From b0404599c2beddcc34922be7cb5c075f5e33109a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 17 Aug 2017 21:52:20 -0700 Subject: [PATCH 001/493] Half moved to new recipe stuff Still need to move alchemy table recipes over and figure out how to do the custom recipe types. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 5 +- .../bloodmagic/altar/BloodAltar.java | 16 +- .../bloodmagic/api/altar/EnumAltarTier.java | 1 + .../bloodmagic/api_impl/BloodMagicAPI.java | 15 +- .../api_impl/BloodMagicBlacklist.java | 17 +- .../api_impl/BloodMagicCorePlugin.java | 5 + .../api_impl/BloodMagicRecipeRegistrar.java | 154 ++++++++++++++++++ .../api_impl/recipe/RecipeAlchemyTable.java | 83 ++++++++++ .../api_impl/recipe/RecipeBloodAltar.java | 96 +++++++++++ .../api_impl/recipe/RecipeTartaricForge.java | 79 +++++++++ .../bloodmagic/apiv2/IBloodMagicAPI.java | 11 +- .../apiv2/IBloodMagicBlacklist.java | 18 +- .../bloodmagic/apiv2/IBloodMagicPlugin.java | 4 +- .../apiv2/IBloodMagicRecipeRegistrar.java | 16 ++ .../compat/jei/BloodMagicPlugin.java | 29 ++-- .../AlchemyTableRecipeCategory.java | 6 +- .../AlchemyTableRecipeHandler.java | 31 ---- .../alchemyTable/AlchemyTableRecipeJEI.java | 25 ++- .../alchemyTable/AlchemyTableRecipeMaker.java | 21 --- .../compat/jei/altar/AltarRecipeCategory.java | 11 +- .../compat/jei/altar/AltarRecipeHandler.java | 31 ---- .../compat/jei/altar/AltarRecipeJEI.java | 28 ++-- .../compat/jei/altar/AltarRecipeMaker.java | 45 ----- .../forge/TartaricForgeRecipeCategory.java | 19 +-- .../jei/forge/TartaricForgeRecipeHandler.java | 31 ---- .../jei/forge/TartaricForgeRecipeJEI.java | 26 ++- .../jei/forge/TartaricForgeRecipeMaker.java | 21 --- .../core/RegistrarBloodMagicRecipes.java | 130 +++++++++++++++ .../core/recipe/IngredientSoulGem.java | 4 + .../bloodmagic/registry/ModRecipes.java | 95 ----------- .../bloodmagic/tile/TileSoulForge.java | 17 +- 31 files changed, 699 insertions(+), 391 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java create mode 100644 src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java create mode 100644 src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java create mode 100644 src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java create mode 100644 src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java create mode 100644 src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java create mode 100644 src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 4957a1be..4dbd80f0 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -88,8 +88,6 @@ public class BloodMagic { @Mod.EventHandler public void init(FMLInitializationEvent event) { BloodMagicPacketHandler.init(); - for (Pair plugin : PLUGINS) - plugin.getLeft().register(BloodMagicAPI.INSTANCE); ModRecipes.init(); ModRituals.initRituals(); @@ -106,6 +104,9 @@ public class BloodMagic { public void postInit(FMLPostInitializationEvent event) { ModRecipes.addCompressionHandlers(); + for (Pair plugin : PLUGINS) + plugin.getLeft().register(BloodMagicAPI.INSTANCE); + proxy.postInit(); } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index b4846dfa..47e1f274 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -6,14 +6,12 @@ import WayofTime.bloodmagic.api.altar.*; import WayofTime.bloodmagic.api.event.AltarCraftedEvent; import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Enums; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; @@ -31,7 +29,6 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import java.util.List; @@ -78,7 +75,7 @@ public class BloodAltar implements IFluidHandler { private int chargingFrequency = 0; private int maxCharge = 0; private int cooldownAfterCrafting = 60; - private AltarRecipe recipe; + private RecipeBloodAltar recipe; private ItemStack result = ItemStack.EMPTY; private EnumAltarTier currentTierDisplayed = EnumAltarTier.ONE; @@ -189,14 +186,14 @@ public class BloodAltar implements IFluidHandler { if (!input.isEmpty()) { // Do recipes - AltarRecipe recipe = AltarRecipeRegistry.getRecipeForInput(input); + RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(input); if (recipe != null) { - if (recipe.doesRequiredItemMatch(input, altarTier)) { + if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) { this.isActive = true; this.recipe = recipe; this.result = recipe.getOutput().isEmpty() ? ItemStack.EMPTY : new ItemStack(recipe.getOutput().getItem(), 1, recipe.getOutput().getMetadata()); this.liquidRequired = recipe.getSyphon(); - this.canBeFilled = recipe.isFillable(); + this.canBeFilled = false; this.consumptionRate = recipe.getConsumeRate(); this.drainRate = recipe.getDrainRate(); return; @@ -318,7 +315,8 @@ public class BloodAltar implements IFluidHandler { if (!result.isEmpty()) result.setCount(result.getCount() * stackSize); - MinecraftForge.EVENT_BUS.post(new AltarCraftedEvent(recipe, result)); + // TODO - Update for new recipe type +// MinecraftForge.EVENT_BUS.post(new AltarCraftedEvent(recipe, result)); tileAltar.setInventorySlotContents(0, result); progress = 0; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java index 16a4e7e1..a5ac7a96 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java @@ -120,6 +120,7 @@ public enum EnumAltarTier { //@formatter:on }; + public static final EnumAltarTier[] VALUES = values(); public static final int MAXTIERS = values().length; ArrayList altarComponents = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java index b2fc17ce..e7dc13d6 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java @@ -9,6 +9,8 @@ import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; import java.util.*; public class BloodMagicAPI implements IBloodMagicAPI { @@ -16,27 +18,36 @@ public class BloodMagicAPI implements IBloodMagicAPI { public static final BloodMagicAPI INSTANCE = new BloodMagicAPI(); private final BloodMagicBlacklist blacklist; + private final BloodMagicRecipeRegistrar recipeRegistrar; private final Map sacrificialValues; private final Multimap altarComponents; public BloodMagicAPI() { this.blacklist = new BloodMagicBlacklist(); + this.recipeRegistrar = new BloodMagicRecipeRegistrar(); this.sacrificialValues = Maps.newHashMap(); this.altarComponents = ArrayListMultimap.create(); } + @Nonnull @Override public BloodMagicBlacklist getBlacklist() { return blacklist; } + @Nonnull @Override - public void setSacrificialValue(ResourceLocation entityId, int value) { + public BloodMagicRecipeRegistrar getRecipeRegistrar() { + return recipeRegistrar; + } + + @Override + public void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value) { sacrificialValues.put(entityId, value); } @Override - public void registerAltarComponent(IBlockState state, String componentType) { + public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { EnumAltarComponent component = EnumAltarComponent.NOTAIR; for (EnumAltarComponent type : EnumAltarComponent.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java index 0d448390..de4c9f77 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; import java.util.Set; public class BloodMagicBlacklist implements IBloodMagicBlacklist { @@ -26,49 +27,49 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } @Override - public void addTeleposer(IBlockState state) { + public void addTeleposer(@Nonnull IBlockState state) { if (!teleposer.contains(state)) teleposer.add(state); } @Override - public void addTeleposer(Block block) { + public void addTeleposer(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addTeleposer(state); } @Override - public void addTeleposer(ResourceLocation entityId) { + public void addTeleposer(@Nonnull ResourceLocation entityId) { if (!teleposerEntities.contains(entityId)) teleposerEntities.add(entityId); } @Override - public void addTransposition(IBlockState state) { + public void addTransposition(@Nonnull IBlockState state) { if (!transposition.contains(state)) transposition.add(state); } @Override - public void addTransposition(Block block) { + public void addTransposition(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addTransposition(state); } @Override - public void addGreenGrove(IBlockState state) { + public void addGreenGrove(@Nonnull IBlockState state) { if (!greenGrove.contains(state)) greenGrove.add(state); } @Override - public void addGreenGrove(Block block) { + public void addGreenGrove(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addGreenGrove(state); } @Override - public void addSacrifice(ResourceLocation entityId) { + public void addSacrifice(@Nonnull ResourceLocation entityId) { if (!sacrifice.contains(entityId)) sacrifice.add(entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java index e2800fc6..161ee241 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java @@ -10,6 +10,7 @@ import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; @@ -50,5 +51,9 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (EnumBloodRune runeType : EnumBloodRune.values()) api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); + + RegistrarBloodMagicRecipes.registerAltarRecipes(api.getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(api.getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); } } diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..6e251afe --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java @@ -0,0 +1,154 @@ +package WayofTime.bloodmagic.api_impl; + +import WayofTime.bloodmagic.api.orb.IBloodOrb; +import WayofTime.bloodmagic.api_impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; +import WayofTime.bloodmagic.apiv2.IBloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraftforge.common.crafting.CraftingHelper; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { + + private final Map altarRecipes; + private final Map, RecipeAlchemyTable> alchemyRecipes; + private final Map, RecipeTartaricForge> tartaricForgeRecipes; + + public BloodMagicRecipeRegistrar() { + this.altarRecipes = Maps.newHashMap(); + this.alchemyRecipes = Maps.newHashMap(); + this.tartaricForgeRecipes = Maps.newHashMap(); + } + + @Override + public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative."); + + altarRecipes.put(input, new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); + } + + @Override + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + alchemyRecipes.put(inputs, new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); + } + + @Override + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + tartaricForgeRecipes.put(inputs, new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); + } + + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); + } + + @Nullable + public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { + Preconditions.checkNotNull(input, "input cannot be null."); + + for (Map.Entry entry : altarRecipes.entrySet()) + if (entry.getKey().test(input)) + return entry.getValue(); + + return null; + } + + @Nullable + public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + + mainLoop: + for (Map.Entry, RecipeAlchemyTable> entry : alchemyRecipes.entrySet()) { + if (entry.getKey().size() != input.size()) + continue; + + for (int i = 0; i > input.size(); i++) { + Ingredient ingredient = entry.getKey().get(i); + if (!ingredient.apply(input.get(i))) + continue mainLoop; + } + + return entry.getValue(); + } + + return null; + } + + @Nullable + public RecipeTartaricForge getTartaricForge(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + + mainLoop: + for (Map.Entry, RecipeTartaricForge> entry : tartaricForgeRecipes.entrySet()) { + if (entry.getKey().size() != input.size()) + continue; + + for (int i = 0; i > input.size(); i++) { + Ingredient ingredient = entry.getKey().get(i); + if (!ingredient.apply(input.get(i))) + continue mainLoop; + } + + return entry.getValue(); + } + + return null; + } + + public Map getAltarRecipes() { + return ImmutableMap.copyOf(altarRecipes); + } + + public Map, RecipeAlchemyTable> getAlchemyRecipes() { + return ImmutableMap.copyOf(alchemyRecipes); + } + + public Map, RecipeTartaricForge> getTartaricForgeRecipes() { + return ImmutableMap.copyOf(tartaricForgeRecipes); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java new file mode 100644 index 00000000..736b33e2 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java @@ -0,0 +1,83 @@ +package WayofTime.bloodmagic.api_impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeAlchemyTable { + + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final int syphon; + @Nonnegative + private final int ticks; + @Nonnegative + private final int minimumTier; + + public RecipeAlchemyTable(@Nonnull NonNullList input, @Nonnull ItemStack output, int syphon, int ticks, int minimumTier) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + + this.input = input; + this.output = output; + this.syphon = syphon; + this.ticks = ticks; + this.minimumTier = minimumTier; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + public final int getSyphon() { + return syphon; + } + + public final int getTicks() { + return ticks; + } + + public final int getMinimumTier() { + return minimumTier; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof RecipeAlchemyTable)) return false; + + RecipeAlchemyTable that = (RecipeAlchemyTable) o; + + if (syphon != that.syphon) return false; + if (ticks != that.ticks) return false; + if (minimumTier != that.minimumTier) return false; + if (!input.equals(that.input)) return false; + return ItemStack.areItemStacksEqual(output, that.output); + } + + @Override + public int hashCode() { + int result = input.hashCode(); + result = 31 * result + output.hashCode(); + result = 31 * result + syphon; + result = 31 * result + ticks; + result = 31 * result + minimumTier; + return result; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java new file mode 100644 index 00000000..9b47ed43 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java @@ -0,0 +1,96 @@ +package WayofTime.bloodmagic.api_impl.recipe; + +import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeBloodAltar { + + @Nonnull + private final Ingredient input; + @Nonnull + private final ItemStack output; + @Nonnull + private final EnumAltarTier minimumTier; + @Nonnegative + private final int syphon; + @Nonnegative + private final int consumeRate; + @Nonnegative + private final int drainRate; + + public RecipeBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkNotNull(minimumTier, "minimumTier cannot be negative."); + Preconditions.checkArgument(minimumTier <= EnumAltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); + + this.input = input; + this.output = output; + this.minimumTier = EnumAltarTier.VALUES[minimumTier]; + this.syphon = syphon; + this.consumeRate = consumeRate; + this.drainRate = drainRate; + } + + @Nonnull + public final Ingredient getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnull + public EnumAltarTier getMinimumTier() { + return minimumTier; + } + + @Nonnegative + public final int getSyphon() { + return syphon; + } + + @Nonnegative + public final int getConsumeRate() { + return consumeRate; + } + + @Nonnegative + public final int getDrainRate() { + return drainRate; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof RecipeBloodAltar)) return false; + + RecipeBloodAltar that = (RecipeBloodAltar) o; + + if (minimumTier != that.minimumTier) return false; + if (syphon != that.syphon) return false; + if (drainRate != that.drainRate) return false; + if (!input.equals(that.input)) return false; + return ItemStack.areItemStacksEqual(output, that.output); + } + + @Override + public int hashCode() { + int result = input.hashCode(); + result = 31 * result + output.hashCode(); + result = 31 * result + minimumTier.ordinal(); + result = 31 * result + syphon; + result = 31 * result + drainRate; + return result; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java new file mode 100644 index 00000000..6acc46cd --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java @@ -0,0 +1,79 @@ +package WayofTime.bloodmagic.api_impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeTartaricForge { + + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final double minimumSouls; + @Nonnegative + private final double soulDrain; + + public RecipeTartaricForge(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + + this.input = input; + this.output = output; + this.minimumSouls = minimumSouls; + this.soulDrain = soulDrain; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnegative + public final double getMinimumSouls() { + return minimumSouls; + } + + @Nonnegative + public final double getSoulDrain() { + return soulDrain; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof RecipeTartaricForge)) return false; + + RecipeTartaricForge that = (RecipeTartaricForge) o; + + if (minimumSouls != that.minimumSouls) return false; + if (soulDrain != that.soulDrain) return false; + if (!input.equals(that.input)) return false; + return ItemStack.areItemStacksEqual(output, that.output); + } + + @Override + public int hashCode() { + int result; + long temp; + result = input.hashCode(); + result = 31 * result + output.hashCode(); + temp = Double.doubleToLongBits(minimumSouls); + result = 31 * result + (int) (temp ^ (temp >>> 32)); + temp = Double.doubleToLongBits(soulDrain); + result = 31 * result + (int) (temp ^ (temp >>> 32)); + return result; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java index 0e7c8d50..0024672a 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java @@ -3,6 +3,9 @@ package WayofTime.bloodmagic.apiv2; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + public interface IBloodMagicAPI { /** @@ -10,9 +13,13 @@ public interface IBloodMagicAPI { * * @return the active blacklist instance */ + @Nonnull IBloodMagicBlacklist getBlacklist(); - void setSacrificialValue(ResourceLocation entityId, int value); + @Nonnull + IBloodMagicRecipeRegistrar getRecipeRegistrar(); - void registerAltarComponent(IBlockState state, String componentType); + void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); + + void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); } diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java index 61caa272..13852efd 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java @@ -4,21 +4,23 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public interface IBloodMagicBlacklist { - void addTeleposer(IBlockState state); + void addTeleposer(@Nonnull IBlockState state); - void addTeleposer(Block block); + void addTeleposer(@Nonnull Block block); - void addTeleposer(ResourceLocation entityId); + void addTeleposer(@Nonnull ResourceLocation entityId); - void addTransposition(IBlockState state); + void addTransposition(@Nonnull IBlockState state); - void addTransposition(Block block); + void addTransposition(@Nonnull Block block); - void addGreenGrove(IBlockState state); + void addGreenGrove(@Nonnull IBlockState state); - void addGreenGrove(Block block); + void addGreenGrove(@Nonnull Block block); - void addSacrifice(ResourceLocation entityId); + void addSacrifice(@Nonnull ResourceLocation entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java index ad2098a7..3d6c899d 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java @@ -1,6 +1,8 @@ package WayofTime.bloodmagic.apiv2; +import javax.annotation.Nonnull; + public interface IBloodMagicPlugin { - void register(IBloodMagicAPI api); + void register(@Nonnull IBloodMagicAPI api); } diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..92c7ea6c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java @@ -0,0 +1,16 @@ +package WayofTime.bloodmagic.apiv2; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public interface IBloodMagicRecipeRegistrar { + + void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); + + void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); + + void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); +} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 11c3f80a..ab7ed560 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -3,16 +3,18 @@ package WayofTime.bloodmagic.compat.jei; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.api_impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHandler; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeMaker; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeHandler; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeMaker; +import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeHandler; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeMaker; +import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeCategory; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeHandler; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeMaker; @@ -20,8 +22,7 @@ import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeCategory; import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeHandler; import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeMaker; import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeHandler; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeMaker; +import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeJEI; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import mezz.jei.api.*; @@ -32,7 +33,7 @@ import javax.annotation.Nonnull; import java.util.Map; @JEIPlugin -public class BloodMagicPlugin extends BlankModPlugin { +public class BloodMagicPlugin implements IModPlugin { public static IJeiHelpers jeiHelper; @Override @@ -40,19 +41,21 @@ public class BloodMagicPlugin extends BlankModPlugin { jeiHelper = registry.getJeiHelpers(); registry.addRecipeHandlers( - new AltarRecipeHandler(), new BindingRecipeHandler(), new AlchemyArrayCraftingRecipeHandler(), - new TartaricForgeRecipeHandler(), - new AlchemyTableRecipeHandler(), new ArmourDowngradeRecipeHandler() ); - registry.addRecipes(AltarRecipeMaker.getRecipes()); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes().values(), Constants.Compat.JEI_CATEGORY_ALTAR); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyRecipes().values(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes().values(), Constants.Compat.JEI_CATEGORY_SOULFORGE); + + registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); + registry.handleRecipes(RecipeAlchemyTable.class, AlchemyTableRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.handleRecipes(RecipeTartaricForge.class, TartaricForgeRecipeJEI::new, Constants.Compat.JEI_CATEGORY_SOULFORGE); + registry.addRecipes(BindingRecipeMaker.getRecipes()); registry.addRecipes(AlchemyArrayCraftingRecipeMaker.getRecipes()); - registry.addRecipes(TartaricForgeRecipeMaker.getRecipes()); - registry.addRecipes(AlchemyTableRecipeMaker.getRecipes()); registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes()); registry.addIngredientInfo(new ItemStack(RegistrarBloodMagicItems.ALTAR_MAKER), ItemStack.class, "jei.bloodmagic.desc.altarBuilder"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index 4ade8678..a6b38e9c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -10,13 +10,13 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; -public class AlchemyTableRecipeCategory extends BlankRecipeCategory { +public class AlchemyTableRecipeCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 0; private static final int ORB_SLOT = 1; private static final int INPUT_SLOT = 2; @@ -64,7 +64,7 @@ public class AlchemyTableRecipeCategory extends BlankRecipeCategory { - @Nonnull - @Override - public Class getRecipeClass() { - return AlchemyTableRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull AlchemyTableRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AlchemyTableRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AlchemyTableRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index 0079d60a..8ec43f49 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -1,20 +1,19 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.api_impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; -import java.util.ArrayList; import java.util.List; -public class AlchemyTableRecipeJEI extends BlankRecipeWrapper { - private AlchemyTableRecipe recipe; +public class AlchemyTableRecipeJEI implements IRecipeWrapper { + private RecipeAlchemyTable recipe; - public AlchemyTableRecipeJEI(AlchemyTableRecipe recipe) { + public AlchemyTableRecipeJEI(RecipeAlchemyTable recipe) { this.recipe = recipe; } @@ -22,21 +21,21 @@ public class AlchemyTableRecipeJEI extends BlankRecipeWrapper { public void getIngredients(IIngredients ingredients) { List> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); ingredients.setInputLists(ItemStack.class, expanded); - ingredients.setOutput(ItemStack.class, recipe.getRecipeOutput(Lists.newArrayList())); + ingredients.setOutput(ItemStack.class, recipe.getOutput()); } @Override public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList(); + List tooltip = Lists.newArrayList(); if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34) { - ret.add(TextHelper.localize("tooltip.bloodmagic.tier", recipe.getTierRequired())); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", recipe.getLpDrained())); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.ticksRequired", recipe.getTicksRequired())); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.tier", recipe.getMinimumTier())); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", recipe.getSyphon())); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.ticksRequired", recipe.getTicks())); } - return ret; + return tooltip; } - public AlchemyTableRecipe getRecipe() { + public RecipeAlchemyTable getRecipe() { return recipe; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java deleted file mode 100644 index e526d182..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyTable; - -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class AlchemyTableRecipeMaker { - @Nonnull - public static List getRecipes() { - List recipeList = AlchemyTableRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList(); - - for (AlchemyTableRecipe recipe : recipeList) - recipes.add(new AlchemyTableRecipeJEI(recipe)); - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 482b98ab..32f955c8 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -8,7 +8,6 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -16,7 +15,7 @@ import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class AltarRecipeCategory implements IRecipeCategory { +public class AltarRecipeCategory implements IRecipeCategory { private static final int INPUT_SLOT = 0; private static final int OUTPUT_SLOT = 1; @@ -55,14 +54,12 @@ public class AltarRecipeCategory implements IRecipeCategory { } @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { + public void setRecipe(IRecipeLayout recipeLayout, AltarRecipeJEI recipeWrapper, IIngredients ingredients) { recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); - if (recipeWrapper instanceof AltarRecipeJEI) { - recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - } + recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); + recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java deleted file mode 100644 index efd8c457..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import WayofTime.bloodmagic.api.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class AltarRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return AltarRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull AltarRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_ALTAR; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AltarRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AltarRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java index d7de9b3d..c7f93c33 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -1,18 +1,20 @@ package WayofTime.bloodmagic.compat.jei.altar; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import javax.annotation.Nonnull; import java.awt.Color; -import java.util.ArrayList; import java.util.List; -public class AltarRecipeJEI extends BlankRecipeWrapper { +public class AltarRecipeJEI implements IRecipeWrapper { @Nonnull private final List input; @Nonnull @@ -22,13 +24,13 @@ public class AltarRecipeJEI extends BlankRecipeWrapper { private final int consumptionRate; private final int drainRate; - public AltarRecipeJEI(@Nonnull List input, @Nonnull ItemStack output, int tier, int requiredLP, int consumptionRate, int drainRate) { - this.input = input; - this.output = output; + public AltarRecipeJEI(RecipeBloodAltar recipe) { + this.input = NonNullList.from(ItemStack.EMPTY, recipe.getInput().getMatchingStacks()); + this.output = recipe.getOutput(); - this.infoString = new String[]{TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier)), TextHelper.localize("jei.bloodmagic.recipe.requiredLP", requiredLP)}; - this.consumptionRate = consumptionRate; - this.drainRate = drainRate; + this.infoString = new String[]{TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())), TextHelper.localize("jei.bloodmagic.recipe.requiredLP", recipe.getSyphon())}; + this.consumptionRate = recipe.getConsumeRate(); + this.drainRate = recipe.getDrainRate(); } @Override @@ -39,12 +41,12 @@ public class AltarRecipeJEI extends BlankRecipeWrapper { @Override public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList(); + List tooltip = Lists.newArrayList(); if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) { - ret.add(TextHelper.localize("jei.bloodmagic.recipe.consumptionRate", consumptionRate)); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.drainRate", drainRate)); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.consumptionRate", consumptionRate)); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.drainRate", drainRate)); } - return ret; + return tooltip; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java deleted file mode 100644 index 760852b2..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ /dev/null @@ -1,45 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class AltarRecipeMaker { - @Nonnull - public static List getRecipes() { - Map, AltarRecipeRegistry.AltarRecipe> altarMap = AltarRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList(); - - for (Map.Entry, AltarRecipeRegistry.AltarRecipe> itemStackAltarRecipeEntry : altarMap.entrySet()) { - // Make sure input is not a Blood Orb. If it is, the recipe is for a filling orb, and we don't want that. - if (!(itemStackAltarRecipeEntry.getKey().get(0).toStack().getItem() instanceof IBloodOrb)) { - List input = ItemStackWrapper.toStackList(itemStackAltarRecipeEntry.getValue().getInput()); - ItemStack output = itemStackAltarRecipeEntry.getValue().getOutput(); - int requiredTier = itemStackAltarRecipeEntry.getValue().getMinTier().toInt(); - int requiredLP = itemStackAltarRecipeEntry.getValue().getSyphon(); - int consumptionRate = itemStackAltarRecipeEntry.getValue().getConsumeRate(); - int drainRate = itemStackAltarRecipeEntry.getValue().getDrainRate(); - - if (output.getItem() == ForgeModContainer.getInstance().universalBucket && requiredLP == 1000) - output = FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)); - - AltarRecipeJEI recipe = new AltarRecipeJEI(input, output, requiredTier, requiredLP, consumptionRate, drainRate); - recipes.add(recipe); - } - } - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index ceee68d8..3e03d2f7 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -10,7 +10,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -19,7 +18,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -public class TartaricForgeRecipeCategory implements IRecipeCategory { +public class TartaricForgeRecipeCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 0; private static final int GEM_SLOT = 1; private static final int INPUT_SLOT = 2; @@ -65,7 +64,7 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory { } @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { + public void setRecipe(IRecipeLayout recipeLayout, TartaricForgeRecipeJEI recipeWrapper, IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); guiItemStacks.init(OUTPUT_SLOT, false, 73, 13); @@ -79,16 +78,12 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory { } List> inputs = ingredients.getInputs(ItemStack.class); - List> outputs = ingredients.getOutputs(ItemStack.class); - if (recipeWrapper instanceof TartaricForgeRecipeJEI) { - TartaricForgeRecipeJEI recipe = (TartaricForgeRecipeJEI) recipeWrapper; - guiItemStacks.set(GEM_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); - inputs.remove(ingredients.getInputs(ItemStack.class).size() - 1); - guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - guiItemStacks.set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - craftingGridHelper.setInputs(guiItemStacks, inputs); - } + guiItemStacks.set(GEM_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); + inputs.remove(ingredients.getInputs(ItemStack.class).size() - 1); + guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); + guiItemStacks.set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); + craftingGridHelper.setInputs(guiItemStacks, inputs); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java deleted file mode 100644 index 608d97be..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import WayofTime.bloodmagic.api.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class TartaricForgeRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return TartaricForgeRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull TartaricForgeRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_SOULFORGE; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull TartaricForgeRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull TartaricForgeRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java index 9919a733..2c7d4f97 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java @@ -1,22 +1,22 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; public class TartaricForgeRecipeJEI extends BlankRecipeWrapper { - private TartaricForgeRecipe recipe; - private List validGems = new ArrayList(); + private RecipeTartaricForge recipe; + private List validGems = Lists.newArrayList(); - public TartaricForgeRecipeJEI(TartaricForgeRecipe recipe) { + public TartaricForgeRecipeJEI(RecipeTartaricForge recipe) { this.recipe = recipe; for (DefaultWill will : DefaultWill.values()) @@ -29,29 +29,25 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper { List> expandedInputs = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); expandedInputs.add(validGems); ingredients.setInputLists(ItemStack.class, expandedInputs); - ingredients.setOutput(ItemStack.class, recipe.getRecipeOutput()); + ingredients.setOutput(ItemStack.class, recipe.getOutput()); } @Nullable @Override public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList(); + List tooltip = Lists.newArrayList(); if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34) { - ret.add(TextHelper.localize("jei.bloodmagic.recipe.minimumSouls", recipe.getMinimumSouls())); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.soulsDrained", recipe.getSoulsDrained())); - return ret; + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.minimumSouls", recipe.getMinimumSouls())); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.soulsDrained", recipe.getSoulDrain())); + return tooltip; } return null; } - public TartaricForgeRecipe getRecipe() { + public RecipeTartaricForge getRecipe() { return recipe; } - public List getValidGems() { - return validGems; - } - public enum DefaultWill { SOUL(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL, 1, 0), 64), PETTY(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 0), 64), diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java deleted file mode 100644 index 9f66cc27..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class TartaricForgeRecipeMaker { - @Nonnull - public static List getRecipes() { - List recipeList = TartaricForgeRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList(); - - for (TartaricForgeRecipe recipe : recipeList) - recipes.add(new TartaricForgeRecipeJEI(recipe)); - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java new file mode 100644 index 00000000..087d7025 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -0,0 +1,130 @@ +package WayofTime.bloodmagic.core; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.api_impl.BloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.apiv2.IBloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.block.BlockLifeEssence; +import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.oredict.OreIngredient; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class RegistrarBloodMagicRecipes { + + @SubscribeEvent + public static void registerCrafting(RegistryEvent.Register event) { + // TODO - Figure out what recipes still need to be here + } + + public static void registerAltarRecipes(IBloodMagicRecipeRegistrar registrar) { + // ONE + registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE.ordinal(), 2000, 2, 1); + registrar.addBloodAltar(new OreIngredient("stone"), new ItemStack(RegistrarBloodMagicItems.SLATE), EnumAltarTier.ONE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), EnumAltarTier.ONE.ordinal(), 1000, 5, 0); + registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE.ordinal(), 1000, 20, 0); + + // TWO + registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO.ordinal(), 5000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), EnumAltarTier.TWO.ordinal(), 2000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO.ordinal(), 3000, 5, 5); + + // THREE + registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE.ordinal(), 25000, 20, 20); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), EnumAltarTier.THREE.ordinal(), 5000, 15, 10); + registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE.ordinal(), 10000, 20, 10); + + // FOUR + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.BLOOD_SHARD), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR.ordinal(), 25000, 30, 50); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR.ordinal(), 15000, 20, 20); + registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR.ordinal(), 2000, 20, 10); + registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR.ordinal(), 2000, 10, 10); + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR.ordinal(), 10000, 20, 10); + + // FIVE + registrar.addBloodAltar(new OreIngredient("netherstar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE.ordinal(), 80000, 50, 100); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE.ordinal(), 30000, 40, 100); + + // SIX + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); + } + + public static void registerAlchemyTableRecipes(IBloodMagicRecipeRegistrar registrar) { + + } + + public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_WATER), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_VOID), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_AIR), 128, 20, Items.GHAST_TEAR, "feather", "feather"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), 64, 20, "chestWood", "leather", "string", "string"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_FROST), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); + + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); + + registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST)); + + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java new file mode 100644 index 00000000..5d63e947 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java @@ -0,0 +1,4 @@ +package WayofTime.bloodmagic.core.recipe; + +public class IngredientSoulGem { +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 30cde112..3a61373e 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; import WayofTime.bloodmagic.api.compress.CompressionRegistry; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; @@ -46,7 +45,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; @@ -207,46 +205,6 @@ public class ModRecipes { } public static void addAltarRecipes() { - // ONE - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, RegistrarBloodMagic.ORB_WEAK.getCapacity(), 2, 1); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.DIAMOND), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, 2000, 2, 1)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.STONE), new ItemStack(RegistrarBloodMagicItems.SLATE), EnumAltarTier.ONE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BUCKET), new ItemStack(ForgeModContainer.getInstance().universalBucket), EnumAltarTier.ONE, 1000, 5, 0)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE, 1000, 20, 0)); - - // TWO - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO, RegistrarBloodMagic.ORB_APPRENTICE.getCapacity(), 5, 5); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.REDSTONE_BLOCK), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO, 5000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), EnumAltarTier.TWO, 2000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO, 3000, 5, 5)); - - // THREE - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE, RegistrarBloodMagic.ORB_MAGICIAN.getCapacity(), 15, 15); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GOLD_BLOCK), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE, 25000, 20, 20)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), EnumAltarTier.THREE, 5000, 15, 10)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.OBSIDIAN), EnumRuneType.EARTH.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.LAPIS_BLOCK), EnumRuneType.WATER.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.MAGMA_CREAM), EnumRuneType.FIRE.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.GHAST_TEAR), EnumRuneType.AIR.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE, 10000, 20, 10)); - - // FOUR - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR, RegistrarBloodMagic.ORB_MASTER.getCapacity(), 25, 25); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR, 25000, 30, 50)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR, 15000, 20, 20)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.COAL_BLOCK), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR, 2000, 20, 10)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR, 2000, 10, 10)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR, 10000, 20, 10)); - - // FIVE - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE, RegistrarBloodMagic.ORB_ARCHMAGE.getCapacity(), 50, 50); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE, 80000, 50, 100)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE, 30000, 40, 100)); - - // SIX - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX, RegistrarBloodMagic.ORB_TRANSCENDENT.getCapacity(), 50, 50); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX, 200000, 100, 200)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GLOWSTONE), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX, 200000, 100, 200)); } public static void addAlchemyArrayRecipes() { @@ -308,59 +266,6 @@ public class ModRecipes { } public static void addSoulForgeRecipes() { - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), 64, 20, "chestWood", "leather", "string", "string"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); - - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST)); - - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); } public static void addAlchemyTableRecipes() { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 7bdf5b3e..3ec94d23 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.IDemonWill; import WayofTime.bloodmagic.api.soul.IDemonWillConduit; import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -79,14 +79,15 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil } } - TartaricForgeRecipe recipe = TartaricForgeRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); + RecipeTartaricForge recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForge(inputList); +// TartaricForgeRecipe recipe = TartaricForgeRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); if (recipe != null && (soulsInGem >= recipe.getMinimumSouls() || burnTime > 0)) { if (canCraft(recipe)) { burnTime++; if (burnTime == ticksRequired) { if (!getWorld().isRemote) { - double requiredSouls = recipe.getSoulsDrained(); + double requiredSouls = recipe.getSoulDrain(); if (requiredSouls > 0) { if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) { consumeSouls(EnumDemonWillType.DEFAULT, requiredSouls); @@ -113,12 +114,12 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil return ((double) burnTime) / ticksRequired; } - private boolean canCraft(TartaricForgeRecipe recipe) { + private boolean canCraft(RecipeTartaricForge recipe) { if (recipe == null) { return false; } - ItemStack outputStack = recipe.getRecipeOutput(); + ItemStack outputStack = recipe.getOutput(); ItemStack currentOutputStack = getStackInSlot(outputSlot); if (outputStack.isEmpty()) return false; @@ -131,9 +132,9 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil } - public void craftItem(TartaricForgeRecipe recipe) { + public void craftItem(RecipeTartaricForge recipe) { if (this.canCraft(recipe)) { - ItemStack outputStack = recipe.getRecipeOutput(); + ItemStack outputStack = recipe.getOutput(); ItemStack currentOutputStack = getStackInSlot(outputSlot); if (currentOutputStack.isEmpty()) { From d587a8c96f342ce625f35ca92baef900cd9a6318 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 18:56:50 -0700 Subject: [PATCH 002/493] Move config to annotation system All old configs must be deleted for this to work properly. Since the rest of the update is filled with world breaking changes, this should be fine. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 5 +- .../WayofTime/bloodmagic/ConfigHandler.java | 425 ++++-------------- .../util/helper/PlayerSacrificeHelper.java | 2 +- .../api_impl/BloodMagicBlacklist.java | 2 +- .../api_impl/BloodMagicCorePlugin.java | 92 +++- .../apiv2/IBloodMagicBlacklist.java | 2 +- .../bloodmagic/block/BlockSpectral.java | 2 +- .../client/gui/config/ConfigGui.java | 37 -- .../client/gui/config/ConfigGuiFactory.java | 29 -- .../render/block/RenderItemRoutingNode.java | 2 +- .../provider/DataProviderBloodAltar.java | 28 +- .../item/ItemSacrificialDagger.java | 6 +- .../meteor/MeteorConfigHandler.java | 4 +- .../bloodmagic/registry/ModRecipes.java | 4 +- .../bloodmagic/registry/ModRituals.java | 71 ++- .../ritual/RitualFeatheredKnife.java | 2 +- .../util/handler/event/ClientHandler.java | 2 +- .../util/handler/event/CraftingHandler.java | 28 +- .../util/handler/event/GenericHandler.java | 2 +- 19 files changed, 251 insertions(+), 494 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 4dbd80f0..8ab9b602 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -33,7 +33,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.io.File; import java.util.List; -@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory") +@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND) public class BloodMagic { public static final String MODID = "bloodmagic"; public static final String NAME = "Blood Magic: Alchemical Wizardry"; @@ -73,8 +73,7 @@ public class BloodMagic { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - configDir = new File(event.getModConfigurationDirectory(), "BloodMagic"); - ConfigHandler.init(new File(configDir, "BloodMagic.cfg")); + configDir = new File(event.getModConfigurationDirectory(), "bloodmagic"); PLUGINS.addAll(PluginUtil.getPlugins(event.getAsmData())); diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 4ec4c8c6..99867dc1 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -1,352 +1,115 @@ package WayofTime.bloodmagic; -import WayofTime.bloodmagic.annot.Handler; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.meteor.MeteorConfigHandler; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Config; +import net.minecraftforge.common.config.ConfigManager; import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.oredict.OreDictionary; -import java.io.File; -import java.util.*; - -@Handler +@Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") +@Mod.EventBusSubscriber public class ConfigHandler { - public static Configuration config; - // Teleposer - public static String[] teleposerBlacklisting; - public static ArrayList teleposerBlacklist = new ArrayList<>(); - public static List teleposerBlacklistEntity; + @Config.Comment({ "Blacklist options for various features" }) + public static ConfigBlacklist blacklist = new ConfigBlacklist(); + @Config.Comment({ "Value modifiers for various features" }) + public static ConfigValues values = new ConfigValues(); + @Config.Comment({ "Toggles for all rituals" }) + public static ConfigRituals rituals = new ConfigRituals(); + @Config.Comment({ "Settings that only pertain to the client" }) + public static ConfigClient client = new ConfigClient(); + @Config.Comment({ "Compatibility settings" }) + public static ConfigCompat compat = new ConfigCompat(); - // Transposition Sigil - public static String[] transpositionBlacklisting; - public static ArrayList transpositionBlacklist = new ArrayList<>(); + public static class ConfigBlacklist { + @Config.Comment({ "Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state." }) + public String[] teleposer = { "bedrock", "mob_spawner" }; + @Config.Comment({ "Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid." }) + public String[] transposer = { "bedrock", "mob_spawner" }; + @Config.Comment({ "Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid." }) + public String[] wellOfSuffering = { }; + } - // Well of Suffering Blacklist - public static List wellOfSufferingBlacklist; + public static class ConfigValues { + @Config.Comment({ "Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid." }) + public String[] sacrificialValues = { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100" }; + @Config.Comment({ "Amount of LP the Coat of Arms should provide for each damage dealt." }) + @Config.RangeInt(min = 0, max = 100) + public int coatOfArmsConversion = 20; + @Config.Comment({ "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) + @Config.RangeInt(min = 0, max = 10000) + public int sacrificialDaggerConversion = 100; + @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) + public boolean shouldResyncMeteors = true; + } - // Blood Altar Sacrificial Values - public static String[] entitySacrificeValuesList; - public static Map entitySacrificeValues = new HashMap<>(); + public static class ConfigRituals { + public boolean ritualAnimalGrowth = true; + public boolean ritualContainment = true; + public boolean ritualCrushing = true; + public boolean ritualExpulsion = true; + public boolean ritualFeatheredKnife = true; + public boolean ritualFullStomach = true; + public boolean ritualGreenGrove = true; + public boolean ritualHarvest = true; + public boolean ritualInterdiction = true; + public boolean ritualJumping = true; + public boolean ritualLava = true; + public boolean ritualMagnetic = true; + public boolean ritualRegeneration = true; + public boolean ritualSpeed = true; + public boolean ritualSuppression = true; + public boolean ritualWater = true; + public boolean ritualWellOfSuffering = true; + public boolean ritualZephyr = true; + public boolean ritualUpgradeRemove = true; + public boolean ritualArmourEvolve = true; + public boolean ritualForsakenSoul = true; + public boolean ritualCrystalHarvest = true; + public boolean ritualPlacer = true; + public boolean ritualFelling = true; + public boolean ritualPump = true; + public boolean ritualAltarBuilder = true; + public boolean ritualPortal = true; + public boolean ritualMeteor = true; + public boolean ritualDowngrade = true; + public ConfigImperfectRituals imperfect = new ConfigImperfectRituals(); + } - // Rituals - public static boolean ritualAnimalGrowth; - public static boolean ritualContainment; - public static boolean ritualCrushing; - public static boolean ritualExpulsion; - public static boolean ritualFeatheredKnife; - public static boolean ritualFullStomach; - public static boolean ritualGreenGrove; - public static boolean ritualHarvest; - public static boolean ritualInterdiction; - public static boolean ritualJumping; - public static boolean ritualLava; - public static boolean ritualMagnetic; - public static boolean ritualRegeneration; - public static boolean ritualSpeed; - public static boolean ritualSuppression; - public static boolean ritualWater; - public static boolean ritualWellOfSuffering; - public static boolean ritualZephyr; - public static boolean ritualUpgradeRemove; - public static boolean ritualArmourEvolve; - public static boolean ritualForsakenSoul; - public static boolean ritualCrystalHarvest; + public static class ConfigImperfectRituals { + public boolean imperfectRitualNight = true; + public boolean imperfectRitualRain = true; + public boolean imperfectRitualResistance = true; + public boolean imperfectRitualZombie = true; + } - public static boolean cobblestoneRitual; - public static boolean placerRitual; - public static boolean fellingRitual; - public static boolean pumpRitual; - public static boolean altarBuilderRitual; - public static boolean portalRitual; - public static boolean meteorRitual; - public static boolean downgradeRitual; + public static class ConfigClient { + @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) + public boolean alwaysRenderRoutingLines = false; + @Config.Comment({ "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) + public boolean invisibleSpectralBlocks = true; + @Config.Comment({ "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar." }) + public boolean sigilHoldingSkipsEmptySlots = false; + } - // Imperfect Rituals - public static boolean imperfectRitualNight; - public static boolean imperfectRitualRain; - public static boolean imperfectRitualResistance; - public static boolean imperfectRitualZombie; + public static class ConfigCompat { + @Config.Comment({ "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) + public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; - // Potion ID's - public static int customPotionDrowningID; - public static int customPotionBoostID; - public static int customPotionProjProtID; - public static int customPotionInhibitID; - public static int customPotionFlightID; - public static int customPotionReciprocationID; - public static int customPotionFlameCloakID; - public static int customPotionIceCloakID; - public static int customPotionHeavyHeartID; - public static int customPotionFireFuseID; - public static int customPotionPlanarBindingID; - public static int customPotionSoulFrayID; - public static int customPotionSoulHardenID; - public static int customPotionDeafID; - public static int customPotionFeatherFallID; - public static int customPotionDemonCloakID; - public static int customPotionAmphibianID; - - // Potion toggles - public static boolean customPotionDrowningEnabled; - public static boolean customPotionBoostEnabled; - public static boolean customPotionProjProtEnabled; - public static boolean customPotionInhibitEnabled; - public static boolean customPotionFlightEnabled; - public static boolean customPotionReciprocationEnabled; - public static boolean customPotionFlameCloakEnabled; - public static boolean customPotionIceCloakEnabled; - public static boolean customPotionHeavyHeartEnabled; - public static boolean customPotionFireFuseEnabled; - public static boolean customPotionPlanarBindingEnabled; - public static boolean customPotionSoulFrayEnabled; - public static boolean customPotionSoulHardenEnabled; - public static boolean customPotionDeafEnabled; - public static boolean customPotionFeatherFallEnabled; - public static boolean customPotionDemonCloakEnabled; - public static boolean customPotionAmphibianEnabled; - public static boolean vanillaPotionRegenerationEnabled; - public static boolean vanillaPotionNightVisionEnabled; - public static boolean vanillaPotionFireResistEnabled; - public static boolean vanillaPotionWaterBreathingEnabled; - public static boolean vanillaPotionSpeedEnabled; - public static boolean vanillaPotionHealthEnabled; - public static boolean vanillaPotionPoisonEnabled; - public static boolean vanillaPotionBlindnessEnabled; - public static boolean vanillaPotionWeaknessEnabled; - public static boolean vanillaPotionStrengthEnabled; - public static boolean vanillaPotionJumpBoostEnabled; - public static boolean vanillaPotionSlownessEnabled; - public static boolean vanillaPotionMiningEnabled; - public static boolean vanillaPotionInvisibilityEnabled; - public static boolean vanillaPotionResistanceEnabled; - public static boolean vanillaPotionSaturationEnabled; - public static boolean vanillaPotionHealthBoostEnabled; - public static boolean vanillaPotionAbsorptionEnabled; - - // General - public static int sacrificialPackConversion; - public static int sacrificialDaggerDamage; - public static int sacrificialDaggerConversion; - - // Client - public static boolean alwaysRenderRoutingLines; - public static boolean invisibleSpectralBlocks; - public static boolean sigilHoldingSkipsEmptySlots; - - // Compat - public static int wailaAltarDisplayMode; - public static boolean thaumcraftGogglesUpgrade; - public static boolean ignoreCompressionSpamAddedByCompression; + public enum AltarDisplayMode { + ALWAYS, + SIGIL_HELD, + SIGIL_CONTAINED, + ; + } + } @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent event) { + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { if (event.getModID().equals(BloodMagic.MODID)) { - syncConfig(); - MeteorConfigHandler.handleMeteors(false); - } - } - - public static void init(File file) { - config = new Configuration(file); - syncConfig(); - } - - public static void syncConfig() { - String category; - - category = "Item/Block Blacklisting"; - config.addCustomCategoryComment(category, "Allows disabling of specific Blocks/Items.\nNote that using this may result in crashes. Use is not supported."); - config.setCategoryRequiresMcRestart(category, true); - - category = "Teleposer Blacklist"; - config.addCustomCategoryComment(category, "Block blacklisting"); - teleposerBlacklisting = config.getStringList("teleposerBlacklist", category, new String[]{"minecraft:bedrock", "minecraft:mob_spawner"}, "Stops specified blocks from being teleposed. Put entries on new lines. Valid syntax is:\nmodid:blockname:meta"); - buildBlacklist(teleposerBlacklisting, teleposerBlacklist); - teleposerBlacklistEntity = Arrays.asList(config.getStringList("teleposerBlacklistEntity", category, new String[]{}, "Entity class names listed here will not be able to be teleposed.")); - - category = "Transposition Sigil Blacklist"; - config.addCustomCategoryComment(category, "Block blacklisting"); - transpositionBlacklisting = config.getStringList("transpositionBlacklist", category, new String[]{"minecraft:bedrock", "minecraft:mob_spawner"}, "Stops specified blocks from being teleposed. Put entries on new lines. Valid syntax is:\nmodid:blockname:meta"); - buildBlacklist(transpositionBlacklisting, transpositionBlacklist); - - category = "Well of Suffering Blacklist"; - config.addCustomCategoryComment(category, "Entity blacklisting from WoS"); - wellOfSufferingBlacklist = Arrays.asList(config.getStringList("wellOfSufferingBlacklist", category, new String[]{"EntityArmorStand", "EntitySentientSpecter"}, "Use the class name of the Entity to blacklist it from usage.\nIE: EntityWolf, EntityWitch, etc")); - - category = "Blood Altar Sacrificial Values"; - config.addCustomCategoryComment(category, "Entity Sacrificial Value Settings"); - entitySacrificeValuesList = config.getStringList("entitySacrificeLP:HPValues", category, new String[]{"EntityVillager;100", "EntitySlime;15", "EntityEnderman;10", "EntityCow;100", "EntityChicken;100", "EntityHorse;100", "EntitySheep;100", "EntityWolf;100", "EntityOcelot;100", "EntityPig;100", "EntityRabbit;100", "EntityArmorStand;0", "EntitySentientSpecter;0"}, "Used to edit the amount of LP gained per HP sacrificed for the given entity.\nSetting an entity to 0 effectively blacklists it.\nIf a mod modifies an entity via the API, it will take precedence over this config.\nSyntax: EntityClassName;LPPerHP"); - buildEntitySacrificeValues(); - - category = "Potions"; - config.addCustomCategoryComment(category, "Potion settings"); - config.addCustomCategoryComment(category + ".id", "Potion ID settings"); - customPotionDrowningID = config.getInt("customPotionDrowningID", category + ".id", 100, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Drowning potion"); - customPotionBoostID = config.getInt("customPotionBoostID", category + ".id", 101, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Boost potion"); - customPotionProjProtID = config.getInt("customPotionProjProtID", category + ".id", 102, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Projectile Protection potion"); - customPotionInhibitID = config.getInt("customPotionInhibitID", category + ".id", 103, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Inhibit potion"); - customPotionFlightID = config.getInt("customPotionFlightID", category + ".id", 104, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Flight potion"); - customPotionReciprocationID = config.getInt("customPotionReciprocationID", category + ".id", 105, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Reciprocation potion"); - customPotionFlameCloakID = config.getInt("customPotionFlameCloakID", category + ".id", 106, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Flame Cloak potion"); - customPotionIceCloakID = config.getInt("customPotionIceCloakID", category + ".id", 107, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Ice Cloak potion"); - customPotionHeavyHeartID = config.getInt("customPotionHeavyHeartID", category + ".id", 108, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Heavy Heart potion"); - customPotionFireFuseID = config.getInt("customPotionFireFuseID", category + ".id", 109, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Fire Fuse potion"); - customPotionPlanarBindingID = config.getInt("customPotionPlanarBindingID", category + ".id", 110, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Planar Binding potion"); - customPotionSoulFrayID = config.getInt("customPotionSoulFrayID", category + ".id", 111, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Soul Fray potion"); - customPotionSoulHardenID = config.getInt("customPotionSoulHardenID", category + ".id", 112, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Soul Harden potion"); - customPotionDeafID = config.getInt("customPotionDeafID", category + ".id", 113, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Deaf potion"); - customPotionFeatherFallID = config.getInt("customPotionFeatherFallID", category + ".id", 114, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Feather Fall potion"); - customPotionDemonCloakID = config.getInt("customPotionDemonCloakID", category + ".id", 115, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Demon Cloak potion"); - customPotionAmphibianID = config.getInt("customPotionAmphibianID", category + ".id", 116, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Amphibian potion"); - - config.addCustomCategoryComment(category + ".toggle", "Toggle potions available in Alchemy"); - customPotionDrowningEnabled = config.getBoolean("customPotionDrowningEnabled", category + ".toggle", true, "Enables the Drowning potion in Alchemy"); - customPotionBoostEnabled = config.getBoolean("customPotionBoostEnabled", category + ".toggle", true, "Enables the Boost potion in Alchemy"); - customPotionProjProtEnabled = config.getBoolean("customPotionProjProtEnabled", category + ".toggle", true, "Enables the Projectile Protection potion in Alchemy"); - customPotionInhibitEnabled = config.getBoolean("customPotionInhibitEnabled", category + ".toggle", true, "Enables the Inhibit potion in Alchemy"); - customPotionFlightEnabled = config.getBoolean("customPotionFlightEnabled", category + ".toggle", true, "Enables the Flight potion in Alchemy"); - customPotionReciprocationEnabled = config.getBoolean("customPotionReciprocationEnabled", category + ".toggle", true, "Enables the Reciprocation potion in Alchemy"); - customPotionFlameCloakEnabled = config.getBoolean("customPotionFlameCloakEnabled", category + ".toggle", true, "Enables the Flame Cloak potion in Alchemy"); - customPotionIceCloakEnabled = config.getBoolean("customPotionIceCloakEnabled", category + ".toggle", true, "Enables the Ice Cloak potion in Alchemy"); - customPotionHeavyHeartEnabled = config.getBoolean("customPotionHeavyHeartEnabled", category + ".toggle", true, "Enables the Heavy Heart potion in Alchemy"); - customPotionFireFuseEnabled = config.getBoolean("customPotionFireFuseEnabled", category + ".toggle", true, "Enables the Fire Fuse potion in Alchemy"); - customPotionPlanarBindingEnabled = config.getBoolean("customPotionPlanarBindingEnabled", category + ".toggle", true, "Enables the Planar Binding potion in Alchemy"); - customPotionSoulFrayEnabled = config.getBoolean("customPotionSoulFrayEnabled", category + ".toggle", true, "Enables the Soul Fray potion in Alchemy"); - customPotionSoulHardenEnabled = config.getBoolean("customPotionSoulHardenEnabled", category + ".toggle", true, "Enables the Soul Harden potion in Alchemy"); - customPotionDeafEnabled = config.getBoolean("customPotionDeafEnabled", category + ".toggle", true, "Enables the Deaf potion in Alchemy"); - customPotionFeatherFallEnabled = config.getBoolean("customPotionFeatherFallEnabled", category + ".toggle", true, "Enables the Feather Fall potion in Alchemy"); - customPotionDemonCloakEnabled = config.getBoolean("customPotionDemonCloakEnabled", category + ".toggle", true, "Enables the Demon Cloak potion in Alchemy"); - customPotionAmphibianEnabled = config.getBoolean("customPotionAmphibianEnabled", category + ".toggle", true, "Enables the Amphibian potion in Alchemy"); - vanillaPotionAbsorptionEnabled = config.getBoolean("vanillaPotionAbsorptionEnabled", category + ".toggle", true, "Enables the Absorption potion in Alchemy"); - vanillaPotionBlindnessEnabled = config.getBoolean("vanillaPotionBlindnessEnabled", category + ".toggle", true, "Enables the Blindness potion in Alchemy"); - vanillaPotionFireResistEnabled = config.getBoolean("vanillaPotionFireResistEnabled", category + ".toggle", true, "Enables the Fire Resistance potion in Alchemy"); - vanillaPotionHealthBoostEnabled = config.getBoolean("vanillaPotionHealthBoostEnabled", category + ".toggle", true, "Enables the Health Boost potion in Alchemy"); - vanillaPotionHealthEnabled = config.getBoolean("vanillaPotionHealthEnabled", category + ".toggle", true, "Enables the Instant Health potion in Alchemy"); - vanillaPotionInvisibilityEnabled = config.getBoolean("vanillaPotionInvisibilityEnabled", category + ".toggle", true, "Enables the Invisibility potion in Alchemy"); - vanillaPotionJumpBoostEnabled = config.getBoolean("vanillaPotionJumpBoostEnabled", category + ".toggle", true, "Enables the Jump Boost potion in Alchemy"); - vanillaPotionMiningEnabled = config.getBoolean("vanillaPotionMiningEnabled", category + ".toggle", true, "Enables the Mining potion in Alchemy"); - vanillaPotionPoisonEnabled = config.getBoolean("vanillaPotionPoisonEnabled", category + ".toggle", true, "Enables the Poison potion in Alchemy"); - vanillaPotionRegenerationEnabled = config.getBoolean("vanillaPotionRegenerationEnabled", category + ".toggle", true, "Enables the Regeneration potion in Alchemy"); - vanillaPotionNightVisionEnabled = config.getBoolean("vanillaPotionNightVisionEnabled", category + ".toggle", true, "Enables the Night Vision potion in Alchemy"); - vanillaPotionResistanceEnabled = config.getBoolean("vanillaPotionResistanceEnabled", category + ".toggle", true, "Enables the Resistance potion in Alchemy"); - vanillaPotionSaturationEnabled = config.getBoolean("vanillaPotionSaturationEnabled", category + ".toggle", true, "Enables the Saturation potion in Alchemy"); - vanillaPotionSlownessEnabled = config.getBoolean("vanillaPotionSlownessEnabled", category + ".toggle", true, "Enables the Slowness potion in Alchemy"); - vanillaPotionSpeedEnabled = config.getBoolean("vanillaPotionSpeedEnabled", category + ".toggle", true, "Enables the Speed potion in Alchemy"); - vanillaPotionStrengthEnabled = config.getBoolean("vanillaPotionStrengthEnabled", category + ".toggle", true, "Enables the Strength potion in Alchemy"); - vanillaPotionWaterBreathingEnabled = config.getBoolean("vanillaPotionWaterBreathingEnabled", category + ".toggle", true, "Enables the Water Breathing potion in Alchemy"); - vanillaPotionWeaknessEnabled = config.getBoolean("vanillaPotionWeaknessEnabled", category + ".toggle", true, "Enables the Weakness potion in Alchemy"); - - category = "Rituals"; - config.addCustomCategoryComment(category, "Ritual toggling"); - config.setCategoryRequiresMcRestart(category, true); - ritualAnimalGrowth = config.get(category, "ritualAnimalGrowth", true).getBoolean(); - ritualContainment = config.get(category, "ritualContainment", true).getBoolean(); - ritualCrushing = config.get(category, "ritualCrushing", true).getBoolean(); - ritualExpulsion = config.get(category, "ritualExpulsion", true).getBoolean(); - ritualFeatheredKnife = config.get(category, "ritualFeatheredKnife", true).getBoolean(); - ritualFullStomach = config.get(category, "ritualFullStomach", true).getBoolean(); - ritualGreenGrove = config.get(category, "ritualGreenGrove", true).getBoolean(); - ritualHarvest = config.get(category, "ritualHarvest", true).getBoolean(); - ritualInterdiction = config.get(category, "ritualInterdiction", true).getBoolean(); - ritualJumping = config.get(category, "ritualJumping", true).getBoolean(); - ritualLava = config.get(category, "ritualLava", true).getBoolean(); - ritualMagnetic = config.get(category, "ritualMagnetic", true).getBoolean(); - ritualRegeneration = config.get(category, "ritualRegeneration", true).getBoolean(); - ritualSpeed = config.get(category, "ritualSpeed", true).getBoolean(); - ritualSuppression = config.get(category, "ritualSuppression", true).getBoolean(); - ritualWater = config.get(category, "ritualWater", true).getBoolean(); - ritualWellOfSuffering = config.get(category, "ritualWellOfSuffering", true).getBoolean(); - ritualZephyr = config.get(category, "ritualZephyr", true).getBoolean(); - ritualUpgradeRemove = config.get(category, "ritualRemove", true).getBoolean(); - ritualArmourEvolve = config.get(category, "ritualArmourEvolve", true).getBoolean(); - ritualForsakenSoul = config.get(category, "ritualForsakenSoul", true).getBoolean(); - ritualCrystalHarvest = config.get(category, "ritualCrystalHarvest", true).getBoolean(); - - cobblestoneRitual = config.get(category, "ritualCobblestone", true).getBoolean(); - placerRitual = config.get(category, "ritualPlacer", true).getBoolean(); - fellingRitual = config.get(category, "ritualFelling", true).getBoolean(); - pumpRitual = config.get(category, "ritualPump", true).getBoolean(); - altarBuilderRitual = config.get(category, "ritualAltarBuilder", true).getBoolean(); - portalRitual = config.get(category, "ritualPortal", true).getBoolean(); - meteorRitual = config.get(category, "ritualMeteor", true).getBoolean(); - downgradeRitual = config.get(category, "ritualDowngrade", true).getBoolean(); - - category = "Rituals.Imperfect"; - imperfectRitualNight = config.get(category, "imperfectRitualNight", true).getBoolean(); - imperfectRitualRain = config.get(category, "imperfectRitualRain", true).getBoolean(); - imperfectRitualResistance = config.get(category, "imperfectRitualResistance", true).getBoolean(); - imperfectRitualZombie = config.get(category, "imperfectRitualZombie", true).getBoolean(); - - category = "General"; - config.addCustomCategoryComment(category, "General settings"); - BloodMagicAPI.loggingEnabled = config.getBoolean("enableLogging", category, true, "Allows logging information to the console. Fatal errors will bypass this"); - sacrificialPackConversion = config.getInt("sacrificialPackConversion", category, 20, 0, 100, "Base multiplier for the Coat of Arms. DamageDealt * sacrificialPackConversion"); - sacrificialDaggerDamage = config.getInt("sacrificialDaggerDamage", category, 2, 0, 10000, "Damage done from using the Sacrificial Dagger"); - sacrificialDaggerConversion = config.getInt("sacrificialDaggerConversion", category, 100, 0, 10000, "Amount of LP received per damage point (not heart!)"); - - category = "Client"; - config.addCustomCategoryComment(category, "Client only settings"); - alwaysRenderRoutingLines = config.getBoolean("alwaysRenderRoutingLines", category, false, "Always renders the beams between routing nodes. If false, only renders while a Node Router is being held."); - invisibleSpectralBlocks = config.get(category, "invisibleSpectralBlocks", true, "Spectral Blocks (Used by the Suppression Sigil to store fluids) will not render at all. If false, a see through texture will render. [default: true]").setRequiresMcRestart(true).getBoolean(); - sigilHoldingSkipsEmptySlots = config.getBoolean("sigilHoldingSkipsEmptySlots", category, false, "The Sigil of Holding will skip empty sigil slots if set to true."); - - category = "Compatibility"; - config.addCustomCategoryComment(category, "Compatibility settings"); - wailaAltarDisplayMode = config.getInt("wailaAltarDisplayMode", category + ".waila", 1, 0, 2, "The mode for the Waila display on Blood Altars.\n0 - Always display information\n1 - Only display when Divination/Seer sigil is in hand.\n2 - Only display when Divination/Seer sigil is in inventory"); - thaumcraftGogglesUpgrade = config.getBoolean("thaumcraftGogglesUpgrade", category + ".thaumcraft", true, "Allows the Living Helmet to be upgraded with Goggles of Revealing in an Anvil."); - ignoreCompressionSpamAddedByCompression = config.getBoolean("ignoreCompressionSpamAddedByCompression", category + ".compression", true, "Compression decided to add a storage recipe for every item and block in the game. This will make the Sigil of Compression ignore those recipes so your game will actually load in a decent amount of time."); - - category = "Meteors"; - config.addCustomCategoryComment(category, "Meteor settings"); - - config.save(); - } - - private static void buildBlacklist(String[] blacklisting, List blockBlacklist) { - blockBlacklist.clear(); - - for (String blockSet : blacklisting) { - String[] blockData = blockSet.split(":"); - - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0], blockData[1])); - int meta = 0; - - if (blockData.length == 3) { - // Check if it's an int, if so, parse it. If not, set meta to 0 - // to avoid crashing. - if (Utils.isInteger(blockData[2])) - meta = Integer.parseInt(blockData[2]); - else if (blockData[2].equals("*")) - meta = OreDictionary.WILDCARD_VALUE; - else - meta = 0; - } - - blockBlacklist.add(new BlockStack(block, meta)); - } - } - - private static void buildEntitySacrificeValues() { - entitySacrificeValues.clear(); - - for (String entityData : entitySacrificeValuesList) { - String[] split = entityData.split(";"); - - int amount = 500; - if (Utils.isInteger(split[1])) - amount = Integer.parseInt(split[1]); - - if (!entitySacrificeValues.containsKey(split[0])) - entitySacrificeValues.put(split[0], amount); + ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values + MeteorConfigHandler.handleMeteors(false); // Reload meteors } } } diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java index 4691fadc..6c1fdc9d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java @@ -61,7 +61,7 @@ public class PlayerSacrificeHelper { if (health > maxHealth / 10.0) { float sacrificedHealth = health - maxHealth / 10.0f; - int lpAdded = (int) (sacrificedHealth * ConfigHandler.sacrificialDaggerConversion * getModifier(amount)); + int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion * getModifier(amount)); SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); if (MinecraftForge.EVENT_BUS.post(evt)) diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java index de4c9f77..b88d64b6 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java @@ -69,7 +69,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } @Override - public void addSacrifice(@Nonnull ResourceLocation entityId) { + public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { if (!sacrifice.contains(entityId)) sacrifice.add(entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java index 161ee241..e9d57594 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.api_impl; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.altar.EnumAltarComponent; import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; +import WayofTime.bloodmagic.apiv2.IBloodMagicBlacklist; import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; @@ -11,8 +13,14 @@ import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.EntityEntry; +import net.minecraftforge.fml.common.registry.ForgeRegistries; @BloodMagicPlugin public class BloodMagicCorePlugin implements IBloodMagicPlugin { @@ -32,10 +40,13 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.DEMON_CRYSTAL); api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INVERSION_PILLAR); api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INVERSION_PILLAR); - api.getBlacklist().addSacrifice(new ResourceLocation("armor_stand")); - api.getBlacklist().addSacrifice(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); + api.getBlacklist().addWellOfSuffering(new ResourceLocation("armor_stand")); + api.getBlacklist().addWellOfSuffering(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); - // TODO - Register things from config + api.setSacrificialValue(new ResourceLocation("armor_stand"), 0); + api.setSacrificialValue(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), 0); + + handleConfigValues(api); // Add standard blocks for altar components api.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), EnumAltarComponent.GLOWSTONE.name()); @@ -56,4 +67,79 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(api.getRecipeRegistrar()); RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); } + + private static void handleConfigValues(IBloodMagicAPI api) { + for (String value : ConfigHandler.values.sacrificialValues) { + String[] split = value.split(";"); + if (split.length != 2) // Not valid format + continue; + + api.setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); + } + + for (String value : ConfigHandler.blacklist.teleposer) { + EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); + if (entityEntry == null) { // It's not an entity (or at least not a valid one), so let's try a block. + String[] blockData = value.split("\\["); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); + if (block == Blocks.AIR || block == null) // Not a valid block either + continue; + + if (blockData.length > 1) { // We have properties listed, so let's build a state. + api.getBlacklist().addTeleposer(parseState(value)); + continue; + } + + api.getBlacklist().addTeleposer(block); + continue; + } + + api.getBlacklist().addTeleposer(entityEntry.getRegistryName()); + } + + for (String value : ConfigHandler.blacklist.transposer) { + String[] blockData = value.split("\\["); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); + if (block == Blocks.AIR || block == null) // Not a valid block + continue; + + if (blockData.length > 1) { // We have properties listed, so let's build a state. + api.getBlacklist().addTeleposer(parseState(value)); + continue; + } + + api.getBlacklist().addTeleposer(block); + } + + for (String value : ConfigHandler.blacklist.wellOfSuffering) { + EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); + if (entityEntry == null) // Not a valid entity + continue; + + api.getBlacklist().addWellOfSuffering(entityEntry.getRegistryName()); + } + } + + private static IBlockState parseState(String blockInfo) { + String[] split = blockInfo.split("\\["); + split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state + + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block + if (block == Blocks.AIR) + return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data + + BlockStateContainer blockState = block.getBlockState(); + IBlockState returnState = blockState.getBaseState(); + + // Force our values into the state + String[] stateValues = split[1].split(","); // Splits up each value + for (String value : stateValues) { + String[] valueSplit = value.split("="); // Separates property and value + IProperty property = blockState.getProperty(valueSplit[0]); + if (property != null) + returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state + } + + return returnState; + } } diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java index 13852efd..f1f1b0ad 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java @@ -22,5 +22,5 @@ public interface IBloodMagicBlacklist { void addGreenGrove(@Nonnull Block block); - void addSacrifice(@Nonnull ResourceLocation entityId); + void addWellOfSuffering(@Nonnull ResourceLocation entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 7a001100..6aa45663 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -68,7 +68,7 @@ public class BlockSpectral extends Block implements IVariantProvider { @Override public EnumBlockRenderType getRenderType(IBlockState state) { - return ConfigHandler.invisibleSpectralBlocks ? EnumBlockRenderType.INVISIBLE : EnumBlockRenderType.MODEL; + return ConfigHandler.client.invisibleSpectralBlocks ? EnumBlockRenderType.INVISIBLE : EnumBlockRenderType.MODEL; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java deleted file mode 100644 index 9013d8ea..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.client.gui.config; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.fml.client.config.GuiConfig; -import net.minecraftforge.fml.client.config.IConfigElement; - -import java.util.ArrayList; -import java.util.List; - -public class ConfigGui extends GuiConfig { - - public ConfigGui(GuiScreen parentScreen) { - super(parentScreen, getConfigElements(parentScreen), BloodMagic.MODID, false, false, "BloodMagic Configuration"); - } - - @SuppressWarnings("rawtypes") - private static List getConfigElements(GuiScreen parent) { - List list = new ArrayList(); - - // adds sections declared in ConfigHandler. toLowerCase() is used - // because the configuration class automatically does this, so must we. - list.add(new ConfigElement(ConfigHandler.config.getCategory("Potions".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Client".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Compatibility".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Teleposer Blacklist".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Well of Suffering Blacklist".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Item/Block Blacklisting".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("General".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Rituals".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Blood Altar Sacrificial Values".toLowerCase()))); - - return list; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java deleted file mode 100644 index 2f968574..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -package WayofTime.bloodmagic.client.gui.config; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.fml.client.IModGuiFactory; - -import java.util.Set; - -public class ConfigGuiFactory implements IModGuiFactory { - @Override - public void initialize(Minecraft minecraftInstance) { - - } - - @Override - public boolean hasConfigGui() { - return false; - } - - @Override - public GuiScreen createConfigGui(GuiScreen parentScreen) { - return new ConfigGui(parentScreen); - } - - @Override - public Set runtimeGuiCategories() { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index 9a94e561..083de767 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -24,7 +24,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer connectionList = tileNode.getConnected(); for (BlockPos wantedPos : connectionList) { BlockPos offsetPos = wantedPos.subtract(tileNode.getPos()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 8affc801..9e3ddf39 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -27,16 +27,6 @@ import java.util.List; * in ImLookingAtBlood by Pokefenn. */ public class DataProviderBloodAltar implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) @@ -45,24 +35,21 @@ public class DataProviderBloodAltar implements IWailaDataProvider { boolean hasSigil = false; boolean hasSeer = false; - switch (ConfigHandler.wailaAltarDisplayMode) { - case 0: { + switch (ConfigHandler.compat.wailaAltarDisplayMode) { + case ALWAYS: { hasSigil = hasSeer = true; break; } - case 1: { + case SIGIL_HELD: { hasSeer = holdingSeerSigil(accessor.getPlayer()); hasSigil = hasSeer || holdingDivinationSigil(accessor.getPlayer()); break; } - case 2: { + case SIGIL_CONTAINED: { hasSeer = hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), accessor.getPlayer()); hasSigil = hasSeer || hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), accessor.getPlayer()); break; } - default: { - break; - } } if (!hasSeer && !hasSigil) @@ -93,11 +80,6 @@ public class DataProviderBloodAltar implements IWailaDataProvider { return currenttip; } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { if (te != null) @@ -127,7 +109,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { if (player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination) return true; - if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination) + if (!player.getHeldItemOffhand().isEmpty() && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination) return true; return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index ba46d284..1444de0e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -98,7 +98,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider { return new ActionResult(EnumActionResult.SUCCESS, stack); } - int lpAdded = ConfigHandler.sacrificialDaggerConversion * ConfigHandler.sacrificialDaggerDamage; + int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; RayTraceResult rayTrace = rayTrace(world, player, false); if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { @@ -109,14 +109,14 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider { } if (!player.capabilities.isCreativeMode) { - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, ConfigHandler.sacrificialDaggerDamage, lpAdded); + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2, lpAdded); if (MinecraftForge.EVENT_BUS.post(evt)) return super.onItemRightClick(world, player, hand); if (evt.shouldDrainHealth) { player.hurtResistantTime = 0; player.attackEntityFrom(BloodMagicAPI.damageSource, 0.001F); - player.setHealth(Math.max(player.getHealth() - ConfigHandler.sacrificialDaggerDamage, 0.0001f)); + player.setHealth(Math.max(player.getHealth() - 2, 0.0001f)); if (player.getHealth() <= 0.001f) { player.onDeath(BloodMagicAPI.damageSource); player.setHealth(0); diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index 1c482c0d..e5aadc77 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -63,7 +63,7 @@ public class MeteorConfigHandler { reader.close(); } - if (checkNewVersion && ConfigHandler.config.getBoolean("resyncOnVersionChange", "Meteors", true, "Should the default meteors be regenerated if the mod has updated them")) { + if (checkNewVersion && ConfigHandler.values.shouldResyncMeteors) { Set discoveredDefaults = Sets.newHashSet(); // Check existing defaults for new version @@ -93,8 +93,6 @@ public class MeteorConfigHandler { } catch (Exception e) { e.printStackTrace(); } - - ConfigHandler.config.save(); } private static List> getDefaultMeteors() { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 3a61373e..6427eee3 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.alchemyArray.*; import WayofTime.bloodmagic.api.compress.CompressionRegistry; import WayofTime.bloodmagic.api.iface.ISigil; @@ -45,6 +44,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; @@ -464,7 +464,7 @@ public class ModRecipes { private static void setupDir() { if (RECIPE_DIR == null) { - RECIPE_DIR = ConfigHandler.config.getConfigFile().toPath().resolve("../recipes/").toFile(); + RECIPE_DIR = new File(Loader.instance().getConfigDir(), "bloodmagic/recipes"); } if (!RECIPE_DIR.exists()) { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index ad026e23..3d0def9a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -42,7 +42,6 @@ public class ModRituals { public static Ritual forsakenSoulRitual; public static Ritual crystalHarvestRitual; - // public static Ritual cobblestoneRitual; public static Ritual placerRitual; public static Ritual fellingRitual; public static Ritual pumpRitual; @@ -60,68 +59,64 @@ public class ModRituals { public static void initRituals() { waterRitual = new RitualWater(); - RitualRegistry.registerRitual(waterRitual, ConfigHandler.ritualWater); + RitualRegistry.registerRitual(waterRitual, ConfigHandler.rituals.ritualWater); lavaRitual = new RitualLava(); - RitualRegistry.registerRitual(lavaRitual, ConfigHandler.ritualLava); + RitualRegistry.registerRitual(lavaRitual, ConfigHandler.rituals.ritualLava); greenGroveRitual = new RitualGreenGrove(); - RitualRegistry.registerRitual(greenGroveRitual, ConfigHandler.ritualGreenGrove); + RitualRegistry.registerRitual(greenGroveRitual, ConfigHandler.rituals.ritualGreenGrove); jumpRitual = new RitualJumping(); - RitualRegistry.registerRitual(jumpRitual, ConfigHandler.ritualJumping); + RitualRegistry.registerRitual(jumpRitual, ConfigHandler.rituals.ritualJumping); sufferingRitual = new RitualWellOfSuffering(); - RitualRegistry.registerRitual(sufferingRitual, ConfigHandler.ritualWellOfSuffering); + RitualRegistry.registerRitual(sufferingRitual, ConfigHandler.rituals.ritualWellOfSuffering); featheredKnifeRitual = new RitualFeatheredKnife(); - RitualRegistry.registerRitual(featheredKnifeRitual, ConfigHandler.ritualFeatheredKnife); + RitualRegistry.registerRitual(featheredKnifeRitual, ConfigHandler.rituals.ritualFeatheredKnife); regenerationRitual = new RitualRegeneration(); - RitualRegistry.registerRitual(regenerationRitual, ConfigHandler.ritualRegeneration); + RitualRegistry.registerRitual(regenerationRitual, ConfigHandler.rituals.ritualRegeneration); animalGrowthRitual = new RitualAnimalGrowth(); - RitualRegistry.registerRitual(animalGrowthRitual, ConfigHandler.ritualAnimalGrowth); + RitualRegistry.registerRitual(animalGrowthRitual, ConfigHandler.rituals.ritualAnimalGrowth); harvestRitual = new RitualHarvest(); - RitualRegistry.registerRitual(harvestRitual, ConfigHandler.ritualHarvest); + RitualRegistry.registerRitual(harvestRitual, ConfigHandler.rituals.ritualHarvest); initHarvestHandlers(); magneticRitual = new RitualMagnetic(); - RitualRegistry.registerRitual(magneticRitual, ConfigHandler.ritualMagnetic); + RitualRegistry.registerRitual(magneticRitual, ConfigHandler.rituals.ritualMagnetic); crushingRitual = new RitualCrushing(); - RitualRegistry.registerRitual(crushingRitual, ConfigHandler.ritualCrushing); + RitualRegistry.registerRitual(crushingRitual, ConfigHandler.rituals.ritualCrushing); stomachRitual = new RitualFullStomach(); - RitualRegistry.registerRitual(stomachRitual, ConfigHandler.ritualFullStomach); + RitualRegistry.registerRitual(stomachRitual, ConfigHandler.rituals.ritualFullStomach); interdictionRitual = new RitualInterdiction(); - RitualRegistry.registerRitual(interdictionRitual, ConfigHandler.ritualInterdiction); + RitualRegistry.registerRitual(interdictionRitual, ConfigHandler.rituals.ritualInterdiction); containmentRitual = new RitualContainment(); - RitualRegistry.registerRitual(containmentRitual, ConfigHandler.ritualContainment); + RitualRegistry.registerRitual(containmentRitual, ConfigHandler.rituals.ritualContainment); speedRitual = new RitualSpeed(); - RitualRegistry.registerRitual(speedRitual, ConfigHandler.ritualSpeed); + RitualRegistry.registerRitual(speedRitual, ConfigHandler.rituals.ritualSpeed); suppressionRitual = new RitualSuppression(); - RitualRegistry.registerRitual(suppressionRitual, ConfigHandler.ritualSuppression); + RitualRegistry.registerRitual(suppressionRitual, ConfigHandler.rituals.ritualSuppression); zephyrRitual = new RitualZephyr(); - RitualRegistry.registerRitual(zephyrRitual, ConfigHandler.ritualZephyr); + RitualRegistry.registerRitual(zephyrRitual, ConfigHandler.rituals.ritualZephyr); expulsionRitual = new RitualExpulsion(); - RitualRegistry.registerRitual(expulsionRitual, ConfigHandler.ritualExpulsion); + RitualRegistry.registerRitual(expulsionRitual, ConfigHandler.rituals.ritualExpulsion); upgradeRemoveRitual = new RitualUpgradeRemove(); - RitualRegistry.registerRitual(upgradeRemoveRitual, ConfigHandler.ritualUpgradeRemove); + RitualRegistry.registerRitual(upgradeRemoveRitual, ConfigHandler.rituals.ritualUpgradeRemove); armourEvolveRitual = new RitualArmourEvolve(); - RitualRegistry.registerRitual(armourEvolveRitual, ConfigHandler.ritualArmourEvolve); + RitualRegistry.registerRitual(armourEvolveRitual, ConfigHandler.rituals.ritualArmourEvolve); forsakenSoulRitual = new RitualForsakenSoul(); - RitualRegistry.registerRitual(forsakenSoulRitual, ConfigHandler.ritualForsakenSoul); + RitualRegistry.registerRitual(forsakenSoulRitual, ConfigHandler.rituals.ritualForsakenSoul); crystalHarvestRitual = new RitualCrystalHarvest(); - RitualRegistry.registerRitual(crystalHarvestRitual, ConfigHandler.ritualCrystalHarvest); - -// cobblestoneRitual = new RitualCobblestone(); -// RitualRegistry.registerRitual(cobblestoneRitual, ConfigHandler.cobblestoneRitual); + RitualRegistry.registerRitual(crystalHarvestRitual, ConfigHandler.rituals.ritualCrystalHarvest); placerRitual = new RitualPlacer(); - RitualRegistry.registerRitual(placerRitual, ConfigHandler.placerRitual); + RitualRegistry.registerRitual(placerRitual, ConfigHandler.rituals.ritualPlacer); fellingRitual = new RitualFelling(); - RitualRegistry.registerRitual(fellingRitual, ConfigHandler.fellingRitual); + RitualRegistry.registerRitual(fellingRitual, ConfigHandler.rituals.ritualFelling); pumpRitual = new RitualPump(); - RitualRegistry.registerRitual(pumpRitual, ConfigHandler.pumpRitual); + RitualRegistry.registerRitual(pumpRitual, ConfigHandler.rituals.ritualPump); altarBuilderRitual = new RitualAltarBuilder(); - RitualRegistry.registerRitual(altarBuilderRitual, ConfigHandler.altarBuilderRitual); + RitualRegistry.registerRitual(altarBuilderRitual, ConfigHandler.rituals.ritualAltarBuilder); portalRitual = new RitualPortal(); - RitualRegistry.registerRitual(portalRitual, ConfigHandler.portalRitual); + RitualRegistry.registerRitual(portalRitual, ConfigHandler.rituals.ritualPortal); meteorRitual = new RitualMeteor(); - RitualRegistry.registerRitual(meteorRitual, ConfigHandler.meteorRitual); - + RitualRegistry.registerRitual(meteorRitual, ConfigHandler.rituals.ritualMeteor); downgradeRitual = new RitualLivingArmourDowngrade(); - RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.downgradeRitual); + RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.rituals.ritualDowngrade); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 250, 0.5); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 25, 0.05); @@ -129,13 +124,13 @@ public class ModRituals { public static void initImperfectRituals() { imperfectNight = new ImperfectRitualNight(); - ImperfectRitualRegistry.registerRitual(imperfectNight, ConfigHandler.imperfectRitualNight); + ImperfectRitualRegistry.registerRitual(imperfectNight, ConfigHandler.rituals.imperfect.imperfectRitualNight); imperfectRain = new ImperfectRitualRain(); - ImperfectRitualRegistry.registerRitual(imperfectRain, ConfigHandler.imperfectRitualRain); + ImperfectRitualRegistry.registerRitual(imperfectRain, ConfigHandler.rituals.imperfect.imperfectRitualRain); imperfectResistance = new ImperfectRitualResistance(); - ImperfectRitualRegistry.registerRitual(imperfectResistance, ConfigHandler.imperfectRitualResistance); + ImperfectRitualRegistry.registerRitual(imperfectResistance, ConfigHandler.rituals.imperfect.imperfectRitualResistance); imperfectZombie = new ImperfectRitualZombie(); - ImperfectRitualRegistry.registerRitual(imperfectZombie, ConfigHandler.imperfectRitualZombie); + ImperfectRitualRegistry.registerRitual(imperfectZombie, ConfigHandler.rituals.imperfect.imperfectRitualZombie); } public static void initHarvestHandlers() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index 60dce160..38a5b4fb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -152,7 +152,7 @@ public class RitualFeatheredKnife extends Ritual { player.setHealth(health - sacrificedHealth); - tileAltar.sacrificialDaggerCall((int) (ConfigHandler.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false); + tileAltar.sacrificialDaggerCall((int) (ConfigHandler.values.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false); totalEffects++; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index c92e1267..8c9aa9ee 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -311,7 +311,7 @@ public class ClientHandler { public static void cycleSigil(ItemStack stack, EntityPlayer player, int dWheel) { int mode = dWheel; - if (!ConfigHandler.sigilHoldingSkipsEmptySlots) { + if (!ConfigHandler.client.sigilHoldingSkipsEmptySlots) { mode = ItemSigilHolding.getCurrentItemOrdinal(stack); mode = dWheel < 0 ? ItemSigilHolding.next(mode) : ItemSigilHolding.prev(mode); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 366c9c1f..f47c2065 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.AltarCraftedEvent; @@ -51,19 +50,20 @@ public class CraftingHandler { // Handles crafting of: Revealing Upgrade Tome, Elytra Upgrade Tome, Combining Upgrade Tomes, Setting Upgrade for Trainer @SubscribeEvent public void onAnvil(AnvilUpdateEvent event) { - if (ConfigHandler.thaumcraftGogglesUpgrade) { - if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { - ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - output = NBTHelper.checkNBT(output); - ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.revealing"); - ItemHelper.LivingUpgrades.setLevel(output, 1); - event.setCost(1); - - event.setOutput(output); - - return; - } - } + // TODO - Azanor come back :( +// if (ConfigHandler.thaumcraftGogglesUpgrade) { +// if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { +// ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); +// output = NBTHelper.checkNBT(output); +// ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.revealing"); +// ItemHelper.LivingUpgrades.setLevel(output, 1); +// event.setCost(1); +// +// event.setOutput(output); +// +// return; +// } +// } if (event.getLeft().getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { if (event.getRight().getItem() == Items.NAME_TAG) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 74d75c62..defb55fa 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -186,7 +186,7 @@ public class GenericHandler { boolean shouldSyphon = pack.getStoredLP(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) < pack.CAPACITY; float damageDone = event.getEntityLiving().getHealth() < event.getAmount() ? event.getAmount() - event.getEntityLiving().getHealth() : event.getAmount(); - int totalLP = Math.round(damageDone * ConfigHandler.sacrificialPackConversion); + int totalLP = Math.round(damageDone * ConfigHandler.values.coatOfArmsConversion); if (shouldSyphon) ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST), totalLP, pack.CAPACITY); From 59df51a66b359e8ce4b19ea67bbc68eb33f796d4 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 19:00:09 -0700 Subject: [PATCH 003/493] Rename meteor files to lowercase --- .../bloodmagic/meteor/MeteorConfigHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index e5aadc77..c608e061 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -136,14 +136,14 @@ public class MeteorConfigHandler { Meteor diamondMeteor = new Meteor(new ItemStack(Blocks.DIAMOND_BLOCK), diamondMeteorList, 10, 3); diamondMeteor.setVersion(3); - holders.add(Pair.of("IronMeteor", ironMeteor)); - DEFAULT_METEORS.put("IronMeteor", ironMeteor); + holders.add(Pair.of("iron", ironMeteor)); + DEFAULT_METEORS.put("iron", ironMeteor); - holders.add(Pair.of("GoldMeteor", goldMeteor)); - DEFAULT_METEORS.put("GoldMeteor", goldMeteor); + holders.add(Pair.of("gold", goldMeteor)); + DEFAULT_METEORS.put("gold", goldMeteor); - holders.add(Pair.of("DiamondMeteor", diamondMeteor)); - DEFAULT_METEORS.put("DiamondMeteor", diamondMeteor); + holders.add(Pair.of("diamond", diamondMeteor)); + DEFAULT_METEORS.put("diamond", diamondMeteor); return holders; } From c23d577c3301fa18f793f1acacaf0ec9c47cf089 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 20:45:11 -0700 Subject: [PATCH 004/493] JSON recipes, much to the displeasure of Elucent feelsgoodman --- .../core/RegistrarBloodMagicRecipes.java | 24 +- .../core/recipe/IngredientSoulGem.java | 4 - .../bloodmagic/item/ItemBloodOrb.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 300 ------------------ .../assets/bloodmagic/recipes/_constants.json | 128 ++++++++ .../recipes/activation_crystal.json | 16 + .../bloodmagic/recipes/alchemy_table.json | 29 ++ .../assets/bloodmagic/recipes/altar.json | 26 ++ .../recipes/base_item_filter_0.json | 24 ++ .../recipes/base_item_filter_1.json | 24 ++ .../recipes/base_item_filter_2.json | 24 ++ .../recipes/base_item_filter_3.json | 24 ++ .../blood_rune/blood_rune_acceleration.json | 32 ++ .../blood_rune/blood_rune_augcapacity.json | 32 ++ .../recipes/blood_rune/blood_rune_blank.json | 25 ++ .../blood_rune/blood_rune_capacity.json | 28 ++ .../blood_rune/blood_rune_charging.json | 32 ++ .../blood_rune/blood_rune_displacement.json | 28 ++ .../recipes/blood_rune/blood_rune_orb.json | 29 ++ .../blood_rune/blood_rune_sacrifice.json | 32 ++ .../blood_rune/blood_rune_selfsacrifice.json | 32 ++ .../recipes/blood_rune/blood_rune_speed.json | 28 ++ .../recipes/blood_tank/blood_tank_0.json | 25 ++ .../recipes/blood_tank/blood_tank_1.json | 26 ++ .../recipes/blood_tank/blood_tank_10.json | 26 ++ .../recipes/blood_tank/blood_tank_11.json | 26 ++ .../recipes/blood_tank/blood_tank_12.json | 26 ++ .../recipes/blood_tank/blood_tank_13.json | 26 ++ .../recipes/blood_tank/blood_tank_14.json | 26 ++ .../recipes/blood_tank/blood_tank_15.json | 26 ++ .../recipes/blood_tank/blood_tank_2.json | 26 ++ .../recipes/blood_tank/blood_tank_3.json | 26 ++ .../recipes/blood_tank/blood_tank_4.json | 26 ++ .../recipes/blood_tank/blood_tank_5.json | 26 ++ .../recipes/blood_tank/blood_tank_6.json | 26 ++ .../recipes/blood_tank/blood_tank_7.json | 26 ++ .../recipes/blood_tank/blood_tank_8.json | 26 ++ .../recipes/blood_tank/blood_tank_9.json | 26 ++ .../decorative_brick_bloodstone_brick.json | 18 ++ .../decorative_brick_bloodstone_tile.json | 17 + .../demon_brick_1_brick1_corrosive.json | 18 ++ .../demon_brick_1_brick1_destructive.json | 18 ++ .../demon_decor/demon_brick_1_brick1_raw.json | 18 ++ .../demon_brick_1_brick1_steadfast.json | 18 ++ .../demon_brick_1_brick1_vengeful.json | 18 ++ .../demon_brick_2_smallbrick_corrosive.json | 17 + .../demon_brick_2_smallbrick_destructive.json | 17 + .../demon_brick_2_smallbrick_raw.json | 17 + .../demon_brick_2_smallbrick_steadfast.json | 17 + .../demon_brick_2_smallbrick_vengeful.json | 17 + .../demon_brick_2_tile_corrosive.json | 23 ++ .../demon_brick_2_tile_destructive.json | 23 ++ .../demon_decor/demon_brick_2_tile_raw.json | 23 ++ .../demon_brick_2_tile_steadfast.json | 23 ++ .../demon_brick_2_tile_vengeful.json | 23 ++ .../demon_brick_2_tilespecial_corrosive.json | 27 ++ ...demon_brick_2_tilespecial_destructive.json | 27 ++ .../demon_brick_2_tilespecial_raw.json | 27 ++ .../demon_brick_2_tilespecial_steadfast.json | 27 ++ .../demon_brick_2_tilespecial_vengeful.json | 27 ++ .../demon_extras_stone_corrosive.json | 38 +++ .../demon_extras_stone_destructive.json | 38 +++ .../demon_decor/demon_extras_stone_raw.json | 38 +++ .../demon_extras_stone_steadfast.json | 38 +++ .../demon_extras_stone_vengeful.json | 38 +++ .../demon_decor/demon_light_corrosive.json | 22 ++ .../demon_decor/demon_light_destructive.json | 22 ++ .../recipes/demon_decor/demon_light_raw.json | 22 ++ .../demon_decor/demon_light_steadfast.json | 22 ++ .../demon_decor/demon_light_vengeful.json | 22 ++ .../demon_decor/demon_pillar_1_corrosive.json | 19 ++ .../demon_pillar_1_destructive.json | 19 ++ .../demon_decor/demon_pillar_1_raw.json | 19 ++ .../demon_decor/demon_pillar_1_steadfast.json | 19 ++ .../demon_decor/demon_pillar_1_vengeful.json | 19 ++ .../demon_decor/demon_pillar_2_corrosive.json | 23 ++ .../demon_pillar_2_destructive.json | 23 ++ .../demon_decor/demon_pillar_2_raw.json | 23 ++ .../demon_decor/demon_pillar_2_steadfast.json | 23 ++ .../demon_decor/demon_pillar_2_vengeful.json | 23 ++ .../demon_pillar_cap_1_corrosive.json | 18 ++ .../demon_decor/demon_pillar_cap_1_raw.json | 18 ++ .../demon_pillar_cap_2_destructive.json | 18 ++ .../demon_pillar_cap_2_vengeful.json | 18 ++ .../demon_pillar_cap_3_steadfast.json | 17 + .../demon_decor/demon_stairs_1_corrosive.json | 19 ++ .../demon_decor/demon_stairs_1_raw.json | 19 ++ .../demon_stairs_2_destructive.json | 19 ++ .../demon_decor/demon_stairs_2_vengeful.json | 19 ++ .../demon_decor/demon_stairs_3_steadfast.json | 18 ++ .../demon_wall_1_brick_corrosive.json | 18 ++ .../demon_wall_1_brick_destructive.json | 18 ++ .../demon_decor/demon_wall_1_brick_raw.json | 18 ++ .../demon_wall_1_brick_steadfast.json | 18 ++ .../demon_wall_1_brick_vengeful.json | 18 ++ .../demon_wall_1_large_corrosive.json | 18 ++ .../demon_wall_1_large_destructive.json | 18 ++ .../demon_decor/demon_wall_1_large_raw.json | 18 ++ .../demon_wall_1_large_steadfast.json | 18 ++ .../demon_wall_1_large_vengeful.json | 18 ++ .../demon_wall_1_smallbrick_corrosive.json | 18 ++ .../demon_wall_1_smallbrick_destructive.json | 18 ++ .../demon_wall_1_smallbrick_raw.json | 18 ++ .../demon_wall_1_smallbrick_steadfast.json | 18 ++ .../demon_wall_1_smallbrick_vengeful.json | 18 ++ .../bloodmagic/recipes/experience_tome.json | 33 ++ .../bloodmagic/recipes/incense_altar.json | 27 ++ .../bloodmagic/recipes/lava_crystal.json | 29 ++ .../bloodmagic/recipes/mimic_nohitbox.json | 27 ++ .../bloodmagic/recipes/mimic_solidclear.json | 30 ++ .../bloodmagic/recipes/mimic_solidlight.json | 33 ++ .../bloodmagic/recipes/mimic_solidopaque.json | 30 ++ .../bloodmagic/recipes/pack_sacrifice.json | 29 ++ .../recipes/pack_self_sacrifice.json | 29 ++ .../recipes/path/path_obsidian.json | 26 ++ .../recipes/path/path_obsidiantile.json | 26 ++ .../bloodmagic/recipes/path/path_stone.json | 26 ++ .../recipes/path/path_stonetile.json | 26 ++ .../bloodmagic/recipes/path/path_wood.json | 26 ++ .../recipes/path/path_woodtile.json | 26 ++ .../recipes/path/path_wornstone.json | 30 ++ .../recipes/path/path_wornstonetile.json | 26 ++ .../recipes/ritual_controller_imperfect.json | 24 ++ .../recipes/ritual_controller_inverted.json | 20 ++ .../recipes/ritual_controller_master.json | 25 ++ .../recipes/ritual_controller_master_alt.json | 13 + .../bloodmagic/recipes/ritual_diviner_0.json | 36 +++ .../bloodmagic/recipes/ritual_diviner_1.json | 26 ++ .../bloodmagic/recipes/ritual_reader.json | 27 ++ .../recipes/ritual_stone_blank.json | 26 ++ .../recipes/ritual_stone_reset.json | 13 + .../recipes/sacrificial_dagger.json | 23 ++ .../assets/bloodmagic/recipes/soul_forge.json | 25 ++ .../assets/bloodmagic/recipes/soul_snare.json | 24 ++ .../assets/bloodmagic/recipes/teleposer.json | 23 ++ .../recipes/teleposition_focus_2.json | 17 + .../recipes/teleposition_focus_3.json | 17 + .../bloodmagic/recipes/upgrade_trainer.json | 27 ++ 138 files changed, 3297 insertions(+), 309 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java create mode 100644 src/main/resources/assets/bloodmagic/recipes/_constants.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/activation_crystal.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/alchemy_table.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/altar.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/experience_tome.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/incense_altar.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/lava_crystal.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_stone.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wood.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_reader.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/soul_forge.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/soul_snare.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposer.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 087d7025..49660987 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -4,17 +4,20 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.altar.EnumAltarTier; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api_impl.BloodMagicRecipeRegistrar; import WayofTime.bloodmagic.apiv2.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; +import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -22,13 +25,26 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreIngredient; +import net.minecraftforge.oredict.ShapelessOreRecipe; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class RegistrarBloodMagicRecipes { @SubscribeEvent public static void registerCrafting(RegistryEvent.Register event) { - // TODO - Figure out what recipes still need to be here + for (int i = 0; i < ItemSoulGem.names.length; i++) { + for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { + ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); + ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); + + ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j); + + EnumDemonWillType willType = ((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack); + ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); + ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, crystalStack); + event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); + } + } } public static void registerAltarRecipes(IBloodMagicRecipeRegistrar registrar) { @@ -53,14 +69,14 @@ public class RegistrarBloodMagicRecipes { registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE.ordinal(), 10000, 20, 10); // FOUR - registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.BLOOD_SHARD), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR.ordinal(), 25000, 30, 50); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR.ordinal(), 25000, 30, 50); registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR.ordinal(), 15000, 20, 20); registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR.ordinal(), 2000, 20, 10); registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR.ordinal(), 2000, 10, 10); - registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR.ordinal(), 10000, 20, 10); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR.ordinal(), 10000, 20, 10); // FIVE - registrar.addBloodAltar(new OreIngredient("netherstar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE.ordinal(), 80000, 50, 100); + registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE.ordinal(), 80000, 50, 100); registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java deleted file mode 100644 index 5d63e947..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientSoulGem.java +++ /dev/null @@ -1,4 +0,0 @@ -package WayofTime.bloodmagic.core.recipe; - -public class IngredientSoulGem { -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 46f441da..0b7311a5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -94,7 +94,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab BloodOrb orb = getOrb(stack); if (flag.isAdvanced() && orb != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName())); + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getResourceDomain())); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 6427eee3..85cfb7a8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -5,68 +5,46 @@ import WayofTime.bloodmagic.alchemyArray.*; import WayofTime.bloodmagic.api.compress.CompressionRegistry; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; import WayofTime.bloodmagic.api.recipe.AlchemyTableCustomRecipe; import WayofTime.bloodmagic.api.registry.*; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemComponent; -import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; -import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe; -import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Stopwatch; -import com.google.common.collect.ImmutableMap; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.util.*; import java.util.Map.Entry; public class ModRecipes { - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final Set USED_OD_NAMES = new TreeSet<>(); public static ArrayList addedOreRecipeList = new ArrayList(); static ItemStack mundaneLengtheningStack = ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1); static ItemStack mundanePowerStack = ItemComponent.getStack(ItemComponent.CATALYST_POWER_1); - private static File RECIPE_DIR = null; public static void init() { initOreDict(); addFurnaceRecipes(); -// addCraftingRecipes(); addAltarRecipes(); addAlchemyArrayRecipes(); addSoulForgeRecipes(); @@ -87,123 +65,6 @@ public class ModRecipes { FurnaceRecipes.instance().addSmeltingRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD), new ItemStack(Items.GOLD_INGOT), (float) 0.15); } - public static void addCraftingRecipes() { - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), "i i", "sgs", "sos", 'i', "ingotIron", 's', "stone", 'g', "ingotGold", 'o', "blockIron"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER), "aaa", " ba", "c a", 'a', "blockGlass", 'b', "ingotGold", 'c', "ingotIron"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), "a a", "aba", "cdc", 'a', "stone", 'b', Blocks.FURNACE, 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.PACK_SELF_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', Items.FLINT, 'd', Items.LEATHER_CHESTPLATE, 'e', RegistrarBloodMagicItems.SLATE); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.PACK_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', "ingotIron", 'd', Items.LEATHER_CHESTPLATE, 'e', RegistrarBloodMagicItems.SLATE); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER), "dfd", "ase", "dwd", 'f', EnumRuneType.FIRE.getScribeStack(), 'a', EnumRuneType.AIR.getScribeStack(), 'w', EnumRuneType.WATER.getScribeStack(), 'e', EnumRuneType.EARTH.getScribeStack(), 'd', "gemDiamond", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER, 1, 1), " S ", "tdt", " S ", 'S', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 't', EnumRuneType.DUSK.getScribeStack(), 'd', new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 4, 1), "aa", "aa", 'a', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 16), "stone", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, 1, 1), new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE, 4, 0), "sis", "iri", "sis", 's', "string", 'i', "ingotIron", 'r', "dustRedstone"); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK), "RBR", "G G", "RRR", 'R', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'B', RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 'G', "blockGlass"); - for (int i = 1; i < TileBloodTank.CAPACITIES.length; i++) - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK, 1, i), "RBR", "T T", "RRR", 'R', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'B', RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 'T', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK, 1, i - 1)); - - addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 3), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 1)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER), "ggg", "efe", "ggg", 'g', "ingotGold", 'e', new ItemStack(Items.ENDER_PEARL), 'f', RegistrarBloodMagicItems.TELEPOSITION_FOCUS); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL), "aba", "bcb", "ded", 'a', "blockGlass", 'b', Items.LAVA_BUCKET, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 'd', Blocks.OBSIDIAN, 'e', "gemDiamond")); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), "aaa", "bcb", "aaa", 'a', "stone", 'b', RegistrarBloodMagicItems.SLATE, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK))); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1), "aba", "cdc", "aba", 'a', "stone", 'b', RegistrarBloodMagicItems.SLATE, 'c', Items.SUGAR, 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE)); //Speed -// addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.bloodRune, 1, 2), "aba", "cdc", "aba", 'a', "stone", 'b', RegistrarBloodMagicItems.slate, 'c', Items.sugar, 'd', new ItemStack(RegistrarBloodMagicBlocks.bloodRune))); //Efficiency -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); //Sacrifice -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', "dustGlowstone", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); //Self-Sacrifice - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 5), "aba", "bcb", "ada", 'a', "stone", 'b', Items.WATER_BUCKET, 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); //Displacement - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6), "aba", "bcb", "ada", 'a', "stone", 'b', Items.BUCKET, 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); //Capacity -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7), "aba", "cdc", "aea", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'c', Items.BUCKET, 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Augmented Capacity -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8), "aba", "cdc", "aba", 'a', "stone", 'b', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Orb -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9), "aba", "cdc", "aea", 'a', Items.BUCKET, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Acceleration -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10), "RsR", "GrG", "ReR", 'G', "glowstone", 's', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'R', "dustRedstone", 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Charging -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE, 4), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', RegistrarBloodMagicBlocks.RITUAL_STONE, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 1), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', "stone", 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), new ItemStack(Blocks.REDSTONE_TORCH), new ItemStack(RegistrarBloodMagicItems.SLATE)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 2)); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 0), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "blockGlass", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 1), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeYellow", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 2), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeGreen", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 3), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyePurple", 's', "stickWood"); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.UPGRADE_TRAINER), "ngn", "ioi", "ngn", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), 'i', "ingotIron", 'n', "nuggetGold", 'g', "ingotGold")); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.COAL, 1, 1))); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 1), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0)); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 3), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2)); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 5), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4)); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 6), Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 7), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6)); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME), "ses", "lbl", "gog", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), 'e', Blocks.LAPIS_BLOCK, 'l', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), 'b', Items.ENCHANTED_BOOK, 's', "string", 'g', "ingotGold")); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_READER), "gog", "isi", " s ", 's', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'g', "blockGlass", 'i', "ingotGold", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); -// -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), "sss", "wbw", "gog", 's', "stone", 'w', "plankWood", 'b', Items.BLAZE_ROD, 'g', "ingotGold", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_WEAK))); - - for (int i = 1; i < EnumBloodRune.values().length; i++) - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, i)); - - for (int i = 0; i < ItemSoulGem.names.length; i++) { - for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { - ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - - ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j); - - ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack), newGemStack); - addShapelessRecipe(newGemStack, baseGemStack, crystalStack); - } - } - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 0), "b b", " r ", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 1), "bsb", "srs", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 's', "stone", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 2), "bsb", "srs", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 's', "blockGlass", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 2, 3), "bnb", "trt", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'n', "glowstone", 't', "torch", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); - - for (int i = 0; i < 5; i++) { - ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, i); - ItemStack baseStoneStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 1, i); - ItemStack baseStoneStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 16, i); - ItemStack polishedStoneStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 1, i + 5); - ItemStack willBrickStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_1, 1, i); - ItemStack willBrickStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_1, 4, i); - - ItemStack willSmallBrickStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 1, i); - ItemStack willSmallBrickStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 1, i); - ItemStack pillarStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_1, 1, i); - ItemStack pillarStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_1, 6, i); - - addShapelessRecipe(baseStoneStackCrafted, crystalStack, "stone", "stone", "stone", "stone", "stone", "stone", "stone", "stone"); - addShapedRecipe(willBrickStackCrafted, "ss", "ss", 's', baseStoneStack); - addShapedRecipe(willSmallBrickStackCrafted, "ss", "ss", 's', willBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 9, i + 5), "scs", "ccc", "scs", 's', baseStoneStack, 'c', willBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 9, i + 10), "scs", "coc", "scs", 's', baseStoneStack, 'c', willBrickStack, 'o', crystalStack); - addShapedRecipe(pillarStackCrafted, "ss", "ss", "ss", 's', polishedStoneStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_2, 8, i), "ppp", "pcp", "ppp", 'p', pillarStack, 'c', crystalStack); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i), "sss", "sss", 's', willBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i + 5), "sss", "sss", 's', willSmallBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i + 10), "sss", "sss", 's', polishedStoneStack); - - addShapedRecipe(new ItemStack(i < 2 ? RegistrarBloodMagicBlocks.DEMON_STAIRS_1 : (i < 4 ? RegistrarBloodMagicBlocks.DEMON_STAIRS_2 : RegistrarBloodMagicBlocks.DEMON_STAIRS_3), 8, i % 2), "s ", "ss ", "sss", 's', polishedStoneStack); - addShapedRecipe(new ItemStack(i < 2 ? RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_1 : (i < 4 ? RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_2 : RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_3), 6, i % 2), "sss", "sss", 's', pillarStack); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_LIGHT, 5, i), "sgs", "ggg", "sgs", 's', polishedStoneStack, 'g', Blocks.GLOWSTONE); - - GameRegistry.addSmelting(baseStoneStack, polishedStoneStack, 0.15f); - } - - generateConstants(); - } - public static void addAltarRecipes() { } @@ -461,165 +322,4 @@ public class ModRecipes { LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); } } - - private static void setupDir() { - if (RECIPE_DIR == null) { - RECIPE_DIR = new File(Loader.instance().getConfigDir(), "bloodmagic/recipes"); - } - - if (!RECIPE_DIR.exists()) { - RECIPE_DIR.mkdir(); - } - } - - private static void addShapedRecipe(ItemStack result, Object... components) { - setupDir(); - - // GameRegistry.addShapedRecipe(result, components); - - Map json = new HashMap<>(); - - List pattern = new ArrayList<>(); - int i = 0; - while (i < components.length && components[i] instanceof String) { - pattern.add((String) components[i]); - i++; - } - json.put("pattern", pattern); - - boolean isOreDict = false; - Map> key = new HashMap<>(); - Character curKey = null; - for (; i < components.length; i++) { - Object o = components[i]; - if (o instanceof Character) { - if (curKey != null) - throw new IllegalArgumentException("Provided two char keys in a row"); - curKey = (Character) o; - } else { - if (curKey == null) - throw new IllegalArgumentException("Providing object without a char key"); - if (o instanceof String) - isOreDict = true; - key.put(Character.toString(curKey), serializeItem(o)); - curKey = null; - } - } - json.put("key", key); - json.put("type", isOreDict ? "forge:ore_shaped" : "minecraft:crafting_shaped"); - json.put("result", serializeItem(result)); - - // names the json the same name as the output's registry name - // repeatedly adds _alt if a file already exists - // janky I know but it works - String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : ""; - File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - - while (f.exists()) { - suffix += "_alt"; - f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - } - - try (FileWriter w = new FileWriter(f)) { - GSON.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private static void addShapelessRecipe(ItemStack result, Object... components) { - setupDir(); - - // addShapelessRecipe(result, components); - - Map json = new HashMap<>(); - - boolean isOreDict = false; - List> ingredients = new ArrayList<>(); - for (Object o : components) { - if (o instanceof String) - isOreDict = true; - ingredients.add(serializeItem(o)); - } - json.put("ingredients", ingredients); - json.put("type", isOreDict ? "forge:ore_shapeless" : "minecraft:crafting_shapeless"); - json.put("result", serializeItem(result)); - - // names the json the same name as the output's registry name - // repeatedly adds _alt if a file already exists - // janky I know but it works - String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : ""; - File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - - while (f.exists()) { - suffix += "_alt"; - f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - } - - - try (FileWriter w = new FileWriter(f)) { - GSON.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private static Map serializeItem(Object thing) { - if (thing instanceof Item) { - return serializeItem(new ItemStack((Item) thing)); - } - if (thing instanceof Block) { - return serializeItem(new ItemStack((Block) thing)); - } - if (thing instanceof ItemStack) { - ItemStack stack = (ItemStack) thing; - - if (stack.getItem() instanceof IBloodOrb) { - Map ret = new HashMap<>(); - BloodOrb orb = ((IBloodOrb) stack.getItem()).getOrb(stack); - ret.put("orb", orb == null ? RegistrarBloodMagic.ORB_WEAK.getRegistryName().toString() : orb.getRegistryName().toString()); - return ret; - } - - Map ret = new HashMap<>(); - ret.put("item", stack.getItem().getRegistryName().toString()); - if (stack.getItem().getHasSubtypes() || stack.getItemDamage() != 0) { - ret.put("data", stack.getItemDamage()); - } - if (stack.getCount() > 1) { - ret.put("count", stack.getCount()); - } - - if (stack.hasTagCompound()) { - throw new IllegalArgumentException("nbt not implemented"); - } - - return ret; - } - if (thing instanceof String) { - Map ret = new HashMap<>(); - USED_OD_NAMES.add((String) thing); - ret.put("item", "#" + ((String) thing).toUpperCase(Locale.ROOT)); - return ret; - } - - throw new IllegalArgumentException("Not a block, item, stack, or od name"); - } - - private static void generateConstants() { - List> json = new ArrayList<>(); - for (String s : USED_OD_NAMES) { - Map entry = new HashMap<>(); - entry.put("name", s.toUpperCase(Locale.ROOT)); - entry.put("ingredient", ImmutableMap.of("type", "forge:ore_dict", "ore", s)); - json.add(entry); - } - - try (FileWriter w = new FileWriter(new File(RECIPE_DIR, "_constants.json"))) { - GSON.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - - } - } } diff --git a/src/main/resources/assets/bloodmagic/recipes/_constants.json b/src/main/resources/assets/bloodmagic/recipes/_constants.json new file mode 100644 index 00000000..4685f9ef --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/_constants.json @@ -0,0 +1,128 @@ +[ + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "name": "BLOCKGLASS" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "blockIron" + }, + "name": "BLOCKIRON" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "cobblestone" + }, + "name": "COBBLESTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dustGlowstone" + }, + "name": "DUSTGLOWSTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dustRedstone" + }, + "name": "DUSTREDSTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dyeGreen" + }, + "name": "DYEGREEN" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dyePurple" + }, + "name": "DYEPURPLE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dyeYellow" + }, + "name": "DYEYELLOW" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "gemDiamond" + }, + "name": "GEMDIAMOND" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "glowstone" + }, + "name": "GLOWSTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "ingotGold" + }, + "name": "INGOTGOLD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "ingotIron" + }, + "name": "INGOTIRON" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "nuggetGold" + }, + "name": "NUGGETGOLD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "plankWood" + }, + "name": "PLANKWOOD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "stickWood" + }, + "name": "STICKWOOD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "stone" + }, + "name": "STONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "string" + }, + "name": "STRING" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "torch" + }, + "name": "TORCH" + } +] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json b/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json new file mode 100644 index 00000000..3f376baa --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json @@ -0,0 +1,16 @@ +{ + "result": { + "item": "bloodmagic:activation_crystal", + "data": 1 + }, + "ingredients": [ + { + "item": "minecraft:nether_star" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:archmage" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json b/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json new file mode 100644 index 00000000..ab2cc8c2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:alchemy_table" + }, + "pattern": [ + "sss", + "wbw", + "gog" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "minecraft:blaze_rod" + }, + "s": { + "item": "#STONE" + }, + "w": { + "item": "#PLANKWOOD" + }, + "g": { + "item": "#INGOTGOLD" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/altar.json b/src/main/resources/assets/bloodmagic/recipes/altar.json new file mode 100644 index 00000000..f346a26f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/altar.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:altar" + }, + "pattern": [ + "a a", + "aba", + "cdc" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "minecraft:furnace" + }, + "c": { + "item": "#INGOTGOLD" + }, + "d": { + "item": "bloodmagic:monster_soul", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json new file mode 100644 index 00000000..1655e10c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 0 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#BLOCKGLASS" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json new file mode 100644 index 00000000..6f529b90 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 1 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#DYEYELLOW" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json new file mode 100644 index 00000000..8f82c2f4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 2 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#DYEGREEN" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json new file mode 100644 index 00000000..a7459853 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 3 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#DYEPURPLE" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json new file mode 100644 index 00000000..885311d0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 9 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "minecraft:bucket" + }, + "b": { + "item": "bloodmagic:slate", + "data": 3 + }, + "c": { + "item": "#INGOTGOLD" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 1 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json new file mode 100644 index 00000000..2c63c590 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 7 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "bloodmagic:slate", + "data": 3 + }, + "c": { + "item": "minecraft:bucket" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 6 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json new file mode 100644 index 00000000..1a354301 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "pattern": [ + "aaa", + "bcb", + "aaa" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 0 + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json new file mode 100644 index 00000000..e3b8a876 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json @@ -0,0 +1,28 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 6 + }, + "pattern": [ + "aba", + "bcb", + "ada" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "d": { + "item": "bloodmagic:slate", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json new file mode 100644 index 00000000..7ebc7383 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 10 + }, + "pattern": [ + "RsR", + "GrG", + "ReR" + ], + "type": "forge:ore_shaped", + "key": { + "R": { + "item": "#DUSTREDSTONE" + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "s": { + "item": "bloodmagic:slate", + "data": 3 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + }, + "G": { + "item": "#GLOWSTONE" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json new file mode 100644 index 00000000..54b8c8c4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json @@ -0,0 +1,28 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 5 + }, + "pattern": [ + "aba", + "bcb", + "ada" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "minecraft:water_bucket" + }, + "c": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "d": { + "item": "bloodmagic:slate", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json new file mode 100644 index 00000000..9f76c1a9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 8 + }, + "pattern": [ + "aba", + "cdc", + "aba" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + }, + "c": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "d": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json new file mode 100644 index 00000000..70e2c399 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 3 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 1 + }, + "c": { + "item": "#INGOTGOLD" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json new file mode 100644 index 00000000..af7f3bc3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 4 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 1 + }, + "c": { + "item": "#DUSTGLOWSTONE" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json new file mode 100644 index 00000000..b161a4af --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json @@ -0,0 +1,28 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 1 + }, + "pattern": [ + "aba", + "cdc", + "aba" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 0 + }, + "c": { + "item": "minecraft:sugar" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json new file mode 100644 index 00000000..756d43af --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 0 + }, + "pattern": [ + "RBR", + "G G", + "RRR" + ], + "type": "forge:ore_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "G": { + "item": "#BLOCKGLASS" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json new file mode 100644 index 00000000..5167464b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 1 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json new file mode 100644 index 00000000..fdf4337f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 10 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json new file mode 100644 index 00000000..1aee0e5e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 11 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 10 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json new file mode 100644 index 00000000..ac198a0d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 12 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 11 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json new file mode 100644 index 00000000..7d3511fc --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 13 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 12 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json new file mode 100644 index 00000000..057ef84b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 14 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 13 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json new file mode 100644 index 00000000..9c12b336 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 15 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 14 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json new file mode 100644 index 00000000..46e11986 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 2 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json new file mode 100644 index 00000000..62d52c96 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 3 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json new file mode 100644 index 00000000..88b6b83e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 4 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json new file mode 100644 index 00000000..8d6db55e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 5 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json new file mode 100644 index 00000000..9304a747 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 6 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json new file mode 100644 index 00000000..7decd313 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 7 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json new file mode 100644 index 00000000..8181bfae --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 8 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json new file mode 100644 index 00000000..e1237382 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 9 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json new file mode 100644 index 00000000..636c8710 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:decorative_brick", + "data": 1, + "count": 4 + }, + "pattern": [ + "aa", + "aa" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "bloodmagic:decorative_brick", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json new file mode 100644 index 00000000..9dc01b3e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:decorative_brick", + "data": 0, + "count": 16 + }, + "ingredients": [ + { + "item": "#STONE" + }, + { + "item": "bloodmagic:blood_shard", + "data": 0 + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json new file mode 100644 index 00000000..021815ad --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 1, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json new file mode 100644 index 00000000..ce28a636 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 2, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json new file mode 100644 index 00000000..60a2b525 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 0, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json new file mode 100644 index 00000000..7aff9cee --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 4, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json new file mode 100644 index 00000000..4904ae75 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 3, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json new file mode 100644 index 00000000..11e92c0e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 1 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json new file mode 100644 index 00000000..b3956493 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 2 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json new file mode 100644 index 00000000..7137a604 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 0 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json new file mode 100644 index 00000000..24142cf4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json new file mode 100644 index 00000000..6a889c25 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 3 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json new file mode 100644 index 00000000..cc134c02 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 6, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json new file mode 100644 index 00000000..305ed3a7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 7, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json new file mode 100644 index 00000000..a9aa5a77 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 5, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json new file mode 100644 index 00000000..718356e2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 9, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json new file mode 100644 index 00000000..caa3ad55 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 8, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json new file mode 100644 index 00000000..46cc1293 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 11, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json new file mode 100644 index 00000000..17bc0d0e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 12, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json new file mode 100644 index 00000000..0e6832a4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 10, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json new file mode 100644 index 00000000..d221cbe8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 14, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json new file mode 100644 index 00000000..32fbbeec --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 13, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json new file mode 100644 index 00000000..28bf109a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 1, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 1 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json new file mode 100644 index 00000000..b190c56f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 2, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 2 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json new file mode 100644 index 00000000..aeb276b6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 0, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 0 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json new file mode 100644 index 00000000..a03834f8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 4, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 4 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json new file mode 100644 index 00000000..86e63596 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 3, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 3 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json new file mode 100644 index 00000000..6396fc8f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 1, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json new file mode 100644 index 00000000..d7d99aa5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 2, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json new file mode 100644 index 00000000..8817d3ad --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 0, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json new file mode 100644 index 00000000..cf27ceb3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 4, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json new file mode 100644 index 00000000..dfcf5d75 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 3, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json new file mode 100644 index 00000000..4448dbfe --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 1, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json new file mode 100644 index 00000000..c7ae8aed --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 2, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json new file mode 100644 index 00000000..afee6a8d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 0, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json new file mode 100644 index 00000000..fbf5d7e0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 4, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json new file mode 100644 index 00000000..f9f079d6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 3, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json new file mode 100644 index 00000000..e74a80a8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 1, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 1 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json new file mode 100644 index 00000000..8869bc5f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 2, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 2 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json new file mode 100644 index 00000000..cdc818ac --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 0, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 0 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json new file mode 100644 index 00000000..fab79b32 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 4, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 4 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json new file mode 100644 index 00000000..2b65e834 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 3, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 3 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json new file mode 100644 index 00000000..7f711d0c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_1", + "data": 1, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json new file mode 100644 index 00000000..ba1305d5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_1", + "data": 0, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json new file mode 100644 index 00000000..4b1f890a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_2", + "data": 0, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json new file mode 100644 index 00000000..7a19d3cf --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_2", + "data": 1, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json new file mode 100644 index 00000000..a0f4f58e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_3", + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json new file mode 100644 index 00000000..0d2824b6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_1", + "data": 1, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json new file mode 100644 index 00000000..3e4ff319 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_1", + "data": 0, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json new file mode 100644 index 00000000..6d6a96f5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_2", + "data": 0, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json new file mode 100644 index 00000000..77527b86 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_2", + "data": 1, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json new file mode 100644 index 00000000..9fcdcbf9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_3", + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json new file mode 100644 index 00000000..7b48b030 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 1, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json new file mode 100644 index 00000000..e1b23e21 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 2, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json new file mode 100644 index 00000000..25b47dec --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 0, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json new file mode 100644 index 00000000..e7967dfa --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 4, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json new file mode 100644 index 00000000..98d5ec24 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 3, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json new file mode 100644 index 00000000..62ea247b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 11, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json new file mode 100644 index 00000000..e00e4198 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 12, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json new file mode 100644 index 00000000..791bdb5c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 10, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json new file mode 100644 index 00000000..16a07805 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 14, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json new file mode 100644 index 00000000..33031c4d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 13, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json new file mode 100644 index 00000000..32bc21f7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 6, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json new file mode 100644 index 00000000..2f4fbf18 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 7, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json new file mode 100644 index 00000000..8c42b8c9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 5, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json new file mode 100644 index 00000000..b94df87c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 9, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json new file mode 100644 index 00000000..15ecb860 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 8, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/experience_tome.json b/src/main/resources/assets/bloodmagic/recipes/experience_tome.json new file mode 100644 index 00000000..12dbe103 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/experience_tome.json @@ -0,0 +1,33 @@ +{ + "result": { + "item": "bloodmagic:experience_tome" + }, + "pattern": [ + "ses", + "lbl", + "gog" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "minecraft:enchanted_book" + }, + "s": { + "item": "#STRING" + }, + "e": { + "item": "minecraft:lapis_block" + }, + "g": { + "item": "#INGOTGOLD" + }, + "l": { + "item": "bloodmagic:slate", + "data": 2 + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/incense_altar.json b/src/main/resources/assets/bloodmagic/recipes/incense_altar.json new file mode 100644 index 00000000..4748c205 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/incense_altar.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:incense_altar" + }, + "pattern": [ + "s s", + "shs", + "coc" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STONE" + }, + "c": { + "item": "#COBBLESTONE" + }, + "h": { + "item": "minecraft:coal", + "data": 1 + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json b/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json new file mode 100644 index 00000000..e0311e8f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:lava_crystal" + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "minecraft:lava_bucket" + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + }, + "d": { + "item": "minecraft:obsidian" + }, + "e": { + "item": "#GEMDIAMOND" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json b/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json new file mode 100644 index 00000000..361f9ed3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 0, + "count": 4 + }, + "pattern": [ + "b b", + " r ", + "bob" + ], + "type": "minecraft:crafting_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json new file mode 100644 index 00000000..a14fa6e0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json @@ -0,0 +1,30 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 2, + "count": 4 + }, + "pattern": [ + "bsb", + "srs", + "bob" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "s": { + "item": "#BLOCKGLASS" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json new file mode 100644 index 00000000..7db4b442 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json @@ -0,0 +1,33 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 3, + "count": 2 + }, + "pattern": [ + "bnb", + "trt", + "bob" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "t": { + "item": "#TORCH" + }, + "n": { + "item": "#GLOWSTONE" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json new file mode 100644 index 00000000..4c281089 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json @@ -0,0 +1,30 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 1, + "count": 4 + }, + "pattern": [ + "bsb", + "srs", + "bob" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "s": { + "item": "#STONE" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json new file mode 100644 index 00000000..e82cd67e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:pack_sacrifice" + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "#INGOTIRON" + }, + "d": { + "item": "minecraft:leather_chestplate" + }, + "e": { + "item": "bloodmagic:slate", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json new file mode 100644 index 00000000..138ba293 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:pack_self_sacrifice" + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "minecraft:flint" + }, + "d": { + "item": "minecraft:leather_chestplate" + }, + "e": { + "item": "bloodmagic:slate", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json new file mode 100644 index 00000000..2898208a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 6, + "count": 4 + }, + "ingredients": [ + { + "item": "minecraft:obsidian" + }, + { + "item": "minecraft:obsidian" + }, + { + "item": "minecraft:obsidian" + }, + { + "item": "minecraft:obsidian" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:archmage" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json new file mode 100644 index 00000000..e235db72 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 7, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 6 + }, + { + "item": "bloodmagic:path", + "data": 6 + }, + { + "item": "bloodmagic:path", + "data": 6 + }, + { + "item": "bloodmagic:path", + "data": 6 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json b/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json new file mode 100644 index 00000000..0503ed1c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 2, + "count": 4 + }, + "ingredients": [ + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json new file mode 100644 index 00000000..5cf9c223 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 3, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json new file mode 100644 index 00000000..fcb33fd3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 0, + "count": 4 + }, + "ingredients": [ + { + "item": "#PLANKWOOD" + }, + { + "item": "#PLANKWOOD" + }, + { + "item": "#PLANKWOOD" + }, + { + "item": "#PLANKWOOD" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json new file mode 100644 index 00000000..90b26af1 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 1, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 0 + }, + { + "item": "bloodmagic:path", + "data": 0 + }, + { + "item": "bloodmagic:path", + "data": 0 + }, + { + "item": "bloodmagic:path", + "data": 0 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json new file mode 100644 index 00000000..86e114b7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json @@ -0,0 +1,30 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 4, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json new file mode 100644 index 00000000..2b66ed18 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 5, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 4 + }, + { + "item": "bloodmagic:path", + "data": 4 + }, + { + "item": "bloodmagic:path", + "data": 4 + }, + { + "item": "bloodmagic:path", + "data": 4 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json new file mode 100644 index 00000000..17bfdac9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 1 + }, + "pattern": [ + "aba", + "bcb", + "aba" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "#STONE" + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json new file mode 100644 index 00000000..d712efbe --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json @@ -0,0 +1,20 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 2 + }, + "ingredients": [ + { + "item": "bloodmagic:ritual_controller", + "data": 0 + }, + { + "item": "minecraft:redstone_torch" + }, + { + "item": "bloodmagic:slate", + "data": 0 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json new file mode 100644 index 00000000..74e1458c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 0 + }, + "pattern": [ + "aba", + "bcb", + "aba" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "bloodmagic:ritual_stone", + "data": 0 + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json new file mode 100644 index 00000000..5b55815a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json @@ -0,0 +1,13 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 0 + }, + "ingredients": [ + { + "item": "bloodmagic:ritual_controller", + "data": 2 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json new file mode 100644 index 00000000..9b48c652 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json @@ -0,0 +1,36 @@ +{ + "result": { + "item": "bloodmagic:ritual_diviner", + "data": 0 + }, + "pattern": [ + "dfd", + "ase", + "dwd" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "bloodmagic:inscription_tool", + "data": 4 + }, + "s": { + "item": "#STICKWOOD" + }, + "d": { + "item": "#GEMDIAMOND" + }, + "e": { + "item": "bloodmagic:inscription_tool", + "data": 3 + }, + "f": { + "item": "bloodmagic:inscription_tool", + "data": 2 + }, + "w": { + "item": "bloodmagic:inscription_tool", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json new file mode 100644 index 00000000..ca45383a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:ritual_diviner", + "data": 1 + }, + "pattern": [ + " S ", + "tdt", + " S " + ], + "type": "minecraft:crafting_shaped", + "key": { + "S": { + "item": "bloodmagic:slate", + "data": 3 + }, + "t": { + "item": "bloodmagic:inscription_tool", + "data": 5 + }, + "d": { + "item": "bloodmagic:ritual_diviner", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json b/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json new file mode 100644 index 00000000..cbf3f52a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:ritual_reader" + }, + "pattern": [ + "gog", + "isi", + " s " + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "bloodmagic:slate", + "data": 3 + }, + "g": { + "item": "#BLOCKGLASS" + }, + "i": { + "item": "#INGOTGOLD" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json new file mode 100644 index 00000000..7e321bb2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:ritual_stone", + "data": 0, + "count": 4 + }, + "pattern": [ + "aba", + "bcb", + "aba" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "bloodmagic:slate", + "data": 1 + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json new file mode 100644 index 00000000..439ad7d2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json @@ -0,0 +1,13 @@ +{ + "result": { + "item": "bloodmagic:ritual_stone", + "data": 0 + }, + "ingredients": [ + { + "item": "bloodmagic:ritual_stone", + "data": 32767 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json b/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json new file mode 100644 index 00000000..f622ef14 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:sacrificial_dagger", + "data": 0 + }, + "pattern": [ + "aaa", + " ba", + "c a" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "#INGOTGOLD" + }, + "c": { + "item": "#INGOTIRON" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/soul_forge.json b/src/main/resources/assets/bloodmagic/recipes/soul_forge.json new file mode 100644 index 00000000..7dfd9961 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/soul_forge.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:soul_forge" + }, + "pattern": [ + "i i", + "sgs", + "sos" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STONE" + }, + "g": { + "item": "#INGOTGOLD" + }, + "i": { + "item": "#INGOTIRON" + }, + "o": { + "item": "#BLOCKIRON" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/soul_snare.json b/src/main/resources/assets/bloodmagic/recipes/soul_snare.json new file mode 100644 index 00000000..20a518c5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/soul_snare.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:soul_snare", + "data": 0, + "count": 4 + }, + "pattern": [ + "sis", + "iri", + "sis" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "#DUSTREDSTONE" + }, + "s": { + "item": "#STRING" + }, + "i": { + "item": "#INGOTIRON" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposer.json b/src/main/resources/assets/bloodmagic/recipes/teleposer.json new file mode 100644 index 00000000..388d0153 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/teleposer.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:teleposer" + }, + "pattern": [ + "ggg", + "efe", + "ggg" + ], + "type": "forge:ore_shaped", + "key": { + "e": { + "item": "minecraft:ender_pearl" + }, + "f": { + "item": "bloodmagic:teleposition_focus", + "data": 0 + }, + "g": { + "item": "#INGOTGOLD" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json new file mode 100644 index 00000000..16212c4f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:teleposition_focus", + "data": 2 + }, + "ingredients": [ + { + "item": "bloodmagic:teleposition_focus", + "data": 1 + }, + { + "item": "bloodmagic:blood_shard", + "data": 0 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json new file mode 100644 index 00000000..9be6ba08 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:teleposition_focus", + "data": 3 + }, + "ingredients": [ + { + "item": "bloodmagic:teleposition_focus", + "data": 2 + }, + { + "item": "bloodmagic:blood_shard", + "data": 1 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json b/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json new file mode 100644 index 00000000..d540e3e4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:upgrade_trainer", + "data": 0 + }, + "pattern": [ + "ngn", + "ioi", + "ngn" + ], + "type": "forge:ore_shaped", + "key": { + "g": { + "item": "#INGOTGOLD" + }, + "i": { + "item": "#INGOTIRON" + }, + "n": { + "item": "#NUGGETGOLD" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file From c00affa4aa56fe0b8bb5ff60192b4fc4c3df06ba Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 20 Aug 2017 15:09:27 -0700 Subject: [PATCH 005/493] Update tile entity mappings --- .../core/RegistrarBloodMagicBlocks.java | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java index 92544f16..54cad50a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -124,7 +124,7 @@ public class RegistrarBloodMagicBlocks { event.getRegistry().registerAll(blocks.toArray(new Block[0])); - registerTiles(); + registerTileEntities(); } @SubscribeEvent @@ -137,29 +137,28 @@ public class RegistrarBloodMagicBlocks { }); } - private static void registerTiles() { - GameRegistry.registerTileEntity(TileAltar.class, BloodMagic.MODID + ":" + TileAltar.class.getSimpleName()); - GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":" + TileImperfectRitualStone.class.getSimpleName()); - GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":" + TileMasterRitualStone.class.getSimpleName()); - GameRegistry.registerTileEntity(TileAlchemyArray.class, BloodMagic.MODID + ":" + TileAlchemyArray.class.getSimpleName()); - GameRegistry.registerTileEntity(TileSpectralBlock.class, BloodMagic.MODID + ":" + TileSpectralBlock.class.getSimpleName()); - GameRegistry.registerTileEntity(TilePhantomBlock.class, BloodMagic.MODID + ":" + TilePhantomBlock.class.getSimpleName()); - GameRegistry.registerTileEntity(TileTeleposer.class, BloodMagic.MODID + ":" + TileTeleposer.class.getSimpleName()); - GameRegistry.registerTileEntity(TileSoulForge.class, BloodMagic.MODID + ":" + TileSoulForge.class.getSimpleName()); - GameRegistry.registerTileEntity(TileMasterRoutingNode.class, BloodMagic.MODID + ":" + TileMasterRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileInputRoutingNode.class, BloodMagic.MODID + ":" + TileInputRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileOutputRoutingNode.class, BloodMagic.MODID + ":" + TileOutputRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileItemRoutingNode.class, BloodMagic.MODID + ":" + TileItemRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileIncenseAltar.class, BloodMagic.MODID + ":" + TileIncenseAltar.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonCrucible.class, BloodMagic.MODID + ":" + TileDemonCrucible.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonPylon.class, BloodMagic.MODID + ":" + TileDemonPylon.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonCrystallizer.class, BloodMagic.MODID + ":" + TileDemonCrystallizer.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonCrystal.class, BloodMagic.MODID + ":" + TileDemonCrystal.class.getSimpleName()); - GameRegistry.registerTileEntity(TileAlchemyTable.class, BloodMagic.MODID + ":" + TileAlchemyTable.class.getSimpleName()); - - GameRegistry.registerTileEntity(TileDimensionalPortal.class, BloodMagic.MODID + ":" + TileDimensionalPortal.class.getSimpleName()); - GameRegistry.registerTileEntity(TileBloodTank.class, BloodMagic.MODID + ":" + TileBloodTank.class.getSimpleName()); - GameRegistry.registerTileEntity(TileMimic.class, BloodMagic.MODID + ":" + TileMimic.class.getSimpleName()); - GameRegistry.registerTileEntity(TileInversionPillar.class, BloodMagic.MODID + ":" + TileInversionPillar.class.getSimpleName()); + private static void registerTileEntities() { + GameRegistry.registerTileEntity(TileAltar.class, BloodMagic.MODID + ":altar"); + GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":imperfect_ritual_stone"); + GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":master_ritual_stone"); + GameRegistry.registerTileEntity(TileAlchemyArray.class, BloodMagic.MODID + ":alchemy_array"); + GameRegistry.registerTileEntity(TileSpectralBlock.class, BloodMagic.MODID + ":spectral_block"); + GameRegistry.registerTileEntity(TilePhantomBlock.class, BloodMagic.MODID + ":phantom_block"); + GameRegistry.registerTileEntity(TileTeleposer.class, BloodMagic.MODID + ":teleposer"); + GameRegistry.registerTileEntity(TileSoulForge.class, BloodMagic.MODID + ":soul_forge"); + GameRegistry.registerTileEntity(TileMasterRoutingNode.class, BloodMagic.MODID + ":master_routing_node"); + GameRegistry.registerTileEntity(TileInputRoutingNode.class, BloodMagic.MODID + ":input_routing_node"); + GameRegistry.registerTileEntity(TileOutputRoutingNode.class, BloodMagic.MODID + ":output_routing_node"); + GameRegistry.registerTileEntity(TileItemRoutingNode.class, BloodMagic.MODID + ":item_routing_node"); + GameRegistry.registerTileEntity(TileIncenseAltar.class, BloodMagic.MODID + ":incense_altar"); + GameRegistry.registerTileEntity(TileDemonCrucible.class, BloodMagic.MODID + ":demon_crucible"); + GameRegistry.registerTileEntity(TileDemonPylon.class, BloodMagic.MODID + ":demon_pylon"); + GameRegistry.registerTileEntity(TileDemonCrystallizer.class, BloodMagic.MODID + ":demon_crystallizer"); + GameRegistry.registerTileEntity(TileDemonCrystal.class, BloodMagic.MODID + ":demon_crystal"); + GameRegistry.registerTileEntity(TileAlchemyTable.class, BloodMagic.MODID + ":alchemy_table"); + GameRegistry.registerTileEntity(TileDimensionalPortal.class, BloodMagic.MODID + ":dimensional_portal"); + GameRegistry.registerTileEntity(TileBloodTank.class, BloodMagic.MODID + ":blood_tank"); + GameRegistry.registerTileEntity(TileMimic.class, BloodMagic.MODID + ":mimic"); + GameRegistry.registerTileEntity(TileInversionPillar.class, BloodMagic.MODID + ":inversion_pillar"); } } From 36ce215b6bc849204d0ee1753e2c83b20931dcd3 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 20 Aug 2017 16:12:50 -0700 Subject: [PATCH 006/493] Precondition the rest of the new API --- .../bloodmagic/api_impl/BloodMagicAPI.java | 7 +++++++ .../api_impl/BloodMagicBlacklist.java | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java index e7dc13d6..f3698004 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.api_impl; import WayofTime.bloodmagic.api.altar.EnumAltarComponent; import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; +import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -43,11 +44,17 @@ public class BloodMagicAPI implements IBloodMagicAPI { @Override public void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value) { + Preconditions.checkNotNull(entityId, "entityId cannot be null."); + Preconditions.checkArgument(value >= 0, "value cannot be negative."); + sacrificialValues.put(entityId, value); } @Override public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { + Preconditions.checkNotNull(state, "state cannot be null."); + Preconditions.checkNotNull(componentType, "componentType cannot be null."); + EnumAltarComponent component = EnumAltarComponent.NOTAIR; for (EnumAltarComponent type : EnumAltarComponent.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java index b88d64b6..86022491 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.api_impl; import WayofTime.bloodmagic.apiv2.IBloodMagicBlacklist; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import net.minecraft.block.Block; @@ -28,48 +29,64 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addTeleposer(@Nonnull IBlockState state) { + Preconditions.checkNotNull(state, "state cannot be null."); + if (!teleposer.contains(state)) teleposer.add(state); } @Override public void addTeleposer(@Nonnull Block block) { + Preconditions.checkNotNull(block, "block cannot be null."); + for (IBlockState state : block.getBlockState().getValidStates()) addTeleposer(state); } @Override public void addTeleposer(@Nonnull ResourceLocation entityId) { + Preconditions.checkNotNull(entityId, "entityId cannot be null."); + if (!teleposerEntities.contains(entityId)) teleposerEntities.add(entityId); } @Override public void addTransposition(@Nonnull IBlockState state) { + Preconditions.checkNotNull(state, "state cannot be null."); + if (!transposition.contains(state)) transposition.add(state); } @Override public void addTransposition(@Nonnull Block block) { + Preconditions.checkNotNull(block, "block cannot be null."); + for (IBlockState state : block.getBlockState().getValidStates()) addTransposition(state); } @Override public void addGreenGrove(@Nonnull IBlockState state) { + Preconditions.checkNotNull(state, "state cannot be null."); + if (!greenGrove.contains(state)) greenGrove.add(state); } @Override public void addGreenGrove(@Nonnull Block block) { + Preconditions.checkNotNull(block, "block cannot be null."); + for (IBlockState state : block.getBlockState().getValidStates()) addGreenGrove(state); } @Override public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { + Preconditions.checkNotNull(entityId, "entityId cannot be null."); + if (!sacrifice.contains(entityId)) sacrifice.add(entityId); } From acc0acb80645b866be6249a98fd3518d7fab5328 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 20 Aug 2017 16:16:13 -0700 Subject: [PATCH 007/493] Switch main content to a proper logger Need to figure out what to keep from old API and move that over as well. --- src/main/java/WayofTime/bloodmagic/BloodMagic.java | 8 +++++--- .../bloodmagic/compress/StorageBlockCraftingManager.java | 2 +- .../WayofTime/bloodmagic/meteor/MeteorConfigHandler.java | 2 +- src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java | 5 ++--- .../java/WayofTime/bloodmagic/registry/ModRecipes.java | 2 +- .../ritual/harvest/HarvestHandlerPlantable.java | 6 +++--- src/main/java/WayofTime/bloodmagic/util/Utils.java | 2 +- .../bloodmagic/util/handler/event/ClientHandler.java | 8 ++++---- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 8ab9b602..561b76fa 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -29,6 +29,8 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.*; import net.minecraftforge.fml.common.network.NetworkRegistry; import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.File; import java.util.List; @@ -39,14 +41,15 @@ public class BloodMagic { public static final String NAME = "Blood Magic: Alchemical Wizardry"; public static final String VERSION = "@VERSION@"; public static final String DEPEND = "required-after:guideapi;"; + public static final Logger LOGGER = LogManager.getLogger(NAME.substring(0, NAME.indexOf(":"))); + public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + public static final List> PLUGINS = Lists.newArrayList(); public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { @Override public ItemStack getTabIconItem() { return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); } }; - public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - public static final List> PLUGINS = Lists.newArrayList(); public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") { @Override public ItemStack getTabIconItem() { @@ -68,7 +71,6 @@ public class BloodMagic { FluidRegistry.enableUniversalBucket(); } - public LogHelper logger = new LogHelper(MODID); private File configDir; @Mod.EventHandler diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 093dbff0..ef1638a9 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -20,7 +20,7 @@ public class StorageBlockCraftingManager { public void addStorageBlockRecipes() { // this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); - BloodMagic.instance.logger.info("Total number of compression recipes: " + this.recipes.size()); + BloodMagic.LOGGER.info("Total number of compression recipes: {}", this.recipes.size()); } public ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world) { diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index c608e061..5a24233f 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -29,7 +29,7 @@ public class MeteorConfigHandler { public static void handleMeteors(boolean checkNewVersion) { if (meteorDir == null) { - BloodMagic.instance.logger.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); + BloodMagic.LOGGER.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); return; } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 3d9d0233..f414bb72 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -152,10 +152,9 @@ public class ClientProxy extends CommonProxy { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); - BloodMagic.instance.logger.info("Elytra layer added"); + BloodMagic.LOGGER.info("Elytra layer added"); } catch (Exception e) { - BloodMagic.instance.logger.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade."); - BloodMagic.instance.logger.error(e.getLocalizedMessage()); + BloodMagic.LOGGER.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade."); } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 85cfb7a8..e02c1d54 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -123,7 +123,7 @@ public class ModRecipes { CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.COBBLESTONE), 64); stopwatch.stop(); - BloodMagic.instance.logger.info("Added compression recipes in {}", stopwatch); + BloodMagic.LOGGER.info("Added compression recipes in {}", stopwatch); } public static void addSoulForgeRecipes() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 55512361..7218dfc1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -120,11 +120,11 @@ public class HarvestHandlerPlantable implements IHarvestHandler { HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); } } catch (NoSuchMethodException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; unable to find crop name mapper"); + BloodMagic.LOGGER.error("HarvestCraft integration cancelled; unable to find crop name mapper"); } catch (IllegalAccessException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); + BloodMagic.LOGGER.error("HarvestCraft integration cancelled; crop name lookup broke"); } catch (InvocationTargetException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); + BloodMagic.LOGGER.error("HarvestCraft integration cancelled; crop name lookup broke"); } } } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index b30a0ab0..fdfcb6a4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -928,7 +928,7 @@ public class Utils { Class handlerClass = Class.forName(data.getClassName()); Object handlerImpl = handlerClass.newInstance(); MinecraftForge.EVENT_BUS.register(handlerImpl); - BloodMagic.instance.logger.debug("Registering event handler for class {}", data.getClassName()); + BloodMagic.LOGGER.debug("Registering event handler for class {}", data.getClassName()); } catch (Exception e) { // No-op } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 8c9aa9ee..7103ab7f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -210,10 +210,10 @@ public class ClientHandler { missingVariants.removeAll(missing); if (errored.size() > 0) - BloodMagic.instance.logger.info("Suppressed {} model errors from Blood Magic.", errored.size()); + BloodMagic.LOGGER.info("Suppressed {} model errors from Blood Magic.", errored.size()); if (missing.size() > 0) - BloodMagic.instance.logger.info("Suppressed {} variant errors from Blood Magic.", missing.size()); - BloodMagic.instance.logger.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop()); + BloodMagic.LOGGER.info("Suppressed {} variant errors from Blood Magic.", missing.size()); + BloodMagic.LOGGER.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop()); } // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. @@ -246,7 +246,7 @@ public class ClientHandler { missingTextures.keySet().remove(mc); badTextureDomains.remove(mc); } - BloodMagic.instance.logger.debug("Suppressed required texture errors in {}", stopwatch.stop()); + BloodMagic.LOGGER.debug("Suppressed required texture errors in {}", stopwatch.stop()); } private void renderRitualStones(EntityPlayerSP player, float partialTicks) { From 9004bccba1e648ccccafc68644b74ada95e44f6f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 20 Aug 2017 16:17:00 -0700 Subject: [PATCH 008/493] Rename compat plugins to be standardized --- .../{GuideBloodMagic.java => BloodMagicGuideAPIPlugin.java} | 2 +- .../jei/{BloodMagicPlugin.java => BloodMagicJEIPlugin.java} | 2 +- .../jei/alchemyArray/AlchemyArrayCraftingCategory.java | 4 ++-- .../compat/jei/alchemyTable/AlchemyTableRecipeCategory.java | 6 +++--- .../compat/jei/alchemyTable/AlchemyTableRecipeJEI.java | 4 ++-- .../bloodmagic/compat/jei/altar/AltarRecipeCategory.java | 4 ++-- .../jei/armourDowngrade/ArmourDowngradeRecipeCategory.java | 6 +++--- .../jei/armourDowngrade/ArmourDowngradeRecipeJEI.java | 4 ++-- .../compat/jei/binding/BindingRecipeCategory.java | 4 ++-- .../compat/jei/forge/TartaricForgeRecipeCategory.java | 6 +++--- .../bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java | 4 ++-- ...ailaPluginBloodMagic.java => BloodMagicHwylaPlugin.java} | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/WayofTime/bloodmagic/compat/guideapi/{GuideBloodMagic.java => BloodMagicGuideAPIPlugin.java} (97%) rename src/main/java/WayofTime/bloodmagic/compat/jei/{BloodMagicPlugin.java => BloodMagicJEIPlugin.java} (99%) rename src/main/java/WayofTime/bloodmagic/compat/waila/{WailaPluginBloodMagic.java => BloodMagicHwylaPlugin.java} (96%) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java index 39319de7..b21f5281 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java @@ -24,7 +24,7 @@ import javax.annotation.Nullable; import java.awt.Color; @GuideBook(priority = EventPriority.HIGHEST) -public class GuideBloodMagic implements IGuideBook { +public class BloodMagicGuideAPIPlugin implements IGuideBook { public static final Book GUIDE_BOOK = new Book(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java rename to src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index ab7ed560..e5d2b153 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -33,7 +33,7 @@ import javax.annotation.Nonnull; import java.util.Map; @JEIPlugin -public class BloodMagicPlugin implements IModPlugin { +public class BloodMagicJEIPlugin implements IModPlugin { public static IJeiHelpers jeiHelper; @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index 5b9b8e22..5e51760a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -22,7 +22,7 @@ public class AlchemyArrayCraftingCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyArrayCrafting"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index a6b38e9c..2e938c83 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -22,14 +22,14 @@ public class AlchemyTableRecipeCategory implements IRecipeCategory> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); ingredients.setInputLists(ItemStack.class, expanded); ingredients.setOutput(ItemStack.class, recipe.getOutput()); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 32f955c8..dea74887 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -20,7 +20,7 @@ public class AltarRecipeCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 1; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.altar"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java index f8a93172..ccde0d58 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -24,14 +24,14 @@ public class ArmourDowngradeRecipeCategory implements IRecipeCategory { private static final int INPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.armourDowngrade"); @Nonnull private final ICraftingGridHelper craftingGridHelper; public ArmourDowngradeRecipeCategory() { - craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); + craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); } @Nonnull diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java index d8155ace..c7a2c037 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; @@ -20,7 +20,7 @@ public class ArmourDowngradeRecipeJEI extends BlankRecipeWrapper { @Override public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); expanded.add(Lists.newArrayList(recipe.getKey())); ingredients.setInputLists(ItemStack.class, expanded); ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index c511fa04..dad5481a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -22,7 +22,7 @@ public class BindingRecipeCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.binding"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index 3e03d2f7..9e2ae73c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.forge; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -24,14 +24,14 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory> expandedInputs = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + List> expandedInputs = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); expandedInputs.add(validGems); ingredients.setInputLists(ItemStack.class, expandedInputs); ingredients.setOutput(ItemStack.class, recipe.getOutput()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index 5cfd9622..7ec1536f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -9,7 +9,7 @@ import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.WailaPlugin; @WailaPlugin -public class WailaPluginBloodMagic implements IWailaPlugin { +public class BloodMagicHwylaPlugin implements IWailaPlugin { @Override public void register(IWailaRegistrar registrar) { registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class); From dc5bfac313668071e5842e23596bcae45b1f91bc Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 21 Aug 2017 20:21:30 -0700 Subject: [PATCH 009/493] Fix JEI not seeing orbs as different items --- .../WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index e5d2b153..1ac3520d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -85,6 +85,7 @@ public class BloodMagicJEIPlugin implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME); + subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.BLOOD_ORB); } @Override From fb2ea2a4fef7f5e5af516c6f520111acedf1b828 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 21 Aug 2017 20:58:24 -0700 Subject: [PATCH 010/493] *Begin* moving GAPI compat to prettier system --- gradle.properties | 2 +- .../guideapi/BloodMagicGuideAPIPlugin.java | 11 +- .../bloodmagic/compat/guideapi/BookUtils.java | 30 +- .../compat/guideapi/book/CategoryAlchemy.java | 104 +++---- .../guideapi/book/CategoryArchitect.java | 265 +++++------------- .../compat/guideapi/entry/EntryText.java | 13 +- .../compat/guideapi/page/PageAltarRecipe.java | 76 +++-- .../page/PageTartaricForgeRecipe.java | 112 ++++---- .../bloodmagic/util/helper/RecipeHelper.java | 54 +--- 9 files changed, 254 insertions(+), 413 deletions(-) diff --git a/gradle.properties b/gradle.properties index bcf9d97a..d4229007 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ mappings_version=snapshot_20170814 jei_version=4.7.5.85 waila_version=1.8.20-B35 -guideapi_version=2.1.4-56 \ No newline at end of file +guideapi_version=2.1.4-57 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java index b21f5281..33b8a2dc 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java @@ -38,16 +38,17 @@ public class BloodMagicGuideAPIPlugin implements IGuideBook { GUIDE_BOOK.setRegistryName(new ResourceLocation(BloodMagic.MODID, "guide")); GUIDE_BOOK.setColor(Color.RED); + CategoryAlchemy.buildCategory(GUIDE_BOOK); + CategoryArchitect.buildCategory(GUIDE_BOOK); + GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD))); + GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER))); +// GUIDE_BOOK.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner))); + return GUIDE_BOOK; } @Override public void handlePost(ItemStack bookStack) { - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.bloodmagic.category.alchemy", new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.bloodmagic.category.architect", new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER))); -// guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner))); } @Nullable diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 0c70656d..a2cb6a10 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -2,18 +2,40 @@ package WayofTime.bloodmagic.compat.guideapi; import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; -import amerifrance.guideapi.page.PageIRecipe; +import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; +import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; public class BookUtils { + @Nullable + public static PageAltarRecipe getAltarPage(ItemStack output) { + for (RecipeBloodAltar recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes().values()) + if (ItemStack.areItemStacksEqualUsingNBTShareTag(output, recipe.getOutput())) + return new PageAltarRecipe(recipe); + + return null; + } + + @Nullable + public static PageTartaricForgeRecipe getForgeRecipe(ItemStack output) { + for (RecipeTartaricForge recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes().values()) + if (ItemStack.areItemStacksEqualUsingNBTShareTag(output, recipe.getOutput())) + return new PageTartaricForgeRecipe(recipe); + + return null; + } + public static PageAlchemyArray getAlchemyPage(String key) { ItemStack[] recipe = AlchemyArrayRecipeRegistry.getRecipeForArrayEffect(key); if (recipe[0] != null) { @@ -55,8 +77,4 @@ public class BookUtils { return null; } - - public static PageIRecipe getPageForRecipe(IRecipe recipe) { - return new PageIRecipe(recipe); - } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index a161cb2c..2db144b0 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -1,103 +1,65 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.PageHelper; +import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.page.PageText; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; public class CategoryAlchemy { - public static Map buildCategory() { - Map entries = new LinkedHashMap(); - String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy."; - List introPages = new ArrayList(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); + public static void buildCategory(Book book) { + final String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy."; - List ashPages = new ArrayList(); + CategoryItemStack category = new CategoryItemStack(keyBase + "alchemy", new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); + category.withKeyBase(BloodMagic.MODID); - TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); - if (ashRecipe != null) { - ashPages.add(new PageTartaricForgeRecipe(ashRecipe)); - } - ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); + category.addEntry("intro", new EntryText(keyBase + "intro", true)); + category.getEntry("intro").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "intro.info"), 370)); - List speedPages = new ArrayList(); + category.addEntry("ash", new EntryText(keyBase + "ash", true)); + category.getEntry("ash").addPage(BookUtils.getForgeRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); + category.getEntry("ash").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "ash.info"), 370)); - PageAlchemyArray speedRecipePage = BookUtils.getAlchemyPage("movement"); - if (speedRecipePage != null) { - speedPages.add(speedRecipePage); - } - speedPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "speed" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "speed"), new EntryText(speedPages, TextHelper.localize(keyBase + "speed"), true)); + category.addEntry("speed", new EntryText(keyBase + "speed", true)); + category.getEntry("speed").addPage(BookUtils.getAlchemyPage("movement")); + category.getEntry("speed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "speed.info"), 370)); - List updraftPages = new ArrayList(); + category.addEntry("updraft", new EntryText(keyBase + "updraft", true)); + category.getEntry("updraft").addPage(BookUtils.getAlchemyPage("updraft")); + category.getEntry("updraft").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "updraft.info"), 370)); - PageAlchemyArray updraftRecipePage = BookUtils.getAlchemyPage("updraft"); - if (updraftRecipePage != null) { - updraftPages.add(updraftRecipePage); - } - updraftPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "updraft" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "updraft"), new EntryText(updraftPages, TextHelper.localize(keyBase + "updraft"), true)); + category.addEntry("turret", new EntryText(keyBase + "turret", true)); + category.getEntry("turret").addPage(BookUtils.getAlchemyPage("skeletonTurret")); + category.getEntry("turret").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "turret.info"), 370)); - List turretPages = new ArrayList(); + category.addEntry("bounce", new EntryText(keyBase + "bounce", true)); + category.getEntry("bounce").addPage(BookUtils.getAlchemyPage("bounce")); + category.getEntry("bounce").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bounce.info"), 370)); - PageAlchemyArray turretRecipePage = BookUtils.getAlchemyPage("skeletonTurret"); - if (turretRecipePage != null) { - turretPages.add(turretRecipePage); - } - turretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "turret" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "turret"), new EntryText(turretPages, TextHelper.localize(keyBase + "turret"), true)); + category.addEntry("buff", new EntryText(keyBase + "buff", true)); + category.getEntry("buff").addPage(BookUtils.getAlchemyPage("buff")); + category.getEntry("buff").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "buff.info"), 370)); - List bouncePages = new ArrayList(); + category.addEntry("fastMiner", new EntryText(keyBase + "fastMiner", true)); + category.getEntry("fastMiner").addPage(BookUtils.getAlchemyPage("fastMiner")); + category.getEntry("fastMiner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fastMiner.info"), 370)); - PageAlchemyArray bounceRecipePage = BookUtils.getAlchemyPage("bounce"); - if (bounceRecipePage != null) { - bouncePages.add(bounceRecipePage); - } - bouncePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bounce" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "bounce"), new EntryText(bouncePages, TextHelper.localize(keyBase + "bounce"), true)); + book.addCategory(category); - List buffPages = new ArrayList(); - - buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "buff"), new EntryText(buffPages, TextHelper.localize(keyBase + "buff"), true)); - - List fastMinerPages = new ArrayList(); - - PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner"); - if (fastMinerRecipePage != null) { - fastMinerPages.add(fastMinerRecipePage); - } - fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); - - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { + for (EntryAbstract entry : category.entries.values()) { + for (IPage page : entry.pageList) { if (page instanceof PageText) { ((PageText) page).setUnicodeFlag(true); } } } - - return entries; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index ba1b8d31..1c415701 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -16,222 +16,103 @@ import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.util.helper.RecipeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.PageHelper; +import amerifrance.guideapi.category.CategoryItemStack; +import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.page.PageText; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; public class CategoryArchitect { - public static Map buildCategory() { - Map entries = new LinkedHashMap(); - String keyBase = "guide." + BloodMagic.MODID + ".entry.architect."; - List introPages = new ArrayList(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); -// introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); - entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); + public static void buildCategory(Book book) { + final String keyBase = "guide." + BloodMagic.MODID + ".entry.architect."; + CategoryItemStack category = new CategoryItemStack(keyBase + "architect", new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)); + category.withKeyBase(BloodMagic.MODID); - List altarPages = new ArrayList(); + category.addEntry("intro", new EntryText(keyBase + "intro", true)); + category.getEntry("intro").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "intro.info"), 370)); - IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ALTAR)); - if (altarRecipe != null) { - altarPages.add(BookUtils.getPageForRecipe(altarRecipe)); - } + category.addEntry("bloodaltar", new EntryText(keyBase + "bloodaltar", true)); + category.getEntry("bloodaltar").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "altar"))); + category.getEntry("bloodaltar").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bloodaltar.info.1"), 370)); + category.getEntry("bloodaltar").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "sacrificial_dagger"))); + category.getEntry("bloodaltar").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bloodaltar.info.2"), 370)); - altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.1"), 370)); + category.addEntry("ash", new EntryText(keyBase + "ash", true)); + category.getEntry("ash").addPage(BookUtils.getForgeRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); + category.getEntry("ash").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "ash.info"), 370)); - IRecipe daggerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER)); - if (daggerRecipe != null) { - altarPages.add(BookUtils.getPageForRecipe(daggerRecipe)); - } + category.addEntry("divination", new EntryText(keyBase + "divination", true)); + category.getEntry("divination").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION))); + category.getEntry("divination").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "divination.info"))); - altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "bloodaltar"), new EntryText(altarPages, TextHelper.localize(keyBase + "bloodaltar"), true)); + category.addEntry("soulnetwork", new EntryText(keyBase + "soulnetwork", true)); + category.getEntry("soulnetwork").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "soulnetwork.info"))); - List ashPages = new ArrayList(); + category.addEntry("weakorb", new EntryText(keyBase + "weakorb", true)); + category.getEntry("weakorb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "weakorb.info1"), 370)); + category.getEntry("weakorb").addPage(BookUtils.getAltarPage(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK))); + category.getEntry("weakorb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "weakorb.info2"), 370)); - TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); - if (ashRecipe != null) { - ashPages.add(new PageTartaricForgeRecipe(ashRecipe)); - } - ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); + category.addEntry("incense", new EntryText(keyBase + "incense", true)); + category.getEntry("incense").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "incense_altar"))); + category.getEntry("incense").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "incense.info.1"), 370)); + category.getEntry("incense").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "path_wood"))); + category.getEntry("incense").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "incense.info.2"), 370)); - List divinationPages = new ArrayList(); + category.addEntry("bloodrune", new EntryText(keyBase + "bloodrune", true)); + category.getEntry("bloodrune").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_blank"))); + category.getEntry("bloodrune").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bloodrune.info.1"), 370)); - PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)); - if (divinationRecipePage != null) { - divinationPages.add(divinationRecipePage); - } + category.addEntry("inspectoris", new EntryText(keyBase + "inspectoris", true)); + category.getEntry("inspectoris").addPage(BookUtils.getAltarPage(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK))); + category.getEntry("inspectoris").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "inspectoris.info.1"), 370)); - divinationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "divination" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "divination"), new EntryText(divinationPages, TextHelper.localize(keyBase + "divination"), true)); + category.addEntry("runeSpeed", new EntryText(keyBase + "runeSpeed", true)); + category.getEntry("runeSpeed").addPage(BookUtils.getAltarPage(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1))); + category.getEntry("runeSpeed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSpeed.info.1"), 370)); - List soulnetworkPages = new ArrayList(); + category.addEntry("water", new EntryText(keyBase + "water", true)); + category.getEntry("water").addPage(BookUtils.getForgeRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER))); + category.getEntry("water").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER))); + category.getEntry("water").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "water.info.1"), 370)); - soulnetworkPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "soulnetwork" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "soulnetwork"), new EntryText(soulnetworkPages, TextHelper.localize(keyBase + "soulnetwork"), true)); + category.addEntry("lava", new EntryText(keyBase + "lava", true)); + category.getEntry("lava").addPage(BookUtils.getForgeRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA))); + category.getEntry("lava").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA))); + category.getEntry("lava").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lava.info.1"), 370)); - List weakorbPages = new ArrayList(); - weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370)); + category.addEntry("lavaCrystal", new EntryText(keyBase + "lavaCrystal", true)); + category.getEntry("lavaCrystal").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "lava_crystal"))); + category.getEntry("lavaCrystal").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lavaCrystal.info.1"), 370)); - AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)); - if (weakorbRecipe != null) { - weakorbPages.add(new PageAltarRecipe(weakorbRecipe)); - } + category.addEntry("apprenticeorb", new EntryText(keyBase + "apprenticeorb", true)); + category.getEntry("apprenticeorb").addPage(BookUtils.getAltarPage(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE))); + category.getEntry("apprenticeorb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "apprenticeorb.info.1"), 370)); - weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "weakorb"), new EntryText(weakorbPages, TextHelper.localize(keyBase + "weakorb"), true)); + category.addEntry("dagger", new EntryText(keyBase + "dagger", true)); + category.getEntry("dagger").addPage(BookUtils.getAltarPage(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE))); + category.getEntry("dagger").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "dagger.info.1"), 370)); - List incensePages = new ArrayList(); + category.addEntry("runeSacrifice", new EntryText(keyBase + "runeSacrifice", true)); + category.getEntry("runeSacrifice").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_sacrifice"))); + category.getEntry("runeSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSacrifice.info.1"), 370)); - IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR)); - if (incenseRecipe != null) { - incensePages.add(BookUtils.getPageForRecipe(incenseRecipe)); - } + category.addEntry("runeSelfSacrifice", new EntryText(keyBase + "runeSelfSacrifice", true)); + category.getEntry("runeSelfSacrifice").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_selfsacrifice"))); + category.getEntry("runeSelfSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSelfSacrifice.info.1"), 370)); - incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.1"), 370)); - - IRecipe woodPathRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0)); - if (woodPathRecipe != null) { - incensePages.add(BookUtils.getPageForRecipe(woodPathRecipe)); - } - - incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "incense"), new EntryText(incensePages, TextHelper.localize(keyBase + "incense"), true)); - - List runePages = new ArrayList(); - - IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 0)); - if (runeRecipe != null) { - runePages.add(BookUtils.getPageForRecipe(runeRecipe)); - } - - runePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodrune" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "bloodrune"), new EntryText(runePages, TextHelper.localize(keyBase + "bloodrune"), true)); - - List inspectPages = new ArrayList(); - - AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK)); - if (inspectRecipe != null) { - inspectPages.add(new PageAltarRecipe(inspectRecipe)); - } - - inspectPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "inspectoris" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "inspectoris"), new EntryText(inspectPages, TextHelper.localize(keyBase + "inspectoris"), true)); - - List speedRunePages = new ArrayList(); - - IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1)); - if (speedRecipe != null) { - speedRunePages.add(BookUtils.getPageForRecipe(speedRecipe)); - } - - speedRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSpeed" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeSpeed"), new EntryText(speedRunePages, TextHelper.localize(keyBase + "runeSpeed"), true)); - - List waterPages = new ArrayList(); - - TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_WATER)); - if (waterRecipe != null) { - waterPages.add(new PageTartaricForgeRecipe(waterRecipe)); - } - - PageAlchemyArray waterRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER)); - if (waterRecipePage != null) { - waterPages.add(waterRecipePage); - } - - waterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "water" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "water"), new EntryText(waterPages, TextHelper.localize(keyBase + "water"), true)); - - List lavaPages = new ArrayList(); - - TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_LAVA)); - if (lavaRecipe != null) { - lavaPages.add(new PageTartaricForgeRecipe(lavaRecipe)); - } - - PageAlchemyArray lavaRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA)); - if (lavaRecipePage != null) { - lavaPages.add(lavaRecipePage); - } - - lavaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lava" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "lava"), new EntryText(lavaPages, TextHelper.localize(keyBase + "lava"), true)); - - List lavaCrystalPages = new ArrayList(); - - IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL)); - if (lavaCrystalRecipe != null) { - lavaCrystalPages.add(BookUtils.getPageForRecipe(lavaCrystalRecipe)); - } - - lavaCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lavaCrystal" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "lavaCrystal"), new EntryText(lavaCrystalPages, TextHelper.localize(keyBase + "lavaCrystal"), true)); - - List apprenticeorbPages = new ArrayList(); - - AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE)); - if (apprenticeorbRecipe != null) { - apprenticeorbPages.add(new PageAltarRecipe(apprenticeorbRecipe)); - } - - apprenticeorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "apprenticeorb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "apprenticeorb"), new EntryText(apprenticeorbPages, TextHelper.localize(keyBase + "apprenticeorb"), true)); - - List daggerPages = new ArrayList(); - - AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE)); - if (daggerOfSacrificeRecipe != null) { - daggerPages.add(new PageAltarRecipe(daggerOfSacrificeRecipe)); - } - - daggerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "dagger" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "dagger"), new EntryText(daggerPages, TextHelper.localize(keyBase + "dagger"), true)); - - List runeSacrificePages = new ArrayList(); - - IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3)); - if (runeSacrificeRecipe != null) { - runeSacrificePages.add(BookUtils.getPageForRecipe(runeSacrificeRecipe)); - } - - runeSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSacrifice" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeSacrifice"), new EntryText(runeSacrificePages, TextHelper.localize(keyBase + "runeSacrifice"), true)); - - List runeSelfSacrificePages = new ArrayList(); - - IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (runeSelfSacrificeRecipe != null) { - runeSelfSacrificePages.add(BookUtils.getPageForRecipe(runeSelfSacrificeRecipe)); - } - - runeSelfSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSelfSacrifice" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeSelfSacrifice"), new EntryText(runeSelfSacrificePages, TextHelper.localize(keyBase + "runeSelfSacrifice"), true)); - - List holdingPages = new ArrayList(); - - TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING)); - if (holdingRecipe != null) { - holdingPages.add(new PageTartaricForgeRecipe(holdingRecipe)); - } - - PageAlchemyArray holdingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING)); - if (holdingRecipePage != null) { - holdingPages.add(holdingRecipePage); - } - - holdingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "holding" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "holding"), new EntryText(holdingPages, TextHelper.localize(keyBase + "holding"), true)); + category.addEntry("holding", new EntryText(keyBase + "holding", true)); + category.getEntry("holding").addPage(BookUtils.getForgeRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING))); + category.getEntry("holding").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); + category.getEntry("holding").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "holding.info.1"), 370)); List airPages = new ArrayList(); @@ -633,14 +514,8 @@ public class CategoryArchitect { mimicPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "mimic" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "mimic"), new EntryText(mimicPages, TextHelper.localize(keyBase + "mimic"), true)); - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { - ((PageText) page).setUnicodeFlag(true); - } - } - } + category.entries.values().forEach(e -> e.pageList.stream().filter(p -> p instanceof PageText).forEach(p -> ((PageText) p).setUnicodeFlag(true))); - return entries; + book.addCategory(category); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java index 577e4f85..34de49c2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java @@ -6,6 +6,7 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.entry.EntryResourceLocation; import amerifrance.guideapi.gui.GuiBase; +import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.ResourceLocation; @@ -17,12 +18,16 @@ import java.util.List; public class EntryText extends EntryResourceLocation { - public EntryText(List pageList, String unlocEntryName, boolean unicode) { - super(pageList, unlocEntryName, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode); + public EntryText(List pageList, String name, boolean unicode) { + super(pageList, name, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode); } - public EntryText(List pageList, String unlocEntryName) { - this(pageList, unlocEntryName, false); + public EntryText(List pageList, String name) { + this(pageList, name, false); + } + + public EntryText(String name, boolean unicode) { + this(Lists.newArrayList(), name, unicode); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 6117a981..b93f7cf6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; @@ -11,60 +10,91 @@ import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import java.util.Random; public class PageAltarRecipe extends Page { - public List input; - public ItemStack output; - public int tier; - public int bloodRequired; + public final ItemStack[] input; + public final ItemStack output; + public final int tier; + public final int bloodRequired; - public PageAltarRecipe(AltarRecipeRegistry.AltarRecipe recipe) { - this.input = ItemStackWrapper.toStackList(recipe.getInput()); + private long lastCycle = -1; + private int cycleIdx = 0; + private Random random = new Random(); + + public PageAltarRecipe(RecipeBloodAltar recipe) { + this.input = recipe.getInput().getMatchingStacks(); this.output = recipe.getOutput(); - this.tier = recipe.getMinTier().toInt(); + this.tier = recipe.getMinimumTier().toInt(); this.bloodRequired = recipe.getSyphon(); } @Override @SideOnly(Side.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); + Minecraft mc = Minecraft.getMinecraft(); + mc.getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide", "textures/gui/altar.png")); + + long time = mc.world.getTotalWorldTime(); + if (lastCycle < 0 || lastCycle < time - 20) { + if (lastCycle > 0) { + cycleIdx++; + cycleIdx = Math.max(0, cycleIdx); + } + lastCycle = mc.world.getTotalWorldTime(); + } + guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.bloodAltar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 - GuiHelper.drawItemStack(input.get(0), inputX, inputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) { - guiBase.renderToolTip(input.get(0), mouseX, mouseY); - } + ItemStack inputStack = input[getRandomizedCycle(0, input.length)]; + GuiHelper.drawItemStack(inputStack, inputX, inputY); + if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) + guiBase.renderToolTip(inputStack, mouseX, mouseY); + + ItemStack outputStack = output; + if (output.isEmpty()) + outputStack = new ItemStack(Blocks.BARRIER); - if (output.isEmpty()) { - output = new ItemStack(Blocks.BARRIER); - } int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; int outputY = (20) + (guiTop + guiBase.xSize / 5) - 1; // 1 * 20 - GuiHelper.drawItemStack(output, outputX, outputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { - guiBase.renderToolTip(output, outputX, outputY); - } + GuiHelper.drawItemStack(outputStack, outputX, outputY); + if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) + guiBase.renderToolTip(outputStack, outputX, outputY); - if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { + if (outputStack.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0); } + guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.tier", String.valueOf(tier)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.lp", String.valueOf(bloodRequired)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); } + + protected ItemStack getNextItem(ItemStack stack, int position) { + NonNullList subItems = NonNullList.create(); + Item item = stack.getItem(); + + item.getSubItems(CreativeTabs.SEARCH, subItems); + return subItems.get(getRandomizedCycle(position, subItems.size())); + } + + protected int getRandomizedCycle(int index, int max) { + random.setSeed(index); + return (index + random.nextInt(max) + cycleIdx) % max; + } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index 7f52af4a..0daf740c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; @@ -9,11 +9,14 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; +import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,93 +26,72 @@ import java.util.List; import java.util.Random; public class PageTartaricForgeRecipe extends Page { - public List input; - public ItemStack output; - public int tier; - public double minimumWill; - public double drainedWill; + public final List input; + public final ItemStack output; + public final int tier; + public final double minimumWill; + public final double drainedWill; + private long lastCycle = -1; private int cycleIdx = 0; - private Random rand = new Random(); + private Random random = new Random(); - public PageTartaricForgeRecipe(TartaricForgeRecipe recipe) { - this.input = recipe.getInput(); - this.output = recipe.getRecipeOutput(); + public PageTartaricForgeRecipe(RecipeTartaricForge recipe) { + input = Lists.newArrayList(); + for (Ingredient ingredient : recipe.getInput()) + input.add(ingredient.getMatchingStacks()); + + this.output = recipe.getOutput(); this.tier = 0; this.minimumWill = recipe.getMinimumSouls(); - this.drainedWill = recipe.getSoulsDrained(); + this.drainedWill = recipe.getSoulDrain(); } @SuppressWarnings("unchecked") @Override @SideOnly(Side.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/soulForge.png")); + Minecraft mc = Minecraft.getMinecraft(); + mc.getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide", "textures/gui/soulForge.png")); + + long time = mc.world.getTotalWorldTime(); + if (lastCycle < 0 || lastCycle < time - 20) { + if (lastCycle > 0) { + cycleIdx++; + cycleIdx = Math.max(0, cycleIdx); + } + lastCycle = mc.world.getTotalWorldTime(); + } + guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.soulForge"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); -// int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; -// int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 - for (int y = 0; y < 2; y++) { for (int x = 0; x < 2; x++) { int stackX = (x + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; int stackY = (y + 1) * 20 + (guiTop + guiBase.ySize / 5) - 1; - Object component = input.size() > y * 2 + x ? input.get(y * 2 + x) : null;//recipe.getInput()[y * 2 + x]; + ItemStack[] component = input.size() > y * 2 + x ? input.get(y * 2 + x) : null;//recipe.getInput()[y * 2 + x]; if (component != null) { - if (component instanceof ItemStack) { - ItemStack input = (ItemStack) component; - if (input.getItemDamage() == OreDictionary.WILDCARD_VALUE) - input.setItemDamage(0); - - GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// tooltips = GuiHelper.getTooltip((ItemStack) component); - guiBase.renderToolTip((ItemStack) component, mouseX, mouseY); - } - } else if (component instanceof Integer) { - List list = OrbRegistry.getOrbsDownToTier((Integer) component); - if (!list.isEmpty()) { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 2), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// tooltips = GuiHelper.getTooltip(stack); - guiBase.renderToolTip(stack, mouseX, mouseY); - } - } - } else { - List list = (List) component; - if (!list.isEmpty()) { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 2), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// tooltips = GuiHelper.getTooltip(stack); - guiBase.renderToolTip(stack, mouseX, mouseY); - } - } - } + ItemStack drawStack = component[getRandomizedCycle(x + (y * 2), component.length)]; + GuiHelper.drawItemStack(drawStack, stackX, stackY); + if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) + guiBase.renderToolTip(drawStack, mouseX, mouseY); } } } -// GuiHelper.drawItemStack(input.get(0), inputX, inputY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) -// { -// guiBase.renderToolTip(input.get(0), mouseX, mouseY); -// } + ItemStack outputStack = output; + if (outputStack.isEmpty()) + outputStack = new ItemStack(Blocks.BARRIER); - if (output == null) { - output = new ItemStack(Blocks.BARRIER); - } int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; int outputY = (20) + (guiTop + guiBase.xSize / 5) + 10; // 1 * 20 - GuiHelper.drawItemStack(output, outputX, outputY); + GuiHelper.drawItemStack(outputStack, outputX, outputY); if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { - guiBase.renderToolTip(output, outputX, outputY); + guiBase.renderToolTip(outputStack, outputX, outputY); } - if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { + if (outputStack.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); // guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0); @@ -118,8 +100,16 @@ public class PageTartaricForgeRecipe extends Page { guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.drainedWill", String.valueOf(drainedWill)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); } + protected ItemStack getNextItem(ItemStack stack, int position) { + NonNullList subItems = NonNullList.create(); + Item item = stack.getItem(); + + item.getSubItems(item.getCreativeTab(), subItems); + return subItems.get(getRandomizedCycle(position, subItems.size())); + } + protected int getRandomizedCycle(int index, int max) { - rand.setSeed(index); - return (index + rand.nextInt(max) + cycleIdx) % max; + random.setSeed(index); + return (index + random.nextInt(max) + cycleIdx) % max; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java index 069246a9..9e4fd5b7 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java @@ -1,55 +1,15 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; +import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; +import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.fml.common.registry.ForgeRegistries; + +import javax.annotation.Nullable; public class RecipeHelper { - public static IRecipe getRecipeForOutput(ItemStack stack) { - for (IRecipe recipe : ForgeRegistries.RECIPES.getValues()) { - if (recipe != null) { - ItemStack resultStack = recipe.getRecipeOutput(); - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return recipe; - } - } - } - } - return null; - } - public static AltarRecipeRegistry.AltarRecipe getAltarRecipeForOutput(ItemStack stack) { - for (AltarRecipeRegistry.AltarRecipe recipe : AltarRecipeRegistry.getRecipes().values()) { - if (recipe != null && !recipe.isFillable()) { - ItemStack resultStack = recipe.getOutput(); - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return recipe; - } - } - } - } - - return null; - } - - public static TartaricForgeRecipe getForgeRecipeForOutput(ItemStack stack) { - for (TartaricForgeRecipe recipe : TartaricForgeRecipeRegistry.getRecipeList()) { - if (recipe != null) { - ItemStack resultStack = recipe.getRecipeOutput(); - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return recipe; - } - } - } - } - - return null; - } } From 114b0c3edab0d8310d6d0a19d0ce939a4869aeb1 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 22 Aug 2017 15:52:27 -0700 Subject: [PATCH 011/493] Move ItemComponent to an enum style item Much cleaner. Less prone to breakage. Less like Kit would have written it. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 1 - .../render/entity/RenderEntityBloodLight.java | 4 +- .../guideapi/book/CategoryArchitect.java | 54 +++---- .../bloodmagic/core/RegistrarBloodMagic.java | 9 ++ .../core/RegistrarBloodMagicItems.java | 3 +- .../core/RegistrarBloodMagicRecipes.java | 48 +++--- .../bloodmagic/fuel/FuelHandler.java | 17 --- .../bloodmagic/item/ItemComponent.java | 137 ------------------ .../WayofTime/bloodmagic/item/ItemEnum.java | 59 ++++++++ .../item/armour/ItemLivingArmour.java | 4 +- .../bloodmagic/item/types/ComponentType.java | 64 ++++++++ .../bloodmagic/item/types/IEnumItem.java | 17 +++ .../bloodmagic/registry/ModRecipes.java | 112 +++++++------- 13 files changed, 257 insertions(+), 272 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemComponent.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemEnum.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 561b76fa..12176ba6 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic; import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.util.helper.LogHelper; import WayofTime.bloodmagic.api_impl.BloodMagicAPI; import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 5d74c644..8075b2ae 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderItem; @@ -26,7 +26,7 @@ public class RenderEntityBloodLight extends Render { GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - this.renderItem.renderItem(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), ItemCameraTransforms.TransformType.GROUND); + this.renderItem.renderItem(ComponentType.REAGENT_BLOODLIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); super.doRender(entity, x, y, z, entityYaw, partialTicks); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 1c415701..ceb9d94b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -12,7 +12,7 @@ import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.util.helper.RecipeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; @@ -80,12 +80,12 @@ public class CategoryArchitect { category.getEntry("runeSpeed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSpeed.info.1"), 370)); category.addEntry("water", new EntryText(keyBase + "water", true)); - category.getEntry("water").addPage(BookUtils.getForgeRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER))); + category.getEntry("water").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_WATER.getStack())); category.getEntry("water").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER))); category.getEntry("water").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "water.info.1"), 370)); category.addEntry("lava", new EntryText(keyBase + "lava", true)); - category.getEntry("lava").addPage(BookUtils.getForgeRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA))); + category.getEntry("lava").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_LAVA.getStack())); category.getEntry("lava").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA))); category.getEntry("lava").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lava.info.1"), 370)); @@ -110,28 +110,18 @@ public class CategoryArchitect { category.getEntry("runeSelfSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSelfSacrifice.info.1"), 370)); category.addEntry("holding", new EntryText(keyBase + "holding", true)); - category.getEntry("holding").addPage(BookUtils.getForgeRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING))); + category.getEntry("holding").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_HOLDING.getStack())); category.getEntry("holding").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); category.getEntry("holding").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "holding.info.1"), 370)); - List airPages = new ArrayList(); - - TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_AIR)); - if (airRecipe != null) { - airPages.add(new PageTartaricForgeRecipe(airRecipe)); - } - - PageAlchemyArray airRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR)); - if (airRecipePage != null) { - airPages.add(airRecipePage); - } - - airPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "air" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "air"), new EntryText(airPages, TextHelper.localize(keyBase + "air"), true)); + category.addEntry("air", new EntryText(keyBase + "air", true)); + category.getEntry("air").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_AIR.getStack())); + category.getEntry("air").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR))); + category.getEntry("air").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "air.info.1"), 370)); List voidPages = new ArrayList(); - TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_VOID)); + TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_VOID.getStack()); if (voidRecipe != null) { voidPages.add(new PageTartaricForgeRecipe(voidRecipe)); } @@ -146,7 +136,7 @@ public class CategoryArchitect { List greenGrovePages = new ArrayList(); - TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH)); + TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_GROWTH.getStack()); if (greenGroveRecipe != null) { greenGrovePages.add(new PageTartaricForgeRecipe(greenGroveRecipe)); } @@ -161,7 +151,7 @@ public class CategoryArchitect { List fastMinerPages = new ArrayList(); - TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER)); + TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_FASTMINER.getStack()); if (fastMinerRecipe != null) { fastMinerPages.add(new PageTartaricForgeRecipe(fastMinerRecipe)); } @@ -176,7 +166,7 @@ public class CategoryArchitect { List seerPages = new ArrayList(); - TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT)); + TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_SIGHT.getStack()); if (seerRecipe != null) { seerPages.add(new PageTartaricForgeRecipe(seerRecipe)); } @@ -221,7 +211,7 @@ public class CategoryArchitect { List affinityPages = new ArrayList(); - TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY)); + TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_AFFINITY.getStack()); if (affinityRecipe != null) { affinityPages.add(new PageTartaricForgeRecipe(affinityRecipe)); } @@ -236,7 +226,7 @@ public class CategoryArchitect { List lampPages = new ArrayList(); - TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT)); + TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_BLOODLIGHT.getStack()); if (lampRecipe != null) { lampPages.add(new PageTartaricForgeRecipe(lampRecipe)); } @@ -251,7 +241,7 @@ public class CategoryArchitect { List magnetismPages = new ArrayList(); - TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM)); + TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_MAGNETISM.getStack()); if (magnetismRecipe != null) { magnetismPages.add(new PageTartaricForgeRecipe(magnetismRecipe)); } @@ -276,7 +266,7 @@ public class CategoryArchitect { List livingArmourPages = new ArrayList(); - TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_BINDING)); + TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_BINDING.getStack()); if (bindingRecipe != null) { livingArmourPages.add(new PageTartaricForgeRecipe(bindingRecipe)); } @@ -416,7 +406,7 @@ public class CategoryArchitect { List suppressionPages = new ArrayList(); - TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION)); + TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_SUPPRESSION.getStack()); if (suppressionRecipe != null) { suppressionPages.add(new PageTartaricForgeRecipe(suppressionRecipe)); } @@ -431,7 +421,7 @@ public class CategoryArchitect { List hastePages = new ArrayList(); - TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_HASTE)); + TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_HASTE.getStack()); if (hasteRecipe != null) { hastePages.add(new PageTartaricForgeRecipe(hasteRecipe)); } @@ -446,7 +436,7 @@ public class CategoryArchitect { List severancePages = new ArrayList(); - TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE)); + TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_SEVERANCE.getStack()); if (severanceRecipe != null) { severancePages.add(new PageTartaricForgeRecipe(severanceRecipe)); } @@ -461,7 +451,7 @@ public class CategoryArchitect { List telepositionPages = new ArrayList(); - TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION)); + TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_TELEPOSITION.getStack()); if (telepositionRecipe != null) { telepositionPages.add(new PageTartaricForgeRecipe(telepositionRecipe)); } @@ -476,7 +466,7 @@ public class CategoryArchitect { List compressionPages = new ArrayList(); - TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION)); + TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_COMPRESSION.getStack()); if (compressionRecipe != null) { compressionPages.add(new PageTartaricForgeRecipe(compressionRecipe)); } @@ -491,7 +481,7 @@ public class CategoryArchitect { List bridgePages = new ArrayList(); - TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE)); + TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_BRIDGE.getStack()); if (bridgeRecipe != null) { bridgePages.add(new PageTartaricForgeRecipe(bridgeRecipe)); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 80b2cf1f..688c627c 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -8,14 +8,17 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.potion.PotionBloodMagic; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.MobEffects; +import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.EntityEntry; @@ -135,4 +138,10 @@ public class RegistrarBloodMagic { return orb.getModelLocation(); }); } + + @SubscribeEvent + public static void handleBurnTime(FurnaceFuelBurnTimeEvent event) { + if (ItemStack.areItemsEqual(event.getItemStack(), ComponentType.SAND_COAL.getStack())) + event.setBurnTime(1600); + } } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index d12b7bce..da72b025 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; +import WayofTime.bloodmagic.item.types.ComponentType; import com.google.common.collect.Lists; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; @@ -165,7 +166,7 @@ public class RegistrarBloodMagicItems { new ItemSigilClaw().setRegistryName("sigil_claw"), new ItemSigilBounce().setRegistryName("sigil_bounce"), new ItemSigilFrost().setRegistryName("sigil_frost"), - new ItemComponent().setRegistryName("component"), + new ItemEnum<>(ComponentType.class, "baseComponent").setRegistryName("component"), new ItemDemonCrystal().setRegistryName("item_demon_crystal"), new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_tome"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 49660987..66f231cf 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -8,10 +8,10 @@ import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api_impl.BloodMagicRecipeRegistrar; import WayofTime.bloodmagic.apiv2.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.soul.ItemSoulGem; +import WayofTime.bloodmagic.item.types.ComponentType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -100,32 +100,32 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_WATER), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_VOID), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_AIR), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), 64, 20, "chestWood", "leather", "string", "string"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.REAGENT_FROST), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); + registrar.addTartaricForge(ComponentType.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); + registrar.addTartaricForge(ComponentType.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); + registrar.addTartaricForge(ComponentType.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); + registrar.addTartaricForge(ComponentType.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); + registrar.addTartaricForge(ComponentType.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); + registrar.addTartaricForge(ComponentType.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); + registrar.addTartaricForge(ComponentType.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); + registrar.addTartaricForge(ComponentType.REAGENT_FASTMINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); + registrar.addTartaricForge(ComponentType.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); + registrar.addTartaricForge(ComponentType.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); + registrar.addTartaricForge(ComponentType.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); + registrar.addTartaricForge(ComponentType.REAGENT_BLOODLIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); + registrar.addTartaricForge(ComponentType.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); + registrar.addTartaricForge(ComponentType.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); + registrar.addTartaricForge(ComponentType.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); + registrar.addTartaricForge(ComponentType.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); + registrar.addTartaricForge(ComponentType.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); + registrar.addTartaricForge(ComponentType.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); + registrar.addTartaricForge(ComponentType.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); + registrar.addTartaricForge(ComponentType.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addTartaricForge(ComponentType.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); + registrar.addTartaricForge(ComponentType.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - registrar.addTartaricForge(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); + registrar.addTartaricForge(ComponentType.COMPONENT_FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); diff --git a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java deleted file mode 100644 index aae512d7..00000000 --- a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.bloodmagic.fuel; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.IFuelHandler; - -public class FuelHandler implements IFuelHandler { - @Override - public int getBurnTime(ItemStack fuel) { - if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.COMPONENT && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata()) { - return 1600; - } - - return 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java deleted file mode 100644 index 4363715e..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ /dev/null @@ -1,137 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; - -public class ItemComponent extends Item implements IVariantProvider { - public static final String REAGENT_WATER = "reagentWater"; - public static final String REAGENT_LAVA = "reagentLava"; - public static final String REAGENT_AIR = "reagentAir"; - public static final String REAGENT_FASTMINER = "reagentFastMiner"; - public static final String REAGENT_VOID = "reagentVoid"; - public static final String REAGENT_GROWTH = "reagentGrowth"; - public static final String REAGENT_AFFINITY = "reagentAffinity"; - public static final String REAGENT_SIGHT = "reagentSight"; - public static final String REAGENT_BINDING = "reagentBinding"; - public static final String REAGENT_SUPPRESSION = "reagentSuppression"; - public static final String COMPONENT_FRAME_PART = "frameParts"; - public static final String REAGENT_BLOODLIGHT = "reagentBloodLight"; - public static final String REAGENT_MAGNETISM = "reagentMagnetism"; - public static final String REAGENT_HASTE = "reagentHaste"; - public static final String REAGENT_COMPRESSION = "reagentCompression"; - public static final String REAGENT_BRIDGE = "reagentBridge"; - public static final String REAGENT_SEVERANCE = "reagentSeverance"; - public static final String REAGENT_TELEPOSITION = "reagentTeleposition"; - public static final String REAGENT_TRANSPOSITION = "reagentTransposition"; - public static final String SAND_IRON = "ironSand"; - public static final String SAND_GOLD = "goldSand"; - public static final String SAND_COAL = "coalSand"; - public static final String PLANT_OIL = "plantOil"; - public static final String SULFUR = "sulfur"; - public static final String SALTPETER = "saltpeter"; - public static final String NEURO_TOXIN = "neurotoxin"; - public static final String ANTISEPTIC = "antiseptic"; - public static final String REAGENT_HOLDING = "reagentHolding"; - public static final String CATALYST_LENGTH_1 = "mundaneLength"; - public static final String CATALYST_POWER_1 = "mundanePower"; - public static final String REAGENT_CLAW = "reagentClaw"; - public static final String REAGENT_BOUNCE = "reagentBounce"; - public static final String REAGENT_FROST = "reagentFrost"; - private static ArrayList names = new ArrayList(); - - public ItemComponent() { - super(); - - setUnlocalizedName(BloodMagic.MODID + ".baseComponent."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - - buildItemList(); - } - - private void buildItemList() { - names.add(0, REAGENT_WATER); - names.add(1, REAGENT_LAVA); - names.add(2, REAGENT_AIR); - names.add(3, REAGENT_FASTMINER); - names.add(4, REAGENT_VOID); - names.add(5, REAGENT_GROWTH); - names.add(6, REAGENT_AFFINITY); - names.add(7, REAGENT_SIGHT); - names.add(8, REAGENT_BINDING); - names.add(9, REAGENT_SUPPRESSION); - names.add(10, COMPONENT_FRAME_PART); - names.add(11, REAGENT_BLOODLIGHT); - names.add(12, REAGENT_MAGNETISM); - names.add(13, REAGENT_HASTE); - names.add(14, REAGENT_COMPRESSION); - names.add(15, REAGENT_BRIDGE); - names.add(16, REAGENT_SEVERANCE); - names.add(17, REAGENT_TELEPOSITION); - names.add(18, REAGENT_TRANSPOSITION); - names.add(19, SAND_IRON); - names.add(20, SAND_GOLD); - names.add(21, SAND_COAL); - names.add(22, PLANT_OIL); - names.add(23, SULFUR); - names.add(24, SALTPETER); - names.add(25, NEURO_TOXIN); - names.add(26, ANTISEPTIC); - names.add(27, REAGENT_HOLDING); - names.add(28, CATALYST_LENGTH_1); - names.add(29, CATALYST_POWER_1); - names.add(30, REAGENT_CLAW); - names.add(31, REAGENT_BOUNCE); - names.add(32, REAGENT_FROST); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names.get(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (String name : names) - ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); - return ret; - } - - public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.COMPONENT, 1, names.indexOf(name)); - } - - public static ItemStack getStack(String key, int stackSize) { - ItemStack stack = getStack(key); - stack.setCount(stackSize); - - return stack; - } - - public static ArrayList getNames() { - return names; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java new file mode 100644 index 00000000..077149c1 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -0,0 +1,59 @@ +package WayofTime.bloodmagic.item; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.types.IEnumItem; +import com.google.common.collect.Lists; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.List; + +public class ItemEnum & IEnumItem> extends Item implements IVariantProvider { + + protected final T[] types; + + public ItemEnum(Class enumClass, String baseName) { + super(); + + this.types = enumClass.getEnumConstants(); + + setUnlocalizedName(BloodMagic.MODID + "." + baseName); + setHasSubtypes(types.length > 1); + setCreativeTab(BloodMagic.TAB_BM); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName(); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(CreativeTabs tab, NonNullList subItems) { + if (!isInCreativeTab(tab)) + return; + + for (T type : types) + subItems.add(new ItemStack(this, 1, type.ordinal())); + } + + public T getItemType(ItemStack stack) { + return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)]; + } + + @Override + public List> getVariants() { + List> variants = Lists.newArrayList(); + for (int i = 0; i < types.length; i++) + variants.add(Pair.of(i, "type=" + types[i].getInternalName())); + + return variants; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index bfd67b55..a17cff21 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -9,7 +9,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra; @@ -97,7 +97,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return ItemStack.areItemsEqual(repair, ItemComponent.getStack(ItemComponent.REAGENT_BINDING)); + return ItemStack.areItemsEqual(repair, ComponentType.REAGENT_BINDING.getStack()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java new file mode 100644 index 00000000..ab7fe88a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java @@ -0,0 +1,64 @@ +package WayofTime.bloodmagic.item.types; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public enum ComponentType implements IEnumItem { + + REAGENT_WATER, + REAGENT_LAVA, + REAGENT_AIR, + REAGENT_FASTMINER, + REAGENT_VOID, + REAGENT_GROWTH, + REAGENT_AFFINITY, + REAGENT_SIGHT, + REAGENT_BINDING, + REAGENT_SUPPRESSION, + COMPONENT_FRAME_PART, + REAGENT_BLOODLIGHT, + REAGENT_MAGNETISM, + REAGENT_HASTE, + REAGENT_COMPRESSION, + REAGENT_BRIDGE, + REAGENT_SEVERANCE, + REAGENT_TELEPOSITION, + REAGENT_TRANSPOSITION, + SAND_IRON, + SAND_GOLD, + SAND_COAL, + PLANT_OIL, + SULFUR, + SALTPETER, + NEURO_TOXIN, + ANTISEPTIC, + REAGENT_HOLDING, + CATALYST_LENGTH_1, + CATALYST_POWER_1, + REAGENT_CLAW, + REAGENT_BOUNCE, + REAGENT_FROST, + ; + + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack() { + return getStack(1); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal()); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java b/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java new file mode 100644 index 00000000..d7be59b7 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java @@ -0,0 +1,17 @@ +package WayofTime.bloodmagic.item.types; + +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; + +public interface IEnumItem { + + @Nonnull + String getInternalName(); + + @Nonnull + ItemStack getStack(); + + @Nonnull + ItemStack getStack(int count); +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index e02c1d54..253aba93 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -13,9 +13,9 @@ import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; +import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; @@ -39,8 +39,8 @@ import java.util.Map.Entry; public class ModRecipes { public static ArrayList addedOreRecipeList = new ArrayList(); - static ItemStack mundaneLengtheningStack = ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1); - static ItemStack mundanePowerStack = ItemComponent.getStack(ItemComponent.CATALYST_POWER_1); + static final ItemStack MUNDANE_LENGTHENING_STACK = ComponentType.CATALYST_LENGTH_1.getStack(); + static final ItemStack MUNDANE_POWER_STACK = ComponentType.CATALYST_POWER_1.getStack(); public static void init() { initOreDict(); @@ -55,52 +55,52 @@ public class ModRecipes { } public static void initOreDict() { - OreDictionary.registerOre("dustIron", ItemComponent.getStack(ItemComponent.SAND_IRON)); - OreDictionary.registerOre("dustGold", ItemComponent.getStack(ItemComponent.SAND_GOLD)); - OreDictionary.registerOre("dustCoal", ItemComponent.getStack(ItemComponent.SAND_COAL)); + OreDictionary.registerOre("dustIron", ComponentType.SAND_IRON.getStack()); + OreDictionary.registerOre("dustGold", ComponentType.SAND_GOLD.getStack()); + OreDictionary.registerOre("dustCoal", ComponentType.SAND_COAL.getStack()); } public static void addFurnaceRecipes() { - FurnaceRecipes.instance().addSmeltingRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON), new ItemStack(Items.IRON_INGOT), (float) 0.15); - FurnaceRecipes.instance().addSmeltingRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD), new ItemStack(Items.GOLD_INGOT), (float) 0.15); + FurnaceRecipes.instance().addSmeltingRecipe(ComponentType.SAND_IRON.getStack(), new ItemStack(Items.IRON_INGOT), (float) 0.15); + FurnaceRecipes.instance().addSmeltingRecipe(ComponentType.SAND_GOLD.getStack(), new ItemStack(Items.GOLD_INGOT), (float) 0.15); } public static void addAltarRecipes() { } public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_FASTMINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BLOODLIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); @@ -109,7 +109,7 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); } @@ -142,16 +142,16 @@ public class ModRecipes { AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.SULFUR, 8), 0, 100, 0, Items.LAVA_BUCKET); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.SALTPETER, 4), 0, 100, 0, ItemComponent.getStack(ItemComponent.PLANT_OIL), ItemComponent.getStack(ItemComponent.PLANT_OIL), "dustCoal"); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ItemComponent.getStack(ItemComponent.SALTPETER), ItemComponent.getStack(ItemComponent.SULFUR), new ItemStack(Items.COAL, 1, 1)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.SULFUR.getStack(8), 0, 100, 0, Items.LAVA_BUCKET); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.SALTPETER.getStack(4), 0, 100, 0, ComponentType.PLANT_OIL.getStack(), ComponentType.PLANT_OIL.getStack(), "dustCoal"); + AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ComponentType.SALTPETER.getStack(), ComponentType.SULFUR.getStack(), new ItemStack(Items.COAL, 1, 1)); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_COAL, 4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentType.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); - AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ItemComponent.getStack(ItemComponent.PLANT_OIL), new ItemStack(Items.POTIONITEM)); + AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentType.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON, 2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD, 2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentType.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentType.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); @@ -163,21 +163,21 @@ public class ModRecipes { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.PLANT_OIL.getStack(), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.PLANT_OIL.getStack(), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.PLANT_OIL.getStack(), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.PLANT_OIL.getStack(), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.NEURO_TOXIN), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.ANTISEPTIC, 2), 1000, 200, 2, ItemComponent.getStack(ItemComponent.PLANT_OIL), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentType.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); - AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ItemComponent.getStack(ItemComponent.NEURO_TOXIN), ItemComponent.getStack(ItemComponent.ANTISEPTIC), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); + AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ComponentType.NEURO_TOXIN.getStack(), ComponentType.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone"); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.CATALYST_POWER_1), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); + AlchemyTableRecipeRegistry.registerRecipe(ComponentType.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); } public static void addOreDoublingAlchemyRecipes() { @@ -229,12 +229,12 @@ public class ModRecipes { List lengtheningList = new ArrayList(); lengtheningList.add(inputStack); - lengtheningList.add(mundaneLengtheningStack); + lengtheningList.add(MUNDANE_LENGTHENING_STACK); AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getLengthAugmentRecipe(lpDrained, 100, tier, lengtheningList, baseEffect, 1)); List powerList = new ArrayList(); powerList.add(inputStack); - powerList.add(mundanePowerStack); + powerList.add(MUNDANE_POWER_STACK); AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getPowerAugmentRecipe(lpDrained, 100, tier, powerList, baseEffect, 1)); } From e4384dcec40bdbdaf148a4003fc03c1a875923b0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 22 Aug 2017 17:15:52 -0700 Subject: [PATCH 012/493] Stahp. --- src/main/java/WayofTime/bloodmagic/BloodMagic.java | 4 ++++ .../bloodmagic/ritual/RitualCobblestone.java | 4 ++-- ...eItAndJustWaitForMeToFinishPleaseAndThankYou.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/util/BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 12176ba6..05c86535 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -15,6 +15,7 @@ import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.proxy.CommonProxy; import WayofTime.bloodmagic.registry.*; import WayofTime.bloodmagic.structures.ModDungeons; +import WayofTime.bloodmagic.util.BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou; import WayofTime.bloodmagic.util.PluginUtil; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.IMCHandler; @@ -74,6 +75,9 @@ public class BloodMagic { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + if (!IS_DEV) + throw new BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou(); + configDir = new File(event.getModConfigurationDirectory(), "bloodmagic"); PLUGINS.addAll(PluginUtil.getPlugins(event.getAsmData())); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index 2a8be8aa..d5a01382 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -40,7 +40,7 @@ public class RitualCobblestone extends Ritual { if (tileEntity != null && tileEntity instanceof TileAlchemyArray) { TileAlchemyArray alchemyArray = (TileAlchemyArray) tileEntity; - if (!alchemyArray.getStackInSlot(0).isEmpty() && alchemyArray.getStackInSlot(0).getItem() instanceof ItemComponent) { + if (!alchemyArray.getStackInSlot(0).isEmpty() && alchemyArray.getStackInSlot(0).getItem() == RegistrarBloodMagicItems.COMPONENT) { switch (alchemyArray.getStackInSlot(0).getItemDamage()) { case 0: block = Blocks.OBSIDIAN; diff --git a/src/main/java/WayofTime/bloodmagic/util/BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou.java b/src/main/java/WayofTime/bloodmagic/util/BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou.java new file mode 100644 index 00000000..70cc23f0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou.java @@ -0,0 +1,12 @@ +package WayofTime.bloodmagic.util; + +public class BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou extends Error { + public BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou() { + super("Blood Magic isn't ready yet. Stop trying to use it and just wait for me to finish. Please and thank you."); + } + + @Override + public synchronized Throwable fillInStackTrace() { + return this; + } +} From 9133fdc167d447dbe20231f21f87ac35de3fedd2 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 22 Aug 2017 18:17:20 -0700 Subject: [PATCH 013/493] More effort moving forward with GAPI compat --- .../guideapi/book/CategoryArchitect.java | 240 ++++-------------- 1 file changed, 55 insertions(+), 185 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index ceb9d94b..52e9cce4 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -119,205 +119,75 @@ public class CategoryArchitect { category.getEntry("air").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR))); category.getEntry("air").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "air.info.1"), 370)); - List voidPages = new ArrayList(); + category.addEntry("void", new EntryText(keyBase + "void", true)); + category.getEntry("void").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_VOID.getStack())); + category.getEntry("void").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID))); + category.getEntry("void").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "void.info.1"), 370)); - TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_VOID.getStack()); - if (voidRecipe != null) { - voidPages.add(new PageTartaricForgeRecipe(voidRecipe)); - } + category.addEntry("greenGrove", new EntryText(keyBase + "greenGrove", true)); + category.getEntry("greenGrove").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_GROWTH.getStack())); + category.getEntry("greenGrove").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE))); + category.getEntry("greenGrove").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "greenGrove.info.1"), 370)); - PageAlchemyArray voidRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID)); - if (voidRecipePage != null) { - voidPages.add(voidRecipePage); - } + category.addEntry("fastMiner", new EntryText(keyBase + "fastMiner", true)); + category.getEntry("fastMiner").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_FASTMINER.getStack())); + category.getEntry("fastMiner").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER))); + category.getEntry("fastMiner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fastMiner.info.1"), 370)); - voidPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "void" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "void"), new EntryText(voidPages, TextHelper.localize(keyBase + "void"), true)); + category.addEntry("seer", new EntryText(keyBase + "seer", true)); + category.getEntry("seer").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_SIGHT.getStack())); + category.getEntry("seer").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER))); + category.getEntry("seer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "seer.info.1"), 370)); - List greenGrovePages = new ArrayList(); + category.addEntry("magicianOrb", new EntryText(keyBase + "magicianOrb", true)); + category.getEntry("magicianOrb").addPage(BookUtils.getAltarPage(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN))); + category.getEntry("magicianOrb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magicianOrb.info.1"), 370)); - TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_GROWTH.getStack()); - if (greenGroveRecipe != null) { - greenGrovePages.add(new PageTartaricForgeRecipe(greenGroveRecipe)); - } + category.addEntry("capacity", new EntryText(keyBase + "capacity", true)); + category.getEntry("capacity").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_capacity"))); + category.getEntry("capacity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "capacity.info.1"), 370)); - PageAlchemyArray greenGroveRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE)); - if (greenGroveRecipePage != null) { - greenGrovePages.add(greenGroveRecipePage); - } + category.addEntry("displacement", new EntryText(keyBase + "displacement", true)); + category.getEntry("displacement").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_displacement"))); + category.getEntry("displacement").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "displacement.info.1"), 370)); - greenGrovePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "greenGrove" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "greenGrove"), new EntryText(greenGrovePages, TextHelper.localize(keyBase + "greenGrove"), true)); + category.addEntry("affinity", new EntryText(keyBase + "affinity", true)); + category.getEntry("affinity").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_AFFINITY.getStack())); + category.getEntry("affinity").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY))); + category.getEntry("affinity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "affinity.info"), 370)); - List fastMinerPages = new ArrayList(); + category.addEntry("lamp", new EntryText(keyBase + "lamp", true)); + category.getEntry("lamp").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_BLOODLIGHT.getStack())); + category.getEntry("lamp").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT))); + category.getEntry("lamp").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lamp.info.1"), 370)); - TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_FASTMINER.getStack()); - if (fastMinerRecipe != null) { - fastMinerPages.add(new PageTartaricForgeRecipe(fastMinerRecipe)); - } + category.addEntry("magnetism", new EntryText(keyBase + "magnetism", true)); + category.getEntry("magnetism").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_MAGNETISM.getStack())); + category.getEntry("magnetism").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM))); + category.getEntry("magnetism").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magnetism.info.1"), 370)); - PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER)); - if (fastMinerRecipePage != null) { - fastMinerPages.add(fastMinerRecipePage); - } + category.addEntry("peritia", new EntryText(keyBase + "peritia", true)); + category.getEntry("peritia").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "experience_tome"))); + category.getEntry("peritia").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "peritia.info.1"), 370)); - fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); + category.addEntry("livingArmour", new EntryText(keyBase + "livingArmour", true)); + category.getEntry("livingArmour").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_BINDING.getStack())); + category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); + category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); + category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); + category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); + category.getEntry("livingArmour").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "livingArmour.info.1"), 370)); - List seerPages = new ArrayList(); + category.addEntry("upgradeTome", new EntryText(keyBase + "upgradeTome", true)); + category.getEntry("upgradeTome").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "upgradeTome.info.1"))); - TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_SIGHT.getStack()); - if (seerRecipe != null) { - seerPages.add(new PageTartaricForgeRecipe(seerRecipe)); - } + category.addEntry("downgrade", new EntryText(keyBase + "downgrade", true)); + category.getEntry("downgrade").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "downgrade.info.1"))); - PageAlchemyArray seerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER)); - if (seerRecipePage != null) { - seerPages.add(seerRecipePage); - } - - seerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "seer" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "seer"), new EntryText(seerPages, TextHelper.localize(keyBase + "seer"), true)); - - List magicianOrbPages = new ArrayList(); - - AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN)); - if (magicianOrbRecipe != null) { - magicianOrbPages.add(new PageAltarRecipe(magicianOrbRecipe)); - } - - magicianOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magicianOrb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "magicianOrb"), new EntryText(magicianOrbPages, TextHelper.localize(keyBase + "magicianOrb"), true)); - - List capacityPages = new ArrayList(); - - IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (capacityRecipe != null) { - capacityPages.add(BookUtils.getPageForRecipe(capacityRecipe)); - } - - capacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "capacity" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "capacity"), new EntryText(capacityPages, TextHelper.localize(keyBase + "capacity"), true)); - - List displacementPages = new ArrayList(); - - IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (displacementRecipe != null) { - displacementPages.add(BookUtils.getPageForRecipe(displacementRecipe)); - } - - displacementPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "displacement" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "displacement"), new EntryText(displacementPages, TextHelper.localize(keyBase + "displacement"), true)); - - List affinityPages = new ArrayList(); - - TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_AFFINITY.getStack()); - if (affinityRecipe != null) { - affinityPages.add(new PageTartaricForgeRecipe(affinityRecipe)); - } - - PageAlchemyArray affinityRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY)); - if (affinityRecipePage != null) { - affinityPages.add(affinityRecipePage); - } - - affinityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "affinity" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "affinity"), new EntryText(affinityPages, TextHelper.localize(keyBase + "affinity"), true)); - - List lampPages = new ArrayList(); - - TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_BLOODLIGHT.getStack()); - if (lampRecipe != null) { - lampPages.add(new PageTartaricForgeRecipe(lampRecipe)); - } - - PageAlchemyArray lampRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT)); - if (lampRecipePage != null) { - lampPages.add(lampRecipePage); - } - - lampPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lamp" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "lamp"), new EntryText(lampPages, TextHelper.localize(keyBase + "lamp"), true)); - - List magnetismPages = new ArrayList(); - - TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_MAGNETISM.getStack()); - if (magnetismRecipe != null) { - magnetismPages.add(new PageTartaricForgeRecipe(magnetismRecipe)); - } - - PageAlchemyArray magnetismRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM)); - if (magnetismRecipePage != null) { - magnetismPages.add(magnetismRecipePage); - } - - magnetismPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magnetism" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "magnetism"), new EntryText(magnetismPages, TextHelper.localize(keyBase + "magnetism"), true)); - - List peritiaPages = new ArrayList(); - - IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME)); - if (peritiaRecipe != null) { - peritiaPages.add(BookUtils.getPageForRecipe(peritiaRecipe)); - } - - peritiaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "peritia" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "peritia"), new EntryText(peritiaPages, TextHelper.localize(keyBase + "peritia"), true)); - - List livingArmourPages = new ArrayList(); - - TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_BINDING.getStack()); - if (bindingRecipe != null) { - livingArmourPages.add(new PageTartaricForgeRecipe(bindingRecipe)); - } - - PageAlchemyArray bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)); - if (bindingRecipePage != null) { - livingArmourPages.add(bindingRecipePage); - } - - bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)); - if (bindingRecipePage != null) { - livingArmourPages.add(bindingRecipePage); - } - - bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS)); - if (bindingRecipePage != null) { - livingArmourPages.add(bindingRecipePage); - } - - bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)); - if (bindingRecipePage != null) { - livingArmourPages.add(bindingRecipePage); - } - - livingArmourPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "livingArmour" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "livingArmour"), new EntryText(livingArmourPages, TextHelper.localize(keyBase + "livingArmour"), true)); - - List upgradePages = new ArrayList(); - - upgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "upgradeTome" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "upgradeTome"), new EntryText(upgradePages, TextHelper.localize(keyBase + "upgradeTome"), true)); - - List downgradePages = new ArrayList(); - - downgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "downgrade" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "downgrade"), new EntryText(downgradePages, TextHelper.localize(keyBase + "downgrade"), true)); - - List teleposerPages = new ArrayList(); - - AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)); - if (teleposerFocusRecipe != null) { - teleposerPages.add(new PageAltarRecipe(teleposerFocusRecipe)); - } - - IRecipe teleposerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER)); - if (teleposerRecipe != null) { - teleposerPages.add(BookUtils.getPageForRecipe(teleposerRecipe)); - } - - teleposerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposer" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "teleposer"), new EntryText(teleposerPages, TextHelper.localize(keyBase + "teleposer"), true)); + category.addEntry("teleposer", new EntryText(keyBase + "teleposer", true)); + category.getEntry("teleposer").addPage(BookUtils.getAltarPage(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS))); + category.getEntry("teleposer").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "teleposer"))); + category.getEntry("teleposer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "teleposer.info.1"), 370)); List boundBladePages = new ArrayList(); From 4a47f5cbdcc2ea9825aa7644cbd680f539183f0a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 23 Aug 2017 19:43:17 -0700 Subject: [PATCH 014/493] Finish moving guide over Some entries crash, others don't. I don't know why right now. It makes no sense. --- .../guideapi/BloodMagicGuideAPIPlugin.java | 5 +- .../bloodmagic/compat/guideapi/BookUtils.java | 8 +- .../compat/guideapi/book/CategoryAlchemy.java | 11 +- .../guideapi/book/CategoryArchitect.java | 313 ++++++------------ .../compat/guideapi/book/CategoryDemon.java | 220 ++++-------- .../compat/guideapi/book/CategoryRitual.java | 166 +++++----- .../compat/guideapi/book/CategorySpell.java | 17 - .../bloodmagic/proxy/CommonProxy.java | 3 - .../bloodmagic/util/helper/RecipeHelper.java | 15 - 9 files changed, 244 insertions(+), 514 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java index 33b8a2dc..505b88ea 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java @@ -40,9 +40,8 @@ public class BloodMagicGuideAPIPlugin implements IGuideBook { CategoryAlchemy.buildCategory(GUIDE_BOOK); CategoryArchitect.buildCategory(GUIDE_BOOK); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER))); -// GUIDE_BOOK.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner))); + CategoryDemon.buildCategory(GUIDE_BOOK); + CategoryRitual.buildCategory(GUIDE_BOOK); return GUIDE_BOOK; } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index a2cb6a10..1d0c2873 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.api_impl.BloodMagicAPI; @@ -9,6 +10,7 @@ import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; +import amerifrance.guideapi.page.PageJsonRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -28,7 +30,7 @@ public class BookUtils { } @Nullable - public static PageTartaricForgeRecipe getForgeRecipe(ItemStack output) { + public static PageTartaricForgeRecipe getForgePage(ItemStack output) { for (RecipeTartaricForge recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes().values()) if (ItemStack.areItemStacksEqualUsingNBTShareTag(output, recipe.getOutput())) return new PageTartaricForgeRecipe(recipe); @@ -36,6 +38,10 @@ public class BookUtils { return null; } + public static PageJsonRecipe getCraftingPage(String name) { + return new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, name)); + } + public static PageAlchemyArray getAlchemyPage(String key) { ItemStack[] recipe = AlchemyArrayRecipeRegistry.getRecipeForArrayEffect(key); if (recipe[0] != null) { diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index 2db144b0..e0f1d390 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -25,7 +25,7 @@ public class CategoryAlchemy { category.getEntry("intro").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "intro.info"), 370)); category.addEntry("ash", new EntryText(keyBase + "ash", true)); - category.getEntry("ash").addPage(BookUtils.getForgeRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); + category.getEntry("ash").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); category.getEntry("ash").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "ash.info"), 370)); category.addEntry("speed", new EntryText(keyBase + "speed", true)); @@ -52,14 +52,7 @@ public class CategoryAlchemy { category.getEntry("fastMiner").addPage(BookUtils.getAlchemyPage("fastMiner")); category.getEntry("fastMiner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fastMiner.info"), 370)); + category.entries.values().forEach(e -> e.pageList.stream().filter(p -> p instanceof PageText).forEach(p -> ((PageText) p).setUnicodeFlag(true))); book.addCategory(category); - - for (EntryAbstract entry : category.entries.values()) { - for (IPage page : entry.pageList) { - if (page instanceof PageText) { - ((PageText) page).setUnicodeFlag(true); - } - } - } } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 52e9cce4..1392936e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -1,38 +1,26 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; -import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ComponentType; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.category.CategoryItemStack; -import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.page.PageText; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.List; +import net.minecraft.nbt.NBTTagCompound; public class CategoryArchitect { public static void buildCategory(Book book) { final String keyBase = "guide." + BloodMagic.MODID + ".entry.architect."; + CategoryItemStack category = new CategoryItemStack(keyBase + "architect", new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)); category.withKeyBase(BloodMagic.MODID); @@ -40,13 +28,13 @@ public class CategoryArchitect { category.getEntry("intro").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "intro.info"), 370)); category.addEntry("bloodaltar", new EntryText(keyBase + "bloodaltar", true)); - category.getEntry("bloodaltar").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "altar"))); + category.getEntry("bloodaltar").addPage(BookUtils.getCraftingPage("altar")); category.getEntry("bloodaltar").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bloodaltar.info.1"), 370)); - category.getEntry("bloodaltar").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "sacrificial_dagger"))); + category.getEntry("bloodaltar").addPage(BookUtils.getCraftingPage("sacrificial_dagger")); category.getEntry("bloodaltar").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bloodaltar.info.2"), 370)); category.addEntry("ash", new EntryText(keyBase + "ash", true)); - category.getEntry("ash").addPage(BookUtils.getForgeRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); + category.getEntry("ash").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); category.getEntry("ash").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "ash.info"), 370)); category.addEntry("divination", new EntryText(keyBase + "divination", true)); @@ -58,17 +46,17 @@ public class CategoryArchitect { category.addEntry("weakorb", new EntryText(keyBase + "weakorb", true)); category.getEntry("weakorb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "weakorb.info1"), 370)); - category.getEntry("weakorb").addPage(BookUtils.getAltarPage(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK))); + category.getEntry("weakorb").addPage(BookUtils.getAltarPage(getOrbStack(RegistrarBloodMagic.ORB_WEAK))); category.getEntry("weakorb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "weakorb.info2"), 370)); category.addEntry("incense", new EntryText(keyBase + "incense", true)); - category.getEntry("incense").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "incense_altar"))); + category.getEntry("incense").addPage(BookUtils.getCraftingPage("incense_altar")); category.getEntry("incense").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "incense.info.1"), 370)); - category.getEntry("incense").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "path_wood"))); + category.getEntry("incense").addPage(BookUtils.getCraftingPage("path_wood")); category.getEntry("incense").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "incense.info.2"), 370)); category.addEntry("bloodrune", new EntryText(keyBase + "bloodrune", true)); - category.getEntry("bloodrune").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_blank"))); + category.getEntry("bloodrune").addPage(BookUtils.getCraftingPage("blood_rune_blank")); category.getEntry("bloodrune").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bloodrune.info.1"), 370)); category.addEntry("inspectoris", new EntryText(keyBase + "inspectoris", true)); @@ -80,21 +68,21 @@ public class CategoryArchitect { category.getEntry("runeSpeed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSpeed.info.1"), 370)); category.addEntry("water", new EntryText(keyBase + "water", true)); - category.getEntry("water").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_WATER.getStack())); + category.getEntry("water").addPage(BookUtils.getForgePage(ComponentType.REAGENT_WATER.getStack())); category.getEntry("water").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER))); category.getEntry("water").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "water.info.1"), 370)); category.addEntry("lava", new EntryText(keyBase + "lava", true)); - category.getEntry("lava").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_LAVA.getStack())); + category.getEntry("lava").addPage(BookUtils.getForgePage(ComponentType.REAGENT_LAVA.getStack())); category.getEntry("lava").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA))); category.getEntry("lava").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lava.info.1"), 370)); category.addEntry("lavaCrystal", new EntryText(keyBase + "lavaCrystal", true)); - category.getEntry("lavaCrystal").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "lava_crystal"))); + category.getEntry("lavaCrystal").addPage(BookUtils.getCraftingPage("lava_crystal")); category.getEntry("lavaCrystal").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lavaCrystal.info.1"), 370)); category.addEntry("apprenticeorb", new EntryText(keyBase + "apprenticeorb", true)); - category.getEntry("apprenticeorb").addPage(BookUtils.getAltarPage(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE))); + category.getEntry("apprenticeorb").addPage(BookUtils.getAltarPage(getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE))); category.getEntry("apprenticeorb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "apprenticeorb.info.1"), 370)); category.addEntry("dagger", new EntryText(keyBase + "dagger", true)); @@ -102,76 +90,76 @@ public class CategoryArchitect { category.getEntry("dagger").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "dagger.info.1"), 370)); category.addEntry("runeSacrifice", new EntryText(keyBase + "runeSacrifice", true)); - category.getEntry("runeSacrifice").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_sacrifice"))); + category.getEntry("runeSacrifice").addPage(BookUtils.getCraftingPage("blood_rune_sacrifice")); category.getEntry("runeSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSacrifice.info.1"), 370)); category.addEntry("runeSelfSacrifice", new EntryText(keyBase + "runeSelfSacrifice", true)); - category.getEntry("runeSelfSacrifice").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_selfsacrifice"))); + category.getEntry("runeSelfSacrifice").addPage(BookUtils.getCraftingPage("blood_rune_selfsacrifice")); category.getEntry("runeSelfSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSelfSacrifice.info.1"), 370)); category.addEntry("holding", new EntryText(keyBase + "holding", true)); - category.getEntry("holding").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_HOLDING.getStack())); + category.getEntry("holding").addPage(BookUtils.getForgePage(ComponentType.REAGENT_HOLDING.getStack())); category.getEntry("holding").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); category.getEntry("holding").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "holding.info.1"), 370)); category.addEntry("air", new EntryText(keyBase + "air", true)); - category.getEntry("air").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_AIR.getStack())); + category.getEntry("air").addPage(BookUtils.getForgePage(ComponentType.REAGENT_AIR.getStack())); category.getEntry("air").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR))); category.getEntry("air").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "air.info.1"), 370)); category.addEntry("void", new EntryText(keyBase + "void", true)); - category.getEntry("void").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_VOID.getStack())); + category.getEntry("void").addPage(BookUtils.getForgePage(ComponentType.REAGENT_VOID.getStack())); category.getEntry("void").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID))); category.getEntry("void").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "void.info.1"), 370)); category.addEntry("greenGrove", new EntryText(keyBase + "greenGrove", true)); - category.getEntry("greenGrove").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_GROWTH.getStack())); + category.getEntry("greenGrove").addPage(BookUtils.getForgePage(ComponentType.REAGENT_GROWTH.getStack())); category.getEntry("greenGrove").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE))); category.getEntry("greenGrove").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "greenGrove.info.1"), 370)); category.addEntry("fastMiner", new EntryText(keyBase + "fastMiner", true)); - category.getEntry("fastMiner").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_FASTMINER.getStack())); + category.getEntry("fastMiner").addPage(BookUtils.getForgePage(ComponentType.REAGENT_FASTMINER.getStack())); category.getEntry("fastMiner").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER))); category.getEntry("fastMiner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fastMiner.info.1"), 370)); category.addEntry("seer", new EntryText(keyBase + "seer", true)); - category.getEntry("seer").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_SIGHT.getStack())); + category.getEntry("seer").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SIGHT.getStack())); category.getEntry("seer").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER))); category.getEntry("seer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "seer.info.1"), 370)); category.addEntry("magicianOrb", new EntryText(keyBase + "magicianOrb", true)); - category.getEntry("magicianOrb").addPage(BookUtils.getAltarPage(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN))); + category.getEntry("magicianOrb").addPage(BookUtils.getAltarPage(getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN))); category.getEntry("magicianOrb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magicianOrb.info.1"), 370)); category.addEntry("capacity", new EntryText(keyBase + "capacity", true)); - category.getEntry("capacity").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_capacity"))); + category.getEntry("capacity").addPage(BookUtils.getCraftingPage("blood_rune_capacity")); category.getEntry("capacity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "capacity.info.1"), 370)); category.addEntry("displacement", new EntryText(keyBase + "displacement", true)); - category.getEntry("displacement").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "blood_rune_displacement"))); + category.getEntry("displacement").addPage(BookUtils.getCraftingPage("blood_rune_displacement")); category.getEntry("displacement").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "displacement.info.1"), 370)); category.addEntry("affinity", new EntryText(keyBase + "affinity", true)); - category.getEntry("affinity").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_AFFINITY.getStack())); + category.getEntry("affinity").addPage(BookUtils.getForgePage(ComponentType.REAGENT_AFFINITY.getStack())); category.getEntry("affinity").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY))); category.getEntry("affinity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "affinity.info"), 370)); category.addEntry("lamp", new EntryText(keyBase + "lamp", true)); - category.getEntry("lamp").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_BLOODLIGHT.getStack())); + category.getEntry("lamp").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BLOODLIGHT.getStack())); category.getEntry("lamp").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT))); category.getEntry("lamp").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lamp.info.1"), 370)); category.addEntry("magnetism", new EntryText(keyBase + "magnetism", true)); - category.getEntry("magnetism").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_MAGNETISM.getStack())); + category.getEntry("magnetism").addPage(BookUtils.getForgePage(ComponentType.REAGENT_MAGNETISM.getStack())); category.getEntry("magnetism").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM))); category.getEntry("magnetism").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magnetism.info.1"), 370)); category.addEntry("peritia", new EntryText(keyBase + "peritia", true)); - category.getEntry("peritia").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "experience_tome"))); + category.getEntry("peritia").addPage(BookUtils.getCraftingPage("experience_tome")); category.getEntry("peritia").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "peritia.info.1"), 370)); category.addEntry("livingArmour", new EntryText(keyBase + "livingArmour", true)); - category.getEntry("livingArmour").addPage(BookUtils.getForgeRecipe(ComponentType.REAGENT_BINDING.getStack())); + category.getEntry("livingArmour").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BINDING.getStack())); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); @@ -186,196 +174,85 @@ public class CategoryArchitect { category.addEntry("teleposer", new EntryText(keyBase + "teleposer", true)); category.getEntry("teleposer").addPage(BookUtils.getAltarPage(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS))); - category.getEntry("teleposer").addPage(new PageJsonRecipe(new ResourceLocation(BloodMagic.MODID, "teleposer"))); + category.getEntry("teleposer").addPage(BookUtils.getCraftingPage("teleposer")); category.getEntry("teleposer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "teleposer.info.1"), 370)); - List boundBladePages = new ArrayList(); + category.addEntry("boundBlade", new EntryText(keyBase + "boundBlade", true)); + category.getEntry("boundBlade").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))); + category.getEntry("boundBlade").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "boundBlade.info.1"), 370)); - PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD)); - if (boundBladePage != null) { - boundBladePages.add(boundBladePage); - } + category.addEntry("boundTool", new EntryText(keyBase + "boundTool", true)); + category.getEntry("boundTool").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE))); + category.getEntry("boundTool").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE))); + category.getEntry("boundTool").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL))); + category.getEntry("boundTool").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "boundTool.info.1"), 370)); + + category.addEntry("weakShard", new EntryText(keyBase + "weakShard", true)); + category.getEntry("weakShard").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "weakShard.info.1"), 370)); + + category.addEntry("masterOrb", new EntryText(keyBase + "masterOrb", true)); + category.getEntry("masterOrb").addPage(BookUtils.getAltarPage(getOrbStack(RegistrarBloodMagic.ORB_MASTER))); + category.getEntry("masterOrb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "masterOrb.info.1"), 370)); + + category.addEntry("runeOrb", new EntryText(keyBase + "runeOrb", true)); + category.getEntry("runeOrb").addPage(BookUtils.getCraftingPage("blood_rune_orb")); + category.getEntry("runeOrb").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeOrb.info.1"), 370)); + + category.addEntry("augmentedCapacity", new EntryText(keyBase + "augmentedCapacity", true)); + category.getEntry("augmentedCapacity").addPage(BookUtils.getCraftingPage("blood_rune_augcapacity")); + category.getEntry("augmentedCapacity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "augmentedCapacity.info.1"), 370)); - boundBladePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundBlade" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "boundBlade"), new EntryText(boundBladePages, TextHelper.localize(keyBase + "boundBlade"), true)); + category.addEntry("charging", new EntryText(keyBase + "charging", true)); + category.getEntry("charging").addPage(BookUtils.getCraftingPage("blood_rune_charging")); + category.getEntry("charging").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "charging.info.1"), 370)); - List boundToolPages = new ArrayList(); + category.addEntry("acceleration", new EntryText(keyBase + "acceleration", true)); + category.getEntry("acceleration").addPage(BookUtils.getCraftingPage("blood_rune_acceleration")); + category.getEntry("acceleration").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "acceleration.info.1"), 370)); - PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)); - if (boundToolPage != null) { - boundToolPages.add(boundToolPage); - } + category.addEntry("suppression", new EntryText(keyBase + "suppression", true)); + category.getEntry("suppression").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SUPPRESSION.getStack())); + category.getEntry("suppression").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION))); + category.getEntry("suppression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "suppression.info.1"), 370)); - boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)); - if (boundToolPage != null) { - boundToolPages.add(boundToolPage); - } + category.addEntry("haste", new EntryText(keyBase + "haste", true)); + category.getEntry("haste").addPage(BookUtils.getForgePage(ComponentType.REAGENT_HASTE.getStack())); + category.getEntry("haste").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE))); + category.getEntry("haste").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "haste.info.1"), 370)); - boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)); - if (boundToolPage != null) { - boundToolPages.add(boundToolPage); - } + category.addEntry("severance", new EntryText(keyBase + "severance", true)); + category.getEntry("severance").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SEVERANCE.getStack())); + category.getEntry("severance").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE))); + category.getEntry("severance").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "severance.info.1"), 370)); - boundToolPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundTool" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "boundTool"), new EntryText(boundToolPages, TextHelper.localize(keyBase + "boundTool"), true)); + category.addEntry("teleposition", new EntryText(keyBase + "teleposition", true)); + category.getEntry("teleposition").addPage(BookUtils.getForgePage(ComponentType.REAGENT_TELEPOSITION.getStack())); + category.getEntry("teleposition").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION))); + category.getEntry("teleposition").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "teleposition.info.1"), 370)); - List weakShardPages = new ArrayList(); + category.addEntry("compression", new EntryText(keyBase + "compression", true)); + category.getEntry("compression").addPage(BookUtils.getForgePage(ComponentType.REAGENT_COMPRESSION.getStack())); + category.getEntry("compression").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION))); + category.getEntry("compression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "compression.info.1"), 370)); - weakShardPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakShard" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "weakShard"), new EntryText(weakShardPages, TextHelper.localize(keyBase + "weakShard"), true)); + category.addEntry("bridge", new EntryText(keyBase + "bridge", true)); + category.getEntry("bridge").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BRIDGE.getStack())); + category.getEntry("bridge").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE))); + category.getEntry("bridge").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bridge.info.1"), 370)); - List masterOrbPages = new ArrayList(); - - AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER)); - if (magicianOrbRecipe != null) { - masterOrbPages.add(new PageAltarRecipe(masterOrbRecipe)); - } - - masterOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterOrb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "masterOrb"), new EntryText(masterOrbPages, TextHelper.localize(keyBase + "masterOrb"), true)); - - List orbRunePages = new ArrayList(); - - IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8)); - if (orbRuneRecipe != null) { - orbRunePages.add(BookUtils.getPageForRecipe(orbRuneRecipe)); - } - - orbRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeOrb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeOrb"), new EntryText(orbRunePages, TextHelper.localize(keyBase + "runeOrb"), true)); - - List augmentedCapacityPages = new ArrayList(); - - IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7)); - if (orbRuneRecipe != null) { - augmentedCapacityPages.add(BookUtils.getPageForRecipe(augmentedCapacityRecipe)); - } - - augmentedCapacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "augmentedCapacity" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "augmentedCapacity"), new EntryText(augmentedCapacityPages, TextHelper.localize(keyBase + "augmentedCapacity"), true)); - - List chargingPages = new ArrayList(); - - IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10)); - if (orbRuneRecipe != null) { - chargingPages.add(BookUtils.getPageForRecipe(chargingRecipe)); - } - - chargingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "charging" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "charging"), new EntryText(chargingPages, TextHelper.localize(keyBase + "charging"), true)); - - List accelerationPages = new ArrayList(); - - IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9)); - if (orbRuneRecipe != null) { - accelerationPages.add(BookUtils.getPageForRecipe(accelerationRecipe)); - } - - accelerationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "acceleration" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "acceleration"), new EntryText(accelerationPages, TextHelper.localize(keyBase + "acceleration"), true)); - - List suppressionPages = new ArrayList(); - - TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_SUPPRESSION.getStack()); - if (suppressionRecipe != null) { - suppressionPages.add(new PageTartaricForgeRecipe(suppressionRecipe)); - } - - PageAlchemyArray suppressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION)); - if (suppressionRecipePage != null) { - suppressionPages.add(suppressionRecipePage); - } - - suppressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "suppression" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "suppression"), new EntryText(suppressionPages, TextHelper.localize(keyBase + "suppression"), true)); - - List hastePages = new ArrayList(); - - TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_HASTE.getStack()); - if (hasteRecipe != null) { - hastePages.add(new PageTartaricForgeRecipe(hasteRecipe)); - } - - PageAlchemyArray hasteRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE)); - if (hasteRecipePage != null) { - hastePages.add(hasteRecipePage); - } - - hastePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "haste" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "haste"), new EntryText(hastePages, TextHelper.localize(keyBase + "haste"), true)); - - List severancePages = new ArrayList(); - - TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_SEVERANCE.getStack()); - if (severanceRecipe != null) { - severancePages.add(new PageTartaricForgeRecipe(severanceRecipe)); - } - - PageAlchemyArray severanceRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE)); - if (severanceRecipePage != null) { - severancePages.add(severanceRecipePage); - } - - severancePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "severance" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "severance"), new EntryText(severancePages, TextHelper.localize(keyBase + "severance"), true)); - - List telepositionPages = new ArrayList(); - - TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_TELEPOSITION.getStack()); - if (telepositionRecipe != null) { - telepositionPages.add(new PageTartaricForgeRecipe(telepositionRecipe)); - } - - PageAlchemyArray telepositionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION)); - if (telepositionRecipePage != null) { - telepositionPages.add(telepositionRecipePage); - } - - telepositionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposition" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "teleposition"), new EntryText(telepositionPages, TextHelper.localize(keyBase + "teleposition"), true)); - - List compressionPages = new ArrayList(); - - TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_COMPRESSION.getStack()); - if (compressionRecipe != null) { - compressionPages.add(new PageTartaricForgeRecipe(compressionRecipe)); - } - - PageAlchemyArray compressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION)); - if (compressionRecipePage != null) { - compressionPages.add(compressionRecipePage); - } - - compressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "compression" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "compression"), new EntryText(compressionPages, TextHelper.localize(keyBase + "compression"), true)); - - List bridgePages = new ArrayList(); - - TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentType.REAGENT_BRIDGE.getStack()); - if (bridgeRecipe != null) { - bridgePages.add(new PageTartaricForgeRecipe(bridgeRecipe)); - } - - PageAlchemyArray bridgeRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE)); - if (bridgeRecipePage != null) { - bridgePages.add(bridgeRecipePage); - } - - bridgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bridge" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "bridge"), new EntryText(bridgePages, TextHelper.localize(keyBase + "bridge"), true)); - - List mimicPages = new ArrayList(); - - IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 1, 1)); - if (mimicRecipe != null) { - mimicPages.add(BookUtils.getPageForRecipe(mimicRecipe)); - } - - mimicPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "mimic" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "mimic"), new EntryText(mimicPages, TextHelper.localize(keyBase + "mimic"), true)); + category.addEntry("mimic", new EntryText(keyBase + "mimic", true)); + category.getEntry("mimic").addPage(BookUtils.getCraftingPage("mimic_solidopaque")); + category.getEntry("mimic").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "mimic.info.1"), 370)); category.entries.values().forEach(e -> e.pageList.stream().filter(p -> p instanceof PageText).forEach(p -> ((PageText) p).setUnicodeFlag(true))); - book.addCategory(category); } + + private static ItemStack getOrbStack(BloodOrb orb) { + ItemStack ret = new ItemStack(RegistrarBloodMagicItems.BLOOD_ORB); + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("orb", BloodMagic.MODID + ":" + orb.getName()); + ret.setTagCompound(tag); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java index 3c5c338d..debc1cb2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -1,191 +1,95 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.PageHelper; +import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.page.PageText; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; public class CategoryDemon { - //TODO: Add Forge recipe pages - public static Map buildCategory() { - Map entries = new LinkedHashMap(); - String keyBase = "guide." + BloodMagic.MODID + ".entry.demon."; - List introPages = new ArrayList(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); -// introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); - entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); + public static void buildCategory(Book book) { + final String keyBase = "guide." + BloodMagic.MODID + ".entry.demon."; - List snarePages = new ArrayList(); - snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.1"), 370)); + CategoryItemStack category = new CategoryItemStack(keyBase + "demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); + category.withKeyBase(BloodMagic.MODID); - IRecipe snareRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE)); - if (snareRecipe != null) { - snarePages.add(BookUtils.getPageForRecipe(snareRecipe)); - } + category.addEntry("intro", new EntryText(keyBase + "intro", true)); + category.getEntry("intro").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "intro.info"), 370)); - snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "snare"), new EntryText(snarePages, TextHelper.localize(keyBase + "snare"), true)); + category.addEntry("snare", new EntryText(keyBase + "snare", true)); + category.getEntry("snare").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "snare.info.1"), 370)); + category.getEntry("snare").addPage(BookUtils.getCraftingPage("soul_snare")); + category.getEntry("snare").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "snare.info.2"), 370)); - List forgePages = new ArrayList(); - forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.1"), 370)); + category.addEntry("forge", new EntryText(keyBase + "forge", true)); + category.getEntry("forge").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "forge.info.1"), 370)); + category.getEntry("forge").addPage(BookUtils.getCraftingPage("soul_forge")); + category.getEntry("forge").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "forge.info.2"), 370)); - IRecipe forgeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE)); - if (forgeRecipe != null) { - forgePages.add(BookUtils.getPageForRecipe(forgeRecipe)); - } + category.addEntry("petty", new EntryText(keyBase + "petty", true)); + category.getEntry("petty").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "petty.info.1"), 370)); + category.getEntry("petty").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM))); + category.getEntry("petty").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "petty.info.2"), 370)); - forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "forge"), new EntryText(forgePages, TextHelper.localize(keyBase + "forge"), true)); + category.addEntry("sword", new EntryText(keyBase + "sword", true)); + category.getEntry("sword").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "sword.info.1"), 370)); + category.getEntry("sword").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD))); + category.getEntry("sword").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "sword.info.2"), 370)); - List pettyPages = new ArrayList(); - pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.1"), 370)); - TartaricForgeRecipe pettyRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM)); - if (pettyRecipe != null) { - pettyPages.add(new PageTartaricForgeRecipe(pettyRecipe)); - } - pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "petty"), new EntryText(pettyPages, TextHelper.localize(keyBase + "petty"), true)); + category.addEntry("lesser", new EntryText(keyBase + "lesser", true)); + category.getEntry("lesser").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lesser.info.1"), 370)); + category.getEntry("lesser").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1))); + category.getEntry("lesser").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lesser.info.2"), 370)); - List swordPages = new ArrayList(); - swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.1"), 370)); - TartaricForgeRecipe swordRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD)); - if (swordRecipe != null) { - swordPages.add(new PageTartaricForgeRecipe(swordRecipe)); - } - swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "sword"), new EntryText(swordPages, TextHelper.localize(keyBase + "sword"), true)); + category.addEntry("reactions", new EntryText(keyBase + "reactions", true)); + category.getEntry("reactions").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "reactions.info"), 370)); - List lesserPages = new ArrayList(); - lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.1"), 370)); - TartaricForgeRecipe lesserRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1)); - if (lesserRecipe != null) { - lesserPages.add(new PageTartaricForgeRecipe(lesserRecipe)); - } - lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "lesser"), new EntryText(lesserPages, TextHelper.localize(keyBase + "lesser"), true)); + category.addEntry("sentientGem", new EntryText(keyBase + "sentientGem", true)); + category.getEntry("sentientGem").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "sentientGem.info.1"), 370)); + category.getEntry("sentientGem").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "sentientGem.info.2"), 370)); - List reactionsPages = new ArrayList(); - reactionsPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "reactions" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "reactions"), new EntryText(reactionsPages, TextHelper.localize(keyBase + "reactions"), true)); + category.addEntry("routing", new EntryText(keyBase + "routing", true)); + category.getEntry("routing").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE))); + category.getEntry("routing").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE))); + category.getEntry("routing").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE))); + category.getEntry("routing").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE))); + category.getEntry("routing").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER))); + category.getEntry("routing").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "routing.info"), 370)); - List sentientGemPages = new ArrayList(); - sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.1"), 370)); - sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "sentientGem"), new EntryText(sentientGemPages, TextHelper.localize(keyBase + "sentientGem"), true)); + category.addEntry("aura", new EntryText(keyBase + "aura", true)); + category.getEntry("aura").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "aura.info"), 370)); - List routingPages = new ArrayList(); - TartaricForgeRecipe nodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - if (nodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(nodeRecipe)); - } - TartaricForgeRecipe inputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE)); - if (inputNodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(inputNodeRecipe)); - } - TartaricForgeRecipe outputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE)); - if (outputNodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(outputNodeRecipe)); - } - TartaricForgeRecipe masterNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE)); - if (masterNodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(masterNodeRecipe)); - } + category.addEntry("types", new EntryText(keyBase + "types", true)); + category.getEntry("types").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "types.info"), 370)); - TartaricForgeRecipe nodeRouterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER)); - if (nodeRouterRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(nodeRouterRecipe)); - } + category.addEntry("crucible", new EntryText(keyBase + "crucible", true)); + category.getEntry("crucible").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE))); + category.getEntry("crucible").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "crucible.info"), 370)); - routingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "routing" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "routing"), new EntryText(routingPages, TextHelper.localize(keyBase + "routing"), true)); + category.addEntry("crystallizer", new EntryText(keyBase + "crystallizer", true)); + category.getEntry("crystallizer").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER))); + category.getEntry("crystallizer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "crystallizer.info"), 370)); - List auraPages = new ArrayList(); + category.addEntry("cluster", new EntryText(keyBase + "cluster", true)); + category.getEntry("cluster").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL))); + category.getEntry("cluster").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "cluster.info"), 370)); - auraPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "aura" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "aura"), new EntryText(auraPages, TextHelper.localize(keyBase + "aura"), true)); + category.addEntry("pylon", new EntryText(keyBase + "pylon", true)); + category.getEntry("pylon").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON))); + category.getEntry("pylon").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "pylon.info"), 370)); - List typesPages = new ArrayList(); + category.addEntry("gauge", new EntryText(keyBase + "gauge", true)); + category.getEntry("gauge").addPage(BookUtils.getForgePage(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE))); + category.getEntry("gauge").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "gauge.info"), 370)); - typesPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "types" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "types"), new EntryText(typesPages, TextHelper.localize(keyBase + "types"), true)); - - List cruciblePages = new ArrayList(); - - TartaricForgeRecipe crucibleRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE)); - if (crucibleRecipe != null) { - cruciblePages.add(new PageTartaricForgeRecipe(crucibleRecipe)); - } - - cruciblePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crucible" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "crucible"), new EntryText(cruciblePages, TextHelper.localize(keyBase + "crucible"), true)); - - List crystallizerPages = new ArrayList(); - - TartaricForgeRecipe crystallizerRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER)); - if (crystallizerRecipe != null) { - crystallizerPages.add(new PageTartaricForgeRecipe(crystallizerRecipe)); - } - - crystallizerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crystallizer" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "crystallizer"), new EntryText(crystallizerPages, TextHelper.localize(keyBase + "crystallizer"), true)); - - List clusterPages = new ArrayList(); - - TartaricForgeRecipe clusterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL)); - if (clusterRecipe != null) { - clusterPages.add(new PageTartaricForgeRecipe(clusterRecipe)); - } - - clusterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "cluster" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "cluster"), new EntryText(clusterPages, TextHelper.localize(keyBase + "cluster"), true)); - - List pylonPages = new ArrayList(); - - TartaricForgeRecipe pylonRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON)); - if (pylonRecipe != null) { - pylonPages.add(new PageTartaricForgeRecipe(pylonRecipe)); - } - - pylonPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "pylon" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "pylon"), new EntryText(pylonPages, TextHelper.localize(keyBase + "pylon"), true)); - - List gaugePages = new ArrayList(); - - TartaricForgeRecipe gaugeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE)); - if (gaugeRecipe != null) { - gaugePages.add(new PageTartaricForgeRecipe(gaugeRecipe)); - } - - gaugePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "gauge" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "gauge"), new EntryText(gaugePages, TextHelper.localize(keyBase + "gauge"), true)); - - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { - ((PageText) page).setUnicodeFlag(true); - } - } - } - - return entries; + category.entries.values().forEach(e -> e.pageList.stream().filter(p -> p instanceof PageText).forEach(p -> ((PageText) p).setUnicodeFlag(true))); + book.addCategory(category); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index a294a615..cb3f4e70 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -1,127 +1,113 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.PageHelper; +import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.page.PageText; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; public class CategoryRitual { - static String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual."; + static final String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual."; - public static Map buildCategory() { - Map entries = new LinkedHashMap(); + public static void buildCategory(Book book) { + CategoryItemStack category = new CategoryItemStack(keyBase + "ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER)); + category.withKeyBase(BloodMagic.MODID); - addRitualPagesToEntries("intro", entries); - addRitualPagesToEntries("basics", entries); + category.addEntry("intro", new EntryText(keyBase + "intro", true)); + category.getEntry("intro").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "intro.info"))); - List ritualStonePages = new ArrayList(); + category.addEntry("basics", new EntryText(keyBase + "basics", true)); + category.getEntry("basics").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "basics.info"))); - IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); - if (ritualStoneRecipe != null) { - ritualStonePages.add(BookUtils.getPageForRecipe(ritualStoneRecipe)); - } + category.addEntry("ritualStone", new EntryText(keyBase + "ritualStone", true)); + category.getEntry("ritualStone").addPage(BookUtils.getCraftingPage("ritual_stone_blank")); + category.getEntry("ritualStone").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "ritualStone.info.1"), 370)); + for (EnumRuneType type : EnumRuneType.values()) + category.getEntry("ritualStone").addPage(BookUtils.getAltarPage(type.getScribeStack())); + category.getEntry("ritualStone").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "ritualStone.info.2"), 370)); - ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.1"), 370)); + category.addEntry("masterRitualStone", new EntryText(keyBase + "masterRitualStone", true)); + category.getEntry("masterRitualStone").addPage(BookUtils.getCraftingPage("ritual_controller_master")); + category.getEntry("masterRitualStone").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "masterRitualStone.info"), 370)); - for (int i = 1; i < 5; i++) { - EnumRuneType type = EnumRuneType.values()[i]; - AltarRecipe scribeRecipe = RecipeHelper.getAltarRecipeForOutput(type.getScribeStack()); - if (scribeRecipe != null) { - ritualStonePages.add(new PageAltarRecipe(scribeRecipe)); - } - } + category.addEntry("activationCrystal", new EntryText(keyBase + "activationCrystal", true)); + category.getEntry("activationCrystal").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "activationCrystal.info.1"), 370)); + category.getEntry("activationCrystal").addPage(BookUtils.getAltarPage(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL))); + category.getEntry("activationCrystal").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "activationCrystal.info.2"), 370)); - ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "ritualStone"), new EntryText(ritualStonePages, TextHelper.localize(keyBase + "ritualStone"), true)); + category.addEntry("diviner", new EntryText(keyBase + "diviner", true)); + category.getEntry("diviner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "diviner.info.1"), 370)); + category.getEntry("diviner").addPage(BookUtils.getCraftingPage("ritual_diviner_0")); + category.getEntry("diviner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "diviner.info.2"), 370)); - List masterRitualStonePages = new ArrayList(); + category.addEntry("fullSpring", new EntryText(keyBase + "fullSpring", true)); + category.getEntry("fullSpring").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fullSpring.info"))); - IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 0)); - if (masterRitualStoneRecipe != null) { - masterRitualStonePages.add(BookUtils.getPageForRecipe(masterRitualStoneRecipe)); - } + category.addEntry("lava", new EntryText(keyBase + "lava", true)); + category.getEntry("lava").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lava.info"))); - masterRitualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterRitualStone" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "masterRitualStone"), new EntryText(masterRitualStonePages, TextHelper.localize(keyBase + "masterRitualStone"), true)); + category.addEntry("greenGrove", new EntryText(keyBase + "greenGrove", true)); + category.getEntry("greenGrove").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "greenGrove.info"))); - List activationCrystalPages = new ArrayList(); + category.addEntry("magnetism", new EntryText(keyBase + "magnetism", true)); + category.getEntry("magnetism").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magnetism.info"))); - activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.1"), 370)); + category.addEntry("crusher", new EntryText(keyBase + "crusher", true)); + category.getEntry("crusher").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "crusher.info"))); - AltarRecipe crystalRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL)); - if (crystalRecipe != null) { - activationCrystalPages.add(new PageAltarRecipe(crystalRecipe)); - } + category.addEntry("highJump", new EntryText(keyBase + "highJump", true)); + category.getEntry("highJump").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "highJump.info"))); - activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "activationCrystal"), new EntryText(activationCrystalPages, TextHelper.localize(keyBase + "activationCrystal"), true)); + category.addEntry("speed", new EntryText(keyBase + "speed", true)); + category.getEntry("speed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "speed.info"))); - List divinerPages = new ArrayList(); + category.addEntry("wellOfSuffering", new EntryText(keyBase + "wellOfSuffering", true)); + category.getEntry("wellOfSuffering").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "wellOfSuffering.info"))); - divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.1"), 370)); + category.addEntry("featheredKnife", new EntryText(keyBase + "featheredKnife", true)); + category.getEntry("featheredKnife").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "featheredKnife.info"))); - IRecipe divinerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER)); - if (divinerRecipe != null) { - divinerPages.add(BookUtils.getPageForRecipe(divinerRecipe)); - } + category.addEntry("regen", new EntryText(keyBase + "regen", true)); + category.getEntry("regen").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "regen.info"))); - divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "diviner"), new EntryText(divinerPages, TextHelper.localize(keyBase + "diviner"), true)); + category.addEntry("harvest", new EntryText(keyBase + "harvest", true)); + category.getEntry("harvest").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "harvest.info"))); - addRitualPagesToEntries("fullSpring", entries); - addRitualPagesToEntries("lava", entries); - addRitualPagesToEntries("greenGrove", entries); - addRitualPagesToEntries("magnetism", entries); - addRitualPagesToEntries("crusher", entries); - addRitualPagesToEntries("highJump", entries); - addRitualPagesToEntries("speed", entries); - addRitualPagesToEntries("wellOfSuffering", entries); - addRitualPagesToEntries("featheredKnife", entries); - addRitualPagesToEntries("regen", entries); - addRitualPagesToEntries("harvest", entries); - addRitualPagesToEntries("interdiction", entries); - addRitualPagesToEntries("containment", entries); - addRitualPagesToEntries("suppression", entries); - addRitualPagesToEntries("expulsion", entries); - addRitualPagesToEntries("zephyr", entries); - addRitualPagesToEntries("laying", entries); - addRitualPagesToEntries("timberman", entries); - addRitualPagesToEntries("meteor", entries); - addRitualPagesToEntries("downgrade", entries); + category.addEntry("interdiction", new EntryText(keyBase + "interdiction", true)); + category.getEntry("interdiction").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "interdiction.info"))); - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { - ((PageText) page).setUnicodeFlag(true); - } - } - } + category.addEntry("containment", new EntryText(keyBase + "containment", true)); + category.getEntry("containment").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "containment.info"))); - return entries; - } + category.addEntry("suppression", new EntryText(keyBase + "suppression", true)); + category.getEntry("suppression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "suppression.info"))); - public static void addRitualPagesToEntries(String name, Map entries) { - List pages = new ArrayList(); - pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + name + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + name), new EntryText(pages, TextHelper.localize(keyBase + name), true)); + category.addEntry("expulsion", new EntryText(keyBase + "expulsion", true)); + category.getEntry("expulsion").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "expulsion.info"))); + + category.addEntry("zephyr", new EntryText(keyBase + "zephyr", true)); + category.getEntry("zephyr").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "zephyr.info"))); + + category.addEntry("laying", new EntryText(keyBase + "laying", true)); + category.getEntry("laying").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "laying.info"))); + + category.addEntry("timberman", new EntryText(keyBase + "timberman", true)); + category.getEntry("timberman").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "timberman.info"))); + + category.addEntry("meteor", new EntryText(keyBase + "meteor", true)); + category.getEntry("meteor").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "meteor.info"))); + + category.addEntry("downgrade", new EntryText(keyBase + "downgrade", true)); + category.getEntry("downgrade").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "downgrade.info"))); + + category.entries.values().forEach(e -> e.pageList.stream().filter(p -> p instanceof PageText).forEach(p -> ((PageText) p).setUnicodeFlag(true))); + book.addCategory(category); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java deleted file mode 100644 index 765791a1..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.book; - -import WayofTime.bloodmagic.api.Constants; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import net.minecraft.util.ResourceLocation; - -import java.util.LinkedHashMap; -import java.util.Map; - -public class CategorySpell { - public static Map buildCategory() { - Map entries = new LinkedHashMap(); - String keyBase = Constants.Mod.DOMAIN + "spell_"; - - return entries; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 636310a4..ec248e4b 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; import WayofTime.bloodmagic.api.ritual.IRitualStone; import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.fuel.FuelHandler; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -13,12 +12,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.animation.ITimeValue; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fml.common.registry.GameRegistry; public class CommonProxy { public void preInit() { MinecraftForge.EVENT_BUS.register(TeleportQueue.getInstance()); - GameRegistry.registerFuelHandler(new FuelHandler()); registerRenderers(); } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java deleted file mode 100644 index 9e4fd5b7..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ /dev/null @@ -1,15 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; -import WayofTime.bloodmagic.api_impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; - -public class RecipeHelper { - - -} From 4c44c871e70723042147e289e6ba779dfc067a8f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 7 Sep 2017 22:31:59 -0700 Subject: [PATCH 015/493] No need for these to be maps --- .../api_impl/BloodMagicRecipeRegistrar.java | 67 ++++++++++--------- .../bloodmagic/compat/guideapi/BookUtils.java | 4 +- .../compat/jei/BloodMagicJEIPlugin.java | 6 +- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java index 6e251afe..ca586faa 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java @@ -7,9 +7,7 @@ import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.apiv2.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import com.google.common.collect.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; @@ -20,17 +18,18 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; import java.util.Map; +import java.util.Set; public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { - private final Map altarRecipes; - private final Map, RecipeAlchemyTable> alchemyRecipes; - private final Map, RecipeTartaricForge> tartaricForgeRecipes; + private final Set altarRecipes; + private final Set alchemyRecipes; + private final Set tartaricForgeRecipes; public BloodMagicRecipeRegistrar() { - this.altarRecipes = Maps.newHashMap(); - this.alchemyRecipes = Maps.newHashMap(); - this.tartaricForgeRecipes = Maps.newHashMap(); + this.altarRecipes = Sets.newHashSet(); + this.alchemyRecipes = Sets.newHashSet(); + this.tartaricForgeRecipes = Sets.newHashSet(); } @Override @@ -42,7 +41,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative."); - altarRecipes.put(input, new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); + altarRecipes.add(new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); } @Override @@ -54,7 +53,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { Preconditions.checkNotNull(input, "input cannot be null."); NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); - alchemyRecipes.put(inputs, new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); + alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); } @Override @@ -65,7 +64,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { Preconditions.checkNotNull(input, "input cannot be null."); NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); - tartaricForgeRecipes.put(inputs, new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); + tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); } public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { @@ -90,10 +89,12 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { @Nullable public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; - for (Map.Entry entry : altarRecipes.entrySet()) - if (entry.getKey().test(input)) - return entry.getValue(); + for (RecipeBloodAltar recipe : altarRecipes) + if (recipe.getInput().test(input)) + return recipe; return null; } @@ -101,19 +102,21 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { @Nullable public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; mainLoop: - for (Map.Entry, RecipeAlchemyTable> entry : alchemyRecipes.entrySet()) { - if (entry.getKey().size() != input.size()) + for (RecipeAlchemyTable recipe : alchemyRecipes) { + if (recipe.getInput().size() != input.size()) continue; - for (int i = 0; i > input.size(); i++) { - Ingredient ingredient = entry.getKey().get(i); + for (int i = 0; i < input.size(); i++) { + Ingredient ingredient = recipe.getInput().get(i); if (!ingredient.apply(input.get(i))) continue mainLoop; } - return entry.getValue(); + return recipe; } return null; @@ -122,33 +125,35 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { @Nullable public RecipeTartaricForge getTartaricForge(@Nonnull List input) { Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; mainLoop: - for (Map.Entry, RecipeTartaricForge> entry : tartaricForgeRecipes.entrySet()) { - if (entry.getKey().size() != input.size()) + for (RecipeTartaricForge recipe : tartaricForgeRecipes) { + if (recipe.getInput().size() != input.size()) continue; - for (int i = 0; i > input.size(); i++) { - Ingredient ingredient = entry.getKey().get(i); + for (int i = 0; i < input.size(); i++) { + Ingredient ingredient = recipe.getInput().get(i); if (!ingredient.apply(input.get(i))) continue mainLoop; } - return entry.getValue(); + return recipe; } return null; } - public Map getAltarRecipes() { - return ImmutableMap.copyOf(altarRecipes); + public Set getAltarRecipes() { + return ImmutableSet.copyOf(altarRecipes); } - public Map, RecipeAlchemyTable> getAlchemyRecipes() { - return ImmutableMap.copyOf(alchemyRecipes); + public Set getAlchemyRecipes() { + return ImmutableSet.copyOf(alchemyRecipes); } - public Map, RecipeTartaricForge> getTartaricForgeRecipes() { - return ImmutableMap.copyOf(tartaricForgeRecipes); + public Set getTartaricForgeRecipes() { + return ImmutableSet.copyOf(tartaricForgeRecipes); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 1d0c2873..a532d149 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -22,7 +22,7 @@ public class BookUtils { @Nullable public static PageAltarRecipe getAltarPage(ItemStack output) { - for (RecipeBloodAltar recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes().values()) + for (RecipeBloodAltar recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes()) if (ItemStack.areItemStacksEqualUsingNBTShareTag(output, recipe.getOutput())) return new PageAltarRecipe(recipe); @@ -31,7 +31,7 @@ public class BookUtils { @Nullable public static PageTartaricForgeRecipe getForgePage(ItemStack output) { - for (RecipeTartaricForge recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes().values()) + for (RecipeTartaricForge recipe : BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes()) if (ItemStack.areItemStacksEqualUsingNBTShareTag(output, recipe.getOutput())) return new PageTartaricForgeRecipe(recipe); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index 1ac3520d..1536dc3b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -46,9 +46,9 @@ public class BloodMagicJEIPlugin implements IModPlugin { new ArmourDowngradeRecipeHandler() ); - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes().values(), Constants.Compat.JEI_CATEGORY_ALTAR); - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyRecipes().values(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes().values(), Constants.Compat.JEI_CATEGORY_SOULFORGE); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(), Constants.Compat.JEI_CATEGORY_ALTAR); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(), Constants.Compat.JEI_CATEGORY_SOULFORGE); registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); registry.handleRecipes(RecipeAlchemyTable.class, AlchemyTableRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); From dd1dafe3dc12f080068fa4e791fa7540cec098e0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 7 Sep 2017 22:46:49 -0700 Subject: [PATCH 016/493] Allow removal of recipes For CraftTweaker and such --- .../api_impl/BloodMagicRecipeRegistrar.java | 18 ++++++++++ .../api_impl/recipe/IngredientTester.java | 34 +++++++++++++++++++ .../api_impl/recipe/RecipeAlchemyTable.java | 4 +-- .../api_impl/recipe/RecipeBloodAltar.java | 4 +-- .../api_impl/recipe/RecipeTartaricForge.java | 4 +-- 5 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java index ca586faa..48c88896 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java @@ -86,6 +86,24 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); } + public boolean removeBloodAltar(@Nonnull RecipeBloodAltar recipe) { + Preconditions.checkNotNull(recipe, "recipe cannot be null."); + + return altarRecipes.remove(recipe); + } + + public boolean removeAlchemyTable(@Nonnull RecipeAlchemyTable recipe) { + Preconditions.checkNotNull(recipe, "recipe cannot be null."); + + return alchemyRecipes.remove(recipe); + } + + public boolean removeTartaricForge(@Nonnull RecipeTartaricForge recipe) { + Preconditions.checkNotNull(recipe, "recipe cannot be null."); + + return tartaricForgeRecipes.remove(recipe); + } + @Nullable public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { Preconditions.checkNotNull(input, "input cannot be null."); diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java new file mode 100644 index 00000000..b429142e --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java @@ -0,0 +1,34 @@ +package WayofTime.bloodmagic.api_impl.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import java.util.List; + +public class IngredientTester { + + public static boolean compareIngredients(Ingredient ingredient1, Ingredient ingredient2) { + ItemStack[] stacks1 = ingredient1.getMatchingStacks(); + ItemStack[] stacks2 = ingredient2.getMatchingStacks(); + + if (stacks1.length != stacks2.length) + return false; + + for (int i = 0; i < stacks1.length; i++) + if (!ItemStack.areItemStacksEqualUsingNBTShareTag(stacks1[i], stacks2[i])) + return false; + + return true; + } + + public static boolean compareIngredients(List ingredients1, List ingredients2) { + if (ingredients1.size() != ingredients2.size()) + return false; + + for (int i = 0; i < ingredients1.size(); i++) + if (!compareIngredients(ingredients1.get(i), ingredients2.get(i))) + return false; + + return true; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java index 736b33e2..e37909e4 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java @@ -67,8 +67,8 @@ public class RecipeAlchemyTable { if (syphon != that.syphon) return false; if (ticks != that.ticks) return false; if (minimumTier != that.minimumTier) return false; - if (!input.equals(that.input)) return false; - return ItemStack.areItemStacksEqual(output, that.output); + if (!IngredientTester.compareIngredients(input, that.input)) return false; + return ItemStack.areItemStacksEqualUsingNBTShareTag(output, that.output); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java index 9b47ed43..120c769a 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java @@ -80,8 +80,8 @@ public class RecipeBloodAltar { if (minimumTier != that.minimumTier) return false; if (syphon != that.syphon) return false; if (drainRate != that.drainRate) return false; - if (!input.equals(that.input)) return false; - return ItemStack.areItemStacksEqual(output, that.output); + if (!IngredientTester.compareIngredients(input, that.input)) return false; + return ItemStack.areItemStacksEqualUsingNBTShareTag(output, that.output); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java index 6acc46cd..6a7ca7b4 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java @@ -60,8 +60,8 @@ public class RecipeTartaricForge { if (minimumSouls != that.minimumSouls) return false; if (soulDrain != that.soulDrain) return false; - if (!input.equals(that.input)) return false; - return ItemStack.areItemStacksEqual(output, that.output); + if (!IngredientTester.compareIngredients(input, that.input)) return false; + return ItemStack.areItemStacksEqualUsingNBTShareTag(output, that.output); } @Override From c58e29eeeac18c54de50f7f4099d7f7c4c1793ff Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 11 Sep 2017 15:43:18 -0700 Subject: [PATCH 017/493] Better recipe removal No more weird Ingredient comparison --- .../java/WayofTime/bloodmagic/BloodMagic.java | 2 +- .../api_impl/BloodMagicRecipeRegistrar.java | 46 +++++++++++-------- .../api_impl/recipe/IngredientTester.java | 34 -------------- .../api_impl/recipe/RecipeAlchemyTable.java | 24 ---------- .../api_impl/recipe/RecipeBloodAltar.java | 26 +---------- .../api_impl/recipe/RecipeTartaricForge.java | 26 ----------- .../apiv2/IBloodMagicRecipeRegistrar.java | 6 +++ 7 files changed, 35 insertions(+), 129 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 05c86535..c24c358f 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -41,8 +41,8 @@ public class BloodMagic { public static final String NAME = "Blood Magic: Alchemical Wizardry"; public static final String VERSION = "@VERSION@"; public static final String DEPEND = "required-after:guideapi;"; - public static final Logger LOGGER = LogManager.getLogger(NAME.substring(0, NAME.indexOf(":"))); public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + public static final Logger LOGGER = LogManager.getLogger(NAME.substring(0, NAME.indexOf(":"))); public static final List> PLUGINS = Lists.newArrayList(); public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { @Override diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java index 48c88896..432d9b40 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicRecipeRegistrar.java @@ -17,7 +17,6 @@ import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -import java.util.Map; import java.util.Set; public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { @@ -44,6 +43,13 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { altarRecipes.add(new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); } + @Override + public boolean removeBloodAltar(@Nonnull ItemStack input) { + Preconditions.checkNotNull(input, "input cannot be null."); + + return altarRecipes.remove(getBloodAltar(input)); + } + @Override public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { Preconditions.checkNotNull(output, "output cannot be null."); @@ -56,6 +62,16 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); } + @Override + public boolean removeAlchemyTable(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return alchemyRecipes.remove(getAlchemyTable(Lists.newArrayList(input))); + } + @Override public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { Preconditions.checkNotNull(output, "output cannot be null."); @@ -67,6 +83,16 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); } + @Override + public boolean removeTartaricForge(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); + } + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); @@ -86,24 +112,6 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); } - public boolean removeBloodAltar(@Nonnull RecipeBloodAltar recipe) { - Preconditions.checkNotNull(recipe, "recipe cannot be null."); - - return altarRecipes.remove(recipe); - } - - public boolean removeAlchemyTable(@Nonnull RecipeAlchemyTable recipe) { - Preconditions.checkNotNull(recipe, "recipe cannot be null."); - - return alchemyRecipes.remove(recipe); - } - - public boolean removeTartaricForge(@Nonnull RecipeTartaricForge recipe) { - Preconditions.checkNotNull(recipe, "recipe cannot be null."); - - return tartaricForgeRecipes.remove(recipe); - } - @Nullable public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { Preconditions.checkNotNull(input, "input cannot be null."); diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java deleted file mode 100644 index b429142e..00000000 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/IngredientTester.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.api_impl.recipe; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; - -import java.util.List; - -public class IngredientTester { - - public static boolean compareIngredients(Ingredient ingredient1, Ingredient ingredient2) { - ItemStack[] stacks1 = ingredient1.getMatchingStacks(); - ItemStack[] stacks2 = ingredient2.getMatchingStacks(); - - if (stacks1.length != stacks2.length) - return false; - - for (int i = 0; i < stacks1.length; i++) - if (!ItemStack.areItemStacksEqualUsingNBTShareTag(stacks1[i], stacks2[i])) - return false; - - return true; - } - - public static boolean compareIngredients(List ingredients1, List ingredients2) { - if (ingredients1.size() != ingredients2.size()) - return false; - - for (int i = 0; i < ingredients1.size(); i++) - if (!compareIngredients(ingredients1.get(i), ingredients2.get(i))) - return false; - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java index e37909e4..817201e1 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeAlchemyTable.java @@ -56,28 +56,4 @@ public class RecipeAlchemyTable { public final int getMinimumTier() { return minimumTier; } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof RecipeAlchemyTable)) return false; - - RecipeAlchemyTable that = (RecipeAlchemyTable) o; - - if (syphon != that.syphon) return false; - if (ticks != that.ticks) return false; - if (minimumTier != that.minimumTier) return false; - if (!IngredientTester.compareIngredients(input, that.input)) return false; - return ItemStack.areItemStacksEqualUsingNBTShareTag(output, that.output); - } - - @Override - public int hashCode() { - int result = input.hashCode(); - result = 31 * result + output.hashCode(); - result = 31 * result + syphon; - result = 31 * result + ticks; - result = 31 * result + minimumTier; - return result; - } } diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java index 120c769a..02640377 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeBloodAltar.java @@ -26,7 +26,7 @@ public class RecipeBloodAltar { public RecipeBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkNotNull(minimumTier, "minimumTier cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); Preconditions.checkArgument(minimumTier <= EnumAltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); @@ -69,28 +69,4 @@ public class RecipeBloodAltar { public final int getDrainRate() { return drainRate; } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof RecipeBloodAltar)) return false; - - RecipeBloodAltar that = (RecipeBloodAltar) o; - - if (minimumTier != that.minimumTier) return false; - if (syphon != that.syphon) return false; - if (drainRate != that.drainRate) return false; - if (!IngredientTester.compareIngredients(input, that.input)) return false; - return ItemStack.areItemStacksEqualUsingNBTShareTag(output, that.output); - } - - @Override - public int hashCode() { - int result = input.hashCode(); - result = 31 * result + output.hashCode(); - result = 31 * result + minimumTier.ordinal(); - result = 31 * result + syphon; - result = 31 * result + drainRate; - return result; - } } diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java index 6a7ca7b4..d1db42ae 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/recipe/RecipeTartaricForge.java @@ -50,30 +50,4 @@ public class RecipeTartaricForge { public final double getSoulDrain() { return soulDrain; } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof RecipeTartaricForge)) return false; - - RecipeTartaricForge that = (RecipeTartaricForge) o; - - if (minimumSouls != that.minimumSouls) return false; - if (soulDrain != that.soulDrain) return false; - if (!IngredientTester.compareIngredients(input, that.input)) return false; - return ItemStack.areItemStacksEqualUsingNBTShareTag(output, that.output); - } - - @Override - public int hashCode() { - int result; - long temp; - result = input.hashCode(); - result = 31 * result + output.hashCode(); - temp = Double.doubleToLongBits(minimumSouls); - result = 31 * result + (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(soulDrain); - result = 31 * result + (int) (temp ^ (temp >>> 32)); - return result; - } } diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java index 92c7ea6c..eb915423 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicRecipeRegistrar.java @@ -10,7 +10,13 @@ public interface IBloodMagicRecipeRegistrar { void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); + boolean removeBloodAltar(@Nonnull ItemStack input); + void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); + boolean removeAlchemyTable(@Nonnull ItemStack... input); + void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); + + boolean removeTartaricForge(@Nonnull ItemStack... input); } From 59a9394f9910d1bed9d2bf9c85ae3aafd93c90e4 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 11 Sep 2017 19:26:41 -0700 Subject: [PATCH 018/493] Move Reagents to their own items --- .../render/entity/RenderEntityBloodLight.java | 3 +- .../guideapi/book/CategoryArchitect.java | 37 ++--- .../core/RegistrarBloodMagicItems.java | 5 +- .../core/RegistrarBloodMagicRecipes.java | 47 +++---- .../WayofTime/bloodmagic/item/ItemEnum.java | 4 +- .../item/armour/ItemLivingArmour.java | 3 +- .../bloodmagic/item/types/ComponentType.java | 33 +---- .../types/{IEnumItem.java => ISubItem.java} | 6 +- .../bloodmagic/item/types/ReagentType.java | 46 +++++++ .../bloodmagic/registry/ModRecipes.java | 61 ++++----- .../bloodmagic/blockstates/component.json | 126 ++---------------- .../bloodmagic/blockstates/reagent.json | 121 +++++++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 69 +++++----- 13 files changed, 298 insertions(+), 263 deletions(-) rename src/main/java/WayofTime/bloodmagic/item/types/{IEnumItem.java => ISubItem.java} (69%) create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java create mode 100644 src/main/resources/assets/bloodmagic/blockstates/reagent.json diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 8075b2ae..dcf62cf9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderItem; @@ -26,7 +27,7 @@ public class RenderEntityBloodLight extends Render { GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - this.renderItem.renderItem(ComponentType.REAGENT_BLOODLIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); + this.renderItem.renderItem(ReagentType.REAGENT_BLOODLIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); super.doRender(entity, x, y, z, entityYaw, partialTicks); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 1392936e..9501278b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.category.CategoryItemStack; @@ -68,12 +69,12 @@ public class CategoryArchitect { category.getEntry("runeSpeed").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSpeed.info.1"), 370)); category.addEntry("water", new EntryText(keyBase + "water", true)); - category.getEntry("water").addPage(BookUtils.getForgePage(ComponentType.REAGENT_WATER.getStack())); + category.getEntry("water").addPage(BookUtils.getForgePage(ReagentType.REAGENT_WATER.getStack())); category.getEntry("water").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER))); category.getEntry("water").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "water.info.1"), 370)); category.addEntry("lava", new EntryText(keyBase + "lava", true)); - category.getEntry("lava").addPage(BookUtils.getForgePage(ComponentType.REAGENT_LAVA.getStack())); + category.getEntry("lava").addPage(BookUtils.getForgePage(ReagentType.REAGENT_LAVA.getStack())); category.getEntry("lava").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA))); category.getEntry("lava").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lava.info.1"), 370)); @@ -98,32 +99,32 @@ public class CategoryArchitect { category.getEntry("runeSelfSacrifice").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "runeSelfSacrifice.info.1"), 370)); category.addEntry("holding", new EntryText(keyBase + "holding", true)); - category.getEntry("holding").addPage(BookUtils.getForgePage(ComponentType.REAGENT_HOLDING.getStack())); + category.getEntry("holding").addPage(BookUtils.getForgePage(ReagentType.REAGENT_HOLDING.getStack())); category.getEntry("holding").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); category.getEntry("holding").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "holding.info.1"), 370)); category.addEntry("air", new EntryText(keyBase + "air", true)); - category.getEntry("air").addPage(BookUtils.getForgePage(ComponentType.REAGENT_AIR.getStack())); + category.getEntry("air").addPage(BookUtils.getForgePage(ReagentType.REAGENT_AIR.getStack())); category.getEntry("air").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR))); category.getEntry("air").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "air.info.1"), 370)); category.addEntry("void", new EntryText(keyBase + "void", true)); - category.getEntry("void").addPage(BookUtils.getForgePage(ComponentType.REAGENT_VOID.getStack())); + category.getEntry("void").addPage(BookUtils.getForgePage(ReagentType.REAGENT_VOID.getStack())); category.getEntry("void").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID))); category.getEntry("void").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "void.info.1"), 370)); category.addEntry("greenGrove", new EntryText(keyBase + "greenGrove", true)); - category.getEntry("greenGrove").addPage(BookUtils.getForgePage(ComponentType.REAGENT_GROWTH.getStack())); + category.getEntry("greenGrove").addPage(BookUtils.getForgePage(ReagentType.REAGENT_GROWTH.getStack())); category.getEntry("greenGrove").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE))); category.getEntry("greenGrove").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "greenGrove.info.1"), 370)); category.addEntry("fastMiner", new EntryText(keyBase + "fastMiner", true)); - category.getEntry("fastMiner").addPage(BookUtils.getForgePage(ComponentType.REAGENT_FASTMINER.getStack())); + category.getEntry("fastMiner").addPage(BookUtils.getForgePage(ReagentType.REAGENT_FASTMINER.getStack())); category.getEntry("fastMiner").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER))); category.getEntry("fastMiner").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "fastMiner.info.1"), 370)); category.addEntry("seer", new EntryText(keyBase + "seer", true)); - category.getEntry("seer").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SIGHT.getStack())); + category.getEntry("seer").addPage(BookUtils.getForgePage(ReagentType.REAGENT_SIGHT.getStack())); category.getEntry("seer").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER))); category.getEntry("seer").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "seer.info.1"), 370)); @@ -140,17 +141,17 @@ public class CategoryArchitect { category.getEntry("displacement").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "displacement.info.1"), 370)); category.addEntry("affinity", new EntryText(keyBase + "affinity", true)); - category.getEntry("affinity").addPage(BookUtils.getForgePage(ComponentType.REAGENT_AFFINITY.getStack())); + category.getEntry("affinity").addPage(BookUtils.getForgePage(ReagentType.REAGENT_AFFINITY.getStack())); category.getEntry("affinity").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY))); category.getEntry("affinity").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "affinity.info"), 370)); category.addEntry("lamp", new EntryText(keyBase + "lamp", true)); - category.getEntry("lamp").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BLOODLIGHT.getStack())); + category.getEntry("lamp").addPage(BookUtils.getForgePage(ReagentType.REAGENT_BLOODLIGHT.getStack())); category.getEntry("lamp").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT))); category.getEntry("lamp").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "lamp.info.1"), 370)); category.addEntry("magnetism", new EntryText(keyBase + "magnetism", true)); - category.getEntry("magnetism").addPage(BookUtils.getForgePage(ComponentType.REAGENT_MAGNETISM.getStack())); + category.getEntry("magnetism").addPage(BookUtils.getForgePage(ReagentType.REAGENT_MAGNETISM.getStack())); category.getEntry("magnetism").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM))); category.getEntry("magnetism").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "magnetism.info.1"), 370)); @@ -159,7 +160,7 @@ public class CategoryArchitect { category.getEntry("peritia").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "peritia.info.1"), 370)); category.addEntry("livingArmour", new EntryText(keyBase + "livingArmour", true)); - category.getEntry("livingArmour").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BINDING.getStack())); + category.getEntry("livingArmour").addPage(BookUtils.getForgePage(ReagentType.REAGENT_BINDING.getStack())); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); category.getEntry("livingArmour").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); @@ -211,32 +212,32 @@ public class CategoryArchitect { category.getEntry("acceleration").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "acceleration.info.1"), 370)); category.addEntry("suppression", new EntryText(keyBase + "suppression", true)); - category.getEntry("suppression").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SUPPRESSION.getStack())); + category.getEntry("suppression").addPage(BookUtils.getForgePage(ReagentType.REAGENT_SUPPRESSION.getStack())); category.getEntry("suppression").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION))); category.getEntry("suppression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "suppression.info.1"), 370)); category.addEntry("haste", new EntryText(keyBase + "haste", true)); - category.getEntry("haste").addPage(BookUtils.getForgePage(ComponentType.REAGENT_HASTE.getStack())); + category.getEntry("haste").addPage(BookUtils.getForgePage(ReagentType.REAGENT_HASTE.getStack())); category.getEntry("haste").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE))); category.getEntry("haste").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "haste.info.1"), 370)); category.addEntry("severance", new EntryText(keyBase + "severance", true)); - category.getEntry("severance").addPage(BookUtils.getForgePage(ComponentType.REAGENT_SEVERANCE.getStack())); + category.getEntry("severance").addPage(BookUtils.getForgePage(ReagentType.REAGENT_SEVERANCE.getStack())); category.getEntry("severance").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE))); category.getEntry("severance").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "severance.info.1"), 370)); category.addEntry("teleposition", new EntryText(keyBase + "teleposition", true)); - category.getEntry("teleposition").addPage(BookUtils.getForgePage(ComponentType.REAGENT_TELEPOSITION.getStack())); + category.getEntry("teleposition").addPage(BookUtils.getForgePage(ReagentType.REAGENT_TELEPOSITION.getStack())); category.getEntry("teleposition").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION))); category.getEntry("teleposition").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "teleposition.info.1"), 370)); category.addEntry("compression", new EntryText(keyBase + "compression", true)); - category.getEntry("compression").addPage(BookUtils.getForgePage(ComponentType.REAGENT_COMPRESSION.getStack())); + category.getEntry("compression").addPage(BookUtils.getForgePage(ReagentType.REAGENT_COMPRESSION.getStack())); category.getEntry("compression").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION))); category.getEntry("compression").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "compression.info.1"), 370)); category.addEntry("bridge", new EntryText(keyBase + "bridge", true)); - category.getEntry("bridge").addPage(BookUtils.getForgePage(ComponentType.REAGENT_BRIDGE.getStack())); + category.getEntry("bridge").addPage(BookUtils.getForgePage(ReagentType.REAGENT_BRIDGE.getStack())); category.getEntry("bridge").addPage(BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE))); category.getEntry("bridge").addPageList(PageHelper.pagesForLongText(I18n.format(keyBase + "bridge.info.1"), 370)); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index da72b025..8d046c24 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -17,6 +17,7 @@ import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import com.google.common.collect.Lists; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; @@ -79,6 +80,7 @@ public class RegistrarBloodMagicItems { public static final Item SIGIL_BOUNCE = Items.AIR; public static final Item SIGIL_FROST = Items.AIR; public static final Item COMPONENT = Items.AIR; + public static final Item REAGENT = Items.AIR; public static final Item ITEM_DEMON_CRYSTAL = Items.AIR; public static final Item TELEPOSITION_FOCUS = Items.AIR; public static final Item EXPERIENCE_TOME = Items.AIR; @@ -166,7 +168,8 @@ public class RegistrarBloodMagicItems { new ItemSigilClaw().setRegistryName("sigil_claw"), new ItemSigilBounce().setRegistryName("sigil_bounce"), new ItemSigilFrost().setRegistryName("sigil_frost"), - new ItemEnum<>(ComponentType.class, "baseComponent").setRegistryName("component"), + new ItemEnum<>(ComponentType.class, "component").setRegistryName("component"), + new ItemEnum<>(ReagentType.class, "reagent").setRegistryName("reagent"), new ItemDemonCrystal().setRegistryName("item_demon_crystal"), new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_tome"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 66f231cf..89ed8aa1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -100,32 +101,32 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - registrar.addTartaricForge(ComponentType.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - registrar.addTartaricForge(ComponentType.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - registrar.addTartaricForge(ComponentType.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - registrar.addTartaricForge(ComponentType.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - registrar.addTartaricForge(ComponentType.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - registrar.addTartaricForge(ComponentType.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - registrar.addTartaricForge(ComponentType.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); - registrar.addTartaricForge(ComponentType.REAGENT_FASTMINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - registrar.addTartaricForge(ComponentType.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - registrar.addTartaricForge(ComponentType.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - registrar.addTartaricForge(ComponentType.REAGENT_BLOODLIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - registrar.addTartaricForge(ComponentType.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - registrar.addTartaricForge(ComponentType.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - registrar.addTartaricForge(ComponentType.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - registrar.addTartaricForge(ComponentType.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - registrar.addTartaricForge(ComponentType.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - registrar.addTartaricForge(ComponentType.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - registrar.addTartaricForge(ComponentType.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - registrar.addTartaricForge(ComponentType.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); + registrar.addTartaricForge(ReagentType.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); + registrar.addTartaricForge(ReagentType.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); + registrar.addTartaricForge(ReagentType.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); + registrar.addTartaricForge(ReagentType.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); + registrar.addTartaricForge(ReagentType.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); + registrar.addTartaricForge(ReagentType.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); + registrar.addTartaricForge(ReagentType.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); + registrar.addTartaricForge(ReagentType.REAGENT_FASTMINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); + registrar.addTartaricForge(ReagentType.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); + registrar.addTartaricForge(ReagentType.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); + registrar.addTartaricForge(ReagentType.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); + registrar.addTartaricForge(ReagentType.REAGENT_BLOODLIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); + registrar.addTartaricForge(ReagentType.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); + registrar.addTartaricForge(ReagentType.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); + registrar.addTartaricForge(ReagentType.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); + registrar.addTartaricForge(ReagentType.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); + registrar.addTartaricForge(ReagentType.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); + registrar.addTartaricForge(ReagentType.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); + registrar.addTartaricForge(ReagentType.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); + registrar.addTartaricForge(ReagentType.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addTartaricForge(ReagentType.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); + registrar.addTartaricForge(ReagentType.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentType.COMPONENT_FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); + registrar.addTartaricForge(ComponentType.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index 077149c1..e3799a0f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.types.IEnumItem; +import WayofTime.bloodmagic.item.types.ISubItem; import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,7 +15,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.List; -public class ItemEnum & IEnumItem> extends Item implements IVariantProvider { +public class ItemEnum & ISubItem> extends Item implements IVariantProvider { protected final T[] types; diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index a17cff21..55f632f9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -10,6 +10,7 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra; @@ -97,7 +98,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return ItemStack.areItemsEqual(repair, ComponentType.REAGENT_BINDING.getStack()); + return ItemStack.areItemsEqual(repair, ReagentType.REAGENT_BINDING.getStack()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java index ab7fe88a..c7dc721f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentType.java @@ -6,27 +6,9 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; import java.util.Locale; -public enum ComponentType implements IEnumItem { +public enum ComponentType implements ISubItem { - REAGENT_WATER, - REAGENT_LAVA, - REAGENT_AIR, - REAGENT_FASTMINER, - REAGENT_VOID, - REAGENT_GROWTH, - REAGENT_AFFINITY, - REAGENT_SIGHT, - REAGENT_BINDING, - REAGENT_SUPPRESSION, - COMPONENT_FRAME_PART, - REAGENT_BLOODLIGHT, - REAGENT_MAGNETISM, - REAGENT_HASTE, - REAGENT_COMPRESSION, - REAGENT_BRIDGE, - REAGENT_SEVERANCE, - REAGENT_TELEPOSITION, - REAGENT_TRANSPOSITION, + FRAME_PART, SAND_IRON, SAND_GOLD, SAND_COAL, @@ -35,27 +17,16 @@ public enum ComponentType implements IEnumItem { SALTPETER, NEURO_TOXIN, ANTISEPTIC, - REAGENT_HOLDING, CATALYST_LENGTH_1, CATALYST_POWER_1, - REAGENT_CLAW, - REAGENT_BOUNCE, - REAGENT_FROST, ; - @Nonnull @Override public String getInternalName() { return name().toLowerCase(Locale.ROOT); } - @Nonnull - @Override - public ItemStack getStack() { - return getStack(1); - } - @Nonnull @Override public ItemStack getStack(int count) { diff --git a/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java similarity index 69% rename from src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java rename to src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java index d7be59b7..27204050 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/IEnumItem.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java @@ -4,13 +4,15 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public interface IEnumItem { +public interface ISubItem { @Nonnull String getInternalName(); @Nonnull - ItemStack getStack(); + default ItemStack getStack() { + return getStack(1); + } @Nonnull ItemStack getStack(int count); diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java b/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java new file mode 100644 index 00000000..0691d87a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java @@ -0,0 +1,46 @@ +package WayofTime.bloodmagic.item.types; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public enum ReagentType implements ISubItem { + + REAGENT_WATER, + REAGENT_LAVA, + REAGENT_AIR, + REAGENT_FASTMINER, + REAGENT_VOID, + REAGENT_GROWTH, + REAGENT_AFFINITY, + REAGENT_SIGHT, + REAGENT_BINDING, + REAGENT_SUPPRESSION, + REAGENT_BLOODLIGHT, + REAGENT_MAGNETISM, + REAGENT_HASTE, + REAGENT_COMPRESSION, + REAGENT_BRIDGE, + REAGENT_SEVERANCE, + REAGENT_TELEPOSITION, + REAGENT_TRANSPOSITION, + REAGENT_CLAW, + REAGENT_BOUNCE, + REAGENT_FROST, + REAGENT_HOLDING, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal()); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 253aba93..a1cd31a2 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.types.ComponentType; +import WayofTime.bloodmagic.item.types.ReagentType; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; @@ -69,38 +70,38 @@ public class ModRecipes { } public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_FASTMINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BLOODLIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ComponentType.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_FASTMINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_BLOODLIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); + AlchemyArrayRecipeRegistry.registerCraftingRecipe(ReagentType.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); @@ -109,7 +110,7 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); } diff --git a/src/main/resources/assets/bloodmagic/blockstates/component.json b/src/main/resources/assets/bloodmagic/blockstates/component.json index eb690f3b..435f0f9a 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/component.json +++ b/src/main/resources/assets/bloodmagic/blockstates/component.json @@ -6,117 +6,27 @@ }, "variants": { "type": { - "reagentwater": { - "textures": { - "layer0": "bloodmagic:items/ReagentWater" - } - }, - "reagentlava": { - "textures": { - "layer0": "bloodmagic:items/ReagentLava" - } - }, - "reagentair": { - "textures": { - "layer0": "bloodmagic:items/ReagentAir" - } - }, - "reagentfastminer": { - "textures": { - "layer0": "bloodmagic:items/ReagentFastMiner" - } - }, - "reagentvoid": { - "textures": { - "layer0": "bloodmagic:items/ReagentVoid" - } - }, - "reagentgrowth": { - "textures": { - "layer0": "bloodmagic:items/ReagentGrowth" - } - }, - "reagentaffinity": { - "textures": { - "layer0": "bloodmagic:items/ReagentAffinity" - } - }, - "reagentsight": { - "textures": { - "layer0": "bloodmagic:items/ReagentSight" - } - }, - "reagentbinding": { - "textures": { - "layer0": "bloodmagic:items/ReagentBinding" - } - }, - "reagentsuppression": { - "textures": { - "layer0": "bloodmagic:items/ReagentSuppression" - } - }, - "frameparts": { + "frame_part": { "textures": { "layer0": "bloodmagic:items/ComponentFrameParts" } }, - "reagentbloodlight": { - "textures": { - "layer0": "bloodmagic:items/ReagentBloodLight" - } - }, - "reagentmagnetism": { - "textures": { - "layer0": "bloodmagic:items/ReagentMagnetism" - } - }, - "reagenthaste": { - "textures": { - "layer0": "bloodmagic:items/ReagentHaste" - } - }, - "reagentcompression": { - "textures": { - "layer0": "bloodmagic:items/ReagentCompression" - } - }, - "reagentbridge": { - "textures": { - "layer0": "bloodmagic:items/ReagentBridge" - } - }, - "reagentseverance": { - "textures": { - "layer0": "bloodmagic:items/ReagentSeverance" - } - }, - "reagentteleposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTeleposition" - } - }, - "reagenttransposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTransposition" - } - }, - "ironsand": { + "sand_iron": { "textures": { "layer0": "bloodmagic:items/IronSand" } }, - "goldsand": { + "sand_gold": { "textures": { "layer0": "bloodmagic:items/GoldSand" } }, - "coalsand": { + "sand_coal": { "textures": { "layer0": "bloodmagic:items/CoalSand" } }, - "plantoil": { + "plant_oil": { "textures": { "layer0": "bloodmagic:items/PlantOil" } @@ -131,7 +41,7 @@ "layer0": "bloodmagic:items/Saltpeter" } }, - "neurotoxin": { + "neuro_toxin": { "textures": { "layer0": "bloodmagic:items/NeuroToxin" } @@ -141,35 +51,15 @@ "layer0": "bloodmagic:items/Antiseptic" } }, - "reagentholding": { - "textures": { - "layer0": "bloodmagic:items/ReagentHolding" - } - }, - "mundanelength": { + "catalyst_length_1": { "textures": { "layer0": "bloodmagic:items/MundaneLengtheningCatalyst" } }, - "mundanepower": { + "catalyst_power_1": { "textures": { "layer0": "bloodmagic:items/MundanePowerCatalyst" } - }, - "reagentclaw": { - "textures": { - "layer0": "bloodmagic:items/ReagentClaw" - } - }, - "reagentbounce": { - "textures": { - "layer0": "bloodmagic:items/ReagentBounce" - } - }, - "reagentfrost": { - "textures": { - "layer0": "bloodmagic:items/ReagentFrost" - } } } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/reagent.json b/src/main/resources/assets/bloodmagic/blockstates/reagent.json new file mode 100644 index 00000000..ed82a929 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/reagent.json @@ -0,0 +1,121 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "reagent_water": { + "textures": { + "layer0": "bloodmagic:items/ReagentWater" + } + }, + "reagent_lava": { + "textures": { + "layer0": "bloodmagic:items/ReagentLava" + } + }, + "reagent_air": { + "textures": { + "layer0": "bloodmagic:items/ReagentAir" + } + }, + "reagent_fastminer": { + "textures": { + "layer0": "bloodmagic:items/ReagentFastMiner" + } + }, + "reagent_void": { + "textures": { + "layer0": "bloodmagic:items/ReagentVoid" + } + }, + "reagent_growth": { + "textures": { + "layer0": "bloodmagic:items/ReagentGrowth" + } + }, + "reagent_affinity": { + "textures": { + "layer0": "bloodmagic:items/ReagentAffinity" + } + }, + "reagent_sight": { + "textures": { + "layer0": "bloodmagic:items/ReagentSight" + } + }, + "reagent_binding": { + "textures": { + "layer0": "bloodmagic:items/ReagentBinding" + } + }, + "reagent_suppression": { + "textures": { + "layer0": "bloodmagic:items/ReagentSuppression" + } + }, + "reagent_bloodlight": { + "textures": { + "layer0": "bloodmagic:items/ReagentBloodLight" + } + }, + "reagent_magnetism": { + "textures": { + "layer0": "bloodmagic:items/ReagentMagnetism" + } + }, + "reagent_haste": { + "textures": { + "layer0": "bloodmagic:items/ReagentHaste" + } + }, + "reagent_compression": { + "textures": { + "layer0": "bloodmagic:items/ReagentCompression" + } + }, + "reagent_bridge": { + "textures": { + "layer0": "bloodmagic:items/ReagentBridge" + } + }, + "reagent_severance": { + "textures": { + "layer0": "bloodmagic:items/ReagentSeverance" + } + }, + "reagent_teleposition": { + "textures": { + "layer0": "bloodmagic:items/ReagentTeleposition" + } + }, + "reagent_transposition": { + "textures": { + "layer0": "bloodmagic:items/ReagentTransposition" + } + }, + "reagent_holding": { + "textures": { + "layer0": "bloodmagic:items/ReagentHolding" + } + }, + "reagent_claw": { + "textures": { + "layer0": "bloodmagic:items/ReagentClaw" + } + }, + "reagent_bounce": { + "textures": { + "layer0": "bloodmagic:items/ReagentBounce" + } + }, + "reagent_frost": { + "textures": { + "layer0": "bloodmagic:items/ReagentFrost" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 1c8ac9bf..bc712392 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -66,47 +66,44 @@ item.bloodmagic.reagent.potentia.name=Potentia item.bloodmagic.bloodShard.weak.name=Weak Blood Shard item.bloodmagic.bloodShard.demon.name=Demon Blood Shard -item.bloodmagic.baseComponent.reagentWater.name=Water Reagent -item.bloodmagic.baseComponent.reagentLava.name=Lava Reagent -item.bloodmagic.baseComponent.reagentAir.name=Air Reagent -item.bloodmagic.baseComponent.reagentFastMiner.name=Mining Reagent -item.bloodmagic.baseComponent.reagentVoid.name=Void Reagent -item.bloodmagic.baseComponent.reagentGrowth.name=Growth Reagent -item.bloodmagic.baseComponent.reagentAffinity.name=Elemental Affinity Reagent -item.bloodmagic.baseComponent.reagentSight.name=Sight Reagent -item.bloodmagic.baseComponent.reagentBinding.name=Binding Reagent -item.bloodmagic.baseComponent.reagentSuppression.name=Suppression Reagent -item.bloodmagic.baseComponent.frameParts.name=Frame Parts -item.bloodmagic.baseComponent.reagentBloodLight.name=Blood Lamp Reagent -item.bloodmagic.baseComponent.reagentMagnetism.name=Magnetism Reagent -item.bloodmagic.baseComponent.reagentHaste.name=Haste Reagent -item.bloodmagic.baseComponent.reagentBridge.name=Phantom Bridge Reagent -item.bloodmagic.baseComponent.reagentCompression.name=Compression Reagent -item.bloodmagic.baseComponent.reagentSeverance.name=Severance Reagent -item.bloodmagic.baseComponent.reagentHolding.name=Holding Reagent -item.bloodmagic.baseComponent.reagentClaw.name=Claw Reagent -item.bloodmagic.baseComponent.reagentBounce.name=Elasticity Reagent -item.bloodmagic.baseComponent.reagentFrost.name=Frost Reagent +item.bloodmagic.reagent.reagent_water.name=Water Reagent +item.bloodmagic.reagent.reagent_lava.name=Lava Reagent +item.bloodmagic.reagent.reagent_air.name=Air Reagent +item.bloodmagic.reagent.reagent_fastMiner.name=Mining Reagent +item.bloodmagic.reagent.reagent_void.name=Void Reagent +item.bloodmagic.reagent.reagent_growth.name=Growth Reagent +item.bloodmagic.reagent.reagent_affinity.name=Elemental Affinity Reagent +item.bloodmagic.reagent.reagent_sight.name=Sight Reagent +item.bloodmagic.reagent.reagent_binding.name=Binding Reagent +item.bloodmagic.reagent.reagent_suppression.name=Suppression Reagent +item.bloodmagic.reagent.reagent_bloodlight.name=Blood Lamp Reagent +item.bloodmagic.reagent.reagent_magnetism.name=Magnetism Reagent +item.bloodmagic.reagent.reagent_haste.name=Haste Reagent +item.bloodmagic.reagent.reagent_bridge.name=Phantom Bridge Reagent +item.bloodmagic.reagent.reagent_compression.name=Compression Reagent +item.bloodmagic.reagent.reagent_severance.name=Severance Reagent +item.bloodmagic.reagent.reagent_holding.name=Holding Reagent +item.bloodmagic.reagent.reagent_claw.name=Claw Reagent +item.bloodmagic.reagent.reagent_bounce.name=Elasticity Reagent +item.bloodmagic.reagent.reagent_frost.name=Frost Reagent +item.bloodmagic.reagent.reagent_teleposition.name=Teleposition Reagent +item.bloodmagic.reagent.reagent_transposition.name=Transposition Reagent -item.bloodmagic.baseComponent.reagentTeleposition.name=Teleposition Reagent -item.bloodmagic.baseComponent.reagentTransposition.name=Transposition Reagent - -item.bloodmagic.baseComponent.ironSand.name=Iron Sand -item.bloodmagic.baseComponent.goldSand.name=Gold Sand -item.bloodmagic.baseComponent.coalSand.name=Coal Sand -item.bloodmagic.baseComponent.plantOil.name=Plant Oil -item.bloodmagic.baseComponent.sulfur.name=Sulfur -item.bloodmagic.baseComponent.saltpeter.name=Saltpeter -item.bloodmagic.baseComponent.neurotoxin.name=Neuro Toxin -item.bloodmagic.baseComponent.antiseptic.name=Antiseptic +item.bloodmagic.component.frame_part.name=Frame Parts +item.bloodmagic.component.sand_iron.name=Iron Sand +item.bloodmagic.component.sand_gold.name=Gold Sand +item.bloodmagic.component.sand_coal.name=Coal Sand +item.bloodmagic.component.plant_oil.name=Plant Oil +item.bloodmagic.component.sulfur.name=Sulfur +item.bloodmagic.component.saltpeter.name=Saltpeter +item.bloodmagic.component.neuro_toxin.name=Neuro Toxin +item.bloodmagic.component.antiseptic.name=Antiseptic +item.bloodmagic.component.catalyst_length_1.name=Simple Lengthening Catalyst +item.bloodmagic.component.catalyst_power_1.name=Simple Power Catalyst item.bloodmagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid item.bloodmagic.cuttingFluid.explosive.name=Explosive Powder -item.bloodmagic.baseComponent.mundaneLength.name=Simple Lengthening Catalyst -item.bloodmagic.baseComponent.mundanePower.name=Simple Power Catalyst - - item.bloodmagic.demonCrystal.crystalDefault.name=Demon Will Crystal item.bloodmagic.demonCrystal.crystalCorrosive.name=Corrosive Will Crystal item.bloodmagic.demonCrystal.crystalDestructive.name=Destructive Will Crystal From 96c617886af921a927b83461c013935c700279b1 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 11 Sep 2017 19:26:48 -0700 Subject: [PATCH 019/493] Fix Guide recipe --- .../bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java index 505b88ea..8b6cff38 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java @@ -53,6 +53,6 @@ public class BloodMagicGuideAPIPlugin implements IGuideBook { @Nullable @Override public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "glass", "feather").setRegistryName("guide"); + return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "blockGlass", "feather").setRegistryName("guide"); } } From a0cd54969b3f43c1d3c891a3335abf8a153c575f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 8 Oct 2017 21:42:40 -0700 Subject: [PATCH 020/493] Begin Sigil migration --- .../WayofTime/bloodmagic/api/Constants.java | 5 +- .../bloodmagic/api/iface/IBindable.java | 16 +- .../bloodmagic/api/impl/ItemBindable.java | 4 +- .../provider/DataProviderBloodAltar.java | 2 +- .../core/RegistrarBloodMagicItems.java | 18 ++- .../bloodmagic/item/sigil/ItemSigilAir.java | 73 --------- .../item/sigil/ItemSigilBloodLight.java | 82 ---------- .../item/sigil/ItemSigilBounce.java | 22 --- .../bloodmagic/item/sigil/ItemSigilClaw.java | 22 --- .../item/sigil/ItemSigilDivination.java | 98 ------------ .../item/sigil/ItemSigilEnderSeverance.java | 30 ---- .../item/sigil/ItemSigilFastMiner.java | 52 ------ .../bloodmagic/item/sigil/ItemSigilFrost.java | 21 --- .../bloodmagic/item/sigil/sigil/ISigil.java | 51 ++++++ .../item/sigil/sigil/ItemSigil.java | 148 ++++++++++++++++++ .../item/sigil/sigil/ItemSigilDivination.java | 81 ++++++++++ .../bloodmagic/item/sigil/sigil/SigilAir.java | 52 ++++++ .../item/sigil/sigil/SigilBloodLight.java | 55 +++++++ .../item/sigil/sigil/SigilBounce.java | 22 +++ .../item/sigil/sigil/SigilClaw.java | 22 +++ .../SigilElementalAffinity.java} | 20 +-- .../item/sigil/sigil/SigilEnderSeverance.java | 26 +++ .../item/sigil/sigil/SigilFastMiner.java | 48 ++++++ .../item/sigil/sigil/SigilFrost.java | 21 +++ .../item/sigil/sigil/SigilHolding.java | 53 +++++++ .../java/WayofTime/bloodmagic/util/Utils.java | 25 ++- .../util/handler/event/GenericHandler.java | 9 ++ 27 files changed, 648 insertions(+), 430 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ISigil.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilDivination.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilAir.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBloodLight.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBounce.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilClaw.java rename src/main/java/WayofTime/bloodmagic/item/sigil/{ItemSigilElementalAffinity.java => sigil/SigilElementalAffinity.java} (52%) create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilEnderSeverance.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFastMiner.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFrost.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHolding.java diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index 4ead21b0..7a7640d7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -7,10 +7,11 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import java.util.Locale; +@Deprecated public class Constants { public static class NBT { - public static final String OWNER_UUID = "ownerUUID"; - public static final String OWNER_NAME = "ownerNAME"; + public static final String OWNER_UUID = "uuid"; + public static final String OWNER_NAME = "name"; public static final String USES = "uses"; public static final String ACTIVATED = "activated"; public static final String UNUSABLE = "unusable"; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java index 5b515342..dee1f4c6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java @@ -3,6 +3,8 @@ package WayofTime.bloodmagic.api.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + /** * Implement this interface on any Item that can be bound to a player. */ @@ -16,7 +18,10 @@ public interface IBindable { * @param stack - The owned ItemStack * @return - The username of the Item's owner */ - String getOwnerName(ItemStack stack); + @Nullable + default String getOwnerName(ItemStack stack) { + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString("name") : null; + } /** * Gets the UUID of the Item's owner. @@ -26,7 +31,10 @@ public interface IBindable { * @param stack - The owned ItemStack * @return - The UUID of the Item's owner */ - String getOwnerUUID(ItemStack stack); + @Nullable + default String getOwnerUUID(ItemStack stack) { + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString("uuid") : null; + } /** * Called when the player attempts to bind the item. @@ -35,5 +43,7 @@ public interface IBindable { * @param stack - The ItemStack to attempt binding * @return If binding was successful. */ - boolean onBind(EntityPlayer player, ItemStack stack); + default boolean onBind(EntityPlayer player, ItemStack stack) { + return true; + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java index 11fe41a2..38a0b4c4 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java @@ -25,11 +25,11 @@ public class ItemBindable extends Item implements IBindable { @Override public String getOwnerName(ItemStack stack) { - return !stack.isEmpty() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; } @Override public String getOwnerUUID(ItemStack stack) { - return !stack.isEmpty() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 9e3ddf39..f7be07dc 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; +import WayofTime.bloodmagic.item.sigil.sigil.ItemSigilDivination; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 8d046c24..40dccbcb 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -15,6 +15,8 @@ import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter; import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; +import WayofTime.bloodmagic.item.sigil.sigil.*; +import WayofTime.bloodmagic.item.sigil.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.item.types.ReagentType; @@ -146,28 +148,28 @@ public class RegistrarBloodMagicItems { new ItemBoundAxe().setRegistryName("bound_axe"), new ItemBoundShovel().setRegistryName("bound_shovel"), new ItemSigilDivination().setRegistryName("sigil_divination"), - new ItemSigilAir().setRegistryName("sigil_air"), + new ItemSigil(new SigilAir(), "air").setRegistryName("sigil_air"), new ItemSigilWater().setRegistryName("sigil_water"), new ItemSigilLava().setRegistryName("sigil_lava"), new ItemSigilVoid().setRegistryName("sigil_void"), new ItemSigilGreenGrove().setRegistryName("sigil_green_grove"), - new ItemSigilBloodLight().setRegistryName("sigil_blood_light"), - new ItemSigilElementalAffinity().setRegistryName("sigil_elemental_affinity"), + new ItemSigil(new SigilBloodLight(), "blood_light").setRegistryName("sigil_blood_light"), + new ItemSigil(new SigilElementalAffinity(), "elemental_affinity").setRegistryName("sigil_elemental_affinity"), new ItemSigilMagnetism().setRegistryName("sigil_magnetism"), new ItemSigilSuppression().setRegistryName("sigil_suppression"), new ItemSigilHaste().setRegistryName("sigil_haste"), - new ItemSigilFastMiner().setRegistryName("sigil_fast_miner"), + new ItemSigil(new SigilFastMiner(), "fast_miner").setRegistryName("sigil_fast_miner"), new ItemSigilSeer().setRegistryName("sigil_seer"), new ItemSigilPhantomBridge().setRegistryName("sigil_phantom_bridge"), new ItemSigilWhirlwind().setRegistryName("sigil_whirlwind"), new ItemSigilCompression().setRegistryName("sigil_compression"), - new ItemSigilEnderSeverance().setRegistryName("sigil_ender_severance"), + new ItemSigil(new SigilEnderSeverance(), "ender_severance").setRegistryName("sigil_ender_severance"), new ItemSigilHolding().setRegistryName("sigil_holding"), new ItemSigilTeleposition().setRegistryName("sigil_teleposition"), new ItemSigilTransposition().setRegistryName("sigil_transposition"), - new ItemSigilClaw().setRegistryName("sigil_claw"), - new ItemSigilBounce().setRegistryName("sigil_bounce"), - new ItemSigilFrost().setRegistryName("sigil_frost"), + new ItemSigil(new SigilClaw(), "claw").setRegistryName("sigil_claw"), + new ItemSigil(new SigilBounce(), "bounce").setRegistryName("sigil_bounce"), + new ItemSigil(new SigilFrost(), "frost").setRegistryName("sigil_frost"), new ItemEnum<>(ComponentType.class, "component").setRegistryName("component"), new ItemEnum<>(ReagentType.class, "reagent").setRegistryName("reagent"), new ItemDemonCrystal().setRegistryName("item_demon_crystal"), diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java deleted file mode 100644 index 885f02b5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; - -public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectProvider { - public ItemSigilAir() { - super("air", 50); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - boolean unusable = isUnusable(stack); - if (world.isRemote && !unusable) { - Vec3d vec = player.getLookVec(); - double wantedVelocity = 1.7; - - // TODO - Revisit after potions - if (player.isPotionActive(RegistrarBloodMagic.BOOST)) { - int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); - wantedVelocity += (1 + amplifier) * (0.35); - } - - player.motionX = vec.x * wantedVelocity; - player.motionY = vec.y * wantedVelocity; - player.motionZ = vec.z * wantedVelocity; - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - } - - if (!world.isRemote) { - if (!player.capabilities.isCreativeMode) - this.setUnusable(stack, !NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed())); - - if (!unusable) - player.fallDistance = 0; - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, EntityLivingBase attacker, EntityLivingBase target) { - target.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 200, 0)); - return true; - } - - @Override - public boolean providesEffectForWill(EnumDemonWillType type) { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java deleted file mode 100644 index 5f9fd16a..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ /dev/null @@ -1,82 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class ItemSigilBloodLight extends ItemSigilBase { - public ItemSigilBloodLight() { - super("blood_light", 10); - } - - @Override - public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { - if (getCooldownRemainder(stack) > 0) - reduceCooldown(stack); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - RayTraceResult mop = this.rayTrace(world, player, false); - - if (getCooldownRemainder(stack) > 0) - return super.onItemRightClick(world, player, hand); - - if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); - - if (world.isAirBlock(blockPos)) { - world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); - if (!world.isRemote) - NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()); - resetCooldown(stack); - player.swingArm(hand); - return super.onItemRightClick(world, player, hand); - } - } else { - if (!world.isRemote) { - world.spawnEntity(new EntityBloodLight(world, player)); - NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()); - } - resetCooldown(stack); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - public int getCooldownRemainder(ItemStack stack) { - return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING); - } - - public void reduceCooldown(ItemStack stack) { - NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); - } - - public void resetCooldown(ItemStack stack) { - NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java deleted file mode 100644 index 37a6eccb..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; - -public class ItemSigilBounce extends ItemSigilToggleableBase { - public ItemSigilBounce() { - super("bounce", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOUNCE, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java deleted file mode 100644 index 44753b5b..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; - -public class ItemSigilClaw extends ItemSigilToggleableBase { - public ItemSigilClaw() { - super("claw", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.CLING, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java deleted file mode 100644 index bc77fa24..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ /dev/null @@ -1,98 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.tile.TileIncenseAltar; -import WayofTime.bloodmagic.tile.TileInversionPillar; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { - public ItemSigilDivination() { - super("divination"); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { -// if (world instanceof WorldServer) -// { -// System.out.println("Testing..."); -//// BuildTestStructure s = new BuildTestStructure(); -//// s.placeStructureAtPosition(new Random(), Rotation.CLOCKWISE_180, (WorldServer) world, player.getPosition(), 0); -// DungeonTester.testDungeonElementWithOutput((WorldServer) world, player.getPosition()); -// } - -// if (!world.isRemote) -// { -// EntityCorruptedSheep fred = new EntityCorruptedSheep(world, EnumDemonWillType.DESTRUCTIVE); -// fred.setPosition(player.posX, player.posY, player.posZ); -// world.spawnEntityInWorld(fred); -// } - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - if (!world.isRemote) { - super.onItemRightClick(world, player, hand); - - RayTraceResult position = rayTrace(world, player, false); - - if (position == null) { - int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - List toSend = new ArrayList(); - if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) - toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", getOwnerName(stack))); - toSend.add(new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); - ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } else { - if (position.typeOfHit == RayTraceResult.Type.BLOCK) { - TileEntity tile = world.getTileEntity(position.getBlockPos()); - - if (tile != null && tile instanceof IBloodAltar) { - IBloodAltar altar = (IBloodAltar) tile; - int tier = altar.getTier().ordinal() + 1; - int currentEssence = altar.getCurrentBlood(); - int capacity = altar.getCapacity(); - altar.checkTier(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence), new TextComponentTranslation(tooltipBase + "currentAltarCapacity", capacity)); - } else if (tile != null && tile instanceof TileIncenseAltar) { - TileIncenseAltar altar = (TileIncenseAltar) tile; - altar.recheckConstruction(); - double tranquility = altar.tranquility; - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentTranquility", (int) ((100D * (int) (100 * tranquility)) / 100d)), new TextComponentTranslation(tooltipBase + "currentBonus", (int) (100 * altar.incenseAddition))); - } else if (tile != null && tile instanceof TileInversionPillar) { - TileInversionPillar pillar = (TileInversionPillar) tile; - double inversion = pillar.getCurrentInversion(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentInversion", ((int) (10 * inversion)) / 10d)); - } else - - { - int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); - } - } - } - } - - return super.onItemRightClick(world, player, hand); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java deleted file mode 100644 index 855c29ab..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ /dev/null @@ -1,30 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.Entity; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; - -import java.util.List; - -public class ItemSigilEnderSeverance extends ItemSigilToggleableBase { - public ItemSigilEnderSeverance() { - super("ender_severance", 200); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - List entityList = world.getEntitiesWithinAABB(Entity.class, new net.minecraft.util.math.AxisAlignedBB(player.posX - 4.5, player.posY - 4.5, player.posZ - 4.5, player.posX + 4.5, player.posY + 4.5, player.posZ + 4.5)); - for (Entity entity : entityList) { - if (entity instanceof EntityEnderman) - ((EntityEnderman) entity).addPotionEffect(new PotionEffect(RegistrarBloodMagic.PLANAR_BINDING, 40, 0)); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java deleted file mode 100644 index 8c6b1a27..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ /dev/null @@ -1,52 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; - -public class ItemSigilFastMiner extends ItemSigilToggleableBase { - public ItemSigilFastMiner() { - super("fast_miner", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - player.addPotionEffect(new PotionEffect(MobEffects.HASTE, 2, 0, true, false)); - } - - @Override - public boolean performArrayEffect(World world, BlockPos pos) { - double radius = 10; - int ticks = 600; - int potionPotency = 2; - - AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); - for (EntityPlayer player : playerList) { - if (!player.isPotionActive(MobEffects.HASTE) || (player.isPotionActive(MobEffects.HASTE) && player.getActivePotionEffect(MobEffects.HASTE).getAmplifier() < potionPotency)) { - player.addPotionEffect(new PotionEffect(MobEffects.HASTE, ticks, potionPotency)); - if (!player.capabilities.isCreativeMode) { - player.hurtResistantTime = 0; - player.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); - } - } - } - - return false; - } - - @Override - public boolean hasArrayEffect() { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java deleted file mode 100644 index dfaab6cd..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import net.minecraft.enchantment.EnchantmentFrostWalker; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemSigilFrost extends ItemSigilToggleableBase { - public ItemSigilFrost() { - super("frost", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - EnchantmentFrostWalker.freezeNearby(player, world, player.getPosition(), 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ISigil.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ISigil.java new file mode 100644 index 00000000..ddee7954 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ISigil.java @@ -0,0 +1,51 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.iface.IBindable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public interface ISigil extends IBindable { + + @Nonnull + default EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand) { + return EnumActionResult.PASS; + } + + default EnumActionResult onInteract(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumHand hand) { + return EnumActionResult.PASS; + } + + @Nonnegative + int getCost(); + + interface Toggle extends ISigil { + + default void onToggle(boolean active, @Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand) { + + } + + default void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnegative int itemSlot, boolean isHeld) { + + } + } + + interface Holding extends ISigil { + + int getSize(ItemStack stack); + + int getEquippedSigil(ItemStack stack); + + NonNullList getHeldSigils(ItemStack stack); + + void setHeldSigils(ItemStack stack, NonNullList inventory); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java new file mode 100644 index 00000000..1550549c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java @@ -0,0 +1,148 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.client.IMeshProvider; +import com.google.common.collect.Lists; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; +import java.util.List; + +public class ItemSigil extends Item implements IBindable, IMeshProvider { + + private final ISigil sigil; + + public ItemSigil(ISigil sigil, String name) { + this.sigil = sigil; + + setCreativeTab(BloodMagic.TAB_BM); + setUnlocalizedName(BloodMagic.MODID + ".sigil." + name); + setMaxStackSize(1); + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.newResult(EnumActionResult.FAIL, player.getHeldItem(hand)); + + ItemStack sigilStack = getSigilStack(player, hand); + if (getOwnerUUID(sigilStack) == null) + return ActionResult.newResult(EnumActionResult.FAIL, player.getHeldItem(hand)); + + if (sigil instanceof ISigil.Toggle && player.isSneaking()) { + boolean newState = toggleState(sigilStack); + ((ISigil.Toggle) sigil).onToggle(newState, sigilStack, player, world, hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); + } + + return ActionResult.newResult(sigil.onRightClick(sigilStack, player, world, hand), player.getHeldItem(hand)); + } + + @Override + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + if (PlayerHelper.isFakePlayer(player)) + return EnumActionResult.FAIL; + + return sigil.onInteract(getSigilStack(player, hand), player, world, pos, facing, hand); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if (!(entity instanceof EntityPlayer) || PlayerHelper.isFakePlayer((EntityPlayer) entity)) + return; + + ItemStack sigilStack = stack; + if (sigil instanceof ISigil.Holding) { + ISigil.Holding holding = (ISigil.Holding) sigil; + int current = holding.getEquippedSigil(stack); + sigilStack = holding.getHeldSigils(stack).get(current); + } + + if (sigil instanceof ISigil.Toggle && isActive(sigilStack)) { + ((ISigil.Toggle) sigil).onUpdate(sigilStack, (EntityPlayer) entity, world, itemSlot, isSelected); + if (entity.ticksExisted % 100 == 0) + NetworkHelper.getSoulNetwork(getOwnerUUID(sigilStack)).syphonAndDamage((EntityPlayer) entity, sigil.getCost()); + } + } + + @Override + public String getOwnerName(ItemStack stack) { + return sigil.getOwnerName(stack); + } + + @Override + public String getOwnerUUID(ItemStack stack) { + return sigil.getOwnerUUID(stack); + } + + public boolean toggleState(ItemStack stack) { + if (!stack.hasTagCompound()) + return false; + + boolean newState = !isActive(stack); + stack.getTagCompound().setBoolean("active", newState); + return newState; + } + + public boolean isActive(ItemStack stack) { + return stack.hasTagCompound() && stack.getTagCompound().getBoolean("active"); + } + + // TODO - Need to get ISigil from holding stack + public ItemStack getSigilStack(EntityPlayer player, EnumHand hand) { + ItemStack held = player.getHeldItem(hand); + + if (sigil instanceof ISigil.Holding) { + ISigil.Holding holding = (ISigil.Holding) sigil; + int current = holding.getEquippedSigil(held); + return holding.getHeldSigils(held).get(current); + } + + return held; + } + + @Override + public boolean onBind(EntityPlayer player, ItemStack stack) { + return sigil.onBind(player, stack); + } + + @SideOnly(Side.CLIENT) + @Override + public ItemMeshDefinition getMeshDefinition() { + return s -> { + if (!(sigil instanceof ISigil.Toggle)) + return new ModelResourceLocation(s.getItem().getRegistryName(), "inventory"); + + return new ModelResourceLocation(s.getItem().getRegistryName(), "active=" + isActive(s)); + }; + } + + @Override + public List getVariants() { + if (sigil instanceof ISigil.Toggle) { + return Lists.newArrayList( + "active=true", + "active=false" + ); + } else return Lists.newArrayList("inventory"); + } + + @Nullable + @Override + public ResourceLocation getCustomLocation() { + return null; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilDivination.java new file mode 100644 index 00000000..517a96f8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilDivination.java @@ -0,0 +1,81 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.altar.IBloodAltar; +import WayofTime.bloodmagic.api.iface.IAltarReader; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.tile.TileIncenseAltar; +import WayofTime.bloodmagic.tile.TileInversionPillar; +import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.NumeralHelper; +import com.google.common.collect.Lists; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import java.util.List; + +public class ItemSigilDivination extends ItemSigil implements IAltarReader { + + public ItemSigilDivination() { + super(new SigilDivination(), "divination"); + } + + public static class SigilDivination implements ISigil { + + @Nonnull + @Override + public EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand) { + RayTraceResult rayTrace = Utils.rayTrace(player, false); + if (rayTrace == null || rayTrace.typeOfHit == RayTraceResult.Type.MISS) { + printNetworkInformation(stack, player); + } else if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { + TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); + + String tooltipBase = "tooltip.bloodmagic.sigil.divination."; + if (tile != null && tile instanceof IBloodAltar) { + IBloodAltar altar = (IBloodAltar) tile; + int tier = altar.getTier().ordinal() + 1; + int currentEssence = altar.getCurrentBlood(); + int capacity = altar.getCapacity(); + altar.checkTier(); + ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence), new TextComponentTranslation(tooltipBase + "currentAltarCapacity", capacity)); + } else if (tile != null && tile instanceof TileIncenseAltar) { + TileIncenseAltar altar = (TileIncenseAltar) tile; + altar.recheckConstruction(); + double tranquility = altar.tranquility; + ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentTranquility", (int) ((100D * (int) (100 * tranquility)) / 100d)), new TextComponentTranslation(tooltipBase + "currentBonus", (int) (100 * altar.incenseAddition))); + } else if (tile != null && tile instanceof TileInversionPillar) { + TileInversionPillar pillar = (TileInversionPillar) tile; + double inversion = pillar.getCurrentInversion(); + ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentInversion", ((int) (10 * inversion)) / 10d)); + } else { + printNetworkInformation(stack, player); + } + } + return EnumActionResult.PASS; + } + + @Override + public int getCost() { + return 0; + } + + private void printNetworkInformation(ItemStack sigilStack, EntityPlayer player) { + int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(sigilStack)).getCurrentEssence(); + List toSend = Lists.newArrayList(); + if (getOwnerName(sigilStack) != null && !getOwnerName(sigilStack).equals(PlayerHelper.getUsernameFromPlayer(player))) + toSend.add(new TextComponentTranslation("tooltip.bloodmagic.sigil.divination.otherNetwork", getOwnerName(sigilStack))); + toSend.add(new TextComponentTranslation("tooltip.bloodmagic.sigil.divination.currentEssence", currentEssence)); + ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[0])); + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilAir.java new file mode 100644 index 00000000..66557822 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilAir.java @@ -0,0 +1,52 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilAir implements ISigil { + + @Nonnull + @Override + public EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand) { + if (world.isRemote) { + Vec3d vec = player.getLookVec(); + double wantedVelocity = 1.7D; + + if (player.isPotionActive(RegistrarBloodMagic.BOOST)) { + int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); + wantedVelocity += (1.0D + amplifier) * 0.35D; + } + + player.motionX = vec.x * wantedVelocity; + player.motionY = vec.y * wantedVelocity; + player.motionZ = vec.z * wantedVelocity; + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + } + + if (!world.isRemote) { + boolean unusable = false; + if (!player.capabilities.isCreativeMode) + unusable = !NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getCost()); + + if (!unusable) + player.fallDistance = 0; + } + + return EnumActionResult.SUCCESS; + } + + @Override + public int getCost() { + return 50; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBloodLight.java new file mode 100644 index 00000000..4f871fd8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBloodLight.java @@ -0,0 +1,55 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.util.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.CooldownTracker; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilBloodLight implements ISigil { + + @Nonnull + @Override + public EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand) { + Item item = stack.getItem(); + RayTraceResult mop = Utils.rayTrace(player, false); + + CooldownTracker cooldownTracker = player.getCooldownTracker(); + if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { + BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); + + if (world.getBlockState(blockPos).getBlock().isReplaceable(world, blockPos)) { + world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); + if (!world.isRemote) + NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getCost()); + player.swingArm(hand); + cooldownTracker.setCooldown(item, 10); + return EnumActionResult.SUCCESS; + } + } else { + if (!world.isRemote) { + world.spawnEntity(new EntityBloodLight(world, player)); + NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getCost()); + } + cooldownTracker.setCooldown(item, 10); + return EnumActionResult.SUCCESS; + } + + return EnumActionResult.PASS; + } + + @Override + public int getCost() { + return 10; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBounce.java new file mode 100644 index 00000000..1d145cc6 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilBounce.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilBounce implements ISigil.Toggle { + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOUNCE, 2, 0, true, false)); + } + + @Override + public int getCost() { + return 100; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilClaw.java new file mode 100644 index 00000000..eb6aaf12 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilClaw.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilClaw implements ISigil.Toggle { + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.CLING, 2, 0, true, false)); + } + + @Override + public int getCost() { + return 100; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilElementalAffinity.java similarity index 52% rename from src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java rename to src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilElementalAffinity.java index e28a310f..fac14b7e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilElementalAffinity.java @@ -1,25 +1,25 @@ -package WayofTime.bloodmagic.item.sigil; +package WayofTime.bloodmagic.item.sigil.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -public class ItemSigilElementalAffinity extends ItemSigilToggleableBase { - public ItemSigilElementalAffinity() { - super("elemental_affinity", 200); - } +import javax.annotation.Nonnull; + +public class SigilElementalAffinity implements ISigil.Toggle { @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { player.fallDistance = 0; player.extinguish(); player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 2, 1, true, false)); player.addPotionEffect(new PotionEffect(MobEffects.WATER_BREATHING, 2, 0, true, false)); } + + @Override + public int getCost() { + return 200; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilEnderSeverance.java new file mode 100644 index 00000000..cceff8d8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilEnderSeverance.java @@ -0,0 +1,26 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.entity.Entity; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import java.util.List; + +public class SigilEnderSeverance implements ISigil.Toggle { + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + List entityList = world.getEntitiesWithinAABB(Entity.class, new net.minecraft.util.math.AxisAlignedBB(player.posX - 4.5, player.posY - 4.5, player.posZ - 4.5, player.posX + 4.5, player.posY + 4.5, player.posZ + 4.5)); + entityList.stream().filter(e -> e instanceof EntityEnderman).forEach(e -> ((EntityEnderman) e).addPotionEffect(new PotionEffect(RegistrarBloodMagic.PLANAR_BINDING, 40, 0))); + } + + @Override + public int getCost() { + return 200; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFastMiner.java new file mode 100644 index 00000000..e4fdc50c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFastMiner.java @@ -0,0 +1,48 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilFastMiner implements ISigil.Toggle { + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + player.addPotionEffect(new PotionEffect(MobEffects.HASTE, 2, 0, true, false)); + } + + @Override + public int getCost() { + return 100; + } + +// @Override +// public boolean performArrayEffect(World world, BlockPos pos) { +// double radius = 10; +// int ticks = 600; +// int potionPotency = 2; +// +// AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); +// List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); +// for (EntityPlayer player : playerList) { +// if (!player.isPotionActive(MobEffects.HASTE) || (player.isPotionActive(MobEffects.HASTE) && player.getActivePotionEffect(MobEffects.HASTE).getAmplifier() < potionPotency)) { +// player.addPotionEffect(new PotionEffect(MobEffects.HASTE, ticks, potionPotency)); +// if (!player.capabilities.isCreativeMode) { +// player.hurtResistantTime = 0; +// player.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); +// } +// } +// } +// +// return false; +// } +// +// @Override +// public boolean hasArrayEffect() { +// return true; +// } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFrost.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFrost.java new file mode 100644 index 00000000..607a447c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFrost.java @@ -0,0 +1,21 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import net.minecraft.enchantment.EnchantmentFrostWalker; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilFrost implements ISigil.Toggle { + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + EnchantmentFrostWalker.freezeNearby(player, world, player.getPosition(), 1); + } + + @Override + public int getCost() { + return 100; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHolding.java new file mode 100644 index 00000000..c9827081 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHolding.java @@ -0,0 +1,53 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.NonNullList; + +public class SigilHolding implements ISigil.Holding { + + @Override + public int getCost() { + return 0; + } + + @Override + public int getSize(ItemStack stack) { + return 5; + } + + @Override + public int getEquippedSigil(ItemStack stack) { + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("current")) + return -1; + + return stack.getTagCompound().getInteger("current"); + } + + @Override + public NonNullList getHeldSigils(ItemStack stack) { + NonNullList inventory = NonNullList.withSize(getSize(stack), ItemStack.EMPTY); + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("inv")) + return inventory; + + NBTTagList invTag = stack.getTagCompound().getTagList("inv", 10); + for (int i = 0; i < invTag.tagCount(); i++) + inventory.set(i, new ItemStack(invTag.getCompoundTagAt(i))); + + return inventory; + } + + @Override + public void setHeldSigils(ItemStack stack, NonNullList inventory) { + NBTTagList invTag = new NBTTagList(); + for (ItemStack invStack : inventory) + if (!invStack.isEmpty()) + invTag.appendTag(invStack.writeToNBT(new NBTTagCompound())); + + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + stack.getTagCompound().setTag("inv", invTag); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index fdfcb6a4..f2d14f7e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -36,10 +36,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.ISpecialArmor; @@ -956,4 +953,24 @@ public class Utils { stack.getTagCompound().setLong(Constants.NBT.LEAST_SIG, itemUUID.getLeastSignificantBits()); } } + + public static RayTraceResult rayTrace(EntityPlayer player, boolean useLiquids) { + float pitch = player.rotationPitch; + float yaw = player.rotationYaw; + Vec3d eyePosition = new Vec3d(player.posX, player.posY + (double) player.getEyeHeight(), player.posZ); + + float f2 = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI); + float f3 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI); + float f4 = -MathHelper.cos(-pitch * 0.017453292F); + float f5 = MathHelper.sin(-pitch * 0.017453292F); + float f6 = f3 * f4; + float f7 = f2 * f4; + + double reachDistance = 5.0D; + if (player instanceof EntityPlayerMP) + reachDistance = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance(); + + Vec3d reachPosition = eyePosition.addVector((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); + return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index defb55fa..ee83e923 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -38,6 +38,7 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -69,6 +70,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; @@ -371,6 +373,13 @@ public class GenericHandler { } } + @SubscribeEvent(priority = EventPriority.HIGH) + public void onTooltip(ItemTooltipEvent event) { + if (event.getItemStack().getItem() instanceof IBindable) + if (((IBindable) event.getItemStack().getItem()).getOwnerUUID(event.getItemStack()) != null) + event.getToolTip().add(I18n.format("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(event.getItemStack()))); + } + @SubscribeEvent public void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { EntityPlayer player = event.player; From 2a1911ea07edf00d73afb7baa401aa16b4b0cc7d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 9 Oct 2017 12:29:43 -0700 Subject: [PATCH 021/493] Improve model handling --- .../bloodmagic/block/BlockAltar.java | 7 ++-- .../bloodmagic/block/BlockBloodTank.java | 8 ++--- .../bloodmagic/block/BlockDemonCrucible.java | 7 ++-- .../block/BlockDemonCrystallizer.java | 7 ++-- .../block/BlockDemonPillarBase.java | 9 ++--- .../block/BlockDemonPillarCapBase.java | 10 ++---- .../bloodmagic/block/BlockDemonPylon.java | 7 ++-- .../block/BlockDemonStairsBase.java | 9 ++--- .../bloodmagic/block/BlockDemonWallBase.java | 9 ++--- .../bloodmagic/block/BlockIncenseAltar.java | 7 ++-- .../block/BlockInversionPillar.java | 7 ++-- .../block/BlockInversionPillarEnd.java | 7 ++-- .../bloodmagic/block/BlockPhantom.java | 7 ++-- .../bloodmagic/block/BlockRoutingNode.java | 5 +-- .../bloodmagic/block/BlockSoulForge.java | 7 ++-- .../bloodmagic/block/BlockSpectral.java | 7 ++-- .../bloodmagic/block/BlockTeleposer.java | 7 ++-- .../WayofTime/bloodmagic/block/IBMBlock.java | 3 ++ .../bloodmagic/block/base/BlockEnum.java | 10 +++--- .../bloodmagic/client/IMeshProvider.java | 10 +++--- .../bloodmagic/client/IVariantProvider.java | 9 ++++- .../item/ItemActivationCrystal.java | 11 +++---- .../bloodmagic/item/ItemAltarMaker.java | 7 ++-- .../bloodmagic/item/ItemArcaneAshes.java | 7 ++-- .../bloodmagic/item/ItemBloodShard.java | 9 +++-- .../bloodmagic/item/ItemBoundAxe.java | 27 --------------- .../bloodmagic/item/ItemBoundPickaxe.java | 27 --------------- .../bloodmagic/item/ItemBoundShovel.java | 27 --------------- .../bloodmagic/item/ItemBoundSword.java | 17 ++-------- .../bloodmagic/item/ItemBoundTool.java | 19 ++++++++++- .../item/ItemDaggerOfSacrifice.java | 7 ++-- .../bloodmagic/item/ItemDemonCrystal.java | 7 ++-- .../bloodmagic/item/ItemDemonWillGauge.java | 7 ++-- .../WayofTime/bloodmagic/item/ItemEnum.java | 8 ++--- .../bloodmagic/item/ItemExperienceBook.java | 9 +++-- .../bloodmagic/item/ItemInscriptionTool.java | 7 ++-- .../bloodmagic/item/ItemLavaCrystal.java | 7 ++-- .../bloodmagic/item/ItemPotionFlask.java | 13 ++------ .../bloodmagic/item/ItemRitualDiviner.java | 11 +++---- .../bloodmagic/item/ItemRitualReader.java | 7 ++-- .../item/ItemSacrificialDagger.java | 12 +------ .../bloodmagic/item/ItemSanguineBook.java | 5 +-- .../WayofTime/bloodmagic/item/ItemSlate.java | 15 ++++----- .../item/ItemTelepositionFocus.java | 13 ++++---- .../bloodmagic/item/ItemUpgradeTome.java | 7 ++-- .../bloodmagic/item/ItemUpgradeTrainer.java | 7 ++-- .../item/alchemy/ItemCuttingFluid.java | 7 ++-- .../ItemLivingArmourPointsUpgrade.java | 7 ++-- .../item/armour/ItemLivingArmour.java | 18 +++++----- .../item/armour/ItemSentientArmour.java | 18 +++++----- .../item/block/ItemBlockAlchemyTable.java | 5 +-- .../item/gear/ItemPackSacrifice.java | 7 ++-- .../item/gear/ItemPackSelfSacrifice.java | 7 ++-- .../item/routing/ItemFluidRouterFilter.java | 7 ++-- .../item/routing/ItemNodeRouter.java | 7 ++-- .../item/routing/ItemRouterFilter.java | 13 ++++---- .../bloodmagic/item/sigil/ItemSigilBase.java | 7 ++-- .../item/sigil/ItemSigilHolding.java | 5 +-- .../item/sigil/ItemSigilToggleableBase.java | 19 ++--------- .../item/sigil/sigil/ItemSigil.java | 24 +++++--------- .../bloodmagic/item/soul/ItemMonsterSoul.java | 11 +++---- .../item/soul/ItemSentientArmourGem.java | 26 ++++++--------- .../bloodmagic/item/soul/ItemSentientAxe.java | 18 ++-------- .../bloodmagic/item/soul/ItemSentientBow.java | 5 +-- .../item/soul/ItemSentientPickaxe.java | 18 ++-------- .../item/soul/ItemSentientShovel.java | 18 ++-------- .../item/soul/ItemSentientSword.java | 18 ++-------- .../bloodmagic/item/soul/ItemSoulGem.java | 30 +++++++---------- .../bloodmagic/item/soul/ItemSoulSnare.java | 7 ++-- .../bloodmagic/proxy/ClientProxy.java | 33 ------------------- .../bloodmagic/proxy/CommonProxy.java | 10 ------ .../bloodmagic/registry/ModRecipes.java | 3 +- .../bloodmagic/blockstates/sigil_air.json | 10 +++--- .../blockstates/sigil_blood_light.json | 10 +++--- .../blockstates/sigil_divination.json | 10 +++--- 75 files changed, 283 insertions(+), 547 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 886bbe25..aeb13014 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -163,10 +164,8 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl // IVariantProvider @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } // IDocumentedBlock diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 6637e06d..b8354f7e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.ItemBlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -195,11 +196,8 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB // IVariantProvider @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); + public void populateVariants(Int2ObjectMap variants) { for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) - ret.add(Pair.of(i, "inventory")); - - return ret; + variants.put(i, "inventory"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index b0bfcfb1..ba562cab 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -100,10 +101,8 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 0b255c05..9377a5c5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrystallizer; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -68,10 +69,8 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java index 44c7f95f..5ff97e5b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumPillar; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.EnumFacing; @@ -24,16 +25,12 @@ public class BlockDemonPillarBase & IStringSerializable> exten } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - + public void populateVariants(Int2ObjectMap variants) { //This is done to make the ItemBlocks have the proper model EnumFacing.Axis[] axis = new EnumFacing.Axis[]{EnumFacing.Axis.Y, EnumFacing.Axis.X, EnumFacing.Axis.Z}; for (int i = 0; i < 3; i++) for (int j = 0; j < this.getTypes().length; j++) - ret.add(Pair.of(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j])); - - return ret; + variants.put(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java index 51ef6dbb..e18397e1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumPillarCap; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.EnumFacing; @@ -24,15 +25,10 @@ public class BlockDemonPillarCapBase & IStringSerializable> ex } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - + public void populateVariants(Int2ObjectMap variants) { //This is done to make the ItemBlocks have the proper model - for (int i = 0; i < EnumFacing.values().length; i++) for (int j = 0; j < this.getTypes().length; j++) - ret.add(Pair.of(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j])); - - return ret; + variants.put(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 28abe0f5..f25a0e35 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonPylon; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -61,9 +62,7 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java index 30166d16..457a7111 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumStairs; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.IStringSerializable; @@ -23,12 +24,8 @@ public class BlockDemonStairsBase & IStringSerializable> exten } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - + public void populateVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(Pair.of(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i])); - - return ret; + variants.put(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java index 2ad6bfe1..93fab1f7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumWall; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.IStringSerializable; @@ -23,12 +24,8 @@ public class BlockDemonWallBase & IStringSerializable> extends } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - + public void populateVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(Pair.of(i, "east=true,north=false,south=false,type=" + this.getTypes()[i] + ",up=true,west=true")); - - return ret; + variants.put(i, "east=true,north=false,south=false,type=" + this.getTypes()[i] + ",up=true,west=true"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index af051063..c6aa9870 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileIncenseAltar; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -84,10 +85,8 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java index 03040157..0b49e8db 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumSubWillType; import WayofTime.bloodmagic.tile.TileInversionPillar; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -73,11 +74,9 @@ public class BlockInversionPillar extends BlockEnum { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); + public void populateVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(Pair.of(i, "static=false,type=" + this.getTypes()[i])); - return ret; + variants.put(i, "static=false,type=" + this.getTypes()[i]); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java index 9b0e3067..d5669c54 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumInversionCap; import WayofTime.bloodmagic.client.IVariantProvider; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -54,10 +55,8 @@ public class BlockInversionPillarEnd extends BlockEnum impleme } @Override - public List> getVariants() { - List> ret = new ArrayList>(); + public void populateVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(new ImmutablePair(i, "type=" + this.getTypes()[i])); - return ret; + variants.put(i, "type=" + this.getTypes()[i]); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index b488e046..12a201a1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TilePhantomBlock; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -85,9 +86,7 @@ public class BlockPhantom extends Block implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java index 773d98b9..f9b4fdaf 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; @@ -132,7 +133,7 @@ public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvide } @Override - public List> getVariants() { - return Lists.newArrayList(Pair.of(0, "inventory")); + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "inventory"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 2c200c2c..6fa1b227 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -98,10 +99,8 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 6aa45663..61f54108 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSpectralBlock; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -108,9 +109,7 @@ public class BlockSpectral extends Block implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 6ac92d99..e47581e9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -65,10 +66,8 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "normal"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java index 7dd5b818..479cbcdb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java +++ b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java @@ -2,7 +2,10 @@ package WayofTime.bloodmagic.block; import net.minecraft.item.ItemBlock; +import javax.annotation.Nullable; + public interface IBMBlock { + @Nullable ItemBlock getItem(); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java index 2691f724..496bbf38 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.block.IBMBlock; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -77,15 +78,12 @@ public class BlockEnum & IStringSerializable> extends Block im } @Override - public List> getVariants() { - List> variants = Lists.newArrayList(); + public void populateVariants(Int2ObjectMap variants) { if (getItem() == null) - return variants; + return; for (int i = 0; i < types.length; i++) - variants.add(Pair.of(i, getProperty().getName() + "=" + types[i].name())); - - return variants; + variants.put(i, getProperty().getName() + "=" + types[i].name()); } public E[] getTypes() { diff --git a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java index d697da6f..a848bc65 100644 --- a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java +++ b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java @@ -22,11 +22,9 @@ public interface IMeshProvider { ItemMeshDefinition getMeshDefinition(); /** - * Gets all possible variants for this item - * - * @return - All possible variants for this item + * Populates a list of all possible variants for this item */ - List getVariants(); + void populateVariants(List variants); /** * If a custom ResourceLocation is required, return it here. @@ -36,5 +34,7 @@ public interface IMeshProvider { * @return - The custom ResourceLocation */ @Nullable - ResourceLocation getCustomLocation(); + default ResourceLocation getCustomLocation() { + return null; + } } diff --git a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java b/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java index c37d9958..1d6c71e5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java +++ b/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java @@ -1,9 +1,16 @@ package WayofTime.bloodmagic.client; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import org.apache.commons.lang3.tuple.Pair; import java.util.List; public interface IVariantProvider { - List> getVariants(); + + /** + * A mapping of meta -> state variant + * + * @param variants A map to populate with all variants + */ + void populateVariants(Int2ObjectMap variants); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index c0560ec7..a045bcbf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -50,12 +51,10 @@ public class ItemActivationCrystal extends ItemBindableBase implements IVariantP } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=weak")); - ret.add(new ImmutablePair(1, "type=demonic")); - ret.add(new ImmutablePair(2, "type=creative")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=weak"); + variants.put(1, "type=demonic"); + variants.put(2, "type=creative"); } public int getCrystalLevel(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 442ecd96..7501b5fc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -90,10 +91,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=altarmaker")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=altarmaker"); } public void setTierToBuild(EnumAltarTier tierToBuild) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 4734f6f9..11d010ca 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -61,9 +62,7 @@ public class ItemArcaneAshes extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=arcaneashes")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=arcaneashes"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index acbf2214..cdcda8d3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -41,10 +42,8 @@ public class ItemBloodShard extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=weak")); - ret.add(new ImmutablePair(1, "type=demonic")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=weak"); + variants.put(1, "type=demonic"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 26831f4c..ee4cdde1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -12,7 +11,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -22,17 +20,12 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -116,24 +109,4 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { } return multimap; } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_axe"); - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - ret.add("active=true"); - ret.add("active=false"); - return ret; - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index bc2c47f3..21c7a231 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -4,14 +4,12 @@ import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -21,17 +19,12 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -129,24 +122,4 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { } return multimap; } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_pickaxe"); - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - ret.add("active=true"); - ret.add("active=false"); - return ret; - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index c122d617..fd643888 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -4,14 +4,12 @@ import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -21,17 +19,12 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -115,24 +108,4 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { } return multimap; } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_shovel"); - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - ret.add("active=true"); - ret.add("active=false"); - return ret; - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index cf6a8809..183d72ef 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -30,14 +30,11 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider { @@ -133,18 +130,10 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable return new CustomMeshDefinitionActivatable("bound_sword"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - ret.add("active=true"); - ret.add("active=false"); - return ret; + public void populateVariants(List variants) { + variants.add("active=true"); + variants.add("active=false"); } // IBindable diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 0bbcea86..5c830bde 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -9,6 +9,8 @@ import WayofTime.bloodmagic.api.iface.IBindable; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -19,6 +21,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multiset; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -45,7 +48,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { +public class ItemBoundTool extends ItemTool implements IBindable, IActivatable, IMeshProvider { public final int chargeTime = 30; protected final String tooltipBase; private final String name; @@ -250,6 +253,20 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { return null; } + // IMeshProvider + + @Override + @SideOnly(Side.CLIENT) + public ItemMeshDefinition getMeshDefinition() { + return new CustomMeshDefinitionActivatable("bound_" + name); + } + + @Override + public void populateVariants(List variants) { + variants.add("active=true"); + variants.add("active=false"); + } + public String getTooltipBase() { return tooltipBase; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index b5cdb49c..0b23856f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.api.util.helper.PurificationHelper; import WayofTime.bloodmagic.api_impl.BloodMagicAPI; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityAnimal; @@ -76,9 +77,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - ret.add(Pair.of(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index bd8143dc..169265cf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -90,11 +91,9 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria } @Override - public List> getVariants() { - List> ret = new ArrayList>(); + public void populateVariants(Int2ObjectMap variants) { for (String name : NAMES) - ret.add(new ImmutablePair(NAMES.indexOf(name), "type=" + name)); - return ret; + variants.put(NAMES.indexOf(name), "type=" + name); } public static ItemStack getStack(String name) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index 68dcc7cf..5c3b8927 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.iface.IDemonWillViewer; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -32,10 +33,8 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=willgauge")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=willgauge"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index e3799a0f..e7ca9173 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.types.ISubItem; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -49,11 +50,8 @@ public class ItemEnum & ISubItem> extends Item implements IVar } @Override - public List> getVariants() { - List> variants = Lists.newArrayList(); + public void populateVariants(Int2ObjectMap variants) { for (int i = 0; i < types.length; i++) - variants.add(Pair.of(i, "type=" + types[i].getInternalName())); - - return variants; + variants.put(i, "type=" + types[i].getInternalName()); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 45fad002..1973bb51 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -59,14 +60,12 @@ public class ItemExperienceBook extends Item implements IVariantProvider { giveOneLevelExpToPlayer(stack, player); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=experiencetome")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=experiencetome"); } public void giveOneLevelExpToPlayer(ItemStack stack, EntityPlayer player) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 4481c2a2..51186953 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; @@ -102,11 +103,9 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro } @Override - public List> getVariants() { - List> ret = new ArrayList>(); + public void populateVariants(Int2ObjectMap variants) { for (int i = 1; i < EnumRuneType.values().length; i++) - ret.add(new ImmutablePair(i, "type=" + EnumRuneType.values()[i].name())); - return ret; + variants.put(i, "type=" + EnumRuneType.values()[i].name()); } public EnumRuneType getType(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index c224ea7d..218f19c8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; @@ -53,9 +54,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - ret.add(Pair.of(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 3f5e15ac..4e628304 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Lists; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -24,7 +23,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.List; public class ItemPotionFlask extends Item implements IMeshProvider { @@ -131,14 +129,9 @@ public class ItemPotionFlask extends Item implements IMeshProvider { }; } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - return Lists.newArrayList("full=true", "full=false"); + public void populateVariants(List variants) { + variants.add("full=true"); + variants.add("full=false"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 616b01a2..0a8c8e2f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.event.ClientHandler; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -332,12 +333,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=basic")); - ret.add(new ImmutablePair(1, "type=dusk")); - ret.add(new ImmutablePair(2, "type=dawn")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=basic"); + variants.put(1, "type=dusk"); + variants.put(2, "type=dawn"); } public void cycleDirection(ItemStack stack, EntityPlayer player) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 455e3f1c..dfbae3ec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -10,6 +10,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -233,9 +234,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 1444de0e..f06cfe2b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -30,8 +30,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -183,17 +181,9 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider { } @Override - public List getVariants() { - List variants = new ArrayList(); + public void populateVariants(List variants) { variants.add("type=normal"); variants.add("type=creative"); variants.add("type=ceremonial"); - return variants; - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index f17328f6..2656aaba 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -11,6 +11,7 @@ import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -109,7 +110,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa // IVariantProvider @Override - public List> getVariants() { - return Collections.singletonList(Pair.of(0, "type=normal")); + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index b2564ffb..ab68166d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -51,13 +52,11 @@ public class ItemSlate extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=blank")); - ret.add(new ImmutablePair(1, "type=reinforced")); - ret.add(new ImmutablePair(2, "type=imbued")); - ret.add(new ImmutablePair(3, "type=demonic")); - ret.add(new ImmutablePair(4, "type=ethereal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=blank"); + variants.put(1, "type=reinforced"); + variants.put(2, "type=imbued"); + variants.put(3, "type=demonic"); + variants.put(4, "type=ethereal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 64895638..e1926357 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -87,13 +88,11 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=weak")); - ret.add(new ImmutablePair(1, "type=enhanced")); - ret.add(new ImmutablePair(2, "type=reinforced")); - ret.add(new ImmutablePair(3, "type=demonic")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=weak"); + variants.put(1, "type=enhanced"); + variants.put(2, "type=reinforced"); + variants.put(3, "type=demonic"); } public World getWorld(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index c7bd3f2c..2a7e87b8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -96,10 +97,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=upgradetome")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=upgradetome"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index f22ac3c0..459b25ef 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -82,9 +83,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=upgradetrainer")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=upgradetrainer"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index f65f891c..6e5e1e82 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -67,11 +68,9 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA } @Override - public List> getVariants() { - List> ret = new ArrayList>(); + public void populateVariants(Int2ObjectMap variants) { for (String name : names) - ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); - return ret; + variants.put(names.indexOf(name), "type=" + name); } public int getDamageOfFluid(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java index 30e35efd..269587c5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Iterables; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -118,11 +119,9 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi } @Override - public List> getVariants() { - List> ret = new ArrayList>(); + public void populateVariants(Int2ObjectMap variants) { for (String name : names) - ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); - return ret; + variants.put(names.indexOf(name), "type=" + name); } public static ItemStack getStack(String name) { diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 55f632f9..886202e0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -9,7 +9,6 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.item.types.ReagentType; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; @@ -45,8 +44,11 @@ import org.lwjgl.input.Keyboard; import javax.annotation.Nullable; import java.lang.reflect.Field; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.UUID; public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshProvider { public static final boolean useSpecialArmourCalculation = true; @@ -367,13 +369,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public List getVariants() { - List ret = new ArrayList(); - ret.add("armour=head"); - ret.add("armour=body"); - ret.add("armour=leg"); - ret.add("armour=feet"); - return ret; + public void populateVariants(List variants) { + variants.add("armour=head"); + variants.add("armour=body"); + variants.add("armour=leg"); + variants.add("armour=feet"); } public void setLivingArmour(ItemStack stack, LivingArmour armour, boolean forceWrite) { diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 962a6272..63662c40 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -33,7 +33,10 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.*; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMeshProvider, IMultiWillTool { public static String[] names = {"helmet", "chest", "legs", "boots"}; @@ -297,18 +300,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public List getVariants() { - List ret = new ArrayList(); + public void populateVariants(List variants) { for (EnumDemonWillType type : EnumDemonWillType.values()) { String additional = "_" + type.getName().toLowerCase(); - ret.add("armour=head" + additional); - ret.add("armour=body" + additional); - ret.add("armour=leg" + additional); - ret.add("armour=feet" + additional); + variants.add("armour=head" + additional); + variants.add("armour=body" + additional); + variants.add("armour=leg" + additional); + variants.add("armour=feet" + additional); } - - return ret; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java index 6f082408..3370d29f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item.block; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAlchemyTable; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -64,7 +65,7 @@ public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider } @Override - public List> getVariants() { - return Lists.newArrayList(Pair.of(0, "inventory")); + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "inventory"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 3abdfdce..bece7301 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -9,6 +9,7 @@ import WayofTime.bloodmagic.api.util.helper.ItemHelper.LPContainer; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -76,10 +77,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } // IFillable diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 1dd19a4b..9d6c36f8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -10,6 +10,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -101,10 +102,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } // IFillable diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 455c44c4..d88f2432 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.routing.IFluidFilter; import WayofTime.bloodmagic.routing.RoutingFluidFilter; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -121,10 +122,8 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=exact")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=exact"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 3cdb1aa0..4cdc0ae6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -176,10 +177,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } public BlockPos getBlockPos(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index 76cc2b48..5fa81eed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -138,13 +139,11 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=exact")); - ret.add(new ImmutablePair(1, "type=ignorenbt")); - ret.add(new ImmutablePair(2, "type=moditems")); - ret.add(new ImmutablePair(3, "type=oredict")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=exact"); + variants.put(1, "type=ignorenbt"); + variants.put(2, "type=moditems"); + variants.put(3, "type=oredict"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 7de088ff..74157b85 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -51,10 +52,8 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(Pair.of(0, "type=normal")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=normal"); } public String getName() { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index da59eee5..5ac4df3f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -167,8 +168,8 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } @Override - public List> getVariants() { - return Collections.emptyList(); + public void populateVariants(Int2ObjectMap variants) { + } public static int next(int mode) { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 7590fc19..fed28625 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -10,14 +10,10 @@ import com.google.common.base.Strings; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.text.WordUtils; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -53,18 +49,9 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes return new CustomMeshDefinitionActivatable("sigil_" + name.toLowerCase(Locale.ROOT)); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - ret.add("active=false"); - ret.add("active=true"); - - return ret; + public void populateVariants(List variants) { + variants.add("active=false"); + variants.add("active=true"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java index 1550549c..df087bf3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigil.java @@ -5,20 +5,21 @@ import WayofTime.bloodmagic.api.iface.IBindable; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; -import com.google.common.collect.Lists; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.List; public class ItemSigil extends Item implements IBindable, IMeshProvider { @@ -131,18 +132,11 @@ public class ItemSigil extends Item implements IBindable, IMeshProvider { } @Override - public List getVariants() { + public void populateVariants(List variants) { if (sigil instanceof ISigil.Toggle) { - return Lists.newArrayList( - "active=true", - "active=false" - ); - } else return Lists.newArrayList("inventory"); - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; + variants.add("active=true"); + variants.add("active=false"); + } else + variants.add("inventory"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 3be9b4be..ed35d92d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.api.soul.IDemonWill; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -105,13 +106,9 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (int i = 0; i < names.length; i++) { - String name = names[i]; - ret.add(new ImmutablePair(i, "type=" + name)); - } - return ret; + public void populateVariants(Int2ObjectMap variants) { + for (int i = 0; i < names.length; i++) + variants.put(i, "type=" + names[i]); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index e25ae539..3c1e9fc6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -5,19 +5,20 @@ import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.List; public class ItemSentientArmourGem extends Item implements IMeshProvider { @@ -53,7 +54,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { ItemSentientArmour.convertPlayerArmour(type, will, player); } - return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); + return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand)); } @SideOnly(Side.CLIENT) @@ -62,24 +63,17 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { return stack -> { boolean flag = false; NonNullList armourInventory = Minecraft.getMinecraft().player.inventory.armorInventory; - for (ItemStack armourStack : armourInventory) { - if (armourStack != null && armourStack.getItem() instanceof ItemSentientArmour) { + for (ItemStack armourStack : armourInventory) + if (!armourStack.isEmpty() && armourStack.getItem() instanceof ItemSentientArmour) flag = true; - } - } return new ModelResourceLocation(stack.getItem().getRegistryName(), "type=" + (flag ? "" : "de") + "activated"); }; } @Override - public List getVariants() { - return Lists.newArrayList("type=activated", "type=deactivated"); - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; + public void populateVariants(List variants) { + variants.add("type=activated"); + variants.add("type=deactivated"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index c2b82f28..24298f2a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -36,13 +36,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { @@ -300,20 +298,10 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP return new CustomMeshDefinitionMultiWill("sentient_axe"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void populateVariants(List variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.add("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 97b87625..00c29dec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -253,8 +254,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public List> getVariants() { - return Lists.newArrayList(Pair.of(0, "inventory")); + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "inventory"); } public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index 05c51b19..07d8690f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -36,13 +36,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { @@ -299,20 +297,10 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon return new CustomMeshDefinitionMultiWill("sentient_pickaxe"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void populateVariants(List variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.add("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 2edd2b73..e6888e5d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -36,13 +36,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { @@ -300,20 +298,10 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I return new CustomMeshDefinitionMultiWill("sentient_shovel"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void populateVariants(List variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.add("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 4753c957..a7a0066f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -34,13 +34,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { @@ -275,20 +273,10 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM return new CustomMeshDefinitionMultiWill("sentient_shovel"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void populateVariants(List variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.add("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index a4095e15..6dde869a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -18,14 +18,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -55,7 +56,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack); this.drainWill(type, stack, filled, true); - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override @@ -64,24 +65,15 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I return new CustomMeshDefinitionWillGem("soul_gem"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList(); + public void populateVariants(List variants) { for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=petty_" + type.getName().toLowerCase()); - ret.add("type=lesser_" + type.getName().toLowerCase()); - ret.add("type=common_" + type.getName().toLowerCase()); - ret.add("type=greater_" + type.getName().toLowerCase()); - ret.add("type=grand_" + type.getName().toLowerCase()); + variants.add("type=petty_" + type.getName().toLowerCase()); + variants.add("type=lesser_" + type.getName().toLowerCase()); + variants.add("type=common_" + type.getName().toLowerCase()); + variants.add("type=greater_" + type.getName().toLowerCase()); + variants.add("type=grand_" + type.getName().toLowerCase()); } - - return ret; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index e6d76d8c..9842603b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -75,9 +76,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=soulsnare")); - return ret; + public void populateVariants(Int2ObjectMap variants) { + variants.put(0, "type=soulsnare"); } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index f414bb72..d0a496c1 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -3,8 +3,6 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.helper.ShaderHelper; import WayofTime.bloodmagic.client.hud.HUDElementDemonWillAura; import WayofTime.bloodmagic.client.hud.HUDElementHolding; @@ -21,15 +19,11 @@ import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import com.google.common.collect.ImmutableMap; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.item.Item; import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.animation.AnimationTESR; import net.minecraftforge.client.model.obj.OBJLoader; @@ -39,7 +33,6 @@ import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import org.apache.commons.lang3.tuple.Pair; import java.awt.Color; import java.util.Map; @@ -120,32 +113,6 @@ public class ClientProxy extends CommonProxy { new HUDElementDemonWillAura(); } - @Override - public void tryHandleBlockModel(Block block, String name) { - if (block instanceof IVariantProvider) { - IVariantProvider variantProvider = (IVariantProvider) block; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), variant.getLeft(), new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), variant.getRight())); - } - } - - @Override - public void tryHandleItemModel(Item item, String name) { - if (item instanceof IMeshProvider) { - IMeshProvider meshProvider = (IMeshProvider) item; - ModelLoader.setCustomMeshDefinition(item, meshProvider.getMeshDefinition()); - ResourceLocation resourceLocation = meshProvider.getCustomLocation(); - if (resourceLocation == null) - resourceLocation = new ResourceLocation(BloodMagic.MODID, "item/" + name); - for (String variant : meshProvider.getVariants()) - ModelLoader.registerItemVariants(item, new ModelResourceLocation(resourceLocation, variant)); - } else if (item instanceof IVariantProvider) { - IVariantProvider variantProvider = (IVariantProvider) item; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(item, variant.getLeft(), new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), variant.getRight())); - } - } - private void addElytraLayer() { RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); try { diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index ec248e4b..1dbea0c8 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -4,8 +4,6 @@ import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; import WayofTime.bloodmagic.api.ritual.IRitualStone; import WayofTime.bloodmagic.api.teleport.TeleportQueue; import com.google.common.collect.ImmutableMap; -import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -36,14 +34,6 @@ public class CommonProxy { return null; } - public void tryHandleBlockModel(Block block, String name) { - // NO-OP - } - - public void tryHandleItemModel(Item item, String name) { - // NO-OP - } - public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) { return null; } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index a1cd31a2..c1e46a44 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -110,7 +110,8 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); + // FIXME +// AlchemyArrayRecipeRegistry.registerRecipe(ReagentType.REAGENT_FASTMINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); } diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json index 32f44849..caaa2b92 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/AirSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/AirSigil" } - } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json index dc5b4f19..c82ae4de 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/BloodLightSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/BloodLightSigil" } - } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json index 184354d6..161209bd 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/DivinationSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/DivinationSigil" } - } + }] } } \ No newline at end of file From e2538d92918db9b92fab67917b5b6372c1d59d03 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 9 Oct 2017 12:34:14 -0700 Subject: [PATCH 022/493] Debug logging for registration timings --- .../java/WayofTime/bloodmagic/BloodMagic.java | 5 +++ .../bloodmagic/core/RegistrarBloodMagic.java | 38 +++++++++++++++++++ .../core/RegistrarBloodMagicBlocks.java | 14 ++----- .../core/RegistrarBloodMagicItems.java | 35 ++++++++--------- .../core/RegistrarBloodMagicRecipes.java | 10 ++--- 5 files changed, 68 insertions(+), 34 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index c24c358f..5874d562 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -133,4 +133,9 @@ public class BloodMagic { public void onIMCRecieved(FMLInterModComms.IMCEvent event) { IMCHandler.handleIMC(event); } + + public static void debug(String message, Object... args) { + if (IS_DEV) + LOGGER.info("[DEBUG] " + message, args); + } } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 688c627c..9a81cc95 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -10,9 +10,13 @@ import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.potion.PotionBloodMagic; +import com.google.common.base.Stopwatch; +import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.MobEffects; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; @@ -61,8 +65,30 @@ public class RegistrarBloodMagic { public static IForgeRegistry BLOOD_ORBS = null; + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); + RegistrarBloodMagicItems.registerItems(event.getRegistry()); + BloodMagic.debug("Item registration completed in {}", stopwatch.stop()); + } + + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); + RegistrarBloodMagicBlocks.registerBlocks(event.getRegistry()); + BloodMagic.debug("Block registration completed in {}", stopwatch.stop()); + } + + @SubscribeEvent + public static void registerRecipes(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); + RegistrarBloodMagicRecipes.registerCrafting(event.getRegistry()); + BloodMagic.debug("Recipe registration completed in {}", stopwatch.stop()); + } + @SubscribeEvent public static void registerBloodOrbs(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName(); event.getRegistry().registerAll( new BloodOrb("weak", 1, 5000).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), @@ -72,10 +98,12 @@ public class RegistrarBloodMagic { new BloodOrb("archmage", 5, 10000000).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), new BloodOrb("transcendent", 6, 30000000).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); + BloodMagic.debug("Blood Orb registration completed in {}", stopwatch.stop()); } @SubscribeEvent public static void registerPotions(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); event.getRegistry().registerAll( new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 1).setRegistryName("boost"), new PotionBloodMagic("Planar Binding", false, 0, 2, 0).setRegistryName("planar_binding"), @@ -89,10 +117,12 @@ public class RegistrarBloodMagic { new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"), new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb") ); + BloodMagic.debug("Potion registration completed in {}", stopwatch.stop()); } @SubscribeEvent public static void registerEntities(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); int entities = 0; EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "blood_light"), EntityBloodLight.class, "BloodLight", ++entities, BloodMagic.instance, 16 * 4, 3, true); EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "soul_snare"), EntitySoulSnare.class, "SoulSnare", ++entities, BloodMagic.instance, 16 * 4, 3, true); @@ -104,21 +134,25 @@ public class RegistrarBloodMagic { EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_sheep"), EntityCorruptedSheep.class, "CorruptedSheep", ++entities, BloodMagic.instance, 16 * 4, 3, true); EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_chicken"), EntityCorruptedChicken.class, "CorruptedChicken", ++entities, BloodMagic.instance, 16 * 4, 3, true); EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_spider"), EntityCorruptedSpider.class, "CorruptedSpider", ++entities, BloodMagic.instance, 16 * 4, 3, true); + BloodMagic.debug("Entity registration completed in {}", stopwatch.stop()); } @SubscribeEvent public static void onRegistryCreation(RegistryEvent.NewRegistry event) { + Stopwatch stopwatch = Stopwatch.createStarted(); BLOOD_ORBS = new RegistryBuilder() .setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")) .setIDRange(0, Short.MAX_VALUE) .setType(BloodOrb.class) .addCallback((IForgeRegistry.AddCallback) (owner, stage, id, obj, oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj))) .create(); + BloodMagic.debug("Registry creation completed in {}", stopwatch.stop()); } @SideOnly(Side.CLIENT) @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { + Stopwatch stopwatch = Stopwatch.createStarted(); for (BloodOrb orb : BLOOD_ORBS) { ModelResourceLocation modelLocation = orb.getModelLocation(); if (modelLocation == null) @@ -137,6 +171,10 @@ public class RegistrarBloodMagic { return orb.getModelLocation(); }); + + RegistrarBloodMagicItems.registerModels(); + RegistrarBloodMagicBlocks.registerModels(); + BloodMagic.debug("Model registration completed in {}", stopwatch.stop()); } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java index 54cad50a..585b6a06 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -15,17 +15,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.init.Blocks; -import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.registries.IForgeRegistry; import java.util.List; -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @SuppressWarnings("unused") public class RegistrarBloodMagicBlocks { @@ -73,8 +69,7 @@ public class RegistrarBloodMagicBlocks { static List blocks; - @SubscribeEvent - public static void registerBlocks(RegistryEvent.Register event) { + public static void registerBlocks(IForgeRegistry registry) { FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence()); FluidRegistry.addBucketForFluid(BlockLifeEssence.getLifeEssence()); @@ -122,13 +117,12 @@ public class RegistrarBloodMagicBlocks { new BlockInversionPillarEnd().setRegistryName("inversion_pillar_end") ); - event.getRegistry().registerAll(blocks.toArray(new Block[0])); + registry.registerAll(blocks.toArray(new Block[0])); registerTileEntities(); } - @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) { + public static void registerModels() { ModelLoader.setCustomStateMapper(LIFE_ESSENCE, new StateMapperBase() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 40dccbcb..f43433ee 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -16,30 +16,26 @@ import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.sigil.sigil.*; -import WayofTime.bloodmagic.item.sigil.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.item.types.ReagentType; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; +import net.minecraftforge.registries.IForgeRegistry; import java.util.List; -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @SuppressWarnings("unchecked") public class RegistrarBloodMagicItems { @@ -122,8 +118,7 @@ public class RegistrarBloodMagicItems { public static List items; - @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) { + public static void registerItems(IForgeRegistry registry) { items = Lists.newArrayList(); RegistrarBloodMagicBlocks.blocks.stream().filter(block -> block instanceof IBMBlock && ((IBMBlock) block).getItem() != null).forEach(block -> { @@ -207,16 +202,17 @@ public class RegistrarBloodMagicItems { new ItemPotionFlask().setRegistryName("potion_flask") )); - event.getRegistry().registerAll(items.toArray(new Item[0])); + registry.registerAll(items.toArray(new Item[0])); } @SideOnly(Side.CLIENT) - @SubscribeEvent - public static void registerRenders(ModelRegistryEvent event) { + public static void registerModels() { items.stream().filter(i -> i instanceof IVariantProvider).forEach(i -> { IVariantProvider variantProvider = (IVariantProvider) i; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(i, variant.getLeft(), new ModelResourceLocation(i.getRegistryName(), variant.getRight())); + Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); + variantProvider.populateVariants(variants); + for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) + ModelLoader.setCustomModelResourceLocation(i, variant.getIntKey(), new ModelResourceLocation(i.getRegistryName(), variant.getValue())); }); items.stream().filter(i -> i instanceof IMeshProvider).forEach(i -> { @@ -224,7 +220,10 @@ public class RegistrarBloodMagicItems { ResourceLocation loc = mesh.getCustomLocation(); if (loc == null) loc = i.getRegistryName(); - for (String variant : mesh.getVariants()) + + List variants = Lists.newArrayList(); + mesh.populateVariants(variants); + for (String variant : variants) ModelLoader.registerItemVariants(i, new ModelResourceLocation(loc, variant)); ModelLoader.setCustomMeshDefinition(i, mesh.getMeshDefinition()); @@ -232,8 +231,10 @@ public class RegistrarBloodMagicItems { RegistrarBloodMagicBlocks.blocks.stream().filter(b -> b instanceof IVariantProvider).forEach(b -> { IVariantProvider variantProvider = (IVariantProvider) b; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(b), variant.getLeft(), new ModelResourceLocation(b.getRegistryName(), variant.getRight())); + Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); + variantProvider.populateVariants(variants); + for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(b), variant.getIntKey(), new ModelResourceLocation(b.getRegistryName(), variant.getValue())); }); final ResourceLocation holdingLoc = SIGIL_HOLDING.getRegistryName(); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 89ed8aa1..d1b8191a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -19,20 +19,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreIngredient; import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraftforge.registries.IForgeRegistry; -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class RegistrarBloodMagicRecipes { - @SubscribeEvent - public static void registerCrafting(RegistryEvent.Register event) { + public static void registerCrafting(IForgeRegistry registry) { for (int i = 0; i < ItemSoulGem.names.length; i++) { for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); @@ -43,7 +39,7 @@ public class RegistrarBloodMagicRecipes { EnumDemonWillType willType = ((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack); ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, crystalStack); - event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); + registry.register(shapeless.setRegistryName("soul_gem_" + willType.getName())); } } } From 9de2354e64fcf56961c2427e717f6feea655235b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 13 Oct 2017 17:12:54 -0700 Subject: [PATCH 023/493] Stop using a custom bus subscriber annotation I'm sorry, past self, but Forge has had one since like 1.10, it's time to move on. It's for the better. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 3 -- .../WayofTime/bloodmagic/annot/Handler.java | 15 ------- .../java/WayofTime/bloodmagic/util/Utils.java | 16 ------- .../util/handler/event/ClientHandler.java | 24 +++++------ .../util/handler/event/CraftingHandler.java | 8 ++-- .../util/handler/event/GenericHandler.java | 42 +++++++++---------- .../handler/event/LivingArmourHandler.java | 21 +++++----- .../handler/event/StatTrackerHandler.java | 14 +++---- .../util/handler/event/WillHandler.java | 26 ++++++------ 9 files changed, 68 insertions(+), 101 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/annot/Handler.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 5874d562..72c9155f 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api_impl.BloodMagicAPI; @@ -17,7 +16,6 @@ import WayofTime.bloodmagic.registry.*; import WayofTime.bloodmagic.structures.ModDungeons; import WayofTime.bloodmagic.util.BloodMagicIsntReadyYetStopTryingToUseItAndJustWaitForMeToFinishPleaseAndThankYou; import WayofTime.bloodmagic.util.PluginUtil; -import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.IMCHandler; import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; @@ -85,7 +83,6 @@ public class BloodMagic { ModTranquilityHandlers.init(); ModDungeons.init(); - Utils.registerHandlers(event.getAsmData().getAll(Handler.class.getCanonicalName())); proxy.preInit(); } diff --git a/src/main/java/WayofTime/bloodmagic/annot/Handler.java b/src/main/java/WayofTime/bloodmagic/annot/Handler.java deleted file mode 100644 index 0e972824..00000000 --- a/src/main/java/WayofTime/bloodmagic/annot/Handler.java +++ /dev/null @@ -1,15 +0,0 @@ -package WayofTime.bloodmagic.annot; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Classes annotated with this will automatically be registered to the - * {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Handler { -} diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index f2d14f7e..ae3b50ef 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.EnumAltarComponent; @@ -41,9 +40,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -919,19 +916,6 @@ public class Utils { return largerStack ? stack : ItemStack.EMPTY; } - public static void registerHandlers(Set eventHandlers) { - for (ASMDataTable.ASMData data : eventHandlers) { - try { - Class handlerClass = Class.forName(data.getClassName()); - Object handlerImpl = handlerClass.newInstance(); - MinecraftForge.EVENT_BUS.register(handlerImpl); - BloodMagic.LOGGER.debug("Registering event handler for class {}", data.getClassName()); - } catch (Exception e) { - // No-op - } - } - } - public static boolean hasUUID(ItemStack stack) { return stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.MOST_SIG) && stack.getTagCompound().hasKey(Constants.NBT.LEAST_SIG); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 7103ab7f..7066d100 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.Ritual; @@ -41,6 +40,7 @@ import net.minecraftforge.client.event.sound.PlaySoundEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -50,7 +50,7 @@ import org.lwjgl.opengl.GL11; import java.util.*; -@Handler +@Mod.EventBusSubscriber @SideOnly(Side.CLIENT) public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. @@ -76,7 +76,7 @@ public class ClientHandler { private static boolean mrsHoloDisplay; @SubscribeEvent - public void onTooltipEvent(ItemTooltipEvent event) { + public static void onTooltipEvent(ItemTooltipEvent event) { ItemStack stack = event.getItemStack(); if (stack.isEmpty()) { return; @@ -93,7 +93,7 @@ public class ClientHandler { } @SubscribeEvent - public void onSoundEvent(PlaySoundEvent event) { + public static void onSoundEvent(PlaySoundEvent event) { EntityPlayer player = Minecraft.getMinecraft().player; if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { event.setResultSound(null); @@ -101,7 +101,7 @@ public class ClientHandler { } @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre event) { + public static void onTextureStitch(TextureStitchEvent.Pre event) { final String BLOCKS = "blocks"; ritualStoneBlank = forName(event.getMap(), "RitualStone", BLOCKS); @@ -121,7 +121,7 @@ public class ClientHandler { } @SubscribeEvent - public void render(RenderWorldLastEvent event) { + public static void render(RenderWorldLastEvent event) { EntityPlayerSP player = minecraft.player; World world = player.getEntityWorld(); @@ -146,7 +146,7 @@ public class ClientHandler { } @SubscribeEvent - public void onMouseEvent(MouseEvent event) { + public static void onMouseEvent(MouseEvent event) { EntityPlayerSP player = Minecraft.getMinecraft().player; if (event.getDwheel() != 0 && player != null && player.isSneaking()) { @@ -164,7 +164,7 @@ public class ClientHandler { } @SubscribeEvent - public void onKey(InputEvent event) { + public static void onKey(InputEvent event) { if (!minecraft.inGameHasFocus) return; @@ -174,7 +174,7 @@ public class ClientHandler { } @SubscribeEvent - public void onHudRender(RenderGameOverlayEvent.Pre event) { + public static void onHudRender(RenderGameOverlayEvent.Pre event) { for (HUDElement element : hudElements) if (element.getElementType() == event.getType() && element.shouldRender(minecraft)) element.render(minecraft, event.getResolution(), event.getPartialTicks()); @@ -182,7 +182,7 @@ public class ClientHandler { // Stolen from Chisel @SubscribeEvent - public void onModelBake(ModelBakeEvent event) { + public static void onModelBake(ModelBakeEvent event) { if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS) return; @@ -218,7 +218,7 @@ public class ClientHandler { // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Post event) { + public static void onTextureStitch(TextureStitchEvent.Post event) { if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS) return; @@ -249,7 +249,7 @@ public class ClientHandler { BloodMagic.LOGGER.debug("Suppressed required texture errors in {}", stopwatch.stop()); } - private void renderRitualStones(EntityPlayerSP player, float partialTicks) { + private static void renderRitualStones(EntityPlayerSP player, float partialTicks) { World world = player.getEntityWorld(); ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); EnumFacing direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index f47c2065..61e56302 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.AltarCraftedEvent; import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; @@ -21,17 +20,18 @@ import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.List; -@Handler +@Mod.EventBusSubscriber public class CraftingHandler { // Sets the uses of crafted Inscription Tools to 10 @SubscribeEvent - public void onAltarCrafted(AltarCraftedEvent event) { + public static void onAltarCrafted(AltarCraftedEvent event) { if (event.getOutput() == null) { return; } @@ -49,7 +49,7 @@ public class CraftingHandler { // Handles crafting of: Revealing Upgrade Tome, Elytra Upgrade Tome, Combining Upgrade Tomes, Setting Upgrade for Trainer @SubscribeEvent - public void onAnvil(AnvilUpdateEvent event) { + public static void onAnvil(AnvilUpdateEvent event) { // TODO - Azanor come back :( // if (ConfigHandler.thaumcraftGogglesUpgrade) { // if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index ee83e923..80706b88 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.ItemBindEvent; import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; @@ -75,6 +74,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.ExplosionEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -87,7 +87,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -@Handler +@Mod.EventBusSubscriber public class GenericHandler { public static Map bounceMap = new HashMap(); public static Map filledHandMap = new HashMap(); @@ -95,7 +95,7 @@ public class GenericHandler { private static Map attackTaskMap = new HashMap(); @SubscribeEvent - public void onEntityFall(LivingFallEvent event) { + public static void onEntityFall(LivingFallEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); if (player.isPotionActive(RegistrarBloodMagic.BOUNCE) && !player.isSneaking() && event.getDistance() > 2) { @@ -114,7 +114,7 @@ public class GenericHandler { } @SubscribeEvent - public void playerTickPost(TickEvent.PlayerTickEvent event) { + public static void playerTickPost(TickEvent.PlayerTickEvent event) { if (event.phase == TickEvent.Phase.END && bounceMap.containsKey(event.player)) { event.player.motionY = bounceMap.remove(event.player); } @@ -132,7 +132,7 @@ public class GenericHandler { } @SubscribeEvent - public void onPlayerClick(PlayerInteractEvent event) { + public static void onPlayerClick(PlayerInteractEvent event) { if (event.isCancelable() && event.getEntityPlayer().isPotionActive(RegistrarBloodMagic.CONSTRICT)) { EntityPlayer player = event.getEntityPlayer(); int level = player.getActivePotionEffect(RegistrarBloodMagic.CONSTRICT).getAmplifier(); @@ -143,7 +143,7 @@ public class GenericHandler { } @SubscribeEvent - public void onPlayerDropItem(ItemTossEvent event) { + public static void onPlayerDropItem(ItemTossEvent event) { EntityItem itemEntity = event.getEntityItem(); if (itemEntity != null) { ItemStack stack = itemEntity.getItem(); @@ -157,7 +157,7 @@ public class GenericHandler { } @SubscribeEvent - public void onExplosion(ExplosionEvent.Start event) { + public static void onExplosion(ExplosionEvent.Start event) { World world = event.getWorld(); Explosion exp = event.getExplosion(); Vec3d position = exp.getPosition(); @@ -176,7 +176,7 @@ public class GenericHandler { } @SubscribeEvent - public void onEntityHurt(LivingHurtEvent event) { + public static void onEntityHurt(LivingHurtEvent event) { if (event.getEntity().getEntityWorld().isRemote) return; @@ -210,7 +210,7 @@ public class GenericHandler { // Handles sending the client the Demon Will Aura updates @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent event) { + public static void onLivingUpdate(LivingUpdateEvent event) { if (!event.getEntityLiving().getEntityWorld().isRemote) { EntityLivingBase entity = event.getEntityLiving(); if (entity instanceof EntityPlayer && entity.ticksExisted % 50 == 0) //TODO: Change to an incremental counter @@ -286,7 +286,7 @@ public class GenericHandler { } // @SideOnly(Side.SERVER) - public void sendPlayerDemonWillAura(EntityPlayer player) { + public static void sendPlayerDemonWillAura(EntityPlayer player) { if (player instanceof EntityPlayerMP) { BlockPos pos = player.getPosition(); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(player.getEntityWorld().provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); @@ -300,7 +300,7 @@ public class GenericHandler { // Handles destroying altar @SubscribeEvent - public void harvestEvent(PlayerEvent.HarvestCheck event) { + public static void harvestEvent(PlayerEvent.HarvestCheck event) { IBlockState state = event.getTargetBlock(); Block block = state.getBlock(); if (block instanceof BlockAltar && event.getEntityPlayer() != null && event.getEntityPlayer() instanceof EntityPlayerMP && !event.getEntityPlayer().getHeldItemMainhand().isEmpty() && event.getEntityPlayer().getHeldItemMainhand().getItem() instanceof ItemAltarMaker) { @@ -311,14 +311,14 @@ public class GenericHandler { // Handle Teleposer block blacklist @SubscribeEvent - public void onTelepose(TeleposeEvent event) { + public static void onTelepose(TeleposeEvent event) { if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposer().contains(event.initialState) || BloodMagicAPI.INSTANCE.getBlacklist().getTeleposer().contains(event.finalState)) event.setCanceled(true); } // Handle Teleposer entity blacklist @SubscribeEvent - public void onTeleposeEntity(TeleposeEvent.Ent event) { + public static void onTeleposeEntity(TeleposeEvent.Ent event) { EntityEntry entry = EntityRegistry.getEntry(event.entity.getClass()); if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName())) event.setCanceled(true); @@ -326,13 +326,13 @@ public class GenericHandler { // Sets teleport cooldown for Teleposed entities to 5 ticks (1/4 second) instead of 150 (7.5 seconds) @SubscribeEvent - public void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) { + public static void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) { event.entity.timeUntilPortal = 5; } // Handles binding of IBindable's as well as setting a player's highest orb tier @SubscribeEvent - public void onInteract(PlayerInteractEvent.RightClickItem event) { + public static void onInteract(PlayerInteractEvent.RightClickItem event) { if (event.getWorld().isRemote) return; @@ -374,14 +374,14 @@ public class GenericHandler { } @SubscribeEvent(priority = EventPriority.HIGH) - public void onTooltip(ItemTooltipEvent event) { + public static void onTooltip(ItemTooltipEvent event) { if (event.getItemStack().getItem() instanceof IBindable) if (((IBindable) event.getItemStack().getItem()).getOwnerUUID(event.getItemStack()) != null) event.getToolTip().add(I18n.format("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(event.getItemStack()))); } @SubscribeEvent - public void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { + public static void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { EntityPlayer player = event.player; if (LivingArmour.hasFullSet(player)) { @@ -402,7 +402,7 @@ public class GenericHandler { // Drop Blood Shards @SubscribeEvent - public void onLivingDrops(LivingDropsEvent event) { + public static void onLivingDrops(LivingDropsEvent event) { EntityLivingBase attackedEntity = event.getEntityLiving(); DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); @@ -420,7 +420,7 @@ public class GenericHandler { // Experience Tome @SubscribeEvent(priority = EventPriority.LOWEST) - public void onExperiencePickup(PlayerPickupXpEvent event) { + public static void onExperiencePickup(PlayerPickupXpEvent event) { EntityPlayer player = event.getEntityPlayer(); ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantments.MENDING, player); @@ -441,11 +441,11 @@ public class GenericHandler { } } - private int xpToDurability(int xp) { + private static int xpToDurability(int xp) { return xp * 2; } - private int durabilityToXp(int durability) { + private static int durabilityToXp(int durability) { return durability / 2; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 903d77e9..341fd647 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -35,14 +34,16 @@ import net.minecraftforge.event.entity.living.LivingHealEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Handler +@Mod.EventBusSubscriber public class LivingArmourHandler { + @SubscribeEvent - public void onEntityHealed(LivingHealEvent event) { + public static void onEntityHealed(LivingHealEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntity(); if (LivingArmour.hasFullSet(player)) { @@ -65,7 +66,7 @@ public class LivingArmourHandler { } @SubscribeEvent - public void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { + public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { EntityPlayer player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); @@ -85,7 +86,7 @@ public class LivingArmourHandler { // Applies: Storm Trooper @SubscribeEvent - public void onEntityJoinedWorld(EntityJoinWorldEvent event) { + public static void onEntityJoinedWorld(EntityJoinWorldEvent event) { Entity owner = null; if (event.getEntity() instanceof EntityArrow) { owner = ((EntityArrow) event.getEntity()).shootingEntity; @@ -115,7 +116,7 @@ public class LivingArmourHandler { } @SubscribeEvent - public void onPlayerClick(PlayerInteractEvent event) { + public static void onPlayerClick(PlayerInteractEvent event) { if (event.isCancelable()) { EntityPlayer player = event.getEntityPlayer(); @@ -148,7 +149,7 @@ public class LivingArmourHandler { // Applies: Grim Reaper @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onEntityDeath(LivingDeathEvent event) { + public static void onEntityDeath(LivingDeathEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); @@ -174,7 +175,7 @@ public class LivingArmourHandler { // Applies: Jump @SubscribeEvent - public void onJumpEvent(LivingEvent.LivingJumpEvent event) { + public static void onJumpEvent(LivingEvent.LivingJumpEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); @@ -198,7 +199,7 @@ public class LivingArmourHandler { // Applies: Step Assist, Speed Boost @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { + public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); boolean hasAssist = false; @@ -253,7 +254,7 @@ public class LivingArmourHandler { // Applies: Arrow Shot // Tracks: Arrow Shot @SubscribeEvent - public void onArrowFire(ArrowLooseEvent event) { + public static void onArrowFire(ArrowLooseEvent event) { World world = event.getEntityPlayer().getEntityWorld(); ItemStack stack = event.getBow(); EntityPlayer player = event.getEntityPlayer(); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index 78b03262..a8121653 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; @@ -24,17 +23,18 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Handler +@Mod.EventBusSubscriber public class StatTrackerHandler { private static float lastPlayerSwingStrength = 0; // Tracks: Digging, DigSlowdown @SubscribeEvent - public void blockBreakEvent(BlockEvent.BreakEvent event) { + public static void blockBreakEvent(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); if (player != null) { if (LivingArmour.hasFullSet(player)) { @@ -53,7 +53,7 @@ public class StatTrackerHandler { // Tracks: Health Boost @SubscribeEvent - public void onEntityHealed(LivingHealEvent event) { + public static void onEntityHealed(LivingHealEvent event) { EntityLivingBase healedEntity = event.getEntityLiving(); if (!(healedEntity instanceof EntityPlayer)) { return; @@ -74,13 +74,13 @@ public class StatTrackerHandler { } @SubscribeEvent - public void onLivingAttack(AttackEntityEvent event) { + public static void onLivingAttack(AttackEntityEvent event) { lastPlayerSwingStrength = event.getEntityPlayer().getCooledAttackStrength(0); } // Tracks: Fall Protect, Arrow Protect, Physical Protect, Grave Digger, Sprint Attack, Critical Strike, Nocturnal Prowess @SubscribeEvent - public void entityHurt(LivingHurtEvent event) { + public static void entityHurt(LivingHurtEvent event) { DamageSource source = event.getSource(); Entity sourceEntity = event.getSource().getTrueSource(); EntityLivingBase attackedEntity = event.getEntityLiving(); @@ -153,7 +153,7 @@ public class StatTrackerHandler { // Tracks: Experienced @SubscribeEvent(priority = EventPriority.LOW) - public void onExperiencePickup(PlayerPickupXpEvent event) { + public static void onExperiencePickup(PlayerPickupXpEvent event) { EntityPlayer player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 6fc490c9..49a48e97 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.util.handler.event; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -25,6 +24,7 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.world.ChunkDataEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; @@ -33,14 +33,14 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -@Handler +@Mod.EventBusSubscriber public class WillHandler { - private final HashMap serverTicks = new HashMap(); + private static final HashMap SERVER_TICKS = new HashMap(); // Adds Will to player @SubscribeEvent - public void onItemPickup(EntityItemPickupEvent event) { + public static void onItemPickup(EntityItemPickupEvent event) { ItemStack stack = event.getItem().getItem(); if (stack.getItem() instanceof IDemonWill) { EntityPlayer player = event.getEntityPlayer(); @@ -55,7 +55,7 @@ public class WillHandler { } @SubscribeEvent - public void onEntityAttacked(LivingDeathEvent event) { + public static void onEntityAttacked(LivingDeathEvent event) { if (event.getSource() instanceof EntityDamageSourceIndirect) { Entity sourceEntity = event.getSource().getImmediateSource(); @@ -67,7 +67,7 @@ public class WillHandler { // Add/Drop Demon Will for Player @SubscribeEvent - public void onLivingDrops(LivingDropsEvent event) { + public static void onLivingDrops(LivingDropsEvent event) { EntityLivingBase attackedEntity = event.getEntityLiving(); DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); @@ -106,16 +106,16 @@ public class WillHandler { } @SubscribeEvent - public void onServerWorldTick(TickEvent.WorldTickEvent event) { + public static void onServerWorldTick(TickEvent.WorldTickEvent event) { if (event.world.isRemote) return; int dim = event.world.provider.getDimension(); if (event.phase == TickEvent.Phase.END) { - if (!this.serverTicks.containsKey(dim)) - this.serverTicks.put(dim, 0); + if (!SERVER_TICKS.containsKey(dim)) + SERVER_TICKS.put(dim, 0); - int ticks = (this.serverTicks.get(dim)); + int ticks = (SERVER_TICKS.get(dim)); if (ticks % 20 == 0) { CopyOnWriteArrayList dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(dim); @@ -127,13 +127,13 @@ public class WillHandler { } } - this.serverTicks.put(dim, ticks + 1); + SERVER_TICKS.put(dim, ticks + 1); } } @SubscribeEvent - public void chunkSave(ChunkDataEvent.Save event) { + public static void chunkSave(ChunkDataEvent.Save event) { int dim = event.getWorld().provider.getDimension(); ChunkPos loc = event.getChunk().getPos(); @@ -150,7 +150,7 @@ public class WillHandler { } @SubscribeEvent - public void chunkLoad(ChunkDataEvent.Load event) { + public static void chunkLoad(ChunkDataEvent.Load event) { int dim = event.getWorld().provider.getDimension(); if (event.getData().getCompoundTag("BloodMagic").hasKey("base")) { NBTTagCompound nbt = event.getData().getCompoundTag("BloodMagic"); From 7cac007b1140e47cc37c490759d870949aabe952 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 13 Oct 2017 17:41:54 -0700 Subject: [PATCH 024/493] Add modid to subscriber annotations --- src/main/java/WayofTime/bloodmagic/ConfigHandler.java | 2 +- .../java/WayofTime/bloodmagic/potion/PotionEventHandlers.java | 3 ++- .../WayofTime/bloodmagic/util/handler/event/ClientHandler.java | 2 +- .../bloodmagic/util/handler/event/CraftingHandler.java | 2 +- .../bloodmagic/util/handler/event/GenericHandler.java | 2 +- .../bloodmagic/util/handler/event/LivingArmourHandler.java | 2 +- .../bloodmagic/util/handler/event/StatTrackerHandler.java | 2 +- .../WayofTime/bloodmagic/util/handler/event/WillHandler.java | 3 ++- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 99867dc1..23e12138 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class ConfigHandler { @Config.Comment({ "Blacklist options for various features" }) diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 27911f00..a393cb53 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.potion; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; @@ -18,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class PotionEventHandlers { @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 7066d100..e1ad1e37 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -50,7 +50,7 @@ import org.lwjgl.opengl.GL11; import java.util.*; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) @SideOnly(Side.CLIENT) public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 61e56302..3c9ca214 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class CraftingHandler { // Sets the uses of crafted Inscription Tools to 10 diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 80706b88..72c9fb45 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -87,7 +87,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { public static Map bounceMap = new HashMap(); public static Map filledHandMap = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 341fd647..a82dd6a0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -39,7 +39,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class LivingArmourHandler { @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index a8121653..8aee28b8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class StatTrackerHandler { private static float lastPlayerSwingStrength = 0; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 49a48e97..4857c90e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -33,7 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class WillHandler { private static final HashMap SERVER_TICKS = new HashMap(); From 67b4b7f9b1735fbd62348eb36daf68691724e4bf Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 15 Dec 2017 00:10:13 -0800 Subject: [PATCH 025/493] More Sigil work --- .../core/RegistrarBloodMagicItems.java | 11 +- .../item/sigil/ItemSigilGreenGrove.java | 94 ------------ .../bloodmagic/item/sigil/ItemSigilHaste.java | 22 --- .../bloodmagic/item/sigil/ItemSigilLava.java | 115 -------------- .../item/sigil/ItemSigilTeleposition.java | 90 ----------- .../item/sigil/ItemSigilTransposition.java | 143 ----------------- .../bloodmagic/item/sigil/ItemSigilWater.java | 132 ---------------- .../sigil/sigil/ItemSigilTeleposition.java | 90 +++++++++++ .../sigil/sigil/ItemSigilTransposition.java | 145 ++++++++++++++++++ .../item/sigil/sigil/SigilFluid.java | 79 ++++++++++ .../item/sigil/sigil/SigilGreenGrove.java | 91 +++++++++++ .../item/sigil/sigil/SigilHaste.java | 22 +++ .../util/handler/event/GenericHandler.java | 51 ++++-- .../bloodmagic/blockstates/sigil_lava.json | 10 +- .../blockstates/sigil_teleposition.json | 10 +- .../blockstates/sigil_transposition.json | 10 +- .../bloodmagic/blockstates/sigil_water.json | 10 +- 17 files changed, 485 insertions(+), 640 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTeleposition.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTransposition.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFluid.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilGreenGrove.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHaste.java diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index f43433ee..79f1dcd3 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -16,6 +16,8 @@ import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.sigil.sigil.*; +import WayofTime.bloodmagic.item.sigil.sigil.ItemSigilTeleposition; +import WayofTime.bloodmagic.item.sigil.sigil.ItemSigilTransposition; import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentType; import WayofTime.bloodmagic.item.types.ReagentType; @@ -29,6 +31,7 @@ import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -144,15 +147,15 @@ public class RegistrarBloodMagicItems { new ItemBoundShovel().setRegistryName("bound_shovel"), new ItemSigilDivination().setRegistryName("sigil_divination"), new ItemSigil(new SigilAir(), "air").setRegistryName("sigil_air"), - new ItemSigilWater().setRegistryName("sigil_water"), - new ItemSigilLava().setRegistryName("sigil_lava"), + new ItemSigil(new SigilFluid(FluidRegistry.WATER), "water").setRegistryName("sigil_water"), + new ItemSigil(new SigilFluid(FluidRegistry.LAVA), "lava").setRegistryName("sigil_lava"), new ItemSigilVoid().setRegistryName("sigil_void"), - new ItemSigilGreenGrove().setRegistryName("sigil_green_grove"), + new ItemSigil(new SigilGreenGrove(), "green_grove").setRegistryName("sigil_green_grove"), new ItemSigil(new SigilBloodLight(), "blood_light").setRegistryName("sigil_blood_light"), new ItemSigil(new SigilElementalAffinity(), "elemental_affinity").setRegistryName("sigil_elemental_affinity"), new ItemSigilMagnetism().setRegistryName("sigil_magnetism"), new ItemSigilSuppression().setRegistryName("sigil_suppression"), - new ItemSigilHaste().setRegistryName("sigil_haste"), + new ItemSigil(new SigilHaste(), "haste").setRegistryName("sigil_haste"), new ItemSigil(new SigilFastMiner(), "fast_miner").setRegistryName("sigil_fast_miner"), new ItemSigilSeer().setRegistryName("sigil_seer"), new ItemSigilPhantomBridge().setRegistryName("sigil_phantom_bridge"), diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java deleted file mode 100644 index 842b69ad..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ /dev/null @@ -1,94 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; -import net.minecraft.block.IGrowable; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.fml.common.eventhandler.Event.Result; - -public class ItemSigilGreenGrove extends ItemSigilToggleableBase { - public ItemSigilGreenGrove() { - super("green_grove", 150); - } - - @Override - public boolean onSigilUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) { - if (PlayerHelper.isFakePlayer(player)) - return false; - - if (applyBonemeal(world, blockPos, player, stack)) { - if (!world.isRemote) { - world.playEvent(2005, blockPos, 0); - } - return true; - } - - return false; - } - - @Override - public void onSigilUpdate(ItemStack stack, World worldIn, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - int range = 3; - int verticalRange = 2; - int posX = (int) Math.round(player.posX - 0.5f); - int posY = (int) player.posY; - int posZ = (int) Math.round(player.posZ - 0.5f); - - for (int ix = posX - range; ix <= posX + range; ix++) { - for (int iz = posZ - range; iz <= posZ + range; iz++) { - for (int iy = posY - verticalRange; iy <= posY + verticalRange; iy++) { - BlockPos blockPos = new BlockPos(ix, iy, iz); - IBlockState state = worldIn.getBlockState(blockPos); - - if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { - if (state.getBlock() instanceof IGrowable) { - if (worldIn.rand.nextInt(50) == 0) { - IBlockState preBlockState = worldIn.getBlockState(blockPos); - state.getBlock().updateTick(worldIn, blockPos, state, worldIn.rand); - - IBlockState newState = worldIn.getBlockState(blockPos); - if (!newState.equals(preBlockState) && !worldIn.isRemote) - worldIn.playEvent(2005, blockPos, 0); - } - } - } - } - } - } - } - - private boolean applyBonemeal(World worldIn, BlockPos target, EntityPlayer player, ItemStack sigilStack) { - IBlockState iblockstate = worldIn.getBlockState(target); - - BonemealEvent event = new BonemealEvent(player, worldIn, target, iblockstate, EnumHand.MAIN_HAND, sigilStack); - if (MinecraftForge.EVENT_BUS.post(event)) - return false; - else if (event.getResult() == Result.ALLOW) - return true; - - if (iblockstate.getBlock() instanceof IGrowable) { - IGrowable igrowable = (IGrowable) iblockstate.getBlock(); - - if (igrowable.canGrow(worldIn, target, iblockstate, worldIn.isRemote)) { - if (!worldIn.isRemote) { - if (igrowable.canUseBonemeal(worldIn, worldIn.rand, target, iblockstate)) - igrowable.grow(worldIn, worldIn.rand, target, iblockstate); - } - return true; - } - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java deleted file mode 100644 index 02559204..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; - -public class ItemSigilHaste extends ItemSigilToggleableBase { - public ItemSigilHaste() { - super("haste", 250); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOOST, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java deleted file mode 100644 index 919b2dab..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ /dev/null @@ -1,115 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; - -public class ItemSigilLava extends ItemSigilBase { - public ItemSigilLava() { - super("lava", 1000); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - if (!world.isRemote && !isUnusable(stack)) { - RayTraceResult rayTrace = this.rayTrace(world, player, false); - - if (rayTrace != null) { - ActionResult ret = ForgeEventFactory.onBucketUse(player, world, stack, rayTrace); - if (ret != null) - return ret; - - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockpos = rayTrace.getBlockPos(); - - if (!world.isBlockModifiable(player, blockpos)) { - return super.onItemRightClick(world, player, hand); - } - - if (!player.canPlayerEdit(blockpos.offset(rayTrace.sideHit), rayTrace.sideHit, stack)) { - return super.onItemRightClick(world, player, hand); - } - - BlockPos blockpos1 = blockpos.offset(rayTrace.sideHit); - - if (!player.canPlayerEdit(blockpos1, rayTrace.sideHit, stack)) { - return super.onItemRightClick(world, player, hand); - } - - if (this.canPlaceLava(world, blockpos1) && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceLava(world, blockpos1)) { - return super.onItemRightClick(world, player, hand); - } - } - } - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) { - return EnumActionResult.FAIL; - } - if (!world.canMineBlockBody(player, blockPos)) { - return EnumActionResult.FAIL; - } - - TileEntity tile = world.getTileEntity(blockPos); - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); - int amount = handler.fill(fluid, false); - - if (amount > 0 && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed())) { - handler.fill(fluid, true); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - return EnumActionResult.FAIL; - } - - public boolean canPlaceLava(World world, BlockPos blockPos) { - if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isSolid()) { - return false; - } else if ((world.getBlockState(blockPos).getBlock() == Blocks.LAVA || world.getBlockState(blockPos).getBlock() == Blocks.FLOWING_LAVA) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0) { - return false; - } else { - world.setBlockState(blockPos, Blocks.FLOWING_LAVA.getBlockState().getBaseState(), 3); - return true; - } - } - - public boolean tryPlaceLava(World world, BlockPos pos) { - Material material = world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)); - - return world.isAirBlock(pos) && !material.isSolid(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java deleted file mode 100644 index e4fd869f..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ /dev/null @@ -1,90 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.ritual.portal.Teleports; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class ItemSigilTeleposition extends ItemSigilBase { - public ItemSigilTeleposition() { - super("teleposition"); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - - if (!stack.hasTagCompound()) - return; - NBTTagCompound tag = stack.getTagCompound(); - - if (tag != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { - tooltip.add(" "); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", getValue(tag, Constants.NBT.X_COORD), getValue(tag, Constants.NBT.Y_COORD), getValue(tag, Constants.NBT.Z_COORD))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", getValue(tag, Constants.NBT.DIMENSION_ID))); - } - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - if (!world.isRemote && NBTHelper.checkNBT(stack) != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { - BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up(); - if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack), true)); - } else { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true)); - } - } - return super.onItemRightClick(world, player, hand); - } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return EnumActionResult.FAIL; - - if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) { - if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) { - stack.getTagCompound().setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); - stack.getTagCompound().setInteger(Constants.NBT.X_COORD, pos.getX()); - stack.getTagCompound().setInteger(Constants.NBT.Y_COORD, pos.getY()); - stack.getTagCompound().setInteger(Constants.NBT.Z_COORD, pos.getZ()); - - return EnumActionResult.SUCCESS; - } - } - return EnumActionResult.FAIL; - } - - public int getValue(NBTTagCompound tag, String key) { - return tag.getInteger(key); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java deleted file mode 100644 index ac8429f4..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ /dev/null @@ -1,143 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class ItemSigilTransposition extends ItemSigilBase { - public ItemSigilTransposition() { - super("transposition", 1000); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - - if (!stack.hasTagCompound()) - return; - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && tag.hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { - tooltip.add(" "); - BlockStack blockStack = new BlockStack(Block.getBlockFromName(tag.getString(Constants.NBT.CONTAINED_BLOCK_NAME)), tag.getByte(Constants.NBT.CONTAINED_BLOCK_META)); - tooltip.add(blockStack.getItemStack().getDisplayName()); - } - } - - @Override - public String getItemStackDisplayName(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && tag.hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { - BlockStack blockStack = new BlockStack(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(tag.getString(Constants.NBT.CONTAINED_BLOCK_NAME))), tag.getByte(Constants.NBT.CONTAINED_BLOCK_META)); - if (blockStack.getItemStack() != null && blockStack.getItemStack().getItem() != null) //TODO: Figure out why it's a null item. This is a patchwork solution. - { - return super.getItemStackDisplayName(stack) + " (" + blockStack.getItemStack().getDisplayName() + ")"; - } - - } - return super.getItemStackDisplayName(stack); - } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return EnumActionResult.FAIL; - - stack = NBTHelper.checkNBT(stack); - - IBlockState state = world.getBlockState(blockPos); - if (!world.isRemote) { - if (BloodMagicAPI.INSTANCE.getBlacklist().getTransposition().contains(state)) - return EnumActionResult.FAIL; - - if (player.isSneaking() && (!stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) || !stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META))) { - if (state.getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && state.getBlockHardness(world, blockPos) >= 0) { - int cost = getLpUsed(); - - NBTTagCompound tileNBTTag = new NBTTagCompound(); - String blockName = state.getBlock().getRegistryName().toString(); - byte metadata = (byte) state.getBlock().getMetaFromState(state); - - if (world.getTileEntity(blockPos) != null) { - cost *= 5; - world.getTileEntity(blockPos).writeToNBT(tileNBTTag); - - if (world.getTileEntity(blockPos) instanceof TileEntityMobSpawner) { - cost *= 6; - } - } - - stack.getTagCompound().setString(Constants.NBT.CONTAINED_BLOCK_NAME, blockName); - stack.getTagCompound().setByte(Constants.NBT.CONTAINED_BLOCK_META, metadata); - stack.getTagCompound().setTag(Constants.NBT.CONTAINED_TILE_ENTITY, tileNBTTag); - - NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, cost); - - world.removeTileEntity(blockPos); - world.setBlockToAir(blockPos); - - return EnumActionResult.SUCCESS; - } - } else if (stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { - IBlockState iblockstate = world.getBlockState(blockPos); - Block block = iblockstate.getBlock(); - BlockStack blockToPlace = new BlockStack(Block.getBlockFromName(stack.getTagCompound().getString(Constants.NBT.CONTAINED_BLOCK_NAME)), stack.getTagCompound().getByte(Constants.NBT.CONTAINED_BLOCK_META)); - - if (!block.isReplaceable(world, blockPos)) { - blockPos = blockPos.offset(side); - } - - if (!stack.isEmpty() && player.canPlayerEdit(blockPos, side, stack) && world.mayPlace(blockToPlace.getBlock(), blockPos, false, side, player)) { - if (world.setBlockState(blockPos, blockToPlace.getState(), 3)) { - blockToPlace.getBlock().onBlockPlacedBy(world, blockPos, blockToPlace.getState(), player, blockToPlace.getItemStack()); -// world.playSound((double) ((float) blockPos.getX() + 0.5F), (double) ((float) blockPos.getY() + 0.5F), (double) ((float) blockPos.getZ() + 0.5F), blockToPlace.getBlock().getStepSound().getPlaceSound(), (blockToPlace.getBlock().getStepSound().getVolume() + 1.0F) / 2.0F, blockToPlace.getBlock().getStepSound().getPitch() * 0.8F); - - if (stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_TILE_ENTITY) && blockToPlace.getBlock().hasTileEntity(blockToPlace.getState())) { - NBTTagCompound tag = stack.getTagCompound().getCompoundTag(Constants.NBT.CONTAINED_TILE_ENTITY); - tag.setInteger("x", blockPos.getX()); - tag.setInteger("y", blockPos.getY()); - tag.setInteger("z", blockPos.getZ()); - world.getTileEntity(blockPos).readFromNBT(tag); - } - world.notifyBlockUpdate(blockPos, state, state, 3); - - stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_BLOCK_NAME); - stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_BLOCK_META); - stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_TILE_ENTITY); - - return EnumActionResult.SUCCESS; - } - } - } - } - return EnumActionResult.FAIL; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java deleted file mode 100644 index 8fa03754..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ /dev/null @@ -1,132 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import net.minecraft.block.BlockCauldron; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; - -public class ItemSigilWater extends ItemSigilBase { - public ItemSigilWater() { - super("water", 100); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - if (!world.isRemote && !isUnusable(stack)) { - RayTraceResult rayTrace = this.rayTrace(world, player, false); - - if (rayTrace != null) { - ActionResult ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, rayTrace); - if (ret != null) - return ret; - - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockpos = rayTrace.getBlockPos(); - - if (!world.isBlockModifiable(player, blockpos)) - return super.onItemRightClick(world, player, hand); - - if (!player.canPlayerEdit(blockpos.offset(rayTrace.sideHit), rayTrace.sideHit, stack)) - return super.onItemRightClick(world, player, hand); - - BlockPos blockpos1 = blockpos.offset(rayTrace.sideHit); - - if (!player.canPlayerEdit(blockpos1, rayTrace.sideHit, stack)) - return super.onItemRightClick(world, player, hand); - - if (this.canPlaceWater(world, blockpos1) && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceWater(world, blockpos1)) - return super.onItemRightClick(world, player, hand); - } - } - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) - return EnumActionResult.FAIL; - - if (!world.canMineBlockBody(player, blockPos)) - return EnumActionResult.FAIL; - - TileEntity tile = world.getTileEntity(blockPos); - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000); - int amount = handler.fill(fluid, false); - - if (amount > 0 && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())) { - handler.fill(fluid, true); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())) { - world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(BlockCauldron.LEVEL, 3)); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - public boolean canPlaceWater(World world, BlockPos blockPos) { - if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isSolid()) - return false; - else if ((world.getBlockState(blockPos).getBlock() == Blocks.WATER || world.getBlockState(blockPos).getBlock() == Blocks.FLOWING_WATER) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0) - return false; - else - return true; - } - - public boolean tryPlaceWater(World worldIn, BlockPos pos) { - - Material material = worldIn.getBlockState(pos).getBlock().getMaterial(worldIn.getBlockState(pos)); - boolean notSolid = !material.isSolid(); - - if (!worldIn.isAirBlock(pos) && !notSolid) { - return false; - } else { - if (worldIn.provider.doesWaterVaporize()) { - int i = pos.getX(); - int j = pos.getY(); - int k = pos.getZ(); - worldIn.playSound(null, i, j, k, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F); - - for (int l = 0; l < 8; ++l) - worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D, 0); - } else { - if (!worldIn.isRemote && notSolid && !material.isLiquid()) - worldIn.destroyBlock(pos, true); - - worldIn.setBlockState(pos, Blocks.FLOWING_WATER.getDefaultState(), 3); - } - - return true; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTeleposition.java new file mode 100644 index 00000000..c3228ab2 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTeleposition.java @@ -0,0 +1,90 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.teleport.ITeleport; +import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.ritual.portal.Teleports; +import WayofTime.bloodmagic.tile.TileTeleposer; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class ItemSigilTeleposition extends ItemSigil { + + public ItemSigilTeleposition() { + super(new SigilTeleposition(), "teleposition"); + } + + @SideOnly(Side.CLIENT) + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); + + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("dim")) + return; + + NBTTagCompound tag = stack.getTagCompound(); + BlockPos pos = BlockPos.fromLong(tag.getLong("pos")); + + tooltip.add(""); + tooltip.add(I18n.format("tooltip.bloodmagic.telepositionFocus.coords", pos.getX(), pos.getY(), pos.getZ())); + tooltip.add(I18n.format("tooltip.bloodmagic.telepositionFocus.dimension", tag.getInteger("dim"))); + } + + public static class SigilTeleposition implements ISigil { + + @Override + public int getCost() { + return 0; + } + + @Nonnull + @Override + public EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand) { + if (world.isRemote || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("dim")) + return EnumActionResult.PASS; + + NBTTagCompound tag = stack.getTagCompound(); + BlockPos pos = BlockPos.fromLong(tag.getLong("pos")); + int dimension = tag.getInteger("dim"); + + ITeleport teleport; + if (world.provider.getDimension() == dimension) + teleport = new Teleports.TeleportSameDim(pos, player, getOwnerUUID(stack), true); + else + teleport = new Teleports.TeleportToDim(pos, player, getOwnerUUID(stack), world, dimension, true); + + TeleportQueue.getInstance().addITeleport(teleport); + + return EnumActionResult.SUCCESS; + } + + @Override + public EnumActionResult onInteract(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumHand hand) { + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + if (!(world.getTileEntity(pos) instanceof TileTeleposer)) + return EnumActionResult.FAIL; + + NBTTagCompound tag = stack.getTagCompound(); + tag.setLong("pos", pos.toLong()); + tag.setInteger("dim", world.provider.getDimension()); + + + return EnumActionResult.SUCCESS; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTransposition.java new file mode 100644 index 00000000..58120ac2 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/ItemSigilTransposition.java @@ -0,0 +1,145 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class ItemSigilTransposition extends ItemSigil { + + public ItemSigilTransposition() { + super(new SigilTransposition(), "transposition"); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); + + if (!stack.hasTagCompound()) + return; + + NBTTagCompound tag = stack.getTagCompound(); + if (!tag.hasKey("stored")) + return; + + IBlockState state = NBTUtil.readBlockState(tag.getCompoundTag("stored")); + ItemStack blockStack = new ItemStack(state.getBlock().getItemDropped(state, null, 0), 1, state.getBlock().damageDropped(state)); + tooltip.add(blockStack.isEmpty() ? I18n.format(state.getBlock().getUnlocalizedName()) : blockStack.getDisplayName()); + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + if (!stack.hasTagCompound()) + return super.getItemStackDisplayName(stack); + + NBTTagCompound tag = stack.getTagCompound(); + if (!tag.hasKey("stored")) + return super.getItemStackDisplayName(stack); + + IBlockState state = NBTUtil.readBlockState(tag.getCompoundTag("stored")); + ItemStack blockStack = new ItemStack(state.getBlock().getItemDropped(state, null, 0), 1, state.getBlock().damageDropped(state)); + String blockName = blockStack.isEmpty() ? net.minecraft.util.text.translation.I18n.translateToLocal(state.getBlock().getUnlocalizedName()) : blockStack.getDisplayName(); + + return super.getItemStackDisplayName(stack) + " (" + blockName + ")"; + } + + @Nullable + @Override + public NBTTagCompound getNBTShareTag(ItemStack stack) { + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("stored")) + return null; + + NBTTagCompound justTheState = stack.getTagCompound().copy(); + justTheState.getCompoundTag("stored").removeTag("tile"); + return justTheState; + } + + public static class SigilTransposition implements ISigil { + + @Override + public int getCost() { + return 1000; + } + + @Override + public EnumActionResult onInteract(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumHand hand) { + IBlockState state = world.getBlockState(pos); + if (world.isRemote || BloodMagicAPI.INSTANCE.getBlacklist().getTransposition().contains(state)) + return EnumActionResult.FAIL; + + NBTTagCompound tag = stack.getTagCompound(); + if (player.isSneaking() && (!stack.hasTagCompound() || !tag.hasKey("stored"))) { + if (state.getPlayerRelativeBlockHardness(player, world, pos) >= 0 && state.getBlockHardness(world, pos) >= 0) { + int cost = getCost(); + + NBTTagCompound stored = new NBTTagCompound(); + NBTUtil.writeBlockState(stored, state); + + TileEntity tile = world.getTileEntity(pos); + if (tile != null) { + NBTTagCompound tileTag = new NBTTagCompound(); + tile.writeToNBT(tileTag); + stored.setTag("tile", tileTag); + cost *= 5; + + if (tile instanceof TileEntityMobSpawner) + cost *= 6; + } + + tag.setTag("stored", stored); + + NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, cost); + world.setBlockToAir(pos); + world.removeTileEntity(pos); + } + } else if (stack.hasTagCompound() && stack.getTagCompound().hasKey("stored")) { + IBlockState placeAtState = world.getBlockState(pos); + + // If the block we clicked isn't replaceable, try to offset to the side we clicked on + if (!placeAtState.getBlock().isReplaceable(world, pos)) + placeAtState = world.getBlockState(pos = pos.offset(side)); + + // If we still can't place here, just cancel out. + if (!placeAtState.getBlock().isReplaceable(world, pos)) + return EnumActionResult.FAIL; + + NBTTagCompound stored = stack.getTagCompound().getCompoundTag("stored"); + IBlockState toPlace = NBTUtil.readBlockState(stored); + if (player.canPlayerEdit(pos, side, stack) && world.mayPlace(toPlace.getBlock(), pos, false, side, player)) { + ItemStack placeStack = new ItemStack(state.getBlock().getItemDropped(state, null, 0), 1, state.getBlock().damageDropped(state)); + toPlace.getBlock().onBlockPlacedBy(world, pos, toPlace, player, placeStack); + + if (stored.hasKey("tile")) { + NBTTagCompound tileTag = stored.getCompoundTag("tile"); + tileTag.setInteger("x", pos.getX()); + tileTag.setInteger("y", pos.getY()); + tileTag.setInteger("z", pos.getZ()); + world.getTileEntity(pos).readFromNBT(tileTag); + } + + world.notifyBlockUpdate(pos, state, state, 3); + + stack.getTagCompound().removeTag("stored"); + } + } + + return EnumActionResult.SUCCESS; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFluid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFluid.java new file mode 100644 index 00000000..82bc1aaf --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilFluid.java @@ -0,0 +1,79 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper; +import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; + +import javax.annotation.Nonnull; + +public class SigilFluid implements ISigil { + + private final Fluid fluid; + + public SigilFluid(Fluid fluid) { + this.fluid = fluid; + } + + @Override + public int getCost() { + return 1000; + } + + @Override + public EnumActionResult onInteract(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumHand hand) { + if (world.isRemote) + return EnumActionResult.FAIL; + + TileEntity tile = world.getTileEntity(pos); + if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { + IFluidHandler fluidHandler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); + FluidStack fluid = new FluidStack(this.fluid, 1000); + int amount = fluidHandler.fill(fluid, false); + if (amount > 0 && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getCost())) { + fluidHandler.fill(fluid, true); + return EnumActionResult.SUCCESS; + } + } + + if (fluid.getBlock() == null) + return EnumActionResult.FAIL; + + IBlockState placeAtState = world.getBlockState(pos); + if (!placeAtState.getBlock().isReplaceable(world, pos)) + placeAtState = world.getBlockState(pos = pos.offset(side)); + + if (!placeAtState.getBlock().isReplaceable(world, pos)) + return EnumActionResult.FAIL; + + Block fluidBlock = fluid.getBlock(); + IFluidHandler fluidHandler = null; + if (fluidBlock instanceof IFluidBlock) + fluidHandler = new FluidBlockWrapper((IFluidBlock) fluidBlock, world, pos); + else if (fluidBlock instanceof BlockLiquid) + fluidHandler = new BlockLiquidWrapper((BlockLiquid) fluidBlock, world, pos); + + if (fluidHandler != null) { + fluidHandler.fill(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true); + NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getCost()); + return EnumActionResult.SUCCESS; + } + + return EnumActionResult.FAIL; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilGreenGrove.java new file mode 100644 index 00000000..19fb9f2f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilGreenGrove.java @@ -0,0 +1,91 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import net.minecraft.block.IGrowable; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.fml.common.eventhandler.Event; + +import javax.annotation.Nonnull; + +public class SigilGreenGrove implements ISigil.Toggle { + + private static final int RANGE_HORIZONTAL = 3; + private static final int RANGE_VERTICAL = 2; + + @Override + public int getCost() { + return 150; + } + + @Override + public EnumActionResult onInteract(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumHand hand) { + if (applyBonemeal(world, pos, player, stack, hand)) { + if (!world.isRemote) + world.playEvent(2005, pos, 0); + + return EnumActionResult.SUCCESS; + } + + return EnumActionResult.FAIL; + } + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + int posX = (int) Math.round(player.posX - 0.5f); + int posY = (int) player.posY; + int posZ = (int) Math.round(player.posZ - 0.5f); + + for (int ix = posX - RANGE_HORIZONTAL; ix <= posX + RANGE_HORIZONTAL; ix++) { + for (int iz = posZ - RANGE_HORIZONTAL; iz <= posZ + RANGE_HORIZONTAL; iz++) { + for (int iy = posY - RANGE_VERTICAL; iy <= posY + RANGE_VERTICAL; iy++) { + BlockPos blockPos = new BlockPos(ix, iy, iz); + IBlockState state = world.getBlockState(blockPos); + + if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { + if (state.getBlock() instanceof IGrowable) { + if (world.rand.nextInt(50) == 0) { + state.getBlock().updateTick(world, blockPos, state, world.rand); + IBlockState newState = world.getBlockState(blockPos); + + if (!newState.equals(state) && !world.isRemote) + world.playEvent(2005, blockPos, 0); + } + } + } + } + } + } + } + + private boolean applyBonemeal(World world, BlockPos target, EntityPlayer player, ItemStack sigilStack, EnumHand hand) { + IBlockState state = world.getBlockState(target); + + BonemealEvent event = new BonemealEvent(player, world, target, state, hand, sigilStack); + if (MinecraftForge.EVENT_BUS.post(event)) + return false; + else if (event.getResult() == Event.Result.ALLOW) + return true; + + if (state.getBlock() instanceof IGrowable) { + IGrowable growable = (IGrowable) state.getBlock(); + + if (growable.canGrow(world, target, state, world.isRemote)) { + if (!world.isRemote && growable.canUseBonemeal(world, world.rand, target, state)) + growable.grow(world, world.rand, target, state); + + return true; + } + } + + return false; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHaste.java new file mode 100644 index 00000000..4486ebfa --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/sigil/SigilHaste.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.item.sigil.sigil; + +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilHaste implements ISigil.Toggle { + + @Override + public int getCost() { + return 250; + } + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld) { + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOOST, 2, 0, true, false)); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 72c9fb45..6e1f3098 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -55,6 +55,7 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; @@ -342,22 +343,8 @@ public class GenericHandler { return; ItemStack held = event.getItemStack(); - if (!held.isEmpty() && held.getItem() instanceof IBindable) { - held = NBTHelper.checkNBT(held); - IBindable bindable = (IBindable) held.getItem(); - if (Strings.isNullOrEmpty(bindable.getOwnerUUID(held))) { - if (bindable.onBind(player, held)) { - String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - ItemBindEvent toPost = new ItemBindEvent(player, uuid, held); - if (MinecraftForge.EVENT_BUS.post(toPost) || toPost.getResult() == Result.DENY) - return; - - BindableHelper.setItemOwnerUUID(held, uuid); - BindableHelper.setItemOwnerName(held, player.getDisplayNameString()); - } - } else if (bindable.getOwnerUUID(held).equals(PlayerHelper.getUUIDFromPlayer(player).toString()) && !bindable.getOwnerName(held).equals(player.getDisplayNameString())) - BindableHelper.setItemOwnerName(held, player.getDisplayNameString()); - } + if (!held.isEmpty() && held.getItem() instanceof IBindable) + bindItem(held, player); if (!held.isEmpty() && held.getItem() instanceof IBloodOrb) { held = NBTHelper.checkNBT(held); @@ -373,6 +360,38 @@ public class GenericHandler { } } + // Handles binding of IBindable's + @SubscribeEvent + public static void onInteractBlock(PlayerInteractEvent.RightClickBlock event) { + if (event.getWorld().isRemote) + return; + + if (PlayerHelper.isFakePlayer(event.getEntityPlayer())) + return; + + if (!event.getItemStack().isEmpty() && event.getItemStack().getItem() instanceof IBindable) + bindItem(event.getItemStack(), event.getEntityPlayer()); + } + + private static void bindItem(ItemStack stack, EntityPlayer player) { + IBindable bindable = (IBindable) stack.getItem(); + if (Strings.isNullOrEmpty(bindable.getOwnerUUID(stack))) { + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + if (bindable.onBind(player, stack)) { + String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); + ItemBindEvent toPost = new ItemBindEvent(player, uuid, stack); + if (MinecraftForge.EVENT_BUS.post(toPost) || toPost.getResult() == Result.DENY) + return; + + BindableHelper.setItemOwnerUUID(stack, uuid); + BindableHelper.setItemOwnerName(stack, player.getDisplayNameString()); + } + } else if (bindable.getOwnerUUID(stack).equals(PlayerHelper.getUUIDFromPlayer(player).toString()) && !bindable.getOwnerName(stack).equals(player.getDisplayNameString())) + BindableHelper.setItemOwnerName(stack, player.getDisplayNameString()); + } + @SubscribeEvent(priority = EventPriority.HIGH) public static void onTooltip(ItemTooltipEvent event) { if (event.getItemStack().getItem() instanceof IBindable) diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json index fde7dbbc..3e264e84 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/LavaSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/lavasigil" } - } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json index 84d1fe93..c46bdb91 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/TelepositionSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/telepositionsigil" } - } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json index bb09cc7d..616df1e8 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/TranspositionSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/transpositionsigil" } - } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json index 9f76d28b..81b7c857 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json +++ b/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json @@ -5,12 +5,10 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/WaterSigil" - } + "inventory": [{ + "textures": { + "layer0": "bloodmagic:items/watersigil" } - } + }] } } \ No newline at end of file From 03b4b5e2d730d1d8cd308bbf4f42148df1c50846 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 15 Dec 2017 17:50:12 -0800 Subject: [PATCH 026/493] Fix Reagent stacks --- src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java b/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java index 0691d87a..9f2504d5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ReagentType.java @@ -41,6 +41,6 @@ public enum ReagentType implements ISubItem { @Nonnull @Override public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal()); + return new ItemStack(RegistrarBloodMagicItems.REAGENT, count, ordinal()); } } From dce2817b8c4ae42dad4464759b2ced9c5f281167 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 15 Dec 2017 18:34:04 -0800 Subject: [PATCH 027/493] Demon Crystal fixes --- .../api/soul/EnumDemonWillType.java | 20 +++++- .../bloodmagic/block/BlockDemonCrystal.java | 56 ++++------------ .../core/RegistrarBloodMagicRecipes.java | 19 +++--- .../bloodmagic/item/ItemDemonCrystal.java | 64 +------------------ .../item/block/ItemBlockDemonCrystal.java | 10 ++- 5 files changed, 50 insertions(+), 119 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java index 445697f7..12aee7ff 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java @@ -1,10 +1,15 @@ package WayofTime.bloodmagic.api.soul; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; +import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; +import org.apache.commons.lang3.text.WordUtils; +import javax.annotation.Nonnull; import java.util.Locale; -public enum EnumDemonWillType implements IStringSerializable { +public enum EnumDemonWillType implements IStringSerializable, ISubItem { DEFAULT("default"), CORROSIVE("corrosive"), DESTRUCTIVE("destructive"), @@ -26,4 +31,17 @@ public enum EnumDemonWillType implements IStringSerializable { public String getName() { return this.toString(); } + + + @Nonnull + @Override + public String getInternalName() { + return "crystal" + WordUtils.capitalize(name); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count, ordinal()); + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 95352a33..c5ca0a1b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -13,6 +14,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -26,7 +28,7 @@ import net.minecraft.world.World; import javax.annotation.Nullable; import java.util.Random; -public class BlockDemonCrystal extends Block { +public class BlockDemonCrystal extends Block implements IBMBlock { public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", EnumFacing.class); @@ -156,6 +158,8 @@ public class BlockDemonCrystal extends Block { } TileDemonCrystal crystal = (TileDemonCrystal) world.getTileEntity(pos); + if (crystal == null) + return false; if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024) { crystal.dropSingleCrystal(); @@ -177,49 +181,13 @@ public class BlockDemonCrystal extends Block { return new TileDemonCrystal(); } - public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) { - ItemStack stack = null; - switch (type) { - case CORROSIVE: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE); - break; - case DEFAULT: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT); - break; - case DESTRUCTIVE: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE); - break; - case STEADFAST: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST); - break; - case VENGEFUL: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL); - break; - } - - stack.setCount(crystalNumber); - return stack; + @Nullable + @Override + public ItemBlock getItem() { + return new ItemBlockDemonCrystal(this); } - // @Override -// public java.util.List getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune) -// { -// java.util.List ret = super.getDrops(world, pos, state, fortune); -// int age = ((Integer) state.getValue(AGE)).intValue(); -// Random rand = world instanceof World ? ((World) world).rand : new Random(); -// -// if (age >= 7) -// { -// int k = 3 + fortune; -// -// for (int i = 0; i < 3 + fortune; ++i) -// { -// if (rand.nextInt(15) <= age) -// { -// ret.add(new ItemStack(this.getSeed(), 1, 0)); -// } -// } -// } -// return ret; -// } + public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) { + return type.getStack(crystalNumber); + } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index d1b8191a..c2fabada 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -30,15 +30,12 @@ public class RegistrarBloodMagicRecipes { public static void registerCrafting(IForgeRegistry registry) { for (int i = 0; i < ItemSoulGem.names.length; i++) { - for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { + for (EnumDemonWillType willType : EnumDemonWillType.values()) { ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j); - - EnumDemonWillType willType = ((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack); ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); - ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, crystalStack); + ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); registry.register(shapeless.setRegistryName("soul_gem_" + willType.getName())); } } @@ -89,7 +86,7 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); @@ -129,11 +126,11 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack()); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index 169265cf..d944bd41 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -1,65 +1,15 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import com.google.common.collect.Lists; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; -import java.util.List; - -public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider { - public static final ArrayList NAMES = Lists.newArrayList(); - - public static final String CRYSTAL_DEFAULT = "crystalDefault"; - public static final String CRYSTAL_CORROSIVE = "crystalCorrosive"; - public static final String CRYSTAL_VENGEFUL = "crystalVengeful"; - public static final String CRYSTAL_DESTRUCTIVE = "crystalDestructive"; - public static final String CRYSTAL_STEADFAST = "crystalSteadfast"; +public class ItemDemonCrystal extends ItemEnum implements IDiscreteDemonWill, IVariantProvider { public ItemDemonCrystal() { - super(); - - setUnlocalizedName(BloodMagic.MODID + ".demonCrystal."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - - buildItemList(); - } - - private void buildItemList() { - NAMES.add(0, CRYSTAL_DEFAULT); - NAMES.add(1, CRYSTAL_CORROSIVE); - NAMES.add(2, CRYSTAL_DESTRUCTIVE); - NAMES.add(3, CRYSTAL_VENGEFUL); - NAMES.add(4, CRYSTAL_STEADFAST); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + NAMES.get(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < NAMES.size(); i++) - list.add(new ItemStack(this, 1, i)); + super(EnumDemonWillType.class, "demonCrystal"); } @Override @@ -89,14 +39,4 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria public EnumDemonWillType getType(ItemStack willStack) { return EnumDemonWillType.values()[MathHelper.clamp(willStack.getMetadata(), 0, EnumDemonWillType.values().length - 1)]; } - - @Override - public void populateVariants(Int2ObjectMap variants) { - for (String name : NAMES) - variants.put(NAMES.indexOf(name), "type=" + name); - } - - public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, NAMES.indexOf(name)); - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 611c8150..63ac8226 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item.block; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrystal; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +16,7 @@ import net.minecraft.world.World; import java.util.Locale; -public class ItemBlockDemonCrystal extends ItemBlock { +public class ItemBlockDemonCrystal extends ItemBlock implements IVariantProvider { public ItemBlockDemonCrystal(Block block) { super(block); setHasSubtypes(true); @@ -43,4 +45,10 @@ public class ItemBlockDemonCrystal extends ItemBlock { return false; } + + @Override + public void populateVariants(Int2ObjectMap variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.put(type.ordinal(), "age=4,attached=up,type=" + type.getName()); + } } From d99cf7728896566b25aea0bc970b97f2e4dfe0d5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 18:56:50 -0700 Subject: [PATCH 028/493] Move config to annotation system All old configs must be deleted for this to work properly. Since the rest of the update is filled with world breaking changes, this should be fine. Also some mapping updates (cherry picked from commit d587a8c) --- build.gradle | 5 +- gradle.properties | 12 +- .../java/WayofTime/bloodmagic/BloodMagic.java | 5 +- .../WayofTime/bloodmagic/ConfigHandler.java | 425 ++++-------------- .../util/helper/PlayerSacrificeHelper.java | 2 +- .../api_impl/BloodMagicBlacklist.java | 17 +- .../api_impl/BloodMagicCorePlugin.java | 91 +++- .../apiv2/IBloodMagicBlacklist.java | 18 +- .../bloodmagic/block/BlockSpectral.java | 2 +- .../client/gui/config/ConfigGui.java | 37 -- .../client/gui/config/ConfigGuiFactory.java | 29 -- .../render/block/RenderItemRoutingNode.java | 2 +- .../provider/DataProviderBloodAltar.java | 28 +- .../entity/ai/EntityAIAttackRangedBow.java | 2 +- .../entity/ai/EntityAIEatAndCorruptBlock.java | 2 +- .../entity/ai/EntityAIFollowOwner.java | 10 +- .../ai/EntityAIGrabEffectsFromOwner.java | 8 +- .../entity/ai/EntityAIPickUpAlly.java | 2 +- .../entity/ai/EntityAIProtectAlly.java | 2 +- .../entity/ai/EntityAIRetreatToHeal.java | 6 +- .../entity/ai/EntityAIStealthRetreat.java | 4 +- .../entity/mob/EntityCorruptedSpider.java | 2 +- .../bloodmagic/entity/mob/EntityMimic.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 2 +- .../entity/projectile/EntityBloodLight.java | 4 +- .../bloodmagic/item/ItemBoundAxe.java | 4 +- .../bloodmagic/item/ItemBoundPickaxe.java | 6 +- .../bloodmagic/item/ItemBoundShovel.java | 2 +- .../bloodmagic/item/ItemBoundTool.java | 4 +- .../item/ItemSacrificialDagger.java | 6 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 4 +- .../bloodmagic/item/soul/ItemSentientBow.java | 5 +- .../item/soul/ItemSentientPickaxe.java | 4 +- .../item/soul/ItemSentientShovel.java | 4 +- .../bloodmagic/item/soul/ItemSoulSnare.java | 2 +- .../meteor/MeteorConfigHandler.java | 4 +- .../bloodmagic/registry/ModRecipes.java | 4 +- .../bloodmagic/registry/ModRituals.java | 71 ++- .../bloodmagic/ritual/RitualExpulsion.java | 2 +- .../ritual/RitualFeatheredKnife.java | 2 +- .../bloodmagic/ritual/RitualForsakenSoul.java | 2 +- .../util/handler/event/ClientHandler.java | 2 +- .../util/handler/event/CraftingHandler.java | 28 +- .../util/handler/event/GenericHandler.java | 4 +- .../handler/event/LivingArmourHandler.java | 2 +- 45 files changed, 320 insertions(+), 561 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java diff --git a/build.gradle b/build.gradle index 14a5a1bb..759d1f9f 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ buildscript { plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" id 'com.matthewprenger.cursegradle' version '1.0.9' + id 'io.franzbecker.gradle-lombok' version '1.6' id 'maven-publish' } @@ -34,8 +35,8 @@ repositories { dependencies { deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" - deobfCompile "mcp.mobius.waila:Hwyla:${waila_version}_${mc_version}" - deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}" + deobfCompile "mcp.mobius.waila:Hwyla:${waila_version}" + deobfCompile "info.amerifrance.guideapi:Guide-API:${guideapi_version}" } minecraft { diff --git a/gradle.properties b/gradle.properties index bcf9d97a..6685f593 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic mod_version=2.2.0 -mc_version=1.12 -forge_version=14.21.1.2443 +mc_version=1.12.2 +forge_version=14.23.2.2611 curse_id=224791 -mappings_version=snapshot_20170814 +mappings_version=snapshot_20180201 -jei_version=4.7.5.85 -waila_version=1.8.20-B35 -guideapi_version=2.1.4-56 \ No newline at end of file +jei_version=4.8.5.147 +waila_version=1.8.23-B38_1.12 +guideapi_version=1.12-2.1.4-57 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 4957a1be..badd6928 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -33,7 +33,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.io.File; import java.util.List; -@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory") +@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND) public class BloodMagic { public static final String MODID = "bloodmagic"; public static final String NAME = "Blood Magic: Alchemical Wizardry"; @@ -73,8 +73,7 @@ public class BloodMagic { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - configDir = new File(event.getModConfigurationDirectory(), "BloodMagic"); - ConfigHandler.init(new File(configDir, "BloodMagic.cfg")); + configDir = new File(event.getModConfigurationDirectory(), "bloodmagic"); PLUGINS.addAll(PluginUtil.getPlugins(event.getAsmData())); diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 4ec4c8c6..99867dc1 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -1,352 +1,115 @@ package WayofTime.bloodmagic; -import WayofTime.bloodmagic.annot.Handler; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.meteor.MeteorConfigHandler; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Config; +import net.minecraftforge.common.config.ConfigManager; import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.oredict.OreDictionary; -import java.io.File; -import java.util.*; - -@Handler +@Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") +@Mod.EventBusSubscriber public class ConfigHandler { - public static Configuration config; - // Teleposer - public static String[] teleposerBlacklisting; - public static ArrayList teleposerBlacklist = new ArrayList<>(); - public static List teleposerBlacklistEntity; + @Config.Comment({ "Blacklist options for various features" }) + public static ConfigBlacklist blacklist = new ConfigBlacklist(); + @Config.Comment({ "Value modifiers for various features" }) + public static ConfigValues values = new ConfigValues(); + @Config.Comment({ "Toggles for all rituals" }) + public static ConfigRituals rituals = new ConfigRituals(); + @Config.Comment({ "Settings that only pertain to the client" }) + public static ConfigClient client = new ConfigClient(); + @Config.Comment({ "Compatibility settings" }) + public static ConfigCompat compat = new ConfigCompat(); - // Transposition Sigil - public static String[] transpositionBlacklisting; - public static ArrayList transpositionBlacklist = new ArrayList<>(); + public static class ConfigBlacklist { + @Config.Comment({ "Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state." }) + public String[] teleposer = { "bedrock", "mob_spawner" }; + @Config.Comment({ "Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid." }) + public String[] transposer = { "bedrock", "mob_spawner" }; + @Config.Comment({ "Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid." }) + public String[] wellOfSuffering = { }; + } - // Well of Suffering Blacklist - public static List wellOfSufferingBlacklist; + public static class ConfigValues { + @Config.Comment({ "Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid." }) + public String[] sacrificialValues = { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100" }; + @Config.Comment({ "Amount of LP the Coat of Arms should provide for each damage dealt." }) + @Config.RangeInt(min = 0, max = 100) + public int coatOfArmsConversion = 20; + @Config.Comment({ "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) + @Config.RangeInt(min = 0, max = 10000) + public int sacrificialDaggerConversion = 100; + @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) + public boolean shouldResyncMeteors = true; + } - // Blood Altar Sacrificial Values - public static String[] entitySacrificeValuesList; - public static Map entitySacrificeValues = new HashMap<>(); + public static class ConfigRituals { + public boolean ritualAnimalGrowth = true; + public boolean ritualContainment = true; + public boolean ritualCrushing = true; + public boolean ritualExpulsion = true; + public boolean ritualFeatheredKnife = true; + public boolean ritualFullStomach = true; + public boolean ritualGreenGrove = true; + public boolean ritualHarvest = true; + public boolean ritualInterdiction = true; + public boolean ritualJumping = true; + public boolean ritualLava = true; + public boolean ritualMagnetic = true; + public boolean ritualRegeneration = true; + public boolean ritualSpeed = true; + public boolean ritualSuppression = true; + public boolean ritualWater = true; + public boolean ritualWellOfSuffering = true; + public boolean ritualZephyr = true; + public boolean ritualUpgradeRemove = true; + public boolean ritualArmourEvolve = true; + public boolean ritualForsakenSoul = true; + public boolean ritualCrystalHarvest = true; + public boolean ritualPlacer = true; + public boolean ritualFelling = true; + public boolean ritualPump = true; + public boolean ritualAltarBuilder = true; + public boolean ritualPortal = true; + public boolean ritualMeteor = true; + public boolean ritualDowngrade = true; + public ConfigImperfectRituals imperfect = new ConfigImperfectRituals(); + } - // Rituals - public static boolean ritualAnimalGrowth; - public static boolean ritualContainment; - public static boolean ritualCrushing; - public static boolean ritualExpulsion; - public static boolean ritualFeatheredKnife; - public static boolean ritualFullStomach; - public static boolean ritualGreenGrove; - public static boolean ritualHarvest; - public static boolean ritualInterdiction; - public static boolean ritualJumping; - public static boolean ritualLava; - public static boolean ritualMagnetic; - public static boolean ritualRegeneration; - public static boolean ritualSpeed; - public static boolean ritualSuppression; - public static boolean ritualWater; - public static boolean ritualWellOfSuffering; - public static boolean ritualZephyr; - public static boolean ritualUpgradeRemove; - public static boolean ritualArmourEvolve; - public static boolean ritualForsakenSoul; - public static boolean ritualCrystalHarvest; + public static class ConfigImperfectRituals { + public boolean imperfectRitualNight = true; + public boolean imperfectRitualRain = true; + public boolean imperfectRitualResistance = true; + public boolean imperfectRitualZombie = true; + } - public static boolean cobblestoneRitual; - public static boolean placerRitual; - public static boolean fellingRitual; - public static boolean pumpRitual; - public static boolean altarBuilderRitual; - public static boolean portalRitual; - public static boolean meteorRitual; - public static boolean downgradeRitual; + public static class ConfigClient { + @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) + public boolean alwaysRenderRoutingLines = false; + @Config.Comment({ "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) + public boolean invisibleSpectralBlocks = true; + @Config.Comment({ "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar." }) + public boolean sigilHoldingSkipsEmptySlots = false; + } - // Imperfect Rituals - public static boolean imperfectRitualNight; - public static boolean imperfectRitualRain; - public static boolean imperfectRitualResistance; - public static boolean imperfectRitualZombie; + public static class ConfigCompat { + @Config.Comment({ "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) + public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; - // Potion ID's - public static int customPotionDrowningID; - public static int customPotionBoostID; - public static int customPotionProjProtID; - public static int customPotionInhibitID; - public static int customPotionFlightID; - public static int customPotionReciprocationID; - public static int customPotionFlameCloakID; - public static int customPotionIceCloakID; - public static int customPotionHeavyHeartID; - public static int customPotionFireFuseID; - public static int customPotionPlanarBindingID; - public static int customPotionSoulFrayID; - public static int customPotionSoulHardenID; - public static int customPotionDeafID; - public static int customPotionFeatherFallID; - public static int customPotionDemonCloakID; - public static int customPotionAmphibianID; - - // Potion toggles - public static boolean customPotionDrowningEnabled; - public static boolean customPotionBoostEnabled; - public static boolean customPotionProjProtEnabled; - public static boolean customPotionInhibitEnabled; - public static boolean customPotionFlightEnabled; - public static boolean customPotionReciprocationEnabled; - public static boolean customPotionFlameCloakEnabled; - public static boolean customPotionIceCloakEnabled; - public static boolean customPotionHeavyHeartEnabled; - public static boolean customPotionFireFuseEnabled; - public static boolean customPotionPlanarBindingEnabled; - public static boolean customPotionSoulFrayEnabled; - public static boolean customPotionSoulHardenEnabled; - public static boolean customPotionDeafEnabled; - public static boolean customPotionFeatherFallEnabled; - public static boolean customPotionDemonCloakEnabled; - public static boolean customPotionAmphibianEnabled; - public static boolean vanillaPotionRegenerationEnabled; - public static boolean vanillaPotionNightVisionEnabled; - public static boolean vanillaPotionFireResistEnabled; - public static boolean vanillaPotionWaterBreathingEnabled; - public static boolean vanillaPotionSpeedEnabled; - public static boolean vanillaPotionHealthEnabled; - public static boolean vanillaPotionPoisonEnabled; - public static boolean vanillaPotionBlindnessEnabled; - public static boolean vanillaPotionWeaknessEnabled; - public static boolean vanillaPotionStrengthEnabled; - public static boolean vanillaPotionJumpBoostEnabled; - public static boolean vanillaPotionSlownessEnabled; - public static boolean vanillaPotionMiningEnabled; - public static boolean vanillaPotionInvisibilityEnabled; - public static boolean vanillaPotionResistanceEnabled; - public static boolean vanillaPotionSaturationEnabled; - public static boolean vanillaPotionHealthBoostEnabled; - public static boolean vanillaPotionAbsorptionEnabled; - - // General - public static int sacrificialPackConversion; - public static int sacrificialDaggerDamage; - public static int sacrificialDaggerConversion; - - // Client - public static boolean alwaysRenderRoutingLines; - public static boolean invisibleSpectralBlocks; - public static boolean sigilHoldingSkipsEmptySlots; - - // Compat - public static int wailaAltarDisplayMode; - public static boolean thaumcraftGogglesUpgrade; - public static boolean ignoreCompressionSpamAddedByCompression; + public enum AltarDisplayMode { + ALWAYS, + SIGIL_HELD, + SIGIL_CONTAINED, + ; + } + } @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent event) { + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { if (event.getModID().equals(BloodMagic.MODID)) { - syncConfig(); - MeteorConfigHandler.handleMeteors(false); - } - } - - public static void init(File file) { - config = new Configuration(file); - syncConfig(); - } - - public static void syncConfig() { - String category; - - category = "Item/Block Blacklisting"; - config.addCustomCategoryComment(category, "Allows disabling of specific Blocks/Items.\nNote that using this may result in crashes. Use is not supported."); - config.setCategoryRequiresMcRestart(category, true); - - category = "Teleposer Blacklist"; - config.addCustomCategoryComment(category, "Block blacklisting"); - teleposerBlacklisting = config.getStringList("teleposerBlacklist", category, new String[]{"minecraft:bedrock", "minecraft:mob_spawner"}, "Stops specified blocks from being teleposed. Put entries on new lines. Valid syntax is:\nmodid:blockname:meta"); - buildBlacklist(teleposerBlacklisting, teleposerBlacklist); - teleposerBlacklistEntity = Arrays.asList(config.getStringList("teleposerBlacklistEntity", category, new String[]{}, "Entity class names listed here will not be able to be teleposed.")); - - category = "Transposition Sigil Blacklist"; - config.addCustomCategoryComment(category, "Block blacklisting"); - transpositionBlacklisting = config.getStringList("transpositionBlacklist", category, new String[]{"minecraft:bedrock", "minecraft:mob_spawner"}, "Stops specified blocks from being teleposed. Put entries on new lines. Valid syntax is:\nmodid:blockname:meta"); - buildBlacklist(transpositionBlacklisting, transpositionBlacklist); - - category = "Well of Suffering Blacklist"; - config.addCustomCategoryComment(category, "Entity blacklisting from WoS"); - wellOfSufferingBlacklist = Arrays.asList(config.getStringList("wellOfSufferingBlacklist", category, new String[]{"EntityArmorStand", "EntitySentientSpecter"}, "Use the class name of the Entity to blacklist it from usage.\nIE: EntityWolf, EntityWitch, etc")); - - category = "Blood Altar Sacrificial Values"; - config.addCustomCategoryComment(category, "Entity Sacrificial Value Settings"); - entitySacrificeValuesList = config.getStringList("entitySacrificeLP:HPValues", category, new String[]{"EntityVillager;100", "EntitySlime;15", "EntityEnderman;10", "EntityCow;100", "EntityChicken;100", "EntityHorse;100", "EntitySheep;100", "EntityWolf;100", "EntityOcelot;100", "EntityPig;100", "EntityRabbit;100", "EntityArmorStand;0", "EntitySentientSpecter;0"}, "Used to edit the amount of LP gained per HP sacrificed for the given entity.\nSetting an entity to 0 effectively blacklists it.\nIf a mod modifies an entity via the API, it will take precedence over this config.\nSyntax: EntityClassName;LPPerHP"); - buildEntitySacrificeValues(); - - category = "Potions"; - config.addCustomCategoryComment(category, "Potion settings"); - config.addCustomCategoryComment(category + ".id", "Potion ID settings"); - customPotionDrowningID = config.getInt("customPotionDrowningID", category + ".id", 100, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Drowning potion"); - customPotionBoostID = config.getInt("customPotionBoostID", category + ".id", 101, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Boost potion"); - customPotionProjProtID = config.getInt("customPotionProjProtID", category + ".id", 102, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Projectile Protection potion"); - customPotionInhibitID = config.getInt("customPotionInhibitID", category + ".id", 103, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Inhibit potion"); - customPotionFlightID = config.getInt("customPotionFlightID", category + ".id", 104, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Flight potion"); - customPotionReciprocationID = config.getInt("customPotionReciprocationID", category + ".id", 105, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Reciprocation potion"); - customPotionFlameCloakID = config.getInt("customPotionFlameCloakID", category + ".id", 106, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Flame Cloak potion"); - customPotionIceCloakID = config.getInt("customPotionIceCloakID", category + ".id", 107, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Ice Cloak potion"); - customPotionHeavyHeartID = config.getInt("customPotionHeavyHeartID", category + ".id", 108, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Heavy Heart potion"); - customPotionFireFuseID = config.getInt("customPotionFireFuseID", category + ".id", 109, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Fire Fuse potion"); - customPotionPlanarBindingID = config.getInt("customPotionPlanarBindingID", category + ".id", 110, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Planar Binding potion"); - customPotionSoulFrayID = config.getInt("customPotionSoulFrayID", category + ".id", 111, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Soul Fray potion"); - customPotionSoulHardenID = config.getInt("customPotionSoulHardenID", category + ".id", 112, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Soul Harden potion"); - customPotionDeafID = config.getInt("customPotionDeafID", category + ".id", 113, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Deaf potion"); - customPotionFeatherFallID = config.getInt("customPotionFeatherFallID", category + ".id", 114, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Feather Fall potion"); - customPotionDemonCloakID = config.getInt("customPotionDemonCloakID", category + ".id", 115, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Demon Cloak potion"); - customPotionAmphibianID = config.getInt("customPotionAmphibianID", category + ".id", 116, 20, Constants.Misc.POTION_ARRAY_SIZE, "ID of the Amphibian potion"); - - config.addCustomCategoryComment(category + ".toggle", "Toggle potions available in Alchemy"); - customPotionDrowningEnabled = config.getBoolean("customPotionDrowningEnabled", category + ".toggle", true, "Enables the Drowning potion in Alchemy"); - customPotionBoostEnabled = config.getBoolean("customPotionBoostEnabled", category + ".toggle", true, "Enables the Boost potion in Alchemy"); - customPotionProjProtEnabled = config.getBoolean("customPotionProjProtEnabled", category + ".toggle", true, "Enables the Projectile Protection potion in Alchemy"); - customPotionInhibitEnabled = config.getBoolean("customPotionInhibitEnabled", category + ".toggle", true, "Enables the Inhibit potion in Alchemy"); - customPotionFlightEnabled = config.getBoolean("customPotionFlightEnabled", category + ".toggle", true, "Enables the Flight potion in Alchemy"); - customPotionReciprocationEnabled = config.getBoolean("customPotionReciprocationEnabled", category + ".toggle", true, "Enables the Reciprocation potion in Alchemy"); - customPotionFlameCloakEnabled = config.getBoolean("customPotionFlameCloakEnabled", category + ".toggle", true, "Enables the Flame Cloak potion in Alchemy"); - customPotionIceCloakEnabled = config.getBoolean("customPotionIceCloakEnabled", category + ".toggle", true, "Enables the Ice Cloak potion in Alchemy"); - customPotionHeavyHeartEnabled = config.getBoolean("customPotionHeavyHeartEnabled", category + ".toggle", true, "Enables the Heavy Heart potion in Alchemy"); - customPotionFireFuseEnabled = config.getBoolean("customPotionFireFuseEnabled", category + ".toggle", true, "Enables the Fire Fuse potion in Alchemy"); - customPotionPlanarBindingEnabled = config.getBoolean("customPotionPlanarBindingEnabled", category + ".toggle", true, "Enables the Planar Binding potion in Alchemy"); - customPotionSoulFrayEnabled = config.getBoolean("customPotionSoulFrayEnabled", category + ".toggle", true, "Enables the Soul Fray potion in Alchemy"); - customPotionSoulHardenEnabled = config.getBoolean("customPotionSoulHardenEnabled", category + ".toggle", true, "Enables the Soul Harden potion in Alchemy"); - customPotionDeafEnabled = config.getBoolean("customPotionDeafEnabled", category + ".toggle", true, "Enables the Deaf potion in Alchemy"); - customPotionFeatherFallEnabled = config.getBoolean("customPotionFeatherFallEnabled", category + ".toggle", true, "Enables the Feather Fall potion in Alchemy"); - customPotionDemonCloakEnabled = config.getBoolean("customPotionDemonCloakEnabled", category + ".toggle", true, "Enables the Demon Cloak potion in Alchemy"); - customPotionAmphibianEnabled = config.getBoolean("customPotionAmphibianEnabled", category + ".toggle", true, "Enables the Amphibian potion in Alchemy"); - vanillaPotionAbsorptionEnabled = config.getBoolean("vanillaPotionAbsorptionEnabled", category + ".toggle", true, "Enables the Absorption potion in Alchemy"); - vanillaPotionBlindnessEnabled = config.getBoolean("vanillaPotionBlindnessEnabled", category + ".toggle", true, "Enables the Blindness potion in Alchemy"); - vanillaPotionFireResistEnabled = config.getBoolean("vanillaPotionFireResistEnabled", category + ".toggle", true, "Enables the Fire Resistance potion in Alchemy"); - vanillaPotionHealthBoostEnabled = config.getBoolean("vanillaPotionHealthBoostEnabled", category + ".toggle", true, "Enables the Health Boost potion in Alchemy"); - vanillaPotionHealthEnabled = config.getBoolean("vanillaPotionHealthEnabled", category + ".toggle", true, "Enables the Instant Health potion in Alchemy"); - vanillaPotionInvisibilityEnabled = config.getBoolean("vanillaPotionInvisibilityEnabled", category + ".toggle", true, "Enables the Invisibility potion in Alchemy"); - vanillaPotionJumpBoostEnabled = config.getBoolean("vanillaPotionJumpBoostEnabled", category + ".toggle", true, "Enables the Jump Boost potion in Alchemy"); - vanillaPotionMiningEnabled = config.getBoolean("vanillaPotionMiningEnabled", category + ".toggle", true, "Enables the Mining potion in Alchemy"); - vanillaPotionPoisonEnabled = config.getBoolean("vanillaPotionPoisonEnabled", category + ".toggle", true, "Enables the Poison potion in Alchemy"); - vanillaPotionRegenerationEnabled = config.getBoolean("vanillaPotionRegenerationEnabled", category + ".toggle", true, "Enables the Regeneration potion in Alchemy"); - vanillaPotionNightVisionEnabled = config.getBoolean("vanillaPotionNightVisionEnabled", category + ".toggle", true, "Enables the Night Vision potion in Alchemy"); - vanillaPotionResistanceEnabled = config.getBoolean("vanillaPotionResistanceEnabled", category + ".toggle", true, "Enables the Resistance potion in Alchemy"); - vanillaPotionSaturationEnabled = config.getBoolean("vanillaPotionSaturationEnabled", category + ".toggle", true, "Enables the Saturation potion in Alchemy"); - vanillaPotionSlownessEnabled = config.getBoolean("vanillaPotionSlownessEnabled", category + ".toggle", true, "Enables the Slowness potion in Alchemy"); - vanillaPotionSpeedEnabled = config.getBoolean("vanillaPotionSpeedEnabled", category + ".toggle", true, "Enables the Speed potion in Alchemy"); - vanillaPotionStrengthEnabled = config.getBoolean("vanillaPotionStrengthEnabled", category + ".toggle", true, "Enables the Strength potion in Alchemy"); - vanillaPotionWaterBreathingEnabled = config.getBoolean("vanillaPotionWaterBreathingEnabled", category + ".toggle", true, "Enables the Water Breathing potion in Alchemy"); - vanillaPotionWeaknessEnabled = config.getBoolean("vanillaPotionWeaknessEnabled", category + ".toggle", true, "Enables the Weakness potion in Alchemy"); - - category = "Rituals"; - config.addCustomCategoryComment(category, "Ritual toggling"); - config.setCategoryRequiresMcRestart(category, true); - ritualAnimalGrowth = config.get(category, "ritualAnimalGrowth", true).getBoolean(); - ritualContainment = config.get(category, "ritualContainment", true).getBoolean(); - ritualCrushing = config.get(category, "ritualCrushing", true).getBoolean(); - ritualExpulsion = config.get(category, "ritualExpulsion", true).getBoolean(); - ritualFeatheredKnife = config.get(category, "ritualFeatheredKnife", true).getBoolean(); - ritualFullStomach = config.get(category, "ritualFullStomach", true).getBoolean(); - ritualGreenGrove = config.get(category, "ritualGreenGrove", true).getBoolean(); - ritualHarvest = config.get(category, "ritualHarvest", true).getBoolean(); - ritualInterdiction = config.get(category, "ritualInterdiction", true).getBoolean(); - ritualJumping = config.get(category, "ritualJumping", true).getBoolean(); - ritualLava = config.get(category, "ritualLava", true).getBoolean(); - ritualMagnetic = config.get(category, "ritualMagnetic", true).getBoolean(); - ritualRegeneration = config.get(category, "ritualRegeneration", true).getBoolean(); - ritualSpeed = config.get(category, "ritualSpeed", true).getBoolean(); - ritualSuppression = config.get(category, "ritualSuppression", true).getBoolean(); - ritualWater = config.get(category, "ritualWater", true).getBoolean(); - ritualWellOfSuffering = config.get(category, "ritualWellOfSuffering", true).getBoolean(); - ritualZephyr = config.get(category, "ritualZephyr", true).getBoolean(); - ritualUpgradeRemove = config.get(category, "ritualRemove", true).getBoolean(); - ritualArmourEvolve = config.get(category, "ritualArmourEvolve", true).getBoolean(); - ritualForsakenSoul = config.get(category, "ritualForsakenSoul", true).getBoolean(); - ritualCrystalHarvest = config.get(category, "ritualCrystalHarvest", true).getBoolean(); - - cobblestoneRitual = config.get(category, "ritualCobblestone", true).getBoolean(); - placerRitual = config.get(category, "ritualPlacer", true).getBoolean(); - fellingRitual = config.get(category, "ritualFelling", true).getBoolean(); - pumpRitual = config.get(category, "ritualPump", true).getBoolean(); - altarBuilderRitual = config.get(category, "ritualAltarBuilder", true).getBoolean(); - portalRitual = config.get(category, "ritualPortal", true).getBoolean(); - meteorRitual = config.get(category, "ritualMeteor", true).getBoolean(); - downgradeRitual = config.get(category, "ritualDowngrade", true).getBoolean(); - - category = "Rituals.Imperfect"; - imperfectRitualNight = config.get(category, "imperfectRitualNight", true).getBoolean(); - imperfectRitualRain = config.get(category, "imperfectRitualRain", true).getBoolean(); - imperfectRitualResistance = config.get(category, "imperfectRitualResistance", true).getBoolean(); - imperfectRitualZombie = config.get(category, "imperfectRitualZombie", true).getBoolean(); - - category = "General"; - config.addCustomCategoryComment(category, "General settings"); - BloodMagicAPI.loggingEnabled = config.getBoolean("enableLogging", category, true, "Allows logging information to the console. Fatal errors will bypass this"); - sacrificialPackConversion = config.getInt("sacrificialPackConversion", category, 20, 0, 100, "Base multiplier for the Coat of Arms. DamageDealt * sacrificialPackConversion"); - sacrificialDaggerDamage = config.getInt("sacrificialDaggerDamage", category, 2, 0, 10000, "Damage done from using the Sacrificial Dagger"); - sacrificialDaggerConversion = config.getInt("sacrificialDaggerConversion", category, 100, 0, 10000, "Amount of LP received per damage point (not heart!)"); - - category = "Client"; - config.addCustomCategoryComment(category, "Client only settings"); - alwaysRenderRoutingLines = config.getBoolean("alwaysRenderRoutingLines", category, false, "Always renders the beams between routing nodes. If false, only renders while a Node Router is being held."); - invisibleSpectralBlocks = config.get(category, "invisibleSpectralBlocks", true, "Spectral Blocks (Used by the Suppression Sigil to store fluids) will not render at all. If false, a see through texture will render. [default: true]").setRequiresMcRestart(true).getBoolean(); - sigilHoldingSkipsEmptySlots = config.getBoolean("sigilHoldingSkipsEmptySlots", category, false, "The Sigil of Holding will skip empty sigil slots if set to true."); - - category = "Compatibility"; - config.addCustomCategoryComment(category, "Compatibility settings"); - wailaAltarDisplayMode = config.getInt("wailaAltarDisplayMode", category + ".waila", 1, 0, 2, "The mode for the Waila display on Blood Altars.\n0 - Always display information\n1 - Only display when Divination/Seer sigil is in hand.\n2 - Only display when Divination/Seer sigil is in inventory"); - thaumcraftGogglesUpgrade = config.getBoolean("thaumcraftGogglesUpgrade", category + ".thaumcraft", true, "Allows the Living Helmet to be upgraded with Goggles of Revealing in an Anvil."); - ignoreCompressionSpamAddedByCompression = config.getBoolean("ignoreCompressionSpamAddedByCompression", category + ".compression", true, "Compression decided to add a storage recipe for every item and block in the game. This will make the Sigil of Compression ignore those recipes so your game will actually load in a decent amount of time."); - - category = "Meteors"; - config.addCustomCategoryComment(category, "Meteor settings"); - - config.save(); - } - - private static void buildBlacklist(String[] blacklisting, List blockBlacklist) { - blockBlacklist.clear(); - - for (String blockSet : blacklisting) { - String[] blockData = blockSet.split(":"); - - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0], blockData[1])); - int meta = 0; - - if (blockData.length == 3) { - // Check if it's an int, if so, parse it. If not, set meta to 0 - // to avoid crashing. - if (Utils.isInteger(blockData[2])) - meta = Integer.parseInt(blockData[2]); - else if (blockData[2].equals("*")) - meta = OreDictionary.WILDCARD_VALUE; - else - meta = 0; - } - - blockBlacklist.add(new BlockStack(block, meta)); - } - } - - private static void buildEntitySacrificeValues() { - entitySacrificeValues.clear(); - - for (String entityData : entitySacrificeValuesList) { - String[] split = entityData.split(";"); - - int amount = 500; - if (Utils.isInteger(split[1])) - amount = Integer.parseInt(split[1]); - - if (!entitySacrificeValues.containsKey(split[0])) - entitySacrificeValues.put(split[0], amount); + ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values + MeteorConfigHandler.handleMeteors(false); // Reload meteors } } } diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java index 4691fadc..6c1fdc9d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java @@ -61,7 +61,7 @@ public class PlayerSacrificeHelper { if (health > maxHealth / 10.0) { float sacrificedHealth = health - maxHealth / 10.0f; - int lpAdded = (int) (sacrificedHealth * ConfigHandler.sacrificialDaggerConversion * getModifier(amount)); + int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion * getModifier(amount)); SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); if (MinecraftForge.EVENT_BUS.post(evt)) diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java index 0d448390..b88d64b6 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; import java.util.Set; public class BloodMagicBlacklist implements IBloodMagicBlacklist { @@ -26,49 +27,49 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } @Override - public void addTeleposer(IBlockState state) { + public void addTeleposer(@Nonnull IBlockState state) { if (!teleposer.contains(state)) teleposer.add(state); } @Override - public void addTeleposer(Block block) { + public void addTeleposer(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addTeleposer(state); } @Override - public void addTeleposer(ResourceLocation entityId) { + public void addTeleposer(@Nonnull ResourceLocation entityId) { if (!teleposerEntities.contains(entityId)) teleposerEntities.add(entityId); } @Override - public void addTransposition(IBlockState state) { + public void addTransposition(@Nonnull IBlockState state) { if (!transposition.contains(state)) transposition.add(state); } @Override - public void addTransposition(Block block) { + public void addTransposition(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addTransposition(state); } @Override - public void addGreenGrove(IBlockState state) { + public void addGreenGrove(@Nonnull IBlockState state) { if (!greenGrove.contains(state)) greenGrove.add(state); } @Override - public void addGreenGrove(Block block) { + public void addGreenGrove(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addGreenGrove(state); } @Override - public void addSacrifice(ResourceLocation entityId) { + public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { if (!sacrifice.contains(entityId)) sacrifice.add(entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java index e2800fc6..aab81509 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.api_impl; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.altar.EnumAltarComponent; import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; @@ -10,8 +11,14 @@ import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.EntityEntry; +import net.minecraftforge.fml.common.registry.ForgeRegistries; @BloodMagicPlugin public class BloodMagicCorePlugin implements IBloodMagicPlugin { @@ -31,10 +38,13 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.DEMON_CRYSTAL); api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INVERSION_PILLAR); api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INVERSION_PILLAR); - api.getBlacklist().addSacrifice(new ResourceLocation("armor_stand")); - api.getBlacklist().addSacrifice(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); + api.getBlacklist().addWellOfSuffering(new ResourceLocation("armor_stand")); + api.getBlacklist().addWellOfSuffering(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); - // TODO - Register things from config + api.setSacrificialValue(new ResourceLocation("armor_stand"), 0); + api.setSacrificialValue(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), 0); + + handleConfigValues(api); // Add standard blocks for altar components api.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), EnumAltarComponent.GLOWSTONE.name()); @@ -51,4 +61,79 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { for (EnumBloodRune runeType : EnumBloodRune.values()) api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); } + + private static void handleConfigValues(IBloodMagicAPI api) { + for (String value : ConfigHandler.values.sacrificialValues) { + String[] split = value.split(";"); + if (split.length != 2) // Not valid format + continue; + + api.setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); + } + + for (String value : ConfigHandler.blacklist.teleposer) { + EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); + if (entityEntry == null) { // It's not an entity (or at least not a valid one), so let's try a block. + String[] blockData = value.split("\\["); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); + if (block == Blocks.AIR || block == null) // Not a valid block either + continue; + + if (blockData.length > 1) { // We have properties listed, so let's build a state. + api.getBlacklist().addTeleposer(parseState(value)); + continue; + } + + api.getBlacklist().addTeleposer(block); + continue; + } + + api.getBlacklist().addTeleposer(entityEntry.getRegistryName()); + } + + for (String value : ConfigHandler.blacklist.transposer) { + String[] blockData = value.split("\\["); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); + if (block == Blocks.AIR || block == null) // Not a valid block + continue; + + if (blockData.length > 1) { // We have properties listed, so let's build a state. + api.getBlacklist().addTeleposer(parseState(value)); + continue; + } + + api.getBlacklist().addTeleposer(block); + } + + for (String value : ConfigHandler.blacklist.wellOfSuffering) { + EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); + if (entityEntry == null) // Not a valid entity + continue; + + api.getBlacklist().addWellOfSuffering(entityEntry.getRegistryName()); + } + } + + private static IBlockState parseState(String blockInfo) { + String[] split = blockInfo.split("\\["); + split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state + + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block + if (block == Blocks.AIR) + return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data + + BlockStateContainer blockState = block.getBlockState(); + IBlockState returnState = blockState.getBaseState(); + + // Force our values into the state + String[] stateValues = split[1].split(","); // Splits up each value + for (String value : stateValues) { + String[] valueSplit = value.split("="); // Separates property and value + IProperty property = blockState.getProperty(valueSplit[0]); + if (property != null) + returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state + } + + return returnState; + } } diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java index 61caa272..f1f1b0ad 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java @@ -4,21 +4,23 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public interface IBloodMagicBlacklist { - void addTeleposer(IBlockState state); + void addTeleposer(@Nonnull IBlockState state); - void addTeleposer(Block block); + void addTeleposer(@Nonnull Block block); - void addTeleposer(ResourceLocation entityId); + void addTeleposer(@Nonnull ResourceLocation entityId); - void addTransposition(IBlockState state); + void addTransposition(@Nonnull IBlockState state); - void addTransposition(Block block); + void addTransposition(@Nonnull Block block); - void addGreenGrove(IBlockState state); + void addGreenGrove(@Nonnull IBlockState state); - void addGreenGrove(Block block); + void addGreenGrove(@Nonnull Block block); - void addSacrifice(ResourceLocation entityId); + void addWellOfSuffering(@Nonnull ResourceLocation entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 7a001100..6aa45663 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -68,7 +68,7 @@ public class BlockSpectral extends Block implements IVariantProvider { @Override public EnumBlockRenderType getRenderType(IBlockState state) { - return ConfigHandler.invisibleSpectralBlocks ? EnumBlockRenderType.INVISIBLE : EnumBlockRenderType.MODEL; + return ConfigHandler.client.invisibleSpectralBlocks ? EnumBlockRenderType.INVISIBLE : EnumBlockRenderType.MODEL; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java deleted file mode 100644 index 9013d8ea..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.client.gui.config; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.fml.client.config.GuiConfig; -import net.minecraftforge.fml.client.config.IConfigElement; - -import java.util.ArrayList; -import java.util.List; - -public class ConfigGui extends GuiConfig { - - public ConfigGui(GuiScreen parentScreen) { - super(parentScreen, getConfigElements(parentScreen), BloodMagic.MODID, false, false, "BloodMagic Configuration"); - } - - @SuppressWarnings("rawtypes") - private static List getConfigElements(GuiScreen parent) { - List list = new ArrayList(); - - // adds sections declared in ConfigHandler. toLowerCase() is used - // because the configuration class automatically does this, so must we. - list.add(new ConfigElement(ConfigHandler.config.getCategory("Potions".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Client".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Compatibility".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Teleposer Blacklist".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Well of Suffering Blacklist".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Item/Block Blacklisting".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("General".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Rituals".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.config.getCategory("Blood Altar Sacrificial Values".toLowerCase()))); - - return list; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java deleted file mode 100644 index 2f968574..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -package WayofTime.bloodmagic.client.gui.config; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.fml.client.IModGuiFactory; - -import java.util.Set; - -public class ConfigGuiFactory implements IModGuiFactory { - @Override - public void initialize(Minecraft minecraftInstance) { - - } - - @Override - public boolean hasConfigGui() { - return false; - } - - @Override - public GuiScreen createConfigGui(GuiScreen parentScreen) { - return new ConfigGui(parentScreen); - } - - @Override - public Set runtimeGuiCategories() { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index 9a94e561..083de767 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -24,7 +24,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer connectionList = tileNode.getConnected(); for (BlockPos wantedPos : connectionList) { BlockPos offsetPos = wantedPos.subtract(tileNode.getPos()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 8affc801..9e3ddf39 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -27,16 +27,6 @@ import java.util.List; * in ImLookingAtBlood by Pokefenn. */ public class DataProviderBloodAltar implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) @@ -45,24 +35,21 @@ public class DataProviderBloodAltar implements IWailaDataProvider { boolean hasSigil = false; boolean hasSeer = false; - switch (ConfigHandler.wailaAltarDisplayMode) { - case 0: { + switch (ConfigHandler.compat.wailaAltarDisplayMode) { + case ALWAYS: { hasSigil = hasSeer = true; break; } - case 1: { + case SIGIL_HELD: { hasSeer = holdingSeerSigil(accessor.getPlayer()); hasSigil = hasSeer || holdingDivinationSigil(accessor.getPlayer()); break; } - case 2: { + case SIGIL_CONTAINED: { hasSeer = hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), accessor.getPlayer()); hasSigil = hasSeer || hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), accessor.getPlayer()); break; } - default: { - break; - } } if (!hasSeer && !hasSigil) @@ -93,11 +80,6 @@ public class DataProviderBloodAltar implements IWailaDataProvider { return currenttip; } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { if (te != null) @@ -127,7 +109,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { if (player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination) return true; - if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination) + if (!player.getHeldItemOffhand().isEmpty() && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination) return true; return false; diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java index 21416e37..f6eb575c 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java @@ -86,7 +86,7 @@ public class EntityAIAttackRangedBow extends EntityAIBase { } if (d0 <= (double) this.maxAttackDistance && this.seeTime >= 20) { - this.entity.getNavigator().clearPathEntity(); + this.entity.getNavigator().clearPath(); ++this.strafingTime; } else { this.entity.getNavigator().tryMoveToEntityLiving(entitylivingbase, this.moveSpeedAmp); diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java index 44337f13..a7718a6b 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java @@ -48,7 +48,7 @@ public class EntityAIEatAndCorruptBlock extends EntityAIBase { public void startExecuting() { this.eatingGrassTimer = 40; this.world.setEntityState(this.grassEaterEntity, (byte) 10); - this.grassEaterEntity.getNavigator().clearPathEntity(); + this.grassEaterEntity.getNavigator().clearPath(); } /** diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java index 73d08ea2..cd82198d 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java @@ -51,7 +51,7 @@ public class EntityAIFollowOwner extends EntityAIBase { return false; } else if (this.thePet.isStationary()) { return false; - } else if (this.thePet.getDistanceSqToEntity(entitylivingbase) < (double) (this.minDist * this.minDist)) { + } else if (this.thePet.getDistanceSq(entitylivingbase) < (double) (this.minDist * this.minDist)) { return false; } else { this.theOwner = entitylivingbase; @@ -63,7 +63,7 @@ public class EntityAIFollowOwner extends EntityAIBase { * Returns whether an in-progress EntityAIBase should continue executing */ public boolean continueExecuting() { - return !this.petPathfinder.noPath() && this.thePet.getDistanceSqToEntity(this.theOwner) > (double) (this.maxDist * this.maxDist) && !this.thePet.isStationary(); + return !this.petPathfinder.noPath() && this.thePet.getDistanceSq(this.theOwner) > (double) (this.maxDist * this.maxDist) && !this.thePet.isStationary(); } /** @@ -80,7 +80,7 @@ public class EntityAIFollowOwner extends EntityAIBase { */ public void resetTask() { this.theOwner = null; - this.petPathfinder.clearPathEntity(); + this.petPathfinder.clearPath(); this.thePet.setPathPriority(PathNodeType.WATER, this.oldWaterCost); } @@ -102,7 +102,7 @@ public class EntityAIFollowOwner extends EntityAIBase { if (!this.petPathfinder.tryMoveToEntityLiving(this.theOwner, this.followSpeed)) { if (!this.thePet.getLeashed()) { - if (this.thePet.getDistanceSqToEntity(this.theOwner) >= 144.0D) { + if (this.thePet.getDistanceSq(this.theOwner) >= 144.0D) { int i = MathHelper.floor(this.theOwner.posX) - 2; int j = MathHelper.floor(this.theOwner.posZ) - 2; int k = MathHelper.floor(this.theOwner.getEntityBoundingBox().minY); @@ -111,7 +111,7 @@ public class EntityAIFollowOwner extends EntityAIBase { for (int i1 = 0; i1 <= 4; ++i1) { if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isTopSolid() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1))) { this.thePet.setLocationAndAngles((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch); - this.petPathfinder.clearPathEntity(); + this.petPathfinder.clearPath(); return; } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java index 3ff28996..3b42eec1 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java @@ -85,7 +85,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { */ public void resetTask() { this.theOwner = null; - this.petPathfinder.clearPathEntity(); + this.petPathfinder.clearPath(); this.thePet.setPathPriority(PathNodeType.WATER, this.oldWaterCost); } @@ -101,7 +101,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { public void updateTask() { this.thePet.getLookHelper().setLookPositionWithEntity(this.theOwner, 10.0F, (float) this.thePet.getVerticalFaceSpeed()); - if (this.thePet.getDistanceSqToEntity(theOwner) < this.minDist * this.minDist) { + if (this.thePet.getDistanceSq(theOwner) < this.minDist * this.minDist) { if (this.thePet.stealEffectsFromOwner(theOwner)) { return; } @@ -113,7 +113,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { if (!this.petPathfinder.tryMoveToEntityLiving(this.theOwner, this.followSpeed)) { if (!this.thePet.getLeashed()) { - if (this.thePet.getDistanceSqToEntity(this.theOwner) >= 144.0D) { + if (this.thePet.getDistanceSq(this.theOwner) >= 144.0D) { int i = MathHelper.floor(this.theOwner.posX) - 2; int j = MathHelper.floor(this.theOwner.posZ) - 2; int k = MathHelper.floor(this.theOwner.getEntityBoundingBox().minY); @@ -122,7 +122,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { for (int i1 = 0; i1 <= 4; ++i1) { if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isTopSolid() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1))) { this.thePet.setLocationAndAngles((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch); - this.petPathfinder.clearPathEntity(); + this.petPathfinder.clearPath(); return; } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java index b7e370b4..bb120f4a 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java @@ -91,7 +91,7 @@ public class EntityAIPickUpAlly extends EntityAIBase { * Resets the task */ public void resetTask() { - this.entity.getNavigator().clearPathEntity(); + this.entity.getNavigator().clearPath(); this.pickupTarget = null; } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java index b4012277..d831c487 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java @@ -58,7 +58,7 @@ public class EntityAIProtectAlly extends EntityAIBase { public void startExecuting() { this.castTimer = 100; this.world.setEntityState(this.entity, (byte) 53); - this.entity.getNavigator().clearPathEntity(); + this.entity.getNavigator().clearPath(); } /** diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java index f077ac20..137efffa 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java @@ -71,7 +71,7 @@ public class EntityAIRetreatToHeal extends EntityAIBase { if (vec3d == null) { return false; //Nowhere to run, gotta fight! - } else if (this.closestLivingEntity.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < this.closestLivingEntity.getDistanceSqToEntity(this.theEntity)) { + } else if (this.closestLivingEntity.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < this.closestLivingEntity.getDistanceSq(this.theEntity)) { return false; //I'll be headed off if I choose this direction. } else { this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.x, vec3d.y, vec3d.z); @@ -112,13 +112,13 @@ public class EntityAIRetreatToHeal extends EntityAIBase { @Override public void updateTask() { if (this.closestLivingEntity != null) { - if (this.theEntity.getDistanceSqToEntity(this.closestLivingEntity) < 49.0D) { + if (this.theEntity.getDistanceSq(this.closestLivingEntity) < 49.0D) { this.theEntity.getNavigator().setSpeed(this.nearSpeed); } else { this.theEntity.getNavigator().setSpeed(this.farSpeed); } - if (this.theEntity.ticksExisted % 20 == 0 && this.theEntity.getDistanceSqToEntity(this.closestLivingEntity) >= safeHealDistance * safeHealDistance) { + if (this.theEntity.ticksExisted % 20 == 0 && this.theEntity.getDistanceSq(this.closestLivingEntity) >= safeHealDistance * safeHealDistance) { healEntity(); return; } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java index bf7e5540..51600496 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java @@ -47,7 +47,7 @@ public class EntityAIStealthRetreat extends EntityAIBase { if (vec3d == null) { return false; - } else if (attacked.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < attacked.getDistanceSqToEntity(this.entity)) { + } else if (attacked.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < attacked.getDistanceSq(this.entity)) { return false; } else { this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.x, vec3d.y, vec3d.z); @@ -87,7 +87,7 @@ public class EntityAIStealthRetreat extends EntityAIBase { return; } - if (this.entity.getDistanceSqToEntity(this.entity.getAttackTarget()) < 49.0D) { + if (this.entity.getDistanceSq(this.entity.getAttackTarget()) < 49.0D) { this.entity.getNavigator().setSpeed(this.nearSpeed); } else { this.entity.getNavigator().setSpeed(this.farSpeed); diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index 5e8c75b0..871bfb50 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -93,7 +93,7 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { super.onUpdate(); if (!this.getEntityWorld().isRemote) { - this.setBesideClimbableBlock(this.isCollidedHorizontally); + this.setBesideClimbableBlock(this.collidedHorizontally); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java index 2fdb7dd0..0661115a 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java @@ -215,7 +215,7 @@ public class EntityMimic extends EntityDemonBase { super.onUpdate(); if (!this.getEntityWorld().isRemote) { - this.setBesideClimbableBlock(this.isCollidedHorizontally); + this.setBesideClimbableBlock(this.collidedHorizontally); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 95557f14..084df078 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -410,7 +410,7 @@ public class EntitySentientSpecter extends EntityDemonBase { double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entitytippedarrow.posY; double d2 = target.posZ - this.posZ; double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); - entitytippedarrow.setThrowableHeading(d0, d1 + d3 * 0.2, d2, 1.6F, 0); //TODO: Yes, it is an accurate arrow. Don't be hatin' + entitytippedarrow.shoot(d0, d1 + d3 * 0.2, d2, 1.6F, 0); //TODO: Yes, it is an accurate arrow. Don't be hatin' int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.POWER, this); int j = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.PUNCH, this); entitytippedarrow.setDamage((double) (velocity * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.getEntityWorld().getDifficulty().getDifficultyId() * 0.11F)); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index 712a9f98..c596696c 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -46,7 +46,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); - this.setThrowableHeading(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); + this.shoot(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); } @Override @@ -55,7 +55,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit } @Override - public void setThrowableHeading(double var1, double var3, double var5, float var7, float var8) { + public void shoot(double var1, double var3, double var5, float var7, float var8) { float var9 = MathHelper.sqrt(var1 * var1 + var3 * var3 + var5 * var5); var1 /= var9; var3 /= var9; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 26831f4c..651a8e91 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -82,8 +82,8 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - if (blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1.0F) { - float strengthVsBlock = getStrVsBlock(stack, blockStack.getState()); + if (blockStack.getState().getBlockHardness(world, blockPos) != -1.0F) { + float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); if (strengthVsBlock > 1.1F || blockStack.getBlock() instanceof BlockLeaves && world.canMineBlockBody(player, blockPos)) { if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index bc2c47f3..37076c1e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -60,11 +60,11 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, IBlockState state) { if (!getActivated(stack)) return 1.0F; - return state.getMaterial() != Material.IRON && state.getMaterial() != Material.ANVIL && state.getMaterial() != Material.ROCK ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; + return state.getMaterial() != Material.IRON && state.getMaterial() != Material.ANVIL && state.getMaterial() != Material.ROCK ? super.getDestroySpeed(stack, state) : this.efficiency; } @Override @@ -97,7 +97,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { continue; if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) { - float strengthVsBlock = getStrVsBlock(stack, blockStack.getState()); + float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index c122d617..2f2600ec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -83,7 +83,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { continue; if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) { - float strengthVsBlock = getStrVsBlock(stack, blockStack.getState()); + float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 0bbcea86..fae76626 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -63,8 +63,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { - return getActivated(stack) ? toolMaterial.getEfficiencyOnProperMaterial() : 1.0F; + public float getDestroySpeed(ItemStack stack, IBlockState state) { + return getActivated(stack) ? toolMaterial.getEfficiency() : 1.0F; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index ba46d284..1444de0e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -98,7 +98,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider { return new ActionResult(EnumActionResult.SUCCESS, stack); } - int lpAdded = ConfigHandler.sacrificialDaggerConversion * ConfigHandler.sacrificialDaggerDamage; + int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; RayTraceResult rayTrace = rayTrace(world, player, false); if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { @@ -109,14 +109,14 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider { } if (!player.capabilities.isCreativeMode) { - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, ConfigHandler.sacrificialDaggerDamage, lpAdded); + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2, lpAdded); if (MinecraftForge.EVENT_BUS.post(evt)) return super.onItemRightClick(world, player, hand); if (evt.shouldDrainHealth) { player.hurtResistantTime = 0; player.attackEntityFrom(BloodMagicAPI.damageSource, 0.001F); - player.setHealth(Math.max(player.getHealth() - ConfigHandler.sacrificialDaggerDamage, 0.0001f)); + player.setHealth(Math.max(player.getHealth() - 2, 0.0001f)); if (player.getHealth() <= 0.001f) { player.onDeath(BloodMagicAPI.damageSource); player.setHealth(0); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index c2b82f28..b86fc3ea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -82,8 +82,8 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { - float value = super.getStrVsBlock(stack, state); + public float getDestroySpeed(ItemStack stack, IBlockState state) { + float value = super.getDestroySpeed(stack, state); if (value > 1) { return (float) (value + getDigSpeedOfSword(stack)); } else { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 97b87625..ef658a06 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -264,13 +264,12 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien float newArrowVelocity = velocity * getVelocityOfArrow(stack); EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount); - entityArrow.setAim(user, user.rotationPitch, user.rotationYaw, 0.0F, newArrowVelocity, 1.0F); double d0 = target.posX - user.posX; double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entityArrow.posY; double d2 = target.posZ - user.posZ; double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); - entityArrow.setThrowableHeading(d0, d1 + d3 * 0.05, d2, newArrowVelocity, 0); + entityArrow.shoot(d0, d1 + d3 * 0.05, d2, newArrowVelocity, 0); if (newArrowVelocity == 0) { world.playSound(null, user.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); @@ -334,7 +333,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); EntitySentientArrow entityArrow = new EntitySentientArrow(world, entityLiving, type, amount); - entityArrow.setAim(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); + entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); if (newArrowVelocity == 0) { world.playSound(null, player.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index 05c51b19..ca8a0502 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -82,8 +82,8 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { - float value = super.getStrVsBlock(stack, state); + public float getDestroySpeed(ItemStack stack, IBlockState state) { + float value = super.getDestroySpeed(stack, state); if (value > 1) { return (float) (value + getDigSpeedOfSword(stack)); } else { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 2edd2b73..e86ee440 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -82,8 +82,8 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { - float value = super.getStrVsBlock(stack, state); + public float getDestroySpeed(ItemStack stack, IBlockState state) { + float value = super.getDestroySpeed(stack, state); if (value > 1) { return (float) (value + getDigSpeedOfSword(stack)); } else { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index e6d76d8c..f422be70 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -44,7 +44,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { if (!worldIn.isRemote) { EntitySoulSnare snare = new EntitySoulSnare(worldIn, playerIn); - snare.setHeadingFromThrower(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); + snare.shoot(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); worldIn.spawnEntity(snare); } diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index 1c482c0d..e5aadc77 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -63,7 +63,7 @@ public class MeteorConfigHandler { reader.close(); } - if (checkNewVersion && ConfigHandler.config.getBoolean("resyncOnVersionChange", "Meteors", true, "Should the default meteors be regenerated if the mod has updated them")) { + if (checkNewVersion && ConfigHandler.values.shouldResyncMeteors) { Set discoveredDefaults = Sets.newHashSet(); // Check existing defaults for new version @@ -93,8 +93,6 @@ public class MeteorConfigHandler { } catch (Exception e) { e.printStackTrace(); } - - ConfigHandler.config.save(); } private static List> getDefaultMeteors() { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 30cde112..6cf39b59 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.alchemyArray.*; import WayofTime.bloodmagic.api.altar.EnumAltarTier; import WayofTime.bloodmagic.api.compress.CompressionRegistry; @@ -47,6 +46,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.ForgeModContainer; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; @@ -559,7 +559,7 @@ public class ModRecipes { private static void setupDir() { if (RECIPE_DIR == null) { - RECIPE_DIR = ConfigHandler.config.getConfigFile().toPath().resolve("../recipes/").toFile(); + RECIPE_DIR = new File(Loader.instance().getConfigDir(), "bloodmagic/recipes"); } if (!RECIPE_DIR.exists()) { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index ad026e23..3d0def9a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -42,7 +42,6 @@ public class ModRituals { public static Ritual forsakenSoulRitual; public static Ritual crystalHarvestRitual; - // public static Ritual cobblestoneRitual; public static Ritual placerRitual; public static Ritual fellingRitual; public static Ritual pumpRitual; @@ -60,68 +59,64 @@ public class ModRituals { public static void initRituals() { waterRitual = new RitualWater(); - RitualRegistry.registerRitual(waterRitual, ConfigHandler.ritualWater); + RitualRegistry.registerRitual(waterRitual, ConfigHandler.rituals.ritualWater); lavaRitual = new RitualLava(); - RitualRegistry.registerRitual(lavaRitual, ConfigHandler.ritualLava); + RitualRegistry.registerRitual(lavaRitual, ConfigHandler.rituals.ritualLava); greenGroveRitual = new RitualGreenGrove(); - RitualRegistry.registerRitual(greenGroveRitual, ConfigHandler.ritualGreenGrove); + RitualRegistry.registerRitual(greenGroveRitual, ConfigHandler.rituals.ritualGreenGrove); jumpRitual = new RitualJumping(); - RitualRegistry.registerRitual(jumpRitual, ConfigHandler.ritualJumping); + RitualRegistry.registerRitual(jumpRitual, ConfigHandler.rituals.ritualJumping); sufferingRitual = new RitualWellOfSuffering(); - RitualRegistry.registerRitual(sufferingRitual, ConfigHandler.ritualWellOfSuffering); + RitualRegistry.registerRitual(sufferingRitual, ConfigHandler.rituals.ritualWellOfSuffering); featheredKnifeRitual = new RitualFeatheredKnife(); - RitualRegistry.registerRitual(featheredKnifeRitual, ConfigHandler.ritualFeatheredKnife); + RitualRegistry.registerRitual(featheredKnifeRitual, ConfigHandler.rituals.ritualFeatheredKnife); regenerationRitual = new RitualRegeneration(); - RitualRegistry.registerRitual(regenerationRitual, ConfigHandler.ritualRegeneration); + RitualRegistry.registerRitual(regenerationRitual, ConfigHandler.rituals.ritualRegeneration); animalGrowthRitual = new RitualAnimalGrowth(); - RitualRegistry.registerRitual(animalGrowthRitual, ConfigHandler.ritualAnimalGrowth); + RitualRegistry.registerRitual(animalGrowthRitual, ConfigHandler.rituals.ritualAnimalGrowth); harvestRitual = new RitualHarvest(); - RitualRegistry.registerRitual(harvestRitual, ConfigHandler.ritualHarvest); + RitualRegistry.registerRitual(harvestRitual, ConfigHandler.rituals.ritualHarvest); initHarvestHandlers(); magneticRitual = new RitualMagnetic(); - RitualRegistry.registerRitual(magneticRitual, ConfigHandler.ritualMagnetic); + RitualRegistry.registerRitual(magneticRitual, ConfigHandler.rituals.ritualMagnetic); crushingRitual = new RitualCrushing(); - RitualRegistry.registerRitual(crushingRitual, ConfigHandler.ritualCrushing); + RitualRegistry.registerRitual(crushingRitual, ConfigHandler.rituals.ritualCrushing); stomachRitual = new RitualFullStomach(); - RitualRegistry.registerRitual(stomachRitual, ConfigHandler.ritualFullStomach); + RitualRegistry.registerRitual(stomachRitual, ConfigHandler.rituals.ritualFullStomach); interdictionRitual = new RitualInterdiction(); - RitualRegistry.registerRitual(interdictionRitual, ConfigHandler.ritualInterdiction); + RitualRegistry.registerRitual(interdictionRitual, ConfigHandler.rituals.ritualInterdiction); containmentRitual = new RitualContainment(); - RitualRegistry.registerRitual(containmentRitual, ConfigHandler.ritualContainment); + RitualRegistry.registerRitual(containmentRitual, ConfigHandler.rituals.ritualContainment); speedRitual = new RitualSpeed(); - RitualRegistry.registerRitual(speedRitual, ConfigHandler.ritualSpeed); + RitualRegistry.registerRitual(speedRitual, ConfigHandler.rituals.ritualSpeed); suppressionRitual = new RitualSuppression(); - RitualRegistry.registerRitual(suppressionRitual, ConfigHandler.ritualSuppression); + RitualRegistry.registerRitual(suppressionRitual, ConfigHandler.rituals.ritualSuppression); zephyrRitual = new RitualZephyr(); - RitualRegistry.registerRitual(zephyrRitual, ConfigHandler.ritualZephyr); + RitualRegistry.registerRitual(zephyrRitual, ConfigHandler.rituals.ritualZephyr); expulsionRitual = new RitualExpulsion(); - RitualRegistry.registerRitual(expulsionRitual, ConfigHandler.ritualExpulsion); + RitualRegistry.registerRitual(expulsionRitual, ConfigHandler.rituals.ritualExpulsion); upgradeRemoveRitual = new RitualUpgradeRemove(); - RitualRegistry.registerRitual(upgradeRemoveRitual, ConfigHandler.ritualUpgradeRemove); + RitualRegistry.registerRitual(upgradeRemoveRitual, ConfigHandler.rituals.ritualUpgradeRemove); armourEvolveRitual = new RitualArmourEvolve(); - RitualRegistry.registerRitual(armourEvolveRitual, ConfigHandler.ritualArmourEvolve); + RitualRegistry.registerRitual(armourEvolveRitual, ConfigHandler.rituals.ritualArmourEvolve); forsakenSoulRitual = new RitualForsakenSoul(); - RitualRegistry.registerRitual(forsakenSoulRitual, ConfigHandler.ritualForsakenSoul); + RitualRegistry.registerRitual(forsakenSoulRitual, ConfigHandler.rituals.ritualForsakenSoul); crystalHarvestRitual = new RitualCrystalHarvest(); - RitualRegistry.registerRitual(crystalHarvestRitual, ConfigHandler.ritualCrystalHarvest); - -// cobblestoneRitual = new RitualCobblestone(); -// RitualRegistry.registerRitual(cobblestoneRitual, ConfigHandler.cobblestoneRitual); + RitualRegistry.registerRitual(crystalHarvestRitual, ConfigHandler.rituals.ritualCrystalHarvest); placerRitual = new RitualPlacer(); - RitualRegistry.registerRitual(placerRitual, ConfigHandler.placerRitual); + RitualRegistry.registerRitual(placerRitual, ConfigHandler.rituals.ritualPlacer); fellingRitual = new RitualFelling(); - RitualRegistry.registerRitual(fellingRitual, ConfigHandler.fellingRitual); + RitualRegistry.registerRitual(fellingRitual, ConfigHandler.rituals.ritualFelling); pumpRitual = new RitualPump(); - RitualRegistry.registerRitual(pumpRitual, ConfigHandler.pumpRitual); + RitualRegistry.registerRitual(pumpRitual, ConfigHandler.rituals.ritualPump); altarBuilderRitual = new RitualAltarBuilder(); - RitualRegistry.registerRitual(altarBuilderRitual, ConfigHandler.altarBuilderRitual); + RitualRegistry.registerRitual(altarBuilderRitual, ConfigHandler.rituals.ritualAltarBuilder); portalRitual = new RitualPortal(); - RitualRegistry.registerRitual(portalRitual, ConfigHandler.portalRitual); + RitualRegistry.registerRitual(portalRitual, ConfigHandler.rituals.ritualPortal); meteorRitual = new RitualMeteor(); - RitualRegistry.registerRitual(meteorRitual, ConfigHandler.meteorRitual); - + RitualRegistry.registerRitual(meteorRitual, ConfigHandler.rituals.ritualMeteor); downgradeRitual = new RitualLivingArmourDowngrade(); - RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.downgradeRitual); + RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.rituals.ritualDowngrade); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 250, 0.5); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 25, 0.05); @@ -129,13 +124,13 @@ public class ModRituals { public static void initImperfectRituals() { imperfectNight = new ImperfectRitualNight(); - ImperfectRitualRegistry.registerRitual(imperfectNight, ConfigHandler.imperfectRitualNight); + ImperfectRitualRegistry.registerRitual(imperfectNight, ConfigHandler.rituals.imperfect.imperfectRitualNight); imperfectRain = new ImperfectRitualRain(); - ImperfectRitualRegistry.registerRitual(imperfectRain, ConfigHandler.imperfectRitualRain); + ImperfectRitualRegistry.registerRitual(imperfectRain, ConfigHandler.rituals.imperfect.imperfectRitualRain); imperfectResistance = new ImperfectRitualResistance(); - ImperfectRitualRegistry.registerRitual(imperfectResistance, ConfigHandler.imperfectRitualResistance); + ImperfectRitualRegistry.registerRitual(imperfectResistance, ConfigHandler.rituals.imperfect.imperfectRitualResistance); imperfectZombie = new ImperfectRitualZombie(); - ImperfectRitualRegistry.registerRitual(imperfectZombie, ConfigHandler.imperfectRitualZombie); + ImperfectRitualRegistry.registerRitual(imperfectZombie, ConfigHandler.rituals.imperfect.imperfectRitualZombie); } public static void initHarvestHandlers() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index 9cc17048..5c9b254a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -136,7 +136,7 @@ public class RitualExpulsion extends Ritual { if (flag1) { moveEntityViaTeleport(entityLiving, entityLiving.posX, entityLiving.posY, entityLiving.posZ); - if (!entityLiving.isCollided && !entityLiving.getEntityWorld().containsAnyLiquid(entityLiving.getEntityBoundingBox())) { + if (!entityLiving.collided && !entityLiving.getEntityWorld().containsAnyLiquid(entityLiving.getEntityBoundingBox())) { flag = true; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index 60dce160..38a5b4fb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -152,7 +152,7 @@ public class RitualFeatheredKnife extends Ritual { player.setHealth(health - sacrificedHealth); - tileAltar.sacrificialDaggerCall((int) (ConfigHandler.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false); + tileAltar.sacrificialDaggerCall((int) (ConfigHandler.values.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false); totalEffects++; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index 6f704b07..de8a4a54 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -112,7 +112,7 @@ public class RitualForsakenSoul extends Ritual { if (!entity.isEntityAlive()) { int uniqueness = calculateUniqueness(entity); double modifier = 1; - if (entity instanceof EntityAnimal && !entity.isCollided) { + if (entity instanceof EntityAnimal && !((EntityAnimal) entity).collided) { modifier = 4; } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index c92e1267..8c9aa9ee 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -311,7 +311,7 @@ public class ClientHandler { public static void cycleSigil(ItemStack stack, EntityPlayer player, int dWheel) { int mode = dWheel; - if (!ConfigHandler.sigilHoldingSkipsEmptySlots) { + if (!ConfigHandler.client.sigilHoldingSkipsEmptySlots) { mode = ItemSigilHolding.getCurrentItemOrdinal(stack); mode = dWheel < 0 ? ItemSigilHolding.next(mode) : ItemSigilHolding.prev(mode); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 366c9c1f..f47c2065 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.AltarCraftedEvent; @@ -51,19 +50,20 @@ public class CraftingHandler { // Handles crafting of: Revealing Upgrade Tome, Elytra Upgrade Tome, Combining Upgrade Tomes, Setting Upgrade for Trainer @SubscribeEvent public void onAnvil(AnvilUpdateEvent event) { - if (ConfigHandler.thaumcraftGogglesUpgrade) { - if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { - ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - output = NBTHelper.checkNBT(output); - ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.revealing"); - ItemHelper.LivingUpgrades.setLevel(output, 1); - event.setCost(1); - - event.setOutput(output); - - return; - } - } + // TODO - Azanor come back :( +// if (ConfigHandler.thaumcraftGogglesUpgrade) { +// if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { +// ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); +// output = NBTHelper.checkNBT(output); +// ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.revealing"); +// ItemHelper.LivingUpgrades.setLevel(output, 1); +// event.setCost(1); +// +// event.setOutput(output); +// +// return; +// } +// } if (event.getLeft().getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { if (event.getRight().getItem() == Items.NAME_TAG) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 74d75c62..3a94876a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -186,7 +186,7 @@ public class GenericHandler { boolean shouldSyphon = pack.getStoredLP(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) < pack.CAPACITY; float damageDone = event.getEntityLiving().getHealth() < event.getAmount() ? event.getAmount() - event.getEntityLiving().getHealth() : event.getAmount(); - int totalLP = Math.round(damageDone * ConfigHandler.sacrificialPackConversion); + int totalLP = Math.round(damageDone * ConfigHandler.values.coatOfArmsConversion); if (shouldSyphon) ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST), totalLP, pack.CAPACITY); @@ -228,7 +228,7 @@ public class GenericHandler { attackTaskMap.put(animal, attackTask); } - if (animal.getAttackTarget() != null && animal.getDistanceSqToEntity(animal.getAttackTarget()) < 4) { + if (animal.getAttackTarget() != null && animal.getDistanceSq(animal.getAttackTarget()) < 4) { animal.getEntityWorld().createExplosion(null, animal.posX, animal.posY + (double) (animal.height / 16.0F), animal.posZ, 2 + animal.getActivePotionEffect(RegistrarBloodMagic.SACRIFICIAL_LAMB).getAmplifier() * 1.5f, false); targetTaskMap.remove(animal); attackTaskMap.remove(animal); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 903d77e9..5488e7e1 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -284,7 +284,7 @@ public class LivingArmourHandler { ItemStack arrowStack = new ItemStack(Items.ARROW); ItemArrow itemarrow = (ItemArrow) ((stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW)); EntityArrow entityarrow = itemarrow.createArrow(world, arrowStack, player); - entityarrow.setAim(player, player.rotationPitch, player.rotationYaw, 0.0F, velocity * 3.0F, 1.0F); + entityarrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, velocity * 3.0F, 1.0F); float velocityModifier = 0.6f * velocity; From cc8d5af4018042c2bcb8e83b5bea27ce5dd9e770 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 19:00:09 -0700 Subject: [PATCH 029/493] Rename meteor files to lowercase (cherry picked from commit 59df51a) --- .../bloodmagic/meteor/MeteorConfigHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index e5aadc77..c608e061 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -136,14 +136,14 @@ public class MeteorConfigHandler { Meteor diamondMeteor = new Meteor(new ItemStack(Blocks.DIAMOND_BLOCK), diamondMeteorList, 10, 3); diamondMeteor.setVersion(3); - holders.add(Pair.of("IronMeteor", ironMeteor)); - DEFAULT_METEORS.put("IronMeteor", ironMeteor); + holders.add(Pair.of("iron", ironMeteor)); + DEFAULT_METEORS.put("iron", ironMeteor); - holders.add(Pair.of("GoldMeteor", goldMeteor)); - DEFAULT_METEORS.put("GoldMeteor", goldMeteor); + holders.add(Pair.of("gold", goldMeteor)); + DEFAULT_METEORS.put("gold", goldMeteor); - holders.add(Pair.of("DiamondMeteor", diamondMeteor)); - DEFAULT_METEORS.put("DiamondMeteor", diamondMeteor); + holders.add(Pair.of("diamond", diamondMeteor)); + DEFAULT_METEORS.put("diamond", diamondMeteor); return holders; } From 42931bcf0e4c0811403fcaf408bde5198a786235 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 20:45:11 -0700 Subject: [PATCH 030/493] JSON recipes, much to the displeasure of Elucent and shadows feelsgoodman (cherry picked from commit c23d577) --- .../core/RegistrarBloodMagicRecipes.java | 34 ++ .../bloodmagic/item/ItemBloodOrb.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 298 +----------------- .../assets/bloodmagic/recipes/_constants.json | 128 ++++++++ .../recipes/activation_crystal.json | 16 + .../bloodmagic/recipes/alchemy_table.json | 29 ++ .../assets/bloodmagic/recipes/altar.json | 26 ++ .../recipes/base_item_filter_0.json | 24 ++ .../recipes/base_item_filter_1.json | 24 ++ .../recipes/base_item_filter_2.json | 24 ++ .../recipes/base_item_filter_3.json | 24 ++ .../blood_rune/blood_rune_acceleration.json | 32 ++ .../blood_rune/blood_rune_augcapacity.json | 32 ++ .../recipes/blood_rune/blood_rune_blank.json | 25 ++ .../blood_rune/blood_rune_capacity.json | 28 ++ .../blood_rune/blood_rune_charging.json | 32 ++ .../blood_rune/blood_rune_displacement.json | 28 ++ .../recipes/blood_rune/blood_rune_orb.json | 29 ++ .../blood_rune/blood_rune_sacrifice.json | 32 ++ .../blood_rune/blood_rune_selfsacrifice.json | 32 ++ .../recipes/blood_rune/blood_rune_speed.json | 28 ++ .../recipes/blood_tank/blood_tank_0.json | 25 ++ .../recipes/blood_tank/blood_tank_1.json | 26 ++ .../recipes/blood_tank/blood_tank_10.json | 26 ++ .../recipes/blood_tank/blood_tank_11.json | 26 ++ .../recipes/blood_tank/blood_tank_12.json | 26 ++ .../recipes/blood_tank/blood_tank_13.json | 26 ++ .../recipes/blood_tank/blood_tank_14.json | 26 ++ .../recipes/blood_tank/blood_tank_15.json | 26 ++ .../recipes/blood_tank/blood_tank_2.json | 26 ++ .../recipes/blood_tank/blood_tank_3.json | 26 ++ .../recipes/blood_tank/blood_tank_4.json | 26 ++ .../recipes/blood_tank/blood_tank_5.json | 26 ++ .../recipes/blood_tank/blood_tank_6.json | 26 ++ .../recipes/blood_tank/blood_tank_7.json | 26 ++ .../recipes/blood_tank/blood_tank_8.json | 26 ++ .../recipes/blood_tank/blood_tank_9.json | 26 ++ .../decorative_brick_bloodstone_brick.json | 18 ++ .../decorative_brick_bloodstone_tile.json | 17 + .../demon_brick_1_brick1_corrosive.json | 18 ++ .../demon_brick_1_brick1_destructive.json | 18 ++ .../demon_decor/demon_brick_1_brick1_raw.json | 18 ++ .../demon_brick_1_brick1_steadfast.json | 18 ++ .../demon_brick_1_brick1_vengeful.json | 18 ++ .../demon_brick_2_smallbrick_corrosive.json | 17 + .../demon_brick_2_smallbrick_destructive.json | 17 + .../demon_brick_2_smallbrick_raw.json | 17 + .../demon_brick_2_smallbrick_steadfast.json | 17 + .../demon_brick_2_smallbrick_vengeful.json | 17 + .../demon_brick_2_tile_corrosive.json | 23 ++ .../demon_brick_2_tile_destructive.json | 23 ++ .../demon_decor/demon_brick_2_tile_raw.json | 23 ++ .../demon_brick_2_tile_steadfast.json | 23 ++ .../demon_brick_2_tile_vengeful.json | 23 ++ .../demon_brick_2_tilespecial_corrosive.json | 27 ++ ...demon_brick_2_tilespecial_destructive.json | 27 ++ .../demon_brick_2_tilespecial_raw.json | 27 ++ .../demon_brick_2_tilespecial_steadfast.json | 27 ++ .../demon_brick_2_tilespecial_vengeful.json | 27 ++ .../demon_extras_stone_corrosive.json | 38 +++ .../demon_extras_stone_destructive.json | 38 +++ .../demon_decor/demon_extras_stone_raw.json | 38 +++ .../demon_extras_stone_steadfast.json | 38 +++ .../demon_extras_stone_vengeful.json | 38 +++ .../demon_decor/demon_light_corrosive.json | 22 ++ .../demon_decor/demon_light_destructive.json | 22 ++ .../recipes/demon_decor/demon_light_raw.json | 22 ++ .../demon_decor/demon_light_steadfast.json | 22 ++ .../demon_decor/demon_light_vengeful.json | 22 ++ .../demon_decor/demon_pillar_1_corrosive.json | 19 ++ .../demon_pillar_1_destructive.json | 19 ++ .../demon_decor/demon_pillar_1_raw.json | 19 ++ .../demon_decor/demon_pillar_1_steadfast.json | 19 ++ .../demon_decor/demon_pillar_1_vengeful.json | 19 ++ .../demon_decor/demon_pillar_2_corrosive.json | 23 ++ .../demon_pillar_2_destructive.json | 23 ++ .../demon_decor/demon_pillar_2_raw.json | 23 ++ .../demon_decor/demon_pillar_2_steadfast.json | 23 ++ .../demon_decor/demon_pillar_2_vengeful.json | 23 ++ .../demon_pillar_cap_1_corrosive.json | 18 ++ .../demon_decor/demon_pillar_cap_1_raw.json | 18 ++ .../demon_pillar_cap_2_destructive.json | 18 ++ .../demon_pillar_cap_2_vengeful.json | 18 ++ .../demon_pillar_cap_3_steadfast.json | 17 + .../demon_decor/demon_stairs_1_corrosive.json | 19 ++ .../demon_decor/demon_stairs_1_raw.json | 19 ++ .../demon_stairs_2_destructive.json | 19 ++ .../demon_decor/demon_stairs_2_vengeful.json | 19 ++ .../demon_decor/demon_stairs_3_steadfast.json | 18 ++ .../demon_wall_1_brick_corrosive.json | 18 ++ .../demon_wall_1_brick_destructive.json | 18 ++ .../demon_decor/demon_wall_1_brick_raw.json | 18 ++ .../demon_wall_1_brick_steadfast.json | 18 ++ .../demon_wall_1_brick_vengeful.json | 18 ++ .../demon_wall_1_large_corrosive.json | 18 ++ .../demon_wall_1_large_destructive.json | 18 ++ .../demon_decor/demon_wall_1_large_raw.json | 18 ++ .../demon_wall_1_large_steadfast.json | 18 ++ .../demon_wall_1_large_vengeful.json | 18 ++ .../demon_wall_1_smallbrick_corrosive.json | 18 ++ .../demon_wall_1_smallbrick_destructive.json | 18 ++ .../demon_wall_1_smallbrick_raw.json | 18 ++ .../demon_wall_1_smallbrick_steadfast.json | 18 ++ .../demon_wall_1_smallbrick_vengeful.json | 18 ++ .../bloodmagic/recipes/experience_tome.json | 33 ++ .../bloodmagic/recipes/incense_altar.json | 27 ++ .../bloodmagic/recipes/lava_crystal.json | 29 ++ .../bloodmagic/recipes/mimic_nohitbox.json | 27 ++ .../bloodmagic/recipes/mimic_solidclear.json | 30 ++ .../bloodmagic/recipes/mimic_solidlight.json | 33 ++ .../bloodmagic/recipes/mimic_solidopaque.json | 30 ++ .../bloodmagic/recipes/pack_sacrifice.json | 29 ++ .../recipes/pack_self_sacrifice.json | 29 ++ .../recipes/path/path_obsidian.json | 26 ++ .../recipes/path/path_obsidiantile.json | 26 ++ .../bloodmagic/recipes/path/path_stone.json | 26 ++ .../recipes/path/path_stonetile.json | 26 ++ .../bloodmagic/recipes/path/path_wood.json | 26 ++ .../recipes/path/path_woodtile.json | 26 ++ .../recipes/path/path_wornstone.json | 30 ++ .../recipes/path/path_wornstonetile.json | 26 ++ .../recipes/ritual_controller_imperfect.json | 24 ++ .../recipes/ritual_controller_inverted.json | 20 ++ .../recipes/ritual_controller_master.json | 25 ++ .../recipes/ritual_controller_master_alt.json | 13 + .../bloodmagic/recipes/ritual_diviner_0.json | 36 +++ .../bloodmagic/recipes/ritual_diviner_1.json | 26 ++ .../bloodmagic/recipes/ritual_reader.json | 27 ++ .../recipes/ritual_stone_blank.json | 26 ++ .../recipes/ritual_stone_reset.json | 13 + .../recipes/sacrificial_dagger.json | 23 ++ .../assets/bloodmagic/recipes/soul_forge.json | 25 ++ .../assets/bloodmagic/recipes/soul_snare.json | 24 ++ .../assets/bloodmagic/recipes/teleposer.json | 23 ++ .../recipes/teleposition_focus_2.json | 17 + .../recipes/teleposition_focus_3.json | 17 + .../bloodmagic/recipes/upgrade_trainer.json | 27 ++ 137 files changed, 3312 insertions(+), 298 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java create mode 100644 src/main/resources/assets/bloodmagic/recipes/_constants.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/activation_crystal.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/alchemy_table.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/altar.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/experience_tome.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/incense_altar.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/lava_crystal.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_stone.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wood.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_reader.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/soul_forge.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/soul_snare.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposer.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java new file mode 100644 index 00000000..542ce653 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -0,0 +1,34 @@ +package WayofTime.bloodmagic.core; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.item.soul.ItemSoulGem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class RegistrarBloodMagicRecipes { + + @SubscribeEvent + public static void registerRecipes(RegistryEvent.Register event) { + for (int i = 0; i < ItemSoulGem.names.length; i++) { + for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { + ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); + ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); + + ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j); + + EnumDemonWillType willType = ((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack); + ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); + ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, crystalStack); + event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); + } + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 46f441da..0b7311a5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -94,7 +94,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab BloodOrb orb = getOrb(stack); if (flag.isAdvanced() && orb != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName())); + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getResourceDomain())); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 6cf39b59..2b27d46d 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -6,12 +6,9 @@ import WayofTime.bloodmagic.api.altar.EnumAltarTier; import WayofTime.bloodmagic.api.compress.CompressionRegistry; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; import WayofTime.bloodmagic.api.recipe.AlchemyTableCustomRecipe; import WayofTime.bloodmagic.api.registry.*; import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; @@ -23,22 +20,15 @@ import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; -import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe; -import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Stopwatch; -import com.google.common.collect.ImmutableMap; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.potion.PotionEffect; @@ -46,29 +36,21 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.util.*; import java.util.Map.Entry; public class ModRecipes { - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final Set USED_OD_NAMES = new TreeSet<>(); + public static ArrayList addedOreRecipeList = new ArrayList(); static ItemStack mundaneLengtheningStack = ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1); static ItemStack mundanePowerStack = ItemComponent.getStack(ItemComponent.CATALYST_POWER_1); - private static File RECIPE_DIR = null; public static void init() { initOreDict(); addFurnaceRecipes(); -// addCraftingRecipes(); addAltarRecipes(); addAlchemyArrayRecipes(); addSoulForgeRecipes(); @@ -89,123 +71,6 @@ public class ModRecipes { FurnaceRecipes.instance().addSmeltingRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD), new ItemStack(Items.GOLD_INGOT), (float) 0.15); } - public static void addCraftingRecipes() { - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), "i i", "sgs", "sos", 'i', "ingotIron", 's', "stone", 'g', "ingotGold", 'o', "blockIron"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER), "aaa", " ba", "c a", 'a', "blockGlass", 'b', "ingotGold", 'c', "ingotIron"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), "a a", "aba", "cdc", 'a', "stone", 'b', Blocks.FURNACE, 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.PACK_SELF_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', Items.FLINT, 'd', Items.LEATHER_CHESTPLATE, 'e', RegistrarBloodMagicItems.SLATE); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.PACK_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', "ingotIron", 'd', Items.LEATHER_CHESTPLATE, 'e', RegistrarBloodMagicItems.SLATE); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER), "dfd", "ase", "dwd", 'f', EnumRuneType.FIRE.getScribeStack(), 'a', EnumRuneType.AIR.getScribeStack(), 'w', EnumRuneType.WATER.getScribeStack(), 'e', EnumRuneType.EARTH.getScribeStack(), 'd', "gemDiamond", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER, 1, 1), " S ", "tdt", " S ", 'S', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 't', EnumRuneType.DUSK.getScribeStack(), 'd', new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 4, 1), "aa", "aa", 'a', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 16), "stone", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, 1, 1), new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE, 4, 0), "sis", "iri", "sis", 's', "string", 'i', "ingotIron", 'r', "dustRedstone"); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK), "RBR", "G G", "RRR", 'R', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'B', RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 'G', "blockGlass"); - for (int i = 1; i < TileBloodTank.CAPACITIES.length; i++) - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK, 1, i), "RBR", "T T", "RRR", 'R', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'B', RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 'T', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK, 1, i - 1)); - - addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 3), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 1)); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER), "ggg", "efe", "ggg", 'g', "ingotGold", 'e', new ItemStack(Items.ENDER_PEARL), 'f', RegistrarBloodMagicItems.TELEPOSITION_FOCUS); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL), "aba", "bcb", "ded", 'a', "blockGlass", 'b', Items.LAVA_BUCKET, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 'd', Blocks.OBSIDIAN, 'e', "gemDiamond")); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), "aaa", "bcb", "aaa", 'a', "stone", 'b', RegistrarBloodMagicItems.SLATE, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK))); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1), "aba", "cdc", "aba", 'a', "stone", 'b', RegistrarBloodMagicItems.SLATE, 'c', Items.SUGAR, 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE)); //Speed -// addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.bloodRune, 1, 2), "aba", "cdc", "aba", 'a', "stone", 'b', RegistrarBloodMagicItems.slate, 'c', Items.sugar, 'd', new ItemStack(RegistrarBloodMagicBlocks.bloodRune))); //Efficiency -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); //Sacrifice -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', "dustGlowstone", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); //Self-Sacrifice - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 5), "aba", "bcb", "ada", 'a', "stone", 'b', Items.WATER_BUCKET, 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); //Displacement - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6), "aba", "bcb", "ada", 'a', "stone", 'b', Items.BUCKET, 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); //Capacity -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7), "aba", "cdc", "aea", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'c', Items.BUCKET, 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Augmented Capacity -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8), "aba", "cdc", "aba", 'a', "stone", 'b', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Orb -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9), "aba", "cdc", "aea", 'a', Items.BUCKET, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Acceleration -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10), "RsR", "GrG", "ReR", 'G', "glowstone", 's', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'R', "dustRedstone", 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Charging -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE, 4), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', RegistrarBloodMagicBlocks.RITUAL_STONE, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 1), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', "stone", 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), new ItemStack(Blocks.REDSTONE_TORCH), new ItemStack(RegistrarBloodMagicItems.SLATE)); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 2)); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 0), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "blockGlass", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 1), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeYellow", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 2), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeGreen", 's', "stickWood"); - addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 3), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyePurple", 's', "stickWood"); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.UPGRADE_TRAINER), "ngn", "ioi", "ngn", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), 'i', "ingotIron", 'n', "nuggetGold", 'g', "ingotGold")); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.COAL, 1, 1))); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 1), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0)); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 3), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2)); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 5), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4)); -// GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 6), Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE))); - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 7), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6)); - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME), "ses", "lbl", "gog", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), 'e', Blocks.LAPIS_BLOCK, 'l', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), 'b', Items.ENCHANTED_BOOK, 's', "string", 'g', "ingotGold")); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_READER), "gog", "isi", " s ", 's', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'g', "blockGlass", 'i', "ingotGold", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); -// -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), "sss", "wbw", "gog", 's', "stone", 'w', "plankWood", 'b', Items.BLAZE_ROD, 'g', "ingotGold", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_WEAK))); - - for (int i = 1; i < EnumBloodRune.values().length; i++) - addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, i)); - - for (int i = 0; i < ItemSoulGem.names.length; i++) { - for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { - ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - - ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j); - - ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack), newGemStack); - addShapelessRecipe(newGemStack, baseGemStack, crystalStack); - } - } - -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 0), "b b", " r ", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 1), "bsb", "srs", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 's', "stone", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 2), "bsb", "srs", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 's', "blockGlass", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); -// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 2, 3), "bnb", "trt", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'n', "glowstone", 't', "torch", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN))); - - for (int i = 0; i < 5; i++) { - ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, i); - ItemStack baseStoneStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 1, i); - ItemStack baseStoneStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 16, i); - ItemStack polishedStoneStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 1, i + 5); - ItemStack willBrickStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_1, 1, i); - ItemStack willBrickStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_1, 4, i); - - ItemStack willSmallBrickStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 1, i); - ItemStack willSmallBrickStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 1, i); - ItemStack pillarStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_1, 1, i); - ItemStack pillarStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_1, 6, i); - - addShapelessRecipe(baseStoneStackCrafted, crystalStack, "stone", "stone", "stone", "stone", "stone", "stone", "stone", "stone"); - addShapedRecipe(willBrickStackCrafted, "ss", "ss", 's', baseStoneStack); - addShapedRecipe(willSmallBrickStackCrafted, "ss", "ss", 's', willBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 9, i + 5), "scs", "ccc", "scs", 's', baseStoneStack, 'c', willBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 9, i + 10), "scs", "coc", "scs", 's', baseStoneStack, 'c', willBrickStack, 'o', crystalStack); - addShapedRecipe(pillarStackCrafted, "ss", "ss", "ss", 's', polishedStoneStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_2, 8, i), "ppp", "pcp", "ppp", 'p', pillarStack, 'c', crystalStack); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i), "sss", "sss", 's', willBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i + 5), "sss", "sss", 's', willSmallBrickStack); - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i + 10), "sss", "sss", 's', polishedStoneStack); - - addShapedRecipe(new ItemStack(i < 2 ? RegistrarBloodMagicBlocks.DEMON_STAIRS_1 : (i < 4 ? RegistrarBloodMagicBlocks.DEMON_STAIRS_2 : RegistrarBloodMagicBlocks.DEMON_STAIRS_3), 8, i % 2), "s ", "ss ", "sss", 's', polishedStoneStack); - addShapedRecipe(new ItemStack(i < 2 ? RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_1 : (i < 4 ? RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_2 : RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_3), 6, i % 2), "sss", "sss", 's', pillarStack); - - addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_LIGHT, 5, i), "sgs", "ggg", "sgs", 's', polishedStoneStack, 'g', Blocks.GLOWSTONE); - - GameRegistry.addSmelting(baseStoneStack, polishedStoneStack, 0.15f); - } - - generateConstants(); - } - public static void addAltarRecipes() { // ONE AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, RegistrarBloodMagic.ORB_WEAK.getCapacity(), 2, 1); @@ -556,165 +421,4 @@ public class ModRecipes { LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); } } - - private static void setupDir() { - if (RECIPE_DIR == null) { - RECIPE_DIR = new File(Loader.instance().getConfigDir(), "bloodmagic/recipes"); - } - - if (!RECIPE_DIR.exists()) { - RECIPE_DIR.mkdir(); - } - } - - private static void addShapedRecipe(ItemStack result, Object... components) { - setupDir(); - - // GameRegistry.addShapedRecipe(result, components); - - Map json = new HashMap<>(); - - List pattern = new ArrayList<>(); - int i = 0; - while (i < components.length && components[i] instanceof String) { - pattern.add((String) components[i]); - i++; - } - json.put("pattern", pattern); - - boolean isOreDict = false; - Map> key = new HashMap<>(); - Character curKey = null; - for (; i < components.length; i++) { - Object o = components[i]; - if (o instanceof Character) { - if (curKey != null) - throw new IllegalArgumentException("Provided two char keys in a row"); - curKey = (Character) o; - } else { - if (curKey == null) - throw new IllegalArgumentException("Providing object without a char key"); - if (o instanceof String) - isOreDict = true; - key.put(Character.toString(curKey), serializeItem(o)); - curKey = null; - } - } - json.put("key", key); - json.put("type", isOreDict ? "forge:ore_shaped" : "minecraft:crafting_shaped"); - json.put("result", serializeItem(result)); - - // names the json the same name as the output's registry name - // repeatedly adds _alt if a file already exists - // janky I know but it works - String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : ""; - File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - - while (f.exists()) { - suffix += "_alt"; - f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - } - - try (FileWriter w = new FileWriter(f)) { - GSON.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private static void addShapelessRecipe(ItemStack result, Object... components) { - setupDir(); - - // addShapelessRecipe(result, components); - - Map json = new HashMap<>(); - - boolean isOreDict = false; - List> ingredients = new ArrayList<>(); - for (Object o : components) { - if (o instanceof String) - isOreDict = true; - ingredients.add(serializeItem(o)); - } - json.put("ingredients", ingredients); - json.put("type", isOreDict ? "forge:ore_shapeless" : "minecraft:crafting_shapeless"); - json.put("result", serializeItem(result)); - - // names the json the same name as the output's registry name - // repeatedly adds _alt if a file already exists - // janky I know but it works - String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : ""; - File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - - while (f.exists()) { - suffix += "_alt"; - f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json"); - } - - - try (FileWriter w = new FileWriter(f)) { - GSON.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private static Map serializeItem(Object thing) { - if (thing instanceof Item) { - return serializeItem(new ItemStack((Item) thing)); - } - if (thing instanceof Block) { - return serializeItem(new ItemStack((Block) thing)); - } - if (thing instanceof ItemStack) { - ItemStack stack = (ItemStack) thing; - - if (stack.getItem() instanceof IBloodOrb) { - Map ret = new HashMap<>(); - BloodOrb orb = ((IBloodOrb) stack.getItem()).getOrb(stack); - ret.put("orb", orb == null ? RegistrarBloodMagic.ORB_WEAK.getRegistryName().toString() : orb.getRegistryName().toString()); - return ret; - } - - Map ret = new HashMap<>(); - ret.put("item", stack.getItem().getRegistryName().toString()); - if (stack.getItem().getHasSubtypes() || stack.getItemDamage() != 0) { - ret.put("data", stack.getItemDamage()); - } - if (stack.getCount() > 1) { - ret.put("count", stack.getCount()); - } - - if (stack.hasTagCompound()) { - throw new IllegalArgumentException("nbt not implemented"); - } - - return ret; - } - if (thing instanceof String) { - Map ret = new HashMap<>(); - USED_OD_NAMES.add((String) thing); - ret.put("item", "#" + ((String) thing).toUpperCase(Locale.ROOT)); - return ret; - } - - throw new IllegalArgumentException("Not a block, item, stack, or od name"); - } - - private static void generateConstants() { - List> json = new ArrayList<>(); - for (String s : USED_OD_NAMES) { - Map entry = new HashMap<>(); - entry.put("name", s.toUpperCase(Locale.ROOT)); - entry.put("ingredient", ImmutableMap.of("type", "forge:ore_dict", "ore", s)); - json.add(entry); - } - - try (FileWriter w = new FileWriter(new File(RECIPE_DIR, "_constants.json"))) { - GSON.toJson(json, w); - } catch (IOException e) { - e.printStackTrace(); - - } - } } diff --git a/src/main/resources/assets/bloodmagic/recipes/_constants.json b/src/main/resources/assets/bloodmagic/recipes/_constants.json new file mode 100644 index 00000000..4685f9ef --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/_constants.json @@ -0,0 +1,128 @@ +[ + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "name": "BLOCKGLASS" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "blockIron" + }, + "name": "BLOCKIRON" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "cobblestone" + }, + "name": "COBBLESTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dustGlowstone" + }, + "name": "DUSTGLOWSTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dustRedstone" + }, + "name": "DUSTREDSTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dyeGreen" + }, + "name": "DYEGREEN" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dyePurple" + }, + "name": "DYEPURPLE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "dyeYellow" + }, + "name": "DYEYELLOW" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "gemDiamond" + }, + "name": "GEMDIAMOND" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "glowstone" + }, + "name": "GLOWSTONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "ingotGold" + }, + "name": "INGOTGOLD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "ingotIron" + }, + "name": "INGOTIRON" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "nuggetGold" + }, + "name": "NUGGETGOLD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "plankWood" + }, + "name": "PLANKWOOD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "stickWood" + }, + "name": "STICKWOOD" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "stone" + }, + "name": "STONE" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "string" + }, + "name": "STRING" + }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "torch" + }, + "name": "TORCH" + } +] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json b/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json new file mode 100644 index 00000000..3f376baa --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json @@ -0,0 +1,16 @@ +{ + "result": { + "item": "bloodmagic:activation_crystal", + "data": 1 + }, + "ingredients": [ + { + "item": "minecraft:nether_star" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:archmage" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json b/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json new file mode 100644 index 00000000..ab2cc8c2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:alchemy_table" + }, + "pattern": [ + "sss", + "wbw", + "gog" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "minecraft:blaze_rod" + }, + "s": { + "item": "#STONE" + }, + "w": { + "item": "#PLANKWOOD" + }, + "g": { + "item": "#INGOTGOLD" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/altar.json b/src/main/resources/assets/bloodmagic/recipes/altar.json new file mode 100644 index 00000000..f346a26f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/altar.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:altar" + }, + "pattern": [ + "a a", + "aba", + "cdc" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "minecraft:furnace" + }, + "c": { + "item": "#INGOTGOLD" + }, + "d": { + "item": "bloodmagic:monster_soul", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json new file mode 100644 index 00000000..1655e10c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 0 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#BLOCKGLASS" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json new file mode 100644 index 00000000..6f529b90 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 1 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#DYEYELLOW" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json new file mode 100644 index 00000000..8f82c2f4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 2 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#DYEGREEN" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json new file mode 100644 index 00000000..a7459853 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_item_filter", + "data": 3 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "#DYEPURPLE" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json new file mode 100644 index 00000000..885311d0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 9 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "minecraft:bucket" + }, + "b": { + "item": "bloodmagic:slate", + "data": 3 + }, + "c": { + "item": "#INGOTGOLD" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 1 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json new file mode 100644 index 00000000..2c63c590 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 7 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "bloodmagic:slate", + "data": 3 + }, + "c": { + "item": "minecraft:bucket" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 6 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json new file mode 100644 index 00000000..1a354301 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "pattern": [ + "aaa", + "bcb", + "aaa" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 0 + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json new file mode 100644 index 00000000..e3b8a876 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json @@ -0,0 +1,28 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 6 + }, + "pattern": [ + "aba", + "bcb", + "ada" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "d": { + "item": "bloodmagic:slate", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json new file mode 100644 index 00000000..7ebc7383 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 10 + }, + "pattern": [ + "RsR", + "GrG", + "ReR" + ], + "type": "forge:ore_shaped", + "key": { + "R": { + "item": "#DUSTREDSTONE" + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "s": { + "item": "bloodmagic:slate", + "data": 3 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + }, + "G": { + "item": "#GLOWSTONE" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json new file mode 100644 index 00000000..54b8c8c4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json @@ -0,0 +1,28 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 5 + }, + "pattern": [ + "aba", + "bcb", + "ada" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "minecraft:water_bucket" + }, + "c": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "d": { + "item": "bloodmagic:slate", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json new file mode 100644 index 00000000..9f76c1a9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 8 + }, + "pattern": [ + "aba", + "cdc", + "aba" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + }, + "c": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "d": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json new file mode 100644 index 00000000..70e2c399 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 3 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 1 + }, + "c": { + "item": "#INGOTGOLD" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json new file mode 100644 index 00000000..af7f3bc3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json @@ -0,0 +1,32 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 4 + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 1 + }, + "c": { + "item": "#DUSTGLOWSTONE" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "e": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json new file mode 100644 index 00000000..b161a4af --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json @@ -0,0 +1,28 @@ +{ + "result": { + "item": "bloodmagic:blood_rune", + "data": 1 + }, + "pattern": [ + "aba", + "cdc", + "aba" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#STONE" + }, + "b": { + "item": "bloodmagic:slate", + "data": 0 + }, + "c": { + "item": "minecraft:sugar" + }, + "d": { + "item": "bloodmagic:blood_rune", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json new file mode 100644 index 00000000..756d43af --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 0 + }, + "pattern": [ + "RBR", + "G G", + "RRR" + ], + "type": "forge:ore_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "G": { + "item": "#BLOCKGLASS" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json new file mode 100644 index 00000000..5167464b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 1 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json new file mode 100644 index 00000000..fdf4337f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 10 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json new file mode 100644 index 00000000..1aee0e5e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 11 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 10 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json new file mode 100644 index 00000000..ac198a0d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 12 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 11 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json new file mode 100644 index 00000000..7d3511fc --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 13 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 12 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json new file mode 100644 index 00000000..057ef84b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 14 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 13 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json new file mode 100644 index 00000000..9c12b336 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 15 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 14 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json new file mode 100644 index 00000000..46e11986 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 2 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json new file mode 100644 index 00000000..62d52c96 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 3 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json new file mode 100644 index 00000000..88b6b83e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 4 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json new file mode 100644 index 00000000..8d6db55e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 5 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json new file mode 100644 index 00000000..9304a747 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 6 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json new file mode 100644 index 00000000..7decd313 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 7 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json new file mode 100644 index 00000000..8181bfae --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 8 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json new file mode 100644 index 00000000..e1237382 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:blood_tank", + "data": 9 + }, + "pattern": [ + "RBR", + "T T", + "RRR" + ], + "type": "minecraft:crafting_shaped", + "key": { + "R": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "B": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "T": { + "item": "bloodmagic:blood_tank", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json new file mode 100644 index 00000000..636c8710 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:decorative_brick", + "data": 1, + "count": 4 + }, + "pattern": [ + "aa", + "aa" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "bloodmagic:decorative_brick", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json new file mode 100644 index 00000000..9dc01b3e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:decorative_brick", + "data": 0, + "count": 16 + }, + "ingredients": [ + { + "item": "#STONE" + }, + { + "item": "bloodmagic:blood_shard", + "data": 0 + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json new file mode 100644 index 00000000..021815ad --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 1, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json new file mode 100644 index 00000000..ce28a636 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 2, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json new file mode 100644 index 00000000..60a2b525 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 0, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json new file mode 100644 index 00000000..7aff9cee --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 4, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json new file mode 100644 index 00000000..4904ae75 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_1", + "data": 3, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json new file mode 100644 index 00000000..11e92c0e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 1 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json new file mode 100644 index 00000000..b3956493 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 2 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json new file mode 100644 index 00000000..7137a604 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 0 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json new file mode 100644 index 00000000..24142cf4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json new file mode 100644 index 00000000..6a889c25 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 3 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json new file mode 100644 index 00000000..cc134c02 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 6, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json new file mode 100644 index 00000000..305ed3a7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 7, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json new file mode 100644 index 00000000..a9aa5a77 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 5, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json new file mode 100644 index 00000000..718356e2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 9, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json new file mode 100644 index 00000000..caa3ad55 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 8, + "count": 9 + }, + "pattern": [ + "scs", + "ccc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json new file mode 100644 index 00000000..46cc1293 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 11, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json new file mode 100644 index 00000000..17bc0d0e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 12, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json new file mode 100644 index 00000000..0e6832a4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 10, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json new file mode 100644 index 00000000..d221cbe8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 14, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json new file mode 100644 index 00000000..32fbbeec --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:demon_brick_2", + "data": 13, + "count": 9 + }, + "pattern": [ + "scs", + "coc", + "scs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + }, + "c": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + }, + "o": { + "item": "bloodmagic:item_demon_crystal", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json new file mode 100644 index 00000000..28bf109a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 1, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 1 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json new file mode 100644 index 00000000..b190c56f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 2, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 2 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json new file mode 100644 index 00000000..aeb276b6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 0, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 0 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json new file mode 100644 index 00000000..a03834f8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 4, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 4 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json new file mode 100644 index 00000000..86e63596 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 3, + "count": 16 + }, + "ingredients": [ + { + "item": "bloodmagic:item_demon_crystal", + "data": 3 + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json new file mode 100644 index 00000000..6396fc8f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 1, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json new file mode 100644 index 00000000..d7d99aa5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 2, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json new file mode 100644 index 00000000..8817d3ad --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 0, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json new file mode 100644 index 00000000..cf27ceb3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 4, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json new file mode 100644 index 00000000..dfcf5d75 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json @@ -0,0 +1,22 @@ +{ + "result": { + "item": "bloodmagic:demon_light", + "data": 3, + "count": 5 + }, + "pattern": [ + "sgs", + "ggg", + "sgs" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + }, + "g": { + "item": "minecraft:glowstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json new file mode 100644 index 00000000..4448dbfe --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 1, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json new file mode 100644 index 00000000..c7ae8aed --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 2, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json new file mode 100644 index 00000000..afee6a8d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 0, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json new file mode 100644 index 00000000..fbf5d7e0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 4, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json new file mode 100644 index 00000000..f9f079d6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_1", + "data": 3, + "count": 6 + }, + "pattern": [ + "ss", + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json new file mode 100644 index 00000000..e74a80a8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 1, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 1 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json new file mode 100644 index 00000000..8869bc5f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 2, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 2 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json new file mode 100644 index 00000000..cdc818ac --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 0, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 0 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json new file mode 100644 index 00000000..fab79b32 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 4, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 4 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json new file mode 100644 index 00000000..2b65e834 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_2", + "data": 3, + "count": 8 + }, + "pattern": [ + "ppp", + "pcp", + "ppp" + ], + "type": "minecraft:crafting_shaped", + "key": { + "p": { + "item": "bloodmagic:demon_pillar_1", + "data": 3 + }, + "c": { + "item": "bloodmagic:item_demon_crystal", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json new file mode 100644 index 00000000..7f711d0c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_1", + "data": 1, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json new file mode 100644 index 00000000..ba1305d5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_1", + "data": 0, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json new file mode 100644 index 00000000..4b1f890a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_2", + "data": 0, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json new file mode 100644 index 00000000..7a19d3cf --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_2", + "data": 1, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json new file mode 100644 index 00000000..a0f4f58e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:demon_pillar_cap_3", + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_pillar_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json new file mode 100644 index 00000000..0d2824b6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_1", + "data": 1, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json new file mode 100644 index 00000000..3e4ff319 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_1", + "data": 0, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json new file mode 100644 index 00000000..6d6a96f5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_2", + "data": 0, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json new file mode 100644 index 00000000..77527b86 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_2", + "data": 1, + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json new file mode 100644 index 00000000..9fcdcbf9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_stairs_3", + "count": 8 + }, + "pattern": [ + "s ", + "ss ", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json new file mode 100644 index 00000000..7b48b030 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 1, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json new file mode 100644 index 00000000..e1b23e21 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 2, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json new file mode 100644 index 00000000..25b47dec --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 0, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json new file mode 100644 index 00000000..e7967dfa --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 4, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json new file mode 100644 index 00000000..98d5ec24 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 3, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_1", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json new file mode 100644 index 00000000..62ea247b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 11, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 6 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json new file mode 100644 index 00000000..e00e4198 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 12, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 7 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json new file mode 100644 index 00000000..791bdb5c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 10, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 5 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json new file mode 100644 index 00000000..16a07805 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 14, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 9 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json new file mode 100644 index 00000000..33031c4d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 13, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 8 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json new file mode 100644 index 00000000..32bc21f7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 6, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json new file mode 100644 index 00000000..2f4fbf18 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 7, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json new file mode 100644 index 00000000..8c42b8c9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 5, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json new file mode 100644 index 00000000..b94df87c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 9, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json new file mode 100644 index 00000000..15ecb860 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_wall_1", + "data": 8, + "count": 6 + }, + "pattern": [ + "sss", + "sss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_brick_2", + "data": 3 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/experience_tome.json b/src/main/resources/assets/bloodmagic/recipes/experience_tome.json new file mode 100644 index 00000000..12dbe103 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/experience_tome.json @@ -0,0 +1,33 @@ +{ + "result": { + "item": "bloodmagic:experience_tome" + }, + "pattern": [ + "ses", + "lbl", + "gog" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "minecraft:enchanted_book" + }, + "s": { + "item": "#STRING" + }, + "e": { + "item": "minecraft:lapis_block" + }, + "g": { + "item": "#INGOTGOLD" + }, + "l": { + "item": "bloodmagic:slate", + "data": 2 + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/incense_altar.json b/src/main/resources/assets/bloodmagic/recipes/incense_altar.json new file mode 100644 index 00000000..4748c205 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/incense_altar.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:incense_altar" + }, + "pattern": [ + "s s", + "shs", + "coc" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STONE" + }, + "c": { + "item": "#COBBLESTONE" + }, + "h": { + "item": "minecraft:coal", + "data": 1 + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json b/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json new file mode 100644 index 00000000..e0311e8f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:lava_crystal" + }, + "pattern": [ + "aba", + "bcb", + "ded" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "minecraft:lava_bucket" + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + }, + "d": { + "item": "minecraft:obsidian" + }, + "e": { + "item": "#GEMDIAMOND" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json b/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json new file mode 100644 index 00000000..361f9ed3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 0, + "count": 4 + }, + "pattern": [ + "b b", + " r ", + "bob" + ], + "type": "minecraft:crafting_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json new file mode 100644 index 00000000..a14fa6e0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json @@ -0,0 +1,30 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 2, + "count": 4 + }, + "pattern": [ + "bsb", + "srs", + "bob" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "s": { + "item": "#BLOCKGLASS" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json new file mode 100644 index 00000000..7db4b442 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json @@ -0,0 +1,33 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 3, + "count": 2 + }, + "pattern": [ + "bnb", + "trt", + "bob" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "t": { + "item": "#TORCH" + }, + "n": { + "item": "#GLOWSTONE" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json new file mode 100644 index 00000000..4c281089 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json @@ -0,0 +1,30 @@ +{ + "result": { + "item": "bloodmagic:mimic", + "data": 1, + "count": 4 + }, + "pattern": [ + "bsb", + "srs", + "bob" + ], + "type": "forge:ore_shaped", + "key": { + "b": { + "item": "bloodmagic:decorative_brick", + "data": 0 + }, + "r": { + "item": "bloodmagic:blood_rune", + "data": 0 + }, + "s": { + "item": "#STONE" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json new file mode 100644 index 00000000..e82cd67e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:pack_sacrifice" + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "#INGOTIRON" + }, + "d": { + "item": "minecraft:leather_chestplate" + }, + "e": { + "item": "bloodmagic:slate", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json new file mode 100644 index 00000000..138ba293 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json @@ -0,0 +1,29 @@ +{ + "result": { + "item": "bloodmagic:pack_self_sacrifice" + }, + "pattern": [ + "aba", + "cdc", + "aea" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "minecraft:flint" + }, + "d": { + "item": "minecraft:leather_chestplate" + }, + "e": { + "item": "bloodmagic:slate", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json new file mode 100644 index 00000000..2898208a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 6, + "count": 4 + }, + "ingredients": [ + { + "item": "minecraft:obsidian" + }, + { + "item": "minecraft:obsidian" + }, + { + "item": "minecraft:obsidian" + }, + { + "item": "minecraft:obsidian" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:archmage" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json new file mode 100644 index 00000000..e235db72 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 7, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 6 + }, + { + "item": "bloodmagic:path", + "data": 6 + }, + { + "item": "bloodmagic:path", + "data": 6 + }, + { + "item": "bloodmagic:path", + "data": 6 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json b/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json new file mode 100644 index 00000000..0503ed1c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 2, + "count": 4 + }, + "ingredients": [ + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "item": "#STONE" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json new file mode 100644 index 00000000..5cf9c223 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 3, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json new file mode 100644 index 00000000..fcb33fd3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 0, + "count": 4 + }, + "ingredients": [ + { + "item": "#PLANKWOOD" + }, + { + "item": "#PLANKWOOD" + }, + { + "item": "#PLANKWOOD" + }, + { + "item": "#PLANKWOOD" + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + ], + "type": "forge:ore_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json new file mode 100644 index 00000000..90b26af1 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 1, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 0 + }, + { + "item": "bloodmagic:path", + "data": 0 + }, + { + "item": "bloodmagic:path", + "data": 0 + }, + { + "item": "bloodmagic:path", + "data": 0 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json new file mode 100644 index 00000000..86e114b7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json @@ -0,0 +1,30 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 4, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "item": "bloodmagic:path", + "data": 2 + }, + { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json new file mode 100644 index 00000000..2b66ed18 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:path", + "data": 5, + "count": 4 + }, + "ingredients": [ + { + "item": "bloodmagic:path", + "data": 4 + }, + { + "item": "bloodmagic:path", + "data": 4 + }, + { + "item": "bloodmagic:path", + "data": 4 + }, + { + "item": "bloodmagic:path", + "data": 4 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json new file mode 100644 index 00000000..17bfdac9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 1 + }, + "pattern": [ + "aba", + "bcb", + "aba" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "#STONE" + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:weak" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json new file mode 100644 index 00000000..d712efbe --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json @@ -0,0 +1,20 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 2 + }, + "ingredients": [ + { + "item": "bloodmagic:ritual_controller", + "data": 0 + }, + { + "item": "minecraft:redstone_torch" + }, + { + "item": "bloodmagic:slate", + "data": 0 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json new file mode 100644 index 00000000..74e1458c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 0 + }, + "pattern": [ + "aba", + "bcb", + "aba" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "bloodmagic:ritual_stone", + "data": 0 + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:magician" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json new file mode 100644 index 00000000..5b55815a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json @@ -0,0 +1,13 @@ +{ + "result": { + "item": "bloodmagic:ritual_controller", + "data": 0 + }, + "ingredients": [ + { + "item": "bloodmagic:ritual_controller", + "data": 2 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json new file mode 100644 index 00000000..9b48c652 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json @@ -0,0 +1,36 @@ +{ + "result": { + "item": "bloodmagic:ritual_diviner", + "data": 0 + }, + "pattern": [ + "dfd", + "ase", + "dwd" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "bloodmagic:inscription_tool", + "data": 4 + }, + "s": { + "item": "#STICKWOOD" + }, + "d": { + "item": "#GEMDIAMOND" + }, + "e": { + "item": "bloodmagic:inscription_tool", + "data": 3 + }, + "f": { + "item": "bloodmagic:inscription_tool", + "data": 2 + }, + "w": { + "item": "bloodmagic:inscription_tool", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json new file mode 100644 index 00000000..ca45383a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:ritual_diviner", + "data": 1 + }, + "pattern": [ + " S ", + "tdt", + " S " + ], + "type": "minecraft:crafting_shaped", + "key": { + "S": { + "item": "bloodmagic:slate", + "data": 3 + }, + "t": { + "item": "bloodmagic:inscription_tool", + "data": 5 + }, + "d": { + "item": "bloodmagic:ritual_diviner", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json b/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json new file mode 100644 index 00000000..cbf3f52a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:ritual_reader" + }, + "pattern": [ + "gog", + "isi", + " s " + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "bloodmagic:slate", + "data": 3 + }, + "g": { + "item": "#BLOCKGLASS" + }, + "i": { + "item": "#INGOTGOLD" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json new file mode 100644 index 00000000..7e321bb2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json @@ -0,0 +1,26 @@ +{ + "result": { + "item": "bloodmagic:ritual_stone", + "data": 0, + "count": 4 + }, + "pattern": [ + "aba", + "bcb", + "aba" + ], + "type": "minecraft:crafting_shaped", + "key": { + "a": { + "item": "minecraft:obsidian" + }, + "b": { + "item": "bloodmagic:slate", + "data": 1 + }, + "c": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json new file mode 100644 index 00000000..439ad7d2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json @@ -0,0 +1,13 @@ +{ + "result": { + "item": "bloodmagic:ritual_stone", + "data": 0 + }, + "ingredients": [ + { + "item": "bloodmagic:ritual_stone", + "data": 32767 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json b/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json new file mode 100644 index 00000000..f622ef14 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:sacrificial_dagger", + "data": 0 + }, + "pattern": [ + "aaa", + " ba", + "c a" + ], + "type": "forge:ore_shaped", + "key": { + "a": { + "item": "#BLOCKGLASS" + }, + "b": { + "item": "#INGOTGOLD" + }, + "c": { + "item": "#INGOTIRON" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/soul_forge.json b/src/main/resources/assets/bloodmagic/recipes/soul_forge.json new file mode 100644 index 00000000..7dfd9961 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/soul_forge.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "bloodmagic:soul_forge" + }, + "pattern": [ + "i i", + "sgs", + "sos" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STONE" + }, + "g": { + "item": "#INGOTGOLD" + }, + "i": { + "item": "#INGOTIRON" + }, + "o": { + "item": "#BLOCKIRON" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/soul_snare.json b/src/main/resources/assets/bloodmagic/recipes/soul_snare.json new file mode 100644 index 00000000..20a518c5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/soul_snare.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:soul_snare", + "data": 0, + "count": 4 + }, + "pattern": [ + "sis", + "iri", + "sis" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "#DUSTREDSTONE" + }, + "s": { + "item": "#STRING" + }, + "i": { + "item": "#INGOTIRON" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposer.json b/src/main/resources/assets/bloodmagic/recipes/teleposer.json new file mode 100644 index 00000000..388d0153 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/teleposer.json @@ -0,0 +1,23 @@ +{ + "result": { + "item": "bloodmagic:teleposer" + }, + "pattern": [ + "ggg", + "efe", + "ggg" + ], + "type": "forge:ore_shaped", + "key": { + "e": { + "item": "minecraft:ender_pearl" + }, + "f": { + "item": "bloodmagic:teleposition_focus", + "data": 0 + }, + "g": { + "item": "#INGOTGOLD" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json new file mode 100644 index 00000000..16212c4f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:teleposition_focus", + "data": 2 + }, + "ingredients": [ + { + "item": "bloodmagic:teleposition_focus", + "data": 1 + }, + { + "item": "bloodmagic:blood_shard", + "data": 0 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json new file mode 100644 index 00000000..9be6ba08 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "bloodmagic:teleposition_focus", + "data": 3 + }, + "ingredients": [ + { + "item": "bloodmagic:teleposition_focus", + "data": 2 + }, + { + "item": "bloodmagic:blood_shard", + "data": 1 + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json b/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json new file mode 100644 index 00000000..d540e3e4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json @@ -0,0 +1,27 @@ +{ + "result": { + "item": "bloodmagic:upgrade_trainer", + "data": 0 + }, + "pattern": [ + "ngn", + "ioi", + "ngn" + ], + "type": "forge:ore_shaped", + "key": { + "g": { + "item": "#INGOTGOLD" + }, + "i": { + "item": "#INGOTIRON" + }, + "n": { + "item": "#NUGGETGOLD" + }, + "o": { + "type": "bloodmagic:orb", + "orb": "bloodmagic:master" + } + } +} \ No newline at end of file From acdf40e2b697925a7e7ffed0633f5a0100cac677 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 20 Aug 2017 15:09:27 -0700 Subject: [PATCH 031/493] Update tile entity mappings (cherry picked from commit c00affa) --- .../core/RegistrarBloodMagicBlocks.java | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java index 92544f16..54cad50a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -124,7 +124,7 @@ public class RegistrarBloodMagicBlocks { event.getRegistry().registerAll(blocks.toArray(new Block[0])); - registerTiles(); + registerTileEntities(); } @SubscribeEvent @@ -137,29 +137,28 @@ public class RegistrarBloodMagicBlocks { }); } - private static void registerTiles() { - GameRegistry.registerTileEntity(TileAltar.class, BloodMagic.MODID + ":" + TileAltar.class.getSimpleName()); - GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":" + TileImperfectRitualStone.class.getSimpleName()); - GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":" + TileMasterRitualStone.class.getSimpleName()); - GameRegistry.registerTileEntity(TileAlchemyArray.class, BloodMagic.MODID + ":" + TileAlchemyArray.class.getSimpleName()); - GameRegistry.registerTileEntity(TileSpectralBlock.class, BloodMagic.MODID + ":" + TileSpectralBlock.class.getSimpleName()); - GameRegistry.registerTileEntity(TilePhantomBlock.class, BloodMagic.MODID + ":" + TilePhantomBlock.class.getSimpleName()); - GameRegistry.registerTileEntity(TileTeleposer.class, BloodMagic.MODID + ":" + TileTeleposer.class.getSimpleName()); - GameRegistry.registerTileEntity(TileSoulForge.class, BloodMagic.MODID + ":" + TileSoulForge.class.getSimpleName()); - GameRegistry.registerTileEntity(TileMasterRoutingNode.class, BloodMagic.MODID + ":" + TileMasterRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileInputRoutingNode.class, BloodMagic.MODID + ":" + TileInputRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileOutputRoutingNode.class, BloodMagic.MODID + ":" + TileOutputRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileItemRoutingNode.class, BloodMagic.MODID + ":" + TileItemRoutingNode.class.getSimpleName()); - GameRegistry.registerTileEntity(TileIncenseAltar.class, BloodMagic.MODID + ":" + TileIncenseAltar.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonCrucible.class, BloodMagic.MODID + ":" + TileDemonCrucible.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonPylon.class, BloodMagic.MODID + ":" + TileDemonPylon.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonCrystallizer.class, BloodMagic.MODID + ":" + TileDemonCrystallizer.class.getSimpleName()); - GameRegistry.registerTileEntity(TileDemonCrystal.class, BloodMagic.MODID + ":" + TileDemonCrystal.class.getSimpleName()); - GameRegistry.registerTileEntity(TileAlchemyTable.class, BloodMagic.MODID + ":" + TileAlchemyTable.class.getSimpleName()); - - GameRegistry.registerTileEntity(TileDimensionalPortal.class, BloodMagic.MODID + ":" + TileDimensionalPortal.class.getSimpleName()); - GameRegistry.registerTileEntity(TileBloodTank.class, BloodMagic.MODID + ":" + TileBloodTank.class.getSimpleName()); - GameRegistry.registerTileEntity(TileMimic.class, BloodMagic.MODID + ":" + TileMimic.class.getSimpleName()); - GameRegistry.registerTileEntity(TileInversionPillar.class, BloodMagic.MODID + ":" + TileInversionPillar.class.getSimpleName()); + private static void registerTileEntities() { + GameRegistry.registerTileEntity(TileAltar.class, BloodMagic.MODID + ":altar"); + GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":imperfect_ritual_stone"); + GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":master_ritual_stone"); + GameRegistry.registerTileEntity(TileAlchemyArray.class, BloodMagic.MODID + ":alchemy_array"); + GameRegistry.registerTileEntity(TileSpectralBlock.class, BloodMagic.MODID + ":spectral_block"); + GameRegistry.registerTileEntity(TilePhantomBlock.class, BloodMagic.MODID + ":phantom_block"); + GameRegistry.registerTileEntity(TileTeleposer.class, BloodMagic.MODID + ":teleposer"); + GameRegistry.registerTileEntity(TileSoulForge.class, BloodMagic.MODID + ":soul_forge"); + GameRegistry.registerTileEntity(TileMasterRoutingNode.class, BloodMagic.MODID + ":master_routing_node"); + GameRegistry.registerTileEntity(TileInputRoutingNode.class, BloodMagic.MODID + ":input_routing_node"); + GameRegistry.registerTileEntity(TileOutputRoutingNode.class, BloodMagic.MODID + ":output_routing_node"); + GameRegistry.registerTileEntity(TileItemRoutingNode.class, BloodMagic.MODID + ":item_routing_node"); + GameRegistry.registerTileEntity(TileIncenseAltar.class, BloodMagic.MODID + ":incense_altar"); + GameRegistry.registerTileEntity(TileDemonCrucible.class, BloodMagic.MODID + ":demon_crucible"); + GameRegistry.registerTileEntity(TileDemonPylon.class, BloodMagic.MODID + ":demon_pylon"); + GameRegistry.registerTileEntity(TileDemonCrystallizer.class, BloodMagic.MODID + ":demon_crystallizer"); + GameRegistry.registerTileEntity(TileDemonCrystal.class, BloodMagic.MODID + ":demon_crystal"); + GameRegistry.registerTileEntity(TileAlchemyTable.class, BloodMagic.MODID + ":alchemy_table"); + GameRegistry.registerTileEntity(TileDimensionalPortal.class, BloodMagic.MODID + ":dimensional_portal"); + GameRegistry.registerTileEntity(TileBloodTank.class, BloodMagic.MODID + ":blood_tank"); + GameRegistry.registerTileEntity(TileMimic.class, BloodMagic.MODID + ":mimic"); + GameRegistry.registerTileEntity(TileInversionPillar.class, BloodMagic.MODID + ":inversion_pillar"); } } From 66ea13137714a99c7f174f475aca195eacbc8a7c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 20:45:11 -0700 Subject: [PATCH 032/493] Fix JEI not seeing orbs as different items --- .../java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 11c3f80a..5c58acbf 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -82,6 +82,7 @@ public class BloodMagicPlugin extends BlankModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME); + subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.BLOOD_ORB); } @Override From 8a4117106dece0e4be88907658518ca1e7a1f6ee Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 13 Oct 2017 17:12:54 -0700 Subject: [PATCH 033/493] Stop using a custom bus subscriber annotation I'm sorry, past self, but Forge has had one since like 1.10, it's time to move on. It's for the better. (cherry picked from commit 9de2354) --- .../java/WayofTime/bloodmagic/BloodMagic.java | 3 -- .../WayofTime/bloodmagic/annot/Handler.java | 15 ------- .../java/WayofTime/bloodmagic/util/Utils.java | 41 ++++++++++--------- .../util/handler/event/ClientHandler.java | 24 +++++------ .../util/handler/event/CraftingHandler.java | 8 ++-- .../util/handler/event/GenericHandler.java | 40 +++++++++--------- .../handler/event/LivingArmourHandler.java | 21 +++++----- .../handler/event/StatTrackerHandler.java | 14 +++---- .../util/handler/event/WillHandler.java | 26 ++++++------ 9 files changed, 88 insertions(+), 104 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/annot/Handler.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index badd6928..86705236 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.util.helper.LogHelper; @@ -17,7 +16,6 @@ import WayofTime.bloodmagic.proxy.CommonProxy; import WayofTime.bloodmagic.registry.*; import WayofTime.bloodmagic.structures.ModDungeons; import WayofTime.bloodmagic.util.PluginUtil; -import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.IMCHandler; import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; @@ -80,7 +78,6 @@ public class BloodMagic { ModTranquilityHandlers.init(); ModDungeons.init(); - Utils.registerHandlers(event.getAsmData().getAll(Handler.class.getCanonicalName())); proxy.preInit(); } diff --git a/src/main/java/WayofTime/bloodmagic/annot/Handler.java b/src/main/java/WayofTime/bloodmagic/annot/Handler.java deleted file mode 100644 index 0e972824..00000000 --- a/src/main/java/WayofTime/bloodmagic/annot/Handler.java +++ /dev/null @@ -1,15 +0,0 @@ -package WayofTime.bloodmagic.annot; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Classes annotated with this will automatically be registered to the - * {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Handler { -} diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index b30a0ab0..ae3b50ef 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.EnumAltarComponent; @@ -36,17 +35,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -922,19 +916,6 @@ public class Utils { return largerStack ? stack : ItemStack.EMPTY; } - public static void registerHandlers(Set eventHandlers) { - for (ASMDataTable.ASMData data : eventHandlers) { - try { - Class handlerClass = Class.forName(data.getClassName()); - Object handlerImpl = handlerClass.newInstance(); - MinecraftForge.EVENT_BUS.register(handlerImpl); - BloodMagic.instance.logger.debug("Registering event handler for class {}", data.getClassName()); - } catch (Exception e) { - // No-op - } - } - } - public static boolean hasUUID(ItemStack stack) { return stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.MOST_SIG) && stack.getTagCompound().hasKey(Constants.NBT.LEAST_SIG); } @@ -956,4 +937,24 @@ public class Utils { stack.getTagCompound().setLong(Constants.NBT.LEAST_SIG, itemUUID.getLeastSignificantBits()); } } + + public static RayTraceResult rayTrace(EntityPlayer player, boolean useLiquids) { + float pitch = player.rotationPitch; + float yaw = player.rotationYaw; + Vec3d eyePosition = new Vec3d(player.posX, player.posY + (double) player.getEyeHeight(), player.posZ); + + float f2 = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI); + float f3 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI); + float f4 = -MathHelper.cos(-pitch * 0.017453292F); + float f5 = MathHelper.sin(-pitch * 0.017453292F); + float f6 = f3 * f4; + float f7 = f2 * f4; + + double reachDistance = 5.0D; + if (player instanceof EntityPlayerMP) + reachDistance = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance(); + + Vec3d reachPosition = eyePosition.addVector((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); + return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 8c9aa9ee..471d3035 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.Ritual; @@ -41,6 +40,7 @@ import net.minecraftforge.client.event.sound.PlaySoundEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -50,7 +50,7 @@ import org.lwjgl.opengl.GL11; import java.util.*; -@Handler +@Mod.EventBusSubscriber @SideOnly(Side.CLIENT) public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. @@ -76,7 +76,7 @@ public class ClientHandler { private static boolean mrsHoloDisplay; @SubscribeEvent - public void onTooltipEvent(ItemTooltipEvent event) { + public static void onTooltipEvent(ItemTooltipEvent event) { ItemStack stack = event.getItemStack(); if (stack.isEmpty()) { return; @@ -93,7 +93,7 @@ public class ClientHandler { } @SubscribeEvent - public void onSoundEvent(PlaySoundEvent event) { + public static void onSoundEvent(PlaySoundEvent event) { EntityPlayer player = Minecraft.getMinecraft().player; if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { event.setResultSound(null); @@ -101,7 +101,7 @@ public class ClientHandler { } @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre event) { + public static void onTextureStitch(TextureStitchEvent.Pre event) { final String BLOCKS = "blocks"; ritualStoneBlank = forName(event.getMap(), "RitualStone", BLOCKS); @@ -121,7 +121,7 @@ public class ClientHandler { } @SubscribeEvent - public void render(RenderWorldLastEvent event) { + public static void render(RenderWorldLastEvent event) { EntityPlayerSP player = minecraft.player; World world = player.getEntityWorld(); @@ -146,7 +146,7 @@ public class ClientHandler { } @SubscribeEvent - public void onMouseEvent(MouseEvent event) { + public static void onMouseEvent(MouseEvent event) { EntityPlayerSP player = Minecraft.getMinecraft().player; if (event.getDwheel() != 0 && player != null && player.isSneaking()) { @@ -164,7 +164,7 @@ public class ClientHandler { } @SubscribeEvent - public void onKey(InputEvent event) { + public static void onKey(InputEvent event) { if (!minecraft.inGameHasFocus) return; @@ -174,7 +174,7 @@ public class ClientHandler { } @SubscribeEvent - public void onHudRender(RenderGameOverlayEvent.Pre event) { + public static void onHudRender(RenderGameOverlayEvent.Pre event) { for (HUDElement element : hudElements) if (element.getElementType() == event.getType() && element.shouldRender(minecraft)) element.render(minecraft, event.getResolution(), event.getPartialTicks()); @@ -182,7 +182,7 @@ public class ClientHandler { // Stolen from Chisel @SubscribeEvent - public void onModelBake(ModelBakeEvent event) { + public static void onModelBake(ModelBakeEvent event) { if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS) return; @@ -218,7 +218,7 @@ public class ClientHandler { // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Post event) { + public static void onTextureStitch(TextureStitchEvent.Post event) { if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS) return; @@ -249,7 +249,7 @@ public class ClientHandler { BloodMagic.instance.logger.debug("Suppressed required texture errors in {}", stopwatch.stop()); } - private void renderRitualStones(EntityPlayerSP player, float partialTicks) { + private static void renderRitualStones(EntityPlayerSP player, float partialTicks) { World world = player.getEntityWorld(); ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); EnumFacing direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index f47c2065..61e56302 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.AltarCraftedEvent; import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; @@ -21,17 +20,18 @@ import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.List; -@Handler +@Mod.EventBusSubscriber public class CraftingHandler { // Sets the uses of crafted Inscription Tools to 10 @SubscribeEvent - public void onAltarCrafted(AltarCraftedEvent event) { + public static void onAltarCrafted(AltarCraftedEvent event) { if (event.getOutput() == null) { return; } @@ -49,7 +49,7 @@ public class CraftingHandler { // Handles crafting of: Revealing Upgrade Tome, Elytra Upgrade Tome, Combining Upgrade Tomes, Setting Upgrade for Trainer @SubscribeEvent - public void onAnvil(AnvilUpdateEvent event) { + public static void onAnvil(AnvilUpdateEvent event) { // TODO - Azanor come back :( // if (ConfigHandler.thaumcraftGogglesUpgrade) { // if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 3a94876a..b5d59221 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.ItemBindEvent; import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; @@ -73,6 +72,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.ExplosionEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -85,7 +85,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -@Handler +@Mod.EventBusSubscriber public class GenericHandler { public static Map bounceMap = new HashMap(); public static Map filledHandMap = new HashMap(); @@ -93,7 +93,7 @@ public class GenericHandler { private static Map attackTaskMap = new HashMap(); @SubscribeEvent - public void onEntityFall(LivingFallEvent event) { + public static void onEntityFall(LivingFallEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); if (player.isPotionActive(RegistrarBloodMagic.BOUNCE) && !player.isSneaking() && event.getDistance() > 2) { @@ -112,7 +112,7 @@ public class GenericHandler { } @SubscribeEvent - public void playerTickPost(TickEvent.PlayerTickEvent event) { + public static void playerTickPost(TickEvent.PlayerTickEvent event) { if (event.phase == TickEvent.Phase.END && bounceMap.containsKey(event.player)) { event.player.motionY = bounceMap.remove(event.player); } @@ -130,7 +130,7 @@ public class GenericHandler { } @SubscribeEvent - public void onPlayerClick(PlayerInteractEvent event) { + public static void onPlayerClick(PlayerInteractEvent event) { if (event.isCancelable() && event.getEntityPlayer().isPotionActive(RegistrarBloodMagic.CONSTRICT)) { EntityPlayer player = event.getEntityPlayer(); int level = player.getActivePotionEffect(RegistrarBloodMagic.CONSTRICT).getAmplifier(); @@ -141,7 +141,7 @@ public class GenericHandler { } @SubscribeEvent - public void onPlayerDropItem(ItemTossEvent event) { + public static void onPlayerDropItem(ItemTossEvent event) { EntityItem itemEntity = event.getEntityItem(); if (itemEntity != null) { ItemStack stack = itemEntity.getItem(); @@ -155,7 +155,7 @@ public class GenericHandler { } @SubscribeEvent - public void onExplosion(ExplosionEvent.Start event) { + public static void onExplosion(ExplosionEvent.Start event) { World world = event.getWorld(); Explosion exp = event.getExplosion(); Vec3d position = exp.getPosition(); @@ -174,7 +174,7 @@ public class GenericHandler { } @SubscribeEvent - public void onEntityHurt(LivingHurtEvent event) { + public static void onEntityHurt(LivingHurtEvent event) { if (event.getEntity().getEntityWorld().isRemote) return; @@ -208,7 +208,7 @@ public class GenericHandler { // Handles sending the client the Demon Will Aura updates @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent event) { + public static void onLivingUpdate(LivingUpdateEvent event) { if (!event.getEntityLiving().getEntityWorld().isRemote) { EntityLivingBase entity = event.getEntityLiving(); if (entity instanceof EntityPlayer && entity.ticksExisted % 50 == 0) //TODO: Change to an incremental counter @@ -284,7 +284,7 @@ public class GenericHandler { } // @SideOnly(Side.SERVER) - public void sendPlayerDemonWillAura(EntityPlayer player) { + public static void sendPlayerDemonWillAura(EntityPlayer player) { if (player instanceof EntityPlayerMP) { BlockPos pos = player.getPosition(); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(player.getEntityWorld().provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); @@ -298,7 +298,7 @@ public class GenericHandler { // Handles destroying altar @SubscribeEvent - public void harvestEvent(PlayerEvent.HarvestCheck event) { + public static void harvestEvent(PlayerEvent.HarvestCheck event) { IBlockState state = event.getTargetBlock(); Block block = state.getBlock(); if (block instanceof BlockAltar && event.getEntityPlayer() != null && event.getEntityPlayer() instanceof EntityPlayerMP && !event.getEntityPlayer().getHeldItemMainhand().isEmpty() && event.getEntityPlayer().getHeldItemMainhand().getItem() instanceof ItemAltarMaker) { @@ -309,14 +309,14 @@ public class GenericHandler { // Handle Teleposer block blacklist @SubscribeEvent - public void onTelepose(TeleposeEvent event) { + public static void onTelepose(TeleposeEvent event) { if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposer().contains(event.initialState) || BloodMagicAPI.INSTANCE.getBlacklist().getTeleposer().contains(event.finalState)) event.setCanceled(true); } // Handle Teleposer entity blacklist @SubscribeEvent - public void onTeleposeEntity(TeleposeEvent.Ent event) { + public static void onTeleposeEntity(TeleposeEvent.Ent event) { EntityEntry entry = EntityRegistry.getEntry(event.entity.getClass()); if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName())) event.setCanceled(true); @@ -324,13 +324,13 @@ public class GenericHandler { // Sets teleport cooldown for Teleposed entities to 5 ticks (1/4 second) instead of 150 (7.5 seconds) @SubscribeEvent - public void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) { + public static void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) { event.entity.timeUntilPortal = 5; } // Handles binding of IBindable's as well as setting a player's highest orb tier @SubscribeEvent - public void onInteract(PlayerInteractEvent.RightClickItem event) { + public static void onInteract(PlayerInteractEvent.RightClickItem event) { if (event.getWorld().isRemote) return; @@ -372,7 +372,7 @@ public class GenericHandler { } @SubscribeEvent - public void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { + public static void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { EntityPlayer player = event.player; if (LivingArmour.hasFullSet(player)) { @@ -393,7 +393,7 @@ public class GenericHandler { // Drop Blood Shards @SubscribeEvent - public void onLivingDrops(LivingDropsEvent event) { + public static void onLivingDrops(LivingDropsEvent event) { EntityLivingBase attackedEntity = event.getEntityLiving(); DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); @@ -411,7 +411,7 @@ public class GenericHandler { // Experience Tome @SubscribeEvent(priority = EventPriority.LOWEST) - public void onExperiencePickup(PlayerPickupXpEvent event) { + public static void onExperiencePickup(PlayerPickupXpEvent event) { EntityPlayer player = event.getEntityPlayer(); ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantments.MENDING, player); @@ -432,11 +432,11 @@ public class GenericHandler { } } - private int xpToDurability(int xp) { + private static int xpToDurability(int xp) { return xp * 2; } - private int durabilityToXp(int durability) { + private static int durabilityToXp(int durability) { return durability / 2; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 5488e7e1..435fa5bf 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -35,14 +34,16 @@ import net.minecraftforge.event.entity.living.LivingHealEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Handler +@Mod.EventBusSubscriber public class LivingArmourHandler { + @SubscribeEvent - public void onEntityHealed(LivingHealEvent event) { + public static void onEntityHealed(LivingHealEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntity(); if (LivingArmour.hasFullSet(player)) { @@ -65,7 +66,7 @@ public class LivingArmourHandler { } @SubscribeEvent - public void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { + public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { EntityPlayer player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); @@ -85,7 +86,7 @@ public class LivingArmourHandler { // Applies: Storm Trooper @SubscribeEvent - public void onEntityJoinedWorld(EntityJoinWorldEvent event) { + public static void onEntityJoinedWorld(EntityJoinWorldEvent event) { Entity owner = null; if (event.getEntity() instanceof EntityArrow) { owner = ((EntityArrow) event.getEntity()).shootingEntity; @@ -115,7 +116,7 @@ public class LivingArmourHandler { } @SubscribeEvent - public void onPlayerClick(PlayerInteractEvent event) { + public static void onPlayerClick(PlayerInteractEvent event) { if (event.isCancelable()) { EntityPlayer player = event.getEntityPlayer(); @@ -148,7 +149,7 @@ public class LivingArmourHandler { // Applies: Grim Reaper @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onEntityDeath(LivingDeathEvent event) { + public static void onEntityDeath(LivingDeathEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); @@ -174,7 +175,7 @@ public class LivingArmourHandler { // Applies: Jump @SubscribeEvent - public void onJumpEvent(LivingEvent.LivingJumpEvent event) { + public static void onJumpEvent(LivingEvent.LivingJumpEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); @@ -198,7 +199,7 @@ public class LivingArmourHandler { // Applies: Step Assist, Speed Boost @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { + public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); boolean hasAssist = false; @@ -253,7 +254,7 @@ public class LivingArmourHandler { // Applies: Arrow Shot // Tracks: Arrow Shot @SubscribeEvent - public void onArrowFire(ArrowLooseEvent event) { + public static void onArrowFire(ArrowLooseEvent event) { World world = event.getEntityPlayer().getEntityWorld(); ItemStack stack = event.getBow(); EntityPlayer player = event.getEntityPlayer(); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index 78b03262..a8121653 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; @@ -24,17 +23,18 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Handler +@Mod.EventBusSubscriber public class StatTrackerHandler { private static float lastPlayerSwingStrength = 0; // Tracks: Digging, DigSlowdown @SubscribeEvent - public void blockBreakEvent(BlockEvent.BreakEvent event) { + public static void blockBreakEvent(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); if (player != null) { if (LivingArmour.hasFullSet(player)) { @@ -53,7 +53,7 @@ public class StatTrackerHandler { // Tracks: Health Boost @SubscribeEvent - public void onEntityHealed(LivingHealEvent event) { + public static void onEntityHealed(LivingHealEvent event) { EntityLivingBase healedEntity = event.getEntityLiving(); if (!(healedEntity instanceof EntityPlayer)) { return; @@ -74,13 +74,13 @@ public class StatTrackerHandler { } @SubscribeEvent - public void onLivingAttack(AttackEntityEvent event) { + public static void onLivingAttack(AttackEntityEvent event) { lastPlayerSwingStrength = event.getEntityPlayer().getCooledAttackStrength(0); } // Tracks: Fall Protect, Arrow Protect, Physical Protect, Grave Digger, Sprint Attack, Critical Strike, Nocturnal Prowess @SubscribeEvent - public void entityHurt(LivingHurtEvent event) { + public static void entityHurt(LivingHurtEvent event) { DamageSource source = event.getSource(); Entity sourceEntity = event.getSource().getTrueSource(); EntityLivingBase attackedEntity = event.getEntityLiving(); @@ -153,7 +153,7 @@ public class StatTrackerHandler { // Tracks: Experienced @SubscribeEvent(priority = EventPriority.LOW) - public void onExperiencePickup(PlayerPickupXpEvent event) { + public static void onExperiencePickup(PlayerPickupXpEvent event) { EntityPlayer player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 6fc490c9..49a48e97 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.util.handler.event; -import WayofTime.bloodmagic.annot.Handler; import WayofTime.bloodmagic.api.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -25,6 +24,7 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.world.ChunkDataEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; @@ -33,14 +33,14 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -@Handler +@Mod.EventBusSubscriber public class WillHandler { - private final HashMap serverTicks = new HashMap(); + private static final HashMap SERVER_TICKS = new HashMap(); // Adds Will to player @SubscribeEvent - public void onItemPickup(EntityItemPickupEvent event) { + public static void onItemPickup(EntityItemPickupEvent event) { ItemStack stack = event.getItem().getItem(); if (stack.getItem() instanceof IDemonWill) { EntityPlayer player = event.getEntityPlayer(); @@ -55,7 +55,7 @@ public class WillHandler { } @SubscribeEvent - public void onEntityAttacked(LivingDeathEvent event) { + public static void onEntityAttacked(LivingDeathEvent event) { if (event.getSource() instanceof EntityDamageSourceIndirect) { Entity sourceEntity = event.getSource().getImmediateSource(); @@ -67,7 +67,7 @@ public class WillHandler { // Add/Drop Demon Will for Player @SubscribeEvent - public void onLivingDrops(LivingDropsEvent event) { + public static void onLivingDrops(LivingDropsEvent event) { EntityLivingBase attackedEntity = event.getEntityLiving(); DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); @@ -106,16 +106,16 @@ public class WillHandler { } @SubscribeEvent - public void onServerWorldTick(TickEvent.WorldTickEvent event) { + public static void onServerWorldTick(TickEvent.WorldTickEvent event) { if (event.world.isRemote) return; int dim = event.world.provider.getDimension(); if (event.phase == TickEvent.Phase.END) { - if (!this.serverTicks.containsKey(dim)) - this.serverTicks.put(dim, 0); + if (!SERVER_TICKS.containsKey(dim)) + SERVER_TICKS.put(dim, 0); - int ticks = (this.serverTicks.get(dim)); + int ticks = (SERVER_TICKS.get(dim)); if (ticks % 20 == 0) { CopyOnWriteArrayList dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(dim); @@ -127,13 +127,13 @@ public class WillHandler { } } - this.serverTicks.put(dim, ticks + 1); + SERVER_TICKS.put(dim, ticks + 1); } } @SubscribeEvent - public void chunkSave(ChunkDataEvent.Save event) { + public static void chunkSave(ChunkDataEvent.Save event) { int dim = event.getWorld().provider.getDimension(); ChunkPos loc = event.getChunk().getPos(); @@ -150,7 +150,7 @@ public class WillHandler { } @SubscribeEvent - public void chunkLoad(ChunkDataEvent.Load event) { + public static void chunkLoad(ChunkDataEvent.Load event) { int dim = event.getWorld().provider.getDimension(); if (event.getData().getCompoundTag("BloodMagic").hasKey("base")) { NBTTagCompound nbt = event.getData().getCompoundTag("BloodMagic"); From 3536a25cc3fa2a3295dacb386de15f6686641c82 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 13 Oct 2017 17:41:54 -0700 Subject: [PATCH 034/493] Add modid to subscriber annotations (cherry picked from commit 7cac007) --- src/main/java/WayofTime/bloodmagic/ConfigHandler.java | 2 +- .../java/WayofTime/bloodmagic/potion/PotionEventHandlers.java | 3 ++- .../WayofTime/bloodmagic/util/handler/event/ClientHandler.java | 2 +- .../bloodmagic/util/handler/event/CraftingHandler.java | 2 +- .../bloodmagic/util/handler/event/GenericHandler.java | 2 +- .../bloodmagic/util/handler/event/LivingArmourHandler.java | 2 +- .../bloodmagic/util/handler/event/StatTrackerHandler.java | 2 +- .../WayofTime/bloodmagic/util/handler/event/WillHandler.java | 3 ++- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 99867dc1..23e12138 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class ConfigHandler { @Config.Comment({ "Blacklist options for various features" }) diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 27911f00..a393cb53 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.potion; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; @@ -18,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class PotionEventHandlers { @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 471d3035..530d4ca5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -50,7 +50,7 @@ import org.lwjgl.opengl.GL11; import java.util.*; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) @SideOnly(Side.CLIENT) public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 61e56302..3c9ca214 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class CraftingHandler { // Sets the uses of crafted Inscription Tools to 10 diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index b5d59221..16cd191c 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -85,7 +85,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { public static Map bounceMap = new HashMap(); public static Map filledHandMap = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 435fa5bf..0e202ffe 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -39,7 +39,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class LivingArmourHandler { @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index a8121653..8aee28b8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class StatTrackerHandler { private static float lastPlayerSwingStrength = 0; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 49a48e97..4857c90e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.util.handler.event; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -33,7 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class WillHandler { private static final HashMap SERVER_TICKS = new HashMap(); From 3f4407e866e0b96907b596380d4ac94d54ba861d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 20:45:11 -0700 Subject: [PATCH 035/493] Update changelog I got so sick and tired of people bothering me about this, that you have to deal with whatever comes of this. Rather than waiting patiently, all I got was constant annoyances. So here you go. Have fun. Go away. --- changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelog.txt b/changelog.txt index bad8aefb..bb42e432 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,12 @@ +------------------------------------------------------ +Version 2.2.0 +------------------------------------------------------ + +- Basic port to 1.12 + - Does not include the vast majority of rewrites and cleanup I did on the other branch + - Completely untested. Done out of spite. Go away. + - There, you have it. Screw off now. + ------------------------------------------------------ Version 2.1.11 ------------------------------------------------------ From 4fbcac6aa2f113d7c95194886b8896da3ac53218 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 19 Aug 2017 20:45:11 -0700 Subject: [PATCH 036/493] Fix JEI slug --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 759d1f9f..66a57a25 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ String getChangelogText() { } def curseRelations = { - optionalLibrary 'just-enough-items-jei' + optionalLibrary 'jei' optionalLibrary 'hwyla' requiredLibrary 'guide-api' } From ddaadfbe5275bd513903e02d0bf24677f396c843 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Feb 2018 17:04:38 -0800 Subject: [PATCH 037/493] Swap the API packages The new one is now built for the api jar and the old one is now internal. It will slowly be moved around to sane places within the internal code. Most of the features provided in the old "api" are addon specific features which will generally rely on the main jar anyways. The new API will be specific to compatibility features, such as blacklists, recipes, and value modification. --- build.gradle | 1 + .../java/WayofTime/bloodmagic/BloodMagic.java | 12 ++++----- .../AlchemyArrayEffectAttractor.java | 2 +- .../AlchemyArrayEffectBinding.java | 4 +-- .../AlchemyArrayEffectBounce.java | 4 +-- .../AlchemyArrayEffectMovement.java | 4 +-- .../alchemyArray/AlchemyArrayEffectSigil.java | 4 +-- .../AlchemyArrayEffectSkeletonTurret.java | 2 +- .../AlchemyArrayEffectUpdraft.java | 4 +-- .../bloodmagic/altar/BloodAltar.java | 22 +++++++--------- .../{apiv2 => api}/BloodMagicPlugin.java | 2 +- .../{apiv2 => api}/IBloodMagicAPI.java | 2 +- .../{apiv2 => api}/IBloodMagicBlacklist.java | 2 +- .../{apiv2 => api}/IBloodMagicPlugin.java | 2 +- .../{api_impl => api/impl}/BloodMagicAPI.java | 6 ++--- .../impl}/BloodMagicBlacklist.java | 4 +-- .../impl}/BloodMagicCorePlugin.java | 10 +++---- .../bloodmagic/api/package-info.java | 2 +- .../{api => apibutnotreally}/BlockStack.java | 2 +- .../BloodMagicAPI.java | 4 +-- .../{api => apibutnotreally}/Constants.java | 2 +- .../DamageSourceBloodMagic.java | 2 +- .../ItemStackWrapper.java | 2 +- .../alchemyCrafting/AlchemyArrayEffect.java | 4 +-- .../AlchemyArrayEffectCrafting.java | 2 +- .../AlchemyCircleRenderer.java | 2 +- .../altar/AltarComponent.java | 2 +- .../altar/AltarUpgrade.java | 2 +- .../altar/EnumAltarComponent.java | 2 +- .../altar/EnumAltarTier.java | 2 +- .../altar/IAltarComponent.java | 2 +- .../altar/IAltarManipulator.java | 2 +- .../altar/IBloodAltar.java | 2 +- .../compress/CompressionHandler.java | 2 +- .../compress/CompressionRegistry.java | 2 +- .../event/AddToNetworkEvent.java | 2 +- .../event/AltarCraftedEvent.java | 4 +-- .../event/BoundToolEvent.java | 2 +- .../event/ItemBindEvent.java | 4 +-- .../event/RitualEvent.java | 10 +++---- .../event/SacrificeKnifeUsedEvent.java | 2 +- .../event/SoulNetworkEvent.java | 4 +-- .../event/TeleposeEvent.java | 2 +- .../iface/IActivatable.java | 2 +- .../iface/IAlchemyArray.java | 2 +- .../iface/IAltarReader.java | 2 +- .../iface/IBindable.java | 2 +- .../iface/ICustomAlchemyConsumable.java | 2 +- .../iface/IDemonWillViewer.java | 2 +- .../iface/IDocumentedBlock.java | 2 +- .../iface/IHarvestHandler.java | 6 ++--- .../iface/IItemLPContainer.java | 2 +- .../iface/IMultiWillTool.java | 4 +-- .../iface/INodeRenderer.java | 2 +- .../iface/IPurificationAsh.java | 2 +- .../iface/ISentientSwordEffectProvider.java | 4 +-- .../iface/ISentientTool.java | 2 +- .../iface/ISigil.java | 4 +-- .../iface/IUpgradeTrainer.java | 2 +- .../impl/ItemBindable.java | 6 ++--- .../impl/ItemSigil.java | 8 +++--- .../impl/ItemSigilToggleable.java | 14 +++++----- .../incense/EnumTranquilityType.java | 2 +- .../incense/IIncensePath.java | 2 +- .../incense/ITranquilityHandler.java | 2 +- .../incense/IncenseTranquilityRegistry.java | 2 +- .../incense/TranquilityStack.java | 2 +- .../livingArmour/ILivingArmour.java | 2 +- .../livingArmour/LivingArmourHandler.java | 4 +-- .../livingArmour/LivingArmourUpgrade.java | 2 +- .../livingArmour/StatTracker.java | 2 +- .../orb/BloodOrb.java | 2 +- .../orb/IBloodOrb.java | 2 +- .../apibutnotreally/package-info.java | 6 +++++ .../recipe/AlchemyTableCustomRecipe.java | 4 +-- .../recipe/AlchemyTableRecipe.java | 2 +- .../recipe/LivingArmourDowngradeRecipe.java | 4 +-- .../recipe/TartaricForgeRecipe.java | 2 +- .../registry/AlchemyArrayRecipeRegistry.java | 10 +++---- .../registry/AlchemyTableRecipeRegistry.java | 4 +-- .../registry/AltarRecipeRegistry.java | 8 +++--- .../registry/HarvestRegistry.java | 6 ++--- .../registry/ImperfectRitualRegistry.java | 8 +++--- .../LivingArmourDowngradeRecipeRegistry.java | 6 ++--- .../registry/OrbRegistry.java | 6 ++--- .../registry/RitualRegistry.java | 6 ++--- .../registry/TartaricForgeRecipeRegistry.java | 4 +-- .../ritual/AreaDescriptor.java | 4 +-- .../ritual/CapabilityRuneType.java | 2 +- .../ritual/EnumRitualReaderState.java | 2 +- .../ritual/EnumRuneType.java | 2 +- .../ritual/IMasterRitualStone.java | 6 ++--- .../ritual/IRitualStone.java | 2 +- .../ritual/Ritual.java | 8 +++--- .../ritual/RitualComponent.java | 2 +- .../ritual/RitualRenderer.java | 2 +- .../imperfect/IImperfectRitualStone.java | 2 +- .../ritual/imperfect/ImperfectRitual.java | 6 ++--- .../ritual/imperfect/package-info.java | 2 +- .../saving/BMWorldSavedData.java | 4 +-- .../saving/SoulNetwork.java | 10 +++---- .../soul/DemonWillHolder.java | 2 +- .../soul/EnumDemonWillType.java | 2 +- .../soul/IDemonWill.java | 2 +- .../soul/IDemonWillConduit.java | 2 +- .../soul/IDemonWillGem.java | 2 +- .../soul/IDemonWillWeapon.java | 2 +- .../soul/IDiscreteDemonWill.java | 2 +- .../soul/PlayerDemonWillHandler.java | 4 +-- .../teleport/ITeleport.java | 2 +- .../teleport/PortalLocation.java | 4 +-- .../teleport/Teleport.java | 2 +- .../teleport/TeleportQueue.java | 2 +- .../teleport/TeleporterBloodMagic.java | 2 +- .../util/helper/BindableHelper.java | 8 +++--- .../util/helper/IncenseHelper.java | 4 +-- .../util/helper/ItemHelper.java | 12 ++++----- .../util/helper/LogHelper.java | 4 +-- .../util/helper/NBTHelper.java | 2 +- .../util/helper/NetworkHelper.java | 16 ++++++------ .../util/helper/PlayerHelper.java | 4 +-- .../util/helper/PlayerSacrificeHelper.java | 6 ++--- .../util/helper/PurificationHelper.java | 4 +-- .../util/helper/RitualHelper.java | 12 ++++----- .../bloodmagic/block/BlockAlchemyTable.java | 2 +- .../bloodmagic/block/BlockAltar.java | 20 +++++++------- .../bloodmagic/block/BlockDemonCrucible.java | 4 +-- .../bloodmagic/block/BlockDemonCrystal.java | 4 +-- .../block/BlockDimensionalPortal.java | 6 ++--- .../block/BlockInputRoutingNode.java | 2 +- .../bloodmagic/block/BlockLifeEssence.java | 2 +- .../bloodmagic/block/BlockMimic.java | 4 +-- .../block/BlockOutputRoutingNode.java | 2 +- .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../block/BlockRitualController.java | 14 +++++----- .../bloodmagic/block/BlockRitualStone.java | 4 +-- .../bloodmagic/block/BlockSoulForge.java | 2 +- .../bloodmagic/block/BlockTeleposer.java | 2 +- .../block/enums/EnumSubWillType.java | 2 +- .../bloodmagic/client/gui/GuiHandler.java | 2 +- .../client/hud/HUDElementDemonWillAura.java | 2 +- .../mesh/CustomMeshDefinitionActivatable.java | 2 +- .../mesh/CustomMeshDefinitionMultiWill.java | 4 +-- .../mesh/CustomMeshDefinitionWillGem.java | 2 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 2 +- .../DualAlchemyCircleRenderer.java | 2 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../render/block/RenderAlchemyArray.java | 4 +-- .../client/render/block/RenderAltar.java | 4 +-- .../render/block/RenderItemRoutingNode.java | 2 +- .../command/sub/SubCommandBind.java | 8 +++--- .../command/sub/SubCommandNetwork.java | 4 +-- .../bloodmagic/command/sub/SubCommandOrb.java | 6 ++--- .../bloodmagic/compat/guideapi/BookUtils.java | 4 +-- .../compat/guideapi/book/CategoryAlchemy.java | 2 +- .../guideapi/book/CategoryArchitect.java | 6 ++--- .../compat/guideapi/book/CategoryDemon.java | 2 +- .../compat/guideapi/book/CategoryRitual.java | 4 +-- .../compat/guideapi/book/CategorySpell.java | 2 +- .../compat/guideapi/page/PageAltarRecipe.java | 4 +-- .../page/PageTartaricForgeRecipe.java | 4 +-- .../compat/jei/BloodMagicPlugin.java | 6 ++--- .../AlchemyArrayCraftingCategory.java | 2 +- .../AlchemyArrayCraftingRecipeHandler.java | 2 +- .../AlchemyArrayCraftingRecipeMaker.java | 8 +++--- .../AlchemyTableRecipeCategory.java | 4 +-- .../AlchemyTableRecipeHandler.java | 2 +- .../alchemyTable/AlchemyTableRecipeJEI.java | 2 +- .../alchemyTable/AlchemyTableRecipeMaker.java | 4 +-- .../compat/jei/altar/AltarRecipeCategory.java | 2 +- .../compat/jei/altar/AltarRecipeHandler.java | 2 +- .../compat/jei/altar/AltarRecipeJEI.java | 6 +++-- .../compat/jei/altar/AltarRecipeMaker.java | 6 ++--- .../ArmourDowngradeRecipeCategory.java | 2 +- .../ArmourDowngradeRecipeHandler.java | 2 +- .../ArmourDowngradeRecipeJEI.java | 4 +-- .../ArmourDowngradeRecipeMaker.java | 4 +-- .../jei/binding/BindingRecipeCategory.java | 2 +- .../jei/binding/BindingRecipeHandler.java | 2 +- .../jei/binding/BindingRecipeMaker.java | 6 ++--- .../forge/TartaricForgeRecipeCategory.java | 2 +- .../jei/forge/TartaricForgeRecipeHandler.java | 2 +- .../jei/forge/TartaricForgeRecipeJEI.java | 2 +- .../jei/forge/TartaricForgeRecipeMaker.java | 4 +-- .../compat/waila/WailaPluginBloodMagic.java | 2 +- .../provider/DataProviderAlchemyArray.java | 2 +- .../provider/DataProviderBloodAltar.java | 2 +- .../waila/provider/DataProviderBloodTank.java | 2 +- .../DataProviderRitualController.java | 12 ++++----- .../waila/provider/DataProviderTeleposer.java | 2 +- .../compress/AdvancedCompressionHandler.java | 4 +-- .../compress/BaseCompressionHandler.java | 2 +- .../compress/StorageBlockCraftingManager.java | 2 +- .../bloodmagic/core/RegistrarBloodMagic.java | 4 +-- .../core/RegistrarBloodMagicRecipes.java | 2 +- .../core/recipe/IngredientBloodOrb.java | 6 ++--- .../bloodmagic/demonAura/WillChunk.java | 2 +- .../demonAura/WorldDemonWillHandler.java | 6 ++--- .../entity/mob/EntityAspectedDemonBase.java | 4 +-- .../entity/mob/EntityCorruptedChicken.java | 2 +- .../entity/mob/EntityCorruptedSheep.java | 2 +- .../entity/mob/EntityCorruptedSpider.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 4 +-- .../entity/projectile/EntityBloodLight.java | 2 +- .../entity/projectile/EntityMeteor.java | 2 +- .../projectile/EntitySentientArrow.java | 6 ++--- .../bloodmagic/gson/Serializers.java | 2 +- .../incense/TranquilityHandlers.java | 6 ++--- .../inversion/CorruptionHandler.java | 2 +- .../inversion/InversionPillarHandler.java | 2 +- .../bloodmagic/item/ItemAltarMaker.java | 8 +++--- .../bloodmagic/item/ItemBindableBase.java | 4 +-- .../bloodmagic/item/ItemBloodOrb.java | 10 +++---- .../bloodmagic/item/ItemBoundAxe.java | 6 ++--- .../bloodmagic/item/ItemBoundPickaxe.java | 6 ++--- .../bloodmagic/item/ItemBoundShovel.java | 6 ++--- .../bloodmagic/item/ItemBoundSword.java | 12 ++++----- .../bloodmagic/item/ItemBoundTool.java | 16 ++++++------ .../item/ItemDaggerOfSacrifice.java | 8 +++--- .../bloodmagic/item/ItemDemonCrystal.java | 4 +-- .../bloodmagic/item/ItemDemonWillGauge.java | 2 +- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemInscriptionTool.java | 6 ++--- .../bloodmagic/item/ItemLavaCrystal.java | 4 +-- .../bloodmagic/item/ItemPotionFlask.java | 2 +- .../bloodmagic/item/ItemRitualDiviner.java | 14 +++++----- .../bloodmagic/item/ItemRitualReader.java | 12 ++++----- .../item/ItemSacrificialDagger.java | 12 ++++----- .../bloodmagic/item/ItemSanguineBook.java | 10 +++---- .../item/ItemTelepositionFocus.java | 4 +-- .../bloodmagic/item/ItemUpgradeTome.java | 6 ++--- .../bloodmagic/item/ItemUpgradeTrainer.java | 8 +++--- .../item/alchemy/ItemCuttingFluid.java | 4 +-- .../item/armour/ItemLivingArmour.java | 12 ++++----- .../item/armour/ItemSentientArmour.java | 10 +++---- .../item/block/ItemBlockDemonCrystal.java | 2 +- .../item/gear/ItemPackSacrifice.java | 12 ++++----- .../item/gear/ItemPackSelfSacrifice.java | 14 +++++----- .../item/inventory/ContainerHolding.java | 2 +- .../item/inventory/InventoryHolding.java | 4 +-- .../item/inventory/ItemInventory.java | 4 +-- .../item/routing/ItemNodeRouter.java | 6 ++--- .../bloodmagic/item/sigil/ItemSigilAir.java | 10 +++---- .../bloodmagic/item/sigil/ItemSigilBase.java | 4 +-- .../item/sigil/ItemSigilBloodLight.java | 10 +++---- .../item/sigil/ItemSigilBounce.java | 2 +- .../bloodmagic/item/sigil/ItemSigilClaw.java | 2 +- .../item/sigil/ItemSigilCompression.java | 4 +-- .../item/sigil/ItemSigilDivination.java | 10 +++---- .../sigil/ItemSigilElementalAffinity.java | 2 +- .../item/sigil/ItemSigilEnderSeverance.java | 2 +- .../item/sigil/ItemSigilFastMiner.java | 4 +-- .../item/sigil/ItemSigilFilledHand.java | 2 +- .../bloodmagic/item/sigil/ItemSigilFrost.java | 2 +- .../item/sigil/ItemSigilGreenGrove.java | 4 +-- .../bloodmagic/item/sigil/ItemSigilHaste.java | 2 +- .../item/sigil/ItemSigilHolding.java | 12 ++++----- .../bloodmagic/item/sigil/ItemSigilLava.java | 6 ++--- .../item/sigil/ItemSigilMagnetism.java | 2 +- .../item/sigil/ItemSigilPhantomBridge.java | 2 +- .../bloodmagic/item/sigil/ItemSigilSeer.java | 10 +++---- .../item/sigil/ItemSigilSuppression.java | 2 +- .../item/sigil/ItemSigilTeleposition.java | 10 +++---- .../item/sigil/ItemSigilToggleableBase.java | 5 ++-- .../item/sigil/ItemSigilTransposition.java | 14 +++++----- .../bloodmagic/item/sigil/ItemSigilVoid.java | 6 ++--- .../bloodmagic/item/sigil/ItemSigilWater.java | 6 ++--- .../item/sigil/ItemSigilWhirlwind.java | 2 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 8 +++--- .../item/soul/ItemSentientArmourGem.java | 4 +-- .../bloodmagic/item/soul/ItemSentientAxe.java | 18 ++++++------- .../bloodmagic/item/soul/ItemSentientBow.java | 12 ++++----- .../item/soul/ItemSentientPickaxe.java | 18 ++++++------- .../item/soul/ItemSentientShovel.java | 18 ++++++------- .../item/soul/ItemSentientSword.java | 18 ++++++------- .../bloodmagic/item/soul/ItemSoulGem.java | 14 +++++----- .../bloodmagic/livingArmour/LivingArmour.java | 10 +++---- .../LivingArmourUpgradeBattleHungry.java | 4 +-- .../LivingArmourUpgradeCrippledArm.java | 4 +-- .../LivingArmourUpgradeDigSlowdown.java | 4 +-- .../LivingArmourUpgradeDisoriented.java | 4 +-- .../LivingArmourUpgradeMeleeDecrease.java | 4 +-- .../LivingArmourUpgradeQuenched.java | 4 +-- .../LivingArmourUpgradeSlippery.java | 4 +-- .../LivingArmourUpgradeSlowHeal.java | 4 +-- .../LivingArmourUpgradeSlowness.java | 4 +-- .../LivingArmourUpgradeStormTrooper.java | 4 +-- .../tracker/StatTrackerArrowProtect.java | 4 +-- .../tracker/StatTrackerArrowShot.java | 4 +-- .../tracker/StatTrackerCriticalStrike.java | 4 +-- .../tracker/StatTrackerDigging.java | 4 +-- .../tracker/StatTrackerExperience.java | 4 +-- .../tracker/StatTrackerFallProtect.java | 4 +-- .../tracker/StatTrackerFireResist.java | 4 +-- .../livingArmour/tracker/StatTrackerFood.java | 4 +-- .../tracker/StatTrackerGraveDigger.java | 4 +-- .../tracker/StatTrackerGrimReaperSprint.java | 4 +-- .../tracker/StatTrackerHealthboost.java | 4 +-- .../livingArmour/tracker/StatTrackerJump.java | 4 +-- .../tracker/StatTrackerMeleeDamage.java | 4 +-- .../tracker/StatTrackerMovement.java | 4 +-- .../tracker/StatTrackerNightSight.java | 4 +-- .../tracker/StatTrackerPhysicalProtect.java | 4 +-- .../tracker/StatTrackerPoison.java | 4 +-- .../tracker/StatTrackerRepairing.java | 4 +-- .../tracker/StatTrackerSelfSacrifice.java | 4 +-- .../tracker/StatTrackerSolarPowered.java | 4 +-- .../tracker/StatTrackerSprintAttack.java | 4 +-- .../tracker/StatTrackerStepAssist.java | 4 +-- .../LivingArmourUpgradeArrowProtect.java | 2 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 4 +-- .../LivingArmourUpgradeCriticalStrike.java | 2 +- .../upgrade/LivingArmourUpgradeDigging.java | 4 +-- .../upgrade/LivingArmourUpgradeElytra.java | 4 +-- .../LivingArmourUpgradeExperience.java | 2 +- .../LivingArmourUpgradeFallProtect.java | 2 +- .../LivingArmourUpgradeFireResist.java | 6 ++--- .../LivingArmourUpgradeGraveDigger.java | 2 +- .../LivingArmourUpgradeGrimReaperSprint.java | 4 +-- .../LivingArmourUpgradeHealthboost.java | 4 +-- .../upgrade/LivingArmourUpgradeJump.java | 4 +-- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 4 +-- .../LivingArmourUpgradeNightSight.java | 6 ++--- .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../LivingArmourUpgradePoisonResist.java | 6 ++--- .../upgrade/LivingArmourUpgradeRepairing.java | 4 +-- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSolarPowered.java | 4 +-- .../upgrade/LivingArmourUpgradeSpeed.java | 4 +-- .../LivingArmourUpgradeSprintAttack.java | 2 +- .../LivingArmourUpgradeStepAssist.java | 4 +-- .../bloodmagic/meteor/MeteorRegistry.java | 2 +- .../network/DemonAuraPacketProcessor.java | 4 +-- .../bloodmagic/potion/BMPotionUtils.java | 8 +++--- .../potion/PotionEventHandlers.java | 2 +- .../bloodmagic/proxy/ClientProxy.java | 4 +-- .../bloodmagic/proxy/CommonProxy.java | 6 ++--- .../AlchemyTableDyeableRecipe.java | 4 +-- .../AlchemyTablePotionRecipe.java | 2 +- .../registry/ModArmourTrackers.java | 2 +- .../registry/ModCorruptionBlocks.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 14 +++++----- .../bloodmagic/registry/ModRituals.java | 12 ++++----- .../registry/ModTranquilityHandlers.java | 2 +- .../bloodmagic/ritual/RitualAltarBuilder.java | 16 ++++++------ .../bloodmagic/ritual/RitualAnimalGrowth.java | 4 +-- .../bloodmagic/ritual/RitualArmourEvolve.java | 2 +- .../bloodmagic/ritual/RitualCobblestone.java | 2 +- .../bloodmagic/ritual/RitualContainment.java | 4 +-- .../bloodmagic/ritual/RitualCrushing.java | 10 +++---- .../ritual/RitualCrystalHarvest.java | 2 +- .../bloodmagic/ritual/RitualExpulsion.java | 6 ++--- .../ritual/RitualFeatheredKnife.java | 10 +++---- .../bloodmagic/ritual/RitualFelling.java | 2 +- .../bloodmagic/ritual/RitualForsakenSoul.java | 4 +-- .../bloodmagic/ritual/RitualFullStomach.java | 2 +- .../bloodmagic/ritual/RitualGreenGrove.java | 8 +++--- .../bloodmagic/ritual/RitualHarvest.java | 8 +++--- .../bloodmagic/ritual/RitualInterdiction.java | 4 +-- .../bloodmagic/ritual/RitualJumping.java | 2 +- .../bloodmagic/ritual/RitualLava.java | 8 +++--- .../ritual/RitualLivingArmourDowngrade.java | 8 +++--- .../bloodmagic/ritual/RitualMagnetic.java | 4 +-- .../bloodmagic/ritual/RitualMeteor.java | 4 +-- .../bloodmagic/ritual/RitualPlacer.java | 2 +- .../bloodmagic/ritual/RitualPortal.java | 10 +++---- .../bloodmagic/ritual/RitualPump.java | 2 +- .../bloodmagic/ritual/RitualRegeneration.java | 6 ++--- .../bloodmagic/ritual/RitualSpeed.java | 4 +-- .../bloodmagic/ritual/RitualSuppression.java | 2 +- .../ritual/RitualUpgradeRemove.java | 8 +++--- .../bloodmagic/ritual/RitualWater.java | 2 +- .../ritual/RitualWellOfSuffering.java | 4 +-- .../bloodmagic/ritual/RitualZephyr.java | 2 +- .../harvest/HarvestHandlerPlantable.java | 6 ++--- .../ritual/harvest/HarvestHandlerStem.java | 6 ++--- .../ritual/harvest/HarvestHandlerTall.java | 6 ++--- .../ritual/imperfect/ImperfectRitualDay.java | 6 ++--- .../imperfect/ImperfectRitualNight.java | 6 ++--- .../ritual/imperfect/ImperfectRitualRain.java | 6 ++--- .../imperfect/ImperfectRitualResistance.java | 6 ++--- .../imperfect/ImperfectRitualZombie.java | 6 ++--- .../ritual/portal/LocationsHandler.java | 4 +-- .../bloodmagic/ritual/portal/Teleports.java | 8 +++--- .../bloodmagic/structures/Dungeon.java | 2 +- .../bloodmagic/structures/DungeonRoom.java | 2 +- .../bloodmagic/tile/TileAlchemyArray.java | 8 +++--- .../bloodmagic/tile/TileAlchemyTable.java | 14 +++++----- .../WayofTime/bloodmagic/tile/TileAltar.java | 4 +-- .../bloodmagic/tile/TileBloodTank.java | 2 +- .../bloodmagic/tile/TileDemonCrucible.java | 8 +++--- .../bloodmagic/tile/TileDemonCrystal.java | 4 +-- .../tile/TileDemonCrystallizer.java | 6 ++--- .../bloodmagic/tile/TileDemonPylon.java | 6 ++--- .../tile/TileImperfectRitualStone.java | 10 +++---- .../bloodmagic/tile/TileIncenseAltar.java | 12 ++++----- .../bloodmagic/tile/TileInversionPillar.java | 4 +-- .../tile/TileMasterRitualStone.java | 22 ++++++++-------- .../bloodmagic/tile/TilePhantomBlock.java | 2 +- .../tile/TilePurificationAltar.java | 6 ++--- .../bloodmagic/tile/TileSoulForge.java | 14 +++++----- .../bloodmagic/tile/TileSpectralBlock.java | 2 +- .../bloodmagic/tile/TileTeleposer.java | 12 ++++----- .../tile/container/ContainerAlchemyTable.java | 2 +- .../tile/container/ContainerSoulForge.java | 4 +-- .../tile/routing/TileFilteredRoutingNode.java | 2 +- .../tile/routing/TileMasterRoutingNode.java | 4 +-- .../tile/routing/TileRoutingNode.java | 2 +- .../bloodmagic/util/GhostItemHelper.java | 4 +-- .../WayofTime/bloodmagic/util/PluginUtil.java | 7 ++--- .../java/WayofTime/bloodmagic/util/Utils.java | 10 +++---- .../util/handler/event/ClientHandler.java | 8 +++--- .../util/handler/event/CraftingHandler.java | 12 ++++----- .../util/handler/event/GenericHandler.java | 26 +++++++++---------- .../handler/event/LivingArmourHandler.java | 4 +-- .../handler/event/StatTrackerHandler.java | 2 +- .../util/handler/event/WillHandler.java | 2 +- .../bloodmagic/util/helper/RecipeHelper.java | 6 ++--- 421 files changed, 1006 insertions(+), 999 deletions(-) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/BloodMagicPlugin.java (88%) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/IBloodMagicAPI.java (92%) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/IBloodMagicBlacklist.java (94%) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/IBloodMagicPlugin.java (68%) rename src/main/java/WayofTime/bloodmagic/{api_impl => api/impl}/BloodMagicAPI.java (91%) rename src/main/java/WayofTime/bloodmagic/{api_impl => api/impl}/BloodMagicBlacklist.java (96%) rename src/main/java/WayofTime/bloodmagic/{api_impl => api/impl}/BloodMagicCorePlugin.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/BlockStack.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/BloodMagicAPI.java (79%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/Constants.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/DamageSourceBloodMagic.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ItemStackWrapper.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/alchemyCrafting/AlchemyArrayEffect.java (86%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/alchemyCrafting/AlchemyArrayEffectCrafting.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/alchemyCrafting/AlchemyCircleRenderer.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/AltarComponent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/AltarUpgrade.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/EnumAltarComponent.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/EnumAltarTier.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/IAltarComponent.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/IAltarManipulator.java (73%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/IBloodAltar.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/compress/CompressionHandler.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/compress/CompressionRegistry.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/AddToNetworkEvent.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/AltarCraftedEvent.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/BoundToolEvent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/ItemBindEvent.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/RitualEvent.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/SacrificeKnifeUsedEvent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/SoulNetworkEvent.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/TeleposeEvent.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IActivatable.java (78%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IAlchemyArray.java (66%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IAltarReader.java (72%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IBindable.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ICustomAlchemyConsumable.java (82%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IDemonWillViewer.java (86%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IDocumentedBlock.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IHarvestHandler.java (78%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IItemLPContainer.java (83%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IMultiWillTool.java (52%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/INodeRenderer.java (72%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IPurificationAsh.java (80%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ISentientSwordEffectProvider.java (74%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ISentientTool.java (79%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ISigil.java (76%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IUpgradeTrainer.java (86%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/impl/ItemBindable.java (82%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/impl/ItemSigil.java (80%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/impl/ItemSigilToggleable.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/EnumTranquilityType.java (70%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/IIncensePath.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/ITranquilityHandler.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/IncenseTranquilityRegistry.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/TranquilityStack.java (81%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/ILivingArmour.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/LivingArmourHandler.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/LivingArmourUpgrade.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/StatTracker.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/orb/BloodOrb.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/orb/IBloodOrb.java (75%) create mode 100644 src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/AlchemyTableCustomRecipe.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/AlchemyTableRecipe.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/LivingArmourDowngradeRecipe.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/TartaricForgeRecipe.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/AlchemyArrayRecipeRegistry.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/AlchemyTableRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/AltarRecipeRegistry.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/HarvestRegistry.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/ImperfectRitualRegistry.java (92%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/LivingArmourDowngradeRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/OrbRegistry.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/RitualRegistry.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/TartaricForgeRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/AreaDescriptor.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/CapabilityRuneType.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/EnumRitualReaderState.java (62%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/EnumRuneType.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/IMasterRitualStone.java (88%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/IRitualStone.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/Ritual.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/RitualComponent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/RitualRenderer.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/imperfect/IImperfectRitualStone.java (88%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/imperfect/ImperfectRitual.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/imperfect/package-info.java (71%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/saving/BMWorldSavedData.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/saving/SoulNetwork.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/DemonWillHolder.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/EnumDemonWillType.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWill.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWillConduit.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWillGem.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWillWeapon.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDiscreteDemonWill.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/PlayerDemonWillHandler.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/ITeleport.java (59%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/PortalLocation.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/Teleport.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/TeleportQueue.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/TeleporterBloodMagic.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/BindableHelper.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/IncenseHelper.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/ItemHelper.java (92%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/LogHelper.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/NBTHelper.java (83%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/NetworkHelper.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/PlayerHelper.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/PlayerSacrificeHelper.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/PurificationHelper.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/RitualHelper.java (92%) diff --git a/build.gradle b/build.gradle index 66a57a25..27fe1311 100644 --- a/build.gradle +++ b/build.gradle @@ -93,6 +93,7 @@ task apiJar(type: Jar) { from sourceSets.main.allSource from sourceSets.main.output include 'WayofTime/bloodmagic/api/**/*' + exclude 'WayofTime/bloodmagic/api/impl/**/*' classifier = 'api' } diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 86705236..08bdce42 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.util.helper.LogHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; -import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; -import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index 9a796c9c..e5888e90 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.fakePlayer.FakePlayerBM; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index 8310f713..d8f09294 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java index 7b0211bd..a5d962b1 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java index f7425b3b..46cc3ed0 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java index afa6ce77..66ce98a8 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index 464cd6cd..5f02f6c4 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java index 2b778e11..4f89481b 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index b4846dfa..37f49e00 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,19 +1,18 @@ package WayofTime.bloodmagic.altar; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.*; -import WayofTime.bloodmagic.api.event.AltarCraftedEvent; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.*; +import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Enums; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; @@ -31,7 +30,6 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import java.util.List; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/apiv2/BloodMagicPlugin.java rename to src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java index 6458977d..04907dfa 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 0e7c8d50..a439d73e 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java rename to src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java index f1f1b0ad..64ba641f 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java similarity index 68% rename from src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java rename to src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java index ad2098a7..450076db 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; public interface IBloodMagicPlugin { diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index b2fc17ce..a8e9426e 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api_impl; +package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.api.IBloodMagicAPI; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java rename to src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java index b88d64b6..c07e979c 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api_impl; +package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.apiv2.IBloodMagicBlacklist; +import WayofTime.bloodmagic.api.IBloodMagicBlacklist; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java rename to src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index aab81509..659a87d6 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -1,11 +1,11 @@ -package WayofTime.bloodmagic.api_impl; +package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; -import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; -import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicAPI; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; diff --git a/src/main/java/WayofTime/bloodmagic/api/package-info.java b/src/main/java/WayofTime/bloodmagic/api/package-info.java index 3f175867..d77cfda2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION) +@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|api", apiVersion = "2.0.0") package WayofTime.bloodmagic.api; import WayofTime.bloodmagic.BloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/BlockStack.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java index 72752c81..74e50107 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java index e69115f3..48b7bc95 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; -import WayofTime.bloodmagic.api.util.helper.LogHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; import net.minecraft.util.DamageSource; /** diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/Constants.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java index 4ead21b0..11d1830b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import WayofTime.bloodmagic.BloodMagic; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java index d9747ad3..75af1dd6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java index d0949cbe..a48a0acd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java index 7455ca08..d08c968c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.alchemyCrafting; +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java index a15da577..16712dee 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.alchemyCrafting; +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java index f6276316..789257c5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.alchemyCrafting; +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java index 470097e1..20a70d23 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java index c18801eb..7598f58a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; public class AltarUpgrade { private int speedCount; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java index 8443bc1a..8f863756 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java index 16a4e7e1..b783a928 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java index 52d1d763..666f5be0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarManipulator.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java similarity index 73% rename from src/main/java/WayofTime/bloodmagic/api/altar/IAltarManipulator.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java index 57509bc0..5a69420e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarManipulator.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java index 843d2a0e..a8642b89 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; public interface IBloodAltar { int getCapacity(); diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java index 22a8fe9e..e36149c6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.compress; +package WayofTime.bloodmagic.apibutnotreally.compress; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java index 7fc1bbae..786306c9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.compress; +package WayofTime.bloodmagic.apibutnotreally.compress; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java index ddd5c637..4f84073f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java index f20d0ec7..2875f168 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java index ab2de72a..3e848cf9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java index 03348e02..d072d39f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class ItemBindEvent extends Event { /** * This event is called whenever a player attempts to bind a - * {@link WayofTime.bloodmagic.api.iface.IBindable} item. + * {@link WayofTime.bloodmagic.apibutnotreally.iface.IBindable} item. * * @param player The player doing the binding * @param key The UUID of the player doing the binding diff --git a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java index 9036f4cb..dd118b83 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java index 93f72b23..991e7a15 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.eventhandler.Cancelable; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java index 06928b8a..a39674a3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,7 +24,7 @@ public class SoulNetworkEvent extends Event { /** * This event is called when an - * {@link WayofTime.bloodmagic.api.impl.ItemBindable} is being drained + * {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable} is being drained * inside of a {@link net.minecraft.tileentity.TileEntity}. *

* If canceled, the drain will not be executed. diff --git a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java index d474e46b..d17ea312 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/api/iface/IActivatable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java index c760dd5c..c72c4cb7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java similarity index 66% rename from src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java index 60d34f08..dfa4559a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java index 292e2e74..d3d0bdc3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java index 5b515342..19cca36f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ICustomAlchemyConsumable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/api/iface/ICustomAlchemyConsumable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java index b7d6f034..547eb869 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ICustomAlchemyConsumable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IDemonWillViewer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/api/iface/IDemonWillViewer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java index cfcbd3d9..ecaa8dd3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IDemonWillViewer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java index fca40184..68ba0fd8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java index f25382f5..c4b38f18 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; -import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -16,7 +16,7 @@ public interface IHarvestHandler { * the block types you want. * * @param world - The world the - * {@link WayofTime.bloodmagic.api.ritual.IMasterRitualStone} is in. + * {@link WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone} is in. * @param pos - The position of the Block being checked * @param blockStack - The Block being checked * @return If the block was successfully harvested. diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IItemLPContainer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/api/iface/IItemLPContainer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java index b909856d..72e05cd9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IItemLPContainer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IMultiWillTool.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java similarity index 52% rename from src/main/java/WayofTime/bloodmagic/api/iface/IMultiWillTool.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java index 9ff0d689..519fc6cd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IMultiWillTool.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.item.ItemStack; public interface IMultiWillTool { diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/INodeRenderer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/api/iface/INodeRenderer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java index 27b48335..a12114b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/INodeRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; /** * Held items that implement this will cause the beams between routing nodes to diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IPurificationAsh.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/api/iface/IPurificationAsh.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java index b6b7940b..777a04e9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IPurificationAsh.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientSwordEffectProvider.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/api/iface/ISentientSwordEffectProvider.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java index 69ed3b28..16225306 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientSwordEffectProvider.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientTool.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/api/iface/ISentientTool.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java index 979c1066..18ed5e29 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientTool.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java similarity index 76% rename from src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java index bc625ee5..12f54b04 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; /** - * Used for all {@link WayofTime.bloodmagic.api.impl.ItemSigil} EXCEPT + * Used for all {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil} EXCEPT * Sigils of Holdings. */ public interface ISigil { diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java index 6d4300bb..f8d30032 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java index 11fe41a2..bb705a2c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.impl; +package WayofTime.bloodmagic.apibutnotreally.impl; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java index ff17b437..3d2dbe87 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.impl; +package WayofTime.bloodmagic.apibutnotreally.impl; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigilToggleable.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigilToggleable.java index bd243ec5..9c905233 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigilToggleable.java @@ -1,11 +1,11 @@ -package WayofTime.bloodmagic.api.impl; +package WayofTime.bloodmagic.apibutnotreally.impl; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IActivatable; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import com.google.common.base.Strings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/EnumTranquilityType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java similarity index 70% rename from src/main/java/WayofTime/bloodmagic/api/incense/EnumTranquilityType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java index ba589df3..af381ab7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/EnumTranquilityType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; public enum EnumTranquilityType { PLANT(), diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java index bb7bc0ad..5f75c546 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java index e6b88a4d..baee7500 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java index 165b80cf..24d04fb7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityStack.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java similarity index 81% rename from src/main/java/WayofTime/bloodmagic/api/incense/TranquilityStack.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java index 5852d488..ff94b0b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityStack.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; public class TranquilityStack { public final EnumTranquilityType type; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/ILivingArmour.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/ILivingArmour.java index 3a487a6c..c260d452 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/ILivingArmour.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.AttributeModifier; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourHandler.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourHandler.java index 129ea2d8..193a6570 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourHandler.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; -import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; import net.minecraft.nbt.NBTTagCompound; import java.lang.reflect.Constructor; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java index 703478fa..2fa4e8cc 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java index a43b7448..f450b4aa 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java index f5acc317..adbe7c7a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.orb; +package WayofTime.bloodmagic.apibutnotreally.orb; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java index 76f1161b..6b87ddd5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.orb; +package WayofTime.bloodmagic.apibutnotreally.orb; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java new file mode 100644 index 00000000..20478ed8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java @@ -0,0 +1,6 @@ +@Deprecated // This entire "api" is going to be nuked over time. Consider all of this unstable. +@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION) +package WayofTime.bloodmagic.apibutnotreally; + +import WayofTime.bloodmagic.BloodMagic; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableCustomRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableCustomRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java index be9afea1..5ce7e83c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableCustomRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; -import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java index 553cdb6d..6cb1cf8d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/LivingArmourDowngradeRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/recipe/LivingArmourDowngradeRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java index 65aa9c3a..d40eab8b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/LivingArmourDowngradeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java index d4becd01..028744fd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java index c4cf383e..fd939ba5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/registry/AlchemyTableRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java index daceba43..ff55fd94 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyTableRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java index 64342bfa..4e4c9352 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java index 90b2fa42..a0a5eeba 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockStem; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java index feebf365..16c5a510 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/LivingArmourDowngradeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/registry/LivingArmourDowngradeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java index 3f635ed3..f2787e34 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/LivingArmourDowngradeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java index 13cdde2b..0efd5b88 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; import com.google.common.collect.ArrayListMultimap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java index e62ece62..ced086b2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java index f9df0ffd..1090c897 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java index 521c9dca..f2ea64be 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java index af658b4f..40be45bf 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java similarity index 62% rename from src/main/java/WayofTime/bloodmagic/api/ritual/EnumRitualReaderState.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java index b1b9597f..f2d3cc8f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRitualReaderState.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; public enum EnumRitualReaderState { SET_AREA, diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java index 74c7aeb4..39685b3e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java index 6fb8544e..8cf47ab3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java index 846d6267..073b9b4b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java index 35763652..aa8c8c1c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,7 +21,7 @@ import java.util.Map.Entry; /** * Abstract class for creating new rituals. Rituals need be registered with - * {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)} + * {@link WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry#registerRitual(Ritual, String)} */ public abstract class Ritual { public final ArrayList ritualComponents = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java index 97d8893d..ad864ce7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java index 57251f8d..4c999f20 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java index 6c8620db..f468513e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual.imperfect; +package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java index d19ef961..c6f668d3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java @@ -1,13 +1,13 @@ -package WayofTime.bloodmagic.api.ritual.imperfect; +package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; -import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; /** * Abstract class for creating new imperfect rituals. ImperfectRituals need be * registered with - * {@link WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)} + * {@link WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)} */ public abstract class ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java similarity index 71% rename from src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java index 5740241a..e47d4b81 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.api.ritual.imperfect; +package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java index 16470fa5..be15d0a9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.saving; +package WayofTime.bloodmagic.apibutnotreally.saving; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java index 4fdb465b..54098c72 100644 --- a/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.api.saving; +package WayofTime.bloodmagic.apibutnotreally.saving; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.event.AddToNetworkEvent; -import WayofTime.bloodmagic.api.event.SoulNetworkEvent; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.event.AddToNetworkEvent; +import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java index 8ec0283e..721cbb99 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java index 445697f7..55a1dd42 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWill.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWill.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java index 7ef8c777..1387372b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java index bfa3a253..96947c98 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; /** * Implement this interface on a block that can accept and store Demonic Will. diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java index 26c90de5..4878ca07 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java index a24d804f..dc989bd2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDiscreteDemonWill.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDiscreteDemonWill.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java index d9ae26d6..c5a34382 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDiscreteDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java index 464245f5..07d95f3a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,7 +8,7 @@ import net.minecraft.util.NonNullList; * This class provides several helper methods in order to handle soul * consumption and use for a player. This refers to the Soul System, meaning * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found - * in {@link WayofTime.bloodmagic.api.util.helper.NetworkHelper} + * in {@link WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper} */ public class PlayerDemonWillHandler { /** diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java similarity index 59% rename from src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java index 567b9052..f5a1392e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; public interface ITeleport { void teleport(); diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java index 094c195d..a861f5c9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java index 72f64bf3..b733e538 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java index 941afa9d..6e56b7d9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java index 148eab4a..0bcb1d36 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java index e21b2d92..ca573a46 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.ItemBindEvent; -import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java index 8e835696..47aca8bc 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/ItemHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java index 35a27909..740043c0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IItemLPContainer; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.ItemUpgradeTome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java index bc10f82e..bc6d8de5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java index 6c1985da..ec5202a6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java index 6e4ae4fe..cfef4b4b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.SoulNetworkEvent; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.api.saving.BMWorldSavedData; -import WayofTime.bloodmagic.api.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.saving.BMWorldSavedData; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java index 348dc3d8..de1c9c62 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java index 6c1fdc9d..541a1472 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PurificationHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/PurificationHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java index 60e8bda7..3c6ef594 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PurificationHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java index 9597d969..321e778d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 16380c15..1ced3484 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 886bbe25..81b6dc1a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.iface.IDocumentedBlock; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index b0bfcfb1..09af9235 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 95352a33..53fd27cb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 31361c34..44681800 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.teleport.PortalLocation; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; import WayofTime.bloodmagic.block.base.BlockInteger; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 848afb35..6dba2cde 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 44c1766c..5b666693 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.material.Material; import net.minecraft.util.BlockRenderLayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index a93df99e..56a40037 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.IAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarComponent; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumMimic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index d3335a6f..92e59c3c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 69333f47..35674e6e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.incense.IIncensePath; +import WayofTime.bloodmagic.apibutnotreally.incense.IIncensePath; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumPath; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 0449705c..726b1af4 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.api.util.helper.RitualHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumRitualController; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 1a573969..4d51b164 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 2c200c2c..c56ac05e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 6ac92d99..c242b3b8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java index 9f5f9c52..08188509 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.block.enums; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.util.IStringSerializable; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java index e2b95ea5..f2c1399e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.gui; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.item.inventory.ContainerHolding; import WayofTime.bloodmagic.item.inventory.InventoryHolding; import WayofTime.bloodmagic.tile.TileAlchemyTable; diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java index 946b2ca0..07b1f281 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import WayofTime.bloodmagic.util.Utils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index 27f9f414..75792062 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java index 89267744..a27b8eba 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java index ea2d04e2..6900eead 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.client.renderer.ItemMeshDefinition; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 41fdcf94..b90de1bf 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 2df29bc5..91fbb1b7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index 4e334205..e5e91378 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index 3bd566f0..e7ec2570 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index 5e3e3ff5..c91a06c3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index 13700c19..a886a981 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index b471e4f4..1f592774 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.api.altar.AltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.handler.event.ClientHandler; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index 083de767..eb13193b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.iface.INodeRenderer; +import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer; import WayofTime.bloodmagic.client.helper.ShaderHelper; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 3e5cbb48..98828c1d 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.util.helper.BindableHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.BindableHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.command.CommandBase; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 21717206..1b164e28 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 6fac129d..92eda02e 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 0c70656d..13b1c7d6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; import amerifrance.guideapi.page.PageIRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index a161cb2c..eb3b8127 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index ba1b8d31..b623e8a6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java index 3c5c338d..2363e749 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index a294a615..5b9c507e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java index 765791a1..4f5446fd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi.book; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 6117a981..5c925f74 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index 7f52af4a..a8189038 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 5c58acbf..dca1919e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHandler; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index 5b9b8e22..9dddc706 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java index 4a0168a5..f05a4cbd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java index 23fc84db..3d95e801 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import com.google.common.collect.BiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index 4ade8678..64058d7a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java index 420793e9..8010e978 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index 0079d60a..f86b8b14 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java index e526d182..db5ebc33 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 482b98ab..2701f7d5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java index efd8c457..c8955819 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.altar; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java index d7de9b3d..36294a82 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -12,7 +13,7 @@ import java.awt.Color; import java.util.ArrayList; import java.util.List; -public class AltarRecipeJEI extends BlankRecipeWrapper { +public class AltarRecipeJEI implements IRecipeWrapper { @Nonnull private final List input; @Nonnull @@ -32,11 +33,12 @@ public class AltarRecipeJEI extends BlankRecipeWrapper { } @Override - public void getIngredients(IIngredients ingredients) { + public void getIngredients(@Nonnull IIngredients ingredients) { ingredients.setInputs(ItemStack.class, input); ingredients.setOutput(ItemStack.class, output); } + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { ArrayList ret = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java index 760852b2..41b2cd1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei.altar; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.block.BlockLifeEssence; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeModContainer; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java index f8a93172..28e67e3a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java index 233f7ee5..b1e1eaf9 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java index d8155ace..611cd8d8 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java index 4aeafbef..f0194367 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.api.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index c511fa04..95e51d0e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java index ce2fad06..4f756e80 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.binding; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java index 561f6b21..38a92b55 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import com.google.common.collect.BiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index ceee68d8..a6a11a1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.forge; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java index 608d97be..9cd307ca 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java index 9919a733..d1004898 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java index 9f66cc27..cea35588 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java index 5cfd9622..bafdcc27 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.*; import WayofTime.bloodmagic.compat.waila.provider.*; import mcp.mobius.waila.api.IWailaPlugin; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index a11aae07..e3bd3c3e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 9e3ddf39..57282503 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index 7bd19ddd..1add88c3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.BlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 8e1c8868..f60db24a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockRitualController; import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index d76f0043..2f7c4273 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index fc018d59..b13f6d36 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.api.compress.CompressionHandler; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 00dd6361..9f4a2fcc 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.api.compress.CompressionHandler; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 093dbff0..2d51470c 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 80b2cf1f..7a0c416d 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.entity.mob.*; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 542ce653..46a42aee 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index 99d8b83d..9c71bb94 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core.recipe; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java index 01547e6f..818bffc3 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import net.minecraft.world.chunk.Chunk; import java.lang.ref.WeakReference; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 98201ee6..96c4c15c 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index 69b5ceac..34879915 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.gson.Serializers; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index ca6ec8be..0ae9a398 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIAttackStealthMelee; import WayofTime.bloodmagic.entity.ai.EntityAIStealthRetreat; import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index cf128414..6bed3068 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIEatAndCorruptBlock; import WayofTime.bloodmagic.entity.ai.EntityAIProtectAlly; import com.google.common.collect.Maps; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index 871bfb50..f4fcbe89 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIPickUpAlly; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 084df078..4ffeb770 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index c596696c..db068c77 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index bfbbe0e8..71e6bb84 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.meteor.MeteorRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index 8946d035..e96c4cc9 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index 1f947941..d629f793 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.gson; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import com.google.gson.*; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java index f6b01f98..9fcad4b6 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.incense; -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.ITranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; +import WayofTime.bloodmagic.apibutnotreally.incense.EnumTranquilityType; +import WayofTime.bloodmagic.apibutnotreally.incense.ITranquilityHandler; +import WayofTime.bloodmagic.apibutnotreally.incense.TranquilityStack; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import net.minecraft.block.*; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java index c7b0abc7..3b9002b1 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java index d1a1e9aa..0bcf8815 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 442ecd96..c6c24cce 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.*; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index 195be959..c413e43b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.ItemBindable; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 0b7311a5..4318a90f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 651a8e91..19d2d6e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 37076c1e..3de0de3b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 2f2600ec..898fec90 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index cf6a8809..ebfd3952 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IActivatable; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index fae76626..ee605c35 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.event.BoundToolEvent; -import WayofTime.bloodmagic.api.iface.IActivatable; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.event.BoundToolEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index b5cdb49c..eb4fec00 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.api.util.helper.PurificationHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.EntityLivingBase; @@ -69,7 +69,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) { target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); target.setHealth(-1); - target.onDeath(WayofTime.bloodmagic.api.BloodMagicAPI.damageSource); + target.onDeath(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource); } return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index bd8143dc..bd45e9cc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index 68dcc7cf..4cc7940a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IDemonWillViewer; +import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 45fad002..e029fe4f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 4481c2a2..1a16af89 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index c224ea7d..3bb6f750 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 3f5e15ac..524f1888 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 616b01a2..e24e5e98 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.RitualHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMasterRitualStone; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 455e3f1c..193d027f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.EnumRitualReaderState; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRitualReaderState; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 1444de0e..8107f15d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -2,12 +2,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index f17328f6..081c8a5d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.iface.IDocumentedBlock; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 64895638..684e8cfa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index c7bd3f2c..1647562f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index f22ac3c0..832d90f2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index f65f891c..663d38ba 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.alchemy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index bfd67b55..2f84dc7b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.armour; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemComponent; diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 962a6272..62eb5cb9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.armour; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.HashMultimap; diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 611c8150..21908bf8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.block; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 3abdfdce..90a11db4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.gear; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IItemLPContainer; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LPContainer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 1dd19a4b..80f9a90b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item.gear; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IItemLPContainer; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LPContainer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java index 09508f3f..ccfd1a2b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.inventory; -import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java index 83440993..62947841 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.inventory; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java index 78c49062..6e6b44d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.inventory; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 3cdb1aa0..882a5556 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.routing; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.INodeRenderer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index 885f02b5..e0bbdf8c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 7de088ff..6accf15c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.ItemSigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 5f9fd16a..67881d1c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java index 37a6eccb..07528ccf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java index 44753b5b..61e779d7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index 34e2d061..25a4d2b3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index bc77fa24..13f9c407 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.tile.TileInversionPillar; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index e28a310f..fc124828 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index 855c29ab..06bce035 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityEnderman; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 8c6b1a27..94bf6f8f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java index 9ef7189e..b941152b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java index dfaab6cd..5287c105 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.enchantment.EnchantmentFrostWalker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 842b69ad..5faaad29 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index 02559204..37cbf27d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index da59eee5..13276673 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 919b2dab..abfdebb8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index f4b7e412..eccf3a77 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index 61631c72..118d528c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index d05a105b..fc2fb523 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NumeralHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 57064bf5..b5c6608e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index e4fd869f..425d43ea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.ritual.portal.Teleports; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 7590fc19..1f9d78c8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.ItemSigilToggleable; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.impl.ItemSigilToggleable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -14,7 +14,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.text.WordUtils; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index ac8429f4..250daeb6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 1dca46ef..1e0aa5ea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 8fa03754..e45ad632 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.block.BlockCauldron; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index 05bb2c43..b8dd34cc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 3be9b4be..743ea4b1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index e25ae539..2ca80fed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index b86fc3ea..d4c7536c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index ef658a06..6aeade8d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index ca8a0502..490edb06 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index e86ee440..e5b90eef 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 4753c957..9546f2ac 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index a4095e15..90fd0023 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionWillGem; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index e9e3edfb..57df9a6c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.livingArmour; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index 2de24a51..9162ab95 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index a187eacd..eea9e27e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index 50655a92..b837ba77 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index 90dcf8a7..af2b15ca 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index f5648b37..0b3b6095 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index 394b308a..c2fb14e7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index 31ddcfcc..f30ef882 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index 57118a87..a9bc44d3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index 4a8827cc..2877f3be 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index 0b8f7788..4546f447 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index bcb98f2a..57584dc9 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 1a408791..95e1357f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index 4fb581c8..2a843bcb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeCriticalStrike; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 8d5cafe3..a063e192 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 459d947a..57c67bea 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index 64440c23..fc0017ea 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index 3be711ab..c69e03e4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFireResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index e3b35918..06a9ecad 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index e7069b4e..bbab4ad4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 21670c1f..ff48cb51 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index a5375402..e9701d9b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index 9d26e3c8..eebfcbc4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index e2ee5927..177ad61a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 26ebe64b..53a91cf1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 1cd463bd..105885bb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeNightSight; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 11580b8f..1333750b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index dd76abe2..31d24e54 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index d3929d36..082a28d4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRepairing; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index fe7b7258..a0744780 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 8e2ecb20..d338e77b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index ae0451e9..00be46cb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 438f5d59..700edfe1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index 48d96ee4..d790ca2f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index 95f9c7b4..c9714184 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 75ffd6b0..65077f41 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 1ba86bcb..4b69347c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index 7908f9d8..d43a8482 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index 83a98ede..73a23691 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index d00394dd..d829d828 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index e76812e1..6cb7e0f6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index e7c285e9..f277bea7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index e6dc11ad..05f6644f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 19181cda..acb057e3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index dd831b75..6cec3d05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index 84363286..faf8d7d5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 5b59193e..5214502d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index 6a39ff37..966c9b1f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 0cb14b98..5143860a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index d5ed775f..f563ba66 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 8f8ec4d2..318ab46f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index acc05450..ca20ddb3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 34291867..3295882a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 2677eaba..87791649 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index 22d175b6..d74bce15 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 48c8d7c6..2f14ec9d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java index 4550aca7..4870d5ff 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.meteor; -import WayofTime.bloodmagic.api.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java index eb8b9724..f7d1f8c4 100644 --- a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.network; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index cb0ea468..0a9f94d7 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.potion; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; @@ -66,7 +66,7 @@ public class BMPotionUtils { } if (incurredDamage > 0) { - entity.attackEntityFrom(WayofTime.bloodmagic.api.BloodMagicAPI.damageSource, (float) incurredDamage); + entity.attackEntityFrom(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource, (float) incurredDamage); } return incurredDamage; diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index a393cb53..2e2bdfa1 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 3d9d0233..42ef7613 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.helper.ShaderHelper; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 636310a4..18885435 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; -import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.ritual.CapabilityRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; import WayofTime.bloodmagic.fuel.FuelHandler; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 971e44cb..52d221eb 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index bd97772c..8c21e8e2 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 4e0e9d18..c3564204 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.livingArmour.tracker.*; import WayofTime.bloodmagic.livingArmour.upgrade.*; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java index fff4f109..58516481 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.inversion.CorruptionHandler; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 2b27d46d..2f244a80 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -2,13 +2,13 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.recipe.AlchemyTableCustomRecipe; -import WayofTime.bloodmagic.api.registry.*; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 3d0def9a..1343d5fe 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java index 69834f08..2fa8e433 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.incense.IncenseTranquilityRegistry; +import WayofTime.bloodmagic.apibutnotreally.incense.IncenseTranquilityRegistry; import WayofTime.bloodmagic.incense.TranquilityHandlers; public class ModTranquilityHandlers { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index 69ccc38a..a9785bf9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.altar.AltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index d5671333..e555c69a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java index 8db309d0..93df19e4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import com.google.common.collect.Iterables; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index 2a8be8aa..ccb845b9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index b5a4953e..41b8098d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index ea01a579..f31a03f0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java index 00e1b34f..c40acf12 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index 5c9b254a..5a52ad05 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index 38a5b4fb..c70de21b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java index 52c22bf5..1207dd3c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index de8a4a54..b8fe4a66 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index 37e6c56b..3bce44ba 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 9f2af4fa..9e42209c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index e48c6b36..574ed869 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java index 69e6c61d..0d4e0f61 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java index 45ab5d5c..1d27ada9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index 1b6d15c1..082edc55 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java index 70d01e55..8034d1b8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.api.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 948ce689..1f55d2f8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java index 90a9412f..81299c17 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index 938a3fab..37dd74e7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 4732b101..85acd27b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; -import WayofTime.bloodmagic.api.teleport.PortalLocation; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.tile.TileDimensionalPortal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java index 0158e15c..ede507a1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import com.google.common.collect.Lists; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java index 64537627..9eea0094 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java index 4cc59843..bb3035b6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java index 967ca362..369f8873 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java index f1c12561..3b42d23a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index c8291570..13e0e257 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index e16184bd..2715bd64 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index 7db7ffea..c406b163 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 55512361..258fdfbe 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.harvest; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 5454ca0b..6200a003 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; import net.minecraft.block.BlockStem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index 19f045b3..408eab39 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index ef7523fa..49c280ac 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index d8d9093c..80857a9a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index 243bd5e3..6ec3a207 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index 871769f2..88907218 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index 39bec8d2..5404ec97 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index 1a1c0555..7ec1d9a0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.teleport.PortalLocation; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; import net.minecraftforge.common.DimensionManager; import java.io.*; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index b005e751..bde56486 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.portal; -import WayofTime.bloodmagic.api.event.TeleposeEvent; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.teleport.Teleport; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.teleport.Teleport; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index 11209c0c..42cf8ab8 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index d9ab71a6..84a2843d 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 6905948d..39d77472 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 0290cf78..3ceab6be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 945c7918..bfaeefbb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 2bf3e98e..8e161c77 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index ac4a0e7b..df286a8b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 2cfda269..d4fbdd7d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockDemonCrystal; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 78d2424e..4e5d3fdb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index e1e73718..86ae91b0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index ec1fc4b8..3899cc39 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 8f90b289..26daca95 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.IIncensePath; -import WayofTime.bloodmagic.api.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.incense.EnumTranquilityType; +import WayofTime.bloodmagic.apibutnotreally.incense.IIncensePath; +import WayofTime.bloodmagic.apibutnotreally.incense.IncenseTranquilityRegistry; +import WayofTime.bloodmagic.apibutnotreally.incense.TranquilityStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.IncenseAltarHandler; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 7ba2a285..1d2e8a19 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.inversion.InversionPillarHandler; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index c812f552..4431af8f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.RitualEvent; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api.util.helper.RitualHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.RitualEvent; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index e9cbe72a..a1b3a63d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index 4e0f8872..bf3dddc8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.iface.IPurificationAsh; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -import WayofTime.bloodmagic.api.util.helper.PurificationHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.IPurificationAsh; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 7bdf5b3e..fd066671 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 44696136..172c7adb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 97c51571..a8124376 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.TeleposeEvent; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java index 9ba7f05a..c2569ba8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.api.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index ced03f85..bd82760e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 83a22f14..5deac5ea 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.util.GhostItemHelper; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index cbe898e4..2d17f476 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.tile.TileInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index a8b7aa2c..6e13a518 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.routing.IItemRoutingNode; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 36b29da4..77862f48 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java index 5b09e100..0b69af06 100644 --- a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java @@ -1,7 +1,8 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; -import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.impl.BloodMagicCorePlugin; import com.google.common.collect.Lists; import net.minecraftforge.fml.common.discovery.ASMDataTable; import org.apache.commons.lang3.tuple.Pair; @@ -32,7 +33,7 @@ public class PluginUtil { } // Bring core plugin up to top - discoveredAnnotations.sort((o1, o2) -> o1.getLeft().getClass().getCanonicalName().startsWith("WayofTime") ? 1 : 0); + discoveredAnnotations.sort((o1, o2) -> o1.getLeft().getClass() == BloodMagicCorePlugin.class ? 1 : 0); return discoveredAnnotations; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index ae3b50ef..19d1e886 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.iface.IDemonWillViewer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 530d4ca5..2719671e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; import WayofTime.bloodmagic.client.hud.HUDElement; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 3c9ca214..add509dc 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.AltarCraftedEvent; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.ItemHelper; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemInscriptionTool; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 16cd191c..387af240 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -2,19 +2,19 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.ItemBindEvent; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.api.event.TeleposeEvent; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.util.helper.*; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.util.helper.*; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 0e202ffe..42e866f8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index 8aee28b8..a98a8e9f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 4857c90e..b83bb3d3 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.*; +import WayofTime.bloodmagic.apibutnotreally.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.PosXY; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java index 069246a9..fd8e6bcf 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.fml.common.registry.ForgeRegistries; From 1205c4171210f8055bb3e115581b8fd457620cb5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Feb 2018 17:25:25 -0800 Subject: [PATCH 038/493] Fix GUIs not rendering backgrounds and tooltips (#1203) --- .../WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java | 7 +++++++ .../java/WayofTime/bloodmagic/client/gui/GuiHolding.java | 7 +++++++ .../bloodmagic/client/gui/GuiItemRoutingNode.java | 2 ++ .../bloodmagic/client/gui/GuiMasterRoutingNode.java | 7 +++++++ .../java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java | 7 +++++++ .../java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java | 7 +++++++ 6 files changed, 37 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java index 8fe326dc..3392b3f3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java @@ -24,6 +24,13 @@ public class GuiAlchemyTable extends GuiContainer { this.ySize = 205; } + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + this.renderHoveredToolTip(mouseX, mouseY); + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.alchemyTable.name"), 8, 5, 4210752); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java index 04ddecb4..11d9c93d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java @@ -25,6 +25,13 @@ public class GuiHolding extends GuiContainer { this.player = player; } + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + this.renderHoveredToolTip(mouseX, mouseY); + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { //the parameters for drawString are: string, x, y, color diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 8c0a2bc2..564494e6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -134,7 +134,9 @@ public class GuiItemRoutingNode extends GuiContainer { */ @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); super.drawScreen(mouseX, mouseY, partialTicks); + this.renderHoveredToolTip(mouseX, mouseY); Minecraft.getMinecraft().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java index dd49555e..3da9b255 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java @@ -22,6 +22,13 @@ public class GuiMasterRoutingNode extends GuiContainer { inventory = (TileEntity) tileRoutingNode; } + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + this.renderHoveredToolTip(mouseX, mouseY); + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { // this.fontRendererObj.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java index 1d5ddf05..6a1d85b0 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java @@ -23,6 +23,13 @@ public class GuiSoulForge extends GuiContainer { this.ySize = 205; } + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + this.renderHoveredToolTip(mouseX, mouseY); + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java index 828a0805..e5db4c67 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java @@ -17,6 +17,13 @@ public class GuiTeleposer extends GuiContainer { super(new ContainerTeleposer(playerInventory, tileTeleposer)); } + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + this.renderHoveredToolTip(mouseX, mouseY); + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.teleposer.name"), 64, 23, 4210752); From 63f88f6bff0bd0920e3c437f07372e40f0dbcbd3 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Feb 2018 17:36:13 -0800 Subject: [PATCH 039/493] Sorted out the sentient sword's identity crisis (#1201) --- .../java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 9546f2ac..24911140 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -272,7 +272,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM @Override @SideOnly(Side.CLIENT) public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionMultiWill("sentient_shovel"); + return new CustomMeshDefinitionMultiWill("sentient_sword"); } @Nullable From e79f6c44d600791889a62571cc1b595d3f611166 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Feb 2018 17:37:23 -0800 Subject: [PATCH 040/493] Fix crash on servers (#1204) --- .../WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java index 54cad50a..7838a879 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -22,6 +22,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; @@ -127,6 +129,7 @@ public class RegistrarBloodMagicBlocks { registerTileEntities(); } + @SideOnly(Side.CLIENT) @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { ModelLoader.setCustomStateMapper(LIFE_ESSENCE, new StateMapperBase() { From 27e41e2e77c8aed287413cc6b1490b666c47321c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Feb 2018 17:56:06 -0800 Subject: [PATCH 041/493] Fix crash when obtaining owner from an unbound bindable item (#1205) --- .../bloodmagic/apibutnotreally/impl/ItemBindable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java index bb705a2c..2add8510 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java @@ -25,11 +25,11 @@ public class ItemBindable extends Item implements IBindable { @Override public String getOwnerName(ItemStack stack) { - return !stack.isEmpty() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; } @Override public String getOwnerUUID(ItemStack stack) { - return !stack.isEmpty() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; } } From 8be8cc30b97af8cad5bcd3e6313225c43f6024ab Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 17:04:04 -0800 Subject: [PATCH 042/493] nullcheck obtained entity entries (#1206, 1207) No idea what's going on here but aight --- .../java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java | 2 ++ .../java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java | 2 +- .../java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java | 2 +- .../WayofTime/bloodmagic/util/handler/event/GenericHandler.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index eb4fec00..dce324db 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -52,6 +52,8 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { return false; EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass()); + if (entityEntry == null) + return false; int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), 25); if (lifeEssenceRatio <= 0) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index b8fe4a66..537b8fc7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -104,7 +104,7 @@ public class RitualForsakenSoul extends Ritual { for (EntityLivingBase entity : entities) { EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); - if (BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) + if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) continue; if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index 2715bd64..c9af292b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -79,7 +79,7 @@ public class RitualWellOfSuffering extends Ritual { for (EntityLivingBase entity : entities) { EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); - if (BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) + if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) continue; int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), SACRIFICE_AMOUNT); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 387af240..0dae83b8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -318,7 +318,7 @@ public class GenericHandler { @SubscribeEvent public static void onTeleposeEntity(TeleposeEvent.Ent event) { EntityEntry entry = EntityRegistry.getEntry(event.entity.getClass()); - if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName())) + if (entry != null && BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName())) event.setCanceled(true); } From 92fa6cd7f7ba33de519720e39a63615803b44a31 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 17:33:02 -0800 Subject: [PATCH 043/493] Update changelog + version --- changelog.txt | 12 ++++++++++++ gradle.properties | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index bb42e432..4f8003c5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,15 @@ +------------------------------------------------------ +Version 2.2.1 +------------------------------------------------------ + +- Fixed crashes when using systems that depended on internal entity names +- Fixed a crash when attempting to get the owner from unbound bindable items +- Fixed a server crash on startup +- Fixed GUIs not displaying the background and tooltips properly +- Helped the Sentient Sword get over it's identity crisis +- By the way I'm not actually upset or anything guys. + - Please stop overreacting Reddit. + ------------------------------------------------------ Version 2.2.0 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 6685f593..239d79e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.0 +mod_version=2.2.1 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From 739c1aa05f9cbbfe67613eec09149dda7cdb912b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 18:59:47 -0800 Subject: [PATCH 044/493] Cleaner sub-item implementation Todo: Move more sub items to use it --- .../soul/EnumDemonWillType.java | 19 +- .../bloodmagic/block/BlockDemonCrystal.java | 10 +- .../bloodmagic/item/ItemDemonCrystal.java | 49 +--- .../WayofTime/bloodmagic/item/ItemEnum.java | 59 +++++ .../bloodmagic/item/types/ComponentTypes.java | 64 ++++++ .../bloodmagic/item/types/ISubItem.java | 19 ++ .../bloodmagic/registry/ModRecipes.java | 14 +- .../bloodmagic/blockstates/component.json | 212 +++++++++--------- .../blockstates/item_demon_crystal.json | 10 +- 9 files changed, 285 insertions(+), 171 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemEnum.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java index 55a1dd42..fa77f039 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java @@ -1,10 +1,14 @@ package WayofTime.bloodmagic.apibutnotreally.soul; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; +import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; +import javax.annotation.Nonnull; import java.util.Locale; -public enum EnumDemonWillType implements IStringSerializable { +public enum EnumDemonWillType implements IStringSerializable, ISubItem { DEFAULT("default"), CORROSIVE("corrosive"), DESTRUCTIVE("destructive"), @@ -26,4 +30,17 @@ public enum EnumDemonWillType implements IStringSerializable { public String getName() { return this.toString(); } + + + @Nonnull + @Override + public String getInternalName() { + return getName(); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count, ordinal()); + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 53fd27cb..9af126b3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -181,19 +181,19 @@ public class BlockDemonCrystal extends Block { ItemStack stack = null; switch (type) { case CORROSIVE: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE); + stack = EnumDemonWillType.CORROSIVE.getStack(); break; case DEFAULT: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT); + stack = EnumDemonWillType.DEFAULT.getStack(); break; case DESTRUCTIVE: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE); + stack = EnumDemonWillType.DESTRUCTIVE.getStack(); break; case STEADFAST: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST); + stack = EnumDemonWillType.STEADFAST.getStack(); break; case VENGEFUL: - stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL); + stack = EnumDemonWillType.VENGEFUL.getStack(); break; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index bd45e9cc..508b1efd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -19,46 +19,13 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; import java.util.List; -public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider { - public static final ArrayList NAMES = Lists.newArrayList(); - - public static final String CRYSTAL_DEFAULT = "crystalDefault"; - public static final String CRYSTAL_CORROSIVE = "crystalCorrosive"; - public static final String CRYSTAL_VENGEFUL = "crystalVengeful"; - public static final String CRYSTAL_DESTRUCTIVE = "crystalDestructive"; - public static final String CRYSTAL_STEADFAST = "crystalSteadfast"; +public class ItemDemonCrystal extends ItemEnum implements IDiscreteDemonWill, IVariantProvider { public ItemDemonCrystal() { - super(); + super(EnumDemonWillType.class, "demonCrystal"); - setUnlocalizedName(BloodMagic.MODID + ".demonCrystal."); setHasSubtypes(true); setCreativeTab(BloodMagic.TAB_BM); - - buildItemList(); - } - - private void buildItemList() { - NAMES.add(0, CRYSTAL_DEFAULT); - NAMES.add(1, CRYSTAL_CORROSIVE); - NAMES.add(2, CRYSTAL_DESTRUCTIVE); - NAMES.add(3, CRYSTAL_VENGEFUL); - NAMES.add(4, CRYSTAL_STEADFAST); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + NAMES.get(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < NAMES.size(); i++) - list.add(new ItemStack(this, 1, i)); } @Override @@ -88,16 +55,4 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria public EnumDemonWillType getType(ItemStack willStack) { return EnumDemonWillType.values()[MathHelper.clamp(willStack.getMetadata(), 0, EnumDemonWillType.values().length - 1)]; } - - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (String name : NAMES) - ret.add(new ImmutablePair(NAMES.indexOf(name), "type=" + name)); - return ret; - } - - public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, NAMES.indexOf(name)); - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java new file mode 100644 index 00000000..457089df --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -0,0 +1,59 @@ +package WayofTime.bloodmagic.item; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.types.ISubItem; +import com.google.common.collect.Lists; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.List; + +public class ItemEnum & ISubItem> extends Item implements IVariantProvider { + + protected final T[] types; + + public ItemEnum(Class enumClass, String baseName) { + super(); + + this.types = enumClass.getEnumConstants(); + + setUnlocalizedName(BloodMagic.MODID + "." + baseName); + setHasSubtypes(types.length > 1); + setCreativeTab(BloodMagic.TAB_BM); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName(); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(CreativeTabs tab, NonNullList subItems) { + if (!isInCreativeTab(tab)) + return; + + for (T type : types) + subItems.add(new ItemStack(this, 1, type.ordinal())); + } + + public T getItemType(ItemStack stack) { + return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)]; + } + + @Override + public List> getVariants() { + List> variants = Lists.newArrayList(); + for (int i = 0; i < types.length; i++) + variants.add(Pair.of(i, "type=" + types[i].getInternalName())); + + return variants; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java new file mode 100644 index 00000000..c49aa09b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java @@ -0,0 +1,64 @@ +package WayofTime.bloodmagic.item.types; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public enum ComponentTypes implements ISubItem { + + REAGENT_WATER, + REAGENT_LAVA, + REAGENT_AIR, + REAGENT_FAST_MINER, + REAGENT_VOID, + REAGENT_GROWTH, + REAGENT_AFFINITY, + REAGENT_SIGHT, + REAGENT_BINDING, + REAGENT_SUPPRESSION, + FRAME_PART, + REAGENT_BLOOD_LIGHT, + REAGENT_MAGNETISM, + REAGENT_HASTE, + REAGENT_COMPRESSION, + REAGENT_BRIDGE, + REAGENT_SEVERANCE, + REAGENT_TELEPOSITION, + REAGENT_TRANSPOSITION, + SAND_IRON, + SAND_GOLD, + SAND_COAL, + PLANT_OIL, + SULFUR, + SALTPETER, + NEURO_TOXIN, + ANTISEPTIC, + REAGENT_HOLDING, + CATALYST_LENGTH_1, + CATALYST_POWER_1, + REAGENT_CLAW, + REAGENT_BOUNCE, + REAGENT_FROST, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack() { + return getStack(1); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal()); + } +} + diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java new file mode 100644 index 00000000..27204050 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java @@ -0,0 +1,19 @@ +package WayofTime.bloodmagic.item.types; + +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; + +public interface ISubItem { + + @Nonnull + String getInternalName(); + + @Nonnull + default ItemStack getStack() { + return getStack(1); + } + + @Nonnull + ItemStack getStack(int count); +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 2f244a80..58a55030 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -9,6 +9,7 @@ import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; import WayofTime.bloodmagic.apibutnotreally.registry.*; import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; @@ -17,7 +18,6 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemComponent; -import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.livingArmour.downgrade.*; @@ -176,7 +176,7 @@ public class ModRecipes { TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); + TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); @@ -216,11 +216,11 @@ public class ModRecipes { TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST)); + TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack()); + TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack()); + TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack()); + TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack()); + TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack()); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); diff --git a/src/main/resources/assets/bloodmagic/blockstates/component.json b/src/main/resources/assets/bloodmagic/blockstates/component.json index eb690f3b..898f699e 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/component.json +++ b/src/main/resources/assets/bloodmagic/blockstates/component.json @@ -6,117 +6,27 @@ }, "variants": { "type": { - "reagentwater": { - "textures": { - "layer0": "bloodmagic:items/ReagentWater" - } - }, - "reagentlava": { - "textures": { - "layer0": "bloodmagic:items/ReagentLava" - } - }, - "reagentair": { - "textures": { - "layer0": "bloodmagic:items/ReagentAir" - } - }, - "reagentfastminer": { - "textures": { - "layer0": "bloodmagic:items/ReagentFastMiner" - } - }, - "reagentvoid": { - "textures": { - "layer0": "bloodmagic:items/ReagentVoid" - } - }, - "reagentgrowth": { - "textures": { - "layer0": "bloodmagic:items/ReagentGrowth" - } - }, - "reagentaffinity": { - "textures": { - "layer0": "bloodmagic:items/ReagentAffinity" - } - }, - "reagentsight": { - "textures": { - "layer0": "bloodmagic:items/ReagentSight" - } - }, - "reagentbinding": { - "textures": { - "layer0": "bloodmagic:items/ReagentBinding" - } - }, - "reagentsuppression": { - "textures": { - "layer0": "bloodmagic:items/ReagentSuppression" - } - }, - "frameparts": { + "frame_part": { "textures": { "layer0": "bloodmagic:items/ComponentFrameParts" } }, - "reagentbloodlight": { - "textures": { - "layer0": "bloodmagic:items/ReagentBloodLight" - } - }, - "reagentmagnetism": { - "textures": { - "layer0": "bloodmagic:items/ReagentMagnetism" - } - }, - "reagenthaste": { - "textures": { - "layer0": "bloodmagic:items/ReagentHaste" - } - }, - "reagentcompression": { - "textures": { - "layer0": "bloodmagic:items/ReagentCompression" - } - }, - "reagentbridge": { - "textures": { - "layer0": "bloodmagic:items/ReagentBridge" - } - }, - "reagentseverance": { - "textures": { - "layer0": "bloodmagic:items/ReagentSeverance" - } - }, - "reagentteleposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTeleposition" - } - }, - "reagenttransposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTransposition" - } - }, - "ironsand": { + "sand_iron": { "textures": { "layer0": "bloodmagic:items/IronSand" } }, - "goldsand": { + "sand_gold": { "textures": { "layer0": "bloodmagic:items/GoldSand" } }, - "coalsand": { + "sand_coal": { "textures": { "layer0": "bloodmagic:items/CoalSand" } }, - "plantoil": { + "plant_oil": { "textures": { "layer0": "bloodmagic:items/PlantOil" } @@ -131,7 +41,7 @@ "layer0": "bloodmagic:items/Saltpeter" } }, - "neurotoxin": { + "neuro_toxin": { "textures": { "layer0": "bloodmagic:items/NeuroToxin" } @@ -141,32 +51,122 @@ "layer0": "bloodmagic:items/Antiseptic" } }, - "reagentholding": { - "textures": { - "layer0": "bloodmagic:items/ReagentHolding" - } - }, - "mundanelength": { + "catalyst_length_1": { "textures": { "layer0": "bloodmagic:items/MundaneLengtheningCatalyst" } }, - "mundanepower": { + "catalyst_power_1": { "textures": { "layer0": "bloodmagic:items/MundanePowerCatalyst" } }, - "reagentclaw": { + "reagent_water": { + "textures": { + "layer0": "bloodmagic:items/ReagentWater" + } + }, + "reagent_lava": { + "textures": { + "layer0": "bloodmagic:items/ReagentLava" + } + }, + "reagent_air": { + "textures": { + "layer0": "bloodmagic:items/ReagentAir" + } + }, + "reagent_fast_miner": { + "textures": { + "layer0": "bloodmagic:items/ReagentFastMiner" + } + }, + "reagent_void": { + "textures": { + "layer0": "bloodmagic:items/ReagentVoid" + } + }, + "reagent_growth": { + "textures": { + "layer0": "bloodmagic:items/ReagentGrowth" + } + }, + "reagent_affinity": { + "textures": { + "layer0": "bloodmagic:items/ReagentAffinity" + } + }, + "reagent_sight": { + "textures": { + "layer0": "bloodmagic:items/ReagentSight" + } + }, + "reagent_binding": { + "textures": { + "layer0": "bloodmagic:items/ReagentBinding" + } + }, + "reagent_suppression": { + "textures": { + "layer0": "bloodmagic:items/ReagentSuppression" + } + }, + "reagent_blood_light": { + "textures": { + "layer0": "bloodmagic:items/ReagentBloodLight" + } + }, + "reagent_magnetism": { + "textures": { + "layer0": "bloodmagic:items/ReagentMagnetism" + } + }, + "reagent_haste": { + "textures": { + "layer0": "bloodmagic:items/ReagentHaste" + } + }, + "reagent_compression": { + "textures": { + "layer0": "bloodmagic:items/ReagentCompression" + } + }, + "reagent_bridge": { + "textures": { + "layer0": "bloodmagic:items/ReagentBridge" + } + }, + "reagent_severance": { + "textures": { + "layer0": "bloodmagic:items/ReagentSeverance" + } + }, + "reagent_teleposition": { + "textures": { + "layer0": "bloodmagic:items/ReagentTeleposition" + } + }, + "reagent_transposition": { + "textures": { + "layer0": "bloodmagic:items/ReagentTransposition" + } + }, + "reagent_holding": { + "textures": { + "layer0": "bloodmagic:items/ReagentHolding" + } + }, + "reagent_claw": { "textures": { "layer0": "bloodmagic:items/ReagentClaw" } }, - "reagentbounce": { + "reagent_bounce": { "textures": { "layer0": "bloodmagic:items/ReagentBounce" } }, - "reagentfrost": { + "reagent_frost": { "textures": { "layer0": "bloodmagic:items/ReagentFrost" } diff --git a/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json b/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json index 0d65d0c3..cfa5e17c 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json @@ -6,27 +6,27 @@ }, "variants": { "type": { - "crystaldefault": { + "default": { "textures": { "layer0": "bloodmagic:items/DefaultCrystal" } }, - "crystalcorrosive": { + "corrosive": { "textures": { "layer0": "bloodmagic:items/CorrosiveCrystal" } }, - "crystalvengeful": { + "vengeful": { "textures": { "layer0": "bloodmagic:items/VengefulCrystal" } }, - "crystaldestructive": { + "destructive": { "textures": { "layer0": "bloodmagic:items/DestructiveCrystal" } }, - "crystalsteadfast": { + "steadfast": { "textures": { "layer0": "bloodmagic:items/SteadfastCrystal" } From 59f171ca5b58a7c387a881635a1f71932b4eaebb Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 19:00:15 -0800 Subject: [PATCH 045/493] Forgot lang --- .../assets/bloodmagic/lang/en_US.lang | 73 +++++++++---------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 1c8ac9bf..b4ea222e 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -66,52 +66,49 @@ item.bloodmagic.reagent.potentia.name=Potentia item.bloodmagic.bloodShard.weak.name=Weak Blood Shard item.bloodmagic.bloodShard.demon.name=Demon Blood Shard -item.bloodmagic.baseComponent.reagentWater.name=Water Reagent -item.bloodmagic.baseComponent.reagentLava.name=Lava Reagent -item.bloodmagic.baseComponent.reagentAir.name=Air Reagent -item.bloodmagic.baseComponent.reagentFastMiner.name=Mining Reagent -item.bloodmagic.baseComponent.reagentVoid.name=Void Reagent -item.bloodmagic.baseComponent.reagentGrowth.name=Growth Reagent -item.bloodmagic.baseComponent.reagentAffinity.name=Elemental Affinity Reagent -item.bloodmagic.baseComponent.reagentSight.name=Sight Reagent -item.bloodmagic.baseComponent.reagentBinding.name=Binding Reagent -item.bloodmagic.baseComponent.reagentSuppression.name=Suppression Reagent -item.bloodmagic.baseComponent.frameParts.name=Frame Parts -item.bloodmagic.baseComponent.reagentBloodLight.name=Blood Lamp Reagent -item.bloodmagic.baseComponent.reagentMagnetism.name=Magnetism Reagent -item.bloodmagic.baseComponent.reagentHaste.name=Haste Reagent -item.bloodmagic.baseComponent.reagentBridge.name=Phantom Bridge Reagent -item.bloodmagic.baseComponent.reagentCompression.name=Compression Reagent -item.bloodmagic.baseComponent.reagentSeverance.name=Severance Reagent -item.bloodmagic.baseComponent.reagentHolding.name=Holding Reagent -item.bloodmagic.baseComponent.reagentClaw.name=Claw Reagent -item.bloodmagic.baseComponent.reagentBounce.name=Elasticity Reagent -item.bloodmagic.baseComponent.reagentFrost.name=Frost Reagent +item.bloodmagic.baseComponent.reagent_water.name=Water Reagent +item.bloodmagic.baseComponent.reagent_lava.name=Lava Reagent +item.bloodmagic.baseComponent.reagent_air.name=Air Reagent +item.bloodmagic.baseComponent.reagent_fast_miner.name=Mining Reagent +item.bloodmagic.baseComponent.reagent_void.name=Void Reagent +item.bloodmagic.baseComponent.reagent_growth.name=Growth Reagent +item.bloodmagic.baseComponent.reagent_affinity.name=Elemental Affinity Reagent +item.bloodmagic.baseComponent.reagent_sight.name=Sight Reagent +item.bloodmagic.baseComponent.reagent_binding.name=Binding Reagent +item.bloodmagic.baseComponent.reagent_suppression.name=Suppression Reagent +item.bloodmagic.baseComponent.reagent_blood_light.name=Blood Lamp Reagent +item.bloodmagic.baseComponent.reagent_magnetism.name=Magnetism Reagent +item.bloodmagic.baseComponent.reagent_haste.name=Haste Reagent +item.bloodmagic.baseComponent.reagent_bridge.name=Phantom Bridge Reagent +item.bloodmagic.baseComponent.reagent_compression.name=Compression Reagent +item.bloodmagic.baseComponent.reagent_severance.name=Severance Reagent +item.bloodmagic.baseComponent.reagent_holding.name=Holding Reagent +item.bloodmagic.baseComponent.reagent_claw.name=Claw Reagent +item.bloodmagic.baseComponent.reagent_bounce.name=Elasticity Reagent +item.bloodmagic.baseComponent.reagent_frost.name=Frost Reagent +item.bloodmagic.baseComponent.reagent_teleposition.name=Teleposition Reagent +item.bloodmagic.baseComponent.reagent_transposition.name=Transposition Reagent -item.bloodmagic.baseComponent.reagentTeleposition.name=Teleposition Reagent -item.bloodmagic.baseComponent.reagentTransposition.name=Transposition Reagent - -item.bloodmagic.baseComponent.ironSand.name=Iron Sand -item.bloodmagic.baseComponent.goldSand.name=Gold Sand -item.bloodmagic.baseComponent.coalSand.name=Coal Sand -item.bloodmagic.baseComponent.plantOil.name=Plant Oil +item.bloodmagic.baseComponent.frame_part.name=Frame Parts +item.bloodmagic.baseComponent.sand_iron.name=Iron Sand +item.bloodmagic.baseComponent.sand_gold.name=Gold Sand +item.bloodmagic.baseComponent.sand_coal.name=Coal Sand +item.bloodmagic.baseComponent.plant_oil.name=Plant Oil item.bloodmagic.baseComponent.sulfur.name=Sulfur item.bloodmagic.baseComponent.saltpeter.name=Saltpeter -item.bloodmagic.baseComponent.neurotoxin.name=Neuro Toxin +item.bloodmagic.baseComponent.neuro_toxin.name=Neuro Toxin item.bloodmagic.baseComponent.antiseptic.name=Antiseptic +item.bloodmagic.baseComponent.catalyst_length_1.name=Simple Lengthening Catalyst +item.bloodmagic.baseComponent.catalyst_power_1.name=Simple Power Catalyst item.bloodmagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid item.bloodmagic.cuttingFluid.explosive.name=Explosive Powder -item.bloodmagic.baseComponent.mundaneLength.name=Simple Lengthening Catalyst -item.bloodmagic.baseComponent.mundanePower.name=Simple Power Catalyst - - -item.bloodmagic.demonCrystal.crystalDefault.name=Demon Will Crystal -item.bloodmagic.demonCrystal.crystalCorrosive.name=Corrosive Will Crystal -item.bloodmagic.demonCrystal.crystalDestructive.name=Destructive Will Crystal -item.bloodmagic.demonCrystal.crystalVengeful.name=Vengeful Will Crystal -item.bloodmagic.demonCrystal.crystalSteadfast.name=Steadfast Will Crystal +item.bloodmagic.demonCrystal.default.name=Demon Will Crystal +item.bloodmagic.demonCrystal.corrosive.name=Corrosive Will Crystal +item.bloodmagic.demonCrystal.destructive.name=Destructive Will Crystal +item.bloodmagic.demonCrystal.vengeful.name=Vengeful Will Crystal +item.bloodmagic.demonCrystal.steadfast.name=Steadfast Will Crystal item.bloodmagic.monsterSoul.base.name=Demonic Will item.bloodmagic.monsterSoul.corrosive.name=Corrosive Demonic Will From d67ed054ff85540117819ab679927117e1aba102 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 19:18:29 -0800 Subject: [PATCH 046/493] New recipe registration API --- .../bloodmagic/api/IBloodMagicAPI.java | 10 +- .../api/IBloodMagicRecipeRegistrar.java | 22 ++ .../api/event/BloodMagicCraftedEvent.java | 49 ++++ .../bloodmagic/api/impl/BloodMagicAPI.java | 16 +- .../api/impl/BloodMagicCorePlugin.java | 5 + .../api/impl/BloodMagicRecipeRegistrar.java | 211 ++++++++++++++++++ .../api/impl/recipe/RecipeAlchemyTable.java | 59 +++++ .../api/impl/recipe/RecipeBloodAltar.java | 72 ++++++ .../api/impl/recipe/RecipeTartaricForge.java | 53 +++++ 9 files changed, 493 insertions(+), 4 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index a439d73e..daede4d1 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -3,6 +3,8 @@ package WayofTime.bloodmagic.api; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public interface IBloodMagicAPI { /** @@ -10,9 +12,13 @@ public interface IBloodMagicAPI { * * @return the active blacklist instance */ + @Nonnull IBloodMagicBlacklist getBlacklist(); - void setSacrificialValue(ResourceLocation entityId, int value); + @Nonnull + IBloodMagicRecipeRegistrar getRecipeRegistrar(); - void registerAltarComponent(IBlockState state, String componentType); + void setSacrificialValue(@Nonnull ResourceLocation entityId, int value); + + void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); } diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..07e25481 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.api; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public interface IBloodMagicRecipeRegistrar { + + void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); + + boolean removeBloodAltar(@Nonnull ItemStack input); + + void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); + + boolean removeAlchemyTable(@Nonnull ItemStack... input); + + void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); + + boolean removeTartaricForge(@Nonnull ItemStack... input); +} diff --git a/src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java new file mode 100644 index 00000000..507a3c30 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java @@ -0,0 +1,49 @@ +package WayofTime.bloodmagic.api.event; + +import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class BloodMagicCraftedEvent extends Event { + + private final boolean modifiable; + private ItemStack output; + + public BloodMagicCraftedEvent(ItemStack output, boolean modifiable) { + this.modifiable = modifiable; + this.output = output; + } + + public boolean isModifiable() { + return modifiable; + } + + public ItemStack getOutput() { + return output; + } + + public void setOutput(ItemStack output) { + if (isModifiable()) + this.output = output; + } + + /** + * Fired whenever a craft is completed in a BloodAltar. + *

+ * It is not cancelable, however you can modify the output stack. + */ + public static class Altar extends BloodMagicCraftedEvent { + + private final RecipeBloodAltar recipe; + + public Altar(RecipeBloodAltar recipe, ItemStack output) { + super(output, true); + + this.recipe = recipe; + } + + public RecipeBloodAltar getRecipe() { + return recipe; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index a8e9426e..353e8771 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -9,6 +9,7 @@ import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; import java.util.*; public class BloodMagicAPI implements IBloodMagicAPI { @@ -16,27 +17,36 @@ public class BloodMagicAPI implements IBloodMagicAPI { public static final BloodMagicAPI INSTANCE = new BloodMagicAPI(); private final BloodMagicBlacklist blacklist; + private final BloodMagicRecipeRegistrar recipeRegistrar; private final Map sacrificialValues; private final Multimap altarComponents; public BloodMagicAPI() { this.blacklist = new BloodMagicBlacklist(); + this.recipeRegistrar = new BloodMagicRecipeRegistrar(); this.sacrificialValues = Maps.newHashMap(); this.altarComponents = ArrayListMultimap.create(); } + @Nonnull @Override public BloodMagicBlacklist getBlacklist() { return blacklist; } + @Nonnull @Override - public void setSacrificialValue(ResourceLocation entityId, int value) { + public BloodMagicRecipeRegistrar getRecipeRegistrar() { + return recipeRegistrar; + } + + @Override + public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { sacrificialValues.put(entityId, value); } @Override - public void registerAltarComponent(IBlockState state, String componentType) { + public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { EnumAltarComponent component = EnumAltarComponent.NOTAIR; for (EnumAltarComponent type : EnumAltarComponent.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { @@ -48,10 +58,12 @@ public class BloodMagicAPI implements IBloodMagicAPI { altarComponents.put(component, state); } + @Nonnull public Map getSacrificialValues() { return ImmutableMap.copyOf(sacrificialValues); } + @Nonnull public List getComponentStates(EnumAltarComponent component) { return (List) altarComponents.get(component); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 659a87d6..1cfadc41 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -11,6 +11,7 @@ import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -60,6 +61,10 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (EnumBloodRune runeType : EnumBloodRune.values()) api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); + + RegistrarBloodMagicRecipes.registerAltarRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); } private static void handleConfigValues(IBloodMagicAPI api) { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..ce789e78 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -0,0 +1,211 @@ +package WayofTime.bloodmagic.api.impl; + +import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraftforge.common.crafting.CraftingHelper; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Set; + +public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { + + private final Set altarRecipes; + private final Set alchemyRecipes; + private final Set tartaricForgeRecipes; + + public BloodMagicRecipeRegistrar() { + this.altarRecipes = Sets.newHashSet(); + this.alchemyRecipes = Sets.newHashSet(); + this.tartaricForgeRecipes = Sets.newHashSet(); + } + + @Override + public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative."); + + altarRecipes.add(new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); + } + + @Override + public boolean removeBloodAltar(@Nonnull ItemStack input) { + Preconditions.checkNotNull(input, "input cannot be null."); + + return altarRecipes.remove(getBloodAltar(input)); + } + + @Override + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); + } + + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0])); + } + + public void addAlchemyTable(RecipeAlchemyTable recipe) { + alchemyRecipes.add(recipe); + } + + @Override + public boolean removeAlchemyTable(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return alchemyRecipes.remove(getAlchemyTable(Lists.newArrayList(input))); + } + + @Override + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); + } + + @Override + public boolean removeTartaricForge(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); + } + + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); + } + + @Nullable + public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + for (RecipeBloodAltar recipe : altarRecipes) + if (recipe.getInput().test(input)) + return recipe; + + return null; + } + + @Nullable + public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: + for (RecipeAlchemyTable recipe : alchemyRecipes) { + if (recipe.getInput().size() != input.size()) + continue; + + for (int i = 0; i < input.size(); i++) { + Ingredient ingredient = recipe.getInput().get(i); + if (!ingredient.apply(input.get(i))) + continue mainLoop; + } + + return recipe; + } + + return null; + } + + @Nullable + public RecipeTartaricForge getTartaricForge(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: + for (RecipeTartaricForge recipe : tartaricForgeRecipes) { + if (recipe.getInput().size() != input.size()) + continue; + + for (int i = 0; i < input.size(); i++) { + Ingredient ingredient = recipe.getInput().get(i); + if (!ingredient.apply(input.get(i))) + continue mainLoop; + } + + return recipe; + } + + return null; + } + + public Set getAltarRecipes() { + return ImmutableSet.copyOf(altarRecipes); + } + + public Set getAlchemyRecipes() { + return ImmutableSet.copyOf(alchemyRecipes); + } + + public Set getTartaricForgeRecipes() { + return ImmutableSet.copyOf(tartaricForgeRecipes); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java new file mode 100644 index 00000000..7fe572b0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java @@ -0,0 +1,59 @@ +package WayofTime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeAlchemyTable { + + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final int syphon; + @Nonnegative + private final int ticks; + @Nonnegative + private final int minimumTier; + + public RecipeAlchemyTable(@Nonnull NonNullList input, @Nonnull ItemStack output, int syphon, int ticks, int minimumTier) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + + this.input = input; + this.output = output; + this.syphon = syphon; + this.ticks = ticks; + this.minimumTier = minimumTier; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + public final int getSyphon() { + return syphon; + } + + public final int getTicks() { + return ticks; + } + + public final int getMinimumTier() { + return minimumTier; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java new file mode 100644 index 00000000..40f01944 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -0,0 +1,72 @@ +package WayofTime.bloodmagic.api.impl.recipe; + +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeBloodAltar { + + @Nonnull + private final Ingredient input; + @Nonnull + private final ItemStack output; + @Nonnull + private final EnumAltarTier minimumTier; + @Nonnegative + private final int syphon; + @Nonnegative + private final int consumeRate; + @Nonnegative + private final int drainRate; + + public RecipeBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkArgument(minimumTier <= EnumAltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); + + this.input = input; + this.output = output; + this.minimumTier = EnumAltarTier.values()[minimumTier]; + this.syphon = syphon; + this.consumeRate = consumeRate; + this.drainRate = drainRate; + } + + @Nonnull + public final Ingredient getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnull + public EnumAltarTier getMinimumTier() { + return minimumTier; + } + + @Nonnegative + public final int getSyphon() { + return syphon; + } + + @Nonnegative + public final int getConsumeRate() { + return consumeRate; + } + + @Nonnegative + public final int getDrainRate() { + return drainRate; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java new file mode 100644 index 00000000..96021cad --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java @@ -0,0 +1,53 @@ +package WayofTime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeTartaricForge { + + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final double minimumSouls; + @Nonnegative + private final double soulDrain; + + public RecipeTartaricForge(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + + this.input = input; + this.output = output; + this.minimumSouls = minimumSouls; + this.soulDrain = soulDrain; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnegative + public final double getMinimumSouls() { + return minimumSouls; + } + + @Nonnegative + public final double getSoulDrain() { + return soulDrain; + } +} From f8c734bc96e182634affe5cf97fd4be1b6a3f957 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 21:24:40 -0800 Subject: [PATCH 047/493] Implemented new Tranquility value API For quick compat, mods can now register a static state-based tranquility value for their blocks. More --- .../bloodmagic/api/IBloodMagicAPI.java | 3 +- .../api/IBloodMagicValueManager.java | 14 +++ .../bloodmagic/api/impl/BloodMagicAPI.java | 14 +-- .../api/impl/BloodMagicCorePlugin.java | 31 +++-- .../api/impl/BloodMagicValueManager.java | 56 +++++++++ .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../incense/EnumTranquilityType.java | 2 +- .../incense/IIncensePath.java | 2 +- .../incense/ITranquilityHandler.java | 2 +- .../incense/IncenseTranquilityRegistry.java | 2 +- .../incense/TranquilityHandlers.java | 107 ------------------ .../incense/TranquilityStack.java | 2 +- .../registry/ModTranquilityHandlers.java | 23 ++-- .../bloodmagic/tile/TileIncenseAltar.java | 8 +- 14 files changed, 125 insertions(+), 143 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/incense/EnumTranquilityType.java (70%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/incense/IIncensePath.java (89%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/incense/ITranquilityHandler.java (84%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/incense/IncenseTranquilityRegistry.java (94%) delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/incense/TranquilityStack.java (81%) diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index daede4d1..9346d415 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -18,7 +18,8 @@ public interface IBloodMagicAPI { @Nonnull IBloodMagicRecipeRegistrar getRecipeRegistrar(); - void setSacrificialValue(@Nonnull ResourceLocation entityId, int value); + @Nonnull + IBloodMagicValueManager getValueManager(); void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); } diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java new file mode 100644 index 00000000..63676ebb --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java @@ -0,0 +1,14 @@ +package WayofTime.bloodmagic.api; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public interface IBloodMagicValueManager { + + void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); + + void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value); +} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 353e8771..3a6ab28c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -18,13 +18,13 @@ public class BloodMagicAPI implements IBloodMagicAPI { private final BloodMagicBlacklist blacklist; private final BloodMagicRecipeRegistrar recipeRegistrar; - private final Map sacrificialValues; + private final BloodMagicValueManager valueManager; private final Multimap altarComponents; public BloodMagicAPI() { this.blacklist = new BloodMagicBlacklist(); this.recipeRegistrar = new BloodMagicRecipeRegistrar(); - this.sacrificialValues = Maps.newHashMap(); + this.valueManager = new BloodMagicValueManager(); this.altarComponents = ArrayListMultimap.create(); } @@ -40,9 +40,10 @@ public class BloodMagicAPI implements IBloodMagicAPI { return recipeRegistrar; } + @Nonnull @Override - public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { - sacrificialValues.put(entityId, value); + public BloodMagicValueManager getValueManager() { + return valueManager; } @Override @@ -58,11 +59,6 @@ public class BloodMagicAPI implements IBloodMagicAPI { altarComponents.put(component, state); } - @Nonnull - public Map getSacrificialValues() { - return ImmutableMap.copyOf(sacrificialValues); - } - @Nonnull public List getComponentStates(EnumAltarComponent component) { return (List) altarComponents.get(component); diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 1cfadc41..280caae4 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -6,6 +6,8 @@ import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; +import WayofTime.bloodmagic.incense.EnumTranquilityType; +import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; @@ -25,7 +27,8 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; public class BloodMagicCorePlugin implements IBloodMagicPlugin { @Override - public void register(IBloodMagicAPI api) { + public void register(IBloodMagicAPI apiInterface) { + BloodMagicAPI api = (BloodMagicAPI) apiInterface; // Add forced blacklistings api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); @@ -42,8 +45,22 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.getBlacklist().addWellOfSuffering(new ResourceLocation("armor_stand")); api.getBlacklist().addWellOfSuffering(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); - api.setSacrificialValue(new ResourceLocation("armor_stand"), 0); - api.setSacrificialValue(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), 0); + api.getValueManager().setSacrificialValue(new ResourceLocation("armor_stand"), 0); + api.getValueManager().setSacrificialValue(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), 0); + + api.getValueManager().setTranquility(Blocks.LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); + api.getValueManager().setTranquility(Blocks.FLOWING_LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); + api.getValueManager().setTranquility(Blocks.WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); + api.getValueManager().setTranquility(Blocks.FLOWING_WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); + api.getValueManager().setTranquility(RegistrarBloodMagicBlocks.LIFE_ESSENCE, new TranquilityStack(EnumTranquilityType.WATER, 1.5D)); + api.getValueManager().setTranquility(Blocks.NETHERRACK, new TranquilityStack(EnumTranquilityType.FIRE, 0.5D)); + api.getValueManager().setTranquility(Blocks.DIRT, new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25D)); + api.getValueManager().setTranquility(Blocks.FARMLAND, new TranquilityStack(EnumTranquilityType.EARTHEN, 1.0D)); + api.getValueManager().setTranquility(Blocks.POTATOES, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); + api.getValueManager().setTranquility(Blocks.CARROTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); + api.getValueManager().setTranquility(Blocks.WHEAT, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); + api.getValueManager().setTranquility(Blocks.NETHER_WART, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); + api.getValueManager().setTranquility(Blocks.BEETROOTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); handleConfigValues(api); @@ -62,9 +79,9 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { for (EnumBloodRune runeType : EnumBloodRune.values()) api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); - RegistrarBloodMagicRecipes.registerAltarRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); - RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); - RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(((BloodMagicAPI) api).getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerAltarRecipes(api.getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(api.getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(api.getRecipeRegistrar()); } private static void handleConfigValues(IBloodMagicAPI api) { @@ -73,7 +90,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { if (split.length != 2) // Not valid format continue; - api.setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); + api.getValueManager().setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); } for (String value : ConfigHandler.blacklist.teleposer) { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java new file mode 100644 index 00000000..8ceacc66 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java @@ -0,0 +1,56 @@ +package WayofTime.bloodmagic.api.impl; + +import WayofTime.bloodmagic.api.IBloodMagicValueManager; +import WayofTime.bloodmagic.incense.EnumTranquilityType; +import WayofTime.bloodmagic.incense.TranquilityStack; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import java.util.Map; + +public class BloodMagicValueManager implements IBloodMagicValueManager { + + private final Map sacrificial; + private final Map tranquility; + + public BloodMagicValueManager() { + this.sacrificial = Maps.newHashMap(); + this.tranquility = Maps.newHashMap(); + } + + @Override + public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { + sacrificial.put(entityId, value); + } + + @Override + public void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value) { + EnumTranquilityType tranquility = null; + for (EnumTranquilityType type : EnumTranquilityType.values()) { + if (type.name().equalsIgnoreCase(tranquilityType)) { + tranquility = type; + break; + } + } + + if (tranquility != null) + this.tranquility.put(state, new TranquilityStack(tranquility, value)); + } + + public void setTranquility(Block block, TranquilityStack tranquilityStack) { + for (IBlockState state : block.getBlockState().getValidStates()) + tranquility.put(state, tranquilityStack); + } + + public Map getSacrificial() { + return ImmutableMap.copyOf(sacrificial); + } + + public Map getTranquility() { + return ImmutableMap.copyOf(tranquility); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 35674e6e..553f791c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.incense.IIncensePath; +import WayofTime.bloodmagic.incense.IIncensePath; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumPath; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java b/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java similarity index 70% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java rename to src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java index af381ab7..c8f9adb8 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java +++ b/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.incense; +package WayofTime.bloodmagic.incense; public enum EnumTranquilityType { PLANT(), diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java b/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java rename to src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java index 5f75c546..fa747980 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.incense; +package WayofTime.bloodmagic.incense; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java rename to src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java index baee7500..6f4cef45 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.incense; +package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java rename to src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java index 24d04fb7..79d9c57f 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.incense; +package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java deleted file mode 100644 index 9fcad4b6..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java +++ /dev/null @@ -1,107 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.apibutnotreally.incense.EnumTranquilityType; -import WayofTime.bloodmagic.apibutnotreally.incense.ITranquilityHandler; -import WayofTime.bloodmagic.apibutnotreally.incense.TranquilityStack; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import net.minecraft.block.*; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class TranquilityHandlers { - - public static class Plant implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block instanceof BlockLeaves) { - return new TranquilityStack(EnumTranquilityType.PLANT, 1); - } - - return null; - } - } - - public static class Lava implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block == Blocks.LAVA || block == Blocks.FLOWING_LAVA) { - return new TranquilityStack(EnumTranquilityType.LAVA, 1.2); - } - - return null; - } - } - - public static class Fire implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block instanceof BlockFire) { - return new TranquilityStack(EnumTranquilityType.FIRE, 1); - } - - if (block == Blocks.NETHERRACK) { - return new TranquilityStack(EnumTranquilityType.FIRE, 0.5); - } - - return null; - } - } - - public static class Earth implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block == Blocks.DIRT) { - return new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25); - } - - if (block instanceof BlockGrass) { - return new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5); - } - - if (block == Blocks.FARMLAND) { - return new TranquilityStack(EnumTranquilityType.EARTHEN, 1); - } - - return null; - } - } - - public static class Crop implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block == Blocks.POTATOES || block == Blocks.CARROTS || block == Blocks.WHEAT || block == Blocks.NETHER_WART || block == Blocks.BEETROOTS) { - return new TranquilityStack(EnumTranquilityType.CROP, 1); - } - - return null; - } - } - - public static class Tree implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block instanceof BlockLog) { - return new TranquilityStack(EnumTranquilityType.TREE, 1); - } - - return null; - } - } - - public static class Water implements ITranquilityHandler { - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - if (block == Blocks.WATER || block == Blocks.FLOWING_WATER) { - return new TranquilityStack(EnumTranquilityType.WATER, 1); - } - - if (block == RegistrarBloodMagicBlocks.LIFE_ESSENCE) { - return new TranquilityStack(EnumTranquilityType.WATER, 1.5); - } - - return null; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java similarity index 81% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java rename to src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java index ff94b0b0..7dd3de54 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java +++ b/src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.incense; +package WayofTime.bloodmagic.incense; public class TranquilityStack { public final EnumTranquilityType type; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java index 2fa8e433..d4fd77b7 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java @@ -1,16 +1,21 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.apibutnotreally.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.incense.TranquilityHandlers; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.incense.EnumTranquilityType; +import WayofTime.bloodmagic.incense.IncenseTranquilityRegistry; +import WayofTime.bloodmagic.incense.TranquilityStack; +import net.minecraft.block.BlockFire; +import net.minecraft.block.BlockGrass; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockLog; public class ModTranquilityHandlers { + public static void init() { - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Plant()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Crop()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Water()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Earth()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Fire()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Lava()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Tree()); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockLeaves ? new TranquilityStack(EnumTranquilityType.PLANT, 1.0D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockFire ? new TranquilityStack(EnumTranquilityType.FIRE, 1.0D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockGrass ? new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockLog ? new TranquilityStack(EnumTranquilityType.TREE, 1.0D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> BloodMagicAPI.INSTANCE.getValueManager().getTranquility().get(state)); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 26daca95..51afef15 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.incense.EnumTranquilityType; -import WayofTime.bloodmagic.apibutnotreally.incense.IIncensePath; -import WayofTime.bloodmagic.apibutnotreally.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.apibutnotreally.incense.TranquilityStack; +import WayofTime.bloodmagic.incense.EnumTranquilityType; +import WayofTime.bloodmagic.incense.IIncensePath; +import WayofTime.bloodmagic.incense.IncenseTranquilityRegistry; +import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.IncenseAltarHandler; From 50fd02b6aa5739c3fab4f10fb0a218e15d72e224 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 21:27:23 -0800 Subject: [PATCH 048/493] Missed some value manager references --- .../java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java | 2 +- .../java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index dce324db..eeeb2012 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -54,7 +54,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass()); if (entityEntry == null) return false; - int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), 25); + int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(entityEntry.getRegistryName(), 25); if (lifeEssenceRatio <= 0) return false; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index c9af292b..86eaf30a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -82,7 +82,7 @@ public class RitualWellOfSuffering extends Ritual { if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) continue; - int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), SACRIFICE_AMOUNT); + int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(entityEntry.getRegistryName(), SACRIFICE_AMOUNT); if (lifeEssenceRatio <= 0) continue; From 57591973a35c8047c4b5391c6732ddc794ca3372 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 21:40:50 -0800 Subject: [PATCH 049/493] Move Altar to new recipe API --- .../bloodmagic/altar/BloodAltar.java | 29 +++++---- .../core/RegistrarBloodMagicItems.java | 3 +- .../core/RegistrarBloodMagicRecipes.java | 62 +++++++++++++++++-- .../bloodmagic/registry/ModRecipes.java | 42 ------------- 4 files changed, 72 insertions(+), 64 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 37f49e00..2e94d54b 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,13 +1,12 @@ package WayofTime.bloodmagic.altar; +import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; +import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.apibutnotreally.BlockStack; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.altar.*; -import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockBloodRune; @@ -76,8 +75,7 @@ public class BloodAltar implements IFluidHandler { private int chargingFrequency = 0; private int maxCharge = 0; private int cooldownAfterCrafting = 60; - private AltarRecipe recipe; - private ItemStack result = ItemStack.EMPTY; + private RecipeBloodAltar recipe; private EnumAltarTier currentTierDisplayed = EnumAltarTier.ONE; public BloodAltar(TileAltar tileAltar) { @@ -187,18 +185,21 @@ public class BloodAltar implements IFluidHandler { if (!input.isEmpty()) { // Do recipes - AltarRecipe recipe = AltarRecipeRegistry.getRecipeForInput(input); + RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(input); if (recipe != null) { - if (recipe.doesRequiredItemMatch(input, altarTier)) { + if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) { this.isActive = true; this.recipe = recipe; - this.result = recipe.getOutput().isEmpty() ? ItemStack.EMPTY : new ItemStack(recipe.getOutput().getItem(), 1, recipe.getOutput().getMetadata()); this.liquidRequired = recipe.getSyphon(); - this.canBeFilled = recipe.isFillable(); this.consumptionRate = recipe.getConsumeRate(); this.drainRate = recipe.getDrainRate(); + this.canBeFilled = false; return; } + } else if (input.getItem() instanceof IBloodOrb) { + this.isActive = true; + this.canBeFilled = true; + return; } } @@ -311,13 +312,11 @@ public class BloodAltar implements IFluidHandler { if (hasOperated) { if (progress >= liquidRequired * stackSize) { - ItemStack result = this.result; + ItemStack result = recipe.getOutput().copy(); - if (!result.isEmpty()) - result.setCount(result.getCount() * stackSize); - - MinecraftForge.EVENT_BUS.post(new AltarCraftedEvent(recipe, result)); - tileAltar.setInventorySlotContents(0, result); + BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(recipe, result); + MinecraftForge.EVENT_BUS.post(event); + tileAltar.setInventorySlotContents(0, event.getOutput()); progress = 0; if (world instanceof WorldServer) { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index d12b7bce..dc216c97 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; +import WayofTime.bloodmagic.item.types.ComponentTypes; import com.google.common.collect.Lists; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; @@ -165,7 +166,7 @@ public class RegistrarBloodMagicItems { new ItemSigilClaw().setRegistryName("sigil_claw"), new ItemSigilBounce().setRegistryName("sigil_bounce"), new ItemSigilFrost().setRegistryName("sigil_frost"), - new ItemComponent().setRegistryName("component"), + new ItemEnum<>(ComponentTypes.class, "baseComponent").setRegistryName("component"), new ItemDemonCrystal().setRegistryName("item_demon_crystal"), new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_tome"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 46a42aee..5202a4d3 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -1,15 +1,27 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.soul.ItemSoulGem; +import WayofTime.bloodmagic.item.types.ComponentTypes; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.OreIngredient; import net.minecraftforge.oredict.ShapelessOreRecipe; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @@ -18,17 +30,55 @@ public class RegistrarBloodMagicRecipes { @SubscribeEvent public static void registerRecipes(RegistryEvent.Register event) { for (int i = 0; i < ItemSoulGem.names.length; i++) { - for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++) { + for (EnumDemonWillType willType : EnumDemonWillType.values()) { ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j); - - EnumDemonWillType willType = ((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack); ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); - ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, crystalStack); + ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); } } + + OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); + OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); + OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); + } + + public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { + // ONE + registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE.ordinal(), 2000, 2, 1); + registrar.addBloodAltar(new OreIngredient("stone"), new ItemStack(RegistrarBloodMagicItems.SLATE), EnumAltarTier.ONE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), EnumAltarTier.ONE.ordinal(), 1000, 5, 0); + registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE.ordinal(), 1000, 20, 0); + + // TWO + registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO.ordinal(), 5000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), EnumAltarTier.TWO.ordinal(), 2000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO.ordinal(), 3000, 5, 5); + + // THREE + registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE.ordinal(), 25000, 20, 20); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), EnumAltarTier.THREE.ordinal(), 5000, 15, 10); + registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE.ordinal(), 10000, 20, 10); + + // FOUR + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR.ordinal(), 25000, 30, 50); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR.ordinal(), 15000, 20, 20); + registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR.ordinal(), 2000, 20, 10); + registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR.ordinal(), 2000, 10, 10); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR.ordinal(), 10000, 20, 10); + + // FIVE + registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE.ordinal(), 80000, 50, 100); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE.ordinal(), 30000, 40, 100); + + // SIX + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 58a55030..df3172e8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -2,13 +2,11 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; import WayofTime.bloodmagic.apibutnotreally.registry.*; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; @@ -35,7 +33,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; @@ -72,46 +69,7 @@ public class ModRecipes { } public static void addAltarRecipes() { - // ONE - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, RegistrarBloodMagic.ORB_WEAK.getCapacity(), 2, 1); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.DIAMOND), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, 2000, 2, 1)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.STONE), new ItemStack(RegistrarBloodMagicItems.SLATE), EnumAltarTier.ONE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BUCKET), new ItemStack(ForgeModContainer.getInstance().universalBucket), EnumAltarTier.ONE, 1000, 5, 0)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE, 1000, 20, 0)); - // TWO - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO, RegistrarBloodMagic.ORB_APPRENTICE.getCapacity(), 5, 5); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.REDSTONE_BLOCK), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO, 5000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), EnumAltarTier.TWO, 2000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO, 3000, 5, 5)); - - // THREE - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE, RegistrarBloodMagic.ORB_MAGICIAN.getCapacity(), 15, 15); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GOLD_BLOCK), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE, 25000, 20, 20)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), EnumAltarTier.THREE, 5000, 15, 10)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.OBSIDIAN), EnumRuneType.EARTH.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.LAPIS_BLOCK), EnumRuneType.WATER.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.MAGMA_CREAM), EnumRuneType.FIRE.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.GHAST_TEAR), EnumRuneType.AIR.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE, 10000, 20, 10)); - - // FOUR - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR, RegistrarBloodMagic.ORB_MASTER.getCapacity(), 25, 25); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR, 25000, 30, 50)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR, 15000, 20, 20)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.COAL_BLOCK), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR, 2000, 20, 10)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR, 2000, 10, 10)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR, 10000, 20, 10)); - - // FIVE - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE, RegistrarBloodMagic.ORB_ARCHMAGE.getCapacity(), 50, 50); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE, 80000, 50, 100)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE, 30000, 40, 100)); - - // SIX - AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX, RegistrarBloodMagic.ORB_TRANSCENDENT.getCapacity(), 50, 50); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX, 200000, 100, 200)); - AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GLOWSTONE), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX, 200000, 100, 200)); } public static void addAlchemyArrayRecipes() { From 80e7b50ddeb30af747d56b8eef644c1ca25a291b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Feb 2018 22:17:06 -0800 Subject: [PATCH 050/493] Move Soul Forge to new recipe API --- .../api/impl/BloodMagicRecipeRegistrar.java | 6 +- .../core/RegistrarBloodMagicRecipes.java | 58 +++++++++++++++++++ .../bloodmagic/tile/TileSoulForge.java | 25 ++++---- 3 files changed, 74 insertions(+), 15 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index ce789e78..9e23a462 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -186,8 +186,12 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { continue; for (int i = 0; i < input.size(); i++) { + boolean matched = false; Ingredient ingredient = recipe.getInput().get(i); - if (!ingredient.apply(input.get(i))) + if (ingredient.apply(input.get(i))) + matched = true; + + if (!matched) continue mainLoop; } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 5202a4d3..e0d3d6e3 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -7,8 +7,10 @@ import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; +import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentTypes; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -81,4 +83,60 @@ public class RegistrarBloodMagicRecipes { registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); } + + public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); + registrar.addTartaricForge(ComponentTypes.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); + registrar.addTartaricForge(ComponentTypes.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); + registrar.addTartaricForge(ComponentTypes.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); + registrar.addTartaricForge(ComponentTypes.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); + registrar.addTartaricForge(ComponentTypes.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); + registrar.addTartaricForge(ComponentTypes.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); + registrar.addTartaricForge(ComponentTypes.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); + registrar.addTartaricForge(ComponentTypes.REAGENT_FAST_MINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); + registrar.addTartaricForge(ComponentTypes.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); + registrar.addTartaricForge(ComponentTypes.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); + registrar.addTartaricForge(ComponentTypes.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); + registrar.addTartaricForge(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); + registrar.addTartaricForge(ComponentTypes.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); + registrar.addTartaricForge(ComponentTypes.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); + registrar.addTartaricForge(ComponentTypes.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); + registrar.addTartaricForge(ComponentTypes.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); + registrar.addTartaricForge(ComponentTypes.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); + registrar.addTartaricForge(ComponentTypes.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); + registrar.addTartaricForge(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); + registrar.addTartaricForge(ComponentTypes.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addTartaricForge(ComponentTypes.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); + registrar.addTartaricForge(ComponentTypes.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); + + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); + + registrar.addTartaricForge(ComponentTypes.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack()); + + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); + } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index fd066671..b9055639 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; @@ -73,20 +73,18 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil List inputList = new ArrayList(); - for (int i = 0; i < 4; i++) { - if (!getStackInSlot(i).isEmpty()) { + for (int i = 0; i < 4; i++) + if (!getStackInSlot(i).isEmpty()) inputList.add(getStackInSlot(i)); - } - } - TartaricForgeRecipe recipe = TartaricForgeRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); + RecipeTartaricForge recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForge(inputList); if (recipe != null && (soulsInGem >= recipe.getMinimumSouls() || burnTime > 0)) { if (canCraft(recipe)) { burnTime++; if (burnTime == ticksRequired) { if (!getWorld().isRemote) { - double requiredSouls = recipe.getSoulsDrained(); + double requiredSouls = recipe.getSoulDrain(); if (requiredSouls > 0) { if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) { consumeSouls(EnumDemonWillType.DEFAULT, requiredSouls); @@ -113,12 +111,11 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil return ((double) burnTime) / ticksRequired; } - private boolean canCraft(TartaricForgeRecipe recipe) { - if (recipe == null) { + private boolean canCraft(RecipeTartaricForge recipe) { + if (recipe == null) return false; - } - ItemStack outputStack = recipe.getRecipeOutput(); + ItemStack outputStack = recipe.getOutput(); ItemStack currentOutputStack = getStackInSlot(outputSlot); if (outputStack.isEmpty()) return false; @@ -131,9 +128,9 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil } - public void craftItem(TartaricForgeRecipe recipe) { + public void craftItem(RecipeTartaricForge recipe) { if (this.canCraft(recipe)) { - ItemStack outputStack = recipe.getRecipeOutput(); + ItemStack outputStack = recipe.getOutput(); ItemStack currentOutputStack = getStackInSlot(outputSlot); if (currentOutputStack.isEmpty()) { From e3cef5ee762640e1db15dc1e3f851eb19c30325a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 7 Feb 2018 17:02:53 -0800 Subject: [PATCH 051/493] Add support for being in the mood to run on dedicated servers (#1211) --- .../WayofTime/bloodmagic/util/handler/event/ClientHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 2719671e..caa081bd 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -50,7 +50,7 @@ import org.lwjgl.opengl.GL11; import java.util.*; -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Side.CLIENT) @SideOnly(Side.CLIENT) public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. From 2d3f86aaf8149ab4dc39231283becec52359356e Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 7 Feb 2018 18:46:18 -0800 Subject: [PATCH 052/493] Fixup Soul Forge crafting --- .../WayofTime/bloodmagic/tile/TileSoulForge.java | 15 +++++++-------- .../tile/container/ContainerSoulForge.java | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index b9055639..64d7fde1 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -11,6 +11,7 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; +import net.minecraftforge.items.ItemHandlerHelper; import java.util.ArrayList; import java.util.List; @@ -115,28 +116,26 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil if (recipe == null) return false; - ItemStack outputStack = recipe.getOutput(); ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (outputStack.isEmpty()) + if (recipe.getOutput().isEmpty()) return false; if (currentOutputStack.isEmpty()) return true; - if (!currentOutputStack.isItemEqual(outputStack)) + if (!currentOutputStack.isItemEqual(recipe.getOutput())) return false; - int result = currentOutputStack.getCount() + outputStack.getCount(); + int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); } public void craftItem(RecipeTartaricForge recipe) { if (this.canCraft(recipe)) { - ItemStack outputStack = recipe.getOutput(); ItemStack currentOutputStack = getStackInSlot(outputSlot); if (currentOutputStack.isEmpty()) { - setInventorySlotContents(outputSlot, outputStack); - } else if (currentOutputStack.getItem() == currentOutputStack.getItem()) { - currentOutputStack.grow(outputStack.getCount()); + setInventorySlotContents(outputSlot, recipe.getOutput().copy()); + } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, recipe.getOutput())) { + currentOutputStack.grow(recipe.getOutput().getCount()); } consumeInventory(); diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index bd82760e..37973d53 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -17,8 +17,8 @@ public class ContainerSoulForge extends Container { this.tileForge = tileForge; this.addSlotToContainer(new Slot(tileForge, 0, 8, 15)); this.addSlotToContainer(new Slot(tileForge, 1, 80, 15)); - this.addSlotToContainer(new Slot(tileForge, 2, 80, 87)); - this.addSlotToContainer(new Slot(tileForge, 3, 8, 87)); + this.addSlotToContainer(new Slot(tileForge, 2, 8, 87)); + this.addSlotToContainer(new Slot(tileForge, 3, 80, 87)); this.addSlotToContainer(new SlotSoul(tileForge, TileSoulForge.soulSlot, 152, 51)); this.addSlotToContainer(new SlotOutput(tileForge, TileSoulForge.outputSlot, 44, 51)); From 9f6a4983a6f13cf1bdc49a5f8082d83ac19a3546 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 7 Feb 2018 21:45:40 -0800 Subject: [PATCH 053/493] Update JEI compat for Forge and Altar --- ...icPlugin.java => BloodMagicJEIPlugin.java} | 22 +++++---- .../AlchemyArrayCraftingCategory.java | 4 +- .../AlchemyTableRecipeCategory.java | 6 +-- .../alchemyTable/AlchemyTableRecipeJEI.java | 4 +- .../compat/jei/altar/AltarRecipeCategory.java | 20 ++++----- .../compat/jei/altar/AltarRecipeHandler.java | 31 ------------- .../compat/jei/altar/AltarRecipeJEI.java | 25 ++++++----- .../compat/jei/altar/AltarRecipeMaker.java | 45 ------------------- .../ArmourDowngradeRecipeCategory.java | 6 +-- .../ArmourDowngradeRecipeJEI.java | 4 +- .../jei/binding/BindingRecipeCategory.java | 4 +- .../forge/TartaricForgeRecipeCategory.java | 30 +++++-------- .../jei/forge/TartaricForgeRecipeHandler.java | 31 ------------- .../jei/forge/TartaricForgeRecipeJEI.java | 41 ++++++++--------- .../jei/forge/TartaricForgeRecipeMaker.java | 21 --------- ...dMagic.java => BloodMagicHwylaPlugin.java} | 3 +- 16 files changed, 80 insertions(+), 217 deletions(-) rename src/main/java/WayofTime/bloodmagic/compat/jei/{BloodMagicPlugin.java => BloodMagicJEIPlugin.java} (84%) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java rename src/main/java/WayofTime/bloodmagic/compat/waila/{WailaPluginBloodMagic.java => BloodMagicHwylaPlugin.java} (96%) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java rename to src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index dca1919e..8a0ed800 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.compat.jei; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; @@ -9,10 +12,10 @@ import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHa import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeMaker; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeHandler; +import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeMaker; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeHandler; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeMaker; +import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeCategory; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeHandler; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeMaker; @@ -20,8 +23,7 @@ import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeCategory; import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeHandler; import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeMaker; import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeHandler; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeMaker; +import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeJEI; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import mezz.jei.api.*; @@ -32,7 +34,7 @@ import javax.annotation.Nonnull; import java.util.Map; @JEIPlugin -public class BloodMagicPlugin extends BlankModPlugin { +public class BloodMagicJEIPlugin extends BlankModPlugin { public static IJeiHelpers jeiHelper; @Override @@ -40,18 +42,20 @@ public class BloodMagicPlugin extends BlankModPlugin { jeiHelper = registry.getJeiHelpers(); registry.addRecipeHandlers( - new AltarRecipeHandler(), new BindingRecipeHandler(), new AlchemyArrayCraftingRecipeHandler(), - new TartaricForgeRecipeHandler(), new AlchemyTableRecipeHandler(), new ArmourDowngradeRecipeHandler() ); - registry.addRecipes(AltarRecipeMaker.getRecipes()); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(), Constants.Compat.JEI_CATEGORY_ALTAR); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(), Constants.Compat.JEI_CATEGORY_SOULFORGE); + + registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); + registry.handleRecipes(RecipeTartaricForge.class, TartaricForgeRecipeJEI::new, Constants.Compat.JEI_CATEGORY_SOULFORGE); + registry.addRecipes(BindingRecipeMaker.getRecipes()); registry.addRecipes(AlchemyArrayCraftingRecipeMaker.getRecipes()); - registry.addRecipes(TartaricForgeRecipeMaker.getRecipes()); registry.addRecipes(AlchemyTableRecipeMaker.getRecipes()); registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index 9dddc706..dbb41825 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -22,7 +22,7 @@ public class AlchemyArrayCraftingCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyArrayCrafting"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index 64058d7a..53d792a2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -22,14 +22,14 @@ public class AlchemyTableRecipeCategory extends BlankRecipeCategory> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); ingredients.setInputLists(ItemStack.class, expanded); ingredients.setOutput(ItemStack.class, recipe.getRecipeOutput(Lists.newArrayList())); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 2701f7d5..69515377 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -2,13 +2,12 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -16,14 +15,12 @@ import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class AltarRecipeCategory implements IRecipeCategory { +public class AltarRecipeCategory implements IRecipeCategory { private static final int INPUT_SLOT = 0; private static final int OUTPUT_SLOT = 1; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65); - @Nonnull - private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.altar"); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65); @Nonnull @Override @@ -34,7 +31,7 @@ public class AltarRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getTitle() { - return localizedName; + return TextHelper.localize("jei.bloodmagic.recipe.altar"); } @Nonnull @@ -55,16 +52,15 @@ public class AltarRecipeCategory implements IRecipeCategory { } @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull AltarRecipeJEI recipeWrapper, @Nonnull IIngredients ingredients) { recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); - if (recipeWrapper instanceof AltarRecipeJEI) { - recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - } + recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); + recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); } + @Nonnull @Override public String getModName() { return BloodMagic.NAME; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java deleted file mode 100644 index c8955819..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import WayofTime.bloodmagic.apibutnotreally.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class AltarRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return AltarRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull AltarRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_ALTAR; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AltarRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AltarRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java index 36294a82..281e9b42 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -1,16 +1,17 @@ package WayofTime.bloodmagic.compat.jei.altar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import javax.annotation.Nonnull; import java.awt.Color; -import java.util.ArrayList; import java.util.List; public class AltarRecipeJEI implements IRecipeWrapper { @@ -23,13 +24,13 @@ public class AltarRecipeJEI implements IRecipeWrapper { private final int consumptionRate; private final int drainRate; - public AltarRecipeJEI(@Nonnull List input, @Nonnull ItemStack output, int tier, int requiredLP, int consumptionRate, int drainRate) { - this.input = input; - this.output = output; + public AltarRecipeJEI(RecipeBloodAltar recipe) { + this.input = NonNullList.from(ItemStack.EMPTY, recipe.getInput().getMatchingStacks()); + this.output = recipe.getOutput(); - this.infoString = new String[]{TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier)), TextHelper.localize("jei.bloodmagic.recipe.requiredLP", requiredLP)}; - this.consumptionRate = consumptionRate; - this.drainRate = drainRate; + this.infoString = new String[]{TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())), TextHelper.localize("jei.bloodmagic.recipe.requiredLP", recipe.getSyphon())}; + this.consumptionRate = recipe.getConsumeRate(); + this.drainRate = recipe.getDrainRate(); } @Override @@ -41,12 +42,12 @@ public class AltarRecipeJEI implements IRecipeWrapper { @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList(); + List tooltip = Lists.newArrayList(); if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) { - ret.add(TextHelper.localize("jei.bloodmagic.recipe.consumptionRate", consumptionRate)); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.drainRate", drainRate)); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.consumptionRate", consumptionRate)); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.drainRate", drainRate)); } - return ret; + return tooltip; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java deleted file mode 100644 index 41b2cd1c..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ /dev/null @@ -1,45 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class AltarRecipeMaker { - @Nonnull - public static List getRecipes() { - Map, AltarRecipeRegistry.AltarRecipe> altarMap = AltarRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList(); - - for (Map.Entry, AltarRecipeRegistry.AltarRecipe> itemStackAltarRecipeEntry : altarMap.entrySet()) { - // Make sure input is not a Blood Orb. If it is, the recipe is for a filling orb, and we don't want that. - if (!(itemStackAltarRecipeEntry.getKey().get(0).toStack().getItem() instanceof IBloodOrb)) { - List input = ItemStackWrapper.toStackList(itemStackAltarRecipeEntry.getValue().getInput()); - ItemStack output = itemStackAltarRecipeEntry.getValue().getOutput(); - int requiredTier = itemStackAltarRecipeEntry.getValue().getMinTier().toInt(); - int requiredLP = itemStackAltarRecipeEntry.getValue().getSyphon(); - int consumptionRate = itemStackAltarRecipeEntry.getValue().getConsumeRate(); - int drainRate = itemStackAltarRecipeEntry.getValue().getDrainRate(); - - if (output.getItem() == ForgeModContainer.getInstance().universalBucket && requiredLP == 1000) - output = FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)); - - AltarRecipeJEI recipe = new AltarRecipeJEI(input, output, requiredTier, requiredLP, consumptionRate, drainRate); - recipes.add(recipe); - } - } - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java index 28e67e3a..675eae1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -24,14 +24,14 @@ public class ArmourDowngradeRecipeCategory implements IRecipeCategory { private static final int INPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.armourDowngrade"); @Nonnull private final ICraftingGridHelper craftingGridHelper; public ArmourDowngradeRecipeCategory() { - craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); + craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); } @Nonnull diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java index 611cd8d8..e306b682 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; @@ -20,7 +20,7 @@ public class ArmourDowngradeRecipeJEI extends BlankRecipeWrapper { @Override public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); expanded.add(Lists.newArrayList(recipe.getKey())); ingredients.setInputLists(ItemStack.class, expanded); ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index 95e51d0e..8e0b0a76 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -22,7 +22,7 @@ public class BindingRecipeCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); @Nonnull private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.binding"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index a6a11a1c..81b69ce8 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.forge; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -10,7 +10,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -19,20 +18,18 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -public class TartaricForgeRecipeCategory implements IRecipeCategory { +public class TartaricForgeRecipeCategory implements IRecipeCategory { private static final int OUTPUT_SLOT = 0; private static final int GEM_SLOT = 1; private static final int INPUT_SLOT = 2; @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40); - @Nonnull - private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.soulForge"); + private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40); @Nonnull private final ICraftingGridHelper craftingGridHelper; public TartaricForgeRecipeCategory() { - craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); + craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); } @Nonnull @@ -44,7 +41,7 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getTitle() { - return localizedName; + return TextHelper.localize("jei.bloodmagic.recipe.soulForge"); } @Nonnull @@ -65,7 +62,7 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory { } @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull TartaricForgeRecipeJEI recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); guiItemStacks.init(OUTPUT_SLOT, false, 73, 13); @@ -79,18 +76,15 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory { } List> inputs = ingredients.getInputs(ItemStack.class); - List> outputs = ingredients.getOutputs(ItemStack.class); - if (recipeWrapper instanceof TartaricForgeRecipeJEI) { - TartaricForgeRecipeJEI recipe = (TartaricForgeRecipeJEI) recipeWrapper; - guiItemStacks.set(GEM_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); - inputs.remove(ingredients.getInputs(ItemStack.class).size() - 1); - guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - guiItemStacks.set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - craftingGridHelper.setInputs(guiItemStacks, inputs); - } + guiItemStacks.set(GEM_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); + inputs.remove(ingredients.getInputs(ItemStack.class).size() - 1); + guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); + guiItemStacks.set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); + craftingGridHelper.setInputs(guiItemStacks, inputs); } + @Nonnull @Override public String getModName() { return BloodMagic.NAME; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java deleted file mode 100644 index 9cd307ca..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import WayofTime.bloodmagic.apibutnotreally.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class TartaricForgeRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return TartaricForgeRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull TartaricForgeRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_SOULFORGE; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull TartaricForgeRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull TartaricForgeRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java index d1004898..16870613 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java @@ -1,22 +1,22 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; -public class TartaricForgeRecipeJEI extends BlankRecipeWrapper { - private TartaricForgeRecipe recipe; - private List validGems = new ArrayList(); +public class TartaricForgeRecipeJEI implements IRecipeWrapper { + private RecipeTartaricForge recipe; + private List validGems = Lists.newArrayList(); - public TartaricForgeRecipeJEI(TartaricForgeRecipe recipe) { + public TartaricForgeRecipeJEI(RecipeTartaricForge recipe) { this.recipe = recipe; for (DefaultWill will : DefaultWill.values()) @@ -25,33 +25,28 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper { } @Override - public void getIngredients(IIngredients ingredients) { - List> expandedInputs = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + public void getIngredients(@Nonnull IIngredients ingredients) { + List> expandedInputs = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); expandedInputs.add(validGems); ingredients.setInputLists(ItemStack.class, expandedInputs); - ingredients.setOutput(ItemStack.class, recipe.getRecipeOutput()); + ingredients.setOutput(ItemStack.class, recipe.getOutput()); } - @Nullable + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList(); + List tooltip = Lists.newArrayList(); if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34) { - ret.add(TextHelper.localize("jei.bloodmagic.recipe.minimumSouls", recipe.getMinimumSouls())); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.soulsDrained", recipe.getSoulsDrained())); - return ret; + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.minimumSouls", recipe.getMinimumSouls())); + tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.soulsDrained", recipe.getSoulDrain())); } - return null; + return tooltip; } - public TartaricForgeRecipe getRecipe() { + public RecipeTartaricForge getRecipe() { return recipe; } - public List getValidGems() { - return validGems; - } - public enum DefaultWill { SOUL(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL, 1, 0), 64), PETTY(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 0), 64), diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java deleted file mode 100644 index cea35588..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class TartaricForgeRecipeMaker { - @Nonnull - public static List getRecipes() { - List recipeList = TartaricForgeRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList(); - - for (TartaricForgeRecipe recipe : recipeList) - recipes.add(new TartaricForgeRecipeJEI(recipe)); - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index bafdcc27..f2c1ec2c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -9,7 +9,8 @@ import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.WailaPlugin; @WailaPlugin -public class WailaPluginBloodMagic implements IWailaPlugin { +public class BloodMagicHwylaPlugin implements IWailaPlugin { + @Override public void register(IWailaRegistrar registrar) { registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class); From 03fece58fa20e90bdf1d3e6bf7d267f2d0aa4596 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 8 Feb 2018 19:01:12 -0800 Subject: [PATCH 054/493] Rewrite Hwyla integration Now properly makes use of the API --- .../bloodmagic/apibutnotreally/Constants.java | 1 - .../compat/waila/BloodMagicHwylaPlugin.java | 36 +++++--- .../provider/DataProviderAlchemyArray.java | 41 ++++----- .../provider/DataProviderBloodAltar.java | 69 +++++++------- .../waila/provider/DataProviderBloodTank.java | 47 +++------- .../waila/provider/DataProviderMimic.java | 51 +++++----- .../DataProviderRitualController.java | 92 +++++++++---------- .../waila/provider/DataProviderTeleposer.java | 50 +++++----- .../assets/bloodmagic/lang/en_US.lang | 1 + 9 files changed, 187 insertions(+), 201 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java index 11d1830b..581a8fad 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java @@ -148,7 +148,6 @@ public class Constants { public static final String JEI_CATEGORY_ALCHEMYTABLE = BloodMagic.MODID + ":salchemyTable"; public static final String JEI_CATEGORY_ARMOURDOWNGRADE = BloodMagic.MODID + ":armourDowngrade"; - public static final String WAILA_CONFIG_BYPASS_SNEAK = BloodMagic.MODID + ".bypassSneak"; public static final String WAILA_CONFIG_ALTAR = BloodMagic.MODID + ".bloodAltar"; public static final String WAILA_CONFIG_TELEPOSER = BloodMagic.MODID + ".teleposer"; public static final String WAILA_CONFIG_RITUAL = BloodMagic.MODID + ".ritualController"; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index f2c1ec2c..c5908b25 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.compat.waila; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.block.*; import WayofTime.bloodmagic.compat.waila.provider.*; +import WayofTime.bloodmagic.tile.*; import mcp.mobius.waila.api.IWailaPlugin; import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.WailaPlugin; @@ -13,22 +13,30 @@ public class BloodMagicHwylaPlugin implements IWailaPlugin { @Override public void register(IWailaRegistrar registrar) { - registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class); - registrar.registerNBTProvider(new DataProviderBloodAltar(), BlockAltar.class); - registrar.registerBodyProvider(new DataProviderTeleposer(), BlockTeleposer.class); - registrar.registerBodyProvider(new DataProviderRitualController(), BlockRitualController.class); - registrar.registerBodyProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class); - registrar.registerBodyProvider(new DataProviderBloodTank(), BlockBloodTank.class); - registrar.registerNBTProvider(new DataProviderBloodTank(), BlockBloodTank.class); - registrar.registerStackProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class); - registrar.registerStackProvider(new DataProviderMimic(), BlockMimic.class); - registrar.registerNBTProvider(new DataProviderMimic(), BlockMimic.class); - - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false); + registrar.registerBodyProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); + registrar.registerNBTProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true); + + registrar.registerBodyProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); + registrar.registerNBTProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true); + + registrar.registerBodyProvider(DataProviderRitualController.INSTANCE, TileMasterRitualStone.class); + registrar.registerNBTProvider(DataProviderRitualController.INSTANCE, TileMasterRitualStone.class); + registrar.registerBodyProvider(DataProviderRitualController.INSTANCE, TileImperfectRitualStone.class); + registrar.registerNBTProvider(DataProviderRitualController.INSTANCE, TileImperfectRitualStone.class); registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true); + + registrar.registerBodyProvider(DataProviderBloodTank.INSTANCE, TileBloodTank.class); + registrar.registerNBTProvider(DataProviderBloodTank.INSTANCE, TileBloodTank.class); registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_BLOOD_TANK, true); + + registrar.registerStackProvider(DataProviderAlchemyArray.INSTANCE, TileAlchemyArray.class); + registrar.registerBodyProvider(DataProviderAlchemyArray.INSTANCE, TileAlchemyArray.class); + registrar.registerNBTProvider(DataProviderAlchemyArray.INSTANCE, TileAlchemyArray.class); + registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true); + + registrar.registerStackProvider(DataProviderMimic.INSTANCE, TileMimic.class); + registrar.registerNBTProvider(DataProviderMimic.INSTANCE, TileMimic.class); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index e3bd3c3e..3a38301f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -15,48 +15,41 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.List; public class DataProviderAlchemyArray implements IWailaDataProvider { + + public static final IWailaDataProvider INSTANCE = new DataProviderAlchemyArray(); + + @Nonnull @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextHelper.getFormattedText(RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName())); } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - + @Nonnull @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ARRAY)) return currenttip; - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) { - TileEntity tile = accessor.getTileEntity(); - if (tile instanceof TileAlchemyArray) { - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - if (!tileArray.getStackInSlot(0).isEmpty()) - currenttip.add(TextHelper.localize("waila.bloodmagic.array.reagent", tileArray.getStackInSlot(0).getDisplayName())); - - if (!tileArray.getStackInSlot(1).isEmpty()) - currenttip.add(TextHelper.localize("waila.bloodmagic.array.catalyst", tileArray.getStackInSlot(1).getDisplayName())); - } - } else { - currenttip.add(TextHelper.localizeEffect("waila.bloodmagic.sneak")); - } + if (accessor.getNBTData().hasKey("reagent")) + currenttip.add(TextHelper.localize("waila.bloodmagic.array.reagent", accessor.getNBTData().getString("reagent"))); + if (accessor.getNBTData().hasKey("catalyst")) + currenttip.add(TextHelper.localize("waila.bloodmagic.array.catalyst", accessor.getNBTData().getString("catalyst"))); return currenttip; } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - + @Nonnull @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { - return null; + TileAlchemyArray alchemyArray = (TileAlchemyArray) te; + if (!alchemyArray.getStackInSlot(0).isEmpty()) + tag.setString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); + if (!alchemyArray.getStackInSlot(1).isEmpty()) + tag.setString("catalyst", alchemyArray.getStackInSlot(1).getDisplayName()); + return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 57282503..e50f80cf 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.List; /** @@ -27,11 +28,35 @@ import java.util.List; * in ImLookingAtBlood by Pokefenn. */ public class DataProviderBloodAltar implements IWailaDataProvider { + + public static final IWailaDataProvider INSTANCE = new DataProviderBloodAltar(); + + @Nonnull @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) return currenttip; + if (accessor.getNBTData().hasKey("altar")) { + NBTTagCompound altarData = accessor.getNBTData().getCompoundTag("altar"); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInteger("tier"))); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInteger("capacity"))); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInteger("stored"))); + + if (altarData.hasKey("charge")) { + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", altarData.getInteger("progress") + "%")); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentCharge", altarData.getInteger("charge"))); + } + } + + return currenttip; + } + + @Nonnull + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + TileAltar altar = (TileAltar) te; + boolean hasSigil = false; boolean hasSeer = false; @@ -41,49 +66,31 @@ public class DataProviderBloodAltar implements IWailaDataProvider { break; } case SIGIL_HELD: { - hasSeer = holdingSeerSigil(accessor.getPlayer()); - hasSigil = hasSeer || holdingDivinationSigil(accessor.getPlayer()); + hasSeer = holdingSeerSigil(player); + hasSigil = hasSeer || holdingDivinationSigil(player); break; } case SIGIL_CONTAINED: { - hasSeer = hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), accessor.getPlayer()); - hasSigil = hasSeer || hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), accessor.getPlayer()); + hasSeer = hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), player); + hasSigil = hasSeer || hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), player); break; } } if (!hasSeer && !hasSigil) - return currenttip; + return tag; - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) { - if (accessor.getBlock() instanceof BlockAltar && accessor.getTileEntity() instanceof TileAltar) { - TileAltar altar = (TileAltar) accessor.getTileEntity(); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarTier", altar.getTier().toInt())); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altar.getCapacity())); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentEssence", altar.getCurrentBlood())); - - if (hasSeer) { - int charge = accessor.getNBTData().getCompoundTag("bloodAltar").getInteger(Constants.NBT.ALTAR_TOTAL_CHARGE); - int progress = accessor.getNBTData().getCompoundTag("bloodAltar").getInteger(Constants.NBT.ALTAR_PROGRESS); - int liquidRequired = accessor.getNBTData().getCompoundTag("bloodAltar").getInteger(Constants.NBT.ALTAR_LIQUID_REQ); - int craftAmount = 1; - if (accessor.getNBTData().getTagList("Items", 10).get(0).getId() == 10) - craftAmount = ((NBTTagCompound) accessor.getNBTData().getTagList("Items", 10).get(0)).getByte("Count"); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", (int) (((double) progress / (double) liquidRequired * 100) / craftAmount) + "%")); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentCharge", charge)); - } - } - } else { - currenttip.add(TextHelper.localizeEffect("waila.bloodmagic.sneak")); + NBTTagCompound altarData = new NBTTagCompound(); + altarData.setInteger("tier", altar.getTier().toInt()); + altarData.setInteger("capacity", altar.getCapacity()); + altarData.setInteger("stored", altar.getCurrentBlood()); + if (hasSeer) { + altarData.setInteger("progress", (int) (((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100) / altar.getStackInSlot(0).getCount())); + altarData.setInteger("charge", altar.getTotalCharge()); } - return currenttip; - } + tag.setTag("altar", altarData); - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { - if (te != null) - te.writeToNBT(tag); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index 1add88c3..477d2393 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.block.BlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -15,54 +14,38 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nonnull; import java.util.List; public class DataProviderBloodTank implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + public static final IWailaDataProvider INSTANCE = new DataProviderBloodTank(); + @Nonnull @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_BLOOD_TANK) && !config.getConfig("capability.tankinfo")) return currenttip; - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) { - if (accessor.getBlock() instanceof BlockBloodTank && accessor.getTileEntity() instanceof TileBloodTank) { - TileBloodTank bloodTank = (TileBloodTank) accessor.getTileEntity(); - NBTTagCompound tag = accessor.getNBTData(); - int capacity = accessor.getNBTData().getInteger(Constants.NBT.ALTAR_CAPACITY); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.tier", bloodTank.getBlockMetadata() + 1)); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.capacity", capacity)); - - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag(Constants.NBT.TANK)); - if (fluidStack != null) { - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.type", fluidStack.getLocalizedName())); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.amount", fluidStack.amount, capacity)); - } - } - } else { - currenttip.add(TextHelper.localizeEffect("waila.bloodmagic.sneak")); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.tier", accessor.getNBTData().getInteger("tier"))); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.capacity", accessor.getNBTData().getInteger("capacity"))); + if (accessor.getNBTData().hasKey("fluid")) { + FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(accessor.getNBTData().getCompoundTag("fluid")); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.type", fluidStack.getLocalizedName())); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.amount", fluidStack.amount, accessor.getNBTData().getInteger("capacity"))); } return currenttip; } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - + @Nonnull @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { - if (te != null) - te.writeToNBT(tag); + TileBloodTank tank = (TileBloodTank) te; + tag.setInteger("tier", tank.getBlockMetadata() + 1); + tag.setInteger("capacity", tank.capacity); + if (tank.getTank().getFluid() != null) + tag.setTag("fluid", tank.getTank().getFluid().writeToNBT(new NBTTagCompound())); return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java index 96594bde..3900f95e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java @@ -5,44 +5,53 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import javax.annotation.Nonnull; import java.util.List; public class DataProviderMimic implements IWailaDataProvider { + public static final IWailaDataProvider INSTANCE = new DataProviderMimic(); + + @Nonnull @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getNBTData().getBoolean("hasItem")) - return new ItemStack(accessor.getNBTData()); + if (accessor.getNBTData().hasKey("mimiced")) { + NBTTagCompound mimiced = accessor.getNBTData().getCompoundTag("mimiced"); + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(mimiced.getString("id"))); + int meta = mimiced.getInteger("data"); + ItemStack ret = new ItemStack(item, 1, meta); + if (mimiced.hasKey("nbt")) + ret.setTagCompound(mimiced.getCompoundTag("nbt")); - return new ItemStack(accessor.getBlock(), 1, accessor.getMetadata()); - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; + return ret; + } + + return ItemStack.EMPTY; } + @Nonnull @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { - if (te instanceof TileMimic && ((TileMimic) te).getStackInSlot(0) != null) { - tag.setBoolean("hasItem", true); - ((TileMimic) te).getStackInSlot(0).writeToNBT(tag); + TileMimic mimic = (TileMimic) te; + ItemStack mimiced = mimic.getStackInSlot(0); + if (!mimiced.isEmpty()) { + NBTTagCompound item = new NBTTagCompound(); + item.setString("id", mimiced.getItem().getRegistryName().toString()); + item.setInteger("data", mimiced.getMetadata()); + NBTTagCompound shareTag = mimiced.getItem().getNBTShareTag(mimiced); + if (shareTag != null) + item.setTag("nbt", shareTag); + + tag.setTag("mimiced", item); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index f60db24a..6769804e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -6,14 +6,12 @@ import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.block.BlockRitualController; -import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; +import joptsimple.internal.Strings; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -21,70 +19,64 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.List; public class DataProviderRitualController implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + public static final IWailaDataProvider INSTANCE = new DataProviderRitualController(); + @Nonnull @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_RITUAL)) return currenttip; - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) { - if (accessor.getBlock() instanceof BlockRitualController) { - int controllerMeta = accessor.getBlock().getMetaFromState(accessor.getBlockState()); - - if ((controllerMeta == 0 || controllerMeta == 2) && accessor.getTileEntity() instanceof TileMasterRitualStone) { - TileMasterRitualStone mrs = (TileMasterRitualStone) accessor.getTileEntity(); - - if (mrs.getCurrentRitual() != null && mrs.isActive()) { - currenttip.add(TextHelper.localizeEffect(mrs.getCurrentRitual().getUnlocalizedName())); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromUUID(mrs.getOwner()))); - if (!RitualRegistry.ritualEnabled(mrs.getCurrentRitual())) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); - } else { - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.deactivated")); - } - } - - if (controllerMeta == 1 && accessor.getTileEntity() instanceof TileImperfectRitualStone) { - if (accessor.getWorld().isAirBlock(accessor.getPosition().up())) { - Block up = accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock(); - int meta = up.getMetaFromState(accessor.getWorld().getBlockState(accessor.getPosition().up())); - BlockStack blockStack = new BlockStack(up, meta); - ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(blockStack); - - if (ritual != null) { - currenttip.add(TextHelper.localizeEffect(ritual.getUnlocalizedName())); - if (!ImperfectRitualRegistry.ritualEnabled(ritual)) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); - } - } - } - } + NBTTagCompound tag = accessor.getNBTData(); + if (tag.getBoolean("master")) { + if (tag.hasKey("ritual")) + currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); + if (tag.hasKey("owner")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", tag.getString("owner"))); + if (!tag.getBoolean("active")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.deactivated")); + if (!tag.getBoolean("enabled")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); } else { - currenttip.add(TextHelper.localizeEffect("waila.bloodmagic.sneak")); + if (tag.hasKey("ritual")) { + currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); + if (!tag.getBoolean("enabled")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); + } } return currenttip; } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - + @Nonnull @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { - return null; + + if (te instanceof TileMasterRitualStone) { + TileMasterRitualStone mrs = (TileMasterRitualStone) te; + tag.setBoolean("master", true); + if (mrs.getCurrentRitual() != null) { + tag.setString("ritual", mrs.getCurrentRitual().getUnlocalizedName()); + tag.setBoolean("active", mrs.isActive()); + if (!Strings.isNullOrEmpty(mrs.getOwner())) + tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); + tag.setBoolean("enabled", RitualRegistry.ritualEnabled(mrs.getCurrentRitual())); + } + } else { + tag.setBoolean("master", false); + + ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(BlockStack.getStackFromPos(world, pos.up())); + if (ritual != null) { + tag.setString("ritual", ritual.getUnlocalizedName()); + tag.setBoolean("enabled", ImperfectRitualRegistry.ritualEnabled(ritual)); + } + } + + return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index 2f7c4273..0463a22b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -11,54 +10,49 @@ import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; +import org.apache.commons.lang3.text.WordUtils; +import javax.annotation.Nonnull; import java.util.List; public class DataProviderTeleposer implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + public static final IWailaDataProvider INSTANCE = new DataProviderTeleposer(); + @Nonnull @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_TELEPOSER)) return currenttip; - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) { - if (accessor.getBlock() instanceof BlockTeleposer && accessor.getTileEntity() instanceof TileTeleposer) { - TileTeleposer teleposer = (TileTeleposer) accessor.getTileEntity(); - if (!teleposer.getStackInSlot(0).isEmpty()) { - ItemStack contained = teleposer.getStackInSlot(0); - BlockPos toPos = ((ItemTelepositionFocus) contained.getItem()).getBlockPos(contained); - int dimensionID = contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID); + if (accessor.getNBTData().hasKey("focus")) { + NBTTagCompound focusData = accessor.getNBTData().getCompoundTag("focus"); + BlockPos boundPos = NBTUtil.getPosFromTag(focusData.getCompoundTag("pos")); + int boundDim = focusData.getInteger("dim"); + String dimName = WordUtils.capitalizeFully(DimensionManager.getProviderType(boundDim).getName().replace("_", " ")); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", toPos.getX(), toPos.getY(), toPos.getZ())); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", dimensionID)); - } - } - } else { - currenttip.add(TextHelper.localizeEffect("waila.bloodmagic.sneak")); + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.bound", dimName, boundPos.getX(), boundPos.getY(), boundPos.getZ())); } return currenttip; } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { - return null; + TileTeleposer teleposer = (TileTeleposer) te; + ItemStack contained = teleposer.getStackInSlot(0); + if (!contained.isEmpty() && contained.hasTagCompound()) { + ItemTelepositionFocus focus = (ItemTelepositionFocus) contained.getItem(); + NBTTagCompound focusData = new NBTTagCompound(); + focusData.setTag("pos", NBTUtil.createPosTag(focus.getBlockPos(contained))); + focusData.setInteger("dim", contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); + tag.setTag("focus", focusData); + } + return tag; } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index b4ea222e..3482c754 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -469,6 +469,7 @@ tooltip.bloodmagic.arcaneAshes=Ashes used to draw an alchemy circle tooltip.bloodmagic.telepositionFocus.coords=Current coordinates: (%d, %d, %d) tooltip.bloodmagic.telepositionFocus.dimension=Dimension ID: %d +tooltip.bloodmagic.telepositionFocus.bound=Bound: %s at %d, %d, %d tooltip.bloodmagic.telepositionFocus.weak=Used to move blocks in the world tooltip.bloodmagic.telepositionFocus.enhanced=Used to move blocks in the world tooltip.bloodmagic.telepositionFocus.reinforced=Used to move blocks in the world From aa5bf185526c00d34179e911892d851ac868f63c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 00:09:04 -0800 Subject: [PATCH 055/493] Fix version replacement --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 27fe1311..b11e08ca 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ minecraft { runDir = "run" replace "@VERSION@", project.version - replaceIn "Constants.java" + replaceIn "BloodMagic.java" clientRunArgs += "--username=${username}" From 47482b6add064ef87f13cf1b499ba5fd2bbc63ab Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 00:39:04 -0800 Subject: [PATCH 056/493] Javadoc the new API --- .../bloodmagic/api/BloodMagicPlugin.java | 4 ++ .../bloodmagic/api/IBloodMagicAPI.java | 34 +++++++++++-- .../bloodmagic/api/IBloodMagicBlacklist.java | 35 ++++++++++--- .../bloodmagic/api/IBloodMagicPlugin.java | 9 ++++ .../api/IBloodMagicRecipeRegistrar.java | 51 +++++++++++++++++++ .../api/IBloodMagicValueManager.java | 28 ++++++++++ .../api/impl/BloodMagicBlacklist.java | 3 -- .../api/impl/BloodMagicCorePlugin.java | 2 +- 8 files changed, 152 insertions(+), 14 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java index 04907dfa..0d2bf397 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java @@ -5,6 +5,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * This annotation lets Blood Magic detect mod plugins. + * All {@link IBloodMagicPlugin} must have this annotation and a constructor with no arguments. + */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface BloodMagicPlugin { diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 9346d415..8817dd25 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -1,25 +1,53 @@ package WayofTime.bloodmagic.api; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; +/** + * The main interface between a plugin and Blood Magic's internals. + */ public interface IBloodMagicAPI { /** - * Retrieves the instance of the blacklisting system that Blood Magic uses. + * Retrieves the instance of the blacklist. * - * @return the active blacklist instance + * @return the active {@link IBloodMagicBlacklist} instance */ @Nonnull IBloodMagicBlacklist getBlacklist(); + /** + * Retrieves the instance of the recipe registrar. + * + * @return the active {@link IBloodMagicRecipeRegistrar} instance + */ @Nonnull IBloodMagicRecipeRegistrar getRecipeRegistrar(); + /** + * Retrieves the instance of the value manager. + * + * @return the active {@link IBloodMagicValueManager} instance + */ @Nonnull IBloodMagicValueManager getValueManager(); + /** + * Registers an {@link IBlockState} as a given component for the Blood Altar. + * + * Valid component types: + *

    + *
  • GLOWSTONE
    • + *
  • BLOODSTONE
    • + *
  • BEACON
    • + *
  • BLOODRUNE
    • + *
  • CRYSTAL
    • + *
  • NOTAIR
    • + *
+ * + * @param state The state to register + * @param componentType The type of Blood Altar component to register as. + */ void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); } diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java index 64ba641f..e99c1609 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java @@ -1,26 +1,47 @@ package WayofTime.bloodmagic.api; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; +/** + * Allows blacklisting of various objects from different Blood Magic systems. + */ public interface IBloodMagicBlacklist { + /** + * Blacklists a given {@link IBlockState} from being teleposed. + * + * @param state The {@link IBlockState} to blacklist. + */ void addTeleposer(@Nonnull IBlockState state); - void addTeleposer(@Nonnull Block block); - + /** + * Blacklists a {@link net.minecraft.entity.Entity} from being teleposed based on the given registry name. + * + * @param entityId The registry name to blacklist. + */ void addTeleposer(@Nonnull ResourceLocation entityId); + /** + * Blacklists a given {@link IBlockState} from being transposed. + * + * @param state The {@link IBlockState} to blacklist. + */ void addTransposition(@Nonnull IBlockState state); - void addTransposition(@Nonnull Block block); - + /** + * Blacklists a given {@link IBlockState} from being accelerated by the growth enhancement ritual and sigil. + * + * @param state The {@link IBlockState} to blacklist. + */ void addGreenGrove(@Nonnull IBlockState state); - void addGreenGrove(@Nonnull Block block); - + /** + * Blacklists a {@link net.minecraft.entity.Entity} from being sacrificed via the Well of Suffering ritual. + * + * @param entityId The registry name to blacklist. + */ void addWellOfSuffering(@Nonnull ResourceLocation entityId); } diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java index 450076db..78ac7036 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java @@ -1,6 +1,15 @@ package WayofTime.bloodmagic.api; +/** + * The main class to implement to create a Blood Magic plugin. Everything communicated between a mod and Blood Magic is through this class. + * IBloodMagicPlugins must have the {@link BloodMagicPlugin} annotation to get loaded by Blood Magic. + */ public interface IBloodMagicPlugin { + /** + * Register mod content with the API + * + * @param api The active instance of the {@link IBloodMagicAPI} + */ void register(IBloodMagicAPI api); } diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java index 07e25481..9320886d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -6,17 +6,68 @@ import net.minecraft.item.crafting.Ingredient; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; +/** + * Allows recipe addition and removal. + */ public interface IBloodMagicRecipeRegistrar { + /** + * Adds a new recipe to the Blood Altar. + * + * @param input An input {@link Ingredient}. + * @param output An output {@link ItemStack}. + * @param minimumTier The minimum Blood Altar tier required for this recipe. + * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. + * @param consumeRate How quickly the Life Essence is syphoned. + * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. + */ void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); + /** + * Removes a Blood Altar recipe based on an input {@link ItemStack}. + * + * @param input The input item to remove the recipe of. + * + * @return Whether or not a recipe was removed. + */ boolean removeBloodAltar(@Nonnull ItemStack input); + /** + * Adds a new recipe to the Alchemy Table. + * + * @param output An output {@link ItemStack}. + * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. + * @param ticks The amount of ticks it takes to complete the craft. + * @param minimumTier The minimum Blood Orb tier required for this recipe. + * @param input An array of {@link Ingredient}s to accept as inputs. + */ void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); + /** + * Removes an Alchemy Table recipe based on an input {@link Ingredient} array. + * + * @param input The input items to remove the recipe of. + * + * @return Whether or not a recipe was removed. + */ boolean removeAlchemyTable(@Nonnull ItemStack... input); + /** + * Adds a new recipe to the Soul/Tartaric Forge. + * + * @param output An output {@link ItemStack}. + * @param minimumSouls The minimum number of souls that must be contained in the Soul Gem. + * @param soulDrain The number of souls to drain from the Soul Gem. + * @param input An array of {@link Ingredient}s to accept as inputs. + */ void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); + /** + * Removes a Soul/Tartaric Forge recipe based on an input {@link Ingredient} array. + * + * @param input The input items to remove the recipe of. + * + * @return Whether or not a recipe was removed. + */ boolean removeTartaricForge(@Nonnull ItemStack... input); } diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java index 63676ebb..1f22de5a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java @@ -6,9 +6,37 @@ import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; +/** + * Allows value modification for various features of Blood Magic such as Sacrificial values. + */ public interface IBloodMagicValueManager { + /** + * Sets the amount of LP received per health point from sacrificing the given entity. By default, this is 25. Setting + * the value to 0 effectively disables sacrificing. + * + * @param entityId The registry name of the entity. + * @param value The amount of LP per health point to receive upon sacrifice. + */ void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); + /** + * Sets the Tranquility value of a given {@link IBlockState}. + * + * Valid tranquility types: + *
    + *
  • PLANT
    • + *
  • CROP
    • + *
  • TREE
    • + *
  • EARTHEN
    • + *
  • WATER
    • + *
  • FIRE
    • + *
  • LAVA
    • + *
+ * + * @param state The {@link IBlockState} to set the value of. + * @param tranquilityType The type of Tranquility this block should provide. + * @param value The amount of tranquility this block should provide. + */ void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java index c07e979c..29fd1f49 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -32,7 +32,6 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { teleposer.add(state); } - @Override public void addTeleposer(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addTeleposer(state); @@ -50,7 +49,6 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { transposition.add(state); } - @Override public void addTransposition(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addTransposition(state); @@ -62,7 +60,6 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { greenGrove.add(state); } - @Override public void addGreenGrove(@Nonnull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) addGreenGrove(state); diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 280caae4..c31010da 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -84,7 +84,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(api.getRecipeRegistrar()); } - private static void handleConfigValues(IBloodMagicAPI api) { + private static void handleConfigValues(BloodMagicAPI api) { for (String value : ConfigHandler.values.sacrificialValues) { String[] split = value.split(";"); if (split.length != 2) // Not valid format From 163fe864e51d29f86518a285bb1b512dfd9a0818 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 10:15:16 -0800 Subject: [PATCH 057/493] Soul Snares should not trigger on players. Especially not in a weird way (#1216) --- .../entity/projectile/EntitySoulSnare.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java index 2be580f8..f0a5ef66 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java @@ -10,6 +10,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; public class EntitySoulSnare extends EntityThrowable { + public EntitySoulSnare(World worldIn) { super(worldIn); } @@ -22,29 +23,21 @@ public class EntitySoulSnare extends EntityThrowable { super(worldIn, x, y, z); } - /** - * Called when this EntityThrowable hits a block or entity. - */ @Override protected void onImpact(RayTraceResult result) { - if (result.entityHit == this.getThrower() && this.ticksExisted < 20) { + if (result.entityHit == this.getThrower() || this.ticksExisted < 2 || getEntityWorld().isRemote) return; - } - if (result.entityHit != null && result.entityHit != this.getThrower()) { - if (result.entityHit instanceof EntityLivingBase && result.entityHit.getEntityWorld().rand.nextDouble() < 0.25) { + if (result.entityHit instanceof EntityLivingBase) { + if (result.entityHit.getEntityWorld().rand.nextDouble() < 0.25) ((EntityLivingBase) result.entityHit).addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_SNARE, 300, 0)); - } result.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), (float) 0); } - for (int j = 0; j < 8; ++j) { + for (int j = 0; j < 8; ++j) this.getEntityWorld().spawnParticle(EnumParticleTypes.SNOWBALL, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); - } - if (!this.getEntityWorld().isRemote) { - this.setDead(); - } + this.setDead(); } } \ No newline at end of file From 4b5f8a9685703c3745e8dbcde7ecf6507171651f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 10:16:09 -0800 Subject: [PATCH 058/493] Move entity registry to new Forge system --- .../bloodmagic/core/RegistrarBloodMagic.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 7a0c416d..54e3ca40 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -19,7 +19,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.EntityEntryBuilder; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -91,16 +91,19 @@ public class RegistrarBloodMagic { @SubscribeEvent public static void registerEntities(RegistryEvent.Register event) { int entities = 0; - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "blood_light"), EntityBloodLight.class, "BloodLight", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "soul_snare"), EntitySoulSnare.class, "SoulSnare", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "soul_arrow"), EntitySentientArrow.class, "SoulArrow", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "meteor"), EntityMeteor.class, "Meteor", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), EntitySentientSpecter.class, "SentientSpecter", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "mimic"), EntityMimic.class, "Mimic", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_zombie"), EntityCorruptedZombie.class, "CorruptedZombie", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_sheep"), EntityCorruptedSheep.class, "CorruptedSheep", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_chicken"), EntityCorruptedChicken.class, "CorruptedChicken", ++entities, BloodMagic.instance, 16 * 4, 3, true); - EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "corrupted_spider"), EntityCorruptedSpider.class, "CorruptedSpider", ++entities, BloodMagic.instance, 16 * 4, 3, true); + + event.getRegistry().registerAll( + EntityEntryBuilder.create().id("blood_light", ++entities).entity(EntityBloodLight.class).name("blood_light").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("soul_snare", ++entities).entity(EntitySoulSnare.class).name("soul_snare").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("soul_arrow", ++entities).entity(EntitySentientArrow.class).name("sentient_arrow").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("meteor", ++entities).entity(EntityMeteor.class).name("meteor").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("sentient_specter", ++entities).entity(EntitySentientSpecter.class).name("sentient_specter").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("mimic", ++entities).entity(EntityMimic.class).name("mimic").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("corrupted_zombie", ++entities).entity(EntityCorruptedZombie.class).name("corrupted_zombie").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("corrupted_sheep", ++entities).entity(EntityCorruptedSheep.class).name("corrupted_sheep").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("corrupted_chicken", ++entities).entity(EntityCorruptedChicken.class).name("corrupted_chicken").tracker(16 * 4, 3, true).build(), + EntityEntryBuilder.create().id("corrupted_spider", ++entities).entity(EntityCorruptedSpider.class).name("corrupted_spider").tracker(16 * 4, 3, true).build() + ); } @SubscribeEvent From 123b06c28824c98024605b960568c242d3afd0d4 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 11:40:13 -0800 Subject: [PATCH 059/493] Alchemy arrays should mostly function now (#1202) Rewrites the crafting recipe portion of alchemy arrays. Currently the rewritten portion is wrapped in the old stuff. Ideally the remaining old stuff will be rewritten as well. Mods who wish to do custom array effects still need to depend on internal classes and I think this is fine. --- .../api/IBloodMagicRecipeRegistrar.java | 26 ++++++++- .../api/impl/BloodMagicCorePlugin.java | 1 + .../api/impl/BloodMagicRecipeRegistrar.java | 46 +++++++++++++++ .../api/impl/recipe/RecipeAlchemyArray.java | 53 +++++++++++++++++ .../AlchemyArrayEffectCraftingNew.java | 58 +++++++++++++++++++ .../registry/AlchemyArrayRecipeRegistry.java | 14 ++--- .../render/block/RenderAlchemyArray.java | 7 +++ .../core/RegistrarBloodMagicRecipes.java | 28 +++++++++ .../bloodmagic/registry/ModRecipes.java | 24 -------- .../bloodmagic/tile/TileAlchemyArray.java | 16 ++++- 10 files changed, 239 insertions(+), 34 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java create mode 100644 src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java index 9320886d..61123c52 100644 --- a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -2,9 +2,11 @@ package WayofTime.bloodmagic.api; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Allows recipe addition and removal. @@ -44,7 +46,7 @@ public interface IBloodMagicRecipeRegistrar { void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); /** - * Removes an Alchemy Table recipe based on an input {@link Ingredient} array. + * Removes an Alchemy Table recipe based on an input {@link ItemStack} array. * * @param input The input items to remove the recipe of. * @@ -63,11 +65,31 @@ public interface IBloodMagicRecipeRegistrar { void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); /** - * Removes a Soul/Tartaric Forge recipe based on an input {@link Ingredient} array. + * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} array. * * @param input The input items to remove the recipe of. * * @return Whether or not a recipe was removed. */ boolean removeTartaricForge(@Nonnull ItemStack... input); + + /** + * Adds a new recipe to the Alchemy Array. + * + * @param input An input {@link Ingredient}. First item put into the Alchemy Array. + * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. + * @param output An output {@link ItemStack}. + * @param circleTexture The texture to render for the Alchemy Array circle. + */ + void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture); + + /** + * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's catalyst {@link ItemStack}. + * + * @param input The input item to remove the recipe of. + * @param catalyst The catalyst item to remove the recipe of. + * + * @return Whether or not a recipe was removed. + */ + boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index c31010da..4d456f95 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -82,6 +82,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { RegistrarBloodMagicRecipes.registerAltarRecipes(api.getRecipeRegistrar()); RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(api.getRecipeRegistrar()); RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(api.getRecipeRegistrar()); + RegistrarBloodMagicRecipes.registerAlchemyArrayRecipes(api.getRecipeRegistrar()); } private static void handleConfigValues(BloodMagicAPI api) { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index 9e23a462..470d1ba3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; @@ -13,6 +14,7 @@ import com.google.common.collect.Sets; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.crafting.CraftingHelper; import javax.annotation.Nonnegative; @@ -26,11 +28,13 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { private final Set altarRecipes; private final Set alchemyRecipes; private final Set tartaricForgeRecipes; + private final Set alchemyArrayRecipes; public BloodMagicRecipeRegistrar() { this.altarRecipes = Sets.newHashSet(); this.alchemyRecipes = Sets.newHashSet(); this.tartaricForgeRecipes = Sets.newHashSet(); + this.alchemyArrayRecipes = Sets.newHashSet(); } @Override @@ -138,6 +142,31 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); } + @Override + public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + + alchemyArrayRecipes.add(new RecipeAlchemyArray(input, catalyst, output, circleTexture)); + } + + @Override + public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + + return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst)); + } + + public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + + addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture); + } + @Nullable public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { Preconditions.checkNotNull(input, "input cannot be null."); @@ -201,6 +230,19 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { return null; } + @Nullable + public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + for (RecipeAlchemyArray recipe : alchemyArrayRecipes) + if (recipe.getInput().test(input) && recipe.getCatalyst().test(catalyst)) + return recipe; + + return null; + } + public Set getAltarRecipes() { return ImmutableSet.copyOf(altarRecipes); } @@ -212,4 +254,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { public Set getTartaricForgeRecipes() { return ImmutableSet.copyOf(tartaricForgeRecipes); } + + public Set getAlchemyArrayRecipes() { + return ImmutableSet.copyOf(alchemyArrayRecipes); + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java new file mode 100644 index 00000000..02b4f153 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java @@ -0,0 +1,53 @@ +package WayofTime.bloodmagic.api.impl.recipe; + +import WayofTime.bloodmagic.BloodMagic; +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class RecipeAlchemyArray { + + @Nonnull + private final Ingredient input; + @Nonnull + private final Ingredient catalyst; + @Nonnull + private final ItemStack output; + @Nonnull + private final ResourceLocation circleTexture; + + public RecipeAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + + this.input = input; + this.catalyst = catalyst; + this.output = output; + this.circleTexture = circleTexture == null ? new ResourceLocation(BloodMagic.MODID, "textures/models/AlchemyArrays/WIPArray.png") : circleTexture; + } + + @Nonnull + public Ingredient getInput() { + return input; + } + + @Nonnull + public Ingredient getCatalyst() { + return catalyst; + } + + @Nonnull + public ItemStack getOutput() { + return output; + } + + @Nonnull + public ResourceLocation getCircleTexture() { + return circleTexture; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java new file mode 100644 index 00000000..076c049d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java @@ -0,0 +1,58 @@ +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; + +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; + +public class AlchemyArrayEffectCraftingNew extends AlchemyArrayEffect { + + private final RecipeAlchemyArray recipe; + + public AlchemyArrayEffectCraftingNew(RecipeAlchemyArray recipe) { + this(recipe.getOutput().toString() + 200, recipe); + } + + public AlchemyArrayEffectCraftingNew(String key, RecipeAlchemyArray recipeAlchemyArray) { + super(key); + + this.recipe = recipeAlchemyArray; + } + + @Override + public boolean update(TileEntity tile, int ticksActive) { + if (tile.getWorld().isRemote) + return false; + + if (ticksActive >= 200) { + BlockPos pos = tile.getPos(); + + ItemStack output = recipe.getOutput().copy(); + + EntityItem outputEntity = new EntityItem(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); + + tile.getWorld().spawnEntity(outputEntity); + + return true; + } + + return false; + } + + @Override + public void writeToNBT(NBTTagCompound tag) { + + } + + @Override + public void readFromNBT(NBTTagCompound tag) { + + } + + @Override + public AlchemyArrayEffect getNewCopy() { + return new AlchemyArrayEffectCraftingNew(key, recipe); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java index fd939ba5..06370e71 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map.Entry; public class AlchemyArrayRecipeRegistry { - public static final AlchemyCircleRenderer defaultRenderer = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BaseArray.png")); + public static final AlchemyCircleRenderer DEFAULT_RENDERER = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BaseArray.png")); private static BiMap, AlchemyArrayRecipe> recipes = HashBiMap.create(); private static HashMap effectMap = new HashMap(); @@ -56,7 +56,7 @@ public class AlchemyArrayRecipeRegistry { } } - recipes.put(input, new AlchemyArrayRecipe(input, catalystStack, arrayEffect, circleRenderer == null ? defaultRenderer : circleRenderer)); + recipes.put(input, new AlchemyArrayRecipe(input, catalystStack, arrayEffect, circleRenderer == null ? DEFAULT_RENDERER : circleRenderer)); } public static AlchemyArrayEffect getAlchemyArrayEffect(String key) { @@ -136,7 +136,7 @@ public class AlchemyArrayRecipeRegistry { } public static void registerRecipe(ItemStack inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { - AlchemyCircleRenderer circleRenderer = arrayResource == null ? defaultRenderer : new AlchemyCircleRenderer(arrayResource); + AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); registerRecipe(Collections.singletonList(inputStacks), catalystStack, arrayEffect, circleRenderer); } @@ -145,12 +145,12 @@ public class AlchemyArrayRecipeRegistry { } public static void registerRecipe(List inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { - AlchemyCircleRenderer circleRenderer = arrayResource == null ? defaultRenderer : new AlchemyCircleRenderer(arrayResource); + AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); registerRecipe(inputStacks, catalystStack, arrayEffect, circleRenderer); } public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { - AlchemyCircleRenderer circleRenderer = arrayResource == null ? defaultRenderer : new AlchemyCircleRenderer(arrayResource); + AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer); } @@ -185,7 +185,7 @@ public class AlchemyArrayRecipeRegistry { for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { AlchemyArrayRecipe arrayRecipe = entry.getValue(); if (input.size() == 1 && arrayRecipe.getInput().size() == 1) { - if (ItemStackWrapper.getHolder(arrayRecipe.getInput().get(0)).equals(ItemStackWrapper.getHolder(input.get(0)))) { + if (ItemStack.areItemsEqual(input.get(0), arrayRecipe.input.get(0))) { AlchemyArrayEffect effect = arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack); if (effect != null) { return effect.getNewCopy(); @@ -220,7 +220,7 @@ public class AlchemyArrayRecipeRegistry { } } - return defaultRenderer; + return DEFAULT_RENDERER; } public static AlchemyCircleRenderer getAlchemyCircleRenderer(ItemStack itemStack, @Nullable ItemStack catalystStack) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index a886a981..023db61e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.client.render.block; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; @@ -13,6 +15,11 @@ public class RenderAlchemyArray extends TileEntitySpecialRenderer 0 ? craftTime + partialTicks : 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index e0d3d6e3..aeeefd25 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; +import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentTypes; @@ -139,4 +140,31 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); } + + public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) { + registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); + + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_VOID), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), null); + registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_FROST), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); + + } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index df3172e8..06dd3e5d 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -82,30 +82,6 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png")); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.GLOWSTONE_DUST), new AlchemyArrayEffectUpdraft("updraft"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/UpdraftArray.png"))); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 39d77472..2fddf46c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCraftingNew; import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import net.minecraft.block.state.IBlockState; @@ -107,7 +110,18 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } } } else { - return false; + RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(getStackInSlot(0), getStackInSlot(1)); + if (recipe == null) + return false; + + AlchemyArrayEffect newEffect = new AlchemyArrayEffectCraftingNew(recipe); + if (arrayEffect == null) { + arrayEffect = newEffect; + key = newEffect.key; + } else if (!newEffect.key.equals(key)) { + arrayEffect = newEffect; + key = newEffect.key; + } } if (arrayEffect != null) { From f974f44aeb343a222074b26d7c615e118cfdd9f6 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 11:53:45 -0800 Subject: [PATCH 060/493] Fixup Alchemy Array JEI compat --- .../compat/jei/BloodMagicJEIPlugin.java | 11 +++--- .../AlchemyArrayCraftingCategory.java | 2 +- .../AlchemyArrayCraftingRecipeHandler.java | 31 --------------- .../AlchemyArrayCraftingRecipeJEI.java | 21 +++++----- .../AlchemyArrayCraftingRecipeMaker.java | 39 ------------------- 5 files changed, 16 insertions(+), 88 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index 8a0ed800..e6c26b9a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.compat.jei; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.apibutnotreally.Constants; @@ -8,11 +9,9 @@ import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHandler; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeMaker; +import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeHandler; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeMaker; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; @@ -34,7 +33,7 @@ import javax.annotation.Nonnull; import java.util.Map; @JEIPlugin -public class BloodMagicJEIPlugin extends BlankModPlugin { +public class BloodMagicJEIPlugin implements IModPlugin { public static IJeiHelpers jeiHelper; @Override @@ -43,19 +42,19 @@ public class BloodMagicJEIPlugin extends BlankModPlugin { registry.addRecipeHandlers( new BindingRecipeHandler(), - new AlchemyArrayCraftingRecipeHandler(), new AlchemyTableRecipeHandler(), new ArmourDowngradeRecipeHandler() ); registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(), Constants.Compat.JEI_CATEGORY_ALTAR); registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(), Constants.Compat.JEI_CATEGORY_SOULFORGE); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArrayRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); registry.handleRecipes(RecipeTartaricForge.class, TartaricForgeRecipeJEI::new, Constants.Compat.JEI_CATEGORY_SOULFORGE); + registry.handleRecipes(RecipeAlchemyArray.class, AlchemyArrayCraftingRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); registry.addRecipes(BindingRecipeMaker.getRecipes()); - registry.addRecipes(AlchemyArrayCraftingRecipeMaker.getRecipes()); registry.addRecipes(AlchemyTableRecipeMaker.getRecipes()); registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index dbb41825..c026c81f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -63,7 +63,7 @@ public class AlchemyArrayCraftingCategory implements IRecipeCategory { if (recipeWrapper instanceof AlchemyArrayCraftingRecipeJEI) { recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - recipeLayout.getItemStacks().set(CATALYST_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); + recipeLayout.getItemStacks().set(CATALYST_SLOT, ingredients.getInputs(ItemStack.class).get(1)); recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java deleted file mode 100644 index f05a4cbd..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import WayofTime.bloodmagic.apibutnotreally.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class AlchemyArrayCraftingRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return AlchemyArrayCraftingRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull AlchemyArrayCraftingRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AlchemyArrayCraftingRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AlchemyArrayCraftingRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java index 9cd323b9..fe451eb0 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java @@ -1,35 +1,34 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -public class AlchemyArrayCraftingRecipeJEI extends BlankRecipeWrapper { +public class AlchemyArrayCraftingRecipeJEI implements IRecipeWrapper { @Nonnull private final List inputs; @Nullable - private final ItemStack catalyst; + private final List catalyst; @Nonnull private final ItemStack output; - public AlchemyArrayCraftingRecipeJEI(@Nonnull List input, @Nullable ItemStack catalyst, @Nonnull ItemStack output) { - this.inputs = input; - this.catalyst = catalyst; - this.output = output; - } - - public ItemStack getCatalyst() { - return catalyst; + public AlchemyArrayCraftingRecipeJEI(RecipeAlchemyArray array) { + this.inputs = NonNullList.from(ItemStack.EMPTY, array.getInput().getMatchingStacks()); + this.catalyst = NonNullList.from(ItemStack.EMPTY, array.getCatalyst().getMatchingStacks()); + this.output = array.getOutput(); } @Override public void getIngredients(IIngredients ingredients) { - ingredients.setInputLists(ItemStack.class, Lists.newArrayList(inputs, Lists.newArrayList(catalyst))); + ingredients.setInputLists(ItemStack.class, Lists.newArrayList(inputs, catalyst)); ingredients.setOutput(ItemStack.class, output); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java deleted file mode 100644 index 3d95e801..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; -import com.google.common.collect.BiMap; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class AlchemyArrayCraftingRecipeMaker { - @Nonnull - public static List getRecipes() { - Map, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> alchemyArrayRecipeMap = AlchemyArrayRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList(); - - for (Map.Entry, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> itemStackAlchemyArrayRecipeEntry : alchemyArrayRecipeMap.entrySet()) { - List input = itemStackAlchemyArrayRecipeEntry.getValue().getInput(); - BiMap catalystMap = itemStackAlchemyArrayRecipeEntry.getValue().catalystMap; - - for (Map.Entry entry : catalystMap.entrySet()) { - ItemStack catalyst = entry.getKey().toStack(); - if (AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(input, catalyst) instanceof AlchemyArrayEffectCrafting) { - ItemStack output = ((AlchemyArrayEffectCrafting) itemStackAlchemyArrayRecipeEntry.getValue().getAlchemyArrayEffectForCatalyst(catalyst)).outputStack; - - AlchemyArrayCraftingRecipeJEI recipe = new AlchemyArrayCraftingRecipeJEI(input, catalyst, output); - recipes.add(recipe); - } - } - } - - return recipes; - } -} From ab09b4f052cd71cd980c3e702177411a30033c29 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 11:59:59 -0800 Subject: [PATCH 061/493] Update changelog + version --- changelog.txt | 18 ++++++++++++++++++ gradle.properties | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 4f8003c5..745d9e7b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,21 @@ +------------------------------------------------------ +Version 2.2.2 +------------------------------------------------------ + +- Fixed Alchemy Arrays so they might actually function now. Might. + - How did this even function properly before? I have no idea. +- Soul Snare should now stop giving the thrower ghosty debuffs. Should. +- Blood Magic is now in the mood to launch on servers. Probably. +- Soul Forge crafting works again! Potentially! +- Fixed the altar nuking any and all NBT attached to output items. +- Fixed the version not being replaced properly +- Rewrote Hwyla integration. + - Should now function a lot nicer. +- Implemented a new API for recipe registration + - Still need to move the alchemy table over, but otherwise this seems to function just fine. +- Implemented a new API for registering tranquility blocks. + - Will allow Chisel to stop crashing + ------------------------------------------------------ Version 2.2.1 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 239d79e2..a30fcbb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.1 +mod_version=2.2.2 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From beb71e4c41baac0afc09ad398a799530e3cae7dd Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 12:02:44 -0800 Subject: [PATCH 062/493] Include a dummied version of the alchemy table recipe method so it builds --- .../WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index aeeefd25..79430210 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -85,6 +85,10 @@ public class RegistrarBloodMagicRecipes { registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); } + public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { + + } + public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); From 33d6cdb3a9f96cef598ef32415ffe1ae5b8ae107 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 14:43:00 -0800 Subject: [PATCH 063/493] Fix mundane component being really really really thirsty (#1218) --- .../render/entity/RenderEntityBloodLight.java | 4 +- .../guideapi/book/CategoryArchitect.java | 38 ++--- .../core/RegistrarBloodMagicRecipes.java | 93 +++++++++--- .../bloodmagic/fuel/FuelHandler.java | 4 +- .../bloodmagic/item/ItemComponent.java | 137 ------------------ .../item/armour/ItemLivingArmour.java | 4 +- .../bloodmagic/registry/ModRecipes.java | 112 +++++++------- .../bloodmagic/ritual/RitualCobblestone.java | 4 +- 8 files changed, 154 insertions(+), 242 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemComponent.java diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 5d74c644..64430836 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentTypes; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderItem; @@ -26,7 +26,7 @@ public class RenderEntityBloodLight extends Render { GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - this.renderItem.renderItem(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), ItemCameraTransforms.TransformType.GROUND); + this.renderItem.renderItem(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); super.doRender(entity, x, y, z, entityYaw, partialTicks); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index b623e8a6..599800cc 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -12,7 +12,7 @@ import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.util.helper.RecipeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; @@ -140,7 +140,7 @@ public class CategoryArchitect { List waterPages = new ArrayList(); - TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_WATER)); + TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_WATER.getStack()); if (waterRecipe != null) { waterPages.add(new PageTartaricForgeRecipe(waterRecipe)); } @@ -155,7 +155,7 @@ public class CategoryArchitect { List lavaPages = new ArrayList(); - TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_LAVA)); + TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_LAVA.getStack()); if (lavaRecipe != null) { lavaPages.add(new PageTartaricForgeRecipe(lavaRecipe)); } @@ -220,7 +220,7 @@ public class CategoryArchitect { List holdingPages = new ArrayList(); - TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING)); + TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HOLDING.getStack()); if (holdingRecipe != null) { holdingPages.add(new PageTartaricForgeRecipe(holdingRecipe)); } @@ -235,7 +235,7 @@ public class CategoryArchitect { List airPages = new ArrayList(); - TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_AIR)); + TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AIR.getStack()); if (airRecipe != null) { airPages.add(new PageTartaricForgeRecipe(airRecipe)); } @@ -250,7 +250,7 @@ public class CategoryArchitect { List voidPages = new ArrayList(); - TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_VOID)); + TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_VOID.getStack()); if (voidRecipe != null) { voidPages.add(new PageTartaricForgeRecipe(voidRecipe)); } @@ -265,7 +265,7 @@ public class CategoryArchitect { List greenGrovePages = new ArrayList(); - TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH)); + TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_GROWTH.getStack()); if (greenGroveRecipe != null) { greenGrovePages.add(new PageTartaricForgeRecipe(greenGroveRecipe)); } @@ -280,7 +280,7 @@ public class CategoryArchitect { List fastMinerPages = new ArrayList(); - TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER)); + TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_FAST_MINER.getStack()); if (fastMinerRecipe != null) { fastMinerPages.add(new PageTartaricForgeRecipe(fastMinerRecipe)); } @@ -295,7 +295,7 @@ public class CategoryArchitect { List seerPages = new ArrayList(); - TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT)); + TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SIGHT.getStack()); if (seerRecipe != null) { seerPages.add(new PageTartaricForgeRecipe(seerRecipe)); } @@ -340,7 +340,7 @@ public class CategoryArchitect { List affinityPages = new ArrayList(); - TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY)); + TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AFFINITY.getStack()); if (affinityRecipe != null) { affinityPages.add(new PageTartaricForgeRecipe(affinityRecipe)); } @@ -355,7 +355,7 @@ public class CategoryArchitect { List lampPages = new ArrayList(); - TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT)); + TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack()); if (lampRecipe != null) { lampPages.add(new PageTartaricForgeRecipe(lampRecipe)); } @@ -370,7 +370,7 @@ public class CategoryArchitect { List magnetismPages = new ArrayList(); - TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM)); + TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_MAGNETISM.getStack()); if (magnetismRecipe != null) { magnetismPages.add(new PageTartaricForgeRecipe(magnetismRecipe)); } @@ -395,7 +395,7 @@ public class CategoryArchitect { List livingArmourPages = new ArrayList(); - TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_BINDING)); + TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BINDING.getStack()); if (bindingRecipe != null) { livingArmourPages.add(new PageTartaricForgeRecipe(bindingRecipe)); } @@ -535,7 +535,7 @@ public class CategoryArchitect { List suppressionPages = new ArrayList(); - TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION)); + TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SUPPRESSION.getStack()); if (suppressionRecipe != null) { suppressionPages.add(new PageTartaricForgeRecipe(suppressionRecipe)); } @@ -550,7 +550,7 @@ public class CategoryArchitect { List hastePages = new ArrayList(); - TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_HASTE)); + TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HASTE.getStack()); if (hasteRecipe != null) { hastePages.add(new PageTartaricForgeRecipe(hasteRecipe)); } @@ -565,7 +565,7 @@ public class CategoryArchitect { List severancePages = new ArrayList(); - TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE)); + TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SEVERANCE.getStack()); if (severanceRecipe != null) { severancePages.add(new PageTartaricForgeRecipe(severanceRecipe)); } @@ -580,7 +580,7 @@ public class CategoryArchitect { List telepositionPages = new ArrayList(); - TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION)); + TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_TELEPOSITION.getStack()); if (telepositionRecipe != null) { telepositionPages.add(new PageTartaricForgeRecipe(telepositionRecipe)); } @@ -595,7 +595,7 @@ public class CategoryArchitect { List compressionPages = new ArrayList(); - TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION)); + TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_COMPRESSION.getStack()); if (compressionRecipe != null) { compressionPages.add(new PageTartaricForgeRecipe(compressionRecipe)); } @@ -610,7 +610,7 @@ public class CategoryArchitect { List bridgePages = new ArrayList(); - TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE)); + TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BRIDGE.getStack()); if (bridgeRecipe != null) { bridgePages.add(new PageTartaricForgeRecipe(bridgeRecipe)); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 79430210..48937522 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -7,10 +7,11 @@ import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; +import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentTypes; +import com.google.common.collect.Sets; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -27,6 +28,9 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreIngredient; import net.minecraftforge.oredict.ShapelessOreRecipe; +import java.util.List; +import java.util.Set; + @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class RegistrarBloodMagicRecipes { @@ -86,7 +90,52 @@ public class RegistrarBloodMagicRecipes { } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { + registrar.addAlchemyTable(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); + registrar.addAlchemyTable(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); + registrar.addAlchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); + registrar.addAlchemyTable(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 500, 200, 1, "gunpowder", "gunpowder", "dustCoal"); + registrar.addAlchemyTable(new ItemStack(Items.BREAD), 100, 200, 1, Items.WHEAT, Items.SUGAR); + registrar.addAlchemyTable(new ItemStack(Blocks.GRASS), 200, 200, 1, Blocks.DIRT, new ItemStack(Items.DYE, 1, 15), Items.WHEAT_SEEDS); + registrar.addAlchemyTable(new ItemStack(Items.CLAY_BALL, 4), 50, 100, 2, Items.WATER_BUCKET, "sand"); + registrar.addAlchemyTable(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); + registrar.addAlchemyTable(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); + registrar.addAlchemyTable(ComponentTypes.SULFUR.getStack(8), 0, 100, 0, Items.LAVA_BUCKET); + registrar.addAlchemyTable(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); + registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ComponentTypes.SALTPETER.getStack(), ComponentTypes.SULFUR.getStack(), new ItemStack(Items.COAL, 1, 1)); + registrar.addAlchemyTable(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT); + registrar.addAlchemyTable(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); + registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addAlchemyTable(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE)); + registrar.addAlchemyTable(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE)); + registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); + registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); + registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); + registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); + registrar.addAlchemyTable(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); + registrar.addAlchemyTable(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); + registrar.addAlchemyTable(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); + registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone"); + registrar.addAlchemyTable(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); + registrar.addAlchemyTable(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); + Set addedOreRecipeList = Sets.newHashSet("oreIron", "oreGold", "oreCoal", "oreRedstone"); // We already added these above + String[] oreList = OreDictionary.getOreNames().clone(); + for (String ore : oreList) { + if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) { + String dustName = ore.replaceFirst("ore", "dust"); + + List discoveredOres = OreDictionary.getOres(ore); + List dustList = OreDictionary.getOres(dustName); + if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) { + ItemStack dustStack = dustList.get(0).copy(); + dustStack.setCount(2); + registrar.addAlchemyTable(dustStack, 400, 200, 1, ore, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + addedOreRecipeList.add(ore); + } + } + } } public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { @@ -148,27 +197,27 @@ public class RegistrarBloodMagicRecipes { public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_VOID), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), null); - registrar.addAlchemyArray(ItemComponent.getStack(ItemComponent.REAGENT_FROST), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); } } diff --git a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java index aae512d7..29b01c00 100644 --- a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java +++ b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.fuel; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentTypes; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.IFuelHandler; public class FuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { - if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.COMPONENT && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata()) { + if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.COMPONENT && fuel.getMetadata() == ComponentTypes.SAND_COAL.ordinal()) { return 1600; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java deleted file mode 100644 index 4363715e..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ /dev/null @@ -1,137 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; - -public class ItemComponent extends Item implements IVariantProvider { - public static final String REAGENT_WATER = "reagentWater"; - public static final String REAGENT_LAVA = "reagentLava"; - public static final String REAGENT_AIR = "reagentAir"; - public static final String REAGENT_FASTMINER = "reagentFastMiner"; - public static final String REAGENT_VOID = "reagentVoid"; - public static final String REAGENT_GROWTH = "reagentGrowth"; - public static final String REAGENT_AFFINITY = "reagentAffinity"; - public static final String REAGENT_SIGHT = "reagentSight"; - public static final String REAGENT_BINDING = "reagentBinding"; - public static final String REAGENT_SUPPRESSION = "reagentSuppression"; - public static final String COMPONENT_FRAME_PART = "frameParts"; - public static final String REAGENT_BLOODLIGHT = "reagentBloodLight"; - public static final String REAGENT_MAGNETISM = "reagentMagnetism"; - public static final String REAGENT_HASTE = "reagentHaste"; - public static final String REAGENT_COMPRESSION = "reagentCompression"; - public static final String REAGENT_BRIDGE = "reagentBridge"; - public static final String REAGENT_SEVERANCE = "reagentSeverance"; - public static final String REAGENT_TELEPOSITION = "reagentTeleposition"; - public static final String REAGENT_TRANSPOSITION = "reagentTransposition"; - public static final String SAND_IRON = "ironSand"; - public static final String SAND_GOLD = "goldSand"; - public static final String SAND_COAL = "coalSand"; - public static final String PLANT_OIL = "plantOil"; - public static final String SULFUR = "sulfur"; - public static final String SALTPETER = "saltpeter"; - public static final String NEURO_TOXIN = "neurotoxin"; - public static final String ANTISEPTIC = "antiseptic"; - public static final String REAGENT_HOLDING = "reagentHolding"; - public static final String CATALYST_LENGTH_1 = "mundaneLength"; - public static final String CATALYST_POWER_1 = "mundanePower"; - public static final String REAGENT_CLAW = "reagentClaw"; - public static final String REAGENT_BOUNCE = "reagentBounce"; - public static final String REAGENT_FROST = "reagentFrost"; - private static ArrayList names = new ArrayList(); - - public ItemComponent() { - super(); - - setUnlocalizedName(BloodMagic.MODID + ".baseComponent."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - - buildItemList(); - } - - private void buildItemList() { - names.add(0, REAGENT_WATER); - names.add(1, REAGENT_LAVA); - names.add(2, REAGENT_AIR); - names.add(3, REAGENT_FASTMINER); - names.add(4, REAGENT_VOID); - names.add(5, REAGENT_GROWTH); - names.add(6, REAGENT_AFFINITY); - names.add(7, REAGENT_SIGHT); - names.add(8, REAGENT_BINDING); - names.add(9, REAGENT_SUPPRESSION); - names.add(10, COMPONENT_FRAME_PART); - names.add(11, REAGENT_BLOODLIGHT); - names.add(12, REAGENT_MAGNETISM); - names.add(13, REAGENT_HASTE); - names.add(14, REAGENT_COMPRESSION); - names.add(15, REAGENT_BRIDGE); - names.add(16, REAGENT_SEVERANCE); - names.add(17, REAGENT_TELEPOSITION); - names.add(18, REAGENT_TRANSPOSITION); - names.add(19, SAND_IRON); - names.add(20, SAND_GOLD); - names.add(21, SAND_COAL); - names.add(22, PLANT_OIL); - names.add(23, SULFUR); - names.add(24, SALTPETER); - names.add(25, NEURO_TOXIN); - names.add(26, ANTISEPTIC); - names.add(27, REAGENT_HOLDING); - names.add(28, CATALYST_LENGTH_1); - names.add(29, CATALYST_POWER_1); - names.add(30, REAGENT_CLAW); - names.add(31, REAGENT_BOUNCE); - names.add(32, REAGENT_FROST); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names.get(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (String name : names) - ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); - return ret; - } - - public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.COMPONENT, 1, names.indexOf(name)); - } - - public static ItemStack getStack(String key, int stackSize) { - ItemStack stack = getStack(key); - stack.setCount(stackSize); - - return stack; - } - - public static ArrayList getNames() { - return names; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 2f84dc7b..e0ba0d32 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -9,7 +9,7 @@ import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra; @@ -97,7 +97,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return ItemStack.areItemsEqual(repair, ItemComponent.getStack(ItemComponent.REAGENT_BINDING)); + return ItemStack.areItemsEqual(repair, ComponentTypes.REAGENT_BINDING.getStack()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 06dd3e5d..db223ce5 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -15,9 +15,9 @@ import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; +import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; @@ -42,8 +42,8 @@ import java.util.Map.Entry; public class ModRecipes { public static ArrayList addedOreRecipeList = new ArrayList(); - static ItemStack mundaneLengtheningStack = ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1); - static ItemStack mundanePowerStack = ItemComponent.getStack(ItemComponent.CATALYST_POWER_1); + static ItemStack mundaneLengtheningStack = ComponentTypes.CATALYST_LENGTH_1.getStack(); + static ItemStack mundanePowerStack = ComponentTypes.CATALYST_POWER_1.getStack(); public static void init() { initOreDict(); @@ -58,14 +58,14 @@ public class ModRecipes { } public static void initOreDict() { - OreDictionary.registerOre("dustIron", ItemComponent.getStack(ItemComponent.SAND_IRON)); - OreDictionary.registerOre("dustGold", ItemComponent.getStack(ItemComponent.SAND_GOLD)); - OreDictionary.registerOre("dustCoal", ItemComponent.getStack(ItemComponent.SAND_COAL)); + OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); + OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); + OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); } public static void addFurnaceRecipes() { - FurnaceRecipes.instance().addSmeltingRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON), new ItemStack(Items.IRON_INGOT), (float) 0.15); - FurnaceRecipes.instance().addSmeltingRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD), new ItemStack(Items.GOLD_INGOT), (float) 0.15); + FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_IRON.getStack(), new ItemStack(Items.IRON_INGOT), (float) 0.15); + FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_GOLD.getStack(), new ItemStack(Items.GOLD_INGOT), (float) 0.15); } public static void addAltarRecipes() { @@ -73,14 +73,14 @@ public class ModRecipes { } public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); @@ -89,7 +89,7 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); } @@ -118,32 +118,32 @@ public class ModRecipes { TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), 64, 20, "chestWood", "leather", "string", "string"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); + TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); @@ -175,16 +175,16 @@ public class ModRecipes { AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.SULFUR, 8), 0, 100, 0, Items.LAVA_BUCKET); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.SALTPETER, 4), 0, 100, 0, ItemComponent.getStack(ItemComponent.PLANT_OIL), ItemComponent.getStack(ItemComponent.PLANT_OIL), "dustCoal"); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ItemComponent.getStack(ItemComponent.SALTPETER), ItemComponent.getStack(ItemComponent.SULFUR), new ItemStack(Items.COAL, 1, 1)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.SULFUR.getStack(8), 0, 100, 0, Items.LAVA_BUCKET); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); + AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ComponentTypes.SALTPETER.getStack(), ComponentTypes.SULFUR.getStack(), new ItemStack(Items.COAL, 1, 1)); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_COAL, 4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); - AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ItemComponent.getStack(ItemComponent.PLANT_OIL), new ItemStack(Items.POTIONITEM)); + AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON, 2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD, 2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); @@ -196,21 +196,21 @@ public class ModRecipes { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.NEURO_TOXIN), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.ANTISEPTIC, 2), 1000, 200, 2, ItemComponent.getStack(ItemComponent.PLANT_OIL), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); - AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ItemComponent.getStack(ItemComponent.NEURO_TOXIN), ItemComponent.getStack(ItemComponent.ANTISEPTIC), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); + AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone"); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.CATALYST_POWER_1), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); + AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); } public static void addOreDoublingAlchemyRecipes() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index ccb845b9..c2a6ee58 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -40,7 +40,7 @@ public class RitualCobblestone extends Ritual { if (tileEntity != null && tileEntity instanceof TileAlchemyArray) { TileAlchemyArray alchemyArray = (TileAlchemyArray) tileEntity; - if (!alchemyArray.getStackInSlot(0).isEmpty() && alchemyArray.getStackInSlot(0).getItem() instanceof ItemComponent) { + if (!alchemyArray.getStackInSlot(0).isEmpty() && alchemyArray.getStackInSlot(0).getItem() == RegistrarBloodMagicItems.COMPONENT) { switch (alchemyArray.getStackInSlot(0).getItemDamage()) { case 0: block = Blocks.OBSIDIAN; From 3286849309cbe6b50dc3cdbf455032fab83f5c27 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Feb 2018 15:02:55 -0800 Subject: [PATCH 064/493] Nerf fast miner array which is actually a buff (#1219) I guess Vanilla can't handle Haste III? --- .../WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 94bf6f8f..566d0255 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -28,7 +28,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase { public boolean performArrayEffect(World world, BlockPos pos) { double radius = 10; int ticks = 600; - int potionPotency = 2; + int potionPotency = 1; AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); From 7167aba23c9d9285cf86e59132970c5468e17470 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 12 Feb 2018 19:45:09 -0800 Subject: [PATCH 065/493] Move Divination output to a HUD element RIP chat spam 2014-2018 :hype: --- .../WayofTime/bloodmagic/client/Sprite.java | 56 +++++++++++ .../client/hud/HUDElementCornerTile.java | 89 ++++++++++++++++++ .../item/sigil/ItemSigilDivination.java | 32 ------- .../bloodmagic/item/sigil/ItemSigilSeer.java | 37 -------- .../bloodmagic/proxy/ClientProxy.java | 43 +++++++++ .../bloodmagic/textures/gui/widgets.png | Bin 22017 -> 24967 bytes 6 files changed, 188 insertions(+), 69 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/client/Sprite.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java diff --git a/src/main/java/WayofTime/bloodmagic/client/Sprite.java b/src/main/java/WayofTime/bloodmagic/client/Sprite.java new file mode 100644 index 00000000..795286a0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/Sprite.java @@ -0,0 +1,56 @@ +package WayofTime.bloodmagic.client; + +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.ResourceLocation; + +public class Sprite { + + private final ResourceLocation textureLocation; + private final int textureX; + private final int textureY; + private final int textureWidth; + private final int textureHeight; + + public Sprite(ResourceLocation textureLocation, int textureX, int textureY, int textureWidth, int textureHeight) { + this.textureLocation = textureLocation; + this.textureX = textureX; + this.textureY = textureY; + this.textureWidth = textureWidth; + this.textureHeight = textureHeight; + } + + public ResourceLocation getTextureLocation() { + return textureLocation; + } + + public int getTextureX() { + return textureX; + } + + public int getTextureY() { + return textureY; + } + + public int getTextureWidth() { + return textureWidth; + } + + public int getTextureHeight() { + return textureHeight; + } + + public void draw(int x, int y) { + float f = 0.00390625F; + float f1 = 0.00390625F; + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(7, DefaultVertexFormats.POSITION_TEX); + buffer.pos((double) x, (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex(); + buffer.pos((double) (x + getTextureWidth()), (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex(); + buffer.pos((double) (x + getTextureWidth()), (double) (y), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY()) * f1)).endVertex(); + buffer.pos((double) x, (double) (y), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY()) * f1)).endVertex(); + tessellator.draw(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java new file mode 100644 index 00000000..207fde44 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java @@ -0,0 +1,89 @@ +package WayofTime.bloodmagic.client.hud; + +import WayofTime.bloodmagic.client.Sprite; +import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; +import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; +import WayofTime.bloodmagic.tile.TileAltar; +import com.google.common.collect.Lists; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import org.apache.commons.lang3.tuple.Pair; + +import java.awt.Color; +import java.util.List; +import java.util.function.Function; + +public abstract class HUDElementCornerTile extends HUDElement { + + protected final List>> information; + + public HUDElementCornerTile() { + super(5, 5, RenderGameOverlayEvent.ElementType.HOTBAR); + + this.information = Lists.newArrayList(); + addInformation(information); + } + + protected abstract void addInformation(List>> information); + + @SuppressWarnings("unchecked") + @Override + public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) { + T tile = (T) Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); + + int yOffset = 0; + for (Pair> sprite : information) { + Minecraft.getMinecraft().renderEngine.bindTexture(sprite.getLeft().getTextureLocation()); + sprite.getLeft().draw(getXOffset(), getYOffset() + yOffset); + int textY = getYOffset() + yOffset + (sprite.getLeft().getTextureHeight() / 4); + Minecraft.getMinecraft().fontRenderer.drawStringWithShadow(sprite.getRight().apply(tile), getXOffset() + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); + yOffset += sprite.getLeft().getTextureHeight() + 2; + } + } + + public static abstract class BloodAltar extends HUDElementCornerTile { + + private final boolean simple; + + public BloodAltar(boolean simple) { + this.simple = simple; + } + + @Override + public boolean shouldRender(Minecraft minecraft) { + EntityPlayer player = Minecraft.getMinecraft().player; + ItemStack sigilStack = player.getHeldItem(EnumHand.MAIN_HAND); + boolean flag = false; + if (simple) { + if (sigilStack.getItem() instanceof ItemSigilDivination) + flag = true; + + if (!flag) { + sigilStack = player.getHeldItem(EnumHand.OFF_HAND); + if (sigilStack.getItem() instanceof ItemSigilDivination) + flag = true; + } + } else { + if (sigilStack.getItem() instanceof ItemSigilSeer) + flag = true; + + if (!flag) { + sigilStack = player.getHeldItem(EnumHand.OFF_HAND); + if (sigilStack.getItem() instanceof ItemSigilSeer) + flag = true; + } + } + + TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); + if (!(tile instanceof TileAltar)) + flag = false; + + return flag; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 13f9c407..4f97fab1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,17 +1,12 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.tile.TileIncenseAltar; -import WayofTime.bloodmagic.tile.TileInversionPillar; import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.NumeralHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -63,33 +58,6 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", getOwnerName(stack))); toSend.add(new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } else { - if (position.typeOfHit == RayTraceResult.Type.BLOCK) { - TileEntity tile = world.getTileEntity(position.getBlockPos()); - - if (tile != null && tile instanceof IBloodAltar) { - IBloodAltar altar = (IBloodAltar) tile; - int tier = altar.getTier().ordinal() + 1; - int currentEssence = altar.getCurrentBlood(); - int capacity = altar.getCapacity(); - altar.checkTier(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence), new TextComponentTranslation(tooltipBase + "currentAltarCapacity", capacity)); - } else if (tile != null && tile instanceof TileIncenseAltar) { - TileIncenseAltar altar = (TileIncenseAltar) tile; - altar.recheckConstruction(); - double tranquility = altar.tranquility; - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentTranquility", (int) ((100D * (int) (100 * tranquility)) / 100d)), new TextComponentTranslation(tooltipBase + "currentBonus", (int) (100 * altar.incenseAddition))); - } else if (tile != null && tile instanceof TileInversionPillar) { - TileInversionPillar pillar = (TileInversionPillar) tile; - double inversion = pillar.getCurrentInversion(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentInversion", ((int) (10 * inversion)) / 10d)); - } else - - { - int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); - } - } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index fc2fb523..ffb2eb29 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -1,17 +1,12 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.NumeralHelper; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -48,38 +43,6 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader { toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", getOwnerName(stack))); toSend.add(new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } else { - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - - TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); - - if (tile != null && tile instanceof IBloodAltar) { - IBloodAltar altar = (IBloodAltar) tile; - int tier = altar.getTier().ordinal() + 1; - int currentEssence = altar.getCurrentBlood(); - int capacity = altar.getCapacity(); - int charge = altar.getTotalCharge(); - altar.checkTier(); - if (tile instanceof IInventory) { - if (!((IInventory) tile).getStackInSlot(0).isEmpty()) { - int progress = altar.getProgress(); - int totalLiquidRequired = altar.getLiquidRequired() * ((IInventory) tile).getStackInSlot(0).getCount(); - int consumptionRate = (int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1)); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentAltarProgress", progress, totalLiquidRequired), new TextComponentTranslation(tooltipBase + "currentAltarConsumptionRate", consumptionRate), new TextComponentTranslation(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence), new TextComponentTranslation(tooltipBase + "currentAltarCapacity", capacity), new TextComponentTranslation(tooltipBase + "currentCharge", charge)); - } else { - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence), new TextComponentTranslation(tooltipBase + "currentAltarCapacity", capacity), new TextComponentTranslation(tooltipBase + "currentCharge", charge)); - } - } - } else if (tile != null && tile instanceof TileIncenseAltar) { - TileIncenseAltar altar = (TileIncenseAltar) tile; - altar.recheckConstruction(); - double tranquility = altar.tranquility; - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentTranquility", (int) ((100D * (int) (100 * tranquility)) / 100d)), new TextComponentTranslation(tooltipBase + "currentBonus", (int) (100 * altar.incenseAddition))); - } else { - int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); - } - } } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 42ef7613..26a98d86 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -5,7 +5,9 @@ import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.client.Sprite; import WayofTime.bloodmagic.client.helper.ShaderHelper; +import WayofTime.bloodmagic.client.hud.HUDElementCornerTile; import WayofTime.bloodmagic.client.hud.HUDElementDemonWillAura; import WayofTime.bloodmagic.client.hud.HUDElementHolding; import WayofTime.bloodmagic.client.key.KeyBindings; @@ -20,6 +22,7 @@ import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; +import WayofTime.bloodmagic.util.helper.NumeralHelper; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -42,7 +45,9 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.apache.commons.lang3.tuple.Pair; import java.awt.Color; +import java.util.List; import java.util.Map; +import java.util.function.Function; public class ClientProxy extends CommonProxy { public static DemonWillHolder currentAura = new DemonWillHolder(); @@ -118,6 +123,44 @@ public class ClientProxy extends CommonProxy { public void postInit() { new HUDElementHolding(); new HUDElementDemonWillAura(); + new HUDElementCornerTile.BloodAltar(true) { // Divination Sigil + @Override + protected void addInformation(List>> information) { + information.add(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), altar -> NumeralHelper.toRoman(altar.getTier().toInt()))); + information.add(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()))); + } + }; + new HUDElementCornerTile.BloodAltar(false) { // Seer Sigil + @Override + protected void addInformation(List>> information) { + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), + altar -> NumeralHelper.toRoman(altar.getTier().toInt()) + )); + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), + altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()) + )); + information.add(Pair.of( // Craft Progress + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), + altar -> { + if (!altar.isActive()) + return "Inactive"; // FIXME localize + int progress = altar.getProgress(); + int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); + return String.format("%d/%d", progress, totalLiquidRequired); + } + )); + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), + altar -> String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))) + )); + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), + altar -> String.valueOf(altar.getTotalCharge()) + )); + } + }; } @Override diff --git a/src/main/resources/assets/bloodmagic/textures/gui/widgets.png b/src/main/resources/assets/bloodmagic/textures/gui/widgets.png index 456166c9145b8337c66386ce688b5ec30a2eb1dd..6d8d9cfe1c773bcda8dbd235b756b045a7817ebf 100644 GIT binary patch delta 6789 zcmb_gXH-*Nvp%7V1dyT#NE4AFMOu&!B1#L0AV_c0dyy76k*Z-TBvVdoz1~SAF4- zK8}rmuCf3iW>)$6os5f=tZYnmb@gsox0L=c6tL&$mNg(N#P9z-`RznR#Iuc6s*wQe zTtdEyDErGSZlAs1V;R}m`n;C=ex5iQWH*t}(lKERUNKbOqN*E@k~BQJBeRnf;N;{q zjDShJ28Jp1&(lT!#N&e|tYLa0SnYZ+fH0&2zwC=6&P6F=-mo<7|E!wH_7PM&o@d&> zcTRA^hVMxYk1u+I`oAI%85YNAIGNu^L6)bKN%-9Nt?+8q2h!u_gMC|=Oh}8Aa z5><+0W6{M-2p1to>EZoPSHWgqPufc2_Sii_wtnA{&ii|uYQT@Lev8NvzpEEHbv=ZI ze|Yr1y5+{K(__dP!+W%K(?6-k7ov%ly`fHNs#MA2{xbFvO!u}3{=NKkFNt(vp^rB? zJDkUEG{x(xM3(_JCY|Lz8+#?c+n4?TyUSbE5OhPi!y++TOk_RHm={#{S)8CKwznHk zvg6dAK7iO2|LT@yICwg2CXmw!WMpI@7Zn~o8oA5_oAw(nt%Gw_iX=5*#y^CR;EMyW z8`!U$8EiEpliOYMN8U3DN|?=PK4`)5R=TD|s$lyEFDFy=Z5hBdY^$D>ALliVycioA z9deobrt)xTJu1U93Z_%!+R=y#|ujP^-BM$Ci_Y7ZpO#fi47;sA?Cs-nQK6D@)= zu+3`X?Bc)(D0-D)k&D`dIC|q+Lz1`xsco}pzapiu%E_y`-to5xG7t6tBxF5L5y{e)p&f?S)6Z!_fgH_Rj029IAT|GEz6a=dcS~s}~ zsNs&`%ij;_kaZKI0$$5Hi{4=^F5BX69FHFqs({7~CF_k?b+4-%{8_mYiND&7*fpI# z%nwiTZ71J$brxSKDExA%6!2XX$`#E<;^7qqq< zs}%fhRY4T4(KdKFhJ`6YMX}G5&BV@=!?IK`IpD*}-ZyY5-V!*Xq5ppC91`Ip7ORCF z=Cqhf*?ixW-C&?3{)?S0eZ0xntxSshUOc2l2{5ZB^TFcUC!LkzL5XN%_bv^e+ zTI@57w$f^u*lXReHoio?$lJf`y50^p2?p!J<%>6ddqtOmckFec4>-*&Dx6uL7o3?} zx#gH@XkL9@5O{As)TW^lmADeCE|X9*pO8vj!W-vSG}>OH5%@C>FqO&rZf2C>9h;&F zqN~?6-+y?s@JoEzlOe~G3;u>eY-~nZBi&$bsyL}e#P0dQsex_R-buH=We3cs-lBBO zJ@!_tp#H0E#CVbv*8eWDCHf&6x7Tz-JW!Sx=$`VXN`4Ca=m`?cZ zKDMv(;gV`}^aG(fhts}FwKI_k zx<$s54{`1VL?<(jUe+*gHpvrHugiuTWg$ZNKU{4MMr4JL-mr;6jQ-9|cD4<5Snht52#@fWC>zs-`Vu3UZ-8eOHW2tt^BQU}9| zoD3qy2jnq=l2#vO{({HRHHg!zc*<9$B!w>KYc}Y(_`X}V9wsK{r2T3tT$5aDTAjK6 zDBjE>-+e$cG{>j3f4vp6ceu~-*<+JJW?k62@_}e$&G*nu8d3N~`hwso88EcX+r`vz z{Ka$2IMP~_zL3gEC5+}m&Rcpk6UF44*YNUdkNrCMr?hJ#B^S0^u^iAI^?Hlmn#Th* zNlH4D%)N)vA)W2k8B|#w1E1V7OD9%iSHI!a%ILOV>GTzsV88Y@c$s`0%e~%}jFd9j zGPeqR^6Odo*Krm7`$rEsX!SoW$98iY!Xky4s?;;|w)#LGQLP(@TxDPxfPsFJ3?Myc!t* zSG@5h!Yf{J7Lws(w`D$M$mLyOl@u>xu@t3yN%RFGMWn(=zScV7ke{B}aHReugjW;$ z;`+rj)1)`JucB=E`30Z?+bf!!GtcN_#@ntCoa}uuj2O2mMpQq$FMo8((w=iO8p--J z(1s2;s>bm2EHAtIm3c9~)}5h{cBU1N$;)19gesiZ?sO>!IJzT6Mw3)0~z9yb>MxX@ne)I{~>1_KeHah?Ua5eF9!$u+qZ9R6H<7` zK|FCjp7-UdNTeV~P7fKeW8vb+87mEtbN(;MmigNB2wHKJ7$mTg5-mHJ%15VKmL5e2 zWsXBX`y)KghybeKZLi)eHhA5pgACL#2MU4sS6gkXExkHYfaFH_Iop=Sfvbq;cvIJH zoxFgD5WeRE2;vH{P%ZKL`02;ZC~mSTE7+3zqOYaogmv)jF>LMDZch zw7Ml;4>=aqj>}Ci6{+{5E{Eh3TLO%2-6p^pki0&h+E;shp2r8C8$}* zmXPama>cqL|8u{4KY}B!>lRSZ%L4rJzjeaUx&PIVTkHPk3bfV>@ETBFLZTdKKiavnF*N~YK-3~sXB1VmRPl9Tzn z13mK6etV4d*(vBbokqE(L%iv|As`>N$OG>xS5Rib?ipFKrj}Ps`!Z`Pir1jzO{8{f3jlA?%hs^!7Xav+U z@MQkM(Cd+?49XBCaQ_lm44K2?LwqaE$|?9@Uejz4bl)YW9%fE<_PmHW=HGO7lq0Bv z7#bva9fcTO-iX~va_&#!9j}$-zLA}`BlEo(wE?TUH`E!r5lu|}qP#*44*+=Mf{+agZ9}z)W>9FrU zG1WN@XI205mQQ?{e(sqMsE6OSL}_ruO_IRjvq@G89qLb^JAW<5QO4)V(+~!bmdmfH3Z2$8~^@mEBm-cA52FCX_OWJ1ou#d++Z$Zk{#DZ#{i_qknD(eBY3~! z;iq4Q;1$V;RccvIXu9q-23y(0p1U@EwZp1nEn>)Eqg&M!c{}h9>tXQZt|~n~$nSXU zebb-6EV1r+;oNG<%83zNFm*a~T%R;o={uwsKq-nwJ`bi*ZFR$D6ZAOGQu)FSyJvry zhPeKLmh-d$N$v5QS*vkJKZ8R;K#uqC-;Y?__OPBD&t`hDj%(bX*PfFXip8P+q7 zg8&upF5hVNr6zMx-?$s6ZhX2iSxrfj_eP&tH9{H^R&npXs86~bkmNycv;k~3{bfAi zH-sr3I%91UyXOqO8%5L6z9g;Oj!bd3lB7%9UQSGsF6R{_WO3>p1KV z!TJ;877Z=!1u9i|ZZ`VhfJ0ldv3d#5xaf$VOwfBA^X%C<#PPTqMy#rh0@pwf?$6Ec zF0GxoX$(WMb28B2dBYRdY+Y(IuZ|0voC=?IZ13}!KkwgS4WQ{?OjctA4rU0dW=&lL z+u7t=314znb+Gy#j-G97iyl7?xY15LseiGB%c|^wSNIM89)P&2n6Z2dI+aAsp9heR zn3sDqgxz=8Qj-spPcUPXdy@5vY!okMs5HBhJo%JrrjL68?s39&RA@D zW|M#0f@%?|yv;js2DKw$Atk79$0ab5&KF#FK&-?inYTM%?!(}OX}fUVR!!Sq#kLL> zlNZ5}{M##`Lf5Yol!<6GkU2;rbioHa-5a)wb?G>}%B>tim!wTuZvo}+~5I7`yA%B30f|AyZQ? zEau1a=<1Qg!(U#sSxOu2t9Ha}9`6i0o`I()eO9Zxf2R{^yRvTUtgj_VLG{XMwW@hC_Jziyt`qMF?y6v0awe%L);mM4kykzTtZllUN(J*qEQ`lbf z9B&EUea=B|0sW0Cax-l!keVOX1tT7ooX!Q44-oIEPTqYTy~_e0uND^%Eqv>hw;_?< z8;N!sYFnB&c#4oSQUJXyr#ZXJIlc=leB#-_WP?{0V-#TF z@nd!1yK9}4ipu%U*{BtT%}fK=qG~Uk{H!%3(B{~`GA^&ak86L{Ou;9ZT8h-IQN7g1 zLHS2IZ zZ`xI#!piCFm-DSE^B#U&_zd#iWfRdir?BTBzjl=?x20{Vi2)Wy5W7bgttRfU-BAc~ zr|95C??;5J%fDQUWR!7%_jt&KKiT*t_BZKUbJ0u`fK9~Sm}YYD)ca(iUyT`66d_@U zVTh9+E+aqgL{v7|TjF!Z94C-8P{6F_omkQicGBB*?BFO$Ikv!k$`1uK`7x_4%$f@Y zjd1${n;t{2XXmfu?n%4$R;n{STyga3`qAt?o!G(lNL**%I_Iw~Au2-otE~V<`Jp z+Mkr1K2ee>0E|qA)1fS2F)(K#-_XKMl4T{@Fjp;Z>yMy~N3N*s>7gj{_^>ma;No|* zzY)#Vm-Whost&5x2-R~5;8iV5SFow}Ei3ut-a^fOC!v6O(3y39wdAIPToQXnw@DEd z|H4QJ3}jc|XttwPC*+U=yg18ybd{+s=IVqs(?E?;S-L$3%gYDaYkhlgMJIxneJVM&+1609gCZmdVR&l-g#Zp5K{j!*vV1f$LtY5!0H z$E7lV!EOM|$uW`h9cH!>uO;4!DcIEC3=uum2V=C~Ka*mRGL^6&*_$UpUh=AW2lCYZ z4n9Q@+5yB>X7LQ5>GUW`k>|V;Gx^cY;GPKopDBYj#PeOGgMnOko!3)b}egIK*i znBkkv0!OJrMW9qqlNT|d(2=!m2g^!i_KpdKP&}lLk7BOP290YQYaGVCAhexWL5W#8 z;P5?5O6HGuW_Hf}6!vjRY6o2(_oiyG3VsV(!{NNIHWvosIRLFX*DZq^S`2`I1HgQN z5}80A`V8<1&;S>10tpEab+QQjZ)E>x5d)w~{olh2fd92={}1s0UIqA1PWkuC{{5=| z;l9BCOvnER^56XaGui*39sE}y{DbU&EBc2p`fMqFiQF-H7ivmxqAfYbnd{l JDmCq*{sYpBJxl-q delta 4177 zcmcguc{JPG+Wu*E;-Hh^&^A@7iXz4%rdErp8c(A&cF?GyK?xGYudSAmo{! znj&I6jX6kBqC#S*F_f5vaINqA_pbHb`>ng~{%5bX*M6Vp-Ou~(cRi65zL!OOU$6oP zbZyHM1uzG(Z9-?T3c?Eiv-=9GVAoE_l{X7N=Eru69mdX{R>!7_reWWUJ;$CD4J#KE zUsL6G+&dkI<-e&6igcUZxON9UG(TbyEo&Oq%DI2T;Lbq!bDZgVn+#M*t3~Dd6RD6= z8myfn;H&6eY^N93QAsOAz)g4^WblvKlx0e$58Ab#%lmNh@4X z#|QH(#s=ehHvDHZe-#!LrM|nrGm%{uyWx`XIOZ5@)L5Of2lA7Ww9}w1;Bxz=;MJKA zva_6t)`Z-epheu`Gks<-`-%}j7Y7n{wig=+ks=Tr#15WEF1cui$@HojQJ|^?IBRnq z;E6*-iv~k|{r;`3>R+q|LV0;Pss2eQi3)-r6X1SkD;d77RvM2*kHPR)cx#F}(kGC7*yE3TUcJw69%WryR3m* zhC5^7+FEH{GiVwteylWe@~`kCKIvImczJ}Z1I9>CTJ@}8+CbK`dtN+6J6O?yhXyMcDZrq%W3OAt5LGEyNjUZ z_lhoct40h#jW(H1M~rwFKs{jv9mUIfhGZU(9xVkfB2N=&H(yb^BNAQs4Kb2uExG=g+O@fBk^gOz(zZ2otR=$9Et{XV;xyo}-w&|J z!S@qh){n;q6YhvLlQ@eI#iaGp@5!j)%{rS*1i46e(mqMDK~~?H-T{{1?kX9}cq=Xr z#6t}2;P6oUFAxzG?d&HgW`0B(Luqx88SB&F6GDkd6c0UE-V!ItQ2k>LCmf3gW8A9D zuW9II`ri^Yn}<`22nWV#vL2N})65DNgv%{v%#_gA9m=NO5YM%F+R=>`HWrv+!l#+4 zGV@Wgp>m9rA8pG9aet1GQDF$V;xx_YdND}`0fQvQmn$2 z6l=J>`O(oshpv7P%ox(D_};hmla$+y(!luy>LMM$Z=~TFA%m>f&(KecLazs9UsBmV z>>_4-G~-(MTm2x(MUn7FkaK;tkk;12c2jvBN_r~O!=HOgi6T{H^1bOTTV-bbZC?aP z_b?-=lN}qPVAt4j^0Ng$f8KqzBLxrzr5k&*z3b>hIi;?(+V3w1nBa1xc0T<|f-&yUFt^0qLcywv#Z z?J18IuS%i3z>)8%R<~2{I3lm>WIVAK_~3E5tMJD&*UQ|f>XEQzLT7HYh5zKvSGYPm zlFb9zIP8iGLs^eSB{Qr7$<~_a{0sZJCHy%3n9cJWFLtc5wXXJN)jXF`#FITxYSfCM z2!YQ5a)+J>WIohX{d9-FL=zZKL-z&ih%>)%V&{H-WbpW%8K2v@o{f?@!BvT;wKx?> z{916`B7FN~kO9=g2&x|^5`RjLI`2LXKC7O6KKJ8kQe2hS_4X|LEXf@Wk&7730xopz znokY8q(t72oyfRdHMJ6E)Z?Tt7R20uzvs-6m4z-78OVkbNb72gdnKDYc5~p!lRjdB zt&Yp5&9OSNpgFkG8_}*W?zWt!ygEp^*htbx zlgutxrPPjpYjU>{(Qg#OGRVd@@%hPhJScsERTv(!*i`wTdA3x zt$}TLEETEER10ZVZu?{Q$C(h-qiAW-tNRm2>77QY7)Tv|cwM2K6y{^JRp%39pX6bX z#a>@v@LDnkfll=9`S~gpQ|trUkXrh5wWXDn>9kHQSadXETz0~f{pX}@Qr^_cR!{Ud zlr4j-DyF^djKLB793XZAbHTcjYPsT^2M1}s8$fsmG3r1T+ihQ{$ko9GAT%R|*Ai z^fuaTLi9xkq{&(4P?7k)LsSsmJ_RJDfnk@Ce@uzQ<_bGH^U%8NhgR+j==~w_HPXNL z%Y&tWK5oT9-@(SO_o~f=f}k0Z58r8r|7|&^HgfE6CQ!Jx8`<5V_;gDytoe z1oxVexq)IwPsX~J_Gr^N119K(K5^2kc;Aeza@hok3f#r!ViN($C`2+U8Xj)`0SR3_ zA42yTUD$u-8FYgnO5B7M6Z4AN$c8$rR|xYKW|VcZ4vf`C2Uj!S~Pu(Lm*4W zf4~3IbdFG~uE5xs7L{WS+gz7~g~Z_Ff;OFUD0qoxe}`hb*=;NqJf$DXUG<`ku`}6A zVT-jZmY?%UvJxdwKsG99*nAZ<0!Cp!Spk&%k31m<14Ta4FQ9E@r*6c1Bfnb*S>>40 zIaA&x!yEl6vf2>8r<*u|uYcS6XHytFjF;a;7$_OronabMb1eu=i5)? z#!5IaN4DJC1k1B>ArVoPpj4f-m8IqCWb%DawUn8i9jBmQ!#2+J)Z21794-ph?^fPJ zgY3S#n;a3Jb{wctUY*%nUIF1n{Bqc+RGf{?>6~7Tb#9BqLZI#>#vnCxZ^Cd(W)fqm zBRKpKcq{dMzew$@JxY~lwIP>te`{|iJ|2U3DFrs(>fHs<2NgC}ArS zrVfr?{0&&-C1zpwbm<9rnHj-1E{*>xxrm^DK6l3x*&4 zm3bIdK!xBWpvzZW$z?b2K7{RnLEwbz@yGVKE;kvkebc))gdY+!&fbn@C2trU5_lnX z9N^^CK)}`e`^Fh&Xm}S6pPdeHW_M@kIuPid4B}q-{W+C@v-P_*>HbbaM@eRUOZfY{ z4h@_6prwBGX#?p`2>UtCC2Uj-)YLJeZlkbJftMW{9W98|l2QOh!NaQKWuuK7+5pK< zWQm8s90Lvj03YxI0ImYSc>p*L07n6UANY?S|1Tu?-=q4cOyGa`vHz}6;QwFOf0yc? pGJ*dR%D;5!|7sT2n>`2s`}OFW=@0eq!2U8bw!Fb#V)WqEKLEgXl{x?b From fa59e7000a1b7f385af333030645c3df90c7cefa Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 13 Feb 2018 16:31:30 -0800 Subject: [PATCH 066/493] Mark of the Falling Tower now demands sacrifices again (#1222) --- .../bloodmagic/meteor/MeteorRegistry.java | 36 +++++++++---------- .../bloodmagic/ritual/RitualMeteor.java | 10 +++--- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java index 4870d5ff..aaf4d0b3 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java @@ -1,23 +1,22 @@ package WayofTime.bloodmagic.meteor; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import com.google.common.collect.Maps; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.HashMap; +import javax.annotation.Nullable; import java.util.List; import java.util.Map; public class MeteorRegistry { - public static Map meteorMap = new HashMap(); + + public static Map meteorMap = Maps.newHashMap(); public static void registerMeteor(ItemStack stack, Meteor holder) { - ItemStackWrapper wrapper = ItemStackWrapper.getHolder(stack); - if (wrapper != null) { - meteorMap.put(wrapper, holder); - } + if (!stack.isEmpty()) + meteorMap.put(stack, holder); } public static void registerMeteor(ItemStack stack, List componentList, float explosionStrength, int radius) { @@ -25,20 +24,21 @@ public class MeteorRegistry { registerMeteor(stack, holder); } - public static boolean hasMeteorForItem(ItemStack stack) { - ItemStackWrapper wrapper = ItemStackWrapper.getHolder(stack); - return wrapper != null && meteorMap.containsKey(wrapper); - } - + @Nullable public static Meteor getMeteorForItem(ItemStack stack) { - ItemStackWrapper wrapper = ItemStackWrapper.getHolder(stack); - return wrapper != null ? meteorMap.get(wrapper) : null; + if (stack.isEmpty()) + return null; + + for (Map.Entry entry : meteorMap.entrySet()) + if (ItemStack.areItemsEqual(stack, entry.getKey())) + return entry.getValue(); + + return null; } public static void generateMeteorForItem(ItemStack stack, World world, BlockPos pos, IBlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { - Meteor holder = getMeteorForItem(stack); - if (holder != null) { - holder.generateMeteor(world, pos, fillerBlock, radiusModifier, explosionModifier, fillerChance); - } + Meteor meteor = getMeteorForItem(stack); + if (meteor != null) + meteor.generateMeteor(world, pos, fillerBlock, radiusModifier, explosionModifier, fillerChance); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java index 81299c17..36706d6e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; +import WayofTime.bloodmagic.meteor.Meteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -50,10 +51,11 @@ public class RitualMeteor extends Ritual { for (EntityItem entityItem : itemList) { ItemStack stack = entityItem.getItem(); - if (MeteorRegistry.hasMeteorForItem(stack)) { - EntityMeteor meteor = new EntityMeteor(world, pos.getX(), 260, pos.getZ(), 0, -0.1, 0, radiusModifier, explosionModifier, fillerChance); - meteor.setMeteorStack(stack.copy()); - world.spawnEntity(meteor); + Meteor meteor = MeteorRegistry.getMeteorForItem(stack); + if (meteor != null) { + EntityMeteor entityMeteor = new EntityMeteor(world, pos.getX(), 260, pos.getZ(), 0, -0.1, 0, radiusModifier, explosionModifier, fillerChance); + entityMeteor.setMeteorStack(stack.copy()); + world.spawnEntity(entityMeteor); entityItem.setDead(); From 3fb708d2be0a981da85726d3ff233a9b0f96db29 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 13 Feb 2018 16:57:21 -0800 Subject: [PATCH 067/493] Fixed crafting order of decor bricks so polished is no longer a lonely boi (#1221) --- .../item/block/base/ItemBlockEnum.java | 2 +- .../demon_brick_1_brick1_corrosive.json | 2 +- .../demon_brick_1_brick1_destructive.json | 2 +- .../demon_decor/demon_brick_1_brick1_raw.json | 2 +- .../demon_brick_1_brick1_steadfast.json | 2 +- .../demon_brick_1_brick1_vengeful.json | 2 +- .../demon_extras_polished_stone_corrosive.json | 18 ++++++++++++++++++ ...emon_extras_polished_stone_destructive.json | 18 ++++++++++++++++++ .../demon_extras_polished_stone_raw.json | 18 ++++++++++++++++++ .../demon_extras_polished_stone_steadfast.json | 18 ++++++++++++++++++ .../demon_extras_polished_stone_vengeful.json | 18 ++++++++++++++++++ 11 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java index a241c1c9..25f7375d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java @@ -23,7 +23,7 @@ public class ItemBlockEnum & IStringSerializable> extends Item @Override public String getUnlocalizedName(ItemStack stack) { - return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, 15)].getName(); + return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName(); } @Override diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json index 021815ad..90d39443 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 1 + "data": 6 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json index ce28a636..31546399 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 2 + "data": 7 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json index 60a2b525..e226f9a7 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 0 + "data": 5 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json index 7aff9cee..18f5ad91 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 4 + "data": 9 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json index 4904ae75..8fa984f8 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 3 + "data": 8 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json new file mode 100644 index 00000000..a66bd811 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 6, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json new file mode 100644 index 00000000..5df3b1d9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 7, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json new file mode 100644 index 00000000..49240f26 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 5, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json new file mode 100644 index 00000000..73845172 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 9, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json new file mode 100644 index 00000000..6c4cd7c5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 8, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + } + } +} \ No newline at end of file From 65b89795bc3735dccf80478b7eabe12cce29c6d2 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 13 Feb 2018 17:24:06 -0800 Subject: [PATCH 068/493] Remove unnecessary base bindable class Jarbo 8 exists --- .../apibutnotreally/iface/IBindable.java | 14 ++++++-- .../apibutnotreally/iface/ISigil.java | 9 +++-- .../apibutnotreally/impl/ItemBindable.java | 35 ------------------- .../apibutnotreally/impl/ItemSigil.java | 16 ++------- .../bloodmagic/item/ItemBindableBase.java | 6 ++-- 5 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java index 19cca36f..37b32d8f 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.apibutnotreally.iface; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -7,6 +8,7 @@ import net.minecraft.item.ItemStack; * Implement this interface on any Item that can be bound to a player. */ public interface IBindable { + /** * Gets the username of the Item's owner. Usually for display, such as in * the tooltip. @@ -16,7 +18,9 @@ public interface IBindable { * @param stack - The owned ItemStack * @return - The username of the Item's owner */ - String getOwnerName(ItemStack stack); + default String getOwnerName(ItemStack stack) { + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; + } /** * Gets the UUID of the Item's owner. @@ -26,7 +30,9 @@ public interface IBindable { * @param stack - The owned ItemStack * @return - The UUID of the Item's owner */ - String getOwnerUUID(ItemStack stack); + default String getOwnerUUID(ItemStack stack) { + return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + } /** * Called when the player attempts to bind the item. @@ -35,5 +41,7 @@ public interface IBindable { * @param stack - The ItemStack to attempt binding * @return If binding was successful. */ - boolean onBind(EntityPlayer player, ItemStack stack); + default boolean onBind(EntityPlayer player, ItemStack stack) { + return true; + } } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java index 12f54b04..196aa098 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java @@ -12,9 +12,14 @@ import javax.annotation.Nonnull; * Sigils of Holdings. */ public interface ISigil { - boolean performArrayEffect(World world, BlockPos pos); - boolean hasArrayEffect(); + default boolean performArrayEffect(World world, BlockPos pos) { + return false; + } + + default boolean hasArrayEffect() { + return false; + } interface Holding { @Nonnull diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java deleted file mode 100644 index 2add8510..00000000 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java +++ /dev/null @@ -1,35 +0,0 @@ -package WayofTime.bloodmagic.apibutnotreally.impl; - -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * Base class for all bindable items. - */ -public class ItemBindable extends Item implements IBindable { - public ItemBindable() { - super(); - - setMaxStackSize(1); - } - - // IBindable - - @Override - public boolean onBind(EntityPlayer player, ItemStack stack) { - return true; - } - - @Override - public String getOwnerName(ItemStack stack) { - return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; - } - - @Override - public String getOwnerUUID(ItemStack stack) { - return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java index 3d2dbe87..208f2b67 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.apibutnotreally.impl; import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; /** * Base class for all (static) sigils. */ -public class ItemSigil extends ItemBindable implements ISigil { +public class ItemSigil extends Item implements IBindable, ISigil { private int lpUsed; public ItemSigil(int lpUsed) { @@ -32,16 +32,6 @@ public class ItemSigil extends ItemBindable implements ISigil { return stack; } - @Override - public boolean performArrayEffect(World world, BlockPos pos) { - return false; - } - - @Override - public boolean hasArrayEffect() { - return false; - } - public int getLpUsed() { return lpUsed; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index c413e43b..092c1bed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -1,11 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -13,11 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemBindableBase extends ItemBindable { +public class ItemBindableBase extends Item implements IBindable { public ItemBindableBase() { super(); setCreativeTab(BloodMagic.TAB_BM); + setMaxStackSize(1); } @Override From c03af41c884127e037e3c940ec4796f79f0305f0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 13 Feb 2018 23:32:15 -0800 Subject: [PATCH 069/493] Some subitem cleanup Still lots left to do. This will help prepare for The Flattening. --- .../bloodmagic/client/IMeshProvider.java | 4 +- .../core/RegistrarBloodMagicItems.java | 5 +- .../item/ItemActivationCrystal.java | 73 ++++++++++--------- .../bloodmagic/item/ItemBloodOrb.java | 10 +-- .../bloodmagic/item/ItemBloodShard.java | 50 ------------- .../bloodmagic/item/ItemDemonCrystal.java | 15 +--- .../WayofTime/bloodmagic/item/ItemEnum.java | 21 ++++-- .../item/ItemSacrificialDagger.java | 51 ++++++------- .../WayofTime/bloodmagic/item/ItemSlate.java | 65 +++++++---------- .../item/ItemTelepositionFocus.java | 68 ++++++++--------- .../bloodmagic/item/soul/ItemMonsterSoul.java | 67 ++++++++--------- .../bloodmagic/item/types/ShardType.java | 26 +++++++ .../blockstates/activation_crystal.json | 2 +- .../bloodmagic/blockstates/monster_soul.json | 2 +- .../assets/bloodmagic/lang/en_US.lang | 32 ++++---- 15 files changed, 210 insertions(+), 281 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ShardType.java diff --git a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java index d697da6f..6706e2c6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java +++ b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java @@ -36,5 +36,7 @@ public interface IMeshProvider { * @return - The custom ResourceLocation */ @Nullable - ResourceLocation getCustomLocation(); + default ResourceLocation getCustomLocation() { + return null; + } } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index dc216c97..5a8c6180 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -17,6 +17,7 @@ import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.item.types.ShardType; import com.google.common.collect.Lists; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; @@ -166,11 +167,11 @@ public class RegistrarBloodMagicItems { new ItemSigilClaw().setRegistryName("sigil_claw"), new ItemSigilBounce().setRegistryName("sigil_bounce"), new ItemSigilFrost().setRegistryName("sigil_frost"), - new ItemEnum<>(ComponentTypes.class, "baseComponent").setRegistryName("component"), + new ItemEnum.Variant<>(ComponentTypes.class, "baseComponent").setRegistryName("component"), new ItemDemonCrystal().setRegistryName("item_demon_crystal"), new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_tome"), - new ItemBloodShard().setRegistryName("blood_shard"), + new ItemEnum.Variant<>(ShardType.class, "blood_shard").setRegistryName("blood_shard"), new ItemLivingArmour(EntityEquipmentSlot.HEAD).setRegistryName("living_armour_helmet"), new ItemLivingArmour(EntityEquipmentSlot.CHEST).setRegistryName("living_armour_chest"), new ItemLivingArmour(EntityEquipmentSlot.LEGS).setRegistryName("living_armour_leggings"), diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index c0560ec7..7b2bb804 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -1,64 +1,65 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; +import java.util.Locale; -public class ItemActivationCrystal extends ItemBindableBase implements IVariantProvider { - public static String[] names = {"weak", "awakened", "creative"}; +public class ItemActivationCrystal extends ItemEnum.Variant implements IBindable { public ItemActivationCrystal() { - super(); + super(CrystalType.class, "activation_crystal"); - setUnlocalizedName(BloodMagic.MODID + ".activationCrystal."); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); + setMaxStackSize(1); + setCreativeTab(BloodMagic.TAB_BM); } @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.activationCrystal." + names[stack.getItemDamage()])); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.activation_crystal." + getItemType(stack).getInternalName())); + + if (!stack.hasTagCompound()) + return; + + if (!Strings.isNullOrEmpty(getOwnerUUID(stack))) + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); super.addInformation(stack, world, tooltip, flag); } - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=weak")); - ret.add(new ImmutablePair(1, "type=demonic")); - ret.add(new ImmutablePair(2, "type=creative")); - return ret; - } - public int getCrystalLevel(ItemStack stack) { return stack.getItemDamage() > 1 ? Integer.MAX_VALUE : stack.getItemDamage() + 1; } + + public enum CrystalType implements ISubItem { + WEAK, + AWAKENED, + CREATIVE, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, count, ordinal()); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 4318a90f..c18428b5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; @@ -23,7 +22,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.List; -public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindable { +public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { public ItemBloodOrb() { setUnlocalizedName(BloodMagic.MODID + ".orb"); this.setMaxDamage(0); @@ -109,13 +108,6 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab return true; } - // IBindable - - @Override - public boolean onBind(EntityPlayer player, ItemStack stack) { - return true; - } - // IBloodOrb @Nullable diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java deleted file mode 100644 index acbf2214..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; - -public class ItemBloodShard extends Item implements IVariantProvider { - public String[] names = {"weak", "demon"}; - - public ItemBloodShard() { - super(); - - setCreativeTab(BloodMagic.TAB_BM); - setUnlocalizedName(BloodMagic.MODID + ".bloodShard."); - setHasSubtypes(true); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; - } - - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=weak")); - ret.add(new ImmutablePair(1, "type=demonic")); - return ret; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index 508b1efd..89ed3f05 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -3,23 +3,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import com.google.common.collect.Lists; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; -import java.util.List; - -public class ItemDemonCrystal extends ItemEnum implements IDiscreteDemonWill, IVariantProvider { +public class ItemDemonCrystal extends ItemEnum.Variant implements IDiscreteDemonWill { public ItemDemonCrystal() { super(EnumDemonWillType.class, "demonCrystal"); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index 457089df..c4def10f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -15,7 +15,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.List; -public class ItemEnum & ISubItem> extends Item implements IVariantProvider { +public class ItemEnum & ISubItem> extends Item { protected final T[] types; @@ -48,12 +48,19 @@ public class ItemEnum & ISubItem> extends Item implements IVar return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)]; } - @Override - public List> getVariants() { - List> variants = Lists.newArrayList(); - for (int i = 0; i < types.length; i++) - variants.add(Pair.of(i, "type=" + types[i].getInternalName())); + public static class Variant & ISubItem> extends ItemEnum implements IVariantProvider { - return variants; + public Variant(Class enumClass, String baseName) { + super(enumClass, baseName); + } + + @Override + public List> getVariants() { + List> variants = Lists.newArrayList(); + for (int i = 0; i < types.length; i++) + variants.add(Pair.of(i, "type=" + types[i].getInternalName())); + + return variants; + } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 8107f15d..05563b0a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.Constants; @@ -9,18 +8,18 @@ import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; @@ -30,39 +29,22 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Locale; -public class ItemSacrificialDagger extends Item implements IMeshProvider { - public static String[] names = {"normal", "creative"}; +public class ItemSacrificialDagger extends ItemEnum implements IMeshProvider { public ItemSacrificialDagger() { - super(); + super(DaggerType.class, "sacrificial_dagger"); - setUnlocalizedName(BloodMagic.MODID + ".sacrificialDagger."); - setCreativeTab(BloodMagic.TAB_BM); setHasSubtypes(true); setMaxStackSize(1); setFull3D(); } - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.desc")))); @@ -191,9 +173,22 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider { return variants; } - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; + public enum DaggerType implements ISubItem { + + NORMAL, + CREATIVE, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER, count, ordinal()); + } } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index b2564ffb..b2d294b5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -1,47 +1,23 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; +import java.util.Locale; -public class ItemSlate extends Item implements IVariantProvider { - public String[] names = {"blank", "reinforced", "imbued", "demonic", "ethereal"}; +public class ItemSlate extends ItemEnum.Variant { public ItemSlate() { - super(); - - setCreativeTab(BloodMagic.TAB_BM); - setUnlocalizedName(BloodMagic.MODID + ".slate."); - setHasSubtypes(true); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + super(SlateType.class, "slate"); } @Override @@ -50,14 +26,25 @@ public class ItemSlate extends Item implements IVariantProvider { list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.slate.desc")))); } - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=blank")); - ret.add(new ImmutablePair(1, "type=reinforced")); - ret.add(new ImmutablePair(2, "type=imbued")); - ret.add(new ImmutablePair(3, "type=demonic")); - ret.add(new ImmutablePair(4, "type=ethereal")); - return ret; + public enum SlateType implements ISubItem { + + BLANK, + REINFORCED, + IMBUED, + DEMONIC, + ETHEREAL, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.SLATE, count, ordinal()); + } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 684e8cfa..37a765fe 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -1,56 +1,35 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; +import java.util.Locale; -public class ItemTelepositionFocus extends ItemBindableBase implements IVariantProvider { - public static String[] names = {"weak", "enhanced", "reinforced", "demonic"}; +public class ItemTelepositionFocus extends ItemEnum.Variant implements IBindable { public ItemTelepositionFocus() { - super(); + super(FocusType.class, "focus"); - setUnlocalizedName(BloodMagic.MODID + ".focus."); - setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); } @Override @@ -69,7 +48,7 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localize("tooltip.bloodmagic.telepositionFocus." + names[stack.getItemDamage()])))); + tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localize("tooltip.bloodmagic.telepositionFocus." + getItemType(stack).getInternalName())))); super.addInformation(stack, world, tooltip, flag); @@ -86,16 +65,6 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP } } - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=weak")); - ret.add(new ImmutablePair(1, "type=enhanced")); - ret.add(new ImmutablePair(2, "type=reinforced")); - ret.add(new ImmutablePair(3, "type=demonic")); - return ret; - } - public World getWorld(ItemStack stack) { stack = NBTHelper.checkNBT(stack); return DimensionManager.getWorld(stack.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); @@ -115,4 +84,25 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP itemTag.setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); return stack; } + + public enum FocusType implements ISubItem { + + WEAK, + ENHANCED, + REINFORCED, + DEMONIC, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, count, ordinal()); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 743ea4b1..fabc46cb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -1,53 +1,32 @@ package WayofTime.bloodmagic.item.soul; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.ItemEnum; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; +import java.util.Locale; -public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvider { - public static String[] names = {"base", "corrosive", "destructive", "vengeful", "steadfast"}; +public class ItemMonsterSoul extends ItemEnum.Variant implements IDemonWill { public ItemMonsterSoul() { - super(); + super(WillType.class, "monster_soul"); - setUnlocalizedName(BloodMagic.MODID + ".monsterSoul."); - setCreativeTab(BloodMagic.TAB_BM); - setHasSubtypes(true); setMaxStackSize(1); } - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; - } - - @Override - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { @@ -104,16 +83,6 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide return soulStack; } - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (int i = 0; i < names.length; i++) { - String name = names[i]; - ret.add(new ImmutablePair(i, "type=" + name)); - } - return ret; - } - @Override public double getWill(ItemStack willStack) { return this.getWill(EnumDemonWillType.DEFAULT, willStack); @@ -128,4 +97,26 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide public double drainWill(ItemStack willStack, double drainAmount) { return this.drainWill(EnumDemonWillType.DEFAULT, willStack, drainAmount); } + + public enum WillType implements ISubItem { + + RAW, + CORROSIVE, + DESTRUCTIVE, + VENGEFUL, + STEADFAST, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL, count, ordinal()); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java new file mode 100644 index 00000000..d3edd6e3 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java @@ -0,0 +1,26 @@ +package WayofTime.bloodmagic.item.types; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public enum ShardType implements ISubItem { + + WEAK, + DEMONIC, + ; + + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, count, ordinal()); + } +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json b/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json index 913aa3f8..b5535ec3 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json +++ b/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json @@ -11,7 +11,7 @@ "layer0": "bloodmagic:items/activationCrystalWeak" } }, - "demonic": { + "awakened": { "textures": { "layer0": "bloodmagic:items/activationCrystalAwakened" } diff --git a/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json b/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json index bbdebb50..3212e25c 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json +++ b/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json @@ -6,7 +6,7 @@ }, "variants": { "type": { - "base": { + "raw": { "textures": { "layer0": "bloodmagic:items/BaseMonsterSoul" } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 3482c754..27fb5cc3 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -3,12 +3,12 @@ itemGroup.bloodmagic.creativeTab=Blood Magic itemGroup.bloodmagic.creativeTabTome=Blood Magic | Tomes #Items -item.bloodmagic.activationCrystal.weak.name=Weak Activation Crystal -item.bloodmagic.activationCrystal.awakened.name=Awakened Activation Crystal -item.bloodmagic.activationCrystal.creative.name=Creative Activation Crystal +item.bloodmagic.activation_crystal.weak.name=Weak Activation Crystal +item.bloodmagic.activation_crystal.awakened.name=Awakened Activation Crystal +item.bloodmagic.activation_crystal.creative.name=Creative Activation Crystal -item.bloodmagic.sacrificialDagger.normal.name=Sacrificial Dagger -item.bloodmagic.sacrificialDagger.creative.name=Creative Sacrificial Dagger +item.bloodmagic.sacrificial_dagger.normal.name=Sacrificial Dagger +item.bloodmagic.sacrificial_dagger.creative.name=Creative Sacrificial Dagger item.bloodmagic.pack.selfSacrifice.name=Blood Letter's Pack item.bloodmagic.pack.sacrifice.name=Coat of Arms item.bloodmagic.daggerOfSacrifice.name=Dagger of Sacrifice @@ -63,8 +63,8 @@ item.bloodmagic.reagent.virtus.name=Virtus item.bloodmagic.reagent.reductus.name=Reductus item.bloodmagic.reagent.potentia.name=Potentia -item.bloodmagic.bloodShard.weak.name=Weak Blood Shard -item.bloodmagic.bloodShard.demon.name=Demon Blood Shard +item.bloodmagic.blood_shard.weak.name=Weak Blood Shard +item.bloodmagic.blood_shard.demonic.name=Demon Blood Shard item.bloodmagic.baseComponent.reagent_water.name=Water Reagent item.bloodmagic.baseComponent.reagent_lava.name=Lava Reagent @@ -110,11 +110,11 @@ item.bloodmagic.demonCrystal.destructive.name=Destructive Will Crystal item.bloodmagic.demonCrystal.vengeful.name=Vengeful Will Crystal item.bloodmagic.demonCrystal.steadfast.name=Steadfast Will Crystal -item.bloodmagic.monsterSoul.base.name=Demonic Will -item.bloodmagic.monsterSoul.corrosive.name=Corrosive Demonic Will -item.bloodmagic.monsterSoul.destructive.name=Destructive Demonic Will -item.bloodmagic.monsterSoul.vengeful.name=Vengeful Demonic Will -item.bloodmagic.monsterSoul.steadfast.name=Steadfast Demonic Will +item.bloodmagic.monster_soul.raw.name=Demonic Will +item.bloodmagic.monster_soul.corrosive.name=Corrosive Demonic Will +item.bloodmagic.monster_soul.destructive.name=Destructive Demonic Will +item.bloodmagic.monster_soul.vengeful.name=Vengeful Demonic Will +item.bloodmagic.monster_soul.steadfast.name=Steadfast Demonic Will item.bloodmagic.sigil.air.name=Air Sigil item.bloodmagic.sigil.blood_light.name=Sigil of the Blood Lamp @@ -124,7 +124,7 @@ item.bloodmagic.sigil.water.name=Water Sigil item.bloodmagic.sigil.lava.name=Lava Sigil item.bloodmagic.sigil.void.name=Void Sigil item.bloodmagic.sigil.green_grove.name=Sigil of the Green Grove -item.bloodmagic.sigil.elementalAffinity.name=Sigil of Elemental Affinity +item.bloodmagic.sigil.elemental_affinity.name=Sigil of Elemental Affinity item.bloodmagic.sigil.haste.name=Sigil of Haste item.bloodmagic.sigil.suppression.name=Sigil of Suppression item.bloodmagic.sigil.magnetism.name=Sigil of Magnetism @@ -440,9 +440,9 @@ tooltip.bloodmagic.pack.selfSacrifice.desc=This pack really chafes... tooltip.bloodmagic.pack.sacrifice.desc=Description tooltip.bloodmagic.pack.stored=Stored: %d LP -tooltip.bloodmagic.activationCrystal.weak=Activates low-level rituals -tooltip.bloodmagic.activationCrystal.awakened=Activates more powerful rituals -tooltip.bloodmagic.activationCrystal.creative=Creative Only - Activates any ritual +tooltip.bloodmagic.activation_crystal.weak=Activates low-level rituals +tooltip.bloodmagic.activation_crystal.awakened=Activates more powerful rituals +tooltip.bloodmagic.activation_crystal.creative=Creative Only - Activates any ritual tooltip.bloodmagic.diviner.currentRitual=Current Ritual: tooltip.bloodmagic.diviner.blankRune=Blank Runes: %d From 2afc235af7e4c985b828e74e3ad717109f880b67 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 14 Feb 2018 23:37:23 -0800 Subject: [PATCH 070/493] Move API to it's own source set --- build.gradle | 36 +++++++++++-------- .../bloodmagic/api/BloodMagicPlugin.java | 0 .../bloodmagic/api/IBloodMagicAPI.java | 0 .../bloodmagic/api/IBloodMagicBlacklist.java | 0 .../bloodmagic/api/IBloodMagicPlugin.java | 0 .../api/IBloodMagicRecipeRegistrar.java | 0 .../api/IBloodMagicValueManager.java | 0 .../api/event/BloodMagicCraftedEvent.java | 12 +++---- .../bloodmagic/api/package-info.java | 4 +++ .../bloodmagic/altar/BloodAltar.java | 2 +- .../bloodmagic/api/package-info.java | 5 --- 11 files changed, 32 insertions(+), 27 deletions(-) rename src/{main => api}/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java (100%) rename src/{main => api}/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java (100%) rename src/{main => api}/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java (100%) rename src/{main => api}/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java (100%) rename src/{main => api}/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java (100%) rename src/{main => api}/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java (100%) rename src/{main => api}/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java (76%) create mode 100644 src/api/java/WayofTime/bloodmagic/api/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/package-info.java diff --git a/build.gradle b/build.gradle index b11e08ca..8d66bf41 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" - id 'com.matthewprenger.cursegradle' version '1.0.9' + id 'com.matthewprenger.cursegradle' version '1.0.10' id 'io.franzbecker.gradle-lombok' version '1.6' id 'maven-publish' } @@ -69,16 +69,16 @@ processResources { } } -if (JavaVersion.current().isJava8Compatible()) { - allprojects { - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } +allprojects { + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') } } jar { classifier = '' + from sourceSets.main.output + from sourceSets.api.output manifest.mainAttributes( "Built-By": System.getProperty('user.name'), "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", @@ -88,22 +88,28 @@ jar { ) } -// API jar task apiJar(type: Jar) { - from sourceSets.main.allSource - from sourceSets.main.output - include 'WayofTime/bloodmagic/api/**/*' - exclude 'WayofTime/bloodmagic/api/impl/**/*' classifier = 'api' + from sourceSets.api.output + + // TODO: when FG bug is fixed, remove allJava from the api jar. + // https://github.com/MinecraftForge/ForgeGradle/issues/369 + // Gradle should be able to pull them from the -sources jar. + from sourceSets.api.allJava } -// Javadoc jar task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir classifier = 'javadoc' } -tasks.build.dependsOn javadoc, javadocJar, apiJar +task sourcesJar(type: Jar) { + classifier = 'sources' + from sourceSets.main.allJava + from sourceSets.api.allJava +} + +tasks.build.dependsOn javadoc, javadocJar, apiJar, sourcesJar tasks.withType(JavaCompile) { task -> task.options.encoding = 'UTF-8' @@ -115,7 +121,7 @@ publishing { mavenJava(MavenPublication) { artifact jar artifact javadocJar - artifact sourceJar + artifact sourcesJar artifact apiJar } } @@ -169,7 +175,7 @@ curseforge { relations curseRelations addArtifact javadocJar - addArtifact sourceJar + addArtifact sourcesJar addArtifact apiJar } } diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java b/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java similarity index 100% rename from src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java rename to src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java similarity index 100% rename from src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java rename to src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java similarity index 100% rename from src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java rename to src/api/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java similarity index 100% rename from src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java rename to src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java similarity index 100% rename from src/main/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java rename to src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java diff --git a/src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java similarity index 100% rename from src/main/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java rename to src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java diff --git a/src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java similarity index 76% rename from src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java rename to src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java index 507a3c30..1df4bb13 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java +++ b/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.event; -import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.fml.common.eventhandler.Event; public class BloodMagicCraftedEvent extends Event { @@ -34,16 +34,16 @@ public class BloodMagicCraftedEvent extends Event { */ public static class Altar extends BloodMagicCraftedEvent { - private final RecipeBloodAltar recipe; + private final Ingredient input; - public Altar(RecipeBloodAltar recipe, ItemStack output) { + public Altar(Ingredient input, ItemStack output) { super(output, true); - this.recipe = recipe; + this.input = input; } - public RecipeBloodAltar getRecipe() { - return recipe; + public Ingredient getInput() { + return input; } } } diff --git a/src/api/java/WayofTime/bloodmagic/api/package-info.java b/src/api/java/WayofTime/bloodmagic/api/package-info.java new file mode 100644 index 00000000..9d563054 --- /dev/null +++ b/src/api/java/WayofTime/bloodmagic/api/package-info.java @@ -0,0 +1,4 @@ +@API(owner = "bloodmagic", provides = "bloodmagic-api", apiVersion = "2.0.0") +package WayofTime.bloodmagic.api; + +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 2e94d54b..2002bfc5 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -314,7 +314,7 @@ public class BloodAltar implements IFluidHandler { if (progress >= liquidRequired * stackSize) { ItemStack result = recipe.getOutput().copy(); - BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(recipe, result); + BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(recipe.getInput(), result); MinecraftForge.EVENT_BUS.post(event); tileAltar.setInventorySlotContents(0, event.getOutput()); progress = 0; diff --git a/src/main/java/WayofTime/bloodmagic/api/package-info.java b/src/main/java/WayofTime/bloodmagic/api/package-info.java deleted file mode 100644 index d77cfda2..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|api", apiVersion = "2.0.0") -package WayofTime.bloodmagic.api; - -import WayofTime.bloodmagic.BloodMagic; -import net.minecraftforge.fml.common.API; \ No newline at end of file From 616c08094b4b6682cca0a0ca3eb19d0ce98b4d4f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 14 Feb 2018 23:38:57 -0800 Subject: [PATCH 071/493] Run formatter --- .../bloodmagic/api/IBloodMagicAPI.java | 16 ++--- .../api/IBloodMagicRecipeRegistrar.java | 34 +++++------ .../api/IBloodMagicValueManager.java | 22 +++---- .../java/WayofTime/bloodmagic/BloodMagic.java | 6 +- .../WayofTime/bloodmagic/ConfigHandler.java | 59 +++++++++---------- .../bloodmagic/altar/BloodAltar.java | 2 +- .../bloodmagic/api/impl/BloodMagicAPI.java | 7 +-- .../api/impl/BloodMagicCorePlugin.java | 6 +- .../AlchemyArrayEffectCraftingNew.java | 2 +- .../bloodmagic/block/BlockDemonCrystal.java | 1 - .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../AlchemyArrayCraftingRecipeJEI.java | 1 - .../provider/DataProviderBloodAltar.java | 1 - .../waila/provider/DataProviderMimic.java | 1 - .../core/RegistrarBloodMagicRecipes.java | 2 +- .../item/ItemActivationCrystal.java | 3 +- .../bloodmagic/item/ItemAltarMaker.java | 3 +- .../item/ItemDaggerOfSacrifice.java | 2 +- .../item/ItemSacrificialDagger.java | 3 +- .../WayofTime/bloodmagic/item/ItemSlate.java | 3 +- .../item/ItemTelepositionFocus.java | 3 +- .../item/sigil/ItemSigilGreenGrove.java | 2 +- .../item/sigil/ItemSigilTransposition.java | 2 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 3 +- .../bloodmagic/item/types/ComponentTypes.java | 3 +- .../bloodmagic/item/types/ShardType.java | 3 +- .../bloodmagic/potion/BMPotionUtils.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 10 +++- .../bloodmagic/ritual/RitualForsakenSoul.java | 2 +- .../bloodmagic/ritual/RitualGreenGrove.java | 2 +- .../bloodmagic/ritual/RitualMagnetic.java | 2 +- .../ritual/RitualWellOfSuffering.java | 2 +- .../bloodmagic/tile/TileIncenseAltar.java | 6 +- .../WayofTime/bloodmagic/util/ChatUtil.java | 4 +- .../java/WayofTime/bloodmagic/util/Utils.java | 7 ++- .../util/handler/event/GenericHandler.java | 2 +- 36 files changed, 108 insertions(+), 123 deletions(-) diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 8817dd25..776bee6d 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -35,18 +35,18 @@ public interface IBloodMagicAPI { /** * Registers an {@link IBlockState} as a given component for the Blood Altar. - * + *

* Valid component types: *

    - *
  • GLOWSTONE
    • - *
  • BLOODSTONE
    • - *
  • BEACON
    • - *
  • BLOODRUNE
    • - *
  • CRYSTAL
    • - *
  • NOTAIR
    • + *
  • GLOWSTONE
    • + *
  • BLOODSTONE
    • + *
  • BEACON
    • + *
  • BLOODRUNE
    • + *
  • CRYSTAL
    • + *
  • NOTAIR
    • *
* - * @param state The state to register + * @param state The state to register * @param componentType The type of Blood Altar component to register as. */ void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java index 61123c52..3817725d 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -16,12 +16,12 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Blood Altar. * - * @param input An input {@link Ingredient}. - * @param output An output {@link ItemStack}. + * @param input An input {@link Ingredient}. + * @param output An output {@link ItemStack}. * @param minimumTier The minimum Blood Altar tier required for this recipe. - * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. + * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. * @param consumeRate How quickly the Life Essence is syphoned. - * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. + * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. */ void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); @@ -29,7 +29,6 @@ public interface IBloodMagicRecipeRegistrar { * Removes a Blood Altar recipe based on an input {@link ItemStack}. * * @param input The input item to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeBloodAltar(@Nonnull ItemStack input); @@ -37,11 +36,11 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Alchemy Table. * - * @param output An output {@link ItemStack}. - * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. - * @param ticks The amount of ticks it takes to complete the craft. + * @param output An output {@link ItemStack}. + * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. + * @param ticks The amount of ticks it takes to complete the craft. * @param minimumTier The minimum Blood Orb tier required for this recipe. - * @param input An array of {@link Ingredient}s to accept as inputs. + * @param input An array of {@link Ingredient}s to accept as inputs. */ void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); @@ -49,7 +48,6 @@ public interface IBloodMagicRecipeRegistrar { * Removes an Alchemy Table recipe based on an input {@link ItemStack} array. * * @param input The input items to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeAlchemyTable(@Nonnull ItemStack... input); @@ -57,10 +55,10 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Soul/Tartaric Forge. * - * @param output An output {@link ItemStack}. + * @param output An output {@link ItemStack}. * @param minimumSouls The minimum number of souls that must be contained in the Soul Gem. - * @param soulDrain The number of souls to drain from the Soul Gem. - * @param input An array of {@link Ingredient}s to accept as inputs. + * @param soulDrain The number of souls to drain from the Soul Gem. + * @param input An array of {@link Ingredient}s to accept as inputs. */ void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); @@ -68,7 +66,6 @@ public interface IBloodMagicRecipeRegistrar { * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} array. * * @param input The input items to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeTartaricForge(@Nonnull ItemStack... input); @@ -76,9 +73,9 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Alchemy Array. * - * @param input An input {@link Ingredient}. First item put into the Alchemy Array. - * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. - * @param output An output {@link ItemStack}. + * @param input An input {@link Ingredient}. First item put into the Alchemy Array. + * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. + * @param output An output {@link ItemStack}. * @param circleTexture The texture to render for the Alchemy Array circle. */ void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture); @@ -86,9 +83,8 @@ public interface IBloodMagicRecipeRegistrar { /** * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's catalyst {@link ItemStack}. * - * @param input The input item to remove the recipe of. + * @param input The input item to remove the recipe of. * @param catalyst The catalyst item to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java index 1f22de5a..f51db50c 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java @@ -16,27 +16,27 @@ public interface IBloodMagicValueManager { * the value to 0 effectively disables sacrificing. * * @param entityId The registry name of the entity. - * @param value The amount of LP per health point to receive upon sacrifice. + * @param value The amount of LP per health point to receive upon sacrifice. */ void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); /** * Sets the Tranquility value of a given {@link IBlockState}. - * + *

* Valid tranquility types: *

    - *
  • PLANT
    • - *
  • CROP
    • - *
  • TREE
    • - *
  • EARTHEN
    • - *
  • WATER
    • - *
  • FIRE
    • - *
  • LAVA
    • + *
  • PLANT
    • + *
  • CROP
    • + *
  • TREE
    • + *
  • EARTHEN
    • + *
  • WATER
    • + *
  • FIRE
    • + *
  • LAVA
    • *
* - * @param state The {@link IBlockState} to set the value of. + * @param state The {@link IBlockState} to set the value of. * @param tranquilityType The type of Tranquility this block should provide. - * @param value The amount of tranquility this block should provide. + * @param value The amount of tranquility this block should provide. */ void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value); } diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 08bdce42..c8671049 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.BloodMagicPlugin; -import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 23e12138..0a87cb07 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -11,36 +11,44 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class ConfigHandler { - @Config.Comment({ "Blacklist options for various features" }) + @Config.Comment({"Blacklist options for various features"}) public static ConfigBlacklist blacklist = new ConfigBlacklist(); - @Config.Comment({ "Value modifiers for various features" }) + @Config.Comment({"Value modifiers for various features"}) public static ConfigValues values = new ConfigValues(); - @Config.Comment({ "Toggles for all rituals" }) + @Config.Comment({"Toggles for all rituals"}) public static ConfigRituals rituals = new ConfigRituals(); - @Config.Comment({ "Settings that only pertain to the client" }) + @Config.Comment({"Settings that only pertain to the client"}) public static ConfigClient client = new ConfigClient(); - @Config.Comment({ "Compatibility settings" }) + @Config.Comment({"Compatibility settings"}) public static ConfigCompat compat = new ConfigCompat(); + @SubscribeEvent + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { + if (event.getModID().equals(BloodMagic.MODID)) { + ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values + MeteorConfigHandler.handleMeteors(false); // Reload meteors + } + } + public static class ConfigBlacklist { - @Config.Comment({ "Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state." }) - public String[] teleposer = { "bedrock", "mob_spawner" }; - @Config.Comment({ "Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid." }) - public String[] transposer = { "bedrock", "mob_spawner" }; - @Config.Comment({ "Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid." }) - public String[] wellOfSuffering = { }; + @Config.Comment({"Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state."}) + public String[] teleposer = {"bedrock", "mob_spawner"}; + @Config.Comment({"Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid."}) + public String[] transposer = {"bedrock", "mob_spawner"}; + @Config.Comment({"Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid."}) + public String[] wellOfSuffering = {}; } public static class ConfigValues { - @Config.Comment({ "Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid." }) - public String[] sacrificialValues = { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100" }; - @Config.Comment({ "Amount of LP the Coat of Arms should provide for each damage dealt." }) + @Config.Comment({"Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid."}) + public String[] sacrificialValues = {"villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100"}; + @Config.Comment({"Amount of LP the Coat of Arms should provide for each damage dealt."}) @Config.RangeInt(min = 0, max = 100) public int coatOfArmsConversion = 20; - @Config.Comment({ "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) + @Config.Comment({"Amount of LP the Sacrificial Dagger should provide for each damage dealt."}) @Config.RangeInt(min = 0, max = 10000) public int sacrificialDaggerConversion = 100; - @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) + @Config.Comment({"Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated."}) public boolean shouldResyncMeteors = true; } @@ -85,31 +93,22 @@ public class ConfigHandler { } public static class ConfigClient { - @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) + @Config.Comment({"Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held."}) public boolean alwaysRenderRoutingLines = false; - @Config.Comment({ "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) + @Config.Comment({"Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed."}) public boolean invisibleSpectralBlocks = true; - @Config.Comment({ "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar." }) + @Config.Comment({"When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar."}) public boolean sigilHoldingSkipsEmptySlots = false; } public static class ConfigCompat { - @Config.Comment({ "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) + @Config.Comment({"The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory."}) public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; public enum AltarDisplayMode { ALWAYS, SIGIL_HELD, - SIGIL_CONTAINED, - ; - } - } - - @SubscribeEvent - public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.getModID().equals(BloodMagic.MODID)) { - ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values - MeteorConfigHandler.handleMeteors(false); // Reload meteors + SIGIL_CONTAINED,; } } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 2002bfc5..859c2ffd 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.apibutnotreally.BlockStack; import WayofTime.bloodmagic.apibutnotreally.Constants; @@ -8,7 +9,6 @@ import WayofTime.bloodmagic.apibutnotreally.altar.*; import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 3a6ab28c..df5dc2b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,16 +1,13 @@ package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.api.IBloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; -import java.util.*; +import java.util.List; public class BloodMagicAPI implements IBloodMagicAPI { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 4d456f95..f6255a0f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -2,18 +2,18 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.TranquilityStack; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; +import WayofTime.bloodmagic.incense.EnumTranquilityType; +import WayofTime.bloodmagic.incense.TranquilityStack; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java index 076c049d..6b06b090 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java @@ -17,7 +17,7 @@ public class AlchemyArrayEffectCraftingNew extends AlchemyArrayEffect { public AlchemyArrayEffectCraftingNew(String key, RecipeAlchemyArray recipeAlchemyArray) { super(key); - + this.recipe = recipeAlchemyArray; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 9af126b3..7d286cd3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 553f791c..92fae1bf 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.incense.IIncensePath; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumPath; +import WayofTime.bloodmagic.incense.IIncensePath; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java index fe451eb0..ce5ec8a6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index e50f80cf..a7d3a22d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java index 3900f95e..e4bf0264 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; import javax.annotation.Nonnull; -import java.util.List; public class DataProviderMimic implements IWailaDataProvider { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 48937522..ba331b03 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -42,7 +42,7 @@ public class RegistrarBloodMagicRecipes { ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); - ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); + ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 7b2bb804..73972287 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -47,8 +47,7 @@ public class ItemActivationCrystal extends ItemEnum.Variant { REINFORCED, IMBUED, DEMONIC, - ETHEREAL, - ; + ETHEREAL,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 37a765fe..8f9a0cdc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -90,8 +90,7 @@ public class ItemTelepositionFocus extends ItemEnum.Variant CORROSIVE, DESTRUCTIVE, VENGEFUL, - STEADFAST, - ; + STEADFAST,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java index c49aa09b..89474201 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java @@ -40,8 +40,7 @@ public enum ComponentTypes implements ISubItem { CATALYST_POWER_1, REAGENT_CLAW, REAGENT_BOUNCE, - REAGENT_FROST, - ; + REAGENT_FROST,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java index d3edd6e3..f3ca9233 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java @@ -9,8 +9,7 @@ import java.util.Locale; public enum ShardType implements ISubItem { WEAK, - DEMONIC, - ; + DEMONIC,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 0a9f94d7..392a6386 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.potion; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index db223ce5..de382992 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -6,7 +6,10 @@ import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.*; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; @@ -36,7 +39,10 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class ModRecipes { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index 537b8fc7..4e71364d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 9e42209c..2bac524c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 1f55d2f8..794bb119 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -23,7 +23,7 @@ import java.util.Map; public class RitualMagnetic extends Ritual { public static final String PLACEMENT_RANGE = "placementRange"; private static final Map oreBlockCache = new HashMap(); -// public static final String SEARCH_RANGE = "searchRange"; + // public static final String SEARCH_RANGE = "searchRange"; public BlockPos lastPos; // An offset public RitualMagnetic() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index 86eaf30a..bda9622f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 51afef15..bae862d0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,12 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.IIncensePath; -import WayofTime.bloodmagic.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.incense.IncenseAltarHandler; +import WayofTime.bloodmagic.incense.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 5ff4bd36..e11ccb24 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -185,8 +185,8 @@ public class ChatUtil { /** * @author tterrag1098 - *

- * Ripped from EnderCore (and slightly altered) + *

+ * Ripped from EnderCore (and slightly altered) */ public static class PacketNoSpamChat implements IMessage { private ITextComponent[] chatLines; diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 19d1e886..fa590b7e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -49,7 +49,10 @@ import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.UUID; public class Utils { public static float addAbsorptionToMaximum(EntityLivingBase entity, float added, int maximum, int duration) { @@ -952,7 +955,7 @@ public class Utils { double reachDistance = 5.0D; if (player instanceof EntityPlayerMP) - reachDistance = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance(); + reachDistance = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance(); Vec3d reachPosition = eyePosition.addVector((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 0dae83b8..e75009fe 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; @@ -14,7 +15,6 @@ import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.apibutnotreally.util.helper.*; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; From 2fecb427fd41aafd0d66f45631d72e426f8e74a0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 15 Feb 2018 18:49:01 -0800 Subject: [PATCH 072/493] Merge apibutnotreally with the main packages Do not consider anything outside of the true API safe to use. And even then, I'm changing things. Just wait. Please I beg you. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 6 ++--- .../AlchemyArrayEffect.java | 4 +-- .../AlchemyArrayEffectAttractor.java | 1 - .../AlchemyArrayEffectBinding.java | 2 -- .../AlchemyArrayEffectBounce.java | 3 +-- .../AlchemyArrayEffectCrafting.java | 2 +- .../AlchemyArrayEffectCraftingNew.java | 2 +- .../AlchemyArrayEffectMovement.java | 3 +-- .../alchemyArray/AlchemyArrayEffectSigil.java | 3 +-- .../AlchemyArrayEffectSkeletonTurret.java | 1 - .../AlchemyArrayEffectUpdraft.java | 3 +-- .../AlchemyCircleRenderer.java | 2 +- .../altar/AltarComponent.java | 2 +- .../altar/AltarUpgrade.java | 2 +- .../bloodmagic/altar/BloodAltar.java | 11 ++++---- .../altar/EnumAltarComponent.java | 2 +- .../altar/EnumAltarTier.java | 2 +- .../altar/IAltarComponent.java | 2 +- .../altar/IAltarManipulator.java | 2 +- .../altar/IBloodAltar.java | 2 +- .../bloodmagic/api/impl/BloodMagicAPI.java | 2 +- .../api/impl/BloodMagicCorePlugin.java | 2 +- .../api/impl/BloodMagicRecipeRegistrar.java | 2 +- .../api/impl/recipe/RecipeBloodAltar.java | 2 +- .../apibutnotreally/package-info.java | 6 ----- .../bloodmagic/block/BlockAlchemyTable.java | 2 +- .../bloodmagic/block/BlockAltar.java | 20 +++++++-------- .../bloodmagic/block/BlockDemonCrucible.java | 4 +-- .../bloodmagic/block/BlockDemonCrystal.java | 4 +-- .../block/BlockDimensionalPortal.java | 6 ++--- .../block/BlockInputRoutingNode.java | 2 +- .../bloodmagic/block/BlockLifeEssence.java | 2 +- .../bloodmagic/block/BlockMimic.java | 4 +-- .../block/BlockOutputRoutingNode.java | 2 +- .../block/BlockRitualController.java | 14 +++++------ .../bloodmagic/block/BlockRitualStone.java | 4 +-- .../bloodmagic/block/BlockSoulForge.java | 2 +- .../bloodmagic/block/BlockTeleposer.java | 2 +- .../block/enums/EnumSubWillType.java | 2 +- .../bloodmagic/client/gui/GuiHandler.java | 2 +- .../client/hud/HUDElementDemonWillAura.java | 2 +- .../mesh/CustomMeshDefinitionActivatable.java | 2 +- .../mesh/CustomMeshDefinitionMultiWill.java | 4 +-- .../mesh/CustomMeshDefinitionWillGem.java | 2 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 2 +- .../DualAlchemyCircleRenderer.java | 2 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../render/block/RenderAlchemyArray.java | 4 +-- .../client/render/block/RenderAltar.java | 4 +-- .../render/block/RenderItemRoutingNode.java | 2 +- .../command/sub/SubCommandBind.java | 8 +++--- .../command/sub/SubCommandNetwork.java | 4 +-- .../bloodmagic/command/sub/SubCommandOrb.java | 6 ++--- .../bloodmagic/compat/guideapi/BookUtils.java | 4 +-- .../compat/guideapi/book/CategoryAlchemy.java | 2 +- .../guideapi/book/CategoryArchitect.java | 6 ++--- .../compat/guideapi/book/CategoryDemon.java | 2 +- .../compat/guideapi/book/CategoryRitual.java | 4 +-- .../compat/guideapi/book/CategorySpell.java | 2 +- .../compat/guideapi/page/PageAltarRecipe.java | 4 +-- .../page/PageTartaricForgeRecipe.java | 4 +-- .../compat/jei/BloodMagicJEIPlugin.java | 6 ++--- .../AlchemyArrayCraftingCategory.java | 2 +- .../AlchemyTableRecipeCategory.java | 4 +-- .../AlchemyTableRecipeHandler.java | 2 +- .../alchemyTable/AlchemyTableRecipeJEI.java | 2 +- .../alchemyTable/AlchemyTableRecipeMaker.java | 4 +-- .../compat/jei/altar/AltarRecipeCategory.java | 2 +- .../ArmourDowngradeRecipeCategory.java | 2 +- .../ArmourDowngradeRecipeHandler.java | 2 +- .../ArmourDowngradeRecipeJEI.java | 4 +-- .../ArmourDowngradeRecipeMaker.java | 4 +-- .../jei/binding/BindingRecipeCategory.java | 2 +- .../jei/binding/BindingRecipeHandler.java | 2 +- .../jei/binding/BindingRecipeMaker.java | 6 ++--- .../forge/TartaricForgeRecipeCategory.java | 2 +- .../compat/waila/BloodMagicHwylaPlugin.java | 2 +- .../provider/DataProviderAlchemyArray.java | 2 +- .../provider/DataProviderBloodAltar.java | 2 +- .../waila/provider/DataProviderBloodTank.java | 2 +- .../DataProviderRitualController.java | 12 ++++----- .../waila/provider/DataProviderTeleposer.java | 2 +- .../compress/AdvancedCompressionHandler.java | 2 -- .../compress/BaseCompressionHandler.java | 1 - .../compress/CompressionHandler.java | 2 +- .../compress/CompressionRegistry.java | 2 +- .../compress/StorageBlockCraftingManager.java | 1 - .../bloodmagic/core/RegistrarBloodMagic.java | 4 +-- .../core/RegistrarBloodMagicRecipes.java | 8 +++--- .../data}/BMWorldSavedData.java | 4 +-- .../saving => core/data}/SoulNetwork.java | 16 ++++++------ .../core/recipe/IngredientBloodOrb.java | 6 ++--- .../registry/AlchemyArrayRecipeRegistry.java | 10 ++++---- .../registry/AlchemyTableRecipeRegistry.java | 4 +-- .../registry/AltarRecipeRegistry.java | 10 ++++---- .../registry/HarvestRegistry.java | 6 ++--- .../registry/ImperfectRitualRegistry.java | 12 ++++----- .../LivingArmourDowngradeRecipeRegistry.java | 6 ++--- .../registry/OrbRegistry.java | 6 ++--- .../registry/RitualRegistry.java | 14 +++++------ .../registry/TartaricForgeRecipeRegistry.java | 4 +-- .../bloodmagic/demonAura/WillChunk.java | 2 +- .../demonAura/WorldDemonWillHandler.java | 10 ++++---- .../entity/mob/EntityAspectedDemonBase.java | 4 +-- .../entity/mob/EntityCorruptedChicken.java | 2 +- .../entity/mob/EntityCorruptedSheep.java | 2 +- .../entity/mob/EntityCorruptedSpider.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 4 +-- .../entity/projectile/EntityBloodLight.java | 2 +- .../entity/projectile/EntityMeteor.java | 2 +- .../projectile/EntitySentientArrow.java | 6 ++--- .../event/AddToNetworkEvent.java | 2 +- .../event/AltarCraftedEvent.java | 4 +-- .../event/BoundToolEvent.java | 2 +- .../event/ItemBindEvent.java | 4 +-- .../event/RitualEvent.java | 10 ++++---- .../event/SacrificeKnifeUsedEvent.java | 2 +- .../event/SoulNetworkEvent.java | 2 +- .../event/TeleposeEvent.java | 2 +- .../bloodmagic/gson/Serializers.java | 2 +- .../iface/IActivatable.java | 2 +- .../iface/IAlchemyArray.java | 2 +- .../iface/IAltarReader.java | 2 +- .../iface/IBindable.java | 4 +-- .../iface/ICustomAlchemyConsumable.java | 2 +- .../iface/IDemonWillViewer.java | 2 +- .../iface/IDocumentedBlock.java | 2 +- .../iface/IHarvestHandler.java | 7 +++--- .../iface/IItemLPContainer.java | 2 +- .../iface/IMultiWillTool.java | 4 +-- .../iface/INodeRenderer.java | 2 +- .../iface/IPurificationAsh.java | 2 +- .../iface/ISentientSwordEffectProvider.java | 4 +-- .../iface/ISentientTool.java | 2 +- .../{apibutnotreally => }/iface/ISigil.java | 5 ++-- .../iface/IUpgradeTrainer.java | 2 +- .../inversion/CorruptionHandler.java | 2 +- .../inversion/InversionPillarHandler.java | 2 +- .../item/ItemActivationCrystal.java | 4 +-- .../bloodmagic/item/ItemAltarMaker.java | 7 +++--- .../bloodmagic/item/ItemBindableBase.java | 4 +-- .../bloodmagic/item/ItemBloodOrb.java | 8 +++--- .../bloodmagic/item/ItemBoundAxe.java | 6 ++--- .../bloodmagic/item/ItemBoundPickaxe.java | 6 ++--- .../bloodmagic/item/ItemBoundShovel.java | 6 ++--- .../bloodmagic/item/ItemBoundSword.java | 12 ++++----- .../bloodmagic/item/ItemBoundTool.java | 16 ++++++------ .../item/ItemDaggerOfSacrifice.java | 7 +++--- .../bloodmagic/item/ItemDemonCrystal.java | 4 +-- .../bloodmagic/item/ItemDemonWillGauge.java | 2 +- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemInscriptionTool.java | 6 ++--- .../bloodmagic/item/ItemLavaCrystal.java | 4 +-- .../bloodmagic/item/ItemPotionFlask.java | 2 +- .../bloodmagic/item/ItemRitualDiviner.java | 14 +++++------ .../bloodmagic/item/ItemRitualReader.java | 12 ++++----- .../item/ItemSacrificialDagger.java | 16 ++++++------ .../bloodmagic/item/ItemSanguineBook.java | 10 ++++---- .../impl => item}/ItemSigil.java | 10 ++++---- .../impl => item}/ItemSigilToggleable.java | 14 +++++------ .../item/ItemTelepositionFocus.java | 6 ++--- .../bloodmagic/item/ItemUpgradeTome.java | 6 ++--- .../bloodmagic/item/ItemUpgradeTrainer.java | 8 +++--- .../item/alchemy/ItemCuttingFluid.java | 4 +-- .../item/armour/ItemLivingArmour.java | 12 ++++----- .../item/armour/ItemSentientArmour.java | 10 ++++---- .../item/block/ItemBlockDemonCrystal.java | 2 +- .../item/gear/ItemPackSacrifice.java | 12 ++++----- .../item/gear/ItemPackSelfSacrifice.java | 14 +++++------ .../item/inventory/ContainerHolding.java | 2 +- .../item/inventory/InventoryHolding.java | 4 +-- .../item/inventory/ItemInventory.java | 4 +-- .../item/routing/ItemNodeRouter.java | 6 ++--- .../bloodmagic/item/sigil/ItemSigilAir.java | 10 ++++---- .../bloodmagic/item/sigil/ItemSigilBase.java | 4 +-- .../item/sigil/ItemSigilBloodLight.java | 10 ++++---- .../item/sigil/ItemSigilBounce.java | 2 +- .../bloodmagic/item/sigil/ItemSigilClaw.java | 2 +- .../item/sigil/ItemSigilCompression.java | 4 +-- .../item/sigil/ItemSigilDivination.java | 8 +++--- .../sigil/ItemSigilElementalAffinity.java | 2 +- .../item/sigil/ItemSigilEnderSeverance.java | 2 +- .../item/sigil/ItemSigilFastMiner.java | 6 ++--- .../item/sigil/ItemSigilFilledHand.java | 2 +- .../bloodmagic/item/sigil/ItemSigilFrost.java | 2 +- .../item/sigil/ItemSigilGreenGrove.java | 2 +- .../bloodmagic/item/sigil/ItemSigilHaste.java | 2 +- .../item/sigil/ItemSigilHolding.java | 12 ++++----- .../bloodmagic/item/sigil/ItemSigilLava.java | 6 ++--- .../item/sigil/ItemSigilMagnetism.java | 2 +- .../item/sigil/ItemSigilPhantomBridge.java | 2 +- .../bloodmagic/item/sigil/ItemSigilSeer.java | 8 +++--- .../item/sigil/ItemSigilSuppression.java | 2 +- .../item/sigil/ItemSigilTeleposition.java | 10 ++++---- .../item/sigil/ItemSigilToggleableBase.java | 4 +-- .../item/sigil/ItemSigilTransposition.java | 12 ++++----- .../bloodmagic/item/sigil/ItemSigilVoid.java | 6 ++--- .../bloodmagic/item/sigil/ItemSigilWater.java | 6 ++--- .../item/sigil/ItemSigilWhirlwind.java | 2 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 8 +++--- .../item/soul/ItemSentientArmourGem.java | 4 +-- .../bloodmagic/item/soul/ItemSentientAxe.java | 18 ++++++------- .../bloodmagic/item/soul/ItemSentientBow.java | 12 ++++----- .../item/soul/ItemSentientPickaxe.java | 18 ++++++------- .../item/soul/ItemSentientShovel.java | 18 ++++++------- .../item/soul/ItemSentientSword.java | 18 ++++++------- .../bloodmagic/item/soul/ItemSoulGem.java | 14 +++++------ .../livingArmour/ILivingArmour.java | 2 +- .../bloodmagic/livingArmour/LivingArmour.java | 6 +---- .../livingArmour/LivingArmourHandler.java | 6 ++--- .../livingArmour/LivingArmourUpgrade.java | 2 +- .../livingArmour/StatTracker.java | 3 +-- .../LivingArmourUpgradeBattleHungry.java | 4 +-- .../LivingArmourUpgradeCrippledArm.java | 4 +-- .../LivingArmourUpgradeDigSlowdown.java | 4 +-- .../LivingArmourUpgradeDisoriented.java | 4 +-- .../LivingArmourUpgradeMeleeDecrease.java | 4 +-- .../LivingArmourUpgradeQuenched.java | 4 +-- .../LivingArmourUpgradeSlippery.java | 4 +-- .../LivingArmourUpgradeSlowHeal.java | 4 +-- .../LivingArmourUpgradeSlowness.java | 4 +-- .../LivingArmourUpgradeStormTrooper.java | 4 +-- .../tracker/StatTrackerArrowProtect.java | 4 +-- .../tracker/StatTrackerArrowShot.java | 4 +-- .../tracker/StatTrackerCriticalStrike.java | 4 +-- .../tracker/StatTrackerDigging.java | 4 +-- .../tracker/StatTrackerExperience.java | 4 +-- .../tracker/StatTrackerFallProtect.java | 4 +-- .../tracker/StatTrackerFireResist.java | 4 +-- .../livingArmour/tracker/StatTrackerFood.java | 4 +-- .../tracker/StatTrackerGraveDigger.java | 4 +-- .../tracker/StatTrackerGrimReaperSprint.java | 4 +-- .../tracker/StatTrackerHealthboost.java | 4 +-- .../livingArmour/tracker/StatTrackerJump.java | 4 +-- .../tracker/StatTrackerMeleeDamage.java | 4 +-- .../tracker/StatTrackerMovement.java | 4 +-- .../tracker/StatTrackerNightSight.java | 4 +-- .../tracker/StatTrackerPhysicalProtect.java | 4 +-- .../tracker/StatTrackerPoison.java | 4 +-- .../tracker/StatTrackerRepairing.java | 4 +-- .../tracker/StatTrackerSelfSacrifice.java | 4 +-- .../tracker/StatTrackerSolarPowered.java | 4 +-- .../tracker/StatTrackerSprintAttack.java | 4 +-- .../tracker/StatTrackerStepAssist.java | 4 +-- .../LivingArmourUpgradeArrowProtect.java | 2 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 4 +-- .../LivingArmourUpgradeCriticalStrike.java | 2 +- .../upgrade/LivingArmourUpgradeDigging.java | 4 +-- .../upgrade/LivingArmourUpgradeElytra.java | 4 +-- .../LivingArmourUpgradeExperience.java | 2 +- .../LivingArmourUpgradeFallProtect.java | 2 +- .../LivingArmourUpgradeFireResist.java | 6 ++--- .../LivingArmourUpgradeGraveDigger.java | 2 +- .../LivingArmourUpgradeGrimReaperSprint.java | 4 +-- .../LivingArmourUpgradeHealthboost.java | 4 +-- .../upgrade/LivingArmourUpgradeJump.java | 4 +-- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 4 +-- .../LivingArmourUpgradeNightSight.java | 6 ++--- .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../LivingArmourUpgradePoisonResist.java | 6 ++--- .../upgrade/LivingArmourUpgradeRepairing.java | 4 +-- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSolarPowered.java | 4 +-- .../upgrade/LivingArmourUpgradeSpeed.java | 4 +-- .../LivingArmourUpgradeSprintAttack.java | 2 +- .../LivingArmourUpgradeStepAssist.java | 4 +-- .../network/DemonAuraPacketProcessor.java | 4 +-- .../{apibutnotreally => }/orb/BloodOrb.java | 2 +- .../{apibutnotreally => }/orb/IBloodOrb.java | 2 +- .../bloodmagic/potion/BMPotionUtils.java | 7 +++--- .../potion/PotionEventHandlers.java | 2 +- .../bloodmagic/proxy/ClientProxy.java | 4 +-- .../bloodmagic/proxy/CommonProxy.java | 6 ++--- .../recipe/AlchemyTableCustomRecipe.java | 4 +-- .../recipe/AlchemyTableRecipe.java | 2 +- .../recipe/LivingArmourDowngradeRecipe.java | 4 +-- .../recipe/TartaricForgeRecipe.java | 2 +- .../AlchemyTableDyeableRecipe.java | 4 +-- .../AlchemyTablePotionRecipe.java | 2 +- .../registry/ModArmourTrackers.java | 2 +- .../registry/ModCorruptionBlocks.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 18 ++++++------- .../bloodmagic/registry/ModRituals.java | 12 ++++----- .../bloodmagic/ritual/RitualAltarBuilder.java | 16 ++++++------ .../bloodmagic/ritual/RitualAnimalGrowth.java | 4 +-- .../bloodmagic/ritual/RitualArmourEvolve.java | 2 +- .../bloodmagic/ritual/RitualCobblestone.java | 2 +- .../bloodmagic/ritual/RitualContainment.java | 4 +-- .../bloodmagic/ritual/RitualCrushing.java | 10 ++++---- .../ritual/RitualCrystalHarvest.java | 2 +- .../bloodmagic/ritual/RitualExpulsion.java | 6 ++--- .../ritual/RitualFeatheredKnife.java | 10 ++++---- .../bloodmagic/ritual/RitualFelling.java | 2 +- .../bloodmagic/ritual/RitualForsakenSoul.java | 2 +- .../bloodmagic/ritual/RitualFullStomach.java | 2 +- .../bloodmagic/ritual/RitualGreenGrove.java | 6 ++--- .../bloodmagic/ritual/RitualHarvest.java | 8 +++--- .../bloodmagic/ritual/RitualInterdiction.java | 4 +-- .../bloodmagic/ritual/RitualJumping.java | 2 +- .../bloodmagic/ritual/RitualLava.java | 10 ++++---- .../ritual/RitualLivingArmourDowngrade.java | 8 +++--- .../bloodmagic/ritual/RitualMagnetic.java | 4 +-- .../bloodmagic/ritual/RitualMeteor.java | 4 +-- .../bloodmagic/ritual/RitualPlacer.java | 2 +- .../bloodmagic/ritual/RitualPortal.java | 10 ++++---- .../bloodmagic/ritual/RitualPump.java | 2 +- .../bloodmagic/ritual/RitualRegeneration.java | 8 +++--- .../bloodmagic/ritual/RitualSpeed.java | 4 +-- .../bloodmagic/ritual/RitualSuppression.java | 2 +- .../ritual/RitualUpgradeRemove.java | 8 +++--- .../bloodmagic/ritual/RitualWater.java | 2 +- .../ritual/RitualWellOfSuffering.java | 2 +- .../bloodmagic/ritual/RitualZephyr.java | 2 +- .../data}/AreaDescriptor.java | 4 +-- .../data}/CapabilityRuneType.java | 2 +- .../data}/EnumRitualReaderState.java | 2 +- .../ritual => ritual/data}/EnumRuneType.java | 2 +- .../data}/IMasterRitualStone.java | 6 ++--- .../ritual => ritual/data}/IRitualStone.java | 2 +- .../ritual => ritual/data}/Ritual.java | 9 ++++--- .../data}/RitualComponent.java | 2 +- .../data}/RitualRenderer.java | 2 +- .../imperfect/IImperfectRitualStone.java | 2 +- .../data}/imperfect/ImperfectRitual.java | 7 +++--- .../data}/imperfect/package-info.java | 2 +- .../harvest/HarvestHandlerPlantable.java | 6 ++--- .../ritual/harvest/HarvestHandlerStem.java | 6 ++--- .../ritual/harvest/HarvestHandlerTall.java | 6 ++--- .../ritual/imperfect/ImperfectRitualDay.java | 6 ++--- .../imperfect/ImperfectRitualNight.java | 6 ++--- .../ritual/imperfect/ImperfectRitualRain.java | 6 ++--- .../imperfect/ImperfectRitualResistance.java | 6 ++--- .../imperfect/ImperfectRitualZombie.java | 6 ++--- .../ritual/portal/LocationsHandler.java | 18 ++++++------- .../bloodmagic/ritual/portal/Teleports.java | 8 +++--- .../soul/DemonWillHolder.java | 2 +- .../soul/EnumDemonWillType.java | 2 +- .../soul/IDemonWill.java | 2 +- .../soul/IDemonWillConduit.java | 2 +- .../soul/IDemonWillGem.java | 2 +- .../soul/IDemonWillWeapon.java | 2 +- .../soul/IDiscreteDemonWill.java | 2 +- .../soul/PlayerDemonWillHandler.java | 5 ++-- .../bloodmagic/structures/Dungeon.java | 2 +- .../bloodmagic/structures/DungeonRoom.java | 2 +- .../teleport/ITeleport.java | 2 +- .../teleport/PortalLocation.java | 4 +-- .../teleport/Teleport.java | 2 +- .../teleport/TeleportQueue.java | 2 +- .../teleport/TeleporterBloodMagic.java | 2 +- .../bloodmagic/tile/TileAlchemyArray.java | 10 ++++---- .../bloodmagic/tile/TileAlchemyTable.java | 14 +++++------ .../WayofTime/bloodmagic/tile/TileAltar.java | 4 +-- .../bloodmagic/tile/TileBloodTank.java | 2 +- .../bloodmagic/tile/TileDemonCrucible.java | 8 +++--- .../bloodmagic/tile/TileDemonCrystal.java | 4 +-- .../tile/TileDemonCrystallizer.java | 6 ++--- .../bloodmagic/tile/TileDemonPylon.java | 6 ++--- .../tile/TileImperfectRitualStone.java | 10 ++++---- .../bloodmagic/tile/TileIncenseAltar.java | 4 +-- .../bloodmagic/tile/TileInversionPillar.java | 4 +-- .../tile/TileMasterRitualStone.java | 22 ++++++++-------- .../bloodmagic/tile/TilePhantomBlock.java | 2 +- .../tile/TilePurificationAltar.java | 6 ++--- .../bloodmagic/tile/TileSoulForge.java | 10 ++++---- .../bloodmagic/tile/TileSpectralBlock.java | 2 +- .../bloodmagic/tile/TileTeleposer.java | 12 ++++----- .../tile/container/ContainerAlchemyTable.java | 2 +- .../tile/container/ContainerSoulForge.java | 4 +-- .../tile/routing/TileFilteredRoutingNode.java | 2 +- .../tile/routing/TileMasterRoutingNode.java | 4 +-- .../tile/routing/TileRoutingNode.java | 2 +- .../{apibutnotreally => util}/BlockStack.java | 3 ++- .../{apibutnotreally => util}/Constants.java | 2 +- .../DamageSourceBloodMagic.java | 2 +- .../bloodmagic/util/GhostItemHelper.java | 3 +-- .../ItemStackWrapper.java | 3 ++- .../PleaseStopUsingMe.java} | 7 +++--- .../java/WayofTime/bloodmagic/util/Utils.java | 8 +++--- .../util/handler/event/ClientHandler.java | 8 +++--- .../util/handler/event/CraftingHandler.java | 12 ++++----- .../util/handler/event/GenericHandler.java | 25 +++++++++---------- .../handler/event/LivingArmourHandler.java | 4 +-- .../handler/event/StatTrackerHandler.java | 2 +- .../util/handler/event/WillHandler.java | 2 +- .../util/helper/BindableHelper.java | 8 +++--- .../util/helper/IncenseHelper.java | 4 +-- .../util/helper/ItemHelper.java | 12 ++++----- .../util/helper/LogHelper.java | 10 ++++---- .../util/helper/NBTHelper.java | 2 +- .../util/helper/NetworkHelper.java | 16 ++++++------ .../util/helper/PlayerHelper.java | 4 +-- .../util/helper/PlayerSacrificeHelper.java | 6 ++--- .../util/helper/PurificationHelper.java | 4 +-- .../bloodmagic/util/helper/RecipeHelper.java | 6 ++--- .../util/helper/RitualHelper.java | 12 ++++----- 399 files changed, 958 insertions(+), 977 deletions(-) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/alchemyCrafting => alchemyArray}/AlchemyArrayEffect.java (86%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/alchemyCrafting => alchemyArray}/AlchemyArrayEffectCrafting.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/alchemyCrafting => alchemyArray}/AlchemyArrayEffectCraftingNew.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/alchemyCrafting => alchemyArray}/AlchemyCircleRenderer.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/AltarComponent.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/AltarUpgrade.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/EnumAltarComponent.java (91%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/EnumAltarTier.java (99%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/IAltarComponent.java (84%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/IAltarManipulator.java (73%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/altar/IBloodAltar.java (95%) delete mode 100644 src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/compress/CompressionHandler.java (89%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/compress/CompressionRegistry.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/saving => core/data}/BMWorldSavedData.java (93%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/saving => core/data}/SoulNetwork.java (90%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/AlchemyArrayRecipeRegistry.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/AlchemyTableRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/AltarRecipeRegistry.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/HarvestRegistry.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/ImperfectRitualRegistry.java (87%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/LivingArmourDowngradeRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/OrbRegistry.java (91%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/RitualRegistry.java (87%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => core}/registry/TartaricForgeRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/AddToNetworkEvent.java (94%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/AltarCraftedEvent.java (87%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/BoundToolEvent.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/ItemBindEvent.java (87%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/RitualEvent.java (89%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/SacrificeKnifeUsedEvent.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/SoulNetworkEvent.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/event/TeleposeEvent.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IActivatable.java (78%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IAlchemyArray.java (66%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IAltarReader.java (72%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IBindable.java (92%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/ICustomAlchemyConsumable.java (82%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IDemonWillViewer.java (86%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IDocumentedBlock.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IHarvestHandler.java (78%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IItemLPContainer.java (83%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IMultiWillTool.java (52%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/INodeRenderer.java (72%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IPurificationAsh.java (80%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/ISentientSwordEffectProvider.java (74%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/ISentientTool.java (79%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/ISigil.java (79%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/iface/IUpgradeTrainer.java (86%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/impl => item}/ItemSigil.java (71%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/impl => item}/ItemSigilToggleable.java (89%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/livingArmour/ILivingArmour.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/livingArmour/LivingArmourHandler.java (89%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/livingArmour/LivingArmourUpgrade.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/livingArmour/StatTracker.java (94%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/orb/BloodOrb.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/orb/IBloodOrb.java (75%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/recipe/AlchemyTableCustomRecipe.java (91%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/recipe/AlchemyTableRecipe.java (99%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/recipe/LivingArmourDowngradeRecipe.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/recipe/TartaricForgeRecipe.java (99%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/AreaDescriptor.java (99%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/CapabilityRuneType.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/EnumRitualReaderState.java (62%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/EnumRuneType.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/IMasterRitualStone.java (88%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/IRitualStone.java (91%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/Ritual.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/RitualComponent.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/RitualRenderer.java (87%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/imperfect/IImperfectRitualStone.java (88%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/imperfect/ImperfectRitual.java (93%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/ritual => ritual/data}/imperfect/package-info.java (71%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/DemonWillHolder.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/EnumDemonWillType.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/IDemonWill.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/IDemonWillConduit.java (90%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/IDemonWillGem.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/IDemonWillWeapon.java (84%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/IDiscreteDemonWill.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/soul/PlayerDemonWillHandler.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/teleport/ITeleport.java (59%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/teleport/PortalLocation.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/teleport/Teleport.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/teleport/TeleportQueue.java (93%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/teleport/TeleporterBloodMagic.java (94%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => util}/BlockStack.java (97%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => util}/Constants.java (99%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => util}/DamageSourceBloodMagic.java (93%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => util}/ItemStackWrapper.java (98%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally/BloodMagicAPI.java => util/PleaseStopUsingMe.java} (74%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/BindableHelper.java (95%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/IncenseHelper.java (84%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/ItemHelper.java (92%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/LogHelper.java (74%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/NBTHelper.java (83%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/NetworkHelper.java (91%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/PlayerHelper.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/PlayerSacrificeHelper.java (96%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/PurificationHelper.java (89%) rename src/main/java/WayofTime/bloodmagic/{apibutnotreally => }/util/helper/RitualHelper.java (92%) diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index c8671049..18a83ef5 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -3,9 +3,9 @@ package WayofTime.bloodmagic; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.util.helper.LogHelper; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java index d08c968c..6bac1e53 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index e5888e90..9dc68b22 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.fakePlayer.FakePlayerBM; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index d8f09294..d3e9849c 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -1,7 +1,5 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java index a5d962b1..85d62dee 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java index 16712dee..9f658335 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java index 6b06b090..b96c9052 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java index 46cc3ed0..3bf96427 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java index 66ce98a8..beb4ba46 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.iface.ISigil; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index 5f02f6c4..6f1fd59d 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java index 4f89481b..f2cb4612 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 789257c5..89b0e042 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java index 20a70d23..e70e496b 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java rename to src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java index 7598f58a..5100406c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; public class AltarUpgrade { private int speedCount; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 859c2ffd..3d22f37e 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -3,12 +3,11 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.altar.*; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java index 8f863756..aa0327c8 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java rename to src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java index b783a928..4eaf1714 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java index 666f5be0..0db6e35e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java similarity index 73% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java rename to src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java index 5a69420e..5ce9f00c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java rename to src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java index a8642b89..a72c1afd 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; public interface IBloodAltar { int getCapacity(); diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index df5dc2b0..12717e3e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index f6255a0f..d73df0b8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index 470d1ba3..e65eac53 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java index 40f01944..2490f9ce 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.api.impl.recipe; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.EnumAltarTier; import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java deleted file mode 100644 index 20478ed8..00000000 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@Deprecated // This entire "api" is going to be nuked over time. Consider all of this unstable. -@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION) -package WayofTime.bloodmagic.apibutnotreally; - -import WayofTime.bloodmagic.BloodMagic; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 1ced3484..e3b768f0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 81b6dc1a..7a63b22d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.IAltarManipulator; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.iface.IAltarReader; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.iface.IDocumentedBlock; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 09af9235..0d61ac9e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.soul.IDemonWillGem; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 7d286cd3..ddea0501 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 44681800..02df2866 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; -import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.teleport.PortalLocation; +import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.block.base.BlockInteger; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 6dba2cde..85aab8ae 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 5b666693..8828d7c0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.material.Material; import net.minecraft.util.BlockRenderLayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index 56a40037..003a64de 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.IAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.IAltarComponent; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumMimic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index 92e59c3c..5882dc30 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 726b1af4..4b4c1b61 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumRitualController; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 4d51b164..483a10fb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IRitualStone; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index c56ac05e..7b8cc730 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index c242b3b8..4df0bbe5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java index 08188509..01c05b88 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.block.enums; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.util.IStringSerializable; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java index f2c1399e..80705ac1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.gui; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.inventory.ContainerHolding; import WayofTime.bloodmagic.item.inventory.InventoryHolding; import WayofTime.bloodmagic.tile.TileAlchemyTable; diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java index 07b1f281..72f5f05f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import WayofTime.bloodmagic.util.Utils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index 75792062..a674b457 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.iface.IActivatable; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java index a27b8eba..58f7fc64 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.iface.IMultiWillTool; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java index 6900eead..a1e3af67 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.client.renderer.ItemMeshDefinition; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index b90de1bf..4e330f9e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 91fbb1b7..699916ca 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index e5e91378..29f03cbb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index e7ec2570..f409062a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index c91a06c3..a1e2b461 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index 023db61e..b954ce52 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 1f592774..0c4a9073 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarTier; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.handler.event.ClientHandler; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index eb13193b..d4cab8a7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer; +import WayofTime.bloodmagic.iface.INodeRenderer; import WayofTime.bloodmagic.client.helper.ShaderHelper; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 98828c1d..f01b70ee 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.BindableHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.BindableHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.command.CommandBase; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 1b164e28..07a53b22 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 92eda02e..27a34df7 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 13b1c7d6..80b78c00 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; import amerifrance.guideapi.page.PageIRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index eb3b8127..fcde6142 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 599800cc..9648211e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java index 2363e749..92566ab3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index 5b9c507e..6e53c89d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java index 4f5446fd..6c3d17e9 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi.book; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 5c925f74..eca0eff2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index a8189038..a26dd233 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index e6c26b9a..de5265ee 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -4,9 +4,9 @@ import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index c026c81f..b6284e66 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index 53d792a2..e6ded288 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java index 8010e978..ea92c210 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index f1a65187..3a88276f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java index db5ebc33..5ef8c619 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 69515377..10f2f6a2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java index 675eae1c..b14c69fd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java index b1e1eaf9..b5c2fd73 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java index e306b682..ba22f8c5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java index f0194367..f7baa13c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index 8e0b0a76..a2493fbd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java index 4f756e80..3d429211 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.binding; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java index 38a92b55..db44651e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import com.google.common.collect.BiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index 81b69ce8..96b7db2f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.forge; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index c5908b25..46e16f45 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.waila.provider.*; import WayofTime.bloodmagic.tile.*; import mcp.mobius.waila.api.IWailaPlugin; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index 3a38301f..bc8ade1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index a7d3a22d..a4ac2b7b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index 477d2393..b664531c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 6769804e..5f5ac41a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; import joptsimple.internal.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index 0463a22b..8f21ea90 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index b13f6d36..2050f6b7 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -1,7 +1,5 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 9f4a2fcc..1af4b63b 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java rename to src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java index e36149c6..b7da216d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.compress; +package WayofTime.bloodmagic.compress; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java rename to src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java index 786306c9..280bd784 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.compress; +package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 2d51470c..4dd1822c 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 54e3ca40..992bb9a1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.entity.mob.*; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index ba331b03..d49617dc 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java rename to src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index be15d0a9..0eb2be6a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.saving; +package WayofTime.bloodmagic.core.data; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java rename to src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index 54098c72..55b09299 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.apibutnotreally.saving; +package WayofTime.bloodmagic.core.data; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.event.AddToNetworkEvent; -import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.event.AddToNetworkEvent; +import WayofTime.bloodmagic.event.SoulNetworkEvent; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -112,14 +112,14 @@ public class SoulNetwork implements INBTSerializable { if (syphon < 100 && syphon > 0) { if (!user.capabilities.isCreativeMode) { user.hurtResistantTime = 0; - user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); + user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); } } else if (syphon >= 100) { if (!user.capabilities.isCreativeMode) { for (int i = 0; i < ((syphon + 99) / 100); i++) { user.hurtResistantTime = 0; - user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); + user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); } } } @@ -130,7 +130,7 @@ public class SoulNetwork implements INBTSerializable { if (getParent() != null) getParent().markDirty(); else - BloodMagicAPI.logger.error("A SoulNetwork was created, but a parent was not set to allow saving."); + PleaseStopUsingMe.logger.error("A SoulNetwork was created, but a parent was not set to allow saving."); } @Nullable diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index 9c71bb94..c61289d9 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core.recipe; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java index 06370e71..36edf7b1 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java index ff55fd94..e09a6ce6 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java index 4e4c9352..789ec6ad 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.altar.EnumAltarTier; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; @@ -29,7 +29,7 @@ public class AltarRecipeRegistry { if (!recipes.containsValue(altarRecipe) && altarRecipe.getInput().size() > 0) recipes.put(altarRecipe.getInput(), altarRecipe); else - BloodMagicAPI.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); + PleaseStopUsingMe.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); } public static void registerFillRecipe(ItemStack orbStack, EnumAltarTier tier, int maxForOrb, int consumeRate, int drainRate) { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java index a0a5eeba..ab500fd8 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockStem; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java index 16c5a510..0336e6b0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -23,7 +23,7 @@ public class ImperfectRitualRegistry { public static void registerRitual(ImperfectRitual imperfectRitual, String id, boolean enabled) { if (imperfectRitual != null) { if (registry.containsKey(id)) - BloodMagicAPI.logger.error("Duplicate imperfect ritual id: %s", id); + PleaseStopUsingMe.logger.error("Duplicate imperfect ritual id: %s", id); else { registry.put(id, imperfectRitual); enabledRituals.put(imperfectRitual, enabled); @@ -71,7 +71,7 @@ public class ImperfectRitualRegistry { try { return enabledRituals.get(imperfectRitual); } catch (NullPointerException e) { - BloodMagicAPI.logger.error("Invalid Imperfect Ritual was called"); + PleaseStopUsingMe.logger.error("Invalid Imperfect Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java index f2787e34..8360dbd5 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 0efd5b88..5ddbeb3c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.orb.BloodOrb; import com.google.common.collect.ArrayListMultimap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java index ced086b2..2c778938 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.ritual.data.Ritual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -28,14 +28,14 @@ public class RitualRegistry { */ public static void registerRitual(Ritual ritual, String id, boolean enabled) { if (locked) { - BloodMagicAPI.logger.error("This registry has been locked. Please register your ritual earlier."); - BloodMagicAPI.logger.error("If you reflect this, I will hunt you down. - TehNut"); + PleaseStopUsingMe.logger.error("This registry has been locked. Please register your ritual earlier."); + PleaseStopUsingMe.logger.error("If you reflect this, I will hunt you down. - TehNut"); return; } if (ritual != null) { if (registry.containsKey(id)) - BloodMagicAPI.logger.error("Duplicate ritual id: %s", id); + PleaseStopUsingMe.logger.error("Duplicate ritual id: %s", id); else { registry.put(id, ritual); enabledRituals.put(ritual, enabled); @@ -78,7 +78,7 @@ public class RitualRegistry { try { return enabledRituals.get(ritual); } catch (NullPointerException e) { - BloodMagicAPI.logger.error("Invalid Ritual was called"); + PleaseStopUsingMe.logger.error("Invalid Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java index 1090c897..83b075e0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java index 818bffc3..658280f0 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.DemonWillHolder; import net.minecraft.world.chunk.Chunk; import java.lang.ref.WeakReference; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 96c4c15c..06cac743 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -45,13 +45,13 @@ public class WorldDemonWillHandler { public static void addWillWorld(int dim) { if (!containedWills.containsKey(dim)) { containedWills.put(dim, new WillWorld(dim)); - BloodMagicAPI.logger.info("Creating demon will cache for world " + dim); + PleaseStopUsingMe.logger.info("Creating demon will cache for world " + dim); } } public static void removeWillWorld(int dim) { containedWills.remove(dim); - BloodMagicAPI.logger.info("Removing demon will cache for world " + dim); + PleaseStopUsingMe.logger.info("Removing demon will cache for world " + dim); } public static void addWillChunk(int dim, Chunk chunk, short base, DemonWillHolder currentWill) { diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index 34879915..cb721ce7 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.gson.Serializers; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index 0ae9a398..5044857f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIAttackStealthMelee; import WayofTime.bloodmagic.entity.ai.EntityAIStealthRetreat; import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index 6bed3068..b5869354 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIEatAndCorruptBlock; import WayofTime.bloodmagic.entity.ai.EntityAIProtectAlly; import com.google.common.collect.Maps; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index f4fcbe89..71290023 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIPickUpAlly; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 4ffeb770..3acc8fed 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index db068c77..5e2e4e43 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index 71e6bb84..4c701ace 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.meteor.MeteorRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index e96c4cc9..b4950f64 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java index 4f84073f..4e4798c7 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java rename to src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java index 2875f168..0aca6bcd 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java rename to src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java index 3e848cf9..66c70ea9 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java rename to src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java index d072d39f..7f7e7bf4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class ItemBindEvent extends Event { /** * This event is called whenever a player attempts to bind a - * {@link WayofTime.bloodmagic.apibutnotreally.iface.IBindable} item. + * {@link WayofTime.bloodmagic.iface.IBindable} item. * * @param player The player doing the binding * @param key The UUID of the player doing the binding diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java rename to src/main/java/WayofTime/bloodmagic/event/RitualEvent.java index dd118b83..d65da6a4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java rename to src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java index 991e7a15..982166b7 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.eventhandler.Cancelable; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index a39674a3..fc81dbe7 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java rename to src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java index d17ea312..856c9917 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index d629f793..3a77e208 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.gson; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import com.google.gson.*; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java rename to src/main/java/WayofTime/bloodmagic/iface/IActivatable.java index c72c4cb7..f9b39342 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java similarity index 66% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java rename to src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java index dfa4559a..f8026ce3 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java b/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java rename to src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java index d3d0bdc3..0e2e5fbe 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java rename to src/main/java/WayofTime/bloodmagic/iface/IBindable.java index 37b32d8f..164d77ff 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java b/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java rename to src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java index 547eb869..708067ba 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java rename to src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java index ecaa8dd3..10c58212 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java rename to src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java index 68ba0fd8..7a991bab 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java rename to src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java index c4b38f18..91240f62 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java @@ -1,6 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -16,7 +17,7 @@ public interface IHarvestHandler { * the block types you want. * * @param world - The world the - * {@link WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone} is in. + * {@link IMasterRitualStone} is in. * @param pos - The position of the Block being checked * @param blockStack - The Block being checked * @return If the block was successfully harvested. diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java b/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java rename to src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java index 72e05cd9..b2daff9c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java b/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java similarity index 52% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java rename to src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java index 519fc6cd..cda13f64 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.item.ItemStack; public interface IMultiWillTool { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java b/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java rename to src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java index a12114b0..cc93b3bc 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; /** * Held items that implement this will cause the beams between routing nodes to diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java b/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java rename to src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java index 777a04e9..22355522 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java rename to src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java index 16225306..db74ba4a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java rename to src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java index 18ed5e29..3f9693ab 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java rename to src/main/java/WayofTime/bloodmagic/iface/ISigil.java index 196aa098..5912f52d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java @@ -1,5 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; +import WayofTime.bloodmagic.item.ItemSigil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -8,7 +9,7 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; /** - * Used for all {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil} EXCEPT + * Used for all {@link ItemSigil} EXCEPT * Sigils of Holdings. */ public interface ISigil { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java rename to src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java index f8d30032..6e9197e9 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java index 3b9002b1..c6019eae 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java index 0bcf8815..b1b2517b 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 73972287..dfb40d9d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 5ce735b1..804104f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -1,11 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.BloodAltar; +import WayofTime.bloodmagic.altar.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.altar.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index 092c1bed..4e251de3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index c18428b5..61dd28b9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 19d2d6e3..751a584a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 3de0de3b..ee6f3f2f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 898fec90..b1842152 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index ebfd3952..773ffb15 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.iface.IActivatable; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index ee605c35..727cfcfb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.event.BoundToolEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.event.BoundToolEvent; +import WayofTime.bloodmagic.iface.IActivatable; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index cf3ee617..15140d9c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -2,8 +2,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.util.helper.PurificationHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.EntityLivingBase; @@ -71,7 +72,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) { target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); target.setHealth(-1); - target.onDeath(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource); + target.onDeath(PleaseStopUsingMe.damageSource); } return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index 89ed3f05..4e62706e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index 4cc7940a..f5d3af13 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; +import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index e029fe4f..9b1bd3f3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 1a16af89..52bc7794 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 3bb6f750..81c127fc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 524f1888..cb3c7c2c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index e24e5e98..652021b0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMasterRitualStone; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 193d027f..07e6be63 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRitualReaderState; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.ritual.data.EnumRitualReaderState; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index a80924ae..bcfd621b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; @@ -97,10 +97,10 @@ public class ItemSacrificialDagger extends ItemEnum ctor = clazz.getConstructor(int.class); if (ctor == null) { - BloodMagicAPI.logger.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); + PleaseStopUsingMe.logger.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); } else { upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor); } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java index 2fa4e8cc..c160c6cd 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.livingArmour; +package WayofTime.bloodmagic.livingArmour; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java index f450b4aa..c9d4d182 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java @@ -1,6 +1,5 @@ -package WayofTime.bloodmagic.apibutnotreally.livingArmour; +package WayofTime.bloodmagic.livingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index 9162ab95..fe02490a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index eea9e27e..88b31e64 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index b837ba77..cf948dac 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index af2b15ca..c2a3d980 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index 0b3b6095..06aebdc0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index c2fb14e7..9272cd48 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index f30ef882..afca233c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index a9bc44d3..0b964731 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index 2877f3be..cbdab679 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index 4546f447..d90aa3e5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index 57584dc9..b084083f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 95e1357f..a89f4588 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index 2a843bcb..f14f0598 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeCriticalStrike; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index a063e192..0a99d49d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 57c67bea..99931891 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index fc0017ea..561cb733 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index c69e03e4..c36f87c6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFireResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index 06a9ecad..b5ef43a6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index bbab4ad4..2b7e5bc5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index ff48cb51..3d562a37 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index e9701d9b..73e1b3cc 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index eebfcbc4..7adb31fd 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 177ad61a..78adec51 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 53a91cf1..eb44d538 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 105885bb..77a1e3db 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeNightSight; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 1333750b..4e215caa 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 31d24e54..16e238bb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index 082a28d4..d81b4e62 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRepairing; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index a0744780..4a508d89 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index d338e77b..41abc39a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index 00be46cb..c8743426 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 700edfe1..b5bbec27 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index d790ca2f..f50e5d59 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index c9714184..64e99f67 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 65077f41..64b1ff05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 4b69347c..6dac903b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index d43a8482..d1699406 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index 73a23691..ba5abaaa 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index d829d828..c394a4af 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index 6cb7e0f6..a4725a05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index f277bea7..69a58009 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 05f6644f..1e8fdfd3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index acb057e3..69ce784c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index 6cec3d05..4bb03e62 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index faf8d7d5..2045b972 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 5214502d..5b5abda1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index 966c9b1f..27a39c9f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 5143860a..9b755a27 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index f563ba66..49bd19c0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 318ab46f..80f7093d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index ca20ddb3..0c3a6db7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 3295882a..d285c11d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 87791649..3fe1f8a0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index d74bce15..49504483 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 2f14ec9d..83d414d4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java index f7d1f8c4..9d0ea6ce 100644 --- a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.network; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java rename to src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java index adbe7c7a..2c23d393 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.orb; +package WayofTime.bloodmagic.orb; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java rename to src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java index 6b87ddd5..09848dbb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.orb; +package WayofTime.bloodmagic.orb; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 392a6386..5ba2f665 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -1,8 +1,9 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; @@ -66,7 +67,7 @@ public class BMPotionUtils { } if (incurredDamage > 0) { - entity.attackEntityFrom(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource, (float) incurredDamage); + entity.attackEntityFrom(PleaseStopUsingMe.damageSource, (float) incurredDamage); } return incurredDamage; diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 2e2bdfa1..40d0d5ed 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 26a98d86..4ae09cac 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.Sprite; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 18885435..bfc6ee8d 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; -import WayofTime.bloodmagic.apibutnotreally.ritual.CapabilityRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; -import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.ritual.data.CapabilityRuneType; +import WayofTime.bloodmagic.ritual.data.IRitualStone; +import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.fuel.FuelHandler; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java index 5ce7e83c..9af2e9d4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; -import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java index 6cb1cf8d..ecea0ca4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java index d40eab8b..8fa14ad2 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java index 028744fd..db294411 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 52d221eb..910be33d 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index 8c21e8e2..33e89171 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index c3564204..931169b8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.livingArmour.tracker.*; import WayofTime.bloodmagic.livingArmour.upgrade.*; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java index 58516481..80525583 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.inversion.CorruptionHandler; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index de382992..9fb8ae3e 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -2,15 +2,15 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; -import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.compress.CompressionRegistry; +import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.AlchemyTableCustomRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.core.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 1343d5fe..8f9beacc 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index a9785bf9..6ce09db4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.altar.AltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index e555c69a..147a3791 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java index 93df19e4..9a59ff3a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index c2a6ee58..a364d484 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index 41b8098d..4f6dc7a6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index f31a03f0..8a801aa6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.compress.CompressionRegistry; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java index c40acf12..b6387112 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index 5a52ad05..d706b79c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index c70de21b..f7749ddf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java index 1207dd3c..a426c67a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index 4e71364d..52048dbf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index 3bce44ba..8a8f5181 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 2bac524c..8a6f9cfb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockFarmland; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index 574ed869..b1d4d478 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java index 0d4e0f61..22a26195 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java index 1d27ada9..84da47b7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index 082edc55..d3878ed7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -198,7 +198,7 @@ public class RitualLava extends Ritual { } if (!entity.isDead && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity)) { - if (entity.attackEntityFrom(BloodMagicAPI.damageSource, damage)) { + if (entity.attackEntityFrom(PleaseStopUsingMe.damageSource, damage)) { corrosiveDrained += corrosiveWillDrain; corrosiveWill -= corrosiveWillDrain; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java index 8034d1b8..936d7d77 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.effect.EntityLightningBolt; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 794bb119..42d262ed 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java index 36706d6e..42052ea9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.meteor.Meteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index 37dd74e7..7c4da792 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 85acd27b..0c4503d8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; -import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.tile.TileDimensionalPortal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java index ede507a1..bdb869bc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Lists; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java index 9eea0094..b2eb76bb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -92,7 +92,7 @@ public class RitualRegeneration extends Ritual { float currentHealth = damagedEntity.getHealth(); - damagedEntity.attackEntityFrom(BloodMagicAPI.damageSource, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); + damagedEntity.attackEntityFrom(PleaseStopUsingMe.damageSource, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); float healthDifference = currentHealth - damagedEntity.getHealth(); if (healthDifference > 0) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java index bb3035b6..57b51bcf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java index 369f8873..3bb9ed0d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java index 3b42d23a..fe1a3a07 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index 13e0e257..82e5bc43 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index bda9622f..ba3bc5e0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index c406b163..a397d22e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java index f2ea64be..c898bf3e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java index 40be45bf..3ed6c7b9 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java similarity index 62% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java index f2d3cc8f..0944cbcb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; public enum EnumRitualReaderState { SET_AREA, diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java index 39685b3e..ea1f364a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java index 8cf47ab3..781988fc 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java index 073b9b4b..00017ab0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java index aa8c8c1c..d75447ce 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java @@ -1,7 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.core.registry.RitualRegistry; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,7 +22,7 @@ import java.util.Map.Entry; /** * Abstract class for creating new rituals. Rituals need be registered with - * {@link WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry#registerRitual(Ritual, String)} + * {@link RitualRegistry#registerRitual(Ritual, String)} */ public abstract class Ritual { public final ArrayList ritualComponents = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java index ad864ce7..25c46e62 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java index 4c999f20..0138310b 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java index f468513e..eeca00f0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; +package WayofTime.bloodmagic.ritual.data.imperfect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java index c6f668d3..bf78aaee 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java @@ -1,13 +1,14 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; +package WayofTime.bloodmagic.ritual.data.imperfect; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; /** * Abstract class for creating new imperfect rituals. ImperfectRituals need be * registered with - * {@link WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)} + * {@link ImperfectRitualRegistry#registerRitual(ImperfectRitual)} */ public abstract class ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java similarity index 71% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java index e47d4b81..00a78dbb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; +package WayofTime.bloodmagic.ritual.data.imperfect; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 258fdfbe..8e5e9a61 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.harvest; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 6200a003..15f06cdf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; import net.minecraft.block.BlockStem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index 408eab39..f643015e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index 49c280ac..2d60a7e8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index 80857a9a..caa2bcd7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index 6ec3a207..098c9bba 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index 88907218..1c3249db 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index 5404ec97..4f2e34fd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index 7ec1d9a0..af88a470 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.teleport.PortalLocation; import net.minecraftforge.common.DimensionManager; import java.io.*; @@ -27,12 +27,12 @@ public class LocationsHandler implements Serializable { updateFile(fileName, portals); } if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2) { - BloodMagicAPI.logger.info("Location " + name + " already exists."); + PleaseStopUsingMe.logger.info("Location " + name + " already exists."); updateFile(fileName, portals); return false; } else { portals.get(name).add(location); - BloodMagicAPI.logger.info("Adding " + name); + PleaseStopUsingMe.logger.info("Adding " + name); updateFile(fileName, portals); return true; } @@ -42,11 +42,11 @@ public class LocationsHandler implements Serializable { if (portals.get(name) != null && !portals.get(name).isEmpty()) { if (portals.get(name).contains(location)) { portals.get(name).remove(location); - BloodMagicAPI.logger.info("Removing " + name); + PleaseStopUsingMe.logger.info("Removing " + name); updateFile(fileName, portals); return true; } else { - BloodMagicAPI.logger.info("No location matching " + name); + PleaseStopUsingMe.logger.info("No location matching " + name); updateFile(fileName, portals); return false; } @@ -75,10 +75,10 @@ public class LocationsHandler implements Serializable { if (!file.exists()) { if (file.getParentFile().mkdir()) { if (file.createNewFile()) { - BloodMagicAPI.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + PleaseStopUsingMe.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); } } else if (file.createNewFile()) { - BloodMagicAPI.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + PleaseStopUsingMe.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); } } FileInputStream fileIn = new FileInputStream(file); @@ -90,7 +90,7 @@ public class LocationsHandler implements Serializable { } catch (IOException e) { return null; } catch (ClassNotFoundException e) { - BloodMagicAPI.logger.error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + PleaseStopUsingMe.logger.error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index bde56486..b2571e6d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.portal; -import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.teleport.Teleport; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.teleport.Teleport; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java rename to src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java index 721cbb99..91422105 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java rename to src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java index fa77f039..8854afb6 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java index 1387372b..cb83bc1d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java index 96947c98..0d5027ae 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; /** * Implement this interface on a block that can accept and store Demonic Will. diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java index 4878ca07..78c64544 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java index dc989bd2..f90c2c98 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java b/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java rename to src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java index c5a34382..9709817a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java rename to src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java index 07d95f3a..89d3b97a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java @@ -1,5 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -8,7 +9,7 @@ import net.minecraft.util.NonNullList; * This class provides several helper methods in order to handle soul * consumption and use for a player. This refers to the Soul System, meaning * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found - * in {@link WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper} + * in {@link NetworkHelper} */ public class PlayerDemonWillHandler { /** diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index 42cf8ab8..3ca1a305 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index 84a2843d..dac62074 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java b/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java similarity index 59% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java rename to src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java index f5a1392e..1f9242f4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; public interface ITeleport { void teleport(); diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java rename to src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java index a861f5c9..ccb55eeb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java rename to src/main/java/WayofTime/bloodmagic/teleport/Teleport.java index b733e538..18719e16 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java rename to src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java index 6e56b7d9..8b3d72e5 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java index 0bcb1d36..16e7a6fc 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 2fddf46c..4d1b42cf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCraftingNew; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; +import WayofTime.bloodmagic.iface.IAlchemyArray; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 3ceab6be..212edac9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index bfaeefbb..b7b5e5aa 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 8e161c77..f0b0b41a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index df286a8b..3d05fe43 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.IDemonWillGem; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index d4fbdd7d..0e26e4be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockDemonCrystal; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 4e5d3fdb..eb97e4cb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index 86ae91b0..80817ce6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index 3899cc39..da6ff9b0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index bae862d0..1601a07a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 1d2e8a19..2c77e867 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.inversion.InversionPillarHandler; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 4431af8f..aaf844d2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.RitualEvent; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.RitualEvent; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index a1b3a63d..cdda27d8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index bf3dddc8..3e90cb5d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.iface.IPurificationAsh; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; +import WayofTime.bloodmagic.iface.IPurificationAsh; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.util.helper.PurificationHelper; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 64d7fde1..f6909c28 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWill; +import WayofTime.bloodmagic.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 172c7adb..d2d41e2d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index a8124376..dc2317c8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; -import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.teleport.TeleportQueue; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java index c2569ba8..879a0ed3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index 37973d53..a86e82d4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.soul.IDemonWill; +import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 5deac5ea..7fb17330 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.util.GhostItemHelper; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index 2d17f476..c760c950 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.tile.TileInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index 6e13a518..fbc6c626 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.routing.IItemRoutingNode; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java rename to src/main/java/WayofTime/bloodmagic/util/BlockStack.java index 74e50107..85428c4d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +@Deprecated public class BlockStack { private final Block block; private final int meta; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java rename to src/main/java/WayofTime/bloodmagic/util/Constants.java index 581a8fad..77d6d512 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.BloodMagic; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java index 75af1dd6..303bea5a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 77862f48..6c454ba8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java rename to src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java index a48a0acd..0163eea1 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -9,6 +9,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +@Deprecated public class ItemStackWrapper { public final Item item; public final int stackSize; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java index 48b7bc95..072d7986 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; +import WayofTime.bloodmagic.util.helper.LogHelper; import net.minecraft.util.DamageSource; /** @@ -9,7 +9,8 @@ import net.minecraft.util.DamageSource; * Some API methods can be used via IMC instead. The supported methods are: */ // TODO - Nuke this class -public class BloodMagicAPI { +@Deprecated +public class PleaseStopUsingMe { public static boolean loggingEnabled; public static LogHelper logger = new LogHelper("BloodMagic|API"); diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index fa590b7e..88c989b8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,10 +1,8 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.iface.IDemonWillViewer; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index caa081bd..f99d4ec6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; import WayofTime.bloodmagic.client.hud.HUDElement; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index add509dc..a859d993 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.AltarCraftedEvent; +import WayofTime.bloodmagic.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.helper.ItemHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemInscriptionTool; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index e75009fe..d9a4d4f2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -3,18 +3,17 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.util.helper.*; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.ItemBindEvent; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.iface.ISentientTool; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -33,7 +32,7 @@ import WayofTime.bloodmagic.network.DemonAuraPacketProcessor; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.TextHelper; +import WayofTime.bloodmagic.util.helper.*; import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 42e866f8..f78a7e59 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index a98a8e9f..a894a655 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index b83bb3d3..ce76a8d0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.*; +import WayofTime.bloodmagic.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.PosXY; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java index ca573a46..f74bb848 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.ItemBindEvent; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java index 47aca8bc..40071726 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java index 740043c0..24912b87 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; -import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.iface.IItemLPContainer; +import WayofTime.bloodmagic.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.ItemUpgradeTome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java index bc6d8de5..3876068e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,17 +12,17 @@ public class LogHelper { } public void info(String info, Object... format) { - if (BloodMagicAPI.loggingEnabled) + if (PleaseStopUsingMe.loggingEnabled) logger.info(info, format); } public void error(String error, Object... format) { - if (BloodMagicAPI.loggingEnabled) + if (PleaseStopUsingMe.loggingEnabled) logger.error(error, format); } public void debug(String debug, Object... format) { - if (BloodMagicAPI.loggingEnabled) + if (PleaseStopUsingMe.loggingEnabled) logger.debug(debug, format); } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java index ec5202a6..59a73f3e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index cfef4b4b..81f9dabe 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.apibutnotreally.saving.BMWorldSavedData; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.SoulNetworkEvent; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.core.data.BMWorldSavedData; +import WayofTime.bloodmagic.core.data.SoulNetwork; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java index de1c9c62..2354b3e1 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java index 541a1472..4aec71d4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java index 3c6ef594..49057296 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java index fd8e6bcf..97b4853a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.core.registry.TartaricForgeRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.fml.common.registry.ForgeRegistries; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index 321e778d..6ecfe11e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; From e4e6a8c4ca79f373ff78428b189a853ff6a839f6 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 16 Feb 2018 16:37:02 -0800 Subject: [PATCH 073/493] Cleanup Altar Upgrade system --- .../bloodmagic/altar/AltarUpgrade.java | 122 ++---------------- .../bloodmagic/altar/BloodAltar.java | 74 +++-------- .../api/impl/BloodMagicCorePlugin.java | 4 +- .../bloodmagic/block/BlockBloodRune.java | 18 ++- ...{EnumBloodRune.java => BloodRuneType.java} | 6 +- .../bloodmagic/iface/IBloodRune.java | 15 +++ .../bloodmagic/blockstates/blood_rune.json | 4 +- 7 files changed, 64 insertions(+), 179 deletions(-) rename src/main/java/WayofTime/bloodmagic/block/enums/{EnumBloodRune.java => BloodRuneType.java} (80%) create mode 100644 src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java index 5100406c..bdca69c4 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java @@ -1,122 +1,24 @@ package WayofTime.bloodmagic.altar; -public class AltarUpgrade { - private int speedCount; - private int efficiencyCount; - private int sacrificeCount; - private int selfSacrificeCount; - private int displacementCount; - private int capacityCount; - private int orbCapacityCount; - private int betterCapacityCount; - private int accelerationCount; - private int chargingCount; +import WayofTime.bloodmagic.block.enums.BloodRuneType; +import com.google.common.collect.Maps; - public AltarUpgrade(int speedCount, int efficiencyCount, int sacrificeCount, int selfSacrificeCount, int displacementCount, int capacityCount, int orbCapacityCount, int betterCapacityCount, int accelerationCount, int chargingCount) { - this.speedCount = speedCount; - this.efficiencyCount = efficiencyCount; - this.sacrificeCount = sacrificeCount; - this.selfSacrificeCount = selfSacrificeCount; - this.displacementCount = displacementCount; - this.capacityCount = capacityCount; - this.orbCapacityCount = orbCapacityCount; - this.betterCapacityCount = betterCapacityCount; - this.accelerationCount = accelerationCount; - this.chargingCount = chargingCount; - } +import java.util.EnumMap; + +public class AltarUpgrade { + + private final EnumMap upgradeLevels; public AltarUpgrade() { + this.upgradeLevels = Maps.newEnumMap(BloodRuneType.class); } - // Adders - - public AltarUpgrade addSpeed() { - speedCount++; + public AltarUpgrade upgrade(BloodRuneType rune) { + upgradeLevels.compute(rune, (r, l) -> l == null ? 0 : l + 1); return this; } - public AltarUpgrade addEfficiency() { - efficiencyCount++; - return this; - } - - public AltarUpgrade addSacrifice() { - sacrificeCount++; - return this; - } - - public AltarUpgrade addSelfSacrifice() { - selfSacrificeCount++; - return this; - } - - public AltarUpgrade addDisplacement() { - displacementCount++; - return this; - } - - public AltarUpgrade addCapacity() { - capacityCount++; - return this; - } - - public AltarUpgrade addOrbCapacity() { - orbCapacityCount++; - return this; - } - - public AltarUpgrade addBetterCapacity() { - betterCapacityCount++; - return this; - } - - public AltarUpgrade addAcceleration() { - accelerationCount++; - return this; - } - - public AltarUpgrade addCharging() { - chargingCount++; - return this; - } - - public int getSpeedCount() { - return speedCount; - } - - public int getEfficiencyCount() { - return efficiencyCount; - } - - public int getSacrificeCount() { - return sacrificeCount; - } - - public int getSelfSacrificeCount() { - return selfSacrificeCount; - } - - public int getDisplacementCount() { - return displacementCount; - } - - public int getCapacityCount() { - return capacityCount; - } - - public int getOrbCapacityCount() { - return orbCapacityCount; - } - - public int getBetterCapacityCount() { - return betterCapacityCount; - } - - public int getAccelerationCount() { - return accelerationCount; - } - - public int getChargingCount() { - return chargingCount; + public int getLevel(BloodRuneType rune) { + return upgradeLevels.getOrDefault(rune, 0); } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 3d22f37e..9c71f339 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -3,12 +3,12 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.block.enums.BloodRuneType; +import WayofTime.bloodmagic.iface.IBloodRune; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import com.google.common.base.Enums; @@ -388,17 +388,17 @@ public class BloodAltar implements IFluidHandler { return; } else if (!tier.equals(EnumAltarTier.ONE) && upgrade != null) { this.isUpgraded = true; - this.accelerationUpgrades = upgrade.getAccelerationCount(); - this.consumptionMultiplier = (float) (0.20 * upgrade.getSpeedCount()); - this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getEfficiencyCount()); - this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getSacrificeCount()); - this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getSelfSacrificeCount()); - this.capacityMultiplier = (float) ((1 * Math.pow(1.10, upgrade.getBetterCapacityCount()) + 0.20 * upgrade.getCapacityCount())); - this.dislocationMultiplier = (float) (Math.pow(1.2, upgrade.getDisplacementCount())); - this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrade.getOrbCapacityCount()); - this.chargingFrequency = Math.max(20 - upgrade.getAccelerationCount(), 1); - this.chargingRate = (int) (10 * upgrade.getChargingCount() * (1 + consumptionMultiplier / 2)); - this.maxCharge = (int) (Fluid.BUCKET_VOLUME * Math.max(0.5 * capacityMultiplier, 1) * upgrade.getChargingCount()); + this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); + this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); + this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getLevel(BloodRuneType.EFFICIENCY)); + this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SACRIFICE)); + this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SELF_SACRIFICE)); + this.capacityMultiplier = (float) ((1 * Math.pow(1.10, upgrade.getLevel(BloodRuneType.AUGMENTED_CAPACITY))) + 0.20 * upgrade.getLevel(BloodRuneType.CAPACITY)); + this.dislocationMultiplier = (float) (Math.pow(1.2, upgrade.getLevel(BloodRuneType.DISPLACEMENT))); + this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrade.getLevel(BloodRuneType.ORB)); + this.chargingFrequency = Math.max(20 - accelerationUpgrades, 1); + this.chargingRate = (int) (10 * upgrade.getLevel(BloodRuneType.CHARGING) * (1 + consumptionMultiplier / 2)); + this.maxCharge = (int) (Fluid.BUCKET_VOLUME * Math.max(0.5 * capacityMultiplier, 1) * upgrade.getLevel(BloodRuneType.CHARGING)); } this.capacity = (int) (Fluid.BUCKET_VOLUME * 10 * capacityMultiplier); @@ -701,50 +701,10 @@ public class BloodAltar implements IFluidHandler { BlockPos componentPos = pos.add(altarComponent.getOffset()); if (altarComponent.isUpgradeSlot()) { - BlockStack worldBlock = new BlockStack(world.getBlockState(componentPos).getBlock(), world.getBlockState(componentPos).getBlock().getMetaFromState(world.getBlockState(componentPos))); - - if (worldBlock.getBlock() instanceof BlockBloodRune) { - switch (((BlockBloodRune) worldBlock.getBlock()).getRuneEffect(worldBlock.getMeta())) { - case 1: - upgrades.addSpeed(); - break; - - case 2: - upgrades.addEfficiency(); - break; - - case 3: - upgrades.addSacrifice(); - break; - - case 4: - upgrades.addSelfSacrifice(); - break; - - case 5: - upgrades.addDisplacement(); - break; - - case 6: - upgrades.addCapacity(); - break; - - case 7: - upgrades.addBetterCapacity(); - break; - - case 8: - upgrades.addOrbCapacity(); - break; - - case 9: - upgrades.addAcceleration(); - break; - - case 10: - upgrades.addCharging(); - break; - } + IBlockState state = world.getBlockState(componentPos); + if (state.getBlock() instanceof IBloodRune) { + BloodRuneType rune = ((IBloodRune) state.getBlock()).getBloodRune(world, componentPos, state); + upgrades.upgrade(rune); } } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index d73df0b8..9f98f857 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -8,7 +8,7 @@ import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.altar.EnumAltarComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; -import WayofTime.bloodmagic.block.enums.EnumBloodRune; +import WayofTime.bloodmagic.block.enums.BloodRuneType; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; @@ -76,7 +76,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), EnumAltarComponent.CRYSTAL.name()); BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; - for (EnumBloodRune runeType : EnumBloodRune.values()) + for (BloodRuneType runeType : BloodRuneType.values()) api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); RegistrarBloodMagicRecipes.registerAltarRecipes(api.getRecipeRegistrar()); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index bd440dd3..471bc99d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -2,19 +2,25 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumBloodRune; +import WayofTime.bloodmagic.block.enums.BloodRuneType; +import WayofTime.bloodmagic.iface.IBloodRune; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; -public class BlockBloodRune extends BlockEnum { +public class BlockBloodRune extends BlockEnum implements IBloodRune { + public BlockBloodRune() { - super(Material.ROCK, EnumBloodRune.class); + super(Material.ROCK, BloodRuneType.class); setUnlocalizedName(BloodMagic.MODID + ".rune."); setCreativeTab(BloodMagic.TAB_BM); @@ -24,8 +30,10 @@ public class BlockBloodRune extends BlockEnum { setHarvestLevel("pickaxe", 2); } - public int getRuneEffect(int meta) { - return meta; + @Nullable + @Override + public BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, IBlockState state) { + return state.getValue(getProperty()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/block/enums/EnumBloodRune.java rename to src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java index a9c04bd1..702fe5d9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java @@ -4,15 +4,15 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; -public enum EnumBloodRune implements IStringSerializable { +public enum BloodRuneType implements IStringSerializable { BLANK, SPEED, EFFICIENCY, SACRIFICE, - SELFSACRIFICE, + SELF_SACRIFICE, DISPLACEMENT, CAPACITY, - AUGCAPACITY, + AUGMENTED_CAPACITY, ORB, ACCELERATION, CHARGING; diff --git a/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java b/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java new file mode 100644 index 00000000..39863d68 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java @@ -0,0 +1,15 @@ +package WayofTime.bloodmagic.iface; + + +import WayofTime.bloodmagic.block.enums.BloodRuneType; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + +import javax.annotation.Nullable; + +public interface IBloodRune { + + @Nullable + BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, IBlockState state); +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json index f267e034..80973833 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json @@ -27,7 +27,7 @@ "all": "bloodmagic:blocks/RuneOfSacrifice" } }, - "selfsacrifice": { + "self_sacrifice": { "textures": { "all": "bloodmagic:blocks/RuneOfSelfSacrifice" } @@ -42,7 +42,7 @@ "all": "bloodmagic:blocks/AltarCapacityRune" } }, - "augcapacity": { + "augmented_capacity": { "textures": { "all": "bloodmagic:blocks/BetterCapacityRune" } From 5920d9124dff99d3184ecf35848ae085ba06b0e3 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 16 Feb 2018 16:48:21 -0800 Subject: [PATCH 074/493] Blood Altar will now be less stingy without outputs --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 9c71f339..9d1272ca 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -28,6 +28,7 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.items.ItemHandlerHelper; import org.apache.commons.lang3.tuple.Pair; import java.util.List; @@ -311,7 +312,7 @@ public class BloodAltar implements IFluidHandler { if (hasOperated) { if (progress >= liquidRequired * stackSize) { - ItemStack result = recipe.getOutput().copy(); + ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(recipe.getInput(), result); MinecraftForge.EVENT_BUS.post(event); From 49394b56d6c0114c0690447d1e98633e231635ad Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 16 Feb 2018 17:10:00 -0800 Subject: [PATCH 075/493] Coerced augmented flask recipe outputs out of hiding (#1200) --- .../AlchemyTablePotionAugmentRecipe.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 60 ------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java index ebd06887..1c2ccd46 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java @@ -52,7 +52,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { @Override public ItemStack getModifiedFlaskForInput(ItemStack inputStack) { - if (inputStack == null) { + if (inputStack.isEmpty()) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); List effectList = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 9fb8ae3e..7b23cda6 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -9,14 +9,11 @@ import WayofTime.bloodmagic.recipe.AlchemyTableCustomRecipe; import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.core.registry.TartaricForgeRecipeRegistry; -import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; @@ -56,7 +53,6 @@ public class ModRecipes { addFurnaceRecipes(); addAltarRecipes(); addAlchemyArrayRecipes(); - addSoulForgeRecipes(); addAlchemyTableRecipes(); addOreDoublingAlchemyRecipes(); addPotionRecipes(); @@ -112,62 +108,6 @@ public class ModRecipes { BloodMagic.instance.logger.info("Added compression recipes in {}", stopwatch); } - public static void addSoulForgeRecipes() { - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); - - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - - TartaricForgeRecipeRegistry.registerRecipe(ComponentTypes.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack()); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack()); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack()); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack()); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack()); - - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); - TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); - } - public static void addAlchemyTableRecipes() { AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); From 29c2ebe8c216b106c587c1ec23b14e4de8c4d5f4 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 16 Feb 2018 17:36:26 -0800 Subject: [PATCH 076/493] Update changelog + version --- changelog.txt | 16 ++++++++++++++++ gradle.properties | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 745d9e7b..590d761f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,19 @@ +------------------------------------------------------ +Version 2.2.3 +------------------------------------------------------ + +- Fixed mundane components being really really really thirsty + - (everything required water reagents. everything.) +- Buffed the Fast Miner array with a nerf + - Vanilla doesn't like Haste 3 I guess? +- Moved Divination Sigil altar output to a HUD element + - RIP Blood Altar chat spam 2014-2018 +- Mark of the Falling Tower is now re-opened and ready for sacrifices. +- Polished Demon Stones are no longer lonely uncraftable bois +- Somewhat more efficient (at least LoC wise) altar upgrade checking +- Blood Altar is now less stingy about outputs +- Coerced augmented Potion Flask recipe outputs out of hiding + ------------------------------------------------------ Version 2.2.2 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index a30fcbb6..afba9053 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.2 +mod_version=2.2.3 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From b29ade63f0cccd7bb0c9913db3b727d1e0b2f7ad Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 16 Feb 2018 23:48:28 -0800 Subject: [PATCH 077/493] Logging overhaul --- .../WayofTime/bloodmagic/ConfigHandler.java | 9 +++ .../bloodmagic/api/impl/BloodMagicAPI.java | 8 ++- .../api/impl/BloodMagicBlacklist.java | 21 +++++-- .../api/impl/BloodMagicValueManager.java | 10 +++- .../bloodmagic/core/data/SoulNetwork.java | 4 +- .../core/registry/AltarRecipeRegistry.java | 5 +- .../registry/ImperfectRitualRegistry.java | 7 ++- .../core/registry/RitualRegistry.java | 21 +++---- .../demonAura/WorldDemonWillHandler.java | 7 ++- .../livingArmour/LivingArmourHandler.java | 5 +- .../ritual/portal/LocationsHandler.java | 16 +++--- .../java/WayofTime/bloodmagic/util/BMLog.java | 57 +++++++++++++++++++ 12 files changed, 130 insertions(+), 40 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/util/BMLog.java diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 0a87cb07..889c07af 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -11,6 +11,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class ConfigHandler { + @Config.Comment({"General settings"}) + public static ConfigGeneral general = new ConfigGeneral(); @Config.Comment({"Blacklist options for various features"}) public static ConfigBlacklist blacklist = new ConfigBlacklist(); @Config.Comment({"Value modifiers for various features"}) @@ -30,6 +32,13 @@ public class ConfigHandler { } } + public static class ConfigGeneral { + @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) + public boolean enableDebugLogging = false; + @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) + public boolean enableAPILogging = false; + } + public static class ConfigBlacklist { @Config.Comment({"Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state."}) public String[] teleposer = {"bedrock", "mob_spawner"}; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 12717e3e..a1f82fe7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; @@ -45,7 +46,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { @Override public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { - EnumAltarComponent component = EnumAltarComponent.NOTAIR; + EnumAltarComponent component = null; for (EnumAltarComponent type : EnumAltarComponent.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { component = type; @@ -53,7 +54,10 @@ public class BloodMagicAPI implements IBloodMagicAPI { } } - altarComponents.put(component, state); + if (component != null) { + BMLog.API.info("Registered {} as a {} altar component.", state, componentType); + altarComponents.put(component, state); + } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); } @Nonnull diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java index 29fd1f49..5348eb2c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicBlacklist; +import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import net.minecraft.block.Block; @@ -28,8 +29,10 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addTeleposer(@Nonnull IBlockState state) { - if (!teleposer.contains(state)) + if (!teleposer.contains(state)) { + BMLog.API.info("Blacklist: Added {} to the Teleposer blacklist.", state); teleposer.add(state); + } } public void addTeleposer(@Nonnull Block block) { @@ -39,14 +42,18 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addTeleposer(@Nonnull ResourceLocation entityId) { - if (!teleposerEntities.contains(entityId)) + if (!teleposerEntities.contains(entityId)) { + BMLog.API.info("Blacklist: Added {} to the Teleposer blacklist.", entityId); teleposerEntities.add(entityId); + } } @Override public void addTransposition(@Nonnull IBlockState state) { - if (!transposition.contains(state)) + if (!transposition.contains(state)) { + BMLog.API.info("Blacklist: Added {} to the Transposition blacklist.", state); transposition.add(state); + } } public void addTransposition(@Nonnull Block block) { @@ -56,8 +63,10 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addGreenGrove(@Nonnull IBlockState state) { - if (!greenGrove.contains(state)) + if (!greenGrove.contains(state)) { + BMLog.API.info("Blacklist: Added {} to the Green Grove blacklist.", state); greenGrove.add(state); + } } public void addGreenGrove(@Nonnull Block block) { @@ -67,8 +76,10 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { - if (!sacrifice.contains(entityId)) + if (!sacrifice.contains(entityId)) { + BMLog.API.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId); sacrifice.add(entityId); + } } // Internal use getters diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java index 8ceacc66..99fc2e9f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicValueManager; import WayofTime.bloodmagic.incense.EnumTranquilityType; import WayofTime.bloodmagic.incense.TranquilityStack; +import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import net.minecraft.block.Block; @@ -24,6 +25,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { @Override public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { + BMLog.API.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value); sacrificial.put(entityId, value); } @@ -37,13 +39,17 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { } } - if (tranquility != null) + if (tranquility != null) { + BMLog.API.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value); this.tranquility.put(state, new TranquilityStack(tranquility, value)); + } else BMLog.API.warn("Invalid tranquility type: {}.", tranquilityType); } public void setTranquility(Block block, TranquilityStack tranquilityStack) { - for (IBlockState state : block.getBlockState().getValidStates()) + for (IBlockState state : block.getBlockState().getValidStates()) { + BMLog.API.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); tranquility.put(state, tranquilityStack); + } } public Map getSacrificial() { diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index 55b09299..acc83e58 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.core.data; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.event.AddToNetworkEvent; import WayofTime.bloodmagic.event.SoulNetworkEvent; @@ -130,7 +132,7 @@ public class SoulNetwork implements INBTSerializable { if (getParent() != null) getParent().markDirty(); else - PleaseStopUsingMe.logger.error("A SoulNetwork was created, but a parent was not set to allow saving."); + BMLog.DEFAULT.error("A SoulNetwork was created, but a parent was not set to allow saving."); } @Nullable diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java index 789ec6ad..49ab1e77 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.altar.EnumAltarTier; import com.google.common.collect.BiMap; @@ -29,7 +30,7 @@ public class AltarRecipeRegistry { if (!recipes.containsValue(altarRecipe) && altarRecipe.getInput().size() > 0) recipes.put(altarRecipe.getInput(), altarRecipe); else - PleaseStopUsingMe.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); + BMLog.DEFAULT.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); } public static void registerFillRecipe(ItemStack orbStack, EnumAltarTier tier, int maxForOrb, int consumeRate, int drainRate) { diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java index 0336e6b0..7694eae2 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java @@ -1,7 +1,8 @@ package WayofTime.bloodmagic.core.registry; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -23,7 +24,7 @@ public class ImperfectRitualRegistry { public static void registerRitual(ImperfectRitual imperfectRitual, String id, boolean enabled) { if (imperfectRitual != null) { if (registry.containsKey(id)) - PleaseStopUsingMe.logger.error("Duplicate imperfect ritual id: %s", id); + BMLog.DEFAULT.error("Duplicate imperfect ritual id: %s", id); else { registry.put(id, imperfectRitual); enabledRituals.put(imperfectRitual, enabled); @@ -71,7 +72,7 @@ public class ImperfectRitualRegistry { try { return enabledRituals.get(imperfectRitual); } catch (NullPointerException e) { - PleaseStopUsingMe.logger.error("Invalid Imperfect Ritual was called"); + BMLog.DEFAULT.error("Invalid Imperfect Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java index 2c778938..dad49720 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -28,14 +28,14 @@ public class RitualRegistry { */ public static void registerRitual(Ritual ritual, String id, boolean enabled) { if (locked) { - PleaseStopUsingMe.logger.error("This registry has been locked. Please register your ritual earlier."); - PleaseStopUsingMe.logger.error("If you reflect this, I will hunt you down. - TehNut"); + BMLog.DEFAULT.error("This registry has been locked. Please register your ritual earlier."); + BMLog.DEFAULT.error("If you reflect this, I will hunt you down. - TehNut"); return; } if (ritual != null) { if (registry.containsKey(id)) - PleaseStopUsingMe.logger.error("Duplicate ritual id: %s", id); + BMLog.DEFAULT.error("Duplicate ritual id: %s", id); else { registry.put(id, ritual); enabledRituals.put(ritual, enabled); @@ -78,7 +78,7 @@ public class RitualRegistry { try { return enabledRituals.get(ritual); } catch (NullPointerException e) { - PleaseStopUsingMe.logger.error("Invalid Ritual was called"); + BMLog.DEFAULT.error("Invalid Ritual was called"); return false; } } @@ -111,13 +111,10 @@ public class RitualRegistry { locked = true; // Lock registry so no no rituals can be registered lookupList.clear(); // Make sure it's empty lookupList.addAll(registry.keySet()); - Collections.sort(lookupList, new Comparator() { - @Override - public int compare(String o1, String o2) { - Ritual ritual1 = registry.get(o1); - Ritual ritual2 = registry.get(o2); - return ritual1.getComponents().size() > ritual2.getComponents().size() ? -1 : 0; // Put earlier if bigger - } + Collections.sort(lookupList, (o1, o2) -> { + Ritual ritual1 = registry.get(o1); + Ritual ritual2 = registry.get(o2); + return ritual1.getComponents().size() > ritual2.getComponents().size() ? -1 : 0; // Put earlier if bigger }); } } diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 06cac743..e863aac9 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,8 +1,9 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -45,13 +46,13 @@ public class WorldDemonWillHandler { public static void addWillWorld(int dim) { if (!containedWills.containsKey(dim)) { containedWills.put(dim, new WillWorld(dim)); - PleaseStopUsingMe.logger.info("Creating demon will cache for world " + dim); + BMLog.DEBUG.info("Creating demon will cache for world " + dim); } } public static void removeWillWorld(int dim) { containedWills.remove(dim); - PleaseStopUsingMe.logger.info("Removing demon will cache for world " + dim); + BMLog.DEBUG.info("Removing demon will cache for world " + dim); } public static void addWillChunk(int dim, Chunk chunk, short base, DemonWillHolder currentWill) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java index 5fe53275..a1a0c46f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.livingArmour; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.nbt.NBTTagCompound; import java.lang.reflect.Constructor; @@ -31,7 +32,7 @@ public class LivingArmourHandler { try { Constructor ctor = clazz.getConstructor(int.class); if (ctor == null) { - PleaseStopUsingMe.logger.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); + BMLog.DEFAULT.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); } else { upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index af88a470..fbf098d3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.teleport.PortalLocation; +import WayofTime.bloodmagic.util.BMLog; import net.minecraftforge.common.DimensionManager; import java.io.*; @@ -27,12 +27,12 @@ public class LocationsHandler implements Serializable { updateFile(fileName, portals); } if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2) { - PleaseStopUsingMe.logger.info("Location " + name + " already exists."); + BMLog.DEBUG.info("Location {} already exists.", name); updateFile(fileName, portals); return false; } else { portals.get(name).add(location); - PleaseStopUsingMe.logger.info("Adding " + name); + BMLog.DEBUG.info("Adding {}", name); updateFile(fileName, portals); return true; } @@ -42,11 +42,11 @@ public class LocationsHandler implements Serializable { if (portals.get(name) != null && !portals.get(name).isEmpty()) { if (portals.get(name).contains(location)) { portals.get(name).remove(location); - PleaseStopUsingMe.logger.info("Removing " + name); + BMLog.DEBUG.info("Removing {}", name); updateFile(fileName, portals); return true; } else { - PleaseStopUsingMe.logger.info("No location matching " + name); + BMLog.DEBUG.info("No location matching {}", name); updateFile(fileName, portals); return false; } @@ -75,10 +75,10 @@ public class LocationsHandler implements Serializable { if (!file.exists()) { if (file.getParentFile().mkdir()) { if (file.createNewFile()) { - PleaseStopUsingMe.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + BMLog.DEBUG.info("Creating {} in {}", fileName, DimensionManager.getCurrentSaveRootDirectory()); } } else if (file.createNewFile()) { - PleaseStopUsingMe.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + BMLog.DEBUG.info("Creating {} in {}", fileName, DimensionManager.getCurrentSaveRootDirectory()); } } FileInputStream fileIn = new FileInputStream(file); @@ -90,7 +90,7 @@ public class LocationsHandler implements Serializable { } catch (IOException e) { return null; } catch (ClassNotFoundException e) { - PleaseStopUsingMe.logger.error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + BMLog.DEFAULT.error("{} was not found in {}", file, DimensionManager.getCurrentSaveRootDirectory()); return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/BMLog.java b/src/main/java/WayofTime/bloodmagic/util/BMLog.java new file mode 100644 index 00000000..0a9f1cfa --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/BMLog.java @@ -0,0 +1,57 @@ +package WayofTime.bloodmagic.util; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; +import org.apache.commons.lang3.text.WordUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public enum BMLog { + + DEFAULT(BloodMagic.MODID) { + @Override + boolean enabled() { + return true; + } + }, + DEBUG() { + @Override + boolean enabled() { + return ConfigHandler.general.enableDebugLogging; + } + }, + API() { + @Override + boolean enabled() { + return ConfigHandler.general.enableAPILogging; + } + }, + ; + + private final Logger logger; + + BMLog(String logName) { + logger = LogManager.getLogger(logName); + } + + BMLog() { + logger = LogManager.getLogger(BloodMagic.MODID + "|" + WordUtils.capitalizeFully(name().replace("_", " "))); + } + + abstract boolean enabled(); + + public void info(String input, Object... args) { + if (enabled()) + logger.info(input, args); + } + + public void error(String input, Object... args) { + if (enabled()) + logger.error(input, args); + } + + public void warn(String input, Object... args) { + if (enabled()) + logger.warn(input, args); + } +} From 0e986a0bdf655781001cb35067305ae15b18ed99 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 16 Feb 2018 23:58:24 -0800 Subject: [PATCH 078/493] Slightly alter the altar renderer --- .../client/render/block/RenderAltar.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 0c4a9073..d8988f06 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -13,7 +13,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -37,16 +36,15 @@ public class RenderAltar extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); if (level > 0) - this.renderFluid(getWorld(), level); - this.renderItem(tileAltar.getWorld(), inputStack); + this.renderFluid(level); + this.renderItem(inputStack); GlStateManager.popMatrix(); - if (tileAltar.getCurrentTierDisplayed() != EnumAltarTier.ONE) { + if (tileAltar.getCurrentTierDisplayed() != EnumAltarTier.ONE) renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); - } } - private void renderFluid(World world, float fluidLevel) { + private void renderFluid(float fluidLevel) { GlStateManager.pushMatrix(); Fluid fluid = BlockLifeEssence.getLifeEssence(); @@ -82,23 +80,20 @@ public class RenderAltar extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } - private void renderItem(World world, ItemStack stack) { + private void renderItem(ItemStack stack) { RenderItem itemRenderer = mc.getRenderItem(); if (!stack.isEmpty()) { GlStateManager.translate(0.5, 1, 0.5); - EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, stack); - entityitem.getItem().setCount(1); - entityitem.hoverStart = 0.0F; GlStateManager.pushMatrix(); GlStateManager.disableLighting(); float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); GlStateManager.rotate(rotation, 0.0F, 1.0F, 0); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.75F, 0.75F, 0.75F); GlStateManager.pushAttrib(); RenderHelper.enableStandardItemLighting(); - itemRenderer.renderItem(entityitem.getItem(), ItemCameraTransforms.TransformType.FIXED); + itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.GROUND); RenderHelper.disableStandardItemLighting(); GlStateManager.popAttrib(); From f49e661eb6980cf4904b8ba5079b5d67e1cffb2b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 09:26:35 -0800 Subject: [PATCH 079/493] Make sure we're looking at a block before doing blocky things (#1227) --- .../bloodmagic/client/hud/HUDElementCornerTile.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java index 207fde44..05a40b57 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java @@ -11,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderGameOverlayEvent; import org.apache.commons.lang3.tuple.Pair; @@ -79,6 +80,10 @@ public abstract class HUDElementCornerTile extends HUDElem } } + RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; + if (trace.typeOfHit != RayTraceResult.Type.BLOCK) + return false; + TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); if (!(tile instanceof TileAltar)) flag = false; From f89b5a005af35f10cbbd24a3f7e464a0d347b408 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 09:48:17 -0800 Subject: [PATCH 080/493] Logging for plugin gathering Moved spammy API stuff to a separate logger --- .../java/WayofTime/bloodmagic/BloodMagic.java | 7 ++--- .../WayofTime/bloodmagic/ConfigHandler.java | 4 ++- .../bloodmagic/api/impl/BloodMagicAPI.java | 2 +- .../api/impl/BloodMagicBlacklist.java | 10 +++--- .../api/impl/BloodMagicValueManager.java | 6 ++-- .../java/WayofTime/bloodmagic/util/BMLog.java | 6 ++++ .../WayofTime/bloodmagic/util/PluginUtil.java | 31 +++++++++++++++++-- 7 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 18a83ef5..0b1122f4 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.core.registry.RitualRegistry; import WayofTime.bloodmagic.util.helper.LogHelper; @@ -73,7 +72,7 @@ public class BloodMagic { public void preInit(FMLPreInitializationEvent event) { configDir = new File(event.getModConfigurationDirectory(), "bloodmagic"); - PLUGINS.addAll(PluginUtil.getPlugins(event.getAsmData())); + PLUGINS.addAll(PluginUtil.gatherPlugins(event.getAsmData())); ModTranquilityHandlers.init(); ModDungeons.init(); @@ -84,8 +83,8 @@ public class BloodMagic { @Mod.EventHandler public void init(FMLInitializationEvent event) { BloodMagicPacketHandler.init(); - for (Pair plugin : PLUGINS) - plugin.getLeft().register(BloodMagicAPI.INSTANCE); + + PluginUtil.registerPlugins(PLUGINS); ModRecipes.init(); ModRituals.initRituals(); diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 889c07af..27316942 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -35,8 +35,10 @@ public class ConfigHandler { public static class ConfigGeneral { @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) public boolean enableDebugLogging = false; - @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) + @Config.Comment({"Enables extra information to be printed to the log."}) public boolean enableAPILogging = false; + @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) + public boolean enableVerboseAPILogging = false; } public static class ConfigBlacklist { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index a1f82fe7..05d0716b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -55,7 +55,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { } if (component != null) { - BMLog.API.info("Registered {} as a {} altar component.", state, componentType); + BMLog.API_VERBOSE.info("Registered {} as a {} altar component.", state, componentType); altarComponents.put(component, state); } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java index 5348eb2c..18029c71 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -30,7 +30,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addTeleposer(@Nonnull IBlockState state) { if (!teleposer.contains(state)) { - BMLog.API.info("Blacklist: Added {} to the Teleposer blacklist.", state); + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state); teleposer.add(state); } } @@ -43,7 +43,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addTeleposer(@Nonnull ResourceLocation entityId) { if (!teleposerEntities.contains(entityId)) { - BMLog.API.info("Blacklist: Added {} to the Teleposer blacklist.", entityId); + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", entityId); teleposerEntities.add(entityId); } } @@ -51,7 +51,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addTransposition(@Nonnull IBlockState state) { if (!transposition.contains(state)) { - BMLog.API.info("Blacklist: Added {} to the Transposition blacklist.", state); + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state); transposition.add(state); } } @@ -64,7 +64,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addGreenGrove(@Nonnull IBlockState state) { if (!greenGrove.contains(state)) { - BMLog.API.info("Blacklist: Added {} to the Green Grove blacklist.", state); + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state); greenGrove.add(state); } } @@ -77,7 +77,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { @Override public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { if (!sacrifice.contains(entityId)) { - BMLog.API.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId); + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId); sacrifice.add(entityId); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java index 99fc2e9f..5c894574 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java @@ -25,7 +25,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { @Override public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { - BMLog.API.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value); + BMLog.API_VERBOSE.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value); sacrificial.put(entityId, value); } @@ -40,14 +40,14 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { } if (tranquility != null) { - BMLog.API.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value); + BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value); this.tranquility.put(state, new TranquilityStack(tranquility, value)); } else BMLog.API.warn("Invalid tranquility type: {}.", tranquilityType); } public void setTranquility(Block block, TranquilityStack tranquilityStack) { for (IBlockState state : block.getBlockState().getValidStates()) { - BMLog.API.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); + BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); tranquility.put(state, tranquilityStack); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/BMLog.java b/src/main/java/WayofTime/bloodmagic/util/BMLog.java index 0a9f1cfa..c6e75232 100644 --- a/src/main/java/WayofTime/bloodmagic/util/BMLog.java +++ b/src/main/java/WayofTime/bloodmagic/util/BMLog.java @@ -26,6 +26,12 @@ public enum BMLog { return ConfigHandler.general.enableAPILogging; } }, + API_VERBOSE() { + @Override + boolean enabled() { + return ConfigHandler.general.enableVerboseAPILogging; + } + }, ; private final Logger logger; diff --git a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java index 0b69af06..2faf5d38 100644 --- a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java @@ -2,7 +2,9 @@ package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.BloodMagicCorePlugin; +import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import net.minecraftforge.fml.common.discovery.ASMDataTable; import org.apache.commons.lang3.tuple.Pair; @@ -15,7 +17,8 @@ public class PluginUtil { @SuppressWarnings("unchecked") @Nonnull - public static List> getPlugins(ASMDataTable dataTable) { + public static List> gatherPlugins(ASMDataTable dataTable) { + Stopwatch stopwatch = Stopwatch.createStarted(); List> discoveredAnnotations = Lists.newArrayList(); Set discoveredPlugins = dataTable.getAll(BloodMagicPlugin.class.getCanonicalName()); @@ -26,6 +29,7 @@ public class PluginUtil { IBloodMagicPlugin instance = pluginClass.newInstance(); + BMLog.API.info("Discovered plugin at {}", data.getClassName()); discoveredAnnotations.add(Pair.of(instance, pluginClass.getAnnotation(BloodMagicPlugin.class))); } catch (Exception e) { e.printStackTrace(); @@ -33,7 +37,30 @@ public class PluginUtil { } // Bring core plugin up to top - discoveredAnnotations.sort((o1, o2) -> o1.getLeft().getClass() == BloodMagicCorePlugin.class ? 1 : 0); + discoveredAnnotations.sort((o1, o2) -> { + if (o1.getLeft().getClass() == BloodMagicCorePlugin.class) + return -1; + + return o1.getClass().getCanonicalName().compareToIgnoreCase(o2.getClass().getCanonicalName()); + }); + BMLog.API.info("Discovered {} potential plugin(s) in {}", discoveredAnnotations.size(), stopwatch.stop()); return discoveredAnnotations; } + + public static void registerPlugins(List> plugins) { + Stopwatch total = Stopwatch.createStarted(); + int errors = 0; + for (Pair plugin : plugins) { + Stopwatch per = Stopwatch.createStarted(); + try { + plugin.getLeft().register(BloodMagicAPI.INSTANCE); + } catch (Exception e) { + errors++; + BMLog.DEFAULT.error("Error loading plugin at {}: {}: {}", plugin.getLeft().getClass(), e.getClass().getSimpleName(), e.getMessage()); + } + BMLog.API.info("Registered plugin at {} in {}", plugin.getLeft().getClass(), per.stop()); + } + + BMLog.API.info("Registered {} plugins with {} errors in {}", plugins.size() - errors, errors, total.stop()); + } } From 90a071ae2377c433a0b85b78abe511423a0049cc Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 09:54:29 -0800 Subject: [PATCH 081/493] Fix some logger usages --- .../bloodmagic/core/registry/ImperfectRitualRegistry.java | 2 +- .../WayofTime/bloodmagic/core/registry/RitualRegistry.java | 2 +- .../WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java index 7694eae2..c1c0acdf 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java @@ -24,7 +24,7 @@ public class ImperfectRitualRegistry { public static void registerRitual(ImperfectRitual imperfectRitual, String id, boolean enabled) { if (imperfectRitual != null) { if (registry.containsKey(id)) - BMLog.DEFAULT.error("Duplicate imperfect ritual id: %s", id); + BMLog.DEFAULT.error("Duplicate imperfect ritual id: {}", id); else { registry.put(id, imperfectRitual); enabledRituals.put(imperfectRitual, enabled); diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java index dad49720..cc3f5dc6 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java @@ -35,7 +35,7 @@ public class RitualRegistry { if (ritual != null) { if (registry.containsKey(id)) - BMLog.DEFAULT.error("Duplicate ritual id: %s", id); + BMLog.DEFAULT.error("Duplicate ritual id: {}", id); else { registry.put(id, ritual); enabledRituals.put(ritual, enabled); diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index e863aac9..0ccf57e0 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -46,13 +46,13 @@ public class WorldDemonWillHandler { public static void addWillWorld(int dim) { if (!containedWills.containsKey(dim)) { containedWills.put(dim, new WillWorld(dim)); - BMLog.DEBUG.info("Creating demon will cache for world " + dim); + BMLog.DEBUG.info("Creating demon will cache for world {}", dim); } } public static void removeWillWorld(int dim) { containedWills.remove(dim); - BMLog.DEBUG.info("Removing demon will cache for world " + dim); + BMLog.DEBUG.info("Removing demon will cache for world {}", dim); } public static void addWillChunk(int dim, Chunk chunk, short base, DemonWillHolder currentWill) { From 009711583e2b258329cbf4b9c84bada7130ff6b3 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 10:08:23 -0800 Subject: [PATCH 082/493] Update changelog + version --- changelog.txt | 9 +++++++++ gradle.properties | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 590d761f..8b6b1ff3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,12 @@ +------------------------------------------------------ +Version 2.2.4 +------------------------------------------------------ + +- Make sure we're looking at a block before doing blocky things +- Slightly altered the altar's renderer +- Added new spammy logging with config options + - Prints out information like mods registering things via the API and stuff + ------------------------------------------------------ Version 2.2.3 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index afba9053..43d16647 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.3 +mod_version=2.2.4 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From b0b62de7fd1fbcf8107000788f4239890e2514f5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 10:14:53 -0800 Subject: [PATCH 083/493] Mark builds as alpha status --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d66bf41..fde35074 100644 --- a/build.gradle +++ b/build.gradle @@ -170,7 +170,7 @@ curseforge { project { id = "${curse_id}" changelog = getChangelogText() - releaseType = 'beta' + releaseType = 'alpha' relations curseRelations From 441e7b8952e4f84bb0a99814904cc3ef55583c66 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 10:38:33 -0800 Subject: [PATCH 084/493] Fix Lava Crystal being consumed --- .../bloodmagic/item/ItemLavaCrystal.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 81c127fc..b64edd65 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; @@ -21,11 +22,13 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide @Override public ItemStack getContainerItem(ItemStack itemStack) { - NetworkHelper.getSoulNetwork(this.getOwnerUUID(itemStack)).syphon(25); - ItemStack copiedStack = itemStack.copy(); - copiedStack.setItemDamage(copiedStack.getItemDamage()); - copiedStack.setCount(1); - return copiedStack; + String uuid = getOwnerUUID(itemStack); + if (uuid != null) + NetworkHelper.getSoulNetwork(this.getOwnerUUID(itemStack)).syphon(25); + + ItemStack returnStack = new ItemStack(this); + returnStack.setTagCompound(itemStack.getTagCompound()); + return returnStack; } @Override @@ -35,9 +38,6 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide @Override public int getItemBurnTime(ItemStack stack) { - if (!stack.hasTagCompound()) - return -1; - if (getOwnerUUID(stack) == null) return -1; @@ -52,6 +52,16 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide return -1; } + @Override + public String getOwnerName(ItemStack stack) { + return stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; + } + + @Override + public String getOwnerUUID(ItemStack stack) { + return stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + } + @Override public List> getVariants() { List> ret = Lists.newArrayList(); From 41baaaf28e35fe63959e6ce05bcb3dfbbc096989 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 15:07:54 -0800 Subject: [PATCH 085/493] YARTF (yet another ray trace fix) (#1228) --- .../WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java index 05a40b57..b84f1c5b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java @@ -81,7 +81,7 @@ public abstract class HUDElementCornerTile extends HUDElem } RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; - if (trace.typeOfHit != RayTraceResult.Type.BLOCK) + if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) return false; TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); From 6ffe4b8f5806e48bcdd25788a01b81d6da1bfc28 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 15:36:50 -0800 Subject: [PATCH 086/493] Fix localization for augmented capacity and self sacrifice runes --- src/main/resources/assets/bloodmagic/lang/en_US.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 27fb5cc3..d08c16c4 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -204,10 +204,10 @@ tile.bloodmagic.rune.blank.name=Blank Rune tile.bloodmagic.rune.speed.name=Speed Rune tile.bloodmagic.rune.efficiency.name=Efficiency Rune tile.bloodmagic.rune.sacrifice.name=Rune of Sacrifice -tile.bloodmagic.rune.selfsacrifice.name=Rune of Self Sacrifice +tile.bloodmagic.rune.self_sacrifice.name=Rune of Self Sacrifice tile.bloodmagic.rune.displacement.name=Displacement Rune tile.bloodmagic.rune.capacity.name=Rune of Capacity -tile.bloodmagic.rune.augcapacity.name=Rune of Augmented Capacity +tile.bloodmagic.rune.augmented_capacity.name=Rune of Augmented Capacity tile.bloodmagic.rune.orb.name=Rune of the Orb tile.bloodmagic.rune.acceleration.name=Acceleration Rune tile.bloodmagic.rune.charging.name=Charging Rune From 0cb9d66c8172fe1c27ef5f29c8d7805d050188a1 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 15:50:11 -0800 Subject: [PATCH 087/493] Satiated Stomach will now let you gorge yourself if you're really hungry (#1188) If the user is below 5 saturation, it will no longer ignore above-max saturation foods. --- .../bloodmagic/ritual/RitualFullStomach.java | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index 8a8f5181..7cc66329 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -11,6 +11,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.FoodStats; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import java.util.ArrayList; import java.util.List; @@ -40,37 +42,32 @@ public class RitualFullStomach extends Ritual { AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - if (!(tile instanceof IInventory)) { + if (tile == null || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) return; - } - - IInventory inventory = (IInventory) tile; + IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); int lastSlot = 0; - AreaDescriptor fillingRange = getBlockRange(FILL_RANGE); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos)); for (EntityPlayer player : playerList) { FoodStats foodStats = player.getFoodStats(); float satLevel = foodStats.getSaturationLevel(); - for (int i = lastSlot; i < inventory.getSizeInventory(); i++) { - ItemStack stack = inventory.getStackInSlot(i); + for (int i = lastSlot; i < inventory.getSlots(); i++) { + ItemStack stack = inventory.extractItem(i, 1, true); if (!stack.isEmpty() && stack.getItem() instanceof ItemFood) { ItemFood foodItem = (ItemFood) stack.getItem(); int healAmount = foodItem.getHealAmount(stack); float saturationAmount = foodItem.getSaturationModifier(stack) * healAmount * 2.0f; - if (saturationAmount + satLevel <= 20) { - NBTTagCompound nbt = new NBTTagCompound(); - foodStats.writeNBT(nbt); - nbt.setFloat("foodSaturationLevel", saturationAmount + satLevel); - foodStats.readNBT(nbt); - - inventory.decrStackSize(i, 1); + // Checks to make sure we're being efficient with the food and not wasting high value foods + // If the food provides more than the max saturation, we just accept it no matter what if the player is low + // Pam please stop being weird. Fix your mod. + if (saturationAmount + satLevel <= 20 || satLevel < 5) { + foodStats.addStats(foodItem, stack); + inventory.extractItem(i, 1, false); totalEffects++; lastSlot = i; break; From 539879dbd7fd0482fa549a49ee121b72a680a510 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 16:10:27 -0800 Subject: [PATCH 088/493] Mod ID filter should only be based on the modid (#1179) Dangit way --- .../bloodmagic/routing/ModIdItemFilter.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java index c414770a..36531585 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java @@ -1,24 +1,16 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; public class ModIdItemFilter extends TestItemFilter { + @Override public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - if (ItemStack.areItemsEqualIgnoreDurability(filterStack, testStack)) { - String keyId = getModID(filterStack.getItem()); - String checkedId = getModID(testStack.getItem()); - return keyId.equals(checkedId); - } - - return false; + return getModID(filterStack).equalsIgnoreCase(getModID(testStack)); } - public String getModID(Item item) { - ResourceLocation resource = ForgeRegistries.ITEMS.getKey(item); - return resource.getResourceDomain(); + public String getModID(ItemStack stack) { + String modid = stack.getItem().getCreatorModId(stack); + return modid == null ? "" : modid; } } From c05336ac9f21f3af7caa81f28c4b043c5175ca42 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 16:27:57 -0800 Subject: [PATCH 089/493] "Temporarily" disable cross-dimension entity teleports --- .../item/sigil/ItemSigilTeleposition.java | 6 +++-- .../bloodmagic/tile/TileTeleposer.java | 26 ++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index ea744f7f..38535e96 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -56,9 +56,11 @@ public class ItemSigilTeleposition extends ItemSigilBase { BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up(); if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) { TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack), true)); - } else { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true)); } + // FIXME - Fix cross-dimension teleports causing major desync +// } else { +// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true)); +// } } return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index dc2317c8..f91052d9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -104,19 +104,21 @@ public class TileTeleposer extends TileInventory implements ITickable { TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), true)); } } - } else { - if (!originalWorldEntities.isEmpty()) { - for (Entity entity : originalWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), getWorld(), focusWorld.provider.getDimension(), true)); - } - } - - if (!focusWorldEntities.isEmpty()) { - for (Entity entity : focusWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, getWorld().provider.getDimension(), true)); - } - } } + // FIXME - Fix cross-dimension teleports causing major desync +// } else { +// if (!originalWorldEntities.isEmpty()) { +// for (Entity entity : originalWorldEntities) { +// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), getWorld(), focusWorld.provider.getDimension(), true)); +// } +// } +// +// if (!focusWorldEntities.isEmpty()) { +// for (Entity entity : focusWorldEntities) { +// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, getWorld().provider.getDimension(), true)); +// } +// } +// } } } } From 74eaabff8ec132255253ba048f0a256e536c7fcf Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 16:37:04 -0800 Subject: [PATCH 090/493] Bounce array now behaves as a pillow while sneak (#1196) --- .../bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java index 85d62dee..cd35b720 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java @@ -22,7 +22,7 @@ public class AlchemyArrayEffectBounce extends AlchemyArrayEffect { @Override public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { if (entity.isSneaking()) { - return; + entity.fallDistance = 0; } else if (entity.motionY < 0.0D) { entity.motionY = -entity.motionY; From 600326acce08a78ee6f28d28bcf785c6547d918d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 16:56:16 -0800 Subject: [PATCH 091/493] Update changelog + version --- changelog.txt | 15 +++++++++++++++ gradle.properties | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 8b6b1ff3..bb775ab4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,18 @@ +------------------------------------------------------ +Version 2.2.5 +------------------------------------------------------ + +- We are now even more sure we're looking at a block before doing blocky things +- Fix Lava Crystal being consumed by furnaces +- Augmented Capacity and Self Sacrifice runes remember their names now +- Satiated Stomach will now let you gorge yourself on overly high saturation foods + - I'm looking at you, Pam. Stop being weird and giving your foods 28 saturation. +- Made Mod ID node filter dumber so it actually, like, works properly +- "Temporarily" disabled cross-dimensional teleports for entities. Temporarily. + - Did I mention this is temporary? As in totally not permanently? + - Who am I kidding? I'll probably forget about this. +- Bounce Arrays are no longer death traps when sneaking. + ------------------------------------------------------ Version 2.2.4 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 43d16647..5157ee7e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.4 +mod_version=2.2.5 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From ee42f6ddc25037c776193532956b54901e904cfd Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 18 Feb 2018 14:20:36 -0800 Subject: [PATCH 092/493] Slates and inscription tools should use ItemEnum properly --- .../compat/guideapi/book/CategoryRitual.java | 2 +- .../core/RegistrarBloodMagicRecipes.java | 77 ++++++++++--------- .../bloodmagic/item/ItemInscriptionTool.java | 53 +++++-------- .../bloodmagic/ritual/data/EnumRuneType.java | 29 ++++--- 4 files changed, 79 insertions(+), 82 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index 6e53c89d..ccc59e49 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -44,7 +44,7 @@ public class CategoryRitual { for (int i = 1; i < 5; i++) { EnumRuneType type = EnumRuneType.values()[i]; - AltarRecipe scribeRecipe = RecipeHelper.getAltarRecipeForOutput(type.getScribeStack()); + AltarRecipe scribeRecipe = RecipeHelper.getAltarRecipeForOutput(type.getStack()); if (scribeRecipe != null) { ritualStonePages.add(new PageAltarRecipe(scribeRecipe)); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index d49617dc..ed3fcbac 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; import WayofTime.bloodmagic.altar.EnumAltarTier; import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.item.ItemSlate; import WayofTime.bloodmagic.ritual.data.EnumRuneType; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; @@ -55,38 +56,38 @@ public class RegistrarBloodMagicRecipes { public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { // ONE registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE.ordinal(), 2000, 2, 1); - registrar.addBloodAltar(new OreIngredient("stone"), new ItemStack(RegistrarBloodMagicItems.SLATE), EnumAltarTier.ONE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), EnumAltarTier.ONE.ordinal(), 1000, 5, 5); registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), EnumAltarTier.ONE.ordinal(), 1000, 5, 0); registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE.ordinal(), 1000, 20, 0); // TWO registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO.ordinal(), 5000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), EnumAltarTier.TWO.ordinal(), 2000, 5, 5); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), EnumAltarTier.TWO.ordinal(), 2000, 5, 5); registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO.ordinal(), 3000, 5, 5); // THREE registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE.ordinal(), 25000, 20, 20); - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), EnumAltarTier.THREE.ordinal(), 5000, 15, 10); - registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getScribeStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), EnumAltarTier.THREE.ordinal(), 5000, 15, 10); + registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE.ordinal(), 10000, 20, 10); // FOUR registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR.ordinal(), 25000, 30, 50); - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR.ordinal(), 15000, 20, 20); - registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR.ordinal(), 2000, 20, 10); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), EnumAltarTier.FOUR.ordinal(), 15000, 20, 20); + registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), EnumAltarTier.FOUR.ordinal(), 2000, 20, 10); registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR.ordinal(), 2000, 10, 10); registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR.ordinal(), 10000, 20, 10); // FIVE registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE.ordinal(), 80000, 50, 100); - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE.ordinal(), 30000, 40, 100); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), EnumAltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); - registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { @@ -141,8 +142,8 @@ public class RegistrarBloodMagicRecipes { public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", ItemSlate.SlateType.IMBUED.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); @@ -175,12 +176,12 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentTypes.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis"); + registrar.addTartaricForge(ComponentTypes.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", ItemSlate.SlateType.BLANK.getStack()); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", ItemSlate.SlateType.REINFORCED.getStack(), "gemLapis", "gemLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", ItemSlate.SlateType.IMBUED.getStack()); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack()); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack()); @@ -195,29 +196,29 @@ public class RegistrarBloodMagicRecipes { } public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) { - registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); + registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_WATER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_LAVA.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_AIR.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_VOID.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_GROWTH.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_AFFINITY.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_SIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_HOLDING.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_MAGNETISM.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_SUPPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_HASTE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_BRIDGE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_COMPRESSION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_SEVERANCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_TELEPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_CLAW.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_BOUNCE.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_FROST.getStack(), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_WATER.getStack(), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_LAVA.getStack(), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_AIR.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_FAST_MINER.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_VOID.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_GROWTH.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_AFFINITY.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_SIGHT.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_HOLDING.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_MAGNETISM.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_SUPPRESSION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); + registrar.addAlchemyArray(ComponentTypes.REAGENT_HASTE.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_BRIDGE.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_COMPRESSION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_SEVERANCE.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_TELEPOSITION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_CLAW.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_BOUNCE.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), null); + registrar.addAlchemyArray(ComponentTypes.REAGENT_FROST.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 52bc7794..b8d88eda 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,17 +1,19 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.ritual.data.EnumRuneType; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; -import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -21,24 +23,16 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class ItemInscriptionTool extends ItemBindableBase implements IVariantProvider { +public class ItemInscriptionTool extends ItemEnum implements IBindable { + public ItemInscriptionTool() { - super(); + super(EnumRuneType.class, "scribe"); - setUnlocalizedName(BloodMagic.MODID + ".scribe."); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + EnumRuneType.values()[stack.getItemDamage()]; + setMaxStackSize(1); } @Override @@ -47,9 +41,11 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro if (!isInCreativeTab(creativeTab)) return; - for (int i = 1; i < EnumRuneType.values().length; i++) { - ItemStack stack = NBTHelper.checkNBT(new ItemStack(this, 1, i)); - stack.getTagCompound().setInteger(Constants.NBT.USES, 10); + for (EnumRuneType runeType : types) { + ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger(Constants.NBT.USES, 10); + stack.setTagCompound(tag); list.add(stack); } } @@ -59,11 +55,11 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro ItemStack stack = player.getHeldItem(hand); IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockRitualStone && !((BlockRitualStone) state.getBlock()).isRuneType(world, pos, getType(stack))) { + if (state.getBlock() instanceof BlockRitualStone && !((BlockRitualStone) state.getBlock()).isRuneType(world, pos, getItemType(stack))) { stack = NBTHelper.checkNBT(stack); int uses = stack.getTagCompound().getInteger(Constants.NBT.USES); - world.setBlockState(pos, state.withProperty(((BlockRitualStone) state.getBlock()).getProperty(), getType(stack))); + world.setBlockState(pos, state.withProperty(((BlockRitualStone) state.getBlock()).getProperty(), getItemType(stack))); if (!player.capabilities.isCreativeMode) { stack.getTagCompound().setInteger(Constants.NBT.USES, --uses); if (uses <= 0) @@ -96,20 +92,13 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { - list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc")))); - super.addInformation(stack, world, list, flag); - } + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc")))); - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (int i = 1; i < EnumRuneType.values().length; i++) - ret.add(new ImmutablePair(i, "type=" + EnumRuneType.values()[i].name())); - return ret; - } + if (!stack.hasTagCompound()) + return; - public EnumRuneType getType(ItemStack stack) { - return EnumRuneType.values()[stack.getItemDamage()]; + if (!Strings.isNullOrEmpty(getOwnerUUID(stack))) + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java index ea1f364a..6bab1b6e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java @@ -1,15 +1,16 @@ package WayofTime.bloodmagic.ritual.data; -import net.minecraft.init.Items; -import net.minecraft.item.Item; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.types.ISubItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.common.registry.GameRegistry; +import javax.annotation.Nonnull; import java.util.Locale; -public enum EnumRuneType implements IStringSerializable { +public enum EnumRuneType implements IStringSerializable, ISubItem { + BLANK(TextFormatting.GRAY), WATER(TextFormatting.AQUA), FIRE(TextFormatting.RED), @@ -18,19 +19,12 @@ public enum EnumRuneType implements IStringSerializable { DUSK(TextFormatting.DARK_GRAY), DAWN(TextFormatting.GOLD); - @GameRegistry.ObjectHolder("bloodmagic:inscription_tool") - public static final Item INSCRIPTION_TOOL = Items.AIR; - public final TextFormatting colorCode; EnumRuneType(TextFormatting colorCode) { this.colorCode = colorCode; } - public ItemStack getScribeStack() { - return new ItemStack(INSCRIPTION_TOOL, 1, ordinal()); - } - @Override public String toString() { return name().toLowerCase(Locale.ENGLISH); @@ -41,6 +35,18 @@ public enum EnumRuneType implements IStringSerializable { return this.toString(); } + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); + } + public static EnumRuneType byMetadata(int meta) { if (meta < 0 || meta >= values().length) meta = 0; @@ -48,4 +54,5 @@ public enum EnumRuneType implements IStringSerializable { return values()[meta]; } + } From ea47db3e5d2691e60647427ff696b298dcd3c884 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 18 Feb 2018 14:33:50 -0800 Subject: [PATCH 093/493] Wrong extenderoo --- .../java/WayofTime/bloodmagic/item/ItemInscriptionTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index b8d88eda..a87bff6c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Arrays; import java.util.List; -public class ItemInscriptionTool extends ItemEnum implements IBindable { +public class ItemInscriptionTool extends ItemEnum.Variant implements IBindable { public ItemInscriptionTool() { super(EnumRuneType.class, "scribe"); From c5b0b61315fe325818eb5372fbf4fa8febf12a29 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 18 Feb 2018 15:55:40 -0800 Subject: [PATCH 094/493] Add HUD elements for tranquility (#1233) --- .../bloodmagic/client/hud/Elements.java | 101 ++++++++++++++++++ .../client/hud/HUDElementCornerTile.java | 8 +- .../bloodmagic/proxy/ClientProxy.java | 42 +------- .../bloodmagic/textures/gui/widgets.png | Bin 24967 -> 25852 bytes 4 files changed, 108 insertions(+), 43 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/Elements.java diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java b/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java new file mode 100644 index 00000000..6c507d1a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java @@ -0,0 +1,101 @@ +package WayofTime.bloodmagic.client.hud; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.Sprite; +import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.tile.TileIncenseAltar; +import WayofTime.bloodmagic.tile.TileInversionPillar; +import WayofTime.bloodmagic.util.helper.NumeralHelper; +import net.minecraft.util.ResourceLocation; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.List; +import java.util.function.Function; + +public class Elements { + + public static void createHUDElements() { + new HUDElementHolding(); + new HUDElementDemonWillAura(); + // Blood Altar with Divination Sigil + new HUDElementCornerTile.DivinedView(TileAltar.class, true) { + @Override + protected void addInformation(List>> information) { + // Current tier + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), + altar -> NumeralHelper.toRoman(altar.getTier().toInt()) + )); + // Stored/Capacity + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), + altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()) + )); + } + }; + // Blood Altar with Seers Sigil + new HUDElementCornerTile.DivinedView(TileAltar.class, false) { + @Override + protected void addInformation(List>> information) { + // Current tier + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), + altar -> NumeralHelper.toRoman(altar.getTier().toInt()) + )); + // Stored/Capacity + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), + altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()) + )); + // Crafting progress/Crafting requirement + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), + altar -> { + if (!altar.isActive()) + return "Inactive"; // FIXME localize + int progress = altar.getProgress(); + int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); + return String.format("%d/%d", progress, totalLiquidRequired); + } + )); + // Consumption rate + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), + altar -> String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))) + )); + // Total charge + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), + altar -> String.valueOf(altar.getTotalCharge()) + )); + } + }; + // Incense Altar + new HUDElementCornerTile.DivinedView(TileIncenseAltar.class, true) { + @Override + protected void addInformation(List>> information) { + // Current tranquility + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 80, 46, 16, 16), + incense -> String.valueOf((int) ((100D * (int) (100 * incense.tranquility)) / 100D)) + )); + // Sacrifice bonus + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 96, 46, 16, 16), + incense -> String.valueOf((int) (100 * incense.incenseAddition)) + )); + } + }; + // Inversion Pillar + new HUDElementCornerTile.DivinedView(TileInversionPillar.class, true) { + @Override + protected void addInformation(List>> information) { + // Current inversion + information.add(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 112, 46, 16, 16), + pillar -> String.valueOf(((int) (10 * pillar.getCurrentInversion())) / 10D) + )); + } + }; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java index b84f1c5b..3ac6264c 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java @@ -47,11 +47,13 @@ public abstract class HUDElementCornerTile extends HUDElem } } - public static abstract class BloodAltar extends HUDElementCornerTile { + public static abstract class DivinedView extends HUDElementCornerTile { + private final Class tileClass; private final boolean simple; - public BloodAltar(boolean simple) { + public DivinedView(Class tileClass, boolean simple) { + this.tileClass = tileClass; this.simple = simple; } @@ -85,7 +87,7 @@ public abstract class HUDElementCornerTile extends HUDElem return false; TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); - if (!(tile instanceof TileAltar)) + if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) flag = false; return flag; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 4ae09cac..3aa2be30 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.hud.Elements; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; @@ -121,46 +122,7 @@ public class ClientProxy extends CommonProxy { @Override public void postInit() { - new HUDElementHolding(); - new HUDElementDemonWillAura(); - new HUDElementCornerTile.BloodAltar(true) { // Divination Sigil - @Override - protected void addInformation(List>> information) { - information.add(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), altar -> NumeralHelper.toRoman(altar.getTier().toInt()))); - information.add(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()))); - } - }; - new HUDElementCornerTile.BloodAltar(false) { // Seer Sigil - @Override - protected void addInformation(List>> information) { - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), - altar -> NumeralHelper.toRoman(altar.getTier().toInt()) - )); - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), - altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()) - )); - information.add(Pair.of( // Craft Progress - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), - altar -> { - if (!altar.isActive()) - return "Inactive"; // FIXME localize - int progress = altar.getProgress(); - int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); - return String.format("%d/%d", progress, totalLiquidRequired); - } - )); - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), - altar -> String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))) - )); - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), - altar -> String.valueOf(altar.getTotalCharge()) - )); - } - }; + Elements.createHUDElements(); } @Override diff --git a/src/main/resources/assets/bloodmagic/textures/gui/widgets.png b/src/main/resources/assets/bloodmagic/textures/gui/widgets.png index 6d8d9cfe1c773bcda8dbd235b756b045a7817ebf..4c80a03ca37d5c71d5b08430638dc66a59dac018 100644 GIT binary patch delta 6923 zcma)gbySpH*Z0K`gEZ11sg%HgbPRn1B2scA4mp5;AR*lsA)QJ~ry>F((hMLqA~_)C z07FQ(jC8y_&w9W0eSdz}I@da}_Bm(mv-ke(-#O9U1Q-1TpVP<)y6V!&KteKEV{s{Y zDRFs8@l*~f#s9Z!N2PGr&c;qcT1-MhL|n?&Uc^p9Qc6TlTufTT{(-cOjGT;(jI0#0 zuA6F`=>JPHmF2b+oveu10}=86yRC?rY%22h_tarVlDZ9g8-i3)YQ8!~#!YdeE^(u+ zR3dFrkp0<14OL^mU)ytmDdrP-ocnun#~A$~-Q-c*Qd(=%l+RP&t?#PxaFAOv-ZMA~ zM?L!SoiEF}rf%NPg)w5;_<7~Fx6zEZdvBz(%r`SlVLhK^hFF&b1`6$8c7FlXv?&C+ zjUi2xe0PjrRvPK&Y~0%kYz@>DfBRPeRQ~s80vOP;hnmCh1#%qYU5e^S08;K^t95g_ zgKN6txOd$4V+eFE^~R^-Hn#m1!l29$uOkQ$dUbW&kt|}?a93va z&|fx*5DR} z(uxPmgcAes*{=U~LUOXLwKeb`kpm*tlx;R3oGbLjyPE~`*Hi`5XJJ*BCpJ6iTZPL_ z=2QQOW)8fRnV+1rFBZPqYS7w2g;=cF4Mg^FN3W;A1gs+{4j)pRVS=IOP8DA2O zYfXD^S!#W8#!q z<$M*tHKn-lZieTS-x9pnB{s;eZvOqi*_s8@K+xIn>E(gUF@rC-vs|qdI=nOmDMwmQ z-a@i!8eITlPkgOeNfdF*3U7ujfP|zZo`R9a7UH1;_j=m;1f8u?_s1_ZL>f$H&Sm0Z z7N+GBLSlk;<$dxl*6+6#yb0|IrpH{SGAeRTO6Kycs!754U6tpnC9-(kuMSn$thuhO-s@;FOLfi z2RJZBXKe3jLj}C6|0%riVLewxHE#G;ovC6rU)jsVk^0V0bY0YSy{vQkUS1XB@JPSF zjYX9)oA+wksztPp0#(*#CLV!;{083eEPIDA!3iNB(nN3r@pYulg&(~hX~@;({&j*XRM!IyHZO!9vE3g(Mgk{$`AJ%&4^viOz7n+!eh*K?b-^c;_UtC2Pb8fM8&XQ zk!+YlBOUO0fV@#d*HFVJJ3ZSkoA*#}ykOQX_+7kBC>hb~ukg0xI0oa#YcYA%jlq7YJ8LKMwCGc_`nzfrGW zb83#DvXWa4SyhxWqg}9B`T2U`KfV_4q?1Ed)aZo{4s$;>-#O&mSY!;X4pZ|ofpE?J z(&08dL`0g1-E9-w)WeqNd95(er%jsv%o(77zD24izTuN}a{W2sqX;d_)#jVHY3E5( z@`AVCgj3QV_72t5Qav|LEw5PqnPeeyf`J?p^i~b$yJ=P-1{e*zJezeBV-cDNFenVuzi8 z9=9dU!XjgQR3h#J8Cm&Dy-{Kg;gSiq6g9B(zyiSVp znxPkG{QW936ju>#6!Jl-yG5h7r837jdDuJ7hA3Xm`?4r5?Es-22kDsM8Ja@7273_C zKwrK^P)hS1>r?(gr+FRE=;cgt2ga79Pt5qJ!aw}8RG34KG+BA5U@>}1kr;jW;5~M% z${%H^)oeaIDA%ABJt;ntt4xF_Q6(cZqZQY%t< z>PrbDB8ybB@3m`0zI~%>Y99?Z`U*}8d*#~PmB$jKjI5QUJ3Ho;zfF0#wQ?G=>SZ|_ zTqQsB%oV0mYdR=gSv584{pCJs$t^g4g5G8NOP0sG6^?v3@)AacU@|dFj$F%9I~_vS zgHesb+(ralM8&zZ7Aa{r4U(CM6!IEL%D}_o({r56>5R4aX(y=a*B8`~WC1t*`^6C% z#DdHDNrQ@R%0z!ms8-qrhhrs2O#HZUFl%c zQ4=h^h&;+Lei0cfm`8EHGy&1gWgw7E!m9Vv=6&W)dFvvOQkPS?p_@I(+w*>F3>9sc z6}Bz-!(4OlL8^mGxBJ!<>#N3uwQQxr}=hS;;TbjHGrmPpQ`#0pvj6etJcd#e=;y5y5 zjQ=l*kaoSpPko=*>@z8RpAoa@2L!lqQt-(0!-0`wq?yTsT1Maa@kl$igVR7-?~a^a zM`jY8vfF28X9#lNB?!&TX@nyRm6uJF%mmA{bG)%0ITRFraxlKLVAjqUAuwjvk_5dCOGmLZBb8B+<&qbv{EvOgt_&y5I6C z<*xiw_0XpKcNzz0MC;Y&hkcbkJX=p%?mTRpbRaOU1ab?df&^x6TP~=o+4Eg3b?M*u zS~wRAm0jO)g{b%0;AoQa; zru~>?(s60qy#Z887w^aF=jcsE*eyv)Z;^aR^FK=-u9FLOD)AN)fv+aV^~7ehY;Jo@ z9%UH(*#2GMqQN=*Fp9XMAW?dD06 z8U)3+TB4Y$K=lvJm>!!Tlak$^W^nqVqAmgYrEonfEElSa2GJ?~IE@^`l4LahLpN8m zXw2LU$+{m@Ko{nvM+%&o;m#PNqN2XM|Fvo$%y`4IzBpAOs%#FHdi&8Yqobp1ZFmV7{9h+;vr5eihO-bRu0wuc@gCiiwGZI@QN{H0L&3T?Af8px}kx zXQPsjWs@SfNZpruZV8(=(Nu30H#Rb<(hRl&{H}}3=cO<;p0b|(eX$If)x7`5FOOi{ zS1d#X;au92GNs3LzI&FIG_P-P4+stU{YL98qsUxUBKprkMcs*x%0cjW2Ra}iz@W+m ziIoP~(GNM8tcdwhm#$Bj2@p>gZvOdxFKiB);cyzTItd!P2O8ei1$y>TmQ@+>_PwxlPe| zztysrfA{LQeS6QIfaEF9=(8;XE(-OF2~V7!YXaZomG3I$%=majZLRok54rywbw>wh z(lS@(!1KPXNHu~)O+w}QKRi|zj7k=y1PjrI@mGJ68+mqb-AMc8LkGS*umH!KCYaPZ zkAt(yv$KP7?rV3%9;ePdD<;1OEJea~1cT0%;lYUX^JZ9($sV?@phg%&tODuO*W2D} z(KyPB$=vQ!hw#YXFwF0kLR(&g!^0kmkGzVAJG1+?u(TFj1n%Vskf#M8T+mItw%u`t z#H=e)0o*+-_YvJ<3$l9PROKlR#-ABLY*iPeg8WPRLw}Et4=3)m&_Ft!EJ=iA2{X&$ z%&ze7m;XBxcg$U;SR!$3vUz^`pMlVIvgWuspJJof=F! zfVQBaFr$L#)}>xs<(`f}+1nZ@Z}DN~EsgsGWodpVwIhqfDwy4sr8+x5H>{bu36(A9j?tE% z-gwXxnr76-N`r}{2Wqwh7+_a5nQt@LW0bfZnKj3j);#1$x#cq`oU7i9tfj(!-7t}x zFtVl&U59XW4usQPZjy9vST<`pix3EC(8Ya3o#QS7kMqcjR@p>*(9%=Es|rV_M{Iiv ze*>q^KUsBHvPJbwR$*J_RR!;jW4X`%1t~-EEJXG8L+|WLA|fLCgJs<2g^hY68qm+v zrcf|X>xsPco}ftB>y(b~S8L>1X0FZ8U=}U(N;1l5Y zJ1J*1py??6QtY*+;i=>HOf*^0G=Ps*DkWH$aVU`bMJ`}LPhQ=jIkG#QGoyMajS0%# zmHrxY+~GPWpEmH^u`0E=?f2V9g*giTM>7tTRo+?y!G}XK8)6i-ei$3S{CF7>rsb(5 zcJ#u6M^kk?l=I?s$a130QqdDF&;x#rho2>#x8DaA-os`qsX651`Zq!p5BJ>031$9y zY8G;}5h(e^s{e?b;kvv-4%i`STA3C?ZAwHlL+}GT1d4|fu&o^BKdq$UfI`Qyvb-AC zF2N_WMp5%t2hOh~^h7^?sAB+QQeACwGDy^@K%|l-qK-ttcb9$+G1LT}$VeseH&#gx zoSck`w)x}M4Ck6_wqDg(w3=9X^xvaVv+jR;?+)%~;6_;{Ux)JP@6_pf=ciwmv97KE zQd3YYtYb=;L#7@8oq>IoH_j-K9%p);j_a(nnh(2yRddnkZz~bg;DS^ee(X_p#Pxb! z=H{DQ)K+cR4+eie{>cY=?4#tX+g*W-4@>$5A>?$n5+~n|Y?t!rubDd9*{J70&iuet z!CC)vh#0W$)&HdaVrnh~s)+uEnWA3Y%yE4fK)ADf^6i`IcFR#P4dinX#)0rT-Dk=| ztTC?R_Ns=Lz8b+SQ^QX^4NQiGM17%d=$D2 z7F)qq7Of=q4T=Fyir5wML*~kNO;^7dOl2LB`*D_dQPNkxo8o!3`u1mWiESlI;04U8 zo7d`;?qXjd#}vH44{$>MYr`$q4&DI5;lV;TjLnUgRJtXp6;|;V0@mZ@kEfen@d69H zP#<1EjE)shd+EY>l_)bGvx99MX*ID14SM^!jM(=pWfz_vOb}-x>rp_UTPvm2>FGB) zPNqH3(UH`7s(L74Xt^u-xWEU~75RO|V?UUB8C<4Y-x0C(nR_67f(e;DEo1v^9yKj3 zAJ^)7x+lO${@KNOcn@y+^)nRg@TE|mmWODEHR=y?xd#hdn)Z$L{sSy~a$N6Kp)^6y zsrf<0*u#tHziS;0(Ced|@eLe&T+P38!m|a}1+3QOqOsKKKc|%0!{^D*7s9Z_O zpB&s2B!1QV?$|bd($9T{0l?=juQwlo*O$kHzX|0!s^>YP9I#%zjMaR_-b)4C|)Bkqrny^crjFi9A8t4P;i3{J-sNFlX=@F zec+ta@)#H$!b<65jQ9X)*Vzw`$9uZ^U-|JTscVP*yH$<;*)OgFL_J>w=e1h&i0t`( znpB&|>Qn7#ZfxNm&cBB4qL?D|6~kif35KT#wW$d>M6D9^KcN^0Oz=p%(y;Ko0*}S6 zAL;iGem>Dh;@X4zL-_dkR%hMx^{Jieh4^Shz^g=@MI04TOaJB(B=fcbpRIBL?<=OmW<-d!@gIF9S}j7OSz3Oi$0DYxhm_$o{=U9f`;*-0l&KFOXjaZeFIUOu9E) z_cT}j3>?gxDFfYN)(F0UvvVZEr_nc$D0C=ChAkO>#Qd6uMh&#SY*5d($w`sEvD)L8 zxb{1(zI)QE^7AcgISq4s#X71ua{lS#T#GR2%X(g!dl96!*71m!@Ab-~tx|{qV{GO*@k)nA!bI0Y@UKn_rFKu7Ur!6jCBo;1Fas#=j?#xYFG3A5&Ep9(i!u>zf*!0&6cx1#3O0Xk&~iOGge1oUUK!gCDl7XB$NP6p|Nq%Hl^Io7NQ+;~GEFs4f&6 z2o#%(E>2&|#fcd+*As6I;kumz3_McM6M&^gGm-%bLbL&9y(=P3Uu|W zVe}8{m~EgN%kVp^fjLpnx<(4OT!`u&_!gT0rWwTOS2R)Fdim^;Yo|9P%(Wy8Bs81KOwEa(?V0k&SJFz0-<-5NER{j+7fzJ7|hJ~?jgyI`j>-~(Jy ze@!m)Gp+Ox^|okDgUWv~<8=UdFlO>{zJn9@>&$ohtF27+eES`+aXz3jzXrO$6c6L; z6<1Qq&&_db_kZ5V0RYCnyWQ|i>V>LoLvvc8i*IN555{-gY)Zw$WSsaVdX=rHxlq^d z_bvtcln!6Ws(uxC7^%|z+3Th_?{-I|-PVd{oL>9XH(; z)MfOf;UP;r;s8U}q}}lvcP?cvB2&hCwv-DrnFDAbre573<0ZK+JLguL!H+x6HIrF# zL3nDV5EvCj^3qC#G86Fm^84qkSMWC9{wT*R4m}No0~QlTIngfgTwM>~OlW8c{|b$&-}v5?_!|9cxfE zNkgQ>M=pm~;7}YvV@k9VS3ONOXtX)ImCyMjS{lte4_;AEv_vx*6+pF>SEII+9ATtZ zzW3unCZv-Gnewl{zuF`&ht>uebB9Uk0MkOY^4e`P6G)HmX zX+NAbJm`c%{~m}lDI68#)>*4#jgc1CL0*ay9pY$D{Q@+4BP1nWJ9kS4Q=znpU0Lq+ zoL6QL&h7{SdAw+jm z#gROzG}bz)DOOae50Kpd+onw|vX)N0wpJ$=2TpF&{GZ^5w)*LKME!Q$YqE@N& UQ>Fbr;O2YykDf-gnsxa907Wle3IG5A delta 6101 zcma)gXH=6-(Dog=KmaL?6_?8kRrj#(fC#xVO ztso_r!A_&}zn9K5iagJxWaZ_YQ@r0zL6I66p5NJ%vg z&}@cby}6i=j4VK@ z?kvoF-=b%)56-}8Yjpm~Z$Add#IfN~*n5o{9#DWz;|pfulsEl~PZPT~$QwH$)_X3Y zrL7GC7#J7;IFr!hQVgnnZ%`~MjY|zH3IOXB1!0tm!8-=vx*U!53@MOZer^1~o|&wK zUoawwjog8`yti&f# zjE$_m07|PF48V>l!*2PaaZAw($SnG{<6m_Pc|JU<=gYLmI@fr%8}JGpU`5Fm#)Rm2 zApkeJ{k+q+tG)IPSlzx5j_Z~+GBoUK5RP@24d{wO^1p@aFx82GNWU;4aF+GvSz0|cK4)M z6-&xr;?UBudXiQ&2IUkzNlu!(RrUq=XH> z*aX{sJ;`fv`%^mDJcFS#-48k}s=&{0eyi{azdJWr^gQ_ae|ik2%e&F(4j8e-a-8km z^G|N@g=iq8gw=@66l>Yt-^4wU)w?f%`5-eth{s=F8RAIE3um{VO!c}W+GmK0&7^vgm$RALz9irpw%3d=j`x~}--rv13Aro|x$S_p9$sxu2HOkU zI5oJ6C=W=lPY#JajaUd9)f!1ziWlrwK?9aiBxQkN7n)clV4uPCnTsP0px{-7g0E^} z<0(xJVcB=nhouCb%Bai`HG0Q#3d&5MJTIvz9W$pK-rFB|(S#g}OO4i0{Aq02*HV3m zok~|5IB>}6h8k2=*WY(FkX;P`63**3lzPagVayU6p^p~bNDnL5z< z=w){N!^$Skm5+LQ@j!kBpcDHrRy@hdz1#AyNEP%jY2$)ZP4TBqvObgT(v*o3jS-8- z^n}?$2KotctB4RyzIBXF*iK+qA?+(zNam;~TcMOVy2*icZ`DMPN$|D+*y!6RB9xEH zc0X~GPOl>>&t=gU;{6VLfKt|k05icqTs@c@RR&F3Dz;luYF>ACxN-|blYVy_Gif+~Tppj}+)w7P$Kd_Mk0M-gNuRj5u50c&)yetE*Fog&lDBv{g@q|V z1yQe3%!Q~3X<5mW67X^3=sUQUU29NL&iqk}mvslih?tW;?YcW(5`OUgk%$aZv^Q+oE6a9EM4favGyDd)!dIy@;05t{k^n9G^8(y{-NuIi} zA_CDk#oh^@XWil5y}z}MEeBq&AQd;Y@`qte=1|K%i4~-+gfokC&6xknWSKsy$mC%~ z@C*?>eJ#$Z$gyZ+kjc1GlO@k>ckR=Qg;MSx@=*BNg9RGt%vW}whpEie`!e&dbxb5Y zb)JGV5_vB{5@o@?Sck;NpQbj<8tGdt={I5>!`N>Z@)ZbY#JxmnDQ;E?z10ir;!M(y zy8pMS@7-t{Pp}?LrhMnGS4<`Nz(EiCh{eLP<{87Qk}C^qw|p~ojXSSO0(F){ZCh#! zlQ!biBoiB!6Vpg5IO5&PCc7Kd1AoN>W|Fx-%#E|X<5D$1ME$nLhmTn+zeUzPsq;Nq zVOc~%QwvJ!nTAVq<;e{K_ODJZ4ek1lF8ckgdSrc?Ei0$oH|xZ4>Q@w!?H4o}$r>7;Ex zS%2clqc8&jm*ikw0nj;#x3LD{VyYCBBcZyd^S+9W3sH%BWhS$a(e5QUXLII3hA?kN zu?sV=TShxoA-tHB6?Vm5l59`fF&`6&GDxzsE4Oh#wWp(aFnWvv@{p116*s}L{I80* zO9$Sp{Tq(-LJN<{a^{|AYJABk?kTkW@bpQlL{%W@yzEDQeaYhPPqrs{3>(#tPp;b~ zHo*& z$?nu2pr0Q+l>;)j#=I3Cl^;+H``h${=_K6Z7k!weSLT^3zM|WE;t_!sPYQc1LkTr| z-4j3wp1N~|EUc>Lg;+bM#IXS4I`&VWRN^!)}JK*z~U)d zL@1R#W$IFsLsyG6T6A4}->=(@zO=C`SRB-q;UBQ%Fh5O#yIBzR5|4DIrEF>{)J{mLpHzZGr3t9(%_OLjf~ z9VLR6Xg2FDtorU#zaFkRt%fMEmHkc>Gju?$*>bSq=}1GeqAoGr;Au=qZ?{c0Nv_Ap zXSbZnna#M(?-%ix~Usiv+7Sv_3)M4xJ z6--rmX~P<_&rmqn4GbR3@bhQKzi7d@B=Gz=Wg+4z3!Id^sqapTd>)4T>9$_G*?)Yo z)eQ)G0N&Y9j*l&b4=FV@?qzT3GFFx-&LNwIoN^U!t($N6{&RAOCvH|IOO9+lO@nR_ zxpACj^XS=B@+O`l$XdfRPfuZ)pX@#q5@zF!e1l35)>98**^Ar7IQ|d z-Zj?A2?CaD(Rw!pUq_@0)ELV&+9aNGQPLSrG+%^pXrNy6-N-OY&O(0^WGpT&0p%Fe z$?~r}W6o*ryF$=X4~39IY-UJ7gS?^Q$vGnW^^89E^rZHfuI~H!lkx9SScjlJT4sLx`7-f?bats*SU#jdRC#9q z$%$NieEfu~l<}u2%2xdzqnQS5&`6vJYE)c}DrOK8) z)rLd+!;??;b=8Kw4lsOVWMl-j1f#5H3~}!wC}Ec;7b?l*UsYa!gdw!TxFxt&s378z zGE|@r&vx-<=E8zuvCuKo`cdPYK`#e0GvfRA?_D$E7^hJTZaIPD&89#U4|DziL1WL# zjfpD;G9aJok66cYV`e0|NTCoUu$CAhHJZjrp;DC@jSZ!XN4)&UKTQ(>)WN#avsPQY z?o&WU8t4LfK}`By*Jj6{t~emJ6MoIEV|C%MMLz+(vKEA9x~2Ch^!iEsMy z({3~y!ITYD#Y4fj;?mM_eSPX}wXaR8OquK6jXZ5adnq*r+$^+_iLj)G&}sUmTrNm< zrkN6znOy6^4K!41xaAz4X;6@;11Kq~MjTq@-@|OMeAqwBwVp(+pJ>#4x*hl~WgcUq)ux=816Dm?K<2mlPGdaM#ikvKzIE zMPC<52SR$oKyJ%e!bb8H!(up5qAP?PPPY>2(G>512wLnZ{BvKEN*rjKj>Pa?dGp|M zKvp)kwMP9WW+KGj2x^NHl?Y+8$pb9rwzejf91zV3&)kp9Z*TPn3sVwr_yS)FQ$Ja> zFkA?d!Lgxnd-!lB67?_xZc7p-HRkvY4oryZH&B$6o?r=qmlGK4hRmC?Js{p-Fy7ak4^L8ml}lTYw#{mnptTosLZi>;ceZqMaf?_sY*t}-PA zh7{>HS=d?onh>8ROOaTI?29=uXO5uTU?fCOAc}?Vha)BY=5cqd&DAC7IiEqir$_=F z&8PI-58|5j?&LmP3|M zm=NDu^J*eaS+99U2x90a?EoDM6H`&-65U@4d*X@0lUOo1$X6IKxxN#3ko;^onPa+9 zj7>PN=s@yEd*P03lg?Og=)tp}?#&tl)}7Bq0{}J8Gsn;3!SSnE1|nV3&!Go@*5ip2ilmD;jUTB9k`-~=n^+ptiN|V5Q|@k+8_sqH z*R9Xsd6PkHe9fWD<|vDbY6mTH=S+bmoc5@Dht<1Hz0Ridh6Y8ob$bI=?8w%C`0mCr zy445S6N#T>z&uAkRwfjftH>0mt;s0>?lC4c;oS;8ta<$Tw-I<-EOL`niUpdfcbD2u zDrrF5cBpY&MW{mv9&9XMPgHaO>#-RJFSJ!CF+qOkQy<#?{joy17lpH_Dk&vJvdXGa zAmWE4SS#Pdy#QiC1pHMnnM$V{Di5pAa+SszZq&c{+bqQOAGDgi3rOxx*v;LHKl>FN z5&|-R`0!!E^1g@7>~tRO>uq%F@xt-eoLkq)iatd&FyM1e-HIk=W~&~+pYZCq6+O$b zX!mEjT&q)w<~KR%Q%zbLmBpO57iyP0xCt0V;H|<2rqK|f=KU?nXE zD0N3D)BJkQ`U;$Ab49+n&3yazAi%VO@>Hur=IYOR{ocub83alUxadN_} zCDvNMhM`$?!ptV>KaG9)@><0Cv?@}lu8RoWLJ1x(Egr6IUAU=_L-O*o5g?V(1w)=5 zskv9rbqyA|&j)r7*)3iT?=b|B4X>uC(f}t5SQYcOKCInhN~5SR0aZN=zNeE{JNts? zPXmOzaTm?6_t3eu1F#yu@xLPwS7meh??IPh5zABn+zI*SXaRfp9#v`jarQZKYW7IX ziJ7BN?I8Rrfz^99)`k5PyhlK2jQ^Z^w=MGbj2KeCGm26mrT|!@gWm`O79x)q=cNpV z3l)g3)~x7EmOhTku51wsK!AFrKcDt6pF&s)PPiGp9s6R+Upr7WGL57C07k8P#?Pw= z_3gO{Mp5{J+l~<%@yQn5&u$GN(fs6nXm9Jb{cl2hC#xx|;6(BLjZj`bKCBWBfdFzw z$#}2(fR{(()^RR9S9jQyLMW28h?^~;tUlIp92^Bh7LppxmT}njb=hlQDd9J^=@17> zQn`lJy{j}oXKDuOyt;1_p86&OYHFJPrmZOD_ayMNwCk(I3G90Mc#-foH*D83CWq>s zkh|vx<4#xL<;9To=HY*E!td8M?OhFZ1j(t~UNRjR_-$?te=oj{PVE@SD1Vu-T>XlR zl2*PlciuC4H?19sjm)aQmrJWUs8WL;L9!!G ze?(Kl#i^G&L}}QR;E#xjPf}*=w4ZKBP*8M*f`|P52;59Y6->TRH0HK)7^AthAL(?R zUE#l;8I^tC;=Z+azyW(sB=Jo<|7$ySHc3WN>n!{Z8rL`~Fz!o^`YVXw{0C#fej_a_ixy7-0y4gDQAZ;{ zq$%UOttkdnWh)UdNPn4sxSsF3LeD9Z2h6s3<@p=B0rAc3~${#t{1_H>_tKFg}nAawqEHKpaPgY|FgailUKpfem;_ zhdE%aZ|_m*O4i2&QkqbZG);JFVeyuVws>xe?aPQxND23U>#*pdqKz`+WiE4p~@ z5!@ArJ`q^X{7@q7PxY&{ADr7lke;peBl;aC^Hv*Vo@)}h>VQ<5gAek)YpC4fVv zG*iyD-nXjavwH_A(}Tnky3uD0%bOMVpngG#@TyQ zwGM^9`3-ALEGoPm>Aq+jmb4RJ=yQJY?;yDFYL)ySF>qcf`A1e5pi7C3TJABoi+n5k zPDswS`Cf?Nr2!bL_2H#BwYZt6!^F`t9`c4m)jN>A@o(^DA+{TcxI-tB4YXaJB`dH~ zDbf*|ZiYGnTu;xV-*%x;2-mZZdGb&R&g_&S^ZQLb#;-;YAg4i4GAdGxSC6{rA|&=-1e;3u`DYHy<3=u_C7X^kCuO%1`bXoveD& z_vvV^5hdrhqB$PUk-ob!lE4gTHo5K@3TNy(S)@C0lTZUHr2lW8vFBu-?sPXJ%}GAp sNi)OG*)+q~kw3%HiS<^L!1)z$8ZGgQl!2s{K<@$F2QbZA4g2W-0TlSa3jhEB From 64336f6f78f22e5eb9416cba7253479f1dac79a2 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 18 Feb 2018 15:55:52 -0800 Subject: [PATCH 095/493] Sigils should only stack to 1 --- src/main/java/WayofTime/bloodmagic/item/ItemSigil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/item/ItemSigil.java index 417c92e2..605c4bdc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSigil.java @@ -17,6 +17,8 @@ public class ItemSigil extends Item implements IBindable, ISigil { super(); this.lpUsed = lpUsed; + + setMaxStackSize(1); } public boolean isUnusable(ItemStack stack) { From 37c8012741f894dcb8f2dbd9998a440df31050f0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 18 Feb 2018 15:56:03 -0800 Subject: [PATCH 096/493] Ignore blank inscription tools --- .../java/WayofTime/bloodmagic/item/ItemInscriptionTool.java | 3 +++ .../assets/bloodmagic/blockstates/inscription_tool.json | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index a87bff6c..b3a62bf6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -42,6 +42,9 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen return; for (EnumRuneType runeType : types) { + if (runeType == EnumRuneType.BLANK) + continue; + ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); NBTTagCompound tag = new NBTTagCompound(); tag.setInteger(Constants.NBT.USES, 10); diff --git a/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json b/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json index 941bdac9..2a14cf73 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json +++ b/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json @@ -6,6 +6,7 @@ }, "variants": { "type": { + "blank": { }, "water": { "textures": { "layer0": "bloodmagic:items/WaterScribeTool" From 7a288a729213cb0e571cbc0db2be6f5d9c6bfdb8 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 18 Feb 2018 16:05:11 -0800 Subject: [PATCH 097/493] Update changelog + version --- changelog.txt | 10 ++++++++++ gradle.properties | 2 +- .../bloodmagic/client/hud/HUDElementCornerTile.java | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/changelog.txt b/changelog.txt index bb775ab4..2f556fa9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +------------------------------------------------------ +Version 2.2.6 +------------------------------------------------------ + +- Fixed a weird thing where slates were weird +- Added HUD elements for Tranquility and Inversion +- Fixed Sigils stacking 64 times higher than they should have + +As a side note, I've been listening to http://loli.dance/ for the last like 2 hours now. + ------------------------------------------------------ Version 2.2.5 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 5157ee7e..a94bfbd0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.5 +mod_version=2.2.6 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java index 3ac6264c..3f7062a1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.client.Sprite; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; -import WayofTime.bloodmagic.tile.TileAltar; import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -86,7 +85,7 @@ public abstract class HUDElementCornerTile extends HUDElem if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) return false; - TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); + TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(trace.getBlockPos()); if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) flag = false; From 0beef19ba1dd1998227742a15745a1be2beea1ca Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 19 Feb 2018 14:04:32 -0800 Subject: [PATCH 098/493] Seer Sigil should display tranquility data (#1234) --- .../client/hud/HUDElementCornerTile.java | 6 +-- .../provider/DataProviderBloodAltar.java | 5 +- .../core/RegistrarBloodMagicItems.java | 4 +- .../item/sigil/ItemSigilDivination.java | 24 ++------- .../bloodmagic/item/sigil/ItemSigilSeer.java | 51 ------------------- 5 files changed, 12 insertions(+), 78 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java index 3f7062a1..fac02451 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.client.Sprite; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -71,12 +71,12 @@ public abstract class HUDElementCornerTile extends HUDElem flag = true; } } else { - if (sigilStack.getItem() instanceof ItemSigilSeer) + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; if (!flag) { sigilStack = player.getHeldItem(EnumHand.OFF_HAND); - if (sigilStack.getItem() instanceof ItemSigilSeer) + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index a4ac2b7b..1614bee5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -102,10 +101,10 @@ public class DataProviderBloodAltar implements IWailaDataProvider { } private static boolean holdingSeerSigil(EntityPlayer player) { - if (player.getHeldItemMainhand().getItem() instanceof ItemSigilSeer) + if (player.getHeldItemMainhand().getItem() == RegistrarBloodMagicItems.SIGIL_SEER) return true; - if (player.getHeldItemOffhand().getItem() instanceof ItemSigilSeer) + if (player.getHeldItemOffhand().getItem() == RegistrarBloodMagicItems.SIGIL_SEER) return true; return false; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 5a8c6180..0d7544ad 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -144,7 +144,7 @@ public class RegistrarBloodMagicItems { new ItemBoundPickaxe().setRegistryName("bound_pickaxe"), new ItemBoundAxe().setRegistryName("bound_axe"), new ItemBoundShovel().setRegistryName("bound_shovel"), - new ItemSigilDivination().setRegistryName("sigil_divination"), + new ItemSigilDivination(true).setRegistryName("sigil_divination"), new ItemSigilAir().setRegistryName("sigil_air"), new ItemSigilWater().setRegistryName("sigil_water"), new ItemSigilLava().setRegistryName("sigil_lava"), @@ -156,7 +156,7 @@ public class RegistrarBloodMagicItems { new ItemSigilSuppression().setRegistryName("sigil_suppression"), new ItemSigilHaste().setRegistryName("sigil_haste"), new ItemSigilFastMiner().setRegistryName("sigil_fast_miner"), - new ItemSigilSeer().setRegistryName("sigil_seer"), + new ItemSigilDivination(false).setRegistryName("sigil_seer"), new ItemSigilPhantomBridge().setRegistryName("sigil_phantom_bridge"), new ItemSigilWhirlwind().setRegistryName("sigil_whirlwind"), new ItemSigilCompression().setRegistryName("sigil_compression"), diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index d25aad56..0447c242 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -19,39 +19,25 @@ import java.util.ArrayList; import java.util.List; public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { - public ItemSigilDivination() { - super("divination"); + + public ItemSigilDivination(boolean simple) { + super(simple ? "divination" : "seer"); } @Override public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { -// if (world instanceof WorldServer) -// { -// System.out.println("Testing..."); -//// BuildTestStructure s = new BuildTestStructure(); -//// s.placeStructureAtPosition(new Random(), Rotation.CLOCKWISE_180, (WorldServer) world, player.getPosition(), 0); -// DungeonTester.testDungeonElementWithOutput((WorldServer) world, player.getPosition()); -// } - -// if (!world.isRemote) -// { -// EntityCorruptedSheep fred = new EntityCorruptedSheep(world, EnumDemonWillType.DESTRUCTIVE); -// fred.setPosition(player.posX, player.posY, player.posZ); -// world.spawnEntityInWorld(fred); -// } ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) return ActionResult.newResult(EnumActionResult.FAIL, stack); if (!world.isRemote) { super.onItemRightClick(world, player, hand); - RayTraceResult position = rayTrace(world, player, false); + RayTraceResult rayTrace = rayTrace(world, player, false); - if (position == null) { + if (rayTrace == null) { int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); List toSend = new ArrayList(); if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java deleted file mode 100644 index 0408c20b..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ /dev/null @@ -1,51 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.iface.IAltarReader; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.util.ChatUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class ItemSigilSeer extends ItemSigilBase implements IAltarReader { - public ItemSigilSeer() { - super("seer"); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); - - if (!world.isRemote) { - super.onItemRightClick(world, player, hand); - RayTraceResult rayTrace = rayTrace(world, player, false); - - if (rayTrace == null) { - int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - - List toSend = new ArrayList(); - if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) - toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", getOwnerName(stack))); - toSend.add(new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); - ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } - } - - return super.onItemRightClick(world, player, hand); - } -} From 77bdbed8b5646dd361fd44541bbef47a0f982732 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 19 Feb 2018 14:06:05 -0800 Subject: [PATCH 099/493] Nullcheck tile in Lava/Water/Void sigils (#1236) --- .../java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java | 2 +- .../java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java | 2 +- .../java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index e3570dfa..3a70741c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -80,7 +80,7 @@ public class ItemSigilLava extends ItemSigilBase { } TileEntity tile = world.getTileEntity(blockPos); - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { + if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); int amount = handler.fill(fluid, false); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 2d4e3c1f..a4b54fda 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -86,7 +86,7 @@ public class ItemSigilVoid extends ItemSigilBase { } TileEntity tile = world.getTileEntity(blockPos); - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { + if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); FluidStack amount = handler.drain(1000, false); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 42cbde55..fd73d938 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -73,7 +73,7 @@ public class ItemSigilWater extends ItemSigilBase { return EnumActionResult.FAIL; TileEntity tile = world.getTileEntity(blockPos); - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { + if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000); int amount = handler.fill(fluid, false); From 562e62725cf58e1f44836b905df89940fbc73378 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 19 Feb 2018 14:07:44 -0800 Subject: [PATCH 100/493] Add Sulfur and Saltpeter to OreDict (#1235) --- src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 7b23cda6..072a068f 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -63,6 +63,8 @@ public class ModRecipes { OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); + OreDictionary.registerOre("dustSulfur", ComponentTypes.SULFUR.getStack()); + OreDictionary.registerOre("dustSaltpeter", ComponentTypes.SALTPETER.getStack()); } public static void addFurnaceRecipes() { From 106532061d1e194a266414db8f05c7a79421c151 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 19 Feb 2018 15:41:18 -0800 Subject: [PATCH 101/493] Alchemy Table now supports new recipe API --- .../compat/jei/BloodMagicJEIPlugin.java | 12 ++- .../AlchemyTableRecipeCategory.java | 11 +-- .../AlchemyTableRecipeHandler.java | 31 ------ .../alchemyTable/AlchemyTableRecipeJEI.java | 42 +++++--- .../alchemyTable/AlchemyTableRecipeMaker.java | 21 ---- .../core/RegistrarBloodMagicRecipes.java | 22 ++--- .../registry/AlchemyTableRecipeRegistry.java | 2 +- .../item/alchemy/ItemCuttingFluid.java | 72 ++++---------- .../ItemLivingArmourPointsUpgrade.java | 99 ++++++------------- .../AlchemyTableCustomRecipe.java | 2 +- .../AlchemyTableDyeableRecipe.java | 1 - .../AlchemyTablePotionRecipe.java | 1 - .../AlchemyTableRecipe.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 73 -------------- .../bloodmagic/registry/ModRituals.java | 4 +- .../bloodmagic/ritual/RitualCrushing.java | 2 +- .../bloodmagic/tile/TileAlchemyTable.java | 66 +++++++++---- .../bloodmagic/tile/base/TileBase.java | 3 +- .../bloodmagic/blockstates/cutting_fluid.json | 2 +- .../blockstates/points_upgrade.json | 2 +- .../assets/bloodmagic/lang/en_US.lang | 6 +- 21 files changed, 167 insertions(+), 309 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java rename src/main/java/WayofTime/bloodmagic/recipe/{ => alchemyTable}/AlchemyTableCustomRecipe.java (96%) rename src/main/java/WayofTime/bloodmagic/recipe/{ => alchemyTable}/AlchemyTableRecipe.java (99%) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index de5265ee..cf027782 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -2,8 +2,12 @@ package WayofTime.bloodmagic.compat.jei; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; @@ -11,8 +15,6 @@ import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeHandler; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeMaker; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeCategory; @@ -42,20 +44,22 @@ public class BloodMagicJEIPlugin implements IModPlugin { registry.addRecipeHandlers( new BindingRecipeHandler(), - new AlchemyTableRecipeHandler(), new ArmourDowngradeRecipeHandler() ); registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(), Constants.Compat.JEI_CATEGORY_ALTAR); registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(), Constants.Compat.JEI_CATEGORY_SOULFORGE); registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArrayRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.addRecipes(AlchemyTableRecipeRegistry.getRecipeList(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); registry.handleRecipes(RecipeTartaricForge.class, TartaricForgeRecipeJEI::new, Constants.Compat.JEI_CATEGORY_SOULFORGE); registry.handleRecipes(RecipeAlchemyArray.class, AlchemyArrayCraftingRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); + registry.handleRecipes(RecipeAlchemyTable.class, AlchemyTableRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.handleRecipes(AlchemyTableRecipe.class, AlchemyTableRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); registry.addRecipes(BindingRecipeMaker.getRecipes()); - registry.addRecipes(AlchemyTableRecipeMaker.getRecipes()); registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes()); registry.addIngredientInfo(new ItemStack(RegistrarBloodMagicItems.ALTAR_MAKER), ItemStack.class, "jei.bloodmagic.desc.altarBuilder"); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index e6ded288..c15e1db3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -10,13 +10,14 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; -public class AlchemyTableRecipeCategory extends BlankRecipeCategory { +public class AlchemyTableRecipeCategory implements IRecipeCategory { + private static final int OUTPUT_SLOT = 0; private static final int ORB_SLOT = 1; private static final int INPUT_SLOT = 2; @@ -24,8 +25,6 @@ public class AlchemyTableRecipeCategory extends BlankRecipeCategory { - @Nonnull - @Override - public Class getRecipeClass() { - return AlchemyTableRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull AlchemyTableRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AlchemyTableRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AlchemyTableRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index 3a88276f..715fb008 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -1,42 +1,60 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; import java.util.ArrayList; import java.util.List; -public class AlchemyTableRecipeJEI extends BlankRecipeWrapper { - private AlchemyTableRecipe recipe; +public class AlchemyTableRecipeJEI implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + private final int tier; + private final int syphon; + private final int ticks; public AlchemyTableRecipeJEI(AlchemyTableRecipe recipe) { - this.recipe = recipe; + this.input = recipe.getInput(); + this.output = recipe.getRecipeOutput(Lists.newArrayList()); + this.tier = recipe.getTierRequired(); + this.syphon = recipe.getLpDrained(); + this.ticks = recipe.getTicksRequired(); + } + + public AlchemyTableRecipeJEI(RecipeAlchemyTable recipe) { + this.input = recipe.getInput(); + this.output = recipe.getOutput(); + this.tier = recipe.getMinimumTier(); + this.syphon = recipe.getSyphon(); + this.ticks = recipe.getTicks(); } @Override public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); + List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(input); ingredients.setInputLists(ItemStack.class, expanded); - ingredients.setOutput(ItemStack.class, recipe.getRecipeOutput(Lists.newArrayList())); + ingredients.setOutput(ItemStack.class, output); } @Override public List getTooltipStrings(int mouseX, int mouseY) { ArrayList ret = new ArrayList(); if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34) { - ret.add(TextHelper.localize("tooltip.bloodmagic.tier", recipe.getTierRequired())); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", recipe.getLpDrained())); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.ticksRequired", recipe.getTicksRequired())); + ret.add(TextHelper.localize("tooltip.bloodmagic.tier", tier)); + ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", syphon)); + ret.add(TextHelper.localize("jei.bloodmagic.recipe.ticksRequired", ticks)); } return ret; } - public AlchemyTableRecipe getRecipe() { - return recipe; + public int getTier() { + return tier; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java deleted file mode 100644 index 5ef8c619..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyTable; - -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class AlchemyTableRecipeMaker { - @Nonnull - public static List getRecipes() { - List recipeList = AlchemyTableRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList(); - - for (AlchemyTableRecipe recipe : recipeList) - recipes.add(new AlchemyTableRecipeJEI(recipe)); - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index ed3fcbac..298b7480 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -94,7 +94,7 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); registrar.addAlchemyTable(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); registrar.addAlchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); - registrar.addAlchemyTable(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 500, 200, 1, "gunpowder", "gunpowder", "dustCoal"); + registrar.addAlchemyTable(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 500, 200, 1, "gunpowder", "gunpowder", "dustCoal"); registrar.addAlchemyTable(new ItemStack(Items.BREAD), 100, 200, 1, Items.WHEAT, Items.SUGAR); registrar.addAlchemyTable(new ItemStack(Blocks.GRASS), 200, 200, 1, Blocks.DIRT, new ItemStack(Items.DYE, 1, 15), Items.WHEAT_SEEDS); registrar.addAlchemyTable(new ItemStack(Items.CLAY_BALL, 4), 50, 100, 2, Items.WATER_BUCKET, "sand"); @@ -102,21 +102,21 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); registrar.addAlchemyTable(ComponentTypes.SULFUR.getStack(8), 0, 100, 0, Items.LAVA_BUCKET); registrar.addAlchemyTable(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); - registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ComponentTypes.SALTPETER.getStack(), ComponentTypes.SULFUR.getStack(), new ItemStack(Items.COAL, 1, 1)); + registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, "dustSaltpeter", "dustSulfur", new ItemStack(Items.COAL, 1, 1)); registrar.addAlchemyTable(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT); - registrar.addAlchemyTable(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); - registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); - registrar.addAlchemyTable(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE)); - registrar.addAlchemyTable(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE)); + registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); + registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.FluidType.BASIC.getStack()); + registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.FluidType.BASIC.getStack()); + registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.FluidType.BASIC.getStack()); + registrar.addAlchemyTable(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.FluidType.EXPLOSIVE.getStack()); + registrar.addAlchemyTable(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.FluidType.EXPLOSIVE.getStack()); registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); registrar.addAlchemyTable(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); registrar.addAlchemyTable(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); - registrar.addAlchemyTable(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); + registrar.addAlchemyTable(ItemLivingArmourPointsUpgrade.UpgradeType.DRAFT_ANGELUS.getStack(), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone"); registrar.addAlchemyTable(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); registrar.addAlchemyTable(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); @@ -132,7 +132,7 @@ public class RegistrarBloodMagicRecipes { if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) { ItemStack dustStack = dustList.get(0).copy(); dustStack.setCount(2); - registrar.addAlchemyTable(dustStack, 400, 200, 1, ore, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addAlchemyTable(dustStack, 400, 200, 1, ore, ItemCuttingFluid.FluidType.BASIC.getStack()); addedOreRecipeList.add(ore); } } @@ -170,7 +170,7 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(ComponentTypes.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); registrar.addTartaricForge(ComponentTypes.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); registrar.addTartaricForge(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentTypes.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC)); + registrar.addTartaricForge(ComponentTypes.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addTartaricForge(ComponentTypes.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); registrar.addTartaricForge(ComponentTypes.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java index e09a6ce6..901994a7 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index 490cd425..c53c6da0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -1,40 +1,28 @@ package WayofTime.bloodmagic.item.alchemy; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.item.ItemEnum; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; +import java.util.Locale; -public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomAlchemyConsumable { - public static final String BASIC = "basicCuttingFluid"; - public static final String EXPLOSIVE = "explosive"; - private static ArrayList names = new ArrayList(); +public class ItemCuttingFluid extends ItemEnum.Variant implements ICustomAlchemyConsumable { public ItemCuttingFluid() { - super(); + super(FluidType.class, "cutting_fluid"); - setUnlocalizedName(BloodMagic.MODID + ".cuttingFluid."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); - - buildItemList(); } @Override @@ -46,34 +34,6 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA tooltip.add(TextHelper.localize("tooltip.bloodmagic.cuttingFluidRatio", max - getDamageOfFluid(stack), max)); } - private void buildItemList() { - names.add(0, BASIC); - names.add(1, EXPLOSIVE); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names.get(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (String name : names) - ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); - return ret; - } - public int getDamageOfFluid(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -119,11 +79,21 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA return stack; } - public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.CUTTING_FLUID, 1, names.indexOf(name)); - } + public enum FluidType implements ISubItem { + BASIC, + EXPLOSIVE, + ; - public static ArrayList getNames() { - return names; + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.CUTTING_FLUID, count, ordinal()); + } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java index 30e35efd..9be66674 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java @@ -1,65 +1,58 @@ package WayofTime.bloodmagic.item.alchemy; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.ItemEnum; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Iterables; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; +import java.util.Locale; -public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvider { - public static final String DRAFT_ANGELUS = "draftAngelus"; - private static ArrayList names = new ArrayList(); +public class ItemLivingArmourPointsUpgrade extends ItemEnum.Variant { public ItemLivingArmourPointsUpgrade() { - super(); - - setUnlocalizedName(BloodMagic.MODID + ".livingPointUpgrade."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - - buildItemList(); + super(UpgradeType.class, "living_point_upgrade"); } @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmourPointsUpgrade.desc", 200)))); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) { - EntityPlayer player = entityLiving instanceof EntityPlayer ? (EntityPlayer) entityLiving : null; + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { + playerIn.setActiveHand(hand); + return new ActionResult<>(EnumActionResult.SUCCESS, playerIn.getHeldItem(hand)); + } - if (player == null || !player.capabilities.isCreativeMode) { + @Override + public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) { + if (!(entityLiving instanceof EntityPlayer)) + return super.onItemUseFinish(stack, worldIn, entityLiving); + + EntityPlayer player = (EntityPlayer) entityLiving; + + if (!player.capabilities.isCreativeMode) stack.shrink(1); - } if (!worldIn.isRemote) { player.addPotionEffect(new PotionEffect(MobEffects.WITHER, 300, 5)); @@ -92,51 +85,21 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi return EnumAction.DRINK; } - @Override - public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { - playerIn.setActiveHand(hand); - return new ActionResult(EnumActionResult.SUCCESS, playerIn.getHeldItem(hand)); - } + public enum UpgradeType implements ISubItem { - private void buildItemList() { - names.add(0, DRAFT_ANGELUS); - } + DRAFT_ANGELUS, + ; - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names.get(stack.getItemDamage()); - } + @Nonnull + @Override + public String getInternalName() { + return name().toLowerCase(Locale.ROOT); + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public List> getVariants() { - List> ret = new ArrayList>(); - for (String name : names) - ret.add(new ImmutablePair(names.indexOf(name), "type=" + name)); - return ret; - } - - public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.POINTS_UPGRADE, 1, names.indexOf(name)); - } - - public static ItemStack getStack(String key, int stackSize) { - ItemStack stack = getStack(key); - stack.setCount(stackSize); - - return stack; - } - - public static ArrayList getNames() { - return names; + @Nonnull + @Override + public ItemStack getStack(int count) { + return new ItemStack(RegistrarBloodMagicItems.POINTS_UPGRADE, count, ordinal()); + } } } diff --git a/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java index 9af2e9d4..9e13b9aa 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.recipe; +package WayofTime.bloodmagic.recipe.alchemyTable; import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 910be33d..50e83c2b 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.recipe.alchemyTable; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index 33e89171..4a627ede 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java index ecea0ca4..8fbd717d 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.recipe; +package WayofTime.bloodmagic.recipe.alchemyTable; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 072a068f..62318a39 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -5,7 +5,6 @@ import WayofTime.bloodmagic.alchemyArray.*; import WayofTime.bloodmagic.compress.CompressionRegistry; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.recipe.AlchemyTableCustomRecipe; import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; @@ -15,8 +14,6 @@ import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.potion.BMPotionUtils; @@ -44,7 +41,6 @@ import java.util.Map.Entry; public class ModRecipes { - public static ArrayList addedOreRecipeList = new ArrayList(); static ItemStack mundaneLengtheningStack = ComponentTypes.CATALYST_LENGTH_1.getStack(); static ItemStack mundanePowerStack = ComponentTypes.CATALYST_POWER_1.getStack(); @@ -54,7 +50,6 @@ public class ModRecipes { addAltarRecipes(); addAlchemyArrayRecipes(); addAlchemyTableRecipes(); - addOreDoublingAlchemyRecipes(); addPotionRecipes(); addLivingArmourDowngradeRecipes(); } @@ -111,72 +106,7 @@ public class ModRecipes { } public static void addAlchemyTableRecipes() { - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); - - AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 500, 200, 1, "gunpowder", "gunpowder", "dustCoal"); - - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.BREAD), 100, 200, 1, Items.WHEAT, Items.SUGAR); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.GRASS), 200, 200, 1, Blocks.DIRT, new ItemStack(Items.DYE, 1, 15), Items.WHEAT_SEEDS); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.CLAY_BALL, 4), 50, 100, 2, Items.WATER_BUCKET, "sand"); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); - - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.SULFUR.getStack(8), 0, 100, 0, Items.LAVA_BUCKET); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ComponentTypes.SALTPETER.getStack(), ComponentTypes.SULFUR.getStack(), new ItemStack(Items.COAL, 1, 1)); - - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); - - AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); - - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - - addedOreRecipeList.add("oreIron"); - addedOreRecipeList.add("oreGold"); - addedOreRecipeList.add("oreCoal"); - addedOreRecipeList.add("oreRedstone"); - - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); - - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); - - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); - - AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); - - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone"); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); - AlchemyTableRecipeRegistry.registerRecipe(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); - } - - public static void addOreDoublingAlchemyRecipes() { - String[] oreList = OreDictionary.getOreNames().clone(); - for (String ore : oreList) { - if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) { - String dustName = ore.replaceFirst("ore", "dust"); - - List discoveredOres = OreDictionary.getOres(ore); - List dustList = OreDictionary.getOres(dustName); - if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) { - ItemStack dustStack = dustList.get(0).copy(); - dustStack.setCount(2); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(dustStack, 400, 200, 1, ore, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - addedOreRecipeList.add(ore); - } - } - } } public static void addPotionRecipes() { @@ -200,9 +130,6 @@ public class ModRecipes { addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new PotionEffect(RegistrarBloodMagic.CLING, 2 * 60 * 20)); addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(RegistrarBloodMagic.DEAFNESS, 450)); - -// AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(5000, 100, 4, new ItemStack(Blocks.SLIME_BLOCK), new PotionEffect(ModPotions.bounce, 15 * 60 * 20))); -// AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(5000, 100, 4, new ItemStack("string"), new PotionEffect(ModPotions.bounce, 15 * 60 * 20))); } public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, PotionEffect baseEffect) { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 8f9beacc..46e18f52 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -118,8 +118,8 @@ public class ModRituals { downgradeRitual = new RitualLivingArmourDowngrade(); RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.rituals.ritualDowngrade); - RitualCrushing.registerCuttingFluid(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 250, 0.5); - RitualCrushing.registerCuttingFluid(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 25, 0.05); + RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5); + RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05); } public static void initImperfectRituals() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index 8a801aa6..3909f072 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.compress.CompressionRegistry; -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 212edac9..5693df57 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.util.helper.NetworkHelper; @@ -193,14 +195,13 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, int tier = getTierOfOrb(); + // special recipes like dying AlchemyTableRecipe recipe = AlchemyTableRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); if (recipe != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipe.getTierRequired() && this.getContainedLp() >= recipe.getLpDrained()))) { - if (burnTime == 1) { - IBlockState state = getWorld().getBlockState(pos); - getWorld().notifyBlockUpdate(getPos(), state, state, 3); - } + if (burnTime == 1) + notifyUpdate(); - if (canCraft(inputList, recipe)) { + if (canCraft(recipe.getRecipeOutput(inputList))) { ticksRequired = recipe.getTicksRequired(); burnTime++; @@ -228,8 +229,42 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } else { burnTime = 0; } - } else { - burnTime = 0; + } else { // Simple recipes + RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(inputList); + if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) { + if (burnTime == 1) + notifyUpdate(); + + if (canCraft(recipeAlchemyTable.getOutput())) { + ticksRequired = recipeAlchemyTable.getTicks(); + burnTime++; + if (burnTime >= ticksRequired) { + if (!getWorld().isRemote) { + if (recipeAlchemyTable.getSyphon() > 0 && !getWorld().isRemote) + consumeLp(recipeAlchemyTable.getSyphon()); + + ItemStack outputSlotStack = getStackInSlot(outputSlot); + if (outputSlotStack.isEmpty()) + setInventorySlotContents(outputSlot, recipeAlchemyTable.getOutput().copy()); + else + outputSlotStack.grow(recipeAlchemyTable.getOutput().getCount()); + + for (int i = 0; i < 6; i++) { + ItemStack currentStack = getStackInSlot(i); + if (currentStack.getItem().hasContainerItem(currentStack)) + setInventorySlotContents(i, currentStack.getItem().getContainerItem(currentStack)); + else + currentStack.shrink(1); + } + + burnTime = 0; + notifyUpdate(); + } + } + } + } else { + burnTime = 0; + } } } @@ -237,20 +272,15 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return ((double) burnTime) / ticksRequired; } - private boolean canCraft(List inputList, AlchemyTableRecipe recipe) { - if (recipe == null) { - return false; - } - - ItemStack outputStack = recipe.getRecipeOutput(inputList); + private boolean canCraft(ItemStack output) { ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (outputStack.isEmpty()) + if (output.isEmpty()) return false; if (currentOutputStack.isEmpty()) return true; - if (!ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) + if (!ItemHandlerHelper.canItemStacksStack(output, currentOutputStack)) return false; - int result = currentOutputStack.getCount() + outputStack.getCount(); + int result = currentOutputStack.getCount() + output.getCount(); return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); } @@ -292,7 +322,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } public void craftItem(List inputList, AlchemyTableRecipe recipe) { - if (this.canCraft(inputList, recipe)) { + if (this.canCraft(recipe.getRecipeOutput(inputList))) { ItemStack outputStack = recipe.getRecipeOutput(inputList); ItemStack currentOutputStack = getStackInSlot(outputSlot); diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java index 56498ae8..e39ba05f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java @@ -76,7 +76,8 @@ public class TileBase extends TileEntity { } public void notifyUpdate() { - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); + IBlockState state = getWorld().getBlockState(getPos()); + getWorld().notifyBlockUpdate(getPos(), state, state, 3); } // Data syncing diff --git a/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json b/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json index fbd1ac61..0d733140 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json +++ b/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json @@ -6,7 +6,7 @@ }, "variants": { "type": { - "basiccuttingfluid": { + "basic": { "textures": { "layer0": "bloodmagic:items/BasicCuttingFluid" } diff --git a/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json b/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json index 67ac1582..61e07141 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json +++ b/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json @@ -6,7 +6,7 @@ }, "variants": { "type": { - "draftangelus": { + "draft_angelus": { "textures": { "layer0": "bloodmagic:items/Coagulant" } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index d08c16c4..00a7151a 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -101,8 +101,8 @@ item.bloodmagic.baseComponent.antiseptic.name=Antiseptic item.bloodmagic.baseComponent.catalyst_length_1.name=Simple Lengthening Catalyst item.bloodmagic.baseComponent.catalyst_power_1.name=Simple Power Catalyst -item.bloodmagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid -item.bloodmagic.cuttingFluid.explosive.name=Explosive Powder +item.bloodmagic.cutting_fluid.basic.name=Basic Cutting Fluid +item.bloodmagic.cutting_fluid.explosive.name=Explosive Powder item.bloodmagic.demonCrystal.default.name=Demon Will Crystal item.bloodmagic.demonCrystal.corrosive.name=Corrosive Will Crystal @@ -185,7 +185,7 @@ item.bloodmagic.fluidFilter.exact.name=Fluid Filter item.bloodmagic.experienceTome.name=Tome of Peritia item.bloodmagic.sanguineBook.name=Inspectoris Scandalum -item.bloodmagic.livingPointUpgrade.draftAngelus.name=Draft of Angelus +item.bloodmagic.living_point_upgrade.draft_angelus.name=Draft of Angelus item.bloodmagic.willGauge.name=Demon Will Aura Gauge item.bloodmagic.potionFlask.name=Potion Flask From cf9e6e207fe01fa9166f3e4324d5d990744ca32e Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 21 Feb 2018 18:03:36 -0800 Subject: [PATCH 102/493] Add Discord badge to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61f510ae..c945030e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Blood Magic: Alchemical Wizardry [![](http://cf.way2muchnoise.eu/full_blood-magic_downloads.svg)](https://minecraft.curseforge.com/projects/blood-magic) +# Blood Magic: Alchemical Wizardry [![](http://cf.way2muchnoise.eu/full_blood-magic_downloads.svg)](https://minecraft.curseforge.com/projects/blood-magic) [![Discord](https://img.shields.io/discord/259683256348311552.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/VtNrGrs) ### Gruesome? Probably. Worth it? Definitely! ### [Downloads](http://minecraft.curseforge.com/projects/blood-magic/files) From bf2fe1166efb110e181eed6eacc73040bb4f20a8 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 23 Feb 2018 16:47:34 -0800 Subject: [PATCH 103/493] Safety for UUID check in lava crystal (#1238) some weird mod was doing weird tooltip things weirdly --- .../java/WayofTime/bloodmagic/item/ItemLavaCrystal.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index b64edd65..2e2d6d21 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -23,8 +24,8 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide @Override public ItemStack getContainerItem(ItemStack itemStack) { String uuid = getOwnerUUID(itemStack); - if (uuid != null) - NetworkHelper.getSoulNetwork(this.getOwnerUUID(itemStack)).syphon(25); + if (!Strings.isNullOrEmpty(uuid)) + NetworkHelper.getSoulNetwork(uuid).syphon(25); ItemStack returnStack = new ItemStack(this); returnStack.setTagCompound(itemStack.getTagCompound()); @@ -38,7 +39,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide @Override public int getItemBurnTime(ItemStack stack) { - if (getOwnerUUID(stack) == null) + if (Strings.isNullOrEmpty(getOwnerUUID(stack))) return -1; if (NetworkHelper.canSyphonFromContainer(stack, 25)) From 57c25f0064d43d5707e0097dad831ae30100fa68 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 24 Feb 2018 20:31:09 -0500 Subject: [PATCH 104/493] - Added the Furnace Array (name pending), which takes health from nearby players to power adjacent furnaces. Not covered by standard medical insurance. --- changelog.txt | 5 + .../AlchemyArrayEffectFurnaceFuel.java | 138 ++++++++++++++++++ .../LowAlchemyCircleRenderer.java | 22 +++ .../bloodmagic/registry/ModRecipes.java | 115 ++++++++------- .../models/alchemyarrays/furnacearray.png | Bin 0 -> 45089 bytes 5 files changed, 231 insertions(+), 49 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java create mode 100644 src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/furnacearray.png diff --git a/changelog.txt b/changelog.txt index 2f556fa9..d3583a7a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.2.7 +------------------------------------------------------ +- Added the Furnace Array (name pending), which takes health from nearby players to power adjacent furnaces. Not covered by standard medical insurance. + ------------------------------------------------------ Version 2.2.6 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java new file mode 100644 index 00000000..29706cef --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java @@ -0,0 +1,138 @@ +package WayofTime.bloodmagic.alchemyArray; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockFurnace; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; + +public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect +{ + static double radius = 10; + static int burnTicksAdded = 201; //Set to +1 more than it needs to be due to a hacky method - basically done so that the array doesn't double dip your health if you only add one item. + + public AlchemyArrayEffectFurnaceFuel(String key) + { + super(key); + } + + @Override + public boolean update(TileEntity tile, int ticksActive) + { + BlockPos pos = tile.getPos(); + World world = tile.getWorld(); + EntityPlayer sacrifice = null; + + for (EnumFacing face : EnumFacing.VALUES) + { + BlockPos furnacePos = pos.offset(face); + Block block = world.getBlockState(furnacePos).getBlock(); + if (block != Blocks.FURNACE) //This will only work vanilla furnaces. No others! + { + continue; + } + + TileEntity bottomTile = world.getTileEntity(furnacePos); + if (bottomTile instanceof TileEntityFurnace) + { + TileEntityFurnace furnaceTile = (TileEntityFurnace) bottomTile; + if (canFurnaceSmelt(furnaceTile) && !furnaceTile.isBurning()) + { + if (sacrifice == null || sacrifice.isDead) + { + AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); + List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); + for (EntityPlayer player : playerList) + { + if (!player.isDead) + { + sacrifice = player; + } + } + } + + if (addFuelTime(furnaceTile, world, furnacePos, burnTicksAdded)) + { + if (!sacrifice.capabilities.isCreativeMode) + { + sacrifice.hurtResistantTime = 0; + sacrifice.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); //No. + } + } + } + } + } + + return false; + } + + public static boolean addFuelTime(TileEntityFurnace furnaceTile, World world, BlockPos furnacePos, int cookTime) + { + furnaceTile.setField(0, cookTime); + BlockFurnace.setState(true, world, furnacePos); + return true; + } + + public static boolean canFurnaceSmelt(TileEntityFurnace furnaceTile) + { + ItemStack burnStack = furnaceTile.getStackInSlot(0); + if (burnStack.isEmpty()) + { + return false; + } else + { + ItemStack resultStack = FurnaceRecipes.instance().getSmeltingResult(burnStack); + + if (resultStack.isEmpty()) + { + return false; + } else + { + ItemStack finishStack = furnaceTile.getStackInSlot(2); + + if (finishStack.isEmpty()) + { + return true; + } else if (!finishStack.isItemEqual(resultStack)) + { + return false; + } else if (finishStack.getCount() + resultStack.getCount() <= furnaceTile.getInventoryStackLimit() && finishStack.getCount() + resultStack.getCount() <= finishStack.getMaxStackSize()) // Forge fix: make furnace respect stack sizes in furnace recipes + { + return true; + } else + { + return finishStack.getCount() + resultStack.getCount() <= resultStack.getMaxStackSize(); // Forge fix: make furnace respect stack sizes in furnace recipes + } + } + } + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectFurnaceFuel(key); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java new file mode 100644 index 00000000..bce8f30f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.client.render.alchemyArray; + +import net.minecraft.util.ResourceLocation; + +public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer +{ + public LowAlchemyCircleRenderer() + { + this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); + } + + public LowAlchemyCircleRenderer(ResourceLocation arrayResource) + { + super(arrayResource); + } + + @Override + public float getVerticalOffset(float craftTime) + { + return 0; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 62318a39..28b4094c 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -39,12 +39,14 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class ModRecipes { +public class ModRecipes +{ static ItemStack mundaneLengtheningStack = ComponentTypes.CATALYST_LENGTH_1.getStack(); static ItemStack mundanePowerStack = ComponentTypes.CATALYST_POWER_1.getStack(); - public static void init() { + public static void init() + { initOreDict(); addFurnaceRecipes(); addAltarRecipes(); @@ -54,7 +56,8 @@ public class ModRecipes { addLivingArmourDowngradeRecipes(); } - public static void initOreDict() { + public static void initOreDict() + { OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); @@ -62,16 +65,19 @@ public class ModRecipes { OreDictionary.registerOre("dustSaltpeter", ComponentTypes.SALTPETER.getStack()); } - public static void addFurnaceRecipes() { + public static void addFurnaceRecipes() + { FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_IRON.getStack(), new ItemStack(Items.IRON_INGOT), (float) 0.15); FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_GOLD.getStack(), new ItemStack(Items.GOLD_INGOT), (float) 0.15); } - public static void addAltarRecipes() { + public static void addAltarRecipes() + { } - public static void addAlchemyArrayRecipes() { + public static void addAlchemyArrayRecipes() + { AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); @@ -85,6 +91,7 @@ public class ModRecipes { AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.GLOWSTONE_DUST), new AlchemyArrayEffectUpdraft("updraft"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/UpdraftArray.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.SLIME_BALL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectBounce("bounce"), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BounceArray.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.COAL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectFurnaceFuel("furnace"), new LowAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FurnaceArray.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); @@ -92,7 +99,8 @@ public class ModRecipes { } - public static void addCompressionHandlers() { + public static void addCompressionHandlers() + { Stopwatch stopwatch = Stopwatch.createStarted(); StorageBlockCraftingManager.getInstance().addStorageBlockRecipes(); CompressionRegistry.registerHandler(new BaseCompressionHandler(new ItemStack(Items.GLOWSTONE_DUST, 4, 0), new ItemStack(Blocks.GLOWSTONE), 64)); @@ -105,11 +113,13 @@ public class ModRecipes { BloodMagic.instance.logger.info("Added compression recipes in {}", stopwatch); } - public static void addAlchemyTableRecipes() { + public static void addAlchemyTableRecipes() + { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); } - public static void addPotionRecipes() { + public static void addPotionRecipes() + { addPotionRecipe(1000, 1, new ItemStack(Items.GHAST_TEAR), new PotionEffect(MobEffects.REGENERATION, 450)); addPotionRecipe(1000, 1, new ItemStack(Items.GOLDEN_CARROT), new PotionEffect(MobEffects.NIGHT_VISION, 2 * 60 * 20)); addPotionRecipe(1000, 1, new ItemStack(Items.MAGMA_CREAM), new PotionEffect(MobEffects.FIRE_RESISTANCE, 2 * 60 * 20)); @@ -132,7 +142,8 @@ public class ModRecipes { addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(RegistrarBloodMagic.DEAFNESS, 450)); } - public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, PotionEffect baseEffect) { + public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, PotionEffect baseEffect) + { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(lpDrained, 100, tier, inputStack, baseEffect)); List lengtheningList = new ArrayList(); @@ -146,7 +157,8 @@ public class ModRecipes { AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getPowerAugmentRecipe(lpDrained, 100, tier, powerList, baseEffect, 1)); } - public static void addLivingArmourDowngradeRecipes() { + public static void addLivingArmourDowngradeRecipes() + { String messageBase = "ritual.bloodmagic.downgradeRitual.dialogue."; ItemStack bowStack = new ItemStack(Items.BOW); @@ -160,16 +172,18 @@ public class ModRecipes { ItemStack stringStack = new ItemStack(Items.STRING); Map> dialogueMap = new HashMap>(); - dialogueMap.put(bowStack, Pair.of("bow", new int[]{1, 100, 300, 500})); - dialogueMap.put(bottleStack, Pair.of("quenched", new int[]{1, 100, 300, 500})); - dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[]{1, 100, 300, 500, 700})); - dialogueMap.put(goldenAppleStack, Pair.of("slowHeal", new int[]{1, 100, 300, 500, 700})); + dialogueMap.put(bowStack, Pair.of("bow", new int[] { 1, 100, 300, 500 })); + dialogueMap.put(bottleStack, Pair.of("quenched", new int[] { 1, 100, 300, 500 })); + dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[] { 1, 100, 300, 500, 700 })); + dialogueMap.put(goldenAppleStack, Pair.of("slowHeal", new int[] { 1, 100, 300, 500, 700 })); - for (Entry> entry : dialogueMap.entrySet()) { + for (Entry> entry : dialogueMap.entrySet()) + { ItemStack keyStack = entry.getKey(); String str = entry.getValue().getKey(); Map> textMap = new HashMap>(); - for (int tick : entry.getValue().getValue()) { + for (int tick : entry.getValue().getValue()) + { List textList = new ArrayList(); textList.add(new TextComponentTranslation("\u00A74%s", new TextComponentTranslation(messageBase + str + "." + tick))); textMap.put(tick, textList); @@ -187,7 +201,8 @@ public class ModRecipes { LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeQuenched(0), bottleStack, Items.DRAGON_BREATH); LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeCrippledArm(0), shieldStack, "gemDiamond"); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) + { addRecipeForTieredDowngrade(new LivingArmourUpgradeMeleeDecrease(i), swordStack, i); addRecipeForTieredDowngrade(new LivingArmourUpgradeSlowHeal(i), goldenAppleStack, i); addRecipeForTieredDowngrade(new LivingArmourUpgradeBattleHungry(i), fleshStack, i); @@ -197,37 +212,39 @@ public class ModRecipes { } } - public static void addRecipeForTieredDowngrade(LivingArmourUpgrade upgrade, ItemStack stack, int tier) { - switch (tier) { - case 0: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); - break; - case 1: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); - break; - case 2: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); - break; - case 3: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); - break; - case 4: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - break; - case 5: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - break; - case 6: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); - break; - case 7: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); - break; - case 8: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); - break; - case 9: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); + public static void addRecipeForTieredDowngrade(LivingArmourUpgrade upgrade, ItemStack stack, int tier) + { + switch (tier) + { + case 0: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); + break; + case 1: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); + break; + case 2: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); + break; + case 3: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); + break; + case 4: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + break; + case 5: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + break; + case 6: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); + break; + case 7: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); + break; + case 8: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); + break; + case 9: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); } } } diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/furnacearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/furnacearray.png new file mode 100644 index 0000000000000000000000000000000000000000..5639657dbdf4c475c4b22ce482710474187b6706 GIT binary patch literal 45089 zcmafZV|1L~7w#L|c4OPN8aHVgqZ2l^(YVRPw$<2nlQd>y+cs~0|GVzzyJpQgGiPS) zv-h)k_Pc+nD$AlE5+VWsfFds^^#uSRKR!YN@US1tjr;7=#{&CZK~@TQ|L>L4Q5^rV zgJ3VG?F0ZwSpU5tfV2$!k4-pdc_nGMEl7L}c>43!eZr3|5=#v&XGuF78&g~7kFNkA z>1b-~Y-;k!&C=Q8ldQawstJoJ8~}U*%yL@YD>#qGIholdIp`lts z@dI5~DxU(D`$y(8@HRnFz(S4|jkfP_0(0u4Y6?(Jyd)MFEY@m@<58=oYP$U$G^?MsmgG{?}VUEv;d=)&yfzA@BAp- zyLt})I){Ca%$e}AFkiu zoWrSuz)dM{uO>ghS4q=dy8|gWMFW%P44_f=@>ShP_Tn@`s2&D&5Ys}?8#gyM58~M2 zdWiFbrS$vKWS1d6NC)p1Ycv6fly{)r7MzL&-GiB^^FIWoqDG?#@uwL!b!jNPw;EXi@uT|MM01v+|&H8Hyf$< zR(w!v+6y;zL?n9?5h#mopxqq&sM!GhKNt`#`_7F%_(o+Pcnn`Wzz_4X}v!G7hA?1uxJ+ICBqJOXwu(M2BV#q>L#>wt+~S=kc%oOW6fp zbkLv?g#kM3Tc;U28}OkOn18ms3RNY7dmsf3%ubf}-qJgU9I&xX;dhO`1nBco!3V%a zD4L^zMsfH2SYmVuL5-O8xRws-?0deTQ6h14rb+GpYYDu(FEaI|$UFlX-)q$mSvdyU zK|f|k&r=EA8t)ZOUFB`VIF%xwI&j}VRs8YI?eZ}OFABj26jICh8G#p)|{ zcgv}!H~JkGOf)kKCc(1ut~!T`U+A#IuNKe+pzsllTw&9@A(!9>pzwj5-%?#I2>v4V z#x@i$Yoy&2cQ$^AufE*Rr?LQvHW3lj!f)h(uJC~$LXoQh$U8D-#d=%If}TD_IuJ6EYabVJs(gfn@VXMW++g>w;r-qy{>2a( z5IJ_So%!7Uoj}Nxj37*RI|>6f4jrGc-ey~jo&;liN zl8c85ptt(&bUrOUGG%DM*!Y{_{#7YA@tQcAAud=xDNs3MKQ9(o zI#m4n0k1XgLD5a)t8#e%qc%{yV^c3{cPeSgNnlOyWEwv9N)OCK@g?$9j19G}%S^E4 zcK8tQ-eV7w5j^=Y0(RO5FPPnD1Xou#s>>08kc!{2Bq@YPq%mt;qPhCtWkISsB^Ox6 z5AC;0^W_A;%>^M{IDRQan-~dCN2Pg=g;;F^k`SD&$!C{Ga#KrISJ1+iR)i0%AUB-m z1|>;vix7#t)HThB27g+&-mD@Vyqo`-85;y_A?)G(arq-17~^v3>9at#W6zU$A5q!G zc-szT;~@y?R0TMLWDDw@GL!!X1qed$;dMs@NOz#%iAoOoKpwyZ)#vs;z`$(PA47=M2D0YCQ0u~eXOY>5X#Ofs&bO>Qo3X5&{INZ(>K1b9a>2H>?1Gwe^x|;+*o%n(UofBYkWAdWKrV{>-q>Hk@}o|aRBR&1$B=@U4HsAt z>gQE5J{^Oa6xv%DHMMye%U^o~I&s`@Dg6UE6EgR16tB#u#U6g|`xQw3X#rgS_9n(6 zt=IqqZtMd$`|49AD`!vIV>E_tbLpYl>7HfAh+ zMuyhk6l-zcmyBb0Co#k?uz(Jv(K`0ty1$r!m;0=+@`CkqagM3Ec)GoHfJ4lQU=k!B zg}K2U%!P5#xv!hTY6YMNWAu)Ez!zsCfQmb{Vp+oYOCp!9II@c#M*5f6au;!T68)2n zl-=){;K<|Lu)txd(4~i};G09(>e5~2SJL4hbpI@6;4)o?&BaDK%E#;g>y(^KV_eWM z$Z2Ce3J|gXyMzR|Mojt!og%`TO3f!xZ96nTQgRphf1Gn0*+orl{44Mq1X%9(Rl$C6 z$6<)+a`!wW{=t+clIOmml?SUxXZKP(eNyqS)8MOb@VqB11d~(R?h{=rb+&H6JYSYJ zuu%_b^HMe>k`pK^_*~rz;v`-6H+lP);$$l1pVT`25dpp|JuJif?yEH~50;Eh?c)Nr z#gXG76P8ofq;;oC#JP5&j3$~wj=b?#Brh#@HrYHnwg`T#37zK!;Qrmu!dei z>5;gWMnYM*8-9j)-mx24!kuIr!zhHoXAQc#NfOIqW3@e zNb?eoUdL(GU5y&=M6zV->du{!oDZF=#6GL>G+zuA1(tNDiTuP3aH0|X?9zbO zKIW3Y{?EA1!m(P(kouF2FtISM5HIXTUhoLhZZAS4%rdl0S62VshmGEA`#4nOgWcTUy@}H{sga(+o;`& zpb*7=naplDIn3oS^UKsC`=&D-%*}>`NayrCO?=&-t4%BYk=JiQ*XLxE{u6Z~wyvZ; zJk8|C)&ahKZBjlxJIFyHT=dEEU{VFd=rLId!N`W z{squz-RhZf>f=-Rl)+{em+01qxv^+FO2^c$ZL?eA<_X@BRO8F{Ul%l(gtSgnTi(~n zBEXfBMx~1UmwfVRPFQB0EEI}Vd-x(yewku;^;244CwYk10b;Q#T|s|=DVR!_48Tv@ za1|xL>GX?`&C~~kFlyv0DGX04rS}Y}wc8YMFTd#?F@?o)+me%blG5Jt`ni@cY&7v; zmd|F7tw5ShD7$NcUw<*j%jy&(;nb^dATwkKCk#hIX5VOed`goPYFm;QjlF0 zND?Z_<*L54myqnXxR1iH(ezNb#i851*QF4RI{;?Vlf1v-Uydc}g`qbXLlyLNbI+g! zR?3S|d|@AN3}u!gGn>8e`~!m;;qW%w&~Oj%6Kco2Qmpoysp!3ei~Zw;kBBFZobMm@ z^06j0iCV7I5KI0z*de|}VodWb+iTz+#^C%{*}Vx4GzS}??yX8u6m%oEwQk~#4=b`> z*HCjBD#3`-t7{KXpOub|M?^oFJww6xS;Ncd@0;HUBjtHFV%0AOA(zd0URg5xTx&R@ zC|-pur*ILy{@p!CRFNFDQV=Vuyyg;X3+SvM^Re27oODIW&(AJgF+#h2uPGm8i6VNS zi{AhJPa^eK63>Uj=wQr`CAH&vgW!p^!*X;!gug&?QHhpDs85XyTfD0r4G=g9-~#u@ z8fHzMW_JaX#b9KIc4}26_XeCTL>k<%TKj~4ubmIApq=ofuIeYrq{c+?gZ?p{m%U6wCMZ41v zKeCwtN@AXh|Hx2XkzE)B>5m&%d`N7ie+x~RMj$d|e%z2O+F@}#RbKquzQ(_81)Ae< zUn7Iobz^otPM2SG|0Mf(dq}1wB>|0+N-X#E7(|koFP%XqCk5ax8^EXxZ;R2 zvgy4Q8-gwlJ*rWEJ4K z;5!7RLoTH8l*`77zUd=gqDic;e+nVeAr$&7v_{BYO9HtNwkHuB%5;l8oH0JE*Jr!i znDdo)Au9;bo8W@7Vcr!PF@8It!?(|y%q{$I2oWSl?v552V-f#Y_NCPnr?b)6TxhP3)&L)_SL@(P2L_|9KU{D@*rT zkFj*{`STtBp2=T1$qLt%&8~5OtHT7y9 z8I|bWc8N-5gL`?9>A3^B?H}J8W~{^It!5RPo{Cv>E0r{>8Ky2sBc#oHR8pB7J4n8j zZ=Jz%;XKUZd>b=yOncFjvP3=U10lYxy$sleEf1Oy&9flP326Hq^K@ol#b)tgJ&Vt>!R&k$upA8?zJVf%}lhttj9 zOKx0;nbf0H<4ZGG$872~*%VD{(4KCrwNo9kp+`6(gV1$I6&n6N+#HhPya7){qkKJE zl96$}Kq6-)iOs@nGAkb}fg$YCg!@usBjelIv__L;B$y4gFqZGTaB)%0lovJi(}a13 zp&7Y4X$HbfA-Yj_DkNc-=nZX$-5%$MW83|&o_FQmCVe&7TK7V9Xv=NZ%8`_~`|MM8hW;d~2{$Ym3SD`V!iX)cZ6TOXWQ;wiJK+59nF zT-Fc;i2CS~GY7c)1Ri7<-j-8GCXt_J*a#yW}EbCYsd`}jeVjFY;BIG77QU9FiQ zF2}B;dEpbRxwxVpkHF#_MkhJWDcXRjqMNm6z;k9`lCoY0aX8Z)s2#S)gaMYCG+a1o}X%>8Xf;o5h5)V4oNvicQeTQ0|wH!sgb) zWK@I@av^974onl+87hCxmi)jfJi>ix?FXMXgHi=q-BP)LDD8^0pc)PHBRo1nw`6R2 zkpkUB%v{j*czNPWrLZOGnnQ^dTG*7GReAQrD&EL1x4vzyP;+lx65A;aCb(+LD4*;| zumq>>(z)59^PAF{i&8}Qx#pj9dJG}#<7}yw^q-Yd6 zLP@fHZs4DbhhA;rEoJ{M(|)8Zqgg3ujkoLlZ0Mi1Bg5=?vcCn-JJf|Oxs2J$jz+F6 zSNl_$ngD#oQ;OWrr^O)b6dS?>mbA3BMlwS7@0x}%=AQ;}dmN5J+dD|CMc&S)am^*_ z<;uBwg(FH_+pZkwITIn2U3UKM<%_VbEt@802y0|vY2flVD;X+E`ZIaV-un6#&r*@` zZ^@5v*~xSd{<8fE)Z4^jTq7vJ&_n21NFm+8Gq1_iL{Ed7n{g?7%D6zg>$=zPb|==5eh zZ0~Zkq)K`~=;!QHo0E7@8J*mGZbLn?$h zplya(!w*!Uj5z%cyCL^bIJL`g(ZiyP^<|<8HPJ7U>EZsK0Bg2@WPCPPJ(Os@rz66^!%+`vTFt4p4JSCeq*KqL)v965RAfRyQ^!Sox=of;Lfd z#if=(i@hsUu=@YqJe@AviMstMqII1J+tA{4n(}E}&cY$ryJ_KhFJNGbHm!S7Y&bP( zqMH85)-TpG)G8vQa}lfYG4`1^4@#c;8c-ZB|0LCkijX43&N^tKRvgk`t#( z_~U*m>#*y{lb5G8#=_TePi4GHVd~4jP|| zwGLH9=FBtplC0YDqcUHNd66%E;$jWJ-KcK1{f>cwMV;TX*^hXIo#)0hRLzR2bo44d zP`tT--}l*iHR8(IJr_Tg94A~tIRKTEH_(aW#E!DjG81>Z5nofqkENqwdarp@_EgT{ z%%|dM{qGFgT0GpTe8WqN>_#H}#b~=+C{33B>8{XvZ9dPVgcU@IiZ6WDVVg13LKYX3 z0_DJ-)ikNKhKV+zGRNsL_oS$?=w^o`r| z?KK+sL&HDQg!Yw47{m-k-@d8t)aTW=tQ=wxy0X}?WP%z+HLI}}a`Bt|)}bVnxojxg z&$F@XA{(9Mo<}LidqD*r^hHw}MsW`7e2~K58~q#?a_Xh#dp1ee*G4}2q!!ob=f>nB zpSDF>(max(ZQ6%;extGVCqkUvttntQ570}9s7%xCwJPWFAf>!p>5 z0+@}`iY^sQ2sRV0hm=9iF~5UUvp|aBWmPn&>5FG~g$Y-|n%2zE&ceiER#`}|krHZf zJnw;&&^~F*BJSZLj0<`1)>4n3fer}b(6k_t^IRHj_(3dEpKk;3uLAS9(K%wEIs*SP zZEQ(|2nfCSJG0&s_8-eOhNH`Vu?>I?%$i~H&!SVph!;o6v9cC8iJ!Z6$ayozb6a#| zlKf^lp56#m5$W(#3#|6>l!;T%n>hReMb{KH~0SKze6FLlV~>XNt=pv zM#B!=2H{1o*;wd896k=&V*0|~G@7%%CQYN>HZ|2J+IE= zcY0196Yo3S`yG+vQ4>-fY?cD-xAlRAgGZuUJ;cq$nQ3z?pvkMz&5C{H@vr74RS%5P z)7t2IL@?V#-L(kNzdHGWy+zP1=caJB16ijliQ&}dBc623MCFCTD@vMG1@o!%r}Qwp z8L4GT8zbC@wfrigye;a3s64vlNKtf(_6oP>v6^>0Oy$`I=T^VqdZ@lUT=b_oO5tU{ zPJ9UO?^@sq%KT0i{>clX+%71mw==19kJx%35Ha_yaO@I!wxD}_w2l%)2sf#B*%RwQ zz#SKBris5dWtf1w!(c%{F8#~yEs?bNA>Q$%D|e9D52Z!+6{|ZDK$UY;2PV~qFezqn(^gQJTcrA@b(; z53IeYDeQL&*#FZ-3^TeRqdB=BOVdaDV}%DM=Mb&@{43DN(EmS!(uHSux`e^c9vhl| zqeaW_kq26FRI|!Hnr=oCbD>&y3C+X#-caG$Q_)1m0|%VLN*6ufVcoybS*LGtV)*_I zM3fq7+_B3DW$==1q+7V)LQIGSXOaKd9+0KpNmXLln1jiy$V7iRn1DIp{Re9x#oTQ& zw;vshh#dI7>z1;aD~@$7xFfe5b)g{HPBY>$c!l)IOrP|83y=K>H9!#V52uIa33fPD z(^)b_p6;pI-ntgd#+PUq3*X#wR|StA)G7D$js3M&z+1k<15X}l^2_Afip~Z*<1WKb|>Bt>*?NPe7(70Py!y{rA63^^UsR=y2v5WgjG*XoA7kn1zit-f}r%) zDI$&OMd%xHTX2KF611p?WMi8TmJ>_xZQaj7^@rE%wO}FH*p_XNhQh8n?}lcPbn-R7+}_4zeN!D z@QebdIu#v?rFp60hXx^plw|XM5rP_3(BYjO(0_GJ{eQCnn)OLb7a^pO*oCgw z*#tO)%Y9!b@i?6xI>$+W-|A3y3B@lYv@a(GpS{yg@>T2EzEkJGEU0g+V^DK6O1m+d z!YPqa_7H@n)=|vL^3G{~1-BO0wN_wFPf~7G=cfVEJ-Gfd7@T$?HS4qE z?M20~UZH{KTKjA~(-)sWVcZ0?>lNz}a{GwDyC3D*8GEsiH|Zm0`pC?{?K9o+JyL>d z>%w=qr0?}7k++hXFoQN+)bV3WKiOCM-PpYy3qD&H`Pb+uT}O3y+%(|RSd zjWhOKvV69%L?Ve7-WykP(08h_{c(}~eJ+v&t$S)trhcHc9coruHFiX*3Vd;$eO6|c zzah8@@14kgz{hZW@5fOd!Euw0WF&{`eJcNZ`keB~Q0n*m8Z{GTCd~Gqk>T4rLr5K< za?K#E__HvSCoi>j)Np7`iit-Vu?2p>0kmWpU`?7oMytL6;T=DRDwYD8q1=MDsQx5f z6weSAc5(l6VoY>)ExXSynB5YgOs3fM!bVcq7DXMXXP&MoJvh__dC&WR?>?TPXjL}7 zV@^VHVe!;?jfkNl#u+S4`RS(Bso@_j8lY)b$s+5xPgcwP*Yv=cfN1)$U?iP{_4FG) zu&a`N8Hp8H<-|^35H}0ux9$eVxKrc9@REaxCK*D}8aMZ`xCO$D&!uo<%&PH@ z4+=n=lm(3*OF-I(=6+m(!PR2x4C3j`+JbEZ8KcI_KV=Y})+e?#?LkX0JUfD~zl+ar zE*!ZxATIoRc~3RJ{a>?}o~$HRFRJ|_FY+?sDdg87X{9=o;G;R25!LG(#Zx))*T$m| zu7h%6^E<8VVg*G2Oe7bgbb!2*y_EZUC&Kb7ZLr~K3%xZQLD%}PHjDp zr%pCUGS*?{Qx(inTMm(9O+7GszYZ<>j54C<%9C%ADC#NI@Pg!TK>tj%%l=L)H(~2+ zKLkzce1<(}5laEv+6zl&jUA4URp|HU`G%B!Nrbgj7ug?A!i6lVMP3+-owc}_Z&o8{ ztGFuaV4w0!aN}>vTE|kO(zS-l)i(t(q-qR*>hkknE>a;su64X)+zgPGn2Kd@u95xC zFhXCp0X^B9(E|ISk&Rf61$8eveS99r*+t6lr-ydfh-jO~IPCneh1Q}cU#>rowr;AQ z9pLj`(XAv>dBFEm@zHOQu(aEgXeF0BL0D5f{LVJSvwNq`gJ~9XXFXRNoXa-sWyP3E zc22d3&xvM8yH-2Mn&NGMvBxJNB=nlowyybVaazJjx8>zY5Zp^HMnVB?;STHL9s5UC z51w>(HGiCxH2wt)yDWhO)KPMWaz* z8us1h53#N?T!=pAjYG)bQ?+bt=erG(@Otwe{vu|}WDgy7zy?>OyQ~0xzOUvp{%Ws7D?=)65gD^#f>N}XT-4hEHDT|a9f9A<<>U|+eJihs0ew19gL!H z?V;i&yroMct$6Uw=WB6r^RI-`_KTSQDx58k{DuFyGPDFs6hR?Au0W{Wg!Hw{nX}rO zKs+LWFgx;Q&k;J)?5S2w7S9h^MJwB_{ zY)4=G+{!w|h?aq}k&spd4z z=)X{uBI0dEQaniMQ_k)k*jcrghaW-HwaQ=4dZqs z7*SBDbw}O4YwbKtS~8YeD98O|+`7n-)IZu`2V`vL>K~~3+aWFNTEy&{`MF66s&mWu z_tFrvP_|g|M11`MF=4iw?s>B>0KCZk*lmN*Q^c)?CkN8(jdT1`fJqs(bKW<#=ze>sCDZ;|S_rD}A zZyoq)2AzjFUZ)eTWvKosH*t}&MMZbNO@H!!X2oFcMmN^G`}RveRQ6Y$eH^0CkK9#g z`n^8c%E^6a;Dxm=-f@=`pA_R&RULjlaEOikS1hrA7OG_WJ>mU4B2Q=@gw|p%c42gWnjy}%bR{R> z_=kPTC_Q3E{yGGFmS4>Ro~a$8DanySi(bHw{qJ@DOA%!hG+QvvS}kedJ3TGr4MLPy zf}wl$;PfxqAAQE@59^ZVnXW=VN zk^spf=O6=+F7RaEB6wCjt;P$}na;=-m2W@|vx`9MWjTfl+~fJbeFmCj6uYg2RqpHL zs29FaQ^uWlp|3Dj%`f{6Swh&NZw)kkLx|eZ<@8kcURPIe*Of}uRi|P&BHa8{Uy*-i zc7o2woX7fYBj1*Rz(wIN5fY2!W=yj%u}g6+Z_(-DITB(6c})LXAO_aCAlmw?%i2A* zLHm0|bxr-u|4t|fTtZ>!sc}EBqQ%Cs+v#am`Bl)r`Kw_~MrmnZj#BhTzTE-3y}r~U zDQfbNbTG%+S8SPTecpX2lG}m0T1ttoVA`HX{^>RNsZwwK6j>P`eGSa-*PYQu_YSpd zZwi`7_Tlyis|M8kJY<3~Ar}$Y$K#xp?yu!tnL)G}v_oc_iIeLrw-#l=3hLd%qzBU` zB~-I0#-vC1JDkL~u(h>KHS2wZ!R-8NFY&f-E+XVA5GMQC{TwWeP0N12EFcIG2hvze z2N?hD_VHrGo}y2(CGQwsKIQex;|ggIHT(Z+7E9axtf!Mth*> zUHgq1DgR9&`j^^a?%lo?Q6~0%> zqb*rO0?rsb??_sy)wr%^%ImJlfp23jHzVpsWhB3>i;0L(pNoGvdA*S0gYMP@ z?h1o&k|&35J%%-Sq9yDrjZc@#b)e7!yV%TT2{L2R=8M@q(~aDu}uDlLzq z+bxfB?sEEH9pf|a0tWwP-`p9x>iCyMB-WRbj;Gqz(@1ZY2c4o(c?Cf5`wh~;od&uT zj7Z`O3c_B>$O@C5>`sUIYHB@c$)8bk9wKbG0{f8oGO(;Z)=0Us?(0kGUAAwJLlc?c zbr>a1-Lnsen}(FLOg~pen2220N6(DoORnxA@EeRoUE&tYlyN6naKl$L9Sk?pB2# zzXuZjxkn?~2km>F|DlU{$P;?-aV*1S3rU`Nzt)5&&aZKq1h`E)+0+`;)~2~B7UrHZ z$L1F$hgrd}QaHFj2b{!qT?!Jdf`5?D1vO;_@g6NDD!(7&>&z8L*0PXU2RSzyLR$Qe z%SNhF!Ih|Jo6LphS|dJs*N|{E#1aTrwD?}q*-swD(ZE+6rnKWF%;`zmC&3WgOya&Qq$(IvZ? z#%lkUO6F5?OqPFBEGR#nI_8ltOV;V+bKqQo1uC=E&j71b!Hv({e4u#jXI~!7ymbA% zrgwp2n3TUyhDkdcl^0vLN)mEL-xxOW;>^%Tde<0%*rX;o)f=$qHAaq_TK3EQ z2T4o`zPA;?a@^#;FKJnFd}eV61ArTnPgR5d&R^~eNu;rF2Nrm;-LB5?(`!ir=|D3| zH!A&erOE5=!-<`kW7~Eh5~baXZ$m+l$;MJUNQPRCA?D@nP2A*C|0TF z_{Ri~?E4a!)u+)1a4}5NrJH+^;S)0}=Z0HGR5%5+f*qnAi`KyJ9o8pZ5Y@SkG)^Lh zbV6gWxlmO|V~z#KORA#lbtBz6Ksx`?QXaJOBnB&3_0}1FEb9X>gyJ_J^=S;-s-}EB zG0kcoWVFOpr3>DF4>OA+=uITrXMhF!~XhxRJ6lE}nd6&A^~ zeAIN)be|$Khs)!u0yie?GJB0f_pP9GgydEPcQ{&EeuQuWsvA1AJEL#-E%Md3E6Q_^ zV^;s~j(g&zM$ z63WXM%9!wi*BMj(7(kA4aqJ?tXl1c}zlI5k3Eph{qF z#Fk(ND@u_s{go%MAG)-@-XSM&ZBF255ozkQF{UM}sbg{U>LxSch8Wcd)qf;toe)aP zB-c#@jT0&7rxDJxAjz%bZt>5Jk>^^{+M@D5g)dig#YLckN!0`{ESfWtZ7HoE#F8bW0+IOkc&!I{s_X%yi0*rhzF<;GtrJ zb6HPTWQLtz&3;wwT|Y6x1}1rneK=Loqy48nxd78%#nar!h-OyDHB|SrM2my<`NF`o z0nuQt^n4OHsQ63Rr#&#SwC~e;$ndJXUl%Jek`S$Ds6fyIvO=aG4hPslI3YKwSE@sr zKfjuIp{q%s3Hz6aH_G;9M3SR9-`qql!m};R2D8FVmk+ax$aigRBCX*?iZ+%>Kz$K@ zTn!gi^t8lDMBzzI$!{NlJ^*aFxX za;hZd@ak&ej{ll7NUE^Ejmu-f>ZqCT7GS79Lv}m;hx!ZAz&e=?20p}%OL;M`^i3Ta z%>7nMk3Kr(5(3~&`1{>Zc5x&kbGNz@K>iM$rud0ZG3|2)j+K>`Og*YA{4t$u zN4(ZzRkKSu#lL1^D)6AuF1VM16%Of&LykY5z>i3EC6dkeoKAGOrV_PrmVY*nn~$7) zY*mtQ7bnW`U(^e%u=C9}=NmN=r!1fHg{TaHM~z#_HD^v;our%{m{0#LG*MLH!)l0D znL4KEzYmYi^y=390M~A_MuVSXM{pyk&o&R3682&L*+E#O$9+uawBzE4kaoi(Wu}b_ z)AT*-;y<<*=P)%qMsg%R3)3H#8~vnoPn$xNT{T3=m0LbMFsG3$MzU+wWi-deaGX)7 z-sM;Nk8?lrpsh8*?~x7E8>v0>T7Y28<~>?JTQAf_d+^+wz|&j$QC>;8NBOvB=lKB> zYj=G@eUwv%^0V};PfB8!uB<30!4Cx_G5mQ3bL^}ur%cbto#Ayae7|Cug!6qZ^TEW0 zCKP*U&fk+$(PkUD4v^w846h2=3EjO2r)AjAwx{UBH5e|uxR75?%JZ{Rkyp!oSHrQd zWUSnRjT%n}@H*)_4$oY%nw2x`c#k2McOiJ$!_Qcm~2UUhBhKGA1`SiOBk7q$vnI z)#QE`WZ{H2JI;#9eZLOhi~0-h8su2>#cSZ7o>|iyS@N>{d4MYG`8ua|28ooJ?{Z@r z!tG@JyYZ92rirM6xAM;bE3Nw!=hgs`k7_|QXS9laDUm?$Wy|C|i z9?YqU%`u3=5lDbxfb?f{zTwnW6)|o1QRL5;qyHAonfg>ky1==8nh0*H@|sJx)()Hp zED|U?PPP5!r4q_AM4nE91$nFT{l&g6P7E!RaZYjt!TADB~!W&$q-X*kk9ZGS8H z;Q9sQ*=5Vc-OXPKsYhh-PZ5r@2@cjpF$UA)j8uUAa|6mndVXVpWGvRuQv{ zVa;S|bam*}e0* z(2<7QkdaRO+lje$Ysy%C`IxMk;(q4nT#f^{HIRu*d3L!AZ0>Z%d!o`xk!Nic`ungO zU*b)kUbdP+{Sg5=fB62!sPM04{#NI)ot1NwqPv&Q^azGO6v?sEG4gz>X|AiG;^aWx zZy2p?dOV#J4z_(?kCIQ?FAn1giP?fb@ry2qD^ zXeURg3#u}|2<7KlP%}iK3hK7+E||i+#mj$aMF<#6;g6-(g9)B-bIxH;sQgk?i@v~XU_3|imzG6P z#8vs32Lh<{|Eur@mEAPhXLtx#XlP}=V0+-LPVE^P>Cn7YI>D)di6<5)rD^tgiC&C zNn`A)c=~#Z{fA>8w2Su){;j_8lCHoJH*~eI^jTZ<3j8;%rA3BaUR33>uPpcCwid?S zL@-79h~0cZ8)BEz=k05g+xulK@Mt?Owzf#s?+FipZVj%iz5%%$OdZI zm#h0>Qxg2MB8QCF%9(vR1JAwtBtU&nY=0ZECND5^t3rc2Ss^qAt&eSd7)PD08HUDK z!A-L`3Tn{W33{rcigEfHHK>LyHWOa#$KPgjm~&+%(p-n8LlorTzuBX>v(t`IZ1#yV zkP{l#B9DiqoSqCHRl!bvEq4E1!*38+L-$#Z^clhSXMO@_se3DXMWXQuW?dvk68B3X zwsSBPYDavJn=jR5Q;BkMdJzJpvGuRXc~Qn~Dd4`Ar|9TLnVV+}=5|B>!}MZzuWV5y zGx=4>%!E2<#ff-8ZEpmp`j!m>(JUWP$1WYyk(hT|j8AEp8O1YQ|8-G(~!-U>w(F`;*cK>6DlZ5IDhNWkY znJ)=XIj#-Jf2pY@)^l;6Y?UVG7GHklE0?)mk)f(T!^-a=)KJg+QfCy;oDAL0v0Ximd5nvD2baE-9iHpcWsNf4xDm-{FOh6ubyR1-v7>+Agz7G%UlRIa-}U&(Sl3(|)<`j+ zu@U`X>2tB;mcw3Btrb^vKwi+U3sFz-Db;_p?=a_Pn6c_P2WkhhceT6diRR0gb{PO< z3NN5@Kl9Y${p-(0ZkMgRZTJa33S%!??WOdj9A@3W>jj~|th5DL54e<>cq@XC4S7GR z2WplkUiQ@2PJ?}Km5B*F0?{h@g>g7}&dZvEfHLosXu98(og)|(518@ESXCLu@Qgh}!vKS!9_U_JR{Pp;$rvEZEn z2LX53kdn^RrRibGT^IwqV!PnH(H-}gPlIrb=9rhYfkwt%vb~M%A3y>sR@2Q+@if~X zkxFn_$R?MWZczLf^q4{k%ETkIj+h)q2==`9gZo}gf6^QAHi^{RQrmO7Lfq0 z^#~)Dp~Xp3p>Q*V7W$D@QvS*dQ|}a>S9KZjhpH?)zp0ry9saHpQD~KtwJ%4QhTpu!N0}Aug=HE6`5Fwe}%P@BbgB&C${I4;ZhH8x1&{0ft_@&9H4*x|Rsf^2Z8 zu*m%PB)BAjhhDXPrQ8?6T@JZZCa^H|-kx8RxnG$NC9P>@tm*~hYrOKzf)MiGPD(HV zp`^H4s7X6!_p=ao>t4OwpOG>T+nAtJ?Ek3Ekn|k4Y8_>Kr(drmhW)!|xIXozGuZxj z8@-I*h(}u?Is1pOCjQ#1T3m z*r(&q&`q?dNI9B(D);lX=)D}))xD>B%R(g^X2RT`(mIZ58X`}g*mDQifSgxtlW$L4 zkfPY%sBzzWpl@xe0^c#4-lj)P<_kPSdMrG*D|3%|+RLqOI_99rni&ls zz*IMwi55iPBhk70^$MWSd^ZpxREYp>cU9 z6ufyygMQ2OvvXaWyr@ejZ~tj)e1o1I?@c1*x%KX(_cciY{Z&A)W)#x!n-(uJoDZpr zg&bV@dXc>hA|A#|qD2q(aUO-C01xIx$vVuSE1)c9TqpfpLn&H(T)J^nYO>#?5Np@| zi*I7ptw)PG#EnEw=X7#At?bVX-(5N(J+$PV)#x0qIH>(tfsX0aQK&@o)r%8u4SQEO z)QK90v{@qOiD}mv%>>)5D;Ma>S8;kPs0UliH<^{#wJ=9^* zTX=cSv?xK?j~1t5A$bKHd^gDpv$jzuvb-Ih4j=h1LM!7=O z=sB;Y9|0plKMi(+9bhz_e#=LmU-;cm2QPDW27&IU2+6lB6`IP^$p;#Xj(ci6i_@fE z684?Yuxz+lDG4{;1xrr)b#Td0mn3iDy*UdMtWbLrerAQ#QxByO zi<7w@onY562ADA7^%KgHv`ue)_yE_Fo`BC|C)o?nTO5Fu@qHrKpBi3?|A4n#xsp$* z>0OSbe`(hF?s}IFjOFEUzZ6_kjlfJTt(7764(2g;8ao};jIEtpCqEuh*Y)}&?n>?~ zc_bMs)MyK-WL8uNvCDH{<7MreqqAKDIbfaTd9?~ep#RMOWOIwUXJJa-Vnw7x>{CD z$tf*_4Yj!m?QFZX$4rX;k(09jgikBBoaujmReD&5!U|M+@ThmLgu}7~mo^#0%p8$D zTTecWS$4}@s>-<5ZvT^z16{zri;35lCt`YXV{yY^PneQ~nhu88;g-;|q)WJ+DACO< zE{lt8W|_W}d9gJat0gqqsTeIP!M3T{KOtoLWq^@NZJMoIUA_O9+eahnawgh+-2@Fu z(I01jB(u%eI=mCkPq3mh^OVIWGU>d`uQpM$WxkA3-P71E3QD9KZ(>@l88YQ?O1o#yTf zQ@AzGiXZGMdX|vFwxSew*{q>s^7lv!S#mwYIDyDd?HVFb&0)ZE zpT}*7lVtuEj@TTGsMv}mwvQd&Jl}~z?cqOqeSHJoZ@98mk_x3~g28BF@V20^sm5xz zeW5qzs};rMTUrEq&?>Y0Tt9oBpQsNs|CVS}*Pt13CcefIEy*p&I{&kZ5oI5lxSe^9 z@I$WZjE}PQ6V+oATR|NTPSBSaov_7X&X<(mlF?nz-{5 zFA(r}OTpD1lrEq_YroH${YMoOo0CgbA603XXC+Q{b` z(a+hs`gt=Wk@o%=IF)WAc%fwV(AOv#W=XZv|kO0}{WQ!)-`6)Eh`18xDdy3eN|5?1Z$&84+%dlPWdZ1p9FKj+aKz zG((^Kj&nn;odvd+iGw(s)y6nwnZWkP1(-NHi}yWc+{3iX_7e?2J^w)wq732ZJ^s0Y z?&~6=;rapWZ7JwfuxN0+o;u`1vqBPEywAgX+rKLyfYz1wc5iSBwqzXF#D^qIumfyW zuWJ3p@6|~o%A>=8u2~!X+MP{?&7@U55QR^?lbr7w5-sRJ6b9(X1dUwwR1LTIY^LtgR5wLDfZMe>n#V}tq&xmZR)P{!ZZ-V$AWk7M; ztm{>C+q$)$O@TF%L^$=)L17z|&;!hXe7%(?5XF3#4&=F7|OJ%}7SFhKxZR$j$yB%^Of%CrU`0d~N%=^=$oyiEFay z9o0|ESI0Z-c*w3XKPk#`ys$ws_Fd;SCxAuxK_3zzIN_)qSL2!!m1J_P6j?TtX16~N zm4jL<)v0 z)jJ01_^l=Z{@|ueU?Fwwb3p@)UdTbQn+$dkosULYKdKpTd`29SDlQthTKgI_(N}JR z>X&}_V1IvE0l}LKJ%32E6>nRsMGhJTvT%zj-+!ObC+YLjwD9`L~?J zxkpWNbB?d-36sy7IGq*nSGljyMqz6I&o*9cZ6}m4xE&HzneuEwu>Fux-=AxNh1>m% zWl?|S*jZnM{&8cP4vF+^{iM+~cr391?MZnXa_uJ5FuN|bFvji~ooz@Ef4~qW zm&ArBp|VSUo22_Dufl0yq}mXk;HuhWHrAyR+5x%MLiR36D&=j*LP|((tAOP{((1B~ z4)S5(%v0(f16%8bA9$*d$tIkq{53s5UU{<0tC02h#}jkcsuCu&!1A&-J&*S}(`jIs zEobOt6W6s<|5Uozzs^DDA5R-&fB{X|IO5Gox7gUJXV?3%fZji7fR@fkQ?t(<6xp4P ziEtnGRlk!A_JKXar|M;$(l5z|?TA(EQeYC{Yr({*>9l^(0cp1z2J&dT*Ie|DmlRx} zBaotd@Lf7n;BAkFXuH~l(F(pHv@p>Av*zd}MwLl1ujU7ez<$JW!q9}GFDjoQN_VKJ|D??ospPj&HetD0u5yDx4QBQ=Zt|4 zc|d@j4y*h{v;TbI8og=_BC8)ad`~jA$^G&+1u-+Mb_%Ek%_;e-Sz6MIZ|xhL&Q)Nzr5V2W$}##>Vx8%0yX9uf=P{>n>;-2u zs=S&EN@NPmsjvGq$0qZ1OiN*cJE=3G0kr)5!!wnc9K8dYXKmo%$)GeiS!-qD4^lK| ziE`4B4@eDymsuZ6V^R6&MJD5v%b`4`4f=6k{W8}yx-0>^eqzo3t1v!8- z!L8pF8IJP#G?DkCxhgN;?-j%aHKvHs2ds#%Ssgn~Ih~ZKTvuVH`s$>(CW2&$Lc_GE zEcc*DLyNITU%cnrH84~Ar;MB#`?#~;kX0*UqkiH8kEFiVrFAbOrWUb`;8n|QTBr~> z;#9cd48gOBozF%zHg29Urc7pDI?^_e)GMLXe%XF{F0L7 zLmQ>{YF(Z2Expi44T7DhmbG(>%_s7MBBxI1sosRa-MzDZN89g!&-;cMW~4VVt?MN6 z3v(%=JzsU@d<+YFi5P64}4HWj;(YRK8fUq(smYe zlAFCljjQ=BHD*)fX7f&N_@L@!K9D2hJ$#UT6brxFo+Y41>pll9gnN9rDR`g1x7HA| z+k<=A!9qnSwG;myo|ApxF_*>M^Y5v~Kw3MbW2=1RWx@G0rjxdVB8wqLZfXJrHF?mF zWeFVfG}^XZC9KRB`?No#>tw;%Gik@i4rYU#gv(~mjm^`llh= zVlUSp+|Yn5Mi1u|@I>Xes8S!hyjA+_db}tj6K2#?465(O7`L%`Vhe@p($WVeO-I96 zsZykmZ(ozJUwK)&y=&u+K0cpZ$0>ms5ijNfpQ1yefX;MTf5CuV7Rv*ujXve4+L$`) z>0O#QPRAG?;%hgIw0gvzlS+MS9BV&Y@vocOOc8+FTh68`x`V^BvhV22|8!p`rqbPe z*Mn88;lgOx+b#pbo$M<2t4G2KzX$RFHw3F?hJ$@c_|Gt`0ZL(}@JbEWd^z2}b(bJR4LCKy;`u9uN0XKZCUzjIt}KuD>(Z&{-( zeJYTjfl5>&8?=;LjMi@T-lAB_CwM@-`M4gDeC{MeA@UNG%%}3xn~3;Hb7QCLH7Y4i zK6Hk9`lmUWgMZ99-=p6*Ns2to&a7h8xBmx7B5kkal=N|#{9Eak(+x<(x@jgkJj|Z5 zUjr=>R>LX;wV*8VVDYRDeV26pm*usu%)2jJL3+AaJ7bfNR+5ql#*dOTshx+}*(JWB z$G6Q%@g`Uu@g*~qqQQK-V~>Yoz6wZBtIL!sAHrG`e|ix;XZ0D-+Dc}CJRuX~FAA^^ zWni*(&UXm^-Os^mRN=P)IJB1gBP-k_HA%}Vd1f-xiqNC`CC-pEe`3nhMfNK$=2UUj zLXX#XdnXBVim#8C$cko@W1bwiev?_gjgJ@0 zxxbU^V@=Yr&0>8p1+t|&&2<>Hz(=r~RoBLv0yszQp+jH5^ePCxE?h=pxF)VUt;O6X z23JCtB+b_A>IL3^E(R+Cr{_uZ!Cq%%DQB2~@-2GIy#!&DbgH;l`{pk=G!2#KbfKpZ zwPWf3keUxx5iOcCq_gnboir9bE84A$nz^31V0uYbIw6qr!vWIv%h(KQ?4$Yr)=j5k zlKN=%pT|{_bQ`_+C$UgH)`EnX#F{G4Ja2a>>g{-U_XpDSlE7%z*+1U!W|r*3fPT4M zpwJen>6ljji@kXi9!@RXdFSW&GjA!=F^j6Q25hbkztKsi;PF%b+lwJ+VYW^C%Sdiq z)!y9dg_l^97k@Eyme0}TwE)?#_|o~gw)h?e6`36(%9CfG@! zx%*VL?Fe&le(Vpe$`|U`4Nl_9fJeZ0l*>O9mE~I<`|r0K7s;>MXRZ}Le0-4~QmW@W zytLWe&zJdo?^YYUR-W#0q5~zlqS_zm&_;pinEvwZ&jXviM@q$xF&YxcXIDKRZU>}T z&8gG-KM#0Z3inHR%KW``J8D);0lW)EkH4F_;pt7;H%5F-;j`?Nu=GBqAn`4mn%a@T z2TJA0iV=288=mRf=7xRaUv&$ai-^2VFxnZn6E$C6>KxqnlH$6()`tn@hR$m^LRwg# zK>MXaKoFZWl^)5}Mt~rs?r0&6k{T)^)8_GvpmH0d6dj%%=AfvY| z|FmzGb2UCi=Qq<4_g-ARhsU9J2e&JXLGSN|ah<6iF42K*)e~IPsLfxWq#$KvnIRs2kvi)Roj9Y>Ec{$@$KyhPvQ>HW5NIBLpaJ_?vogAGC&A+jO9_!_ zk3idf;WX|g_03*$G>iM8z9tPe)Cv2**}}O$)ReG}=?Uuq1M<@gvuJ7s&3t=JsRjq1 z$Lgo3R^_snLr|@{?ofdxo0O+Wf!m8ZUZ6!EQ_0A`n-M;UlCFA}+f+XHEWKy8<>|Y| zD-Ed#5@0$eb2PBDjLRnKiN#P1t%^%s(>c^+@x6%%C_8o@YdZ-Y{P$UQCu7nd$eq%k*W zfI}T4I+io(ku5E`=c$5B0VM8?PekzyBA}&G7d*go_EC1{p|c#p1Y@9H1bu9p)@Fk3 zP%x5#V<4;82Bh*K<_`XT-Th%;_Q56){GD^)tTJG5=HvEKy=DtLkbgsh7PO&M6cJz3 zD+XQD{~xH*DSzY`&Cu8evTQy_oj>RN3HgoFlZrj*F$4d00Mm4A^T>Ywfc9->#&xa) z6G%AQ-Bty9No@29z3Eu-(IoXZH;on3Fx{JkRBe_Ev38&=akhXO ziND>qFb>i|(G|fgyQZe{)TZ**Zhw+c0RddLm(1NWmGBS4xL6a#c~T-pc&X* z|Al*r!B^ga{?C3m+L-U=W&ZbV%gv|4bL*Quwc!9T($e@e0;BTdYQne=&qr8bn!vpzQA;Gu$BBg% zanK8SlgC(i*yPo9&jkjv@#n{{ERw;VAY~v$<|?-7Sme>9*6%k)6@xA5whgvq?0}G& z3jl8o=z4q{$kv6Mhvd}`N}e7x6te7AV`OStFFp3reJus4i+R#$H|<5xee@8yJp+LEnfdA@Qa(T659s2VQq>5pW5WETT|Oe9)Ry-6cr=dD6<52PmqAXdl#4S6!@(lA{3$|NI)m-)xB0+r5v_1Fk+1%!RpJ zqID;B*hekSIGMT<0c)UZM0+tsy-UaM8?NceE*wo2%^w0R(p|;In%D=j3@6bfXQEi_ zy@-LXn-=khjm#>>@UY7pr_SU!)kD`(*_>e_t&E-gL5<8-VE-*zy249zoeRfvWEmt``Rm{H{_%PF(M*?ZM zE;2)0St!rR84@z_xeI3kSro|zUH534cE^TkAHB;j^9}oR*o&oIINn<7nA4xKLM1Ug z*goePllSC?2C_~bf0~=FWi!X| zX}N#)6MCinmnCOE8cYL}{~SC3TV=?+>>bV**BpeP_u4j5`xbMJx{o8cmu6A1y13^L z#$8JxyiWgYKr(9Rhs$fwC-V+L>b4;yFs^_*jnJoi2E?6@hI8v6{dJkcEmEZTNAk&6 zAADbq@{PX%Hkv`y+2OC!YBY=Enly#E-{{|e-Cpcy)ETaQRLtzxD~wY4%Gk&ti}h~! zb9Xw+?jNtKr@?gB;KQ-lrFwwf(X;I*w@(A?##c(^oz_$-H+C@(xxdD=?HXlc7BQTY z=Eti?GNaOgDbx!u{-}9%#94yPSp4jYQyem&Tn8fjKE`p#)pxjc1MnRG=Ggz;O=)~S zZ#%TMTvcMQ+LbSSWBtJ9n+35vGs%PriurcIl)B8&5udlePRJ|A&xsod>836$0HNA$ zBK5&gX5frjumwL;4-{=o?vwjnq8bYR;LaV*e7ysv=aaENFT46)%GCNi)B=Y{x3}7= zu6#q%A=V(}uWOhZ?Ym6I7{`S-??1Esi!Mii=ts%{gcvGPUQm{wqgrF1zE`b>#C{mK zvhe4lgb&haqX0*wXkgu+Xfyw{MO{AZh!I zdNa-pBc&;{Qf@6vP^3XiI9Hq_(vn7dwW>!56~ z-E_wORRu{wzqT+5jLa1=7eKWqpEutaH9Jft9;qAqFU9}vjC$&t3Rl8@vWKnUqZd`% zI8OLG4M^J|6L?qxWLv0-7Cmme{*IB*ren?kXS2Ev#p8DcbeI_hg^}g6{m(8$+13`g zroE*D$pdLKE(joLr$qm-xdGSNgsX=EexKbYGn~j-O#BRl*~EJdTpMbM`F}Q!auiHg zj_bG`ZwtE~jbdr%wp{6XouNGS>9Q!o^hTPl5O_Bnb#)N)I+d$}g-7N89mA6@8P)T; zT^uni@adOW$AZUJf!F&^#zd#8gI$iV^$(}~S$>H@tFGuvmdG1?nkQ6p{=Y>hvKoP= zh&<;O;n89lL6459DO|ZlhpYT#mIt2n>vNP?1_`A%gqQox>(gxQ|9=+%Jij*Sj{aua z>z>ml?NNPVAvlp#1fAW8+snRZlTF~)u$Il;)0eh0~ zdZ2CWdtw;gWzYN2ge3Y-8KLT^>7m8$CS`@I)N9%^Wt5U-0#2^VJymby&1S63kP)%z zKUBE~W0#V3J}B*Bzvb_!@CL8}TpkyN|IklCD(IwD-RqJXO^w+=dxDkAni)mg{MLqN85 zsyo^fQ?ayPU;VLUFFwgYE5hGs7nv*DveKz3xtNP})$|>_4+a-7Ee3fO?DUr+x^GhA zHVo*r=iGi%g3IEhv$n?gyzklC1M7Vn*DvNbR)wLy`!~49?%1O3FE*xe0c)utO0^IET9U9qxVObxSZY|GGvurShJ z<(hOOv?=B{;}QDc?7}qMUof>Qg=KQn1t`KePzHoU9^VSq`(LS)!-xg7?Mi^k)qDX?dh>LlZj6RN` zH)=W$m^aveErqRU`|f-rkX9*3X~d-rL|+vq0hSQL7PV5j$EjJoy6bFa6FPCU( z@qsGGt9A7nIPU4-lLe5rT{BFu%Dpk$-tM#NdDEGtmQB#p3;629`H?*{()FCTJwlLC zBg-!H(WI&DH6u|Ej`&2H;G!zK8|RX!+Rrevl~0}fqeR!Nxi9Xi>fbQ@yN zpiQ)QlepDRgqJ2@X+g`UvJhKkv`z#^Ps6%#2%O-ozzBWG6Nr~9s1RYEZ&$u24{?9; z1a!r(oU1LS^Npbd(0G?R!;^hmU|>&x%}l?-(J;~cGO_Rg(q7(Xe}w6K_`-8LsYSR@ zd;EbB{#ct$ub|lD1l*s<%;27Lsz$cv(~%vmkTQG#y7tHo*5CUckx{0gYO{Gv%qB3+ zyye~V`pg5XAj}ziGYNDV9qB*L5&^QPY@!_@^qWFI(N?hN70Q8?^3W5dXTDc(KNuF( z%cPa!--rI?>zLomuSab^FU1lYcj_FLfi~`?In9c1D<~eic9EBqXE2{dKl?UJU!Nv5_j> zq8}=?m7-4x2t_@lpaRY@T&v`r7KR*a{=wTTP#<38fl_{uZeTxGA{#xB&9IM~kK5A< zeOw67p(T47M7Zj})|ebL^v^isvhNFe4?p)t#37Dl*GZ~2AAA(#%tlrAWQMO`!gV06 zG5=*9p$AnWsktJWB{}~kSAqQ%Q-i@zreh3EXa)wA+>AgI$3Tc!RUfXisd(dBRcC|~ zDZfI-stD{|)JcxFyUlLDQ|BdjaixOk9hC=)IKH)VC$)CAUL=K0IQ-R%?mP@Q&SM*Z z2c*M|II>?(1ch6t#I9>^|B~ST^W`epTwvd`|KcJezvRF$-~OeksiyzM5NU&blCurr zT1zUM7&cH(_ix(l4mP?N2%ghNv|JiDfc?Tn4|7jcviae6uiz}B`YtPJmV-ph`sPkT zTG8f0m3xXC9pHm!jC95tP=ax+u6J;A{x|nQCP&lAm`~0j`slk{An5GjZ~^16T5W7d z@_qZ2FOz_}RHvyYKjFG9hm(#Hvw*4#~p*~QtBt)m11moU*iCSHk-jgp9)VRw-E`4h_oegzfo^2`S)zAk!XT1el9vl5cI(7`fV; zUFXmQP?GD;p^X@L*%!1tVnAQ`PgU5zHztp3qa`r0bQdi5YU2At_?x`_^~$5+c0 zoVlR@?w)f`&=t2STX_zRQI`8{c(;#_)ioW2RNpOHV zRNBPc(ENo962*7+?xf=lom)8Lmqn(lhvKo4JW_8=?L@OHF~A++Dl3_?KA~-`(Omu` zQl6T4b|<3}6x@gCz>tqQ>zBM0?q)GTZbia-g1pDz-ssPstLoQJTYWm3q;9xprIw;WDHJ;&0Lu-kE%n_)Au>uDkL$*gue;N!#^yr!;xB( zZM*nMm$riuv$FZ4qM7whD$n;(RgXJzfkV{hBLR`JF%#O{fSOX2kqtdE1I&68ZH9Ti zi~GGyo8UAM`7^A59l$M$TOa88H0eeFNgF&M&J4~o82YD;G4BmZr8yXe7-5M#c#EJu zoz=9i|I;0VPGdOYiw*PJdlO(F+U;sGa3)l&5Pr0kkoI=Qq;(D9b3`X=i4-dg7~!8u zbXIR!OYF&iY;9m>?}D9vX};ar{HUSva=0=Yigeq_DvcZjAM}M=$wdvFR!s%Nhlm(O zEc)Y=l=tt3I6|>|30*1*^SmM+N&J#7eAUmS8Gk~s0u!vhei{2R=HutT;(FP#>Ydv; zdG?fZ*?D-$&%g6@Vw^2-+BpA@A<%I(tEd)y1IUSpnbuYQYUrUO9I}C<@O-$1OYHTT zqRHYH%S4rX2G>6+wm1u+zTwhj(`RD*-^0duP4lb(-!S$&co?XyHl1n&@|Sk(Q6c@y zq}3S~d-}eddP5q81>j6U0go}s@(UkuC3hyEnc81zzoMkeTPtH)^8-hdC6J%WaP$YU z8Gq4sC-qN}5=_Eu#u>f$=V1yVTz(z=8y>)@*@NEBi?Qc6pQaNIePw`5s>`!hQba)t8AwbD2xPK8mJ81IY^)PWB!kmi2%mkl>lGgrCcj zLEAmCoB{0K+M$)ZTk_>@!mlLPx-jFW?^4f@u+9=^n(=EvVk@8Wk0q9o-rhr3qZIgO z+|g-6*Ht095so=KkFvurskn7la~;eEj5FFG@+Q^i^Oi>q{|0EJI8xewvb}J_LFIYo zcdu_~pI{*9FXl2wK#a}j>Dk&+Oa59;Cs4~P?V5Y zN^PpS@A`aw)MAFOd02wED`A^E;Orwntgnw*|Mztf(UmXsX2TVDH{jd7S$AXBI8HRO z9)9oz-3N^lc>b2;STD6^Z~2Maprl&(Jvzmj`-F6_YjwoHZG*+rcVux7v1FG+v2Txa z#5)yl0!g^HBV1(0zOiK)oG!doZv5gO4ZYoPR_1IE=!xwRRma~DiLmj(JSymzt~;^JnG-O(PV)Y)KiNX@9-EMDg8(^ajJcOFx0}(9 zj-Yt*SMk#Jnfd2UP(@LtTo3u1x3XA* zkPjHbaN{M9N)o{iX(cfg9A->W=eAnbis>T#o1Y{yRwh8O-%nLFf9ss51Bl2kI;yr? z=_EUmI37lSgA8f##W9hLR$AsDt+ZO%1-`IyYc`=XJmFHZCjO_aM zv8f7ZqA^3RE$Y^}w3*T<`37SBsqVJY)m04c%$4#O2Uz7lJUS&n;M(NsdiRsm)M)1^ zNX{fB+sLW2eX20ZH$B`xbLV}H#{H>~_K39=&DH};*QvWK9-8)>ffS09@K;68baRH85Jvan7ouFD%mQ>{&P`$ZL+)yD09f>)C$4K5!)Uqz<~W-g9yt(rkZLU5m!3# z?2wBREiAVTdC%7nvy+h%e1c>ru5WWGVUN`KsAxncLv_NmTe{(Gl0#S6@GwDjM?!r` z?DMqU-57;As9^#-{jB~kh|%)Y$*KVc394thBYuK0#=*t)l0V~&D^&+BN|pt3h2K${ zp@OZUz$$1_%3V(>ox)T~v!Qy2V|SV@_e`1yciLj~a^9~IE z4q4AVS~CHxLS%!=AO**Q2S|%da`=`^#d&J!h|6my670j8|8~@1EBXO<5>a3gQmsMV z&QfgY{T(KyV>ygWXi)0tlHum(k8pW{l02&@rG<&6Nx!A~49?=JNnULZ&$<}QYq{3< zl4qQ|$|ku;O>mQNg6BIr0T9=~VmK93FllU+O8n3(4cS`VBq$T1wGWmo@itAl4l(}_ zdfv^70t*$GXA>TPL_YU-k!7?~t3K9d=q~|2_SS7D@_rUggxuntmGap)N&h{nqFV zQy4whfaJFy`-CH>`HpHfy}n`ml*JS`JU{zOHg=47N6EASAyfCLK7nog#FT1^0GW)v z5COB1*MMS&3iz^XJ|vnXnf__PD=hNXsO9s(>uFUv344s`{$01ufqRjhl(10x15@n` zY5}X~JK@`@uxJ}vPjT_2t_iFDH^7tvf&?-kl(RHLrGpkbFiSw3U-LJZ?p6JetcGUypmCnfo0*qyx>}2F`(M53Rk& z|F^Q#2~C6sL@j^gcT$DZi4gL}df321<@R^BqRb;@`#eV_AC4G_@>jFVHoen;c&O;K z8%BKv$x=bji{c$@bKkM}vXe6Y0>1CX^F$hR@Uo(USpii7c98CpHPHYr+& zs#dtMbK#~%gT}R>Xnd6LOZL(|G4oG)O5L-Z>BhNt`s-|_oF>)-J%Znb+@qLsWnsPp z-rqF>f|I&oZHjP8k%pfEH#B z{rK)%c3Og;8*Skc1ox=yxw}F=sb5A&TI$C``RH<_YK$zZi-lj)gvDE%rx=3HtRe0|Ca@r~#xp zEv#S^0>`d*!bILfX8t;K@cDWrvKjtC+4H;v#Y)EBKnziY(pC@)i$p6bM^=&K<>_z4 z#=`o;FR#XPYNy`UZ(9eZg8WHr7YI6df>J5_6ml-ud{%VqG zpaX=Z2+}U8@&sV-%F@IFV&wi0j z2hbDEy$s9dtO0X?2i<->Q2)=?{eP{TUt5`~h9K2>xg-3ZVJo;?hntct`3mBoz5>bP z2yiFA3CNMnaX3mpM>rH(QF%JWj{h);l1+nYI8Zm<=<;07s_=@n2^yqSXYQp{c1hT{ zW%c0CFZ1$tu`ly4{9^d0UqU=>win{>WZ&xri!@o(%?X3EOkm!TcMo5fK%PkA4L{|$ z66TzNbzS(@Iu_U$HS)o){aR41P$;XXZb10ZEV}w#uht~o#wn17xbgOxEBR$Et{9Re z9GB?n0C;DH*8XyVsCV>ZT0sau$uW`{w-PM!VH!qkALNBt!UR~cGQzxVnQGkj zZ84?YTNEPfQh#5T*UDmmcXD`92{7!f_{MwXPY~gE5IGw~!W=xB}$n*N;{ptuU zhjMv1kst5s1MCmk;snec3{05GY5sNG2eLLbLl!3E+~Q&xfyrTV$QbfD+KQ=+;l-Db zVoRevX&=gjy-9o>@t?Fb2an&3!$!w*GVl1o7d5l`UZ~F3eQMGVtKxIev0a`UzL1bqqu+A|-l7hjETuSl}eLNwx)pmy<+mTETZZu9 z9%GY}T!<5saKh@H7a>1rkTVA|T}t3GNQw8Va@KHQ z8jiRU<#~VnkbMO-q|&~pS@8L0R`EnL2Iqhf@QiS9FljdCUS>}hpu0~h0@<6*O{(qa zXHQ9Pt?5Jmr1+Dsl9A05FNq%niC`W-g88RcFHX|BvR}J=bUCt-A>O~Bpz&fqjOJ$! zA8(R4kyYrHBMywE0KaK9@P~>{_I&q2ylLV;Wq5ip8{tfJkE&7>3{udUWalU`Lt1co z*``GP@W~H_Q|o-t+7+{W5@DTrM$VQ+X07A9`swW&MQnh&u3+|za)SrPgBoJd`f68fuJCnhNpas+?QwJO-w!~ZaVp|Z$*XX10 zFH+u#(mdU7E{vn@_?HY20uFJz_nSU=CqY4D>2^3!xv;>SUEzU1hR6uzvdpWZy!V&K zP|^5)0ZtDfGEada*Vkk8W_~!)*8diAai`t4u{5zJYLW~pk`}}G4(&(Q*Rh)^MFKhf zu}YG+=1B5U(#+$vP$5BNW38Wo>hh+~3iju~gtFa>0p{E-R<4{QC3_7M=KANvZ|FTw zOuE3&86&Kh67#Mgk$Z*pT@5cTOemUis? zw+aRV{dY%&_&X-2S*R>KY4;qHj(lgme}%~QA|ksHC*v>UWOvJ#g#Kz4SnmbsX@(xv ztQu0GTeMoA+~u?fC91&o<;Kv_5`q8&IK$Y|tPX~;H}l0MUnPU}$vuR4Rtt}ZNLMJ= zVPXLuaPVJ0_<0jBJgG%m6mAwnPNPMNxlZ843S(G{?5lAvvcJh(s`f)Ryzu6NpvI#8 zlAY*lEFVIsg_T3jy@Sn!JUNUP3z2tXEKyPPOz-aAF?iY`73-DU`!*KW3%;4s3~PA5 zcUdqee8JY#v(7%37mYO_EV4Fe=PM3>Jb^Ic_e0rS!P#nsMUeVEVEZ;_M@_U_gVqfy zT@4ip25$_3sPnV|@s26my+?iDQ3Nt@;?DRm63sHoZq+l$UK;kDjlDN9g})oI_<`o? zRxm};i%01MoJ@^vxNsjIE9f_tzoGC$FomV#Zfo_-B7$o<&C`|eM=GrCqP^4eNn;wz zKJ|iE4)0D&^-uw+p$|CQKE$)Q>Mzjre+l65bD%;J#lV){X%c-tX%;$z_#>^AJe)S( zVy2J73Djd$ElDpo&SE^bqi1iijfk^CcO&aR!N4Pakn*>{?T+_E}|vVaVD$R@tje>GFXRG+>>V{d-(hq{x3wY#yuY%bRg5S9!A5p&T32-r=% z2m(@K%m_`>-pzCFg&kX3Ch?^3&xcR@!W*Siy~LU=3>?Iw9*D^5QqJ708Co^+Q14>h0(sx7q#H^^4HWySRm5%v&@J;#i98Y^J@RAeuz{@rhf zx)p40p&b9w@Je&ZDZfFsXbtv%pZ7;eYrV=@?USL`IdwNH7_oqk5#k;hm?GC z!uTDtf=CbAL#ck9!DYz1fHt9&y;2A1!(_r9Z-hjSj3Il=XA_u+W!*glHp(k+5_9rp z)QvbOzja6@*(#LL6<>n^DgP{jFap~JO*SJhANqZN~OkddS83OkC`< zuo(@<5FfJU-?I-J_{9p$DVoDY*?OM`?kO?C>uwZw*?!vv0?x*0ruZIUTklo<}d0cByq) z^0&kMCKu?;$IPMgqIWU2-Qd1=*M1V=g@sbA(FsWz85$~5LRDMxtZI;@J6`%a{Jm?N z12(VJj3lv>uE1D{gM9@VptgK|UZ4J4-q`6yzbvIodCfT|;ELitG~X}T1l^NI=r=zv zs{1tubw51va|6XwU95xmr@1C->w&X#d_Oeo@wn!!Xx(B@Ly;l$5n8Xj_sN-7N><6U z%PpiQ1MgJnyI}I@@(B%v5uI;5ql&r2{{Joj365f)h_uh_42ivf#7u(KgJ3>s!HguD zJg-H)aNLX}k+`^j;wEL8@MGAQ352Ix@U9-=2{*GY)-RziWpEh2)bK&;6g+^BF)4h| zdl8*=(t_oPzhY!dZ16!SG55O|zl>9wFyQH6rC>zj+V@hw@i$>}&9bqY!@Pz6&Foh- z*s&ljF7)T+5h0)nVRzwOoY7@9b;04CkpJJddxEacY-BX>RoZlZyXRH`;6oSrmZWmv z--^duvdPEWi-E=TFBe8U{;(LXlm&ZV{t8ZZM3OB@zAuB>c4HnrhJf`3%@LMgqlf}G zkS?LbT`(|?-xowel5A(TdsyGqF}$m_fePGkmf!4@M>h?$vUe=yW|#CF^~I|N8kF@@ zH1Ve!%?*`_aLPVO=KFN3PCpk%9e1`$Yc5I@F}?Y~fs!tkGJuwRuJ@cqQIH!};`SNx zuUdJw4c~Nh+$?EFMj}NId0+QDqr6YEDHNd;4LI5+9UM^htcKzyM;N6F5Mz8$_g)-M zM9HW}M&aX=)GFK)bBk=a=c z+xC4$!pSacqig;O5Q*Ex9YK&+QaQ@~k_mj4<)=2RkKV`Snh|Y*;4pUBeOv)JGO9~a z_6P1myev}2K5#;C@kvL=WzaVA>jrQ?8CVtc;uMvd=xk!C>8Lzq9mk)pD0jINO;6S! z|1r+EDy6lWyDw`{wb>KJfI$8luqPz8hzp0+=|XASAZ8?Qa{0s_>YI2iea-Krg~5n3 zkGYy??J%Q;`oq%A`4xK*os6K#g37Pp_x;+s1ur(6j*>|hmH7T1e#0V|?{~9~Xzo?$DjUT$Z8yBTpN^)LA_?)iY57PqI7eRWd{rt&t9|*gU%Z3!;(eKNXv4Q1Eknld(EIP0Ga9Yz=4{wcqpQ&wuw z91S6NdRa+?RQe7uynlUH8Vfu4eO&o7oY5~6@_}zjF;b%&p}s>bDVh^04^$REFIMSr zc$szMhw0Ih41G5lsGF)8F;_tO<|JBzM9V38OI?ilETT z^R0VmN2w2}Z!8E=8KQ(H%OLhCuTHG^ z9Gl;4N-IchiJ5E@gFZtRh41$Uv}&uCy$!h5(xIoIKx6r~DiRHJF`_4aqf*YMR-1DC zsd~u^kF#8+*#LjBG1Cl3f!<@;&=Sr@v0wz>B%P7_O$TRb-_qo*qASMLJ*0fv>t11J zZ)Ag;ZW^p`p!-)PWwm@pDJ$xmW4b^eNbMKnjHuk_t#12vsxm7ZRdlkF8X#%^TgMB> zoPKtiJu2?|nm*h|y3ak!miB|Pf$f|myq464j$wnw{%dtPTl#4whf+=lS38=S(-l9R z8&20`sD&XxUvi9C3pK(eptY=`^-JjG~5_&0k4LzU4h$B4(t=*&ZoAtCPu7 zo7bGaC{H0bT2dQlI~vegG}V?)(9zI7^ON_r?9T+(j26gc*ik?yPdM`Q6Bd;6b? zlNZ`qM*UJhslrIN0le;r#r{(j8+gfPooj4N94Lnh5U-6$+6oYKxwXk*>zYJ!nlp4W@_|Qcz40@{Y|FaVksW zREz24yJ}eJ18a=j)^#doWS2KpoxQHyg0u3-_aCoMH;@NR$XAd74Evz-+o@)%Xug&n z7q5m3+9wIs1#_bg7+cs7J&0-#Ctf9;VH| zD}b~3|AwR{(y7Mb9nOnna5AW;|9BPp?GL(9sRdg)&GARHq!vU-siWHG+lzmmeSYV6 zd7sPAv2hbxD}RDcyk(UOpBj@^Mf$8_;Nu36%ma=wBc0H?rB+A@hBtAr9`C5<6qFQSe1Xqz}h4A`w*Jeo#tm-Bj;|TuZ;Rx4LLSR zrYY7fkAZgZ34_`dQN z+F?dMIyXC;8S37WHA18$SeB12te{D_GMyk8q68hDZGRkc)t#_Rax?DMG z351L~oDSL(9qU)WXLDT3f6%@p2mGcy@WhmpZ>1U=9CIQhdU|edZCh>$r9Wf%G~u>8 z*raeAQ5ST?%e$j~F)RtNVYO3}mO%Q<9hXMx{*)lVDSnMLctp-WEIRScm2ve+7})#j zemPFpqexyY$<1bjxu$8J8rK9sU8w_1SPEw4iLN8Z@^Q7t%^%ij>y){%!2slC}# z`QWcUHBe(#l4^}@MWF^|3aTzuF`W4&kAvOgd5C;;#kw}*%d)Y;r){KM&ZqU~p;#e)1|+(mn@t(=B-M-wE(%IT&tCC;`&8yLQXx)e7A^O_9PW>!`klKi;R79B3q&__ zQ4XS2eDD3ncB`@1{NfeX_e)t*f*c;$6`uon+8afu{L|!LLSD08y|O4Q^6LMtnediu z8oo?Dk<+M>O^x@an!{`>IpC18wvpW(oMq|nccFY9Xe2Lgr*>gtacgH?Q9%pOX8?1x z@6jJ=sW-e4cO-c#=JeEdGz6W%sl zBbVeZr^S%gKEo{r| zyGRhuJg?7FEx5Kys2A2a-YN8!BzT%^_#57h)e+D0eAlqM_ak1 zB#Nv;O5Ev~ohwnlvoUzikb28PXqqvhe}Is(mf*v?$AYOBLAD@87CgFE0@tRLj_Al@ zKbP@=->BmeztU`S#f`%sU^Qb+>|G-hOM6BRutPUm3uh9U_$L%bt+2>DHS{1bi1w=Edp=>?SHza zzdQtql$h=r+}P?G80e1R1-!NTqRX9pq#hP~=kEKq3JEgCzTD$9_=Q!!i*q4HFjvh7 zGv_=5{u+q5kGUf3b$8Dju_uIPrMgkFi`m#PAXip@e)&i>Lvw>XXE|3-ue0TEDx5?& z5blb%Os>dxA3L=FGF5$mkA`23vc@?gOs{2W-4fO1RafHpnVu)NYb`WcAR~LIFO(dc zcw)9dEpaU9&=Bq0DrGYy_%_jViueTu8VS6_Uan9_Z?U)>r|r0Pd}oQ>7MhhDnY5+U zPs&BuR!D!*T4s&r52!nw#H(a6i^Q;qmT#P=b_${MGA4C7D?j^k?zd_@NF(D*DgsTA zj_~kBOWc2!Xkps0LZ2nmwKrZdohso;g{vZhz!gjj4wb(;7MfOv@DSAn?FXw~Rb-J` zL-7Dn!->TIc#X;j__*8`X}c+Dzrx8@!(cBJaOoba7mAVi3ib`nJlLfsGC>~S+^9&e z{>*3CBwfk_MQM(A>QXQ}f^V8jxQ3yT>FS5MT!zw>C>-rn{0T40JWY@&6SMrS6#lPr}l3&yn9}) zIb<1`CkwHsoME)0;FTq6Oiqz3Rxn2gFX{B>&&KunsdiQ*HW6a~te4t+=QdF z%SQVKCmwBi5~xBFjKaH&fILMEUS$amhdeOEvx8w=`@V^HsVlGTQxVEpqNZIV*-rM5 zx4y;YQ<+l6iiK4&)_ZGkgVuoTr>quu<&J}h8z^%2fvW!%1k z-lV=C`c_4qqp0E3eNB(^!5Cxy_uR3q1o$mz!pHk;6mc69$DDmSODBT1Q$23s{qIp< z5#zZzE+~v&ot}pp&v~HKjX7WToO`FF3!liwY#WL+))2Q^zQAO1@U!!%5hwgft?;iF z`E^tfm%vNiCY}R<)`a)qn%DuY?t`yrs$ddDY6ZRq?yMA+eM;R+7PmkS^3dH_4X65O zO}opyOlZuebnuUYtcfgq4RmjtCs*&RmydD*8N1z|sP4nhTvi%A)T_5#e$})~Xe7Iu zzfo(#?XvOgkqepm{!9qvz7yBZ#LKvYx*Om>HWh@uZ!%Ko8V-gjEbv9w()S4b<3{pN zZCl{sZxSeVRnX+%s(C=vH7^zdq%gP6S4z>@3E z0dE(aX|IG=%Y@O9R++NFbOQI;Ud=J(I~lU0v{x?iVZ3(WxF=h&RSe1{b0<&6Mee8i z#wF>?Vy1_KHO+pJ=xa;JtJBI4Kc6^&#M-=NVu2{3)h#K3tt;A?KHeTN(zM>0)GICY zI8&P~9A^~n!TgsVOs;Ol!B-ZT@EKXQ-8EGH#wo&wrM$r1Sa)CNZc_**#UM@RpkU5l z<4;k+Wp!5}Dhk1MS%(_iBeJg(j`2Ea%hp>UqDJSLi85}oFX{<2L8QfE^@=|zT_nI+ zTn-w;1-s$7emJmP%*OIpsqHS`bsl{>9X=~hK7Y~ZWB=2ip=o97wGbc|O=@P*h9}D) z>IJ}4TLnE4g;@{L@Dy~;kDQ;2ro#CD5-&dX<@QpN=Up2RYK@Wz`D#Z004zPT1>3nt zkk71x_}CB8@Ljx+8H8pO-Rp2;3J5sJC?KKrr&DJTM~*@*fgN|2^f2;lPmP&$}r>%B6E zjn-?<+9yZ2apd%OQTg5RZ}tu^?Qb;-UTv$cpnk9fXd`s)0(T1bRsct*L4L&VcZ9b` z^7vY*c1MS!0abfO^(o@1Ly`ziLZ2YGA{idXYB=(&9yZ!?dV(f zj8~8H_?LlEqqiJ|M(``=*wyG?GbD{p8hCIOO5s5WMWJ9!1Z3pGd$HnsgqHK?maG!S z!)#{^!anv``BSB6c`I84drfT(EfeY1>6`QTtK(W05+zFWX-a>I)|L0ly9@W=_clv~ zKHbjD+b3PUO~Zbo^xA*eboF+kQxg1rO&z;~Jtco>8ucF>!f%!ZyDdD?U)NVLZY!JO zt^L8|csNOY3jR*BTR}CrKn?|sR6O_%DKt;7M|tvJ<)xgeGdh`f-j{o7>by`xSJ;}q zp8!|Puf^@(j4TJ7On%tU9j8?HBYx~&tWM~^=)^i`HP&&J7#%MiNHpH04VtTD39^7k z?dF9lYV)uH%S`Q*^rXi0(t0?`YG1^b!!gyQB;QMiB3q=z*;Hujx~l!KS6W?w{;b+a zLudeVNXhs4(&w-njdfyE7F2GR2?iilKl~r1^i1H{3+3`ps59>)Bccx5pC)|!ZT3*z zgTik^r$b7G6rS4@oL@Ay!g`c7=VO&s0WYR(lz<(j6;%P8NprOxNkBn_6BJt;}Z@b zXtfHF)$inc7ULRnP&Hi+@*_fx{87T(b?b^X`1#u2urE4sS^K3piw?i9m8If@ZR#1J z(>4~rL?rGJTYP&;PlO&CIy#Z0!^lgAYzA>BTAD3rXZ+Xp7Tn>VchA)J7_?O*CGN=9 zr1Gwz%|b@O<(PzU`%Q?7JxKw5a^9Q={|1h*WTNU2^lgvBc^p$o?~ih!*97F9%qEUZ z!^_xO$y zGpeQa@U81*$Z+<}FO!ZX}1uC$4@>2lR?l;<>O+aEc70gme` zTRAgjM%*=Omp|5P&SwN=zn$}8f5L64vhGA8dM)XBNwKv-$SWK!5lab=t3pd$Q!}V*pLu z#Jfuz81{ugtm~&2#yXkRpeQorDY5VL-OeuETJL8m@oRq4d{4DUF+$^TZIiG5d ziAh>PIumb`S{W8Xr2`$bjDM_6mjJGc<+70~H!o`cNWM7O&cH>Bp}Z?^4m4^xl!?L{4KD7>UL_&ix*#j^e2SuJH> z(*f5!Md=66>b^eZUPeSCRE(exV$R%JuHhBHlN#&~LmwU1wzxK%oABtRjp@_@IZX&BCfYHAEK9O=G)Xt$}uBOyc%*$R}Lpz>P@QI4-_Nvc6ykvkLjW zuZeVAow!c3_-?Di*n{jOIpUORM{0=6H6+}&;||ZmV5?6)g@{+<9vyIF`526BUp58j z*uJIS(UeU47>Fb8+Uvz$4o4S72TiQI0*V5gHKAW>JzDbF7)PsBtfJp)k`QeVEBuZW!}IBlHrw+LIGz6HZcH>c;2b$!1$ zP>>Npos!d~a4Gy~C0G_4sAti(w?u2_pUT&|L`!@0>vNi{`AzC~bH=-%jVTztc5{rq ztyFl-d>H%~A(mY(m{)lS0YdF!Z?Cc9mb+hbTq2o_rX$m#>)A^_pr(&EET*V@X81I8 z!-ij|YKD}-t`u7+i=mpGT^=Tu_U@hlbxfHroAZ}6ZGG;RPAO@;(T6tyeK-I9!-Mlkwy<*u$qK-AylPsZ#Kjvi&i>{)_Z*)YTH zI1HI&9*MrJHavAXHCN0Mj+27|I55Mf z`8usRiI%Cq9;txRDN&I=HBevRJVhf-?VYLyb z9w_mZow03B>|voSpa1{_%F1%mx(hd?#?iMt(54$Z!<_%_D;UmnRQhfCg^H<~-xwKO zT*>>)ZB5?L8pC?QUZv$n$YGB?2is>WFaO0FQ-KTcJ_(A6h_0CbkPPMo!%PZ*fDny} zFh+alw+EBOQgUzcXz{rX27X_y`)d|mOisI}I#>?7Ir1NfHN0zyke3r^7X_XA?M%Qa zsz{7=#8GK?SVK{&q=m}S##Hq_hcT`czk^wJn{8?85yZDy==8L8s9Z@rI}0J{~KUp`zobb-)mI}`;>u|n=EU{LJ2Aw8Gcas``bM$Y&~OS znimrPR<{mNleLi@s~6!IxKQ-uCoQ<`ib%q@kUo_3o1g!>xb(93T8j-%=hN@7 z7LlIjdb1%Nc&Q3kmwLeSr(SZ*33CynI>`{ykbRLn->~=0xBU7yk_7X<+AAGRr0*Op z`kt3!Vsu|3H>}whcw1FRsSBRCTsH13Xfk=4M~XCeSJ00~#DOfj3;pwS;>i8)2fx_} zw;YJ5)_JKA)>bY^A~S0_&nZL5>jwQ?D)TIqTl5?fPmz(gtj)bGqcqu;1)bFUf8kdp zfA^{~zPUfz<0O=7vtmSR>V zZa$Q7%B?TL#h!eVUrl*Tz|0+Cok4*nWaFzjo}U^XX*ugn&#))2-|wt_uT99|z4=c6 zs12vvbp&uMLa%ul3OX+Z`$EKiDA)AW#3|!%ZmNx+V4`lfy)rv!hJ-HH3|9sPPI8?v zSq=VDcrX6`YEenn6hoQ7X|Xoj@Z9XOIkL$TePAVMkNRKJxYOOL!HY3U$v(8ts&XM( z{^`@WS%A`_9R?Myo1)Q0DLuKO*o-$XIMnGNVEMZY6?B%4ATbT3P^gK3B~Fm*atavE z@G8+m+V86PIbU~3d~zxnX#9}8L#-x3gLK5*LDMn^pRv#&>Wg0LGxuPvqch&?LYyMt zn298oq=HR$1hB_PL8AKy`y}1`(lP<5vSOq==kHX(Qu-S zIwqEBuS{c zC>5Cpb7BH>q%_;*_cUd30kS$I+5-byvMv_kWl@B*XPUhU9?zYP>I^PU_AkD&FXtPh zhu%sUKCSGCTTM|^jo48;GmG}HmL=z-%?*wNA4f(lD}Vc&QP_(0*^B4~=rXdNSWOW_ z$r5njc=T>j$9Kmy$?La=DYaFXNiDI`ozYwG7;i){Wx^nhDpJ|Q3wN(zbI0Fum&Cr; z7WZ^N5C0bdYi{U z%6YCIY4XSaxV8h-k;W$ZQbhc?<_rUL z812nsXY&9(QEpe}27;j%KWniJu-=JzLq-L0}m$f$3AU|4f)Iv2hgC4IBZ#x~%=Im)M>$-W+dX!k^9 z2|3iC9%nQeQ0OT?RMOKwsXm*Gu2})~3-Em=eoc8hEgt2pcLgt4{DgFrAGbb9GQigj zOJfk%k6e{zBrI%YoIz<`vVIkS1TFpH-LPvRb4Yt|FByA%i433=-J)i1x-llw&E_g^ z3fg224F^#4rC6p!V#r1h^`a{vV8;#-AAon<+R_MjEx*~L2MHJL%u0@qMSc!5E-jlx zB%$d%)uVp;!g!YS0I^xLsp)@8r(_vRLO>s{4a-H1O!7Y);H|NEEawBC(cRyIM+Iy` zyAcMalpH5a5-hxNRl%URLp|e=$ALEsMMWps;=+1?!zIdqsLCi7YPcr@YUOpDV5o1n z0m?@}T`MTZ9Q%1i152TBgLq#sjK7#WOwy;?4r-&u4dy$b8}|BxF+14DLx_3N2x;8y z9m5!{Ei)&q`zIRmtyKHP49DVk(Mkz`n`Gv6W9V|)xex}mDjxB6XwbvJq5gEUh4SO_uGhw@EEUnw{B8*nmMeoL9bI&g!Wk=oZ15EhheB-GsCyZ+8d zwhspCcWUmG;yl{3cEL%v2!PPGMF|7IkM}DOw!{GkB4yI{i^RH+=CdY9Zi}GRDp4G| z`wQNhlG?bc#a)#74KEK_k5Sb54acUNBVZ;!%jKW@I-6@cfbV&?$)=&3Vzg4kA@D(I zGuR+$|L*6S6obU_Y+^P+EXyV3qreWOgnnNlVhG7Oq22iUl?hvtfPa>!AFpY-Nn*(M zasjTWV~PRn!ka||w|~hoP})N1w|&<51d{u8X@}QpIGchIEYz9F(jkzExn|STPb>8A z;MBkl1sp0`OGW>xL$|TU;|o*lilpi4J<`=~4L{2tzrdgU<##7Ih^VUIgxE358~(KL zFdHDB?N>x&*%<3lr5nubA9j^tO?jp)-D%9;9ph0&qNUO@IEM-Sor0Y)ip77LxONk(D9tXjA__UQpS0V&3^$uk zn^-6%js0;?m?d5#z_0Cj+JJMJcBH@6$j}IY8`V9jI6DG(nvZB&BL*Z2qpfb82wY|L zyB;KsAC6^C7Rj*s2hi!AItruzw{-Ii1z)}1&WJ4otTjvgZvN)|zu*{~V!s8(%ru4e zJKM2P)0T>$m9-LquY1)hp}e>AFsz)|^fUa#Undi?;VR(<#n|lrZ}+9-P-6Dl|pai^F)8_+`%#D^(g zn%*BSE$0Q<@yGCmu#MCe zz*Oa~u!*<^+ET%8w~r*_VRD~&1%K~6?#i_X#_S=10O84dTtctC6)lw6k@Ocumr7?6r`SQV4JfG zR*3KW&+WXg^9$rfO>U@koP2$f5wlU{6bJSHLVP1DBZU}%4O8~j`Wo>Hfi5wn67WO9 z2l(;bs(NN)0(Jbe)E>|gI5&l1GnaS}0 literal 0 HcmV?d00001 From 941173dbf4bb27549cf570bcbdb9f8c95a8185f3 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Feb 2018 17:25:41 -0500 Subject: [PATCH 105/493] Added book entry for the Burning Furnace array. --- .../AlchemyArrayEffectFurnaceFuel.java | 2 +- .../compat/guideapi/book/CategoryAlchemy.java | 43 ++++++++++++++----- .../assets/bloodmagicguide/lang/en_US.lang | 2 + 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java index 29706cef..145b6143 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java @@ -20,7 +20,7 @@ import WayofTime.bloodmagic.util.PleaseStopUsingMe; public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { static double radius = 10; - static int burnTicksAdded = 201; //Set to +1 more than it needs to be due to a hacky method - basically done so that the array doesn't double dip your health if you only add one item. + static int burnTicksAdded = 401; //Set to +1 more than it needs to be due to a hacky method - basically done so that the array doesn't double dip your health if you only add one item. public AlchemyArrayEffectFurnaceFuel(String key) { diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index fcde6142..9eb03a5b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -22,8 +22,10 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class CategoryAlchemy { - public static Map buildCategory() { +public class CategoryAlchemy +{ + public static Map buildCategory() + { Map entries = new LinkedHashMap(); String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy."; @@ -34,16 +36,28 @@ public class CategoryAlchemy { List ashPages = new ArrayList(); TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); - if (ashRecipe != null) { + if (ashRecipe != null) + { ashPages.add(new PageTartaricForgeRecipe(ashRecipe)); } ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); + List furnacePages = new ArrayList(); + + PageAlchemyArray furnaceRecipePage = BookUtils.getAlchemyPage("furnace"); + if (furnaceRecipePage != null) + { + furnacePages.add(furnaceRecipePage); + } + furnacePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "furnace" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "furnace"), new EntryText(furnacePages, TextHelper.localize(keyBase + "furnace"), true)); + List speedPages = new ArrayList(); PageAlchemyArray speedRecipePage = BookUtils.getAlchemyPage("movement"); - if (speedRecipePage != null) { + if (speedRecipePage != null) + { speedPages.add(speedRecipePage); } speedPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "speed" + ".info"), 370)); @@ -52,7 +66,8 @@ public class CategoryAlchemy { List updraftPages = new ArrayList(); PageAlchemyArray updraftRecipePage = BookUtils.getAlchemyPage("updraft"); - if (updraftRecipePage != null) { + if (updraftRecipePage != null) + { updraftPages.add(updraftRecipePage); } updraftPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "updraft" + ".info"), 370)); @@ -61,7 +76,8 @@ public class CategoryAlchemy { List turretPages = new ArrayList(); PageAlchemyArray turretRecipePage = BookUtils.getAlchemyPage("skeletonTurret"); - if (turretRecipePage != null) { + if (turretRecipePage != null) + { turretPages.add(turretRecipePage); } turretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "turret" + ".info"), 370)); @@ -70,7 +86,8 @@ public class CategoryAlchemy { List bouncePages = new ArrayList(); PageAlchemyArray bounceRecipePage = BookUtils.getAlchemyPage("bounce"); - if (bounceRecipePage != null) { + if (bounceRecipePage != null) + { bouncePages.add(bounceRecipePage); } bouncePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bounce" + ".info"), 370)); @@ -84,15 +101,19 @@ public class CategoryAlchemy { List fastMinerPages = new ArrayList(); PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner"); - if (fastMinerRecipePage != null) { + if (fastMinerRecipePage != null) + { fastMinerPages.add(fastMinerRecipePage); } fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { + for (Entry entry : entries.entrySet()) + { + for (IPage page : entry.getValue().pageList) + { + if (page instanceof PageText) + { ((PageText) page).setUnicodeFlag(true); } } diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index 75787652..1ba63f89 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -243,6 +243,7 @@ guide.bloodmagic.entry.alchemy.bounce=Bouncing Array guide.bloodmagic.entry.alchemy.turret=Skeleton Turret Array guide.bloodmagic.entry.alchemy.buff=Buff Arrays guide.bloodmagic.entry.alchemy.fastMiner=Fast Miner Array +guide.bloodmagic.entry.alchemy.furnace=Burning Furnace Array @@ -256,3 +257,4 @@ guide.bloodmagic.entry.alchemy.bounce.info=By using a source of heat near its ce guide.bloodmagic.entry.alchemy.turret.info=By utilizing the Demon Will that is still controlling a mob, you can take over the mind of a skeleton in order to make it do your bidding. If a skeleton finds itself inside of the area of this array, it will act as a sentry and attack hostile monsters nearby. Unfortunately this array is still highly experimental, so it may not work very well or consistently. guide.bloodmagic.entry.alchemy.buff.info=Through rigorous study, you realize that alchemical arrays have a wide range of applications. So far, you have managed to create powerful items through crafting arrays, as well as a couple of arrays that provide functional benefits such as rapid movement and weak forms of teleportation. However, one of the uses that you have yet to tap into is providing powerful buffs through an active array.\n\t"Buff Arrays" are the general term for alchemy arrays that provide some buff to players within its area of effect. These areas of effect tends to have a very large radius which cannot be manipulated (unlike Rituals). However, because alchemy arrays have no concept of a Soul Network, they have to power their effects through other means: mainly through direct blood offerings. In simplified terms, this means that whenever the array will apply a buff, it will damage (take HP) from the player that it is cast on. \n\tBecause of the direct nature of these sacrifices, the HP -> buff conversion is a lot more favourable for players in the early game compared to similar buffs in the mod. For instance, if a buff from a sigil cost 100 LP for 10 seconds of activation, a more powerful buff can be applied by the array for 30 seconds for 1 HP (which is 100 LP in a T1 altar with no runes). This can be seen as a lot more efficient in the early tiers, while during the later tiers it is not as efficient of an effect. However, because of the stationary nature of the arrays, they will tend to provide a stronger effect than their sigil counter parts, so people may wish to still use it in the late-game. guide.bloodmagic.entry.alchemy.fastMiner.info=When tasked with carving out a large area of land, sometimes it is best to just do it by hand. For those occasions, this array is for you. The array applies a Haste III buff to players within a 10 block radius, costing the user 1 HP per 30 seconds. Because it is a general Haste buff, it will also increase your attack speed while in its area of effect, though you will have to be careful since other players will benefit from this too! +guide.bloodmagic.entry.alchemy.furnace.info=One of the many problems that you may encounter in the beginning of your adventure is the inability to keep your furnace lit. A lit furnace can mean the difference between having a full stomach and strong weapons or starving in a cave. \n\tThe Burning Furnace array, as the name implies, will provide a much needed heat source for any nearby furnace. By placing the array directly adjacent to a vanilla furnace (it can be next to multiple), it will provide fuel to the furnace if an operation is able to be completed - nothing will happen if it is next to an empty or a full furnace, mainly for your protection. \n\tThis does not come for free, however: when a person is nearby (within a 10 block radius), it will take away half a heart of health in order to cook up to two things in the furnace. This will be helpful to either get a quick bite or to smelt a full stack of ore, but unfortunately you haven't found a way to add any safety measures to the array... From 2a43e5384279b5a38b8b392b548dc094e3a54316 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 27 Feb 2018 16:59:51 -0800 Subject: [PATCH 106/493] Rewrite IBindable to provide an object instead of storing 2 strings --- .../bloodmagic/altar/BloodAltar.java | 22 ++- .../bloodmagic/block/BlockAltar.java | 8 +- .../block/BlockRitualController.java | 3 +- .../client/gui/GuiItemRoutingNode.java | 2 +- .../command/sub/SubCommandBind.java | 18 ++- .../DataProviderRitualController.java | 2 +- .../bloodmagic/core/RegistrarBloodMagic.java | 25 ++-- .../bloodmagic/core/data/Binding.java | 71 ++++++++++ .../bloodmagic/core/data/SoulNetwork.java | 3 +- .../bloodmagic/event/ItemBindEvent.java | 19 ++- .../bloodmagic/event/RitualEvent.java | 26 ++-- .../bloodmagic/event/SoulNetworkEvent.java | 21 +-- .../bloodmagic/iface/IActivatable.java | 21 ++- .../WayofTime/bloodmagic/iface/IBindable.java | 27 ++-- .../item/ItemActivationCrystal.java | 8 +- .../bloodmagic/item/ItemBindableBase.java | 8 +- .../bloodmagic/item/ItemBloodOrb.java | 18 +-- .../bloodmagic/item/ItemBoundSword.java | 49 +------ .../bloodmagic/item/ItemBoundTool.java | 49 +------ .../bloodmagic/item/ItemInscriptionTool.java | 8 +- .../bloodmagic/item/ItemLavaCrystal.java | 30 ++-- .../bloodmagic/item/ItemSigilToggleable.java | 11 +- .../item/ItemTelepositionFocus.java | 5 +- .../bloodmagic/item/sigil/ItemSigilAir.java | 2 +- .../bloodmagic/item/sigil/ItemSigilBase.java | 7 +- .../item/sigil/ItemSigilBloodLight.java | 6 +- .../item/sigil/ItemSigilDivination.java | 17 ++- .../item/sigil/ItemSigilHolding.java | 5 +- .../bloodmagic/item/sigil/ItemSigilLava.java | 4 +- .../item/sigil/ItemSigilTeleposition.java | 2 +- .../item/sigil/ItemSigilToggleableBase.java | 8 +- .../item/sigil/ItemSigilTransposition.java | 2 +- .../bloodmagic/item/sigil/ItemSigilVoid.java | 6 +- .../bloodmagic/item/sigil/ItemSigilWater.java | 2 +- .../WayofTime/bloodmagic/orb/BloodOrb.java | 9 +- .../bloodmagic/ritual/RitualExpulsion.java | 38 +++-- .../bloodmagic/ritual/RitualPortal.java | 5 +- .../ritual/data/IMasterRitualStone.java | 3 +- .../bloodmagic/ritual/data/Ritual.java | 7 +- .../bloodmagic/ritual/portal/Teleports.java | 26 ++-- .../bloodmagic/teleport/Teleport.java | 20 +-- .../tile/TileMasterRitualStone.java | 37 +++-- .../bloodmagic/tile/TileTeleposer.java | 27 ++-- .../util/handler/event/GenericHandler.java | 29 ++-- .../util/helper/BindableHelper.java | 130 ++---------------- .../bloodmagic/util/helper/NetworkHelper.java | 32 +++-- .../bloodmagic/util/helper/PlayerHelper.java | 48 +------ 47 files changed, 416 insertions(+), 510 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/core/data/Binding.java diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 9d1272ca..2da8895d 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -4,6 +4,8 @@ import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.block.enums.BloodRuneType; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.IBloodRune; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.orb.BloodOrb; @@ -329,27 +331,21 @@ public class BloodAltar implements IFluidHandler { } } } else { - ItemStack returnedItem = tileAltar.getStackInSlot(0); + ItemStack contained = tileAltar.getStackInSlot(0); - if (returnedItem.isEmpty() || !(returnedItem.getItem() instanceof IBloodOrb)) + if (contained.isEmpty() || !(contained.getItem() instanceof IBloodOrb) || !(contained.getItem() instanceof IBindable)) return; - IBloodOrb item = (IBloodOrb) (returnedItem.getItem()); - NBTTagCompound itemTag = returnedItem.getTagCompound(); + BloodOrb orb = ((IBloodOrb) contained.getItem()).getOrb(contained); + Binding binding = ((IBindable) contained.getItem()).getBinding(contained); - if (itemTag == null) - return; - - String ownerUUID = itemTag.getString(Constants.NBT.OWNER_UUID); - - if (Strings.isNullOrEmpty(ownerUUID)) + if (binding == null || orb == null) return; if (fluid != null && fluid.amount >= 1) { - int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); + int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); - BloodOrb orb = item.getOrb(returnedItem); - int drain = orb == null ? 0 : NetworkHelper.getSoulNetwork(ownerUUID).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); + int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 7a63b22d..7f9d2236 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.altar.BloodAltar; import WayofTime.bloodmagic.altar.EnumAltarComponent; import WayofTime.bloodmagic.altar.IAltarManipulator; import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.IDocumentedBlock; @@ -15,7 +16,6 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; -import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -68,9 +68,9 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl if (world.getBlockState(pos.down()).getBlock() instanceof BlockDecorative) { if (orbStack.getItem() instanceof IBloodOrb && orbStack.getItem() instanceof IBindable) { BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); - IBindable bindable = (IBindable) orbStack.getItem(); - if (orb != null && !Strings.isNullOrEmpty(bindable.getOwnerUUID(orbStack))) { - SoulNetwork soulNetwork = NetworkHelper.getSoulNetwork(bindable.getOwnerUUID(orbStack)); + Binding binding = ((IBindable) orbStack.getItem()).getBinding(orbStack); + if (orb != null && binding != null) { + SoulNetwork soulNetwork = NetworkHelper.getSoulNetwork(binding); int maxEssence = orb.getCapacity(); int currentEssence = soulNetwork.getCurrentEssence(); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 4b4c1b61..2824b6f0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -50,8 +50,7 @@ public class BlockRitualController extends BlockEnum imple if (state.getValue(getProperty()) != EnumRitualController.IMPERFECT && tile instanceof TileMasterRitualStone) { if (heldItem.getItem() == RegistrarBloodMagicItems.ACTIVATION_CRYSTAL) { - IBindable bindable = (IBindable) heldItem.getItem(); - if (Strings.isNullOrEmpty(bindable.getOwnerName(heldItem))) + if (((IBindable) heldItem.getItem()).getBinding(heldItem) == null) return false; String key = RitualHelper.getValidRitual(world, pos); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 564494e6..ffba0f12 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -197,7 +197,7 @@ public class GuiItemRoutingNode extends GuiContainer { // { // if (slotInd == 0) // { -// this.nameField.setText(stack == null ? "" : stack.getDisplayName()); +// this.nameField.setText(stack == null ? "" : stack.getOwnerName()); // this.nameField.setEnabled(stack != null); // // if (stack != null) diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index f01b70ee..7548e3ec 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.command.sub; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.helper.BindableHelper; @@ -38,8 +39,6 @@ public class SubCommandBind extends CommandBase { try { EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender); - String playerName = player.getName(); - String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); ItemStack held = player.getHeldItemMainhand(); boolean bind = true; @@ -53,21 +52,20 @@ public class SubCommandBind extends CommandBase { bind = Boolean.parseBoolean(args[0]); if (args.length > 2) - playerName = args[1]; + player = CommandBase.getPlayer(server, commandSender, args[1]); } else { - playerName = args[0]; - uuid = PlayerHelper.getUUIDFromPlayer(CommandBase.getPlayer(server, commandSender, playerName)).toString(); + player = CommandBase.getPlayer(server, commandSender, args[0]); } } if (bind) { - BindableHelper.setItemOwnerName(held, playerName); - BindableHelper.setItemOwnerUUID(held, uuid); + Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); + BindableHelper.applyBinding(held, binding); commandSender.sendMessage(new TextComponentTranslation("commands.bind.success")); } else { - if (!Strings.isNullOrEmpty(((IBindable) held.getItem()).getOwnerUUID(held))) { - held.getTagCompound().removeTag(Constants.NBT.OWNER_UUID); - held.getTagCompound().removeTag(Constants.NBT.OWNER_NAME); + Binding binding = ((IBindable) held.getItem()).getBinding(held); + if (binding != null) { + held.getTagCompound().removeTag("binding"); commandSender.sendMessage(new TextComponentTranslation("commands.bind.remove.success")); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 5f5ac41a..f246bc48 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -63,7 +63,7 @@ public class DataProviderRitualController implements IWailaDataProvider { if (mrs.getCurrentRitual() != null) { tag.setString("ritual", mrs.getCurrentRitual().getUnlocalizedName()); tag.setBoolean("active", mrs.isActive()); - if (!Strings.isNullOrEmpty(mrs.getOwner())) + if (mrs.getOwner() != null) tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); tag.setBoolean("enabled", RitualRegistry.ritualEnabled(mrs.getCurrentRitual())); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 992bb9a1..c23234a9 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -30,18 +30,19 @@ import net.minecraftforge.registries.RegistryBuilder; @GameRegistry.ObjectHolder(BloodMagic.MODID) public class RegistrarBloodMagic { + private static final BloodOrb ORB_DEF = new BloodOrb("", 0, 0, 0); @GameRegistry.ObjectHolder("weak") - public static final BloodOrb ORB_WEAK = new BloodOrb("", 0, 0); + public static final BloodOrb ORB_WEAK = ORB_DEF; @GameRegistry.ObjectHolder("apprentice") - public static final BloodOrb ORB_APPRENTICE = new BloodOrb("", 0, 0); + public static final BloodOrb ORB_APPRENTICE = ORB_DEF; @GameRegistry.ObjectHolder("magician") - public static final BloodOrb ORB_MAGICIAN = new BloodOrb("", 0, 0); + public static final BloodOrb ORB_MAGICIAN = ORB_DEF; @GameRegistry.ObjectHolder("master") - public static final BloodOrb ORB_MASTER = new BloodOrb("", 0, 0); + public static final BloodOrb ORB_MASTER = ORB_DEF; @GameRegistry.ObjectHolder("archmage") - public static final BloodOrb ORB_ARCHMAGE = new BloodOrb("", 0, 0); + public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; @GameRegistry.ObjectHolder("transcendent") - public static final BloodOrb ORB_TRANSCENDENT = new BloodOrb("", 0, 0); + public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; public static final Potion BOOST = MobEffects.HASTE; public static final Potion WHIRLWIND = MobEffects.HASTE; @@ -62,12 +63,12 @@ public class RegistrarBloodMagic { public static void registerBloodOrbs(RegistryEvent.Register event) { ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName(); event.getRegistry().registerAll( - new BloodOrb("weak", 1, 5000).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), - new BloodOrb("apprentice", 2, 25000).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"), - new BloodOrb("magician", 3, 150000).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), - new BloodOrb("master", 4, 1000000).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), - new BloodOrb("archmage", 5, 10000000).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), - new BloodOrb("transcendent", 6, 30000000).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") + new BloodOrb("weak", 1, 5000, 2).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), + new BloodOrb("apprentice", 2, 25000, 5).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"), + new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), + new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), + new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), + new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java new file mode 100644 index 00000000..e8182e9a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -0,0 +1,71 @@ +package WayofTime.bloodmagic.core.data; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraftforge.common.util.INBTSerializable; + +import javax.annotation.Nullable; +import java.util.UUID; + +public class Binding implements INBTSerializable { + + private UUID uuid; + private String name; + + public Binding(UUID uuid, String name) { + this.uuid = uuid; + this.name = name; + } + + private Binding() { + // No-op + } + + @Override + public NBTTagCompound serializeNBT() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setTag("id", NBTUtil.createUUIDTag(uuid)); + tag.setString("name", name); + return tag; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) { + this.uuid = NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")); + this.name = nbt.getString("name"); + } + + public UUID getOwnerId() { + return uuid; + } + + public Binding setOwnerId(UUID uuid) { + this.uuid = uuid; + return this; + } + + public String getOwnerName() { + return name; + } + + public Binding setOwnerName(String name) { + this.name = name; + return this; + } + + @Nullable + public static Binding fromStack(ItemStack stack) { + if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. + return null; + + NBTBase bindingTag = stack.getTagCompound().getTag("binding"); + if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. + return null; + + Binding binding = new Binding(); + binding.deserializeNBT((NBTTagCompound) bindingTag); + return binding; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index acc83e58..a9ec1ff2 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.core.data; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.event.AddToNetworkEvent; @@ -74,7 +73,7 @@ public class SoulNetwork implements INBTSerializable { return false; if (!Strings.isNullOrEmpty(playerId.toString())) { - SoulNetworkEvent.ItemDrainNetworkEvent event = new SoulNetworkEvent.ItemDrainNetworkEvent(user, playerId.toString(), null, toSyphon); + SoulNetworkEvent.ItemDrainNetworkEvent event = new SoulNetworkEvent.ItemDrainNetworkEvent(user, playerId, null, toSyphon); if (MinecraftForge.EVENT_BUS.post(event)) return false; diff --git a/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java index 7f7e7bf4..e5cf73c5 100644 --- a/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java @@ -7,24 +7,29 @@ import net.minecraftforge.fml.common.eventhandler.Event; @Cancelable public class ItemBindEvent extends Event { - public final EntityPlayer player; - public String key; - public ItemStack itemStack; + + private final EntityPlayer player; + private final ItemStack itemStack; /** * This event is called whenever a player attempts to bind a * {@link WayofTime.bloodmagic.iface.IBindable} item. * * @param player The player doing the binding - * @param key The UUID of the player doing the binding * @param itemStack The {@link ItemStack} that the player is binding *

* This event is {@link Cancelable}.
*/ - public ItemBindEvent(EntityPlayer player, String key, ItemStack itemStack) { - super(); + public ItemBindEvent(EntityPlayer player, ItemStack itemStack) { this.player = player; - this.key = key; this.itemStack = itemStack; } + + public EntityPlayer getNewOwner() { + return player; + } + + public ItemStack getBindingStack() { + return itemStack; + } } diff --git a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java index d65da6a4..bf69e5b7 100644 --- a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java @@ -10,14 +10,16 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.UUID; + public class RitualEvent extends Event { public final IMasterRitualStone mrs; - public final String ownerName; + public final UUID ownerId; public final Ritual ritual; - private RitualEvent(IMasterRitualStone mrs, String ownerName, Ritual ritual) { + private RitualEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) { this.mrs = mrs; - this.ownerName = ownerName; + this.ownerId = ownerId; this.ritual = ritual; } @@ -33,8 +35,8 @@ public class RitualEvent extends Event { public final ItemStack crystalStack; public int crystalTier; - public RitualActivatedEvent(IMasterRitualStone mrs, String owner, Ritual ritual, EntityPlayer player, ItemStack activationCrystal, int crystalTier) { - super(mrs, owner, ritual); + public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, EntityPlayer player, ItemStack activationCrystal, int crystalTier) { + super(mrs, ownerId, ritual); this.player = player; this.crystalStack = activationCrystal; @@ -50,8 +52,8 @@ public class RitualEvent extends Event { */ @Cancelable public static class RitualRunEvent extends RitualEvent { - public RitualRunEvent(IMasterRitualStone mrs, String owner, Ritual ritual) { - super(mrs, owner, ritual); + public RitualRunEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) { + super(mrs, ownerId, ritual); } } @@ -65,8 +67,8 @@ public class RitualEvent extends Event { public final Ritual.BreakType method; - public RitualStopEvent(IMasterRitualStone mrs, String owner, Ritual ritual, Ritual.BreakType method) { - super(mrs, owner, ritual); + public RitualStopEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, Ritual.BreakType method) { + super(mrs, ownerId, ritual); this.method = method; } @@ -76,12 +78,12 @@ public class RitualEvent extends Event { public static class ImperfectRitualActivatedEvent extends Event { public final IImperfectRitualStone ims; - public final String ownerName; + public final UUID ownerId; public final ImperfectRitual imperfectRitual; - public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, String ownerName, ImperfectRitual imperfectRitual) { + public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, UUID ownerId, ImperfectRitual imperfectRitual) { this.ims = ims; - this.ownerName = ownerName; + this.ownerId = ownerId; this.imperfectRitual = imperfectRitual; } } diff --git a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index fc81dbe7..cb962fdd 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -6,6 +6,7 @@ import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; import javax.annotation.Nullable; +import java.util.UUID; /** * Base event class for Soul Network related events. @@ -14,17 +15,17 @@ import javax.annotation.Nullable; * amount of LP to be drained */ public class SoulNetworkEvent extends Event { - public final String ownerUUID; + public final UUID ownerUUID; public int syphon; - public SoulNetworkEvent(String ownerUUID, int syphon) { + public SoulNetworkEvent(UUID ownerUUID, int syphon) { this.ownerUUID = ownerUUID; this.syphon = syphon; } /** * This event is called when an - * {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable} is being drained + * {@link WayofTime.bloodmagic.iface.IBindable} is being drained * inside of a {@link net.minecraft.tileentity.TileEntity}. *

* If canceled, the drain will not be executed. @@ -33,8 +34,8 @@ public class SoulNetworkEvent extends Event { public static class ItemDrainInContainerEvent extends SoulNetworkEvent { public ItemStack stack; - public ItemDrainInContainerEvent(ItemStack stack, String ownerName, int syphon) { - super(ownerName, syphon); + public ItemDrainInContainerEvent(ItemStack stack, UUID ownerId, int syphon) { + super(ownerId, syphon); this.stack = stack; } } @@ -50,8 +51,8 @@ public class SoulNetworkEvent extends Event { // If true, will damage regardless of if the network had enough inside it public boolean shouldDamage; - public PlayerDrainNetworkEvent(EntityPlayer player, String ownerNetwork, int drainAmount) { - super(ownerNetwork, drainAmount); + public PlayerDrainNetworkEvent(EntityPlayer player, UUID ownerId, int drainAmount) { + super(ownerId, drainAmount); this.shouldDamage = false; this.player = player; } @@ -72,12 +73,12 @@ public class SoulNetworkEvent extends Event { * event prevents action without penalties * * @param player Player using the item - * @param ownerNetwork Network that the item is tied to + * @param ownerId Network that the item is tied to * @param itemStack Item used * @param drainAmount Original drain amount - change to alter cost */ - public ItemDrainNetworkEvent(EntityPlayer player, String ownerNetwork, @Nullable ItemStack itemStack, int drainAmount) { - super(player, ownerNetwork, drainAmount); + public ItemDrainNetworkEvent(EntityPlayer player, UUID ownerId, @Nullable ItemStack itemStack, int drainAmount) { + super(player, ownerId, drainAmount); this.itemStack = itemStack; this.damageAmount = (float) (drainAmount) / 100.0f; } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java index f9b39342..e5ee95e9 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java @@ -1,9 +1,26 @@ package WayofTime.bloodmagic.iface; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.Nonnull; public interface IActivatable { - boolean getActivated(ItemStack stack); - ItemStack setActivatedState(ItemStack stack, boolean activated); + default boolean getActivated(ItemStack stack) { + return !stack.isEmpty() && stack.hasTagCompound() && stack.getTagCompound().getBoolean(Constants.NBT.ACTIVATED); + } + + @Nonnull + default ItemStack setActivatedState(ItemStack stack, boolean activated) { + if (!stack.isEmpty()) { + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + stack.getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); + } + + return stack; + } } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java index 164d77ff..cc2dad03 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java @@ -1,37 +1,28 @@ package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.data.Binding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + /** * Implement this interface on any Item that can be bound to a player. */ public interface IBindable { /** - * Gets the username of the Item's owner. Usually for display, such as in - * the tooltip. + * Gets an object that stores who this item is bound to. *

* If the item is not bound, this will be null. * * @param stack - The owned ItemStack - * @return - The username of the Item's owner + * @return - The binding object */ - default String getOwnerName(ItemStack stack) { - return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; - } - - /** - * Gets the UUID of the Item's owner. - *

- * If the item is not bound, this will be null. - * - * @param stack - The owned ItemStack - * @return - The UUID of the Item's owner - */ - default String getOwnerUUID(ItemStack stack) { - return !stack.isEmpty() && stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + @Nullable + default Binding getBinding(ItemStack stack) { + Binding binding = Binding.fromStack(stack); + return !stack.isEmpty() && binding != null ? binding : null; } /** diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index dfb40d9d..65c0c354 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -1,12 +1,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -34,8 +33,9 @@ public class ItemActivationCrystal extends ItemEnum.Variant implemen if (!stack.hasTagCompound()) return; - if (!Strings.isNullOrEmpty(getOwnerUUID(stack))) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); + Binding binding = getBinding(stack); + if (binding != null) + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 2e2d6d21..ddb05494 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; @@ -13,39 +14,42 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nullable; import java.util.List; public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvider { + public ItemLavaCrystal() { super(); setUnlocalizedName(BloodMagic.MODID + ".lavaCrystal"); } @Override - public ItemStack getContainerItem(ItemStack itemStack) { - String uuid = getOwnerUUID(itemStack); - if (!Strings.isNullOrEmpty(uuid)) - NetworkHelper.getSoulNetwork(uuid).syphon(25); + public ItemStack getContainerItem(ItemStack stack) { + Binding binding = getBinding(stack); + if (binding != null) + NetworkHelper.getSoulNetwork(binding.getOwnerId()).syphon(25); ItemStack returnStack = new ItemStack(this); - returnStack.setTagCompound(itemStack.getTagCompound()); + returnStack.setTagCompound(stack.getTagCompound()); return returnStack; } @Override - public boolean hasContainerItem(ItemStack itemStack) { + public boolean hasContainerItem(ItemStack stack) { return true; } @Override public int getItemBurnTime(ItemStack stack) { - if (Strings.isNullOrEmpty(getOwnerUUID(stack))) + Binding binding = getBinding(stack); + if (binding == null) return -1; if (NetworkHelper.canSyphonFromContainer(stack, 25)) return 200; else { - EntityPlayer player = PlayerHelper.getPlayerFromUUID(getOwnerUUID(stack)); + EntityPlayer player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); if (player != null) player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99)); } @@ -53,14 +57,10 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide return -1; } + @Nullable @Override - public String getOwnerName(ItemStack stack) { - return stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; - } - - @Override - public String getOwnerUUID(ItemStack stack) { - return stack.hasTagCompound() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + public Binding getBinding(ItemStack stack) { + return Binding.fromStack(stack); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java index c340021c..9b9bbe27 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.IActivatable; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import com.google.common.base.Strings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -22,6 +22,7 @@ import net.minecraft.world.World; * Base class for all toggleable sigils. */ public class ItemSigilToggleable extends ItemSigil implements IActivatable { + public ItemSigilToggleable(int lpUsed) { super(lpUsed); } @@ -64,10 +65,12 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (Strings.isNullOrEmpty(getOwnerUUID(stack)) || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while toggling state + + Binding binding = getBinding(stack); + if (binding == null || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while toggling state return EnumActionResult.PASS; - return (NetworkHelper.getSoulNetwork(getOwnerUUID(player.getHeldItem(hand))).syphonAndDamage(player, getLpUsed()) && onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ)) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return (NetworkHelper.getSoulNetwork(binding).syphonAndDamage(player, getLpUsed()) && onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ)) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } public boolean onSigilUse(ItemStack itemStack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) { @@ -78,7 +81,7 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) { if (entityIn.ticksExisted % 100 == 0) { - if (!NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage((EntityPlayer) entityIn, getLpUsed())) { + if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((EntityPlayer) entityIn, getLpUsed())) { setActivatedState(stack, false); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index b12011d1..2d645ba2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.helper.NBTHelper; @@ -51,11 +52,13 @@ public class ItemTelepositionFocus extends ItemEnum.Variant 0) return super.onItemRightClick(world, player, hand); + SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); if (world.isAirBlock(blockPos)) { world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); if (!world.isRemote) - NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()); + network.syphonAndDamage(player, getLpUsed()); resetCooldown(stack); player.swingArm(hand); return super.onItemRightClick(world, player, hand); @@ -55,7 +57,7 @@ public class ItemSigilBloodLight extends ItemSigilBase { } else { if (!world.isRemote) { world.spawnEntity(new EntityBloodLight(world, player)); - NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()); + network.syphonAndDamage(player, getLpUsed()); } resetCooldown(stack); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 0447c242..a9a4b26f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,21 +1,21 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.ChatUtil; +import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { @@ -35,13 +35,12 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { if (!world.isRemote) { super.onItemRightClick(world, player, hand); - RayTraceResult rayTrace = rayTrace(world, player, false); - - if (rayTrace == null) { - int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - List toSend = new ArrayList(); - if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) - toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", getOwnerName(stack))); + Binding binding = getBinding(stack); + if (binding != null) { + int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); + List toSend = Lists.newArrayList(); + if (!binding.getOwnerId().equals(player.getGameProfile().getId())) + toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", binding.getOwnerName())); toSend.add(new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index d6f77a58..32fa6957 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -11,7 +11,6 @@ import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -90,7 +89,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl List inv = getInternalInventory(stack); ItemStack itemUsing = inv.get(currentSlot); - if (itemUsing.isEmpty() || Strings.isNullOrEmpty(((IBindable) itemUsing.getItem()).getOwnerUUID(itemUsing))) + if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(stack) == null) return EnumActionResult.PASS; EnumActionResult result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); @@ -109,7 +108,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl List inv = getInternalInventory(stack); ItemStack itemUsing = inv.get(currentSlot); - if (itemUsing.isEmpty() || Strings.isNullOrEmpty(((IBindable) itemUsing.getItem()).getOwnerUUID(itemUsing))) + if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(stack) == null) return ActionResult.newResult(EnumActionResult.PASS, stack); itemUsing.getItem().onItemRightClick(world, player, hand); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 3a70741c..b02e3f3c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -59,7 +59,7 @@ public class ItemSigilLava extends ItemSigilBase { return super.onItemRightClick(world, player, hand); } - if (this.canPlaceLava(world, blockpos1) && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceLava(world, blockpos1)) { + if (this.canPlaceLava(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceLava(world, blockpos1)) { return super.onItemRightClick(world, player, hand); } } @@ -85,7 +85,7 @@ public class ItemSigilLava extends ItemSigilBase { FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); int amount = handler.fill(fluid, false); - if (amount > 0 && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed())) { + if (amount > 0 && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed())) { handler.fill(fluid, true); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 38535e96..4a9566da 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -55,7 +55,7 @@ public class ItemSigilTeleposition extends ItemSigilBase { if (!world.isRemote && NBTHelper.checkNBT(stack) != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up(); if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack), true)); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getBinding(stack).getOwnerId(), true)); } // FIXME - Fix cross-dimension teleports causing major desync // } else { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 1b6b777c..f54bc75b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.item.ItemSigilToggleable; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; @@ -21,6 +22,7 @@ import java.util.List; import java.util.Locale; public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMeshProvider { + protected final String tooltipBase; private final String name; @@ -40,10 +42,12 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes super.addInformation(stack, world, tooltip, flag); if (!stack.hasTagCompound()) return; + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated"))); - if (!Strings.isNullOrEmpty(getOwnerName(stack))) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); + Binding binding = getBinding(stack); + if (binding != null) + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index b150306d..3a00e1fe 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -99,7 +99,7 @@ public class ItemSigilTransposition extends ItemSigilBase { stack.getTagCompound().setByte(Constants.NBT.CONTAINED_BLOCK_META, metadata); stack.getTagCompound().setTag(Constants.NBT.CONTAINED_TILE_ENTITY, tileNBTTag); - NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, cost); + NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, cost); world.removeTileEntity(blockPos); world.setBlockToAir(blockPos); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index a4b54fda..a2e20146 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; @@ -85,12 +86,13 @@ public class ItemSigilVoid extends ItemSigilBase { return EnumActionResult.FAIL; } + SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); TileEntity tile = world.getTileEntity(blockPos); if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); FluidStack amount = handler.drain(1000, false); - if (amount != null && amount.amount > 0 && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed())) { + if (amount != null && amount.amount > 0 && network.syphonAndDamage(player, getLpUsed())) { handler.drain(1000, true); return EnumActionResult.SUCCESS; } @@ -104,7 +106,7 @@ public class ItemSigilVoid extends ItemSigilBase { return EnumActionResult.FAIL; } - if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed())) { + if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && network.syphonAndDamage(player, getLpUsed())) { world.setBlockToAir(newPos); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index fd73d938..396c2aa5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -54,7 +54,7 @@ public class ItemSigilWater extends ItemSigilBase { if (!player.canPlayerEdit(blockpos1, rayTrace.sideHit, stack)) return super.onItemRightClick(world, player, hand); - if (this.canPlaceWater(world, blockpos1) && NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceWater(world, blockpos1)) + if (this.canPlaceWater(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceWater(world, blockpos1)) return super.onItemRightClick(world, player, hand); } } diff --git a/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java index 2c23d393..6a8b5a1b 100644 --- a/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java @@ -15,6 +15,7 @@ public class BloodOrb extends IForgeRegistryEntry.Impl { private final String name; private final int tier; private final int capacity; + private final int fillRate; @Nullable private ModelResourceLocation modelLocation; @@ -25,11 +26,13 @@ public class BloodOrb extends IForgeRegistryEntry.Impl { * @param name - A name for the Orb. Gets put into an unlocalized name. * @param tier - The tier of the Orb. * @param capacity - The max amount of LP the Orb can store. + * @param fillRate - The amount of LP per tick the Altar can fill the network with. */ - public BloodOrb(String name, int tier, int capacity) { + public BloodOrb(String name, int tier, int capacity, int fillRate) { this.name = name; this.tier = tier; this.capacity = capacity; + this.fillRate = fillRate; } public String getName() { @@ -44,6 +47,10 @@ public class BloodOrb extends IForgeRegistryEntry.Impl { return capacity; } + public int getFillRate() { + return fillRate; + } + @Nullable public ModelResourceLocation getModelLocation() { return modelLocation; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index d706b79c..ba6a2fa7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -1,11 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; -import com.google.common.base.Strings; +import com.google.common.collect.Lists; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +24,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.UUID; public class RitualExpulsion extends Ritual { public static final String EXPULSION_RANGE = "expulsionRange"; @@ -48,7 +50,7 @@ public class RitualExpulsion extends Ritual { AreaDescriptor expulsionRange = getBlockRange(EXPULSION_RANGE); - List allowedNames = new ArrayList(); + List whitelist = Lists.newArrayList(); BlockPos masterPos = masterRitualStone.getBlockPos(); TileEntity tile = world.getTileEntity(masterPos.up()); @@ -57,10 +59,10 @@ public class RitualExpulsion extends Ritual { if (handler != null) { for (int i = 0; i < handler.getSlots(); i++) { ItemStack itemStack = handler.getStackInSlot(i); - if (itemStack != null && itemStack.getItem() instanceof IBindable) { - IBindable bindable = (IBindable) itemStack.getItem(); - if (!Strings.isNullOrEmpty(bindable.getOwnerName(itemStack)) && !allowedNames.contains(bindable.getOwnerName(itemStack))) - allowedNames.add(bindable.getOwnerUUID(itemStack)); + if (!itemStack.isEmpty() && itemStack.getItem() instanceof IBindable) { + Binding binding = ((IBindable) itemStack.getItem()).getBinding(itemStack); + if (binding != null && !whitelist.contains(binding.getOwnerId())) + whitelist.add(binding.getOwnerId()); } } } @@ -69,14 +71,14 @@ public class RitualExpulsion extends Ritual { final int teleportDistance = 100; for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, expulsionRange.getAABB(masterRitualStone.getBlockPos()))) { - if (player.capabilities.isCreativeMode || PlayerHelper.getUUIDFromPlayer(player).toString().equals(masterRitualStone.getOwner()) || allowedNames.contains(PlayerHelper.getUUIDFromPlayer(player).toString())) + if (player.capabilities.isCreativeMode || PlayerHelper.getUUIDFromPlayer(player).toString().equals(masterRitualStone.getOwner()) || whitelist.contains(player.getGameProfile().getId())) continue; if (teleportRandomly(player, teleportDistance)) masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * 1000); } - allowedNames.clear(); + whitelist.clear(); } public boolean teleportRandomly(EntityLivingBase entityLiving, double distance) { @@ -162,20 +164,16 @@ public class RitualExpulsion extends Ritual { } public void moveEntityViaTeleport(EntityLivingBase entityLiving, double x, double y, double z) { - if (entityLiving != null && entityLiving instanceof EntityPlayer) { - if (entityLiving instanceof EntityPlayerMP) { - EntityPlayerMP entityplayermp = (EntityPlayerMP) entityLiving; + if (entityLiving instanceof EntityPlayerMP) { + EntityPlayerMP player = (EntityPlayerMP) entityLiving; - if (entityplayermp.getEntityWorld() == entityLiving.getEntityWorld()) { - EnderTeleportEvent event = new EnderTeleportEvent(entityplayermp, x, y, z, 5.0F); + EnderTeleportEvent event = new EnderTeleportEvent(player, x, y, z, 5.0F); - if (!MinecraftForge.EVENT_BUS.post(event)) { - if (entityLiving.isRiding()) { - entityplayermp.mountEntityAndWakeUp(); - } - entityLiving.setPositionAndUpdate(event.getTargetX(), event.getTargetY(), event.getTargetZ()); - } - } + if (!MinecraftForge.EVENT_BUS.post(event)) { + if (entityLiving.isRiding()) + player.mountEntityAndWakeUp(); + + entityLiving.setPositionAndUpdate(event.getTargetX(), event.getTargetY(), event.getTargetZ()); } } else if (entityLiving != null) { entityLiving.setPosition(x, y, z); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 0c4503d8..2dd00fe1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -18,6 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; import java.util.ArrayList; +import java.util.UUID; public class RitualPortal extends Ritual { @@ -31,14 +32,14 @@ public class RitualPortal extends Ritual { } @Override - public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player, String owner) { + public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player, UUID owner) { World world = masterRitualStone.getWorldObj(); int x = masterRitualStone.getBlockPos().getX(); int y = masterRitualStone.getBlockPos().getY(); int z = masterRitualStone.getBlockPos().getZ(); EnumFacing direction = masterRitualStone.getDirection(); - String name = owner; + String name = owner.toString(); IBlockState blockState; if (!world.isRemote) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java index 781988fc..320757ef 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java @@ -9,6 +9,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.List; +import java.util.UUID; /** * This interface is for internal implementation only. @@ -16,7 +17,7 @@ import java.util.List; * It is provided via the API for easy obtaining of basic data. */ public interface IMasterRitualStone { - String getOwner(); + UUID getOwner(); SoulNetwork getOwnerNetwork(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java index d75447ce..b2a4d680 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java @@ -14,10 +14,7 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import org.apache.commons.lang3.builder.ToStringBuilder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; /** @@ -100,7 +97,7 @@ public abstract class Ritual { * owner of the ritual if being reactivated. * @return - Whether activation was successful */ - public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player, String owner) { + public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player, UUID owner) { return true; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index b2571e6d..5e24db13 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -20,17 +20,19 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; +import java.util.UUID; + public class Teleports { public static class TeleportSameDim extends Teleport { private final boolean teleposer; - public TeleportSameDim(int x, int y, int z, Entity entity, String networkToDrain, boolean teleposer) { - this(new BlockPos(x, y, z), entity, networkToDrain, teleposer); + public TeleportSameDim(int x, int y, int z, Entity entity, UUID networkOwner, boolean teleposer) { + this(new BlockPos(x, y, z), entity, networkOwner, teleposer); } - public TeleportSameDim(BlockPos blockPos, Entity entity, String networkToDrain, boolean teleposer) { - super(blockPos, entity, networkToDrain); + public TeleportSameDim(BlockPos blockPos, Entity entity, UUID networkOwner, boolean teleposer) { + super(blockPos, entity, networkOwner); this.teleposer = teleposer; } @@ -39,7 +41,7 @@ public class Teleports { if (entity != null) { if (entity.timeUntilPortal <= 0) { if (entity instanceof EntityPlayer) { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain); + SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < getTeleportCost()) return; @@ -60,7 +62,7 @@ public class Teleports { if (teleposer) MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z))); } else { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain); + SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < (getTeleportCost() / 10)) return; @@ -95,12 +97,12 @@ public class Teleports { private int newWorldID; private boolean teleposer; - public TeleportToDim(int x, int y, int z, Entity entity, String networkToDrain, World oldWorld, int newWorld, boolean teleposer) { - this(new BlockPos(x, y, z), entity, networkToDrain, oldWorld, newWorld, teleposer); + public TeleportToDim(int x, int y, int z, Entity entity, UUID networkOwner, World oldWorld, int newWorld, boolean teleposer) { + this(new BlockPos(x, y, z), entity, networkOwner, oldWorld, newWorld, teleposer); } - public TeleportToDim(BlockPos blockPos, Entity entity, String networkToDrain, World oldWorld, int newWorldID, boolean teleposer) { - super(blockPos, entity, networkToDrain); + public TeleportToDim(BlockPos blockPos, Entity entity, UUID networkOwner, World oldWorld, int newWorldID, boolean teleposer) { + super(blockPos, entity, networkOwner); this.oldWorld = oldWorld; this.newWorldID = newWorldID; this.teleposer = teleposer; @@ -118,7 +120,7 @@ public class Teleports { EntityPlayerMP player = (EntityPlayerMP) entity; if (!player.getEntityWorld().isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain); + SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < getTeleportCost()) return; @@ -138,7 +140,7 @@ public class Teleports { } } else if (!entity.getEntityWorld().isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain); + SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < (getTeleportCost() / 10)) return; diff --git a/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java index 18719e16..742b4000 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java @@ -3,23 +3,25 @@ package WayofTime.bloodmagic.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; +import java.util.UUID; + public abstract class Teleport implements ITeleport { protected int x; protected int y; protected int z; protected Entity entity; - protected String networkToDrain; + protected UUID networkOwner; - public Teleport(int x, int y, int z, Entity entity, String networkToDrain) { + public Teleport(int x, int y, int z, Entity entity, UUID networkOwner) { this.x = x; this.y = y; this.z = z; this.entity = entity; - this.networkToDrain = networkToDrain; + this.networkOwner = networkOwner; } - public Teleport(BlockPos blockPos, Entity entity, String networkToDrain) { - this(blockPos.getX(), blockPos.getY(), blockPos.getZ(), entity, networkToDrain); + public Teleport(BlockPos blockPos, Entity entity, UUID networkOwner) { + this(blockPos.getX(), blockPos.getY(), blockPos.getZ(), entity, networkOwner); } public int getX() { @@ -38,8 +40,8 @@ public abstract class Teleport implements ITeleport { return entity; } - public String getNetworkToDrain() { - return networkToDrain; + public UUID getNetworkOwner() { + return networkOwner; } @Override @@ -53,7 +55,7 @@ public abstract class Teleport implements ITeleport { if (y != teleport.y) return false; if (z != teleport.z) return false; if (entity != null ? !entity.equals(teleport.entity) : teleport.entity != null) return false; - return networkToDrain != null ? networkToDrain.equals(teleport.networkToDrain) : teleport.networkToDrain == null; + return networkOwner != null ? networkOwner.equals(teleport.networkOwner) : teleport.networkOwner == null; } @Override @@ -62,7 +64,7 @@ public abstract class Teleport implements ITeleport { result = 31 * result + y; result = 31 * result + z; result = 31 * result + (entity != null ? entity.hashCode() : 0); - result = 31 * result + (networkToDrain != null ? networkToDrain.hashCode() : 0); + result = 31 * result + (networkOwner != null ? networkOwner.hashCode() : 0); return result; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index aaf844d2..9bce3ea8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.RitualEvent; import WayofTime.bloodmagic.core.registry.RitualRegistry; @@ -7,10 +9,7 @@ import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; import WayofTime.bloodmagic.ritual.data.Ritual; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.helper.*; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.tile.base.TileTicking; @@ -29,9 +28,10 @@ import net.minecraftforge.fml.common.eventhandler.Event; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import java.util.UUID; public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone { - private String owner; + private UUID owner; private SoulNetwork cachedNetwork; private boolean active; private boolean redstoned; @@ -57,7 +57,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (!isActive() && !isPowered() && isRedstoned() && getCurrentRitual() != null) { active = true; ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, 1, getCurrentRitual().getCrystalLevel())); - crystalStack.getTagCompound().setString(Constants.NBT.OWNER_UUID, getOwner()); + BindableHelper.applyBinding(crystalStack, new Binding(owner, PlayerHelper.getUsernameFromUUID(owner))); activateRitual(crystalStack, null, getCurrentRitual()); redstoned = false; } @@ -72,8 +72,8 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS @Override public void deserialize(NBTTagCompound tag) { - owner = tag.getString(Constants.NBT.OWNER_UUID); - if (!Strings.isNullOrEmpty(owner)) + owner = tag.hasUniqueId("owner") ? tag.getUniqueId("owner") : null; + if (owner != null) cachedNetwork = NetworkHelper.getSoulNetwork(owner); currentRitual = RitualRegistry.getRitualForId(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { @@ -97,7 +97,8 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS @Override public NBTTagCompound serialize(NBTTagCompound tag) { String ritualId = RitualRegistry.getIdForRitual(getCurrentRitual()); - tag.setString(Constants.NBT.OWNER_UUID, Strings.isNullOrEmpty(getOwner()) ? "" : getOwner()); + if (owner != null) + tag.setUniqueId(Constants.NBT.OWNER_UUID, owner); tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); if (currentRitual != null) { NBTTagCompound ritualTag = new NBTTagCompound(); @@ -121,15 +122,13 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (PlayerHelper.isFakePlayer(activator)) return false; - activationCrystal = NBTHelper.checkNBT(activationCrystal); - String crystalOwner = activationCrystal.getTagCompound().getString(Constants.NBT.OWNER_UUID); - - if (!Strings.isNullOrEmpty(crystalOwner) && ritual != null) { + Binding binding = ((IBindable) activationCrystal.getItem()).getBinding(activationCrystal); + if (binding != null && ritual != null) { if (activationCrystal.getItem() instanceof ItemActivationCrystal) { int crystalLevel = ((ItemActivationCrystal) activationCrystal.getItem()).getCrystalLevel(activationCrystal); if (RitualHelper.canCrystalActivate(ritual, crystalLevel)) { if (!getWorld().isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(crystalOwner); + SoulNetwork network = NetworkHelper.getSoulNetwork(binding); if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() && (activator != null && !activator.capabilities.isCreativeMode)) { activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.weak"), true); @@ -139,7 +138,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (currentRitual != null) currentRitual.stopRitual(this, Ritual.BreakType.ACTIVATE); - RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, crystalOwner, ritual, activator, activationCrystal, crystalLevel); + RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, binding.getOwnerId(), ritual, activator, activationCrystal, crystalLevel); if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) { if (activator != null) @@ -147,7 +146,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS return false; } - if (ritual.activateRitual(this, activator, crystalOwner)) { + if (ritual.activateRitual(this, activator, binding.getOwnerId())) { if (!isRedstoned() && (activator != null && !activator.capabilities.isCreativeMode)) network.syphon(ritual.getActivationCost()); @@ -155,7 +154,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.activate"), true); this.active = true; - this.owner = crystalOwner; + this.owner = binding.getOwnerId(); this.cachedNetwork = network; this.currentRitual = ritual; @@ -240,11 +239,11 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public String getOwner() { + public UUID getOwner() { return owner; } - public void setOwner(String owner) { + public void setOwner(UUID owner) { this.owner = owner; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index f91052d9..416c37f7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; import WayofTime.bloodmagic.util.Utils; -import com.google.common.base.Strings; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -59,17 +59,23 @@ public class TileTeleposer extends TileInventory implements ITickable { } public void initiateTeleport() { - if (!getWorld().isRemote && canInitiateTeleport(this) && getBlockType() instanceof BlockTeleposer) { - ItemStack focusStack = NBTHelper.checkNBT(getStackInSlot(0)); + if (!getWorld().isRemote && canInitiateTeleport() && getBlockType() instanceof BlockTeleposer) { + ItemStack focusStack = getStackInSlot(0); ItemTelepositionFocus focus = (ItemTelepositionFocus) focusStack.getItem(); + Binding binding = focus.getBinding(focusStack); + if (binding == null) + return; BlockPos focusPos = focus.getBlockPos(getStackInSlot(0)); World focusWorld = focus.getWorld(getStackInSlot(0)); + if (focusWorld == null) + return; - if (focusWorld != null && focusWorld.getTileEntity(focusPos) instanceof TileTeleposer && !focusWorld.getTileEntity(focusPos).equals(this)) { + TileEntity boundTile = focusWorld.getTileEntity(focusPos); + if (boundTile instanceof TileTeleposer && boundTile != this) { final int focusLevel = (getStackInSlot(0).getItemDamage() + 1); final int lpToBeDrained = (int) (0.5F * Math.sqrt((pos.getX() - focusPos.getX()) * (pos.getX() - focusPos.getX()) + (pos.getY() - focusPos.getY() + 1) * (pos.getY() - focusPos.getY() + 1) + (pos.getZ() - focusPos.getZ()) * (pos.getZ() - focusPos.getZ()))); - if (NetworkHelper.getSoulNetwork(focus.getOwnerUUID(focusStack)).syphonAndDamage(PlayerHelper.getPlayerFromUUID(focus.getOwnerUUID(focusStack)), lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1))) { + if (NetworkHelper.getSoulNetwork(binding).syphonAndDamage(PlayerHelper.getPlayerFromUUID(binding.getOwnerId()), lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1))) { int blocksTransported = 0; for (int i = -(focusLevel - 1); i <= (focusLevel - 1); i++) { @@ -95,13 +101,13 @@ public class TileTeleposer extends TileInventory implements ITickable { if (focusWorld.equals(getWorld())) { if (!originalWorldEntities.isEmpty()) { for (Entity entity : originalWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), true)); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, binding.getOwnerId(), true)); } } if (!focusWorldEntities.isEmpty()) { for (Entity entity : focusWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), true)); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, binding.getOwnerId(), true)); } } } @@ -124,7 +130,8 @@ public class TileTeleposer extends TileInventory implements ITickable { } } - private boolean canInitiateTeleport(TileTeleposer teleposer) { - return !teleposer.getStackInSlot(0).isEmpty() && teleposer.getStackInSlot(0).getItem() instanceof ItemTelepositionFocus && !Strings.isNullOrEmpty(((ItemTelepositionFocus) teleposer.getStackInSlot(0).getItem()).getOwnerName(teleposer.getStackInSlot(0))); + private boolean canInitiateTeleport() { + ItemStack focusStack = getStackInSlot(0); + return !focusStack.isEmpty() && focusStack.getItem() instanceof ItemTelepositionFocus && ((ItemTelepositionFocus) focusStack.getItem()).getBinding(focusStack) != null; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index d9a4d4f2..cd8bebf3 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.ItemBindEvent; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; @@ -53,6 +54,7 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; @@ -79,10 +81,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { @@ -339,25 +338,25 @@ public class GenericHandler { return; ItemStack held = event.getItemStack(); - if (!held.isEmpty() && held.getItem() instanceof IBindable) { - held = NBTHelper.checkNBT(held); + if (!held.isEmpty() && held.getItem() instanceof IBindable) { // Make sure it's bindable IBindable bindable = (IBindable) held.getItem(); - if (Strings.isNullOrEmpty(bindable.getOwnerUUID(held))) { + Binding binding = bindable.getBinding(held); + if (binding == null) { // If the binding is null, let's create one if (bindable.onBind(player, held)) { - String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - ItemBindEvent toPost = new ItemBindEvent(player, uuid, held); - if (MinecraftForge.EVENT_BUS.post(toPost) || toPost.getResult() == Result.DENY) + ItemBindEvent toPost = new ItemBindEvent(player, held); + if (MinecraftForge.EVENT_BUS.post(toPost)) // Allow cancellation of binding return; - BindableHelper.setItemOwnerUUID(held, uuid); - BindableHelper.setItemOwnerName(held, player.getDisplayNameString()); + BindableHelper.applyBinding(held, player); // Bind item to the player } - } else if (bindable.getOwnerUUID(held).equals(PlayerHelper.getUUIDFromPlayer(player).toString()) && !bindable.getOwnerName(held).equals(player.getDisplayNameString())) - BindableHelper.setItemOwnerName(held, player.getDisplayNameString()); + // If the binding exists, we'll check if the player's name has changed since they last used it and update that if so. + } else if (binding.getOwnerId().equals(player.getGameProfile().getId()) && !binding.getOwnerName().equals(player.getGameProfile().getName())) { + binding.setOwnerName(player.getGameProfile().getName()); + BindableHelper.applyBinding(held, binding); + } } if (!held.isEmpty() && held.getItem() instanceof IBloodOrb) { - held = NBTHelper.checkNBT(held); IBloodOrb bloodOrb = (IBloodOrb) held.getItem(); SoulNetwork network = NetworkHelper.getSoulNetwork(player); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java index f74bb848..2606eae9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java @@ -1,17 +1,26 @@ package WayofTime.bloodmagic.util.helper; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.ItemBindEvent; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; - -import java.util.UUID; +import net.minecraft.nbt.NBTTagCompound; public class BindableHelper { + + public static void applyBinding(ItemStack stack, EntityPlayer player) { + Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); + applyBinding(stack, binding); + } + + public static void applyBinding(ItemStack stack, Binding binding) { + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + stack.getTagCompound().setTag("binding", binding.serializeNBT()); + } + /** * Sets the Owner Name of the item without checking if it is already bound. * Also bypasses {@link ItemBindEvent}. @@ -37,113 +46,4 @@ public class BindableHelper { stack.getTagCompound().setString(Constants.NBT.OWNER_UUID, ownerUUID); } - - // Everything below is to be removed. - - /** - * Deprecated. - *

- * Built into {@link IBindable} now. - * - * @param stack - The ItemStack to check the owner of - * @return - The username of the ItemStack's owner - */ - @Deprecated - public static String getOwnerName(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - - return PlayerHelper.getUsernameFromStack(stack); - } - - /** - * Deprecated. - *

- * Built into {@link IBindable} now. - * - * @param stack - The ItemStack to check the owner of - * @return - The UUID of the ItemStack's owner - */ - @Deprecated - public static String getOwnerUUID(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - - return stack.getTagCompound().getString(Constants.NBT.OWNER_UUID); - } - - /** - * Deprecated. - *

- * Now handled automatically with - * {@link GenericHandler#onInteract(PlayerInteractEvent.RightClickItem)} - * - * @param stack - The ItemStack to bind - * @param player - The Player to bind the ItemStack to - * @return - Whether binding was successful - */ - @Deprecated - public static boolean checkAndSetItemOwner(ItemStack stack, EntityPlayer player) { - return !PlayerHelper.isFakePlayer(player) && checkAndSetItemOwner(stack, PlayerHelper.getUUIDFromPlayer(player), player.getName()); - } - - /** - * Deprecated. - *

- * Now handled automatically with - * {@link GenericHandler#onInteract(PlayerInteractEvent.RightClickItem)} - * - * @param stack - The ItemStack to bind - * @param uuid - The username to bind the ItemStack to - * @param currentUsername - The current name of the player. - * @return - Whether the binding was successful - */ - @Deprecated - public static boolean checkAndSetItemOwner(ItemStack stack, String uuid, String currentUsername) { - stack = NBTHelper.checkNBT(stack); - - if (!(stack.getItem() instanceof IBindable)) - return false; - - String currentOwner = stack.getTagCompound().getString(Constants.NBT.OWNER_UUID); - - if (currentOwner == "") //The player has not been set yet, so set everything. - { - MinecraftForge.EVENT_BUS.post(new ItemBindEvent(PlayerHelper.getPlayerFromUUID(uuid), uuid, stack)); - ((IBindable) stack.getItem()).onBind(PlayerHelper.getPlayerFromUUID(uuid), stack); - stack.getTagCompound().setString(Constants.NBT.OWNER_UUID, uuid); - stack.getTagCompound().setString(Constants.NBT.OWNER_NAME, currentUsername); - return true; - } else if (currentOwner.equals(uuid)) //The player has been set, so this will simply update the display name - { - stack.getTagCompound().setString(Constants.NBT.OWNER_NAME, currentUsername); - } - - return true; - } - - /** - * Deprecated. - *

- * Now handled automatically with - * {@link GenericHandler#onInteract(PlayerInteractEvent.RightClickItem)} - * - * @param stack - ItemStack to check - * @param uuid - UUID of the Player - * @param currentUsername - The current name of the player. - */ - @Deprecated - public static boolean checkAndSetItemOwner(ItemStack stack, UUID uuid, String currentUsername) { - return checkAndSetItemOwner(stack, uuid.toString(), currentUsername); - } - - /** - * Deprecated. - * - * @param stack - The ItemStack to bind - * @param ownerName - The username to bind the ItemStack to - * @see #setItemOwnerName(ItemStack, String) - */ - @Deprecated - public static void setItemOwner(ItemStack stack, String ownerName) { - setItemOwnerName(stack, ownerName); - } } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index 81f9dabe..1b3a4bda 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.util.helper; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.SoulNetworkEvent; import WayofTime.bloodmagic.orb.BloodOrb; @@ -57,6 +59,10 @@ public class NetworkHelper { return getSoulNetwork(PlayerHelper.getUUIDFromPlayer(player)); } + public static SoulNetwork getSoulNetwork(Binding binding) { + return getSoulNetwork(binding.getOwnerId()); + } + /** * Gets the current orb tier of the SoulNetwork. * @@ -99,7 +105,7 @@ public class NetworkHelper { @Deprecated public static boolean syphonAndDamage(SoulNetwork soulNetwork, EntityPlayer user, int toSyphon) { -// if (soulNetwork.getPlayer() == null) +// if (soulNetwork.getNewOwner() == null) // { // soulNetwork.syphon(toSyphon); // return true; @@ -117,15 +123,16 @@ public class NetworkHelper { */ public static boolean syphonFromContainer(ItemStack stack, int toSyphon) //TODO: Change to a String, int? { - stack = NBTHelper.checkNBT(stack); - String ownerName = stack.getTagCompound().getString(Constants.NBT.OWNER_UUID); - - if (Strings.isNullOrEmpty(ownerName)) + if (!(stack.getItem() instanceof IBindable)) return false; - SoulNetwork network = getSoulNetwork(ownerName); + Binding binding = ((IBindable) stack.getItem()).getBinding(stack); + if (binding == null) + return false; - SoulNetworkEvent.ItemDrainInContainerEvent event = new SoulNetworkEvent.ItemDrainInContainerEvent(stack, ownerName, toSyphon); + SoulNetwork network = getSoulNetwork(binding); + + SoulNetworkEvent.ItemDrainInContainerEvent event = new SoulNetworkEvent.ItemDrainInContainerEvent(stack, binding.getOwnerId(), toSyphon); return !(MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) && network.syphon(event.syphon) >= toSyphon; } @@ -138,13 +145,14 @@ public class NetworkHelper { * @return - If syphoning is possible */ public static boolean canSyphonFromContainer(ItemStack stack, int toSyphon) { - stack = NBTHelper.checkNBT(stack); - String ownerName = stack.getTagCompound().getString(Constants.NBT.OWNER_UUID); - - if (Strings.isNullOrEmpty(ownerName)) + if (!(stack.getItem() instanceof IBindable)) return false; - SoulNetwork network = getSoulNetwork(ownerName); + Binding binding = ((IBindable) stack.getItem()).getBinding(stack); + if (binding == null) + return false; + + SoulNetwork network = getSoulNetwork(binding); return network.getCurrentEssence() >= toSyphon; } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java index 2354b3e1..601a9240 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java @@ -1,12 +1,7 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.util.Constants; -import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; import net.minecraftforge.common.UsernameCache; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -23,43 +18,25 @@ public class PlayerHelper { */ private static final ArrayList knownFakePlayers = Lists.newArrayList(); - public static String getUsernameFromPlayer(EntityPlayer player) { - return player.getEntityWorld().isRemote ? "" : UsernameCache.getLastKnownUsername(getUUIDFromPlayer(player)); - } - - public static EntityPlayer getPlayerFromUsername(String username) { + public static EntityPlayer getPlayerFromId(UUID uuid) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return null; - return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUsername(username); - } - - public static EntityPlayer getPlayerFromUUID(String uuid) { - return getPlayerFromUsername(getUsernameFromUUID(uuid)); + return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(uuid); } public static EntityPlayer getPlayerFromUUID(UUID uuid) { - return getPlayerFromUsername(getUsernameFromUUID(uuid)); + return getPlayerFromId(uuid); } public static UUID getUUIDFromPlayer(EntityPlayer player) { return player.getGameProfile().getId(); } - public static String getUsernameFromUUID(String uuid) { - return UsernameCache.getLastKnownUsername(UUID.fromString(uuid)); - } - public static String getUsernameFromUUID(UUID uuid) { return UsernameCache.getLastKnownUsername(uuid); } - public static String getUsernameFromStack(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - - return stack.getTagCompound().getString(Constants.NBT.OWNER_NAME); - } - /** * Checks whether or not the given player is an "actual" player * @@ -69,23 +46,4 @@ public class PlayerHelper { public static boolean isFakePlayer(EntityPlayer player) { return player instanceof FakePlayer || (player != null && knownFakePlayers.contains(player.getClass().getCanonicalName())); } - - public static void causeNauseaToPlayer(ItemStack stack) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - return; - - stack = NBTHelper.checkNBT(stack); - - if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID))) - causeNauseaToPlayer(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID)); - } - - public static void causeNauseaToPlayer(String ownerName) { - EntityPlayer player = getPlayerFromUsername(ownerName); - - if (player == null) - return; - - player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 80)); - } } From eaf4bfb8574cec465f673f6c12444037337ce3d4 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 27 Feb 2018 18:17:03 -0800 Subject: [PATCH 107/493] Fix Haste being... *constricted* when above level 2 (#1239) --- .../java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index c23234a9..e9287caf 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -80,7 +80,7 @@ public class RegistrarBloodMagic { new PotionBloodMagic("Soul Snare", false, 0xFFFFFF, 3, 0).setRegistryName("soul_snare"), new PotionBloodMagic("Soul Fray", true, 0xFFFFFF, 4, 0).setRegistryName("soul_fray"), new PotionBloodMagic("Fire Fuse", true, 0xFF3333, 5, 0).setRegistryName("fire_fuse"), - new PotionBloodMagic("Constriction", true, 0x000000, 6, 0).setRegistryName("constriction"), + new PotionBloodMagic("Constriction", true, 0x000000, 6, 0).setRegistryName("constrict"), new PotionBloodMagic("Plant Leech", true, 0x000000, 7, 0).setRegistryName("plant_leech"), new PotionBloodMagic("Deaf", true, 0x000000, 0, 1).setRegistryName("deafness"), new PotionBloodMagic("Bounce", false, 0x000000, 1, 1).setRegistryName("bounce"), From caab4dcbef996527b97f28ea6c1a8c7cfdccd53e Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 27 Feb 2018 18:17:30 -0800 Subject: [PATCH 108/493] Fix rituals crashing when deserializing the owner --- .../java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 9bce3ea8..4e140dea 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -98,7 +98,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public NBTTagCompound serialize(NBTTagCompound tag) { String ritualId = RitualRegistry.getIdForRitual(getCurrentRitual()); if (owner != null) - tag.setUniqueId(Constants.NBT.OWNER_UUID, owner); + tag.setUniqueId("owner", owner); tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); if (currentRitual != null) { NBTTagCompound ritualTag = new NBTTagCompound(); From f4b72bed8b62261143a54b148c0619ee9afdf3eb Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Feb 2018 21:17:31 -0500 Subject: [PATCH 109/493] Added temp recipe to try out a new Teleport array. Don't stick only your hand in it, though. --- .../AlchemyArrayEffectTeleport.java | 109 ++++++++++++++++++ .../bloodmagic/registry/ModRecipes.java | 2 + .../models/alchemyarrays/teleportation.png | Bin 0 -> 50896 bytes 3 files changed, 111 insertions(+) create mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java create mode 100644 src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportation.png diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java new file mode 100644 index 00000000..47d0e935 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java @@ -0,0 +1,109 @@ +package WayofTime.bloodmagic.alchemyArray; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.play.server.SPacketUpdateHealth; +import net.minecraft.potion.Potion; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.iface.IAlchemyArray; + +public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect +{ + public static final int MAX_SEARCH = 20; + public static final int TELEPORT_DELAY = 40; + + public AlchemyArrayEffectTeleport(String key) + { + super(key); + } + + @Override + public boolean update(TileEntity tile, int ticksActive) + { + return false; + } + + @Override + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) + { + + { + double motionY = 0.5; + double speed = 3; + EnumFacing direction = array.getRotation(); + + teleportEntityInDirection(world, pos, entity, direction); + } + + } + + public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, EnumFacing direction) + { + if (entity != null && entity.timeUntilPortal <= 0) + { + for (int i = 1; i <= MAX_SEARCH; i++) + { + BlockPos offsetPos = currentPos.offset(direction, i); + Block testBlock = world.getBlockState(offsetPos).getBlock(); + if (testBlock == RegistrarBloodMagicBlocks.ALCHEMY_ARRAY) + { + int x = offsetPos.getX(); + int y = offsetPos.getY(); + int z = offsetPos.getZ(); + + entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); + entity.timeUntilPortal = TELEPORT_DELAY; + if (!world.isRemote) + { + Potion d; + if (entity instanceof EntityPlayer) + { + EntityPlayerMP player = (EntityPlayerMP) entity; + + player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); + player.getEntityWorld().updateEntityWithOptionalForce(player, false); + player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + + } else + { + WorldServer worldServer = (WorldServer) entity.getEntityWorld(); + + entity.setPosition(x + 0.5, y + 0.5, z + 0.5); + worldServer.resetUpdateEntityTick(); + } + } + return; + } + } + } + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectTeleport(key); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 28b4094c..855181d2 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -95,6 +95,8 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.APPLE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); } diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportation.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportation.png new file mode 100644 index 0000000000000000000000000000000000000000..de03c724053eb312de67d10a59dae0b898fab85d GIT binary patch literal 50896 zcmXtf1yozl({^z8;ts)zOL2FHLZMiJ;uLrH7HIK6af(}U_h3bWyF;K*9D+OKNB~jadFz}Rf zadNVD_I#}Z0CMiupFORu=zQ!w?dX(LG_RE}O;?uF-%Spg zywc()CwQ&mqkoYD2ljtWWU~TBG z^`oNZfAWQoNIbRBxAnOWOKDzU^h5O%*Nhak|L=*|(~&aRQh1Xz`M4^CgmNU7k4&H*-&=D2t4Sds{!jb7yQmQE(T*3f&#;FT)6H&@fG|_O`u}zE#u(tcX0hBI zSG>_ok`Pw+|H-#!(D{Oq?#cX@=hTOOtFI{k{hM`T3;K0ODY8F665@>Ov{Znq30#&} zH2R+=78n2)V`tdjfZbl8npk&I63PF%7LE!*12y18-J}SUzbH2Y?|W%%D^7qXpcXe23_wL(B9YF;&g@oX^YWj# zGDF&&!_Is_?g;^OB5g7PbOBF!DMqXn@^ttJuhzR00san#+#=SZgysXhN6(Y_0ayB} z;tl;6JfG=qe ziE249(_si>kQmHtH#h`wGq{TLPMPhUv3{vE9b%|-;{4~*&GL>G01shLodP3453XwY zM>TP-RV3f?Q1P8fz)Lww3b}A;4qPkKZ%O_NtXDbbf>mUmSgtdivFr{!^?sqLM8X=NcyjTl{0E zcpY-j5PN62&6uYrg zrzrhVRH?TD)hI3L_#+|(>QNhc#ok-B&ztg~9BW&QSG?uLd-i@{&YbT!#{|I{{Jhz4 zpAug>&GQ^YAP6W_aD>ceo~I7%E9?c2TW+<#MZg;>v_o5r|FAISe9B(keH9z$UXs}_ zLZ4fR+p_znY05VsY;Sv#r2UqS@zeNq_D0^GFgsG8Q&ZY2P~)Sk{+a4X66a=Ad=ZD} zs@!lYLo<`J9sME=8hS2gAO*p>CYt$grESe5_9kr`BPSS_HM~n++wJr>W`U>_FV<7W z{J(qiiiPh`pd9bPI2v<}5H3A4zrA>1D#IxJImL?>6)8F^7VUJG>t5$NalGo{I3?DP z7xJhQ|8|6PZfcPWxJUkQrou$UVWgd9wcp>#KsjrFGRoSePf}{)VVism6f=00^DqDQ zxUys_2t!KtVpE6u0eIB7x;3GKJ)pc{c`!;tEa1~!d$oOvc_8P}&!r<#3wG4{-EzW7{%JKWJh`TPoSuzKvC%-pI6Hov8a0afHLuKmIU^rmv|xV z-BqSP+d%u1X3Yt6{p>4lnlnW>X}Ei0?ur_seLKkF&xupH0s1u#Xuv`Q2IizC=^VL};lp8pJE7uk=+oe=1sYB>O|et`I&Rxa)oeRX&c z1vy~ZzOLr^z%w6uKeZn{?2I0HJ-omG>+4jt3-{66U_%rS=YW;A%CDXR zi;ZK`lR_Hq4-><0!pfbeF)IFB7+-K-CNS_`P=GZoZSOTbo9bEvIGOGNkY~@${B|lZ zGiQqNlF9HhK}? znw3`C0>1J9kp-`Q9Sm|w6z7l=J-m_$PJ|qqpiw+@FcGZ{XFJ0?mSQO@Ts6ea4`37I z!KHPAD<+Opzp)!DQU1jU-0Lj-!d&@u758;8-054x>(XW5zc0a9zyAg4&&=H+0=qa; zyl<}fm-z5&r`nJj{UPyT>f(615OYxxFGe&_cBM$vXi2OGU&Sq4P1WKVxIOemByPa9 zYd5(SPc{AXYedDmTkV;c-0GXMlbCJyh44;aY{;LQW0FL-L3=z|9Ky#;s(&upHar6} zD>Vq{NY1uL2lM~YbDe#84$hw}VzbMh_QjqKpyN{f@P!KHmER}zpax`ERzl($vu(To zBUngE=6L})iOoyH2oX~8)=*xg0NNTN$ENCa>Ki3JtxVk-x)ln6sLTxlE>&pA_6`&s z@JSwARwLbQ54yXP=bf^51TkcBL%8T8Q4nR?(*0OKw}VzjTK~MZ@$z8?P#+hyX-!>_ z(zmkIQYJ?j^XMJb2c)B2b2Ye&r(9!r6j9^!WZwI-7WI$sYJ*cu@t7A! z<2b!OGWtd3pW@heDtbP{?R~MWBhkRi%%!{(&g6_lnk0{aR}^8n+~8u?eGpcwcu9|H zqOIbyYtYIY=fYUIYx$g=n!MH-xiGzpdMgeJ+@SOPWnIT;$RBb2mvk(Wd_?2S_MW|0 zn7ZUvo63e^qqDf9{qhQ6SSwuNN{b&`{{k2` zhV>ZPY&bku0z_(88W@xG^)|&w{BM`Qv!j6|l*4M0auHyBhkF=PuN+jNi?g^5iQTUl zGKzE`S8=ZF$L*%Je2N^+j3Ji(LJwJ0K9zUBjs?S7oJ9I%&^yHnVa*I}RV0MQC3brS zWZOdBDa}}~y1P3+yII^yoe~<&Z*>GjHU`;bX8nj?hYcC3Gy;s0dDa&vioxAYOd{z! z_rOx1`tw6$WhXptj~`>mHC3}zTo_U%{--8{vtQ<92o>Yepi~YAF1oY(;yrSHRC;Tb zy@ptTgOC38zP={d%&Yenm@sm->b24*a$Mpr-52qAns~FpxJ+*&){RY|?(9xg0lV%M zm_EB@0t%(f-*(q+XeX$U4JK0&x%TpZuK!gU49pS<^kL~9{hdD+_M#le`#7Ju!;@oa z(e~{$i;rTc@M^`QseGTkqNbVtyvQN#U;#lGqvtwa?*)5Py?E|89r_-Smr_uyP72Th zphpTm)AX;NY~BhnO&G#bERAMQN|cdCJJXr{Ro50#eJgs=lR5NgqT0-rAnUovnu z(E$9{A+`tbiG`5d(oycZ@jAKOYBbmSt;s0%;?wCUe=UF*g0QGn7xFnx=xmA(HwE~< z(-{kJqo*oCsAIzy>Mu8gl%j*DcvVOg`Wc{!R{P!Zc2P$)D0dp{jJJsi7!uVNLFs|B z73-sae1raF`wUj#GQjm3@eO~49{iqfr0po9YLZ!aBbT{3fqT7pHgBlzP94OK?a$sA zZMSz7&6`m&50B_8m^{dWddjVnzi-Ah;-As4i1nfK!-iC-NZLXewUNhW1Wc>!H)L+} zol*p&b`B%IN&@fWK4)irIqCf_D%gz?Cwqvh_sA(X;)$1HPs1F0&`M-0yarBlz?m0- z!kiP9q$q*B!E;)lb44ds15^-=Um`7_Rd_P3}o+hNCrb^Akr3HA)LxoDZv`^pG zRdXEl;1h=wym7s-L20;xF?f_Kdts8J2L35W%hgcqdHvI&@_7sGXbr`usFtk^S$#T4 zT>rK$S*n2svd!tm?L~IWEQ&FAE~<^MBI&>?#_;xcZtx(+xNaWa-YgYzeTM(Z)ieQ` zvC==Pv!>j)hj}y!QiJKaNqzJv;fLaP#)+L0gH<8EsL(ZmDd#9MFUo^Z$xFEnE+3w` zww{ltp*_$W48JIe;VDhs91HJRRwo(d^=oA=zStwB%=jZ&0ivc@h`;*Hw58Prz<_(# zM4KG_hL<_bb|Im4te5)hzbv85cyZA5k3T>kkLct1gQD4%IrmsG%v;H5#9B zEaY$t+Ls^>6}#}(ck1&QDa)Y171|aFnT{;-{lGA*A!);IuWM0yCofzK=SKZO%jdG} zy|%3+>^=KmT6vXN_m9o=lazv;C3q|PsV>zdWwQ&~T>HV93Ie0M2yxjsYAQDb6Kwb& zUbaG%v9aLqF;-v)Y6g5fJFpx?=mAl~a}MLaq%L$J6FC^VG-XN+(G^I}a(GLctXTXl z=JH?c1ohrQoj%)MWyJznmF?Xl7H(r_NiLz0Sny?J8QE)?s(~R+Z$-}P@Bv#ZOzvw0 zCh||eGa)>`N5L(6ki(E;wQI+a~KgQVyYL z`Vw&R*GnlQ?o@IvYM$MwqfTH5#yJo5RS3E4=c8oW$luEg8Vo4?`7ev;fQj`>j(OKz z9D*^$2uiY|QyP+sficXFbS*=kkrf|(#OJPtsJ|sdT^5y(_fPwV=aKVZB>B4ck8{p$ znGFDRD=1~4#a|uQaz$CHID6|1HJcbb@6zjYuzHvTi~=1i)H6Yxls8ODomKJ}o z4U~i{q_v;=LkzGNb9;GL^;g2heA(AV-(Qm%S3x54y%sT_s;D8hat{kqa-1Uz2)j9G z;387Ui91Ni?zYbxHPb(-Gx418T}G`eyl7zWVG3rQ*OqfSOVFN>a3s0+ef4VXotE%z z(6x~nON7@PZ>?D-=TLPsP>VBCOua9Zlkmk1ZTnOlotr%M~{NhyK`_)0TX^rMw~9llC!uCmJE1BShHNE2siSX=#bzb~4#h zLk_pMR$+(INbA2$dh`PLCV<2V?lmUU{9SjSkFKMB`L zYlFu{my)KRIZutt^eecr*OqP}p}Tp;<}7N4QkI=>3wa&1xYbXdVsVr94*nU@ri7Q^ zsF?P7z6X5TxS(ZO9+Xw01Zi1aaT1jzJ|XD>ZI9|E5ihSZhgY(CXvbZu2b6D$ zdx({78d-gj z794y2^~UVzb|&a=d-ykWS(ap~G|(>$0j0^yZ6nftwUZOq9Jv5m>pWhv(xE)vA8w9S zdw&HbgzV32P1)Z@c%6o%u0jje&kB9Qe8-mKExi+6t-|sIvUE@aH#F|12Slah3weZG zkD%P8l#yl~Q|iwK~ch#d$z-kH+2w_Wl7TXHGbJ9|!X*lOqL_#W-jawfs=_o@S-HHHRp3gJxswucBDs8bXC->wlp5 zNj5@r(K+y1s>8;WM-w7D0CVv0@ISCi{>vW}aGZ<4`Fzn%K8pqGWGy%?H7rZMeu!2D zHY9>;>qP8CAFQVmUi_V<)MO?-fIk;E9=sFRVl() zGoo?hg0t!hhgxYm*VVur>Yyg>m}TeElvt~ilxGTj?PTUU{F-h*=688nrO<>Z8v(6S zYu9b;Aj-wVjTq|KGt=RjJdKKV(pQj&+u1l#H(-KeQhad(a!tB=yrsf(Q6*a9$p>?&}yAcmuyT+Mf%DIwKhux9; ziE+$Umq!(g3v4h1{D0$UT`SoZo*dLPI9P9~J!RBkG30+Vp~Do~wHp-3uz^-`X~2UYVW@Y`YEy=^-Pg zI~&I8Otx|28i${DMotPLCz@%@y&9G1eh*n@V(4Lvs={zas<}N~73bY4eSHGF(xbM6 z+Qp50n0mZL$x@<0EdG-?)TAaxJ^lZmt3V39NJEZZu@)boKOO!yJVm9iww~d16 zxKOf`%`RU8h=bj*`rh68yfRG{4s_-Zeyt58CU2_+7aH8~W`z_h&cU9d;OSsedCHr_ z5HHOkVz_X|pv1wb+U=|pz2S%~Wp?S2AMK@jtTV4}SLHn!6O}0)k4q6FmEd$Pmb}Xp zS(&cl$&LEv#BEMwj}*=>J}!LQ+FR_pKlRLV|H{OPZ8tXfnf*ZJY3 z&#jF4?Z!!KiV60a;s7jxoc?4AmBUTRJ-*<-MSIFOW4>$8Gy*V^ue49gpE=_3HM#LC z+x_Cbmc&1j#@Y~TFP8XYPGR4)BezuQf+%F|Is0iT`YjpCkq z?=?ujU%V1+?dg>`FBaCKL*26DmRN|<8C%4b*fVA>D%7lLYh5WnN`LRl>Hi-7WcMMl zX%l2}WUzII*gK-J4T`*c3ZL2FI+G0X3>Tyj`6Bg{u6VKYRiH+Vd;OS&4L6DS;p8$6 z_;J#l>QT6?gA^oQ+jDeB7v)Qwn{=Gq+oHc{34c4w#PT2yJzUgK9)iTu9v?(=;5t%^ zF@BUY@t=OflK7+$E4n8Z+iSP=gedZ~jtif~+=wzm#?Jfuhk}+&w@EC`6a;Ed7a;lD z!!y+!6Ct+N;@8Du+ev~dRyMqsxF*u?lB$OEpFNqZHv z-AQ(>Nksp8%IHE!+61q8Tg2^S=MQz`fNp#oBL4X2eLjhTHI>XZ1}+WmwxLYhVpEvi z2hICp5%PFv!)g}lDx406-Ii1HzOp!=&rOquo2G}KZ0JUX#oY5xaWr(~t*m~9e?jUf z*Gl$jd7@G7Xn(9gK5a%bq!2rf@Cn6-ydQl_jRdffMw*qxz_t7kp`G*KPnw0AC+}Q8 zj=`w#7pvvaqDSWO6L$vb8#f3oIpPWWrNi>JO33tLvcgSM!7Y|N1Eimx?_zcYccmSS zL0TPTK_mmM?B5bS;^d@qNBlZR|1Okoqj!=OKDUrF9_7(MO&Afsa3}DrZ9hm1jmEd4 zV}AL2=7VwJVes?1E&lYp{|M(P-p#H>JIs=5$l_B}o~+t$m3OKa!cnXtM9S5=h(@Y3 zODfRtZ8A(6+HKcsv@Jumu>V(CRIB zL3Op4YzJ*VC5@if(@(u&z$d~-DqV$Vy?Dj=Yu^p4e-ntz2`W4^Q6gjvnyN&-wTKJy zE@+=!2_SN6>K`E>vDfXPTRk3)@o739&=Yg(sN%J!z^ z!Hih$@cviTYu|`}IQMJ4-DcOY%)~%WeB{au%K)wo1dytMHZgXMNBQ&9b(~G8H!miI zgx7dmH=_j)4ExT{1AWd%0k3yD-rv8Vdbqt{dgb3fOSj+mdR(?}CW$f3voz*FdOgirn& z%7N#jO(UC)88~vXcIOsJ;?;9Rwa4SYP zQN}l|3{=R#$D~d^nYnKB;|Lb7KYvKT&3MHD!C|Y8f_x%3@Xxe3S!j3hQZ7RuKu%Pv zu|LRKd9+~oVRVx?vjXNEL|@KQ!>qtzH^tr}!Y*UwH9;0sYd#J?EvO+m$}c}nB_E6K zzVDcM8hfE+JR;zt4QRRbRp_5flArRx&C+HJ_`^3$7OFOge1`CW4=JtCs5`I}^UlS& zRZn_Dmu1KM$RyaVmpuXc#fOY_%DP&3cER%maI*F*O-||aPazyTI{nEEUU_n5>ZCo5 z-*g_`EfMs~DGYXOm;yFgiBBWFp&m8i(>ZOssxX3&a*J}RON+n2Ft9y-EDhH2t!BKF zk~KkR8j5N#6TbW>wVJ#Cp9{dbf5|{{#fY)uSctRCY`m7l#oQMBY%?u%=`Wt-Mw>M& zkpkn-Y&O}@!4iPkiXdnD6_#D4`5lXjki~Pc_}PRVOpbW}v*@xlaYggc#H!*J=zTLE zhb`NK1m?T^Dw_uT0(Ia(US`k$aJ!+vv}_&@Akv zNIRxVa4^l{_V;A!)sPiz%p<6A`zLTu1ZJmub`1+k;$qR$XE|yyD6Qv)^5fOnG=}Gu zLka+XUfek2`FNzr;B(;mMbI6}-wZAX zGbtxU42cNqH1r>>%N=55&)BYx4nMZE#WQv?s24q;%iOhOall0$0`B0?b?Yef zAB}Cs2e(|5kwZ(uSV17T#sjC6b4hJN5Y&{#8lEXa_Kx|Rhx&E+_&pCuO7ZH%csEhD zHS%VjPBH2rN6y{g+ckRy6^USBn+==2xaicbhe~7gieQ1tm}o!agHWy&`!aoaK^e!8 zBFEA;5l?ilN<@F+@!!Xr#+2tHJ6>`19|nf=n8JH3q6R_TlY~Ih-vr}EDd+n$oecJ= zc_D^Yb=dt@AZntSMyO!I5Mm|6xFhS(zzK}td-2>dQ^^4$;2I$^ z{)6iJ&)OU?fO&)i3z;}3E=7lSVChl}!FS`ff)wGnAjQZOb;F-Lw1GomLSOY0mo5jQ zbQ>=GGvHU#oBIx(!#u*-IrN@aUivd9DLNiRjSY;Uq*kdY;Xj77i|1l+1HdeylR@47 zw=ZY2ANpeXn# z1|D2)=ZqBnH!8OllLn*fZJ$~TmqQO$)zrQQ|?k3=_<0_OITq3_wQb;cfS0j)YVhID13Px@?LKdoUc zNM{tGa71Avwk8fs@G^1_Aspocn?jU-5JD%e`8&BJT7=4~6eHk&y0amNiXl*0v(>lg z9P*;kTS$s?jv)e`f9m9x6jcz1=3c|A0aGSyO>=eCh_0NWx>k`W;lBs20h(SSz8;%d zS%|)7a9GGs9VE-Sb*!GkRECiEs??mblz11&_#p(egl>1aL|%6ejc0KoYJg*;d8!$Q_e&;_g=QN#&Y-g$_KQyi5Xp3ix3D8#?Dc1D(QqIn5oFwuP> zDXdzE6b#M@2e$;BTzOZ{awJa760_(XP_&)zVjKh1LCQ?4;x*|39PK&w-^->&f;!m&g3l?7EvCdNup9r|eU zMuUe#eCvx2UeLt}I}R;3vTh#}S+|dy?d!Z-CY`#!Lq&~hZwjsZyfYn49bz!15fNnu zvF>i7#~ZE3ZZeS%yYcVfw%cnwDm27OF?kJGnyS6Si)Hoq>udB1=UTv9jP}~UjJ%OqmWIxgE_Fd;;cDbFnrmZhuP++;1E>zqb3ierJi z-@K`aSle|(Ta)sjJ0^GpxclU|f<%V0Ndkqv=89;uy_?MMN&_6{!CMM-4$;(>n*ox5 zM1hDU&*BehZ!@7mfHkB^lK!u307cef$=GG@5I_gg5^>LspBKVwp2;jg9qo)dlpJ7# zn2uwPD?XXxcZRJ+iimEcE)->(HiIcm=}WR$apbj3(31&RK%63%{s>t2*rBcI@u&+j zV!JjSJ3mF+JdbXYpzYaGEm!(&hogm-_#x|pI8>wlLY{BRhbuJZ8g81G(#~TYP>8Vh zg{?kK=P=jZA7h4Vjf-Gr*9l`)FU(u?0O~?I{PJ#ysi+cm^I$69)*RN-3iK`cv3u(n z<>*k;!Tfo~33vMK=_DVREu=&)&s5<;I48qxy@>w3S4sPcP9@aq9nO$_=HTw!p2N1d z$idxZjhNMvSjCTp^9Hsdzu#c89fe$}?7O_!l}^qAEjZr)CaE!?-R{W)MTp=P|MPWaMMbNDysVZ@3-lzHb9vB{t?u~QB2uc?cxFZYsG`l zg^Gc?Q4Dy%U(v75#`Z0qk+SIe~Zn4sNy?)_9!9vxA@q<(U`f5@xWJy zwT%hdTX9|l1{|$j)0SFw&ZU{rJNU%z6Mri;$rXMUR4tw_g4uypIM6K`?aA z0ob+4${8jEml#}<;7Qd|CLzh@&@UY%Qa*G`-XbAfAjLAO!mM0h`=H2C$x9x%{mCpq z?Aue9n{r978j&x$fJdz}oDcPqT6^pAK|vl)lDGz)8O&$XtM+I#Uil6b;+hq{!zpiO zCBmUR;`L?CJO2@5t3vbTegeT?)9FrDDZ66MtIIF;{Kv`>%&MGtdeZT_l_3h8@O@uv zV4@;VJgZybWD>3swRRJH?Rklrv-pYnK}6zM zdamV}U3o&;SGh~=f)KPyYQ=GSQ_+hhJA30FyP+XG$bUt3Er>4u-YAMz<}`_5Nd*<{Fm`shrEqi^j(Yom-Uf2IcKzDi^wV37_hdgy$HvYNxI~;?)krv~z}VgPf?tM8rqFnl`B+YW zEl6qEcGO97!^kEQ+52-0^9!Iyaz{EW()c zWFoB;5ax8A?PMsPYx8`g;ZAGz$ZflHN{_23-KC7%l5#(B_89cmiffVa{{0_e4rad; zt`MD`kIN{x$n#^wJX~?uZg{DweUEh8VC-2Be6-~9OM|JHUv0t#Px7E6y?1P2+W)SeZ+7jX%ro zGZ=j&6Q~4~=DzaJqM!iKG0k>XFvRbR;&b#5EJ?MFe**OP-}A@BK^{0EM|ubzZPbtq zg6%UT2z4XLZcKX1GZb`ekbe|7`$aeDOUndwa1Jvte=iuVi^MVgfG{8rusyYEaV0cq zHCyN>0}nNJC-WZrema35^P$+$#aCWRFp)?LU%XSQg(F=`w9ySz^EAK}$${{({~!4k zr8=c1^b-|&6aD$qrq)Rp!&y#pbGOU`1H&WIZa4jGxEg8`#r}u)7Fc0BCFaqn2;{)kbsU&*)?liOP=_hQQr9{W4)xj4uL+N z%4*ezcD=E^u(X3z^2>ULgrtEo7a*htJ0wdZXN~=g!(MhM*8ZmAxMiYjoS8riL1`4i zQYQ4f;d7Ct*bmd4R=Rke^2WyNN?Hw~oBWLa$7?$?zbw5c)@M`FNHI*&s48X2zkmD4 zwxwG$^iqx2WaK`0$>=stZ;rdInNW|2j}aD6YfM4Ka0KA`9cvk9Az(p8v8DF{qtP4Q zhG)`ptBi~f(<++M1OS?5j>J`>#ul0A>G4bK?;+HG6V{nO(-v6#$|V&>R&VKn+sO=i zdQj;0+#ktabmMB#R?Fx(SG_5$LALbzCI{!PnE}_3ex^Si;zQHB3o-1m;sZgA;z}^0=w*69@9oiIh=R!(wRvLtPJJF6>yax1xt% zyOmWipf%O&)pz#m)JhtL1-^;g<)JxYL_~H%lhL4g(O@LGeNP@} zS%H7Fy80}Lf-t(OVc9GtP=Kd}Is*I57Ldj@Yd|SZY-FwI-W{EeQ|-%(H>lfly&*Q3 zepMZIPByah9yKDe?vbR-%)v00jPi)j$M~TkAg_ys@j*%erD`0>sVlE3;abYap=zF3 zbg-A~*`v~%MSRY>>WhySWu~mQ2VyAaEOh%ddkN)ZocPVBE_O^xMWIzj#SRIor?iiF zc1-H26H<#6{G6~q{Fr<$KXyc7C(cN|u>lh*^RI*7$JVvwMGpQ`F40Qr3f~byIZTG2 zc*{NCa`{h2Z81JD(1A>HDr}f=3Y26;TOh2iQ@FTLfAJA4S#7Z_$&s@fGx_IV4>ln} zkmh(O75T+YuzrvAf&5T&rqbOp*Wcd<-$E?e-~nbLy29fjq~;r$3Tvh&ZsZQE4Cy49 zyF;DxzbPnknd51I?_0CTZKlGl-481)v*j3^f7RTV z*Cb2X*$c1 zViq&|3CeBRrlQ-wfE|aq*DB8P+(w(4Kqb4M@S5v^15D`Tmw0F=t4pDx%(>9LO{xM9 zq%N-3r_QJF=_RP8Zd(I9jC)o$d7J?z8`M`jJmWW$(KX z?{HqRipU`cf$=1sPdphriq=JNVWdw9gPTl?QH_s}(ZRHY5sGl#?KmbXO5?`i@tv=g z!Fpw!f1#{H-i|j&wo~*a?Wyh&VQ+U8=MISK5Mcash8C=Fe{ByL4}&!s>&%9A9lq_y znEh(KzwdIbo_6PE_@#$iy}oa8;zzzZb$#X)G)lV%aVw{E0gzhXUvnPOE?-(Disw4z z1@^6_B|g+((@_U7iQqN*=uSf1^n^Y^miccrY2qr>jz4CTI?X62@7E;HDlQlsiLWEo zA`q>ODPxaPqXu|cdjoUc^v7`@1H^O|#5+ob|Fn9! za(T}3@i>A^DF&kuo$jjOENPzu2aWb==~=A3oOf7Tx)FF+FeBHgl`l>b1zkMdc&E9H z(h`rquz46GKS#(OzTSms&1A`8?EdE6R&c@kOHeY*s&9St()eauSWyw5ZaL05iCLo+ z;$mpVkl7vG%kpBAA7r3>FGKL$#Tnk*6=Z$O)*pzA-_oySj^03Z0>Y6P`W4FG?38B8_~MlNoG-?j^D25p`6_796=u z%hg{SMOQEE5QcV`EXn$u~1b2=1Xp|_ttf%}&$Gd?+ zJ!@u52gqh+ByZ<-QTwg;8KZAgAGO{Y-^r z!^+G~aCX7EM9_&kPl~;jft8C+DKz$Ou#RBNie0Yjh{FrFDR7cPhGR%X^oO(CVZUp5 zrTccP=A<+ror}?)3Q9y6fAF^x=R*cv0Sly`L%__TjK~^4$gy{Cs>JP>wW9MvsQiRS zoI{~Q0?FxJJvxFdS-Ld4+T;6PV@>|K)t=T~lY2zF$d3(gtG+4_OA?PGK=~dsy z9^m2KtbQ7z)4bl-Sl&3^TMeX*ULtca##J=#`7y-dDdFt)xH_UUnW?}L)n>17G5t06 z5(7kS^{sSG;h&LC*h~Q$TYE71q-B#(>ctN^O~mN%1uWx>iU*mizuM& z&!_Kpw^9~Jx;d1WB%^b1C+%m4?Pp2(_8~bzyfib z-yfNXkzZrM#-NzW6%{7Ow*fpiaL}GRX)7tUpl6gzn%^BYv1fHCescP1Sy&k_*5z zJrsgFW$-Yuo{+bI`PchA&$7uQ{bvg{$eQvC4$Mz8djnZPdqx{1Rr>oD$D{$BQsXj! zbRZ+818%cg*@01hE|DIpfM)|b#rw?R1tWHXLltQ`RLQEKhl!bPB*GhO7G27#i=56k z7gc^&d`*JxPlJqZCr!u$Yk`8J@YmCAJ6U(&I2->F>5?oIUXvWYdqWW0y9@St{g7x2 z7kcVcCMFiqW~UfX_MVb?inlGg$B(+W_mHozZnq%epCK3KEwD=&*^Z}c^wz!1LHEGS zsocj-9tuJ>y>w_or5vfWE(zew$N)z#ie04NJH3sDkar~D5=rn{9Dd?=ui$|IK#7Dm!kQ!r!gLDvR(hW3+^f63c6>E3;E8JVNEX)dRwJy<|>L{j#gtY7)kh zAVc1`tHZ(+uDE4*KG@~gKZ8ATto17Eccebaahlt=THJgeyUb2Esu4t&c(Qj=dF`9K z8YF1xg=2;0jLC-nMegRwtpd{{l8KC@S@@>j2#`H?snG$BnHY1v#DhwRO%*SMFu*NU z`CVETjdhwm3y_3cCo~br-gdh{RO40x!r7OxmxS*Qp=1Q4(tIc+o|fb`nl)g;tg7hsi{6!^BNw*2Z|MYsx5!EsF0U{%^X5>fXk?Ing)8_ zhGm@PMLIERSb<-xH&@-1XLj*MUi3?&$DQ{_v-=p!`0EI8d)8o?ZOr+MyuRDH;C!_E zJr7#t{@!4j&nH>-)%n&h2I}3bCP!ofj?Q*_6=Y78nipnl=_>|?z2%GM4ym{Ws2Wmc zmb$TU4=%J)m@%_f$*W(tvvhNK+PD#rzc>_FxCZ)M{e+6`3Qww9{80*s4<)D%k7>zQ z2bboiZLY>4L67&fOG~Z8G#HorbZ%AE)(b6Wf{XHVSg4L_v;q`4XVfAb`R|g2;8zZ= zz8EN>X2a2?zqpA%laUegZ(C*&2X7i{mAvnLToGB3og^kO8njPsmtX`3q}CiOvfa6F zr$4{@<^|W(cdZkgwMiZDGWu@kD;%HlyV#c~{yRREx*>Su^H>oj$-xs}RJ&N>6Mgu5 z&L6HGgbr}W1!x7+8-VFgf=R0hBgIy9t{>@9w92QOXE~!d*EK&>T&N*%BfAs(@_<;4 zLW1-4z2rXy=&fHTRe7YEIij*4m|PQzd~JQ4tUufN%#+|&@`kG&OECmqPOzv|ro2^8 zERjE3g0)LwGRxsl(YYbsXe#CO;l_djT_tbtp?8tIn6&r-OzE5X6talx4fLedhDQl9n<=M9-`cr9 z8VezGm6Ux~Qx<%u{3k(#r*MdIEd$sb(tLE<#)l4=92vG1japS`os>M~VM+LAFMjZC z+ti}0K@rhtu|Zs`(;*-d=$H2G<#VLyCvuwiSDKX1z?$oy>!Mqoj#l}%j)raj)&(?T ztPC}|?WY7N>Xi=U)<`T`(~3`CeJ+=pa*awM4}FoNPz*pPq4=r*bD}XNsWN!Ex^0(( zHggo)N;K`!c+j62g2i};c1?3aF>@2;=5kEXX!>g^viu`5ymsKt(#GbqC#PI}HR|0w z1>5exZr$_;eP>?1Tt+Nq*ak+G-KtS171%m9r9aF&#M15(EZxRQp0j+c1nQWf3djZy z4gVew)WBhT1vq&dy32biOLEx9E1E}M3)7P1HHN9v=g4{%rXqe`EsOpqHko7U^L0`G z^5FjZw3q4^=>@H-U~b?~3r)qrc_Vby2E&ba>LW#nGb>B=(Yq^8{>iGVxB}}oc9&FU z8Au$FJlA*OR%Rd}(q5Xv!J8gS>o)+JpX9^Vnoh6@p`)%Fg+FT?XAY}ZTV#<^#d-Wm z`XEzR2II1`L0qVFQ5+>{q#c3c>?jicXtBuOfD*fM*vJpgN#+B66&HSj!>$I-Yr^gp zktwSm-tT19rn-I3l!6sj38`$^F27bTnJj$ZPo*tD9Jh7Ot&P2R1B!{Z23OPhRd0+2 zP>gi`3LpIAtwPXj{5X`CkJ6u<*-Lt5KO-fjGWIjrV(;}fpO zl~7k{|C#RV>vV=mVAV)&sv;J?oy$8=3&n~NOT_)YW4>NJGReO5vl7C=`lu`nlIs6G z$eG&CXwf42QW06sP}9tY6Xaq;o+Z609(7AB4QTyn!_acSKEZeDg6dp4%D8)g6N9iN z%66dsChM!|Uml_xRb{ou9&q|lEJNJPFXFno%B2~nSSL;*Uhx8F7SLmoqdtSt5eKD< zs(hFH`xdH$6@L1Dc*c$-*t@zZMM6g3!TIPnMhuclJP0bDYfgUa5cKbcmu#@jTwaxe zNQtFbgn48pWil&Bc|$siqn3B2@!RT#zP`hO;5P`TrMrBWB5)5`NNb|;)XGqx)Zmcm zM+bF8HI&Kx&FsD!9pTozYgXl)$>Mw-A_l;CBz8x1v8Bymd{*uF9cS-TPBKE=_lx92 z@c|u|QpAaYor2b!#Y3Cg;;Am-f@-PD^#i7YMc`JjlE+T@q^Z1YWT7pC|7Tjf7gJ{Hu#i3)WV7?H_qiBYdO7mS8}*1)G$z{+H^b z-*x?2E^Kus8`7h{&+pap9MuHXHA%i3z|?Z5GR?8VmlJ#-XryfTu&6hveB@B_=giSvbs6RBHKejP2) zTI^@&!VyQ~4d2}I!e1@8ouVhsXU`wg191oH^{H1NV&5r=0}PTg}wJd5m9hJsvSJv7ng{T?aw7gXS~TnW@m)F{ zQVUNLwDUTnOj?t?Jr2V$47y1E{M#F6X~%Bb_1kyX!s{PcE1FibL>8}nlMDawWQZcE za(9K8F7Xr{KK{ej%9da4`^KsuKXqA^u25ED64P<+UhLq^YwEFI+~k z`07z3EkFU0GzsUq3gn^2f8z4YVP#}OCpgl455Zw^93jYjk`Jbs7ahDO#j%RH?} z9N)7Z5#0J{2%8qal8M5=6GhjmC4W^Vc>cN|OME5}!jn&k!kc(Ymut=$O}-GoY9oeK z#A!tO!&liH-?>rWA^%+X9_PDR0_);Z5yfjgJ!hX(OU$S9q#k5LB$Y9&j`NZXQ8D8M zqvhF|DddBy5Qgp6mhX?B)curlUF|2M&vBfe#H5XhCOhabWp)e6*wOwD#aoMB*U-GW z={a?k4J2c-b42MRK4b$uCK@j+v6TeDzK>Q=B({cD=P0BJVCWDMvlb89vfG9p-JL7cmf;k2N7MeX|M zEeR8#6msFT`}C98)7@Mt@VbMvEZZ&8VlevIZ4O9-aP?#y?N9&jPYfD=Z0#K~e?i8w*)hQ?aI9u2dPR;**wY z^Xw(dXAnHFKi(gWN6FT3WN6zz?4T5TPf3y5*L0#613HqOKV0!S9=dq{5loB53%>e z)c+I=%Q!j7r|Pl|Xw4pw>hemdvBNDF<4dS|F{rK-LegLn%G^fQ$!f`5`Ga%p7$G)} zuzF8YzJj!D=#Ou<=j2*s&n-IU!Wh@`jlGk9RZ_7@>rg7032Tp3Zfk%QXxG!zp+@ zD|do2v3ED(lCIR>DEiKZ(wVoFOl`8Hz&?z#7_(ku$^2e4q0Na*TjecTB2r62DD}4m zBTl5|bvV2P)2DNTh@2cK<|?LObw&q&-qSM+48H3@2o8m_>;rwwd*o!Lv2oIlY?8Yq zORS9EcJ38D_z&FTP;sCQ(vXI+U=1_1C0FnDwk8{rumZy=^Qz*zR49HLq{5KXPhvRR zA%EE?=U=c+Sy9mNK_@)1a_z=td~nj}9Bz+iqFt*sJsf_W@2)`p2bBZ5e>WTNF!b6_T2MlGXcH@CaQ{zy^>MOzh&=Q zt4cow%KQ$s;Z=yo=dZ=AJg=_;6}xPPMt{WJmL!dsI~0l-G(UjbtTuZ|w z1(=u|f}BUOME(q5;A&!@Q0)Ea{i(XP%6X-Fu~e(x;iy$mJ%au%s)s|OLizJ%0K08Z zb@ZDv8yD^|);Ay`7u1~l)zc3@LN-6!d#ULb;|0OS+;yei!2*=N&~SKN;W@oXEqx+X zh}4?SXn#Y{LHc>>tx=J{Hpm%(+Zz`%tTIk0lh*ffD$$D;*!ROR^Rnx?z3U zz|At}!){cHeKTR;Si?*=m^G-ZbnJR_>?iA=8gTe1)h7E2YwHd@J6f~@DbzK9EY7by zd!60WE*3W$_8ZgJDDI2lt%0%4gnjL^QPHjNl=SzdF_~RKewN$Y{71#9b*DC-)Ud-^ z(vj^5o_=4n+5?baSccy-(_;Uas8Fk&QuH8ZB88m% zW{7z!e1KIwoMsT;`vQ; zYKBVbn)#OYnPb?lS3mqD5&PCF%(h^t{NOXuIRfEskYS+#oscR z2+WNaTXZ8+^~>&4jvvpHiuPSW`jNfAVIxo*K`>5u(5he>pW$Zc8vA6_P5~ty&k|!H z&d6CK6?K8vFey2=-PxwW<8{n$FDVlib_uVpnfI3k#lv=c)Mol+w|>9M-(mL@^E8!) zdfluTL~o%M?vB6zCUW<=D?Z?Yw>Wyeh1hmDk`+l>@S~y{~d)DS1AF)DmG2{ zLZOlY#<_h|2Onu+8HNlm2fdov-LW1&-v2@Mtrnb*_{593ms zZibh~L{&?tH}Q=}>H=O&}42UQqQ$PBI=ek2^Fst4eKBpi;uFloRR zPhY|MaY1V*9($+M{}nsDXD6Fwlc|1?$ z`Z?%`H9(^BjkKVt%5OPm*Wg!Q{^qmO)_O;L2LDke6)x%D)#VA5eEu%X|67o?@bu23 z*H?dR=-0vZHEdivB#qPRTiYFHk3Z(-V*cGzuxj@ZDdY^uWi~hNS>tf4_-i&?^P8#U zP?k%y03y43co$)kdEefn&>68mVN6*Qy#G>;jndQ{CkDsH3tq0$8%dcriaRXSZKf?g zgnm*G`RJ_TSqqXpE^q0W4exQ1ZG&X%AM1SVN#9xslU+^hi}yh@F|TNM9-py!2f7~8 z>Nzp=tSDE?bhGZ^lgu06n7no&|Po7Un< z3VnfEIY$7GtNw{Bb5W#zRoh+btoH34&YxX{fcz5!sejS-wD>W$ax#!+IfyqulurPU zZ(R!DN;Xl22w*`6AM4SeIs&fh-Km=s&m2%3P$Y)5I>;-|ZsRh`HU}M$pniYzNQLWd zcK#R`L7da#A4w3uKlUU9Z3$S9u^@!zG*=B815PJSl1Ouk5bw9BRt^ipogahD?RK;r zD!Ld9TD6>fD7w!C%R%g25lA?A`oqCx*3pL`fXTTvk&x&Pgw z3=(u*sb{HpG{*N&k)GeDV!olH(~%7{7q24QbhM*QtV|NQjl>m^(N2&LjRTpz4w>i} zC)Ii8dL>&=bHs6$x9Y=I)KP<{9@nH1R|eX1x?MEJz1+Rg)reur+S>v8kt$%1F_o{J zX;D|f!o#PnyTAqLG^_5BJ06K!333^tVC9gqRbDopl13hCL*HnbPD|+wa?xy_=yV6hNtNcOm-Uo@dDkEN56(kZQZ^Tln`sSK2;f=sS>B?fdwhlI1756ZzTfBu@ zCMXMS?cf7XC;-R3!(n635l6{=;5RFY;?mbO47rCK^gLtt$SzTw}YU;#s;L^_Cy zKcNLZCs@h(h(M1nVKC%Vc3BafjSr)stZH#s%r&Xa77f6O>Q4$CA(WLq^y_O^E4y<~P*zspRtn#-ZZ$UaWR9ngQ zrZYL!z`?qW6-tKO%~$d)%#G=vSPqCTqJ>L(3EE@4ausWQHC|l=wxUki%u1-5xZWCn z+j3>x;4}91_l}EK`k%=~k%V~$(!~hYm0Q`$BY^PYL^oBn*beAMtHu!bP2}#NDz4-T zewO&X-hMQ8IL;k8176~gKU&-%I;5u&*8c6sdj zWZ-QjW!+5IfxvaGX~Z;?J8w+;JjtXWEr4dF{V_(ljGj4>Q(#5YZ)Un0F#o6gtOg+w z!diRX6}lMy)dal&_H=y>B*fdzrbV*UF6={qMe=y;MmZQ})^*byGQ5gu^y^wriG1_Y z$9K&%@k(E{Pj5xB;8hiziJyLWP*-H5xfJ_bR)6L3_fjq#tsb?^^A_L$oGfl0(J&VN zwc8&$%=IoJ3C~_v9Z?q@(d0@?)}hsxYde@?^f%Etpk*cpF=xH6l&KeRz%zck_7lc1 zXbYI=$)2Z);k{9LL^jt13` zOPV5z6LKer20vD*lzf|WVJd|f9Gx?$#HR99pQr07bIX@8dn=sJ8)LgJ&FW_LY6?rl z5wVrML#y3Wn}4#8J98j4=xvN8S2<9Rh@dzu{a3VE{LOWegtI@oLi3RdRuY3i&~+6E z8Dm#T48j&I+A5Fj*a)vT$Gro^v-q3-+^06_@#L@g)w|!!*M;i(7*cJP-%uAR13y2_ z>yyx&>t$x}L^Qc`oLV+_X#P7O^ut$I^V^xuMTKwuXpn;lKrC`X#Go`61$a=h$Rb*? zeeOg~rH!&nLg-J(T@q@r<3&GVZm16woK(z!)5I}%hTjXo^|J?{kjTC|OZG28lSLSR%JEf~u>psV@ym^u8 z6dyf`E?5n?MQa}zpw)$ozi~u`atf2f%bB=1f8C$&@V+G1f=0kTCs5u&K3dD05~qF2 zL`<8kr3qoStbZwC@869yM)(c7p-QO!`0^|+$de?Eb(NVDL2 z^id{kBVsZ_D{x?xzQB&W3%*I&inT7=)aNDHra|gN?UIwtG?)JA7pr~1=C{B*%d*Iw zca%693V~h+J%=)P_`TpzWdg8?LFO;jl9wb@=Uohp27}YJ`7B#DJ?_mgxia7e^GzgS z&7dVE5AdMuklQIg$gM&R371{bPB$ecB^Ovz*h*8-Lxv7VK|{M$QJeS~Mz18XM#o}K zkGfW!an`6(I{BFH8?$UpoiTs~jyg>ZFkCV08D<8#Gzj-G(KT1s!mkQUp^2>Q%U%pr z>XQElB@FT9qquvvm?S*@grwAk!evw;p4wK(HzNY8DVqbJA|7to75iNTjc;osJ-)y=z?2U@L>MyASd@khEd8VP75VC0-K`TG@!F{Gt#x}iv z=h;Dgp*7jhHHImU`yx5GTyN_RV=#9iOkzmFVhZWBs8vtTcTdZ_Zh8+DC|~Z89`h7< zN6wEkc}Bak34tF}A(Ex^STOJ5f6i-$SszggMC%1Rpxmn|9el-8Jp;e%YrmrWT1%SC z*!ptX4K+h=h^S=F^RNe-QtLfQc7^()w{dgosL;emgMKW4Z*sS2G3@gR&kw60AoJHf zC*`E?*L~HrcHL5}2X9KIji@kSzflx_dXfZ0Y+*1Nvt;Ef0187|wc$i5Hx{Y?Q4nza zAOVRfg~N(STAalKBdT~qAAIixfMqq3bnR!f(FFLj(*x6>CsBOQRFjeB$J7i>RO_@n2kSP!-4(znb&!!w>d2GQL5 zP0~M{D(pG=g_y*vy8T*Lxk8bQt!W@F?34j`CfI8PvIT|T!BQt4nhpfWz@)RcQE&I2 z+CRaR%p~!TTlgu#NmjNFZY$v~!Anbl?2<+EyL^SD4`nvl!N(mw&*14tE~ zYKms*U@09S4ky&5@=;LTTMXWKHKG#7qXB8Q{^e@}vZGT7-@M@f#uOo!-m(1`vL6V{ zlMw_dMWBOt3>O;%Ld8r>{FWPCY)=+1@Hy~AORRdV-+Y^koYOAS+d&*ajN z-W{Q{jd_(y0hxsmTJ}xkCM^{X73D=<;0S@f!rnF}zd{B0*=;Ajdtd?11hh=+iltKr zxR<^PJ$}!Mzzr3&EWkq#sa{mvw}A5$Tl5ajM~-O(rLAO?X>(xhigg!*#BNpdEsaEU z#OYy@BHaLRB47nL&Cot5M=yjklW#%j;~TkoHl^u2=2}s>(O24!-Tb~z*?c2r1FM3X zIQzm#bW%ldY^;vny38?gflmV;VPDdp0uOt zpboB}uSI7sJDQp_|F-28q-E1&?J^KJ%VD4^n~SgY;0CDM2Kt@k=InP)P#q^PA@}u` zi8`3(1vydqaek@Yozywai|hVR-6lNtv~t?y1|alMm#f6Pvx|43fv7Md)_aU@XM-QC zrDd6pyhF~&b{_h1M2OrUkZqWtKjlby*NuImmhqxTKgV8iES8?HuOs#kZMAu_6u;*nP z1Uq;D13AqV6l8a^D1@GP+Jpk_0X+x|oTVj|Psa*ej*_0P3_fC?qxqR~G+vAb20Rak z+n$M&tu&5}0;JuOb{x}xVW#9YlN|*Z;^{V6es880%(wX#D4AMgt`%U>PliMc<5S3Q zKXv#I6P!+5^sm>@Ipi&^zk%TS<(JS-LoHX5!6 zX3kh^lzxMZQXcrw*@g*^b43Klc9o^%L@W-WM%45%ApWYVETQX)!AS{7qwe7gM_#8e z5NuV0e*L{#MTNhNmK=qO1g^wnv$(!rTQ`f!rKrpFTe2Z}1F-ti7hFZJj%v`yc1A_> z+zcd99}r<5+}{yFacFQuse<{|`bZ2MzSn#X(w~jqRW)+Y(LoSbJ$86@;kmGNl}Jel z$8?9Ef*P%21 zVKBUtcWl^JN;WR&^51AuqB#D8UF&->wi)3*IKJlR-|^Wl&v&Scq_g~Ys%@q5pFIQs zNoIRB*uY_->uuF5Vn2uHHVSms%eavX>@hMpdCzJ#(s#C)h9z?AtAqap{diG9hd^z( zVV|VJ`4o2$`PyKVs5#9a{&67E++}0Baw-VGLkZ~w!!s~s{$-a8%oBj&{VJ7Y4HMH$ zAA)I2+BRgSo)L&a;$LaANlOHvO+7l=nH3f)MRcGMs}_{SP6>T$fqBKp)n`eGv$mHM z@+2tjNyAvuhLN!-4CI15sl)zyIn2EhK;YP=l7x6S1+vjhZEwzBjL15#=Hk2e9B1uH zB_VLLNHMxI=azY40t`UYkTyW?j}A2shW#^M%rB0Lc*PHR7V`t5m4om7Bx)??u;DyK zAjInlRD*;`;bmp2DL(T$+z4?S_eS*cPcOZsTv=ZC6=IGKahy?f9ya^&jx1Yqb##E) zD&-b~*-F#T0{Zt1v*S8_F&NgKzD3KEEzmhSwMed};O95hVz6Hq01>B~<~GSKl>USu zWrr15A_LCf5u3K7tCpqu`gkKcJ%3`kki_THV^+W7t==o=C7+&#lCl%^9nrn94na7I z85!CVy~_1LghF<`)U0Lz4e*(HGojEk)T@`sqU@3p6)mH9nPWEr-s3$79{y5U1XS7IA%ZSfaWT=n6Gc_E5tPF-GGG z9nk19Q;b?M#XrZc#sI;I?OiS62g$KVm+NTFK;$NLFWv^C#!K~_CT+Xk055uAO zZXAQD)O&iTMQz7B2#wtOR`H*vZ_!}RR$y%5^jY|O&21#2W>W$bluqfay+pw*fg7we1s@ij=oFO&Eb z$WYe)e=k6vJYYbc8Y2tw7NuN>e;og*ai{{s+&(?)l}^!7-?g*uP#6$_p%9!s%a|UR z7$s_q0Z>o}X)Yqg6#S{u18)KP|C)^WqXUoN)leL`B(}9;5_N_pwK|pD1{i^}<=5iz zPZ;WR*7vI{=sCSk;_iI>hY#?Fpsdk8hiUv{MOrRL5?;Qp8t@7xdzIjiIui+)V?NX~ zS%R7)uCGkzDku*+#6obEsJhT2{_lVY$Op3d#?3JKX(r1(`GX#ovzCzY7YxymwFm7hL0AON%b3PkAlpJ@r z>SH5(CKa4@5*yuSMN98bB<_o#WgwdyJL{98Rqj>kf#@MuQ)v4EDwU%|vCS%-I0Y=w zp|P3WoKH6ehS()Sw#dmA2#$lbv7B4Bpe9aQ($ohXY-Bai{tp(X<*w2a69d+dyJ zlfsL`>IeF;PkLn+Z*u@GrBx+5weeCTWZZK)0+%^`w8lPm=(Fufdruu}?e%Km^$IdF zF$yw7PwP#C1^*ltr2wTsM#UQ|!j}#5=Q^ob2ItN4sdnN0;r)bGbq#$6tVMJ6$kL^i zO1qDb4ZG3S%b&l@dz`F{+9H0*fk$_YIQ7^W{>)dtW@{j1@rE4sa{fh_!6Il*it+7e zg@C(1BI>@*h()D8hBk(s(i0^*gn2U_N1c_PO3_3+Tva5dX~(IH&xgkhG<)+Qi@ayM zL5BY>zrtjf9A+JT-^_S{Q*PH7ZC6Q@stc zvFx>yDZHS%jyRHORiiRH>gFY*U#2}XT&#e};;00u{df6Q^PD(x>wi7E;xP+gzvx10<@fw!YzfkZd#^D`0HTO-u9^6Y#unS9Pk1(_#8 zTEsDrXKybK3c(2ev6zp3GNcOFAy%^VZ5&Xt7vY1n{Fs zlT%_MX{58GTsrlR^rQs`T(XIH4^w5v=Q>2q89b+p*g)wiuj~7v-$IrwKITEaD0&?B zNd|Bev0&tVLvo0|Ca64_B_tt~J6xO<>zA3Zl95qd&amQK2Z0XJkSWO6P1 zzET?l_WZ`SKa4Wg8~M=?YV5oNRg;}hvaL4@iW?5~C?7|9PyW(h5YO6TW}0Q0Pkm38 z;;ht?)`7gsfR1AFlZFY+INpj4M_!f;Al;z{fS-@U-YDpxA6qhCEK7Q<0k1b0L`XKQ zrKU)3sXM#wOn4vg-MD~d%e;39aA+UvV*tW&1_j-+HViA4onnJ|1S?(z)WaKY2pWQS z-1ULq&Z0`?HsVnRdX!thr*^}Q`V8NVLXhAwz|M?_b&~-47sjG}sAU1A`ljSaW!B)76zRo-?!be>xv@*JNPw+1tgM=UkV8SZ?2bB{Q z%A6-I89iE?wCjsp&jmJ)qKjMez=FnXzviTz5+V#a+4_#AhtiDOR<&p@wy0DZegeLc z|FFmTqD>21@Z$vF)i@XQ1qJw-4kXBSoE$Qxgc7bA=AiJ-o^#>hC1Phe2ErNUsi4Pz zAXeDNWzt$@=#REjHw>nWCUx1~UmXzW4m$X*DMM52))xY;#F+NtEJiJu0Yf$JlzFqU zR&#>F>B;;47OJ09rZ}c)&yr1b(aPHaY!i?{K46LJ+%pg$1Ks46qM9fC-#c;-NF%u= zJAHH)?h%a3oAYRM00M};yEAluIs(rfL% z2`cP&hj!m0Q+~Vct{`PR-L933Herr;BAHo<5F{`iqn7Ud_ItnVb$I*GpKr_vREFBq zF`HUzPJTG*r$i29s0GsiAS`o!-=k7_PqWe{v2ijCLp{x7)HKyiaX&Qbze;}#?B!{3 zI-&e%aLQIyPLL{a`1(C@NyCGsbSf3HSdLZFm}j$Ts{RiLIk{+~37`|{xc36;`i9>S z0ip6i=CM&Km8ap4_|n*}D2W06<>(&Cp~!3Q$ScezpezLSg~BtOlI+fv>h?nI_Bj3D zlV-a1Y;Q-E2o!{#(&B_{Zfmjjn9LEFt#~9IiCvqnO_yvE>AGTz2*6~$i)l68KU!1; z$G$wRYN^!ttPiqkayK2D0`>X1#~3VI(@eAIKXEXEpGgMSyXo2G?vMwQRVphX3*}g) zi&5_#)m`@XQ9*0ci)8GjHouggx3coljB=j}(_ReDk5O&=rQw~#;olda|HstEvJ||L z0Pd0+40Z46Pd^S43CSVHxuS2YRIVc31Xp}{hhGt+2%1BZ4#ColyNsCUu@5K*&8>v7 zyem!%=sD}uI0#LtDb#Psd`TT}&5Oy}ObU3#;yY=upP}oH5hP2& z1F=+p6{91p%sJ)+|0{+G^t?k;jQo5~;D4XF;C6;4lm(3m_Da{kMv zZgDSeZY?$GLgEV)pM|_ySLGeB2Hw9n05*ZcM0h{EnA&eP4A!^aQE~N~u$BjynZ=;z zp~NL*SY1IDO=fUxW)Uie6{Z=p)1rV=gzLqQZeh))Uk zjY{X=vHoZJ74o`##$*?nZq{mV#8s4A+)RtVCDl@F2oG4>c)X1q)sry0wA*PtvYyJs|;(t5>r zddyFCB|QHCGJiD~mJq10WSU`v=QIbF>c(jI4F~Y`G@Iq)d7{W`unA;bnDd2{a1sA0 zYH`}p{RD7JO_nDrbM^{7N*FV6rvwbS$Ll3O5I{qj$7^iDI#3cFHW`tX6+-AyiEDp!+xL~+uokZZx8nSPJY=`F zEj+w@<_*Ee=pXCl1eo1mXiHiRlWU3d`{)OL1GEwT?ZpNL2k8bEQ30k>~TEQX?0ngVLze+PahY{R$XhfFCTy_5t6s zS*f_TR{|$&yIE1f4+%aExL~aA->bvEcEe=>TEd(#M*QzX2pwD|RavPpF$n&aGkQkE z9uV}{T6WI~Rjm#j3E&OiQcSN76GQsWVV!>`avc0g1@Pl41x};3?ZrD{yV$f>&KXeo zRQW+a>f3(A2Xrd=Xsd8|7>MWCP*-7rsAF#`w9!(<+rKf$b5COdZEJ~u%h#p9RL2*O zWoGXz)+mwJVFNFe4*$KD^!m*6w((7iVp7O!-18_!>o6T$AmvLzB6u$a=h6Y$@R1Gt zBw%pOwl)PuhF*67`1uQDV^lu6__(LsbL&ix;K3u1IFaQmSE@)LHGjt(;1X4;qDpou zO;g#vW4Lw|&7Zmi9@He>bR66oIs}Eovu^`Rr9G>z$g*~QWlU3|74$Dbhug@l6f^xYb?Bf@tGss+^w^Hn(RK%B==2C^4urP?qU@t; zZdaZfPt~d~F6r6t1+cJ|2C$cMYN?F8tW-Ltr+U8iV4Hg*5prHv%dJImtz*r3_rV;m zbjsv&m>3f zNK6=_HNXS&&V44RIywf&6zrCz?SQC${P^V>On_V`GVOX-N`$I`;>Ix8mFykzMcY9b z+VkG!bxMPgp8_#Vx+5+RE0Oo707`uRo0M8o`gGo{q4NXc z2NuQY+NlDg)SE(26IkE@yO}%0!qpBSdNfip#TtiNGx^HkSMuP|ZnFVd{K7rd{yyI| z83}r`D$K9RYozDa&J0FC1d!``>*l<@Y%IVdB~<79ydR@)^+RsRWJf41I5Xn}OkRXB zoMgktB?HuR1X2uEupOa{&NiKUMLIpSQe{PfPl+T=N(U0v)QlkB?dV`dxEapgsZ8Wm z&TnNAP1^KKAgN64<%YSzWoWYY!4Y|YAq|@K<=xrPcQ>RZ^aY51TF7Hxp3`zvU&$T@4~w;!*dUkZil10~nrky$x&S6+j19sREG3Sqt@ z%79-BHqkp$(3J{YcOQnwSBf32EtwRWAqBUW zKe<3o^!tv^JmYxA%kY5ONK`@m?9&gYnCovjYlCyjv{Lm2&%b~0uWG0*n~lDv^cNf~ zG!QZv*T4`ldLp^IM;@rf@mV^jM1&3nN{|#p04a<>X*5?`@L;9!H~pK0i8RBHH%>-U zq5|^(a72@L0$R(}3X}-b_t!v0G)#FXXgjnOpL&>03TGG!NdJ^bbhGdzVD5BA$@hQIjT$4PQ}8Rw@fys~octLH|jjO#Ot@$zz@O zFydu5zm%+xB(3)Rk^Qo&Ub8tweeZ+;_i>@uebg}x4ByQ@F;1d3sZmIBVw*3B$6^fU zz<#^4k6B?%U&nYl@`;bt9<(+w_MC4QiG3tqI;B)P6-;p;3_q##j+yc-OZ%Y-5g>&7 ze{x&u7T;+7F#1|%U8HW86)54^S?rF|PhCQWYi`4;fWsa04?-_5t|c<=2hI09TZ4{K zpv_n=mFv3}({>R{nOxxd$oFI;5MEqa9N#-W4`QGROAd0$1%ysMbde37{kyiZ6Zb=h zBkqqPGBvGL^W2J7FN<`vsOh<;N=EI(E@nNK4(P1aW`r<(hDrvU^`0L>Ki(#xFkFzB*juS8^Pw zIXZNQXLU5Tq9Ft)7<1U{*K~h`T~-!T`O|0r*+ppo9^?GOZtvIuH33+{LF)0*FfSca zYV%RhTpQ_~ES}1%=X0Ek^PDlipoAN8%#n2)*7D6LKAdBJEB;l@nc?LZrMifmWd?&Y zlsR%4|(t}tJ(a0&FWMeENO zycj^)uu?I0oV$9(;R>e+NX`l$7a-IK6PXF47fYUME7`JO-TWry5+!l48cT@0DZ!7u z1ekjc9vdJt^C!6nV8b&6qZR)RXV?kTGOltKX&1JQM4?iFj~PX<1CS8?oJ)FRpn++? z&2w+rqnt!QiZHRjBXpH<{p=0o`bR$mU@g^?2_5M2mpPM+y4&=?aZ}toK~O}A@1ECr zMsrMrTDY`;`m1D;)(o8n!D)B$5&YhZu2v9tHBp-OfVI}{d;vp601Fa1*WV#)j$^j& z_nn)z@^7otj1bWV_jr8$_lLkJq271FwbJGWe^Xdq;^Dx(6ist_i_hUd(O)n!zeJuq zGNk)n-Pd0N0>E!Ws9Tg$Ol3ojtsNNKoVU_KU(DeAsW;Zmp~sT4MXQfsB*6QmJh#aP zs7-R0g(7{I*Rc@?yT$}`{tZTg3-VM3ct*{sI>q1hyMm})QpsLNN6*kJ6$To9N&HFw z$=Ee79PSOYNGlh$m%i07yCB+Pu6xu$&Kg(lg+Kv2eLU?ynIClML`TMxseluvKop?|_n-@Vk zY9<;K;IY=H2qz7D@0wzE(4V^XwpwyY`rEs7yECmBp+CReUxk?LTDdEw+m(G8v+G=E zOKIeX1xtIpmd!WD;`(T*&O{bl`#?VuNJja4cs6Zb^Zen7X>^L*hfE&J)qdf-@8_$f zZ}vbLWy#GkYNZno6y={;jvRfAMUCq<8vsLpBqgQaz*aY%nwpQ=+RJJon6Cv1qTrLw zE)g@fTTTZzxQGjQXHbwqN^ud}_iszDAF(gvWD%W0BM4wC1bQ-c=BK;OhUjfb*FK;J z$foCS_<8KwITN-}KU^7Rp38}x3jLjgof>>m*zL>O4FrA1g1-b@YA1G9X#!f0Dy?&F zcr6mvTgNf1*;5yPm;6iB@f7adj3wBtsFyaRp5!aVU7mlFZe7gmsr{^YDz=wOPLn`r zSj@a;P&zeQ#oFmB)6%ii+$&r<<&5Iw(h8od)EIalIbzR0&~PUbPW36$wTZ6p#AZV7~fObb0`yMtZ3m z_V--bVy^1IEy$;mm#dv1taD`dC0!<0Bw6n|3p0n+r<)uXTGxrC=X~1R=hvKhmLgby zE9vLv76v;2=-fUN#MthRg>==3%wK+R`VgZ~^Q-S>KX2@&cR6%_MamoKArIFp+rHkVz~_JbNpeG|_eQd#isWYCv_r--ct{ zH<5N=CJq+=YTXNwiNa7(*)9}}Z6gf4 zc-c(kE~oPcjcnV@g=jWX#$!gMTHG_Ibgdo7k-&irXBbB@s?@H^q><%Sj#dNG9)bFd zl!u%gANTkg??02hlL#xOdlZ1w@plOO&h707SiS?QteSnw5Ah2##+6eAUqXMJJI6TA zmpRW61n+^nxLNA;vZp2*A{}e4M=f8B0tDG^_XR(?H~UqN{o^zcDs`eLAfk5FRp~s| z8g2ieDK}%d@$k1EV`CF{n1D9tmoZA5z-Y`7H?yTPkf#TPm^a+|D&n_X?~IwYu@w%J z12r_)f?R-{pgv6sQ$?UmC?1BYyMfT&Xb;BcjU5YTpC+UtLNgiWir3WB@5>y4FPP2> zn5)N)I5Mh+-*O)fA>LBsT^$$|nNu)Lh7aL4-Z--dv*_SF@wY5iSDTaxh%PlW`d^|( zsCzRHh!V2!m2$d-pjmQnN0=_R~nTRT@+Vmul8_k?^2c&JdF^$4p|xD zpx}?*J+v|7O~{@hpR^Auj0B~!ei@|Eg(B5^QoQ)6Oy!e+K4;yBD_UmOcP5It?~$>E zvz!gn@{3}hm;)J50hpT8_C%r^IU-tum`AROkkX8}utS(^;A%PS8EBckwxZ(Z!qyNuz={B(V(dMMTiVU z9|6hM3ip}n*$EW^Z%zwX+b1&vMF^|^|EaxxtrDn)IY!Di$5}b$tU-tTF&d*ZSd1vh&Gzz^>9k! zy6j8Jsv#9YK_cD@Ya#V7b(Ft@Dj<#4!;Lx|3!#B~w{3+dV)6$+L@pMaElVDQ)PmDj z*`hycGROZUmt73F`?8#um1aTD@-l6i@8Yn5)7omG-r)C0%1OV-t1^P*yM^di%0#j@ zDNYI=h6KI3MW2p85{{evO>s4enH|4-U9@F2|5eV)TV57FUg>ILs{IuwavekO?ZKV^ z&L9Eq;~dY1w}9%o3(*RLh(R7spfGh7H)<-jHyf<6onQ(lJ1mH)(8O20ZJNngti{6E zontBQy-rW8IPPx$)OE|wyt7pv%~$`cN$P%|te=l%MmMmO@x?zcSL%IgdoJ5mV+TCT zQ$9^UPy31M@hTDJHPhwWAFML%%pdWO{{YVWPIT*c?iv1>ibPpHZXTz@H@wJo2{zU>5}$X4hztifLYyQBp4 z-_sxdLHCdvu;|*kPi889)8ZA)+hf_~>7DG}cWaO%RhgZo?dbTNb?b~_UY9cdtdCxF zuP*;ZCTI{%#q4)vuoKcxUH9q)8Rre;SNNt$XeK6KV(jz2&>H6CfXMfM1+sIl#TCSM za;>mO01x<5p`}wlRVw9^eXo(VL@v$p#;)HLYSv$UBSRD)d%>UK!iO1J;s+^SdQ9ty z?0>KbWQc7kf794O0PNO>Ke{o0Z~lzBuP<)IX7NCfS~v{@B?!tcEIJ+kmEa-a8|dGQ z2yIFkGEVpUi`huce}o}QTyXsTYHMj9q}XhPY072*9h4is3XkOBB8fGx4%M;^s zZnqWRBDtQ8$3TK%?zSPJLwEQ7&y0Pk;I9eK4mGrMBs?-P3>|)yP*yQx@(-GQ=KpND ziCnLdDx=sfjU=7ZINw(=quH&*G&ZIro6%iKr;G-&rkhG%%Ye}(9;e+3?)$w3wL4LB zX)y49EmGI@Ho_a%_3O_?3lJIqofDq@k>UNN7U;`t1PIBUe4pm$Jrl}ODfML*;RC>L zH9voaP#8%uDA7H8Xyl|}VO6hBhGDIN!J%9tFsi_+xq>l#z zD1#g5i6tJVN3d=(n>?`s#pOk?2??BN;4D1zP|b6{jfBBI3wlG--=^Gz!+hbTglBbo z(S5Rqc>y2;bTO27A=$OS_nrzsmvZ-_m~g_ncD4g>Sm^&YAv25i0EjZ1Spcpspz4d1 zQa6_Pl+`RUH?_delu{?xH~~_%H#aJ!PC}5Ns+Kq+&pYq}#_2`?7Zp(TRkG%*DFE2; zw=i!!On7JFo*=yVV$HJ^OMh3sPzfbGT`BdI;n}VTGCjKNT^@f+? z9%&fsF7U{OsAg#f_|AgfccWoa_cfF|#!zm!JTpM^`&X3+R4x&Ia(LDs{^{a zwuT$ec)zm$HxIkla2~FygYjvXqqoj+1-I20!IWeZ!$GOPJTu(T{$mX9-p^3(4-S0@ z=V<7i@a&zM_s#MvJ3pd2Rx`*em~&ijITfx>I?1QdR$Lm=6zH@I1L+u3JLkT;hC9|_ zOdZfv(;7voTS;=1U)A53kIfA0uITw_S_k8khq3CbMfa5nIZQ}yWH_ZOspHbLr)rXq zY09l8xrIgh!;xec(-6a7v<^BK@nij}&X1`27zkowj_*+t(*&oCh=56S+a=YNy(x`Wh&ATAr~!3YpassBPB6>#4iUv(&e z?KHn#rp(r`P&pRtJ)p_(XoC4=|hsGqawLFh&00xoDJ~Eu%yIR(x464lMRxckjtxh!hDMjFuGrX^V3eotXf#kPzJb?k4;lUED;@+lH8z* zZ9G%cjvGn-P4n9+3EI)sv`neXARVwyi|`>M>4sypP)o(`tcl^dRt6q&YQ3zrCUwLY zbg`IQ0N6i=`p*Q=SM%F>5bLO0dG za{z`brIz@u-J1Tsl6CMxm0sBbz~DL=o7DhLax8Y4QtJIGHq)d5(7FH$Z`?-n`_Z

126#V~Flo@M-s+D$Ug;bu=zVIrM8zwLNl3 zu5WPR(;3Zmqdun!=@`{jj1i}6>iW9kagd>pQ#5ri^eeYG!aB)7AYD_`*OTN=60E^@ zP1)AV40Ucya<0Q7UQna)cJa|(NOJu;pdppwdLxy4nXSswBXPc};jX!)9_C9n*M(&l z%pKeKiSR@nE=$=4Q#j?nW$0U1L%k>YRa+cU^)?LriI#P=WDw)u<{s_d3~lXisQ0&q zKo@a%sz&48gyg>++Bu~TXlPIsHWQx#EdO~sw+i#NaUG1q6o>x2R4dyCl21Fd^AX{R zG{px<*$$HiX@`_`o@l7Ew_mNr5|%C~(32Krw{-CRUPf|Y#+cO$un%W!$3R2f zucW!6Bl)Bc{!=@`I>bOoNhyM_aUjZzb7<=p3HQUcIHAU4eybxR9bHn|QR0hV6!!Eh zwD39nc7gM^xUAOzBu6{;Wpa(%d!mcx(D2(9Ike>xL;c5*Y{MXm;7E(QOsRhl@hh}= z!s=w0fD1EBUes`=eNOG2ZE!8L#db9w^L~y2T3#t5BNg|?BCt9SM&)5Wk6W_1sDT@l zu)j*yl#4yX`ZaFzScmrNc;W1v+F~+jj`Fou33Xj)=tn2NI;%rm_i85KJ&UqEE!0y- z=GfL<64Z1ys=SUR7;{(E`Sm5Fn@I&3k8S8zWle;+BBBPKRl>erUvF0#a!|A7Z#wLf zV|$LW6y%#G)bn26_F^9SN|zHX$`3KPqr8~s=~WErban?e_6Q%8WX#)8A1Eo4VP+Li zQ44e4Eas8y?pI{Z=CnKYiL=sTewnmaj;i#;KsQxx`-c|oHSxwKIrHI{654W6LLCzf zWykszSv|sPmc_k;6OEfnRWSE0}3uwL*-)_}OyH%!PRO_>(d#~A;zNFPp;2c=vHhm~yHw@P7vb$Xaer4nbO-bIL*VRr5`s3P{)g-qn*_<4na{Lb}uuXjoo=Ai>A47Y``xRF^0&8JX)kdEEgW=iztJL16w2wqclG92&_CGVU`>R^0_Y7_Q zIOAq;ykBi~#~V(_IOiYMpv?!RTvL-uJP*?y#(ZV9uGdH&VAAwOp1s%bYzx2IYD-|I zyP09~%;tuB>&Hr@wTNPJiO1a}MVpw_s%m-$h~_5?_V%l+Zh6B#8Rx!d72CSKtPNKI zpeowS4E=J6B09dxZF}5cPqDc?Gprs3ug0{K38W}2Z5w-`35CrUi#TMO^{+;Xf(*QlMQq-;kT>@M!{ zE2})jHp(!G3k?y!y4JAG4?8lWH%XpNazF{kUdy0J-frmAvn()bnfOw>;xjMVH&{*K z{1o)iwZJyDku{*h?Fj<*$dZlm1|-iBUgd&^YuM&)Bo{dD9V9u*uc~qp-&{wcJEg|$ z9hg!rxkl7e$C2z@lCd|%DnE$k+~5xtrTQcJUB|I~k7NhGni?#R=#WAqbVNaIQ9}DP zsGtuv{C-_Y#5%8I6>dk-Srk zom$keA3YLWEC-OBY3s3(W4mTLjOEMp(ft|&pJ*j>ZHpNNwZmjtK2z3=wX0f{$FPO) zoI8aFWx-`7powNAXE?NZFTaw?x3HT#OyF)MX>%v$htC;gIozg3efhD;T9)Ld30j&d z1)NN5@c?}+@5aO{no*w*Bo3W(e*YBH=~C8;$<6kR8jP7Dxvkup&(D!>bt(x>xOitZ z_p7L!3;TGB$-AdyZ9bCu<86}XRnw47P6e|}fl5ejM{^3-DLJ-hqUBiK#2mAZdDIQB zXd-iOgM+KI`7e<*VhXhNRyDPKVnBI5-SZOI;K-8E#NT~PkosQK?JQL08>s0 zqxJ&-Vvtg_OBMQJx`z2OnG+$9ev@~+$9 z-SEF;B^LG?4`uNVAlcDkJWlef#Y5=jWD9!fkfHuI2?l@vyH}<;+15h^jzLS|4fj}V zf_Y%elG4Jj3~m0qUoGWc$Q{LvD-NHKY+vHG-^l7=0mbDtH12!z)gT;YnqjU}do z4zgG1T!cIN)l%Nc`>lcKjw*TEyJS@Lr^R~=lBW#Lu`gE{-gl_OMm>!wA_h{Q8-8`I zj3hnkf`4plIDJ2#qP`&sL4MW|MoE6h@Z6O-_H!`F3rW6TBc9WxoL)$O)E2W&1 zHkkU%Q!mwnp;v<6ZxY^ebY+RdizH7W**#-Fx*F^nJ`Ah((m)fE z|2ABu4)!ahe3SNoVWDkPCw)*Ntk7_RO~q{pUrV z9iQMGu!@#h1W8WNFwkCpm3UavP%ljsxNlpQKZxeUK1&!$d?S|jI-H!cAFX8#-$(bf zykY#8rIf@u-(r<#_)YwL!Xr$^Cwnlxwo~G!We_b=H^u2@CAYgx^1t(??U1 zyOF%vqKpZP#6Dr1ixwpzxW*Ea>qnm7j>*v+Pq%n)G<520e{biJVjXtmHGeg*+}hD(eJIlYdPHM=Ooy8n{opM{4s6`t~0M&8uF&S>B-hQ93KS4lZ0 zsRi}1r@tcErw;pM%4NQobSwt0X|u zVd3iz1_{-YJOkbl-lW3`bvXZhsZYZ^(+319$0Ys8Ky*K^(>^sxxMzEScFBY;iJsae zAkXQtIcC9sNS>CYS{L=B?rLV+nCI7{Id=d_-cPbyOxfKcu7p0ipGVfU*etTvc8z(a zo6w{QPm^3PrtEeGRr9?GZR;g#@IM*X@+-mI;i$>C; z*vUzXLEoy5`?g`iqWcNWsVpm)qBC9+m%U3eo*Gt?{D)XDw~2X&$*3yUI8#)Pw9pwa+JK=&Vzz5|15WFnN%D6V?>sT2uB8O>P=0lI`b$)f!W>PjYSe!oIfSAtn z2I6~7n8UX$41VTNBJo*ByoZQNb7cl*^D)U^lN`<<>CvZ#cC|CK=TwV#T`x@SRKGGj z3SN_^iILs)7Ib;4p`P{zH^F&ggg9KR??29{p}Sw!bZd+LZI$4@STPLVU3kxHhUcDd zD8e|&Ck%EIqx{OK{>J#UVM0bUpuYA>+Wh3XVI<#8c=l^scRH!F2ZLPMFJ-)Ae9aJ? zha@jbXveoLERf$IIohudkAm0ZXrZ+vPn>Tj)N`?+{0k&s&$#AZlC|5zp>GEZk1*lg ziV?7d5Y(#y&HG4$ru8YmGO9Znrc7_wG{F8Q#m+xop6gEX8H)&B=eSDd45FI-GR8G3 z4=g3QLBjhtvM>(xhB+QZuEWzU=qxWTv4sq<4B6%*8qx(HwF}`JT z=GDC#;QU`(&jF4a$|STAceFSxh_eoFApK5~wnxizE#~}Lm-Q=G&iIhLVKoB+pDb z!HW^-3l{a=T93h?JZiqy`XmJC3E$UmX2G}4657s!=VXm_&7prIEUxpuVkC2>g|=Ww z1E-7T1{;tiUh`P&;Af7Q)d0reu!IG8PUQK`sZTNzcHf(jV;eUn`3no9#H5qQNDa3}mID%gnakO_x1 z68dn8aO#oIppQ)(F{=TN#f=FI@!-hwy$u0J!rl`<%DJ6NBAs1BeRe<_d@aJ?x8tJw ziKfFQn9+ktr!|j8&0{tT1(Qk&qO)I2`DQ|+w^~@!n=oH&UAD{HjgI6Q7I8yfVkBxI zlQWgx*vM$b6ybC`znbzL>?YKQyIh{9bX+In(JEm>T}E>ANSQVk(e)_Cea#DKb4!x@ ziZRu)49syJ$t$8U4J6jUA1&*+m_ClT$6DHHp5T@j#ve&`ij?0c`X?;p86-Q$oX9V< zFra&!8S{@Pw7s*aS>Itc%q019hO&%Fz!RImDYLzipobXw*|@fTO!AOWxdB3ZGc(fg z+p-oq7ud%xhCnvqlj{Xhjf1S!q!hsY8!7Gl#xN$w_|=uqAa^uK)}NT}ha17z?3}PL zAJCLL%)$?O7RkW{w|_eeVZ;V&NIoTkVkfzOz1Fhq6C`)`E3HwkohK}5RdnOm$*If;M z>*0-R8%_BnA^J2=PdvsjKELrRF5BRmGRghh-?RL0oc@}yP|wwr>!0A$OOh*!w4f*1 z&*0iwd4F1bPV#Cos9NE0+S|}mRfAh28#-u(RtU{pEi{xCCYmeMWsKwrOwQ%;x=wvB zkpYc?#5`5~&pz#CgMHc{KT7Eb_x@U`&gyKOS~5s~Y{K!HvhA6i%bX-HXG}`doZ5fB z;k{>zl>KBzcdGXsv;mY2V2G!#x?dYZETczO@T$dHN^)O)QfStcOa8oq`rA|t5|eNr z$@ZE$j<;A#Ej@MpZ@f%bnfLh-N;jx`c7Iv5 zTYsw)=1J~vQNFvUuy2f;DL~S<{0O-XW^;pe?N>D9wr}L)Hq_#DGR{!``xdJ5X(R^} z(Dv^b-g#xr^IM8mVs1uZz!ndYJit>~>DRykGFL^=K-~TLbL}V-0nTv(T~)^;8x+cBUw`Z+N$3x4}H!HqxEPH^y!!iy$ML8OrZ$5wvGs-oY-! zMe#Y!`&Q~0j|5-YQzY;#!B=eY7RjIbQ&8!&Uq6+(DH=<}=4Q{hpj6VHVTSwne-#ki zXFHOgTCDq>40UW~vF>;B)MlKAbG^Z2K8txFJ&MHprr=3pe3`^dmytXo=egg?Z~}SA zQU!Vx$;UF<3%FbljQ6XyX1rp&qnbar=Y=`#~jC@3CW8r`tT?XL53J4J(}*>VO4N#+18UP+2S4v z;6DJGdRA8zybNFurPSw|`DhN{Y5>P2)N>br?<%Ff&VdGc19%HSyO^J60T`~7TH#pd zC;&$QI26Eo1&`^o0PX}ZMJe@>C$U`k!ukOA2XG*Ou?4^G69BgYxLGOnx??+A0GJLS z?zH_SfWbgi;#x$!6tk9!S3JV72HCnt~U<5>WE zDWw(}=4Vd;w*fHSf&Lf3K1!+oWTb^w0NwzwLCnvK0Sr<~eVXwd?Evfp;JW~Jse;z& zRXJ@vq?CHvlU(ea>;PbQ0DAx^I&0%<0FTN^`tM4qB^le^Lo`$!V}5=gz)+>svW)N8 z62RX9^fo;91%N}9QvWb*{s8W)f;Pn?9tS9;rg#BhEkU+Hp!W6deYL~$0QS~h2gp2a zDvV=*p`Nc1TnF5hktPlVaEIpS>y=W+=SY9+A-Ep+E`X6$80$p<9s}?MfTxsF(;MlA zzbSwn0qi6~Sf?ty_B8;v0Jt>|b$qBV*8}*z=H~-*S`U8)V2U5`zO3QthI+aIxEFwr zZBaXX1Yk%WSEe4tGN@A%)H!1;>ew~({5#^dwm9_N*ot8pNMh-x|&=g5NQd{dIYqCPND5tzdu4eRL)0@yTdfNQC#^zC%%>zpc% z??*DHn-^^rB6WYF3+MLYY1>UbqXe}{+axxnK2 zF$w)S)$e2;X^F83gV3Nlyh@9F1Po$|hh4|Q7@4t+dq(Qp-SBLCCZ|4~ZgLrtdRkh# zU){_MAw!E~td?`Xi+Ck`QRREWRU}_v5W@ERBuBG=$Zl1)(R_Sjt(W+x=Q14prJk2WvDkdO&fzCKS_T6A2MT@ zZ?2m|p=TAw{`!PI_3=BH8OjfV6`}0|;2y&xCn%+^OQ@qefVlvo5@{c$)SMjJcpiZB zLtl+oNVuUEzxXQ6TJpmkoz^!nLvXCf%4*`4( zV2;q)rvN^ad0dFVc=AgCOTVoeVgLXj07*naQ~)dmuna)Oow5ahRsdQ9Xp6wmvm=1c z0J;F^4xk5sUI+}(`U2=zBL49*fWH8^O(`|6inLIOv1*>SHVi_4-zD>?!v_FHD5bv0 zI3CvkI6?k9PAT0Fz(+zDlXT``ybUFM_)vLE7BfqK-Xd%5})GjnTj$yBVHs zZ($R#nwkVck-D}d`QL=P7Kx4et;CC#Kycc`x1oiLh zaw15oCz_MIMb7QKG*bVrhG*MSpUXOo<1OBsi+{4F?iM6x8SZ-5t1)dfA-N;TKhQ1H zpobe4$r$fg>$_c&y(NBtZc}ZMqR!mnZ7?~dZ>6rbIgZJ88RqtATdj-mTGKU9YrkW8 z6tU=sBoOgmEb3?$+00Y{?YuJ5u3Zezwxm9Gc^KzfytggMyDaLumX6u6SfvoFd8ma+ z9xV6aD>5*|C1NSRw2n9IrP7Bb8R}ReV|kE`fL+CT&Lw2E)YY7JA<*x%F$SeMDNO|r zXED%?d1q6S&t#bAV=dqFmxOwJIBt(Z7ye-h1USi}juxUW8(L5sRg9)#=LDf-vdzYA zc^b|fqg+#W)sn2_G!NZKo-9`IS@4!vv|lKy)yKr(YE20?`8Cp($E0l+N?WtW>VICw zu3HJ`HB-{6NL{(++=yBCahOa^Cc_LGum?i*FBh7qeC8S2@+HZ;ZG@2+W9KLi^E;GB zH5kB6352+B3EHS)+PQPW^OspLj|XfvZsw4sET+z?rdiE-J_eDzAYv))igmKm$(;2U z)$2hdPmvAyS_Z!MkC1$c;h{!AF|a#1y}kI|LJZiuY#wQTwt&a5_EbfM|v*K8du>O04B?02&4-)SiYyVWFz6*T6zCcJyR--$eG z$rR2?Akd2~>uH2x-ZEu zS=7%n465<<>zt+rl047g`e@6PpA=)$jw#yEQOZ7<@m_zHSfvlF^Ev5f@Mf5ibPXdm z8~0m`*X2npi@G-x?38qO(i+nqMs))Ih^k6B>N}Sv%5(kX+ZR~jRR`jfcC|2o zn@e(=gnI5XsGGNKU^Lc(k%bOE6GO_;p}NP&cb{bxGVYKzwrF5uzn$S)=3WZ{ zE=jGvfQDEdp}LN@oQuDjY%4??cbC{L^i4S?Z9?yxo%484urPpa>vtZHvZ)A7_`=3= z-a+foOg4o!Bs+sx~j_Mj?f0zGdYvjU<(!ZQj*^>)G^3l zJogeCXeKb3@9&d*DxwTo%QcHc42UMRKr38?LvU zlhZ8vG${1^At}ctoc(WQj^n*KlS3i*gNH{6nZ+0jhTFT&`?#|uBYMr^1mA_^6Be7y z1v+(~7!K-iR3o6d0SvM-&aC3K(M)+~|3)yr-!qKEr3L~0LJQ&S@g##t(IC8LIWId~ z_UZ6YnO!oBO&BVNvF>dlkdA?eM~NB6p$P>1OfCGjbM9k*3m@hR&Pb@MIg=ADQSPN% zYfi(uSOarNwrfPRx0M)L&MRQkpC@&1)riKkz0iAE!CNCi$$dBKf0)_x6i%+tuMl*C05N zYqJ&^#^=>gJuNei^^}Buo(m6;I$<2j!f5Uf4WzG!Su(1HB#%s}YcGrYzmG_67Ae=% zpe9{Pa)U-fcN;SZrTcCH8i04i4}RlDGL{<}?(biXo_OW%`XdWFpa}`@J(A`qqt?NF zH1&4~YsfN=(JP_4+GVKc4;Ds^-s0b*t{6y*$O5sxL#)HT4zY0UtKeoD616K0bfo-mI$TaN!q zrp$WBAlz>S*W@SwbWK^ur3rm~rJ;G1cr+d%po4`K@OcfSudN*{mFJQ?+)!6fiw$ix z$urY3?K&UpRwNH3`FCauAv}lVCmG5wmo^;81{90kMVOR8V5=qRU~&1tAK4ccE-fJJhqf*7iC{Vq^T-(kH)_ z=3RXqBKnc!UO8(v*3Vd1SO6I0Sk}hCvA5qrJQ~8LILLz7f6##X+si>E{Uynh44dA$ z7VcC}SFROY4Y%rGEQgT%rNy;KlHu9I3{o_=GrX&vJoB)HL8b}sOPhz(;dmz+lro5p znPjoPhC!@;o%`xZLi;v&o;ju1jR?qDE%(F1i%S~hA6WEx5Ij5@(5ASh1<@Z49r6!axgCt2wDQDkhkh{Ryb*qH5 z(u3p=#p@vpUXznn?-Xt5P4dSK!ZK&UOVXDfbujLUE~O-gSr}Pf zyYDYDw0E)ec_)@6Tr-oyO8?N}TI7{Dn-)3sx(H7v6frK54S4e^kM9xHuyOG4s0Sfn zVl6cRaw@N28iR17dx$miX>v7C`JB%nrEukQTd3^aj_>X7sMdZW#^tIl$-6DePGQOf zE>)QSVI(gh`C-Nr^*=~{hh&=?^r4N!fcQs7dw~zdZev)D=fsp)YKkSjwT;pEJ>hs= z(%+)3+mJk&L7tBh;x*GM=_DSxvu~GzW{*n~@W=AxKhf_D9*s!|uvrwx6!h*EkrT0U zDBC1UBr&lKIM{KM_;WY_jkMtsi*hCxxA9e;@AX8WdWG5W9}&`em57#mNt^zYv2U-) z81<@h`*%-CLls;SKCw$crawFO{a~AQ$mFDBABv^_*(47lxi!i4#U;67bhyxQz5XOr z|AmfYdrU14J02co76NRHD-I|5&y1(!4;X~@9a;x8JycHgS+pCgNIobUhPDN_x0%p_3++^}EWCM% z5#g^K`+6f25&}iq+argoyK5}p)tui9Nj%b_tv1&F$NHVXqcIBsHaWh}DB!)}5Wc6T zPzU~xfn{vRmb6bSRJlK%R5@{x+@9(4*q>a$xHcuZ8-u8BUuIy^i)3>c$2v@FELxgz z(uYME#^FmjP48Aj90#!%NrTTwZXfFFBu6`r`Dv})MdiPvXkG3|LH`ph-qAhcdb-lZ zK+n?8|9HOxcz7YeP6#+J=XZt!6wPrg8@>iuor6DdQ_CxnsG;DgQhr0jDK3c#cgbly zM~apAe=}@$E95SEVp%QaQ;tn*>C=7E$F%sbcq5F+sa;(ih0n0|XhW&v)D+$kN9HZe z$eL_Vasvjzn2sfRHG^P1QB6kggu1qic%savA(CNC`Sbkd@8RLLfNib=F3s_MDiRc= zhhzEQgvt)jsZE_C*9$h7EhnMQqH1@=l^NRGNA5?bW>m?(C@0bGjeyR(OJ85iIA&92 z?E7SB%T+1f`%j^@)949X(@Ru#v*X+#KUV&DlsjPATWEoH3kVYW<%pUB*8o^pMqp`ox=X?$6PJd#i9 ztoUQ@`(LL+xNNZ{dd6Z*e2^ax4~KzS7#Jr3Q8|fP8Dz0SDWt`g?48mXclR2JMARX<;5@nr~ z(|H(eLV|VlzW-X6wu^vl6XtuIr)Cci_r+_IK5i$bywZgUuZ1 z_83vg-^L(X-@f8P+MSM3H7(zFTByBO$a~(4xWW!}tkX8HhfnESa(F|e`Vazo19%re ztAs}{QA$lpQU9L+RIGEK1Mptx=Z*k6ME)PXBkT;IVmt7ZQfgenySf0FFaNzxDRn}| zv1tNeCjd7B=@H6A(PasUIAQsb3U|4F&|cL#8I=!857z-9ox4d6romjU>Poc5FO zU(45S7W3U20J|!s&QVIy_JAOo!9x-roeW@%@G1`vj{-CSN`jFjVG+rF9qMgDvLk~e zJ#n9Qa-yhwTFa?GrRYOAieSG2$Ep&vXSF}PdZaKIJdzH%o=Yg>#;Y3 z(7s`GwS4FOk#Zl>G1H>hDA?q3IM>Iv@bIXfAaJN9Bb!vhw(lEi-@a9NpAv6}yZpZ9 zk$}5|R#cAk*Dmso){f=JhRVKdS*Atgop;kcb@wF8F+0?AWDk$(Z=_=^7wBI|wklD( z!=4Q{WUQ;Hw!hZaY8@Wnx z>fc&;g^keE&r_#|N9`G8Tax!$GQHzV&|Vc`itQX3>Pa#F|GQ^sPjiynlAN5gI(Z?< z2S}d7AT(?zPpye_(MiVY92vWXInT*tnd{~$+SVe4hs}|pci)!co#BLC-z|9TkGCAd zdr7wS)av0;9>%E{ggdpt^{yx8oEiKvTsOx01s3ju%^9Rjj*HDc(=~vR;XSQM?nLsA zg6^1Ski1#67vo5FZp1X(S;pWr8Iu_Wjrkoir>#@8u?fjh3=%<+&bA8$wgLFa8PL^TDUZCn7ZcnL!-VAn?h{2*Mlx9Ke|t)lUa-q*CgY6zzHe zz-U;6E4Hk!3xcq!69F7uqiJ4%AhhgU0G|T*Ts{i`ECR3?z!w0%1h53aQu(Zq&nl^> z8Gsh@X)T|&0NNu61KklpxaTeay2+;pfL;LBlkaPRn*jU`z{^Uh1u5sT8Gx+;oCDxn zn#Udynw|jQr}Ev&N~zx)>fH;#y_ND3pvt9P!?89v*PBYIO>*Q7>jAh5zyTJI{}Dle zuVtRAdU({IAaIzals}K;#EkDcCBblLN1atNgHXr6)0BOWB>8-TW?__#XG|oB z)jOJJu1pb#=y?&KPmKr}XXViU39_bba6_5wOFTS0@@0nmI54Iw)A&p0#IP&)IHx+B zgj}i?mcf;YWHT{#93w7{H#Tr>!EEW{vC`+B%rP01LGX&hDI8?*-6!g@7giPJw;e+&=&~Gp)6CiuOGWU^n^i zUP`I^bEtDa08`|@rz@o{Pf^Ft03JeMIX_V;b$cx~H3Sy>6-)iFg??B0x4Zn?MSkxj z&$mV3dC>xE(}Ax+;1#e8fw#aC1YQJ-5O@@P4&XEScRtqjG^ltOtguZlTZ8es6hP%F z=_sYtpEK6iRQg^yo%d2o&C4*CZDij10O&8YwFJO@N~u+j^>qR8D*(q@7C8;TRg$LL z!^5MI2?9eMVg}43`MoN&YyZ%D^Vs}5l6*4kH=g2Deo16J_V*N27c{T;t$JJ>3E^zcV80k5k zhlhtr8!*X%sl1gnfRLdrzfa@3C!6ZTNFtR=(x8*W2961JoK|#5)X=rWqy|V!T_oJ> zp>Z2K$sPs^{gX)!%gZH@7{}#6l=HY{v)m;Q7kxtm1B`_h8m=13&LgCyf)d(FEp$kVeV zH2$BZ&H88gjx%IU+2XD=LZF9-hlhy~ZSQyjnMv}9jPGnJC*?kx-^a(?^}kB8x1rAF zkuv=v$$}~>|LzgvvHf!%PhDu{8!XGWk(9epn~WAIPngT|P-lx#Uj>Uz_xL1l3q3np z^Gs*aa9rWwvN|n#=S^}%)^Bna5NA5Bx$Qlt^6>B|N(g8n@ycEBY?|Bx z7Hv5&&a&So%x^+ogkM!o;c^nq)rUOPhHz4vs5SSo31tVzY=#eH+0;mmjnp?JMIECe zb!?OH{OPWi^y1yIEy*(@cknb_8O7LtY?ISGHV@6^_BqryLDq~5PR&c8@$m5QNMcew z>7M%bA6X6E3jW=^R5Ef!^Vb$MP>M+cH0M#ker&9h-CkBp7A}L$jX`a13^xThg8n^XAbv_yD&w~-8z;2OE zW^!aKS4()}Jm>Vvi0fl#%W^-DxW%=yC^Ilr=Cc%S9T*WhR+Bu?@ciD9XPcH_4Q(fD z!UgY;9OXHXhlfY48JLQ(`nJK{d1?eww0m1QeV=L)AV`jm+-c`=(hl2GoE!SSMI=eg zZ27K7ObX%mNcJdbJ|Bn}*|kk5vq2h{Mv1Z*MstTYo)EJs_DU$%B~oT&4e4)OBtexe z_9{a*OAikZ4@5Sv<5MuSe->dQkYm4^MnVa1nnRu8yYD?BzjcckT}zOi`#73ypERny+OPXK8svi zv~_&XVIn}BY4PmVF`=3Fa(v&Jk@hyJ(s&-B2~uSfyT60yEFK;n^&|*%7yoRgxZgZO zcPC$?zHE}G3t8lZ-zMhwEn^ZGt*&+kH?dV%=`eQ>6``IMn~jTN=p;?hqal%c`V}~S z?Sz)!NwE$tBiY?^5)TiLdKLtFOHdbAd@a$>hLxZXD&lsxV}`ogggpQvzqKTJqba&u zmHXX1qB6G)MAJ0KHgt;#^mKjN#6coVEDm`(v@c-Xh6(L{or3PKF~za)@bK`cM?s)Z zNt%6Yu@ag5a;-T3=>PT}F<(U1j!^-^99R3hC?s>KOOHausG zb6N^%Sf*0IfI9XM`IEMx}`K0tl)3e_8y2B1CB^pNBA!Lg_s05E2G*Dxi**`dG5>t z``I`0u3FZo*8l(o>`6pHR4XjY9Tq9Kl;kEUG$eCk(%CjC8U0QW8cd6G!*L!wJUl!a zqae^OrTbvmAO6B>7|2O5o~I;WPm`2&yqaJ{*TFDO(T(xk0{YlIa_!)npeQax^X?Yq zT9W*Iq}=>6*nouEI8{t7kc0S-@i7p#bG!f9HIkoSgNWDWd)HN*P?x>AnK=QPR z&@raQ^VCXcXG%sIyvK*^_3-fUNXLkK%KdK^EGKy@$%(ZV2E=N9WoV-tmtkC@9s|G6 z;)5^7Y+-yahyM18(O5K#d9JP8iJwxdQ@?Eb6NOfmXQa7FK1q*?FKHm1N9@%A7x% z6Ahh9a(%xtJv=--s>jHiksO;L@JbXj#m#R*nd}BEH42xCKlx@E>e-Lv?}~_wSL5+% zC3AX(%yAyLS7@)9Ux^+b9v-!2@|{Q?B3bM5z#5W|$X)IjKf-lK4`XER9+A1s1G9w2 zI{6XyXbA8*r9B!V^Y0B{KLEc3kQcLF4B%<`Jgby?!H;ygHhchM0qh{3jyYAm2*B9@ z?p8|8@gwcw1pp6^`q>!zi7;?}j=}%{ECui!fad|c2;fDf)MtLgt1_qE0gRT`UNH;6%K-iZ;1vL`DWw+qk0QdrH1*>~hHqLQLi3qta3##D z0Ulz0?~}2BwR$rn53@mxoidlu6|Eio2jm4}Ug~@>egJm$vF#tXFl^v#sAZVbSF@h$ z(FUdiJ`DLMpXdJEbNj-2L6=(l0JCqsj6BoMt1)zan;*~ez=)xq-5^+V>!INN?c%`c zcAG`F8g&_ERHT}+k_;QZGoE4lu&~CC?L$06F+I?qL6u zhhYQbC*yOQkIFOL0iL^9e+t;*Vrpn_KfP=j!xx4PQ!_aFbR9Q~f$n29{&|Ld1H%EQ zpSgw&`cF5r9JtQWBQ~8eLQkqA^b=!4+NVs$1*#2U96hgYF=TKr*jrufl;QVLB6_$La9ij&wGu->2 zUc(O#&X8z@j7EpIwoJeQ>^pqFe@{FqD$lS(`hYM;kJj@a)=*Vb0yQ%F9=u9OX1UI8 z&HQ7UyrlM@V85^b-4bMet_;drDlY~x?aJna3sMf|EN+F)f)dhwu8()SRR|y0%<)KV zPve0XA3txBvH%_`&j@N`YaDb?G}!lAWma?VD@v3p%h@Zj-$h_0ya=z*Bk; zTcf+fQSS%ZEOIRI3Li8gS`Hju@F+LnXZggMeN&81GpzYCdpD?oHpsy7|M~oU9t=Rh j^0)qOe*hzhi4AOH64m{4d|L%O3rN<})z4*}Q$iB};1E?* literal 0 HcmV?d00001 From 395f1188e7ea1666658c6be4a5141e3fe8ca1bd7 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 27 Feb 2018 18:19:41 -0800 Subject: [PATCH 110/493] Put fast miner array back up at Haste 3 It was ~~our~~ my fault. --- .../WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 517b0d27..2a4371b2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -28,7 +28,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase { public boolean performArrayEffect(World world, BlockPos pos) { double radius = 10; int ticks = 600; - int potionPotency = 1; + int potionPotency = 2; AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); From 91d7f23b4f2e628054cac37822dd934762a8a0d9 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 28 Feb 2018 17:53:23 -0800 Subject: [PATCH 111/493] Add API method for registering recipes at proper time The old access to IBloodMagicRecipeRegistrar still exists, but should not be used so mods like CraftTweaker can do their thing. This commit also introduces @BloodMagicPlugin.Inject which will inject the active API instance into an annotated field with the API interface as it's type. These fields are populated during pre init. --- .../bloodmagic/api/BloodMagicPlugin.java | 13 +++ .../bloodmagic/api/IBloodMagicAPI.java | 4 + .../bloodmagic/api/IBloodMagicPlugin.java | 15 ++- .../java/WayofTime/bloodmagic/BloodMagic.java | 3 +- .../api/impl/BloodMagicCorePlugin.java | 12 ++- .../core/RegistrarBloodMagicRecipes.java | 3 + .../WayofTime/bloodmagic/util/PluginUtil.java | 93 ++++++++++++++++--- 7 files changed, 125 insertions(+), 18 deletions(-) diff --git a/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java b/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java index 0d2bf397..3cbeb4b9 100644 --- a/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java +++ b/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java @@ -13,4 +13,17 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface BloodMagicPlugin { + /** + * This annotation will inject the active {@link IBloodMagicAPI} into a {@code static} field of the same + * type. Fields with invalid types will be ignored and an error will be logged. + * + * These fields are populated during {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent}. + * + * {@code public static @BloodMagicPlugin.Inject IBloodMagicAPI API_INSTANCE = null;} + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + @interface Inject { + + } } diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 776bee6d..11ce4bce 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -6,6 +6,10 @@ import javax.annotation.Nonnull; /** * The main interface between a plugin and Blood Magic's internals. + * + * This API is intended for compatibility between other mods and Blood Magic. More advanced integration is out of the scope of this API and are considered "addons". + * + * To get an instance of this without actually creating an {@link IBloodMagicPlugin}, use {@link BloodMagicPlugin.Inject}. */ public interface IBloodMagicAPI { diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java index 78ac7036..c18d3c1d 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java @@ -7,9 +7,20 @@ package WayofTime.bloodmagic.api; public interface IBloodMagicPlugin { /** - * Register mod content with the API + * Register mod content with the API. Called during {@link net.minecraftforge.fml.common.event.FMLInitializationEvent}. * * @param api The active instance of the {@link IBloodMagicAPI} */ - void register(IBloodMagicAPI api); + default void register(IBloodMagicAPI api) { + // No-op + } + + /** + * Register recipes with the API. Called during {@link net.minecraftforge.event.RegistryEvent.Register}. + * + * @param recipeRegistrar The active instance of the {@link IBloodMagicRecipeRegistrar} + */ + default void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { + // No-op + } } diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 0b1122f4..ce2f8153 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -73,6 +73,7 @@ public class BloodMagic { configDir = new File(event.getModConfigurationDirectory(), "bloodmagic"); PLUGINS.addAll(PluginUtil.gatherPlugins(event.getAsmData())); + PluginUtil.injectAPIInstances(PluginUtil.gatherInjections(event.getAsmData())); ModTranquilityHandlers.init(); ModDungeons.init(); @@ -84,7 +85,7 @@ public class BloodMagic { public void init(FMLInitializationEvent event) { BloodMagicPacketHandler.init(); - PluginUtil.registerPlugins(PLUGINS); + PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.PLUGIN_REGISTER); ModRecipes.init(); ModRituals.initRituals(); diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 9f98f857..453d5174 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.BloodRuneType; @@ -78,11 +79,14 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (BloodRuneType runeType : BloodRuneType.values()) api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); + } - RegistrarBloodMagicRecipes.registerAltarRecipes(api.getRecipeRegistrar()); - RegistrarBloodMagicRecipes.registerAlchemyTableRecipes(api.getRecipeRegistrar()); - RegistrarBloodMagicRecipes.registerTartaricForgeRecipes(api.getRecipeRegistrar()); - RegistrarBloodMagicRecipes.registerAlchemyArrayRecipes(api.getRecipeRegistrar()); + @Override + public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { + RegistrarBloodMagicRecipes.registerAltarRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); + RegistrarBloodMagicRecipes.registerAlchemyTableRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); + RegistrarBloodMagicRecipes.registerTartaricForgeRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); + RegistrarBloodMagicRecipes.registerAlchemyArrayRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); } private static void handleConfigValues(BloodMagicAPI api) { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 298b7480..85ceebe4 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.util.PluginUtil; import com.google.common.collect.Sets; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -51,6 +52,8 @@ public class RegistrarBloodMagicRecipes { OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); + + PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); } public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { diff --git a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java index 2faf5d38..aeed6037 100644 --- a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java @@ -1,17 +1,23 @@ package WayofTime.bloodmagic.util; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.BloodMagicCorePlugin; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; +import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.discovery.ASMDataTable; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nonnull; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.List; import java.util.Set; +import java.util.function.Consumer; public class PluginUtil { @@ -20,7 +26,7 @@ public class PluginUtil { public static List> gatherPlugins(ASMDataTable dataTable) { Stopwatch stopwatch = Stopwatch.createStarted(); List> discoveredAnnotations = Lists.newArrayList(); - Set discoveredPlugins = dataTable.getAll(BloodMagicPlugin.class.getCanonicalName()); + Set discoveredPlugins = dataTable.getAll(BloodMagicPlugin.class.getName()); for (ASMDataTable.ASMData data : discoveredPlugins) { try { @@ -47,20 +53,85 @@ public class PluginUtil { return discoveredAnnotations; } - public static void registerPlugins(List> plugins) { - Stopwatch total = Stopwatch.createStarted(); - int errors = 0; - for (Pair plugin : plugins) { - Stopwatch per = Stopwatch.createStarted(); + @Nonnull + public static List gatherInjections(ASMDataTable dataTable) { + Stopwatch stopwatch = Stopwatch.createStarted(); + List injectees = Lists.newArrayList(); + Set discoveredInjectees = dataTable.getAll(BloodMagicPlugin.Inject.class.getName()); + + for (ASMDataTable.ASMData data : discoveredInjectees) { try { - plugin.getLeft().register(BloodMagicAPI.INSTANCE); + Class asmClass = Class.forName(data.getClassName()); + Field toInject = asmClass.getDeclaredField(data.getObjectName()); + if (toInject.getType() != IBloodMagicAPI.class) { + BMLog.API.error("Mod requested API injection on field {}.{} which is an invalid type.", data.getClassName(), data.getObjectName()); + continue; + } + + BMLog.API.info("Discovered injection request at {}.{}", data.getClassName(), data.getObjectName()); + injectees.add(toInject); } catch (Exception e) { - errors++; - BMLog.DEFAULT.error("Error loading plugin at {}: {}: {}", plugin.getLeft().getClass(), e.getClass().getSimpleName(), e.getMessage()); + e.printStackTrace(); } - BMLog.API.info("Registered plugin at {} in {}", plugin.getLeft().getClass(), per.stop()); } - BMLog.API.info("Registered {} plugins with {} errors in {}", plugins.size() - errors, errors, total.stop()); + BMLog.API.info("Discovered {} potential API injection(s) in {}", injectees.size(), stopwatch.stop()); + return injectees; + } + + public static void handlePluginStep(RegistrationStep step) { + Stopwatch total = Stopwatch.createStarted(); + int errors = 0; + for (Pair plugin : BloodMagic.PLUGINS) { + Stopwatch per = Stopwatch.createStarted(); + try { + step.getConsumer().accept(plugin); + } catch (Exception e) { + errors++; + BMLog.DEFAULT.error("Error handling plugin step {} at {}: {}: {}", step, plugin.getLeft().getClass(), e.getClass().getSimpleName(), e.getMessage()); + } + BMLog.API.info("Handled plugin step {} at {} in {}", step, plugin.getLeft().getClass(), per.stop()); + } + + BMLog.API.info("Handled {} plugin(s) at step {} with {} errors in {}", BloodMagic.PLUGINS.size() - errors, step, errors, total.stop()); + } + + public static void injectAPIInstances(List injectees) { + Stopwatch total = Stopwatch.createStarted(); + int errors = 0; + + for (Field injectee : injectees) { + Stopwatch per = Stopwatch.createStarted(); + if (!Modifier.isStatic(injectee.getModifiers())) + continue; + + try { + EnumHelper.setFailsafeFieldValue(injectee, null, BloodMagicAPI.INSTANCE); + } catch (Exception e) { + errors++; + BMLog.DEFAULT.error("Error injecting API instance at {}.{}", injectee.getDeclaringClass().getCanonicalName(), injectee.getName()); + } + BMLog.API.info("Injected API instance at {}.{} in {}", injectee.getDeclaringClass().getCanonicalName(), injectee.getName(), per.stop()); + } + + BMLog.API.info("Injected API {} times with {} errors in {}", injectees.size() - errors, errors, total.stop()); + } + + public enum RegistrationStep { + + PLUGIN_REGISTER(p -> p.getLeft().register(BloodMagicAPI.INSTANCE)), + RECIPE_REGISTER(p -> p.getLeft().registerRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar())) + ; + + private final Consumer> consumer; + + RegistrationStep(Consumer> consumer) { + this.consumer = consumer; + } + + @Nonnull + public Consumer> getConsumer() { + return consumer; + } } } From b1be099d6785f2b0f7f48394c787346b20733102 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 28 Feb 2018 18:06:39 -0800 Subject: [PATCH 112/493] Update changelog + version --- changelog.txt | 18 +++++++++++++++++- gradle.properties | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index d3583a7a..3a1b7fea 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,23 @@ ------------------------------------------------------ Version 2.2.7 ------------------------------------------------------ -- Added the Furnace Array (name pending), which takes health from nearby players to power adjacent furnaces. Not covered by standard medical insurance. +- Added the Furnace Array: + - Name pending. + - Takes health from nearby players to power adjacent furnaces. + - Not covered by standard medical insurance. +- Added a new Teleport Array: + - Please keep all hands and feet inside the floating circle until you have come to a complete stop. + - Note to Scotty: Feed the non-floating circle a Feather followed by an Apple to initiate the Beaming sequence. +- Seer Sigil should now properly mimic all functions of the Divination Sigil. +- Fixed some console error spam when using Lava/Water/Void sigils. +- Registered Sulfur (dustSulfur) and Saltpeter (dustSaltpeter) to the ore dictionary. +- Rewrote how IBindable stores it's data: + - This will probably break existing worlds if you have Rituals running. Stop them before updating. + - This will also unbind any of your bound items. Bind them again after updating. + - *glances at the big red A next to all 1.12 files* +- Fixed Haste being *constricted* when above level 2. +- De-nerf Fast Miner array so it provides Haste 3 again. +- Prepped API for recipe tweaking mods. ------------------------------------------------------ Version 2.2.6 diff --git a/gradle.properties b/gradle.properties index a94bfbd0..7a442322 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.6 +mod_version=2.2.7 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From 0dd0854bd967b324dbc4a7d1b3f84c628db66781 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 1 Mar 2018 18:23:56 -0800 Subject: [PATCH 113/493] Move all SysOut references to debug logging --- .../java/WayofTime/bloodmagic/BloodMagic.java | 4 +- .../bloodmagic/block/base/BlockString.java | 97 ------------------- .../block/property/PropertyString.java | 41 -------- .../entity/ai/EntityAIPickUpAlly.java | 3 +- .../inversion/InversionPillarHandler.java | 5 +- .../bloodmagic/item/ItemExperienceBook.java | 3 +- .../tracker/StatTrackerGrimReaperSprint.java | 3 +- .../structures/BuildTestStructure.java | 3 +- .../bloodmagic/structures/Dungeon.java | 3 +- .../structures/DungeonStructure.java | 3 +- .../bloodmagic/tile/TileInversionPillar.java | 7 +- 11 files changed, 21 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockString.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index ce2f8153..5ff8bdc4 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -36,14 +36,14 @@ public class BloodMagic { public static final String NAME = "Blood Magic: Alchemical Wizardry"; public static final String VERSION = "@VERSION@"; public static final String DEPEND = "required-after:guideapi;"; + public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + public static final List> PLUGINS = Lists.newArrayList(); public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { @Override public ItemStack getTabIconItem() { return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); } }; - public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - public static final List> PLUGINS = Lists.newArrayList(); public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") { @Override public ItemStack getTabIconItem() { diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java deleted file mode 100644 index 7afab9bd..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java +++ /dev/null @@ -1,97 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import WayofTime.bloodmagic.block.property.PropertyString; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.ArrayUtils; - -/** - * Creates a block that has multiple meta-based states. - *

- * These states will be named after the given string array. Somewhere along the - * way, each value is {@code toLowerCase()}'ed, so the blockstate JSON needs all - * values to be lowercase. - */ -public class BlockString extends Block { - private final int maxMeta; - private final String[] types; - private final PropertyString property; - private final BlockStateContainer realStateContainer; - - public BlockString(Material material, String[] values, String propName) { - super(material); - - this.maxMeta = values.length; - this.types = values; - - this.property = PropertyString.create(propName, values); - this.realStateContainer = createStateContainer(); - setDefaultState(getBlockState().getBaseState()); - } - - public BlockString(Material material, String[] values) { - this(material, values, "type"); - } - - @Override - protected final BlockStateContainer createBlockState() { - return new BlockStateContainer.Builder(this).build(); // Blank to avoid crashes - } - - @Override - public final BlockStateContainer getBlockState() { - return realStateContainer; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(property, types[meta]); - } - - @Override - public int getMetaFromState(IBlockState state) { - return ArrayUtils.indexOf(types, state.getValue(property)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @SideOnly(Side.CLIENT) - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { - for (int i = 0; i < maxMeta; i++) - subBlocks.add(new ItemStack(this, 1, i)); - } - - protected BlockStateContainer createStateContainer() { - System.out.println(""); - BlockStateContainer ctn = new BlockStateContainer.Builder(this).add(property).build(); - System.out.println("Number of states: " + ctn.getValidStates().size()); - return ctn; - } - - public int getMaxMeta() { - return maxMeta; - } - - public String[] getTypes() { - return types; - } - - public PropertyString getProperty() { - return property; - } - - public BlockStateContainer getRealStateContainer() { - return realStateContainer; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java deleted file mode 100644 index 1706dcb4..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java +++ /dev/null @@ -1,41 +0,0 @@ -package WayofTime.bloodmagic.block.property; - -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; -import net.minecraft.block.properties.PropertyHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collection; - -public class PropertyString extends PropertyHelper { - private final ImmutableSet allowedValues; - - protected PropertyString(String name, String[] values) { - super(name, String.class); - allowedValues = ImmutableSet.copyOf(values); - } - - @SideOnly(Side.CLIENT) - public Optional parseValue(String value) { - return allowedValues.contains(value) ? Optional.of(value) : Optional.absent(); - } - - @Override - public Collection getAllowedValues() { - return allowedValues; - } - - public String getName0(String value) { - return value; - } - - @Override - public String getName(String value) { - return this.getName0(value); - } - - public static PropertyString create(String name, String[] values) { - return new PropertyString(name, values); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java index bb120f4a..eb69d601 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.pathfinding.Path; @@ -142,7 +143,7 @@ public class EntityAIPickUpAlly extends EntityAIBase { double d0 = this.getAttackReachSqr(potentialPickup); if (distance <= d0 && this.attackTick <= 0 && !potentialPickup.isRiding()) { - System.out.println("Hai!"); + BMLog.DEBUG.info("Hai!"); potentialPickup.startRiding(this.entity, true); } } diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java index b1b2517b..e988ba1f 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.inversion; import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -63,7 +64,7 @@ public class InversionPillarHandler { //Assume that it has been added already. private static void onPillarAdded(World world, EnumDemonWillType type, BlockPos pos) { - System.out.println("Adding..."); + BMLog.DEBUG.info("Adding..."); List closePosList = new ArrayList(); int dim = world.provider.getDimension(); @@ -114,7 +115,7 @@ public class InversionPillarHandler { } private static void onPillarRemoved(World world, EnumDemonWillType type, BlockPos pos) { - System.out.println("Removing..."); + BMLog.DEBUG.info("Removing..."); int dim = world.provider.getDimension(); if (nearPillarMap.containsKey(dim)) { Map>> willMap = nearPillarMap.get(dim); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 9b1bd3f3..10c4776b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -76,7 +77,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { int neededExp = (int) Math.ceil((1 - progress) * expToNext); float containedExp = (float) getStoredExperience(stack); - System.out.println("Needed: " + neededExp + ", contained: " + containedExp + ", exp to next: " + expToNext); + BMLog.DEBUG.info("Needed: " + neededExp + ", contained: " + containedExp + ", exp to next: " + expToNext); if (containedExp >= neededExp) { setStoredExperience(stack, containedExp - neededExp); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 3d562a37..9a3830ad 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -102,7 +103,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker { StatTracker tracker = armour.getTracker(BloodMagic.MODID + ".tracker.grimReaper"); if (tracker instanceof StatTrackerGrimReaperSprint) { ((StatTrackerGrimReaperSprint) tracker).totalDeaths++; - System.out.println(((StatTrackerGrimReaperSprint) tracker).totalDeaths); + BMLog.DEBUG.info(String.valueOf(((StatTrackerGrimReaperSprint) tracker).totalDeaths)); tracker.markDirty(); } // changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1); diff --git a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java index 58b52194..bf1d7826 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java +++ b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.structures; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Mirror; import net.minecraft.util.ResourceLocation; @@ -25,7 +26,7 @@ public class BuildTestStructure { Template template = templatemanager.getTemplate(minecraftserver, resource); if (template == null) { - System.out.println("Invalid template for location: " + resource); + BMLog.DEBUG.warn("Invalid template for location: " + resource); return false; } diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index 3ca1a305..c0137c5d 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.structures; import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.util.EnumFacing; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -131,7 +132,7 @@ public class Dungeon { long endTime = System.nanoTime(); long duration = (endTime - startTime); //divide by 1000000 to get milliseconds. - System.out.println("Duration: " + duration + "(ns), " + duration / 1000000 + "(ms)"); + BMLog.DEBUG.info("Duration: " + duration + "(ns), " + duration / 1000000 + "(ms)"); //Building what I've got for (Entry> entry : roomMap.entrySet()) { diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java index 8e06624f..198869e6 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.structures; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -27,7 +28,7 @@ public class DungeonStructure { Template template = templatemanager.getTemplate(minecraftserver, resource); if (template == null) { - System.out.println("Invalid template for location: " + resource); + BMLog.DEBUG.warn("Invalid template for location: " + resource); return false; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 2c77e867..638930a3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; @@ -118,13 +119,13 @@ public class TileInversionPillar extends TileTicking { currentInfectionRadius++; consecutiveFailedChecks = 0; currentInversion -= inversionToIncreaseRadius; - System.out.println("Increasing radius!"); + BMLog.DEBUG.info("Increasing radius!"); } else if (consecutiveFailedAirChecks > 25 * currentInfectionRadius) //Change this to require a number of "creations" with the orbs in the air. { currentInfectionRadius++; consecutiveFailedChecks = 0; currentInversion -= inversionToIncreaseRadius; - System.out.println("Increasing radius due to being in the air!"); + BMLog.DEBUG.info("Increasing radius due to being in the air!"); } if (currentInfectionRadius >= 8 && currentInversion >= inversionToAddPillar) { @@ -304,7 +305,7 @@ public class TileInversionPillar extends TileTicking { public void handleEvents(float time, Iterable pastEvents) { for (Event event : pastEvents) { - System.out.println("Event: " + event.event() + " " + event.offset() + " " + getPos() + " " + time); + BMLog.DEBUG.info("Event: " + event.event() + " " + event.offset() + " " + getPos() + " " + time); } } From 70d98455b719b952c6aaa80dffb273823dc4b5ad Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 1 Mar 2018 19:27:38 -0800 Subject: [PATCH 114/493] Cleaned up a lot of different inspections --- .../AlchemyArrayEffectAttractor.java | 10 +- .../AlchemyArrayEffectSkeletonTurret.java | 9 +- .../bloodmagic/altar/BloodAltar.java | 1 - .../bloodmagic/altar/EnumAltarTier.java | 2 +- .../bloodmagic/block/BlockAlchemyTable.java | 2 +- .../bloodmagic/block/BlockAltar.java | 6 +- .../bloodmagic/block/BlockDemonCrucible.java | 4 +- .../bloodmagic/block/BlockDemonCrystal.java | 4 +- .../block/BlockDemonCrystallizer.java | 4 +- .../bloodmagic/block/BlockDemonPylon.java | 4 +- .../bloodmagic/block/BlockIncenseAltar.java | 4 +- .../block/BlockInversionPillar.java | 2 +- .../block/BlockInversionPillarEnd.java | 4 +- .../bloodmagic/block/BlockPhantom.java | 4 +- .../block/BlockRitualController.java | 1 - .../bloodmagic/block/BlockSoulForge.java | 4 +- .../bloodmagic/block/BlockSpectral.java | 4 +- .../bloodmagic/block/BlockTeleposer.java | 4 +- .../client/gui/GuiItemRoutingNode.java | 31 ++---- .../client/gui/GuiMasterRoutingNode.java | 3 - .../client/helper/ShaderHelper.java | 20 ++-- .../client/hud/HUDElementDemonWillAura.java | 2 +- .../render/entity/RenderCorruptedChicken.java | 2 +- .../render/entity/RenderCorruptedSheep.java | 6 +- .../render/entity/RenderCorruptedSpider.java | 2 +- .../render/entity/RenderCorruptedZombie.java | 2 +- .../render/entity/RenderEntityMeteor.java | 25 ++--- .../entity/RenderEntitySentientArrow.java | 2 +- .../command/sub/SubCommandBind.java | 3 - .../bloodmagic/compat/guideapi/BookUtils.java | 4 +- .../compat/guideapi/book/CategoryAlchemy.java | 20 ++-- .../guideapi/book/CategoryArchitect.java | 100 +++++++++--------- .../compat/guideapi/book/CategoryDemon.java | 34 +++--- .../compat/guideapi/book/CategoryRitual.java | 12 +-- .../compat/guideapi/book/CategorySpell.java | 2 +- .../guideapi/page/PageAlchemyArray.java | 2 +- .../alchemyTable/AlchemyTableRecipeJEI.java | 2 +- .../ArmourDowngradeRecipeMaker.java | 2 +- .../jei/binding/BindingRecipeMaker.java | 2 +- .../DataProviderRitualController.java | 1 - .../compress/CompressionRegistry.java | 4 +- .../core/data/BMWorldSavedData.java | 2 +- .../registry/AlchemyArrayRecipeRegistry.java | 12 +-- .../registry/AlchemyTableRecipeRegistry.java | 4 +- .../core/registry/AltarRecipeRegistry.java | 5 +- .../core/registry/HarvestRegistry.java | 20 ++-- .../registry/ImperfectRitualRegistry.java | 7 +- .../LivingArmourDowngradeRecipeRegistry.java | 6 +- .../bloodmagic/core/registry/OrbRegistry.java | 6 +- .../core/registry/RitualRegistry.java | 14 +-- .../registry/TartaricForgeRecipeRegistry.java | 4 +- .../bloodmagic/demonAura/WillWorld.java | 2 +- .../demonAura/WorldDemonWillHandler.java | 7 +- .../entity/ai/EntityAIRetreatToHeal.java | 2 +- .../entity/mob/EntityAspectedDemonBase.java | 2 +- .../entity/mob/EntityCorruptedChicken.java | 4 +- .../entity/mob/EntityCorruptedSheep.java | 25 ++--- .../entity/mob/EntityCorruptedSpider.java | 6 +- .../entity/mob/EntityDemonBase.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 16 +-- .../incense/EnumTranquilityType.java | 3 +- .../incense/IncenseAltarHandler.java | 4 +- .../incense/IncenseTranquilityRegistry.java | 2 +- .../inversion/CorruptionHandler.java | 4 +- .../inversion/InversionPillarHandler.java | 32 +++--- .../bloodmagic/item/ItemAltarMaker.java | 4 +- .../bloodmagic/item/ItemArcaneAshes.java | 4 +- .../bloodmagic/item/ItemBoundAxe.java | 2 +- .../bloodmagic/item/ItemBoundPickaxe.java | 2 +- .../bloodmagic/item/ItemBoundShovel.java | 2 +- .../bloodmagic/item/ItemBoundSword.java | 4 +- .../bloodmagic/item/ItemBoundTool.java | 4 +- .../bloodmagic/item/ItemDemonWillGauge.java | 4 +- .../bloodmagic/item/ItemExperienceBook.java | 6 +- .../bloodmagic/item/ItemLavaCrystal.java | 2 - .../bloodmagic/item/ItemPotionFlask.java | 4 +- .../bloodmagic/item/ItemRitualDiviner.java | 18 ++-- .../bloodmagic/item/ItemRitualReader.java | 12 +-- .../item/ItemSacrificialDagger.java | 4 +- .../bloodmagic/item/ItemUpgradeTome.java | 4 +- .../bloodmagic/item/ItemUpgradeTrainer.java | 6 +- .../item/armour/ItemLivingArmour.java | 10 +- .../item/armour/ItemSentientArmour.java | 4 +- .../item/block/base/ItemBlockString.java | 32 ------ .../item/gear/ItemPackSacrifice.java | 4 +- .../item/gear/ItemPackSelfSacrifice.java | 4 +- .../item/routing/ItemFluidRouterFilter.java | 8 +- .../item/routing/ItemNodeRouter.java | 12 +-- .../item/routing/ItemRouterFilter.java | 14 +-- .../bloodmagic/item/sigil/ItemSigilBase.java | 4 +- .../item/sigil/ItemSigilPhantomBridge.java | 13 +-- .../item/sigil/ItemSigilToggleableBase.java | 4 +- .../item/soul/ItemSentientArmourGem.java | 2 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 6 +- .../item/soul/ItemSentientPickaxe.java | 6 +- .../item/soul/ItemSentientShovel.java | 6 +- .../item/soul/ItemSentientSword.java | 6 +- .../bloodmagic/item/soul/ItemSoulGem.java | 4 +- .../bloodmagic/item/soul/ItemSoulSnare.java | 6 +- .../bloodmagic/livingArmour/LivingArmour.java | 8 +- .../livingArmour/LivingArmourHandler.java | 9 +- .../LivingArmourUpgradeDigSlowdown.java | 2 +- .../LivingArmourUpgradeMeleeDecrease.java | 2 +- .../LivingArmourUpgradeSlowness.java | 2 +- .../tracker/StatTrackerArrowProtect.java | 4 +- .../tracker/StatTrackerArrowShot.java | 4 +- .../tracker/StatTrackerCriticalStrike.java | 4 +- .../tracker/StatTrackerDigging.java | 4 +- .../tracker/StatTrackerExperience.java | 4 +- .../tracker/StatTrackerFallProtect.java | 4 +- .../tracker/StatTrackerFireResist.java | 2 +- .../livingArmour/tracker/StatTrackerFood.java | 4 +- .../tracker/StatTrackerGraveDigger.java | 4 +- .../tracker/StatTrackerGrimReaperSprint.java | 4 +- .../tracker/StatTrackerHealthboost.java | 4 +- .../livingArmour/tracker/StatTrackerJump.java | 4 +- .../tracker/StatTrackerMeleeDamage.java | 4 +- .../tracker/StatTrackerMovement.java | 6 +- .../tracker/StatTrackerNightSight.java | 4 +- .../tracker/StatTrackerPhysicalProtect.java | 4 +- .../tracker/StatTrackerPoison.java | 2 +- .../tracker/StatTrackerRepairing.java | 4 +- .../tracker/StatTrackerSelfSacrifice.java | 4 +- .../tracker/StatTrackerSolarPowered.java | 4 +- .../tracker/StatTrackerSprintAttack.java | 4 +- .../tracker/StatTrackerStepAssist.java | 6 +- .../upgrade/LivingArmourUpgradeDigging.java | 2 +- .../LivingArmourUpgradeHealthboost.java | 2 +- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 2 +- .../upgrade/LivingArmourUpgradeSpeed.java | 2 +- .../bloodmagic/potion/BMPotionUtils.java | 2 +- .../bloodmagic/proxy/ClientProxy.java | 7 -- .../recipe/LivingArmourDowngradeRecipe.java | 12 +-- .../recipe/TartaricForgeRecipe.java | 31 +++--- .../AlchemyTableDyeableRecipe.java | 4 +- .../AlchemyTablePotionAugmentRecipe.java | 12 +-- .../AlchemyTablePotionRecipe.java | 10 +- .../alchemyTable/AlchemyTableRecipe.java | 12 +-- .../bloodmagic/registry/ModRecipes.java | 10 +- .../bloodmagic/ritual/RitualAltarBuilder.java | 6 +- .../bloodmagic/ritual/RitualAnimalGrowth.java | 2 +- .../bloodmagic/ritual/RitualArmourEvolve.java | 2 +- .../bloodmagic/ritual/RitualCobblestone.java | 2 +- .../bloodmagic/ritual/RitualContainment.java | 5 +- .../bloodmagic/ritual/RitualCrushing.java | 8 +- .../ritual/RitualCrystalHarvest.java | 2 +- .../bloodmagic/ritual/RitualExpulsion.java | 5 +- .../ritual/RitualFeatheredKnife.java | 4 +- .../bloodmagic/ritual/RitualFelling.java | 4 +- .../bloodmagic/ritual/RitualForsakenSoul.java | 8 +- .../bloodmagic/ritual/RitualFullStomach.java | 4 +- .../bloodmagic/ritual/RitualGreenGrove.java | 2 +- .../bloodmagic/ritual/RitualHarvest.java | 2 +- .../bloodmagic/ritual/RitualInterdiction.java | 5 +- .../bloodmagic/ritual/RitualJumping.java | 2 +- .../bloodmagic/ritual/RitualLava.java | 2 +- .../ritual/RitualLivingArmourDowngrade.java | 30 +++--- .../bloodmagic/ritual/RitualMagnetic.java | 11 +- .../bloodmagic/ritual/RitualMeteor.java | 2 +- .../bloodmagic/ritual/RitualPlacer.java | 2 +- .../bloodmagic/ritual/RitualPortal.java | 2 +- .../bloodmagic/ritual/RitualPump.java | 2 +- .../bloodmagic/ritual/RitualRegeneration.java | 2 +- .../bloodmagic/ritual/RitualSpeed.java | 2 +- .../bloodmagic/ritual/RitualSuppression.java | 2 +- .../ritual/RitualUpgradeRemove.java | 2 +- .../bloodmagic/ritual/RitualWater.java | 2 +- .../ritual/RitualWellOfSuffering.java | 2 +- .../bloodmagic/ritual/RitualZephyr.java | 2 +- .../ritual/data/AreaDescriptor.java | 18 ++-- .../ritual/data/EnumRitualReaderState.java | 3 +- .../bloodmagic/ritual/data/Ritual.java | 12 +-- .../harvest/HarvestHandlerPlantable.java | 4 +- .../ritual/harvest/HarvestHandlerStem.java | 2 +- .../ritual/harvest/HarvestHandlerTall.java | 2 +- .../ritual/portal/LocationsHandler.java | 4 +- .../routing/RoutingFluidFilter.java | 4 +- .../bloodmagic/routing/TestItemFilter.java | 8 +- .../bloodmagic/soul/DemonWillHolder.java | 2 +- .../bloodmagic/structures/Dungeon.java | 12 +-- .../bloodmagic/structures/DungeonRoom.java | 10 +- .../structures/DungeonRoomRegistry.java | 2 +- .../bloodmagic/structures/DungeonUtil.java | 2 +- .../bloodmagic/teleport/TeleportQueue.java | 2 +- .../teleport/TeleporterBloodMagic.java | 2 +- .../bloodmagic/tile/TileAlchemyArray.java | 1 - .../bloodmagic/tile/TileAlchemyTable.java | 4 +- .../bloodmagic/tile/TileDemonCrucible.java | 2 +- .../bloodmagic/tile/TileIncenseAltar.java | 8 +- .../bloodmagic/tile/TileInversionPillar.java | 3 +- .../tile/TileMasterRitualStone.java | 10 +- .../WayofTime/bloodmagic/tile/TileMimic.java | 4 +- .../tile/TilePurificationAltar.java | 2 +- .../bloodmagic/tile/TileSoulForge.java | 2 +- .../tile/routing/TileMasterRoutingNode.java | 34 +++--- .../tile/routing/TileRoutingNode.java | 2 +- .../WayofTime/bloodmagic/util/ChatUtil.java | 7 +- .../bloodmagic/util/ItemStackWrapper.java | 4 +- .../java/WayofTime/bloodmagic/util/Utils.java | 6 +- .../util/handler/event/ClientHandler.java | 8 +- .../util/handler/event/CraftingHandler.java | 2 +- .../util/handler/event/GenericHandler.java | 13 +-- .../util/handler/event/WillHandler.java | 2 +- .../bloodmagic/util/helper/NetworkHelper.java | 2 - .../bloodmagic/util/helper/NumeralHelper.java | 2 +- .../bloodmagic/util/helper/TextHelper.java | 4 +- 207 files changed, 603 insertions(+), 731 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockString.java diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index 9dc68b22..9d8d63d5 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -28,7 +28,7 @@ import java.util.*; */ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { private FakePlayer target; - private Set tracking = new HashSet(); + private Set tracking = new HashSet<>(); private int counter = 0; private int maxMobsAttracted = 10000; @@ -48,9 +48,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { BlockPos pos = tile.getPos(); counter++; if (counter < 10) { - Iterator itr = tracking.iterator(); - while (itr.hasNext()) { - EntityLiving ent = itr.next(); + for (EntityLiving ent : tracking) { onEntityTick(pos, ent); } @@ -61,7 +59,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { World world = tile.getWorld(); - Set trackingThisTick = new HashSet(); + Set trackingThisTick = new HashSet<>(); List entsInBounds = world.getEntitiesWithinAABB(EntityLiving.class, getBounds(pos)); for (EntityLiving ent : entsInBounds) { @@ -268,7 +266,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { private void cancelCurrentTasks(EntityLiving ent) { Iterator iterator = ent.tasks.taskEntries.iterator(); - List currentTasks = new ArrayList(); + List currentTasks = new ArrayList<>(); while (iterator.hasNext()) { EntityAITaskEntry entityaitaskentry = iterator.next(); if (entityaitaskentry != null) { diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index 6f1fd59d..d297eb60 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -25,12 +25,7 @@ import java.util.List; * Credits for the initial code go to Crazy Pants of EIO. */ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { - public static Predicate checkSkeleton = new Predicate() { - @Override - public boolean apply(EntityMob input) { - return !(input instanceof EntitySkeleton); - } - }; + public static Predicate checkSkeleton = input -> !(input instanceof EntitySkeleton); private EntitySkeleton turret; public AlchemyArrayEffectSkeletonTurret(String key) { @@ -105,7 +100,7 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { private void cancelCurrentTargetTasks(EntityLiving entity) { Iterator iterator = entity.targetTasks.taskEntries.iterator(); - List currentTasks = new ArrayList(); + List currentTasks = new ArrayList<>(); while (iterator.hasNext()) { EntityAITaskEntry entityaitaskentry = iterator.next(); if (entityaitaskentry != null)// && entityaitaskentry.action instanceof EntityAITarget) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 2da8895d..f55108ca 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -14,7 +14,6 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import com.google.common.base.Enums; -import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java index 4eaf1714..0478db4b 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java @@ -122,7 +122,7 @@ public enum EnumAltarTier { public static final int MAXTIERS = values().length; - ArrayList altarComponents = new ArrayList(); + ArrayList altarComponents = new ArrayList<>(); public void buildComponents() { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index e3b768f0..8d9c9b8f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -25,7 +25,7 @@ import javax.annotation.Nullable; public class BlockAlchemyTable extends Block implements IBMBlock { public static final PropertyBool INVISIBLE = PropertyBool.create("invisible"); - public static final PropertyEnum DIRECTION = PropertyEnum.create("direction", EnumFacing.class); + public static final PropertyEnum DIRECTION = PropertyEnum.create("direction", EnumFacing.class); public BlockAlchemyTable() { super(Material.ROCK); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 7f9d2236..679ae793 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -164,8 +164,8 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } @@ -173,7 +173,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl @Override public List getDocumentation(EntityPlayer player, World world, BlockPos pos, IBlockState state) { - List docs = new ArrayList(); + List docs = new ArrayList<>(); IBloodAltar altar = ((IBloodAltar) world.getTileEntity(pos)); Pair missingBlock = BloodAltar.getAltarMissingBlock(world, pos, altar.getTier().toInt()); if (missingBlock != null) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 0d61ac9e..1bcbbc80 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -101,8 +101,8 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index ddea0501..fdb13d22 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -27,8 +27,8 @@ import java.util.Random; public class BlockDemonCrystal extends Block { public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); - public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", EnumFacing.class); + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); + public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", EnumFacing.class); public BlockDemonCrystal() { super(Material.ROCK); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 0b255c05..8ed12395 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -69,8 +69,8 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 28abe0f5..a761816b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -62,8 +62,8 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index af051063..87048b65 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -85,8 +85,8 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java index 03040157..e5b3b04d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java @@ -74,7 +74,7 @@ public class BlockInversionPillar extends BlockEnum { @Override public List> getVariants() { - List> ret = new ArrayList>(); + List> ret = new ArrayList<>(); for (int i = 0; i < this.getTypes().length; i++) ret.add(Pair.of(i, "static=false,type=" + this.getTypes()[i])); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java index 9b0e3067..7fb5b5d5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java @@ -55,9 +55,9 @@ public class BlockInversionPillarEnd extends BlockEnum impleme @Override public List> getVariants() { - List> ret = new ArrayList>(); + List> ret = new ArrayList<>(); for (int i = 0; i < this.getTypes().length; i++) - ret.add(new ImmutablePair(i, "type=" + this.getTypes()[i])); + ret.add(new ImmutablePair<>(i, "type=" + this.getTypes()[i])); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index b488e046..6744b025 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -86,8 +86,8 @@ public class BlockPhantom extends Block implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 2824b6f0..a4405cf6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -14,7 +14,6 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import amerifrance.guideapi.api.IGuideLinked; -import com.google.common.base.Strings; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 7b8cc730..e4a0a271 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -99,8 +99,8 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 6aa45663..2aa70bea 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -109,8 +109,8 @@ public class BlockSpectral extends Block implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 4df0bbe5..5ac1eaf1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -66,8 +66,8 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index ffba0f12..e879512a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -25,15 +25,6 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiItemRoutingNode extends GuiContainer { - private GuiButton downButton; - private GuiButton upButton; - private GuiButton northButton; - private GuiButton southButton; - private GuiButton westButton; - private GuiButton eastButton; - private GuiButton incrementButton; - private GuiButton decrementButton; - private GuiTextField textBox; private TileFilteredRoutingNode inventory; @@ -65,14 +56,14 @@ public class GuiItemRoutingNode extends GuiContainer { top = (this.height - this.ySize) / 2; this.buttonList.clear(); - this.buttonList.add(this.downButton = new GuiButton(0, left + 176, top + 14, 18, 18, "D")); - this.buttonList.add(this.upButton = new GuiButton(1, left + 176, top + 32, 18, 18, "U")); - this.buttonList.add(this.northButton = new GuiButton(2, left + 176, top + 50, 18, 18, "N")); - this.buttonList.add(this.southButton = new GuiButton(3, left + 176, top + 68, 18, 18, "S")); - this.buttonList.add(this.westButton = new GuiButton(4, left + 176, top + 86, 18, 18, "W")); - this.buttonList.add(this.eastButton = new GuiButton(5, left + 176, top + 104, 18, 18, "E")); - this.buttonList.add(this.incrementButton = new GuiButton(6, left + 160, top + 50, 10, 18, ">")); - this.buttonList.add(this.decrementButton = new GuiButton(7, left + 132, top + 50, 10, 18, "<")); + this.buttonList.add(new GuiButton(0, left + 176, top + 14, 18, 18, "D")); + this.buttonList.add(new GuiButton(1, left + 176, top + 32, 18, 18, "U")); + this.buttonList.add(new GuiButton(2, left + 176, top + 50, 18, 18, "N")); + this.buttonList.add(new GuiButton(3, left + 176, top + 68, 18, 18, "S")); + this.buttonList.add(new GuiButton(4, left + 176, top + 86, 18, 18, "W")); + this.buttonList.add(new GuiButton(5, left + 176, top + 104, 18, 18, "E")); + this.buttonList.add(new GuiButton(6, left + 160, top + 50, 10, 18, ">")); + this.buttonList.add(new GuiButton(7, left + 132, top + 50, 10, 18, "<")); disableDirectionalButton(inventory.currentActiveSlot); this.textBox = new GuiTextField(0, this.fontRenderer, left + 94, top + 37, 70, 12); @@ -92,7 +83,7 @@ public class GuiItemRoutingNode extends GuiContainer { try { Integer testVal = Integer.decode(str); if (testVal != null) { - amount = testVal.intValue(); + amount = testVal; } } catch (NumberFormatException d) { } @@ -120,7 +111,7 @@ public class GuiItemRoutingNode extends GuiContainer { if (container.lastGhostSlotClicked != -1) { Slot slot = container.getSlot(container.lastGhostSlotClicked + 1); ItemStack stack = slot.getStack(); - if (stack != null) { + if (!stack.isEmpty()) { int amount = GhostItemHelper.getItemGhostAmount(stack); this.textBox.setText("" + amount); } else { @@ -173,7 +164,7 @@ public class GuiItemRoutingNode extends GuiContainer { String s = ""; if (container.lastGhostSlotClicked != -1) { ItemStack clickedStack = inventorySlots.getSlot(1 + container.lastGhostSlotClicked).getStack(); - if (clickedStack != null) { + if (!clickedStack.isEmpty()) { s = clickedStack.getDisplayName(); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java index 3da9b255..c64d1b21 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java @@ -6,20 +6,17 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMasterRoutingNode extends GuiContainer { - private TileEntity inventory; public GuiMasterRoutingNode(InventoryPlayer playerInventory, IInventory tileRoutingNode) { super(new ContainerMasterRoutingNode(playerInventory, tileRoutingNode)); this.xSize = 216; this.ySize = 216; - inventory = (TileEntity) tileRoutingNode; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java index a268d9f9..950af569 100644 --- a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java +++ b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java @@ -1,13 +1,3 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - *

- * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)] - */ package WayofTime.bloodmagic.client.helper; import net.minecraft.client.renderer.OpenGlHelper; @@ -22,6 +12,16 @@ import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + *

+ * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + *

+ * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)] + */ public final class ShaderHelper { private static final int VERT_ST = ARBVertexShader.GL_VERTEX_SHADER_ARB; private static final int FRAG_ST = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB; diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java index 72f5f05f..20003b61 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; public class HUDElementDemonWillAura extends HUDElement { - protected List barOrder = new ArrayList(); + protected List barOrder = new ArrayList<>(); public HUDElementDemonWillAura() { super(5, 5, RenderGameOverlayEvent.ElementType.HOTBAR); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java index 44db0152..6db0f642 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java @@ -16,7 +16,7 @@ public class RenderCorruptedChicken extends RenderLiving public RenderCorruptedChicken(RenderManager renderManagerIn) { super(renderManagerIn, new ModelCorruptedChicken(0), 0.3f); - this.addLayer(new LayerWill(this, new ModelCorruptedChicken(1.1f))); + this.addLayer(new LayerWill<>(this, new ModelCorruptedChicken(1.1f))); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java index 11529425..d8024973 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java @@ -19,9 +19,9 @@ public class RenderCorruptedSheep extends RenderLiving { public RenderCorruptedSheep(RenderManager renderManagerIn) { super(renderManagerIn, new ModelCorruptedSheep2(0), 0.7F); this.addLayer(new LayerCorruptedSheepWool(this)); - this.addLayer(new LayerWill(this, new ModelCorruptedSheep(1.1f))); - this.addLayer(new LayerWill(this, new ModelCorruptedSheep2(1.1f))); - this.addLayer(new LayerAlchemyCircle()); + this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep(1.1f))); + this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep2(1.1f))); + this.addLayer(new LayerAlchemyCircle<>()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java index 343a459c..bef6c894 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java @@ -18,7 +18,7 @@ public class RenderCorruptedSpider extends RenderLiving { public RenderCorruptedSpider(RenderManager renderManagerIn) { super(renderManagerIn, new ModelSpider(), 1.0F); this.addLayer(new LayerCorruptedSpiderEyes(this)); - this.addLayer(new LayerWill(this, new ModelCorruptedSpider(1.1f))); + this.addLayer(new LayerWill<>(this, new ModelCorruptedSpider(1.1f))); } protected float getDeathMaxRotation(EntityCorruptedSpider entityLivingBaseIn) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java index 57475a5f..f7ffad16 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java @@ -38,7 +38,7 @@ public class RenderCorruptedZombie extends RenderBiped { } this.layerRenderers.remove(layerbipedarmor); - this.addLayer(new LayerWill(this, new ModelZombie(1.2f, false))); + this.addLayer(new LayerWill<>(this, new ModelZombie(1.2f, false))); } /** diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java index f1cf5f9f..77c9cdbc 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java @@ -10,9 +10,11 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; public class RenderEntityMeteor extends Render { - private static final ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png"); + + private static final ResourceLocation TEXTURE = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png"); + private static final float SCALE = 1; + public ModelBase model = new ModelMeteor(); - private float scale = 1; public RenderEntityMeteor(RenderManager renderManagerIn) { super(renderManagerIn); @@ -20,24 +22,11 @@ public class RenderEntityMeteor extends Render { @Override public void doRender(EntityMeteor entity, double x, double y, double z, float entityYaw, float partialTicks) { -// GlStateManager.pushMatrix(); -// GlStateManager.translate((float) x, (float) y, (float) z); -// GlStateManager.enableRescaleNormal(); -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); -// GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); -// this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); -// this.renderItem.renderItem(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), ItemCameraTransforms.TransformType.GROUND); -// GlStateManager.disableRescaleNormal(); -// GlStateManager.popMatrix(); - GlStateManager.pushMatrix(); GlStateManager.translate((float) x, (float) y, (float) z); GlStateManager.enableRescaleNormal(); - GlStateManager.scale(scale, scale, scale); - this.bindTexture(this.getEntityTexture(entity)); -// GL11.glRotatef(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * f1, 0.0F, 1.0F, 0.0F); -// GL11.glRotatef(180.0f - entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * f1, 1.0F, 0.0F, 0.0f); + GlStateManager.scale(SCALE, SCALE, SCALE); + this.bindTexture(TEXTURE); model.render(entity, 0, (float) x, (float) y, (float) z, entityYaw, partialTicks); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); @@ -47,6 +36,6 @@ public class RenderEntityMeteor extends Render { @Override protected ResourceLocation getEntityTexture(EntityMeteor entity) { - return resource; + return TEXTURE; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java index c0a2a618..3e522850 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java @@ -37,7 +37,7 @@ public class RenderEntitySentientArrow extends Render { int i = 0; float f = 0.0F; float f1 = 0.5F; - float f2 = (float) (0 + i * 10) / 32.0F; + float f2 = (float) (i * 10) / 32.0F; float f3 = (float) (5 + i * 10) / 32.0F; float f4 = 0.0F; float f5 = 0.15625F; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 7548e3ec..5547ac6d 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -1,12 +1,9 @@ package WayofTime.bloodmagic.command.sub; import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.helper.BindableHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 80b78c00..c8b7e847 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -22,7 +22,7 @@ public class BookUtils { AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack); if (renderer instanceof DualAlchemyCircleRenderer) { - List resources = new ArrayList(); + List resources = new ArrayList<>(); resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource); resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource); return new PageAlchemyArray(resources, inputStack, catalystStack); @@ -43,7 +43,7 @@ public class BookUtils { AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack); if (renderer != null) { if (renderer instanceof DualAlchemyCircleRenderer) { - List resources = new ArrayList(); + List resources = new ArrayList<>(); resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource); resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource); return new PageAlchemyArray(resources, inputStack, catalystStack, outputStack); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index 9eb03a5b..a167ea9b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -26,14 +26,14 @@ public class CategoryAlchemy { public static Map buildCategory() { - Map entries = new LinkedHashMap(); + Map entries = new LinkedHashMap<>(); String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy."; - List introPages = new ArrayList(); + List introPages = new ArrayList<>(); introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); - List ashPages = new ArrayList(); + List ashPages = new ArrayList<>(); TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); if (ashRecipe != null) @@ -43,7 +43,7 @@ public class CategoryAlchemy ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); - List furnacePages = new ArrayList(); + List furnacePages = new ArrayList<>(); PageAlchemyArray furnaceRecipePage = BookUtils.getAlchemyPage("furnace"); if (furnaceRecipePage != null) @@ -53,7 +53,7 @@ public class CategoryAlchemy furnacePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "furnace" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "furnace"), new EntryText(furnacePages, TextHelper.localize(keyBase + "furnace"), true)); - List speedPages = new ArrayList(); + List speedPages = new ArrayList<>(); PageAlchemyArray speedRecipePage = BookUtils.getAlchemyPage("movement"); if (speedRecipePage != null) @@ -63,7 +63,7 @@ public class CategoryAlchemy speedPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "speed" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "speed"), new EntryText(speedPages, TextHelper.localize(keyBase + "speed"), true)); - List updraftPages = new ArrayList(); + List updraftPages = new ArrayList<>(); PageAlchemyArray updraftRecipePage = BookUtils.getAlchemyPage("updraft"); if (updraftRecipePage != null) @@ -73,7 +73,7 @@ public class CategoryAlchemy updraftPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "updraft" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "updraft"), new EntryText(updraftPages, TextHelper.localize(keyBase + "updraft"), true)); - List turretPages = new ArrayList(); + List turretPages = new ArrayList<>(); PageAlchemyArray turretRecipePage = BookUtils.getAlchemyPage("skeletonTurret"); if (turretRecipePage != null) @@ -83,7 +83,7 @@ public class CategoryAlchemy turretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "turret" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "turret"), new EntryText(turretPages, TextHelper.localize(keyBase + "turret"), true)); - List bouncePages = new ArrayList(); + List bouncePages = new ArrayList<>(); PageAlchemyArray bounceRecipePage = BookUtils.getAlchemyPage("bounce"); if (bounceRecipePage != null) @@ -93,12 +93,12 @@ public class CategoryAlchemy bouncePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bounce" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "bounce"), new EntryText(bouncePages, TextHelper.localize(keyBase + "bounce"), true)); - List buffPages = new ArrayList(); + List buffPages = new ArrayList<>(); buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "buff"), new EntryText(buffPages, TextHelper.localize(keyBase + "buff"), true)); - List fastMinerPages = new ArrayList(); + List fastMinerPages = new ArrayList<>(); PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner"); if (fastMinerRecipePage != null) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 9648211e..946dd171 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -31,15 +31,15 @@ import java.util.Map.Entry; public class CategoryArchitect { public static Map buildCategory() { - Map entries = new LinkedHashMap(); + Map entries = new LinkedHashMap<>(); String keyBase = "guide." + BloodMagic.MODID + ".entry.architect."; - List introPages = new ArrayList(); + List introPages = new ArrayList<>(); introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); // introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); - List altarPages = new ArrayList(); + List altarPages = new ArrayList<>(); IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ALTAR)); if (altarRecipe != null) { @@ -56,7 +56,7 @@ public class CategoryArchitect { altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "bloodaltar"), new EntryText(altarPages, TextHelper.localize(keyBase + "bloodaltar"), true)); - List ashPages = new ArrayList(); + List ashPages = new ArrayList<>(); TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); if (ashRecipe != null) { @@ -65,7 +65,7 @@ public class CategoryArchitect { ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); - List divinationPages = new ArrayList(); + List divinationPages = new ArrayList<>(); PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)); if (divinationRecipePage != null) { @@ -75,12 +75,12 @@ public class CategoryArchitect { divinationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "divination" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "divination"), new EntryText(divinationPages, TextHelper.localize(keyBase + "divination"), true)); - List soulnetworkPages = new ArrayList(); + List soulnetworkPages = new ArrayList<>(); soulnetworkPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "soulnetwork" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "soulnetwork"), new EntryText(soulnetworkPages, TextHelper.localize(keyBase + "soulnetwork"), true)); - List weakorbPages = new ArrayList(); + List weakorbPages = new ArrayList<>(); weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370)); AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)); @@ -91,7 +91,7 @@ public class CategoryArchitect { weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "weakorb"), new EntryText(weakorbPages, TextHelper.localize(keyBase + "weakorb"), true)); - List incensePages = new ArrayList(); + List incensePages = new ArrayList<>(); IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR)); if (incenseRecipe != null) { @@ -108,7 +108,7 @@ public class CategoryArchitect { incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "incense"), new EntryText(incensePages, TextHelper.localize(keyBase + "incense"), true)); - List runePages = new ArrayList(); + List runePages = new ArrayList<>(); IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 0)); if (runeRecipe != null) { @@ -118,7 +118,7 @@ public class CategoryArchitect { runePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodrune" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "bloodrune"), new EntryText(runePages, TextHelper.localize(keyBase + "bloodrune"), true)); - List inspectPages = new ArrayList(); + List inspectPages = new ArrayList<>(); AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK)); if (inspectRecipe != null) { @@ -128,7 +128,7 @@ public class CategoryArchitect { inspectPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "inspectoris" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "inspectoris"), new EntryText(inspectPages, TextHelper.localize(keyBase + "inspectoris"), true)); - List speedRunePages = new ArrayList(); + List speedRunePages = new ArrayList<>(); IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1)); if (speedRecipe != null) { @@ -138,7 +138,7 @@ public class CategoryArchitect { speedRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSpeed" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "runeSpeed"), new EntryText(speedRunePages, TextHelper.localize(keyBase + "runeSpeed"), true)); - List waterPages = new ArrayList(); + List waterPages = new ArrayList<>(); TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_WATER.getStack()); if (waterRecipe != null) { @@ -153,7 +153,7 @@ public class CategoryArchitect { waterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "water" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "water"), new EntryText(waterPages, TextHelper.localize(keyBase + "water"), true)); - List lavaPages = new ArrayList(); + List lavaPages = new ArrayList<>(); TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_LAVA.getStack()); if (lavaRecipe != null) { @@ -168,7 +168,7 @@ public class CategoryArchitect { lavaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lava" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "lava"), new EntryText(lavaPages, TextHelper.localize(keyBase + "lava"), true)); - List lavaCrystalPages = new ArrayList(); + List lavaCrystalPages = new ArrayList<>(); IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL)); if (lavaCrystalRecipe != null) { @@ -178,7 +178,7 @@ public class CategoryArchitect { lavaCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lavaCrystal" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "lavaCrystal"), new EntryText(lavaCrystalPages, TextHelper.localize(keyBase + "lavaCrystal"), true)); - List apprenticeorbPages = new ArrayList(); + List apprenticeorbPages = new ArrayList<>(); AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE)); if (apprenticeorbRecipe != null) { @@ -188,7 +188,7 @@ public class CategoryArchitect { apprenticeorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "apprenticeorb" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "apprenticeorb"), new EntryText(apprenticeorbPages, TextHelper.localize(keyBase + "apprenticeorb"), true)); - List daggerPages = new ArrayList(); + List daggerPages = new ArrayList<>(); AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE)); if (daggerOfSacrificeRecipe != null) { @@ -198,7 +198,7 @@ public class CategoryArchitect { daggerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "dagger" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "dagger"), new EntryText(daggerPages, TextHelper.localize(keyBase + "dagger"), true)); - List runeSacrificePages = new ArrayList(); + List runeSacrificePages = new ArrayList<>(); IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3)); if (runeSacrificeRecipe != null) { @@ -208,7 +208,7 @@ public class CategoryArchitect { runeSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSacrifice" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "runeSacrifice"), new EntryText(runeSacrificePages, TextHelper.localize(keyBase + "runeSacrifice"), true)); - List runeSelfSacrificePages = new ArrayList(); + List runeSelfSacrificePages = new ArrayList<>(); IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); if (runeSelfSacrificeRecipe != null) { @@ -218,7 +218,7 @@ public class CategoryArchitect { runeSelfSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSelfSacrifice" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "runeSelfSacrifice"), new EntryText(runeSelfSacrificePages, TextHelper.localize(keyBase + "runeSelfSacrifice"), true)); - List holdingPages = new ArrayList(); + List holdingPages = new ArrayList<>(); TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HOLDING.getStack()); if (holdingRecipe != null) { @@ -233,7 +233,7 @@ public class CategoryArchitect { holdingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "holding" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "holding"), new EntryText(holdingPages, TextHelper.localize(keyBase + "holding"), true)); - List airPages = new ArrayList(); + List airPages = new ArrayList<>(); TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AIR.getStack()); if (airRecipe != null) { @@ -248,7 +248,7 @@ public class CategoryArchitect { airPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "air" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "air"), new EntryText(airPages, TextHelper.localize(keyBase + "air"), true)); - List voidPages = new ArrayList(); + List voidPages = new ArrayList<>(); TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_VOID.getStack()); if (voidRecipe != null) { @@ -263,7 +263,7 @@ public class CategoryArchitect { voidPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "void" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "void"), new EntryText(voidPages, TextHelper.localize(keyBase + "void"), true)); - List greenGrovePages = new ArrayList(); + List greenGrovePages = new ArrayList<>(); TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_GROWTH.getStack()); if (greenGroveRecipe != null) { @@ -278,7 +278,7 @@ public class CategoryArchitect { greenGrovePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "greenGrove" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "greenGrove"), new EntryText(greenGrovePages, TextHelper.localize(keyBase + "greenGrove"), true)); - List fastMinerPages = new ArrayList(); + List fastMinerPages = new ArrayList<>(); TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_FAST_MINER.getStack()); if (fastMinerRecipe != null) { @@ -293,7 +293,7 @@ public class CategoryArchitect { fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); - List seerPages = new ArrayList(); + List seerPages = new ArrayList<>(); TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SIGHT.getStack()); if (seerRecipe != null) { @@ -308,7 +308,7 @@ public class CategoryArchitect { seerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "seer" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "seer"), new EntryText(seerPages, TextHelper.localize(keyBase + "seer"), true)); - List magicianOrbPages = new ArrayList(); + List magicianOrbPages = new ArrayList<>(); AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN)); if (magicianOrbRecipe != null) { @@ -318,7 +318,7 @@ public class CategoryArchitect { magicianOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magicianOrb" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "magicianOrb"), new EntryText(magicianOrbPages, TextHelper.localize(keyBase + "magicianOrb"), true)); - List capacityPages = new ArrayList(); + List capacityPages = new ArrayList<>(); IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); if (capacityRecipe != null) { @@ -328,7 +328,7 @@ public class CategoryArchitect { capacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "capacity" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "capacity"), new EntryText(capacityPages, TextHelper.localize(keyBase + "capacity"), true)); - List displacementPages = new ArrayList(); + List displacementPages = new ArrayList<>(); IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); if (displacementRecipe != null) { @@ -338,7 +338,7 @@ public class CategoryArchitect { displacementPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "displacement" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "displacement"), new EntryText(displacementPages, TextHelper.localize(keyBase + "displacement"), true)); - List affinityPages = new ArrayList(); + List affinityPages = new ArrayList<>(); TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AFFINITY.getStack()); if (affinityRecipe != null) { @@ -353,7 +353,7 @@ public class CategoryArchitect { affinityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "affinity" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "affinity"), new EntryText(affinityPages, TextHelper.localize(keyBase + "affinity"), true)); - List lampPages = new ArrayList(); + List lampPages = new ArrayList<>(); TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack()); if (lampRecipe != null) { @@ -368,7 +368,7 @@ public class CategoryArchitect { lampPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lamp" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "lamp"), new EntryText(lampPages, TextHelper.localize(keyBase + "lamp"), true)); - List magnetismPages = new ArrayList(); + List magnetismPages = new ArrayList<>(); TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_MAGNETISM.getStack()); if (magnetismRecipe != null) { @@ -383,7 +383,7 @@ public class CategoryArchitect { magnetismPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magnetism" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "magnetism"), new EntryText(magnetismPages, TextHelper.localize(keyBase + "magnetism"), true)); - List peritiaPages = new ArrayList(); + List peritiaPages = new ArrayList<>(); IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME)); if (peritiaRecipe != null) { @@ -393,7 +393,7 @@ public class CategoryArchitect { peritiaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "peritia" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "peritia"), new EntryText(peritiaPages, TextHelper.localize(keyBase + "peritia"), true)); - List livingArmourPages = new ArrayList(); + List livingArmourPages = new ArrayList<>(); TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BINDING.getStack()); if (bindingRecipe != null) { @@ -423,17 +423,17 @@ public class CategoryArchitect { livingArmourPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "livingArmour" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "livingArmour"), new EntryText(livingArmourPages, TextHelper.localize(keyBase + "livingArmour"), true)); - List upgradePages = new ArrayList(); + List upgradePages = new ArrayList<>(); upgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "upgradeTome" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "upgradeTome"), new EntryText(upgradePages, TextHelper.localize(keyBase + "upgradeTome"), true)); - List downgradePages = new ArrayList(); + List downgradePages = new ArrayList<>(); downgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "downgrade" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "downgrade"), new EntryText(downgradePages, TextHelper.localize(keyBase + "downgrade"), true)); - List teleposerPages = new ArrayList(); + List teleposerPages = new ArrayList<>(); AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)); if (teleposerFocusRecipe != null) { @@ -448,7 +448,7 @@ public class CategoryArchitect { teleposerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposer" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "teleposer"), new EntryText(teleposerPages, TextHelper.localize(keyBase + "teleposer"), true)); - List boundBladePages = new ArrayList(); + List boundBladePages = new ArrayList<>(); PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD)); if (boundBladePage != null) { @@ -458,7 +458,7 @@ public class CategoryArchitect { boundBladePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundBlade" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "boundBlade"), new EntryText(boundBladePages, TextHelper.localize(keyBase + "boundBlade"), true)); - List boundToolPages = new ArrayList(); + List boundToolPages = new ArrayList<>(); PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)); if (boundToolPage != null) { @@ -478,12 +478,12 @@ public class CategoryArchitect { boundToolPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundTool" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "boundTool"), new EntryText(boundToolPages, TextHelper.localize(keyBase + "boundTool"), true)); - List weakShardPages = new ArrayList(); + List weakShardPages = new ArrayList<>(); weakShardPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakShard" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "weakShard"), new EntryText(weakShardPages, TextHelper.localize(keyBase + "weakShard"), true)); - List masterOrbPages = new ArrayList(); + List masterOrbPages = new ArrayList<>(); AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER)); if (magicianOrbRecipe != null) { @@ -493,7 +493,7 @@ public class CategoryArchitect { masterOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterOrb" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "masterOrb"), new EntryText(masterOrbPages, TextHelper.localize(keyBase + "masterOrb"), true)); - List orbRunePages = new ArrayList(); + List orbRunePages = new ArrayList<>(); IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8)); if (orbRuneRecipe != null) { @@ -503,7 +503,7 @@ public class CategoryArchitect { orbRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeOrb" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "runeOrb"), new EntryText(orbRunePages, TextHelper.localize(keyBase + "runeOrb"), true)); - List augmentedCapacityPages = new ArrayList(); + List augmentedCapacityPages = new ArrayList<>(); IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7)); if (orbRuneRecipe != null) { @@ -513,7 +513,7 @@ public class CategoryArchitect { augmentedCapacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "augmentedCapacity" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "augmentedCapacity"), new EntryText(augmentedCapacityPages, TextHelper.localize(keyBase + "augmentedCapacity"), true)); - List chargingPages = new ArrayList(); + List chargingPages = new ArrayList<>(); IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10)); if (orbRuneRecipe != null) { @@ -523,7 +523,7 @@ public class CategoryArchitect { chargingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "charging" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "charging"), new EntryText(chargingPages, TextHelper.localize(keyBase + "charging"), true)); - List accelerationPages = new ArrayList(); + List accelerationPages = new ArrayList<>(); IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9)); if (orbRuneRecipe != null) { @@ -533,7 +533,7 @@ public class CategoryArchitect { accelerationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "acceleration" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "acceleration"), new EntryText(accelerationPages, TextHelper.localize(keyBase + "acceleration"), true)); - List suppressionPages = new ArrayList(); + List suppressionPages = new ArrayList<>(); TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SUPPRESSION.getStack()); if (suppressionRecipe != null) { @@ -548,7 +548,7 @@ public class CategoryArchitect { suppressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "suppression" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "suppression"), new EntryText(suppressionPages, TextHelper.localize(keyBase + "suppression"), true)); - List hastePages = new ArrayList(); + List hastePages = new ArrayList<>(); TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HASTE.getStack()); if (hasteRecipe != null) { @@ -563,7 +563,7 @@ public class CategoryArchitect { hastePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "haste" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "haste"), new EntryText(hastePages, TextHelper.localize(keyBase + "haste"), true)); - List severancePages = new ArrayList(); + List severancePages = new ArrayList<>(); TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SEVERANCE.getStack()); if (severanceRecipe != null) { @@ -578,7 +578,7 @@ public class CategoryArchitect { severancePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "severance" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "severance"), new EntryText(severancePages, TextHelper.localize(keyBase + "severance"), true)); - List telepositionPages = new ArrayList(); + List telepositionPages = new ArrayList<>(); TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_TELEPOSITION.getStack()); if (telepositionRecipe != null) { @@ -593,7 +593,7 @@ public class CategoryArchitect { telepositionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposition" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "teleposition"), new EntryText(telepositionPages, TextHelper.localize(keyBase + "teleposition"), true)); - List compressionPages = new ArrayList(); + List compressionPages = new ArrayList<>(); TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_COMPRESSION.getStack()); if (compressionRecipe != null) { @@ -608,7 +608,7 @@ public class CategoryArchitect { compressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "compression" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "compression"), new EntryText(compressionPages, TextHelper.localize(keyBase + "compression"), true)); - List bridgePages = new ArrayList(); + List bridgePages = new ArrayList<>(); TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BRIDGE.getStack()); if (bridgeRecipe != null) { @@ -623,7 +623,7 @@ public class CategoryArchitect { bridgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bridge" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "bridge"), new EntryText(bridgePages, TextHelper.localize(keyBase + "bridge"), true)); - List mimicPages = new ArrayList(); + List mimicPages = new ArrayList<>(); IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 1, 1)); if (mimicRecipe != null) { diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java index 92566ab3..eb26e3a4 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -26,15 +26,15 @@ import java.util.Map.Entry; public class CategoryDemon { //TODO: Add Forge recipe pages public static Map buildCategory() { - Map entries = new LinkedHashMap(); + Map entries = new LinkedHashMap<>(); String keyBase = "guide." + BloodMagic.MODID + ".entry.demon."; - List introPages = new ArrayList(); + List introPages = new ArrayList<>(); introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); // introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); - List snarePages = new ArrayList(); + List snarePages = new ArrayList<>(); snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.1"), 370)); IRecipe snareRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE)); @@ -45,7 +45,7 @@ public class CategoryDemon { snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "snare"), new EntryText(snarePages, TextHelper.localize(keyBase + "snare"), true)); - List forgePages = new ArrayList(); + List forgePages = new ArrayList<>(); forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.1"), 370)); IRecipe forgeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE)); @@ -56,7 +56,7 @@ public class CategoryDemon { forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "forge"), new EntryText(forgePages, TextHelper.localize(keyBase + "forge"), true)); - List pettyPages = new ArrayList(); + List pettyPages = new ArrayList<>(); pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.1"), 370)); TartaricForgeRecipe pettyRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM)); if (pettyRecipe != null) { @@ -65,7 +65,7 @@ public class CategoryDemon { pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "petty"), new EntryText(pettyPages, TextHelper.localize(keyBase + "petty"), true)); - List swordPages = new ArrayList(); + List swordPages = new ArrayList<>(); swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.1"), 370)); TartaricForgeRecipe swordRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD)); if (swordRecipe != null) { @@ -74,7 +74,7 @@ public class CategoryDemon { swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "sword"), new EntryText(swordPages, TextHelper.localize(keyBase + "sword"), true)); - List lesserPages = new ArrayList(); + List lesserPages = new ArrayList<>(); lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.1"), 370)); TartaricForgeRecipe lesserRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1)); if (lesserRecipe != null) { @@ -83,16 +83,16 @@ public class CategoryDemon { lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "lesser"), new EntryText(lesserPages, TextHelper.localize(keyBase + "lesser"), true)); - List reactionsPages = new ArrayList(); + List reactionsPages = new ArrayList<>(); reactionsPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "reactions" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "reactions"), new EntryText(reactionsPages, TextHelper.localize(keyBase + "reactions"), true)); - List sentientGemPages = new ArrayList(); + List sentientGemPages = new ArrayList<>(); sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.1"), 370)); sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "sentientGem"), new EntryText(sentientGemPages, TextHelper.localize(keyBase + "sentientGem"), true)); - List routingPages = new ArrayList(); + List routingPages = new ArrayList<>(); TartaricForgeRecipe nodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); if (nodeRecipe != null) { routingPages.add(new PageTartaricForgeRecipe(nodeRecipe)); @@ -118,17 +118,17 @@ public class CategoryDemon { routingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "routing" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "routing"), new EntryText(routingPages, TextHelper.localize(keyBase + "routing"), true)); - List auraPages = new ArrayList(); + List auraPages = new ArrayList<>(); auraPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "aura" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "aura"), new EntryText(auraPages, TextHelper.localize(keyBase + "aura"), true)); - List typesPages = new ArrayList(); + List typesPages = new ArrayList<>(); typesPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "types" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "types"), new EntryText(typesPages, TextHelper.localize(keyBase + "types"), true)); - List cruciblePages = new ArrayList(); + List cruciblePages = new ArrayList<>(); TartaricForgeRecipe crucibleRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE)); if (crucibleRecipe != null) { @@ -138,7 +138,7 @@ public class CategoryDemon { cruciblePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crucible" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "crucible"), new EntryText(cruciblePages, TextHelper.localize(keyBase + "crucible"), true)); - List crystallizerPages = new ArrayList(); + List crystallizerPages = new ArrayList<>(); TartaricForgeRecipe crystallizerRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER)); if (crystallizerRecipe != null) { @@ -148,7 +148,7 @@ public class CategoryDemon { crystallizerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crystallizer" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "crystallizer"), new EntryText(crystallizerPages, TextHelper.localize(keyBase + "crystallizer"), true)); - List clusterPages = new ArrayList(); + List clusterPages = new ArrayList<>(); TartaricForgeRecipe clusterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL)); if (clusterRecipe != null) { @@ -158,7 +158,7 @@ public class CategoryDemon { clusterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "cluster" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "cluster"), new EntryText(clusterPages, TextHelper.localize(keyBase + "cluster"), true)); - List pylonPages = new ArrayList(); + List pylonPages = new ArrayList<>(); TartaricForgeRecipe pylonRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON)); if (pylonRecipe != null) { @@ -168,7 +168,7 @@ public class CategoryDemon { pylonPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "pylon" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "pylon"), new EntryText(pylonPages, TextHelper.localize(keyBase + "pylon"), true)); - List gaugePages = new ArrayList(); + List gaugePages = new ArrayList<>(); TartaricForgeRecipe gaugeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE)); if (gaugeRecipe != null) { diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index ccc59e49..3d77b52c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -28,12 +28,12 @@ public class CategoryRitual { static String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual."; public static Map buildCategory() { - Map entries = new LinkedHashMap(); + Map entries = new LinkedHashMap<>(); addRitualPagesToEntries("intro", entries); addRitualPagesToEntries("basics", entries); - List ritualStonePages = new ArrayList(); + List ritualStonePages = new ArrayList<>(); IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); if (ritualStoneRecipe != null) { @@ -53,7 +53,7 @@ public class CategoryRitual { ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "ritualStone"), new EntryText(ritualStonePages, TextHelper.localize(keyBase + "ritualStone"), true)); - List masterRitualStonePages = new ArrayList(); + List masterRitualStonePages = new ArrayList<>(); IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 0)); if (masterRitualStoneRecipe != null) { @@ -63,7 +63,7 @@ public class CategoryRitual { masterRitualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterRitualStone" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "masterRitualStone"), new EntryText(masterRitualStonePages, TextHelper.localize(keyBase + "masterRitualStone"), true)); - List activationCrystalPages = new ArrayList(); + List activationCrystalPages = new ArrayList<>(); activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.1"), 370)); @@ -75,7 +75,7 @@ public class CategoryRitual { activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "activationCrystal"), new EntryText(activationCrystalPages, TextHelper.localize(keyBase + "activationCrystal"), true)); - List divinerPages = new ArrayList(); + List divinerPages = new ArrayList<>(); divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.1"), 370)); @@ -120,7 +120,7 @@ public class CategoryRitual { } public static void addRitualPagesToEntries(String name, Map entries) { - List pages = new ArrayList(); + List pages = new ArrayList<>(); pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + name + ".info"), 370)); entries.put(new ResourceLocation(keyBase + name), new EntryText(pages, TextHelper.localize(keyBase + name), true)); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java index 6c3d17e9..680bffda 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -9,7 +9,7 @@ import java.util.Map; public class CategorySpell { public static Map buildCategory() { - Map entries = new LinkedHashMap(); + Map entries = new LinkedHashMap<>(); String keyBase = Constants.Mod.DOMAIN + "spell_"; return entries; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java index 8529425f..caa0df9a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java @@ -24,7 +24,7 @@ public class PageAlchemyArray extends Page { public final ItemStack inputStack; public final ItemStack catalystStack; public final ItemStack outputStack; - public List arrayResources = new ArrayList(); + public List arrayResources = new ArrayList<>(); public PageAlchemyArray(List arrayResources, ItemStack inputStack, ItemStack catalystStack, ItemStack outputStack) { this.arrayResources = arrayResources; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index 715fb008..ba639936 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -45,7 +45,7 @@ public class AlchemyTableRecipeJEI implements IRecipeWrapper { @Override public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34) { ret.add(TextHelper.localize("tooltip.bloodmagic.tier", tier)); ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", syphon)); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java index f7baa13c..90ca286d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java @@ -11,7 +11,7 @@ public class ArmourDowngradeRecipeMaker { @Nonnull public static List getRecipes() { List recipeList = LivingArmourDowngradeRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList(); + ArrayList recipes = new ArrayList<>(); for (LivingArmourDowngradeRecipe recipe : recipeList) recipes.add(new ArmourDowngradeRecipeJEI(recipe)); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java index db44651e..d921befc 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java @@ -17,7 +17,7 @@ public class BindingRecipeMaker { public static List getRecipes() { Map, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> alchemyArrayRecipeMap = AlchemyArrayRecipeRegistry.getRecipes(); - ArrayList recipes = new ArrayList(); + ArrayList recipes = new ArrayList<>(); for (Map.Entry, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> itemStackAlchemyArrayRecipeEntry : alchemyArrayRecipeMap.entrySet()) { List input = itemStackAlchemyArrayRecipeEntry.getValue().getInput(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index f246bc48..f5a4b923 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -8,7 +8,6 @@ import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; -import joptsimple.internal.Strings; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java index 280bd784..2d975531 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java @@ -18,8 +18,8 @@ import java.util.Map; * form. */ public class CompressionRegistry { - public static List compressionRegistry = new ArrayList(); - public static Map thresholdMap = new HashMap(); + public static List compressionRegistry = new ArrayList<>(); + public static Map thresholdMap = new HashMap<>(); public static void registerHandler(CompressionHandler handler) { compressionRegistry.add(handler); diff --git a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index 0eb2be6a..70338a16 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -13,7 +13,7 @@ import java.util.UUID; public class BMWorldSavedData extends WorldSavedData { public static final String ID = "BloodMagic-SoulNetworks"; - private Map soulNetworks = new HashMap(); + private Map soulNetworks = new HashMap<>(); public BMWorldSavedData(String id) { super(id); diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java index 36edf7b1..bc28b170 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java @@ -20,7 +20,7 @@ public class AlchemyArrayRecipeRegistry { public static final AlchemyCircleRenderer DEFAULT_RENDERER = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BaseArray.png")); private static BiMap, AlchemyArrayRecipe> recipes = HashBiMap.create(); - private static HashMap effectMap = new HashMap(); + private static HashMap effectMap = new HashMap<>(); /** * General case for creating an AlchemyArrayEffect for a given input. @@ -120,7 +120,7 @@ public class AlchemyArrayRecipeRegistry { } public static void registerCraftingRecipe(String inputOreDict, ItemStack catalystStack, ItemStack outputStack, ResourceLocation arrayResource) { - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource); + registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource); } public static void registerCraftingRecipe(ItemStack input, ItemStack catalystStack, ItemStack outputStack) { @@ -132,7 +132,7 @@ public class AlchemyArrayRecipeRegistry { } public static void registerCraftingRecipe(String inputOreDict, ItemStack catalystStack, ItemStack outputStack) { - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack)); + registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack)); } public static void registerRecipe(ItemStack inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { @@ -151,7 +151,7 @@ public class AlchemyArrayRecipeRegistry { public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer); + registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer); } public static void registerRecipe(ItemStack input, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) { @@ -163,7 +163,7 @@ public class AlchemyArrayRecipeRegistry { } public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) { - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, (AlchemyCircleRenderer) null); + registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, (AlchemyCircleRenderer) null); } public static void replaceAlchemyCircle(List input, AlchemyCircleRenderer circleRenderer) { @@ -250,7 +250,7 @@ public class AlchemyArrayRecipeRegistry { } public AlchemyArrayRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { - this(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer, false); + this(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer, false); } public AlchemyArrayRecipe(List inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java index 901994a7..d27e99c1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; public class AlchemyTableRecipeRegistry { - private static List recipeList = new ArrayList(); + private static List recipeList = new ArrayList<>(); public static void registerRecipe(AlchemyTableRecipe recipe) { recipeList.add(recipe); @@ -34,6 +34,6 @@ public class AlchemyTableRecipeRegistry { } public static List getRecipeList() { - return new ArrayList(recipeList); + return new ArrayList<>(recipeList); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java index 49ab1e77..e52151a5 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.altar.EnumAltarTier; @@ -119,11 +118,11 @@ public class AltarRecipeRegistry { } public AltarRecipe(String inputEntry, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { - this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, fillable); + this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, fillable); } public AltarRecipe(String inputEntry, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate) { - this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, false); + this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, false); } public boolean doesRequiredItemMatch(ItemStack comparedStack, EnumAltarTier tierCheck) { diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java index ab500fd8..9be7251b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java @@ -8,11 +8,11 @@ import net.minecraft.block.BlockStem; import java.util.*; public class HarvestRegistry { - private static List handlerList = new ArrayList(); - private static Map standardCrops = new HashMap(); - private static Set tallCrops = new HashSet(); - private static Map stemCrops = new HashMap(); - private static Map amplifierMap = new HashMap(); + private static List handlerList = new ArrayList<>(); + private static Map standardCrops = new HashMap<>(); + private static Set tallCrops = new HashSet<>(); + private static Map stemCrops = new HashMap<>(); + private static Map amplifierMap = new HashMap<>(); /** * Registers a handler for the Harvest Ritual to call. @@ -81,22 +81,22 @@ public class HarvestRegistry { } public static List getHandlerList() { - return new ArrayList(handlerList); + return new ArrayList<>(handlerList); } public static Map getStandardCrops() { - return new HashMap(standardCrops); + return new HashMap<>(standardCrops); } public static Set getTallCrops() { - return new HashSet(tallCrops); + return new HashSet<>(tallCrops); } public static Map getStemCrops() { - return new HashMap(stemCrops); + return new HashMap<>(stemCrops); } public static Map getAmplifierMap() { - return new HashMap(amplifierMap); + return new HashMap<>(amplifierMap); } } diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java index c1c0acdf..1cf8922a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; @@ -12,7 +11,7 @@ import java.util.HashMap; import java.util.Map; public class ImperfectRitualRegistry { - public static final Map enabledRituals = new HashMap(); + public static final Map enabledRituals = new HashMap<>(); private static final BiMap registry = HashBiMap.create(); /** @@ -90,10 +89,10 @@ public class ImperfectRitualRegistry { } public static ArrayList getIds() { - return new ArrayList(registry.keySet()); + return new ArrayList<>(registry.keySet()); } public static ArrayList getRituals() { - return new ArrayList(registry.values()); + return new ArrayList<>(registry.values()); } } diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java index 8360dbd5..61a28fb5 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java @@ -15,8 +15,8 @@ import java.util.Map; import java.util.Map.Entry; public class LivingArmourDowngradeRecipeRegistry { - private static List recipeList = new ArrayList(); - private static Map>> dialogueMap = new HashMap>>(); + private static List recipeList = new ArrayList<>(); + private static Map>> dialogueMap = new HashMap<>(); public static void registerRecipe(LivingArmourDowngradeRecipe recipe) { recipeList.add(recipe); @@ -55,6 +55,6 @@ public class LivingArmourDowngradeRecipeRegistry { } public static List getRecipeList() { - return new ArrayList(recipeList); + return new ArrayList<>(recipeList); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 5ddbeb3c..d911c303 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -21,7 +21,7 @@ public class OrbRegistry { @GameRegistry.ObjectHolder("bloodmagic:blood_orb") private static final Item ORB_ITEM = null; public static ArrayListMultimap tierMap = ArrayListMultimap.create(); - private static List orbs = new ArrayList(); + private static List orbs = new ArrayList<>(); public static List getOrbsForTier(int tier) { if (getTierMap().containsKey(tier)) @@ -31,7 +31,7 @@ public class OrbRegistry { } public static List getOrbsUpToTier(int tier) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (int i = 1; i <= tier; i++) ret.addAll(getOrbsForTier(i)); @@ -40,7 +40,7 @@ public class OrbRegistry { } public static List getOrbsDownToTier(int tier) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (int i = EnumAltarTier.MAXTIERS; i >= tier; i--) ret.addAll(getOrbsForTier(i)); diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java index cc3f5dc6..b13b4614 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java @@ -9,14 +9,14 @@ import javax.annotation.Nullable; import java.util.*; public class RitualRegistry { - public static final Map enabledRituals = new HashMap(); + public static final Map enabledRituals = new HashMap<>(); private static final BiMap registry = HashBiMap.create(); - private static final List lookupList = new ArrayList(); + private static final List lookupList = new ArrayList<>(); /** * Ordered list for actions that depend on the order that the rituals were * registered in */ - private static final ArrayList orderedIdList = new ArrayList(); + private static final ArrayList orderedIdList = new ArrayList<>(); private static boolean locked; @@ -92,11 +92,11 @@ public class RitualRegistry { } public static Map getEnabledMap() { - return new HashMap(enabledRituals); + return new HashMap<>(enabledRituals); } public static ArrayList getIds() { - return new ArrayList(lookupList); + return new ArrayList<>(lookupList); } public static ArrayList getOrderedIds() { @@ -104,14 +104,14 @@ public class RitualRegistry { } public static ArrayList getRituals() { - return new ArrayList(registry.values()); + return new ArrayList<>(registry.values()); } public static void orderLookupList() { locked = true; // Lock registry so no no rituals can be registered lookupList.clear(); // Make sure it's empty lookupList.addAll(registry.keySet()); - Collections.sort(lookupList, (o1, o2) -> { + lookupList.sort((o1, o2) -> { Ritual ritual1 = registry.get(o1); Ritual ritual2 = registry.get(o2); return ritual1.getComponents().size() > ritual2.getComponents().size() ? -1 : 0; // Put earlier if bigger diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java index 83b075e0..595310ae 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; public class TartaricForgeRecipeRegistry { - private static List recipeList = new ArrayList(); + private static List recipeList = new ArrayList<>(); public static void registerRecipe(TartaricForgeRecipe recipe) { recipeList.add(recipe); @@ -34,6 +34,6 @@ public class TartaricForgeRecipeRegistry { } public static List getRecipeList() { - return new ArrayList(recipeList); + return new ArrayList<>(recipeList); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java index bf587940..76bf8a75 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap; public class WillWorld { int dim; - ConcurrentHashMap willChunks = new ConcurrentHashMap(); + ConcurrentHashMap willChunks = new ConcurrentHashMap<>(); // private static ConcurrentHashMap nodeTickets = new ConcurrentHashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 0ccf57e0..bd37857a 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.BMLog; @@ -13,8 +12,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; public class WorldDemonWillHandler { - public static ConcurrentHashMap> dirtyChunks = new ConcurrentHashMap>(); - static ConcurrentHashMap containedWills = new ConcurrentHashMap(); + public static ConcurrentHashMap> dirtyChunks = new ConcurrentHashMap<>(); + static ConcurrentHashMap containedWills = new ConcurrentHashMap<>(); @Nullable public static DemonWillHolder getWillHolder(int dim, int x, int y) { @@ -165,7 +164,7 @@ public class WorldDemonWillHandler { } PosXY pos = new PosXY(chunk.loc.x, chunk.loc.y); if (!dirtyChunks.containsKey(dim)) { - dirtyChunks.put(dim, new CopyOnWriteArrayList()); + dirtyChunks.put(dim, new CopyOnWriteArrayList<>()); } CopyOnWriteArrayList dc = dirtyChunks.get(dim); if (!dc.contains(pos)) { diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java index 137efffa..a2468fbe 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java @@ -36,7 +36,7 @@ public class EntityAIRetreatToHeal extends EntityAIBase { private Predicate avoidTargetSelector; public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class classToAvoidIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) { - this(theEntityIn, classToAvoidIn, Predicates.alwaysTrue(), avoidDistanceIn, farSpeedIn, nearSpeedIn); + this(theEntityIn, classToAvoidIn, Predicates.alwaysTrue(), avoidDistanceIn, farSpeedIn, nearSpeedIn); } public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class classToAvoidIn, Predicate avoidTargetSelectorIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) { diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index cb721ce7..47f9cf1d 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import java.util.Locale; public abstract class EntityAspectedDemonBase extends EntityDemonBase { - protected static final DataParameter TYPE = EntityDataManager.createKey(EntityAspectedDemonBase.class, Serializers.WILL_TYPE_SERIALIZER); + protected static final DataParameter TYPE = EntityDataManager.createKey(EntityAspectedDemonBase.class, Serializers.WILL_TYPE_SERIALIZER); public EntityAspectedDemonBase(World worldIn) { super(worldIn); diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index 5044857f..450bb4f9 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -63,8 +63,8 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); this.tasks.addTask(7, new EntityAILookIdle(this)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); + this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); + this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index b5869354..bd12e3e9 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -30,12 +30,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Random; public class EntityCorruptedSheep extends EntityAspectedDemonBase implements IShearable { - private static final DataParameter DYE_COLOR = EntityDataManager.createKey(EntityCorruptedSheep.class, DataSerializers.BYTE); + private static final DataParameter DYE_COLOR = EntityDataManager.createKey(EntityCorruptedSheep.class, DataSerializers.BYTE); private static final Map DYE_TO_RGB = Maps.newEnumMap(EnumDyeColor.class); public static int maxProtectionCooldown = 90 * 20; //90 second cooldown @@ -93,8 +94,8 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh this.tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); this.tasks.addTask(8, new EntityAILookIdle(this)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); + this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); + this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); } @Override @@ -180,7 +181,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh @Override protected void entityInit() { super.entityInit(); - this.dataManager.register(DYE_COLOR, Byte.valueOf((byte) 0)); + this.dataManager.register(DYE_COLOR, (byte) 0); } @Override @@ -255,34 +256,34 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh * Gets the wool color of this sheep. */ public EnumDyeColor getFleeceColor() { - return EnumDyeColor.byMetadata(this.dataManager.get(DYE_COLOR).byteValue() & 15); + return EnumDyeColor.byMetadata(this.dataManager.get(DYE_COLOR) & 15); } /** * Sets the wool color of this sheep */ public void setFleeceColor(EnumDyeColor color) { - byte b0 = this.dataManager.get(DYE_COLOR).byteValue(); - this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 & 240 | color.getMetadata() & 15))); + byte b0 = this.dataManager.get(DYE_COLOR); + this.dataManager.set(DYE_COLOR, (byte) (b0 & 240 | color.getMetadata() & 15)); } /** * returns true if a sheeps wool has been sheared */ public boolean getSheared() { - return (this.dataManager.get(DYE_COLOR).byteValue() & 16) != 0; + return (this.dataManager.get(DYE_COLOR) & 16) != 0; } /** * make a sheep sheared if set to true */ public void setSheared(boolean sheared) { - byte b0 = this.dataManager.get(DYE_COLOR).byteValue(); + byte b0 = this.dataManager.get(DYE_COLOR); if (sheared) { - this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 | 16))); + this.dataManager.set(DYE_COLOR, (byte) (b0 | 16)); } else { - this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 & -17))); + this.dataManager.set(DYE_COLOR, (byte) (b0 & -17)); } } @@ -327,7 +328,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh this.setSheared(true); int i = 1 + this.rand.nextInt(3); - java.util.List ret = new java.util.ArrayList(); + List ret = new ArrayList<>(); for (int j = 0; j < i; ++j) ret.add(new ItemStack(Item.getItemFromBlock(Blocks.WOOL), 1, this.getFleeceColor().getMetadata())); diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index 71290023..589f6e72 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -20,7 +20,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class EntityCorruptedSpider extends EntityAspectedDemonBase { - private static final DataParameter CLIMBING = EntityDataManager.createKey(EntityCorruptedSpider.class, DataSerializers.BYTE); + private static final DataParameter CLIMBING = EntityDataManager.createKey(EntityCorruptedSpider.class, DataSerializers.BYTE); public EntityCorruptedSpider(World world) { this(world, EnumDemonWillType.DEFAULT); @@ -43,8 +43,8 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { this.tasks.addTask(6, new EntityAILookIdle(this)); this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); + this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); + this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java index 2df10d5e..b82cfc8d 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java @@ -45,7 +45,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { protected void entityInit() { super.entityInit(); this.dataManager.register(TAMED, (byte) 0); - this.dataManager.register(OWNER_UNIQUE_ID, Optional.absent()); + this.dataManager.register(OWNER_UNIQUE_ID, Optional.absent()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 3acc8fed..1b13122c 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -57,7 +57,7 @@ public class EntitySentientSpecter extends EntityDemonBase { this.setSize(0.6F, 1.95F); // ((PathNavigateGround) getNavigator()).setCanSwim(false); this.tasks.addTask(0, new EntityAISwimming(this)); - this.tasks.addTask(2, new EntityAIRetreatToHeal(this, EntityCreature.class, 6.0F, 1.0D, 1.2D)); + this.tasks.addTask(2, new EntityAIRetreatToHeal<>(this, EntityCreature.class, 6.0F, 1.0D, 1.2D)); this.tasks.addTask(attackPriority, aiAttackOnCollide); this.tasks.addTask(4, new EntityAIGrabEffectsFromOwner(this, 2.0D, 1.0F)); this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F)); @@ -67,9 +67,9 @@ public class EntitySentientSpecter extends EntityDemonBase { this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this)); this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this)); - this.targetTasks.addTask(3, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true)); + this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); - this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false, new Class[0])); + this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false)); this.setCombatTask(); // this.targetTasks.addTask(8, new EntityAINearestAttackableTarget(this, EntityMob.class, 10, true, false, new TargetPredicate(this))); @@ -138,7 +138,7 @@ public class EntitySentientSpecter extends EntityDemonBase { boolean hasStolenEffect = false; - List removedEffects = new ArrayList(); + List removedEffects = new ArrayList<>(); for (PotionEffect eff : owner.getActivePotionEffects()) { if (canStealEffectFromOwner(owner, eff)) { @@ -157,7 +157,7 @@ public class EntitySentientSpecter extends EntityDemonBase { public boolean applyNegativeEffectsToAttacked(EntityLivingBase attackedEntity, float percentTransmitted) { boolean hasProvidedEffect = false; - List removedEffects = new ArrayList(); + List removedEffects = new ArrayList<>(); for (PotionEffect eff : this.getActivePotionEffects()) { if (eff.getPotion().isBadEffect() && attackedEntity.isPotionApplicable(eff)) { if (!attackedEntity.isPotionActive(eff.getPotion())) { @@ -197,13 +197,13 @@ public class EntitySentientSpecter extends EntityDemonBase { } public List getPotionEffectsForArrowRemovingDuration(float percentTransmitted) { - List arrowEffects = new ArrayList(); + List arrowEffects = new ArrayList<>(); if (type != EnumDemonWillType.CORROSIVE) { return arrowEffects; } - List removedEffects = new ArrayList(); + List removedEffects = new ArrayList<>(); for (PotionEffect eff : this.getActivePotionEffects()) { if (eff.getPotion().isBadEffect()) { removedEffects.add(eff); @@ -310,7 +310,7 @@ public class EntitySentientSpecter extends EntityDemonBase { if (getEntityWorld() instanceof WorldServer) { WorldServer server = (WorldServer) getEntityWorld(); - server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0, new int[0]); + server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0); } } diff --git a/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java b/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java index c8f9adb8..d2221dbf 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java +++ b/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java @@ -7,5 +7,6 @@ public enum EnumTranquilityType { EARTHEN(), WATER(), FIRE(), - LAVA(); + LAVA(), + ; } diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java index 9f01f968..f41928c1 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.TreeMap; public class IncenseAltarHandler { - public static Map> incenseComponentMap = new TreeMap>(); + public static Map> incenseComponentMap = new TreeMap<>(); //Incense bonus maximum applied for the tier of blocks. public static double[] incenseBonuses = new double[]{0.2, 0.6, 1.2, 2, 3, 4.5}; public static double[] tranquilityRequired = new double[]{0, 6, 14.14, 28, 44.09, 83.14}; @@ -22,7 +22,7 @@ public class IncenseAltarHandler { if (incenseComponentMap.containsKey(altarLevel)) { incenseComponentMap.get(altarLevel).add(component); } else { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(component); incenseComponentMap.put(altarLevel, list); } diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java index 79d9c57f..e291bbf9 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; public class IncenseTranquilityRegistry { - public static List handlerList = new ArrayList(); + public static List handlerList = new ArrayList<>(); public static void registerTranquilityHandler(ITranquilityHandler handler) { handlerList.add(handler); diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java index c6019eae..1e916933 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; public class CorruptionHandler { - public static Map, Map> corruptBlockMap = new HashMap, Map>(); + public static Map, Map> corruptBlockMap = new HashMap<>(); public static void registerBlockCorruption(EnumDemonWillType type, Block block, int meta, IBlockState corruptedState) { Pair pair = Pair.of(block, meta); @@ -19,7 +19,7 @@ public class CorruptionHandler { Map stateMap = corruptBlockMap.get(pair); stateMap.put(type, corruptedState); } else { - Map stateMap = new HashMap(); + Map stateMap = new HashMap<>(); stateMap.put(type, corruptedState); corruptBlockMap.put(pair, stateMap); } diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java index e988ba1f..34a090ef 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java @@ -9,8 +9,8 @@ import java.util.*; public class InversionPillarHandler { public static final double farthestDistanceSquared = 16 * 16; - public static Map>> pillarMap = new HashMap>>(); - public static Map>>> nearPillarMap = new HashMap>>>(); + public static Map>> pillarMap = new HashMap<>(); + public static Map>>> nearPillarMap = new HashMap<>(); public static boolean addPillarToMap(World world, EnumDemonWillType type, BlockPos pos) { int dim = world.provider.getDimension(); @@ -25,15 +25,15 @@ public class InversionPillarHandler { return false; } } else { - List posList = new ArrayList(); + List posList = new ArrayList<>(); posList.add(pos); willMap.put(type, posList); onPillarAdded(world, type, pos); return true; } } else { - Map> willMap = new HashMap>(); - List posList = new ArrayList(); + Map> willMap = new HashMap<>(); + List posList = new ArrayList<>(); posList.add(pos); willMap.put(type, posList); @@ -65,7 +65,7 @@ public class InversionPillarHandler { //Assume that it has been added already. private static void onPillarAdded(World world, EnumDemonWillType type, BlockPos pos) { BMLog.DEBUG.info("Adding..."); - List closePosList = new ArrayList(); + List closePosList = new ArrayList<>(); int dim = world.provider.getDimension(); if (pillarMap.containsKey(dim)) { @@ -91,7 +91,7 @@ public class InversionPillarHandler { if (posList != null && !posList.contains(pos)) { posList.add(pos); } else { - posList = new ArrayList(); + posList = new ArrayList<>(); posList.add(pos); posMap.put(closePos, posList); } @@ -99,14 +99,14 @@ public class InversionPillarHandler { posMap.put(pos, closePosList); } else { - Map> posMap = new HashMap>(); + Map> posMap = new HashMap<>(); posMap.put(pos, closePosList); willMap.put(type, posMap); } } else { - Map>> willMap = new HashMap>>(); - Map> posMap = new HashMap>(); + Map>> willMap = new HashMap<>(); + Map> posMap = new HashMap<>(); posMap.put(pos, closePosList); willMap.put(type, posMap); @@ -123,9 +123,7 @@ public class InversionPillarHandler { Map> posMap = willMap.get(type); List posList = posMap.get(pos); if (posList != null) { - Iterator itr = posList.iterator(); - while (itr.hasNext()) { - BlockPos checkPos = itr.next(); + for (BlockPos checkPos : posList) { List checkPosList = posMap.get(checkPos); if (checkPosList != null) { checkPosList.remove(pos); @@ -152,12 +150,12 @@ public class InversionPillarHandler { } } - return new ArrayList(); + return new ArrayList<>(); } public static List getAllConnectedPillars(World world, EnumDemonWillType type, BlockPos pos) { - List checkedPosList = new ArrayList(); - List uncheckedPosList = new ArrayList(); //Positions where we did not check their connections. + List checkedPosList = new ArrayList<>(); + List uncheckedPosList = new ArrayList<>(); //Positions where we did not check their connections. uncheckedPosList.add(pos); @@ -170,7 +168,7 @@ public class InversionPillarHandler { while (!uncheckedPosList.isEmpty()) { //Positions that are new this iteration and need to be dumped into uncheckedPosList next iteration. - List newPosList = new ArrayList(); + List newPosList = new ArrayList<>(); for (BlockPos checkPos : uncheckedPosList) { List posList = posMap.get(checkPos); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 804104f5..efa445e2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -89,8 +89,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=altarmaker")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=altarmaker")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 4734f6f9..ff20254d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -62,8 +62,8 @@ public class ItemArcaneAshes extends Item implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=arcaneashes")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=arcaneashes")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 751a584a..589e91ee 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -131,7 +131,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("active=true"); ret.add("active=false"); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index ee6f3f2f..f54d39a7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -144,7 +144,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("active=true"); ret.add("active=false"); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index b1842152..910a4658 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -130,7 +130,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("active=true"); ret.add("active=false"); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 74bb779e..c7d49cfc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -118,7 +118,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @Override public Multimap getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); + Multimap multimap = HashMultimap.create(); if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 8 : 2, 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4, 0)); @@ -140,7 +140,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("active=true"); ret.add("active=false"); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 415e712a..4c39abdd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -46,8 +46,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { public final int chargeTime = 30; protected final String tooltipBase; private final String name; - public Map heldDownMap = new HashMap(); - public Map heldDownCountMap = new HashMap(); + public Map heldDownMap = new HashMap<>(); + public Map heldDownCountMap = new HashMap<>(); public ItemBoundTool(String name, float damage, Set effectiveBlocks) { super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index f5d3af13..3a0a86ad 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -33,8 +33,8 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=willgauge")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=willgauge")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 10c4776b..24474e87 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -60,13 +60,13 @@ public class ItemExperienceBook extends Item implements IVariantProvider { giveOneLevelExpToPlayer(stack, player); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=experiencetome")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=experiencetome")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index ddb05494..52a3e3c4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -2,11 +2,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; -import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index cb3c7c2c..ef73018c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -95,10 +95,10 @@ public class ItemPotionFlask extends Item implements IMeshProvider { if (remainingUses <= 0) { NBTHelper.checkNBT(stack); stack.getTagCompound().setBoolean("empty", true); - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } player.setActiveHand(hand); - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 652021b0..10b2ea3c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -295,7 +295,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { ItemStack stack = player.getHeldItem(hand); RayTraceResult ray = this.rayTrace(world, player, false); if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } if (player.isSneaking()) { @@ -303,10 +303,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { cycleRitual(stack, player); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override @@ -333,10 +333,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=basic")); - ret.add(new ImmutablePair(1, "type=dusk")); - ret.add(new ImmutablePair(2, "type=dawn")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=basic")); + ret.add(new ImmutablePair<>(1, "type=dusk")); + ret.add(new ImmutablePair<>(2, "type=dawn")); return ret; } @@ -549,14 +549,14 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { double d0 = itemRand.nextGaussian() * 0.02D; double d1 = itemRand.nextGaussian() * 0.02D; double d2 = itemRand.nextGaussian() * 0.02D; - worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat(), (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2, new int[0]); + worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat(), (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2); } } else { for (int i1 = 0; i1 < amount; ++i1) { double d0 = itemRand.nextGaussian() * 0.02D; double d1 = itemRand.nextGaussian() * 0.02D; double d2 = itemRand.nextGaussian() * 0.02D; - worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat() * 1.0f, (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2, new int[0]); + worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat() * 1.0f, (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 07e6be63..a718ea5b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -67,7 +67,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { ItemStack stack = player.getHeldItem(hand); RayTraceResult ray = this.rayTrace(world, player, false); if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } if (player.isSneaking()) { @@ -75,10 +75,10 @@ public class ItemRitualReader extends Item implements IVariantProvider { cycleReader(stack, player); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override @@ -107,7 +107,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { master.provideInformationOfRangeToPlayer(player, range); break; case SET_WILL_TYPES: - List typeList = new ArrayList(); + List typeList = new ArrayList<>(); NonNullList inv = player.inventory.mainInventory; for (int i = 0; i < 9; i++) { ItemStack testStack = inv.get(i); @@ -234,8 +234,8 @@ public class ItemRitualReader extends Item implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=normal")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index bcfd621b..3ffdf74d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -77,7 +77,7 @@ public class ItemSacrificialDagger extends ItemEnum(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; @@ -166,7 +166,7 @@ public class ItemSacrificialDagger extends ItemEnum getVariants() { - List variants = new ArrayList(); + List variants = new ArrayList<>(); variants.add("type=normal"); variants.add("type=creative"); variants.add("type=ceremonial"); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index 3df9322b..a6bfe3b2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -97,8 +97,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=upgradetome")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=upgradetome")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index cc7f150b..1f6b9e6d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -61,7 +61,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian @Override public List getTrainedUpgrades(ItemStack stack) { - List keyList = new ArrayList(); + List keyList = new ArrayList<>(); String key = LivingUpgrades.getKey(stack); if (!key.isEmpty()) { @@ -83,8 +83,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=upgradetrainer")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=upgradetrainer")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 158b1034..8f4a5409 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -51,7 +51,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP public static final boolean useSpecialArmourCalculation = true; public static String[] names = {"helmet", "chest", "legs", "boots"}; //TODO: Save/delete cache periodically. - public static Map armourMap = new HashMap(); + public static Map armourMap = new HashMap<>(); private static Field _FLAGS = ReflectionHelper.findField(Entity.class, "FLAGS", "field_184240_ax"); private static DataParameter FLAGS = null; @@ -283,9 +283,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP if (FLAGS == null) { try { FLAGS = (DataParameter) _FLAGS.get(null); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } } @@ -337,7 +335,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP return armour.getAttributeModifiers(); } - return HashMultimap.create(); + return HashMultimap.create(); } @Override @@ -367,7 +365,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("armour=head"); ret.add("armour=body"); ret.add("armour=leg"); diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 793faa21..b2151097 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -298,7 +298,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (EnumDemonWillType type : EnumDemonWillType.values()) { String additional = "_" + type.getName().toLowerCase(); @@ -313,7 +313,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); + Multimap multimap = HashMultimap.create(); if (slot == EntityEquipmentSlot.CHEST) { multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 318145), "Armor modifier", this.getHealthBonus(stack), 0)); multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(new UUID(0, 8145), "Armor modifier", this.getKnockbackResistance(stack), 0)); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockString.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockString.java deleted file mode 100644 index 895b40c8..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockString.java +++ /dev/null @@ -1,32 +0,0 @@ -package WayofTime.bloodmagic.item.block.base; - -import WayofTime.bloodmagic.block.base.BlockString; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.MathHelper; - -public class ItemBlockString extends ItemBlock { - - public ItemBlockString(BlockString block) { - super(block); - - if (block.getTypes().length > 1) - setHasSubtypes(true); - } - - @SuppressWarnings("unchecked") - @Override - public BlockString getBlock() { - return (BlockString) super.getBlock(); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return getBlock().getUnlocalizedName() + "." + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, 15)]; - } - - @Override - public int getMetadata(int damage) { - return damage; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index cba28176..a726b800 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -77,8 +77,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 002b469d..492dd868 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -102,8 +102,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 455c44c4..94fbf3ec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -70,7 +70,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, testFilter = new RoutingFluidFilter(); } - List filteredList = new ArrayList(); + List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -100,7 +100,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, testFilter = new RoutingFluidFilter(); } - List filteredList = new ArrayList(); + List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -122,8 +122,8 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=exact")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=exact")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index b3b3e522..d8fb3a56 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -84,7 +84,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi if (!node.isMaster(master)) { if (node.getMasterPos().equals(BlockPos.ORIGIN)) //If the node is not the master and it is receptive { - node.connectMasterToRemainingNode(world, new LinkedList(), master); + node.connectMasterToRemainingNode(world, new LinkedList<>(), master); master.addConnection(pos, containedPos); master.addNodeToList(node); node.addConnection(containedPos); @@ -106,7 +106,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi if (!pastNode.isMaster(master)) { if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //TODO: This is where the issue is { - pastNode.connectMasterToRemainingNode(world, new LinkedList(), master); + pastNode.connectMasterToRemainingNode(world, new LinkedList<>(), master); master.addConnection(pos, containedPos); pastNode.addConnection(pos); master.addNodeToList(pastNode); @@ -143,7 +143,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi IMasterRoutingNode master = (IMasterRoutingNode) tile; master.addConnection(pos, containedPos); master.addNodeToList(pastNode); - pastNode.connectMasterToRemainingNode(world, new LinkedList(), master); + pastNode.connectMasterToRemainingNode(world, new LinkedList<>(), master); } pastNode.addConnection(pos); node.addConnection(containedPos); @@ -157,7 +157,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi IMasterRoutingNode master = (IMasterRoutingNode) tile; master.addConnection(pos, containedPos); master.addNodeToList(node); - node.connectMasterToRemainingNode(world, new LinkedList(), master); + node.connectMasterToRemainingNode(world, new LinkedList<>(), master); } pastNode.addConnection(pos); node.addConnection(containedPos); @@ -177,8 +177,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index 76cc2b48..a7c1d197 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -78,7 +78,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari testFilter = new DefaultItemFilter(); } - List filteredList = new ArrayList(); + List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -117,7 +117,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari testFilter = new DefaultItemFilter(); } - List filteredList = new ArrayList(); + List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -139,11 +139,11 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=exact")); - ret.add(new ImmutablePair(1, "type=ignorenbt")); - ret.add(new ImmutablePair(2, "type=moditems")); - ret.add(new ImmutablePair(3, "type=oredict")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=exact")); + ret.add(new ImmutablePair<>(1, "type=ignorenbt")); + ret.add(new ImmutablePair<>(2, "type=moditems")); + ret.add(new ImmutablePair<>(3, "type=oredict")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index a3753559..39d5689d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -3,10 +3,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.item.ItemSigil; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -55,7 +53,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); + List> ret = new ArrayList<>(); ret.add(Pair.of(0, "type=normal")); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index ce3b9360..eb2d1431 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -12,9 +12,10 @@ import java.util.HashMap; import java.util.Map; public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { - private Map> prevPositionMap = new HashMap>(); - private double expansionFactor = 2; - private int range = 3; + private static final double EXPANSION_FACTOR = 2; + private static final int RANGE = 3; + + private Map> prevPositionMap = new HashMap<>(); public ItemSigilPhantomBridge() { super("phantom_bridge", 100); @@ -57,12 +58,12 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { int posY = playerPos.getY(); int posZ = playerPos.getZ(); - double offsetPosX = posX + expansionFactor * playerVelX; - double offsetPosZ = posZ + expansionFactor * playerVelZ; + double offsetPosX = posX + EXPANSION_FACTOR * playerVelX; + double offsetPosZ = posZ + EXPANSION_FACTOR * playerVelZ; double avgX = (posX + offsetPosX) / 2; double avgZ = (posZ + offsetPosZ) / 2; - double C = 2 * (range + expansionFactor * totalVel) + 1; + double C = 2 * (RANGE + EXPANSION_FACTOR * totalVel) + 1; int truncC = (int) C; //TODO: Make this for-loop better. diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index f54bc75b..952a8712 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -3,11 +3,9 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.item.ItemSigilToggleable; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; @@ -64,7 +62,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("active=false"); ret.add("active=true"); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index 7d0450a9..604826b0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -53,7 +53,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { ItemSentientArmour.convertPlayerArmour(type, will, player); } - return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); + return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand)); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index fbcef7f1..ca4a4558 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -308,7 +308,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (EnumDemonWillType type : EnumDemonWillType.values()) { ret.add("type=" + type.getName().toLowerCase()); } @@ -318,7 +318,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP @Override public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList(); + List soulList = new ArrayList<>(); if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; @@ -343,7 +343,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP //TODO: Change attack speed. @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); + Multimap multimap = HashMultimap.create(); if (slot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index 7f70b1e2..a1ffaaac 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -307,7 +307,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (EnumDemonWillType type : EnumDemonWillType.values()) { ret.add("type=" + type.getName().toLowerCase()); } @@ -317,7 +317,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon @Override public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList(); + List soulList = new ArrayList<>(); if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; @@ -342,7 +342,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon //TODO: Change attack speed. @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); + Multimap multimap = HashMultimap.create(); if (slot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index f391bb4f..deb5056c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -308,7 +308,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (EnumDemonWillType type : EnumDemonWillType.values()) { ret.add("type=" + type.getName().toLowerCase()); } @@ -318,7 +318,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I @Override public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList(); + List soulList = new ArrayList<>(); if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; @@ -343,7 +343,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I //TODO: Change attack speed. @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); + Multimap multimap = HashMultimap.create(); if (slot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 32f45db7..13206057 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -283,7 +283,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (EnumDemonWillType type : EnumDemonWillType.values()) { ret.add("type=" + type.getName().toLowerCase()); } @@ -293,7 +293,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM @Override public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList(); + List soulList = new ArrayList<>(); if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; @@ -318,7 +318,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM //TODO: Change attack speed. @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); + Multimap multimap = HashMultimap.create(); if (slot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index 139313e3..d55aa834 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -55,7 +55,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack); this.drainWill(type, stack, filled, true); - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override @@ -72,7 +72,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I @Override public List getVariants() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for (EnumDemonWillType type : EnumDemonWillType.values()) { ret.add("type=petty_" + type.getName().toLowerCase()); ret.add("type=lesser_" + type.getName().toLowerCase()); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index f422be70..15e42172 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -48,7 +48,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { worldIn.spawnEntity(snare); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } @Override @@ -76,8 +76,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider { @Override public List> getVariants() { - List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=soulsnare")); + List> ret = new ArrayList<>(); + ret.add(new ImmutablePair<>(0, "type=soulsnare")); return ret; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index fcd8c555..19f9a7a1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -23,8 +23,8 @@ import java.util.Map.Entry; public class LivingArmour implements ILivingArmour { public static String chatBase = "chat.bloodmagic.livingArmour."; - public HashMap trackerMap = new HashMap(); - public HashMap upgradeMap = new HashMap(); + public HashMap trackerMap = new HashMap<>(); + public HashMap upgradeMap = new HashMap<>(); public int maxUpgradePoints = 100; public int totalUpgradePoints = 0; @@ -60,7 +60,7 @@ public class LivingArmour implements ILivingArmour { @Override public Multimap getAttributeModifiers() { - HashMultimap modifierMap = HashMultimap.create(); + HashMultimap modifierMap = HashMultimap.create(); for (Entry entry : upgradeMap.entrySet()) { LivingArmourUpgrade upgrade = entry.getValue(); @@ -165,7 +165,7 @@ public class LivingArmour implements ILivingArmour { return; } - List allowedUpgradesList = new ArrayList(); + List allowedUpgradesList = new ArrayList<>(); for (ItemStack stack : player.inventory.mainInventory) { if (stack != null && stack.getItem() instanceof IUpgradeTrainer) { List keyList = ((IUpgradeTrainer) stack.getItem()).getTrainedUpgrades(stack); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java index a1a0c46f..c15afafb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.livingArmour; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.BMLog; import net.minecraft.nbt.NBTTagCompound; @@ -10,10 +9,10 @@ import java.util.HashMap; import java.util.List; public class LivingArmourHandler { - public static List> trackers = new ArrayList>(); - public static HashMap> upgradeMap = new HashMap>(); - public static HashMap> upgradeConstructorMap = new HashMap>(); - public static HashMap upgradeMaxLevelMap = new HashMap(); + public static List> trackers = new ArrayList<>(); + public static HashMap> upgradeMap = new HashMap<>(); + public static HashMap> upgradeConstructorMap = new HashMap<>(); + public static HashMap upgradeMaxLevelMap = new HashMap<>(); public static void registerStatTracker(Class tracker) { trackers.add(tracker); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index cf948dac..6c1dece3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -12,7 +12,7 @@ import java.util.HashMap; public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade { public static final int[] costs = new int[]{-10, -17, -28, -42, -60, -80, -100, -125, -160, -200}; public static final double[] digSpeedModifier = new double[]{0.9, 0.8, 0.7, 0.6, 0.55, 0.5, 0.4, 0.35, 0.3, 0.2}; - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public LivingArmourUpgradeDigSlowdown(int level) { super(level); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index 06aebdc0..a67a5cfb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -29,7 +29,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade { @Override public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); + Multimap modifierMap = HashMultimap.create(); String name = getUniqueIdentifier() + "-DamageModifier1"; modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "DamageModifier1", meleeDamage[this.level], 1)); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index cbdab679..db12a7ac 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -24,7 +24,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade { @Override public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); + Multimap modifierMap = HashMultimap.create(); String name = getUniqueIdentifier() + "-SpeedModifier1"; modifierMap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "SpeedModifier1", speedModifier[this.level], 1)); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index b084083f..51671858 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerArrowProtect extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{30, 200, 400, 800, 1500, 2500, 3500, 5000, 7000, 15000}; public int totalDamage = 0; @@ -66,7 +66,7 @@ public class StatTrackerArrowProtect extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalDamage >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index a89f4588..ed0e225d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerArrowShot extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] shotsRequired = new int[]{50, 200, 700, 1500, 3000}; public int totalShots = 0; @@ -66,7 +66,7 @@ public class StatTrackerArrowShot extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 5; i++) { if (totalShots >= shotsRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index f14f0598..fef5ed19 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerCriticalStrike extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800}; public double totalDamageDealt = 0; @@ -66,7 +66,7 @@ public class StatTrackerCriticalStrike extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 5; i++) { if (totalDamageDealt >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 0a99d49d..c04c1951 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerDigging extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] blocksRequired = new int[]{128, 512, 1024, 2048, 8192, 16000, 32000, 50000, 80000, 150000}; public int totalBlocksDug = 0; @@ -66,7 +66,7 @@ public class StatTrackerDigging extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalBlocksDug >= blocksRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 99931891..379d3631 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerExperience extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] experienceRequired = new int[]{100, 400, 1000, 1600, 3200, 5000, 7000, 9200, 11500, 140000}; public double totalExperienceGained = 0; @@ -66,7 +66,7 @@ public class StatTrackerExperience extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalExperienceGained >= experienceRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index 561cb733..76f6248d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerFallProtect extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{30, 200, 400, 800, 1500}; public int totalDamage = 0; @@ -66,7 +66,7 @@ public class StatTrackerFallProtect extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 5; i++) { if (totalDamage >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index c36f87c6..c6e467d1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -55,7 +55,7 @@ public class StatTrackerFireResist extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 5; i++) { if (totalFireTicks >= fireTicksRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index b5ef43a6..b00fbb71 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; public class StatTrackerFood extends StatTracker { - public static Map lastFoodEatenMap = new HashMap(); + public static Map lastFoodEatenMap = new HashMap<>(); public static int[] foodRequired = new int[]{100, 200, 300, 500, 1000}; @@ -74,7 +74,7 @@ public class StatTrackerFood extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < foodRequired.length; i++) { if (foodEaten >= foodRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index 2b7e5bc5..209a8316 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerGraveDigger extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500, 140000}; public double totalDamageDealt = 0; @@ -66,7 +66,7 @@ public class StatTrackerGraveDigger extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalDamageDealt >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 9a3830ad..0234bbf2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerGrimReaperSprint extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] deathsRequired = new int[]{6, 10, 15, 25, 50, 70, 90, 120, 150, 200}; //TODO: Modify public int totalDeaths = 0; @@ -67,7 +67,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalDeaths >= deathsRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index 73e1b3cc..666cf88f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerHealthboost extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] healthedRequired = new int[]{80, 200, 340, 540, 800, 1600, 2800, 5000, 7600, 10000}; public double totalHealthGenned = 0; @@ -66,7 +66,7 @@ public class StatTrackerHealthboost extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalHealthGenned >= healthedRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index 7adb31fd..d5214fa6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerJump extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] jumpsRequired = new int[]{30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000}; //testing public int totalJumps = 0; @@ -68,7 +68,7 @@ public class StatTrackerJump extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalJumps >= jumpsRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 78adec51..a7172372 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerMeleeDamage extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500, 140000}; public double totalDamageDealt = 0; @@ -66,7 +66,7 @@ public class StatTrackerMeleeDamage extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalDamageDealt >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index eb44d538..49a598d1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; public class StatTrackerMovement extends StatTracker { - public static Map lastPosX = new HashMap(); - public static Map lastPosZ = new HashMap(); + public static Map lastPosX = new HashMap<>(); + public static Map lastPosZ = new HashMap<>(); public static int[] blocksRequired = new int[]{200, 1000, 2000, 4000, 7000, 15000, 25000, 35000, 50000, 70000}; @@ -82,7 +82,7 @@ public class StatTrackerMovement extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalMovement >= blocksRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 77a1e3db..ca2a181b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerNightSight extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{0, 200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500}; public static int neededNightVision = 3 * 60 * 20; public double totalDamageDealt = 0; @@ -81,7 +81,7 @@ public class StatTrackerNightSight extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); if (totalNightVision < neededNightVision) { return upgradeList; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 4e215caa..7fca6648 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerPhysicalProtect extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{30, 50, 80, 140, 200, 300, 400, 500, 650, 800}; public int totalDamage = 0; @@ -66,7 +66,7 @@ public class StatTrackerPhysicalProtect extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalDamage >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 16e238bb..fb002e49 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -56,7 +56,7 @@ public class StatTrackerPoison extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 5; i++) { if (totalPoisonTicks >= poisonTicksRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index d81b4e62..458b5eb6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerRepairing extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{500}; public double totalDamage = 0; @@ -66,7 +66,7 @@ public class StatTrackerRepairing extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 1; i++) { if (totalDamage >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index 4a508d89..631ac1d2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerSelfSacrifice extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] sacrificesRequired = new int[]{30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000}; //testing public int totalSacrifices = 0; @@ -68,7 +68,7 @@ public class StatTrackerSelfSacrifice extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalSacrifices >= sacrificesRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 41abc39a..29d656ac 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerSolarPowered extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] healthedRequired = new int[]{70, 150, 300, 500, 700, 1400, 2400, 4000, 7000, 9000}; public double totalHealthGenned = 0; @@ -66,7 +66,7 @@ public class StatTrackerSolarPowered extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 10; i++) { if (totalHealthGenned >= healthedRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index c8743426..09d2f220 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class StatTrackerSprintAttack extends StatTracker { - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800}; public double totalDamageDealt = 0; @@ -66,7 +66,7 @@ public class StatTrackerSprintAttack extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); for (int i = 0; i < 5; i++) { if (totalDamageDealt >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index b5bbec27..77ad3f12 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.Map; public class StatTrackerStepAssist extends StatTracker { - public static Map lastPosX = new HashMap(); - public static Map lastPosZ = new HashMap(); + public static Map lastPosX = new HashMap<>(); + public static Map lastPosZ = new HashMap<>(); public static int blocksRequired = 1000; @@ -82,7 +82,7 @@ public class StatTrackerStepAssist extends StatTracker { @Override public List getUpgrades() { - List upgradeList = new ArrayList(); + List upgradeList = new ArrayList<>(); if (totalMovement >= blocksRequired) { upgradeList.add(new LivingArmourUpgradeStepAssist(0)); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 6dac903b..a88e42c9 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -17,7 +17,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { public static final int[] digSpeedTime = new int[]{0, 50, 60, 100, 100, 100, 100, 150, 150, 150}; public static final int[] digSpeedLevel = new int[]{0, 0, 0, 1, 1, 1, 1, 1, 2, 2}; public static final double[] digSpeedModifier = new double[]{1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 2, 2.2, 2.5}; - public static HashMap changeMap = new HashMap(); + public static HashMap changeMap = new HashMap<>(); public LivingArmourUpgradeDigging(int level) { super(level); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 69ce784c..08ecc06c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -29,7 +29,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { @Override public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); + Multimap modifierMap = HashMultimap.create(); String name = getUniqueIdentifier() + "-HealthModifier1"; modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0)); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index 2045b972..8909473e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -22,7 +22,7 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { @Override public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); + Multimap modifierMap = HashMultimap.create(); String name = getUniqueIdentifier() + "-KnockbackModifier1"; modifierMap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "KnockbackModifier1", kbModifier[this.level], 0)); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 5b5abda1..22e206f8 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -29,7 +29,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { @Override public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); + Multimap modifierMap = HashMultimap.create(); String name = getUniqueIdentifier() + "-DamageModifier1"; modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "DamageModifier1", meleeDamage[this.level], 0)); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 3fe1f8a0..446decfb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -47,7 +47,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { @Override public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); + Multimap modifierMap = HashMultimap.create(); // modifierMap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Speed modifier" + 1, speedModifier[this.level], 1)); diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 5ba2f665..1fad6f4e 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -37,7 +37,7 @@ public class BMPotionUtils { double incurredDamage = 0; - List growList = new ArrayList(); + List growList = new ArrayList<>(); for (int i = 0; i < maxPlantsGrown; i++) { BlockPos blockPos = entity.getPosition().add(rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius, rand.nextInt(verticalRadius * 2 + 1) - verticalRadius, rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius); diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 3aa2be30..04ace93a 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -6,11 +6,7 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.client.Sprite; import WayofTime.bloodmagic.client.helper.ShaderHelper; -import WayofTime.bloodmagic.client.hud.HUDElementCornerTile; -import WayofTime.bloodmagic.client.hud.HUDElementDemonWillAura; -import WayofTime.bloodmagic.client.hud.HUDElementHolding; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.LayerBloodElytra; import WayofTime.bloodmagic.client.render.block.*; @@ -23,7 +19,6 @@ import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import WayofTime.bloodmagic.util.helper.NumeralHelper; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -46,9 +41,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.apache.commons.lang3.tuple.Pair; import java.awt.Color; -import java.util.List; import java.util.Map; -import java.util.function.Function; public class ClientProxy extends CommonProxy { public static DemonWillHolder currentAura = new DemonWillHolder(); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java index 8fa14ad2..2a17628f 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java @@ -17,7 +17,7 @@ import java.util.List; public class LivingArmourDowngradeRecipe { protected LivingArmourUpgrade upgrade = null; protected ItemStack keyStack = ItemStack.EMPTY; - protected List input = new ArrayList(); + protected List input = new ArrayList<>(); public LivingArmourDowngradeRecipe(LivingArmourUpgrade upgrade, ItemStack keyStack, Object... recipe) { this.upgrade = upgrade; @@ -32,12 +32,12 @@ public class LivingArmourDowngradeRecipe { } else if (in instanceof String) { input.add(OreDictionary.getOres((String) in)); } else { - String ret = "Invalid living armour downgrade recipe: "; + StringBuilder ret = new StringBuilder("Invalid living armour downgrade recipe: "); for (Object tmp : recipe) { - ret += tmp + ", "; + ret.append(tmp).append(", "); } - ret += upgrade.toString(); - throw new RuntimeException(ret); + ret.append(upgrade.toString()); + throw new RuntimeException(ret.toString()); } } } @@ -63,7 +63,7 @@ public class LivingArmourDowngradeRecipe { return false; } - ArrayList required = new ArrayList(input); + ArrayList required = new ArrayList<>(input); for (ItemStack slot : checkedList) { if (slot != null) { diff --git a/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java index db294411..21f5936b 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java @@ -14,7 +14,7 @@ import java.util.List; public class TartaricForgeRecipe { protected ItemStack output = null; - protected List input = new ArrayList(); + protected List input = new ArrayList<>(); protected double minimumSouls; protected double soulsDrained; @@ -40,12 +40,12 @@ public class TartaricForgeRecipe { } else if (in instanceof String) { input.add(OreDictionary.getOres((String) in)); } else { - String ret = "Invalid soul forge recipe: "; + StringBuilder ret = new StringBuilder("Invalid soul forge recipe: "); for (Object tmp : recipe) { - ret += tmp + ", "; + ret.append(tmp).append(", "); } - ret += output; - throw new RuntimeException(ret); + ret.append(output); + throw new RuntimeException(ret.toString()); } } } @@ -67,24 +67,19 @@ public class TartaricForgeRecipe { */ @SuppressWarnings("unchecked") public boolean matches(List checkedList, World world, BlockPos pos) { - ArrayList required = new ArrayList(input); - - for (int x = 0; x < checkedList.size(); x++) { - ItemStack slot = checkedList.get(x); + ArrayList required = new ArrayList<>(input); + for (ItemStack slot : checkedList) { if (slot != null) { boolean inRecipe = false; - Iterator req = required.iterator(); - while (req.hasNext()) { + for (Object aRequired : required) { boolean match = false; - Object next = req.next(); - - if (next instanceof ItemStack) { - match = OreDictionary.itemMatches((ItemStack) next, slot, false); - } else if (next instanceof List) { - Iterator itr = ((List) next).iterator(); + if (aRequired instanceof ItemStack) { + match = OreDictionary.itemMatches((ItemStack) aRequired, slot, false); + } else if (aRequired instanceof List) { + Iterator itr = ((List) aRequired).iterator(); while (itr.hasNext() && !match) { match = OreDictionary.itemMatches(itr.next(), slot, false); } @@ -92,7 +87,7 @@ public class TartaricForgeRecipe { if (match) { inRecipe = true; - required.remove(next); + required.remove(aRequired); break; } } diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 50e83c2b..9182aad7 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -19,11 +19,11 @@ public class AlchemyTableDyeableRecipe extends AlchemyTableRecipe { public AlchemyTableDyeableRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem) { super(inputItem, lpDrained, ticksRequired, tierRequired); - ArrayList validDyes = new ArrayList(); + ArrayList validDyes = new ArrayList<>(); validDyes.add(new ItemStack(Items.NAME_TAG)); validDyes.add(new ItemStack(Items.DYE, 1, OreDictionary.WILDCARD_VALUE)); - ArrayList recipe = new ArrayList(); + ArrayList recipe = new ArrayList<>(); recipe.add(inputItem); recipe.add(validDyes); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java index 1c2ccd46..17162a39 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java @@ -19,10 +19,8 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, PotionEffect baseEffect, double lengthAugment, int powerAugment) { super(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect); - ArrayList recipe = new ArrayList(); - for (ItemStack stack : inputItems) { - recipe.add(stack); - } + ArrayList recipe = new ArrayList<>(); + recipe.addAll(inputItems); recipe.add(getAugmentedPotionFlask(baseEffect)); this.input = recipe; @@ -55,7 +53,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { if (inputStack.isEmpty()) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - List effectList = new ArrayList(); + List effectList = new ArrayList<>(); int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), lengthAugment, powerAugment - baseEffect.getAmplifier()); effectList.add(new PotionEffect(wantedPotion, potionLength, powerAugment - baseEffect.getAmplifier())); @@ -67,7 +65,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { ItemStack outputStack = inputStack.copy(); List effectList = PotionUtils.getEffectsFromStack(outputStack); - List newEffectList = new ArrayList(); + List newEffectList = new ArrayList<>(); for (PotionEffect effect : effectList) { if (effect.getPotion() == wantedPotion) { @@ -89,7 +87,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { public static ItemStack getAugmentedPotionFlask(PotionEffect baseEffect) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - List effectList = new ArrayList(); + List effectList = new ArrayList<>(); effectList.add(baseEffect); BMPotionUtils.setEffects(outputStack, effectList); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index 4a627ede..172af124 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -22,10 +22,8 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, PotionEffect baseEffect) { super(basePotionFlaskStack, lpDrained, ticksRequired, tierRequired); - ArrayList recipe = new ArrayList(); - for (ItemStack stack : inputItems) { - recipe.add(stack); - } + ArrayList recipe = new ArrayList<>(); + recipe.addAll(inputItems); recipe.add(basePotionFlaskStack); this.input = recipe; @@ -60,7 +58,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { @Override public boolean matches(List checkedList, World world, BlockPos pos) { - ArrayList required = new ArrayList(input); + ArrayList required = new ArrayList<>(input); for (ItemStack slot : checkedList) { if (slot != null) { @@ -121,7 +119,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { if (inputStack.isEmpty()) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - List effectList = new ArrayList(); + List effectList = new ArrayList<>(); effectList.add(baseEffect); PotionUtils.appendEffects(outputStack, effectList); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java index 8fbd717d..a845963a 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java @@ -15,7 +15,7 @@ import java.util.List; public class AlchemyTableRecipe { protected ItemStack output = ItemStack.EMPTY; - protected ArrayList input = new ArrayList(); + protected ArrayList input = new ArrayList<>(); protected int lpDrained; protected int ticksRequired; protected int tierRequired; @@ -43,12 +43,12 @@ public class AlchemyTableRecipe { } else if (in instanceof String) { input.add(OreDictionary.getOres((String) in)); } else { - String ret = "Invalid alchemy recipe: "; + StringBuilder ret = new StringBuilder("Invalid alchemy recipe: "); for (Object tmp : recipe) { - ret += tmp + ", "; + ret.append(tmp).append(", "); } - ret += output; - throw new RuntimeException(ret); + ret.append(output); + throw new RuntimeException(ret.toString()); } } } @@ -78,7 +78,7 @@ public class AlchemyTableRecipe { */ @SuppressWarnings("unchecked") public boolean matches(List checkedList, World world, BlockPos pos) { - ArrayList required = new ArrayList(input); + ArrayList required = new ArrayList<>(input); for (ItemStack slot : checkedList) { if (!slot.isEmpty()) { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 855181d2..4a49327e 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -148,12 +148,12 @@ public class ModRecipes { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(lpDrained, 100, tier, inputStack, baseEffect)); - List lengtheningList = new ArrayList(); + List lengtheningList = new ArrayList<>(); lengtheningList.add(inputStack); lengtheningList.add(mundaneLengtheningStack); AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getLengthAugmentRecipe(lpDrained, 100, tier, lengtheningList, baseEffect, 1)); - List powerList = new ArrayList(); + List powerList = new ArrayList<>(); powerList.add(inputStack); powerList.add(mundanePowerStack); AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getPowerAugmentRecipe(lpDrained, 100, tier, powerList, baseEffect, 1)); @@ -173,7 +173,7 @@ public class ModRecipes ItemStack minecartStack = new ItemStack(Items.MINECART); ItemStack stringStack = new ItemStack(Items.STRING); - Map> dialogueMap = new HashMap>(); + Map> dialogueMap = new HashMap<>(); dialogueMap.put(bowStack, Pair.of("bow", new int[] { 1, 100, 300, 500 })); dialogueMap.put(bottleStack, Pair.of("quenched", new int[] { 1, 100, 300, 500 })); dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[] { 1, 100, 300, 500, 700 })); @@ -183,10 +183,10 @@ public class ModRecipes { ItemStack keyStack = entry.getKey(); String str = entry.getValue().getKey(); - Map> textMap = new HashMap>(); + Map> textMap = new HashMap<>(); for (int tick : entry.getValue().getValue()) { - List textList = new ArrayList(); + List textList = new ArrayList<>(); textList.add(new TextComponentTranslation("\u00A74%s", new TextComponentTranslation(messageBase + str + "." + tick))); textMap.put(tick, textList); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index 6ce09db4..67a8bf76 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.Iterator; public class RitualAltarBuilder extends Ritual { - private Iterator altarComponentsIterator = new ArrayList(EnumAltarTier.SIX.getAltarComponents()).iterator(); + private Iterator altarComponentsIterator = new ArrayList<>(EnumAltarTier.SIX.getAltarComponents()).iterator(); private boolean cycleDone = false; private AltarComponent currentComponent; @@ -53,7 +53,7 @@ public class RitualAltarBuilder extends Ritual { } if (cycleDone) { - altarComponentsIterator = new ArrayList(EnumAltarTier.SIX.getAltarComponents()).iterator(); + altarComponentsIterator = new ArrayList<>(EnumAltarTier.SIX.getAltarComponents()).iterator(); } if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) { @@ -114,7 +114,7 @@ public class RitualAltarBuilder extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); for (int i = -12; i <= -8; i++) { addRune(components, i, -6, 13, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index 147a3791..596d5c21 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -170,7 +170,7 @@ public class RitualAnimalGrowth extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 2, 0, EnumRuneType.DUSK); this.addParallelRunes(components, 1, 0, EnumRuneType.WATER); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java index 9a59ff3a..df617162 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java @@ -66,7 +66,7 @@ public class RitualArmourEvolve extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.DUSK); this.addCornerRunes(components, 2, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index a364d484..d20a3643 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -84,7 +84,7 @@ public class RitualCobblestone extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 1, EnumRuneType.FIRE); this.addParallelRunes(components, 1, 0, EnumRuneType.WATER); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index 4f6dc7a6..4691725c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +31,7 @@ public class RitualContainment extends Ritual { AreaDescriptor containmentRange = getBlockRange(CONTAINMENT_RANGE); for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || PlayerHelper.getUUIDFromPlayer((EntityPlayer) entity).toString().equals(masterRitualStone.getOwner()))) + if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) continue; double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); @@ -58,7 +57,7 @@ public class RitualContainment extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 1, 0, EnumRuneType.EARTH); this.addCornerRunes(components, 2, 0, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index 3909f072..5dea1dbf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -36,8 +36,8 @@ public class RitualCrushing extends Ritual { public static double destructiveWillDrain = 0.2; public static double vengefulWillDrain = 0.2; - public static Map cuttingFluidLPMap = new HashMap(); - public static Map cuttingFluidWillMap = new HashMap(); + public static Map cuttingFluidLPMap = new HashMap<>(); + public static Map cuttingFluidWillMap = new HashMap<>(); public static int defaultRefreshTime = 40; public int refreshTime = 40; @@ -120,7 +120,7 @@ public class RitualCrushing extends Ritual { } cuttingStack = cuttingStack.copy(); - List input = new ArrayList(); + List input = new ArrayList<>(); input.add(cuttingStack); input.add(copyStack); @@ -252,7 +252,7 @@ public class RitualCrushing extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 1, 0, EnumRuneType.EARTH); this.addParallelRunes(components, 2, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java index b6387112..6525cb0d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java @@ -68,7 +68,7 @@ public class RitualCrystalHarvest extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); this.addParallelRunes(components, 1, 1, EnumRuneType.DUSK); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index ba6a2fa7..04ed12f4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import com.google.common.collect.Lists; @@ -71,7 +70,7 @@ public class RitualExpulsion extends Ritual { final int teleportDistance = 100; for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, expulsionRange.getAABB(masterRitualStone.getBlockPos()))) { - if (player.capabilities.isCreativeMode || PlayerHelper.getUUIDFromPlayer(player).toString().equals(masterRitualStone.getOwner()) || whitelist.contains(player.getGameProfile().getId())) + if (player.capabilities.isCreativeMode || player.getGameProfile().getId().equals(masterRitualStone.getOwner()) || whitelist.contains(player.getGameProfile().getId())) continue; if (teleportRandomly(player, teleportDistance)) @@ -192,7 +191,7 @@ public class RitualExpulsion extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 2, 0, EnumRuneType.EARTH); this.addRune(components, 2, 0, 1, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index f7749ddf..efa144fb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -109,7 +109,7 @@ public class RitualFeatheredKnife extends Ritual { for (EntityPlayer player : entities) { float healthThreshold = steadfastWill >= steadfastWillThreshold ? 0.7f : 0.3f; - if (vengefulWill >= vengefulWillThreshold && !player.getUniqueID().toString().equals(masterRitualStone.getOwner())) { + if (vengefulWill >= vengefulWillThreshold && !player.getGameProfile().getId().equals(masterRitualStone.getOwner())) { healthThreshold = 0.1f; } @@ -186,7 +186,7 @@ public class RitualFeatheredKnife extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 1, 0, EnumRuneType.DUSK); this.addParallelRunes(components, 2, -1, EnumRuneType.WATER); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java index a426c67a..c6e3112c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java @@ -35,7 +35,7 @@ public class RitualFelling extends Ritual { setMaximumVolumeAndDistanceOfRange(FELLING_RANGE, 14000, 15, 30); setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - treePartsCache = new ArrayList(); + treePartsCache = new ArrayList<>(); } @Override @@ -86,7 +86,7 @@ public class RitualFelling extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); addCornerRunes(components, 1, 0, EnumRuneType.EARTH); addCornerRunes(components, 1, 1, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index 52048dbf..402a8b40 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -29,7 +29,7 @@ public class RitualForsakenSoul extends Ritual { public double willBuffer = 0; public double crystalBuffer = 0; - public List keyList = new ArrayList(); + public List keyList = new ArrayList<>(); public RitualForsakenSoul() { super("ritualForsakenSoul", 0, 40000, "ritual." + BloodMagic.MODID + ".forsakenSoulRitual"); @@ -83,7 +83,7 @@ public class RitualForsakenSoul extends Ritual { int maxEffects = 100; int totalEffects = 0; - List crystalList = new ArrayList(); + List crystalList = new ArrayList<>(); AreaDescriptor crystalRange = getBlockRange(CRYSTAL_RANGE); @@ -153,7 +153,7 @@ public class RitualForsakenSoul extends Ritual { keyList.remove(0); } - List uniquenessList = new ArrayList(); + List uniquenessList = new ArrayList<>(); for (int value : keyList) { if (!uniquenessList.contains(value)) { uniquenessList.add(value); @@ -179,7 +179,7 @@ public class RitualForsakenSoul extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); this.addParallelRunes(components, 1, -1, EnumRuneType.DUSK); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index 7cc66329..7bcd06e7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -3,10 +3,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.FoodStats; import net.minecraft.util.math.BlockPos; @@ -96,7 +94,7 @@ public class RitualFullStomach extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 3, 0, EnumRuneType.FIRE); this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 8a6f9cfb..84089407 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -260,7 +260,7 @@ public class RitualGreenGrove extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.EARTH); this.addParallelRunes(components, 1, 0, EnumRuneType.WATER); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index b1d4d478..ec6650f1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -67,7 +67,7 @@ public class RitualHarvest extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); components.add(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.DUSK)); components.add(new RitualComponent(new BlockPos(1, 0, -1), EnumRuneType.DUSK)); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java index 22a26195..26801083 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +31,7 @@ public class RitualInterdiction extends Ritual { AreaDescriptor interdictionRange = getBlockRange(INTERDICTION_RANGE); for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || PlayerHelper.getUUIDFromPlayer((EntityPlayer) entity).toString().equals(masterRitualStone.getOwner()))) + if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) continue; double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); @@ -62,7 +61,7 @@ public class RitualInterdiction extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); this.addParallelRunes(components, 1, 0, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java index 84da47b7..62f6f77c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java @@ -70,7 +70,7 @@ public class RitualJumping extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); for (int i = -1; i <= 1; i++) this.addCornerRunes(components, 1, i, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index d3878ed7..884ddf09 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -234,7 +234,7 @@ public class RitualLava extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 1, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java index 936d7d77..566f9019 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java @@ -51,7 +51,7 @@ public class RitualLivingArmourDowngrade extends Ritual { boolean isActivatorPresent = false; for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) { - if (player.getUniqueID().toString().equals(masterRitualStone.getOwner())) { + if (player.getGameProfile().getId().equals(masterRitualStone.getOwner())) { ItemStack keyStack = getStackFromItemFrame(world, masterPos, masterRitualStone.getDirection()); if (keyStack.isEmpty()) { return; @@ -77,7 +77,7 @@ public class RitualLivingArmourDowngrade extends Ritual { } IItemHandler inv = Utils.getInventory(tile, null); if (inv != null) { - List recipeList = new ArrayList(); + List recipeList = new ArrayList<>(); for (int i = 0; i < inv.getSlots(); i++) { ItemStack invStack = inv.getStackInSlot(i); if (!invStack.isEmpty()) { @@ -163,7 +163,7 @@ public class RitualLivingArmourDowngrade extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addRune(components, 0, 0, -1, EnumRuneType.AIR); this.addRune(components, 0, 0, -2, EnumRuneType.DUSK); @@ -180,25 +180,25 @@ public class RitualLivingArmourDowngrade extends Ritual { this.addRune(components, sgn * 2, 0, 2, EnumRuneType.AIR); this.addRune(components, sgn * 3, 0, 2, EnumRuneType.AIR); this.addRune(components, sgn * 3, 0, 3, EnumRuneType.AIR); - this.addRune(components, sgn * 1, 0, 0, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 0, 1, EnumRuneType.EARTH); + this.addRune(components, sgn, 0, 0, EnumRuneType.EARTH); + this.addRune(components, sgn, 0, 1, EnumRuneType.EARTH); this.addRune(components, sgn * 2, 0, -1, EnumRuneType.FIRE); this.addRune(components, sgn * 2, 0, -2, EnumRuneType.FIRE); this.addRune(components, sgn * 3, 0, -2, EnumRuneType.FIRE); this.addRune(components, sgn * 3, 0, -3, EnumRuneType.FIRE); this.addRune(components, sgn * 3, 0, -4, EnumRuneType.FIRE); - this.addRune(components, sgn * 1, 1, -1, EnumRuneType.AIR); - this.addRune(components, sgn * 1, 1, -2, EnumRuneType.AIR); - this.addRune(components, sgn * 1, 1, -4, EnumRuneType.FIRE); + this.addRune(components, sgn, 1, -1, EnumRuneType.AIR); + this.addRune(components, sgn, 1, -2, EnumRuneType.AIR); + this.addRune(components, sgn, 1, -4, EnumRuneType.FIRE); this.addRune(components, sgn * 2, 1, -4, EnumRuneType.FIRE); - this.addRune(components, sgn * 1, 0, -3, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 0, -4, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 0, -5, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 1, -5, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 2, -5, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 3, -5, EnumRuneType.EARTH); + this.addRune(components, sgn, 0, -3, EnumRuneType.EARTH); + this.addRune(components, sgn, 0, -4, EnumRuneType.EARTH); + this.addRune(components, sgn, 0, -5, EnumRuneType.EARTH); + this.addRune(components, sgn, 1, -5, EnumRuneType.EARTH); + this.addRune(components, sgn, 2, -5, EnumRuneType.EARTH); + this.addRune(components, sgn, 3, -5, EnumRuneType.EARTH); - this.addRune(components, sgn * 1, 3, -4, EnumRuneType.EARTH); + this.addRune(components, sgn, 3, -4, EnumRuneType.EARTH); } return components; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 42d262ed..86e3d325 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -73,7 +73,7 @@ public class RitualMagnetic extends Ritual { k = Math.min(radius, Math.max(-radius, lastPos.getZ())); } - while (j + pos.getY() >= 0) { + if (j + pos.getY() >= 0) { while (i <= radius) { while (k <= radius) { BlockPos newPos = pos.add(i, j, k); @@ -136,7 +136,7 @@ public class RitualMagnetic extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.EARTH); this.addParallelRunes(components, 2, 1, EnumRuneType.EARTH); @@ -162,12 +162,7 @@ public class RitualMagnetic extends Ritual { return false; BlockStack type = new BlockStack(block, meta); - Boolean result = oreBlockCache.get(type); - if (result == null) { - result = computeIsItemOre(type); - oreBlockCache.put(type, result); - } - return result; + return oreBlockCache.computeIfAbsent(type, RitualMagnetic::computeIsItemOre); } private static boolean computeIsItemOre(BlockStack type) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java index 42052ea9..939fd82a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java @@ -96,7 +96,7 @@ public class RitualMeteor extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 2, 0, EnumRuneType.FIRE); this.addOffsetRunes(components, 3, 1, 0, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index 7c4da792..27809a91 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -81,7 +81,7 @@ public class RitualPlacer extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); addRune(components, 3, 0, 3, EnumRuneType.EARTH); addRune(components, 3, 0, -3, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 2dd00fe1..d62f2f64 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -184,7 +184,7 @@ public class RitualPortal extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); addRune(components, 1, 0, 0, EnumRuneType.AIR); addRune(components, 2, 0, 0, EnumRuneType.WATER); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java index bdb869bc..1cb26be9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java @@ -92,7 +92,7 @@ public class RitualPump extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); addRune(components, 1, 0, 1, EnumRuneType.WATER); addRune(components, 1, 0, -1, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java index b2eb76bb..1da5a885 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java @@ -154,7 +154,7 @@ public class RitualRegeneration extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); components.add(new RitualComponent(new BlockPos(4, 0, 0), EnumRuneType.AIR)); components.add(new RitualComponent(new BlockPos(5, 0, -1), EnumRuneType.AIR)); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java index 57b51bcf..02d9fd7e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java @@ -154,7 +154,7 @@ public class RitualSpeed extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addRune(components, 0, 0, -2, EnumRuneType.DUSK); this.addRune(components, 1, 0, -1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java index 3bb9ed0d..b944c9ec 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java @@ -57,7 +57,7 @@ public class RitualSuppression extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 2, 0, EnumRuneType.WATER); this.addRune(components, -2, 0, -1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java index fe1a3a07..49ad448b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java @@ -104,7 +104,7 @@ public class RitualUpgradeRemove extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.DUSK); this.addCornerRunes(components, 2, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index 82e5bc43..0d784546 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -58,7 +58,7 @@ public class RitualWater extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.WATER); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index ba3bc5e0..44604cc5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -119,7 +119,7 @@ public class RitualWellOfSuffering extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addCornerRunes(components, 1, 0, EnumRuneType.FIRE); this.addCornerRunes(components, 2, -1, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index a397d22e..fc4ea91f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -82,7 +82,7 @@ public class RitualZephyr extends Ritual { @Override public ArrayList getComponents() { - ArrayList components = new ArrayList(); + ArrayList components = new ArrayList<>(); this.addParallelRunes(components, 2, 0, EnumRuneType.AIR); this.addCornerRunes(components, 1, 1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java index c898bf3e..59248e7f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java @@ -14,7 +14,7 @@ import java.util.List; public abstract class AreaDescriptor implements Iterator { public List getContainedPositions(BlockPos pos) { - return new ArrayList(); + return new ArrayList<>(); } public AxisAlignedBB getAABB(BlockPos pos) { @@ -92,7 +92,7 @@ public abstract class AreaDescriptor implements Iterator { @Override public List getContainedPositions(BlockPos pos) { if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { - ArrayList posList = new ArrayList(); + ArrayList posList = new ArrayList<>(); for (int j = minimumOffset.getY(); j < maximumOffset.getY(); j++) { for (int i = minimumOffset.getX(); i < maximumOffset.getX(); i++) { @@ -125,12 +125,12 @@ public abstract class AreaDescriptor implements Iterator { public void setOffsets(BlockPos offset1, BlockPos offset2) { this.minimumOffset = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); this.maximumOffset = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - blockPosCache = new ArrayList(); + blockPosCache = new ArrayList<>(); } @Override public void resetCache() { - this.blockPosCache = new ArrayList(); + this.blockPosCache = new ArrayList<>(); } @Override @@ -267,13 +267,13 @@ public abstract class AreaDescriptor implements Iterator { public void setRadius(BlockPos minimumOffset, int radius) { this.minimumOffset = new BlockPos(Math.min(minimumOffset.getX(), minimumOffset.getX()), Math.min(minimumOffset.getY(), minimumOffset.getY()), Math.min(minimumOffset.getZ(), minimumOffset.getZ())); this.radius = radius; - blockPosCache = new ArrayList(); + blockPosCache = new ArrayList<>(); } @Override public List getContainedPositions(BlockPos pos) { if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { - ArrayList posList = new ArrayList(); + ArrayList posList = new ArrayList<>(); int i = -radius; int j = minimumOffset.getY(); @@ -318,7 +318,7 @@ public abstract class AreaDescriptor implements Iterator { @Override public void resetCache() { - this.blockPosCache = new ArrayList(); + this.blockPosCache = new ArrayList<>(); } @Override @@ -400,7 +400,7 @@ public abstract class AreaDescriptor implements Iterator { public Cross(BlockPos center, int size) { this.centerPos = center; this.size = size; - this.blockPosCache = new ArrayList(); + this.blockPosCache = new ArrayList<>(); } @Override @@ -424,7 +424,7 @@ public abstract class AreaDescriptor implements Iterator { @Override public void resetCache() { - blockPosCache = new ArrayList(); + blockPosCache = new ArrayList<>(); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java index 0944cbcb..6a3e7bf8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java @@ -3,5 +3,6 @@ package WayofTime.bloodmagic.ritual.data; public enum EnumRitualReaderState { SET_AREA, INFORMATION, - SET_WILL_TYPES; + SET_WILL_TYPES, + ; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java index b2a4d680..fae7e240 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java @@ -22,11 +22,11 @@ import java.util.Map.Entry; * {@link RitualRegistry#registerRitual(Ritual, String)} */ public abstract class Ritual { - public final ArrayList ritualComponents = new ArrayList(); - protected final Map modableRangeMap = new HashMap(); - protected final Map volumeRangeMap = new HashMap(); - protected final Map horizontalRangeMap = new HashMap(); - protected final Map verticalRangeMap = new HashMap(); + public final ArrayList ritualComponents = new ArrayList<>(); + protected final Map modableRangeMap = new HashMap<>(); + protected final Map volumeRangeMap = new HashMap<>(); + protected final Map horizontalRangeMap = new HashMap<>(); + protected final Map verticalRangeMap = new HashMap<>(); private final String name; private final int crystalLevel; private final int activationCost; @@ -159,7 +159,7 @@ public abstract class Ritual { } public List getListOfRanges() { - return new ArrayList(modableRangeMap.keySet()); + return new ArrayList<>(modableRangeMap.keySet()); } public String getNextBlockRange(String range) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 8e5e9a61..e6f600ed 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -121,9 +121,7 @@ public class HarvestHandlerPlantable implements IHarvestHandler { } } catch (NoSuchMethodException e) { BloodMagic.instance.logger.error("HarvestCraft integration cancelled; unable to find crop name mapper"); - } catch (IllegalAccessException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); - } catch (InvocationTargetException e) { + } catch (IllegalAccessException | InvocationTargetException e) { BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 15f06cdf..79aa7dbd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -32,7 +32,7 @@ public class HarvestHandlerStem implements IHarvestHandler { @Override public boolean harvestAndPlant(World world, BlockPos pos, BlockStack blockStack) { boolean retFlag = false; - List drops = new ArrayList(); + List drops = new ArrayList<>(); BlockPos cropPos = pos; if (HarvestRegistry.getStemCrops().containsKey(blockStack)) { EnumFacing cropDir = blockStack.getBlock().getActualState(blockStack.getState(), world, pos).getValue(BlockStem.FACING); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index f643015e..a9f11698 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -27,7 +27,7 @@ public class HarvestHandlerTall implements IHarvestHandler { public boolean harvestAndPlant(World world, BlockPos pos, BlockStack blockStack) { boolean retFlag = false; - List drops = new ArrayList(); + List drops = new ArrayList<>(); if (HarvestRegistry.getTallCrops().contains(blockStack)) { BlockStack up = BlockStack.getStackFromPos(world, pos.up()); if (up.equals(blockStack)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index fbf098d3..bdcd9fdd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -17,13 +17,13 @@ public class LocationsHandler implements Serializable { private static LocationsHandler locationsHandler; private LocationsHandler() { - portals = new HashMap>(); + portals = new HashMap<>(); } public boolean addLocation(String name, PortalLocation location) { ArrayList portalLocations = portals.get(name); if (portalLocations == null) { - portals.put(name, new ArrayList()); + portals.put(name, new ArrayList<>()); updateFile(fileName, portals); } if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2) { diff --git a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java index 81c51625..5de7f9cb 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java @@ -25,7 +25,7 @@ public class RoutingFluidFilter implements IFluidFilter { this.fluidHandler = fluidHandler; if (isFilterOutput) { //The requestList contains a list of how much can be extracted. - requestList = new ArrayList(); + requestList = new ArrayList<>(); for (ItemStack filterStack : filteredList) { FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); if (fluidFilterStack != null) { @@ -46,7 +46,7 @@ public class RoutingFluidFilter implements IFluidFilter { } } } else { - requestList = new ArrayList(); + requestList = new ArrayList<>(); for (ItemStack filterStack : filteredList) { FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); if (fluidFilterStack != null) { diff --git a/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java index ecf423d7..2e45865d 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java @@ -86,13 +86,7 @@ public class TestItemFilter implements IItemFilter { } } - Iterator iterator = requestList.iterator(); - while (iterator.hasNext()) { - ItemStack filterStack = iterator.next(); - if (filterStack.isEmpty()) { - iterator.remove(); - } - } + requestList.removeIf(ItemStack::isEmpty); } /** diff --git a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java index 91422105..5ac2397d 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map.Entry; public class DemonWillHolder { - public HashMap willMap = new HashMap(); + public HashMap willMap = new HashMap<>(); public double addWill(EnumDemonWillType type, double amount, double max) { double current = 0; diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index c0137c5d..8170946d 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -17,9 +17,9 @@ public class Dungeon { public static boolean placeStructureAtPosition(Random rand, WorldServer world, BlockPos pos) { long startTime = System.nanoTime(); - Map> availableDoorMap = new HashMap>(); //Map of doors. The EnumFacing indicates what way this door faces. - List descriptorList = new ArrayList(); - Map> roomMap = new HashMap>(); // Placement positions in terms of actual positions + Map> availableDoorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. + List descriptorList = new ArrayList<>(); + Map> roomMap = new HashMap<>(); // Placement positions in terms of actual positions PlacementSettings settings = new PlacementSettings(); Mirror mir = Mirror.NONE; @@ -49,7 +49,7 @@ public class Dungeon { //Initial AreaDescriptors and door positions are initialized. Time for fun! for (int i = 0; i < 100; i++) { - List facingList = new ArrayList(); + List facingList = new ArrayList<>(); for (Entry> entry : availableDoorMap.entrySet()) { if (entry.getValue() != null && !entry.getValue().isEmpty()) { facingList.add(entry.getKey()); @@ -62,7 +62,6 @@ public class Dungeon { Pair removedDoor2 = null; BlockPos roomLocation = null; - roomPlacement: for (EnumFacing doorFacing : facingList) { EnumFacing oppositeDoorFacing = doorFacing.getOpposite(); List availableDoorList = availableDoorMap.get(doorFacing); //May need to copy here @@ -97,8 +96,9 @@ public class Dungeon { room = testingRoom; - break roomPlacement; } + + break; } // Collections.shuffle(otherDoorList); diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index dac62074..de848276 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -13,10 +13,10 @@ import java.util.Map.Entry; public class DungeonRoom { public int dungeonWeight = 1; - public Map structureMap = new HashMap(); + public Map structureMap = new HashMap<>(); - public Map> doorMap = new HashMap>(); //Map of doors. The EnumFacing indicates what way this door faces. - public List descriptorList = new ArrayList(); + public Map> doorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. + public List descriptorList = new ArrayList<>(); public DungeonRoom(Map structureMap, Map> doorMap, List descriptorList) { this.structureMap = structureMap; @@ -25,7 +25,7 @@ public class DungeonRoom { } public List getAreaDescriptors(PlacementSettings settings, BlockPos offset) { - List newList = new ArrayList(); + List newList = new ArrayList<>(); for (AreaDescriptor desc : descriptorList) { newList.add(desc.rotateDescriptor(settings).offset(offset)); @@ -35,7 +35,7 @@ public class DungeonRoom { } public List getDoorOffsetsForFacing(PlacementSettings settings, EnumFacing facing, BlockPos offset) { - List offsetList = new ArrayList(); + List offsetList = new ArrayList<>(); EnumFacing originalFacing = DungeonUtil.reverseRotate(settings.getMirror(), settings.getRotation(), facing); if (doorMap.containsKey(originalFacing)) { diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java index 3bd4ab75..5dd80e81 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java @@ -6,7 +6,7 @@ import java.util.Map.Entry; import java.util.Random; public class DungeonRoomRegistry { - public static Map dungeonWeightMap = new HashMap(); + public static Map dungeonWeightMap = new HashMap<>(); private static int totalWeight = 0; public static void registerDungeonRoom(DungeonRoom room, int weight) { diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java index 9534787e..ddf6c518 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java @@ -38,7 +38,7 @@ public class DungeonUtil { if (doorMap.containsKey(facing)) { doorMap.get(facing).add(offsetPos); } else { - List doorList = new ArrayList(); + List doorList = new ArrayList<>(); doorList.add(offsetPos); doorMap.put(facing, doorList); } diff --git a/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java index 8b3d72e5..1f7463f5 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java @@ -11,7 +11,7 @@ public class TeleportQueue { private static List queue; private TeleportQueue() { - queue = new ArrayList(); + queue = new ArrayList<>(); } public void addITeleport(ITeleport iTeleport) { diff --git a/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java index 16e7a6fc..4a02d90a 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java @@ -17,7 +17,7 @@ public class TeleporterBloodMagic extends Teleporter { @Override public void removeStalePortalLocations(long worldTime) { - ; + } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 4d1b42cf..2ee25431 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -17,7 +17,6 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche public boolean isActive = false; public int activeCounter = 0; public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; - ; private String key = "empty"; private AlchemyArrayEffect arrayEffect; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 5693df57..fd911ee6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -168,7 +168,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } public List getAccessibleInputSlots(EnumFacing direction) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < 6; i++) { if (isInputSlotAccessible(i)) { @@ -185,7 +185,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return; } - List inputList = new ArrayList(); + List inputList = new ArrayList<>(); for (int i = 0; i < 6; i++) { if (!getStackInSlot(i).isEmpty()) { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 3d05fe43..7685e0fc 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -17,7 +17,7 @@ import java.util.Map.Entry; public class TileDemonCrucible extends TileInventory implements ITickable, IDemonWillConduit, ISidedInventory { public final int maxWill = 100; public final double gemDrainRate = 10; - public HashMap willMap = new HashMap(); //TODO: Change to DemonWillHolder + public HashMap willMap = new HashMap<>(); //TODO: Change to DemonWillHolder public int internalCounter = 0; public TileDemonCrucible() { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 1601a07a..125f8cca 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -22,7 +22,7 @@ import java.util.Map.Entry; public class TileIncenseAltar extends TileInventory implements ITickable { public static int maxCheckRange = 5; public AreaDescriptor incenseArea = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); - public Map tranquilityMap = new HashMap(); + public Map tranquilityMap = new HashMap<>(); public double incenseAddition = 0; //Self-sacrifice is multiplied by 1 plus this value. public double tranquility = 0; @@ -55,7 +55,7 @@ public class TileIncenseAltar extends TileInventory implements ITickable { if (hasPerformed) { if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof WorldServer) { WorldServer server = (WorldServer) getWorld(); - server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0, new int[0]); + server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); } } } @@ -80,7 +80,7 @@ public class TileIncenseAltar extends TileInventory implements ITickable { int maxLength = 11; //Max length of the path. The path starts two blocks away from the center block. int yOffset = 0; - Map tranquilityMap = new HashMap(); + Map tranquilityMap = new HashMap<>(); for (int currentDistance = 2; currentDistance < currentDistance + maxLength; currentDistance++) { boolean canFormRoad = false; @@ -116,7 +116,7 @@ public class TileIncenseAltar extends TileInventory implements ITickable { continue; //TODO: Can make this just set j to currentDistance to speed it up. } - for (int y = 0 + yOffset; y <= 2 + yOffset; y++) { + for (int y = yOffset; y <= 2 + yOffset; y++) { BlockPos offsetPos = pos.add(i, y, j); IBlockState state = getWorld().getBlockState(offsetPos); Block block = state.getBlock(); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 638930a3..a947fda7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -19,7 +19,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.common.animation.Event; -import net.minecraftforge.common.animation.ITimeValue; import net.minecraftforge.common.animation.TimeValues.VariableValue; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.model.animation.CapabilityAnimation; @@ -64,7 +63,7 @@ public class TileInversionPillar extends TileTicking { public TileInversionPillar(EnumDemonWillType type) { this.type = type; - asm = BloodMagic.proxy.load(new ResourceLocation(BloodMagic.MODID.toLowerCase(), "asms/block/inversion_pillar.json"), ImmutableMap.of("offset", animationOffset, "cycle_length", cycleLength)); + asm = BloodMagic.proxy.load(new ResourceLocation(BloodMagic.MODID.toLowerCase(), "asms/block/inversion_pillar.json"), ImmutableMap.of("offset", animationOffset, "cycle_length", cycleLength)); animationOffsetValue = -1; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 4e140dea..0bbf0441 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -40,7 +40,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS private Ritual currentRitual; private EnumFacing direction = EnumFacing.NORTH; private boolean inverted; - private List currentActiveWillConfig = new ArrayList(); + private List currentActiveWillConfig = new ArrayList<>(); @Override public void onUpdate() { @@ -322,7 +322,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS @Override public List getActiveWillConfig() { - return new ArrayList(currentActiveWillConfig); + return new ArrayList<>(currentActiveWillConfig); } @Override @@ -330,17 +330,17 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS //There is probably an easier way to make expanded chat messages if (typeList.size() >= 1) { Object[] translations = new TextComponentTranslation[typeList.size()]; - String constructedString = "%s"; + StringBuilder constructedString = new StringBuilder("%s"); for (int i = 1; i < typeList.size(); i++) { - constructedString = constructedString + ", %s"; + constructedString.append(", %s"); } for (int i = 0; i < typeList.size(); i++) { translations[i] = new TextComponentTranslation("tooltip.bloodmagic.currentBaseType." + typeList.get(i).name.toLowerCase()); } - ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.willConfig.set", new TextComponentTranslation(constructedString, translations))); + ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.willConfig.set", new TextComponentTranslation(constructedString.toString(), translations))); } else { ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.willConfig.void")); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java index 46ed0004..1076ba17 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java @@ -339,9 +339,7 @@ public class TileMimic extends TileInventory implements ITickable { try { _blockMetadata.setInt(tile, replacementMeta); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index 3e90cb5d..88ea4e75 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -57,7 +57,7 @@ public class TilePurificationAltar extends TileInventory implements ITickable { if (hasPerformed) { if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof WorldServer) { WorldServer server = (WorldServer) getWorld(); - server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0, new int[0]); + server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); } } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index f6909c28..3640b6c7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -72,7 +72,7 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil double soulsInGem = getWill(EnumDemonWillType.DEFAULT); - List inputList = new ArrayList(); + List inputList = new ArrayList<>(); for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index c760c950..250752bd 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -20,10 +20,10 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti public static final int tickRate = 20; private int currentInput; // A list of connections - private TreeMap> connectionMap = new TreeMap>(); - private List generalNodeList = new LinkedList(); - private List outputNodeList = new LinkedList(); - private List inputNodeList = new LinkedList(); + private TreeMap> connectionMap = new TreeMap<>(); + private List generalNodeList = new LinkedList<>(); + private List outputNodeList = new LinkedList<>(); + private List inputNodeList = new LinkedList<>(); public TileMasterRoutingNode() { super(0, "masterRoutingNode"); @@ -43,12 +43,12 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti return; } - Map> outputMap = new TreeMap>(); - Map> outputFluidMap = new TreeMap>(); + Map> outputMap = new TreeMap<>(); + Map> outputFluidMap = new TreeMap<>(); for (BlockPos outputPos : outputNodeList) { TileEntity outputTile = getWorld().getTileEntity(outputPos); - if (this.isConnected(new LinkedList(), outputPos)) { + if (this.isConnected(new LinkedList<>(), outputPos)) { if (outputTile instanceof IOutputItemRoutingNode) { IOutputItemRoutingNode outputNode = (IOutputItemRoutingNode) outputTile; @@ -63,7 +63,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (outputMap.containsKey(priority)) { outputMap.get(priority).add(filter); } else { - List filterList = new LinkedList(); + List filterList = new LinkedList<>(); filterList.add(filter); outputMap.put(priority, filterList); } @@ -85,7 +85,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (outputMap.containsKey(priority)) { outputFluidMap.get(priority).add(filter); } else { - List filterList = new LinkedList(); + List filterList = new LinkedList<>(); filterList.add(filter); outputFluidMap.put(priority, filterList); } @@ -95,12 +95,12 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - Map> inputMap = new TreeMap>(); - Map> inputFluidMap = new TreeMap>(); + Map> inputMap = new TreeMap<>(); + Map> inputFluidMap = new TreeMap<>(); for (BlockPos inputPos : inputNodeList) { TileEntity inputTile = getWorld().getTileEntity(inputPos); - if (this.isConnected(new LinkedList(), inputPos)) { + if (this.isConnected(new LinkedList<>(), inputPos)) { if (inputTile instanceof IInputItemRoutingNode) { IInputItemRoutingNode inputNode = (IInputItemRoutingNode) inputTile; @@ -115,7 +115,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (inputMap.containsKey(priority)) { inputMap.get(priority).add(filter); } else { - List filterList = new LinkedList(); + List filterList = new LinkedList<>(); filterList.add(filter); inputMap.put(priority, filterList); } @@ -137,7 +137,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (inputMap.containsKey(priority)) { inputFluidMap.get(priority).add(filter); } else { - List filterList = new LinkedList(); + List filterList = new LinkedList<>(); filterList.add(filter); inputFluidMap.put(priority, filterList); } @@ -315,7 +315,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (connectionMap.containsKey(pos1) && !connectionMap.get(pos1).contains(pos2)) { connectionMap.get(pos1).add(pos2); } else { - List list = new LinkedList(); + List list = new LinkedList<>(); list.add(pos2); connectionMap.put(pos1, list); } @@ -323,7 +323,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (connectionMap.containsKey(pos2) && !connectionMap.get(pos2).contains(pos1)) { connectionMap.get(pos2).add(pos1); } else { - List list = new LinkedList(); + List list = new LinkedList<>(); list.add(pos1); connectionMap.put(pos2, list); } @@ -360,7 +360,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti @Override public List getConnected() { - return new LinkedList(); + return new LinkedList<>(); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index fbc6c626..66c6b4df 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -21,7 +21,7 @@ import java.util.List; public class TileRoutingNode extends TileInventory implements IRoutingNode, IItemRoutingNode, ITickable { private int currentInput; private BlockPos masterPos = BlockPos.ORIGIN; - private List connectionList = new LinkedList(); + private List connectionList = new LinkedList<>(); public TileRoutingNode(int size, String name) { super(size, name); diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index e11ccb24..b82710f9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -219,12 +219,7 @@ public class ChatUtil { public static class Handler implements IMessageHandler { @Override public IMessage onMessage(final PacketNoSpamChat message, MessageContext ctx) { - Minecraft.getMinecraft().addScheduledTask(new Runnable() { - @Override - public void run() { - sendNoSpamMessages(message.chatLines); - } - }); + Minecraft.getMinecraft().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java index 0163eea1..d1d648d0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java @@ -96,7 +96,7 @@ public class ItemStackWrapper { } public static List toWrapperList(List itemStackList) { - List wrapperList = new ArrayList(); + List wrapperList = new ArrayList<>(); for (ItemStack stack : itemStackList) wrapperList.add(ItemStackWrapper.getHolder(stack)); @@ -104,7 +104,7 @@ public class ItemStackWrapper { } public static List toStackList(List wrapperList) { - List stackList = new ArrayList(); + List stackList = new ArrayList<>(); for (ItemStackWrapper wrapper : wrapperList) stackList.add(wrapper.toStack()); diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 88c989b8..417eddad 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -231,9 +231,7 @@ public class Utils { public static boolean isInteger(String integer) { try { Integer.parseInt(integer); - } catch (NumberFormatException e) { - return false; - } catch (NullPointerException e) { + } catch (NumberFormatException | NullPointerException e) { return false; } // only got here if we didn't return false @@ -365,7 +363,7 @@ public class Utils { public static float applyArmor(EntityLivingBase entity, ItemStack[] inventory, DamageSource source, double damage) { damage *= 25; - ArrayList dmgVals = new ArrayList(); + ArrayList dmgVals = new ArrayList<>(); for (int x = 0; x < inventory.length; x++) { ItemStack stack = inventory[x]; if (stack.isEmpty()) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index f99d4ec6..e1025a32 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -55,7 +55,7 @@ import java.util.*; public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. public static final boolean SUPPRESS_ASSET_ERRORS = true; - public static final List hudElements = new ArrayList(); + public static final List hudElements = new ArrayList<>(); public static TextureAtlasSprite ritualStoneBlank; public static TextureAtlasSprite ritualStoneWater; public static TextureAtlasSprite ritualStoneFire; @@ -191,13 +191,13 @@ public class ClientHandler { Set missingVariants = ReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), "missingVariants"); // Collect all Blood Magic model errors - List errored = new ArrayList(); + List errored = new ArrayList<>(); for (ResourceLocation modelError : modelErrors.keySet()) if (modelError.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID)) errored.add(modelError); // Collect all Blood Magic variant errors - List missing = new ArrayList(); + List missing = new ArrayList<>(); for (ModelResourceLocation missingVariant : missingVariants) if (missingVariant.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID)) missing.add(missingVariant); @@ -228,7 +228,7 @@ public class ClientHandler { String mc = "minecraft"; String format = "textures/%s.png"; - Set toRemove = new HashSet(); + Set toRemove = new HashSet<>(); // Find our missing textures and mark them for removal. Cannot directly remove as it would cause a CME if (missingTextures.containsKey(mc)) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index a859d993..1eafcbe6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -127,7 +127,7 @@ public class CraftingHandler { if (rightUpgrade != null) { String key = ItemHelper.LivingUpgrades.getKey(event.getRight()); ItemStack outputStack = event.getLeft().copy(); - List keyList = new ArrayList(); + List keyList = new ArrayList<>(); keyList.add(key); if (((IUpgradeTrainer) event.getLeft().getItem()).setTrainedUpgrades(outputStack, keyList)) { event.setCost(1); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index cd8bebf3..8ba5b079 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -34,7 +34,6 @@ import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.*; -import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; @@ -54,7 +53,6 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; @@ -74,7 +72,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; @@ -85,10 +82,10 @@ import java.util.*; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { - public static Map bounceMap = new HashMap(); - public static Map filledHandMap = new HashMap(); - private static Map targetTaskMap = new HashMap(); - private static Map attackTaskMap = new HashMap(); + public static Map bounceMap = new HashMap<>(); + public static Map filledHandMap = new HashMap<>(); + private static Map targetTaskMap = new HashMap<>(); + private static Map attackTaskMap = new HashMap<>(); @SubscribeEvent public static void onEntityFall(LivingFallEvent event) { @@ -218,7 +215,7 @@ public class GenericHandler { EntityAnimal animal = (EntityAnimal) event.getEntityLiving(); if (animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { if (!targetTaskMap.containsKey(animal)) { - EntityAITarget task = new EntityAINearestAttackableTarget(animal, EntityMob.class, false); + EntityAITarget task = new EntityAINearestAttackableTarget<>(animal, EntityMob.class, false); EntityAIBase attackTask = new EntityAIAttackMelee(animal, 1.0D, false); animal.targetTasks.addTask(1, task); animal.tasks.addTask(1, attackTask); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index ce76a8d0..4b735090 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -37,7 +37,7 @@ import java.util.concurrent.CopyOnWriteArrayList; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class WillHandler { - private static final HashMap SERVER_TICKS = new HashMap(); + private static final HashMap SERVER_TICKS = new HashMap<>(); // Adds Will to player @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index 1b3a4bda..279498e4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -2,14 +2,12 @@ package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.SoulNetworkEvent; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.core.data.BMWorldSavedData; import WayofTime.bloodmagic.core.data.SoulNetwork; -import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java index c79afba7..e98cccfb 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java @@ -4,7 +4,7 @@ import java.util.TreeMap; public class NumeralHelper { - private static final TreeMap romanNumerals = new TreeMap(); + private static final TreeMap romanNumerals = new TreeMap<>(); static { romanNumerals.put(1000, "M"); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java index 42b3a443..8b9c3e35 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java @@ -36,7 +36,7 @@ public class TextHelper { } public static ArrayList localizeAll(List input) { - ArrayList ret = new ArrayList(input.size()); + ArrayList ret = new ArrayList<>(input.size()); for (int i = 0; i < input.size(); i++) ret.add(i, localize(input.get(i))); @@ -44,7 +44,7 @@ public class TextHelper { } public static ArrayList localizeAllEffect(List input) { - ArrayList ret = new ArrayList(input.size()); + ArrayList ret = new ArrayList<>(input.size()); for (int i = 0; i < input.size(); i++) ret.add(i, localizeEffect(input.get(i))); From f025407014c85896fa28c7f872660eec6feb5920 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 1 Mar 2018 19:40:37 -0800 Subject: [PATCH 115/493] Move fuel handling to new event --- .../WayofTime/bloodmagic/fuel/FuelHandler.java | 17 ----------------- .../WayofTime/bloodmagic/proxy/CommonProxy.java | 3 --- .../util/handler/event/CraftingHandler.java | 9 +++++++++ 3 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java diff --git a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java deleted file mode 100644 index 29b01c00..00000000 --- a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.bloodmagic.fuel; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.IFuelHandler; - -public class FuelHandler implements IFuelHandler { - @Override - public int getBurnTime(ItemStack fuel) { - if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.COMPONENT && fuel.getMetadata() == ComponentTypes.SAND_COAL.ordinal()) { - return 1600; - } - - return 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index bfc6ee8d..34643085 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.ritual.data.CapabilityRuneType; import WayofTime.bloodmagic.ritual.data.IRitualStone; import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.fuel.FuelHandler; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -13,12 +12,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.animation.ITimeValue; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fml.common.registry.GameRegistry; public class CommonProxy { public void preInit() { MinecraftForge.EVENT_BUS.register(TeleportQueue.getInstance()); - GameRegistry.registerFuelHandler(new FuelHandler()); registerRenderers(); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 1eafcbe6..119e96a2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.AltarCraftedEvent; import WayofTime.bloodmagic.iface.IUpgradeTrainer; @@ -15,8 +16,10 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.event.AnvilUpdateEvent; +import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; @@ -137,4 +140,10 @@ public class CraftingHandler { } } } + + @SubscribeEvent + public static void handleFuelLevel(FurnaceFuelBurnTimeEvent event) { + if (event.getItemStack().getItem() == RegistrarBloodMagicItems.COMPONENT && event.getItemStack().getMetadata() == ComponentTypes.SAND_COAL.ordinal()) + event.setBurnTime(TileEntityFurnace.getItemBurnTime(new ItemStack(Items.COAL))); + } } From 022fe00847814b1fcd23eb147c5241aa8803b484 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 2 Mar 2018 14:46:59 -0500 Subject: [PATCH 116/493] Worked on the Ellipsoid Ritual (currently disabled). No, it is not used to summon mathematical demons. --- .../bloodmagic/registry/ModRituals.java | 18 +- .../bloodmagic/ritual/RitualEllipsoid.java | 202 ++++++++++++++++++ 2 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 46e18f52..5f5a6564 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -18,7 +18,8 @@ import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualResistance; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualZombie; import net.minecraft.init.Blocks; -public class ModRituals { +public class ModRituals +{ public static Ritual waterRitual; public static Ritual lavaRitual; public static Ritual greenGroveRitual; @@ -48,6 +49,8 @@ public class ModRituals { public static Ritual altarBuilderRitual; public static Ritual portalRitual; + public static Ritual ellipsoidRitual; + public static Ritual meteorRitual; public static Ritual downgradeRitual; @@ -57,7 +60,8 @@ public class ModRituals { public static ImperfectRitual imperfectResistance; public static ImperfectRitual imperfectZombie; - public static void initRituals() { + public static void initRituals() + { waterRitual = new RitualWater(); RitualRegistry.registerRitual(waterRitual, ConfigHandler.rituals.ritualWater); lavaRitual = new RitualLava(); @@ -115,14 +119,19 @@ public class ModRituals { RitualRegistry.registerRitual(portalRitual, ConfigHandler.rituals.ritualPortal); meteorRitual = new RitualMeteor(); RitualRegistry.registerRitual(meteorRitual, ConfigHandler.rituals.ritualMeteor); + downgradeRitual = new RitualLivingArmourDowngrade(); RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.rituals.ritualDowngrade); + ellipsoidRitual = new RitualEllipsoid(); + RitualRegistry.registerRitual(ellipsoidRitual, false); + RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05); } - public static void initImperfectRituals() { + public static void initImperfectRituals() + { imperfectNight = new ImperfectRitualNight(); ImperfectRitualRegistry.registerRitual(imperfectNight, ConfigHandler.rituals.imperfect.imperfectRitualNight); imperfectRain = new ImperfectRitualRain(); @@ -133,7 +142,8 @@ public class ModRituals { ImperfectRitualRegistry.registerRitual(imperfectZombie, ConfigHandler.rituals.imperfect.imperfectRitualZombie); } - public static void initHarvestHandlers() { + public static void initHarvestHandlers() + { HarvestRegistry.registerRangeAmplifier(new BlockStack(Blocks.DIAMOND_BLOCK), 15); HarvestRegistry.registerRangeAmplifier(new BlockStack(Blocks.GOLD_BLOCK), 10); HarvestRegistry.registerRangeAmplifier(new BlockStack(Blocks.IRON_BLOCK), 6); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java new file mode 100644 index 00000000..cc62e700 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java @@ -0,0 +1,202 @@ +package WayofTime.bloodmagic.ritual; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.util.Utils; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; + +import javax.annotation.Nullable; + +import java.util.ArrayList; +import java.util.Iterator; + +public class RitualEllipsoid extends Ritual +{ +// public static final String FELLING_RANGE = "fellingRange"; + public static final String CHEST_RANGE = "chest"; + + private boolean cached = false; + private BlockPos currentPos; //Offset + + public RitualEllipsoid() + { + super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual"); +// addBlockRange(FELLING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -3, -10), new BlockPos(11, 27, 11))); + addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); + +// setMaximumVolumeAndDistanceOfRange(FELLING_RANGE, 14000, 15, 30); + setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + BlockPos masterPos = masterRitualStone.getBlockPos(); + AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + if (tileInventory != null) + { + IItemHandler inventory = Utils.getInventory(tileInventory, EnumFacing.DOWN); + int numSlots = inventory.getSlots(); + if (numSlots >= 3) + { + ItemStack xStack = inventory.getStackInSlot(0); + ItemStack yStack = inventory.getStackInSlot(1); + ItemStack zStack = inventory.getStackInSlot(2); + + if (xStack.isEmpty() || yStack.isEmpty() || zStack.isEmpty()) + { + return; + } + + int xR = xStack.getCount(); + int yR = yStack.getCount(); + int zR = zStack.getCount(); + + int j = -yR; + int i = -xR; + int k = -zR; + + if (currentPos != null) + { + j = currentPos.getY(); + i = Math.min(xR, Math.max(-xR, currentPos.getX())); + k = Math.min(zR, Math.max(-zR, currentPos.getZ())); + } + + while (j <= yR) + { + while (i <= xR) + { + while (k <= zR) + { + if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) + { + BlockPos newPos = masterPos.add(i, j, k); + + if (world.isAirBlock(newPos)) + { + if (j > 0) + { + world.setBlockState(newPos, Blocks.GLASS.getDefaultState()); + } else + { + world.setBlockState(newPos, Blocks.STONE.getDefaultState()); + } + k++; + this.currentPos = new BlockPos(i, j, k); + return; + } + } + k++; + } + i++; + k = -zR; + } + j++; + i = -xR; + this.currentPos = new BlockPos(i, j, k); + return; + } + + j = -yR; + this.currentPos = new BlockPos(i, j, k); + return; + + } + } + } + + public boolean checkIfEllipsoidShell(int xR, int yR, int zR, int xOff, int yOff, int zOff) + { + //Checking shell in the x-direction + if (!checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) + { + return false; + } + + return !((checkIfEllipsoid(xR, yR, zR, xOff + 1, yOff, zOff) && checkIfEllipsoid(xR, yR, zR, xOff - 1, yOff, zOff)) && (checkIfEllipsoid(xR, yR, zR, xOff, yOff + 1, zOff) && checkIfEllipsoid(xR, yR, zR, xOff, yOff - 1, zOff)) && (checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff + 1) && checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff - 1))); +// if (xOff * xOff + yOff * yOff + zOff * zOff >= (xR - 0.5) * (xR - 0.5) && xOff * xOff + yOff * yOff + zOff * zOff <= (xR + 0.5) * (xR + 0.5)) +// if (checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) +// { +// if (xOff * xOff / ((xR - 0.5) * (xR - 0.5)) + yOff * yOff / ((yR - 0.5) * (yR - 0.5)) >= 1 - zOff * zOff / ((zR + possOffset) * (zR + possOffset))) +// { +// return true; +// } +// +// if (xOff * xOff / ((xR - 0.5) * (xR - 0.5)) + zOff * zOff / ((zR - 0.5) * (zR - 0.5)) >= 1 - yOff * yOff / ((yR + possOffset) * (yR + possOffset))) +// { +// return true; +// } +// +// if (zOff * zOff / ((zR - 0.5) * (zR - 0.5)) + yOff * yOff / ((yR - 0.5) * (yR - 0.5)) >= 1 - xOff * xOff / ((xR + possOffset) * (xR + possOffset))) +// { +// return true; +// } +// } +// return false; + } + + public boolean checkIfEllipsoid(float xR, float yR, float zR, float xOff, float yOff, float zOff) + { + float possOffset = 0.5f; + return xOff * xOff / ((xR + possOffset) * (xR + possOffset)) + yOff * yOff / ((yR + possOffset) * (yR + possOffset)) + zOff * zOff / ((zR + possOffset) * (zR + possOffset)) <= 1; + } + + @Override + public int getRefreshCost() + { + return 0; + } + + @Override + public int getRefreshTime() + { + return 1; + } + +// @Override +// public void readFromNBT(NBTTagCompound tag) +// { +// super.readFromNBT(tag); +// tag +// } + + @Override + public ArrayList getComponents() + { + ArrayList components = new ArrayList(); + + addCornerRunes(components, 1, 0, EnumRuneType.WATER); + addCornerRunes(components, 1, 1, EnumRuneType.WATER); + + return components; + } + + @Override + public Ritual getNewCopy() + { + return new RitualEllipsoid(); + } +} From 08031e65f822e877427e7e7084a29b94011391de Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 2 Mar 2018 15:21:51 -0500 Subject: [PATCH 117/493] Fixed client-sided crash in the Blood Light sigil by rearranging a few arguments. --- changelog.txt | 6 +++ .../item/sigil/ItemSigilBloodLight.java | 41 +++++++++++++------ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/changelog.txt b/changelog.txt index 3a1b7fea..5a76db06 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 2.2.8 +------------------------------------------------------ +- Fixed a client side null-pointer exception with the Blood Lamp + - It's a bright idea to fix this as soon as I can. + ------------------------------------------------------ Version 2.2.7 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 5fb9b806..42b5f026 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -18,19 +18,23 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -public class ItemSigilBloodLight extends ItemSigilBase { - public ItemSigilBloodLight() { +public class ItemSigilBloodLight extends ItemSigilBase +{ + public ItemSigilBloodLight() + { super("blood_light", 10); } @Override - public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { + public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) + { if (getCooldownRemainder(stack) > 0) reduceCooldown(stack); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); @@ -42,20 +46,27 @@ public class ItemSigilBloodLight extends ItemSigilBase { if (getCooldownRemainder(stack) > 0) return super.onItemRightClick(world, player, hand); - SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { + if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) + { BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); - if (world.isAirBlock(blockPos)) { + if (world.isAirBlock(blockPos)) + { world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); if (!world.isRemote) + { + SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); network.syphonAndDamage(player, getLpUsed()); + } resetCooldown(stack); player.swingArm(hand); return super.onItemRightClick(world, player, hand); } - } else { - if (!world.isRemote) { + } else + { + if (!world.isRemote) + { + SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); world.spawnEntity(new EntityBloodLight(world, player)); network.syphonAndDamage(player, getLpUsed()); } @@ -66,19 +77,23 @@ public class ItemSigilBloodLight extends ItemSigilBase { } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + { return oldStack.getItem() != newStack.getItem(); } - public int getCooldownRemainder(ItemStack stack) { + public int getCooldownRemainder(ItemStack stack) + { return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING); } - public void reduceCooldown(ItemStack stack) { + public void reduceCooldown(ItemStack stack) + { NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); } - public void resetCooldown(ItemStack stack) { + public void resetCooldown(ItemStack stack) + { NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10); } } From 7a02783e3122349001037b75acd6f14986992d5e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 2 Mar 2018 15:29:45 -0500 Subject: [PATCH 118/493] Changed the recipe of the Teleport array. --- changelog.txt | 2 ++ src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 5a76db06..567608ca 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,8 @@ Version 2.2.8 ------------------------------------------------------ - Fixed a client side null-pointer exception with the Blood Lamp - It's a bright idea to fix this as soon as I can. +- Changed the recipe of the Teleport Array: + - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! ------------------------------------------------------ Version 2.2.7 diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 4a49327e..0fb77ac2 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -95,7 +95,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.APPLE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); From 927fc6498ffce6d102cf8f95d2d2b3423e50b3de Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 3 Mar 2018 19:16:53 -0800 Subject: [PATCH 119/493] Cleanup harvest handling --- .../core/registry/HarvestRegistry.java | 102 ----------------- .../bloodmagic/iface/IHarvestHandler.java | 26 ----- .../bloodmagic/registry/ModRituals.java | 8 +- .../bloodmagic/ritual/RitualHarvest.java | 51 +++++++-- .../harvest/HarvestHandlerPlantable.java | 60 +++++----- .../ritual/harvest/HarvestHandlerStem.java | 61 +++++----- .../ritual/harvest/HarvestHandlerTall.java | 49 ++++---- .../ritual/harvest/HarvestRegistry.java | 105 ++++++++++++++++++ .../ritual/harvest/IHarvestHandler.java | 37 ++++++ 9 files changed, 263 insertions(+), 236 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java deleted file mode 100644 index 9be7251b..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java +++ /dev/null @@ -1,102 +0,0 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.iface.IHarvestHandler; -import net.minecraft.block.Block; -import net.minecraft.block.BlockStem; - -import java.util.*; - -public class HarvestRegistry { - private static List handlerList = new ArrayList<>(); - private static Map standardCrops = new HashMap<>(); - private static Set tallCrops = new HashSet<>(); - private static Map stemCrops = new HashMap<>(); - private static Map amplifierMap = new HashMap<>(); - - /** - * Registers a handler for the Harvest Ritual to call. - * - * @param handler - The custom handler to register - */ - public static void registerHandler(IHarvestHandler handler) { - if (!handlerList.contains(handler)) - handlerList.add(handler); - } - - /** - * Registers a standard crop (IE: Wheat, Carrots, Potatoes, Netherwart, etc) - * for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable} - * handler to handle. - * - * @param crop - The crop block to handle. - * @param matureMeta - The meta value at which the crop is considered mature and ready - * to be harvested. - */ - public static void registerStandardCrop(Block crop, int matureMeta) { - if (!standardCrops.containsKey(crop)) - standardCrops.put(crop, matureMeta); - } - - /** - * Registers a tall crop (Sugar Cane and Cactus) for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall} handler to - * handle. - * - * @param crop - The crop block to handle. - */ - public static void registerTallCrop(BlockStack crop) { - if (!tallCrops.contains(crop)) - tallCrops.add(crop); - } - - /** - * Registers a stem crop (Melon and Pumpkin) for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem} handler to - * handle. - *

- * Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to - * accept any meta for the crop block. - *

- * The Stem must be instanceof {@link BlockStem} - * - * @param crop - The crop block to handle. - * @param stem - The stem of the crop - */ - public static void registerStemCrop(BlockStack crop, BlockStack stem) { - if (!stemCrops.containsKey(crop) && stem.getBlock() instanceof BlockStem) - stemCrops.put(stem, crop); - } - - /** - * Registers a range amplifier for the Harvest Ritual. - * - * @param blockStack - The block for the amplifier. - * @param range - The range the amplifier provides. - */ - public static void registerRangeAmplifier(BlockStack blockStack, int range) { - if (!amplifierMap.containsKey(blockStack)) - amplifierMap.put(blockStack, range); - } - - public static List getHandlerList() { - return new ArrayList<>(handlerList); - } - - public static Map getStandardCrops() { - return new HashMap<>(standardCrops); - } - - public static Set getTallCrops() { - return new HashSet<>(tallCrops); - } - - public static Map getStemCrops() { - return new HashMap<>(stemCrops); - } - - public static Map getAmplifierMap() { - return new HashMap<>(amplifierMap); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java deleted file mode 100644 index 91240f62..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * Used to define a HarvestHandler for the Harvest Ritual. - */ -public interface IHarvestHandler { - /** - * Called whenever the Harvest Ritual attempts to harvest a block.
- * Use this to break the block, plant a new one, and drop the produced - * items.
- * Make sure to do checks so you are certain the blocks being handled are - * the block types you want. - * - * @param world - The world the - * {@link IMasterRitualStone} is in. - * @param pos - The position of the Block being checked - * @param blockStack - The Block being checked - * @return If the block was successfully harvested. - */ - boolean harvestAndPlant(World world, BlockPos pos, BlockStack blockStack); -} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 5f5a6564..8582d583 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; import WayofTime.bloodmagic.core.registry.RitualRegistry; import WayofTime.bloodmagic.ritual.data.Ritual; @@ -144,9 +144,9 @@ public class ModRituals public static void initHarvestHandlers() { - HarvestRegistry.registerRangeAmplifier(new BlockStack(Blocks.DIAMOND_BLOCK), 15); - HarvestRegistry.registerRangeAmplifier(new BlockStack(Blocks.GOLD_BLOCK), 10); - HarvestRegistry.registerRangeAmplifier(new BlockStack(Blocks.IRON_BLOCK), 6); + HarvestRegistry.registerRangeAmplifier(Blocks.DIAMOND_BLOCK.getDefaultState(), 15); + HarvestRegistry.registerRangeAmplifier(Blocks.GOLD_BLOCK.getDefaultState(), 10); + HarvestRegistry.registerRangeAmplifier(Blocks.IRON_BLOCK.getDefaultState(), 6); HarvestRegistry.registerHandler(new HarvestHandlerPlantable()); HarvestRegistry.registerHandler(new HarvestHandlerTall()); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index ec6650f1..63036470 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -1,14 +1,23 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.iface.IHarvestHandler; -import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.ritual.harvest.IHarvestHandler; +import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; import WayofTime.bloodmagic.ritual.data.*; +import com.google.common.collect.Lists; +import net.minecraft.block.state.IBlockState; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import java.util.ArrayList; +import java.util.List; /** * This ritual uses registered {@link IHarvestHandler}'s to harvest blocks. @@ -18,7 +27,7 @@ import java.util.ArrayList; *

* This ritual includes a way to change the range based on what block is above * the MasterRitualStone. You can use - * {@link HarvestRegistry#registerRangeAmplifier(BlockStack, int)} to register a + * {@link HarvestRegistry#registerRangeAmplifier(net.minecraft.block.state.IBlockState, int)} to register a * new amplifier. */ public class RitualHarvest extends Ritual { @@ -47,7 +56,7 @@ public class RitualHarvest extends Ritual { harvestArea.resetIterator(); while (harvestArea.hasNext()) { BlockPos nextPos = harvestArea.next().add(pos); - if (harvestBlock(world, nextPos)) { + if (harvestBlock(world, nextPos, masterRitualStone.getBlockPos())) { harvested++; } } @@ -102,12 +111,34 @@ public class RitualHarvest extends Ritual { return new RitualHarvest(); } - public static boolean harvestBlock(World world, BlockPos pos) { - BlockStack harvestStack = BlockStack.getStackFromPos(world, pos); + public static boolean harvestBlock(World world, BlockPos cropPos, BlockPos controllerPos) { + IBlockState harvestState = world.getBlockState(cropPos); + TileEntity potentialInventory = world.getTileEntity(controllerPos.up()); + IItemHandler itemHandler = null; + if (potentialInventory != null && potentialInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) + itemHandler = potentialInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); - for (IHarvestHandler handler : HarvestRegistry.getHandlerList()) - if (handler.harvestAndPlant(world, pos, harvestStack)) - return true; + for (IHarvestHandler handler : HarvestRegistry.getHarvestHandlers()) { + if (handler.test(world, cropPos, harvestState)) { + List drops = Lists.newArrayList(); + if (handler.harvest(world, cropPos, harvestState, drops)) { + for (ItemStack stack : drops) { + if (stack.isEmpty()) + continue; + + // TODO I wrote this, but didn't actually think about whether it should be a thing. Remove the true if we want to keep it + if (itemHandler == null || true) + InventoryHelper.spawnItemStack(world, cropPos.getX(), cropPos.getY(), cropPos.getZ(), stack); + else { + ItemStack remainder = ItemHandlerHelper.insertItemStacked(itemHandler, stack, false); + if (!remainder.isEmpty()) + InventoryHelper.spawnItemStack(world, cropPos.getX(), cropPos.getY(), cropPos.getZ(), remainder); + } + } + return true; + } + } + } return false; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index e6f600ed..38a405f9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -1,21 +1,18 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.iface.IHarvestHandler; -import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -25,10 +22,10 @@ import java.util.List; /** * Harvest handler for standard plantable crops such as Wheat, Potatoes, and * Netherwart.
- * Register a new crop for this handler with - * {@link HarvestRegistry#registerStandardCrop(Block, int)} + * Register a new crop for this handler with {@link HarvestRegistry#registerStandardCrop(Block, int)} */ public class HarvestHandlerPlantable implements IHarvestHandler { + public HarvestHandlerPlantable() { HarvestRegistry.registerStandardCrop(Blocks.CARROTS, 7); HarvestRegistry.registerStandardCrop(Blocks.WHEAT, 7); @@ -54,19 +51,12 @@ public class HarvestHandlerPlantable implements IHarvestHandler { } @Override - public boolean harvestAndPlant(World world, BlockPos pos, BlockStack blockStack) { - if (!HarvestRegistry.getStandardCrops().containsKey(blockStack.getBlock())) - return false; - - int matureMeta = HarvestRegistry.getStandardCrops().get(blockStack.getBlock()); - - if (blockStack.getMeta() < matureMeta) - return false; - - List drops = blockStack.getBlock().getDrops(world, pos, blockStack.getState(), 0); + public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { + NonNullList blockDrops = NonNullList.create(); + state.getBlock().getDrops(blockDrops, world, pos, state, 0); boolean foundSeed = false; - for (ItemStack stack : drops) { + for (ItemStack stack : blockDrops) { if (stack.isEmpty()) continue; @@ -78,16 +68,13 @@ public class HarvestHandlerPlantable implements IHarvestHandler { } if (foundSeed) { - world.setBlockState(pos, blockStack.getBlock().getDefaultState()); - world.playEvent(2001, pos, Block.getStateId(blockStack.getState())); - for (ItemStack stack : drops) { + world.setBlockState(pos, state.getBlock().getDefaultState()); + world.playEvent(2001, pos, Block.getStateId(state)); + for (ItemStack stack : blockDrops) { if (stack.isEmpty()) continue; - if (!world.isRemote) { - EntityItem toDrop = new EntityItem(world, pos.getX(), pos.getY() + 0.5, pos.getZ(), stack); - world.spawnEntity(toDrop); - } + drops.add(stack); } return true; @@ -96,6 +83,11 @@ public class HarvestHandlerPlantable implements IHarvestHandler { return false; } + @Override + public boolean test(World world, BlockPos pos, IBlockState state) { + return HarvestRegistry.getStandardCrops().containsKey(state.getBlock()) && state.getBlock().getMetaFromState(state) == HarvestRegistry.getStandardCrops().get(state.getBlock()); + } + private static void addThirdPartyCrop(String modid, String regName, int matureMeta) { if (!Loader.isModLoaded(modid)) return; @@ -110,19 +102,19 @@ public class HarvestHandlerPlantable implements IHarvestHandler { return; try { - ClassLoader loader = HarvestHandlerPlantable.class.getClassLoader(); - String className = "com.pam.harvestcraft.blocks.CropRegistry"; - Class registry = ReflectionHelper.getClass(loader, className); - Field names = ReflectionHelper.findField(registry, "cropNames"); - Method getCrop = registry.getMethod("getCrop", String.class); + Class pamRegistry = Class.forName("com.pam.harvestcraft.blocks.CropRegistry"); + Field names = pamRegistry.getDeclaredField("cropNames"); + Method getCrop = pamRegistry.getMethod("getCrop", String.class); for (String name : (String[]) names.get(null)) { BlockCrops crop = (BlockCrops) getCrop.invoke(null, name); HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); } - } catch (NoSuchMethodException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; unable to find crop name mapper"); + } catch (ClassNotFoundException e) { + BMLog.DEFAULT.error("HarvestCraft integration cancelled; unable to find registry class"); + } catch (NoSuchMethodException | NoSuchFieldException e) { + BMLog.DEFAULT.error("HarvestCraft integration cancelled; unable to find crop name mapper"); } catch (IllegalAccessException | InvocationTargetException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); + BMLog.DEFAULT.error("HarvestCraft integration cancelled; crop name lookup broke"); } } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 79aa7dbd..2e7bb2fd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,62 +1,55 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.iface.IHarvestHandler; -import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import net.minecraft.block.BlockPumpkin; import net.minecraft.block.BlockStem; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; import java.util.List; /** - * Harvest handler for crops with stems such as Pumpkins and Melons. - * {@link OreDictionary#WILDCARD_VALUE} is used as a wildcard to allow the crop - * to be harvested at any metadata. Rotation based crop blocks are a good reason + * Harvest handler for crops with stems such as Pumpkins and Melons. Rotation based crop blocks are a good reason * to use this (see pumpkins).
* Register a new crop for this handler with - * {@link HarvestRegistry#registerStemCrop(BlockStack, BlockStack)} + * {@link HarvestRegistry#registerStemCrop(IBlockState, IBlockState)} */ public class HarvestHandlerStem implements IHarvestHandler { + public HarvestHandlerStem() { - HarvestRegistry.registerStemCrop(new BlockStack(Blocks.PUMPKIN, OreDictionary.WILDCARD_VALUE), new BlockStack(Blocks.PUMPKIN_STEM, 7)); - HarvestRegistry.registerStemCrop(new BlockStack(Blocks.MELON_BLOCK), new BlockStack(Blocks.MELON_STEM, 7)); + for (EnumFacing facing : EnumFacing.HORIZONTALS) + HarvestRegistry.registerStemCrop(Blocks.PUMPKIN.getDefaultState().withProperty(BlockPumpkin.FACING, facing), Blocks.PUMPKIN_STEM.getDefaultState().withProperty(BlockStem.AGE, 7)); + + HarvestRegistry.registerStemCrop(Blocks.MELON_BLOCK.getDefaultState(), Blocks.MELON_STEM.getDefaultState().withProperty(BlockStem.AGE, 7)); } @Override - public boolean harvestAndPlant(World world, BlockPos pos, BlockStack blockStack) { - boolean retFlag = false; - List drops = new ArrayList<>(); - BlockPos cropPos = pos; - if (HarvestRegistry.getStemCrops().containsKey(blockStack)) { - EnumFacing cropDir = blockStack.getBlock().getActualState(blockStack.getState(), world, pos).getValue(BlockStem.FACING); + public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { + EnumFacing cropDir = state.getBlock().getActualState(state, world, pos).getValue(BlockStem.FACING); - if (cropDir != EnumFacing.UP) { - cropPos = pos.offset(cropDir); - BlockStack probableCrop = BlockStack.getStackFromPos(world, cropPos); - BlockStack regCrop = HarvestRegistry.getStemCrops().get(blockStack); + if (cropDir != EnumFacing.UP) { + BlockPos cropPos = pos.offset(cropDir); + IBlockState probableCrop = world.getBlockState(cropPos); + IBlockState registeredCrop = HarvestRegistry.getStemCrops().get(state); - if ((regCrop.getMeta() == OreDictionary.WILDCARD_VALUE && regCrop.getBlock() == probableCrop.getBlock()) || regCrop.equals(probableCrop)) { - drops = probableCrop.getBlock().getDrops(world, cropPos, probableCrop.getState(), 0); - world.destroyBlock(cropPos, false); - retFlag = true; - } + if (registeredCrop == probableCrop) { + NonNullList blockDrops = NonNullList.create(); + probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0); + drops.addAll(blockDrops); + world.destroyBlock(cropPos, false); + return true; } } - if (!world.isRemote) { - for (ItemStack drop : drops) { - EntityItem item = new EntityItem(world, cropPos.getX(), cropPos.getY() + 0.5, cropPos.getZ(), drop); - world.spawnEntity(item); - } - } + return false; + } - return retFlag; + @Override + public boolean test(World world, BlockPos pos, IBlockState state) { + return HarvestRegistry.getStemCrops().containsKey(state); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index a9f11698..544a3d83 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,49 +1,46 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.iface.IHarvestHandler; -import WayofTime.bloodmagic.core.registry.HarvestRegistry; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.block.BlockCactus; +import net.minecraft.block.BlockReed; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; /** * Harvest handler for crops that grow vertically such as Sugar Cane and Cactus.
* Register a new crop for this handler with - * {@link HarvestRegistry#registerTallCrop(BlockStack)} + * {@link HarvestRegistry#registerTallCrop(IBlockState)} */ public class HarvestHandlerTall implements IHarvestHandler { + public HarvestHandlerTall() { - HarvestRegistry.registerTallCrop(new BlockStack(Blocks.REEDS)); - HarvestRegistry.registerTallCrop(new BlockStack(Blocks.CACTUS)); + for (int i = 0; i < 15; i++) { + HarvestRegistry.registerTallCrop(Blocks.REEDS.getDefaultState().withProperty(BlockReed.AGE, i)); + HarvestRegistry.registerTallCrop(Blocks.CACTUS.getDefaultState().withProperty(BlockCactus.AGE, i)); + } } @Override - public boolean harvestAndPlant(World world, BlockPos pos, BlockStack blockStack) { - boolean retFlag = false; - - List drops = new ArrayList<>(); - if (HarvestRegistry.getTallCrops().contains(blockStack)) { - BlockStack up = BlockStack.getStackFromPos(world, pos.up()); - if (up.equals(blockStack)) { - drops = up.getBlock().getDrops(world, pos.up(), up.getState(), 0); - world.destroyBlock(pos.up(), false); - retFlag = true; - } + public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { + IBlockState up = world.getBlockState(pos.up()); + if (up.getBlock() == state.getBlock()) { + NonNullList blockDrops = NonNullList.create(); + up.getBlock().getDrops(blockDrops, world, pos.up(), up, 0); + drops.addAll(blockDrops); + world.destroyBlock(pos.up(), false); + return true; } - if (!world.isRemote) { - for (ItemStack drop : drops) { - EntityItem item = new EntityItem(world, pos.getX(), pos.getY() + 0.5, pos.getZ(), drop); - world.spawnEntity(item); - } - } + return false; + } - return retFlag; + @Override + public boolean test(World world, BlockPos pos, IBlockState state) { + return HarvestRegistry.getTallCrops().contains(state); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java new file mode 100644 index 00000000..c5deba16 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java @@ -0,0 +1,105 @@ +package WayofTime.bloodmagic.ritual.harvest; + +import com.google.common.collect.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockStem; +import net.minecraft.block.state.IBlockState; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class HarvestRegistry { + + private static final List HARVEST_HANDLERS = Lists.newArrayList(); + private static final Map STANDARD_CROPS = Maps.newHashMap(); + private static final Set TALL_CROPS = Sets.newHashSet(); + private static final Map STEM_CROPS = Maps.newHashMap(); + private static final Map AMPLIFIERS = Maps.newHashMap(); + + /** + * Registers a handler for the Harvest Ritual to call. + * + * @param handler - The custom handler to register + */ + public static void registerHandler(IHarvestHandler handler) { + if (!HARVEST_HANDLERS.contains(handler)) + HARVEST_HANDLERS.add(handler); + } + + /** + * Registers a standard crop (IE: Wheat, Carrots, Potatoes, Netherwart, etc) + * for the + * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable} + * handler to handle. + * + * @param crop - The crop block to handle. + * @param matureMeta - The meta value at which the crop is considered mature and ready + * to be harvested. + */ + public static void registerStandardCrop(Block crop, int matureMeta) { + if (!STANDARD_CROPS.containsKey(crop)) + STANDARD_CROPS.put(crop, matureMeta); + } + + /** + * Registers a tall crop (Sugar Cane and Cactus) for the + * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall} handler to + * handle. + * + * @param crop - The crop block to handle. + */ + public static void registerTallCrop(IBlockState crop) { + if (!TALL_CROPS.contains(crop)) + TALL_CROPS.add(crop); + } + + /** + * Registers a stem crop (Melon and Pumpkin) for the + * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem} handler to + * handle. + *

+ * Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to + * accept any meta for the crop block. + *

+ * The Stem must be instanceof {@link BlockStem} + * + * @param crop - The crop block to handle. + * @param stem - The stem of the crop + */ + public static void registerStemCrop(IBlockState crop, IBlockState stem) { + if (!STEM_CROPS.containsKey(crop) && stem.getBlock() instanceof BlockStem) + STEM_CROPS.put(stem, crop); + } + + /** + * Registers a range amplifier for the Harvest Ritual. + * + * @param block - The block for the amplifier. + * @param range - The range the amplifier provides. + */ + public static void registerRangeAmplifier(IBlockState block, int range) { + if (!AMPLIFIERS.containsKey(block)) + AMPLIFIERS.put(block, range); + } + + public static List getHarvestHandlers() { + return ImmutableList.copyOf(HARVEST_HANDLERS); + } + + public static Map getStandardCrops() { + return ImmutableMap.copyOf(STANDARD_CROPS); + } + + public static Set getTallCrops() { + return ImmutableSet.copyOf(TALL_CROPS); + } + + public static Map getStemCrops() { + return ImmutableMap.copyOf(STEM_CROPS); + } + + public static Map getAmplifiers() { + return ImmutableMap.copyOf(AMPLIFIERS); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java new file mode 100644 index 00000000..b8b49316 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java @@ -0,0 +1,37 @@ +package WayofTime.bloodmagic.ritual.harvest; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.List; + +/** + * Used to define a HarvestHandler for the Harvest Ritual. + */ +public interface IHarvestHandler { + + /** + * Called whenever the Harvest Ritual attempts to harvest a block.
+ * Use this to break the block and plant a new one.
+ * Add the items to be dropped to the drops list.
+ * + * @param world - The world + * @param pos - The position of the {@link IBlockState} being checked + * @param state - The {@link IBlockState} being checked + * @param drops - The items to be dropped + * @return If the block was successfully harvested. + */ + boolean harvest(World world, BlockPos pos, IBlockState state, List drops); + + /** + * Tests to see if the block is valid for harvest. + * + * @param world The world + * @param pos The position in the world of the {@link IBlockState} being checked + * @param state The {@link IBlockState} being checked + * @return if this block is valid for harvest. + */ + boolean test(World world, BlockPos pos, IBlockState state); +} From 81ad9bf76472ded54c43a4da421b2dc33be2ef11 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 3 Mar 2018 19:17:06 -0800 Subject: [PATCH 120/493] Cleaner fuel handling --- .../bloodmagic/util/handler/event/CraftingHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 119e96a2..c1456262 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -143,7 +143,7 @@ public class CraftingHandler { @SubscribeEvent public static void handleFuelLevel(FurnaceFuelBurnTimeEvent event) { - if (event.getItemStack().getItem() == RegistrarBloodMagicItems.COMPONENT && event.getItemStack().getMetadata() == ComponentTypes.SAND_COAL.ordinal()) + if (ItemStack.areItemsEqual(event.getItemStack(), ComponentTypes.SAND_COAL.getStack())) event.setBurnTime(TileEntityFurnace.getItemBurnTime(new ItemStack(Items.COAL))); } } From e2f7772e82352d7c6478c8c256aef0e595f4496d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 4 Mar 2018 09:29:19 -0500 Subject: [PATCH 121/493] Improved the Ellipsoid effect. --- .../bloodmagic/ritual/RitualEllipsoid.java | 127 +++++++++++------- .../assets/bloodmagic/lang/en_US.lang | 5 +- 2 files changed, 84 insertions(+), 48 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java index cc62e700..1fb6b7d1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java @@ -1,29 +1,30 @@ package WayofTime.bloodmagic.ritual; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; -import WayofTime.bloodmagic.util.Utils; +import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; - -import javax.annotation.Nullable; - -import java.util.ArrayList; -import java.util.Iterator; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.util.Utils; public class RitualEllipsoid extends Ritual { -// public static final String FELLING_RANGE = "fellingRange"; + public static final String SPHEROID_RANGE = "spheroidRange"; public static final String CHEST_RANGE = "chest"; private boolean cached = false; @@ -32,10 +33,10 @@ public class RitualEllipsoid extends Ritual public RitualEllipsoid() { super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual"); -// addBlockRange(FELLING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -3, -10), new BlockPos(11, 27, 11))); + addBlockRange(SPHEROID_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), new BlockPos(11, 11, 11))); addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); -// setMaximumVolumeAndDistanceOfRange(FELLING_RANGE, 14000, 15, 30); + setMaximumVolumeAndDistanceOfRange(SPHEROID_RANGE, 0, 32, 32); setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); } @@ -55,75 +56,107 @@ public class RitualEllipsoid extends Ritual return; } + AreaDescriptor sphereRange = getBlockRange(SPHEROID_RANGE); + AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos); + int minX = (int) (masterPos.getX() - sphereBB.minX); + int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1; + int minY = (int) (masterPos.getY() - sphereBB.minY); + int maxY = (int) (sphereBB.maxY - masterPos.getY()) - 1; + int minZ = (int) (masterPos.getZ() - sphereBB.minZ); + int maxZ = (int) (sphereBB.maxZ - masterPos.getZ()) - 1; + if (tileInventory != null) { - IItemHandler inventory = Utils.getInventory(tileInventory, EnumFacing.DOWN); - int numSlots = inventory.getSlots(); - if (numSlots >= 3) + if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - ItemStack xStack = inventory.getStackInSlot(0); - ItemStack yStack = inventory.getStackInSlot(1); - ItemStack zStack = inventory.getStackInSlot(2); + IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); - if (xStack.isEmpty() || yStack.isEmpty() || zStack.isEmpty()) + if (itemHandler.getSlots() <= 0) { return; } - int xR = xStack.getCount(); - int yR = yStack.getCount(); - int zR = zStack.getCount(); + int blockSlot = -1; + for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) + { + ItemStack stack = itemHandler.extractItem(invSlot, 1, true); + if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock)) + continue; - int j = -yR; - int i = -xR; - int k = -zR; + blockSlot = invSlot; + break; + } + + if (blockSlot == -1) + { + return; + } + + int xR = Math.max(maxX, minX); + int yR = Math.max(maxY, minY); + int zR = Math.max(maxZ, minZ); + + int j = -minX; + int i = -minY; + int k = -minZ; if (currentPos != null) { j = currentPos.getY(); - i = Math.min(xR, Math.max(-xR, currentPos.getX())); - k = Math.min(zR, Math.max(-zR, currentPos.getZ())); + i = Math.min(xR, Math.max(-minX, currentPos.getX())); + k = Math.min(zR, Math.max(-minZ, currentPos.getZ())); } + int checks = 0; + int maxChecks = 100; - while (j <= yR) + while (j <= maxY) { - while (i <= xR) + while (i <= maxX) { - while (k <= zR) + while (k <= maxZ) { + checks++; + if (checks >= maxChecks) + { + this.currentPos = new BlockPos(i, j, k); + return; + } + if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) { BlockPos newPos = masterPos.add(i, j, k); - - if (world.isAirBlock(newPos)) +// + if (!world.getBlockState(newPos).getBlock().isReplaceable(world, newPos)) { - if (j > 0) - { - world.setBlockState(newPos, Blocks.GLASS.getDefaultState()); - } else - { - world.setBlockState(newPos, Blocks.STONE.getDefaultState()); - } k++; - this.currentPos = new BlockPos(i, j, k); - return; + continue; } + + IBlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(blockSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(blockSlot).getItemDamage()); + world.setBlockState(newPos, placeState); + + itemHandler.extractItem(blockSlot, 1, false); + tileInventory.markDirty(); + //TODO: + masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + k++; + this.currentPos = new BlockPos(i, j, k); + return; } k++; } i++; - k = -zR; + k = -minZ; } j++; - i = -xR; + i = -minX; this.currentPos = new BlockPos(i, j, k); return; } - j = -yR; + j = -minY; this.currentPos = new BlockPos(i, j, k); return; - } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 00a7151a..a218e51f 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -605,7 +605,7 @@ ritual.bloodmagic.animalGrowthRitual=Ritual of the Shepherd ritual.bloodmagic.forsakenSoulRitual=Gathering of the Forsaken Souls ritual.bloodmagic.crystalHarvestRitual=Crack of the Fractured Crystal ritual.bloodmagic.meteorRitual=Mark of the Falling Tower - +ritual.bloodmagic.ellipseRitual=Focus of the Ellipsoid ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius ritual.bloodmagic.placerRitual=Laying of the Filler ritual.bloodmagic.fellingRitual=Crash of the Timberman @@ -713,6 +713,9 @@ ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in th ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. +ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated. +ritual.bloodmagic.ellipseRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. + ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down. From 986852e2658d55acd6f3e8690458f738021f14fa Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 4 Mar 2018 09:36:03 -0500 Subject: [PATCH 122/493] Added the ability to set the array to no longer drop its ingredients. - I need to just change all of the files to my format, so Nut doesn't cry each push. --- .../bloodmagic/tile/TileAlchemyArray.java | 116 ++++++++++++------ 1 file changed, 81 insertions(+), 35 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 2ee25431..03454b0c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,61 +1,78 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; -import WayofTime.bloodmagic.iface.IAlchemyArray; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.iface.IAlchemyArray; +import WayofTime.bloodmagic.util.Constants; -public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray { +public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray +{ public boolean isActive = false; public int activeCounter = 0; public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; private String key = "empty"; private AlchemyArrayEffect arrayEffect; + private boolean doDropIngredients = true; - public TileAlchemyArray() { + public TileAlchemyArray() + { super(2, "alchemyArray"); } - public void onEntityCollidedWithBlock(IBlockState state, Entity entity) { - if (arrayEffect != null) { + public void onEntityCollidedWithBlock(IBlockState state, Entity entity) + { + if (arrayEffect != null) + { arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity); } } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(NBTTagCompound tagCompound) + { super.deserialize(tagCompound); this.isActive = tagCompound.getBoolean("isActive"); this.activeCounter = tagCompound.getInteger("activeCounter"); this.key = tagCompound.getString("key"); + if (!tagCompound.hasKey("doDropIngredients")) //Check if the array is old + { + this.doDropIngredients = true; + } else + { + this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); + } this.rotation = EnumFacing.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; NBTTagCompound arrayTag = tagCompound.getCompoundTag("arrayTag"); arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); - if (arrayEffect != null) { + if (arrayEffect != null) + { arrayEffect.readFromNBT(arrayTag); } } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public NBTTagCompound serialize(NBTTagCompound tagCompound) + { super.serialize(tagCompound); tagCompound.setBoolean("isActive", isActive); tagCompound.setInteger("activeCounter", activeCounter); tagCompound.setString("key", "".equals(key) ? "empty" : key); + tagCompound.setBoolean("doDropIngredients", doDropIngredients); tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); NBTTagCompound arrayTag = new NBTTagCompound(); - if (arrayEffect != null) { + if (arrayEffect != null) + { arrayEffect.writeToNBT(arrayTag); } tagCompound.setTag("arrayTag", arrayTag); @@ -64,16 +81,27 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } @Override - public int getInventoryStackLimit() { + public int getInventoryStackLimit() + { return 1; } + //Use this to prevent the Array from dropping items - useful for arrays that need to "consume" ingredients well before the effect. + public void setItemDrop(boolean dropItems) + { + this.doDropIngredients = dropItems; + } + @Override - public void update() { - if (isActive && attemptCraft()) { + public void update() + { + if (isActive && attemptCraft()) + { activeCounter++; - } else { + } else + { isActive = false; + doDropIngredients = true; activeCounter = 0; arrayEffect = null; key = "empty"; @@ -84,49 +112,65 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche * This occurs when the block is destroyed. */ @Override - public void dropItems() { - super.dropItems(); - if (arrayEffect != null) { + public void dropItems() + { + if (!doDropIngredients) + { + super.dropItems(); + } + if (arrayEffect != null) + { } } - public boolean attemptCraft() { + public boolean attemptCraft() + { AlchemyArrayEffect effect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(this.getStackInSlot(0), this.getStackInSlot(1)); - if (effect != null) { - if (arrayEffect == null) { + if (effect != null) + { + if (arrayEffect == null) + { arrayEffect = effect; key = effect.getKey(); - } else { + } else + { String effectKey = effect.getKey(); - if (effectKey.equals(key)) { + if (effectKey.equals(key)) + { //Good! Moving on. - } else { + } else + { //Something has changed, therefore we have to move our stuffs. //TODO: Add an AlchemyArrayEffect.onBreak(); ? arrayEffect = effect; key = effect.getKey(); } } - } else { + } else + { RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(getStackInSlot(0), getStackInSlot(1)); if (recipe == null) return false; AlchemyArrayEffect newEffect = new AlchemyArrayEffectCraftingNew(recipe); - if (arrayEffect == null) { + if (arrayEffect == null) + { arrayEffect = newEffect; key = newEffect.key; - } else if (!newEffect.key.equals(key)) { + } else if (!newEffect.key.equals(key)) + { arrayEffect = newEffect; key = newEffect.key; } } - if (arrayEffect != null) { + if (arrayEffect != null) + { isActive = true; - if (arrayEffect.update(this, this.activeCounter)) { + if (arrayEffect.update(this, this.activeCounter)) + { this.decrStackSize(0, 1); this.decrStackSize(1, 1); this.getWorld().setBlockToAir(getPos()); @@ -139,11 +183,13 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } @Override - public EnumFacing getRotation() { + public EnumFacing getRotation() + { return rotation; } - public void setRotation(EnumFacing rotation) { + public void setRotation(EnumFacing rotation) + { this.rotation = rotation; } } From 3f5178dd6a0fde802447848b35a85c4ada567c92 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 4 Mar 2018 09:17:23 -0800 Subject: [PATCH 123/493] A bit of Ritual cleanup Slowly getting rid of these BlockStack references. Slowly moving towards a proper "API" in our internals. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 2 +- .../block/BlockDimensionalPortal.java | 2 +- .../block/BlockRitualController.java | 18 ++-- .../bloodmagic/block/BlockRitualStone.java | 4 +- .../compat/guideapi/book/CategoryRitual.java | 2 +- .../DataProviderRitualController.java | 8 +- .../core/RegistrarBloodMagicRecipes.java | 2 +- .../bloodmagic/event/RitualEvent.java | 8 +- .../bloodmagic/item/ItemInscriptionTool.java | 2 +- .../bloodmagic/item/ItemRitualDiviner.java | 23 +++-- .../bloodmagic/item/ItemRitualReader.java | 4 +- .../bloodmagic/proxy/CommonProxy.java | 4 +- .../bloodmagic/registry/ModRituals.java | 19 ++--- .../ritual/{data => }/AreaDescriptor.java | 2 +- .../ritual/{data => }/CapabilityRuneType.java | 2 +- .../{data => }/EnumRitualReaderState.java | 2 +- .../ritual/{data => }/EnumRuneType.java | 2 +- .../ritual/{data => }/IMasterRitualStone.java | 2 +- .../ritual/{data => }/IRitualStone.java | 2 +- .../bloodmagic/ritual/{data => }/Ritual.java | 23 ++--- .../ritual/{data => }/RitualComponent.java | 2 +- .../registry => ritual}/RitualRegistry.java | 10 ++- .../ritual/{data => }/RitualRenderer.java | 2 +- .../imperfect/IImperfectRitualStone.java | 2 +- .../{data => }/imperfect/ImperfectRitual.java | 42 +++++----- .../imperfect}/ImperfectRitualRegistry.java | 11 +-- .../{data => }/imperfect/package-info.java | 2 +- .../{ => types}/RitualAltarBuilder.java | 17 ++-- .../{ => types}/RitualAnimalGrowth.java | 14 ++-- .../{ => types}/RitualArmourEvolve.java | 26 +++--- .../ritual/{ => types}/RitualCobblestone.java | 15 ++-- .../ritual/{ => types}/RitualContainment.java | 20 ++--- .../ritual/{ => types}/RitualCrushing.java | 18 ++-- .../{ => types}/RitualCrystalHarvest.java | 30 +++---- .../ritual/{ => types}/RitualEllipsoid.java | 23 ++--- .../ritual/{ => types}/RitualExpulsion.java | 83 +++++++++---------- .../{ => types}/RitualFeatheredKnife.java | 25 +++--- .../ritual/{ => types}/RitualFelling.java | 11 +-- .../{ => types}/RitualForsakenSoul.java | 28 +++---- .../ritual/{ => types}/RitualFullStomach.java | 21 ++--- .../ritual/{ => types}/RitualGreenGrove.java | 15 ++-- .../ritual/{ => types}/RitualHarvest.java | 11 +-- .../{ => types}/RitualInterdiction.java | 16 ++-- .../ritual/{ => types}/RitualJumping.java | 13 +-- .../ritual/{ => types}/RitualLava.java | 13 +-- .../RitualLivingArmourDowngrade.java | 69 +++++++-------- .../ritual/{ => types}/RitualMagnetic.java | 20 ++--- .../ritual/{ => types}/RitualMeteor.java | 49 +++++------ .../ritual/{ => types}/RitualPlacer.java | 12 +-- .../ritual/{ => types}/RitualPortal.java | 18 ++-- .../ritual/{ => types}/RitualPump.java | 11 +-- .../{ => types}/RitualRegeneration.java | 21 ++--- .../ritual/{ => types}/RitualSpeed.java | 21 ++--- .../ritual/{ => types}/RitualSuppression.java | 30 +++---- .../{ => types}/RitualUpgradeRemove.java | 27 +++--- .../ritual/{ => types}/RitualWater.java | 14 ++-- .../{ => types}/RitualWellOfSuffering.java | 25 +++--- .../ritual/{ => types}/RitualZephyr.java | 17 ++-- .../imperfect/ImperfectRitualDay.java | 9 +- .../imperfect/ImperfectRitualNight.java | 9 +- .../imperfect/ImperfectRitualRain.java | 9 +- .../imperfect/ImperfectRitualResistance.java | 9 +- .../imperfect/ImperfectRitualZombie.java | 9 +- .../bloodmagic/structures/Dungeon.java | 2 +- .../bloodmagic/structures/DungeonRoom.java | 2 +- .../tile/TileDimensionalPortal.java | 2 +- .../tile/TileImperfectRitualStone.java | 13 +-- .../bloodmagic/tile/TileIncenseAltar.java | 2 +- .../tile/TileMasterRitualStone.java | 6 +- .../tile/TilePurificationAltar.java | 2 +- .../util/handler/event/ClientHandler.java | 15 ++-- .../bloodmagic/util/helper/RitualHelper.java | 18 ++-- 72 files changed, 450 insertions(+), 594 deletions(-) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/AreaDescriptor.java (99%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/CapabilityRuneType.java (97%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/EnumRitualReaderState.java (69%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/EnumRuneType.java (97%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/IMasterRitualStone.java (97%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/IRitualStone.java (93%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/Ritual.java (93%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/RitualComponent.java (97%) rename src/main/java/WayofTime/bloodmagic/{core/registry => ritual}/RitualRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/RitualRenderer.java (90%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/imperfect/IImperfectRitualStone.java (90%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/imperfect/ImperfectRitual.java (61%) rename src/main/java/WayofTime/bloodmagic/{core/registry => ritual/imperfect}/ImperfectRitualRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/ritual/{data => }/imperfect/package-info.java (75%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualAltarBuilder.java (96%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualAnimalGrowth.java (95%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualArmourEvolve.java (74%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualCobblestone.java (88%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualContainment.java (80%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualCrushing.java (95%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualCrystalHarvest.java (72%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualEllipsoid.java (93%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualExpulsion.java (75%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualFeatheredKnife.java (92%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualFelling.java (94%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualForsakenSoul.java (88%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualFullStomach.java (86%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualGreenGrove.java (96%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualHarvest.java (96%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualInterdiction.java (85%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualJumping.java (87%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualLava.java (97%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualLivingArmourDowngrade.java (75%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualMagnetic.java (90%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualMeteor.java (73%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualPlacer.java (94%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualPortal.java (96%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualPump.java (94%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualRegeneration.java (92%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualSpeed.java (91%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualSuppression.java (70%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualUpgradeRemove.java (84%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualWater.java (84%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualWellOfSuffering.java (85%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/RitualZephyr.java (86%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/imperfect/ImperfectRitualDay.java (61%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/imperfect/ImperfectRitualNight.java (61%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/imperfect/ImperfectRitualRain.java (68%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/imperfect/ImperfectRitualResistance.java (60%) rename src/main/java/WayofTime/bloodmagic/ritual/{ => types}/imperfect/ImperfectRitualZombie.java (76%) diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 5ff8bdc4..4581753c 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.util.helper.LogHelper; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 02df2866..8939e5f5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.block.base.BlockInteger; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index a4405cf6..756dea87 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,12 +1,11 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumRitualController; @@ -31,6 +30,7 @@ import net.minecraft.world.World; import javax.annotation.Nullable; public class BlockRitualController extends BlockEnum implements IGuideLinked { + public BlockRitualController() { super(Material.ROCK, EnumRitualController.class); @@ -67,10 +67,8 @@ public class BlockRitualController extends BlockEnum imple } } else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone) { - IBlockState determinerState = world.getBlockState(pos.up()); - BlockStack determiner = new BlockStack(determinerState.getBlock(), determinerState.getBlock().getMetaFromState(determinerState)); - - return ((TileImperfectRitualStone) tile).performRitual(world, pos, ImperfectRitualRegistry.getRitualForBlock(determiner), player); + IBlockState ritualBlock = world.getBlockState(pos.up()); + return ((TileImperfectRitualStone) tile).performRitual(world, pos, ImperfectRitualRegistry.getRitualForBlock(ritualBlock), player); } return false; @@ -115,7 +113,7 @@ public class BlockRitualController extends BlockEnum imple else return new ResourceLocation("bloodmagic", "ritual_" + mrs.getCurrentRitual().getName()); } else if (state.getValue(getProperty()).equals(EnumRitualController.IMPERFECT)) { - ImperfectRitual imperfectRitual = ImperfectRitualRegistry.getRitualForBlock(BlockStack.getStackFromPos(world, pos.up())); + ImperfectRitual imperfectRitual = ImperfectRitualRegistry.getRitualForBlock(world.getBlockState(pos.up())); if (imperfectRitual != null) return new ResourceLocation("bloodmagic", "ritual_" + imperfectRitual.getName()); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 483a10fb..905c8810 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; -import WayofTime.bloodmagic.ritual.data.IRitualStone; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.IRitualStone; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index 3d77b52c..2547591b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index f5a4b923..3e97d19f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -69,7 +69,7 @@ public class DataProviderRitualController implements IWailaDataProvider { } else { tag.setBoolean("master", false); - ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(BlockStack.getStackFromPos(world, pos.up())); + ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(world.getBlockState(pos.up())); if (ritual != null) { tag.setString("ritual", ritual.getUnlocalizedName()); tag.setBoolean("enabled", ImperfectRitualRegistry.ritualEnabled(ritual)); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 85ceebe4..dbd69d57 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; import WayofTime.bloodmagic.altar.EnumAltarTier; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.item.ItemSlate; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; diff --git a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java index bf69e5b7..a76ceb7d 100644 --- a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.event; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 70162421..67e87565 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 10b2ea3c..e6e41c4c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.event.ClientHandler; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -117,7 +118,9 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { Ritual ritual = RitualRegistry.getRitualForId(this.getCurrentRitual(stack)); if (ritual != null) { EnumFacing direction = getDirection(stack); - for (RitualComponent component : ritual.getComponents()) { + List components = Lists.newArrayList(); + ritual.gatherComponents(components); + for (RitualComponent component : components) { if (!canPlaceRitualStone(component.getRuneType(), stack)) { return false; } @@ -223,7 +226,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } else if (sneaking) { tooltip.add(TextHelper.localize(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).getName()))); tooltip.add(""); - ArrayList componentList = ritual.getComponents(); + List components = Lists.newArrayList(); + ritual.gatherComponents(components); int blankRunes = 0; int airRunes = 0; @@ -232,9 +236,9 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { int earthRunes = 0; int duskRunes = 0; int dawnRunes = 0; - int totalRunes = componentList.size(); + int totalRunes = components.size(); - for (RitualComponent component : componentList) { + for (RitualComponent component : components) { switch (component.getRuneType()) { case BLANK: blankRunes++; @@ -486,7 +490,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { return false; } - ArrayList components = ritual.getComponents(); + List components = Lists.newArrayList(); + ritual.gatherComponents(components); for (RitualComponent component : components) { if (!canPlaceRitualStone(component.getRuneType(), stack)) { return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index a718ea5b..0b203dd9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.data.EnumRitualReaderState; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.EnumRitualReaderState; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.util.helper.NBTHelper; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 34643085..6eab4d82 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.proxy; -import WayofTime.bloodmagic.ritual.data.CapabilityRuneType; -import WayofTime.bloodmagic.ritual.data.IRitualStone; +import WayofTime.bloodmagic.ritual.CapabilityRuneType; +import WayofTime.bloodmagic.ritual.IRitualStone; import WayofTime.bloodmagic.teleport.TeleportQueue; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 8582d583..e1c67c19 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,21 +1,20 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; -import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualNight; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRain; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualResistance; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualZombie; +import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualNight; +import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualRain; +import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualResistance; +import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualZombie; +import WayofTime.bloodmagic.ritual.types.*; import net.minecraft.init.Blocks; public class ModRituals diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java rename to src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java index 59248e7f..b6bcdd7d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.util.Constants; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java rename to src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java index 3ed6c7b9..c8800b94 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java similarity index 69% rename from src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java rename to src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java index 6a3e7bf8..55694e32 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; public enum EnumRitualReaderState { SET_AREA, diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java rename to src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java index 6bab1b6e..1566d5b5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index 320757ef..f6743a12 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.soul.EnumDemonWillType; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java index 00017ab0..73c0e471 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java rename to src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index fae7e240..3ae656fa 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -1,8 +1,7 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.registry.RitualRegistry; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -22,7 +21,7 @@ import java.util.Map.Entry; * {@link RitualRegistry#registerRitual(Ritual, String)} */ public abstract class Ritual { - public final ArrayList ritualComponents = new ArrayList<>(); + protected final Map modableRangeMap = new HashMap<>(); protected final Map volumeRangeMap = new HashMap<>(); protected final Map horizontalRangeMap = new HashMap<>(); @@ -262,16 +261,13 @@ public abstract class Ritual { } } - /** - * @return a list of {@link RitualComponent} for checking the ritual. - */ - public abstract ArrayList getComponents(); + public abstract void gatherComponents(List components); - public void addRune(ArrayList components, int offset1, int y, int offset2, EnumRuneType rune) { + protected final void addRune(List components, int offset1, int y, int offset2, EnumRuneType rune) { components.add(new RitualComponent(new BlockPos(offset1, y, offset2), rune)); } - public void addOffsetRunes(ArrayList components, int offset1, int offset2, int y, EnumRuneType rune) { + protected final void addOffsetRunes(List components, int offset1, int offset2, int y, EnumRuneType rune) { addRune(components, offset1, y, offset2, rune); addRune(components, offset2, y, offset1, rune); addRune(components, offset1, y, -offset2, rune); @@ -282,14 +278,14 @@ public abstract class Ritual { addRune(components, -offset2, y, -offset1, rune); } - public void addCornerRunes(ArrayList components, int offset, int y, EnumRuneType rune) { + protected final void addCornerRunes(List components, int offset, int y, EnumRuneType rune) { addRune(components, offset, y, offset, rune); addRune(components, offset, y, -offset, rune); addRune(components, -offset, y, -offset, rune); addRune(components, -offset, y, offset, rune); } - public void addParallelRunes(ArrayList components, int offset, int y, EnumRuneType rune) { + protected final void addParallelRunes(List components, int offset, int y, EnumRuneType rune) { addRune(components, offset, y, 0, rune); addRune(components, -offset, y, 0, rune); addRune(components, 0, y, -offset, rune); @@ -302,10 +298,6 @@ public abstract class Ritual { public abstract Ritual getNewCopy(); - public ArrayList getRitualComponents() { - return ritualComponents; - } - public String getName() { return name; } @@ -345,7 +337,6 @@ public abstract class Ritual { @Override public String toString() { return new ToStringBuilder(this) - .append("ritualComponents", ritualComponents) .append("name", name) .append("crystalLevel", crystalLevel) .append("activationCost", activationCost) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java rename to src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java index 25c46e62..92feb8ec 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java index b13b4614..af289560 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.core.registry; +package WayofTime.bloodmagic.ritual; -import WayofTime.bloodmagic.ritual.data.Ritual; import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import com.google.common.collect.Lists; import javax.annotation.Nullable; import java.util.*; @@ -114,7 +114,11 @@ public class RitualRegistry { lookupList.sort((o1, o2) -> { Ritual ritual1 = registry.get(o1); Ritual ritual2 = registry.get(o2); - return ritual1.getComponents().size() > ritual2.getComponents().size() ? -1 : 0; // Put earlier if bigger + List first = Lists.newArrayList(); + ritual1.gatherComponents(first); + List second = Lists.newArrayList(); + ritual2.gatherComponents(second); + return first.size() > second.size() ? -1 : 0; // Put earlier if bigger }); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java rename to src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java index 0138310b..a5df2590 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data; +package WayofTime.bloodmagic.ritual; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java index eeca00f0..205bdf87 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual.data.imperfect; +package WayofTime.bloodmagic.ritual.imperfect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java similarity index 61% rename from src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java rename to src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java index bf78aaee..dae1c461 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java @@ -1,10 +1,11 @@ -package WayofTime.bloodmagic.ritual.data.imperfect; +package WayofTime.bloodmagic.ritual.imperfect; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import java.util.function.Predicate; + /** * Abstract class for creating new imperfect rituals. ImperfectRituals need be * registered with @@ -13,26 +14,26 @@ import net.minecraft.world.World; public abstract class ImperfectRitual { private final String name; - private final BlockStack requiredBlock; + private final Predicate blockRequirement; private final int activationCost; - private final boolean lightshow; + private final boolean lightShow; private final String unlocalizedName; - public ImperfectRitual(String name, BlockStack requiredBlock, int activationCost, boolean lightshow, String unlocalizedName) { + public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, boolean lightShow, String unlocalizedName) { this.name = name; - this.requiredBlock = requiredBlock; + this.blockRequirement = blockRequirement; this.activationCost = activationCost; - this.lightshow = lightshow; + this.lightShow = lightShow; this.unlocalizedName = unlocalizedName; } /** - * @param name - The name of the ritual - * @param requiredBlock - The block required above the ImperfectRitualStone - * @param activationCost - Base LP cost for activating the ritual + * @param name The name of the ritual + * @param blockRequirement The block required above the ImperfectRitualStone + * @param activationCost Base LP cost for activating the ritual */ - public ImperfectRitual(String name, BlockStack requiredBlock, int activationCost, String unlocalizedName) { - this(name, requiredBlock, activationCost, false, unlocalizedName); + public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, String unlocalizedName) { + this(name, blockRequirement, activationCost, false, unlocalizedName); } /** @@ -49,16 +50,16 @@ public abstract class ImperfectRitual { return name; } - public BlockStack getRequiredBlock() { - return requiredBlock; + public Predicate getBlockRequirement() { + return blockRequirement; } public int getActivationCost() { return activationCost; } - public boolean isLightshow() { - return lightshow; + public boolean isLightShow() { + return lightShow; } public String getUnlocalizedName() { @@ -67,7 +68,7 @@ public abstract class ImperfectRitual { @Override public String toString() { - return getName() + ":" + getRequiredBlock().toString() + "@" + getActivationCost(); + return getName() + "@" + getActivationCost(); } @Override @@ -78,19 +79,14 @@ public abstract class ImperfectRitual { ImperfectRitual that = (ImperfectRitual) o; if (activationCost != that.activationCost) return false; - if (lightshow != that.lightshow) return false; if (name != null ? !name.equals(that.name) : that.name != null) return false; - if (requiredBlock != null ? !requiredBlock.equals(that.requiredBlock) : that.requiredBlock != null) - return false; return unlocalizedName != null ? unlocalizedName.equals(that.unlocalizedName) : that.unlocalizedName == null; } @Override public int hashCode() { int result = name != null ? name.hashCode() : 0; - result = 31 * result + (requiredBlock != null ? requiredBlock.hashCode() : 0); result = 31 * result + activationCost; - result = 31 * result + (lightshow ? 1 : 0); result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); return result; } diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java index 1cf8922a..2417a24d 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java @@ -1,11 +1,11 @@ -package WayofTime.bloodmagic.core.registry; +package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import net.minecraft.block.state.IBlockState; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -43,9 +43,10 @@ public class ImperfectRitualRegistry { registerRitual(imperfectRitual, imperfectRitual.getName()); } - public static ImperfectRitual getRitualForBlock(BlockStack blockStack) { + @Nullable + public static ImperfectRitual getRitualForBlock(IBlockState state) { for (ImperfectRitual imperfectRitual : getRegistry().values()) - if (imperfectRitual.getRequiredBlock().equals(blockStack)) + if (imperfectRitual.getBlockRequirement().test(state)) return imperfectRitual; return null; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java rename to src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java index 00a78dbb..9b848792 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.ritual.data.imperfect; +package WayofTime.bloodmagic.ritual.imperfect; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 67a8bf76..145ac180 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -1,14 +1,14 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.altar.AltarComponent; import WayofTime.bloodmagic.altar.EnumAltarComponent; import WayofTime.bloodmagic.altar.EnumAltarTier; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; @@ -27,6 +27,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; public class RitualAltarBuilder extends Ritual { private Iterator altarComponentsIterator = new ArrayList<>(EnumAltarTier.SIX.getAltarComponents()).iterator(); @@ -113,9 +114,7 @@ public class RitualAltarBuilder extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { for (int i = -12; i <= -8; i++) { addRune(components, i, -6, 13, EnumRuneType.AIR); addRune(components, i, -6, -13, EnumRuneType.FIRE); @@ -151,8 +150,6 @@ public class RitualAltarBuilder extends Ritual { for (int i = 3; i <= 5; i++) { addCornerRunes(components, 13, i, EnumRuneType.DUSK); } - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index 596d5c21..eb271087 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +18,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import java.util.ArrayList; import java.util.List; public class RitualAnimalGrowth extends Ritual { @@ -169,11 +168,10 @@ public class RitualAnimalGrowth extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); + public void gatherComponents(List components) { - this.addParallelRunes(components, 2, 0, EnumRuneType.DUSK); - this.addParallelRunes(components, 1, 0, EnumRuneType.WATER); + addParallelRunes(components, 2, 0, EnumRuneType.DUSK); + addParallelRunes(components, 1, 0, EnumRuneType.WATER); components.add(new RitualComponent(new BlockPos(1, 0, 2), EnumRuneType.EARTH)); components.add(new RitualComponent(new BlockPos(1, 0, -2), EnumRuneType.EARTH)); components.add(new RitualComponent(new BlockPos(-1, 0, 2), EnumRuneType.EARTH)); @@ -182,8 +180,6 @@ public class RitualAnimalGrowth extends Ritual { components.add(new RitualComponent(new BlockPos(2, 0, -1), EnumRuneType.AIR)); components.add(new RitualComponent(new BlockPos(-2, 0, 1), EnumRuneType.AIR)); components.add(new RitualComponent(new BlockPos(-2, 0, -1), EnumRuneType.AIR)); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index df617162..9c602679 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class RitualArmourEvolve extends Ritual { @@ -65,22 +64,19 @@ public class RitualArmourEvolve extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); + public void gatherComponents(List components) { - this.addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - this.addCornerRunes(components, 2, 0, EnumRuneType.FIRE); - this.addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); - this.addCornerRunes(components, 1, 1, EnumRuneType.DUSK); - this.addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - this.addCornerRunes(components, 1, 3, EnumRuneType.DUSK); - this.addParallelRunes(components, 1, 4, EnumRuneType.EARTH); + addCornerRunes(components, 1, 0, EnumRuneType.DUSK); + addCornerRunes(components, 2, 0, EnumRuneType.FIRE); + addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); + addCornerRunes(components, 1, 1, EnumRuneType.DUSK); + addParallelRunes(components, 4, 0, EnumRuneType.EARTH); + addCornerRunes(components, 1, 3, EnumRuneType.DUSK); + addParallelRunes(components, 1, 4, EnumRuneType.EARTH); for (int i = 0; i < 4; i++) { - this.addCornerRunes(components, 3, i, EnumRuneType.EARTH); + addCornerRunes(components, 3, i, EnumRuneType.EARTH); } - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index d20a3643..abae34aa 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; +import java.util.List; public class RitualCobblestone extends Ritual { @@ -83,13 +83,10 @@ public class RitualCobblestone extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); + public void gatherComponents(List components) { - this.addCornerRunes(components, 1, 1, EnumRuneType.FIRE); - this.addParallelRunes(components, 1, 0, EnumRuneType.WATER); - - return components; + addCornerRunes(components, 1, 1, EnumRuneType.FIRE); + addParallelRunes(components, 1, 0, EnumRuneType.WATER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java index 4691725c..b7c58ff3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java @@ -1,13 +1,13 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; +import java.util.List; public class RitualContainment extends Ritual { public static final String CONTAINMENT_RANGE = "containmentRange"; @@ -56,15 +56,11 @@ public class RitualContainment extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 1, 0, EnumRuneType.EARTH); - this.addCornerRunes(components, 2, 0, EnumRuneType.EARTH); - this.addParallelRunes(components, 1, 5, EnumRuneType.EARTH); - this.addCornerRunes(components, 2, 5, EnumRuneType.EARTH); - - return components; + public void gatherComponents(List components) { + addParallelRunes(components, 1, 0, EnumRuneType.EARTH); + addCornerRunes(components, 2, 0, EnumRuneType.EARTH); + addParallelRunes(components, 1, 5, EnumRuneType.EARTH); + addCornerRunes(components, 2, 5, EnumRuneType.EARTH); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 5dea1dbf..06d3bc1b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -1,13 +1,13 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.compress.CompressionRegistry; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -251,15 +251,11 @@ public class RitualCrushing extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 1, 0, EnumRuneType.EARTH); - this.addParallelRunes(components, 2, 0, EnumRuneType.FIRE); - this.addCornerRunes(components, 2, 0, EnumRuneType.DUSK); - this.addParallelRunes(components, 2, 1, EnumRuneType.AIR); - - return components; + public void gatherComponents(List components) { + addParallelRunes(components, 1, 0, EnumRuneType.EARTH); + addParallelRunes(components, 2, 0, EnumRuneType.FIRE); + addCornerRunes(components, 2, 0, EnumRuneType.DUSK); + addParallelRunes(components, 2, 1, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java index 6525cb0d..8eb060a1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java @@ -1,14 +1,14 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; +import java.util.List; public class RitualCrystalHarvest extends Ritual { public static final String CRYSTAL_RANGE = "crystal"; @@ -67,20 +67,16 @@ public class RitualCrystalHarvest extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); - this.addParallelRunes(components, 1, 1, EnumRuneType.DUSK); - this.addParallelRunes(components, 1, -1, EnumRuneType.FIRE); - this.addParallelRunes(components, 2, -1, EnumRuneType.FIRE); - this.addParallelRunes(components, 3, -1, EnumRuneType.FIRE); - this.addOffsetRunes(components, 3, 1, -1, EnumRuneType.FIRE); - this.addCornerRunes(components, 3, -1, EnumRuneType.EARTH); - this.addCornerRunes(components, 3, 0, EnumRuneType.EARTH); - this.addOffsetRunes(components, 3, 2, 0, EnumRuneType.DUSK); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.AIR); + addParallelRunes(components, 1, 1, EnumRuneType.DUSK); + addParallelRunes(components, 1, -1, EnumRuneType.FIRE); + addParallelRunes(components, 2, -1, EnumRuneType.FIRE); + addParallelRunes(components, 3, -1, EnumRuneType.FIRE); + addOffsetRunes(components, 3, 1, -1, EnumRuneType.FIRE); + addCornerRunes(components, 3, -1, EnumRuneType.EARTH); + addCornerRunes(components, 3, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 3, 2, 0, EnumRuneType.DUSK); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index 1fb6b7d1..631b35b7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -1,10 +1,9 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; -import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -15,12 +14,11 @@ import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.AreaDescriptor; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.RitualComponent; -import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.ritual.AreaDescriptor; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; public class RitualEllipsoid extends Ritual { @@ -217,14 +215,9 @@ public class RitualEllipsoid extends Ritual // } @Override - public ArrayList getComponents() - { - ArrayList components = new ArrayList(); - + public void gatherComponents(List components) { addCornerRunes(components, 1, 0, EnumRuneType.WATER); addCornerRunes(components, 1, 1, EnumRuneType.WATER); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java index 04ed12f4..1be8f406 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; import com.google.common.collect.Lists; import net.minecraft.block.state.IBlockState; @@ -20,7 +20,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.items.IItemHandler; -import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.UUID; @@ -190,47 +189,43 @@ public class RitualExpulsion extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 2, 0, EnumRuneType.EARTH); - this.addRune(components, 2, 0, 1, EnumRuneType.EARTH); - this.addRune(components, 1, 0, 2, EnumRuneType.EARTH); - this.addRune(components, 2, 0, -1, EnumRuneType.EARTH); - this.addRune(components, -1, 0, 2, EnumRuneType.EARTH); - this.addRune(components, -2, 0, 1, EnumRuneType.EARTH); - this.addRune(components, 1, 0, -2, EnumRuneType.EARTH); - this.addRune(components, -2, 0, -1, EnumRuneType.EARTH); - this.addRune(components, -1, 0, -2, EnumRuneType.EARTH); - this.addRune(components, 4, 0, 2, EnumRuneType.AIR); - this.addRune(components, 5, 0, 2, EnumRuneType.AIR); - this.addRune(components, 4, 0, -2, EnumRuneType.AIR); - this.addRune(components, 5, 0, -2, EnumRuneType.AIR); - this.addRune(components, -4, 0, 2, EnumRuneType.AIR); - this.addRune(components, -5, 0, 2, EnumRuneType.AIR); - this.addRune(components, -4, 0, -2, EnumRuneType.AIR); - this.addRune(components, -5, 0, -2, EnumRuneType.AIR); - this.addRune(components, 2, 0, 4, EnumRuneType.AIR); - this.addRune(components, 2, 0, 5, EnumRuneType.AIR); - this.addRune(components, -2, 0, 4, EnumRuneType.AIR); - this.addRune(components, -2, 0, 5, EnumRuneType.AIR); - this.addRune(components, 2, 0, -4, EnumRuneType.AIR); - this.addRune(components, 2, 0, -5, EnumRuneType.AIR); - this.addRune(components, -2, 0, -4, EnumRuneType.AIR); - this.addRune(components, -2, 0, -5, EnumRuneType.AIR); - this.addParallelRunes(components, 5, 0, EnumRuneType.DUSK); - this.addParallelRunes(components, 6, 0, EnumRuneType.EARTH); - this.addRune(components, -6, 0, 1, EnumRuneType.DUSK); - this.addRune(components, -6, 0, -1, EnumRuneType.DUSK); - this.addRune(components, 6, 0, 1, EnumRuneType.DUSK); - this.addRune(components, 6, 0, -1, EnumRuneType.DUSK); - this.addRune(components, 1, 0, 6, EnumRuneType.DUSK); - this.addRune(components, -1, 0, 6, EnumRuneType.DUSK); - this.addRune(components, 1, 0, -6, EnumRuneType.DUSK); - this.addRune(components, -1, 0, -6, EnumRuneType.DUSK); - this.addCornerRunes(components, 4, 0, EnumRuneType.FIRE); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 2, 0, EnumRuneType.EARTH); + addRune(components, 2, 0, 1, EnumRuneType.EARTH); + addRune(components, 1, 0, 2, EnumRuneType.EARTH); + addRune(components, 2, 0, -1, EnumRuneType.EARTH); + addRune(components, -1, 0, 2, EnumRuneType.EARTH); + addRune(components, -2, 0, 1, EnumRuneType.EARTH); + addRune(components, 1, 0, -2, EnumRuneType.EARTH); + addRune(components, -2, 0, -1, EnumRuneType.EARTH); + addRune(components, -1, 0, -2, EnumRuneType.EARTH); + addRune(components, 4, 0, 2, EnumRuneType.AIR); + addRune(components, 5, 0, 2, EnumRuneType.AIR); + addRune(components, 4, 0, -2, EnumRuneType.AIR); + addRune(components, 5, 0, -2, EnumRuneType.AIR); + addRune(components, -4, 0, 2, EnumRuneType.AIR); + addRune(components, -5, 0, 2, EnumRuneType.AIR); + addRune(components, -4, 0, -2, EnumRuneType.AIR); + addRune(components, -5, 0, -2, EnumRuneType.AIR); + addRune(components, 2, 0, 4, EnumRuneType.AIR); + addRune(components, 2, 0, 5, EnumRuneType.AIR); + addRune(components, -2, 0, 4, EnumRuneType.AIR); + addRune(components, -2, 0, 5, EnumRuneType.AIR); + addRune(components, 2, 0, -4, EnumRuneType.AIR); + addRune(components, 2, 0, -5, EnumRuneType.AIR); + addRune(components, -2, 0, -4, EnumRuneType.AIR); + addRune(components, -2, 0, -5, EnumRuneType.AIR); + addParallelRunes(components, 5, 0, EnumRuneType.DUSK); + addParallelRunes(components, 6, 0, EnumRuneType.EARTH); + addRune(components, -6, 0, 1, EnumRuneType.DUSK); + addRune(components, -6, 0, -1, EnumRuneType.DUSK); + addRune(components, 6, 0, 1, EnumRuneType.DUSK); + addRune(components, 6, 0, -1, EnumRuneType.DUSK); + addRune(components, 1, 0, 6, EnumRuneType.DUSK); + addRune(components, -1, 0, 6, EnumRuneType.DUSK); + addRune(components, 1, 0, -6, EnumRuneType.DUSK); + addRune(components, -1, 0, -6, EnumRuneType.DUSK); + addCornerRunes(components, 4, 0, EnumRuneType.FIRE); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index efa144fb..476ab93c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -1,9 +1,10 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.altar.IBloodAltar; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -11,7 +12,6 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; @@ -23,7 +23,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class RitualFeatheredKnife extends Ritual { @@ -185,18 +184,14 @@ public class RitualFeatheredKnife extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 1, 0, EnumRuneType.DUSK); - this.addParallelRunes(components, 2, -1, EnumRuneType.WATER); - this.addCornerRunes(components, 1, -1, EnumRuneType.AIR); - this.addOffsetRunes(components, 2, 4, -1, EnumRuneType.FIRE); - this.addOffsetRunes(components, 2, 4, 0, EnumRuneType.EARTH); - this.addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); - this.addCornerRunes(components, 3, 0, EnumRuneType.AIR); - - return components; + public void gatherComponents(List components) { + addParallelRunes(components, 1, 0, EnumRuneType.DUSK); + addParallelRunes(components, 2, -1, EnumRuneType.WATER); + addCornerRunes(components, 1, -1, EnumRuneType.AIR); + addOffsetRunes(components, 2, 4, -1, EnumRuneType.FIRE); + addOffsetRunes(components, 2, 4, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); + addCornerRunes(components, 3, 0, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java index c6e3112c..31813dea 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -16,6 +16,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; public class RitualFelling extends Ritual { public static final String FELLING_RANGE = "fellingRange"; @@ -85,13 +86,9 @@ public class RitualFelling extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { addCornerRunes(components, 1, 0, EnumRuneType.EARTH); addCornerRunes(components, 1, 1, EnumRuneType.EARTH); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index 402a8b40..8767e150 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; @@ -178,20 +178,16 @@ public class RitualForsakenSoul extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); - this.addParallelRunes(components, 1, -1, EnumRuneType.DUSK); - this.addParallelRunes(components, 1, 1, EnumRuneType.FIRE); - this.addParallelRunes(components, 2, 1, EnumRuneType.FIRE); - this.addParallelRunes(components, 3, 1, EnumRuneType.FIRE); - this.addOffsetRunes(components, 3, 1, 1, EnumRuneType.FIRE); - this.addCornerRunes(components, 3, 1, EnumRuneType.EARTH); - this.addCornerRunes(components, 3, 0, EnumRuneType.EARTH); - this.addOffsetRunes(components, 3, 2, 0, EnumRuneType.EARTH); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.AIR); + addParallelRunes(components, 1, -1, EnumRuneType.DUSK); + addParallelRunes(components, 1, 1, EnumRuneType.FIRE); + addParallelRunes(components, 2, 1, EnumRuneType.FIRE); + addParallelRunes(components, 3, 1, EnumRuneType.FIRE); + addOffsetRunes(components, 3, 1, 1, EnumRuneType.FIRE); + addCornerRunes(components, 3, 1, EnumRuneType.EARTH); + addCornerRunes(components, 3, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 3, 2, 0, EnumRuneType.EARTH); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java index 7bcd06e7..35fa103d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -12,7 +12,6 @@ import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import java.util.ArrayList; import java.util.List; public class RitualFullStomach extends Ritual { @@ -93,16 +92,12 @@ public class RitualFullStomach extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 3, 0, EnumRuneType.FIRE); - this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); - this.addOffsetRunes(components, 1, 2, 0, EnumRuneType.AIR); - this.addCornerRunes(components, 4, 0, EnumRuneType.WATER); - this.addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); - - return components; + public void gatherComponents(List components) { + addParallelRunes(components, 3, 0, EnumRuneType.FIRE); + addCornerRunes(components, 1, 0, EnumRuneType.AIR); + addOffsetRunes(components, 1, 2, 0, EnumRuneType.AIR); + addCornerRunes(components, 4, 0, EnumRuneType.WATER); + addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index 84089407..79f3b0f2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockFarmland; @@ -22,7 +22,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -259,13 +258,9 @@ public class RitualGreenGrove extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - this.addParallelRunes(components, 1, 0, EnumRuneType.WATER); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.EARTH); + addParallelRunes(components, 1, 0, EnumRuneType.WATER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index 63036470..c554cc83 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.IHarvestHandler; import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; -import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Lists; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.InventoryHelper; @@ -16,7 +16,6 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import java.util.ArrayList; import java.util.List; /** @@ -75,9 +74,7 @@ public class RitualHarvest extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { components.add(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.DUSK)); components.add(new RitualComponent(new BlockPos(1, 0, -1), EnumRuneType.DUSK)); components.add(new RitualComponent(new BlockPos(-1, 0, -1), EnumRuneType.DUSK)); @@ -102,8 +99,6 @@ public class RitualHarvest extends Ritual { components.add(new RitualComponent(new BlockPos(3, 0, -2), EnumRuneType.WATER)); components.add(new RitualComponent(new BlockPos(-2, 0, -3), EnumRuneType.WATER)); components.add(new RitualComponent(new BlockPos(-3, 0, -2), EnumRuneType.WATER)); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java similarity index 85% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java index 26801083..44d48d1d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java @@ -1,13 +1,13 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; +import java.util.List; public class RitualInterdiction extends Ritual { public static final String INTERDICTION_RANGE = "interdictionRange"; @@ -60,13 +60,9 @@ public class RitualInterdiction extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.AIR); - this.addParallelRunes(components, 1, 0, EnumRuneType.AIR); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.AIR); + addParallelRunes(components, 1, 0, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index 62f6f77c..f594e44b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -1,14 +1,13 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class RitualJumping extends Ritual { @@ -69,13 +68,9 @@ public class RitualJumping extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { for (int i = -1; i <= 1; i++) - this.addCornerRunes(components, 1, i, EnumRuneType.AIR); - - return components; + addCornerRunes(components, 1, i, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index 884ddf09..89e9b8ec 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -25,7 +25,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import java.util.ArrayList; import java.util.List; public class RitualLava extends Ritual { @@ -233,12 +232,8 @@ public class RitualLava extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 1, 0, EnumRuneType.FIRE); - - return components; + public void gatherComponents(List components) { + addParallelRunes(components, 1, 0, EnumRuneType.FIRE); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index 566f9019..c22915bc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.effect.EntityLightningBolt; @@ -162,46 +162,41 @@ public class RitualLivingArmourDowngrade extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addRune(components, 0, 0, -1, EnumRuneType.AIR); - this.addRune(components, 0, 0, -2, EnumRuneType.DUSK); - this.addRune(components, 0, 1, -3, EnumRuneType.DUSK); - this.addRune(components, 0, 2, -3, EnumRuneType.BLANK); - this.addRune(components, 0, 3, -3, EnumRuneType.BLANK); - this.addRune(components, 0, 1, -4, EnumRuneType.FIRE); + public void gatherComponents(List components) { + addRune(components, 0, 0, -1, EnumRuneType.AIR); + addRune(components, 0, 0, -2, EnumRuneType.DUSK); + addRune(components, 0, 1, -3, EnumRuneType.DUSK); + addRune(components, 0, 2, -3, EnumRuneType.BLANK); + addRune(components, 0, 3, -3, EnumRuneType.BLANK); + addRune(components, 0, 1, -4, EnumRuneType.FIRE); for (int i = 1; i <= 3; i++) - this.addRune(components, 0, 0, i, EnumRuneType.AIR); + addRune(components, 0, 0, i, EnumRuneType.AIR); for (int sgn = -1; sgn <= 1; sgn += 2) { - this.addRune(components, sgn, 0, 4, EnumRuneType.AIR); - this.addRune(components, sgn * 2, 0, 2, EnumRuneType.AIR); - this.addRune(components, sgn * 3, 0, 2, EnumRuneType.AIR); - this.addRune(components, sgn * 3, 0, 3, EnumRuneType.AIR); - this.addRune(components, sgn, 0, 0, EnumRuneType.EARTH); - this.addRune(components, sgn, 0, 1, EnumRuneType.EARTH); - this.addRune(components, sgn * 2, 0, -1, EnumRuneType.FIRE); - this.addRune(components, sgn * 2, 0, -2, EnumRuneType.FIRE); - this.addRune(components, sgn * 3, 0, -2, EnumRuneType.FIRE); - this.addRune(components, sgn * 3, 0, -3, EnumRuneType.FIRE); - this.addRune(components, sgn * 3, 0, -4, EnumRuneType.FIRE); - this.addRune(components, sgn, 1, -1, EnumRuneType.AIR); - this.addRune(components, sgn, 1, -2, EnumRuneType.AIR); - this.addRune(components, sgn, 1, -4, EnumRuneType.FIRE); - this.addRune(components, sgn * 2, 1, -4, EnumRuneType.FIRE); - this.addRune(components, sgn, 0, -3, EnumRuneType.EARTH); - this.addRune(components, sgn, 0, -4, EnumRuneType.EARTH); - this.addRune(components, sgn, 0, -5, EnumRuneType.EARTH); - this.addRune(components, sgn, 1, -5, EnumRuneType.EARTH); - this.addRune(components, sgn, 2, -5, EnumRuneType.EARTH); - this.addRune(components, sgn, 3, -5, EnumRuneType.EARTH); - - this.addRune(components, sgn, 3, -4, EnumRuneType.EARTH); + addRune(components, sgn, 0, 4, EnumRuneType.AIR); + addRune(components, sgn * 2, 0, 2, EnumRuneType.AIR); + addRune(components, sgn * 3, 0, 2, EnumRuneType.AIR); + addRune(components, sgn * 3, 0, 3, EnumRuneType.AIR); + addRune(components, sgn, 0, 0, EnumRuneType.EARTH); + addRune(components, sgn, 0, 1, EnumRuneType.EARTH); + addRune(components, sgn * 2, 0, -1, EnumRuneType.FIRE); + addRune(components, sgn * 2, 0, -2, EnumRuneType.FIRE); + addRune(components, sgn * 3, 0, -2, EnumRuneType.FIRE); + addRune(components, sgn * 3, 0, -3, EnumRuneType.FIRE); + addRune(components, sgn * 3, 0, -4, EnumRuneType.FIRE); + addRune(components, sgn, 1, -1, EnumRuneType.AIR); + addRune(components, sgn, 1, -2, EnumRuneType.AIR); + addRune(components, sgn, 1, -4, EnumRuneType.FIRE); + addRune(components, sgn * 2, 1, -4, EnumRuneType.FIRE); + addRune(components, sgn, 0, -3, EnumRuneType.EARTH); + addRune(components, sgn, 0, -4, EnumRuneType.EARTH); + addRune(components, sgn, 0, -5, EnumRuneType.EARTH); + addRune(components, sgn, 1, -5, EnumRuneType.EARTH); + addRune(components, sgn, 2, -5, EnumRuneType.EARTH); + addRune(components, sgn, 3, -5, EnumRuneType.EARTH); + addRune(components, sgn, 3, -4, EnumRuneType.EARTH); } - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index 86e3d325..2fc4868c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; @@ -16,8 +16,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; public class RitualMagnetic extends Ritual { @@ -135,15 +135,11 @@ public class RitualMagnetic extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - this.addParallelRunes(components, 2, 1, EnumRuneType.EARTH); - this.addCornerRunes(components, 2, 1, EnumRuneType.AIR); - this.addParallelRunes(components, 2, 2, EnumRuneType.FIRE); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.EARTH); + addParallelRunes(components, 2, 1, EnumRuneType.EARTH); + addCornerRunes(components, 2, 1, EnumRuneType.AIR); + addParallelRunes(components, 2, 2, EnumRuneType.FIRE); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java similarity index 73% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 939fd82a..95edf4ed 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -1,18 +1,17 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.meteor.Meteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; -import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class RitualMeteor extends Ritual { @@ -95,36 +94,32 @@ public class RitualMeteor extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 2, 0, EnumRuneType.FIRE); - this.addOffsetRunes(components, 3, 1, 0, EnumRuneType.AIR); - this.addOffsetRunes(components, 4, 2, 0, EnumRuneType.AIR); - this.addOffsetRunes(components, 5, 3, 0, EnumRuneType.DUSK); - this.addCornerRunes(components, 4, 0, EnumRuneType.DUSK); + public void gatherComponents(List components) { + addParallelRunes(components, 2, 0, EnumRuneType.FIRE); + addOffsetRunes(components, 3, 1, 0, EnumRuneType.AIR); + addOffsetRunes(components, 4, 2, 0, EnumRuneType.AIR); + addOffsetRunes(components, 5, 3, 0, EnumRuneType.DUSK); + addCornerRunes(components, 4, 0, EnumRuneType.DUSK); for (int i = 4; i <= 6; i++) { - this.addParallelRunes(components, 4, 0, EnumRuneType.EARTH); + addParallelRunes(components, 4, 0, EnumRuneType.EARTH); } - this.addParallelRunes(components, 8, 0, EnumRuneType.EARTH); - this.addParallelRunes(components, 8, 1, EnumRuneType.EARTH); - this.addParallelRunes(components, 7, 1, EnumRuneType.EARTH); - this.addParallelRunes(components, 7, 2, EnumRuneType.EARTH); - this.addParallelRunes(components, 6, 2, EnumRuneType.FIRE); - this.addParallelRunes(components, 6, 3, EnumRuneType.WATER); - this.addParallelRunes(components, 5, 3, EnumRuneType.WATER); - this.addParallelRunes(components, 5, 4, EnumRuneType.AIR); + addParallelRunes(components, 8, 0, EnumRuneType.EARTH); + addParallelRunes(components, 8, 1, EnumRuneType.EARTH); + addParallelRunes(components, 7, 1, EnumRuneType.EARTH); + addParallelRunes(components, 7, 2, EnumRuneType.EARTH); + addParallelRunes(components, 6, 2, EnumRuneType.FIRE); + addParallelRunes(components, 6, 3, EnumRuneType.WATER); + addParallelRunes(components, 5, 3, EnumRuneType.WATER); + addParallelRunes(components, 5, 4, EnumRuneType.AIR); - this.addOffsetRunes(components, 1, 4, 4, EnumRuneType.AIR); - this.addParallelRunes(components, 4, 4, EnumRuneType.AIR); + addOffsetRunes(components, 1, 4, 4, EnumRuneType.AIR); + addParallelRunes(components, 4, 4, EnumRuneType.AIR); - this.addOffsetRunes(components, 2, 4, 4, EnumRuneType.WATER); - this.addOffsetRunes(components, 2, 3, 4, EnumRuneType.FIRE); - this.addCornerRunes(components, 3, 4, EnumRuneType.FIRE); - - return components; + addOffsetRunes(components, 2, 4, 4, EnumRuneType.WATER); + addOffsetRunes(components, 2, 3, 4, EnumRuneType.FIRE); + addCornerRunes(components, 3, 4, EnumRuneType.FIRE); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java index 27809a91..be35f269 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; @@ -13,7 +13,7 @@ import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import java.util.ArrayList; +import java.util.List; public class RitualPlacer extends Ritual { public static final String PLACER_RANGE = "placerRange"; @@ -80,9 +80,7 @@ public class RitualPlacer extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { addRune(components, 3, 0, 3, EnumRuneType.EARTH); addRune(components, 3, 0, -3, EnumRuneType.EARTH); addRune(components, -3, 0, 3, EnumRuneType.EARTH); @@ -96,8 +94,6 @@ public class RitualPlacer extends Ritual { addRune(components, -2, 0, -3, EnumRuneType.WATER); addRune(components, -3, 0, 2, EnumRuneType.WATER); addRune(components, -3, 0, -2, EnumRuneType.WATER); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java index d62f2f64..da2c5a7d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; @@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import java.util.ArrayList; +import java.util.List; import java.util.UUID; public class RitualPortal extends Ritual { @@ -183,9 +183,7 @@ public class RitualPortal extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { addRune(components, 1, 0, 0, EnumRuneType.AIR); addRune(components, 2, 0, 0, EnumRuneType.WATER); addRune(components, -1, 0, 0, EnumRuneType.FIRE); @@ -203,8 +201,6 @@ public class RitualPortal extends Ritual { addRune(components, -2, 3, 0, EnumRuneType.FIRE); addRune(components, -2, 2, 0, EnumRuneType.EARTH); addRune(components, -2, 1, 0, EnumRuneType.DUSK); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index 1cb26be9..b61c1312 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import com.google.common.collect.Lists; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -18,7 +18,6 @@ import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper; import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -91,17 +90,13 @@ public class RitualPump extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { addRune(components, 1, 0, 1, EnumRuneType.WATER); addRune(components, 1, 0, -1, EnumRuneType.EARTH); addRune(components, -1, 0, -1, EnumRuneType.AIR); addRune(components, -1, 0, 1, EnumRuneType.FIRE); addCornerRunes(components, 1, 1, EnumRuneType.DUSK); - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index 1da5a885..c547d6b8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +14,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -153,9 +152,7 @@ public class RitualRegeneration extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - + public void gatherComponents(List components) { components.add(new RitualComponent(new BlockPos(4, 0, 0), EnumRuneType.AIR)); components.add(new RitualComponent(new BlockPos(5, 0, -1), EnumRuneType.AIR)); components.add(new RitualComponent(new BlockPos(5, 0, 1), EnumRuneType.AIR)); @@ -168,13 +165,11 @@ public class RitualRegeneration extends Ritual { components.add(new RitualComponent(new BlockPos(0, 0, -4), EnumRuneType.FIRE)); components.add(new RitualComponent(new BlockPos(1, 0, -5), EnumRuneType.FIRE)); components.add(new RitualComponent(new BlockPos(-1, 0, -5), EnumRuneType.FIRE)); - this.addOffsetRunes(components, 3, 5, 0, EnumRuneType.WATER); - this.addCornerRunes(components, 3, 0, EnumRuneType.DUSK); - this.addOffsetRunes(components, 4, 5, 0, EnumRuneType.EARTH); - this.addOffsetRunes(components, 4, 5, -1, EnumRuneType.EARTH); - this.addCornerRunes(components, 5, 0, EnumRuneType.EARTH); - - return components; + addOffsetRunes(components, 3, 5, 0, EnumRuneType.WATER); + addCornerRunes(components, 3, 0, EnumRuneType.DUSK); + addOffsetRunes(components, 4, 5, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 4, 5, -1, EnumRuneType.EARTH); + addCornerRunes(components, 5, 0, EnumRuneType.EARTH); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index 02d9fd7e..3bf3ab59 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +13,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class RitualSpeed extends Ritual { @@ -153,18 +152,14 @@ public class RitualSpeed extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addRune(components, 0, 0, -2, EnumRuneType.DUSK); - this.addRune(components, 1, 0, -1, EnumRuneType.AIR); - this.addRune(components, -1, 0, -1, EnumRuneType.AIR); + public void gatherComponents(List components) { + addRune(components, 0, 0, -2, EnumRuneType.DUSK); + addRune(components, 1, 0, -1, EnumRuneType.AIR); + addRune(components, -1, 0, -1, EnumRuneType.AIR); for (int i = 0; i < 3; i++) { - this.addRune(components, 2, 0, i, EnumRuneType.AIR); - this.addRune(components, -2, 0, i, EnumRuneType.AIR); + addRune(components, 2, 0, i, EnumRuneType.AIR); + addRune(components, -2, 0, i, EnumRuneType.AIR); } - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java similarity index 70% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java index b944c9ec..964744e8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; +import java.util.List; public class RitualSuppression extends Ritual { public static final String SUPPRESSION_RANGE = "suppressionRange"; @@ -56,20 +56,16 @@ public class RitualSuppression extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 2, 0, EnumRuneType.WATER); - this.addRune(components, -2, 0, -1, EnumRuneType.AIR); - this.addRune(components, -1, 0, -2, EnumRuneType.AIR); - this.addRune(components, -2, 0, 1, EnumRuneType.AIR); - this.addRune(components, 1, 0, -2, EnumRuneType.AIR); - this.addRune(components, 2, 0, 1, EnumRuneType.AIR); - this.addRune(components, 1, 0, 2, EnumRuneType.AIR); - this.addRune(components, 2, 0, -1, EnumRuneType.AIR); - this.addRune(components, -1, 0, 2, EnumRuneType.AIR); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 2, 0, EnumRuneType.WATER); + addRune(components, -2, 0, -1, EnumRuneType.AIR); + addRune(components, -1, 0, -2, EnumRuneType.AIR); + addRune(components, -2, 0, 1, EnumRuneType.AIR); + addRune(components, 1, 0, -2, EnumRuneType.AIR); + addRune(components, 2, 0, 1, EnumRuneType.AIR); + addRune(components, 1, 0, 2, EnumRuneType.AIR); + addRune(components, 2, 0, -1, EnumRuneType.AIR); + addRune(components, -1, 0, 2, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index 49ad448b..c504e747 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -1,13 +1,13 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.StatTracker; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; @@ -103,22 +102,18 @@ public class RitualUpgradeRemove extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - this.addCornerRunes(components, 2, 0, EnumRuneType.FIRE); - this.addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); - this.addCornerRunes(components, 1, 1, EnumRuneType.WATER); - this.addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - this.addCornerRunes(components, 1, 3, EnumRuneType.WATER); - this.addParallelRunes(components, 1, 4, EnumRuneType.AIR); + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.DUSK); + addCornerRunes(components, 2, 0, EnumRuneType.FIRE); + addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); + addCornerRunes(components, 1, 1, EnumRuneType.WATER); + addParallelRunes(components, 4, 0, EnumRuneType.EARTH); + addCornerRunes(components, 1, 3, EnumRuneType.WATER); + addParallelRunes(components, 1, 4, EnumRuneType.AIR); for (int i = 0; i < 4; i++) { - this.addCornerRunes(components, 3, i, EnumRuneType.EARTH); + addCornerRunes(components, 3, i, EnumRuneType.EARTH); } - - return components; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java index 0d784546..74867148 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; +import java.util.List; public class RitualWater extends Ritual { public static final String WATER_RANGE = "waterRange"; @@ -57,12 +57,8 @@ public class RitualWater extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.WATER); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.WATER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java similarity index 85% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 44604cc5..51cf4e4c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +14,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import java.util.ArrayList; import java.util.List; public class RitualWellOfSuffering extends Ritual { @@ -118,18 +117,14 @@ public class RitualWellOfSuffering extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addCornerRunes(components, 1, 0, EnumRuneType.FIRE); - this.addCornerRunes(components, 2, -1, EnumRuneType.FIRE); - this.addParallelRunes(components, 2, -1, EnumRuneType.EARTH); - this.addCornerRunes(components, -3, -1, EnumRuneType.DUSK); - this.addOffsetRunes(components, 2, 4, -1, EnumRuneType.WATER); - this.addOffsetRunes(components, 1, 4, 0, EnumRuneType.WATER); - this.addParallelRunes(components, 4, 1, EnumRuneType.AIR); - - return components; + public void gatherComponents(List components) { + addCornerRunes(components, 1, 0, EnumRuneType.FIRE); + addCornerRunes(components, 2, -1, EnumRuneType.FIRE); + addParallelRunes(components, 2, -1, EnumRuneType.EARTH); + addCornerRunes(components, -3, -1, EnumRuneType.DUSK); + addOffsetRunes(components, 2, 4, -1, EnumRuneType.WATER); + addOffsetRunes(components, 1, 4, 0, EnumRuneType.WATER); + addParallelRunes(components, 4, 1, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java index fc4ea91f..d4a15920 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.ritual; +package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.data.*; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -10,7 +10,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.ArrayList; import java.util.List; public class RitualZephyr extends Ritual { @@ -81,14 +80,10 @@ public class RitualZephyr extends Ritual { } @Override - public ArrayList getComponents() { - ArrayList components = new ArrayList<>(); - - this.addParallelRunes(components, 2, 0, EnumRuneType.AIR); - this.addCornerRunes(components, 1, 1, EnumRuneType.AIR); - this.addParallelRunes(components, 1, -1, EnumRuneType.AIR); - - return components; + public void gatherComponents(List components) { + addParallelRunes(components, 2, 0, EnumRuneType.AIR); + addCornerRunes(components, 1, 1, EnumRuneType.AIR); + addParallelRunes(components, 1, -1, EnumRuneType.AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java similarity index 61% rename from src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java index 2d60a7e8..8c6d4eda 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java @@ -1,15 +1,14 @@ -package WayofTime.bloodmagic.ritual.imperfect; +package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; public class ImperfectRitualDay extends ImperfectRitual { public ImperfectRitualDay() { - super("day", new BlockStack(Blocks.GOLD_BLOCK), 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.day"); + super("day", s -> s.getBlock() == Blocks.GOLD_BLOCK, 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.day"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java similarity index 61% rename from src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java index caa2bcd7..504fe1a0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java @@ -1,15 +1,14 @@ -package WayofTime.bloodmagic.ritual.imperfect; +package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; public class ImperfectRitualNight extends ImperfectRitual { public ImperfectRitualNight() { - super("night", new BlockStack(Blocks.LAPIS_BLOCK), 100, true, "ritual." + BloodMagic.MODID + ".imperfect.night"); + super("night", s -> s.getBlock() == Blocks.LAPIS_BLOCK, 100, true, "ritual." + BloodMagic.MODID + ".imperfect.night"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java similarity index 68% rename from src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java index 098c9bba..58e1ec6c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java @@ -1,15 +1,14 @@ -package WayofTime.bloodmagic.ritual.imperfect; +package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; public class ImperfectRitualRain extends ImperfectRitual { public ImperfectRitualRain() { - super("rain", new BlockStack(Blocks.WATER), 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.rain"); + super("rain", s -> s.getBlock() == Blocks.WATER, 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.rain"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java similarity index 60% rename from src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java index 1c3249db..9bb7e0de 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java @@ -1,9 +1,8 @@ -package WayofTime.bloodmagic.ritual.imperfect; +package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; @@ -11,7 +10,7 @@ import net.minecraft.potion.PotionEffect; public class ImperfectRitualResistance extends ImperfectRitual { public ImperfectRitualResistance() { - super("resistance", new BlockStack(Blocks.BEDROCK), 5000, "ritual." + BloodMagic.MODID + ".imperfect.resistance"); + super("resistance", s -> s.getBlock() == Blocks.BEDROCK, 5000, "ritual." + BloodMagic.MODID + ".imperfect.resistance"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java similarity index 76% rename from src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java rename to src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java index 4f2e34fd..4c539eb4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java @@ -1,9 +1,8 @@ -package WayofTime.bloodmagic.ritual.imperfect; +package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -12,7 +11,7 @@ import net.minecraft.potion.PotionEffect; public class ImperfectRitualZombie extends ImperfectRitual { public ImperfectRitualZombie() { - super("zombie", new BlockStack(Blocks.COAL_BLOCK), 5000, "ritual." + BloodMagic.MODID + ".imperfect.zombie"); + super("zombie", s -> s.getBlock() == Blocks.COAL_BLOCK, 5000, "ritual." + BloodMagic.MODID + ".imperfect.zombie"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index 8170946d..dab32935 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.BMLog; import net.minecraft.util.EnumFacing; import net.minecraft.util.Mirror; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index de848276..cef16685 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index 8fe0d65c..c58a02be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.ritual.RitualPortal; +import WayofTime.bloodmagic.ritual.types.RitualPortal; import WayofTime.bloodmagic.tile.base.TileBase; import com.google.common.base.Strings; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index da6ff9b0..7e8b1d12 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.base.TileBase; @@ -11,16 +11,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; + public class TileImperfectRitualStone extends TileBase implements IImperfectRitualStone { - // IImperfectRitualStone @Override - public boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player) { + public boolean performRitual(World world, BlockPos pos, @Nullable ImperfectRitual imperfectRitual, EntityPlayer player) { if (imperfectRitual != null && ImperfectRitualRegistry.ritualEnabled(imperfectRitual)) { if (!PlayerHelper.isFakePlayer(player) && !world.isRemote) { NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, imperfectRitual.getActivationCost()); if (imperfectRitual.onActivate(this, player)) { - if (imperfectRitual.isLightshow()) + if (imperfectRitual.isLightShow()) getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 125f8cca..f0da8c4a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.*; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 0bbf0441..fd8fcca1 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -4,9 +4,9 @@ import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.RitualEvent; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.helper.*; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index 88ea4e75..fdcab9f4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.iface.IPurificationAsh; -import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.helper.PurificationHelper; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index e1025a32..a63f727e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -3,9 +3,9 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.client.hud.HUDElement; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; @@ -18,6 +18,7 @@ import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import com.google.common.collect.SetMultimap; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -269,7 +270,9 @@ public class ClientHandler { double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; - for (RitualComponent ritualComponent : ritual.getComponents()) { + List components = Lists.newArrayList(); + ritual.gatherComponents(components); + for (RitualComponent ritualComponent : components) { vX = vec3.add(ritualComponent.getOffset(direction)); double minX = vX.getX() - posX; double minY = vX.getY() - posY; @@ -346,7 +349,9 @@ public class ClientHandler { double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; - for (RitualComponent ritualComponent : ritual.getComponents()) { + List components = Lists.newArrayList(); + ritual.gatherComponents(components); + for (RitualComponent ritualComponent : components) { vX = vec3.add(ritualComponent.getOffset(direction)); double minX = vX.getX() - posX; double minY = vX.getY() - posY; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index 6ecfe11e..5a73de68 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -1,10 +1,11 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.core.registry.RitualRegistry; -import WayofTime.bloodmagic.ritual.data.EnumRuneType; -import WayofTime.bloodmagic.ritual.data.IRitualStone; -import WayofTime.bloodmagic.ritual.data.Ritual; -import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.IRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; @@ -15,6 +16,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import java.util.ArrayList; +import java.util.List; public class RitualHelper { @CapabilityInject(IRitualStone.Tile.class) @@ -76,10 +78,8 @@ public class RitualHelper { return false; } - ArrayList components = ritual.getComponents(); - - if (components == null) - return false; + List components = Lists.newArrayList(); + ritual.gatherComponents(components); for (RitualComponent component : components) { BlockPos newPos = pos.add(component.getOffset(direction)); From 8a61741e0d6fb5206d047e5dd2e60c44059d117f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 4 Mar 2018 10:15:03 -0800 Subject: [PATCH 124/493] Rewrite Transposition Sigil --- .../item/sigil/ItemSigilTransposition.java | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index 3a00e1fe..6e3b00f4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -1,32 +1,30 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemSigilTransposition extends ItemSigilBase { + public ItemSigilTransposition() { super("transposition", 1000); } @@ -40,26 +38,22 @@ public class ItemSigilTransposition extends ItemSigilBase { return; NBTTagCompound tag = stack.getTagCompound(); - if (tag.hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && tag.hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { + if (tag.hasKey("stored")) { tooltip.add(" "); - BlockStack blockStack = new BlockStack(Block.getBlockFromName(tag.getString(Constants.NBT.CONTAINED_BLOCK_NAME)), tag.getByte(Constants.NBT.CONTAINED_BLOCK_META)); - tooltip.add(blockStack.getItemStack().getDisplayName()); + tooltip.add(tag.getCompoundTag("stored").getString("display")); } } + @SideOnly(Side.CLIENT) @Override public String getItemStackDisplayName(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return super.getItemStackDisplayName(stack); + NBTTagCompound tag = stack.getTagCompound(); + if (tag.hasKey("stored")) + return super.getItemStackDisplayName(stack) + " (" + tag.getCompoundTag("stored").getString("display") + ")"; - if (tag.hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && tag.hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { - BlockStack blockStack = new BlockStack(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(tag.getString(Constants.NBT.CONTAINED_BLOCK_NAME))), tag.getByte(Constants.NBT.CONTAINED_BLOCK_META)); - if (blockStack.getItemStack() != null && blockStack.getItemStack().getItem() != null) //TODO: Figure out why it's a null item. This is a patchwork solution. - { - return super.getItemStackDisplayName(stack) + " (" + blockStack.getItemStack().getDisplayName() + ")"; - } - - } return super.getItemStackDisplayName(stack); } @@ -71,68 +65,59 @@ public class ItemSigilTransposition extends ItemSigilBase { if (PlayerHelper.isFakePlayer(player)) return EnumActionResult.FAIL; - stack = NBTHelper.checkNBT(stack); - IBlockState state = world.getBlockState(blockPos); if (!world.isRemote) { if (BloodMagicAPI.INSTANCE.getBlacklist().getTransposition().contains(state)) return EnumActionResult.FAIL; - if (player.isSneaking() && (!stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) || !stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META))) { + if (player.isSneaking() && stack.hasTagCompound() && !stack.getTagCompound().hasKey("stored")) { if (state.getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && state.getBlockHardness(world, blockPos) >= 0) { int cost = getLpUsed(); - NBTTagCompound tileNBTTag = new NBTTagCompound(); - String blockName = state.getBlock().getRegistryName().toString(); - byte metadata = (byte) state.getBlock().getMetaFromState(state); + NBTTagCompound stored = new NBTTagCompound(); + stored.setTag("state", NBTUtil.writeBlockState(new NBTTagCompound(), state)); + stored.setString("display", state.getBlock().getPickBlock(state, null, world, blockPos, player).getDisplayName()); + if (state.getBlock().hasTileEntity(state)) { + TileEntity tile = world.getTileEntity(blockPos); + if (tile != null) { + cost *= 5; + stored.setTag("tileData", tile.writeToNBT(new NBTTagCompound())); - if (world.getTileEntity(blockPos) != null) { - cost *= 5; - world.getTileEntity(blockPos).writeToNBT(tileNBTTag); - - if (world.getTileEntity(blockPos) instanceof TileEntityMobSpawner) { - cost *= 6; + if (world.getTileEntity(blockPos) instanceof TileEntityMobSpawner) + cost *= 6; } } - stack.getTagCompound().setString(Constants.NBT.CONTAINED_BLOCK_NAME, blockName); - stack.getTagCompound().setByte(Constants.NBT.CONTAINED_BLOCK_META, metadata); - stack.getTagCompound().setTag(Constants.NBT.CONTAINED_TILE_ENTITY, tileNBTTag); - + stack.getTagCompound().setTag("stored", stored); NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, cost); - world.removeTileEntity(blockPos); world.setBlockToAir(blockPos); - return EnumActionResult.SUCCESS; } - } else if (stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { - IBlockState iblockstate = world.getBlockState(blockPos); - Block block = iblockstate.getBlock(); - BlockStack blockToPlace = new BlockStack(Block.getBlockFromName(stack.getTagCompound().getString(Constants.NBT.CONTAINED_BLOCK_NAME)), stack.getTagCompound().getByte(Constants.NBT.CONTAINED_BLOCK_META)); + } else if (stack.hasTagCompound() && stack.getTagCompound().hasKey("stored")) { + IBlockState worldState = world.getBlockState(blockPos); + NBTTagCompound storedTag = stack.getTagCompound().getCompoundTag("stored"); + IBlockState storedState = NBTUtil.readBlockState(storedTag.getCompoundTag("state")); + NBTTagCompound tileData = storedTag.hasKey("tileData") ? storedTag.getCompoundTag("tileData") : null; - if (!block.isReplaceable(world, blockPos)) { + if (!worldState.getBlock().isReplaceable(world, blockPos)) blockPos = blockPos.offset(side); - } - if (!stack.isEmpty() && player.canPlayerEdit(blockPos, side, stack) && world.mayPlace(blockToPlace.getBlock(), blockPos, false, side, player)) { - if (world.setBlockState(blockPos, blockToPlace.getState(), 3)) { - blockToPlace.getBlock().onBlockPlacedBy(world, blockPos, blockToPlace.getState(), player, blockToPlace.getItemStack()); -// world.playSound((double) ((float) blockPos.getX() + 0.5F), (double) ((float) blockPos.getY() + 0.5F), (double) ((float) blockPos.getZ() + 0.5F), blockToPlace.getBlock().getStepSound().getPlaceSound(), (blockToPlace.getBlock().getStepSound().getVolume() + 1.0F) / 2.0F, blockToPlace.getBlock().getStepSound().getPitch() * 0.8F); + if (!stack.isEmpty() && player.canPlayerEdit(blockPos, side, stack) && world.mayPlace(storedState.getBlock(), blockPos, false, side, player)) { + if (world.setBlockState(blockPos, storedState, 3)) { + storedState.getBlock().onBlockPlacedBy(world, blockPos, storedState, player, ItemStack.EMPTY); - if (stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_TILE_ENTITY) && blockToPlace.getBlock().hasTileEntity(blockToPlace.getState())) { - NBTTagCompound tag = stack.getTagCompound().getCompoundTag(Constants.NBT.CONTAINED_TILE_ENTITY); - tag.setInteger("x", blockPos.getX()); - tag.setInteger("y", blockPos.getY()); - tag.setInteger("z", blockPos.getZ()); - world.getTileEntity(blockPos).readFromNBT(tag); + if (tileData != null) { + tileData.setInteger("x", blockPos.getX()); + tileData.setInteger("y", blockPos.getY()); + tileData.setInteger("z", blockPos.getZ()); + TileEntity worldTile = world.getTileEntity(blockPos); + if (worldTile != null) + worldTile.readFromNBT(tileData); } + world.notifyBlockUpdate(blockPos, state, state, 3); - - stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_BLOCK_NAME); - stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_BLOCK_META); - stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_TILE_ENTITY); - + stack.getTagCompound().removeTag("stored"); return EnumActionResult.SUCCESS; } } @@ -140,4 +125,19 @@ public class ItemSigilTransposition extends ItemSigilBase { } return EnumActionResult.FAIL; } + + // We only want to send the display name to the client rather than the bloated tag with tile data and such + @Nullable + @Override + public NBTTagCompound getNBTShareTag(ItemStack stack) { + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("stored")) + return super.getNBTShareTag(stack); + + NBTTagCompound shareTag = stack.getTagCompound().copy(); + NBTTagCompound storedTag = shareTag.getCompoundTag("stored"); + storedTag.removeTag("state"); + storedTag.removeTag("stored"); + + return shareTag; + } } From 2b86e5c8ad27622634aa20b52ed4f647eca1fc1f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 4 Mar 2018 10:47:15 -0800 Subject: [PATCH 125/493] More removal of BlockStack usages --- .../DataProviderRitualController.java | 1 - .../ritual/types/RitualMagnetic.java | 41 ++----------------- .../java/WayofTime/bloodmagic/util/Utils.java | 14 +++---- 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 3e97d19f..2d5f1975 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; import WayofTime.bloodmagic.ritual.RitualRegistry; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index 2fc4868c..2950cc63 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -2,27 +2,19 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; -import net.minecraft.block.BlockOre; -import net.minecraft.block.BlockRedstoneOre; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class RitualMagnetic extends Ritual { public static final String PLACEMENT_RANGE = "placementRange"; - private static final Map oreBlockCache = new HashMap(); // public static final String SEARCH_RANGE = "searchRange"; public BlockPos lastPos; // An offset @@ -58,9 +50,7 @@ public class RitualMagnetic extends Ritual { } IBlockState downState = world.getBlockState(pos.down()); - Block downBlock = downState.getBlock(); - - int radius = getRadius(downBlock); + int radius = getRadius(downState.getBlock()); if (replace) { int j = -1; @@ -78,10 +68,7 @@ public class RitualMagnetic extends Ritual { while (k <= radius) { BlockPos newPos = pos.add(i, j, k); IBlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - ItemStack checkStack = block.getItem(world, newPos, state); -// int meta = block.getMetaFromState(state); - + ItemStack checkStack = state.getBlock().getPickBlock(state, null, world, newPos, null); if (isBlockOre(checkStack)) { Utils.swapLocations(world, newPos, world, replacement); masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); @@ -103,7 +90,6 @@ public class RitualMagnetic extends Ritual { j = -1; this.lastPos = new BlockPos(i, j, k); - return; } } @@ -147,35 +133,16 @@ public class RitualMagnetic extends Ritual { return new RitualMagnetic(); } - public static boolean isBlockOre(Block block, int meta) { - if (block == null) - return false; - - if (block instanceof BlockOre || block instanceof BlockRedstoneOre) - return true; - - if (Item.getItemFromBlock(block) == Items.AIR) - return false; - - BlockStack type = new BlockStack(block, meta); - return oreBlockCache.computeIfAbsent(type, RitualMagnetic::computeIsItemOre); - } - - private static boolean computeIsItemOre(BlockStack type) { - ItemStack stack = new ItemStack(type.getBlock(), type.getMeta()); - return isBlockOre(stack); - } - public static boolean isBlockOre(ItemStack stack) { - if (stack.isEmpty()) { + if (stack.isEmpty()) return false; - } for (int id : OreDictionary.getOreIDs(stack)) { String oreName = OreDictionary.getOreName(id); if (oreName.contains("ore")) return true; } + return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 417eddad..83ea0573 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -848,10 +848,10 @@ public class Utils { if (finalTile != null) finalTile.writeToNBT(finalTag); - BlockStack initialStack = BlockStack.getStackFromPos(initialWorld, initialPos); - BlockStack finalStack = BlockStack.getStackFromPos(finalWorld, finalPos); + IBlockState initialState = initialWorld.getBlockState(initialPos); + IBlockState finalState = finalWorld.getBlockState(finalPos); - if ((initialStack.getBlock().equals(Blocks.AIR) && finalStack.getBlock().equals(Blocks.AIR)) || initialStack.getBlock() instanceof BlockPortal || finalStack.getBlock() instanceof BlockPortal) + if ((initialState.getBlock().equals(Blocks.AIR) && finalState.getBlock().equals(Blocks.AIR)) || initialState.getBlock() instanceof BlockPortal || finalState.getBlock() instanceof BlockPortal) return false; if (playSound) { @@ -860,9 +860,9 @@ public class Utils { } //Finally, we get to do something! (CLEARING TILES) - if (finalStack.getBlock() != null) + if (finalState.getBlock().hasTileEntity(finalState)) finalWorld.removeTileEntity(finalPos); - if (initialStack.getBlock() != null) + if (initialState.getBlock().hasTileEntity(initialState)) initialWorld.removeTileEntity(initialPos); //TILES CLEARED @@ -889,8 +889,8 @@ public class Utils { newTileFinal.setWorld(initialWorld); } - initialWorld.notifyNeighborsOfStateChange(initialPos, finalStack.getBlock(), true); - finalWorld.notifyNeighborsOfStateChange(finalPos, initialStack.getBlock(), true); + initialWorld.notifyNeighborsOfStateChange(initialPos, finalState.getBlock(), true); + finalWorld.notifyNeighborsOfStateChange(finalPos, initialState.getBlock(), true); return true; } From 3a83b4ca8a07cc12fa2d0bd1476156021ecaacbb Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 4 Mar 2018 19:11:46 -0500 Subject: [PATCH 126/493] Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. --- changelog.txt | 1 + .../tile/routing/TileMasterRoutingNode.java | 257 ++++++++++++------ 2 files changed, 172 insertions(+), 86 deletions(-) diff --git a/changelog.txt b/changelog.txt index 567608ca..775f13c4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Version 2.2.8 - It's a bright idea to fix this as soon as I can. - Changed the recipe of the Teleport Array: - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! +- Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. ------------------------------------------------------ Version 2.2.7 diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index 250752bd..776901f4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -16,7 +16,8 @@ import net.minecraft.world.World; import java.util.*; import java.util.Map.Entry; -public class TileMasterRoutingNode extends TileInventory implements IMasterRoutingNode, ITickable { +public class TileMasterRoutingNode extends TileInventory implements IMasterRoutingNode, ITickable +{ public static final int tickRate = 20; private int currentInput; // A list of connections @@ -25,13 +26,16 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti private List outputNodeList = new LinkedList<>(); private List inputNodeList = new LinkedList<>(); - public TileMasterRoutingNode() { + public TileMasterRoutingNode() + { super(0, "masterRoutingNode"); } @Override - public void update() { - if (!getWorld().isRemote) { + public void update() + { + if (!getWorld().isRemote) + { // currentInput = getWorld().isBlockIndirectlyGettingPowered(pos); currentInput = getWorld().getStrongPower(pos); @@ -46,23 +50,31 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti Map> outputMap = new TreeMap<>(); Map> outputFluidMap = new TreeMap<>(); - for (BlockPos outputPos : outputNodeList) { + for (BlockPos outputPos : outputNodeList) + { TileEntity outputTile = getWorld().getTileEntity(outputPos); - if (this.isConnected(new LinkedList<>(), outputPos)) { - if (outputTile instanceof IOutputItemRoutingNode) { + if (this.isConnected(new LinkedList<>(), outputPos)) + { + if (outputTile instanceof IOutputItemRoutingNode) + { IOutputItemRoutingNode outputNode = (IOutputItemRoutingNode) outputTile; - for (EnumFacing facing : EnumFacing.VALUES) { - if (!outputNode.isInventoryConnectedToSide(facing) || !outputNode.isOutput(facing)) { + for (EnumFacing facing : EnumFacing.VALUES) + { + if (!outputNode.isInventoryConnectedToSide(facing) || !outputNode.isOutput(facing)) + { continue; } IItemFilter filter = outputNode.getOutputFilterForSide(facing); - if (filter != null) { + if (filter != null) + { int priority = outputNode.getPriority(facing); - if (outputMap.containsKey(priority)) { + if (outputMap.containsKey(priority)) + { outputMap.get(priority).add(filter); - } else { + } else + { List filterList = new LinkedList<>(); filterList.add(filter); outputMap.put(priority, filterList); @@ -71,20 +83,26 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - if (outputTile instanceof IOutputFluidRoutingNode) { + if (outputTile instanceof IOutputFluidRoutingNode) + { IOutputFluidRoutingNode outputNode = (IOutputFluidRoutingNode) outputTile; - for (EnumFacing facing : EnumFacing.VALUES) { - if (!outputNode.isTankConnectedToSide(facing) || !outputNode.isFluidOutput(facing)) { + for (EnumFacing facing : EnumFacing.VALUES) + { + if (!outputNode.isTankConnectedToSide(facing) || !outputNode.isFluidOutput(facing)) + { continue; } IFluidFilter filter = outputNode.getOutputFluidFilterForSide(facing); - if (filter != null) { + if (filter != null) + { int priority = outputNode.getPriority(facing); - if (outputMap.containsKey(priority)) { + if (outputMap.containsKey(priority)) + { outputFluidMap.get(priority).add(filter); - } else { + } else + { List filterList = new LinkedList<>(); filterList.add(filter); outputFluidMap.put(priority, filterList); @@ -98,23 +116,31 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti Map> inputMap = new TreeMap<>(); Map> inputFluidMap = new TreeMap<>(); - for (BlockPos inputPos : inputNodeList) { + for (BlockPos inputPos : inputNodeList) + { TileEntity inputTile = getWorld().getTileEntity(inputPos); - if (this.isConnected(new LinkedList<>(), inputPos)) { - if (inputTile instanceof IInputItemRoutingNode) { + if (this.isConnected(new LinkedList<>(), inputPos)) + { + if (inputTile instanceof IInputItemRoutingNode) + { IInputItemRoutingNode inputNode = (IInputItemRoutingNode) inputTile; - for (EnumFacing facing : EnumFacing.VALUES) { - if (!inputNode.isInventoryConnectedToSide(facing) || !inputNode.isInput(facing)) { + for (EnumFacing facing : EnumFacing.VALUES) + { + if (!inputNode.isInventoryConnectedToSide(facing) || !inputNode.isInput(facing)) + { continue; } IItemFilter filter = inputNode.getInputFilterForSide(facing); - if (filter != null) { + if (filter != null) + { int priority = inputNode.getPriority(facing); - if (inputMap.containsKey(priority)) { + if (inputMap.containsKey(priority)) + { inputMap.get(priority).add(filter); - } else { + } else + { List filterList = new LinkedList<>(); filterList.add(filter); inputMap.put(priority, filterList); @@ -123,20 +149,26 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - if (inputTile instanceof IInputFluidRoutingNode) { + if (inputTile instanceof IInputFluidRoutingNode) + { IInputFluidRoutingNode inputNode = (IInputFluidRoutingNode) inputTile; - for (EnumFacing facing : EnumFacing.VALUES) { - if (!inputNode.isTankConnectedToSide(facing) || !inputNode.isFluidInput(facing)) { + for (EnumFacing facing : EnumFacing.VALUES) + { + if (!inputNode.isTankConnectedToSide(facing) || !inputNode.isFluidInput(facing)) + { continue; } IFluidFilter filter = inputNode.getInputFluidFilterForSide(facing); - if (filter != null) { + if (filter != null) + { int priority = inputNode.getPriority(facing); - if (inputMap.containsKey(priority)) { + if (inputMap.containsKey(priority)) + { inputFluidMap.get(priority).add(filter); - } else { + } else + { List filterList = new LinkedList<>(); filterList.add(filter); inputFluidMap.put(priority, filterList); @@ -150,14 +182,19 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti int maxTransfer = this.getMaxTransferForDemonWill(WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT)); int maxFluidTransfer = 1000; - for (Entry> outputEntry : outputMap.entrySet()) { + for (Entry> outputEntry : outputMap.entrySet()) + { List outputList = outputEntry.getValue(); - for (IItemFilter outputFilter : outputList) { - for (Entry> inputEntry : inputMap.entrySet()) { + for (IItemFilter outputFilter : outputList) + { + for (Entry> inputEntry : inputMap.entrySet()) + { List inputList = inputEntry.getValue(); - for (IItemFilter inputFilter : inputList) { + for (IItemFilter inputFilter : inputList) + { maxTransfer -= inputFilter.transferThroughInputFilter(outputFilter, maxTransfer); - if (maxTransfer <= 0) { + if (maxTransfer <= 0) + { return; } } @@ -165,14 +202,19 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - for (Entry> outputEntry : outputFluidMap.entrySet()) { + for (Entry> outputEntry : outputFluidMap.entrySet()) + { List outputList = outputEntry.getValue(); - for (IFluidFilter outputFilter : outputList) { - for (Entry> inputEntry : inputFluidMap.entrySet()) { + for (IFluidFilter outputFilter : outputList) + { + for (Entry> inputEntry : inputFluidMap.entrySet()) + { List inputList = inputEntry.getValue(); - for (IFluidFilter inputFilter : inputList) { + for (IFluidFilter inputFilter : inputList) + { maxFluidTransfer -= inputFilter.transferThroughInputFilter(outputFilter, maxFluidTransfer); - if (maxFluidTransfer <= 0) { + if (maxFluidTransfer <= 0) + { return; } } @@ -181,15 +223,18 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - public int getMaxTransferForDemonWill(double will) { - return 8; + public int getMaxTransferForDemonWill(double will) + { + return 64; } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public NBTTagCompound serialize(NBTTagCompound tag) + { super.serialize(tag); NBTTagList tags = new NBTTagList(); - for (BlockPos pos : generalNodeList) { + for (BlockPos pos : generalNodeList) + { NBTTagCompound posTag = new NBTTagCompound(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); @@ -199,7 +244,8 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti tag.setTag(Constants.NBT.ROUTING_MASTER_GENERAL, tags); tags = new NBTTagList(); - for (BlockPos pos : inputNodeList) { + for (BlockPos pos : inputNodeList) + { NBTTagCompound posTag = new NBTTagCompound(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); @@ -209,7 +255,8 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti tag.setTag(Constants.NBT.ROUTING_MASTER_INPUT, tags); tags = new NBTTagList(); - for (BlockPos pos : outputNodeList) { + for (BlockPos pos : outputNodeList) + { NBTTagCompound posTag = new NBTTagCompound(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); @@ -221,25 +268,29 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(NBTTagCompound tag) + { super.deserialize(tag); NBTTagList tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); - for (int i = 0; i < tags.tagCount(); i++) { + for (int i = 0; i < tags.tagCount(); i++) + { NBTTagCompound blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); generalNodeList.add(newPos); } tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_INPUT, 10); - for (int i = 0; i < tags.tagCount(); i++) { + for (int i = 0; i < tags.tagCount(); i++) + { NBTTagCompound blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); inputNodeList.add(newPos); } tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); - for (int i = 0; i < tags.tagCount(); i++) { + for (int i = 0; i < tags.tagCount(); i++) + { NBTTagCompound blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); outputNodeList.add(newPos); @@ -247,14 +298,16 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public boolean isConnected(List path, BlockPos nodePos) { + public boolean isConnected(List path, BlockPos nodePos) + { //TODO: Figure out how to make it so the path is obtained // if (!connectionMap.containsKey(nodePos)) // { // return false; // } TileEntity tile = getWorld().getTileEntity(nodePos); - if (!(tile instanceof IRoutingNode)) { + if (!(tile instanceof IRoutingNode)) + { // connectionMap.remove(nodePos); return false; } @@ -263,17 +316,22 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti List connectionList = node.getConnected(); // List testPath = path.subList(0, path.size()); path.add(nodePos); - for (BlockPos testPos : connectionList) { - if (path.contains(testPos)) { + for (BlockPos testPos : connectionList) + { + if (path.contains(testPos)) + { continue; } - if (testPos.equals(this.getPos()) && node.isConnectionEnabled(testPos)) { + if (testPos.equals(this.getPos()) && node.isConnectionEnabled(testPos)) + { // path.clear(); // path.addAll(testPath); return true; - } else if (NodeHelper.isNodeConnectionEnabled(getWorld(), node, testPos)) { - if (isConnected(path, testPos)) { + } else if (NodeHelper.isNodeConnectionEnabled(getWorld(), node, testPos)) + { + if (isConnected(path, testPos)) + { // path.clear(); // path.addAll(testPath); return true; @@ -285,44 +343,56 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public boolean isConnectionEnabled(BlockPos testPos) { + public boolean isConnectionEnabled(BlockPos testPos) + { return currentInput <= 0; } @Override - public void addNodeToList(IRoutingNode node) { + public void addNodeToList(IRoutingNode node) + { BlockPos newPos = node.getBlockPos(); - if (!generalNodeList.contains(newPos)) { + if (!generalNodeList.contains(newPos)) + { generalNodeList.add(newPos); } - if (node instanceof IInputItemRoutingNode && !inputNodeList.contains(newPos)) { + if (node instanceof IInputItemRoutingNode && !inputNodeList.contains(newPos)) + { inputNodeList.add(newPos); } - if (node instanceof IOutputItemRoutingNode && !outputNodeList.contains(newPos)) { + if (node instanceof IOutputItemRoutingNode && !outputNodeList.contains(newPos)) + { outputNodeList.add(newPos); } } @Override - public void addConnections(BlockPos pos, List connectionList) { - for (BlockPos testPos : connectionList) { + public void addConnections(BlockPos pos, List connectionList) + { + for (BlockPos testPos : connectionList) + { addConnection(pos, testPos); } } @Override - public void addConnection(BlockPos pos1, BlockPos pos2) { - if (connectionMap.containsKey(pos1) && !connectionMap.get(pos1).contains(pos2)) { + public void addConnection(BlockPos pos1, BlockPos pos2) + { + if (connectionMap.containsKey(pos1) && !connectionMap.get(pos1).contains(pos2)) + { connectionMap.get(pos1).add(pos2); - } else { + } else + { List list = new LinkedList<>(); list.add(pos2); connectionMap.put(pos1, list); } - if (connectionMap.containsKey(pos2) && !connectionMap.get(pos2).contains(pos1)) { + if (connectionMap.containsKey(pos2) && !connectionMap.get(pos2).contains(pos1)) + { connectionMap.get(pos2).add(pos1); - } else { + } else + { List list = new LinkedList<>(); list.add(pos1); connectionMap.put(pos2, list); @@ -330,69 +400,84 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public void removeConnection(BlockPos pos1, BlockPos pos2) { - if (connectionMap.containsKey(pos1)) { + public void removeConnection(BlockPos pos1, BlockPos pos2) + { + if (connectionMap.containsKey(pos1)) + { List posList = connectionMap.get(pos1); posList.remove(pos2); - if (posList.isEmpty()) { + if (posList.isEmpty()) + { connectionMap.remove(pos1); } } - if (connectionMap.containsKey(pos2)) { + if (connectionMap.containsKey(pos2)) + { List posList = connectionMap.get(pos2); posList.remove(pos1); - if (posList.isEmpty()) { + if (posList.isEmpty()) + { connectionMap.remove(pos2); } } } @Override - public void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master) { + public void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master) + { return; } @Override - public BlockPos getBlockPos() { + public BlockPos getBlockPos() + { return this.getPos(); } @Override - public List getConnected() { + public List getConnected() + { return new LinkedList<>(); } @Override - public BlockPos getMasterPos() { + public BlockPos getMasterPos() + { return this.getPos(); } @Override - public boolean isMaster(IMasterRoutingNode master) { + public boolean isMaster(IMasterRoutingNode master) + { return false; } @Override - public void addConnection(BlockPos pos1) { + public void addConnection(BlockPos pos1) + { // Empty } @Override - public void removeConnection(BlockPos pos1) { + public void removeConnection(BlockPos pos1) + { generalNodeList.remove(pos1); inputNodeList.remove(pos1); outputNodeList.remove(pos1); } @Override - public void removeAllConnections() { + public void removeAllConnections() + { List list = generalNodeList.subList(0, generalNodeList.size()); Iterator itr = list.iterator(); - while (itr.hasNext()) { + while (itr.hasNext()) + { BlockPos testPos = itr.next(); TileEntity tile = getWorld().getTileEntity(testPos); - if (tile instanceof IRoutingNode) { + if (tile instanceof IRoutingNode) + { ((IRoutingNode) tile).removeConnection(pos); getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(testPos), getWorld().getBlockState(testPos), 3); } From b01162333357192c127b72372d825a61f433aae3 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Mar 2018 00:10:30 -0800 Subject: [PATCH 127/493] Switch ritual component gathering to a Consumer rather than direct list access --- .../bloodmagic/item/ItemRitualDiviner.java | 6 +-- .../WayofTime/bloodmagic/ritual/Ritual.java | 13 ++--- .../bloodmagic/ritual/RitualRegistry.java | 4 +- .../ritual/types/RitualAltarBuilder.java | 4 +- .../ritual/types/RitualAnimalGrowth.java | 19 +++---- .../ritual/types/RitualArmourEvolve.java | 4 +- .../ritual/types/RitualCobblestone.java | 5 +- .../ritual/types/RitualContainment.java | 4 +- .../ritual/types/RitualCrushing.java | 3 +- .../ritual/types/RitualCrystalHarvest.java | 4 +- .../ritual/types/RitualEllipsoid.java | 4 +- .../ritual/types/RitualExpulsion.java | 3 +- .../ritual/types/RitualFeatheredKnife.java | 3 +- .../ritual/types/RitualFelling.java | 4 +- .../ritual/types/RitualForsakenSoul.java | 3 +- .../ritual/types/RitualFullStomach.java | 3 +- .../ritual/types/RitualGreenGrove.java | 3 +- .../ritual/types/RitualHarvest.java | 51 ++++++++++--------- .../ritual/types/RitualInterdiction.java | 4 +- .../ritual/types/RitualJumping.java | 3 +- .../bloodmagic/ritual/types/RitualLava.java | 3 +- .../types/RitualLivingArmourDowngrade.java | 3 +- .../ritual/types/RitualMagnetic.java | 4 +- .../bloodmagic/ritual/types/RitualMeteor.java | 3 +- .../bloodmagic/ritual/types/RitualPlacer.java | 4 +- .../bloodmagic/ritual/types/RitualPortal.java | 4 +- .../bloodmagic/ritual/types/RitualPump.java | 3 +- .../ritual/types/RitualRegeneration.java | 27 +++++----- .../bloodmagic/ritual/types/RitualSpeed.java | 3 +- .../ritual/types/RitualSuppression.java | 4 +- .../ritual/types/RitualUpgradeRemove.java | 3 +- .../bloodmagic/ritual/types/RitualWater.java | 4 +- .../ritual/types/RitualWellOfSuffering.java | 3 +- .../bloodmagic/ritual/types/RitualZephyr.java | 3 +- .../util/handler/event/ClientHandler.java | 4 +- .../bloodmagic/util/helper/RitualHelper.java | 3 +- 36 files changed, 121 insertions(+), 104 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index e6e41c4c..d39fc897 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -119,7 +119,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { if (ritual != null) { EnumFacing direction = getDirection(stack); List components = Lists.newArrayList(); - ritual.gatherComponents(components); + ritual.gatherComponents(components::add); for (RitualComponent component : components) { if (!canPlaceRitualStone(component.getRuneType(), stack)) { return false; @@ -227,7 +227,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { tooltip.add(TextHelper.localize(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).getName()))); tooltip.add(""); List components = Lists.newArrayList(); - ritual.gatherComponents(components); + ritual.gatherComponents(components::add); int blankRunes = 0; int airRunes = 0; @@ -491,7 +491,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } List components = Lists.newArrayList(); - ritual.gatherComponents(components); + ritual.gatherComponents(components::add); for (RitualComponent component : components) { if (!canPlaceRitualStone(component.getRuneType(), stack)) { return false; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 3ae656fa..472fa682 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.*; import java.util.Map.Entry; +import java.util.function.Consumer; /** * Abstract class for creating new rituals. Rituals need be registered with @@ -261,13 +262,13 @@ public abstract class Ritual { } } - public abstract void gatherComponents(List components); + public abstract void gatherComponents(Consumer components); - protected final void addRune(List components, int offset1, int y, int offset2, EnumRuneType rune) { - components.add(new RitualComponent(new BlockPos(offset1, y, offset2), rune)); + protected final void addRune(Consumer components, int offset1, int y, int offset2, EnumRuneType rune) { + components.accept(new RitualComponent(new BlockPos(offset1, y, offset2), rune)); } - protected final void addOffsetRunes(List components, int offset1, int offset2, int y, EnumRuneType rune) { + protected final void addOffsetRunes(Consumer components, int offset1, int offset2, int y, EnumRuneType rune) { addRune(components, offset1, y, offset2, rune); addRune(components, offset2, y, offset1, rune); addRune(components, offset1, y, -offset2, rune); @@ -278,14 +279,14 @@ public abstract class Ritual { addRune(components, -offset2, y, -offset1, rune); } - protected final void addCornerRunes(List components, int offset, int y, EnumRuneType rune) { + protected final void addCornerRunes(Consumer components, int offset, int y, EnumRuneType rune) { addRune(components, offset, y, offset, rune); addRune(components, offset, y, -offset, rune); addRune(components, -offset, y, -offset, rune); addRune(components, -offset, y, offset, rune); } - protected final void addParallelRunes(List components, int offset, int y, EnumRuneType rune) { + protected final void addParallelRunes(Consumer components, int offset, int y, EnumRuneType rune) { addRune(components, offset, y, 0, rune); addRune(components, -offset, y, 0, rune); addRune(components, 0, y, -offset, rune); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java index af289560..66039e2b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java @@ -115,9 +115,9 @@ public class RitualRegistry { Ritual ritual1 = registry.get(o1); Ritual ritual2 = registry.get(o2); List first = Lists.newArrayList(); - ritual1.gatherComponents(first); + ritual1.gatherComponents(first::add); List second = Lists.newArrayList(); - ritual2.gatherComponents(second); + ritual2.gatherComponents(second::add); return first.size() > second.size() ? -1 : 0; // Put earlier if bigger }); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 145ac180..37125032 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -27,7 +27,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.ArrayList; import java.util.Iterator; -import java.util.List; +import java.util.function.Consumer; public class RitualAltarBuilder extends Ritual { private Iterator altarComponentsIterator = new ArrayList<>(EnumAltarTier.SIX.getAltarComponents()).iterator(); @@ -114,7 +114,7 @@ public class RitualAltarBuilder extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { for (int i = -12; i <= -8; i++) { addRune(components, i, -6, 13, EnumRuneType.AIR); addRune(components, i, -6, -13, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index eb271087..f7724e6a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; import java.util.List; +import java.util.function.Consumer; public class RitualAnimalGrowth extends Ritual { public static final double rawWillDrain = 0.05; @@ -168,18 +169,18 @@ public class RitualAnimalGrowth extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 2, 0, EnumRuneType.DUSK); addParallelRunes(components, 1, 0, EnumRuneType.WATER); - components.add(new RitualComponent(new BlockPos(1, 0, 2), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(1, 0, -2), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-1, 0, 2), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-1, 0, -2), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(2, 0, 1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(2, 0, -1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(-2, 0, 1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(-2, 0, -1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(1, 0, 2), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(1, 0, -2), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-1, 0, 2), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-1, 0, -2), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(2, 0, 1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(2, 0, -1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(-2, 0, 1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(-2, 0, -1), EnumRuneType.AIR)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index 9c602679..90447806 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -12,6 +12,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.List; +import java.util.function.Consumer; public class RitualArmourEvolve extends Ritual { public static final String CHECK_RANGE = "fillRange"; @@ -64,8 +65,7 @@ public class RitualArmourEvolve extends Ritual { } @Override - public void gatherComponents(List components) { - + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.DUSK); addCornerRunes(components, 2, 0, EnumRuneType.FIRE); addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index abae34aa..cf481fa9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; +import java.util.function.Consumer; public class RitualCobblestone extends Ritual { @@ -83,8 +83,7 @@ public class RitualCobblestone extends Ritual { } @Override - public void gatherComponents(List components) { - + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 1, EnumRuneType.FIRE); addParallelRunes(components, 1, 0, EnumRuneType.WATER); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java index b7c58ff3..4ad43168 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; +import java.util.function.Consumer; public class RitualContainment extends Ritual { public static final String CONTAINMENT_RANGE = "containmentRange"; @@ -56,7 +56,7 @@ public class RitualContainment extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 1, 0, EnumRuneType.EARTH); addCornerRunes(components, 2, 0, EnumRuneType.EARTH); addParallelRunes(components, 1, 5, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 06d3bc1b..caefd268 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.function.Consumer; public class RitualCrushing extends Ritual { public static final String CRUSHING_RANGE = "crushingRange"; @@ -251,7 +252,7 @@ public class RitualCrushing extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 1, 0, EnumRuneType.EARTH); addParallelRunes(components, 2, 0, EnumRuneType.FIRE); addCornerRunes(components, 2, 0, EnumRuneType.DUSK); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java index 8eb060a1..62d86acc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java @@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; +import java.util.function.Consumer; public class RitualCrystalHarvest extends Ritual { public static final String CRYSTAL_RANGE = "crystal"; @@ -67,7 +67,7 @@ public class RitualCrystalHarvest extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.AIR); addParallelRunes(components, 1, 1, EnumRuneType.DUSK); addParallelRunes(components, 1, -1, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index 631b35b7..1def76f5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.ritual.types; -import java.util.List; +import java.util.function.Consumer; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -215,7 +215,7 @@ public class RitualEllipsoid extends Ritual // } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.WATER); addCornerRunes(components, 1, 1, EnumRuneType.WATER); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java index 1be8f406..10209075 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java @@ -23,6 +23,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.List; import java.util.Random; import java.util.UUID; +import java.util.function.Consumer; public class RitualExpulsion extends Ritual { public static final String EXPULSION_RANGE = "expulsionRange"; @@ -189,7 +190,7 @@ public class RitualExpulsion extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 2, 0, EnumRuneType.EARTH); addRune(components, 2, 0, 1, EnumRuneType.EARTH); addRune(components, 1, 0, 2, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index 476ab93c..dd347421 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -24,6 +24,7 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import java.util.List; +import java.util.function.Consumer; public class RitualFeatheredKnife extends Ritual { public static final String ALTAR_RANGE = "altar"; @@ -184,7 +185,7 @@ public class RitualFeatheredKnife extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 1, 0, EnumRuneType.DUSK); addParallelRunes(components, 2, -1, EnumRuneType.WATER); addCornerRunes(components, 1, -1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java index 31813dea..c4b33b27 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java @@ -16,7 +16,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Iterator; -import java.util.List; +import java.util.function.Consumer; public class RitualFelling extends Ritual { public static final String FELLING_RANGE = "fellingRange"; @@ -86,7 +86,7 @@ public class RitualFelling extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.EARTH); addCornerRunes(components, 1, 1, EnumRuneType.EARTH); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index 8767e150..ee49bbcd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.registry.EntityRegistry; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; public class RitualForsakenSoul extends Ritual { public static final String CRYSTAL_RANGE = "crystal"; @@ -178,7 +179,7 @@ public class RitualForsakenSoul extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.AIR); addParallelRunes(components, 1, -1, EnumRuneType.DUSK); addParallelRunes(components, 1, 1, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java index 35fa103d..f0a739ea 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java @@ -13,6 +13,7 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import java.util.List; +import java.util.function.Consumer; public class RitualFullStomach extends Ritual { public static final String FILL_RANGE = "fillRange"; @@ -92,7 +93,7 @@ public class RitualFullStomach extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 3, 0, EnumRuneType.FIRE); addCornerRunes(components, 1, 0, EnumRuneType.AIR); addOffsetRunes(components, 1, 2, 0, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index 79f3b0f2..f2aa95ad 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -24,6 +24,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.Random; +import java.util.function.Consumer; public class RitualGreenGrove extends Ritual { public static final String GROW_RANGE = "growing"; @@ -258,7 +259,7 @@ public class RitualGreenGrove extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.EARTH); addParallelRunes(components, 1, 0, EnumRuneType.WATER); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index c554cc83..faa582ad 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -17,6 +17,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import java.util.List; +import java.util.function.Consumer; /** * This ritual uses registered {@link IHarvestHandler}'s to harvest blocks. @@ -74,31 +75,31 @@ public class RitualHarvest extends Ritual { } @Override - public void gatherComponents(List components) { - components.add(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.DUSK)); - components.add(new RitualComponent(new BlockPos(1, 0, -1), EnumRuneType.DUSK)); - components.add(new RitualComponent(new BlockPos(-1, 0, -1), EnumRuneType.DUSK)); - components.add(new RitualComponent(new BlockPos(-1, 0, 1), EnumRuneType.DUSK)); - components.add(new RitualComponent(new BlockPos(2, 0, 0), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-2, 0, 0), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(0, 0, 2), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(0, 0, -2), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(3, 0, 1), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(3, 0, -1), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-3, 0, 1), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-3, 0, -1), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(1, 0, 3), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-1, 0, 3), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(1, 0, -3), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(-1, 0, -3), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(2, 0, 3), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(3, 0, 2), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(2, 0, -3), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(-3, 0, 2), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(-2, 0, 3), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(3, 0, -2), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(-2, 0, -3), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(-3, 0, -2), EnumRuneType.WATER)); + public void gatherComponents(Consumer components) { + components.accept(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.DUSK)); + components.accept(new RitualComponent(new BlockPos(1, 0, -1), EnumRuneType.DUSK)); + components.accept(new RitualComponent(new BlockPos(-1, 0, -1), EnumRuneType.DUSK)); + components.accept(new RitualComponent(new BlockPos(-1, 0, 1), EnumRuneType.DUSK)); + components.accept(new RitualComponent(new BlockPos(2, 0, 0), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-2, 0, 0), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(0, 0, 2), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(0, 0, -2), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(3, 0, 1), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(3, 0, -1), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-3, 0, 1), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-3, 0, -1), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(1, 0, 3), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-1, 0, 3), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(1, 0, -3), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(-1, 0, -3), EnumRuneType.EARTH)); + components.accept(new RitualComponent(new BlockPos(2, 0, 3), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(3, 0, 2), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(2, 0, -3), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(-3, 0, 2), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(-2, 0, 3), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(3, 0, -2), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(-2, 0, -3), EnumRuneType.WATER)); + components.accept(new RitualComponent(new BlockPos(-3, 0, -2), EnumRuneType.WATER)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java index 44d48d1d..a9eb84b3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; +import java.util.function.Consumer; public class RitualInterdiction extends Ritual { public static final String INTERDICTION_RANGE = "interdictionRange"; @@ -60,7 +60,7 @@ public class RitualInterdiction extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.AIR); addParallelRunes(components, 1, 0, EnumRuneType.AIR); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index f594e44b..e34a008d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -9,6 +9,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.List; +import java.util.function.Consumer; public class RitualJumping extends Ritual { public static final String JUMP_RANGE = "jumpRange"; @@ -68,7 +69,7 @@ public class RitualJumping extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { for (int i = -1; i <= 1; i++) addCornerRunes(components, 1, i, EnumRuneType.AIR); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index 89e9b8ec..56e32be6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -26,6 +26,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import java.util.List; +import java.util.function.Consumer; public class RitualLava extends Ritual { public static final String LAVA_RANGE = "lavaRange"; @@ -232,7 +233,7 @@ public class RitualLava extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 1, 0, EnumRuneType.FIRE); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index c22915bc..d0f9e4b5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -25,6 +25,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; public class RitualLivingArmourDowngrade extends Ritual { public static final String DOWNGRADE_RANGE = "containmentRange"; @@ -162,7 +163,7 @@ public class RitualLivingArmourDowngrade extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addRune(components, 0, 0, -1, EnumRuneType.AIR); addRune(components, 0, 0, -2, EnumRuneType.DUSK); addRune(components, 0, 1, -3, EnumRuneType.DUSK); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index 2950cc63..ba7fe38b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -11,7 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import java.util.List; +import java.util.function.Consumer; public class RitualMagnetic extends Ritual { public static final String PLACEMENT_RANGE = "placementRange"; @@ -121,7 +121,7 @@ public class RitualMagnetic extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.EARTH); addParallelRunes(components, 2, 1, EnumRuneType.EARTH); addCornerRunes(components, 2, 1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 95edf4ed..e8b9c652 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -13,6 +13,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.List; +import java.util.function.Consumer; public class RitualMeteor extends Ritual { public static final String ITEM_RANGE = "itemRange"; @@ -94,7 +95,7 @@ public class RitualMeteor extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 2, 0, EnumRuneType.FIRE); addOffsetRunes(components, 3, 1, 0, EnumRuneType.AIR); addOffsetRunes(components, 4, 2, 0, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java index be35f269..d18f1cb5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java @@ -13,7 +13,7 @@ import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import java.util.List; +import java.util.function.Consumer; public class RitualPlacer extends Ritual { public static final String PLACER_RANGE = "placerRange"; @@ -80,7 +80,7 @@ public class RitualPlacer extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addRune(components, 3, 0, 3, EnumRuneType.EARTH); addRune(components, 3, 0, -3, EnumRuneType.EARTH); addRune(components, -3, 0, 3, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java index da2c5a7d..fd3b83f4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java @@ -17,8 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import java.util.List; import java.util.UUID; +import java.util.function.Consumer; public class RitualPortal extends Ritual { @@ -183,7 +183,7 @@ public class RitualPortal extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addRune(components, 1, 0, 0, EnumRuneType.AIR); addRune(components, 2, 0, 0, EnumRuneType.WATER); addRune(components, -1, 0, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index b61c1312..50667a6a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.Iterator; import java.util.List; +import java.util.function.Consumer; public class RitualPump extends Ritual { public static final String PUMP_RANGE = "pumpRange"; @@ -90,7 +91,7 @@ public class RitualPump extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addRune(components, 1, 0, 1, EnumRuneType.WATER); addRune(components, 1, 0, -1, EnumRuneType.EARTH); addRune(components, -1, 0, -1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index c547d6b8..78e145ba 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -16,6 +16,7 @@ import net.minecraft.world.World; import java.util.Collections; import java.util.List; +import java.util.function.Consumer; public class RitualRegeneration extends Ritual { public static final String HEAL_RANGE = "heal"; @@ -152,19 +153,19 @@ public class RitualRegeneration extends Ritual { } @Override - public void gatherComponents(List components) { - components.add(new RitualComponent(new BlockPos(4, 0, 0), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(5, 0, -1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(5, 0, 1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(-4, 0, 0), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(-5, 0, -1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(-5, 0, 1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(0, 0, 4), EnumRuneType.FIRE)); - components.add(new RitualComponent(new BlockPos(1, 0, 5), EnumRuneType.FIRE)); - components.add(new RitualComponent(new BlockPos(-1, 0, 5), EnumRuneType.FIRE)); - components.add(new RitualComponent(new BlockPos(0, 0, -4), EnumRuneType.FIRE)); - components.add(new RitualComponent(new BlockPos(1, 0, -5), EnumRuneType.FIRE)); - components.add(new RitualComponent(new BlockPos(-1, 0, -5), EnumRuneType.FIRE)); + public void gatherComponents(Consumer components) { + components.accept(new RitualComponent(new BlockPos(4, 0, 0), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(5, 0, -1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(5, 0, 1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(-4, 0, 0), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(-5, 0, -1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(-5, 0, 1), EnumRuneType.AIR)); + components.accept(new RitualComponent(new BlockPos(0, 0, 4), EnumRuneType.FIRE)); + components.accept(new RitualComponent(new BlockPos(1, 0, 5), EnumRuneType.FIRE)); + components.accept(new RitualComponent(new BlockPos(-1, 0, 5), EnumRuneType.FIRE)); + components.accept(new RitualComponent(new BlockPos(0, 0, -4), EnumRuneType.FIRE)); + components.accept(new RitualComponent(new BlockPos(1, 0, -5), EnumRuneType.FIRE)); + components.accept(new RitualComponent(new BlockPos(-1, 0, -5), EnumRuneType.FIRE)); addOffsetRunes(components, 3, 5, 0, EnumRuneType.WATER); addCornerRunes(components, 3, 0, EnumRuneType.DUSK); addOffsetRunes(components, 4, 5, 0, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index 3bf3ab59..cc9390f9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -14,6 +14,7 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import java.util.List; +import java.util.function.Consumer; public class RitualSpeed extends Ritual { public static final String SPEED_RANGE = "sanicRange"; @@ -152,7 +153,7 @@ public class RitualSpeed extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addRune(components, 0, 0, -2, EnumRuneType.DUSK); addRune(components, 1, 0, -1, EnumRuneType.AIR); addRune(components, -1, 0, -1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java index 964744e8..8866eee8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; +import java.util.function.Consumer; public class RitualSuppression extends Ritual { public static final String SUPPRESSION_RANGE = "suppressionRange"; @@ -56,7 +56,7 @@ public class RitualSuppression extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 2, 0, EnumRuneType.WATER); addRune(components, -2, 0, -1, EnumRuneType.AIR); addRune(components, -1, 0, -2, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index c504e747..65120c45 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; +import java.util.function.Consumer; public class RitualUpgradeRemove extends Ritual { public static final String CHECK_RANGE = "fillRange"; @@ -102,7 +103,7 @@ public class RitualUpgradeRemove extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.DUSK); addCornerRunes(components, 2, 0, EnumRuneType.FIRE); addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java index 74867148..569998a1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java @@ -6,7 +6,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; +import java.util.function.Consumer; public class RitualWater extends Ritual { public static final String WATER_RANGE = "waterRange"; @@ -57,7 +57,7 @@ public class RitualWater extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.WATER); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 51cf4e4c..8d07813f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -15,6 +15,7 @@ import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; import java.util.List; +import java.util.function.Consumer; public class RitualWellOfSuffering extends Ritual { public static final String ALTAR_RANGE = "altar"; @@ -117,7 +118,7 @@ public class RitualWellOfSuffering extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.FIRE); addCornerRunes(components, 2, -1, EnumRuneType.FIRE); addParallelRunes(components, 2, -1, EnumRuneType.EARTH); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java index d4a15920..d21d4e8c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java @@ -11,6 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.List; +import java.util.function.Consumer; public class RitualZephyr extends Ritual { public static final String ZEPHYR_RANGE = "zephyrRange"; @@ -80,7 +81,7 @@ public class RitualZephyr extends Ritual { } @Override - public void gatherComponents(List components) { + public void gatherComponents(Consumer components) { addParallelRunes(components, 2, 0, EnumRuneType.AIR); addCornerRunes(components, 1, 1, EnumRuneType.AIR); addParallelRunes(components, 1, -1, EnumRuneType.AIR); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index a63f727e..472ed94f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -271,7 +271,7 @@ public class ClientHandler { double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; List components = Lists.newArrayList(); - ritual.gatherComponents(components); + ritual.gatherComponents(components::add); for (RitualComponent ritualComponent : components) { vX = vec3.add(ritualComponent.getOffset(direction)); double minX = vX.getX() - posX; @@ -350,7 +350,7 @@ public class ClientHandler { double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; List components = Lists.newArrayList(); - ritual.gatherComponents(components); + ritual.gatherComponents(components::add); for (RitualComponent ritualComponent : components) { vX = vec3.add(ritualComponent.getOffset(direction)); double minX = vX.getX() - posX; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index 5a73de68..fa6e3963 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; -import java.util.ArrayList; import java.util.List; public class RitualHelper { @@ -79,7 +78,7 @@ public class RitualHelper { } List components = Lists.newArrayList(); - ritual.gatherComponents(components); + ritual.gatherComponents(components::add); for (RitualComponent component : components) { BlockPos newPos = pos.add(component.getOffset(direction)); From c079da79692256dcebf62724c71912df251b6457 Mon Sep 17 00:00:00 2001 From: qianzha Date: Thu, 8 Mar 2018 08:12:52 +0800 Subject: [PATCH 128/493] Update zh_CN.lang (#1240) * Update zh_CN.lang * Update zh_CN.lang * Update zh_TW.lang --- .../assets/bloodmagic/lang/zh_CN.lang | 144 +++++++++--------- .../assets/bloodmagicguide/lang/zh_CN.lang | 4 +- .../assets/bloodmagicguide/lang/zh_TW.lang | 2 +- 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang index f824d9ce..5c76206c 100644 --- a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang @@ -3,12 +3,12 @@ itemGroup.bloodmagic.creativeTab=血魔法 itemGroup.bloodmagic.creativeTabTome=血魔法|手册 #Items -item.bloodmagic.activationCrystal.weak.name=[虚弱]激活水晶 -item.bloodmagic.activationCrystal.awakened.name=[觉醒]激活水晶 -item.bloodmagic.activationCrystal.creative.name=[创造]激活水晶 +item.bloodmagic.activation_crystal.weak.name=[虚弱]激活水晶 +item.bloodmagic.activation_crystal.awakened.name=[觉醒]激活水晶 +item.bloodmagic.activation_crystal.creative.name=[创造]激活水晶 -item.bloodmagic.sacrificialDagger.normal.name=牺牲匕首 -item.bloodmagic.sacrificialDagger.creative.name=[创造]牺牲匕首 +item.bloodmagic.sacrificial_dagger.normal.name=牺牲匕首 +item.bloodmagic.sacrificial_dagger.creative.name=[创造]牺牲匕首 item.bloodmagic.pack.selfSacrifice.name=血液背包 item.bloodmagic.pack.sacrifice.name=斗士铠衣 item.bloodmagic.daggerOfSacrifice.name=献祭刀 @@ -63,79 +63,76 @@ item.bloodmagic.reagent.virtus.name=力é‡å…ƒç´  item.bloodmagic.reagent.reductus.name=代价元素 item.bloodmagic.reagent.potentia.name=效能元素 -item.bloodmagic.bloodShard.weak.name=[虚弱]气血碎片 -item.bloodmagic.bloodShard.demon.name=[æ¶é­”]气血碎片 +item.bloodmagic.blood_shard.weak.name=[虚弱]气血碎片 +item.bloodmagic.blood_shard.demonic.name=[æ¶é­”]气血碎片 -item.bloodmagic.baseComponent.reagentWater.name=水之试剂 -item.bloodmagic.baseComponent.reagentLava.name=熔岩试剂 -item.bloodmagic.baseComponent.reagentAir.name=风之试剂 -item.bloodmagic.baseComponent.reagentFastMiner.name=采掘试剂 -item.bloodmagic.baseComponent.reagentVoid.name=虚空试剂 -item.bloodmagic.baseComponent.reagentGrowth.name=促生试剂 -item.bloodmagic.baseComponent.reagentAffinity.name=元素试剂 -item.bloodmagic.baseComponent.reagentSight.name=è§è§£è¯•å‰‚ -item.bloodmagic.baseComponent.reagentBinding.name=æŸç¼šè¯•å‰‚ -item.bloodmagic.baseComponent.reagentSuppression.name=抑液试剂 -item.bloodmagic.baseComponent.frameParts.name=框架零件 -item.bloodmagic.baseComponent.reagentBloodLight.name=血光试剂 -item.bloodmagic.baseComponent.reagentMagnetism.name=ç£å¼•è¯•å‰‚ -item.bloodmagic.baseComponent.reagentHaste.name=急速试剂 -item.bloodmagic.baseComponent.reagentBridge.name=影桥试剂 -item.bloodmagic.baseComponent.reagentCompression.name=压挤试剂 -item.bloodmagic.baseComponent.reagentSeverance.name=éš”ç»è¯•å‰‚ -item.bloodmagic.baseComponent.reagentHolding.name=集æŒè¯•å‰‚ -item.bloodmagic.baseComponent.reagentClaw.name=爪之试剂 -item.bloodmagic.baseComponent.reagentBounce.name=弹性试剂 -item.bloodmagic.baseComponent.reagentFrost.name=霜之试剂 +item.bloodmagic.baseComponent.reagent_water.name=水之试剂 +item.bloodmagic.baseComponent.reagent_lava.name=熔岩试剂 +item.bloodmagic.baseComponent.reagent_air.name=风之试剂 +item.bloodmagic.baseComponent.reagent_fast_miner.name=采掘试剂 +item.bloodmagic.baseComponent.reagent_void.name=虚空试剂 +item.bloodmagic.baseComponent.reagent_growth.name=促生试剂 +item.bloodmagic.baseComponent.reagent_affinity.name=元素试剂 +item.bloodmagic.baseComponent.reagent_sight.name=è§è§£è¯•å‰‚ +item.bloodmagic.baseComponent.reagent_binding.name=æŸç¼šè¯•å‰‚ +item.bloodmagic.baseComponent.reagent_suppression.name=抑液试剂 +item.bloodmagic.baseComponent.reagent_bloodlight.name=血光试剂 +item.bloodmagic.baseComponent.reagent_magnetism.name=ç£å¼•è¯•å‰‚ +item.bloodmagic.baseComponent.reagent_haste.name=急速试剂 +item.bloodmagic.baseComponent.reagent_bridge.name=影桥试剂 +item.bloodmagic.baseComponent.reagent_compression.name=压挤试剂 +item.bloodmagic.baseComponent.reagent_severance.name=éš”ç»è¯•å‰‚ +item.bloodmagic.baseComponent.reagent_holding.name=集æŒè¯•å‰‚ +item.bloodmagic.baseComponent.reagent_claw.name=爪之试剂 +item.bloodmagic.baseComponent.reagent_bounce.name=弹性试剂 +item.bloodmagic.baseComponent.reagent_frost.name=霜之试剂 +item.bloodmagic.baseComponent.reagent_teleposition.name=ä¼ é€è¯•å‰‚ +item.bloodmagic.baseComponent.reagent_transposition.name=移ä½è¯•å‰‚ -item.bloodmagic.baseComponent.reagentTeleposition.name=ä¼ é€è¯•å‰‚ -item.bloodmagic.baseComponent.reagentTransposition.name=移ä½è¯•å‰‚ - -item.bloodmagic.baseComponent.ironSand.name=é“矿砂 -item.bloodmagic.baseComponent.goldSand.name=金矿砂 -item.bloodmagic.baseComponent.coalSand.name=煤矿砂 -item.bloodmagic.baseComponent.plantOil.name=æ¤ç‰©æ²¹ +item.bloodmagic.baseComponent.frame_part.name=框架零件 +item.bloodmagic.baseComponent.sand_iron.name=é“矿砂 +item.bloodmagic.baseComponent.sand_gold.name=金矿砂 +item.bloodmagic.baseComponent.sand_coal.name=煤矿砂 +item.bloodmagic.baseComponent.plant_oil.name=æ¤ç‰©æ²¹ item.bloodmagic.baseComponent.sulfur.name=硫磺 item.bloodmagic.baseComponent.saltpeter.name=ç¡çŸ³ -item.bloodmagic.baseComponent.neurotoxin.name=神ç»æ¯’ç´  +item.bloodmagic.baseComponent.neuro_toxin.name=神ç»æ¯’ç´  item.bloodmagic.baseComponent.antiseptic.name=防è…剂 +item.bloodmagic.baseComponent.catalyst_length_1.name=简å•çš„延时催化剂 +item.bloodmagic.baseComponent.catalyst_power_1.name=简å•çš„功效催化剂 -item.bloodmagic.cuttingFluid.basicCuttingFluid.name=基础切削油 -item.bloodmagic.cuttingFluid.explosive.name=爆炸ç«è¯ +item.bloodmagic.cutting_fluid.basic.name=基础切削油 +item.bloodmagic.cutting_fluid.explosive.name=爆炸ç«è¯ -item.bloodmagic.baseComponent.mundaneLength.name=简å•çš„延时催化剂 -item.bloodmagic.baseComponent.mundanePower.name=简å•çš„功效催化剂 +item.bloodmagic.demonCrystal.default.name=æ¶é­”æ„志晶体 +item.bloodmagic.demonCrystal.corrosive.name=è…蚀æ„志晶体 +item.bloodmagic.demonCrystal.destructive.name=ç ´åæ„志晶体 +item.bloodmagic.demonCrystal.vengeful.name=å¤ä»‡æ„志晶体 +item.bloodmagic.demonCrystal.steadfast.name=åšæ¯…æ„志晶体 - -item.bloodmagic.demonCrystal.crystalDefault.name=æ¶é­”æ„志晶体 -item.bloodmagic.demonCrystal.crystalCorrosive.name=è…蚀æ„志晶体 -item.bloodmagic.demonCrystal.crystalDestructive.name=ç ´åæ„志晶体 -item.bloodmagic.demonCrystal.crystalVengeful.name=å¤ä»‡æ„志晶体 -item.bloodmagic.demonCrystal.crystalSteadfast.name=åšæ¯…æ„志晶体 - -item.bloodmagic.monsterSoul.base.name=[原生]æ¶é­”æ„å¿— -item.bloodmagic.monsterSoul.corrosive.name=[è…蚀]æ¶é­”æ„å¿— -item.bloodmagic.monsterSoul.destructive.name=[ç ´å]æ¶é­”æ„å¿— -item.bloodmagic.monsterSoul.vengeful.name=[å¤ä»‡]æ¶é­”æ„å¿— -item.bloodmagic.monsterSoul.steadfast.name=[åšæ¯…]æ¶é­”æ„å¿— +item.bloodmagic.monster_soul.raw.name=[原生]æ¶é­”æ„å¿— +item.bloodmagic.monster_soul.corrosive.name=[è…蚀]æ¶é­”æ„å¿— +item.bloodmagic.monster_soul.destructive.name=[ç ´å]æ¶é­”æ„å¿— +item.bloodmagic.monster_soul.vengeful.name=[å¤ä»‡]æ¶é­”æ„å¿— +item.bloodmagic.monster_soul.steadfast.name=[åšæ¯…]æ¶é­”æ„å¿— item.bloodmagic.sigil.air.name=风之å°è®° -item.bloodmagic.sigil.bloodLight.name=血光å°è®° +item.bloodmagic.sigil.blood_light.name=血光å°è®° item.bloodmagic.sigil.compression.name=压挤å°è®° item.bloodmagic.sigil.divination.name=å åœå°è®° item.bloodmagic.sigil.water.name=水之å°è®° item.bloodmagic.sigil.lava.name=熔岩å°è®° item.bloodmagic.sigil.void.name=虚空å°è®° -item.bloodmagic.sigil.greenGrove.name=绿丛å°è®° -item.bloodmagic.sigil.elementalAffinity.name=元素å°è®° +item.bloodmagic.sigil.green_grove.name=绿丛å°è®° +item.bloodmagic.sigil.elemental_affinity.name=元素å°è®° item.bloodmagic.sigil.haste.name=急速å°è®° item.bloodmagic.sigil.suppression.name=抑液å°è®° item.bloodmagic.sigil.magnetism.name=ç£å¼•å°è®° -item.bloodmagic.sigil.fastMiner.name=速掘å°è®° +item.bloodmagic.sigil.fast_miner.name=速掘å°è®° item.bloodmagic.sigil.seer.name=è§è§£å°è®° -item.bloodmagic.sigil.phantomBridge.name=影桥å°è®° +item.bloodmagic.sigil.phantom_bridge.name=影桥å°è®° item.bloodmagic.sigil.whirlwind.name=旋风å°è®° -item.bloodmagic.sigil.enderSeverance.name=ç»å½±å°è®° +item.bloodmagic.sigil.ender_severance.name=ç»å½±å°è®° item.bloodmagic.sigil.holding.name=集æŒå°è®° item.bloodmagic.sigil.holding.display=&r%s：&o&n%s item.bloodmagic.sigil.teleposition.name=ä¼ é€å°è®° @@ -188,7 +185,7 @@ item.bloodmagic.fluidFilter.exact.name=精确液体筛选器 item.bloodmagic.experienceTome.name=ç»éªŒæ‰‹å†Œ item.bloodmagic.sanguineBook.name=指示之书 -item.bloodmagic.livingPointUpgrade.draftAngelus.name=祷告之始 +item.bloodmagic.living_point_upgrade.draft_angelus.name=祷告之始 item.bloodmagic.willGauge.name=çµåŸŸæµ‹é‡ä»ª item.bloodmagic.potionFlask.name=è¯å‰‚瓶 @@ -207,10 +204,10 @@ tile.bloodmagic.rune.blank.name=空白符文 tile.bloodmagic.rune.speed.name=速度符文 tile.bloodmagic.rune.efficiency.name=效率符文 tile.bloodmagic.rune.sacrifice.name=献祭符文 -tile.bloodmagic.rune.selfsacrifice.name=牺牲符文 +tile.bloodmagic.rune.self_sacrifice.name=牺牲符文 tile.bloodmagic.rune.displacement.name=转ä½ç¬¦æ–‡ tile.bloodmagic.rune.capacity.name=增容符文 -tile.bloodmagic.rune.augcapacity.name=超容符文 +tile.bloodmagic.rune.augmented_capacity.name=超容符文 tile.bloodmagic.rune.orb.name=å®ç ç¬¦æ–‡ tile.bloodmagic.rune.acceleration.name=促进符文 tile.bloodmagic.rune.charging.name=充能符文 @@ -224,10 +221,10 @@ tile.bloodmagic.ritualStone.air.name=风之仪å¼çŸ³ tile.bloodmagic.ritualStone.dusk.name=薄暮仪å¼çŸ³ tile.bloodmagic.ritualStone.dawn.name=破晓仪å¼çŸ³ -tile.bloodmagic.bloodstonebrick.large.name=大血石砖 -tile.bloodmagic.bloodstonebrick.brick.name=血石砖 -tile.bloodmagic.crystal.large.name=æ™¶ç°‡å— -tile.bloodmagic.crystal.brick.name=晶簇砖 +tile.bloodmagic.bloodstone_tile.name=大血石砖 +tile.bloodmagic.bloodstone_brick.name=血石砖 +tile.bloodmagic.crystal_tile.name=æ™¶ç°‡å— +tile.bloodmagic.crystal_brick.name=晶簇砖 tile.bloodmagic.bloodLight.name=è¡€ä¹‹å…‰æº tile.bloodmagic.spectralBlock.name=å¹½çµæ–¹å— tile.bloodmagic.phantom.name=å½±æ¡¥æ–¹å— @@ -389,7 +386,7 @@ tooltip.bloodmagic.activated=激活 tooltip.bloodmagic.deactivated=åœç”¨ tooltip.bloodmagic.sigil.air.desc=&o我感到轻æ¾å¤šäº†... -tooltip.bloodmagic.sigil.bloodLight.desc=&o我看è§äº†ä¸€æŸå…‰æ˜Ž! +tooltip.bloodmagic.sigil.blood_light.desc=&o我看è§äº†ä¸€æŸå…‰æ˜Ž! tooltip.bloodmagic.sigil.compression.desc=&o钻石之手 tooltip.bloodmagic.sigil.divination.desc=&o窥视çµé­‚ tooltip.bloodmagic.sigil.divination.otherNetwork=窥视 %s çš„çµé­‚ @@ -402,11 +399,11 @@ tooltip.bloodmagic.sigil.divination.currentBonus=当å‰æ•ˆç›Šï¼š+%d%% tooltip.bloodmagic.sigil.water.desc=&oæ— é™æ°´æº? tooltip.bloodmagic.sigil.lava.desc=&o噢好烫! ä¸è¦åƒ tooltip.bloodmagic.sigil.void.desc=&o胜过速易æ´Â®! -tooltip.bloodmagic.sigil.greenGrove.desc=&o绿色环ä¿æ— æ±¡æŸ“ +tooltip.bloodmagic.sigil.green_grove.desc=&o绿色环ä¿æ— æ±¡æŸ“ tooltip.bloodmagic.sigil.magnetism.desc=&o我现在éžå¸¸å…·æœ‰å¸å¼•åŠ› tooltip.bloodmagic.sigil.suppression.desc=&o比念力移动更好... tooltip.bloodmagic.sigil.haste.desc=&o42继咖啡因åŽ... -tooltip.bloodmagic.sigil.fastMiner.desc=&o继续挖, 继续挖... +tooltip.bloodmagic.sigil.fast_miner.desc=&o继续挖, 继续挖... tooltip.bloodmagic.sigil.elementalAffinity.desc=&oè½å…¥ç„°ä¸­çš„鱼儿! tooltip.bloodmagic.sigil.seer.desc=&o当看到的一切还ä¸è¶³å¤Ÿ tooltip.bloodmagic.sigil.seer.currentAltarProgress=当å‰è¿›åº¦ï¼š%d LP/ %s LP @@ -418,9 +415,9 @@ tooltip.bloodmagic.sigil.seer.currentAltarCapacity=当å‰å®¹é‡ï¼š%d LP tooltip.bloodmagic.sigil.seer.currentCharge=当å‰å‚¨èƒ½ï¼š%d tooltip.bloodmagic.sigil.seer.currentTranquility=当å‰é™è°§ï¼š%d tooltip.bloodmagic.sigil.seer.currentBonus=当å‰æ•ˆç›Šï¼š+%d%% -tooltip.bloodmagic.sigil.phantomBridge.desc=&o御气于é’空之上... +tooltip.bloodmagic.sigil.phantom_bridge.desc=&o御气于é’空之上... tooltip.bloodmagic.sigil.whirlwind.desc=&o最好ä¸è¦ç©¿è£™å­ -tooltip.bloodmagic.sigil.enderSeverance.desc=&o使末影人é‡ä¸Šä¸€ä¸ªä¸¥å³»å½¢åŠ¿ï¼ +tooltip.bloodmagic.sigil.ender_severance.desc=&o使末影人é‡ä¸Šä¸€ä¸ªä¸¥å³»å½¢åŠ¿ï¼ tooltip.bloodmagic.sigil.teleposition.desc=éšæ—¶å¯ä»¥è„±ç¦»è¿™é‡Œã€‚ tooltip.bloodmagic.sigil.transposition.desc=æ„Ÿå—原力的力é‡ï¼Œæˆ‘年轻的学徒。 tooltip.bloodmagic.sigil.holding.press=按下&o%s&r&7修改 @@ -443,9 +440,9 @@ tooltip.bloodmagic.pack.selfSacrifice.desc=相当ä¸èˆ’适的背包... tooltip.bloodmagic.pack.sacrifice.desc=æè¿° tooltip.bloodmagic.pack.stored=储存：%d LP -tooltip.bloodmagic.activationCrystal.weak=æ¿€æ´»ä½Žç­‰ä»ªå¼ -tooltip.bloodmagic.activationCrystal.awakened=æ¿€æ´»æ›´å¼ºå¤§çš„ä»ªå¼ -tooltip.bloodmagic.activationCrystal.creative=åˆ›é€ æ¨¡å¼ - æ¿€æ´»ä»»ä½•ä»ªå¼ +tooltip.bloodmagic.activation_crystal.weak=æ¿€æ´»ä½Žç­‰ä»ªå¼ +tooltip.bloodmagic.activation_crystal.awakened=æ¿€æ´»æ›´å¼ºå¤§çš„ä»ªå¼ +tooltip.bloodmagic.activation_crystal.creative=åˆ›é€ æ¨¡å¼ - æ¿€æ´»ä»»ä½•ä»ªå¼ tooltip.bloodmagic.diviner.currentRitual=当å‰ä»ªå¼: tooltip.bloodmagic.diviner.blankRune=空白仪å¼çŸ³ï¼š%d @@ -472,6 +469,7 @@ tooltip.bloodmagic.arcaneAshes=ç”¨äºŽç»˜åˆ¶ç‚¼é‡‘çŸ©é˜µçš„ç²‰ç° tooltip.bloodmagic.telepositionFocus.coords=当å‰å标：(%d, %d, %d) tooltip.bloodmagic.telepositionFocus.dimension=世界ID：%d +tooltip.bloodmagic.telepositionFocus.bound=绑定：%s 于 %d, %d, %d tooltip.bloodmagic.telepositionFocus.weak=用于在世界中转移区域 tooltip.bloodmagic.telepositionFocus.enhanced=用于在世界中转移区域 tooltip.bloodmagic.telepositionFocus.reinforced=用于在世界中转移区域 diff --git a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang index 7732676e..e6c42342 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang @@ -145,7 +145,7 @@ guide.bloodmagic.entry.architect.weakorb.info.1=没了魔法æ¥æºçš„魔法师 guide.bloodmagic.entry.architect.weakorb.info.2=虚弱气血å®ç ä¾¿æ˜¯ä½ èƒ½åˆ¶ä½œçš„第一ç§å®ç â€”—åªéœ€å‘一粒钻石中çŒæ³¨ä¸¤åƒLP的生命力å³å¯å®Œæˆã€‚将已绑定的å®ç æ”¾å…¥ç¥­å›ï¼Œå®ƒå°±å¯ä»¥ä¸æ–­åœ°ä»Žç¥­å›ä¸­æŠ½å–LP，直接输入çµé­‚网络中。å¦å¤–，ä¸è®ºä»€ä¹ˆå®ç ï¼Œå…¶å®¹é‡ä¸Šé™éƒ½åªèƒ½é€šè¿‡ä¸€äº›é«˜çº§ç¬¦æ–‡æ¥æå‡ï¼›è¿™é‡Œæ³¨æ„一点，这个容é‡æå‡çš„效果åªæœ‰åœ¨å®ç åœ¨ç¥­å›ä¸Šæ—¶æ‰æœ‰æ•ˆã€‚对于虚弱气血å®ç ï¼Œæœ€é«˜åªèƒ½æå‡åˆ°äº”åƒã€‚\n\t/cut玩家还å¯ä»¥é€šè¿‡ç®€å•åœ°ä½¿ç”¨æ°”è¡€å®ç æ¥èŽ·å¾—LP——æ¯ä¸€æ¬¡ä½¿ç”¨éƒ½ä¼šå¯¹çŽ©å®¶é€ æˆä¸€é¢—心的伤害并æä¾›200LP。此法ä¸èƒ½ä»¤ç½‘络中的LPæ•°é‡çªç ´å®¹é‡ä¸Šé™ã€‚\n\t祭å›åªå¯èƒ½ä¸ºä¸Žè‡ªå·±çº§åˆ«ç›¸å½“，或者比自己级别低的气血å®ç æä¾›LP。举例，三级的å®ç åªå¯èƒ½åœ¨ä¸‰çº§æˆ–更高级的祭å›ä¸­èŽ·å¾—LP，一级的祭å›æ˜¯æ— æ³•èƒœä»»çš„。 guide.bloodmagic.entry.architect.incense.info.1=血法师会ç»å¸¸å‘现，它们的LP产能时常跟ä¸ä¸Šæ¶ˆè€—。当然，有特殊的符文å¯ä»¥æ高自我献祭所产生的生命æºè´¨çš„æ•°é‡ï¼Œä½†è¿™ä¸ªè¿‡ç¨‹ä¾æ—§æ˜¯å¦‚此缓慢。åªæœ‰è¿™ä¸€æ¡è·¯å¯ä»¥èµ°äº†å—？\n\t下é¢ä»‹ç»ç†é¦™ç¥­å›ã€‚ç†é¦™ç¥­å›æœ¬èº«å¯ä»¥ä»¥è‡ªèº«ä¸ºä¸­å¿ƒï¼Œæ ‡è®°å‡ºä¸€ç‰‡é™è°§çš„土地，在这范围内，它å¯ä»¥å€ŸåŠ©ç¥­å›æœ¬èº«æ•£å‘出的余力æ¥å®‰æŠšæƒŠæ‰°åˆ°çš„çµé­‚。当然你ä¸æ˜¯å¾ˆæ¸…楚这/cutè‚¡ç†é¦™çš„æ°”æ¯ä»Žä½•è€Œæ¥ï¼Œä½†å¥½åƒåˆæ²¡ä»€ä¹ˆä¸å¯¹ï¼Ÿå…ˆä¸ç®¡äº†ã€‚\n\tç†é¦™ç¥­å›çš„作用就是如此：利用é™è°§çš„环境æ¥æå‡å•é¢—心所创造出的生命æºè´¨çš„æ•°é‡ã€‚在你è·ç¦»ç†é¦™ç¥­å›åªæœ‰çº¦èŽ«äº”格远的地方时，它会散å‘出ç«ç„°é¢—粒以è¯æ˜Žå…¶å·²ç»åˆ›é€ å‡ºé™è°§åŒºåŸŸã€‚在它的影å“范围下，你的牺牲匕首也会å‘生å˜åŒ–，以è¯æ˜Žç†é¦™å·²ç»å‘挥其效果。整个过程大约æŒç»­äº”秒钟，你å¯ä»¥é€šè¿‡è§‚察ç«ç„°/cutç²’å­çš„存在æ¥åˆ¤æ–­æ˜¯å¦ç»“æŸã€‚此时，使用牺牲匕首献祭自己将会一次性献祭你生命值上é™çš„百分之ä¹å，并将对应数é‡çš„LP输入血之祭å›ä¹‹ä¸­ã€‚LPæ•°é‡å’ŒçŒ®ç¥­çš„生命值ä¾æ—§æˆæ­£æ¯”，但此时它的转化率会根æ®é™„è¿‘çš„é™è°§å€¼è€Œæœ‰æ‰€ä¸Šå‡ï¼›é»˜è®¤ï¼Œå¢žå¹…是百分之二å。\n\tå¦å¤–，å åœå°è®°å¯ä»¥æ­ç¤ºé™„è¿‘çš„é™è°§å€¼ï¼Œä»¥åŠé™è°§æ‰€å¸¦æ¥çš„具体增幅水平。 guide.bloodmagic.entry.architect.incense.info.2=自然，百分之二å的增幅已ç»å¤Ÿå¤šäº†ï¼Œä½†ç†é¦™ç¥­å›ä½œç”¨çš„范围还是å¯ä»¥ç»§ç»­æ‰©å±•çš„。你åªéœ€è¦åœ¨ç†é¦™ç¥­å›æŸä¸ªåŸºç¡€æ–¹å‘（å³ï¼Œæ­£ä¸œã€æ­£è¥¿ã€æ­£å—ã€æ­£åŒ—）两格远的地方排出一列三å—高度一样木质路é¢å³å¯å®šä¹‰ä¸€ä¸ªâ€œèŒƒå›´â€ã€‚在此“范围â€ä¸­çš„ä»»æ„æ–¹å—都有助于让这片区域更加é™è°§ã€‚木质路é¢è¿˜å¯ä»¥ç»§ç»­æ‰©å±•ï¼ŒæƒŸéœ€éµå®ˆä»¥ä¸‹è§„则：一，æ¯ä¸€åˆ—木质路é¢å¿…须水平，å³æž„æˆæ–°ä¸€åˆ—è·¯é¢çš„æ–¹å—必须高度相åŒï¼›äºŒï¼Œæ–°çš„è·¯é¢å¿…é¡»ä½äºŽä¸Šä¸€åˆ—è·¯é¢çš„上/cut下五格范围内。简å•æ¥è¯´ï¼Œé‡‘å­—å¡”ã€å€’金字塔等阶梯å¼ç»“构都是å¯ä»¥çš„。\n\t然而，这个范围并éžå¯ä»¥æ— èŠ‚制地扩张。木质路é¢åªèƒ½å åŠ ä¸‰åˆ—ï¼›ä¸è¿‡ä¸ç”¨æ‹…心，还有一ç§å¯ä»¥å åŠ äº”列的石质路é¢ï¼›ç”šè‡³è¿˜æœ‰å¯ä»¥å åŠ ä¹åˆ—的碎石路é¢å’Œé»‘曜石路é¢ã€‚自然地，你在å åŠ ä¸‰åˆ—木路é¢åŽå°±éœ€è¦ç”¨çŸ³å¤´çš„；然而你完全å¯ä»¥ä¸€å¼€å§‹å°±ç”¨çŸ³å¤´çš„，åªè¦ä½ ä¸æ˜¯åªç”¨æœ¨è·¯é¢å°±å¥½ã€‚\n\t/cut回到é™è°§ç¨‹åº¦çš„问题上æ¥ã€‚事实上åªæœ‰ä¸€éƒ¨åˆ†æ–¹å—å¯ä»¥è®©è¿™ç‰‡åŒºåŸŸæ›´åŠ é™è°§ï¼Œè€Œæ ¹æ®å®žéªŒï¼Œè¿™äº›æ–¹å—被分æˆäº†è‹¥å¹²ç§ã€‚举个例å­ï¼Œä½ åœ¨è¿™ç‰‡åŒºåŸŸä¸­ç§äº†åœŸè±†ï¼ŒåœŸè±†å±žäºŽâ€œä½œç‰©â€åˆ†ç±»ï¼Œç„¶åŽè¿™ç‰‡åŒºåŸŸä¾¿å¹³é™äº†ä¸€äº›ã€‚ä¸è®ºæ˜¯ä½ æŽ¥ç€ç§åœŸè±†ï¼Œæˆ–者你ç§èµ·äº†èƒ¡èåœï¼Œå®ƒä»¬çš„效果都会éšç€ä½ ç§çš„æ•°é‡çš„增多而é™ä½Žï¼Œç”šè‡³è¿˜ä¼šæŠµæ¶ˆä¸€å¼€å§‹çš„效果，因为它们都属于“作物â€ã€‚为了最好的效果，你需è¦å°½å¯èƒ½ä½¿ç”¨å¤šç§ä¸åŒç±»åž‹çš„æ–¹å—。/cut有助于平é™çš„æ–¹å—有这么几类：作物ã€åŽŸæœ¨ã€æ ‘å¶ã€ç†”岩ã€åœ°ç‹±å²©ã€è€•åœ°ã€æ°´ã€ç”Ÿå‘½æºè´¨ã€ä»¥åŠå…¶ä»–东西（原文如此）。 -guide.bloodmagic.entry.architect.bloodrune.info.1=éšç€ä½ é€æ¸æ·±å…¥è¡€é­”法，你会å‘现你那普普通通的血之祭å›å·²æ— æ³•æ»¡è¶³ä½ çš„需è¦äº†ã€‚但你还å¯ä»¥é€šè¿‡æ”¾ç½®ä¸€ç§å为气血符文的特殊方å—æ¥æå‡ç¥­å›çš„整体属性，进而解é”更多的åˆæˆã€‚\n\t将血之祭å›å‡åˆ°2级的方法很简å•ï¼šåœ¨ç¥­å›æœ¬èº«å¾€ä¸‹ä¸€å±‚放置八个一圈的气血符文。如果你实在æžä¸æ¸…楚具体的ä½ç½®ï¼ŒæŒ‡ç¤ºä¹‹ä¹¦å¯ä»¥å¸®åˆ°ä½ â€”—它å¯ä»¥ä»¥ä¸€ç§ç±»ä¼¼å…¨æ¯æŠ•å½±çš„/cutæ–¹å¼æŒ‡æ˜Žä½ éœ€è¦æ”¾ç½®æ°”血符文的ä½ç½®ã€‚\n\t尽管åªéœ€è¦ç©ºç™½æ°”血符文就å¯ä»¥å®Œæˆç¥­å›å‡çº§ï¼Œæˆ‘ä»ç„¶æŽ¨è你对使用带有特殊强化的气血符文。这些带有特殊强化的气血符文å¯ä»¥æ高祭å›çš„åˆæˆé€Ÿåº¦ã€å®¹é‡ä»¥åŠæ•ˆçŽ‡ï¼Œè€Œä¸”，除了二级祭å›çš„四个角上的符文必须是空白符文外，其他ä½ç½®çš„空白符文都å¯ä»¥æ›¿æ¢ã€‚有关这些特殊的气血/cut符文的资料å¯ä»¥åœ¨åŽé¢çš„章节找到。 +guide.bloodmagic.entry.architect.bloodrune.info.1=éšç€ä½ é€æ¸æ·±å…¥è¡€é­”法，你会å‘现你那普普通通的血之祭å›å·²æ— æ³•æ»¡è¶³ä½ çš„需è¦äº†ã€‚但你还å¯ä»¥é€šè¿‡æ”¾ç½®ä¸€ç§å为气血符文的特殊方å—æ¥æå‡ç¥­å›çš„整体属性，进而解é”更多的åˆæˆã€‚\n\t将血之祭å›å‡åˆ°2级的方法很简å•ï¼šåœ¨ç¥­å›æœ¬èº«å¾€ä¸‹ä¸€å±‚放置八个一圈的气血符文。如果你实在æžä¸æ¸…楚具体的ä½ç½®ï¼ŒæŒ‡ç¤ºä¹‹ä¹¦å¯ä»¥å¸®åˆ°ä½ â€”—它å¯ä»¥ä»¥ä¸€ç§ç±»ä¼¼å…¨æ¯æŠ•å½±çš„/cutæ–¹å¼æŒ‡æ˜Žä½ éœ€è¦æ”¾ç½®æ°”血符文的ä½ç½®ã€‚\n\t尽管åªéœ€è¦ç©ºç™½æ°”血符文就å¯ä»¥å®Œæˆç¥­å›å‡çº§ï¼Œæˆ‘ä»ç„¶æŽ¨è你对使用带有特殊强化的气血符文。祭å›ä¸Šçš„æ¯ä¸€ä¸ªç¬¦æ–‡éƒ½å¯ä»¥è¢«æ¢ä½œç‰¹æ®Šçš„气血符文（唯一的例外是，二级祭å›å››ä¸ªè§’è½ä¸Šçš„特殊符文ä¸ä¼šæœ‰æ•ˆæžœâ€”—但在三级åŠä»¥ä¸Šçš„祭å›ï¼Œè¿™å››ä¸ªä½ç½®çš„特殊符文则å¯ä»¥ä½¿ç”¨ï¼‰ã€‚这些带有特殊强化的气血符文å¯ä»¥æ高/cut祭å›çš„åˆæˆé€Ÿåº¦ã€å®¹é‡ä»¥åŠæ•ˆçŽ‡ã€‚有关这些特殊的气血符文的资料å¯ä»¥åœ¨åŽé¢çš„章节找到。 guide.bloodmagic.entry.architect.inspectoris.info.1=Inspectoris Scandalum åœ¨æ‹‰ä¸ è¯­ä¸­å¤§æ¦‚çš„æ„æ€æ˜¯â€œæ–¹å—读å–器â€ã€‚事实上，它的用途是，潜行时对ç€æŸä¸ªæ–¹å—使用，便å¯è§£è¯»é‚£äº›å¤æ‚结构的信æ¯ï¼Œå¹¶å°†å…¶æ˜¾ç¤ºåœ¨ä½ çœ¼å‰ã€‚ç›®å‰ï¼Œå®ƒåªèƒ½ç»™å‡ºè¡€ä¹‹ç¥­å›çš„相关信æ¯ï¼šå®ƒå¯ä»¥ç»™å‡ºå‡çº§ç¥­å›æ‰€éœ€çš„æ–¹å—çš„ç§ç±»ï¼Œä»¥åŠå…·ä½“摆放ä½ç½®ã€‚\n\t若你觉得一次一次查询ä¸é€‚åˆä½ ï¼Œä½ å¯ä»¥è¯•ç€æ½œè¡Œæ—¶å¯¹ç€ç©ºæ°”使用此物以切æ¢ç›®æ ‡å±‚/cut级。这样，å†æ¬¡æŒ‰å‰æ–‡æ‰€è¿°çš„æ–¹å¼ä½¿ç”¨æ­¤ç‰©ï¼Œå®ƒå°±å¯ä»¥ä»¥ä¸€ç§ç±»ä¼¼å…¨æ¯æŠ•å½±çš„æ–¹å¼å°†å‡çº§æ‰€éœ€çš„æ–¹å—çš„ä½ç½®æŠ•å½±å‡ºæ¥ã€‚设定级别为1æ—¶å¯ä»¥å…³é—­è¿™ä¸ªç±»å…¨æ¯æŠ•å½±çš„效果。 guide.bloodmagic.entry.architect.runeSpeed.info.1=速度符文å¯ä»¥æ高祭å›å†…的压力，藉由此加速嬗å˜è¿‡ç¨‹ï¼Œä»Žè€Œæ高åˆæˆé€Ÿåº¦ã€‚æ¯å—速度符文都会æ高20%%的祭å›çš„LP消耗速度。它åŒæ—¶ä¹Ÿä¼šå½±å“çŒæ³¨æ°”è¡€å®ç çš„速度。 guide.bloodmagic.entry.architect.water.info.1=顾åæ€ä¹‰ï¼Œæ°´ä¹‹å°è®°æ˜¯ä¸€å—å¯å‡èšç©ºæ°”中水分，并将其集中于一点上的å°è®°ã€‚除此之外，对ç€ä»»ä½•èƒ½è£…水的设备使用水之å°è®°éƒ½å¯ä»¥å‘设备里é¢è£…一桶水。总而言之，它便是一个移动的无é™æ°´æºã€‚æ¯æ¬¡ä½¿ç”¨éƒ½ä¼šæ¶ˆè€—50点LP。 @@ -243,6 +243,7 @@ guide.bloodmagic.entry.alchemy.bounce=法阵：弹跳 guide.bloodmagic.entry.alchemy.turret=法阵：骷髅炮塔 guide.bloodmagic.entry.alchemy.buff=增益法阵 guide.bloodmagic.entry.alchemy.fastMiner=法阵：速掘 +guide.bloodmagic.entry.alchemy.furnace=法阵：燃炉 @@ -256,3 +257,4 @@ guide.bloodmagic.entry.alchemy.bounce.info=阵列会将接近中心的热é‡é›† guide.bloodmagic.entry.alchemy.turret.info=利用那些ä»ç„¶æŽ§åˆ¶ç€æ€ªç‰©çš„æ¶é­”æ„志，你å¯ä»¥æŽ§åˆ¶ä¸€ä¸ªéª·é«…的心智。åªè¦æœ‰éª·é«…进入了这个阵列的覆盖范围，这骷髅就会化身哨兵，并å‘所有敌对生物开ç«ã€‚ä¸è¿‡è¿™ä¸ªæ³•é˜µä»åœ¨å®žéªŒå½“中，它有时候会ä¸ç®¡ç”¨ã€‚ guide.bloodmagic.entry.alchemy.buff.info=ç»è¿‡ä¸¥å¯†çš„研究，你å‘现法阵拥有强大的应用潜力。迄今，你已æˆåŠŸåˆ¶é€ äº†æ•°ç§é˜µåˆ—，从加速移动，到åˆçº§çš„ä¼ é€ï¼Œåº”有尽有。但唯有一ç§é˜µåˆ—，你至今ä»ç„¶æ²¡æœ‰ç€æ‰‹åŽ»ç ”究，那便是æ供强大的正é¢å¢žç›Šçš„阵列。\n\t增益阵列实际上是指一系列å¯ä»¥æ供范围增益效果的阵列。这些阵列产生的增益效果通常都有很大的固定覆盖范围，ä¸å—外力影å“。然而，因/cut为法阵ä¸ä¼šç‰µæ‰¯åˆ°çµé­‚网络，阵列需è¦åˆ«çš„æ–¹å¼æ¥ä¼ æ’­è¿™ç§æ•ˆæžœï¼Œé€šå¸¸æ˜¯ç›´æŽ¥ç”¨è¡€ã€‚æ¢è¨€ä¹‹ï¼Œå½“有玩家展开阵列时，玩家就会立刻å—到伤害（æŸå¤±ç”Ÿå‘½ï¼‰ï¼Œè—‰ç”±æ­¤å¯åŠ¨é˜µåˆ—。\n\t因为使用了直接献祭，å‰æœŸä½¿ç”¨è¿™ç§é˜µåˆ—会比使用其他获å–增益的手段更ç»æµŽä¸€äº›ã€‚è·ç¦»ï¼Œå¦‚æžœæŸä¸ªå°è®°å¯æ¶ˆè€—100LP并æ¢å–10秒的效果，阵列å¯ä»¥ä»¥1点生命的代价æ¢æ¥30秒åŒæ ·çš„效果（1点生命对于一级/cut祭å›æ¥è¯´æ˜¯100LP）。尽管到了åŽæœŸï¼Œè¿™ç§é˜µåˆ—å°±ä¸ä¼šå†æœ‰æ•ˆçŽ‡ä¸Šçš„优势，但因为它们的ä½ç½®æ˜¯å›ºå®šçš„，相比于å°è®°ï¼Œå®ƒä»¬é€šå¸¸ä¼šç»™äºˆæ›´å¼ºå¤§çš„效果，所以它们到了åŽæœŸä»æœ‰å®ƒä»¬çš„价值。 guide.bloodmagic.entry.alchemy.fastMiner.info=é‡åˆ°å¤§èŒƒå›´çš„雕刻任务，有时候还是自己动手更划算一些。对于这ç§æƒ…况，这个阵列便是你的ä¸äºŒé€‰æ‹©ã€‚这个阵列å¯ä¸º10格内的玩家æ供急迫 III的效果，消耗则是æ¯30秒1点生命值（åŠé¢—心）。因为是普通的急迫效果，所以它也å¯ä»¥æ高你的攻击速度，ä¸è¿‡è¦è®°ä½ï¼Œåˆ«çš„玩家åŒæ ·ä¼šè¢«é˜µåˆ—è¦†ç›–åˆ°ï¼ +guide.bloodmagic.entry.alchemy.furnace.info=在冒险刚刚å¯ç¨‹æ—¶å¯èƒ½é‡åˆ°çš„众多问题之一，就是难以ä¿æŒç†”炉的燃烧。一个点ç€çš„熔炉æ„味ç€å¯ä»¥äº«å—美味的食物与精炼的装备，而ä¸æ˜¯èº²åœ¨æ´žç©´ä¸­æŒ¨é¥¿ã€‚\n\t燃炉法阵，顾åæ€ä¹‰ï¼Œå¯ä»¥å‘相邻的熔炉æ供所需的充足热æºã€‚直接在一个原版熔炉æ—边铺设下该法阵（å¯ä»¥ä¸Žå¤šä¸ªç†”炉相邻），åªè¦ç†”炉å¯ä»¥å®Œæˆä¸€æ¬¡çƒ§åˆ¶ï¼Œæ³•é˜µä¾¿ä¼šä¾›ç»™ç‡ƒæ–™â€”—如果相邻的熔炉是空的，或者已ç»å¡«æ»¡ï¼Œåˆ™ä»€ä¹ˆéƒ½ä¸ä¼šå‘生，/cut这也是为了ä¿æŠ¤ä½ ã€‚\n\t但是，这也ä¸æ˜¯å‡­ç©ºèƒ½åŠžåˆ°çš„：如果有人在附近（åæ ¼åŠå¾„之内），消耗1点生命值（åŠé¢—心）æ‰èƒ½ç»´æŒç†”炉中两个物å“的冶炼。这对åšç‚¹ä¸œè¥¿åž«åž«è‚šå­æˆ–者冶炼一堆矿石很有帮助，但ä¸å¹¸çš„是你还没有办法在法阵上设置什么ä¿æŠ¤æŽªæ–½â€¦â€¦ diff --git a/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang b/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang index c4aaf9d8..fd3a40d4 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang @@ -145,7 +145,7 @@ guide.bloodmagic.entry.architect.weakorb.info.1=沒了魔法來æºçš„魔法師 guide.bloodmagic.entry.architect.weakorb.info.2=虛弱氣血寶ç ä¾¿æ˜¯ä½ èƒ½è£½ä½œçš„第一種寶ç â€”—åªéœ€å‘一粒鑽石中çŒæ³¨å…©åƒLP的生命力å³å¯å®Œæˆã€‚將已ç¶å®šçš„寶ç æ”¾å…¥ç¥­å£‡ï¼Œå®ƒå°±å¯ä»¥ä¸æ–·åœ°å¾žç¥­å£‡ä¸­æŠ½å–LP，直接輸入éˆé­‚網絡中。å¦å¤–，ä¸è«–什麼寶ç ï¼Œå…¶å®¹é‡ä¸Šé™éƒ½åªèƒ½é€šéŽä¸€äº›é«˜ç´šç¬¦æ–‡ä¾†æå‡ï¼›é€™è£¡æ³¨æ„一點，這個容é‡æå‡çš„效果åªæœ‰åœ¨å¯¶ç åœ¨ç¥­å£‡ä¸Šæ™‚æ‰æœ‰æ•ˆã€‚å°æ–¼è™›å¼±æ°£è¡€å¯¶ç ï¼Œæœ€é«˜åªèƒ½æå‡åˆ°äº”åƒã€‚\n\t/cut玩家還å¯ä»¥é€šéŽç°¡å–®åœ°ä½¿ç”¨æ°£è¡€å¯¶ç ä¾†ç²å¾—LP——æ¯ä¸€æ¬¡ä½¿ç”¨éƒ½æœƒå°çŽ©å®¶é€ æˆä¸€é¡†å¿ƒçš„傷害並æä¾›200LP。此法ä¸èƒ½ä»¤ç¶²çµ¡ä¸­çš„LP數é‡çªç ´å®¹é‡ä¸Šé™ã€‚\n\t祭壇åªå¯èƒ½ç‚ºèˆ‡è‡ªå·±ç´šåˆ¥ç›¸ç•¶ï¼Œæˆ–者比自己級別低的氣血寶ç æä¾›LP。舉例，三級的寶ç åªå¯èƒ½åœ¨ä¸‰ç´šæˆ–更高級的祭壇中ç²å¾—LP，一級的祭壇是無法å‹ä»»çš„。 guide.bloodmagic.entry.architect.incense.info.1=血術士會經常發ç¾ï¼Œå®ƒå€‘çš„LP產能時常跟ä¸ä¸Šæ¶ˆè€—。當然，有特殊的符文å¯ä»¥æ高自我ç»ç¥­æ‰€ç”¢ç”Ÿçš„生命精è¯çš„數é‡ï¼Œä½†é€™å€‹éŽç¨‹ä¾èˆŠæ˜¯å¦‚此緩慢。åªæœ‰é€™ä¸€æ¢è·¯å¯ä»¥èµ°äº†å—Žï¼Ÿ\n\t下é¢ä»‹ç´¹ç†é¦™ç¥­å£‡ã€‚ç†é¦™ç¥­å£‡æœ¬èº«å¯ä»¥ä»¥è‡ªèº«ç‚ºä¸­å¿ƒï¼Œæ¨™è¨˜å‡ºä¸€ç‰‡éœè¬çš„土地，在這範åœå…§ï¼Œå®ƒå¯ä»¥å€ŸåŠ©ç¥­å£‡æœ¬èº«æ•£ç™¼å‡ºçš„餘力來安撫驚擾到的éˆé­‚。當然你ä¸æ˜¯å¾ˆæ¸…楚這/cutè‚¡ç†é¦™çš„æ°£æ¯å¾žä½•è€Œä¾†ï¼Œä½†å¥½åƒåˆæ²’什麼ä¸å°ï¼Ÿå…ˆä¸ç®¡äº†ã€‚\n\tç†é¦™ç¥­å£‡çš„作用就是如此：利用éœè¬çš„環境來æå‡å–®é¡†å¿ƒæ‰€å‰µé€ å‡ºçš„生命精è¯çš„數é‡ã€‚在你è·é›¢ç†é¦™ç¥­å£‡åªæœ‰ç´„莫五格é çš„地方時，它會散發出ç«ç„°é¡†ç²’以證明其已經創造出éœè¬å€åŸŸã€‚在它的影響範åœä¸‹ï¼Œä½ çš„犧牲匕首也會發生變化，以證明ç†é¦™å·²ç¶“發æ®å…¶æ•ˆæžœã€‚整個éŽç¨‹å¤§ç´„æŒçºŒäº”秒é˜ï¼Œä½ å¯ä»¥é€šéŽè§€å¯Ÿç«ç„°/cutç²’å­çš„存在來判斷是å¦çµæŸã€‚此時，使用犧牲匕首ç»ç¥­è‡ªå·±å°‡æœƒä¸€æ¬¡æ€§ç»ç¥­ä½ ç”Ÿå‘½å€¼ä¸Šé™çš„百分之ä¹å，並將å°æ‡‰æ•¸é‡çš„LP輸入血之祭壇之中。LP數é‡å’Œç»ç¥­çš„生命值ä¾èˆŠæˆæ­£æ¯”，但此時它的轉化率會根據附近的éœè¬å€¼è€Œæœ‰æ‰€ä¸Šå‡ï¼›é»˜èªï¼Œå¢žå¹…是百分之二å。\n\tå¦å¤–，å åœå°è¨˜å¯ä»¥æ­ç¤ºé™„è¿‘çš„éœè¬å€¼ï¼Œä»¥åŠéœè¬æ‰€å¸¶ä¾†çš„具體增幅水平。 guide.bloodmagic.entry.architect.incense.info.2=自然，百分之二å的增幅已經夠多了，但ç†é¦™ç¥­å£‡ä½œç”¨çš„範åœé‚„是å¯ä»¥ç¹¼çºŒæ“´å±•çš„。你åªéœ€è¦åœ¨ç†é¦™ç¥­å£‡æŸå€‹åŸºç¤Žæ–¹å‘（å³ï¼Œæ­£æ±ã€æ­£è¥¿ã€æ­£å—ã€æ­£åŒ—）兩格é çš„地方排出一列三塊高度一樣木質路é¢å³å¯å®šç¾©ä¸€å€‹ã€Œç¯„åœã€ã€‚在此「範åœã€ä¸­çš„ä»»æ„方塊都有助於讓這片å€åŸŸæ›´åŠ éœè¬ã€‚木質路é¢é‚„å¯ä»¥ç¹¼çºŒæ“´å±•ï¼ŒæƒŸéœ€éµå®ˆä»¥ä¸‹è¦å‰‡ï¼šä¸€ï¼Œæ¯ä¸€åˆ—木質路é¢å¿…須水平，å³æ§‹æˆæ–°ä¸€åˆ—è·¯é¢çš„方塊必須高度相åŒï¼›äºŒï¼Œæ–°çš„è·¯é¢å¿…é ˆä½æ–¼ä¸Šä¸€åˆ—è·¯é¢çš„上/cut下五格範åœå…§ã€‚簡單來說，金字塔ã€å€’金字塔等階梯å¼çµæ§‹éƒ½æ˜¯å¯ä»¥çš„。\n\t然而，這個範åœä¸¦éžå¯ä»¥ç„¡ç¯€åˆ¶åœ°æ“´å¼µã€‚木質路é¢åªèƒ½ç–ŠåŠ ä¸‰åˆ—ï¼›ä¸éŽä¸ç”¨æ“”心，還有一種å¯ä»¥ç–ŠåŠ äº”列的石質路é¢ï¼›ç”šè‡³é‚„有å¯ä»¥ç–ŠåŠ ä¹åˆ—的碎石路é¢å’Œé»‘曜石路é¢ã€‚自然地，你在疊加三列木路é¢å¾Œå°±éœ€è¦ç”¨çŸ³é ­çš„；然而你完全å¯ä»¥ä¸€é–‹å§‹å°±ç”¨çŸ³é ­çš„，åªè¦ä½ ä¸æ˜¯åªç”¨æœ¨è·¯é¢å°±å¥½ã€‚\n\t/cut回到éœè¬ç¨‹åº¦çš„å•é¡Œä¸Šä¾†ã€‚事實上åªæœ‰ä¸€éƒ¨åˆ†æ–¹å¡Šå¯ä»¥è®“這片å€åŸŸæ›´åŠ éœè¬ï¼Œè€Œæ ¹æ“šå¯¦é©—，這些方塊被分æˆäº†è‹¥å¹²ç¨®ã€‚舉個例å­ï¼Œä½ åœ¨é€™ç‰‡å€åŸŸä¸­ç¨®äº†åœŸè±†ï¼ŒåœŸè±†å±¬æ–¼ã€Œä½œç‰©ã€åˆ†é¡žï¼Œç„¶å¾Œé€™ç‰‡å€åŸŸä¾¿å¹³éœäº†ä¸€äº›ã€‚ä¸è«–是你接著種土豆，或者你種起了胡蘿蔔，它們的效果都會隨著你種的數é‡çš„增多而é™ä½Žï¼Œç”šè‡³é‚„會抵消一開始的效果，因為它們都屬於「作物ã€ã€‚為了最好的效果，你需è¦ç›¡å¯èƒ½ä½¿ç”¨å¤šç¨®ä¸åŒé¡žåž‹çš„方塊。/cut有助於平éœçš„方塊有這麼幾類：作物ã€åŽŸæœ¨ã€æ¨¹è‘‰ã€ç†”岩ã€åœ°ç„å·–ã€è€•åœ°ã€æ°´ã€ç”Ÿå‘½ç²¾è¯ã€ä»¥åŠå…¶ä»–æ±è¥¿ï¼ˆåŽŸæ–‡å¦‚此）。 -guide.bloodmagic.entry.architect.bloodrune.info.1=隨著你é€æ¼¸æ·±å…¥è¡€é­”法，你會發ç¾ä½ é‚£æ™®æ™®é€šé€šçš„血之祭壇已無法滿足你的需è¦äº†ã€‚但你還å¯ä»¥é€šéŽæ”¾ç½®ä¸€ç¨®å為氣血符文的特殊方塊來æå‡ç¥­å£‡çš„整體屬性，進而解鎖更多的åˆæˆã€‚\n\t將血之祭壇å‡åˆ°2級的方法很簡單：在祭壇本身往下一層放置八個一圈的氣血符文。如果你實在æžä¸æ¸…楚具體的ä½ç½®ï¼ŒæŒ‡ç¤ºä¹‹æ›¸å¯ä»¥å¹«åˆ°ä½ â€”—它å¯ä»¥ä»¥ä¸€ç¨®é¡žä¼¼å…¨æ¯æŠ•å½±çš„/cutæ–¹å¼æŒ‡æ˜Žä½ éœ€è¦æ”¾ç½®æ°£è¡€ç¬¦æ–‡çš„ä½ç½®ã€‚\n\t儘管åªéœ€è¦ç©ºç™½æ°£è¡€ç¬¦æ–‡å°±å¯ä»¥å®Œæˆç¥­å£‡å‡ç´šï¼Œæˆ‘ä»ç„¶æŽ¨è–¦ä½ å°ä½¿ç”¨å¸¶æœ‰ç‰¹æ®Šå¼·åŒ–的氣血符文。這些帶有特殊強化的氣血符文å¯ä»¥æ高祭壇的åˆæˆé€Ÿåº¦ã€å®¹é‡ä»¥åŠæ•ˆçŽ‡ï¼Œè€Œä¸”，除了二級祭壇的四個角上的符文必須是空白符文外，其他ä½ç½®çš„空白符文都å¯ä»¥æ›¿æ›ã€‚有關這些特殊的氣血/cut符文的資料å¯ä»¥åœ¨å¾Œé¢çš„章節找到。 +guide.bloodmagic.entry.architect.bloodrune.info.1=隨著你é€æ¼¸æ·±å…¥è¡€é­”法，你會發ç¾ä½ é‚£æ™®æ™®é€šé€šçš„血之祭壇已無法滿足你的需è¦äº†ã€‚但你還å¯ä»¥é€šéŽæ”¾ç½®ä¸€ç¨®å為氣血符文的特殊方塊來æå‡ç¥­å£‡çš„整體屬性，進而解鎖更多的åˆæˆã€‚\n\t將血之祭壇å‡åˆ°2級的方法很簡單：在祭壇本身往下一層放置八個一圈的氣血符文。如果你實在æžä¸æ¸…楚具體的ä½ç½®ï¼ŒæŒ‡ç¤ºä¹‹æ›¸å¯ä»¥å¹«åˆ°ä½ â€”—它å¯ä»¥ä»¥ä¸€ç¨®é¡žä¼¼å…¨æ¯æŠ•å½±çš„/cutæ–¹å¼æŒ‡æ˜Žä½ éœ€è¦æ”¾ç½®æ°£è¡€ç¬¦æ–‡çš„ä½ç½®ã€‚\n\t儘管åªéœ€è¦ç©ºç™½æ°£è¡€ç¬¦æ–‡å°±å¯ä»¥å®Œæˆç¥­å£‡å‡ç´šï¼Œæˆ‘ä»ç„¶æŽ¨è–¦ä½ å°ä½¿ç”¨å¸¶æœ‰ç‰¹æ®Šå¼·åŒ–的氣血符文。祭壇上的æ¯ä¸€å€‹ç¬¦æ–‡éƒ½å¯ä»¥è¢«æ›ä½œç‰¹æ®Šçš„氣血符文（唯一的例外是，二級祭壇四個角è½ä¸Šçš„特殊符文ä¸æœƒæœ‰æ•ˆæžœâ€”—但在三級åŠä»¥ä¸Šçš„祭壇，這四個ä½ç½®çš„特殊符文則å¯ä»¥ä½¿ç”¨ï¼‰ã€‚這些帶有特殊強化的氣血符文å¯ä»¥æ高/cut祭壇的åˆæˆé€Ÿåº¦ã€å®¹é‡ä»¥åŠæ•ˆçŽ‡ã€‚有關這些特殊的氣血符文的資料å¯ä»¥åœ¨å¾Œé¢çš„章節找到。 guide.bloodmagic.entry.architect.inspectoris.info.1=Inspectoris Scandalum åœ¨æ‹‰ä¸ èªžä¸­å¤§æ¦‚çš„æ„æ€æ˜¯ã€Œæ–¹å¡Šè®€å–器ã€ã€‚事實上，它的用途是，潛行時å°è‘—æŸå€‹æ–¹å¡Šä½¿ç”¨ï¼Œä¾¿å¯è§£è®€é‚£äº›è¤‡é›œçµæ§‹çš„ä¿¡æ¯ï¼Œä¸¦å°‡å…¶é¡¯ç¤ºåœ¨ä½ çœ¼å‰ã€‚ç›®å‰ï¼Œå®ƒåªèƒ½çµ¦å‡ºè¡€ä¹‹ç¥­å£‡çš„相關信æ¯ï¼šå®ƒå¯ä»¥çµ¦å‡ºå‡ç´šç¥­å£‡æ‰€éœ€çš„方塊的種類，以åŠå…·é«”擺放ä½ç½®ã€‚\n\t若你覺得一次一次查詢ä¸é©åˆä½ ï¼Œä½ å¯ä»¥è©¦è‘—潛行時å°è‘—空氣使用此物以切æ›ç›®æ¨™å±¤/cut級。這樣，å†æ¬¡æŒ‰å‰æ–‡æ‰€è¿°çš„æ–¹å¼ä½¿ç”¨æ­¤ç‰©ï¼Œå®ƒå°±å¯ä»¥ä»¥ä¸€ç¨®é¡žä¼¼å…¨æ¯æŠ•å½±çš„æ–¹å¼å°‡å‡ç´šæ‰€éœ€çš„方塊的ä½ç½®æŠ•å½±å‡ºä¾†ã€‚設定級別為1時å¯ä»¥é—œé–‰é€™å€‹é¡žå…¨æ¯æŠ•å½±çš„效果。 guide.bloodmagic.entry.architect.runeSpeed.info.1=速度符文å¯ä»¥æ高祭壇內的壓力，藉由此加速嬗變éŽç¨‹ï¼Œå¾žè€Œæ高åˆæˆé€Ÿåº¦ã€‚æ¯å¡Šé€Ÿåº¦ç¬¦æ–‡éƒ½æœƒæ高20%%的祭壇的LP消耗速度。它åŒæ™‚也會影響çŒæ³¨æ°£è¡€å¯¶ç çš„速度。 guide.bloodmagic.entry.architect.water.info.1=顧åæ€ç¾©ï¼Œæ°´ä¹‹å°è¨˜æ˜¯ä¸€å¡Šå¯å‡èšç©ºæ°£ä¸­æ°´åˆ†ï¼Œä¸¦å°‡å…¶é›†ä¸­æ–¼ä¸€é»žä¸Šçš„å°è¨˜ã€‚除此之外，å°è‘—任何能è£æ°´çš„設備使用水之å°è¨˜éƒ½å¯ä»¥å‘設備裡é¢è£ä¸€æ¡¶æ°´ã€‚總而言之，它便是一個移動的無é™æ°´æºã€‚æ¯æ¬¡ä½¿ç”¨éƒ½æœƒæ¶ˆè€—50點LP。 From c4527d157f5a9c663fb13be41a2128f857a53a7d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 7 Mar 2018 19:58:59 -0500 Subject: [PATCH 129/493] Worked on the Laputa array. Yes, I went there. --- .../AlchemyArrayEffectLaputa.java | 155 ++++++++++++++++++ .../bloodmagic/registry/ModRecipes.java | 1 + .../models/alchemyarrays/shardoflaputa.png | Bin 0 -> 54532 bytes 3 files changed, 156 insertions(+) create mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java create mode 100644 src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/shardoflaputa.png diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java new file mode 100644 index 00000000..cdb1e14e --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -0,0 +1,155 @@ +package WayofTime.bloodmagic.alchemyArray; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.tile.TileAlchemyArray; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.Utils; + +public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect +{ + public static final int TELEPOSE_DELAY = 4; + + private BlockPos currentPos = BlockPos.ORIGIN; + + private int radius = -1; + private int teleportHeightOffset = 5; + + public AlchemyArrayEffectLaputa(String key) + { + super(key); + } + + @Override + public boolean update(TileEntity tile, int ticksActive) + { + if (ticksActive >= 100) + { + World world = tile.getWorld(); + + if (radius == -1) + { + ((TileAlchemyArray) tile).setItemDrop(false); + radius = getRandomRadius(world.rand); + teleportHeightOffset = getRandomHeightOffset(world.rand); + currentPos = new BlockPos(-radius, -radius, -radius); + } + + BlockPos pos = tile.getPos(); + if (world.isRemote) + { + return false; + } + + int j = -radius; + int i = -radius; + int k = -radius; + + if (currentPos != null) + { + j = currentPos.getY(); + i = currentPos.getX(); + k = currentPos.getZ(); + } + int checks = 0; + int maxChecks = 100; + + while (j <= radius) + { + while (i <= radius) + { + while (k <= radius) + { + if (i == 0 && j == 0 && k == 0) + { + k++; + continue; + } + + checks++; + if (checks >= maxChecks) + { + this.currentPos = new BlockPos(i, j, k); + return false; + } + + if (checkIfSphere(radius, i, j, k)) + { + BlockPos newPos = pos.add(i, j, k); + BlockPos offsetPos = newPos.up(teleportHeightOffset); + + TeleposeEvent event = new TeleposeEvent(world, newPos, world, offsetPos); + if (Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos) && !MinecraftForge.EVENT_BUS.post(event)) + { + k++; + this.currentPos = new BlockPos(i, j, k); + + return false; + } + } + k++; + } + i++; + k = -radius; + } + j++; + i = -radius; + this.currentPos = new BlockPos(i, j, k); + return false; + } + + return true; + } + + return false; + } + + public boolean checkIfSphere(float radius, float xOff, float yOff, float zOff) + { + float possOffset = 0.5f; + return xOff * xOff + yOff * yOff + zOff * zOff <= ((radius + possOffset) * (radius + possOffset)); + } + + public int getRandomRadius(Random rand) + { + return rand.nextInt(4) + 4; + } + + public int getRandomHeightOffset(Random rand) + { + return radius * 2 + 1 + rand.nextInt(5); + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + tag.setInteger("radius", radius); + tag.setInteger("teleportHeightOffset", teleportHeightOffset); + tag.setInteger(Constants.NBT.X_COORD, currentPos.getX()); + tag.setInteger(Constants.NBT.Y_COORD, currentPos.getY()); + tag.setInteger(Constants.NBT.Z_COORD, currentPos.getZ()); + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + radius = tag.getInteger("radius"); + teleportHeightOffset = tag.getInteger("teleportHeightOffset"); + currentPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectLaputa(key); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 0fb77ac2..9e1f2b9b 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -96,6 +96,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); +// AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.APPLE), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/shardoflaputa.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/shardoflaputa.png new file mode 100644 index 0000000000000000000000000000000000000000..2ae4fd521f353891bba0932a48f39f85c6704c09 GIT binary patch literal 54532 zcmafaWmFu`6YVZ;fe;8Tfh-!_7k8Hs2*F)La1XY@T^9G?A;H}t$P#psz~Z)OaCdn8 z{^z~V@64IgGyP?{yQ**3t-2HWUR~h@4h0SX0C=IKDEk2bKzV*d0bpS~H|O4eZ=V|s za}@$=N0IXGB3x<9`H05YytX6{y&Z@lc>ZQm#;slB)4u)+iY-T;(jrL?{0_x-(^KlV>Q zwmEibOJzo&=*Skzqu0>S7BXMz2GyYPzxa}OGWBC3-S*rDh0!D?RQHt{pKKv4NSP0Z zl|qHsSFT8rba(OY@p0D8vTn}GQ{S3G4M!e6R879y$r0^N z9pH&s?L}#lxeaK?TJ3lwu^6y%s%RR z-7O2ypy*$<07Or3OaAXme^geR!reF|(7M+E@*8hv#ev5x*>$IIfS;py-KdQt)XfdL z1iUBgHcL$t#Wqcj7*Xfa5rgCc1i16mMs0Y{c5%O(;73i$0BA6dQ6L0zmKh%^{8U-D7}G^wl=&?JN>|Ks)Y0wvltp-OFwT`cozKt6B+&2=F}4XO|S9PL!zNn)yir zU_e&xTVa#0lO7s<0R;I-;-A2z6p>x?yJXK5(_; zt;!PKeD719k8>_y@)XE3V%wq#lR#-E=;kBT`|k9=@f8T82L#W3j6-v#fo7eTX24Yd z#w3YN%I*@Bz*&OsH$suVj)aLVpm^Q=3e&8 zG@vdWy}e2`K5A?M?;mFOU?R^81_&iU6fmG)r@ulG$_l`d+r)XOl&{W-v{d)S1*!tM zUU#1Xj9(^xv~o5PA!jK1eQ}`=xT3$k4gxr$IZOS{Pq3thsEjgIWcWAM1o>eN$OMLI zl5|3d%HF>x(RbC)k{620^aackbsIa=zg}Ob12my{tILx7TPS+onVX#FcL`K#r>L+2 zKPZt>99@e_#_~!c(Cw*b{c$TnRH*3aL2=CTKCVgOj`2u)m$Ji2!-8=HH1y2Be?;?ZhQav)RALxJfj2;Di z(p^<%efH)&$4yFcZ++6aNw@hW=)j1W8^@u}&x*_IE%DomkHhN$pE8%K`l#H92RBI` zB;;zF;1>;`EJaU-x%drrQ2dMclZUwJGSq{wD?QIf>O>+eHK6?DqNVaOxJW#QzTXrw z!TuMq+RVgJexU&x7EwkolQboyPDPPish;=;u}U}eP|l?G6^)nV`3LfCA;@W{-|RG; z4{8I=b|~B5&t5mig!(O+XZwH%;&*=G4wCv+iU}%$xvx4|&G!dhsNwNlkW7lNd<)ab zjZm_{9TENdFYD*C73Q!WEQ%MFEB=FyP7rLE&m zY?#v^v`K+Qp;f*#T1a+U0c^!8-M^QcEw|f_l&E!D3d%Y5@g06*S zFi{>-Sxt6T`9_OxaKZ54G8&v_4V^MV#MfvCktE%F;=?VAiZ?gapetMmK8m&7eh-j6 z(WD$H)Hk6$edAZE^(|)1n-$?dh;H-!uQCQ++~Kt=iG z$!1hw;9p)nCywzufn_K45>Xplj9~S7-~HXV-%YkAHdMGvbT*plQm!knM7x%h0&H*g zIXF-m>e^h$@OlKuW2P3ycT~80-fJ+-X@Y~K^KEg1y7G#(^ys+Z&Gp>3*4wlp&kjAb zYrH3BF)fc(hG}v5^C=fL$Q^vQ_hn>NVEgzJ2z&*%&20<2#$}_sDNIldIo!Hc=N_Q? zVv7(s85g1~ReU~{fAHmVg2EI0W}xKa>Zi#u+s>X54QA5DZCuc3L!|o)yQ@92pg{CN zZmV-Y1wCPym{IwcuN;}UQ3qW)8>wd2-WG{2w6v;>El!4eF9)^g%LyDs?YAlhP@lJJ z0eWD^35|()%R*P&20nPKbS~SZ2`$}Xz|!pYDrWaGXoc?kD409s={zXSKSOK}m}-0z zt(2Qkx4Odg=Jh#FlGk^wm`-u5?Ccl?(&0{q;G0kulxWow@SrVwz{bBj+q{*o*D}{D86Wl6vU7duY$WY#j{33o)=D}d zCZpeaq0C;^f;1^;yV*j^57w17Wb;kGZAV$Yzh@pYI`*QwAyO&1WP-|A=)Q{M8MM$> zbTmPW?%o46jhe>z8~Ga_+#I|gZpc(Pjld}g4)&7^s4d4v;X_>+&hA*YE4a}6(1*O<_0&=n-`f-7a731 zY?Zj_XB{kc*q1JON3ESt-x#LyR9&ZViXwBZ4|N{#us^^4oBqXD%H;`RR=#=Nbcey z+yn*I0a79XC;c5bc(IbP;lFtZ&YSoeMR@p&?eHpK_;YAO$&c|M2%5y9+ifNJ^00qy z`%^>Z4IXwrqS$)7Qwi@Yx&3kmvteP>bAZJxU~!~;`WY94KX!w8SbT5yZ)+Z5wMu)n z?v_T<=FuGFL-kvteVrwiP>BZJCJn{Ik8<6(YeCU%fH_Tm#UqpZ7792OU3^s$r7 zPZLz6dEaw=vV@X7wEPzQMqVPm-}(H`fIs&Px^L+-vt&+%y=Nq{?}S+--5GDm2^V@0 zb&$98CP@35JQ;??aM}uJHGVY^WtFU+g-llAD@%~h|C8w>s2BEAO#bxcuz1r|a*GFY z%T+1L+%shWlNjUHpZKky9=b&1NS;K=i}6Y3;Z_XJu;hS8romBZn6pSh<^< zjZJ&^dZsWE>$ZNIrj?28>7|O*X|{Q>kq$HQ^l-Vo>RJ}FsPd^~^y9x+*L?;Pc41gMIwEG3k_%KIDtUO0yvi$Z${Jo z^Y#csUXYL8WaYLrz@5cB-Q>P~`Rp@FxaA+E%-!DLDikWcHXz%oyRX0U#>X{AoFHz; zDTM`cCZlEKh;-%C%Ut?51A_C3JpAyD>Pb@iMWMrTaDjzg=w?x@v}j3bV1i`1yKhTA zE9Z{%UA`FE8^J@YTYB;QL_>6%X}T*WVY3iNRdtkW#F|pnDL!&Zt>m!t_V}E9rsBM# znkh=$kW4Dywi*U6WM7b)-(47b_VULk@tQ&rcM?S_YGMe-#PM~vY;e@EZ;3yTVfa|? zW0S`C00DbBYpITF9CoO5V(uJX?MuT?@;RDWXu>(t0Zu$?df}OmU(B;?NQODPN1T|T z+XnmJaa5lIh;ls(GVF=P8C$|X7;V(ePV-=oEs_y3efpZLvd~I2DxY47Ref%#S}TKZ z|BU7mxzdpxlhSt7McSqB>)9FGYFNT4!mtJMy(_hw*g=9(Ey#sGSj(E$qE7mVZ{Vt4 z@sdtS;?&H9E*Z5b1MW6y1Exk_WO?i)lL+))29IedEaLH>7=DF_eEreubtHH1xRg=c zmBa|IbrrGy1@Dm#nPa@xh~hKGGFrS&Dq~}fgpZT?8*j9Fp5bj>M;SP8HIpI` zJd~@ggE#mqiQAM3Wfvr;U6WJWXHY&dKn>*18*=6v;4g6a`Fl77-EP=&XS4Mj^ z!iG6gc{1!!?3@oQ6GAwl^faimumPXJcjse@<5dfW3*ca%!_ACO15}6&j5Iy(@)~(Q zQWa*F@?1^pA)Rz*-XnzsY0+x5EC0^zKV=++0q_W++OJLQo6oWA&zx@p-XGF$*IJo> zla71UiO{LbpH-Y(Gi2v9eFVWe;)aLVDk3go)~T8nGd2u!H&!8!;#~NUgD5|^k?0v& zuGz{c-83g|v$maX{*Ny(FmsTdcrFY(VuQmGmbKQd;IrOjuiPG&AyUHfN-W&WN7#^J zZ|WUkCzZ(S3GjuKmsv&jbuW_8gZ!`3`}`kV@^e({eX`IqrMNLuDlfC|g*@4TNeV9H z9|}B182Ho@|7Ezpy?LKYmu4M98z%dQjawrE&x=2E{ z$i39KbUMI6-i&>Qj|=705=yzNEK-JlN>2<_Y_y^6qA>5bcvVOBuXMWMUhh%YI@8<`{A6>$h!2>QhDcH1X6ABu23kC_Uf)@p9 zVqfJ3mm^1&9z`~JjZJNfZANPBW1mKQIo?S+#MonIZfL2nZF^G>c66{bD=qJTzS2y9 zFoL^1+-p4g?klk~hR>BN{*}GgW-X*7Kb7uOI)x;d!*zx~8@=NgA^XJEiK4I%l9kxth0YnFD}Hol+O7uELgZv-z@}91;p0zaGxBnb|1~%xXOK1p+JUZR& z>l*X#N|T0WYvqz4{3zU-B>p6CHuQsrt7~2}0uxB&%i^wVl8dLd4M2GjQW{s36fwS{ z9u<4k6wefL)5GoF^8glZn!DHJCUcv<-4c$Eji?V_6O$6sW6{W09B9s@ADOezIyX{q zwLz}d@nK9E$eymEOz{SJzpL}rBXl0U#!Djb0Qr25p z-emTl<=O1)iOPrw*m5J>W4QBf(XNhBn~K?2?|h^>S>^M+kfr41d$SQ1NsRy5?lF2= zqVMhXbalC*d^2KzOeH4r6R%5VQP>~C4#GYtj zMZK)*=j(sE^`^GAhO$2m1!0N%X;b&UKCsUMI5h_3G!)Jb!P}i_)ikF}M zX)*7c{E(3$8yPi=3xL%%o5CDbg#vyDFUS7ozOxn38?kP_ZKk)THBTR|OC7m#@lw)7 z3ZDGz_lTZiW{QgP?TV`>-kDMg==E4)A?$Zs^qv`aoWX8hJeq0}9lETeLv*ZWm>k7y ze?($Sov*(y77eA>Ukyz;6nnRRD-0($af@p4mU$2^*|FzM((Y?KckICSF#Ny7B3E2K z@qTFicH1L-l5wR$9F*61fq7!s7Mu^JWH67+-@J|4@=x_8JtDWCg4lar*57Hx?S0je zjWoOXrOE7PoE?|@x5=^Hu@05Vr*ki}?ZcQ2FPyxT*zCo87KlwCUHKI6sD0A6}I+`wi2v8VWA?f zi6Xu%?9c)V@`+SBRU`+cmiS<-XitU35V++RPG|Pn!~d8D<85hz+t`xYMH921vMcTL z0;rhI{SE$)AVS2$DCX;bYXtS2vu%qE3@A^Kjn7cFiu_QtpSSh?^pdZzMB0os27Rr7 z?4cQ%qcLo1d^p~l<=T2x$!MRYw(*-YIQyB1Ajvd5>)xocdGyfB>2-$ZC_c{dg!jFc zN_~qgzf~Dl_W#6CuDVn4!n4U2uF=+!chiSAuOR&z`{9FM=*8!W4)s0$D?NgP(Ay8g|H5l#$IoH8=6iR z(jgWX^=jO)l4(v;CUVAIHlnM~wpdusz=EfNj?O`=Fv{)vTyXAyJbQwQ*8L*mqumrE zbX%9J&km%ZcP=iUsxt}lkajYgbOK`A-25<1%%XRUk zAyLaz)MDt)Qw->hLdW4&n~06ZLF0snnAtn$Uz)rFL&&n{SRqP4ppn9gu36uuP$$twaYsr zO*mGiqQ(1po76rmo{5vJ`DrAG_SJTMqoaW>$2h)C{zuHRGKX3>_D1RSWpr|{3RL)~ zJ}bFT0iAh3TIludmjdn5XK>@;+6X02sfN=D;ET(jI3sPNsT(N|UX3`|N27^rDbf%Y z!Zo+pR$$QTvJW}*g-y`}YpKVUZ*mqKuTJ!L! zh&zv!nC@tSOg`--)<|wL8_{K!Xx1w+FQ^Id6Ph6pCd1gwR&N1x6swSKE3O8do zJ09nGucorgjr0`Hmdauw@c#F9DJCGBnf@Kor2(p`07RO6)tH_KvEHf<*a9+VPdvm& z7?Kv{pxR=Z)<%>^?RdR}3;;s<`ApDP|NZDR^q&DX|Me>%TV4V9X~>c^r7ZpM2|EC~ zqg5yB-8ljT1fDzvpFH`yoGj;?Fvl$`Ihi3903B3aY}1SzHi5iQz!qg|27&3f8?XEu z|1!HSec4(0nXb2xCsb!;Z7qNxO0%TwjPB(U*6J&OS;{R5ijb_V@zCz$BK!oC{xlF= zWkUq<1zdvxc?|S|zxXt@DUz_F+`3qTJC|rKx?+6}oZ)_rO5E|WO3O4g78x&_gee9` z*>M5v6)+)lBL0a%%LuB^lcUB?lRr32Z_K}CATO-PWJbl@f5I%t&uBOrb<;?Z)}6d9 zVvMrqzP{OoVPqDZ=kG)eLoV7`m^FfwiRJqD#}t=eO8)s|Jsz0zPE$z*n%o6Cx=i2P zd$ovUA&K*rAsRVIhw!R$8jmfA>Y?eE@wP05Cx|9(IBYQ&>Yqfm4DgPMUB#&QT3zGa z>CK?%z8W~{cZjSz{wKjOtWTY*Pk|fVp8E-75&1%2QBm`7R7E+Mcl;6H$QP^AE=VU|xM&$M|-X zf?sF0u7Y>0v=NLd3?f6uybK3tdbwuB9BwOm4KV1!x#?zP)yRsNRT$qposQU$Y>~c^ z)oHev?v8URpg&V{ybsvA|FVdoK0RQ%Pa9TrGOPW77crA%5UE2nBypc;e z`gc}Oa^F*KcBMS~khqw)u}yMyi9hJXs12=(-npBsAL1Sy%M}+%Gi6r@{d@Z3Q)D4? zDQVZY$6`MOMt=(>9Ub>T%i{Evmm%lgVaX2cSL%pInI?W5Xl}rKQHroFYarwMQ2M+2 z&&B=OdCUk9-In-Q%HlmZYnxkd-YCTt$EVP4=63`Ji^Knl=zeYa`-!qq(rW2EoLORu zGM6^|e{= z>f$hoB#xi{=LN2q+N?|%j76EpD-68+Yh$M;D3$+5>-sLIEN~1`-@et_CTi`FCAu!y z|7X!7c#vrPUD+zArBLZP+BR@VA`ag<2e>e_vT?dBAnmr){b`Z~q>F0S!jI?#KO!#;nY8|G?_! z|0iO|O`PU@s&}j*rfh`ZSIoenR}4!9OYq&#wXh4=l6Mxi+dgTp9&5NwJJVp+$4(t8 zM*(&}HWRi*!mG`+f58*ptJ; zI3Mz2UrZtGWzsq(hufo<;^p8i)!%clSkIuwtIMVM2_HC7xQf+Cb-0goK50$Y*^@9)vW(d+SmJph9OJ20xCLL0nPeM;k!Jdy> z3kiw*Ybg~)pkvcf)95R#9;dTfq4 zPdqjSy=RGvXvhjvxUZeLcVc1<%k81mDIsoH<0LaS^vrEfvDEK#^bo(CYCYNft}fam zPt=BMG+6AlyMQBjY&M~jDY++cj7q9i)2XxTZ!c~WZu2AMIRRn26hj(4F3QEPe@zi| zE{|KSYe02Jv$cRMAJx-nvbQer{T=65%;b*kL&V%yuoK%)BNO7X4XHr#M^OX~?J-o0$Wz{mPycHi0R>NUnv6{P&?w7D^hFHm!ixC7 zc7r`6sYE&voiTBdU*XolygeJJRChnkCEC=VFSk|aXyw0>@IqH*eB#GR*|A$WRRvTv zF@!lD#~U11-TsJKX)k^XzN?Hh6Y~}hg^+}io`B!=Q#h!czQzq}NZ*JAi#kJdf>la-Hwa7%djN$CwO`7KvPAP30cB6}Tne1mQ90DJx2%R|<%4D_r z=>GVlVA*NMh%b6nz(Fl}rB#^p$pELu?ggSng@FX>lReD=GD83O0;A&Jq>7G-y}UmQ zliEyUhu+FXR>Q_kjquMqGHOWV&A?j86oOl42pKk-{^M`6hz>B0E%GDECH|U9z^np8 zR?j8d7=eZPB{Hr;VnShxA*TrRYH}bn_mcGaEE|4V;_?aS%!~;dSZk_kuVmaCgLI8u zl~A{eFBow)oQVSDj3c9Wi2I^?Runyzgw)?6sx;R7Q^BVT0W=H&YKjYa-dp^l-c$Ty$gxK3-TpudfhNnDn!K!6i*^OVd=YE*q1%D3B&$4 zGK*POW};~(#5~OF4$V zWVReeOozyHi-u;)bqEmOo@F^w6Vz2pc4wlRt`MRglv4(Lh*Pm&`<`^x*EZ+M#40>r z5MQUZfJr~UbmT^$p;d>@Dm}6fx}nzs!H&}#gW7d8&SHF&dTQn|nYlnd3Q@j7JeGp1 zFn7iuU>cso)W6Q+au=o_Qnz>9KX`Y2=02o{4wRB@$3X(})LWxVkTQITsg+7Y3AcY$ z?027IYHP=_EBq!j5;X@)v3N4zmdbDsjX)7S+gkLPSnwDlP=OTWqu0|yx}Ipjo<5QT zTCh526DVLj*3{+<7!B$7SH6gIeW-6Y-ZW22_ixw^yCCr7?c#6l^yRdm=|X?l{fZEE3*KuJkq~=!k+;jV-0hM9DYQGBX`}Z#E)+2C z>Rs-D?i${fO3sF$?LQ0H-%r))<^~hoMo1rUP&Fq2nw#6Otfsp>=c0i$w@xKzZJ1H)%K!DFlX;}Tr-1dH(MjzSot286t%sU1k=dv31?N9!;n+B4Rbxx3o4cAkr zJ1adaanuX$SaNM@zMx}H5@dzi=ZV6=7%{zd96xIrElJ!#W8lGk4;AM}Y`vwPl`8sW zKl#2tQ-dFu*11CoaO_sbc;!oz&q$zxXzk8QwZx9{rz<3Q^dECw;x7XmPrX8WaBO&k zrDaB1j4^}j4wl{zE%70|e&#CWeg5h0N_`F1pqWp#EU2ejTcPb%5SO5)qbJZaTp{S* z11$F3qY<_sN*yo(Dn=#^q=}o@+eWynB!JSJdr=)(SpWVJ^Rs>=qE@*b`&l;Q!@Jq) z1YFewED)c#a0By9hu{O+5`2FP;js4q3fMt6)dFMz zcL+>z0SDjTZ$w`Ks95P~i~XJ&(VYb$M)a8h*sEU%TbL@V(T^$f@*c5Ped#AZ&<6x^ zLXabQ1VEt=vO9LXDBZ#0X-;(XwC}KW;*XuyZ|NA(4TbLh+!|G|P|=2#6BO`s}{)sh`KKt%@j?;-$!1(9r;^G3pn@&e>~53F?R?+5j$ zd!8)w!tcIjQdiC`edV1I(-N}h2}#ohay{I!ut$^ex`a-Qr5UuJYlQmjz{s3rVIxN? zpg?6;I8ITA*y!R@1&?YXP~K89Nla1PoO?#uEtP}&mPY=myogA7lSq8N9i0iC3AlNWugh`vT_TDMqpd4x z_p&eu5=3*jdzjuqNPIJWze;YV)1y18+uy9WW&?k*!F)yIF21P`9>X7~P*tuEbC8(> zZRbk0)>{YRKvt!9NoxXAT_O8=JRL*Q#-pz?-mJ+( z3SMhhdQ~u3_>N%x8FPRLh-CTtt8Qk{17|Gh(swrSyjRTI;Y#@NWoXxWC>$(nB3Cv| zc`}k&btp5fdJLa8x#tY->$kIE|AtqCL}zdS4@vjs4g7bM1EdSHkG>gFW>Cmm5`%Up z)s2S*uAECj`{U04qP6U7;DZO~1~a+_XYBV2?l{!@>v7xRz0kO>6wCA6Y4VjY6m#`M={`e@_)R->3YReNN^qCD6wlkkUyqa_;jExh`5LanyVJn3&5> z7LpCgLs7)LY!vM*`w@F>NqX->doXa*)i8bsfJ${^nnE^MQvESPu?~q`)nxjv+1)1z z0~bbG1h(2Xm+?G~?RY_^i{e8$Ls>2}<1D_r{j&hNOA+hUo5RA6uQ}JBW#%zc&Z#Z9 zb$F5emx7kgfxSf8pB|M>a{Gq%tEBJW5#tDk*+{yDTF5SB1F6|=sfe5(x)ba>doPgJ zg;$P|dZ+ghrp5=xI_!CL?}P*{)uQvM51ow7YL z^rHu^o2-ip-Y~Ka#92awF}qx9;+1}J4XHW0*u6s8RNNc{d7b;{)+t^d&*e)Te0GzM z+*%M{9XVjc#qA{%c4^g2C%y>M8*511^PQMazrADqXsyoce_<6Uh;94+8;I`CJch@-_vxiIfD=whCyo#+bP&1lRPc>L7rYu*O7a->{oA<>Vu;3#Lj zk%*bbtNrxgWAs6%(DNxv?;KJjPv*9OaWpGJ1CuJuCqOiPBUap@>Lb23jp{hu;!N%6 z5Mf)(**u@EUvP8Ve+##i1doYkyRvPAM^1}x7*up`wRZE&bH7OwhM190=rgJhY^es8 zzi(~&fe-wwYje5D-dA*J7XEYis1moM?=mIc4J%P?{4mJ#hPtynla%lLp*@iJeS z@4LSQREyoXnE|9R zKT-h+N1f-J91Oa~z5NuqG`pRNin8@f4@KqA`LmY!4dS|fZx`IPYZ%nxNG>T^h%z5v zKvYT*N~+|Tu_nq{Pj+^SQ;^7bcJKAZ=gr{M2zX5mmS>)MBl@MYZKNJNZa9_nTALzy zW0Q4{7}(4uBfOBkQAc9IVI!%?8|;SmCBxkKP_g(ITh*@B7Ef$kQUzLl8_cE>@e9Q9 zqL6aqjLY~1S7PfsF>2$W7Eio4=ff!T%ddM!bn+&s9$2Zqp2#OO6sVR<8B7j}dwQt1 zt+A9Gy&cgVwQ41iVTaqlb|C1oZrt^7(28GCsEyX3l~VVmCK|Idq|qVx^c0|nf>|cZ z!4YhaB}7DfICZH|xpKrgL4E+rYgt~K@)T4ltptMzhMeO(Ku2+8XV&tTd~Bz!o+U)T zMB@f)Us;EuTjTfY$%n>_@OJ2J=Ja5C+1zj>Eyi!ykRSu3T{-jij*jg_SRxC0E_iDW z6MKC()37Q+$w7Krvl1aH{xm%v;s=X%-_lae2S~UOW#Y;~4nAX;_hUakj8t(;O1U7* zd3+8#VthKYy_%fT!I!K_{30rwIrNg<0@jK)IZBWH=7uZTKwzhO8e{qZ9^&G`^=oP6 zuz6*aWpr08e7);nnq=48u`{bdK(Us3aKTQqD10Md+$~4rlX!seAR|qKw~G!1gA|Y9 z@Fh%>3G1l3FD?MoM*dB>5G7+DkN3)v!MIm!v`)L;=vq(J#CilIN>VQ{lzpdQ#xtm9 zgm7^1E+h?yQLV(PgY`XDE;IH7So6;WOYe%isMn@0%@Id}RzjTyrUGI02egvcZw(#r zLEwdTE1zg`(h2TP470Kj+H;Y*cav_Ff+dYMKO=w=7Kde>vi9?#nWBm{bjxaAmuaN! zQCm7!KEB-Yxn7Hacs{TXRGb-p%0k}p(VMdKgMHV8oG$E|Lies(%v1%(P?5KC z?70MX2-&COXCa^UmAx(PLS94a@?iD=x|v^Ou9HUmx=uxNda;T$zp+(r&-Ry2Etva^ z>|Hi6@Xg$qp;w|t7DIhR-`efij7sz|$I?GugqHS)?Ydb?%=D=?pZV#pAq$duD^2u1 z_=8MpS;K6wqiymw8^r}|akq})djZJCI}%QqIdo;rj9Nr4eTtLycOA9jQxD~IoNtC^ zNn`q+f8vm6DBR^^DV42*CB$weTJX6(Xow_5=ci+g&($tMDs}lT=rVX-M*FwHrQm@+t>0S{X<@SjA=>w(T%#j6L#bCh{~DeXoi+ z71`mimoD$>oQQaIH}VXPXZUV`U*DLq>9XuRH-%BmD#2eo0;+m{5&^_W2K$0yO6G}P^9|Cl;G zrGN-H*2$l8hAiH?Fhy^?l{___|M*p_p1OS``{z>P;u4fLK>5kJjUNwdTYzM&I85WJ zF&iEL(y)q3_zijS4`pj7WHyx;qUBG5;M{srAVj-};{JWbvA?QBb9nmz1^nKvb*O0t>cZ1`_CVtc)DN>}RBjx~vL1NaUm{GlRozf`@=R7R{6EBX z#P*X-?Or?2{Ym1zUp7eD7^E4S5swCg!>Mb1y;>88WjED_ePtsohR;K6+7DcfyQ+T% zkiK3kHqLM7bt^ZGAkvnHtIMFhHa1M>9p$G$Z{pu-FIm9aN^rq!yQNSYP}rRZL~ni& zwrg0BI|t8g&sTgb7zh*!C}s@b5*-_pXYroDSn8!i7{5$1MGX6;Am?+ac*0K@s0RGFYKPmmCwBitZDP) zvJ<9sKQ+gbHg`^~;b4UHB`k6?=2xcO2@f<-lJJCMx=}TK+fW-~iVn+4w?OClJa5_` zMy7-IIGyC#pt(59y{7B9Qt^Pw))$N-P*{|7ToDZS2#8$0)EsoYdjENcwrvGo>L5{q z*YL(C-5$>=tQ}QaRmYw!vhMxE&qgeJK`u+0BQBj-ct?xaiiG>SA1 zCkDy4`2Mmu{neUSY#90GKa2OW&snFdvP|+fY3;hut!8@8zsdRd&UgSPGT2A@(@2{{ zC)8tZNWD6VQ}bh2#@^FaJIn znUX#{>r`)1(|coZ<$#d?oRcHvqOSx zy(k!v_O3NCZ!K|!wrpAhg+{mAOd|fU#)nO#tWqOBMN;p{TCzhBq9(NT^zTFo+}!|A zD90TU9G?JW@8}0MYmoTeAqmvi?DVJMRK_Dy0MUZa_H(O*XR5W!u@As*_SSZs_)R-$ zZj4un#q_7tfKrre)`A;sKuN;lWUX)0QFkrbl&isy72NbIRzO#EvI|b7$xsbMPnKO z$HR{0r`VoXP^RYsKHNjiA;#y+QR`u4L}S2_nnKDoCC6U|aa<4Akhz7}Ll)SfB$L+} zUlVqux+l{@<_z-mdNvt@lTg5?;k2W6U>YoXmET&9LyO1B1OHWs)OJWRI#<8- z-pva5TrhG?=Qg|IaUe(N@X%AhsTtYzNbhl>SHwbsSlap=Xbp3l&wb|N5&O8%71rOG z7qRJxO>j(^$Wx;OcC%sH$F<;2hSk8ksmkjG5m48zn}6M}QB3Xu@oA3(O_GBL);v#k z%sB%NalrPSpI1e{$6ezkv<%@ zQ^*VHudHf~{^N%@IsksbH?;xu0;$Z((b2Q9nSkRO?8F6a06!DiPS%O9F964$ib({3 zFBZgwY_L6Sros4v(+L&XEo)g)^YjCqXQv@(BueyB=H|*-WJdt5U7l<1O(;UW;oI?; z&J7WMggj#ut^tHloZ-s!} zChmH#Y0A;Z2eTB4|FoZi09^xN8-OC zjIRJam^h%h1@GF*1Pa$1xlj?F( zO0$S$EOsY0D$L)pz%OV6zE4~LYWfjbByj&=8bw8N3}-=MRq)#+f{y1T<0p!`mm z{&N6=x4U`OnjHl=XC_n};^j13Ub zmT-biS~p|sjQ)j%9uf6Nff4?M*koAi<8pc~t%8JV9^zAgYdDZQ_DtiX32!xk@$?JT zY2-8>vhgee>-$_oL;8{~E<^|3#SWNho-cQ4FxtB*_k7UVDf~G2#%nQ8&M_6Q9QYK3 zM0??znopMeF>TSCKAI+L>D==ehjt9P zIg6)vZQZ`20X$;8VKrD`1&{*C@={3sG3-4U3vg=;ndqOM2ZeljAoc49ehg_MH~GY9 zRf16fgx@*typxBLm_mFy$^*ap7vOK^3Qk^6n0196;vdh$WId_Snn{Cob|nDg9m_`4 zQRJTrD@%VGD}k6%LbW^;E@fG3at7;WO`OHezy$^mPZ0P;_Zv9k1$}MF&$4eDinM0~ zKSKPc6SDXIm6mQ_p|VZMb*i~;^B9z}`)#$%oLx~IiItK$Md-6FP=#5_iio{nxBe!A zbJQ5mj|VvZjY*3};)s1Wy0o1QcKbK#MZiM75yw6h(*#pG3rNqxh*ix{Jsqo$ihz5+ z{bh6=4KDOTb`U>Mul?JGJHA6bz?EN=t~JW2(0VcG#lH3UD+czf$?%<=M}8>xzfuJ~ z;D@o|lnsRXMxi?WMH~O$?n2J*C+m6hsYMs4TVUt}Q`{0wV=Rw-HbKb9D@*UJgM}NljKzvT(jH)yObA>iBCEP72Vjc)qhO_& z;J;Qx8P}sm@2XC+WnkOb)flH*i$=kimO23kItS+;6_>22J7?Djgu4Zp2*FKIzYktK zVVoJP-FFejnRMd-(BGLv-&E2_(gGCzAvq~-GmhI`ku6!kYhH*yeP$)VxkgFs%hXY? zbI&MnRh00iVf#v6=IC&|XIs`X@2Br6=nVMQn(H!hI`u zX~qxJ#2>DH$)lSZ{*9$zbj2UEqKobtV#W|j5*5Zc8GX~@luBALxCJV8DAb7(S0+*09Iv5tNL`>h;?~f?z6J9(Y`}hs6BoQ;%JY;$ z@n;$QrR4a@nUQ;_M^~kwEpG#6)hTae(JrfC&9_CoselvALO$^~ksSUjUAa4cl&oz+ z>2>8FOrzm!QZGiI_ze7x`;IDMRlAUJlNY5NxtT zMRfj99FQP4Z|vkP)V0Kmj!pID>o2CLwo*%99b3fTT=GF_pM5-Pi8VyfN#T?~`YuD^ z8Kd+OUbGWD_lX_Eu{6D`&^wvcGz|e*7PrzB3-K@B8}B=-r6kjozZSsA2R@ z)aYH1=)FwT(W483XhB4cAle|&Ya~%Zh7d%L5^b1gzQ5=5f9KV?_v|zF*=yak*S1`f zdQ~8nnZX&cvM4u9?|x~cT+2uezfqKtQf_opd!sV-mX@Ti(BRdHjxsCJpff{ySknoc zI&e6J7-pUDjJ6U0DVwj`o0M2P_FQXm_Ir!UxuJf|U)<*1N6Y-PD%|sbkaR^Sp_69% z>3oTAizFZ%-}&F8zDk734C&7P8S{2Q0#&&i<^-uhGu#%D9l7$W&*`Qtt7rO6na!(( zQ-hh%l9`Z@%au#Y2SmQo$Dbq*hI;rG2J5aO;fTowQIln@{f5W!$Lk?)g1!SP~(d}1aKxDnj(br{E4Owb|fLs}ib@{57O^N;IBmK91k;Sua3 zS5v`)phQ#}^h$eFs%-CNjFr;_@$dCG?Pv$TnD25P;0BT|Ih-v|(D5mvp@4N&K!kUN?Yl8MiZqGZVXz+r~RM+W#9wxign;ixsY+O>%#EY*AR z!gIqQS|WW@f_C|dtlq^=1&p~vyWTQ`qL5{tBvk=G^wkCC2uk- za+>cGi-=Yzv}Q`I#joTRme5uz!kZNAGqJZ=Y4Do?xd zNz0$5O_b7PMVV&&AVVswdhuXvw#0F15l)wK52+F5yF_&s{(E%yjgpg zr=W8flw))Ax&lwhkaq8)c;I9o*DAv<)UwKTv^6S%pFyl^i&YV^HT*1Noi3O>w}$xrOuxJGoRUwUCK zPsUr^k#eafeBOUwBD_np5C7qcR^tYg;jM)OGTV_`7(-cO!V$2njW!R>cd!RlR=&X6 zIlz7}#o9_5yc}%)90Oo^}vt*6dGu8;{J? zVn-Lau%jdDupPfhx5VHt`zbYpVqvsQ{eg05B6yY@5k?TUN#3>>VSs(oE@@^%C}Q-U zZ-Ysuh9nEHhL`QE@bm5>bU8|bM7eo|1^}Y-cJG{Ujb*YiqD970@jRCj071%V!xMJG z>>yt#-LGFL2GW??6Iyj5&utWUVTj_`bRxsO4DAn6LwEK#z9onr@4INc3{Q(J@)((( zR>oYo2*8Zb>yF%gQIiftE0BnT`3PovpFtFRdVtX~)w^y15#!v##F{*hpS@{#8{XM0Q^v?L6HD+N(OSg) z_5R|e_n`?G)MO`x;Gf)h_x!g~4t0n$u&=`4trM;R{n|x3DOpa7t1HMd?)=q?IgSUS zbKmv9I^pJ<*5|<8hfS)H+sZ(wEiBkTuFqbtP8CAHw0W$hlGFrRtb?7-3{n~SUPdf& zqnqFX!+SJ$7KqWnc{c^PVs5;XvoL&EKpsE1pW=2c{^o#TE|Bc|MZsf1=(*KYCC?Dk z?h)rEBXp8^V?DmJ*Zy<7g3#+@0_Ff`>ynBdm@&TOnKjWin;TK{s~f-j>nPGSTDEme zE`pgCIzNSCQ>nyuZciUi*T*9w!47;C0r;T_QLnPve^EKiL_Gy;(Z$@*qyFxpYw z`LCZpuhk8(eQi{wW}&9bMFMs?6?iia-JNzyqbYSGZt6mg<2x!q}j7KW?UKZv($Z8G;dC*MKZF?Vj zFfj~PY0XSHws)RnN$S8`fA&J!d*fB^!m}o{S{CGkh?wxU6Okxtb=#RptL?O3Ga+W_ zcvhzczcT>8A;sh8^ytco5dcI^R7|1XihfYm1#QzaE zvI56R9^Dm>p#c&FyIc}+$V7ZdbW}LpkvI%vD?4HmRKaY(qIks;6`;6`d>P}YAMNwL zt18qK)|cf^Zc2IJT5p8ylt=96WwWAyW;KS@d1hcCbrcgY^_N}to6NU;d!@^CM9B}0 zO%0rqUna&@+{)Bh@4jSM_Cn)JOMwQTVb;MT_;DViARG1F_EaQ*TXrVM+Z>#Wt~!PyzEs<7GbBiOfQ26jZ` z5#iEK9Zu+&4R%n)w~Z=22^ZF@7-f8=t2ZB3;Xt$l^M7%Oo*=)c@a?4DIQT1w9&&uD zsHB5@={eG%E4PkcMx;!<_VCgjv_fz2I_akVQtq%Q%Snp&_xWm`JD<2l2oRvFH6QjE zJS{O8$t0U#)ia1XIPM@Qx#qcXx($4X$DzJ}>5WZQLJ^5iPg=XyiuIiT7U&zf1p-g6 zqRC3$e_3t06T2qNCi6t^ej%R8H4)Li!8{{WaAV3Pq%Hg^p{i35sBJ+z-C~z}i(76y{ z86tVY#@$kJ{M}!@{K_6iJD{979L(JY0Q7&ZZdf2;6X+NyTrILuu4pq8R#m-RTIx4G zy4&!?aePk-=OxtZj9*N@02~u{Z$b&0X{8PSl~pe#4oc@BJU5H%bHR zI#2p!i(D)qR+c_8Zcm1p8IDh30A*H(Rv(T7Tob?FPJjg7VSdTAfMG)>=A}6xdaQfr z+ZvpE`F@`l#o1&@NehbU)8+9F5w-ho|HCj&%IL)&03-|NlZZWUo-ltK9Bke3|LGR4zLiL&HT zU8p#CE@i}2sZwOlmPZ4Vx}Ldw>=`3eQBjH>c%Zwwe@vNOUp|aoUx)(#R%zz z@86|CDi?>VOpJ_-McUu98h!-M>le!`x#Zvji;<^OOd(6I1+jU+%|Qp7b};8vK%2J7 zrE_H7104LZPwp@mI|O)kZ1fjQD*#t?@iatG`pl$+5F>$c)++T9_cbH=kYFo}`&dXf ztd|wU*Q!xQH6PeAM~3Y3Wya~poz?N@hO5eM>I|uQO&a)+!8Izm8u-v`dnXlNUn-e{ zE(eZSffDX%1}k)TTS1NIE?gMdy&k1k)X|%-RuKV|M_;4jNCr_3LU7&OPYq!Q zcxHjhaqDb4%fyD(4iGE#6YYkh+He~aJoY&Ve9qF~G_v>kLO)^>bR4Odqsjfm_Z*mB zxG;HLYc0C@Y}iAF1?dMBuWLT#4a-})B5>@xj|rDW9j`oj_(G^e0NNJWcQL*^pUs-e zbq+cXFuyFQCgL28H5#MORV(vsYm9mwshTC$$A|shQc<0BeDVlsM4+dz36)x<0Pd#@ z7R5DS?u6QxJ{G`L&miNtf>$@_Q&$u}0v(&6hpn!oWUEsa1Q@`8fn-m|7e`K<+rh1})=%3Tp&u{HE^gPu(C_gXnHtgDvC(?xB^iXI=b2bn@#S@rx?1 zXh0iFf0ZICxVvlc zhG}Y@PJdRwH&qs^PZY;ZwuUplXjcHCf-b_;Sr&u$DYGs>Xqg23M~xKCL`3=`L^SVY z3*Vt1W{J5K6xRI6J|>vV(#~X6Ty6!^BsvTB?03D}_hMff<21D&NUUoQxt|C=7M?+w zM&de)WH;rMXq~uZ-vTT4KEwdr)_=d-Vtj9#KgP%ua4U4cEU(~C!C((X8m5QEU6GAxobnTGC_CEtjft&Jo7MvzC)(BP_nN;rU+}jssuL1}>?=8hNiIzij_2BLJ}R4aB_Tdmu7R&2+CmZ7 zwtjq@G;QuU6#k$^m2*P?_!;`C*-5FNKy=~!;ve*cQ`YL8bf~*gSWxNd^ermG1(h4s zQ`>`mb(6X5*S~{(JbM2TUA?2(n?C(>-A!X)HefDm0H4qfmf2evINo!u(NEp}Xl~f= zLzHKp^xM+AP<%PP|E0cUbKlDtxZw{^i1-8QATc|KzjN>Hi05J-Yh?tkBD=Vr;U0%v zTKGS}M|Kj=t$nPJmFgw{E+s#o&zn8v7au$$_2?4j@CZ1sf&6N((SPf8?>()7wxby4 zqXed%(M}X^?}@g(6D zYOA(VY%AhaoVp7HXs~Xt4{&zgpgO(%t^ui)$OnOU@JEvOkEL5b5YPz-<#+Ax5b=Hv zc(L)z9opLEzR~+#0kr_zEH1snzvjd0bOW;=>7K_eJa^a5#bVvh=NJ~?EG|Z8juFr_ zCv16TROJ_}7trFkNP;b=hXy4Fl}W4{eP?@;ex#13#Gp6W>?O7@P%)SZJQCUle0UOD zbZ5}j$!}fTg|N3G(FeGT%gfiU>zIJ8$t#D$l`bs990&<>AJ65-{zVO8c)o_~{VnmH zfJ><+0b$G_e@RDEQqsM>*1LoK^iWapQ0@4JX;=Wm)VY}4a64Uh<72gxi?fk?H01+C zsYwgsg-5ai)PF?p<2;Cb_fEvg%WE$)b@Hu&hqJB_4ZCt_+D%55!os)4j+vtz#i;ZT zuMA5DsR%;vGB`^bho#TR4`U!BP5_A^+^%l>{fB>4Fr5pd?d_hj_fjPBq@g^;QG+YRDD#~dne9q7xy`vjs8Xq65VT`Y;wURL|DnrDYp)siAt~_6KX;J#I z2p@31)zJ>{fI^Wr-S`GB1KL>AN^S?TlG9DpU^3$|F-CZK@%k`hE%)>{JPRZqazD~! zxBIws4|9VPDyd5Qc>7z+2}pGLO~=8WSUajX*KSmWj4U=lCqSL4N;B`e~TRVqG_r0kBZ_7`Wcw;5H1|uJv z^T|Oz(D4+uN?$21IcFpMvmdD=|*fghoF(L>VHvjLpC zpc2}-23DeaMjE139nq~mhO@u5Cni{y!rk6>7}Q0oM$1M;Qpd|cU4jMvgYKeOx4#*nVvu0soPLdoo4!qAOmRMt z9U8F47G7r*zb>IB?-{HVF(?)y`0F(dlGu<3X$`P}W$A_uQ(Rca=0P@fy5{1nK5^_X z|G^OrEuBAK$-B#!p-^crmg=a1rfsKR4GtQQlXVRI5FD5OLm+O(5bPz;X%iM#fh*b8 zf8W{Zy@PG*2Sz|*oy+v2IxPPWmLdGRBg);$0*?bnmwGHsd07^Gof3I8AD*PxW%QKU5W%zVdBnWoJc~r@mbNt?}zqB6|`)g>l zZlAC4fHY~SpM2N^Fti$=@L1nrS<}yNeOwkfIkwQv7xhY9hSL#{R{1RO+SK}i`(0D|jx#&F#dp#i0}`b` zGG>ziXz~GWuT1tOBOZ#AQE{Fc*}`)4Lt|Vx8RbHjeIl{J_tZ3%2X`VFQ#qETDdZ*MiLM`N5$6XSfcb3<{$U zHjSOclrju|Jg*apE;}K_()0lfk-x9}oorPEx>L%l?ReAq&qJe8V zjh6@eX5Uhm3}AJ7{~Y7@e;Tn`lI~AkcJw3kGCDQZ;!lDSa@suvWr-MrWy)&kFQVTf zBAY%Ds~7?S(qhwkhqoBl?Rq&`p(N~EaS->$R0ZP4nhlJ2o?VGVb!8m$SV zc#7wnIAchWJPHxJu8VV)6SBt1p@{o!^?Y(pM-Mg+PC27IW z`d_6<&r?i823kOj6I$8Zg--O`^L!JCWSGh@^`i=7^H2ksB2SagzarWAV{VG{bX(G3-Of&uGbqyF ziyO|r7|VX?X)Q*jFoJ*(>*8NuVQrqq=H#8N(OlA2bsX`IE5>{^Mg1@Io zwzpki{@zDVN-`^WJAkW%Q#qkR_;jD|Xgg3NU@zx$#beE-$vI!+(B>%UT^eOuG<;;|HR?o{#Sav}cT6&Cw>n3ZTdYE9G0Epu~PfmK~QaB(!D-+;3yPX(MFlW37lk%{L~7iv>{!Q)m*1CVm6# zk~YRMy$l-p(!|T+4$iWsvC#mT-P7c#9z3)y4>rXo*$#NmDrrUv)(JA?m{8Ue{`F@-b=8?4)IJEOPJyO@6;X2 z6TqSnq+z;|;RfgIkR|2x=fu)9Jk#MuZuSZ#SG_gm>Dn?3iDiI#P~|s;8~+ORgo^C2 zi>JrR;yfk3O8xqaIe;|&vF5_UThKla^sRFSCM=#bvl{R|x{CNPvx!wg%&2erLjJf@ zQBeOvM+_y~Gn4b0t{JYokf14I=P~#3kDc`9bxQf%Gq(cf^NFNqe97Rwx%Thn_Vc8- z`xl(XHrMqITS*x5hWQx^_OHcpqz@Y+;S*Y~L=0Qjk! zaEYpl?ogwc0V5f(Jmi<=0bn&TY)I6fBYJ?2?&|qdi(yu zJsY)Q39!w%T&9H;?CA`2$Ms-*0xs2di~7TjHR#izMdMBq_!%j;RjGJmox3 z^duRjTF_rDsYsselX*FjJ$WRl;oMZ)BAAlGLisQ}EGB01%Kzf<)zV2+w|y6?XC{E{ z5^Lw^=I%Bl7qCTb01K+-{_wgC5m_|QjrE~c{F3nGU#;RK!K@l=%e~p{8ai^x&h6Ct zCCkt;Eu$Zcf#IGXr`7K~MMzp}c4=O+fxK{5{#Hn{*M`S-xH zd_Rbf2@c7vi_02>9eS$$6nD+mP~KWfdOY@u;JaP*U%a%x$9o^+!U>Q!>ieZz;KD5U z=m)%Jp2@4-a6tNzb$hnGwONAy{L_MK%r~w{`@eQ;nAI0wQXj&It%4&GLc_2nTfojm zh%4)41QZuOKfyIeqYcrKc_rq9h(#Fd&ByUqEdacH?1#I-Zn%+jL(b#KELVyd~yaW8FXeqFA!M^6DrKo_Mri#NMXBHl+cJi0ips-}Y&rZ|}P3 zCjnokG>*SI(AMV&W~@3ZzxZk-QpWVX;Rs?BzaAp{=tgNsq(7xxNU~&8rBnFuNY~g* zbkDnGY`Nz1@d*s9(xF2PKuK>ln`I~Z0ah?{XmDWsLlRAqv4_#G_v2iG zOmVi^>9-cnF3&rKh8crZxVbFdpTfo4QPsn=H%nG{x+axb!iu*ZQj4vGWlnUjsQ~xw z*%3U^zS(ZX==jH+=$>{xI6|TE=)Jh!zj>y)FSE;)(w>)Vxe7vP{dUkXuJtfwXNJqN z^9KeiLO`+J5?CzU+;#Qnk4P8(Ck2!ga|~SL4z`_9|DP6s7Y1WB>pv>JK2(x$PygcEeoJrJ0F)mdQ&jMC`O;ftE41T+$~9@h z$VuWzE)3pr-$t-p1}OadTCDQRO>>6n0Va>q%;m}t&2Oh2%|AUAbaB5@W<^RvTiX#f zoX~(hAAgujW8ckp;KQ8Q-&$eDKDPb)du++0kHt_qwJ(}=*G|Ml#X{}KY~+hKX^5nH zB-$u}L7WS<1fJuvjJ@Bo_&c_hsds~E$zO*&PV~=fS(qCGEcCs+KyYOoOMMtQO_n=a z^7cqRLIXygpiO-0e!217`t|yKJ4p`EX+QH+9Koym(1O%ag~Eo|fuju%`fj)^$68XA zsu3d@vVmBC4K{K8ZA_5KJfh=D|!|JmWGvnne4s!{&Vz}XPs`8i#AuqT97h29Y zY=NGGy#=78A>{K`_*?l~JwL7m|FHHV2J4`&M-Cr6S^~D}sO1TGpmVB)$HltDF^~bq zkDp2JT;&W7Tc!FgMR>c6A&|KW#FsiQcW@_iKEHnT%6$s`W3X0W{?`Lw`*Jn~7Wg3E(TB-V9F@KY{>a(x*)i-cHl?Z>t6rDeBW1rK?hJng` zIxSt<`9jI!oEf^3zoBr((Is1P;F#||oH)Lp(>j%^He>I}-{xAIcFI@5k#Ht1Q4SO#Xemw?w@2S;RZm48J>@X}uSxo~YX`YRjJ8Qgk~*TNDRr30azB zy7*lW3DtlFf3>YrHmPGKLoum*wdzR^p^5dIO7ffOmHEBGMzLn`Tvy&YWlFy`S&N2v zkq0OtS{s^e-*)&qwBeA({1opv_pTS`Ue+Xy*)bKwsz?<;m=5Ho9KPG+>=e*lKq8$Y z>6Hvrq#TBr8*WMN$5?O+MRUU2VVjJ~EUx!(8$r$a8NHfUo}tV~Eq@#Bk+7S`eU=wC zkS;Kf;O}%GSc@HyjpL}+#+O8W$x7fNz_}D+cWnT#kp?+ysk(3(v8BFP`@p#*!Mjm$ z_-;q7^Z8~z^dxE+wnL_v7{)prHC7pUiOVyHlCiST!@>wAD(YJ>@-NiCpe!SW5QGBB zmTV3I_Y-HdENK}VQJN)LL535Nib@(-emdC)CphpRK!}_W zXv*;}I99j3)a6jenMFjCWvOw z;0QCxfbB>FUPJyao5tc;8cBX5x6g4ahDwjmgpLP9F9fx?{!?rHa80LhQ!)qb;bJ(X z9sGRtvXTC$nU1mzJ|gvh+hF%*YnB}t>}EuAKi9<`m+3GVF3fHm0d)Ts9X_!Bqv^*w zwxW9T!Gl>U1d zxYcT^UR6`6lIhA~ZUZ&DC=1b_I&DJF&7U0fVv&|XZ?rP>3(v;i z9)f=^fsQ}VDiGd~@ZbkUX*f-ZMBq=p!q1k8$y2RBk2QOBj)E%^%*sf$x#7@Bw(%DFW)l)jPc`CCzW$T`-B#nPFyDIMQ) zDRJ{J*AcH=Q+!zAn;_<I)-o^Jw`zCj$gIkXOevw0L_#lL+gZnDZ8LZ)^u#~#HhV#;%oI_=# zjbiL?Y14?4!kCh4QO-ISo$R$(J1z8@-*I2lpLFcagsh>VSMjZQbCAG@EZLmgJ6@sj zP|}N__Y%dMv$ceg9}Rpu`PLcxKcDPt=C>Z?WIW8Zmi{XjyFvOy3@!|cWb8zfjy>le ziLCjp_r``lmagI)tEbXT`8Hc+a}R|W@sg@zK$HL+l&?HGdTvVh|fZpSTsa^;lxd zz4PDl5X&8!^|!up&s&a9_J$;AC48j)kShGHk5NT*W~9s+7e1Vwz@CkY|4KNKC+Zue z>h3$A^YNhW5z8kIv2D?AED=)n?e+Cl6*1-cLoSS6lJjjycAS9dPhRyiPw1F|+3;ES ze}hoEb2sGkHgU7vv#_nK5BPmvF7Ha*c(U9}F?t>IChEw<)p>c$zh{~8uT`S6G<5t< zFU*v3JE`;;olSB0!NP0zMiD|#{l9+kKn!tvi{Kiou5tm1;;Fuvh&=bBF#&FJJIo8n z_z0IgPw3&Mk#cnP!cmaka5{s*Wp_|GzG9;)td3#~wJ>mb*JtC7&KF~)3#eJGODTL5 z!yT$E_GJ70|9F6KT)yJtqu3tO0JXLzXKy~9C3Q2{$S2Mcbi%b>4zot3z~8~ z8xcIDY9;0UGYc&o%eY0M3wi8%>0BY~SC0f4XWpE>Vic6DQ4BP&#p;<`%?1nc-#F-* zYTIe(?tT;h7gG3-qb_*Ovxr&Xo9Oq6-IWe=g)$C(f1(Hi&zGiZ3nTHnmOQ>k$+NvU zYBPyst85h--@o@)Df=~{#t*<4P!bLhL6R6NJTUVL9w`CBM)n+rO+5ie zF)8SnYAn;^mrHqU6owob{Sn`qv$bMf9$8xW6a-IF?HT*r9Xnz;uXgIoTV#TVGi7?I zgyWE@QnMlriCi9j>rTfBOpaRvvvg6^NXO^8OyEnyPfIqTlo3x9+d$}vzk23BfpgaF zNPS@D%VvBN_46Vgs7%Uez39MWa)M)Xn#`rg%Of-}7qf$#_r&7gT11~0+9XHigJqku z@ng6axUSw4^BW7CY&)c#ho_9L>*&@KLr-cE%#DFhgerP%uiw77l^l~2T->Grm}|XW zw{r+G9{%Fb^i)-_#Es_zIn=na-pBFv+Bw-1{VA)HU?^&fpcp9kwGunZ8D8WC&#!?1i>w}=N-<&A)yQ|GL5g`FLgI+pcK`Xn)r95P^yZB7{Lkl|lLdhuy0#5A3J0e1>`o2XmiY|<767z2Js#rH zVPdOEZ-TW zhY5jKIZqxg*H8laexwG5z(k#O1xcEH7_XV*`#7TRB~~8kNST8bVh$Pthin2xQitur zhx;s-7+m_0@(=mqk8wilKXqZqS@FljQKn zuP=Ye0fyjE2=*&|kuT-h-ybAz!=)ATP z(Z<3P)1}<;+8+FJx$k(#Tw@Zj%}D{y*3(B$r46x;j_JWh0|8c&pJVLR6B6=p*#32h zimmm-O!Y3Ca^dK;OUk$8<1W)$MuCysPB(9Z?uJDFDc>)lSd0Ch|HKmSAG{4m{=(}93)nzY~pxeq}$RCM5>;=p_%={ z{91lC-Fm>+P{ePFIJ*wx)8lD?yK&bN{}eB7b!tKvAk;;z3c23luj##i&wXhgVr;*Q z>iC#bRI`gXawNSM{gti|>&=Q-gwiI2*!5~j<4>y}#uejE|N{t&R&ujQVNbwb_;H<9K8n^G<|O#lJmkP=j;NI^qMX5 zT8G3A-d!2Ru&NhsAEaP^gz^%fCD(XoJrq(8(0As9+llqORf`WUw*(>GDCUI|3+Spr zJ5R0n*y>Z-Aw0KhznJNtPx;hSq@~b8Psql$9i~0K>x)fr;o%oxt=JsUzV3-65b3*MCLQR;Do|I()vtk-Jl-n7X%92%-K==dNacFy}ZSKf@qdihx zIl)i0PIoe4+-`sBw`Bp(W_-B3)a+zUw5-2-eQ|aPur{4LiIIkMwWi&!5Fs_mw_=#! z?Fy#^fK6(sSr7rh_NOpkSIw__+Elpm5o2G$#Io7gfY8J^f@TMX8^X;wv|NhB#GvqS7N zL84-+Bw`=GJWr~}d-5h%GX4t2^22}K@@w#m@+Izub$y`WX*XWL8T03ypBYPC1yBHY z6-~=U2}F;o0z0+?+NADUkNM9)QJ{N@ll6FfuUF+t6=)JTL3$iv538Mic8Cw7k~Z;x znw>@3xQz)%vnH|0CU|l>@FHT_(NvpxFAuXmp!?mT;7c0Uud8nY6I9qnQc?(R0?vzD#owj8!JcIR0*z*X*SbwM2T}o zFe%3&x?;1f)eLunY@3eJ1jA4@q{*E5%Z2T5$>!&5*)Z^Fo@l8gFLc>bhFoIppUh0r zm7(f{iXEItHqb*(k>UxpXTtkeAU%O3%5tyT?;h)EP6uDK8VN!gQf`D6%#+ux;D3W( zR-?wgQvDR9-x+b^V%yFr)B>76qG;xph@J;a6Zon@f+AUY0mLY;s9%l`-*5UgGs6P$ zp)A18!g)aP*7rU8gNS-R)E=MRH@4xUQzb78vomEO+yH)fnK^XLDE(I-mNXziDxWBk z&q|%$Ffz@Ucyy$?>-mQ|HBb$;VUwnMRWZWb#woIhyKyy2HRKZv44=5YPv%GuW-mF| zHOlt<_Hw;*H_EiuO@{{fc^1eYkOufFk5OpfJ>Ps1GKrEbB;?y<)nZc}9pRZ_oJk zxrFT3OfAmQ&eKcTi*CMs2BXv-ZfFF~rRUn+6yqot(V&Sz+%PqTZY>+~X%tZ>*@Iul zS-iTg1HRZfi-p=J(XKDv4acbnUs3ReDW^R}}S_Zx&vag|9(U;`yJyJS|wi`~f{F{Vl)azFw_tzVj-llaq%QfUX`v3Dr1@y4%yf ze-7YSYNEfuR%Y8IX0b;o=%{~qCANsVD@QzGA5M-XK{_C#SS1qSxk zGXzVerpK;UuZIq|mFs`1Ub{^?*sGpgo=aaV8gJLQEtn_rchUV+>r z0kl_+yk!aX^HW4pwM5(I>O7tvT+5D~-}}nIBXDbK@TI0`S6n!uU*mDmErj)3>{C$Vr>Cu?|-JTg|1M@Z%I&*}BL+8L2&uhy9vk7)TZas*J_Z4i{WS z&|kci^YG951Ke|bO9E#VU6(AtY3|Ya_7<=t(^$2bf*py3X`ttG`_>zxX|zRFQnJ)( z`{K0kBt+8F5R>dzbU;k)7cumEEsO5=yD>~6;gu=4@EOi+u`TDL%&kOfwp1+);zV%{ zjecULJNn7tDp<6yC_zP0;{4@Oe(U4%Ft`2=n2VxjZ?RmJ=#$&J=|n9%iZx%u0)={J z5}={504U#`GZgB;zaflynGsN!kstf*( z?1vuqgIMu_$0?&EG}iJtb1OWK>9wTUe$s%W>KBn3^zY{w6zgZSS&9vzLmOcHhkT7& z6ZyK?&0&h3=-M<1X`1%rAS^WWk@EeCtSb_Dl5j`Hze(kr)%Lh(nz$t0Nd)7<%tU=4 zed_C_2>H-o+d##4>=2fo`jQ>Gp&?TuAbI5oyc}CzjPfI*n^PzZ`1Um32DC; z=NKsCfzMJAG2bxLny_KM!V|z^)AEAvecD+_vEhCW)6a?8()Pf^Cw^0Tu}&TzQe{>S zi1`~7YQ@Orr~EEZ6#T0YCa1yx#*1$D`92t|ruqd}4D2-E^E+Wz?{(6JjN0!(ZrFa; z-zFIcyrryRkK~58Yj+Qx=P&I(QPj0*-xwm@`^epdl>E3gY_WbBmF=H?p%K7&%GL8} zJdU}io>}W4qmWC?u;J!a=__xh&a)Bd1Ge`z!Rqgc3C8HDjZpzWU#rctxU&&petq3| zwNrZJS+b*83^4)pC*my}(){XI4yZo}A?s&dfW)VvU zj-5&XV8hM=X)4XxNB_r5G)<5O(8D=KRPLC*M(x40YIGfYK;BwGq~%tVJ+w%y6TOYy zK!{{~ux#(ME`QRm60PJa!GSI7v-f64+yjTqq`EOsal?g-zz3U8pOc%y>DaYyz^|(Q7BPrh(>65_<0Rd*_xYF)$t*%WOB2j_ z!G+o=;Q&Nne@wa2&F>6)L7*zA z|6bN9Py*=;lo}gi>Bf|M&52M=TZNkZN)upBBD!VNz_PJ5FMR3PyVsb{5f_v>FUL6* zUt@R&^!V4b+Kr&L__cZ_1W*{C$5<{^H4E-ixptofmqM#J_V0W zKUX3ey9ZK8-|{1}qd=p!{2BH#EXOk(WQ(0mQrtx-6eEB!eQ-ZYYpHH=4k6+j%ZK7_EbK`AdO|$l$JonsYL?%eG(_JmqZ2fm{&WNMw zCTe!Jl`D5|GwnK(aSD*Lymf~R#&aI)+Q7#=kmmx{RB9ltUu*nB~2c@6* zzBLQDx$#K>^$WDzr`F0Vu9_p_?_1o{-%T}mzEAz9>>{?MI~Xw7!%y$E^>?tV_pUo& z?I&S2FHR`iRNSs2fde<>N>tK9LUmHPPTpw_tRisHO?k=HRjt45G#W!QAnxk1@r&_s zv0ta+aJs^%>)?tV=2Yb)jKZ6I3918T;y;iaAcSPN;K6HS5jR)4mpg1M&<9kw}c&>9* z741-kq$>u1y}|Bm7c*WS!LYn@;Qy!bL;Fh{pPxi3G85-lzDX6C*cY%K$BnzcB>mB% zyn5l2$$v6aZIA|v6ZzI>{Qz4c=2wB5wbkpK7*h$cT2N8rEL!m88*E$ACaj;blr(Rr zVi_Z*Dy|ixMeBpd3lT z6N`EXe1|}accUj>yrAR-xV|H+AV7*=e*h6kS0`6=+Y&!;0yk5sJO`p7(wXz{{j5v* zsO5AJ;luekNN~BQTzSm{WkZazK&%KZ$k3?#A3VwOPGevdS(c|ASeQ`aXS#D?PE>fI zM<3I$%bWavT7W>NFU&ZhgN44%bzW)D+dn+Q!`V&RNr0b)awI*_Oo-lQaGm93y&Yft zUdw1zX*K6U_bx^c)@OK(HW%w51illZF#{DuwaHiZ9!Kwvx2(c^JLv6RB?B*(Z|}RK zCC(!D;%B-ZDMY+6O6Ub=R(VwJ>49U&I6PNKKx2Q^zyG~7v%Tt`{e6QrvY^JnKIO=y zGl(~~an3&xFPeMZ`Weuysq+&~Z+B{_`?5S8Il3 zHf&f^+Q(PyP>fb@r6Y5odgqjj2ZH%XRwtRsHfa(uS0)iKeEswOs4zkT(EF89n2e9C z8DDHz#A^1a;B49%e61b%(2Am#nR*>lxkd%<`QfV2 z!cQZg6#f5bIt#a`zORelp^+A(LtyCc4(Ub|>F(~%kyd(Wq>+#Y36UB^>F(~5ZY1Y7 z-{*PXf8frYduPtxXP>n`YYd-&=H{o&Ys6t~RE`af_Mrhs8gZN5W6Hso{0I$(4S7_M zSxAoVn-|VKOFY?V6p5qSfYNcup5D4Kf>n@0V2?B~H8orKZZy7dNDLgbTyn4=6sfZb znr1SYYZW7a*#oPeS=Ol4Yaq?^|H&PAQ%hwWo&UMwdQ(&0Kh@Ffezxd&(dh3MUo}%? zUq5-%@%{qk_gN-IkC+P%{W2%LWWDCwDFO#3#FAx$Bwc^vYyQY{^?(iCx(;H*`Ng_v zj)@8loOp+WlX(=O+(b?@OKWa`LLD<;73-(Kq+1&dyo6voCvsNHVmpKp%2y5%^}#|pws1Wl8F zU$yw!^3h#n0q;Nop$<~S00|1g(D=zv6)-`z$p081`SxGp^SA)+^IzX1MyL*?LNeJt zbFfXjoU)o$3L1U+RlO{~l&?;z=a?C3+iA6d6LEfg%1l=>|K{rR#9Oet;;=R{K(rA; zA~P<$DMLyhO>=##0F*-2tbpRZJM)j=zxwHyqy-W6<>+3hZoEh=93L=*SG78$S?E0F ztUzkQyONlT3ojVG&(48#tf6G@K~lz8rCI+?^r#Tq6YKTl5FwL7A9Nf2teTktky{ZQ z9L^646Ao* z)3Kk4fD<2X=!_DhM0g<1b!@Rxp0QHbHwDXwNPdtuC_dY!SptH~-OUc=b~l8UGH~}H zUB@JPmV3VMDy>9!uwJc{8F4kBcNDx1U}zt*(y8WL@}5G{boUsrNO^8sZ<0dEv2Ri%g`Q4Htcc6(%KHgz8rHt%JVcC2expct@AliMjdw<>5mg!I2?AbJIE1Ukn^9C z2ttm)!5F@$1ES5wdwS*)XZ@6~U3a`8&|ni=*g^mP0sAhcTW*|E0wEX;$dA6{H))L}HAJi(-|Q9A zC`6=~O%7R3i9RXnE}xKFg96tKJMLIXVq+=p@X(?4MpB$LvZJy9&$u#ZgxF1SGUwKf z!l$c7{Iv#T|5N&^^_>1-6N5kXfb1Z*rmUr(M-8I*oO;xvnEQpd!KE0@s@7m&ZNJy! zb7jhlK{U>^FMYYRu#y;A*LU)K^dk{jXgR1Uzj*i2GOr%HP%oKUvEqDTHr~R$Q@k}? zM>lEF86Oorj&xCj_lhFA=c}IX50i;$i06z1GiBF0pFDY9BT3ey zm)xNZ{C$><^o&M$O~k!G+0t*HV9`UcR}BItBR3@IyVqOmh_jv0O{V0fS~(cbR3KjLvHQeu2^9+BHl(Y=PkxsuvM{90aka~TyPXYMx>S&P3EVE!9- zH8Nie<IkAPA7I<`rZqCXzRWGzE*_Btg+X|{HUv8nqv<^BN{h(G?7)7Sv zPp=%4P+C>K;ESdWEOPtZiUlCh@Mtr)wXY*lf2j0!VH@4+4%2T`g*`afl>YF|LJ902 zEI-oP5XD&6(;TXjft_>L*Xx4nemZ!8k$2%zZ*X8N>Ds@1?^w>tL6keuuXz&G3r|)_ zeAKs?=w4FrEBg0!@`y7Iqwf~CCO`ZG8vsyer98k4kx8@6TDRAvOqn3;iUTCEW4n%X zTd)C%jOK%%-`Kr_uYG|X)2p3PBri7z##%xi9&hbmAtj)>)r63uBk3{9?wUe4(%c*g zkwmSG*7ge5*#7Mpm?Vh~z6&T=2m#ofQ7oolTX4y@dW}zl{-7d+~VDnsUjG@Q0 zb?V#p_K8qJm6Pp>@(U+uc09gWiF;&eKR zd&xL01E2`{psVg*d2!n5!aj?y4T-Wlr{6nJ2CiclvXYKcw3+M01HV~Li02gre@YUU z$ga!WrUF0M4nG=x$L9ubx%!U0eWLMiHqu$V(|J`>FTfYlM@x3?s7xLk0EK%@dn*6h za~^Ki9Q5rHJUg--q_|HBT6%XY2ko#p2xPw+j&RWX9jIqgYAbiw40e5y1{Za5*7Pu1 ze@7&}Uc}e_fHBXu<=T=_65pIBkP+$f z+^jOER~xtHSsQonZTDF)P|Rlz+^YUd)C5=J)_~x&GpIa4i2W%`9Wh+@zHSt6Qxssg zGVH@uK3ncg-@}~_be18UmqaeK`i?Rtkn}iN@0Or65kfMyWyzz+u-4^Q+zEUV><+hDWNJ$M>pCj$-FuHA;g^O4LxB z;#{JV01y#Xly1tODkRG%Js1_(bz%=oEIIU3e^}~DLn~H-%6M4`_uZ~DX_keWP0v@4 zE4O08xVE84?%8`zdd;ZkF_had#8?&f*NJKslx6VOaUEKhfAhMF-?LAI`<$%;=kmSW zJlkG&hn&5`yB~Jf9qElfmHOG9)0(Hib5ZVrxLfamaJlUa7C*yDx8JXl?Rws=K7NIM zJ&|!qOoHC9H)sk)9Au@RwVD&4IZC{1T$^*fAY4M4=hlR$?{|56;qD%u*ylNX+TA~u z2P14AC2-Dh_}DC5^L49xydzT0$i`BK)O4?Yp46TS+wHf_Ywu9p(?Dmmr-Ls=9Vbq_ z)OePC5#DN8627v7z9#AdiGuBK2-g^^OI<>!7hzSS4@TyGmMenVo8n41{&sz(sxXM@&!!TC$jb0}19Al@o8kwOj7V0h#a( z^d4RU5ToaDEIZ1*U)+$H?q2VR1kxE6Oyr1T`j^0C(+v-^{d(7kmZ{9_rOT_jLQ`lf z54@)Q>zYqP(_3f98y*7Xlwu2%Y>Pe=9*Kd6i63un8qT2L%QiYlS5#*i_w0wxHts)S z47iF$1Aio#z=g~2sMtr~CeM72u31f%+Ws zo2r5+feyQ0SX`Q0E>rQn55+Afz>C|q1JjLwj5D$V1D3A0^p=-exNFCPg@QqnkVm`i z_z#_(%>x^`Qmlx4`qc6X*7f^{F)0Us9gDob&OA*CpZ7_pxPb{YIt=R+#UNp3L< zHJ&qdW(uzxOU@&WWK`c4rg~G^XC-+Pinka>82nTnlvFzxmzZ&fc@CzEP5sWYd;3bS zm^`|90^WkN;yCVje6=Q67#ROCFw%oc30J$QzCfY3+_`tHdc?Uo-*zr*s;^$4uKC{T zanxD$Xe>4Ln4`EaRPZQ!{mz?XjEb!1U#&aU9BN{m@^d}u8xwood9$mCs$C`CoTHg> z-u!=^bRL??*UI%QxX9jD@4Q3sLy40KE%O}l)+vA$_7*(+2CmB&zc!Hs} z#xLgjhzQquo89ECev&t%eBhL#ziTVMm$w29L<5votr9O`Ywz0!yV76*@B^!TB+JOQ zFT96;27i#5X*(k$Nhb}EG~jSzVgNDtz#`Hk%Tl+04RCtm?ga4v6C^JPpyod{Pe7SbftG;xsSTeW|FIM{zWHpm6oTD4|mK=NT_r z{se!jEMZXAQwzRVKkr=Q8ofQg$~%~ZWoMakG|$U_>WO)9LP}6&IhOk5ba>aQsF0b| z<2yYzIm$iOsY*RJRcCPfm!$$Q1EuC#Ve@C47><^cyr z=V75`FG-bZMyGDR%tFD@*C{Ywcl1BE=Nym+u4 zmJjMRKZz?B`+JJDopNMz1%)alp5A82E>B@p4 zdPZodJ=MhZ<#0b@?(>twbPMTLKyk=tR0A1GCvt=odw3stLlgYVxKDGECm9;(u)4~f zg5(=7r`}RX&#w~+vKm$VkDn=& zN8P5qrNj1Io5V9_msIVbjw?jxCaOvrFN_UWv`m#3FxZMfZ|7zHQfHoT9(>#d`G;`Q zttl!we*Zv@Wuc8EbN|{PN`*toSFH5!ca_Emzl;53P;-Cb=#osAE}h6Sp0~rImr+=* zannXKt3mMtQT@XjCd3)}2jIeS0!Mk(i2WqSX}xbAgBUIb6Nq3VOiyp@sCPSIu00={ zaecJ?&16;$jFBKQLC9wB_AfN~Tz2!M*WmG1I?W`8HSzKO88qezWRvANMcg0`;~H^R zxk_2MEzWiDA>~1%KQZNchVsu`DF;6E{-qBM3M6dtYFH#3A=+{_f5gQEX={~wkoP|I zQ*pPt%p$pY%AFHZHlvy6i75L!ss~|wYB;w~3SWaRYa%yzslD|bpSJ`F=Ld7bBzdi>^MqZ}s9aPv&1_!L0=zC9wO= z#dX+=Xx@_&ddy9v4>52F`hS^(a5uZ9c5r=rFbR{y`}*nikC^T5^oIG_IWXx7_)a|W_5TN5c%xo(U*@VD)W^YO`__>{7;riw}`l%jLU-Uyea zi0cc$4S;VstH@?py>T&+oweVxZxienM0A#& zIL+#e%%r>uNi_7lcTqH4B;Q;Jj&)y*+cp$<=7>XRyj;{55hUVYIB+?lJ`|5&YQ51un=vRsb`3N+>r;p*!DquwVK?1u37-Rb> z6)7U8>)y1p(|wV@suYULFFPI%r6BMxjXD2|w@$CAGL$d|JW?~RNt0w=6;{H2W95U^ z#h!cx<6fN`0heAJTrUw$k_lNcag?a~e}qOM_g+{2;*Q zvr=Nt>})Z2;g4`TW&tjZ63Nt}hI7;hB2Z~e@ZCOvD0X92cf2y*!&e5NoeMyf+zfSqs z%T8}zs2VD_ad4t{?+i;<2R z3;*LF*QkdBx2afntEWchuLy<_>CDQmH{^6KJ?n?IR737gduFZMm!!(vRUGjbI{JMg zw#yPkL&+|W2>*~SBtLorjgK&RG)a9r?i^0P zg5XEAf$s#fQ9yyP&{Z3WLGLbCq#nnsWcvVI_}leaBRO=8pNk&HEd<9wIP0i=$H@%s zzpCxBq`K*)8qw>JATF!`V)@m;rYCuY5m3QhM+#Hp&&AYv;jeJ`5O2L4qH8-0ZviCj zB4zGfJ;-Y}038**Ahc{nPjxJkkzf~^KB0CEybtS7nWiDk@(m@u2OfN35eBu*#x)%qA&5a z7?dcMBRBw8On(n%UOibs4w2Tg33{9r3pPQSw8Zz3VW>@#~m ze^KHLzo#vjoNYzt>9PwJ6sqSl;MtObY-9c8GcHT(v@xj(jr@13>=r)RZn3loz{nGp zZWYA?-pNqoN1ClhbYea%5lVM+oKpZ}ktb!N3VN#K5Tq^aEfO-$&V&jRmeddNU9WZO`7Gx3DzRCYy2{_w}cOZv0ueD-`VHJ&UVt#)C!xK02>XhesDa6IQ-bNY(Xm4p)mj|k6l6cm7J1dK`#T2|$usJ4yd86K zyG;x1%UliU4u)$00X;c~V`1k{rm50^9lDuFunQ-|)!YJAo813?e+j7~?juj#lMYA5 zTHrX;Ssdt?T~)+~%FMsD z6~RGhFp9-n6Yqvyc!g(H-w)jSqZ(&FeS0Go=W0x|W0bbbb-pgdYAWUFm8|ANo{cnc zoChoBuyeb^8ak1>M3gCZ@3PU}jDk@!rP(i^tBS+_z%NvF*XS&|^Rv52udh$;TP;Ng z-g~XKIT}Gk_yQ?s2Xf^UnOw(I8)0Ip}ObIFWwrH{M(diUwf6y}cO z0KhR8@)KFOBI46LlJt1y*;}gLzV=W8D#Z&XFuMIXiTjbqF7mvTmwzONvkYe+u$ZB# zN=BF{$6S6P*8KzM{94hf3u;GSCrrEA>z>D8ht!kkRX8@MoIG~P@*>OF8T)T0wXul-_aOH8@zbj>iza+a;wbXLMHEemL0X! zlPm$5o}4ibxBH5&%K7{|QrY|ob1c>B)4;~K@5xYSuBYLC4iokOjOx;wi+z~;lS|WuZh5yP1+KG+ zmx}HGBofkg3h1$gA4tyd+~LEBfcNG|yz1}o&x&8D#Wn>Qk|GaVr<&d96m{}KLI5hr?LLqpn{xFq#Yiy`S8isA z%c0+lq!a94HOrH^Z7k9`_n6~5|MWQdP2_6GUE*q5faJLup#v?x3EA`OyQSK3txH{D zln=zYA2Fri>8xqS!%JOQ^N{)=_-hsn@Ee#sme3t!68eSo!6LlDt?e4ino8927arM0 zCz{YlPqh_I!+W9WcPB=DVScnd_4lo1rmg1017b>f(jH)Shrc+=xNmJ%WG_*@Ca-ny zalzbD6v>a85dgv=7Y)7zFX-g!BZi%xLABpKo_%yifU_aA@UdkVufBXNh1(1@vkc8GUl|M+#$TeY( zIOfT~{6#{$sASg)6ur%<)!iD!=V1Pr_w_+h$5eZETPbx(Z?K z$!={U%Isgg!cVV&ymkAlUoIm9wOykXF=`Tt?-oe?jz7+|ciPfrO8z1CS!68urC|~Q zS<4-bq8Nz*>AkjUD>aMLWa*?_w2|P(eHVjUa0~1jk&}6BVSj2hO+l%4lPs({jK8tM z-}g+FZC3A0R(NkryY+0e_18fC1s=_TOQF_GDZMf-XE?r_Gg;?G?jw;dl@DuAyD7y~ zv?H%eE#8Wcpkc(Ii5-il-LO_KQ8wS5mKSMEpI!YPN`g}tww*aS$Cw0ETlgC~?K*st z-3;1?K4$50Vn~s_j$@9En>*1q8rN&HoS)EWI3J*maNT}Xd2&|1DdJHIPTFp^#z%@u z-Jp={)%2WM&*UAxP0EyHM>v!|ZYL)+mo~I&otUX+{cR-Ou(rx?0*`A5k;`r(B`7g- z!%Z3d-AYpY=MnU)EeiQyU4iD;-V0LHDf=@`KoDZ2LPNyoDYoGTniIeSt zQ5<7x1&_qHt#}}>kC%TwB9A{fu9$F;U%B`^fluPyQ zAPBnRaq!->>+TzA>7S#hFh#)i+qovPdR_9N-7-ec8}*A>lq20z*OGV#5%G&ZuXf%( z9Oj&mOl5S6G%ZD*_z{ZPlYNQ3dKm7OSf1=UNw-|PN%t5txS#({?q?_~;3e~a?P8_) zXzJ%98qoZs0oQosjcZ>*y95OB(NkrB&()^o!Z|0z{r=X4G9JQnPY5`hHN4=Q?Bf2| zV2?B!w$#th!O4j}L6FQqccBXO-IqWq5?&>n?wT*#EalLONJs(#{-(T;8MQT8mFWj9 z_+owQsV%5yKVeo#$hBA=+T#CHk9fHFQ}`Me_sxR>21r%8Q@>89^pkB!N5zYbUJOv% z0nZo@xU2t+DuMM#>H{9{Ienea*;zvvF3R9qLo5Q2p}5 zhmx)?142Ml5A8^GsZ}K*SWlLzX2N}q*lCj^TUtU&nE0qumQuKPjtIO@f&e4EuaiFM<0MY?e<@Sgf$*Mx3 zlyiIH1R^Lf&8G|H`25fPv?3^TpNhhrL2{9oE8;=3xyVNRmmt!_2ydA=uD6Ru9Ks*` zb@3lE1}uw9n*f}IT(2(P#twDpcW~N?Q#T8zms0h2eQMK{HzD7(b<|-CJlT*E{;b~S zDZZz)867M4VFGCpH_yn<(~zrkBD!6w=iR&xTO4 zA!sX4s%CqdjaNv_Lb$a4DyW^OEC5=ewG&PvBPF(3Qo@JUtT`3{*L`{QjlJ3`DQ-dK z&b@fw&xPNm$!~=^ER|{ucFh~lD^}84{J};snucG?3q_h+oCki&k2y&A?=ynw}Y##czY!r=aSm(tw)UUGk??^WL`{j zf7H0TYTT58eYtPxs7Xsp{lQUH)X8N|)_~SqH6uWU6xy+F4|UY>!;Kn0*^q-WrPtHM zs}WnpssvKd9lR*xc&?gv*J%o=>-47D$*a5aly16MXr5W*A-GH07UsueZjczDm)i~) zg88Djp{iwm0RB-kzU{%zgb{cG!?TW;08t#z3lP~ThW4%5l3{3 zYms1Glru-a)I(ta%=IeyRBqb^ic%*8Vfd-Dc#teDn?{LDl)!ufZVg9J2?|}Gf`O&+ zZJ(}J(r{6Ip%hRYaWV<(@FT*1N^wKKp(?lii`U0i@rNvKi!f`9R%IgS3@uJe2teRf zB%pgeC|mlJe4NgyHm2CGhtDz$25Aa+!b!`_k0d^86D(>UQE^x!>~8U0I&xCCDtfm9 z*3?q8{%vaoy4r+wohQ_btu~%oJ+Wr`0Jou%-}HRvXb5**i1i^SIRGc`-@+yHLpH*TO zcb`_q=YHRh{`=_blmL3cfLOue87Tx2p5yXr0>TO0Xn$}zB{#&H0x0p;Y3O*{vNNTI zwf1h(mr?*HeKb?JTYfV-zU^KUsq~!17TvzkKjCZ|zF@4BGRs#(^rnTaQg8w~4_Q4+ z)b)~aPd6k2lqPkiOe`WmNiGNTN9wMl-Pwa5xdk_R}PLVYjc?i15Q0HztV?(-Te<_OjWL zC#C23i2+E(0Hc|ifFs&W=jJ0T`S;5vP3H=~Wi*AHyU^Yj3>8|Xlo^*6+P%)Wo$vGQ7>-|XAftilP#vazf5 zp|tB<{5258hUTJmb?ZoDl=pTQ_bfb|W#{Wti#A;z6hp5>G-Q=RsCed#+2&iSEqm{y zC{YKflxwV7eRT_-^7T({b*PCHxW?))v#KW2yE|(l?gcTXJvF1Aj--8=RiTfnk$v@* z2sQkx?@FD+i)!Rq&kx#e-8y{~>-O8V9zh8NKaa3b{tCvSG7?JUH)K6&X@Q6GS=rOZztxYlF z8Rn+C$Y=FiH$*^XEC!o!x-rmhL8h7*R7doIG(Zeh<5jY!V-WHL2BAf>P@MVP;Jq&Q z^F1X@`|06DFT^!HhP~qaRuZ-M-*i+W;ACWvEDxnY)*EpT^d`9bI^5_^4)M8Pxgkil zFXW{M)G#FOL69a^<+;N*Slr`u-W^|bP|Nnjx{Wm~v-pWoo!+5ZE@btV&GgV?x^T8Q zW-2PL`5G!P-S}6(LkleoQ7EC7{EGCHMLN?-EwYes@n}<_M(CAoea5Ax-?#eF*0gY7 zTIXnum*Duv=+amFCcV&1tH%b9jxw4AG}MDiUAutm0evxa zweY^>?lFH?*Z7X{Tke*)V>FTXa{jr9J-VV;P39ww_Jm(^Nh0ZfGOnV(iZ)^~FVAdk z>&WI8A-H+RBs^GKK~XuyccNGenCe^b?OJ-az+OMO?&+HNlf-if!oCuXNhKpFKtmH6 zQa?SrYIWteSioF2K_m32E({A(?~5z$q5=46ZI$3A zF^DT(VuzznSB-^^6e9O$Ypi6NNWyvB835PqMFriei#u53eY=;!Fzs1UoDZ*_bf?-8YN2LvN3P@#Fk>tGIK(S?f|2Ep zkI)#w(~G;xzUu0=I4M{)^yK*;9iK26k|Nb3gEw~i~75QPqhUm)&6tpuELY8 zC4j_k_U2QtFz?&BDcni~^DS6>t@ihUzS6Pm@J~oG!*r`nK^_ev2p}ur&$9|nIjPjm ze-|@SO$i>M|KeItlTt!e7V>>a=kB5XVE=)PXRHY)?ev`t&1!(HC^? zrSgc7DwT^jPzt>hjxup@-1SpM)u_C8n03RmiIs8p_ojHhgSEf}RQM7(*_vsf$*vZ7 zH%WX53+WpfT;D0LjvcqF#@s-iF)mT&qQ!qo6B^obb&Ar(Tj{G6i6i>?o>_^LCZIDI zGkCG#^@M`b`Pj@j>FK(EmLg`RCZX~O4UXJt0+-c&LWcpL`$_bUSO_-8N9&!c8s7AovWzgm(I6Bo|7-*_wzmUFN6Xu zyKUBH@D=(Hs&~zPZ)_CN1`)YuM z>d2`YVKu8pN*xO9Gu?$VPQtYTH*I`ygjKnJxpm<-AiaXnZuQwj zI^Lysdp3YcBY%qz#|r~$bwbDYT3s6rN4A&cVNZM~LnS;8-xLkI{Swczof31-(bT<~ zkt+wjNLSzDO?P%A_XH-|pB0@?8HEDvh(1IOKGi$Y~bERG!0AN?(?ECnR zq5QU)>Vhn=jE&F$v87f#&CUg} zy9ep1he`ovW7r9HuJz;F6bSw=7tn|cDhTIncN<(wk>3u&N-+V!TKw_xn|Ol(SWN<5 z^r!xjYO`Tf7(qqD)mb?TBl15|SQ+=hMlBG8WkwD;HJ|>CXu;zvM{XvMEpr$nw zU_diJLR9wDRxW3+ISW>?%LhIr7|KxfjQn;=fS#2%;fxZ~bn{_n@-~F`)*2I%FXnQp*5JrSewzrY!dYkb z^Ya6DYjOA5R)4zl{m2v3xPdlF9#;WYNiSm>SND*1Lm^9{Kh0J zwk6Nq3<$x-6WHjmA55W(Dr;l%Q;hSOU6WX!`z<75L;2hsk6&iN zM~HXfnHNz%!=|?~O4WkWcV_?6d8Es}G_FFL;s+dK`tdNA9AX(O=j02Q=z(QRe-qm4|kMTC~mZn9)#z*>jwz-sp;g7@Uq%BY{JKUj4)?(-u&VL0#b^s-IJ}-e582Fo|CG9~ zI2XWn-SOm>l}mt#;AVpG67PRu1L5-9F|)&uucX|$;WQKPC=P#xji36+bHimRheP87 zte(Bu0A}QDY*@PFr43Y;V-8Q|{nzp|Kusly(NC3#hT7LEcesa*yGAG4KW|-&Nf=w9 z=T;@Ry*4&oB9p(U(B+pTp3y-L^bRlb)9K4z+(E2^m)^NcdUDS=W>q`0&Ig^u>}{m5 zW;@YXa*XwbO#W0=BzQh%Afq&iLiu7P^{)A+UdesX`pYpIaRU}k5Q5|EqN7=$gSP@c z-u)4*Id~A3h16EE-*Zq$@jBrH_1hM^@>{NV2s8nfu?Z%O${ek#mlXlcdduaEw4NNp z-_y-kfygR5C>pPKMK2&hh;m4cfg?RzPoDR33DF{X{@B#i)yRq6T zKoCY5FPYO&V`h@EikTIP4)_*Wr}nxxW&8fY0v5J}fV>yROKKzdW~=VKO{^GtHwG_^b(XqNNj?tIuAL@1bV- z)qhtEgQt|*cgfoO<7={v)CT&205}%HupE~y8PlO;V$C9j4*SWSUJcaYK@QnvV3QG8 zvn4NFcM2x{z8x8&4Vszp3Tdj z5wdcygVBox3}lT^W^PlP$1(V)mprnQhE9i#y9vh`8sc}$H_OOf;=%k-BPOU|ANXYnsU zkyMYZ;KXS-mpUE5Y{XjM!SA0GO?LVR(UZPF3hbf5@zchQ^~MqW+;8k(LQ^AOZtj(S z01r#Qq2X4n-4j`qK=IKma!zXw^h1o61E&%sD0k*ww}RigghJ_&x+#1*4Hgr===x28I>@qtQg%|^FE2DcN2zScqn3=hY8{1FsRcD#PPDB z|5p1`HGJ`spMTyCf&L_XubzOAa+Z2AD;$T3N(xxfp1+mbg?vsGifQxP9`$|p3$U+A|9}`uqoD>-nr9|8e>lfGnIqiWf=NG zGa{O8B9wlCD#cc2pzm7R-dk8LN^QAPSq8gjihX!_H$kn#TZ8Nty6=h%urrGAJ~p&w zJi5t=*H`-SF&q88(=P+P+ss+A=ZtbpYV+FfgMRMsNvy7!&Kz3JeW~ma6g*S=z42E| zr*HlBpEoBhl7=zEtcC&u@&tS%d&;=i5n03mEwp1oxD2g*e1ReQOF&ktCDy=@QnN!c zTbxcMA%_EPR%3mJxW}_h)EcQnuxqBgr~re?hk8c|1)EA`+>40T->d#SqYm@aGhZ&e zwEHTFc-d4HJ@^Ow$>BfQFRO6vEOL$8M7!w^!@=mbSMhIV_Y}zNXDf*0SlIli21@dj zA)18aL_%x~`mTf#K|#h0ZyP=#kU=C4YDZV>jSaKXTG`EBv5F@{yheA5IM1pJkt?OK zH`UuX;0*s}WQEeW%Bby&x8isKV$8H<#^Y*fvX> z-wgM^X^N83i%b&2d3};Ar{t~GkF)fPAK9Tj7NXya!B0LMTkn-u zt9crG+*{Ie(V}h~xfDsXOlZakZ+WPf!gg3Kwd}JYbNlCn_%CP#>Z-WC)5l2NYQU!H z4K>YAn-oeevXy2D0Ur0f zF}prH&Hi;wZ3E&AS5caykVIx|ICqi%~&aglGHAH`APd<6QNEktHKV>=7%TEfZ7 z8gb3o#;2Z6e#X`|I(Cz~<%!xW)I+#Nm%EOiwun)o%z380?D!())JD^2h~XGlSLi?) zmq{c|WbNXRzqc#)8)I?6OeU^wSLhzg)Rz}Ahvb?@SXOJaqQ4GKN7>1d2evFkhs>cq z(Y0&>!z*y^kJ~%VWh)C!sJHqiOnR%1+JvG(64Zk^#re#=rE!Ohn&Q4HSYXk2#hF{* z`h82{`u1M$t3o}>s>MEl1CuDbmpcwJc=iy7dQd~raWkobi}7$C6K?tF+S<8*!BFEt zzmtpK#fDER5jNT-&ZK;x$H3p3u^^-EoTc2?2}__Lk>#Fr|Hg z5x@Yr0*x;{FU>tKS#$|4J*WfZ>_JNfLHIBepbgZx_8W2RDw}P)&z*ii)P8)A; zMfb`l|3a_N5iuPKk6vw_ETYr_u_bAiFl$i@2pJuXAz%3Di2R!3ExG;Qz_GOsA_{u4DXGjX5f8k=m4RMf?BAs z0`ygGef`y~U(;vrbBf|O^O_fLm31(*qMobp27>cC?Jd-PwB~UyDcxjP$=kZ{tAj)T z+5>Bs5#Q+UeliX3Kr8Tzu!9#~@zexYN|<-%D ztm`=(Uvi4qA@=9Kk=aHiyNFHbE1yN2xlLpvTIglFZ#|eL!mcmGQDJzqgz;>(D)adm zTlrl%&rW;EonPIEP{8oa_gDsbS~;;BefZ7=G&TtUh+Zqpz0v*~d(yOaSbciIBlC`E zGZ$@U#j}K4xrR4ddM_YkO}-)eD|3Whbmsv+)HU$F$g`@}VCU`$6S~6iXHc5NT^nPx zH5bf;oQb@?J3iKjL9a_1Cd61bfB;P*-jt;c+TYI6#i@kg! zKUz2T$zF~NNm%CHOBroa_u#44QITA|Nfc>t4hlB%89MOp7>ibv)fGv2ROGfnPRoD) z^QcO0)(*Lv6mY9bE)#>>{{-CIpJkv)6P4j)qOGGtBk+sDxmQGPlYSRqLi%l9a+AXx z`rY1RXtf@pyTy5)gfhIKZOBF8hqg2AIvuwt>Fj(e#!ETZg|5-wVL}z5k5=m~vq5VE z%v}=iJ5QAo7+N6%3+flzjEGr7^3wA*}^8CY>fx603M} zK?#xIaHHhERSlB8eG*`b4?_{m&P;*=r3BBPw)J_;D`joH43#D2FGSnC&*}=8YNdZ< zkB^x4We6t<&HD;w4Q)53d}M^~r5Fu(i7Q_i7%MM+TO1-~n__xD8;J;7%vQ;4Hh?-J zuNkQ}G{^kwq{vnZ5<7$Iz9Kl)pKbY5cxyrgKg~lu0KZjER*~8fisF5I=i=2tr_MBU@@75bzjL^My}%^s zogFDwp2_Y$vF8&~MKEF4*yK4+FnYx-=EO6V@vDJDOY*%_<-Dwo+XRe1YkI%huj5)l z?j!@XM3c%Xloq^>>LT2fb(sGP)DbK0$SjiMRr@NgEsVFaSz=|ChE}T+L)tmbb3*Aj zBBOYxdFpT4iSwD(hxoX@J+=ac5b+K5*pPZY%pF`Hzm)u$?cl#3Q@V8<%B$) z;JqaK6cK+*D89qXkjF-n7m<85<^;nhNp>qR{yOVGZzQ>+hyiCi$*0YBVn(T~$U9Np zZ9By=!({ff$*@p%SQ(BbSyx25sx!=EH#2N)R4Wn_^jDW!1Y#ZQ3}SgtXa;9Fswwt4J;jq;**-_t5Rc&)NAV{I(UcIYy@Q zbi7Z9j@QYK%VQ9=gygsa;yp8Dkmo8OuT3N`Cb_|r*PAn(bo4X3gZV{j2!iY-xtio6 zv%0>*Y4;6~@%eF@{c6Tp}3f4}IQn_tGfwOD8N70)a80=ULG_jW|s zu>kG?@Nwtd`mD4B)?p6=a1wyC09=65U%s^kz$O5j?b&M2b{iz#wC61VtpM8O(ai>% zLy)_DvIl^kfx)N62Aw`O0QD|$J`Ms{1mGzED*(IaXTW$8s|q?UQktSC?3RTSzX9^4=Lr$0TdpaZHzysx$zi^G^hN+Y0BBnAh$H za8ul>*xd8>1MotztFshouL1B;0N+4P)g0!JrkVJabM8Qb`0fU9h5hew&bd`(D31nP zWe)~062MphCj*$+Nvhnh0Xz#}6@V82{1w1f=iKfR$+ODp_ZMQcE(ZZDH0{rdDD6;& z>A4cXMS(y44Zt4zcdKb<+Sp)!Yc=gnD{|XyI|1x6?aeOawkG!HYjUPR=t!Z0E zkbJMLQsy#JP`BR8vt%~&V9SgX+0jm%D|ttBDeSdqe543Bzpu_V0!^HM6IgK znDR*gr`w;dF1I`aX>$N-kuxA`0?-|~J^Y@?8IJWb4MW?%o9*dgQM`$qoxpYg+w9pI z`1cNbb_Q0Y``SzE6VQ_M126`_DaaXIt^@Gd@E*OryB0Zv#31(qxWPHMy_2`;&ja{- z?v~mt~p}pK`8O0m)cRo1c_d`go3CUtlzI|5< z+mg=?LA*=L(n9h?l9!u}N8C}%F}{hd*?=7IoNMpV31v6U+Grf}%@|S$A>P%Aj3l`< zPbcyW$@9yUzR4jU1oauj`3av}R+5K??mr0fzC7^;uWjzB+V$>Lz4;0_m*g#ZE}rrE z0mx_k)}7?P#<;cZ-U;M*zUTJLAWOTV!zm#|VV%lp37p(KS}>vs1?HLh9L_B(F)Lo+SB^(D(ag zkk{Y^C`W`=@3bv|CX-2U@H#XiuDPMG7iUx+O(fsf5e?XEC7#r%Oe=JIi&uIm*-6x-o6ki05Ehw}@PA50PNf|#@6<9(f% z?e7K$gC!Z{aYkqm3U7JT1>XI<&&9BvIS=yH4ARyuWYN8j$7Mdq!KCk;Od4>lxwh6b_*`+Inj^tB?>R88_T9z(VR`D_pp z#D8VPL}x;&R*hy%InXp2E=9QGL+KopQF>fx60orn9pRWZ>gfdSZjKC2g%G9gkXp=W zD<8{A&PbtUm>OYiAE^}}SrgiyUti3?WrI?fTYUq9sj1tzGNeJsV(>pBWa|(-eGug8 zA}4guc+Sgzx)N@HvvS_(Gt$gJ3y|2TvkZBkVQnZMx0pL@A%tkR4yupc@|KUawx?U4 zFy4V?n6=NN6}Z|A_rfdKiwexgVG*|oPRkSK*qHo&tq7TpAh{wU&c$ZP))3)B_`V`1 zKVxGCn(t<{;w~_4^Fpfss*K{TGWXB_Z^u$0ZK~ed%Gw0&>b9(17YiXoArpa{6LeVH zNd8k&i+EFkpB{58@zsdcaed0PpB$QK>`P)@ZtCL=Sq=WSt?>Pb_a zcExTU@}Ba@dWCuUt7^x3by_G5gENf#OQG$Q<}$aTq1HCGC1^)CYv30`RN6$K7s=TP zt-XJc4oK1H0Dhr(_o**``2>BSEIc0thf5&76?7XL0L?8MOIWgE%k zGAPHxN!}fEtn8{%`!%q-6x{BZm0{fdLV5ah!f*{FPchl-GI_TYnU+b`7LqVqPJDzA zl|B(@A~`c*r}i6?mnAj6veoZck`H_0J3z8qo;a#VekT-eWxjBp!8=GpN*T?KF!0-B zd%sEjBJ_z+7vGx2N}Xg6lCwNpF>Tut$Ckoy&Q1sfCqr4O{$0rK;ki7MtloB<&ZmX? zK!Itv%<6s;W|C}D&mx5ANE3ltGwj=upp)B7@(z+mr-;9sT|l!w6xS&+Vd^3}^M?yP zRu(#*c5%Wmqay~@1EvY6FCYyy5!WKG$?9mI#eYu7S3+1@aY!#D3W;ojF_~wLO4yTsuLM0)D$Z8_s?0DJIge#sUB&VnR#xUC= zxFp7MzbRr6yRn!RtPK{yPP-~Wn5!a=O?Jyb&eJ1gd2YsKIm~We^zk6cQ5k&aV-b_2 zog~jGBF@Ipw!*FU_j;?JcSW4C2(pUgrM5-lQkKh-gmr(Zr9~ID2_ZV&WMF85ONWA5 zf%zoIXY}pxiteKs#T!(?PfqZD70G3x)&Hp(rDdQw3M$AhBIRH@-D3#JEVKdUH{g+o zxR({8-5~kxP&{)(TMc3MnX{_X3)mhSZ*_Nb!n!_R?xKYdU1cKB-B#-d5_XWkBYABx zYVE*avWMic8Rlh5$RB}A5T?#nltC`ZC_OC^a_wG%GVEo?1Q~H6p(?}gOt3o|qO9R- z6UH$(VLe-K$M8m^&4aluzSin$5)N1!kn1wpP_*jbi`xC44Qu7NTgmtF9&Gl_k_L5vk@`7?-dJ=Mov?Ar89ac?0lGZ5E zR;*FJ?JvqOkHbSA5Q7)#T$zQDUc!8?@py{t6%+1G*5sv1*DfA!BgGu=e z$=+(|LI@E*D2|P}EGUY%%mD3za#&8AW}#rGHFoDg_*i0Nf^bcq)%Y5c12f9oF&+cX z9cBkm+m3Q>w7UT|c~t6$dBWA3)2F^gXdo`II`&qIdbz;rvR3;-2$8bmZL*_VD^qm3 zyX|P-jP~@A9!le#1%&@_C?Bu;1}s~JUK(L3zsD|0swy%s&Ya$?j*#yryOO!OgtDw9 z+25QUeUaqjp}QY^49YMKEmnsfwmOxRl~!kUc3%h~GU|}~nNyT4OvjUEoHeGz=^Gnb zjn)+q$7vDj^)aD$P7L|6Z{v<)?Hg?1f4?XGS4mFJ*ubyK2HF$Me&B)7qVj{12!a&=xIPInTd>pKB!@|ptU7#m^5 zf3A7``>ALD`>+fK{?j9zDv{)i_M6K{Mt#iK@%fZx_qw^^on}sTdKQ}|+Zs5}>O|V~ z?6W#JL@iPXA<8ou7-k)DYswD%fH`QHm6fjnOHXqKD)_@a``qCpYbR!~0zb!d``l_f z&+alVuYC78>>>GcyRc`XojRz^@cZMf%$KA%h8pw$csE^kncNfV|WH8C->2Y_vEK5HL5#PN#q>;J9>>oyD;Sn+7dnZ_#E=u8; zC#(UPnUztc5JHI351=h(jP)oBV~d5IZMU}7mmv>Tp(BQ~vN~>Ou9Jf-Y_FBAO>Roz zFQDGaYPOZ#mIBNEQL8&GYDuEAqN6FIt4s#!02~QmDu8PN^e8Z@<@WpzzzXNwpW7+@ zy#Ta2=k{h8XET7O0W1daE$7^}4p^>Z0GtG19Dwom6vCST?lf6EpQW6I&;&q;${IL& z+hB1afJ=*rY6pOo0RCXlDgb|U&QVg%w7eXEV*!i>aGX6S0O(mnwD$ve1i*6V+!je$ zXaXQa*Bo5>12`GL#{m3Ykx?E1uo}Rh06Yia&$g<3LDEiC9wU*{){Fsg6o8`v90QK!`#HtR@?%CII*lfGHV&;vj(a z0R95t6?GY|mDEwj*bc@TNU)0cZvAwmrK6>;bUX zG!gre+o}L^s`VOMdDj7`2haeZn>|ec4lylA59IdUn*p@g)5o5^07`w?%|QT*06Ya? z1%Q_UY}e{u2u%QlDEGvm5x`-{sk2W4FbTlfl1xE73E)>Y(60rs!8x}}Vi7_U03kZk z#Gt`e%Y%{I?;eYs(c#1{E}CB>XOy=JIlG9z0@&)D+pSt7geCw&boR+XEpjUM7SkRK z!aIg>ZIu zo&b8;(-Qc1vpqfR-6jBy7QPO-J^wa)g@ef11nfo5R$v!$_5(YSvnSYY&o+Cu2L8Rn zo}CtEH-LTGlNUk=A%qY@2qA Date: Wed, 7 Mar 2018 19:43:00 -0800 Subject: [PATCH 130/493] Cleanup model registration --- .../bloodmagic/block/BlockAltar.java | 16 ++------ .../bloodmagic/block/BlockBloodTank.java | 10 ++--- .../bloodmagic/block/BlockDemonCrucible.java | 13 +------ .../block/BlockDemonCrystallizer.java | 12 ++---- .../block/BlockDemonPillarBase.java | 14 ++----- .../block/BlockDemonPillarCapBase.java | 15 ++----- .../bloodmagic/block/BlockDemonPylon.java | 12 ------ .../block/BlockDemonStairsBase.java | 13 ++----- .../bloodmagic/block/BlockDemonWallBase.java | 13 ++----- .../bloodmagic/block/BlockIncenseAltar.java | 11 ------ .../block/BlockInversionPillar.java | 11 ++---- .../block/BlockInversionPillarEnd.java | 12 ++---- .../bloodmagic/block/BlockPhantom.java | 11 ------ .../bloodmagic/block/BlockRoutingNode.java | 9 ++--- .../bloodmagic/block/BlockSoulForge.java | 13 +------ .../bloodmagic/block/BlockSpectral.java | 13 +------ .../bloodmagic/block/BlockTeleposer.java | 14 +------ .../bloodmagic/block/base/BlockEnum.java | 14 +++---- .../bloodmagic/client/IMeshProvider.java | 8 ++-- .../bloodmagic/client/IVariantProvider.java | 10 +++-- .../core/RegistrarBloodMagicItems.java | 25 ++++++++---- .../bloodmagic/item/ItemAltarMaker.java | 15 +++---- .../bloodmagic/item/ItemArcaneAshes.java | 10 ++--- .../bloodmagic/item/ItemBoundAxe.java | 22 +++-------- .../bloodmagic/item/ItemBoundPickaxe.java | 22 +++-------- .../bloodmagic/item/ItemBoundShovel.java | 22 +++-------- .../bloodmagic/item/ItemBoundSword.java | 26 ++++--------- .../item/ItemDaggerOfSacrifice.java | 13 +++---- .../bloodmagic/item/ItemDemonWillGauge.java | 13 +++---- .../WayofTime/bloodmagic/item/ItemEnum.java | 12 ++---- .../bloodmagic/item/ItemExperienceBook.java | 13 +++---- .../bloodmagic/item/ItemLavaCrystal.java | 13 +++---- .../bloodmagic/item/ItemPotionFlask.java | 16 +++----- .../bloodmagic/item/ItemRitualDiviner.java | 25 ++++++------ .../bloodmagic/item/ItemRitualReader.java | 16 ++++---- .../item/ItemSacrificialDagger.java | 24 ++++++------ .../bloodmagic/item/ItemSanguineBook.java | 14 +++---- .../bloodmagic/item/ItemUpgradeTome.java | 17 ++++---- .../bloodmagic/item/ItemUpgradeTrainer.java | 12 +++--- .../item/armour/ItemLivingArmour.java | 30 +++++++------- .../item/armour/ItemSentientArmour.java | 24 ++++++------ .../item/block/ItemBlockAlchemyTable.java | 9 ++--- .../item/gear/ItemPackSacrifice.java | 15 +++---- .../item/gear/ItemPackSelfSacrifice.java | 15 +++---- .../item/routing/ItemFluidRouterFilter.java | 10 ++--- .../item/routing/ItemNodeRouter.java | 17 ++++---- .../item/routing/ItemRouterFilter.java | 16 ++++---- .../bloodmagic/item/sigil/ItemSigilBase.java | 12 +++--- .../item/sigil/ItemSigilHolding.java | 15 ++++--- .../item/sigil/ItemSigilToggleableBase.java | 23 +++-------- .../item/soul/ItemSentientArmourGem.java | 24 +++++------- .../bloodmagic/item/soul/ItemSentientAxe.java | 29 +++++--------- .../bloodmagic/item/soul/ItemSentientBow.java | 21 +++++----- .../item/soul/ItemSentientPickaxe.java | 29 +++++--------- .../item/soul/ItemSentientShovel.java | 29 +++++--------- .../item/soul/ItemSentientSword.java | 29 +++++--------- .../bloodmagic/item/soul/ItemSoulGem.java | 35 +++++++---------- .../bloodmagic/item/soul/ItemSoulSnare.java | 11 ++---- .../bloodmagic/proxy/ClientProxy.java | 39 ++----------------- .../bloodmagic/proxy/CommonProxy.java | 10 ----- 60 files changed, 338 insertions(+), 678 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 679ae793..a99dadea 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -5,17 +5,17 @@ import WayofTime.bloodmagic.altar.BloodAltar; import WayofTime.bloodmagic.altar.EnumAltarComponent; import WayofTime.bloodmagic.altar.IAltarManipulator; import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.IDocumentedBlock; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -31,7 +31,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; @@ -160,15 +159,6 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl return new TileAltar(); } - // IVariantProvider - - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } - // IDocumentedBlock @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 6637e06d..b9dfe15d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.ItemBlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,8 +29,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; @@ -195,11 +196,8 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB // IVariantProvider @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); + public void gatherVariants(@Nonnull Int2ObjectMap variants) { for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) - ret.add(Pair.of(i, "inventory")); - - return ret; + variants.put(i, "inventory"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 1bcbbc80..5627ce9d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; @@ -19,12 +19,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBlock { public BlockDemonCrucible() { @@ -99,13 +95,6 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl return new TileDemonCrucible(); } - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } - @Override public ItemBlock getItem() { return new ItemBlock(this); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 8ed12395..26ecfb88 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrystallizer; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -13,11 +14,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; -import java.util.List; +import javax.annotation.Nonnull; public class BlockDemonCrystallizer extends BlockContainer implements IVariantProvider, IBMBlock { public BlockDemonCrystallizer() { @@ -68,10 +66,8 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "normal"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java index 44c7f95f..5db379bb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java @@ -2,14 +2,13 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumPillar; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; -import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.annotation.Nonnull; public class BlockDemonPillarBase & IStringSerializable> extends BlockEnumPillar { public BlockDemonPillarBase(String baseName, Material materialIn, Class enumClass) { @@ -24,16 +23,11 @@ public class BlockDemonPillarBase & IStringSerializable> exten } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - - //This is done to make the ItemBlocks have the proper model + public void gatherVariants(@Nonnull Int2ObjectMap variants) { EnumFacing.Axis[] axis = new EnumFacing.Axis[]{EnumFacing.Axis.Y, EnumFacing.Axis.X, EnumFacing.Axis.Z}; for (int i = 0; i < 3; i++) for (int j = 0; j < this.getTypes().length; j++) - ret.add(Pair.of(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j])); - - return ret; + variants.put(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java index 51ef6dbb..b31b09b1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java @@ -2,14 +2,13 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumPillarCap; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; -import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.annotation.Nonnull; public class BlockDemonPillarCapBase & IStringSerializable> extends BlockEnumPillarCap { public BlockDemonPillarCapBase(String baseName, Material materialIn, Class enumClass) { @@ -24,15 +23,9 @@ public class BlockDemonPillarCapBase & IStringSerializable> ex } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - - //This is done to make the ItemBlocks have the proper model - + public void gatherVariants(@Nonnull Int2ObjectMap variants) { for (int i = 0; i < EnumFacing.values().length; i++) for (int j = 0; j < this.getTypes().length; j++) - ret.add(Pair.of(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j])); - - return ret; + variants.put(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index a761816b..e24869fd 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -11,11 +11,6 @@ import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; public class BlockDemonPylon extends BlockContainer implements IVariantProvider { public BlockDemonPylon() { @@ -59,11 +54,4 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider public TileEntity createNewTileEntity(World world, int meta) { return new TileDemonPylon(); } - - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java index 30166d16..05bd1d75 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java @@ -2,13 +2,10 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumStairs; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.IStringSerializable; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; public class BlockDemonStairsBase & IStringSerializable> extends BlockEnumStairs { public BlockDemonStairsBase(String baseName, Material materialIn, Class enumClass) { @@ -23,12 +20,8 @@ public class BlockDemonStairsBase & IStringSerializable> exten } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - + public void gatherVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(Pair.of(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i])); - - return ret; + variants.put(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java index 2ad6bfe1..ba6699fa 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java @@ -2,13 +2,10 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnumWall; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.IStringSerializable; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; public class BlockDemonWallBase & IStringSerializable> extends BlockEnumWall { public BlockDemonWallBase(String baseName, Material materialIn, Class enumClass) { @@ -23,12 +20,8 @@ public class BlockDemonWallBase & IStringSerializable> extends } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - + public void gatherVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(Pair.of(i, "east=true,north=false,south=false,type=" + this.getTypes()[i] + ",up=true,west=true")); - - return ret; + variants.put(i, "east=true,north=false,south=false,type=" + this.getTypes()[i] + ",up=true,west=true"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index 87048b65..e77d0982 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -13,12 +13,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlock { protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); @@ -83,13 +79,6 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo return new TileIncenseAltar(); } - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } - @Override public ItemBlock getItem() { return new ItemBlock(this); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java index e5b3b04d..f9c17e29 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumSubWillType; import WayofTime.bloodmagic.tile.TileInversionPillar; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -14,10 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.Properties; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; public class BlockInversionPillar extends BlockEnum { public BlockInversionPillar() { @@ -73,11 +70,9 @@ public class BlockInversionPillar extends BlockEnum { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); + public void gatherVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(Pair.of(i, "static=false,type=" + this.getTypes()[i])); - return ret; + variants.put(i, "static=false,type=" + this.getTypes()[i]); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java index 7fb5b5d5..54193ee9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java @@ -4,17 +4,13 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumInversionCap; import WayofTime.bloodmagic.client.IVariantProvider; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; public class BlockInversionPillarEnd extends BlockEnum implements IVariantProvider { public BlockInversionPillarEnd() { @@ -54,10 +50,8 @@ public class BlockInversionPillarEnd extends BlockEnum impleme } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); + public void gatherVariants(Int2ObjectMap variants) { for (int i = 0; i < this.getTypes().length; i++) - ret.add(new ImmutablePair<>(i, "type=" + this.getTypes()[i])); - return ret; + variants.put(i, "type=" + this.getTypes()[i]); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 6744b025..bb6ad64a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -15,12 +15,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; import java.util.Random; public class BlockPhantom extends Block implements IVariantProvider { @@ -83,11 +79,4 @@ public class BlockPhantom extends Block implements IVariantProvider { public TileEntity createTileEntity(World world, IBlockState state) { return new TilePhantomBlock(100); } - - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java index 773d98b9..bb26cf20 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; @@ -19,9 +19,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.annotation.Nonnull; public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvider { public static final PropertyBool UP = PropertyBool.create("up"); @@ -132,7 +131,7 @@ public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvide } @Override - public List> getVariants() { - return Lists.newArrayList(Pair.of(0, "inventory")); + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "inventory"); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index e4a0a271..4f93536b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -18,12 +18,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock { protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.06F, 0.0F, 0.06F, 0.94F, 0.75F, 0.94F); @@ -97,13 +93,6 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock return new TileSoulForge(); } - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } - @Override public ItemBlock getItem() { return new ItemBlock(this); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 2aa70bea..6802804b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSpectralBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -18,15 +17,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockSpectral extends Block implements IVariantProvider { +public class BlockSpectral extends Block { protected static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); public BlockSpectral() { @@ -106,11 +102,4 @@ public class BlockSpectral extends Block implements IVariantProvider { public TileEntity createTileEntity(World world, IBlockState state) { return new TileSpectralBlock(); } - - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 5ac1eaf1..22fb0307 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -17,11 +17,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.List; public class BlockTeleposer extends BlockContainer implements IVariantProvider, IBMBlock { public BlockTeleposer() { @@ -64,13 +59,6 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, return new TileTeleposer(); } - @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "normal")); - return ret; - } - @Override public ItemBlock getItem() { return new ItemBlock(this); diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java index 2691f724..0734740e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.block.base; import WayofTime.bloodmagic.block.IBMBlock; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -14,9 +14,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.NonNullList; -import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.annotation.Nonnull; public class BlockEnum & IStringSerializable> extends Block implements IBMBlock, IVariantProvider { private final E[] types; @@ -77,15 +76,12 @@ public class BlockEnum & IStringSerializable> extends Block im } @Override - public List> getVariants() { - List> variants = Lists.newArrayList(); + public void gatherVariants(@Nonnull Int2ObjectMap variants) { if (getItem() == null) - return variants; + return; for (int i = 0; i < types.length; i++) - variants.add(Pair.of(i, getProperty().getName() + "=" + types[i].name())); - - return variants; + variants.put(i, getProperty().getName() + "=" + types[i].name()); } public E[] getTypes() { diff --git a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java index 6706e2c6..fb8ec3c2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java +++ b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.List; +import java.util.function.Consumer; /** * Provides a custom {@link ItemMeshDefinition} for automatic registration of @@ -22,11 +22,9 @@ public interface IMeshProvider { ItemMeshDefinition getMeshDefinition(); /** - * Gets all possible variants for this item - * - * @return - All possible variants for this item + * Gathers all possible variants for this item */ - List getVariants(); + void gatherVariants(Consumer variants); /** * If a custom ResourceLocation is required, return it here. diff --git a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java b/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java index c37d9958..cffbd900 100644 --- a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java +++ b/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java @@ -1,9 +1,13 @@ package WayofTime.bloodmagic.client; -import org.apache.commons.lang3.tuple.Pair; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.block.Block; -import java.util.List; +import javax.annotation.Nonnull; public interface IVariantProvider { - List> getVariants(); + + default void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, this instanceof Block ? "normal" : "inventory"); + } } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 0d7544ad..76d5da2c 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -19,6 +19,9 @@ import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.item.types.ShardType; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; @@ -33,14 +36,15 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; import java.util.List; +import java.util.Set; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @SuppressWarnings("unchecked") public class RegistrarBloodMagicItems { + public static final Item BLOOD_ORB = Items.AIR; public static final Item ACTIVATION_CRYSTAL = Items.AIR; public static final Item SLATE = Items.AIR; @@ -210,9 +214,10 @@ public class RegistrarBloodMagicItems { @SubscribeEvent public static void registerRenders(ModelRegistryEvent event) { items.stream().filter(i -> i instanceof IVariantProvider).forEach(i -> { - IVariantProvider variantProvider = (IVariantProvider) i; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(i, variant.getLeft(), new ModelResourceLocation(i.getRegistryName(), variant.getRight())); + Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); + ((IVariantProvider) i).gatherVariants(variants); + for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) + ModelLoader.setCustomModelResourceLocation(i, variant.getIntKey(), new ModelResourceLocation(i.getRegistryName(), variant.getValue())); }); items.stream().filter(i -> i instanceof IMeshProvider).forEach(i -> { @@ -220,16 +225,20 @@ public class RegistrarBloodMagicItems { ResourceLocation loc = mesh.getCustomLocation(); if (loc == null) loc = i.getRegistryName(); - for (String variant : mesh.getVariants()) + + Set variants = Sets.newHashSet(); + mesh.gatherVariants(variants::add); + for (String variant : variants) ModelLoader.registerItemVariants(i, new ModelResourceLocation(loc, variant)); ModelLoader.setCustomMeshDefinition(i, mesh.getMeshDefinition()); }); RegistrarBloodMagicBlocks.blocks.stream().filter(b -> b instanceof IVariantProvider).forEach(b -> { - IVariantProvider variantProvider = (IVariantProvider) b; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(b), variant.getLeft(), new ModelResourceLocation(b.getRegistryName(), variant.getRight())); + Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); + ((IVariantProvider) b).gatherVariants(variants); + for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(b), variant.getIntKey(), new ModelResourceLocation(b.getRegistryName(), variant.getValue())); }); final ResourceLocation holdingLoc = SIGIL_HOLDING.getRegistryName(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index efa445e2..83ca8822 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -3,13 +3,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -23,10 +24,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantProvider { @@ -88,10 +87,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=altarmaker")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=altarmaker"); // FIXME } public void setTierToBuild(EnumAltarTier tierToBuild) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index ff20254d..41ebf298 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,10 +18,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; import java.util.List; public class ItemArcaneAshes extends Item implements IVariantProvider { @@ -61,9 +59,7 @@ public class ItemArcaneAshes extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=arcaneashes")); - return ret; + public void gatherVariants(Int2ObjectMap variants) { + variants.put(0, "type=arcaneashes"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 589e91ee..f4b092e0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -22,7 +22,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -31,10 +30,9 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.function.Consumer; public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.PLANKS, Blocks.BOOKSHELF, Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK, Blocks.LADDER); @@ -123,17 +121,9 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { return new CustomMeshDefinitionActivatable("bound_axe"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - ret.add("active=true"); - ret.add("active=false"); - return ret; + public void gatherVariants(Consumer variants) { + variants.accept("active=true"); + variants.accept("active=false"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index f54d39a7..8e7da20c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -21,7 +21,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -30,10 +29,9 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.function.Consumer; public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.STONE_SLAB, Blocks.GOLDEN_RAIL, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, Blocks.LIT_REDSTONE_ORE, Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.RAIL, Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.STONE_SLAB); @@ -136,17 +134,9 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { return new CustomMeshDefinitionActivatable("bound_pickaxe"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - ret.add("active=true"); - ret.add("active=false"); - return ret; + public void gatherVariants(Consumer variants) { + variants.accept("active=true"); + variants.accept("active=false"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 910a4658..a1426e9e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -21,7 +21,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -30,10 +29,9 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.function.Consumer; public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.CLAY, Blocks.DIRT, Blocks.FARMLAND, Blocks.GRASS, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.SNOW, Blocks.SNOW_LAYER, Blocks.SOUL_SAND); @@ -122,17 +120,9 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { return new CustomMeshDefinitionActivatable("bound_shovel"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - ret.add("active=true"); - ret.add("active=false"); - return ret; + public void gatherVariants(Consumer variants) { + variants.accept("active=true"); + variants.accept("active=false"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index c7d49cfc..1c67b320 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IActivatable; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.iface.IActivatable; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -27,15 +27,13 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider { public ItemBoundSword() { @@ -132,17 +130,9 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable return new CustomMeshDefinitionActivatable("bound_sword"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - ret.add("active=true"); - ret.add("active=false"); - return ret; + public void gatherVariants(Consumer variants) { + variants.accept("active=true"); + variants.accept("active=false"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 15140d9c..3b5203a9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.util.helper.PurificationHelper; -import WayofTime.bloodmagic.client.IVariantProvider; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityAnimal; @@ -19,9 +19,8 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.annotation.Nonnull; public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { public ItemDaggerOfSacrifice() { @@ -79,9 +78,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - ret.add(Pair.of(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index 3a0a86ad..bc8448ea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -1,9 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,10 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -32,10 +31,8 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=willgauge")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=willgauge"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index c4def10f..e949e446 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.types.ISubItem; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -11,9 +11,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; public class ItemEnum & ISubItem> extends Item { @@ -55,12 +52,9 @@ public class ItemEnum & ISubItem> extends Item { } @Override - public List> getVariants() { - List> variants = Lists.newArrayList(); + public void gatherVariants(Int2ObjectMap variants) { for (int i = 0; i < types.length; i++) - variants.add(Pair.of(i, "type=" + types[i].getInternalName())); - - return variants; + variants.put(i, "type=" + types[i].getInternalName()); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 24474e87..5d8bc69e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -1,10 +1,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -17,10 +18,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; public class ItemExperienceBook extends Item implements IVariantProvider { @@ -64,10 +63,8 @@ public class ItemExperienceBook extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=experiencetome")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=experiencetome"); } public void giveOneLevelExpToPlayer(ItemStack stack, EntityPlayer player) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 52a3e3c4..cebbe121 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,19 +1,18 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.client.IVariantProvider; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvider { @@ -62,9 +61,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide } @Override - public List> getVariants() { - List> ret = Lists.newArrayList(); - ret.add(Pair.of(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index ef73018c..0d7f9e01 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -1,10 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Lists; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -24,8 +23,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.List; +import java.util.function.Consumer; public class ItemPotionFlask extends Item implements IMeshProvider { public ItemPotionFlask() { @@ -131,14 +130,9 @@ public class ItemPotionFlask extends Item implements IMeshProvider { }; } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - return Lists.newArrayList("full=true", "full=false"); + public void gatherVariants(Consumer variants) { + variants.accept("full=true"); + variants.accept("full=false"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index d39fc897..1de11784 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,22 +1,23 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.RitualComponent; +import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.helper.RitualHelper; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.event.ClientHandler; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -35,11 +36,9 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.input.Keyboard; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -336,12 +335,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=basic")); - ret.add(new ImmutablePair<>(1, "type=dusk")); - ret.add(new ImmutablePair<>(2, "type=dawn")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=basic"); + variants.put(1, "type=dusk"); + variants.put(2, "type=dawn"); } public void cycleDirection(ItemStack stack, EntityPlayer player) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 0b203dd9..9cc9c6df 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -1,15 +1,16 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.ritual.EnumRitualReaderState; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -23,10 +24,9 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.input.Keyboard; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -233,9 +233,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 3ffdf74d..11a6381d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.item.types.ISubItem; +import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -30,10 +30,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Locale; +import java.util.function.Consumer; public class ItemSacrificialDagger extends ItemEnum implements IMeshProvider { @@ -165,12 +165,10 @@ public class ItemSacrificialDagger extends ItemEnum getVariants() { - List variants = new ArrayList<>(); - variants.add("type=normal"); - variants.add("type=creative"); - variants.add("type=ceremonial"); - return variants; + public void gatherVariants(Consumer variants) { + variants.accept("type=normal"); + variants.accept("type=creative"); + variants.accept("type=ceremonial"); } public enum DaggerType implements ISubItem { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index 85fd255a..377c401e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -1,16 +1,17 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.altar.EnumAltarTier; import WayofTime.bloodmagic.altar.IAltarManipulator; -import WayofTime.bloodmagic.iface.IDocumentedBlock; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.iface.IDocumentedBlock; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -28,9 +29,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; -import java.util.Collections; +import javax.annotation.Nonnull; import java.util.List; public class ItemSanguineBook extends Item implements IVariantProvider, IAltarManipulator { @@ -109,7 +109,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa // IVariantProvider @Override - public List> getVariants() { - return Collections.singletonList(Pair.of(0, "type=normal")); + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index a6bfe3b2..dc7d64b3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -1,13 +1,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -20,10 +21,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; import java.util.Map.Entry; @@ -96,10 +95,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=upgradetome")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=upgradetome"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index 1f6b9e6d..cef99437 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -1,12 +1,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.iface.IUpgradeTrainer; import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,9 +16,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; @@ -82,9 +82,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=upgradetrainer")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=upgradetrainer"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 8f4a5409..b976cb04 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -1,21 +1,21 @@ package WayofTime.bloodmagic.item.armour; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerFallDistancePacketProcessor; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -44,8 +44,12 @@ import org.lwjgl.input.Keyboard; import javax.annotation.Nullable; import java.lang.reflect.Field; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.UUID; +import java.util.function.Consumer; public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshProvider { public static final boolean useSpecialArmourCalculation = true; @@ -364,13 +368,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public List getVariants() { - List ret = new ArrayList<>(); - ret.add("armour=head"); - ret.add("armour=body"); - ret.add("armour=leg"); - ret.add("armour=feet"); - return ret; + public void gatherVariants(Consumer variants) { + variants.accept("armour=head"); + variants.accept("armour=body"); + variants.accept("armour=leg"); + variants.accept("armour=feet"); } public void setLivingArmour(ItemStack stack, LivingArmour armour, boolean forceWrite) { diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index b2151097..5b043282 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item.armour; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -33,7 +33,10 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.*; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; +import java.util.function.Consumer; public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMeshProvider, IMultiWillTool { public static String[] names = {"helmet", "chest", "legs", "boots"}; @@ -297,18 +300,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public List getVariants() { - List ret = new ArrayList<>(); + public void gatherVariants(Consumer variants) { for (EnumDemonWillType type : EnumDemonWillType.values()) { String additional = "_" + type.getName().toLowerCase(); - ret.add("armour=head" + additional); - ret.add("armour=body" + additional); - ret.add("armour=leg" + additional); - ret.add("armour=feet" + additional); + variants.accept("armour=head" + additional); + variants.accept("armour=body" + additional); + variants.accept("armour=leg" + additional); + variants.accept("armour=feet" + additional); } - - return ret; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java index 6f082408..3a42a40e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.item.block; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAlchemyTable; -import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -12,9 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider { public ItemBlockAlchemyTable(Block block) { @@ -64,7 +61,7 @@ public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider } @Override - public List> getVariants() { - return Lists.newArrayList(Pair.of(0, "inventory")); + public void gatherVariants(Int2ObjectMap variants) { + variants.put(0, "inventory"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index a726b800..31dfe5b2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -1,14 +1,15 @@ package WayofTime.bloodmagic.item.gear; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.altar.IAltarManipulator; import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.iface.IItemLPContainer; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.ItemHelper.LPContainer; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -20,10 +21,8 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, IItemLPContainer, IVariantProvider { @@ -76,10 +75,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } // IFillable diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 492dd868..a0c08a87 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -1,15 +1,16 @@ package WayofTime.bloodmagic.item.gear; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.altar.IAltarManipulator; import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.iface.IItemLPContainer; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.ItemHelper.LPContainer; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -21,10 +22,8 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.List; public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulator, IItemLPContainer, IVariantProvider { @@ -101,10 +100,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } // IFillable diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 94fbf3ec..1437dbd1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.routing.IFluidFilter; import WayofTime.bloodmagic.routing.RoutingFluidFilter; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -17,9 +18,8 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -121,10 +121,8 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=exact")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=exact"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index d8fb3a56..7994c36b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -1,13 +1,14 @@ package WayofTime.bloodmagic.item.routing; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.INodeRenderer; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.iface.INodeRenderer; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,10 +23,8 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.LinkedList; import java.util.List; @@ -176,10 +175,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } public BlockPos getBlockPos(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index a7c1d197..840f1c27 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -16,9 +17,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -138,13 +138,11 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=exact")); - ret.add(new ImmutablePair<>(1, "type=ignorenbt")); - ret.add(new ImmutablePair<>(2, "type=moditems")); - ret.add(new ImmutablePair<>(3, "type=oredict")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=exact"); + variants.put(1, "type=ignorenbt"); + variants.put(2, "type=moditems"); + variants.put(3, "type=oredict"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 39d5689d..c9f5747b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -1,18 +1,18 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.item.ItemSigil; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -52,10 +52,8 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(Pair.of(0, "type=normal")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=normal"); } public String getName() { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 32fa6957..76a2b19b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -1,16 +1,17 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.key.IKeybindable; +import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.client.key.IKeybindable; -import WayofTime.bloodmagic.client.key.KeyBindings; -import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -23,10 +24,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nonnull; -import java.util.Collections; import java.util.List; public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAltarReader, ISigil.Holding { @@ -166,8 +165,8 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } @Override - public List> getVariants() { - return Collections.emptyList(); + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + } public static int next(int mode) { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 952a8712..6aa74856 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -1,23 +1,21 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.item.ItemSigilToggleable; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.item.ItemSigilToggleable; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.function.Consumer; public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMeshProvider { @@ -54,18 +52,9 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes return new CustomMeshDefinitionActivatable("sigil_" + name.toLowerCase(Locale.ROOT)); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - ret.add("active=false"); - ret.add("active=true"); - - return ret; + public void gatherVariants(Consumer variants) { + variants.accept("active=false"); + variants.accept("active=true"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index 604826b0..9cb62f6d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -1,24 +1,25 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import com.google.common.collect.Lists; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import java.util.function.Consumer; public class ItemSentientArmourGem extends Item implements IMeshProvider { public ItemSentientArmourGem() { @@ -73,13 +74,8 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { } @Override - public List getVariants() { - return Lists.newArrayList("type=activated", "type=deactivated"); - } - - @Nullable - @Override - public ResourceLocation getCustomLocation() { - return null; + public void gatherVariants(Consumer variants) { + variants.accept("type=activated"); + variants.accept("type=deactivated"); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index ca4a4558..9f9bb426 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; import WayofTime.bloodmagic.iface.ISentientTool; @@ -9,11 +12,8 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWill; import WayofTime.bloodmagic.soul.IDemonWillWeapon; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -36,14 +36,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; +import java.util.function.Consumer; public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; @@ -300,20 +299,10 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP return new CustomMeshDefinitionMultiWill("sentient_axe"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void gatherVariants(Consumer variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.accept("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 57314155..b4b104bc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import com.google.common.collect.Lists; +import WayofTime.bloodmagic.iface.IMultiWillTool; +import WayofTime.bloodmagic.iface.ISentientTool; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -34,9 +34,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider @@ -253,8 +252,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public List> getVariants() { - return Lists.newArrayList(Pair.of(0, "inventory")); + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "inventory"); } public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index a1ffaaac..f939b4e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; import WayofTime.bloodmagic.iface.ISentientTool; @@ -9,11 +12,8 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWill; import WayofTime.bloodmagic.soul.IDemonWillWeapon; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -36,14 +36,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; +import java.util.function.Consumer; public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; @@ -299,20 +298,10 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon return new CustomMeshDefinitionMultiWill("sentient_pickaxe"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void gatherVariants(Consumer variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.accept("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index deb5056c..995f80ac 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; import WayofTime.bloodmagic.iface.ISentientTool; @@ -9,11 +12,8 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWill; import WayofTime.bloodmagic.soul.IDemonWillWeapon; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -36,14 +36,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; +import java.util.function.Consumer; public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; @@ -300,20 +299,10 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I return new CustomMeshDefinitionMultiWill("sentient_shovel"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void gatherVariants(Consumer variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.accept("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 13206057..d97cab1c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; import WayofTime.bloodmagic.iface.ISentientTool; @@ -9,11 +12,8 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWill; import WayofTime.bloodmagic.soul.IDemonWillWeapon; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -34,14 +34,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.*; +import java.util.function.Consumer; public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000, 2000, 4000}; @@ -275,20 +274,10 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM return new CustomMeshDefinitionMultiWill("sentient_sword"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=" + type.getName().toLowerCase()); - } - - return ret; + public void gatherVariants(Consumer variants) { + for (EnumDemonWillType type : EnumDemonWillType.values()) + variants.accept("type=" + type.getName().toLowerCase()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index d55aa834..aa678159 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionWillGem; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWill; import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionWillGem; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; @@ -18,16 +18,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.function.Consumer; public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, IMultiWillTool { public static String[] names = {"petty", "lesser", "common", "greater", "grand"}; @@ -64,24 +66,15 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I return new CustomMeshDefinitionWillGem("soul_gem"); } - @Nullable @Override - public ResourceLocation getCustomLocation() { - return null; - } - - @Override - public List getVariants() { - List ret = new ArrayList<>(); + public void gatherVariants(Consumer variants) { for (EnumDemonWillType type : EnumDemonWillType.values()) { - ret.add("type=petty_" + type.getName().toLowerCase()); - ret.add("type=lesser_" + type.getName().toLowerCase()); - ret.add("type=common_" + type.getName().toLowerCase()); - ret.add("type=greater_" + type.getName().toLowerCase()); - ret.add("type=grand_" + type.getName().toLowerCase()); + variants.accept("type=petty_" + type.getName().toLowerCase()); + variants.accept("type=lesser_" + type.getName().toLowerCase()); + variants.accept("type=common_" + type.getName().toLowerCase()); + variants.accept("type=greater_" + type.getName().toLowerCase()); + variants.accept("type=grand_" + type.getName().toLowerCase()); } - - return ret; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 15e42172..50971b17 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.util.helper.TextHelper; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,10 +15,8 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -75,9 +74,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { } @Override - public List> getVariants() { - List> ret = new ArrayList<>(); - ret.add(new ImmutablePair<>(0, "type=soulsnare")); - return ret; + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + variants.put(0, "type=soulsnare"); } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 04ace93a..d24ce3b8 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,12 +1,8 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.hud.Elements; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.helper.ShaderHelper; +import WayofTime.bloodmagic.client.hud.Elements; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.LayerBloodElytra; import WayofTime.bloodmagic.client.render.block.*; @@ -17,18 +13,16 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; +import WayofTime.bloodmagic.util.Constants; import com.google.common.collect.ImmutableMap; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.item.Item; import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.animation.AnimationTESR; import net.minecraftforge.client.model.obj.OBJLoader; @@ -38,7 +32,6 @@ import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import org.apache.commons.lang3.tuple.Pair; import java.awt.Color; import java.util.Map; @@ -118,32 +111,6 @@ public class ClientProxy extends CommonProxy { Elements.createHUDElements(); } - @Override - public void tryHandleBlockModel(Block block, String name) { - if (block instanceof IVariantProvider) { - IVariantProvider variantProvider = (IVariantProvider) block; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), variant.getLeft(), new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), variant.getRight())); - } - } - - @Override - public void tryHandleItemModel(Item item, String name) { - if (item instanceof IMeshProvider) { - IMeshProvider meshProvider = (IMeshProvider) item; - ModelLoader.setCustomMeshDefinition(item, meshProvider.getMeshDefinition()); - ResourceLocation resourceLocation = meshProvider.getCustomLocation(); - if (resourceLocation == null) - resourceLocation = new ResourceLocation(BloodMagic.MODID, "item/" + name); - for (String variant : meshProvider.getVariants()) - ModelLoader.registerItemVariants(item, new ModelResourceLocation(resourceLocation, variant)); - } else if (item instanceof IVariantProvider) { - IVariantProvider variantProvider = (IVariantProvider) item; - for (Pair variant : variantProvider.getVariants()) - ModelLoader.setCustomModelResourceLocation(item, variant.getLeft(), new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), variant.getRight())); - } - } - private void addElytraLayer() { RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); try { diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 6eab4d82..d63dc5a5 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -4,8 +4,6 @@ import WayofTime.bloodmagic.ritual.CapabilityRuneType; import WayofTime.bloodmagic.ritual.IRitualStone; import WayofTime.bloodmagic.teleport.TeleportQueue; import com.google.common.collect.ImmutableMap; -import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -36,14 +34,6 @@ public class CommonProxy { return null; } - public void tryHandleBlockModel(Block block, String name) { - // NO-OP - } - - public void tryHandleItemModel(Item item, String name) { - // NO-OP - } - public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) { return null; } From fefeaf26af1183ace6ed7a0a8678c8380fd5c179 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 7 Mar 2018 19:55:32 -0800 Subject: [PATCH 131/493] Holding sigil can provide it's own mesh provider now --- .../core/RegistrarBloodMagicItems.java | 9 -------- .../item/sigil/ItemSigilHolding.java | 21 ++++++++++++++++++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 76d5da2c..4afa594e 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -240,14 +240,5 @@ public class RegistrarBloodMagicItems { for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(b), variant.getIntKey(), new ModelResourceLocation(b.getRegistryName(), variant.getValue())); }); - - final ResourceLocation holdingLoc = SIGIL_HOLDING.getRegistryName(); - ModelLoader.setCustomMeshDefinition(SIGIL_HOLDING, stack -> { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("color")) - return new ModelResourceLocation(holdingLoc, "type=color"); - return new ModelResourceLocation(holdingLoc, "type=normal"); - }); - ModelLoader.registerItemVariants(SIGIL_HOLDING, new ModelResourceLocation(holdingLoc, "type=normal")); - ModelLoader.registerItemVariants(SIGIL_HOLDING, new ModelResourceLocation(holdingLoc, "type=color")); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 76a2b19b..17e36621 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.iface.IAltarReader; @@ -12,6 +13,8 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,8 +30,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import java.util.List; +import java.util.function.Consumer; -public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAltarReader, ISigil.Holding { +public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAltarReader, ISigil.Holding, IMeshProvider { public static final int inventorySize = 5; public ItemSigilHolding() { @@ -166,7 +170,22 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl @Override public void gatherVariants(@Nonnull Int2ObjectMap variants) { + // No-op - Just here to stop the super from running since we're using a mesh provider + } + @Override + public ItemMeshDefinition getMeshDefinition() { + return stack -> { + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("color")) + return new ModelResourceLocation(getRegistryName(), "type=color"); + return new ModelResourceLocation(getRegistryName(), "type=normal"); + }; + } + + @Override + public void gatherVariants(Consumer variants) { + variants.accept("type=normal"); + variants.accept("type=color"); } public static int next(int mode) { From eada60f43661e5b2151e280be89ad2c69831c60f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 9 Mar 2018 18:00:04 -0800 Subject: [PATCH 132/493] Some altar cleanup and renaming --- .../bloodmagic/altar/AltarComponent.java | 11 +- .../{EnumAltarTier.java => AltarTier.java} | 98 +++++++------- .../WayofTime/bloodmagic/altar/AltarUtil.java | 85 +++++++++++++ .../bloodmagic/altar/BloodAltar.java | 120 +++--------------- ...AltarComponent.java => ComponentType.java} | 6 +- .../bloodmagic/altar/IAltarComponent.java | 2 +- .../bloodmagic/altar/IBloodAltar.java | 2 +- .../bloodmagic/api/impl/BloodMagicAPI.java | 10 +- .../api/impl/BloodMagicCorePlugin.java | 18 +-- .../api/impl/recipe/RecipeBloodAltar.java | 10 +- .../bloodmagic/block/BlockAltar.java | 7 +- .../bloodmagic/block/BlockMimic.java | 6 +- .../client/render/block/RenderAltar.java | 8 +- .../core/RegistrarBloodMagicRecipes.java | 48 +++---- .../core/registry/AltarRecipeRegistry.java | 22 ++-- .../bloodmagic/core/registry/OrbRegistry.java | 4 +- .../bloodmagic/item/ItemAltarMaker.java | 16 +-- .../bloodmagic/item/ItemSanguineBook.java | 8 +- .../ritual/types/RitualAltarBuilder.java | 12 +- .../WayofTime/bloodmagic/tile/TileAltar.java | 8 +- .../java/WayofTime/bloodmagic/util/Utils.java | 6 +- 21 files changed, 253 insertions(+), 254 deletions(-) rename src/main/java/WayofTime/bloodmagic/altar/{EnumAltarTier.java => AltarTier.java} (68%) create mode 100644 src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java rename src/main/java/WayofTime/bloodmagic/altar/{EnumAltarComponent.java => ComponentType.java} (78%) diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java index e70e496b..abc937c7 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java @@ -6,18 +6,17 @@ import net.minecraft.util.math.BlockPos; * Used for building the altar structure. */ public class AltarComponent { - private BlockPos offset; + private final BlockPos offset; + private final ComponentType component; private boolean upgradeSlot; - private EnumAltarComponent component; - /** * Sets a component location for the altar. * * @param offset - Where the block should be in relation to the Altar * @param component - The type of Component the location should contain */ - public AltarComponent(BlockPos offset, EnumAltarComponent component) { + public AltarComponent(BlockPos offset, ComponentType component) { this.offset = offset; this.component = component; } @@ -29,7 +28,7 @@ public class AltarComponent { * @param offset - Where the block should be in relation to the Altar */ public AltarComponent(BlockPos offset) { - this(offset, EnumAltarComponent.NOTAIR); + this(offset, ComponentType.NOTAIR); } /** @@ -50,7 +49,7 @@ public class AltarComponent { return upgradeSlot; } - public EnumAltarComponent getComponent() { + public ComponentType getComponent() { return component; } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java similarity index 68% rename from src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java rename to src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index 0478db4b..df88e59c 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -5,31 +5,31 @@ import net.minecraft.util.math.BlockPos; import java.util.ArrayList; //@formatter:off -public enum EnumAltarTier { +public enum AltarTier { ONE(), TWO() { @Override public void buildComponents() { - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), EnumAltarComponent.BLOODRUNE)); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), EnumAltarComponent.BLOODRUNE)); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), EnumAltarComponent.BLOODRUNE)); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), EnumAltarComponent.BLOODRUNE)); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE)); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE)); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE)); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE)); } }, THREE() { @Override public void buildComponents() { - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); altarComponents.add(new AltarComponent(new BlockPos(-3, -1, -3))); altarComponents.add(new AltarComponent(new BlockPos(-3, 0, -3))); altarComponents.add(new AltarComponent(new BlockPos(3, -1, -3))); @@ -38,16 +38,16 @@ public enum EnumAltarTier { altarComponents.add(new AltarComponent(new BlockPos(-3, 0, 3))); altarComponents.add(new AltarComponent(new BlockPos(3, -1, 3))); altarComponents.add(new AltarComponent(new BlockPos(3, 0, 3))); - altarComponents.add(new AltarComponent(new BlockPos(-3, 1, -3), EnumAltarComponent.GLOWSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(3, 1, -3), EnumAltarComponent.GLOWSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(-3, 1, 3), EnumAltarComponent.GLOWSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(3, 1, 3), EnumAltarComponent.GLOWSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(-3, 1, -3), ComponentType.GLOWSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(3, 1, -3), ComponentType.GLOWSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(-3, 1, 3), ComponentType.GLOWSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(3, 1, 3), ComponentType.GLOWSTONE)); for (int i = -2; i <= 2; i++) { - altarComponents.add(new AltarComponent(new BlockPos(3, -2, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-3, -2, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -2, 3), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -2, -3), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -2, 3), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -2, -3), ComponentType.BLOODRUNE).setUpgradeSlot()); } } }, @@ -57,10 +57,10 @@ public enum EnumAltarTier { altarComponents.addAll(THREE.getAltarComponents()); for (int i = -3; i <= 3; i++) { - altarComponents.add(new AltarComponent(new BlockPos(5, -3, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-5, -3, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -3, 5), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -3, -5), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -3, 5), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -3, -5), ComponentType.BLOODRUNE).setUpgradeSlot()); } for (int i = -2; i <= 1; i++) { @@ -70,26 +70,26 @@ public enum EnumAltarTier { altarComponents.add(new AltarComponent(new BlockPos(-5, i, 5))); } - altarComponents.add(new AltarComponent(new BlockPos(5, 2, 5), EnumAltarComponent.BLOODSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(5, 2, -5), EnumAltarComponent.BLOODSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(-5, 2, -5), EnumAltarComponent.BLOODSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(-5, 2, 5), EnumAltarComponent.BLOODSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(5, 2, 5), ComponentType.BLOODSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(5, 2, -5), ComponentType.BLOODSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(-5, 2, -5), ComponentType.BLOODSTONE)); + altarComponents.add(new AltarComponent(new BlockPos(-5, 2, 5), ComponentType.BLOODSTONE)); } }, FIVE() { @Override public void buildComponents() { altarComponents.addAll(FOUR.getAltarComponents()); - altarComponents.add(new AltarComponent(new BlockPos(-8, -3, 8), EnumAltarComponent.BEACON)); - altarComponents.add(new AltarComponent(new BlockPos(-8, -3, -8), EnumAltarComponent.BEACON)); - altarComponents.add(new AltarComponent(new BlockPos(8, -3, -8), EnumAltarComponent.BEACON)); - altarComponents.add(new AltarComponent(new BlockPos(8, -3, 8), EnumAltarComponent.BEACON)); + altarComponents.add(new AltarComponent(new BlockPos(-8, -3, 8), ComponentType.BEACON)); + altarComponents.add(new AltarComponent(new BlockPos(-8, -3, -8), ComponentType.BEACON)); + altarComponents.add(new AltarComponent(new BlockPos(8, -3, -8), ComponentType.BEACON)); + altarComponents.add(new AltarComponent(new BlockPos(8, -3, 8), ComponentType.BEACON)); for (int i = -6; i <= 6; i++) { - altarComponents.add(new AltarComponent(new BlockPos(8, -4, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-8, -4, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -4, 8), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -4, -8), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -4, 8), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -4, -8), ComponentType.BLOODRUNE).setUpgradeSlot()); } } }, @@ -105,16 +105,16 @@ public enum EnumAltarTier { altarComponents.add(new AltarComponent(new BlockPos(-11, i, 11))); } - altarComponents.add(new AltarComponent(new BlockPos(11, 3, 11), EnumAltarComponent.CRYSTAL)); - altarComponents.add(new AltarComponent(new BlockPos(-11, 3, -11), EnumAltarComponent.CRYSTAL)); - altarComponents.add(new AltarComponent(new BlockPos(11, 3, -11), EnumAltarComponent.CRYSTAL)); - altarComponents.add(new AltarComponent(new BlockPos(-11, 3, 11), EnumAltarComponent.CRYSTAL)); + altarComponents.add(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); + altarComponents.add(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); + altarComponents.add(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); + altarComponents.add(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); for (int i = -9; i <= 9; i++) { - altarComponents.add(new AltarComponent(new BlockPos(11, -5, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-11, -5, i), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -5, 11), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -5, -11), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); + altarComponents.add(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); } } //@formatter:on diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java new file mode 100644 index 00000000..845f9051 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java @@ -0,0 +1,85 @@ +package WayofTime.bloodmagic.altar; + +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.block.BlockBloodRune; +import WayofTime.bloodmagic.tile.TileAltar; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.apache.commons.lang3.tuple.Pair; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class AltarUtil { + + @Nonnull + public static AltarTier getTier(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileAltar)) + return AltarTier.ONE; + + AltarTier lastCheck = AltarTier.ONE; + for (AltarTier tier : AltarTier.values()) { + for (AltarComponent component : tier.getAltarComponents()) { + IBlockState worldState = world.getBlockState(pos.add(component.getOffset())); + if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) + continue; + + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); + if (!validStates.contains(worldState)) + return lastCheck; + } + + lastCheck = tier; + } + + return lastCheck; + } + + @Nonnull + public static AltarUpgrade getUpgrades(World world, BlockPos pos, AltarTier currentTier) { + AltarUpgrade upgrades = new AltarUpgrade(); + + for (AltarTier tier : AltarTier.values()) { + if (tier.ordinal() > currentTier.ordinal()) + return upgrades; + + for (AltarComponent component : tier.getAltarComponents()) { + if (!component.isUpgradeSlot() || component.getComponent() != ComponentType.BLOODRUNE) + continue; + + BlockPos componentPos = pos.add(component.getOffset()); + IBlockState state = world.getBlockState(componentPos); + if (state.getBlock() instanceof BlockBloodRune) + upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos, state)); + } + } + + return upgrades; + } + + @Nullable + public static Pair getFirstMissingComponent(World world, BlockPos pos, int altarTier) { + if (altarTier >= AltarTier.MAXTIERS) + return null; + + for (AltarTier tier : AltarTier.values()) { + for (AltarComponent component : tier.getAltarComponents()) { + BlockPos componentPos = pos.add(component.getOffset()); + IBlockState worldState = world.getBlockState(componentPos); + if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) + continue; + + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); + if (!validStates.contains(worldState)) + return Pair.of(componentPos, component.getComponent()); + } + } + + return null; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index f55108ca..39ccbf9c 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -6,7 +6,6 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.block.enums.BloodRuneType; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.iface.IBloodRune; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; @@ -30,18 +29,15 @@ import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.items.ItemHandlerHelper; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; public class BloodAltar implements IFluidHandler { static { - EnumAltarTier.ONE.buildComponents(); - EnumAltarTier.TWO.buildComponents(); - EnumAltarTier.THREE.buildComponents(); - EnumAltarTier.FOUR.buildComponents(); - EnumAltarTier.FIVE.buildComponents(); - EnumAltarTier.SIX.buildComponents(); + AltarTier.ONE.buildComponents(); + AltarTier.TWO.buildComponents(); + AltarTier.THREE.buildComponents(); + AltarTier.FOUR.buildComponents(); + AltarTier.FIVE.buildComponents(); + AltarTier.SIX.buildComponents(); } public boolean isActive; @@ -49,7 +45,7 @@ public class BloodAltar implements IFluidHandler { protected FluidStack fluidInput = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); private TileAltar tileAltar; private int internalCounter = 0; - private EnumAltarTier altarTier = EnumAltarTier.ONE; + private AltarTier altarTier = AltarTier.ONE; private AltarUpgrade upgrade; private int capacity = Fluid.BUCKET_VOLUME * 10; private FluidStack fluid = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); @@ -77,7 +73,7 @@ public class BloodAltar implements IFluidHandler { private int maxCharge = 0; private int cooldownAfterCrafting = 60; private RecipeBloodAltar recipe; - private EnumAltarTier currentTierDisplayed = EnumAltarTier.ONE; + private AltarTier currentTierDisplayed = AltarTier.ONE; public BloodAltar(TileAltar tileAltar) { this.tileAltar = tileAltar; @@ -98,7 +94,7 @@ public class BloodAltar implements IFluidHandler { } internalCounter = tagCompound.getInteger("internalCounter"); - altarTier = Enums.getIfPresent(EnumAltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(EnumAltarTier.ONE); + altarTier = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(AltarTier.ONE); isActive = tagCompound.getBoolean(Constants.NBT.ALTAR_ACTIVE); liquidRequired = tagCompound.getInteger(Constants.NBT.ALTAR_LIQUID_REQ); canBeFilled = tagCompound.getBoolean(Constants.NBT.ALTAR_FILLABLE); @@ -124,7 +120,7 @@ public class BloodAltar implements IFluidHandler { chargingFrequency = tagCompound.getInteger(Constants.NBT.ALTAR_CHARGE_FREQUENCY); totalCharge = tagCompound.getInteger(Constants.NBT.ALTAR_TOTAL_CHARGE); maxCharge = tagCompound.getInteger(Constants.NBT.ALTAR_MAX_CHARGE); - currentTierDisplayed = Enums.getIfPresent(EnumAltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(EnumAltarTier.ONE); + currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); } public void writeToNBT(NBTTagCompound tagCompound) { @@ -358,15 +354,15 @@ public class BloodAltar implements IFluidHandler { } public void checkTier() { - EnumAltarTier tier = BloodAltar.getAltarTier(tileAltar.getWorld(), tileAltar.getPos()); + AltarTier tier = AltarUtil.getTier(tileAltar.getWorld(), tileAltar.getPos()); this.altarTier = tier; - upgrade = BloodAltar.getUpgrades(tileAltar.getWorld(), tileAltar.getPos(), tier); + upgrade = AltarUtil.getUpgrades(tileAltar.getWorld(), tileAltar.getPos(), tier); if (tier.equals(currentTierDisplayed)) - currentTierDisplayed = EnumAltarTier.ONE; + currentTierDisplayed = AltarTier.ONE; - if (tier.equals(EnumAltarTier.ONE)) { + if (tier.equals(AltarTier.ONE)) { upgrade = null; isUpgraded = false; this.consumptionMultiplier = 0; @@ -382,7 +378,7 @@ public class BloodAltar implements IFluidHandler { this.maxCharge = 0; this.totalCharge = 0; return; - } else if (!tier.equals(EnumAltarTier.ONE) && upgrade != null) { + } else if (!tier.equals(AltarTier.ONE)) { this.isUpgraded = true; this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); @@ -464,11 +460,11 @@ public class BloodAltar implements IFluidHandler { return getFluidAmount(); } - public EnumAltarTier getTier() { + public AltarTier getTier() { return altarTier; } - public void setTier(EnumAltarTier tier) { + public void setTier(AltarTier tier) { this.altarTier = tier; } @@ -508,7 +504,7 @@ public class BloodAltar implements IFluidHandler { return bufferCapacity; } - public boolean setCurrentTierDisplayed(EnumAltarTier altarTier) { + public boolean setCurrentTierDisplayed(AltarTier altarTier) { if (currentTierDisplayed == altarTier) return false; else @@ -626,85 +622,7 @@ public class BloodAltar implements IFluidHandler { return new IFluidTankProperties[]{new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity))}; } - public EnumAltarTier getCurrentTierDisplayed() { + public AltarTier getCurrentTierDisplayed() { return currentTierDisplayed; } - - public static EnumAltarTier getAltarTier(World world, BlockPos pos) { - for (int i = EnumAltarTier.MAXTIERS - 1; i >= 1; i--) { - if (checkAltarIsValid(world, pos, i)) { - return EnumAltarTier.values()[i]; - } - } - - return EnumAltarTier.ONE; - } - - public static boolean checkAltarIsValid(World world, BlockPos worldPos, int altarTier) { - for (AltarComponent altarComponent : EnumAltarTier.values()[altarTier].getAltarComponents()) { - BlockPos componentPos = worldPos.add(altarComponent.getOffset()); - IBlockState state = world.getBlockState(componentPos); - - if (altarComponent.getComponent() != EnumAltarComponent.NOTAIR) { - if (state.getBlock() instanceof IAltarComponent) { - EnumAltarComponent component = ((IAltarComponent) state.getBlock()).getType(world, state, componentPos); - if (component == null || component != altarComponent.getComponent()) - return false; - } - - if (!BloodMagicAPI.INSTANCE.getComponentStates(altarComponent.getComponent()).contains(state)) - return false; - } else if (world.isAirBlock(componentPos)) - return false; - } - - return true; - } - - public static Pair getAltarMissingBlock(World world, BlockPos worldPos, int altarTier) { - if (altarTier >= EnumAltarTier.MAXTIERS) - return null; - - for (AltarComponent altarComponent : EnumAltarTier.values()[altarTier].getAltarComponents()) { - BlockPos componentPos = worldPos.add(altarComponent.getOffset()); - IBlockState state = world.getBlockState(componentPos); - - if (altarComponent.getComponent() != EnumAltarComponent.NOTAIR) { - if (state.getBlock() instanceof IAltarComponent) { - EnumAltarComponent component = ((IAltarComponent) state.getBlock()).getType(world, state, componentPos); - if (component == null || component != altarComponent.getComponent()) - return Pair.of(componentPos, altarComponent.getComponent()); - } - - if (!BloodMagicAPI.INSTANCE.getComponentStates(altarComponent.getComponent()).contains(state)) - return Pair.of(componentPos, altarComponent.getComponent()); - } else if (world.isAirBlock(componentPos)) - return Pair.of(componentPos, altarComponent.getComponent()); - } - - return null; - } - - public static AltarUpgrade getUpgrades(World world, BlockPos pos, EnumAltarTier altarTier) { - if (world.isRemote) { - return null; - } - - AltarUpgrade upgrades = new AltarUpgrade(); - List list = altarTier.getAltarComponents(); - - for (AltarComponent altarComponent : list) { - BlockPos componentPos = pos.add(altarComponent.getOffset()); - - if (altarComponent.isUpgradeSlot()) { - IBlockState state = world.getBlockState(componentPos); - if (state.getBlock() instanceof IBloodRune) { - BloodRuneType rune = ((IBloodRune) state.getBlock()).getBloodRune(world, componentPos, state); - upgrades.upgrade(rune); - } - } - } - - return upgrades; - } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/ComponentType.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/ComponentType.java index aa0327c8..1eec1f0d 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/ComponentType.java @@ -5,7 +5,7 @@ import java.util.Locale; /** * List of different components used to construct different tiers of altars. */ -public enum EnumAltarComponent { +public enum ComponentType { GLOWSTONE, BLOODSTONE, BEACON, @@ -13,11 +13,11 @@ public enum EnumAltarComponent { CRYSTAL, NOTAIR; - public static final EnumAltarComponent[] VALUES = values(); + public static final ComponentType[] VALUES = values(); private static final String BASE = "chat.bloodmagic.altar.comp."; private String key; - EnumAltarComponent() { + ComponentType() { this.key = BASE + name().toLowerCase(Locale.ENGLISH); } diff --git a/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java index 0db6e35e..6a96dc66 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java @@ -8,5 +8,5 @@ import javax.annotation.Nullable; public interface IAltarComponent { @Nullable - EnumAltarComponent getType(World world, IBlockState state, BlockPos pos); + ComponentType getType(World world, IBlockState state, BlockPos pos); } diff --git a/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java index a72c1afd..0270ac3e 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java @@ -5,7 +5,7 @@ public interface IBloodAltar { int getCurrentBlood(); - EnumAltarTier getTier(); + AltarTier getTier(); int getProgress(); diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 05d0716b..a779da4b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicAPI; -import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -17,7 +17,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { private final BloodMagicBlacklist blacklist; private final BloodMagicRecipeRegistrar recipeRegistrar; private final BloodMagicValueManager valueManager; - private final Multimap altarComponents; + private final Multimap altarComponents; public BloodMagicAPI() { this.blacklist = new BloodMagicBlacklist(); @@ -46,8 +46,8 @@ public class BloodMagicAPI implements IBloodMagicAPI { @Override public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { - EnumAltarComponent component = null; - for (EnumAltarComponent type : EnumAltarComponent.VALUES) { + ComponentType component = null; + for (ComponentType type : ComponentType.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { component = type; break; @@ -61,7 +61,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { } @Nonnull - public List getComponentStates(EnumAltarComponent component) { + public List getComponentStates(ComponentType component) { return (List) altarComponents.get(component); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 453d5174..8448277e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; @@ -66,19 +66,19 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { handleConfigValues(api); // Add standard blocks for altar components - api.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), EnumAltarComponent.GLOWSTONE.name()); - api.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), EnumAltarComponent.GLOWSTONE.name()); - api.registerAltarComponent(Blocks.BEACON.getDefaultState(), EnumAltarComponent.BEACON.name()); + api.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), ComponentType.GLOWSTONE.name()); + api.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), ComponentType.GLOWSTONE.name()); + api.registerAltarComponent(Blocks.BEACON.getDefaultState(), ComponentType.BEACON.name()); BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), EnumAltarComponent.BLOODSTONE.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), EnumAltarComponent.BLOODSTONE.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), EnumAltarComponent.CRYSTAL.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), EnumAltarComponent.CRYSTAL.name()); + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), ComponentType.BLOODSTONE.name()); + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), ComponentType.BLOODSTONE.name()); + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (BloodRuneType runeType : BloodRuneType.values()) - api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), EnumAltarComponent.BLOODRUNE.name()); + api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), ComponentType.BLOODRUNE.name()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java index 2490f9ce..5682645e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.api.impl.recipe; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; @@ -15,7 +15,7 @@ public class RecipeBloodAltar { @Nonnull private final ItemStack output; @Nonnull - private final EnumAltarTier minimumTier; + private final AltarTier minimumTier; @Nonnegative private final int syphon; @Nonnegative @@ -27,14 +27,14 @@ public class RecipeBloodAltar { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - Preconditions.checkArgument(minimumTier <= EnumAltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); + Preconditions.checkArgument(minimumTier <= AltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); this.input = input; this.output = output; - this.minimumTier = EnumAltarTier.values()[minimumTier]; + this.minimumTier = AltarTier.values()[minimumTier]; this.syphon = syphon; this.consumeRate = consumeRate; this.drainRate = drainRate; @@ -51,7 +51,7 @@ public class RecipeBloodAltar { } @Nonnull - public EnumAltarTier getMinimumTier() { + public AltarTier getMinimumTier() { return minimumTier; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index a99dadea..2312acab 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -1,10 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.altar.EnumAltarComponent; -import WayofTime.bloodmagic.altar.IAltarManipulator; -import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.altar.*; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulNetwork; @@ -165,7 +162,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl public List getDocumentation(EntityPlayer player, World world, BlockPos pos, IBlockState state) { List docs = new ArrayList<>(); IBloodAltar altar = ((IBloodAltar) world.getTileEntity(pos)); - Pair missingBlock = BloodAltar.getAltarMissingBlock(world, pos, altar.getTier().toInt()); + Pair missingBlock = AltarUtil.getFirstMissingComponent(world, pos, altar.getTier().toInt()); if (missingBlock != null) docs.add(new TextComponentTranslation("chat.bloodmagic.altar.nextTier", new TextComponentTranslation(missingBlock.getRight().getKey()), Utils.prettifyBlockPosString(missingBlock.getLeft()))); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index 003a64de..33e6cb94 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.altar.IAltarComponent; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumMimic; @@ -200,7 +200,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent @Nullable @Override - public EnumAltarComponent getType(World world, IBlockState state, BlockPos pos) { + public ComponentType getType(World world, IBlockState state, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMimic) { TileMimic mimic = (TileMimic) tile; @@ -210,7 +210,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent if (block instanceof IAltarComponent) { return ((IAltarComponent) block).getType(world, block.getStateFromMeta(mimic.metaOfReplacedBlock), pos); } else { - for (EnumAltarComponent altarComponent : EnumAltarComponent.values()) + for (ComponentType altarComponent : ComponentType.values()) if (block == Utils.getBlockForComponent(altarComponent)) return altarComponent; } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index d8988f06..0246341a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.altar.AltarComponent; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.handler.event.ClientHandler; @@ -40,7 +40,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { this.renderItem(inputStack); GlStateManager.popMatrix(); - if (tileAltar.getCurrentTierDisplayed() != EnumAltarTier.ONE) + if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE) renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); } @@ -102,11 +102,11 @@ public class RenderAltar extends TileEntitySpecialRenderer { } } - private void renderHologram(TileAltar altar, EnumAltarTier tier, float partialTicks) { + private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) { EntityPlayerSP player = mc.player; World world = player.world; - if (tier == EnumAltarTier.ONE) + if (tier == AltarTier.ONE) return; GlStateManager.pushMatrix(); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index dbd69d57..dc591305 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.item.ItemSlate; import WayofTime.bloodmagic.ritual.EnumRuneType; @@ -58,39 +58,39 @@ public class RegistrarBloodMagicRecipes { public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { // ONE - registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE.ordinal(), 2000, 2, 1); - registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), EnumAltarTier.ONE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), EnumAltarTier.ONE.ordinal(), 1000, 5, 0); - registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE.ordinal(), 1000, 20, 0); + registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), AltarTier.ONE.ordinal(), 2000, 2, 1); + registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), AltarTier.ONE.ordinal(), 1000, 5, 0); + registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), AltarTier.ONE.ordinal(), 1000, 20, 0); // TWO - registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO.ordinal(), 5000, 5, 5); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), EnumAltarTier.TWO.ordinal(), 2000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO.ordinal(), 3000, 5, 5); + registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), AltarTier.TWO.ordinal(), 5000, 5, 5); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), AltarTier.TWO.ordinal(), 2000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), AltarTier.TWO.ordinal(), 3000, 5, 5); // THREE - registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE.ordinal(), 25000, 20, 20); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), EnumAltarTier.THREE.ordinal(), 5000, 15, 10); - registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), EnumAltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE.ordinal(), 10000, 20, 10); + registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), AltarTier.THREE.ordinal(), 25000, 20, 20); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), AltarTier.THREE.ordinal(), 5000, 15, 10); + registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), AltarTier.THREE.ordinal(), 10000, 20, 10); // FOUR - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR.ordinal(), 25000, 30, 50); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), EnumAltarTier.FOUR.ordinal(), 15000, 20, 20); - registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), EnumAltarTier.FOUR.ordinal(), 2000, 20, 10); - registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR.ordinal(), 2000, 10, 10); - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR.ordinal(), 10000, 20, 10); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 25000, 30, 50); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); + registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); + registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), AltarTier.FOUR.ordinal(), 10000, 20, 10); // FIVE - registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE.ordinal(), 80000, 50, 100); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), EnumAltarTier.FIVE.ordinal(), 30000, 40, 100); + registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), AltarTier.FIVE.ordinal(), 80000, 50, 100); + registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); - registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), EnumAltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java index e52151a5..c0c74d3a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.core.registry; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; @@ -32,7 +32,7 @@ public class AltarRecipeRegistry { BMLog.DEFAULT.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); } - public static void registerFillRecipe(ItemStack orbStack, EnumAltarTier tier, int maxForOrb, int consumeRate, int drainRate) { + public static void registerFillRecipe(ItemStack orbStack, AltarTier tier, int maxForOrb, int consumeRate, int drainRate) { registerRecipe(new AltarRecipe(orbStack, orbStack, tier, maxForOrb, consumeRate, drainRate, true)); } @@ -76,7 +76,7 @@ public class AltarRecipeRegistry { public static class AltarRecipe { private final List input; private final ItemStack output; - private final EnumAltarTier minTier; + private final AltarTier minTier; private final int syphon, consumeRate, drainRate; private final boolean fillable; @@ -95,7 +95,7 @@ public class AltarRecipeRegistry { * @param drainRate - The rate at which LP is drained during crafting * @param fillable - Whether the input item can be filled with LP. IE: Orbs */ - public AltarRecipe(List input, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { + public AltarRecipe(List input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { this.input = ItemStackWrapper.toWrapperList(input); this.output = output; this.minTier = minTier; @@ -105,27 +105,27 @@ public class AltarRecipeRegistry { this.fillable = fillable; } - public AltarRecipe(List input, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate) { + public AltarRecipe(List input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate) { this(input, output, minTier, syphon, consumeRate, drainRate, false); } - public AltarRecipe(ItemStack input, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { + public AltarRecipe(ItemStack input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { this(Collections.singletonList(input), output, minTier, syphon, consumeRate, drainRate, fillable); } - public AltarRecipe(ItemStack input, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate) { + public AltarRecipe(ItemStack input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate) { this(Collections.singletonList(input), output, minTier, syphon, consumeRate, drainRate, false); } - public AltarRecipe(String inputEntry, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { + public AltarRecipe(String inputEntry, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, fillable); } - public AltarRecipe(String inputEntry, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate) { + public AltarRecipe(String inputEntry, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate) { this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, false); } - public boolean doesRequiredItemMatch(ItemStack comparedStack, EnumAltarTier tierCheck) { + public boolean doesRequiredItemMatch(ItemStack comparedStack, AltarTier tierCheck) { if (comparedStack == null || this.input == null) return false; @@ -151,7 +151,7 @@ public class AltarRecipeRegistry { return output; } - public EnumAltarTier getMinTier() { + public AltarTier getMinTier() { return minTier; } diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index d911c303..81267670 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.orb.BloodOrb; import com.google.common.collect.ArrayListMultimap; import net.minecraft.item.Item; @@ -42,7 +42,7 @@ public class OrbRegistry { public static List getOrbsDownToTier(int tier) { List ret = new ArrayList<>(); - for (int i = EnumAltarTier.MAXTIERS; i >= tier; i--) + for (int i = AltarTier.MAXTIERS; i >= tier; i--) ret.addAll(getOrbsForTier(i)); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 83ca8822..b299b030 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -29,7 +29,7 @@ import javax.annotation.Nonnull; import java.util.List; public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantProvider { - private EnumAltarTier tierToBuild = EnumAltarTier.ONE; + private AltarTier tierToBuild = AltarTier.ONE; public ItemAltarMaker() { super(); @@ -61,12 +61,12 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP stack = NBTHelper.checkNBT(stack); if (player.isSneaking()) { - if (stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) >= EnumAltarTier.MAXTIERS - 1) + if (stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) >= AltarTier.MAXTIERS - 1) stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, 0); else stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); - setTierToBuild(EnumAltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]); + setTierToBuild(AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]); ChatUtil.sendNoSpam(player, TextHelper.localizeEffect("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1))); return super.onItemRightClick(world, player, hand); } @@ -91,7 +91,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP variants.put(0, "type=altarmaker"); // FIXME } - public void setTierToBuild(EnumAltarTier tierToBuild) { + public void setTierToBuild(AltarTier tierToBuild) { this.tierToBuild = tierToBuild; } @@ -99,12 +99,12 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP if (world.isRemote) return; - if (tierToBuild == EnumAltarTier.ONE) + if (tierToBuild == AltarTier.ONE) return; for (AltarComponent altarComponent : tierToBuild.getAltarComponents()) { BlockPos componentPos = pos.add(altarComponent.getOffset()); - if (altarComponent.getComponent() == EnumAltarComponent.NOTAIR) { + if (altarComponent.getComponent() == ComponentType.NOTAIR) { world.setBlockState(componentPos, Blocks.STONEBRICK.getDefaultState()); continue; } @@ -123,9 +123,9 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP RayTraceResult rayTrace = rayTrace(world, player, false); BlockPos pos = rayTrace.getBlockPos(); IBlockState state = world.getBlockState(pos); - EnumAltarTier altarTier = BloodAltar.getAltarTier(world, pos); + AltarTier altarTier = AltarUtil.getTier(world, pos); - if (altarTier.equals(EnumAltarTier.ONE)) + if (altarTier.equals(AltarTier.ONE)) return "" + altarTier.toInt(); else { for (AltarComponent altarComponent : altarTier.getAltarComponents()) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index 377c401e..ec2457d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.altar.IAltarManipulator; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.iface.IDocumentedBlock; @@ -34,7 +34,7 @@ import javax.annotation.Nonnull; import java.util.List; public class ItemSanguineBook extends Item implements IVariantProvider, IAltarManipulator { - private EnumAltarTier currentDisplayedTier = EnumAltarTier.ONE; + private AltarTier currentDisplayedTier = AltarTier.ONE; public ItemSanguineBook() { setUnlocalizedName(BloodMagic.MODID + ".sanguineBook"); @@ -73,12 +73,12 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa RayTraceResult rayTrace = rayTrace(world, player, false); if (rayTrace == null || rayTrace.typeOfHit == RayTraceResult.Type.MISS || rayTrace.typeOfHit == RayTraceResult.Type.ENTITY) { - if (stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) >= EnumAltarTier.MAXTIERS - 1) + if (stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) >= AltarTier.MAXTIERS - 1) stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, 0); else stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); - currentDisplayedTier = EnumAltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]; + currentDisplayedTier = AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]; ChatUtil.sendNoSpam(player, TextHelper.localizeEffect("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1))); return super.onItemRightClick(world, player, hand); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 37125032..c1572201 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.altar.AltarComponent; -import WayofTime.bloodmagic.altar.EnumAltarComponent; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.ComponentType; +import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.Ritual; @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.function.Consumer; public class RitualAltarBuilder extends Ritual { - private Iterator altarComponentsIterator = new ArrayList<>(EnumAltarTier.SIX.getAltarComponents()).iterator(); + private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); private boolean cycleDone = false; private AltarComponent currentComponent; @@ -54,7 +54,7 @@ public class RitualAltarBuilder extends Ritual { } if (cycleDone) { - altarComponentsIterator = new ArrayList<>(EnumAltarTier.SIX.getAltarComponents()).iterator(); + altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); } if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) { @@ -206,7 +206,7 @@ public class RitualAltarBuilder extends Ritual { for (int i = 0; i < itemHandler.getSlots(); i++) { if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof ItemBlock && Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune && itemHandler.extractItem(i, 1, true) != null) { - BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(EnumAltarComponent.BLOODRUNE), itemHandler.getStackInSlot(i).getItemDamage()); + BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(ComponentType.BLOODRUNE), itemHandler.getStackInSlot(i).getItemDamage()); itemHandler.extractItem(i, 1, false); return blockStack; } @@ -215,7 +215,7 @@ public class RitualAltarBuilder extends Ritual { IInventory inv = (IInventory) tileEntity; for (int i = 0; i < inv.getSizeInventory(); i++) { if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof ItemBlock && Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune) { - BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(EnumAltarComponent.BLOODRUNE), inv.getStackInSlot(i).getItemDamage()); + BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(ComponentType.BLOODRUNE), inv.getStackInSlot(i).getItemDamage()); inv.decrStackSize(i, 1); return blockStack; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index b7b5e5aa..b0ecd0c9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -67,7 +67,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { } @Override - public EnumAltarTier getTier() { + public AltarTier getTier() { return bloodAltar.getTier(); } @@ -161,11 +161,11 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { return bloodAltar.getChargingFrequency(); } - public EnumAltarTier getCurrentTierDisplayed() { + public AltarTier getCurrentTierDisplayed() { return bloodAltar.getCurrentTierDisplayed(); } - public boolean setCurrentTierDisplayed(EnumAltarTier altarTier) { + public boolean setCurrentTierDisplayed(AltarTier altarTier) { return bloodAltar.setCurrentTierDisplayed(altarTier); } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 83ea0573..052977db 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; @@ -321,12 +321,12 @@ public class Utils { } /** - * Gets a default block for each type of {@link EnumAltarComponent} + * Gets a default block for each type of {@link ComponentType} * * @param component - The Component to provide a block for. * @return The default Block for the EnumAltarComponent */ - public static Block getBlockForComponent(EnumAltarComponent component) { + public static Block getBlockForComponent(ComponentType component) { switch (component) { case GLOWSTONE: return Blocks.GLOWSTONE; From e2d2ecb3baae71fff8c98b5e64b1bbba873577ba Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 9 Mar 2018 23:53:56 -0800 Subject: [PATCH 133/493] Run formatter on build.gradle --- build.gradle | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index fde35074..987c88db 100644 --- a/build.gradle +++ b/build.gradle @@ -5,14 +5,14 @@ buildscript { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } plugins { - id "net.minecraftforge.gradle.forge" version "2.0.2" + id "net.minecraftforge.gradle.forge" version "2.0.2" id 'com.matthewprenger.cursegradle' version '1.0.10' - id 'io.franzbecker.gradle-lombok' version '1.6' + id 'io.franzbecker.gradle-lombok' version '1.6' id 'maven-publish' } @@ -30,7 +30,7 @@ version = "${mc_version}-${mod_version}-${build_number}" repositories { maven { url "http://dvs1.progwml6.com/files/maven" } - maven { url "http://tehnut.info/maven" } + maven { url "http://tehnut.info/maven" } } dependencies { @@ -80,11 +80,11 @@ jar { from sourceSets.main.output from sourceSets.api.output manifest.mainAttributes( - "Built-By": System.getProperty('user.name'), - "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", - "Implementation-Title": project.name, - "Implementation-Version": project.version, - "Built-On": "${mc_version}-${forge_version}" + "Built-By": System.getProperty('user.name'), + "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", + "Implementation-Title": project.name, + "Implementation-Version": project.version, + "Built-On": "${mc_version}-${forge_version}" ) } @@ -146,7 +146,9 @@ String getChangelogText() { } if (lineCount < 3) { lineCount++ - if (it.startsWith(separator)) {return} + if (it.startsWith(separator)) { + return + } } if (!it.startsWith(separator)) { str += "$it" + (lineCount < 3 ? ':\n\n' : '\n') From ecb81a7017696c1b8d6ff561a6e06980b44cfd2d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 10 Mar 2018 00:07:19 -0800 Subject: [PATCH 134/493] A bit more altar cleanup --- .../WayofTime/bloodmagic/altar/AltarTier.java | 168 ++++++++++-------- .../WayofTime/bloodmagic/altar/AltarUtil.java | 8 +- .../bloodmagic/altar/BloodAltar.java | 8 - .../bloodmagic/block/BlockAltar.java | 9 +- .../client/render/block/RenderAltar.java | 13 +- .../java/WayofTime/bloodmagic/util/Utils.java | 10 +- 6 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index df88e59c..d940e6ab 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -1,138 +1,148 @@ package WayofTime.bloodmagic.altar; +import com.google.common.collect.Lists; import net.minecraft.util.math.BlockPos; -import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; -//@formatter:off public enum AltarTier { - ONE(), TWO() { + ONE() { @Override - public void buildComponents() { - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE)); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE)); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE)); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE)); + public void buildComponents(Consumer components) { + // Nada + } + }, TWO() { + @Override + public void buildComponents(Consumer components) { + components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE)); + components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE)); + components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE)); + components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE)); } }, THREE() { @Override - public void buildComponents() { - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-3, -1, -3))); - altarComponents.add(new AltarComponent(new BlockPos(-3, 0, -3))); - altarComponents.add(new AltarComponent(new BlockPos(3, -1, -3))); - altarComponents.add(new AltarComponent(new BlockPos(3, 0, -3))); - altarComponents.add(new AltarComponent(new BlockPos(-3, -1, 3))); - altarComponents.add(new AltarComponent(new BlockPos(-3, 0, 3))); - altarComponents.add(new AltarComponent(new BlockPos(3, -1, 3))); - altarComponents.add(new AltarComponent(new BlockPos(3, 0, 3))); - altarComponents.add(new AltarComponent(new BlockPos(-3, 1, -3), ComponentType.GLOWSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(3, 1, -3), ComponentType.GLOWSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(-3, 1, 3), ComponentType.GLOWSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(3, 1, 3), ComponentType.GLOWSTONE)); + public void buildComponents(Consumer components) { + // Doesn't pull from tier 2 because upgrades slots are different + components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-3, -1, -3))); + components.accept(new AltarComponent(new BlockPos(-3, 0, -3))); + components.accept(new AltarComponent(new BlockPos(3, -1, -3))); + components.accept(new AltarComponent(new BlockPos(3, 0, -3))); + components.accept(new AltarComponent(new BlockPos(-3, -1, 3))); + components.accept(new AltarComponent(new BlockPos(-3, 0, 3))); + components.accept(new AltarComponent(new BlockPos(3, -1, 3))); + components.accept(new AltarComponent(new BlockPos(3, 0, 3))); + components.accept(new AltarComponent(new BlockPos(-3, 1, -3), ComponentType.GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(3, 1, -3), ComponentType.GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(-3, 1, 3), ComponentType.GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(3, 1, 3), ComponentType.GLOWSTONE)); for (int i = -2; i <= 2; i++) { - altarComponents.add(new AltarComponent(new BlockPos(3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -2, 3), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -2, -3), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -2, 3), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -2, -3), ComponentType.BLOODRUNE).setUpgradeSlot()); } } }, FOUR() { @Override - public void buildComponents() { - altarComponents.addAll(THREE.getAltarComponents()); + public void buildComponents(Consumer components) { + THREE.getAltarComponents().forEach(components); for (int i = -3; i <= 3; i++) { - altarComponents.add(new AltarComponent(new BlockPos(5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -3, 5), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -3, -5), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -3, 5), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -3, -5), ComponentType.BLOODRUNE).setUpgradeSlot()); } for (int i = -2; i <= 1; i++) { - altarComponents.add(new AltarComponent(new BlockPos(5, i, 5))); - altarComponents.add(new AltarComponent(new BlockPos(5, i, -5))); - altarComponents.add(new AltarComponent(new BlockPos(-5, i, -5))); - altarComponents.add(new AltarComponent(new BlockPos(-5, i, 5))); + components.accept(new AltarComponent(new BlockPos(5, i, 5))); + components.accept(new AltarComponent(new BlockPos(5, i, -5))); + components.accept(new AltarComponent(new BlockPos(-5, i, -5))); + components.accept(new AltarComponent(new BlockPos(-5, i, 5))); } - altarComponents.add(new AltarComponent(new BlockPos(5, 2, 5), ComponentType.BLOODSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(5, 2, -5), ComponentType.BLOODSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(-5, 2, -5), ComponentType.BLOODSTONE)); - altarComponents.add(new AltarComponent(new BlockPos(-5, 2, 5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(5, 2, 5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(5, 2, -5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(-5, 2, -5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(-5, 2, 5), ComponentType.BLOODSTONE)); } }, FIVE() { @Override - public void buildComponents() { - altarComponents.addAll(FOUR.getAltarComponents()); - altarComponents.add(new AltarComponent(new BlockPos(-8, -3, 8), ComponentType.BEACON)); - altarComponents.add(new AltarComponent(new BlockPos(-8, -3, -8), ComponentType.BEACON)); - altarComponents.add(new AltarComponent(new BlockPos(8, -3, -8), ComponentType.BEACON)); - altarComponents.add(new AltarComponent(new BlockPos(8, -3, 8), ComponentType.BEACON)); + public void buildComponents(Consumer components) { + FOUR.getAltarComponents().forEach(components); + components.accept(new AltarComponent(new BlockPos(-8, -3, 8), ComponentType.BEACON)); + components.accept(new AltarComponent(new BlockPos(-8, -3, -8), ComponentType.BEACON)); + components.accept(new AltarComponent(new BlockPos(8, -3, -8), ComponentType.BEACON)); + components.accept(new AltarComponent(new BlockPos(8, -3, 8), ComponentType.BEACON)); for (int i = -6; i <= 6; i++) { - altarComponents.add(new AltarComponent(new BlockPos(8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -4, 8), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -4, -8), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -4, 8), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -4, -8), ComponentType.BLOODRUNE).setUpgradeSlot()); } } }, SIX() { @Override - public void buildComponents() { - altarComponents.addAll(FIVE.getAltarComponents()); + public void buildComponents(Consumer components) { + FIVE.getAltarComponents().forEach(components); for (int i = -4; i <= 2; i++) { - altarComponents.add(new AltarComponent(new BlockPos(11, i, 11))); - altarComponents.add(new AltarComponent(new BlockPos(-11, i, -11))); - altarComponents.add(new AltarComponent(new BlockPos(11, i, -11))); - altarComponents.add(new AltarComponent(new BlockPos(-11, i, 11))); + components.accept(new AltarComponent(new BlockPos(11, i, 11))); + components.accept(new AltarComponent(new BlockPos(-11, i, -11))); + components.accept(new AltarComponent(new BlockPos(11, i, -11))); + components.accept(new AltarComponent(new BlockPos(-11, i, 11))); } - altarComponents.add(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); - altarComponents.add(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); - altarComponents.add(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); - altarComponents.add(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); for (int i = -9; i <= 9; i++) { - altarComponents.add(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); - altarComponents.add(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); } } -//@formatter:on }; public static final int MAXTIERS = values().length; - ArrayList altarComponents = new ArrayList<>(); + private List altarComponents; - public void buildComponents() { + AltarTier() { + this.altarComponents = Lists.newArrayList(); + buildComponents(altarComponents::add); } + public abstract void buildComponents(Consumer components); + public int toInt() { return ordinal() + 1; } - public ArrayList getAltarComponents() { + public List getAltarComponents() { return altarComponents; } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java index 845f9051..7519c870 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java @@ -25,7 +25,13 @@ public class AltarUtil { AltarTier lastCheck = AltarTier.ONE; for (AltarTier tier : AltarTier.values()) { for (AltarComponent component : tier.getAltarComponents()) { - IBlockState worldState = world.getBlockState(pos.add(component.getOffset())); + BlockPos componentPos = pos.add(component.getOffset()); + IBlockState worldState = world.getBlockState(componentPos); + + if (worldState.getBlock() instanceof IAltarComponent) + if (((IAltarComponent) worldState.getBlock()).getType(world, worldState, componentPos) == component.getComponent()) + continue; + if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) continue; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 39ccbf9c..0cb9b8f7 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -31,14 +31,6 @@ import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.items.ItemHandlerHelper; public class BloodAltar implements IFluidHandler { - static { - AltarTier.ONE.buildComponents(); - AltarTier.TWO.buildComponents(); - AltarTier.THREE.buildComponents(); - AltarTier.FOUR.buildComponents(); - AltarTier.FIVE.buildComponents(); - AltarTier.SIX.buildComponents(); - } public boolean isActive; protected FluidStack fluidOutput = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 2312acab..39fe58e1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -117,7 +117,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl if (altar == null || player.isSneaking()) return false; - ItemStack playerItem = player.inventory.getCurrentItem(); + ItemStack playerItem = player.getHeldItem(hand); if (playerItem.getItem() instanceof IAltarReader || playerItem.getItem() instanceof IAltarManipulator) { playerItem.getItem().onItemRightClick(world, player, hand); @@ -136,11 +136,8 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl @Override public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TileAltar) { - TileAltar tileAltar = (TileAltar) world.getTileEntity(blockPos); - if (tileAltar != null) - tileAltar.dropItems(); - } + if (tile instanceof TileAltar) + ((TileAltar) tile).dropItems(); super.breakBlock(world, blockPos, blockState); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 0246341a..2dba9db8 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; @@ -22,10 +21,8 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; public class RenderAltar extends TileEntitySpecialRenderer { - public static Minecraft mc = Minecraft.getMinecraft(); - public static ResourceLocation resource = new ResourceLocation("bloodmagic", "textures/blocks/lifeEssenceStill.png"); - public static float minHeight = 0.499f; - public static float maxHeight = 0.745f; + private static final float MIN_HEIGHT = 0.499f; + private static final float MAX_HEIGHT = 0.745f; @Override public void render(TileAltar tileAltar, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { @@ -50,7 +47,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { Fluid fluid = BlockLifeEssence.getLifeEssence(); FluidStack fluidStack = new FluidStack(fluid, 1000); - GlStateManager.translate(0.5, minHeight + (fluidLevel) * (maxHeight - minHeight), 0.5); + GlStateManager.translate(0.5, MIN_HEIGHT + (fluidLevel) * (MAX_HEIGHT - MIN_HEIGHT), 0.5); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder wr = tessellator.getBuffer(); @@ -81,7 +78,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { } private void renderItem(ItemStack stack) { - RenderItem itemRenderer = mc.getRenderItem(); + RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); if (!stack.isEmpty()) { GlStateManager.translate(0.5, 1, 0.5); GlStateManager.pushMatrix(); @@ -103,7 +100,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { } private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) { - EntityPlayerSP player = mc.player; + EntityPlayerSP player = Minecraft.getMinecraft().player; World world = player.world; if (tier == AltarTier.ONE) diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 052977db..33fbff01 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -270,17 +270,15 @@ public class Utils { * otherwise */ public static boolean insertItemToTile(TileInventory tile, EntityPlayer player, int slot) { - if (tile.getStackInSlot(slot).isEmpty() && !player.getHeldItemMainhand().isEmpty()) { + ItemStack slotStack = tile.getStackInSlot(slot); + if (slotStack.isEmpty() && !player.getHeldItemMainhand().isEmpty()) { ItemStack input = player.getHeldItemMainhand().copy(); input.setCount(1); player.getHeldItemMainhand().shrink(1); tile.setInventorySlotContents(slot, input); return true; - } else if (!tile.getStackInSlot(slot).isEmpty() && player.getHeldItemMainhand().isEmpty()) { - if (!tile.getWorld().isRemote) { - EntityItem invItem = new EntityItem(tile.getWorld(), player.posX, player.posY + 0.25, player.posZ, tile.getStackInSlot(slot)); - tile.getWorld().spawnEntity(invItem); - } + } else if (!slotStack.isEmpty() && player.getHeldItemMainhand().isEmpty()) { + ItemHandlerHelper.giveItemToPlayer(player, slotStack); tile.clear(); return false; } From bbe026dda9ac69fca16bb59e9efcec520ddc7529 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 11 Mar 2018 11:19:34 -0400 Subject: [PATCH 135/493] Added a new (slightly WIP?) array, the Turret Array --- changelog.txt | 2 + .../AlchemyArrayEffectArrowTurret.java | 242 +++++++++++++++ .../TurretAlchemyCircleRenderer.java | 285 ++++++++++++++++++ .../bloodmagic/registry/ModRecipes.java | 79 +++-- .../bloodmagic/tile/TileAlchemyArray.java | 15 +- 5 files changed, 596 insertions(+), 27 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java diff --git a/changelog.txt b/changelog.txt index 775f13c4..e27942ad 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,8 @@ Version 2.2.8 - It's a bright idea to fix this as soon as I can. - Changed the recipe of the Teleport Array: - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! +- Added a new (slightly WIP?) array, the Turret Array: + - Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. - Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java new file mode 100644 index 00000000..25d838cb --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java @@ -0,0 +1,242 @@ +package WayofTime.bloodmagic.alchemyArray; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.monster.EntityMob; +import net.minecraft.entity.projectile.EntityTippedArrow; +import net.minecraft.init.Items; +import net.minecraft.item.ItemArrow; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec2f; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import WayofTime.bloodmagic.util.Utils; + +public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect +{ + public EntityLiving target; + public int arrowTimer; + public static final int ARROW_WINDUP = 50; + private int lastChestSlot = -1; + + private double pitch = 0; + private double lastPitch = 0; + private double yaw = 0; + private double lastYaw = 0; + + public AlchemyArrayEffectArrowTurret(String key) + { + super(key); + } + + @Override + public boolean update(TileEntity tile, int ticksActive) + { + BlockPos pos = tile.getPos(); + World world = tile.getWorld(); + + BlockPos chestPos = pos.down(); + TileEntity chestTile = world.getTileEntity(chestPos); + if (chestTile == null) + { + return false; + } + IItemHandler itemHandler = Utils.getInventory(chestTile, EnumFacing.UP); + if (itemHandler == null) + { + return false; + } + + ItemStack arrowStack = new ItemStack(Items.AIR); + if (lastChestSlot >= 0 && lastChestSlot < itemHandler.getSlots()) + { + ItemStack testStack = itemHandler.extractItem(lastChestSlot, 1, true); + if (testStack.isEmpty() || !(testStack.getItem() instanceof ItemArrow)) + { + lastChestSlot = -1; + } else + { + arrowStack = testStack; + } + } + + if (lastChestSlot < 0) + { + for (int i = 0; i < itemHandler.getSlots(); i++) + { + ItemStack testStack = itemHandler.extractItem(i, 1, true); + if (!testStack.isEmpty() && testStack.getItem() instanceof ItemArrow) + { + arrowStack = testStack; + lastChestSlot = i; + break; + } + } + + } + + if (lastChestSlot < 0) + { + return false; //No arrows in the chest. Welp! + } + + if (canFireOnMob(world, pos, target)) + { + Vec2f pitchYaw = getPitchYaw(pos, target); + lastPitch = pitch; + lastYaw = yaw; + pitch = pitchYaw.x; + yaw = pitchYaw.y; + arrowTimer++; + + if (arrowTimer >= ARROW_WINDUP) + { +// ItemStack arrowStack = new ItemStack(Items.ARROW); + fireOnTarget(world, pos, arrowStack, target); + if (!world.isRemote) + { + itemHandler.extractItem(lastChestSlot, 1, false); + } + arrowTimer = 0; + } + return false; + } else + { + target = null; + arrowTimer = -1; + } + + List mobsInRange = world.getEntitiesWithinAABB(EntityMob.class, getBounds(pos)); + + for (EntityMob entity : mobsInRange) + { + if (canFireOnMob(world, pos, entity))// && isMobInFilter(ent)) + { + target = entity; + arrowTimer = 0; + return false; + } + } + arrowTimer = -1; + target = null; + + return false; + } + + public double getPitch() + { + return pitch; + } + + public double getLastPitch() + { + return lastPitch; + } + + public double getYaw() + { + return yaw; + } + + public double getLastYaw() + { + return lastYaw; + } + + public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, EntityLiving targetMob) + { + float vel = 3f; + double damage = 2; + if (!world.isRemote) + { + if (arrowStack.getItem() instanceof ItemArrow) + { +// ItemArrow arrow = (ItemArrow) arrowStack.getItem(); +// EntityArrow entityarrow = arrow.createArrow(world, arrowStack, targetMob); + EntityTippedArrow entityarrow = new EntityTippedArrow(world); + entityarrow.setPotionEffect(arrowStack); + entityarrow.posX = pos.getX() + 0.5; + entityarrow.posY = pos.getY() + 0.5; + entityarrow.posZ = pos.getZ() + 0.5; + + double d0 = targetMob.posX - (pos.getX() + 0.5); + double d1 = targetMob.posY + targetMob.height - (pos.getY() + 0.5); + double d2 = targetMob.posZ - (pos.getZ() + 0.5); + double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); + entityarrow.setDamage(damage); + entityarrow.shoot(d0, d1 + d3 * 0.05, d2, vel, 0); + world.spawnEntity(entityarrow); + } + } + } + + public static Vec2f getPitchYaw(BlockPos pos, Entity entityIn) + { + if (entityIn == null) + { + return new Vec2f(0, 0); + } + + double distanceX = entityIn.posX - (pos.getX() + 0.5); + double distanceY = entityIn.posY + (double) entityIn.getEyeHeight() - (pos.getY() + 0.5); + double distanceZ = entityIn.posZ - (pos.getZ() + 0.5); + double radialDistance = Math.sqrt(distanceX * distanceX + distanceZ * distanceZ); + double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI; + double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI; + + return new Vec2f((float) pitch, (float) yaw); + } + + public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) + { + return world.rayTraceBlocks(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), new Vec3d(entityIn.posX, entityIn.posY + (double) entityIn.getEyeHeight(), entityIn.posZ), false, true, false) == null; + } + + public boolean canFireOnMob(World world, BlockPos pos, Entity entityIn) + { + return entityIn != null && !entityIn.isDead && entityIn.getDistanceSqToCenter(pos) <= getRange() * getRange() && entityIn.getDistanceSqToCenter(pos) >= getMinRange() * getMinRange() && canEntityBeSeen(world, pos, entityIn); + } + + public AxisAlignedBB getBounds(BlockPos pos) + { + return new AxisAlignedBB(pos).grow(getRange(), getRange(), getRange()); + } + + public float getRange() + { + return 32; + } + + public float getMinRange() + { + return 3; + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectArrowTurret(key); + } + +} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java new file mode 100644 index 00000000..66039503 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -0,0 +1,285 @@ +package WayofTime.bloodmagic.client.render.alchemyArray; + +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec2f; +import net.minecraft.world.World; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; +import WayofTime.bloodmagic.tile.TileAlchemyArray; + +public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer +{ + private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"); + private ResourceLocation middleArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"); + + public TurretAlchemyCircleRenderer(ResourceLocation location) + { + super(location); + } + + public TurretAlchemyCircleRenderer() + { + this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png")); + } + + @Override + public float getSizeModifier(float craftTime) + { + return 1; + } + + @Override + public float getRotation(float craftTime) + { + float offset = 50; + if (craftTime >= offset) + { + float modifier = (craftTime - offset) * 5f; + return modifier * 1f; + } + return 0; + } + + @Override + public float getSecondaryRotation(float craftTime) + { + return 0; + } + + @Override + public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) + { + if (!(tile instanceof TileAlchemyArray)) + { + return; + } + + float f = 0; //Not working + + TileAlchemyArray tileArray = (TileAlchemyArray) tile; + AlchemyArrayEffect effect = tileArray.arrayEffect; + double pitch = 0; + double yaw = 0; + int arrowTimer = -1; + if (effect instanceof AlchemyArrayEffectArrowTurret) + { + AlchemyArrayEffectArrowTurret turretEffect = (AlchemyArrayEffectArrowTurret) effect; + pitch = (turretEffect.getPitch() - turretEffect.getLastPitch()) * f + turretEffect.getLastPitch(); + yaw = (turretEffect.getYaw() - turretEffect.getLastYaw()) * f + turretEffect.getLastYaw(); + arrowTimer = turretEffect.arrowTimer; + } + + double arrowAnimation = arrowTimer + f; + + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder wr = tessellator.getBuffer(); + + GlStateManager.pushMatrix(); + + float rot = getRotation(craftTime); + + float size = 1.0F * getSizeModifier(craftTime); + + // Bind the texture to the circle + Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + + GlStateManager.disableCull(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 1); + + GlStateManager.translate(x, y, z); + + // Specify which face this "circle" is located on + EnumFacing sideHit = EnumFacing.UP; + EnumFacing rotation = tileArray.getRotation(); + + GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + + switch (sideHit) + { + case DOWN: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(-90.0f, 1, 0, 0); + break; + case EAST: + GlStateManager.rotate(-90.0f, 0, 1, 0); + GlStateManager.translate(0, 0, -1); + break; + case NORTH: + break; + case SOUTH: + GlStateManager.rotate(180.0f, 0, 1, 0); + GlStateManager.translate(-1, 0, -1); + break; + case UP: + GlStateManager.translate(0, 1, 0); + GlStateManager.rotate(90.0f, 1, 0, 0); + break; + case WEST: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(90.0f, 0, 1, 0); + break; + } + + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); +// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); + + GlStateManager.pushMatrix(); + + double topHeightOffset = getTopHeightOffset(craftTime, arrowAnimation); + double middleHeightOffset = getMiddleHeightOffset(craftTime, arrowAnimation); + double bottomHeightOffset = getBottomHeightOffset(craftTime, arrowAnimation); + + BlockPos pos = tileArray.getPos(); + World world = tileArray.getWorld(); + + GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1); + GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); + + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); + GlStateManager.rotate(-rot, 0, 0, 1); + GlStateManager.translate(0, 0, -bottomHeightOffset); + renderStandardCircle(tessellator, wr, size / 2); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(middleArrayResource); + GlStateManager.rotate(0, 0, 0, 1); + GlStateManager.translate(0, 0, -middleHeightOffset); + renderStandardCircle(tessellator, wr, size); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + GlStateManager.rotate(rot, 0, 0, 1); + GlStateManager.translate(0, 0, -topHeightOffset); + renderStandardCircle(tessellator, wr, size); + GlStateManager.popMatrix(); + + GlStateManager.popMatrix(); + + // GlStateManager.depthMask(true); + GlStateManager.disableBlend(); + GlStateManager.enableCull(); + // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GlStateManager.popMatrix(); + GlStateManager.popMatrix(); + } + + public float getStartupPitchYawRatio(float craftTime) + { + if (craftTime <= 80) + { + return 0; + } else if (craftTime > 80 && craftTime < 140) + { + return (craftTime - 80) / 60f; + } + + return 1; + } + + public double getBottomHeightOffset(double craftTime, double arrowAnimation) + { + if (craftTime <= 40) + { + return 0; + } else if (craftTime > 40 && craftTime < 100) + { + return -0.4 * (craftTime - 40) / 60d; + } else if (craftTime >= 100 && craftTime < 140) + { + return -0.4 * (140 - craftTime) / 40d; + } + + if (arrowAnimation > 0 && arrowAnimation < 45) + { + return -0.4 * (arrowAnimation) / 45; + } else if (arrowAnimation >= 45 && arrowAnimation < 50) + { + return -0.4 * (50 - arrowAnimation) / 5; + } + + return 0; + } + + public double getMiddleHeightOffset(double craftTime, double arrowAnimation) + { + if (craftTime <= 40) + { + return 0; + } else if (craftTime > 40 && craftTime < 100) + { + return 0.1 * (craftTime - 40) / 60d; + } else if (craftTime >= 100 && craftTime < 140) + { + return 0.1 * (140 - craftTime) / 40d; + } + + if (arrowAnimation > 0 && arrowAnimation < 45) + { + return 0.1 * (arrowAnimation) / 45; + } else if (arrowAnimation >= 45 && arrowAnimation < 50) + { + return 0.1 * (50 - arrowAnimation) / 5; + } + + return 0; + } + + public double getTopHeightOffset(double craftTime, double arrowAnimation) + { + if (craftTime <= 40) + { + return 0; + } else if (craftTime > 40 && craftTime < 100) + { + return 0.4 * (craftTime - 40) / 60d; + } else if (craftTime >= 100 && craftTime < 140) + { + return 0.4 * (140 - craftTime) / 40d; + } + + if (arrowAnimation > 0 && arrowAnimation < 45) + { + return 0.4 * (arrowAnimation) / 45; + } else if (arrowAnimation >= 45 && arrowAnimation < 50) + { + return 0.4 * (50 - arrowAnimation) / 5; + } + + return 0; + } + + private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) + { + double var31 = 0.0D; + double var33 = 1.0D; + double var35 = 0; + double var37 = 1; + GlStateManager.color(1f, 1f, 1f, 1f); + builder.begin(7, DefaultVertexFormats.POSITION_TEX); + // wr.setBrightness(200); + builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex(); + builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex(); + builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex(); + builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex(); + tessellator.draw(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 9e1f2b9b..14386ee5 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,26 +1,11 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.compress.CompressionRegistry; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.client.render.alchemyArray.*; -import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; -import WayofTime.bloodmagic.compress.BaseCompressionHandler; -import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.livingArmour.downgrade.*; -import WayofTime.bloodmagic.potion.BMPotionUtils; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe; -import WayofTime.bloodmagic.util.Utils; -import com.google.common.base.Stopwatch; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; @@ -31,13 +16,54 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.oredict.OreDictionary; + import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectAttractor; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBounce; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectFurnaceFuel; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectTeleport; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft; +import WayofTime.bloodmagic.client.render.alchemyArray.AttractorAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.LowAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.SingleAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.StaticAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.TurretAlchemyCircleRenderer; +import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; +import WayofTime.bloodmagic.compress.BaseCompressionHandler; +import WayofTime.bloodmagic.compress.CompressionRegistry; +import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDisoriented; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowHeal; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowness; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTrooper; +import WayofTime.bloodmagic.potion.BMPotionUtils; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe; +import WayofTime.bloodmagic.util.Utils; + +import com.google.common.base.Stopwatch; public class ModRecipes { @@ -96,6 +122,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turretTest"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); // AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.APPLE), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 03454b0c..1a02cbd2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,10 +1,16 @@ package WayofTime.bloodmagic.tile; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; @@ -20,7 +26,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; private String key = "empty"; - private AlchemyArrayEffect arrayEffect; + public AlchemyArrayEffect arrayEffect; private boolean doDropIngredients = true; public TileAlchemyArray() @@ -192,4 +198,11 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche { this.rotation = rotation; } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return Block.FULL_BLOCK_AABB.offset(getPos()); + } } From c7af09a4589d35a20e1af42e86840b921da9c725 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 11 Mar 2018 12:48:49 -0700 Subject: [PATCH 136/493] Fixed Master Blood Orb cost (#1248) This has been wrong for almost 2 years now. Neat. --- .../WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index dc591305..9a75d798 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -78,7 +78,7 @@ public class RegistrarBloodMagicRecipes { registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), AltarTier.THREE.ordinal(), 10000, 20, 10); // FOUR - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 25000, 30, 50); + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 40000, 30, 50); registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); From 46389368ecc980275e5805064321a1ffd637763f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 12 Mar 2018 16:20:32 -0700 Subject: [PATCH 137/493] Fix default potion flask recipe --- .../WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java | 1 + .../WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index cf027782..0f183c45 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -90,6 +90,7 @@ public class BloodMagicJEIPlugin implements IModPlugin { public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME); subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.BLOOD_ORB); + subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.POTION_FLASK); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 9a75d798..7a5f5dfb 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -16,9 +16,11 @@ import WayofTime.bloodmagic.util.PluginUtil; import com.google.common.collect.Sets; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.PotionTypes; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.Fluid; @@ -120,7 +122,7 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); registrar.addAlchemyTable(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); registrar.addAlchemyTable(ItemLivingArmourPointsUpgrade.UpgradeType.DRAFT_ANGELUS.getStack(), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); - registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone"); + registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER), "cropNetherWart", "dustRedstone", "dustGlowstone"); registrar.addAlchemyTable(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); registrar.addAlchemyTable(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); From 924dc7b38d54c013d08d676ea2503f1fa8dffc5e Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 13 Mar 2018 23:10:13 -0700 Subject: [PATCH 138/493] Fix server crash when handling dye recipes (#1250) --- .../AlchemyTableDyeableRecipe.java | 3 ++- .../java/WayofTime/bloodmagic/util/Utils.java | 24 +++++++++++++++---- .../util/handler/event/CraftingHandler.java | 3 ++- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 9182aad7..93c0feb9 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.recipe.alchemyTable; import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; @@ -76,7 +77,7 @@ public class AlchemyTableDyeableRecipe extends AlchemyTableRecipe { outputStack.setTagCompound(new NBTTagCompound()); } - outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getColorValue())); + outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(Utils.DYE_COLOR_VALUES.getOrDefault(dyeColor, 0))); return outputStack; } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 33fbff01..3e6fecc0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; import WayofTime.bloodmagic.tile.TileInventory; import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.BlockPortal; @@ -23,6 +24,7 @@ import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -39,6 +41,7 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -47,12 +50,25 @@ import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; +import java.lang.reflect.Field; +import java.util.*; public class Utils { + + public static final EnumMap DYE_COLOR_VALUES = Maps.newEnumMap(EnumDyeColor.class); + + static { + try { + Field colorValue = ReflectionHelper.findField(EnumDyeColor.class, "field_193351_w", "colorValue"); + colorValue.setAccessible(true); + for (EnumDyeColor color : EnumDyeColor.values()) { + DYE_COLOR_VALUES.put(color, (int) colorValue.get(color)); + } + } catch (IllegalAccessException e) { + BMLog.DEFAULT.error("Error grabbing color values: {}", e.getMessage()); + } + } + public static float addAbsorptionToMaximum(EntityLivingBase entity, float added, int maximum, int duration) { float currentAmount = entity.getAbsorptionAmount(); added = Math.min(maximum - currentAmount, added); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index c1456262..4d97a8d4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.AltarCraftedEvent; import WayofTime.bloodmagic.iface.IUpgradeTrainer; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.ItemHelper; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; @@ -86,7 +87,7 @@ public class CraftingHandler { ItemStack output = event.getLeft().copy(); if (!output.hasTagCompound()) output.setTagCompound(new NBTTagCompound()); - output.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getColorValue())); + output.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(Utils.DYE_COLOR_VALUES.getOrDefault(dyeColor, 0))); event.setCost(1); event.setOutput(output); From 77e5beb9e185f45f79b6e6655a39cd1f90e3b9f6 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Mar 2018 17:18:20 -0700 Subject: [PATCH 139/493] Fully remove old LogHelper usage --- .../java/WayofTime/bloodmagic/BloodMagic.java | 2 -- .../AlchemyArrayEffectLaputa.java | 3 -- .../TurretAlchemyCircleRenderer.java | 5 --- .../compress/StorageBlockCraftingManager.java | 4 +-- .../meteor/MeteorConfigHandler.java | 4 +-- .../bloodmagic/proxy/ClientProxy.java | 6 ++-- .../bloodmagic/registry/ModRecipes.java | 4 +-- .../bloodmagic/tile/TileAlchemyArray.java | 2 -- .../bloodmagic/util/PleaseStopUsingMe.java | 3 -- .../util/handler/event/ClientHandler.java | 9 ++--- .../bloodmagic/util/helper/LogHelper.java | 36 ------------------- 11 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 4581753c..630607c9 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.ritual.RitualRegistry; -import WayofTime.bloodmagic.util.helper.LogHelper; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -65,7 +64,6 @@ public class BloodMagic { FluidRegistry.enableUniversalBucket(); } - public LogHelper logger = new LogHelper(MODID); private File configDir; @Mod.EventHandler diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index cdb1e14e..d3701692 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -2,11 +2,8 @@ package WayofTime.bloodmagic.alchemyArray; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index 66039503..967b4638 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -1,19 +1,14 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec2f; import net.minecraft.world.World; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 4dd1822c..19e06bb4 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -19,7 +19,7 @@ public class StorageBlockCraftingManager { public void addStorageBlockRecipes() { // this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); - BloodMagic.instance.logger.info("Total number of compression recipes: " + this.recipes.size()); + BMLog.DEBUG.info("Total number of compression recipes: " + this.recipes.size()); } public ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world) { diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index c608e061..c6e1b65c 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.meteor; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.gson.Serializers; +import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -29,7 +29,7 @@ public class MeteorConfigHandler { public static void handleMeteors(boolean checkNewVersion) { if (meteorDir == null) { - BloodMagic.instance.logger.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); + BMLog.DEFAULT.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); return; } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index d24ce3b8..1f8ff251 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -16,6 +16,7 @@ import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Constants; import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; @@ -117,10 +118,9 @@ public class ClientProxy extends CommonProxy { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); - BloodMagic.instance.logger.info("Elytra layer added"); + BMLog.DEBUG.info("Elytra layer added"); } catch (Exception e) { - BloodMagic.instance.logger.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade."); - BloodMagic.instance.logger.error(e.getLocalizedMessage()); + BMLog.DEBUG.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade: {}", e.getMessage()); } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 14386ee5..f8375a0e 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import WayofTime.bloodmagic.util.BMLog; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; @@ -19,7 +20,6 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; -import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectAttractor; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; @@ -140,7 +140,7 @@ public class ModRecipes CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.COBBLESTONE), 64); stopwatch.stop(); - BloodMagic.instance.logger.info("Added compression recipes in {}", stopwatch); + BMLog.DEBUG.info("Added compression recipes in {}", stopwatch); } public static void addAlchemyTableRecipes() diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 1a02cbd2..a8f0ff7c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -4,11 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; diff --git a/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java index 072d7986..368bd44e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java +++ b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.util.helper.LogHelper; import net.minecraft.util.DamageSource; /** @@ -13,7 +12,5 @@ import net.minecraft.util.DamageSource; public class PleaseStopUsingMe { public static boolean loggingEnabled; - public static LogHelper logger = new LogHelper("BloodMagic|API"); - public static DamageSource damageSource = new DamageSourceBloodMagic(); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 472ed94f..ebc027cd 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.Ritual; @@ -211,10 +212,10 @@ public class ClientHandler { missingVariants.removeAll(missing); if (errored.size() > 0) - BloodMagic.instance.logger.info("Suppressed {} model errors from Blood Magic.", errored.size()); + BMLog.DEBUG.info("Suppressed {} model errors from Blood Magic.", errored.size()); if (missing.size() > 0) - BloodMagic.instance.logger.info("Suppressed {} variant errors from Blood Magic.", missing.size()); - BloodMagic.instance.logger.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop()); + BMLog.DEBUG.info("Suppressed {} variant errors from Blood Magic.", missing.size()); + BMLog.DEBUG.info("Suppressed discovered model/variant errors in {}", stopwatch.stop()); } // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. @@ -247,7 +248,7 @@ public class ClientHandler { missingTextures.keySet().remove(mc); badTextureDomains.remove(mc); } - BloodMagic.instance.logger.debug("Suppressed required texture errors in {}", stopwatch.stop()); + BMLog.DEBUG.info("Suppressed required texture errors in {}", stopwatch.stop()); } private static void renderRitualStones(EntityPlayerSP player, float partialTicks) { diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java deleted file mode 100644 index 3876068e..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java +++ /dev/null @@ -1,36 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.util.PleaseStopUsingMe; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class LogHelper { - private Logger logger; - - public LogHelper(String logger) { - this.logger = LogManager.getLogger(logger); - } - - public void info(String info, Object... format) { - if (PleaseStopUsingMe.loggingEnabled) - logger.info(info, format); - } - - public void error(String error, Object... format) { - if (PleaseStopUsingMe.loggingEnabled) - logger.error(error, format); - } - - public void debug(String debug, Object... format) { - if (PleaseStopUsingMe.loggingEnabled) - logger.debug(debug, format); - } - - public void fatal(String fatal, Object... format) { - logger.error(fatal, format); - } - - public Logger getLogger() { - return logger; - } -} From f535e331dd0a5811e2a6507339888f7e89983600 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Mar 2018 22:30:14 -0700 Subject: [PATCH 140/493] Removed all usages of PleaseStopUsingMe --- .../AlchemyArrayEffectFurnaceFuel.java | 4 ++-- .../bloodmagic/core/data/SoulNetwork.java | 6 +++--- .../bloodmagic/item/ItemDaggerOfSacrifice.java | 4 ++-- .../bloodmagic/item/ItemSacrificialDagger.java | 6 +++--- .../item/sigil/ItemSigilFastMiner.java | 4 ++-- .../bloodmagic/potion/BMPotionUtils.java | 4 ++-- .../bloodmagic/ritual/types/RitualLava.java | 4 ++-- .../ritual/types/RitualRegeneration.java | 4 ++-- .../bloodmagic/util/DamageSourceBloodMagic.java | 3 +++ .../bloodmagic/util/PleaseStopUsingMe.java | 16 ---------------- 10 files changed, 21 insertions(+), 34 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java index 145b6143..b9f2f51b 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.alchemyArray; import java.util.List; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import net.minecraft.block.Block; import net.minecraft.block.BlockFurnace; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +16,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { @@ -67,7 +67,7 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect if (!sacrifice.capabilities.isCreativeMode) { sacrifice.hurtResistantTime = 0; - sacrifice.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); //No. + sacrifice.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); //No. } } } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index a9ec1ff2..046c6b61 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.core.data; import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.event.AddToNetworkEvent; import WayofTime.bloodmagic.event.SoulNetworkEvent; import WayofTime.bloodmagic.util.helper.PlayerHelper; @@ -113,14 +113,14 @@ public class SoulNetwork implements INBTSerializable { if (syphon < 100 && syphon > 0) { if (!user.capabilities.isCreativeMode) { user.hurtResistantTime = 0; - user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); + user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); } } else if (syphon >= 100) { if (!user.capabilities.isCreativeMode) { for (int i = 0; i < ((syphon + 99) / 100); i++) { user.hurtResistantTime = 0; - user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); + user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 3b5203a9..c3b3ecfd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.util.helper.PurificationHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -71,7 +71,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) { target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); target.setHealth(-1); - target.onDeath(PleaseStopUsingMe.damageSource); + target.onDeath(DamageSourceBloodMagic.INSTANCE); } return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 11a6381d..6dc81125 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -7,7 +7,7 @@ import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; @@ -97,10 +97,10 @@ public class ItemSacrificialDagger extends ItemEnum 0) { - entity.attackEntityFrom(PleaseStopUsingMe.damageSource, (float) incurredDamage); + entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, (float) incurredDamage); } return incurredDamage; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index 56e32be6..d81a2ace 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -198,7 +198,7 @@ public class RitualLava extends Ritual { } if (!entity.isDead && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity)) { - if (entity.attackEntityFrom(PleaseStopUsingMe.damageSource, damage)) { + if (entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, damage)) { corrosiveDrained += corrosiveWillDrain; corrosiveWill -= corrosiveWillDrain; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index 78e145ba..f480edc7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; @@ -92,7 +92,7 @@ public class RitualRegeneration extends Ritual { float currentHealth = damagedEntity.getHealth(); - damagedEntity.attackEntityFrom(PleaseStopUsingMe.damageSource, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); + damagedEntity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); float healthDifference = currentHealth - damagedEntity.getHealth(); if (healthDifference > 0) { diff --git a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java index 303bea5a..28a29658 100644 --- a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java @@ -7,6 +7,9 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; public class DamageSourceBloodMagic extends DamageSource { + + public static final DamageSourceBloodMagic INSTANCE = new DamageSourceBloodMagic(); + public DamageSourceBloodMagic() { super("bloodMagic"); diff --git a/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java deleted file mode 100644 index 368bd44e..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java +++ /dev/null @@ -1,16 +0,0 @@ -package WayofTime.bloodmagic.util; - -import net.minecraft.util.DamageSource; - -/** - * The primary API class. Includes helper methods and blacklists. - *

- * Some API methods can be used via IMC instead. The supported methods are: - */ -// TODO - Nuke this class -@Deprecated -public class PleaseStopUsingMe { - public static boolean loggingEnabled; - - public static DamageSource damageSource = new DamageSourceBloodMagic(); -} From dd6b5bd3b513000a1ad51c1344338e4062ae00f8 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 23 Mar 2018 11:02:43 -0400 Subject: [PATCH 141/493] Added an example item whose variants use the same textures but different colours for the layers. --- .../core/RegistrarBloodMagicItems.java | 30 +++++--- .../bloodmagic/item/ItemEnumColour.java | 67 ++++++++++++++++++ .../bloodmagic/item/types/AlchemicTypes.java | 59 +++++++++++++++ .../bloodmagic/proxy/ClientProxy.java | 57 +++++++++++---- .../ritual/types/RitualEllipsoid.java | 3 +- .../bloodmagic/blockstates/alchemic_vial.json | 18 +++++ .../textures/items/alchemic_liquid.png | Bin 0 -> 222 bytes .../textures/items/alchemic_ribbon.png | Bin 0 -> 200 bytes .../textures/items/alchemic_vial.png | Bin 0 -> 248 bytes 9 files changed, 209 insertions(+), 25 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java create mode 100644 src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json create mode 100644 src/main/resources/assets/bloodmagic/textures/items/alchemic_liquid.png create mode 100644 src/main/resources/assets/bloodmagic/textures/items/alchemic_ribbon.png create mode 100644 src/main/resources/assets/bloodmagic/textures/items/alchemic_vial.png diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 4afa594e..e7085209 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -16,10 +16,13 @@ import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; +import WayofTime.bloodmagic.item.types.AlchemicTypes; import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.item.types.ShardType; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -43,7 +46,8 @@ import java.util.Set; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @SuppressWarnings("unchecked") -public class RegistrarBloodMagicItems { +public class RegistrarBloodMagicItems +{ public static final Item BLOOD_ORB = Items.AIR; public static final Item ACTIVATION_CRYSTAL = Items.AIR; @@ -117,6 +121,7 @@ public class RegistrarBloodMagicItems { public static final Item POINTS_UPGRADE = Items.AIR; public static final Item DEMON_WILL_GAUGE = Items.AIR; public static final Item POTION_FLASK = Items.AIR; + public static final Item ALCHEMIC_VIAL = Items.AIR; public static Item.ToolMaterial BOUND_TOOL_MATERIAL = EnumHelper.addToolMaterial("bound", 4, 1, 10, 8, 50); public static Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("demonic", 4, 520, 7, 8, 50); @@ -124,10 +129,12 @@ public class RegistrarBloodMagicItems { public static List items; @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) { + public static void registerItems(RegistryEvent.Register event) + { items = Lists.newArrayList(); - RegistrarBloodMagicBlocks.blocks.stream().filter(block -> block instanceof IBMBlock && ((IBMBlock) block).getItem() != null).forEach(block -> { + RegistrarBloodMagicBlocks.blocks.stream().filter(block -> block instanceof IBMBlock && ((IBMBlock) block).getItem() != null).forEach(block -> + { IBMBlock bmBlock = (IBMBlock) block; items.add(bmBlock.getItem().setRegistryName(block.getRegistryName())); }); @@ -204,23 +211,27 @@ public class RegistrarBloodMagicItems { new ItemSanguineBook().setRegistryName("sanguine_book"), new ItemLivingArmourPointsUpgrade().setRegistryName("points_upgrade"), new ItemDemonWillGauge().setRegistryName("demon_will_gauge"), - new ItemPotionFlask().setRegistryName("potion_flask") - )); + new ItemPotionFlask().setRegistryName("potion_flask"), + new ItemEnumColour.Variant<>(AlchemicTypes.class, "alchemicVial").setRegistryName("alchemic_vial") + )); event.getRegistry().registerAll(items.toArray(new Item[0])); } @SideOnly(Side.CLIENT) @SubscribeEvent - public static void registerRenders(ModelRegistryEvent event) { - items.stream().filter(i -> i instanceof IVariantProvider).forEach(i -> { + public static void registerRenders(ModelRegistryEvent event) + { + items.stream().filter(i -> i instanceof IVariantProvider).forEach(i -> + { Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); ((IVariantProvider) i).gatherVariants(variants); for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) ModelLoader.setCustomModelResourceLocation(i, variant.getIntKey(), new ModelResourceLocation(i.getRegistryName(), variant.getValue())); }); - items.stream().filter(i -> i instanceof IMeshProvider).forEach(i -> { + items.stream().filter(i -> i instanceof IMeshProvider).forEach(i -> + { IMeshProvider mesh = (IMeshProvider) i; ResourceLocation loc = mesh.getCustomLocation(); if (loc == null) @@ -234,7 +245,8 @@ public class RegistrarBloodMagicItems { ModelLoader.setCustomMeshDefinition(i, mesh.getMeshDefinition()); }); - RegistrarBloodMagicBlocks.blocks.stream().filter(b -> b instanceof IVariantProvider).forEach(b -> { + RegistrarBloodMagicBlocks.blocks.stream().filter(b -> b instanceof IVariantProvider).forEach(b -> + { Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); ((IVariantProvider) b).gatherVariants(variants); for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java new file mode 100644 index 00000000..bb99c6a9 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java @@ -0,0 +1,67 @@ +package WayofTime.bloodmagic.item; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.types.ISubItem; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ItemEnumColour & ISubItem> extends Item +{ + //Copy of @ItemEnum, except all variants use the same textures with different colouring + protected final T[] types; + + public ItemEnumColour(Class enumClass, String baseName) + { + super(); + + this.types = enumClass.getEnumConstants(); + + setUnlocalizedName(BloodMagic.MODID + "." + baseName); + setHasSubtypes(types.length > 1); + setCreativeTab(BloodMagic.TAB_BM); + } + + @Override + public String getUnlocalizedName(ItemStack stack) + { + return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName(); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(CreativeTabs tab, NonNullList subItems) + { + if (!isInCreativeTab(tab)) + return; + + for (T type : types) + subItems.add(new ItemStack(this, 1, type.ordinal())); + } + + public T getItemType(ItemStack stack) + { + return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)]; + } + + public static class Variant & ISubItem> extends ItemEnum implements IVariantProvider + { + + public Variant(Class enumClass, String baseName) + { + super(enumClass, baseName); + } + + @Override + public void gatherVariants(Int2ObjectMap variants) + { + variants.put(0, "type=normal"); + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java new file mode 100644 index 00000000..35498ea0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java @@ -0,0 +1,59 @@ +package WayofTime.bloodmagic.item.types; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public enum AlchemicTypes implements ISubItem +{ + BASE(0x2e35ff); + + final int potionColour; + + AlchemicTypes(int colour1) + { + potionColour = colour1; + } + + @Nonnull + @Override + public String getInternalName() + { + return name().toLowerCase(Locale.ROOT); + } + + @Nonnull + @Override + public ItemStack getStack() + { + return getStack(1); + } + + @Nonnull + @Override + public ItemStack getStack(int count) + { + return new ItemStack(RegistrarBloodMagicItems.ALCHEMIC_VIAL, count, ordinal()); + } + + public int getColourForLayer(int layer) + { + if (layer == 0) + { + return potionColour; + } + return -1; + } + + public static int getColourForLayer(int variant, int layer) + { + if (variant >= AlchemicTypes.values().length) + { + return -1; + } + + return AlchemicTypes.values()[variant].getColourForLayer(layer); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 1f8ff251..b6cc9e64 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -13,12 +13,15 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.item.types.AlchemicTypes; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Constants; + import com.google.common.collect.ImmutableMap; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; @@ -37,18 +40,22 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import java.awt.Color; import java.util.Map; -public class ClientProxy extends CommonProxy { +public class ClientProxy extends CommonProxy +{ public static DemonWillHolder currentAura = new DemonWillHolder(); @Override - public void preInit() { + public void preInit() + { super.preInit(); OBJLoader.INSTANCE.addDomain(BloodMagic.MODID); - ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR() { + ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR() + { @Override - public void handleEvents(TileInversionPillar chest, float time, Iterable pastEvents) { + public void handleEvents(TileInversionPillar chest, float time, Iterable pastEvents) + { chest.handleEvents(time, pastEvents); } }); @@ -66,7 +73,8 @@ public class ClientProxy extends CommonProxy { } @Override - public void registerRenderers() { + public void registerRenderers() + { RenderingRegistry.registerEntityRenderingHandler(EntitySoulSnare.class, new SoulSnareRenderFactory()); RenderingRegistry.registerEntityRenderingHandler(EntitySentientArrow.class, new SentientArrowRenderFactory()); RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new BloodLightRenderFactory()); @@ -82,19 +90,24 @@ public class ClientProxy extends CommonProxy { } @Override - public void init() { + public void init() + { super.init(); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { - try { + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + { + try + { if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) if (tintIndex == 1) return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); - } catch (NumberFormatException e) { + } catch (NumberFormatException e) + { return -1; } return -1; }, RegistrarBloodMagicItems.SIGIL_HOLDING); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + { if (tintIndex != 0 && tintIndex != 2) return -1; @@ -103,29 +116,43 @@ public class ClientProxy extends CommonProxy { return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack)); }, RegistrarBloodMagicItems.POTION_FLASK); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + { +// if (tintIndex != 0 && tintIndex != 2) +// return -1; + + int variant = stack.getMetadata(); + + return AlchemicTypes.getColourForLayer(variant, tintIndex); + }, RegistrarBloodMagicItems.ALCHEMIC_VIAL); addElytraLayer(); } @Override - public void postInit() { + public void postInit() + { Elements.createHUDElements(); } - private void addElytraLayer() { + private void addElytraLayer() + { RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); - try { + try + { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); BMLog.DEBUG.info("Elytra layer added"); - } catch (Exception e) { + } catch (Exception e) + { BMLog.DEBUG.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade: {}", e.getMessage()); } } @Override - public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) { + public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) + { return ModelLoaderRegistry.loadASM(location, parameters); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index 1def76f5..2b454edb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -215,7 +215,8 @@ public class RitualEllipsoid extends Ritual // } @Override - public void gatherComponents(Consumer components) { + public void gatherComponents(Consumer components) + { addCornerRunes(components, 1, 0, EnumRuneType.WATER); addCornerRunes(components, 1, 1, EnumRuneType.WATER); } diff --git a/src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json b/src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json new file mode 100644 index 00000000..74f8af30 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "normal": { + "textures": { + "layer0": "bloodmagic:items/Alchemic_Liquid", + "layer1": "bloodmagic:items/Alchemic_Vial", + "layer2": "bloodmagic:items/Alchemic_Ribbon" + } + } + } + } +} diff --git a/src/main/resources/assets/bloodmagic/textures/items/alchemic_liquid.png b/src/main/resources/assets/bloodmagic/textures/items/alchemic_liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..4930364ff3048c8b16e4e2414a839e6cc50b552c GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(}#5xOlqRR-g!Hfk$L9 z0|U1(2s1Lwnj--eWH0gbb!C6VEG8l)-`p_I0w^S#84^+AoS&PUnpXnkGB7w7r6!i7 zrYMwWmSiZnd-?{X=%um)#hpA|978NlCnrd-x-|a>g5?p#Sy`{@H<_%D-u~|YiZrRL zv^K+_;NbuNe|~OH{Qd1M&*t>=X)4zk)Kd6X&SD3e5m4usS9k8jB#Uf#N!zE{-7^>bP0l+XkKb>A^_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodmagic/textures/items/alchemic_vial.png b/src/main/resources/assets/bloodmagic/textures/items/alchemic_vial.png new file mode 100644 index 0000000000000000000000000000000000000000..3062b21d8f4cfb9411f7463ccca7a95451218cac GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(}+JEQTFn-eEwBv%n*= zn1O*?7=#%aX3dcR3bL1Y`ns||VipsUSHD!TE)Xarn;8;O;+&tGo0?Yw Date: Fri, 23 Mar 2018 13:24:33 -0400 Subject: [PATCH 142/493] *Hopefully* make Nut cry a bit less. --- .../core/RegistrarBloodMagicItems.java | 2 +- .../bloodmagic/item/ItemAlchemicVial.java | 22 ++++++ .../bloodmagic/item/ItemEnumColour.java | 67 ------------------- 3 files changed, 23 insertions(+), 68 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index e7085209..0d9abfe8 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -212,7 +212,7 @@ public class RegistrarBloodMagicItems new ItemLivingArmourPointsUpgrade().setRegistryName("points_upgrade"), new ItemDemonWillGauge().setRegistryName("demon_will_gauge"), new ItemPotionFlask().setRegistryName("potion_flask"), - new ItemEnumColour.Variant<>(AlchemicTypes.class, "alchemicVial").setRegistryName("alchemic_vial") + new ItemAlchemicVial().setRegistryName("alchemic_vial") )); event.getRegistry().registerAll(items.toArray(new Item[0])); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java b/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java new file mode 100644 index 00000000..520bbcb6 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.item; + +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; + +import javax.annotation.Nonnull; + +import WayofTime.bloodmagic.item.types.AlchemicTypes; +import WayofTime.bloodmagic.item.types.ISubItem; + +public class ItemAlchemicVial & ISubItem> extends ItemEnum.Variant +{ + public ItemAlchemicVial() + { + super((Class) AlchemicTypes.class, "alchemic_vial"); + } + + @Override + public void gatherVariants(@Nonnull Int2ObjectMap variants) + { + variants.put(0, "type=normal"); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java deleted file mode 100644 index bb99c6a9..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnumColour.java +++ /dev/null @@ -1,67 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.types.ISubItem; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class ItemEnumColour & ISubItem> extends Item -{ - //Copy of @ItemEnum, except all variants use the same textures with different colouring - protected final T[] types; - - public ItemEnumColour(Class enumClass, String baseName) - { - super(); - - this.types = enumClass.getEnumConstants(); - - setUnlocalizedName(BloodMagic.MODID + "." + baseName); - setHasSubtypes(types.length > 1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public String getUnlocalizedName(ItemStack stack) - { - return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName(); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs tab, NonNullList subItems) - { - if (!isInCreativeTab(tab)) - return; - - for (T type : types) - subItems.add(new ItemStack(this, 1, type.ordinal())); - } - - public T getItemType(ItemStack stack) - { - return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)]; - } - - public static class Variant & ISubItem> extends ItemEnum implements IVariantProvider - { - - public Variant(Class enumClass, String baseName) - { - super(enumClass, baseName); - } - - @Override - public void gatherVariants(Int2ObjectMap variants) - { - variants.put(0, "type=normal"); - } - } -} From cdfc77be036d1fba7a7dd2161819c23a4d96c4b6 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 23 Mar 2018 16:18:16 -0700 Subject: [PATCH 143/493] Cleanup ritual events (#1256) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also actually fire the imperfect one ¬_¬ --- .../block/BlockRitualController.java | 11 ++- .../bloodmagic/event/RitualEvent.java | 67 +++++++++++++++---- .../tile/TileMasterRitualStone.java | 6 +- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 756dea87..e1c71e8f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.event.RitualEvent; import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.Ritual; @@ -26,6 +28,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import javax.annotation.Nullable; @@ -66,9 +69,13 @@ public class BlockRitualController extends BlockEnum imple } } } else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone) { - IBlockState ritualBlock = world.getBlockState(pos.up()); - return ((TileImperfectRitualStone) tile).performRitual(world, pos, ImperfectRitualRegistry.getRitualForBlock(ritualBlock), player); + ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(ritualBlock); + if (ritual == null) + return false; + + RitualEvent.ImperfectRitualActivatedEvent event = new RitualEvent.ImperfectRitualActivatedEvent((IImperfectRitualStone) tile, player, ritual); + return !MinecraftForge.EVENT_BUS.post(event) && ((TileImperfectRitualStone) tile).performRitual(world, pos, ritual, player); } return false; diff --git a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java index a76ceb7d..08d94f85 100644 --- a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java @@ -13,9 +13,10 @@ import net.minecraftforge.fml.common.eventhandler.Event; import java.util.UUID; public class RitualEvent extends Event { - public final IMasterRitualStone mrs; - public final UUID ownerId; - public final Ritual ritual; + + private final IMasterRitualStone mrs; + private final UUID ownerId; + private final Ritual ritual; private RitualEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) { this.mrs = mrs; @@ -23,6 +24,18 @@ public class RitualEvent extends Event { this.ritual = ritual; } + public IMasterRitualStone getRitualStone() { + return mrs; + } + + public UUID getOwnerId() { + return ownerId; + } + + public Ritual getRitual() { + return ritual; + } + /** * This event is called when a ritual is activated. If cancelled, it will * not activate. @@ -31,9 +44,10 @@ public class RitualEvent extends Event { */ @Cancelable public static class RitualActivatedEvent extends RitualEvent { - public final EntityPlayer player; - public final ItemStack crystalStack; - public int crystalTier; + + private final EntityPlayer player; + private final ItemStack crystalStack; + private final int crystalTier; public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, EntityPlayer player, ItemStack activationCrystal, int crystalTier) { super(mrs, ownerId, ritual); @@ -42,6 +56,18 @@ public class RitualEvent extends Event { this.crystalStack = activationCrystal; this.crystalTier = crystalTier; } + + public EntityPlayer getPlayer() { + return player; + } + + public ItemStack getCrystalStack() { + return crystalStack; + } + + public int getCrystalTier() { + return crystalTier; + } } /** @@ -52,6 +78,7 @@ public class RitualEvent extends Event { */ @Cancelable public static class RitualRunEvent extends RitualEvent { + public RitualRunEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) { super(mrs, ownerId, ritual); } @@ -65,26 +92,42 @@ public class RitualEvent extends Event { */ public static class RitualStopEvent extends RitualEvent { - public final Ritual.BreakType method; + private final Ritual.BreakType method; public RitualStopEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, Ritual.BreakType method) { super(mrs, ownerId, ritual); this.method = method; } + + public Ritual.BreakType getMethod() { + return method; + } } @Cancelable public static class ImperfectRitualActivatedEvent extends Event { - public final IImperfectRitualStone ims; - public final UUID ownerId; - public final ImperfectRitual imperfectRitual; + private final IImperfectRitualStone ims; + private final EntityPlayer activator; + private final ImperfectRitual imperfectRitual; - public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, UUID ownerId, ImperfectRitual imperfectRitual) { + public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, EntityPlayer activator, ImperfectRitual imperfectRitual) { this.ims = ims; - this.ownerId = ownerId; + this.activator = activator; this.imperfectRitual = imperfectRitual; } + + public IImperfectRitualStone getRitualStone() { + return ims; + } + + public EntityPlayer getActivator() { + return activator; + } + + public ImperfectRitual getImperfectRitual() { + return imperfectRitual; + } } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index fd8fcca1..182b2cf3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -140,7 +140,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, binding.getOwnerId(), ritual, activator, activationCrystal, crystalLevel); - if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) { + if (MinecraftForge.EVENT_BUS.post(event)) { if (activator != null) activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.prevent"), true); return false; @@ -181,7 +181,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (RitualHelper.checkValidRitual(getWorld(), getPos(), RitualRegistry.getIdForRitual(currentRitual), getDirection())) { RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), getCurrentRitual()); - if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) + if (MinecraftForge.EVENT_BUS.post(event)) return; getCurrentRitual().performRitual(this); @@ -196,7 +196,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (!getWorld().isRemote && getCurrentRitual() != null) { RitualEvent.RitualStopEvent event = new RitualEvent.RitualStopEvent(this, getOwner(), getCurrentRitual(), breakType); - if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) + if (MinecraftForge.EVENT_BUS.post(event)) return; getCurrentRitual().stopRitual(this, breakType); From 7ec27febc691d5bf660a2931c6b1a7452a49061b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 23 Mar 2018 16:42:18 -0700 Subject: [PATCH 144/493] Apply same model to all alchemic vials --- .../bloodmagic/core/RegistrarBloodMagicItems.java | 1 - .../bloodmagic/item/ItemAlchemicVial.java | 15 ++++++--------- .../{AlchemicTypes.java => AlchemicVialType.java} | 15 ++++----------- .../WayofTime/bloodmagic/proxy/ClientProxy.java | 4 ++-- 4 files changed, 12 insertions(+), 23 deletions(-) rename src/main/java/WayofTime/bloodmagic/item/types/{AlchemicTypes.java => AlchemicVialType.java} (73%) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 0d9abfe8..caa674b9 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -16,7 +16,6 @@ import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; import WayofTime.bloodmagic.item.sigil.*; import WayofTime.bloodmagic.item.soul.*; -import WayofTime.bloodmagic.item.types.AlchemicTypes; import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.item.types.ShardType; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java b/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java index 520bbcb6..bd75cd4a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java @@ -1,22 +1,19 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.item.types.AlchemicVialType; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import javax.annotation.Nonnull; - -import WayofTime.bloodmagic.item.types.AlchemicTypes; -import WayofTime.bloodmagic.item.types.ISubItem; - -public class ItemAlchemicVial & ISubItem> extends ItemEnum.Variant +public class ItemAlchemicVial extends ItemEnum.Variant { public ItemAlchemicVial() { - super((Class) AlchemicTypes.class, "alchemic_vial"); + super(AlchemicVialType.class, "alchemic_vial"); } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) + public void gatherVariants(Int2ObjectMap variants) { - variants.put(0, "type=normal"); + for (AlchemicVialType type : types) + variants.put(type.ordinal(), "type=normal"); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java similarity index 73% rename from src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java rename to src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java index 35498ea0..db637b99 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicTypes.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; import java.util.Locale; -public enum AlchemicTypes implements ISubItem +public enum AlchemicVialType implements ISubItem { BASE(0x2e35ff); final int potionColour; - AlchemicTypes(int colour1) + AlchemicVialType(int colour1) { potionColour = colour1; } @@ -24,13 +24,6 @@ public enum AlchemicTypes implements ISubItem return name().toLowerCase(Locale.ROOT); } - @Nonnull - @Override - public ItemStack getStack() - { - return getStack(1); - } - @Nonnull @Override public ItemStack getStack(int count) @@ -49,11 +42,11 @@ public enum AlchemicTypes implements ISubItem public static int getColourForLayer(int variant, int layer) { - if (variant >= AlchemicTypes.values().length) + if (variant >= AlchemicVialType.values().length) { return -1; } - return AlchemicTypes.values()[variant].getColourForLayer(layer); + return AlchemicVialType.values()[variant].getColourForLayer(layer); } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index b6cc9e64..87256a18 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -13,7 +13,7 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.item.types.AlchemicTypes; +import WayofTime.bloodmagic.item.types.AlchemicVialType; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; @@ -123,7 +123,7 @@ public class ClientProxy extends CommonProxy int variant = stack.getMetadata(); - return AlchemicTypes.getColourForLayer(variant, tintIndex); + return AlchemicVialType.getColourForLayer(variant, tintIndex); }, RegistrarBloodMagicItems.ALCHEMIC_VIAL); addElytraLayer(); From 58d9678c40e9d2815bc3d356b37b82586c837d7b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 23 Mar 2018 16:50:17 -0700 Subject: [PATCH 145/493] Switch some more instances of chat spam to the action bar --- .../WayofTime/bloodmagic/item/ItemAltarMaker.java | 14 +++++++------- .../bloodmagic/item/ItemRitualDiviner.java | 2 +- .../bloodmagic/item/ItemRitualReader.java | 2 +- .../bloodmagic/item/ItemSanguineBook.java | 3 ++- .../util/handler/event/GenericHandler.java | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index b299b030..e1da3b10 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -5,7 +5,6 @@ import WayofTime.bloodmagic.altar.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NumeralHelper; @@ -21,6 +20,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -54,7 +54,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP return super.onItemRightClick(world, player, hand); if (!player.capabilities.isCreativeMode) { - ChatUtil.sendNoSpam(player, TextHelper.localizeEffect("chat.bloodmagic.altarMaker.creativeOnly")); + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.creativeOnly"), true); return super.onItemRightClick(world, player, hand); } @@ -67,18 +67,18 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); setTierToBuild(AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]); - ChatUtil.sendNoSpam(player, TextHelper.localizeEffect("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1))); + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); return super.onItemRightClick(world, player, hand); } RayTraceResult rayTrace = rayTrace(world, player, false); - if (rayTrace == null || rayTrace.typeOfHit == RayTraceResult.Type.MISS || rayTrace.typeOfHit == RayTraceResult.Type.ENTITY) + if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) return super.onItemRightClick(world, player, hand); - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK && world.getBlockState(rayTrace.getBlockPos()).getBlock() instanceof BlockAltar) { - ChatUtil.sendNoSpam(player, TextHelper.localizeEffect("chat.bloodmagic.altarMaker.building", NumeralHelper.toRoman(tierToBuild.toInt()))); + IBlockState state = world.getBlockState(rayTrace.getBlockPos()); + if (state.getBlock() instanceof BlockAltar) { + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.building", NumeralHelper.toRoman(tierToBuild.toInt())), true); buildAltar(world, rayTrace.getBlockPos()); - IBlockState state = world.getBlockState(rayTrace.getBlockPos()); world.notifyBlockUpdate(rayTrace.getBlockPos(), state, state, 3); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 1de11784..e55a482d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -366,7 +366,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } public void notifyDirectionChange(EnumFacing direction, EntityPlayer player) { - ChatUtil.sendNoSpam(player, TextHelper.localize(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.getName()))); + player.sendStatusMessage(new TextComponentTranslation(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.name())), true); } public void setDirection(ItemStack stack, EnumFacing direction) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 9cc9c6df..cdabfa3a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -136,7 +136,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { BlockPos containedPos = getBlockPos(stack); if (containedPos.equals(BlockPos.ORIGIN)) { this.setBlockPos(stack, pos.subtract(masterPos)); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.blockRange.firstBlock")); + player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.firstBlock"), true); //TODO: Notify player. } else { tile = world.getTileEntity(masterPos); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index ec2457d6..ca2d37f9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -25,6 +25,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -79,7 +80,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); currentDisplayedTier = AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]; - ChatUtil.sendNoSpam(player, TextHelper.localizeEffect("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1))); + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 8ba5b079..0dff68cc 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -59,6 +59,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -298,7 +299,7 @@ public class GenericHandler { Block block = state.getBlock(); if (block instanceof BlockAltar && event.getEntityPlayer() != null && event.getEntityPlayer() instanceof EntityPlayerMP && !event.getEntityPlayer().getHeldItemMainhand().isEmpty() && event.getEntityPlayer().getHeldItemMainhand().getItem() instanceof ItemAltarMaker) { ItemAltarMaker altarMaker = (ItemAltarMaker) event.getEntityPlayer().getHeldItemMainhand().getItem(); - ChatUtil.sendNoSpam(event.getEntityPlayer(), TextHelper.localizeEffect("chat.bloodmagic.altarMaker.destroy", altarMaker.destroyAltar(event.getEntityPlayer()))); + event.getEntityPlayer().sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.destroy", altarMaker.destroyAltar(event.getEntityPlayer())), true); } } From 8dce5927879cc42d2034e6da17acad3337b8ffeb Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 23 Mar 2018 17:12:32 -0700 Subject: [PATCH 146/493] Fix out of bounds on invalid enum items --- src/main/java/WayofTime/bloodmagic/item/ItemEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index e949e446..0fed5b36 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -42,7 +42,7 @@ public class ItemEnum & ISubItem> extends Item { } public T getItemType(ItemStack stack) { - return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)]; + return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length - 1)]; } public static class Variant & ISubItem> extends ItemEnum implements IVariantProvider { From 6e7b387e6ad1b945152c7652c4862463c7edf3ab Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 29 Mar 2018 16:05:56 -0400 Subject: [PATCH 147/493] Added additional effects to the Sentient Bow when aspected to different Will types. --- changelog.txt | 1 + .../projectile/EntitySentientArrow.java | 113 +++++++-- .../bloodmagic/item/soul/ItemSentientBow.java | 228 +++++++++++------- 3 files changed, 245 insertions(+), 97 deletions(-) diff --git a/changelog.txt b/changelog.txt index e27942ad..4716494f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,7 @@ Version 2.2.8 - Added a new (slightly WIP?) array, the Turret Array: - Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. - Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. +- Added additional effects to the Sentient Bow when aspected to different Will types. ------------------------------------------------------ Version 2.2.7 diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index b4950f64..1e91024e 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,41 +1,59 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import java.util.Locale; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityTippedArrow; import net.minecraft.init.Items; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; -import java.util.Locale; - -public class EntitySentientArrow extends EntityTippedArrow { +public class EntitySentientArrow extends EntityTippedArrow +{ public double reimbursedAmountOnHit = 0; public EnumDemonWillType type = EnumDemonWillType.DEFAULT; + public int currentLevel = 0; + public float[] destructiveExplosionRadius = { 0.5f, 1, 1.5f, 2, 2.5f, 3, 3.5f }; + public int[] poisonDuration = { 50, 100, 150, 80, 120, 160, 200 }; + public int[] poisonLevel = { 0, 0, 0, 1, 1, 1, 1 }; + public int[] levitationDuration = { 20, 40, 60, 80, 100, 120, 160 }; + public int[] levitationLevel = { 0, 0, 0, 1, 1, 1, 2 }; + public int[] slownessDuration = { 40, 60, 100, 150, 200, 250, 300 }; + public int[] slownessLevel = { 0, 0, 0, 1, 1, 1, 2 }; - public EntitySentientArrow(World worldIn) { + public EntitySentientArrow(World worldIn) + { super(worldIn); } - public EntitySentientArrow(World worldIn, double x, double y, double z) { + public EntitySentientArrow(World worldIn, double x, double y, double z) + { super(worldIn, x, y, z); } - public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reinburseAmount) { + public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reinburseAmount, int currentLevel) + { super(worldIn, shooter); this.reimbursedAmountOnHit = reinburseAmount; this.type = type; + this.currentLevel = currentLevel; } - public void reimbursePlayer(EntityLivingBase hitEntity, float damage) { - if (this.shootingEntity instanceof EntityPlayer) { - if (hitEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(hitEntity instanceof IMob)) { + public void reimbursePlayer(EntityLivingBase hitEntity, float damage) + { + if (this.shootingEntity instanceof EntityPlayer) + { + if (hitEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(hitEntity instanceof IMob)) + { return; } @@ -44,23 +62,88 @@ public class EntitySentientArrow extends EntityTippedArrow { } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + protected void arrowHit(EntityLivingBase living) + { + super.arrowHit(living); + + switch (type) + { + case CORROSIVE: + living.addPotionEffect(new PotionEffect(MobEffects.POISON, currentLevel >= 0 ? poisonDuration[currentLevel] : 0, currentLevel >= 0 ? poisonLevel[currentLevel] : 0)); + break; + case DEFAULT: + break; + case DESTRUCTIVE: + this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); + break; + case STEADFAST: + living.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, currentLevel >= 0 ? levitationDuration[currentLevel] : 0, currentLevel >= 0 ? levitationLevel[currentLevel] : 0)); + break; + case VENGEFUL: + living.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, currentLevel >= 0 ? slownessDuration[currentLevel] : 0, currentLevel >= 0 ? slownessLevel[currentLevel] : 0)); + break; + default: + break; + } + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + if (!this.world.isRemote && this.inGround && this.timeInGround > 0) + { + switch (type) + { + case DESTRUCTIVE: + this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); + this.setDead(); + break; + case CORROSIVE: + break; + case DEFAULT: + break; + case STEADFAST: + break; + case VENGEFUL: + break; + default: + break; + } + } +// else if (this.inGround && this.timeInGround != 0 && !this.customPotionEffects.isEmpty() && this.timeInGround >= 600) +// { +// this.world.setEntityState(this, (byte)0); +// this.potion = PotionTypes.EMPTY; +// this.customPotionEffects.clear(); +// this.dataManager.set(COLOR, Integer.valueOf(-1)); +// } + } + + @Override + public void writeEntityToNBT(NBTTagCompound tag) + { super.writeEntityToNBT(tag); tag.setDouble("reimbursement", reimbursedAmountOnHit); + tag.setInteger("currentLevel", currentLevel); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(NBTTagCompound tag) + { super.readEntityFromNBT(tag); reimbursedAmountOnHit = tag.getDouble("reimbursement"); type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); + currentLevel = tag.getInteger("currentLevel"); } @Override - protected ItemStack getArrowStack() { + protected ItemStack getArrowStack() + { return new ItemStack(Items.ARROW); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index b4b104bc..70e48450 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -40,56 +40,68 @@ import java.util.Locale; public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider { - public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; - public static double[] defaultDamageAdded = new double[]{0.25, 0.5, 0.75, 1, 1.25}; - public static float[] velocityAdded = new float[]{0.25f, 0.5f, 0.75f, 1, 1.25f}; - public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75}; //TODO - public static double[] soulDrop = new double[]{2, 4, 7, 10, 13}; - public static double[] staticDrop = new double[]{1, 1, 2, 3, 3}; + public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000, 2000, 4000 }; + public static double[] defaultDamageAdded = new double[] { 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75 }; + public static float[] velocityAdded = new float[] { 0.25f, 0.5f, 0.75f, 1, 1.25f, 1.5f, 1.75f }; + public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5 }; //TODO + public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13, 16, 24 }; + public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3, 3, 4 }; - public ItemSentientBow() { + public ItemSentientBow() + { super(); setUnlocalizedName(BloodMagic.MODID + ".sentientBow"); setCreativeTab(BloodMagic.TAB_BM); - this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() { + this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() + { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { - if (entityIn == null) { + public float apply(ItemStack stack, World world, EntityLivingBase entityIn) + { + if (entityIn == null) + { return 0.0F; - } else { + } else + { ItemStack itemstack = entityIn.getActiveItemStack(); return !itemstack.isEmpty() && itemstack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F; } } }); - this.addPropertyOverride(new ResourceLocation("pulling"), new IItemPropertyGetter() { + this.addPropertyOverride(new ResourceLocation("pulling"), new IItemPropertyGetter() + { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { + public float apply(ItemStack stack, World world, EntityLivingBase entityIn) + { return entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F; } }); - this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { + this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() + { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { + public float apply(ItemStack stack, World world, EntityLivingBase entityIn) + { return ((ItemSentientBow) RegistrarBloodMagicItems.SENTIENT_BOW).getCurrentType(stack).ordinal(); } }); } @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { + public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) + { return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { + public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) + { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); recalculatePowers(stack, type, soulsRemaining); } - public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) { + public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) + { this.setCurrentType(stack, will > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, will); + int level = getLevel(will); // double drain = level >= 0 ? soulDrainPerSwing[level] : 0; @@ -108,10 +120,13 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien setDamageAdded(stack, level >= 0 ? getDamageModifier(type, level) : 0); } - private int getLevel(ItemStack stack, double soulsRemaining) { + private int getLevel(double soulsRemaining) + { int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) { - if (soulsRemaining >= soulBracket[i]) { + for (int i = 0; i < soulBracket.length; i++) + { + if (soulsRemaining >= soulBracket[i]) + { lvl = i; } } @@ -120,42 +135,49 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { + public EnumDemonWillType getCurrentType(ItemStack stack) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { + if (!tag.hasKey(Constants.NBT.WILL_TYPE)) + { return EnumDemonWillType.DEFAULT; } return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); } - public double getDamageModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return 0; - case DEFAULT: - case CORROSIVE: - case DESTRUCTIVE: - case STEADFAST: - return defaultDamageAdded[willBracket]; + public double getDamageModifier(EnumDemonWillType type, int willBracket) + { + switch (type) + { + case VENGEFUL: + return 0; + case DEFAULT: + case CORROSIVE: + case DESTRUCTIVE: + case STEADFAST: + return defaultDamageAdded[willBracket]; } return 0; } - public float getVelocityModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return velocityAdded[willBracket]; - default: - return 0; + public float getVelocityModifier(EnumDemonWillType type, int willBracket) + { + switch (type) + { + case VENGEFUL: + return velocityAdded[willBracket]; + default: + return 0; } } - public void setDamageAdded(ItemStack stack, double damage) { + public void setDamageAdded(ItemStack stack, double damage) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -163,7 +185,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setDouble("damage", damage); } - public double getDamageAdded(ItemStack stack) { + public double getDamageAdded(ItemStack stack) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -171,7 +194,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien return tag.getDouble("damage"); } - public void setVelocityOfArrow(ItemStack stack, float velocity) { + public void setVelocityOfArrow(ItemStack stack, float velocity) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -179,19 +203,22 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setFloat("velocity", velocity); } - public float getVelocityOfArrow(ItemStack stack) { + public float getVelocityOfArrow(ItemStack stack) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); - if (tag.hasKey("velocity")) { + if (tag.hasKey("velocity")) + { return tag.getFloat("velocity"); } return 3; } - public void setCurrentType(ItemStack stack, EnumDemonWillType type) { + public void setCurrentType(ItemStack stack, EnumDemonWillType type) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -199,14 +226,16 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } - public double getDrainOfActivatedBow(ItemStack stack) { + public double getDrainOfActivatedBow(ItemStack stack) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } - public void setDrainOfActivatedBow(ItemStack stack, double drain) { + public void setDrainOfActivatedBow(ItemStack stack, double drain) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -214,14 +243,16 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } - public double getStaticDropOfActivatedBow(ItemStack stack) { + public double getStaticDropOfActivatedBow(ItemStack stack) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } - public void setStaticDropOfActivatedBow(ItemStack stack, double drop) { + public void setStaticDropOfActivatedBow(ItemStack stack, double drop) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -229,14 +260,16 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } - public double getDropOfActivatedBow(ItemStack stack) { + public double getDropOfActivatedBow(ItemStack stack) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } - public void setDropOfActivatedBow(ItemStack stack, double drop) { + public void setDropOfActivatedBow(ItemStack stack, double drop) + { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -245,24 +278,28 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + { ItemStack stack = player.getHeldItem(hand); this.recalculatePowers(stack, world, player); return super.onItemRightClick(world, player, hand); } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { + public void gatherVariants(@Nonnull Int2ObjectMap variants) + { variants.put(0, "inventory"); } - public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) { + public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) + { EnumDemonWillType type = this.getCurrentType(stack); double amount = user instanceof EntityPlayer ? (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)) : 0; float newArrowVelocity = velocity * getVelocityOfArrow(stack); - EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount); + double soulsRemaining = user instanceof EntityPlayer ? (PlayerDemonWillHandler.getTotalDemonWill(type, (EntityPlayer) user)) : 0; + EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount, getLevel(soulsRemaining)); double d0 = target.posX - user.posX; double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entityArrow.posY; @@ -270,12 +307,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); entityArrow.shoot(d0, d1 + d3 * 0.05, d2, newArrowVelocity, 0); - if (newArrowVelocity == 0) { + if (newArrowVelocity == 0) + { world.playSound(null, user.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); return null; } - if (velocity == 1.0F) { + if (velocity == 1.0F) + { entityArrow.setIsCritical(true); } @@ -285,11 +324,13 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - if (k > 0) { + if (k > 0) + { entityArrow.setKnockbackStrength(k); } - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) + { entityArrow.setFire(100); } @@ -299,8 +340,10 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) { - if (entityLiving instanceof EntityPlayer) { + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) + { + if (entityLiving instanceof EntityPlayer) + { EntityPlayer player = (EntityPlayer) entityLiving; boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; ItemStack itemstack = this.getFiredArrow(player); @@ -310,17 +353,21 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien if (i < 0) return; - if (itemstack != null || flag) { - if (itemstack == null) { + if (itemstack != null || flag) + { + if (itemstack == null) + { itemstack = new ItemStack(Items.ARROW); } float arrowVelocity = getArrowVelocity(i); - if ((double) arrowVelocity >= 0.1D) { + if ((double) arrowVelocity >= 0.1D) + { boolean flag1 = flag && itemstack.getItem() == Items.ARROW; //Forge: Fix consuming custom arrows. - if (!world.isRemote) { + if (!world.isRemote) + { this.recalculatePowers(stack, world, player); EnumDemonWillType type = this.getCurrentType(stack); @@ -331,15 +378,18 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); - EntitySentientArrow entityArrow = new EntitySentientArrow(world, entityLiving, type, amount); + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + EntitySentientArrow entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining)); entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); - if (newArrowVelocity == 0) { + if (newArrowVelocity == 0) + { world.playSound(null, player.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); return; } - if (arrowVelocity == 1.0F) { + if (arrowVelocity == 1.0F) + { entityArrow.setIsCritical(true); } @@ -349,17 +399,20 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - if (k > 0) { + if (k > 0) + { entityArrow.setKnockbackStrength(k); } - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) + { entityArrow.setFire(100); } stack.damageItem(1, player); - if (flag1) { + if (flag1) + { entityArrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; } @@ -368,10 +421,12 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + arrowVelocity * 0.5F); - if (!flag1) { + if (!flag1) + { itemstack.shrink(1); - if (itemstack.isEmpty()) { + if (itemstack.isEmpty()) + { player.inventory.deleteStack(itemstack); } } @@ -382,16 +437,22 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } } - protected ItemStack getFiredArrow(EntityPlayer player) { - if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) { + protected ItemStack getFiredArrow(EntityPlayer player) + { + if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) + { return player.getHeldItem(EnumHand.OFF_HAND); - } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) { + } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) + { return player.getHeldItem(EnumHand.MAIN_HAND); - } else { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { + } else + { + for (int i = 0; i < player.inventory.getSizeInventory(); ++i) + { ItemStack itemstack = player.inventory.getStackInSlot(i); - if (this.isArrow(itemstack)) { + if (this.isArrow(itemstack)) + { return itemstack; } } @@ -401,14 +462,17 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) + { World world = player.getEntityWorld(); - if (!world.isRemote) { + if (!world.isRemote) + { this.recalculatePowers(droppedStack, world, player); EnumDemonWillType type = this.getCurrentType(droppedStack); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) { + if (soulsRemaining < 1024) + { return false; } From b7adad76e7e84fdc47f26414eb1c37a1ce45ff59 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 30 Mar 2018 07:15:38 -0400 Subject: [PATCH 148/493] Added in book entries for the Teleport Array and the Turret Array. --- changelog.txt | 3 ++- .../AlchemyArrayEffectTeleport.java | 12 ++--------- .../compat/guideapi/book/CategoryAlchemy.java | 20 +++++++++++++++++++ .../bloodmagic/registry/ModRecipes.java | 2 +- .../assets/bloodmagicguide/lang/en_US.lang | 8 +++++++- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/changelog.txt b/changelog.txt index 4716494f..c7161c82 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,10 +5,11 @@ Version 2.2.8 - It's a bright idea to fix this as soon as I can. - Changed the recipe of the Teleport Array: - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! -- Added a new (slightly WIP?) array, the Turret Array: +- Added a new array, the Turret Array: - Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. - Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. - Added additional effects to the Sentient Bow when aspected to different Will types. +- Added in book entries for the Teleport Array and the Turret Array. ------------------------------------------------------ Version 2.2.7 diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java index 47d0e935..9437e86b 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketUpdateHealth; -import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; @@ -37,15 +36,9 @@ public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect @Override public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { + EnumFacing direction = array.getRotation(); - { - double motionY = 0.5; - double speed = 3; - EnumFacing direction = array.getRotation(); - - teleportEntityInDirection(world, pos, entity, direction); - } - + teleportEntityInDirection(world, pos, entity, direction); } public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, EnumFacing direction) @@ -66,7 +59,6 @@ public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect entity.timeUntilPortal = TELEPORT_DELAY; if (!world.isRemote) { - Potion d; if (entity instanceof EntityPlayer) { EntityPlayerMP player = (EntityPlayerMP) entity; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index a167ea9b..bbf67db9 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -93,6 +93,26 @@ public class CategoryAlchemy bouncePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bounce" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "bounce"), new EntryText(bouncePages, TextHelper.localize(keyBase + "bounce"), true)); + List teleportPages = new ArrayList<>(); + + PageAlchemyArray teleportRecipePage = BookUtils.getAlchemyPage("teleport"); + if (teleportRecipePage != null) + { + teleportPages.add(teleportRecipePage); + } + teleportPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleport" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "teleport"), new EntryText(teleportPages, TextHelper.localize(keyBase + "teleport"), true)); + + List standardTurretPages = new ArrayList<>(); + + PageAlchemyArray standardTurretRecipePage = BookUtils.getAlchemyPage("turret"); + if (standardTurretRecipePage != null) + { + standardTurretPages.add(standardTurretRecipePage); + } + standardTurretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "standardTurret" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "standardTurret"), new EntryText(standardTurretPages, TextHelper.localize(keyBase + "standardTurret"), true)); + List buffPages = new ArrayList<>(); buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index f8375a0e..fdebf48d 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -122,7 +122,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turretTest"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turret"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); // AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.APPLE), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index 1ba63f89..8f5d49b9 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -244,7 +244,8 @@ guide.bloodmagic.entry.alchemy.turret=Skeleton Turret Array guide.bloodmagic.entry.alchemy.buff=Buff Arrays guide.bloodmagic.entry.alchemy.fastMiner=Fast Miner Array guide.bloodmagic.entry.alchemy.furnace=Burning Furnace Array - +guide.bloodmagic.entry.alchemy.teleport=Teleportation Array +guide.bloodmagic.entry.alchemy.standardTurret=Turret Array @@ -258,3 +259,8 @@ guide.bloodmagic.entry.alchemy.turret.info=By utilizing the Demon Will that is s guide.bloodmagic.entry.alchemy.buff.info=Through rigorous study, you realize that alchemical arrays have a wide range of applications. So far, you have managed to create powerful items through crafting arrays, as well as a couple of arrays that provide functional benefits such as rapid movement and weak forms of teleportation. However, one of the uses that you have yet to tap into is providing powerful buffs through an active array.\n\t"Buff Arrays" are the general term for alchemy arrays that provide some buff to players within its area of effect. These areas of effect tends to have a very large radius which cannot be manipulated (unlike Rituals). However, because alchemy arrays have no concept of a Soul Network, they have to power their effects through other means: mainly through direct blood offerings. In simplified terms, this means that whenever the array will apply a buff, it will damage (take HP) from the player that it is cast on. \n\tBecause of the direct nature of these sacrifices, the HP -> buff conversion is a lot more favourable for players in the early game compared to similar buffs in the mod. For instance, if a buff from a sigil cost 100 LP for 10 seconds of activation, a more powerful buff can be applied by the array for 30 seconds for 1 HP (which is 100 LP in a T1 altar with no runes). This can be seen as a lot more efficient in the early tiers, while during the later tiers it is not as efficient of an effect. However, because of the stationary nature of the arrays, they will tend to provide a stronger effect than their sigil counter parts, so people may wish to still use it in the late-game. guide.bloodmagic.entry.alchemy.fastMiner.info=When tasked with carving out a large area of land, sometimes it is best to just do it by hand. For those occasions, this array is for you. The array applies a Haste III buff to players within a 10 block radius, costing the user 1 HP per 30 seconds. Because it is a general Haste buff, it will also increase your attack speed while in its area of effect, though you will have to be careful since other players will benefit from this too! guide.bloodmagic.entry.alchemy.furnace.info=One of the many problems that you may encounter in the beginning of your adventure is the inability to keep your furnace lit. A lit furnace can mean the difference between having a full stomach and strong weapons or starving in a cave. \n\tThe Burning Furnace array, as the name implies, will provide a much needed heat source for any nearby furnace. By placing the array directly adjacent to a vanilla furnace (it can be next to multiple), it will provide fuel to the furnace if an operation is able to be completed - nothing will happen if it is next to an empty or a full furnace, mainly for your protection. \n\tThis does not come for free, however: when a person is nearby (within a 10 block radius), it will take away half a heart of health in order to cook up to two things in the furnace. This will be helpful to either get a quick bite or to smelt a full stack of ore, but unfortunately you haven't found a way to add any safety measures to the array... +guide.bloodmagic.entry.alchemy.teleport.info=The Teleportation Array acts as a way to travel instantly from one location to another with a few specific limitations. When a player or other entity steps onto the array, the array will search up to 20 blocks away in the direction it is facing for another alchemy array (which does not need to be active). If the array manages to successfully find a destination, it will then teleport the entity to its found array instantly, even through walls. \n\tStudying this array has shown that there are further limitations added to it: because of the nature of bending the fabric of space-time, a Teleportation Array will not teleport something that has teleported within 2 seconds. This is to allow time for all components to rearrange themselves in a desirable manner. +guide.bloodmagic.entry.alchemy.standardTurret.info=The power of flinging pointy objects at far away monsters cannot be overstated. The Turret Array is able to sense a nearby hostile monster and by utilizing complex alchemical mechanisms it is able to draw back and fire an arrow in order to strike its target. \n\tThe array searches for an inventory directly beneath it. If it finds either a normal or tipped arrow it will syphon from its container and fire at a mob that is within a 32 block radius. \n\t(Due to some silly Minecraft physics that has arrows bounce off of entities that are too close to where they spawn, the turret will also only fire on a mob that is greater than 3 blocks away. Keep that in mind!) + + + From d2a84c0e7c9049870042bf3f4136b21fa0e37d22 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 30 Mar 2018 11:35:40 -0400 Subject: [PATCH 149/493] Added in the Spike Array --- changelog.txt | 7 ++- .../alchemyArray/AlchemyArrayEffectSpike.java | 52 ++++++++++++++++++ .../LowStaticAlchemyCircleRenderer.java | 29 ++++++++++ .../bloodmagic/registry/ModRecipes.java | 5 +- .../models/alchemyarrays/spikearray.png | Bin 0 -> 47801 bytes 5 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java create mode 100644 src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/spikearray.png diff --git a/changelog.txt b/changelog.txt index c7161c82..f385a646 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,8 +5,11 @@ Version 2.2.8 - It's a bright idea to fix this as soon as I can. - Changed the recipe of the Teleport Array: - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! -- Added a new array, the Turret Array: - - Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. +- Added new arrays + - The Turret Array: + > Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. + - Spike Array: + > Place a piece of cobblestone and iron ingot in the array. The array deals damage to any living entity that enters - Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. - Added additional effects to the Sentient Bow when aspected to different Will types. - Added in book entries for the Teleport Array and the Turret Array. diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java new file mode 100644 index 00000000..a0bbf514 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java @@ -0,0 +1,52 @@ +package WayofTime.bloodmagic.alchemyArray; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.DamageSource; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import WayofTime.bloodmagic.iface.IAlchemyArray; + +public class AlchemyArrayEffectSpike extends AlchemyArrayEffect +{ + public AlchemyArrayEffectSpike(String key) + { + super(key); + } + + @Override + public boolean update(TileEntity tile, int ticksActive) + { + return false; + } + + @Override + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) + { + if (entity instanceof EntityLivingBase) + { + entity.attackEntityFrom(DamageSource.CACTUS, 2); + } + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectSpike(key); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java new file mode 100644 index 00000000..0256ec93 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java @@ -0,0 +1,29 @@ +package WayofTime.bloodmagic.client.render.alchemyArray; + +import net.minecraft.util.ResourceLocation; + +public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer +{ + public LowStaticAlchemyCircleRenderer() + { + this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); + } + + public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) + { + super(arrayResource); + } + + @Override + public float getRotation(float craftTime) + { + float offset = 2; + float duration = 180; + if (craftTime >= offset && craftTime < offset + duration) + { + float modifier = (craftTime - offset) * 2f; + return modifier * 1f; + } + return 0; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index fdebf48d..2e2930e8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import WayofTime.bloodmagic.util.BMLog; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; @@ -28,12 +27,14 @@ import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectFurnaceFuel; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSpike; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectTeleport; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft; import WayofTime.bloodmagic.client.render.alchemyArray.AttractorAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.LowAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.LowStaticAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.SingleAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.StaticAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.TurretAlchemyCircleRenderer; @@ -61,6 +62,7 @@ import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTroop import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe; +import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Stopwatch; @@ -124,6 +126,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turret"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); // AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.APPLE), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Items.IRON_INGOT), new AlchemyArrayEffectSpike("spike"), new LowStaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/spikearray.png"))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/spikearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/spikearray.png new file mode 100644 index 0000000000000000000000000000000000000000..7e312f51f067e9fbe9ca93b1112db801edc766ca GIT binary patch literal 47801 zcmXuK1ytS6^FACLie4!07k7u^cJbo0xVsd0DHkbRiWhf^Q@m(#iWVvEUfkX7<@5c$ z|C5uGWU@OmJDY5toqZCarXq*=hU5(Z0GJB$5Dfr;e?5fM- z``?zI!e9R?L35VZbprr&y#IDMAU%`lRfyuQpe%#(4}k(39e+!SQ~p&%ZmXr^F75Q` zlcl5k>m>k4yIPvMTUtY&u(+|#>C%IoakN7_osOQ3WH}KU1 z)qoC0ZljI-s{}FFpB*p?B6kAR^637r4By>Ji1Q&$I_`g3sl*ckrGZsnR-g#5p(VjX zJ&)DPgAdAO<_v}j`HD0$gR&U+|F7gj%gYDg5h?HyGdILW<$t;zIDlhG_a&Niy#MKH zNqC_Ll6C0s7~n*-j2NaU!0DSIul%2AEZT)vvK}^(aN8WK(6*D;Mk+JBg97Mf6iYjKYIZF zdKfLnsP=0Rz(ZydUQ&$eyEsyC)ca$|RG4^0L-Sogb15&8g@VH2!bRC0C-6PhWqJ= z5|qH^3+qqJWF6?gYvN$^xZ~E3ccCybb;SUdA0SiOEB+Hf%SbaEewv^8cKeN(fK_?<+w_&#a}>4mE2Sy<=f3>!a@qr!f9s zkyNxmKJb2jj&eka^_w0&h=Z*vl5`6R`eT|_^typ z{N*5`8KRXVju}w`3QWgQ*JSo4;mr@8l|2#OJ-&l8B)#RU6GGx5pj z)&9?;PQLX2BSagFxKdL z^K4%@<@F)&B1Y@<^X_{jCs?i*M36HZW<;A;qgYxqfsXhSz(M_Cey*DYLq4?@W+rn= zd9#YEUp=W2c^#ox`b7h;uenqS$ti+lG=fC+>$Fnpkuiif43BJ@}aKPyCtu$8VE)==QLvhlCsg=mYJ*N}qgn;IEGP+Mu@eN)et%}9d(h^WtqHKtxR?k!Q_R6W|}d^XH+4M`J6 z9B-VeaLQh$Xf+JRPo1Zos1cYb?<88fR-wM}t41&QPoM%M7I&ORvDB-e5$*NG*kX8c z1pazLx*|i21zC^P07E6(n?axfa7Klq!!2R21ptAN#H$iSi+RdUcR31lxJ*Ez_k9OH zlqqw@&(eX^@E6v}mXPwB9M_BkdQr947kp57uMyGtEp!%-Y|0pL=7z4I4K1K|f&g}e zQ$}d4Ag>c{(_4uOGtVu6g1_K_6`Fy$DvoIKh3KvvUw&isO+&_tK|crWoTJfB17oP# z>u{^~8_u5rxS{2BR$W(c#0HcVX;1!eSw3KP>I04_&dAV>I+<=T5E7aA2^-L?_qV=? z(LLh{fg2vrzJu=+0$nVKojz|S))ms1hh!iWX#)U8T7*;eGwYFEPJ=T_-YRs%btN6X)32A1JF4Uv6}5XSzT z`eOqLb=EKN)n1_@v8b&N2Jp>Q2x~5YG2A=4@18R$i+!Pp3-hx}R@x~Ptgl1qILc-a zK%rp5`8m?-pFIQPVjs|sxyiL~ZeYFAy9&4V9tiRN=0std=cmXr`b%a&6zEjd^L4xX z+>yM|hJSl24x?*N;D9Q@pBUyqpBvHG3lzt$XSVq-KEfZJfB=L-IrRUAyW>j;fEP*T z-Va9vm#g&qd>Y=FgtQll;kTh;K`d##YjjMSiYSm$TP_)O!)Jkz3y@VMkpr?kL9qwR z4+x_dO5-`Kp}tx271-q8P6gOpz9A_+}s8xRnu0 zhvH>jryTro6+&126FO1j*H7_9PX`T@;VaSmVuU6Fi4NSMUxLt_`qmTcz$cAOFKB~) zAgM$?(Ox;?nq0S(Z3uWvAFVS(ui0si0M6k=E#wM!Ott#`%MZ21qyA4$zM!KUG(dRp zzt8ax+kfJyox(C0nW}I^TF8R<(1f~#h%Z1`3g>7AFg#m+tR0m$(}leJBwQ)pk?a`& zyzsHY@7s*>O=sJFv}ix7znoE!^rNt-o`wZ`0c5l^Are#r7d?Tj&_7%#f1GY_>owCX zJ{6JkA#`#8{2Zp)%W%U}=a1T;y=fHALFXIszU^N))JN=LEb&Odg6-%PYW5s$ZoVPH z-UxFT%6G)8*@(qm0j|Yc3!r~cp86G1aPJ8K&R^G2MF+X|jxCdap+Gq>TNbbBhHFKk zCzxBt7;7RxeWbjfSGW2VrMkf#yzR7kWA88I#=fAi9WOMI3nO@6A@R7CIoz3kJA1n_69P(nQuRx9wg2?+v%^EKF(uit z8!gsaO{ZTtp{{BcpWs5`_fPKYCd%Tv3&&pX&+A-6c~M+5Vx>U=c~QKt_LT8nKq5G@ zy+^>k_jV0FCErO}_2GeS`Dc^#d8_Oblz^qG=+v8ez4lo>&zKY<&%CO)_6fk6&B_R} zi|FE~^1qTn?@R<(qyE=vO9d16&i%#|F+|iIadcvFs zIhkd}?@>G3xpC1DgI%$p`tU@gF4gJiYhZxIr(iYiM5*Iv69PZ0#^>IdO(kBI>rdtd z9&uJYYC{`YXSsaVlyxkWj>LWq zOQv96e?x6o4Wd`icM{dkbU>;MN4Aejb%_o|_peNDqRbpU;(l}NPVDxIZY49jDhNok zWqK{e5=b8mj4kJ70){FrlyRAdkg2&}FxR93FE^ajBLhd{@{BdE8>;@=1Dh34M=yEx zU8Rp67cwl_z0vyMnFepJ=EQXDgjMWQQ`&(CDey^jV*fka+%gz6AV03VYtQ0y3SF4QF zRQAEVO3gW6)LYnh^(}NiT6p#zX)Jj1N9C@rrX8&5@iQ;85(#2=Qg_+JGO;=7Z=>DP z7m!bXO?5;$)>J=bgHm$`zjket@Rl_Vme38{?q2+LGLX$hX3nuL(#Yg8|8X;GXWhZ{ z1qT{y&Wf>pCPmjI;oJ3Xhi$=c@uPw;$!{)%KDb++zTXFO^e=auHjwnZ^J#O0k%u}W ztRj~3mah?pKrX`$9?~cQ>7&AbGp`=w4Nn3jj&S7#f35anI@B?L!0YyQImMLobxLNk zvL{X%^4mL|?x+PJ8`)3GQ8IpPaYl162Rk=e52QBU6C*N4f<)n7c>McS{&<^cU zXExow@z3GZ{{B*>Y@r&w{{h0W0BUBOBS1Do;2KPi?@vQVjh0{@VMM8itBKztjj=+AZFyyQn)id!7e z6X6FaW|t>d2SH{vkhxTU?G`TY%ePwl-tbkl8@2l zWYB~lAs6eO6hh#QW{i}1D2+<%5!!r6(m)SoyEO`+g`$vK@NRWNl1*uc>X3%!ekOJ$ zXsA&(+A@fV;>yj20G`bedg(ogXhksJ~= zmuKO|Vu&|mw#hHav?#Zo=VPr5>xRC?r&|r*+iJlx#a;@)pQcMXoxtzzoIRr+w}|P$ zn>0m5!ArI?JlBJpua_zNR{yqqlX;wH+MLIqA9JpgJI(DC)5av8oA$Dp$R1*w>I>c? zgr?N~6-vIZgI4|M``NXw39|9KncQ5dgq$A*OEuY&W5emtY%Z&WmBgB|huHs-XTsTZ zIv3{-&Uv_DmlbAP=72vTCsr@wn@3*fidL>dKCqJS_}YflU^dHxJ)}XWbQ`V+q z#$*Wfz(k;d+=l-*JPf2KhX~bZEPMs^2GFwcu!4c9muQ>w@c8W@EDCv_LCqW+} zQ|YjUQwB`AD{RnsH{_B4^i-0lrvWj14u{3mC)$&NmK7m42QyEA3T@ty-7{_8v0`Zi zor7C+#I843DB|D;@?_~6l5@U>-S>@UCD_31>4_v*NS2B3gRFWGRYt;#QJ7j4KLqRX zw|hmGU(bxpfL`pLiM_M$o2&V63J%BRo$TJ!5B?pU<-t47r)hA*IJ3=BzBVI1SSG}O zP1B4_hzUPRh651qwI%^q%m}&S5&S&gNxDgk0jaaR3+?K3*ut z2V%EKokrZ>-XP9rJXXOty^TOSI{2L(Az^AVgDsJsb$fVJvM$xx#XkS$*-Xi2kjIjA z4?eR^Lio`-@%-zA6VWV%tg4?pEat;qb+fDEB$MDfT(dl6dN}_W>>$92{PARK5E4R? z@WV30=XG%SAWL3_wq_dQ&jG)SKj8$9#^%m@HBIF0*G0Z)xXOjW2(DUFxork-eWr?= zF{d7#u_UOAtvhecfDWVk;G8-R9B!B__wu_qxJ31{8PmCns2Lx}-EZjx^iP^F0imVtuQb~(Y)x}UC zg36lh^NxD#K{Ur;fiRMZ2OwNCw0cA!Rn@TudozIk^8j48(QQ$Hk2)ccx?S6uI zZeKti@5u_Tc$tiO$sqMKOVJfU+Jrx3m!SvyT#g7=Gy^TT(8;x!v~dQ>r>P!=xwJH%6A5al#@p+^dlYwv4N zvcxV(!R{EjqNXv`*1to51-itOz99D();_+-6IT1vx{nRQY{!v2a0a{PEV)PNzL2@I zTlSJ;Bu)%HfY2(c7R260RdGWpDtbUwvS)2`(yg|4G_s&;Y%&VX63%v(vgi zb9c6L0xIvt?eh_rR$ahna4cqMBgAVBRQ)<1NpyS#@7FL}p)iKbn|Ot#HUu4I;o~Pl z?DA24`cX*V%=|o&4QTz=8On+D1*h8Y zc7?pQoZoWhR1=g3mD$*}zNss~DrHn_QdTJaMBgT$5_3vDVK*t9TC-BMn>R zrZuThsl=9cuEA-8 zPm4P-&HIL!R2Ad?${nuNpcq12(x2aTxQO}@o)+jtvWS`4=6^KOkomS$57fe$bkvE1agYy2I(Uhq~qPfv4r zRP18r^ex9|)0zz7A~|4b&Q#9$`qf6j?bi|C7E%I(cp^^m;nQN*!M0_;|UMM%F?6syq<0=3>^XzR2lJ6M1auQGH^n z5Y!5MBFn~$O=Rq_k96k}L7*!#vsw&Wqg~7!xb&<^+_KCl#%cMxvQ>unpXoF5)s*<- zx1*O7mm&%}zgeF3Zz+uWU#b)FK3kyX&uIZWD1`W29yQ2N{Ycs%Vy)lJ3k&f#2ovdT zSG%q%=v-)dl4BPP5Lw<7+}FrrEBUAz*HXHMn}};#7<~tNn?8?I$^* zSK`N`ilGnW&nG$GdlLWnN4sG)X1yZ{!43U6V?Zv)5NE{MdWy2ZG$3WQtd;ELHQkEm z;B6FTgcNK;UK=i3d%&%CV5eY?u;Nj59B*v?7QQhPVU2ERtp)W9(O$IZP&GA_g>R$K zNBwv~FuI9gNfnrDi}LV{l1{!T_#ij4BcGDqw0zxFTA*tXh@B=-L?UO((H13whTjrC7%RVKlNIEz166m=8>U`f`^u3T!c>aj_2 zg5OPsVr133x8SE4IZJYdKiEkFjkb618)}}ZT4bu(L=l_!(`n3+bGt?4*2lDm0~s4zhltEhS#YWcnoRa ze_`jY5KH$zK>SSlqbBMZb8Rh^fq#M$F*xq8ceyo+(A4>7gl)O-?VJt`5I52Z*(j^& ze8$BwbByYB=bKr5fpE-TeMYcs@Ff~!QB(b|jH{Are*|+^RRd(UwGW{pa!3 zO41+;TG(Q|Nl!g^=(IItxFojjIPa=O?C^V#@%xCVfF@&n%YW_EHh(ZZQi?BtTjGmX7ujjAN$H`#978_xAV+TCySSykj*;%kg@_`~iX1Md$X$hB&f>($Isx9dd|UyoozIFbQvalB$+&uj7qm z&;%zDo;YnN${)kMK58b2jX1R1ToDxd1KD^nrhtXf3B|Ei{j`}Q9Dp7mFaW){@JA)2 z@Iu+kA%A`cXGEhbp8z&{d(A8caKS&wrjE~QF1=dCAvDN$)3bvsn(g-sUptKB_xQe= zFlvQ7#7(4b04i<+qEdR^|L#4JyoLA*xonU=wLG2t{=Pb#GX%%}<=B2;#0r)#fzk?lF&(6P@|C%Rf1XqyLU&% z&^*xt6sWBijsq8Bv*1`o7Q)Q{oU-mN*Wb=D=Gv82C6po7QTMQ)j(Jjq(&6qD*JL$?p3w+Rt3FESI0!krR~L=qH%26X z*=5bdgi_^;HF*sS|DZhaU*|e%nv3rzJ*XzFa=vbG{=XA$_!uF`OAM9vW}&XwH+4SW z@OULFkt>jaK7#d)j-m#))Z&N3WQpy7x~}@<9Y0ZThV@9{pT84ETPR4c_I^{vf6cY< zsOCRZXY5b0lQal+b;l4?;6D26=Uvc3lZ-7V8hi54_)k;tLznA=Gg6dthH0^c+VJ01 z>vKvApFp>fs%wFUXXCU8A(rV^ysCK7%7uCRO& zZ3TM{ebJ`lL=@|CRs<2RqnDl}C|zrVr{YyKHRFsg6VnCNs0=g{5tUn1ZTd{)dUfRd zIf#VZdgRP-?ra?&?N0|O^x3q988~>C*O=xxNW-m@q6|E4t_h~VthdS{3DP6&a5?}T z>JUp3xR;Vlx8EumI&!LZCxUzac$&I0wZDZ<{rV|T8MwD_w`y0Vg$)$KVAY%+Kw!e3S`)`Ys zvHlfloK&jA$n-)2*hUZ6YIc2O^;)PRvjm5yow8Yk2%wZA(LQ1br*ENUe6pQLh3=_$d6JY<+Go)ggk|Kl_w598Q$4)>S_K{U z?pgLpx&AG(bA<+xQQ_S()b!1mxc};0uYM-w8&UlAo+k;1q)pY>%loo$QA*%UDo%gq zn>WVv@g$9vfyN=BagV#m`H?+1>HmHdm=v1aEI2M!hvADYxJlgq_H2uir1aYG;(6Jv@7CpqPb|B4w5Lu)ab& ztd%C-d?#_R$q}xLvSSM!KKYRhWCx0|P6Vh9D5xvl*sI-1(x9tIn za%c%FXk>w=E%?PU{6WZ_M;?*rP{sIvT!1TGlT$M}cvLj*d4&L}`{R$YK7SRNg~&M= z{ZCn-ZEjk{a=+d!7ETuzW&ib>nv54@-dS1d_ji_%*Ruz1J3D*kd8l=-xbl;B{KQt^ za20jpe#H1V7>K{%4i;cQXc%PP=S#{n&RE8D!_^I`XEhs)d}c*@`bp(!$mdElvNb4! zCn0=nFV-|IQ_}t9SJ&0+yo$JaSXJ0!73vk>4Ih(~%porwz9i1xZA@%YR_t=dab2in zS@cu4{a9YGeAb?9OH@to^Zvelb$)y0UsIoeWhd(|T%X|I$#0zL=s4Vdiup*?BMVx+ zF~wLi)@#rGmgT%yry4_+B5VV3Z|xUe^uuDu11?8Q+dSRIM%oP(m_Gzv^c;97Ww9~S zr(1p;NSgO-;8-ob1| z8DSWC#lBdK0@h!=M8n#%-4NOKX)46)ueRSzU7D#38ALwhVXJts8Qn2k%HvjcJ4mz) z%+hzotLVJ#+Ve43LYr9L)8m4RLeJ;^SVRwGUz5p)Z8td@%E~t?9;gO9EfdUYi*0OC z?9Y4Uu%|qIC3t(73Z5Xw*CO5$@84^G`H)s&^R2ysLtC+O^8inSO(#pM_0%i;;9SOD9_jT2gh;Tq8t^*YB4GVvY|YE=PTJu z)W@p2KKDMyWXFSk?(Eyjjq4V+Pa3hrjD7*fWn#O8)XNJFr0yc&1Y*RU3INv5DBNLD z6N(>jiE?U6Rdo=#MSO}{P7jd`{^nW9BSo^-59sL$jmEkdm?;`$Q)eUeGW~Q*94inM z`eSRn6`4yF=3V54{;i9QU-2_qXBL^o0TDgJLL5`1y{?5#X%=&;bJ!&i2;-{_3}48B z8OS|MM%bViPFWYhMZm0Z)oGshZ3?G6@L40ldFZg+sW>@n-0>HtLW-*3`?f3?*3ZXQ zeG-pO1WSb1{0d|QR)PW0<$QubUXzDmbWR`;8&zIMgw1PCMgh`+ zBGz$c&HN&q1+zMtR%r4Y4QlDV~rq?VwS=+`2&3L zLf-p4j?D)C_e@ub^m1Nc-=xK6OccgKT2CldO-x-pb%7P_iVMI|K&^(B5Gb-;qd`e1 z%aopfuUv8U?!;;les`p1n!|)NF-;!Z>gRjH>Zmr|ZD0JEtdR_Jg?eu{&M!CbVuk!! zLwQShNO9VMH9lbD?gBq2?rFHI|5?7;Fu*$AvL)_@KxT^^2h{Vbchm z&W$m5`BP#QJYg)NkaY(IAFuWHSjWh8Z^YDf!-DDIZ6x6(G>S~{WGUC*2&McY zBNs(EjQ{Yl1K%{xym80~h`Hu;9Hi-Up7%?dU{fX{PZ{r(A8p=CRr`E{JkdIGw$$t& zoZA>%B$K?umDaU{Lkf5yw7_5n$jg;=NWl^PM==`eZ7r481wg93KXc1;yaUp}fo z@zduiK$4#JQDYT+1 zxJicarVV@biG#-V6iWp^Ol@OZiiUqr(b&%iUozz$0hT+ z59j|e%=K`8{ExWR(1KmrM$g7TZQFoEHsZ!VFR|y=s49jTrHRy-*d;<;n-~Fk&KzIX z2NU)oqEUtZFb17QHnRbZMaejxs-;;MCfk=~QG@-jW~vsef%)q^#xJZh@HpfIJUNvj z^xf+Hq6$=}4r(Wfd73t!fYSR+IJ9I_*p8^f5Oc*w_=c~$&0gKM!f`?>-r_qz+XZ!s z-IDQ!1xt5@vEGyn%5E@ICQ>n}d>iVqA|%zWFFfH_qWB=8r23FR%{56`NP1aQbAY6G z9|$+cL|cKMDzIh_==aSXw$kuqbQX`V=rC)Lt>7bdJ05??<0d;Y-!ty@Xibvl!1ilh z4PIWR?@MhpLUN{%`{tmt?Rv6By=r8cTuOcLPh>_}>-}c4&3gPS4ep1(C4`jNLHXtd zerW_Dxvxug_3nX4W5Tpqe*rP<){F03zc|nHNfoG^dF#4=?>gfRY#_0X=mIM!r$DXQ zQ{>5!c1&73Ho{y9bEWyL%c=h&dnTciet-2`&VcauAP0AyQda@Q(+c{<1R#5&Jp(>h z9cjy9xS0gsJcuvspd_2_NF~NTM|H#CVY9?I>U`{k2{hR%A#6CYxIhR9eJL2H9Fj9^ zTRHP5!aO&n#UUb5;XomNuS}JBkGARN8wz)X4R9db#;UGlC%g!LFdCH;a(4@|oM?LY z4|0hM#RJ@x)PIfgvU<+^Tb^#Mn<)Ls@q$)9$=Ec<`|A|E7-srmMc}W3D+tHT;=zh& z2Y{N-^HaexfGLkwP0C}ad?eiEH)7RXfy_o}lFvDz=kvVVZ97=hd-r4y*j493j&LUF zG6Mf0&FaNfu76mUwqlZY8NXethHuIx4G3c{L8>O6<%0Mo&tGy_ zM^)sK!jq6VMM@6E$xl9vvWCPjkw_xm!&pR>g7P)DGoM{f@R>xCr-% z(s|4XnQu<_5(*?Dd1;Q}4ZwKDO7iujaKo}nZpNcIz6_V)k}XsFb;8{=$A|v7l1L~a z`N*+lX*bdw>&op6o~x;>773DLRnT34S^i{)91{sR`#mP=g^Yz1bmU zB^DHGIyFK!aPbA_MW@%%F5`@R&Mv0T-{1*ZLDc*c3fm##t(wa0x5jbw{6^0& zBHp@H38hmzh!b-eVybOJ{wHg6aYN$s+hlyGZdvH4Gni;?lDzb{+>7_?;(k~kQ zlU0J*>Xcc2C;lHt3^I3Dy&fBQb&{7w2cL(W@>|YwK~V%CqEE{;lBHYw7Da7nZQ?#C zqVsD`z$oYK%%DzM<5u%|7w*uFd13!sFf)NPK~Jdk#r&AhNnGnSuYu;WW>hgo;~pB; ze4xTcQdX`%=3`J?-*O}5?t12YkAf!J!*b`OqRh}-hnEFh}p`6bn~mdog!Av+U`5@d5m-T9=e-{GmyHqAM+}1I>zr46n8y35o>zmox zKOp2M;kbl%|Bz>UJK)?;y`Av8)emI^$N$J0^tTgHiw^kV%DlyX1CRs$C2cQ0r4IIh z$Znh;9JKyNjnRiB{%z}sfri0M#V_(Y9d;)U3Xryl0erxQ0yI)6by1#7=1#0O`M zQ046@GCBLA;HfLahW8*-vP|`~kYi-XB@?J(-TTm>a7vKd0tBb?$~C0UYkma_%8*&+ z!uDZ>U&5gA9f+2=N{dM)tQNue6?=HN7UZx)+<8Idr02U}@P1jMud#1Jjp6QX`r@C~ zIQM(p@eM5)yKV?W#I8i)R1V#@HgbG$-oo)?j;7)fRXr=qd>iJ;rJU<6d8b84uWJ>~ zFMMc!==x|`j5gJyVts-gt7u@5!oog#p;auahq-uK_+ z*M3}+`mwM+Jay+;zbK9Uh0FsNC-6NssDjzBn9-pq(U%4?OAfQ)0WXBU92M0I;1S@A z>wtY>FbZwO5tvQ~0&I8wO{|<@l188s9-6z57M3=xK{8eSskRKxlY3|`(J;KTUeaX_ zfrBw_PavMWwzYgFoJlY9_@3=j7~OU-Plx7s0oAB@JH%Wm8D~ zhR~qDG>oY8*akC?cC@MuWP-PLWnL-U##bK{+wi!e>9tO=aEv#1b)+CS%!OFxc}SP_ z5O=M$vUx~dvc`T2c=D6gltGI9;ktU)@rQvXuE;d?T^iDl%(?FnOSG_pR_=c- zZ^psdXvu|6Mx}%I$^xvE{8t5tla${J+fXH9nJ3Q_sq22i3unjpz4fI9gxX( z61$F%m8gnYx?KqW&|x!9MR3~|I^=uO?NMyCqbOTp#WTl|Sv?ti42IOhjcXnc$!871{eGjMHbuSpuCkQ-$vEi`EOL1VTI zKGkl#D;(fYqBx7KZf%HRkF|vTw5* zt}S`@5E|u@FFJ{4gp#9amUiMi;AfrrOF_-xOK9a!z=8O8=hXPO>jp+=g^Xio0-y<{ zGb|Y^z#L@xh9{9Y{X(dsqGJDw{781$n8b5KzR5_VaJ-3>GwX8Ur%t%># z=P8uM0<>wlRzB}>q;KXUOj0=)JohcsMzVZ45T_x!r67aH_~ zl&1-HKkFznHTl2o%vozZplZQ@S4m+k(WNb`YR@h^V!1r(yxh?_kd%qfa_WP5c-efJ zkMX-N2H~B&Gj_s9YsjCDxCi{gq-Sb?8JJxTJ!7SmL2~kmF!OojUk#d%qsVaFyGf1fi-JP^s|FINV0!ys)gS{xqIV=8Q%Gv}4@6Kj4O%jt z{?Uid3D1`w3focu^+U85DOf(@u>J4!jO|j#(UM*7=Dy8fcSU5zZrb|{RNJn#ahN5V zdc#@++zbNk`>tw}8e+qF1D@bbz9eRD?;_V?D@F@?Z2x1@<>}u#Cgr|sSTywHayuNBZE8WHj&ecr1isnoF3C_^H(IM@(odH4Cs!@#6W2d%sqh5dA z2JY>RPF?^Ecf@mBDmEdlKsh3LFMh@Ene?t;mko?reFQm)??HlWZo(87arF9Bq&r{v zwdXjIBxr2Mw@OO_M41b$U$eyhTWULl*Ms3XCm`^_ieN=?8{5`XRh=2f6CcWHMp4V6 zChG|~vhTlSjRd3ShpH&dpW-ON0(9CD%@+M6~PY9G#QF808g~$<3*v`&BQu?lKf*Xn`$M)Tdd`uMKR7#X!%GL!sWChO{v258rPG!H(wHq54`PB z9#-AC?ATS!U3$~R#HEC;_*VBnkdHcIuN5-7RKOkX#$7zLjxP%tJXxH_wuj8b$`}ut z2=)=_@E<5)GWfiU7MYi(_{OGN* z%504IZhE+r>;Kqk!TS4z|Bc`bNn)+gyjsi?-sDz9Iu_xbcX~lJ*)rz$%0f}d>;~Gj z1OcLn+Cb`j3FOW(cdPbwWsD8;jKl72E=4KwzURza*%jus^P_ho3(mU5R zAZ3~X8jmG-GOC+Z&V(EovG+5&f%H#Z3M%xV{^w(wb^8PE{@JiyE~Y1<60>d`6VQ)x ze%qaZ^$ZTr>{pCrGek%`RC`q9nrLA;eYW-Aybk&D?~EQ;7MU>UrrwYOvRt(&k9wv# z)B|GpA%zB9-CMS3Yd3aZ-F2l57cj;awo0P1Fp6a*%R%R#DI0dH$f-ve;P=Fj?*1xb z5i=;+vng-98~A>y&NV4Qw>f7^Qq`^<6}Np5b1A!7B9^X`caQc*RV1LYzyImif->+< zg=NwVXe;b9-#hO}W(-z#)#?MqoLzYI`$^YJ=xQU(z1u8kAmI49AR zewA~@g|Ss>nAfXedFympKLNJ)%R9e+r-a?kzUJ-o_nV|-68++4G4W9ZIYd0ufV`w5 zWong(3RS#Mr)67j;`NKTV`52Gkve~2eakL`bFehI)mQcNtVQMabQ!pfshhGO4IRpR zz6MVis?+G-z3Gg1SrSa0`uzn?@JDPJTTnm`CVjTp&5(~D7hBX#QhIFR5OOjgrM*)U zg&@^8(H!Qra3N(AvC&2eXP|B_fws1qj_wlzb6qh)8~tMEaH;z4?J`3UP4UCrbk#@D z9)`z&w_MErKW8O*RB5>Uy~e&T__;WU{eQHHZl`UiOZ-YP83M?S7Nwy^+rsfR;&tv1iu)z9W?Y zRD~xF>DcOT!<^fsyAbNF?UCkg{xauB{VImJkC9-i$(*vK5I@i0c62ydTm z%wjHS2Ab0I;r!DQd`p}nY`nAUCh{(QtEl1iYROU>OM?auC~VPW_AW(~Xxr`unO0L` z&OGW(|RtdbW>);^XQH-58_dC8D)P#1{Tz)EjG=Q{8Mn z47@*}DgsD6eOu?khSa!PTaVpA=}`z1QDSVEMLiGMY7@-X3dk`=7QCkF2j` z_hN?~KhNP{8#c;k{eNrtw<**kL;jzp5kDtg!lb_&)>|iS$y-~MqH>eLIRk6$WV;>T z*CD-o!8E56WqTBl$IMgRqSF>HYV=v@2Jt%xHmM;$mv@Mq1fo)B`b`6{I~Rtp1txJl z+Y5KB&;W|~8RClIkFo!Z|FEh`zWk$_dHv%EkBs|zSdx6ngfZo`iLh#Rs0VjtAI_z; zE-vrNxAyz$N?eHRm3vep9=IT%=l1AO2Ur?@nhd1~^D^+~`<;OM{o7wpM%SCT3UHLGR?D~nBt=48)taQ&^vGiZ2HG~oq&YuOtF5&(@|IjY56WYSx1wY(*@veduE2aWr$a@sy7~6LTc6 zyjiWFKFPM`+~!#q00{d`wGhYtQ0K%MePOIBl=e~mLgo=r@I-)-;Ul7NOu0b?O&!E6 z$d_)PDTFDe;x0GxB-%R85b`mNAGw6dSUHUki{I}dnZy_6o6GP-yiaz+d}=oA8`}E% zdv>7)^@S_+c1P3-%|WfeUsdqjhKX&mvMHbJE9u(_oac%sPnhSd(2(pb`Wh;wb{dZ3 zz8LZB6A@*DjAXgY(Mh_I6YdCWad8Hwg)z%ltFJQ$)vbm|p^$aq?sFCKp^FPaS&3D| zEz-@n6Gq!4&)zo24J&?;MG@y=abrr>RN^swWjnG}xasr63e&`rP~ypl$}nzGdNyv* z@_tvjm1O|RN3du;*R6puL%IT_F_!rLrt*IQGM4VXShO2`?74aQWVUUbVH<2Lz@{ab z4MnR`isWUPk}321G+^5$oy@z+%ULN(9PYQ|DxU3A!~l%2_Hnpg8n-&OkOu3LbEMbo zA0R4gN1k_<#>2OH)*ybcPhRK#m1=gwBT_YYbcw|;QlW40oPl`WGIIJ*uP{NVEluNb z_xyVM#WdBU&UTf4UpESBw?Ig0hZS&3LI9`BRKXWKm9d(B;=1QuO0~PvWO;Ms+lv zf(xUt^H$~xF3|FEnjCjB_wL9ha%=d1>e}tbK2>3)SnFt9cA~L1lwU&s9~VHvlk4$0 zO{PJ$kdM8rBpQ7G9E?|1M018c86Gi%n&ta+YM{p5AJT&y^w;a1XR zDYx>`e)DAj>4o zV#qDf#(Pt5jDlBi{M{|$(zk85_EVa(A#dnPJkpwv!DU_(76KLc7>dD z$eG_k?cT6PD5$Y#!W;?mCT)>BhdR#7@%)-1-8lKH!{zp?Yfv9c&}TJPe(Wa?HS+p2MTw#;%>68O$E4L2jPXmiU?OT)6$!Vecmvl$Q$h9dzo;H0m-65S zk`>fNZh&mxSC(chveGYtJ-9~tlry$g1zcT+S~q%lD*=P0BRj2V`e>kua-L;V(13YV zCJKoodAXwz9&7o6RPQA-dfs}ZN^xEZ-uTyC0s=Z4TPm;4c@}z`ezj< z>j`eb2dQ|zSMhZI!jy&V%ttl=M8TlVSMq7R{hvimvPY^UMSw!mexHcY5>V+j)F=z@ z;gHYKDYTQ-N<8@bKAIF-Whq;cYy^8t&5p(agroII&Dlhtd&AkAKF!L+y%TBf$r;(V zt+s#g6o>kTNDOP32WBdR%>f2s?kl!#(rAI8>Wtki@{H4`@bxDFbHQ>#qVqmn3q^X9 zY`+LKV~&_#C}{;Wa2LUwq|VT+T(2gen^LdT(vWVhte2|M5>giDzBsQg zOY!Rx4#I(78~9l%TE);kaOWUmdn+?nm(F8xJl;_G4!@}>GQp836yxVVE-|yJ=O&7Z z3})By%Es6~>vxePVo%*9$Gb>70f<#c6Lrt8sj`ykiOGIMl5)D(l4T<<&0X(m-XDC1 zbGWDLtNazGI7_qm^ccQ&l%T14HbHUstl^zlXj%*nrS?+49avfnhI2#?ejPF+i?-?) zEdl8wZfK#|oNUHd1aW(q;yoE*4T=f2{&wXK7Cjq-WG}J}2{Qz{AOEX)V~PmqrUS-Z zR|56$W8s}>#9OX|GByc+YATPegq{D3Zr#5dvrD3Q;pWIKc$3C&%D_%g(Hn*ThX=IT zVtmFse1@U88ttE-3tq1~B}JS3tHq+L2?$DA%axVTz&R`6ceo}TR{ai#@H|1*eezTV ztxoT3D>8!~S3V(PP6z4rZMl7#7}0i{eEVhg>;rV$BJJ7aS9H+q`f^M=wN*=kecplC zX5()SPMB3gCDG11jT4SLY>(R2mfk|xj~AJ0>{a*$GLXuOXe_pclc-XW$woW(N*5Va*XC&{qlWKG@Us4%EB%U z;kvIV9z-0x&v)d%uqrDQo$jlOIh`&~1g{4&)aav;xOQybpXMeVJxGO?6D9La1_PZQ z2S>x@wRG?!_nDuIs|s}SP%z6Pe6>Zs-7kInVWZjjw@JxR6xVI?oW4&c++Rhptn;1c zH|{FIK)Y1cSLANCh?gFrteP2#q0gZ&Kl8T#TGKyQgCy&vhDmwHIp45F7XpVc9X&JA8oWO&-|i`JHqUaagUsQ zVZDq{BcR)keTVQgpN1!l7Hz9H>Cjs?^qXIbPWY`oS@lwWosCZI`wi)N>IziW5w6Tu zthB0HSIR!YA&M35lEdsS$+TS#jH8oOjx~cF{J4lq&PKbWX`1*F+}XL~=;kM=jo7&r zP54;!vY*hGqUCvrdtErmumqLr~9A-%f z#zCvAO%E37M`pP1p=I?jegdfFshgA**PgD!25vVaX<>L+qRSvu#ctpg{c&xD#y+m+ zSD6#)Bs7_B(9IS+evJ+Bn$I>^jv$HmN*9=2!@<}+I+9dCb+eu!6#AY&5zK`a**?20 zh(11TNmlJEzv`d|LvuOL@lsqISULPv3!W&h7pL;OULH2xQWOe;0wMNS2!LimEi!CFNe%DM1(A=y?dd=_@q;=`M7Sr1`HQBmO4EWbSB#;eczVEx+~T7g)lf} z2|JxjPC>UR~MWXE00HgaGFaW_E7TjEbCc889V%rowi=H znHi!Z!pm6|&cf*$Zi~o>9fHH*0RYXOgB($Q4B^%(a49^;D3C9brg-UlDae-Cd$c=z zT@9NQw(de6DM5XP*X$S0$@|yO#s7(mC$!{c)RKPTun|73sWMk+kk8$wz|(8`ys_L^ zC%j0lQXSV@RyNqrcCr#bb)#!OR+FV}$|QCZf}SC>{3W9Ljk~6OcFHA;69xx4!EWOv zCpFkptxob$L@8y8DP!2O=qP{E!ulIKGXz0XESBwkYR*I0FHd-P0d};1p!@WFF9cBu zvr#`K`C(*jDIZ^fofY=DtSkMD$>PoB+@N!ZX9KDwNyG?d#3L!8J&qYnyK|C_p|^Bo z4|EbM%hG_talF>N&81rm%)$LG5+#JJg@|Ae|WmcbTI@Onfw&MjZx&vU0qxE@|$foDg95t+HhWZ$-+i@7a2^@~Z3 z0{rU7{^cnql!XVKIV&6%K#|3CKZ#;pzt&iH3+6=2lAx7+z78pGQHbKYtwEm24<^Nk zAkc4xa@Nh~B(-sVLMPlRv?m1q0=5%%_rp2(LeqRe_)G)CX2aaY_9TGLoDz@`-#6sb}phS0?)5QJ!LHM(je{2YY}Eb($(%=CLsD z@azDgzvl)>U49}Mk5hZe;0>mAjeq4{Lk<20`v4bO`7JJfK8rAt?193>F}mm4Bc-$d zpHa6(;$exo4NBbKjutacc4U1csErx5vQpdr=PH70b=^8aN@yp(cQl!@^HRO__~i{O z8h_ga2Nv}x3$N^29_~Q;nDtL=&z&6w_IA5vl4s|3|M2sZo(fu*YcS*jMxEY2&R`18 z@Fx6*h3V&_3k^glnZFawyL?zepvJ)p(CEAA>*1)dtQ>#N$;+}&5No~hHqEiHiAK54 z?$U{Mw^=bpWs&SGhN#pGWfNbwy-$(5y{Wg0e#6hU(ZLB516Z1{FH!pH@U*i#n1|=N z);ImyXu=D3Tg?O-P#<5Y$0{j5oR)H)-#gsr;XeT)F5Z(HKQ*Iab%caxB>R==EKxW8 zUaLq>&*6YI*PkjcosWqeJ3i@>i&T`wyRK~-DGw%gv%@v}e=t$saS@3Tjn)}yo3{$7 z#O(JY!ip6?)!QZVJl2-m#yCc0GtPfZskel&Hj-FNFMoSK`moWN9Qp~_o^6F!rZs}7 z68|xQ{MV_uS)a{>3HyxB`)O-4i`hmfGWpJn>{64eQcZqtHwAiqE~5UBjDbf}`iN{jgi zS=;u{%|pr={{@rsMzyGse^S}yZ)Qnd{CWYCZq5>6D+s`STu-GjH>P<3(M_mg*W zM|7;)(k+uQOgGLi#UHJ_-B>guRxlA>^GlR74J~U1#@>wuo5)D^ybFI42A9>W`y@?? z%Cn)!Fa=l`vHrm(HxMdojlR)CD~*ht8}x}fy&ir$u~VVZ`7KAa2qxeM`V-_Fgj&S5iq_XOO}R?p_4OLiMvPFX8AC0u<{E%xnnjAEZ5-Ieom?%ma1jF;v8X$mY2V6efq zN9*vKTmAQjlqTRdOG}6^=bJr~eTck4Aln9IOq$TF9CU>5D9>;vl_d6X)=aQz6B;}E zaxxRdlX(=2>{~?8KGJxdbW9YjShAlt{l|>{&o)j{nOPZ_y_-0_p89nMm>43w3rag` zdPj8qf@?}PwSakH&N^*+w(|QgEsOWx;22l7@o{6;9N&Cts?8+=q~bN$FLJp&e$k($ zi_cdayik3bV!p&%6C1fX5&YmG?%u{tI~$e^tok}Xj5;$d~C54yu7EZG@)=}V&Tz8Qkgb5JrCfA?Z~~%KTS5R^mpIRX)aAlY2R;nnGSu zdS#M8c;o^_eu*>{SfyP~>X@-8R!v?B&x3C;mFHtTsY_ zr~{MHNx$6t=1W1FpswPibgJ#dI^_Y(Xdx5$Hr_!_#S z)OK!+Q^$t~ilR9bB-|dJfhvqIlj8I@oEXq{n;b$O@3{NRIPbA9%P~kBzc)(7OEB&WR7geYhu3PO|KIQU+dw; z93rxo{uBmmN}_^Rr4^6gh;5WOF;Mwu(sv|Nel&!;78I$fKy6%U^f2Xs?E-*MnH4Yp zj$dfx;PN>>$AL+-P`l_bb$6hi=FSxWTsg9+8W*llsB#tp;k2}h=OirNAc z&x|!oBYqkH&JRySD?NW_B-`B=r*hl)#NG5+W<>`KK6&rhxwQ$dT)njFPE|{{*XU38 z(){bH{;Q~O zglJ$@Ydm;aCU(k-Tw=`hg{s49bBq+Njf-)4TRk}wH(lUmmhKGZwt#S5^GBZ1L3sc9-K;?S4yN zb0Tb}4(44z40`qK|6&~8J&E=$oQNRXqh{7~!W8Dv$!zIouA&2pe5GFavyXcJ=F-G?*BSeJ_hjv>Rvgdn{^ zKVG{@(qAus0Wq(45Z=rxzQ5H{bOwv@oiR1_LAXRi6e+#_Hr|aqkSxHRu12wg@i1iw zC0+-Ypp%D$hG1q%)$iPkAXdVou_n0lYKmboiU~+L+G3N;{V`s+A9i%=rQ}59+ph7x z+k6!N{sSa=gt~3~w6baUp`(63aGNf%3FMs|gIln{CP`|fn=M@U$(N1>W9nzhc^9X@ z7cGXcv=kZim1YoF4RF%I1?0=hq}&sB_m!n~wxc^cZ|@K|u=xdjnJHVpMurR~VnrVC zOvgf8P%vWNdumd)G8|s4@&87kFiS)l#7a2*eF^1)VYT=k@co<^lnaNkRvxgH9yvjk z9~x!tMybm$@%L(25$Da|cMI1%3Ph7>U4`9WYrF67w@6bg(dx}j0U%wMw5H{!B8yo` zO9*mO0c|EIH(=;V!0JYp+IiEMa^@WSZQOkv45BYeL7#S!f_2~!l&jzVEeqX&hzOJo zQiEAEs1N1F)xH_4OWwx78tW0E z&#R}cK-;|$fEH6-FwMJdn3G{Y{DWP-L9s04>Q6^n}x}JMW^o zXO0m^qAMl0-%^yi`3|Z3m$5Gq-BxK`$?8{>BiE8Gct8=czr%HG1YtHB2VFyCf)){Q z9!^kLILth40@wE263*_QskX`h#jjXa9&K+g^zleEi1deF_(IYwn9%xnLv|I8Fa(X* zP}Pi)ylwt;;?f_F$KHsn`zy`&!zuYMa4ga$fpyrHklRe;drg+eqqkue5?YvV@GEW} zvpXq>#tso=C#$r=+U@v9!>ZxQ_xDJPwD?C?GOUrxCVpUN<g`rA_U)Juyg>CnYAkD3m8EF8y?hi6yVof=uCvx_dl)@BcZ3D6G9TZ4;cogQ&5lE7anQ0MYoA@`_kS>i8nFA!?uaF#Ugfz;Oey37cP%eH{JXI!2M7 zm8`C!7A)D_08|rPKC5o_ShC|hODdJBNZ}#8E_A?jCj7HXyPXb+oLK1WRHDDhww6V& zF;d=$kwM>29svvWO%3L5;Ct{x$#C0w_30Z*duvw*URlCxEbuXe#ig(mnF2A;+eeMq zd%?NXS~R9(c+ZIy3TL% zQhM}719peMg+cfHG@;{7pK_6CM~~c6Z`bDV6*YVYlIu_Ytt?8pHYv{?%c@Cu)lWa-H%9OcTzft#1ir%yd zVmOop2)B>T<%jqyJ41sw>eFLr%Mk5KO{{by$!nFAyUo{~*M9cmIiC72=TX*H4EoFq zOz`KhQ>+r%CRzX|^rzEwf#*#(a5wSUB)Zzv-7OL2iax!CTYy^@u(Wik=opnuZ2wB> zSN+Y>MyN%uXU8ZGnRr{gy)?;Jy`D<0)JQ~JYSPB&P1cI2!u0tBe>N09p|}|tn%~_p zokMAgJEE*jjPc$OAcuWSqFH2m&=b4lV?GtptLjmCO9b_(Fs_a z`+SJOj((%c=M~P*kO$|7oJvjEdSN_#(Zof}-?;D2RoNlyY$M#@#EmHkVb)qP&VV80 z$9*@6HH{HmrHeJ42>8<;Rx?6$F!tv@u>k46^#M9c->8(Bp=%5bhq5GO!ArxQnyApV=&ZR;hy;Q5>ckTkBfeC${^mv=ePhsB9&>fR!F69_d;P?a+G%CY_^62r5TQ>SpB{5E zC^9n)-O+a|>SiNskn7!_G4!GiIt8f(zvHV&CG`Sze;|~MI(X<_lm+t*xPhj+-D1c7 zfOGR?Hb96qbr)Ruhvgm?@+g;!1)FiMfDG$fsim&g&BaJNnDhbcEP!w zlVCthvac>j>d(WXcE}=~Td=xqtd&J^0Nx83Wvw)0`Cd0Q0%pRQZz8;{n)s^<2zT~! zASfW}0K)J&`tc33E{XIh2}LFr^nGZ z7i*fZtJJ;{@Ixc^ZeqV89k#3}S7K5KovOs(CLuf+D!|^J3CMUgYhp3!RuCg#GDvxE zSTxq-iCFh2pL6)aPhr%rj)QGUNFJ_9j-*S&L*hNFKu*dXER=*Y2Fph0=q#CD7`tgV z+=j{bBmIpwym`|&h?&Y!(bnY!VSjEu>Od`qm2wQ;IPf<=cXC_34_m>P&1G&7Do=S* z{+ci(JXbZH9X>9Ai3)XY+ z)t+P%xfzN)@zdK2Kc*~pgE?vbH6Q~kw%UDXhIUwAUC7R=fM%Lkgs#LuJ-LSK18*)@ zg2J`DSlS!BN1=oOMYM?*Q|bVpyCho}o6p6X2cp(+Nox>j#P+^%nX;_4geGY#lVw#O-0vO5%DZ)Kl z9Fh-nV?Mt=5Pa{*v2gT;=039xcLOlm!IG4sSoeWQIqr*FZ!q27lD;?0mrN7tq1vYO zQd!8uSH;rVH=OOIw(8O_iVgr7p@1$k<`6iy*7p-IU~}|buWn`lry{|@uLIIv=iqHO zq*XBZ|GfZ*|IS=i1an}t*`dk;*5UAEfJWF0-nW-1ig5v4pOmEhXATH*Eu=5Xdd*mr zBEJ9%ik9LIkq;R*j?K3yYiq-r&dblzXZ7_g3CZw83#7;o7JttJrB|mENR70`g`%tv z3>lnd(bHl8w>;t&uv{mqrVm`V4Et<-?K+EOd?rw+nB!&5ko7KCGdZc_XC(mG7Z9{g zIui&JRwCK5^O0?pPaV&a)(XArE8|!kLK2hr@J)AY zaWDxT)oW35ga~s|wlxuvLt=ojg|q9Xt1&BSK-Ajj*~YuF+!0bF0IF_bn&U0^v^77_ zmI@SaN^A^YcPRH6=a?C+q=31v31huFl_2O_o{O z17O~JA)imh#aoS7X%nF3!NevPwu3f>6yw z40BYgsoKFIrKp4U%#?W#lI5_Jj=PBwaISiSX@*p$24@3con8wkcARt;!b_eHBSC7X z#1GTP^O|#e!!Pd1986AC0zl#Cg||0d!1aWQOW#0#55O~$dXlUQaE9gdtYLnOM$r7VJfT*&H8eS6Di78@nS4-85a_afS)l<1-24>dx$1x36%NA>V$25 zv`?AP41#GZGkpZE`-J*G8?mw-_Y3X8<${d?GW;sDXZWJtQBda0yRK%QzTQ#gk2h4s zY02--EQqV(lmOAzKHKw3k=8kxIP+FaE0D-{V^iRbb9IZM-ybt%^?|X88F06!|BTQP z80apRa%aRjOS`4YUj&sCLQ7_r>_!M;wy`t(z3X4H1srmIOv8vt>i%8(hg3A@#u0(-R9>zk;Y&1cb`AbwM5cGOUX;g z>&uEX*BEUqw{RpQV4o&?tPEEa!kt#lk|%OUp1%lXfPmy>`xV-$Fw?>124cej-HlS$ zbPlA%c`%G12a*rKO~a3=WI2-zA>V`vPy3Tr(`pAOcf@vN>6hEfEc(@mTsgLIo~9%x zd3wBc)8I~AgEKyQ{2#LJPTQ(~OjSDj49VZaCdC>E-3^6k0QSRPgyBhR9Bew8Q3n(p zWYhKJ`TQ&FBdipO_X#Dp>5L9@yPR#1NXKcTVlZOuCa2@9sdt6CZNdpr2qizzi$<0~nET+jzP&gTgZy}c=4IA>FiHmz2%cTA5$wS^?{4!#p4@P+$Rur8# z@gvM~l{jpOME{qh5dx#A^rZDOmrk|{@h*N5%b)zph_z^|D{tc900Sv0Kii-ufe>)K zoPJ0lHlTN~hD-((Bu3KLq)$;_q}+e1+k!DjRDz_kf67QDg7n2Rh(1d3gN9nbKrSl= ziMh{nwYn{Cgy2F$_bKx8@g}R(HSg)96@Ag?crjJ|5`Z!4fcSJ$l6b)Q3pfDnQHQ<( z8Z=O12%DCuXTW#v~opWG6Dzb zq2*?Lwt}RjU;wxXuWwkAqJ7Lztc7sDQ1tE8Mw0FfX?gb(phMP^JmIdSUInr;t?7U(FNTP^sJ~%O1+|d_e zLCBbc)&+K8bCK*~dW;dblhn^`SFUH1TnSJ}%NmgQLH9Ef8kKR=vKVT3qjk{18KY#SQcO0}AZU$3!^v5J&=LXm&a-)mBc8-@Nw{pN*Kr0$zB6%{G7 zm+A@CfQ4d45Omf^Do@kNI=(Bo+T*t{H)}&LZFPYJqaIv0t-|sLeQ{3hzUOXLr_f4G z7;CFTGnaS!Wg^gBx(8IWA%pPClhX`yjnMRf`_Dw90kzW58!u|?1>52A2e?!(*DS3v z#-jSR9T&pNZ1=|%Ky#COGDR^sHMM;stys$d`S-uQ)#dqrF|lU-XX8ccqX`BV%9 z&TBhM2gmN3IS>mHjSwGd?^ljeoE|fCaaVuaqy_dbJT49W0}T3RZqsx#;(*c~vJ&8; zGf!D-P)L)Ws|U)k8vhzzYh-P~16~r8Fq%hQ`7B(as5!XPIM(y*4z8Y%m?WMZMu5nK z*Ulp=vgpES7sPDpFXKvq=xQEBRm^%;nmdK+_`+?&Z%PyLGQk(M78R>NuEINOr^BW9 zKW!~mdt%N(?Vt^IAQ8|fTsi<5^Eka$fP?&2#595worbgb@33ckx-?UnMJ3g5F2Q;$g!kIx4 z%fD{-Ig`|X$&u4h&=q~gn)W`Ogi-oX=z|(?`jEUxH|xDloA1YTdJX5SnquR$-6l&{ z)Jc_JDdo;l^o@{=GM_(*W6Mn%RbN61CP_W{?xn|WqDuHqX3;R6{d>FC{mP}62JxF; zq;*hsHO0p;6Z0{e{J-H{R?HkYc0-L~_|TJWM4==kE+q+mJJTi42*ROkm3g}QCB>!L z2qPZF0D51`=#qQ)PB?H6bPnZPuBropLv%K)zkSnmTo~LQx{KDtnW`jf1|2!isss@pw)jy;K3_ zc_7G}jr*HyN{|`=D+M@mHxD{!0`AA>*DRzSKM8~o7-~55&K%zndMZ~>;=#PQa|kuH z(7bk_fAKvRa&NQSv3p2Uee>df6rHMz2@h{|xYEaUTsSc3Nvna)2M}2y6=>62jw5dA ztAq=A;n^Mt{0lvTbz*I!ROM@El(|NU0@*#;zHJS(Bp=OYg)Cqmtt3p{)8hQlQyF)JVAt%| z#uK+|Tufml>46yuCZFn(7oAzUlpvk;bD(XM0|W%Na@%pG(;`3mfFSFbCv`TtIq%UX zpLQt`RZSfs@?~gJ*I#yBh(@VBP-we8!o1~)UNXN~9=_2ltW6+wvdShbKS3f7{wpzH ztj@;Z`t2T4y5M6Req>VCl&?spF(O~G@6cC~DzOXti_)FvBkx)j&rNUNjuLf%E4wO7 zE7#^w5ya3V(kBGi8$B3Z80yCBp1R@2?8!?mzuZSYYuzTstt_fm#Bnn3%II193gz*a zZVz45Gi7Nn+4GkdSZ4q0Z0#wvphen&72DVv)gZJJsr!;KP7%Y6cC2#8wc@fX@i5`8 zLW=bgr}s#lwUG%YJVi^CZIpI+<7}7(u!+<>uVG)hY8998UoKCu z|Hah5ulJh$iEpHiE_rt<3`xGsf_>cXTu5(pVyb=xO^Qn<#XGn=YBrM2ny!Q7jX7sZ zuvhn70Pa32(w@aJCd%4g;@T^!nb&+9HrL>{a6Nhb@@&A`8Q>073#eLVoqvR+AQ(4{ zT7$*R1`QNKQwO`Uc#6qIhISkyRNjX)lgHh6R#3R_&DSJ`yBO-i~exLLKpNKE~Khf`FfG;H4c175T6rC@B|- zVjwEOjP#8vw)1wl`gFAZ)^ZkG3cIz?ykjyKcf^}Njm1**uhJQgt4^vYpqbM?aWfha_rjcS{Ell2 zv=OaTWFZKh_g4xfP=+B%fza&-aOFWOH*#vn+9 zhcwl1<{E=Ml*`sqM=wAZU*D7#L^nIKmK5uk*SE3NnL3bpUxN#2eJEzGZQIt5DfZ$s zY!t%=f<=QyfcCPQL!|(;F_1yA##$?Tea4bU*}`N%XZWE`rUvu?wwj`wugZ9<$#uY= zyeIr!ki2mA3`dMw?iLg-feMiIbL}M(6Rt_KPn@b7d>mn~isSj_rJ^$-4MH#MFMxtV z>o@s}ZNAG)&fu?hF4Z_@<7<$S?XIc`LZWN4;Q2B_Grm`@lC(v&=g<2gcc%b<7ft1O zqs25v3sFIm`g)!4svibgvT_@`*dqLSS_DO?N1N$@kZ<=~nr8ENA6o`}X6jT6tR%iU zEP|`4m4Ddu$yzKF%=%7QxG7|+qk^AVM>j;G$+0=>Th|}&p9NRkzrg-w?fYlAZ~Zis zy5E?Q7pKg>bwxu+^2_Z(9V%}+Oc8EQDb@}?*?M=5a^5x5vu(OTC?u?}@ov-;(O9Kb zq;BfE$`pMAhVx}*Pw?hVdnGkzf~2kw{o)VmK>GYe3a<3tHStAr^5*Lq_&>i98LEY6 zd!m~W4Qq@G(`w6phhewmUUBN?W&))4l>H9wCvRWv-}D>|adFU}&LF;1;^e@$TfoxC zztruDhanZUZ9Xbh0zZR=AyM5o9F`ZhX8w3j}rZ_-XtGPUu>+@@L!hLc| zQtE5rQ!kNSintx2Fj9$gBOB4$3=mOn67<#oopTa9oPu_X@oAs7sQ8bZR~* z;39zZ2Tf=CACi6Qv|$BuWU;8rQFpFR^5G3`-M2x4g|tT`Mq);L*;_Tvui^JAT08Mo zJWap%qd$6AeOo-8_|b-k!$*h7iV^c{cIS*wC&dQ(^HG}?oxK8@| zS49=}nS-lVMMF8L8wjbtw|v}4O>)jDaP_c%w?RJmD8MfvxURQ?pDAhB`Ui6rFJprx zdi7M0^gI@TTbLR6L8_mLo@okQ22Nk(Kym$_BCS zaBQUZwT&E)V02H!dUX1{d+>IgCIWofTx7ll)B_jc3$H3Xztm!zvKB}*BD;>lsf~sZ zO9&k5evhgY5bh#E-ALiM;Oz9h8`8}@&!W*dF=PnWh-U5pzngDRz$k@$&9Ba2#jg05 zafIF$XFpy2+eCOHOfEcR6*chwM;enQTA3XqJ7ZxE6^Vq0!MnZ19W-ZU@C)k5yk-Q{ zkMx{B3(^qTSJdcmV(}=XB8g>CDUdzR zZ;cVha5D|cJ1BGr#NGsmf!!Hm73zjP=FzuOnuFMp?LwRXoYi}d0`3TG@ZDHIpyxFw z6{SIh_G9~y+I}JNgv)xEn@!y4&HvlA5En^ITujYN07ul{^looi!G$#xW{-Ct8UAJL z!W^=YdEKEm{f6&ns6MwOM33YypCHD#zyRJP`FNb!@*Pun9B}iS2uFB$srQF`jo(E8 zw60_Q3xlHjk3S`$`ZMMfG0aKgjotO-`ti|i1g*v>WO%TVbFPJ3LxojkiJcHmhlzYDE7?-e4fqJQzG5h>NrK($EZ#>zWO8Ve- zpPG{s@CR%-;Qe`GJZ%Zjev&5de#QpG4KJ_RjqaM`J+sF@Y>T4AK!>E7MKkx6^zvNa zo)o|ZRfrDg7&zQB-v<|EW!Ll8+tr!16=8?DJJW7@QQa2Zzdq^%RS5o^>oakK-gR}G zID>VYJ_3_gsn}_e4*KzvS|tBn78(EM+__%QBOR`}%89IY4!z@)-Nq}^_GC4U04;0y zpmo?gX21bFDZ*L5jjSNlj2%|5rcY1Ge7XpR(#r*D!!-8CS2~nF6>fVEhVdq%(xhz) zadA!gd4)ZWqn^e77~x=qx~Qs$pMIbU@Dzu{OB>p;OrH?RuUc4tw~A$zfjKYETQp zHLyVb{lzj_t4t&(X@D^V+1+$X-2NDq|0s5+O!e%j+4$PE#)&^=1yq`Dch(}-D_vRp z6$M@=4!Q}?iUlR2@5+nj`7jz){m)>(onHv8Weo2;;+D?-u2vpnivPz0uI@Ek%T9q7 zzV-RlC3-Q>4QwS^IVA4an9&Yd9Yk{Rz)KV`t&iSNq#|hCjThzxi)1&BSKs5B_P_f? zV(YvzT%&!Pc=rS0LX;yM*WWtfg;Nov*^8WbxzNVy-;4@sVq{V1flZ0qq=BSFpX;Ne zDvwAh!tJn^^t&9`LjDZoTL+XRzliE6L*p@Q>bUdyrS>^&T#{~{aKGy&6#MddArZ`9 zAC|hn7n-?MEa4mqm;7Jt8wor!Rqofs9{7WQi?BN1j}{|MdlrN?hN3uEda-}omX~b# zh5A}C{t@csa?yR-nPn?c{LZVm%HOwPZ+IKXp77HC@wzCyVeE6$(%#yZSL4f&{&+fM zR1yHPPlj7*<+CPI&%JW^`gNY;qCJM9d>2+n=D+=MX-bEt^Qq=T0HE47k?H02!&`FqgVybw9!pQCX>%`<%Wcbq$UKJ&fu8cCF03 zBwr;zk%&l7?oS4#Nh4*w$?uW7Eu_q!R-8(bbjy>wG9nqUE}-R%L1@nxt&|=arSI_N zJ$lic8Qgt77gat@?E-XkEZTUox)IJsx+fdPa&6LCSyFmMGV4BfH3#|1oz$EzeFFn% zWd(DZa&&t%S$*4$-|GQ=?bKzEGjVinGWd;5PKpeMPdLv#xk@0LL@&~buWRGSknRU` zL~wH`LYjY#SX;K791|GPx1kuAcR*bQuPuGLcwC)rN5FMi-5)2cT)9Jm)`B_N3IIc zERP`)GfOrC(GqHm*|c_nf?dxzL)%1i<3zs8p#z;7dF>V zpvjhDG`B{%0;q?`-+4Ikcat1-7AhbS}h%g#S*#*L5@f z1ThqM#l{2QUj@I}LC%FK#*Qkd5AWL7nLG+3s`BR#PnRYqu%ezhu>|;OPv9jV-UW}p zUXAE4`j1)EVR$nbJOMx`$u%0&hEJ7Ui-ZlMIz7~3(0Q+YZac1&S_6~LiVgY-@x{Dv z|Itu?IS$GMZFIyR@4=LP+66?l_}|JH?^it=m^cq^^5# zjw)*D5h&(cF@WCy-DdwJnu%p(-26zHd>dtlPJ=>5WZ{q3+-Bos(**8TN-?WuO*I(_ z?L_T3IAVC^zWPE`QX*3vKkXt z_|wmD7fQJmSTp}E;rvz3;vSY1ot;)JT8v>J2Q>HZpdhC&^CeTk$9)$i*Yd6kPU}0TV9!pFD)+dje&-uPr1_)LR!Iud^O*W;RB1X9 zLNEX4*~gIZkfx>B5vB}t8eQ!BKdY7e)MD}f{olr^qYGKw{&2G{-@;lNLF0?Oq9<&Q z&cV|s>e(Pn19s56cl_MmqNYX-EnPUcZxhg9bdC6WO&|8EtII_HT&e{D3wrerAsLN6 z7|hoMVSGEa9Bf@>{$k7!@c(-OLOs3an4X)I>#{=o??g#uoc2?P4sr9|w?5x|ESU5y zM?5$qYSJB<^qN{~kTYu3lNNv;z#VQQC+3;B@0GDPo`LYEo;&w!1VnBysb{$^f(aAW zi4Ub_9D?{GIV9d9+@XO@uxzB=l%2?YL+TSar1!y;sc-2i7b8^vcPSbbS;D`I4Ttyr z`L6`o6{cd+2A%+=(00{({;od==rv>=4i>7gKOqGE3i59HT z0eKV?G#kT)74>@zWWw24dgNbN){;Dejzgt`Fg|1l1<1wcP|X&)n6k@!9p~Q0gRW9y z6NP6EHO>1iyy!55;`$ykpp+St0UCa>dh4uyS9H)$_;%h;XX3#R{PB)p=ikzAlB~sK z!A4Tb`DZ0H+>2m5*?n~md>RGEXpnG`YEt_*_pvo1NK5=D88}uluJ#-+?BS(Y*YYY2 zW)Ee=<((fFnJ&?ILqX}#2F2Y!n&jBdO(Dw-Z1EZ79aHx}@-DY5&!3r@=Ar?^ zrk)_I3PIJVkc$)4Oh2-Q4ABTUkD#2&<+IokN!iCrj8w|9^0&4mSpPpwy>(br&;LGr zSUP11=~_Zi8l;;gq*J;Cq`Re-UZs(4X`~yaK^mk(8cFHy`0e}iy{_ka_Rq6BGiPSc znR(TH-_G$G2zyp=ecgE&K|Ckl$4~c#N;lV7xshUbcmHSkAw>sJvZFUmuMS!wK3WqIhbjK+r9?+a$V8(=BBRJ(ZAczhu+ez39gZ?NX)mPj~B zKSkel(#?uKJ^SG^roy`58BF%&bi3hX9Fok^g^(; z$lK$~-;&zxj_l22>zC9iH;7GkMRl?FX<7X@Vw1?0w|$Uuac8eRaRD%or@sQmp5uaz z@EdjXPStR(752&ho-c6rvZMEEz}X;7U&5SnUsv3uar#f>VcqK*H?&8ZHFHgHLehzK z{H#T&dA#{#)4P(f+{k{=XtR@*w2#iuwM#&s7%WaM*Dy|uc&+6lP54yv`w(mNo-Y1Q zpJGpI%CLjyZv1bqSQk!>4#klDMy^Y|yqzn^^^5sm4&~gA3SPx&G5uc^I!MgYZP--q zV!9S0HdbUif{+@-6hExb2qt@#8^uSTOZNZt`BwN_K>82jaJGu!66u(h++l}Ov7 zC4V--%?-+5L6o7(9_*{JmCE9ZIl6`~Zgvu|a*(~ilcV=6?3$dgo%pk|v09&S=q99Jww=23h5FJAU}(vG z05}J(9h+qQ{Tt!U?x$y8bAfcx5am%XUxC;f>%Dmw&QvbhYF%cx-*P3$h{EJRmI1SS z?uzhPgn)YtNvX22t}USZ(X5jkAPyJOK^YRE`c@^#BrW}$vtd&D)O(PQm7j>t3GEBP zf3cy7(Lhsh%q3dC&}~9t%+YJ_(3b-{Ihf;m-+o}C)hI3H*1h74mx8*^w&%JG0 zTl}ONT8d|izM{(A7&-}I#qmcBd;E7OMR}VGUx~M3^b65iMB9J7#V{-noJMNqd6%-O zfpKfhETtLgf9hauR>JeHZu>>#S$)~;w&%jREg*&^5-5c>Vbkg(*~&mj@8$|K@e+Yik~v*DxTy&6v8p27M?zE6#Z3-KE`nOpL! z*nlee-N9bX>VtBDfN-!TVJ8VSj!&mrli}1&rOO2&FEbg5s~^#bn0H>`5-Og42S*W% zdZF1NJZS2dwJZ^^j%=&jegCqsizfC5SCtQ+p=qg?TJ8wb@MpV|@7I{dIb(?UU4M4X zM1tWFQtVF?;tVUDcC4}66FG6|$6T6cAx%!)D-PT|RSe}F>sQ#gIF{dSz68gV%8c-2 zM6MYQLYT26Fwaee6+h(Uxm`~6iO$p@&^&{U`UdwWEprIvKZ^%6HmEbHBUk+#ht%Ua z^!r!h%%bGZ7ksVOHaliI3$j4qRQL7l)%ag=%$6OrYJZG2^Dn7hEdsndqR^i*|7Dw3 zdlDv_c7q?RH>e3~(Hxyhy*?*D=f)Qr&U@@LsqkGm9oDbO4M!|Sg0C{PnULKj{kqSA zybb2aZ7N=dKL)-54hSxr?0VGLpClG1po`ZZo*LYue4FJFp?pT}>mI6O$rcE;SCzXM z3~*nQFHaKanvnb9>5m=r=ZqN!P7*YqXBM%}bog@TrA2-}`UqJc#27Q7>=&%Oh>v7D zG_v4XnbLT%N)*(GE#TQ{Etkd}vSovR&Vy;L2l(0B4??Wl?h%HC8uZ+;4)v~7_Yel! z&mO)xGFtqJz9x9MP|aFUh1B{=2~-{H$UI=_cslT}c3$$>AjZlyFAa7wA0;q*ma^rh z9?W}^rJ<%tIT%<~YLn4JNUA!8&xR1w-LazjZRV(y%+SZ12N13M&3Q7kq!}r(__J+v zytNp$vn}<4dlq*{E4>0!AnUX)<60VaZD*T%K@GGzo0L~fgD(&ccL-UETbihJxv&BG z0#(s%)-39{LD{0%H!fT(A3E8Wf~vzvhE`vzkKT4YfRwCu z7T0we_oto-1u~m9&}xo#O3gf_5&0_DT$SA`EPn(e{=qxc3L97z43?S3O>FD$ifh4j zc*C~xObq;pIY4}HD$wRCCyI`uY@MQWvmD31(S z7@~k+No0>&8T6wo&hocXj>)73oo}*EX)4|`w=Ss_X%BcDoWzM03GCs;@iUP37}`K| zkgSg;`lj&0MXYb{rXR(chW@77g%$`HXCKnnQ4YhXAL!vTfb3w#e?5t2H+Ul z9v_~?A>z!nN>i3WPbsNOQB>^dz)8Iv&7x4=G&^4y|I7JT=e+1VzfbMWi}BgqRJUbUFN1Qv+--w)2XbCC#LlXI zeGBK7ma<+MtgCXvW*cc4lBWAkn;hosI^*Mhu9BohuDiv5bU8lE+s1W=E z)w1EZiqf!!y)WVeBZ4KPgiJdm5ZkK6JL6xSqxH|UzRh&Q=4B-EAwI?VOM3XwUIYWg zI!F)+ZnL6dsz(Uz(Gy&oQA51x(ceaJ^)f>YHgR2f%7r6*N0`toT>M5GFf=zD((T}q z@ts+UW)wadP$alddn4v&OAcp>qwka_2WbHAGao`RV9RG7!*s_lVc$ zWRF>_VT&1CLqL*IexIa)&}srt2rf5ezqrPqiuQ5^$+>a$D# zCtXYeE2#7>CY(T1FhVx`eyt4E**5KH<0BbTTX_Qjc(3xr1b2TDf{l`TpZdTP<(&_! z*tr>!m^Vpq1~~N2RWyn%W-R$1e!&l>EL>AmFz#?qY@w8-ukrB34>tNd^v}C*Aqou0 z-!=A_Am3G?zAS~a*0EK88^jmqqv3eNB-X9F4F?J6IlSad z#TFBMsiwg8Ht|py$}udI0B(omO(kh)TD}fQdBX*A4~#ODfsR`6ad#ucy>(dK{1C$9 zln?lt3Tz_;f%k+HQ-YZ(Rq&D!4cjERyr;=QG37N64N^(EjJ}Xfz_XjZdbbpa0;yAJ zo$aSEft%I`q&He;>2(dK1YVTRjADmQCZL${@|#vp1g3k9XE;GaZv1 zVW$--?tUYEoyWb+{sz=(IhMtlg zm(DW`^NCtwgLN{mo->gGiPD0_0J-xOos?g@^Ud|`UZo6D-D{P?m+IAt#6Zj%|DZJc z?7eKzn|L2#af^1bny_2caqY;Q6M7g&U6OY+VY`3MyJi!~Qw-PpxM(xmZevN(+&yYcs#x0CDd@gbjh zMCK~b`e06p&q!Viy<0T+1oHpzGlSV_ey1;OJu(D^4fo=i5hj~l%O+~v2ky3n05dr6 zvb#^pSw14pX;k4^>9k^XT1>;I)DAH9`OKt76E*Bb{ir7(e&5l#S~d9X%r(#X2QTXV zH~g+$%Th0y+>u?NK5S0=A(p< zTPwj*P#u;ZyF$hk zFVH!03`a zJs1TATnJzLDpv*pF<6N{bF~x4c%}@neL$pG@2m=Wd`7Bg0ROHkIZG9vD0NN>r6}T? ziWOV>Dz8B#5YS$eX!Nnpg5#Ulul|L=`ur!bzH^T5-Hyvm zCl2WrQK`LFCgE%elJukWwLR}SqVFV~Nb@3Lr(wxgA(G4i+qm~2pb04z&y*d;2+Zo< z1x}gcY=|1Co-1aK<>x^;k;f5nYj9En36PmRrrwJsgS57rRV?=~iGE(5^sP;i%0q?u z)N8{p)`#l2WL3_fV;iYtgIS!pCpM1+$Km}>!-7ZpYdtDd*&q>i=-N@kw6JEKyXcbI z_PnWxODxAs3~*&i5hjgfza@x9!)U63dEUI_^4v1(*)&!R@)wov+cU}iI^USz$P9dQ zpV|JAPIQWbHj>fKcP;vU`@O+l0FbMI*+KG^d+A{j(5>_t*9yJ(p&0sR+;U-6Y_q`j zQ^s|8y+`JOJ19kMCE>Rsu*S|dF2jF#I~cUH${>Q4vk$vhNbPTldA#xB{({#M;v%RlEOVxWYc)YrNpB~t8p?7V>~Ed2`XU|+-nt{3~= zrv5ac`1pM@S5f(5hJ1i#8vOFFppoB5##)m7Kr;=@vr#_&j~WoCpfVFbZ$7>xJMf4O5&No8-*gvoCYcej1{08R5C@( zh2dm-R8mmQ&n1(LCkWb&chLT`j*j;VZ-@U1Adrc|)H1P}3d_b)4;2WBKf;N|@cvSEl+%9!T_-!*u8ra>qJQTM1q>x1F%2_~wb7ZeD2Co4%_ zhCFhpRt9_zf8r%nD+RuHUWWx)NQaYy)d{of1dOOt2qzq%ydm%vO@#`Cm4tvHLa0Mx zoZuyG8hcFy3AbR8F|%C+D+qt=u816qNBp-Xe<<(t#I&VCX`KZ>VZj^tlvKT9#^Nf< z=ueRw?F((ZzKO~6;r(ucjpO*3AI)N20sAL56T7@3*k6!%d=8e4DnD?Ioa3HZ?t1(s zhAPhWqf|LW6BfA9%2|~E3Y?@I<0Zi0ChEJRo?W5Gxg?6Xdu#SCrf(9zG;{eIHK=Gm z8nRV2$r=?hk0^0|`OkWwQk@=2$t?f7RKEiCuspSaw5C>b=yv_r#&{I2R|f8zK~X8b z2m!voSfMDn9-WTcg`w8V+I6Eo-4;4);0k9mp(_X|=pD1KZC5}mYyY3#e;(3*INSu1 z$*GIUllbtc6hb?Mg@PqSbIcdM*SP%qeQ@N-rBUh-IFzsa^s4CJhawlNq96J(J4bpE zCO)wQ@rQWXD=(+I58eSd@{?ab+u$xRwK|^Rn^K^W@BzCl!YQ;W>y&$D@^gRGsy@?Q z?Dk_$=zgvEXw?%x9@@djajHv{ELQ_!cYa#=ml_drmblH`*y{MJ&%32|r~lMX$(Jh7 ze+=b>FL0f0tLm(w73{eAY%(||wqDEg=9z z%(Ez{Xv_xgX>?^XQqQ+80CY{kD{!}jd`UU+lBg8peqq1u>M8t9lx1rLl!3NZ-oYC8 z7D&e4P?2CPSOAg%EI#UEwzORsEbqqQn#ieznlK<(sXPT|Ha}FFaV~u267I z>g!;y-iNR-q4l$2xEW>AI>BfMN%k8#H<%RLx`KAys``{PwSibWccqK+{fxpBV@>u@ z$i`u_#{1we@K`Is8-d1we&c0&N=L>|a`yM#)gJ81pG z7Gp((A5-!zm#x28Bq6bFp_%vSn^`S=tQ+ns21+C|0UbISUzy&{Foj68ISd^OYDW8msP>OXQ{(%Q?JDNA99CR zx^{A?N0Q1&I_adCbHbwaPZb>;fPKa{DVO9ODObC8a#$~C)tGKy>$~#E z^K>U+!B)ZSHtC` zr|_yan{0;r?+fk)qKu0bxg75N$Q@}~o+B185q4d2AvAtN{Co=9NCTaG3A5UdbomO5 zN3KfJ9FRx{cI}6qf3U84wfg)#b)kYpy1`ZH54}VE;fERV3F9Az;?464 z(xYPEUm}&sF)h>b3MxTomqPvCu>^x-!U4ErTONjZeZqa`%Z6Z`TKdr}AEoXMighkN zmute!-eK=A5!HA#(`|B179KK)Oj}-8uGMO2pEh!*#aP%!+k|yVx6Y|MzwaNqy?{od z!7&Qs8LnRo7}Q{X*1Q_NZLd-EuN&?rGu#DFqFr2gr=*K4klSFtPh4Z?_zNL8m*2@* z4U1t@7!*U#B{IAe31Kz3=Z4Ph=+55Y(+g<7E(byB7=@V8!P-;_gnVcHA?DUJRnB({ ze77QH_go#?=N;ES|C_Kh7Tq<4tm*`zduJwRe*dO0dv-4gJaGwi|FAYT^?4Vga9Y3O zKm_t#%&P+)0#M z1W!aH4q23#BNf&zI53}Zy=Tm`Yq;zR$AwPIuw2I5@x01=1uuC4b|}#58_0q0l00dD zj4pq;c7kd}!-MrMj|#MyMimkXn5?-z&rw{tg+eo~s3pT`6PsaZZE zbH#K#$L|PxWvD*9_}!R-jpI39A4~7@73B_0G_5Gi2#uQqcCAWTqz4&r6xoWDgs}9W=X@{H&ZYZvP(Ebff8R%|jR5e;B#rSinSf>)6P+?sXuKgCP3Nu(wm(A9%)5#=oqB zO`--FNJ(H*I65)ftd=3_fJwAXE3!z;V-A503DF)zyO%yF?CmluO>_lLq5)1WDoik_ zLs|7}V@3T%hE4G;O10>#)03_{DW!q#Ql}19RGm7|TG+76`M$gK^0v2LH1k5)tf(sRd2%JzWlVOkZ57i`a$Df%S~Nx*lR zg3=|)sXq6YYAOY8lA%>8{74rZoW=+l!LE;IsV^#NmE~T}>)xHWtVLq`t$4lH4aBDW zlcF~?!?pQVuutu1v1Be3Z^7^3A?FRE{w#P>uiDo8H4-AumvuAT7cK_=_rtKPDnf0U zEu_X1shYPt*wf1}eyFxnuCSMbOcpn>89@vOscGOlP@>bfZ`I zZC?8x{)bc!MQjWsaIBZCQ=WDp)JZRbzSk zMf=X@P1+w&Wqx>TpK{{Ve*|xG<{py{b*%phv>GikrGj;w)D{0#@x{(1gQY-N-6OH- zeg~8mWsZjUaO`T0`i0dCbl;y4z&_ek@^snt(2MN<3$Ju?K8OuiSe<&uAJE?Kos%FO zD9OTV5$n^6^OexUvgDNK<<$O`Kxoc7iGvHlS!iH1<>v&k zB#u<*b}KndCRxw~Gxr_!)Jm+S5Z2XLZiiUe@dH^+qCCf5X{S$aNurH+58J_e*3&KU_Y-%o~uH6WLnT!~5C) zIkaDFb%W|$R7}<8Xo#B}6hWY(dBwva(s<0uW}P`LVOeK7uYb#zWzhjI%}+|2XL z*vZmG9wwQ16dM%B`4`eLy{NR49cx5zk1T-P2?Y#%r)>^73+mQC=3s>RT*%xh>grlb zmcL?udlt3wlC@6#gc~-?bx9-gPxwvrov;wdMETS{Kd5;0Yv?s`;>BOjhJM8}YS{1O zyL%*ouH-+Fv8(*H*H3M%#VC@BYlQWv4uI3eS3&N14yL(wjE$odS%Hanz`{28*sy)% ztISXHj2+<(jGzoup~X+sUi-Tw^tks7A=>~zw*C$(sYS)xGw|M~(Jd-$7L(dT_&l9B zyiDdNYHjCjA;FW$bo2Q`Lz|)94zKi&yYfqp@r2uXzE2clQSv6*0R5CM=kX9pq*H|U zU7u8q!q~Z&xm-l=!?}-?c`Sa98ij0k!j&+x{%@RmasHl0rD9TKsl9_TGTH@N7Jt;> z&PcZ}J9%8)b!`i1Y<^@gHzdPem-bcAiDvjav00acV+x>N)$QQ&28-_XM}Rcdyxqg~ zrf`gfsN+J!|CON&3E!sB5lBPt@?!yA6Cu*HBD`qL?~$jc@w7+Kj)Y=`1n)fsfR@BDu&Je^9@3 zDc|2}oI;=ey}Eo4O*>GQ}ZEOr`>)&cq!Z$k(B%N`sP$FU;8J(%byAtE6I&5|};~NqO$0@$#QQswImN>ZcU=W7e@ez)RA}W-mOh z=|!?>*QP+3!&qot*)QTpYgUUIY|Wt~Ev<&PI5$qKNI@)LNV<#woMb<$%>Ion!|7MY zGyT?kSej!+u`FWrMd>DrWad5QdD)WLZ7X@FCuC;D?GNSEK>~I{``)_OwqJ6VJ13z; z6Yu>BZbmVZml^U{zrX#%wPGiGvDvQxVL)K^s?dp9eBhjSQ%}A~DTwy4cb9Lh*VIqx zk*cy`Q8b)y-?gC2ghvZS-wsPbO9WGKwl{UVvTFZHr{Iq-HI3)UMmy$}aHu7Nky1=g zN)E0!dUfQ9-%T;*)3N{`0xqiiN6)~=c3s`7^%d3M4G#QY)wD_{e(Oi0)6B7KXCc_X z)3{>t!7w{E6M^SwQ+hS9nTq{&JU_6T1yoUcT)gqhT|aM1F@K_dm)o(ziapF7SBwd~ zCdmA{;3wn71e06)jf3S~1eJYVGt;8KY!h=f;}dH60!t#Dk--ubdso<9nANN zdCo-$rT@&Z`o4AJ)ma1ypmY+am#w@83__TOs;1&*sioTA&T559Rw%{PUeb$xV?wy``bl6QD=g*T={$mamnFTN*Z|>Esq~+iZQ@+amh6i(^oO|(s$THb3M)=_@xqy{g157yG3PWhnwka8mB4X;uahvicp8oeQSD86;=9jBp| zJQWJ{X<$HW@A$>7#n>%i3u+EoZK0~=bP`6}HA0g9z|iP6t{D`Fx>iLu^tI}*d#QZ2 zMBJl{n=VSqH!koZ9{GK1(w56%ubI1ty+VI8Jftith70nS^$D`{XQJ4ZlD`VQx=sG% z*llJ4ta7V7$MO=El}1wcVe{D9+oG|4oQL6Ng~4Atw|Bq8!1sLyaar_&u>042C~7C^ zn2$bvJUeRe5_`5$yu!i;#h3aTtCoJda8Zw1-fT8Ol!J|zi?C}RYlBk{=}fbPj-6bE ze87F?ZV~ee$~X4;;z>+Z)nMEDYe4bHnb?<|hkMdnZ~9@`A{P$N@r7maE}ydK(J6)( z`?_t9yf5L(`N7E@Uy^H5H=@zS; znOko!^1r>@d_=+|rCOse1cva4e)I;#-2TYfIWf$hvgA6qB_Ec!OzkJC9|{!g`XS6W zJ{C*q;f5_nJWu4^7_;F#?OgBSjS{x^QqKi7_`yIa*3Hi)z1{nJcs&Wi4rKeN--PDO zEvIa-pX){y@!>IJlp+XsfO@NOp;%Ip3a|ByAt5OGRnD)rTcXs~_dH9=5u1z{Go>joT~vO!tRCOTp7nB(Xc$oA5S&+8m* zpK@v4%G#jC)Z({wynU{RH;<(#cjKZSD--Q^IxcIuuVeV`&dJw8=KjL5UgKlb)?pY? znFX~9Wdw{STYnG-H4~O@zG;9o&MDj3HIb5>;kCvE?7-o8Z)$?~(Pf_YKrb-BqjY&y zNg5d+{_d+o-CsPr;euz>6&#f6Du&_Kh7wG|uM1!HOKjLc-IK0%`Vm}lh0|WiLJgmH zT_I=6g(69CmG=s4N!nVp%ziR!(1@yr7>@O{w=XiRZWdA2xM*m+*zAv6N&AX{Rx0cB zb=I+}zZ@HF^MCIMG5&VH5-IjQr7T0az0t~D)#0(XGZ^i>yh^ohHMv(1=Ph`^4{^yI z-o1kAaiIqP)dVdF`&BCc=O)GRjq!z&EDu~iI8a`q_4+%#SW{Cb`y<$YZWMjojeaKD z%#0e4@t7oH#fGFc4C#1XzaLq{RZrH+u0O1frHXQr;@(Z+meDqkyk@I&V^lz(DN1T~ zl%vugDNBn_lnmjNts}*2@ulAXrn_Y4ysVGDCJv;N?`d^ypPm)>aaM942Au!lT`a{~ zqrHMPgSbAPY`E~FRa3}iW?-!~5iIQnZq&qX|FDjtv{IOEeaF{p<~L|8$nMu8>)Qkf z;C4O%`u(PaJbb}yeMKelQm7zFvo}at^&7uATmQL|ZSo19ofcGLl%qLEQyUYPLfIr` z@?~%~$crx9tU`YtdiTt+J;nZ>w2`F8a}dTs*vcFvU9!*Iv6iH<73zE)d-P{(Gr+Q& zx&3tw@3sS*MrqAH^q@?fPZf_Syclp#AXcYkR+d>~IHVTG@rv*#qf2snlnjAX6LiV| zdoDkc_0!&%ld1|D*J{h= z^~03(tDrEYo-id%nxY!X#t-BtnB9Ir3SEf3JJ2|FBhDmCZig%YbfVztBJ`UCuNr!7 z29Jw40#Kb3%3+`&W~9-01#EK0+GUhj&lbRYzPg6pYB6XbUAbG;1!|3a5?dYDazGzI ztnp)9S+}cwR+-H|YA(3CevIqIupnGrdfSQwFMubGe}}78eHCL(jIY}-DUj#JiQhGi z%g~CpX(DXVe!xF*=ktPnmgIx3TpgKJn7Wek01RzeqH$k0!d2izp!6a|z%Xed78P_9d@29^lc^nB|ofvj= zuwcQ*z_LE<Iw&ukpZvS(hv zL^n$D6=;4oKMRYUf|w-Sh#mt4Bsm>cp-leSdA54r1UVMrsqK>04qlmJKj=us+^nKF z{~Y}y-X*v&T;0WrR&5^RGdH}(eIq%kLku`#U0lm2CuO}6t=I@O7o0ief+5pi=yka; z1T-?tl9~JiQB0~J2UyJ(#N(Gnmun#wbgUdWg zoi)y?@V+MgrWw~;Kdhvvy`sdYyUjXLhBexDbVzyffg_dYLqL!E>uamIzL%{*=|tf> zNbcDGiWxOnDwMeeyLajl(e#Iy@|YV(Q4+?rBnevlUp387(MAV(9|&NL;QPI8>thF? z?abbB=q6J2MgN^H6OtWda(n`x*b#T}o&8XsHtJ%W*54h<6Ej7z$*Nz{l<{hMLtZ;? z7^k!+9UAQz-tz`~<92q5$(;fVXTo6OW6(`TITSIkl#FG} zmse;f$&$a5(`%1UGff7Hv08kuCPG$&N^U@%n6+mJlh;oJYZl zlTSe6QT#d?UDIR0Q|#lT-KMiKkwN%AyY1NSy9Dmt4UEHPidH0QB8_8RX^DJ67t+L< zLs|R?OPAkcv-VW!1%FiDUSZwP;lFM+`o;IX+I~!RqfPhsv6hFP8Dcm(W>ABG>}@SC zN$Y1o2)bKE?PM_~FqvDqmU@jYhe=Fv-g@y-$UUS!i`%;H^UDz?Ys$t71mkMGy>}9( zxojWjb}mlT=%mQpRQpramv=?6SD!zTl}rU$3Q~o6lXXZF=xHF%!vcs}Nc4KUGS9}6 zJAf{C;P$3b(R*SYtuX<26;D}%Y^^*9d7dD!abw|c0Z~qJH@MBlF9gT_K@UarEo+M%>HO$DxfNtV;-VIstiUV=Y zm_zfb4wWEAz}7`?2zT38^zpd#pxH$E-D zo{6hl@WPvo(QTAQo|DT^-GRY~7zL}17Z+7y>jo}VB*+54*2LxoMjIX9GP4A}Q)@RK z$C289#X2Uf%QV$10>}*y(IVJ7-+|}FL(C_KgeNKd2uexs9D8Ixd~*KwiqbwLT7-Rb)8Iz_=mm0q3B$HW`T`h|B=iY*XPt;l z)p}*Vi(qxvu678buHXJrQgiUfNPP^rrH8e1jsM_B@2|<)J)oTOd(g@Ek0jms$#d=@ ziRSt<+p?{t^%eo}JLv}*?DK69URr0e~;kRIBd-$$LJC1!b-lAsU_ibTXyLN*sm6XJR`R!)W!kdJifNDp zE!-+z4Co~K6~btr6(B!(eIb}$=8tQZCjPzE7j1l@`j3C|AXucyAXbzf&G}{PIg--$ z$uDdiFuGA{!rH^M*~+Tzz)T!_5g;J3qJ`*B-tp8CSYrS<=*33T4$$&ynEMv zd*Qb9{|ooNoZ8K2>{q*q!=>fvl?6=B2cdPTJLXo~r{$zu+m^|_XlEa>uy7TMB-GY2 z3|~QnG6S>BZ9Q4QZSqhK@PvKgv>d94xHf!O10uA1*6zfR7f3iEqrg%yfe;qqeJzzV z1HC{6vmuQ8n+}sRCrq$^MWQ~<)VwghIt^su>wmQQvRumhAV|6bR5M9~X2^gU0Y;}C zc>Fl`6^=)TVD~R^h*IXD%hS2JMilb3fig2Bq3-Bl)bl@qGSGhJLgRtl<$U<=QKx=w z;!c@s$TQ^Rm{FmWhLF-+2SI`h|8&lwLOHwlA# z(&c48?8`u1XnHsp^8P_Dnl<*``jq_#+D8d1#&Lg@*Fi9W)T+)96#IFX4Ur*(Zxc=k zhvgCxVLX%Lt9wBfg5aJEd0Frhf2n1}$Yjuq0*yVYH2?pobRd9l>B;m*%F^Ur8Q#d?ZUBRC*^FPoyeqvuy9X}XR zwfG2UHlPL~Z+@AA3y+c!oUp107;EA{W)nl+EOa_tqmlgZCbHcqS>F3AJo{DNPNK%x zpaJcFi;r)a3ob10y)H<+^p0TtS{t-@eBkOK*er%wyT=Sf|gxC&s zd`#pXup8{Kk5GJq!#`>cm2JorPHV(_2K~3toegPki^W-oybvs8J`%HNkh`Ejae@i% zr$;DMoNxl`siI)|^y>9f1yf$bgTYuw^wLK`u=bXT$I}c$p8iAG|IcSkJY%+&hyKrN z{Jz;m*(L|ABJg!&E=-2=V*hXD)0k0knJuBZHa_jxy-q&t@bE3@1={0!JeN)s2kL*6 z0KxXmsD~_;N$vE7<@UG^6SHg zV?^>4694jlYk>IMLtbA*g!#EC=#A>=kMn;^)b^JN!rhmH+{I|DU?*kcB-K23(B^R@ zYEXpUBRmlRVVW4eE2*!q$`xll+1DI;-N9b?m(;z9wB4gL#X% zI$I<8;VtW7t2B%F9dY8B(9P$k6X;F+ytE{r7h(%QgfdDHdA-$yMo(hcOKJyRkAlm` zxco~5v>Ea301u<7libnWz386!TFI)(M_oh%l;8(#P?0d-sVLzETj5#nf|6z+e|9@?W!a>!j zFef&OI}P9xWZ8srl9g|7l&1c_Hdu0)HxV0UPeT$v$|$#<*m)2>0^%e#V*xAy<0kuq zeV`tFoavWwuF^+@6@a+2ZcUJnPpg18P(!BCVwg0<{xL;bKqpxX%h}J>5)xxiUk^fCp?M9*V2bc)vX3_V*c{Ago<}$&?MERZ>0o%c-|ND)ILMNCSs}szv z`F}T_LvWH{ejfPlqx}B{`Ktx|M4mUDf8Ynr|9{uCK~LstfMa|b_ Date: Fri, 30 Mar 2018 18:01:23 -0400 Subject: [PATCH 150/493] Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. Also added better looking potion effects for a few things Enabled Shard of Laputa array - no book entry yet. --- .../bloodmagic/core/RegistrarBloodMagic.java | 32 ++-- .../bloodmagic/registry/ModRecipes.java | 3 +- .../handler/event/LivingArmourHandler.java | 171 ++++++++++++------ .../bloodmagic/textures/misc/potions.png | Bin 1577 -> 2109 bytes 4 files changed, 135 insertions(+), 71 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index e9287caf..9b0c4e9a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -28,7 +28,8 @@ import net.minecraftforge.registries.RegistryBuilder; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) -public class RegistrarBloodMagic { +public class RegistrarBloodMagic +{ private static final BloodOrb ORB_DEF = new BloodOrb("", 0, 0, 0); @GameRegistry.ObjectHolder("weak") @@ -60,7 +61,8 @@ public class RegistrarBloodMagic { public static IForgeRegistry BLOOD_ORBS = null; @SubscribeEvent - public static void registerBloodOrbs(RegistryEvent.Register event) { + public static void registerBloodOrbs(RegistryEvent.Register event) + { ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName(); event.getRegistry().registerAll( new BloodOrb("weak", 1, 5000, 2).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), @@ -69,13 +71,14 @@ public class RegistrarBloodMagic { new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") - ); + ); } @SubscribeEvent - public static void registerPotions(RegistryEvent.Register event) { + public static void registerPotions(RegistryEvent.Register event) + { event.getRegistry().registerAll( - new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 1).setRegistryName("boost"), + new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 0).setRegistryName("boost"), new PotionBloodMagic("Planar Binding", false, 0, 2, 0).setRegistryName("planar_binding"), new PotionBloodMagic("Soul Snare", false, 0xFFFFFF, 3, 0).setRegistryName("soul_snare"), new PotionBloodMagic("Soul Fray", true, 0xFFFFFF, 4, 0).setRegistryName("soul_fray"), @@ -86,11 +89,12 @@ public class RegistrarBloodMagic { new PotionBloodMagic("Bounce", false, 0x000000, 1, 1).setRegistryName("bounce"), new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"), new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb") - ); + ); } @SubscribeEvent - public static void registerEntities(RegistryEvent.Register event) { + public static void registerEntities(RegistryEvent.Register event) + { int entities = 0; event.getRegistry().registerAll( @@ -104,11 +108,12 @@ public class RegistrarBloodMagic { EntityEntryBuilder.create().id("corrupted_sheep", ++entities).entity(EntityCorruptedSheep.class).name("corrupted_sheep").tracker(16 * 4, 3, true).build(), EntityEntryBuilder.create().id("corrupted_chicken", ++entities).entity(EntityCorruptedChicken.class).name("corrupted_chicken").tracker(16 * 4, 3, true).build(), EntityEntryBuilder.create().id("corrupted_spider", ++entities).entity(EntityCorruptedSpider.class).name("corrupted_spider").tracker(16 * 4, 3, true).build() - ); + ); } @SubscribeEvent - public static void onRegistryCreation(RegistryEvent.NewRegistry event) { + public static void onRegistryCreation(RegistryEvent.NewRegistry event) + { BLOOD_ORBS = new RegistryBuilder() .setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")) .setIDRange(0, Short.MAX_VALUE) @@ -119,8 +124,10 @@ public class RegistrarBloodMagic { @SideOnly(Side.CLIENT) @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) { - for (BloodOrb orb : BLOOD_ORBS) { + public static void registerModels(ModelRegistryEvent event) + { + for (BloodOrb orb : BLOOD_ORBS) + { ModelResourceLocation modelLocation = orb.getModelLocation(); if (modelLocation == null) modelLocation = new ModelResourceLocation(orb.getRegistryName(), "inventory"); @@ -128,7 +135,8 @@ public class RegistrarBloodMagic { ModelLoader.registerItemVariants(RegistrarBloodMagicItems.BLOOD_ORB, modelLocation); } - ModelLoader.setCustomMeshDefinition(RegistrarBloodMagicItems.BLOOD_ORB, stack -> { + ModelLoader.setCustomMeshDefinition(RegistrarBloodMagicItems.BLOOD_ORB, stack -> + { if (!stack.hasTagCompound()) return new ModelResourceLocation(ORB_WEAK.getRegistryName(), "inventory"); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 2e2930e8..d84c7548 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -24,6 +24,7 @@ import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectAttractor; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBounce; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectFurnaceFuel; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectLaputa; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret; @@ -125,7 +126,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turret"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); -// AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.APPLE), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.REDSTONE), new ItemStack(Blocks.LAPIS_BLOCK), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Items.IRON_INGOT), new AlchemyArrayEffectSpike("spike"), new LowStaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/spikearray.png"))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index f78a7e59..456482c3 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -40,24 +40,31 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class LivingArmourHandler { +public class LivingArmourHandler +{ @SubscribeEvent - public static void onEntityHealed(LivingHealEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { + public static void onEntityHealed(LivingHealEvent event) + { + if (event.getEntityLiving() instanceof EntityPlayer) + { EntityPlayer player = (EntityPlayer) event.getEntity(); - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { + if (armour != null) + { double modifier = 1; LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.slowHeal", chestStack); - if (upgrade instanceof LivingArmourUpgradeSlowHeal) { + if (upgrade instanceof LivingArmourUpgradeSlowHeal) + { modifier *= ((LivingArmourUpgradeSlowHeal) upgrade).getHealingModifier(); } - if (modifier != 1) { + if (modifier != 1) + { event.setAmount((float) (event.getAmount() * modifier)); } } @@ -66,18 +73,23 @@ public class LivingArmourHandler { } @SubscribeEvent - public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { + public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) + { EntityPlayer player = event.getEntityPlayer(); - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { + if (armour != null) + { double modifier = 1; - for (LivingArmourUpgrade upgrade : armour.upgradeMap.values()) { + for (LivingArmourUpgrade upgrade : armour.upgradeMap.values()) + { modifier *= upgrade.getMiningSpeedModifier(player); } - if (modifier != 1) { + if (modifier != 1) + { event.setNewSpeed((float) (event.getOriginalSpeed() * modifier)); } } @@ -86,24 +98,31 @@ public class LivingArmourHandler { // Applies: Storm Trooper @SubscribeEvent - public static void onEntityJoinedWorld(EntityJoinWorldEvent event) { + public static void onEntityJoinedWorld(EntityJoinWorldEvent event) + { Entity owner = null; - if (event.getEntity() instanceof EntityArrow) { + if (event.getEntity() instanceof EntityArrow) + { owner = ((EntityArrow) event.getEntity()).shootingEntity; - } else if (event.getEntity() instanceof EntityThrowable) { + } else if (event.getEntity() instanceof EntityThrowable) + { owner = ((EntityThrowable) event.getEntity()).getThrower(); } - if (owner instanceof EntityPlayer) { + if (owner instanceof EntityPlayer) + { Entity projectile = event.getEntity(); EntityPlayer player = (EntityPlayer) owner; - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { + if (armour != null) + { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stormTrooper", chestStack); - if (upgrade instanceof LivingArmourUpgradeStormTrooper) { + if (upgrade instanceof LivingArmourUpgradeStormTrooper) + { float velocityModifier = (float) (((LivingArmourUpgradeStormTrooper) upgrade).getArrowJiggle(player) * Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ)); projectile.motionX += 2 * (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; @@ -116,29 +135,37 @@ public class LivingArmourHandler { } @SubscribeEvent - public static void onPlayerClick(PlayerInteractEvent event) { - if (event.isCancelable()) { + public static void onPlayerClick(PlayerInteractEvent event) + { + if (event.isCancelable()) + { EntityPlayer player = event.getEntityPlayer(); - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - if (event.getHand() == EnumHand.OFF_HAND) { + if (armour != null) + { + if (event.getHand() == EnumHand.OFF_HAND) + { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.crippledArm", chestStack); - if (upgrade instanceof LivingArmourUpgradeCrippledArm) { + if (upgrade instanceof LivingArmourUpgradeCrippledArm) + { event.setCanceled(true); } } - if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) { + if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) + { ItemStack drinkStack = event.getItemStack(); //TODO: See if the item is a splash potion? Those should be usable. LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); - if (upgrade instanceof LivingArmourUpgradeQuenched) { + if (upgrade instanceof LivingArmourUpgradeQuenched) + { event.setCanceled(true); } } @@ -149,19 +176,24 @@ public class LivingArmourHandler { // Applies: Grim Reaper @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onEntityDeath(LivingDeathEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { + public static void onEntityDeath(LivingDeathEvent event) + { + if (event.getEntityLiving() instanceof EntityPlayer) + { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { + if (armour != null) + { StatTrackerGrimReaperSprint.incrementCounter(armour); LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.grimReaper", chestStack); - if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint && ((LivingArmourUpgradeGrimReaperSprint) upgrade).canSavePlayer(player)) { + if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint && ((LivingArmourUpgradeGrimReaperSprint) upgrade).canSavePlayer(player)) + { ((LivingArmourUpgradeGrimReaperSprint) upgrade).applyEffectOnRebirth(player); event.setCanceled(true); event.setResult(Event.Result.DENY); @@ -175,20 +207,26 @@ public class LivingArmourHandler { // Applies: Jump @SubscribeEvent - public static void onJumpEvent(LivingEvent.LivingJumpEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { + public static void onJumpEvent(LivingEvent.LivingJumpEvent event) + { + if (event.getEntityLiving() instanceof EntityPlayer) + { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { + if (armour != null) + { StatTrackerJump.incrementCounter(armour); - if (!player.isSneaking()) { + if (!player.isSneaking()) + { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.jump", chestStack); - if (upgrade instanceof LivingArmourUpgradeJump) { + if (upgrade instanceof LivingArmourUpgradeJump) + { player.motionY += ((LivingArmourUpgradeJump) upgrade).getJumpModifier(); } } @@ -199,21 +237,28 @@ public class LivingArmourHandler { // Applies: Step Assist, Speed Boost @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { + public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) + { + if (event.getEntityLiving() instanceof EntityPlayer) + { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); boolean hasAssist = false; - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) + { hasAssist = true; player.stepHeight = Constants.Misc.ALTERED_STEP_HEIGHT; - } else { - if (LivingArmour.hasFullSet(player)) { + } else + { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour != null) { + if (armour != null) + { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stepAssist", chestStack); - if (upgrade instanceof LivingArmourUpgradeStepAssist) { + if (upgrade instanceof LivingArmourUpgradeStepAssist) + { player.stepHeight = ((LivingArmourUpgradeStepAssist) upgrade).getStepAssist(); hasAssist = true; } @@ -226,27 +271,32 @@ public class LivingArmourHandler { float percentIncrease = 0; - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour != null) { + if (armour != null) + { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.movement", chestStack); - if (upgrade instanceof LivingArmourUpgradeSpeed) { - percentIncrease += 0.1f * ((LivingArmourUpgradeSpeed) upgrade).getSpeedModifier(); + if (upgrade instanceof LivingArmourUpgradeSpeed) + { + percentIncrease += ((LivingArmourUpgradeSpeed) upgrade).getSpeedModifier(); } } } - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) + { int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); { - percentIncrease += (i + 1) * 0.05f; + percentIncrease += (i + 1) * 0.5f; } } - if (percentIncrease > 0 && (player.onGround || player.capabilities.isFlying) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0)) { - player.moveRelative(player.moveStrafing, player.moveForward, player.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease, 0.02F); + if (percentIncrease > 0 && (player.onGround || player.capabilities.isFlying) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0)) + { + player.travel(player.moveStrafing * percentIncrease, 0, player.moveForward * percentIncrease); } } } @@ -254,7 +304,8 @@ public class LivingArmourHandler { // Applies: Arrow Shot // Tracks: Arrow Shot @SubscribeEvent - public static void onArrowFire(ArrowLooseEvent event) { + public static void onArrowFire(ArrowLooseEvent event) + { World world = event.getEntityPlayer().getEntityWorld(); ItemStack stack = event.getBow(); EntityPlayer player = event.getEntityPlayer(); @@ -262,14 +313,17 @@ public class LivingArmourHandler { if (world.isRemote) return; - if (LivingArmour.hasFullSet(player)) { + if (LivingArmour.hasFullSet(player)) + { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { + if (armour != null) + { StatTrackerArrowShot.incrementCounter(armour); LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.arrowShot", chestStack); - if (upgrade instanceof LivingArmourUpgradeArrowShot) { + if (upgrade instanceof LivingArmourUpgradeArrowShot) + { int charge = event.getCharge(); float velocity = (float) charge / 20.0F; velocity = (velocity * velocity + velocity * 2.0F) / 3.0F; @@ -281,7 +335,8 @@ public class LivingArmourHandler { velocity = 1.0F; int extraArrows = ((LivingArmourUpgradeArrowShot) upgrade).getExtraArrows(); - for (int n = 0; n < extraArrows; n++) { + for (int n = 0; n < extraArrows; n++) + { ItemStack arrowStack = new ItemStack(Items.ARROW); ItemArrow itemarrow = (ItemArrow) ((stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW)); EntityArrow entityarrow = itemarrow.createArrow(world, arrowStack, player); diff --git a/src/main/resources/assets/bloodmagic/textures/misc/potions.png b/src/main/resources/assets/bloodmagic/textures/misc/potions.png index 49c30a6e3a54c8bedba5f62ceaf3a7727f82fd28..0ceb8f8ba5ae5f4d9983f4ce6bbe059eed5d4039 100644 GIT binary patch delta 1845 zcmV-52g>-V480JLDlvorgaCxG%vneP000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jT-B6%Q!L{-67iTPuGDp-DtRRCwC$+)s?0WgQ3b?^Gz2ED4~ryBbLd{<-L)AvFZT zpG#X0;6W~^NiS97VH1rPqG{BaJ&1b2G)f}Gq=^X!IS?`0Hc_B}CKRRBa1m_6h3yiR zq?>9n@_3l{oq1<=W_EU&+3latCwa3o^FHtIeLJ1s?|q(U-gyBNlK}z0lMn#~f4I=K zCKaeGq$Ek}(8glUq?9B%yU=P?ak9ZUsp4E%$FrWpSWd~#AsbBYeU3PnU!0Y+dbZy- z(Q0yN;{~O8V8fDac6PQjmmzT`emrx(9J;^Kx2!tenc2Crt{pF@A%n7T!wMp zz3tmew!rM{Y&mzJlye8l&;l^6fBlwH1{I!CYZidIUA@hqN-=O*PALm12M!!4Wg(?3 zr;MyHu&K6hFWJ7m%>4eDQa|480*4X!|0x+y?S!WR#l>7<+leTR=$v<=C zSns&v$gxf74Gc^8%_;;-OG~Y}xw-Bzd|@F&^08Fw+CzuAxhyR$t*7hNe;)gPJNeQ# z5BPL)0TqBPwtM&Pv0mGZB5?5F!7MH=rhVe?bOo}wxR`?n4{kj9Ydh1r=bn3fI=QgA z|8>{D|L>43jwLyr2&YwuK(iVVyCNLKd#sHe;?NxUH|g$C)-O&H3tww050wxz|WJsC&|lI!tYA*NVV>_ zNq)Ua|Hkho`C*b@B>7d6n>W~I)lguVb)5Zsa(YKq5*ufKInPB~08S+NV3Mnoyq07+ z$w#Yo?@MxWoFGT{rW~GM8oK`Q{8EnY9hoS%C%LA2{FfxJZm>ZISjdv{)Z z@x@hR?IGLlYjo*9mE;de-rJW?3`ba&p6aQ^Y8p)`|Q8tSh9Sg z{k)Fd@|k6Vf36s{vQGF~vp9^A{7HMF@B2wUl=ck!8%aK&bKLA_V1L!FVYbXDP9Nn8zCv=_Q zbwc0yLVGTtE&|7IZ+|;*dZoR-xm}}xyprU}B*&}ye~6Pwe$%(xaoS9>2hh_CXq@GH zlE3-79stuX096qfxy6(cf7no<>CP8sdwKwM0jLccHYB+!?duUflH~76&JNh!IBhni z05o4qdb|G$0F$FAF`#b3W~_ zBTtS))r|~|Ea~Z~2*Brol&7_o# z{_eOwxc}v^xiVkNfAetqhXVZ<1oe0Q`;%=F$5X}WxzE7J9@Kcr-_f7sea~CddY{F) zeB<(vL} zFsB7u=!$73|1EdScb-3R;=i-!+^ThN-h5qdcK(r##-w3RUCJ`5l5UU#u+#VFv&aToO!AprykR0Ra^l;NAE?qy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jB_<4l)(68vK}%TPuGBjY&j7RCwC$+}n#?R~^9dZ=y+yPHC-5y-+V`tAedJP!Mg! zwnXqn#TQ%fMNmPlA`-zrK&vPSz6c_MC_X7Fh=!o`60A_QrbZntk) zi6%7}3C}6#N|Q;|BV%`Y|>cJ#C#l z|KGkyj$QP<WA(x6MD?sqZeKJ8&ZC0|CmlRE zS-JBElhw~V*qXOgKiP$UrRRTF-fO}?bMco~AFWseqPgA%uC1e&7*U#os)wr2 zH=PK(d35eOXX0L3-8~A*4b@x6@xC~h?<+GSo$IRitZ~d`#WdRS^|SmXH`=~v4D9L= zz)zdr#(F~a+v=~?wbg&U)sw5^>+JWt>ciD-vHqTM_P?(Beba{)j!65&sgJ_%ZhY%ITgZr%6BF{_TOalB>4zy*I^09J4H9XZWZ1=cUHd`Kkr>9@3Lax0=@*8xz%^#(3$gd zv)dLd2**bOcwzOm>Q!U?W9Qi3OK0X4)-#!lIa$4<`bPDI(U$oRysQ}58*>0_b@0`q za9WW#b?R)-7T8$;u=h)t>I{VXq2bw-GbN9@;Lu0u9&8CxycUAA} z^hYa~6$5*t0IW3%m@NtmbpF*5z#Y}q)tAQ*{%zHL3$*QurjNg_p3Pr7I^DxFF_+El zb6fS9>R&VKZk@Sazo+`y8l84oF^vLu`B}c#M%x#Sfh~XAx85bdhDBlH&c78a)$gk> zRsU{!C*g6`?K7QwrTTXDx9Y3a)2shfpPI{c-x#+4XpBUTkNvhI=BDc7P48439+y3T z+{E@pV_+K!z$gM|-D7(@{_L6k{_3gKQ${-dK~f9oBkW_L5ONt{FKW*~XYF zJAGpH}#cbH*Eiyg@}Cc`lwjXN&;O!}P#f4L={p z1vap62RgqZ02e_4nC$TJfgS3AlU>jTU(+@&*-o6VdVjn5djq# bcEbMvyHm}gW+aYk00000NkvXXu0mjf^VYIs From 58ca46b6bd7e7d61ab998ec43f210d165dc4f4eb Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 30 Mar 2018 18:03:31 -0400 Subject: [PATCH 151/493] Disabled the added Health in the "Quick Feet" upgrade. --- changelog.txt | 2 + .../upgrade/LivingArmourUpgradeSpeed.java | 62 ++++++++++++------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/changelog.txt b/changelog.txt index f385a646..beacb676 100644 --- a/changelog.txt +++ b/changelog.txt @@ -13,6 +13,8 @@ Version 2.2.8 - Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. - Added additional effects to the Sentient Bow when aspected to different Will types. - Added in book entries for the Teleport Array and the Turret Array. +- Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. +- Removed added health from "Quick Feet" - seriously, why was this a thing? ------------------------------------------------------ Version 2.2.7 diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 446decfb..d0392eec 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -16,76 +16,90 @@ import org.apache.commons.codec.binary.StringUtils; import java.util.UUID; -public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { - public static final int[] costs = new int[]{3, 7, 13, 26, 42, 60, 90, 130, 180, 250}; - public static final double[] speedModifier = new double[]{0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5}; - public static final int[] sprintSpeedTime = new int[]{0, 0, 0, 0, 0, 20, 60, 60, 100, 200}; - public static final int[] sprintSpeedLevel = new int[]{0, 0, 0, 0, 0, 0, 0, 1, 1, 2}; - public static final int[] healthModifier = new int[]{0, 0, 0, 0, 0, 0, 0, 4, 10, 20}; - public static final int[] sprintRegenTime = new int[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 25}; +public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade +{ + public static final int[] costs = new int[] { 3, 7, 13, 26, 42, 60, 90, 130, 180, 250 }; + public static final double[] speedModifier = new double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5 }; + public static final int[] sprintSpeedTime = new int[] { 0, 0, 0, 0, 0, 20, 60, 60, 100, 200 }; + public static final int[] sprintSpeedLevel = new int[] { 0, 0, 0, 0, 0, 0, 0, 1, 1, 2 }; + public static final int[] healthModifier = new int[] { 0, 0, 0, 0, 0, 0, 0, 4, 10, 20 }; + public static final int[] sprintRegenTime = new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 25 }; - public LivingArmourUpgradeSpeed(int level) { + public LivingArmourUpgradeSpeed(int level) + { super(level); } - public double getSpeedModifier() { + public double getSpeedModifier() + { return speedModifier[this.level]; } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { - if (player.isSprinting()) { - if (sprintSpeedTime[this.level] > 0) { + public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) + { + if (player.isSprinting()) + { + if (sprintSpeedTime[this.level] > 0) + { player.addPotionEffect(new PotionEffect(MobEffects.SPEED, sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); } - if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(MobEffects.REGENERATION)) { + if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(MobEffects.REGENERATION)) + { player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, sprintRegenTime[this.level], 0, false, false)); } } } @Override - public Multimap getAttributeModifiers() { + public Multimap getAttributeModifiers() + { Multimap modifierMap = HashMultimap.create(); // modifierMap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Speed modifier" + 1, speedModifier[this.level], 1)); - if (healthModifier[this.level] > 0) { - String name = getUniqueIdentifier() + "-HealthModifier1"; - modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0)); - } +// if (healthModifier[this.level] > 0) { +// String name = getUniqueIdentifier() + "-HealthModifier1"; +// modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0)); +// } return modifierMap; } @Override - public String getUniqueIdentifier() { + public String getUniqueIdentifier() + { return BloodMagic.MODID + ".upgrade.movement"; } @Override - public int getMaxTier() { + public int getMaxTier() + { return 10; } @Override - public int getCostOfUpgrade() { + public int getCostOfUpgrade() + { return costs[this.level]; } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) + { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) + { // EMPTY } @Override - public String getUnlocalizedName() { + public String getUnlocalizedName() + { return tooltipBase + "speed"; } } From 467bcb4d52ae05b053a8bfa30114f82ff13b1043 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 30 Mar 2018 19:42:11 -0400 Subject: [PATCH 152/493] Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. Also added the guide page for the Shard of Laputa. --- changelog.txt | 2 + .../WayofTime/bloodmagic/ConfigHandler.java | 82 +++++++++++-------- .../AlchemyArrayEffectLaputa.java | 2 +- .../compat/guideapi/book/CategoryAlchemy.java | 10 +++ .../bloodmagic/registry/ModRituals.java | 2 +- .../ritual/types/RitualEllipsoid.java | 41 +++++++++- .../assets/bloodmagic/lang/en_US.lang | 1 + .../assets/bloodmagicguide/lang/en_US.lang | 3 +- 8 files changed, 102 insertions(+), 41 deletions(-) diff --git a/changelog.txt b/changelog.txt index beacb676..f72e8573 100644 --- a/changelog.txt +++ b/changelog.txt @@ -15,6 +15,8 @@ Version 2.2.8 - Added in book entries for the Teleport Array and the Turret Array. - Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. - Removed added health from "Quick Feet" - seriously, why was this a thing? +- Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. + - Note: The dictionary definition for "Ellipsoid" is a three-dimensional figure whose plane sections are ellipses or circles. For those who weren't born in a math class, it means it is a sphere that has different radii in each direction. ------------------------------------------------------ Version 2.2.7 diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 27316942..c0f2a892 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -9,61 +9,68 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class ConfigHandler { +public class ConfigHandler +{ - @Config.Comment({"General settings"}) + @Config.Comment({ "General settings" }) public static ConfigGeneral general = new ConfigGeneral(); - @Config.Comment({"Blacklist options for various features"}) + @Config.Comment({ "Blacklist options for various features" }) public static ConfigBlacklist blacklist = new ConfigBlacklist(); - @Config.Comment({"Value modifiers for various features"}) + @Config.Comment({ "Value modifiers for various features" }) public static ConfigValues values = new ConfigValues(); - @Config.Comment({"Toggles for all rituals"}) + @Config.Comment({ "Toggles for all rituals" }) public static ConfigRituals rituals = new ConfigRituals(); - @Config.Comment({"Settings that only pertain to the client"}) + @Config.Comment({ "Settings that only pertain to the client" }) public static ConfigClient client = new ConfigClient(); - @Config.Comment({"Compatibility settings"}) + @Config.Comment({ "Compatibility settings" }) public static ConfigCompat compat = new ConfigCompat(); @SubscribeEvent - public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.getModID().equals(BloodMagic.MODID)) { + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) + { + if (event.getModID().equals(BloodMagic.MODID)) + { ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values MeteorConfigHandler.handleMeteors(false); // Reload meteors } } - public static class ConfigGeneral { - @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) + public static class ConfigGeneral + { + @Config.Comment({ "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) public boolean enableDebugLogging = false; - @Config.Comment({"Enables extra information to be printed to the log."}) + @Config.Comment({ "Enables extra information to be printed to the log." }) public boolean enableAPILogging = false; - @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) + @Config.Comment({ "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) public boolean enableVerboseAPILogging = false; } - public static class ConfigBlacklist { - @Config.Comment({"Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state."}) - public String[] teleposer = {"bedrock", "mob_spawner"}; - @Config.Comment({"Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid."}) - public String[] transposer = {"bedrock", "mob_spawner"}; - @Config.Comment({"Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid."}) + public static class ConfigBlacklist + { + @Config.Comment({ "Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state." }) + public String[] teleposer = { "bedrock", "mob_spawner" }; + @Config.Comment({ "Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid." }) + public String[] transposer = { "bedrock", "mob_spawner" }; + @Config.Comment({ "Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid." }) public String[] wellOfSuffering = {}; } - public static class ConfigValues { - @Config.Comment({"Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid."}) - public String[] sacrificialValues = {"villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100"}; - @Config.Comment({"Amount of LP the Coat of Arms should provide for each damage dealt."}) + public static class ConfigValues + { + @Config.Comment({ "Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid." }) + public String[] sacrificialValues = { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100" }; + @Config.Comment({ "Amount of LP the Coat of Arms should provide for each damage dealt." }) @Config.RangeInt(min = 0, max = 100) public int coatOfArmsConversion = 20; - @Config.Comment({"Amount of LP the Sacrificial Dagger should provide for each damage dealt."}) + @Config.Comment({ "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) @Config.RangeInt(min = 0, max = 10000) public int sacrificialDaggerConversion = 100; - @Config.Comment({"Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated."}) + @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) public boolean shouldResyncMeteors = true; } - public static class ConfigRituals { + public static class ConfigRituals + { public boolean ritualAnimalGrowth = true; public boolean ritualContainment = true; public boolean ritualCrushing = true; @@ -93,33 +100,38 @@ public class ConfigHandler { public boolean ritualPortal = true; public boolean ritualMeteor = true; public boolean ritualDowngrade = true; + public boolean ritualEllipsoid = true; public ConfigImperfectRituals imperfect = new ConfigImperfectRituals(); } - public static class ConfigImperfectRituals { + public static class ConfigImperfectRituals + { public boolean imperfectRitualNight = true; public boolean imperfectRitualRain = true; public boolean imperfectRitualResistance = true; public boolean imperfectRitualZombie = true; } - public static class ConfigClient { - @Config.Comment({"Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held."}) + public static class ConfigClient + { + @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) public boolean alwaysRenderRoutingLines = false; - @Config.Comment({"Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed."}) + @Config.Comment({ "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) public boolean invisibleSpectralBlocks = true; - @Config.Comment({"When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar."}) + @Config.Comment({ "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar." }) public boolean sigilHoldingSkipsEmptySlots = false; } - public static class ConfigCompat { - @Config.Comment({"The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory."}) + public static class ConfigCompat + { + @Config.Comment({ "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; - public enum AltarDisplayMode { + public enum AltarDisplayMode + { ALWAYS, SIGIL_HELD, - SIGIL_CONTAINED,; + SIGIL_CONTAINED, ; } } } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index d3701692..0a4dcbe5 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -118,7 +118,7 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect public int getRandomRadius(Random rand) { - return rand.nextInt(4) + 4; + return rand.nextInt(5) + 4; } public int getRandomHeightOffset(Random rand) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index bbf67db9..307cc083 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -113,6 +113,16 @@ public class CategoryAlchemy standardTurretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "standardTurret" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "standardTurret"), new EntryText(standardTurretPages, TextHelper.localize(keyBase + "standardTurret"), true)); + List laputaPages = new ArrayList<>(); + + PageAlchemyArray laputaRecipePage = BookUtils.getAlchemyPage("laputa"); + if (laputaRecipePage != null) + { + laputaPages.add(laputaRecipePage); + } + laputaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "laputa" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "laputa"), new EntryText(laputaPages, TextHelper.localize(keyBase + "laputa"), true)); + List buffPages = new ArrayList<>(); buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index e1c67c19..544df8a9 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -123,7 +123,7 @@ public class ModRituals RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.rituals.ritualDowngrade); ellipsoidRitual = new RitualEllipsoid(); - RitualRegistry.registerRitual(ellipsoidRitual, false); + RitualRegistry.registerRitual(ellipsoidRitual, ConfigHandler.rituals.ritualEllipsoid); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index 2b454edb..e47a8c74 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -198,7 +198,7 @@ public class RitualEllipsoid extends Ritual @Override public int getRefreshCost() { - return 0; + return 5; } @Override @@ -217,8 +217,43 @@ public class RitualEllipsoid extends Ritual @Override public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.WATER); - addCornerRunes(components, 1, 1, EnumRuneType.WATER); + addCornerRunes(components, 1, 0, EnumRuneType.DUSK); + + addRune(components, 4, 0, 0, EnumRuneType.FIRE); + addRune(components, 5, 0, 0, EnumRuneType.FIRE); + addRune(components, 5, 0, -1, EnumRuneType.FIRE); + addRune(components, 5, 0, -2, EnumRuneType.FIRE); + addRune(components, -4, 0, 0, EnumRuneType.FIRE); + addRune(components, -5, 0, 0, EnumRuneType.FIRE); + addRune(components, -5, 0, 1, EnumRuneType.FIRE); + addRune(components, -5, 0, 2, EnumRuneType.FIRE); + + addRune(components, 0, 0, 4, EnumRuneType.AIR); + addRune(components, 0, 0, 5, EnumRuneType.AIR); + addRune(components, 1, 0, 5, EnumRuneType.AIR); + addRune(components, 2, 0, 5, EnumRuneType.AIR); + addRune(components, 0, 0, -4, EnumRuneType.AIR); + addRune(components, 0, 0, -5, EnumRuneType.AIR); + addRune(components, -1, 0, -5, EnumRuneType.AIR); + addRune(components, -2, 0, -5, EnumRuneType.AIR); + + addRune(components, 3, 0, 1, EnumRuneType.EARTH); + addRune(components, 3, 0, 2, EnumRuneType.EARTH); + addRune(components, 3, 0, 3, EnumRuneType.EARTH); + addRune(components, 2, 0, 3, EnumRuneType.EARTH); + addRune(components, -3, 0, -1, EnumRuneType.EARTH); + addRune(components, -3, 0, -2, EnumRuneType.EARTH); + addRune(components, -3, 0, -3, EnumRuneType.EARTH); + addRune(components, -2, 0, -3, EnumRuneType.EARTH); + + addRune(components, 1, 0, -3, EnumRuneType.WATER); + addRune(components, 2, 0, -3, EnumRuneType.WATER); + addRune(components, 3, 0, -3, EnumRuneType.WATER); + addRune(components, 3, 0, -2, EnumRuneType.WATER); + addRune(components, -1, 0, 3, EnumRuneType.WATER); + addRune(components, -2, 0, 3, EnumRuneType.WATER); + addRune(components, -3, 0, 3, EnumRuneType.WATER); + addRune(components, -3, 0, 2, EnumRuneType.WATER); } @Override diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index a218e51f..befcd6ac 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -713,6 +713,7 @@ ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in th ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. +ritual.bloodmagic.ellipseRitual.info=Creates a hollow spheroid around the ritual using the blocks in the attached chest. ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated. ritual.bloodmagic.ellipseRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index 8f5d49b9..aa0981c5 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -246,7 +246,7 @@ guide.bloodmagic.entry.alchemy.fastMiner=Fast Miner Array guide.bloodmagic.entry.alchemy.furnace=Burning Furnace Array guide.bloodmagic.entry.alchemy.teleport=Teleportation Array guide.bloodmagic.entry.alchemy.standardTurret=Turret Array - +guide.bloodmagic.entry.alchemy.laputa=Shard of Laputa # Alchemy Entry Texts @@ -261,6 +261,7 @@ guide.bloodmagic.entry.alchemy.fastMiner.info=When tasked with carving out a lar guide.bloodmagic.entry.alchemy.furnace.info=One of the many problems that you may encounter in the beginning of your adventure is the inability to keep your furnace lit. A lit furnace can mean the difference between having a full stomach and strong weapons or starving in a cave. \n\tThe Burning Furnace array, as the name implies, will provide a much needed heat source for any nearby furnace. By placing the array directly adjacent to a vanilla furnace (it can be next to multiple), it will provide fuel to the furnace if an operation is able to be completed - nothing will happen if it is next to an empty or a full furnace, mainly for your protection. \n\tThis does not come for free, however: when a person is nearby (within a 10 block radius), it will take away half a heart of health in order to cook up to two things in the furnace. This will be helpful to either get a quick bite or to smelt a full stack of ore, but unfortunately you haven't found a way to add any safety measures to the array... guide.bloodmagic.entry.alchemy.teleport.info=The Teleportation Array acts as a way to travel instantly from one location to another with a few specific limitations. When a player or other entity steps onto the array, the array will search up to 20 blocks away in the direction it is facing for another alchemy array (which does not need to be active). If the array manages to successfully find a destination, it will then teleport the entity to its found array instantly, even through walls. \n\tStudying this array has shown that there are further limitations added to it: because of the nature of bending the fabric of space-time, a Teleportation Array will not teleport something that has teleported within 2 seconds. This is to allow time for all components to rearrange themselves in a desirable manner. guide.bloodmagic.entry.alchemy.standardTurret.info=The power of flinging pointy objects at far away monsters cannot be overstated. The Turret Array is able to sense a nearby hostile monster and by utilizing complex alchemical mechanisms it is able to draw back and fire an arrow in order to strike its target. \n\tThe array searches for an inventory directly beneath it. If it finds either a normal or tipped arrow it will syphon from its container and fire at a mob that is within a 32 block radius. \n\t(Due to some silly Minecraft physics that has arrows bounce off of entities that are too close to where they spawn, the turret will also only fire on a mob that is greater than 3 blocks away. Keep that in mind!) +guide.bloodmagic.entry.alchemy.laputa.info=There exists a story of a lost kingdom that had such advanced magic that it could fly through the clouds. Although this kingdom has since crumbled to dust, a few drawings of this castle in the sky has managed to provide exquisite detail as to the mechanisms that allowed it to become the legend that it is. \n\tThe Shard of Laputa converts the life essence that is found within the earth into a more avian form, causing the surrounding area to levitate in the air. While the underlying principle is simple, the variations of the life essence in the earth cause a bit of inconsistency in how much land is moved. The array will move the earth in a spherical radius between 4 and 8 blocks up above itself a random offset between one and 5 blocks plus twice the radius of the effect. \n\tIt should be noted that as soon as the effect starts, all items used to activate the array will be lost. From bf18c337e281d10e92b499e26fe242a9ead5baba Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 1 Apr 2018 15:37:55 -0700 Subject: [PATCH 153/493] Fix of by one with altar upgrade calculation --- src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java index bdca69c4..fce1de92 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java @@ -14,7 +14,7 @@ public class AltarUpgrade { } public AltarUpgrade upgrade(BloodRuneType rune) { - upgradeLevels.compute(rune, (r, l) -> l == null ? 0 : l + 1); + upgradeLevels.compute(rune, (r, l) -> l == null ? 1 : l + 1); return this; } From 03a2904bd15a60603dde51aeb6f953fd7d68f49a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 7 Apr 2018 12:24:28 -0700 Subject: [PATCH 154/493] Fixed holding sigil internal interactions It will no longer tick unbound sigils and checks binding of stored sigil on right click.. --- .../item/sigil/ItemSigilHolding.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 17e36621..6399e817 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.KeyBindings; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.ISigil; @@ -92,7 +93,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl List inv = getInternalInventory(stack); ItemStack itemUsing = inv.get(currentSlot); - if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(stack) == null) + if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) return EnumActionResult.PASS; EnumActionResult result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); @@ -111,7 +112,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl List inv = getInternalInventory(stack); ItemStack itemUsing = inv.get(currentSlot); - if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(stack) == null) + if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) return ActionResult.newResult(EnumActionResult.PASS, stack); itemUsing.getItem().onItemRightClick(world, player, hand); @@ -149,20 +150,19 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } @Override - public void onUpdate(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) { - if (itemStack.getTagCompound() != null) { - this.tickInternalInventory(itemStack, world, entity, itemSlot, isSelected); - } + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if (stack.hasTagCompound()) + tickInternalInventory(stack, world, entity, itemSlot, isSelected); } public void tickInternalInventory(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) { - List inv = getInternalInventory(itemStack); - - for (int i = 0; i < inventorySize; i++) { - ItemStack stack = inv.get(i); - if (stack.isEmpty()) { + for (ItemStack stack : getInternalInventory(itemStack)) { + if (stack.isEmpty() || !(stack.getItem() instanceof IBindable) || !(stack.getItem() instanceof ISigil)) + continue; + + Binding binding = ((IBindable) stack.getItem()).getBinding(stack); + if (binding == null) continue; - } stack.getItem().onUpdate(stack, world, entity, itemSlot, isSelected); } From 234ccd4935f81ea912fcd5f562c1be15c63021f4 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 7 Apr 2018 12:47:46 -0700 Subject: [PATCH 155/493] Fixed a null stack check in holding GUI --- .../java/WayofTime/bloodmagic/client/gui/GuiHolding.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java index 11d9c93d..95fbd50f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java @@ -9,6 +9,8 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -46,7 +48,8 @@ public class GuiHolding extends GuiContainer { int x = (width - xSize) / 2; int y = (height - ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { + ItemStack held = player.getHeldItem(EnumHand.MAIN_HAND); + if (!held.isEmpty() && held.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.drawTexturedModalRect(4 + x + 36 * ItemSigilHolding.getCurrentItemOrdinal(player.getHeldItemMainhand()), y + 13, 0, 123, 24, 24); } From c8b394bf86f5a955dae343070575cb648f0452ac Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 7 Apr 2018 13:05:32 -0700 Subject: [PATCH 156/493] Add missing itemblock for demon crystals (#1252) Still need to figure out the rendering issue. Might just need to rewrite them to store the age as meta instead of the type. --- .../bloodmagic/block/BlockDemonCrystal.java | 165 ++++++++---------- .../bloodmagic/tile/TileDemonCrystal.java | 12 +- 2 files changed, 82 insertions(+), 95 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index fdb13d22..489e77ca 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -1,9 +1,12 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.tile.TileDemonCrystal; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -12,6 +15,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -22,10 +26,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Random; -public class BlockDemonCrystal extends Block { +public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvider { public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", EnumFacing.class); @@ -42,40 +47,80 @@ public class BlockDemonCrystal extends Block { } @Override - public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side) { - BlockPos offsetPos = pos.offset(side.getOpposite()); - IBlockState offsetState = world.getBlockState(offsetPos); - Block offsetBlock = offsetState.getBlock(); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + if (world.isRemote) + return true; - return offsetBlock.isSideSolid(offsetState, world, offsetPos, side) && this.canPlaceBlockAt(world, pos); + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileDemonCrystal) { + TileDemonCrystal crystal = (TileDemonCrystal) tile; + + if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024) + crystal.dropSingleCrystal(); + } + + return true; } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { - TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); - EnumFacing placement = tile.getPlacement(); - BlockPos offsetPos = pos.offset(placement.getOpposite()); - IBlockState offsetState = world.getBlockState(offsetPos); - Block offsetBlock = offsetState.getBlock(); + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileDemonCrystal) { + EnumDemonWillType type = state.getValue(TYPE); + int number = ((TileDemonCrystal) tile).getCrystalCount(); - if (!offsetBlock.isSideSolid(offsetState, world, offsetPos, placement)) { - world.setBlockToAir(pos); + drops.add(getItemStackDropped(type, number)); } } @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - if (world.getTileEntity(pos) == null) { - return state; + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileDemonCrystal) { + TileDemonCrystal crystal = (TileDemonCrystal) tile; + state = state.withProperty(AGE, crystal.getCrystalCountForRender()); + state = state.withProperty(ATTACHED, crystal.getPlacement()); } - TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); - return state.withProperty(AGE, tile.getCrystalCountForRender()).withProperty(ATTACHED, tile.getPlacement()); + return state; + } + + @Override + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileDemonCrystal) { + TileDemonCrystal crystal = (TileDemonCrystal) tile; + EnumFacing placement = crystal.getPlacement(); + BlockPos offsetPos = pos.offset(placement.getOpposite()); + IBlockState offsetState = world.getBlockState(offsetPos); + + if (!offsetState.isSideSolid(world, offsetPos, placement)) + world.destroyBlock(pos, true); + } + } + + @Override + public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side) { + BlockPos offsetPos = pos.offset(side.getOpposite()); + IBlockState offsetState = world.getBlockState(offsetPos); + + return offsetState.isSideSolid(world, offsetPos, side) && this.canPlaceBlockAt(world, pos); } @Override public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { - for (int i = 0; i < EnumDemonWillType.values().length; i++) - list.add(new ItemStack(this, 1, i)); + for (EnumDemonWillType willType : EnumDemonWillType.values()) + list.add(new ItemStack(this, 1, willType.ordinal())); + } + + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity tile, ItemStack stack) { + super.harvestBlock(world, player, pos, state, tile, stack); + world.setBlockToAir(pos); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + return willHarvest || super.removedByPlayer(state, world, pos, player, false); } @Override @@ -103,22 +148,11 @@ public class BlockDemonCrystal extends Block { return EnumBlockRenderType.MODEL; } -// public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state) -// { -// return (worldIn.getLight(pos) >= 8 || worldIn.canSeeSky(pos)) && worldIn.getBlockState(pos.down()).getBlock().canSustainPlant(worldIn, pos.down(), net.minecraft.util.EnumFacing.UP, this); -// } - - /** - * Convert the given metadata into a BlockState for this Block - */ @Override public IBlockState getStateFromMeta(int meta) { return this.getDefaultState().withProperty(TYPE, EnumDemonWillType.values()[meta]); } - /** - * Convert the BlockState into the correct metadata value - */ @Override public int getMetaFromState(IBlockState state) { return state.getValue(TYPE).ordinal(); @@ -129,42 +163,6 @@ public class BlockDemonCrystal extends Block { return new BlockStateContainer(this, TYPE, AGE, ATTACHED); } - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - EnumDemonWillType type = state.getValue(TYPE); - int number = ((TileDemonCrystal) tile).getCrystalCount(); - - spawnAsEntity(world, pos, getItemStackDropped(type, number)); - world.removeTileEntity(pos); - } - - super.breakBlock(world, pos, state); - } - - @Override - public int quantityDropped(Random random) { - return 0; - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - if (world.isRemote) { - return true; - } - - TileDemonCrystal crystal = (TileDemonCrystal) world.getTileEntity(pos); - - if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024) { - crystal.dropSingleCrystal(); - - world.notifyBlockUpdate(pos, state, state, 3); - } - - return true; - } - @Override public boolean hasTileEntity(IBlockState state) { return true; @@ -177,7 +175,7 @@ public class BlockDemonCrystal extends Block { } public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; switch (type) { case CORROSIVE: stack = EnumDemonWillType.CORROSIVE.getStack(); @@ -200,25 +198,14 @@ public class BlockDemonCrystal extends Block { return stack; } - // @Override -// public java.util.List getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune) -// { -// java.util.List ret = super.getDrops(world, pos, state, fortune); -// int age = ((Integer) state.getValue(AGE)).intValue(); -// Random rand = world instanceof World ? ((World) world).rand : new Random(); -// -// if (age >= 7) -// { -// int k = 3 + fortune; -// -// for (int i = 0; i < 3 + fortune; ++i) -// { -// if (rand.nextInt(15) <= age) -// { -// ret.add(new ItemStack(this.getSeed(), 1, 0)); -// } -// } -// } -// return ret; -// } + @Override + public ItemBlock getItem() { + return new ItemBlockDemonCrystal(this); + } + + @Override + public void gatherVariants(@Nonnull Int2ObjectMap variants) { + for (EnumDemonWillType willType : EnumDemonWillType.values()) + variants.put(willType.ordinal(), "age=3,attached=up,type=" + willType.getName()); + } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 0e26e4be..e2b21806 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.block.BlockDemonCrystal; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -103,12 +103,11 @@ public class TileDemonCrystal extends TileTicking { } public void checkAndGrowCrystal() { - if (progressToNextCrystal >= 1) { + if (progressToNextCrystal >= 1 || internalCounter % 100 == 0) { progressToNextCrystal--; crystalCount++; - IBlockState thisState = getWorld().getBlockState(pos); - getWorld().notifyBlockUpdate(pos, thisState, thisState, 3); markDirty(); + notifyUpdate(); } } @@ -121,9 +120,10 @@ public class TileDemonCrystal extends TileTicking { IBlockState state = getWorld().getBlockState(pos); EnumDemonWillType type = state.getValue(BlockDemonCrystal.TYPE); ItemStack stack = BlockDemonCrystal.getItemStackDropped(type, 1); - if (stack != null) { + if (!stack.isEmpty()) { crystalCount--; - getWorld().spawnEntity(new EntityItem(getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, stack)); + InventoryHelper.spawnItemStack(getWorld(), pos.getX(), pos.getY(), pos.getZ(), stack); + notifyUpdate(); return true; } } From 6944e5e8d40aa65167e2989d198418211d1b5093 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 7 Apr 2018 13:08:28 -0700 Subject: [PATCH 157/493] Add missing demon pylon itemblock (#1259) --- .../java/WayofTime/bloodmagic/block/BlockDemonPylon.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index e24869fd..60fdafea 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -6,13 +6,14 @@ import WayofTime.bloodmagic.tile.TileDemonPylon; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockDemonPylon extends BlockContainer implements IVariantProvider { +public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVariantProvider { public BlockDemonPylon() { super(Material.ROCK); @@ -54,4 +55,9 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider public TileEntity createNewTileEntity(World world, int meta) { return new TileDemonPylon(); } + + @Override + public ItemBlock getItem() { + return new ItemBlock(this); + } } From f01e1bfee0100e9a0a0d3e9c127a6ae35ccec48d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 7 Apr 2018 13:18:57 -0700 Subject: [PATCH 158/493] Update changelog + version --- changelog.txt | 9 +++++++++ gradle.properties | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index f72e8573..ae38265b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -17,6 +17,15 @@ Version 2.2.8 - Removed added health from "Quick Feet" - seriously, why was this a thing? - Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. - Note: The dictionary definition for "Ellipsoid" is a three-dimensional figure whose plane sections are ellipses or circles. For those who weren't born in a math class, it means it is a sphere that has different radii in each direction. +- Fixed an off by one in altar upgrade management causing the first of any upgrade to not be counted +- Fixed the LP cost of the Master Blood Orb + - This bug has gone unnoticed for 2 years now. +- Potion Flasks can be crafted now +- Fixed a server crash when handling dye recipes +- Moved several text outputs out of the chat and into the action bar +- Fixed a crash when trying to use unbound toggle-able sigils in the Sigil of Holding +- Fixed an issue where unbound sigils could be used inside the Sigil of Holding +- Added missing items for Demon Crystals and Demon Pylons ------------------------------------------------------ Version 2.2.7 diff --git a/gradle.properties b/gradle.properties index 7a442322..d81bba9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.7 +mod_version=2.2.8 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From 9c2621e93aa3bb2da9f6046c27c670709f1a5262 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 7 Apr 2018 18:51:21 -0400 Subject: [PATCH 159/493] Fixed stupid NPE in the Furnace Array --- changelog.txt | 5 +++++ .../alchemyArray/AlchemyArrayEffectFurnaceFuel.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changelog.txt b/changelog.txt index ae38265b..ee011044 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.2.9 +------------------------------------------------------ +- Fixed stupid NPE in the Furnace Array + ------------------------------------------------------ Version 2.2.8 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java index b9f2f51b..c21135ac 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java @@ -62,6 +62,11 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect } } + if (sacrifice == null || sacrifice.isDead) + { + return false; + } + if (addFuelTime(furnaceTile, world, furnacePos, burnTicksAdded)) { if (!sacrifice.capabilities.isCreativeMode) From dc7af258ffac5238d02ec04e5107c0cd17079576 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 8 Apr 2018 12:53:23 -0700 Subject: [PATCH 160/493] Upgradle --- build.gradle | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 987c88db..9947af35 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,6 @@ buildscript { plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" id 'com.matthewprenger.cursegradle' version '1.0.10' - id 'io.franzbecker.gradle-lombok' version '1.6' id 'maven-publish' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 928cda88..a5ffca25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip From e64e481a1128b20f0823eb5cd77e281be4972db9 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 8 Apr 2018 12:55:23 -0700 Subject: [PATCH 161/493] Fix errant MRS tags displaying on fresh MRSs (#1265) I literally totally hate everybody who downvoted my comment in that issue and will show them my wrath. --- .../provider/DataProviderRitualController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 2d5f1975..9b8c8c12 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -32,14 +32,15 @@ public class DataProviderRitualController implements IWailaDataProvider { NBTTagCompound tag = accessor.getNBTData(); if (tag.getBoolean("master")) { - if (tag.hasKey("ritual")) + if (tag.hasKey("ritual")) { currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); - if (tag.hasKey("owner")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", tag.getString("owner"))); - if (!tag.getBoolean("active")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.deactivated")); - if (!tag.getBoolean("enabled")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); + if (tag.hasKey("owner")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", tag.getString("owner"))); + if (!tag.getBoolean("active")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.deactivated")); + if (!tag.getBoolean("enabled")) + currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); + } } else { if (tag.hasKey("ritual")) { currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); From b63c3837477bcbd962a03b4ae06a0ca6b018fbbc Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 11 Apr 2018 16:46:09 -0700 Subject: [PATCH 162/493] Fix Sanguine Scientium recipe (#1267) --- .../WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java index 39319de7..e1ba4eee 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java @@ -53,6 +53,6 @@ public class GuideBloodMagic implements IGuideBook { @Nullable @Override public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "glass", "feather").setRegistryName("guide"); + return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "blockGlass", "feather").setRegistryName("bloodmagic_guide"); } } From ebdc66d0633624d85fc628bcfea2a09d582a6206 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 13 Apr 2018 11:31:52 -0400 Subject: [PATCH 163/493] Changed the Alchemy Table to use Bindable for checking the Orb's stored LP. Also fixed a crafting exploit with the table. #1269 --- .../bloodmagic/tile/TileAlchemyTable.java | 334 +++++++++++------- 1 file changed, 207 insertions(+), 127 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index fd911ee6..ecbc8fa8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,15 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.base.Strings; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -22,11 +15,20 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.SidedInvWrapper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NetworkHelper; -import java.util.ArrayList; -import java.util.List; - -public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable { +public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable +{ public static final int orbSlot = 6; public static final int toolSlot = 7; public static final int outputSlot = 8; @@ -37,36 +39,43 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, public int ticksRequired = 1; public BlockPos connectedPos = BlockPos.ORIGIN; - public boolean[] blockedSlots = new boolean[]{false, false, false, false, false, false}; + public boolean[] blockedSlots = new boolean[] { false, false, false, false, false, false }; - public TileAlchemyTable() { + public TileAlchemyTable() + { super(9, "alchemyTable"); } - public void setInitialTableParameters(EnumFacing direction, boolean isSlave, BlockPos connectedPos) { + public void setInitialTableParameters(EnumFacing direction, boolean isSlave, BlockPos connectedPos) + { this.isSlave = isSlave; this.connectedPos = connectedPos; - if (!isSlave) { + if (!isSlave) + { this.direction = direction; } } - public boolean isInvisible() { + public boolean isInvisible() + { return isSlave(); } - public boolean isInputSlotAccessible(int slot) { + public boolean isInputSlotAccessible(int slot) + { return !(slot < 6 && slot >= 0) || !blockedSlots[slot]; } - public void toggleInputSlotAccessible(int slot) { + public void toggleInputSlotAccessible(int slot) + { if (slot < 6 && slot >= 0) blockedSlots[slot] = !blockedSlots[slot]; } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(NBTTagCompound tag) + { super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); @@ -82,7 +91,8 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public NBTTagCompound serialize(NBTTagCompound tag) + { super.serialize(tag); tag.setBoolean("isSlave", isSlave); @@ -104,14 +114,19 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, @SuppressWarnings("unchecked") @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - if (this.isSlave()) { + public T getCapability(Capability capability, EnumFacing facing) + { + if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + { + if (this.isSlave()) + { TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable) { + if (tile instanceof TileAlchemyTable) + { return (T) new SidedInvWrapper((TileAlchemyTable) tile, facing); } - } else { + } else + { return (T) new SidedInvWrapper(this, facing); } } @@ -120,58 +135,73 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public int[] getSlotsForFace(EnumFacing side) { - switch (side) { - case DOWN: - return new int[]{outputSlot}; - case UP: - return new int[]{orbSlot, toolSlot}; - default: - return new int[]{0, 1, 2, 3, 4, 5}; + public int[] getSlotsForFace(EnumFacing side) + { + switch (side) + { + case DOWN: + return new int[] { outputSlot }; + case UP: + return new int[] { orbSlot, toolSlot }; + default: + return new int[] { 0, 1, 2, 3, 4, 5 }; } } @Override - public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { - switch (direction) { - case DOWN: - return index != outputSlot && index != orbSlot && index != toolSlot; - case UP: - if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) { - return true; - } else if (index == toolSlot) { - return false; //TODO: - } else { - return true; - } - default: - return getAccessibleInputSlots(direction).contains(index); + public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) + { + switch (direction) + { + case DOWN: + return index != outputSlot && index != orbSlot && index != toolSlot; + case UP: + if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) + { + return true; + } else if (index == toolSlot) + { + return false; //TODO: + } else + { + return true; + } + default: + return getAccessibleInputSlots(direction).contains(index); } } @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { - switch (direction) { - case DOWN: - return index == outputSlot; - case UP: - if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) { - return true; - } else if (index == toolSlot) { - return true; //TODO: - } else { - return true; - } - default: - return getAccessibleInputSlots(direction).contains(index); + public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) + { + switch (direction) + { + case DOWN: + return index == outputSlot; + case UP: + if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) + { + return true; + } else if (index == toolSlot) + { + return true; //TODO: + } else + { + return true; + } + default: + return getAccessibleInputSlots(direction).contains(index); } } - public List getAccessibleInputSlots(EnumFacing direction) { + public List getAccessibleInputSlots(EnumFacing direction) + { List list = new ArrayList<>(); - for (int i = 0; i < 6; i++) { - if (isInputSlotAccessible(i)) { + for (int i = 0; i < 6; i++) + { + if (isInputSlotAccessible(i)) + { list.add(i); } } @@ -180,15 +210,19 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public void update() { - if (isSlave()) { + public void update() + { + if (isSlave()) + { return; } List inputList = new ArrayList<>(); - for (int i = 0; i < 6; i++) { - if (!getStackInSlot(i).isEmpty()) { + for (int i = 0; i < 6; i++) + { + if (!getStackInSlot(i).isEmpty()) + { inputList.add(getStackInSlot(i)); } } @@ -197,24 +231,31 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, // special recipes like dying AlchemyTableRecipe recipe = AlchemyTableRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); - if (recipe != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipe.getTierRequired() && this.getContainedLp() >= recipe.getLpDrained()))) { + if (recipe != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipe.getTierRequired() && this.getContainedLp() >= recipe.getLpDrained()))) + { if (burnTime == 1) notifyUpdate(); - if (canCraft(recipe.getRecipeOutput(inputList))) { + if (canCraft(recipe.getRecipeOutput(inputList))) + { ticksRequired = recipe.getTicksRequired(); burnTime++; - if (burnTime == ticksRequired) { - if (!getWorld().isRemote) { + if (burnTime == ticksRequired) + { + if (!getWorld().isRemote) + { int requiredLp = recipe.getLpDrained(); - if (requiredLp > 0) { - if (!getWorld().isRemote) { + if (requiredLp > 0) + { + if (!getWorld().isRemote) + { consumeLp(requiredLp); } } - if (!getWorld().isRemote) { + if (!getWorld().isRemote) + { craftItem(inputList, recipe); } } @@ -223,25 +264,40 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, IBlockState state = getWorld().getBlockState(pos); getWorld().notifyBlockUpdate(getPos(), state, state, 3); - } else if (burnTime > ticksRequired + 10) { + } else if (burnTime > ticksRequired + 10) + { burnTime = 0; } - } else { + } else + { burnTime = 0; } - } else { // Simple recipes + } else + { // Simple recipes RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(inputList); - if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) { + if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) + { if (burnTime == 1) notifyUpdate(); - if (canCraft(recipeAlchemyTable.getOutput())) { + if (canCraft(recipeAlchemyTable.getOutput())) + { ticksRequired = recipeAlchemyTable.getTicks(); burnTime++; - if (burnTime >= ticksRequired) { - if (!getWorld().isRemote) { - if (recipeAlchemyTable.getSyphon() > 0 && !getWorld().isRemote) - consumeLp(recipeAlchemyTable.getSyphon()); + if (burnTime >= ticksRequired) + { + if (!getWorld().isRemote) + { + if (recipeAlchemyTable.getSyphon() > 0) + { + if (consumeLp(recipeAlchemyTable.getSyphon()) < recipeAlchemyTable.getSyphon()) + { + //There was not enough LP to craft or there was no orb + burnTime = 0; + notifyUpdate(); + return; + } + } ItemStack outputSlotStack = getStackInSlot(outputSlot); if (outputSlotStack.isEmpty()) @@ -249,7 +305,8 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, else outputSlotStack.grow(recipeAlchemyTable.getOutput().getCount()); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) + { ItemStack currentStack = getStackInSlot(i); if (currentStack.getItem().hasContainerItem(currentStack)) setInventorySlotContents(i, currentStack.getItem().getContainerItem(currentStack)); @@ -262,17 +319,20 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } } - } else { + } else + { burnTime = 0; } } } - public double getProgressForGui() { + public double getProgressForGui() + { return ((double) burnTime) / ticksRequired; } - private boolean canCraft(ItemStack output) { + private boolean canCraft(ItemStack output) + { ItemStack currentOutputStack = getStackInSlot(outputSlot); if (output.isEmpty()) return false; @@ -284,10 +344,13 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); } - public int getTierOfOrb() { + public int getTierOfOrb() + { ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) { - if (orbStack.getItem() instanceof IBloodOrb) { + if (!orbStack.isEmpty()) + { + if (orbStack.getItem() instanceof IBloodOrb) + { BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); return orb == null ? 0 : orb.getTier(); } @@ -296,23 +359,20 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return 0; } - public int getContainedLp() { + public int getContainedLp() + { ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) { - if (orbStack.getItem() instanceof IBloodOrb) { - NBTTagCompound itemTag = orbStack.getTagCompound(); - - if (itemTag == null) { + if (!orbStack.isEmpty()) + { + if (orbStack.getItem() instanceof IBloodOrb) + { + Binding binding = ((IBindable) orbStack.getItem()).getBinding(orbStack); + if (binding == null) + { return 0; } - String ownerUUID = itemTag.getString(Constants.NBT.OWNER_UUID); - - if (Strings.isNullOrEmpty(ownerUUID)) { - return 0; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(ownerUUID); + SoulNetwork network = NetworkHelper.getSoulNetwork(binding); return network.getCurrentEssence(); } @@ -321,14 +381,18 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return 0; } - public void craftItem(List inputList, AlchemyTableRecipe recipe) { - if (this.canCraft(recipe.getRecipeOutput(inputList))) { + public void craftItem(List inputList, AlchemyTableRecipe recipe) + { + if (this.canCraft(recipe.getRecipeOutput(inputList))) + { ItemStack outputStack = recipe.getRecipeOutput(inputList); ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (currentOutputStack.isEmpty()) { + if (currentOutputStack.isEmpty()) + { setInventorySlotContents(outputSlot, outputStack); - } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) { + } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) + { currentOutputStack.grow(outputStack.getCount()); } @@ -336,12 +400,16 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } - public int consumeLp(int requested) { + public int consumeLp(int requested) + { ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) { - if (orbStack.getItem() instanceof IBloodOrb) { - if (NetworkHelper.syphonFromContainer(orbStack, requested)) { + if (!orbStack.isEmpty()) + { + if (orbStack.getItem() instanceof IBloodOrb) + { + if (NetworkHelper.syphonFromContainer(orbStack, requested)) + { return requested; } } @@ -350,52 +418,64 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return 0; } - public void consumeInventory(AlchemyTableRecipe recipe) { + public void consumeInventory(AlchemyTableRecipe recipe) + { ItemStack[] input = new ItemStack[6]; - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) + { input[i] = getStackInSlot(i); } ItemStack[] result = recipe.getRemainingItems(input); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) + { setInventorySlotContents(i, result[i]); } } - public EnumFacing getDirection() { + public EnumFacing getDirection() + { return direction; } - public boolean isSlave() { + public boolean isSlave() + { return isSlave; } - public int getBurnTime() { + public int getBurnTime() + { return burnTime; } - public int getTicksRequired() { + public int getTicksRequired() + { return ticksRequired; } - public BlockPos getConnectedPos() { + public BlockPos getConnectedPos() + { return connectedPos; } - public boolean[] getBlockedSlots() { + public boolean[] getBlockedSlots() + { return blockedSlots; } - public static int getOrbSlot() { + public static int getOrbSlot() + { return orbSlot; } - public static int getToolSlot() { + public static int getToolSlot() + { return toolSlot; } - public static int getOutputSlot() { + public static int getOutputSlot() + { return outputSlot; } } From 765a7a2998af88878a05eeb7936ca017000fe91a Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 13 Apr 2018 11:34:21 -0400 Subject: [PATCH 164/493] Updated changelog. --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index ee011044..8302d97d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Version 2.2.9 ------------------------------------------------------ - Fixed stupid NPE in the Furnace Array +- Fixed part of the Alchemy Table - now it works for recipes that require a LP cost. ------------------------------------------------------ Version 2.2.8 From 2db0ce5639d034c25d123781922b7adfe3960824 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 13 Apr 2018 12:20:39 -0400 Subject: [PATCH 165/493] Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. --- changelog.txt | 1 + .../guideapi/book/CategoryArchitect.java | 230 ++++++++++++------ .../assets/bloodmagicguide/lang/en_US.lang | 4 + 3 files changed, 160 insertions(+), 75 deletions(-) diff --git a/changelog.txt b/changelog.txt index 8302d97d..dfceb679 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version 2.2.9 ------------------------------------------------------ - Fixed stupid NPE in the Furnace Array - Fixed part of the Alchemy Table - now it works for recipes that require a LP cost. +- Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. ------------------------------------------------------ Version 2.2.8 diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 946dd171..ac330963 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -29,8 +29,10 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class CategoryArchitect { - public static Map buildCategory() { +public class CategoryArchitect +{ + public static Map buildCategory() + { Map entries = new LinkedHashMap<>(); String keyBase = "guide." + BloodMagic.MODID + ".entry.architect."; @@ -42,14 +44,16 @@ public class CategoryArchitect { List altarPages = new ArrayList<>(); IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ALTAR)); - if (altarRecipe != null) { + if (altarRecipe != null) + { altarPages.add(BookUtils.getPageForRecipe(altarRecipe)); } altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.1"), 370)); IRecipe daggerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER)); - if (daggerRecipe != null) { + if (daggerRecipe != null) + { altarPages.add(BookUtils.getPageForRecipe(daggerRecipe)); } @@ -59,7 +63,8 @@ public class CategoryArchitect { List ashPages = new ArrayList<>(); TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); - if (ashRecipe != null) { + if (ashRecipe != null) + { ashPages.add(new PageTartaricForgeRecipe(ashRecipe)); } ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); @@ -68,7 +73,8 @@ public class CategoryArchitect { List divinationPages = new ArrayList<>(); PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)); - if (divinationRecipePage != null) { + if (divinationRecipePage != null) + { divinationPages.add(divinationRecipePage); } @@ -84,7 +90,8 @@ public class CategoryArchitect { weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370)); AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)); - if (weakorbRecipe != null) { + if (weakorbRecipe != null) + { weakorbPages.add(new PageAltarRecipe(weakorbRecipe)); } @@ -94,14 +101,16 @@ public class CategoryArchitect { List incensePages = new ArrayList<>(); IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR)); - if (incenseRecipe != null) { + if (incenseRecipe != null) + { incensePages.add(BookUtils.getPageForRecipe(incenseRecipe)); } incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.1"), 370)); IRecipe woodPathRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0)); - if (woodPathRecipe != null) { + if (woodPathRecipe != null) + { incensePages.add(BookUtils.getPageForRecipe(woodPathRecipe)); } @@ -111,7 +120,8 @@ public class CategoryArchitect { List runePages = new ArrayList<>(); IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 0)); - if (runeRecipe != null) { + if (runeRecipe != null) + { runePages.add(BookUtils.getPageForRecipe(runeRecipe)); } @@ -121,7 +131,8 @@ public class CategoryArchitect { List inspectPages = new ArrayList<>(); AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK)); - if (inspectRecipe != null) { + if (inspectRecipe != null) + { inspectPages.add(new PageAltarRecipe(inspectRecipe)); } @@ -131,7 +142,8 @@ public class CategoryArchitect { List speedRunePages = new ArrayList<>(); IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1)); - if (speedRecipe != null) { + if (speedRecipe != null) + { speedRunePages.add(BookUtils.getPageForRecipe(speedRecipe)); } @@ -141,12 +153,14 @@ public class CategoryArchitect { List waterPages = new ArrayList<>(); TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_WATER.getStack()); - if (waterRecipe != null) { + if (waterRecipe != null) + { waterPages.add(new PageTartaricForgeRecipe(waterRecipe)); } PageAlchemyArray waterRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER)); - if (waterRecipePage != null) { + if (waterRecipePage != null) + { waterPages.add(waterRecipePage); } @@ -156,12 +170,14 @@ public class CategoryArchitect { List lavaPages = new ArrayList<>(); TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_LAVA.getStack()); - if (lavaRecipe != null) { + if (lavaRecipe != null) + { lavaPages.add(new PageTartaricForgeRecipe(lavaRecipe)); } PageAlchemyArray lavaRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA)); - if (lavaRecipePage != null) { + if (lavaRecipePage != null) + { lavaPages.add(lavaRecipePage); } @@ -171,7 +187,8 @@ public class CategoryArchitect { List lavaCrystalPages = new ArrayList<>(); IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL)); - if (lavaCrystalRecipe != null) { + if (lavaCrystalRecipe != null) + { lavaCrystalPages.add(BookUtils.getPageForRecipe(lavaCrystalRecipe)); } @@ -181,7 +198,8 @@ public class CategoryArchitect { List apprenticeorbPages = new ArrayList<>(); AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE)); - if (apprenticeorbRecipe != null) { + if (apprenticeorbRecipe != null) + { apprenticeorbPages.add(new PageAltarRecipe(apprenticeorbRecipe)); } @@ -191,7 +209,8 @@ public class CategoryArchitect { List daggerPages = new ArrayList<>(); AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE)); - if (daggerOfSacrificeRecipe != null) { + if (daggerOfSacrificeRecipe != null) + { daggerPages.add(new PageAltarRecipe(daggerOfSacrificeRecipe)); } @@ -201,7 +220,8 @@ public class CategoryArchitect { List runeSacrificePages = new ArrayList<>(); IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3)); - if (runeSacrificeRecipe != null) { + if (runeSacrificeRecipe != null) + { runeSacrificePages.add(BookUtils.getPageForRecipe(runeSacrificeRecipe)); } @@ -211,7 +231,8 @@ public class CategoryArchitect { List runeSelfSacrificePages = new ArrayList<>(); IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (runeSelfSacrificeRecipe != null) { + if (runeSelfSacrificeRecipe != null) + { runeSelfSacrificePages.add(BookUtils.getPageForRecipe(runeSelfSacrificeRecipe)); } @@ -221,12 +242,14 @@ public class CategoryArchitect { List holdingPages = new ArrayList<>(); TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HOLDING.getStack()); - if (holdingRecipe != null) { + if (holdingRecipe != null) + { holdingPages.add(new PageTartaricForgeRecipe(holdingRecipe)); } PageAlchemyArray holdingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING)); - if (holdingRecipePage != null) { + if (holdingRecipePage != null) + { holdingPages.add(holdingRecipePage); } @@ -236,12 +259,14 @@ public class CategoryArchitect { List airPages = new ArrayList<>(); TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AIR.getStack()); - if (airRecipe != null) { + if (airRecipe != null) + { airPages.add(new PageTartaricForgeRecipe(airRecipe)); } PageAlchemyArray airRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR)); - if (airRecipePage != null) { + if (airRecipePage != null) + { airPages.add(airRecipePage); } @@ -251,12 +276,14 @@ public class CategoryArchitect { List voidPages = new ArrayList<>(); TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_VOID.getStack()); - if (voidRecipe != null) { + if (voidRecipe != null) + { voidPages.add(new PageTartaricForgeRecipe(voidRecipe)); } PageAlchemyArray voidRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID)); - if (voidRecipePage != null) { + if (voidRecipePage != null) + { voidPages.add(voidRecipePage); } @@ -266,12 +293,14 @@ public class CategoryArchitect { List greenGrovePages = new ArrayList<>(); TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_GROWTH.getStack()); - if (greenGroveRecipe != null) { + if (greenGroveRecipe != null) + { greenGrovePages.add(new PageTartaricForgeRecipe(greenGroveRecipe)); } PageAlchemyArray greenGroveRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE)); - if (greenGroveRecipePage != null) { + if (greenGroveRecipePage != null) + { greenGrovePages.add(greenGroveRecipePage); } @@ -281,12 +310,14 @@ public class CategoryArchitect { List fastMinerPages = new ArrayList<>(); TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_FAST_MINER.getStack()); - if (fastMinerRecipe != null) { + if (fastMinerRecipe != null) + { fastMinerPages.add(new PageTartaricForgeRecipe(fastMinerRecipe)); } PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER)); - if (fastMinerRecipePage != null) { + if (fastMinerRecipePage != null) + { fastMinerPages.add(fastMinerRecipePage); } @@ -296,12 +327,14 @@ public class CategoryArchitect { List seerPages = new ArrayList<>(); TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SIGHT.getStack()); - if (seerRecipe != null) { + if (seerRecipe != null) + { seerPages.add(new PageTartaricForgeRecipe(seerRecipe)); } PageAlchemyArray seerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER)); - if (seerRecipePage != null) { + if (seerRecipePage != null) + { seerPages.add(seerRecipePage); } @@ -311,17 +344,24 @@ public class CategoryArchitect { List magicianOrbPages = new ArrayList<>(); AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN)); - if (magicianOrbRecipe != null) { + if (magicianOrbRecipe != null) + { magicianOrbPages.add(new PageAltarRecipe(magicianOrbRecipe)); } + List tier3Pages = new ArrayList<>(); + + tier3Pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "tier3" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "tier3"), new EntryText(tier3Pages, TextHelper.localize(keyBase + "tier3"), true)); + magicianOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magicianOrb" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "magicianOrb"), new EntryText(magicianOrbPages, TextHelper.localize(keyBase + "magicianOrb"), true)); List capacityPages = new ArrayList<>(); IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (capacityRecipe != null) { + if (capacityRecipe != null) + { capacityPages.add(BookUtils.getPageForRecipe(capacityRecipe)); } @@ -331,7 +371,8 @@ public class CategoryArchitect { List displacementPages = new ArrayList<>(); IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (displacementRecipe != null) { + if (displacementRecipe != null) + { displacementPages.add(BookUtils.getPageForRecipe(displacementRecipe)); } @@ -341,12 +382,14 @@ public class CategoryArchitect { List affinityPages = new ArrayList<>(); TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AFFINITY.getStack()); - if (affinityRecipe != null) { + if (affinityRecipe != null) + { affinityPages.add(new PageTartaricForgeRecipe(affinityRecipe)); } PageAlchemyArray affinityRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY)); - if (affinityRecipePage != null) { + if (affinityRecipePage != null) + { affinityPages.add(affinityRecipePage); } @@ -356,12 +399,14 @@ public class CategoryArchitect { List lampPages = new ArrayList<>(); TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack()); - if (lampRecipe != null) { + if (lampRecipe != null) + { lampPages.add(new PageTartaricForgeRecipe(lampRecipe)); } PageAlchemyArray lampRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT)); - if (lampRecipePage != null) { + if (lampRecipePage != null) + { lampPages.add(lampRecipePage); } @@ -371,12 +416,14 @@ public class CategoryArchitect { List magnetismPages = new ArrayList<>(); TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_MAGNETISM.getStack()); - if (magnetismRecipe != null) { + if (magnetismRecipe != null) + { magnetismPages.add(new PageTartaricForgeRecipe(magnetismRecipe)); } PageAlchemyArray magnetismRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM)); - if (magnetismRecipePage != null) { + if (magnetismRecipePage != null) + { magnetismPages.add(magnetismRecipePage); } @@ -386,7 +433,8 @@ public class CategoryArchitect { List peritiaPages = new ArrayList<>(); IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME)); - if (peritiaRecipe != null) { + if (peritiaRecipe != null) + { peritiaPages.add(BookUtils.getPageForRecipe(peritiaRecipe)); } @@ -396,27 +444,32 @@ public class CategoryArchitect { List livingArmourPages = new ArrayList<>(); TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BINDING.getStack()); - if (bindingRecipe != null) { + if (bindingRecipe != null) + { livingArmourPages.add(new PageTartaricForgeRecipe(bindingRecipe)); } PageAlchemyArray bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)); - if (bindingRecipePage != null) { + if (bindingRecipePage != null) + { livingArmourPages.add(bindingRecipePage); } bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)); - if (bindingRecipePage != null) { + if (bindingRecipePage != null) + { livingArmourPages.add(bindingRecipePage); } bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS)); - if (bindingRecipePage != null) { + if (bindingRecipePage != null) + { livingArmourPages.add(bindingRecipePage); } bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)); - if (bindingRecipePage != null) { + if (bindingRecipePage != null) + { livingArmourPages.add(bindingRecipePage); } @@ -436,12 +489,14 @@ public class CategoryArchitect { List teleposerPages = new ArrayList<>(); AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)); - if (teleposerFocusRecipe != null) { + if (teleposerFocusRecipe != null) + { teleposerPages.add(new PageAltarRecipe(teleposerFocusRecipe)); } IRecipe teleposerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER)); - if (teleposerRecipe != null) { + if (teleposerRecipe != null) + { teleposerPages.add(BookUtils.getPageForRecipe(teleposerRecipe)); } @@ -451,7 +506,8 @@ public class CategoryArchitect { List boundBladePages = new ArrayList<>(); PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD)); - if (boundBladePage != null) { + if (boundBladePage != null) + { boundBladePages.add(boundBladePage); } @@ -461,17 +517,20 @@ public class CategoryArchitect { List boundToolPages = new ArrayList<>(); PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)); - if (boundToolPage != null) { + if (boundToolPage != null) + { boundToolPages.add(boundToolPage); } boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)); - if (boundToolPage != null) { + if (boundToolPage != null) + { boundToolPages.add(boundToolPage); } boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)); - if (boundToolPage != null) { + if (boundToolPage != null) + { boundToolPages.add(boundToolPage); } @@ -486,7 +545,8 @@ public class CategoryArchitect { List masterOrbPages = new ArrayList<>(); AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER)); - if (magicianOrbRecipe != null) { + if (magicianOrbRecipe != null) + { masterOrbPages.add(new PageAltarRecipe(masterOrbRecipe)); } @@ -496,7 +556,8 @@ public class CategoryArchitect { List orbRunePages = new ArrayList<>(); IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8)); - if (orbRuneRecipe != null) { + if (orbRuneRecipe != null) + { orbRunePages.add(BookUtils.getPageForRecipe(orbRuneRecipe)); } @@ -506,7 +567,8 @@ public class CategoryArchitect { List augmentedCapacityPages = new ArrayList<>(); IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7)); - if (orbRuneRecipe != null) { + if (orbRuneRecipe != null) + { augmentedCapacityPages.add(BookUtils.getPageForRecipe(augmentedCapacityRecipe)); } @@ -516,7 +578,8 @@ public class CategoryArchitect { List chargingPages = new ArrayList<>(); IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10)); - if (orbRuneRecipe != null) { + if (orbRuneRecipe != null) + { chargingPages.add(BookUtils.getPageForRecipe(chargingRecipe)); } @@ -526,7 +589,8 @@ public class CategoryArchitect { List accelerationPages = new ArrayList<>(); IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9)); - if (orbRuneRecipe != null) { + if (orbRuneRecipe != null) + { accelerationPages.add(BookUtils.getPageForRecipe(accelerationRecipe)); } @@ -536,12 +600,14 @@ public class CategoryArchitect { List suppressionPages = new ArrayList<>(); TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SUPPRESSION.getStack()); - if (suppressionRecipe != null) { + if (suppressionRecipe != null) + { suppressionPages.add(new PageTartaricForgeRecipe(suppressionRecipe)); } PageAlchemyArray suppressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION)); - if (suppressionRecipePage != null) { + if (suppressionRecipePage != null) + { suppressionPages.add(suppressionRecipePage); } @@ -551,12 +617,14 @@ public class CategoryArchitect { List hastePages = new ArrayList<>(); TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HASTE.getStack()); - if (hasteRecipe != null) { + if (hasteRecipe != null) + { hastePages.add(new PageTartaricForgeRecipe(hasteRecipe)); } PageAlchemyArray hasteRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE)); - if (hasteRecipePage != null) { + if (hasteRecipePage != null) + { hastePages.add(hasteRecipePage); } @@ -566,12 +634,14 @@ public class CategoryArchitect { List severancePages = new ArrayList<>(); TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SEVERANCE.getStack()); - if (severanceRecipe != null) { + if (severanceRecipe != null) + { severancePages.add(new PageTartaricForgeRecipe(severanceRecipe)); } PageAlchemyArray severanceRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE)); - if (severanceRecipePage != null) { + if (severanceRecipePage != null) + { severancePages.add(severanceRecipePage); } @@ -581,12 +651,14 @@ public class CategoryArchitect { List telepositionPages = new ArrayList<>(); TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_TELEPOSITION.getStack()); - if (telepositionRecipe != null) { + if (telepositionRecipe != null) + { telepositionPages.add(new PageTartaricForgeRecipe(telepositionRecipe)); } PageAlchemyArray telepositionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION)); - if (telepositionRecipePage != null) { + if (telepositionRecipePage != null) + { telepositionPages.add(telepositionRecipePage); } @@ -596,12 +668,14 @@ public class CategoryArchitect { List compressionPages = new ArrayList<>(); TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_COMPRESSION.getStack()); - if (compressionRecipe != null) { + if (compressionRecipe != null) + { compressionPages.add(new PageTartaricForgeRecipe(compressionRecipe)); } PageAlchemyArray compressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION)); - if (compressionRecipePage != null) { + if (compressionRecipePage != null) + { compressionPages.add(compressionRecipePage); } @@ -611,12 +685,14 @@ public class CategoryArchitect { List bridgePages = new ArrayList<>(); TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BRIDGE.getStack()); - if (bridgeRecipe != null) { + if (bridgeRecipe != null) + { bridgePages.add(new PageTartaricForgeRecipe(bridgeRecipe)); } PageAlchemyArray bridgeRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE)); - if (bridgeRecipePage != null) { + if (bridgeRecipePage != null) + { bridgePages.add(bridgeRecipePage); } @@ -626,16 +702,20 @@ public class CategoryArchitect { List mimicPages = new ArrayList<>(); IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 1, 1)); - if (mimicRecipe != null) { + if (mimicRecipe != null) + { mimicPages.add(BookUtils.getPageForRecipe(mimicRecipe)); } mimicPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "mimic" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "mimic"), new EntryText(mimicPages, TextHelper.localize(keyBase + "mimic"), true)); - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { + for (Entry entry : entries.entrySet()) + { + for (IPage page : entry.getValue().pageList) + { + if (page instanceof PageText) + { ((PageText) page).setUnicodeFlag(true); } } diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index aa0981c5..d0ff5595 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -134,6 +134,8 @@ guide.bloodmagic.entry.architect.augmentedCapacity=Rune of Augmented Capacity guide.bloodmagic.entry.architect.charging=Charging Rune guide.bloodmagic.entry.architect.acceleration=Rune of Acceleration +guide.bloodmagic.entry.architect.tier3=Tier 3 Under da Sea + # Architect Entry Texts guide.bloodmagic.entry.architect.intro.info=Hello, everyone. My name is Tiberius. You can probably tell by this entry that the book is not exactly complete, and you would be right. Because of the 1.7.10 -> 1.8.9 and 1.9.4 (and above) updates, a lot of stuff has changed in the mod. As such, the books have had to be rewritten. Because the ultimate plan for these documents is to have each book in the form of a research journal / actual book, these documents will take a while to flesh out. As such, I am going to be updating this book periodically in order to fill in the necessary gaps. It will start as flavourless garbage to start with (Yeah... not the most appetizing of illustrations to go with for documents, but whatever!), but slowly it will be morphed into a story about a bunch of blood magi on a journey through discovery.\n\tBut enough about that, I need to get into character. *Cough cough*\n\tMy name is Tiberius, and I am a Blood Mage, and also otherwise known as The Architect. This book contains all of my research regarding the ethereal phenomenon called the "Soul Network," as well as the physical properties of some of the most central devices that any Blood Mage in training should be accustomed to. From the art of laying out the structure of a powerful Blood Altar, to the intricacies of sacrificing life force to increase a mage's power, and further to the powers gained through arcane glyphs and sigils, I have discovered, revised, and created new ways into train one's self to new heights.\n\tSo enter, Mage, for a new realm awaits you!\n\t...Yeah, Magus says that I can get a little grandiose, but what can you do? guide.bloodmagic.entry.architect.bloodaltar.info.1=The Blood Altar is one of the most central devices in the mod. There are two main uses for the altar: either for crafting certain items essential for progressing through the mod, or for filling up one's Blood Orb. Both of these actions require the player to fill up the basin with Life Essence, which can be extracted from two different sources: monsters and peaceful creatures, and the player's own health. @@ -190,6 +192,8 @@ guide.bloodmagic.entry.architect.augmentedCapacity.info=The Rune of Augmented Ca guide.bloodmagic.entry.architect.charging.info=The Charging Rune is one of those beauties that will completely change the operation of the Blood Altar to something that can be seen as more useful for one-stop crafting. By syphoning off the LP from the Blood Altar slowly, the Charging rune begins storing "Charge," an internal value of the Blood Altar that can be seen using the Sigil of Sight. If the Blood Altar has enough Charge when it gets something to craft, it will use the required Charge up immediately and craft the item instantaneously. If there is not enough Charge, the Charge is all used to increase the progress of the item at a 1:1 Charge:LP ratio. \n\tThe maximum amount of Charge that can be stored in the Blood Altar is a function of the number of Charging Runes that it has multiplied by the current capacity of the altar (the capacity of the altar only comes into effect if it is greater than 20k). The rate that it charges is also related directly to the speed of the altar times the number of Charging Runes it has, and it will convert LP into Charge once every 20 ticks (one second). So if you were to design a Blood Altar with this rune, careful consideration will have to be made for all of the synergistic relationships that it has. guide.bloodmagic.entry.architect.acceleration.info=Unlike most runes, the Rune of Acceleration works best only when paired with other runes, and its effects only increase to a limited amount. What this rune does is it increases the number of processing ticks that can occur in a given period of time, specifically when it comes to the Displacement Rune and Charging Rune. For each rune added, the number of ticks before the next processing tick decreases by one. For instance, by default the Displacement Rune displaces liquids at a rate of one operation per 20 ticks - with 10 Runes of Acceleration, this would occur at a rate of one operation per 10 ticks.\n\tObviously the maximum number of Acceleration Runes that presently matter is 19 - if you have this many, the Displacement Rune and Charging Rune will both activate their effects each tick. Noice! +guide.bloodmagic.entry.architect.tier3.info=It is well known that a Tier 3 altar requires you to cap four pillars with glowstone blocks from the Nether. What is not as thoroughly understood is that you can actually use Sea Lanterns instead. So if you find yourself very far away from going to the Nether but have access to ocean temples, you can use other ways to advance yourself in Blood Magic. + # Demon Kin Entries guide.bloodmagic.entry.demon.intro=Bella Highborn guide.bloodmagic.entry.demon.snare=Demon Will and Snares From af3e1fecb6d3b47fb9c8105f39767b734c32d137 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 13 Apr 2018 16:44:00 -0400 Subject: [PATCH 166/493] Fixed an interaction issue between vanilla hoppers and the Alchemy Table, due to the hoppers not actually using the Forge capabilities for all of its checking methods. --- changelog.txt | 4 +++- .../bloodmagic/tile/TileAlchemyTable.java | 24 +++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index dfceb679..3c827cb6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,9 @@ Version 2.2.9 ------------------------------------------------------ - Fixed stupid NPE in the Furnace Array -- Fixed part of the Alchemy Table - now it works for recipes that require a LP cost. +- Fixed various issues with the Alchemy Table: + - Now works for recipes that require an LP cost. + - Hoppers no longer lose items when items are placed into the "slave" Alchemy Table who has some slots restricted. - Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index ecbc8fa8..fd9de09f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -8,13 +8,13 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.items.wrapper.SidedInvWrapper; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.core.data.Binding; @@ -121,13 +121,13 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, if (this.isSlave()) { TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable) + if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { - return (T) new SidedInvWrapper((TileAlchemyTable) tile, facing); + return (T) tile.getCapability(capability, facing); } } else { - return (T) new SidedInvWrapper(this, facing); + return super.getCapability(capability, facing); } } @@ -167,6 +167,14 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return true; } default: + if (this.isSlave) + { + TileEntity tile = getWorld().getTileEntity(connectedPos); + if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) + { + return ((TileAlchemyTable) tile).canInsertItem(index, stack, direction); + } + } return getAccessibleInputSlots(direction).contains(index); } } @@ -190,6 +198,14 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return true; } default: + if (this.isSlave) + { + TileEntity tile = getWorld().getTileEntity(connectedPos); + if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) + { + return ((TileAlchemyTable) tile).canExtractItem(index, stack, direction); + } + } return getAccessibleInputSlots(direction).contains(index); } } From 2d83e8047d35d67a0d71bd65f0927ba6468166a2 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 15 Apr 2018 11:05:02 -0700 Subject: [PATCH 167/493] Fix Blood Light not being punchable (#1272) Also makes it more visible while holding the sigil. --- .../bloodmagic/block/BlockBloodLight.java | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index 71f9d92e..7076f77f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -8,7 +8,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.particle.ParticleManager; +import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -29,15 +31,15 @@ public class BlockBloodLight extends Block { setUnlocalizedName(BloodMagic.MODID + ".bloodLight"); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return AABB; + } + @Nullable @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { - return null; - } - - @Override - public boolean isCollidable() { - return false; + return NULL_AABB; } @Override @@ -89,21 +91,18 @@ public class BlockBloodLight extends Block { @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - EntityPlayerSP playerSP = Minecraft.getMinecraft().player; + EntityPlayerSP player = Minecraft.getMinecraft().player; if (rand.nextInt(3) != 0) { world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - if (!playerSP.getActiveItemStack().isEmpty() && playerSP.getActiveItemStack().getItem() == RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT) { - world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - } - } - } + ItemStack heldItem = player.getHeldItem(EnumHand.MAIN_HAND); - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return AABB; + if (heldItem.isEmpty() || heldItem.getItem() != RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT) + return; + + for (int i = 0; i < 8; i++) + world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); + } } @Override From 79ccd1f3bb9676522295f4c9f1b22f971f5ab3d0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 15 Apr 2018 11:21:14 -0700 Subject: [PATCH 168/493] Add inputs to crafting events + implement SF/AT events (#1270) --- .../api/event/BloodMagicCraftedEvent.java | 50 +++++++++++++------ .../bloodmagic/tile/TileAlchemyTable.java | 26 ++++++++-- .../bloodmagic/tile/TileSoulForge.java | 16 ++++-- 3 files changed, 71 insertions(+), 21 deletions(-) diff --git a/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java index 1df4bb13..0b92284c 100644 --- a/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java +++ b/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java @@ -1,16 +1,17 @@ package WayofTime.bloodmagic.api.event; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.fml.common.eventhandler.Event; public class BloodMagicCraftedEvent extends Event { private final boolean modifiable; + private final ItemStack[] inputs; private ItemStack output; - public BloodMagicCraftedEvent(ItemStack output, boolean modifiable) { + public BloodMagicCraftedEvent(ItemStack output, ItemStack[] inputs, boolean modifiable) { this.modifiable = modifiable; + this.inputs = inputs; this.output = output; } @@ -18,6 +19,10 @@ public class BloodMagicCraftedEvent extends Event { return modifiable; } + public ItemStack[] getInputs() { + return inputs; + } + public ItemStack getOutput() { return output; } @@ -28,22 +33,39 @@ public class BloodMagicCraftedEvent extends Event { } /** - * Fired whenever a craft is completed in a BloodAltar. - *

+ * Fired whenever a craft is completed in a Blood Altar. + * * It is not cancelable, however you can modify the output stack. */ public static class Altar extends BloodMagicCraftedEvent { - private final Ingredient input; - - public Altar(Ingredient input, ItemStack output) { - super(output, true); - - this.input = input; - } - - public Ingredient getInput() { - return input; + public Altar(ItemStack output, ItemStack input) { + super(output, new ItemStack[] { input }, true); } } + + /** + * Fired whenever a craft is completed in a Soul Forge. + * + * It is not cancelable, however you can modify the output stack. + */ + public static class SoulForge extends BloodMagicCraftedEvent { + + public SoulForge(ItemStack output, ItemStack[] inputs) { + super(output, inputs, true); + } + } + + /** + * Fired whenever a craft is completed in an Alchemy Table. + * + * It is not cancelable, however you can modify the output stack. + */ + public static class AlchemyTable extends BloodMagicCraftedEvent { + + public AlchemyTable(ItemStack output, ItemStack[] inputs) { + super(output, inputs, true); + } + } + } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index fd9de09f..11b9e8eb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.tile; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -12,6 +13,7 @@ import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -26,6 +28,7 @@ import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; +import org.apache.commons.lang3.ArrayUtils; public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable { @@ -315,11 +318,18 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } + ItemStack[] inputs = new ItemStack[0]; + for (ItemStack stack : inputList) + ArrayUtils.add(inputs, stack.copy()); + + BloodMagicCraftedEvent.AlchemyTable event = new BloodMagicCraftedEvent.AlchemyTable(recipeAlchemyTable.getOutput().copy(), inputs); + MinecraftForge.EVENT_BUS.post(event); + ItemStack outputSlotStack = getStackInSlot(outputSlot); if (outputSlotStack.isEmpty()) - setInventorySlotContents(outputSlot, recipeAlchemyTable.getOutput().copy()); + setInventorySlotContents(outputSlot, event.getOutput()); else - outputSlotStack.grow(recipeAlchemyTable.getOutput().getCount()); + outputSlotStack.grow(event.getOutput().getCount()); for (int i = 0; i < 6; i++) { @@ -399,11 +409,19 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, public void craftItem(List inputList, AlchemyTableRecipe recipe) { - if (this.canCraft(recipe.getRecipeOutput(inputList))) + ItemStack outputStack = recipe.getRecipeOutput(inputList); + if (this.canCraft(outputStack)) { - ItemStack outputStack = recipe.getRecipeOutput(inputList); ItemStack currentOutputStack = getStackInSlot(outputSlot); + ItemStack[] inputs = new ItemStack[0]; + for (ItemStack stack : inputList) + ArrayUtils.add(inputs, stack.copy()); + + BloodMagicCraftedEvent.AlchemyTable event = new BloodMagicCraftedEvent.AlchemyTable(outputStack.copy(), inputs); + MinecraftForge.EVENT_BUS.post(event); + outputStack = event.getOutput(); + if (currentOutputStack.isEmpty()) { setInventorySlotContents(outputSlot, outputStack); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 3640b6c7..4e737ae9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.util.Constants; @@ -11,6 +12,7 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.items.ItemHandlerHelper; import java.util.ArrayList; @@ -132,10 +134,18 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil if (this.canCraft(recipe)) { ItemStack currentOutputStack = getStackInSlot(outputSlot); + List inputList = new ArrayList<>(); + for (int i = 0; i < 4; i++) + if (!getStackInSlot(i).isEmpty()) + inputList.add(getStackInSlot(i).copy()); + + BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); + MinecraftForge.EVENT_BUS.post(event); + if (currentOutputStack.isEmpty()) { - setInventorySlotContents(outputSlot, recipe.getOutput().copy()); - } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, recipe.getOutput())) { - currentOutputStack.grow(recipe.getOutput().getCount()); + setInventorySlotContents(outputSlot, event.getOutput()); + } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) { + currentOutputStack.grow(event.getOutput().getCount()); } consumeInventory(); From 07ae96a60eb8e71393e564fb17fe981722cc0a45 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 17 Apr 2018 19:12:29 -0400 Subject: [PATCH 169/493] Fixed Demon Crystals growing at an accelerated rate (all the time). --- changelog.txt | 2 + .../bloodmagic/tile/TileDemonCrystal.java | 94 ++++++++++++------- 2 files changed, 64 insertions(+), 32 deletions(-) diff --git a/changelog.txt b/changelog.txt index 3c827cb6..a0908def 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,6 +6,8 @@ Version 2.2.9 - Now works for recipes that require an LP cost. - Hoppers no longer lose items when items are placed into the "slave" Alchemy Table who has some slots restricted. - Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. +- Fixed the Demon Will crystals growing when they shouldn't. Also lowered the time between natural crystal growths in Will-enriched areas. + - Side note: who's bright idea was it to have to wait 15 minutes per crystal growth? ------------------------------------------------------ Version 2.2.8 diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index e2b21806..a4b878e6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -12,7 +12,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.MathHelper; -public class TileDemonCrystal extends TileTicking { +public class TileDemonCrystal extends TileTicking +{ public static final double sameWillConversionRate = 50; public static final double defaultWillConversionRate = 100; public static final double timeDelayForWrongWill = 0.6; @@ -24,35 +25,46 @@ public class TileDemonCrystal extends TileTicking { public int crystalCount = 1; public EnumFacing placement = EnumFacing.UP; //Side that this crystal is placed on. - public TileDemonCrystal() { + public TileDemonCrystal() + { this.crystalCount = 1; } @Override - public void onUpdate() { - if (getWorld().isRemote) { + public void onUpdate() + { + if (getWorld().isRemote) + { return; } internalCounter++; - if (internalCounter % 20 == 0 && crystalCount < 7) { + if (internalCounter % 20 == 0 && crystalCount < 7) + { EnumDemonWillType type = EnumDemonWillType.values()[this.getBlockMetadata()]; double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - if (type != EnumDemonWillType.DEFAULT) { - if (value >= 100) { + if (type != EnumDemonWillType.DEFAULT) + { + if (value >= 100) + { double nextProgress = getCrystalGrowthPerSecond(value); progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; - } else { + } else + { value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT); - if (value > 0.5) { + if (value > 0.5) + { double nextProgress = getCrystalGrowthPerSecond(value) * timeDelayForWrongWill; progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), EnumDemonWillType.DEFAULT, nextProgress * defaultWillConversionRate, true) / defaultWillConversionRate; } } - } else { - if (value > 0.5) { + } else + { + if (value > 0.5) + { + double nextProgress = getCrystalGrowthPerSecond(value); progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; } @@ -72,14 +84,17 @@ public class TileDemonCrystal extends TileTicking { * Encourages the crystal to grow by a large percentage by telling it to * drain will from the aura. * - * @param willDrain The amount of drain that is needed for the crystal to grow - * successfully for the desired amount. Can be more than the base - * amount. + * @param willDrain + * The amount of drain that is needed for the crystal to grow + * successfully for the desired amount. Can be more than the base + * amount. * @param progressPercentage * @return percentage actually grown. */ - public double growCrystalWithWillAmount(double willDrain, double progressPercentage) { - if (crystalCount >= 7) { + public double growCrystalWithWillAmount(double willDrain, double progressPercentage) + { + if (crystalCount >= 7) + { return 0; } @@ -89,7 +104,8 @@ public class TileDemonCrystal extends TileTicking { double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); double percentDrain = willDrain <= 0 ? 1 : Math.min(1, value / willDrain); - if (percentDrain <= 0) { + if (percentDrain <= 0) + { return 0; } @@ -102,8 +118,10 @@ public class TileDemonCrystal extends TileTicking { return percentDrain * progressPercentage; } - public void checkAndGrowCrystal() { - if (progressToNextCrystal >= 1 || internalCounter % 100 == 0) { + public void checkAndGrowCrystal() + { + if (progressToNextCrystal >= 1 && internalCounter % 100 == 0) + { progressToNextCrystal--; crystalCount++; markDirty(); @@ -111,16 +129,20 @@ public class TileDemonCrystal extends TileTicking { } } - public double getMaxWillForCrystal() { + public double getMaxWillForCrystal() + { return 50; } - public boolean dropSingleCrystal() { - if (!getWorld().isRemote && crystalCount > 1) { + public boolean dropSingleCrystal() + { + if (!getWorld().isRemote && crystalCount > 1) + { IBlockState state = getWorld().getBlockState(pos); EnumDemonWillType type = state.getValue(BlockDemonCrystal.TYPE); ItemStack stack = BlockDemonCrystal.getItemStackDropped(type, 1); - if (!stack.isEmpty()) { + if (!stack.isEmpty()) + { crystalCount--; InventoryHelper.spawnItemStack(getWorld(), pos.getX(), pos.getY(), pos.getZ(), stack); notifyUpdate(); @@ -131,16 +153,19 @@ public class TileDemonCrystal extends TileTicking { return false; } - public double getCrystalGrowthPerSecond(double will) { - return 1.0 / 800 * Math.sqrt(will / 200); + public double getCrystalGrowthPerSecond(double will) + { + return 1.0 / 200 * Math.sqrt(will / 200); } - public int getCrystalCountForRender() { + public int getCrystalCountForRender() + { return MathHelper.clamp(crystalCount - 1, 0, 6); } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(NBTTagCompound tag) + { holder.readFromNBT(tag, "Will"); crystalCount = tag.getInteger("crystalCount"); placement = EnumFacing.getFront(tag.getInteger("placement")); @@ -148,7 +173,8 @@ public class TileDemonCrystal extends TileTicking { } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public NBTTagCompound serialize(NBTTagCompound tag) + { holder.writeToNBT(tag, "Will"); tag.setInteger("crystalCount", crystalCount); tag.setInteger("placement", placement.getIndex()); @@ -156,19 +182,23 @@ public class TileDemonCrystal extends TileTicking { return tag; } - public int getCrystalCount() { + public int getCrystalCount() + { return crystalCount; } - public void setCrystalCount(int crystalCount) { + public void setCrystalCount(int crystalCount) + { this.crystalCount = crystalCount; } - public EnumFacing getPlacement() { + public EnumFacing getPlacement() + { return placement; } - public void setPlacement(EnumFacing placement) { + public void setPlacement(EnumFacing placement) + { this.placement = placement; } } \ No newline at end of file From 19cdfbfb0a2a8e8a911732340e2b556dcdbad4ce Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 17 Apr 2018 16:16:03 -0700 Subject: [PATCH 170/493] This file slipped through the craks :think: --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 0cb9b8f7..70eedb21 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -303,7 +303,7 @@ public class BloodAltar implements IFluidHandler { if (progress >= liquidRequired * stackSize) { ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); - BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(recipe.getInput(), result); + BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(result, input.copy()); MinecraftForge.EVENT_BUS.post(event); tileAltar.setInventorySlotContents(0, event.getOutput()); progress = 0; From 60c8441115ca2d1e75027858181f9ea79df7ecb5 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 20 Apr 2018 13:39:05 -0400 Subject: [PATCH 171/493] Added the "Resonance of the Faceted Crystal" --- changelog.txt | 2 + .../WayofTime/bloodmagic/ConfigHandler.java | 1 + .../compat/guideapi/book/CategoryRitual.java | 37 ++-- .../bloodmagic/registry/ModRituals.java | 4 + .../ritual/types/RitualCrystalSplit.java | 192 ++++++++++++++++++ .../bloodmagic/tile/TileDemonCrystal.java | 20 +- .../tile/TileDemonCrystallizer.java | 92 +++++---- .../assets/bloodmagic/lang/en_US.lang | 2 + .../assets/bloodmagicguide/lang/en_US.lang | 4 +- 9 files changed, 296 insertions(+), 58 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java diff --git a/changelog.txt b/changelog.txt index a0908def..1a56be77 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,8 @@ Version 2.2.9 - Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. - Fixed the Demon Will crystals growing when they shouldn't. Also lowered the time between natural crystal growths in Will-enriched areas. - Side note: who's bright idea was it to have to wait 15 minutes per crystal growth? +- Added the "Resonance of the Faceted Crystal", which can be used to create your first aspected Will crystal clusters. +- Made it so the Crystallizer no longer generates a random aspected Will crystal cluster. ------------------------------------------------------ Version 2.2.8 diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index c0f2a892..a16e13bc 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -101,6 +101,7 @@ public class ConfigHandler public boolean ritualMeteor = true; public boolean ritualDowngrade = true; public boolean ritualEllipsoid = true; + public boolean ritualCrystalSplit = true; public ConfigImperfectRituals imperfect = new ConfigImperfectRituals(); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index 2547591b..0a82b197 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -24,10 +24,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class CategoryRitual { +public class CategoryRitual +{ static String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual."; - public static Map buildCategory() { + public static Map buildCategory() + { Map entries = new LinkedHashMap<>(); addRitualPagesToEntries("intro", entries); @@ -36,16 +38,19 @@ public class CategoryRitual { List ritualStonePages = new ArrayList<>(); IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); - if (ritualStoneRecipe != null) { + if (ritualStoneRecipe != null) + { ritualStonePages.add(BookUtils.getPageForRecipe(ritualStoneRecipe)); } ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.1"), 370)); - for (int i = 1; i < 5; i++) { + for (int i = 1; i < 5; i++) + { EnumRuneType type = EnumRuneType.values()[i]; AltarRecipe scribeRecipe = RecipeHelper.getAltarRecipeForOutput(type.getStack()); - if (scribeRecipe != null) { + if (scribeRecipe != null) + { ritualStonePages.add(new PageAltarRecipe(scribeRecipe)); } } @@ -56,7 +61,8 @@ public class CategoryRitual { List masterRitualStonePages = new ArrayList<>(); IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 0)); - if (masterRitualStoneRecipe != null) { + if (masterRitualStoneRecipe != null) + { masterRitualStonePages.add(BookUtils.getPageForRecipe(masterRitualStoneRecipe)); } @@ -68,7 +74,8 @@ public class CategoryRitual { activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.1"), 370)); AltarRecipe crystalRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL)); - if (crystalRecipe != null) { + if (crystalRecipe != null) + { activationCrystalPages.add(new PageAltarRecipe(crystalRecipe)); } @@ -80,7 +87,8 @@ public class CategoryRitual { divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.1"), 370)); IRecipe divinerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER)); - if (divinerRecipe != null) { + if (divinerRecipe != null) + { divinerPages.add(BookUtils.getPageForRecipe(divinerRecipe)); } @@ -107,10 +115,14 @@ public class CategoryRitual { addRitualPagesToEntries("timberman", entries); addRitualPagesToEntries("meteor", entries); addRitualPagesToEntries("downgrade", entries); + addRitualPagesToEntries("crystalSplit", entries); - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { + for (Entry entry : entries.entrySet()) + { + for (IPage page : entry.getValue().pageList) + { + if (page instanceof PageText) + { ((PageText) page).setUnicodeFlag(true); } } @@ -119,7 +131,8 @@ public class CategoryRitual { return entries; } - public static void addRitualPagesToEntries(String name, Map entries) { + public static void addRitualPagesToEntries(String name, Map entries) + { List pages = new ArrayList<>(); pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + name + ".info"), 370)); entries.put(new ResourceLocation(keyBase + name), new EntryText(pages, TextHelper.localize(keyBase + name), true)); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 544df8a9..c3da05f3 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -49,6 +49,7 @@ public class ModRituals public static Ritual portalRitual; public static Ritual ellipsoidRitual; + public static Ritual crystalSplitRitual; public static Ritual meteorRitual; @@ -125,6 +126,9 @@ public class ModRituals ellipsoidRitual = new RitualEllipsoid(); RitualRegistry.registerRitual(ellipsoidRitual, ConfigHandler.rituals.ritualEllipsoid); + crystalSplitRitual = new RitualCrystalSplit(); + RitualRegistry.registerRitual(crystalSplitRitual, ConfigHandler.rituals.ritualCrystalSplit); + RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5); RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java new file mode 100644 index 00000000..5930d6d9 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java @@ -0,0 +1,192 @@ +package WayofTime.bloodmagic.ritual.types; + +import java.util.function.Consumer; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.tile.TileDemonCrystal; + +public class RitualCrystalSplit extends Ritual +{ + public RitualCrystalSplit() + { + super("ritualCrystalSplit", 0, 20000, "ritual." + BloodMagic.MODID + ".crystalSplitRitual"); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + BlockPos pos = masterRitualStone.getBlockPos(); + EnumFacing direction = masterRitualStone.getDirection(); + BlockPos rawPos = pos.up(2); + + TileEntity tile = world.getTileEntity(rawPos); + if (!(tile instanceof TileDemonCrystal) || ((TileDemonCrystal) tile).getType() != EnumDemonWillType.DEFAULT) + { + return; + } + + IBlockState rawState = world.getBlockState(rawPos); + + TileDemonCrystal rawTile = (TileDemonCrystal) tile; + if (rawTile.crystalCount >= 5) + { + BlockPos vengefulPos = pos.offset(rotateFacing(EnumFacing.NORTH, direction)).up(); + BlockPos corrosivePos = pos.offset(rotateFacing(EnumFacing.EAST, direction)).up(); + BlockPos steadfastPos = pos.offset(rotateFacing(EnumFacing.SOUTH, direction)).up(); + BlockPos destructivePos = pos.offset(rotateFacing(EnumFacing.WEST, direction)).up(); + + int vengefulCrystals = 0; + int corrosiveCrystals = 0; + int steadfastCrystals = 0; + int destructiveCrystals = 0; + + tile = world.getTileEntity(vengefulPos); + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.VENGEFUL && ((TileDemonCrystal) tile).crystalCount < 7) + { + vengefulCrystals = ((TileDemonCrystal) tile).crystalCount; + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(vengefulPos)) + { + // #donothing, no point setting the crystal to 0 again + } else + { + return; + } + + tile = world.getTileEntity(corrosivePos); + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.CORROSIVE && ((TileDemonCrystal) tile).crystalCount < 7) + { + corrosiveCrystals = ((TileDemonCrystal) tile).crystalCount; + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(corrosivePos)) + { + + } else + { + return; + } + + tile = world.getTileEntity(steadfastPos); + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.STEADFAST && ((TileDemonCrystal) tile).crystalCount < 7) + { + steadfastCrystals = ((TileDemonCrystal) tile).crystalCount; + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(steadfastPos)) + { + + } else + { + return; + } + + tile = world.getTileEntity(destructivePos); + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.DESTRUCTIVE && ((TileDemonCrystal) tile).crystalCount < 7) + { + destructiveCrystals = ((TileDemonCrystal) tile).crystalCount; + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(destructivePos)) + { + + } else + { + return; + } + + rawTile.crystalCount -= 4; + + growCrystal(world, vengefulPos, EnumDemonWillType.VENGEFUL, vengefulCrystals); + growCrystal(world, corrosivePos, EnumDemonWillType.CORROSIVE, corrosiveCrystals); + growCrystal(world, steadfastPos, EnumDemonWillType.STEADFAST, steadfastCrystals); + growCrystal(world, destructivePos, EnumDemonWillType.DESTRUCTIVE, destructiveCrystals); + rawTile.markDirty(); + world.notifyBlockUpdate(rawPos, rawState, rawState, 3); + } + } + + public EnumFacing rotateFacing(EnumFacing facing, EnumFacing rotation) + { + switch (rotation) + { + case EAST: + return facing.rotateY(); + case SOUTH: + return facing.rotateY().rotateY(); + case WEST: + return facing.rotateYCCW(); + case NORTH: + default: + return facing; + } + } + + public void growCrystal(World world, BlockPos pos, EnumDemonWillType type, int currentCrystalCount) + { + if (currentCrystalCount <= 0) + { + world.setBlockState(pos, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal()), 3); + } else + { + TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); + tile.crystalCount++; + tile.markDirty(); + IBlockState state = world.getBlockState(pos); + world.notifyBlockUpdate(pos, state, state, 3); + } + } + + @Override + public int getRefreshTime() + { + return 20; + } + + @Override + public int getRefreshCost() + { + return 1000; + } + + @Override + public void gatherComponents(Consumer components) + { + addRune(components, 0, 0, -1, EnumRuneType.FIRE); + addRune(components, 1, 0, 0, EnumRuneType.EARTH); + addRune(components, 0, 0, 1, EnumRuneType.WATER); + addRune(components, -1, 0, 0, EnumRuneType.AIR); + + this.addOffsetRunes(components, 1, 2, -1, EnumRuneType.DUSK); + this.addCornerRunes(components, 1, 0, EnumRuneType.BLANK); + this.addParallelRunes(components, 2, 0, EnumRuneType.DUSK); + } + + @Override + public Ritual getNewCopy() + { + return new RitualCrystalSplit(); + } + + @Override + public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) + { + return new ITextComponent[] { new TextComponentTranslation(this.getUnlocalizedName() + ".info") }; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index a4b878e6..392b3ebf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,16 +1,17 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.block.BlockDemonCrystal; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import WayofTime.bloodmagic.block.BlockDemonCrystal; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.tile.base.TileTicking; public class TileDemonCrystal extends TileTicking { @@ -42,12 +43,12 @@ public class TileDemonCrystal extends TileTicking if (internalCounter % 20 == 0 && crystalCount < 7) { - EnumDemonWillType type = EnumDemonWillType.values()[this.getBlockMetadata()]; + EnumDemonWillType type = getType(); double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); if (type != EnumDemonWillType.DEFAULT) { - if (value >= 100) + if (value >= 0.5) { double nextProgress = getCrystalGrowthPerSecond(value); progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; @@ -118,6 +119,11 @@ public class TileDemonCrystal extends TileTicking return percentDrain * progressPercentage; } + public EnumDemonWillType getType() + { + return EnumDemonWillType.values()[this.getBlockMetadata()]; + } + public void checkAndGrowCrystal() { if (progressToNextCrystal >= 1 && internalCounter % 100 == 0) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index eb97e4cb..0fd56f0c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,17 +1,18 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWillConduit; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; +import WayofTime.bloodmagic.tile.base.TileTicking; -public class TileDemonCrystallizer extends TileTicking implements IDemonWillConduit { +public class TileDemonCrystallizer extends TileTicking implements IDemonWillConduit +{ public static final int maxWill = 100; public static final double drainRate = 1; public static final double willToFormCrystal = 99; @@ -20,13 +21,16 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond public DemonWillHolder holder = new DemonWillHolder(); public double internalCounter = 0; - public TileDemonCrystallizer() { + public TileDemonCrystallizer() + { } @Override - public void onUpdate() { - if (getWorld().isRemote) { + public void onUpdate() + { + if (getWorld().isRemote) + { return; } @@ -35,11 +39,15 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond { EnumDemonWillType highestType = WorldDemonWillHandler.getHighestDemonWillType(getWorld(), pos); double amount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, highestType); - if (amount >= willToFormCrystal) { + if (amount >= willToFormCrystal) + { internalCounter += getCrystalFormationRate(amount); - if (internalCounter >= totalFormationTime) { - if (WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, false) >= willToFormCrystal) { - if (highestType == EnumDemonWillType.DEFAULT && formRandomSpecialCrystal(offsetPos) || formCrystal(highestType, offsetPos)) { + if (internalCounter >= totalFormationTime) + { + if (WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, false) >= willToFormCrystal) + { + if (formCrystal(highestType, offsetPos)) + { WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, true); internalCounter = 0; } @@ -49,10 +57,12 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } } - public boolean formCrystal(EnumDemonWillType type, BlockPos position) { + public boolean formCrystal(EnumDemonWillType type, BlockPos position) + { getWorld().setBlockState(position, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal())); TileEntity tile = getWorld().getTileEntity(position); - if (tile instanceof TileDemonCrystal) { + if (tile instanceof TileDemonCrystal) + { ((TileDemonCrystal) tile).setPlacement(EnumFacing.UP); return true; } @@ -60,26 +70,21 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond return false; } - public boolean formRandomSpecialCrystal(BlockPos position) { - if (getWorld().rand.nextDouble() > 0.1) { - return formCrystal(EnumDemonWillType.DEFAULT, position); - } - EnumDemonWillType crystalType = EnumDemonWillType.values()[getWorld().rand.nextInt(EnumDemonWillType.values().length - 1) + 1]; - return formCrystal(crystalType, position); - } - - public double getCrystalFormationRate(double currentWill) { + public double getCrystalFormationRate(double currentWill) + { return 1; } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(NBTTagCompound tag) + { holder.readFromNBT(tag, "Will"); internalCounter = tag.getDouble("internalCounter"); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public NBTTagCompound serialize(NBTTagCompound tag) + { holder.writeToNBT(tag, "Will"); tag.setDouble("internalCounter", internalCounter); return tag; @@ -88,21 +93,26 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond // IDemonWillConduit @Override - public int getWeight() { + public int getWeight() + { return 10; } @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) { - if (amount <= 0) { + public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) + { + if (amount <= 0) + { return 0; } - if (!canFill(type)) { + if (!canFill(type)) + { return 0; } - if (!doFill) { + if (!doFill) + { return Math.min(maxWill - holder.getWill(type), amount); } @@ -110,14 +120,17 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) { + public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) + { double drained = amount; double current = holder.getWill(type); - if (current < drained) { + if (current < drained) + { drained = current; } - if (doDrain) { + if (doDrain) + { return holder.drainWill(type, amount); } @@ -125,17 +138,20 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } @Override - public boolean canFill(EnumDemonWillType type) { + public boolean canFill(EnumDemonWillType type) + { return true; } @Override - public boolean canDrain(EnumDemonWillType type) { + public boolean canDrain(EnumDemonWillType type) + { return true; } @Override - public double getCurrentWill(EnumDemonWillType type) { + public double getCurrentWill(EnumDemonWillType type) + { return holder.getWill(type); } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index befcd6ac..73a05bfd 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -613,6 +613,7 @@ ritual.bloodmagic.pumpRitual=Hymn of Syphoning ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar ritual.bloodmagic.portalRitual=The Gate of the Fold ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul +ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crytstal ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. @@ -659,6 +660,7 @@ ritual.bloodmagic.animalGrowthRitual.default.info=(Raw) Increases the speed of t ritual.bloodmagic.animalGrowthRitual.destructive.info=(Destructive) Causes adults that have not bred lately to run at mobs and explode. ritual.bloodmagic.animalGrowthRitual.corrosive.info=(Corrosive) Unimplemented. +ritual.bloodmagic.crystalSplitRitual.info=Splits apart a well-grown Raw crystal cluster into seperal aspected crystal clusters. ritual.bloodmagic.fullStomachRitual.info=Takes food from the linked chest and fills the player's saturation with it. ritual.bloodmagic.interdictionRitual.info=Pushes all mobs within its area away from the master ritual stone. ritual.bloodmagic.containmentRitual.info=Pulls all mobs within its area towards the master ritual stone. diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index d0ff5595..222ea2ab 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -50,6 +50,7 @@ guide.bloodmagic.entry.ritual.laying=Laying of the Filler guide.bloodmagic.entry.ritual.timberman=Crash of the Timberman guide.bloodmagic.entry.ritual.meteor=Mark of the Falling Tower guide.bloodmagic.entry.ritual.downgrade=Penance of the Leadened Soul +guide.bloodmagic.entry.ritual.crystalSplit=Resonance of the Faceted Crystal # Ritual Master Entry Text guide.bloodmagic.entry.ritual.intro.info=Good evening. My name is Magus Arcana. I have had many guises over the years: a thief and a vigilante, a wizard and a warrior, a roaming nomad and even a politician. The title that I hold nowadays is one that many cannot comprehend, that at the very mention of it brings forth images of brutality that in some cases have been earned but in many others are misguided. I am of course talking about being a Blood Mage, though my friends simply call me Magus whereas my enemies refer to me as The Ritual Master.\n\tMy students have been pestering me for many months now, attempting to get me to document all of the myriad adventures that I have had in some form of book for me to distribute among any aspiring mages. I had been resistant, but it was Tiberius who put it best: "Although you may not see the value of it yourself, hearing the intricacies of any sort of craft from a man who has achieved mastership of the field will prove invaluable for future generations. It doesn't matter how accurately someone else retells it, if you don't have the utmost confidence in a source the gold sand could be nothing more than sulfur." You could tell he was delving into a bit of alchemy at that point, but since he was my first student for a long time I tend to value his opinion.\n\tSo, aspiring Blood Mage, training in the arcane that many yet do not fully understand, lend me your ears for these are words worth heeding: the field that you are studying has many aspects, and without careful consideration you may find your tools lacking. Therefore make sure to review this book often - I have put many enchantments on the tome that you carry with you so that whenever I write in my master copy the words will change for you.\n\tSo sit back, relax, and enjoy the teachings of a very old man. You may learn more than you've bargained for. @@ -81,6 +82,7 @@ guide.bloodmagic.entry.ritual.laying.info=As many are aware, being able to place guide.bloodmagic.entry.ritual.timberman.info=Got wood? This ritual has you covered. The Crash of the Timberman tethers a spectral entity using the LP of the owner to harvest the leaves and logs of all trees within its range and places the results inside of the connected chest. It will try to find all "trees" in a 10 block horizontal radius and up to 30 blocks above the MRS (by default) and use 10LP per felled block. guide.bloodmagic.entry.ritual.meteor.info=For all intents and purposes, this is one of the most powerful rituals currently in the game. It costs one million LP to activate and can only be used once before needing to be reactivated. The ritual, once specific sacrifices are made, pulls a meteor from outer space and causes it to plummet towards the ground, causing a large explosion once it hits something solid. Because these meteors are not from the Overworld, they can hold a rich ore density never seen anywhere else.\n\tSacrifices can include: an iron block, a gold block, a diamond. This is configurable by the mudpack or user. guide.bloodmagic.entry.ritual.downgrade.info=In order to gain more power, sometimes you have to sacrifice something in return. The Penance of the Leadened Soul does just that - by sacrificing a few items to an unseen entity, you may reduce the effectiveness of some aspect of your Living Armour and get an increase in the number of upgrade points as compensation. When you construct the ritual you have to place an item frame on the top-most Blank ritual stone facing towards the Master Ritual stone, and some sort of inventory (see: chest) on top of the Dusk ritual stone. To acquire a Living Armour Downgrade, you then have to place the key item in the item frame and the consumables in the chest. Once the ritual is activated, you can sneak on top of the Master Ritual Stone at any time and acquire the downgrade.\n\tIn the case of the Quenched Living Armour Downgrade, its key item is a water bottle (placed in the item frame) and the recipe is Dragon's Breath (placed in the chest). The key item is never consumed, but the recipe is.\n\tIn order to view the recipe for the downgrades you can look them up in JEI - check the usage of the Master Ritual Stone and you will see the recipes for the Penance ritual. Also you can just check the recipe for the max level downgrade in JEI and then check the usage of the key item - the key item is always the same for the specific downgrade. +guide.bloodmagic.entry.ritual.crystalSplit.info=Once Demon Will has crystalized, there is no way to split it into its many aspects - or so I've thought until now. The "Resonance of the Faceted Crystal" works by separating the many aspects inside of an unaspected (or raw) crystal cluster by using the different aspected ritual stones. \n\tIn order to use the ritual, an unaspected crystal cluster has to be placed two blocks above the Master Ritual Stone. In other words, you can place a crystallizer on top of the MRS and a crystal cluster on top of that and it should work well. Next, you must make sure that there are no blocks directly above the four elemental-based ritual stones, and then wait for the crystal cluster to grow. \n\tAfter the cluster has grown a total of five or more spires, the ritual will split these spires off and create one spire each of Corrosive, Steadfast, Vengeful, and Destructive Will on top of the aspected ritual stones. If the unaspected cluster is allowed to grow further and these new clusters remain intact, the process will repeat and more spires will be added. \n\tThe mechanism for this process is quite simple. When the Raw Will crystal has at least five spires, the ritual breaks off four of these spires and converts the Will into its more incorporeal form. This Will is then pushed threw the final spire of the cluster, which forces the different aspects of the Will into more localized clumps of the particular aspect. This Will is then gathered into the ritual stones, which act as bases for which the new aspected crystal clusters can grow from. # Architect Entries guide.bloodmagic.entry.architect.intro=Foreword @@ -231,7 +233,7 @@ guide.bloodmagic.entry.demon.routing.info=Item transport in Blood Magic comes fr guide.bloodmagic.entry.demon.aura.info=When an entity is killed normally, it evaporates over time and returns to the creator. When captured in a snare, it is pulled into this plane from the ethereal and is sort of stuck. We have, for all intents and purposes, broken its programming and it has frozen all action. When we burn it, it returns to an ethereal state and is able to resume normal operations. If this Will is injected into the air, we can then harness it in a variety of ways. Some of them are mundane in nature, whereas others are quite powerful.\n\tDemon Will when injected into the air stays within the chunk that it was put in without migrating. Each chunk has their own stored Will, with each type of Will stored individually (more on that in a different section). This Will can be accessed and manipulated by other blocks and items. guide.bloodmagic.entry.demon.types.info=So far, the only type of Demon Will that we have discussed is raw Will. As the name suggests, it is the most raw and unadulterated form of Will there is, but this does not mean that it is pure. In fact, Demon Will takes on many different forms: Raw is the type we deal with normally, but there is also Corrosive, Destructive, Vengeful, and Steadfast. Raw Will is composed of a mixture of all four of these types, and perhaps mixed with other as of yet undiscovered types, but once split into these different Will types it seems impossible to recombine them.\n\tIt is not clear yet whether these different types of Will come from different sources, however we do know the process of generating these different types of Will. When Will of the same type bump into each other in the Aura it tends to congregate similar to how impurities in an otherwise homogeneous liquid clump together. If a device is able to latch onto these clumps within the Raw Will in the Aura, chunks of pure Will of a particular type can be gathered. One such device is the Demon Crystallizer, whose entry can be found further down.\n\tEach of these four types of Will represent different aspects of one's desire. There may be more types of Will, however they are either not pure enough or simply cannot be created in this form.\n\tCorrosive represents the desire to break down all things around oneself, either with acid or by crushing force. One who can master this Will can wield debilitating status effects and are immune to horrible poisons.\n\tVengeful can be viewed as the desire to seek a target without tiring. Usually, this can be seen either as an increased speed of the body to seek their pray or to make sure that a target is not able to get away as you continually attack them.\n\tDestructive, as you can probably tell, is pure force. Attack strength and overall physical prowess can be gained if this Will is properly harnessed. It can also be used to crush and smash things when used in other applications.\n\tSteadfast is seen as the desire to prevent damage to oneself. In most cases, masters of this Will are the defensive bulwark of the party, able to withstand powerful attacks and not even feel it. If you need to stay alive, through your armour or by rituals, this is one choice that should be considered. guide.bloodmagic.entry.demon.crucible.info=The Demon Crucible is a device that is able to burn the Demon Will inside of a Tartaric Gem and other items in order to inject it into the Aura of the chunk that it is in. There are a few different ways to use the crucible: one of the simplest ways is to place a Tartaric Gem inside of the crucible by right clicking on it with a gem in your hand. The crucible will then in that case drain the Will from the gem until either the Aura is saturated with that type of Will (a max of 100 by default) or until the gem is empty.\n\tAnother mode is to use the contained Tartaric Gem to drain the Will from the Aura - this is done by applying a strong redstone signal to the crucible and then the contained gem will attempt to drain as much Will as possible.\n\tFinally, a discrete piece of Will can be burned in the crucible if there is enough room in the Aura of that type. One example of this is a Demon Will Crystal, which has a value of 50. -guide.bloodmagic.entry.demon.crystallizer.info=As discussed previously, Demon Aura is the ethereal manifestation of Demon Will, and the substance obtained when killing a mob is its physical manifestation. The Demon Crystallizer acts as an anchoring point for Demon Will in the Aura to latch on to, transforming the ethereal Will back into a physical form once again in the form of a crystal.\n\tYou may be curious why you do not just take the Will from a Tartaric Gem directly and form a crystal from it. That is because by transforming the Will to its ethereal form we purify it and allow the Will to attempt to resume its normal operations - keep in mind that when we kill a monster with Demon Will attached to them, we freeze the programming of the Will so that it cannot do what it was sent out to do. By converting it into the ethereal form in the Aura, the Will becomes more active, and that is the Will that is grabbed by the crystallizer. Just don't look at it funny.\n\tIn order for the Demon Crystallizer to work it must be in a chunk with a high amount of Demon Will (80) of a particular type, and after a certain amount of time it will consume the Will from the Aura in order to create a Demon Crystal Cluster with a single spire. There are two ways for the Crystallizer to work: it can form a crystal from an aspected type of Will (Corrosive, Destructive, Vengeful, and Steadfast) if there is enough Will of that particular type, or it will take Raw Will from the Aura to create a crystal. \n\tWhen it generates a crystal from Raw Will, there is a small chance (~40%%) for the formed crystal to be of one of the aspected types. Essentially, this is how you can initially gather the different types of Will. +guide.bloodmagic.entry.demon.crystallizer.info=As discussed previously, Demon Aura is the ethereal manifestation of Demon Will, and the substance obtained when killing a mob is its physical manifestation. The Demon Crystallizer acts as an anchoring point for Demon Will in the Aura to latch on to, transforming the ethereal Will back into a physical form once again in the form of a crystal.\n\tYou may be curious why you do not just take the Will from a Tartaric Gem directly and form a crystal from it. That is because by transforming the Will to its ethereal form we purify it and allow the Will to attempt to resume its normal operations - keep in mind that when we kill a monster with Demon Will attached to them, we freeze the programming of the Will so that it cannot do what it was sent out to do. By converting it into the ethereal form in the Aura, the Will becomes more active, and that is the Will that is grabbed by the crystallizer. Just don't look at it funny.\n\tIn order for the Demon Crystallizer to work it must be in a chunk with a high amount of Demon Will (80) of a particular type, and after a certain amount of time it will consume the Will from the Aura in order to create a Demon Crystal Cluster with a single spire. There are two ways for the Crystallizer to work: it can form a crystal from an aspected type of Will (Corrosive, Destructive, Vengeful, and Steadfast) if there is enough Will of that particular type, or it will take Raw Will from the Aura to create a crystal. \n\tIn previous incarnations of the device it was possible to transform Raw Will from the Aura into differently aspected crystals. However, that is no longer the case: you can still create new spires of a certain aspected Will if there is enough of it in the Aura, however you will need to look into other means to separate the many aspects from Raw Will. See the entry on "Resonance of the Faceted Crystal" in The Ritual Master for more details. guide.bloodmagic.entry.demon.cluster.info=The Demon Crystal Cluster can either be created by a Demon Crystallizer or by crafting one in the Hellfire Forge with Demon Will Crystals. Crafted clusters can be placed on any solid surface, such as the floor, walls, and ceilings. There are a max of seven spires on the crystal when fully grown, and when broken with a pickaxe it will drop the spires as Demon Will Crystals. However, if you right-click the cluster when you have a Tartaric Gem with more than 1024 Raw Will inside of it, you can break off a single spire from the cluster without breaking the cluster itself; this will never break the main spire from the cluster.\n\tWhen left to its own devices, the cluster will syphon some Will of the same type from the Aura to grow itself slowly. This process is a bit slow, but there is a minor net gain.\n\tThere are two rituals that are used to grow and harvest these crystals: the Gathering of the Forsaken Souls and the Crash of the Crystal. In order to find out how to use them, please refer to The Ritual Master. guide.bloodmagic.entry.demon.pylon.info=As you may know, Demon Aura remains in its own chunk if there are not any outside influences. Well, this is one of those influences. The Demon Pylon acts as a beacon for Will in the Aura, pulling the Will from neighbouring chunks (those chunks that are directly next to it in the four cardinal directions, not diagonal) into its chunk. The Pylon will attempt to equalize the Will in its chunk with its neighbour so that the Pylon's chunk has as much Will as its highest neighbour for each Will type. This process only happens one way, however: if the neighbouring chunk has less Will in it than the Pylon's chunk, the Will will not transfer the other direction. guide.bloodmagic.entry.demon.gauge.info=In order to tell how much Will you have in a given chunk you need to have a Demon Will Gauge. When in your inventory, the gauge will display the Will in the chunk that you have in five bars in the top-left corner of the screen. You can tell how much there is exactly by shifting; numbers will appear to the right of the bars to give the amount rounded to the nearest whole number. From c9319477bd378469f2d47aea1e2bb8daabf2dec1 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 20 Apr 2018 16:11:05 -0400 Subject: [PATCH 172/493] Made the Blood Altar check if it had a null recipe on update while active. (Actual change on line 271) Potential fix for #1275. --- changelog.txt | 1 + .../bloodmagic/altar/BloodAltar.java | 263 ++++++++++++------ 2 files changed, 178 insertions(+), 86 deletions(-) diff --git a/changelog.txt b/changelog.txt index 1a56be77..a812faeb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -10,6 +10,7 @@ Version 2.2.9 - Side note: who's bright idea was it to have to wait 15 minutes per crystal growth? - Added the "Resonance of the Faceted Crystal", which can be used to create your first aspected Will crystal clusters. - Made it so the Crystallizer no longer generates a random aspected Will crystal cluster. +- Fixed rare crash with the Blood Altar, which only has a chance of occuring on restart. ------------------------------------------------------ Version 2.2.8 diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 70eedb21..5fc75ba7 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -30,7 +30,8 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.items.ItemHandlerHelper; -public class BloodAltar implements IFluidHandler { +public class BloodAltar implements IFluidHandler +{ public boolean isActive; protected FluidStack fluidOutput = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); @@ -67,12 +68,15 @@ public class BloodAltar implements IFluidHandler { private RecipeBloodAltar recipe; private AltarTier currentTierDisplayed = AltarTier.ONE; - public BloodAltar(TileAltar tileAltar) { + public BloodAltar(TileAltar tileAltar) + { this.tileAltar = tileAltar; } - public void readFromNBT(NBTTagCompound tagCompound) { - if (!tagCompound.hasKey(Constants.NBT.EMPTY)) { + public void readFromNBT(NBTTagCompound tagCompound) + { + if (!tagCompound.hasKey(Constants.NBT.EMPTY)) + { FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagCompound); if (fluid != null) @@ -115,7 +119,8 @@ public class BloodAltar implements IFluidHandler { currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); } - public void writeToNBT(NBTTagCompound tagCompound) { + public void writeToNBT(NBTTagCompound tagCompound) + { if (fluid != null) fluid.writeToNBT(tagCompound); @@ -158,7 +163,8 @@ public class BloodAltar implements IFluidHandler { tagCompound.setString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); } - public void startCycle() { + public void startCycle() + { if (tileAltar.getWorld() != null) tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); @@ -172,11 +178,14 @@ public class BloodAltar implements IFluidHandler { ItemStack input = tileAltar.getStackInSlot(0); - if (!input.isEmpty()) { + if (!input.isEmpty()) + { // Do recipes RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(input); - if (recipe != null) { - if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) { + if (recipe != null) + { + if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) + { this.isActive = true; this.recipe = recipe; this.liquidRequired = recipe.getSyphon(); @@ -185,7 +194,8 @@ public class BloodAltar implements IFluidHandler { this.canBeFilled = false; return; } - } else if (input.getItem() instanceof IBloodOrb) { + } else if (input.getItem() instanceof IBloodOrb) + { this.isActive = true; this.canBeFilled = true; return; @@ -195,7 +205,8 @@ public class BloodAltar implements IFluidHandler { isActive = false; } - public void update() { + public void update() + { World world = tileAltar.getWorld(); BlockPos pos = tileAltar.getPos(); @@ -208,14 +219,17 @@ public class BloodAltar implements IFluidHandler { if (lockdownDuration > 0) lockdownDuration--; - if (internalCounter % 20 == 0) { - for (EnumFacing facing : EnumFacing.VALUES) { + if (internalCounter % 20 == 0) + { + for (EnumFacing facing : EnumFacing.VALUES) + { BlockPos newPos = pos.offset(facing); IBlockState block = world.getBlockState(newPos); block.getBlock().onNeighborChange(world, newPos, pos); } } - if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) { + if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) + { int syphonMax = (int) (20 * this.dislocationMultiplier); int fluidInputted; int fluidOutputted; @@ -230,7 +244,8 @@ public class BloodAltar implements IFluidHandler { tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) { + if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) + { int chargeInputted = Math.min(chargingRate, this.fluid.amount); chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge); totalCharge += chargeInputted; @@ -244,13 +259,21 @@ public class BloodAltar implements IFluidHandler { updateAltar(); } - private void updateAltar() { - if (!isActive) { + private void updateAltar() + { + if (!isActive) + { if (cooldownAfterCrafting > 0) cooldownAfterCrafting--; return; } + if (recipe == null) + { + startCycle(); + return; + } + ItemStack input = tileAltar.getStackInSlot(0); if (input.isEmpty()) @@ -262,11 +285,13 @@ public class BloodAltar implements IFluidHandler { if (world.isRemote) return; - if (!canBeFilled) { + if (!canBeFilled) + { boolean hasOperated = false; int stackSize = input.getCount(); - if (totalCharge > 0) { + if (totalCharge > 0) + { int chargeDrained = Math.min(liquidRequired * stackSize - progress, totalCharge); totalCharge -= chargeDrained; @@ -274,7 +299,8 @@ public class BloodAltar implements IFluidHandler { hasOperated = true; } - if (fluid != null && fluid.amount >= 1) { + if (fluid != null && fluid.amount >= 1) + { int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); if (liquidDrained > (liquidRequired * stackSize - progress)) @@ -285,22 +311,27 @@ public class BloodAltar implements IFluidHandler { hasOperated = true; - if (internalCounter % 4 == 0 && world instanceof WorldServer) { + if (internalCounter % 4 == 0 && world instanceof WorldServer) + { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.2, 0, 0.2, 0); } - } else if (!hasOperated && progress > 0) { + } else if (!hasOperated && progress > 0) + { progress -= (int) (efficiencyMultiplier * drainRate); - if (internalCounter % 2 == 0 && world instanceof WorldServer) { + if (internalCounter % 2 == 0 && world instanceof WorldServer) + { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0); } } - if (hasOperated) { - if (progress >= liquidRequired * stackSize) { + if (hasOperated) + { + if (progress >= liquidRequired * stackSize) + { ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(result, input.copy()); @@ -308,7 +339,8 @@ public class BloodAltar implements IFluidHandler { tileAltar.setInventorySlotContents(0, event.getOutput()); progress = 0; - if (world instanceof WorldServer) { + if (world instanceof WorldServer) + { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); } @@ -317,7 +349,8 @@ public class BloodAltar implements IFluidHandler { this.isActive = false; } } - } else { + } else + { ItemStack contained = tileAltar.getStackInSlot(0); if (contained.isEmpty() || !(contained.getItem() instanceof IBloodOrb) || !(contained.getItem() instanceof IBindable)) @@ -329,13 +362,15 @@ public class BloodAltar implements IFluidHandler { if (binding == null || orb == null) return; - if (fluid != null && fluid.amount >= 1) { + if (fluid != null && fluid.amount >= 1) + { int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; - if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) { + if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) + { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.SPELL_WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0, 0, 0, 0.001); } @@ -345,7 +380,8 @@ public class BloodAltar implements IFluidHandler { tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - public void checkTier() { + public void checkTier() + { AltarTier tier = AltarUtil.getTier(tileAltar.getWorld(), tileAltar.getPos()); this.altarTier = tier; @@ -354,7 +390,8 @@ public class BloodAltar implements IFluidHandler { if (tier.equals(currentTierDisplayed)) currentTierDisplayed = AltarTier.ONE; - if (tier.equals(AltarTier.ONE)) { + if (tier.equals(AltarTier.ONE)) + { upgrade = null; isUpgraded = false; this.consumptionMultiplier = 0; @@ -370,7 +407,8 @@ public class BloodAltar implements IFluidHandler { this.maxCharge = 0; this.totalCharge = 0; return; - } else if (!tier.equals(AltarTier.ONE)) { + } else if (!tier.equals(AltarTier.ONE)) + { this.isUpgraded = true; this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); @@ -400,103 +438,128 @@ public class BloodAltar implements IFluidHandler { tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - public int fillMainTank(int amount) { + public int fillMainTank(int amount) + { int filledAmount = Math.min(capacity - fluid.amount, amount); fluid.amount += filledAmount; return filledAmount; } - public void sacrificialDaggerCall(int amount, boolean isSacrifice) { - if (this.lockdownDuration > 0) { + public void sacrificialDaggerCall(int amount, boolean isSacrifice) + { + if (this.lockdownDuration > 0) + { int amt = (int) Math.min(bufferCapacity - fluidInput.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); fluidInput.amount += amt; - } else { + } else + { fluid.amount += Math.min(capacity - fluid.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); } } - public void setMainFluid(FluidStack fluid) { + public void setMainFluid(FluidStack fluid) + { this.fluid = fluid; } - public void setOutputFluid(FluidStack fluid) { + public void setOutputFluid(FluidStack fluid) + { this.fluidOutput = fluid; } - public void setInputFluid(FluidStack fluid) { + public void setInputFluid(FluidStack fluid) + { this.fluidInput = fluid; } - public AltarUpgrade getUpgrade() { + public AltarUpgrade getUpgrade() + { return upgrade; } - public void setUpgrade(AltarUpgrade upgrade) { + public void setUpgrade(AltarUpgrade upgrade) + { this.upgrade = upgrade; } - public int getCapacity() { + public int getCapacity() + { return capacity; } - public FluidStack getFluid() { + public FluidStack getFluid() + { return fluid; } - public int getFluidAmount() { + public int getFluidAmount() + { return fluid.amount; } - public int getCurrentBlood() { + public int getCurrentBlood() + { return getFluidAmount(); } - public AltarTier getTier() { + public AltarTier getTier() + { return altarTier; } - public void setTier(AltarTier tier) { + public void setTier(AltarTier tier) + { this.altarTier = tier; } - public int getProgress() { + public int getProgress() + { return progress; } - public float getSacrificeMultiplier() { + public float getSacrificeMultiplier() + { return sacrificeEfficiencyMultiplier; } - public float getSelfSacrificeMultiplier() { + public float getSelfSacrificeMultiplier() + { return selfSacrificeEfficiencyMultiplier; } - public float getOrbMultiplier() { + public float getOrbMultiplier() + { return orbCapacityMultiplier; } - public float getDislocationMultiplier() { + public float getDislocationMultiplier() + { return dislocationMultiplier; } - public float getConsumptionMultiplier() { + public float getConsumptionMultiplier() + { return consumptionMultiplier; } - public float getConsumptionRate() { + public float getConsumptionRate() + { return consumptionRate; } - public int getLiquidRequired() { + public int getLiquidRequired() + { return liquidRequired; } - public int getBufferCapacity() { + public int getBufferCapacity() + { return bufferCapacity; } - public boolean setCurrentTierDisplayed(AltarTier altarTier) { + public boolean setCurrentTierDisplayed(AltarTier altarTier) + { if (currentTierDisplayed == altarTier) return false; else @@ -504,79 +567,99 @@ public class BloodAltar implements IFluidHandler { return true; } - public void addToDemonBloodDuration(int dur) { + public void addToDemonBloodDuration(int dur) + { this.demonBloodDuration += dur; } - public boolean hasDemonBlood() { + public boolean hasDemonBlood() + { return this.demonBloodDuration > 0; } - public void decrementDemonBlood() { + public void decrementDemonBlood() + { this.demonBloodDuration = Math.max(0, this.demonBloodDuration - 1); } - public void setActive() { - if (tileAltar.getStackInSlot(0).isEmpty()) { + public void setActive() + { + if (tileAltar.getStackInSlot(0).isEmpty()) + { isActive = false; } } - public boolean isActive() { + public boolean isActive() + { return isActive; } - public void requestPauseAfterCrafting(int amount) { - if (this.isActive) { + public void requestPauseAfterCrafting(int amount) + { + if (this.isActive) + { this.cooldownAfterCrafting = amount; } } - public int getChargingRate() { + public int getChargingRate() + { return chargingRate; } - public int getTotalCharge() { + public int getTotalCharge() + { return totalCharge; } - public int getChargingFrequency() { + public int getChargingFrequency() + { return chargingFrequency == 0 ? 1 : chargingFrequency; } @Override - public int fill(FluidStack resource, boolean doFill) { - if (resource == null || resource.getFluid() != BlockLifeEssence.getLifeEssence()) { + public int fill(FluidStack resource, boolean doFill) + { + if (resource == null || resource.getFluid() != BlockLifeEssence.getLifeEssence()) + { return 0; } - if (!doFill) { - if (fluidInput == null) { + if (!doFill) + { + if (fluidInput == null) + { return Math.min(bufferCapacity, resource.amount); } - if (!fluidInput.isFluidEqual(resource)) { + if (!fluidInput.isFluidEqual(resource)) + { return 0; } return Math.min(bufferCapacity - fluidInput.amount, resource.amount); } - if (fluidInput == null) { + if (fluidInput == null) + { fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.amount)); return fluidInput.amount; } - if (!fluidInput.isFluidEqual(resource)) { + if (!fluidInput.isFluidEqual(resource)) + { return 0; } int filled = bufferCapacity - fluidInput.amount; - if (resource.amount < filled) { + if (resource.amount < filled) + { fluidInput.amount += resource.amount; filled = resource.amount; - } else { + } else + { fluidInput.amount = bufferCapacity; } @@ -584,37 +667,45 @@ public class BloodAltar implements IFluidHandler { } @Override - public FluidStack drain(FluidStack resource, boolean doDrain) { - if (resource == null || !resource.isFluidEqual(fluidOutput)) { + public FluidStack drain(FluidStack resource, boolean doDrain) + { + if (resource == null || !resource.isFluidEqual(fluidOutput)) + { return null; } return drain(resource.amount, doDrain); } @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - if (fluidOutput == null) { + public FluidStack drain(int maxDrain, boolean doDrain) + { + if (fluidOutput == null) + { return null; } int drained = maxDrain; - if (fluidOutput.amount < drained) { + if (fluidOutput.amount < drained) + { drained = fluidOutput.amount; } FluidStack stack = new FluidStack(fluidOutput, drained); - if (doDrain) { + if (doDrain) + { fluidOutput.amount -= drained; } return stack; } @Override - public IFluidTankProperties[] getTankProperties() { - return new IFluidTankProperties[]{new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity))}; + public IFluidTankProperties[] getTankProperties() + { + return new IFluidTankProperties[] { new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity)) }; } - public AltarTier getCurrentTierDisplayed() { + public AltarTier getCurrentTierDisplayed() + { return currentTierDisplayed; } } From ddf07acf703e63c331dbda82375cd60b6a98d114 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 21 Apr 2018 16:42:22 -0700 Subject: [PATCH 173/493] "way pls" - WayofTime 2018 --- src/main/resources/assets/bloodmagic/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 73a05bfd..b74fe090 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -535,7 +535,7 @@ tooltip.bloodmagic.itemFilter.ignoreNBT=Ignores the NBT of the filter tooltip.bloodmagic.itemFilter.modItems=Matches all items from the same mod tooltip.bloodmagic.itemFilter.oreDict=Used to filter through the Ore Dictionary -tooltip.bloodmagic.itemFilter.exact=Filters the fluid input/output +tooltip.bloodmagic.fluidFilter.exact=Filters the fluid input/output tooltip.bloodmagic.fluid.type=Fluid Contained: %s tooltip.bloodmagic.fluid.amount=Amount: %d / %d mB From afcf1a1822f5240fe52dea3fcdd4784e5bf7ccb6 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 21 Apr 2018 16:53:19 -0700 Subject: [PATCH 174/493] Add a recipe for the fluid filter --- .../item/routing/ItemFluidRouterFilter.java | 7 +++--- .../recipes/base_fluid_filter_0.json | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 1437dbd1..534ab3c4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -52,7 +52,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localize("tooltip.BloodMagic.fluidFilter." + names[stack.getItemDamage()])); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.fluidFilter." + names[stack.getItemDamage()])); super.addInformation(stack, world, tooltip, flag); } @@ -89,8 +89,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override public IFluidFilter getOutputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { - IFluidFilter testFilter = new RoutingFluidFilter(); - + IFluidFilter testFilter; switch (filterStack.getMetadata()) { case 0: testFilter = new RoutingFluidFilter(); @@ -104,7 +103,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (stack == null) { + if (stack.isEmpty()) { continue; } diff --git a/src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json b/src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json new file mode 100644 index 00000000..29d26032 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "bloodmagic:base_fluid_filter", + "data": 0 + }, + "pattern": [ + "sgs", + "gfg", + "sgs" + ], + "type": "forge:ore_shaped", + "key": { + "s": { + "item": "#STICKWOOD" + }, + "f": { + "item": "bloodmagic:component", + "data": 10 + }, + "g": { + "item": "minecraft:bucket" + } + } +} \ No newline at end of file From 37f9ea2ab23393a8ecb5880cdec9e48391789e01 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 22 Apr 2018 16:04:08 -0400 Subject: [PATCH 175/493] Fixed server-sided crash for the turret array (why is Vec2f not found on the server???) --- changelog.txt | 6 ++++++ .../alchemyArray/AlchemyArrayEffectArrowTurret.java | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index a812faeb..f34df715 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 2.2.10 +------------------------------------------------------ +- Fixed Turret Array crash on servers. + + ------------------------------------------------------ Version 2.2.9 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java index 25d838cb..d2782237 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java @@ -15,12 +15,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec2f; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.util.Utils; +import com.sun.javafx.geom.Vec2d; + public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { public EntityLiving target; @@ -91,7 +92,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect if (canFireOnMob(world, pos, target)) { - Vec2f pitchYaw = getPitchYaw(pos, target); + Vec2d pitchYaw = getPitchYaw(pos, target); lastPitch = pitch; lastYaw = yaw; pitch = pitchYaw.x; @@ -179,11 +180,11 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect } } - public static Vec2f getPitchYaw(BlockPos pos, Entity entityIn) + public static Vec2d getPitchYaw(BlockPos pos, Entity entityIn) { if (entityIn == null) { - return new Vec2f(0, 0); + return new Vec2d(0, 0); } double distanceX = entityIn.posX - (pos.getX() + 0.5); @@ -193,7 +194,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI; double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI; - return new Vec2f((float) pitch, (float) yaw); + return new Vec2d((float) pitch, (float) yaw); } public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) From f4aef16ed13ca108250f7e1e72bd2832fa9fc31e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 22 Apr 2018 16:14:36 -0400 Subject: [PATCH 176/493] Fixed the Turret Array. (Deja vu) --- .../alchemyArray/AlchemyArrayEffectArrowTurret.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java index d2782237..ccebac1f 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java @@ -2,6 +2,8 @@ package WayofTime.bloodmagic.alchemyArray; import java.util.List; +import javax.vecmath.Vector2d; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityMob; @@ -20,8 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.util.Utils; -import com.sun.javafx.geom.Vec2d; - public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { public EntityLiving target; @@ -92,7 +92,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect if (canFireOnMob(world, pos, target)) { - Vec2d pitchYaw = getPitchYaw(pos, target); + Vector2d pitchYaw = getPitchYaw(pos, target); lastPitch = pitch; lastYaw = yaw; pitch = pitchYaw.x; @@ -180,11 +180,11 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect } } - public static Vec2d getPitchYaw(BlockPos pos, Entity entityIn) + public static Vector2d getPitchYaw(BlockPos pos, Entity entityIn) { if (entityIn == null) { - return new Vec2d(0, 0); + return new Vector2d(0, 0); } double distanceX = entityIn.posX - (pos.getX() + 0.5); @@ -194,7 +194,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI; double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI; - return new Vec2d((float) pitch, (float) yaw); + return new Vector2d(pitch, yaw); } public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) From 6522b0fa1b98759f28048a1e6120322c2d0334bb Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 22 Apr 2018 20:59:29 -0400 Subject: [PATCH 177/493] Fixed the Blood Altar so it can actually fill Blood Orbs (derp). --- changelog.txt | 2 +- gradle.properties | 2 +- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index f34df715..36548cc2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,7 @@ Version 2.2.10 ------------------------------------------------------ - Fixed Turret Array crash on servers. - +- Fixed the Blood Altar so it can actually fill Blood Orbs (derp). ------------------------------------------------------ Version 2.2.9 diff --git a/gradle.properties b/gradle.properties index d81bba9b..203e4f8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.8 +mod_version=2.2.10 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 5fc75ba7..0a6fcdb9 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -268,7 +268,7 @@ public class BloodAltar implements IFluidHandler return; } - if (recipe == null) + if (!canBeFilled && recipe == null) { startCycle(); return; @@ -365,7 +365,6 @@ public class BloodAltar implements IFluidHandler if (fluid != null && fluid.amount >= 1) { int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); - int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; From da8e43a8b494df393687af91415a69f8b10db227 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 24 Apr 2018 17:06:43 -0700 Subject: [PATCH 178/493] Fix Blood Tank NBT transfer between item/tile form (#1283) --- .../bloodmagic/block/BlockBloodTank.java | 26 +++++++++---------- .../item/block/ItemBlockBloodTank.java | 5 ++-- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index b9dfe15d..9140427b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -5,7 +5,6 @@ import WayofTime.bloodmagic.block.base.BlockInteger; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.ItemBlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; -import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -20,6 +19,7 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -32,7 +32,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; public class BlockBloodTank extends BlockInteger implements IVariantProvider, IBMBlock { public static final AxisAlignedBB BOX = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.8, 0.75); @@ -113,23 +112,22 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState blockState, int fortune) { - List list = Lists.newArrayList(); - + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState blockState, int fortune) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBloodTank) { TileBloodTank bloodTank = (TileBloodTank) tile; ItemStack drop = new ItemStack(this, 1, bloodTank.getBlockMetadata()); - NBTTagCompound tag = new NBTTagCompound(); + NBTTagCompound fluidTag = new NBTTagCompound(); - if (bloodTank.getTank().getFluid() != null) - bloodTank.getTank().getFluid().writeToNBT(tag); + if (bloodTank.getTank().getFluid() != null) { + bloodTank.getTank().getFluid().writeToNBT(fluidTag); + NBTTagCompound dropTag = new NBTTagCompound(); + dropTag.setTag("Fluid", fluidTag); + drop.setTagCompound(dropTag); + } - drop.setTagCompound(tag); - list.add(drop); + drops.add(drop); } - - return list; } @Override @@ -138,8 +136,8 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB if (tile instanceof TileBloodTank) { TileBloodTank bloodTank = (TileBloodTank) tile; NBTTagCompound tag = stack.getTagCompound(); - if (tag != null) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag); + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { + FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("Fluid")); bloodTank.getTank().setFluid(fluidStack); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java index 0e8bb21d..f614ed34 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java @@ -47,9 +47,8 @@ public class ItemBlockBloodTank extends ItemBlock { public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.tier", stack.getItemDamage() + 1)); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.capacity", getCapacity(stack))); - if (stack.hasTagCompound()) { - NBTTagCompound tag = stack.getTagCompound(); - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag); + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { + FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("Fluid")); if (fluidStack != null) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.type", fluidStack.getLocalizedName())); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.amount", fluidStack.amount, getCapacity(stack))); From 151c1dfd67819b8ab00572f768d70e42f9659b97 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 24 Apr 2018 17:08:08 -0700 Subject: [PATCH 179/493] "way pls" - TehNut 2018 (#1279) --- src/main/resources/assets/bloodmagic/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index b74fe090..11123441 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -613,7 +613,7 @@ ritual.bloodmagic.pumpRitual=Hymn of Syphoning ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar ritual.bloodmagic.portalRitual=The Gate of the Fold ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul -ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crytstal +ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crystal ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. From 842c9d1411f17a18e96199ac3392906651429da1 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 26 Apr 2018 16:33:22 -0400 Subject: [PATCH 180/493] Fixed the Alchemy Array from voiding items when broken when it shouldn't have. --- changelog.txt | 6 ++++++ .../java/WayofTime/bloodmagic/tile/TileAlchemyArray.java | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index 36548cc2..0ee1e6e0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 2.2.10-94 +------------------------------------------------------ +- Fixed the Alchemy Array from voiding items when broken when it shouldn't have. +- Fixed Blood Tank NBT transfer between item/tile form. + ------------------------------------------------------ Version 2.2.10 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index a8f0ff7c..c1c82c2c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -118,14 +118,10 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche @Override public void dropItems() { - if (!doDropIngredients) + if (arrayEffect == null || doDropIngredients) { super.dropItems(); } - if (arrayEffect != null) - { - - } } public boolean attemptCraft() From 26d67e68eb3e2c750a8a77b880dce42352c04614 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 26 Apr 2018 17:16:41 -0400 Subject: [PATCH 181/493] Quickly fixed something to avoid the wrath that anyone with a nut allergy would fear. --- changelog.txt | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 0ee1e6e0..d3e2ee41 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,9 @@ ------------------------------------------------------ -Version 2.2.10-94 +Version 2.2.11 ------------------------------------------------------ - Fixed the Alchemy Array from voiding items when broken when it shouldn't have. - Fixed Blood Tank NBT transfer between item/tile form. +- Made sure to not offend TehNut's sensibilities :NutMaid: ------------------------------------------------------ Version 2.2.10 diff --git a/gradle.properties b/gradle.properties index 203e4f8f..3c89390d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.10 +mod_version=2.2.11 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From 560d1677657a0151b09524be01eb6e252a97e8e1 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 26 Apr 2018 19:12:14 -0700 Subject: [PATCH 182/493] Check the proper maps when looking up fluid priorities (#1286) When copypasta goes wrong. --- .../bloodmagic/tile/routing/TileMasterRoutingNode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index 776901f4..51318fdc 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -98,7 +98,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (filter != null) { int priority = outputNode.getPriority(facing); - if (outputMap.containsKey(priority)) + if (outputFluidMap.containsKey(priority)) { outputFluidMap.get(priority).add(filter); } else @@ -164,7 +164,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (filter != null) { int priority = inputNode.getPriority(facing); - if (inputMap.containsKey(priority)) + if (inputFluidMap.containsKey(priority)) { inputFluidMap.get(priority).add(filter); } else From eb6b8a3aa5559363ff5fe242783ac4daa8ee8d26 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 28 Apr 2018 21:56:57 -0400 Subject: [PATCH 183/493] Small bit of framework for Soul Breath items, plus testing with the "Scroll of Icarus". Crafting mechanic as well as refilling of its resource not implemented. --- .../bloodmagic/core/RegistrarBloodMagic.java | 27 +++-- .../core/RegistrarBloodMagicItems.java | 106 +++++++++++++----- .../potion/PotionEventHandlers.java | 76 ++++++++++--- .../bloodmagic/registry/ModRecipes.java | 1 + .../WayofTime/bloodmagic/util/Constants.java | 20 +++- .../assets/bloodmagic/lang/en_US.lang | 2 + .../bloodmagic/textures/misc/potions.png | Bin 2109 -> 2109 bytes 7 files changed, 174 insertions(+), 58 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 9b0c4e9a..c039399d 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,14 +1,5 @@ package WayofTime.bloodmagic.core; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.entity.mob.*; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.potion.PotionBloodMagic; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; @@ -25,6 +16,20 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryBuilder; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; +import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; +import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; +import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; +import WayofTime.bloodmagic.entity.mob.EntityMimic; +import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; +import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.entity.projectile.EntityMeteor; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; +import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.potion.PotionBloodMagic; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @@ -57,6 +62,7 @@ public class RegistrarBloodMagic public static final Potion BOUNCE = MobEffects.HASTE; public static final Potion CLING = MobEffects.HASTE; public static final Potion SACRIFICIAL_LAMB = MobEffects.HASTE; + public static final Potion FLIGHT = MobEffects.HASTE; public static IForgeRegistry BLOOD_ORBS = null; @@ -88,7 +94,8 @@ public class RegistrarBloodMagic new PotionBloodMagic("Deaf", true, 0x000000, 0, 1).setRegistryName("deafness"), new PotionBloodMagic("Bounce", false, 0x000000, 1, 1).setRegistryName("bounce"), new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"), - new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb") + new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb"), + new PotionBloodMagic("Flight", false, 0x000000, 4, 0).setRegistryName("flight") ); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index caa674b9..fd76818f 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -1,29 +1,11 @@ package WayofTime.bloodmagic.core; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.IBMBlock; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.*; -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; -import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; -import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter; -import WayofTime.bloodmagic.item.routing.ItemNodeRouter; -import WayofTime.bloodmagic.item.routing.ItemRouterFilter; -import WayofTime.bloodmagic.item.sigil.*; -import WayofTime.bloodmagic.item.soul.*; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.item.types.ShardType; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; + +import java.util.List; +import java.util.Set; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; @@ -38,9 +20,81 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.block.IBMBlock; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.ItemActivationCrystal; +import WayofTime.bloodmagic.item.ItemAlchemicVial; +import WayofTime.bloodmagic.item.ItemAltarMaker; +import WayofTime.bloodmagic.item.ItemArcaneAshes; +import WayofTime.bloodmagic.item.ItemBloodOrb; +import WayofTime.bloodmagic.item.ItemBoundAxe; +import WayofTime.bloodmagic.item.ItemBoundPickaxe; +import WayofTime.bloodmagic.item.ItemBoundShovel; +import WayofTime.bloodmagic.item.ItemBoundSword; +import WayofTime.bloodmagic.item.ItemDaggerOfSacrifice; +import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.item.ItemDemonWillGauge; +import WayofTime.bloodmagic.item.ItemEnum; +import WayofTime.bloodmagic.item.ItemExperienceBook; +import WayofTime.bloodmagic.item.ItemInscriptionTool; +import WayofTime.bloodmagic.item.ItemLavaCrystal; +import WayofTime.bloodmagic.item.ItemPotionFlask; +import WayofTime.bloodmagic.item.ItemRitualDiviner; +import WayofTime.bloodmagic.item.ItemRitualReader; +import WayofTime.bloodmagic.item.ItemSacrificialDagger; +import WayofTime.bloodmagic.item.ItemSanguineBook; +import WayofTime.bloodmagic.item.ItemSlate; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import WayofTime.bloodmagic.item.ItemUpgradeTome; +import WayofTime.bloodmagic.item.ItemUpgradeTrainer; +import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; +import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.item.armour.ItemSentientArmour; +import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; +import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; +import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter; +import WayofTime.bloodmagic.item.routing.ItemNodeRouter; +import WayofTime.bloodmagic.item.routing.ItemRouterFilter; +import WayofTime.bloodmagic.item.sigil.ItemSigilAir; +import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight; +import WayofTime.bloodmagic.item.sigil.ItemSigilBounce; +import WayofTime.bloodmagic.item.sigil.ItemSigilClaw; +import WayofTime.bloodmagic.item.sigil.ItemSigilCompression; +import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; +import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity; +import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance; +import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner; +import WayofTime.bloodmagic.item.sigil.ItemSigilFrost; +import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove; +import WayofTime.bloodmagic.item.sigil.ItemSigilHaste; +import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; +import WayofTime.bloodmagic.item.sigil.ItemSigilLava; +import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism; +import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; +import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression; +import WayofTime.bloodmagic.item.sigil.ItemSigilTeleposition; +import WayofTime.bloodmagic.item.sigil.ItemSigilTransposition; +import WayofTime.bloodmagic.item.sigil.ItemSigilVoid; +import WayofTime.bloodmagic.item.sigil.ItemSigilWater; +import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind; +import WayofTime.bloodmagic.item.soul.ItemMonsterSoul; +import WayofTime.bloodmagic.item.soul.ItemSentientArmourGem; +import WayofTime.bloodmagic.item.soul.ItemSentientAxe; +import WayofTime.bloodmagic.item.soul.ItemSentientBow; +import WayofTime.bloodmagic.item.soul.ItemSentientPickaxe; +import WayofTime.bloodmagic.item.soul.ItemSentientShovel; +import WayofTime.bloodmagic.item.soul.ItemSentientSword; +import WayofTime.bloodmagic.item.soul.ItemSoulGem; +import WayofTime.bloodmagic.item.soul.ItemSoulSnare; +import WayofTime.bloodmagic.item.soulBreath.ItemFlightScroll; +import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.item.types.ShardType; -import java.util.List; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @@ -121,6 +175,7 @@ public class RegistrarBloodMagicItems public static final Item DEMON_WILL_GAUGE = Items.AIR; public static final Item POTION_FLASK = Items.AIR; public static final Item ALCHEMIC_VIAL = Items.AIR; + public static final Item ICARUS_SCROLL = Items.AIR; public static Item.ToolMaterial BOUND_TOOL_MATERIAL = EnumHelper.addToolMaterial("bound", 4, 1, 10, 8, 50); public static Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("demonic", 4, 520, 7, 8, 50); @@ -211,7 +266,8 @@ public class RegistrarBloodMagicItems new ItemLivingArmourPointsUpgrade().setRegistryName("points_upgrade"), new ItemDemonWillGauge().setRegistryName("demon_will_gauge"), new ItemPotionFlask().setRegistryName("potion_flask"), - new ItemAlchemicVial().setRegistryName("alchemic_vial") + new ItemAlchemicVial().setRegistryName("alchemic_vial"), + new ItemFlightScroll().setRegistryName("icarus_scroll") )); event.getRegistry().registerAll(items.toArray(new Item[0])); diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 40d0d5ed..2ffb368b 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,10 +1,13 @@ package WayofTime.bloodmagic.potion; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.potion.PotionEffect; @@ -16,15 +19,20 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import java.util.List; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class PotionEventHandlers { +public class PotionEventHandlers +{ + public static List flightList = new ArrayList(); @SubscribeEvent - public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) { - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { + public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) + { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) + { int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); event.getEntityLiving().motionY += (0.1f) * (2 + i); } @@ -35,7 +43,33 @@ public class PotionEventHandlers { } @SubscribeEvent - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { + public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) + { + if (event.getEntityLiving() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (!player.world.isRemote) + { + if (player.isPotionActive(RegistrarBloodMagic.FLIGHT)) + { + if (!player.isSpectator() && !player.capabilities.allowFlying) + { + player.capabilities.allowFlying = true; + player.sendPlayerAbilities(); + flightList.add(player); + } + } else + { + if (flightList.contains(player)) + { + player.capabilities.allowFlying = false; + player.capabilities.isFlying = false; + player.sendPlayerAbilities(); + flightList.remove(player); + } + } + } + } // if (event.getEntityLiving().isPotionActive(ModPotions.boost)) // { // int i = event.getEntityLiving().getActivePotionEffect(ModPotions.boost).getAmplifier(); @@ -52,12 +86,14 @@ public class PotionEventHandlers { // } // } - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND)) { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND)) + { int d0 = 3; AxisAlignedBB axisAlignedBB = new AxisAlignedBB(event.getEntityLiving().posX - 0.5, event.getEntityLiving().posY - 0.5, event.getEntityLiving().posZ - 0.5, event.getEntityLiving().posX + 0.5, event.getEntityLiving().posY + 0.5, event.getEntityLiving().posZ + 0.5).expand(d0, d0, d0); List entityList = event.getEntityLiving().getEntityWorld().getEntitiesWithinAABB(Entity.class, axisAlignedBB); - for (Entity projectile : entityList) { + for (Entity projectile : entityList) + { if (projectile == null) continue; if (!(projectile instanceof IProjectile)) @@ -84,7 +120,8 @@ public class PotionEventHandlers { if (angle < 3 * (Math.PI / 4)) continue; // angle is < 135 degrees - if (throwingEntity != null) { + if (throwingEntity != null) + { delX = -projectile.posX + throwingEntity.posX; delY = -projectile.posY + (throwingEntity.posY + throwingEntity.getEyeHeight()); delZ = -projectile.posZ + throwingEntity.posZ; @@ -104,26 +141,31 @@ public class PotionEventHandlers { } @SubscribeEvent - public static void onPlayerRespawn(PlayerEvent.Clone event) { + public static void onPlayerRespawn(PlayerEvent.Clone event) + { if (event.isWasDeath()) event.getEntityPlayer().addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, 400)); } @SubscribeEvent - public static void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event) { + public static void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event) + { if (event.player.isPotionActive(RegistrarBloodMagic.SOUL_FRAY)) event.lpAdded = (int) (event.lpAdded * 0.1D); } @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onPlayerDamageEvent(LivingAttackEvent event) { + public static void onPlayerDamageEvent(LivingAttackEvent event) + { if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND) && event.isCancelable() && event.getSource().isProjectile()) event.setCanceled(true); } @SubscribeEvent - public static void onEndermanTeleportEvent(EnderTeleportEvent event) { - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.PLANAR_BINDING) && event.isCancelable()) { + public static void onEndermanTeleportEvent(EnderTeleportEvent event) + { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.PLANAR_BINDING) && event.isCancelable()) + { event.setCanceled(true); } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index d84c7548..cbec17ec 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -172,6 +172,7 @@ public class ModRecipes addPotionRecipe(1000, 1, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), new PotionEffect(MobEffects.HEALTH_BOOST, 2 * 60 * 20)); addPotionRecipe(1000, 1, new ItemStack(Blocks.SLIME_BLOCK), new PotionEffect(RegistrarBloodMagic.BOUNCE, 2 * 60 * 20)); addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new PotionEffect(RegistrarBloodMagic.CLING, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.CAKE), new PotionEffect(RegistrarBloodMagic.FLIGHT, 2 * 60 * 20)); addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(RegistrarBloodMagic.DEAFNESS, 450)); } diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index 77d6d512..13b43026 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -7,8 +7,10 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import java.util.Locale; -public class Constants { - public static class NBT { +public class Constants +{ + public static class NBT + { public static final String OWNER_UUID = "ownerUUID"; public static final String OWNER_NAME = "ownerNAME"; public static final String USES = "uses"; @@ -125,13 +127,17 @@ public class Constants { public static final String POTION_IMPURITY = "impurity"; public static final String TANK = "tank"; + + public static final String BREATH = "breath"; } - public static class Mod { + public static class Mod + { public static final String DOMAIN = BloodMagic.MODID.toLowerCase(Locale.ENGLISH) + ":"; } - public static final class Gui { + public static final class Gui + { public static final int TELEPOSER_GUI = 0; public static final int SOUL_FORGE_GUI = 1; public static final int ROUTING_NODE_GUI = 2; @@ -140,7 +146,8 @@ public class Constants { public static final int SIGIL_HOLDING_GUI = 5; } - public static class Compat { + public static class Compat + { public static final String JEI_CATEGORY_ALTAR = BloodMagic.MODID + ":altar"; public static final String JEI_CATEGORY_BINDING = BloodMagic.MODID + ":binding"; public static final String JEI_CATEGORY_ALCHEMYARRAY = BloodMagic.MODID + ":alchemyArray"; @@ -157,7 +164,8 @@ public class Constants { public static final Item THAUMCRAFT_GOGGLES = ForgeRegistries.ITEMS.getValue(new ResourceLocation("Thaumcraft", "goggles")); } - public static class Misc { + public static class Misc + { public static final int POTION_ARRAY_SIZE = 256; public static final float ALTERED_STEP_HEIGHT = 1.00314159f; public static final int NIGHT_VISION_CONSTANT_BEGIN = 30002; diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 11123441..b4b2e0b5 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -190,6 +190,8 @@ item.bloodmagic.living_point_upgrade.draft_angelus.name=Draft of Angelus item.bloodmagic.willGauge.name=Demon Will Aura Gauge item.bloodmagic.potionFlask.name=Potion Flask +item.bloodmagic.icarusScroll.name=Scroll of Icarus + # Blocks tile.bloodmagic.fluid.lifeEssence.name=Life Essence diff --git a/src/main/resources/assets/bloodmagic/textures/misc/potions.png b/src/main/resources/assets/bloodmagic/textures/misc/potions.png index 0ceb8f8ba5ae5f4d9983f4ce6bbe059eed5d4039..f289281240a90f136817ac2eca17b8dedca422a3 100644 GIT binary patch delta 60 zcmdlhuvcJ$mf?Q}AY8C_`D6wL2F?PH$YKTtZeb8+WSBKa0w~B{;_2(k{)k0dgx#!8 LB(HU2^doivKOhlX delta 60 zcmdlhuvcJ$mSGD65NA}Fjz**oCS=tt}T>}nB7 From 7cecdef6c51d8b26b0d2f28df13657764f190190 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 29 Apr 2018 07:39:20 -0400 Subject: [PATCH 184/493] Fixed the Hellfire Forge and Alchemy Table so that they now accept ingredients in any order. --- changelog.txt | 6 + .../api/impl/BloodMagicRecipeRegistrar.java | 160 ++++++++++++------ 2 files changed, 113 insertions(+), 53 deletions(-) diff --git a/changelog.txt b/changelog.txt index d3e2ee41..46e87f91 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 2.2.12 +------------------------------------------------------ +- Fixed Hellfire Forge and Alchemy Table's shape-crafted-ness. + + ------------------------------------------------------ Version 2.2.11 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index e65eac53..59fb5dba 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -7,10 +7,12 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; @@ -20,17 +22,21 @@ import net.minecraftforge.common.crafting.CraftingHelper; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import javax.annotation.Nullable; + +import java.util.ArrayList; import java.util.List; import java.util.Set; -public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { +public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar +{ private final Set altarRecipes; private final Set alchemyRecipes; private final Set tartaricForgeRecipes; private final Set alchemyArrayRecipes; - public BloodMagicRecipeRegistrar() { + public BloodMagicRecipeRegistrar() + { this.altarRecipes = Sets.newHashSet(); this.alchemyRecipes = Sets.newHashSet(); this.tartaricForgeRecipes = Sets.newHashSet(); @@ -38,7 +44,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Override - public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) + { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); @@ -50,14 +57,16 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Override - public boolean removeBloodAltar(@Nonnull ItemStack input) { + public boolean removeBloodAltar(@Nonnull ItemStack input) + { Preconditions.checkNotNull(input, "input cannot be null."); return altarRecipes.remove(getBloodAltar(input)); } @Override - public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) + { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); @@ -68,7 +77,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); } - public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) { + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) + { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); @@ -76,8 +86,10 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { Preconditions.checkNotNull(input, "input cannot be null."); List ingredients = Lists.newArrayList(); - for (Object object : input) { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + for (Object object : input) + { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) + { ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); continue; } @@ -88,12 +100,14 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0])); } - public void addAlchemyTable(RecipeAlchemyTable recipe) { + public void addAlchemyTable(RecipeAlchemyTable recipe) + { alchemyRecipes.add(recipe); } @Override - public boolean removeAlchemyTable(@Nonnull ItemStack... input) { + public boolean removeAlchemyTable(@Nonnull ItemStack... input) + { Preconditions.checkNotNull(input, "inputs cannot be null."); for (ItemStack stack : input) @@ -103,7 +117,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Override - public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) + { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); @@ -114,7 +129,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Override - public boolean removeTartaricForge(@Nonnull ItemStack... input) { + public boolean removeTartaricForge(@Nonnull ItemStack... input) + { Preconditions.checkNotNull(input, "inputs cannot be null."); for (ItemStack stack : input) @@ -123,15 +139,18 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); } - public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) + { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); Preconditions.checkNotNull(input, "input cannot be null."); List ingredients = Lists.newArrayList(); - for (Object object : input) { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + for (Object object : input) + { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) + { ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); continue; } @@ -143,7 +162,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Override - public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) + { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); @@ -152,14 +172,16 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Override - public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { + public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) + { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst)); } - public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) + { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); @@ -168,7 +190,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Nullable - public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { + public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) + { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; @@ -181,44 +204,32 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Nullable - public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { + public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) + { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; - mainLoop: - for (RecipeAlchemyTable recipe : alchemyRecipes) { + mainLoop: for (RecipeAlchemyTable recipe : alchemyRecipes) + { if (recipe.getInput().size() != input.size()) continue; - for (int i = 0; i < input.size(); i++) { - Ingredient ingredient = recipe.getInput().get(i); - if (!ingredient.apply(input.get(i))) - continue mainLoop; - } + List recipeInput = new ArrayList<>(recipe.getInput()); - return recipe; - } - - return null; - } - - @Nullable - public RecipeTartaricForge getTartaricForge(@Nonnull List input) { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - mainLoop: - for (RecipeTartaricForge recipe : tartaricForgeRecipes) { - if (recipe.getInput().size() != input.size()) - continue; - - for (int i = 0; i < input.size(); i++) { + for (int i = 0; i < input.size(); i++) + { boolean matched = false; - Ingredient ingredient = recipe.getInput().get(i); - if (ingredient.apply(input.get(i))) - matched = true; + for (int j = 0; j < recipeInput.size(); j++) + { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.apply(input.get(i))) + { + matched = true; + recipeInput.remove(j); + break; + } + } if (!matched) continue mainLoop; @@ -231,7 +242,46 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { } @Nullable - public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { + public RecipeTartaricForge getTartaricForge(@Nonnull List input) + { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: for (RecipeTartaricForge recipe : tartaricForgeRecipes) + { + if (recipe.getInput().size() != input.size()) + continue; + + List recipeInput = new ArrayList<>(recipe.getInput()); + + for (int i = 0; i < input.size(); i++) + { + boolean matched = false; + for (int j = 0; j < recipeInput.size(); j++) + { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.apply(input.get(i))) + { + matched = true; + recipeInput.remove(j); + break; + } + } + + if (!matched) + continue mainLoop; + } + + return recipe; + } + + return null; + } + + @Nullable + public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) + { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; @@ -243,19 +293,23 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { return null; } - public Set getAltarRecipes() { + public Set getAltarRecipes() + { return ImmutableSet.copyOf(altarRecipes); } - public Set getAlchemyRecipes() { + public Set getAlchemyRecipes() + { return ImmutableSet.copyOf(alchemyRecipes); } - public Set getTartaricForgeRecipes() { + public Set getTartaricForgeRecipes() + { return ImmutableSet.copyOf(tartaricForgeRecipes); } - public Set getAlchemyArrayRecipes() { + public Set getAlchemyArrayRecipes() + { return ImmutableSet.copyOf(alchemyArrayRecipes); } } From b20e1ac4d777231a0fbcaf561184c0421805d04a Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 29 Apr 2018 08:40:42 -0400 Subject: [PATCH 185/493] Fixed Cutting Fluids so they now work properly. --- changelog.txt | 2 +- .../WayofTime/bloodmagic/tile/TileAlchemyTable.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index 46e87f91..94038314 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,7 @@ Version 2.2.12 ------------------------------------------------------ - Fixed Hellfire Forge and Alchemy Table's shape-crafted-ness. - +- Fixed Cutting Fluids so they now work properly. ------------------------------------------------------ Version 2.2.11 diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 11b9e8eb..4871b0b5 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -3,13 +3,11 @@ package WayofTime.bloodmagic.tile; import java.util.ArrayList; import java.util.List; -import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; @@ -17,18 +15,22 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; + +import org.apache.commons.lang3.ArrayUtils; + +import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import org.apache.commons.lang3.ArrayUtils; public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable { @@ -336,6 +338,8 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, ItemStack currentStack = getStackInSlot(i); if (currentStack.getItem().hasContainerItem(currentStack)) setInventorySlotContents(i, currentStack.getItem().getContainerItem(currentStack)); + else if (currentStack.getItem() instanceof ICustomAlchemyConsumable) + setInventorySlotContents(i, ((ICustomAlchemyConsumable) currentStack.getItem()).drainUseOnAlchemyCraft(currentStack)); else currentStack.shrink(1); } From d29b91a1068fa007bb2604f17b717aa2852d48c7 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 29 Apr 2018 09:57:29 -0400 Subject: [PATCH 186/493] Fixed the Fluid filters so that they now work perfectly in the routing system. --- changelog.txt | 1 + .../item/routing/ItemFluidRouterFilter.java | 71 ++++++---- .../item/routing/ItemRouterFilter.java | 106 ++++++++------- .../routing/RoutingFluidFilter.java | 125 ++++++++++++------ 4 files changed, 189 insertions(+), 114 deletions(-) diff --git a/changelog.txt b/changelog.txt index 94038314..f449eb05 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version 2.2.12 ------------------------------------------------------ - Fixed Hellfire Forge and Alchemy Table's shape-crafted-ness. - Fixed Cutting Fluids so they now work properly. +- Fixed the Fluid filters so that they now work perfectly in the routing system. ------------------------------------------------------ Version 2.2.11 diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 534ab3c4..a72dfd3f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -23,10 +23,12 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, IVariantProvider { - public static String[] names = {"exact"}; +public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, IVariantProvider +{ + public static String[] names = { "exact" }; - public ItemFluidRouterFilter() { + public ItemFluidRouterFilter() + { super(); setUnlocalizedName(BloodMagic.MODID + ".fluidFilter."); @@ -35,13 +37,15 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public String getUnlocalizedName(ItemStack stack) { + public String getUnlocalizedName(ItemStack stack) + { return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; } @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(CreativeTabs creativeTab, NonNullList list) + { if (!isInCreativeTab(creativeTab)) return; @@ -51,35 +55,39 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { tooltip.add(TextHelper.localize("tooltip.bloodmagic.fluidFilter." + names[stack.getItemDamage()])); super.addInformation(stack, world, tooltip, flag); } @Override - public IFluidFilter getInputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { + public IFluidFilter getInputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) + { IFluidFilter testFilter; - switch (filterStack.getMetadata()) { - case 0: - testFilter = new RoutingFluidFilter(); - break; + switch (filterStack.getMetadata()) + { + case 0: + testFilter = new RoutingFluidFilter(); + break; - default: - testFilter = new RoutingFluidFilter(); + default: + testFilter = new RoutingFluidFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); - for (int i = 0; i < inv.getSizeInventory(); i++) { + for (int i = 0; i < inv.getSizeInventory(); i++) + { ItemStack stack = inv.getStackInSlot(i); - if (stack == null) { + if (stack.isEmpty()) + { continue; } ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - filteredList.add(ghostStack); } @@ -88,27 +96,32 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public IFluidFilter getOutputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { + public IFluidFilter getOutputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) + { IFluidFilter testFilter; - switch (filterStack.getMetadata()) { - case 0: - testFilter = new RoutingFluidFilter(); - break; + switch (filterStack.getMetadata()) + { + case 0: + testFilter = new RoutingFluidFilter(); + break; - default: - testFilter = new RoutingFluidFilter(); + default: + testFilter = new RoutingFluidFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. - for (int i = 0; i < inv.getSizeInventory(); i++) { + for (int i = 0; i < inv.getSizeInventory(); i++) + { ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) { + if (stack.isEmpty()) + { continue; } ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.isEmpty()) { + if (ghostStack.isEmpty()) + { ghostStack.setCount(Integer.MAX_VALUE); } @@ -120,12 +133,14 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { + public void gatherVariants(@Nonnull Int2ObjectMap variants) + { variants.put(0, "type=exact"); } @Override - public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) { + public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) + { ItemStack copyStack = keyStack.copy(); GhostItemHelper.setItemGhostAmount(copyStack, 0); copyStack.setCount(1); diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index 840f1c27..f80cf9aa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -22,10 +22,12 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider { - public static String[] names = {"exact", "ignoreNBT", "modItems", "oreDict"}; +public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider +{ + public static String[] names = { "exact", "ignoreNBT", "modItems", "oreDict" }; - public ItemRouterFilter() { + public ItemRouterFilter() + { super(); setUnlocalizedName(BloodMagic.MODID + ".itemFilter."); @@ -34,13 +36,15 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public String getUnlocalizedName(ItemStack stack) { + public String getUnlocalizedName(ItemStack stack) + { return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; } @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(CreativeTabs creativeTab, NonNullList list) + { if (!isInCreativeTab(creativeTab)) return; @@ -50,39 +54,44 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { tooltip.add(TextHelper.localize("tooltip.bloodmagic.itemFilter." + names[stack.getItemDamage()])); super.addInformation(stack, world, tooltip, flag); } @Override - public IItemFilter getInputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) { + public IItemFilter getInputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) + { IItemFilter testFilter = new TestItemFilter(); - switch (filterStack.getMetadata()) { - case 0: - testFilter = new TestItemFilter(); - break; - case 1: - testFilter = new IgnoreNBTItemFilter(); - break; - case 2: - testFilter = new ModIdItemFilter(); - break; - case 3: - testFilter = new OreDictItemFilter(); - break; + switch (filterStack.getMetadata()) + { + case 0: + testFilter = new TestItemFilter(); + break; + case 1: + testFilter = new IgnoreNBTItemFilter(); + break; + case 2: + testFilter = new ModIdItemFilter(); + break; + case 3: + testFilter = new OreDictItemFilter(); + break; - default: - testFilter = new DefaultItemFilter(); + default: + testFilter = new DefaultItemFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); - for (int i = 0; i < inv.getSizeInventory(); i++) { + for (int i = 0; i < inv.getSizeInventory(); i++) + { ItemStack stack = inv.getStackInSlot(i); - if (stack == null) { + if (stack.isEmpty()) + { continue; } @@ -96,37 +105,42 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public IItemFilter getOutputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) { + public IItemFilter getOutputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) + { IItemFilter testFilter; - switch (filterStack.getMetadata()) { - case 0: - testFilter = new TestItemFilter(); - break; - case 1: - testFilter = new IgnoreNBTItemFilter(); - break; - case 2: - testFilter = new ModIdItemFilter(); - break; - case 3: - testFilter = new OreDictItemFilter(); - break; + switch (filterStack.getMetadata()) + { + case 0: + testFilter = new TestItemFilter(); + break; + case 1: + testFilter = new IgnoreNBTItemFilter(); + break; + case 2: + testFilter = new ModIdItemFilter(); + break; + case 3: + testFilter = new OreDictItemFilter(); + break; - default: - testFilter = new DefaultItemFilter(); + default: + testFilter = new DefaultItemFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. - for (int i = 0; i < inv.getSizeInventory(); i++) { + for (int i = 0; i < inv.getSizeInventory(); i++) + { ItemStack stack = inv.getStackInSlot(i); - if (stack == null) { + if (stack.isEmpty()) + { continue; } ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.isEmpty()) { + if (ghostStack.isEmpty()) + { ghostStack.setCount(Integer.MAX_VALUE); } @@ -138,7 +152,8 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { + public void gatherVariants(@Nonnull Int2ObjectMap variants) + { variants.put(0, "type=exact"); variants.put(1, "type=ignorenbt"); variants.put(2, "type=moditems"); @@ -146,7 +161,8 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) { + public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) + { ItemStack copyStack = keyStack.copy(); GhostItemHelper.setItemGhostAmount(copyStack, 0); copyStack.setCount(1); diff --git a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java index 5de7f9cb..6ff9f8d9 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java @@ -1,5 +1,11 @@ package WayofTime.bloodmagic.routing; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -9,47 +15,54 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class RoutingFluidFilter implements IFluidFilter { +public class RoutingFluidFilter implements IFluidFilter +{ protected List requestList; protected TileEntity accessedTile; protected IFluidHandler fluidHandler; @Override - public void initializeFilter(List filteredList, TileEntity tile, IFluidHandler fluidHandler, boolean isFilterOutput) { + public void initializeFilter(List filteredList, TileEntity tile, IFluidHandler fluidHandler, boolean isFilterOutput) + { this.accessedTile = tile; this.fluidHandler = fluidHandler; - if (isFilterOutput) { + if (isFilterOutput) + { //The requestList contains a list of how much can be extracted. requestList = new ArrayList<>(); - for (ItemStack filterStack : filteredList) { + for (ItemStack filterStack : filteredList) + { FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); - if (fluidFilterStack != null) { + if (fluidFilterStack != null) + { requestList.add(fluidFilterStack); } } IFluidTankProperties[] properties = fluidHandler.getTankProperties(); - for (IFluidTankProperties property : properties) { + for (IFluidTankProperties property : properties) + { FluidStack containedStack = property.getContents(); - if (containedStack != null) { - for (FluidStack fluidFilterStack : requestList) { - if (doStacksMatch(fluidFilterStack, containedStack)) { + if (containedStack != null) + { + for (FluidStack fluidFilterStack : requestList) + { + if (doStacksMatch(fluidFilterStack, containedStack)) + { fluidFilterStack.amount = Math.max(fluidFilterStack.amount - containedStack.amount, 0); } } } } - } else { + } else + { requestList = new ArrayList<>(); - for (ItemStack filterStack : filteredList) { + for (ItemStack filterStack : filteredList) + { FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); - if (fluidFilterStack != null) { + if (fluidFilterStack != null) + { fluidFilterStack.amount *= -1; requestList.add(fluidFilterStack); } @@ -57,11 +70,15 @@ public class RoutingFluidFilter implements IFluidFilter { IFluidTankProperties[] properties = fluidHandler.getTankProperties(); - for (IFluidTankProperties property : properties) { + for (IFluidTankProperties property : properties) + { FluidStack containedStack = property.getContents(); - if (containedStack != null) { - for (FluidStack fluidFilterStack : requestList) { - if (doStacksMatch(fluidFilterStack, containedStack)) { + if (containedStack != null) + { + for (FluidStack fluidFilterStack : requestList) + { + if (doStacksMatch(fluidFilterStack, containedStack)) + { fluidFilterStack.amount += containedStack.amount; } } @@ -74,16 +91,20 @@ public class RoutingFluidFilter implements IFluidFilter { * Gives the remainder~ */ @Override - public FluidStack transferStackThroughOutputFilter(FluidStack fluidStack) { + public FluidStack transferStackThroughOutputFilter(FluidStack fluidStack) + { int allowedAmount = 0; - for (FluidStack filterStack : requestList) { - if (doStacksMatch(filterStack, fluidStack)) { + for (FluidStack filterStack : requestList) + { + if (doStacksMatch(filterStack, fluidStack)) + { allowedAmount = Math.min(filterStack.amount, fluidStack.amount); break; } } - if (allowedAmount <= 0) { + if (allowedAmount <= 0) + { return fluidStack; } @@ -92,11 +113,14 @@ public class RoutingFluidFilter implements IFluidFilter { copyStack.amount = fluidStack.amount - filledAmount; Iterator itr = requestList.iterator(); - while (itr.hasNext()) { + while (itr.hasNext()) + { FluidStack filterStack = itr.next(); - if (doStacksMatch(filterStack, copyStack)) { + if (doStacksMatch(filterStack, copyStack)) + { filterStack.amount -= filledAmount; - if (filterStack.amount <= 0) { + if (filterStack.amount <= 0) + { itr.remove(); } } @@ -110,10 +134,13 @@ public class RoutingFluidFilter implements IFluidFilter { } @Override - public int transferThroughInputFilter(IFluidFilter outputFilter, int maxTransfer) { - for (FluidStack filterFluidStack : requestList) { + public int transferThroughInputFilter(IFluidFilter outputFilter, int maxTransfer) + { + for (FluidStack filterFluidStack : requestList) + { int allowedAmount = Math.min(filterFluidStack.amount, maxTransfer); - if (allowedAmount <= 0) { + if (allowedAmount <= 0) + { continue; } @@ -125,7 +152,8 @@ public class RoutingFluidFilter implements IFluidFilter { FluidStack remainderStack = outputFilter.transferStackThroughOutputFilter(drainStack); int drained = remainderStack == null ? copyStack.amount : (copyStack.amount - remainderStack.amount); - if (drained > 0) { + if (drained > 0) + { drainStack.amount = drained; fluidHandler.drain(drainStack, true); @@ -133,11 +161,14 @@ public class RoutingFluidFilter implements IFluidFilter { } Iterator itr = requestList.iterator(); - while (itr.hasNext()) { + while (itr.hasNext()) + { FluidStack filterStack = itr.next(); - if (doStacksMatch(filterStack, copyStack)) { + if (doStacksMatch(filterStack, copyStack)) + { filterStack.amount -= drained; - if (filterStack.amount <= 0) { + if (filterStack.amount <= 0) + { itr.remove(); } } @@ -155,9 +186,12 @@ public class RoutingFluidFilter implements IFluidFilter { } @Override - public boolean doesStackMatchFilter(FluidStack testStack) { - for (FluidStack filterStack : requestList) { - if (doStacksMatch(filterStack, testStack)) { + public boolean doesStackMatchFilter(FluidStack testStack) + { + for (FluidStack filterStack : requestList) + { + if (doStacksMatch(filterStack, testStack)) + { return true; } } @@ -166,17 +200,26 @@ public class RoutingFluidFilter implements IFluidFilter { } @Override - public boolean doStacksMatch(FluidStack filterStack, FluidStack testStack) { + public boolean doStacksMatch(FluidStack filterStack, FluidStack testStack) + { return testStack != null && filterStack.getFluid() == testStack.getFluid(); } @Nullable - public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) { + public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) + { + boolean isEmpty = false; + if (inputStack.getCount() == 0) + { + isEmpty = true; + inputStack.setCount(1); + } + FluidStack fluidStack = FluidUtil.getFluidContained(inputStack); if (fluidStack == null) return null; - fluidStack.amount = inputStack.getCount(); + fluidStack.amount = isEmpty ? 0 : inputStack.getCount(); return fluidStack; } } From 29ae24b044a793188f752af0637ae75e5fd6e0bf Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 30 Apr 2018 19:01:54 -0700 Subject: [PATCH 187/493] Fix altar double counting upgrades (#1291) --- .../WayofTime/bloodmagic/altar/AltarUtil.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java index 7519c870..acde6d6d 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java @@ -50,19 +50,14 @@ public class AltarUtil { public static AltarUpgrade getUpgrades(World world, BlockPos pos, AltarTier currentTier) { AltarUpgrade upgrades = new AltarUpgrade(); - for (AltarTier tier : AltarTier.values()) { - if (tier.ordinal() > currentTier.ordinal()) - return upgrades; + for (AltarComponent component : currentTier.getAltarComponents()) { + if (!component.isUpgradeSlot() || component.getComponent() != ComponentType.BLOODRUNE) + continue; - for (AltarComponent component : tier.getAltarComponents()) { - if (!component.isUpgradeSlot() || component.getComponent() != ComponentType.BLOODRUNE) - continue; - - BlockPos componentPos = pos.add(component.getOffset()); - IBlockState state = world.getBlockState(componentPos); - if (state.getBlock() instanceof BlockBloodRune) - upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos, state)); - } + BlockPos componentPos = pos.add(component.getOffset()); + IBlockState state = world.getBlockState(componentPos); + if (state.getBlock() instanceof BlockBloodRune) + upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos, state)); } return upgrades; From 920d105374a502927355953ac7393835cd155342 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 1 May 2018 06:51:37 -0400 Subject: [PATCH 188/493] Needed to be more pushy. --- .settings/org.eclipse.jdt.ui.prefs | 6 +- .../item/soulBreath/ItemFlightScroll.java | 116 ++++++++++++++++++ .../soulBreath/ItemSoulBreathContainer.java | 75 +++++++++++ .../bloodmagic/soul/ISoulBreathContainer.java | 16 +++ .../bloodmagic/blockstates/icarus_scroll.json | 21 ++++ .../textures/items/icarusscroll_activated.png | Bin 0 -> 625 bytes .../items/icarusscroll_deactivated.png | Bin 0 -> 622 bytes 7 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java create mode 100644 src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java create mode 100644 src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java create mode 100644 src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json create mode 100644 src/main/resources/assets/bloodmagic/textures/items/icarusscroll_activated.png create mode 100644 src/main/resources/assets/bloodmagic/textures/items/icarusscroll_deactivated.png diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index f9b2d33a..3f2271a9 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,7 +1,11 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_BloodMagic1.8 +formatter_profile=_BloodMagic formatter_settings_version=12 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.overrideannotation=true sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java new file mode 100644 index 00000000..e10d1297 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -0,0 +1,116 @@ +package WayofTime.bloodmagic.item.soulBreath; + +import java.util.function.Consumer; + +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.iface.IActivatable; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; + +public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshProvider, IActivatable +{ + //TODO: A lot of this stuff could be moved to a toggle-able variant + public ItemFlightScroll() + { + super(); + setUnlocalizedName(BloodMagic.MODID + ".icarusScroll"); + setCreativeTab(BloodMagic.TAB_BM); + } + + @Override + public boolean getActivated(ItemStack stack) + { + return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); + } + + @Override + public ItemStack setActivatedState(ItemStack stack, boolean activated) + { + if (!stack.isEmpty()) + { + NBTHelper.checkNBT(stack).getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); + return stack; + } + + return stack; + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + { + ItemStack stack = player.getHeldItem(hand); + + if (!world.isRemote) + { + if (player.isSneaking()) + setActivatedState(stack, !getActivated(stack)); + } + + return super.onItemRightClick(world, player, hand); + } + + @Override + public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) + { + if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) + { + if (entityIn.ticksExisted % 100 == 0) + { + double drainNeeded = getBreathCostPerSecond(stack); + if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) + { + this.drainBreath(stack, drainNeeded, true); + } else + { + this.setActivatedState(stack, false); + } + } + + onEffectUpdate(stack, worldIn, (EntityPlayer) entityIn, itemSlot, isSelected); + } + } + + public void onEffectUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) + { + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FLIGHT, 2, 0)); + } + + @Override + public int getMaxBreath(ItemStack stack) + { + return 20; + } + + public double getBreathCostPerSecond(ItemStack stack) + { + return 0.01; + } + + @Override + @SideOnly(Side.CLIENT) + public ItemMeshDefinition getMeshDefinition() + { + return new CustomMeshDefinitionActivatable("icarus_scroll"); + } + + @Override + public void gatherVariants(Consumer variants) + { + variants.accept("active=false"); + variants.accept("active=true"); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java new file mode 100644 index 00000000..1dfb41cd --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java @@ -0,0 +1,75 @@ +package WayofTime.bloodmagic.item.soulBreath; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import WayofTime.bloodmagic.soul.ISoulBreathContainer; +import WayofTime.bloodmagic.util.Constants; + +public abstract class ItemSoulBreathContainer extends Item implements ISoulBreathContainer +{ + @Override + public double getBreath(ItemStack stack) + { + NBTTagCompound tag = stack.getTagCompound(); + + return tag.getDouble(Constants.NBT.BREATH); + } + + @Override + public void setBreath(ItemStack stack, double amount) + { + NBTTagCompound tag = stack.getTagCompound(); + + tag.setDouble(Constants.NBT.BREATH, amount); + } + + @Override + public double drainBreath(ItemStack stack, double drainAmount, boolean doDrain) + { + double breath = getBreath(stack); + + double breathDrained = Math.min(drainAmount, breath); + + if (doDrain) + { + setBreath(stack, breath - breathDrained); + } + + return breathDrained; + } + + @Override + public double fillBreath(ItemStack stack, double fillAmount, boolean doFill) + { + double current = this.getBreath(stack); + double maxBreath = this.getMaxBreath(stack); + + double filled = Math.min(fillAmount, maxBreath - current); + + if (doFill) + { + this.setBreath(stack, filled + current); + } + + return filled; + } + + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + double maxWill = getMaxBreath(stack); + if (maxWill <= 0) + { + return 1; + } + return 1.0 - (getBreath(stack) / maxWill); + } + +} diff --git a/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java new file mode 100644 index 00000000..f8b9b137 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java @@ -0,0 +1,16 @@ +package WayofTime.bloodmagic.soul; + +import net.minecraft.item.ItemStack; + +public interface ISoulBreathContainer +{ + double getBreath(ItemStack stack); + + void setBreath(ItemStack stack, double amount); + + int getMaxBreath(ItemStack stack); + + double drainBreath(ItemStack stack, double drainAmount, boolean doDrain); + + double fillBreath(ItemStack stack, double fillAmount, boolean doFill); +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json b/src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json new file mode 100644 index 00000000..748b4003 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "active": { + "false": { + "textures": { + "layer0": "bloodmagic:items/icarusscroll_deactivated" + } + }, + "true": { + "textures": { + "layer0": "bloodmagic:items/icarusscroll_activated" + } + } + } + } +} diff --git a/src/main/resources/assets/bloodmagic/textures/items/icarusscroll_activated.png b/src/main/resources/assets/bloodmagic/textures/items/icarusscroll_activated.png new file mode 100644 index 0000000000000000000000000000000000000000..767852ce986246c1e6191e3f19b48d99190d2fb9 GIT binary patch literal 625 zcmV-%0*?KOP)WFU8GbZ8()Nlj2>E@cM*00GrWL_t(I%f*vBXjDNI zhQBj+?>@4wkJyQY4-{;zY()eg;A0D0>y@Aq4W`hnAi*rCuy#=pgJ=<7hzM$FXDx_U zT38D)=I-9TGxxVxU0sq?DLgRE%$e`}^Pe*&iM51djZs+bVB+{jb(c~?5I%?y`brIm zB4hSlYO4a~ntRn~j1#&YT&WBaxlfsC-DLXZbEZzz|0YWsTA!ayNT84N=OmCoA09S- z@156~{Uwbb9?_qC``5(Rck9|(-GY2Z`f~w?$OFXHD$Yd|s#VCv{YUp`y;vN6!o_2w z8asOl1yAlX${RK#d5|OYl72Pku*hMyf{Dpug7U!jLzjpA`0{3&-Srj#U*BFQ_;lqi z^fC=D_~Zw99?0`R`2LMgPsS;f*FoCBMG@U@SPtlRa?C~j;V4#!%mE^#2~tj$EMOMl z;+RenmJd>`=8(j;gOlt$dX*hVrofC{CtF0t3VTkqDb_X-SJqQ1MFYT~3u6b$0=O{Q zBxGH{P}U=aj66#zlt(Zevv=A6+<3KQLkheXR~|oQ=2{c80t$g%vVa+sYNJGPnfC2l zOgxw$@?fCg^uAbz5j+%PD8_~Wvp(EsA}%_-7ZS|9@7WOGzx~EvMve3JEpOYO00000 LNkvXXu0mjf0SO1@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodmagic/textures/items/icarusscroll_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/icarusscroll_deactivated.png new file mode 100644 index 0000000000000000000000000000000000000000..d16e87e04373ef1e329f7359fdc428718a6b2d29 GIT binary patch literal 622 zcmV-!0+IcRP)WFU8GbZ8()Nlj2>E@cM*00GiTL_t(I%f*wwYg2I) z#XtA^eJ^?GOInS%h<}BXi<1sc{)pn*xmZMMsxBH(gcg4hovKAF7KciyS_F0Ipp*ZC zqc|x9V(d#^-uL^iL!cVcOdY)I6k3 zVd+yUV+mFoM|5Up4&UoyiV>)iyOf2+``p>w;O3dycm-cKuIkAj-)MDORJT?E_<8IC z2S2Y-zkHEf=g(0t|AooFA-;cF)5Gy0)Mcc<+ZdGGLm0;xV+rCIa^?BUXDq(y3|pw5 zs_N{eYp8eRE+d*cfT{yE_ Date: Tue, 1 May 2018 16:29:19 -0400 Subject: [PATCH 189/493] Made some WIP additions to the Scroll of Icarus, allowing it to pick up mobs. Lacks costs and may break. --- .../item/soulBreath/ItemFlightScroll.java | 210 +++++++++++++++++- 1 file changed, 205 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index e10d1297..9d63d703 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -1,15 +1,26 @@ package WayofTime.bloodmagic.item.soulBreath; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.function.Consumer; +import javax.annotation.Nullable; +import javax.vecmath.Vector3d; + import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,6 +34,10 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshProvider, IActivatable { + public static Map> floatMap = new HashMap>(); + public static Map heldEntityMap = new HashMap(); + public static Map heldEntityOffsetMap = new HashMap(); + //TODO: A lot of this stuff could be moved to a toggle-able variant public ItemFlightScroll() { @@ -57,18 +72,62 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr if (!world.isRemote) { if (player.isSneaking()) - setActivatedState(stack, !getActivated(stack)); + { + if (!getActivated(stack)) + { + double drainNeeded = getBreathCostPerSecond(stack); + if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) + { + setActivatedState(stack, true); + } + } else + { + setActivatedState(stack, false); + } + } else + { + + } } return super.onItemRightClick(world, player, hand); } @Override - public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { - if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) + if (entity.world.isRemote) { - if (entityIn.ticksExisted % 100 == 0) + return false; + } + + //TODO: Do check to see if the entity is levitating - will only "ensnare" a mob that is levitating. + + if (player.isSneaking()) + { + //TODO: Release entity completely? + removeEntity(player, entity); + } else + { + EntityLivingBase heldEntity = getHeldEntity(player); + if (heldEntity != null && heldEntity.equals(entity)) + { + heldEntityMap.remove(player); + } else + { + holdEntity(player, entity); //Hold the entity so you can place it around yourself where needed. + } + } + + return true; + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) + { + if (!world.isRemote && entity instanceof EntityPlayerMP && getActivated(stack)) + { + if (entity.ticksExisted % 20 == 0) { double drainNeeded = getBreathCostPerSecond(stack); if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) @@ -80,8 +139,149 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } - onEffectUpdate(stack, worldIn, (EntityPlayer) entityIn, itemSlot, isSelected); + onEffectUpdate(stack, world, (EntityPlayer) entity, itemSlot, isSelected); } + + if (!world.isRemote) + { + if (entity instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) entity; + updateHeldEntityPosition(player); + if (floatMap.containsKey(player)) + { + Map entityMap = floatMap.get(player); + if (entityMap == null) + { + return; + } + + List removalList = new ArrayList(); + + for (Entry entry : entityMap.entrySet()) + { + EntityLivingBase floatingEntity = entry.getKey(); + if (floatingEntity == null || floatingEntity.isDead || floatingEntity.dimension != player.dimension) + { + removalList.add(floatingEntity); + } + + followOwner(player, floatingEntity, entry.getValue()); + } + + for (EntityLivingBase livingEntity : removalList) + { + entityMap.remove(livingEntity); + } + + if (entityMap.isEmpty()) + { + floatMap.remove(player); + } + + } + } + } + } + + public static boolean updateEntityOffset(EntityPlayer player, EntityLivingBase living, Vector3d updatedOffset) + { + //TODO: Check if this entity is contained in another player's map to prevent weird things. + if (floatMap.containsKey(player)) + { + Map entityMap = floatMap.get(player); + entityMap.put(living, updatedOffset); + return true; + } else + { + Map entityMap = new HashMap(); + entityMap.put(living, updatedOffset); + floatMap.put(player, entityMap); + return true; + } + } + + @Nullable + public static EntityLivingBase getHeldEntity(EntityPlayer player) + { + if (heldEntityMap.containsKey(player)) + { + return heldEntityMap.get(player); + } + + return null; + } + + public static double getHeldEntityOffset(EntityPlayer player) + { + if (heldEntityMap.containsKey(player)) + { + return heldEntityOffsetMap.get(player); + } + + return 1; + } + + public static void holdEntity(EntityPlayer player, EntityLivingBase entityLiving) + { + float distance = player.getDistance(entityLiving); + Vec3d lookVec = player.getLookVec(); + heldEntityMap.put(player, entityLiving); + heldEntityOffsetMap.put(player, (double) distance); + updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * distance, lookVec.y * distance, lookVec.z * distance)); + } + + public static void updateHeldEntityPosition(EntityPlayer player) + { + EntityLivingBase entityLiving = getHeldEntity(player); + if (entityLiving != null) + { + double offset = getHeldEntityOffset(player); + Vec3d lookVec = player.getLookVec(); + updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * offset, lookVec.y * offset, lookVec.z * offset)); + } + } + + public static void removeEntity(EntityPlayer player, EntityLivingBase living) + { + if (living == null) + { + return; + } + + if (floatMap.containsKey(player)) + { + Map entityMap = floatMap.get(player); + if (entityMap.containsKey(living)) + { + entityMap.remove(living); + } + + if (entityMap.isEmpty()) + { + floatMap.remove(player); + } + } + } + + public void followOwner(EntityPlayer owner, EntityLivingBase livingEntity, Vector3d offset) + { + double offsetX = offset.x; + double offsetY = offset.y; + double offsetZ = offset.z; + double ownerSpeed = Math.sqrt(owner.motionX * owner.motionX + owner.motionY + owner.motionY + owner.motionZ + owner.motionZ); + double maxFollowSpeed = Math.max(ownerSpeed * 1.5, 0.5d); + + livingEntity.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 20, 0, false, true)); + + double wantedX = owner.posX + offsetX; + double wantedY = owner.posY + offsetY; + double wantedZ = owner.posZ + offsetZ; + +// livingEntity.posX = wantedX; +// livingEntity.posY = wantedY; +// livingEntity.posZ = wantedZ; + livingEntity.setPosition(wantedX, wantedY, wantedZ); } public void onEffectUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) From 383be360ffd46ab3be0bd400b6789c1926706f79 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 1 May 2018 21:39:15 -0400 Subject: [PATCH 190/493] Improved collision "i.e. actually made a non-retarded position update" for the Scroll of Icarus. --- .../item/soulBreath/ItemFlightScroll.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index 9d63d703..3eac2ed9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -86,7 +86,8 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } else { - + //TODO: Add an effect where it "draws back" like a bow in order to cast Levitation on a mob. + //Only Levitated mobs can be grabbed. } } @@ -269,8 +270,10 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr double offsetX = offset.x; double offsetY = offset.y; double offsetZ = offset.z; - double ownerSpeed = Math.sqrt(owner.motionX * owner.motionX + owner.motionY + owner.motionY + owner.motionZ + owner.motionZ); - double maxFollowSpeed = Math.max(ownerSpeed * 1.5, 0.5d); + double ownerSpeed = Math.sqrt(owner.motionX * owner.motionX + owner.motionY * owner.motionY + owner.motionZ * owner.motionZ); +// double ownerSpeed = Math.sqrt((owner.posX - owner.prevPosX) * (owner.posX - owner.prevPosX) + (owner.posY - owner.prevPosY) * (owner.posY - owner.prevPosY) + (owner.posZ - owner.prevPosZ) * (owner.posZ - owner.prevPosZ)); + + double speed = Math.max(ownerSpeed * 20, 2); //May just want to call it a day and set this to "2" livingEntity.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 20, 0, false, true)); @@ -278,10 +281,13 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr double wantedY = owner.posY + offsetY; double wantedZ = owner.posZ + offsetZ; -// livingEntity.posX = wantedX; -// livingEntity.posY = wantedY; -// livingEntity.posZ = wantedZ; - livingEntity.setPosition(wantedX, wantedY, wantedZ); + Vector3d vec = new Vector3d(wantedX - livingEntity.posX, wantedY - livingEntity.posY, wantedZ - livingEntity.posZ); + double vecDistance = Math.sqrt(vec.dot(vec)); + speed = Math.min(vecDistance, speed); + + vec.normalize(); + + livingEntity.setVelocity(vec.x * speed, vec.y * speed, vec.z * speed); } public void onEffectUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) From 778838e2b004cd39768e1fb01885ff45f29ed87b Mon Sep 17 00:00:00 2001 From: cpw Date: Fri, 4 May 2018 03:26:28 +0100 Subject: [PATCH 191/493] Fix light calculation to use actual visible level. Should now work on (#1295) surface at night as well as underground. Tweak duration to reduce flicker. --- .../livingArmour/upgrade/LivingArmourUpgradeNightSight.java | 2 +- src/main/java/WayofTime/bloodmagic/util/Constants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index 27a39c9f..b9171625 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -29,7 +29,7 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { @Override public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { - if (world.getLight(player.getPosition()) <= 9) { + if (world.getLight(player.getPosition(), false) <= 9) { isActive = true; if (player.isPotionActive(MobEffects.NIGHT_VISION)) { int dur = player.getActivePotionEffect(MobEffects.NIGHT_VISION).getDuration(); diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index 13b43026..fd678307 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -168,7 +168,7 @@ public class Constants { public static final int POTION_ARRAY_SIZE = 256; public static final float ALTERED_STEP_HEIGHT = 1.00314159f; - public static final int NIGHT_VISION_CONSTANT_BEGIN = 30002; + public static final int NIGHT_VISION_CONSTANT_BEGIN = 30020; public static final int NIGHT_VISION_CONSTANT_END = 30000; } } From 6a56a13aacaa6960f18a6b893a6c2b4fdf8a7152 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 4 May 2018 14:34:46 -0400 Subject: [PATCH 192/493] Final push before 2.2.12. --- changelog.txt | 2 ++ gradle.properties | 2 +- .../bloodmagic/item/soulBreath/ItemFlightScroll.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index f449eb05..9a176a06 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,8 @@ Version 2.2.12 - Fixed Hellfire Forge and Alchemy Table's shape-crafted-ness. - Fixed Cutting Fluids so they now work properly. - Fixed the Fluid filters so that they now work perfectly in the routing system. +- Fixed the Living Armour Upgrade that provides night vision, so it is no longer as finicky. +- Proved that Way could update the version number properly without being told by the maid. ------------------------------------------------------ Version 2.2.11 diff --git a/gradle.properties b/gradle.properties index 3c89390d..eacbf839 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.11 +mod_version=2.2.12 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index 3eac2ed9..a4878215 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -287,6 +287,11 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr vec.normalize(); + if (speed <= 0.00001) + { + return; + } + livingEntity.setVelocity(vec.x * speed, vec.y * speed, vec.z * speed); } From c94af26a64f36da5a573ed078e4f70c07d75c750 Mon Sep 17 00:00:00 2001 From: Vegar Guldal Date: Fri, 4 May 2018 22:58:39 +0200 Subject: [PATCH 193/493] Require water potion instead of uncraftable potion (#1297) Fixes issue where cutting fluid is uncraftable. --- .../WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 7a5f5dfb..a323b825 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -109,7 +109,7 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, "dustSaltpeter", "dustSulfur", new ItemStack(Items.COAL, 1, 1)); registrar.addAlchemyTable(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT); - registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), new ItemStack(Items.POTIONITEM)); + registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER); registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.FluidType.BASIC.getStack()); From 32227afd9da45ab715397f5ffc5080295b61bfa1 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 5 May 2018 15:20:37 -0400 Subject: [PATCH 194/493] Fixed Syntax error in the recipes, as well as annoyed Nut with another class with bracing changes. (Wonder when I should change all the classes...) --- .../core/RegistrarBloodMagicRecipes.java | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index a323b825..62f6d717 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -36,12 +36,16 @@ import java.util.List; import java.util.Set; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class RegistrarBloodMagicRecipes { +public class RegistrarBloodMagicRecipes +{ @SubscribeEvent - public static void registerRecipes(RegistryEvent.Register event) { - for (int i = 0; i < ItemSoulGem.names.length; i++) { - for (EnumDemonWillType willType : EnumDemonWillType.values()) { + public static void registerRecipes(RegistryEvent.Register event) + { + for (int i = 0; i < ItemSoulGem.names.length; i++) + { + for (EnumDemonWillType willType : EnumDemonWillType.values()) + { ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); @@ -58,7 +62,8 @@ public class RegistrarBloodMagicRecipes { PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); } - public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { + public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) + { // ONE registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), AltarTier.ONE.ordinal(), 2000, 2, 1); registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); @@ -95,7 +100,8 @@ public class RegistrarBloodMagicRecipes { registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); } - public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { + public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) + { registrar.addAlchemyTable(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); registrar.addAlchemyTable(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); registrar.addAlchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); @@ -109,7 +115,7 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, "dustSaltpeter", "dustSulfur", new ItemStack(Items.COAL, 1, 1)); registrar.addAlchemyTable(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT); - registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER); + registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER)); registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.FluidType.BASIC.getStack()); @@ -128,13 +134,16 @@ public class RegistrarBloodMagicRecipes { Set addedOreRecipeList = Sets.newHashSet("oreIron", "oreGold", "oreCoal", "oreRedstone"); // We already added these above String[] oreList = OreDictionary.getOreNames().clone(); - for (String ore : oreList) { - if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) { + for (String ore : oreList) + { + if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) + { String dustName = ore.replaceFirst("ore", "dust"); List discoveredOres = OreDictionary.getOres(ore); List dustList = OreDictionary.getOres(dustName); - if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) { + if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) + { ItemStack dustStack = dustList.get(0).copy(); dustStack.setCount(2); registrar.addAlchemyTable(dustStack, 400, 200, 1, ore, ItemCuttingFluid.FluidType.BASIC.getStack()); @@ -144,7 +153,8 @@ public class RegistrarBloodMagicRecipes { } } - public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { + public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) + { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", ItemSlate.SlateType.IMBUED.getStack()); @@ -200,7 +210,8 @@ public class RegistrarBloodMagicRecipes { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); } - public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) { + public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) + { registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); registrar.addAlchemyArray(ComponentTypes.REAGENT_WATER.getStack(), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); From 389043dc64718f3443ea50182999aca8b1410d7a Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 7 May 2018 22:10:59 -0400 Subject: [PATCH 195/493] Implemented the Mob Sacrifice Array. Needs some cleaning up + added visuals, but appears functional. --- .../api/IBloodMagicRecipeRegistrar.java | 13 +- .../AlchemyArrayEffectMobSacrifice.java | 184 ++++++++++++ .../api/impl/BloodMagicCorePlugin.java | 40 ++- .../api/impl/BloodMagicRecipeRegistrar.java | 119 ++++++-- .../api/impl/recipe/RecipeSacrificeCraft.java | 48 ++++ .../MobSacrificeAlchemyCircleRenderer.java | 267 ++++++++++++++++++ .../core/RegistrarBloodMagicRecipes.java | 5 + .../bloodmagic/registry/ModRecipes.java | 3 + .../models/alchemyarrays/mobsacrifice.png | Bin 0 -> 27246 bytes .../textures/models/mobsacrificeswirl.png | Bin 0 -> 137017 bytes 10 files changed, 644 insertions(+), 35 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java create mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java create mode 100644 src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png create mode 100644 src/main/resources/assets/bloodmagic/textures/models/mobsacrificeswirl.png diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java index 3817725d..93e13c45 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -11,7 +11,8 @@ import javax.annotation.Nullable; /** * Allows recipe addition and removal. */ -public interface IBloodMagicRecipeRegistrar { +public interface IBloodMagicRecipeRegistrar +{ /** * Adds a new recipe to the Blood Altar. @@ -54,7 +55,7 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Soul/Tartaric Forge. - * + * * @param output An output {@link ItemStack}. * @param minimumSouls The minimum number of souls that must be contained in the Soul Gem. * @param soulDrain The number of souls to drain from the Soul Gem. @@ -65,8 +66,8 @@ public interface IBloodMagicRecipeRegistrar { /** * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} array. * - * @param input The input items to remove the recipe of. - * @return Whether or not a recipe was removed. + * @param input The input items to remove the recipe of. + * @return Whether or not a recipe was removed. */ boolean removeTartaricForge(@Nonnull ItemStack... input); @@ -88,4 +89,8 @@ public interface IBloodMagicRecipeRegistrar { * @return Whether or not a recipe was removed. */ boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); + + void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input); + + boolean removeSacrificeCraft(@Nonnull ItemStack... input); } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java new file mode 100644 index 00000000..e0ad6ae9 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java @@ -0,0 +1,184 @@ +package WayofTime.bloodmagic.alchemyArray; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.EntityEntry; +import net.minecraftforge.fml.common.registry.EntityRegistry; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeSacrificeCraft; +import WayofTime.bloodmagic.ritual.AreaDescriptor; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; +import WayofTime.bloodmagic.util.helper.PurificationHelper; + +public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect +{ + public static final AreaDescriptor itemDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); + public static final AreaDescriptor mobDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); + + public AlchemyArrayEffectMobSacrifice(String key) + { + super(key); + } + + @Override + public boolean update(TileEntity tile, int ticksActive) + { + World world = tile.getWorld(); + if (world.isRemote && ticksActive < 200 && ticksActive > 40) + { + BlockPos pos = tile.getPos(); + Random rand = world.rand; + + for (int i = 0; i < 2; i++) + { + double d0 = (double) pos.getX() + 0.5D + (rand.nextDouble() - 0.5D) * 2.5D; + double d1 = (double) pos.getY() + 0.2D + (rand.nextDouble() - 0.5D) * 0.2D; + double d2 = (double) pos.getZ() + 0.5D + (rand.nextDouble() - 0.5D) * 2.5D; + world.spawnParticle(EnumParticleTypes.SPELL_MOB, d0, d1, d2, 1D, 0.0D, 0.0D); + } + } + + if (!world.isRemote) + { + if (ticksActive >= 200) + { + BlockPos pos = tile.getPos(); + + List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDescriptor.getAABB(pos)); + + List inputList = new ArrayList(); + + for (EntityItem entityItem : itemList) + { + if (entityItem.isDead || entityItem.getItem().isEmpty()) + { + continue; + } + + inputList.add(entityItem.getItem().copy()); + } + + if (inputList.isEmpty()) + { + return false; + } + + if (inputList.size() == 1) //TODO: Test if it is a something that can be filled with Soul Breath + { + + } + + RecipeSacrificeCraft recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getSacrificeCraft(inputList); + if (recipe != null) + { + double healthRequired = recipe.getHealthRequired(); + double healthAvailable = 0; + + List livingEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, mobDescriptor.getAABB(pos)); + for (EntityLivingBase living : livingEntities) + { + double health = getEffectiveHealth(living); + if (health > 0) + { + healthAvailable += health; + } + } + + if (healthAvailable < healthRequired) + { + return false; + } + + for (EntityLivingBase living : livingEntities) + { + double health = getEffectiveHealth(living); + if (health > 0) + { + healthAvailable -= health; + living.getEntityWorld().playSound(null, living.posX, living.posY, living.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (living.getEntityWorld().rand.nextFloat() - living.getEntityWorld().rand.nextFloat()) * 0.8F); + living.setHealth(-1); + living.onDeath(DamageSourceBloodMagic.INSTANCE); + } + + if (healthAvailable <= 0) + { + break; + } + } + + for (EntityItem itemEntity : itemList) + { + itemEntity.getItem().setCount(itemEntity.getItem().getCount() - 1); + if (itemEntity.getItem().isEmpty()) //TODO: Check container + { + itemEntity.setDead(); + } + } + + world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, recipe.getOutput())); + } + } + } + + return false; + } + + //Future-proofing in case I want to make different mobs give different effective health + public double getEffectiveHealth(EntityLivingBase living) + { + if (living == null) + return 0; + + if (!living.isNonBoss()) + return 0; + + if (living instanceof EntityPlayer) + return 0; + + if (living.isChild() && !(living instanceof IMob)) + return 0; + + if (living.isDead || living.getHealth() < 0.5F) + return 0; + + EntityEntry entityEntry = EntityRegistry.getEntry(living.getClass()); + if (entityEntry == null) + return 0; + + return living.getHealth(); + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectMobSacrifice(key); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 8448277e..633e2a40 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -25,10 +25,12 @@ import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; @BloodMagicPlugin -public class BloodMagicCorePlugin implements IBloodMagicPlugin { +public class BloodMagicCorePlugin implements IBloodMagicPlugin +{ @Override - public void register(IBloodMagicAPI apiInterface) { + public void register(IBloodMagicAPI apiInterface) + { BloodMagicAPI api = (BloodMagicAPI) apiInterface; // Add forced blacklistings api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); @@ -82,15 +84,19 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { } @Override - public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { + public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) + { RegistrarBloodMagicRecipes.registerAltarRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); RegistrarBloodMagicRecipes.registerAlchemyTableRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); RegistrarBloodMagicRecipes.registerTartaricForgeRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); RegistrarBloodMagicRecipes.registerAlchemyArrayRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); + RegistrarBloodMagicRecipes.registerSacrificeCraftRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); } - private static void handleConfigValues(BloodMagicAPI api) { - for (String value : ConfigHandler.values.sacrificialValues) { + private static void handleConfigValues(BloodMagicAPI api) + { + for (String value : ConfigHandler.values.sacrificialValues) + { String[] split = value.split(";"); if (split.length != 2) // Not valid format continue; @@ -98,15 +104,18 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.getValueManager().setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); } - for (String value : ConfigHandler.blacklist.teleposer) { + for (String value : ConfigHandler.blacklist.teleposer) + { EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); - if (entityEntry == null) { // It's not an entity (or at least not a valid one), so let's try a block. + if (entityEntry == null) + { // It's not an entity (or at least not a valid one), so let's try a block. String[] blockData = value.split("\\["); Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); if (block == Blocks.AIR || block == null) // Not a valid block either continue; - if (blockData.length > 1) { // We have properties listed, so let's build a state. + if (blockData.length > 1) + { // We have properties listed, so let's build a state. api.getBlacklist().addTeleposer(parseState(value)); continue; } @@ -118,13 +127,15 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.getBlacklist().addTeleposer(entityEntry.getRegistryName()); } - for (String value : ConfigHandler.blacklist.transposer) { + for (String value : ConfigHandler.blacklist.transposer) + { String[] blockData = value.split("\\["); Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); if (block == Blocks.AIR || block == null) // Not a valid block continue; - if (blockData.length > 1) { // We have properties listed, so let's build a state. + if (blockData.length > 1) + { // We have properties listed, so let's build a state. api.getBlacklist().addTeleposer(parseState(value)); continue; } @@ -132,7 +143,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { api.getBlacklist().addTeleposer(block); } - for (String value : ConfigHandler.blacklist.wellOfSuffering) { + for (String value : ConfigHandler.blacklist.wellOfSuffering) + { EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); if (entityEntry == null) // Not a valid entity continue; @@ -141,7 +153,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { } } - private static IBlockState parseState(String blockInfo) { + private static IBlockState parseState(String blockInfo) + { String[] split = blockInfo.split("\\["); split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state @@ -154,7 +167,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin { // Force our values into the state String[] stateValues = split[1].split(","); // Splits up each value - for (String value : stateValues) { + for (String value : stateValues) + { String[] valueSplit = value.split("="); // Separates property and value IProperty property = blockState.getProperty(valueSplit[0]); if (property != null) diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index 59fb5dba..776d762d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -1,31 +1,31 @@ package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.crafting.CraftingHelper; +import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.api.impl.recipe.RecipeSacrificeCraft; +import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { @@ -34,6 +34,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar private final Set alchemyRecipes; private final Set tartaricForgeRecipes; private final Set alchemyArrayRecipes; + private final Set sacrificeCraftRecipes; public BloodMagicRecipeRegistrar() { @@ -41,6 +42,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar this.alchemyRecipes = Sets.newHashSet(); this.tartaricForgeRecipes = Sets.newHashSet(); this.alchemyArrayRecipes = Sets.newHashSet(); + this.sacrificeCraftRecipes = Sets.newHashSet(); } @Override @@ -189,6 +191,49 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture); } + public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Object... input) + { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) + { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) + { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addSacrificeCraft(output, healthRequired, ingredients.toArray(new Ingredient[0])); + } + + @Override + public boolean removeSacrificeCraft(@Nonnull ItemStack... input) + { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return sacrificeCraftRecipes.remove(getSacrificeCraft(Lists.newArrayList(input))); + } + + @Override + public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input) + { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + sacrificeCraftRecipes.add(new RecipeSacrificeCraft(inputs, output, healthRequired)); + } + @Nullable public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { @@ -279,6 +324,44 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar return null; } + @Nullable + public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List input) + { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes) + { + if (recipe.getInput().size() != input.size()) + continue; + + List recipeInput = new ArrayList<>(recipe.getInput()); + + for (int i = 0; i < input.size(); i++) + { + boolean matched = false; + for (int j = 0; j < recipeInput.size(); j++) + { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.apply(input.get(i))) + { + matched = true; + recipeInput.remove(j); + break; + } + } + + if (!matched) + continue mainLoop; + } + + return recipe; + } + + return null; + } + @Nullable public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java new file mode 100644 index 00000000..95bf3354 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java @@ -0,0 +1,48 @@ +package WayofTime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeSacrificeCraft +{ + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final double healthRequired; + + public RecipeSacrificeCraft(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double healthRequired) + { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); + + this.input = input; + this.output = output; + this.healthRequired = healthRequired; + } + + @Nonnull + public final NonNullList getInput() + { + return input; + } + + @Nonnull + public final ItemStack getOutput() + { + return output; + } + + @Nonnegative + public final double getHealthRequired() + { + return healthRequired; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java new file mode 100644 index 00000000..d4590a5d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -0,0 +1,267 @@ +package WayofTime.bloodmagic.client.render.alchemyArray; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; +import WayofTime.bloodmagic.tile.TileAlchemyArray; + +public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer +{ + private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"); + + private ResourceLocation mobSacrificeSwirlResource = new ResourceLocation("bloodmagic", "textures/models/mobsacrificeswirl.png"); + + public MobSacrificeAlchemyCircleRenderer(ResourceLocation location) + { + super(location); + } + + public MobSacrificeAlchemyCircleRenderer() + { + this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/mobsacrifice.png")); + } + + @Override + public float getSizeModifier(float craftTime) + { + if (craftTime < 40) + { + return 0; + } else if (craftTime > 40 && craftTime < 100) + { + return (craftTime - 40) / 60f; + } + return 1; + } + + @Override + public float getRotation(float craftTime) + { + float offset = 50; + if (craftTime >= offset) + { + float modifier = (craftTime - offset) * 5f; + return modifier * 1f; + } + return 0; + } + + @Override + public float getSecondaryRotation(float craftTime) + { + return 0; + } + + @Override + public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) + { + if (!(tile instanceof TileAlchemyArray)) + { + return; + } + + TileAlchemyArray tileArray = (TileAlchemyArray) tile; + + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder wr = tessellator.getBuffer(); + + GlStateManager.pushMatrix(); + + float rot = getRotation(craftTime); + + float size = 1.0F * getSizeModifier(craftTime); + + // Bind the texture to the circle + Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + + GlStateManager.disableCull(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 1); + + GlStateManager.translate(x, y, z); + + // Specify which face this "circle" is located on + EnumFacing sideHit = EnumFacing.UP; + EnumFacing rotation = tileArray.getRotation(); + + GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + + switch (sideHit) + { + case DOWN: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(-90.0f, 1, 0, 0); + break; + case EAST: + GlStateManager.rotate(-90.0f, 0, 1, 0); + GlStateManager.translate(0, 0, -1); + break; + case NORTH: + break; + case SOUTH: + GlStateManager.rotate(180.0f, 0, 1, 0); + GlStateManager.translate(-1, 0, -1); + break; + case UP: + GlStateManager.translate(0, 1, 0); + GlStateManager.rotate(90.0f, 1, 0, 0); + break; + case WEST: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(90.0f, 0, 1, 0); + break; + } + + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); +// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); + + GlStateManager.pushMatrix(); + + double topHeightOffset = 0; + double middleHeightOffset = 0; + double bottomHeightOffset = 0; + + BlockPos pos = tileArray.getPos(); + World world = tileArray.getWorld(); + +// GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1); +// GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); + + for (int i = 1; i <= 3; i++) + { + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); + translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i); + GlStateManager.popMatrix(); + } + + //Render the main array. + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); +// GlStateManager.rotate(rot, 0, 0, 1); + renderStandardCircle(tessellator, wr, 3); + GlStateManager.popMatrix(); + + //Render the swirlz + float swirlSize = 3; + if (craftTime <= 40) + { + swirlSize = 0; + } else if (craftTime <= 100) + { + swirlSize = 3 * (craftTime - 40) / 60; + } + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(mobSacrificeSwirlResource); + GlStateManager.translate(0, 0, 0.1); + GlStateManager.rotate(rot / 3, 0, 0, 1); + renderStandardCircle(tessellator, wr, swirlSize); + GlStateManager.popMatrix(); + +// GlStateManager.popMatrix(); + + GlStateManager.popMatrix(); + + // GlStateManager.depthMask(true); + GlStateManager.disableBlend(); + GlStateManager.enableCull(); + // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GlStateManager.popMatrix(); + GlStateManager.popMatrix(); + } + + public float getStartupPitchYawRatio(float craftTime) + { + if (craftTime <= 80) + { + return 0; + } else if (craftTime > 80 && craftTime < 140) + { + return (craftTime - 80) / 60f; + } + + return 1; + } + + private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle) + { + double verticalOffset = 2; + + float primaryRotation = 0; + float secondaryRotation = 0; + if (craftTime >= 40) + { + primaryRotation = (craftTime - 40) * 4f; + secondaryRotation = (craftTime - 40) * 2f; + } + + float translationOffset = 1; + if (craftTime < 80) + { + translationOffset = 0; + } else if (craftTime < 140) + { + translationOffset = (craftTime - 80) / 60; + } + + switch (circle) + { + case 1: + GlStateManager.translate(0, 0, -verticalOffset); + GlStateManager.rotate(rotation / 200, 1, 0, 0); + GlStateManager.rotate(rotation / 10, 0, 0, 1); + GlStateManager.translate(1.7 * translationOffset, 0, 0); + break; + case 2: + GlStateManager.translate(0, 0, -verticalOffset); +// GlStateManager.rotate(254, 0, 0, 1); + GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0); + GlStateManager.rotate(120, 0, 1, 0); + GlStateManager.rotate(-rotation / 10, 0, 0, 1); + GlStateManager.translate(1.2 * translationOffset, 0, 0); + break; + case 3: + GlStateManager.translate(0, 0, -verticalOffset); +// GlStateManager.rotate(130, 0, 0, 1); + GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0); + GlStateManager.rotate(240, 0, 1, 0); + GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1); + GlStateManager.translate(2 * translationOffset, 0, 0); + break; + default: + //What are you doing, Way??? + } + + GlStateManager.rotate(primaryRotation, 0, 1, 0); + GlStateManager.rotate(secondaryRotation, 1, 0, 0); + GlStateManager.rotate(secondaryRotation * 0.41831f, 0, 0, 1); + + renderStandardCircle(tessellator, builder, size); + } + + private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) + { + double var31 = 0.0D; + double var33 = 1.0D; + double var35 = 0; + double var37 = 1; + GlStateManager.color(1f, 1f, 1f, 1f); + builder.begin(7, DefaultVertexFormats.POSITION_TEX); + // wr.setBrightness(200); + builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex(); + builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex(); + builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex(); + builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex(); + tessellator.draw(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 62f6d717..caa7f823 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -237,4 +237,9 @@ public class RegistrarBloodMagicRecipes registrar.addAlchemyArray(ComponentTypes.REAGENT_FROST.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); } + + public static void registerSacrificeCraftRecipes(BloodMagicRecipeRegistrar registrar) + { + registrar.addSacrificeCraft(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER), 10, Items.REDSTONE); + } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index cbec17ec..25d54dd2 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -25,6 +25,7 @@ import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBounce; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectFurnaceFuel; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectLaputa; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMobSacrifice; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret; @@ -36,6 +37,7 @@ import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRende import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.LowAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.LowStaticAlchemyCircleRenderer; +import WayofTime.bloodmagic.client.render.alchemyArray.MobSacrificeAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.SingleAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.StaticAlchemyCircleRenderer; import WayofTime.bloodmagic.client.render.alchemyArray.TurretAlchemyCircleRenderer; @@ -128,6 +130,7 @@ public class ModRecipes AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turret"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.REDSTONE), new ItemStack(Blocks.LAPIS_BLOCK), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Items.IRON_INGOT), new AlchemyArrayEffectSpike("spike"), new LowStaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/spikearray.png"))); + AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Blocks.REDSTONE_BLOCK), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMobSacrifice("mobSacrifice"), new MobSacrificeAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png new file mode 100644 index 0000000000000000000000000000000000000000..409c9eebee29a9918d2919e4c014b0fb5d3d4f33 GIT binary patch literal 27246 zcmagFbyOSQ6E?mH!HNbbQasQi#VPJB?oiy_-JO&Q!2%SDYx!WMxJx0F7I!FaE$&_% z-t>Fk_x%3+olVYWceAr|@16VHnP+CBG}RRd9zA&k004oKqO3LmfYCp}01g&t zjox8dsVK+-5C68jZ^cRIGq@g#hTZ^xNBZvz0y45F(I>Hel+@&~|6pR0LPb|65G&|Y zw2nFkKCj$eU2WZb(1!r<%FEW$$JU0y-_gf`K|x7P(}v3y8vqypC0QArfVsWUz$R0< zPj?j;d z2_W4oz)}RLqk5&}Yl?0kfhft}0~N{Jb;`I4@y{*%`UH-BRRv1mf5QY4;>-JY4l_~h8?lSLU2P6aVA zh8>zC<3u?ND*X728+vF&2ckDpZtaD;JgZ3W3+Hd75PkrnRiG6XE9cJ|40&Xcg%~7D ze9Y8dqbU1~t#Bi`JoAN@ogbVb4a6YauOTpZ8e&6_N$~^c9tL}k=xvsXv*84ao$ybT*39&n*la~ncL(Y=JqY{~gupU+?Np*s?)IjRxOw`;iKAMb-$ z3Fho*ojGo0`odM5;1cye?Z$~5e&}_-lm?h&*QlU|#Y3xCFg`6df#q92TWFxVY2JGb5 zTwE;493ejj+7zg;??)%9<)%nca{#%q>?!FbS}$Cns5_6v2QaI-@=R zX|*wIop@S-=5YTY;P3-`?}r9ubQ7BR%U|AjT@Moib#g8paYy%Rgw=;H!I~O3PjMph zCeDOML0jM>|Cq}lkZP=EHw2JK;iJPC9a_<7ef9;!1!h+EPS6TBUwt3q>G>7m;u`qZ zv~bcJYIFA)VPX~7_8vi_#%u3f$qa_bc>FMbtEFY;iplc`MH3@zj$LIHTchWZEI@%$ zrn#H=i)#nqz-m@k9i;R_Udc{XiHoVQ)iZSC_$4AjhE4*$u2LnwF-^ip+bxu+7SI|n zCPHb)1khuSe##r<0*FMWNL^54Qa3p036gEp3|R^1fK35@>RJbXk+hhN2|(2ddghEq zeIf%ud%ua#eW@l-gA}fU`7djUpb(j2xyVm%7OYan2v%@=wnJC>OE!%Fa>I6B4Aki7 z`JphmX6P(D28hxj{4#OaR5HSqiXSbaBr8}gE@sYlu8nn`#R;P@q|<;Vl8PtFt?w~K zn3CIvqgI|tmK!#98q_xj_eil1@T~ZSJ#M@Wt}D zmh9YshSF7WDtQ|#>~*sCH_TtIY5%5qR3a^bD~W%haFQ;SZMgvw9%xBDR>KmzhD1Q%c^Di5h->zO|4tjUHr}1GrUn&-|3f6d zy*zNy;R$;%NMCpT`@IZI8Z2GKKP|i!$z1z6N;-S3^Zq5tzjGM+!dpZsYP~T%Col}g zMycp9C9Exle-h?0uhy>wK`O`&kQ;zyqBC~ zz9T}Tje>q3a&y%oh8f3Zil&*iq?hCRaE2OAqnW36@8gD zX80pB{DcL{fXe`4Q1+qA_b(Z(NPdc&x3KGWcxL>st6tDDDgoow?M1G7!k&r{J0t?RjlQM)6k^~@B^O+?rF}a$H}{+ zdR3u@)kCWkvNi=%P&X5n%^0rn$$1;a9I`}$xm%xngsQgkH+g3(LHKp;g0dQ z_&@X(@%0E2tB4)Ll0zP?hSi$hBx{EvReM>XSAs(b^h5xsfh>+TOBk7hXI{$ERVVC8 zu@(O953g}L#;3#fEANB#fNoT; zxvb5mU_3Rf=DoI4kRhmf5SmpGnk2X8`ETJm#(>pWXAdj&j*_>^{zt`!wx3?2EU?9q zza=?bWym1~f$ZY!G?!hA^nCjOm$;H7NGd`qmln&dc@3=Y%dPQb=!(C@w8%h+(~CB* z`2fFNi8-z51S^C5QTTv8*dRN@zuyl6HzcPT#^#x0%6=xV?rMOE%1qH{2U`RhrM(U- z0}F#tq3v7A_bC=fL}Euo@)#&n0Qvcq+w)aN!r4&X7ul(r%Sp7q(v|UU;B6@wRZ?(j z(Akypfg%_O>*46_gGC$O3Omr6-rU_X{}T<&B7Cf`W`afgtEf?=5`PPA0nCI7DpG{m;M+tc&K`Sy!eQ!b|~o0kh2T*wAfm$P_TxL$ieS~RbPRWfe+8R z&R#}`wUD980YXfkSY|i_yOWQnp(Om1s?!4(Ao@Ou%7B}vLcXE;+bg>c>%%C{5o3;; zNx-inkw$xHw{Zmu6a$n=QyQc6r1<7eQrEA1xtqJ$2mYyj}zRnf%H!I6UZRM&#;ck!Y&yeYMGXr}`l^;WC zRvj)d_hh2hgYsWhDCk#x!?@ckC%fC*e{uIuSIS#gTl;#mmB*`Ff@Sc~STIk|_;53z zXT{ww*HDRJPz`p?ve`J#9dR;Swx@q7rN(oqpVtoPZ3Ka!Nmlj04gP+fJdqe?Ts{T6 zPOx*HUOQe7quTDB&cc~NvTAXqF5QF{w4^`m?dr@dY#0RjK+^Gr67inSHqZDDz(-Zq zp+A2}&y9&zE@yVO-Tx51B>xC}r+#I16t9!}CU8*bOS>6>8bS*0eK$)^&+_+(O?E$N zJHWX6Jyf%CuJjL-upTrO#JMw}BUm|oOZED9srfV4b&eA+o9XYdBHN^P3{877V`sc| z`w)o`;(CI6$tN0$w0vFXU<~gZYZW&QA$ZR#sdBg9-`^M1Pc;sw@mf0ocV3)5-zUa3 z48LZ?>7zD1*x@DmM?|vSyYD1L!AF=1i$(9P4vlt~0r=GQ{F|9!5yIx&9~=~SL`r~6 z0inW1=TN*~Q?;8PD>j`#=1{?sn32Y=e0cbSA82L(rxvGzc4OUl;&YeV^N!*7_a7~e z>?K}NE2#}uSELHJKco|{Ely0-BB!piFS0Ak&b{5+j=N7lGyPD)D{~X+jW2p)rdvX| zSm9H(y?#Nh3UemiR$>|F_r&sE6GdvTjdp{Lzz^k|5A87EMiaPq8k3QN$MN0jP1&2q z7CzWW;69Pt5uNG`FxGorEb_E`I_sk!863*C>m9iok>UC(!LfE${M*wNbKliCAwS3R zy*yBaOSEWbcWxRURALH?z-{7Vw_D)Zp0yAuQgZbbX< z3~~7Oc6a9$oxe>&9>Rw*h1`=7z2k){EDq%q866!B9>2fyf@ZpY5r&3{zYqQ8XVy`{ z3{Onx%!t`uZ|TDinm6Z`C>tHdK35y< z3Jo4EnYQ?B2aNbi4tnPNXa)3yItH%E2Zm->zlvTlDFK};xuHkcaQ)JsNWMLA73uhL znIt{xG2rHTyTP!$emrIDUY=JU)(JT;3=Iv5Bi8Y`T^TXn7#Asia}G9yAcjKR zy$i->xceN!mf8Xf>ZZ8mhn@uF&BqN=0gk*pl^vqNsxXPYCkivM1naMU{ot8r*I_FR zDbGaQ>d6wion9n;(w53=ReE~b2lGlpgy_jWV`ly1RXC|6+2}d;S*|ROM&v}Pa8j86 zi_~M3iq`Vs&d!_++xcUrN*1$#-|tR;zPUB$AT0U4Pkj)_-1j-?@~ijLj0$ zdoeG59fzPH$sqch?&Ohd*a21=y?DHPK zS%Q~Tj^0`p@85QC_s41r)%piUtrzcVb~SHrJW<#Q$YrmquB>!dDfb=8BYW6YN#VHC z#5}w3jJ&TXdcXPX;+Q<0o2o68&u3Yc=aNEO2#7ZdYv-=dig9c3GU4;Ke>~S@(HWsz zKlM;Ec)BcP-5s0%c+~nRRS=W)^vJt^bIkbm|(#3cVGIX*G3E5UdC*VMFqIM z3vxqOer|PoC}gaNDttUzxI4FjE&M(uW^g1rSWC}=8E#~E#GR}Q7VbKk<1X1AJoo;O z$@lgfd!3fEMEyEEceQ@1R&Dg*?bNjx=LlgXT$0;w>lDW*WaFfL7`FR><6EajqWNa! z@a_1=DLm9tivEL=tNoW;C}3988$<`!edTWbZ-}N^9KrVjABfu&0J^}nL`I|Co567I zo!#9`k|uS1KNDJsOqN?)uEQSAntO-ETS1xblqe|ZGGTQ*BY!f$PV~CSy6*C7biUDN zd)&8v>QvPu_x^gfGM+{ikd;m0Fs!i~u$3Me%#{lNi8>GZ_^NVq^n^d@lz261&NA)` z!BUAQ*2DLm^`=p~NA)>TVN-q!#6q;vqxQCg83N8|n}m{1QvCh<*G>4yg$Klw9uePQ z^C*nE$*q-^Y2qm`WlPj6J4`)WV}JHr*7dc3;Uq4~oMT8VHe*Cqp~EYdM2aNn2Fn!d zY+GhTQW_Xs9>Lw_%OkvAT+CmlMw?pV@o)00`{qZTDX&2^cd2$SfcxCS5_hfBQs27T z*(XzkLhqN_?P>#E26pc08yK-&aZzzXOEZP_?epT!FP_9Lf~QZ_kgjjUYFYkEIc(%S zxs$~9hP(}r4gy`a6*etv-IV%FVy+yL&;A9cQF^RMnK_4^qb#L@sKRE^(Dh=3h<^mT z0o4AbzP+WRBb?&&mbv_VpL6XuLHYTwIC<*_X zMB0aszS+Q@1KSCvkuQ<(|Dgwgd{c!br9qlMx{kCjk|REDbhY z!Us-RrD0Asp2gE>RxNWQ8QCe<3q{$S{<-*6Dvv;ks?CCjFH?Qh3fVmw&yqIfkYg)j z$(pw3VX?0cDYRck*<8Dm2M&MEWqI@(9>1NBKhPdmIxuL{oMSz5QqV@Rbc1fQr8h0yqLY0r}NZV#*$Cp0f^DdrTsBJ}9ty)2;mek{5USG78U(5b_H@06o z9;S>Al}%*Xes*{BhU&3OP7fHo4hD~^A3x5zppRv-_LKblt>P~kbYA(dIeX!~GMjD= zM4SQEaQBc4R0$Q5;bs0fGfc-cSylv!!H;kne3kDSL#+8#CYJMbWm7DL;4C!7-{Xpt zoviVkK?XL}?~4Nl{WuJV>w7&Xh(lesj!XO?d4%U6o(0cu+XhDR%v3ph2EbneR1_>+{H3z25sB3xdp=`z>c$UajTSp#wtWpPu{+&)cXfQUrOyD2^DlL2RB3 z?H$&xZ!Z20la7LwxGixUA{HXK#HTjBnm4WQ?IG-9UW>@E|rpvd-%yn|10l#u1P zdk8thTvYk!=X6np2J5>Y!Qhol1{G$eL4djILiWGKPwhss>aUeO*EE+o0NFK_ZgMPZ z1j0m~?dlTm zXpF9D5beo1GXlC65|m8ZaHbxz?JU^lXVsPy#{ugKj7tV}D0F_TVp$IzAVQ%6K$LdflS8HTFHs6Y&ucM0xTUZO1$P)c100L;Dl8@?TGGfmuFr-;~r!Ts$Hd)#f zJ0dSRNLe<_C9tgkLGv<$lUn(vR$wCo^HVJ88&#D6IUvORax+T1nYij(yF8*7Go{Bp zrnl}3BzQ`||27pdSSx(hSCVFsXWq#J!fIz!f!~;TO#rzn=dx-hQmLtU#qPgJ=m{-yI@dV5(5T}!uD02v$ zUoXaVI|>~g#;Q_}Ta|ZI0I)a8zKwu+Fo-FkmRNb5T*T1%PwmCe3$H`*uLH3!KO^30 z@by&<5kN(Lodo>HG4Irm4=<(y=!nS-M%Vww^`09qxhOrsC$Lz5GB@m3w7>6BR{7WT z{PCr(BR_ne_r)^YxNm$p1JJWD!R4>e)B>^LqVULz>#T?NlrYGT{Wp)uCU_=rGRI<_&?)mct>H}5~8V@e5OWqene@4U4^d@)!UF_zpSq; zVXUVRf2zLZebCOJCN|)epQ z3Ad3-uem_464qy@KWQIc3eMS&jzr>q{3BNz2kv@rH29hd7ThR)iTOgUe{MNwDIna(+?K zw79qC@m(l|DulA=4u&BTdNYmGIMDNK4j&vp2>;+Bm3=vyXYcVH&q9gE|%WkvS= zcYkBVXB4kD>81xcDk>bRtrdPBTYA59l_GwIZNUsr<^0*9^@~&lByQ(;+C%krhvIF7 ztB)Mg$h2piD)>wC2S^n;{B^8#{qI^i2+@a`9pX3m?Via6mxnr&kqs~Yz>uz)+OE_*O^s}mqB@7 zEU10sB5h26_n%6t6pIUwLc7g?3d|~2D?y>-_Z;}Q%wR`f+V65YRQ*T9Dq;`)0c38p z0c0LCIQLE#05wS1To#>hX_Z~8wd$Dj=LySCZsArc_LkWE)9%C=Etw>2Ryg?<=9RsE z90o}0G4ck5WAex}=w^;}IF3+oe!UgSnGROtuY8CnqxivzRYj<9Cz~#4;S!i%SW*n& zmm?O!oE=vwC{w?eWAFom0GaI?6F}pnUBKN}b9b9r%z9!{I5|LbPHJn1k*r-A{SQmf z>=-kehOTi#-k&;5d?D9c0(i#XUi&^xn~sl2U9F2}3WI6P164HeaKq?yA`8_Oz9*I; z%3`s0Ayy%u;R8wgWhuyJ-6-EV9MlzHrUG5Np&cPq+FhW!jpEqI@w&XW;YOt4+HLO+s3TJ$2gZ-rh2 zwUil4hdgs~6|JbDcQd81ahKBzw`zKN8gN8A27`_EOS_+A;l+PLhrbU$q)lA34911% z3+qWKbkYE+giAd{D@jQIik05nBN0+yr3X1pgs(&AZ#3tv^Xq)rK)1S1850+kf^LCR z_cB%5bZ!!C>jG$kqVD$(h_HF^QK|#2c)-_Tl*Xkh1c((VUajxK13qB0VjJf!f8M#a zYl9V>n061W*T1AdMGm&z7f=oE<^mQvk%!sqteaAlw^7oHC@SRiF#gxOifnnNojmvM zudz>F34Ssb%dPhrHziFzUup}B{B)UpLQpUK zb?OPIK2%6WET=T4VwYTqt@p_0j#`C9Lgdd)`RO&DHsmg_C^nm6=9O z9c`rvm1b*)jbm5k?q_F0lXT@{)2Y{-*=Hw&hpvxSU_FLltttr07x?QaR7qcbZ=6;d z;nyUFd}UVx>t_I`EZ;BjayF0Rwa7j1F<)m-*gi)RCrDOD#n8qJN3^9#sn!s$-} zmGt>bOu(R5R=#9LXD&`U1o$5(oBNNGjh`1<;@zKC18eRJD{qjcbV`2wZ7U}6%-F*r zXF5H@C4#`*=7@#;C0N~W=1M1iz9F}8IJ~mVjcS1P1-)(i7wZbHgSLA%xrHN43(g*b zH~dBvWPIqhBmqhJ!QXi^=nfrQhZ`oZpwsy#%m6c>nz^<-JQaA?o_u<3{(KG>)U>2k z{0%)(q7&f~G=Iagi(Ol|{=8gyyz^PVo1d?UZ+*VS{9%zyCOpjS^cp%}EdjWe&L5sU zx>tJt^GL5eFDtd3DFJTGAvFg0{nZT9_%ZXyMdDAUArRhCSyQoxEvdP(?`#_`)#Il| zp4f$k9oR=7%&5Q;__4*K1*#<3TM~yWR9a-|I-m0|9c6M0DO4tsMP+ zqKnY51@AGMO#jeshHB&h-s@GR|6|9b)+<-y0N z0$nZT%`NQzMmDUrK%!MvT=OYnMVTbQ zxWf!*#hC8bp>dIVqH6=Dm~aS6jjnEAPGzxy{;c&MBVUm$>1y!}B}@WGS<%cU*1C1^ zXH19p^#tA__&oOC+}pm}f1R&>n1Exms)4m^ek?$=b6HR5D+?j$=6;^WN^1qkFofm1=rQjG(t*AdIL=iQrMgNy*uGj_x_$|9aKrX zkq-|RnX5b2RtX(eGd$?0s-&PaE|#Q$fJ)v|wxH5^uUH?{BfMx54OuZH7ImLqiA>GY!Y zlQun@B6nF#ud^%Nc}(x4z$Hd7x}+pTCuK3v3;v@c(gLVN^q#}KK50AIAv}Ag({>4{ z`%mYohIP?4AOGnI2-Qw=#ZQ`W+S{SoDsy!iAk#8CaB|0j*8p`7_0U~4+ula-VJ3F9 z-D7FL0w^D?P+^6Cghya(?}$tV`V!%wyzSm)HHN9zW>0H<9>U+N2pWz&2b*APLKy+g z4cQ9%^v8{k8|UHp7MtuNy9&wM+y4yZY3yh2;p!!dE}|?wII^NHy4Nv5Q$G)DWkp|QoR_V6CkYOYuqG8*h_w7$EhNDR9Ktrsd@VZ) zEW$_j*vew}Rh0a!euX_@c!8DNMK|gB5w$Gpv$wjc6&D{wrFz zv5a>uJE}GK!bgxduCo$~8Q649KTwgmU@D6wNqj5Eysa48fLLH2(EB7gthuZ=l^NAr z0Q-0uJ-X#<*~@KxE4?6dG7DR3Hbd`K-ri;->J~9crilF4O<;ZP=&iha_je+m(SIhF%V!) z;Z3@W<+gI>(p?@fO)(7g5MY;!dRlAl6ZwaEqW?lIERWbRnL zhi7G159ic`*k43nSM)u@YFl$o8EqBbGoE95mO`1*+F{6`_}@g2@Q=190`6T%B|$7d z&IQaBBx~8%m@md#uR%|-yWQ(RXi9=*m1v3JJtX;L zAHW4R&rc_M1Ok1Lka_Xd`!IfM>N`O2`-7?3B&14r_8d2Bn>V;UA4*8or29xZ> zVZp}ahoGU5IWNa)yvb-FV9x*x?SfFih)iAHr(yrMX6uftFy)_-Yrb&O_+~fekge7& z-yUR?5llNyJN^;Nxv=EH=;^QK>0S=P7jRep(OG-W^<`aa`c#K+(uKt!aTcIe<)Ihk@-p&A|G-`{%lK~^BZ^HC1GeSnFk%x-gik#Rg_vBud_UhF$g9vb(R z^b9G+4ie-aTyx@HcyT{^&Rp{F2y@CEi{k#vyPCuLxV!QxM-r~x&~D&{oZ%;!i$8mJJgTqOJ5D3rN; zKbR^_`v`4lCQc5EVkRcC*>e@1zZ$^F_ zXpg^-rxc!qprUz~sDIUX-SH2CZC+Q(%tMHV0`tC^#|rMHdYcleu|HS%P(VxfDmF#2B8?W$E>aC>1a+gTVhP>5|w0@scUO16IZy9?;K6z7UJKKu+h%u3PH z(vLXw0|m?^^Oo;%NbBOD@;V3vAkT?7kYgWyiu|(tyYl!!Y3-L=W6|8SR~ ziHS8XjOIqHP%1R1c=N|4#4Duqec2=j^h#M>cY(EFnYmM6b^hezu>kC(YJHXs5Zuyy zK>n^$Ud9CyB*RXMPY{`yow7YvbGzY6O zkR{acLaEa3b-Z4LT_zqz^}ZI-aZQa4Bc;$t7krwc^zMH0MQF9D2-?;DOz6AtEVGXvH`Wf+9q}VklB+HB^E8vrJ>;@P$N9FlHnmaDef4gW8j=ds$+W%Zj z@1V!y2RhV=4pw@EE4{ZI`ZUsF;ny1;ySU1=r$Trj13VN=#Wcssf3IqLv!VQ*^8_iM zo?hxNVy@=!zTY$LV@g7{SZy+`N1ixA{M!r! zOU$AtO*FSRSo6cp{rR&}Z4vL{?f<3S=h$I~_&d19W%|2-a%rSDq55=xjqVi1xR+Pg@yA6|P%v`{IriLSb8=#F^$@k}n%TgJ zI(W2YCszzWI2FD?=$zcYefo3;Ql+Mo$;$K---770_B}AAXl2j4OohE-db*>q`j=51 zB%5-2Or=}7d>nTl+wK`c=SNW=UoSrY{cP5+sde3d#4xOu|C?oi=krtpbXZDVaQCjO z`tAkNEZPk64@eCSQx5|UT~2rKr>jd%AZgKnj|j3gE+)~npFUk{*82~gKz8SL6cor^*Zx`$`rZw0z zfXj^|ujErMD$MQkx#VwV^0tTCbqk_4pze%cxBExpa9S6<&~2!Q!!uAxYG=z|({O=ElD8Hq2cxySMj$Gw%c?dN>wb zO@$etPJeHM_7B*fQ~!BeJ0ODRVcIW^u0-Ig)G*xewf$IxGuwn=-LP4E7X2?sKj#@& zEPJ2yU&A99;GZV-P_+jYfYYa29k3e_GTMPi!kG4>LTl%fMZ_vev0@VRf3P*TTG!d* z1<8{DB=8{0?OaavJYI*6Dj`VT`ebeBP;Grm;w7l<71QRn_KgKlW zv@QIGvBF|I@Eit8Bk?S=#z5hq<-lhMb0G}E776AjuQ)+sSV*zkgT2i#uv;jCwY-i)-v+-Cs;-k&9*6DeMTYFfk5 zf%Ebo+ovpBRt9M2&Ip2fRIk4uY1V8qE@FBR!GAfLmBv}CK}9A`E*+uG;&@n@7hB!- zBnkeDA#EPaO4%R#mDuW~W!p2WzN~UQAm1Klh>}@Rd)n?^b`$*!9e!{=ODMg$r-U|_ z@j2qf^8q~1{Te@~7k=F5ra8GYpvg`aFskfVY;u~77d{_gz~f>6-Fw%R!iQ8b=w{8e zA@lY;$U*wuA?f%&-MNErd{5XQ?hPH6mLH|t0 zDcCw&X4Kn6{u4MDG=^`Ax$5vX)2tRZ;2*g0b=cOK6B*Hj%VCE+utnc8H4g-jYGIYSOLR4BA5#`nBs3w zUVYeslm27Bz>ejobBbSkj$P_2wUC`Jz(JI?I64m*8RL7%3L^s2Ue?zAap`f`+*L01 ze@Uf8m~-fIcUU88l-%-O^y3AuHIHKVsqES`uNjs5l|Rd^=yrQJ{kfYTuWG$G9Sh97 zP}k^OL`(L7B5{#cYS$Kvp%ouR4w!9ASCIoVsT)@y!wS5-9$0NSur)kSIR2GZv4v!= zu|3g`Kn_6#Z(>>^E5>jm_GYdeeE4I5v22@&de$08*?2f+;leVMh?TK&Y!A3R6 zG^{l|M9>BYZVsxKh|{|t-F#pc?n?^s(vS@fOi2M(rU zzpe4l?U+B+oqTB4h{=l;6XSF%YZ~(t;d@p+9xR91{&k;oC?czk;*^Xt=1UT=O0gl2 zzqPm#uEj$EKWW~lB8Jz4I2!66a%ZddCUFi!_C}MEG|kB;5N27l3%PTHT+3Vf+kurF;&X)j>D!IV@8Sy zQUWnoo)l9(=Zud~LakG&gG}g@k48RMf`$7TV-6=vr0h~mpMh9cS{*kW*&W)_=}rxQ z&pZ~3c|YJ}T*8f{NBJSMUp4AA9j@1O#X|A|Fp%~7wN~xztem+Og;`O~^ufx}D4W#!AjH&Uuqg>u%)*m2wG#JPb zqu1|a190FhoUW$$7PQMafRgl`O~O-L50`usp|@)EyG5n146lcK!z*ynd3Y`j-R;;< zZ5ruML9E-Yz%z`1_P184fbdt?hmh!kZ1d;F^!RX>U_Do4fSzJ_^vbf7@LldNqcqr! zw(`T3Z)8Zj2~7AQTYm$$eR zD#A^EN?lhL8u`u&rTRVzVxt79$*}9)y^R5|G$TcS9KV%zbqk0TAjD`QLGdjAp~96u z@zRJwUD83Sf-JBkekLBYarf~S+0KC|x)LD)Jl8|}3o!t;X1E_m^!y7RV`_|*B^;{X zj_p1CBybzsLyVP0LM$F?lpcucoSt*v!EOv$qtR2g^F|o|ezyN-Px%+!Eiph)sI#5+ zo-85G6>Oo0z1)F=dZW8_$_(UCy;QHc{?EC?shl9KvqSHsFIYD;`-T8cFLtYn6IN6A zh8`Clxy;G*IQbRzhxAoe*LgiXqFHzui7?gWX=#%!4)3v?o-HX{v;yRCHQa~f;;)DM z{R75V)BBhnsOMK0b- zkpQ{-MTz9QZ2MUvLK2yZ{aF-4@&y<6jXu>;yGux zZO29ZMY?Kslr^iL;7kQ3Z_l+{6{p$mW3J?W5O>*oL-;I{;hqeBXWf2--IG#NJ^*vk z>d>7&d&qNN`ZLqg?EPW+*v*t2S2`|2ZJ@WT>Txm90*J5m3cE;ySEN8Z>t@?ksdr3m zQq2UQZ$lWg3z8-3{-7C-@4>kqy{pBxyU+Xm6#-e`t3BbAW28bYCH_?#e+-1-=!M>Q zQSzEiG88ZJgxf;z87p|DMe}E12tS<3vg4!g2+4X!v9;5xVoz{7?Q<1$q3THc=A`!f(Vw9?-j zc9XLtWd}`a7r*ydsK8p0qVc-?!hOASMnD2rY~MNmZ+28u-M-ugpCIEKnf}PaaP|Su zFAo=58WqD~DFw7%->()4Wlnbk<7&Km)tmnwRBkW~M^&T@rPt+84FswC&^Csj0NSp8Ja(-^cDTB$!=Y2hN+hlV$&P_?|)K3tlUcew+Rb+K`=4 zpgV|;`a3e08A#mC++LiZC2!l)PSw$Sj0>^_8*Fh0)lFJr_aF;1VQo@0s1c^ivF9LsJO-`=VDb%6H+hqcGkD%fSZX%C zG-p2bt2tQ)@EQcWtj#=xX+&yGF(Csl1Rf>$|2fAY{4)Vmm2!tM{V^qC2KIM7-*$zE zP985&&Txx55B;Z($4ZBm83m-Z9IkpKlsk@>&$Z3F`Vo~-#n4NIeWb(3p)Xo6MuRF}AwilVpa_KMg?&vXUl4M6+|nBZ$*bD8Ef#ZGRqY9;76l)>icDSj zVIR++6*5Hn<>)03$;-{IRe>R>dJA8=!J$G!)%1@*0&wX9c#_wLEFa(Uw^Molng)?2 zV^Z$S$nS^~7k80;SMVy?Jy6oV1iD4!14f?C{!Nt)cYNDE0zvh(XGx;%kY-SmWQ7C@4$*yqow@^(d1z-ijk|XbDDr62u z0;^$)KwIhjFW%clnp`Y##_lTBj)7IUx1)aY04J7q8U5#i(#VO!Dy+5F$O|tC8rGlr zQjsD{t+6&$f_Gjf?{x2_u~Lh*SVVrfkibpm$k&4gYWtj=KVhO%^~U7J0keYRNH1aH zk4$5t7)b(`sq5dafbImGsRE4*(R+Jrv4OQ~9}+lCy9zkL_@-NQ_$GX;o+xX$C;;13 zlYC`BN&b{pZ)@{?JoDg_kSIY-F)+{I-lapN*)m`DzldM1Zp8QVoXiUsDTQzmd(a0U zVBCr{2K1Fw0B7b5vZ6Ua1&*8gsjqY~kjYjdm!h8o=1IP;%*};(c%-u!{BM|TXqru< zwf(>8FyK|Cc4?VW3mrAm5!!65-_UmKVtb@r?e8lQ4sUxL{Ol>YxxQ9nZiAo+3rL<5 z9_Y|3tE9nD@xu^@G?#0W#KFDeY0j=ko_izi{as2&XzfJ46moOuvj*$hmJ}r#b|Aaq zWlwIE&=&f+=zEy#Dxo!V+Nloe+Rp98!Pb1egGM7`rb5~&+cgtO91+bmDX-EfwuLsL zQ|iC5a2&}R3?&IgcDOPrppNmM(}+ipRaztHYxfyBM#NS3PbFmezK8JWO+@&BSfo$d zldXU)4Q#$62@=U`h1Z+9L!m$?M_9#qUOI$f;%`$!SC;aJfxOX^xKByFO2dCP z6;XR7n=v5|s{gMRpr$d8*;=Y)vCC+!VdGGz>$9&Q6?F0W>7i^@ALAk*PA~4aAgO=(1o-ihsq1uN)ED%D=uL z%h&B^`>_4ZY>8{rp2DokCVECUQe*&YIU9Q8dRf_?Pa_soww%R$K0}h}N~YAX6WxK; z$FgfCAMp4x`Z*wws!!IwXW6<{QKELB8bTMt-ihjw<>tedu4XcNVU|3X2d!i?k?WCq zTK{(*xJIlkefzDy_;bvS4ag(Yh*IZ>_&5Es665@KWizm_3k+Y@ELx z`CrcNTM6`VyiOZk5tMhPt5??b^59eLPv>#p0F*H$%*ahGVck|9iPnwl3v#h$9d0)s>^$k0?bOrFaspVpi>w0Lsa5R5q0 z^mh-K!f4bu8?VEeS}MDhbG^>pYNkyA>DS>lF&BSos>VYD`*7kyKyNttJLO{V{e z0lYSuA}%^;QXE*k|DpbGrgBAGOezfozFpL0SiE0v%JEW3%-(pw$T`z&L&4>)yV6co z%A9Fmvv8qFIOoxd0niUmxwUX{26>cHR5 zQNeThVH*nb&v*kb?c4wrB@%MXG}!FFrN{R=p%l?Kvop%U#Xiz~5gwo)>fsmZUq%Qm?Ge$P>L&u!K;Uv7e=cjc6 znXAkvX4M1uXKB0z8WuL6I!Xm>aR3`@!aR2`0S4g=gVR zwUUHfkO-vve>yE9IBXwV{E~!;hI19_Yr@DKugD)?e=b#~!E(<@^hlD~h5OYdtQnm8 zAHDA+bjZ+vz^DYwqLnOI~YL^pQ zl6d$R^4d*FGDWrb6vyw{S&DJuMR=-?>x+2(SOAqf?(uln^K-b6frLnL-XkbqOsFo^ z?KkvKg|ECT1Ie?;35hUaz-cx}87b1vigznAhyoGUUnp|9b}ByT<4cdM7Hs(U?WuK#jKZXXx$(m?7RhA+mnj^HG}E z_^S1)CKZb%+!w;_*d?$@S}9dVR6su8X4NFi$qto;JbTH7^osw#sZ&huP#~EoSI)D& zg?%q>K=Iu?*|?l`NUUq+;**}U#imv3Yc}=nqa*qG`SV&ye34kJw;=jV@%R(8th(26 zJ>g*VrTXIzC7sLBs1#d`ISQa^qIb-KPthy;I2g6b-P+a`{;Kbie7MKmxQaiB&bnht z{7ba|J8XTPUfB&*y{T>}0lwaNnO%2|OI!P8Pw{eN@@>P98qTd)eSIq}RwuI`cgtl> z3>0kx)u``UH~anAv|70cLZ`>WHw+(Xf)k_zKd9(f%*z=(V->aap>T^aYIi(93loZF~lcdBD z%!Ub*9JZtK%SidS0kz>Z3>9TVI0L2*=KW=IQlXw#qry2~Qgy`8Wf@sMTqQi0EI)w%54V$K7dD^q(qrD7 zBHVqCm=~*hI1=uk5R_18Krs6&B6hf6jz+7fs5sRVCcSW3mm#_FmsEh;X?i+5m2qu~ z2&1k8&ISBx_Vz>#FlMmBM^$|dGiK0tN`c!+xy#d==_-i_`2;I|;^bu0vuS@s0Nu}$ z6>qu9U5%Eh5_-#Yk0u7ot`5ECzQ(lb_ED>qih2T-!*tNFFTA;F)ZP2}muPwqPNt*( z-p5i@jIPTrY_|4E(;GiGJ+A%MNhsma>Wm>AG%fflc;Hm!v40sM9a%VIZU@w8bPETA zu5~TuH|44z<*kzr{F?NQr-2prDgGOdL-ilGb9aFAPPhf9NcM0eXvpem!i|tRzP3X`d7B~-b6(V59j`D%tzTwDce??o5`wt z_)ch^-EiWWv-cU%JRNv&NTt$-z;j!zB!EOl7o=6Pq(;Y=CQ(ju?SEH3p!=Sg)0j`V zIp6*hY_$?F0JqDg$M1pM$_7YrR6>PM0}KhRxBZsB6no|H-dN8I`{FLIm9b_Iqfg;_ zuUyc(b|LS~rEcGH%>=f0RV=%Edr6*`b0BvTQlK32r+R6ugmJ=(=vuz{7_!U=Iv5A8 z;UwO2W6uq@vw(9Md@kn(DFJEIC_-<0y^HE^>h{1TA*y3<8IG`UVrfZRYdu?|uwj-vXHJ z9!x`OQOoCzEY_#Tel}+e;10*Lj%HUSWfn=DaLfgL`_6&f7kg-o9d5_Kw`1Scyl&cN zwkP=6{%i)g46l~N(5&^Xt*@Udm`p@_;F=(FD{T1w{Cz=9CbIDLD2{MI95{&t&2)Hw zG#V1Q2Dl~=XCOhKGH!fNwMt?iXYR2YTTyUY;Lxm*-;f zP_6m;lm0}L2@ri$5==UtB1dAZ`%jS=b8r>v^(HF*2*2iOTwF&-2gE{vbb`I0MxpFD ztAQX_PawiK?C#uK7e+sSCpkF8cK6B zT3B~-o<J8~*OesV-Img)33AJBOxKAwubO#jiqFw4Q!WpeO4IX7={>s=m$4%($E!hRO}^wG!@s1%gm# zDJyV2ooFD4z(ZX}EKd*L9q-QcGok_HQi%>x0d9ukk42b}kMUeQ0VR z*gKxOB}#rvNkL-WaS8;hPFzD2555aBEaLa?-zUIPlV#Z{w&mO6Mc1eJGm-_|7OeDj zPxiJi?_8ZyOn7LuVooJR2Mt~JFFj5Zr%a!&{>n!dI&G-N?lp>3etd7WQeyDP_hm2T zr>_I1A$$xsv+D${s|m!; z-aTlE_IS#f@>C;;lhT2x^-6{U?=~38uL6cZ^&7(dY$Y$pYZyCl*wjHB8 zjQ)Iw858@I7tbNbd?1GDgjqPWSo&bj9W_jQ`y4`)0m(_|o+$0&mpgq)8e{h>kmzkP zqyh*ylRo(iaHb5TAGbq2iJuF$G5ZXb>o#}%NNHj3BBJd{Jt2hgUGmc?Sz9Lmo;}`!e>&b_HG|J@(KYDvR2 z1FvINAmV{zjQkldV#?|~r_NT$LQ{HZgul10@31l4-ticb{ifj>G$ks7yf<$APYC3W zoEDJpHNlYchMPVVOnS)zIL-WSMRS`F01 z^ifEE8u-yk*z6-h<^tV&s&Y=F=<%upPaWJ6u#m0yTCMcg6NW)EHGbpj?$%gYDj3E@L>L)+^h*nOXn9r8WQZNJs|W`qzh(owUOv#%trE5k}-rNYC* zOX^LJIpvbcUj6reodJ{G@AlJbUb@!ESLhwex-I2wjaXH^Zn&oD^$t?ob9nSkeUTt} zz^7WLz5jUc9_;0`wVAOh$0glQ3hkQ}G;9BT{vn?bMKp1Tx17(nWj@mfw=?)=dGIF_R+k53~y`d)R9)B;`|dYxu^Cjs-eNP$kR6>J=Kb>4>N9chG(4Vj>U?lki zH|S27=c)8UQt2AS&CDWsHi}o}&so67dIBOOXc$O;4qWDiT~+d{_k{>9(y1VtS`7;G zj620$U^<#X-1&p{4_dRm?0qa8ItQmd_&d zB=4E=oqOdOgDWXq#%K!sYWGxilAh)51T~)08e98&`m_Z zM`D47^8@4MvtVWX?glA5g7)j@i2nu!T@cw6rJsLGI8q91nth0QdPEE<_T`x#Y25sn zs}%4Ep?J$H(k@dZ=Fx(Ej={A}NJOc}{UWQ+7pRqu})lU~9fAu`P zoZ-dIiunr&Z(C2Fq})?YmZ`gO=0j~;wcDe5h-_BKWvEO8qs~AIEa0My=5BBo4PR6w zBk+*g%*1Cx5V$>T-b@`5iJ<7>!vLQbUpHQ#dozC9<~n#W+=}2u+G;bJtK9W%gxEFxpY@@ z%-^Mr3(W=eMEcwCD(f=%yN>)-|GcU`v0-3I_5ic!O-9u8>%m`qsON9f?~A<-ouaXY zfKPfh&NL9+v!t8mB#>!``f6TaE|pw~?fez$-=$S=FNO+!Xu42rYNBBXCDA~Mux59e zZr`UAxJd;Z!cqG<#kNhN#SGgu-(Oa1x*}?`!e`}RE*xkyomH9Hq^dGn>M<( z!g#r=qx;7Cne!`QjNl)+Yk;^7pTaj?d2I2xRk6PI57jLrtpz&7m=w9c0_U=lP}*pZ ztmeZMv&r3;Pq1e3x?7-x!Z`6np2muEDCb!P#bbPh1s;%w@wec~PSNcnj>g(!S>eI} zyaEF?qFzwiQF&kRQf#?8vR3pW9dmNf#;~;^{n5$x({iR{2ATOFa6y)Qs1Alg$T3b8 z1EEW?M?!G1yDg^7P>_^yiR~6M#?zS}@GMH#ZAIWha5?}(1MW-c-Iqw%=VAtEd35pv zq%$;yA?pHhwf_s8nO{zM-x&e-tNSRj%3Sng6jQE^Wd0iLD2y*5t@p!jAddwwyudwS zX;$OZwg?TOGB@ZtU;kja#vFqbNiPm-5~Ar5C%a8+QARNX`;Idt%Ez2h=^brIP55uh zjb=@;n;^03=5j)1>4CGreA^x7 zpl++RB_4?peL>$Gm`nP;6)Y^^4<*O=&>skc7-q<}?P{}^+YJ>4zI4c$ieql_ME#Nr zS^@R>_fult-%r}N=B5d?-xxkP{C5B=`45U=?49B#QdNZP8%ER0!ImCy`D}`ahO>Ll ze|$_Sycx!#uZA@9ehuWnDt@VnQGE3=^KOzjH7A8+V82~JD>sCFV@es!FqXTqIca-M z8I}-tlz)z_u3;!CPG-?yyG*2Q%n@jBw8r*`p^Ij&@}bdL4=!7*(CWg#E^A7pL{gQJ zo{G(56mOoZ3fzfx+otO>YJUH9ZJn!LS+~aAVrF+Zj2wFV{+4u4lM56ac+!)GmMt6f zO3-jlHTHbQ7$o^?Ch+Y}OqB^${riKj4tZ}>VTmj$&(UB0T*EACIy)7c`cj)T*upqx zvLybI{=OB(sq*su7%OeXqJk}n=co%Js*OD>u~RyqwSyc;RP;r(CL&-krUBO#9P$of9tktW<4sq+s^tkDIDRL;`G3SdWm z1V}hhVg#sT|FLib(9kFKXK6;#;qxEujCiZgAYSuJA?D+Ex zz4_Hp#+93$?6-5vd1y+*-@yd{Exs)?N~Y#RB+i=P-_|vkz)=&PW8;;&ZRx zg5xccm0~RrOuzEM2mZY48m<<6zBWICA&jpP+CQ^iRW1T_Kj~2cpTAg9YZrv3?&XkG z)t)lf>40+n?Pm7f<7}V(!}De$s(NK~8gtSp%b(<>XXs6U5nEMh=squVn7nsg8Vaqj zBh^7R1vT?6f+Rw^$2Hn1_Q<YOUBP()G@$McxcMx#Ym)u_j?LV%Cgeu+UhcxgT~-$a2Qa~w%`eU z*s`Bmnsisf?Lb30k*14Xjxw2PTx;WBko(|8SIu1`^)@r`MpFP50=Ias^6qkQO>q~) zLa5#PS7uB(^0bmRsK}TVpPtRyP(bNkgAy%%6W`;e;av8sgddgi7^YveKMucMe5&$W zyZGR%_|xq+ci_mWhWTv1@({yzcwCHK6+`dS67}Qi^IU#~z{ZGV-siT)`U?`I9sr*XWz3TB89nF2lzUF0UgU zyb@m6y`)G0926u1^$J{y0w17U?t!S2yh0S0=eKD*t+HwtgiFJjfm@`u;vK~*J-VoM z9`Y8ncB>5D>cpGr?NulS_azF$3fD!h8YL!G+(L{F>nEhmJSQApQ_2H{RS25UZ{7Wl z*iTo8T}6v->f7(Oj~!oDeBhXi2Kpx#tWprY2UkpGrsKN`S9BuUYv3!NtgjadCX=NR zq&&L<7D$3W7tO26Erp(Z(SWew>7fUaOjJ=jT6PukVVkDQt-kI?gUZ*w2mML;_6U$2 zA9TeiJgRm`Bx9mjF-?+J^3L8?7GL6TS?)v&7t(4mDZ+kJR)0eGHFz}e&WF%qT&b8h z1TYg~xWet$XPQ|mpj8+2?TkSH)r_0GY%;7Qbz0Ha^6AFqV(4KDC>EyXwr?wrK8){y zcMqQ!XzKp0_CAzR$aydQdg^&5@azlz=jQ5VmQE31s-QhptV-w$G8L zA;>g4pfdjNdSPt{NdHk+%XKs%HfRr}(9wOlcecMJe?TUW6Ehxs{2J>miH;6B@(x3_ z(BS3uB&O&=5|D~doQkrZco>~A2wody-_pAM()6qxn4a3Pu3c@!+c!s@N1MQGXdF0- zKhvv;zVhX#j1HnXX>g3b$L3FN+^iF)GXig2P;16O-My@4z6|7YI^H8eX&%P^eP8m$ z)*J_0)G>54{%#fidt5(G%M5b<<2(xR9ln}?6&W*T>EC7o3ChVBC>!i$efyW0vk8?8 zlOA|YqP>)OC$+SmUQe<2n`qfC`hKF)ndEOB(L!kDCq4gf7=zv7Pwm%T*uf*xA=Tk& z>%mFo74F!Z``5VCDCkqQ;fqe}r)N{3d}*WZVXgQcNzkDm9~Ps>2jfW{rtjTL19J}4 z*SOU*$8KF^R#ZKVGSdiVO(7~p5hT%B@Mbvvw%%Yrz1n;*NMGy!nTomM5*hYLF-}zu zOw`PDq5YGwxnn;{M6f+;;Le-zY#0<@5%5G#>WLMsSfHk>kZMgHb}abK`XPOnNO{b6 zh6F?byqd4rtl1~CY4!VvnV`$dee=o#5gM>!q0?s9D1VpR%5|akI}HDgLD+#0Gb@U_ zu~UoFWWPAtRQpV`DANQ8mc)rWltQ}J+&tn%^h`pJ$+H5SI64~XM}O`Phq%%yf30u% z%Gv98Cjr^t-;6nqJ{Jigo@#=(izH?Q{c?V}L8>2dkOhV43y+Li_D^r$8J~Rkk?&E*6)0OGw8l#L(v6w?MKQL=# z;n`d*@-53Ep4Wjd>s#?Pn(ndGw_ErRTn#F46_4@j+W`p@{6(sc8y68a$lq%2Q2M+z zPmfT{m{OY{h!RC-1^({tWJ^(j&??>4ubMRGgwUIGlfxR$;ut8A>XjB+5G#aHw_2U- z6$yas0&2X1panzB+>nnMss)<1`ycCTNHL{+%rL&mJY`h%kIv{8j}1QBwm`K|;VnGh z2(=SoOno&S^d}l(Zxy!#vo8iwR%aF8zxCy7u73_S={dvFez7GV2|@Zd@*}n=fJv!f z2~UZ&bCXDYBvyib1hMe1*SXxVK9KC7&TvB$?Gq5b=7Uxy75 z9k}P@DD0b4*%vo=m-XIKZu~ww<9gbv_p`qC&3!zVJlTD1e(Sr*;55WkmhcSG5m zMg`4-=z?EL%Zoh)0yGgbo*Bz+*4=Z5$HXMB@^|%?5&a4M2^4Xbj0YHY$%5Gq*WFh@ zKcTw$k0Jl!1S}Em=k?&getD&3PsvU9YknRcKTNunj2zEIg66KxUKUShg$xVJ^_gcB zNpt>1nhc#z8*UpHS-w#u3*Pv~J7Tq$8caKWpyL3%o1PJ3L{^5XFkdK73d+=D$|2pEjgd;ow$Mh~|oW`_P_=;yP4TG|FLs4fAG8&wj2v zJ*>QVbTTg+zL&q(zP@!$E_@+Z>}___SN;hVnhkkUZ1l=#zUr0_BCNKKFuQZvfAWJ; zVpq7zFXDP-r_>sG%mNBb17<&Umx#mfY<9z zolA{T`BH_G7HJi}D7+u8WuaR7bQ#{35tT|4fVGgX8@0prv`U52L|dq0G&#dEf(4u-ioFEmzM10mm))~s#qHxkvtzcCd1a-PL&3It-eU9n#(ga@H~FEW zw7C~ggdNP90H2AQiIu2A{nT)*DrKR#(Cs)H3n8J~J2~KH3Aa?H@gKhCRcA35`^g|W z)=B((BXmYmszA;^>uxI?@yTMUN#8L zXH2wM4XLly{_f;dcd7SKh>c20KQu8X)1Q39rjxHh^AJ3gp44*ia5<_{>1=e0t#J$A!^94|a;HO@SUIQwZXQ7u(SC2KurikuU*c9-*S`EEmxFyl_*{KrhL z&IQ#@3uJT5z}NdtjWT%`DHo5Mea*I=+2B$tI7MT<7GF~BSaG^YYh`%NN^5{;;mygQ zs&wPsEMvnnHuufN=3m9%O&rf^D@ZDR>@q=UzkK@j^C#di!L=~L4L6a8JDCd=D0Fm~ zji!aNO7~V8_jNPlah22~ee~mq2=(N<8XgX(^i|Vh_&CkJGbXe*B9FxV+ zl)mxHEQ@nXvymzJb?<2H>!+a2ZXuDD2(geH&!ZQr)t{f%UKgqkVCeR9NmbB}*o$L3 zl)TVkoB9y-H}XQSSpfOicY=H=8k1&6Atdca3=dDe=oT?QrkkJMb>Z2LlkQ0_YNaae zn{bl{D;_Bg_u98z*Wdh=ShXLJ8t&p7F5`>)>ve*sOrRAa`P9d7aU71%i?!U$0=E!c z((o0T-Lg~F)}r?8iXe8}aT3v16(6J!z?aT5tqw=%ORK{EuXTWx3>dd0jPgS5~oxx)LX+Duw$OueJSz)E^4Ypij^tbcW&)ljMfy9ZfrKY zr~*4HDYtRatiXVXZ}&CycmH(6Ygnr}Rw9IfyHbAkm+FmOeQ~IyD*cn@*_&Gmpi6@9 z6K%`Lk69_hZJ|0jd?MZmz|g-C$Fcs{6^xMBaajT`Op z#~scA{0^TgoUM^p2n6&%G1@@erptCM4hCdKvOif~ow&jQn5fRYjd4A%<;hJCs2^I~ z`9f{Y@#+O70u)`BKR+uiB5CMva0WU8TS_l3 zGegHRyoZeoLiGv2k)_JeZaQF`6Z$F&mTBn$7mGv@MX4b4^M9L+o?3$#7%)PNW4T}m z%!0r=;vxAn?JJy z7^(fuY}ca-RV8!&bFv$B@dV8mx7DR!(8(ymvgG_J>A^^AHA_gC;6*$D8U-6U;Q@@4 zVC1YkT&R5t_uVyq(nAHV6F$F~<)D)6SUoQL1SjYuK$?59 z8BK;Oqci{kg}n#|=&exKExOl+rhW>Z z?(VNV{GMI`K*8sgt=}sL#=zHp&WtK*TDlH=uP^|B5l~ZgG_BPTN?{QX@(e26HgmAT>X+6v5uOkK zh9@#smyG|Tbim1$D<0;D)$8jZ$*Cnm%~ru-&DfnVh^X7{+sA)KIo-D#`BwM{# zB|>9t(dSm(Kg>0(x8bny#C37rJ-og`(kW#3o1mr0Xxpdvci1{5zV}_+_w9yZSk`H| z>YkKsakdPrJD4twSaj1EXQqeI6Rrmlj#sU1I6{k|%k8$89*yL)Nmq{H(nk3)`)B6& z_w)DGzXg60c&y>ElC7mqmFU2sSxR7FUZ%F}iYr2pd z5gLSpnuqdTN~EGF5U(EBeh#3qm_04{}eE#n7Z`$)+S1$cCan^5A{a>B`{_FvV%UC6Ms%m9%-(P2X7H!ppX;a-L zVv}l$n$9YtXy!9oY&9s8P%=pmpLgU(A4!Bl%{@|Z=x9`?I>&yt-7z1Wh?{N6n(R3` z;-WH(iq61mLis}gU~E$$8-2tgJk}c92}TlIdvcq!=qHxDll~E%vyTe#x8y7j8SD5L zd#l-;*`5=7g?16XgGb$G>;3TJx9Hx*p^$5ah1uv7WU6`RDC4Av!(LJkY7~lExu&=; z5Keg=C!ZnKjh%v(v!Mqy4xRV8x4TvW<>;PKjwZD%B%Lr|IP!52@l=3i3;RRIM-r|HL)JgHi;YY}u3x-4VHh!@erOuxPmiwhxRA}K~M7Z1eFmLa-M(L9Gw)n^_V63zVu+1i52j0)U#sc(wLBvX1 z)+#)h9G0iGixwi4dosbZdCJx%N$?7k#;bD;-+tXaP3?J$Pfm2?OZt&t=jzWS73Kcr zu;p(3fGNQTmS{6%+U{;hWyeR`Kkdjb_iPa+m`M5(ma}JYi7@7%*r0hI>_-o2H-^(1xTOtfI-xl`&`&# z+J*gbs*Rq_CG3|gky#9j9Oo1uDJ%pE7bzBTZ=mXZpOKE7^(=z8FNnIq?*1UY!nxU!G8Q>MhAb9 zYz~!Q`DRT%vGY#PT9^^`mUG|xgL51=8nA|mv;~ZS0FK8C zA6zjNTaWm{nYORI_DOMqK@aXD;kmO{ywkjA*LQK0JiVSIiD7YAe|=_(X=x5F?vfV! z6WIk;wSw4Inc)tr4&k zpL~j%BHs%DA~BI~fJ4U=%d>Bt=wiRNI%2J_1mI35zOs-QPtafXXe*3(q28&5|>*@1A)N*62uOzjiGAPA@+fO+y*=^6(bDa5Nw+>F*s zG_j<1EH(^%D?F7@xw=ROJRe&WR$6<0aU&+@?Y8vp^YFE+vivgv@lk_B%Y?`i@;pXZ zhT547E~0-p^;$d#^)pWFT;NwYZUjY;>4@aHw6+kAcs3>`PaM?76oLbAwN?j^@mA-q zc7{AMN~1u4g%c0lYDm~VrYd*rEEbS?n|zbqJR7MQJV5|DC)8PZI#XOs@g}8f9w3t5 zI%WF!!2mb}j@c)`ZZt=|h9jskw}bT|W%KTlje(SZ=zhe-2CyJOc;qNFj`Pbg4q%Dq zOo#d6-6chB5kOk_?-3D~n|Z=+!>qW~PgS~UNdbeamUsd=Xg2%L>;-DmZRt26jd=aS za74`_hg&oijR)v{;JNdu@}qjy!u~e_kUJBW;Qh*0;I0{;4&?X*u&9jR+b+!@@sE{% zirvG=zXbLS%A&>69!D<#P%9!lKz@uL_a~JMVaP82Y{j1001|q5H~C``StCF-bwJTX^`B@iNKQ|;y}=gjfT>aQ8jn~h+0J%F}dZ*3Dz})Z7wl8 z?nd%*tZYE?(F!n6LP$=YF&1AwzT23F!KB30_xK|N-qyT%pOTX%W<9N=&vziD!LLt9CgfWCp*9M_F zgL(>8W$drR6QizpH3uT3AJ%T#)@3KIGD^3l@^VK$@Xox~e3jI1wcY(Eq=7OD`|aD$ z|GW6^q~$?B;lqdn3LuCJ-d~F=>j|s~=*8!rfH9+AnwC@ix|=g#e(dA_eHZZk(Mp)D z-wncib1K>zgxxky2FnJSCHAKfzQq0b)7o(Mj3OmmbN0FsVp<2E1TT3ZDlxPZPE26M z?>`CKaBza*L`q(IG$Gk=m@RIz0RlePM>~UygKf-11}Xj+Qy>O^Z1_$Yeq$vxvQ8b5 zr5?2dxd!08F61eHrK`>UJP?eaZ0O=2LR#jHfapOquzTD_V9;aC@AF5wH)I2L>*-p@ zKj{0#8yEfCba7PwhT#DLGZUa3&SG7xuY>*g68xSpD)7#varVix7 zoP=_`jK$jLb%4on1vnwv{t-kuDd9n2qwg(m4XO`D#%PR1urKdfJ25sLYWK?zsx0juVBd8dQ@p^=L z;QkX*}FA^yOQJBw)Lg@ut4jP}a?OUQ9=P7QH z*sWP`__>E!s#2XVta<{rjY*~gw%s#*g}$4p5G^dAsTpQPJLJ4#B=~q#sd;lWg8Oh% z0D`ALBY734Bi`WML+!o}IL5odS-=f%GnsAnc2sPgU60 ztPYy?iySWOwzofghMB70kEfUt$qdjG<^p`60^NGt9LC{04aJpyOwN)f8|5MNzR4^o z=C~ftKU$oOw7Z`^5jZ??GVVD5&f%r^b5YIo_tjZ)YaJ*ho~mIT4b zSbg<&t*^`nP@GV)`+l11AcgsB4Jw{Ug&HQMoP5516xAB6xn^FMGu8NvaH+a z*fWN5$C`kM(V48*TlM5oa+$BXP^sMcYNm(0OdI!e3@CMjb?5nx8*sonv}zFb>nc_WlQLeU~}s1Fm@)I~NU}6#BBJtix+4He;FF!f>=9 z);-GuGylB7MadINFOO6GSyKi7+_`3hPJ{&XX<(t176S1~9+mq8agOOsR6VkW?Ot9n z+I^BeIScWTsGNP*>!v7aDHUOh<`D6G+DnU;ok!!^0z-|-s4 z%CZ?Ia*a;2uN(`QE4F-iLh^l5Cy?be90-7O~@UA@V3jH@A6}v8fP&O})@0+c>xuCVFmSi=P_wC|q11_}dz^_4532F=wUG z{t*{#LFt0OT3NFGuXtJ^V5RpszQ+%KOJkv;_VM)eqoXz#nGDvhm?59?$oIENEpe=O zVog1D|Ev}wf*n&Y`~R$?IIVs#mq$?3tDU@#W-(=QZ&&)N-k^a_SpbGi!ND(H`cRb{ ztCr&6F6D*qJ?y0uZ~VAss7M=c24Gebss;hK;wyZSA3z<(SdmW$OV zX12TVIPvsQP*0AhiOVO93~9bhvCs!?D*0bsSIQ6`{XKYk)D>U9%*ue1gFJwf*|yF7 z&7UkcA@@iJ2B0^X z3sxO-MK5ix+Z*fU3O*aZGm6tnYR$Zz2cB~M;cK!SS~o{CyopNY;=FN3%UXLo$JJi$d_Njy6?4mOj29F1sChv#^<1@Y z%;I^g_w(Psou{pLtl`(rZk0t-PhGW83C4AYKVyiDEZ!5=ri zGNO!M6$DKqF&fBwYqZTF8ZI%t+2p8etabnG!(c))s_&X#raiR`o$N@6GnH5mW#_VBkBvT<}Z zIbA^gJRqt(!y0aMh@d(SNjCTa3(dko;-%t62-^SrfW8tzO8EJCU`d`lla!O~480K6|Z|xahKH;r_0~UbloBU;QFS`MViLH%!=* zu{e^V&q(Ca{Y$^-W2Z(ING=Z#ll$~8&Rf$I_;}7f7C~?dJ>`I>fP(n!LM?w;-YM+& z-e%VDLHjV%lo?JQ^v71;%d0n$H0jdRs0TkXS?#7~4?S9jeSC(ezh9I$9)&+yAKA1S z>jaqqY(x?Pn*l+TS_N7}m;;zC{v5TW0&Dv7Tq5=BB&J}q&Qfxh?Ry>X$Mk7mJ=Q3e zk3WxwzIAK<&D2rc66=>i%Tm$ftWdJdEg1khiMPer;Fm$Yiziu5aBBwRy{}393j0kr z2e?RvWEgy9{BmV{OSSduLL-WkG4q=%`aTzPZ(WjvZF6^4CY8F+X3TOdmS(;tI_3xz z_pkBqtdenGz{UtqKfhYf*%s_~_$KRNJ{JW6C`a@Oi-{^k-ph`1pw?B7w#bK`qagQ7 zA1A*{SAG6H+|9rVFeZDbU#4nQ4&#tPz2tXHu)nzg#oU0<^5>W&!qlnjD=yc<-baCRD0@&u}E z+}0JTnLCy1aO>yba!>Q$u`;8o+NLKs2qW(S%5%}U_4u9MAkRUyA!==rQSJ@sqo>Ww zsQtL6=s4NMD1n`aRhf-+pn5p6ZIyWQ^jKcDntAaHUo2{f6l+`jMr zvP=}0{pBNZk}xXsY2I7a@=TotrmLEi_Zn5J&(w>cVBud}cobJpRwx~HA1q$6Z+QAp zA=d)z8(@G(wJfP&UJ{^VWOa@ChRNX>q!hgesx&+jq9=t6iu$g!BT$Bai%yIJeG7di+u6^E~Pdo z(s1}Wsv}`6!u}GuXo_JodGaWqu*-iFNEnFb#}$?PynCbSyNp^K>DInHu5Bs{V61l9 zK3fN4KbIThYO(Of19M$a5<_NEU&PgZ{#O5k@8gFil@Xi%El#Ij=QJZSBb-A%Ye!1; z-#crlrV#+q#p{DO+B=agf%Z;oo4qA86Sh_`f0 zsf61n7^2mmox3m-a~0yDhFVUX7=@q$e1@S`7@F$q1{NV!U6&H0jK$m26=-hQF2?eR z(HVe}a86!Eb2HIY|JdbCL#Es3p!@OxK$5f=uTQe7^Rw*Rh*Gz3br3f707u*A2_D^_5VC21f zL-P9phod9vs0hYoG-vZa*DxpxA)^9{rJK{{`aZP+f4Fd))W@Fcgr)&aIC=7t`~)WX zG%5nHp32ylvimn922Wv8+vxJskqS{tYixc#MV&4%g}HC5zzQ)gz#X0InR)mDXmS_( zAR1C|;d3oGh_~R2fWexX36f*3+4q0$e`-FYur%uca62xxc&i81;B$Msl_I?Rc!umV zJ#w|JVlU2yBSX$27KU{7ZIUmBT#m?2Mir=42&)sod-WvJnGE)=}{x!gW5Qe~` z2dS+?q1RV~>Ob#-B;eD^_1|-=BWQGaD>zwyQ|NY)eC5#67dpi`8_>k3qd(r2P9HLV zx9McFK40J1X35NWPrVVro`+-LO7iWuBAT?Q!1IzE@H;sdF&nbp$S=B&0yG7>_p4O9 zky$;cD3GZhAYd|rdPakKyL^UnDb$V0(L@6nv_=%gtJ89>^EBvAMC{q$_1KxRQZ-?Y zCptl7omQ;b?#0YciJSi-pXwJ@$yt*s!MR&X`G-&=4+{N)2+f*XXT`M3qK+Z@53##* zqj6U059(FF?krB(Mejd%Vz=_=-fK&p%D?&*%1GLyc4r!*R9mj%v@b3dPI*jd_^E%K z=vz(wW%6$ZRxeZ_C4lIQGjI(}e;m5)H}Xbxq0lPAvZy(#$A0;YB;-xDxKzplSuU$| z@$EEbJo80mxjW1gFg#30*tI@m0r~(AVTOYGs|oSUD}E>nYXiu2vFGmJ0f zs`aF538YgSTs{=IZ@^iMGo~ACy9;jGilU1+Y-DuFP>sY{JyzedfgOZ1vE10`ie$28 zBh}LF-Z`I-k}6OPXeT|Nvi>Z`;ERFy?C=VfEjBSSqV|rAN$g&mnC6C(b`gm&ecpdA zmO2Cc_nElJE016QN;1Pd@v&GP28j@qjW!OOc1`+$;4cLA*_wU|y0KM%vuMUv&t<>6A|^$zrthUlvz2(Yph1qMI6_cgS9gaTekqsj4>4>7lqXwB=9 zQ-_yg%sbtN7_!+R^BQBTieHYxf1GXLj@?-s*vNHlNEE5BIi%|-Xab6WHaaqRKiR^T zv41#7$z_jqn-y$tP#%Vs!a=ofy3&r^;=LA6dig!DJcEQYRz#iRs~i@ey@N|XPe!WV zW*+gM*8S%9ofPWsO%7#~#vR57B*_t@d+kDMa5IGJ7}?_KaP4jhl){;FLsEI`sE_En zvwh^l#o!X8J6r7%kBY6>7-dw5;waZ&(3e^gYp!w49SPcT0?O+48>R;r%<(ag+OrA^G|lZJ0{)Hliq%d5uxN7IYJ zr=d@ouM`c!lbP*7dV;Z7Bz}&a`S+I-mGV3Gs6lW1rE>&Z&2|6jd5 z=Ozd1ejn(8FH3nD7rcIw@5^`Q1Y>f#2b{e85H9Y6JJpA$vrH0WE0>y z8m7QK?!+Pe=hYJt)iGRIJgg%xbkV@t&BVzgQkhc0T8+`q!*oUe$y#<*WrPd-_R)*l;m1CXingt1C8#%5>TAfOH{}Yz?7m#d8c3oa7R1tcRAK7C>(OV4; zv>XY;Y!d&vP`O<(WTKA{z|_0z7|gtL79aj{IHAzyXoK~o+1^bfcWvYkUnOnTO~7_X zIRV6>p#ROc;G--KV$v5$)w8Ve*QXK|QnOI!22EFBq=~8Q_-F@Znc`#(HLEmnMoG3X z>>p$#q=YD4wQTa&EbrG(aoZ8d1}SaT4Qt0pwpcqy&dSc*_Y}}X*DM$_h zBzBOCWc|wPc{5RSFceI|tY?R|{cIrGmnRPMFAK7t`e`=S6Gw1uiEZS3jLQ?iKuZV0 z#0+lgMl3A%0Y*@!evp(>JlF~Cg-Qv9F) zCn!Qy@7(Tg!4WYD>WKOeLuEWD6dmvj4gDGXMSi6zTJT$}fm$T(9zXZt1O^mP&($3u zVck2|NZ+W|9n))gsc+$Qm2Vh&u(|g~G0G4VnDo_lRPb6*!`vN8TYh0?_b$DIQ+GJuaF*GS^^iYxUeXtf+}Qu zN#J3~^=O@-KhzhwPyg0e))1IF5ZX1_>+VCLeU@B=Hc$uL^W~Kgoz( z=6ChESQO?Bokuh(v5`Ub0kQ`mp#Inkh`>Yya*Eu`%q!v7WE5F^3GC;jmo))Ymx~s_ zghz4?QFQE^?lF{-rgi#1A1Ej3DMH+_Z5rn!7jSbcgzF)fuMuy6v+^^+rt7 z_q(#4zpjd!2n%R<1(qjONqD;6k zy2mx=JwZX^O=j5yc2~DniZ9pMD^cB-m#>>=3;M`YO@)VC(3R(=m3`FxEJkHEyto-^}Gn4+xFs{gPz0jYF7 zwf^enBcX;YI9U`$MGWsa2=e?l4+U0%G`p<-uLT(QdDK(>`<6JiucYS@@2PQRD;2a> z*-v6$bj8J0B-1557XvqqDMwlop9X1-o8^>n28d1rAsR;N)wToB2)f!gMYIMbiU}N| zXD=ZpXaWWTaa?z0duQCn%y+ECYlx{zcpqi z>Y6?&e2(t6P8Wp`FdKpDd|QMBQQL`y)xa2XU5NFy1u7(XktTcS@w5CKv4b%Z8EC6! z{0hs?&pd~2JLTRlJQkt-z%RHKE$yfp z$6TbNaeJS*DEigWBeA(LbpY))m^*McGh0ZW_=xlCFPTg~xpR7(7w=cJ!|a98aP`88-H#N%y@ zj(RzZ*na{1l#zJg)Se8Yyx&^rc~FrjdGvp)hxFJ`1l2-B(&{&y`6}M9PvnSrd-kZ48^FvVraQoh7=p6O%(r-K%lSaHYq3U1uq_7J~n z$Zr&9gqcv7E=U0g3g8?=RjAXyg}8kG)laJq#g>X=xuX^dol-5uuQY@FFVn!__Ze5R z0syy^qvI*(w6V*oD-$h;PEjwai>_S<&r5wssNc*(yc{1+f=^OUb+lTOUP736+AjK$ zQa?D&`F`(WJ34`?_PWB|)R0TL>|4-%+gDxo_$t=KnODvUVt%x^!h~~&#yOU{-6|E{ zTfam9I9|D(RI{=mYi_zts4&AuX`&(@jFG*A*d7hm(^dzQ@xOb`9xnqJ!?^eYC?wEWF$=n3J1MtjRnP5#eu zVpIsxqr}n-hxktHv(rA~KQK`n?gEf+@LLIT^ZVUA)GlT4Q%--boc~r`HRI5?)TL?* zGPF0%;n=0~|1aH1G=>v3O8n_P4P^ax2j6j@IIeuQW?w0d*uaCOKF^(@l-rizis+ z#JMVzxCIL3y`GT!-kPCCAzyFv$#?Rg5IVLxAsDRIRK!3)KYbIqDi_PZ)jBQW)i^F) z?HiCPnXEk@&P%+_gV{lbXo>QY)elnq^>=Oli&*^&=MRjt^V8E)qrMYGQnk&=5G z_7^RWPgFKZ443Db-lTTc`~SA&Pj4$$Ejfk0JUgf>cNKl3`ycSe{xLIiD4MJ62cBa5 z>edGti7rWY*v@~QN!}E-&AMvZoeRhY^qiy6uW#uYiw}gc&m=4nFq)7DI&!y(Y&c+v z%^?XYVTbs{lm#(+{rQCWXGO-PIg1=2-^eescSMf`M8`%*6aN1iY3(wIMj2^BDD~q18Wm}G{WPNABcVl;cWA%q04%lUuzq{X~k`LT9e99#Rws_E;Z{tUz< ze1`oZM62FhP8>OF1v3`-n|hazfn-X>_E^7eroApQL#($N$)<|6iwksJ@2i{xZqG)8 zwDIjlYYgj3nW61AOF=H3@L=pqWJEsk&G7CMgo-ZG%eAOyJNG&gA(n4__?)x_=1&TcYWNN_CGou2bxZe(_@=Bs69LaFG zU;dZY*km)~i8Q^GknGtc+Y{Cs(Q!e>QguKui&S$2a%xCt=9ZU~4X&Mr3|#7S;i;$S z>QiLtk6@vX(xR*W8XYjHFlqN4pwdF^OQK_GL&G`KpaU`Ci~I;Cc;LuJ!W}8FB-ax4 z-dN7ZCHau`P5ORKXI2>{$O^~!BJm*vHVf7mO+?2^W+LhKlR z-Sa3|Oc?3bW=075E;iI5bR-|8X8Yg9U<}y3Fvr&FWrQfB;Z_L>lB{=U1+u!&FUL!P&p?LVYA_$Y$=IL}t8 zDwurEfx>?pEAJUKI(!GPg(81QX>oi8kjA|Rj>n3m8hOEF<3Ea;Jm8LipDL^t6!Up; zRclynU;zBwD8%B%@IA*^e7`)8`&q&bq|!fmi=`}#KZUNrRJar2wcHD5A!My1fK0Y_{fR!NpzD7%TyCGOhbX`5-zZa<<{YULr@Q?o%Y=-4kj^Bd4 zrc9~cN2AV-s5Ab3N^&6?%4)~|ucnf5MpOCQEGm4}Q6I0^54q;7N)5t$vOP$I@S4cM>)<^`0RUpYYBbU4R-F`@RHjC`e>xvm-! z7Es0`bhK@9`G)+WN%$8*lm)@|-q&jazy@79k}8n5;jOY|kB(JHMNi~t`(BJ}1HjQ) zu|p{sAnyI|F{ci?o9dvt!L+e6P&$dd&@v4Gh`$HSWozt3_P>74OnOiFb|rfx3a|Ca z_%b5+Hx#4KA-asP2* zZN4Xe1aJwzMS<|pte`PhY`HeM+P(=R?QA8{Tn}6Ao?e56#!$F)V56jk`XHlD4Y`~u7Q*#PEG-_*j1)d=VQyZnVzH&()Fab?idIe9*?J zzDVQeu*&*j_fpe6H9~@Vb zlbJD_#pNqZ2{f2iwBjy1`u{BWF>it6P{5hh24K*UwFQs~jF&oj22LTxzJ*ty(p~s3_q4u}FG4$0Y29H(`lm|D{ zX+n>`B~p6*FKC|-&4>3cvr9M^1WNg8@_15CTXkyB8|MaoyEdZB$zxLhlWTCZsqB__ z72+yU*Hk{v6+}h(w>Heq0<0AgK^|tMAJ6v6Uhlj?7=nxIkfoK zMXww}Nxf4>Qn39{zUJ#QQM|}rN24Fbtz5sqePXV?u~OEj;5GWeXvrIs`tnT*5R`r@ zw$QXBS`U+9nW_5H_}{gO^TN$udB4TP6DE1^!xQJ}E)#$3R7=Q#n~dH{>mG-e?}XXd z3tZKN|0NaN^!yX`5`F)c@(DSlHLPMIjL|Lh7FX$)PPxYBS^3NOK=K*#est}=S|KYT z9{ZzI<8j1ajH85>6c48Ezw>)L>v##knYM{@us>)m2)W%VX6=@bpSkWn)6!FHX#U%7 zgMN+)Scs1PepMB9L>U0@O)=Sa&*3vFitBjKZ_r~QU%pc%#qP4~&b?43Cl@#Gt4;vR z^Z%r$|1S$_Z%@v_y#vozd5gY&etM(Oa><}9*(8xC`0jxcwZ@iqcKvCmQTV~XNA?`z z1c3-7)zSF#>+*amW;jk>0%&R6LTIeB^#t8DCI#~iaOGST+N-TV4 zc!kD1D;1$r09_AZ)1Mn$+7ctu-(uukBq8Dl9ir1jfPfeAOtKFN!P?Y2EvKS5;YaR?YqxU{Q@wB_clNQRdBK#@_r<^KrL-uQ|gt*aJ)>$&ncKV{!uX+Xk1==1onO2!=3L^($sy_ zKIOw5MYUHgI8B8tPaXO?2DXfpEn|?MXKiBj3+Ls`O zbLh!5n0^#cWYjfI^DdWw9oc>rT5(_yZ@nxim#k@yT zFCHM_SB$VC?W^Si$0m|_eT8)Mv5}HFn}FOP7%H)is(QJKH*rdxwTZtOdWLAcb0^;! zjRdd+8_Dc;QxPJx4J zZDGGpm+!B8al@k6VvEj%IL=;*9m*=SG;ECAHwKPxyk|o5QnY_Rr*oDS|4Dvhp*)E7 z&BhBW5i*E@@s$rPxz_|#7da%SyaNVv{h-sGaR&%%x9Kz?O$rnEUR7V4MGltHAJ;&8 ztX`v-9VB&1?Cme5T{mc0V{vrOaq&!9`z<11pdabHpFu1%Ng6a<37Ip?ZvBp?7K`kNPTLRB1U}3-%;08o!v-fQc#}W_w(%A2;KEKzQ4hL zkBSX<&FV15Wxm$Fv1hAmQ%uNF$da2h7!93Ex@wK>VYhTY%aLq)XFDpA==in$kX69s zOFU&b9XNFn>5U0IiM=pKlT4hkkjB7~+ES zzaVIp0JtVSiWF-cVfGMWP^=eTGlGV;58E$#>ucOt+ipctO-@C~qxKHpa4$QB0>I)< zNA=9%D}Wz-j7h_q;&}C(6Xf728{;s?+N}H;)$51hz;Av2$PFbS6UNAL+HLqH^!4Qg z`tzeG4PWGd)Ox=N`qTkA)A(%@aV40za`Q#mN4Hc6b52<+<71sQbsROZvl_J6UqOM*ZP-ug*l`n zN8j~`Gf|^n5P@J!A0G^@QuYWjJ{y<=unPIO@AitPMARWB<1dM%NxUlb1$R=nrGaqj z;!t1>GSiag11ZEtlEnXxez7m2m6f*mDx|B=di*vZM{xDm)nWB2HSop%s=F`>K?pWY zJFyk15U|b@yG0t@YZ{X`f2HUuBGhY*565gZzDgp{dZ4l%u3xK3Ie9Uf*nC_-f?$o> zB4kjBSCjUD2EDJErM=z`N8Dj?ctET|aE|eYPsa8=F!|EnVOM)03PsU;Y(cBRnlc+D zB`fiS{t%ZCtH&=ymzA=ItIOLB3bN{>JKlA~ORZQM%$(-IV1OTEfZ=4V6_=1z2|-1( zD`@D$MWtfG?f(6jMe0$L+8h4{u3?M$pIo0o&s14%)cjl1zOem~VrGoPZ{RRL#6m=F z7M+?QiWDZWt}UTpcET)31@r_Op_%SbkzeU>ojBWXCl&eecjK2A)FrWPeQ5v7!Vre2 z*S(fNyJ80)RlDt!vf8Yn+^dd|%X_t-aXQXF>qaXwo8%3N3vN1`17ktQh|JzcZebf& zijLpxyz{rF+-H-8W)1YuvDlB9QDu(95IJ9WNb>C&Ht%lN;>M zEevvb|IRy*^xq>5hve)unwRk65kDqy;!Z)HfpU=kwv+yyxh5l7DX$=pc>CAI9*bid zbM`vem5GgVI?Tn!czP=Za&B|}_;2c4(yxs1>OCI}*Yn2X-=$p^`ira1*ua=m5Cl2s zj|+wZP0@@-RG|jz5YL>HrXJs>T45-Z;`9A z)!&WdHo5%wNO`bd8q&sXBMAv`LWI#rDPC|KFR@1jMxX`lQ6F!TAe_2$zI$1SZI3*< zkW>uVnJAb+!851w=Elyr0gy1X-{|89Vjs_?V<6;GsIn<6M&wu(+&2&sC{4c*0zyXq zM;QsSHOIX+e0?n6L?6HK5EXVfPKnS$lZu6}a*$Icvk=X}Ed{n%p zRSK}cBEd2MeukLRy8W7pp(#FNPCrG9OP8efp+ zOB+k^`W{p;P-&$3D>sgVSt=j=q6HH(ATa75UsE^9kxmuDtq`Wj3Mh~s(L<*qNQ3TF zq9VhIJ5XrHLXuWYRdMBBrb+G3wnX{S!6SRqVD$O+uO0)-Nxc67rh^+4XfxPN0MNHh zddz=lwV&Z{nY;lyZlUu_y3eLq=E82ZY@5ifdgih#I~P{Vh*XZa?F0o0RXD;NmiT$` zS$q*CH(inzY|k9xylWNGcg@U_x@R)47;ZS&rR>nZ;#~$i(3mR-U$uJl>wyk$fQS^l zONvtxorHSMsb_JRhqm^S_=5fFN&OZq{5BYqGQd5Zzdx9%5#l4A#DrlJJBktH(}#~) z^wT1!^e?+rpW9m3RomSD_(OvI!{_4Ylwe5IYUskJSUSQH9=jHtnOBFh0x1ue7Q-Ct z?3Q_gK}>azo6NHWC=#S414!o47WqP!A!u`vj$~UcaryQe2VQA~wD-bfTSBxX^ffN* z7>XHWOkDoqY%z-&+5NJr_*dUL8wb5yE)o(y=DK(g)HHmZxOl^1K4@uWlZP&klWzzP z!orCUXM8B~H+k*icr1RakQ1_OBM+JRAzuDZ+z!csH3~mH=L|rnHS%txWZosNM|a$y z%NFC-DBxGH24{QNm?;q|5y)q^ zd7<%|Os+~gB7m4ym`Djpz8!!1HG?n|TJNh9CEAq0s8nh9QD+n@K`o9fQoDwYZ?dyY9QLdHE!t~0~5bm8}x|JC`EudjXvP}OSF(6CL7r7h2@B$xA|G)bz)-9 zP}8(VI{^a{$R`06>V_GS3#|Dwd+i8vu(CMpR{7>LUrgWuX5BcB3TRystF@443VJJe z%^9VCWdgtroz63L+MxchKnIV;d_j5A$B@{QF6q!}`@Tn7D;WE%>}CC@%ZHOLoBLyy zgu;uKTpxtEdb%m=)`q=Yfki^|*2WFs-) z40h(H5UjxG4QyVdi^(25ELkFEeSP>u@g~QDNPZb;*d8Y323F6p7&3npfn!XCnRAMm zqJ@k3%W0r?zDx>#uawI&O4~|>SC`wqOKWF}Cub|>PV)Ywfi4@|``jE2`3{K4l-7Hh zaVy)2SU9>OBv}<}zRGDC!@;VxR(-7wv=DcF@$yY$)%RIoHEhIdeCp1AD(#UEFa_YP zosRu64hwC#H3~}Dt)fRbg4T3F1SbbtLo%${mJURGcO7)!?|>C>EjKL~1m7@z`#=rI z;-C?co;o{T{in>z1jYlT@&+s<(>6PFrk)sZ+}00G>+qOH6g(HCW^;okdqt!e9<@{E zL8VNOn1pqJXIkLLq>3K8AyXv!z5Acyqn6lnjw11_t#D!jtMHUE`?*|%AijgxfA2(n zkx@@x^QH(`55^I&Owq@z>#K4dRE4sr+F8E&>FH|oot)me>`*JC44n;#vlFv=EF8i! ztA#X-tv?lS4<5+H28`**H`1shlbs79sHZ_}j`g?cEE7RNPl%T%+VUQ$g8Q^0=>iS+ z>TgYX8!et#M}lN!Bls?ZzS9jip>B=%m|GyWEh7r;+6cCV>&LM)Nw9;J?f^;)lN)V6+K}G3qi2>3n zptK+@Il9@G*ZcST{0C<{=YH0?uE+Vtz<4_HD)U{P*JMdw@tCNa0tEGcT7U-x&z-EQ zE)re~vC^m8u6jg`EK7iZFxZ&@^XL-(r7o+pV`T$N?#kPj$*!+QE!%dXW{Nw`^W{E` zmiWUTj&$2AG8DK8#{`@oI?EAi?*P4=sweY!RW_TOB1`p>sES#rY40fWrRDU7_w*P4 zvO5_~FKi`bt?ltcm*PR$lSPE{+wSDax-mnLGxcz~+TujgPx;2*_q6z=Dg0p!g9l7M zq;g}W{$bzwJtrDTnVPo)q;60m$7eq({O>EM9r%LIRmutAaLqz%lR;O<98?4xzQN@q za|^fRtX!oVmVQiXtfiYa=WeI{o+Ncj?`^1pJ9z!Mx{fWCxBRg((`Vg|Ggn}Q!jH@0dz#)zoJNZa_V_7S1 zne0%gK(!+L-+@G5RLsAa+9d=&3w*8thpQ!-i-ihyoH2^pMWjdj<5dw2*ZjKldRiQu z1DeslIeQo1E{piw`A`kBL?WDH+&@XWsoAb){=uo5Ls+kfke)#E0DJ$7Lq6w2Mpe;{ z7)$Xt!|=;#4*TcP0@(;b+HIC3_5v_}=I}ImoDtaK>u>xN_JNPU-v$7?MfB*aMx^t* z%JOW^SBf6CD)D!qKE{poaDF>tc&=(r_9c;G0d@#x&6YI#c z_%Sv5}Tyy`&H!{2C+3?(<9+L}B4+fvN68Q8I zqnIHYoXcP9^Gc_1Ud*asJh)p`M;ZvBwJA8feZ(7WU)6>A&$66!5Nti#QLtmIRSD=a z1#f+aP}rZ%_!0Zk#W&Pqo8)`bN3X7JOadO$-%vPl%e)NPHbYL7p~&C~;(w0QOpra1rxWAWkWyr+@Y-Wkz_;XN;FNt}q@WD44 zlTy4Xn;HBTx(X;wfaB3`zV}wihA7lxH$fEGx;iL49xL&2@nJPiE}OhT*iP3h>eqY`{M8v}L1AK=qO=#6 z&bllqZKMX8U7J`Y!}x=tBcL4i1xYS)oNw^Flp;bHk$$lKRR;f^GKoB`ZW1#jj%nPG7~_=HSNvs?BoJWfoxKKA`Rv-Z+`dG?RL+4X+x z-5Ni}aIm-$(rb}zzKI+gOtSfUA1M`B`NV$spW`UAx(Jev_(KdC+`J;=Z6}-8Cur2Y z^T7M8x;409p@0F6H!^-V4*&}04AlDsZXh~Ng4rGO_LH(1;}O_xyYP>^b^9cVUJ-9^ z)k`!0l&>5Zy^XPQgtewdHjh)BB`axXiWj%qmEvnM<+i+J2zP=M!k2r8b;?%EKy4kkT>Ia@ARJG6Kdv~7E(Ze9+-JX zyiWCrI`uY=%|>lxgKw`Es_49IdT6Smr))&7)6T2xJ{kP{D~MhEh4@yE-IJ*|`5|$| zA_8m9dFB0T&}d>;e+RrdIq$$t1_JaPn9D&nJed*eR?kBw40&maED~35;RP$49CQcT zQURyeI8vnoHGs%<1Rlw7i1NKG;tv5orFFLmA_)Yvj*d{SF9&_ux|39xQ2d2BnHNCs zDiKRJk-BO z6l>#eu;~yIA+94F+&q*FF0SKGO4Mg*Fp+R3`KPa7_2rQ3lYs(T2YK-#D&bz*9B);m z4s$YItgkiRlL7$cLoEs1n%&_)UO=c20>OyUxZq;y zc&<(7eEyKTw5yWTXfUCF5e>szQfa{s1n^gp=BKnv;~ya|?TqIO>PxW%R8*W2K`)IO zyCMmVHNqT3)f^&0g|Xs!0kO+}a#{B~CB&=9+Fn^XpJK3NCw5;+t+T3mD7+ciI#yI5<@U}Pb2t*&XTM1F=rCFFn%8qN*z}F1bGth#nz3v-*O^e zZs^j*h>Ilh-cl3SqCsDss0mJVeCx}@PA2^l{lU18$%!5IO!Va9uYIV}FG)MWy7;au z50K{{;W(2_1EoCqD$wKpI(|qm54AZQ?8oq~;Ur+;QR1u;&ub+e7@a-ie;I)^{2&ain?buc$3cFVbSdkOeMFsL~~lPjd&+b zVF5;yDmSNWIneLLbR_=4zTLD-3Gdu^qT?3KxDqhyOz!K5+SNH4F$4E~tE}!x>=9W> zcsm$PT#6R`$~qyb%@R@yhwI`1^ud9;DVHWyDV#8bo~&UHNm!%> z!p*dYvXp3Yk=*$~Nli)_Cp`j3#kc@J3N>=@fro-^L)>o#Uw7BEBOink5m{z#SUqZG z^7)Iugv*Grk$D}{T8HzbXVcFnpk%FGyjE-}e`DJy1SN`%hJm)Q1lmTN4k2?eDD?O@ zffza5b^YyGW%Ao9EYFwlxwfO@yp~|eR~`;G9~I|3$+fn(-GKmNORZ3$<@b|$0&H(` zBBd(9z9Zefa&P;Ch2oFCkplK=KP#1p@c=w9AZB`JI$8WY^HaAu`^9{|ha@nkvlNp+ zPLwcmAJI6}gB>7h6oT-Mgb)S z=hjTrT@v8{Q!lXO+(PdWPi^kInfHhYC4YK*_4-Q%45NTNcTu0)mBo`f4qDpX#|_${ z#89(gKJfa<5!SZXISqC~4lgTz*w@?do(Wf%ZG7HtCs0-mWbrLhe}rVaS1$l^#s{M6 znRCIp{@$el(&YPCEtsn4{US$R_h8bb%YDJyd#I=^k{ulyytisfCZ>+^K=WLI2TAxp zsy=1U__oEs;7}5mru8$qXgp8`IG3x6QlTIPw(M4K1 zDKNHPyX2C!1qfs|SB0c#Z&UagbAe$na~f5Hkc!y{Cq9(iXu;71zaN*k37PS`^dTP+ zOLM24g0%vmyC&+G2!C@GUEqWYhd&u~sqZbgeMDZQJDS_R$B6!8a$~3^emtnr|D@-f zWg9BBt;TKM^mRoMAU$lFed-OKHf_b$s|}QwVvQ5_WE1{eN5hT4?Ud*=oTY!11}Nb! zKuOy_-b!!0m;$|-eDIAE#fWyNHJ_GGh>l2t*aRpvRit8U{A7HD%Vt!g2=I09RX)b8 z=Q8&vk$M42@LQ7dzoGt$zMyrr7@4}~D*glBS*{^X@HHfvL>ewbidpRG6%*k`^TZXe z)^n7;dn4rrisV9BOs){$!8=}puFKvjFbsu`_`VOk{K*W>Bvx(Fan4yi2u>0Vxl?MD+nQhvL0tKoNOf_eTmrSpLso1TI*u$7|*M z-mc2M2CCfJ>?s2Yn09-GD$7g^Y-S>OY=vTKHX{QevPWkAa?j%RxQv_=vsXt}>|yCf z+(FNm*}W~c+273)3`c__e(Q>vaG?l)!{<|2#2r;+$Znw z(~G92vCV6b+&_GaYI@kVrnXhs>i)c|}Ln2mmOUSbPOy5L_MwOER<;vz7Y#4K7Dp5kWr z;sb;eh|s?o8udX5!y(Vs(N;A+;x9oPC4EH3L};5m_C`kSMd*9hkAvQeMByKw4&XGB zRn;yl4}s@Hzg+r|D?8fUi{GLD?_~Sac9X*sk1826?@Tzmf5W;H#$7Gsm?CafvSQWCxV*%J)9*Jk4c;!BkGcEBWrM z8$7&i9y38v+^^H9F^fT|X(P!WyrGLxj!=N$hlFb|GDVTsW8&o_lpty@JR8h*Z<*6_ zWSLQa$bh(sSEDJKhRAWP+)aF9dEdpOadq);?KeL6=do8DNL8ZOEgCtv-;_RCOrUvU zI6YZYibIXv%f(R`0z`laiZpM=?TVZ}Ku*ie**)roO+eHPb)-PtANs}Wh!)M&*p~S{ zExwrY9;BC5>f#%SYY@0)MgfBr_9GK_H`*q8`>wH!elMTtx0oJFopgas#WywQHW@5V zW<1sT1^Vn&xbAX2lc*3^NTN<6cV_Q&j~Y~BRVYzZ@!R#-vzduItpoK(!uW{X+;)YR zsjcHgX=B#`fdWtaLt~`pBaX9E=P5oZFd(n)O*qImpQ=hXP`)UQ%zC!oapChl{aFss zJNmCTCXw!}Y&0a9N$jtc%n$q@gD|s-C?B$`GWV;kg2U(N8vwN-cz@agsO&LvrIwTVaJQj~<+h-F@pDL`$hDP_ zWUS|8L~_2R^Fm;n{4acP9}4(}MA8z=;NztOA#%u5hJ&kZDew!EK*r@F>HxkEMFK!iC1X#r+lr! zwyoy5pbq_wg#f7CV;b<0orw!?8UNIqTT4aN5}Y;hQ`?W8V=aGAo4t+kFbeKw6Dcm$ z%6zjizwOLKvN8O2Lql&!(zRwXye~tQ7`|SmR*4}3^fy+l-*Thb7ykg2&(Scp9`jFq z%~dShn~cDXy)|@ufR=2s`3Hw1J?B&}GYdstFTEi{iUrXM(g4W1`PB_R#sLM^;$DWL z>Pu^lU&{N-;+or{A4sCN83z}Cp4PD{ z1id(wjU<8>O)Tzs7G(a3wjh$?&R)Cp_f24M&FY2fqIps;8_OHpClD#dXWXPMT6d5r zeDkh{FU%>>ktk3b(*w4X?XST&z$Jhbt!`*9L7~Dy;f(2Jm3KWcnxBLix~dN}*juND zqHbiSqVPB8E*pmDh8YLhmNs~Qd_3oI?)~haZzy6OT5xwgYNB~&VkTB!kp^?!p;E>G1D~lh>B07;+L2b7@AY|+9*_J4G#zYrQ zPe_6cHE{Rmd0?7$Z#ixo8WoESSDulH$Wd8)CM3AxmUM zgF6DQrB!h@FT};mV`>Nq8hGVQ)GasP@C$%0X)S3mgI?oeig^{0?r}|($d^gx_TzPd zT+nKIId-DFf_L-?b7=^e;PFFlJbrC#R@szyuXx^1@XfD+_y zBN4!N`@C$8PV_tPvq|niM`}2sGdnlfG8Kdx8S|*CJE*D5pDk1nNxGGh=LO@VU5Eg4 zni2wVElFTnT0Gkl>a?n{SwGz717Lz5e%e}%W&+=0IvU@%aXlq<0zI9sM3InsRDmW# zm7jc{Qk*;po)wfk$=Yf`34cj>wLtJe0twWuLU+1gr;M^*n#{U3B8N9Lq6q=|d8GQz zSJ?y$ERm8)&~UqldWWE|ecK*&%G87I@fUT>myv#`0^YLyuCFX|~V3C>g?N@CfsfS3whsAP{Qs6p?Moe!qw!O#yXpO0YHXIfC z=GV&l=D$VrBh$H%CqNR{w_8ssFckIzRr^Vu0Iwg@^UPzw%i* zneFAKf5EcYoByQU0gQ+N6}2fXJ;2TCLA> zPS+CYIZE)Hh&x@FLn;c?$l%J*cxpy_s{SParOxa^NR#L$*OXcequtY_d}wP>*N^ z9?8?I5bxZ0k>gm4fvA3;RXRL-k-QZ<2gSU2p6SPU9K;lP-ijx(uy1aZPGZRYsM^LU z=E?K!5)hCyHMaJq;lugGyE$ipz?)Wgq1cl&Hi}5E`&~!A74Qe%U|^l!4V~f=Bd_ly zseWaE4V+G{#3Szu1%@Lx7t1r9$;=qc(%uq;I2x~1*o10ugjMW|PJ_OzB6;TIfXxQb zC3{c^9>heB0ODhHewE$Q${X%~hMB$d;;&>@115+(BzEVjT-}CmIMNEe z2Doc&V)wW)W+Of7YuLRm7#@5~Qj5AgKgbs}i35&d_owi9YspCXYMfO)(tH}QMxtfT zT4lJ=qq`e{1%hIe7Mmfb)sgk*!Mv%=mD7sf9V|enuGLR-#&tZD$WR9N3_?Vr!}g-U6Q}_=krGx$|2tbszQLxXi9J{a1~=V}P!Phr}poR8=Wmu7ZvW#+u{&=*{Iw zM`hEd8`IJk4VLyHjreGjyDv&|^b0dRBJ2KGF2$Ib=OhSB;7$Yv*FHz7yts2x%Q;)h z#Y@XDaO0i#gqZ`UmODSgMigTYO71GL5^x?a4xdoF_rbgaERUeL?6vJ4_fSIExs?DzLC?YyTb<#LBkkS_n-nCW;^ zUx?9_@52Oo;YvW;oqPPq`3bD{2kL@E1WA99eNbW8vdU!Yh2-{z^mgonD&>nA5@$dq zuxW#OAK|*)AbeK`h{p2YtGI(_kvRN-K9}_X+yEu80qINmRTipopBXmR1PBg0f^|+4 z_pQPLKxl<8sU3za{0$n@M{}^fCYfFHRuUYK$`UH9D07awr}X9i9f!ELU?`uDC08GJbm8V^$sL> z3brf#A%GwPz#Rm)oCo8W)~AUoeX@$!qY+NjfbM`H&P{;(>fCibD8XjMplV2?r(UA~ zr2_-$kvN_FgH$rZ5d%-1o52}J^5Sr|Q63P@7nx)@aWGjX>uh9ZIem)#Ed>nv_F(FX z+#L-%#v6!W7`yi)DK?e}Duie6F0`ueZlO@S6ZQ+ZOJT-xfFI3E)o%^7KY5G(v{nKp z1rg3wx8-x20G~gtUC2kk^%*^dW}X38BR4Cm^&d_m4oE_vatL)7SvM;S$qQw>*7|c> zy#`Grcp>{YOiT4`6=o}Z%=uYfXVNX$azZVOEKEtB)!YpB}D`<~Db44Nepz8F;|{Hy2~=ZzV? zVG+4aC>m7wGLB3*l|seAwNnHAy7ai;$>F=wM3I1trC*a+a_l^P=w7xsr)M@dwIspq zP~7k{k4kRa%0qwXu&x1eY6b}qQNf=mL+{I<(Dc=b|1J$rVJVtQb`uHcEgGL$gr-7I z2T*eYxSi?5eSQ+M79&h;sRf^DNbvk7M7Sb9k#CX?ytj3NIp}yW{Dg+4GpY(s=V*h0>TQN@-CB2sC71R($xOMr--h-MxLvqH4I( zXE_Di{~BNGQ%whTI*>)#*94OD(K6!GOXstJS0)}u%WLDe;I&-)TPE4KAS4G+T7jAh zJ$Y-(H_m@U%Nar-{I>`_88eYbfGttEg8+h}czig7#JI!DU`RHNKSM{(xW4RM$faL2 ztz3wpn2l$(o{UIBIT}uM1PUEQToUtd>iLGDgQ+N~GLcfd3rljFmBCK`L~qif3k9H_#Jc;K z`o5h}#QLb`s%fvK_g%a~BoHc9E`ae5NESL^X5=8g2l!BR;yfqF3&G$vCR}Pi+W&%} zn>}fp{_?*DXLe^Nv?@09s$=6Y0ref>gUvJ+lle{GaEKI#0geQ}W z9pwiK-GSr7{B9UhPUzwW#FXZ8(W)njn0EBCr#GTxz+)O!2>XhclL}(;K7eA)3)oYbxFUiZr=R z!wkh>^^=N3|Fj902;3$LXb=`_eWoI~y(l zKk9P-(Wgo63#1~)t9Dg;&|pnIuaZJVp}5JjQaUjbd?K|c+GLY?`Q_*j#wb-F$C~ON zIRrEeemj38II!%0e)1mzaRmll9oThyB;MdUOA}Vok8f|q*6UD$)vyLC5MW)HE`H^yD7gf0F*d0>8WpTFQx!s!|Xek*RKf9~+ zS;Kds-dR*WI6&r3fr$J`RhJJ{C`(dK1QQf;RaaMYJ$mf2-YUABeRDhQ-)mr((>f|H zFrTH9J^E0FO!PI;!_yi6ip9&ax}fd1V!abVU4PgXQeUc0ogVC@?Vb#}Hy1EHph0s4&8zXTjFRMIA24`^oL#f!KoAa^9Isk{)|V(mAE zK4%@O8s96C5UA2HD%{UJUae|D{udpICK7=uAciN#`d84<$jn0vBuJsDsc;|MYsHTj zt{;P2wu49ImWhLGITz+)N1pMZ?t7SUKW}{PD_MXGe9d*5**;oV?r|J^vpN100j{<+ z9$~kHd{h1XqskEi)f_D$7L#BleJ4S!R;)`b{S(^?j#Z(wS8Hu%_4>qyK@$L_?^OTlKV{=Ds7(_*JcR9*>~DkTiSq&*Kkkq}dVaI@mWPyeRC5gkw-E0< zkoV`edjXhx8eZTXnQo3f3W3Cfky^#ww#^!1SWKAc~?{&=ocVOOVF>*ebdsbpb?oe_*$lWGZukhhCI|239o||s-xwn!&7^b5@4rCNTd$52&Wn)`E*E z$2M<4M|6SRkwQU{>Q)y;Zh1xIH;PQ~RWJ=S5uRlIEx(qL`kmEgJeD?CmgUdCNw6$z zz6K1Gthm{Mn&TYPycZjYP3Z{}2gZl*Z={#>;y2A5fxupEbZyHr`LuZ_VC$E1Z`v|) zSQzr&hk1NfoJ1u_HkNBiF9gVB^fvLHOm7Y*igGa{0za6e*O1V5m7J<6d*k2*Cn&xGvOE^i_u4;`l?Qx*#*c3LD=pWeO|? zleejcq4eGI%z13_acf_|;<(TjQJ=g~TIR|vQ>$;Xs)gXLxYyfuE0?_cz{_PrTtius zXAuolu^Rgdq$|F}rA&GBKVI2t$^eo*b)@>1YkHSxdGtozI;yS;=v;Vqfj zDuWUVeBT`LkTI2i!&mJiZbc0mIpajFVr|f$w+x}%c=iQW4a>AcXD3gV!h_1=*^RA9TmgIf5l2Fki-XL0KHp;)S>0k6wj%dMe$+<)m; z64*E{Qsnyg%pc!V*Mpt+v)svUQ~XUH`?0*ccpy#rfme6R;CuGXLm(#}fEk z0W#mt&(h5I<^KAV`CK!c>kx`=Ev7w7M|H#@@)E2oCpCz{a#hzPGp-!AM?*2f(aM}_cE$J9tP#zoK4<0k7Zr)6kx9>Y20B# zmDCTiw-59|+wykojFa+)_K9^exXW?A-V@6%0S%XCAo|5+M#lfQK&E0m0JunPe3{^kORni_7J<)6_PcX+E?Qw9G0mUlw(Gr`IIXxg=18V{(X@+XmB*qU+QuIj?WoVoo+9J8 zP9ERi=uGi%gx#Og8Cft#(|^%@@o{9Lh$~k#Zl#G zE`**7FUemu{`vox%3a_)_9sxIVt#U6JeFfjioR)tA*Q>I?=Ib*pwGII$kKw!fB97Q z#ntFcMbuu`R!AgqJ__{j)VWF%Wsqxi`zO>^{knQq?3+HDWLJPv_sDnD6WAL2bk^V6 zgFmu*%GoWZIleV(432a4*Hp~0{Dv62S1}rImVeBylMbsLCD8~ke(RBX&-|b@D7k1b zh(5hU3hx}UG%Ztc^uJq0 zwO>IX#y%S`!;w!PAWLu}*X6VkN}&%&>%Kk#4Z4mcL?%m5T8gI*gTJ61212_>N+6W_ zQs~Ua1ELS{1!Y9}$^jeW)**8P>^jAFCMx$V^!?~-vZ9!DmSTvSp1MU*gOW&r+3x~G zg^J#}PH59&`#v4Ry_&_||9v}`{EVY@Yp`_jwnz6G_CF&FrKe;*J)#Eid?;KU>G5dr z;YeAy<`IKYGwyT$5?eBOo+{3Rtjo?j|1d^YXxcahXLGK#dU(Jqn#gmLY`QAg!T6p8 z<>A#8QMTyVV^aCFL$mXpq)aNb_9V7ciLy>wE^f%IO63{1dt|GC(kvf3P`kIp7-sijIK|{i0A%;81AL@AH$J`oweUbst`G z&|~y<$f%XC^?z&I(kH>QKPr5@t^>(l`yTDoQbZCm$e}!+up;hyEn-I$iZG?d+Z-2j zxVGl0=aoa^;aG3gJ+ah(2<45(@xh;e|30xlt84R2;5cvqJG&Wtf8!BRVcolCTfmFD zM=@eLUI|7SCg!b*GC->SEjoJ3Kc;;j;GzuG@_oP_NL$9gGZD~T+Wb&J{Zmedyn;Mz zed0|s@Cc}sc+r~_=e8w2H&OGkdugJB>&GF$3fF&OIU@sv5NG#_Eg)I(Xhbql^#X!b z#L5qG{9G+?g;XIY>FoL_1>)Y4b&!1^%EYMC!EC+1erS=Bp5OIP$;ped+V?U-ioRWB zPi=O{OMv^tD2@kA7oW`TMW1|Y>(WlE9l?Pk9I1FxbPurlbBUVxi4hI}?cKG5?=<9p zStAL^a}HDYT@I8(&h;#GEB>gSxoRAw9)Cmc^vUZEewO|VyMO~W`~YUdOU!MbN1tZm zoRfVddrg%cHdd}j_IO9YeC!$W+4r&zm5Uccbqqv#m7enUKfJSShKDDcR6fYs=&{|n zq@J97n&eZ_e%f=N!rdb?D_wy=pqfBTjjyQhL0`3>Fp#Td4tXe1_h0UjF8dSzWt_p_IhXBrQ{11}PTS*+x#wExnQ( z!nemySwuhtPJ`RWE9p$g48Ss_@jFxdYWqsx z@RNBRrEB%qVsK(^N!1&dM(5~Z>uA;SK!6}M`9vd=Or=_$(ITB()YK|C3lD$;3PsZq zYLJEM5i|{2YDd+uV)5BC^Z$-H8!4cDf-Q<~+HT{!S^R**8jtPn1D~%L5`$qvba*&n zmJ<4?9v=m0D9yPhilJBkO8D2VjRhPNhA9gyQ~Q`6JSUa)!Q|}?TKDdGgdBq2hhC{d z?tty#a+<{lLJI~6o_^B$liK^$Wq0VSZ&r;?9h>`HfF{jP&e_Iwm1fy)%Ef+uBr(Kg3O$r}x@@fSLfNns31S|7E7emsXny*%7jb61K0 z3wA@lAW^)8lq+rAR7=8vAiJ$M#V5u_2_VK%4TJiWU$J%5-5;<96;3r)%Vj9_j~8P5 zd0!>4{o`mhuiKh>+M@>cLyG$hL1Nvz<1-sP#`kyX4|Y=^c$IoeX!f>-kh8}JA0XJT z)Vs-VO#iExmHls>P5l?M3e2J{=8h(0J_-HWapS!fM3cZV-i2PB)v-&4Yx$$uq=T%{L!wH`$C6XLkL%7rF>A4(^1|Ett39U6Tqb!@JiuiR=kJbSw7)6FGfyE|rQ zH2;Q-fM1}to&&BldGYKZCAtQJ^Nv$|B_1ojR2tz-_`OF|S6gh*0aNq{uJWc|mEZ9; zR;ES6zvI6^Kll#Ee(r64*7(P@i%A|;8b0^;rr+k4G(sw#hXDI^8f&4>8t_E2eTL00 zLK`N5YbMQ%r-DmQ>Q`}>+D{kszc=fQgRU)qu{dX7*+B%B_#qKGpp+b}is$S43b|cy zdHuu3TJSd?)52%ferq+|_ZJTl=2MI8=pRwwClCLPS>@Lb z?+wMjky@2QzuXH8`Tw@J1~8$2W5#Fd(pGiuM0EgI#XV7c%$=D0+9lw92x6hlcS>&RCOCU7eCGUh(@qi}T;1K*ELa0@l7(~PG~@x?n}s-x~9 zxVqCPi-9jBL3tH}w8Yh~-jrA=%4V;0Dt*4aH5^`)bKziDjekh@;YG zem6UKc=|F6A?P7!t^}VmKWZy^A`aIoMnVSaY%Y&L!1vpyhD9~+s1PYTW=OctT%CqnAS)vHFh*6^LKi7Uk%P-qL5h3Yh10sB><8{oS*pUCD

8vl|cBsWV& zzq2wauzmrZ;x=#RX-fd7V2g5TgihkP-)NQG1li zmKlP7n4s3R9`eFZTx2MES}|ufCk@19R_>paU4%csqH=1-KrrcM;RzHL&X!ZIRC!9V zTH(LP+hDt9g^SGdUOW?u@($K1U9Lt(e)jii$m!vKBY~g) z$_CYucO;ss*WqmuXB15IYbWXH@2B1fCi|#aKX!a0vAVd{&>+Uj_cHFu%bYeSX~8EO z=TNP_4+jY$F|pU_g2ReFkCWDOCZ{*Qycas34TdISwChvK%X5Y%`iciStwVA64+aId z5B!#Xmk%WB{thxSk}i=#`q2c>bsePz+Xc0BPS1XQUrSKQck)(`eRH)P=MiA}r%u>G zy*Ekg#*rN+V}O2!!oArQ07WZBY0}^phzFEvB8;nS;k^ppzYAg=quZdGh+IglwUD4>cr%hxotw15p<+Bu3xo5 zBDpc-y98nh!h4or@)=*-p8X{A9z~&hPO4%(expHCl7AnfG;A@h_@wk=RwZt-7_^|~ zbuLb#G??IhfMMhno|ofLtanJOR|0LvJ)kj8>Oz3msK7i^pS)0pLRlrDhYoaMOMv9pzCJpn_qgL=k18~ zs|r6j6A^QND20Cx55>`^fQWnDk?rw~EQ%eSA%jUe6$BXCmm)3ou{ip*bW7c?t7{_< zN=@2JyD_g2(*s7|h%Fx!RfxPQxXL(}42ayE)gQ5Rybo)3=N=4ySy6~>A`aeBw`{R; zMp^OIq2E=UkqTgOU4f-qjqACSfz*OBzWskT2RlfX(?m?mZ=6bzWujrt;>Nqk*F}3i zg=&?bNw4~>KjTSX(DY=eDEiy2Tl*_IxmH34O*(_`5L^1{&ixYl#4^1sKih?)C}Lyr z$j`lhHwDDph{~rULLzn?rrYS)pXE#8&EUbBx>&cpifO~DT#Lh_RK#RLtTvWHI{RIo zQ&VfM?un*AI7Esg*ooT(z&qzhDMWJXW@&5;$Y~|O#=jLQ#km(B$YGXNvEFNq{3x?Ek{59VDasJN8TN0Gr zw^ZwieWU_Pk2B9HrSmhgxlQ|oQ}qIuXv3!SB5)G2;D1H|>={hcIM|6x7_~n7&P3|9 zl&i@ad{MGYu;!j?;*DSDed3JPf};J3+HiCldD*2Y*~Puz!M#sY8dTz?$vCv&VKl1SpQ&B;x%0+hZKA{Ircbx1^9> zRk75L2fux>-yp5~y#p$}PXylP?^N_44COB7zDi+I)Q!&^SIDwA(YYX$`El?S`J5AP z!OA;7+t+)oPCDls1p5mce^9f{7K5Q7^p{@Ap~8%De`BH_W47h(YDsAtJ0+@;Aygzl z7EI*2#dtKQ%53nFbgI;m1P>Lg!*$lyz$>L#bh$-+*4>_)ij1q$q3T0WRUjS47_u_Y zw!2f_MD*tjvd_6xPR_*8)nqbl5SA0~pp!muYSh=|LeTR>rEpf_fdD>YwcB#>CgXg4 zf+j_^hydXwg-bFxfND9M&p75FrX+9Ip+f3{`CUI+$qVLbsi9GZ{c?Sv^eh~EorGGR zvmc!MtO`tz4_8DSiX(X7iw4^oF1o!vGQUKRrsLB2-`8fwRujKxQQv(;Y}qLmd5|v< zV2wv=hzovB+OikCE{s)QcvEQNX5@R-p`0N|_SHAu*(p&}O0s^+qC*aI?a9}7k7jyq zB_gO$etaw#_o|GSL_#>zVBx_tTD4^V(b>*C%>HmO@2iY-iw7&~6Ix4jOAbr?uCAM} zvqm~>yE-#Zm|73C_r88wi=u*M$o8uF?APygt2VcKZ|HnxD9|_NPAZB+PLQ+eD>r2n zUw<81;zS>XxeJB6XSt4`#R*+%Fzu+|AJG9jG4XFu07N&>obt`k6TvZP`gP@WaIiK{ zh1xFSblfc147cTZBr??4wUB^=vCx4S$NG;|5*P{T0H=iFq-$2RaBLx7zXmYUn3@U{ zvx9ql!B0LTQ|ddJrCHBGuh8I)b^2$gCWX`U@=YD*IF<34?V9Gz-&2<*LKg~eT+0}y zYagb=*zL1ByhyNOUItiF--p*uBy$vJ*n?>bj-DF!AX2=i$@AXu{@~f@D!;=V9RF`6 zBcK0I3jhoWR5BmaAIe|dJ)w}U-xGY0@gd$cW`oJr#FQty=z*9AOp*`L-lhIk?vK!y z4npE&&paYBvC$w#{l~7*#(_@7f2dWK6{!n#W06z#k&=&o$MuJ+QIr0~tGRSUf8=bp zbn}Pk-*S1+un+$>5-*J)Rx19MFTy%8zv(FYK7*dzD;IkGn1Q&_hVd|15`){AIRE?~ zRg*Qe_6d(A9|;mM&(3$?f12=8cZrSuN+TQ`gncfW+JLaX*0P!Jyylw|KrVD8R00#> zzgh_H{!g&oFI%aNgRuVxpFm*0zz=E9zN-unnhkt(CcO5NC&KVgh{yVMX`PJ#0t*}i zdrf_*l?t>cr{yxiY3z5~D%p6ZB@xN5skQvI^(14XJpVFtEa3JS{((yIZ!2@ge+QV1 z-S8U`@6UWl5I=@tzndEUwmB9~;w;!rFdqkdH4c58+K06`2xqqIcf6y(D}Zla+3%T; zZ>yv%rIvP>%ppN;WMG(ix>MkTEQj1Lgmqi>PZ^kMfd))1p$VYiAR?gz4i>wEfHUU+<};Dr5S8tlStHC4s(% z_lX8xU>zgyp~BUG-<`ulh4%^q5HQu44y?V+L{RHkQ;NgLj|2><*&IBfz(+1$Hp!fr~ zSH==ar{2H#&alUr6v4L%=6G$lJO{A6N$2nXML^7v6~sKSZ*WnCyCT*sjw_o1n5l4JyS{BoPT!teDjTwJIA zVmh9S*VWgdfYOBm+H6lN3n04!hBYf$09gxeI_5~%@tyFjSHRzNdHX18KW6Y_8T~$~V^qLQ7FSWfSGmWo*y82kaqt?=qG5aRCm(MEWy- zPFG$=;eRDzs}1}#`7W<0Z&cm+wDdO^`VvN^^U`xudFz=-7&+i+_%&cOsU}5W0S*{A z=qdc8-sl_-^u4F@hqht>M&8g2BqePtL!Z%X!D?uB{E8WQ6A{tqV&hH9@V2S|@j#-znjvB|J2Q zM@Fz!`Zm9%s|+YhuwUip)WCrN`-e@#ZX@A^>Gx`Ia2)IdKHhN8d02yk9qKN}7MFG$ z@{X2dv@+4$tx(yrS+!T?Wwoi-;^w8>$JR5KEkCl=Yjg40Yu0)1*9_ol5w|~pGy0p} z=m%r3X?vN7re)>nk%VVr*~zgCS(DcIPkQq@yI;^T6VWFyGk#o@V6br(K!3iqPD5m?gm;(l@CZ(pu3BgpS2A4YQ2tl2 zuk@SpFZm7nd0={ElX(z`Y$^|2y+1DkX&2~4R-y`dF)o100S{QGNTg^?U!V_MfFPH)DRv#3;&S8Nef%M zus!fK{|4-@i&H-f{43yBaGUm7zlcA8>kf4t*lq98KOO9rU+@nCPXO~luxD{i2F{*G z;}0;nTX~5e>TzL>K-mU(De#gD*yu~K3rXEuWk}2B{*j>)yNYUoY-VnwAC(ml7}_en znEQDA)xZq}T$#h6%zOEs%HJ@8!dDsPGK?t~WvYa{&D(DnPaWH*Y1B=O_K!61F#>6u z7S7GIZL*1^LDL#zNW8{2H};genH3&>tY1sa8L}OKAb^Tc9=Hh{G4L1*UuWGu@SDKj z87CtfMC=A4Jg_0yfY5gIk_7_Kf%n}Be*}Dm>>9WxKtQQt{;}Q_p#-)R3rCg!%Kzmw zO6b~3#X67gf#>}ayh$6mRGq(0&eI8hAvq+VKw0(&^@P3!=ySR3WR6lRvF68Z?y=Hr zN2&s#kMWPS|4yv))Y~Tp&TPVmPs2kwJUVfSf77^s7J0t~z8jY__b^qbprg39f$#Bb z`rlF)V)|c8=&P_)0Kgo=Ve0JA~OwDJn7BbdUk%R;WtgTBO22; ziFUj#owAY=p{6buycCaWk;BYbI+S>ijW7g67?fzscGIL+hsJ?{tAHP|aLmGA0DtUR zfw2hhYziQ-;X%MTVB0z%F!`EGELrgL;JI&$gaXzg03g8v)EEG%04P}i-GR|0K;aw= zz{@PWNv4Fyy7`q68eEt8?FjEbgaM=xS%Tr``euUPkVF}8HV3=VmnqR8s0(~_y+Ey1 zs~JM&_}C0~GuSQQZ-7T~r}j4)!ldw*=+|3@`Fnwv3BYo~8~!WAJl^rwcAI*q(BcAE zcY~A%({&M_fm2BMM*oAMD&u(-aQprn{%CKNVDL>P*dV=o>G5acJ;r6qsChV#kQxsX{e~bQ=aM%^K!z4wO|LRQiiU%HT0bJY5(SRe|s_TfBO%c z%t|RN;O*PElBy8~RvP!3$DIfbgu40l2sqvJhX2XH)2z$Tzan_};(qAW_c9dgK=qta zHTPOpQg`Z;#@(di@-c(2ss0`kpO=Fk%}jVk?*<7h3Ee(A}M0iJ?e?xiCBn-ZdQ~j5a z1ApGb3bEwgGQkemh-ipp1+D_V(7h%Y_~R6U73gjIfON52y?OG-7Q_3IlvUJo)FHgmjdm*T#RMjQ_SU{JYBd z?}0>gV-6b8_$sw$BsvMUddOX1z!DFUn4UjCJhl;C5GzZ!6{9ge4dbIu!{O1~t)hL?R^NaK_@auk_?OdSiZ=lAowH-iMkYTch45fj84&g5Urhn~TbQts}nb~GD znOee}>Q6uQ@{KU|)+K=iLmH_2Yk|dB26L018}1H*RSCct+h6QF&!*GCOkqN+moRH(Ms6lO9}%3FSYQ( zl<}8rK+5Zn#r*fEKZI2PG)R8O_Kwk^et`?(&(q(T(#v99`yD^f3N~@`{&j{gwA0_OqmOF~{fE{*L8A#5y9He&3sFoJeYJsNAP*3ulhN zTX4#M+uKm&OEOz8rV58&$O|!0*1a!wxL^a|i@nj=#<|QPTl6UX#Uy6gGZdw5633!fd3o|RRNN(}L4CB{oWKgq&(;Cht5(ZJodDnAZFL=p&W zc{X5jA+iBs!x;nDd;0&MH(&PoxUP(~jL30>1yF--WbgMF10bK5<;-fG%_R*SGi8z(IE0bH}9byH^pMji-kzaDmy&BGv?G*3XS;@9U4#`>@Y;pBQ+rfd_Ng+J@qlmyry%<`!>VZ)qZ}g^a(-#I&zzGHRuT^)alSfnfok3EW}eg$AAje7S|^ zQPt&#M5=?vZJePy-nwyMV8e(SY*Q)ph2*OZLA{2GfsyzenIDixn8*8ry-{B z*XtUsj*A8eND$a4MV0w2Y7Pu>A*wINg$BL>xJdxg!+sfFi%VKPY+(Hjb(XJjJY$~+ z;3)9fe(}Dj<#qSF{F~Zl zLjVy;+`UGlx->Osk1GJm1jzBvnK?f?$ppyn79T#zp_ss5SvZ+F@4vhpH=}_7%QiLf z!(zGCThM1HPqhRNf;~*SK5CvL7=H-@ZiK!Jhh{O?pD*|{Z;mlz;wgn%zaQY1F+RJnU8qf^a8%3W?v*13( z?K-t=^(5+4=_x@13tX zV;>YmhsJy7wlel>!uXGbNKei92e1(9ut&VRUahNMOpM3IMR&T8_UgEN!GKYWX=a-7 z%*-=V&j22WW7FSe;iJBZ&=E23hq!XWbLT50kONP{~!~5=sC+V_4kqeO7IyfTb zycl8lb#tIZ7+_u^^IHqJy`b6BSE~KRTKX=-X_{lsWtj_ij;J#L(NN>OZgQ;Mue#0a z{nw0sWS!`;Xq&-!9p1kM$1^AUTmIT*NdLze03-hqq%^MrzBF#IjL&jy&@JIZzp-WJ zg}~ES`M&7`m}IcF3kN>}8=EkCyf^A&2L{%U!Y~smeYwB4uu;HT<~<)<7v`CI`GOS~ zX|ErZ>}NzvT^p&>S7^%QGP@YF|n(042`&*CUDh6HI4z*l>C<`FRQRM&-480N60J0)r(Q?3G z;C05orCH)vvNs|>eH^c{dN}a=VP_w>K05Y&>i;!Bn#b@*kh4v78l}44;}MkS;GH8l zUBd3@GBy6e&KsI#n6A$$E~fwNco|-x+6=B^k}+W3BrZ?^+~E+W#nswQ**1R#hZApj zGstpp>~mOqs`tVtz7%ih4ELsm^}@&Lb1%5$DgX7n@_5!n`JTLKia*>>n};cHe`@qq zn^0YvCo2+?-S}2Ue|5|X1bl*10|+Rbji2{V_J;Bn;7@@EsOEN<{|_5D{RUSCRqh8H zV1RD{K1oM1LgKg&uD?kr{8^^jBgu*Y2?k<%-;xC|aR4y)F^PEo+Tcx;@$WL6%S4u@ zNsvh8(wby=Hly*6dH(XTPL5nq<3N_y%F;iZqHszlwf$GSaL+;5I_uN`FWX~~Fl08k z&reWuNO-YR?fe{ur8D9|%UOCUru1cSK@=yeBzp6KFuaBH+=n5fxqyw#0|G<`y+PGf zXWeH&PrZJlJbq>Thr-YYdOwupy#@j6$^&22hy`5$A44}btqEWA!mk~Cgh#0_fZ|Bf-!;btbh%K(^muN*eajr9sO(fZ`jsEWw|BwE@*fo<% zsD3VNjp3~WI5vT;O(D>RM7G_3+Dj4gIKu zkvH_RH~Q40_u2XDnY$0he~l{9X-#?hYu>0&4Zf`1NA(FYN)tr)!;Z!9^>Zu3e{mfd z7hT$KO!ir_03lBxGY%L(1-RP4%@+RDxYU}%)FrD=`j9}emky|myJvG=D+@=BZxoaX zBs1=A6+CSdtjlpG)YIUDkx-UqW<7vkhR^*@c!#F?_2d0A{#xuv?NvEGBr22uld+FQ zdjROai}}Z(k^OHHo`2ZSGZ-8AA&pBi>k8Txg9FO&MF-hQav_m6Y6(di^U-6J5jK8&LC zR@CL-lx3;Tto>+l#g z{(C6z8(lLA#Y2<1u?xi&BNNYWnjW)y{;9-24T8%4L!BD78n%cu?h4_w-3;y?z_BrG zl~C?p=KJbE8@=$4X94%t=Tb(!Y|VI~oX6o}j=2;v5!c^{a=74?=eCMVPH&+eKdTJ8 zHuP)Msr~R7GIk&6{LEGx-1Pfxz05_|*4HM#NqhgAo?RV#VB}-FQPyGj`|cub-i%C$ z$s(`aYp-nv+b9_Ti!=Tqv~9gdchE~+Uj@7o_@DyCL7U>t?J!<82(ZA9;F1xf7|yIn z#{-Bb0w0$wfZv#sC4pu2f2$3lr-V&QbD((>0l%?;?mYCbn9#Q* z?6JmnSl$_0^)@WF7I29%17`N=)mY96Hny~|JAk`Nc*wwZ4&~3T7=Xrg%7F6T<{m6* zf2d?5pY1)2Fu$yU!U_;Adfo@g$$_ArLLy!*NzXF^YvTU{q0l!Fo=k?K@NOE@_f-b}5;rJKQ$n&so6f?FHu{(~fM_EgzsRg>h|QD<_TW4v62-936cm{1 zbVGvRx8StT-$g_r*TCszg8++bllmem1<_f?Dj<|0unV6U306^*1O_l}BlB$fyflhA z&EDZl>;|~SIEmdr!&@WTR|}yDBb(-kW;&tf zUJC9E<^QOfR1CC-uRw_r4R|zDfoW#so0fTJBKpxQ!@r=RC*o;E;xE>;00k6K=(38l zY*>-REUPy@C0t@+Ou>G{c3Yff`Slr<#PATf-oo>ZD;s>PWB>#}KD8H2z$5MhrMJG68x`=*oyiDgcOU0cc}ZW>5^^T|;7^`>f3nG3I8*5pesUDEos91s%+ z$qhOz_1wzv&u;LI+K{sPgtA%0xMvA3Cgtk(4GpwW{VDGz)}>5$_9}daInE)wHW z^czoWTE5pb8wyHCZ{nGvca7jgUdb}706@g+m(EPC=a#KNWM<&GIAO1$Xvi>?X|&C~ zJphNPz>W~xF(&eTCgLQTx`w{o=wj4Qk}{2Cyc#nb9knv}YOuAjmt|K{Z{5Tx*M=^8 z%KPu*`S+m~V<7;W*uYBSo!&%)6RZAj!UmVmxZy344Jbud%z#S{8u;IEIeBjej?1Af z!M+GizjBEnAZ#o@*7Nn+K&yH6cfhSi(c3Lu0;k(i-kf_Drvg|50};=mbTvJM|S3m+-q zB&={y1>V)e!-3{FG4vRrcVo}#3l?prut!#t1SJM>0h1yD2KOJM&G6Ry)4qugt`%U0hPyN0bxF1(FfOY2`K)`reC-mJjoU~EKOd7SL@XSXX z3U{+97C=@cOsMq*utrq;NI@VwXJ^2I_U1RszR=;f$S!0<>RHpF26T&BRaWTnR$~BS ziO;i~dzk>vQV?lI3E-OOk8s>ls({lekU=?s|C#yh|FsqUp9BC#dH)(v%JQKv@hwW% zsl51FfAa);tEqVtp==;R=~36*kFEt<_u~5`h_8%)4=+Cx)+E+rJyTiMc?(NG#M6q! z_q)9QSudRJxoNe1uVx1dn)S@O^vil9GpSx2-k>7R%PMJt`E>i4@kP)w(mN#X_wv13y5TbrfHV{HH?^n@(9>1xXZvP>$Ct? z-oF3%ys*P`n7XUbz59dF>1*8e^6;ljOrGe{A5(WEj9G9g?m* zfQ+ZKC|a$o{elKx(}{zGx1Wm!D>~UP zRkt5Y`ZGPx%S7nm7!c^9d-^snkzL|qU_gffWWK_nWwX;6&^{(?JsoXg!ZFLV8K#*R z5bj47p5np5TY!%#5K!I$XJ0+XDZO@%d01=4q2`{rzRwNBiI}fu5}`D0oeqwLrfg^o zfflj7CirH8&vWC3IW?Y}NPnO`ijhw;Aye z4k>3?N3rS|C4-!*_-%ZSQN~`d01!_AoSK=l@c#{54~(7h%J@ee7!&dS2MSn9VV=*o zt|3pz;@4TnsSQ5bV$#1pQx~=7)yGQtR>yJ-f2?F^K(k+ZE@*xd)NIV7mj=6}pO}wH z0D!)wfQuY4K#-y}W0I~$u_rOZK2bm*ga`sFkg+G>f!L)eJ%AtKn1BNKW8f3wR3{dS zJ7D|Od$fTX;t8cXsWgoHbxATi@V6mEQI-F_X8 z^50b;{U32skX{=h_x)QA__t?Puu=Yd%sh&iu|!$D24;`|4pe_F$-HBXg58+p@R#S{ zJwrHE!emwZpJo8`{K_K6f89@(FECaAXzDiFp=Y&Uwn)(MaeV#d^a#qWCUdY{xb zwbDxh0%3Cux;#@5;03py>TSoL2#hl^4g{3I&a7iPOX*)0F~liwXUEUV zRq-Z~&rJ3EX7>H(>B|h~==C=glX`G$m1h+U`G}@ih|K1f@6nWh1N|kCAGDYK5!s0Q823a{SeGqtbFgAb zvD2`C6}A4UY5|=Ps5jB@TZ45SRxAJ$Ds{UU5LiZNK!n_Kd5WHeTLV4=SGNB@1zy=P zFu4QDSNE(8`0bvHR(s>Id=eAcOneyN9jJLbt|ZADMzl;A`%DP}<%@4P*DfRTKU3=~ ztkt2n+ME9QYrN+l0O_E6$U}wTADyy2R5U>ge45)D_SiAYiG53#rWfEb$tE8{nM}sLgEPuE(?-P=SUJ zTCu6Q7-JshEd?x>aA8u(ej9!h9s)N4M?7fk({a((0l;CO$ene$-Loia>i3Bp7$ZUe zy7H^_BTcuil9YNcGI*zfW5x+vO;*+*4FGhNm+T!L=Gq~DdnQ$G$;yyl;NHIU>ZRUt zrXK4qX(mF+rgZRQM!K!l;tYv>w#|@75`gBKkfwzx5OUTvP+=6?;OqQtUIzsYK%hIr z>AKs{n?8sK6@n4)K)@7&!d}n{H$Z?Gi%sC!z**q0y@R=99Wzke0q45%0lHetb{T)o zB-s`(LeJIMkCZ<)i_AwoH?zq5=i#hporhKdZJCp^?k~)mr(s8yI)eFDatjAunV&o{8TJQmRxD0Zszdpv)+5* z?E84xV*}6phD3E=OYR%cObRTh=T}$-2Ew8ogWYwnF`4-P0$~9ymmf-~23{`sHsDbU z?=x_nfpZ=ROlVOG{Oz8g%p^d7o>#GCB7gi0@WX0DGkt!vY0i5SD@m2*lY4FaC3r`% zcI$$Yy%v|~m(NcO4sjI#NBzepL#-nAZ@Vf0QsP;%3ZS5=JKqzSCp-U{I>0HffJe9B z9s`dKR^ERv20+@2H8J1Tan%12;A!;e8nrt1_t285v6^7{d|T~)+r|XVm}E@emyXYs zJpuaAta2mhG4X7KR3P-#1c09i06=;$<3x8r z%@}AlNqLdB58zysfSUHtJH-Lb7NLsjti?>rj?H+WR$P|YST&U@QG81>U{{$>(%G`j?~yXmb`j&>b{={2 zWUTavga>Iue|j7!sD%ka-JQ%mD1~7Qf%u?&w<|o?1=)aDPC&pOkImroN~ab$0nSzu zF^pfnqW@a~fKhW!8vji{L5={A^{i920st3=x3BfTgQuW1!L{O<^uA*fTP5u!SlZCX zTK+~nU{ds5*0dMK%+8?35{fi1$T~cZn&^m`lhxH5yHr#2UXRV|V8Bp$NJb_EmJuK@ z@@&9v1q$r0U<1aBfdJht&H|&-f&XK`U*bXmTe$py)=)s7aY}WBOmV-qex0!JaRZOh zRRl!@-Jk@?G;r0dnCJ3idc>U@) zkA^=_c>2=g*C0XaDQGIys=sskW$b6f#eGbiHnnY1zL6dhwSTEjk28USo^LWSqeQ## znYBGA;shX=G6Z>*#3TWj$psLw!az)@GQfAlb=Vb6Z9+A{ydGlEQ5To%0Ps1$10G{s z51clzeFqe>DqvpvKL!X4>HHBfZ~p~O!B8?|(K>S-zDgw@&cZ~@OSMRV5$g6g1c=YQ z$MraWy%#+PTP?pJA#jvRL&&sv_14l)0WhV9;peX@da?kz{jXe)w#gm_Z3|=37o9T347K=GW4|mFjE@|KH%uzClo+mw%o2KE8QZ&*M8(IwrNW)R8 zc@eJtwn}E3GbCV4U9%&@weh~nz~=)Gd+c$Ybs%6DmmD~k;p`Fwi9MF%`xyA+Pej(s zc!o6=ML~PCrls)@1~GVDA@OtQDc2)QGX8?u$#4mtn>Z1rO)KV`2c$-`Eq!ADvDUvj ztQDyMh^lsrYuvySGMuN^`UKv+2JaifR=MY$w=W$AK<1eQ@Be@>{#SX#zoP&5+3;&E z<{{14zBd3tu`eW>)jW(CovJsww(R}bhG=M(;%VcS=nl;Mh0h@{Z08hahBY=QpU1aruuMS`b?AXtR9kDsj@mp%q2cH!9xD1|I!WmpB z;89@fb{M~A4$>hOuQ8-E_;kPW*lRrSHKxO8rON*_)3t2+UzXJxVf^ve@F-4``JCT; zmpPxUzm6pw%w5ZX^-`=st)y5+Jp4WYN7w($P=M_}H`*dV)4fH=#M|TW+9$yA4cPgG z75(1}0LaY$ko7NP|3`4)r#>1Jt7E~9A>8Y@{zyINJ-$YBlU$Xol`V!p)v+&6ye8p| zTOFg8#@#k)I_+sD>CwHj>w69oV$$=H*0iY)ks*RoQ2HX7(CB*hSO>jrrg2KM!I4{ERlF-8|x2pue%z6JuaDbpTSHojb zwr6d}v@dDzhf&r)ukXZ5YX3({|I7gHyczDdu>G=?_rDMWaFBZZ|2kIUKYMQY2h>Y{ z{6(=|-qa4M>-lTNG#l~wyR!J(WO`%wx@1r-+EiO+qbXjNXz)$T@5x)3j#d{Wa$k0M zI&I*4KcWRj55|;OreR zc>&lyZGi2JUU!FF@Q(s-g=o{D2BVZk%G!hirs>mjV%Eb71QoogZNJHWF7wy+&$#7; zzCl-7=iDXbcoQ-E=x>U->N5Txynlb|8YZh5Go2I|S^5_E=?qQ|`lo-a008yO|3LkR z#y?kh?|&cW=F0F3!*6A>U*^4jN%w2?T}Bq97U_X_H@+^zuQq8r%f4vajo?CtUb7%E z1K6j%tLgb0VjfOWr#YuFPx-$dUuhKSP?GRMbI%CiOB#I+fRSx*W7lq5gcEia00E|| z64*2@6z~yTN#HdW9`PSP(*~@8YT0sKbj3<|&Ew$DJ{n=LYzMp3N2PGtYd@UZ78Z4;2be0T! zyNJ=({Rk3O4h=RWMe{E*dAkgW-tZ<(?>!|%7%H5>VT{Tiy=Lu1ukRP2`Rssc#0{`H{P^vol$Vhu;5ZVLQONuERS zx-ED#TY3L80{|KS-}K)9VShX50YJvyB*b1;#$U(yN8Zz4SI^7ZOu6Zo2~SiThdzyW zQc|mlGLPhSmq~tRK_@C@@FSWAoo$2nVgrvId1516Q_MgB0=v}9qFTPj^Z^2;Z{s^~ z)dE>y0}weH3LMP~0;T{!$g!?lc)Edqz;#@^8hH42*nR;_UOVHM+JrZmk?z!IdKlc6 zm)I^D;$`Qflzxz&?brHk!14Xrf{caSRQ3PYl)l0+lCx7Y;C+EySNy-L{7)zSDHfm% zOn_BWVch|!S6bNm&7TM7p4q;7IBg1ap0A3k5#lI5!S-AkR-|9BfoE`yrYSCk%NYR z1Pti%CKDlg2veM@UWTQw(Kwm=3%sBy}QIHh|<)~)?j(OYmpmBKtlfEAqLz;SC zW{DdKmLMaY=-E~tnDu0SdQ7-uu|a<-@DzUz&j$X+Q?0u!rMqL>IEVWG0055S1)szi z)+$!|ssNS=7NDquU(-XA!YVeP1_ls08WJEMfp!^5BMC1wd@qk)lRJW@)8b8H;a z0T~0kzFchw7+V;d$_7tN9b0AIz>O@7Ofyk7v!0~zrB!*L<6{*KxdH?ue_{a$?9dDo zs5<97Lj36d3Dzg+l@l;SC8?~-H|-pWf#UaN-WwYkSGo2cTs6Rzz=_*o`UP3}OuisRUOU2Y^0Ci-%uroB=!#F1I(xvRA=$;RP^I_=OjMz&HT}#N{rvxR7K6N)ZwmD5`s%T7sMn zS`9n>uVY9842g)jg)5B9WxF3I8g>jgV_R&Rj3>sVsDmbc8!HqE1-udXPFk3OSO#m> z0T|}=eBKcrJRX-VnE|f?z6}>M`Aggc3ZbFB#UoRu_pqO<8?yXQ>n)U|ONmoJAl3t* ztbbN(WW}n7rcQurf+z#*&A=z&y@yuDe{KK}_T*rj4k$1X27V<1)Wh)m1V1YWbfg|j zsy|noQ_AqiHnmuJTbpo?l!&F7e^vV$v&3CTHZ97iHz}II%b)Hq-fQ3X2L2>)!npe1 zdoA2;-~-lyfN|-1*YDuG{W9|jO)|MD40i;4)U*q7=T(CP0w0^ep8;9sZh7G@@fDeC zpZn>+jmGW&H{jZ?j*KYeFcBJV-5Y})e^V5!wpk4}z%SHN{68BgCcygdDFqWy(0>QD zl~iy@2wVf64BU-N2s~=w;ctbV{{Z&;W>`a4h{tO*lRxtokZ9pG#sdJUY*(HiJ@~&c zINjuH{Sy!2nkg9I6@H`rCH%ga9@pfPHl&DD8na{DI+p;WvS72!j$vnWLqjZ{TqjZZ&Wd zRqm&euD$HZz3zWhh!01AK(0KbSWD$Ht0(csJU8nV+IsDxre1=Td6wg-2LbnaBeQAY z%t4s^l{b7T&pdb+Vcj6Wa;k-O?06i!^IkO%7daMb9eoG<+2{M;aLQl9GoBu~lKmA` z@z-bIb^ilfHB2R;7CmGCsl-3k`HwQum?<*UR;~Tg#4A5D&t_#O;DYb_&1G_)tJ-s$*5@8#r%l&o+rWg~aL5|I8id zeV;4gJ%wvfGALjzcQNx982CKk@fOyNunD?MbeAe|VbTl>$nLjRu|w0wM1v|6VcT>K z`c?**x;8*?*q;o%+XH~Z22Q>eCL6do%NIwCzFZHF^%p*)YEfsEvDCDGnMzc** z&@k2q!jpm47aH{xbQm5zp_V0iX=NP5_LGlc}+e zW&BT1A++qtwk)UFIrg##0y568>Dx8&ct|~oi4Lzn zwm{lEe)W84^=q?!hJ7j5&=7A?+%v8(jsA`|`rEjcvmdiARQgWfeZV6H?3OU`{SNHd z8~ULa$FaZ{o+nS>w)$RKDo|iD$i|T8uwB648n}B5qcslYUWv>zxh>nA?@;|+H8u&x7PE$7P1iW|%=YDo2{Id`MkfpZL@mQlu($x##vJ3|( z1wR`$=XFK*>yCY~?qaE|*qE42M;-sHhJR_^ex`nFPP#uq!szb;XDysD&gg%@!r$S% z{A0kGb1)wH-#77{@-k0Re#r$+`zcUR0OPm&;VB>=z;+2|Gx+{3SlfhW0zYct>E0d= zBsve{z3qX(ZXAo%5(G_!3`#$51DihW@xD=cZnm5)A3z%a;J7~-c)vF`n-)$Tg2`s{ ze5Xb}$JG(;ig^^)NLNR{KJ%0g&%RWTb>+=GUeCvHv5+f0n!OTN_V>;Nd$CuCt>XV1 zR9#)yB-<2A0PNcUC2!ij%{99QuU?1kvn%7jFaRhOBR3%459YE? z1k`kYEId!rO=OECKP0UrSV z-ojge6D6D}VLX7ca3ITi`P&QL;P*M6<891qVRECl&n4_`I%eQ)JMjEXw^{#3<8)#U z`eB~Vr{E!<^Ebr?giBD{cVi$RBzOgFSWny9iDv?O?5rUNp!D-^fXi>V*4w><28OSJ z$&b*KXv-pAzoam70Rr~HP$okFW)9Z=5nSfyrnkB`;z~~%G|fINS)Y7*z`EG~4Q17e zV0tqm{x5T7Y{z&dl>er+wf=KVNiQkznDIx@{~0d-rZn)95p4g;D)zrL0HEnaOI)FI znGLcoCa=Fn_sdwnl<}4HcgoAKGkE>l;}*?IrhVi0)9`C{ql4z3mIV9y`%@N<8^?~m z&$?2n_m-|iZ#RcYDVlzK!6m-9?+5#}Feza2w~*y9UiS^+3iv;O^&DPd;Pb7EsSlto z7d^nmO~!Sv9Is1IBbqb_up&b~R0ha6Zr@OVsT2Y;;}ZFA^bGi6VD0N+`!~S82#^VZ z!SFwuD)uiY&3<~yT`a+@$F=_290tC~g8*=eD_i^YJMOFiTA=@L0Iskt=@Nkn>KdPz zK8d*1vj4jbz7XfqA7_;qR+fP|=+?)%m#u_yE4SdA9j;9|lVJmZ`dN!2jec@$- z=wAT57WjSO`M|A?@hA%zzt?4Kk29C^@Gq(+&(OT^di@ARS$RJz`(kNQ)j^*RBv1pb4XH-1r33peewK5oVrgJ zypH3Q1K_2=KgGqea$FU_K3gm!@Zu5A&TLBEe_j43y!OuWzarwYPiW=<*cNY57=Io6 z4~c-f^smg|d)NC*SFDZ>01zsSrlKm;t2wgE$>XQKA=zO3bgW;}{cWB4NI~tM#y`;e zie5MS@%v{q{Gse_0&H72ZCp+GM{!AfcUiczgcBL;OhhdI`CuQtj2GeSfv*u8LIQwi_@-8~;qiN!1^>wWp1A<1^WLH2eda z?RQlfh&7e`?iMb-e+;@zLQPlxu;qLRHi`!0FfL%A=?bv&CUDGG@ zAfPHayUDoIIcUA;%(wf0zS_U(3nJIK#`X4?vzmHN8F$r9v*zH&j9F-eGtcoEz}r0= zv+dFF);`baJF9EH?nRm&0~|)`IUefz-bba20 z@?m({<5%AQQumx)e>-R0y#)RtoYO}V`eGjloBLRQ@Pa~ZvZnrH0ynd6?p?9|z9EHW z8GiYj*A&a4&ck{`a?U!6{}UG8Z{e*5{u}U;GKTT~001BWNklpyFtJO<_c zLXTdf$X~$m+SiJ6*-!9uzFB~9yq>0fvV8ohF!>ZXTe=F0(>w4r1^gOtB6w^AT;};9 zfBn=3K8P6GGK13Rx0nF>WLfK==R6X% ztKr{Ix<8{y^$*g4U;lA(3bzj%@Ty1m8f7s9^?t6XL zHDo&<*1>w6o!?lOnOat5RKgAQ zz@N^a_aiMbr^yQ!j?;X|Qf|}Je7w%taTowvVTz2idPuZV0?{afb_q6&lZ#AwT5mXA zx}DQi9$hfkh8$14Dd_+Have`X@vfa-+s){>rO!*ZNHin6obtDHf z%Swl56>>_P`|t|8+Q4TmAabL%dmMyEws46>omi?OT$IqLxrd02_G|2myA^cabu81Mx_l5|*X=#dwh)MRX1{6gVc@e1BYa(^XgPG~qM)5A?E z3di>+B9AZXVQFof359-7z4=5rZ}25_r%{^m93|<;!d+cf(=9iwp4ot^j{o{?bqRv6 zNHP1u`s`a80Y`X^qYM8TvW&+9;+P77qdKN{-8ZuT{)5)aQ59iC5}@^O0LC{aceInxROaJv1HQD*z-b*ev4Qmi{q2{ z=JyO3b>_6LGbuN`9E%&}>`bk94QCNKIEl95J?)Fh!A1=GSx0y2r+$*;4d4u$ z!Cu0l)Hv1F-?Xbn>6Be1U(v!Iy@wB*rO)0kdI0p-nj7 z<607uRSUFuVi8K{=qj#@F`~lMW^QZ~t{lCnJEac>=bhCD8#sbSw|<}k1NZJk53V7> zkY2z32f0eFMc>Q5e6a6AjX-F)eGL69Zx5!uyP8vhikOTS7I0t}0f0y;32>akyKdAm zrQFGyNrp+Xm2lhl-vIO$1{FYw*<5qV(Yf~w;~vjBv%r_#h4`&Pf3S?o@t3y$JXvxL9b0vZE=k9)TARZC6Zj~41i*^S_@%TTP6DJTs{h~P_ z;YH{DiVqWCg#UxaL%qExPP+2I4(?cM^t)tZ>8JA(fCuL7)>T*S#sC6G9cm#u^ykKu z-VM;N;;79aJi7%B>LZsiCLMqhnS}~ahn7+|&(jDl_ ztwCCLX48IZgh6JxhE3K&m>wKvfV}s0K`qe`fiU>qDo+z#x_lU|WO0(qY{t4n+oBFFrR zqE`2uzGO~rO4sG^kjo?P-p`p=Cnb+~y3@D$m7|a1mkk*)_X1vWcaa0Wf=m64zk$aJ zmjLJf0=KNj#&tz~w(D=JbYje4q zuP-SefD|FI?t;#U$;j9`h>IrMqlf2%9tS7hpL@hsJHj@ozWz&o3A%H%+IF0Ya67Y#sV@({5np$;V|5*`N?Rl%yDj{ zA^#8j*5{}{rR-UO&y!bJ$hc|wL4{c);0P%1m(OTF5ZmvEdmRVvnVMzr^v)M4-=w`s z%R0nVhYgEk1nbczj0s+Yof#jo!6Q z620PyP#n18IwaG-DFyJA+-{wa7E}7T1}+?P1^vyp!fS@cG2t4|j|J(~jZI3m!KBs` z^}Wmbg34xl>_0E$(2IMGS5Qh+Al13mdpw+xp!`D_*yR)$XUAdJbe)PKAc$sg%T%bR9ZiZ4?VbRIS`7!z>uvy0Wej6xu;oFx zKd!m{_{ysfuFSNcM~UZe2NrYT=JY|8r4jfd-ApcVj}U}?%6=@B@i`X|MdFn zg1_7cJzOOGsJ=5W%6`vNtov9vIk|5pEK;kTKdZ>*J_cE0v3x2pk;xbU$7>YzB@-H~ z1{)xsYj1A&ISZC{{4hHyjFCj}BjA<_xx+seGMP7}-vVN@ZCRFv8C!Jx~97z|}V(R$UO(tv>gW zJipEFDoy&Y;bT?1yj@RpD9bxpJp@(+dcT`$WkqXUOQR7?88H(Yzp*nV1hTzhnlH=K2Ti1JS5p_^J3C zj>8;D7H-YMQfm5)i946IrrF==({xz-e-u=RBiPw}eq>qiKfTN&)4k{M5h@u@-+?dt zh(8F zXy$FiQa9NGn^{>9Pu?>j)|Z=*Z`K}|t`}1cU!#?D^yB#J?CpVy29#}=3)|(Hlg!-a zhw8&?5Y!U3C8m#Gr-$DC$mSz;lP8PrwUrvD{}BG)SJ1_g%l+SZW3*$iAy34k`GytPTOz{K>lN`i30&$^MPNxLZJhhdMwxvqx(T1zpFf;JREld)6k4!iI`33ss&cBOZEJRdG4m%65KB`)~ z!^#E(#o~8jV+zlj(+K-WtTS@tZUyJlx7oqrS7LNEW0@5 z=p43Xpu==#kJ?MDTJ)85_7Jpq+(`yTUFzOrc+m{+DhctZ70g<;(ZZBB0; z+|)88x8%!?hwAi5NQ-IX-@QGCa^hf>ZW&3#NOw=|u+r2xpXVuV{5T7=*?@uH`>PAr zR>$&uXPD3IGDEGF{fQ_$nc-Syj^u39pe z)_cOpRbAog^`FPG(TB%^FBWzfg0;M_Z;BmFiGf5F8rH8CnS~zRl$^OhSu}Sa_7O{fvGvS z=pi9Oc>7L}x)4MQCFcH>3>{tp@YzI^MkFTFf(H|kN~XuuVZEo;Fjg!VSWN1zsz6pj58B=u13 zS9Isww}7m6ZKn%D?*~=$?dgHs&lrm_R;N;l90nCAk_EX@a{P}TEI?JZ6D`Nj!iU@# zK5X0n%I>O+SvP%f!xhYPK1(ZOZ%Z{hqbu`E^)+-98FtD|ju!p(|OjkR`xO;UhfxO1lFfD&ms-o5vP{!b8JeRU~rkZ_`V@s}u(EHd78=l)MiH zzJ7sP!Pbv9gNk5u7_2?s*g4S|C`A((GRrBNdwy%4!yCvD@#6#?{Z=)ZQGr!opwdOuo%u^GuQ@us45YeDa}s#nyopv*@1-Hpf8a?Ca(KzPB z9Diz2@GuJ|E>7(&jB%GXLrVA)+O@!godMI(kC8pyG_GzA`_@;@#Kbfx6eAdt<8=KfU_23Dj#T&uguUgE}PmG4z zyzXwDqS=5pCs^Bpq~SlGVH}F+o?Gygyhg^6RGeBAWMeKJEgzCs6KK4b>2^cVf7<=O z^Sv9OsSb9~lVS>S3JbG|7wmZPpK;v$!ENvx`iBY+sQUC18|4wDqLFvvMwf=S1cMyH zUX>#*SsjL17+|#Auwseq2C8-*n?s72Z?}J3cTU0elJ_4LiazdYyI>MReM4TbnSn7p zA3FJMD;}(NQK%@jH@~_Oh;Tkt_cK(wIUcyLoXZ%%ZA*k2NyI$O8q|k|9IVLPBPlP^ zok63Sf*PHq6XfHleb<`ZAPpB@{fSIBA~Ct6v?`6K5-va!$^Nai$=FO{$o53Jj@tH> ztqS2(15wD@;lJ@6NKU_D62A5*(b+OXY+I1&Y3*;UJeh6NAZi4GGKE2nr9l&5k}#Om zVTVEfw@GaLyRCW-H{6^C>|$@m{$^ zSsTQXi#pFx3~&(MH@@jxuK*z+_XZf`>?j_mJS}op_D^>kFYfpI+ItDVpK$b5_{ok% zP@hWH{bQ0h=YNkBmXOf0``t&!8o_blcsmfca+b;v=$B_=)X3Z_ut{zGs6Z>_-{L?- z*m<&PzKq-U52eppPjAK2g4XkDz4H$J#y~Y1kc|WQya>J;sX1#Aq4d$6csgT3;;V_G z9|#>fg)ikyGeQzqOrYQu34KZVo9F9dglemj`oZFeLbCYpr1T zKPE5%jlayC$tW-TP5t}99q|&%re_J1()GU=Rqqlr95J$NV0GRsu1VhCzr@67wDEEi zh&ggC$Mfb%N+l9r@(I8@z89>QQ+vIWb`iLx_QO6okA*GWXQKQ+z(nMH4P^618swyg z55cPaRZ41jN8}ydd>QM--mbmG2H3DT2t6)r=-phR$cJ~<5O>F~uL?UX4Pm2yT$Mc` zGDM*`S?HvPWzC&!9`R)I=$tX|T*-fC`CaGkAr$deQ13_fd8-h<-FhN1Po}evW;m_6 zTpeTC#&@0I^{`KwE1*=gC)ENG&{*(>{W}U^V)S41YFPIkQ>ZVw8txfx zn1O^FHg4N>?z$=RxT!JVxuW^iw&`x-(e(`yx# zLi)4^NpZeZ;+~zSVME`3-}kWIa5dO8(;?^(!sq&Pa7sdhP<_tw0zpLBgMiRft`VfO zy+FHvUDg3GcLR^yfykNg^htsr+CG<{d~UV^wQ~mE|23$6UYSHHe6^mr_7cNK+d|uf zN7HVh#`8egLR){A`E($D7kwKnSQRp{ieYI8=? zcSi3j1d0VK_9pCN?Y~VZLLq}yd_=8_r`u~Z`Fqi%#%khOpwOGkCR@x~a(@kLDhhq+ zihMZ5wf|5^VquDrO4@b3Zk#pdZvd_c;EML(Ck$sir**GLYmpM~SfrkP7l#*4C~MSX zStR>MVHI|UKap(XnIow=-2we}&6A`gl~KCa!o9-D-aQ*1QpZLfoTK4)Z@B$Yh1AOe z{;zB&T!5&~gx`NpeXq=W(D9)5^5z!42<(R#S=rG1gwuvxiqsd@Be@fNa{0t0Pbe?N zv+zCpoNU)2ihV0_Qs6=;^(_hYq(>nRu$_H}na7WuOBKws$)v}xEz@AGu={J3uR-BS zIvbBac+FqF=YL2uizqYx)L+G66jHaTZb?PcM?MJ?QK0}{7x}_y-3uRt&XD1{_;JTU zxd0Kdq2)c&brAa2VERS;YchQ$hJs(1{*1xJq=XauW2xh;k=LCS&t9^TNsC4T?~q10da zrU#t+MV@CY5X=9xLvvBkBc<}!J;Ucc9<4nzFGSv3=9C?v{#}#rsk`V}-?in) zJCDXeN?AyaHlR#)@Ya2#zVT^0C|1BYhw4F=*~&mr&}(H+u@7=Q07ZK31Ic7UX>Qwn zeGXjGcC2GtbUqK^ajSi4TS=jtf-R%Z=JTaf7MY%7YlIKtr*hfQ4iC=<*%n`cvX%Jb zH7bjlX9oY2#P`E%SE8TY=2-dV{WPoO=KRHt*s%sElD0qbECDTiZV|Ph~XGWmo_TbQV8#c!kKJ3-8XL0_6HjuTvRyF5dmb zSAecd$}Djy2-dXm_USeeFc6vc<^V! z3HG?>`9byc6n)+5(|kFX+xu|p?)m2>s3v{`qcd;%NtFhx_=z3#DnF)e*uQK7x6d9Z zk)OS79Ue8=IAPa|6+LXvzYM^4%H!LVoH~98a9=ZSbwDqyZ6)Sx1p)lgm|ce^Ex!lu zi-L2*ZG6iitFxZnH`J;=ygB~+_n2#4{3?qp55#0S#+elif?%p2um4235qCxZDICmB z%W@ro3GwjY6tKc}$;T$28au2NoJ$~`rJW4(-r>L3Q>8zrT`W(pCjPlv#8=L;(&6q1 z)J8sh{f=vC#d&kh<&h6V64CvmCaT)?$+hK1DXd zhG$8m^tgRTwVSy5ey^oBb3nAkF`UigZ0*#P5*U{L9-rd6wP=D_CHFTHW^#ABv z#1p^<)&MQ&KQE15Laerexpm~|pI305f&7t^Kc~zcG7^d)U}b(Xfcw=udhh@I$yHKm zS~L!!>~qK7QRKll@4CjU6}bJ$u<|fd6)E7cFql{j z_fNLEdTt#+bQF*!_pRmpI1O6&a@BXgypo_JmB~cV1JiRMGT?`rYp8%h(1PC0%lbPf zL0#v^U=Z^^;kM+J1`Bq}lfCI%h-R+~FaGW0L6uZ3y-Xr9_5i{t^ZPZzq~G`~`gij` zd6zv!*%KCi3W2VdeY%AB^iG#$Rh)eU!R_ zr>gT?7`Zh}+>^tqHT|i0S^awBMt)30j4jm;*7yxjoJ&pkJH$I)3-h+#--aQ9QM3>+$HNM5Y|4CN90|0e{u#5lj2;cy0gO% zQqFP^Uv^3yC#jx6Zs4)rE~7>y$?>M?5m|DPLAT&H+TW6YD$sylquf=EP&&?q=^=1g zkJ)T5jhj|E*?@AmE(ufqH~JHAtM6#PJ-8Qkox% zf#@G3!GNw9a^(M#ROX1K#YwwBq~>v#QMQ+YUVBpyC!1|<)%PnZ=t1Kl9L`1b(M{hD*@ z@Tb39YcGr^q<<8QGg_I;Q~F* zXGp_d=5<8nj)SLB0PwZ7BzoWxlTF{}h_S+ihg5RA7!`4_1!_;=lePE%xB$Cn#?OrH zl$XwBQsg*ciQdU4-qKkIaFNaj3EO`3tfUS-N6}K`_BvDAAR|2T5iTT>0;KV8QciEFWWnrn^pJvb9MEn3bh^1 zZEt<^EYF+GNSCW$m1w+;jPHJBsoO=#f|gV(N|`2Ys048iDDIOlt?Oj!qhp!b!AI`U z+_wwNKC`~i=SAhe|7KnPl6=**M4*u-O<4TGd%YE!FPaDlW6h~X5fp;4PZj`_0;=GZ zGXzX-lotB}R&g8%CP!^A4{gv3Ks4`Ht{+P# zp#w=_cA3|sn`)^UN$=nGZ-Ze^@`xGPpP^swzvnRywXc{pl$ihSZ@o*Y_<3x|s_44< zw$Dn=3BHr#F#P+0eb;l(MW}K%k=i?!w3z=wc;h?0s6-iklIIWe@E;24&p}o~rfJY7 zJy3o!o3CY8D~|z3cg(esvBw3!=w_qr{d9b4s_%NehAYeYcMqO))K449eYd)6C+nvqr>;tu(}f^5 zC+f}5uIxwe+6YCZo~XUJd24$HN&jt?;|}QI;Z%xQ2=T@*Ne%+nxc_jy3~G3 zAop1>^C}sl)DEv%<-;h1U^tbkQAo+b_4m7tZe*XkjvDA`2*`(IBl_0SsL>zQksQ8o zwlZSQ5pTv#lgy#~9?iW@RsPRC#b9JzS^RG@w9XrcpiVu%3xk5I!NSBM6`{nn@cT=J zly~M?^4Eq}M0%O^&(4rtndSV*SqV4bG4<6t9ToMHPL*CCw>wI-dpE4}O2NwI=f-<) zt$^cFI!uz?D8wvy@2aTT4sqQDB5JPa3(?7P{Po_iET5tgvgrM=S+%eq3ToUiN{4Cn zGWN$RDtFIjou936tvmbvYQmN*4g9kEwOji+phMj1E2|6HVRIbpQ*5GY*&r$|+4ofE z=k6cDijP^@Kg%Kja_1A_DtLFa1vVew7VmyeGVO^dM0kK~=w(Z%_RJ={+>E>>vAmY#L` zxn;THJvbOXfGbvBZWT_bsO;-uG|(ZgSvP6!13xsq6V9A|TMMPR3cb8v;soj>@3IOd z6x@IpJfii*pqH*ab$HqVkWoFv7 zr|FF!UQ96(tQftin#Q+ennz~nF$Oe*OYz7{9cJw$Tn*~!xgZ-UsQjLF4T-Cf9BQMj z4i5Bk@MVq0av9)=f&~nS*aR)1@9lycG*bH^4}mX~G#{kau&0R8w@I_ShPg5#%p}IM z1&=!|oE7fp@5OX@DG3D;sm*G~+_(~fkuK%$e((hCSKab4eXIVv1&$LgO_T1_pbl5t zPtxsz>Lsjj;ZQ~)jkOy&h0)qf9`w^|%+2eJkZ$I(m6*kk$crFL%&{x+nKN-g42J5e z)USD{qP0@DVgzj5sj>c+{#Qv>EAjPx(Lr@L{$F0UEG^}8vkj3N0v$>SRZOeJ@Uf(V zoX5Q%x7pU4--Y@+tU7Sju)oJ$`+>SuoM%O^!Wc@SuwlE_*%z&MmTEb^`sNuIh3;%4 zKJX^to&j-2bPr{22-Gdk#6gk6WvmHM`KAhotMe>E&;l~GL}XwWR@isL<#{=J(53)B zbO2$l0SslgLL=v;z-bts`8Ez_lAf81N8hf~&A9%8;WJ3U|9`+#pr?S}qx+w3VkM!T zr=K3~QnKu~Bcp(Nu&1AH)M0IpzqIz4;s}LR;$|`Mmx@FxPObNDeMCGItawsz0Vy6N zKI|5W^CQ}aq7$+g7)!%M$P|*03rt1H#cx5C_AP@nG1`>dsKOW>*Dc1iEj;s(BF#4B z;Bf!j<>OvR{vq-f51{$v{8%QM`Cqd6#=WmT((m|ZcY{sI^6wjl3e z&U}-#mCq#bs$i}!tNcWC{rIY<+}$F;zVnkx-6vkLo4NZNq7xZMWb&t-Tk}iN&3=4z zy^8$~R|PdzlA2pz`ZZFwXK@Tc){Mzl zhVmhI=^NT*aJ+Z!p1I^40Z(A|UW#i^|G0mDdVc(^M3FqAjF}lC@pmWrXDB0R-L+N?0O)MnkaY%B+Z*tP6&aW%8 zY@bjE-GeB2kn%eArTnRCr2nm4AA<;&D|Nj@>#`bB>O5o!`BrhQh=%R^m6E9C@`jBX zx!(p=b7_Ho2UVpJsmdi!6FgQ-_q-z`o{E$V!kJCDa{V)EY#q+wy+gNDu>4%;t0jz6 zm*GIFs$!d2{%f-w)8S&KK^>ZEY}ci^IS9Q@^w*zCt4Ad*Si}Z-$C^rd#GDn!g%U;@ zVgR45borj_MJi|0R``AE^)tICR+MtPn}yWClTl|&^aINCB)kb=jx7z_gWq8;vVE=Y zTBeQ$9?Bmw2Rs=VA380?G+SqcEJXfiMzHb|Fr+JtEtl+Y=}eg{*H>KLzd!z;1i|{j zlZ3nV$*c?O-=uBhGJs3kJ)m2PY*G<3>H^pyGU#ctH4pzVedv#S@#9Z4`!ZgsHrXV| z_OhJDGKt4p^O-Gpu`aA`!UL0YSDNPi^OV6)fJse2ie>}C#}0xAA;cA=Y&xNkoGdL}Q1cyAe#?%e7(ZGGan)O=Nc3Ekw; zwoS%#Q0D7)v+|zm*OaO*?)R8~--&=7E6gORGPx-~T^iVYdxEz@Jki3)KDAn*72`GWEOaK@(lEe{>d$}kyq_Xa?(_XgaB>pAhyC`o5AKKM zD{G=(;PY=Uu?<&RdrO@|MiguY9@9kGV$1&C>JF~{AW!&qQ`DT4f;6v@`sLTW_1sd7 z-_Tp}lfYM@9!&eMD94*9N-CZU2oT8O!0#HA;Tg)vC0lH(oQrMMZVx)hcCXfJZVcU8 zk3L0Nb^aL>Nxwr0qAE@n->AOULhW2BXZBN0dq0VCaf7NhEld~md=+%t z8T4Rz6ah87clO+nq(cVP&f}-(bit_GYC=Og(PcRf!W03CV+T$ZUigX}9`N9`A3jBn zu70;t)g{o<+f!o_LnEsG+Y+ChlvSV$oNyML>b8Al*OH)q+B+H;)P`7JL%MyVBys9r zqgn7!=hII+FerH725v-(K1G?@S=+5!g7^c>XZ%Ism>;nwky_$Fp~ZjQ?UCDLYuM41 z;iB!jEPcrm!n7Y7yVRe(UMjDKhb%|fD{0lB`mQ`Z940biq7vyW8=c!0Y=e*YNhy0P ze)TE48hZt3Jc(ieNtqnX)b?(#7v6bp3!2ZZh@s4P#YWuv{OXRpi}=qKBu}Uo)xC+W zKm1Q+p0tHwX4bpyRSm}}G~8$iRtQuG`x#0idZe9Ui9!wdXyfyjzqav9CKHWnk!5DaeZqXBDoe_=-}-iemjC zZuH$kx(J4OZI}uMoxh`@EaClZOPRmbu3tQ<=mBU}gG}A*qkR=+3x}?TnYyD8UuQBw zkUTclflVgGe}w%rj)jm^%lb9i^YI?Ii3%vR{dA>nw0I4rAxX9HQ{wt|-?!bWmm9+~ z67FN}A<~Vs<&dmjNqk=`io}2U`DvIE1z)fHu$CZXiGFmirt;*y;h~Tkq`op<@%I>m z=@=4@AMK9*C{x3)HFbJeyV*kBP1d~~{`*}W>GWfTmV;^jpYn`%cK2fU9pp?7#(}FHs|%}h83(m zWJrg3sPFtuw@2O;mrBcEa8XjmR0+aPJ?-3(e$`o`=kUdN?elrue6AlUVoJ=Bii>l{K#ad0rfa&69T0(T|$P# z_d*O*Fa{F3*A?dJF!1%EZ&pUx9W~}ArKVq{Jo1oGX|DGrM6Xf!n`Coj@nBxm=Q{~A zBre9uZOn242BkE6L9?8*-lIz$F=z?nX+64^MoZE=RE$~CE+zYY`^m@;KY#PU0Z{F} zhIwwZJe`?nwjTXHI$ObTUSDpEJ4l$H$^1S!LePB2!Lu>VdJ^;~sv)H=jM53|;r8)onf z>zwrnl%-X+2zkLaMpaQo?>qjwpiV#j^1HdN=}hjk4ldrt5_d6vSehG2DRDO1l>RAg z*!`qGR4N0UYVzbsq&d~{=yGqPqn#5H3%}++tDtvPWvJ37zWn-q)j;rYh6G4@Hdy|) zfvq%JhOqv`e#ED9V5hkV^sYQSn*xzd$?VGsizBVn(R$vOTGDjKZ8K0jz9@wHwn59{{i`RAxz+35a>fcH?z1Y-!K-+syO7UG!XV}-LOhm)`Oo!(u3 zw`c`f2PwO}2J3f_*cB=d++XB^hsI+Dq1K+kRf}iKkC~ z40DoxIqkvylwz@w{DhS$%&DWTY0+x5MF+^x4MJCjRX~t{;UJbC(-N44gBvVx1!7#70>Pg#-*95@T{P&P2yZkk~ zF;A#T)aLYOP$c(yAer+f24H3pd?OEn$AmtPv;vz(eWH&de2D1)nWRoUy*yWg%duK~JWwVZE3{P3`T zexbN_j$Ei^+48MMon7xFi{qq_qbya2Sk_fSD&6H3>LFP{9A(ED7;+LWp!@n9zDXw7 z-H!~H(f5e*=wXDda^552Q_Ct%7j5lV4S~FW?mZ$26snj^pB1OgcGDEk&lWLaMDpY` zV8PU$5iX~T1s}Hy*8%sfdsnF`8&||vd$I`GgjJ}%43z3S$qaqW4phQ`^|UKm0vNzt zydleW)5I!)0*9u}t^kY$qJ7rjhu|&Q!4L4ykxX|^^xFe^39CmPmxslqFEvm|#bl34 z_;-{_TealvlYmfNQ@~mdf%1u;X0FFx>YrWQ>w}`|2C$A?4D0&?(ey2>xPEl8>PI!m zjOs)ZOVs#24BBw_eyIYLL-E9=o~_WJN*1i*r!LHUPc1u^a&`fJ6BNOl3;MLeoJ)OP zNV7aTu%kc*Ri*hTi0jMfcpgfyB+0FGiY#As7RfSw};T-;7+3G84w0}7R^k`;jn_6j0F`SVK1Ov1A;78$}#2S z1D~ji730?U@f*XMs$9`g+kh@jne_Nfx&Q(S}BTo z-6GmL1tCBWVT}CibhLze9Y3>B@$nj z*OyjCpOlk+r(cv(=yzcv>5;B2-`9vQT=Huu7VqrYcM%hE?mX^*cV76^^};1fUgVhq zM;0YZE+nnbPMp^)$F>~6%G5ZNH(o|}MK10t0^ zxLI@cjlM>BG9&=Jmc#@)DK32W>zNU_!W;yhkt#}AwT~dT6sZtXy?Y2dHxQFkGhqes zF{Axrr@|~TArY7uIq&+xC{6+Ip$!x)32v`?TeLqYROrUKUk=Zwi+FQ8;a5YIF9?a@ zF*e@;&d{ez!#pOKaUy2EZwriU3pPdA&y#vLn`Mc#UG0~}P~(5o%r71dtY_Ar41+QE z>4AM|zA@9zrav)`nuRas|J(m>^R9M*N!uL?vYaF5{XM@8#!`0Af=9ca-)dgi$2P6Xu}O6PntTiGCL%cMV@=9e0ff?Z6a%?MFgtnkRU;6;tgL}gf@&;p#X z4R~Yn5*eq_!TREB_{9OLgg8kSIIZlemPFh~w=(+MQ-9oqye!Z;2<^gSLpI=8A;|~j zRGXZHgPYpge8DjY&k!GE8RBe<9CQ^dlh5$pX}oU7cLQSd8v24Npjo%WJWM<3r?8V1 z^osNS7(@tQAdy~#4xSA%bRyBw=s~`tOC|3MGK)<{#^941In_dy%<_33W@e;+B)TNg zXr9n<-Y~-w$yU7Oj^d7$Kz=B4E+I7J`4rrGZoYGXwqFc-^~CA^@iOV!_KZ-VQO6zq zW6~zPTdIf%*qY=o#tt5lx7la^oUU1&I=1B1qZSXQ9K*Gl@HyvXXCm|)j~HuuW}@mn zCe+VwIn4Mk)E;B)#Xkl5kpJR(yw4Q+{;GIWu z{3KF|9%Xn4|1AUb-08fO!`UMddAS{eP7ylDF%21P7-!F7F%A4z2~P!hZae#x~B0+}YGWB0*0fMPI>Zjk_D@gVIgdmTXLZ2Y4dyt(O!B{vCh%gbx zcLlt|{xAf8z^F4Z3;QG4RdB9F`DWlqHs_gMeZl;z#Edr|Vnu)No*0TF(&tEh763OqSPrO7_PjlLj^n2tbr2>V~6h0V@LWX&a_H>Oyni4^|B zxA|xm4Qs)Xa1UfGo?HLF)UdiehjD7QvPZo}vHJnk?7XSc<-5E^Od;tUiLX_q|D;92 z&dcdSA`bq} z?EdgWYMhQ1Xh4zb46Rb;+w9GitGfeOC&Vd>_-MrX^vaGtU_o(j~FU<7XdVI@vvl!@Ue&M2&2(B-y(8pnQD4jxJ^2@>Q z5yKJmBSnpov^)pMSE~ZcbFyDW0qUGNj=!GR=df|JJDe)|C6|gUo2&2bRTRZhbR5E- z9QZ&-W7G9~932k5TR5FI>49TLKuT|ir)Ot9uLH+iui~sbBI=1^A0&17sP>vsQ$U4x z`{-DA?cLFeoMldEA^MV39Qop(Qd*WxtT+P!gs`7L26EcrZ{p}2ra46($+!bKgnnUv zVn@@j@R*3KoOBQY%5wxfP$6PB@TwA(sew_ArX$uTXMUV$zv8A*RM$nvgxu7yfc*fg zUFUj+W7ITWmqwel#wc?f(MRO}ZmFtVzwrJ*p-K7oKSSg{o= zdSynH1=h#;#~`d<=0hachhdQWGRUDY6~)jhnt*nRn@M(Vxp~W9xuG~goM|}Y5GJk! zHm%hCH^EV51qS@z+V_JA{Ztid@A4l|0FxUt5e$Ufm}BqPer5*h&p5ums0{hysgO~@ zxjrK?Hcp@iS}hU2{>%8t4{A_R@MVtFnril_V_wWX=$EK~Mwsrtpu^Ew>}l0cc1_!; z@oTlwnX5k5ZRd9})_G@1Wuz23g6j71_>Eg8B!snJJe=<=%30gP;P0sXwm{RXgDD-! z&pqV4GI{D@7$i^Bjmrr$(5&pQY7=LYmh~O^lxyk@+cS`eo?ga*FKQ)ELDKZPX@hZY zgR0c%S#6hV&K}G>3q`LRuzpcYN{{%+o2m<+|LN;7#%h(Y&x=OYW0cl)&qcgInNOoW zna70-r$eLvHJ{0XOt%(r>WG<2t+a~Cl;CXl9f2j%{7o5Pn+h6h?|sc&oVNF6cuN{<&vc~YrcniDFoO6O?kE5>hcWY}{V#OqN> zkvGZtcjQe1x9K*1&W^^fb({C4NmOA_*q?P#%qWOD@yvft!3F!DeUM-!3`*a2y5935 zj8U06tU6p;j|=y3``CNuxft+-+D3;q)_iE|o@+u>$vgb*AOEmF_y!(5_R z;bv^lueN9m$P){2v>q`;2;JNUqz7J>biF)zkTV8vf4B^xTGNjk4MC{xD!O{J#C02= zzipishTb%wn-0obd+d*#D3Egl3p<*I)QW(~4cljHG%6(}Vcd(CT!yVncPGuAL|ZAJ za7Dl}~793OxiU{CbQe-t=i}|2A2Bt)+Iet6`i^6@j9K z+4oFYTI}0DUz#cBAC!A_dj-lZy(zp4A$#YzRmayffi5~!!0}R&@;H=jvB#QiKt=8x zC3MZ}e7^BU;Y-AfBO{5iRUCDniFtBRulf;wm+CILJ`1)u%l{czr zI7X8KnbEnGCAZ#1C!qK>&FZLNoB7la4tklJ)V!zB5bocYxBfpafMuP!Arz2%?>?hI z(Y#8IlBcg$yuaGgHR~p@bOlN$&ypN>Aa*b~4<|uX6IwQS!AK5=2FK)luc)s}lQAFv zE}^d1h!3IVeixsL>!%8(yhibEoCa|myf3_N)TShJ_^yW-TiB{|9thH;6^HN@j)K1+xQ2Gp6%W3&FGykJIWW7G zeU}$M>7h)`G7QM#FbN)*A3GY_n{ZW;^BL?|$N?MCQ?ovMu9m!K2DAjp{-bCyJW>t# z6_Yx8=&}(E5l2G~5zvoPv3MVz^`N(f`f?ENH>A2R>A_F)Pb>w9+{twyN6W;A5wX-{ z9hz65|21xl*HzCFJY|}Q21w)Z>?hlTjcKCc;lSfnNHPfcOF@bg&7&5`NdM4Fj_kEDcxbc1w>bj<)N zDIp!gAl)N1$kfaChxZ>iYn^q@+Iu~FU-xzA6MZIoChYgpinFxZcr`um+9))cyZ}Q8 z3)6~{pu6dM@w;WJ`v^92zVhu>_AgbJ>lQVpX=F2AI#dsUv!7l>6lV{!pgOUyPV}mr zq6~E0aO=lahSokc#cF2PHz5Gp8D5Z zJ}dM6n;2>nRZtnRy9$(fED4Y_GALB%eK%)Xt;#l@F-WP~^YkAzM6*~|JGiI#8q>6* z`+@-TG%1V)88T%%{>-(Pq7=u~9)PD*4z2MvHROTNT_f|8ifib}Q^{{*W1zLK2Zu0@ z1a+vPAetfDs&7M)FNF|k(gnY)VKftV%qv6@j!hT9f#zJ8MJsF^XUnWg77}rmfL>#d(a~3qLQ=DbQLx+Yqwc z$_iWyY><%)gaTHfNsAYBp7o4YjaOfKx8aKv|r zq>91LGG$v#_Oj|}nh~G8IH}xooXw*apGt-tx$`e-&_b60ynE;y;9Go5Pi8sfvpp2s zci6@8+1x1((=+^$O7c6W<%^Fxsc(yA?SdUtzvLMdnkF+`^9gUEjLd4fb>jwUN^CiU z4?Q!8S!sbyx%HBK6|r~!(+{rzN4(n^E`4{GPzg=|j^x+e-)g;tL+98+gjuQC| z4Fk(klC=6U-VgePwKJ4@y%*##O>buu*PB-Q2gdj_?rHRW;MLi{2oa!rZQb(3pL}Iw z5d)q#hv2!dzoiEJR^y(Ue3kkR-1Z6J^p&+#D^TpaWM;U=$=k*HsoQ%L+-@?`RwIK| z$~Wlx8#W|m$mFQeQfOm->tXC&W%z$98eu8dHj=4yBiK0CTS5YkXTh+_<*G&Ur| z^&Q<7n$kje=+?s#rEY63exFvQOW}B5*50MNiM;Pj@Mc!$@*c6}eGIn1;qxtO8LW4? zr`6OLF^al17AOPf$~D7?d-ykJ43SHs%Hhyfq8I!`7U&NRp?(wOL?lBK#@2_Wu>kvZ zT!c<}uZ{{bnMu!qU~Tuhqg_8#j(szt@uiTLtfy6ufs-g5t?}Aueg%(U(%R$l6z4%_ zwNU`l_Ea|@5#i5t1!e)>4hN3nxV#2qmQr@ zh`rB!*9Hh8-4m>qHYVgpe3yglrz<6;twvo9G*86{_37DfcUMpHfD9q_7k@AD%Dpq? z1ER`VBW_~Q8VbUFbu1tNP8Ktq1R0tW%)S!sb0FbpE-b6uXb4*!z)^zIibLRwG;3gn z&{^qIsgB2BFs~P0Brr6B*s}e>j4ICPc(D+9FGh_HNuyKW@uwBs(fX^*^3sE11-2D1 z5{uX11;YEKa_+|u8^`ImzXN*qTb%foXFiD&BBRvr;u<}(D2zX0xTKM(RH2NEq-|!X zDL&STBodWIJITL%eksI6>&@GDUs~fe8xOf6Rq$SnziOiUF`hv&y~AjUfe}S3~V0^AEpAb4yY7snyR+ zJzs{HHs(6qIA$0gWr6~B9)!-ey0%}@IT)phwXLkne-7y`=K3>Ra*W*D-=CvyNBtZ} zi*TThvFlx4WxuNzU2^X4UY#2hf_hnU<-wodrBsHCMjm)_w?&Jc=O;Hm)HcNthYkD; zOhrSEno?m?B9VsCz|JnDjIi5$G0jUX`(g6VG2d4rNpm{hnWbCZg}wO9rw-(H6{n+R zEdoTxkp!)8Q5nCe~TtOH`1SZC(|$S z^NE9qgr(;jE$vu55EM_pv;k3ZX^#37y0aF+FWUd}yDzrox>md_T1Go{n{$azIV1LZ z%lU41yjUzg3-Uf~E z;V`GzK}3}c!ci>pQu(!y-FX{3V*)m28n(wHj9;_~?T4EEOuxeEW&dj`lVr1@Y)q@N z+nqo1({y0Wtw(*xhKnhpjVX{;d-i{RaQo_)wKOK#;3IlwjnQA1Y#=rMbIN?`HjCCN8dA5lmav~e>Ql7w_aQc4ZRP1qXns%Wnx|QKa#HV zBh0Ht=Mdgo))oW{!@+#1yg+bUh$w)hf$-I8!#EDw;4#q8vZGe5Dkr$*IO@%;6c3KS zRkjPDb?9ek^h*A^CTIj!xrC9)9oeM!9jt)MorouBW22s->t_9YNE+3QtvdM}H#9yo z5#c1v5Mc7BF?g>IsKN7u+gi9|)%DSbJQ%tVru!|Si2~eN0>WK)lRWHhxz2Xc$!G3=!A zD+##H4mTHe1%Wwwl~(c)f@PP6MR3^ZYVn)8#H?^`Co+t8v)ViR;H4sXh!HgYP!iur zT93JLu`&tvC>42 zQtwtkK2uJ%B<*sDQW@t6i(;H4-OgX)8;jv=S6-zP+Fm5BU4#|VopJNUz4t?-(O*6q z#J24F_mZx+l0_%J$Mq67Nlm zZJ!a~V1)tuK}n0nV#VGRxj%-(QGNW!{gZ}fSf2ogLI@oToSZ#ntB~uR8hh)%BdMMT zNry8tWUu9idBybCg<*2LOBq!j$XfR3dJvmpgjF^yta7yL;EKjo%`wFprX_{`*R3l zMH2jVEZJ>3PvN_kb)B$uDYDN)<9VSFWbv!^B~J~VJRjTLI?ny%b9cGLQ{s&razopP zw=%;rH;Y2!-$^POyMOynehO~iYyO#p^rvY4`97zQD_IdM%~9u$I3Gerp^3bI#HnE6 zJ-u`19t4Oc5%}UCH38B`ua=+IZXAW>J7({nClmXvDieBAwdkILa4rdlXd+?BOAi%HrN2Lu+@NCaI6(sQH#(j|(3TlEXH6{}R zEp~wS?oN;Nkt>$NM{4B7TyIi_mKkeSOw9fiQEnoIWgapq6W*XX@n)iSSwlzCH=ERt z6t#BGbSebomX=rvFj08i-7@=WK&_tLRhNGwFz1cnJ8a`m|0bxt?9z)^G#j!6glE>T z*sG(2zAPS|_#W3s@*pQ3XwUf%{PgV6i$3wJvD6oSc}y^mTSB$cVO>M0sUZ=Cb6^Xj zXiZn1tIBJ1(`$-(e3UHjeFkOYS`OOsQ|Gd7qB|C$Y34{%7e4`Wc{i{e|K_z1h|_m%$ZZGK_^$`?b4eG; z8rEk=#KD2U195&q{&hYZR6a}f!+^!{udOri9e4=HlAC9}ln8tzgrSQ3$rUa@v733K zyVwnYn?h*>0%pZo5l?n;4qs6P9iYP4K!4UC*+YfSgSvooeW$;Q7OE_7>?n%$Hf1b{ zOCm*!j-m&w7xtpvFBiVl!Cj|=!u2A&wrn|-+{QLYfZC;zWce>+U{-a- zO+a~cEZC@N1(tYpF-$hguw)yAD28KQnm+@BU{*6n{@T69?J-28do-x>h4_<+8I)+1 zWt9`ihC}3wyg{r(V4!rxfz_ahDyk9n6bc75d_a12~kvq4^$%}_3Nmn$++=FU5SPxcA5V_;Uy|FXQ2h@e&bV2+VA~Jd(j*kjm zyJq5~Bc+nm_ushcrudi@Q=MC>oaND#(0umcEt#RQGAKB2>iIB{FH?hZT>LPzX#d60 zVdB|A>WxKtG?~>w(F@pn&hc&W8>P=+N{oJtn#bj=)HCEBi&AUslF_t z9wL+I9`#D9tuGfGdS>vPy7nc-%kMD&8eGa}D9jQg{~PpGAigjWf?tqR{srmV(>k4c z_Ev$tj+fyOpL>DqLnAJoZI=WI27VD&MX@~DEcQRUXv0fsVFiYQ{jIgIw!GabC~n!m zyu>*y^KbhiyMDlDY43I419(_F>rF^{2j2myXQzwiZyYT%w^VI1bqX6b9)V8Zy?r3| zqsI_V|KFdAJkJNaE6vy3OBR6*DW9~|qUj@%Uy*+^XYBsAcUOm9Nc#ZFA5UG0eoOk9 zq3QAgS*@7`_B&eOnF05%@t?-#Zjw-~zf&IBF6FUm zj7DHFO_??tAl^6O5dW8KDcs1_I8r(WZ&}h0@ZgHeK8@LXn?zmbY%Ol+pVh7D1!OC! z!Ao6jMo;FHoiv?a%_#>R`9y<<;qvlnP9QY{efQ^;jD7P*OxgsHss~Ysr}kAAwO+&E90$d8TqLteOo=#` zQZI0f@AAIpk_)Cj2RK(>8FbaAck9!8Jkk2muOeltV|}+r|4yZHTAG8Il%=WDQj$3C=Jj(-ZwQ&P@+NXD>wOE!+NNyj@Uj*M=ZoQ zDy$-EgYeIC1<#EXR*650ih*k9L%%)%Z%5{Kt#k;EzvC4`x7p?SQg}=3i%5qXTD~-> zQBD;?7bnT|RgMFgf1hTvh5JU&mQW&qcV3^n*_MmA^25F37?=of%>!X9kII6PsLokf ztKa-1*=95bioZsHzvz#}(__Oj?mO-_GYYWTcK8N6$fA0@lktw~?`=7y#jA75L-t?% zA%IBbJabZvy%v4XL3|W13>+;Z94uZYZCa&qJfE|&ne>cEO%*mJX8TFufw5^^XLH`!cZ+ z((8#tsXjt;+!&{f7PSYK#MTEYAS0|b4CZMc;GB!O2Z=5?z$ePx9 z+a{%C@_u}en+y=zxdoTO9Z?wcuM}@O0~P>|5pnhvuRsAquoRRIsF}xG=6>IXlW<(o z6!?FhKYK2st@d;t>&X)%d3loj^6=MID3SIdi^LjC)uXp!Y zcuAGQ*#D^uj1v2ID*cNz(ey(kO%bR~Jz@jaeIvG6a-oX3C*>E8`I8QAc^ zQ{VKg7`xfHlsor3 zzDc8-lx+_|6oEM0CC!xUv$y=bF#hPKm(v6nUf_Gk{FQYbsbh;>Ur)Q0XX3Je0)+*2 zDGtFI?>z2@iU(w|{@N(!o|a0wrE0PeMH|~Uw^lk)2O@BUoW+5Z7W9!fN6~R;HWyPUckp2myQ*t1hhL1(~Az#nFaW~x1L?_EG>w&=iRv-(C!Gz|h zPs&Tu^ENYif;`q5=3T6rqjxlBR;f&`68!$v&oJ~H)S?I&pi0{l%=5>)s&L|WcEysx zMTPSA_dML9@AqnaMS<)`>emb^zQ=?zhKS}*xTW9BZ*7)N2k^%w?~X^waU*eGy_m)Q z29K!6xNGn8y5qyY-pxP1#=t6vA@8dX!3Y)erY?q?xv+OnPp1*Zmtovj#OIu06i0Nc zr+bepBd(hHKHh%^(=Y_~ra-`==tbDs|n2eKTxsu z_MSjWg17%-Fh7l(pyTob{wMLdZyyFJu9~_Lwsu!7v_GGatJWg8dbD($O3dqYD>~iG zALZek68(%Hb*;s`z6PZrcn5xTqyvSC$y9uUt9f3?6vhDedBR9>jlJpKyT2IafE40A zN(rquC$CSVmF~ZE#7*DNsU6s4ZrwP6Z@i}kOjj{F-A*5Mw>t5--7EYQKeUzlLp9%A zl3|D%Wz#rBT~brX(w6^U{>$nYhb-7RBA|^?+awV|jTjng>P<0XTav+OFK`8k(q+1_ zB(fBVNmk65i;arw{II|{kk*9edV_$8WCNT;=m8V_!=nTW3&Vyc-h-?c$TIr?>#Ab| z1<{)j)PfcBA&j%U9!Eo&KS4YD=SitE#ZBi>9u!e*E(y@vhF+?4on>+5zwtr2X}9{Z zv6LzeCgUFUZ5#|~zlr%-Yb3=B=a?ONpA^Nqa|$f>_11U8_uoe%2#>AOQNJDo+za!s z_bBt;&^n3s`cw5@xC(_SEAlBqPs4ocmRc`^)%F2?h2bx-UAqHcd*%$g93w0^312XG zTFOnnMpPKYbnV$59Kq~RS0aeB>zjCMHQqUNkC6*G#^Q%#-r*i=jFWORO86BkS*Qmc z`d^>yQX%;XEb4z4#6F?HymK`33RgfYOobc>h_Y&B`NUc0yqaXVYvsD-JbDoN?3nl! zL1dw$DK7C4F}w0gqUyfRkEHhu&Su_zbo^x7uR3;G*$B7A2b-BzAR1XecdZ=jg%39< z*Lg27=|mlg;fLU{!S-%S%rdw!9P;yZt5vG$HS8_3xOb{JhN8(^2z_V!UiR97G2{4N zqehoL2+f0um3=nPrYM&3(u)j)rSUl|&E=34GPhrZMlAtAq=Bso{y_3xb>lwX9N0S< zd8tTEvT;)tS%!&;_|1;$nsyveyGQlyldcDSa1Lv%gsAS`U^kKHF_TmY>INAOAso5K z2lA_r^Pk^5$wzQiRrL8F%0?L3nh|n2Z9tbQ+ty!Bzb{=t#|eA@kk4zvL=v1`rGVPv z;89R0lr1xJo4lTB|HwwIR_S|oefXNgQ(MQTZ(}^=k$3KtRs0!CiQOW`SIY41BovP$ zynfic%7&S9UhQ1UHlBBOW>!2)p2N7Hm#gm>Z)?DxzC#P6sNq0I4)a+x2h@daa@!8- zN1oWXDEoi;+4jnan*8C1VjcMYBrF9%swjl{?elLYz+R zFHZwrRlI88y024+xNM6K)PApavQ8jl!1(y4HfOM4m3|oZb9vt-+E=&7!VRxFyI2dJ zZ&xtb((d>)=BAa*96d`osK!91S*w~h;~ShrgmehIdGVkGPl+G^9oaYdR=dQs`1e_` zM$?aGKA9|E_Id_x3?EjL@+t_UueI*y%W(lBC6jdc=-( zfZHjj2e;G;EYAC{k8LxBY)xMFo9B+`$TyEU?4k^HWR@KTT#b@YTZ;8u4XwNRTaB!s zAUWZJ93iWqYz%@uzlpGDle;_+mzecVeG$%FD+tE-C540KACH8`9u<`R54YgZb;IY? z4o%MS-KAT-9By&>LDOOW09>qe`{!oB7XUZA{i=WH%5xuR@x-v0mv{52l+?SRCciS9 zl!>d{OU-f$LZfoYfUnMg^tt49xZD$guxrT|hhITUxo&#zUFPtT+G+!?_59}mjwcY8 zv`^R7!;s&5)r#jC92gj}JKe(6z-Jj`OPIC6K|;ha{MgY0XLD2KHRzr|7W=}q)BzMA zfc*5c){b)=lc5VJd4uXKNiR+}OMRP|IxRMRKYg#O@J1~4)VX*OWG9kgMJDy2y$emOU@wY4uOgUrZH?jGWBHK1JmXbyM; z!qHdrxMPfw3DyR;5oxS&@uT`A3*cbo{OD1}b5iXjTdr(S_KXmAYyfd&xocN_JSXlG zlclyO{FSQ)Yy4mq`?j;Gcw{I-TQSh{(Ppn)uMbT@VOlzNwPgcL14{qp?NdI`Y%0E) z^PmVD&<`g-l08fpY4{*XT0;(~W#7Vpko{%X;BGqTQrIbwty@!?GqbinsX5prUz=77 z4=%TB-|y7>bfNA*0pB38u8X1Cz~e}qHy06(hXKL1iq~EjCaXtQkXAvWeQvn>N4-4C zkM}VnguQLl#ZpL}{BN$F?#~P}cmcW8eFP&?MEz}mgkW0Q^&TsV#Vx<&0Je=2ziO!8UbFO9L`B`RmIZYr|y;!T@ zm)Zx@?H=!sS7*B4o3{U2G*^+$QcSbQV^rwkVYLsG|B+^b->=gYtLZmYOR!H?4F8S` zhX{N{bkiW&2r)gMdglfT#a`ZCH5vx5RdWNDocOl<9xtoM z`Ts0{t7<>>C_%v^nrzPh>hkDSIA@xRo8#CPJ|AhSu*C&pcv;@Q+_WY3Q*lgTI~BOp z-{*4Mr*!+^=K}U3)SUbhP+C6!Bd*V=4RSJ_87jJ(ID=OVeXh2uVc=+!5Drr^>S|nq z5cmBN!OQb+PExNu63a`QSE!H~q}=t|?wI<~gANyuh$p#hC02U`RI`dj(|2w@>ij+u zBun$=x*P4nJCM?p81cf`1K;h|#C(^aA3L9KdbEbNq9}N^Y0X@eVuHz6+3x{VdOUG7 z7H;bI4`;A#)qd82a$~XvbDx)&zmFmqQ#)q%0bVe>Q?Z*|;W!e_Zb7R8u6Kn&%&q*~ z_+{=3F2d^a1cJ5(zxjaA)088Zqx`ZACJ{+7c(Fs%sbuGD&sO_@gE2?3_XZ`%*$1JGNn=?N1JqgS$cHrXp37I z=L5+6w^eM>&cUze;$TabNGh5VjVg=`6}sh|_4Cv#z9*`ZR%FI?+<|NU7(?lJE1C znt|cW`Hb=7o|=Jo&*(-6!}<>A^K$7>x5EnZr->OTZB6(2x&t@*YRmDuq>1;Puct!# zFAC2vd+>EUA?8m4zls9@=}Gh+)yX#v*d>UiFm3cy&zmR`c}dv+mJriNXTk)>yFnd+ z$lUmSRV8)y5Cq@`1h+g4*VR#A#rOvy+I{U5UcZTY3$VMmYts16h>u`Ll9Hg2rAHPi zF2&@ShAh=hFps{8n3vN0YSUMof(ox&_wNBjg>xq&;|SZtg7`#*_(Ug_ z)4>n_ODD+%!fkMsT%Xl$xJBPTFTQi3BNmv&;p6Yj}2S0_BNV{v+U5X1+uYKVy}9g`Q@ zh?hypCmtWe1Lt6t^=mOQA5}hJVZ;bG8oLnq??w$Z|0k{16A=Ajc*HftKi_nM%?9n? z0xoX>FHeaBS4n-Zz^veq1f;QI%{weQj3)BjdhA7ZwRV2VLo*6<2?xC)JWEv12~>cx zEm7s0{IXNZH%-FRfUo8pd`XOLz8`#o8)!+m+uTXsPdAqGLKlYcQWQx22)Gt!XwW}G zmfv)*odtd&y6v{YVv*v+%Kp$6!hSGeWM_qVc{UZYj`+sjWDy}k{CFuf1t<$qWJ$C5 z5ZzIVJLn`Eq}%D*((AnugfwkVz7Ls)&zG$1Ep)w@zQ?FW_#MW0GvjyQeIOk?s_Txm zsKByGfLSrY3y$ToTLW!>&CP0+of?LHt@F zdsb^9xo5FtAZSW@ftxr75OP1~Co~*r&gT=(f7+*6Ubn6t;&$;N*UFLPwF~Fhn=>JR|I)0gv%`S*kz&e-$jPEo-NsD`;LQDAcasLqY7e92^Z{R+2nL=3oUOH7`1S^eCl4+0g zc~Ol^Q?&P&5{^r^IGVq=&RM>ZPe)$~A(cM;y;v0Mc67yvrQvNnY3BBiUw~m%&v#Vx zBj&w%+XX$^@K+p&NrFyC6J(PZ0&G5qF(W_i&+|1}a!Wtmk++h&(VI_dOaD3v2>vY_ zz$q5vm^!Ssr;77+dj3Tq4=BgZ_tG}YYB(7>wub=cvO;{nK}%Mh32OAx75-pyjX`n- zgrfK0YcrJl-8@WRMD5>ce%4&AdU{mR+R&kL#NcL5HTTkF3ic?e=D*FUyMnuqN+lX< zO%P&tc0L`B{?WUmA!JbmT>hu$U#dy3D1P)JfLs1LWX(N5(HsAS=(kBloE<(IYhPAS zRHwJ&qj%*w{pBW_0S>1B4o+i1oJ2A-4t{LCUE_o0kCi+hu$BRM4N*UOL)T(KMG$z| zh+F1I>QEr6bl^kDONAX_luJsHRP0Xe|GYPdL-|YjX*8-|g}H2fl;mi6l=;0E27hj; zeZ;6+>p-~i0zd;K`Ulw{zck@iZ@UnK+Ggm^e0~}JV13Vr74QhU(dLasv>k`hzuGBp z+@ggymSFtf>+XjXHbnVL+w2=_{N0NIm1=4vYE^wvFHxzx7Xv!MVPI(@yHl#k^0S^paco`A;;w z>Uxb~a{8+V;6lM?Bj7a6fCD-jA9m2S_$-F$S3KZL1uo-(uCASJzgr1vJ4AOx95FslI%H{VcDc zWg}O`nw3mF*9Xp^mr4U)1jg`E#$piL=y%eIb{&C3L1Y2>WDX4*ddf|0UzD1g$(Sqs zD?2fFor#4oAO@p_*i=FEuydR~0A#ql7?iNWf`O9x1-{IlQ__;Yz{16aIs%`zKj{_{ z#y{ib?e_#h%#se2p+5Lk2&Tl+i&Sz-4h2{WJ208c_v==&X0k53^JsWuElU3}+5F#t>x#g_yCa z@0u2eC1$YC4Ira2V@b0yHs&D)qW<=T0Y87uor=WZU=v&}CL#!03DJzl#`*xK&4jnL zed^_ysAj8A_V-6J-*S>lW(4D(o8oidYrB7bt{X&n|3jCz;00-e_d(^S>S@ zV6lL^Fd;Q2aTN8tw;ioe?~p#8r+EDiML!u4;#Ph=F&$sXh8&#Yfk}Kx$bX($49q^u zAC>`Mu%f!NBIyb^or5+*syhmk($=f-IsXT~baQ{O*DO2z+M^!Hqx*OLMOQL7ce=BD@(l@Ji$Jm-MF%GS8e$W> z!4o)11ngvtd)vlo*59LY!)7a>!Gi=e3gkF5eK^9o^`~D{Oe9p;jdjC)%k^;zfSV9c z^z*hcifx-;(Y=MY6-`W3m~@*RwaxLy!Yu82=CI=&{$=xc<1RN+)s4RgT#L{?k@DX? z-T>S@zQUdr0H!zzHUfLg&bc@S?*ch)tWKFufO@O?O0Z}r!(s?A0*{;K!nSI%jg`5DOc#o8@!5w$mypN^CjX>U!7^xHw zY;7?nBp2?lbhwQ)d*m}Dr|-b1;JjJ8&yOLiH|$Ud^FVISIPX+3*%h9W#g8xiv&WAy zV4I7jx{9B)DFNvG8D1tR;8CLJuQ$lKmvnNZtHW$Q#RvH53p{-_p$UwL9=AaCV;Mgb zggEji@NcrD^h#6-swp&l@-zLPKn#8wy^wf3%3AgW532%%{I|ad9)#MZHjB=?mw!!A zqoJpFeO^sR5y(kwy<>z;vZt3ucd$zS`sDi$muv!=8#Kce^zJG!g?uVWrh;%08{t9_ zW}Hh)1h|O@rW4d~CXmnEHjC%r!v>D~eDB5J286VN%|2K!X^pjq>w)6jS2^)nFPNNJc27xoK*zO-i&eHw{v&|6&Y;1eY`YSvl6p-hRIGxa!olDTm0l2!DkPO?_rl zo_7%a_GERp1e|iEnI^p%$_m$#Yw8~BhJ0{cH;jJLWr{LQLP!xV3 zE?(ieLoEmc!ifLmo;Yu=5=Q-X-o`61-57?e*(A*Lk=!-+%IBVfQ(|#HrLNE$4bXCe z$2B#EJ<Hf z+dTlpUj%RO?yEpFg0Ut7*TsOL4l`We$h=MDNZsOB@P;NxFsnIz=qxdwdMLGpxRDch z)=$=3ZX<>^=4Vz2ZmPiVKp=0KniInYbCqr;iPejlC z`|9+RojMeXb0h;~lDF{UemiN@b8BCh6cI&zeF`{5fl#VM znC?=8TVsy&3&h&2cDt|OkWlJlirv@k{WW?3?Ke@OLX^R*w62zR>GqlJqf&h~?u+H^gd2=uiQa%`Gl0^9iM&!rDelvWDJ(2n(grYbk&dJvNhgK611kXPG z7ZR01eG4Wvll&$|tBZ;|YJpB3yLA|)?3_Z()BYXRup_;{K|WE))eDz9&oecL(LkyQ z?_LegREg8cV%5HbBgL}%gnLTjEy>Z#i>q3e=)}w3;0TT=cAP&X7KQk)mm^*jd=K)zg=wyK zXgtSjq5ASu!X|WoBjFx85H)RflArD}H?q{X@t)?Gss|-7zcv>r@4SM*3q z+1mVil~al~=LdayuBOxeJ*#%_1wcs?Uq@YIVQorXc%^AWr1Z4BS`2d&CdyBiyEYL%dBRc=ogC~qHJS>tO$I^-R{eZ{i>i;JoE`W4&f-nm!fl#ZRHtW7Kottmfx6Zy;)+9U{ZD*8|Q zSG6cHA(YFg^{Z{eKte41yr+04+or5q3Ggjz zMKGE@6!6@IY-HE5BgxjUmy%s#WAW6GI=ekE%ZF3g7!)tOA;T*o`Mhkhcx<2I>Vogd zkL@pbUB5KGvWvMVF?O>HpgHpS`=SwY+hgh?P$`j??!eG%E+g~KG!HuurERvON)iX@ zid)z}_fec7|F}L`V|0<+fGL%7IA!mi+)qu%wyUNLoG}#m3N6yKM}7&G8KrwzaO(yT z!2AAD7HwX0flY3ezb13oKF0HaVZZu6p4VE*j{n*iUnoFcFXtoZBjOyRSwpXuH9hnv zFZy0A2iBriK{xyeoCjn>6au1H%Lknm1BX*dvqee_{bQk!U`oPg=Y1$Ug7ZMqOglC{ zHbOpa`G_~J1qm(@*-Ml{#~FJPpZ<++s?{g|EeSsPS$Hys23O@cU_`U72V)0kLA|f7?%l zmoF6rC%f2@LM4c(H!ojlf6pp~DnA$p$K|XN{<-w;b<^}3qJVw&6hkMzBbc$J~{!c>8DbW=i9&Hgg{zSl=EU_c-pUc z^sxjkuk_(xKET(i4a72xHQEWf`#&WOfJE-?_GMT{)(U6 zi+R!K4cS1KbVo<0AXb8+@7l75r}uw~ZHPP#L$alrYt*6?rQq}TJIzhn{}LIy^kr1) zaQ@>A=z^v(oNci|w>Chk-h$`F`KLnmyx}D%lHd_z;-a}S94(=& zI=cEhW=+1T1OXdrXvrSn4bA-n`@xEL<3ySzNDxKO;#LHuztyco%TPSbAc@li z7JYPTeFku#td;(Qla#tq3f>r5@cwN*XUTt9pY6W?r{d7DK>eUx1vK-K!~nZN+;?CL zFe*}Dczbho@5WaLxhL9G4;2xBTb>XYTY9(RatX0Ct+vP8nF?WI7DB_9ZLeSPXE&X3 zNyP?nR)rJ1IL+Jt7%EKc#6(>I+0H@j+RJjF^vs^M^@|G&7Y`2;tSD%>iH z-~xQ-#-Lp)2FlAp{c9oq%A0;{I&27{A`8x!k#s-)inCBk3SN16RTx7d{cq{4i{G#U zxMO>2y$@MI`nmo4ilnjO!VD_tG>!U^{s-OoBBE1f^HrD`5@qJpQKs-Po`?vSOTs8sUV(zz(fS-ts<5T&89 zFBt*52R3NfSJ=6D^Ow5S{tB(g@kObNIyI;5tD;o%_cZnB@h{E4{`$M`{~&J!hfuNN z){t|SN?;kH==_`agn%2pl~8$M#A}+!qp0UajV|b9b}UWBuxxhHywuP>{`216$2p0Z z1~Aw5PzD~HQ`47XHiuty165e|iv#~F3X)2l4qx$nl0VZX0qB4!3MYPT(whBtZs_1f zSQy@$pBi-}1K*_V?BX8oMomIO#1d}%_p2X%0i7G?B#4uX3;?D%xqc71x`9k2 z5FzmNFmFj}sdowbZ=PVX?|-2}?v9V1wtZt%b6E;x^W`sjU}CsRyU0TvmEi=;3;qe& zqA7gV8B6R$O#oo(0mY@Q{MddfeZf@xJ{{ULPvAM1ER=Nw?&<~~smgzdbNNkodY>NG zN6>;*3BRR!dFv7$13tuDW`dH4nq^4Vqe&yFlJUofuceIfM>u?DLI&7lq_0}cj3d7i zLp>QkK(>Bsi;=RC&y^G@n#*)4wLGZaSIKtC3{kdDa1hgdg?Xvbe{N0phhSWGi{Ldz zARUEc=7W~s&4p^^A6g~Y5bvlEDgy9TW=a727eOVv`_qOGm<@(vZOKvqM7sX#>$Qv7 z;mN9|yas%9iA#$wm50(fr7w>f2k8aO@{a@h32M3WXq{Nr#*ZZ80TxIrn+*D`3lNK-oFzyx0<1v?F3;?zX zY6sW)wM*2h6}~t|6UsnJkv`pDH5LFJlz6!H@YzRc#Jx3~cOQT#@O_*0Bp)*+yK0DN zt~J;18Uj*J7C>US?;L=zwC(j5cEpVqVWt!dw^!5M4Fmo;5@iYrBH%0~3&cc_RbXI$ z!zXd^27i8uz%Kz1WCvII?NK#x<4>rEKQL|XNXA9)))7P>C1xQO&g9&2@47)A7(P=BNtS3g zm{uTms0V;~G3AX_EV*S5h|umkTD(U{u-*mi^(I!9N&^|bWtS4pFPiixD|(smc(OCB zD>$O4tM!_r?A4J$&buP54h4ODvD18nkI!a;p#6$Yx3Z&tTzHN%}9l#hDVp8!w1)wkll2>7|h=Cz91Ee+5?Xa`qt`fN8t! zF|TY0_m0mJ$qO7G)Qo~0$2&z3iZv$WobKJ@$JRxK2*`$%_9pHcR zR_?J;{%FOU82dT$m2bp>?35`efB0bV9p{JMgDk@R$g!EYw_6vCIE@5hhq z_u!0bC+8+m^zibmLJEyVG;{X%ZpO<7gBr~@#FUvEbh8ia)0#?$3L>dPcL+Os0R85` zViM#fVW_)?I)WZlYbf5}({1(Cf}w2HYO!?y{v1A9otk0Ll@^T|IMU3!{Ru3vdd8os zF)<7DPP(QjJ3nJXl)RtAV?W}~OkB|d#8&SGw?c>mcmZI=nO}=cp;xH4@bGc#b{>Y2 z9ssH0GvLz+M~u20Hwj@yv^oKEe5-@{TY`i3?X`qIb6X)iq-_&6DGC=GyJ;eF_tAD= zXJ)|}ukcc3Aji)eTxBxFvQh)h$H%N6FFus^RbQ65EK~#y1Qb_@Yv>;PE0gtx7dx); zZ}_O1VE+(%62Ry_ zvsG&FsA8NnIer3ucC}|71=jsh3}DitvdaM(a}b=_)$4dj0CDDczeWab8J>2EfJcif z-{`0OZ!Vl)KVdIOSh*S_fDZ&S*1P`{=G%Mr&RgR?M8|6-y@&wGla^^n%#^nOOYpl{ zV1r?fQO^WS?UaOo8oucP-BJkf21d>R!Jbe7ojD5Z9A#%~iQyX?+E3kNPJe8QG+M=O zcDncI6CQmyotpXQK!moLMhEHV2vpys8BSc&P!U~$03<~7NE*>*e<=1NWS|t7D%`^E z--7+PTCEQUTe(Il=D*E_)PcIF~oWDa-74T7)%s z=hleb!-@lHZ2Fm4p5a4(?J#N4ntagjG^k5|=P`4N&Bu;I~p1z@+}z|u}Gcte5_ zOMQTg%C3&8dInHmSvG4FNIP9-?k{IVC|!#eZ)O@Ahj9;+*OL>z5d!2cmiYchA&Q<~ zE$X`nnlT<+dF&qX(gg|oW*segNoI{FV)%;VM%4X0?|#ICxRTC$twAXsL2X z_=OCc{*R`!e2A*;y7-wH7+OHO2T($~;iiUAP*OrdN?N)>a%hxPkS;|^IwS=Kq`O-f zr5nkiW?r5T@4s-JbN1QS-fOMjs8xJDnH$HpCI}!b!m{{0dgkByMQ5HbM}HI@p95=% z=-+=1i8xNL0>FkWD1h;f+06vvtAbRc`hjm&hA7i5dg)k8d0)-4sA@nIn%d7e%pa>e z(|r0{rT<(+@+>lSD-p7)_ zIeL_OKiAfGqeD$0?=Fcrc!@!o?n0hQ2e2b+QD@168UXWL>)Gt3UscId46|DY2hZ|b z5+~^uRgej9C{Y5?MTtyh&q2;l6&d+2de(ND+h8^DlHUXQ z1Z)-Zq+)kTfhqe77+FR89q4j#=^y1%SbFV{#>~I-8fUzxi6F|hllkLX9u?87eJ##*9D997 z%hrsaA)g{tRCM#p378tahTK*0u!-I1W&8Q$;OyvQQ16}z)M@XXxhH=PZGZWI`Xx+c z&>jf$ZlYoM^=aHF25C(B50Icww0Y5FYf)=4h7D4psCSu0s^PxO-~|r2tPl!4Wi146ivEkH6wEb0h4C-PWd%@t5yC84{Ym%ub))zLQpH%$-?l zbN{|Ja0ChvbF)%6!amcupWAELglZ@O77%1q?1Mj#`<2?nxTbq_tSz`5sm`_r&zwM( zAkD6^`2=4Vu5klgq5=)Q_Nl^^>s5Lu-g!Ik z%jn@YQK2oSFR~BWZ-ZhgB30q3T~Ub%=_iiOao-vWp`XiLLM_)E0kif|E??>w0JK6V z^@rivB7xhRr5D|k-KlTzJdQnN{0g)$qu*3plz)wK=BT#cRF`s>^0~`mIJsH1>N({h zLS2Pjd)jSLp*@*zr2vZnm+vM?<~9_SrI#VQ85q00RsG1FS{s|^I3=r9E?atqAd$1| z?^{(Q$8_0Bci4iV|9VeE!EmFkksmgNeywsmQ%Gk#dRHr{O%q;3F*?^T3(xFN?m0U@ z2}qUa#?>zOlzo>V_|~Zt$%wqY429&fYP;P`mlW-HT%lT=$W(u*7Afvi*=GT>!%#g< z^_@DQtSaJ=ILn86uWNZ-z;ePrZoYW6?v&1KIcz=n?HtN2l&_x`jR2NFaF4OVx`3>! z*J&V*KA}v6tIN(W9_az@>D0uhk`2kSk+%>nq zb)a|A7urcfUg3)y;+zh13?LfCB&KgR?S<~8c5A9=<+&e(*avl}wdD<6kFm|~^(9XA zO8Ou-q>%={6L&-EEP>OaHE((lIcH9XAu-i%(Imz2cnpT}3?_fu^gI(femFkBtBhKS}Yw)n2s|2XN7jSB-JL zfbFexn?e=)5v(K7W#@oxyyP6AWP9CTqj@qo`)pdEHlz_&JUm=zaTcs|O}UGvpnzbb zN^Tlkj3P2u``ez4s0lGW&v<~*8LAy3z-mB&D)2OWN0OMPK%7~`SN;Eh2EBURJwP!w z|M3$!TEa*jgi5)7w(o>=xOyG@JVcMTpD z+=6083;!?;`(u(`*#@S0&KOIiEHDOcI(>^mw;=~?!=By6I{xfC1wf?%y%6-P2Al_b zMar2_)rGO^gy994Y~iSN?I^DecY*=u1?eh9b*mvBU+o~>-8be2h{<}bOY|Xmhb=PL zWem}K$^)>z3qI_jZmAZFCqDSdu-wXGe6Nr$6tKRNW<(d8;kYTBN+__9tE+?Y0UJzh z_WZg^kqWhKiz}Y&M~~i6Y|_!?k_9wL4e&)`>2BqVZojUFesi`+uQU+h!ne${ot6%f z=U#*~2382G@Jv3$Sgq0!Cq2N3F;GV~beL*wZ{n(Xj|P>0yz~7rOZ;|hD2UW+?uuo) zfWxA(4Pa)1Xz{)(#s)~w#WfW@gwhZ)FNNZ$%y;YKAtZ2&6W!Vq88;eEY&XW`&GhXs z{53^^Y!=ap+E7})qf;8NKL$t(yLB_Z z94v@ws8st9%obJI2;f1J=H;Veo-?2<- zc-gd6jL#AWKXpyQqjN)vnTMu3D4~2!N7!-Qn{ka?*TC3I!MQEh-&Fgdf1+f{v~M>V z3k)=7I~bUoYJn9`c&z_#^hWC-4Cz6G@Bu`5vcc}U0dM%v!J}it+y<_%8!40bajHM@ z58(iF{9o29y*-s!2$Tg@;{L=RFv*l`j_VHX2PuP`Pctz9(%|&8;zN@h_#tl5p{oci zM}Y%DO83EP{P%|~k;mzkZxx_Bn3Kv+$_a`?B&{|5r0Y9h*E~&uN<3cgwoN(Mr1vmC z*(FQ?PQxG=YvoZ`W~Vd~aBVzVh@XKide2wFaNB65uoW$Yd=u59hXB1@pCY{F(D=9Y zDgKM%P7)*=AE;KLB3-r>tRA{-#`+*#*&9HIr@`b7my`RP^`KEE5kOoRAOZ>n=kb|< z(H^0kg!oX4o^8$i)*f!L{$E78q``+2W0fJeZet(`9t&46@5)Df!!n#eFPwAzz3VNy zGcn*8IScl)C-U2ck`@|Lne1gP*lw%K;;4q?6inkOn~yy%p>fApWiv=fz05Sc%KVRN z+jJ~*2VB_<(87`AN7k9RD1j<^6qA@6YGB7@m5k`P>qdDJ`^es3iv)Gxm0gW z7|B}cYpPdu&`+%U;hh%(R3eN}@b@}+($Lx-PUi(lxEE)#w<KyPwoUP#{vfiZ#0w?{CV}zR^2UFaoxM6+t$~N(@Ns<1W1t3adgLTxYH?-KSHol z0w>s7@9sLVa?*Ky`aqrrAqOA=ve#Jv$&VFDe-gt&wXCvs3evp$>wl&H1_;AID&x44 zJjM=$`jgYiiT=E(K!*=$)r_f~@?4DAeu%FhVLp#P^%YrN&KL2vJ^C}5{ywdVE*2?^ z0L`_Ks@dXntD~ij^z|cqB9!HoOhs+=2EN6Z<57b=_Ibjj^JK*k*bf){A(vQ^Mzq|L zWL@b3!+4_k4M_jPB5ww?iaA63aPO`Mid9Jk^G*fidL?GL0sFd_^SLlPf3Qtu#jtJd zpXz^SLQvC;5CdRzW>7v=d_jD)-ocdoexD(8+&vuc|FMR!3OjEEb(k~$f_x) zj!I~vTg9j_9v_9btZB*^xk*g@I)YuCj-ewEk-@lj3!XdKJ;}8%g00wRapUM7;f%nK zp(V{OOWMsIZ3}OD9!LehqG#ll5lX&P7~B*@PyDZq$UW zIub7ajTrV0X@#M+DrHB8Ib@9)X1-KK|g%?-y-wFjD3)U0Dz-1#PV>_TIFu|N|>W;&YJ%=yqZHetJ z;dRz>?{>@qZgk_*r|RD?lrETS@AzI4;xmC5-aDCxAz*Bb8QY6AIKj`dm6G$%;-#`= z2Lt%0q&=FlSv9*!M0gWq4OPshZRVPagkbB}wwjG@&HSr6t< zMEEjKv6(IPRK}*x&=WXgba~T&SB0lCRTDQXGV-K|O}*<2QT4{nb9kiqr z@FUZs7&1wL_83;?*WTP5xJiKX-N#HhQfx%AUKZMd9K6TQe+*UVe4x|$H1OD02YHgYuszO>>b{YO(ekr{bS{4^~Sq=d+as%CIGNf}(Tyj*UO%hklrJEY#<)LVPyz~ zJhP)-oz^R8>zV1fsJ_QieULJ-9ky`$YBfdSckFO(WSB1bt;Ew~Qm>Gq##Q3v?20yW zo63+9-v3zW&>4vv2<`T&CoY#2z^$j;!KY1LzJ<%#K-3dKAXhw6(7|^-v^ItfNw#e> zp4PrJ`fW&WL5$<3Bl38xW^GkyivAKg{apPLApnK*fMQ1Rj=d*e94>71 z*VxT?Y;n-vgSKl5;;^h*wVz`-uK92QQkK?Pj~P9$CI7S#OwH3 z$Q1vf(mDW1m(60&$MfV;tu647s3~so7{uSiVJTt|7!g8*%mdxZ$5Y@daq}XUey9R( z3Cc-AyreB&Oc&Pmnk0?ODu8evRYv1-=jL%E-f0jZ>R#@nBMqKgw+iFqH}qJI>vg&! zv>(LInfh3#uoE9aRdpn`8(u%dDGDp|3jde8! z$T=}oF>65v8gAEy@tOdamO!85R(kWPW&h``BiYqC8R=h=P$2Uo57SHhsC$ER-3V^SvzMs6affy;&O7tt4OJ*dt z-<(C*)K^I9b#bjiz+k+nK`YCr4BsDDJD18E{e2uN{Sd z^Ge|nDI1(2@~kVKwXYfKZ#(n!yv{3h2)Eh@l*W79{dN~?dSjbLVVP$c6v_D@Zk%`v z1v*{}BuRKUAexpx3k9@yp1YiuO&q)t=!>6G&Fb}grWR#{_~eUxI7B^jyEYW19>yp_ z)!S<0J2ue+MM8CY3tE7V3HQO1JWxEa*CNSc2TbhZu6WF7|RGq2aE)@gB~KMnEk>+ z;r%{s?_WERZ5nm6%6Hat8lJiI!v(+{w?=LRydsSWLXJ-PrHGEdy_*>)Y3~2wuQM#> z$xE;3{yanDSsYG@nh6|ZXo-XD;EJQT3id$4JVxK7Qj=fDGR7s=E2!>ZeFq?vQI-28@)!7@Ev^g0$^9~Q_{;>VYYJ&6zEK81loWl?iF|%Xr zE%b-U9i1-=v?n)rJXuNl0)drxNKNvgi@^Yyf@>}pWZe)D2rJsle;5wa9%a(s8>{}c zAm(#$_9nSx;Jgm!I8qDnl~aW~jYnNt0T}TR**~5)4-v)PNAddFTomP#+DV7fTwd}? zV&fQWi!?k|K=;LMC2V1iu=q9H)7EO+f=}0zTqozDsrTK~Y_%>y81pDaySz(de@1@M z<=IPclQn`<_V@urW`m#{Do@Kf--D_nRjvwQx|Imb1kF=!AV~iFk=N00{45-tSYPyw z{?nWDwB(;w4J$-ba);-nkAW@R5<9YS-nDy?acMQyZSyEY0{@o}J%a^<7$5>z!?f#mn_2byPS*ZbR4hBHhrY>3N7$Xe{`j3BxGEG~KJ{%&><2cU z$;};VA_eeI+bO%vciYA&R|}jmO%-`X3o5Meid6M&-d9I+GEh@Om4qbO=+%{$pGM`~ zf8PqU;~P9$$ySSZ=gMjUR2Dk|!Txbjy+*WT5V4yL!lA`8RP&j%QDE4)k5XU0MZtYh z+DBFJ_;~>#*DONCAPk_?X~`ceChPQKS8RQesNyR&n$eN!KS|u+GtUKP*pwadwEine z=dVd%CXda?;`n6~(5=Go2?^18IcH`Nj>AU4GBD&5;Be%z#ErWnrm$2H z^8NKqx61tvte00L&G56n54*@n*R|qKz zOL^&thV=b-(1&N-RKlAbx}B^|U*hC6r6%<1RZm#^KoMW7Ig1LziYGFS*aj=$xwLva zG){v-(uS&xq5N`*5#qenK?Hu6zqj!N=n3U+TAWn~;CGcqTiNJ&5|1!E93V{czI|iM zkDAS-69M`-2uMTP%t@6$qV2x(*^k0Ka*FzxVn6K)=biv z$T5aHksYF>d9X6`VvFh&cE>jEZg!0mQx*f2joJfR5QyN8st>yFs$}V^&SWI2gBa^>VEJIy6AI~VPxZ}BiSEl;g`U8A6ZZT!~AF{zgq&Q4!7Ua|Zq zcqTIDa|bn?K8PyN1{)ez%CoEa1d5J@7@exz5BoWd5fO+^H6xyHdkH_r#q!uc-;F68 zJ`G^@o6#M^s^y2u_hCqs@AgP~Ll+Ag$X*x9eAV84TE5je3PEsC&(ndlTF&=FWQ89f znx$E{2%9QFQG;Y{@AuIevb=T};k8${!G?*R4e4^0<9nLPLeEuL`Ot$IVDB1$dPmOR zh!B5n!|ib3NyIlK0z8dumVdA#MLN!*Amk&^gg#{GE1n-lCWtCV^4 zD^rPPi#gIU0)59z6ow`!bRBp{kToweZ0$o}@HxiqX*z?C@{t967{^JSRa>C6OZkD!Eqg zn`=rLJpX?!0JJ;os^YjQKlt*1XF31Rsn&#s*!Q=Ia~eWWR)7?P5j<$*?>r0@E4$VV}eInykWXyZ~YPQG{9qqAK@K}tk@ugi#$q!V4-*@9!7K?=$N?iB2xDy!C!TH0_c({ zPlD9n$JC4GVaeu#7=nzD>LZe02tuPs5qHJae2;i79Q5=hJ@EtbLXOc^n(%AJxhtjU zNw$>3p#2X-8&rGBQtXBl=HOuw1lH05P;4Wcu*k10=yT)R%el9_NH%^wR}{q6w={QH zNv7pzzqxZ1O7QCq#wshxy`Ce@``U=`b0)peoynVe9xTe z|NcAkAu*B0DXN6@RNjb+p9VQ_AdPaKNg4d*WtK0l4Ss$XJ0jG*JFd|<_T1}0>ka-R z*H1dm#H`ZhFahZB#B$_UdX2A?WC@;Jl~WCt?%i)VVMC}SqxdHlCg3Uh`6sH8cVQqG zIXuQfW8A`bDF#PUDT?3d#urPz4w8IXi0p+>VZ6jzq`%;2tfq(TLG%%R1Ppi6(nf#aeGwtQq(;$9P`kbb=^n= z6x7*5dVaAmT{IjXl|mb+bp_v(4^*+3>#KPW&vR_s<2iZ*3$LYleGv!C2zw|ms3ILm zBu9YaR?4f2O0)eM;M61=2JNptHOt>rIu;1}cGo92dz)3$_Uu+>{?fk__N@fNFO;{} ze|C=b7K)SFEV9C$dOP`+@7H2O9%p0kS107p6&zb1II?x;PlAis)-8B;q4>mzH||Cy z1i8n(fe-BuoNPV|#JL)TVSh8HnZZ+2 z%7=ruIkRb6##?FTE^-D2h7mbnKg)IukdGXG^c2w?|BHhb#EW<2tuAu!-@)1`d=+(8 z|H|1T1+c_+Bg1m=FBJ;Jl?6Fo2O1cWc+>F&o^ADc^g39S2S@l!8&m4j@};Xq zlW6(@;*CBqm)aQ=)+YC1;Vk9SBe6|#Rvi5Y4>ttA>&@T_F4+&PWaEi!?|Sih*D0>^ zKVu4XWYRpn!qpH;U>hs6cz(yRCQ;Mtstl`F#d#Ox?1iWjLBPYq8IzLYP-M{i-q|;M zBl>~N0>*$n6_hFpln&7!_IWT$kd9U07CpQ}%N)A7sFHbEK6jQobtcQt00b^t!S)NS z;!~Kg-vU##(FwblIT|Dn^Z%T%9>{-aZ^m0)8ZE+1j@`@h#p8*8L93_#!gv{_fI}xx z;w!K4a{4c~-;cx|--_7Pzl*&z$fm{#lty&q!Z#|Vtu z@mh|Q5VJpDPJc`6BC+9_X+=b7GYCWMQqC`rZEuj1k5hEfuo|lIQ)0deq>Fs6wPQ7& zL!Vjg8yfoO7t}9qB!Kxuw50E(O+V`b&QNu8-J{ZJvn?3mV*M52#%73kkAKbH9oJF% z?rGziF&U z{*V{^;nhNmva`pGmD&@xgl!vUadduFb=XBY`G|H)Ehd|m>t|XXWFJh+rwT~sK%~#P zY4ukXC@w-nS&e3%WIbLjXAk+H{O=(G%b)yl!$l?+kL>RT0V0TWS>l^Qsb&ELe_z|s z(IcYlrx1;0PJfPIA^qHMV4DkfdY9fvKl4SXHpTAGj6O%hL2Y9n?y zbdUyNR82chwqc=iz-f{$$$gCDj&F2tjVsckQE$^LlD*}b4h&m(fsc`pJ-$bMlpyA8 zk-we4cji91(TXpMT$HSNcAVy>KlMa=;kUBQRS&XUeruZwQ^nR`s|Q)4s`k#qL3m_W z8vVONSH|%^y(|_c2!PIg=wQwgBfWft=vWPH_dI{|7$+Mvzonq3^7Y_c4_5XtzgpW- zC+qtQy;snkT0U?LCFW5iXv&4qMLp*5uP4DG}pTGN2AUk)aUk zRRVO!a}cii<$v6BIXwW4^`RQEg}6E!(P!#Ei+C_Rx%&8O{+EVl0q1*jeq7H2W8g9m zpJ1G;sUy@B<^UPXP!)LaLz+jYdux6x#?EhFONixgMEGI1N{60I{g1Q?8~UKF4i< zFlQNtBoV{8KoR>PZ~mH5L`6gz=+*rdA*TQD82MZK@)F4-hKp4qZMw`mVf5t=`^_CT z!=_aC*0z&C(=lhHn1{h`X_y@0jAtUrHd9tV&*%{x_;mv(7?2c#)PB;nY>fBj{|GuJ zO`_2*{JBWsaF+QN3xSs4nOrQ&9hfqC0iSS_6e}2s@*@#X{~pEW^6J0-#QYt*G#rk| zCz{_J@%2>PbD=<{LVRT0n)88UuKuPyF{0&wgr`5}@Ro;63q$L8smd3jb`kpx<+O3=G*|VkwK<>kcc0kI^gs%AfC`{Q@C<cGqE!wwMYI zrZd)(cd;dplju6AsZxu6o07FZpa(radi^M@;lZvq+n%p%21bf&g29zhDIq6 z-fP>J*?wg|xQHap4>~J+|F@dYY6d8y`9|NO@YIRNp zrm-DT7s$KJxUTl?&@@>$Pl|aZMWet}i6B36hTC&*<&G099+Krq>XijCh5*5G*uNc% zN5!$;Q+g+)e ztVKNb-NV{C^CW6dk)HW$AG<2y1Zia^mfgBXMxVw-c)QT@{FW*F-iBu@4B$FiMvB(w zQVXN;K>0KPeERbB2~@!26J<}8$c;a|C}gz4j&J!-fkLk5kYvyEKsKjao0CJm$X^J~ z5PrBbq5)?a|MT|Tr8CPio%j<6E9NQW0)I`h0mS$;ogMA9slL2Nk@?R zoB|C+(nHY}oVpAK1hdJhg}jPs2s8MH1GR30F%m*s*d<@2H|b9R zwUHSYa_En;hmYP<2`T81<~_F*b7JV9;_ z2Dg0Cp|Hv>t`p-*3@pzPqCc>asZsQ0g+T3El*^fe%MQe-Yq@_)^>HH0VX9IEUJ67(>v}#Euer zeBL>ItJ_!c z^(VATv%~Ji`8l*PNpa5zY>ApVQQRj~Cv7*O%MhgQ#f)`Ns)1u&VyJj26Ip{StaqUy z=iM;@{@r`e(L z^eLTrr8G6i6&!A0hcJNAz5maC zUO_lYfp1b_+M_R9!{xMj@lsErbswQ3Q~g@|xC0ke#2Sy3g&IaDsyLZ+ocyRbj23&p?Y2F3?K17Q$h#_iXvt0(rg~ zs5WiY_QicULg-1sA*d%1aF>fP6|%YCyzAL8u5lL4!k^ReiRL9dw@5XJ7D80s7g!d@ z!9Vl|8{Ys4xvbTzI^nZE#>Em2Ri0ASVaEt$_i{J((zC#zM86c^4B0hU0R%=fJ z5uOl$p+S@}bftFxd5;O5kal)}HG6NrcC5u!B~!j*azpxw$jrAiXG03OkLRF54O zM!O2?C1t1fr&SlZ!?EzlOiC=-Z_=Jy;c73}p5EaQKsjcwNCSCRI72@gaaE^VhUoVA zRb6Y|i&XQZ!eBAXUa_GHtqe$Oa4vBKca3ADSH(h^M|g11Ctc!#@_>0Dyo8iC+B@$b4h<`8}Fd{av^9`8vg@Q zn5{oLV4mall7SkIe^u^Q;aD4#VA9Je97wvs8aEf8e#Fb8!6&%Bq@O2vtKtBxA1rpk zR|oP64~w(GhcO}OyOgUn10#**o-I*HlK0B@VJx0n-!T^Wlo2N)3NH;=sAd{vf3N$J zRJX!jc>h61ne}}nm0c(ure<1UOvD`lxVDgfgfcCL6>Hm}sd%H7o>Wj)-MopHxQp`j zaZarA5lYZs<8T=TCtO)jVd)Y0xb>i;imqt|Z>H+VgU(`$cL*pPoZr|Jm_7mzO#!-n zGd39>0RFgm@ktTsSjWhgX8RQ}(~5SR3H3ZsE%H_UtmNw*iWd2?pfW!^46c|ovP{7e zaO-ZdbEF9j=fyo&P5x&R0uR7^heYaJCP8uLBD5b2UC>wfNGj}T`PHsWYZJJs;oKg( zPxK%<23T~N52w|;MVwpbH*GR)bOg??p>V(i5Kv9dCI5nr9wDZj0c;&r%kFI6o@$9jRa$#k>ISAmI%#JkPGWA<%IOu9N#CB@FH|H&B`SUk;sKws?6AIwC=5sPhZgDOB-j@o^Kc*Eh%SuzX8qooHcx` z6(n;PV0Ncoe?%v+?L=cYU+~JS1Lw;*L*k0LFT-@Wd^{UgCN(moc?G+9b}Qh}!4-+@ z(*gpi1y`YHqK^;HAE$vRt(wWU3m*QsKSb)k#*ZXK+TFuxF$j^;=EU&OTO(+SRrX}V zf%i3<*1|gLD|fFl^3zJdK6gtO1c1s%f>h4=JmkbiPT zPkaYlFZS~ByOHTITc1 zEXy2z`?%*QZSQJiOnuQf|8cKc3L&^>^;(|Qy3V_G-KnXJTkT&l+alzPjJZ4v$%!a% z(n&tS8vys;pXEOW#JgPY;LGmFCs#2mv03xv{^vxXWI%YZY*u@OE4zL2Ff!|BIKw&`_3MEka@Hm^o<3k%Puhi zMivy!Ue>M8;o`8%Bu?VyA7j3F(Z5dboki~v5QF`>|z&MBF8ic z6x6}e9O}0qP2F=I(IlCn%l3ct;qbW>so$*HoLtDHT$e|a%LyA4T-)Pf+9EvF$1-lj zqFzp$_M2D3-FbO2)@!ugl#Hxk#IaO0g!2$DWww z;~&GjY7`p2ym4KL=aKWHald)W zKmt?%&@qJl=Z(MywqE2%ro~eUx+YP)S^XZpk%I#uC2Zl_pW7#rxDov$ZmsOeK_Yk| z52$+|*0N|J4%YesG#+i9fq%Iramw2o!iB!Ip9@TdVVlIrVufEJD)eB9m{s~#y z?gPD2j}^iy#vy>PIlkG?&{i3YRA9uW8ezWA7pxlH4Eh7wtP$+moI@AF);q zE&Kw5=|3wS7ysrS)|^i8%;E{#1RMqvStkzlA}V9-L&wK??DxG=0hy(D(`0v@q*85{%{54A$Z$39TuV% z@A{u<*XU)@JaI1&e&>e^)Gx~4I(L<^7*azNA^0^e_2~k1XWpjr#i&a^HCdhBME}@w z5vRZ$sn5YQ#|GmrBQ5~Y?S~|@$Jzn%&s5F}tJ##72&xCrN_VTtmjA`bTQ8k=^)Q^O zjt6SI-GU4Pk7yowuzL+P_7f6#D-p#tAfjC+;`hc5kAH=?YT;z)Z~e^LrsPhf6R(c# zuLmCr=Xm!U-MWI%q<+Q3LH=o1d(LKF?3+5i??{3G>&E4^twTTJEppYL*O~V=yx~DW z+qd2cSG~06tYk6;lA~tABLU!e{r2Vm7-f&EqiW|JLEluK`2u_-#UP%UsIR_bApSt5 z)Wk{2#rV@xkFWAN@~%I`%7R9hY~H;3u%b2dPi43^!K8d|=#M!2gY7?9wK*v1W6L|U zxiH;(Lwv=0qw4rAT{(ZK5)rXiik$Ifxz{GqjeZXPbxY)thRK{f39Z`)oGRRlNhjMxa8u0?5@g!6oK9F2G40ha^8Tz92-+VR!b6S+ z$A&#)WO=m>na8Q_e#cki!-sd*C*|CMvnx$PGGPurzTtLwbM*rk8GwVz#WS-}KqUv3 z=#tF@Aq*_e{;a^$gqEU9|I%pk!`Om?>8{fX$>oB*wcB7Bb$aKw1xI&JJY%lbUT zZ?Nd53#+Bbh# z&MzAiBa@a;5o=Z}UMf%hHVLU=xF!;SIJp>TKah$93Zf zBznVI+4eeg(|mVnj`_}f;3SPJ#FStr+0T*J@xYc4U(cUUo)|5^9-(r`6q(MdkNYt%hHqX@f8`G>8GBMV1)gvlo*FjJ`g_P%UIqS zj#uqHuj25WKq*8nrQ}A9ERy%w3e}Ac^HbM|DMNG%umEz+VxBn4{@C>%&86_lvo$7s z-}l`}AfEmHDSge=IK)@o8pQl(z}}7x8u7xEB(<+)ms;hj73wTDPeum(>$0(sV48bX z2bzr3PQ}$Edm3g{pEW*b7~&sOEHcFJputm4eCX5cKS6j>DZPEu&O5>n0b9#4FnP6o zozSpMY4|ozMW!11i85dFzlbOKNy1m=ClVh2w&ZYvIQ4EZJQib|K(>L|8Hvn1h5gTdfitff z@Qa~%K{1OVerZ-8N2oto5#?K)P@A$+t>sGnm=f&_$x&ZvYz3fG7)Tg)5$fFTOfM|1 z{Nww#vbX=Q1@L7q#))^&eeZpysr^N+M8}R8j1j_)TAnw)3MF>*c{h6J2;_=>G?b(e zvhZ{M@2Pqy@a`+kZlFC`Qi~=%4((^fbQffU-V|TWa-OIb5Q=iBQ+#Wo>ir#rv|XT3 zN^MR3IqU2@ZvNOdLtTp9<|d0|w%__VbN7gD-9{Mp8hTl%#8bnL)8;z;js8A#JLK^a zOE_F^B~8?TrO<2m3EvVB9@cOB8>76JVRKfvC(X6t6M+x{B0T z`zu}q1q}YIMehZ78>WmHf7=+~=777dD=i?V)xi~{No`K-HE-vqLP5_B7=F}634PZ# zW0yOZ+5qL>ry(WY2jF;>`_^^cy}_}c>w8WD5;1kk<7Kg*9e+=3UUHch@z7g^Z-Yl6 zgl|%>adGS^D(#@6RNTM_>;~LQfHCqAZ>fP-S==I!LeOzB=u*V;p9wrW#)lMn*`U9u zX^nk@&DhH|m|IcHT-Y_Fej+MfmAm?7cs?u>O#ySC!@LeGymih!at^J95;BJ`Il1jA zYKgc3+UCY7R}0!>w~x<-(^6JOt!$G4i#W-LlCViwb2~|<(hb)t-zr$=E{~00;#Vl} z(=rCvZ+aa0S;QThQV5tr@f8+%ERrCgf>5KM#LL38t)WhELVU{iqR)iEwJa`=kO(OT zK?F|za9gkd0<3N;HI!%9ZstEwB+WObb5v>}P4tF&YoOYx$SNH*HXS?XuW?r`7IAcScNT*}2`5(Y05szZ_ zFw7|IS`7aA&%X#A#j9X`xU69yge5$LPX+U$+eJasB~&gQKo|dfht*#X__6vT5!bHw z|7bc7Z@9ky>)$&wM(pZ^CTE9QxtaH~n@4L_5ug&q%S8#2o|5GOYc-6x<+xRd)n$9OT>JQnU5)$lJcQ|>M zS%tMcMF)RjE}qX)V(;FA{UqzcLD$(K3ri@Vi_LvN2NA|IuMc&PHzH4q2VG>jLi(#y zd@i*JO@)V8Q~T;(QofbplGtQ17CQ07m(vWWRI3<&Eczm^#TS$w&}!&+2&XLSzG=oJlA)8&+qI=eyRHl7{z?vO4b;Ocj>1v zz#M~uejymffsXe@5dsl9_thx-zL1+LDU~#V3%D;UlQ5@|6zGTGEpn%?K)qd@1%k!b zq%zuPufBlb6cdjjf7Vc}mjhRzm1*JiehQ*$w@%Ld%fk?07D6}H#`OJhDfUJ`HT4cO zVDk8dkw;Lxy;@y1iRt?H4yWWkclkBhzf17_Na(pjsvi3Goket6=?MuGbuX6J=&4KM z=@=1g17lq%FRqDQs$vD0SnoLZk=*xEA&|n{a`$+@Nu6pf=AEuq|G9rUUcYm^*gbhF zC#X8UPW>+B(#ThgaoDuociksw**5RGv-DgNeGFd$qhmcDS^5jYy)C>MeF|=xl&A03 zB)H5^Bu%Lz3Vdv$wkAIBejYT2g~vpH&-KV+ZcO~D7KFC8RyRIpZrqDZY-IZL-@@1f zK`s}HYuRUS;-5@3b;SQPjgCCD)$(*_(oc$dg~VAN^A~qxNzl}qVcVCI3^zwc`_3A^>gpi}P0p_z+A}MKi8pJke{=AYqW8o*MZQ&>Nz-%it8#*hvoMeBiPY~<;pxaMa8KGLgG zg(tl=vU=XTFO|lb#z$-}UpA;gf7`^QzWQrJ2B(Vh_^KQYE za2J91+~HmlpanOl6A4T#-1Lggb78RRj#%m3TWph9^*KFE>74$x{bAuM_sx?hfz`Vs zlxYSgPo#5)Kb@H`T~3=XLH2zUnt)(x3TszhHNA6nlX5R=+vY{z3*zx; zT;_{xvKgg$LoU0w1(x?%e?;6rZY}P~Yfm^zUms0gA?(K5uxl&4{Uh_bJvgvUVkz#i zbK|QOPEUui)Lv%cyt-4u&!HfBk_PlceJ3-?!K{dU2UWzS=yy z**(;pMRm`Iv=UnIuKMU1VivM*l90#3vxOzVJ)0>s-_W8@9K+d<0~X63|4{_@rGW^F zg2-kjewS7D&(6af-128L$rYBEJHxi9R55$8)iFTx>_Y;$Pf}5anumPmBABh7E+5?+ z8)?=E^kPogg}Wvmx=QaaP|zC)=uUpT40Wozi(yC_9Yj4wp+D82n#O$fdFT(`ue5&h$oi&ONtucfv@J2mCxhu$Go+o?485NDMZ zl3Bp>Lxw-^$uqSdg%bm6?JhnJld#k9u{QY$&zQh3uArkyaoc_v_rLYpS5Jk=1kOa@ zwYXAkdEBz=LXb;$%MH9J-4xH=YlQ{jVS$$aa8QVM5TShR1ry$UQ*gBDAriXTUXRc z0Ce8N)2rU|9QOX$d3uBAh8iT=f7(C^*eIpfqi9fk{FuV*&*_Eq{*glF6#13V)U?VJ z7ob3;E<@9+zO0)Af`3`)} zGZ!$#?SCV;miYOD0dFZeKOX8M&g11;K~*_%6iw4k42dTgP@|*I!(~^3jxULjo9mCc zEbkUXU~ey!R6m^$>W<6Td0b?5IIB zf3{O?u=6V$*3Gwn5~b?H+C%Gf?h})MpefoCpyB*Z>yyG0 zt%$k0GoV?sNyKzk&{1XvXeN9+ESU?asDaPWF^YtfN(1P0 zPxBE);u}5j0uolSIdR6nxsNW?vykn!$K~{PqIT%egBjpVZK0KY)Fvs&D;2m_E76J? zbZO@#_8~;G$YLa@ouu6zUb7M^+3DR2K;+B#>MCse^>0fg7ERTf8fKyfgPbLi+WkzvtSc%+Sq$3Xky2dwMzT&7(feZ5jzPEdEVBo<9b()AaM=!&K-eB`htAG#rsw^vokRMb8c%1 zD1O2}(e3PmxhwMlTNHD6LZ86j%X1Hsg1b2Ak=e@O*Y?A|PIcS95+fFnCX3UEUr`90 z`i7y!Xmf22NRWlc=8R{wPm+`3H^SX4pd(}KkEw5XabY(z9#&5-3!k(lG#QoBTA>jB z9z2VmN;)=yDCJDj6t{;~sZ_AfD6ru^Ssc{81h*TgHiZZV z{BFw#sWPVz5RVa&8Epaf`R_YdFRlI10tv1l`EA-e84&3D580vTKveOc(r+bxSo)I2 zDfH`0E2s5H@=7U(DhjF;$ay{xKGT7U%7Y>+6kKgq1SrtV6H=l5F!5qi9GFY_o^L>Z z>nFw=)9cR1!@zI|U4k8mflmSY%vwUnO{YJhsfAftJ1`q{mtJrkFNDL+9m}MZX^9v< zQ0({k$y9cOqs;QaC7{YNZuu=n5x&m=q>%fhxr1`aQ8=j&N27pzTgbm#a{cbY+WDco z1R4+M>7xF2k7W#u61eWTq^ig;Bs=`1{;cfq4#ipSrtRBsd`?K{ zlei~aAZ6qnEtM`rhOjO&M=Rp$3|eh3JjZ`yjLuZ$ULw2`Tr1Xnbw!69(8!G3eIo4$ za`X&%JQrl6k1O$$x1yC(u#|j#GPUH?BKdLa%Tx60xE-4pl8T8pSZdHKn*eM6dHUqP z5wYW4%pz8yP3UfD_c6vFyo%0~=$Xgi{ll z1l!{&A&Oh52NoWme*5-PJ zKg5OSUL@6${W7KJDuhA&*4s3F|L9+KX#Xp#wyE2ezbrZv#+*Q6n=S-YZi-_rHS_{r z^;e#L5%2aiY2-H`p;}iD&Khv1-2$8lfPZW}IeQJ(EMhBk4h(Bq+-28CX=P_^!+Dv4 z%xTNaARSU>*(ZHZ_}-C3e0VPxHvQAAKI4n^^_v->(=rP2E~zvYOoK{t|4L$zgCf*4 znDrjZz2WqBKHD@ZlNKA~f(Yk1-&^av8-^fGs4 z?7K=7vu!u&zTgG4FZ1VJzZi`ZZ1Ke#ZCXb&R0{dNTVQQY6%ED=fntI<@O-O{KoUZD z`{Bn?0Forbw?%j}o`TFwys8XxejuN`0Ew3I?<)PHU5f!OPhUNqd_q!Kf2B?ni^F}Z z=5p)Eee0O8)iw>Mo`i7=TXSF6CFYSbp;JT=Hfd)9Hcv%zuJn0Pf}%i}i}sCSymaK` z`jH`9!Xf?O(v*HD&CaGA`}~Eghm8>H+Vxmcz~t`kl!N@$@5Q34axl*6`Yzdl~Ot@cjvdO&E!GWl+nWnxA0fD zUbywbXU{5l#z9dz14{Oe*; zF3pDQg^@%{r~QL^=3(HxU^3H`Zoy|G5qg z+0%$>zk3VhAxg1+!Tt42YsE)*`TPuZiA}zDoa%eX!j_C5L51dgjC-7p+WmHisAEOj zcbV}xkk%t^o$YPEH5%AzZYK-fN!`{b{_hOW zlLyBs_B#3N&F-V<7?NhE9-A!;IAA}AsmUVqpFB+Wz5Mc_Fj*WGk$^(czh<7+{&($M zLU$l!)Z`1pxTiiJ*9ZQX^Ql0WCrpxS@wFZxzrh1jRB8$TW1FR4F`w9+`6Y_gd^&|# zOq3&24yU(dd0aiM*uJ#j4WxRZw)F{wNq-&0pyppKMHYjspIXF-J0@GCJCQiyKBOpfdPR_el9IKdD&kaEaMmyEm0O`MNh8Co6jGcjc=4Uz8 zOiB-p3dMZI?&D)bP|l1$ZmE#Yl*XIC7$lZITmBd21y!qVhFdaMQig1o}e9we#VaV0yYPa3`~S1rA7dTY%^4tk)ri%}AUE z`_o<<8q`}HpWl?BrVt1}VFBOu2~0`UAewoOE#-~eE&Pz-+Kc($h}wT_al1Nw4icLw zD+NTv7DWe^;J=?x_Q>OoQ}!8u^556RZYM$zie!qvq=Bo87S(LSc@GVqv0&=Q{9lY2 zChTiVHt?CGe<=@zqZLq=w1ZjkL!@$uCUDf~E0@{iCia2_S~f}3@6`ng$Sf%|J!N;JAk_6fb0=pP~N&U=g^Z6~$+YH%xD>Y)F_}_`YtqGS8I^fg_0`U1$l>2 zrm;NW8(*JoD+*Ig-8zH1ZaX4=v+H*6U3@R2$du1gW3fKFe*ek2aHRvOp-&-$MyX)$ zE6@1fi0wRY+p<>ATnH2yy&(gQvKoE$k1{L4GeThT8wyC{^oC9NNeG1YlnuEM;?a4s z=6^qMaZl3jvWEL^@F<3cz`%3GcWse#9Ut^oqWY6V7WWy>wGT|I2{ADtEu_h>JBYA8 zTCU_6FQD-+>NjG|*Y%QRBTqcYxc5Wub0aY@h>Q>$=}yqGzZu^Hpbyq>YL3pJP5(8I4)4kn6<-$hKuOfI*_-*Ry=b#y%QBbI zx*^^2(L_@Do1tDSd_A(JGS21v(cb96n>#$2GD zJ0SUT?v|uMr>2y=m!x{K*q&I0XD0@*BggcHTr-K`@N+kO3RNIe^aFFZ<8M9FHRz%5 zU*2X>K>XZz3$$a3)k$W#Fik*h1i0T*N3Y?ZtNz^?KrOl`AgL)!KBH48s-ZF%NPmzz zkDHw2l8w^rkVWq!5iUv5kE{iwsJnhP;G(BTP@NTeyoSmYpy^<-u_0eKCv})l-tLGc zSY*^tjWh?r697tOCh~OH8LMu)Q=Fs5nMHS{(r3`szOWlS1MN1gF7yg7HWw)h47e5u zyLKi^O#W~uNp-)Pg15Z-93E6YK}Dbxi^q7#uBgASrpGZJYxm$I4op?&lq?EG2a!K) z!WnnT;|zBJQFdyK!Fn#{jP%wE0I%t1a);u`=05ng=uqf^-G#FEo?*g}5iDt*!T`(m znpq7A8C9Hdua#JrM|Bg7FC{Vw8TA>Xk4Vl@iA{uAmWCL)X=4=Qr~gWRl+w|S>r$IN z9{dOvgLm8A_cIFljrBS)oG+X@E7N&d45%f{k1KR9 z!zBkbs$S_d-V#_GH&+SY&F!(%_4AJ}`jxt@7^tkO@dg%q*mSRhN)Z>$p^+;gJbMvF zc`{!pO2fMGD%q_2(pL2y#@TY=pZ(t$Ju2AHUDV_a6bvO!g^)rZT$)>)Vyid`v2>U@ z0A;bIB$V`xPLvRDy1)j>e{VKDI$JG~_veZh^(~W(&2o|F`TZjK^B+&r=ijmEj1Uve zy=-a8d3~D*(>S-&B}~Pi(_zZ5nkEFH?H%i9li@3!`1(p|3+Dmwl`_Ce!H-c=n|r{BD8p{8&i{ln?Str!*`#% zx;*GV7!l+7sD&Mzl&sYAuEWe#!NCfG(gb%Hq~vBZY&OQ4slUUt)!A zhsmXgKf0z?8&9La`j)J%R7?SQ1$r6`OfF+=>(`vb1;2(r9DIL9@yB}X;GLBQ?=uDC zjmWBv4u*z~gHL3x*Fs6}!H)+F-77>AHATi!ebV)NVR*FnX#4yPqjo*(Ou+Io)((9PCodrqwm0%)rR8j zW%=qqH5J^FxsJaA5rjV8@QolipuN{!0(?$e1Czvojcn|DDEQP(MN>gP2~D>X&GAb- z5)ZQj+;Z9}VZ!FFs+6QMK{9E~nS2MK(Hd`y4Do<3Tiu;&L6Y+!DXUGFa!zuP*C_oT z`K(8VUOx9b{p>LW2A$s*OdTU=HO`O#Qg7;zSymT^Y+u0%6l4vONRsOO)S!%=B!ocb zrn&>mOxOs<@bh7f+XTl*20Sy47s>%CNd}e9hK_kocBruQxFs zZ~bXBy1%By20)C5N=6wEam0)ZXe56fS}ASeg)lb!xghT=Li~|_c+uL8hp9Vq?~raP zcp2`AcwO(g8#(I^%tpz~^a3rm-`ZmyU{9O6o-@Z}@e%d85iF`wVi@gc(av(M%4C={ z+RKUTbCbBEW*ZQ=hg`)YEt)_1wZh7muy-~-$3*Q(H#qDKD~a|evv$1;Zsf1@z<)|o3cH5 z{&Fai<#WYMu^i3ZTt_No22;#Z&9l3y6`zh}O7K^xFk0cb`tM0f8{Qcj6 zm8aEW>F2oVgWvAJ_$oSMC3tJ^OO%!tc8T{BvA~CW6Eh3=-CY#BR<@$LS05tsTeoVw`72Xl-arYK71Dd{oLW z>*cZkKNO!T>EY28cqz0zBdpGQ{j3{WOXibD2=YCG#$^6#{Vme=hkz{7!( zXi7&|^0E1=A0Jt;^}Kkt!=~G<9a%uiN`!-dDhB=j3VQl(#yaSHtS#R6JTQPBemBSO zh|YZFStkXTtUvyr7vN`^smM4fIx3|&Joqk}9Q5MyY!G2mFyM97`dPD z_D_+N>)tCpMg#tjiE~ZH9-C*;%!nhV+d3ZZJl3E=1#NT~82%jPj2H4E3}SDMq~Co!mcv@^4k&lHR@(eyuPpMSyR@bQbg=D=&~a0f%yzwQG)~EB zH&iv*J|z-MG)#JY!FGEggQ`6^dQnBj_ly|*&>ndnv?`QX;D{BS5t{#^rX{^!fhoz* zYf`Vu!@aN3pjh(@=s5mt$@uZe3AY2+^XtpfrTgpW)euUXU(t-IDj)<<-J#;BfDt>APJdV0lVYvoG*wyuX{V=u;1{L=D; zpCheG+Pz0&CHl@dN`2Xj8qcQulX2*V)>3l@qwNQpaN~6&Xhkl&Rea}`I?1AL*?!!L z(Omk5*T^LYh;N+_}}$aa?O7d-azF==`ERzdurmiV)WS zeH&iHK?PZR9`T{CPUu>w94xRFGL_#&(L-e>KrCK=^nkzMv}Dq`zs$oi)x06wb{O6f zj<1S`Do@Bbj|zGFWbaFLdQ>W(Tq93ht*vTe8Sdi=^B<s4L5Uk_Np&Cb%Yf;(C0PM7ekqf6$OokVKFITSXe$l0`78e-2+6 zj{Lq$3m42&YrB4<5F5|1GV7C$i>iAQb`1>F9m!efq3@8;Pe3A-_wtW7_QMvfW8aV` z=4h=d2BuBse~eLt`Ow*2w{Kr~CtvqpXe;Ft@>HE+Ac&Ga{qZ7Vv`|7dtJ?m9p-;+mt7)HS7XvSoVJ0T&m z)J4&zVe6A2^UrUPoCCDBE}oY;yS(8;^ykFwYvOpEs4;=dqQ}2ThX`+HI}`~>mefZ^ zuStMNmI|yr^Zu8R3%%zJ#TUkCn!^`|4+h}Ck!zHoFV%K>CF-%iZceHj7%+(Nx{b!M zQMvrnX)B#6Pa`n*bWK(WBr*p+2z{3exQM#i-1pb*4!EHWy!1k~t|(wp6}t}*5d#_6 z-=;^*51Pe=Xytf^6OViH*;1+3mCp_YSLRI%o_8kjLG!bHRl- z4FT;IB~ry(X%C9U_Zd&ll3f~&F`6y?dh#W zV-D$(Frv$JN<5c8Ca|1c-kKz*gS0HA`ER<$!R8If(P;Vt@Yi*7va?Vn@I>NSoAD3Ez+8$`T@j)kcE1>hRUebO8;ruPZ|T_PZEGM zO#v%WW9m-88dXO4E)D8C)gY8q5YDf5F&8zv5GgphQ^c&DRu_JbWh&@?ooywDqO~-} zTTq6995d5lvjGo2kdNcSj`x{nKv=~-LstwZPZVe=_0}HpD8Y-nUi7=+s`!4FNes>m zRuKeWxtre?&{JIj0 zpAK;GG_aJ|=oCfN9MZPT>a9VhG(F=;wj@522L`DguZyx%hw7+d+w#h2f$NUT8(iR; zqmQwd8pwC=npIT(a2)xbwc^bM*UWp2~q`IWe+OWBnsM*rv7586DP zI!@Br+epRd(QS;0I}`;`;ve?nAICkn(`|SoEu3l(pSLgml(C7|reu?oMQwbk!h36tF8>sdw|EOp-1$BOV`hZ!?mDQrCjmZE2S zfo%>a4B;x(!$=A?U5=7D|C#VHKS2xKEX z^83ZMcwOVE)}JK_)k`b{8twnC(+mc1rtg=!vxGB9%KnYoTozMkYlJ+q7x@k0NBtd6 zVz4p7MQFI=Huj^QCV=f1_kDIL8_3FMDx`)}4x8W;)Je|V`d@2%$NzSnMZ(6L!4s!R z+Mf-%2NBSi zVpJR(RYZP;L6(@c+82l4_C%?+$8M{M{`fnM8De{dRw^_6IKuLK9Hn}Kw^SO|rmnD2 z*g+&aftK5iEOpY$FLBC^vVpp zUvn?>KNA1i>Td$BAv6=bq)f5BRd%a$SZ>M-0a;oEh&!U7jk{$6Sidq$yet&7Py2xl z!g-!nYyvs-^vJB5_KcbWArUaVCHS!9vV^>iTfLuaV{mPb>*{Wd{y5pUkWA3@w4GPl zFW)xHkCkoRBHRfHxro+%D!d`HvCKB%XIg!nx>v)u+{t3Y7BCy#wX954+gpSvb?3Hx z$PnocE^`f7~`vo%r?%@gqi(+a5oP3bkWp69GybA_8wC;S%Q> zC%2S$GMH-9Z=U7*i{Il9uMBU5wjxai&*aQGm7lUa2#S{}U?!RJ6a9X9OTmYk$UECz z)5HIsHhpEm)2EbSi66%ArV`2u2N7)Z$!TL87*Dm|fS2ck#NcJAgK?SSJd( zK3$U5+Rp5x*K8o=B3nRlf04PO;3ybB|L6+*rr^H&cH=kes!2k=Q=<9C20o)lXEy91 zZA9sCE6x#^a&TJgEmje}aWAUA*Qk*mwqVC)qgqKtbWtQcN985>+)Z>i_tIc9D!Z<=G>2!5e4(;1b}k5VCz`7VXDyve^uBJLKM zT08}ai)U-|qv5^`XfQIC8j^UYJfD}2v4~F9Z;Kq4YWb7=u0-Vn8#z&-vRjGm1X2}I zS;#8rTl@QFvNkHj+A=1CWUTrL?AybE2l6h1q;f2sZy{@m$}vxbP8A3V>M>4CTX^kv z{uFT{%M_-n7zBO!;+Y%+UO0_TaSIX0A7N{BW%(?{VLvM4*%G;|l`WWB6bZtVPrern z(%a=&?W_pUoqpoEw9lz{FIS;c1ScncUH2b!&0FctA;tu>o!5D@B-JbEwx0##4BjWv z&+Qc3G6>~DJxzbK9csZ7Jwyz@t6)Y8zE@-_MCm9rJC`?qp*#^ZfPvm26d|{iXl={m z0zQ52)c2(;iJkY+fD3;-62yB|t$yAtwZixme&g*h;TjPJy>-C@hV3a6Mt` z#L&2$)NERmc)!0Bop(-x2!S-U_xqwJILJMb`w4pq<5?i}D>AiBu1aMYrV}! zpmHU2YZ)P+vSY`~S`YI{4F!_-w|Rd;@bC&`C}|Ibdhj%P5urEEQ+WixJ!m2O)5byo zD?y&-!IDYPt*C*igX$I0HUp3w)!W3>rrvCRXDEf=Yn7DKc0W_&Yvo3yfTLfXzX}sR z!>aWsgd!0A?%3$WK)^f5AoZ}+BEY~;PP%tZMDJ`nsIjZdgI5?f8oqQHe2Qtp)aVAp?5V5n>Si5P1ek=K{3zM5>>voAkSd&|uHoE=5D~wS-#R>XgMdl&Y z(q)dl~QCUdO1#_sNUEpDeR&q~HGOna*}A_*-$DwDDi){Hyq?A!!r4 zaqPT+FC3^vXrqpPP6&HJUy!}@IN>Ih;0D4eA0^WWA}~$r-9SqnrfzK>kc+<4;*!%L zE%BN+De&4>^7EJ5E5@Gye;c{CH)>TGup^!pY250=bt?GtL`zS-R$Y_@0lFT#nnHJD zuTb;UAPLoM3F|Wj*&>MPP=>cE?Yadb z_bm1wQgTJT#|~%fMKE?j3hvwpqOuX27u^HN))iR)LRG-DeyA6=*s$nvufDkjZiX&Eh{uTsj{p{RcIsqwy#ujdzAELs#oEDsIrJfWiWL z`Wl=lCqa`dZ7M}udJH}%HCkN^IO-2KJQ0FMxdDN{YdKtObs+mGpj=&UH}^3Co>WTw zbv2IUl?;v#oH0UJVVd+4ZNDy%bNYgu*n6f@2yH{qCvc7oXmjZEWoRZQQ^R{C5Qif z1De)+Hhax@`gZS8>WO3`>RyxRlgYiYFzX7Wz=^EML>RFXjQd7F4XJdu>@6FbHGizm zpL}ju1d-OibvQICCp`ZSK*Q6>=FhH9Jw52E5ZX0NSHS=BsYn%43D zqt<5(biQ#UgN5!!qeV``sT(~dKTvO*S%>4!^ z4YFY{{AR;o{75Np@B>r<7!T|_h<=!Mi0y&=tN+5MbHf)EB?0wOCn|i!;87A|Ok`SR z?N1-4)p}MfdT)@|{V&0s+weM(=W2fS>tGEbh==Z1&iwkX1?Mt*Z~Rlh9HD;S_rKx= z2cz}l{OOd}g=De=P)yZGahl}nbRfZ@}r}xr@?Hy3?BotYI3WealMaD;=Y&G?xi72OoldI{*=5ap8J<6rsCCs)hO*hP; zAag>@+O*~I-98ZfdYf=G6B7w3m9LNh83qa-k6L%?);L5SWSa$}*5834Nle({>m$+E zTT9%%{DC;WUc|sCiQkAOxc#bK-+ajtvSiWq(LpZCPxrCLO`yhc9UNM-CF@s(+f_76 z5t3}i_5-xW!Q>^L0RH)fdIxps?3-1ue4wvp#|h7p%}4<_ND1e_4GaixzVBwct{7OU z&$E9s?~)kP`l*rjvTP*qCH(Jw&%hhh-V&eM;5;WSk}7n*hI^U0Xgur3LvEdc?_iYL zuh))mU$GH>ZY&Q&8-M@r=fc{${jq#aR4A2F@XE2}x0~&>?l)BW7L{_7;F7-$QV$ zMZE41=`RK`Wx;xup9c*Iee%w}QvyL=K=Hh9%&9sJr)1w`k>yVMW!PpX9W*(( zZxry;3R`$qOf)1t%&_D3Hyfob*o2>-&8A#!gOe0=RUqN1q*fWdL_?ZW;=6?o4Z9F{HT@nGrK7oC~u#9k=Y6tU0@%2&Qt z$@dK{pof$=K{Ykduxq)C_h)~T)_w$?H-neLcFB7oudf~BMW6WIFhQouKN|=IE}y=7dOll2sH$wj);=wMm2pg z`f>qu8Jb(Jwe4N__A&9 z6Thk4(Z$?`E%RQ_l`|r30R3(5e0J8ie&Ry>C>H?FNcc|?8lR4C$o}F20w*aPz)K9+ z@9tecCql^rRWLXW-q+!DOt=LU4Ptn2Yd$1fVwtF0Aa3_a`sY8M1g&v@FOG6 z&>G_>)vnlFaUWNYeRhvNgzyhLFl1~2w$F>}VGXLc%iR_kqfPx7O67`o&c;p>g_Ofi z8-S&##}ku%+{$)PG*!jJq6xPo%Gb8Cq&C`jO`%G&tgX4%sbBpp4|^?m}0cdu9$BYBZ5*%81p_YbppC#^{hPxiIZ&v*-kI4 zG2Jf)=DA^ZNB~^}qJPbZHxUDnN%kfGMem{RCcZ#)m}MYx3H;uod02xwE|GO}1=It`6qSxS36* zQk^nf{05TbHMaOS#0+AdIsF@c5Rbr&_YWbX@#sk8KY@>MZIaI4_L|>}j$-vukV(}q zh@C$wuZSbkCoUyl_hcnq1mcW~(f<11;sS4TBZJv=(!Y7Kmm30Y0=0E;bSuacQ(NVj z|EsZ75~1Dh$5!w|K!^{3jChcG;V&pt!9!u_YQV!9CV9HdHLUL7kP4GAi|)#7s4YS? zqu2yHBJ^i0-R_mB?T^Cs$L#+486p1}=TT@WggcbP{Elf%c~lwA<}!JLioSDr%l;l0 zg`9rh&6bo>74fD|E6)8yM-g~N%}qjmSqRR2*p(hkE-3%iQxYJm%=_)$Ck{n2g8W1e z_bha@)G1Ft{`(aMseSYxZiS$K92~+oO(Fmj0ez}r-fWHDVJrupSn>Y_-7F()=bEorM>@d@Ut<0DhsYf zaYnHB=or(@_Ul)>7KZQzSiK6Gnif2H%D6v?zNM5B^aJwq=NeutKFPPK@3BdQo;e@N zjGBOdLxXJU=MiK%znzfDcb?>n4?{4SHIbMOeqJsdN@GO0ubGo-N0|pXa6_$_Rk^iLJMn5o8v1IVyU9FkpeHz^_@zFu{ha&mfsXu+oy3 zx7H%eZA+zTEYr8GRU+LUe+z^^>5Uxvd9Mzc|x8jds{Kmy8FX9EQTCSZMB7d+A|@rspUWi!m?`76;D=GpzQ@m@y?}z{C{o}pVViQE$*+b_XKY;K212U za6I3`?Cr=>;E|bVuDAZy(@;t$8lQcz!b!D`b6b0?X?rHT_oWbBKzRIXX0w`-8w6$! z7$R7OD`ej$QH&oz@5bI!j;j{6CK5P=*pT9v^3-rT$0BY$Eh_BaIcXIho>O`iR?W_$ z42w@FT-{1ju)O~94GZqAeBTU%(PjR>2Kttp)by3|q@%NU=#uKUZFP84bJKVG`8STY z$GtZ2eZtyDk5AruaElQ8zp>}Dx6ZuRV>Fi;PIqL~?SOuR8^tE@1!{vh!3ZKGjWK}a z`Jnrc&^tGpKZ$qu1pglUr#<;w_0j`kR2j>%P6Pr$mL&Q)hHYI#Cf7{x=&D z5Oi)c*%udv(~*_FfT*m>qGR@a{?*3#Zt*Q1G1(N7x{OCBeHHy&RZW8K3fCXaHxVC< zAALr8SJ$-r48yFkjqCO;zf0U0Ivalp*gN43=<@)#SE#v278%M5v1)y7`599`=Pa1T z!|_@k{4Miz#z^aLyumv&$_Qr+cje>@Ri3sNC>m!x;2A9m0Iuu zfs6CZ=Qqg``+R)~XLpZw5IOY*4oto@Mw)3NnCGN53T_<3vjoB!X?|GH;X$6eX0i`9 zi1FCHQ?dfD*w*9+(`SKAidkEX@z->%W;jF}gmyn)`E+r@_UQfH-_(?}J2OZnl303uS|o1{^q%xYz#q z^Dxq{0Ql%zR8#is%Vy~P(4L(5&Tle^q0I_1nz~lAF^JTaM)kKPI`Vn!lA{oRi_4Bs zbzuIzpdY1pZ@**XdX#I|iGNi2jTX7G79ofU(P=x5Uicka=o5eR@7|VYiJ`le5TV)_ z2_KxQQz;cUI4Cw8!|>j&P-cy_^zSBuzFK4{xF1|+s{i_%>gN*^Qn?zBFT8ZI48L*8 zRfCw4Om5}Z1maS_#>!p^$fjSEVJ5rBrckX)(FH^Xad`KCyxy^R5P-V zTItw?ox`TovBd0)mVo5VLQcy>SZ3+iw&GXYiz2*>!n0bjEsT-0ctfhOeZOfX^rUmL zRjb!!kD|kRNFx6kcPnBQ4Bp&2#qCI*kh->cAsi8r&@z)u!0(@ z|F(PaK~DGhx*^5a#eNB)BJ&xtzfp?$C_P|Sz_l}r$f`2y-dh%$^ss;U(SYBxu>X=b zM`Wg9|NSc1{I;f&rJj=SEQvs%wZfB5d|6Ns0^NrX2|7}!Emk|^4&Sga$$qsUFTrOo z;PB#^EvCBJW1GAU=57EezThtAP@8rqSM|M>^n9*q^K97|WSuj|zUu16-SAX*yCJc& zKIEEvy_s?GzsB#u$6*1%Oc@^2|GOsaNqzW%KU7;s8x=f+&rl10FDyp|(^aEA0!1Aq zKWcQdvySWH#xtXN-*?0Ri$~Zze@j3{gMlxn*67W{NXmV!gQ7)dVyZm*_QvHOU9^z$ z5b>+}JoRW?ZO=b6{#4fa(k@grX~D!6noGg;bO!zbRAFfc0?H})N8bN1MEx@2eCKpx zNb!R3raN&K|0tmz5TpT^Kl0{N>B>rQ^tR%qx~3Oh@R(_9_=}-YdLOP_o8krL^akQIrRiWhMB3N#L_5@U zJ75$NyA@Ohnotkie4W5QU)Z43y|kl@z#siP7^uNm)1o3xdb9 z^)B3dFpBZpGIt6c#%>1eS-~^sEQItQ3ZVi{lEz_I1W3Q;S^jH#+z*Y~xV0&4&v3)5 zek+9!fg6sp9glnt)){3`=4GpB2Gre@SJ?#qQupiB^?mz_vSJnyF;S8%R>M1;gV$#t zQnSByIk{FkM;Gv#eO*tg!>__4P&6otdw7hq{8BxIPKv?Kn}cOOR@FfwaYU!a%66%% zK+TU))9oSw6*T3OEc#Z{CZan1hCR|ZFn$%ndl!L;wLlQ!__jlV3mVb?adIlXa~#We z5kHR|CkxyRe-_c1_jG`OzE>j`$yjo>zPWxyjbo;q$~P*Uzcksgfj2A z0C-|tj*s4+VpI9Tt4A=E$knGPQr{(xS`Z@pCqXhp^#a&a`AH#`334W;UlCJI*&Z^7 zSy`A(qG7@cEn9z_DB~DJ9hQl5JOMzMh-SX z5X`n%oToO0ta@kI@-^naKqm=0H|UU(LDfDpHWet$#S0$Q(}-YQ1m2zq0_NIH<| z7#tG*Mp|*_?j2@T(C<&8b=G)nIR z>twqMl7=TZ%+siu(Jo@7MZP0ih5+Ml5GATOtC@;xeT?L^`d4b|Zs^mc%;iIxI0>nLCEC;w<`-^y&NIK=Kb6XM{9&)q4;0n~rZ(WJI6^rlo6G+(qjZ*b4yi z3Df!yTHpiiMUP|VEO;s-beOrwVz^^umIF$(_iXIWev4gUsrd8;SJYIR}qO3>$W=zm$j3} zAC?8YFd7zvbyb_Z;VLMbQSO&6gLfpn2_B%p*ZiUHdsu6J=r;8?f}oubS$IRTT=ivd zMxA?Ob&gLL%4~KHjLmynL5CQ~Tk4Kypn41>8Hg%=rKw{$Yzr%{Ig8&$;!_%i%I?622*U6(9I5MS#j{YE``Wwv{Wl7cXI&70~<-kRz|ye3>OZy-sPM zx~94AsR8GIlfs}3%fpz>Q<64HgefIVAJCCPs)7YxM(%ObM!FU#Q2j1cd+(9*CHoG= z4+|HWuF@N07X#?_uQ;VQ5_WNy`HikRj`j-@t+bY4i3xCc71eiD^t@dQ6@AfTB_m$zqxIJ2r5ZO!|d;=J*DGD6ws9dOMPXra4fm4Fw5f;*Fy#6fj1EJ#e*+5l2F3(<%8v05 zP0xJ3mcsv5PgB>zzjqxo3L(dj!TfPKx|Ef0R}^~yFQ&5(F2!^CYP zzG_(_a#%P7am;pktuU&##VY8Te|JSKKCvk6$BTQ2m%LtW^+KWHnIrBt>cR^zC4va) zc6i9;Md(%lss9kkD}r3c=%9x^_j>`#(>GW&H0+XKH$*6=o|wIZOH6nWMP@C|r8Hoz zejumll9aeYRy~37YS8}pm7!FK3tJ(go`lKBykc!HKH=*<7AfRdB=yWm;R4+Y-rwB; z!TO>JGbZy(RGD3DWx5GZRHgl#7;lZoNmIW&^3&}mr?6Tuac$oF5Xy0+LK!%1ckdRR z3lk{eFRnsJ5od8nJ(D6p#~)i%1bm|)tm0aEz5)#i05sAHtJ1}%;WaP+8wPIe0Cd#! z5GEF|Nd3n`wHCJay%C^US*h+-!o(|g(fAntVD-zv93xPT$mvJPmYMjR6&*aTR1h9| z@Le_D%Dk25DAaIS+?Nlj+eqpEs}=Xg=VsF&v_a1jIlt#|BJXAlVE256t&yILB_a;J zP}H3_e>ghFn+Jfyw@WY&H<=^CWR%2`72e-zXD1OM9Nm`M4_3Y36qr;GpLC45BBUOx zEaOVd2{Pv0Swei8h#g7*bnC}~mbccGQsa|soj|`qJ=je=97oUJg_`B^d#CF;C#vXH zIaBqE@BC{s7D`NMhOAldM8ty-cB&pnMdmj-v$EgAyomn%dmS96$|aSv_`5Lr#*nt7?2Y-?CpkLJrIDWoQ!UJ(QfLZd z+?l&_8|=36o5SZAW|cT#ce0aM(i4kh$L42nqDtkzSKPyf+wxeT)*N!7jrCkkiUl3w z497Rwv7DsKjFKD(vf2RLz>Hb&Gi%THNA~(`T{Rn%7fmy}3g;M4FoRMIt(;d@aUXnI z+5e`#>bWBjIQA?)u=B!^wRjyw;RwtA}m z+QgxTr>}L}m6sVW)Y4t40I|>0414a4c&A%34-O=luvGa-O9^W|YzNFd5q1d^=%+wC z5AwDdan_JL;VICY_T#FsHTEj$zXvla-H0za9Tfx)s(3ie-}w&=`{Qlj7+OQja>g!k znk#}kQgLwjon;n>A0Rm8|6S(k{1~773RS9Xa=YAR>0 zQZQaa;IC3kX&XAe=9CIr#eB}P`icDdK zfv3Aylr1-2s_$rA(tnhL4$cT)^rY*dmBhGEl5AcOE@S0WK)FE!{z*NpRMe z7jRR*#v!!f*-U?CINVCa>!z^8K7aDiV-L)3g|q>#-f33vT47U8w&1F7H<@2U-`XVR z3C@bS+A!M3zFf8&Mw6-EZd_Y#-5mpxI88{8|Cn2fZ-cfqiX;II)`%BDtVkosxfgJZ zc_Kl=d*}9kvdtT1L;+#O@qhm6P3QiwYLZVfkr#CV-pLTEz8jc8SYwY$8tCqSMa!qZ zcfId80&`bC{0Wq`vKX%sg#a29a>3SjH|=r)ETkZLJ)>7mOsm_yp@X0lQX?vCbmnu~Ua|;0@ zYI`hzGMEw)yctjA$IU$`a7YDsR-1&wnr0L^8LTKW`*@ zQE?$YnUVitXtrA>UdNpgKgsX=0z09ixVs?_Wi_HPFwQk$AtdP>O+2SvzTxG+-oy@% z7%_ry=Yrw3=dtIrlM3CI`8zd#h(NTUJ!sIFZpJc0Ygf$fr#!*Chh`clr{slv9!~?HF%L|#`Ihj^$3qB z54L2slzz*h+VYU5q(^t-^1o<(2)Gu;CZMbU?4J$1e}eOhOYOef2YBFDsX^-lve8RX z54OUpQ#NlUQt{9#d&hXoL1@C-de8DXy64>ZEl#9)-|fT7Xyc7gBj4@aMvSS&Rv^QwH# zKKyLDHfmMOa|Yqjw=Q5DhJ5Y~BV7uM8IIk48#T#8e$tCCj|u~RNqQhnyU1u(7d3F% zl4#^r==)kys<^rNA~l+v_vSedwip?E{7j&Tl0R}?Q3{WWGYA>`4!mKB#p{~v0sjyD z#{~T8b#%_sua!q5Ti<1)L{a?nRoj>ff)k zixTm-R~egy%=7qTa|h{+qOr;Goos*y676w%=4?k#|Cm(YsG?YJWTX|59(!cD>fe7l zJ`>%4%&3tJ+cpJS?65FEjm4syR4>`jeU0A{hhcl~vg8E^MIO9P%}U}-q#Tcac-(cO>I zW0w3~6~XjM-WUd3Ei)}5B`v`L=O`&czzbH$!29G&u2#E%u?N2)*9<*C?^MBX0^Qby z()%4DxOwlgx#`<4qckIckGYQPv0o)1gm>!5`!4=E1qbC?(0F!?H|o7xF%+5)``<0t zv=V47RbVa{?V^@ZC^d_Le11OOU9b4$cF?D4CJIL8IWiB~YQa2g`Hwu|(6=s9ov&-v zp3Uc7;w3R;YQHyoh#mFLK08MM4Xpp;xKi>V{dcVdFZ;@ zYqFk5WA>#nN>68xT17F}paWKfh&MMy^(crg@~-4&IZ2~D zZ)9t9Z6ntN3i$PhXZ}Wuh82c*G2B4j{85tWupU3KFn6c znlUfkXPEfX(3I;t+S7xIIwX}$?E+xgKf^}DV8k@e(q+^2@$@%ioWL+Vv%DczgwK^MM5A;!(TTRp$>1QCZQ;irxEYQNDV;{dxb;IvSXM=zZPN-Lct+9C3BT zAmF+%J?)`a0~w(#=o%DnEr&=y`e5@Zt&dH@?yZ=4&EEt*dXr0Pi$lLWxO?I+Vs%m&btA?I1ECjtz!`VqKCW}Vfe+cb87nnKf*^%QkWf6OK*oP&j!Mc z`;A`GDn&IK17}r@Ug#W$*sE)M#_Y2XILG{o{oq2F9>Y;qL4P8`nbqg#-yEDdB2(5I z-1H$dGjm@L6 znGditIz$p}pbb-pFsAzi?91#3&LK(TOD}%$SIII_-1#4v|L&vJWB+}Xu9Nc3JIGvo z3asc)PWq&SJ+BnqBtCklhMxDDwy7d6i|@ps z6%3W3bGmUx05XY?gz9YEN(_758w-gP!9}Q*S7_BDo67A#5G%7yX`3}3`bMx_!SxkNMNxXW$Lw3FOtm9qe)Hbf*JcxUhC2lK_Za)NHW zY_c=uzK3mR2q5C%$7gvT`!o>+kOEeuKV}c!^o=asqW@ty#k&$ZlKPy+aOCE^QYCZN ztQ}|uwVS>8Egzdj+o9&9o4boGx+g-;QP&Se7q|CP`lieFl>vOFM!aygyEhOZ`#b>V zA5vJ)HWhh;b2IkofSJW5V`Uozz=@^`xtDb+Q06MG=#L-@I!U@x`1i&qE-Xd*p*>6p z9q(hbVeS2T_A`j;^v&^H+C)Y&j1pY&`aAqE$93j9ETiuS)JZ8^#qMdoE?xAxuqDil z7C$t-Hdp?E(6C%4CF^6K;)M>Z>$?ts5MenNJ`cVs3$ z2K$QZ{)kVSzW13l7>U3TjBY}zXc#W+pqB82-39Ujbl6KL87fWNav_X-go=cIH2IRA@bv&HNH^&gEudON z?$3Pp1YhjJEb@O9p9JZ<{1&-&r5WPK38=5T=~{DxKFDPHRaNj>I#;kL@-}_?{{F18 z~$GbOk zHx6{yO?9Uf5XR?vTc+9*YlcUFfg!6ky(f!_bSISUuSNJA81yckZUSNYw|&in6^<^Q z63>TxCJH~KrsjxuBpQnb5)1P)KRLtnx3F2veH!cQ4Swyw@~=HgVPng#=%b`N|MxF1 zBke~0=n5&hD1T%>IR&e*NJP%&6M{#j1S&|erQ&G(#N`&Iv4@#w7-mH`tpV<~wM zV+c&Y?OXWgMe-EX8V*7Y)2yoWOu=$k9Kr8i{*OhlSBK{r{)ji@7cD z$BO=Cx5=xrQ6Y>z0vqiz0mQg%zK?5FeIxZaH6kA`>o0h+m#zclJI8OygdYWXn!tk9 z%J7*zn-YPzqZqMr`WDL1Y17|Ap7bM1^C&wKmVUl!HeY|jQrwzjMcICk>%UCa`vc0j zb}OMQ^GR*==7--*FiNpk4cghfr1md(`R(6IL!LQK?jFV>%S|d2ImLw~=5uW&id5!l zv_p{f_N_|?^waA zZ@SHQ3kt0e&Ai{6S)A%p-I3bpiL5fbDueh7f*atF``iGCjLvY+_O0>BwXiqmP>Riq{rt|5J%{Hhh_H#>cQ6d2&=mB?XwmpsZ0w_7pnWBI45-^YWAZO0Z_UX1(L3;i3g z#GAr`6((M`J6&}rXb@|ztaI37v@xdcM$};hj`}abfmKeVgK&eT7rS>g*2Lp1vNIK{ zQnyar&OI=hCeG#!h&Rm11xtx3xJ82{6UN)?Mb+T=2KeKcFZF!}$2AWSa%82YD$n9d z-oao-^*u+t#gIk2BhxA)sTRK6JGufusQz}aG@wxDjK%GQCCR@3rm`w0v=K6t!87>| zH;Wk;C*OgipZ2K4<0>_a!(6O^!GAU=a;}f79e3H_Qskn$js@qDm-chLlEz9%9HDqX zJU2A$;=nYv({J>z>lP05WU_@7qZ(KUvpW(lx8VCAW1z(z(4IUs2T+pIhomz&%e;P1 zfM8!NGh0H~W0Y1&{R?=f2+c^i;wFy~RC)N65fD23U^vD#%>J6;6}+!A$iFoHzvqzL8NaBt49>5u@xo&JcjYf4?gWqSo!W# z)9AT-_njvI5XJy496dl4GPk{VZTtq0tU5z;>-}C2V!wb-Lwu+IcOgs4&$U^9f~Xl} z+^s1cJ}3+mt-l)c5_fjYAjm!+z|xyRa4NO2hA~zwFRNURzeUvVck8hiep#9hlQn+@ zk3IMg$hv>WJJ0d5duGDHl77f=7f2T024C|>UrF2kcJ%f=|B)bR zdwu?tR@g?FUz2(A;cP;(_iQj&1VZN88`(%qKDLAM3y2bX`sg0|XHFXvsZL6P761k2 zm4@$K!N;^Mhfwl3E$GLW;>;T7gfL)0VSx50;r-Zt(?+`S-=~+{%jhS1ea~=Uy17O= zGZ*_gKQvwxx|AOr+)X|ZZSBNtOX_DTauq`~c6(xuusWFDJ^F`?T=AQO7CV;j#p33- z-(&P_+322rzeungr$Xxl!KNgrnXQb!s68b8{Q6YHfdcjocx{2{M}IV#(L9@05r@bx zU3$vwgDIOVZdvrjE>k3~&6>8_h(r-1=o0LGB!DkQ&T|ArG6r=R41T40AWv`x=R zQ(>KO{~CJR1>Qv|Tn`r5ypLcc?UkUSIeS16)2=l?PJ?%sApeQ$`kY53b2tcMSPgiJ z>mK?rHb<`bHld|}D&_Q_8KLFs-O3GmQ0A&aiqRZ7A{u@miwo-=x6)){n?=V-S7)3+ zDQ8Dxv0Oz4Or39pof0R9b%FSZZ4|;Ji4+0dUv@|S&`}>coufyO(_oH$1;S$!JAT3e0SBjPU!6^+tva+PVYAh+u zoWl{1Ghe;jb(|w-G`8^K|IUp(>8Zg*m|Jy$Rv8DK>}4>_h^DJVTNJJa7t8Q0z*Ib^ zEzN}NLd<(G!d59!a^%YlYr>aPpB>ZoXvL$hFw5?ls?_&&@*zF@FX8vXzE+rj&@Ae2iI+AU*O4TZ! zXUxLF0_(Pf>mICgF$>v77C#;I?I&Wzk*thTX)unAD)AHUnyhokWD&1I5KKY!KH!-e zsc(x=Jm5pTQ}TNY7ApPjh=mI8-pAv+{=WRntm@C4WuMD)jKZKf zd01nWi^>HoZp6eq^N@^fi|+r%d54e2!!Esa;|3@pUAu>V)8=QF?iOu+X(JJzLQIUw z!Ystl@^&Hr@FHqgfVKi@Rom!CL$7L)p7%sQ;}WOCsbKI}W7AE&q{K5V;}LaT{)qO^ z6)sc(={Xvbf5MDp{sfxE?i+$t+t@j+!chipfAQZ9>;DdTnb%pcD<4qEu;YS#x62~8 ze6y}U4WB<&7zmAAXW6bq9Vz0973bTe4*yhwXUE^WJpAN=^(}^i2IG23XS7_J z+nK2UdsxY?LMysoJyt_^q4#%qdhj@IIti>*f|C$LqP*Hw17Q=1=je3!%lMhvM`nO^ zhvKL+D1VX|48Dn_YeB!ANH%ktjo8XXlme9l68!K;Am*6;NdB#n1bWjuwxt^Dh;L zPLFAJJih$%o3KD2BE3+w7`xI@kPDM8EJV11v^)zC_@u}USSLnOf$m)ZG?UB?Z(NWR z>1AgLH=3UUCOeYxzbsd>nXf^vWub_N3kTuA8H{>zha%)mA(;op1k`a3`5#LVO3SO- zG#qX?Ez_Qykl%A8Pu8?GkV;?Dn+4+umJFe$IF70?`o~p71G?ggBXN%dd^cEq=}T8; z)h<4Kq=p~g3DuF5vsavyzLShhAeLk(j{?tc72@}^Pr)r?(>N%|wGn{wQAy)hjgb1Z z^DnuQ;2DBlpoJs;S7&|2b`DIsv4%N4PWQ`>SrbHGi&a^q^523$If*O0`^a*#dg&cF z(JI%$`}T^GWG<^=WU=$I$@}CE57-4m3Bf~H81y_OUXDu`<{DM%po5)1T^NTu%)mJ( zOn$=u9Br5Tb$I%o;?KG2)f<;vk0Nu7e?kn8?Q5o#N!!~C0odZ1Qg1&W!UcAs4y`K9 zSzUrm>hfX9PLlr3czv3vUk%#4KcIhEQ4cpFfUQAdK+}D^Di@CePorydNMsra&}c@| zLEQVbV)v*wt_&wII>fn2)xqL5bh5%z-Pb;wEoI=oE6}RtBO-$l5dgWyG4X+HF9@jL zoE&jmlw1yFcaI=mCMhr8g8nH~Q)MwH5WX~{)f4qQn?KZVu^f(q(bF-91jhzduh3gH zlENv*oA?8yrQ3tha(_mMUv3FR9G99y1Fgc7Mbc1nq1gK511)&>@({#xSCI&sSEE-! zC|#2;wrwB3M~Hp7KN?Qj>)i9Exjah(G%m&5JnQxW>_9z&GRNRaA?JKUvwPy?=J zrp=63@Du#)nT zFW7E>7p4GPGNL09yXPH{MG-B33uVXj1UYZ9OIst=d2z z9AN8!yFrsy5Iu}5D9OXP>&2^-;8M4fuEm>XGlaZS2#%%8lLmRCha#R$vw@NibGBNp zU?Iz7*=OsdrX!!piQW9ICYJZ&<6>+|FL^3)6L?CgkKHO_8rYHu`ra8Q`qCjpjYJu61^H{pJKodnSIGHZcbE zYGMIfS%fl0*kpe)je8%hXolxaE?u|UZlW~K1z*8iZrvL4AM?d(1KT3H)aY_jZ4_So zQQ28DXKW+3=iO2;`&u+rwqD+JsD&PY;5;V0k;`%{)eDzCSq;g5eoTn;*^HE1rUkwI z?}=~Bqaa>U+rNyM zYf$|7q>~o)`d;SQAT)z1*cw0D*CqVX%B~GquS(?kTZ2DkP4I&I<0F71cF}iR{$W9> z@)iRN*{%6b${*2c=`sJf`)EgI_8?cn&BK-tBCm+HyvJy~c`aJQ<kJt>PO9)a*ZySDPwh}o?y}{`*@s!1y zzCz1~dGVm&ku;|o(WZ@9z~8k94Vw)Ll0iC5t~Nw0&cW;L8mj@*#i_jZt+PK_G`ZwJ zC|ilU0>Lt=im&!GYH?cNnjAP`9=)ljfr)qriYtj!ut$vW+5b$_TeJAW7?#leG|*~0 zC@LGfX3GEeq?!$3c;!wzu$GR!t>F-Z*=?oO1!~(f=Ed}nciHk)R?fvt^^BzMZ!@8) zuH1T@*Br0d@c*d)GGrD~=rbAiI`i(x|4~@@{s{K3QPnIzQ`qO5O;$5Bu8$w6Cn0&l{NgS?)AZ zF}Y0i4&{X8o3_`u8~81*J(up<$qV@#wAQpEw+&_D$ z?mzazRd7O4{w?5S$LPGA3n}2yN^1(nVpqO1lBx#P_2uXO?NLJU03uU&h>F3YK36cn zuu6D)XjcdOj9RcsD~1q0bFk9dDJu>jSNc~QRsUklP{!}RVTTog{Z^r`{g@dYW^@|T zUqBn_wWgvBH@L2ez(qF9ZC?xy#jkG{QH2G3to36K-q#lxfUhZE?6y9DRZys z0F<3w^j|GUlQ|uIrLVXa{yBBSF?cUtKP9QUnz_c<>SHQY*k+p2*_g&LmE~Eo9ls+s zE*;;C@~n~#@a-snj>qbqt1{R0GR~H{NuWBx&!8`wKs%kDd&F_{_1zB{4MyVk=|qWg zK+3)^6yxN-I=uVVB6tJcj*}@o4Xh+_quI)8!yA$4`%fZP zdj0eRQdttW&EVI9ed)a#1~I9nDwC`Tc_7hrevQh0*AaQL%8YcI)wTSZl@40>(xeARHfYci~l7 zld>csjBTe_!wDvnD2neKJw%Hy%)?`}HQd|Js^n8JDcK^`)2>2=-hcV$vI%RQh6>Wp z70G*#2zu~DvT#AvkLaTB9?nKv(c4|GU>f0gIaV#SLMp|Z@9>6u{+ZDd%AOh`q`{RB zO!C2alRp$*2VTp<+L>{^PKDX$Xj9YqMnJwC>=XoUR0FGw$WC-;hp>cK^IxSHm1_J4 z1m?tYDBOc?F8EmN#{BQ*SzJN;nq5*j5vp$uaSS2~I)thGyL-I!i4a`6+Q2+dIK0wz zU*5SN4eHGrJ0{ZdgEw6%umbIJ-+}?nytmre*NHj#e+k%y7Kc~M{AU4~UgL4OVGn6U1&l9ie2e_E)0Cs$JxK}Yw{<3%{3*+8D6 z^?Eg=&!9BY{)xyZKFbI=3jK@o>7^_fnGOi9))>MhU#kw`0fmYcjc9g~mUp}&%JKlk`>9`KnAMtiP+g(d}c z9J$~jb49P2Iz%uv9xsi@l?@f5P_E#;nIZ?bNwNhVILVJhDNicLU_Q$sWwZr(k@`wG z-zXhks@hwbbb{SMm~)wY_r!k0hQ%BkCL?Ci73<5-zO8uj_1_-CyjfgyVYbZJi-n+! zk6649=%YRS7#y>?V>B7e^Y8WDZ@*R`lR}0@qYG< zf%ry)6B13!Jo%YK)MX93M&8*b_(6XCQ%K)?kV_Oaj119Vpe=ct8bqjPu|rIftbr34 z{{0L3hBC5YK~W8QYpjiNyII<#Jl>9}G89@d~D-clqSkD!<@dDJH|KXQAx z8erc()}n4~IF>?R001F07YL_8kbi>wHqRlDHLd(QAhtt~y@mPhL|BJr?jBQG+5+F4 zFCW-918>+xJcRa2Or7EamJS#&vHL|9kQlD5wruF>tI&uQ6P#Y}B->2h2z=BP^TC}d z*eZN{1*56O_JoNXw$dvPtJUmFDITC`IP1FM`yT%R{Bc05*!&gcf%SJ|tkA!p;QzE0 z!RcMBM!!G)Epx}74;t_cZQ#UTr9bP-QD!kZ*rGP>*%qG1E*A$ex8q=@%Fa(au2atm zx&xu+AEO|k%K~get|JO7*Cx5Qc{H|QfZ25AftVeVtzZ;1)~uemA2_m>dtHk|L0tss zN$fYVw-Mj!{o4vnhu7q-^xf_p_)uNneAT&Pstx+!gdM0?q@&?nry0tK$nA9hm7T{cs zaht_*n`1ro@|a2cQcUllc(!fAC4D;c`R(-&QiLWs_$cYc+Jh}PHIr}vEeq3Ok;0dM z#R{rmK@uCpwm%qKC$Xexr3+CPq^(jKTlaoX(E&bxIx8#=`LZQfo#OWh7>BE2nMvFo zkH2>=Y_b%zeNddJ>yO8Z_;?kj@dfq%ybTjgxYdWIzJEMkTYUfv&D|mEH*_9QYYN9j zMmv2QPFxJnZv9-?v`S6M{at?SR<0Hi9?E+42}d!RK2?fEs9X-$B|UOk^XO;nL3*4? z1LQ{j^uOJDX&IhMtFrQT{5}IS;K~eC&E<;GZ%z@^^`trfaBv54a1mX$^Ts3mU;E&g=yt~o54H#y+WTDL>l9o> zzDa~>ihDE1S|vtN_s}|u2ganj0hyz|P!pY5_iKuwWBaOlGGhR=dKLc3!Gn=UVvaU( zg@ol&#*NXW66pNH`84HLP3rylqk1XUc%`IC<1q)%V8?1~=>E&(h%EPCV*zoEVip}n z4?{9Fj_;r=V0}=*qIf?`y4%VAYAbQ!fr%j7h2}6a;{L);j!2O8)c*sO6}w`JWYc*I zK2mtQhS7Iz{coBiP1i%6sMOBqC}PwXEwE?UdJBb zXXi)bt3ScvJauV=KfUjL$AfMjiGimbDR2S-uDwi%D{IHRu-%#4(vt6w!d(Vc(msvI zLi>?y9MQ(x4}Q72>-e(1iUq%W!j`!Woo&0~l%w>9HE|*IN}s>9b~-oot{3N7Z!lZ% zuCU?dA}#o;z23_I{WC00Cd@3O74+~~14BQZJze73=|vOf=wL_f_i;PTk*VLBj9*r6 zePU1z9&(iiyE~wsVU~yt9F?a|!qYdpjrG95X>@t*eg96U3_Rq=1|F+!^!*O?#I32W zLuug`f!$;4DjehHlR8XveN+tcDS%Fjf~()X_!Xeci*7dAQ>Ze43!~R#2<}q)9~0}} zCFzFwIdHifrM^=y3A*dzxyHlrWAKtPhtC^O>471b)+1@a(SYsDdS3W#g4J&p`R`Gj zm>KGHS*_THvB2wJOze9&o`1;aL*(>qfaN8t6ptU{(?llLSyNGBZ+g7NC{r~0YV?zy zy&%(`;T|CYmZuXmCuBreVy5KiPFGjBL-Cs}Y<^7|gsZ!Cx;F}sY<^(^O^(6MaViIJ3 z{VkHAc#e&vo8kPn>m|$-yj=&SBArub{IlQ*s`cw%O(@U7G++1*i)a7hGi`{7)W#h6 zDC_^2Du&2lYC0K@AvKjVY|cgl><2$gC*Am^zXEZB>s6%KgSGuF>`3eqC%f;DO5Lxz z5B{FrqTf^J+|7**0l+b2BN{6D=9i`6TM-*c&|9|f@UdeM;q}ltoT;>PQnT(A?g_?1 zNUG?ArRu&xw&L}hw~PqTz8h@w?{-9?&CmD1yw(eIfC7hT#3~zg%T5PkB3wuV>mYv#X(F4y=O$&L+Hh;^>ZKo&u=b1oMHg!tbiOH3 zdLRlG`-aPG^4FxCk7t09?qRItQ?GnLJ2)x~Y5ZBQR{==uIV*#{w>fO|co}0_N`zB` zVoOgOE9NxxQ1$-MEm0BWAW(hXS*5Xq3LILyxhTP6Wu^&v_+ooM{vLMy{rB4>3TyE& z+rJq;Y8dqI5oC9`=>sP!5Rnj!6XeU6ck5&i9I>Mjp}n&Q;iE+wCQDPpIFp|_sN;_} zHU9lrSlrf$QSm+T*&~#@(~maXL=W!`NlC1yrL5M82h8|KfbA?CgXD5e_-5hkaoQ%fmN! zhxb-PCSrZ%-4B8~Nh6cAB}$9FLo4rKSRVSq1T1vh%#M1nbT;Mz4iaZVV~%yB3yo15 z)xn8fWxg=7m|={iCK9RBlbT^tt}1+__@0|zo(u#T{u1XGizcr#cKp@(yaVj=p5GDk z!@=z$CZQp4vI(HR`Rzo!ldab+naKZ7IRnE?8-p*<6hH5xCA8pxD>|!VSh0{RhFX}f z=AM{AQOnIy;R%2?xkBIvd!FGA_OG9(@n07z+CSu$H$1r0pUGs4wE^xnVG8MWyKmm2 zowX;as)#|vo?q!?Q!SyiO!t!-wSTWbff6L})Iu4oUJ}uD&94-HaaCB>;VmmBNdij2 zV@j}ZMK6A*3UsHZNAae!yEVj~`{>LZUn$$PUBz;b`dYp_Uu8%ulx8KTGzb{sk1RkV z*dq13K?9n%m%II43`-FYUfkYWm0<0+lPr^9YjfaTumomDk)}CYug=STZaHG#9qnCe zMpHln9no@jC&+l(;b5?LMyo@`qiIh}DgD%@fZO=HZbAFdo;4*}KDIWZ`!7qlHkdWl zgzoYt0xKTE0idjTv~J1&Y{uZZcK;yynvBj(wF~<>eGIyNNd9s^T!4X}%K)==rsoFZQgMiZU=nqqIH z`fsi*MIA}UK-{`6cJpK;)|^}O+@gS*8V?erbW-EJ_wk%~+o|lA=Ao@dZ9l)n5kL9Ey_nC_IA_Dl#jyKg-f)Le?td~?-^t%*uuZfz2r5@v?OED?)!=| zL3y($c|3w1@&5c4BQ6DU$~EgUWI6vUDD!TQOvGzqVv_Om`)A1%ITn7^!Szr5y8wV< zO;bhjb)lesK@(LZFH8S}h@85FD)~K*>$}5+&Zh{&kM16A2(>AESP~}(Fbn;)Yp(Sq zC+jHHw(>aQPmM1fe@j6a#@kk``m6Aoo@~tEI8OCEb`_(hLSu0K_s^uP?dKs8#y&$* zFopWg%@@b$+gX^b|9>$EueBV!0~#O#T#bG>>Wn)69rUyxBTesRW2t_(qBK)dj0mLOtnAXuhK=hF+YFMeoB)y zbDV_`trrG$lpe7CJv`j4%`Fx+Z4&WO#O|=`GrCYYITQW$<4nye9}{LdUFZP1e?rnO zW`!bSW&*l&o<5r@8_sTk#jKL0d}--l+Ma$fgEcqsLVo$93PFpURYl0RHueE4eHj0D z8*|eflJodzPK?~(HIpag06E8%*r;3FM}q9Dqk##Q1NJ(6l=MS@*1C_`t0{FSc6Nqp z`hrHcMqL}09KLMdft5Mo6AQota)J%~O~Iv*L}URye;1!?)J`~DFfD<-vQ14Mgz57= zKg$e(N2?2<3Z_r--QGkC&98#HwWgRPFXf8ae-ZtoHDRL&6 z_PqNu8P?rTX;GFBsTcgub%*`(52%1p!QamKHRo(I6MPy%XcyWoOEqVFGpIAJnTlR; zlRs>HwaNb&Dz}M624>;@X9~KD0uAm6p0} zhy5BlKi7ZwzKh@ka`Q_<6sN&2@!Bw!TxTZT08@S;7uX&~7DiD%P}hb*8+~U=SYVIy z_5{u$`imGLUg$pF!K{e-P;PRdqOotReZ6{`d(HymrM-v8%@K9PZRs~xF2bMa^CBzK zVNIBxcMB3+bGqWNKwU=l4V#j}DJO#4$^itC*EV5{*vcUE*=jN9*ZU$J#$UL;la;+7 z{H?wRac|3C0$A&lj^B{PgC3uoDLgRy1cIm+f@? zyk_-qit@z#b0SB)RIf`#Dm^j5WX|!g89+(Lif5DdMjM*hm(phMs*zW}Q`hom{$lz| z_OpiE5u?eWC>$4|)G(>s6~UOnjq_E*jSSD~;bDsB?oGe|H2!&$#8Mz~#^CBQXFe1n$Cfd^5Z206d!j-7C~xQ+2hkRmPQM|67u` z#|0*7&f;ez%S1OE@lST;N`!~=Yyu0{K{g8ySMEywoWaSkO3>-Kl{R-7`-|Jc`( z4eNMY9N_qFdN(fTS2%kp&NAVFDemPWutL%=wbB9EXJ8)oFb?cHYGG#9rjM+FTChIL z-v=X+KjHrubPw*kCsp|>{16(Ig!t@aP}y)r}peoX?- zpzQy%7(rX^9cyjB1L_7~;~Eoy*VXz(J)pfGXG7^b!z&A9_UaXVj5$_KDhYr=Xd9FW zw3S34tT|DfW$xfHGXTGaWI9xP%sVs*pde@*fzV`lTpA7BL1B5(pCJY8Aj;xz5_I1X z%fAiE_P5(~eWKNVD>@0#r0Xqh8jT?X)Ia4Uzyf=8*1nNS8>^ZIQl)Ow5wZ*(_zawM z5>T-tHhJewt@dq1@Hu3axT|9V@Wxs%>17Xz82I3@Z_mkKjKfjcD0Qv<73vUw&4$>^ z^$v!RE>Ok)8nWf?y?S9$9xGn170l%rmvP;`HMRh*WBslk?0n`hUKVKAwuE3)lYp!G z94udH4p-iKi`_Wbp~JK|S?9A#*>yV!?i{|GB0V{UIQJnu47EeJ6Q*DY|i< zqE8O3(D|HpV|j(h59KYL1?Wb-0!*u*QKoZ~zg{yH635=}$yITPG)BI$($7IU14bqc z4Lyfss8wz;Ea~^c4P=9-NAwVQI0A1G;HwdMvj8tY1FX)Et$;V&`tAHP0!dfop_HV@ zwnUtY!_FtRRLsRn9a2jyYTHD=_JMd=55C`{U_aHL2LBuJkNf>&03Q>8yK=o>PXs?x z(_zR^wM1ZwJYai?zVL`VGi!adEtC!&oD^6xa7g#B=)~Z3De%D`Kdc-Vp8xwDt@am4{iQGKK4WwE z#t+(}`!)#49OZb&1mLb;e~r#0ZlJXkT#c>MYUOU@fG;64csRIP8(@muq+_ctBL&)& z0LyjpCLZ@YL4mfSV`J%AC){Y`Ykc>v+jQe_{RBkXpHMFS+*Adz-RSf_(Fn#qKW2g zAvuPw3-;0eApl-#%QuneMvLFxl`kCW2t}y|)YuBGglG*LGH&LIz zSyF|+qbKkMI+3{w_ktJ`WPX4JX_M$;OJVlyTw-X^H4U~1BfWl`Ymppc9o$*1u&JH=Mx!*gubc zUY28i2*AFI1$`Tmwfeo!0B6r9X^C;20(2k%_^Mw2Fn~`~9`_NXp8cVo`;GprK?S^* z89HDpd<^-I3BZ^DoVs;@a>(7YReAm&$guoNIKndPh-85OIp(U>AxjJ|DJfuEFZTE} zq~H<~gZHAIw7bYwov{KrZX?;7wgCP@4!9;!+E@Nkb~K>S{K~ZeB1c2&u`~J4bkMEf zXkrroF$v(Fj-bKTw9uPKZ3U=l5OTksHTEqzvC*pDQBC;(D{BMTO!Z1%M-zZn6O<;V z+Y{1cZw!q<$pgLV?tr*GS>MM!NM!7Tm=tEeq>0blQSauA>n=?KSX=+csbH|_qmBap z%4L>uO~z>_WlO<-hCH#y5p}F~DQ2|K&~~-j%KIKc$mrjx=+B5?ZZ=92oLk zt(}n8lQTI^W9Hgyu0LsG1=--&I*X)Q_#TA_9~!#jMK{t@j3=R_NEqA?(V#3@Q$PB# zHyO_3+jE#GP~RpHH|s137PreHW^iO4fkVlikhxypk2+uxlS|=#RC^^O(1$sf%|H2bg$$tQ6$orO(yJ1PGnvM5S|Bi&s`@MU>pOyI~H?%YU)16 zf}5!FHxmzY;xpDioBp&IwfRQ`;1sNX2H>aGd|^WOO^|lqOAcx~iN);!)64cJxNQL2 z$R^=6A&!7@Y=@1DUP00VcvMgHIS@C7BS@VlK33tckXiEqRB6+m)T;u$#6S8fs!-o^NOk^tVDCrX4oqe#FUsSWUD{XFl`f8n@J*@|nfALrm=DPAiq zjPbusL7!UyBLXlY0H3g8J0O)LT>02@f<;#DNyRwn$Nw=UW=$9ztU zG?%rc{6RpT0`T^X0z|Gtk^A2UxyL{iKeZ2x^tXzc*w+h_NOm1G)w52@YJX`h1^^2o zJ5$Nj2lheV=btg(-i^Rsm#Y0ey}ciST>*AG9kh^iIf$vs-d7dAL%r`n6h)9ssW{Z@ zi!iiNT{o94*Re-OLP?m6xuDm16#$+~!a&DH0Y(Ji^ej1I|FGb1#vS))<$o_--$CXB zOfa?rMg-uLtS2xu+4g?c3yn4}qvQ&7xA=tiw=F_jQc{Bk?fu((H_pP69`i*2KL^C` zuawwUEq^Z%pVGHM{r3>E67s6kr&SLC3(^yP$pZ`EF$MN{2ONY1!&_k82e7HPr;>5WAGmnfV+NeYH7t-v+dkd3W|qF(Eox?td$GQxAP=7{CNW<9o}$r%l2nf zF0&J1M6xiQ0(c6DKcSVuCKAqUD9E1z;;)x|>Q2dfOUZ&k9TJ4!P%xY$1^R_m*jin0 z0XXb{{h&x>OuF}*NI`d^WVps!4uQ1&QCc%BpuxW*0Y%~otYUg!)^>=iOeU15o&=Tz zC=b7=?ev1mF~{1rm#%cj%UatRPGG?o;4D z4*BL*CjvZ0u!%fAWE!)Z8lg;O(6DsIuU`Q0Edc%#fWM`GcNKXicn07Hi5U1~dVV&s zS)p|KTxtcok}O@Y2_ot#3a}4gFD8rNEp^A+kdy=%|ESebyna72`T0 z&=+iyzy3`{1OAu*-_SP6yK#*KVC?;!&NZXG!3Y0s4fsYdu|!}SLmhyz`X3X3QhiD|Ir|1fYcy5@SLIW|{~XTCv%rua_^zr`kqo25Ht2 zc9?loU_b`c#~WdLOMsmSJfd8Lho1%>d~9q5jLWUdir^VJ*m_i3$Si+@{m;;WJ9F9U zxW)wFu3rJk^71v59Dpe@yUU>e=&Juay_f_zai~B;sDKw1@(eci3GLiC{1YUJ zWGiX^k|G5c2o-oTX94|JLu5be&$lEB)N2_j3NS;dM>3@xq@{U$IP)J?66{(3#x<}+ zK$L&bWYe9FOw%O*VW|*&3xtIt4vp#*=>2U>+=NL3Yy_?JBe2~lnOf5RYSWr$2o;zT zI>6Ia_LK8U&-)ZZAv7_15NQInl?2?33Bb4p>ni}h&sF~$bWmEW&qj(p=?`P|KPCXD zWi6070KuIIrna}F63!d%+{spePXc`3&no^omB-Nqex|Y8?~Ho>?*M$eKBrOc8ziYZ zOBx=hkKX~SCyB|f0o3N`SCj-CB0=f%?o;)osuJ*1TeB^QjCNEpfp%q zA#nn1vOzimev}hnrba>k$4$(>0EPw_z%q-ePrupZ1mKM1;%dk3wVRbhhh3mW6P_6J z{=L+x1Z&~G**^c%!0$hnjVQ-8u73R{l7b*}fi|ex=Ztjf55n>58xw%juq=?zks0%L zBCs%F|$aKsx3JPyPsb7EpLyvE#L z=$wA5U-49Pi&ioRX(Bl|w)(pe%jw5}ifbB55yWN8!QaLUO*ep5pUwHN(S#s0+2zn$ z1%?WU$_O`#226q`ElXe)6s`{mvbUD&4xs{Ov2OPn;ADW5jboZWfQ?ozp<+e=9@hJU zBxUEP#xr?bwe=`+8(>NSe@1)V1Vi1Bag7PUUB4`7{s4e~kJ2E+O4L^=*jf3=>-A#L z?rnJ_g{QBa?#J z{3oEysK>xRCIF{q31z(Ya|@-N?j@A0HlCrs9vRNtodnnk-8qz_mazDd!r!L9vkgN4 ze3wH!LIp|T=llVB$zLCODRm)R1zUHe(c2;B>X$W4j2YiU^)hS=2!G^?QlWJ=7WA+5 zZik3KP@jMhvLR3~q(Ci&u}nz-n&c}GCfXusG>Pdnd1=Z~K+`TTBgZ{WeD;MVH6PQj z^l5#4m)n^(0wRECfXVsNP;Ok~>epFhZV;bP-l%L`V*+q$g1-g)1!c!TR!cZd?1 z?B#(wN(!_;4=7pCeJtxt81b*@gjicb`2Z{B0tD}FxXKdHKXPxLw2 zMGz=u%*`3FM+{=V&dGr2V|%(o$dblgmxBMY%SnJG0{n6O>lhC~qP~vaHUee00G2v| zai}jG8~r?OB0`#y;Sy;iajqsvOQiQ>It63EAJ>Vl$yn*1+V%edKpic5AI~`+00000 LNkvXXu0mjf!6xZ- literal 0 HcmV?d00001 From f563da152e35ec08a23946df28c372b4ec4f74de Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 13 May 2018 22:20:33 -0700 Subject: [PATCH 196/493] Fix Teleposer swapping blocks even if the event is cancelled (#1303) --- src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 416c37f7..9a4e955e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -82,7 +82,7 @@ public class TileTeleposer extends TileInventory implements ITickable { for (int j = 0; j <= (focusLevel * 2 - 2); j++) { for (int k = -(focusLevel - 1); k <= (focusLevel - 1); k++) { TeleposeEvent event = new TeleposeEvent(getWorld(), pos.add(i, 1 + j, k), focusWorld, focusPos.add(i, 1 + j, k)); - if (Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos) && !MinecraftForge.EVENT_BUS.post(event)) { + if (!MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) { blocksTransported++; } } From edf4564a07ec54d0bb658f6a65a9111a799b8aae Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 15 May 2018 12:40:00 -0400 Subject: [PATCH 197/493] Fancied up the rendering of the Mob Sacrifice array, as well as added more behaviour --- .../AlchemyArrayEffectMobSacrifice.java | 161 ++++++++++++------ .../models/alchemyarrays/mobsacrifice.png | Bin 27246 -> 44577 bytes 2 files changed, 105 insertions(+), 56 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java index e0ad6ae9..6ed8fbcf 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java @@ -11,13 +11,16 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; @@ -30,6 +33,8 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { public static final AreaDescriptor itemDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); public static final AreaDescriptor mobDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); + public int craftTime = 0; + public static final int REQUIRED_CRAFT_TIME = 200; public AlchemyArrayEffectMobSacrifice(String key) { @@ -54,84 +59,128 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect } } - if (!world.isRemote) + //We need to do the check on both sides to correctly do particles. + + if (ticksActive >= 200) { - if (ticksActive >= 200) + BlockPos pos = tile.getPos(); + + List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDescriptor.getAABB(pos)); + + List inputList = new ArrayList(); + + for (EntityItem entityItem : itemList) { - BlockPos pos = tile.getPos(); - - List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDescriptor.getAABB(pos)); - - List inputList = new ArrayList(); - - for (EntityItem entityItem : itemList) + if (entityItem.isDead || entityItem.getItem().isEmpty()) { - if (entityItem.isDead || entityItem.getItem().isEmpty()) - { - continue; - } - - inputList.add(entityItem.getItem().copy()); + continue; } - if (inputList.isEmpty()) + inputList.add(entityItem.getItem().copy()); + } + + if (inputList.isEmpty()) + { + return false; + } + + if (inputList.size() == 1) //TODO: Test if it is a something that can be filled with Soul Breath + { + + } + + RecipeSacrificeCraft recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getSacrificeCraft(inputList); + if (recipe != null) + { + double healthRequired = recipe.getHealthRequired(); + double healthAvailable = 0; + + List livingEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, mobDescriptor.getAABB(pos)); + for (EntityLivingBase living : livingEntities) { + double health = getEffectiveHealth(living); + if (health > 0) + { + healthAvailable += health; + } + } + + if (healthAvailable < healthRequired) + { + craftTime = 0; return false; } - if (inputList.size() == 1) //TODO: Test if it is a something that can be filled with Soul Breath + craftTime++; + + if (craftTime >= REQUIRED_CRAFT_TIME) { + if (!world.isRemote) + { + for (EntityLivingBase living : livingEntities) + { + double health = getEffectiveHealth(living); + if (healthAvailable > 0) + { + healthAvailable -= health; + living.getEntityWorld().playSound(null, living.posX, living.posY, living.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (living.getEntityWorld().rand.nextFloat() - living.getEntityWorld().rand.nextFloat()) * 0.8F); + living.setHealth(-1); + living.onDeath(DamageSourceBloodMagic.INSTANCE); + } - } + if (healthAvailable <= 0) + { + break; + } + } - RecipeSacrificeCraft recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getSacrificeCraft(inputList); - if (recipe != null) + for (EntityItem itemEntity : itemList) + { + itemEntity.getItem().setCount(itemEntity.getItem().getCount() - 1); + if (itemEntity.getItem().isEmpty()) //TODO: Check container + { + itemEntity.setDead(); + } + } + + world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5, recipe.getOutput())); + craftTime = 0; + } + } else { - double healthRequired = recipe.getHealthRequired(); - double healthAvailable = 0; - - List livingEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, mobDescriptor.getAABB(pos)); - for (EntityLivingBase living : livingEntities) + if (world.isRemote) { - double health = getEffectiveHealth(living); - if (health > 0) + Vec3d spawnPosition = new Vec3d(pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5); + for (EntityItem itemEntity : itemList) { - healthAvailable += health; - } - } + ItemStack stack = itemEntity.getItem(); + double velocityFactor = 0.1; - if (healthAvailable < healthRequired) - { - return false; - } + Vec3d itemPosition = new Vec3d(itemEntity.posX, itemEntity.posY + 0.5, itemEntity.posZ); + Vec3d velVec1 = new Vec3d((world.rand.nextDouble() - 0.5) * velocityFactor, (world.rand.nextDouble() - 0.5) * velocityFactor, (world.rand.nextDouble() - 0.5) * velocityFactor); +// Vec3d velVec2 = new Vec3d((world.rand.nextDouble() - 0.5) * velocityFactor, (world.rand.nextDouble()) * velocityFactor, (world.rand.nextDouble() - 0.5) * velocityFactor); - for (EntityLivingBase living : livingEntities) - { - double health = getEffectiveHealth(living); - if (health > 0) - { - healthAvailable -= health; - living.getEntityWorld().playSound(null, living.posX, living.posY, living.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (living.getEntityWorld().rand.nextFloat() - living.getEntityWorld().rand.nextFloat()) * 0.8F); - living.setHealth(-1); - living.onDeath(DamageSourceBloodMagic.INSTANCE); +// vec3d1 = vec3d1.addVector(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ); +// if (this.world instanceof WorldServer) //Forge: Fix MC-2518 spawnParticle is nooped on server, need to use server specific variant +// ((WorldServer)this.world).spawnParticle(EnumParticleTypes.ITEM_CRACK, vec3d1.x, vec3d1.y, vec3d1.z, 0, vec3d.x, vec3d.y + 0.05D, vec3d.z, 0.0D, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); +// else //Fix the fact that spawning ItemCrack uses TWO arguments. + world.spawnParticle(EnumParticleTypes.ITEM_CRACK, itemPosition.x + (spawnPosition.x - itemPosition.x) * craftTime / REQUIRED_CRAFT_TIME, itemPosition.y + (spawnPosition.y - itemPosition.y) * craftTime / REQUIRED_CRAFT_TIME, itemPosition.z + (spawnPosition.z - itemPosition.z) * craftTime / REQUIRED_CRAFT_TIME, velVec1.x, velVec1.y, velVec1.z, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); +// world.spawnParticle(EnumParticleTypes.ITEM_CRACK, spawnPosition.x, spawnPosition.y, spawnPosition.z, velVec2.x, velVec2.y, velVec2.z, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); } - if (healthAvailable <= 0) + for (EntityLivingBase living : livingEntities) { - break; + double health = getEffectiveHealth(living); + if (health <= 0) + { + continue; + } + double d0 = (double) living.posX + (world.rand.nextDouble() - 0.5D) * 0.5D; + double d1 = (double) living.posY + 0.5D + (world.rand.nextDouble() - 0.5D) * 1D; + double d2 = (double) living.posZ + (world.rand.nextDouble() - 0.5D) * 0.5D; + world.spawnParticle(EnumParticleTypes.SPELL_MOB, d0, d1, d2, 1D, 0.0D, 0.0D); } } - - for (EntityItem itemEntity : itemList) - { - itemEntity.getItem().setCount(itemEntity.getItem().getCount() - 1); - if (itemEntity.getItem().isEmpty()) //TODO: Check container - { - itemEntity.setDead(); - } - } - - world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, recipe.getOutput())); } } } diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png index 409c9eebee29a9918d2919e4c014b0fb5d3d4f33..717018449429c81300d21bd5d5779f439e68a902 100644 GIT binary patch literal 44577 zcmb4r1yfv2u=d%--Q6WXaQEPnAi>=of-S*)2`)hr+$Csm2oNB!NPyrHTm!*^v$%fy z-dpzvd{ebGXHRYQ%(Oh+J=3$Xns1eHFexzs0Kj?kT0t8Cz=%gMfR2jjF8qGqAv#oR zRb>T4k7&2@9ifO01M=F)69BM?{`-J{>|AohOEj-H>WXNaC^!H*Y0A3aD&iH5ldhqc zyt}KbotqcpD*(v9x3luHv!(ZS@^YkCext5w%Wa1S0QA5c1zBCcr9(6CHvQS@f?(X2 zG~iYy)2t;-(l6^bjQ)2ls~Z$c zB_Nw{idCUmC9Qa!P)mBGk#v|69i5o!9b%?-_BZSbJ%+i-Mf>@G!)}QPY7`V$ZFiyw zk=~Y=`+`7I06Kc=UiwMj9oX_TD1gHoOBERpy2$##=QmbDN#%62Ne(9T5w6dl+sFUybMn*;u z0KcD^nEJ?tBQFDt#qN1B8c%J*)foTT8O^D2FQ><_5NRoAH0o6L&_m3pAi9F$MEIvz z*2rwhUvs+F`$Wr?0<~cKl!%piMU6dBXoTWVEoL{45KX--?Vv#ULNkSpj%W&_HzoRm z;61SAE1;u{FC+8*AF5?Os$v1)_*c7}6c(K=4hLPZVTLrSd!#3+I(4~nF`VnM`vq2^A zSx%;i;1M@8&ORT{zv8(bq;Wu|31~*<`vbIS5OV1DOqm5jMj)%Zr_2y4paZE54W_0{ zB&sBD>BA{E%#(B7%X{sZKx@T$u3PCyDw2+ZG#g65s?ZiUy-R)PC6u zMKqaoa%m_nkch$yf>|qH7JyceEj@wjm)+86meCay#=~G31FE3;UP)d&_7SxyGYD41 zwS*3P0Z2h8<|Y6)t86ER5C20*En(dz&Qmp)WUB`Eyk2f*|>%3DVg2&E@mKVWJ^itI!&J`ut5PRgZJ`LkFXHDPd#oqaSY^$ z_P+NAq8x{%hPVHLu(=BXNEWCD4cYNTMm{iu)C_7fMP8^^%BLd)LyA<))aNPB1vLSUzNdIPaiMQ( z5=aN2Bp^wUr7yvMx~}r;Mu&R+a+uc*Wl~_o55B0x1x>=9x^GwJ9VY=sXD|3LWVXKS z=50`3f+5^cce5x{w2hZOVy^a%TiNtc<&6JnEBY3m^mt05i3trf5QII}K?=a8P=6QD z{1H{Ax)ZB<-5LrUffB%{W%gZkNTL|9_q0pzP%TmCC5ndb)nsI3$V2tS-Uh=*zU?|-;Ese6 zbXe1dbls}R&VhEtlT(&FK4|U!z;dp7+aH~52{R}d_S88Ax!CR*(D zjkTCX;X;hSdnV!F5gpP>O^~OckYSuI)JloF3c&#=AIudM+y;C}7{%8btJ`p&wqhL_ z31-`JnG6V~%FLaH6hts4y)766a$;P1uoVQuVrp57%Q;7?k_vOeV}}@vc@SV&u(cc+ zGl0~#*jTN_@}Rd|f=Wq<;2^qB$LYd2Rt)M}Jh1|Vh3?k(yj?$vJe&#UgoY4oo?;$5 zFV_3{rY?>{%R^aZs9GuS=&~+zq?4TSoi#(yAbJahO58^xJ1Zan@@b--l!_7zqj_^; z6!t#sbrd*do^D&j{`ho z9AAwzN?ipG5l!Jf6bMM3sxby+$IvnrJA7T8MA~S0L7>i1%)>ci%+V|4sG>keltR^) zEw2!a@OWbOl=}(_7KAA#Qqa2C3TbE0Am;?avP*M?i_dmOaBIgvWyXL^AtMgM^vj&2 zb`!!B8Z}4tk;XNxE+NKZDFs2JassTc-w+y=Ox0a*z4!L;pfe_(mf$_-2wPMD9OSZh zeTs7WjYW1+FZZlQYxIWtXRx^~+l;Y;DXFIFdzB9t@82bZ(jBE={nY6akuj6#JXPgh z$K7$)5rf;*IR0mQgbq)+d~VH5Np~YadlY&6&+m(_9EW*G&3sxI;rF;u0VAqp=C=iZ z_*{lVTkU$bY!hWqQIbwzya&awd0DPmr13foC{G`6=)f;&pqXbO|7)P2hMIGs6?&30JKA)=~_j#Z!8#ur_yDkns7Dbpn$rxnV@aGPnk-7Mh zz>NO~0{Va6a9zdbR}<%rcEN=R5}ZXMwbn>7I84AdM_V7JPe77`15v;!5tP=W&PZv$ zqWgV(9**TB_^5{Rh2`{1sRJJeUlm|sME>>);NGT}Zy9jzd?`?d{-1Aq2=9cuS5?fp zq6!bYQ~Sx^e}xB11D*L_#5*WMz|B*rFe?CeL$JT*_L_F|#vVjYh}NgR3E&Cf;`ZCF zn}&kw18C=dD_i8Stx_K<^V;7NL)OBSr2cs$L2}Ly>oda@xTr40{sZ4ylV{DusIsWw zS2!?!g2WmQDxt+_i*iYHMbOR-36+XlHZoG;Iek*G2GGIQI!gys8>e1+J2q@gCev*F zsVuLtR`v9Pb)iA#WZ9O|1iVwY6sZt&M=b_#oPm`+zm6^%nU0vjIn#!l0u)ObedOW_ zTseSd(eNwS(j9NxV2f&HNo%}EIp)vM@-{ivrRjwLuo~AgKHRk!`OT310krXcwFwVv z)@MA-PA<_Zf+=N67l{7XjLC@n9}4?++;;p_3XK$)$(&Nsyc-~eM=#bIrG{ezj= za7pPo!B@hT9U~xej16jBnG4mlm!mk@xhe?Y53}ZbewCW@Cit63i2gF(mdU>k6}a;~ z_17b@>Vh@6et$Mr7o6*f7YIQi z25NVU=?nt9MVhU!3?$&|5@Nkn-8l?*2czuAS-2&w=27B804i9N5GG1WS=F=cQDgK; zaC`5o2-FiqeRy7j0reJ(o&Ax0I``HuFS1PimZET=k9-ap^6f1zJ|f#FG#m}J00d0q zPEMLm&SsI(aPQ99G9>t8#RgBK4z7j$rMpjR@rx%8a-Dl8Fv}YP=g}w%f0zSq+NSp| z1EJ>0tu7&POL1oNv>p+iDA46i`zNQF?CF!8>{suk^E$^UKOHTM{AIn*8gh{4BK~s_ zGKGprEHch~y>Bp{>F73EFdOqG_!joxPWar;<<%_eA@$mPl1$hd@E$$r$QWm(#(5Kw z?(rZDhPh!(uiM4lEhXadv8ae>T~)S5#z#v!X7LkYF@Srv@S`;^!CSsWBHbZ&bUeRr zAD!>MzutE^5gn&NNd6-0Ic&J&AP8V>q`V?o7GK^a58yC!D}7iafTacDFP;iRaXyLq zeID>nc)UCqkN=5#zfA%(q;06<~b{GsZ%Zid-exYYDt@Isx-$#ZD_ zc~YZsU>7n`LGyn01i9Sgnx#~;?PkpteYRcatoI*39i+^q!CB8~#99l%4F4YGo=zlY zy(&nS(O{HKwF@YEKX~Xe1mCXS3rDuR9V?DvarPQMa6b8Q@M_LqtKrZ7(T#l|dr-{) zC%Pvo20A*k*MWoTmVBDL6^K&1ZjRmVN|UoL<5G-P!g(>t1zU71g>?fWeKy+UwXBh| zSU-7%1~m)%eY^VQ4h0hb?)BiwwYg;!cLEpHr>??IRSPJ-7_}k&x2)-6UiN*?<0<5b zf%~>wcgfUM9g6WR?)B%R(^1j&F%#ux5E#7Jad{2!_7r_MInX|qZsEwEIQ#7w^zj)u zouCJqH;&(Ywif4Xdxf>3S8ypM7$jlpUvBaCcGZXH;ltMK$l7F17OJxVXm(ahr$aS$?s9Q`+}9{YtjE3+48BRUXbij zu7%PU>v-mM1AkZj64lp|WBNf&(({hcXtv#q?QrIS(}w5NK= zUA(7jNuSkb1$2D;*ZZfFzZb_CYOY0^rF*w)uARDi@I)%#i&^IcLszz6K;KOE@g+GE z7yqC=-1NL5)}s)&is?C&;Yne%)9mx>8K7Ok!wn&71^PFh5%n6P0j4GFc06bJvWG$;_si3_ zxT9f80g7U+lC;DGN>fdl{^Ma23aUXPXeJ+9H8am7RGJmdSlTEfoummtQiq&=%eNJt zV5+BYs+jAFB*=zPH0A4NQ^&(+;;=gPv=)86C@;dm=-hEi+WI;BXtoJnMB@1LtCQ^Q zrhVP!_4+a>=*tT3M)A%`&Lx$mc_aV?dVUK<-FtS7?wL~t*0#F4tF8o*Ed95|_UiHd z94mRFxwHAX3=6B(ktP($kQdUeX=h|=ww6IEGZKL=C!s#Cowr+O7yAaILOZre@ewf( zJ28C*a(`)l&m>X<4IP{2G=u5M%&gI6)H5J5B4gE-NC-1c5z1 zB~*VK^77I|*4#iI^`+yOG%_4rua?{&2h-AS2Y*QW;feS>%;Cbk+>ZI^Txq^8fSL_L zER-;$Y_YPP|MOb-@R|a>E}g{G7^u1|m&7MGY2Zzs|9`RF z{sgB}9lK&JHlbb8@{$oB=|S?(K9vZ-ro(}~>uNcG^Xn`a@_PN&^f(oNOMKogdm<2H zk7-moFfd-8KeWORdtsm_=g!fF1CamEtWN7ef_BmDA=93qLyAUs3FgC4IAobbcEkP1 z3=yziU1+x8P@%WK0|A^P@BHgW99(1k*Q(IduWvDInY~h9J+K*p55)K;sUEHklP)Fd zk635*toqTN;GbIn*!G&-{Ntv+EJu;=P*J}) zCDv0uXOQsQ06KC@w4z+wYZeR9e~*9P^EO|m6znRASs<&7JbZspjbc{?9)<=)w?Ky( z^Cn6d`-QQ^`ikkuVVt~dNI^$J_RvYgFLE*?F#{LazM&?j4rMZa6$HfnO$^@aoFmge zF4yE0+zF;!GTcALIHE8bXTCMMCY7hT`yDssCmumXhx@TaHo**>Y!C$3 z_twLBw*o4|k|j+SFb}>-Dllm$%=V1ixo00w&=aFDT!XjW?L0zkIMcl{*zBQ z@nv1ON#v(IeBdD%zmuI=|&T~4Wh1gJ%N1ERn()ZPU%*H16;vpq`1}PzMymVoB*u|EXm@e^vV<(( zRs1^#d_CpBF}gzpd{yuo68SWXqkxy*Gwb#SKSTU4 zHh8p-=LAE$POKC8Di6j(sY@RpKhQWgg zp*kS1lr)jemj5=2L~|+h2+NuyKVI$MBm*p2mpM0izSPRX{xB-Qf1_`sTB5=mW&9PH?U-cZUJ7{fp3v>2j8fC&UoQZi-peo>%l5iiU=~^{q(Xx6>aVNgd5}N$ zOkn4bj+Ilv!lL{w7$w+v&3S}2E}`J@`89{`$OVV)=tT#CsQAh(jjYru8^VT!~+lpCf|HF3;o&_RghlEOOwa2lc@`bw=!)&e~<)Aq~c32V9xR2hoPbte!(1 z2*AjMOhF&xzFG{0M4jD>0zt%uZq_|8u6Br1a^> za^C^R{=Z*C+|3<>M>F~K-(LLc9xshi45F%o|fAzalAT*;v$&Sae+uujUU+NnmH5%C5F6O!8RiVqSp_VOJ z>4AH-jfvVf^SgwT^y5I2&(22OexwB87*QHK`2>kF%qR!K46~#&3VIZk?EG^n`p)9~ zyJQ%+)+{8WlP@{HJcB&`%4U7+nk4(k>|JFWWUP+EXc zoLGWy=i|Yhyw9*4af6c*UWe+OPZ?0<%gf9AM<;Ew%HLc@jkZVBld7J=A3Vb;VqVS^ zhq+<7?|w@2j4_jQT~NFIfrAzW4%E9OMo5;xT0baNnapEm`-WwfW1zv@buY9|awD+k z0}6*edz$nUp+&29*24%-ck>Xa=Fk=PtcT%PtFpcSDH0x2u<}$h@)cD0nXuu)xqPGu zF}nu*hT?%P?aa_GB8O^suRZxm%^c@M;E>N$0`>`dmAdBIF==h8$~frqRW<&zBzNN8(^x#G%r5gSgw-@3T_fJ1F5lPi@kr=a<_MaR&UfGDEEo<`O))B?kl(EN1!M;}maxvqWcoh-REzHb zIkGssV-`ae_dEuux&v*G4$0W)i%=bR?Q8F9i`2NFISXc`>Yu18kq^kf{g6>smu98> zm!FSjs>hy&MS>a{TQ+LrlXZ7@hxESw=~=LP1S4DAl{s3`ClVlSSvUCb;6h@}sSY3x zueL?UL&FFKLfsAsB^D!#MlV%FoFf-yfc!L)-_F4MO9z=8SBScd$5PQZ+qL2{TgJ=|{4 zY5wnbUO52mHfzu=uTMVF&g9sq4E{zb0xB*6c#6W zI0v56RGaE}vS>|)5ORz{eILWw%bQ9{xmV2%AKp^!dU6^-GCV(Tpn=7R0l606h|Q3{ zsl0evx(OOcj?|xSpD9pv^rzu>f;yX65e;OJ@Qib4xJv2!_~JR~MVma6H1X%59&u^9 zv!$x1J1$#RfAi=obAsGSzqOs?wYPDs=&2F6o;iVRW8Y+Tzft~QEr4#wIWYK!M}ekIPY@`_-vHEB3Ad&phgyTu09aH3D>B=Zib^K==D0 zB(>VnF<_5s+I(Z6dcxy)<@*T2=ADMspW52n+i5zV3@UZG^&-$}R%N2*F3Ou#XN9=>$(p0un*t|Cp-88kMpS@r1xQjXbBk1?g+ZZ!+s=Nzz zD%i1#NN~v}5f}v@5ZrFjayu3Px$GAmNvSk-a1^oa2E<}JQ0DZs?Ry)|8t#3eFnN|P zl3Z`=IWsCyH8WdHN08>gd)9Li>W*%-;56@S3muq0MgEN4Hz6IZ7x;+?J>glTieiN2 zr!B~|g4|=yubK%gLy^_39fA&ZPxD>VQ6u=Vpoon*(~1Lb#o!l?1||pbT}MC7e*9=J zPSp%5&=c4h#ri!zPglKiobh{h)>RYw%^7)vXl!Y0OdeK7y|u>QHgfg$t_)|Rl766_ z5t%siHqc9UAAJL*bofX6sF{o7X2P2g2(isp%dT@=EgJ_l)#{2nMRIuXvjRcdVMbHvO}ItQn=H1ej})BCYb*NHK%h^{Q4O8^XgA?X`j>~)lVB# zU@@B~Y6V*q#NovI(tr0ryYuikq{~}T(b6z`cL`&8h<#8_q!0UzeLhbwwZlaIYL|9p z&{zN6(BSDWZ$4txCw|vhN|n!b{~F&&AyiUBnA3+r_QKnrc&HxO=zUoKtL71mb97kQ z_UQp^DWAblbaUTb%)%+(`&q{>jj24Ve|oeGB^UF?$^Ht9J#AR>>AEfspSJ~Yc2Ze> zNS7@7`2jxjz%qrEUYx&9=os2 zBAN1COZ{F6TY;=s_jMnQtB@g$WlN#9rA*~H!Pu=a9Pzw^Dy96!9$1oJv@6xD%AQ?H zwZEI*wkU(<;Ou^V7Q{A$WZp_0ED1fEi;KV};%?a%1x1{J#!~o0N+=UA5%Fgl7 z3A0W=kM7($CzCxLWsMZ{(3Guvd7N62q=TS~NjHh@^DENbaKrf3ZwR=~8E8Y+Zh!P- zsXsZCk&s%hMS)Zju3h8s#9GRAd3y^n*En%<&{C}CI=6Arrd;3thm*>s+F3oLkDr}p z%DA?OftZ+`iGuFVPuP3#ECGj>@!R%9{^|oUx!aUK-w6udxYe8HW-#L&;iA;TBQ!cFKCLy@|)(dFyCvK$8a6;^<9+dpJI_}Xj+ z!O4`YyIjS1(wcXno|r)O%LUUZV#!qaw;G`pwOyn=1_^pX$?JKiiDIcfq{Io0{)za{ zlo>J!qwCvO-Q}C>-62Cy`d$L)3E>c+vnp%txbZw?a{Mu>&$6j=Vj>0GQDd;R8v}T_ z7xPy^)wK&2;jcakZbV}2Iisa~=pr0c9CrvD`PxDU1c1r=X{D*o-C5ty4S9kt)KnxG zk|&P}C|YQ~Y?{hT2t6n@`%~LsvH_;$PX8p0ZYP}u<@~2Tdi(qfEP{g{W#hb`akzWK zz5=`<4>#Ee)C7lqMYLt!-Ghhv9xh14VZ`LkD~s@T=NWMkGwzUhuQSu>-*3_TCmx&^ z6#GM3-T&UKk;2>#-mJ!*RC^kq@5TBghg;ZxW>L?c2si9<{2 zG}N}%+FCcXr!I-m)>WV!fu<4&PuM6GN{5Jj^0gzPEf5Al#=3g-lNq6gm~ zsED)3vv~SLAu8>@@vrW#T4cz{;f0(GZf18p0Ezq5UyAlThX<23t?*uD6kMM4QwFonW!*TsdaX7FfrhVrFbljS*&M zG+{cGB%pb%@Pl)N($Z*-M>eKqDH9B1Rrou1tO6MSIwRVHI4LT$mly6Ucr{p7LLeZ5 z$Ld=j2B`3dVwu3o7X+7(dj*98C6B~FF&iN}38EBN&LdV9pZG}7|xW~1sN23n?R4I)%>GOU%Lf6IcCJnH^G|+ z?pV(*6|-eg4_YXT)W08_uNh~VVm;021E|MnK1#4 zxPScornN4oMj;00ePjVg&cMUG<@Jo`_VQ-dPwj^k|IGS+(w)6w8h0t2xZ9Qn z@2@@Oh~nP1f~c!>vXJ(`8%D}Y^9)*;%nZAM4Q26PBPoNn&OI8?c`onjY)&8i)Oi0= z6&NU|MX>&ZrwM!q!xE+L{?&M$0a#H$eSstBJ?tUveYwZ*5Quj98$ex$j*A6yDG-M5 zN?px)!9Qq5@JPB@Yl4!9u+yS&kNGBhNIx)Gv;}E}5B}Jcx_@`;akSvGEaPu-)kJSfpgXzX_=LDgwOpD{p3QQYfI#+epHs=u)- zljoWov3Qj@vQH_At8#Eo)`(}a+)gfo1*nslGzNa!Q3gw)L&>V;ksk%Ou|sQSSYF#n zwqKOxMes}hId$x-IdSRH+~2cm4x>#Z#P;vCa*)3}EaSVR_)S|#0?oU{aHNp`zT37a zlD7UEYPB3gN*_L2Fw!~UE}Q{4=KH!vlytwz<`yCNR}t6Y6EzBvRo>uUD!Iw#7 zujG-!2ErAY-JTp;`i`}s6b(IRDCd=;f#CxBR$PC0+{8e@%9p<>P6!jZa(n(rGu73F zTrW$IDSho|(;CWsogQy@J*I_r``V@llv~NL6p9r|em18;bVLA{qtW-g8djwu zoq@jn$VDMCcGIC3-XYM~OO$#p1gtfO8-x9lfAsCN3F_?*2;5-w)OP2igI@B5h69D| zU(|G-UZKEz{Oz7rPOd0*JGpeN`CJ_oJj&xM>&@gI?@7RS z9B#qoY~4JAv~sNV1RJ$c!nAq`iaAkJD(DKGL%@}GTn*kvz~D|-L7zNJSwI{<-YcQi ziL?zN<6Kt<&Fk15g~BCuQa}kas#)Zp7-eov>bH?1?Oo~@;+7LYa4ld-+RCTW3@m;+ z)z^=s9qX?7IS{7#Aa*@6b5wBOV#=tyIH^;y?SAtPyn%(&WshX|ww@W*JdFXPqcpx{ z=Z?S1-Ey(R>DpnwttN#kSGWaFpdEU;1JXzf{Hl_2$WT-kClilEgAjM*4Tb3byJ~>} zPyMWJe$>2S*TACm?mz$NqD)p_eqaEh{m6Y+nDH4!KD2Kh*U0}9HjH&nN3id{OpG)v zhTzu#O$!cm`=+J%Jj&+lgzrcBSz@BMPc;<7S#o^&?p_unAK%K9@ZC)p^8I5pyu<1m zpWgVF&UuQ7CkMMUJv0Dl6w%od0Z6KLX_9QfW7tUN=L{5~w$&9@VmO)Ps&(5~Y>NWy zq=poDdO?1NReL<~$>co%Dij(7Ku`%qfDM4}wm+u5i>4g@h73^=Qa$D5Dq~20WG>2< z_7Kcm^;_9c>`9g(x$__25Nd3<+|!WU*RFBTCF|%=RzNwp6bAydQhj4lrNPZJ2kPaU8sT)}KQ?10NU9-hLafEAf(4fSli*9`sQ$>E}_R17E=vZ&~DCO);HdZ5Wota>kU}{rvP&)twLvm43pdy+=)Hl6^ zasbT&=zxO4fpX7-0CGVLuz|@+q=h%uI+bqs$TDia^Y?5c|Bb@#J1JkLVj@N0)LYo@ z{C#Eh^`pY?rN(Mixn>Kj4Sqo4vy3Df3e;|)w_}`OVb@S7T4WitPy}`7nl3`wu>5#; z^oww2{M>)^B%drTh@t>j)Mscgn_&W}-a7VrS%b9Onx(xu4s41U%s&WE!L{SH^Z;{v9RY?w%x20 zXu$wSj0Y?O#`>w9A&@iA0YrgBZ2WcQs-+jboK-6dbNAW15r?Y9Fs;TCecWG3>FMxHXgxvPD=N<@@LOJh}KV4os@Lw zHmC2rTcrE@k4l|gkMxIDjVcf0~o4DKx0TzU~>=0Wt5vM4gm)!lhiVwKVSflf;kYSH+%Lk04zaKKROv# zee%?Lxb+65%*U-mEh`47o=PKaw-aQtwI3`)SGov#SeAdd?qdWL+UQ+wzA-_Qs2fh7 zY5GM(lCXNEhQ<57)V?UpL&FKOM6!BdMDG`jy2Pes#Y?rsNf$wv`4~6sDcS7Y0gN~B z(B-C%&VjK>8R$2ETE+(90RC*SJaA#Y73sr?KD`mlN~+&?!9e1> ze1sN_;9wJI4f; z6?%y0`>_3iFHvSdVKi?D0rI9P9k9B<@hgpB;PD}qzw0^Wy6`o@iyV`WSsif3_oXE( z_=;G(x)D%vR=h$!s()&Fhe+b2DYx(&jaiog2~0JSXsYpBc*I#eeX^$GUpUSxwZ5g~ zdSw>;rQL=!fO-xu8NTV>!eRvu_qBKVo~|;{0pbq6sGmxfz^R;;`?KVet6W67{ zXQ2Dtj^v9tHrw7CMf}r+3H~TZTQ{)~BP;Y;&~vSQPZAx5lZakz;bETs7E$SD&V3p6 z(ikdRN(Qzj1zPm8SHDz@7VOp+%aWLz&<7ZSU>-sB|18&;Go$MlHqpTZ7YzkPw+u^jMyfy%E*_PoNPCq3+JvX1Vs{|1u$q$^!G!Rg1)(v-+zM_h+$@vgJ8xBUoz&m^r6b*C{}?!=~t8md_TWHL~r}P3NdDtm%Lmh;2Jf9;5t-24o$v*7QH#zh zNI<9cU2=s{Maxpq@OD^`->cu4El&D}aTPDtEvIs)~%RXNCGx6DG{pbto6 zz{r=^kYJvuAS*-sY@!_={8oGz8DU=4!%yn1znEjW++0lnOzTNlHq8rOItNyG^-}3B z@5WhtrAf8Y*eP@UDSPbJRPAvVqSTdxGdE$r!3x;qg*-UEzN`+jP-mc-y8+jq$c0Mlxx5Fp5BNHu{vsYu=}la2yP#CeV`Tbc*5ckuDrUrB#KV4uyLqy*CER}&eT zN(ked&R3(z1ewqeS{Gpzav&H+)zk501sLn?p9soJuwuZ;hGOv{jYUh9VmaNvW-9zC z=9V?D-VchE_a*`3sP(z%fVC0DwPg3C%QOzSnPj%(sr;d~`xD;BaZYs;i+#7Zy$>jj zEXegN2Uy`O&flrWg5}2~rFce+sfMp~$)B@=e%%gjg9XDTelOA6Brk`)MM*~9y)Cr= zOncPObyq7bfjm>tQ&GdYLpGOcXGQ^t-0qES3v@Ig*Z0 zQceu8US{}m(*mVf*2!45Sgu)_kZ|g%(aV;^t>xhdHQv6d6;ol-Bc0c4FTzL&3l7G! z)$gKI7q@TBo-bq8E={7TJ5V-+*{{ z`@XQ6&98ogVfjIIh6t!OV|yauuik+G&q(zpyrC2DBUeB7<^@gOIN!$!!^l~I-i8yW zJ@;zf(6C%A&^-BGU{b=w6#v5Z1^eEz=J_%cb&gR0`KBDc#iZij(jGoQCJpD8KD_$ zG5C^iCG6daWhkd5TD2TYl`m2v_iLM#tg8xBh{gNy?XkMCWUmhLyDvHmQVbr3~QVuqN8bFsZCH4{S zh`!RudGLLC^qkQG|(j=UD(62I%Wl)v>iccN1hC)k$+8RE%Q2qifK= zx-W{y?bOk9RGO_Z;s;6m%fWAJv=PujK}B{z$reA9?iPYF7j?s(Lb~CFLdO++Wpftk zR=RR7STLlW^{ji3gDi7Um~t2w;MXKEMV|PAmY9_NY1v-8czs9>eXAuA8} zkpw^xq7&^}enWbdWK;BB&hNUYV|}5K32l z0x-9bV6aRSM1mgt-3d{}0C(fr&_Q>MXBX2D^e*EV!^7@1@C;){gBRcy7N}`L4mxk?UhaO3#q8{f~(ITc*d~ir1b%h{}22;3W9buQQaD zjaQ@*o#-i9wrz~)saSPVjG%T|9A$~w#h!~{*aPi+!U?aB^GYhkZ72Tjd{WREg())^ zuR`+I?mQa+UL#{D^EQIjZyxsXbl*gPHqdiq;+O$m+C$$*6|J?) zSL2TaeL-{A6^ljoqPG2vt>aS_S!zMf#LXGtpVSUl6EWw|pU*X&&+ zGMO0!@N`dXc62FIX9g9XTy99E&F|6>AQy{ih|6m<86EMV7B0@g#O(nLt^cvK#!o9c(4{V8 z+Vn&c!B1?P%eguR;l2|!<{U<}tUf`%3Y62Lp3t`BQHu!Z9ybvsdG01T+PycOAaRyM z8-a+5Q;73HLOfD#Xm^C@^V87u?XC{iDKXhCdFX_XI2z2=FdO`6T)GA*vN>klHZkL( zj<)UuIOw)jV*xI^5O!#t9R4F?$ox8<3>-|or%bscK48hF$2RctgN$v0g%FE#daq~> zgA6`*AN2&EE>+sJF?AKi1QBTIT`%P%+aU_KPkVv`A|=!H@T{{cIwQ?co!|sU#Q!b% zSl!z`HB!wN0%|)uxD)3+lzkmfjVR*3)w3qcQX_BU@$tprt$(U2mait)^sGK$P~=~) zSfUaRjr`#sY{)({C2w49Ay~%p8vaMCB;O)^PuS72b^Vn%d{4mipLyjH%3l=#a=W(d zZi!rb%_idSG3WN2==-S1fPRaX{w|Q@!m?XD0S=)c&*y!foD|x;QfpB&OOZ59>&@=` zLNQ`aaMi#laK^*bNM^_qZVa9GuFVS)qdeTf#ITg#t}HYv;~~%!9_3B{kdHZeObSRv zGEhUN)#TSMga5pn(g&bWM+9>EVCE^|QI&wMw9@n17IB z=<(h!rs%Wor*>vW9ea0@S^z@qB-Ly-;VsK=SQt$PppgJBBtvITD%PN-#D6uzh(k)< z#=c;x?+C6YGuwje?@!@-Z;r{a) zu~S)KdUL%L3SffuR5c-GeA=W$LtPmu;Ncd~_UK;unm0YkC#Q&k<;nDOjt22-8F}0t zZ_r9b=Xd1b`DZdpLK-7oYXDNr8%hAyZd0@%*=nnk6W)kGp4-z`Uw5{duWsu zF0-t?k&}@-*;ThD_a*9E4w~l0;wztvlv3^)N|@5orCdG<_p|nYHE8H~n;3scH*c;I zEZ-4SFjRnhzF3<_c^1n?fFF+c&VdlJd1LQ?pX4AN3v6I04e%bP43Vx7Z&A)#I@yb} zR;OAmsYsH>PdGrohMPtS1e@!Ae{41QvU4o8{OB&^oq^Y{ocHaWkQLn6v~IwdAO;^F z$CG&HgsLmS>d?Yo4X8lleQ-6D z>TTdja_Jr6tC_{kep(xTd9)a`(VBc^RvSbgD-iBVYYx=w+vkHM(SdpKS-s9Ix54RZ zqm#{(eFEQ2_wKvkXXPFNExVwSBkHRbIylSlm#iJmxb4U$|Ge4VIVrH-kfzUZ^V% zemMY1nZ9rl?L~D!{GmWSwZIl8)aG^;6{t~pk>Cbo&(|J4Etpe`N2pY%419SHpy>HYWAW@ zOLn5RYZR$VLr!(5cTikvVCTY(JhL6xkbUgV_>=yFJ7d3?y7Q!n!EZE9Wl@Tch8=D+ zOoNfZj1BH`DiR1PQ~D^^N33V|)7c7~9>v}D63b@fUPop);cNwcAk+;P87fvm$U9cf z;vQR8V22fwI17-E@Ag!;MF2n@ezhO3c>om0#M8 zqeAeX16BH?<2nxpm9cyWE)$Pi&7tQl^Sy*E)89Um{Xd$%IxfoZ3HR*M&C=c79ZIKw zbeGhZk_Hu!S`m;&r4b|)1Oe%kSX$|lZX~2(>Ad^<+zuDBe0J6{-Pa3y9{Bv&E=X@i+?@bjC(69#ut*o@ZYfI zENKX0XQ$)Mu8keLF{Z*=R05(oaR#wQ;vBGYt1%*kVI$aes#3!zk!^3H~3C zsX*d$X@L)}Z>dSE_8fP6gQ3K-j$$um-{xQ`Ksu`?c!o6~EhNc6svErvNruuyhr<+-%`wRCj9)aZsJ3Qyn7 zi^Lj<&u&42sOU03qT4TnAp(;c(KY*U{jt2YI-%d%wkpb}zlh$NnR5ys$}HZC2Zb1f z57s%tj~kwP2PfzKX0Sq=+3woaGc_^bC zksPQ!JO=KA^@LN-yel}bmwl-iW)Dj{*X!t^`i zp}}Fm{rL+gbkHXm$3ABR^MT{SfQa(n#k`S{BaQJvc{uRKG7Xwho>gz$+c&qH41@uh z6t|DW$*pn-x*xhO?%KDX195|00tokEw!>ZG``T%Sg1(RyDuI(XXb<%XgP*)(!sDVQ zd+O8vXhuq!z`$!Rlahh%*$Qk>0=v3%UA|WqddP42P0^v8M+IadeAxDm^cM?wOn?mo z@0P0XnB7Uy;B6d^?gfTfgML;$!v{k_3kD2Z?H<`ya(UL^-gf>74k3ECX%DnrIei=; z4qHPc8l0A+x{O1ZeqbV)gjWV+-c)F*{CqAapM4s@H*oT@l61_h=z^DjAZsuG&Z{v| zRmJqijxDs8;Z?Zx;Q!MB&SiwN^ezK9r9?iB?$g436ixepO!4> zdx-*CN%Z+)<*F*qBxB!i_pMOP(i7R-cqwOQynZBv@QFLk1n`gIvv6$k2gyaMY97KC2m=F7|du=BTXE76ZBhIaUDVF-$@KCo(G0lyP+By(84P0v9 zCCn!96J~5V5F+hqy2!rugb@cfHA&N)Z@vH?GPM$*Lz3I}Iv%ciu2Q8DgW;?kzKJi(Smo79^&z z$|?ZKYv=cHv!XIlQ|4f!O#@Oy2%7%YIZbr#*<9P4<%U913PSu=a)avI6hfFh~F< z%+Vq~RsFRPSV#^F9XJl+ry)5h?&Uc|qe3k2zpq~Y$}x+bF?HwDj_w0g_d=+C!Xft5l(ca4>py4uw`sdoJRZx1CH}G5 zaO##Ab*A8MW{}+{zg%!TMT+1hEb>X9VFf6(U>^r%?drciQ4!Yra5O);ncBTrT8+4eq}~Gsjd#3`&3%Yy&ev4)-Bj264B|`pK?e+7QuRW$cb|)fr+jgp3;_`8rgj(9 z|KC;g<@TSMgpm|3ft``ZB?M6v^_nsUyys^5fpPSKdCts#V(#nE5uh714n4JRI$US+ zBwTqc5UOXjE{H-0H|}9*qCZMlgwzNgqVc?FAPRr2y7ZlhmuWu2bc$q^54zMyw+A+14H&+HHi2oena?1_O9K`N;ebbH0clrrMq!(X;|8vwlV zDhAApKgwevUg5Ui{`qUZ=A5ev!!FJpPu!Qh#)T2o^9_)(yfS`{{mx8XB{%5blkieD z=oX1S)=)z-%8RA{sZ&(O9a=AD{=0LW=BO$l2_qPR=Jo5VO$q-TE@aJiN@O z{7W>%6TPswb9ctx3)D|3e|i-#rJ;C@s*mQ}*t@!Da<B0^0D>tg(n$GsD_lwo&-G4Bl6#+O!ILK%Z#48$B|Rk ze%E7}>UU+*Wu|`8@={4DNE((511XO@AXclRh+)(F5R3PI%&ETv+%IS(o|}nQ{l?y& zDnMyUh`sA@KU3Rxv^F3HiGNvaOht=g%z#TlKy|#P1^6}hhLZL3bW*fN#oqXNKdi1b zbUdK60Ass*>elm!oCfOHM04FALv>i#q`4>uKKmNA3yFu)e*t=Ed5#6+@o>Uvj`m%{ z+aFrllF!n;_Gfq~z^kWO`Ouk|(h={8@Sa+KO?KeD_@IjT+TiW#ABR16XG0T!%*&De zBeZ!V-Y(C|Y5y7uACK~|l;kuH&7mNr*vzH+tSuQ?0TDaB>+70KnZ>R9254vdvIB2=@M1yc=$L+&y1+}?9$s$c-% z0Tu{WAY%U|JSHKSExg9m?}-KPar2k#rDp1hss%I_UrWFLZ6B&hlTrXia|wQ@f$iKh z2{ycU)`J#sA7<(^SpknF(&`}}S6pp|TA#<4*&}VfJWfiWxMN(!T{(GYx&l;w!0O77 z1h-g-D;MmsW?`BWbTJAD(@U1K|M=-t>Qdi>Be92IGnJr9V=?Dj$Y5DvSnI2&zW|QXe#_mmZSIfQ(C73#u5KMvm#JL2JW+0S{%c zrr!l(>B+*RG;j&fwz0zq7v1LI0q8Hz{vjj>_D6|-UW!Oa1(G6+ZpA$|Qdz)PwY;Cy zgyFlLKQywvmH`dgrA(K=aWX`Vzw0JUFN$K#WRm&sT&>aEbL#4HLc5VaTt_>{<_E8d zkXKK2dQUMxo7rPQXS`XnpB&FW=R9@Lns9fwJM~P2l z0wGLFe{bDmvp2+}-znJM<~mBDC&q*`^!I{f3V3z!3Of_1CG2R#;@-!{9n;xubY=bZ ztn|dn+dWk}hyR-cTTs5M!hRqD{HKvN9}P;uWNj3C5aP`x_Ip@_9~`mmUle~p0S^t3 z7qAoDgolk)QLg~K-_`CgG=s{r@xK;w#;t|`pHu`d^5KE% z=%-`K_rgXh6MfH4M{>Y24z0!g)k0)4CnaS|TV5T(n%mp-iE8t#7$wlQ9maI}FQYV4 zq}{UbmfrD3I->En&QCZB)4NOMFg@W0aIcET*i9IncXNcSPsu+=XHoS3!XMx|jc8ho zB7+VSAX)^Cc5JBf?wicJlSbw@le3yoB#ZQ9k1^j`gAp9)mEydaktU+Ie?CQpc!ZHjY_S&%yYt6f# z!Bgc#4sm3hp24`FluOYmTL>nXO!Ip-cD-dZKmUH->Y?`e;Ih6Ke4hQ$E);QauDvv( z`2CF~L<~l98gX&g)#4h3T8I-SjqY(dH-~{_$)~s$aJ*m+92qT4_P!G2cEKYYX&RrUj}AhO9jN$ly=7L- z``4#%{la0o)_DHdtF7pzkCV{L1iYg{gNp&S+xujM2KZ7l6)TxWS`>Ng%k?{RjsctjJgxBNae2a~ zqr0ac3_FQ-pxTLe3{CF)i|N~+G%|<~c8Lb5j_R^m6)_8BlPD~Q#i+!31jYN|fO-7K zRbNc}Nd%JsPT!9dW*pxm2J$AbN++}#wO>fD#yyDb8%*azwBm$Mgd_&896TPJ;%zdR zU7B-dWC~unl7Vp#NVL|P#5f>kKHvZmlxP5^EEDIpjrU6`n(8DPR}6&da`UPuXj=qP5~H>N4JKGKYCQMp+8=zZ0hR^tVC~}Rk?CvXn@!+ zNd85k;)avZ_@j4?G_xYidxKHC(XXB|EYG!6 z_+yGO9;S7!{I%{q9~NVyi%7=mQ2WnNuq+$1Ey42K3DNZ*3yrJ!6eT;`LRZW-$Iup% zf8fyok#L|nsk}!f{@>2pL&sZ1=3$?IN3fTdIM$n-A{02*d&M|V z-K$#nLw}WfCj@sTnB|c&^2&Rl`rf!xw3ZVltEj?(hU`&!5#eaw&=>NGLly7C()C)3 zJ)~?`aVJ+_LfnL$GM8J=pnyXgFY8;*r15{|deh|p&KaEqnBDoZUR%xeqTb#m>(7;1 zldg2}I1vrqt$~EcbE6h^$fvKHRi~dQ@zhWW_0#XwdU1fxjAcz6<7!5duO>bYVyKb7 zefh);yOFz-6aML>^Y+V3DLBU?tV=+jqExoJa~&9?FA-x$?s9Bm%w zdVBGLQVq)!7M0G*>c@hgM^w>>*awJ83#VZ|COZ4<8lG>v;y! z+WcoGs((SiijDj)CIaV~`{VD~FwX8^ou0ODN{ysT9*BW7jIRST_JfxJP_rpm%0C)O zNQ$^sJ9m1stbP7l8Fk?k(()1ol?CjuA=2_r8NlnL4TzcZf~BGju!R`=5ySsc7gjam$ z+Y1IiDI?w|i4G#;Yp0c|@&;wUO9#c1SF@obZPr>sR2}h>|31SF4E^ki7^%X@?^?{n z%2?qAA;}g*=e-$uMoqc0s5?a(HE07X2@(WUb;&Fehm+YYASy3FBeT2sH%Z@>k z9-Eb{gA-R#0f(NDamRGTgAE1|L2-UW!SZuGAyS1tx{1#iD@GD6qKey3Yaj&XmZ&DY z5(z>r_>3|vKF}2H(T@@CA@Oqi^*oVT4%c!l_@;a1K?K$Z1*oJT6rsLnvpmar5(YU+ z&wc88D(x!-7 z>|(Eo6Va>+o0}1x6JDy8+&_j(#Eibdg4kk)SS~; zGqFD!*kIyv!kf|Km0s3fN^g-y9I-vi4!!pM_dq8LRfn|B+w~sZ1(P$!B}s7aDCKs7|#yvDBNJ5;#R!;MhjScC z#Zwv+9Bx;tjq8_VC0$wn8R)d-3X3y15SOfIWNTD!~GEVJn}^vS@yDLaRc878pL&>iWbmkCKsys`|=KX7vct=gEo~A zH^d+m7uMvfGa5=8nK4h|OnXar1YomO1%gHVtOSB z7`gr&RxcN#luuTh&0Bm}ifZ4(5-UYysJZMfazoK zwl9@K4pbKSa(TWtj_T@t;~+!)2iXi)6OJ!wVh-&XY>X#EvVlv-1v|t#6<)3$dqEw3 z$}beOHi-^@1w#LnO(*>co@Av{=LNa}Gd~+j}}=G3dGI4=yjHe%m31biQW9E|t^=<2h9Oq6bI` zO_XrY9K#u`;e=}#*B`I|tTa2>abocK1(|u-F?J=e+OC$e+zuN;*mN=72+ z!^mGQYT=(|&wdNz9AJ8r%DZJlRsz7g0%qZfG@u5k`k{K9Iq>WVa8%g^eUZeopWxe_ zvLq)cIb2()4KApz7Yn%FX_}zqTq5A6;%=r`wzh~a|A43|J1Lp}xco|-HUB%qlqr%S zhcM-|_P?@uL`7+sn>p66#s%;Ru2=$Jp)@~Ragp-B96rq>{S+|}J1E>fz^bH05@Oc3 zf_dih;g1>j;>^0s#NXztf{}U&$Dk|}^IoJ9GbA%64A=JSNb?AdRlkX@mMwD5)cnsw zq8y`Wqi14tW$xgtqbe5=^F2z#0M9UwYyfiGc zp~WbHiMPG^4cK57bzv=95}b;RE8n#VK(~{r&E9^abI1a=;zVclqATmmt`+I&p(=n0 zT3KyBy%FL6r4iq8R+RU9plNTxCy0SB8H;fR6{+F53a_DxtTMx9Uv!R>-wHgMM5P`oAX*nh zYhX+LQQ+k?fib*jVw8K*)e}=^c(}uo-0|L;0HJ{?ll?LE?EBO^6q#%IyQ^YdeqhWn z4ZEPjo4!{UpYd#6cx1!`)CP3{rBX6J*8qN>V|Gi zv6<0y_rl=jg|`DbwC|R;BUn%ix%9+O z*Hk#bT%PDV9}L9r%X?LZGCCFe!`}!DKPBFBrtYn3&tH0uX&IGXT}1HR9^LvmrNR)^ zlz0H2>|TDT;rZJN%m%2-N3=HL=dyIVj=Dh!7avoAQ0Ko3oV+H*v#SD8xVAnza9rpM zd~dbKH-%vHD>uY(UHhTaD966}bEeHek)Ui;9~3{Hh6$ zPOkH9YJ2)`5#e`;Pn6-GciCKkI!%Al2Q-dAeua34A5QqwgL)SlUD~fvpAOtctz`5! zh()R8U+Ey#=n&RgOAkX1(tX~E39&n!Mwk!@ryr_kq(GD{S+ho?+{u18*et7Z}J`&AvKK3EA1)bO+` zHTl`EXqc$n9!v1cGwO8}CKfL2)Y)IT)lG$pZ>Vi=ucLoC@zrz=F4U(Chc=A}QYi~} zxH7j*H4_{$Mg@Ll|2XC5YZn)v@qYpcKjg=ylhYQhx&n-&KkAQP<-dH(h%ZoM{1%N_ z3cXs?w!EVu>$RwMl#cI>;MC{8!uK_}IjSG!WRsu(8UE+vfg}&aw*0wbh?s|`mn9?} z^^8|9!{wG9Bst{0rQJWu=aG&>>1h8-*z_pL3(WB4O|4MnzZu5?+B5521Qd?i6PcC3 zJ1hmWN&^oprs(nq*GhM{5u}&_AyuRKlBeIxQT2NJDX19qs49wM6Jj>TOFCLk3bz&) zM&B`7FU`9@x$PD=HQX=+366IIRgCoO3(`Z_Y19Y4w$*Z#8n4RB3 z_rwrtM#;t7KaDjwNBagW;MxRO8`h!J?KE`J%Nyxb{ro5faC!*Ola*{9AHn*RI>B!! zPfd`5Ub+HB=-?8jUCf-@y_#G!!T|T4rLQo1Vi4ifP#qx^BTIhW2!0E=+2&D-&4cR? zXI#P;ZFoqVf~)<7=ZazY%e%>mdMN7d0yZdOGZUmty$Y&?WQ_DAUW~pXVrN;|K-DWH zu)KpO6=`wza2x&JM?d%7{%@Cq3TcSoxs}+tIQI~lD{aL76yz5i%g%t2(2j9;T+C*M zpQp=^8TQ%pAyA676uacHK76=gG_*Psf}4&fC;SKaB!uifK;2#R_>BVh8)mon*{^VP;hDjL%(v zMhURE!yCA7FUB-$EZI9tQPrFmavc5{>qyO&0*vUwqFC4SJSb7`Z@`?u9oh_GDT#G~dxsKT>IxX@)e z3EehCx%DO-{Z7N}aI^J}1P>%sihZ!!M9X8Z@`tnx_AvTgO;Kt2`2?57WfFf~w&Jw> zMQx?2(rin~X^~dPCP-SvH^6g4_2>MHOmNPpY5Swu!C;p01XnFdaaOpFN^PpAnTpYI z93y99L9Zc=8-I|<$0}4#z@0V1AG6&_a)R~g*lV-E^>Jo&6p6kpY~R6rYHv_W%rV`U z9!cd?nHbuJZQw~=2lPejxsF_qkdoKdrZHN_4N?%-Tt-BVZLbOgI)0V)LhZ`4O5mTT_#*R6+>oI=U;w0dhu zEWEV#pBg$`-f(s2qit&>{#Qj^Uk?!6ZTw@S9YrW)d^m@}iy}#Y)cq9zb>^gUEZOUF zuIB2L#-b_4PO!Bp21;awD0=p5gOZz+j&JP(T1pBGQ-6P z^~sz3=t4q?ZTuC<*Osb`UOIafGwIQosA(oFG~Ew2Z{n;_@9*>MdU(Q;62AFA_5G$u z?;MT)wb*B6IzyQ7t=VLUrTQpNwVR{ue%vYOS+Q58nHO!ee2x)7x@xH;$Nb_~oHSzD zLH$e%>PxwQL0qubfv`lDg5Buiv}m1rzTH@ zFnn9Jvi&h{J%r`@O<*rUuwqzD^p9AA2mL1!fCe_!s!}Tp%UqZZ3b!=#WU*W_|gUdgO-xt12Zl%~=kXW1lLA!t|>@u*!Ks|c_=j8}$jhiL;!V=wm zjeVi+M7GTaf5ky5$Cy7Rj-9o#%-OrxSKeD(?5_3>V%@v`97i~7B40%>=jZjd0OKqg zN<+6MuIMl%d_30Fiab)H-oJiwR4k84qEeSwJ9oKtQ*D5L)<434AGS z5+sW`f=q${b>;3jaLUsR-oH~8zczpMn;PS<0?dfaXb=|@|62x{lddpb6jDd{ z+vDR&(K{Vo+4Y!M^O5e7j5C#ycq#;lWeR7(eKO;C(K@}n%xL*#UrN+#vo+AmAVfa* zZtoyyQC4>GkMW;Be~f1hpql1}8@OR#a=yt>?HNMmam&zA+<%taiCtxA-dijpYwWz5 zL4B22^_ZS|0=16&|LXa{Ir^nB_%1D2U1WbTjAAjJ9DT9iJV2)OJEtqf(;Zy6v9|enjAPC? zKisc>n6bC)2i>^Dx74an*YfegJpIKjpYLpd*Qv8bg6xQIJ*>#p&>Ga^1bOZIBtQSi z1z@Ahva@f7v4JFn7XGVihs;O`wM?{`W z3cIh`V!sGH`eU6er3*ZPg*usB5d{OtmSE7#Kg53L85h@$|ta`}=#hZ@iYH~p!lEmbhM6mmq zHFnC^N7KpcLV|L)7CVrIO>Z$7mLXh3dwliQg)v?u`1*VHWK$| zJ39|BhTY%pWob%(d(8#;zy&mldg6J32V~G^wJHwsB1v=f=7Tu6t~~ri`s`^7bfw^U z@4t-uiukUtM)r!3#-%S;Z@IgEHIon<{c6gy?`+p}ke=J(Hu^Nq&Bv8FU_ z>SSKcv8O4+?h1$Dapr4GY$&1Tr{cQ zMFy8Q#?VfhzFO=sePGr1mz!z9DJvwK6tIrby6lWA*(=r52C}J8hZ)XLI0_{=5h|C?&md+5 z2m{Kc8)5g_@~<&^T6(x6r=DL;E@ zv0Hled8bh+ztU15efOV`L>lSvmc=d-vX@`i#t3Ss)X8xpuf=%d?X0blB=^)NAea~8 zN_Jm;LnNm25;*m)YD(GYx6G?`rK7pH@lF#WOj{17wIgp6gwBsCxrFoeBFW!`e5{10 z3EC_@a|pW#M!K9X?kix2Y-Gc+{3sTFPXRi2?By{9$>GO6%l z7OdE#q>X@m+LwG(;O_Ft;BI@jt5VNFlBI2Nr9!j4rBcz>+gBkEg2D!$s=1g z(1594Z(3>lb-K3C_Rq|la{BV+az}_>V7pWSL=%XTkd$l~h9)Cd!S4Chn+?ofjS?s^ zSDY;k{|9n0?NYLdu^N4hHx4!t#=Yhb@(bZ@RSqj6n>BX^Uxd`Yf^0WZxy9HN#xArl z{lao6j+xM1?UXL9^A!!kAN01LO{9+f z{C9>GPZK`i{9`pl6@s0nsu$57=2Cv~H)!i6^J&eW@5ZGjy3y?1d>G%OBy;>B0iz=O zelE)u*~8cLa~XOG@PMiX0%J1>fZr@elOtZLHIce6dqGyZHO&O zKS_!A7tPkNo|sSV$?SuDkLdTIK?01G5Z1{f=6aDFNXFwuUb?x!RO-QzTkp7xgSkUO^h~85Q}OihO8(1b+~Roj^su~ zm_mQNyw40nhdtYAj=QS$z+!j4Zt5nFeGx^OH$1tz<#0SnvT#uL9;tR5cwOW%O_WCp zUym<+{VJGLC8pZ?=CSC@pAXUG@OIFc`EUiqe+fR>AzQ$ zg&IGTkDiM){(H%mV$^9)cE7MGZE{3ie&!CO%g+vDqJ5hdvMhG1EOuET+4#0~a7_dt zv_&gFd)t#}lgxBE+ubf2bW%}!RVdSe`-VK^=oao_d4;zLbxGF5V1i;gaRW}UjcqIO zAWw~`S7VBj1`;POeUBKZoNrpl;k+|H4OKO=nUm(1%Xx!KP0F7;U|+3+U>w^IQ`da& zUf)4vdgJb2&if}rg1^%42TYjdx zhrru>XNo4J?dE|w>Z+pEmiG4UqzQF8?=a;#t03^2ldIsq;z)V;9LZeS>d%{VzPF4u zeW6|g{&ZnWaA1y=;1;Iv>tDS?pD3#VINy3ur=iI@y9w)gdIRo%IX*ZBJ2B7$goPdK zIYysyxmnd3Wt>p@z)L7BzqgS41Q>ZJL$cXBy09rf z6C9TiG^@-*xfHyl{ZAIVZ+dG?r!5%q@|4F1M~%(!+6=Ev*6+Tw3DTd2=(D9(Vuy{K zUyNFW4J*09lD>$i9X>C&ku3WvSZ-1G{pZN5^3#I~v<%#p*X1uiarN?``#soxDPe>x z;M%&q^PSRu8-!LLmhYotVYq*m9AKD6gkc+TJnL5^J(pzKjGB7ocppamxG`f!NC18J zq^ud`PSdBZ#gTLj2!->d5w~(8XT>n0!?kZS^J5l=7%Q@Xz+$&ODE?}ifPldIqvm6n z$OWB@fpQ#l#o}N^Oiin-^5_t(P(0h6J{ItofOC|eeTk#s|IST@+Zy0b>D`0_By9V( zAv*h;zD@j1r8dvYB_}Knztk;BaChcbtZ~mff2%ew$;9H@&imH$|H{l3G3Zoz={2851U9WC}_a_dq$bYHPd^lHEv zAJKg~MzQEZbX9d=iW_ID2`~X!m-x%gn5b}RKcUn$v>Y(fF1Aw3bM^$jlb?S>9_bUM zv4vzJwTwiz2yTg3*G{!NL}G#atbvV3Qe33Yl`O)hZXtZr z^sZ9(R$aLzUq$+&Gfcm#0}W#^{sNu&jh7z(!;fhT`Qh6Yobt0o5an8~{t(RlWEo;B z+V&^_5BWzLME&(`k^s*{wl6&aTC$jq%WwN@-gjP%XMCYo@Z86@e7t_SZDhcZW?VdERpg3|s#4Gc>DB;d8Efiic{Yd?6m~r`4T@ z?~!ge#2AQ+VfkF|tmudzbyM@SpT0C%?Dq6VIa$c%GJ4j$7ocWg|q1lC;rP--+Y>NDN-o%+mAut+{v5P~OntgG(&KsOd{_}Omg=je~ zTA0t}(gFS@4%}l+VZmaT*`f?o08 zB|yh-dkZqim*!T!8rwNrhxXOe#`DNDN;FF#l%*vL-kVd{TCPF*nz47S0@*rgApcjCN3^sKD<=Lc=Xc(7p3Ih zc36en8mXY%G`DEKgJ@|7wj2u&Q3!&x*H#Fbsud2X$*iMgD^ zu^(bj=bNF{yD2lJ`T6-+aN2+$PHyE5FIS+hYrQvnH zZBcTQ9rtw_*znzbUVgZiag_i(W0MseE417yx*V78d60qV+jP#YDU5GDp~{A9RcyqvhUkyrI1N_Dv%x%;m4 zfhP~;fezpzTmpOB~P#uS#44A=37lU#>jld9&DEZ^X-Gu$(zW^9kh z-8>Z+6PrXC*B_d*q^;*R|1-1mgP(^}pm7-c-Va&`Gz_7!DL#hK#3xlp@8h!#HOq@yW4`8St?`WFjEKtTu0dd@cFN?(0rk|PQTdrS zU^LGU@oTc8F9bME_8b0hl3u~0OAMh_EqD4)FZ+xkPnwUgMwQ({PWn@M=kwXULLdmn zgu{6f*naJV&UX?A6qvP!TfV*H9Iy{+w`l0XVKd4QfaF3a=R}8b- z8?9JdzVY*}d3Wda{kI+sE$zHZ`Qc{dNddpopADdMx%tU!&LH+ZoQZeCqTQenJpel_ zLOM+;?9I}uFG@Z~Sf$9NJZyu#-FsDuyvGbeJ1t5^3X3Z(s;-bo}YLEgK*_I^N zgr^@7iO4DW=bzbBMIKSHmR*jc@*_i|DckhdIp)!Bn^nB{9ieY%D;#&DO3p6Ru588p4i__iUtI2us<{N9s(MNuQLyG`{}+yg#;apm&BF;)8-XYmdXC z-t8&&ZoNC%y6ABnizXqK&xch$G>LIRxIT_c{+hu~FvdjXw+&O*405;ugU#xUtQdLp zSl3tFzX`+6v1I)swjR!R}6Oq*(t~d0A5oUePcZGd;RNWoJ>1f(4vL#cV{%JRBokTToVE) zOz}Gj9BzJh8y`2S_c~B+Iq#Yl-W6Nhz&6cp`*6-N_pvwDaOQN46_xTuh_O^O_dt({N1I=k@J*fb13x~Rq% zL>uMh^%behB7o1!V%zFM1<*?VKNmp0du{wc4#=T-NADwbg5B~mOLci(sW9OxoKe3< zk9E<&Rai)cqi*nM=zHTwzu!Y`dv+SaVT1ge5!kls0%6M1$mhH@>3x&B?-#?uZ3q!U zx7iDwiIke`G(-vK-T<$$KM187YZon!aC4?bSkXLYXDU7tJa5w~mlw8O z_HKQ<#oiKso{rj}<0A4Ic5mi{2Gy;8p!JnJBU~Br%#VmvSgSxc5NWXu_$?bD41-Bgu%D3C&x*qjH5HZF zt@iPihaooG{1kZi_@OYODDf!{m-^+;RxdIKK{uZ2#RomPz7aIDfy-O;^=%{SSVhLA ze6N0aTBC4N=ypG?H0PjSvjta+Y#S~jAnE1(J2sv7LZzpB=*-cJ0Ryqcgkex`Ny@

P=mL5TA?CaO%$JtRo(|OKdn>tU$GJd#9I>F?H*c@%bPz{ z`D3mjJO5Iq*x`kw`g}f$F7zzoxykmA`cMIL+3%kX`TiWzMm`%VOj00=+0Y(PYLr`u zk0tQnx>|2y81YL5*(Sq!4XXIvbA7}y_scpWc%o(`fJT}-gY+^db$uG*RCLR;<2sP` zDAn5j7yH6;R<~X?aM(naAouqs-#y9&iF&)_9=&ewsUtqYbOF#Nxl?T2_?GBN#_}7^ zBFs^u(hM-Ye(=dKmt%l=|K6l~A``MqY5I!!`*s`j8cwyumu@|>-oGJicSHTo4^zm> z8wjr&J{4yqAV$O)X8$?O@lxW(X5ZkI)?z}k(E{WztZ4 z1^lAS6c9bdkqnwOEpgG!K9#-i9kob~r6n`=1olbVIj}bX`A^OtDTi1UUB3mr)>E}h zjOD6jq=Fj*)pnwU+E$pReuT5E9Y2*S4H^JQ@IId@_Y;|)%Ob(``OjjVcw?tIu$&h^ z`T#ocxKswUVHTZcDH9*;-m+LcF&UKgb02~e2QG&pn1 zj;6=4X3=B;60wTpSWwcJ*zo79MKG>7bM=JApludn=7izO`9m2+j4`nC#|O9;p0(_s z7^W@$j7$Cx$xB_&07-W9;bT%Kh1GX!&g9SN;X}oe_ucF*`Cz-VSI%88C@vpZ#LGT(?hY2YU^2v2b^ypgC z6XBcq)m#D9`;V0qa+-JF0a0L_t}=rXDYiI@_PxQp$Tclqb%8>`-kzsas?SCY94&7J zn`SA`MKKy0rLK!q)=J*z-86$aZ($&KmMiCDgM=76kY?jYs_5iO2!Kx}m$=T7Ow3XWUWLmer!fFUFGCs~O9jkz0gZH| zAk>$LsjEyP*ox=cze`)5N~Z?s`>8f&+T=v1GT(V9f(H09XgzTVz*UWXz+> z&VlW{l)XJaGVoouY;TW6hL=bGyS7UaM7V`+nty*ruv zqv@;aPHWNbrUgH%59CDcQ{ThKpzNb3BD8_)ovJ{m;%CmI@omq-GN z2Tj;tqNQK2=-JV6i}7JZ10C7ul&SYno5U)pBGh)urnXG1eI441te*70La2Ap30Xw* zOA{}z6c=843dpmgZlLRf0`#%~rNv;Jfig7LTgVOg(3XahPn6cmGX2fC zt0;(%@?ttso5aE{ZNy~N+QsI(JDHiPFk-A}VAv~VlN)hNezoZg=Xi&$VwMuns{;?zeFUgroeIyNvIR0{&x8oq_(x69T2 zZb75HO@SC*jGHqLI1XmuR7Vi0S|c;#{I8||GkcOKk z)yEI%f)m^@)qv;(H8ZqG6Y-M4m{?&@fQqR==Tka4!rvF5!2y7Zot$e;Dp+0rI#HZxulRbt}R05yQ&K(jPhv#a+hO-?`jsc0l? zL87|fLfA5|YPO!e?J(E#Y$1177S6#x?5g&OOAobq{JL@V^V!SJjo>be4hh`$YVicuLr1i1JTjX%AnYO}(oLGw^$LNA#X=4|?(~IG`2!V}iC0 zWMyE{24Js5@BHcEJy@k`Rw?1NrozbTx>M#f21? zDSB`370tx%K;iy8_3+(^Y*=U4-jZl@U=S4(vP!F=6Lfqa7+Ll5AhQ5Wv?5nNX578; zNP-;82-+=T=`Tx&`HhowEqR#cHv=5_LHS_Ua7K+oQp0oe3`M>rOfkF0wbaOhA0QTh z1$38AHT_9BHVCZ*`+Z@=MUboxJiAM%BM~p^i5M*g1bL`buU&JVk#Tu6cLVF9Tu9;% z8n>~Cc;it;szdp4|rph#&%ec z#_k4yJ1~29iwZbB;ba|)-vjG^^AcFE;|Sd*aimo2bqx!@6Pal1);MQ^0ThW*Yi+mOm}}B(#hh+n zD@%(={>^1UR*rBPUn-<=7!mdAV{rSA_aTaLpOqBmVu3U%ro{!g{o}xvJeF$WWEg*jzKn6^;>ukjPFe@ee>co8L558C-Wpm9EX8|4+TaT zsjh_ZlZ?t2;M$f*18Nfu635Pwvp2e{A3@tiqvk++b*(bpEO1J^$Ut1GOGGuQFK_dNnCggevUixW0*%uz6M8Tu8z3Jwgc1F- zIce-7;tnY`P_HWT;S@vq%^TkQz6Fg>Qard<%WCkaGl=8oe8<@)!Nbd!-)Ap08#O(*=-?hB+GAnR{=H}_oZlK#%?|Ik;z%D zc1Li>=e9zw&2W{fk7ol|e&BB?=7jekS`9&^%Eq`Zwe6^c995p%p>(1vIrS?FRfp6U z4^Q1rcd0#MOSct4az@`JS4KmUCF07QY*!>JcKA1yq7M0EmTF_B6_+x8aASR2Z9zQ4 zTN+%yQebKpfC>UTamBBod3NLxrm*-inzS@>h?!Wz%3+uEM^?Q>b8w%Dd{9tf5i+i? zC2V~3bIetg6VyD!F-BT1ik!Tw?({+_jxAZI?p;nj%d(gra%q7ebn(3u>AU1*xBr&% zTP9@mOQfjxBlP|1xQ2u-x}wOb%X1Xpl!2;=(klweyNoWqb=3M{*iOXo zD2W>TBF8fJ`QuodtbYJJ<^t5kKUWqb<|Wq#hezDA$`@un|d0 zoRHVybhMVxcPo&uT>5&&)&o!_TlAO!W-nzkF!MnTYSRX213W~^SoEn?xBURNE}w+M zL-eiMbX7go9K|cXr0|rVB_?lG5$-1XLEO-*2Ot#5LM<=mGG!A3*BoS+Fa_R!u1p~< zeX2(c!$no0^I2t!MLz>wisgDf{tQTI;e|nTTD1G$tCljLwEMn$rHj(Q&BC|Wxk;>S zwcc$9PcE+gO)^Y1Sy%UW?7ul~JS$1GmiS6PwaP#O{0q<7ni>d0Yu{y9hiIa!+d%d8 zMEnK`^7_N(xAJ1P?IZp3OkD+>|2Sj0U$9)2JbL(t0(LJr%Vb*vPRuKsx1eN~`@~{^ z?`20bDIVVNf3sy)vhWBN?1bb4bB$YLgw%sKI-`WLEJ_T(Yep%k(e9vwh^3W!YhJbZ zjuMFnnY|o!Hyx&p6Ht0eoB^{3)QaSw_2{Wg!mjrFUi~xy)`iQJGfh>RcDZ4xN|5EZ zXd6`ofd@nKt~{IHijtmM^&}g)hIn)r`t_E{u@T~!7ilQz^#DX+j4xn83I*;~!1}-{ zuW3y77k;w8F6BLw2^>>AK{_38fL52Ip0tQs7UkoK@LxUp>5YD`DC z2NEC`duh+tNJu#lyS_q#J$NC7)#fCHzfV97yi~2Mxts^lm6b>!3z}ZwK?!}wOi1eg z6pYt~@o~sipoS83ffU#4CH0$$=THvNLlyZK5qjRD)zi*}h)yiXRTwlz^woeJQrMK* z)Jm!Ju+g?fkFMwgnm|Z3*W^0^Os5s)$%992j1xLul-yA-SUUo3uYo-Tc$RK- zkkgU2^Hbt?*cU}IRZhT&!(5bkSxo0Om_8v3I0hfQwRK_!xfy(Ll!0H6dRl-7tQ7bhfc4SsV_p$l*7@Dh z^3+r6e&*|)et^TD292IBE>q#jogd1#Y3j~8y5UDjyedP1t@uuZTa_vuXEjDV)}Ng>2xIRo zY9yu|+>2ap!~vW9y^dKHd`<#D*ufHE)$3HNqqNL{7qAH1vS`Xh+YkD%0{R$=i5H7n!-YcRmlpFW!+;lG=gwDA}vg z|8h}ojL$kW=5B2(7f|1dfAvUVpBrwb1u5l$Dj6c&S%o65L-(rCHWsAvHoAy&#tBW$ zrx|>hii=-uM3DipBVlH}C_kV|ZnZg@m`X?7$wV!}Fij{Ade*ZnRQ}oipndVFICQW7 zA~2}o!^=7MI2eOIP!d^?cOa_&WZh9qC1(Fyx|qdzA`d z;MJo9#;0|zn&y8qz2M^mRLT3OXJeAPgS9+`0z0>X>8E8<@)bpjn_Vs@({e~{pV4Bm zCIJG6=$dz00S{~9LhLie_}8~U+8mlP8Qx3p8phKe>V*0fN&GVg2F?R&BSkYdwgGu? zc&|30F5P?noXS?0%SC|K)BZ?=UpV8-PCo{Jc;Zg|1c9eUP~xqnVv52vNx;fw)X9vk zgzA0;iJb}~`nrQkG$11+@9dMb$5Ulu60=*o4&DBol(r6Op4q|AZk9uQ{J zA^5*{YGD|ca+<5-VY`DgSn;8)Pb8HNjMm!Z3klmH7lGbPNTKJ=^)J*zvafG73_V* zVu?>*gB90~iBI`w{7VG2bvJ7N&u`981_zwJqm7Na@1yE~d1nOPv~^#Ay!)GQuOm@| zg+&SkpOp6pd6LXZq>aCixkuxgVeFmBw$*K_!vC=o+YzR?EXzSZxjKI=0g znp5<`)TG3}?csrf?Q--r=&~3+AB;^yCyK&i7!v8m6~?YL$Nm1!`5byeU5VUC zD2dWj5A`X2MT>j?k{%f*zcn~-;~nJohypc8VUklT^(e}_H=F4h&jnTbO30vERl2yn!cbrot>XkJp*A1G|44>CL5Z5^U4Mu6GMwP} zEL?5~$C#$*L^3I5p&Y>D!kV{XQ}o!FX=@$lK#?C=)LzSQV(4(cTd!*1!9F9}p9%re zc@4i`%TS62L#;;xJO5QaDC$Y4;Hl3j(X__E#TV9&%pQ{d;>it5@vzN&AdK>eEuX?O z)x~+Ico@O|3|ZInLA$+;t`|7b(CQqyQeM#~y1g@D0^l5Kh@E=LNc*Z@N8Y6W0wH(% zhHkX7BY$fSDfdyghe)KV@iE2G-v&}F0U!;Inb~})Te_QTgisJHzcGg82+vRaWS9BC zn|?wV_-oJrJ}?G2-oC-LIi0bskxb7e$Ev(T|1(SIQN>}tz6@F?cIqv|-&7v5rL$s8 zMRP)MH-N~b6H(A&RgeDnBtZ?nWbv^Ie8AsGDOY~~9+ycHEED%=+$!TmMh(}>y6vWA zdW*T%lI0;!Ev1#eEFH8fWVXu)M$cDT{(Hmjn2y`kXst1|tE(Dh=lW<_7x1>!hdPbn z%SFGF@dfxv?HscN6q@WYQ950Jd3rV>EMbU_FDY627(NvX+TGE1uHqeIG$U(~giNRk zl`963mZF4q`QSDMs8G`SrtiE^Yl#(a)Mxplw)lW!7$&5u|JgXDRC>=T3{wQysUa+x zf`2tE4sLg{l86s;gn)1^@Sva4G<+Cq$_M|5ZVfT)xMiM(BAUfVXcPH9?@~(av#FpP zSF%AW&lQtU)1>u1Cfl8mZp_Y^%K6dV+G{F1w*jSAe$07FB`vg@7#c*Ia7Uo`)e&tR z+`eNf5L_fYUkkAhoiKyvW6(C6miXioL$KN#5fBin?RocenSm6{s7Zv)U~>@s_f!hZ z`XkUee%%DTgjNo%qE7quY<_D!Xht8Yd@QN{Cx10u3EBO%kOpXNDHpk#9)x~P?pK!| z9(9CK7(<;Hn=Jnk@d+#>xntDFe1K)d0t7b?$zhLyBc*)OTo{lox5_C1eA(~}!SM5i z?&jQ|!2lN?^UxIy9+L3cwd;np&A7IcG65tt5VbWPmGQ)I!4tA?P2uD}jOkbFHzW;E zK%V-2ayBMzt`=B;D__1scCP6l~nu{qqQ5`>;4Xv}QT(76=ypPnFC6n_VF#Q(*= zmvdOzQ#S*GYYL+1iPxJ>1m3(?3^i$>K#zpUkOj1t3!)BKDd6|P>M?&clPs1N@KNNz zWP0t$%8u`=Zd<6^lFXZ6zAb-YsoE5yOq$a4hO!L1gU;gyZrjD%!%I@S8_r<0x7kQ4 z$IBmI!$*qgYzUsaA9wSpn!!)8^=zZY+JF&$^Ss3~EzmLX(ENt`CV#QZU`zW+?2C4) znB)&ORM>3YU$)>lE0W&F4wkEn|6D~~BZ9ktuZFfQ*$>zPU2hcn25LPMl?Ac!nA!cc z;vV|3-X+e6eXnb>GCV?Q!fCNf;c&zTj6g>xEa{}FSnAu8vXLX0D zRe)KwO4&#k2U;7qjb25hy?U!z8WU0C@#;`gL_Pzxe+|IDOP!3=`fBz3J*UAJjsx!y zIr*CSrSKeP#jUa+9#`<}(x%N)`yakI)m*2%R9aR0h9eJPkmIW#d)sN+XF173-=mu4Bkk@UG=Phqk_GBPTYn(ENuYpIqIc=r2G$22+1u`1+C|n{3WPP88~=&+*H%zq zJnw6n9M7)@ccdu*fL2!*p=P$v4E&rMQgYF(6>f^Hk(0_zc^p+#uOZDA$bQo-IndD* znk`y>>^QNR8u+1a?DAYeB~$`g%h!6S+!okD5fcaFoJOYKy{Jg+aQhvS!Q|!~KoNZ* zf@Jlzx23^7e_%X_aT@nb(=U1O@0v70eLnF+O`TGj!i6Pzc0iL09-d1P8wXRE21s!_ zb0=>FK-K-=x!w}>-Bn`4Jn09tR&BI?5b@Idr^vzFLf@SdMh9W-Kxl&D`NG{L&4y3X zFBRm-EfmbekfB_U-YF-9^XCDq#oYv3QLAtpXVHe zd=xmt*Lm~dQK~SVR=79~c1JXibm!L8*oP7NmvhBuPI6E(jr(Ntp;@bm?;jYQSK#Y$ zW~Q4nrF_w+4{dwalbKgIu!cU?1zS7>>>(UaO7tBIw*`Sg06%IG)k$??3}Rc(k})UQ zH2r!g7{B%=GXeIuS!F1v3A4TN&&OJU7Q4~!RQ~ju zSbgXw6^_hBHqhg9GzT^#sYKz?Ry07)<~j!s&(E9jThmge?vsR>W#6-@`}Tc;R*wG@ zRoRx?o28n!;$+t!`(Ao<{^=|yQd5=9gVz`t=Xv`5zQ6Bb z`=jnho_9dYfL889dD0k^dJhXWjtD@NCR|^7v}KyuP`R<1x$hH5ua)?P5dv0Ass`N@ zA6WR&Q8#fDIVx4{)O_NxYVaiQ=OI6mQNNqSo-z(TBK4v7L;Rzw_&w;Pb)c_lVxT7} zP7nxA+lZyaQM3hoR__GIiGR~8j`jPbruQMxRYMs8+ojEdW zA36Y4<4ed8pFYk|Kn`99BkYMyfD%hO>qOMP!CS#o!$j#oZ)O0+2^+>P3u_xz*$~+8 zz&Vix)sd&IW8QbE<`?Kdkt_$&1GFomxs9WbUPu=2HU*I(W%2D^xqFeMI9M_gL25y# zWl?Hm#6D*IQ38-p!Ld?6%*`R;?tVQnQzLnEbb@?1$|Zk?0pIIu#nY|`awqxQ}GQbgc?4plMcV<7%{QedBvv7( z&d|=EH!VN@y?N3?j$HiSct8mO8$-Ij(S}j+G*?Y5n#KG&0qywqodf|9Zmz6_T4v4; zOq0Xeg>xV}hYP|3?dgcc$F^4j0%uWLk#yf&oSp1u>WR6*`!t~s3OF-=iaRZMw=W)f zvbjT#nK{qxXVd%!?dbA4yI*wN5cwem!qJwDRjtW@aOThpaGWX=Xn$kT&HhN(S=)VY ze1NR74O9@L;wI%E%`o7Q5M{j@nK99A1hN}=T5-$7A7$*HmAR27GsL}X>_^-Da6JD6MAN&bU>t55jU+4&>Y31ZI3vJ7jf{87a-K1??EFzK=aI z{%bCJE<$Vxw{*?@)shd*-e{oh%m3ac&g&CB{>k#A@5)XKu}o3~lFhLO$S(WTdi`l@ z;)LW*%B!!UQ5ij&NcpE_dJ(@z?6->tPCgtovH`Q7N-Kub$9Ckx$ILis4M_sB{yQvL zx|#qsdH$0DXy-ezunN??9Qo7eN3HNW=pvbf;`_nlz1XwPe&8SJtbxO)iKQg9Z={w5 z{Fykp$eT{xv4Pzwpq&$$O^*cajub6;v6|0%4+N|Jge*8J*vFwhugg z{rAJG4Yoa%yT2IOu9enN2e(y|)ZshY(sS%~{<2XJQ6P-OL4-VgRF=073eU6E{#XFB znL8qns0((CPuXiDQijsH?pice2%J_hTq^AlJ|#Pd9no4z0kX_no%2 zk7GN1uIgC-<6Fsc3OvQFJAmp2a;#QjGo6H*^)fN2{hva8N05Ijvw8-uK$YpV7&jhR+d=#@)yWaI71)fgfJLXBG)^7&W-ic@|dOsp^3A|ezolp%M%~$@>k^FSel=P(WOS+M8=Zf z(_ZlHZJW-{W2yREqB5dnkgJac-e05sVQ?nb4SG~Peo;$~Qv@`?Q;+MI+&ht%?~6+U zEwK@+?Td4Kij(rIB@fTLq=k8df5^Vh{EzIgr>d@gbaulAN*l)O46Dzy&wSdFp|{s} z9&F%!ezqNK&<_SZWN$lJ&+FyD78igoswcx~=)o@<2N^-n_r9 zm7Ere(yzy~@d^$TS(IL1v(!w>onmV#5>1qYu6@=%sLaqg4h4P7WU;a+C7Ym+wiZul zH8}b#07KmE02lnCJ8Cc@y_}hG=kvj5KONfOu92LU^~z-9AIt3=SwffQMt6)( zCrU){g1tk)%=@RS#0=|wpea4ZarORhvMaxAN8%KnIgX5Hb!1<>26Y1g+!j?2A?%`X zLBAQMWVJ$cwBrAg5)bc@1?a=ZQvXI%nDhnccT04ewByXs53cs#Wc9|#)AIsjf|xni z%y<01SBbImq;H)CT093P1~@c-?m=++eLLN;*qEZx5O*{DC82N38f#dnL^7Um;@1*b z9!w+#y=LjfhJ)XoNXZiJ9^c6MQ@dJ6%DuTvu*}ySYo`<6p{l z5h{nfO55DMAulb%Y3O9p#BsO}6aCOH`{OsfHLbQHG>N7)SnXaOf23#6?{CLONGkFR=a^`Fca>(`zi$gEqZVBQV6O@EwOIKYrPN+aqa3 zTD7Mt&BYEwnXXA+z}zCODWe1hS!8M%uG6mQq{)##fBf-AZ60&-ArSE?-GaEYs_3`_ zjccc?l|DtnQ-lbBoBac%@76(@ER8__q@K^JD7S{f`!wZN3BMcnXtv88dygW5VvW|BS#QETB!K6P$uGS zY6>^t*4VNf{(-~#1wx*Yf=CV2J^9z0PiDeDotE@}j2I=US3pXGqMQ(ga}vJ-@#(%B zk#S=Ybptwf#Ltepw?g9M@{wY*YDQ~L%R(SBq<*3P~TVRf7Lp3L^zbde{d)Ry{Z>n zLoGKk2B=DI=m|gOL+g?^{j-;(&S;bEyyl6-|8O^|S>moRnt?HesgFtOSppd0Y!m(H zDWz=G=uHeWqB#MT^T&T@zr1xU5;{?XcxWH2pd}QNT=P``MT~ZUq3ITSN*p*Pe&~eY zl}DP17p7)}8qxeBbDaaVDGbjyLO32RnW9a^UVHu~+NuB~o=FJuorwmxaT9Yn>;czC z6c7_OxW8Hq6Z#hm*?Lt?B!4SNpa%RH-;_#72Km=nQWt*fn zDb^7g1OTg1q2u(ZuE|vS>miC#DtQRM?;(otu{#yQ1R0h65pWo5`P6Mce|l)Q4#Ko* zjScRoUb2ny5Q9hP3bi2C4TxAJ;<-;$O-LO{`JcUj^=d<&r8WKE^{p52`UCg=_fO?8 zzId_J{oC{?Fp<|8Zo*9aD-pBQ5F)M)g5g4C5zV*%S;A1r|F^u2x=&pG$05YS@&Et% bmOvnXeo%k5%bwx{5HDR#Lqx5*Q~dt{Ca*G+ literal 27246 zcmagFbyOSQ6E?mH!HNbbQasQi#VPJB?oiy_-JO&Q!2%SDYx!WMxJx0F7I!FaE$&_% z-t>Fk_x%3+olVYWceAr|@16VHnP+CBG}RRd9zA&k004oKqO3LmfYCp}01g&t zjox8dsVK+-5C68jZ^cRIGq@g#hTZ^xNBZvz0y45F(I>Hel+@&~|6pR0LPb|65G&|Y zw2nFkKCj$eU2WZb(1!r<%FEW$$JU0y-_gf`K|x7P(}v3y8vqypC0QArfVsWUz$R0< zPj?j;d z2_W4oz)}RLqk5&}Yl?0kfhft}0~N{Jb;`I4@y{*%`UH-BRRv1mf5QY4;>-JY4l_~h8?lSLU2P6aVA zh8>zC<3u?ND*X728+vF&2ckDpZtaD;JgZ3W3+Hd75PkrnRiG6XE9cJ|40&Xcg%~7D ze9Y8dqbU1~t#Bi`JoAN@ogbVb4a6YauOTpZ8e&6_N$~^c9tL}k=xvsXv*84ao$ybT*39&n*la~ncL(Y=JqY{~gupU+?Np*s?)IjRxOw`;iKAMb-$ z3Fho*ojGo0`odM5;1cye?Z$~5e&}_-lm?h&*QlU|#Y3xCFg`6df#q92TWFxVY2JGb5 zTwE;493ejj+7zg;??)%9<)%nca{#%q>?!FbS}$Cns5_6v2QaI-@=R zX|*wIop@S-=5YTY;P3-`?}r9ubQ7BR%U|AjT@Moib#g8paYy%Rgw=;H!I~O3PjMph zCeDOML0jM>|Cq}lkZP=EHw2JK;iJPC9a_<7ef9;!1!h+EPS6TBUwt3q>G>7m;u`qZ zv~bcJYIFA)VPX~7_8vi_#%u3f$qa_bc>FMbtEFY;iplc`MH3@zj$LIHTchWZEI@%$ zrn#H=i)#nqz-m@k9i;R_Udc{XiHoVQ)iZSC_$4AjhE4*$u2LnwF-^ip+bxu+7SI|n zCPHb)1khuSe##r<0*FMWNL^54Qa3p036gEp3|R^1fK35@>RJbXk+hhN2|(2ddghEq zeIf%ud%ua#eW@l-gA}fU`7djUpb(j2xyVm%7OYan2v%@=wnJC>OE!%Fa>I6B4Aki7 z`JphmX6P(D28hxj{4#OaR5HSqiXSbaBr8}gE@sYlu8nn`#R;P@q|<;Vl8PtFt?w~K zn3CIvqgI|tmK!#98q_xj_eil1@T~ZSJ#M@Wt}D zmh9YshSF7WDtQ|#>~*sCH_TtIY5%5qR3a^bD~W%haFQ;SZMgvw9%xBDR>KmzhD1Q%c^Di5h->zO|4tjUHr}1GrUn&-|3f6d zy*zNy;R$;%NMCpT`@IZI8Z2GKKP|i!$z1z6N;-S3^Zq5tzjGM+!dpZsYP~T%Col}g zMycp9C9Exle-h?0uhy>wK`O`&kQ;zyqBC~ zz9T}Tje>q3a&y%oh8f3Zil&*iq?hCRaE2OAqnW36@8gD zX80pB{DcL{fXe`4Q1+qA_b(Z(NPdc&x3KGWcxL>st6tDDDgoow?M1G7!k&r{J0t?RjlQM)6k^~@B^O+?rF}a$H}{+ zdR3u@)kCWkvNi=%P&X5n%^0rn$$1;a9I`}$xm%xngsQgkH+g3(LHKp;g0dQ z_&@X(@%0E2tB4)Ll0zP?hSi$hBx{EvReM>XSAs(b^h5xsfh>+TOBk7hXI{$ERVVC8 zu@(O953g}L#;3#fEANB#fNoT; zxvb5mU_3Rf=DoI4kRhmf5SmpGnk2X8`ETJm#(>pWXAdj&j*_>^{zt`!wx3?2EU?9q zza=?bWym1~f$ZY!G?!hA^nCjOm$;H7NGd`qmln&dc@3=Y%dPQb=!(C@w8%h+(~CB* z`2fFNi8-z51S^C5QTTv8*dRN@zuyl6HzcPT#^#x0%6=xV?rMOE%1qH{2U`RhrM(U- z0}F#tq3v7A_bC=fL}Euo@)#&n0Qvcq+w)aN!r4&X7ul(r%Sp7q(v|UU;B6@wRZ?(j z(Akypfg%_O>*46_gGC$O3Omr6-rU_X{}T<&B7Cf`W`afgtEf?=5`PPA0nCI7DpG{m;M+tc&K`Sy!eQ!b|~o0kh2T*wAfm$P_TxL$ieS~RbPRWfe+8R z&R#}`wUD980YXfkSY|i_yOWQnp(Om1s?!4(Ao@Ou%7B}vLcXE;+bg>c>%%C{5o3;; zNx-inkw$xHw{Zmu6a$n=QyQc6r1<7eQrEA1xtqJ$2mYyj}zRnf%H!I6UZRM&#;ck!Y&yeYMGXr}`l^;WC zRvj)d_hh2hgYsWhDCk#x!?@ckC%fC*e{uIuSIS#gTl;#mmB*`Ff@Sc~STIk|_;53z zXT{ww*HDRJPz`p?ve`J#9dR;Swx@q7rN(oqpVtoPZ3Ka!Nmlj04gP+fJdqe?Ts{T6 zPOx*HUOQe7quTDB&cc~NvTAXqF5QF{w4^`m?dr@dY#0RjK+^Gr67inSHqZDDz(-Zq zp+A2}&y9&zE@yVO-Tx51B>xC}r+#I16t9!}CU8*bOS>6>8bS*0eK$)^&+_+(O?E$N zJHWX6Jyf%CuJjL-upTrO#JMw}BUm|oOZED9srfV4b&eA+o9XYdBHN^P3{877V`sc| z`w)o`;(CI6$tN0$w0vFXU<~gZYZW&QA$ZR#sdBg9-`^M1Pc;sw@mf0ocV3)5-zUa3 z48LZ?>7zD1*x@DmM?|vSyYD1L!AF=1i$(9P4vlt~0r=GQ{F|9!5yIx&9~=~SL`r~6 z0inW1=TN*~Q?;8PD>j`#=1{?sn32Y=e0cbSA82L(rxvGzc4OUl;&YeV^N!*7_a7~e z>?K}NE2#}uSELHJKco|{Ely0-BB!piFS0Ak&b{5+j=N7lGyPD)D{~X+jW2p)rdvX| zSm9H(y?#Nh3UemiR$>|F_r&sE6GdvTjdp{Lzz^k|5A87EMiaPq8k3QN$MN0jP1&2q z7CzWW;69Pt5uNG`FxGorEb_E`I_sk!863*C>m9iok>UC(!LfE${M*wNbKliCAwS3R zy*yBaOSEWbcWxRURALH?z-{7Vw_D)Zp0yAuQgZbbX< z3~~7Oc6a9$oxe>&9>Rw*h1`=7z2k){EDq%q866!B9>2fyf@ZpY5r&3{zYqQ8XVy`{ z3{Onx%!t`uZ|TDinm6Z`C>tHdK35y< z3Jo4EnYQ?B2aNbi4tnPNXa)3yItH%E2Zm->zlvTlDFK};xuHkcaQ)JsNWMLA73uhL znIt{xG2rHTyTP!$emrIDUY=JU)(JT;3=Iv5Bi8Y`T^TXn7#Asia}G9yAcjKR zy$i->xceN!mf8Xf>ZZ8mhn@uF&BqN=0gk*pl^vqNsxXPYCkivM1naMU{ot8r*I_FR zDbGaQ>d6wion9n;(w53=ReE~b2lGlpgy_jWV`ly1RXC|6+2}d;S*|ROM&v}Pa8j86 zi_~M3iq`Vs&d!_++xcUrN*1$#-|tR;zPUB$AT0U4Pkj)_-1j-?@~ijLj0$ zdoeG59fzPH$sqch?&Ohd*a21=y?DHPK zS%Q~Tj^0`p@85QC_s41r)%piUtrzcVb~SHrJW<#Q$YrmquB>!dDfb=8BYW6YN#VHC z#5}w3jJ&TXdcXPX;+Q<0o2o68&u3Yc=aNEO2#7ZdYv-=dig9c3GU4;Ke>~S@(HWsz zKlM;Ec)BcP-5s0%c+~nRRS=W)^vJt^bIkbm|(#3cVGIX*G3E5UdC*VMFqIM z3vxqOer|PoC}gaNDttUzxI4FjE&M(uW^g1rSWC}=8E#~E#GR}Q7VbKk<1X1AJoo;O z$@lgfd!3fEMEyEEceQ@1R&Dg*?bNjx=LlgXT$0;w>lDW*WaFfL7`FR><6EajqWNa! z@a_1=DLm9tivEL=tNoW;C}3988$<`!edTWbZ-}N^9KrVjABfu&0J^}nL`I|Co567I zo!#9`k|uS1KNDJsOqN?)uEQSAntO-ETS1xblqe|ZGGTQ*BY!f$PV~CSy6*C7biUDN zd)&8v>QvPu_x^gfGM+{ikd;m0Fs!i~u$3Me%#{lNi8>GZ_^NVq^n^d@lz261&NA)` z!BUAQ*2DLm^`=p~NA)>TVN-q!#6q;vqxQCg83N8|n}m{1QvCh<*G>4yg$Klw9uePQ z^C*nE$*q-^Y2qm`WlPj6J4`)WV}JHr*7dc3;Uq4~oMT8VHe*Cqp~EYdM2aNn2Fn!d zY+GhTQW_Xs9>Lw_%OkvAT+CmlMw?pV@o)00`{qZTDX&2^cd2$SfcxCS5_hfBQs27T z*(XzkLhqN_?P>#E26pc08yK-&aZzzXOEZP_?epT!FP_9Lf~QZ_kgjjUYFYkEIc(%S zxs$~9hP(}r4gy`a6*etv-IV%FVy+yL&;A9cQF^RMnK_4^qb#L@sKRE^(Dh=3h<^mT z0o4AbzP+WRBb?&&mbv_VpL6XuLHYTwIC<*_X zMB0aszS+Q@1KSCvkuQ<(|Dgwgd{c!br9qlMx{kCjk|REDbhY z!Us-RrD0Asp2gE>RxNWQ8QCe<3q{$S{<-*6Dvv;ks?CCjFH?Qh3fVmw&yqIfkYg)j z$(pw3VX?0cDYRck*<8Dm2M&MEWqI@(9>1NBKhPdmIxuL{oMSz5QqV@Rbc1fQr8h0yqLY0r}NZV#*$Cp0f^DdrTsBJ}9ty)2;mek{5USG78U(5b_H@06o z9;S>Al}%*Xes*{BhU&3OP7fHo4hD~^A3x5zppRv-_LKblt>P~kbYA(dIeX!~GMjD= zM4SQEaQBc4R0$Q5;bs0fGfc-cSylv!!H;kne3kDSL#+8#CYJMbWm7DL;4C!7-{Xpt zoviVkK?XL}?~4Nl{WuJV>w7&Xh(lesj!XO?d4%U6o(0cu+XhDR%v3ph2EbneR1_>+{H3z25sB3xdp=`z>c$UajTSp#wtWpPu{+&)cXfQUrOyD2^DlL2RB3 z?H$&xZ!Z20la7LwxGixUA{HXK#HTjBnm4WQ?IG-9UW>@E|rpvd-%yn|10l#u1P zdk8thTvYk!=X6np2J5>Y!Qhol1{G$eL4djILiWGKPwhss>aUeO*EE+o0NFK_ZgMPZ z1j0m~?dlTm zXpF9D5beo1GXlC65|m8ZaHbxz?JU^lXVsPy#{ugKj7tV}D0F_TVp$IzAVQ%6K$LdflS8HTFHs6Y&ucM0xTUZO1$P)c100L;Dl8@?TGGfmuFr-;~r!Ts$Hd)#f zJ0dSRNLe<_C9tgkLGv<$lUn(vR$wCo^HVJ88&#D6IUvORax+T1nYij(yF8*7Go{Bp zrnl}3BzQ`||27pdSSx(hSCVFsXWq#J!fIz!f!~;TO#rzn=dx-hQmLtU#qPgJ=m{-yI@dV5(5T}!uD02v$ zUoXaVI|>~g#;Q_}Ta|ZI0I)a8zKwu+Fo-FkmRNb5T*T1%PwmCe3$H`*uLH3!KO^30 z@by&<5kN(Lodo>HG4Irm4=<(y=!nS-M%Vww^`09qxhOrsC$Lz5GB@m3w7>6BR{7WT z{PCr(BR_ne_r)^YxNm$p1JJWD!R4>e)B>^LqVULz>#T?NlrYGT{Wp)uCU_=rGRI<_&?)mct>H}5~8V@e5OWqene@4U4^d@)!UF_zpSq; zVXUVRf2zLZebCOJCN|)epQ z3Ad3-uem_464qy@KWQIc3eMS&jzr>q{3BNz2kv@rH29hd7ThR)iTOgUe{MNwDIna(+?K zw79qC@m(l|DulA=4u&BTdNYmGIMDNK4j&vp2>;+Bm3=vyXYcVH&q9gE|%WkvS= zcYkBVXB4kD>81xcDk>bRtrdPBTYA59l_GwIZNUsr<^0*9^@~&lByQ(;+C%krhvIF7 ztB)Mg$h2piD)>wC2S^n;{B^8#{qI^i2+@a`9pX3m?Via6mxnr&kqs~Yz>uz)+OE_*O^s}mqB@7 zEU10sB5h26_n%6t6pIUwLc7g?3d|~2D?y>-_Z;}Q%wR`f+V65YRQ*T9Dq;`)0c38p z0c0LCIQLE#05wS1To#>hX_Z~8wd$Dj=LySCZsArc_LkWE)9%C=Etw>2Ryg?<=9RsE z90o}0G4ck5WAex}=w^;}IF3+oe!UgSnGROtuY8CnqxivzRYj<9Cz~#4;S!i%SW*n& zmm?O!oE=vwC{w?eWAFom0GaI?6F}pnUBKN}b9b9r%z9!{I5|LbPHJn1k*r-A{SQmf z>=-kehOTi#-k&;5d?D9c0(i#XUi&^xn~sl2U9F2}3WI6P164HeaKq?yA`8_Oz9*I; z%3`s0Ayy%u;R8wgWhuyJ-6-EV9MlzHrUG5Np&cPq+FhW!jpEqI@w&XW;YOt4+HLO+s3TJ$2gZ-rh2 zwUil4hdgs~6|JbDcQd81ahKBzw`zKN8gN8A27`_EOS_+A;l+PLhrbU$q)lA34911% z3+qWKbkYE+giAd{D@jQIik05nBN0+yr3X1pgs(&AZ#3tv^Xq)rK)1S1850+kf^LCR z_cB%5bZ!!C>jG$kqVD$(h_HF^QK|#2c)-_Tl*Xkh1c((VUajxK13qB0VjJf!f8M#a zYl9V>n061W*T1AdMGm&z7f=oE<^mQvk%!sqteaAlw^7oHC@SRiF#gxOifnnNojmvM zudz>F34Ssb%dPhrHziFzUup}B{B)UpLQpUK zb?OPIK2%6WET=T4VwYTqt@p_0j#`C9Lgdd)`RO&DHsmg_C^nm6=9O z9c`rvm1b*)jbm5k?q_F0lXT@{)2Y{-*=Hw&hpvxSU_FLltttr07x?QaR7qcbZ=6;d z;nyUFd}UVx>t_I`EZ;BjayF0Rwa7j1F<)m-*gi)RCrDOD#n8qJN3^9#sn!s$-} zmGt>bOu(R5R=#9LXD&`U1o$5(oBNNGjh`1<;@zKC18eRJD{qjcbV`2wZ7U}6%-F*r zXF5H@C4#`*=7@#;C0N~W=1M1iz9F}8IJ~mVjcS1P1-)(i7wZbHgSLA%xrHN43(g*b zH~dBvWPIqhBmqhJ!QXi^=nfrQhZ`oZpwsy#%m6c>nz^<-JQaA?o_u<3{(KG>)U>2k z{0%)(q7&f~G=Iagi(Ol|{=8gyyz^PVo1d?UZ+*VS{9%zyCOpjS^cp%}EdjWe&L5sU zx>tJt^GL5eFDtd3DFJTGAvFg0{nZT9_%ZXyMdDAUArRhCSyQoxEvdP(?`#_`)#Il| zp4f$k9oR=7%&5Q;__4*K1*#<3TM~yWR9a-|I-m0|9c6M0DO4tsMP+ zqKnY51@AGMO#jeshHB&h-s@GR|6|9b)+<-y0N z0$nZT%`NQzMmDUrK%!MvT=OYnMVTbQ zxWf!*#hC8bp>dIVqH6=Dm~aS6jjnEAPGzxy{;c&MBVUm$>1y!}B}@WGS<%cU*1C1^ zXH19p^#tA__&oOC+}pm}f1R&>n1Exms)4m^ek?$=b6HR5D+?j$=6;^WN^1qkFofm1=rQjG(t*AdIL=iQrMgNy*uGj_x_$|9aKrX zkq-|RnX5b2RtX(eGd$?0s-&PaE|#Q$fJ)v|wxH5^uUH?{BfMx54OuZH7ImLqiA>GY!Y zlQun@B6nF#ud^%Nc}(x4z$Hd7x}+pTCuK3v3;v@c(gLVN^q#}KK50AIAv}Ag({>4{ z`%mYohIP?4AOGnI2-Qw=#ZQ`W+S{SoDsy!iAk#8CaB|0j*8p`7_0U~4+ula-VJ3F9 z-D7FL0w^D?P+^6Cghya(?}$tV`V!%wyzSm)HHN9zW>0H<9>U+N2pWz&2b*APLKy+g z4cQ9%^v8{k8|UHp7MtuNy9&wM+y4yZY3yh2;p!!dE}|?wII^NHy4Nv5Q$G)DWkp|QoR_V6CkYOYuqG8*h_w7$EhNDR9Ktrsd@VZ) zEW$_j*vew}Rh0a!euX_@c!8DNMK|gB5w$Gpv$wjc6&D{wrFz zv5a>uJE}GK!bgxduCo$~8Q649KTwgmU@D6wNqj5Eysa48fLLH2(EB7gthuZ=l^NAr z0Q-0uJ-X#<*~@KxE4?6dG7DR3Hbd`K-ri;->J~9crilF4O<;ZP=&iha_je+m(SIhF%V!) z;Z3@W<+gI>(p?@fO)(7g5MY;!dRlAl6ZwaEqW?lIERWbRnL zhi7G159ic`*k43nSM)u@YFl$o8EqBbGoE95mO`1*+F{6`_}@g2@Q=190`6T%B|$7d z&IQaBBx~8%m@md#uR%|-yWQ(RXi9=*m1v3JJtX;L zAHW4R&rc_M1Ok1Lka_Xd`!IfM>N`O2`-7?3B&14r_8d2Bn>V;UA4*8or29xZ> zVZp}ahoGU5IWNa)yvb-FV9x*x?SfFih)iAHr(yrMX6uftFy)_-Yrb&O_+~fekge7& z-yUR?5llNyJN^;Nxv=EH=;^QK>0S=P7jRep(OG-W^<`aa`c#K+(uKt!aTcIe<)Ihk@-p&A|G-`{%lK~^BZ^HC1GeSnFk%x-gik#Rg_vBud_UhF$g9vb(R z^b9G+4ie-aTyx@HcyT{^&Rp{F2y@CEi{k#vyPCuLxV!QxM-r~x&~D&{oZ%;!i$8mJJgTqOJ5D3rN; zKbR^_`v`4lCQc5EVkRcC*>e@1zZ$^F_ zXpg^-rxc!qprUz~sDIUX-SH2CZC+Q(%tMHV0`tC^#|rMHdYcleu|HS%P(VxfDmF#2B8?W$E>aC>1a+gTVhP>5|w0@scUO16IZy9?;K6z7UJKKu+h%u3PH z(vLXw0|m?^^Oo;%NbBOD@;V3vAkT?7kYgWyiu|(tyYl!!Y3-L=W6|8SR~ ziHS8XjOIqHP%1R1c=N|4#4Duqec2=j^h#M>cY(EFnYmM6b^hezu>kC(YJHXs5Zuyy zK>n^$Ud9CyB*RXMPY{`yow7YvbGzY6O zkR{acLaEa3b-Z4LT_zqz^}ZI-aZQa4Bc;$t7krwc^zMH0MQF9D2-?;DOz6AtEVGXvH`Wf+9q}VklB+HB^E8vrJ>;@P$N9FlHnmaDef4gW8j=ds$+W%Zj z@1V!y2RhV=4pw@EE4{ZI`ZUsF;ny1;ySU1=r$Trj13VN=#Wcssf3IqLv!VQ*^8_iM zo?hxNVy@=!zTY$LV@g7{SZy+`N1ixA{M!r! zOU$AtO*FSRSo6cp{rR&}Z4vL{?f<3S=h$I~_&d19W%|2-a%rSDq55=xjqVi1xR+Pg@yA6|P%v`{IriLSb8=#F^$@k}n%TgJ zI(W2YCszzWI2FD?=$zcYefo3;Ql+Mo$;$K---770_B}AAXl2j4OohE-db*>q`j=51 zB%5-2Or=}7d>nTl+wK`c=SNW=UoSrY{cP5+sde3d#4xOu|C?oi=krtpbXZDVaQCjO z`tAkNEZPk64@eCSQx5|UT~2rKr>jd%AZgKnj|j3gE+)~npFUk{*82~gKz8SL6cor^*Zx`$`rZw0z zfXj^|ujErMD$MQkx#VwV^0tTCbqk_4pze%cxBExpa9S6<&~2!Q!!uAxYG=z|({O=ElD8Hq2cxySMj$Gw%c?dN>wb zO@$etPJeHM_7B*fQ~!BeJ0ODRVcIW^u0-Ig)G*xewf$IxGuwn=-LP4E7X2?sKj#@& zEPJ2yU&A99;GZV-P_+jYfYYa29k3e_GTMPi!kG4>LTl%fMZ_vev0@VRf3P*TTG!d* z1<8{DB=8{0?OaavJYI*6Dj`VT`ebeBP;Grm;w7l<71QRn_KgKlW zv@QIGvBF|I@Eit8Bk?S=#z5hq<-lhMb0G}E776AjuQ)+sSV*zkgT2i#uv;jCwY-i)-v+-Cs;-k&9*6DeMTYFfk5 zf%Ebo+ovpBRt9M2&Ip2fRIk4uY1V8qE@FBR!GAfLmBv}CK}9A`E*+uG;&@n@7hB!- zBnkeDA#EPaO4%R#mDuW~W!p2WzN~UQAm1Klh>}@Rd)n?^b`$*!9e!{=ODMg$r-U|_ z@j2qf^8q~1{Te@~7k=F5ra8GYpvg`aFskfVY;u~77d{_gz~f>6-Fw%R!iQ8b=w{8e zA@lY;$U*wuA?f%&-MNErd{5XQ?hPH6mLH|t0 zDcCw&X4Kn6{u4MDG=^`Ax$5vX)2tRZ;2*g0b=cOK6B*Hj%VCE+utnc8H4g-jYGIYSOLR4BA5#`nBs3w zUVYeslm27Bz>ejobBbSkj$P_2wUC`Jz(JI?I64m*8RL7%3L^s2Ue?zAap`f`+*L01 ze@Uf8m~-fIcUU88l-%-O^y3AuHIHKVsqES`uNjs5l|Rd^=yrQJ{kfYTuWG$G9Sh97 zP}k^OL`(L7B5{#cYS$Kvp%ouR4w!9ASCIoVsT)@y!wS5-9$0NSur)kSIR2GZv4v!= zu|3g`Kn_6#Z(>>^E5>jm_GYdeeE4I5v22@&de$08*?2f+;leVMh?TK&Y!A3R6 zG^{l|M9>BYZVsxKh|{|t-F#pc?n?^s(vS@fOi2M(rU zzpe4l?U+B+oqTB4h{=l;6XSF%YZ~(t;d@p+9xR91{&k;oC?czk;*^Xt=1UT=O0gl2 zzqPm#uEj$EKWW~lB8Jz4I2!66a%ZddCUFi!_C}MEG|kB;5N27l3%PTHT+3Vf+kurF;&X)j>D!IV@8Sy zQUWnoo)l9(=Zud~LakG&gG}g@k48RMf`$7TV-6=vr0h~mpMh9cS{*kW*&W)_=}rxQ z&pZ~3c|YJ}T*8f{NBJSMUp4AA9j@1O#X|A|Fp%~7wN~xztem+Og;`O~^ufx}D4W#!AjH&Uuqg>u%)*m2wG#JPb zqu1|a190FhoUW$$7PQMafRgl`O~O-L50`usp|@)EyG5n146lcK!z*ynd3Y`j-R;;< zZ5ruML9E-Yz%z`1_P184fbdt?hmh!kZ1d;F^!RX>U_Do4fSzJ_^vbf7@LldNqcqr! zw(`T3Z)8Zj2~7AQTYm$$eR zD#A^EN?lhL8u`u&rTRVzVxt79$*}9)y^R5|G$TcS9KV%zbqk0TAjD`QLGdjAp~96u z@zRJwUD83Sf-JBkekLBYarf~S+0KC|x)LD)Jl8|}3o!t;X1E_m^!y7RV`_|*B^;{X zj_p1CBybzsLyVP0LM$F?lpcucoSt*v!EOv$qtR2g^F|o|ezyN-Px%+!Eiph)sI#5+ zo-85G6>Oo0z1)F=dZW8_$_(UCy;QHc{?EC?shl9KvqSHsFIYD;`-T8cFLtYn6IN6A zh8`Clxy;G*IQbRzhxAoe*LgiXqFHzui7?gWX=#%!4)3v?o-HX{v;yRCHQa~f;;)DM z{R75V)BBhnsOMK0b- zkpQ{-MTz9QZ2MUvLK2yZ{aF-4@&y<6jXu>;yGux zZO29ZMY?Kslr^iL;7kQ3Z_l+{6{p$mW3J?W5O>*oL-;I{;hqeBXWf2--IG#NJ^*vk z>d>7&d&qNN`ZLqg?EPW+*v*t2S2`|2ZJ@WT>Txm90*J5m3cE;ySEN8Z>t@?ksdr3m zQq2UQZ$lWg3z8-3{-7C-@4>kqy{pBxyU+Xm6#-e`t3BbAW28bYCH_?#e+-1-=!M>Q zQSzEiG88ZJgxf;z87p|DMe}E12tS<3vg4!g2+4X!v9;5xVoz{7?Q<1$q3THc=A`!f(Vw9?-j zc9XLtWd}`a7r*ydsK8p0qVc-?!hOASMnD2rY~MNmZ+28u-M-ugpCIEKnf}PaaP|Su zFAo=58WqD~DFw7%->()4Wlnbk<7&Km)tmnwRBkW~M^&T@rPt+84FswC&^Csj0NSp8Ja(-^cDTB$!=Y2hN+hlV$&P_?|)K3tlUcew+Rb+K`=4 zpgV|;`a3e08A#mC++LiZC2!l)PSw$Sj0>^_8*Fh0)lFJr_aF;1VQo@0s1c^ivF9LsJO-`=VDb%6H+hqcGkD%fSZX%C zG-p2bt2tQ)@EQcWtj#=xX+&yGF(Csl1Rf>$|2fAY{4)Vmm2!tM{V^qC2KIM7-*$zE zP985&&Txx55B;Z($4ZBm83m-Z9IkpKlsk@>&$Z3F`Vo~-#n4NIeWb(3p)Xo6MuRF}AwilVpa_KMg?&vXUl4M6+|nBZ$*bD8Ef#ZGRqY9;76l)>icDSj zVIR++6*5Hn<>)03$;-{IRe>R>dJA8=!J$G!)%1@*0&wX9c#_wLEFa(Uw^Molng)?2 zV^Z$S$nS^~7k80;SMVy?Jy6oV1iD4!14f?C{!Nt)cYNDE0zvh(XGx;%kY-SmWQ7C@4$*yqow@^(d1z-ijk|XbDDr62u z0;^$)KwIhjFW%clnp`Y##_lTBj)7IUx1)aY04J7q8U5#i(#VO!Dy+5F$O|tC8rGlr zQjsD{t+6&$f_Gjf?{x2_u~Lh*SVVrfkibpm$k&4gYWtj=KVhO%^~U7J0keYRNH1aH zk4$5t7)b(`sq5dafbImGsRE4*(R+Jrv4OQ~9}+lCy9zkL_@-NQ_$GX;o+xX$C;;13 zlYC`BN&b{pZ)@{?JoDg_kSIY-F)+{I-lapN*)m`DzldM1Zp8QVoXiUsDTQzmd(a0U zVBCr{2K1Fw0B7b5vZ6Ua1&*8gsjqY~kjYjdm!h8o=1IP;%*};(c%-u!{BM|TXqru< zwf(>8FyK|Cc4?VW3mrAm5!!65-_UmKVtb@r?e8lQ4sUxL{Ol>YxxQ9nZiAo+3rL<5 z9_Y|3tE9nD@xu^@G?#0W#KFDeY0j=ko_izi{as2&XzfJ46moOuvj*$hmJ}r#b|Aaq zWlwIE&=&f+=zEy#Dxo!V+Nloe+Rp98!Pb1egGM7`rb5~&+cgtO91+bmDX-EfwuLsL zQ|iC5a2&}R3?&IgcDOPrppNmM(}+ipRaztHYxfyBM#NS3PbFmezK8JWO+@&BSfo$d zldXU)4Q#$62@=U`h1Z+9L!m$?M_9#qUOI$f;%`$!SC;aJfxOX^xKByFO2dCP z6;XR7n=v5|s{gMRpr$d8*;=Y)vCC+!VdGGz>$9&Q6?F0W>7i^@ALAk*PA~4aAgO=(1o-ihsq1uN)ED%D=uL z%h&B^`>_4ZY>8{rp2DokCVECUQe*&YIU9Q8dRf_?Pa_soww%R$K0}h}N~YAX6WxK; z$FgfCAMp4x`Z*wws!!IwXW6<{QKELB8bTMt-ihjw<>tedu4XcNVU|3X2d!i?k?WCq zTK{(*xJIlkefzDy_;bvS4ag(Yh*IZ>_&5Es665@KWizm_3k+Y@ELx z`CrcNTM6`VyiOZk5tMhPt5??b^59eLPv>#p0F*H$%*ahGVck|9iPnwl3v#h$9d0)s>^$k0?bOrFaspVpi>w0Lsa5R5q0 z^mh-K!f4bu8?VEeS}MDhbG^>pYNkyA>DS>lF&BSos>VYD`*7kyKyNttJLO{V{e z0lYSuA}%^;QXE*k|DpbGrgBAGOezfozFpL0SiE0v%JEW3%-(pw$T`z&L&4>)yV6co z%A9Fmvv8qFIOoxd0niUmxwUX{26>cHR5 zQNeThVH*nb&v*kb?c4wrB@%MXG}!FFrN{R=p%l?Kvop%U#Xiz~5gwo)>fsmZUq%Qm?Ge$P>L&u!K;Uv7e=cjc6 znXAkvX4M1uXKB0z8WuL6I!Xm>aR3`@!aR2`0S4g=gVR zwUUHfkO-vve>yE9IBXwV{E~!;hI19_Yr@DKugD)?e=b#~!E(<@^hlD~h5OYdtQnm8 zAHDA+bjZ+vz^DYwqLnOI~YL^pQ zl6d$R^4d*FGDWrb6vyw{S&DJuMR=-?>x+2(SOAqf?(uln^K-b6frLnL-XkbqOsFo^ z?KkvKg|ECT1Ie?;35hUaz-cx}87b1vigznAhyoGUUnp|9b}ByT<4cdM7Hs(U?WuK#jKZXXx$(m?7RhA+mnj^HG}E z_^S1)CKZb%+!w;_*d?$@S}9dVR6su8X4NFi$qto;JbTH7^osw#sZ&huP#~EoSI)D& zg?%q>K=Iu?*|?l`NUUq+;**}U#imv3Yc}=nqa*qG`SV&ye34kJw;=jV@%R(8th(26 zJ>g*VrTXIzC7sLBs1#d`ISQa^qIb-KPthy;I2g6b-P+a`{;Kbie7MKmxQaiB&bnht z{7ba|J8XTPUfB&*y{T>}0lwaNnO%2|OI!P8Pw{eN@@>P98qTd)eSIq}RwuI`cgtl> z3>0kx)u``UH~anAv|70cLZ`>WHw+(Xf)k_zKd9(f%*z=(V->aap>T^aYIi(93loZF~lcdBD z%!Ub*9JZtK%SidS0kz>Z3>9TVI0L2*=KW=IQlXw#qry2~Qgy`8Wf@sMTqQi0EI)w%54V$K7dD^q(qrD7 zBHVqCm=~*hI1=uk5R_18Krs6&B6hf6jz+7fs5sRVCcSW3mm#_FmsEh;X?i+5m2qu~ z2&1k8&ISBx_Vz>#FlMmBM^$|dGiK0tN`c!+xy#d==_-i_`2;I|;^bu0vuS@s0Nu}$ z6>qu9U5%Eh5_-#Yk0u7ot`5ECzQ(lb_ED>qih2T-!*tNFFTA;F)ZP2}muPwqPNt*( z-p5i@jIPTrY_|4E(;GiGJ+A%MNhsma>Wm>AG%fflc;Hm!v40sM9a%VIZU@w8bPETA zu5~TuH|44z<*kzr{F?NQr-2prDgGOdL-ilGb9aFAPPhf9NcM0eXvpem!i|tRzP3X`d7B~-b6(V59j`D%tzTwDce??o5`wt z_)ch^-EiWWv-cU%JRNv&NTt$-z;j!zB!EOl7o=6Pq(;Y=CQ(ju?SEH3p!=Sg)0j`V zIp6*hY_$?F0JqDg$M1pM$_7YrR6>PM0}KhRxBZsB6no|H-dN8I`{FLIm9b_Iqfg;_ zuUyc(b|LS~rEcGH%>=f0RV=%Edr6*`b0BvTQlK32r+R6ugmJ=(=vuz{7_!U=Iv5A8 z;UwO2W6uq@vw(9Md@kn(DFJEIC_-<0y^HE^>h{1TA*y3<8IG`UVrfZRYdu?|uwj-vXHJ z9!x`OQOoCzEY_#Tel}+e;10*Lj%HUSWfn=DaLfgL`_6&f7kg-o9d5_Kw`1Scyl&cN zwkP=6{%i)g46l~N(5&^Xt*@Udm`p@_;F=(FD{T1w{Cz=9CbIDLD2{MI95{&t&2)Hw zG#V1Q2Dl~=XCOhKGH!fNwMt?iXYR2YTTyUY;Lxm*-;f zP_6m;lm0}L2@ri$5==UtB1dAZ`%jS=b8r>v^(HF*2*2iOTwF&-2gE{vbb`I0MxpFD ztAQX_PawiK?C#uK7e+sSCpkF8cK6B zT3B~-o<J8~*OesV-Img)33AJBOxKAwubO#jiqFw4Q!WpeO4IX7={>s=m$4%($E!hRO}^wG!@s1%gm# zDJyV2ooFD4z(ZX}EKd*L9q-QcGok_HQi%>x0d9ukk42b}kMUeQ0VR z*gKxOB}#rvNkL-WaS8;hPFzD2555aBEaLa?-zUIPlV#Z{w&mO6Mc1eJGm-_|7OeDj zPxiJi?_8ZyOn7LuVooJR2Mt~JFFj5Zr%a!&{>n!dI&G-N?lp>3etd7WQeyDP_hm2T zr>_I1A$$xsv+D${s|m!; z-aTlE_IS#f@>C;;lhT2x^-6{U?=~38uL6cZ^&7(dY$Y$pYZyCl*wjHB8 zjQ)Iw858@I7tbNbd?1GDgjqPWSo&bj9W_jQ`y4`)0m(_|o+$0&mpgq)8e{h>kmzkP zqyh*ylRo(iaHb5TAGbq2iJuF$G5ZXb>o#}%NNHj3BBJd{Jt2hgUGmc?Sz9Lmo;}`!e>&b_HG|J@(KYDvR2 z1FvINAmV{zjQkldV#?|~r_NT$LQ{HZgul10@31l4-ticb{ifj>G$ks7yf<$APYC3W zoEDJpHNlYchMPVVOnS)zIL-WSMRS`F01 z^ifEE8u-yk*z6-h<^tV&s&Y=F=<%upPaWJ6u#m0yTCMcg6NW)EHGbpj?$%gYDj3E@L>L)+^h*nOXn9r8WQZNJs|W`qzh(owUOv#%trE5k}-rNYC* zOX^LJIpvbcUj6reodJ{G@AlJbUb@!ESLhwex-I2wjaXH^Zn&oD^$t?ob9nSkeUTt} zz^7WLz5jUc9_;0`wVAOh$0glQ3hkQ}G;9BT{vn?bMKp1Tx17(nWj@mfw=?)=dGIF_R+k53~y`d)R9)B;`|dYxu^Cjs-eNP$kR6>J=Kb>4>N9chG(4Vj>U?lki zH|S27=c)8UQt2AS&CDWsHi}o}&so67dIBOOXc$O;4qWDiT~+d{_k{>9(y1VtS`7;G zj620$U^<#X-1&p{4_dRm?0qa8ItQmd_&d zB=4E=oqOdOgDWXq#%K!sYWGxilAh)51T~)08e98&`m_Z zM`D47^8@4MvtVWX?glA5g7)j@i2nu!T@cw6rJsLGI8q91nth0QdPEE<_T`x#Y25sn zs}%4Ep?J$H(k@dZ=Fx(Ej={A}NJOc}{UWQ+7pRqu})lU~9fAu`P zoZ-dIiunr&Z(C2Fq})?YmZ`gO=0j~;wcDe5h-_BKWvEO8qs~AIEa0My=5BBo4PR6w zBk+*g%*1Cx5V$>T-b@`5iJ<7>!vLQbUpHQ#dozC9<~n#W+=}2u+G;bJtK9W%gxEFxpY@@ z%-^Mr3(W=eMEcwCD(f=%yN>)-|GcU`v0-3I_5ic!O-9u8>%m`qsON9f?~A<-ouaXY zfKPfh&NL9+v!t8mB#>!``f6TaE|pw~?fez$-=$S=FNO+!Xu42rYNBBXCDA~Mux59e zZr`UAxJd;Z!cqG<#kNhN#SGgu-(Oa1x*}?`!e`}RE*xkyomH9Hq^dGn>M<( z!g#r=qx;7Cne!`QjNl)+Yk;^7pTaj?d2I2xRk6PI57jLrtpz&7m=w9c0_U=lP}*pZ ztmeZMv&r3;Pq1e3x?7-x!Z`6np2muEDCb!P#bbPh1s;%w@wec~PSNcnj>g(!S>eI} zyaEF?qFzwiQF&kRQf#?8vR3pW9dmNf#;~;^{n5$x({iR{2ATOFa6y)Qs1Alg$T3b8 z1EEW?M?!G1yDg^7P>_^yiR~6M#?zS}@GMH#ZAIWha5?}(1MW-c-Iqw%=VAtEd35pv zq%$;yA?pHhwf_s8nO{zM-x&e-tNSRj%3Sng6jQE^Wd0iLD2y*5t@p!jAddwwyudwS zX;$OZwg?TOGB@ZtU;kja#vFqbNiPm-5~Ar5C%a8+QARNX`;Idt%Ez2h=^brIP55uh zjb=@;n;^03=5j)1>4CGreA^x7 zpl++RB_4?peL>$Gm`nP;6)Y^^4<*O=&>skc7-q<}?P{}^+YJ>4zI4c$ieql_ME#Nr zS^@R>_fult-%r}N=B5d?-xxkP{C5B=`45U=?49B#QdNZP8%ER0!ImCy`D}`ahO>Ll ze|$_Sycx!#uZA@9ehuWnDt@VnQGE3=^KOzjH7A8+V82~JD>sCFV@es!FqXTqIca-M z8I}-tlz)z_u3;!CPG-?yyG*2Q%n@jBw8r*`p^Ij&@}bdL4=!7*(CWg#E^A7pL{gQJ zo{G(56mOoZ3fzfx+otO>YJUH9ZJn!LS+~aAVrF+Zj2wFV{+4u4lM56ac+!)GmMt6f zO3-jlHTHbQ7$o^?Ch+Y}OqB^${riKj4tZ}>VTmj$&(UB0T*EACIy)7c`cj)T*upqx zvLybI{=OB(sq*su7%OeXqJk}n=co%Js*OD>u~RyqwSyc;RP;r(CL&-krUBO#9P$of9tktW<4sq+s^tkDIDRL;`G3SdWm z1V}hhVg#sT|FLib(9kFKXK6;#;qxEujCiZgAYSuJA?D+Ex zz4_Hp#+93$?6-5vd1y+*-@yd{Exs)?N~Y#RB+i=P-_|vkz)=&PW8;;&ZRx zg5xccm0~RrOuzEM2mZY48m<<6zBWICA&jpP+CQ^iRW1T_Kj~2cpTAg9YZrv3?&XkG z)t)lf>40+n?Pm7f<7}V(!}De$s(NK~8gtSp%b(<>XXs6U5nEMh=squVn7nsg8Vaqj zBh^7R1vT?6f+Rw^$2Hn1_Q<YOUBP()G@$McxcMx#Ym)u_j?LV%Cgeu+UhcxgT~-$a2Qa~w%`eU z*s`Bmnsisf?Lb30k*14Xjxw2PTx;WBko(|8SIu1`^)@r`MpFP50=Ias^6qkQO>q~) zLa5#PS7uB(^0bmRsK}TVpPtRyP(bNkgAy%%6W`;e;av8sgddgi7^YveKMucMe5&$W zyZGR%_|xq+ci_mWhWTv1@({yzcwCHK6+`dS67}Qi^IU#~z{ZGV-siT)`U?`I9sr*XWz3TB89nF2lzUF0UgU zyb@m6y`)G0926u1^$J{y0w17U?t!S2yh0S0=eKD*t+HwtgiFJjfm@`u;vK~*J-VoM z9`Y8ncB>5D>cpGr?NulS_azF$3fD!h8YL!G+(L{F>nEhmJSQApQ_2H{RS25UZ{7Wl z*iTo8T}6v->f7(Oj~!oDeBhXi2Kpx#tWprY2UkpGrsKN`S9BuUYv3!NtgjadCX=NR zq&&L<7D$3W7tO26Erp(Z(SWew>7fUaOjJ=jT6PukVVkDQt-kI?gUZ*w2mML;_6U$2 zA9TeiJgRm`Bx9mjF-?+J^3L8?7GL6TS?)v&7t(4mDZ+kJR)0eGHFz}e&WF%qT&b8h z1TYg~xWet$XPQ|mpj8+2?TkSH)r_0GY%;7Qbz0Ha^6AFqV(4KDC>EyXwr?wrK8){y zcMqQ!XzKp0_CAzR$aydQdg^&5@azlz=jQ5VmQE31s-QhptV-w$G8L zA;>g4pfdjNdSPt{NdHk+%XKs%HfRr}(9wOlcecMJe?TUW6Ehxs{2J>miH;6B@(x3_ z(BS3uB&O&=5|D~doQkrZco>~A2wody-_pAM()6qxn4a3Pu3c@!+c!s@N1MQGXdF0- zKhvv;zVhX#j1HnXX>g3b$L3FN+^iF)GXig2P;16O-My@4z6|7YI^H8eX&%P^eP8m$ z)*J_0)G>54{%#fidt5(G%M5b<<2(xR9ln}?6&W*T>EC7o3ChVBC>!i$efyW0vk8?8 zlOA|YqP>)OC$+SmUQe<2n`qfC`hKF)ndEOB(L!kDCq4gf7=zv7Pwm%T*uf*xA=Tk& z>%mFo74F!Z``5VCDCkqQ;fqe}r)N{3d}*WZVXgQcNzkDm9~Ps>2jfW{rtjTL19J}4 z*SOU*$8KF^R#ZKVGSdiVO(7~p5hT%B@Mbvvw%%Yrz1n;*NMGy!nTomM5*hYLF-}zu zOw`PDq5YGwxnn;{M6f+;;Le-zY#0<@5%5G#>WLMsSfHk>kZMgHb}abK`XPOnNO{b6 zh6F?byqd4rtl1~CY4!VvnV`$dee=o#5gM>!q0?s9D1VpR%5|akI}HDgLD+#0Gb@U_ zu~UoFWWPAtRQpV`DANQ8mc)rWltQ}J+&tn%^h`pJ$+H5SI64~XM}O`Phq%%yf30u% z%Gv98Cjr^t-;6nqJ{Jigo@#=(izH?Q{c?V}L8>2dkOhV43y+Li_D^r$8J~Rkk?&E*6)0OGw8l#L(v6w?MKQL=# z;n`d*@-53Ep4Wjd>s#?Pn(ndGw_ErRTn#F46_4@j+W`p@{6(sc8y68a$lq%2Q2M+z zPmfT{m{OY{h!RC-1^({tWJ^(j&??>4ubMRGgwUIGlfxR$;ut8A>XjB+5G#aHw_2U- z6$yas0&2X1panzB+>nnMss)<1`ycCTNHL{+%rL&mJY`h%kIv{8j}1QBwm`K|;VnGh z2(=SoOno&S^d}l(Zxy!#vo8iwR%aF8zxCy7u73_S={dvFez7GV2|@Zd@*}n=fJv!f z2~UZ&bCXDYBvyib1hMe1*SXxVK9KC7&TvB$?Gq5b=7Uxy75 z9k}P@DD0b4*%vo=m-XIKZu~ww<9gbv_p`qC&3!zVJlTD1e(Sr*;55WkmhcSG5m zMg`4-=z?EL%Zoh)0yGgbo*Bz+*4=Z5$HXMB@^|%?5&a4M2^4Xbj0YHY$%5Gq*WFh@ zKcTw$k0Jl!1S}Em=k?&getD&3PsvU9YknRcKTNunj2zEIg66KxUKUShg$xVJ^_gcB zNpt>1nhc#z8*UpHS-w#u3*Pv~J7Tq$8caKWpyL3%o1PJ3L{^5XFkdK73d+=D$|2pEjgd;ow$Mh~|oW`_P_=;yP4TG|FLs4fAG8&wj2v zJ*>QVbTTg+zL&q(zP@!$E_@+Z>}___SN;hVnhkkUZ1l=#zUr0_BCNKKFuQZvfAWJ; zVpq7zFXDP-r_>sG%mNBb17<&Umx#mfY<9z zolA{T`BH_G7HJi}D7+u8WuaR7bQ#{35tT|4fVGgX8@0prv`U52L|dq0G&#dEf(4u-ioFEmzM10mm))~s#qHxkvtzcCd1a-PL&3It-eU9n#(ga@H~FEW zw7C~ggdNP90H2AQiIu2A{nT)*DrKR#(Cs)H3n8J~J2~KH3Aa?H@gKhCRcA35`^g|W z)=B((BXmYmszA;^>uxI?@yTMUN#8L zXH2wM4XLly{_f;dcd7SKh>c20KQu8X)1Q39rjxHh^AJ3gp44*ia5<_{>1=e0t#J$A!^94|a;HO@SUIQwZXQ7u(SC2KurikuU*c9-*S`EEmxFyl_*{KrhL z&IQ#@3uJT5z}NdtjWT%`DHo5Mea*I=+2B$tI7MT<7GF~BSaG^YYh`%NN^5{;;mygQ zs&wPsEMvnnHuufN=3m9%O&rf^D@ZDR>@q=UzkK@j^C#di!L=~L4L6a8JDCd=D0Fm~ zji!aNO7~V8_jNPlah22~ee~mq2=(N<8XgX(^i|Vh_&CkJGbXe*B9FxV+ zl)mxHEQ@nXvymzJb?<2H>!+a2ZXuDD2(geH&!ZQr)t{f%UKgqkVCeR9NmbB}*o$L3 zl)TVkoB9y-H}XQSSpfOicY=H=8k1&6Atdca3=dDe=oT?QrkkJMb>Z2LlkQ0_YNaae zn{bl{D;_Bg_u98z*Wdh=ShXLJ8t&p7F5`>)>ve*sOrRAa`P9d7aU71%i?!U$0=E!c z((o0T-Lg~F)}r?8iXe8}aT3v16(6J!z?aT5tqw=%ORK{EuXTWx3>dd0jPgS5~oxx)LX+Duw$OueJSz)E^4Ypij^tbcW&)ljMfy9ZfrKY zr~*4HDYtRatiXVXZ}&CycmH(6Ygnr}Rw9IfyHbAkm+FmOeQ~IyD*cn@*_&Gmpi6@9 z6K%`Lk69_hZJ|0jd?MZmz|g-C$Fcs{6^xMBaajT`Op z#~scA{0^TgoUM^p2n6&%G1@@erptCM4hCdKvOif~ow&jQn5fRYjd4A%<;hJCs2^I~ z`9f{Y@#+O70u)`BKR+uiB5CMva0WU8TS_l3 zGegHRyoZeoLiGv2k)_JeZaQF`6Z$F&mTBn$7mGv@MX4b4^M9L+o?3$#7%)PNW4T}m z%!0r=;vxAn?JJy z7^(fuY}ca-RV8!&bFv$B@dV8mx7DR!(8(ymvgG_J>A^^AHA_gC;6*$D8U-6U;Q@@4 zVC1YkT&R5t_uVyq(nAHV6F$F~<)D)6SUoQL1SjYuK$?59 z8BK;Oqci{kg}n#|=&exK Date: Sat, 9 Jun 2018 18:01:30 +0200 Subject: [PATCH 198/493] Update de_DE.lang (#1337) Someone mixed up dusk and dawn --- .../assets/bloodmagic/lang/de_DE.lang | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang index 926a5efa..7417685a 100644 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang @@ -26,8 +26,8 @@ item.bloodmagic.scribe.water.name=Elementar-Gravurwerkzeug: Wasser item.bloodmagic.scribe.fire.name=Elementar-Gravurwerkzeug: Feuer item.bloodmagic.scribe.earth.name=Elementar-Gravurwerkzeug: Erde item.bloodmagic.scribe.air.name=Elementar-Gravurwerkzeug: Luft -item.bloodmagic.scribe.dusk.name=Elementar-Gravurwerkzeug: Morgendämmerung -item.bloodmagic.scribe.dawn.name=Elementar-Gravurwerkzeug: Abenddämmerung +item.bloodmagic.scribe.dusk.name=Elementar-Gravurwerkzeug: Abenddämmerung +item.bloodmagic.scribe.dawn.name=Elementar-Gravurwerkzeug: Morgendämmerung item.bloodmagic.focus.weak.name=Telepositionsfokus item.bloodmagic.focus.enhanced.name=Verbesserter Telepositionsfokus @@ -105,8 +105,8 @@ item.bloodmagic.livingArmour.boots.name=Lebende Schuhe item.bloodmagic.altarMaker.name=Altarersteller item.bloodmagic.ritualDivinernormal.name=Ritualrute -item.bloodmagic.ritualDivinerdusk.name=Ritualrute [Morgendämmerung] -item.bloodmagic.ritualDivinerdawn.name=Ritualrute [Abenddämmerung] +item.bloodmagic.ritualDivinerdusk.name=Ritualrute [Abenddämmerung] +item.bloodmagic.ritualDivinerdawn.name=Ritualrute [Morgendämmerung] item.bloodmagic.arcaneAshes.name=Arkane Asche item.bloodmagic.upgradeTome.name=Thesis zur Verbesserung lebender Rüstung @@ -144,8 +144,8 @@ tile.bloodmagic.ritualStone.water.name=Wasserritualstein tile.bloodmagic.ritualStone.fire.name=Feuerritualstein tile.bloodmagic.ritualStone.earth.name=Erdritualstein tile.bloodmagic.ritualStone.air.name=Luftritualstein -tile.bloodmagic.ritualStone.dusk.name=Morgendämmerungsritualstein -tile.bloodmagic.ritualStone.dawn.name=Abenddämmerungsritualstein +tile.bloodmagic.ritualStone.dusk.name=Abenddämmerungsritualstein +tile.bloodmagic.ritualStone.dawn.name=Morgendämmerungsritualstein tile.bloodmagic.bloodstonebrick.large.name=Großer Blutsteinziegel tile.bloodmagic.bloodstonebrick.brick.name=Blutsteinziegel @@ -218,8 +218,8 @@ tooltip.bloodmagic.diviner.waterRune=Wasserrunen: %d tooltip.bloodmagic.diviner.airRune=Luftrunen: %d tooltip.bloodmagic.diviner.fireRune=Feuerrunen: %d tooltip.bloodmagic.diviner.earthRune=Erdrunen: %d -tooltip.bloodmagic.diviner.duskRune=Runen der Morgendämmerung: %d -tooltip.bloodmagic.diviner.dawnRune=Runen der Abenddämmerung: %d +tooltip.bloodmagic.diviner.duskRune=Runen der Abenddämmerung: %d +tooltip.bloodmagic.diviner.dawnRune=Runen der Morgendämmerung: %d tooltip.bloodmagic.diviner.totalRune=Runen insgesamt: %d tooltip.bloodmagic.diviner.extraInfo=Halte Shift für extra Info tooltip.bloodmagic.diviner.currentDirection=Richtung: %s @@ -260,7 +260,7 @@ ritual.bloodmagic.lavaRitual=Serenade des Nethers ritual.bloodmagic.greenGroveRitual=Ritual des grünen Hains ritual.bloodmagic.jumpRitual=Ritual des hohen Sprungs ritual.bloodmagic.wellOfSufferingRitual=Quelle des Leidens -ritual.bloodmagic.featheredKnifeRitual=Ritual der gefederten Klinge +ritual.bloodmagic.featheredKnifeRitual=Ritual der gefiederten Klinge ritual.bloodmagic.regenerationRitual=Ritual der Regeneration ritual.bloodmagic.harvestRitual=Ritual der Mondernte ritual.bloodmagic.magneticRitual=Ritual des Magnetismus From 8bec2f3872f2f1f5c0841d0093a7b3a6b13dfb64 Mon Sep 17 00:00:00 2001 From: "Urey. Xue" Date: Tue, 12 Jun 2018 21:49:24 -0700 Subject: [PATCH 199/493] Update zh_CN.lang of blood magic guide (#1327) * Update zh_CN.lang of blood magic guide * Clarification * Clarification on Laputa Shard * "Messagner" -> "Child" * More fix --- .../assets/bloodmagicguide/lang/zh_CN.lang | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang index e6c42342..5cb7ba38 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang @@ -19,7 +19,7 @@ guide.bloodmagic.page.alchemyArray=炼金法阵 # Categories guide.bloodmagic.category.architect=缔造者 guide.bloodmagic.category.ritual=仪å¼å¤§å¸ˆ -guide.bloodmagic.category.demon=æ¶é­”使者 +guide.bloodmagic.category.demon=æ¶é­”ä¹‹å­ guide.bloodmagic.category.spell=战法师 guide.bloodmagic.category.alchemy=炼金术士 @@ -50,6 +50,7 @@ guide.bloodmagic.entry.ritual.laying=é“ºè®¾ä»ªå¼ guide.bloodmagic.entry.ritual.timberman=ä¼æž—ä»ªå¼ guide.bloodmagic.entry.ritual.meteor=å æ˜Ÿæ ‡ä½ guide.bloodmagic.entry.ritual.downgrade=沉é‡çµé­‚çš„å¿æ‚” +guide.bloodmagic.entry.ritual.crystalSplit=结晶共鸣 # Ritual Master Entry Text guide.bloodmagic.entry.ritual.intro.info=晚上好，我就是马格斯·阿尔å¡çº³ã€‚在外人看æ¥æˆ‘有很多身份：盗贼ã€è‡ªè­¦å›¢ã€å·«å¸ˆã€æˆ˜å£«ã€åŸæ¸¸è¯—人ã€ç”šè‡³æ”¿æ²»å®¶ã€‚而现在，åªæœ‰å°‘数人清楚地知é“我的头衔——åªéœ€æåŠä¸€ä¸‹ï¼Œé‚£è‡†æƒ³ä¸­çš„残暴图景就å¯ä»¥ä»¤äººé—»é£Žä¸§èƒ†â€”—纵使这个说法有一åŠæ˜¯è¯¯å¯¼ï¼Œä½†è¿™ä¸ªè¯´æ³•æœ‰ä¸€åŠçš„确是真相。诚然，我说的便是作为èŒä¸šå­˜åœ¨çš„血法师。我的朋å‹ä¸€èˆ¬éƒ½ç›´å‘¼æˆ‘çš„å，而我的敌人一般称我为仪å¼å¤§å¸ˆã€‚\n\t/cut现在呢，我的学生们，为了让我把毕生所学传播给下一代有志者们，缠在我身边已有数月了。我一直在åšå®ˆç§˜å¯†ï¼Œä½†æ比略对此的评论更为精辟：“尽管你自己还看ä¸åˆ°ä½ è‡ªå·±çš„潜力，但ä¸è®ºæ˜¯åœ¨ä»€ä¹ˆé­”法领域中，那些已臻化境的大师们的故事总是对下一代人有好处的。然而，é‡çŽ°å¥‡è¿¹çš„细节其实并没有那么é‡è¦ã€‚若是没有对魔法能é‡çš„ç»å¯¹è‡ªä¿¡ï¼Œå³ä¾¿æ˜¯é‡‘沙，也ä¸è¿‡æ˜¯ä¸€å †ç¡«ç£ºç²‰è€Œå·²ã€‚â€å½“然你å¯ä»¥è®¤ä¸º/cutä»–å·²ç»è§¦ç¢°åˆ°äº†ç‚¼é‡‘术的真谛，但他毕竟是我的第一个学生，我有时候也会认真æ€è€ƒä»–的想法。\n\t所以呢，那些ä»åœ¨è‹¦è‹¦å¯»æ‰¾å‰è¿›çš„é“路的年轻血法师们，且å¬æˆ‘一言：血魔法的领域之广阔ä¸æ˜¯å¸¸äººå¯ä»¥ç†è§£çš„，若ä¸åŠ æ€è€ƒåœ°å‰è¿›ï¼Œå¾ˆå¿«ä½ å°±ä¼šé‡åˆ°ç“¶é¢ˆã€‚因此，请务必时常翻阅这本书——这本书上有我的魔法，åªè¦æˆ‘写下æ¥æ–°çš„内容，你们就能立刻看到。\n\t/cut诸ä½è¯·å。ä¸è¦ç´§å¼ ï¼Œè¯•ç€åŽ»æ„Ÿå—è€ä¸€è¾ˆè¡€æ³•å¸ˆçš„教诲。或许会比你讨价还价求到的东西还è¦æœ‰ç”¨ã€‚ @@ -81,6 +82,7 @@ guide.bloodmagic.entry.ritual.laying.info=å¾ˆå¤šæ—¶å€™ï¼Œè‡ªåŠ¨åŒ–ä»»åŠ¡éœ€è¦ guide.bloodmagic.entry.ritual.timberman.info=ç§äº†ä¸€å †æ ‘？想必你需è¦è¿™ä¸ªä»ªå¼ã€‚ä¼æž—仪å¼ä¼šå°†ä»ªå¼æŒæœ‰è€…çš„LP用æ¥é©±ä½¿ä¸€ä¸ªæ— å½¢çš„å¹½çµï¼Œä»¥ç ä¼é™„近的树木，并将ç ä¸‹æ¥çš„木头放入附近的箱å­é‡Œã€‚默认，它的工作范围是主仪å¼çŸ³å¾€ä¸Š30格，æ¯ä¸ªæ°´å¹³æ–¹å‘上å„延伸10格形æˆçš„长方体。æ¯ç æŽ‰ä¸€å—木头需è¦æ¶ˆè€—10LP。 guide.bloodmagic.entry.ritual.meteor.info=就目å‰æ¥è¯´ï¼Œè¿™ä¸ªä»ªå¼æ˜¯æ‰€æœ‰ä»ªå¼ä¸­æœ€å¼ºå¤§çš„仪å¼ä¹‹ä¸€ã€‚激活此仪å¼éœ€è¦æ¶ˆè€—一百万LP，并且还有一段冷å´æ—¶é—´ã€‚然而它的效果也å分强大——åªéœ€æä¾›åˆé€‚的祭å“，它就å¯ä»¥ä»Žå®‡å®™ä¸­å¬å”¤ä¸€é¢—陨石并直接砸å‘地é¢ã€‚诚然，这样一个大家伙会在地é¢ä¸Šé€ æˆå¤§çˆ†ç‚¸ï¼Œä½†å› ä¸ºå®ƒæ¥è‡ªå®‡å®™ä¸­ï¼Œæ‰€ä»¥å¯èƒ½ä¼šåŒ…å«å¤§é‡ç¨€æœ‰çŸ¿çŸ³ã€‚ \n\t/cutå¯ç”¨çš„祭å“包括é“å—ã€é‡‘å—和钻石。（事实上，å¯ç”¨çš„祭å“是å¯ä»¥è¢«æ•´åˆä½œè€…或用户控制的） guide.bloodmagic.entry.ritual.downgrade.info=为了获得更强大的力é‡ï¼Œä½ æˆ–许需è¦çŒ®ç¥­æŸç§ä¸œè¥¿ä½œä¸ºäº¤æ¢ã€‚而这“沉é‡çµé­‚çš„å¿æ‚”â€çš„任务正是如此——将一些物å“献祭给一个虚无缥缈的实体，你便å¯ä»¥ä»¥æŸçµæŠ¤ç”²çš„属性下é™ä¸ºä»£ä»·ï¼Œæ¥æ¢å–更多的å‡çº§ç‚¹æ•°ã€‚仪å¼è½æˆåŽï¼Œä½ éœ€è¦åœ¨æœ€é«˜çš„空白仪å¼çŸ³æŒ‚一个é¢æœä¸»ä»ªå¼çŸ³çš„物å“展示框，然åŽåœ¨è–„暮仪å¼çŸ³ä¸Šæ”¾ä¸€ä¸ªèƒ½è£…东西的方å—（例如箱å­ï¼‰ã€‚è¦çŒ®ç¥­çš„物å“需è¦æ”¾å…¥é‚£ä¸ªè£…东西的地方，而核心物å“/cut应挂入物å“展示框内。仪å¼æ¿€æ´»åŽï¼Œä½ ä¾¿å¯ä»¥è¹²åœ¨ä¸»ä»ªå¼çŸ³ä¸Šå¹¶èŽ·å¾—é™çº§åŽçš„物å“。\n\t举例，对于淬ç«é™çº§æ¥è¯´ï¼Œæ ¸å¿ƒç‰©å“是个水瓶，需è¦çŒ®ç¥­çš„物å“是龙æ¯ã€‚\n\t所有å¯ç”¨çš„é™çº§éƒ½å¯ä»¥é€šè¿‡JEI查询到——查询主仪å¼çŸ³çš„用途å³å¯ã€‚å¦å¤–，对于一个特定的é™çº§æ¥è¯´ï¼Œæ ¸å¿ƒç‰©å“是一定的，所以你也å¯ä»¥é€‰æ‹©æŸ¥è¯¢æŸä¸ªç‰©å“æ¥å®šä½æŸä¸ªé™çº§æ‰€éœ€çš„祭å“。 +guide.bloodmagic.entry.ritual.crystalSplit.info=晶化æ¶é­”æ„志一旦形æˆï¼Œå°±ä¸èƒ½å†é‡æ–°åˆ†è§£æˆå…¶ä»–类型的æ„志——至少我之å‰æ˜¯è¿™ä¹ˆè®¤ä¸ºçš„。“结晶共鸣â€ä»ªå¼å¯ä»¥åˆ©ç”¨å››å…ƒç´ ä»ªå¼çŸ³ï¼Œä»ŽåŽŸç”Ÿæ¶é­”æ„志中分离出å„ç§å…¶ä»–类型的æ¶é­”æ„志。\n\t首先è¦åœ¨ä¸»ä»ªå¼çŸ³ä¸Šæ–¹ä¸¤æ ¼å¤„放置原生æ„志晶簇。你å¯ä»¥åœ¨ä¸»ä»ªå¼çŸ³ä¸Šæ”¾ä¸€åº§ç»“晶å›ï¼Œç»“晶å›ä¸Šæ”¾ç½®æ¶é­”晶簇，这样就å¯ä»¥äº†ã€‚然åŽï¼Œç¡®ä¿å››ç§å…ƒç´ çš„仪å¼çŸ³ä¸Šä¸èƒ½æœ‰æ–¹å—/cuté®æŒ¡ï¼Œç¡®è®¤å®ŒåŽå°±å¯ä»¥ç­‰å¾…结晶生长了。\n\t晶簇长出五瓣åŽï¼Œè¿™ä¸ªä»ªå¼å°±ä¼šå°†å››ç“£æ™¶ç°‡åˆ†ç¦»å‡ºåŽ»ï¼Œæ­¤æ—¶å››å…ƒç´ ä»ªå¼çŸ³ä¸Šä¼šé•¿å‡ºè…蚀ã€åšæ¯…ã€æ¶æ„和破åå››ç§ç±»åž‹çš„æ¶é­”晶簇å„一瓣。若中间的原生晶簇ä»èƒ½ç»§ç»­ç”Ÿé•¿ï¼Œä¸”周围的四ç§å…¶ä»–类型的晶簇ä»ç„¶ä¿æŒå®Œæ•´ï¼Œé‚£ä¹ˆè¿™ä¸ªè¿‡ç¨‹å°±ä¼šæŒç»­ä¸‹åŽ»ã€‚\n\t这个过程的工作原ç†å¾ˆç®€å•ï¼Œ/cut原生æ„志晶簇有五瓣或者更多瓣的时候，仪å¼ä¼šæ”¶å‰²å…¶ä¸­çš„四瓣，转化为更无形的存在。然åŽï¼Œæ–°äº§ç”Ÿçš„æ„志就会被推出原生æ¶é­”晶簇的范围，迫使类型相近的æ„å¿—èšé›†åœ¨ä¸€èµ·ã€‚ä¸åŒç±»åž‹çš„æ„志最终会在仪å¼çŸ³ä¸Šé›†ç»“，而仪å¼çŸ³æœ¬èº«ä¹Ÿæ˜¯å¯ä¾›æŸç§éžåŽŸç”Ÿæ„志生长的基础。 # Architect Entries guide.bloodmagic.entry.architect.intro=å‰è¨€ @@ -134,11 +136,13 @@ guide.bloodmagic.entry.architect.augmentedCapacity=超容符文 guide.bloodmagic.entry.architect.charging=充能符文 guide.bloodmagic.entry.architect.acceleration=促进符文 +guide.bloodmagic.entry.architect.tier3=æµ·æ´‹ä¹‹ä¸‹çš„ä¸‰çº§ç¥­å› + # Architect Entry Texts guide.bloodmagic.entry.architect.intro.info=大家好，我å«æ比略。你或许已ç»å‘现这本书并ä¸å®Œæ•´äº†ï¼Œä½†å¾ˆä¸å¹¸ä½ æ˜¯å¯¹çš„。因为1.7.10->1.8.9->1.9.4åŠä»¥ä¸Šçš„更新，血魔法也å‘生了巨大的å˜åŒ–。因此，这本书ä¸å¾—ä¸é‡å†™ã€‚这本书的最终目标是一本研究笔记，或者说是一本真正的书，所以è·ç¦»è¿™æœ¬ä¹¦çœŸæ­£å®Œæˆè¿˜æœ‰ä¸€æ®µè·ç¦»ã€‚有鉴于此，我会定期填补这本书中的空白。当然了，一开始这本书里将全是读起æ¥å‘³åŒåš¼èœ¡çš„文字（嘛...肯定ä¸æ˜¯é‚£ç§å¼•äººå…¥èƒœçš„å­—/cut啦，好啦ä¸è¦åœ¨æ„细节），但这个情况会éšç€æ—¶é—´çš„推移而得到改善的，等待ç€ä½ çš„将会是一部血法师们的心路历程。\n\t但ä¸å¥½æ„æ€æˆ‘想我得赶紧é‡æ–°åˆ‡å…¥è§’色当中去了。*咳嗽声*\n\t我åæ比略，一å血法师，åŒæ—¶ä¹Ÿä»¥â€œç¼”造者â€çš„åå­—é—»å于世。这本书中包å«äº†æˆ‘对å为“çµé­‚网络â€çš„自然现象的研究，以åŠæˆ‘对血魔法师需/cutè¦é€‚应的一些设备的物ç†ç‰¹æ€§çš„æ述。从æ­å»ºå¼ºå¤§çš„血之祭å›çš„技艺，到为增强法力而进行的生命献祭的ç§ç§ç»†èŠ‚，å†åˆ°å„ç§æ‹¥æœ‰å¼ºå¤§åŠ›é‡çš„魔法符文和å°è®°ï¼Œæˆ‘ä¸æ–­åœ°å‘现新的魔法，ä¸æ–­åœ°æ€»ç»“并找到强化自己的全新方å¼ã€‚\n\tæ¥å§ï¼Œæ–°å…¥é—¨çš„魔法师们，全新的领域在等待ç€ä½ ï¼\n\t...啊马格斯说我有时候有点浮夸，但那åˆå¦‚何？ guide.bloodmagic.entry.architect.bloodaltar.info.1=血之祭å›ä¾¿æ˜¯è¡€é­”法中最核心的设备之一。它有两个主è¦ç”¨é€”：åˆæˆæŸäº›ç‰©å“，或将生命æºè´¨è½¬ç§»åˆ°å®ç ä¸­åŽ»ã€‚然而这两个用途都需è¦æ¶ˆè€—祭å›ä¸­çš„生命æºè´¨ã€‚自然地，也有两ç§è¡¥å……生命æºè´¨çš„æ–¹å¼ï¼šä»¥çŽ©å®¶çš„è¡€æ供生命æºè´¨ï¼Œæˆ–以别的动物或怪物的血æ供生命æºè´¨ã€‚ guide.bloodmagic.entry.architect.bloodaltar.info.2=你需è¦ä¸€æŠŠç‰ºç‰²åŒ•é¦–æ‰èƒ½å°†ä½ çš„血转化为生命æºè´¨å¹¶æ³¨å…¥ç¥­å›ä¸­ã€‚具体æ“作如下：首先，站在祭å›æ—；然åŽï¼Œä½¿ç”¨åŒ•é¦–伤害自己（å³å³å‡»ï¼‰ï¼Œä½ ä¼šæŸå¤±ä¸€é¢—心的生命值，祭å›ä¸­ä¼šå¤šå‡º 200 LP。LP 是生命æºè´¨çš„ å•ä½ï¼Œç§°ä¸ºç”Ÿå‘½ç‚¹æ•°ï¼ˆLife Point， 缩写 LP），用于刻画æŸç§ä»» 务需è¦æ¶ˆè€—的生命力——ä¸ï¼Œå’Œæ¸¸æˆçŽ‹ä¸ä¸€æ ·ã€‚默认，普通的血之祭å›å®¹é‡ä»…为一万。你还å¯ä»¥æŠŠç‰©å“放入祭å›ä¸­ï¼ˆå³å‡»å³å¯ï¼‰ï¼Œè‹¥å¦‚æ­¤åšï¼Œåˆé€‚çš„/cut物å“便会触å‘åˆæˆè¿›ç¨‹ã€‚\n\t祭å›åˆæˆä¸ä»…需è¦æ¶ˆè€— LP，还需è¦ä¸€å®šçš„层级。满足 这些æ¡ä»¶åŽï¼Œç¥­å›ä¾¿ä¼šå¼€å§‹è‡ªåŠ¨æŠ½å– LP 用于åˆæˆï¼Œå¹¶å¼€ 始散å‘红色粒å­æ•ˆæžœã€‚è‹¥åˆæˆè¿˜æœªå®Œæˆï¼Œä½†æ­¤æ—¶ LP 已被 抽干，红色的粒å­æ•ˆæžœä¼šè½¬ä¸ºç°è‰²ï¼Œåˆæˆè¿›åº¦ä¹Ÿä¼šå¼€å§‹å€’退，所以尽é‡é¿å…è¿™ç§æƒ…况的出现ï¼æœ€åŽè¿˜æœ‰ä¸€ç‚¹ï¼Œå¦‚果你放进祭å›é‡Œçš„东西是气血å®ç ï¼Œé‚£ä¹ˆå®ƒ 会散å‘紫色的粒å­æ•ˆæžœï¼Œè¡¨æ˜Žå®ƒåœ¨å‘æŸä¸ªå®ç ä¸­çŒè¾“ LP。\n\t事实上，祭å›ä¸­æœ‰ä¸‰ä¸ªå­˜å‚¨ LP 的容器：之å‰æ到的一万容积指的是其主容器；除此之外，祭å›è¿˜æœ‰è¾“入容器和输出容器å„一，容积å‡ä¸ºä¸»å®¹å™¨å®¹ç§¯çš„å分之一。默认，输入容器中的生命æºè´¨ä¼šä»¥æ¯ç§’ 20 LP 的速度转移至主容器中，而主容器中的生命æºè´¨ä¹Ÿä¼šä»¥åŒæ ·çš„速度转移到输出容器中。如此一æ¥ï¼Œè¾“入容器和输出/cut容器在祭å›ä¸­æ‰®æ¼”的便是缓冲区的角色——它们是用æ¥é™åˆ¶å°†ç”Ÿå‘½æºè´¨è¾“入祭å›ï¼Œå’Œä»Žç¥­å›ä¸­å°†ç”Ÿå‘½æºè´¨æŠ½å–出æ¥çš„速度的。 -guide.bloodmagic.entry.architect.ash.info=尽管奥术粉ç°å¹¶ä¸æ˜¯è¿™ä¸€å·çš„核心，但它确实贯穿了本å·æ到的很多é“å…·çš„åˆæˆä¹‹ä¸­ã€‚åˆæˆå¥¥æœ¯ç²‰ç°éœ€è¦ç”¨åˆ°ç‹±ç«ç†”炉和æ¶é­”æ„志，关于这些东西的细节å¯ä»¥å‚考《æ¶é­”使者》å·ã€‚简å•æ¥è¯´ï¼Œå®ƒæ˜¯ä¸€ç§äºŒå…ƒåˆæˆå·¥å…·ï¼šä½ éœ€è¦ä¸€ç§å¯å……当催化剂的å应试剂，以åŠæŸç§ç‰©å“作为次è¦åˆæˆæ料。\n\t一份奥术粉ç°å¯ä½¿ç”¨äºŒå次。对ç€åœ°é¢æˆ–者墙å£ä½¿ç”¨ä¾¿/cutå¯ç”»å‡ºä¸€ä¸ªåœ†å½¢çš„法阵（如果是墙å£ï¼Œä½ åªèƒ½åœ¨ä¸€ä¸ªæ–¹å‘上看到法阵）。然åŽï¼Œå¯¹æ³•é˜µä¸­å¤®ä½¿ç”¨åˆé€‚的催化剂å³å¯æ”¹å˜å…¶å½¢çŠ¶ï¼Œå½“然也会消耗催化剂（å³ï¼Œå³å‡»ä½¿ç”¨ï¼‰ã€‚如果法阵没有å˜å½¢ï¼Œé‚£ä¹ˆä½ è‚¯å®šæœ‰ä»€ä¹ˆåœ°æ–¹æžé”™äº†ã€‚\n\t在观察到法阵å˜å½¢åŽï¼Œä½ ä¾¿å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé€‚的次è¦ç‰©å“会å¯åŠ¨æ³•é˜µï¼Œå±Šæ—¶ä½ ä¼šçœ‹åˆ°æ³•é˜µå¼€å§‹æ—‹è½¬ï¼Œå¹¶å¼€å§‹äº§ç”Ÿå„ç§å˜åŒ–，具体å˜åŒ–éšæ³•/cut阵ä¸åŒè€Œä¸åŒâ€”—但正确å¯åŠ¨çš„法阵最终都会产生一ç§æ–°çš„物å“。\n\t所有用到奥术粉ç°çš„åˆæˆâ€”—我一般管这å«ç‚¼é‡‘阵列——都å¯ä»¥åœ¨JEI中查询到。注æ„，左侧的物å“一定是催化剂，而å³ä¾§çš„物å“一定是一个次è¦ç‰©å“。 +guide.bloodmagic.entry.architect.ash.info=尽管奥术粉ç°å¹¶ä¸æ˜¯è¿™ä¸€å·çš„核心，但它确实贯穿了本å·æ到的很多é“å…·çš„åˆæˆä¹‹ä¸­ã€‚åˆæˆå¥¥æœ¯ç²‰ç°éœ€è¦ç”¨åˆ°ç‹±ç«ç†”炉和æ¶é­”æ„志，关于这些东西的细节å¯ä»¥å‚考《æ¶é­”之å­ã€‹å·ã€‚简å•æ¥è¯´ï¼Œå®ƒæ˜¯ä¸€ç§äºŒå…ƒåˆæˆå·¥å…·ï¼šä½ éœ€è¦ä¸€ç§å¯å……当催化剂的å应试剂，以åŠæŸç§ç‰©å“作为次è¦åˆæˆæ料。\n\t一份奥术粉ç°å¯ä½¿ç”¨äºŒå次。对ç€åœ°é¢æˆ–者墙å£ä½¿ç”¨ä¾¿/cutå¯ç”»å‡ºä¸€ä¸ªåœ†å½¢çš„法阵（如果是墙å£ï¼Œä½ åªèƒ½åœ¨ä¸€ä¸ªæ–¹å‘上看到法阵）。然åŽï¼Œå¯¹æ³•é˜µä¸­å¤®ä½¿ç”¨åˆé€‚的催化剂å³å¯æ”¹å˜å…¶å½¢çŠ¶ï¼Œå½“然也会消耗催化剂（å³ï¼Œå³å‡»ä½¿ç”¨ï¼‰ã€‚如果法阵没有å˜å½¢ï¼Œé‚£ä¹ˆä½ è‚¯å®šæœ‰ä»€ä¹ˆåœ°æ–¹æžé”™äº†ã€‚\n\t在观察到法阵å˜å½¢åŽï¼Œä½ ä¾¿å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé€‚的次è¦ç‰©å“会å¯åŠ¨æ³•é˜µï¼Œå±Šæ—¶ä½ ä¼šçœ‹åˆ°æ³•é˜µå¼€å§‹æ—‹è½¬ï¼Œå¹¶å¼€å§‹äº§ç”Ÿå„ç§å˜åŒ–，具体å˜åŒ–éšæ³•/cut阵ä¸åŒè€Œä¸åŒâ€”—但正确å¯åŠ¨çš„法阵最终都会产生一ç§æ–°çš„物å“。\n\t所有用到奥术粉ç°çš„åˆæˆâ€”—我一般管这å«ç‚¼é‡‘阵列——都å¯ä»¥åœ¨JEI中查询到。注æ„，左侧的物å“一定是催化剂，而å³ä¾§çš„物å“一定是一个次è¦ç‰©å“。 guide.bloodmagic.entry.architect.divination.info=å åœå°è®°æ˜¯è¡€æ³•å¸ˆæœ€å¸¸ç”¨çš„工具之一，因为它能解决你很多麻烦，具体æ¥è¯´æ˜¯èƒ½ç»™ä½ ä¸€äº›å…³é”®æ•°æ®ã€‚它的åˆæˆä¹Ÿå¾ˆç®€å•ï¼šåªéœ€è¦åœ¨ç‚¼é‡‘阵列中以红石为催化剂，以石æ¿ä¸ºæ¬¡è¦ç‰©å“åˆæˆå³å¯ã€‚\n\t对血之祭å›ä½¿ç”¨æ­¤å°è®°ä¾¿å¯çœ‹åˆ°ç¥­å›ä¸»å®¹å™¨ä¸­çš„LPæ•°é‡ï¼Œä»¥åŠå®¹é‡ä¸Šé™ã€‚短时间内åå¤ä½¿ç”¨å¹¶ä¸ä¼šå¯¼è‡´åˆ·å±ï¼Œåªä¼šè¦†ç›–之å‰çš„æ示。\n\t/cut对ç€ç©ºæ°”使用此å°è®°çš„è¯ï¼Œåˆ™èƒ½çœ‹åˆ°ä½ çš„çµé­‚网络中的LPæ•°é‡ã€‚尽管这功能看上去很普通，但你以åŽå°±ä¼šå‘现，你一刻也ä¸æƒ³è®©è¿™çŽ©æ„离手。 guide.bloodmagic.entry.architect.soulnetwork.info=çµé­‚网络（Soul Network，缩写 SN）是指玩家和å„ç§ç‰©å“以 åŠç»“构之间的çµé­‚上的链接。éšç€è¡€æ³•å¸ˆèƒ½åŠ›çš„æå‡ï¼Œçµé­‚网络的强度也会éšä¹‹æ高。就存在æ¥è¯´ï¼Œå®ƒä»¬æ˜¯çµé­‚织æˆçš„一张无形的网，但最强大的血魔法师们是å¯ä»¥çœ‹åˆ°å…¶ç‰©ç†çš„具现的。然而，时至今日，ä»æ— äººå¯è¾¾æ­¤åŒ–境...\n\t在游æˆä¸­ï¼Œç½‘络是直接与玩家绑定在一å—的。玩家所在的世界早已记录下了这一切——/cutè¿™æ„味ç€ï¼ŒçŽ©å®¶çš„ LP 并éžæ˜¯ 记录在æŸé¢—气血å®ç ä¸­ï¼Œè€Œæ˜¯è¢«ä¸–界记录ç€ï¼›æ¯ä¸ªçŽ©å®¶ä¹‹é—´çš„网络互相独立，互ä¸å½±å“。\n\t绑定的过程通常在第一次使用æŸä¸ªç‰©å“时就已ç»å®Œæˆäº†ã€‚就目å‰çš„科技æ¥è¯´ï¼Œä¸€æ—¦ç»‘定，å³ä¾¿æ˜¯ç‰©å“的主人也无法解除。需è¦æ¶ˆè€—LP的物å“会直接消耗其主人çµé­‚网络中的LP。但，如果主人的çµé­‚网络中没有足够的 LP，它会从 当å‰ä½¿ç”¨è€…，而ä¸æ˜¯å…¶ä¸»äººï¼Œçš„身上抽å–生命值以填补空缺。因此，在快没有LP的时候è¦å°å¿ƒâ€”—因为这通常会致人于死地。 guide.bloodmagic.entry.architect.weakorb.info.1=没了魔法æ¥æºçš„魔法师和咸鱼有什么区别？气血å®ç ä¾¿æ˜¯è¿™æ ·ä¸€ä¸ªé­”法æºï¼šå®ƒå¯ä»¥å°†ç‰©ç†å½¢å¼çš„生命转化æˆLP并输入到其主人的çµé­‚网络中去。它本身并éžç”µæ± ï¼Œç›¸å它倒åƒæ˜¯ä¸€æ ¹å¯¼ç®¡ï¼Œå¯å°†ç”Ÿå‘½åŠ›è½¬åŒ–æˆè¡€é­”法师需è¦çš„魔法。 @@ -190,6 +194,8 @@ guide.bloodmagic.entry.architect.augmentedCapacity.info=和增容符文类似， guide.bloodmagic.entry.architect.charging.info=有那么一些东西对于åˆæˆå¾ˆæœ‰å¸®åŠ©ï¼Œè€Œè¿™å……能符文便是其中之一：它å¯ä»¥å¸æ”¶ LP，并将 其转化为“充能点数â€ï¼Œå…·ä½“æ•°é‡å¯ç”¨è§è§£å°è®°çœ‹åˆ°ã€‚若是åˆæˆæŸäº›ç‰©å“正好需è¦ä¸€å®šé‡çš„充能点数，那么这充能符文就å¯ä»¥ä»¥æ¶ˆè€—充能点数为代价，将物å“立刻åˆæˆå‡ºæ¥ã€‚若没有足够的充能点数，它就åªä¼šæŒ‰ä¸€æ¯”一的比例直接将充能点数转化为 LP 以加速 å…¶åˆæˆã€‚\n\t/cut血之祭å›æœ€å¤šå¯å­˜å‚¨çš„充能点数数é‡æ˜¯å……能符文的数é‡ä¹˜ä»¥ç¥­å›çš„容积，其中容积需è¦è‡³å°‘为两万æ‰æœ‰æ•ˆæžœã€‚血之祭å›å……能的速度也是和充能符文数é‡ä»¥åŠå…¶æœ¬èº«çš„速度æˆæ­£æ¯”的（å³ï¼Œå……能速度=符文数é‡*祭å›æœ¬èº«åˆæˆé€Ÿåº¦ï¼‰ï¼Œæ¯ä¸€ç§’å®ƒéƒ½ä¼šå°†ä¸€å®šé‡ LP 转化为充能点数。所以，如果你的祭å›ä¸­æœ‰è¿™å—符文，åˆç†çš„设计将会使你事åŠåŠŸå€ã€‚ guide.bloodmagic.entry.architect.acceleration.info=和大多数符文ä¸åŒï¼Œä¿ƒè¿›ç¬¦æ–‡éœ€è¦å’Œåˆ«çš„符文æ­é…使用，而且它的效果ä¸æ˜¯æ— é™åˆ¶å¢žé•¿çš„。这个符文的效果是，它å¯ä»¥è®©æŸäº›ç¬¦æ–‡çš„工作频率å˜é«˜ï¼Œæ¯”如说，转ä½ç¬¦æ–‡å’Œå……能符文。具体æ¥è¯´ï¼Œæ¯æœ‰ä¸€ä¸ªè¿™ä¸ªç¬¦æ–‡ï¼Œè·ç¦»ä¸‹ä¸€æ¬¡å·¥ä½œçš„等待时间就å‡ä¸€åˆ»ã€‚æ¢è¨€ä¹‹ï¼šå¦‚果有10å—促进符文，转ä½ç¬¦æ–‡ä¼šæ¯10刻就转移一次液体，而默认值å´æ˜¯æ¯20刻。\n\t显然，你的祭å›ä¸­åªå¯èƒ½æœ‰19/cutå—促进符文——在这ç§æƒ…况下，转ä½ç¬¦æ–‡å’Œå……能符文就会一刻ä¸åœåœ°å·¥ä½œã€‚éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸å¥½ï¼ +guide.bloodmagic.entry.architect.tier3.info=众所周知，三级祭å›çš„结构中，四角的柱å­é¡¶éƒ¨éœ€è¦å››å—æ¥è‡ªä¸‹ç•Œçš„è§çŸ³ã€‚但有一个鲜为人知的事实：这四å—è§çŸ³å¯ä»¥ç”¨æµ·æ™¶ç¯ä»£æ›¿ã€‚如果地狱对你æ¥è¯´å¤ªè¿‡é¥è¿œï¼Œä½†ä½ å·²ç»æ‰¾åˆ°äº†æµ·æ´‹ç¥žæ®¿ï¼Œä½ å¯ä»¥é€šè¿‡è¿™ä¸ªæ–¹å¼æ¥æŽ¨è¿›ä½ çš„血魔法进程。 + # Demon Kin Entries guide.bloodmagic.entry.demon.intro=è´æ‹‰Â·æµ·æ³Šæ© guide.bloodmagic.entry.demon.snare=æ¶é­”æ„志与投网 @@ -209,7 +215,7 @@ guide.bloodmagic.entry.demon.pylon=æ¶é­”导能塔 guide.bloodmagic.entry.demon.gauge=çµåŸŸæµ‹é‡ä»ª # Demon Kin Entry Texts -guide.bloodmagic.entry.demon.intro.info=我的åå­—å«è´æ‹‰Â·æµ·æ³Šæ©ï¼Œä»¥æ¶é­”使者的身份被知晓。数个月å‰æˆ‘的家乡被一群æ¶é­”侵袭，其他æ‘民全部被æ€ï¼Œæˆ¿å±‹å…¨è¢«ç ´å。我无法记起袭击时的多少细节，除了我所认识的æ¯ä¸€ä¸ªï¼Œä¼´éšç€ç—›è‹¦çš„惨å«è€Œå‰å¾€ä¸€ä¸ªæ›´ç¾Žå¥½çš„世界的人们。庆幸那些æ¶é­”没有å¬åˆ°ï¼Œé‚£åœ¨ä¸å®¹æ˜“察觉的教堂的地下室里，ç•ç¼©äºŽæžœç¯®ä¸‹çš„我ç»æœ›åœ°é¿å…ç€è‡ªå·±çš„å°–å«å£°åŠ å…¥ä¼—人的åˆå£°ã€‚\n\t/cutå¯æ€•çš„瞬间，在我ä¸æ…Žæ’žå€’å ‚çš„ç†é¦™ç¥­å›æ—¶ï¼Œä¸€åªæ¶é­”çªç„¶é—¯å…¥åœ£æ‰€ï¼Œæˆ–许是这圣地的原由åˆé•‡é™ä¸‹æ¥ã€‚这是åªä½“型庞大的四足怪物，弯曲的ç ç‰™å€’悬在çªå‡ºçš„嘴上，唾液滴在带有锯齿的剑状爪å­ã€‚它环顾了四周，我å‘誓有那么一会它的眼ç›å’Œæˆ‘对上了，但之åŽå®ƒå°±è¿™ä¹ˆç¦»å¼€è¿™é‡Œï¼Œä»¿ä½›å®Œå…¨æ²¡æœ‰çœ‹åˆ°æˆ–者å¬åˆ°ä»€ä¹ˆã€‚之åŽå‘生的事记忆全都模糊ä¸æ¸…。\n\t/cut直到第二天æ‰æœ‰äººç»è¿‡çœ‹åˆ°è¿™ä¸€åˆ‡ã€‚这一商队看到远处的浓烟，决定绕一大段路好é¿å¼€è¿™äº›æ¶é­”。商队中许多人觉得我独自一人毫å‘æ— æŸåœ°ç”Ÿè¿˜å…´è®¸æ˜¯ä¸ªå兆头，有些甚至ä¸æ„¿å¤šçœ‹æˆ‘一眼。但有一对兄弟åŒæƒ…我的é­é‡ï¼Œå¹¶å°½åŠ›è¯´æœå•†é˜Ÿå…¶ä»–æˆå‘˜ä¹Ÿå¸¦ä¸Šæˆ‘。我å–掉了女祭å¸ä¹‹ä»—与一æ¡ç›’å¼æŒ‚å ï¼Œè—‰æ­¤æ¢åˆ°äº†è·Ÿç€å‰å¾€ä¸€ä¸ªè¿œç¦»æ¶é­”ç ´å路径上的一个安全æ‘庄的许å¯ã€‚ +guide.bloodmagic.entry.demon.intro.info=我的åå­—å«è´æ‹‰Â·æµ·æ³Šæ©ï¼Œä»¥æ¶é­”之å­çš„身份为人知晓。数个月å‰æˆ‘的家乡被一群æ¶é­”侵袭，其他æ‘民全部被æ€ï¼Œæˆ¿å±‹å…¨è¢«ç ´å。我无法记起袭击时的多少细节，除了我所认识的æ¯ä¸€ä¸ªï¼Œä¼´éšç€ç—›è‹¦çš„惨å«è€Œå‰å¾€ä¸€ä¸ªæ›´ç¾Žå¥½çš„世界的人们。庆幸那些æ¶é­”没有å¬åˆ°ï¼Œé‚£åœ¨ä¸å®¹æ˜“察觉的教堂的地下室里，ç•ç¼©äºŽæžœç¯®ä¸‹çš„我ç»æœ›åœ°é¿å…ç€è‡ªå·±çš„å°–å«å£°åŠ å…¥ä¼—人的åˆå£°ã€‚\n\t/cutå¯æ€•çš„瞬间，在我ä¸æ…Žæ’žå€’å ‚çš„ç†é¦™ç¥­å›æ—¶ï¼Œä¸€åªæ¶é­”çªç„¶é—¯å…¥åœ£æ‰€ï¼Œæˆ–许是这圣地的原由åˆé•‡é™ä¸‹æ¥ã€‚这是åªä½“型庞大的四足怪物，弯曲的ç ç‰™å€’悬在çªå‡ºçš„嘴上，唾液滴在带有锯齿的剑状爪å­ã€‚它环顾了四周，我å‘誓有那么一会它的眼ç›å’Œæˆ‘对上了，但之åŽå®ƒå°±è¿™ä¹ˆç¦»å¼€è¿™é‡Œï¼Œä»¿ä½›å®Œå…¨æ²¡æœ‰çœ‹åˆ°æˆ–者å¬åˆ°ä»€ä¹ˆã€‚之åŽå‘生的事记忆全都模糊ä¸æ¸…。\n\t/cut直到第二天æ‰æœ‰äººç»è¿‡çœ‹åˆ°è¿™ä¸€åˆ‡ã€‚这一商队看到远处的浓烟，决定绕一大段路好é¿å¼€è¿™äº›æ¶é­”。商队中许多人觉得我独自一人毫å‘æ— æŸåœ°ç”Ÿè¿˜å…´è®¸æ˜¯ä¸ªå兆头，有些甚至ä¸æ„¿å¤šçœ‹æˆ‘一眼。但有一对兄弟åŒæƒ…我的é­é‡ï¼Œå¹¶å°½åŠ›è¯´æœå•†é˜Ÿå…¶ä»–æˆå‘˜ä¹Ÿå¸¦ä¸Šæˆ‘。我å–掉了女祭å¸ä¹‹ä»—与一æ¡ç›’å¼æŒ‚å ï¼Œè—‰æ­¤æ¢åˆ°äº†è·Ÿç€å‰å¾€ä¸€ä¸ªè¿œç¦»æ¶é­”ç ´å路径上的一个安全æ‘庄的许å¯ã€‚ guide.bloodmagic.entry.demon.snare.info.1=曾有一天，马格斯曾对我讲述é“，世间生çµçš†æœ‰çµé­‚：人类，鸡，羊，甚至是爬行者也存在这ç§ç»™äºˆèº¯ä½“生之æ„志的生命力é‡ã€‚似乎马格斯早已在这方é¢åšè¿‡å¤§é‡å®žéªŒï¼Œç”šè‡³æœ‰é—»ä¸€ä¸ªå¼ºå¤§çš„法师，å¯ä»¥å°†èŽ·å–这些çµé­‚并注入一个空的躯体，比如僵尸。但这也让我感到好奇：如果僵尸与骷髅并ä¸æ‹¥æœ‰çµé­‚，它们如何拥有这生的æ„志？是什么，给予他们生气，使他们会去追æ•å¹¶æ€å®³ç”Ÿçµï¼Ÿ\n\t/cutæ¯æ¯é’»ç ”最终还是回到了æ„志的问题上。任何“活物â€éƒ½å¿…须拥有使之生存下去的æ„志，但这ä¸æ„味ç€é‚£å¿…须是它们自己的。当我把这个想法告诉马格斯的时候他考虑了一会，接ç€æ‹¿å‡ºä¸€ä¸ªé»‘æ¿å’Œç²‰ç¬”（从哪？è°çŸ¥é“呢），开始速写并注上一些关于其他形å¼é­”法的注解。“在神秘学中，â€ä»–画出一åªç¨»è‰äººçš„å½¢æ€å¹¶è¯´é“，“分é…于执行许多简å•æ“作的傀儡被赋予了生气。它们活ç€ï¼Œå‘¼å¸ç€ï¼Œç”šè‡³å¯ä»¥æ­»äºŽä¸/cutå†éœ€è¦å®ƒä»¬çš„主人。几个世纪以æ¥ï¼Œä¼´éšç€ç¥žç§˜å­¦çš„进化，这门艺术已ç»æœ‰è¿‡æ•°ä¸ªç‰ˆæœ¬ï¼Œæ³•å¸ˆä¼šå°†ä»–们的æ„志注入那无生命的创造物中，给他们带æ¥ç”Ÿæ°”。\n\t“那么，è´æ‹‰ï¼Œå‚€å„¡æ˜¯å¦‚何è¿ä½œçš„呢：通过æ„å¿—çš„çŒè¾“。â€\n\t所以如果å¯ä»¥é€šè¿‡ä»–人将其æ„志注入一个空壳å¯ä»¥ä½¿å‚€å„¡èŽ·å¾—生命，那么就有å¯èƒ½æœ‰ä»€ä¹ˆæŠŠä»–们的æ„志注入亡者/cut的躯体，使得有了僵尸和骷髅的存在。想到这我打了个哆嗦，脑中闪过故乡的é­é‡ã€‚åªæœ‰æ¶é­”会åšåˆ°è¿™ä¹ˆæ®‹å¿çš„事。但è¦æ£€éªŒè¿™ä¸ªå‡è®¾ï¼Œæˆ‘需è¦æ›´å¤šè¯æ®ã€‚ guide.bloodmagic.entry.demon.snare.info.2=在马格斯的指引，和æ比略百忙之中抽出时间为我æ供的帮助下，我用é“ã€çº¿å’Œä¸€ç‚¹çº¢çŸ³ä¾¿åšå‡ºäº†åŽŸå§‹æŠ•ç½‘。身兼神秘使的æ比略说这玩æ„å¯ä»¥åˆ‡æ–­æŽ§åˆ¶ç”Ÿç‰©çš„æ„志。“我拿这玩æ„在傀儡上瞎æžâ€ï¼Œä»–带ç€å¾®ç¬‘这样说é“。我们都知é“结果是什么样的。\n\t“红石似乎切断了我的æ„志和傀儡之间的è”系。ç†è®ºä¸Šæ¥è¯´ï¼Œå¦‚果僵尸和骷髅身上也有æ„志，那这投网也å¯ä»¥åˆ‡æ–­ã€‚â€\n\t/cut他说我åªéœ€è¦çž„准目标把投网丢过去就å¯ä»¥â€”—如果å¥æ•ˆï¼Œæˆ‘就能在目标生物上看到一些白色的颗粒。“然åŽä½ éœ€è¦æŠŠé‚£ä¸ªå¯æ€œçš„目标æ€æ­»æ‰èƒ½çœ‹åˆ°çœŸç›¸ã€‚但记ä½ï¼Œå¤§æ¦‚åªæœ‰å››åˆ†ä¹‹ä¸€çš„投网会对目标有效果。所以记得多备一些ï¼â€\n\t我制作了å六个投网，然åŽæˆ‘选择在深夜出å‘。事实上，这项工作相当棘手：è¦åŒæ—¶è¿½è¸ªå‡ ä¸ªåƒµå°¸ï¼Œè¿˜è¦é—ªé¿å®ƒä»¬çš„é‡å‡»ï¼Œè¿˜è¦çž„准它们丢出投网。/cut当我看到白色的颗粒时，我迅速将僵尸们悉数斩æ€ï¼Œå¹¶æ¸…点了它们留下的物å“。沙地上一些è“色的粘稠液体å¸å¼•äº†æˆ‘的注æ„。我æ¡èµ·æ¥çœ‹äº†ä¸€ä¸‹ï¼Œè¿™ä¼¼ä¹Žæ˜¯ä¸€ç§è¶…凡脱俗的存在...在快速收集好样本åŽæˆ‘决定先返回å†ä½œè¿›ä¸€æ­¥ç ”究。\n\tæ¯ä¸€ä»½æ”¶é›†åˆ°çš„“æ¶é­”æ„å¿—â€çš„形状和大å°éƒ½ä¸å°½ç›¸åŒï¼Œä¼¼ä¹Žå–决于它们的æ¥æºã€‚抛开å•ä½ä¸è°ˆï¼Œåªåšç²—略的定/cuté‡åˆ†æžçš„è¯ï¼Œå®ƒä»¬çš„å“è´¨å¯ä»¥æŒ‰0到5æ¥åˆ’分。我并ä¸æ˜¯å¾ˆæ¸…楚这些物质å¯ä»¥ç”¨æ¥å¹²ä»€ä¹ˆï¼Œä½†æ¯«æ— ç–‘问它们引起了我的注æ„。我也ä¸æ˜¯å¾ˆæ¸…楚这究竟是æ¶é­”çš„å°è®°ï¼ŒæŠ‘或仅是它们身上掉è½çš„æŸç§æ™¶ä½“。我需è¦è¿›ä¸€æ­¥çš„研究。 guide.bloodmagic.entry.demon.forge.info.1=我已在æ¶é­”æ„志上投入了数星期的时间。虽然有所进展，但情况ä¾æ—§æ—¶å¥½æ—¶å。但有一天，æ比略问我能å¦å€Ÿç”¨ä¸€ç‚¹æ¶é­”æ„å¿—æ¥åšå®žéªŒï¼›ä»–解释说，这很有å¯èƒ½æ˜¯ä»–一直在寻找的新一代血之祭å›çš„æ料——马格斯原本的祭å›å·²ç»ç ´æ—§ä¸å ªï¼Œä½†æŒ‰å¤æ³•åˆ¶ä½œçš„祭å›å´æ€Žä¹ˆä¹Ÿæ— æ³•ä½¿ç”¨...总而言之，他觉得我能帮上忙。\n\t事实è¯æ˜Žä»–是对的。我查阅了很多讨论“等价交æ¢â€ä»¥åŠ/cut物质嬗å˜çš„炼金术书ç±ï¼›åŒæ—¶æˆ‘还咨询了一些途ç»æˆ‘们这里的炼金术师，他们也慷慨地给了我一些解构物质和能é‡çš„方法，以便进行深入研究。（啊，我必须承认我å分喜欢那些炼金术师的暗紫色盔甲——区区看一眼就会让人感觉è¦è¢«ä¸€ä¸ªè´¨é‡å·¨å¤§çš„东西拉过去一样。啊我没在说æ比略ï¼ï¼‰æˆ‘利用仅有的简易炼金阵列以åŠæžå°‘é‡æ ·æœ¬ä¾¿æˆåŠŸä»Žæ¶é­”æ„志中抽å–到了能é‡ã€‚剩下的事情就åªæœ‰åˆé€‚的构造了。 @@ -225,7 +231,7 @@ guide.bloodmagic.entry.demon.sentientGem.info.1=几天åŽï¼Œé©¬æ ¼æ–¯å¼ºåˆ¶æ‰§ guide.bloodmagic.entry.demon.sentientGem.info.2=感知护甲å®çŸ³æ˜¯å—å¯ä»¥è®©ä½ ç©¿å¸æ„ŸçŸ¥æŠ¤ç”²çš„工具。确ä¿èº«ä¸Šæœ‰16点æ¶é­”æ„志，使用这å—å®çŸ³ï¼ˆå³å‡»ï¼‰ï¼Œä¾¿ä¼šå°†ä½ èº«ä¸Šçš„护甲悉数替æ¢æˆä¸€å¥—全新的感知护甲，åŒæ—¶è¿˜ä¼šç»§æ‰¿ä½ æœ¬æ¥æŠ¤ç”²ä¸Šçš„附魔效果；å†æ¬¡ä½¿ç”¨è¿™å—å®çŸ³å°±å¯ä»¥è„±ä¸‹æ„ŸçŸ¥æŠ¤ç”²å¹¶æ¢å›žä½ æœ¬æ¥çš„护甲。当然，å³ä¾¿ä½ èº«ä¸Šæ²¡æœ‰æŠ¤ç”²ï¼Œè¿™å—å®çŸ³ä¹Ÿæ˜¯å¯ä»¥ç”¨çš„。\n\t感知护甲的效果一般与普通é“护甲无异，除此之外没有别/cut的效果。但，和感知工具一样，当你身上æŒæœ‰æ¶é­”æ„志时，感知护甲的ä¿æŠ¤èƒ½åŠ›å°±ä¼šä¸Šå‡ï¼Œä¸Šå‡å¹…度与æ„å¿—æ•°é‡æˆæ­£æ¯”。也正是因为此，当你身上有海é‡æ¶é­”æ„志时它的ä¿æŠ¤èƒ½åŠ›å°±ä¼šå˜å¾—å分强大。但有一点需è¦æ³¨æ„，就是你æ¯å—到一次伤害，都会消耗地狱魂石中的æ¶é­”æ„志，如果æ„å¿—æ•°é‡å¤ªä½Žï¼Œæ„ŸçŸ¥æŠ¤ç”²å°±å¯èƒ½ä¼šè¢«æ‰“回原形。说ä¸å®šæ˜¯ä¸ªå¼±ç‚¹å‘¢ï¼ guide.bloodmagic.entry.demon.routing.info=血魔法的物å“ä¼ é€æ˜¯ä»¥æ¶é­”æ„志编织æˆçš„网的形å¼å‡ºçŽ°çš„，整张网构æˆäº†ç‰©å“传输的通路，连接ç€æ¯ä¸€ä¸ªå‚¨å­˜ç‚¹ã€‚让我æ¥å…ˆè®²è§£ä¸€ä¸‹æ¯ä¸€ä¸ªç‰©å“都是干什么的。\n\tæ¯ä¸€ä¸ªè·¯ç”±ç³»ç»Ÿéƒ½æœ‰ä¸€ä¸ªä¸»æŽ§è·¯ç”±èŠ‚点，相当于整个系统的中枢。输入节点用于将物å“输入路由网络，输出节点将物å“从网络中æå–出æ¥ï¼Œè€Œæ ‡å‡†çš„路由节点没有任何特殊功能。\n\t/cut网络的æ­å»ºæ–¹æ³•å¦‚下：首先，你需è¦åœ¨æ½œè¡Œæ—¶æ‰‹æŒèŠ‚点连接工具å³å‡»ä¸€ä¸ªèŠ‚点，然åŽä»¥åŒæ ·çš„方法å³å‡»å¦ä¸€ä¸ªä½ æƒ³ä¸Žä¹‹è¿žæŽ¥çš„节点。åªè¦ä¸¤ä¸ªèŠ‚点之间能找到æŸç§é€šè·¯ï¼ŒæŠ‘或都连接在主节点上，它们就å¯ä»¥äº’相“通信â€ã€‚\n\t物å“路由第一原则：物å“总是从最近的输入节点进入网络，从最近的输出节点离开网络。你需è¦ç­›é€‰å™¨æ¥é™åˆ¶ç‰©å“çš„æµå‘。在节点的æ“作界é¢/cut上有一个按钮å¯ä»¥è®©ä½ è¿›è¡Œè¿‡æ»¤è®¾ç½®ï¼Œå¯ä»¥ç²¾ç¡®åˆ°é¢ï¼ˆç•Œé¢ä¸­çš„N指北方，以此类推）。最左边的格å­è¿˜å¯ä»¥æŒ‡å®šç‰©å“æ•°é‡å’Œç§ç±»ã€‚对于输入节点æ¥è¯´ï¼Œç­›é€‰å™¨çš„存在会使它们åªæå–筛选器指定的物å“；如果你指定了数é‡ï¼Œå®ƒä»¬è¿˜ä¼šç•™ä¸‹æŒ‡å®šæ•°é‡çš„物å“，而éžå…¨éƒ¨æå–出æ¥ã€‚对于输出节点æ¥è¯´ï¼Œç­›é€‰å™¨åˆ™è®©å®ƒä»¬åªæŽ¥å—并输出指定的物å“；如果你指定了数é‡ï¼Œé‚£ä¹ˆå®ƒä»¬æœ€å¤šåªä¼šè¾“出那么多物å“。\n\t/cut有四ç§ä¸åŒç±»åž‹çš„筛选器：\n\t精确匹é…——物å“çš„NBT和元数æ®å¿…须完全匹é…。\n\t按模组匹é…——若物å“æ¥è‡ªæŒ‡å®šMod则匹é…æˆåŠŸã€‚\n\t忽略NBT——筛选器ä¸æ¯”较NBT标签。\n\t矿物字典——若物å“带有相åŒçŸ¿ç‰©å­—å…¸æ¡ç›®åˆ™åŒ¹é…æˆåŠŸã€‚\n\t/cut在将筛选器放入路由节点åŽï¼Œä½ å¯ä»¥åœ¨è·¯ç”±èŠ‚点上看到两个数字：数é‡å’Œä¼˜å…ˆçº§ã€‚点击筛选器中的任何物å“åŽå³å¯çœ‹åˆ°å…¶å字，正下方则会显示数é‡ã€‚如å‰æ–‡æ‰€è¿°ï¼Œè¿™ä¾¿æ˜¯æŒ‡å®šæ•°é‡çš„地方了。若你将数é‡è®¾å®šä¸º0，那么就æ„味ç€â€œæ‰€æœ‰â€â€”—对于输入节点æ¥è¯´ï¼Œé‚£å°±æ˜¯æŠ½å–所有物å“；对于输出节点æ¥è¯´ï¼Œå°±æ˜¯æ供所有物å“。\n\t第二个数字便是优先级，å¯ç”¨ä¸€æ—的箭头调整。数字越å°ï¼Œ/cut优先级越高，物å“将会首先试图å‰å¾€ä¼˜å…ˆçº§é«˜çš„节点。 guide.bloodmagic.entry.demon.aura.info=生物被æ€æ­»åŽï¼Œå…¶çµé­‚会日æ¸æ¶ˆé€€ï¼Œæœ€ç»ˆå›žå½’创世之神。使用投网，å¯ä»¥å°†å…¶æŸç¼šäºŽçŽ°ä¸–，但也有一些难度。我们现在，出于ç§ç§ç†ç”±ï¼Œå¯¹è¿™äº›æ„志加以干扰并冻结其一切活性。若我们燃烧æ„志，它就会回归虚无。但若是我们直接将æ„志释放到空气中，我们便å¯ä»¥ä»¥æ›´çµæ´»çš„æ–¹å¼é©¾é©­è¿™è‚¡åŠ›é‡ã€‚有些方å¼å分普通，而有些方å¼åˆ™æ˜¾å¾—å分强大。\n\t在将æ¶é­”æ„志释放到空气中/cutåŽï¼Œå®ƒä¼šä¸€ç›´å¾…在释放出æ¥çš„那片土地上（å³ï¼Œé‚£ä¸ªåŒºå—），ä¸ä¼šè½»æ˜“离开。æ¯ä¸€ç‰‡åœŸåœ°ä¸Šçš„ä¸åŒç§ç±»çš„æ„志（关于æ„å¿—çš„ç§ç±»ï¼ŒåŽæ–‡æœ‰è¯¦è¿°ï¼‰äº’ä¸å½±å“。这些æ„志的存在还å¯ä»¥ç”¨å…¶ä»–çš„æ–¹å—和物å“æ¥è°ƒæ•´ã€‚ -guide.bloodmagic.entry.demon.types.info=到目å‰ä¸ºæ­¢ï¼Œæ¯å½“我们讨论æ¶é­”æ„志时，都是讨论的原生æ„志。这也就æ„味ç€è¿™æ˜¯å¤©ç„¶çš„æ„志，但这并ä¸ç­‰äºŽå®ƒæ˜¯çº¯çš„。事实上，æ¶é­”æ„志有若干类型；除开原生æ„志，还有è…蚀ã€ç ´åã€å¤ä»‡ä»¥åŠåšæ¯…å››ç§æ„志。原生æ„志实质是这四ç§æ„å¿—çš„æ··åˆç‰©ï¼Œä¹Ÿè®¸è¿˜æœ‰ä¸€äº›è‡³ä»Šæ²¡æœ‰è¯†åˆ«çš„æ„志，但有一点å¯ä»¥ç¡®å®šï¼Œå³åˆ†ç¦»åŽçš„æ„志很难å†èžåˆä¸ºä¸€ä½“。\n\tå››ç§ä¸åŒçš„æ„志的真正æ¥æº/cut至今ä»ç„¶ä¸æ˜Žï¼Œä½†æˆ‘们已ç»æŽŒæ¡äº†äº§ç”Ÿè¿™å››ç§æ„志的方法。将æ„志释放到空气中åŽï¼Œç›¸åŒç§ç±»çš„æ„志就会开始èšé›†åœ¨ä¸€èµ·ã€‚æ®æ­¤ï¼Œåªéœ€è¦æœ‰ä¸€ç§å¯ä»¥æ”¶é›†ç‰¹å®šç§ç±»æ„志的设备就å¯ä»¥å®Œæˆä»»åŠ¡äº†ã€‚接下æ¥çš„几个章节中将会讲述其中一ç§è®¾å¤‡â€”—æ¶é­”结晶å›ã€‚\n\tå››ç§æ„志代表了人的四ç§æ¬²æœ›ã€‚当然我们ä»ç„¶å¯ä»¥å‡å®šå­˜åœ¨æ›´å¤šç§æ„志，但也许它们/cut的纯度还ä¸å¤Ÿï¼Œä¹Ÿè®¸æ ¹æœ¬ä¸èƒ½å­˜åœ¨ï¼Œæ€»è€Œè¨€ä¹‹æˆ‘们目å‰è¿˜æ²¡å‘现新的æ„å¿—ç§ç±»ã€‚\n\tè…蚀——代表了藉由å„ç§æ–¹å¼â€”—酸液ã€è›®åŠ›ã€ç­‰ç­‰â€”—破å万物的欲望。掌æ¡äº†è¿™ç§åŠ›é‡çš„人，将能自由地驱使å„ç§ç–¾ç—…（æ¢è¨€ä¹‹ï¼Œå„ç§è´Ÿé¢æ•ˆæžœï¼‰çš„力é‡ï¼Œå¹¶ä»¤è‡ªèº«å…å—剧毒的侵蚀。\n\tæ¶æ„——å¯çœ‹ä½œæ˜¯â€”—一ç§å­œå­œä¸å€¦å¯»æ‰¾å¯¹æ‰‹çš„欲望。通常，驾/cuté©­æ¶æ„能é‡çš„人，åªè¦é”定了目标，移动速度就会上å‡ï¼Œä½¿å¾—å¯æ€œçš„猎物无处躲è—，åªå¾—å以待毙。\n\tç ´å——你或许已ç»çŒœåˆ°äº†â€”—其实就是纯粹的力é‡ã€‚正确地使用这ç§åŠ›é‡å¯ä»¥ä»¤ä½¿ç”¨è€…的身体素质在短时间内获得快速æå‡ï¼›åŒæ—¶è¿˜å¯ä»¥ç”¨æ¥ç²‰ç¢Žæˆ–碾磨其他物å“。\n\tåšæ¯…——无数的观察表明——这是抵御攻击，使自身å…é­ä¼¤å®³çš„/cut欲望。大多数情况下，æ“纵这ç§æ¬²æœ›çš„人，都是团队中的铜墙é“å£â€”—任何攻击都ä¸ä¼šä¼¤ä»–分毫。如果你想藉由你的护甲或仪å¼æ¥ä¿éšœä½ çš„存活概率，这股力é‡ç»å¯¹æ˜¯ä½ çš„第一选择。 +guide.bloodmagic.entry.demon.types.info=到目å‰ä¸ºæ­¢ï¼Œæ¯å½“我们讨论æ¶é­”æ„志时，都是讨论的原生æ„志。这也就æ„味ç€è¿™æ˜¯å¤©ç„¶çš„æ„志，但这并ä¸ç­‰äºŽå®ƒæ˜¯çº¯çš„。事实上，æ¶é­”æ„志有若干类型；除开原生æ„志，还有è…蚀ã€ç ´åã€å¤ä»‡ä»¥åŠåšæ¯…å››ç§æ„志。原生æ„志实质是这四ç§æ„å¿—çš„æ··åˆç‰©ï¼Œä¹Ÿè®¸è¿˜æœ‰ä¸€äº›è‡³ä»Šæ²¡æœ‰è¯†åˆ«çš„æ„志，但有一点å¯ä»¥ç¡®å®šï¼Œå³åˆ†ç¦»åŽçš„æ„志很难å†èžåˆä¸ºä¸€ä½“。\n\tå››ç§ä¸åŒçš„æ„志的真正æ¥æº/cut至今ä»ç„¶ä¸æ˜Žï¼Œä½†æˆ‘们已ç»æŽŒæ¡äº†äº§ç”Ÿè¿™å››ç§æ„志的方法。将æ„志释放到空气中åŽï¼Œç›¸åŒç§ç±»çš„æ„志就会开始èšé›†åœ¨ä¸€èµ·ã€‚æ®æ­¤ï¼Œåªéœ€è¦æœ‰ä¸€ç§å¯ä»¥æ”¶é›†ç‰¹å®šç§ç±»æ„志的设备就å¯ä»¥å®Œæˆä»»åŠ¡äº†ã€‚接下æ¥çš„几个章节中将会讲述其中一ç§è®¾å¤‡â€”—æ¶é­”结晶å›ã€‚\n\tå››ç§æ„志代表了人的四ç§æ¬²æœ›ã€‚当然我们ä»ç„¶å¯ä»¥å‡å®šå­˜åœ¨æ›´å¤šç§æ„志，但也许它们/cut的纯度还ä¸å¤Ÿï¼Œä¹Ÿè®¸æ ¹æœ¬ä¸èƒ½å­˜åœ¨ï¼Œæ€»è€Œè¨€ä¹‹æˆ‘们目å‰è¿˜æ²¡å‘现新的æ„å¿—ç§ç±»ã€‚\n\tè…蚀——代表了通过å„ç§æ–¹å¼â€”—酸液ã€è›®åŠ›ã€ç­‰ç­‰â€”—破å万物的欲望。掌æ¡äº†è¿™ç§åŠ›é‡çš„人，将能自由地驱使å„ç§ç–¾ç—…（æ¢è¨€ä¹‹ï¼Œå„ç§è´Ÿé¢æ•ˆæžœï¼‰çš„力é‡ï¼Œå¹¶ä»¤è‡ªèº«å…å—剧毒的侵蚀。\n\tæ¶æ„——å¯çœ‹ä½œæ˜¯â€”—一ç§å­œå­œä¸å€¦å¯»æ‰¾å¯¹æ‰‹çš„欲望。通常，驾/cuté©­æ¶æ„能é‡çš„人，åªè¦é”定了目标，移动速度就会上å‡ï¼Œä½¿å¾—å¯æ€œçš„猎物无处躲è—，åªå¾—å以待毙。\n\tç ´å——你或许已ç»çŒœåˆ°äº†â€”—其实就是纯粹的力é‡ã€‚正确地使用这ç§åŠ›é‡å¯ä»¥ä»¤ä½¿ç”¨è€…的身体素质在短时间内获得快速æå‡ï¼›åŒæ—¶è¿˜å¯ä»¥ç”¨æ¥ç²‰ç¢Žæˆ–碾磨其他物å“。\n\tåšæ¯…——无数的观察表明——这是抵御攻击，使自身å…é­ä¼¤å®³çš„/cut欲望。大多数情况下，æ“纵这ç§æ¬²æœ›çš„人，都是团队中的铜墙é“å£â€”—任何攻击都ä¸ä¼šä¼¤ä»–分毫。如果你想藉由你的护甲或仪å¼æ¥ä¿éšœä½ çš„存活概率，这股力é‡ç»å¯¹æ˜¯ä½ çš„第一选择。 guide.bloodmagic.entry.demon.crucible.info=æ¶é­”å©åŸšå¯å°†åœ°ç‹±é­‚石中的æ¶é­”æ„志散布到当地（å³å½“å‰åŒºå—）的大气之中。这å£å©åŸšæœ‰è‹¥å¹²ç”¨é€”：最简å•çš„一个就是直接将地狱魂石放入其中（å³å‡»æ”¾å…¥ï¼‰ã€‚å©åŸšä¼šè‡ªåŠ¨ä»Žé­‚石中抽å–æ¶é­”æ„志并散布到空气中，直到饱和（æ¯ç§æ„志大约都会在达到100点时饱和）或者魂石本身被抽干了。\n\t此外，它还å¯ä»¥æŠ½å–空气中的æ¶é­”æ„志并çŒè¾“进魂石中。æ“作方å¼å’Œæ•£å¸ƒæ¶é­”æ„å¿—æ— /cut异，åªæ˜¯å©åŸšéœ€è¦ä¸€ä¸ªå¼ºçš„红石信å·ï¼ˆå³å¼ºå……能）。\n\t最åŽï¼Œç›´æŽ¥å¾€é‡Œé¢æŠ•å…¥ä¸€å—æ¶é­”æ„志也是å¯ä»¥çš„，ä¸è®ºä»€ä¹ˆå½¢å¼ï¼Œåªè¦æœ‰å®¹çº³æ„志的空间就å¯ä»¥è¿›è¡Œè½¬åŒ–。举个例å­ï¼Œå°†æ™¶åŒ–æ¶é­”æ„志投入å©åŸšå¯äº§ç”Ÿ50点æ„志。 guide.bloodmagic.entry.demon.crystallizer.info=正如之å‰æ‰€æ到的那样，æ¶é­”çµæ°”——通常我们会简å•ä»¥â€œå¤§æ°”â€æŒ‡ä»£ä¹‹â€”—是æ¶é­”æ„志的空çµçš„存在形å¼ï¼Œè€Œå‡»æ€æ€ªç‰©èŽ·å¾—的物质则是æ¶é­”æ„志物ç†å½¢å¼çš„具现。而这æ¶é­”结晶å›ï¼Œåˆ™åƒæ˜¯ä¸€ä¸ªé”šç‚¹ï¼Œè®©æ¼‚浮在大气中的æ¶é­”æ„志以晶体的形æ€é‡çŽ°ã€‚\n\t你也许会问，为什么ä¸ç›´æŽ¥ç”¨åœ°ç‹±é­‚石培养一å—晶体呢？这是因为在我们将æ¶é­”æ„志释放到空气中时，它身上的ç¦é”¢/cut就已ç»è¢«è§£é™¤äº†â€”—记ä½ï¼Œå½“我们æ€æ­»ä¸€ä¸ªæ€ªç‰©æ—¶ï¼Œå®ƒèº«ä¸Šçš„æ„志也就éšä¹‹è¢«æˆ‘们ç¦é”¢äº†ã€‚å†æ¬¡é‡Šæ”¾è‡ªç„¶ä¼šä»¤å…¶é‡æ–°æ¢å¤æ´»åŠ›ï¼Œè€Œè¿™ç»“晶å›å°±æ˜¯ç›´æŽ¥å¸æ”¶è¿™æ´»çš„æ¶é­”æ„志。ä¸è¦å¤ªæƒ³å½“然啦。\n\t结晶过程需è¦æ¯”较高的æ¶é­”çµæ°”的浓度（大概是80点），并且需è¦ä¸€æ®µæ—¶é—´ã€‚在这之åŽï¼Œç»“晶å›çš„上方便会长出åªæœ‰ä¸€æ ¹å°–çš„æ¶é­”晶簇。结晶å›æœ‰ä¸¤ç§å·¥ä½œæ–¹å¼ï¼šå®ƒæ—¢å¯ä»¥å¸æ”¶/cut特定的一ç§æ„志然åŽäº§ç”Ÿå¯¹åº”的晶体；也å¯ä»¥ç›´æŽ¥å¸æ”¶åŽŸç”Ÿæ„å¿—æ¥äº§ç”Ÿæ™¶ä½“。\n\t这其中的区别在于，使用原生æ„志时，有大约40%%概率会获得任æ„一ç§ç‰¹å®šç±»åž‹çš„晶体。而这将是你获得特定类型的æ„志的第一步。 guide.bloodmagic.entry.demon.cluster.info=æ¶é­”晶簇既å¯ä»¥ä½¿ç”¨æ¶é­”结晶å›åŸ¹å…»ï¼Œä¹Ÿå¯åœ¨ç‹±ç«ç†”炉中用æ¶é­”结晶制作。晶簇å¯ä»¥åœ¨å„ç§åœ°æ–¹ç”Ÿé•¿â€”—地æ¿ã€å¢™å£ã€ç”šè‡³å¤©èŠ±æ¿ä¸Šã€‚完全长æˆçš„晶簇应该有七个尖，打掉åŽæ¯ä¸€ä¸ªå°–都会å˜æˆä¸€å—结晶。然而，如果你使用å«æœ‰è‡³å°‘1024点æ„志的地狱魂石æ¥æ”¶èŽ·ï¼ˆå³å‡»ï¼‰ï¼Œä½ ä¾¿èƒ½åªæ”¶èŽ·ä¸€å—结晶而ä¸å½±å“到整棵晶簇。\n\t晶簇生长的过程中，会å¸æ”¶åŒç§æ¶é­”çµæ°”。虽然慢，但的确/cut是有收益的。\n\t有两ç§å’Œæ™¶ç°‡çš„ç§æ¤å’Œæ”¶èŽ·ç›¸å…³çš„仪å¼ï¼šå­¤é­‚集会和碎晶裂纹。具体用法å¯ä»¥å‚阅《仪å¼å¤§å¸ˆã€‹ä¸€å·ã€‚ @@ -244,13 +250,14 @@ guide.bloodmagic.entry.alchemy.turret=法阵：骷髅炮塔 guide.bloodmagic.entry.alchemy.buff=增益法阵 guide.bloodmagic.entry.alchemy.fastMiner=法阵：速掘 guide.bloodmagic.entry.alchemy.furnace=法阵：燃炉 - - +guide.bloodmagic.entry.alchemy.teleport=æ³•é˜µï¼šä¼ é€ +guide.bloodmagic.entry.alchemy.standardTurret=法阵：标准炮塔 +guide.bloodmagic.entry.alchemy.laputa=法阵：拉普达碎片 # Alchemy Entry Texts guide.bloodmagic.entry.alchemy.intro.info=我å«å¼—拉德·海泊æ©ï¼Œæ˜¯ä¸€å血法师。我一直致力于研究炼金术的细节以åŠæ‰€æœ‰é­”法中共åŒçš„原则——“等价交æ¢â€ã€‚简å•æ¥è¯´ï¼Œä½ ä¸èƒ½æ— ä¸­ç”Ÿæœ‰ï¼Œè™½ç„¶å¾ˆå¤šäººä¸€ç›´åœ¨è‡´åŠ›äºŽå¯»æ‰¾é‚£ä¸ªå¯ä»¥æ— è§†æ­¤åŽŸåˆ™çš„石头。很显然，石头的寻找之旅并ä¸é¡ºåˆ©ï¼Œå› ä¸ºäººä»¬æ€»æ˜¯ä¼šåœ¨æƒŠè®¶å£°ä¸­å‘现石头是å‡è´§ã€‚当然，我ä¸åªæ˜¯ä¸ªç‚¼é‡‘术师，我主è¦è¿˜æ˜¯åœ¨è·Ÿä»ªå¼å¤§å¸ˆå’Œç¼”造者学习血之魔法，这二ä½åœ¨åœˆå†…业已是颇具声望的人物了。/cut马格斯和æ比略这几年æ¥ä¸€ç›´åœ¨è®°å½•ä»–们的æˆæžœï¼Œä½†æ˜¯æˆ‘一直ä¸çŸ¥é“马格斯是å¦çœŸçš„记录下了他的毕生所学——既ä¸èƒ½è¯æ˜Žï¼Œä¹Ÿä¸èƒ½è¯ä¼ªã€‚\n\t我的这本书将记录血魔法中的炼金术。从奥术粉尘，到å¤æ‚的炼金å°æ¡Œï¼Œä½ å°†ä¼šåœ¨è¿™æœ¬ä¹¦ä¸­æ‰¾åˆ°ä¸–é—´å„ç§å¤æ‚的元素的线索。当然，为了读懂这本书，你还需è¦é˜…读其余的几本书，以对血魔法有清楚的了解。\n\t/cut就现在æ¥è¯´å‘¢ï¼Œæˆ‘衷心希望é¢å‰çš„读者阅读愉快。这些书页的内容，都是如å‡åŒ…æ¢çš„真æ‰å®žå­¦ã€‚ -guide.bloodmagic.entry.alchemy.ash.info=奥术粉尘便是炼金法阵的基础，而炼金法阵（为简便，下简称法阵）——一ç§åœ†å½¢æ³•é˜µâ€”—则拥有多ç§å¼ºå¤§çš„功能。åˆæˆå¥¥æœ¯ç²‰å°˜éœ€è¦ç”¨åˆ°ç‹±ç«ç†”炉和æ¶é­”æ„志，关于这两样东西的细节å¯ä»¥å‚考本书《æ¶é­”使者》一å·ã€‚\n\t/cut一份奥术粉尘å¯ä½¿ç”¨äºŒå次。对ç€åœ°é¢æˆ–者墙å£ä½¿ç”¨ä¾¿å¯ç”»å‡ºä¸€ä¸ªåœ†å½¢çš„法阵（如果是墙å£ï¼Œä½ åªèƒ½åœ¨ä¸€ä¸ªæ–¹å‘上看到法阵）。然åŽï¼Œå¯¹æ³•é˜µä¸­å¤®ä½¿ç”¨åˆé€‚的催化剂å³å¯æ”¹å˜å…¶å½¢çŠ¶ï¼Œå½“然也会消耗催化剂（å³ï¼Œå³å‡»ä½¿ç”¨ï¼‰ã€‚如果法阵没有å˜å½¢ï¼Œé‚£ä¹ˆä½ è‚¯å®šæœ‰ä»€ä¹ˆåœ°æ–¹æžé”™äº†ã€‚\n\t在观察到法阵å˜å½¢åŽï¼Œä½ ä¾¿å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé€‚的次è¦ç‰©å“会å¯åŠ¨æ³•é˜µï¼Œå±Šæ—¶ä½ ä¼šçœ‹åˆ°æ³•é˜µå¼€å§‹æ—‹è½¬ï¼Œå¹¶å¼€å§‹/cut产生å„ç§å˜åŒ–，具体å˜åŒ–éšæ³•é˜µä¸åŒè€Œä¸åŒã€‚\n\t所有éžåˆæˆçš„法阵用途都å¯ä»¥åœ¨æœ¬ä¹¦ä¸­æŸ¥é˜…到，å³ä¾¿åˆæˆè¢«ä»–人强行更改过也å¯ä»¥ã€‚对于需è¦çš„物å“，它们都已ç»è¿‡æŽ’åºï¼ŒæŒ‰ç…§æœ¬ä¹¦ç»™å‡ºçš„顺åºæ”¾ç½®å³å¯ã€‚ +guide.bloodmagic.entry.alchemy.ash.info=奥术粉尘便是炼金法阵的基础，而炼金法阵（为简便，下简称法阵）——一ç§åœ†å½¢æ³•é˜µâ€”—则拥有多ç§å¼ºå¤§çš„功能。åˆæˆå¥¥æœ¯ç²‰å°˜éœ€è¦ç”¨åˆ°ç‹±ç«ç†”炉和æ¶é­”æ„志，关于这两样东西的细节å¯ä»¥å‚考本书《æ¶é­”之å­ã€‹ä¸€å·ã€‚\n\t/cut一份奥术粉尘å¯ä½¿ç”¨äºŒå次。对ç€åœ°é¢æˆ–者墙å£ä½¿ç”¨ä¾¿å¯ç”»å‡ºä¸€ä¸ªåœ†å½¢çš„法阵（如果是墙å£ï¼Œä½ åªèƒ½åœ¨ä¸€ä¸ªæ–¹å‘上看到法阵）。然åŽï¼Œå¯¹æ³•é˜µä¸­å¤®ä½¿ç”¨åˆé€‚的催化剂å³å¯æ”¹å˜å…¶å½¢çŠ¶ï¼Œå½“然也会消耗催化剂（å³ï¼Œå³å‡»ä½¿ç”¨ï¼‰ã€‚如果法阵没有å˜å½¢ï¼Œé‚£ä¹ˆä½ è‚¯å®šæœ‰ä»€ä¹ˆåœ°æ–¹æžé”™äº†ã€‚\n\t在观察到法阵å˜å½¢åŽï¼Œä½ ä¾¿å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé€‚的次è¦ç‰©å“会å¯åŠ¨æ³•é˜µï¼Œå±Šæ—¶ä½ ä¼šçœ‹åˆ°æ³•é˜µå¼€å§‹æ—‹è½¬ï¼Œå¹¶å¼€å§‹/cut产生å„ç§å˜åŒ–，具体å˜åŒ–éšæ³•é˜µä¸åŒè€Œä¸åŒã€‚\n\t所有éžåˆæˆçš„法阵用途都å¯ä»¥åœ¨æœ¬ä¹¦ä¸­æŸ¥é˜…到，å³ä¾¿åˆæˆè¢«ä»–人强行更改过也å¯ä»¥ã€‚对于需è¦çš„物å“，它们都已ç»è¿‡æŽ’åºï¼ŒæŒ‰ç…§æœ¬ä¹¦ç»™å‡ºçš„顺åºæ”¾ç½®å³å¯ã€‚ guide.bloodmagic.entry.alchemy.speed.info=法阵：æ•æ·å¯ä»¥åˆ¶é€ è‹¥å¹²æ°”旋，并用法力加热。此åŽï¼Œä¸€æ—¦æœ‰ç”Ÿç‰©èµ°å…¥å…¶ä¸­ï¼Œå®ƒä»¬å°±ä¼šè¢«é£Žçš„力é‡æŽ¨å‘å‰æ–¹ã€‚此外，它还å¯ä»¥å…除所有因此产生的掉è½ä¼¤å®³ã€‚åªéœ€è¦åšäº›è¿åŠ¨å°±å¥½äº†ã€‚\n\t漩涡推进的方å‘是阵列上箭头的方å‘。\n\tå¦å¤–，相比于直接走入阵列中，从高处掉入阵列的效果会更好。这è¦å½’功于你掉下æ¥æ—¶å‘¨å›´ç©ºæ°”产生的æµåŠ¨ã€‚ guide.bloodmagic.entry.alchemy.updraft.info=这个阵列使用和法阵：æ•æ·ä¸€æ ·çš„原ç†ï¼Œä¸è¿‡è¿™æ¬¡çš„æ–¹å‘是æœä¸Šäº†ã€‚自然地，使用阵列时务必å°å¿ƒï¼šå†ä¸‹æ¥å°±ä¸æ˜¯æ˜“äº‹äº†ï¼ guide.bloodmagic.entry.alchemy.bounce.info=阵列会将接近中心的热é‡é›†ä¸­åˆ°ä¸‹é¢ï¼Œè¿›è€Œè½¯åŒ–地é¢ï¼Œå¹¶æœ€ç»ˆè½¬åŒ–为一ç§ç”±ç¢³å’Œæ°¢ç»„æˆçš„橡胶状物质。这ç§ç‰©è´¨ä¼šå°†ç”Ÿç‰©å¼¹è‡³ç©ºä¸­ï¼ŒåŒæ—¶ä¹Ÿèƒ½é¿å…掉è½ä¼¤å®³ã€‚潜行å³å¯é¿å…è¿™ç§ç¥žå¥‡æ料的影å“，当然这ä¸ä¼šå½±å“æ‘”è½ä¿æŠ¤çš„功能。 @@ -258,3 +265,6 @@ guide.bloodmagic.entry.alchemy.turret.info=利用那些ä»ç„¶æŽ§åˆ¶ç€æ€ªç‰©çš„ guide.bloodmagic.entry.alchemy.buff.info=ç»è¿‡ä¸¥å¯†çš„研究，你å‘现法阵拥有强大的应用潜力。迄今，你已æˆåŠŸåˆ¶é€ äº†æ•°ç§é˜µåˆ—，从加速移动，到åˆçº§çš„ä¼ é€ï¼Œåº”有尽有。但唯有一ç§é˜µåˆ—，你至今ä»ç„¶æ²¡æœ‰ç€æ‰‹åŽ»ç ”究，那便是æ供强大的正é¢å¢žç›Šçš„阵列。\n\t增益阵列实际上是指一系列å¯ä»¥æ供范围增益效果的阵列。这些阵列产生的增益效果通常都有很大的固定覆盖范围，ä¸å—外力影å“。然而，因/cut为法阵ä¸ä¼šç‰µæ‰¯åˆ°çµé­‚网络，阵列需è¦åˆ«çš„æ–¹å¼æ¥ä¼ æ’­è¿™ç§æ•ˆæžœï¼Œé€šå¸¸æ˜¯ç›´æŽ¥ç”¨è¡€ã€‚æ¢è¨€ä¹‹ï¼Œå½“有玩家展开阵列时，玩家就会立刻å—到伤害（æŸå¤±ç”Ÿå‘½ï¼‰ï¼Œè—‰ç”±æ­¤å¯åŠ¨é˜µåˆ—。\n\t因为使用了直接献祭，å‰æœŸä½¿ç”¨è¿™ç§é˜µåˆ—会比使用其他获å–增益的手段更ç»æµŽä¸€äº›ã€‚è·ç¦»ï¼Œå¦‚æžœæŸä¸ªå°è®°å¯æ¶ˆè€—100LP并æ¢å–10秒的效果，阵列å¯ä»¥ä»¥1点生命的代价æ¢æ¥30秒åŒæ ·çš„效果（1点生命对于一级/cut祭å›æ¥è¯´æ˜¯100LP）。尽管到了åŽæœŸï¼Œè¿™ç§é˜µåˆ—å°±ä¸ä¼šå†æœ‰æ•ˆçŽ‡ä¸Šçš„优势，但因为它们的ä½ç½®æ˜¯å›ºå®šçš„，相比于å°è®°ï¼Œå®ƒä»¬é€šå¸¸ä¼šç»™äºˆæ›´å¼ºå¤§çš„效果，所以它们到了åŽæœŸä»æœ‰å®ƒä»¬çš„价值。 guide.bloodmagic.entry.alchemy.fastMiner.info=é‡åˆ°å¤§èŒƒå›´çš„雕刻任务，有时候还是自己动手更划算一些。对于这ç§æƒ…况，这个阵列便是你的ä¸äºŒé€‰æ‹©ã€‚这个阵列å¯ä¸º10格内的玩家æ供急迫 III的效果，消耗则是æ¯30秒1点生命值（åŠé¢—心）。因为是普通的急迫效果，所以它也å¯ä»¥æ高你的攻击速度，ä¸è¿‡è¦è®°ä½ï¼Œåˆ«çš„玩家åŒæ ·ä¼šè¢«é˜µåˆ—è¦†ç›–åˆ°ï¼ guide.bloodmagic.entry.alchemy.furnace.info=在冒险刚刚å¯ç¨‹æ—¶å¯èƒ½é‡åˆ°çš„众多问题之一，就是难以ä¿æŒç†”炉的燃烧。一个点ç€çš„熔炉æ„味ç€å¯ä»¥äº«å—美味的食物与精炼的装备，而ä¸æ˜¯èº²åœ¨æ´žç©´ä¸­æŒ¨é¥¿ã€‚\n\t燃炉法阵，顾åæ€ä¹‰ï¼Œå¯ä»¥å‘相邻的熔炉æ供所需的充足热æºã€‚直接在一个原版熔炉æ—边铺设下该法阵（å¯ä»¥ä¸Žå¤šä¸ªç†”炉相邻），åªè¦ç†”炉å¯ä»¥å®Œæˆä¸€æ¬¡çƒ§åˆ¶ï¼Œæ³•é˜µä¾¿ä¼šä¾›ç»™ç‡ƒæ–™â€”—如果相邻的熔炉是空的，或者已ç»å¡«æ»¡ï¼Œåˆ™ä»€ä¹ˆéƒ½ä¸ä¼šå‘生，/cut这也是为了ä¿æŠ¤ä½ ã€‚\n\t但是，这也ä¸æ˜¯å‡­ç©ºèƒ½åŠžåˆ°çš„：如果有人在附近（åæ ¼åŠå¾„之内），消耗1点生命值（åŠé¢—心）æ‰èƒ½ç»´æŒç†”炉中两个物å“的冶炼。这对åšç‚¹ä¸œè¥¿åž«åž«è‚šå­æˆ–者冶炼一堆矿石很有帮助，但ä¸å¹¸çš„是你还没有办法在法阵上设置什么ä¿æŠ¤æŽªæ–½â€¦â€¦ +guide.bloodmagic.entry.alchemy.teleport.info=法阵：传é€ï¼Œé¡¾åæ€ä¹‰å¯ä»¥ç”¨æ¥åœ¨ä¸¤ä¸ªåœ°ç‚¹é—´çž¬é—´ç§»åŠ¨ï¼Œä½†æœ‰è‹¥å¹²é™åˆ¶ã€‚当玩家或其他实体走进法阵åŽï¼Œæ³•é˜µä¼šæ²¿ç€å®ƒçš„æœå‘æœç´¢è‡³å¤š 20 æ–¹å—çš„è·ç¦»ï¼Œåœ¨å…¶ä¸­å¯»æ‰¾å¦ä¸€ä¸ªç‚¼é‡‘法阵，类型ä¸é™ï¼Œä¹Ÿä¸éœ€è¦æ¿€æ´»ã€‚若找到了å¦ä¸€ä¸ªæ³•é˜µï¼Œåˆ™å°†è¿›å…¥æ³•é˜µçš„实体传é€åˆ°æ³•é˜µé‚£è¾¹åŽ»ï¼Œè¿™ä¸ªè¿‡ç¨‹ç”šè‡³å¯ä»¥æ— è§†ä¸­é—´çš„墙å£ã€‚\n\t进一步的研究表明，这个法阵还有å¦ä¸€ä¸ªé™åˆ¶ï¼šæœ‰é‰´äºŽæ‰­æ›²/cut时空的本质，这个法阵ä¸ä¼šä¼ é€é‚£äº›åˆšä¼ é€å®Œä¸¤ç§’é’Ÿä¸åˆ°çš„物体。这样一æ¥ï¼Œè¿™äº›ç‰©ä½“就有时间æ¥é‡æ–°å¯¹è‡ªèº«è¿›è¡Œè°ƒæ•´ã€‚ +guide.bloodmagic.entry.alchemy.standardTurret.info=把尖é”物体弹射到远处的怪物上的力é‡å®žåœ¨æ˜¯ä¸èƒ½æ›´å¥½ç”¨äº†ã€‚法阵：标准炮塔å¯ä»¥æ„ŸçŸ¥é™„近的敌对生物的存在，并利用å¤æ‚的炼金术å‘其他敌对生物开ç«ã€‚\n\t法阵首先在其正下方æœç´¢ç‰©å“容器。若在容器中找到了箭头，或者带è¯æ°´çš„箭头，它就会将其å¸å‡ºï¼Œå¹¶ä½¿ç”¨å®ƒæœ 32 格范围内的生物开ç«ã€‚\n\t/cut（因为 Minecraft 奇葩的物ç†å­¦ï¼Œç®­å¤´è‹¥ç”ŸæˆäºŽç¦»ç”Ÿç‰©å¾ˆè¿‘的地方就会被弹开，所以炮塔åªä¼šæœè‡³å°‘三格开外的敌对生物开ç«ã€‚时刻留æ„这一点ï¼ï¼‰ +guide.bloodmagic.entry.alchemy.laputa.info=有个关于æŸå¤±è½çš„王国的传说，这个王国的居民拥有在云中自由穿梭的魔法。虽然关于这个王国的一切现在都已ä¸å¾—而知，æ绘了他们漂浮在空中的城堡的画å·å´æ供了所有让这魔法æˆä¸ºçŽ°å®žçš„细节。\n\t拉普达碎片（法阵）å¯ä»¥å°†åœ°é¢ä¸Šçš„生命æºè´¨æ°”化，这ç§æ°”化的生命æºè´¨å¯ä»¥å°†å‘¨å›´çš„大地举起æ¥ã€‚尽管原ç†å分简å•ï¼Œä½†å¤§åœ°ä¸­ç”Ÿå‘½æºè´¨çš„差异会/cutç¨å¾®å½±å“到举起的大地的范围。这个法阵能将以法阵中心为çƒå¿ƒï¼ŒåŠå¾„四到八格的çƒçŠ¶åŒºåŸŸå†…çš„æ–¹å—，举高到两å€äºŽåŠå¾„多éšæœºä¸€åˆ°äº”格的高度。\n\t需è¦æ³¨æ„的是，法阵生效时，所有å¯åŠ¨æ³•é˜µæ‰€ç”¨çš„物å“都会被消耗。 From 1096c697f4a8d25850d1ea017cfa0822fd1e7801 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Wed, 20 Jun 2018 21:43:33 -0400 Subject: [PATCH 200/493] Fix the Blood Tank BB (#1347) --- .../java/WayofTime/bloodmagic/block/BlockBloodTank.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 9140427b..47e03d74 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -48,14 +48,8 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB setLightOpacity(0); } - @Nullable @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { - return BOX; - } - - @Override - public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) { + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { return BOX; } From b38c3022eef6ac450b4ce62e441bf752f1dd2de0 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jun 2018 16:32:07 -0700 Subject: [PATCH 201/493] Fix crafted inscription tools not having the proper durability (#1353) --- .../java/WayofTime/bloodmagic/ritual/EnumRuneType.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java index 1566d5b5..d827c436 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java @@ -2,7 +2,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; @@ -44,7 +46,11 @@ public enum EnumRuneType implements IStringSerializable, ISubItem { @Nonnull @Override public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); + ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger(Constants.NBT.USES, 10); + ret.setTagCompound(tag); + return ret; } public static EnumRuneType byMetadata(int meta) { From 954f2c87e1bfd45681508ee70fd6be63849bdd92 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jun 2018 16:42:35 -0700 Subject: [PATCH 202/493] Fix bound orbs not allowing JEI interactions (#1349) --- .../bloodmagic/compat/jei/BloodMagicJEIPlugin.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index 0f183c45..7f82a21a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -7,6 +7,8 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; @@ -89,8 +91,17 @@ public class BloodMagicJEIPlugin implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME); - subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.BLOOD_ORB); subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.POTION_FLASK); + subtypeRegistry.registerSubtypeInterpreter(RegistrarBloodMagicItems.BLOOD_ORB, stack -> { + if (!(stack.getItem() instanceof IBloodOrb)) + return ISubtypeRegistry.ISubtypeInterpreter.NONE; + + BloodOrb orb = ((IBloodOrb) stack.getItem()).getOrb(stack); + if (orb == null) + return ISubtypeRegistry.ISubtypeInterpreter.NONE; + + return orb.getRegistryName().toString(); + }); } @Override From d1e77acc730af69265c68312e1e3d7825cab0146 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jun 2018 16:50:34 -0700 Subject: [PATCH 203/493] Bandaid crushing ritual to pass a valid player instance (#1345) This entire thing needs to be cleaned up. It's so bad right now :( --- .../bloodmagic/ritual/types/RitualCrushing.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index caefd268..01cab915 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -9,6 +9,7 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; +import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +20,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; @@ -40,6 +44,7 @@ public class RitualCrushing extends Ritual { public static Map cuttingFluidLPMap = new HashMap<>(); public static Map cuttingFluidWillMap = new HashMap<>(); public static int defaultRefreshTime = 40; + private FakePlayer fakePlayer; public int refreshTime = 40; public RitualCrushing() { @@ -154,7 +159,7 @@ public class RitualCrushing extends Ritual { } } - if (!isBlockClaimed && isSilkTouch && block.canSilkHarvest(world, newPos, state, null)) { + if (!isBlockClaimed && isSilkTouch && block.canSilkHarvest(world, newPos, state, getFakePlayer((WorldServer) world))) { ItemStack checkStack = block.getItem(world, newPos, state); if (checkStack.isEmpty()) { continue; @@ -280,4 +285,8 @@ public class RitualCrushing extends Ritual { cuttingFluidLPMap.put(stack, lpDrain); cuttingFluidWillMap.put(stack, willDrain); } + + private FakePlayer getFakePlayer(WorldServer world) { + return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_crushing")) : fakePlayer; + } } From 86f54886c59a838b1f95884612a7579eeda2707f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jun 2018 16:53:16 -0700 Subject: [PATCH 204/493] Mending should not work on potion flasks (#1332) --- .../bloodmagic/item/ItemPotionFlask.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 0d7f9e01..12e0a2d4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -69,6 +69,11 @@ public class ItemPotionFlask extends Item implements IMeshProvider { return EnumAction.DRINK; } + @Override + public boolean isDamaged(ItemStack stack) { + return false; + } + @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); @@ -108,16 +113,6 @@ public class ItemPotionFlask extends Item implements IMeshProvider { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.potion.uses", stack.getMaxDamage() - stack.getItemDamage())); } -// @Override -// @SideOnly(Side.CLIENT) -// public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) -// { -// for (PotionType potiontype : PotionType.REGISTRY) -// { -// subItems.add(PotionUtils.addPotionToItemStack(new ItemStack(itemIn), potiontype)); -// } -// } - @SideOnly(Side.CLIENT) @Override From 22e8290921c7cb375367436877ffd5e663ceb88a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jun 2018 17:09:18 -0700 Subject: [PATCH 205/493] Teleposition Sigil should make sure a Teleposer is the destination (#1328) --- .../item/sigil/ItemSigilTeleposition.java | 114 ++++++++++++++---- 1 file changed, 90 insertions(+), 24 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 4a9566da..10e44dab 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.util.helper.NBTHelper; @@ -12,18 +12,23 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.INBTSerializable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; public class ItemSigilTeleposition extends ItemSigilBase { + public ItemSigilTeleposition() { super("teleposition"); } @@ -33,14 +38,11 @@ public class ItemSigilTeleposition extends ItemSigilBase { public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { super.addInformation(stack, world, tooltip, flag); - if (!stack.hasTagCompound()) - return; - NBTTagCompound tag = stack.getTagCompound(); - - if (tag != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { - tooltip.add(" "); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", getValue(tag, Constants.NBT.X_COORD), getValue(tag, Constants.NBT.Y_COORD), getValue(tag, Constants.NBT.Z_COORD))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", getValue(tag, Constants.NBT.DIMENSION_ID))); + TeleportLocation location = getTeleportLocation(stack); + if (location != null) { + tooltip.add(""); + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", location.pos.getX(), location.pos.getY(), location.pos.getZ())); + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", location.dim)); } } @@ -52,15 +54,23 @@ public class ItemSigilTeleposition extends ItemSigilBase { if (PlayerHelper.isFakePlayer(player)) return ActionResult.newResult(EnumActionResult.FAIL, stack); - if (!world.isRemote && NBTHelper.checkNBT(stack) != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { - BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up(); - if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getBinding(stack).getOwnerId(), true)); + TeleportLocation location = getTeleportLocation(stack); + Binding binding = getBinding(stack); + if (!world.isRemote && location != null && binding != null) { + World teleportTo = DimensionManager.getWorld(location.dim); + if (teleportTo != null) { + TileEntity tile = teleportTo.getTileEntity(location.pos); + if (tile instanceof TileTeleposer) { + BlockPos blockPos = location.pos.up(); + if (world.provider.getDimension() == location.dim) { + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, binding.getOwnerId(), true)); + } + // FIXME - Fix cross-dimension teleports causing major desync +// } else { +// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true)); +// } + } } - // FIXME - Fix cross-dimension teleports causing major desync -// } else { -// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true)); -// } } return super.onItemRightClick(world, player, hand); } @@ -75,18 +85,74 @@ public class ItemSigilTeleposition extends ItemSigilBase { if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) { if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) { - stack.getTagCompound().setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); - stack.getTagCompound().setInteger(Constants.NBT.X_COORD, pos.getX()); - stack.getTagCompound().setInteger(Constants.NBT.Y_COORD, pos.getY()); - stack.getTagCompound().setInteger(Constants.NBT.Z_COORD, pos.getZ()); - + TeleportLocation teleportLocation = new TeleportLocation(world.provider.getDimension(), pos); + updateLocation(stack, teleportLocation); return EnumActionResult.SUCCESS; } } return EnumActionResult.FAIL; } - public int getValue(NBTTagCompound tag, String key) { - return tag.getInteger(key); + @Nullable + public TeleportLocation getTeleportLocation(ItemStack stack) { + if (!(stack.getItem() instanceof ItemSigilTeleposition)) + return null; + + if (!stack.hasTagCompound()) + return null; + + NBTTagCompound locationTag = stack.getSubCompound("tplocation"); + if (locationTag == null) + return null; + + return TeleportLocation.fromTag(locationTag); + } + + public void updateLocation(ItemStack stack, TeleportLocation location) { + NBTTagCompound tagCompound; + if (!stack.hasTagCompound()) + stack.setTagCompound(tagCompound = new NBTTagCompound()); + else + tagCompound = stack.getTagCompound(); + + tagCompound.setTag("tplocation", location.serializeNBT()); + } + + public static class TeleportLocation implements INBTSerializable { + + private int dim; + private BlockPos pos; + + private TeleportLocation() { + } + + public TeleportLocation(int dim, BlockPos pos) { + this.dim = dim; + this.pos = pos; + } + + public TeleportLocation(int dim, int x, int y, int z) { + this(dim, new BlockPos(x, y, z)); + } + + @Override + public NBTTagCompound serializeNBT() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("dim", dim); + tag.setLong("pos", pos.toLong()); + return tag; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) { + this.dim = nbt.getInteger("dim"); + this.pos = BlockPos.fromLong(nbt.getLong("pos")); + } + + public static TeleportLocation fromTag(NBTTagCompound tpTag) { + TeleportLocation location = new TeleportLocation(); + location.deserializeNBT(tpTag); + return location; + } } } From c8e42e32885e40ac17d05c7af35d4299d9e74dbe Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jun 2018 17:15:45 -0700 Subject: [PATCH 206/493] Fix lava crystal not syphoning LP (#1326) --- .../java/WayofTime/bloodmagic/item/ItemLavaCrystal.java | 2 +- .../WayofTime/bloodmagic/util/helper/NetworkHelper.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index cebbe121..3e3c07ba 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -43,7 +43,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide if (binding == null) return -1; - if (NetworkHelper.canSyphonFromContainer(stack, 25)) + if (NetworkHelper.syphonFromContainer(stack, 25)) return 200; else { EntityPlayer player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index 279498e4..bdc7f096 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.Event; import java.util.UUID; @@ -119,7 +118,7 @@ public class NetworkHelper { * @param toSyphon - Amount of LP to syphon * @return - If the syphon was successful. */ - public static boolean syphonFromContainer(ItemStack stack, int toSyphon) //TODO: Change to a String, int? + public static boolean syphonFromContainer(ItemStack stack, int toSyphon) { if (!(stack.getItem() instanceof IBindable)) return false; @@ -129,10 +128,9 @@ public class NetworkHelper { return false; SoulNetwork network = getSoulNetwork(binding); - SoulNetworkEvent.ItemDrainInContainerEvent event = new SoulNetworkEvent.ItemDrainInContainerEvent(stack, binding.getOwnerId(), toSyphon); - return !(MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) && network.syphon(event.syphon) >= toSyphon; + return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.syphon) >= toSyphon; } /** From 47b88b95b0f395387dc6a5d7f36041a43bb7a6e2 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 28 Jun 2018 18:24:17 -0700 Subject: [PATCH 207/493] Base work for ticket based syphoning To be used for providing a history. This commit breaks any usage of the network events. Heads up @TeamDMan @Arcaratus --- .../bloodmagic/core/data/SoulNetwork.java | 102 ++++++++----- .../bloodmagic/core/data/SoulTicket.java | 33 +++++ .../bloodmagic/event/SoulNetworkEvent.java | 139 ++++++++++-------- .../bloodmagic/util/BooleanResult.java | 24 +++ .../bloodmagic/util/helper/NetworkHelper.java | 9 +- 5 files changed, 203 insertions(+), 104 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java create mode 100644 src/main/java/WayofTime/bloodmagic/util/BooleanResult.java diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index 046c6b61..d0686067 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,24 +1,27 @@ package WayofTime.bloodmagic.core.data; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.event.AddToNetworkEvent; import WayofTime.bloodmagic.event.SoulNetworkEvent; +import WayofTime.bloodmagic.util.BMLog; +import WayofTime.bloodmagic.util.BooleanResult; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import com.google.common.base.Strings; +import com.google.common.collect.EvictingQueue; +import com.google.common.collect.ImmutableList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.INBTSerializable; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.Event; import javax.annotation.Nullable; +import java.util.List; +import java.util.Queue; import java.util.UUID; public class SoulNetwork implements INBTSerializable { + + private final Queue ticketHistory; private BMWorldSavedData parent; private EntityPlayer cachedPlayer; private UUID playerId; @@ -27,72 +30,93 @@ public class SoulNetwork implements INBTSerializable { private SoulNetwork() { // No-op - For creation via NBT only + ticketHistory = EvictingQueue.create(16); } - public int add(int toAdd, int maximum) { - AddToNetworkEvent event = new AddToNetworkEvent(playerId.toString(), toAdd, maximum); - + public int add(SoulTicket ticket, int maximum) { + SoulNetworkEvent.Fill event = new SoulNetworkEvent.Fill(this, ticket, maximum); if (MinecraftForge.EVENT_BUS.post(event)) return 0; - if (FMLCommonHandler.instance().getMinecraftServerInstance() == null) - return 0; - int currEss = getCurrentEssence(); - if (currEss >= event.maximum) + if (currEss >= event.getMaximum()) return 0; - int newEss = Math.min(event.maximum, currEss + event.addedAmount); - if (event.getResult() != Event.Result.DENY) - setCurrentEssence(newEss); + int newEss = Math.min(event.getMaximum(), currEss + event.getTicket().getAmount()); + setCurrentEssence(newEss); + ticketHistory.add(ticket); return newEss - currEss; } /** - * @deprecated - Please use {@link #add(int, int)} + * @deprecated For future proofing, use {@link #add(SoulTicket, int)} instead. + */ + @Deprecated + public int add(int toAdd, int maximum) { + return add(new SoulTicket(toAdd), maximum); + } + + /** + * @deprecated Use {@link #add(SoulTicket, int)} instead. */ @Deprecated public int addLifeEssence(int toAdd, int maximum) { return add(toAdd, maximum); } - public int syphon(int syphon) { + public int syphon(SoulTicket ticket) { + return syphon(ticket, false); + } + + public int syphon(SoulTicket ticket, boolean skipEvent) { + SoulNetworkEvent.Syphon event = new SoulNetworkEvent.Syphon(this, ticket); + if (!skipEvent && MinecraftForge.EVENT_BUS.post(event)) + return 0; + + int syphon = event.getTicket().getAmount(); if (getCurrentEssence() >= syphon) { setCurrentEssence(getCurrentEssence() - syphon); + ticketHistory.add(ticket); return syphon; } return 0; } - public boolean syphonAndDamage(EntityPlayer user, int toSyphon) { - if (user != null) { - if (user.getEntityWorld().isRemote) - return false; + /** + * @deprecated For future proofing, use {@link #syphon(SoulTicket)} instead. + */ + @Deprecated + public int syphon(int amount) { + return syphon(new SoulTicket(amount)); + } - if (!Strings.isNullOrEmpty(playerId.toString())) { - SoulNetworkEvent.ItemDrainNetworkEvent event = new SoulNetworkEvent.ItemDrainNetworkEvent(user, playerId, null, toSyphon); + public BooleanResult syphonAndDamage(EntityPlayer user, SoulTicket ticket) { + if (user.getEntityWorld().isRemote) + return BooleanResult.newResult(false, 0); - if (MinecraftForge.EVENT_BUS.post(event)) - return false; + SoulNetworkEvent.Syphon.User event = new SoulNetworkEvent.Syphon.User(this, ticket, user); - int drainAmount = syphon(event.syphon); + if (MinecraftForge.EVENT_BUS.post(event)) + return BooleanResult.newResult(false, 0); - if (drainAmount <= 0 || event.shouldDamage) - hurtPlayer(user, event.syphon); + int drainAmount = syphon(event.getTicket(), true); - return event.getResult() != Event.Result.DENY; - } + if (drainAmount <= 0 || event.shouldDamage()) + hurtPlayer(user, event.getTicket().getAmount()); - int amount = syphon(toSyphon); - hurtPlayer(user, toSyphon - amount); + ticketHistory.add(ticket); + return BooleanResult.newResult(true, event.getTicket().getAmount()); + } - return true; - } - - return false; + /** + * @deprecated Use {@link #syphonAndDamage(EntityPlayer, SoulTicket)} instead. + */ + @Deprecated + public boolean syphonAndDamage(EntityPlayer user, int amount) { + return syphonAndDamage(user, new SoulTicket(amount)).isSuccess(); } public void causeNausea() { @@ -180,6 +204,10 @@ public class SoulNetwork implements INBTSerializable { return this; } + public List getTicketHistory() { + return ImmutableList.copyOf(ticketHistory); + } + // INBTSerializable @Override diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java new file mode 100644 index 00000000..1f9c4c60 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java @@ -0,0 +1,33 @@ +package WayofTime.bloodmagic.core.data; + +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; + +public class SoulTicket { + + private static final ITextComponent EMPTY = new TextComponentString(""); + + private final ITextComponent description; + private final int amount; + + public SoulTicket(ITextComponent description, int amount) { + this.description = description; + this.amount = amount; + } + + public SoulTicket(int amount) { + this(EMPTY, amount); + } + + public boolean isSyphon() { + return amount < 0; + } + + public ITextComponent getDescription() { + return description; + } + + public int getAmount() { + return amount; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index cb962fdd..560b19a5 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -1,86 +1,99 @@ package WayofTime.bloodmagic.event; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; -import javax.annotation.Nullable; -import java.util.UUID; - -/** - * Base event class for Soul Network related events. - *

- * {@link #ownerUUID} contains the owner's UUID {@link #syphon} contains the - * amount of LP to be drained - */ public class SoulNetworkEvent extends Event { - public final UUID ownerUUID; - public int syphon; - public SoulNetworkEvent(UUID ownerUUID, int syphon) { - this.ownerUUID = ownerUUID; - this.syphon = syphon; + private final SoulNetwork network; + private SoulTicket ticket; + + public SoulNetworkEvent(SoulNetwork network, SoulTicket ticket) { + this.network = network; + this.ticket = ticket; } - /** - * This event is called when an - * {@link WayofTime.bloodmagic.iface.IBindable} is being drained - * inside of a {@link net.minecraft.tileentity.TileEntity}. - *

- * If canceled, the drain will not be executed. - */ - @Cancelable - public static class ItemDrainInContainerEvent extends SoulNetworkEvent { - public ItemStack stack; + public SoulNetwork getNetwork() { + return network; + } - public ItemDrainInContainerEvent(ItemStack stack, UUID ownerId, int syphon) { - super(ownerId, syphon); - this.stack = stack; + public SoulTicket getTicket() { + return ticket; + } + + public void setTicket(SoulTicket ticket) { + this.ticket = ticket; + } + + @Cancelable + public static class Syphon extends SoulNetworkEvent { + + private boolean shouldDamage; + + public Syphon(SoulNetwork network, SoulTicket ticket) { + super(network, ticket); } - } - /** - * This event is called when a {@link EntityPlayer} drains the Soul Network - *

- * If canceled, the drain will not be executed. - */ - @Cancelable - public static class PlayerDrainNetworkEvent extends SoulNetworkEvent { - public final EntityPlayer player; - // If true, will damage regardless of if the network had enough inside it - public boolean shouldDamage; + public boolean shouldDamage() { + return shouldDamage; + } - public PlayerDrainNetworkEvent(EntityPlayer player, UUID ownerId, int drainAmount) { - super(ownerId, drainAmount); - this.shouldDamage = false; - this.player = player; + public void setShouldDamage(boolean shouldDamage) { + this.shouldDamage = shouldDamage; + } + + public static class Item extends Syphon { + + private final ItemStack stack; + + public Item(SoulNetwork network, SoulTicket ticket, ItemStack stack) { + super(network, ticket); + + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } + } + + public static class User extends Syphon { + + private final EntityPlayer user; + + public User(SoulNetwork network, SoulTicket ticket, EntityPlayer user) { + super(network, ticket); + + this.user = user; + } + + public EntityPlayer getUser() { + return user; + } } } @Cancelable - public static class ItemDrainNetworkEvent extends PlayerDrainNetworkEvent { - @Nullable - public final ItemStack itemStack; - /** - * Amount of damage that would incur if the network could not drain - * properly - */ - public float damageAmount; + public static class Fill extends SoulNetworkEvent { - /** - * Set result to deny the action i.e. damage/drain anyways. Cancelling - * event prevents action without penalties - * - * @param player Player using the item - * @param ownerId Network that the item is tied to - * @param itemStack Item used - * @param drainAmount Original drain amount - change to alter cost - */ - public ItemDrainNetworkEvent(EntityPlayer player, UUID ownerId, @Nullable ItemStack itemStack, int drainAmount) { - super(player, ownerId, drainAmount); - this.itemStack = itemStack; - this.damageAmount = (float) (drainAmount) / 100.0f; + private int maximum; + + public Fill(SoulNetwork network, SoulTicket ticket, int maximum) { + super(network, ticket); + + this.maximum = maximum; + } + + public int getMaximum() { + return maximum; + } + + public void setMaximum(int maximum) { + this.maximum = maximum; } } } diff --git a/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java b/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java new file mode 100644 index 00000000..c4cb571f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java @@ -0,0 +1,24 @@ +package WayofTime.bloodmagic.util; + +public class BooleanResult { + + private final boolean result; + private final T value; + + private BooleanResult(boolean result, T value) { + this.result = result; + this.value = value; + } + + public boolean isSuccess() { + return result; + } + + public T getValue() { + return value; + } + + public static BooleanResult newResult(boolean success, T value) { + return new BooleanResult<>(success, value); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index bdc7f096..dbd07fc5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -1,8 +1,9 @@ package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.event.SoulNetworkEvent; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.core.registry.OrbRegistry; @@ -97,7 +98,7 @@ public class NetworkHelper { * @param user - User of the item. * @param toSyphon - Amount of LP to syphon * @return - Whether the action should be performed. - * @deprecated Use {@link #getSoulNetwork(EntityPlayer)} and {@link SoulNetwork#syphonAndDamage(EntityPlayer, int)} + * @deprecated Use {@link #getSoulNetwork(EntityPlayer)} and {@link SoulNetwork#syphonAndDamage(EntityPlayer, SoulTicket)} */ @Deprecated public static boolean syphonAndDamage(SoulNetwork soulNetwork, EntityPlayer user, int toSyphon) { @@ -128,9 +129,9 @@ public class NetworkHelper { return false; SoulNetwork network = getSoulNetwork(binding); - SoulNetworkEvent.ItemDrainInContainerEvent event = new SoulNetworkEvent.ItemDrainInContainerEvent(stack, binding.getOwnerId(), toSyphon); + SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, new SoulTicket(toSyphon), stack); - return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.syphon) >= toSyphon; + return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(), true) >= toSyphon; } /** From e3d65a9e3a91989ef29eb2dc02121077c5e31bba Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 28 Jun 2018 20:37:53 -0700 Subject: [PATCH 208/493] Rework of HUD element system Allows configuration because that's probably a good thing. The values in the json config are percentages of the screen. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 2 +- .../WayofTime/bloodmagic/client/Sprite.java | 2 + .../client/gui/GuiBloodMagicConfig.java | 63 ++++++ .../client/hud/ConfigEntryEditHUD.java | 39 ++++ .../bloodmagic/client/hud/ElementInfo.java | 39 ++++ .../client/hud/ElementRegistry.java | 148 +++++++++++++ .../bloodmagic/client/hud/Elements.java | 203 ++++++++++-------- .../bloodmagic/client/hud/GuiEditHUD.java | 183 ++++++++++++++++ .../bloodmagic/client/hud/HUDElement.java | 73 ------- .../client/hud/HUDElementCornerTile.java | 95 -------- .../ElementDemonAura.java} | 54 +++-- .../element/ElementDivinedInformation.java | 46 ++++ .../ElementHolding.java} | 43 ++-- .../client/hud/element/ElementItemStack.java | 23 ++ .../client/hud/element/ElementSprite.java | 20 ++ .../client/hud/element/ElementString.java | 36 ++++ .../hud/element/ElementTileInformation.java | 57 +++++ .../client/hud/element/HUDElement.java | 58 +++++ .../bloodmagic/proxy/ClientProxy.java | 2 +- .../util/handler/event/ClientHandler.java | 9 - .../assets/bloodmagic/lang/en_US.lang | 10 +- 21 files changed, 894 insertions(+), 311 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java rename src/main/java/WayofTime/bloodmagic/client/hud/{HUDElementDemonWillAura.java => element/ElementDemonAura.java} (52%) create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java rename src/main/java/WayofTime/bloodmagic/client/hud/{HUDElementHolding.java => element/ElementHolding.java} (60%) create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java create mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 630607c9..1374c78c 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -29,7 +29,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.io.File; import java.util.List; -@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND) +@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.GuiBloodMagicConfig$Factory") public class BloodMagic { public static final String MODID = "bloodmagic"; public static final String NAME = "Blood Magic: Alchemical Wizardry"; diff --git a/src/main/java/WayofTime/bloodmagic/client/Sprite.java b/src/main/java/WayofTime/bloodmagic/client/Sprite.java index 795286a0..cb92dcd1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/Sprite.java +++ b/src/main/java/WayofTime/bloodmagic/client/Sprite.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.client; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -42,6 +43,7 @@ public class Sprite { } public void draw(int x, int y) { + Minecraft.getMinecraft().renderEngine.bindTexture(textureLocation); float f = 0.00390625F; float f1 = 0.00390625F; Tessellator tessellator = Tessellator.getInstance(); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java new file mode 100644 index 00000000..a13b950c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java @@ -0,0 +1,63 @@ +package WayofTime.bloodmagic.client.gui; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.client.hud.ConfigEntryEditHUD; +import com.google.common.collect.Lists; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.config.DummyConfigElement; +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.IConfigElement; + +import java.util.Collections; +import java.util.List; +import java.util.Set; + +public class GuiBloodMagicConfig extends GuiConfig { + + public GuiBloodMagicConfig(GuiScreen parentScreen) { + super(parentScreen, getElements(), BloodMagic.MODID, false, false, BloodMagic.NAME); + } + + public static List getElements() { + List elements = Lists.newArrayList(); + + elements.addAll(ConfigElement.from(ConfigHandler.class).getChildElements()); + if (Minecraft.getMinecraft().world != null) + elements.add(new DummyElementEditHUD(BloodMagic.NAME, "config." + BloodMagic.MODID + ".edit_hud")); + + return elements; + } + + public static class DummyElementEditHUD extends DummyConfigElement.DummyCategoryElement { + + public DummyElementEditHUD(String name, String langKey) { + super(name, langKey, Collections.emptyList(), ConfigEntryEditHUD.class); + } + } + + public static class Factory implements IModGuiFactory { + @Override + public void initialize(Minecraft minecraftInstance) { + + } + + @Override + public boolean hasConfigGui() { + return true; + } + + @Override + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new GuiBloodMagicConfig(parentScreen); + } + + @Override + public Set runtimeGuiCategories() { + return null; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java new file mode 100644 index 00000000..d713e3b6 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java @@ -0,0 +1,39 @@ +package WayofTime.bloodmagic.client.hud; + +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.GuiConfigEntries; +import net.minecraftforge.fml.client.config.IConfigElement; + +public class ConfigEntryEditHUD extends GuiConfigEntries.CategoryEntry { + + public ConfigEntryEditHUD(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement element) { + super(owningScreen, owningEntryList, element); + + this.childScreen = new GuiEditHUD(owningScreen); + } + + @Override + public boolean isDefault() { + return true; + } + + @Override + public void setToDefault() { + ElementRegistry.resetPos(); + } + + @Override + public boolean isChanged() { + return ((GuiEditHUD) childScreen).changes; + } + + @Override + public void undoChanges() { + + } + + @Override + public boolean saveConfigElement() { + return false; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java new file mode 100644 index 00000000..9544dcdc --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java @@ -0,0 +1,39 @@ +package WayofTime.bloodmagic.client.hud; + +import javax.vecmath.Vector2f; + +public class ElementInfo { + + public static final ElementInfo DUMMY = new ElementInfo(new Vector2f(0F, 0F), ElementRegistry.getRandomColor()); + + private final Vector2f defaultPosition; + private final int boxColor; + private Vector2f currentPosition; + + public ElementInfo(Vector2f defaultPosition, int boxColor) { + this.defaultPosition = defaultPosition; + this.boxColor = boxColor; + this.currentPosition = defaultPosition; + } + + public Vector2f getDefaultPosition() { + return defaultPosition; + } + + public int getBoxColor() { + return boxColor; + } + + public ElementInfo setPosition(Vector2f position) { + this.currentPosition = position; + return this; + } + + public Vector2f getPosition() { + return currentPosition; + } + + public void resetPosition() { + this.currentPosition = defaultPosition; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java new file mode 100644 index 00000000..d83cb03c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java @@ -0,0 +1,148 @@ +package WayofTime.bloodmagic.client.hud; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.hud.element.HUDElement; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.vecmath.Vector2f; +import java.awt.Color; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.function.BiFunction; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Side.CLIENT) +public class ElementRegistry { + + private static final File CONFIG = new File(Loader.instance().getConfigDir(), BloodMagic.MODID + "/hud_elements.json"); + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final Map HUD_ELEMENTS = Maps.newLinkedHashMap(); + private static final Map REVERSE = Maps.newHashMap(); + private static final Map ELEMENT_INFO = Maps.newHashMap(); + + public static void registerHandler(ResourceLocation key, HUDElement element, Vector2f defaultPosition) { + HUD_ELEMENTS.put(key, element); + REVERSE.put(element, key); + + + ELEMENT_INFO.put(key, new ElementInfo(defaultPosition, getRandomColor())); + } + + public static void resetPos() { + ELEMENT_INFO.values().forEach(ElementInfo::resetPosition); + } + + public static List getElements() { + return ImmutableList.copyOf(HUD_ELEMENTS.values()); + } + + public static ResourceLocation getKey(HUDElement element) { + return REVERSE.get(element); + } + + public static int getColor(ResourceLocation element) { + return ELEMENT_INFO.getOrDefault(element, ElementInfo.DUMMY).getBoxColor(); + } + + public static Vector2f getPosition(ResourceLocation element) { + return ELEMENT_INFO.get(element).getPosition(); + } + + public static void setPosition(ResourceLocation element, Vector2f point) { + ELEMENT_INFO.compute(element, (resourceLocation, elementInfo) -> { + if (elementInfo == null) + return new ElementInfo(point, getRandomColor()); + + elementInfo.setPosition(point); + return elementInfo; + }); + } + + public static void save(Map newLocations) { + newLocations.forEach((k, v) -> { + ElementInfo info = ELEMENT_INFO.get(k); + if (info != null) + info.setPosition(v); + }); + + Map toWrite = Maps.newHashMap(); + for (Map.Entry entry : ELEMENT_INFO.entrySet()) + toWrite.put(entry.getKey().toString(), entry.getValue().getPosition()); + + String json = GSON.toJson(toWrite); + try (FileWriter writer = new FileWriter(CONFIG)) { + writer.write(json); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void readConfig() { + if (!CONFIG.exists()) + return; + + try (FileReader reader = new FileReader(CONFIG)) { + Map toLoad = GSON.fromJson(reader, new TypeToken>() {}.getType()); + for (Map.Entry entry : toLoad.entrySet()) { + ElementInfo info = ELEMENT_INFO.get(new ResourceLocation(entry.getKey())); + if (info != null) + info.setPosition(entry.getValue()); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public static void onRenderOverlay(RenderGameOverlayEvent.Pre event) { + if (event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR) { + ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + + for (HUDElement element : HUD_ELEMENTS.values()) { + if (!element.shouldRender(Minecraft.getMinecraft())) + continue; + + Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition(); + int xPos = (int) (resolution.getScaledWidth_double() * position.x); + if (xPos - element.getWidth() < 0) + xPos *= 2; + if (xPos + element.getWidth() > resolution.getScaledWidth()) + xPos -= element.getWidth(); + + int yPos = (int) (resolution.getScaledHeight_double() * position.y); + if (yPos - element.getHeight() < 0) + yPos *= 2; + if (yPos + element.getHeight() > resolution.getScaledHeight()) + yPos -= element.getHeight(); + + element.draw(event.getResolution(), event.getPartialTicks(), xPos, yPos); + } + } + } + + public static int getRandomColor() { + Random rand = new Random(); + float r = rand.nextFloat() / 2F + 0.5F; + float g = rand.nextFloat() / 2F + 0.5F; + float b = rand.nextFloat() / 2F + 0.5F; + float a = 0.5F; + return new Color(r, g, b, a).getRGB(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java b/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java index 6c507d1a..cc11d92c 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java @@ -2,100 +2,135 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.Sprite; +import WayofTime.bloodmagic.client.hud.element.ElementDemonAura; +import WayofTime.bloodmagic.client.hud.element.ElementDivinedInformation; +import WayofTime.bloodmagic.client.hud.element.ElementHolding; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.tile.TileInversionPillar; import WayofTime.bloodmagic.util.helper.NumeralHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; import org.apache.commons.lang3.tuple.Pair; -import java.util.List; +import javax.vecmath.Vector2f; +import java.awt.Point; +import java.util.function.Consumer; import java.util.function.Function; public class Elements { - public static void createHUDElements() { - new HUDElementHolding(); - new HUDElementDemonWillAura(); - // Blood Altar with Divination Sigil - new HUDElementCornerTile.DivinedView(TileAltar.class, true) { - @Override - protected void addInformation(List>> information) { - // Current tier - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), - altar -> NumeralHelper.toRoman(altar.getTier().toInt()) - )); - // Stored/Capacity - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), - altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()) - )); - } - }; - // Blood Altar with Seers Sigil - new HUDElementCornerTile.DivinedView(TileAltar.class, false) { - @Override - protected void addInformation(List>> information) { - // Current tier - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), - altar -> NumeralHelper.toRoman(altar.getTier().toInt()) - )); - // Stored/Capacity - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), - altar -> String.format("%d/%d", altar.getCurrentBlood(), altar.getCapacity()) - )); - // Crafting progress/Crafting requirement - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), - altar -> { - if (!altar.isActive()) - return "Inactive"; // FIXME localize - int progress = altar.getProgress(); - int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); - return String.format("%d/%d", progress, totalLiquidRequired); - } - )); - // Consumption rate - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), - altar -> String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))) - )); - // Total charge - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), - altar -> String.valueOf(altar.getTotalCharge()) - )); - } - }; - // Incense Altar - new HUDElementCornerTile.DivinedView(TileIncenseAltar.class, true) { - @Override - protected void addInformation(List>> information) { - // Current tranquility - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 80, 46, 16, 16), - incense -> String.valueOf((int) ((100D * (int) (100 * incense.tranquility)) / 100D)) - )); - // Sacrifice bonus - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 96, 46, 16, 16), - incense -> String.valueOf((int) (100 * incense.incenseAddition)) - )); - } - }; - // Inversion Pillar - new HUDElementCornerTile.DivinedView(TileInversionPillar.class, true) { - @Override - protected void addInformation(List>> information) { - // Current inversion - information.add(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 112, 46, 16, 16), - pillar -> String.valueOf(((int) (10 * pillar.getCurrentInversion())) / 10D) - )); - } - }; + public static void registerElements() { + ElementRegistry.registerHandler( + new ResourceLocation(BloodMagic.MODID, "blood_altar"), + new ElementDivinedInformation(2, true, TileAltar.class) { + @Override + public void gatherInformation(Consumer>> information) { + // Current tier + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), + altar -> altar == null ? "IV" : NumeralHelper.toRoman(altar.getTier().toInt()) + )); + // Stored/Capacity + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), + altar -> String.format("%d/%d", altar == null ? 0 : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity()) + )); + } + }, + new Vector2f(0.01F, 0.01F) + ); + + ElementRegistry.registerHandler( + new ResourceLocation(BloodMagic.MODID, "blood_altar_adv"), + new ElementDivinedInformation(5, false, TileAltar.class) { + @Override + public void gatherInformation(Consumer>> information) { + // Current tier + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), + altar -> altar == null ? "IV" : NumeralHelper.toRoman(altar.getTier().toInt()) + )); + // Stored/Capacity + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), + altar -> String.format("%d/%d", altar == null ? 0 : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity()) + )); + // Crafting progress/Crafting requirement + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), + altar -> { + if (altar == null || !altar.isActive()) + return I18n.format("hud.bloodmagic.inactive"); + int progress = altar.getProgress(); + int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); + return String.format("%d/%d", progress, totalLiquidRequired); + } + )); + // Consumption rate + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), + altar -> altar == null ? "0" : String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))) + )); + // Total charge + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), + altar -> altar == null ? "0" : String.valueOf(altar.getTotalCharge()) + )); + } + }, + new Vector2f(0.01F, 0.01F) + ); + + ElementRegistry.registerHandler( + new ResourceLocation(BloodMagic.MODID, "incense_altar"), + new ElementDivinedInformation(2, true, TileIncenseAltar.class) { + @Override + public void gatherInformation(Consumer>> information) { + // Current tranquility + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 80, 46, 16, 16), + incense -> incense == null ? "0" : String.valueOf((int) ((100D * (int) (100 * incense.tranquility)) / 100D)) + )); + // Sacrifice bonus + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 96, 46, 16, 16), + incense -> incense == null ? "0" : String.valueOf((int) (100 * incense.incenseAddition)) + )); + } + }, + new Vector2f(0.01F, 0.01F) + ); + + ElementRegistry.registerHandler( + new ResourceLocation(BloodMagic.MODID, "inversion_pillar"), + new ElementDivinedInformation(1, true, TileInversionPillar.class) { + @Override + public void gatherInformation(Consumer>> information) { + // Current inversion + information.accept(Pair.of( + new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 112, 46, 16, 16), + pillar -> pillar == null ? "0" : String.valueOf(((int) (10 * pillar.getCurrentInversion())) / 10D) + )); + } + }, + new Vector2f(0.01F, 0.01F) + ); + + ElementRegistry.registerHandler( + new ResourceLocation(BloodMagic.MODID, "demon_will_aura"), + new ElementDemonAura(), + new Vector2f(0.01F, 0.01F) + ); + + ElementRegistry.registerHandler( + new ResourceLocation(BloodMagic.MODID, "holding"), + new ElementHolding(), + new Vector2f(0.72F, 1.0F) + ); + + ElementRegistry.readConfig(); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java new file mode 100644 index 00000000..a25a5b6c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java @@ -0,0 +1,183 @@ +package WayofTime.bloodmagic.client.hud; + +import WayofTime.bloodmagic.client.hud.element.HUDElement; +import com.google.common.collect.Maps; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.config.GuiButtonExt; +import org.lwjgl.input.Keyboard; + +import javax.annotation.Nullable; +import javax.vecmath.Vector2f; +import java.awt.Point; +import java.util.Map; + +public class GuiEditHUD extends GuiScreen { + + private static final int LINE_COLOR = 0x2D2D2D; + + private final GuiScreen parent; + private final Map currentOverrides = Maps.newHashMap(); + private HUDElement dragged; + public boolean changes; + + public GuiEditHUD(GuiScreen parent) { + this.parent = parent; + } + + @Override + public void initGui() { + super.initGui(); + + addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")){{enabled = false;}}); + addButton(new GuiButtonExt(1, width / 2 - 75, height - 30, 70, 20, I18n.format("gui.bloodmagic.default"))); + addButton(new GuiButtonExt(2, width / 2 + 5, height - 30, 70, 20, I18n.format("gui.bloodmagic.save"))); + addButton(new GuiButtonExt(3, width / 2 + 90, height - 30, 70, 20, I18n.format("gui.bloodmagic.cancel"))); + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + + ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + for (HUDElement element : ElementRegistry.getElements()) { + if (dragged == element) + continue; + + ResourceLocation key = ElementRegistry.getKey(element); + Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key)); + int xPos = (int) (resolution.getScaledWidth_double() * position.x); + int yPos = (int) (resolution.getScaledHeight_double() * position.y); + + drawWithBox(resolution, element, partialTicks, xPos, yPos); + } + + if (dragged != null) { + Point bounded = getBoundedDrag(resolution, mouseX, mouseY); + drawWithBox(resolution, dragged, partialTicks, bounded.x, bounded.y); + } + } + + @Override + public boolean doesGuiPauseGame() { + return true; + } + + @Override + protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { + if (dragged != null) + return; + + HUDElement element = getHoveredElement(mouseX, mouseY); + if (element == null) + return; + + if (clickedMouseButton == 0) + dragged = element; + } + + @Override + protected void mouseReleased(int mouseX, int mouseY, int state) { + if (dragged != null) { + ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + Point bounded = getBoundedDrag(resolution, mouseX, mouseY); + float xPos = (float) ((bounded.x) / resolution.getScaledWidth_double()); + float yPos = (float) ((bounded.y) / resolution.getScaledHeight_double()); + + currentOverrides.put(ElementRegistry.getKey(dragged), new Vector2f(xPos, yPos)); + changes = true; + dragged = null; + return; + } + + super.mouseReleased(mouseX, mouseY, state); + } + + @Override + protected void actionPerformed(GuiButton button) { + switch (button.id) { + case 0: { + Minecraft.getMinecraft().displayGuiScreen(parent); + break; + } + case 1: { + currentOverrides.clear(); + ElementRegistry.resetPos(); + changes = false; + break; + } + case 2: { + ElementRegistry.save(currentOverrides); + Minecraft.getMinecraft().displayGuiScreen(parent); + break; + } + case 3: { + currentOverrides.clear(); + Minecraft.getMinecraft().displayGuiScreen(parent); + break; + } + } + } + + @Nullable + public HUDElement getHoveredElement(int mouseX, int mouseY) { + for (HUDElement element : ElementRegistry.getElements()) { + ResourceLocation key = ElementRegistry.getKey(element); + Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key)); + ScaledResolution resolution = new ScaledResolution(mc); + int xPos = (int) (resolution.getScaledWidth_double() * position.x); + int yPos = (int) (resolution.getScaledHeight_double() * position.y); + + if (mouseX < xPos || mouseX > xPos + element.getWidth()) + continue; + + if (mouseY < yPos || mouseY > yPos + element.getHeight()) + continue; + + return element; + } + + return null; + } + + protected Point getBoundedDrag(ScaledResolution resolution, int mouseX, int mouseY) { + int drawX = mouseX - dragged.getWidth() / 2; + if (drawX + dragged.getWidth() >= resolution.getScaledWidth()) + drawX = resolution.getScaledWidth() - dragged.getWidth(); + if (drawX < 0) + drawX = 0; + + int drawY = mouseY - dragged.getHeight() / 2; + if (drawY + dragged.getHeight() >= resolution.getScaledHeight()) + drawY = resolution.getScaledHeight() - dragged.getHeight(); + if (drawY < 0) + drawY = 0; + + return new Point(drawX, drawY); + } + + protected void drawWithBox(ScaledResolution resolution, HUDElement element, float partialTicks, int drawX, int drawY) { + int color = ElementRegistry.getColor(ElementRegistry.getKey(element)); + GlStateManager.pushMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + drawVerticalLine(drawX, drawY, drawY + element.getHeight() - 1, color); + drawVerticalLine(drawX + element.getWidth() - 1, drawY, drawY + element.getHeight() - 1, color); + drawHorizontalLine(drawX, drawX + element.getWidth() - 1, drawY, color); + drawHorizontalLine(drawX, drawX + element.getWidth() - 1, drawY + element.getHeight() - 1, color); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + GlStateManager.popMatrix(); + GlStateManager.color(1.0F, 1.0F, 1.0F); + GlStateManager.enableTexture2D(); + element.draw(resolution, partialTicks, drawX, drawY); + GlStateManager.disableTexture2D(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java deleted file mode 100644 index c9a605a5..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import WayofTime.bloodmagic.util.handler.event.ClientHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraftforge.client.event.RenderGameOverlayEvent; - -public abstract class HUDElement { - private final int xOffsetDefault; - private final int yOffsetDefault; - private final RenderGameOverlayEvent.ElementType elementType; - private int xOffset; - private int yOffset; - - public HUDElement(int xOffset, int yOffset, RenderGameOverlayEvent.ElementType elementType) { - this.xOffset = xOffset; - this.xOffsetDefault = xOffset; - this.yOffset = yOffset; - this.yOffsetDefault = yOffset; - this.elementType = elementType; - - ClientHandler.hudElements.add(this); - } - - public abstract void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks); - - public abstract boolean shouldRender(Minecraft minecraft); - - public void onPositionChanged() { - - } - - public void resetToDefault() { - this.xOffset = xOffsetDefault; - this.yOffset = yOffsetDefault; - } - - public void drawTexturedModalRect(double x, double y, double textureX, double textureY, double width, double height) { - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder buffer = tessellator.getBuffer(); - buffer.begin(7, DefaultVertexFormats.POSITION_TEX); - buffer.pos(x + 0, y + height, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - buffer.pos(x + width, y + height, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - buffer.pos(x + width, y + 0, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); - buffer.pos(x + 0, y + 0, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); - tessellator.draw(); - } - - public int getXOffset() { - return xOffset; - } - - public int getYOffset() { - return yOffset; - } - - public int getXOffsetDefault() { - return xOffsetDefault; - } - - public int getYOffsetDefault() { - return yOffsetDefault; - } - - public RenderGameOverlayEvent.ElementType getElementType() { - return elementType; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java deleted file mode 100644 index fac02451..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementCornerTile.java +++ /dev/null @@ -1,95 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import WayofTime.bloodmagic.client.Sprite; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.RayTraceResult; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import org.apache.commons.lang3.tuple.Pair; - -import java.awt.Color; -import java.util.List; -import java.util.function.Function; - -public abstract class HUDElementCornerTile extends HUDElement { - - protected final List>> information; - - public HUDElementCornerTile() { - super(5, 5, RenderGameOverlayEvent.ElementType.HOTBAR); - - this.information = Lists.newArrayList(); - addInformation(information); - } - - protected abstract void addInformation(List>> information); - - @SuppressWarnings("unchecked") - @Override - public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) { - T tile = (T) Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); - - int yOffset = 0; - for (Pair> sprite : information) { - Minecraft.getMinecraft().renderEngine.bindTexture(sprite.getLeft().getTextureLocation()); - sprite.getLeft().draw(getXOffset(), getYOffset() + yOffset); - int textY = getYOffset() + yOffset + (sprite.getLeft().getTextureHeight() / 4); - Minecraft.getMinecraft().fontRenderer.drawStringWithShadow(sprite.getRight().apply(tile), getXOffset() + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); - yOffset += sprite.getLeft().getTextureHeight() + 2; - } - } - - public static abstract class DivinedView extends HUDElementCornerTile { - - private final Class tileClass; - private final boolean simple; - - public DivinedView(Class tileClass, boolean simple) { - this.tileClass = tileClass; - this.simple = simple; - } - - @Override - public boolean shouldRender(Minecraft minecraft) { - EntityPlayer player = Minecraft.getMinecraft().player; - ItemStack sigilStack = player.getHeldItem(EnumHand.MAIN_HAND); - boolean flag = false; - if (simple) { - if (sigilStack.getItem() instanceof ItemSigilDivination) - flag = true; - - if (!flag) { - sigilStack = player.getHeldItem(EnumHand.OFF_HAND); - if (sigilStack.getItem() instanceof ItemSigilDivination) - flag = true; - } - } else { - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - flag = true; - - if (!flag) { - sigilStack = player.getHeldItem(EnumHand.OFF_HAND); - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - flag = true; - } - } - - RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; - if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) - return false; - - TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(trace.getBlockPos()); - if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) - flag = false; - - return flag; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java similarity index 52% rename from src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java rename to src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java index 20003b61..29c7a889 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java @@ -1,51 +1,50 @@ -package WayofTime.bloodmagic.client.hud; +package WayofTime.bloodmagic.client.hud.element; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.Utils; +import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import java.util.ArrayList; import java.util.List; -public class HUDElementDemonWillAura extends HUDElement { - protected List barOrder = new ArrayList<>(); +public class ElementDemonAura extends HUDElement { - public HUDElementDemonWillAura() { - super(5, 5, RenderGameOverlayEvent.ElementType.HOTBAR); + private static final ResourceLocation BAR_LOCATION = new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png"); - barOrder.add(EnumDemonWillType.DEFAULT); - barOrder.add(EnumDemonWillType.CORROSIVE); - barOrder.add(EnumDemonWillType.STEADFAST); - barOrder.add(EnumDemonWillType.DESTRUCTIVE); - barOrder.add(EnumDemonWillType.VENGEFUL); + private final List orderedTypes = Lists.newArrayList( + EnumDemonWillType.DEFAULT, + EnumDemonWillType.CORROSIVE, + EnumDemonWillType.STEADFAST, + EnumDemonWillType.DESTRUCTIVE, + EnumDemonWillType.VENGEFUL + ); + + public ElementDemonAura() { + super(80, 46); } @Override - public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) { + public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { + Minecraft minecraft = Minecraft.getMinecraft(); EntityPlayer player = minecraft.player; - if (!Utils.canPlayerSeeDemonWill(player)) { - return; - } - - minecraft.getTextureManager().bindTexture(new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png")); + minecraft.getTextureManager().bindTexture(BAR_LOCATION); GlStateManager.color(1.0F, 1.0F, 1.0F); - this.drawTexturedModalRect(getXOffset(), getYOffset(), 0, 105 * 2, 80, 46); + this.drawTexturedModalRect(drawX, drawY, 0, 210, 80, 46); double maxAmount = Utils.getDemonWillResolution(player); int i = 0; - for (EnumDemonWillType type : barOrder) { + for (EnumDemonWillType type : orderedTypes) { i++; GlStateManager.color(1.0F, 1.0F, 1.0F); - minecraft.getTextureManager().bindTexture(new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png")); + minecraft.getTextureManager().bindTexture(BAR_LOCATION); int textureXOffset = (i > 3) ? (i - 3) : (3 - i); int maxBarSize = 30 - 2 * textureXOffset; @@ -54,8 +53,8 @@ public class HUDElementDemonWillAura extends HUDElement { double width = maxBarSize * ratio * 2; double height = 2; - double x = getXOffset() + 2 * textureXOffset + 10; - double y = getYOffset() + 4 * i + 10; + double x = drawX + 2 * textureXOffset + 10; + double y = drawY + 4 * i + 10; double textureX = 2 * textureXOffset + 2 * 42; double textureY = 4 * i + 220; @@ -64,10 +63,9 @@ public class HUDElementDemonWillAura extends HUDElement { if (player.isSneaking()) { GlStateManager.pushMatrix(); - String value = "" + (int) amount; - GlStateManager.translate(x - 2 * textureXOffset - value.length() * 0 + 70, (y - 1), 0); + GlStateManager.translate(x - 2 * textureXOffset + 70, (y - 1), 0); GlStateManager.scale(0.5, 0.5, 1); - minecraft.fontRenderer.drawStringWithShadow("" + (int) amount, 0, 2, 0xffffff); + minecraft.fontRenderer.drawStringWithShadow(String.valueOf((int) amount), 0, 2, 0xffffff); GlStateManager.popMatrix(); } } @@ -75,6 +73,6 @@ public class HUDElementDemonWillAura extends HUDElement { @Override public boolean shouldRender(Minecraft minecraft) { - return true; + return Utils.canPlayerSeeDemonWill(Minecraft.getMinecraft().player); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java new file mode 100644 index 00000000..c8244775 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -0,0 +1,46 @@ +package WayofTime.bloodmagic.client.hud.element; + +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; + +public abstract class ElementDivinedInformation extends ElementTileInformation { + + private final boolean simple; + + public ElementDivinedInformation(int lines, boolean simple, Class tileClass) { + super(100, lines, tileClass); + this.simple = simple; + } + + @Override + public boolean shouldRender(Minecraft minecraft) { + EntityPlayer player = Minecraft.getMinecraft().player; + ItemStack sigilStack = player.getHeldItem(EnumHand.MAIN_HAND); + boolean flag = false; + if (simple) { + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION) + flag = true; + + if (!flag) { + sigilStack = player.getHeldItem(EnumHand.OFF_HAND); + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION) + flag = true; + } + } else { + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) + flag = true; + + if (!flag) { + sigilStack = player.getHeldItem(EnumHand.OFF_HAND); + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) + flag = true; + } + } + + return super.shouldRender(minecraft) && flag; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java similarity index 60% rename from src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java rename to src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java index 5524e074..d2656658 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java @@ -1,28 +1,34 @@ -package WayofTime.bloodmagic.client.hud; +package WayofTime.bloodmagic.client.hud.element; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.client.Sprite; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderGameOverlayEvent; import java.util.List; -public class HUDElementHolding extends HUDElement { +public class ElementHolding extends HUDElement { - public HUDElementHolding() { - super(0, 0, RenderGameOverlayEvent.ElementType.HOTBAR); + private static final Sprite HOLDING_BAR = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 0, 102, 22); + private static final Sprite SELECTED_OVERLAY = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 22, 24, 24); + + public ElementHolding() { + super(HOLDING_BAR.getTextureWidth(), HOLDING_BAR.getTextureHeight()); } @Override - public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) { + public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { + GlStateManager.color(1.0F, 1.0F, 1.0F); + HOLDING_BAR.draw(drawX, drawY); + + Minecraft minecraft = Minecraft.getMinecraft(); ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); // Check mainhand for Sigil of Holding if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) @@ -31,27 +37,28 @@ public class HUDElementHolding extends HUDElement { if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) return; - Gui ingameGui = minecraft.ingameGUI; - - minecraft.getTextureManager().bindTexture(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png")); - GlStateManager.color(1.0F, 1.0F, 1.0F); - ingameGui.drawTexturedModalRect(resolution.getScaledWidth() / 2 + 100 + getXOffset(), resolution.getScaledHeight() - 22 + getYOffset(), 0, 0, 102, 22); int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilHolding); - ingameGui.drawTexturedModalRect(resolution.getScaledWidth() / 2 + 99 + (currentSlot * 20) + getXOffset(), resolution.getScaledHeight() - 23 + getYOffset(), 0, 22, 24, 24); + SELECTED_OVERLAY.draw(drawX - 1 + (currentSlot * 20), drawY - 1); RenderHelper.enableGUIStandardItemLighting(); - List holdingInv = ItemSigilHolding.getInternalInventory(sigilHolding); + List inventory = ItemSigilHolding.getInternalInventory(sigilHolding); int xOffset = 0; - for (ItemStack sigil : holdingInv) { - renderHotbarItem(resolution.getScaledWidth() / 2 + 103 + xOffset + getXOffset(), resolution.getScaledHeight() - 18 + getYOffset(), partialTicks, minecraft.player, sigil); + for (ItemStack stack : inventory) { + renderHotbarItem(drawX + 3 + xOffset, drawY - 4, partialTicks, minecraft.player, stack); xOffset += 20; } - - RenderHelper.disableStandardItemLighting(); } @Override public boolean shouldRender(Minecraft minecraft) { + ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); + // Check mainhand for Sigil of Holding + if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) + sigilHolding = minecraft.player.getHeldItemOffhand(); + // Check offhand for Sigil of Holding + if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) + return false; + return true; } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java new file mode 100644 index 00000000..5f783e55 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java @@ -0,0 +1,23 @@ +package WayofTime.bloodmagic.client.hud.element; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.item.ItemStack; + +public class ElementItemStack extends HUDElement { + private ItemStack stack; + + public ElementItemStack(ItemStack stack) { + super(16, 16); + + this.stack = stack; + } + + @Override + public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { + RenderHelper.enableGUIStandardItemLighting(); + Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(stack, drawX, drawY); + RenderHelper.disableStandardItemLighting(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java new file mode 100644 index 00000000..e574ffef --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java @@ -0,0 +1,20 @@ +package WayofTime.bloodmagic.client.hud.element; + +import WayofTime.bloodmagic.client.Sprite; +import net.minecraft.client.gui.ScaledResolution; + +public class ElementSprite extends HUDElement { + + private final Sprite sprite; + + public ElementSprite(Sprite sprite) { + super(sprite.getTextureWidth(), sprite.getTextureHeight()); + + this.sprite = sprite; + } + + @Override + public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { + sprite.draw(drawX, drawY); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java new file mode 100644 index 00000000..419ebe25 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java @@ -0,0 +1,36 @@ +package WayofTime.bloodmagic.client.hud.element; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.util.text.ITextComponent; + +public class ElementString extends HUDElement { + + private ITextComponent[] display; + + public ElementString(ITextComponent... display) { + super(getMaxStringWidth(display), (Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 2) * display.length - 2); + + this.display = display; + } + + @Override + public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + for (ITextComponent drawText : display) { + fontRenderer.drawStringWithShadow(drawText.getFormattedText(), drawX, drawY, 14737632); + drawY += fontRenderer.FONT_HEIGHT + 2; + } + } + + private static int getMaxStringWidth(ITextComponent... display) { + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + int maxWidth = 0; + for (ITextComponent drawText : display) + if (fontRenderer.getStringWidth(drawText.getFormattedText()) > maxWidth) + maxWidth = fontRenderer.getStringWidth(drawText.getFormattedText()); + + return maxWidth; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java new file mode 100644 index 00000000..f8092cf6 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java @@ -0,0 +1,57 @@ +package WayofTime.bloodmagic.client.hud.element; + +import WayofTime.bloodmagic.client.Sprite; +import com.google.common.collect.Lists; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.RayTraceResult; +import org.apache.commons.lang3.tuple.Pair; + +import java.awt.Color; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; + +public abstract class ElementTileInformation extends HUDElement { + + protected final Class tileClass; + private final List>> information; + + public ElementTileInformation(int width, int lines, Class tileClass) { + super(width, 18 * lines - 2); + + this.tileClass = tileClass; + this.information = Lists.newArrayList(); + gatherInformation(information::add); + } + + public abstract void gatherInformation(Consumer>> information); + + @SuppressWarnings("unchecked") + @Override + public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { + T tile = (T) Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); + + int yOffset = 0; + for (Pair> sprite : information) { + sprite.getLeft().draw(drawX, drawY + yOffset); + int textY = drawY + yOffset + (sprite.getLeft().getTextureHeight() / 4); + Minecraft.getMinecraft().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); + yOffset += sprite.getLeft().getTextureHeight() + 2; + } + } + + @Override + public boolean shouldRender(Minecraft minecraft) { + RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; + if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) + return false; + + TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(trace.getBlockPos()); + if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) + return false; + + return true; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java new file mode 100644 index 00000000..10eed1cd --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java @@ -0,0 +1,58 @@ +package WayofTime.bloodmagic.client.hud.element; + +import WayofTime.bloodmagic.client.hud.ElementRegistry; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.vecmath.Vector2f; +import java.awt.Point; + +@SideOnly(Side.CLIENT) +public abstract class HUDElement { + + private int width; + private int height; + + public HUDElement(int width, int height) { + this.width = width; + this.height = height; + } + + public boolean shouldRender(Minecraft minecraft) { + return true; + } + + public abstract void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY); + + public final int getWidth() { + return width; + } + + public final int getHeight() { + return height; + } + + protected void drawTexturedModalRect(double x, double y, double textureX, double textureY, double width, double height) { + float f = 0.00390625F; + float f1 = 0.00390625F; + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(7, DefaultVertexFormats.POSITION_TEX); + buffer.pos(x + 0, y + height, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex(); + buffer.pos(x + width, y + height, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); + buffer.pos(x + width, y + 0, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); + buffer.pos(x + 0, y + 0, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); + tessellator.draw(); + } + + @Override + public String toString() { + Vector2f point = ElementRegistry.getPosition(ElementRegistry.getKey(this)); + return ElementRegistry.getKey(this) + "@" + point.x + "," + point.y; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 87256a18..f8dd774e 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -132,7 +132,7 @@ public class ClientProxy extends CommonProxy @Override public void postInit() { - Elements.createHUDElements(); + Elements.registerElements(); } private void addElytraLayer() diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index ebc027cd..15575efb 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -7,7 +7,6 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.RitualComponent; -import WayofTime.bloodmagic.client.hud.HUDElement; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -57,7 +56,6 @@ import java.util.*; public class ClientHandler { // Quick toggle for error suppression. Set to false if you wish to hide model errors. public static final boolean SUPPRESS_ASSET_ERRORS = true; - public static final List hudElements = new ArrayList<>(); public static TextureAtlasSprite ritualStoneBlank; public static TextureAtlasSprite ritualStoneWater; public static TextureAtlasSprite ritualStoneFire; @@ -175,13 +173,6 @@ public class ClientHandler { keyBinding.handleKeybind(); } - @SubscribeEvent - public static void onHudRender(RenderGameOverlayEvent.Pre event) { - for (HUDElement element : hudElements) - if (element.getElementType() == event.getType() && element.shouldRender(minecraft)) - element.render(minecraft, event.getResolution(), event.getPartialTicks()); - } - // Stolen from Chisel @SubscribeEvent public static void onModelBake(ModelBakeEvent event) { diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index b4b2e0b5..e9227fde 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -374,6 +374,9 @@ tile.bloodmagic.stairs3.steadfast.name=Steadfast Stone Stairs # Fluids fluid.lifeEssence=Life Essence +# HUD +hud.bloodmagic.inactive=Inactive + # Tooltips tooltip.bloodmagic.extraInfo=&9-Hold shift for more info- @@ -828,8 +831,6 @@ commands.bind.remove.success=Unbinding successful commands.orb.usage=/bloodmagic orb [set|get] player [tier] commands.orb.help=Used to set or get the Player's max Blood Orb tier. -commands.bind.usage=/bind -commands.bind.success=Item successfully bound! commands.bind.failed.noPlayer=There is no player specified commands.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it commands.bind.failed.notBindable=Item cannot be bound @@ -851,6 +852,11 @@ commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb # GUI tile.bloodmagic.inputNode.name=Input Node tile.bloodmagic.outputNode.name=Output Node +gui.bloodmagic.save=Save +gui.bloodmagic.cancel=Cancel +gui.bloodmagic.default=Default +gui.bloodmagic.toggle=Toggle +config.bloodmagic.edit_hud=Edit HUD Elements # Keybinds bloodmagic.keybind.open_holding=Open Sigil of Holding From 42c69eb5571b1b7c0f8e222bcee87f4b41c32257 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 28 Jun 2018 21:56:25 -0700 Subject: [PATCH 209/493] Rework of ritual registration Moves to annotation based registration. Configs are handled for automatically --- .../java/WayofTime/bloodmagic/BloodMagic.java | 14 +- .../WayofTime/bloodmagic/ConfigHandler.java | 47 +----- .../block/BlockRitualController.java | 29 ++-- .../client/gui/GuiBloodMagicConfig.java | 1 + .../DataProviderRitualController.java | 9 +- .../bloodmagic/item/ItemRitualDiviner.java | 100 +++--------- .../bloodmagic/registry/ModRituals.java | 138 +--------------- .../WayofTime/bloodmagic/ritual/Ritual.java | 3 +- .../bloodmagic/ritual/RitualManager.java | 148 ++++++++++++++++++ .../bloodmagic/ritual/RitualRegister.java | 49 ++++++ .../bloodmagic/ritual/RitualRegistry.java | 124 --------------- .../ritual/imperfect/ImperfectRitual.java | 4 +- .../imperfect/ImperfectRitualRegistry.java | 99 ------------ .../ritual/types/RitualAltarBuilder.java | 6 +- .../ritual/types/RitualAnimalGrowth.java | 1 + .../ritual/types/RitualArmourEvolve.java | 1 + .../ritual/types/RitualCobblestone.java | 1 + .../ritual/types/RitualContainment.java | 1 + .../ritual/types/RitualCrushing.java | 1 + .../ritual/types/RitualCrystalHarvest.java | 1 + .../ritual/types/RitualCrystalSplit.java | 6 +- .../ritual/types/RitualEllipsoid.java | 7 +- .../ritual/types/RitualExpulsion.java | 1 + .../ritual/types/RitualFeatheredKnife.java | 1 + .../ritual/types/RitualFelling.java | 1 + .../ritual/types/RitualForsakenSoul.java | 1 + .../ritual/types/RitualFullStomach.java | 1 + .../ritual/types/RitualGreenGrove.java | 1 + .../ritual/types/RitualHarvest.java | 1 + .../ritual/types/RitualInterdiction.java | 1 + .../ritual/types/RitualJumping.java | 1 + .../bloodmagic/ritual/types/RitualLava.java | 1 + .../types/RitualLivingArmourDowngrade.java | 1 + .../bloodmagic/ritual/types/RitualMeteor.java | 1 + .../bloodmagic/ritual/types/RitualPlacer.java | 1 + .../bloodmagic/ritual/types/RitualPortal.java | 6 +- .../bloodmagic/ritual/types/RitualPump.java | 1 + .../ritual/types/RitualRegeneration.java | 1 + .../bloodmagic/ritual/types/RitualSpeed.java | 1 + .../ritual/types/RitualSuppression.java | 1 + .../ritual/types/RitualUpgradeRemove.java | 1 + .../bloodmagic/ritual/types/RitualWater.java | 1 + .../ritual/types/RitualWellOfSuffering.java | 1 + .../bloodmagic/ritual/types/RitualZephyr.java | 1 + .../types/imperfect/ImperfectRitualDay.java | 1 + .../types/imperfect/ImperfectRitualNight.java | 2 + .../types/imperfect/ImperfectRitualRain.java | 2 + .../imperfect/ImperfectRitualResistance.java | 2 + .../imperfect/ImperfectRitualZombie.java | 2 + .../tile/TileImperfectRitualStone.java | 8 +- .../tile/TileMasterRitualStone.java | 11 +- .../util/handler/event/ClientHandler.java | 3 +- .../bloodmagic/util/helper/RitualHelper.java | 40 ++--- .../assets/bloodmagic/lang/en_US.lang | 2 +- 54 files changed, 321 insertions(+), 569 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 1374c78c..c132d776 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.ritual.RitualManager; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; @@ -19,7 +19,9 @@ import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.launchwrapper.Launch; +import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.*; @@ -37,6 +39,7 @@ public class BloodMagic { public static final String DEPEND = "required-after:guideapi;"; public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); public static final List> PLUGINS = Lists.newArrayList(); + public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg"))); public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { @Override public ItemStack getTabIconItem() { @@ -75,6 +78,7 @@ public class BloodMagic { ModTranquilityHandlers.init(); ModDungeons.init(); + RITUAL_MANAGER.discover(event.getAsmData()); proxy.preInit(); } @@ -86,8 +90,7 @@ public class BloodMagic { PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.PLUGIN_REGISTER); ModRecipes.init(); - ModRituals.initRituals(); - ModRituals.initImperfectRituals(); + ModRituals.initHarvestHandlers(); MeteorConfigHandler.init(new File(configDir, "meteors")); ModArmourTrackers.init(); NetworkRegistry.INSTANCE.registerGuiHandler(BloodMagic.instance, new GuiHandler()); @@ -103,11 +106,6 @@ public class BloodMagic { proxy.postInit(); } - @Mod.EventHandler - public void loadComplete(FMLLoadCompleteEvent event) { - RitualRegistry.orderLookupList(); - } - @Mod.EventHandler public void modMapping(FMLModIdMappingEvent event) { diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index a16e13bc..4bed50be 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -18,8 +18,6 @@ public class ConfigHandler public static ConfigBlacklist blacklist = new ConfigBlacklist(); @Config.Comment({ "Value modifiers for various features" }) public static ConfigValues values = new ConfigValues(); - @Config.Comment({ "Toggles for all rituals" }) - public static ConfigRituals rituals = new ConfigRituals(); @Config.Comment({ "Settings that only pertain to the client" }) public static ConfigClient client = new ConfigClient(); @Config.Comment({ "Compatibility settings" }) @@ -31,6 +29,7 @@ public class ConfigHandler if (event.getModID().equals(BloodMagic.MODID)) { ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values + BloodMagic.RITUAL_MANAGER.syncConfig(); MeteorConfigHandler.handleMeteors(false); // Reload meteors } } @@ -69,50 +68,6 @@ public class ConfigHandler public boolean shouldResyncMeteors = true; } - public static class ConfigRituals - { - public boolean ritualAnimalGrowth = true; - public boolean ritualContainment = true; - public boolean ritualCrushing = true; - public boolean ritualExpulsion = true; - public boolean ritualFeatheredKnife = true; - public boolean ritualFullStomach = true; - public boolean ritualGreenGrove = true; - public boolean ritualHarvest = true; - public boolean ritualInterdiction = true; - public boolean ritualJumping = true; - public boolean ritualLava = true; - public boolean ritualMagnetic = true; - public boolean ritualRegeneration = true; - public boolean ritualSpeed = true; - public boolean ritualSuppression = true; - public boolean ritualWater = true; - public boolean ritualWellOfSuffering = true; - public boolean ritualZephyr = true; - public boolean ritualUpgradeRemove = true; - public boolean ritualArmourEvolve = true; - public boolean ritualForsakenSoul = true; - public boolean ritualCrystalHarvest = true; - public boolean ritualPlacer = true; - public boolean ritualFelling = true; - public boolean ritualPump = true; - public boolean ritualAltarBuilder = true; - public boolean ritualPortal = true; - public boolean ritualMeteor = true; - public boolean ritualDowngrade = true; - public boolean ritualEllipsoid = true; - public boolean ritualCrystalSplit = true; - public ConfigImperfectRituals imperfect = new ConfigImperfectRituals(); - } - - public static class ConfigImperfectRituals - { - public boolean imperfectRitualNight = true; - public boolean imperfectRitualRain = true; - public boolean imperfectRitualResistance = true; - public boolean imperfectRitualZombie = true; - } - public static class ConfigClient { @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index e1c71e8f..d08eb08c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -4,8 +4,6 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.event.RitualEvent; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; -import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.RitualHelper; @@ -56,13 +54,22 @@ public class BlockRitualController extends BlockEnum imple return false; String key = RitualHelper.getValidRitual(world, pos); - EnumFacing direction = RitualHelper.getDirectionOfRitual(world, pos, key); - // TODO: Give a message stating that this ritual is not a valid ritual. - if (!key.isEmpty() && direction != null && RitualHelper.checkValidRitual(world, pos, key, direction)) { - if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, RitualRegistry.getRitualForId(key))) { - ((TileMasterRitualStone) tile).setDirection(direction); - if (state.getValue(getProperty()) == EnumRitualController.INVERTED) - ((TileMasterRitualStone) tile).setInverted(true); + if (!key.isEmpty()) { + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); + if (ritual != null) { + EnumFacing direction = RitualHelper.getDirectionOfRitual(world, pos, ritual); + // TODO: Give a message stating that this ritual is not a valid ritual. + if (direction != null && RitualHelper.checkValidRitual(world, pos, ritual, direction)) { + if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, BloodMagic.RITUAL_MANAGER.getRitual(key))) { + ((TileMasterRitualStone) tile).setDirection(direction); + if (state.getValue(getProperty()) == EnumRitualController.INVERTED) + ((TileMasterRitualStone) tile).setInverted(true); + } + } else { + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); + } + } else { + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); } } else { player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); @@ -70,7 +77,7 @@ public class BlockRitualController extends BlockEnum imple } } else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone) { IBlockState ritualBlock = world.getBlockState(pos.up()); - ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(ritualBlock); + ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(ritualBlock); if (ritual == null) return false; @@ -120,7 +127,7 @@ public class BlockRitualController extends BlockEnum imple else return new ResourceLocation("bloodmagic", "ritual_" + mrs.getCurrentRitual().getName()); } else if (state.getValue(getProperty()).equals(EnumRitualController.IMPERFECT)) { - ImperfectRitual imperfectRitual = ImperfectRitualRegistry.getRitualForBlock(world.getBlockState(pos.up())); + ImperfectRitual imperfectRitual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); if (imperfectRitual != null) return new ResourceLocation("bloodmagic", "ritual_" + imperfectRitual.getName()); } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java index a13b950c..f96654ca 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java @@ -26,6 +26,7 @@ public class GuiBloodMagicConfig extends GuiConfig { List elements = Lists.newArrayList(); elements.addAll(ConfigElement.from(ConfigHandler.class).getChildElements()); + elements.add(new ConfigElement(BloodMagic.RITUAL_MANAGER.getConfig().getCategory("rituals"))); if (Minecraft.getMinecraft().world != null) elements.add(new DummyElementEditHUD(BloodMagic.NAME, "config." + BloodMagic.MODID + ".edit_hud")); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 9b8c8c12..cadada2e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -1,8 +1,7 @@ package WayofTime.bloodmagic.compat.waila.provider; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; -import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileMasterRitualStone; @@ -64,15 +63,15 @@ public class DataProviderRitualController implements IWailaDataProvider { tag.setBoolean("active", mrs.isActive()); if (mrs.getOwner() != null) tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); - tag.setBoolean("enabled", RitualRegistry.ritualEnabled(mrs.getCurrentRitual())); + tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(mrs.getCurrentRitual()), false)); } } else { tag.setBoolean("master", false); - ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(world.getBlockState(pos.up())); + ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); if (ritual != null) { tag.setString("ritual", ritual.getUnlocalizedName()); - tag.setBoolean("enabled", ImperfectRitualRegistry.ritualEnabled(ritual)); + tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index e55a482d..6d026756 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -6,10 +6,8 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.RitualComponent; -import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.handler.event.ClientHandler; @@ -40,6 +38,7 @@ import org.lwjgl.input.Keyboard; import javax.annotation.Nonnull; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class ItemRitualDiviner extends Item implements IVariantProvider { @@ -63,7 +62,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { if (Strings.isNullOrEmpty(getCurrentRitual(stack))) return displayName; - Ritual ritual = RitualRegistry.getRitualForId(getCurrentRitual(stack)); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(getCurrentRitual(stack)); if (ritual == null) return displayName; @@ -114,7 +113,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMasterRitualStone) { - Ritual ritual = RitualRegistry.getRitualForId(this.getCurrentRitual(stack)); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); if (ritual != null) { EnumFacing direction = getDirection(stack); List components = Lists.newArrayList(); @@ -161,7 +160,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMasterRitualStone) { - Ritual ritual = RitualRegistry.getRitualForId(this.getCurrentRitual(itemStack)); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(itemStack)); TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tile; if (ritual != null) { @@ -207,9 +206,9 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { if (!stack.hasTagCompound()) return; - Ritual ritual = RitualRegistry.getRitualForId(this.getCurrentRitual(stack)); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); if (ritual != null) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual") + TextHelper.localize(ritual.getUnlocalizedName())); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual", TextHelper.localize(ritual.getUnlocalizedName()))); boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); @@ -303,7 +302,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { if (player.isSneaking()) { if (!world.isRemote) { - cycleRitual(stack, player); + cycleRitual(stack, player, false); } return new ActionResult<>(EnumActionResult.SUCCESS, stack); @@ -314,7 +313,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { @Override public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) { - if (entityLiving instanceof EntityPlayer) { + if (!entityLiving.world.isRemote && entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entityLiving; RayTraceResult ray = this.rayTrace(player.getEntityWorld(), player, false); @@ -324,7 +323,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { if (!player.isSwingInProgress) { if (player.isSneaking()) { - cycleRitualBackwards(stack, player); + cycleRitual(stack, player, true); } else { cycleDirection(stack, player); } @@ -396,83 +395,36 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } /** - * Cycles the selected ritual to the next available ritual that is enabled. - * - * @param stack - The ItemStack of the ritual diviner - * @param player - The player using the ritual diviner + * Cycles the ritual forward or backward */ - public void cycleRitual(ItemStack stack, EntityPlayer player) { + public void cycleRitual(ItemStack stack, EntityPlayer player, boolean reverse) { String key = getCurrentRitual(stack); - List idList = RitualRegistry.getOrderedIds(); + List rituals = BloodMagic.RITUAL_MANAGER.getSortedRituals(); + if (reverse) + Collections.reverse(rituals = Lists.newArrayList(rituals)); + String firstId = ""; boolean foundId = false; boolean foundFirst = false; - for (String str : idList) { - Ritual ritual = RitualRegistry.getRitualForId(str); + for (Ritual ritual : rituals) { + String id = BloodMagic.RITUAL_MANAGER.getId(ritual); - if (!RitualRegistry.ritualEnabled(ritual) || !canDivinerPerformRitual(stack, ritual)) { + if (!BloodMagic.RITUAL_MANAGER.enabled(id, false) || !canDivinerPerformRitual(stack, ritual)) { continue; } if (!foundFirst) { - firstId = str; + firstId = id; foundFirst = true; } if (foundId) { - setCurrentRitual(stack, str); - notifyRitualChange(str, player); + setCurrentRitual(stack, id); + notifyRitualChange(id, player); return; - } else { - if (str.equals(key)) { - foundId = true; - continue; - } - } - } - - if (foundFirst) { - setCurrentRitual(stack, firstId); - notifyRitualChange(firstId, player); - } - } - - /** - * Does the same as cycleRitual but instead cycles backwards. - * - * @param stack - * @param player - */ - public void cycleRitualBackwards(ItemStack stack, EntityPlayer player) { - String key = getCurrentRitual(stack); - List idList = RitualRegistry.getOrderedIds(); - String firstId = ""; - boolean foundId = false; - boolean foundFirst = false; - - for (int i = idList.size() - 1; i >= 0; i--) { - String str = idList.get(i); - Ritual ritual = RitualRegistry.getRitualForId(str); - - if (!RitualRegistry.ritualEnabled(ritual) || !canDivinerPerformRitual(stack, ritual)) { - continue; - } - - if (!foundFirst) { - firstId = str; - foundFirst = true; - } - - if (foundId) { - setCurrentRitual(stack, str); - notifyRitualChange(str, player); - return; - } else { - if (str.equals(key)) { - foundId = true; - continue; - } + } else if (id.equals(key)) { + foundId = true; } } @@ -499,7 +451,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } public void notifyRitualChange(String key, EntityPlayer player) { - Ritual ritual = RitualRegistry.getRitualForId(key); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); if (ritual != null) { player.sendStatusMessage(new TextComponentTranslation(ritual.getUnlocalizedName()), true); } @@ -512,7 +464,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { NBTTagCompound tag = stack.getTagCompound(); - tag.setString(Constants.NBT.CURRENT_RITUAL, key); + tag.setString("current_ritual", key); } public String getCurrentRitual(ItemStack stack) { @@ -521,7 +473,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } NBTTagCompound tag = stack.getTagCompound(); - return tag.getString(Constants.NBT.CURRENT_RITUAL); + return tag.getString("current_ritual"); } public boolean canPlaceRitualStone(EnumRuneType rune, ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index c3da05f3..f33bbf22 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,150 +1,14 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; -import WayofTime.bloodmagic.ritual.RitualRegistry; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall; -import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualNight; -import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualRain; -import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualResistance; -import WayofTime.bloodmagic.ritual.types.imperfect.ImperfectRitualZombie; -import WayofTime.bloodmagic.ritual.types.*; import net.minecraft.init.Blocks; public class ModRituals { - public static Ritual waterRitual; - public static Ritual lavaRitual; - public static Ritual greenGroveRitual; - public static Ritual jumpRitual; - public static Ritual sufferingRitual; - public static Ritual featheredKnifeRitual; - public static Ritual regenerationRitual; - public static Ritual animalGrowthRitual; - public static Ritual harvestRitual; - public static Ritual magneticRitual; - public static Ritual crushingRitual; - public static Ritual stomachRitual; - public static Ritual interdictionRitual; - public static Ritual containmentRitual; - public static Ritual speedRitual; - public static Ritual suppressionRitual; - public static Ritual expulsionRitual; - public static Ritual zephyrRitual; - public static Ritual upgradeRemoveRitual; - public static Ritual armourEvolveRitual; - public static Ritual forsakenSoulRitual; - public static Ritual crystalHarvestRitual; - - public static Ritual placerRitual; - public static Ritual fellingRitual; - public static Ritual pumpRitual; - public static Ritual altarBuilderRitual; - public static Ritual portalRitual; - - public static Ritual ellipsoidRitual; - public static Ritual crystalSplitRitual; - - public static Ritual meteorRitual; - - public static Ritual downgradeRitual; - - public static ImperfectRitual imperfectNight; - public static ImperfectRitual imperfectRain; - public static ImperfectRitual imperfectResistance; - public static ImperfectRitual imperfectZombie; - - public static void initRituals() - { - waterRitual = new RitualWater(); - RitualRegistry.registerRitual(waterRitual, ConfigHandler.rituals.ritualWater); - lavaRitual = new RitualLava(); - RitualRegistry.registerRitual(lavaRitual, ConfigHandler.rituals.ritualLava); - greenGroveRitual = new RitualGreenGrove(); - RitualRegistry.registerRitual(greenGroveRitual, ConfigHandler.rituals.ritualGreenGrove); - jumpRitual = new RitualJumping(); - RitualRegistry.registerRitual(jumpRitual, ConfigHandler.rituals.ritualJumping); - sufferingRitual = new RitualWellOfSuffering(); - RitualRegistry.registerRitual(sufferingRitual, ConfigHandler.rituals.ritualWellOfSuffering); - featheredKnifeRitual = new RitualFeatheredKnife(); - RitualRegistry.registerRitual(featheredKnifeRitual, ConfigHandler.rituals.ritualFeatheredKnife); - regenerationRitual = new RitualRegeneration(); - RitualRegistry.registerRitual(regenerationRitual, ConfigHandler.rituals.ritualRegeneration); - animalGrowthRitual = new RitualAnimalGrowth(); - RitualRegistry.registerRitual(animalGrowthRitual, ConfigHandler.rituals.ritualAnimalGrowth); - harvestRitual = new RitualHarvest(); - RitualRegistry.registerRitual(harvestRitual, ConfigHandler.rituals.ritualHarvest); - initHarvestHandlers(); - magneticRitual = new RitualMagnetic(); - RitualRegistry.registerRitual(magneticRitual, ConfigHandler.rituals.ritualMagnetic); - crushingRitual = new RitualCrushing(); - RitualRegistry.registerRitual(crushingRitual, ConfigHandler.rituals.ritualCrushing); - stomachRitual = new RitualFullStomach(); - RitualRegistry.registerRitual(stomachRitual, ConfigHandler.rituals.ritualFullStomach); - interdictionRitual = new RitualInterdiction(); - RitualRegistry.registerRitual(interdictionRitual, ConfigHandler.rituals.ritualInterdiction); - containmentRitual = new RitualContainment(); - RitualRegistry.registerRitual(containmentRitual, ConfigHandler.rituals.ritualContainment); - speedRitual = new RitualSpeed(); - RitualRegistry.registerRitual(speedRitual, ConfigHandler.rituals.ritualSpeed); - suppressionRitual = new RitualSuppression(); - RitualRegistry.registerRitual(suppressionRitual, ConfigHandler.rituals.ritualSuppression); - zephyrRitual = new RitualZephyr(); - RitualRegistry.registerRitual(zephyrRitual, ConfigHandler.rituals.ritualZephyr); - expulsionRitual = new RitualExpulsion(); - RitualRegistry.registerRitual(expulsionRitual, ConfigHandler.rituals.ritualExpulsion); - upgradeRemoveRitual = new RitualUpgradeRemove(); - RitualRegistry.registerRitual(upgradeRemoveRitual, ConfigHandler.rituals.ritualUpgradeRemove); - armourEvolveRitual = new RitualArmourEvolve(); - RitualRegistry.registerRitual(armourEvolveRitual, ConfigHandler.rituals.ritualArmourEvolve); - forsakenSoulRitual = new RitualForsakenSoul(); - RitualRegistry.registerRitual(forsakenSoulRitual, ConfigHandler.rituals.ritualForsakenSoul); - crystalHarvestRitual = new RitualCrystalHarvest(); - RitualRegistry.registerRitual(crystalHarvestRitual, ConfigHandler.rituals.ritualCrystalHarvest); - placerRitual = new RitualPlacer(); - RitualRegistry.registerRitual(placerRitual, ConfigHandler.rituals.ritualPlacer); - fellingRitual = new RitualFelling(); - RitualRegistry.registerRitual(fellingRitual, ConfigHandler.rituals.ritualFelling); - pumpRitual = new RitualPump(); - RitualRegistry.registerRitual(pumpRitual, ConfigHandler.rituals.ritualPump); - altarBuilderRitual = new RitualAltarBuilder(); - RitualRegistry.registerRitual(altarBuilderRitual, ConfigHandler.rituals.ritualAltarBuilder); - portalRitual = new RitualPortal(); - RitualRegistry.registerRitual(portalRitual, ConfigHandler.rituals.ritualPortal); - meteorRitual = new RitualMeteor(); - RitualRegistry.registerRitual(meteorRitual, ConfigHandler.rituals.ritualMeteor); - - downgradeRitual = new RitualLivingArmourDowngrade(); - RitualRegistry.registerRitual(downgradeRitual, ConfigHandler.rituals.ritualDowngrade); - - ellipsoidRitual = new RitualEllipsoid(); - RitualRegistry.registerRitual(ellipsoidRitual, ConfigHandler.rituals.ritualEllipsoid); - - crystalSplitRitual = new RitualCrystalSplit(); - RitualRegistry.registerRitual(crystalSplitRitual, ConfigHandler.rituals.ritualCrystalSplit); - - RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5); - RitualCrushing.registerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05); - } - - public static void initImperfectRituals() - { - imperfectNight = new ImperfectRitualNight(); - ImperfectRitualRegistry.registerRitual(imperfectNight, ConfigHandler.rituals.imperfect.imperfectRitualNight); - imperfectRain = new ImperfectRitualRain(); - ImperfectRitualRegistry.registerRitual(imperfectRain, ConfigHandler.rituals.imperfect.imperfectRitualRain); - imperfectResistance = new ImperfectRitualResistance(); - ImperfectRitualRegistry.registerRitual(imperfectResistance, ConfigHandler.rituals.imperfect.imperfectRitualResistance); - imperfectZombie = new ImperfectRitualZombie(); - ImperfectRitualRegistry.registerRitual(imperfectZombie, ConfigHandler.rituals.imperfect.imperfectRitualZombie); - } - + // TODO Move elsewhere public static void initHarvestHandlers() { HarvestRegistry.registerRangeAmplifier(Blocks.DIAMOND_BLOCK.getDefaultState(), 15); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 472fa682..be545f56 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -18,8 +18,7 @@ import java.util.Map.Entry; import java.util.function.Consumer; /** - * Abstract class for creating new rituals. Rituals need be registered with - * {@link RitualRegistry#registerRitual(Ritual, String)} + * Abstract class for creating new rituals. Register your ritual by annotating it with {@link RitualRegister} */ public abstract class Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java new file mode 100644 index 00000000..e6e2287b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java @@ -0,0 +1,148 @@ +package WayofTime.bloodmagic.ritual; + +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BMLog; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import net.minecraft.block.state.IBlockState; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.common.discovery.ASMDataTable; + +import java.util.*; + +public class RitualManager { + + private final Map rituals; + private final Map ritualsReverse; + private final List sortedRituals; + private final Map imperfectRituals; + private final Map imperfectRitualsReverse; + private final Configuration config; + + public RitualManager(Configuration config) { + this.rituals = Maps.newTreeMap(); + this.ritualsReverse = Maps.newHashMap(); + this.sortedRituals = Lists.newArrayList(); + this.imperfectRituals = Maps.newTreeMap(); + this.imperfectRitualsReverse = Maps.newHashMap(); + this.config = config; + } + + public void discover(ASMDataTable dataTable) { + Set data = dataTable.getAll(RitualRegister.class.getName()); + for (ASMDataTable.ASMData found : data) { + try { + Class discoveredClass = Class.forName(found.getClassName()); + if (!Ritual.class.isAssignableFrom(discoveredClass)) + throw new BadRitualException("Annotated class " + found.getClassName() + " does not inherit from " + Ritual.class.getName()); + + Class ritualClass = discoveredClass.asSubclass(Ritual.class); + RitualRegister ritualRegister = ritualClass.getAnnotation(RitualRegister.class); + String id = ritualRegister.value(); + Ritual ritual = ritualRegister.factory().newInstance().apply(ritualClass); + if (ritual == null) { + BMLog.DEFAULT.error("Error creating ritual instance for {}.", id); + continue; + } + + rituals.put(id, ritual); + ritualsReverse.put(ritual, id); + BMLog.DEBUG.info("Registered ritual {}", id); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + e.printStackTrace(); + } + } + + Set imperfectData = dataTable.getAll(RitualRegister.Imperfect.class.getName()); + for (ASMDataTable.ASMData found : imperfectData) { + try { + Class discoveredClass = Class.forName(found.getClassName()); + if (!ImperfectRitual.class.isAssignableFrom(discoveredClass)) + throw new BadRitualException("Annotated class " + found.getClassName() + " does not inherit from " + ImperfectRitual.class.getName()); + + Class ritualClass = discoveredClass.asSubclass(ImperfectRitual.class); + RitualRegister.Imperfect ritualRegister = ritualClass.getAnnotation(RitualRegister.Imperfect.class); + String id = ritualRegister.value(); + ImperfectRitual ritual = ritualRegister.factory().newInstance().apply(ritualClass); + if (ritual == null) { + BMLog.DEFAULT.error("Error creating imperfect ritual instance for {}.", id); + continue; + } + + imperfectRituals.put(id, ritual); + imperfectRitualsReverse.put(ritual, id); + BMLog.DEBUG.info("Registered imperfect ritual {}", id); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + e.printStackTrace(); + } + } + + syncConfig(); + + // Sort rituals + sortedRituals.addAll(rituals.values()); + // Oh dear this is probably so slow + sortedRituals.sort((o1, o2) -> { + Set components = Sets.newHashSet(); + o1.gatherComponents(components::add); + int initialSize = components.size(); + components.clear(); + o2.gatherComponents(components::add); + return Integer.compare(initialSize, components.size()); + }); + } + + public Ritual getRitual(String id) { + return rituals.get(id); + } + + public String getId(Ritual ritual) { + return ritualsReverse.get(ritual); + } + + public ImperfectRitual getImperfectRitual(IBlockState state) { + for (ImperfectRitual ritual : imperfectRituals.values()) + if (ritual.getBlockRequirement().test(state)) + return ritual; + + return null; + } + + public String getId(ImperfectRitual ritual) { + return imperfectRitualsReverse.get(ritual); + } + + public Collection getRituals() { + return rituals.values(); + } + + public Collection getImperfectRituals() { + return imperfectRituals.values(); + } + + public List getSortedRituals() { + return sortedRituals; + } + + public void syncConfig() { + config.addCustomCategoryComment("rituals", "Toggles for all rituals"); + rituals.forEach((k, v) -> config.getBoolean(k, "rituals", true, "Enable the " + k + " ritual.")); + imperfectRituals.forEach((k, v) -> config.getBoolean(k, "rituals.imperfect", true, "Enable the " + k + " imperfect ritual.")); + config.save(); + } + + public boolean enabled(String id, boolean imperfect) { + return id != null && config.getBoolean(id, "rituals" + (imperfect ? ".imperfect" : ""), true, ""); + } + + public Configuration getConfig() { + return config; + } + + public static class BadRitualException extends RuntimeException { + public BadRitualException(String message) { + super(message); + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java new file mode 100644 index 00000000..b077056f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java @@ -0,0 +1,49 @@ +package WayofTime.bloodmagic.ritual; + +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.function.Function; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface RitualRegister { + + String value(); + + Class, Ritual>> factory() default DefaultRitualFactory.class; + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.TYPE) + @interface Imperfect { + + String value(); + + Class, ImperfectRitual>> factory() default DefaultImperfectRitualFactory.class; + } + + class DefaultRitualFactory implements Function, Ritual> { + @Override + public Ritual apply(Class aClass) { + try { + return aClass.newInstance(); + } catch (Exception e) { + return null; + } + } + } + + class DefaultImperfectRitualFactory implements Function, ImperfectRitual> { + @Override + public ImperfectRitual apply(Class aClass) { + try { + return aClass.newInstance(); + } catch (Exception e) { + return null; + } + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java deleted file mode 100644 index 66039e2b..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegistry.java +++ /dev/null @@ -1,124 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import com.google.common.collect.Lists; - -import javax.annotation.Nullable; -import java.util.*; - -public class RitualRegistry { - public static final Map enabledRituals = new HashMap<>(); - private static final BiMap registry = HashBiMap.create(); - private static final List lookupList = new ArrayList<>(); - /** - * Ordered list for actions that depend on the order that the rituals were - * registered in - */ - private static final ArrayList orderedIdList = new ArrayList<>(); - - private static boolean locked; - - /** - * The safe way to register a new Ritual. - * - * @param ritual - The ritual to register. - * @param id - The ID for the ritual. Cannot be duplicated. - */ - public static void registerRitual(Ritual ritual, String id, boolean enabled) { - if (locked) { - BMLog.DEFAULT.error("This registry has been locked. Please register your ritual earlier."); - BMLog.DEFAULT.error("If you reflect this, I will hunt you down. - TehNut"); - return; - } - - if (ritual != null) { - if (registry.containsKey(id)) - BMLog.DEFAULT.error("Duplicate ritual id: {}", id); - else { - registry.put(id, ritual); - enabledRituals.put(ritual, enabled); - orderedIdList.add(id); - } - } - } - - public static void registerRitual(Ritual ritual, boolean enabled) { - registerRitual(ritual, ritual.getName(), enabled); - } - - public static void registerRitual(Ritual ritual, String id) { - registerRitual(ritual, id, true); - } - - public static void registerRitual(Ritual ritual) { - registerRitual(ritual, ritual.getName()); - } - - @Nullable - public static Ritual getRitualForId(String id) { - Ritual ritual = registry.get(id); - return ritual != null ? ritual.getNewCopy() : null; - } - - public static String getIdForRitual(Ritual ritual) { - return registry.inverse().get(ritual); - } - - public static boolean isMapEmpty() { - return registry.isEmpty(); - } - - public static int getMapSize() { - return registry.size(); - } - - public static boolean ritualEnabled(Ritual ritual) { - try { - return enabledRituals.get(ritual); - } catch (NullPointerException e) { - BMLog.DEFAULT.error("Invalid Ritual was called"); - return false; - } - } - - public static boolean ritualEnabled(String id) { - return ritualEnabled(getRitualForId(id)); - } - - public static BiMap getRegistry() { - return HashBiMap.create(registry); - } - - public static Map getEnabledMap() { - return new HashMap<>(enabledRituals); - } - - public static ArrayList getIds() { - return new ArrayList<>(lookupList); - } - - public static ArrayList getOrderedIds() { - return orderedIdList; - } - - public static ArrayList getRituals() { - return new ArrayList<>(registry.values()); - } - - public static void orderLookupList() { - locked = true; // Lock registry so no no rituals can be registered - lookupList.clear(); // Make sure it's empty - lookupList.addAll(registry.keySet()); - lookupList.sort((o1, o2) -> { - Ritual ritual1 = registry.get(o1); - Ritual ritual2 = registry.get(o2); - List first = Lists.newArrayList(); - ritual1.gatherComponents(first::add); - List second = Lists.newArrayList(); - ritual2.gatherComponents(second::add); - return first.size() > second.size() ? -1 : 0; // Put earlier if bigger - }); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java index dae1c461..6aa24daa 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java @@ -7,9 +7,7 @@ import net.minecraft.world.World; import java.util.function.Predicate; /** - * Abstract class for creating new imperfect rituals. ImperfectRituals need be - * registered with - * {@link ImperfectRitualRegistry#registerRitual(ImperfectRitual)} + * Abstract class for creating new imperfect rituals. To register, annotate your class with {@link WayofTime.bloodmagic.ritual.RitualRegister.Imperfect} */ public abstract class ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java deleted file mode 100644 index 2417a24d..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRegistry.java +++ /dev/null @@ -1,99 +0,0 @@ -package WayofTime.bloodmagic.ritual.imperfect; - -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import net.minecraft.block.state.IBlockState; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -public class ImperfectRitualRegistry { - public static final Map enabledRituals = new HashMap<>(); - private static final BiMap registry = HashBiMap.create(); - - /** - * The safe way to register a new Ritual. - * - * @param imperfectRitual - The imperfect ritual to register. - * @param id - The ID for the imperfect ritual. Cannot be duplicated. - */ - public static void registerRitual(ImperfectRitual imperfectRitual, String id, boolean enabled) { - if (imperfectRitual != null) { - if (registry.containsKey(id)) - BMLog.DEFAULT.error("Duplicate imperfect ritual id: {}", id); - else { - registry.put(id, imperfectRitual); - enabledRituals.put(imperfectRitual, enabled); - } - } - } - - public static void registerRitual(ImperfectRitual imperfectRitual, String id) { - registerRitual(imperfectRitual, id, true); - } - - public static void registerRitual(ImperfectRitual imperfectRitual, boolean enabled) { - registerRitual(imperfectRitual, imperfectRitual.getName(), enabled); - } - - public static void registerRitual(ImperfectRitual imperfectRitual) { - registerRitual(imperfectRitual, imperfectRitual.getName()); - } - - @Nullable - public static ImperfectRitual getRitualForBlock(IBlockState state) { - for (ImperfectRitual imperfectRitual : getRegistry().values()) - if (imperfectRitual.getBlockRequirement().test(state)) - return imperfectRitual; - - return null; - } - - public static ImperfectRitual getRitualForId(String id) { - return registry.get(id); - } - - public static String getIdForRitual(ImperfectRitual imperfectRitual) { - return registry.inverse().get(imperfectRitual); - } - - public static boolean isMapEmpty() { - return registry.isEmpty(); - } - - public static int getMapSize() { - return registry.size(); - } - - public static boolean ritualEnabled(ImperfectRitual imperfectRitual) { - try { - return enabledRituals.get(imperfectRitual); - } catch (NullPointerException e) { - BMLog.DEFAULT.error("Invalid Imperfect Ritual was called"); - return false; - } - } - - public static boolean ritualEnabled(String id) { - return ritualEnabled(getRitualForId(id)); - } - - public static BiMap getRegistry() { - return HashBiMap.create(registry); - } - - public static BiMap getEnabledMap() { - return HashBiMap.create(enabledRituals); - } - - public static ArrayList getIds() { - return new ArrayList<>(registry.keySet()); - } - - public static ArrayList getRituals() { - return new ArrayList<>(registry.values()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index c1572201..4c7783b4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -1,14 +1,11 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.altar.AltarComponent; import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; @@ -29,6 +26,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.function.Consumer; +@RitualRegister("altar_builder") public class RitualAltarBuilder extends Ritual { private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); private boolean cycleDone = false; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index f7724e6a..260447b2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -21,6 +21,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.List; import java.util.function.Consumer; +@RitualRegister("animal_growth") public class RitualAnimalGrowth extends Ritual { public static final double rawWillDrain = 0.05; public static final double vengefulWillDrain = 0.02; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index 90447806..175069ea 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -14,6 +14,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.function.Consumer; +@RitualRegister("armour_evolve") public class RitualArmourEvolve extends Ritual { public static final String CHECK_RANGE = "fillRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index cf481fa9..ab8516e2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -12,6 +12,7 @@ import net.minecraft.world.World; import java.util.function.Consumer; +@RitualRegister("cobblestone") public class RitualCobblestone extends Ritual { public static final String COBBLESTONE_RANGE = "cobblestoneRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java index 4ad43168..51c8432e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import java.util.function.Consumer; +@RitualRegister("containment") public class RitualContainment extends Ritual { public static final String CONTAINMENT_RANGE = "containmentRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 01cab915..1ad10719 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Consumer; +@RitualRegister("crushing") public class RitualCrushing extends Ritual { public static final String CRUSHING_RANGE = "crushingRange"; public static final String CHEST_RANGE = "chest"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java index 62d86acc..5f5e9be2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import java.util.function.Consumer; +@RitualRegister("crystal_harvest") public class RitualCrystalHarvest extends Ritual { public static final String CRYSTAL_RANGE = "crystal"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java index 5930d6d9..a52f5181 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.ritual.types; import java.util.function.Consumer; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -12,13 +13,10 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.TileDemonCrystal; +@RitualRegister("crystal_split") public class RitualCrystalSplit extends Ritual { public RitualCrystalSplit() diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index e47a8c74..74bbdaa8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.ritual.types; import java.util.function.Consumer; +import WayofTime.bloodmagic.ritual.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; @@ -14,12 +15,8 @@ import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; +@RitualRegister("ellipsoid") public class RitualEllipsoid extends Ritual { public static final String SPHEROID_RANGE = "spheroidRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java index 10209075..393645d2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java @@ -25,6 +25,7 @@ import java.util.Random; import java.util.UUID; import java.util.function.Consumer; +@RitualRegister("expulsion") public class RitualExpulsion extends Ritual { public static final String EXPULSION_RANGE = "expulsionRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index dd347421..ddddf20b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -26,6 +26,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.function.Consumer; +@RitualRegister("feathered_knife") public class RitualFeatheredKnife extends Ritual { public static final String ALTAR_RANGE = "altar"; public static final String DAMAGE_RANGE = "damage"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java index c4b33b27..749ff388 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.function.Consumer; +@RitualRegister("felling") public class RitualFelling extends Ritual { public static final String FELLING_RANGE = "fellingRange"; public static final String CHEST_RANGE = "chest"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index ee49bbcd..c56ff474 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; +@RitualRegister("forsaken_soul") public class RitualForsakenSoul extends Ritual { public static final String CRYSTAL_RANGE = "crystal"; public static final String DAMAGE_RANGE = "damage"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java index f0a739ea..0b4153a6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java @@ -15,6 +15,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.List; import java.util.function.Consumer; +@RitualRegister("full_stomach") public class RitualFullStomach extends Ritual { public static final String FILL_RANGE = "fillRange"; public static final String CHEST_RANGE = "chest"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index f2aa95ad..fdc69092 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Random; import java.util.function.Consumer; +@RitualRegister("green_grove") public class RitualGreenGrove extends Ritual { public static final String GROW_RANGE = "growing"; public static final String LEECH_RANGE = "leech"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index faa582ad..b04ba5b2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -30,6 +30,7 @@ import java.util.function.Consumer; * {@link HarvestRegistry#registerRangeAmplifier(net.minecraft.block.state.IBlockState, int)} to register a * new amplifier. */ +@RitualRegister("harvest") public class RitualHarvest extends Ritual { public static final String HARVEST_RANGE = "harvestRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java index a9eb84b3..861b2f32 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import java.util.function.Consumer; +@RitualRegister("interdiction") public class RitualInterdiction extends Ritual { public static final String INTERDICTION_RANGE = "interdictionRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index e34a008d..78c89219 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -11,6 +11,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.function.Consumer; +@RitualRegister("jumping") public class RitualJumping extends Ritual { public static final String JUMP_RANGE = "jumpRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index d81a2ace..ae953425 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -28,6 +28,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import java.util.List; import java.util.function.Consumer; +@RitualRegister("lava") public class RitualLava extends Ritual { public static final String LAVA_RANGE = "lavaRange"; public static final String FIRE_FUSE_RANGE = "fireFuse"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index d0f9e4b5..35aa10ba 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; +@RitualRegister("armour_downgrade") public class RitualLivingArmourDowngrade extends Ritual { public static final String DOWNGRADE_RANGE = "containmentRange"; private int internalTimer = 0; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index e8b9c652..0abb6a48 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.function.Consumer; +@RitualRegister("meteor") public class RitualMeteor extends Ritual { public static final String ITEM_RANGE = "itemRange"; public static final double destructiveWillDrain = 50; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java index d18f1cb5..c421f794 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java @@ -15,6 +15,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.function.Consumer; +@RitualRegister("placer") public class RitualPlacer extends Ritual { public static final String PLACER_RANGE = "placerRange"; public static final String CHEST_RANGE = "chest"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java index fd3b83f4..8ec0b006 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java @@ -1,10 +1,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; @@ -20,6 +17,7 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import java.util.UUID; import java.util.function.Consumer; +@RitualRegister("portal") public class RitualPortal extends Ritual { public static final String PORTAL_NBT_TAG = "PortalRitualTag"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index 50667a6a..e7d6b74c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -22,6 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.function.Consumer; +@RitualRegister("pump") public class RitualPump extends Ritual { public static final String PUMP_RANGE = "pumpRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index f480edc7..e851b8ad 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Consumer; +@RitualRegister("regeneration") public class RitualRegeneration extends Ritual { public static final String HEAL_RANGE = "heal"; public static final String VAMPIRE_RANGE = "vampire"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index cc9390f9..c40fb66a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -16,6 +16,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.function.Consumer; +@RitualRegister("speed") public class RitualSpeed extends Ritual { public static final String SPEED_RANGE = "sanicRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java index 8866eee8..5934ab9f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java @@ -11,6 +11,7 @@ import net.minecraft.world.World; import java.util.function.Consumer; +@RitualRegister("suppression") public class RitualSuppression extends Ritual { public static final String SUPPRESSION_RANGE = "suppressionRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index 65120c45..ba9d5a04 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.function.Consumer; +@RitualRegister("upgrade_remove") public class RitualUpgradeRemove extends Ritual { public static final String CHECK_RANGE = "fillRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java index 569998a1..c63b3b6d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java @@ -8,6 +8,7 @@ import net.minecraft.world.World; import java.util.function.Consumer; +@RitualRegister("water") public class RitualWater extends Ritual { public static final String WATER_RANGE = "waterRange"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 8d07813f..a1c96a08 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -17,6 +17,7 @@ import net.minecraftforge.fml.common.registry.EntityRegistry; import java.util.List; import java.util.function.Consumer; +@RitualRegister("well_of_suffering") public class RitualWellOfSuffering extends Ritual { public static final String ALTAR_RANGE = "altar"; public static final String DAMAGE_RANGE = "damage"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java index d21d4e8c..780e5061 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java @@ -13,6 +13,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.function.Consumer; +@RitualRegister("zephyr") public class RitualZephyr extends Ritual { public static final String ZEPHYR_RANGE = "zephyrRange"; public static final String CHEST_RANGE = "chest"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java index 8c6d4eda..9d2a87ed 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java @@ -6,6 +6,7 @@ import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +//@RitualRegister.Imperfect("day") public class ImperfectRitualDay extends ImperfectRitual { public ImperfectRitualDay() { super("day", s -> s.getBlock() == Blocks.GOLD_BLOCK, 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.day"); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java index 504fe1a0..f5a8746b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java @@ -1,11 +1,13 @@ package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +@RitualRegister.Imperfect("night") public class ImperfectRitualNight extends ImperfectRitual { public ImperfectRitualNight() { super("night", s -> s.getBlock() == Blocks.LAPIS_BLOCK, 100, true, "ritual." + BloodMagic.MODID + ".imperfect.night"); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java index 58e1ec6c..b7790a1e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java @@ -1,11 +1,13 @@ package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +@RitualRegister.Imperfect("rain") public class ImperfectRitualRain extends ImperfectRitual { public ImperfectRitualRain() { super("rain", s -> s.getBlock() == Blocks.WATER, 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.rain"); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java index 9bb7e0de..b0281f53 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; @@ -8,6 +9,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; +@RitualRegister.Imperfect("resistance") public class ImperfectRitualResistance extends ImperfectRitual { public ImperfectRitualResistance() { super("resistance", s -> s.getBlock() == Blocks.BEDROCK, 5000, "ritual." + BloodMagic.MODID + ".imperfect.resistance"); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java index 4c539eb4..bc8cb7cf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; @@ -9,6 +10,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; +@RitualRegister.Imperfect("zombie") public class ImperfectRitualZombie extends ImperfectRitual { public ImperfectRitualZombie() { super("zombie", s -> s.getBlock() == Blocks.COAL_BLOCK, 5000, "ritual." + BloodMagic.MODID + ".imperfect.zombie"); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index 7e8b1d12..27b4e876 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRegistry; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.util.helper.NetworkHelper; @@ -9,6 +10,7 @@ import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -17,9 +19,9 @@ public class TileImperfectRitualStone extends TileBase implements IImperfectRitu @Override public boolean performRitual(World world, BlockPos pos, @Nullable ImperfectRitual imperfectRitual, EntityPlayer player) { - if (imperfectRitual != null && ImperfectRitualRegistry.ritualEnabled(imperfectRitual)) { + if (imperfectRitual != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(imperfectRitual), true)) { if (!PlayerHelper.isFakePlayer(player) && !world.isRemote) { - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, imperfectRitual.getActivationCost()); + NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, new SoulTicket(new TextComponentTranslation(imperfectRitual.getUnlocalizedName()), imperfectRitual.getActivationCost())); if (imperfectRitual.onActivate(this, player)) { if (imperfectRitual.isLightShow()) getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 182b2cf3..68f01766 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.RitualEvent; -import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.core.data.SoulNetwork; @@ -23,7 +23,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.Event; import javax.annotation.Nullable; import java.util.ArrayList; @@ -75,7 +74,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS owner = tag.hasUniqueId("owner") ? tag.getUniqueId("owner") : null; if (owner != null) cachedNetwork = NetworkHelper.getSoulNetwork(owner); - currentRitual = RitualRegistry.getRitualForId(tag.getString(Constants.NBT.CURRENT_RITUAL)); + currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { NBTTagCompound ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); if (!ritualTag.hasNoTags()) { @@ -96,7 +95,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS @Override public NBTTagCompound serialize(NBTTagCompound tag) { - String ritualId = RitualRegistry.getIdForRitual(getCurrentRitual()); + String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); if (owner != null) tag.setUniqueId("owner", owner); tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); @@ -177,8 +176,8 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS @Override public void performRitual(World world, BlockPos pos) { - if (!world.isRemote && getCurrentRitual() != null && RitualRegistry.ritualEnabled(getCurrentRitual())) { - if (RitualHelper.checkValidRitual(getWorld(), getPos(), RitualRegistry.getIdForRitual(currentRitual), getDirection())) { + if (!world.isRemote && getCurrentRitual() != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(currentRitual), false)) { + if (RitualHelper.checkValidRitual(getWorld(), getPos(), currentRitual, getDirection())) { RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), getCurrentRitual()); if (MinecraftForge.EVENT_BUS.post(event)) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 15575efb..8f29bfab 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.RitualRegistry; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.client.key.KeyBindings; @@ -246,7 +245,7 @@ public class ClientHandler { World world = player.getEntityWorld(); ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); EnumFacing direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); - Ritual ritual = RitualRegistry.getRitualForId(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); if (ritual == null) return; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index fa6e3963..eedf6f7c 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.ritual.RitualRegistry; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.ritual.IRitualStone; import WayofTime.bloodmagic.ritual.Ritual; @@ -22,21 +22,7 @@ public class RitualHelper { static Capability RUNE_CAPABILITY = null; public static boolean canCrystalActivate(Ritual ritual, int crystalLevel) { - return ritual.getCrystalLevel() <= crystalLevel && RitualRegistry.ritualEnabled(ritual); - } - - public static String getNextRitualKey(String currentKey) { - int currentIndex = RitualRegistry.getIds().indexOf(currentKey); - int nextIndex = RitualRegistry.getRituals().listIterator(currentIndex).nextIndex(); - - return RitualRegistry.getIds().get(nextIndex); - } - - public static String getPrevRitualKey(String currentKey) { - int currentIndex = RitualRegistry.getIds().indexOf(currentKey); - int previousIndex = RitualRegistry.getIds().listIterator(currentIndex).previousIndex(); - - return RitualRegistry.getIds().get(previousIndex); + return ritual.getCrystalLevel() <= crystalLevel && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false); } /** @@ -48,31 +34,26 @@ public class RitualHelper { * @return The ID of the valid ritual */ public static String getValidRitual(World world, BlockPos pos) { - for (String key : RitualRegistry.getIds()) { + for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { for (EnumFacing direction : EnumFacing.HORIZONTALS) { - boolean test = checkValidRitual(world, pos, key, direction); - if (test) { - return key; - } + if (checkValidRitual(world, pos, ritual, direction)) + return BloodMagic.RITUAL_MANAGER.getId(ritual); } } return ""; } - public static EnumFacing getDirectionOfRitual(World world, BlockPos pos, String key) { + public static EnumFacing getDirectionOfRitual(World world, BlockPos pos, Ritual ritual) { for (EnumFacing direction : EnumFacing.HORIZONTALS) { - boolean test = checkValidRitual(world, pos, key, direction); - if (test) { + if (checkValidRitual(world, pos, ritual, direction)) return direction; - } } return null; } - public static boolean checkValidRitual(World world, BlockPos pos, String ritualId, EnumFacing direction) { - Ritual ritual = RitualRegistry.getRitualForId(ritualId); + public static boolean checkValidRitual(World world, BlockPos pos, Ritual ritual, EnumFacing direction) { if (ritual == null) { return false; } @@ -82,11 +63,8 @@ public class RitualHelper { for (RitualComponent component : components) { BlockPos newPos = pos.add(component.getOffset(direction)); - if (isRuneType(world, newPos, component.getRuneType())) { - continue; - } else { + if (!isRuneType(world, newPos, component.getRuneType())) return false; - } } return true; diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index e9227fde..bacb10da 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -449,7 +449,7 @@ tooltip.bloodmagic.activation_crystal.weak=Activates low-level rituals tooltip.bloodmagic.activation_crystal.awakened=Activates more powerful rituals tooltip.bloodmagic.activation_crystal.creative=Creative Only - Activates any ritual -tooltip.bloodmagic.diviner.currentRitual=Current Ritual: +tooltip.bloodmagic.diviner.currentRitual=Current Ritual: %s tooltip.bloodmagic.diviner.blankRune=Blank Runes: %d tooltip.bloodmagic.diviner.waterRune=Water Runes: %d tooltip.bloodmagic.diviner.airRune=Air Runes: %d From a7fcfbd2d006c81342d82ccd3d6f4203658d870c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 16 Jul 2018 16:05:13 -0700 Subject: [PATCH 210/493] Laputa Array should not be able to move unbreakable blocks (#1360) --- .../bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index 0a4dcbe5..ce64e7f3 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.alchemyArray; import java.util.Random; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -83,9 +84,10 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { BlockPos newPos = pos.add(i, j, k); BlockPos offsetPos = newPos.up(teleportHeightOffset); + IBlockState state = world.getBlockState(newPos); TeleposeEvent event = new TeleposeEvent(world, newPos, world, offsetPos); - if (Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos) && !MinecraftForge.EVENT_BUS.post(event)) + if (state.getBlockHardness(world, newPos) > 0 && !MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) { k++; this.currentPos = new BlockPos(i, j, k); From fb90656335b64770cc519df93607f95ca1c98f12 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 16 Jul 2018 16:42:10 -0700 Subject: [PATCH 211/493] Green Grove ritual should apply to Reeds and Cactus (#1359) --- .../bloodmagic/ritual/types/RitualGreenGrove.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index fdc69092..ccbfca81 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -8,9 +8,7 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.block.BlockFarmland; -import net.minecraft.block.IGrowable; +import net.minecraft.block.*; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -93,11 +91,13 @@ public class RitualGreenGrove extends Ritual { IBlockState state = world.getBlockState(newPos); if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { - if (state.getBlock() instanceof IGrowable) { + boolean flag = state.getBlock() instanceof IGrowable || state.getBlock() instanceof BlockCactus || state.getBlock() instanceof BlockReed; + if (flag) { if (world.rand.nextDouble() < growthChance) { state.getBlock().updateTick(world, newPos, state, new Random()); IBlockState newState = world.getBlockState(newPos); if (!newState.equals(state)) { + world.playEvent(2005, newPos, 0); totalGrowths++; if (consumeRawWill) { rawWill -= rawWillDrain; From a28f6308aa55f20e2b88caee92c5cb6da31c9be8 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 16 Jul 2018 16:42:24 -0700 Subject: [PATCH 212/493] Update changelog + version --- changelog.txt | 26 ++++++++++++++++++++++++++ gradle.properties | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 9a176a06..75fdcfe3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,29 @@ +------------------------------------------------------ +Version 2.3.0 +------------------------------------------------------ + +- Fixed Basic Cutting Fluid recipe so it no longer requires an unobtainable potion +- Fixed Teleposer Blacklist not working +- Fixed the bounding box on the Blood Tank +- Fixed crafted Inscription Tools not having their uses tag applied +- Fixed JEI queries with bound Blood Orbs +- Fixed Crushing Ritual not passing a valid player +- Fixed Mending applying to Potion Flasks +- Fixed Teleposition Sigil not checking for a Teleposer at it's destination +- Fixed Lava Crystal not syphoning LP +- Fixed the Laputa array moving unbreakable blocks + - ie: Bedrock +- Fixed the Ritual of the Green Grove not working on Cactus and Reeds +- Added a Mob Sacrifice array +- Updated the HUD system + - You can now edit the HUD layout via the in-game config editor with a drag'n'drop system. + - This screen is only available while in a world. +- Updated the German translation +- Updated the Chinese translation +- [API] Reworked how rituals are registered + - This will break any addons that work with rituals + - If you report an issue to me regarding broken addons, it will be closed without any comment + ------------------------------------------------------ Version 2.2.12 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index eacbf839..c9f0bf43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.2.12 +mod_version=2.3.0 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From 7aadc505abfb5907db158cea6d992fd765fa4173 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 22 Jul 2018 06:51:38 -0700 Subject: [PATCH 213/493] Fix Ritual of Magnetism not being registered --- .../java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index ba7fe38b..d5047838 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -13,6 +13,7 @@ import net.minecraftforge.oredict.OreDictionary; import java.util.function.Consumer; +@RitualRegister("magnetism") public class RitualMagnetic extends Ritual { public static final String PLACEMENT_RANGE = "placementRange"; // public static final String SEARCH_RANGE = "searchRange"; From 5ac52fa8c9dd58b7edcf80308f8233cbca6e64b3 Mon Sep 17 00:00:00 2001 From: KohaiKhaos Date: Sun, 22 Jul 2018 08:54:46 -0500 Subject: [PATCH 214/493] Mob Sacrifice Array no longer kills bosses or players (#1371) This is solving the issue I raised in https://github.com/WayofTime/BloodMagic/issues/1368 Added a single check to line 123 of src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java. The check makes sure the effective health of the currently targeted entity is above 0. So bosses and players are no longer set to -1 health when the array finishes crafting. --- .../alchemyArray/AlchemyArrayEffectMobSacrifice.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java index 6ed8fbcf..77224e58 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java @@ -120,7 +120,7 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect for (EntityLivingBase living : livingEntities) { double health = getEffectiveHealth(living); - if (healthAvailable > 0) + if (healthAvailable > 0 && health > 0) { healthAvailable -= health; living.getEntityWorld().playSound(null, living.posX, living.posY, living.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (living.getEntityWorld().rand.nextFloat() - living.getEntityWorld().rand.nextFloat()) * 0.8F); @@ -230,4 +230,4 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { return new AlchemyArrayEffectMobSacrifice(key); } -} \ No newline at end of file +} From e82510d55324622c609ee67d6edb9d9ebf6bb452 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 22 Jul 2018 06:56:10 -0700 Subject: [PATCH 215/493] Fix will type serializer using lowercased names for lookups (#1369) --- src/main/java/WayofTime/bloodmagic/gson/Serializers.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index 3a77e208..a2171911 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -33,7 +33,7 @@ public class Serializers { @Override public EnumDemonWillType copyValue(EnumDemonWillType value) { - return EnumDemonWillType.valueOf(value.getName()); + return EnumDemonWillType.valueOf(value.name()); } }; From 6c5bbed348f70ea2fddb785090aac1b782d686d5 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Sun, 22 Jul 2018 10:07:27 -0400 Subject: [PATCH 216/493] Quick Fixes (#1362) * Add modid to command localizations to prevent conflicts * Corrected localizations of other lang files * Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD --- .../client/hud/element/ElementHolding.java | 2 +- .../command/sub/SubCommandBind.java | 8 +- .../command/sub/SubCommandNetwork.java | 38 +++---- .../bloodmagic/command/sub/SubCommandOrb.java | 16 +-- .../assets/bloodmagic/lang/en_US.lang | 94 +++++++++--------- .../assets/bloodmagic/lang/fr_FR.lang | 98 +++++++++---------- .../assets/bloodmagic/lang/ja_JP.lang | 98 +++++++++---------- .../assets/bloodmagic/lang/zh_CN.lang | 98 +++++++++---------- 8 files changed, 226 insertions(+), 226 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java index d2656658..9206f124 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java @@ -44,7 +44,7 @@ public class ElementHolding extends HUDElement { List inventory = ItemSigilHolding.getInternalInventory(sigilHolding); int xOffset = 0; for (ItemStack stack : inventory) { - renderHotbarItem(drawX + 3 + xOffset, drawY - 4, partialTicks, minecraft.player, stack); + renderHotbarItem(drawX + 3 + xOffset, drawY + 3, partialTicks, minecraft.player, stack); xOffset += 20; } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 5547ac6d..f229ad5b 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -21,7 +21,7 @@ public class SubCommandBind extends CommandBase { @Override public String getUsage(ICommandSender commandSender) { - return TextHelper.localizeEffect("commands.bind.usage"); + return TextHelper.localizeEffect("commands.bloodmagic.bind.usage"); } @Override @@ -58,17 +58,17 @@ public class SubCommandBind extends CommandBase { if (bind) { Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); BindableHelper.applyBinding(held, binding); - commandSender.sendMessage(new TextComponentTranslation("commands.bind.success")); + commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.success")); } else { Binding binding = ((IBindable) held.getItem()).getBinding(held); if (binding != null) { held.getTagCompound().removeTag("binding"); - commandSender.sendMessage(new TextComponentTranslation("commands.bind.remove.success")); + commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.remove.success")); } } } } catch (PlayerNotFoundException e) { - commandSender.sendMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.error.404"))); + commandSender.sendMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.bloodmagic.error.404"))); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 07a53b22..f5a279d8 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -23,7 +23,7 @@ public class SubCommandNetwork extends CommandBase { @Override public String getUsage(ICommandSender commandSender) { - return TextHelper.localizeEffect("commands.network.usage"); + return TextHelper.localizeEffect("commands.bloodmagic.network.usage"); } @Override @@ -50,12 +50,12 @@ public class SubCommandNetwork extends CommandBase { CommandBloodMagic.displayErrorString(commandSender, e.getLocalizedMessage()); } } else { - CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing"); + CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing"); } } private enum ValidCommands { - SYPHON("commands.network.syphon.help") { + SYPHON("commands.bloodmagic.network.syphon.help") { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { if (displayHelp) { @@ -67,16 +67,16 @@ public class SubCommandNetwork extends CommandBase { if (Utils.isInteger(args[2])) { int amount = Integer.parseInt(args[2]); NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, amount); - CommandBloodMagic.displaySuccessString(sender, "commands.network.syphon.success", amount, player.getDisplayName().getFormattedText()); + CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.syphon.success", amount, player.getDisplayName().getFormattedText()); } else { - CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid"); + CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); } } else { - CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing"); + CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing"); } } }, - ADD("commands.network.add.help") { + ADD("commands.bloodmagic.network.add.help") { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { if (displayHelp) { @@ -90,16 +90,16 @@ public class SubCommandNetwork extends CommandBase { if (Utils.isInteger(args[2])) { int amount = Integer.parseInt(args[2]); int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); - CommandBloodMagic.displaySuccessString(sender, "commands.network.add.success", network.add(amount, maxOrb), player.getDisplayName().getFormattedText()); + CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.add.success", network.add(amount, maxOrb), player.getDisplayName().getFormattedText()); } else { - CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid"); + CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); } } else { - CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing"); + CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing"); } } }, - SET("commands.network.set.help") { + SET("commands.bloodmagic.network.set.help") { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { if (displayHelp) { @@ -113,16 +113,16 @@ public class SubCommandNetwork extends CommandBase { if (Utils.isInteger(args[2])) { int amount = Integer.parseInt(args[2]); network.setCurrentEssence(amount); - CommandBloodMagic.displaySuccessString(sender, "commands.network.set.success", player.getDisplayName().getFormattedText(), amount); + CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount); } else { - CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid"); + CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); } } else { - CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing"); + CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing"); } } }, - GET("commands.network.get.help") { + GET("commands.bloodmagic.network.get.help") { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { if (displayHelp) { @@ -137,7 +137,7 @@ public class SubCommandNetwork extends CommandBase { } }, - FILL("commands.network.fill.help") { + FILL("commands.bloodmagic.network.fill.help") { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { if (displayHelp) { @@ -149,11 +149,11 @@ public class SubCommandNetwork extends CommandBase { if (args.length > 1) { network.setCurrentEssence(Integer.MAX_VALUE); - CommandBloodMagic.displaySuccessString(sender, "commands.network.fill.success", player.getDisplayName().getFormattedText()); + CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText()); } } }, - CAP("commands.network.cap.help") { + CAP("commands.bloodmagic.network.cap.help") { @Override public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { if (displayHelp) { @@ -166,7 +166,7 @@ public class SubCommandNetwork extends CommandBase { if (args.length > 1) { int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); network.setCurrentEssence(maxOrb); - CommandBloodMagic.displaySuccessString(sender, "commands.network.cap.success", player.getDisplayName().getFormattedText()); + CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText()); } } },; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 27a34df7..cdba93a2 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -24,7 +24,7 @@ public class SubCommandOrb extends CommandBase { @Override public String getUsage(ICommandSender commandSender) { - return TextHelper.localizeEffect("commands.orb.usage"); + return TextHelper.localizeEffect("commands.bloodmagic.orb.usage"); } @Override @@ -63,12 +63,12 @@ public class SubCommandOrb extends CommandBase { if (Utils.isInteger(args[2])) { int amount = Integer.parseInt(args[2]); network.setOrbTier(amount); - CommandBloodMagic.displaySuccessString(commandSender, "commands.success"); + CommandBloodMagic.displaySuccessString(commandSender, "commands.bloodmagic.success"); } else { - CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.invalid"); + CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.invalid"); } } else { - CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing"); + CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing"); } break; @@ -86,17 +86,17 @@ public class SubCommandOrb extends CommandBase { } } } catch (IllegalArgumentException e) { - CommandBloodMagic.displayErrorString(commandSender, "commands.error.404"); + CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404"); } } catch (PlayerNotFoundException e) { - CommandBloodMagic.displayErrorString(commandSender, "commands.error.404"); + CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404"); } } } private enum ValidCommands { - SET("commands.orb.set.help"), - GET("commands.orb.get.help"); + SET("commands.bloodmagic.orb.set.help"), + GET("commands.bloodmagic.orb.get.help"); public String help; diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index bacb10da..a8ec51ae 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -794,60 +794,60 @@ entity.bloodmagic.SentientSpecter.name=Sentient Specter entity.bloodmagic.Mimic.name=Mimic # Commands -commands.error.arg.invalid=Invalid arguments -commands.error.arg.missing=Not enough arguments -commands.error.arg.player.missing=You must specify which player you wish to perform this action on. -commands.error.404=Command not found! -commands.error.unknown=Unknown command! -commands.error.perm=You do not have permission to use this command. +commands.bloodmagic.error.arg.invalid=Invalid arguments +commands.bloodmagic.error.arg.missing=Not enough arguments +commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on. +commands.bloodmagic.error.404=Command not found! +commands.bloodmagic.error.unknown=Unknown command! +commands.bloodmagic.error.perm=You do not have permission to use this command. -commands.success=Executed successfully +commands.bloodmagic.success=Executed successfully -commands.format.help=%s - %s -commands.format.error=%s - %s +commands.bloodmagic.format.help=%s - %s +commands.bloodmagic.format.error=%s - %s -commands.help.usage=/bloodmagic help -commands.help.help=Displays the help information for the "/bloodmagic" command. +commands.bloodmagic.help.usage=/bloodmagic help +commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic" command. -commands.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] -commands.network.help=LP network utilities -commands.network.syphon.help=Removes the given amount of LP from the given player's LP network. -commands.network.syphon.success=Successfully syphoned %d LP from %s. -commands.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. -commands.network.add.success=Successfully added %d LP to %s's LP network. -commands.network.set.help=Sets the given player's LP to the given amount. -commands.network.set.success=Successfully set %s's LP network to %d LP. -commands.network.get.help=Returns the amount of LP in the given player's LP network. -commands.network.fill.help=Fills the given player's LP network to %d. -commands.network.fill.success=Successfully filled %s's LP network. -commands.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. -commands.network.cap.success=Successfully capped off %s's LP network. +commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] +commands.bloodmagic.network.help=LP network utilities +commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network. +commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s. +commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. +commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network. +commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount. +commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP. +commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network. +commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d. +commands.bloodmagic.network.fill.success=Successfully filled %s's LP network. +commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. +commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network. -commands.bind.usage=/bloodmagic bind [true|false] [player] -commands.bind.help=Attempts to (un)bind the currently held item. -commands.bind.success=Binding successful -commands.bind.remove.success=Unbinding successful +commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] +commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item. +commands.bloodmagic.bind.success=Binding successful +commands.bloodmagic.bind.remove.success=Unbinding successful -commands.orb.usage=/bloodmagic orb [set|get] player [tier] -commands.orb.help=Used to set or get the Player's max Blood Orb tier. +commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] +commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier. -commands.bind.failed.noPlayer=There is no player specified -commands.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it -commands.bind.failed.notBindable=Item cannot be bound -commands.unbind.usage=/unbind -commands.unbind.success=Item successfully unbound! -commands.unbind.failed.notBindable=Item cannot be unbound -commands.soulnetwork.usage=/soulnetwork [amount] -commands.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! -commands.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! -commands.soulnetwork.fill.success=Successfully filled %s's Soul Network! -commands.soulnetwork.empty.success=Successfully emptied %s's Soul Network! -commands.soulnetwork.get.success=There is %dLP in %s's Soul Network! -commands.soulnetwork.noPlayer=There is no player specified -commands.soulnetwork.noCommand=There is no command specified -commands.soulnetwork.notACommand=That is not a valid command -commands.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! -commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) +commands.bloodmagic.bind.failed.noPlayer=There is no player specified +commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it +commands.bloodmagic.bind.failed.notBindable=Item cannot be bound +commands.bloodmagic.unbind.usage=/unbind +commands.bloodmagic.unbind.success=Item successfully unbound! +commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound +commands.bloodmagic.soulnetwork.usage=/soulnetwork [amount] +commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! +commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! +commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network! +commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network! +commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network! +commands.bloodmagic.soulnetwork.noPlayer=There is no player specified +commands.bloodmagic.soulnetwork.noCommand=There is no command specified +commands.bloodmagic.soulnetwork.notACommand=That is not a valid command +commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! +commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) # GUI tile.bloodmagic.inputNode.name=Input Node diff --git a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang index 6f2638be..f75e010a 100644 --- a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang +++ b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang @@ -552,62 +552,62 @@ secret.bloodmagic.bread.bloody=&r&cBloody Bread secret.bloodmagic.bread.bloody.desc=Only for &odire &r&7emergencies. # Commands -commands.error.arg.invalid=Invalid arguments -commands.error.arg.missing=Not enough arguments -commands.error.arg.player.missing=You must specify which player you wish to perform this action on. -commands.error.404=Command not found! -commands.error.unknown=Unknown command! -commands.error.perm=You do not have permission to use this command. +commands.bloodmagic.error.arg.invalid=Invalid arguments +commands.bloodmagic.error.arg.missing=Not enough arguments +commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on. +commands.bloodmagic.error.404=Command not found! +commands.bloodmagic.error.unknown=Unknown command! +commands.bloodmagic.error.perm=You do not have permission to use this command. -commands.success=Executed successfully +commands.bloodmagic.success=Executed successfully -commands.format.help=%s - %s -commands.format.error=%s - %s +commands.bloodmagic.format.help=%s - %s +commands.bloodmagic.format.error=%s - %s -commands.help.usage=/bloodmagic help -commands.help.help=Displays the help information for the "/bloodmagic" command. +commands.bloodmagic.help.usage=/bloodmagic help +commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic" command. -commands.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] -commands.network.help=LP network utilities -commands.network.syphon.help=Removes the given amount of LP from the given player's LP network. -commands.network.syphon.success=Successfully syphoned %d LP from %s. -commands.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. -commands.network.add.success=Successfully added %d LP to %s's LP network. -commands.network.set.help=Sets the given player's LP to the given amount. -commands.network.set.success=Successfully set %s's LP network to %d LP. -commands.network.get.help=Returns the amount of LP in the given player's LP network. -commands.network.fill.help=Fills the given player's LP network to %d. -commands.network.fill.success=Successfully filled %s's LP network. -commands.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. -commands.network.cap.success=Successfully capped off %s's LP network. +commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] +commands.bloodmagic.network.help=LP network utilities +commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network. +commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s. +commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. +commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network. +commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount. +commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP. +commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network. +commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d. +commands.bloodmagic.network.fill.success=Successfully filled %s's LP network. +commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. +commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network. -commands.bind.usage=/bloodmagic bind [true|false] [player] -commands.bind.help=Attempts to (un)bind the currently held item. -commands.bind.success=Binding successful -commands.bind.remove.success=Unbinding successful +commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] +commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item. +commands.bloodmagic.bind.success=Binding successful +commands.bloodmagic.bind.remove.success=Unbinding successful -commands.orb.usage=/bloodmagic orb [set|get] player [tier] -commands.orb.help=Used to set or get the Player's max Blood Orb tier. +commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] +commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier. -commands.bind.usage=/bind -commands.bind.success=Item successfully bound! -commands.bind.failed.noPlayer=There is no player specified -commands.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it -commands.bind.failed.notBindable=Item cannot be bound -commands.unbind.usage=/unbind -commands.unbind.success=Item successfully unbound! -commands.unbind.failed.notBindable=Item cannot be unbound -commands.soulnetwork.usage=/soulnetwork [amount] -commands.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! -commands.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! -commands.soulnetwork.fill.success=Successfully filled %s's Soul Network! -commands.soulnetwork.empty.success=Successfully emptied %s's Soul Network! -commands.soulnetwork.get.success=There is %dLP in %s's Soul Network! -commands.soulnetwork.noPlayer=There is no player specified -commands.soulnetwork.noCommand=There is no command specified -commands.soulnetwork.notACommand=That is not a valid command -commands.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! -commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) +commands.bloodmagic.bind.usage=/bind +commands.bloodmagic.bind.success=Item successfully bound! +commands.bloodmagic.bind.failed.noPlayer=There is no player specified +commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it +commands.bloodmagic.bind.failed.notBindable=Item cannot be bound +commands.bloodmagic.unbind.usage=/unbind +commands.bloodmagic.unbind.success=Item successfully unbound! +commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound +commands.bloodmagic.soulnetwork.usage=/soulnetwork [amount] +commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! +commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! +commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network! +commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network! +commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network! +commands.bloodmagic.soulnetwork.noPlayer=There is no player specified +commands.bloodmagic.soulnetwork.noCommand=There is no command specified +commands.bloodmagic.soulnetwork.notACommand=That is not a valid command +commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! +commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) # Keybinds bloodmagic.keybind.openSigilHolding=Open Sigil of Holding diff --git a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang index 6bc2153f..58d7b932 100644 --- a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang +++ b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang @@ -785,62 +785,62 @@ entity.bloodmagic.SentientSpecter.name=ç†åŠ›ã®éœŠé­‚ entity.bloodmagic.Mimic.name=ミミック # Commands -commands.error.arg.invalid=無効ãªå¼•æ•°ã§ã™ -commands.error.arg.missing=引数ãŒè¶³ã‚Šã¾ã›ã‚“ -commands.error.arg.player.missing=ã‚ãªãŸã¯å®Ÿè¡Œã™ã‚‹å¯¾è±¡ãƒ—レイヤーを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -commands.error.404=コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼ -commands.error.unknown=未知ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã™ï¼ -commands.error.perm=ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 +commands.bloodmagic.error.arg.invalid=無効ãªå¼•æ•°ã§ã™ +commands.bloodmagic.error.arg.missing=引数ãŒè¶³ã‚Šã¾ã›ã‚“ +commands.bloodmagic.error.arg.player.missing=ã‚ãªãŸã¯å®Ÿè¡Œã™ã‚‹å¯¾è±¡ãƒ—レイヤーを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ +commands.bloodmagic.error.404=コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼ +commands.bloodmagic.error.unknown=未知ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã™ï¼ +commands.bloodmagic.error.perm=ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 -commands.success=正常ã«å®Ÿè¡Œã•ã‚Œã¾ã—㟠+commands.bloodmagic.success=正常ã«å®Ÿè¡Œã•ã‚Œã¾ã—㟠-commands.format.help=%s - %s -commands.format.error=%s - %s +commands.bloodmagic.format.help=%s - %s +commands.bloodmagic.format.error=%s - %s -commands.help.usage=/bloodmagic help -commands.help.help="/bloodmagic" コマンドã§ãƒ˜ãƒ«ãƒ—情報ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ +commands.bloodmagic.help.usage=/bloodmagic help +commands.bloodmagic.help.help="/bloodmagic" コマンドã§ãƒ˜ãƒ«ãƒ—情報ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ -commands.network.usage=/bloodmagic network [syphon|add|get|fill|cap] <プレイヤー> [é‡] -commands.network.help=LP ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£ -commands.network.syphon.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰LPを削減ã—ã¾ã™ -commands.network.syphon.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’削減ã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.network.add.help=指定ã•ã‚ŒãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®LPã‚’ã€LP増加ルールã®ç¯„囲内ã§å¢—加ã•ã›ã¾ã™ã€‚ -commands.network.add.success=%d LPã ã‘ã€%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’増加ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.network.set.help=指定ã—ãŸãƒ—レイヤーã®LPを設定ã—ã¾ã™ã€‚ -commands.network.set.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’%d LPã«è¨­å®šã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.network.get.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®LPé‡ã‚’è¿”ã—ã¾ã™ã€‚ -commands.network.fill.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’%d LPã¾ã§æº€ãŸã—ã¾ã™ã€‚ -commands.network.fill.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’最大ã¾ã§ä»˜ä¸Žã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.network.cap.help=プレイヤーãŒå…¥æ‰‹ã§ãる最高ä½ã®ãƒ–ラッドオーブã§è²¯è”µå¯èƒ½ãªæœ€å¤§å€¤ã®LPを付与ã—ã¾ã™ã€‚ -commands.network.cap.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®é™ç•Œå€¤ã¾ã§LPを付与ã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ +commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] <プレイヤー> [é‡] +commands.bloodmagic.network.help=LP ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£ +commands.bloodmagic.network.syphon.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰LPを削減ã—ã¾ã™ +commands.bloodmagic.network.syphon.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’削減ã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ +commands.bloodmagic.network.add.help=指定ã•ã‚ŒãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®LPã‚’ã€LP増加ルールã®ç¯„囲内ã§å¢—加ã•ã›ã¾ã™ã€‚ +commands.bloodmagic.network.add.success=%d LPã ã‘ã€%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’増加ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ +commands.bloodmagic.network.set.help=指定ã—ãŸãƒ—レイヤーã®LPを設定ã—ã¾ã™ã€‚ +commands.bloodmagic.network.set.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’%d LPã«è¨­å®šã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ +commands.bloodmagic.network.get.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®LPé‡ã‚’è¿”ã—ã¾ã™ã€‚ +commands.bloodmagic.network.fill.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’%d LPã¾ã§æº€ãŸã—ã¾ã™ã€‚ +commands.bloodmagic.network.fill.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’最大ã¾ã§ä»˜ä¸Žã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ +commands.bloodmagic.network.cap.help=プレイヤーãŒå…¥æ‰‹ã§ãる最高ä½ã®ãƒ–ラッドオーブã§è²¯è”µå¯èƒ½ãªæœ€å¤§å€¤ã®LPを付与ã—ã¾ã™ã€‚ +commands.bloodmagic.network.cap.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®é™ç•Œå€¤ã¾ã§LPを付与ã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.bind.usage=/bloodmagic bind [true|false] [プレイヤー] -commands.bind.help=手ã«æ‰€æŒã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’çµåˆï¼åˆ†é›¢ã—ã¾ã™ã€‚ -commands.bind.success=çµåˆã«æˆåŠŸã—ã¾ã—㟠-commands.bind.remove.success=分離ã«æˆåŠŸã—ã¾ã—㟠+commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [プレイヤー] +commands.bloodmagic.bind.help=手ã«æ‰€æŒã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’çµåˆï¼åˆ†é›¢ã—ã¾ã™ã€‚ +commands.bloodmagic.bind.success=çµåˆã«æˆåŠŸã—ã¾ã—㟠+commands.bloodmagic.bind.remove.success=分離ã«æˆåŠŸã—ã¾ã—㟠-commands.orb.usage=/bloodmagic orb [set|get] <プレイヤー> [グレード] -commands.orb.help=対象プレイヤーã®ãƒ–ラッドオーブã®ã‚°ãƒ¬ãƒ¼ãƒ‰ã®æœ€å¤§å€¤ã‚’設定ã€å–å¾—ã™ã‚‹ãŸã‚ã«ä½¿ã„ã¾ã™ã€‚ +commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] <プレイヤー> [グレード] +commands.bloodmagic.orb.help=対象プレイヤーã®ãƒ–ラッドオーブã®ã‚°ãƒ¬ãƒ¼ãƒ‰ã®æœ€å¤§å€¤ã‚’設定ã€å–å¾—ã™ã‚‹ãŸã‚ã«ä½¿ã„ã¾ã™ã€‚ -commands.bind.usage=/bind <プレイヤー> -commands.bind.success=アイテムã®ç™»éŒ²ãŒæˆåŠŸã—ã¾ã—ãŸï¼ -commands.bind.failed.noPlayer=指定ã•ã‚ŒãŸãƒ—レイヤーã¯å­˜åœ¨ã—ã¾ã›ã‚“ -commands.bind.failed.alreadyBound=アイテムã¯æ—¢ã«ç™»éŒ²æ¸ˆã¿ã§ã™ï¼› /unbind コマンドã§ç™»éŒ²è§£é™¤ã—ã¦ãã ã•ã„ -commands.bind.failed.notBindable=アイテムã®ç™»éŒ²ãŒå‡ºæ¥ã¾ã›ã‚“ã§ã—㟠-commands.unbind.usage=/unbind -commands.unbind.success=アイテムã®ç™»éŒ²è§£é™¤ãŒæˆåŠŸã—ã¾ã—ãŸï¼ -commands.unbind.failed.notBindable=アイテムã®ç™»éŒ²è§£é™¤ãŒå‡ºæ¥ã¾ã›ã‚“ã§ã—㟠-commands.soulnetwork.usage=/soulnetwork <プレイヤー> [é‡] -commands.soulnetwork.add.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’増加ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸï¼ -commands.soulnetwork.subtract.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’減少ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸï¼ -commands.soulnetwork.fill.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’満ãŸã—ã¾ã—ãŸï¼ -commands.soulnetwork.empty.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’空ã«ã—ã¾ã—ãŸï¼ -commands.soulnetwork.get.success=%dã ã‘%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã¯LPãŒã‚ã‚Šã¾ã™ï¼ -commands.soulnetwork.noPlayer=指定ã•ã‚ŒãŸãƒ—レイヤーã¯å­˜åœ¨ã—ã¾ã›ã‚“ -commands.soulnetwork.noCommand=指定ã•ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“ -commands.soulnetwork.notACommand=有効ãªã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“ -commands.soulnetwork.fillMax.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã‚ªãƒ¼ãƒ–ã®æœ€å¤§å€¤ã¾ã§LPを供給ã—ã¾ã—ãŸï¼ -commands.soulnetwork.create.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’構築ã—ã¾ã—ãŸ(オーブã®ã‚°ãƒ¬ãƒ¼ãƒ‰ï¼š %d) +commands.bloodmagic.bind.usage=/bind <プレイヤー> +commands.bloodmagic.bind.success=アイテムã®ç™»éŒ²ãŒæˆåŠŸã—ã¾ã—ãŸï¼ +commands.bloodmagic.bind.failed.noPlayer=指定ã•ã‚ŒãŸãƒ—レイヤーã¯å­˜åœ¨ã—ã¾ã›ã‚“ +commands.bloodmagic.bind.failed.alreadyBound=アイテムã¯æ—¢ã«ç™»éŒ²æ¸ˆã¿ã§ã™ï¼› /unbind コマンドã§ç™»éŒ²è§£é™¤ã—ã¦ãã ã•ã„ +commands.bloodmagic.bind.failed.notBindable=アイテムã®ç™»éŒ²ãŒå‡ºæ¥ã¾ã›ã‚“ã§ã—㟠+commands.bloodmagic.unbind.usage=/unbind +commands.bloodmagic.unbind.success=アイテムã®ç™»éŒ²è§£é™¤ãŒæˆåŠŸã—ã¾ã—ãŸï¼ +commands.bloodmagic.unbind.failed.notBindable=アイテムã®ç™»éŒ²è§£é™¤ãŒå‡ºæ¥ã¾ã›ã‚“ã§ã—㟠+commands.bloodmagic.soulnetwork.usage=/soulnetwork <プレイヤー> [é‡] +commands.bloodmagic.soulnetwork.add.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’増加ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸï¼ +commands.bloodmagic.soulnetwork.subtract.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’減少ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸï¼ +commands.bloodmagic.soulnetwork.fill.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’満ãŸã—ã¾ã—ãŸï¼ +commands.bloodmagic.soulnetwork.empty.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’空ã«ã—ã¾ã—ãŸï¼ +commands.bloodmagic.soulnetwork.get.success=%dã ã‘%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã¯LPãŒã‚ã‚Šã¾ã™ï¼ +commands.bloodmagic.soulnetwork.noPlayer=指定ã•ã‚ŒãŸãƒ—レイヤーã¯å­˜åœ¨ã—ã¾ã›ã‚“ +commands.bloodmagic.soulnetwork.noCommand=指定ã•ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“ +commands.bloodmagic.soulnetwork.notACommand=有効ãªã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“ +commands.bloodmagic.soulnetwork.fillMax.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã‚ªãƒ¼ãƒ–ã®æœ€å¤§å€¤ã¾ã§LPを供給ã—ã¾ã—ãŸï¼ +commands.bloodmagic.soulnetwork.create.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’構築ã—ã¾ã—ãŸ(オーブã®ã‚°ãƒ¬ãƒ¼ãƒ‰ï¼š %d) # GUI tile.bloodmagic.inputNode.name=入力ノード diff --git a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang index 5c76206c..6ccec15a 100644 --- a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang @@ -783,62 +783,62 @@ entity.bloodmagic.SentientSpecter.name=æ„ŸçŸ¥ä¹‹çµ entity.bloodmagic.Mimic.name=æ‹Ÿæ€ # Commands -commands.error.arg.invalid=无效å‚æ•° -commands.error.arg.missing=å‚æ•°ä¸è¶³ -commands.error.arg.player.missing=你必须指定一个玩家æ¥æ‰§è¡Œè¯¥å‘½ä»¤ã€‚ -commands.error.404=å‘½ä»¤æœªæ‰¾åˆ°ï¼ -commands.error.unknown=æœªçŸ¥çš„å‘½ä»¤ï¼ -commands.error.perm=你没有使用该命令的æƒé™ã€‚ +commands.bloodmagic.error.arg.invalid=无效å‚æ•° +commands.bloodmagic.error.arg.missing=å‚æ•°ä¸è¶³ +commands.bloodmagic.error.arg.player.missing=你必须指定一个玩家æ¥æ‰§è¡Œè¯¥å‘½ä»¤ã€‚ +commands.bloodmagic.error.404=å‘½ä»¤æœªæ‰¾åˆ°ï¼ +commands.bloodmagic.error.unknown=æœªçŸ¥çš„å‘½ä»¤ï¼ +commands.bloodmagic.error.perm=你没有使用该命令的æƒé™ã€‚ -commands.success=æˆåŠŸæ‰§è¡Œ +commands.bloodmagic.success=æˆåŠŸæ‰§è¡Œ -commands.format.help=%s - %s -commands.format.error=%s - %s +commands.bloodmagic.format.help=%s - %s +commands.bloodmagic.format.error=%s - %s -commands.help.usage=/bloodmagic help -commands.help.help=使用"/bloodmagic help"命令显示指令列表。 +commands.bloodmagic.help.usage=/bloodmagic help +commands.bloodmagic.help.help=使用"/bloodmagic help"命令显示指令列表。 -commands.network.usage=/bloodmagic network [å¸å–(syphon)|添加(add)|查看(get)|å¡«å……(fill)|填满(cap)] <玩家> [æ•°é‡] -commands.network.help=çµé­‚网络实用工具 -commands.network.syphon.help=从指定玩家的çµé­‚网络中移出指定的LP值。 -commands.network.syphon.success=æˆåŠŸä»Ž %s å¸å–出 %dLP。 -commands.network.add.help=添加指定的LP值到指定玩家的çµé­‚网络中。æœä»Žæ ‡å‡†çš„LP增加规则。 -commands.network.add.success=æˆåŠŸæ·»åŠ  %dLP 到 %s çš„çµé­‚网络。 -commands.network.set.help=将指定玩家的LP设置为所给数值。 -commands.network.set.success=æˆåŠŸå°† %s çµé­‚网络中的LP设置为 %d。 -commands.network.get.help=返还指定玩家çµé­‚网络中的LP值。 -commands.network.fill.help=将指定玩家的LP填充为 %d。 -commands.network.fill.success=æˆåŠŸå¡«å…… %s çš„çµé­‚网络。 -commands.network.cap.help=填充指定玩家的çµé­‚网络至其所æŒæœ‰çš„最高阶气血å®ç å®¹é‡çš„最大值。 -commands.network.cap.success=æˆåŠŸå¡«æ»¡ %s çš„çµé­‚网络。 +commands.bloodmagic.network.usage=/bloodmagic network [å¸å–(syphon)|添加(add)|查看(get)|å¡«å……(fill)|填满(cap)] <玩家> [æ•°é‡] +commands.bloodmagic.network.help=çµé­‚网络实用工具 +commands.bloodmagic.network.syphon.help=从指定玩家的çµé­‚网络中移出指定的LP值。 +commands.bloodmagic.network.syphon.success=æˆåŠŸä»Ž %s å¸å–出 %dLP。 +commands.bloodmagic.network.add.help=添加指定的LP值到指定玩家的çµé­‚网络中。æœä»Žæ ‡å‡†çš„LP增加规则。 +commands.bloodmagic.network.add.success=æˆåŠŸæ·»åŠ  %dLP 到 %s çš„çµé­‚网络。 +commands.bloodmagic.network.set.help=将指定玩家的LP设置为所给数值。 +commands.bloodmagic.network.set.success=æˆåŠŸå°† %s çµé­‚网络中的LP设置为 %d。 +commands.bloodmagic.network.get.help=返还指定玩家çµé­‚网络中的LP值。 +commands.bloodmagic.network.fill.help=将指定玩家的LP填充为 %d。 +commands.bloodmagic.network.fill.success=æˆåŠŸå¡«å…… %s çš„çµé­‚网络。 +commands.bloodmagic.network.cap.help=填充指定玩家的çµé­‚网络至其所æŒæœ‰çš„最高阶气血å®ç å®¹é‡çš„最大值。 +commands.bloodmagic.network.cap.success=æˆåŠŸå¡«æ»¡ %s çš„çµé­‚网络。 -commands.bind.usage=/bind <玩家> -commands.bind.help=用于设置/解除对手æŒç‰©å“的绑定情况。 -commands.bind.success=物å“æˆåŠŸç»‘å®šï¼ -commands.bind.remove.success=解除绑定æˆåŠŸ +commands.bloodmagic.bind.usage=/bind <玩家> +commands.bloodmagic.bind.help=用于设置/解除对手æŒç‰©å“的绑定情况。 +commands.bloodmagic.bind.success=物å“æˆåŠŸç»‘å®šï¼ +commands.bloodmagic.bind.remove.success=解除绑定æˆåŠŸ -commands.orb.usage=/bloodmagic orb [设置(set)|查看(get)] <玩家> [等级] -commands.orb.help=用于设置或查看玩家的最高血å®ç ç­‰çº§. +commands.bloodmagic.orb.usage=/bloodmagic orb [设置(set)|查看(get)] <玩家> [等级] +commands.bloodmagic.orb.help=用于设置或查看玩家的最高血å®ç ç­‰çº§. -commands.bind.usage=/bind <玩家> -commands.bind.success=物å“æˆåŠŸç»‘å®šï¼ -commands.bind.failed.noPlayer=没有指定玩家 -commands.bind.failed.alreadyBound=物å“å·²ç»è¢«ç»‘定；使用 /unbind æ¥è§£é™¤ç»‘定 -commands.bind.failed.notBindable=物å“无法被绑定 -commands.unbind.usage=/unbind -commands.unbind.success=物å“æˆåŠŸè§£é™¤ç»‘å®šï¼ -commands.unbind.failed.notBindable=物å“无法解除绑定 -commands.soulnetwork.usage=/soulnetwork <玩家> <添加(add)|å‡åŽ»(subtract)|填满(fill)|清空(empty)|查看(get)> [æ•°é‡] -commands.soulnetwork.add.success=æˆåŠŸæ·»åŠ  %dLP 到 %s çš„çµé­‚ç½‘ç»œï¼ -commands.soulnetwork.subtract.success=æˆåŠŸä»Ž %s çš„çµé­‚网络中å‡åŽ» %dLPï¼ -commands.soulnetwork.fill.success=æˆåŠŸå¡«æ»¡ %s çš„çµé­‚ç½‘ç»œï¼ -commands.soulnetwork.empty.success=æˆåŠŸæ¸…空 %s çš„çµé­‚ç½‘ç»œï¼ -commands.soulnetwork.get.success=%s çš„çµé­‚网络中有 %dLPï¼ -commands.soulnetwork.noPlayer=没有指定玩家 -commands.soulnetwork.noCommand=è¿™ä¸ç¬¦å‘½ä»¤è§„定 -commands.soulnetwork.notACommand=è¿™ä¸æ˜¯æœ‰æ•ˆçš„命令 -commands.soulnetwork.fillMax.success=æˆåŠŸå°† %s çš„çµé­‚网络填满至其å®ç çš„æœ€å¤§å€¼ï¼ -commands.soulnetwork.create.success=创建 %s çš„çµé­‚网络æˆåŠŸï¼ˆå®ç ç­‰çº§ï¼š%d） +commands.bloodmagic.bind.usage=/bind <玩家> +commands.bloodmagic.bind.success=物å“æˆåŠŸç»‘å®šï¼ +commands.bloodmagic.bind.failed.noPlayer=没有指定玩家 +commands.bloodmagic.bind.failed.alreadyBound=物å“å·²ç»è¢«ç»‘定；使用 /unbind æ¥è§£é™¤ç»‘定 +commands.bloodmagic.bind.failed.notBindable=物å“无法被绑定 +commands.bloodmagic.unbind.usage=/unbind +commands.bloodmagic.unbind.success=物å“æˆåŠŸè§£é™¤ç»‘å®šï¼ +commands.bloodmagic.unbind.failed.notBindable=物å“无法解除绑定 +commands.bloodmagic.soulnetwork.usage=/soulnetwork <玩家> <添加(add)|å‡åŽ»(subtract)|填满(fill)|清空(empty)|查看(get)> [æ•°é‡] +commands.bloodmagic.soulnetwork.add.success=æˆåŠŸæ·»åŠ  %dLP 到 %s çš„çµé­‚ç½‘ç»œï¼ +commands.bloodmagic.soulnetwork.subtract.success=æˆåŠŸä»Ž %s çš„çµé­‚网络中å‡åŽ» %dLPï¼ +commands.bloodmagic.soulnetwork.fill.success=æˆåŠŸå¡«æ»¡ %s çš„çµé­‚ç½‘ç»œï¼ +commands.bloodmagic.soulnetwork.empty.success=æˆåŠŸæ¸…空 %s çš„çµé­‚ç½‘ç»œï¼ +commands.bloodmagic.soulnetwork.get.success=%s çš„çµé­‚网络中有 %dLPï¼ +commands.bloodmagic.soulnetwork.noPlayer=没有指定玩家 +commands.bloodmagic.soulnetwork.noCommand=è¿™ä¸ç¬¦å‘½ä»¤è§„定 +commands.bloodmagic.soulnetwork.notACommand=è¿™ä¸æ˜¯æœ‰æ•ˆçš„命令 +commands.bloodmagic.soulnetwork.fillMax.success=æˆåŠŸå°† %s çš„çµé­‚网络填满至其å®ç çš„æœ€å¤§å€¼ï¼ +commands.bloodmagic.soulnetwork.create.success=创建 %s çš„çµé­‚网络æˆåŠŸï¼ˆå®ç ç­‰çº§ï¼š%d） # GUI tile.bloodmagic.inputNode.name=输入节点 From 093cfb13efaff3988f1588e8582aefa08365b851 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 22 Jul 2018 07:10:00 -0700 Subject: [PATCH 217/493] Changelog + version --- changelog.txt | 10 ++++++++++ gradle.properties | 2 +- .../java/WayofTime/bloodmagic/block/BlockAltar.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 75fdcfe3..3d8a9a5d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +------------------------------------------------------ +Version 2.3.1 +------------------------------------------------------ + +- Fixed Ritual of Magnetism not being registered +- Fixed Mob Sacrifice Array so it no longer kills bosses and players +- Fixed Will type serializer using lowercase names +- Fixed item rendering for the Sigil of Holding HUD +- Added mod id to command localization keys to prevent potential conflicts + ------------------------------------------------------ Version 2.3.0 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index c9f0bf43..b97442cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.3.0 +mod_version=2.3.1 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 39fe58e1..3f979f47 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -57,7 +57,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl TileEntity tile = world.getTileEntity(pos); - if (tile != null && tile instanceof TileAltar) { + if (tile instanceof TileAltar) { TileAltar altar = (TileAltar) tile; ItemStack orbStack = altar.getStackInSlot(0); From b441e7fc1e0ce7587d70ae140c83681933994371 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Tue, 7 Aug 2018 18:27:12 -0400 Subject: [PATCH 218/493] SoulTicket internal implementation (#1372) * Fix the Blood Tank BB * Add modid to command localizations to prevent conflicts * Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD Corrected localizations of other lang files * SoulTicket internal implementation * do what TehNut says * implement hashCode() * Fix toggleable sigils draining on r-click when it shouldn't Also moved the ItemSigil and ItemSigilToggleable to the sigil package (why wasn't it there???) --- .../bloodmagic/altar/BloodAltar.java | 3 +- .../command/sub/SubCommandNetwork.java | 5 +- .../bloodmagic/core/data/SoulNetwork.java | 15 ++++++ .../bloodmagic/core/data/SoulTicket.java | 52 +++++++++++++++++++ .../WayofTime/bloodmagic/iface/ISigil.java | 2 +- .../bloodmagic/item/ItemBloodOrb.java | 5 +- .../bloodmagic/item/ItemBoundAxe.java | 3 +- .../bloodmagic/item/ItemBoundPickaxe.java | 7 ++- .../bloodmagic/item/ItemBoundShovel.java | 7 ++- .../bloodmagic/item/ItemBoundSword.java | 11 ++-- .../bloodmagic/item/ItemBoundTool.java | 3 +- .../bloodmagic/item/ItemLavaCrystal.java | 6 ++- .../item/armour/ItemLivingArmour.java | 3 +- .../item/{ => sigil}/ItemSigil.java | 2 +- .../bloodmagic/item/sigil/ItemSigilAir.java | 10 ++-- .../bloodmagic/item/sigil/ItemSigilBase.java | 1 - .../item/sigil/ItemSigilBloodLight.java | 19 +++---- .../item/sigil/ItemSigilDivination.java | 6 +-- .../item/sigil/ItemSigilGreenGrove.java | 4 +- .../bloodmagic/item/sigil/ItemSigilLava.java | 10 ++-- .../item/sigil/ItemSigilSuppression.java | 1 - .../item/{ => sigil}/ItemSigilToggleable.java | 9 ++-- .../item/sigil/ItemSigilToggleableBase.java | 1 - .../item/sigil/ItemSigilTransposition.java | 7 ++- .../bloodmagic/item/sigil/ItemSigilVoid.java | 14 +++-- .../bloodmagic/item/sigil/ItemSigilWater.java | 7 +-- .../bloodmagic/ritual/IMasterRitualStone.java | 5 ++ .../bloodmagic/ritual/portal/Teleports.java | 24 +++++---- .../ritual/types/RitualAltarBuilder.java | 8 +-- .../ritual/types/RitualAnimalGrowth.java | 2 +- .../ritual/types/RitualCobblestone.java | 2 +- .../ritual/types/RitualCrushing.java | 4 +- .../ritual/types/RitualCrystalHarvest.java | 2 +- .../ritual/types/RitualEllipsoid.java | 8 +-- .../ritual/types/RitualExpulsion.java | 2 +- .../ritual/types/RitualFeatheredKnife.java | 2 +- .../ritual/types/RitualFelling.java | 2 +- .../ritual/types/RitualForsakenSoul.java | 2 +- .../ritual/types/RitualFullStomach.java | 2 +- .../ritual/types/RitualGreenGrove.java | 2 +- .../ritual/types/RitualHarvest.java | 2 +- .../ritual/types/RitualJumping.java | 2 +- .../bloodmagic/ritual/types/RitualLava.java | 2 +- .../ritual/types/RitualMagnetic.java | 2 +- .../bloodmagic/ritual/types/RitualMeteor.java | 2 +- .../bloodmagic/ritual/types/RitualPlacer.java | 2 +- .../bloodmagic/ritual/types/RitualPump.java | 2 +- .../ritual/types/RitualRegeneration.java | 2 +- .../bloodmagic/ritual/types/RitualWater.java | 2 +- .../ritual/types/RitualWellOfSuffering.java | 2 +- .../bloodmagic/ritual/types/RitualZephyr.java | 2 +- .../bloodmagic/tile/TileAlchemyTable.java | 33 ++++++------ .../tile/TileImperfectRitualStone.java | 5 +- .../tile/TileMasterRitualStone.java | 2 +- .../bloodmagic/tile/TileTeleposer.java | 5 +- .../bloodmagic/util/helper/NetworkHelper.java | 10 ++-- 56 files changed, 210 insertions(+), 147 deletions(-) rename src/main/java/WayofTime/bloodmagic/item/{ => sigil}/ItemSigil.java (95%) rename src/main/java/WayofTime/bloodmagic/item/{ => sigil}/ItemSigilToggleable.java (89%) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 0a6fcdb9..8df2775c 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.block.enums.BloodRuneType; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.orb.BloodOrb; @@ -365,7 +366,7 @@ public class BloodAltar implements IFluidHandler if (fluid != null && fluid.amount >= 1) { int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); - int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); + int drain = NetworkHelper.getSoulNetwork(binding).add(SoulTicket.block(world, pos, liquidDrained), (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index f5a279d8..12db2d7f 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.command.sub; import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; @@ -66,7 +67,7 @@ public class SubCommandNetwork extends CommandBase { if (args.length == 3) { if (Utils.isInteger(args[2])) { int amount = Integer.parseInt(args[2]); - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, amount); + NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.command(sender, "syphon", amount)); CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.syphon.success", amount, player.getDisplayName().getFormattedText()); } else { CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); @@ -90,7 +91,7 @@ public class SubCommandNetwork extends CommandBase { if (Utils.isInteger(args[2])) { int amount = Integer.parseInt(args[2]); int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); - CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.add.success", network.add(amount, maxOrb), player.getDisplayName().getFormattedText()); + CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, "add", amount), maxOrb), player.getDisplayName().getFormattedText()); } else { CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index d0686067..4ba15109 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -33,6 +33,10 @@ public class SoulNetwork implements INBTSerializable { ticketHistory = EvictingQueue.create(16); } + public void clear() { + ticketHistory.clear(); + } + public int add(SoulTicket ticket, int maximum) { SoulNetworkEvent.Fill event = new SoulNetworkEvent.Fill(this, ticket, maximum); if (MinecraftForge.EVENT_BUS.post(event)) @@ -46,7 +50,11 @@ public class SoulNetwork implements INBTSerializable { int newEss = Math.min(event.getMaximum(), currEss + event.getTicket().getAmount()); setCurrentEssence(newEss); + if (ticketHistory.contains(ticket)) + ticketHistory.remove(ticket); // "Pops" the existing ticket to the top of the queue + ticketHistory.add(ticket); + return newEss - currEss; } @@ -78,6 +86,9 @@ public class SoulNetwork implements INBTSerializable { int syphon = event.getTicket().getAmount(); if (getCurrentEssence() >= syphon) { setCurrentEssence(getCurrentEssence() - syphon); + if (ticketHistory.contains(ticket)) + ticketHistory.remove(ticket); + ticketHistory.add(ticket); return syphon; } @@ -107,7 +118,11 @@ public class SoulNetwork implements INBTSerializable { if (drainAmount <= 0 || event.shouldDamage()) hurtPlayer(user, event.getTicket().getAmount()); + if (ticketHistory.contains(ticket)) + ticketHistory.remove(ticket); + ticketHistory.add(ticket); + return BooleanResult.newResult(true, event.getTicket().getAmount()); } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java index 1f9c4c60..6d209dd5 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java @@ -1,7 +1,12 @@ package WayofTime.bloodmagic.core.data; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.World; public class SoulTicket { @@ -30,4 +35,51 @@ public class SoulTicket { public int getAmount() { return amount; } + + /** + * @return A description in the format block|dimensionID|pos + */ + public static SoulTicket block(World world, BlockPos pos, int amount) { + return new SoulTicket(new TextComponentString("block|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + } + + /** + * @return A description in the format item|item registry name|dimensionID|entityName|entityPos + */ + public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) { + return new SoulTicket(new TextComponentString("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + entity.getPersistentID()), amount); + } + + /** + * @return A description in the format item|item registry name|dimensionID|pos + */ + public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) { + return new SoulTicket(new TextComponentString("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + } + + /** + * @return A description in the format item|item registry name|dimensionID + */ + public static SoulTicket item(ItemStack itemStack, int amount) { + return new SoulTicket(new TextComponentString("item|" + itemStack.getItem().getRegistryName()), amount); + } + + public static SoulTicket command(ICommandSender sender, String command, int amount) { + return new SoulTicket(new TextComponentString("command|" + command + "|" + sender.getName()), amount); + } + + // TODO maybe make it check the amount?? + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o instanceof SoulTicket) + return ((SoulTicket) o).getDescription().equals(description); + + return false; + } + + @Override + public int hashCode() { + return description.hashCode(); + } } diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java index 5912f52d..017df5c1 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.item.ItemSigil; +import WayofTime.bloodmagic.item.sigil.ItemSigil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index c9e1b210..c8516244 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,8 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.*; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.util.helper.NetworkHelper; @@ -83,7 +82,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { if (binding.getOwnerId().equals(player.getGameProfile().getId())) ownerNetwork.setOrbTier(orb.getTier()); - ownerNetwork.add(200, orb.getCapacity()); // Add LP to owner's network + ownerNetwork.add(SoulTicket.item(stack, world, player,200), orb.getCapacity()); // Add LP to owner's network ownerNetwork.hurtPlayer(player, 200); // Hurt whoever is using it return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index f4b092e0..14094b3d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; @@ -100,7 +101,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { } } - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, (int) (charge * charge * charge / 2.7)); + NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.1F, false); dropStacks(drops, world, playerPos.add(0, 1, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 8e7da20c..68b37547 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -2,12 +2,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; +import com.google.common.collect.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -113,7 +112,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { } } - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, (int) (charge * charge * charge / 2.7)); + NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.5F, false); dropStacks(drops, world, playerPos.add(0, 1, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index a1426e9e..3634012d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -2,12 +2,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; +import com.google.common.collect.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -99,7 +98,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { } } - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, (int) (charge * charge * charge / 2.7)); + NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.5F, false); dropStacks(drops, world, playerPos.add(0, 1, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 1c67b320..e9b30300 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.IActivatable; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.Utils; @@ -16,17 +17,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -71,7 +68,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable } if (entity instanceof EntityPlayer && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) - NetworkHelper.getSoulNetwork(binding).syphonAndDamage((EntityPlayer) entity, 20); + NetworkHelper.getSoulNetwork(binding).syphonAndDamage((EntityPlayer) entity, SoulTicket.item(stack, world, entity, 20)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 4c39abdd..bdc791bf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.event.BoundToolEvent; import WayofTime.bloodmagic.iface.IActivatable; @@ -93,7 +94,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } if (entity instanceof EntityPlayer && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) - NetworkHelper.getSoulNetwork(binding).syphonAndDamage((EntityPlayer) entity, 20); + NetworkHelper.getSoulNetwork(binding).syphonAndDamage((EntityPlayer) entity, SoulTicket.item(stack, world, entity, 20)); } protected int getHeldDownCount(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 3e3c07ba..ed4153a0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -14,6 +15,7 @@ import net.minecraft.potion.PotionEffect; import javax.annotation.Nonnull; import javax.annotation.Nullable; +// TODO: Make some hook somewhere that attaches the pos to the ticket otherwise the tickets are basically useless lmao public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvider { public ItemLavaCrystal() { @@ -25,7 +27,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide public ItemStack getContainerItem(ItemStack stack) { Binding binding = getBinding(stack); if (binding != null) - NetworkHelper.getSoulNetwork(binding.getOwnerId()).syphon(25); + NetworkHelper.getSoulNetwork(binding.getOwnerId()).syphon(SoulTicket.item(stack, 25)); ItemStack returnStack = new ItemStack(this); returnStack.setTagCompound(stack.getTagCompound()); @@ -43,7 +45,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide if (binding == null) return -1; - if (NetworkHelper.syphonFromContainer(stack, 25)) + if (NetworkHelper.syphonFromContainer(stack, SoulTicket.item(stack, 25))) return 200; else { EntityPlayer player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index b976cb04..001b3264 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.item.types.ComponentTypes; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; @@ -210,7 +211,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP if (entity.getEntityWorld().isRemote && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; SoulNetwork network = NetworkHelper.getSoulNetwork(player); - network.syphonAndDamage(player, damage * 100); + network.syphonAndDamage(player, SoulTicket.item(stack, entity.getEntityWorld(), entity, damage * 100)); } return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/item/ItemSigil.java rename to src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java index 605c4bdc..70be6e84 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.item; +package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.IBindable; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index a8e50e25..da71b84d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -1,21 +1,19 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -51,7 +49,7 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP if (!world.isRemote) { if (!player.capabilities.isCreativeMode) - this.setUnusable(stack, !NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed())); + this.setUnusable(stack, !NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()); if (!unusable) player.fallDistance = 0; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index c9f5747b..c62a8ca8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.item.ItemSigil; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 42b5f026..8c161786 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -1,19 +1,16 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.*; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -56,7 +53,7 @@ public class ItemSigilBloodLight extends ItemSigilBase if (!world.isRemote) { SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - network.syphonAndDamage(player, getLpUsed()); + network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); } resetCooldown(stack); player.swingArm(hand); @@ -68,7 +65,7 @@ public class ItemSigilBloodLight extends ItemSigilBase { SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); world.spawnEntity(new EntityBloodLight(world, player)); - network.syphonAndDamage(player, getLpUsed()); + network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); } resetCooldown(stack); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index a9a4b26f..a25a5122 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -3,15 +3,13 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.util.ChatUtil; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 02a8a4d7..8f479995 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -1,6 +1,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.core.data.SoulTicket; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; @@ -24,7 +26,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase { if (PlayerHelper.isFakePlayer(player)) return false; - if (applyBonemeal(world, blockPos, player, stack)) { + if (NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && applyBonemeal(world, blockPos, player, stack)) { if (!world.isRemote) { world.playEvent(2005, blockPos, 0); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index b02e3f3c..6b044a6d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; @@ -8,10 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -59,7 +57,7 @@ public class ItemSigilLava extends ItemSigilBase { return super.onItemRightClick(world, player, hand); } - if (this.canPlaceLava(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceLava(world, blockpos1)) { + if (canPlaceLava(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && tryPlaceLava(world, blockpos1)) { return super.onItemRightClick(world, player, hand); } } @@ -85,7 +83,7 @@ public class ItemSigilLava extends ItemSigilBase { FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); int amount = handler.fill(fluid, false); - if (amount > 0 && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed())) { + if (amount > 0 && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { handler.fill(fluid, true); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 4b2d2180..16783af4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -47,5 +47,4 @@ public class ItemSigilSuppression extends ItemSigilToggleableBase { } } } - } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java rename to src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java index 9b9bbe27..4a354186 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java @@ -1,6 +1,7 @@ -package WayofTime.bloodmagic.item; +package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.IActivatable; import WayofTime.bloodmagic.iface.ISigil; @@ -53,7 +54,7 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { if (!world.isRemote && !isUnusable(stack)) { if (player.isSneaking()) setActivatedState(stack, !getActivated(stack)); - if (getActivated(stack) && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())) + if (getActivated(stack)) return super.onItemRightClick(world, player, hand); } @@ -70,7 +71,7 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { if (binding == null || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while toggling state return EnumActionResult.PASS; - return (NetworkHelper.getSoulNetwork(binding).syphonAndDamage(player, getLpUsed()) && onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ)) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } public boolean onSigilUse(ItemStack itemStack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) { @@ -81,7 +82,7 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) { if (entityIn.ticksExisted % 100 == 0) { - if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((EntityPlayer) entityIn, getLpUsed())) { + if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((EntityPlayer) entityIn, SoulTicket.item(stack, worldIn, entityIn, getLpUsed())).isSuccess()) { setActivatedState(stack, false); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 6aa74856..08fb9dff 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.item.ItemSigilToggleable; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index 6e3b00f4..4cba37ed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; @@ -12,9 +13,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -89,7 +88,7 @@ public class ItemSigilTransposition extends ItemSigilBase { } stack.getTagCompound().setTag("stored", stored); - NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, cost); + NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, cost)); world.removeTileEntity(blockPos); world.setBlockToAir(blockPos); return EnumActionResult.SUCCESS; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index a2e20146..93796d8d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,16 +1,14 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -56,7 +54,7 @@ public class ItemSigilVoid extends ItemSigilBase { return super.onItemRightClick(world, player, hand); } - if (world.getBlockState(blockpos).getBlock().getMaterial(world.getBlockState(blockpos)).isLiquid() && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())) { + if (world.getBlockState(blockpos).getBlock().getMaterial(world.getBlockState(blockpos)).isLiquid() && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { world.setBlockToAir(blockpos); return super.onItemRightClick(world, player, hand); } @@ -66,7 +64,7 @@ public class ItemSigilVoid extends ItemSigilBase { } if (!player.capabilities.isCreativeMode) - this.setUnusable(stack, !NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())); + setUnusable(stack, !NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()); } return super.onItemRightClick(world, player, hand); @@ -92,7 +90,7 @@ public class ItemSigilVoid extends ItemSigilBase { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); FluidStack amount = handler.drain(1000, false); - if (amount != null && amount.amount > 0 && network.syphonAndDamage(player, getLpUsed())) { + if (amount != null && amount.amount > 0 && network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { handler.drain(1000, true); return EnumActionResult.SUCCESS; } @@ -106,7 +104,7 @@ public class ItemSigilVoid extends ItemSigilBase { return EnumActionResult.FAIL; } - if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && network.syphonAndDamage(player, getLpUsed())) { + if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { world.setBlockToAir(newPos); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 396c2aa5..5737fd32 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; @@ -54,7 +55,7 @@ public class ItemSigilWater extends ItemSigilBase { if (!player.canPlayerEdit(blockpos1, rayTrace.sideHit, stack)) return super.onItemRightClick(world, player, hand); - if (this.canPlaceWater(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, getLpUsed()) && this.tryPlaceWater(world, blockpos1)) + if (canPlaceWater(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && tryPlaceWater(world, blockpos1)) return super.onItemRightClick(world, player, hand); } } @@ -78,7 +79,7 @@ public class ItemSigilWater extends ItemSigilBase { FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000); int amount = handler.fill(fluid, false); - if (amount > 0 && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())) { + if (amount > 0 && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { handler.fill(fluid, true); return EnumActionResult.SUCCESS; } @@ -86,7 +87,7 @@ public class ItemSigilWater extends ItemSigilBase { return EnumActionResult.FAIL; } - if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, getLpUsed())) { + if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(BlockCauldron.LEVEL, 3)); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index f6743a12..eb61019c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -56,4 +57,8 @@ public interface IMasterRitualStone { boolean setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2); List getActiveWillConfig(); + + default SoulTicket ticket(int amount) { + return SoulTicket.block(getWorldObj(), getBlockPos(), amount); + } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index 5e24db13..79902bc7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,12 +1,11 @@ package WayofTime.bloodmagic.ritual.portal; -import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; +import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.teleport.Teleport; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; @@ -15,6 +14,7 @@ import net.minecraft.network.play.server.SPacketUpdateHealth; import net.minecraft.server.MinecraftServer; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; @@ -49,10 +49,10 @@ public class Teleports { if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z)))) return; - network.syphon(getTeleportCost()); - EntityPlayerMP player = (EntityPlayerMP) entity; + network.syphon(ticket(entity.world, player, getTeleportCost())); + player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.getEntityWorld().updateEntityWithOptionalForce(player, false); player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); @@ -70,10 +70,10 @@ public class Teleports { if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z)))) return; - network.syphon(getTeleportCost() / 10); - WorldServer world = (WorldServer) entity.getEntityWorld(); + network.syphon(ticket(world, entity, getTeleportCost() / 10)); + entity.setPosition(x + 0.5, y + 0.5, z + 0.5); entity.timeUntilPortal = 150; world.resetUpdateEntityTick(); @@ -128,7 +128,7 @@ public class Teleports { if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, new BlockPos(x, y, z)))) return; - network.syphon(getTeleportCost()); + network.syphon(ticket(oldWorld, player, getTeleportCost())); player.changeDimension(newWorldID); //TODO: UNTESTED // server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer)); @@ -148,7 +148,7 @@ public class Teleports { if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, new BlockPos(x, y, z)))) return; - network.syphon(getTeleportCost() / 10); + network.syphon(ticket(oldWorld, entity, getTeleportCost() / 10)); NBTTagCompound tag = new NBTTagCompound(); @@ -193,4 +193,8 @@ public class Teleports { return teleposer; } } + + public static SoulTicket ticket(World world, Entity entity, int amount) { + return new SoulTicket(new TextComponentString("teleport|" + world.provider.getDimension() + "|" + entity.getName() + "|" + entity.getPosition().toLong()), amount); + } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 4c7783b4..1cf2f0ce 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -58,7 +58,7 @@ public class RitualAltarBuilder extends Ritual { if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) { world.setBlockState(altarPos, RegistrarBloodMagicBlocks.ALTAR.getDefaultState()); lightning(world, altarPos); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); } if (altarComponentsIterator.hasNext()) { @@ -72,7 +72,7 @@ public class RitualAltarBuilder extends Ritual { if (blockStack != null) { world.setBlockState(currentPos, blockStack.getState(), 3); lightning(world, currentPos); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); } break; } @@ -81,7 +81,7 @@ public class RitualAltarBuilder extends Ritual { if (blockStack != null) { world.setBlockState(currentPos, blockStack.getState(), 3); lightning(world, currentPos); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); } break; } @@ -90,7 +90,7 @@ public class RitualAltarBuilder extends Ritual { if (hasItem(tileEntity, Item.getItemFromBlock(blockStack.getBlock()), blockStack.getMeta(), true)) { world.setBlockState(currentPos, blockStack.getState(), 3); lightning(world, currentPos); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); } break; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index 260447b2..401398cc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -161,7 +161,7 @@ public class RitualAnimalGrowth extends Ritual { WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveDrain, true); } - masterRitualStone.getOwnerNetwork().syphon(totalGrowths * getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalGrowths * getRefreshCost())); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index ab8516e2..f9d0d6e9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -75,7 +75,7 @@ public class RitualCobblestone extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 1ad10719..8f1a5855 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -153,7 +153,7 @@ public class RitualCrushing extends Ritual { WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, willDrain, true); corrosiveWill -= willDrain; - masterRitualStone.getOwnerNetwork().syphon(lpDrain); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); currentEssence -= lpDrain; isBlockClaimed = true; @@ -211,7 +211,7 @@ public class RitualCrushing extends Ritual { } world.destroyBlock(newPos, false); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); hasOperated = true; if (consumeRawWill) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java index 5f5e9be2..a28c8433 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java @@ -54,7 +54,7 @@ public class RitualCrystalHarvest extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index 74bbdaa8..636e5806 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.ritual.types; -import java.util.function.Consumer; - +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -14,7 +13,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import WayofTime.bloodmagic.BloodMagic; + +import java.util.function.Consumer; @RitualRegister("ellipsoid") public class RitualEllipsoid extends Ritual @@ -133,7 +133,7 @@ public class RitualEllipsoid extends Ritual itemHandler.extractItem(blockSlot, 1, false); tileInventory.markDirty(); //TODO: - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); k++; this.currentPos = new BlockPos(i, j, k); return; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java index 393645d2..1294ea4f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java @@ -75,7 +75,7 @@ public class RitualExpulsion extends Ritual { continue; if (teleportRandomly(player, teleportDistance)) - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * 1000); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * 1000)); } whitelist.clear(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index ddddf20b..eae72593 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -169,7 +169,7 @@ public class RitualFeatheredKnife extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); if (totalEffects > 0 && consumeRawWill) { WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWillDrain, true); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java index 749ff388..6e1f01e1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java @@ -67,7 +67,7 @@ public class RitualFelling extends Ritual { } if (blockPosIterator.hasNext() && tileInventory != null) { - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); currentPos = blockPosIterator.next(); IItemHandler inventory = Utils.getInventory(tileInventory, EnumFacing.DOWN); placeInInventory(world.getBlockState(currentPos), world, currentPos, inventory); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index c56ff474..0e3207bc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -141,7 +141,7 @@ public class RitualForsakenSoul extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } /** diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java index 0b4153a6..b803b810 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java @@ -80,7 +80,7 @@ public class RitualFullStomach extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index ccbfca81..d8cdf397 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -194,7 +194,7 @@ public class RitualGreenGrove extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(totalGrowths * getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalGrowths * getRefreshCost())); } public double getPlantGrowthChanceForWill(double will) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index b04ba5b2..fed3bb5b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -62,7 +62,7 @@ public class RitualHarvest extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * harvested); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * harvested)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index 78c89219..975f84d7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -56,7 +56,7 @@ public class RitualJumping extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index ae953425..e7e064a8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -215,7 +215,7 @@ public class RitualLava extends Ritual { WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrained, true); } - masterRitualStone.getOwnerNetwork().syphon(lpDrain); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index d5047838..cbd5cd20 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -72,7 +72,7 @@ public class RitualMagnetic extends Ritual { ItemStack checkStack = state.getBlock().getPickBlock(state, null, world, newPos, null); if (isBlockOre(checkStack)) { Utils.swapLocations(world, newPos, world, replacement); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); k++; this.lastPos = new BlockPos(i, j, k); return; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 0abb6a48..b9dbc916 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -61,7 +61,7 @@ public class RitualMeteor extends Ritual { entityItem.setDead(); if (destructiveWill >= destructiveWillDrain && currentEssence >= 1000000000) { - masterRitualStone.getOwnerNetwork().syphon(1000000); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(1000000)); } else { masterRitualStone.setActive(false); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java index c421f794..90469c94 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java @@ -67,7 +67,7 @@ public class RitualPlacer extends Ritual { world.setBlockState(blockPos, placeState); itemHandler.extractItem(invSlot, 1, false); tileEntity.markDirty(); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); break posLoop; // Break instead of return in case we add things later } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index e7d6b74c..2fb5001a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -77,7 +77,7 @@ public class RitualPump extends Ritual { blockPosIterator = liquidsCache.iterator(); if (blockPosIterator.hasNext()) { Pair posInfo = blockPosIterator.next(); - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); fluidHandler.fill(posInfo.getRight(), true); world.setBlockState(posInfo.getLeft(), Blocks.STONE.getDefaultState()); world.notifyBlockUpdate(posInfo.getLeft(), tankState, tankState, 3); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index e851b8ad..1f431459 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -140,7 +140,7 @@ public class RitualRegeneration extends Ritual { WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrain, true); } - masterRitualStone.getOwnerNetwork().syphon(totalCost); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalCost)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java index c63b3b6d..c4f7d6b1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java @@ -44,7 +44,7 @@ public class RitualWater extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index a1c96a08..8e20ebf6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -105,7 +105,7 @@ public class RitualWellOfSuffering extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(getRefreshCost() * totalEffects); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java index 780e5061..9935e162 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java @@ -67,7 +67,7 @@ public class RitualZephyr extends Ritual { } } - masterRitualStone.getOwnerNetwork().syphon(this.getRefreshCost() * Math.min(count, 100)); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * Math.min(count, 100))); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 4871b0b5..b023c5c0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,8 +1,17 @@ package WayofTime.bloodmagic.tile; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; +import WayofTime.bloodmagic.core.data.*; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -15,22 +24,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; - import org.apache.commons.lang3.ArrayUtils; -import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NetworkHelper; +import java.util.ArrayList; +import java.util.List; public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable { @@ -446,7 +443,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, { if (orbStack.getItem() instanceof IBloodOrb) { - if (NetworkHelper.syphonFromContainer(orbStack, requested)) + if (NetworkHelper.syphonFromContainer(orbStack, SoulTicket.item(orbStack, world, pos, requested))) { return requested; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index 27b4e876..e10d556e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -4,13 +4,12 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.tile.base.TileBase; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -21,7 +20,7 @@ public class TileImperfectRitualStone extends TileBase implements IImperfectRitu public boolean performRitual(World world, BlockPos pos, @Nullable ImperfectRitual imperfectRitual, EntityPlayer player) { if (imperfectRitual != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(imperfectRitual), true)) { if (!PlayerHelper.isFakePlayer(player) && !world.isRemote) { - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, new SoulTicket(new TextComponentTranslation(imperfectRitual.getUnlocalizedName()), imperfectRitual.getActivationCost())); + NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.block(getWorld(), getPos(), imperfectRitual.getActivationCost())); if (imperfectRitual.onActivate(this, player)) { if (imperfectRitual.isLightShow()) getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 68f01766..510e8932 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -147,7 +147,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (ritual.activateRitual(this, activator, binding.getOwnerId())) { if (!isRedstoned() && (activator != null && !activator.capabilities.isCreativeMode)) - network.syphon(ritual.getActivationCost()); + network.syphon(ticket(ritual.getActivationCost())); if (activator != null) activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.activate"), true); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 9a4e955e..6c1c09b5 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.teleport.TeleportQueue; @@ -75,7 +76,7 @@ public class TileTeleposer extends TileInventory implements ITickable { final int focusLevel = (getStackInSlot(0).getItemDamage() + 1); final int lpToBeDrained = (int) (0.5F * Math.sqrt((pos.getX() - focusPos.getX()) * (pos.getX() - focusPos.getX()) + (pos.getY() - focusPos.getY() + 1) * (pos.getY() - focusPos.getY() + 1) + (pos.getZ() - focusPos.getZ()) * (pos.getZ() - focusPos.getZ()))); - if (NetworkHelper.getSoulNetwork(binding).syphonAndDamage(PlayerHelper.getPlayerFromUUID(binding.getOwnerId()), lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1))) { + if (NetworkHelper.getSoulNetwork(binding).syphonAndDamage(PlayerHelper.getPlayerFromUUID(binding.getOwnerId()), SoulTicket.block(world, pos, lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1))).isSuccess()) { int blocksTransported = 0; for (int i = -(focusLevel - 1); i <= (focusLevel - 1); i++) { @@ -89,7 +90,7 @@ public class TileTeleposer extends TileInventory implements ITickable { } } - NetworkHelper.syphonFromContainer(focusStack, lpToBeDrained * blocksTransported); + NetworkHelper.syphonFromContainer(focusStack, SoulTicket.item(focusStack, world, pos, lpToBeDrained * blocksTransported)); List originalWorldEntities; List focusWorldEntities; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index dbd07fc5..bd79a435 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -98,7 +98,7 @@ public class NetworkHelper { * @param user - User of the item. * @param toSyphon - Amount of LP to syphon * @return - Whether the action should be performed. - * @deprecated Use {@link #getSoulNetwork(EntityPlayer)} and {@link SoulNetwork#syphonAndDamage(EntityPlayer, SoulTicket)} + * @deprecated Use {@link #getSoulNetwork(EntityPlayer)} and {@link SoulNetwork#syphonAndDamage$(EntityPlayer, SoulTicket)} */ @Deprecated public static boolean syphonAndDamage(SoulNetwork soulNetwork, EntityPlayer user, int toSyphon) { @@ -116,10 +116,10 @@ public class NetworkHelper { * Syphons a player from within a container. * * @param stack - ItemStack in the Container. - * @param toSyphon - Amount of LP to syphon + * @param ticket - SoulTicket to syphon * @return - If the syphon was successful. */ - public static boolean syphonFromContainer(ItemStack stack, int toSyphon) + public static boolean syphonFromContainer(ItemStack stack, SoulTicket ticket) { if (!(stack.getItem() instanceof IBindable)) return false; @@ -129,9 +129,9 @@ public class NetworkHelper { return false; SoulNetwork network = getSoulNetwork(binding); - SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, new SoulTicket(toSyphon), stack); + SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, ticket, stack); - return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(), true) >= toSyphon; + return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(),true) >= ticket.getAmount(); } /** From d30dcf1ae5d05f06cd007aeb6bf33cd7ffe89c44 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 00:48:01 +0200 Subject: [PATCH 219/493] Sentient Sword to not attack players unless provoked/auto attack mobs (#1381) * Should close #1121 Not tested (yet) (because I haven't figured out how to launch the server with a fake player entity... yet). * will close #1121 Tested. Specters only attack players if they attack the owner or the specter. Spectres now autoattack every instance of EntityMob in range. //TODO: (fluff) make Bow Specter change angle based on target position (it currently always looks like it shoots into the ground) --- .../bloodmagic/entity/mob/EntitySentientSpecter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 1b13122c..c69b1e76 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -19,6 +19,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.*; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityGhast; +import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityTippedArrow; import net.minecraft.init.Enchantments; @@ -67,7 +68,7 @@ public class EntitySentientSpecter extends EntityDemonBase { this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this)); this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this)); - this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); + this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityMob.class, true)); this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false)); @@ -384,10 +385,9 @@ public class EntitySentientSpecter extends EntityDemonBase { @Override public boolean shouldAttackEntity(EntityLivingBase attacker, EntityLivingBase owner) { if (!(attacker instanceof EntityCreeper) && !(attacker instanceof EntityGhast)) { - return super.shouldAttackEntity(attacker, owner); - } else { + return super.shouldAttackEntity(attacker, owner); + } return false; - } } @Override From daa52f4d3d176963b7d780691310246e1575a7f6 Mon Sep 17 00:00:00 2001 From: "Urey. Xue" Date: Wed, 8 Aug 2018 06:52:11 +0800 Subject: [PATCH 220/493] Corrections of manual translation (#1386) * Update zh_CN.lang of blood magic guide * Clarification * Clarification on Laputa Shard * "Messagner" -> "Child" * More fix * Correct some misintepretations --- src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang index 5cb7ba38..37b61615 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang @@ -191,7 +191,7 @@ guide.bloodmagic.entry.architect.mimic.info.1=æ‹Ÿæ€æ˜¯ä¸€ç§å¯ä»¥æ¨¡ä»¿ä»»æ„ guide.bloodmagic.entry.architect.downgrade.info=就护甲é™çº§çš„内容，我建议你阅读《仪å¼å¤§å¸ˆã€‹å·çš„“沉é‡çµé­‚çš„å¿æ‚”â€ä¸€ç« ï¼Œåœ¨é‚£é‡Œä½ å¯ä»¥å¾—到更详细的解释。 guide.bloodmagic.entry.architect.augmentedCapacity.info=和增容符文类似，超容符文也å¯ä»¥æå‡ç¥­å›çš„容é‡ã€‚但和增容符文ä¸åŒï¼Œå¤šå—超容符文会之间的共鸣会让容积呈指数级增长。具体æ¥è¯´ï¼Œæ˜¯åšä¹˜æ³•ï¼šæ¯ä¸€å—超容符文都会给予é¢å¤–10%%的容积；æ¢è¨€ä¹‹ï¼Œä¸¤å—å³21%%的增长，三å—å³33.1%%的增长，以此类推。\n\t然而，超容符文的效果ä¸ä¸Žå¢žå®¹ç¬¦æ–‡å åŠ ï¼Œæ¢è¨€ä¹‹ï¼Œä¸è®ºæœ‰å¤šå°‘超容符文，æ¯å—增容符文都åªæ供两åƒLP容é‡ã€‚ -guide.bloodmagic.entry.architect.charging.info=有那么一些东西对于åˆæˆå¾ˆæœ‰å¸®åŠ©ï¼Œè€Œè¿™å……能符文便是其中之一：它å¯ä»¥å¸æ”¶ LP，并将 其转化为“充能点数â€ï¼Œå…·ä½“æ•°é‡å¯ç”¨è§è§£å°è®°çœ‹åˆ°ã€‚若是åˆæˆæŸäº›ç‰©å“正好需è¦ä¸€å®šé‡çš„充能点数，那么这充能符文就å¯ä»¥ä»¥æ¶ˆè€—充能点数为代价，将物å“立刻åˆæˆå‡ºæ¥ã€‚若没有足够的充能点数，它就åªä¼šæŒ‰ä¸€æ¯”一的比例直接将充能点数转化为 LP 以加速 å…¶åˆæˆã€‚\n\t/cut血之祭å›æœ€å¤šå¯å­˜å‚¨çš„充能点数数é‡æ˜¯å……能符文的数é‡ä¹˜ä»¥ç¥­å›çš„容积，其中容积需è¦è‡³å°‘为两万æ‰æœ‰æ•ˆæžœã€‚血之祭å›å……能的速度也是和充能符文数é‡ä»¥åŠå…¶æœ¬èº«çš„速度æˆæ­£æ¯”的（å³ï¼Œå……能速度=符文数é‡*祭å›æœ¬èº«åˆæˆé€Ÿåº¦ï¼‰ï¼Œæ¯ä¸€ç§’å®ƒéƒ½ä¼šå°†ä¸€å®šé‡ LP 转化为充能点数。所以，如果你的祭å›ä¸­æœ‰è¿™å—符文，åˆç†çš„设计将会使你事åŠåŠŸå€ã€‚ +guide.bloodmagic.entry.architect.charging.info=有那么一些东西对于åˆæˆå¾ˆæœ‰å¸®åŠ©ï¼Œè€Œè¿™å……能符文便是其中之一：它å¯ä»¥å¸æ”¶ LP，并将 其转化为“充能点数â€ï¼Œå…·ä½“æ•°é‡å¯ç”¨è§è§£å°è®°çœ‹åˆ°ã€‚若是åˆæˆæŸäº›ç‰©å“正好需è¦ä¸€å®šé‡çš„充能点数，那么这充能符文就å¯ä»¥ä»¥æ¶ˆè€—充能点数为代价，将物å“立刻åˆæˆå‡ºæ¥ã€‚若没有足够的充能点数，它就åªä¼šæŒ‰ä¸€æ¯”一的比例直接将充能点数转化为 LP 以加速 å…¶åˆæˆã€‚\n\t/cut血之祭å›æœ€å¤šå¯å­˜å‚¨çš„充能点数数é‡æ˜¯ç¥­å›å®¹ç§¯çš„函数，åŒæ—¶ä¹Ÿå……能符文的数é‡æˆæ­£æ¯”；其中容积需è¦è‡³å°‘为两万æ‰æœ‰æ•ˆæžœã€‚血之祭å›å……能的速度也是和充能符文数é‡ä»¥åŠå…¶æœ¬èº«çš„速度æˆæ­£æ¯”的（å³ï¼Œå……能速度=符文数é‡*祭å›æœ¬èº«åˆæˆé€Ÿåº¦ï¼‰ï¼Œæ¯ä¸€ç§’å®ƒéƒ½ä¼šå°†ä¸€å®šé‡ LP 转化为充能点数。所以，如果你的祭å›ä¸­æœ‰è¿™å—符文，åˆç†çš„设计将会使你事åŠåŠŸå€ã€‚ guide.bloodmagic.entry.architect.acceleration.info=和大多数符文ä¸åŒï¼Œä¿ƒè¿›ç¬¦æ–‡éœ€è¦å’Œåˆ«çš„符文æ­é…使用，而且它的效果ä¸æ˜¯æ— é™åˆ¶å¢žé•¿çš„。这个符文的效果是，它å¯ä»¥è®©æŸäº›ç¬¦æ–‡çš„工作频率å˜é«˜ï¼Œæ¯”如说，转ä½ç¬¦æ–‡å’Œå……能符文。具体æ¥è¯´ï¼Œæ¯æœ‰ä¸€ä¸ªè¿™ä¸ªç¬¦æ–‡ï¼Œè·ç¦»ä¸‹ä¸€æ¬¡å·¥ä½œçš„等待时间就å‡ä¸€åˆ»ã€‚æ¢è¨€ä¹‹ï¼šå¦‚果有10å—促进符文，转ä½ç¬¦æ–‡ä¼šæ¯10刻就转移一次液体，而默认值å´æ˜¯æ¯20刻。\n\t显然，你的祭å›ä¸­åªå¯èƒ½æœ‰19/cutå—促进符文——在这ç§æƒ…况下，转ä½ç¬¦æ–‡å’Œå……能符文就会一刻ä¸åœåœ°å·¥ä½œã€‚éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸å¥½ï¼ guide.bloodmagic.entry.architect.tier3.info=众所周知，三级祭å›çš„结构中，四角的柱å­é¡¶éƒ¨éœ€è¦å››å—æ¥è‡ªä¸‹ç•Œçš„è§çŸ³ã€‚但有一个鲜为人知的事实：这四å—è§çŸ³å¯ä»¥ç”¨æµ·æ™¶ç¯ä»£æ›¿ã€‚如果地狱对你æ¥è¯´å¤ªè¿‡é¥è¿œï¼Œä½†ä½ å·²ç»æ‰¾åˆ°äº†æµ·æ´‹ç¥žæ®¿ï¼Œä½ å¯ä»¥é€šè¿‡è¿™ä¸ªæ–¹å¼æ¥æŽ¨è¿›ä½ çš„血魔法进程。 @@ -233,7 +233,7 @@ guide.bloodmagic.entry.demon.routing.info=血魔法的物å“ä¼ é€æ˜¯ä»¥æ¶é­” guide.bloodmagic.entry.demon.aura.info=生物被æ€æ­»åŽï¼Œå…¶çµé­‚会日æ¸æ¶ˆé€€ï¼Œæœ€ç»ˆå›žå½’创世之神。使用投网，å¯ä»¥å°†å…¶æŸç¼šäºŽçŽ°ä¸–，但也有一些难度。我们现在，出于ç§ç§ç†ç”±ï¼Œå¯¹è¿™äº›æ„志加以干扰并冻结其一切活性。若我们燃烧æ„志，它就会回归虚无。但若是我们直接将æ„志释放到空气中，我们便å¯ä»¥ä»¥æ›´çµæ´»çš„æ–¹å¼é©¾é©­è¿™è‚¡åŠ›é‡ã€‚有些方å¼å分普通，而有些方å¼åˆ™æ˜¾å¾—å分强大。\n\t在将æ¶é­”æ„志释放到空气中/cutåŽï¼Œå®ƒä¼šä¸€ç›´å¾…在释放出æ¥çš„那片土地上（å³ï¼Œé‚£ä¸ªåŒºå—），ä¸ä¼šè½»æ˜“离开。æ¯ä¸€ç‰‡åœŸåœ°ä¸Šçš„ä¸åŒç§ç±»çš„æ„志（关于æ„å¿—çš„ç§ç±»ï¼ŒåŽæ–‡æœ‰è¯¦è¿°ï¼‰äº’ä¸å½±å“。这些æ„志的存在还å¯ä»¥ç”¨å…¶ä»–çš„æ–¹å—和物å“æ¥è°ƒæ•´ã€‚ guide.bloodmagic.entry.demon.types.info=到目å‰ä¸ºæ­¢ï¼Œæ¯å½“我们讨论æ¶é­”æ„志时，都是讨论的原生æ„志。这也就æ„味ç€è¿™æ˜¯å¤©ç„¶çš„æ„志，但这并ä¸ç­‰äºŽå®ƒæ˜¯çº¯çš„。事实上，æ¶é­”æ„志有若干类型；除开原生æ„志，还有è…蚀ã€ç ´åã€å¤ä»‡ä»¥åŠåšæ¯…å››ç§æ„志。原生æ„志实质是这四ç§æ„å¿—çš„æ··åˆç‰©ï¼Œä¹Ÿè®¸è¿˜æœ‰ä¸€äº›è‡³ä»Šæ²¡æœ‰è¯†åˆ«çš„æ„志，但有一点å¯ä»¥ç¡®å®šï¼Œå³åˆ†ç¦»åŽçš„æ„志很难å†èžåˆä¸ºä¸€ä½“。\n\tå››ç§ä¸åŒçš„æ„志的真正æ¥æº/cut至今ä»ç„¶ä¸æ˜Žï¼Œä½†æˆ‘们已ç»æŽŒæ¡äº†äº§ç”Ÿè¿™å››ç§æ„志的方法。将æ„志释放到空气中åŽï¼Œç›¸åŒç§ç±»çš„æ„志就会开始èšé›†åœ¨ä¸€èµ·ã€‚æ®æ­¤ï¼Œåªéœ€è¦æœ‰ä¸€ç§å¯ä»¥æ”¶é›†ç‰¹å®šç§ç±»æ„志的设备就å¯ä»¥å®Œæˆä»»åŠ¡äº†ã€‚接下æ¥çš„几个章节中将会讲述其中一ç§è®¾å¤‡â€”—æ¶é­”结晶å›ã€‚\n\tå››ç§æ„志代表了人的四ç§æ¬²æœ›ã€‚当然我们ä»ç„¶å¯ä»¥å‡å®šå­˜åœ¨æ›´å¤šç§æ„志，但也许它们/cut的纯度还ä¸å¤Ÿï¼Œä¹Ÿè®¸æ ¹æœ¬ä¸èƒ½å­˜åœ¨ï¼Œæ€»è€Œè¨€ä¹‹æˆ‘们目å‰è¿˜æ²¡å‘现新的æ„å¿—ç§ç±»ã€‚\n\tè…蚀——代表了通过å„ç§æ–¹å¼â€”—酸液ã€è›®åŠ›ã€ç­‰ç­‰â€”—破å万物的欲望。掌æ¡äº†è¿™ç§åŠ›é‡çš„人，将能自由地驱使å„ç§ç–¾ç—…（æ¢è¨€ä¹‹ï¼Œå„ç§è´Ÿé¢æ•ˆæžœï¼‰çš„力é‡ï¼Œå¹¶ä»¤è‡ªèº«å…å—剧毒的侵蚀。\n\tæ¶æ„——å¯çœ‹ä½œæ˜¯â€”—一ç§å­œå­œä¸å€¦å¯»æ‰¾å¯¹æ‰‹çš„欲望。通常，驾/cuté©­æ¶æ„能é‡çš„人，åªè¦é”定了目标，移动速度就会上å‡ï¼Œä½¿å¾—å¯æ€œçš„猎物无处躲è—，åªå¾—å以待毙。\n\tç ´å——你或许已ç»çŒœåˆ°äº†â€”—其实就是纯粹的力é‡ã€‚正确地使用这ç§åŠ›é‡å¯ä»¥ä»¤ä½¿ç”¨è€…的身体素质在短时间内获得快速æå‡ï¼›åŒæ—¶è¿˜å¯ä»¥ç”¨æ¥ç²‰ç¢Žæˆ–碾磨其他物å“。\n\tåšæ¯…——无数的观察表明——这是抵御攻击，使自身å…é­ä¼¤å®³çš„/cut欲望。大多数情况下，æ“纵这ç§æ¬²æœ›çš„人，都是团队中的铜墙é“å£â€”—任何攻击都ä¸ä¼šä¼¤ä»–分毫。如果你想藉由你的护甲或仪å¼æ¥ä¿éšœä½ çš„存活概率，这股力é‡ç»å¯¹æ˜¯ä½ çš„第一选择。 guide.bloodmagic.entry.demon.crucible.info=æ¶é­”å©åŸšå¯å°†åœ°ç‹±é­‚石中的æ¶é­”æ„志散布到当地（å³å½“å‰åŒºå—）的大气之中。这å£å©åŸšæœ‰è‹¥å¹²ç”¨é€”：最简å•çš„一个就是直接将地狱魂石放入其中（å³å‡»æ”¾å…¥ï¼‰ã€‚å©åŸšä¼šè‡ªåŠ¨ä»Žé­‚石中抽å–æ¶é­”æ„志并散布到空气中，直到饱和（æ¯ç§æ„志大约都会在达到100点时饱和）或者魂石本身被抽干了。\n\t此外，它还å¯ä»¥æŠ½å–空气中的æ¶é­”æ„志并çŒè¾“进魂石中。æ“作方å¼å’Œæ•£å¸ƒæ¶é­”æ„å¿—æ— /cut异，åªæ˜¯å©åŸšéœ€è¦ä¸€ä¸ªå¼ºçš„红石信å·ï¼ˆå³å¼ºå……能）。\n\t最åŽï¼Œç›´æŽ¥å¾€é‡Œé¢æŠ•å…¥ä¸€å—æ¶é­”æ„志也是å¯ä»¥çš„，ä¸è®ºä»€ä¹ˆå½¢å¼ï¼Œåªè¦æœ‰å®¹çº³æ„志的空间就å¯ä»¥è¿›è¡Œè½¬åŒ–。举个例å­ï¼Œå°†æ™¶åŒ–æ¶é­”æ„志投入å©åŸšå¯äº§ç”Ÿ50点æ„志。 -guide.bloodmagic.entry.demon.crystallizer.info=正如之å‰æ‰€æ到的那样，æ¶é­”çµæ°”——通常我们会简å•ä»¥â€œå¤§æ°”â€æŒ‡ä»£ä¹‹â€”—是æ¶é­”æ„志的空çµçš„存在形å¼ï¼Œè€Œå‡»æ€æ€ªç‰©èŽ·å¾—的物质则是æ¶é­”æ„志物ç†å½¢å¼çš„具现。而这æ¶é­”结晶å›ï¼Œåˆ™åƒæ˜¯ä¸€ä¸ªé”šç‚¹ï¼Œè®©æ¼‚浮在大气中的æ¶é­”æ„志以晶体的形æ€é‡çŽ°ã€‚\n\t你也许会问，为什么ä¸ç›´æŽ¥ç”¨åœ°ç‹±é­‚石培养一å—晶体呢？这是因为在我们将æ¶é­”æ„志释放到空气中时，它身上的ç¦é”¢/cut就已ç»è¢«è§£é™¤äº†â€”—记ä½ï¼Œå½“我们æ€æ­»ä¸€ä¸ªæ€ªç‰©æ—¶ï¼Œå®ƒèº«ä¸Šçš„æ„志也就éšä¹‹è¢«æˆ‘们ç¦é”¢äº†ã€‚å†æ¬¡é‡Šæ”¾è‡ªç„¶ä¼šä»¤å…¶é‡æ–°æ¢å¤æ´»åŠ›ï¼Œè€Œè¿™ç»“晶å›å°±æ˜¯ç›´æŽ¥å¸æ”¶è¿™æ´»çš„æ¶é­”æ„志。ä¸è¦å¤ªæƒ³å½“然啦。\n\t结晶过程需è¦æ¯”较高的æ¶é­”çµæ°”的浓度（大概是80点），并且需è¦ä¸€æ®µæ—¶é—´ã€‚在这之åŽï¼Œç»“晶å›çš„上方便会长出åªæœ‰ä¸€æ ¹å°–çš„æ¶é­”晶簇。结晶å›æœ‰ä¸¤ç§å·¥ä½œæ–¹å¼ï¼šå®ƒæ—¢å¯ä»¥å¸æ”¶/cut特定的一ç§æ„志然åŽäº§ç”Ÿå¯¹åº”的晶体；也å¯ä»¥ç›´æŽ¥å¸æ”¶åŽŸç”Ÿæ„å¿—æ¥äº§ç”Ÿæ™¶ä½“。\n\t这其中的区别在于，使用原生æ„志时，有大约40%%概率会获得任æ„一ç§ç‰¹å®šç±»åž‹çš„晶体。而这将是你获得特定类型的æ„志的第一步。 +guide.bloodmagic.entry.demon.crystallizer.info=正如之å‰æ‰€æ到的那样，æ¶é­”çµæ°”——通常我们会简å•ä»¥â€œå¤§æ°”â€æŒ‡ä»£ä¹‹â€”—是æ¶é­”æ„志的空çµçš„存在形å¼ï¼Œè€Œå‡»æ€æ€ªç‰©èŽ·å¾—的物质则是æ¶é­”æ„志物ç†å½¢å¼çš„具现。而这æ¶é­”结晶å›ï¼Œåˆ™åƒæ˜¯ä¸€ä¸ªé”šç‚¹ï¼Œè®©æ¼‚浮在大气中的æ¶é­”æ„志以晶体的形æ€é‡çŽ°ã€‚\n\t你也许会问，为什么ä¸ç›´æŽ¥ç”¨åœ°ç‹±é­‚石培养一å—晶体呢？这是因为在我们将æ¶é­”æ„志释放到空气中时，它身上的ç¦é”¢/cut就已ç»è¢«è§£é™¤äº†â€”—记ä½ï¼Œå½“我们æ€æ­»ä¸€ä¸ªæ€ªç‰©æ—¶ï¼Œå®ƒèº«ä¸Šçš„æ„志也就éšä¹‹è¢«æˆ‘们ç¦é”¢äº†ã€‚å†æ¬¡é‡Šæ”¾è‡ªç„¶ä¼šä»¤å…¶é‡æ–°æ¢å¤æ´»åŠ›ï¼Œè€Œè¿™ç»“晶å›å°±æ˜¯ç›´æŽ¥å¸æ”¶è¿™æ´»çš„æ¶é­”æ„志。ä¸è¦å¤ªæƒ³å½“然啦。\n\t结晶过程需è¦æ¯”较高的æ¶é­”çµæ°”的浓度（大概是80点），并且需è¦ä¸€æ®µæ—¶é—´ã€‚在这之åŽï¼Œç»“晶å›çš„上方便会长出åªæœ‰ä¸€æ ¹å°–çš„æ¶é­”晶簇。结晶å›æœ‰ä¸¤ç§å·¥ä½œæ–¹å¼ï¼šå®ƒæ—¢å¯ä»¥å¸æ”¶/cut特定的一ç§æ„志然åŽäº§ç”Ÿå¯¹åº”的晶体；也å¯ä»¥ç›´æŽ¥å¸æ”¶åŽŸç”Ÿæ„å¿—æ¥äº§ç”Ÿæ™¶ä½“。\n\tæ­¤å‰ç»“晶å›å¯ä»¥ç›´æŽ¥ä»ŽåŽŸç”Ÿæ„志中分离出特定类型的æ„志，现在你需è¦ä¸€äº›ç‰¹æ®Šçš„设备æ¥åšåˆ°è¿™ä¸€ç‚¹äº†ã€‚ä½ å¯èƒ½éœ€è¦å‚阅仪å¼å¤§å¸ˆå·çš„《结晶共鸣》一章。 guide.bloodmagic.entry.demon.cluster.info=æ¶é­”晶簇既å¯ä»¥ä½¿ç”¨æ¶é­”结晶å›åŸ¹å…»ï¼Œä¹Ÿå¯åœ¨ç‹±ç«ç†”炉中用æ¶é­”结晶制作。晶簇å¯ä»¥åœ¨å„ç§åœ°æ–¹ç”Ÿé•¿â€”—地æ¿ã€å¢™å£ã€ç”šè‡³å¤©èŠ±æ¿ä¸Šã€‚完全长æˆçš„晶簇应该有七个尖，打掉åŽæ¯ä¸€ä¸ªå°–都会å˜æˆä¸€å—结晶。然而，如果你使用å«æœ‰è‡³å°‘1024点æ„志的地狱魂石æ¥æ”¶èŽ·ï¼ˆå³å‡»ï¼‰ï¼Œä½ ä¾¿èƒ½åªæ”¶èŽ·ä¸€å—结晶而ä¸å½±å“到整棵晶簇。\n\t晶簇生长的过程中，会å¸æ”¶åŒç§æ¶é­”çµæ°”。虽然慢，但的确/cut是有收益的。\n\t有两ç§å’Œæ™¶ç°‡çš„ç§æ¤å’Œæ”¶èŽ·ç›¸å…³çš„仪å¼ï¼šå­¤é­‚集会和碎晶裂纹。具体用法å¯ä»¥å‚阅《仪å¼å¤§å¸ˆã€‹ä¸€å·ã€‚ guide.bloodmagic.entry.demon.pylon.info=你或许已ç»å‘现了，在没有外力的影å“下，æ¶é­”çµæ°”åªä¼šå¾…在它被释放出æ¥çš„那个地方（å³å½“å‰åŒºå—）。而这æ¶é­”导能塔，则为那些çµåŸŸä¸­çš„æ„志亮起了一ç›ç¯â€”—一ç›æŒ‡å¼•æ–¹å‘çš„ç¯ã€‚附近的æ„志在这ç¯çš„指引下会é€æ¸å‘ç¯é æ‹¢ï¼Œç›´è‡³è¿™äº›åœ°æ–¹çš„æ„å¿—æ•°é‡ä¿æŒå‡åŒ€ã€‚（注：这里所谓的“附近â€ä¸å«å¯¹è§’线上的区å—，å³åªæœ‰ä¸Žå¡”所在的区å—相邻的四个区å—会å—到影å“）。å¦å¤–è¦æ³¨æ„的是，æ„å¿—åªä¼šä»Žå¤šçš„地方æµ/cutå‘少的地方。若是什么地方的æ„志的浓度比附近的地方浓度低了，它就ä¸ä¼šç»§ç»­æµåŠ¨äº†ã€‚ guide.bloodmagic.entry.demon.gauge.info=你需è¦ä¸€ä¸ªæµ‹é‡ä»ªæ¥æµ‹å®šçµåŸŸä¸­çš„æ¶é­”æ„志浓度。åªéœ€è¦ä¸€ç›´æ”¾åœ¨ä½ çš„背包中，测é‡ä»ªä¾¿å¯å°†æµ“度以五个指示器的形å¼æ˜¾ç¤ºå‡ºæ¥ï¼ˆåœ¨å±å¹•å·¦ä¸Šè§’）。潜行时你还能得知具体数é‡ï¼Œä½†è¿™ä¸ªç»“果是ç»è¿‡å››èˆäº”入的。 From ce46de0d0a3dabaae2df3b939d7601ec5de478ce Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 00:59:09 +0200 Subject: [PATCH 221/493] Fixed Crystal Cluster behavior. (#1390) * Players in creative mode can now add crystals to crystal blocks by right clicking them with an item demon crystal. Crystal block texture now updates on the next tick. The render update is only called when a new crystal has been added (by natural or unnatural means). Adding a crystal imitates a positive result of checkAndGrowCrystal() closes #1151 * fixed conditional to allow harvesting crystals if not in creative and holding crystal --- .../bloodmagic/block/BlockDemonCrystal.java | 30 +++++++++++++------ .../bloodmagic/tile/TileDemonCrystal.java | 15 +++++----- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 489e77ca..61b7073c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; @@ -28,7 +29,6 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Random; public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvider { public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); @@ -48,17 +48,29 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - if (world.isRemote) - return true; + if (!world.isRemote) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileDemonCrystal) { + TileDemonCrystal crystal = (TileDemonCrystal) tile; + boolean isCreative = player.capabilities.isCreativeMode; + boolean holdsCrystal = player.getHeldItem(hand).getItem() instanceof ItemDemonCrystal; - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - TileDemonCrystal crystal = (TileDemonCrystal) tile; + if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024 && !(holdsCrystal && isCreative)) { + crystal.dropSingleCrystal(); - if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024) - crystal.dropSingleCrystal(); + } + if (!crystal.getWorld().isRemote && isCreative && holdsCrystal) { + if (crystal.crystalCount < 7) { + crystal.internalCounter = 0; + if(crystal.progressToNextCrystal > 0) + crystal.progressToNextCrystal--; + crystal.crystalCount++; + crystal.markDirty(); + crystal.notifyUpdate(); + } + } + } } - return true; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 392b3ebf..d856cc42 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,17 +1,16 @@ package WayofTime.bloodmagic.tile; -import net.minecraft.block.state.IBlockState; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import WayofTime.bloodmagic.block.BlockDemonCrystal; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.base.TileTicking; +import net.minecraft.block.state.IBlockState; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.MathHelper; public class TileDemonCrystal extends TileTicking { @@ -36,6 +35,8 @@ public class TileDemonCrystal extends TileTicking { if (getWorld().isRemote) { + if(internalCounter % 20 == 0) + getWorld().markBlockRangeForRenderUpdate(pos, pos); return; } From e8ad057662bb1a195e3a4a9aad80f84b48f740c3 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 01:02:22 +0200 Subject: [PATCH 222/493] Added RitualReader/Ritual Tinkerer to creative tab (#1393) --- src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index cdabfa3a..b6f7297d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -38,6 +38,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { super(); setUnlocalizedName(BloodMagic.MODID + ".ritualReader"); setMaxStackSize(1); + setCreativeTab(BloodMagic.TAB_BM); } @Override From 7954d04421d25a69203c32c9ca30e7f12987bcec Mon Sep 17 00:00:00 2001 From: KohaiKhaos Date: Tue, 7 Aug 2018 18:24:41 -0500 Subject: [PATCH 223/493] Fixed a null pointer exception with certain modded blocks with the Ritual of Magnetism (#1380) * Replaced a null RayTraceResult in Magnetism Ritual with a real one * Added a fake player to the code. No more passing nulls. --- .../bloodmagic/ritual/types/RitualMagnetic.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index cbd5cd20..8d9a662c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -7,9 +7,14 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; + import java.util.function.Consumer; @@ -18,6 +23,7 @@ public class RitualMagnetic extends Ritual { public static final String PLACEMENT_RANGE = "placementRange"; // public static final String SEARCH_RANGE = "searchRange"; public BlockPos lastPos; // An offset + private FakePlayer fakePlayer; public RitualMagnetic() { super("ritualMagnetic", 0, 5000, "ritual." + BloodMagic.MODID + ".magneticRitual"); @@ -28,6 +34,7 @@ public class RitualMagnetic extends Ritual { @Override public void performRitual(IMasterRitualStone masterRitualStone) { World world = masterRitualStone.getWorldObj(); + Vec3d MRSpos = new Vec3d(masterRitualStone.getBlockPos()); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); if (currentEssence < getRefreshCost()) { @@ -68,8 +75,10 @@ public class RitualMagnetic extends Ritual { while (i <= radius) { while (k <= radius) { BlockPos newPos = pos.add(i, j, k); + Vec3d newPosVector = new Vec3d(newPos); IBlockState state = world.getBlockState(newPos); - ItemStack checkStack = state.getBlock().getPickBlock(state, null, world, newPos, null); + RayTraceResult fakeRayTrace = world.rayTraceBlocks(MRSpos, newPosVector, false); + ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((WorldServer) world)); if (isBlockOre(checkStack)) { Utils.swapLocations(world, newPos, world, replacement); masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); @@ -134,6 +143,10 @@ public class RitualMagnetic extends Ritual { return new RitualMagnetic(); } + private FakePlayer getFakePlayer(WorldServer world) { + return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_magnetic")) : fakePlayer; + } + public static boolean isBlockOre(ItemStack stack) { if (stack.isEmpty()) return false; From ebfd8ce9a3a22da0b31cd1093a53c5db031856f0 Mon Sep 17 00:00:00 2001 From: KohaiKhaos Date: Tue, 7 Aug 2018 18:28:55 -0500 Subject: [PATCH 224/493] Several mimic fixes, with actually cleaned up commit history. (#1379) * Reimplemented a lot of mimic logic and did a first run of changing how mimics store their states. * Finished removing all metadata calls for blocks replaced by mimics. * Update EntityMimic.java * Update ItemBlockMimic.java * Update TileMimic.java * How did I even replace a semicolon with a slash. * Changed all tabs to 4 spaces. Changed Serializer to StateUtil * Fixed spacing again, hopefully for the last time --- .../api/impl/BloodMagicCorePlugin.java | 32 +--- .../bloodmagic/block/BlockMimic.java | 15 +- .../bloodmagic/entity/mob/EntityMimic.java | 15 +- .../bloodmagic/item/block/ItemBlockMimic.java | 144 ++++++++++++++++++ .../WayofTime/bloodmagic/tile/TileMimic.java | 47 ++++-- .../WayofTime/bloodmagic/util/StateUtil.java | 37 +++++ 6 files changed, 238 insertions(+), 52 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java create mode 100644 src/main/java/WayofTime/bloodmagic/util/StateUtil.java diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 633e2a40..3a0d0164 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -15,6 +15,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; import WayofTime.bloodmagic.incense.EnumTranquilityType; import WayofTime.bloodmagic.incense.TranquilityStack; +import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -116,7 +117,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin if (blockData.length > 1) { // We have properties listed, so let's build a state. - api.getBlacklist().addTeleposer(parseState(value)); + api.getBlacklist().addTeleposer(StateUtil.parseState(value)); continue; } @@ -136,7 +137,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin if (blockData.length > 1) { // We have properties listed, so let's build a state. - api.getBlacklist().addTeleposer(parseState(value)); + api.getBlacklist().addTeleposer(StateUtil.parseState(value)); continue; } @@ -152,29 +153,4 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin api.getBlacklist().addWellOfSuffering(entityEntry.getRegistryName()); } } - - private static IBlockState parseState(String blockInfo) - { - String[] split = blockInfo.split("\\["); - split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state - - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block - if (block == Blocks.AIR) - return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data - - BlockStateContainer blockState = block.getBlockState(); - IBlockState returnState = blockState.getBaseState(); - - // Force our values into the state - String[] stateValues = split[1].split(","); // Splits up each value - for (String value : stateValues) - { - String[] valueSplit = value.split("="); // Separates property and value - IProperty property = blockState.getProperty(valueSplit[0]); - if (property != null) - returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state - } - - return returnState; - } -} +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index 33e6cb94..b0feb7eb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.block.enums.EnumMimic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMimic; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.item.block.ItemBlockMimic; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -59,7 +60,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent if (mimicBlock == Blocks.AIR) { return FULL_BLOCK_AABB; } - IBlockState mimicState = mimicBlock.getStateFromMeta(tileMimic.metaOfReplacedBlock); + IBlockState mimicState = tileMimic.getReplacedState(); if (mimicBlock != this) { return mimicState.getCollisionBoundingBox(world, pos); } @@ -82,7 +83,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent if (mimicBlock == Blocks.AIR) { return FULL_BLOCK_AABB; } - IBlockState mimicState = mimicBlock.getStateFromMeta(tileMimic.getStackInSlot(0).getItemDamage()); + IBlockState mimicState = tileMimic.getReplacedState(); if (mimicBlock != this) { return mimicState.getSelectedBoundingBox(world, pos); } @@ -136,7 +137,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent ItemStack stack = mimic.getStackInSlot(0); if (stack.getItem() instanceof ItemBlock) { Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState mimicState = block.getStateFromMeta(stack.getItemDamage()); + IBlockState mimicState = mimic.getReplacedState(); if (block != this) { if (block.getRenderType(mimicState) == EnumBlockRenderType.ENTITYBLOCK_ANIMATED) { return RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState(); //Small and invisible-ish, basically this is returned in order to not render over the animated block (TESR) @@ -208,7 +209,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent if (stack.getItem() instanceof ItemBlock) { Block block = ((ItemBlock) stack.getItem()).getBlock(); if (block instanceof IAltarComponent) { - return ((IAltarComponent) block).getType(world, block.getStateFromMeta(mimic.metaOfReplacedBlock), pos); + return ((IAltarComponent) block).getType(world, mimic.getReplacedState(), pos); } else { for (ComponentType altarComponent : ComponentType.values()) if (block == Utils.getBlockForComponent(altarComponent)) @@ -218,4 +219,10 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } return null; } + + @Override + public ItemBlock getItem() { + return new ItemBlockMimic(this); + } + } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java index 0661115a..54e39197 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.block.BlockMimic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.entity.ai.EntityAIMimicReform; import WayofTime.bloodmagic.tile.TileMimic; +import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -12,6 +13,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.*; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; @@ -39,6 +41,7 @@ public class EntityMimic extends EntityDemonBase { public boolean dropItemsOnBreak = true; public NBTTagCompound tileTag = new NBTTagCompound(); public int metaOfReplacedBlock = 0; + public IBlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); public int playerCheckRadius = 5; public EntityMimic(World worldIn) { @@ -67,6 +70,7 @@ public class EntityMimic extends EntityDemonBase { tag.setTag("tileTag", tileTag); tag.setInteger("metaOfReplacedBlock", metaOfReplacedBlock); tag.setInteger("playerCheckRadius", playerCheckRadius); + tag.setString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); } @Override @@ -77,6 +81,7 @@ public class EntityMimic extends EntityDemonBase { tileTag = tag.getCompoundTag("tileTag"); metaOfReplacedBlock = tag.getInteger("metaOfReplacedBlock"); playerCheckRadius = tag.getInteger("playerCheckRadius"); + stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); } public ItemStack getMimicItemStack() { @@ -88,7 +93,7 @@ public class EntityMimic extends EntityDemonBase { } public boolean spawnHeldBlockOnDeath(World world, BlockPos pos) { - return world.isAirBlock(pos) && TileMimic.replaceMimicWithBlockActual(world, pos, getMimicItemStack(), tileTag, metaOfReplacedBlock); + return world.isAirBlock(pos) && TileMimic.replaceMimicWithBlockActual(world, pos, getMimicItemStack(), tileTag, stateOfReplacedBlock); } public boolean spawnMimicBlockAtPosition(World world, BlockPos pos) { @@ -98,7 +103,7 @@ public class EntityMimic extends EntityDemonBase { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMimic) { TileMimic mimic = (TileMimic) tile; - mimic.metaOfReplacedBlock = metaOfReplacedBlock; + mimic.setReplacedState(this.stateOfReplacedBlock); mimic.tileTag = tileTag; mimic.setInventorySlotContents(0, getMimicItemStack()); mimic.dropItemsOnBreak = dropItemsOnBreak; @@ -111,11 +116,11 @@ public class EntityMimic extends EntityDemonBase { return false; } - public void initializeMimic(ItemStack heldStack, NBTTagCompound tileTag, boolean dropItemsOnBreak, int metaOfReplacedBlock, int playerCheckRadius, BlockPos homePosition) { + public void initializeMimic(ItemStack heldStack, NBTTagCompound tileTag, boolean dropItemsOnBreak, IBlockState stateOfReplacedBlock, int playerCheckRadius, BlockPos homePosition) { this.setMimicItemStack(heldStack); this.tileTag = tileTag; this.dropItemsOnBreak = dropItemsOnBreak; - this.metaOfReplacedBlock = metaOfReplacedBlock; + this.stateOfReplacedBlock = stateOfReplacedBlock; this.playerCheckRadius = playerCheckRadius; this.setHomePosAndDistance(homePosition, 2); //TODO: Save this. } @@ -319,4 +324,4 @@ public class EntityMimic extends EntityDemonBase { super(spider, classTarget, true); } } -} \ No newline at end of file +} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java new file mode 100644 index 00000000..7963d0f8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java @@ -0,0 +1,144 @@ +package WayofTime.bloodmagic.item.block; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import WayofTime.bloodmagic.block.BlockMimic; +import WayofTime.bloodmagic.tile.TileMimic; +import WayofTime.bloodmagic.block.base.BlockEnum; +import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; + +import WayofTime.bloodmagic.util.ChatUtil; + +public class ItemBlockMimic extends ItemBlockEnum +{ + public ItemBlockMimic(BlockEnum block) + { + super(block); + setHasSubtypes(true); + } + + @Override + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) + { + ItemStack stack = player.getHeldItem(hand); + + //If not sneaking, do normal item use + if (!player.isSneaking()) + { + return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); + } + + //IF sneaking and player has permission, replace the targeted block + if (player.canPlayerEdit(pos, facing, stack)) + { + //Store information about the block being replaced and its appropriate itemstack + IBlockState replacedBlockstate = world.getBlockState(pos); + Block replacedBlock = replacedBlockstate.getBlock(); + ItemStack replacedStack = replacedBlock.getItem(world, pos, replacedBlockstate); + + //Get the state for the mimic + IBlockState mimicBlockstate = this.getBlock().getStateFromMeta(stack.getMetadata()); + + + //Check if the block can be replaced + + if (!canReplaceBlock(world, pos, replacedBlockstate)) + { + return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); + } + + //Check if the tile entity, if any, can be replaced + TileEntity tileReplaced = world.getTileEntity(pos); + if (!canReplaceTile(tileReplaced)) + { + return EnumActionResult.FAIL; + } + + //If tile can be replaced, store info about the tile + NBTTagCompound tileTag = getTagFromTileEntity(tileReplaced); + if (tileReplaced != null) + { + NBTTagCompound voidTag = new NBTTagCompound(); + voidTag.setInteger("x", pos.getX()); + voidTag.setInteger("y", pos.getY()); + voidTag.setInteger("z", pos.getZ()); + tileReplaced.readFromNBT(voidTag); + } + + //Remove one item from stack + stack.shrink(1); + + + //Replace the block + world.setBlockState(pos, mimicBlockstate, 3); + //Make placing sound + SoundType soundtype = this.block.getSoundType(); + world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + + //Replace the tile entity + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileMimic) + { + TileMimic mimic = (TileMimic) tile; + mimic.tileTag = tileTag; + mimic.setReplacedState(replacedBlockstate); + mimic.setInventorySlotContents(0, replacedStack); + mimic.refreshTileEntity(); + + if (player.capabilities.isCreativeMode) + { + mimic.dropItemsOnBreak = false; + } + } + return EnumActionResult.SUCCESS; + } + + return EnumActionResult.FAIL; + + } + + public boolean canReplaceTile(TileEntity tile) + { + if (tile instanceof TileEntityChest) + { + return true; + } + + return tile == null; + } + + public boolean canReplaceBlock(World world, BlockPos pos, IBlockState state) { + return state.getBlockHardness(world, pos) != -1.0F; + } + + public NBTTagCompound getTagFromTileEntity(TileEntity tile) + { + NBTTagCompound tag = new NBTTagCompound(); + + if (tile != null) + { + return tile.writeToNBT(tag); + } + + return tag; + } + + @Override + public int getMetadata(int meta) + { + return meta; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java index 1076ba17..11b80f2e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java @@ -6,10 +6,12 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.entity.mob.EntityMimic; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityPotion; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryHelper; @@ -39,8 +41,8 @@ public class TileMimic extends TileInventory implements ITickable { public boolean dropItemsOnBreak = true; public NBTTagCompound tileTag = new NBTTagCompound(); public TileEntity mimicedTile = null; - public int metaOfReplacedBlock = 0; - + IBlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); + public int playerCheckRadius = 5; public int potionSpawnRadius = 5; public int potionSpawnInterval = 40; @@ -134,6 +136,13 @@ public class TileMimic extends TileInventory implements ITickable { return false; Utils.insertItemToTile(this, player, 0); + ItemStack stack = getStackInSlot(0); + if(stateOfReplacedBlock == Blocks.AIR.getDefaultState()) { + if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { + Block block = ((ItemBlock) stack.getItem()).getBlock(); + stateOfReplacedBlock = block.getDefaultState(); + } + } this.refreshTileEntity(); if (player.capabilities.isCreativeMode) { @@ -220,7 +229,7 @@ public class TileMimic extends TileInventory implements ITickable { EntityMimic mimicEntity = new EntityMimic(getWorld()); mimicEntity.setPosition(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); - mimicEntity.initializeMimic(getStackInSlot(0), tileTag, dropItemsOnBreak, metaOfReplacedBlock, playerCheckRadius, pos); + mimicEntity.initializeMimic(getStackInSlot(0), tileTag, dropItemsOnBreak, stateOfReplacedBlock, playerCheckRadius, pos); tileTag = null; mimicedTile = null; this.setInventorySlotContents(0, ItemStack.EMPTY); @@ -239,7 +248,7 @@ public class TileMimic extends TileInventory implements ITickable { if (mimicedTile != null) { dropMimicedTileInventory(); } - mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, metaOfReplacedBlock); + mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, stateOfReplacedBlock); } @Override @@ -248,8 +257,8 @@ public class TileMimic extends TileInventory implements ITickable { dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); tileTag = tag.getCompoundTag("tileTag"); - metaOfReplacedBlock = tag.getInteger("metaOfReplacedBlock"); - mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, metaOfReplacedBlock); + stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); + mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, stateOfReplacedBlock); playerCheckRadius = tag.getInteger("playerCheckRadius"); potionSpawnRadius = tag.getInteger("potionSpawnRadius"); potionSpawnInterval = Math.max(1, tag.getInteger("potionSpawnInterval")); @@ -261,10 +270,10 @@ public class TileMimic extends TileInventory implements ITickable { tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); tag.setTag("tileTag", tileTag); - tag.setInteger("metaOfReplacedBlock", metaOfReplacedBlock); tag.setInteger("playerCheckRadius", playerCheckRadius); tag.setInteger("potionSpawnRadius", potionSpawnRadius); tag.setInteger("potionSpawnInterval", potionSpawnInterval); + tag.setString("stateOfReplacedBlock",stateOfReplacedBlock.toString()); return tag; } @@ -284,6 +293,14 @@ public class TileMimic extends TileInventory implements ITickable { } } + public IBlockState getReplacedState() { + return stateOfReplacedBlock; + } + + public void setReplacedState(IBlockState state) { + stateOfReplacedBlock = state; + } + @Override public boolean isItemValidForSlot(int slot, ItemStack itemstack) { return slot == 0 && dropItemsOnBreak; @@ -293,13 +310,13 @@ public class TileMimic extends TileInventory implements ITickable { World world = mimic.getWorld(); BlockPos pos = mimic.getPos(); - replaceMimicWithBlockActual(world, pos, mimic.getStackInSlot(0), mimic.tileTag, mimic.metaOfReplacedBlock); + replaceMimicWithBlockActual(world, pos, mimic.getStackInSlot(0), mimic.tileTag, mimic.stateOfReplacedBlock); } - - public static boolean replaceMimicWithBlockActual(World world, BlockPos pos, ItemStack stack, NBTTagCompound tileTag, int replacedMeta) { + + public static boolean replaceMimicWithBlockActual(World world, BlockPos pos, ItemStack stack, NBTTagCompound tileTag, IBlockState replacementState) { if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState state = block.getStateFromMeta(replacedMeta); + IBlockState state = replacementState; if (world.setBlockState(pos, state, 3)) { TileEntity tile = world.getTileEntity(pos); if (tile != null) { @@ -317,10 +334,10 @@ public class TileMimic extends TileInventory implements ITickable { } @Nullable - public static TileEntity getTileFromStackWithTag(World world, BlockPos pos, ItemStack stack, @Nullable NBTTagCompound tag, int replacementMeta) { + public static TileEntity getTileFromStackWithTag(World world, BlockPos pos, ItemStack stack, @Nullable NBTTagCompound tag, IBlockState replacementState) { if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState state = block.getStateFromMeta(stack.getItemDamage()); + IBlockState state = replacementState; if (block.hasTileEntity(state)) { TileEntity tile = block.createTileEntity(world, state); @@ -338,7 +355,7 @@ public class TileMimic extends TileInventory implements ITickable { tile.setWorld(world); try { - _blockMetadata.setInt(tile, replacementMeta); + _blockMetadata.setInt(tile, block.getMetaFromState(replacementState)); } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } @@ -349,4 +366,4 @@ public class TileMimic extends TileInventory implements ITickable { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java new file mode 100644 index 00000000..03dce756 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java @@ -0,0 +1,37 @@ +package WayofTime.bloodmagic.util; + +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +public class StateUtil +{ + public static IBlockState parseState(String blockInfo) + { + String[] split = blockInfo.split("\\["); + split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state + + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block + if (block == Blocks.AIR) + return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data + + BlockStateContainer blockState = block.getBlockState(); + IBlockState returnState = blockState.getBaseState(); + + // Force our values into the state + String[] stateValues = split[1].split(","); // Splits up each value + for (String value : stateValues) + { + String[] valueSplit = value.split("="); // Separates property and value + IProperty property = blockState.getProperty(valueSplit[0]); + if (property != null) + returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state + } + + return returnState; + } +} \ No newline at end of file From 4941d0b361a158e0d160f9a2aa058d36391b6a11 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 01:45:15 +0200 Subject: [PATCH 225/493] Language files en_US -> de_DE (FINISHED), minor language file edits (#1321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed downgrade level inconsistency * Squashed commit of the following: commit 7263e6fbc2a3411167a10fa7a931fb9a74832286 Author: PiscesdanAT <40119554+PiscesdanAT@users.noreply.github.com> Date: Sat Jun 9 18:01:30 2018 +0200 Update de_DE.lang (#1337) Someone mixed up dusk and dawn Updated de_DE.lang Added some missing stuff in en_US.lang * Update en_US.lang Fixed the typo I inserted with previous commit. * bloodmagic/.../de_DE.lang * more fitting translations bloodmagicguide/.../de_DE.lang * 1/3 finished .. en_US.lang Whitespaces Signed-off-by: Iorce * bloodmagic/.../de_DE.lang: - improved translations - again bloodmagicguide/.../en_US: - mudpack -> modpack (someone doesn't like them, it seems) - wares off -> wears off (Typo) bloodmagicguide/.../de_DE: - another batch of translations Signed-off-by: Iorce * bloodmagic/.../de_DE.lang: - improved translations - again bloodmagicguide/.../en_US: - mudpack -> modpack (someone doesn't like them, it seems) - wares off -> wears off (Typo) bloodmagicguide/.../de_DE: - another batch of translations - finished the "Ritual Master" Signed-off-by: Iorce * bloodmagic/.../de_DE.lang: - improved translations - a bit more literal for some while keeping variety (Suppression and Displacement can have the same translation) bloodmagicguide/.../de_DE: - translated architect entry texts / titles * bloodmagicguide/.../en_US.lang: consistency (was Sacrificial Knife, every occurrence of that item is now called "Sacrifical Dagger" bloodmagicguide/.../de_DE.lang: some more.... * bloodmagicguide/.../en_US.lang: corrected required Blood Altar tier from "greater than" to "greater than or equal to" bloodmagicguide/.../de_DE.lang: some more.... * bloodmagicguide/.../en_US.lang: added clarification for Incense Altar block range bloodmagicguide/.../de_DE.lang: changed "Wahrheitssiegel" to "Siegel der Weissagung" changed "Weihrauchaltar" to "Räucheraltar" some more.... * bloodmagicguide/.../en_US.lang: clarification for Sigil of the Fast Miner entry ("and" -> "at") bloodmagicguide/.../de_DE.lang: some more.... * bloodmagicguide/.../de_DE.lang: some more.... * Changed "Blutorb" to "Blutkugel" in translation. Might have missed some cases of severe german grammar. bloodmagicguide/.../en_US.lang: Removed a "my", if someone misses it, it myght be readded. bloodmagicguide/.../de_DE.lang: some more.... * long overdue: closes #1320 (the disorient thing that nobody cares about) bloodmagicguide/.../en_US.lang: people are now less warry and more wary about sentient mimics. bloodmagicguide/.../de_DE.lang: some more.... (just the mimic stuff, since I commit after every typo I fix :o ) * bloodmagicguide/.../de_DE.lang: some more.... Completed "The Architect" * bloodmagic/.../de_DE.lang: Leere Tafel -> Leere Schiefertafel (material clarification, remaining names unchanged to keep the names short) Rudimentäre Falle -> [...] Schlinge (item icon looks like the latter, word has multiple meanings) Ansammlung Kristalle [...] -> Kirstallansammlung (easier on the tongue, better text flow) bloodmagicguide/.../en_US.lang: fixed mistake in textflow bloodmagicguide/.../de_DE.lang: some more.... * bloodmagic/.../de_DE.lang: clarification Haupt- -> Meister bloodmagicguide/.../de_DE.lang: some more.... bloodmagicguide/.../en_US.lang: Updated entry to reflect the new mechanic for creating pure will types * bloodmagic/.../de_DE.lang: Ansammlung -> Gruppe bloodmagicguide/.../de_DE.lang: finished! bloodmagicguide/.../en_US.lang: fixed ritual name * Finalized de_DE.lang Ätzend -> Korrosiv Contains: -> Enthält: * Finalized de_DE.lang ätzend -> korrosiv * Update de_DE.lang * Update de_DE.lang Drained -> Verbraucht Item -> Gegenstand * Update de_DE.lang Knoten-Router -> Netzknoten-Router * Update de_DE.lang Changed the base names for demonic Will to "Willpower" -> clarification for the user that the residue is actualy willpower and the quality of said will is a measure of the potential -> not changing other occurrences or notions in the book as no sane person would repeat "willpower" at every occasion. * Applied quick fixes to de_DE.lang * Merge me! reverted a whitespace change in gradle.properties (no idea where that came from) and moved the disorient thingy to another PR) * Take No.2 at fixing whitespaces. * TAKE NO.3 (HOPEFULLY FINAL TAKE) --- .../assets/bloodmagic/lang/de_DE.lang | 674 ++++++++++++++++-- .../assets/bloodmagic/lang/en_US.lang | 18 +- .../assets/bloodmagicguide/lang/de_DE.lang | 270 +++++++ .../assets/bloodmagicguide/lang/en_US.lang | 23 +- 4 files changed, 920 insertions(+), 65 deletions(-) create mode 100644 src/main/resources/assets/bloodmagicguide/lang/de_DE.lang diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang index 7417685a..d4d8ce84 100644 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang @@ -34,18 +34,18 @@ item.bloodmagic.focus.enhanced.name=Verbesserter Telepositionsfokus item.bloodmagic.focus.reinforced.name=Verstärkter Telepositionsfokus item.bloodmagic.focus.demonic.name=Dämonischer Telepositionsfokus -item.bloodmagic.slate.blank.name=Leere Tafel +item.bloodmagic.slate.blank.name=Leere Schiefertafel item.bloodmagic.slate.reinforced.name=Verstärkte Tafel item.bloodmagic.slate.imbued.name=Erfüllte Tafel item.bloodmagic.slate.demonic.name=Dämonische Tafel item.bloodmagic.slate.ethereal.name=Ätherische Tafel -item.bloodmagic.orb.weak.name=Schwacher Blutorb -item.bloodmagic.orb.apprentice.name=Blutorb des Lehrlings -item.bloodmagic.orb.magician.name=Blutorb des Magiers -item.bloodmagic.orb.master.name=Blutorb des Meisters -item.bloodmagic.orb.archmage.name=Blutorb des Erzmagiers -item.bloodmagic.orb.transcendent.name=Transzendenter Blutorb +item.bloodmagic.orb.weak.name=Schwache Blutkugel +item.bloodmagic.orb.apprentice.name=Blutkugel des Lehrlings +item.bloodmagic.orb.magician.name=Blutkugel des Magiers +item.bloodmagic.orb.master.name=Blutkugel des Meisters +item.bloodmagic.orb.archmage.name=Blutkugel des Erzmagiers +item.bloodmagic.orb.transcendent.name=Transzendenter Blutkugel item.bloodmagic.reagent.incendium.name=Incendium item.bloodmagic.reagent.magicales.name=Magicales @@ -70,74 +70,150 @@ item.bloodmagic.baseComponent.reagentWater.name=Wasserreagenz item.bloodmagic.baseComponent.reagentLava.name=Lavareagenz item.bloodmagic.baseComponent.reagentAir.name=Luftreagenz item.bloodmagic.baseComponent.reagentFastMiner.name=Reagenz der Eile -item.bloodmagic.baseComponent.reagentVoid.name=reagenz der Leere +item.bloodmagic.baseComponent.reagentVoid.name=Reagenz der Leere item.bloodmagic.baseComponent.reagentGrowth.name=Wachstumsreagenz item.bloodmagic.baseComponent.reagentAffinity.name=Reagenz der elementaren Verbundenheit item.bloodmagic.baseComponent.reagentSight.name=Sichtreagenz item.bloodmagic.baseComponent.reagentBinding.name=Bindendes Reagenz -item.bloodmagic.baseComponent.reagentSuppression.name=Unterdrückendes Reagenz +item.bloodmagic.baseComponent.reagentSuppression.name=Verdrängendes Reagenz +item.bloodmagic.baseComponent.reagent_blood_light.name=Blutlampenreagenz +item.bloodmagic.baseComponent.reagent_magnetism.name=Magnetismusreagenz +item.bloodmagic.baseComponent.reagent_haste.name=Reagenz der Hast +item.bloodmagic.baseComponent.reagent_bridge.name=Reagenz der Phantombrücke +item.bloodmagic.baseComponent.reagent_compression.name=Kompressionsreagenz +item.bloodmagic.baseComponent.reagent_severance.name=Trennungsreagenz +item.bloodmagic.baseComponent.reagent_holding.name=Aufbewahrungsreagenz +item.bloodmagic.baseComponent.reagent_claw.name=Klauenreagenz +item.bloodmagic.baseComponent.reagent_bounce.name=Elastizitätsreagenz +item.bloodmagic.baseComponent.reagent_frost.name=Frostreagenz +item.bloodmagic.baseComponent.reagent_teleposition.name=Telepositionsreagenz +item.bloodmagic.baseComponent.reagent_transposition.name=Transpositionsreagenz -item.bloodmagic.monsterSoul.base.name=Dämonischer Wille +item.bloodmagic.baseComponent.frame_part.name=Rahmenteile +item.bloodmagic.baseComponent.sand_iron.name=Eisensand +item.bloodmagic.baseComponent.sand_gold.name=Goldsand +item.bloodmagic.baseComponent.sand_coal.name=Kohlesand +item.bloodmagic.baseComponent.plant_oil.name=Pflanzenöl +item.bloodmagic.baseComponent.sulfur.name=Schwefel +item.bloodmagic.baseComponent.saltpeter.name=Saltpeter +item.bloodmagic.baseComponent.neuro_toxin.name=Nervengift +item.bloodmagic.baseComponent.antiseptic.name=Antiseptikum +item.bloodmagic.baseComponent.catalyst_length_1.name=Einfacher Verlängerungskatalysator +item.bloodmagic.baseComponent.catalyst_power_1.name=Einfacher Machtkatalysator + +item.bloodmagic.cutting_fluid.basic.name=Einfache Schneidelösung +item.bloodmagic.cutting_fluid.explosive.name=Explosives Pulver + +item.bloodmagic.demonCrystal.default.name=Kristall dämonischer Willenskraft +item.bloodmagic.demonCrystal.corrosive.name=Kristall korrosiver dämonischer Willenskraft +item.bloodmagic.demonCrystal.destructive.name=Kristall zerstörender dämonischer Willenskraft +item.bloodmagic.demonCrystal.vengeful.name=Kristall rachsüchtiger dämonischer Willenskraft +item.bloodmagic.demonCrystal.steadfast.name=Kristall standhafter dämonischer Willenskraft + +item.bloodmagic.monsterSoul.base.name=Dämonische Willenskraft +item.bloodmagic.monster_soul.corrosive.name=Korrosive dämonische Willenskraft +item.bloodmagic.monster_soul.destructive.name=Zerstörerische dämonische Willenskraft +item.bloodmagic.monster_soul.vengeful.name=Rachsüchtige dämonische Willenskraft +item.bloodmagic.monster_soul.steadfast.name=Standhafte dämonische Willenskraft item.bloodmagic.sigil.air.name=Luftsiegel item.bloodmagic.sigil.bloodLight.name=Siegel der Blutlampe item.bloodmagic.sigil.compression.name=Siegel der Kompression -item.bloodmagic.sigil.divination.name=Wahrheitssiegel +item.bloodmagic.sigil.divination.name=Siegel der Weissagung item.bloodmagic.sigil.water.name=Wassersiegel item.bloodmagic.sigil.lava.name=Lavasiegel item.bloodmagic.sigil.void.name=Siegel der Leere -item.bloodmagic.sigil.greenGrove.name=Siegel des Grünen Hains +item.bloodmagic.sigil.greenGrove.name=Siegel des grünen Hains item.bloodmagic.sigil.elementalAffinity.name=Siegel der elementaren Verbundenheit item.bloodmagic.sigil.haste.name=Siegel der Hast -item.bloodmagic.sigil.suppression.name=Siegel der Unterdrückung +item.bloodmagic.sigil.suppression.name=Siegel der Verdrängung item.bloodmagic.sigil.magnetism.name=Siegel des Magnetismus item.bloodmagic.sigil.fastMiner.name=Siegel des Eile -item.bloodmagic.sigil.seer.name=Siegel der Sicht +item.bloodmagic.sigil.seer.name=Siegel des Sehers item.bloodmagic.sigil.phantomBridge.name=Siegel der Phantombrücke item.bloodmagic.sigil.whirlwind.name=Siegel des Wirbelwindes item.bloodmagic.sigil.enderSeverance.name=Siegel des Endertrennens +item.bloodmagic.sigil.holding.name=Siegel der Aufbewahrung +item.bloodmagic.sigil.holding.display=&r%s: &o&n%s +item.bloodmagic.sigil.teleposition.name=Telepositionssiegel +item.bloodmagic.sigil.transposition.name=Transpositionssiegel +item.bloodmagic.sigil.claw.name=Siegel der Klaue +item.bloodmagic.sigil.bounce.name=Siegel der Elastizität +item.bloodmagic.sigil.frost.name=Siegel des Winteratems item.bloodmagic.livingArmour.helmet.name=Lebender Helm item.bloodmagic.livingArmour.chest.name=Lebender Brustpanzer item.bloodmagic.livingArmour.legs.name=Lebender Beinschutz item.bloodmagic.livingArmour.boots.name=Lebende Schuhe +item.bloodmagic.sentientArmour.helmet.name=Empfindsamer Helm +item.bloodmagic.sentientArmour.chest.name=Empfindsamer Brustpanzer +item.bloodmagic.sentientArmour.legs.name=Empfindsamer Beinschutz +item.bloodmagic.sentientArmour.boots.name=Empfindsame Schuhe item.bloodmagic.altarMaker.name=Altarersteller item.bloodmagic.ritualDivinernormal.name=Ritualrute item.bloodmagic.ritualDivinerdusk.name=Ritualrute [Abenddämmerung] item.bloodmagic.ritualDivinerdawn.name=Ritualrute [Morgendämmerung] +item.bloodmagic.ritualReader.name=Ritual-Tüftler item.bloodmagic.arcaneAshes.name=Arkane Asche -item.bloodmagic.upgradeTome.name=Thesis zur Verbesserung lebender Rüstung +item.bloodmagic.upgradeTome.name=These zur Verbesserung lebender Rüstung +item.bloodmagic.downgradeTome.name=These zur Schwächung lebender Rüstung +item.bloodmagic.upgradeTrainer.name=Trainingsband für Lebende Rüstung -item.bloodmagic.sentientSword.name=Intelligentes Schwert + +item.bloodmagic.sentientSword.name=Empfindsames Schwert item.bloodmagic.soulGem.petty.name=Winziges Juwel des Tartaros item.bloodmagic.soulGem.lesser.name=Niederes Juwel des Tartaros item.bloodmagic.soulGem.common.name=Gewöhnliches Juwel des Tartaros item.bloodmagic.soulGem.greater.name=Größeres Juwel des Tartaros item.bloodmagic.soulGem.grand.name=Großartiges Juwel des Tartaros -item.bloodmagic.soulSnare.base.name=Rudimentäre Falle -item.bloodmagic.sentientBow.name=Intelligenter Bogen +item.bloodmagic.soulSnare.base.name=Rudimentäre Schlinge +item.bloodmagic.sentientBow.name=Empfindsamer Bogen +item.bloodmagic.sentientArmourGem.name=Juwel der Empfindsamen Rüstung +item.bloodmagic.sentientAxe.name=Empfindsame Axt +item.bloodmagic.sentientPickaxe.name=Empfindsame Spitzhacke +item.bloodmagic.sentientShovel.name=Empfindsame Schaufel + +item.bloodmagic.nodeRouter.name=Netzknoten-Router +item.bloodmagic.itemFilter.exact.name=Präziser Gegenstandsfilter +item.bloodmagic.itemFilter.ignoreNBT.name=Ignoriere NBT Gegenstandsfilter +item.bloodmagic.itemFilter.modItems.name=Mod Gegenstandsfilter +item.bloodmagic.itemFilter.oreDict.name=Ore Dictionary Gegenstandsfilter +item.bloodmagic.fluidFilter.exact.name=Flüssigeitsfilter + +item.bloodmagic.experienceTome.name=Peritia-Foliant +item.bloodmagic.sanguineBook.name=Inspectoris Scandalum + +item.bloodmagic.living_point_upgrade.draft_angelus.name=Trank der Engelsmacht + +item.bloodmagic.willGauge.name=Dämonischer Auramesser +item.bloodmagic.potionFlask.name=Trankflasche + +item.bloodmagic.icarusScroll.name=Ikarusrolle # Blocks tile.bloodmagic.fluid.lifeEssence.name=Lebensessenz -tile.bloodmagic.stone.ritual.master.name=Haupt-Ritualstein +tile.bloodmagic.stone.ritual.master.name=Meisterritualstein tile.bloodmagic.stone.ritual.imperfect.name=Imperfekter Ritualstein +tile.bloodmagic.stone.ritual.inverted.name=Umgekehrter Meisterritualstein tile.bloodmagic.altar.name=Blutaltar -tile.bloodmagic.rune.blank.name=Blutrune +tile.bloodmagic.alchemyArray.name=&r&fAlchemische Anordnung + +tile.bloodmagic.rune.blank.name=Leere Rune tile.bloodmagic.rune.speed.name=Geschwindigkeitsrune tile.bloodmagic.rune.efficiency.name=Effizienzrune tile.bloodmagic.rune.sacrifice.name=Rune der Opferung tile.bloodmagic.rune.selfSacrifice.name=Rune der Selbstopferung -tile.bloodmagic.rune.displacement.name=Rune der Deplazierung +tile.bloodmagic.rune.displacement.name=Rune der Verlagerung tile.bloodmagic.rune.capacity.name=Kapazitätsrune tile.bloodmagic.rune.augCapacity.name=Rune der erweiterten Kapazität -tile.bloodmagic.rune.orb.name=Orbrune +tile.bloodmagic.rune.orb.name=Rune der Blutkugel tile.bloodmagic.rune.acceleration.name=Beschleunigungsrune -tile.bloodmagic.rune.charging.name=Laderune +tile.bloodmagic.rune.charging.name=Aufladungsrune tile.bloodmagic.ritualStone.blank.name=Ritualstein tile.bloodmagic.ritualStone.water.name=Wasserritualstein @@ -154,15 +230,159 @@ tile.bloodmagic.crystal.brick.name=Kristallklumpenziegel tile.bloodmagic.bloodLight.name=Blutlampe tile.bloodmagic.spectralBlock.name=Spektralblock tile.bloodmagic.phantomBlock.name=Phantomblock +tile.bloodmagic.incenseAltar.name=Räucheraltar tile.bloodmagic.teleposer.name=Teleposer tile.bloodmagic.soulForge.name=Höllenfeuerschmiede +tile.bloodmagic.alchemyTable.name=Alchemietisch +tile.bloodmagic.demonCrucible.name=Dämonenschmelztiegel +tile.bloodmagic.demonPylon.name=Dämonenpylon +tile.bloodmagic.demonCrystallizer.name=Dämonenkristallisierer + +tile.bloodmagic.masterRouting.name=Haupt-Verteilerknoten +tile.bloodmagic.outputRouting.name=Ausgehender Verteilerknoten +tile.bloodmagic.inputRouting.name=Eingehender Verteilerknoten +tile.bloodmagic.itemRouting.name=Verteilerknoten + +tile.bloodmagic.path.wood.name=Hölzerner Pfad +tile.bloodmagic.path.woodtile.name=Gekachelter Holzpfad +tile.bloodmagic.path.stone.name=Steinziegelpfad +tile.bloodmagic.path.stonetile.name=Gekachelter Steinpfad +tile.bloodmagic.path.wornstone.name=Verwitterter Steinziegelpfad +tile.bloodmagic.path.wornstonetile.name=Gekachelter verwitterter Steinpfad +tile.bloodmagic.path.obsidian.name=Obsidianziegelpfad +tile.bloodmagic.path.obsidiantile.name=Gekachelter Obsidianpfad + +tile.bloodmagic.dimensionalPortal.name=Dimensionsportal +tile.bloodmagic.bloodTank.name=Bluttank + +tile.bloodmagic.demonCrystal.default.name=Kristallgruppe dämonischen Willens +tile.bloodmagic.demonCrystal.corrosive.name=Kristallgruppe korrosiven dämonischen Willens +tile.bloodmagic.demonCrystal.destructive.name=Kristallgruppe zerstörerischen dämonischen Willens +tile.bloodmagic.demonCrystal.vengeful.name=Kristallgruppe rachsüchtigen dämonischen Willens +tile.bloodmagic.demonCrystal.steadfast.name=Kristallgruppe standhaften dämonischen Willens + +tile.bloodmagic.mimic.nohitbox.name=Ätherischer opaker Mimikblock +tile.bloodmagic.mimic.solidopaque.name=Opaker Mimikblock +tile.bloodmagic.mimic.solidclear.name=Klarer Mimikblock +tile.bloodmagic.mimic.solidlight.name=Leuchtender Mimikblock +tile.bloodmagic.mimic.sentient.name=Empfindsamer Mimikblock + +tile.bloodmagic.bricks1.brick1_raw.name=Rohe Steinziegel +tile.bloodmagic.bricks1.brick1_corrosive.name=Korrosive Steinziegel +tile.bloodmagic.bricks1.brick1_destructive.name=Zerstörerische Steinziegel +tile.bloodmagic.bricks1.brick1_vengeful.name=Rachsüchtige Steinziegel +tile.bloodmagic.bricks1.brick1_steadfast.name=Standhafte Steinziegel + +tile.bloodmagic.bricks2.smallbrick_raw.name=Kleine rohe Steinziegel +tile.bloodmagic.bricks2.smallbrick_corrosive.name=Kleine korrosive Steinziegel +tile.bloodmagic.bricks2.smallbrick_destructive.name=Kleine zerstörerische Steinziegel +tile.bloodmagic.bricks2.smallbrick_vengeful.name=Kleine rachsüchtige Steinziegel +tile.bloodmagic.bricks2.smallbrick_steadfast.name=Kleine standhafte Steinziegel +tile.bloodmagic.bricks2.tile_raw.name=Rohe Steinkacheln +tile.bloodmagic.bricks2.tile_corrosive.name=Korrosive Steinkacheln +tile.bloodmagic.bricks2.tile_destructive.name=Zerstörerische Steinkacheln +tile.bloodmagic.bricks2.tile_vengeful.name=Rachsüchtige Steinkacheln +tile.bloodmagic.bricks2.tile_steadfast.name=Standhafte Steinkacheln +tile.bloodmagic.bricks2.tilespecial_raw.name=Betonte rohe Steinkacheln +tile.bloodmagic.bricks2.tilespecial_corrosive.name=Betonte korrosive Steinkacheln +tile.bloodmagic.bricks2.tilespecial_destructive.name=Betonte zerstörerische Steinkacheln +tile.bloodmagic.bricks2.tilespecial_vengeful.name=Betonte rachsüchtige Steinkacheln +tile.bloodmagic.bricks2.tilespecial_steadfast.name=Betonte standhafte Steinkacheln + +tile.bloodmagic.inversionpillar.raw.name=Rohe Inversionssäule +tile.bloodmagic.inversionpillar.corrosive.name=Korrosive Inversionssäule +tile.bloodmagic.inversionpillar.destructive.name=Zerstörerische Inversionssäule +tile.bloodmagic.inversionpillar.vengeful.name=Rachsüchtige Inversionssäule +tile.bloodmagic.inversionpillar.steadfast.name=Standhafte Inversionssäule + +tile.bloodmagic.inversionpillarend.raw_bottom.name=Basis der rohen Inversionssäule +tile.bloodmagic.inversionpillarend.corrosive_bottom.name=Basis der korrosiven Inversionssäule +tile.bloodmagic.inversionpillarend.destructive_bottom.name=Basis der zerstörerischen Inversionssäule +tile.bloodmagic.inversionpillarend.vengeful_bottom.name=Basis der rachsüchtigen Inversionssäule +tile.bloodmagic.inversionpillarend.steadfast_bottom.name=Basis der standhaften Inversionssäule +tile.bloodmagic.inversionpillarend.raw_top.name=Kapitell der rohen Inversionssäule +tile.bloodmagic.inversionpillarend.corrosive_top.name=Kapitell der korrosiven Inversionssäule +tile.bloodmagic.inversionpillarend.destructive_top.name=Kapitell der zerstörerischen Inversionssäule +tile.bloodmagic.inversionpillarend.vengeful_top.name=Kapitell der rachsüchtigen Inversionssäule +tile.bloodmagic.inversionpillarend.steadfast_top.name=Kapitell der standhaften Inversionssäule + +tile.bloodmagic.demonlight.raw.name=Rohes Dämonenauge +tile.bloodmagic.demonlight.corrosive.name=Korrosives Dämonenauge +tile.bloodmagic.demonlight.destructive.name=Zerstörerisches Dämonenauge +tile.bloodmagic.demonlight.vengeful.name=Rachsüchtiges Dämonenauge +tile.bloodmagic.demonlight.steadfast.name=Standhaftes Dämonenauge + +tile.bloodmagic.extras.stone_raw.name=Roher Stein +tile.bloodmagic.extras.stone_corrosive.name=Korrosiver Stein +tile.bloodmagic.extras.stone_destructive.name=Zerstörerischer Stein +tile.bloodmagic.extras.stone_vengeful.name=Rachsüchtiger Stein +tile.bloodmagic.extras.stone_steadfast.name=Standhafter Stein + +tile.bloodmagic.extras.polished_raw.name=Polierter roher Stein +tile.bloodmagic.extras.polished_corrosive.name=Polierter korrosiver Stein +tile.bloodmagic.extras.polished_destructive.name=Polierter zerstörerischer Stein +tile.bloodmagic.extras.polished_vengeful.name=Polierter rachsüchtiger Stein +tile.bloodmagic.extras.polished_steadfast.name=Polierter standhafter Stein + +tile.bloodmagic.extras.metal_raw.name=Rohe Dämonenlegierung +tile.bloodmagic.extras.metal_corrosive.name=Korrosive Dämonenlegierung +tile.bloodmagic.extras.metal_destructive.name=Zerstörerische Dämonenlegierung +tile.bloodmagic.extras.metal_vengeful.name=Rachsüchtige Dämonenlegierung +tile.bloodmagic.extras.metal_steadfast.name=Standhafte Dämonenlegierung + +tile.bloodmagic.pillar1.raw.name=Rohe Steinsäule +tile.bloodmagic.pillar1.corrosive.name=Korrosive Steinsäule +tile.bloodmagic.pillar1.destructive.name=Zerstörerische Steinsäule +tile.bloodmagic.pillar1.vengeful.name=Rachsüchtige Steinsäule +tile.bloodmagic.pillar1.steadfast.name=Standhafte Steinsäule + +tile.bloodmagic.pillar2.raw.name=Betonte rohe Steinsäule +tile.bloodmagic.pillar2.corrosive.name=Betonte korrosive Steinsäule +tile.bloodmagic.pillar2.destructive.name=Betonte zerstörerische Steinsäule +tile.bloodmagic.pillar2.vengeful.name=Betonte rachsüchtige Steinsäule +tile.bloodmagic.pillar2.steadfast.name=Betonte standhafte Steinsäule + +tile.bloodmagic.pillarCap1.raw.name=Kapitell der rohen Steinsäule +tile.bloodmagic.pillarCap1.corrosive.name=Kapitell der korrosiven Steinsäule +tile.bloodmagic.pillarCap2.destructive.name=Kapitell der zerstörerischen Steinsäule +tile.bloodmagic.pillarCap2.vengeful.name=Kapitell der rachsüchtigen Steinsäule +tile.bloodmagic.pillarCap3.steadfast.name=Kapitell der standhaften Steinsäule + +tile.bloodmagic.wall1.brick_raw.name=Rohe Steinziegelmauer +tile.bloodmagic.wall1.brick_corrosive.name=Korrosive Steinziegelmauer +tile.bloodmagic.wall1.brick_destructive.name=Zerstörerische Steinziegelmauer +tile.bloodmagic.wall1.brick_vengeful.name=Rachsüchtige Steinziegelmauer +tile.bloodmagic.wall1.brick_steadfast.name=Standhafte Steinziegelmauer +tile.bloodmagic.wall1.smallbrick_raw.name=Rohe Steinmauer mit kleinen Ziegeln +tile.bloodmagic.wall1.smallbrick_corrosive.name=Korrosive Steinmauer mit kleinen Ziegeln +tile.bloodmagic.wall1.smallbrick_destructive.name=Zerstörerische Steinmauer mit kleinen Ziegeln +tile.bloodmagic.wall1.smallbrick_vengeful.name=Rachsüchtige Steinmauer mit kleinen Ziegeln +tile.bloodmagic.wall1.smallbrick_steadfast.name=Standhafte Steinmauer mit kleinen Ziegeln +tile.bloodmagic.wall1.large_raw.name=Rohe Steinmauer +tile.bloodmagic.wall1.large_corrosive.name=Korrosive Steinmauer +tile.bloodmagic.wall1.large_destructive.name=Zerstörerische Steinmauer +tile.bloodmagic.wall1.large_vengeful.name=Rachsüchtige Steinmauer +tile.bloodmagic.wall1.large_steadfast.name=Standhafte Steinmauer + +tile.bloodmagic.stairs1.raw.name=Rohe Steintreppe +tile.bloodmagic.stairs1.corrosive.name=Korrosive Steintreppe +tile.bloodmagic.stairs2.destructive.name=Zerstörerische Steintreppe +tile.bloodmagic.stairs2.vengeful.name=Rachsüchtige Steintreppe +tile.bloodmagic.stairs3.steadfast.name=Standhafte Steintreppe + +# Fluids +fluid.lifeEssence=Lebensessenz # Tooltips +tooltip.bloodmagic.extraInfo=&9-Halte Shift für mehr Info- + tooltip.bloodmagic.orb.desc=Speichert Lebensessenz tooltip.bloodmagic.orb.owner=Hinzugefügt durch: %s tooltip.bloodmagic.currentOwner=Eigentümer: %s -tooltip.bloodmagic.currentTier=Ausbaustufe: %d +tooltip.bloodmagic.currentTier=Momentane Ausbaustufe: %d +tooltip.bloodmagic.config.disabled=Zurzeit durch Konfiguration deaktiviert +tooltip.bloodmagic.tier=Ausbaustufe %d tooltip.bloodmagic.activated=Aktiviert tooltip.bloodmagic.deactivated=Deaktiviert @@ -174,6 +394,9 @@ tooltip.bloodmagic.sigil.divination.desc=&oSpähe in die Seele tooltip.bloodmagic.sigil.divination.currentAltarTier=Ausbaustufe: %d tooltip.bloodmagic.sigil.divination.currentEssence=Gespeicherte Lebensessenz: %d LP tooltip.bloodmagic.sigil.divination.currentAltarCapacity=Maximale Kapazität: %d LP +tooltip.bloodmagic.sigil.divination.currentTranquility=Momentane Gelassenheit: %d +tooltip.bloodmagic.sigil.divination.currentInversion=Momentane Inversion: %d +tooltip.bloodmagic.sigil.divination.currentBonus=Momentaner Bonus: +%d%% tooltip.bloodmagic.sigil.water.desc=&oHat jemand nach unendlichem Wasser gefragt? tooltip.bloodmagic.sigil.lava.desc=&oHEISS! NICHT ESSEN! tooltip.bloodmagic.sigil.void.desc=&oBesser als Swiffer®! @@ -191,18 +414,28 @@ tooltip.bloodmagic.sigil.seer.currentAltarTier=Ausbaustufe: %d tooltip.bloodmagic.sigil.seer.currentEssence=Gespeicherte Lebensessenz: %d LP tooltip.bloodmagic.sigil.seer.currentAltarCapacity=Maximale Kapazität: %d LP tooltip.bloodmagic.sigil.seer.currentCharge=Ladung: %d +tooltip.bloodmagic.sigil.seer.currentTranquility=Momentane Gelassenheit: %d +tooltip.bloodmagic.sigil.seer.currentBonus=Momentaner Bonus: +%d%% tooltip.bloodmagic.sigil.phantomBridge.desc=&oLaufen auf dünner Luft... tooltip.bloodmagic.sigil.whirlwind.desc=&oBesser keinen Rock tragen -tooltip.bloodmagic.sigil.enderSeverance.desc=&oBringt Enderman in Notlage +tooltip.bloodmagic.sigil.enderSeverance.desc=&oBringt Endermen in Notlage +tooltip.bloodmagic.sigil.teleposition.desc=Das ist beinahe ein bewegender Moment. +tooltip.bloodmagic.sigil.transposition.desc=Spüre die Stärke der Macht, mein junger Schüler. +tooltip.bloodmagic.sigil.holding.press=Drücke &o%s&r&7 zum ändern +tooltip.bloodmagic.sigil.holding.desc=Gesiegelte Siegel +tooltip.bloodmagic.sigil.holding.sigilInSlot=Platz %d: %s -tooltip.bloodmagic.bound.sword.desc=&oErlegen der Schwachen -tooltip.bloodmagic.bound.pickaxe.desc=&oZerstören von Stein ohne Erbarmen +tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Erhöht die maximalen Punkte der Lebenden Rüstung auf %d. + +tooltip.bloodmagic.bound.sword.desc=&oSchlachten der Schwachen +tooltip.bloodmagic.bound.pickaxe.desc=&oSteinzerstörung ohne Erbarmen tooltip.bloodmagic.bound.axe.desc=&oDämonischer Kahlschlag tooltip.bloodmagic.bound.shovel.desc=&oSchrubbt den Dreck vom Boden tooltip.bloodmagic.sacrificialDagger.desc=Schon ein Stich in den Finger genügt +tooltip.bloodmagic.sacrificialDagger.creative=Rechtsklicke einen Altar während du kriechst, um diesen zu füllen tooltip.bloodmagic.slate.desc=Stein getränkt im Blutaltar -tooltip.bloodmagic.inscriber.desc=Die Zeichen an der Wand. +tooltip.bloodmagic.inscriber.desc=Die Zeichen sind an der Wand... tooltip.bloodmagic.pack.selfSacrifice.desc=Es scheuert richtig... tooltip.bloodmagic.pack.sacrifice.desc=Beschreibung @@ -222,30 +455,75 @@ tooltip.bloodmagic.diviner.duskRune=Runen der Abenddämmerung: %d tooltip.bloodmagic.diviner.dawnRune=Runen der Morgendämmerung: %d tooltip.bloodmagic.diviner.totalRune=Runen insgesamt: %d tooltip.bloodmagic.diviner.extraInfo=Halte Shift für extra Info +tooltip.bloodmagic.diviner.extraExtraInfo=&9-Halte Shift + M für Augmentationsinfo- tooltip.bloodmagic.diviner.currentDirection=Richtung: %s +tooltip.bloodmagic.ritualReader.currentState=Modus: %s +tooltip.bloodmagic.ritualReader.set_area=Definiere Gebiet +tooltip.bloodmagic.ritualReader.information=Information +tooltip.bloodmagic.ritualReader.set_will_types=Setze verbrauchten Willen +tooltip.bloodmagic.ritualReader.desc.set_area=Rechtsklick auf einen aktiven Meisterritualstein, um auszuwählen, welches Gebiet vom Ritual modifiziert werden soll. Dann klicke auf zwei gegenüberliegende Ecken, um das neue Gebiet zu definieren. +tooltip.bloodmagic.ritualReader.desc.information=Rechtsklick auf einen aktiven Meisterritualstein, um Informationen über das Ritual anzuzeigen. +tooltip.bloodmagic.ritualReader.desc.set_will_types=Setze durch einen Rechtsklick auf den MRS mit den jeweiligen Kristallen die Aspekte dämonischen Willens, die das Ritual über die Aura aufnimmt. + tooltip.bloodmagic.arcaneAshes=Asche gebraucht für einen alchemischen Kreis tooltip.bloodmagic.telepositionFocus.coords=Koordinaten: (%d, %d, %d) tooltip.bloodmagic.telepositionFocus.dimension=Dimensions-ID: %d -tooltip.bloodmagic.telepositionFocus.weak=Benutzt, um Blöcke zu verschieben -tooltip.bloodmagic.telepositionFocus.enhanced=Benutzt, um Blöcke zu verschieben -tooltip.bloodmagic.telepositionFocus.reinforced=Benutzt, um Blöcke zu verschieben +tooltip.bloodmagic.telepositionFocus.weak=Benutzt, um Blöcke zu teleportieren +tooltip.bloodmagic.telepositionFocus.enhanced=Benutzt, um Blöcke zu teleportieren +tooltip.bloodmagic.telepositionFocus.reinforced=Benutzt, um Blöcke zu teleportieren tooltip.bloodmagic.telepositionFocus.demonic=Benutzt, um Blöcke zu teleportieren tooltip.bloodmagic.livingArmour.upgrade.speed=Schnelle Füße tooltip.bloodmagic.livingArmour.upgrade.digging=Zwergenhafte Stärke -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=Giftungsresistenz +tooltip.bloodmagic.livingArmour.upgrade.poisonResist=Giftresistenz +tooltip.bloodmagic.livingArmour.upgrade.fireResist=Gabe des Feuers tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Zähe Handballen tooltip.bloodmagic.livingArmour.upgrade.knockback=Body Builder tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=Zähe Haut tooltip.bloodmagic.livingArmour.upgrade.health=Gesund tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Heftiger Schlag tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Trickschuss +tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Stufenhilfe +tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Sprint des Sensenmanns +tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Solarbetrieben +tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=Runenschild +tooltip.bloodmagic.livingArmour.upgrade.revealing=Aufdeckend +tooltip.bloodmagic.livingArmour.upgrade.experienced=Erfahren +tooltip.bloodmagic.livingArmour.upgrade.jump=Starke Beine +tooltip.bloodmagic.livingArmour.upgrade.fallProtect=Weicher Fall +tooltip.bloodmagic.livingArmour.upgrade.graveDigger=Totengräber +tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=Sturmangriff +tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=Gezielter Angriff +tooltip.bloodmagic.livingArmour.upgrade.elytra=Elytra +tooltip.bloodmagic.livingArmour.upgrade.nightSight=Nachtwandler +tooltip.bloodmagic.livingArmour.upgrade.repair=Reparierend + + +tooltip.bloodmagic.livingArmour.upgrade.slowness=Humpelnd +tooltip.bloodmagic.livingArmour.upgrade.crippledArm=Verkümmerter Arm +tooltip.bloodmagic.livingArmour.upgrade.slippery=Schlittern +tooltip.bloodmagic.livingArmour.upgrade.battleHunger=Bluthunger +tooltip.bloodmagic.livingArmour.upgrade.quenched=Löschend +tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=Stumpfe Klinge +tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=Schwache Spitzhacke +tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=Sturmtruppe +tooltip.bloodmagic.livingArmour.upgrade.slowHeal=Verseucht +tooltip.bloodmagic.livingArmour.upgrade.disoriented=Disorientiert + tooltip.bloodmagic.livingArmour.upgrade.level=%s (Level %d) +tooltip.bloodmagic.livingArmour.upgrade.progress=%s (%d/100) +tooltip.bloodmagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s + +tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Halte Shift + M für Fortschrittsinfo- + tooltip.bloodmagic.will=Willensqualität: %1$,.2f tooltip.bloodmagic.sentientSword.desc=Benutzt Dämonenwille um volles Potential freizusetzen +tooltip.bloodmagic.sentientAxe.desc=Benutzt Dämonenwille um volles Potential freizusetzen +tooltip.bloodmagic.sentientPickaxe.desc=Benutzt Dämonenwille um volles Potential freizusetzen +tooltip.bloodmagic.sentientShovel.desc=Benutzt Dämonenwille um volles Potential freizusetzen tooltip.bloodmagic.soulGem.petty=Ein Juwel, das eine winzige Menge an Willen aufnehmen kann tooltip.bloodmagic.soulGem.lesser=Ein Juwel, das ein wenig Willen festhalten kann tooltip.bloodmagic.soulGem.common=Ein Juwel, das eine ordentliche Menge an Willen aufnehmen kann @@ -253,25 +531,219 @@ tooltip.bloodmagic.soulGem.greater=Ein Juwel, das eine größere Menge an Willen tooltip.bloodmagic.soulGem.grand=Ein Juwel, das eine große Menge an Willen aufnehmen kann tooltip.bloodmagic.soulSnare.desc=Werfe nach einem Monster und töte es anschließend, um seinen Dämonischen Willen zu erhalten +tooltip.bloodmagic.itemFilter.exact=Stellt sicher, dass die Gegenstände genau übereinstimmen +tooltip.bloodmagic.itemFilter.ignoreNBT=Ignoriert NBT des Filters +tooltip.bloodmagic.itemFilter.modItems=Erlaubt alle Gegenstände der gleichen Mod +tooltip.bloodmagic.itemFilter.oreDict=Filtert durch das Ore Dictionary + +tooltip.bloodmagic.fluidFilter.exact=Filtert Flüssigkeitseingang/-ausgang + +tooltip.bloodmagic.fluid.type=Enthaltene Flüssigkeit: %s +tooltip.bloodmagic.fluid.amount=Menge: %d / %d mB +tooltip.bloodmagic.fluid.capacity=Kapazität: %d mB + +tooltip.bloodmagic.ghost.everything=Alles +tooltip.bloodmagic.ghost.amount=Geistergegenstandsanzahl: %d + +tooltip.bloodmagic.currentType.default=Enthält: Roher Wille +tooltip.bloodmagic.currentType.corrosive=Enthält: Korrosiver Wille +tooltip.bloodmagic.currentType.destructive=Enthält: Zerstörerischer Wille +tooltip.bloodmagic.currentType.vengeful=Enthält: Rachsüchtiger Wille +tooltip.bloodmagic.currentType.steadfast=Enthält: Standhafter Wille + +tooltip.bloodmagic.currentBaseType.default=Roh +tooltip.bloodmagic.currentBaseType.corrosive=Korrosiv +tooltip.bloodmagic.currentBaseType.destructive=Zerstörerisch +tooltip.bloodmagic.currentBaseType.vengeful=Rachsüchtig +tooltip.bloodmagic.currentBaseType.steadfast=Standhaft + +tooltip.bloodmagic.experienceTome=Ein Buch, um Erfahrung zu sammeln +tooltip.bloodmagic.experienceTome.exp=Exp: %0.3f +tooltip.bloodmagic.experienceTome.expLevel=Level: %d + +tooltip.bloodmagic.decoration.safe=Sicher als Dekoration +tooltip.bloodmagic.decoration.notSafe=Gefährlich als Dekoration + +tooltip.bloodmagic.cuttingFluidRatio=%d/%d Nutzungen verbleibend + +tooltip.bloodmagic.potion.uses=%d Nutzungen verbleibend + +tooltip.bloodmagic.book.shifting=Diese Symbole scheinen sich zu... &overändern... + +tooltip.bloodmagic.willGauge=Ein merkwürdiges Gerät, das dämonischen Willen in der Aura messen kann. + # Ritual +ritual.bloodmagic.blockRange.tooBig=Das Gebiet ist zu groß! Darf höchstens %s Blöcke groß sein. +ritual.bloodmagic.blockRange.tooFar=Das Gebiet ist zu weit! Muss in einer vertikalen Reichweite von %s Blöcken und einer horizontalen Reichweite von %s Blöcken sein. +ritual.bloodmagic.blockRange.inactive=Das Ritual ist inaktiv, das Gebiet kann nicht verändert werden. +ritual.bloodmagic.blockRange.noRange=Das Gebiet wurde nicht richtig ausgewählt. +ritual.bloodmagic.blockRange.firstBlock=Erster Block des neuen Gebietes gesetzt. +ritual.bloodmagic.blockRange.success=Neues Gebiet erfolgreich gesetzt! +ritual.bloodmagic.willConfig.set=Das Ritual wird den folgenden Typ dämonischen Willens nutzen: %s +ritual.bloodmagic.willConfig.void=Das Ritual nutzt keinen Willen mehr. + ritual.bloodmagic.testRitual=Testritual ritual.bloodmagic.waterRitual=Ritual der vollen Quelle ritual.bloodmagic.lavaRitual=Serenade des Nethers ritual.bloodmagic.greenGroveRitual=Ritual des grünen Hains ritual.bloodmagic.jumpRitual=Ritual des hohen Sprungs ritual.bloodmagic.wellOfSufferingRitual=Quelle des Leidens -ritual.bloodmagic.featheredKnifeRitual=Ritual der gefiederten Klinge +ritual.bloodmagic.featheredKnifeRitual=Ritual der federnden Klinge ritual.bloodmagic.regenerationRitual=Ritual der Regeneration ritual.bloodmagic.harvestRitual=Ritual der Mondernte ritual.bloodmagic.magneticRitual=Ritual des Magnetismus ritual.bloodmagic.crushingRitual=Ritual des Brechers -ritual.bloodmagic.fullStomachRitual=Ritual des gefüllten Bauches +ritual.bloodmagic.fullStomachRitual=Ritual des gefüllten Magens ritual.bloodmagic.interdictionRitual=Ritual der Verbietung -ritual.bloodmagic.containmentRitual=Ritual des Einschlusses +ritual.bloodmagic.containmentRitual=Ritual der Eindämmung ritual.bloodmagic.speedRitual=Ritual der Geschwindigkeit -ritual.bloodmagic.suppressionRitual=Ritual der Unterdrückung +ritual.bloodmagic.suppressionRitual=Ritual der Verdrängung ritual.bloodmagic.expulsionRitual=Aura der Vertreibung -ritual.bloodmagic.zephyrRitual=Ruf des Zephir +ritual.bloodmagic.zephyrRitual=Ruf des Zephyrs +ritual.bloodmagic.upgradeRemoveRitual=Klang der reinigenden Seele +ritual.bloodmagic.armourEvolveRitual=Ritual der lebenden Evolution +ritual.bloodmagic.animalGrowthRitual=Ritual des Hirten +ritual.bloodmagic.forsakenSoulRitual=Versammlung der verlassenen Seelen +ritual.bloodmagic.crystalHarvestRitual=Riss des gebrochenen Kristalls +ritual.bloodmagic.meteorRitual=Zeichen des fallenden Turms +ritual.bloodmagic.ellipseRitual=Fokus der Ellipse +ritual.bloodmagic.cobblestoneRitual=Ritual des gefrorenen Vulkans +ritual.bloodmagic.placerRitual=Füllung der Grube +ritual.bloodmagic.fellingRitual=Kahlschlag des Holzfällers +ritual.bloodmagic.pumpRitual=Hymne der Absaugung +ritual.bloodmagic.altarBuilderRitual=Die Zusammensetzung des hohen Altares +ritual.bloodmagic.portalRitual=Das Tor der Faltung +ritual.bloodmagic.downgradeRitual=Sühne der belasteten Seele +ritual.bloodmagic.crystalSplitRitual=Resonanz des facettierten Kristalls + +ritual.bloodmagic.waterRitual.info=Generiert eine Wasserquelle auf dem Meisterritualstein. +ritual.bloodmagic.lavaRitual.info=Generiert eine Lavaquelle auf dem Meisterritualstein. +ritual.bloodmagic.lavaRitual.default.info=(Roh) Verringert die LP-Kosten der Lava und erlaubt die Platzierung in einem Tank. +ritual.bloodmagic.lavaRitual.corrosive.info=(Korrosiv) Objekte in Reichweite, die immun gegen Feuer sind nehmen hohen Schaden. +ritual.bloodmagic.lavaRitual.destructive.info=(Zerstörerisch) Lava Platzierungsweite ist basierend auf der Menge an Wille erhöht. +ritual.bloodmagic.lavaRitual.vengeful.info=(Rachsüchtig) Objekte in Reichweite werden mit dem Effekt Fire Fuse betroffen. +ritual.bloodmagic.lavaRitual.steadfast.info=(Standhaft) Spieler in einer gesetzten Reichweite bekommen Feuerresistenz. + +ritual.bloodmagic.greenGroveRitual.info=Beschleunigt das Pflanzenwachstum. +ritual.bloodmagic.jumpRitual.info=Objekte in Reichweite werden in die Luft gestoßen. +ritual.bloodmagic.wellOfSufferingRitual.info=Fügt Monstern im Gebiet Schaden zu und füllt damit LP in den Blutaltar. +ritual.bloodmagic.featheredKnifeRitual.info=Entzieht Spielern in Reichweite Leben und führt dem Blutaltar LP zu. +ritual.bloodmagic.regenerationRitual.info=Gibt allen Objekten in Reichweite den Regenerations-Effekt, wenn ihnen Leben fehlt. +ritual.bloodmagic.regenerationRitual.default.info=(Roh) +ritual.bloodmagic.regenerationRitual.corrosive.info=(Korrosiv) Stiehlt Leben von Monstern in Reichweite des Vampirismus-Effekts und führt es Spielern direkt zu. +ritual.bloodmagic.regenerationRitual.destructive.info=(Zerstörerisch) +ritual.bloodmagic.regenerationRitual.vengeful.info=(Rachsüchtig) +ritual.bloodmagic.regenerationRitual.steadfast.info=(Standhaft) +ritual.bloodmagic.harvestRitual.info=Erntet Pflanzen in Reichweite und lässt die Erträge auf den Boden fallen. +ritual.bloodmagic.magneticRitual.info=Zieht Erze aus dem Boden un platziert sie in Reichweite des Rituals. +ritual.bloodmagic.crushingRitual.info=Bricht Blöcke in Reichweite und platziert die Gegenstände in einer verbundenen Truhe. +ritual.bloodmagic.crushingRitual.destructive.info=(Zerstörerisch) Die Blöcke werden mit großer Kraft zerstört: Alle Blöcke sind mit Glück III betroffen. +ritual.bloodmagic.crushingRitual.steadfast.info=(Standhaft) Alle zerstörten Blöcke sind mit Behutsamkeit betroffen. Ãœberschreibt Glück falls anwendbar. +ritual.bloodmagic.crushingRitual.corrosive.info=(Korrosiv) Alle Blöcke werden mit einer Art Schneidelösung betroffen. Ãœberschreibt Behutsamkeit falls anwendbar. +ritual.bloodmagic.crushingRitual.vengeful.info=(Rachsüchtig) Komprimiert das Inventar bei einer erfolgreichen Operation. Momentan nur eine Kompression per Operation. +ritual.bloodmagic.crushingRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen. +ritual.bloodmagic.greenGroveRitual.corrosive.info=(Korrosiv) Objekte in Reichweite werden von Pflanzen attackiert, wodurch ihr Leben entzogen wird. +ritual.bloodmagic.greenGroveRitual.default.info=(Roh) Erhöht die Geschwindigkeit aller Operationen des Rituals basierend auf dem vorhandenen Willen in der Aura. +ritual.bloodmagic.greenGroveRitual.vengeful.info=(Rachsüchtig) Erhöht die Chance, dass ein Wachstumstick erfolgreich ist. +ritual.bloodmagic.greenGroveRitual.steadfast.info=(Standhaft) Samen werden neu gepflanzt und Blöcke in Reichweite werden bewässert. +ritual.bloodmagic.greenGroveRitual.destructive.info=(Zerstörerisch) Wachstumsreichweite wird basierend auf vorhandenen Willen erhöht. +ritual.bloodmagic.featheredKnifeRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen. +ritual.bloodmagic.featheredKnifeRitual.destructive.info=(Zerstörerisch) Erhöht den Ertrag des Rituals basierend auf dem vorhandenen Willen. +ritual.bloodmagic.featheredKnifeRitual.vengeful.info=(Rachsüchtig) Setzt die Mindestlebenspunkte für die Opferung auf 10%%. Wird von Standhaft für den Besitzer überschrieben, wenne es aktiv ist. +ritual.bloodmagic.featheredKnifeRitual.corrosive.info=(Korrosiv) Nutzt den Bonus des Räucheraltars, um den Ertrag der Opferung zu erhöhen. +ritual.bloodmagic.featheredKnifeRitual.steadfast.info=(Standhaft) Erhöht die Mindestlebenspunkte für die Opferung von 30%% to 70%%. +ritual.bloodmagic.speedRitual.default.info=(Roh) Erhöht die Geschwindigkeit basierend auf vorhandenen Willen. +ritual.bloodmagic.speedRitual.vengeful.info=(Rachsüchtig) Verhindert, dass erwachsene Mobs und Spieler transportiert werden. Spieler werden transportiert, wenn es mit Zerstörerisch kombiniert wird. +ritual.bloodmagic.speedRitual.destructive.info=(Zerstörerisch) Verhindert, dass Kindmobs und Spieler transportiert werden. Spieler werden transportiert, wenn es mit Rachsüchtig kombiniert wird. +ritual.bloodmagic.animalGrowthRitual.vengeful.info=(Rachsüchtig) Verringert die Zeit zwischen Deckungen. +ritual.bloodmagic.animalGrowthRitual.steadfast.info=(Standhaft) Züchtet Erwachsene im Gebiet automatisch mit Gegenständen aus einer verbundenen Truhe. +ritual.bloodmagic.animalGrowthRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen in der Aura. +ritual.bloodmagic.animalGrowthRitual.destructive.info=(Zerstörerisch) Lässt Erwachsene, die sich länger nicht mehr gedeckt haben, auf Monster zulaufen und explodieren. +ritual.bloodmagic.animalGrowthRitual.corrosive.info=(Korrosiv) Nicht implementiert. + +ritual.bloodmagic.crystalSplitRitual.info=Spaltet eine ausgewachsene rohe Kristallgruppe in die Aspekte auf. +ritual.bloodmagic.fullStomachRitual.info=Entfernt Essen aus der verbundenen Truhe, um die Sättigung des Spielers zu füllen. +ritual.bloodmagic.interdictionRitual.info=Stößt alle Mobs im Gebiet weg vom Meisterritualstein. +ritual.bloodmagic.containmentRitual.info=Zieht alle Mobs im Gebiet zum Meisterritualstein. +ritual.bloodmagic.speedRitual.info=Stößt Spieler im Gebiet in Richtung des Rituals +ritual.bloodmagic.suppressionRitual.info=Verdrängt Flüssigkeiten im Ritualbereich - das Deaktivieren des Rituals bringt die Flüssigkeiten wieder zurück. +ritual.bloodmagic.expulsionRitual.info=Teleportiert Spieler, die weder Besitzer des Rituals sind, noch eine gebundene Blutkugel in einer verbundenen Truhe haben, weg vom Ritual. +ritual.bloodmagic.zephyrRitual.info=Nimmt in der nähe befindliche Gegenstände auf und platziert sie in der verbundenen Truhe. +ritual.bloodmagic.upgradeRemoveRitual.info=Entfernt alle Eigenschaften von der Lebenden Rüstung und gibt die dazugehörigen Thesen. Diese können benutzt werden, um sie wieder der Lebenden Rüstung hinzuzufügen. +ritual.bloodmagic.armourEvolveRitual.info=Erhöht das Maximum verfügbarer Upgrade-Punkte der Lebenden Rüstung auf 300. +ritual.bloodmagic.animalGrowthRitual.info=Erhöht die Wachstumsgeschwindigkeit nahegelegener Tiere, die noch nicht erwachsen sind. +ritual.bloodmagic.forsakenSoulRitual.info=Fügt Mobs im Gebiet Schaden zu. Wenn ein Mob stirbt, wird ein Kristall in der Kristlalreichweite wachsen. +ritual.bloodmagic.crystalHarvestRitual.info=Zerstört Kristalle dämonischen Willes in Reichweite. Die Erträge werden auf den Kristallen fallen gelassen. +ritual.bloodmagic.placerRitual.info=Nimmt sich Blöcke aus dem verbundenen Inventar und platziert sie in der Welt. +ritual.bloodmagic.fellingRitual.info=Zerstört alle Bäume (ihr Holz und Blätter) in einem Gebiet und platziert die Erträge in einem verbundenen Inventar. +ritual.bloodmagic.pumpRitual.info=Sucht im definierten Gebiet nach Flüssigkeiten. Entfernt und platziert die Flüssigkeiten nur in einem verbundenen Tank, wenn dieser bereits mindestens mit einem Eimer der Flüssigkeit gefüllt ist. +ritual.bloodmagic.altarBuilderRitual.info=Baut einen Altar aus den Materialien im verbundenen Altar. +ritual.bloodmagic.portalRitual.info=Erstellt ein Portalnetzwerk basierend auf dem aktivierenden Spieler und Blöcke, die sich in direkter Umgebung des Rituals befinden. Blöcke können nach aktivierung des Portals verändert werden, ohne das Netzwerk zu ändern und portale mit dem gleichen "Schlüssel" verbinden sich miteinander. +ritual.bloodmagic.meteorRitual.info=Konsumiert einen Gegenstand in Reichweite um einen Meteor voller Ressourcen vom Himmel zu beschwören, welcher direkt auf das Ritual fällt. + +ritual.bloodmagic.waterRitual.waterRange.info=(Wasser) Das Gebiet, in dem das Ritual Wasser-Quellblöcke platzieren wird. +ritual.bloodmagic.waterRitual.waterTank.info=(Roh) Der von dem Ritual mit Wasser zu befüllende Tank. +ritual.bloodmagic.lavaRitual.lavaRange.info=(Lava) Das Gebiet, in dem das Ritual Lava-Quellblöcke platzieren wird +ritual.bloodmagic.lavaRitual.lavaTank.info=(Roh) Der von dem Ritual mit Lava zu befüllende Tank. +ritual.bloodmagic.lavaRitual.fireFuse.info=(Rachsüchtig) Objekte in diesem Gebiet erhalten den "Fire Fuse"-Effekt. +ritual.bloodmagic.lavaRitual.fireResist.info=(Standhaft) Spieler in diesem Gebiet erhalten Feuerresistenz. +ritual.bloodmagic.lavaRitual.fireDamage.info=(Korrosiv) Objekte in diesem Gebiet, die immun gegen Feuerschaden sind, nehmen Schaden proportional zum vorhandenem Willen. +ritual.bloodmagic.greenGroveRitual.growing.info=(Wachstum) Das Gebiet, in dem das Ritual Pflanzen wachsen lässt. +ritual.bloodmagic.greenGroveRitual.leech.info=(Korrosiv) Objekte in diesem Gebiet wird Leben entzogen, um die Pflanzen wachsen zu lassen. +ritual.bloodmagic.greenGroveRitual.hydrate.info=(Standhaft) Blöcke in diesem gebiet werden zu Farmland bewässert und Samen in diesem Gebiet werden in der Nähe gepflanzt. +ritual.bloodmagic.jumpRitual.jumpRange.info=(Springen) Objekte in diesem Gebiet werden in die Luft gestoßen. +ritual.bloodmagic.wellOfSufferingRitual.altar.info=(Altar) In diesem Gebiet sucht das Ritual nach dem Blutaltar. Eine Veränderung wird das Gebiet entweder vergrößern oder verringern. +ritual.bloodmagic.wellOfSufferingRitual.damage.info=(Schaden) Dieses Gebiet definiert, wo Mobs schaden nehmen. Alle Mobs in diesem gebiet (außer dem Spieler) werden Schaden über Zeit nehmen. +ritual.bloodmagic.featheredKnifeRitual.altar.info=(Altar) In diesem Gebiet sucht das Ritual nach dem Blutaltar. Eine Veränderung wird das Gebiet entweder vergrößern oder verringern. +ritual.bloodmagic.featheredKnifeRitual.damage.info=(Schaden) In diesem Gebiet wird den Spielern Schaden durch das Ritual zugefügt. Spieler innerhalb des Gebietes nehmen Schaden über Zeit bis zum gesetzten Limit. +ritual.bloodmagic.regenerationRitual.heal.info=(Heilung) Objekte innerhalb dieses Gebietes bekommen einen Regenerationseffekt. +ritual.bloodmagic.regenerationRitual.vampire.info=(Vampirismus) Mobs innerhalb des Gebiets wird Leben entzogen um den Spieler im Heilgebiet zu heilen. +ritual.bloodmagic.harvestRitual.harvestRange.info=(Ernte) Pflanzen in diesem Gebiet werden geerntet. +ritual.bloodmagic.magneticRitual.placementRange.info=(Platzierung) Das Gebiet, in das das Ritual die gesammelten Erze platziert. +ritual.bloodmagic.crushingRitual.crushingRange.info=(Brecher) Die Blöcke, die von dem Ritual zerstört werden. +ritual.bloodmagic.crushingRitual.chest.info=(Truhe) Die Position der Truhe, in die die zerstörten Blöcke platziert werden. +ritual.bloodmagic.fullStomachRitual.fillRange.info=(Fütterung) Das Gebiet, in dem das Ritual nach Spielern sucht, die gefüttert werden. +ritual.bloodmagic.fullStomachRitual.chest.info=(Truhe) Die Position des Inventars, aus dem das Ritual Essen nimmt, um Spieler in Reichweite zu füttern. +ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Stoßen) Das Gebiet, in dem Mobs weggestoßen werden. Alle Mobs werden vom Meisterritualstein weggestoßen, egal wo sich das Gebiet befindet. +ritual.bloodmagic.containmentRitual.containmentRange.info=(Eindämmung) Das Gebiet, in dem Mobs herangezogen werden. Alle Mobs werden vom Meisterritualstein weggestoßen, egal wo sich das Gebiet befindet. +ritual.bloodmagic.speedRitual.sanicRange.info=(Geschwindigkeit) Alle Objekte in diesem Gebiet werden in die Richtung des Pfeils, der vom Ritual geformt wurde, katapultiert. +ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Verdrängung) Alle Flüssigkeiten im Gebiet werden verdrängt. +ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Vertreibung) Das Gebiet, in dem Spieler, die nicht Besitzer sind und keine Blutkugel in der Truhe haben, wegteleportiert werden. +ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Saugen) Gegenstände in diesem Gebiet werden in die verbundene Truhe gesaugt. +ritual.bloodmagic.zephyrRitual.chest.info=(Truhe) Die Position der Truhe, in die aufgenommene Gegenstände platziert werden. +ritual.bloodmagic.animalGrowthRitual.growing.info=(Wachstum) Tiere in diesem Gebiet werden wesentlich schneller wachsen. +ritual.bloodmagic.animalGrowthRitual.chest.info=(Truhe) Truhe mit Gegenständen, die für das Züchten verwendet werden, falls das Ritual dementsprechend verbessert wurde. +ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Kristall) Dämonenkristalle in diesem Gebiet wachsen schneller wenn ein Mob vom Ritual getötet wurde. +ritual.bloodmagic.forsakenSoulRitual.damage.info=(Schaden) Mobs in diesem Gebiet nehmen langsam schaden und lassen einen Kristall wachsen, wenn sie durch das Ritual sterben. +ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Kristall) Von allen Dämonenkristallgruppen wird ein Kristall abgebrochen, der Gegenstand wird in der Welt fallengelassen. Sollte in der Gruppe nur noch ein Kristall sein, wird dieser nicht abgebrochen. + +ritual.bloodmagic.ellipseRitual.info=Erzeugt eine hohle Spähre um das Ritual mit den Blöcken in der verbundenen Truhe. +ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Platzierung) Das Gebiet, in dem Blöcke platziert werden. Die Sphäre ist auf das Ritual zentriert - falls eine Seite kürzer als die andere ist, wird die Sphäre an der kürzeren Seite abgeschnitten. +ritual.bloodmagic.ellipseRitual.chest.info=(Truhe) Die Position des Inventars, von dem sich das Ritual die zu platzierenden Blöcke holt. + +ritual.bloodmagic.placerRitual.placerRange.info=(Platzierung) Das Gebiet, in das das Ritual die Blöcke platziert. +ritual.bloodmagic.placerRitual.chest.info=(Truhe) Die Position des Inventars, von dem sich das Ritual die zu platzierenden Blöcke holt. +ritual.bloodmagic.fellingRitual.fellingRange.info=(Fällung) Das Gebiet, in dem das Ritual nach Baumstämmen und Blättern sucht, um sie zu Fällen. +ritual.bloodmagic.fellingRitual.chest.info=(Truhe) Die Position des Inventars, in das die Gegenstände gesetzt werden, die vom Ritual gesammelt wurden. +ritual.bloodmagic.pumpRitual.pumpRange.info=(Pumpe) Das Gebiet, in dem das Ritual nach aufnehmbaren Flüssigkeiten sucht. + +ritual.bloodmagic.downgradeRitual.dialogue.bow.1=Also, Sterblicher... Du verlangst nach mehr Macht...? +ritual.bloodmagic.downgradeRitual.dialogue.bow.100=Natürlich wirst du wissen, dass alles einen Preis hat... Ich kann dir nicht einfach mehr Macht geben, ohne dass du etwas dafür zahlen musst... +ritual.bloodmagic.downgradeRitual.dialogue.bow.300=Wenn du mir ein Opfer darbringst, wirst du deine Wahrnehmung aufgeben, deine Pfeile werden auf große Distanz nicht mehr treffen. Die Kunst des Bogens wird dir nicht länger von Nutzen sein. +ritual.bloodmagic.downgradeRitual.dialogue.bow.500=Dafür werde ich das Potential deiner Rüstung noch weiter vergrößern, ihr Nutzen und Macht könnte noch weiter wachsen... Alles was du tun musst ist knien... und mir das richtige Opfer darbringen... +ritual.bloodmagic.downgradeRitual.dialogue.quenched.1=Sei gegrüßt, Sterblicher. Ich sehe, dass du mehr Macht erlangen möchtest... +ritual.bloodmagic.downgradeRitual.dialogue.quenched.100=Du musst dir im klaren sein, dass wenn das Glas voll ist, es geleert werden muss bevor es wieder befüllt werden kann. +ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=Somit schlage ich dir einen Handel vor: gebe die Fähigkeit zu trinken auf und ich werde dein Potential stark erhöhen. Ob du glaubst, dass der Handel gerecht ist, ist eine ganz andere Frage... +ritual.bloodmagic.downgradeRitual.dialogue.quenched.500=Nun knie, Sterblicher, und trinke von dem Kelch, den ich dir anbiete, da es dein letzter Schluck sein soll. +ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=Hmmm... was ist es, wochnach es dich wirklich lüstet...? +ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.100=Falls es Stärke jenseits der sterblichen Wesen ist, dann kann ich es dir nicht geben - allerdings hätte ich einen anderen Handel für dich... +ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.300=Ich kann die Fähigkeiten deiner Rüstung erweitern, sodass du neue Höhen erreichen sollst. Allerdings benötige ich auch etwas von dir: deine Kraft im Nahkampf. +ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.500=Falls du zustimmst, wirst du deine Waffen nicht mehr mit solch einer Zuversicht schwingen können und nur einen Bruchteil deines vorherigen Schadens anrichten. +ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.700=Also, die Wahl liegt bei dir: wirst du vor diesem Altar knien, oder wirst du weiterhin dein Schwert erheben? +ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.1=Vorsicht, Sterblicher, denn du wandelst auf dünnem Eis. +ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Anders als meine Brüder biete ich dir einen der aussichtslosesten Handel an, die sich jemand, der sich mit der Magie des eigenen Blutes brüstet, vorstellen kann. +ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Auch wenn deine Wunden noch heilen mögen, werden sie es doch nur langsam, fall du mein "Angebot" akzeptieren solltest und die Wunden der Schlacht werden dir noch mehr schmerzen. +ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=Also überlege gut, bevor du einen Handel eingehst, den du bereuen wirst. Denn auch wenn dein Glas leer sein sollte, wird es nahezu unmöglich sein, es wieder zu füllen... # Chat chat.bloodmagic.altarMaker.setTier=Setze Ausbaustufe auf: %d @@ -286,25 +758,141 @@ chat.bloodmagic.ritual.prevent=Das Ritual versucht, dir zu widerstehen. chat.bloodmagic.ritual.activate=Ein Energiestrom fließt durch das Ritual. chat.bloodmagic.ritual.notValid=Du fühlst, dass die Runen nicht richtig eingerichtet sind... -chat.bloodmagic.livingArmour.upgrade.poisonRemove=Du fühlst dich schon wieder besser. -chat.bloodmagic.livingArmour.newUpgrade=Upgrade erworben! +chat.bloodmagic.livingArmour.upgrade.poisonRemove=Du fühlst dich schon wieder besser! +chat.bloodmagic.livingArmour.upgrade.fireRemove=&6Ein kühles Gefühl kommt hervor, mit dem das Brennen nachlässt. +chat.bloodmagic.livingArmour.upgrade.grimReaper=&6Eine schattenhafte Macht zieht dich vom Rande des Todes zurück! +chat.bloodmagic.livingArmour.newUpgrade=&4Upgrade erworben! + +chat.bloodmagic.routing.remove=Entferne gespeicherte Position +chat.bloodmagic.routing.set=Setze Knotenposition +chat.bloodmagic.routing.link.master=Knoten mit Hauptknoten verbunden! +chat.bloodmagic.routing.link=Knoten miteinander verbunden. + +chat.bloodmagic.altar.comp.glowstone=ein Glowstone-Block +chat.bloodmagic.altar.comp.bloodstone=ein großer Blutsteinziegel +chat.bloodmagic.altar.comp.beacon=ein Leuchtfeuer +chat.bloodmagic.altar.comp.bloodrune=eine Blutrune +chat.bloodmagic.altar.comp.crystal=ein Block, noch nicht implementiert +chat.bloodmagic.altar.comp.notair=ein fester Block + +chat.bloodmagic.altar.nextTier=Für die nächste Ausbaustufe des Altars fehlt %s an %s. + +chat.bloodmagic.mimic.potionSet=Trankfalle wurde gesetzt. +chat.bloodmagic.mimic.potionRemove=Trankfalle wurde deaktiviert. +chat.bloodmagic.mimic.potionInterval.up=Trankintervall wurde erhöht auf: %d Ticks. +chat.bloodmagic.mimic.potionInterval.down=Trankintervall wurde verringert auf: %d Ticks. +chat.bloodmagic.mimic.detectRadius.up=Spieler-Erfassungsradius wurde erhöht auf: %d Blöcke. +chat.bloodmagic.mimic.detectRadius.down=Spieler-Erfassungsradius wurde verringert auf: %d Blöcke. +chat.bloodmagic.mimic.potionSpawnRadius.up=Trankerzeugungsradius wurde erhöht auf: %d Blöcke. +chat.bloodmagic.mimic.potionSpawnRadius.down=Trankerzeugungsradis wurde verringert auf: %d Blöcke. + +# entity +entity.bloodmagic.SentientSpecter.name=Empfindsamer Geist +entity.bloodmagic.Mimic.name=Mimik + +# Commands +commands.bloodmagic.error.arg.invalid=Ungültige Argumente +commands.bloodmagic.error.arg.missing=Nicht genug Argumente +commands.bloodmagic.error.arg.player.missing=Du musst einen Spieler für diese Aktion bestimmen. +commands.bloodmagic.error.404=Befehl nicht gefunden! +commands.bloodmagic.error.unknown=Unbekannter Befehl! +commands.bloodmagic.error.perm=Du hast keine Berechtigung, diesen Befehl zu nutzen! + +commands.bloodmagic.success=Erfolgreich ausgeführt + +commands.bloodmagic.format.help=%s - %s +commands.bloodmagic.format.error=%s - %s + +commands.bloodmagic.help.usage=/bloodmagic help +commands.bloodmagic.help.help=Zeigt hilfe für den Befehl "/bloodmagic" an. + +commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] Spieler [amount] +commands.bloodmagic.network.help=LP Netzwerk Befehle +commands.bloodmagic.network.syphon.help=Zieht den gegebenen Wert an LP vom LP-Netzwerk des gegebenen Spielers ab. +commands.bloodmagic.network.syphon.success=Erfolgreich %d LP von %s abgezogen. +commands.bloodmagic.network.add.help=Fügt den gegebenen Wert an LP dem LP-Netzwerk des gegebenen Spielers zu. Folgt normalen LP Regeln. +commands.bloodmagic.network.add.success=Erfolgreich %d LP zu %ss LP-Netzwerk hinzugefügt. +commands.bloodmagic.network.set.help=Setzt die LP des gegebenen Spielers auf einen bestimmten Wert. +commands.bloodmagic.network.set.success=Erfolgreich %ss LP-Netzwerk auf %d LP gesetzt. +commands.bloodmagic.network.get.help=Zeigt an, wie viel LP ein Spieler in seinem Netzwerk hat. +commands.bloodmagic.network.fill.help=Füllt das LP-Netzwerk des Spielers auf %d. +commands.bloodmagic.network.fill.success=%ss LP-Netzwerk erfolgreich befüllt. +commands.bloodmagic.network.cap.help=Füllt das LP-Netzwerk des Spielers bis zu dem Maximum, das dessen höchstes Blutkugel speichern kann. +commands.bloodmagic.network.cap.success=%ss LP-Netzwerk erfolgreich gefüllt. + +commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [Spieler] +commands.bloodmagic.bind.help=Versucht, den gehaltenen Gegenstand zu binden bzw. die Bindung zu entfernen. +commands.bloodmagic.bind.success=Erfolgreich gebunden +commands.bloodmagic.bind.remove.success=Bindung erfolgreich entfernt + +commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] Spieler [tier] +commands.bloodmagic.orb.help=Setzt oder zeigt die Blutkugel-Ausbaustufe des Spielers. + +commands.bloodmagic.bind.usage=/bind +commands.bloodmagic.bind.success=Gegenstand erfolgreich gebunden! +commands.bloodmagic.bind.failed.noPlayer=Kein Spieler angegeben +commands.bloodmagic.bind.failed.alreadyBound=Gegenstand ist schon gebunden; benutze /unbind um die Bindung zu entfernen +commands.bloodmagic.bind.failed.notBindable=Gegenstand kann nicht gebunden werden +commands.bloodmagic.unbind.usage=/unbind +commands.bloodmagic.unbind.success=Bindung erfolgreich entfernt. +commands.bloodmagic.unbind.failed.notBindable=Bindung kann nicht entfernt werden. +commands.bloodmagic.soulnetwork.usage=/soulnetwork [Menge] +commands.bloodmagic.soulnetwork.add.success=Erfolgreich %dLP zu %ss LP-Netzwerk hinzugefügt! +commands.bloodmagic.soulnetwork.subtract.success=Erfolgreich %dLP von %ss LP-Netzwerk entfernt! +commands.bloodmagic.soulnetwork.fill.success=Erfolgreich %ss LP-Netzwerk gefüllt! +commands.bloodmagic.soulnetwork.empty.success=Erfolgreich %ss LP-Netzwerk geleert! +commands.bloodmagic.soulnetwork.get.success=In %ss LP-Netzwerk sind %dLP! +commands.bloodmagic.soulnetwork.noPlayer=Kein Spieler angegeben +commands.bloodmagic.soulnetwork.noCommand=Kein Befehl angegeben +commands.bloodmagic.soulnetwork.notACommand=Das ist kein gültiger Befehl +commands.bloodmagic.soulnetwork.fillMax.success=%ss LP-Netzwerk erfolgreich zu deren Blutkugel-Maximum befüllt! +commands.bloodmagic.soulnetwork.create.success=%ss LP-Netzwerk erfolgreich erstellt! (Blutkugel-Ausbaustufe: %d) + +# GUI +tile.bloodmagic.inputNode.name=Eingangsknoten +tile.bloodmagic.outputNode.name=Ausgangsknoten + +# Keybinds +bloodmagic.keybind.open_holding=Öffne Siegel der Aufbewahrung +bloodmagic.keybind.cycle_holding_pos=Siegelrotation (+) +bloodmagic.keybind.cycle_holding_neg=Siegelrotation (-) # JustEnoughItems jei.bloodmagic.recipe.altar=Blutaltar -jei.bloodmagic.recipe.binding=Bindungsritual +jei.bloodmagic.recipe.binding=Alchemische Anordnung (Bindung) jei.bloodmagic.recipe.alchemyArrayCrafting=Alchemische Anordnung jei.bloodmagic.recipe.soulForge=Höllenfeuerschmiede +jei.bloodmagic.recipe.alchemyTable=Alchemietisch +jei.bloodmagic.recipe.armourDowngrade=Sühne (Ritual) jei.bloodmagic.recipe.requiredLP=LP: %d jei.bloodmagic.recipe.requiredTier=Ausbaustufe: %d -jei.bloodmagic.recipe.minimumSouls=Minimum: %d Wille -jei.bloodmagic.recipe.soulsDrained=Verbraucht: %d Wille +jei.bloodmagic.recipe.consumptionRate=Verbrauch: %d LP/t +jei.bloodmagic.recipe.drainRate=Ablauf: %d LP/t +jei.bloodmagic.recipe.minimumSouls=Minimum: %1$..2f Wille +jei.bloodmagic.recipe.soulsDrained=Verbraucht: %1$..2f Wille +jei.bloodmagic.recipe.lpDrained=Verbraucht: %.d LP +jei.bloodmagic.recipe.ticksRequired=Zeit: %.d Ticks -jei.bloodmagic.desc.altarBuilder=Ein Item zum Testen. Nur im Kreativmodus erhältlich.\n\nShift+Rechtsklick um die Ausbaustufe zu ändern. Rechtsklicke auf einen Altar, um den Bau zu starten.\n\nZerstöre einen Altar mit ihm in der Hand, um alles abzubauen. +jei.bloodmagic.desc.altarBuilder=Ein Gegenstand zum Testen. Nur im Kreativmodus erhältlich.\n\nShift+Rechtsklick um die Ausbaustufe zu ändern. Rechtsklicke auf einen Altar, um den Bau zu starten.\n\nZerstöre einen Altar mit ihm in der Hand, um alles abzubauen. jei.bloodmagic.desc.demonicWill=Prägung eines dämonischen Wesens gebunden an eine Kreatur.\n\nKann durch das Töten eines Monsters mit einer empfindsamen Waffe, oder das Werfen einer Falle und Umbringen während as weiße Partikel aussendet, gesammelt werden. # WAILA waila.bloodmagic.sneak=&oSchleiche für Info +waila.bloodmagic.array.reagent=Reagenz: %s +waila.bloodmagic.array.catalyst=Katalysator: %s option.bloodmagic.bypassSneak=Umgehe Schleichen option.bloodmagic.bloodAltar=Blutaltar option.bloodmagic.ritualController=Ritualsteine option.bloodmagic.teleposer=Teleposer +option.bloodmagic.array=Alchemische Anordnung + +# Thaumcraft +tc.research_category.BLOODMAGIC=Sanguine Arcana + +# Thaumcraft Research +bloodmagic.research_name.BLOODMAGIC=Blood Magic +bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana +bloodmagic.research_page.BLOODMAGIC.1=Das Reich der Blutmagier schien immer schon eine etaws einsamere und... "individuelle" Kunst zu sein... Blutmagier waren immer schon sehr zurückgezogen und manchmal auch etwas verrückt zu sein. Allerdings haben die Mächte der Selbstopferung Nutzen jenseits der Sicht eines normalen Blutmagiers. Tatsächlich ist es ziemlich offensichtlich, dass es schließlich doch einen Nutzen in Thaumaturgie hat! + +# Buttons +button.bloodmagic.tooltip.fill=Fülle Netzwerk diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index a8ec51ae..5545c19c 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -214,7 +214,6 @@ tile.bloodmagic.rune.orb.name=Rune of the Orb tile.bloodmagic.rune.acceleration.name=Acceleration Rune tile.bloodmagic.rune.charging.name=Charging Rune - tile.bloodmagic.ritualStone.blank.name=Ritual Stone tile.bloodmagic.ritualStone.water.name=Ritual Stone of Water tile.bloodmagic.ritualStone.fire.name=Ritual Stone of Fire @@ -644,7 +643,7 @@ ritual.bloodmagic.crushingRitual.info=Breaks blocks within its crushing range an ritual.bloodmagic.crushingRitual.destructive.info=(Destructive) Blocks are broken down forcefully: all blocks broken are affected by Fortune III. ritual.bloodmagic.crushingRitual.steadfast.info=(Steadfast) Causes all blocks that are broken to be picked up with silk touch. Overrides Fortune where applicable. ritual.bloodmagic.crushingRitual.corrosive.info=(Corrosive) All blocks are broken to be processed with a form of cutting fluid. Overrides Silk Touch where applicable. -ritual.bloodmagic.crushingRitual.vengeful.info=(Vengeful) Compresses the inventory on successful opperation. Currently only does one compression per operation. +ritual.bloodmagic.crushingRitual.vengeful.info=(Vengeful) Compresses the inventory on successful operation. Currently only does one compression per operation. ritual.bloodmagic.crushingRitual.default.info=(Raw) Increases the speed of the ritual based on total Will. ritual.bloodmagic.greenGroveRitual.corrosive.info=(Corrosive) Entities within range are attacked by nearby plants, leeching away their life. ritual.bloodmagic.greenGroveRitual.default.info=(Raw) Increases the speed of all of the ritual operations depending on the total Will in the Aura. @@ -673,8 +672,8 @@ ritual.bloodmagic.speedRitual.info=Launches players within its range in the dire ritual.bloodmagic.suppressionRitual.info=Suppresses fluids within its range - deactivating the ritual returns the fluids back to the world. ritual.bloodmagic.expulsionRitual.info=Expels players from its range that are neither the owner nor have a bound blood orb in the chest on top of the master ritual stone. ritual.bloodmagic.zephyrRitual.info=Picks up items within its range and places them into the linked chest. -ritual.bloodmagic.upgradeRemoveRitual.info=Undocumented. -ritual.bloodmagic.armourEvolveRitual.info=Undocumented. +ritual.bloodmagic.upgradeRemoveRitual.info=Removes all upgrades (and downgrades) from your Living Armor and gives you the corresponding Upgrade (and Downgrade) Tomes. These Tomes can be used to be applied to your Living Armor again. +ritual.bloodmagic.armourEvolveRitual.info=Increases the amount of maximum Upgrade Points on your Living Armor to 300. ritual.bloodmagic.animalGrowthRitual.info=Increases the maturity rate of baby animals within its range. ritual.bloodmagic.forsakenSoulRitual.info=Damages mobs within its damage range and when the mob dies a demon crystal within its crystal range will be grown. ritual.bloodmagic.crystalHarvestRitual.info=Breaks Demon Will crystal clusters within its range, dropping the results on top of the crystals. @@ -686,6 +685,7 @@ ritual.bloodmagic.portalRitual.info=Creates a portal network based on the activa ritual.bloodmagic.meteorRitual.info=Consumes an item inside of its item range to summon a meteor full of resources from the sky, aimed directly at the ritual. ritual.bloodmagic.waterRitual.waterRange.info=(Water) The area that the ritual will place water source blocks. +ritual.bloodmagic.waterRitual.waterTank.info=(Raw) The tank that the ritual will place water into. ritual.bloodmagic.lavaRitual.lavaRange.info=(Lava) The area that the ritual will place lava source blocks. ritual.bloodmagic.lavaRitual.lavaTank.info=(Raw) The tank that the ritual will place lava into. ritual.bloodmagic.lavaRitual.fireFuse.info=(Vengeful) Entities in this range are afflicted by Fire Fuse. @@ -699,7 +699,7 @@ ritual.bloodmagic.wellOfSufferingRitual.altar.info=(Altar) This range defines th ritual.bloodmagic.wellOfSufferingRitual.damage.info=(Damage) This defines where the ritual will damage a mob. All mobs inside of this range (except for players) will receive damage over time. ritual.bloodmagic.featheredKnifeRitual.altar.info=(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region. ritual.bloodmagic.featheredKnifeRitual.damage.info=(Damage) This defines where the ritual will damage a player. Players inside of this range will receive damage over time up to the specified limit. -ritual.bloodmagic.regenerationRitual.heal.info=(Healing) Mobs within this range will receive a regeneration buff. +ritual.bloodmagic.regenerationRitual.heal.info=(Healing) Entities within this range will receive a regeneration buff. ritual.bloodmagic.regenerationRitual.vampire.info=(Vampirism) Mobs within this range have their health syphoned to heal players in the Healing range. ritual.bloodmagic.harvestRitual.harvestRange.info=(Harvesting) Plants within this range will be harvested. ritual.bloodmagic.magneticRitual.placementRange.info=(Placement) The range that the ritual will place the grabbed ores into. @@ -711,7 +711,7 @@ ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Push) The area of t ritual.bloodmagic.containmentRitual.containmentRange.info=(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is. ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Suppress) All liquids within the range are suppressed. -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) +ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) The area from which players that are not owner or have an orb in the chest will be teleported away from. ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Suction) Items within this range will be sucked into the linked chest. ritual.bloodmagic.zephyrRitual.chest.info=(Chest) The location of the inventory that the ritual will place the picked up items into. ritual.bloodmagic.animalGrowthRitual.growing.info=(Growth) Animals within this range will grow much faster. @@ -736,9 +736,9 @@ ritual.bloodmagic.downgradeRitual.dialogue.bow.300=If you lay an offering before ritual.bloodmagic.downgradeRitual.dialogue.bow.500=But in return, I will unlock your armour so that it may grow even further... All you have to do is kneel before this altar with the correct offering... ritual.bloodmagic.downgradeRitual.dialogue.quenched.1=Fufufu... Greetings. I see that you wish to become more powerful. ritual.bloodmagic.downgradeRitual.dialogue.quenched.100=You must be fully aware that when one's cup becomes full, it invariably has to empty once more to be filled again. -ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=As such, I offer you a deal: by forsaking one's ability to drink, I shall grant you a vast increase to your potential. Wether this is a deal you think is worth taking is another matter entirely... +ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=As such, I offer you a deal: by forsaking one's ability to drink, I shall grant you a vast increase to your potential. Whether this is a deal you think is worth taking is another matter entirely... ritual.bloodmagic.downgradeRitual.dialogue.quenched.500=So kneel, mortal, and drink from this cup that I offer to you, for it may be your last drink. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=Hmmm... What is it that you truely desire? +ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=Hmmm... What is it that you truly desire? ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.100=If it is strength beyond mortal men, then I cannot provide that - instead, I can offer you a different deal... ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.300=I can expand the capabilities of your armour, allowing you to achieve greater heights. However, I will need something from you in return: your strength in physical combat. ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.500=By agreeing to this, you will no longer be able to swing a weapon with as much certainty, only able to do a fraction of the damage you could before. @@ -901,4 +901,4 @@ bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana bloodmagic.research_page.BLOODMAGIC.1=The realm of the Blood Magics has always appeared to be a more solitary and "individual" art with blood mages being notoriously reclusive and a bit insane at times. However, the powers of self-sacrifice and life essence have uses even beyond a normal blood mage's sight, in fact, it is quite apparent that it may have some uses in thaumaturgy after all! # Buttons -button.bloodmagic.tooltip.fill=Fill network \ No newline at end of file +button.bloodmagic.tooltip.fill=Fill network diff --git a/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang b/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang new file mode 100644 index 00000000..3715be0f --- /dev/null +++ b/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang @@ -0,0 +1,270 @@ +# Book Information +guide.bloodmagic.title=Sanguine Scientiem +guide.bloodmagic.display=Sanguine Scientiem +guide.bloodmagic.author=Blood Magic +guide.bloodmagic.welcome=Blood Magic + +# Page Information +guide.bloodmagic.page.bloodAltar=Blutaltar Rezept +guide.bloodmagic.page.soulForge=Höllenfeuerschmiede Rezept +guide.bloodmagic.page.tier=Ausbaustufe: %d +guide.bloodmagic.page.lp=LP: %d +guide.bloodmagic.page.minimumWill=Minimaler Wille: %f +guide.bloodmagic.page.drainedWill=Verbrauchter Wille: %f +guide.bloodmagic.shapelessOrb=Formloses Blutkugel-Rezept +guide.bloodmagic.shapedOrb=Striktes Orb-Rezept +guide.bloodmagic.page.alchemyArray=Alchemische Anordnung + + +# Categories +guide.bloodmagic.category.architect=Der Architekt +guide.bloodmagic.category.ritual=Der Ritualmeister +guide.bloodmagic.category.demon=Das Dämonenkind +guide.bloodmagic.category.spell=Der Kriegsmagier +guide.bloodmagic.category.alchemy=Der Alchemist + +# Ritual Master Entries +guide.bloodmagic.entry.ritual.intro=Einführung +guide.bloodmagic.entry.ritual.basics=Grundlagen der Ritualmagie +guide.bloodmagic.entry.ritual.ritualStone=Ritualsteine +guide.bloodmagic.entry.ritual.masterRitualStone=Haupt-Ritualstein +guide.bloodmagic.entry.ritual.activationCrystal=Aktivierungskristalle +guide.bloodmagic.entry.ritual.diviner=Die Ritualrute +guide.bloodmagic.entry.ritual.fullSpring=Ritual der vollen Quelle +guide.bloodmagic.entry.ritual.lava=Gesang des Nethers +guide.bloodmagic.entry.ritual.greenGrove=Ritual des grünen Hains +guide.bloodmagic.entry.ritual.magnetism=Ritual des Magnetismus +guide.bloodmagic.entry.ritual.crusher=Ritual des Brechers +guide.bloodmagic.entry.ritual.highJump=Ritual des hohen Sprungs +guide.bloodmagic.entry.ritual.speed=Ritual der Geschwindigkeit +guide.bloodmagic.entry.ritual.wellOfSuffering=Quelle des Leidens +guide.bloodmagic.entry.ritual.featheredKnife=Ritual der gefederten Klinge +guide.bloodmagic.entry.ritual.regen=Ritual der Regeneration +guide.bloodmagic.entry.ritual.harvest=Ritual der Mondernte +guide.bloodmagic.entry.ritual.interdiction=Ritual der Verbietung +guide.bloodmagic.entry.ritual.containment=Ritual der Eindämmung +guide.bloodmagic.entry.ritual.suppression=Kuppel der Unterdrückung +guide.bloodmagic.entry.ritual.expulsion=Aura der Vertreibung +guide.bloodmagic.entry.ritual.zephyr=Ruf des Zephyrs +guide.bloodmagic.entry.ritual.laying=Füllung der Grube +guide.bloodmagic.entry.ritual.timberman=Kahlschlag des Holzfällers +guide.bloodmagic.entry.ritual.meteor=Zeichen des fallenden Turms +guide.bloodmagic.entry.ritual.downgrade=Sühne der belasteten Seele +guide.bloodmagic.entry.ritual.crystalSplit=Resonanz des facettierten Kristalls + +# Ritual Master Entry Text +guide.bloodmagic.entry.ritual.intro.info=Guten Abend. Mein Name ist Magus Arcana. Ich habe über die Jahre viele Gestalten angenommen: ein Dieb und ein Wächter, ein Zauberer und ein Krieger, ein umherwandernder Nomade und sogar ein Politiker. Der Titel, den ich dieser Tage trage ist einer, der sich dem Verständnis der meisten Leute entzieht, bei dessen bloßer Erwähnung Bilder von Brutalität hervorkommen, welche in manchen Fällen wohl verdient, in vielen anderen jedoch schlicht fehlgeleitet sind. Natürlich rede ich davon, ein Blutmagier zu sein, doch meine Freunde nennen mich einfach Magus, während meine Feine mich als den Ritualmeister bezeichnen.\n\tMeine Schüler bedrängen mich nun schon seit Monaten, versuchen mich zu überzeugen, dass ich all meine Abenteuer niederschreibe, in die ich verwickelt war, um sie unter den aufstrebenden Magiern zu verteilen. Ich hatte mich geweigert, aber Tiberius hat es am besten in Worte gefasst: "Auch wenn du selbst nicht den Wert darin sehen kannst, ist es für spätere Generationen doch unbezahlbar, die Feinheiten eines Handwerks von jemanden zu hören, der dieses gemeistert hat. Es spielt keine Rolle wie genau es jemand anderes wiedergibt, wenn man nicht absolutes Vertrauen in die Quelle hat, könnte der Goldsand auch nichts weiter als Schwefel sein." Man konnte sehen, dass er sich zu der Zeit ein wenig mit Alchemie beschäftigt hat, aber da er seit langer Zeit mein erster Student war, tendiere ich dazu, seine Meinung zu respektieren.\n\tNun denn, angehender Blutmagier, der du das Arkane studierst, dass viele noch nicht vollständig begreifen, leihe mir deine Aufmerksamkeit für diese Worte, die es wert sind, befolgt zu werden: das Gebiet, dass du studierst hat viele Aspekte und ohne wohl überlegte Planung wirst du deine Werkzeuge als unzureichend empfinden. Deswegen solltest du sicher stellen, dass du dieses Buch oft zu rate ziehst - Ich habe einen Folianten mit vielen Verzauberungen versehen, sodass es, wann auch immer ich etwas in meiner Meister-Kopie schreiben sollte, sich die Worte für dich verändern werden.\n\tNun lehne dich zurück, entspanne dich und genieße die Lehren eines sehr alten Mannes. Du mögest mehr lernen, als du erhofft hast. +guide.bloodmagic.entry.ritual.basics.info=Moderne Rituale sind sehr verschieden von denen, die vor Jahrtausenden durchgeführt wurden. Es gab eine Zeit, in der die Leute Arkane Konstrukte aus Staub in den Boden zeichnen und so lange darum tanzen würden, bis sie bekommen haben, was sie wollten. Ich Erinnere mich sogar an eine Kräuterhexe, die Energie aus ihrem Garten gezogen hat. Ich habe sie ausgelacht, bis sie ihre Eule auf mich hetzte. \n\tDie Rituale, die Blutmagier nutzen benötigen die genaue Anordnung von gezeichneten Steinen, um vom Magier hineingepumpte Energie zu fokussieren und transformieren. Eines Tages wühlte mein Lehrling Tiberius durch meine alten Artefakte, die ich über die Jahre beschafft hatte und seitdem im Kleiderschrank seines nun neuen Zimmers lagen. Dort war eine Phiole flüssigem Etheriums, die ich seit Jahren nicht angefasst habe (Ich wollte darauf zurückkommen, allerdings hatte ich leider keine Zeit), sowie eine Kristallkugel, welche scheinbar immer "Dienstag" sagt, wenn man durch sie blickt. Als eine der Kisten mit der Aufschrift "Runenstaub" umgestoßen wurde, ist ein kleiner roter Edelstein herausgefallen und gegen Tiberius Fuß gestoßen. Sofort strahlte der Stein in einem grellen, rubinroten Licht das mit dem Staub in der Truhe, die er trug, reagierte.\n\tSelbstverständlich verursachte das eine Explosion. Die unfokussierte Energie, die Tiberius unvermeidbar durch den Edelstein freigesetzt hat, sprühte Funken auf den runischen Staub und die Steine um ihn herum und ohne eine Möglichkeit, die Energie einzudämmen, hat sie sich einfach ausgedehnt. Nach ein paar Tagen auf der Krankenstation begannen Tiberius und ich zu arbeiten. Durch eine Mischung aus mehreren schlaflosen Nächten und einer kräftigen Portion Koffein (ich muss mich wirklich bei Herr Spieler für die Kaffeeversorgung bedanken, ich begrüße Ihre Bemühungen für ein wacheres Morgen! Durch unser Experimentieren lernten wir, dass wir vier verschiedene Dinge brauchten: Wir brauchten einen Haufen Ritualsteine, die in einem bestimmten Muster um einen Bereich gelegt wurden, ein paar verschiedene Tinten, die auf die Ritualsteine aufgetragen wurden, um das Muster weiter zu spezifizieren, einen zentralen Ritualstein, der als zentraler Kraftkanal fungiert, und einen Kristall, der das Ritual aktiviert. Ich denke, es ist das Beste, wenn wir nacheinander darüber reden. +guide.bloodmagic.entry.ritual.ritualStone.info.1=Der Ritualstein dient als einfaches Behältnis für magische Energie, formt sie und leitet sie je nach Konfiguration des Steins weiter. Wenn du anfängst, gibt es fünf verschiedene Steine, zu denen du Zugang hast: Leer (der Grundstein ohne Markierungen), Wasser, Feuer, Luft und Erde. Jedes einzelne Ritual wird eine Reihe davon haben, und je nachdem, wie sie um den Meisterritualstein herum angeordnet sind, wird die Gesamtwirkung unterschiedlich sein. +guide.bloodmagic.entry.ritual.ritualStone.info.2=Um die richtigen Symbole auf die Ritualsteine zu schreiben, benötigst du einen Satz Beschriftungswerkzeuge. Seitdem habe ich eine Methode entwickelt, mit der man die richtigen Farben leichter auf die Ritualsteine auftragen und sie in die richtige Konfiguration bringen kann, aber wenn man dies manuell tun möchte, kann man diese Werkzeuge benutzen. Wenn du einen Ritualstein mit einem der Beschriftungswerkzeuge in der Hand aktivierst (Rechtsklick auf den Stein), tragst du etwas Tinte auf den Stein auf und änderst ihn in den gleichen Typ wie das Werkzeug. In den frühen Stufen habst du nur Zugang zu den vier Grundfarben, aber wenn Sie stärker werden, stehen dir mehr Werkzeuge zur Verfügung. +guide.bloodmagic.entry.ritual.masterRitualStone.info=Wie bei den meisten Arten der Magie wird die Wirkung des Rituals ohne eine leitende Kraft entweder unkontrollierbar werden oder einfach nicht funktionieren. Um die Rituale zu kontrollieren, ist also ein Haupt-Ritualstein erforderlich (ich kürze dies in meinen Notizen normalerweise mit "HRS" ab, aber es in der Öffentlichkeit zu sagen, ist etwas unangenehm. "Ich brauche mehr HRS bitte!"). Der HRS nimmt die Macht aus dem LP-Netzwerk des Besitzers auf und treibt sie durch die Ritualsteine und führt so das Ritual durch. Das LP-Netzwerk an einen großen Stein zu binden, den wir nicht in unseren Händen halten, erwies sich als etwas knifflig. Ich habe es einmal geschafft, indem ich auf den Stein in der Lotusstellung meditierte, meine Kraft durch den Stein konzentrierte und versuchte, die Ranken meines Netzwerks mit dem Inneren des Rituals zu verbinden. Obwohl ich es für ein paar Minuten zum Laufen gebracht habe, war alles, was mir wirklich zugesprochen wurde, eine nasse Hose, da sich Wasser auf den Ritualsteinen verdichtete. Ich habe gelernt, über keines meiner Experimente mehr zu meditieren. +guide.bloodmagic.entry.ritual.activationCrystal.info.1=Anstatt eine Stunde lang zu warten, um das Ritual durch meditieren zu aktivieren, nahmen wir den roten Edelstein, der ursprünglich aus der Schachtel fiel, und begannen ihn zu analysieren. Tiberius war sich sicher, dass er die Fähigkeit hatte, "Verbindungen zwischen dem körperlichen Bereich unserer Realität und der unkörperlichen Essenz, die das manifestierte LP-Netzwerk ist, herzustellen". Manchmal frage ich mich, ob es eine gute Idee war, ihn zu meinem Lehrling zu machen, aber in Zeiten wie diesen sehe ich sein Talent für die arkaneren Aspekte der Magie. Oh, ich sollte wohl schreiben, was er auf Deutsch meinte: Indem wir diesen Kristall benutzen, könnten wir unsere LP-Netzwerke mit dem Haupt-Ritualstein verbinden, um ihn mit Energie zu versorgen. +guide.bloodmagic.entry.ritual.activationCrystal.info.2=So hatten wir einen schwachen Aktivierungskristall und ein Mittel, um seine Struktur wiederherzustellen. Der Hauptbestandteil des Kristalls ist ein weiterer Kristall, der mit meinem LP-Netzwerk verbunden werden kann: ein Lavakristall. Dann kann der Blutaltar, indem er schnell einige Anweisungen auf die Oberfläche des Kristalls schreibt, den Rest der Arbeit erledigen, um ihn in einen Aktivierungskristall umzuwandeln. Natürlich muss dieser Kristall an das LP-Netzwerk des Benutzers gebunden sein, um zu funktionieren. Wenn die Steine des Rituals richtig um den HRS gelegt sind, sollte der Benutzer den Aktivierungskristall an den HRS berühren und genügend Energie ausstoßen, um das betreffende Ritual zu starten. Wenn du genug LP in deinem LP-Netzwerk hast, wird das Ritual aktiviert. Falls du nicht genug LP hast, oder die Steine nicht richtig ausgelegt sind, wird das Ritual einfach nicht aktiviert und es entstehen keine LP-Kosten. +guide.bloodmagic.entry.ritual.diviner.info.1=Nachdem ich die Größe und Auslegung vieler Rituale erkannt hatte, fand ich es etwas lästig, ständig meine Notizen zu konsultieren, um die Rituale aufzubauen. Deshalb habe ich daran gearbeitet, einen Apparat zu entwickeln, der es jedem erlaubt, die Steine durch einfache Gesten und Bewegungen einfach in die richtige Position zu bringen. Ich habe diesen Eintrag chronologisch weiter oben auf der Liste platziert, weil es für die Leute am besten ist, von diesem Gegenstand zu lernen, bevor sie mit der eigentlichen Konstruktion von Ritualen beginnen. Sonst finden sie vielleicht heraus, dass sie nicht alles haben, was sie brauchen, oder sie beschwören einen Meteoriten aus der Hölle statt einer frischen Flasche Quellwasser. +guide.bloodmagic.entry.ritual.diviner.info.2=Die Ritualrute ist im Wesentlichen eine Enzyklopädie für Rituale. Indem du durch die Rute blätterst (Shift-Linksklick und Shift-Rechtsklick), kannst du ein anderes Ritual aus seinem Wissensspeicher auswählen. Der Blick in die Ritualrute sagt dir auch einige einfache Informationen über das Ritual. Wenn du Ritualsteine bei dir trägst und den HRS mit der Ritualrute berührst (Rechtsklick), kannst du einen Stein für das Ritual platzieren, das du bauen willst. Wenn du das oft genug machst, wirst du ein vollendetes Ritual haben! +guide.bloodmagic.entry.ritual.fullSpring.info=Vor ein paar Jahren kam ein reisender Händler in das Dorf in der Nähe meines Hauses und verkaufte seine Waren an alle, die bereit waren, sich von ihrer Münze zu trennen. Zu dieser Zeit gab es eine Dürre und die Ernten starben, so dass der Händler einen silbernen Talisman mit einem blauen Edelstein in seinem Inneren hervorbrachte. "Das, meine Freunde", sagte er mit großem Eifer, "wird dafür sorgen, dass eure Flüsse nicht austrocknen! Mit Hilfe der Alchemie kann ich Wasser aus der Luft hervorbringen!" \n\tUnglücklicherweise für das Dorf schien es, dass der Edelstein ein einfaches Stück Saphir war, und bevor jemand merkte, dass sie ausgetrickst wurden, war er schon einige Meilen entfernt. Ich neige dazu, nicht in die Angelegenheiten des Dorfes einzugreifen, weil sie meine Magie nicht mögen, aber in diesem Fall habe ich eine Ausnahme gemacht. Nach einem netten Gespräch mit dem "Alchemisten" habe ich einige Stunden in der Nähe der Bewässerungskanäle meditiert. Durch die Kondensation des Wasserdampfes in der Luft gelang es mir, genügend Wasser zu erzeugen, um die Pflanzen bis zum nächsten Niederschlag zu bewässern. Das war nicht gerade eine effiziente Methode, und ich war für die nächsten Tage erschöpft, und ich benutzte etwas von dem Wasser aus dem Kanal, um mich zu rehydrieren. Durch die Zufuhr einer kleinen Energiemenge in das Ritual kondensiert es die Feuchtigkeit in der Luft um es herum, um eine Wasserquelle auf dem Haupt-Ritualstein zu erzeugen. Die Kosten für die Aktivierung des Rituals sind ziemlich gering, und der Unterhaltsaufwand ist umso geringer. Die Reichweite des Wassers kann durch den Einsatz des Ritual-Tüftlers erweitert und sogar an einem anderen Ort platziert werden, so dass man sich keine Gedanken darüber machen muss, wo ein Ritual platziert wird, wenn man sich um Ästhetik sorgt. Die Wunder der Magie! +guide.bloodmagic.entry.ritual.lava.info=Lava, vielleicht eine der rudimentärsten Energiequellen. Ich neige dazu, es nicht viel in meiner eigenen Forschung zu benutzen, weil es ein wenig schwierig sein kann, damit zu arbeiten - es ist nicht so, als ob man einen einfachen Eisenkübel benutzen könnte, um etwas aufzuheben! Einer der hiesigen Tüftler kam eines Tages bei mir vorbei und fragte mich, ob es irgendwelche Quellen in der Nähe gäbe, da er vor kurzem neue Ausrüstung gekauft hatte, für deren Betrieb Lava benötigt wird. Ich sagte, dass es einige gab, doch die meisten von ihnen waren bereits im Besitz, aber ich entschied mich, zu ihm zu kommen, um mir das Gerät anzusehen. \n\tEs war eine mindestens 5 Meter hohe und ebenso breite Schmelzanlage, die an mehrere Tanks angeschlossen war, die leer und karg standen. Obwohl ich mir nicht ganz sicher war, wie es funktioniert, konnte ich sagen, dass die rohe Hitze der Lava perfekt dafür sein würde - Elektrizität würde gut funktionieren, wenn sie richtig modifiziert würde, aber ich konnte erkennen, dass dies nicht von Immersive Industries war. \n\tNach einem kleinen Gespräch mit dem Tüftler wechselte das Geld den Besitzer und ich bat ihn, zurückzutreten, während ich meine Ritualsteine vorbereitete. Um das zu verwirklichen, was ich mir wünschte, nahm ich vier Feuersteine und legte sie in einem Kreuz um den Haupt-Ritualstein und schob sie dann mit meinem Aktivierungskristall fest, während ich mir den Vorgang in meinem Kopf vorstellte. In der Theorie sollte es einfach sein: Man nimmt einige Steine aus der Tiefe der Erde und komprimiert sie mit etwas Energie, wodurch sie unter dem starken Druck geschmolzen werden. Diese Lava könnte man aus dem Ritualstein herausholen und den Vorgang wiederholen. Für mein damaliges einfaches Netzwerk waren die Aktivierungskosten wegen des erforderlichen Anfangsdrucks ziemlich hoch, und der Abfluss für jede Lavaquelle war nicht etwas, auf das ich vorbereitet war. (20000 LP zu aktivieren, 500 LP pro Quellblock)\n\tIch taumelte mit einem Grinsen im Gesicht aus dem Gebäude: Die Tanks waren voller Lava, genug, um den Tüftler für ein paar Wochen im Geschäft zu halten, bis er sich eine dauerhaftere Lavaquelle beschaffen konnte. Ich habe allerdings dafür gesorgt, dass ich meine Ritualsteine wieder aufnehme, nachdem ich fertig war. \n\n------------------\n\tWenn keine Änderungen am Ritual vorgenommen werden, wird es versuchen, eine Quelle von Lava auf dem Block direkt über sich selbst zu platzieren, zu einem Preis von 500 LP pro Tick, wenn es Platz gibt, und Flüssigkeiten verdrängen, wenn sie fließen. Dieser Platzierungsbereich kann standardmäßig auf maximal 9 Blöcke in einem maximalen Abstand von 3 vom Ritual erweitert werden. Durch die Erweiterung des Rituals mit Rohem Willen werden die LP-Kosten im Verhältnis zu dem Willen, der sich in der Aura befindet, verringert, wobei der Verbrauch des Willens proportional zur Menge an LP ist, die eingespart wird. Die Verwendung dieses Willens kann außerdem die Fähigkeit verleihen, Lava direkt in das Innere eines Blocks zu bringen, wie zum Beispiel ein Tank, mit einer Rate, die mit normalen rituellen Operationen vergleichbar ist.\n\tKorrosiver Wille bewirkt, dass das Ritual Feuerimmunität umkehrt und alle Entitäten, die innerhalb eines bestimmten Bereichs gegen Feuer immun sind, gemäß der Menge an Willen in der Aura schwer beschädigt werden. Wenn Rachsüchtiger Wille auf das Ritual angewendet wird, wird ein flüchtiges Gas freigesetzt und bewirkt, dass alle Nicht-Spieler-Einheiten innerhalb seines spezifizierten Bereichs von Fire Fuse beeinflusst werden. Wenn der Timer des Schwächungszaubers auf 0 geht, wird das Wesen explodieren und sie mit explosiver Kraft in die Luft treiben. Zerstörerischer Wille erhöht die maximale Reichweite und Volumen, die das Ritual beeinflussen kann. Je mehr Wille Sie haben, desto mehr Lavablöcke können durch ein einziges Ritual gesetzt werden. Glücklicherweise entzieht das Ritual keinen Zerstörerischen Willen, aber wenn dein Wille fällt und die maximale Reichweite des Rituals geringer ist als die, auf die du es eingestellt hast, wird das Ritual überhaupt nicht funktionieren, bis es repariert ist. Letztlich gewährt Standhafter Wille allen Spielern innerhalb seiner Reichweite einen Feuerwiderstandsbuff, dessen Zeit und Willenskosten durch die Menge des Willens in der Aura beeinflusst werden. Vorsicht ist geboten, denn wenn du von Feuerresistenz betroffen bist, kannst du durch die korrosive Wirkung des Rituals beschädigt werden. +guide.bloodmagic.entry.ritual.greenGrove.info=Letzte Woche begann ich, Tiberius seine interdisziplinäre Magie beizubringen. Jeder Lehrling, den ich hatte, musste beim Erlernen der Blutmagie eine andere Form der Magie erlernen. Es spielt keine Rolle, welche sie wählen, solange sie nicht irgendeine Form von endlicher Ressource verbrauchen - ich habe eine Form der Magie des Ars-Clans aus dem fernen Osten verwendet, aber da die Quelle des Etheriums der Welt knapp wurde, ist sie längst ausgestorben. \n\tTiberius hat beschlossen, Thaumaturgie zu lernen, die die Magie der Welt benutzt, um deine Magie auszuführen. Dies ist ein gutes Gegengewicht zur Blutmagie, die die Magie des Lebens nutzt. Als solche verwenden diese Magien verschiedene Mittel, um die gleichen Aufgaben zu erfüllen. Um das zu demonstrieren, habe ich beschlossen, die Unterschiede zu Tiberius hervorzuheben, wenn es um das Wachstum der Pflanzen geht.\n\t Thaumaturgie benutzt einen Wachstumskatalysator, der von der Essentia Herba angetrieben wird," sage ich, während ich auf das Essentia Flussdiagramm zeige, das an der Klassenzimmerwand befestigt war. Sicher, Tiberius saß dort am einzigen Schreibtisch, aber manchmal muss ein Mann etwas Spaß haben. "Ein kleines Rinnsal von Aura und dieser Essenz stimuliert den photosynthetischen Prozess der Pflanze und ermutigt sie, durch mehr Sonnenenergie zu wachsen. Dieser Prozess erfordert, dass der Boden gut gedüngt ist, sonst kann die Ernte einfach verwelken und absterben.\n\tIch nehme nun vier Erd- und Wasserritualsteine und lege sie in einen Kreis um einen Haupt-Ritualstein. "Umgekehrt verwendet die Blutmagie einen anderen Prozess." Während ich spreche, aktiviere ich das Ritual und bedecke es mit einfachem Schmutz. "Indem man seine Lebenskraft oder die der Tiere nutzt, kann man die Pflanzen so düngen, dass sie nicht so viel Dünger benötigen. Im Wesentlichen ernährt es die Pflanzen, so dass sie immer eine hohe Konzentration an Nährstoffen haben."\n\tIch werfe ein paar Samen auf den Schmutz und bedecke sie leicht, entkorke und leere eine Ampulle mit Wasser aus meinem Gewand. "Dieser Prozess benötigt kein zusätzliches Sonnenlicht, da er eine andere Energiequelle nutzt. Obwohl es viel besser funktioniert, wenn es etwas Licht gibt - die Pflanze ist nicht gerade an diese Art von Bedingungen gewöhnt!"\n\tEin paar Triebe haben bereits ihre Blätter aus der Erde geschossen, während ich erklärt habe, scheinbar als Antwort winkend. Ich spürte die milde Belastung meines Körpers, als jedes neue Blatt sprießte, jedes Mal geringfügig, aber als es sich ansammelte, begann es sich zu sammeln. Als ich den Kurs beendet hatte, räumte ich den Dreck vom Experiment auf und beschloss, einen schönen Spaziergang ins Dorf zu machen: Ich hatte einen Scheffel Weizen, der verkauft werden musste. \n\t----------\n\tDas Ritual des Grünen Hains, wie der Name schon sagt, beschleunigt das Wachstum von Pflanzen, die in der Umgebung sind. Indem es das Blut des Spielers als reiches Düngemittel verwendet, wird es versuchen, alles zu züchten, was es als eine Pflanze betrachtet, wie Weizen und Karotten, und alles, was in seinem Bereich wächst, in regelmäßigen Abständen. Durch Standardoperationen wird das Ritual den 3x3-Bereich zwei Blöcke über sich selbst betrachten und versuchen, jeden Block mit einer Erfolgsrate von 30% pro Sekunde zu vergrößern. Wenn mit dem Ritual-Tüftler manipuliert, kann das Ritual maximal 81 Pflanzen gleichzeitig in einem Radius von 5 Blöcken um den HRS herum bearbeiten. Als weitere Anmerkung:\n\tWenn Dämonischer Wille ergänzt wird, gibt es mehrere Effekte, die erzielt werden können. Wenn Roher Wille verwendet wird, wird das Ritual alle Operationen mit einer beschleunigten Rate durchführen, wobei 0,05 Wille pro erfolgreichem Wachstum verbraucht wird und die Geschwindigkeit im Verhältnis dazu, wie viel Wille in der Aura ist, erhöht wird. \n\tWenn es mit Rachsüchtigem Willen angereichert wird, wird das Ritual 0,05 Wille pro erfolgreichem Wachstum verbrauchen und die Chance erhöhen, dass ein bestimmter operativer Tick auf der Pflanze erfolgreich sein wird. Standardmäßig ohne Willen ist es 30%%, wenn aber zum Beispiel 100 Rachsüchtiger Wille zur Verfügung steht, erhöht sich die Rate auf 80%%.\n\tZerstörerischer Wille erhöht die effektive maximale Reichweite des Rituals, was bedeutet, je mehr Wille du hast, desto mehr Ernten/Pflanzen kann ein einzelnes Ritual verarbeiten. Glücklicherweise entleert das Ritual keinen Zerstörerischen Willen, aber wenn dein Wille fällt und die maximale Reichweite des Rituals geringer ist als die, auf die du es eingestellt hast, wird das Ritual überhaupt nicht funktionieren, bis es wiederhergestellt ist.\n\tStandhafter Wille gewährt die Fähigkeit, einen Bereich um das Ritual herum festzulegen, der automatisch gepflügt und bewässert wird. Zusätzlich wird jedes Saatgut, das sich in diesem Bereich befindet, wenn möglich auf einem nahegelegenen Block gepflanzt. Das kostet eine kleine Menge von Standhaftem Willen, und seine Auswirkungen skalieren nicht mit Willen in der Aura.\n\tWenn korrosiver Wille im Ritual verwendet wird, kann sich die grundlegende Natur des Rituals verschieben. Wenn der neue Bereich richtig eingestellt ist, werden alle Mobs, die in den Einflussbereich des Rituals eintreten, mit dem "Blutegel"-Effekt versehen. Alle paar Ticks werden die Pflanzen in der Nähe der Mobs beschädigt und der Mob wird proportional beschädigt. Direktes Düngen mit Mobs kann sich als vorteilhaft erweisen! Alle 10 Sekunden, die der Schwächungszauber pro Mob angewendet wird, wird 0.2 korrosiver Wille verbraucht. +guide.bloodmagic.entry.ritual.magnetism.info=Das Ritual des Magnetismus ist das Brot und die Butter eines jeden, der Steinbrüche schätzt. Das Ritual erzeugt ein sich drehendes Magnetfeld, das die reichen Erze aus dem Boden unter ihm herauszieht und den Inhalt in seinem Bereich platziert. Dadurch wird kein Gestein verdrängt, so dass keine klaffenden Löcher im Land entstehen - vorausgesetzt, das Land besteht nicht nur aus Erz. Das Ritual funktioniert einmal alle 40 Ticks und kostet 50 LP pro erfolgreicher Operation. Der Standardradius dieses Rituals ist 3 Blöcke in jeder Kardinalrichtung, was eine Fläche von 7x7 Blöcken ergibt, die auf dem HRS zentriert ist. Da das Ritual derzeit keine Willensvergrößerungen hat, können Sie den Wirkungsradius für das Ritual nur erhöhen, indem Sie einen wertvollen Block direkt unter das MRS legen. Wird ein Eisenblock verwendet, wird der Radius 7. Wenn ein Goldblock verwendet wird, wird der Radius 15. Wenn schließlich ein Diamantblock verwendet wird, dehnt sich der Radius auf 31 aus, was bedeutet, dass alle Erze unterhalb des Rituals in einem 63x63 Bereich langsam in sein 3x3x3 Volumen über dem HRS gezogen werden. +guide.bloodmagic.entry.ritual.crusher.info=Das Ritual des Brechers ist ziemlich einfach. Das Ritual muss mit einer Art Inventar verbunden sein, das unverändert auf dem HRS sitzt. Während des Betriebs blickt das Ritual innerhalb seines Brechbereichs (standardmäßig der 3x3x3 Bereich unterhalb des Rituals) und bricht einen Block nach dem anderen alle 2 Sekunden zum Preis von 7 LP pro erfolgreicher Operation. Die zerbrochenen Blöcke werden dann in das verknüpfte Inventar übertragen - wenn es keinen Platz für die Gegenstände gibt, werden sie stattdessen auf die Truhe gespuckt.\n\tWenn es mit Rohem Willen versorgt ist, wird das Ritual schneller funktionieren, basierend auf der Gesamtmenge des Willens in der Aura. Während es beschleunigt wird, verbraucht es 0,05 Rohen Willen pro erfolgreicher Operation.\n\tZerstörerischer Wille bewirkt, dass Glück auf Blöcke angewendet wird, die durch das Ritual gebrochen werden. Derzeit variiert die Glücksstufe nicht und ist stattdessen Stufe 3, unabhängig von der Höhe des Willens. Das wird 0,2 Wille pro erfolgreicher Operation verbrauchen, unabhängig davon, ob es nützlich war oder nicht.\n\tStandhafter Wille wird stattdessen dazu führen, dass Blöcke mit dem Behutsamkeits-Effekt gebrochen werden. Das kostet 0,02 Will pro Operation und überschreibt den Effekt des Zerstörerischen Willens, wo immer es möglich ist.\n\tKorrosiver Wille bearbeitet Blöcke, die durch das Ritual gebrochen werden, mit irgendeiner Form von Schneidflüssigkeit. Das bedeutet, dass zum Beispiel, wenn es sich um einen Block Eisenerz handelt, das Ergebnis zwei Stücke Eisensand sind. Die aktuellen "Schneidflüssigkeiten", die das Ritual verwendet: Einfache Schneidelösung und Explosives Pulver. Das Ritual verbraucht eine andere Menge des Willens, basierend auf dem, was verwendet wurde, und wird den Willen nur verbrauchen, wenn der Effekt zutrifft. Dies überschreibt Behutsamkeit, wo es möglich ist. \n\tRachsüchtiger Wille bewirkt, dass bei einer erfolgreichen Operation der Inhalt des Inventars ähnlich dem Siegel der Kompression komprimiert wird: Wenn sich 65 Redstone-Staub in der Truhe befindet, wird ein Block von Redstone hergestellt und 56 Staub verbleiben. Der Wille wird nur verbraucht, wenn die Operation erfolgreich ist, und es kostet 0,2 Wille. +guide.bloodmagic.entry.ritual.highJump.info=Dieses Ritual nutzt einen gewaltigen Luftstoß, um all jene, die darauf laufen, in den Himmel zu katapultieren. Und wenn der Benutzer im Wirkungsbereich des Rituals landet, erleidet er keinen Fallschaden. Spieler, die sich in dieses Ritual einschleichen, sind nicht davon betroffen. Das Ritual kostet 5 LP pro Entität pro Tick erfolgreicher Operation, also wird es nichts kosten, wenn es keine Leute in die Luft wirft. +guide.bloodmagic.entry.ritual.speed.info=Wie der Name schon sagt, wird das Ritual der Geschwindigkeit für den Transport verschiedener Arten verwendet. Das Ritual kann in die Richtung einer der Himmelsrichtungen gelegt werden, und alle Entitäten innerhalb seiner Reichweite werden in die Richtung gestartet, in die das Ritual zeigt. Wenn man ein Ritual betrachtet, ist diese Richtung der Ort, an dem sich der Ritualstein der Abenddämmerung befindet. Standardmäßig hat das Ritual einen Radius von 2 Blöcken vom HRS, der jedoch bei Verwendung eines Ritual-Tüftlers erweitert oder verkleinert werden kann. Wenn das Ritual mit Rohem Willen getankt wird, wird die Geschwindigkeit des Rituals wesentlich erhöht, basierend auf dem Willen, der in der Aura ist. Zum Beispiel wird die Geschwindigkeit verdoppelt, wenn sich 100 Wille in der Aura befinden. Für jede erfolgreiche Operation wird 0,1 Wille verbraucht.\n\tRachsüchtiger Wille verhindert, dass das Ritual erwachsene Mobs bewegt, und Zerstörerischer Wille verhindert, dass das Ritual Kindermobs bewegt. Wenn einer von beiden verwendet wird, werden die Spieler auch daran gehindert, das Ritual anzuwenden. Wenn beide verwendet werden, ist der Effekt jedoch, dass nur Spieler das Ritual benutzen dürfen und Mobs nicht. Diese Augmentationen können effektiv zum Sortieren von Tierfarmen oder sogar zur Beseitigung der lästigen Kinderzombies in Ihrem Opferstall verwendet werden. Das Ritual wird 0,05 Wille für jeden Typ verbrauchen, der bei erfolgreicher Operation wirksam ist, also wenn ein Kind den rituellen Raum betritt, wenn Sie den Zerstörerischen Willen verwenden, wird es weder Wille noch LP kosten. +guide.bloodmagic.entry.ritual.wellOfSuffering.info=Für diejenigen unter euch, die es vorziehen, Mobs anstatt der eigenen Gesundheit zu benutzen, beschädigt die Quelle des Leidens alle lebenden Nichtspieler in einem Radius von 10 Blöcken und platziert die Gesundheit als LP in einen verbundenen Altar. Das Ritual sucht nach einem Blutaltar in seiner Reichweite, wobei 5 Blöcke horizontal und 10 Blöcke vertikal geprüft werden. Wenn es einen Altar findet, wird es seinen Standort intern speichern - wenn kein Altar in der Nähe ist, wird das Ritual nicht funktionieren. Das Ritual wird jeder Entität 1 HP Schaden und dem Altar 25 LP zufügen (100 für friedliche Tiere), was mit Opfer-Runen verstärkt werden kann. +guide.bloodmagic.entry.ritual.featheredKnife.info=Das Ritual der Federnden Klinge zapft den Körper des Benutzers an und lässt seine Lebenskraft abfließen, um einen Blutaltar in der Nähe zu füllen. Das Ritual sucht nach einem Blutaltar in seiner Reichweite, wobei 5 Blöcke horizontal und 10 Blöcke vertikal geprüft werden. Wenn es einen Altar findet, wird es seinen Standort intern speichern - wenn es keinen Altar in der Nähe gibt, wird das Ritual nicht funktionieren. Wenn ein Spieler dann in den Schadensbereich des Rituals eintritt, der standardmäßig einen Radius von 15 Blöcken horizontal und 20 Blöcken vertikal hat, wird das Ritual den Spieler für 1HP schädigen und dann diese Gesundheit direkt in den angeschlossenen Altar legen (unter Berücksichtigung von Blut-Runen). Es gibt einige Sicherheitsmechanismen auf dem Ritual, die dazu führen, sodass es bei einem Spieler mit weniger als 30%% seiner maximalen Gesundheit nicht funktioniert. Ohne Verstärkungen führt das Ritual jede Sekunde eine Operation durch.\n\t Es gibt ein paar nützliche Ergänzungen, die benutzt werden können, indem Dämonischer Wille verwendet wird. Wenn Roher Wille von dem Ritual verzehrt wird, wird das Ritual versuchen, Spieler innerhalb seiner Reichweite schneller zu schädigen, indem es zweimal pro Sekunde arbeitet. Das Ritual wird 0,05 Rohen Willen pro erfolgreicher Operation verbrauchen.\n\tWenn mehr als 10 Standhafter Wille in der Aura ist, so erhöht das Ritual seine Sicherheitsschwelle und funktioniert stattdessen nicht bei Spielern mit weniger als 70% Gesundheit. Dies verbraucht keinen Willen.\n\tWenn mehr als 10 Rachsüchtiger Wille in der Aura ist, wird das Ritual einige seiner Sicherheitseinschränkungen aufheben, was dazu führt, dass es bei Spielern funktioniert, bis sie nur noch 10%% ihrer maximalen Gesundheit haben. Wenn das Ritual auch Standhaften Willen hat, wird die Schwelle immer noch 70%% für den Besitzer des Rituals sein, nicht jedoch für andere Spieler. Diese Funktion verbraucht derzeit keinen Willen.\n\tWenn Zerstörerischer Wille auf das Ritual angewendet wird, wird das Ritual mit seiner HP-zu-LP-Umwandlung viel effizienter. Die Menge an LP, die dem Altar pro Lebenspunkt hinzugefügt wird, erhöht sich auf der Grundlage des Willens in der Aura, bis zu einem Maximum von +20%% für 100 Zerstörerischen Willen. Dieser Effekt stapelt sich multiplikativ mit Runen, Upgrades der Lebenden Rüstung und dem Bonus des Räucheraltars. Das verbraucht 0,05 Zerstörerischen Willen pro geopferter HP.\n\tWo wir bei Weihrauch sind: Wenn korrosiver Wille im Ritual verwendet wird, wird das Ritual die Wirkung des Räucheraltars auf dich respektieren. Wenn du nicht vom Soul Fray Debuff betroffen bist und du von einem Räucheraltar bevollmächtigt bist, wird das Ritual deine HP bis zur eingestellten Schwelle verbrauchen und die gesamte resultierende LP in den Altar pumpen. Es wird auch den Effekt des Weihrauchs von dir nehmen und dich mit Soul Fray belegen. Dieser Effekt stapelt sich mit dem des Zerstörerischen Willens. +guide.bloodmagic.entry.ritual.regen.info=Das Ritual der Regeneration ist wohl eines der besten Rituale für jeden potentiellen Blutmagier, der seine eigene Lebenskraft nutzen möchte, um seine Magie zu speisen, und wirft einen Schleier von Energie um sich herum, um Entitäten zu heilen, die sich in dessen Reichweite befinden. Alle 2,5 Sekunden wirft das Ritual Regeneration I auf lebende Wesen in seinem 15-Block-Radius und kostet 100 LP pro Spieler und 10 LP pro andere lebende Wesen für 2,5 Sekunden Regeneration.\n\tWenn korrosiver Wille benutzt wird, um das Ritual zu verstärken, wird ein zweiter, "vampirischer" Bereich verfügbar sein. Alle Nicht-Spieler-Einheiten in diesem Bereich werden zufällig beschädigt, um Spieler innerhalb des regulären Heilungsbereichs direkt zu heilen. Dies kostet 0,04 Wille zur Nutzung und überträgt 1HP pro operativem Tick. +guide.bloodmagic.entry.ritual.harvest.info=Dieses Ritual sucht jeden erntbaren Pflanzenblock innerhalb seiner Reichweite (Standard ist der 9x9x5 große Bereich über dem HRS) und versucht, ihn zu ernten, indem es alle Samen neu pflanzt, wenn die Pflanze Samen fallen lassen kann. Alle Gegenstände der Pflanze erscheinen dort, wo die Pflanze geerntet wurde. Das Ritual wird versuchen, Pflanzen einmal alle 5 Ticks zu ernten und wird 20 LP pro erfolgreicher Operation kosten.\n\tPflanzen, die geerntet werden können, sind unter anderem: Kürbisse, Weizen, Karotten, Kartoffeln, Netherwarzen, Kakteen, Zuckerrohr. Denke daran, dass das Ritual keine Annahmen über die Sache macht, die es erntet - Falls Pflanzen durch Mods hinzugefügt wurden, müssen diese einen harvesting handler mit der Mod registriert haben. +guide.bloodmagic.entry.ritual.interdiction.info=Basierend auf einem alten alchemistischen Mythos versucht das Ritual der Verbietung, alle Nicht-Spieler-Mobs gewaltsam aus dem Zentrum des Rituals zu entfernen. Standardmäßig werden alle Mobs, die sich innerhalb von zwei Blöcken des HRS befinden, durch Einstellen ihrer Geschwindigkeit vom HRS weggeschoben. Es ist zu beachten, dass Mobs in diesem Bereich nicht von Sturzschäden betroffen sind, aber dieses Sicherheitsnetz verschwindet, sobald sie weggeschoben werden. +guide.bloodmagic.entry.ritual.containment.info=Das Gegenteil von Verbietung, das Ritual der Eindämmung, versucht, Mobs in seinem Wirkungsbereich in den Raum über dem HRS zu ziehen und sie in der Luft aufzuhängen, wo sie sich nicht bewegen können. Der Standardbereich des Rituals ist ein horizontaler Radius von 3 Blöcken von der Unterseite des Hauptsteins bis zur Oberseite der obersten Runen, obwohl dieser Bereich natürlich geändert werden kann.\n\tDas Ritual kostet 1LP pro Mob, das jeden Tick gezogen wird. +guide.bloodmagic.entry.ritual.suppression.info=Die Kuppel der Verdrängung "verdrängt" alle Flüssigkeiten in einem bestimmten Radius, wodurch Flüssigkeiten in einer Halbkugel mit einem Radius von 10 Blöcken vorübergehend durch Luft ersetzt werden können. Wenn das Ritual abgeschaltet wird, kehrt diese Flüssigkeit in den Zustand zurück, in dem sie vorher war. Dies kostet 2LP pro Tick. +guide.bloodmagic.entry.ritual.expulsion.info=Wenn du auf einem Server spielst, kannst du mit einer Situation konfrontiert werden, in der du unerwünschte Spielerbesuche bekommst. Manchmal sind Kraftfelder und riesige blutige Rotoren nicht genug Abschreckung und sie schaffen es immer noch, in deine Basis zu gelangen. Wenn ein Spieler, der nicht der Besitzer ist, den Bereich des Rituals betritt (Standard 12 Blöcke Radius), teleportiert das Ritual den Spieler zufällig innerhalb eines Radius von 100 Blöcken. Wenn es allerdings eine Truhe auf dem HRS mit einem gebundenen Gegenstand des Spielers gibt, wird dieser Spieler von der Teleportation ausgenommen und es verhält sich effektiv wie eine weiße Liste.\n\tDas Ritual kostet 2000LP für jede erfolgrreiche Teleportation. +guide.bloodmagic.entry.ritual.zephyr.info=Nach dem Vorbild eines alten Schwerts aus Legenden nutzt der Ruf des Zephyr die Kraft des Windes, um die Gegenstände, die sich um ihn herum befinden, zu sammeln und sie in die verbundene Truhe zu legen (Standard ist direkt über dem HRS). Dies geschieht sofort, was bedeutet, dass die Gegenstände direkt in das Inventar teleportiert werden - kein Grund zur Sorge um seltsame Sog-Effekte!\n\tDer standardmäßige Gegenstandsradius ist 5 Blöcke um den HRS. +guide.bloodmagic.entry.ritual.laying.info=Wie viele wissen, kann das Platzieren von Blöcken bei verschiedenen Automatisierungsaufgaben wichtig sein. Dieses Ritual nimmt die Gegenstände/Blöcke aus der verbundenen Truhe (standardmäßig auf der Oberseite des HRS) und platziert die Blöcke innerhalb des Rituals, das einen Radius von 2 auf der gleichen Ebene wie das MRS hat. Dies kann nützlich sein, wenn Sie versuchen, Setzlinge für eine Baumfarm auszulegen oder wenn es andere Blöcke gibt, die platziert werden müssen. Das Ritual verbraucht 50 LP pro erfolgreicher Operation. +guide.bloodmagic.entry.ritual.timberman.info=Hast du genug Holz? Dieses Ritual hält dich bedeckt. Der Kahlschlag des Holzfällers hält eine spektrale Entität fest, die die LP des Besitzers benutzt, um die Blätter und Stämme aller Bäume in ihrem Bereich zu sammeln und die Erträge in die verbundene Truhe zu platzieren. Es wird versucht, alle "Bäume" in einem horizontalen Radius von 10 Blöcken und bis zu 30 Blöcken über dem HRS (standardmäßig) zu finden und 10LP pro gefälltem Block zu verwenden. +guide.bloodmagic.entry.ritual.meteor.info=In jeder Hinsicht ist dies eines der mächtigsten Rituale im Spiel. Die Aktivierung kostet eine Million LP und kann nur einmal verwendet werden, bevor sie wieder aktiviert werden muss. Das Ritual, sobald bestimmte Opfer gebracht werden, zieht einen Meteor aus dem Weltraum und lässt ihn zu Boden stürzen, was zu einer großen Explosion führt, sobald er auf etwas Festes trifft. Weil diese Meteore nicht aus der Ãœberwelt sind, können sie eine reiche Erzdichte enthalten, die es sonst nirgendwo gibt. Dies ist durch das Modpack oder den Benutzer konfigurierbar. +guide.bloodmagic.entry.ritual.downgrade.info=Um mehr Macht zu erlangen, muss man manchmal etwas dafür opfern. Die Buße der belasteten Seele tut genau das - indem man einem unsichtbaren Wesen ein paar Gegenstände opfert, kann die Wirksamkeit eines Aspekts der Lebenden Rüstung verringert und eine Erhöhung der Anzahl der Upgrade-Punkte als Ausgleich erhalten werden. Wenn das das Ritual konstruiert wird, muss eine Gegenstandsrahmen an den obersten leeren Ritualstein gehängt werden, der dem Haupt-Ritualstein zugewandt ist, und eine Art Inventar (siehe: Truhe) auf dem Ritualstein der Abenddämmerung platziert werden. Um eine Herabstufung der lebenden Rüstung zu erhalten, muss zunächst der Schlüsselgegenstand in den Gegenstandsrahmen und die Verbrauchsmaterialien in die Truhe gelegt werden. Sobald das Ritual aktiviert ist, kannst du jederzeit auf dem Haupt-ritualstein schleichen und die Herabstufung erwerben.\n\tIm Falle der Herabstufung der abgeschreckten lebenden Rüstung ist ihr Kernstück eine Wasserflasche (im Gegenstandsrahmen platziert) und das Rezept ist Drachenatem (in der Truhe platziert). Um das Rezept für die Herabstufungen zu sehen, kannst du sie in JEI nachschlagen - überprüfe die Verwendung des Haupt-Ritualsteins und du wirst die Rezepte für Sühne (Ritual) sehen. Das Rezept für die maximale Herabstufung kann auch einfach in JEI überprüft und dann die Verwendung des Schlüsselgegenstands überprüfen - dieser ist immer der gleiche für die spezifische Herabstufung. +guide.bloodmagic.entry.ritual.crystalSplit.info=Sobald sich der Dämonische Wille herauskristallisiert hat, gibt es keine Möglichkeit, ihn in seine vielen Aspekte aufzuteilen - so habe ich bisher gedacht. Die "Resonanz des facettierten Kristalls" arbeitet, indem sie die vielen Aspekte innerhalb einer aspektlosen (oder rohen) Kristallgruppe unter Verwendung der verschiedenen elementaren Ritualsteine trennt. Um das Ritual nutzen zu können, muss eine aspektlose Kristallgruppe zwei Blöcke über dem Haupt-Ritualstein platziert werden. Mit anderen Worten: Es kann ein Kristallisierer auf dem HRS und eine Kristallgruppe darauf platziert werden und es sollte gut funktionieren. Als nächstes müssen Sie sicherstellen, dass es keine Blöcke direkt über den vier elementaren Ritualsteinen gibt, und dann warten, bis die Kristallgruppe wächst.\n\tNachdem insgesamt fünf oder mehr Spitzen gewachsen sind, wird das Ritual diese Spitzen abspalten und jeweils eine Spitze aus Korrosivem, Standhaftem, Rachsüchtigem und Zerstörerischem Willen auf den elementaren Ritualsteinen erschaffen. Wenn die aspektlose Kristallgruppe weiter wachsen darf und diese neuen Kristalle intakt bleiben, wird der Prozess wiederholt und es werden weitere Türme hinzugefügt.\n\tDer Mechanismus für diesen Prozess ist ganz einfach. Wenn der Rohe Kristall dämonischen Willens mindestens fünf Spitzen hat, bricht das Ritual vier dieser Spitzen ab und verwandelt den Willen in seine unkörperlichere Form. Dieser Wille wird dann in den letzten Turm des Clusters geworfen, was die verschiedenen Aspekte des Willens in lokalisierte Klumpen des jeweiligen Aspekts zwingt. Dieser Wille wird dann in den rituellen Steinen gesammelt, die als Grundlage dienen, auf der die neuen, aspektierten Kristallgruppen wachsen können. + +# Architect Entries +guide.bloodmagic.entry.architect.intro=Vorwort +guide.bloodmagic.entry.architect.bloodaltar=Der Blutaltar +guide.bloodmagic.entry.architect.ash=Arkane Asche +guide.bloodmagic.entry.architect.divination=Wahrheitssiegel +guide.bloodmagic.entry.architect.soulnetwork=Seelennetzwerk +guide.bloodmagic.entry.architect.weakorb=Schwache Blutkugel +guide.bloodmagic.entry.architect.incense=Räucheraltar +guide.bloodmagic.entry.architect.bloodrune=Altaraufrüstung +guide.bloodmagic.entry.architect.inspectoris=Inspectoris Scandalum (Blockleser) +guide.bloodmagic.entry.architect.runeSpeed=Geschwindigkeitsrune +guide.bloodmagic.entry.architect.water=Wassersiegel +guide.bloodmagic.entry.architect.lava=Lavasiegel +guide.bloodmagic.entry.architect.lavaCrystal=Lavakristall +guide.bloodmagic.entry.architect.apprenticeorb=Blutkugel des Lehrlings +guide.bloodmagic.entry.architect.dagger=Opferdolch +guide.bloodmagic.entry.architect.runeSacrifice=Rune der Opferung +guide.bloodmagic.entry.architect.runeSelfSacrifice=Rune der Selbstopferung +guide.bloodmagic.entry.architect.holding=Siegel der Aufbewahrung +guide.bloodmagic.entry.architect.air=Luftsiegel +guide.bloodmagic.entry.architect.void=Siegel der Leere +guide.bloodmagic.entry.architect.greenGrove=Siegel des grünen Hains +guide.bloodmagic.entry.architect.fastMiner=Siegel der Eile +guide.bloodmagic.entry.architect.seer=Siegel des Sehers +guide.bloodmagic.entry.architect.magicianOrb=Blutkugel des Magiers +guide.bloodmagic.entry.architect.capacity=Rune der Kapazität +guide.bloodmagic.entry.architect.displacement=Rune der Verlagerung +guide.bloodmagic.entry.architect.affinity=Siegel der Elementaren Affinität +guide.bloodmagic.entry.architect.lamp=Siegel der Blutlampe +guide.bloodmagic.entry.architect.magnetism=Siegel des Magnetismus +guide.bloodmagic.entry.architect.peritia=Peritia-Foliant +guide.bloodmagic.entry.architect.livingArmour=Lebende Rüstung +guide.bloodmagic.entry.architect.upgradeTome=Thesen zur Verbesserung lebender Rüstung +guide.bloodmagic.entry.architect.teleposer=Teleposer +guide.bloodmagic.entry.architect.boundBlade=Gebundene Klinge +guide.bloodmagic.entry.architect.boundTool=Gebundene Werkzeuge +guide.bloodmagic.entry.architect.weakShard=Schwache Blutscherbe +guide.bloodmagic.entry.architect.masterOrb=Blutkugel des Meisters +guide.bloodmagic.entry.architect.runeOrb=Orbrune +guide.bloodmagic.entry.architect.suppression=Siegel der Verdrängung +guide.bloodmagic.entry.architect.haste=Siegel der Hast +guide.bloodmagic.entry.architect.severance=Siegel des Endertrennens +guide.bloodmagic.entry.architect.teleposition=Telepositionssiegel +guide.bloodmagic.entry.architect.compression=Siegel der Kompression +guide.bloodmagic.entry.architect.bridge=Siegel der Phantombrücke +guide.bloodmagic.entry.architect.mimic=Mimikblöcke +guide.bloodmagic.entry.architect.downgrade=Thesen zur Schwächung lebender Rüstung + +guide.bloodmagic.entry.architect.augmentedCapacity=Rune der erweiterten Kapazität +guide.bloodmagic.entry.architect.charging=Aufladungsrune +guide.bloodmagic.entry.architect.acceleration=Beschleunigungsrune + +//--// needs a better string. Literal translation loses its rhyme and just sounds silly. This one is simply "An Altar from the depths" +guide.bloodmagic.entry.architect.tier3=Ein Altar aus den Tiefen (Stufe 3) + +# Architect Entry Texts +guide.bloodmagic.entry.architect.intro.info=Hallo, alle zusammen. Mein Name ist Tiberius. Wahrscheinlich kannst du an diesem Eintrag erkennen, dass das Buch nicht ganz vollständig ist, und du hast Recht. Durch die Updates 1.7.10 -> 1.8.9 und 1.9.4 (und höher) hat sich sehr viel geändert. Deshalb mussten die Bücher neu geschrieben werden. Da der ultimative Plan für diese Dokumente ist, jedes Buch in Form eines Forschungsjournals / tatsächlichen Buches zu haben, wird es eine Weile dauern, bis diese Dokumente ausgearbeitet sind. Daher werde ich dieses Buch regelmäßig aktualisieren, um die notwendigen Lücken zu schließen. Es wird als geschmackloser Müll anfangen (Ja.... nicht die appetitlichste Illustration für Dokumente, aber was auch immer!), aber langsam wird es in eine Geschichte über einen Haufen Blutmagier auf einer Entdeckungsreise verwandelt werden.\n\tAber genug davon, ich muss in den Charakter kommen. Mein Name ist Tiberius, und ich bin ein Blutmagier, auch bekannt als der Architekt. Dieses Buch enthält alle meine Forschungen über das ätherische Phänomen "Seelennetzwerk" sowie die physikalischen Eigenschaften einiger der wichtigsten Geräte, an die jeder Blutmagier im Training gewöhnt sein sollte. Von der Kunst, die Struktur eines mächtigen Blutaltars zu entwerfen, über die Feinheiten, Lebenskraft zu opfern, um die Macht eines Magiers zu erhöhen, bis hin zu den Kräften, die durch arkane Glyphen und Siegel gewonnen wurden, habe ich neue Wege entdeckt, überarbeitet und erschaffen, um sich selbst zu neuen Höhen zu trainieren.\n\tAlso trete ein, Blutmagier, denn ein neues Universum erwartet dich...\n\t Ja, Magus sagt, dass ich ein wenig grandios werden kann, aber was kannst man da schon machen? +guide.bloodmagic.entry.architect.bloodaltar.info.1=Der Blutaltar ist eines der zentralsten Geräte in der Mod. Es gibt zwei Hauptanwendungen für den Altar: entweder um bestimmte Gegenstände herzustellen, die für den Fortschritt durch die Mod notwendig sind, oder um die Blutkugel aufzufüllen. Bei beiden Aktionen muss der Spieler das Becken mit Lebensessenz füllen, die aus zwei verschiedenen Quellen gewonnen werden kann: Monstern und friedlichen Kreaturen und der eigenen Gesundheit des Spielers. +guide.bloodmagic.entry.architect.bloodaltar.info.2=Um deine eigene Lebensessenz in das Becken zu bringen, musst du dir einen Opferdolch basteln und es mit der rechten Maustaste neben dem Altar klicken. Dies nimmt ein Herz der Gesundheit und fügt einem nicht aufgerüsteten Altar insgesamt 200 LP hinzu. "LP" steht für "Life Points" oder Lebenspunkte, das ist ein Maß dafür, wie viel Lebenskraft für eine Operation verwendet wird - nein, es ist nicht wie YuGi-Oh. Der Blutaltar hat eine Kapazität von 10.000 LP. Wenn du dann mit der rechten Maustaste auf den Altar klickst, kannst du einen Gegenstand in das Becken legen, und wenn es sich um einen gültigen Gegenstand handelt, wird der Altar den Herstellungsprozess starten.\n\tDer Altar fertigt einen Gegenstand, indem er die LP im Becken verbraucht, wenn der Altar eine ausreichend hohe Ausbaustufe besitzt. Wenn genügend LP vorhanden sind, wird der Altar mit jedem Tick ein wenig LP aus dem Becken ablassen und den Fortschritt der Herstellung erhöhen, indem er rote Partikel aussendet. Wenn sich keine LP mehr im Becken befindet, gibt der Altar graue Partikel ab und der Herstellungsprozess verliert an Fortschritt, was überhaupt nicht gut ist! Schließlich, wenn der Altar eine Blutkugel füllt, wird der Altar violette Partikel emittieren, um anzuzeigen, dass er LP aus dem Becken absaugt.\n\tTatsächlich gibt es insgesamt drei Tanks im Blutaltar: den Haupttank, der eine Standardkapazität von 10 kLP hat, wie zuvor angegeben, sowie einen Eingangstank und einen Ausgangstank, die beide 10% der Gesamtkapazität des Haupttanks haben. Standardmäßig alle 20 Ticks werden die LP im Eingangstank mit 20LP/s in den Haupttank und die LP im Haupttank mit 20LP/s in den Ausgangstank übertragen. Wie der Name schon sagt, nimmt der Eingangstank die LP auf, die in den Altar gepumpt wird und als Puffer dient, um die Ãœbertragungsgeschwindigkeit von außen zu begrenzen, und der Ausgangstank kann mit Hilfe von Rohren aus dem Altar gezogen werden. +guide.bloodmagic.entry.architect.ash.info=Obwohl nicht unbedingt Teil des Gesamtthemas dieses Buches, ist Arcane Ash notwendig, um durch die Mod zu kommen und einige der leistungsfähigeren Geräte zu bekommen. Diese Asche wird mit der Höllenfeuer-Schmiede und Dämonischen Willen hergestellt, wenn du also neu in diesem Konzept bist, konsultiere bitte das "Dämonenkind". Im Wesentlichen ist dies eine Möglichkeit, Gegenstände aus zwei getrennten Gegenständen herzustellen: einem Reagenz, das als Katalysator dient, und einem sekundären Gegenstand.\n\tDie Asche hat insgesamt zwanzig Verwendungen, bevor du eine weitere herstellen musst. Wenn du mit der rechten Maustaste auf den Boden (oder eine Wand, obwohl sie nur eine Richtung darstellt) klickst, zeichnest du einen einfachen Kreis aus Asche ein. Wenn du die Asche erneut mit einem Gegenstand anklickst, wird dieser "in die Asche gelegt" - vorausgesetzt, dieser Gegenstand ist ein gültiger Katalysator, ändert der Kreis seine Form, um anzuzeigen, dass er für den nächsten Gegenstand bereit ist. Wenn sie sich nicht ändert, dann hast du etwas falsch gemacht.\n\t Sobald sie sich verändert hat, kannst du das zweite Element hinein legen. Wenn dieses Element mit dem ersten Element übereinstimmt, beginnt sich der Kreis zu drehen und führt je nach dem Rezept, an dem er arbeitet, verschiedene Aktionen aus. Nach einer Weile, wenn es richtig ausgeführt wird, wird ein Gegenstand herauskommen. Alle Rezepte für das Arkane Asche-Handwerk (ich nenne es Herstellung mit der Alchemischen Anordung) können in JEI gefunden werden, indem man die Verwendungen für Arkane Asche überprüft - der erste Gegenstand ist der Katalysator, und der zweite Gegenstand ist der sekundäre Gegenstand. +guide.bloodmagic.entry.architect.divination.info=Das Siegel der Weissagung ist eines der nützlichsten Werkzeuge in der Mod, das dir viele Werte vermitteln kann, die dein Leben einfacher machen. Dieses Siegel wird aus einem Stück Redstone und eine leeren Tafel (hergestellt im Blutaltar) mit einer Alchemischen Anordnung hergestellt.\n\tWenn du mit dem Siegel in der Hand auf einen Blutaltar rechts klickst, kannst du die aktuelle Stufe, die Menge der LP im Hauptbecken sowie die maximale Kapazität des Blutaltars sehen. Wenn du erneut mit dem Siegel auf den Altar klickst, wird der vorherige Text des Siegels überschrieben, was bedeutet, dass es keinen Spam in deinem Chat geben wird. Wenn du mit dem Siegel mit der rechten Maustaste in die Luft klickst, wird dir das Siegel die aktuelle Menge an LP in deinem LP-Netzwerk anzeigen. Obwohl dies zunächst eher alltäglich ist, wird diese Funktion allein es sehr wahrscheinlich machen, dass du dieses Siegel immer bei dir behalten wollen wirst. +guide.bloodmagic.entry.architect.soulnetwork.info=Das Seelennetzwerk (allgemein als LP-Netzwerk abgekürzt) ist der Begriff für die Verbindungen zwischen dem Spieler und allen Gegenständen und Strukturen, mit denen er seine Seele verbunden hat. Wenn ein Blutmagier mächtiger wird, nimmt die Kraft seiner Seele zu und verdickt diese Bindungen. Diese Verbindungen sind ätherische Stränge der Seele, und nur die mächtigsten der Blutmagier sind in der Lage, diese in ihrer physischen Form zu sehen. Bis jetzt hat noch kein Magier diese Fähigkeit erreicht.... \n\tIm Spiel ist das Seelen-Netzwerk direkt an den Spieler gebunden. Die Daten werden innerhalb der Welt gespeichert, und jeder Spieler hat nur ein einziges Netzwerk - die in das Netzwerk eingesetzten LP werden nicht in einem Element gespeichert, sondern in einem einzigen Pool platziert und gezogen.\n\tUm Dinge an dein Netzwerk zu binden, ist der gängigste Weg, einfach mit der rechten Maustaste auf ein Element zu klicken, das ein Netzwerk verwendet, um sich selbst zu aktivieren. Sobald der Gegenstand gebunden ist, zeigt er an, dass er sich im Besitz von Ihnen befindet und nie mehr losgebunden werden kann (mit der aktuellen Technologie). Wenn dieser Gegenstand verwendet wird und ihm LP-Kosten zugeschrieben werden, werden die LP aus dem Netz des Eigentümers genommen. Wenn nicht genügend LP in diesem Netzwerk vorhanden ist, wird die fehlende LP direkt der Gesundheit des Benutzers (nicht dem des Besitzers) entnommen. Man sollte die Verwendung solcher Gegenstände mit Vorsicht genießen, wenn nur eine geringe Menge an LP vorhanden ist - es könnte tödlich enden. +guide.bloodmagic.entry.architect.weakorb.info.1=Was nützt ein Magier ohne Machtquelle? Eine Blutkugel ist ein Gerät, das physische LP verbraucht und in das LP-Netzwerk des Besitzers überträgt. Obwohl es sich selbst nicht um eine Batterie handelt, dient es als Leitung, um die Energiereserven des Blutmagiers aufzufüllen. +guide.bloodmagic.entry.architect.weakorb.info.2=Die Schwache Blutkugel ist die erste solche Kugel, die du machen kannst. Indem du einen Diamanten in einen Blutaltar mit 2 kLP einsetzt, kannst du diese Kugel erschaffen. Wenn die Kugel gebunden und in einen Altar gelegt wird, in dem sich eine LP befindet, wird sie aus dem Becken gesaugt und die LP direkt in das Netzwerk übertragen. Jede Kugel hat eine maximale Kapazität, die nur durch fortgeschrittene Runen auf dem Altar erweitert werden kann. Für die Schwache Blutkugel beträgt diese maximale Kapazität 5 kLP.\n\tBlutkugeln können auch direkt vom Spieler gefüllt werden, indem man einfach mit der rechten Maustaste darauf klickt - das überträgt ein Herz der Gesundheit in die Kugel und gibt dir 200LP. Das kann nicht über die maximale Kapazität der Kugel hinausgehen. Eine Blutkugel kann nur durch ihre Altarebene oder höher gefüllt werden; das bedeutet, dass, wenn du eine T3-Kugel hast, sie in einen Altar gefüllt werden muss, der größer oder gleich T3 ist. Ein einfacher T1-Altar würde in dieser Situation nicht ausreichen. +guide.bloodmagic.entry.architect.incense.info.1=Man wird schnell feststellen, dass die Geschwindigkeit der LP-Generierung zunehmend belastend werden kann. Sicher, indem du dem Blutaltar spezielle Runen hinzufügst, kannst du den Ertrag der Selbstopferung erhöhen, aber das kann trotzdem ein langsamer Prozess sein. Wenn es nur einen Weg gäbe, um die Menge an LP, die du von dir selbst bekommen kannst, weiter zu erhöhen?\n\tHier kommt der Räucheraltar ins Spiel. Der Räucheraltar fungiert als zentraler Punkt für eine ruhige Gegend und beruhigt die Seele selbst mit den sanften Wellen, die aus dem Becken kommen. Du hast zwar keine Ahnung, woher dieser Geruch kommt, aber wass kann schon schief gehen?\n\tDas Ziel dieses Blocks ist es, einen Bereich der Ruhe zu schaffen, um zu erhöhen, wie viel LP du von einem Herz deiner Gesundheit bekommst.Wenn du in der Nähe des Blocks (etwa fünf Blöcke) bist, werden Feuerpartikel ausgesendet, um zu zeigen, dass er funktioniert - wenn du von dieser Ruhe betroffen bist, wird sich dein Opferdolch verwandeln, um anzuzeigen, dass du eine erhöhte Ausbeute am Blutaltar hast. Dieser Vorgang dauert etwa 5 Sekunden, und du erkennst, dass du fertig bist, daran dass die Feuerpartikel nicht mehr auftreten. Bei deiner nächsten Opferung am Blutaltar wirst du 90%% deiner maximalen Gesundheit auf einmal opfern und LP in den Altar pumpen, proportional zur Menge der geopferten Gesundheit, multipliziert mit einem Bonus, der davon abhängt, wie ruhig die Umgebung ist: dieser Bonus ist standardmäßig +20%%.\n\tAls Nebenbemerkung kann das Siegel der Weissagung auf dem Räucheraltar verwendet werden, um die Menge der Ruhe sowie die Menge eines Bonus zu bestimmen, die der aktuelle Altar gibt. +guide.bloodmagic.entry.architect.incense.info.2=Natürlich sind nur 20%% schön und gut, aber es kann durch die Erweiterung des Einflussbereichs des Räucheraltars noch erhöht werden. Wenn man eine Reihe von drei Holzpfadblöcken zwei Blöcke vom Räucheraltar entfernt in jede der Himmelsrichtungen platziert (wobei darauf zu achten ist, dass sich alle Pfadblöcke auf der gleichen y-Ebene befinden, bis zu fünf Blöcke nach oben oder unten vom Räucheraltar), kann man einen Bereich definieren. Jeder Block, der sich in diesem Bereich befindet (ein Block, der horizontal den gleichen Abstand zum Räucheraltar hat, wie die Pfadblöcke horizontal und auf der gleichen Ebene oder bis zu zwei Blöcke höher von den Pfadblöcken), kann zur Ruhe des Räucheraltars beitragen. Eine weitere Zeile mit Pfadblöcken kann nach der gleichen Regel hinter dieser ersten Zeile eingefügt werden: Die neue Zeile muss sich alle auf der gleichen y-Ebene befinden, und die gesamte Zeile muss innerhalb von 5 Blöcken vertikal von der vorherigen Zeile mit Pfadblöcken liegen. Das bedeutet, dass Grundrisse wie Pyramiden, umgekehrte Pyramiden oder fortgeschrittenere Treppenstrukturen möglich sind.\n\tAlle Pfadblöcke haben einen maximalen Abstand zum Räucheraltar, um wirksam zu sein. Die Holzpfadblöcke können bis zu drei Reihen vom Räucheraltar aus arbeiten. Steinpfade arbeiten bis zu fünf, abgenutzte Steinpfade sieben und Obsidianpfade neun Blöcke vom Ursprung entfernt. An einem bestimmten Punkt musst du also bessere Pfadblöcke verwenden, um deinen Ruhebereich zu erweitern, aber du kannst höhere Pfadblöcke anstelle von niedrigeren Pfadblöcken verwenden, nur nicht umgekehrt. Nur bestimmte Blöcke können die Ruhe eines Gebietes beeinflussen, und es gibt verschiedene Arten von Ruheblöcken. Wenn du eine Nutzpflanze wie z.B. Kartoffeln in das Gebiet legst, erzeugst du ein wenig Ruhe (mit der Kategorie Nutzpflanzen). Wenn du jedoch wieder eine andere Ernte wie Kartoffeln oder sogar Karotten hinzufügst, wirst du weniger Ruhe bekommen. Wenn du etwas aus einer anderen Ruhekategorie hinzufügst, bekommst du den vollen Effekt. Aber das Hinzufügen von mehr Material mit der gleichen Kategorie hat eine abnehmende Wirkung. Deshalb ist es am besten, so viele verschiedene Arten von Ruhe wie möglich zu verwenden, um aus einem bestimmten Gebiet die größtmögliche Ruhe herauszuholen: Pflanzen, Baumstämme, Blätter, Lava, Netherrack, Ackerland, Wasser, Lebensessenz und andere sortierte Dinge. +guide.bloodmagic.entry.architect.bloodrune.info.1=Während du dich durch die Mod arbeitest, wirst du langsam lernen, dass der schlichte Blutaltar vor dir nicht stark genug ist, um deine wahren Ambitionen zu erfüllen. Indem man spezielle Blöcke, die als Blutrunen bekannt sind, um den Altar legt, kann man die Stärke des Altars beträchtlich erhöhen, indem man höhere Stufen von Rezepten freischaltet und gleichzeitig die Fähigkeiten des Altars selbst erhöht.\n\tUm den Altar auf seine zweite Stufe aufzurüsten, muss man 8 Blutrunen um den Altar und eine Stufe tiefer legen. Wenn du über die genaue Konfiguration verwirrt bist, kann dir der Gegenstand "Inspectoris Scandalum" die genaue Platzierung der Blöcke, die für die nächste Ebene benötigt werden, zeigen. Jede der Runen in einem Blutaltar kann gegen jede Upgrade-Rune getauscht werden (die einzige Ausnahme ist, dass man die Eck-Runen auf Stufe 2 nicht als Upgrade-Runen verwenden kann - ab T3 kann man diese verwenden). Es gibt Runen, die die Geschwindigkeit des Herstellens, die Kapazität des Altars sowie die Effizienz des Opferns am Altar beeinflussen. Diese Runen sind in ihren jeweiligen Einträgen zu finden. +guide.bloodmagic.entry.architect.inspectoris.info.1=Wörtlich "Blockleser" in Latein, soll dieser Gegenstand mehr Informationen über die komplexeren Blöcke in der Mod geben, wenn die Blöcke in der Welt sind. Derzeit ist die einzige Implementierung für diesen Gegenstand der Blutaltar, und durch einfaches Klicken mit der rechten Maustaste auf einen Blutaltar in der Welt wird er dir zeigen, welche Blöcke in der Welt für die nächste Altarebene erforderlich sind. Wenn du dann mit der rechten Maustaste auf den Altar klickst, zeigt der Altar Geisterblöcke in der Welt an, die genau zeigen, wo die Blutrunen und die Säulen benötigt werden, um diese Ebene zu erreichen. Wenn man die angezeigte Schicht auf 1 setzt, wird das Hologramm entfernt. +guide.bloodmagic.entry.architect.runeSpeed.info.1=Die Geschwindigkeitsrune übt einen Druck auf das Becken des Altars aus und zwingt den Umwandlungsprozess, so dass das Herstellen viel schneller geht. Jede Geschwindigkeitsrune erhöht den Verbrauch des Altars um +20% pro Rune, wodurch die Geschwindigkeit des Altars effektiv erhöht wird. Dies beeinflusst auch die Geschwindigkeit, mit der die Blutkugeln vom Altar gefüllt werden. +guide.bloodmagic.entry.architect.water.info.1=Das Wassersiegel ist, wie der Name schon sagt, in der Lage, Feuchtigkeit aus der Luft zu sammeln, um an der Kontaktstelle am Boden eine Wasserquelle zu schaffen. Außerdem kann man durch Anklicken einer Maschine, die eine Flüssigkeit aufnimmt, bis zu 1000mB Wasser in die Maschine einfüllen, und das zu den gleichen Kosten, als ob man sie auf den Boden stellen würde. In jeder Hinsicht wirkt es wie ein unendlicher Eimer Wasser - es funktioniert jedoch nicht, wenn man es in eine Maschine legt. 50LP pro Anwendung. +guide.bloodmagic.entry.architect.lava.info.1=Das Yang zum Yin des Wassersiegels, dieses Siegel erwärmt den Fels in der Umgebung und sammelt ihn an einer Stelle und bildet eine Quelle der Lava, wo das Siegel Kontakt aufnimmt. Ein ähnlicher Prozess findet statt, wenn man mit einer Flüssigkeit aufnehmenden Maschine interagiert und bis zu 1000mB Lava im Inneren der Maschine für die gleichen Kosten erzeugt. Aus irgendeinem Grund verbrennt die Hand nicht, wenn man es benutzt, aber es bedeutet nicht, dass es eine kluge Wahl ist, darin zu baden! 1000LP pro Anwendung. +guide.bloodmagic.entry.architect.lavaCrystal.info.1=Der Lavakristall ist ein Stein, in dessen Mitte sich ein Stück Lava befindet, das seine Wärme nicht verliert. Wenn es als Brennstoffquelle in einem Ofen platziert wird, "brennt" es für eine Menge, die ausreicht, um einen einzelnen Gegenstand in einem Standard-Ofen zum Preis von 50 LP aus dem Netz des Eigentümers zu kochen. Wenn das Netzwerk nicht genügend Energie hat (oder wenn es keinen Besitzer gibt), wird der Kristall einfach nicht brennen und dem Besitzer aufgrund der Belastung Ãœbelkeit zufügen.\n\tDieser Kristall wird für jede Festbrennstoffverbrennungsmaschine funktionieren, die jeden Brennstoff akzeptiert. +guide.bloodmagic.entry.architect.apprenticeorb.info.1=Während du die verschiedenen Geräte benutzt, wirst du schnell feststellen, dass deine maximale Kapazität von 5kLP in deinem LP-Netzwerk schnell erschöpft sein wird. Hier wirst du anfangen, nach einem stärkeren Orb für dein Netzwerk zu suchen.\n\tDie Blutkugel des Lehrlings benötigt einen Stufe-2-Altar und hat eine maximale Kapazität von 25kLP. Es erlaubt außerdem, mächtigere Gegenstände und Runen zu erstellen. +guide.bloodmagic.entry.architect.dagger.info.1=Nach einer Weile der Stärkung durch Selbstopferung, kannst du versuchen, das Blut der Mobs zu opfern. Das Opfermesser, wenn es auf einen Nicht-Boss und Nicht-Spieler neben einem Blutaltar angewendet wird, tötet das Wesen mit einem Schlag und pumpt das ganze Blut in den Altar, wobei es je nach Qualität des Mobs in eine Lebenselixier umgewandelt wird. Normalerweise neigen feindliche Mobs dazu, viel mehr LP zu geben als friedliche Mobs. +guide.bloodmagic.entry.architect.runeSacrifice.info.1=Die Rune der Opferung, wie der Name schon sagt, erhöht den Ertrag aller Aktivitäten, die die Gesundheit der Mobs als Gegenleistung für LP opfern. Jede Rune bietet eine +10%%ige Ertragssteigerung, additiv. +guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=Ähnlich wie bei der Rune der Opferung erhöht die Rune der Selbstopferung den Ertrag der vom Spieler bereitgestellten LP. Jede Rune bietet eine +10%%ige Ertragssteigerung, additiv. +guide.bloodmagic.entry.architect.holding.info.1=Wie du feststellen wirst, gibt es eine Menge nützlicher Zeichen, die verfügbar sind - einige sind umschaltbar, andere aktiv. Dadurch wird das Inventar schnell verstopft. Dieses Siegel kann bis zu fünf weitere Siegel (nein, es kann keine anderen Siegel der Aufbewahrung halten) in seinem internen Inventar halten. Durch Drücken der "Aufbewahrungstaste", Standard 'H', kann die Benutzeroberfläche des Siegels geöffnet werden, um die gehaltenen Siegel neu anzuordnen. Wenn man das Scrollrad verschiebt und benutzt, während es ausgerüstet ist, fährt man durch die enthaltenen Siegel. Sobald du auf dem Siegel landest, das du benutzen willst, kannst du das Siegel so benutzen, als ob es das ausgewählte wäre! Natürlich kannst du mehrere Siegel der Aufbewahrung haben, jedes mit seinem eigenen Inventar. Um festzustellen, welches auf einen Blick welches ist, kann das Siegel mit Hilfe des Alchemietisches eingefärbt werden. Um dies zu tun, wird das Siegel entweder mit einem Farbstoff oder mit einem Namensschild in der gewünschten Farbe im Format 0xZZZZZZ für den Namen im Alchemietisch platziert. +guide.bloodmagic.entry.architect.air.info.1=Das Luftsiegel nutzt eine rudimentäre Form der Spaltung, um durch die Spuren von Wasserdampf in der Luft einen gleichmäßigen Luftstrom hinter dem Benutzer zu erzeugen und ihn nach vorne zu treiben. Im Wesentlichen kann man mit diesem Siegel eine beträchtliche Strecke vorwärts starten. Es ist zu beachten, dass das Siegel die Fallhöhe des Benutzers nur dann aufhebt, wenn es benutzt wird, d.h. dass man die Landung in Bodennähe halten will! +guide.bloodmagic.entry.architect.void.info.1=Wie der Name schon sagt, erzeugt das Siegel der Leere an der Kontaktstelle ein Vakuum, das die Flüssigkeitsquelle, an der es verwendet wird, aufsaugt und die Quelle vollständig zerstört. Dies ist wahrscheinlich am besten in Verbindung mit dem Wassersiegel oder dem Lavasiegel zu verwenden. +guide.bloodmagic.entry.architect.greenGrove.info.1=Durch die Verwendung von Blut als einfacher Wachstumskatalysator wird das Siegel des Grünen Hains die Wachstumsgeschwindigkeit von Pflanzen in der näheren Umgebung erhöhen, während es aktiviert ist. Um das Siegel zu aktivieren, klickt man mit der rechten Maustaste darauf, um zwischen aktiviert und deaktiviert zu wechseln (leicht erkennbar am Tooltip oder an den leuchtenden Symbolen auf dem Siegel). Man beachte, dass das Siegel alle paar Sekunden ein wenig LP vom Benutzer absaugen wird, um das beschleunigte Wachstum zu fördern. Es kann auch für den Anbau von hohem Gras oder anderen Nutzpflanzen verwendet werden, genauso wie Knochenmehl. +guide.bloodmagic.entry.architect.fastMiner.info.1=Wie jeder gute Blutmagier wissen sollte, hat Blut einen hohen Anteil an Eisen in sich. Wenn man geschickt genug ist, kann man Blut manipulieren, während es noch im Körper ist - es sollte jedoch beachtet werden, dass nur die fortgeschrittensten Blutmagier das Blut derjenigen verdrehen können, die nicht willens sind.\n\tIm Prinzip verwendet man es, um die Funktionen des eigenen Körpers zu beschleunigen. Durch die Magnetisierung des Eisens im Blut des Benutzers erhöht das Siegel der Eile die Geschwindigkeit des Abbaus drastisch, indem es Eile II anwendet, während es aktiviert ist. Dieser Magnetismus ist zu schwach, um Dinge außerhalb des eigenen Körpers zu beeinflussen, aber er reicht aus, um Obsidian mit beachtlicher Geschwindigkeit abzubauen. +guide.bloodmagic.entry.architect.seer.info.1=Wenn man am Blutaltar herumbastelt, kann man sich manchmal in den verborgenen Feinheiten seines Wirkens verlieren, die das Siegel der Weissagung nicht zu erahnen scheint. Hier kommt das Siegel des Sehers ins Spiel. Im Wesentlichen ein Upgrade zum Wahrsager-Siegel, bietet dieses Siegel zusätzliche Informationen über verschiedene Eigenschaften des Altars. Diese reichen von der Geschwindigkeit des Altars über die aktuelle LP bis hin zum aktuellen Fortschritt des gefertigten Gegenstandes. Es gibt auch Informationen über das LP-Netzwerk des Spielers. +guide.bloodmagic.entry.architect.magicianOrb.info.1=Eine neue Stufe, eine neues Blutkugel. Dieses Mal musst du, um im Mod weiter zu kommen, die Blutkugel des Magiers selbst herstellen. Im Standardrezept kann man sehen, dass es 25kLP braucht, um es zu fertigen, aber die maximale Kapazität des Blutaltars ist 10kLP. Das bedeutet, dass du für eine erfolgreiche Herstellung LP in den Altar einfügen musst, während er gerade das Orb herstellt. Bereite dich darauf vor, denn es kann eine schwierige Aufgabe sein, wenn du nicht alles hast, was du brauchst! +guide.bloodmagic.entry.architect.capacity.info.1=Man ist sich nicht ganz sicher, wie es funktioniert, aber die Rune der Kapazität erhöht die Kapazität des Blutaltars zusätzlich um 2 kLP. Vielleicht gibt es eine Art Resonanzeffekt, der das Volumen der LP verringert, so dass man mehr in das statische Becken packen kann? Es gibt dir eine Idee, wie du es weiter verbessern kannst, aber....\n\tEs sollte wiederholt werden, dass die Größe der Eingangs- und Ausgangspuffer 10% der maximalen Kapazität des Haupttanks beträgt, also werden diese Runen auch die Pufferkapazitäten erhöhen. +guide.bloodmagic.entry.architect.displacement.info.1=Standardmäßig ist die Ãœbertragung von LP zwischen Puffer- und Haupttank auf 20LP/s begrenzt. Für Systeme, die LP entfernen und dem Altar wieder hinzufügen wollen, ist diese Geschwindigkeit ein träges Kriechen. Da kommt diese Rune ins Spiel. Die Rune der Verlagerung erhöht die Menge an LP, die pro Operation übertragen wird. Jede Rune multipliziert die Transferrate mit 1,2x und stapelt multiplikativ. Eine Rune wäre also 24LP pro Operation, zwei Runen wären 28,8LP pro Operation und drei Runen 34,56LP. Wenn du 20 Runen auf einem Altar hast, überträgt dieser bis zu 767 LP pro Operation - das würde einen vollen Altar in nur 13 Sekunden leeren. +guide.bloodmagic.entry.architect.affinity.info.1=Auf den ersten Blick gewährt das Siegel der Elementaffinität einfach Immunität gegen Feuer, Ertrinken und Schäden aus der Höhe, wenn es aktiviert ist. Die Bedienung ist jedoch viel nuancierter. Dieses Siegel erzeugt eine dünne Luftbarriere um den Benutzer herum, indem es den Schweiß (und bei Bedarf Blut) des Benutzers verwendet und den Körper von den harten Elementen fernhält. Diese Luftbarriere wirkt als Puffer zwischen der Haut und dem Feuer oder der Lava und zirkuliert bei Bedarf, um eine Ãœberhitzung zu verhindern. Es füllt auch die Lunge unter Wasser, um den Druck des Körpers und des umgebenden Wassers auszugleichen. Bei einem Sturz aus großer Höhe verschiebt sich die Luft schließlich unter die Füße und dämpft den Sturz. +guide.bloodmagic.entry.architect.lamp.info.1=Es gibt eine ganze Reihe von "Unreinheiten" im Körper und im Blut eines Menschen. Indem du einige Edelgase erntest und sie mit einer Wärmequelle umhüllst, kannst du eine Lichtkugel erzeugen, die über eine große Entfernung geschleudert werden kann und an der Oberfläche haften bleibt, auf die sie auftrifft.\n\tDas Siegel der Blutlampe hat zwei Verwendungszwecke: du kannst entweder direkt auf einen Block klicken und eine Lichtquelle platzieren oder ein Projektil abfeuern, das eine Lichtquelle an der Kontaktstelle erzeugen wird. Diese Lichtquellen können wie Fackeln in einem Schlag zerbrochen werden. +guide.bloodmagic.entry.architect.magnetism.info.1=Dieses Siegel magnetisiert das Eisen im Blutkreislauf des Benutzers, um kleine Gegenstände in Richtung des Siegels zu ziehen, was eine schnelle und schmerzfreie Aufnahme ermöglicht. Im Wesentlichen wirkt dies wie ein Gegenstandsmagnet, aber anstatt Gegenstände in Richtung des Spielers zu "saugen", veranlasst es den Spieler, den Gegenstand aus der Ferne aufzunehmen, so dass Gegenstände nicht überall herumfliegen müssen. Zum Glück ist der Magnetismus so abgestimmt, dass er keine lebenden Objekte anzieht, so dass man keine Creeper findet, die einen plötzlich mit Mach 3 umarmen wollen. + +guide.bloodmagic.entry.architect.peritia.info.1=Bestimmte Aktionen in der Welt beeindrucken den Menschen: Das Töten von Monstern, Bergbauelementen und das Schmelzen von Barren oder Nahrungsmitteln kann zu Erfahrungen führen, die sich über einen längeren Zeitraum angesammelt haben. Durch einige arkane Mechanismen, einige Strukturen und Geräte können dir diese Erfahrungen tatsächlich entzogen werden, um ihre eigenen Prozesse zu fördern. Es kann daher nützlich sein, diese Erfahrungen in irgendeinem Medium zu speichern. Obwohl einige Behälter Erfahrung als physische Substanz speichern, erlaubt der Peritia-Foliant der Person, ihre Erfahrungen in das Buch zu schreiben - indem er in den Band schreibt, werden die Seiten mit deinen Gedanken und vergangenen Handlungen durchdrungen und sie für den späteren Gebrauch gespeichert. Wenn du dann diese Erfahrungen zurückgewinnen möchtest, kannst du deine Hand auf die Seite halten und sie zurücksaugen; dies wird die Schrift von der Seite entfernen und diese Aktionen zurück in dein Gedächtnis übertragen.\n\tNun für den tatsächlichen Gebrauch; indem du auf den Wälzer in deiner Hand klickst, kannst du einen Erfahrungslevel im Buch speichern (oder auf den Anfang des Levels, wenn du Teilerfahrung hast). Mit einem Rechtsklick auf den Wälzer kannst du das nächste Level erreichen, wenn genügend Erfahrung im Buch gespeichert ist. Die Gesamterfahrung sowie die entsprechende gespeicherte Stufe wird im Tooltip des Folianten angezeigt. +guide.bloodmagic.entry.architect.livingArmour.info.1=Jeder Person in Minecraft, besonders in den neueren Versionen der Welt, wird bewusst, dass eine gute Rüstung einen Unterschied zwischen Leben und Tod bedeutet. Normalerweise wählt man bei der Auswahl einer Rüstung einen statischen Satz von Vorteilen - bietet diese Rüstung mehr Schutz? Bekomme ich die Fähigkeit, zu fliegen, wenn ich das trage? Kann ich wirklich hoch springen oder mich schnell bewegen? Das sind alles gültige Optionen für eine Rüstung, aber man kann nie ein Set bekommen, das genau auf seine Bedürfnisse zugeschnitten ist. Zumindest das dachten die Leute. Ein Set Lebendiger Rüstung ist eine konstruierte Lebensform, die mit einer einfachen Eisenrüstung integriert ist. Wenn es getragen wird, geht es eine symbiotische Beziehung mit dem Benutzer ein - wenn man sich bewegt, bewegt es sich. Wenn man angreift, greift es an. Wenn man isst, spürt es das und kompensiert es. Und genau wie ein normaler menschlicher Körper beginnt es zu wachsen und zu stärken, je nachdem, was man tut, indem man es durch seine Handlungen trainiert.\n\tLass mich ein Beispiel nennen: Wenn du eine neue Rüstung ausrüstest und viel herumläufst, wirst du feststellen, dass du ein Upgrade auf der Brustplatte namens "Schnelle Füße" erhältst - dieses Upgrade bietet eine stufenweise Erhöhung deiner Geschwindigkeit, während die folgenden Stufen einen größeren Schub bringen. Du wirst auch feststellen, dass die "Upgrade-Punkte" jetzt "3/100" lauten - jedes Upgrade erfordert eine Anzahl von Upgrade-Punkten, und die Brustplatte hat eine maximale Anzahl von Punkten, die sie halten kann. Wenn ein Upgrade, das du erhalten kannst, nicht mit der Anzahl der kostenlosen Upgrade-Punkte erhältlich ist, die du hast, kann es nicht erworben werden. Behalte im Hinterkopf, dass die Lebende Rüstung nur trainiert wird, wenn du eine vollständige Rüstung anhast, und die Effekte der Rüstung nur wirksam werden, wenn eine vollständige Rüstung verwendet wird.\n\tDie maximale Anzahl von Aufrüstungspunkten kann auf verschiedene Weisen verändert werden. Eine von ihnen ist es, alchemistische Zubereitungen zu kreieren, die die Bindungen zwischen dem Benutzer und der Lebenden Rüstung stärken und die Anzahl der Punkte, die man auf einer bestimmten Ausrüstung haben kann, enorm erhöhen. Ein Beispiel ist der "Trank der Engelsmacht", der die maximale Punktzahl auf 200 erhöht. Informationen über diese Gebräue und wie man sie herstellt, können in "Der Alchemist" gefunden werden. +guide.bloodmagic.entry.architect.upgradeTome.info.1=Manchmal ist man mit den Aufrüstungen, die man für die Lebende Rüstung erhalten hat, nicht zufrieden. Mit dem Ritual "Klang der reinigenden Seele" (weitere Informationen unter "Der Ritualmeister") können alle Aufrüstungen von der Rüstung entfernt und in Form von "Thesen der Lebenden Rüstung" erhalten werden. Klicke mit der rechten Maustaste darauf, während du einen kompletten Satz Lebende Rüstung trägst (und Platz für die Aufrüstung hast), um die Eigenschaft zu deiner Rüstung hinzuzufügen. Diese Thesen können auch in einem Amboss kombiniert werden - wenn man zwei der exakt gleichen Thesen (gleiches Upgrade, gleiche Stufe) in einem Amboss kombiniert, kann man eine einzelne These erhalten, die eine Stufe höher ist. Wenn du also Schnelle Füße II mit einem anderen Schnelle Füße II kombinierst, erhälst du Schnelle Füße III. Diese These kann dann in gleicher Weise auf die Rüstung aufgebracht werden. +guide.bloodmagic.entry.architect.teleposer.info.1=Der Teleposer ist ein Gerät, das nicht nur Objekte, sondern auch Entitäten teleportiert. Um einen Teleposer einzurichten, benötigst du mindestens zwei Teleposer und einen Telepositionsfokus. Einer der Teleposer fungiert als das Ziel und der andere als der Anfang. Um das einzurichten, musst du zuerst den Fokus an dich binden, indem du mit der rechten Maustaste darauf klickst. Dann klickst du mit der rechten Maustaste auf den Ziel-Teleposer, um seine Position (und Dimension) zu speichern, und fügst dann den Fokus in den beginnenden Teleposer ein, indem du mit der rechten Maustaste auf den Teleposer ohne Fokus in deiner Hand klickst und den Fokus in das GUI platzierst.\n\tMit einem starken Redstonesignal kann ein Teleposer aktiviert werden, wodurch die Teleposer alle Entitäten und Blöcke tauschen, vorausgesetzt, dass ein Teleposer an der Zielposition existiert.\n\tDu kannst entweder einen Teleposer haben, der einen Fokus hat, beide Teleposer haben Fokusse, die miteinander verbunden sind, oder du kannst einen Teleposer haben, der mit einem anderen Teleposer verbunden ist, der nicht mit ersteren verbunden ist, also abhängig davon, wie du sie einrichtest, kannst du sehr komplizierte Systeme haben.\n\tBeachte, dass der Teleposer derzeit nur die Blöcke und Entitäten vertauscht, die sich direkt über dem Block befinden, und die Größe hängt vom Fokus ab - der T1-Fokus vertauscht nur den Block über dem Teleposer, der T2-Fokus vertauscht einen 3x3x3-Bereich über dem Teleposer usw. +guide.bloodmagic.entry.architect.boundTool.info.1=Ähnlich wie bei der Gebundenen Klinge werden diese gebundenen Werkzeuge (Spitzhacke, Axt und Schaufel) irgendwann modifiziert, um besser in die Mod zu passen. Wie bei der Klinge haben die Werkzeuge einen aktiven und einen inaktiven Modus, zwischen denen man durch Klicken mit der rechten Maustaste umschalten kann.\n\tEtwas, das diese Werkzeuge haben, ist etwas, das man "Beast Mode" nennt. Wenn du die rechte Maustaste gedrückt hältst, kannst du das Werkzeug aufladen und einen mächtigen Spalt freisetzen, der sofort die Blöcke zerbricht, die von dem gegebenen Werkzeug gebrochen werden können - wenn es vollständig aufgeladen ist, ist das ein 11x11x11 Würfel über dir zu einem Preis von 10kLP. Sei vorsichtig mit diesem mächtigen Werkzeug, da es dein letztes sein kann! +guide.bloodmagic.entry.architect.weakShard.info.1=Alles, was Leben hat, kann die ätherischen Verbindungen haben, die als das Seelen-Netzwerk bekannt sind. Wie aus euren Erfahrungen hervorgeht, können auch nicht-lebende Dinge ein Seelen-Netzwerk haben, wie Siegel und Rituale; aber diese Verbindungen sind die stärksten in den Geschöpfen und natürlich den Menschen. Wenn du ein Monster mit einer Gebundenen Klinge angreifst, wird ihr Seelen-Netzwerk vorübergehend hart und ein Stück davon wird nach dem Tod bleiben. Dieses Stück hat die Form eines Schwachen Blutsplitters, so benannt nach der Tatsache, dass sein rötlicher Farbton der Farbe der Schwachen Blutkugel entspricht. An diesem Punkt ist es nicht klar, ob es stärkere Formen von Blutsplittern gibt, aber man kann sagen, dass dies sehr hilfreich wäre, um die Macht des eigenen Seelen-Netzwerks zu erhöhen. +guide.bloodmagic.entry.architect.masterOrb.info.1=Eine der Anwendungen für diese erhöhte Affinität zum Seelennetzwerk ist die Verwendung des Schwachen Blutsplitters in einer neuen Blutkugel: der Blutkugel des Meisters. Diese Kugel hat eine maximale Kapazität von 1 Million LP und ermöglicht so dem Besitzer den Zugriff auf mächtigere Gegenstände und Rituale. Vielleicht sind Meteore doch in Reichweite... +guide.bloodmagic.entry.architect.runeOrb.info.1=Diese Rune kann zunächst als etwas nutzlos angesehen werden. Durch die Verdickung der Verbindungen zwischen der Blutkugel im Altar und dem Seelennetzwerk erhöht die Rune der Kugel die maximale Kapazität einer Blutkugel, die von einem Blutaltar gefüllt wird, um +2%% pro Rune. Für so etwas wie die Schwache Blutkugel ist das nur eine Kapazität von +100LP, für die Blutkugel des Meisters ist das jedoch eine bemerkenswerte Kapazität von +20kLP pro Rune. Wenn du eine hochrangige Blutkugel und Platz für ein paar zusätzliche Runen auf deinem Altar hast, kann das etwas sein, das dein Netzwerk abrunden wird. +guide.bloodmagic.entry.architect.suppression.info.1=Das Siegel der Verdrängung verwendet die Technologie, die in einem Teleposer verwendet wird, um Flüssigkeiten, die sich in seiner Nähe befinden, vorübergehend zu verdrängen. Dazu werden die Flüssigkeiten in einer Kugel um den Benutzer herum in eine verstecktes Taschendimension teleposiert und die Flüssigkeit durch Luft ersetzt. Da das Feld des Teleposers überladen wird, ist die Teleposition vorübergehend - wenn der Benutzer den Bereich, in dem die Flüssigkeit entfernt wurde, verlässt oder das Siegel deaktiviert, springt die Flüssigkeit an die Stelle zurück, an der sie vorher war, als ob nichts geschehen wäre, vorausgesetzt, es gibt dort keine neu platzierten Blöcke. Dies ermöglicht einen ausgefallenen Transport zu Fuß, unter Wasser zu gehen, anstatt durch das Wasser zu schwimmen oder sogar die roten Seen des Nethers zu teilen. +guide.bloodmagic.entry.architect.haste.info.1=Zucker und Koffein sind interessante Chemikalien, die der menschliche Körper verarbeiten kann. Das eine dient als Energiereservoir, das schnell verbrannt wird, während der andere die Wachsamkeit erhöht und den Zugang zu Energie auf andere Weise ermöglicht. Indem diese chemischen Prozesse nachgeahmt werden, um mehr chemische Energie freizusetzen, ermöglicht das Siegel der Hast dem Benutzer, seine Bewegungsfähigkeit zu erhöhen. \n\tWährend es aktiviert ist, kann der Benutzer viel schneller laufen und deutlich höher springen. Darüber hinaus bietet das Siegel auch "Step Assist", das es dem Benutzer ermöglicht, einen Block hohe Grate zu überwinden, ohne zu springen. Es ist wie ein automatisches Springen, nur weniger schlecht. +guide.bloodmagic.entry.architect.severance.info.1=Teleportation ist eine dieser seltsamen Mächte, die die Menschen nicht vollständig erklären können. In den meisten Fällen kann die Teleportation als eine temporäre Verwerfung in der Raumzeit beschrieben werden, die zwei Orte im Raum miteinander verbindet, so dass das betreffende Objekt einfach auf die andere Seite "treten" kann. Das Siegel der Endertrennung versucht, diese Verzerrung zu stoppen, die die Teleportation erfordert, und verhindert, dass Kreaturen sich teleportieren, wenn sie in der Nähe des Benutzers sind. Dies stoppt nicht einige der größeren Teleportationsmittel wie Portale, aber es wird Endermen daran hindern, ihre Kräfte zu nutzen, sich in der Nähe des Nutzers zu teleportieren. +guide.bloodmagic.entry.architect.teleposition.info.1=Das Telepositionssiegel hat einen Teleposer und Fokus in seiner Struktur. Wenn du mit der rechten Maustaste auf einen Teleposer mit diesem Siegel klickst, kannst du die Koordinaten und Abmessungen an das Siegel binden. Wenn du nun mit der rechten Maustaste auf das Siegel klickst, wird es dich direkt zum Teleposer teleportieren (falls dieser vorhanden ist). Leider scheint es nicht möglich zu sein, eine Rückfahrt zu machen.... +guide.bloodmagic.entry.architect.compression.info.1=Ein Bergarbeiter wird schnell feststellen, dass sein Inventar während einer langen Expedition mit Redstone Staub, Lapis und anderen Materialien gefüllt wird. Die meisten von ihnen haben Rezepte, die sie zu Speicherblöcken wie Redstone-Blöcken und Diamantblöcken komprimieren, aber sie benötigen normalerweise eine Werkbank, um sie zu kombinieren. Dieses Siegel faltet ein kleines Kompressionsfeld im Inventar des Benutzers, wenn es aktiviert wird, und komprimiert Gegenstände auf die niedrigste Anzahl von Slots, die für das Inventar benötigt werden. Das heißt, wenn du 63 Redstone Staub hast, wird es nichts bewirken. Wenn du jedoch 64 Staub hast, werden 9 von ihnen zu einem Block aus Redstone komprimiert. Das ist zwar technisch nicht die ideale Situation, wenn du genau einen Stapel Redstone-Staub hast, aber es garantiert, dass du nicht durch volle Taschen im Staub zurückbleiben. Wenn andere Mods vorhanden sind, funktioniert dies auch für andere Rezepte. +guide.bloodmagic.entry.architect.bridge.info.1=Wenn aktiviert und während der Benutzer auf festem Boden steht, verfestigt das Siegel der Phantombrücke die Luft unter dem Benutzer, so dass er sie betreten kann, wodurch im Wesentlichen eine Phantombrücke entsteht. Wenn du in der Luft kriechst, bildet sich die Brücke direkt unter dir, so dass du dich in der Luft fangen kannst, falls du fällst. Obwohl eine gewisse Kalibrierung notwendig ist, um es sowohl für die vertikale als auch für die horizontale Bewegung bei schnellen Bewegungen effektiver zu machen (da die Entstehung der Brücke verzögert wird), ist es ein ausgefallener Weg, um effektiv zu verschiedenen Bereichen zu fliegen. +guide.bloodmagic.entry.architect.mimic.info.1=Mimics sind arkane Konstrukte, die dazu bestimmt sind, das nachzuahmen, worauf sie eingestellt sind. Wenn die Mimik mit irgendeiner Form von Block in Kontakt kommt, verschieben ihre Moleküle ihre Orientierung, um die Form, das Aussehen und das Gefühl des Blocks anzunehmen. Allerdings werden nicht alle Eigenschaften kopiert: Ein normaler Mimikblock, der mit Glowstone in Berührung kommt, gibt beispielsweise kein Licht ab.\n\tBei normalem Gebrauch gibt es zwei Möglichkeiten, einen Mimikblock zu benutzen. Der erste ist, den Mimikblock zu platzieren und dann mit der rechten Maustaste mit dem Block, der kopiert werden soll, auf die Mimik zu klicken. Dadurch wird der Block innerhalb der Mimik platziert und die Mimik nimmt die "Standard"-form des Blocks an. Wenn also ein Mimikblock mit einer Treppe angeklickt wird, wird sich die Mimik immer auf die gleiche Weise orientieren.\n\tDie zweite Methode ist, den Mimikblock in der Hand zu halten und auf den zu ersetzenden Block zu klicken. Dadurch wird der Block durch die Mimik ersetzt und die Mimik hat genau die gleiche Ausrichtung wie der ersetzte Block. Das kann man bei Treppen und Truhen sehen, aber auch bei anderen orientierungsabhängigen Blöcken wie z.B. Holzstämmen.\n\tEs gibt einige verschiedene Varianten der Mimikblöcke. Der Opake Mimikblock ist die Standardmimik, das die Form und die allgemeinen Eigenschaften von Blöcken annehmen kann - Licht kann sich jedoch nicht durch diese hindurchbewegen, daher sollte man mit Glas vorsichtig sein. Der ätherische opake Mimikblock kann ohne Probleme durchlaufen werden, da dieser keine Hitbox hat, die perfekt für versteckte Türen ist. Klare Mimikblöcke funktionieren genauso wie ihre undurchsichtigen Varianten, lassen aber Licht durch sie hindurch, auch wenn es völlig fest erscheint. Schließlich ist der Leuchtende Mimikblock undurchsichtig und fest, aber egal, was sich darin befindet, er strahlt ein starkes Licht aus. Keine dunklen Bereiche mehr in deiner Basis ohne Fackel-Spam! Es gibt eine spezielle Variante der Mimik, vor der du dich in Acht nehmen solltest: der Empfindsame Mimikblock. Wenn ein Spieler zu nahe an einen von diesen in der Welt kommt, wird dieser aufstehen und mit einem hohen Grad an Grausamkeit angreifen. Diese sind in verschiedenen Bereichen vorzufinden, aber sie sind besonders von Verliesen angetan. Wenn man eine Truhe nachahmt, sollte man jedoch vorsichtig sein: Sie beißen....\n\t***Nur Kreativmodus***\n\tEs gibt einige interessante Funktionen, die du jedem Mimikblock hinzufügen kannst, wenn du dich im Kreativmodus befindest. Wenn du mit der rechten Maustaste auf eine platzierte Mimik mit einem Trank oder einer Trankflasche klickst, kannst du die Mimik so einstellen, dass sie Tränke um sie herum erzeugt, wenn ein Spieler in der Nähe ist. Wenn es eine normale Mimik ist und du auf die Ost- oder Westseite klickst, kannst du den Radius, in dem der Trank entsteht, vergrößern oder verkleinern. Wenn du auf die Nord- oder Südseite klickst, kannst du den Radius vergrößern oder verkleinern, den die Mimik vor dem Erstellen der Tränke nach Spielern um sie herum sucht. Wenn es sich um einen empfindsamen Mimikblock handelt, kannst du überall auf den Mimikblock klicken, um den Erkennungsradius für Spieler zu vergrößern oder zu verkleinern - wenn sich ein Spieler in diesem Bereich befindet und den Block sehen kann, wird die Mimik erstellt und den Spieler anfallen.\n\tEine weitere Sache ist, dass, wenn der Block auf die Mimik gesetzt wird, während der platzierende Spieler im Kreativmodus ist, wird der Block, der nachgeahmt wird, NICHT fallen gelassen, wenn die Mimik zerstört wird.\n\tZu guter Letzt wird die Mimik, falls sie auf irgendeinem Inventar oder eine Kiste gesetzt wird, diese Kiste bzw. das Inventar samt Inhalt fallen lassen, sobald sie besiegt wurde - eine reguläre Mimik wird stattdessen den Inhalt auf dem Boden verteilen, falls sie zerstört werden sollte. +guide.bloodmagic.entry.architect.downgrade.info=Bitte lese den Eintrag "Sühne der belasteten Seele" in "Der Ritualmeister" für eine detaillierte Erklärung darüber, was diese sind und wie man sie erhält. + +guide.bloodmagic.entry.architect.augmentedCapacity.info=Die Rune der erweiterten Kapazität funktioniert ähnlich wie die Rune der Kapazität in dem Sinne, dass sie die Kapazität des Blutaltars erhöht. Allerdings werden mehrere Runen auf dem gleichen Altar miteinander in Resonanz treten, was die Kapazität exponentiell erhöht, je mehr es gibt. Eine Rune allein wird die Kapazität des Altars um +10%% erhöhen, aber das funktioniert multiplikativ mit anderen Runen mit erhöhter Kapazität: Wenn es zwei Runen gibt, ist es eine Zunahme um +21%%, drei Runen um +33,1%%, usw.\n\tUnglücklicherweise ist dieser multiplikative Effekt nicht mit der Rune der Kapazität stapelbar, was bedeutet, dass man immer noch nur den Bonus von +2kLP pro Rune erhält. +guide.bloodmagic.entry.architect.charging.info=Die Aufladungsrune ist eine jener Schönheiten, die den Betrieb des Blutaltars vollständig in etwas verwandeln wird, das als nützlicher für die Herstellung aus einem Guss angesehen werden kann. Durch das langsame Absaugen der LP vom Blutaltar beginnt die Aufladungsrune mit der Speicherung von "Aufladung", einem internen Wert des Blutaltars, der mit dem Siegel des Sehers sichtbar ist. Wenn der Blutaltar genügend Ladung hat, wenn er etwas zum Herstellen bekommt, wird er die erforderliche Ladung sofort verwenden und den Gegenstand sofort herstellen. Wenn nicht genügend Ladung vorhanden ist, wird die Ladung verwendet, um den Fortschritt des Gegenstands in einem Verhältnis von 1:1 Ladung:LP zu erhöhen. Die maximale Ladungsmenge, die im Blutaltar gespeichert werden kann, ist eine Funktion der Anzahl der Ladungsrunen, die er mit der aktuellen Kapazität des Altars multipliziert hat (die Kapazität des Altars tritt nur in Kraft, wenn sie größer als 20k ist). Die Rate, die er auflädt, hängt auch direkt von der Geschwindigkeit des Altars ab, mal der Anzahl der Aufladungsrunen, die er hat, und er wird LP alle 20 Ticks (eine Sekunde) in Charge umwandeln. Wenn ihr also einen Blut-Altar mit dieser Rune entwerfen wollt, dann müsst ihr alle synergistischen Beziehungen, die sie hat, sorgfältig abwägen. +guide.bloodmagic.entry.architect.acceleration.info=Im Gegensatz zu den meisten Runen funktioniert die Beschleunigungsrune nur dann am besten, wenn sie mit anderen Runen gepaart wird, und ihre Wirkung nimmt nur begrenzt zu. Was diese Rune tut, ist, dass sie die Anzahl der Verarbeitungs-Ticks erhöht, die in einem bestimmten Zeitraum auftreten können, insbesondere wenn es um die Rune der Verlagerung und die Aufladungsrune geht. Für jede hinzugefügte Rune verringert sich die Anzahl der Ticks vor dem nächsten Verarbeitungs-Tick um eins. Zum Beispiel verdrängt die Rune der Verdrängung standardmäßig Flüssigkeiten mit einer Geschwindigkeit von einer Operation pro 20 Ticks - bei 10 Beschleunigungsrunen würde dies mit einer Geschwindigkeit von einer Operation pro 10 Ticks geschehen.\n\tDie maximale Anzahl der Beschleunigungsrunen, die derzeit von Bedeutung sind, ist natürlich 19 - wenn du so viele hast, werden die Rune der Verdrängung und die Aufladungsrune beide ihre Effekte jeden Tick aktivieren. Noice! + +guide.bloodmagic.entry.architect.tier3.info=Es ist bekannt, dass ein Altar der Stufe 3 erfordert, dass man vier Säulen mit Glowstoneblöcken aus dem Nether bedeckt. Was nicht durchweg verstanden wird, ist, dass man stattdessen Seelaternen verwenden kann. Wenn du dich also sehr weit weg vom Nether befindest, aber Zugang zu den Ozean-Tempeln hast, kannst du andere Wege nutzen, um dich in der Blutmagie weiterzuentwickeln. + +# Demon Kin Entries +guide.bloodmagic.entry.demon.intro=Bella Highborn +guide.bloodmagic.entry.demon.snare=Dämonischer Wille und Fallen +guide.bloodmagic.entry.demon.forge=Höllenfeuerschmiede +guide.bloodmagic.entry.demon.petty=Winziges Juwel des Tartaros +guide.bloodmagic.entry.demon.sword=Empfindsames Schwert +guide.bloodmagic.entry.demon.lesser=Kleines Juwel des Tartaros +guide.bloodmagic.entry.demon.reactions=Unerwartete Reaktionen +guide.bloodmagic.entry.demon.sentientGem=Empfindsame Rüstung +guide.bloodmagic.entry.demon.routing=Gegenstands-Routing +guide.bloodmagic.entry.demon.aura=Dämonische Willensaura +guide.bloodmagic.entry.demon.types=Verschiedene Typen von Wille +guide.bloodmagic.entry.demon.crucible=Dämonenschmelztiegel +guide.bloodmagic.entry.demon.crystallizer=Dämonenkristallisierer +guide.bloodmagic.entry.demon.cluster=Dämonische Kristallgruppen +guide.bloodmagic.entry.demon.pylon=Dämonenpylon +guide.bloodmagic.entry.demon.gauge=Dämonischer Auramesser + +# Demon Kin Entry Texts +guide.bloodmagic.entry.demon.intro.info=Mein Name ist Bella Highborn, und ich bin bekannt als das Dämonenkind. Vor einigen Monaten wurde mein Dorf von einer Welle von Dämonen angegriffen, die alle anderen Menschen töteten und dabei jedes einzelne Gebäude zerstörten. Ich erinnere mich nicht viel von dem Angriff, außer den Schmerzensschreien, da jede Person, die ich kannte, diese Welt für eine glücklichere verließ. Glücklicherweise hörten mich die Dämonen nicht, als ich mich unter die Obstkörbe im Keller der Kirche von Intactilis kauerte und verzweifelt versuchte, meine Schreie davon abzuhalten, sich dem Chor anderer Stimmen anzuschließen. Es gab einen schrecklichen Moment, als ich versehentlich den Räucheraltar der Kirche niedergerissen habe und ein Dämon in das Heiligtum kam, unbeirrt von dem, was wir für einen heiligen Ort hielten. Es war ein riesiges vierbeiniges Monster, mit geschwungenen Stoßzähnen, die an einem hervorstehenden Mund vorbei hingen, wobei der Speichel auf gezackte Schwerter tropfte, die seine Krallen ersetzten. Es hat sich im Raum umgesehen und ich schwöre, dass wir uns für eine Sekunde gegenseitig in die Augen gesehen haben, aber dann ist es einfach weggegangen, als ob es nichts gehört oder gesehen hätte. Alles danach war verschwommen. Es war ein ganzer Tag, bevor jemand kam, um zu sehen, was passiert ist. Eine Handelskarawane sah den Rauch in der Ferne und beschloss, den langen Weg an den Dämonen vorbei zu gehen. Viele der Händler wollten mich nicht einmal anschauen, weil sie befürchteten, dass es ein schlechtes Omen war, weil ich es allein schaffte, unbeschadet zu überleben. Aber zwei Brüder beschlossen, Mitleid mit mir zu haben und den Rest der Karawane davon zu überzeugen, mich mitfahren zu lassen. Ich musste den Zauberstab und das Medaillon der Priesterin verkaufen, aber ich schaffte es, einen sicheren Weg in ein Dorf zu finden, das weit genug vom Pfad der Zerstörung der Dämonen entfernt war. +guide.bloodmagic.entry.demon.snare.info.1=Magus sagte mir eines Tages, dass jedes Lebewesen eine Seele hat: Menschen, Hühner, Schafe und sogar Creeper haben diese Lebenskraft, die dem Körper den Willen zum Leben geben würde. Es scheint, dass Magus in seiner Zeit viele Experimente gemacht hat und sogar von einem mächtigen Magier gehört hat, der diese Seelen in leere Gefäße wie Zombies verwandeln könnte. Aber das ließ mich fragen: Wenn Zombies und Skelette keine Seelen hatten, warum hatten sie dann den Willen zu leben? Was animierte sie, damit sie versuchen würden, jedes Lebewesen zu jagen und zu töten?\n\tEs kam alles zu Dämonischen Willen zurück, jedes einzelne Mal. Alles "Lebende" musste einen Willen haben, um zu überleben, aber es bedeutete nicht, dass es ihr eigener sein musste. Als ich das zu Magus brachte, dachte er ein wenig darüber nach, brachte dann eine Tafel und Kreide heraus (von wo, wer weiß) und begann, einige Notizen über andere Formen der Magie zu zeichnen. "In der Thaumaturgie", sagte er, während er die Form eines Strohmannes skizzierte, "sind Golems animierte Wesen, die beauftragt sind, viele alltägliche Operationen durchzuführen. Sie leben, atmen und können sogar sterben, wenn sie bei ihren Herren in Ungnade fallen. In der gegenwärtigen Iteration der Thaumaturgie, und ja, es gab im Laufe der Jahrhunderte mehrere Versionen dieser Kunst, würde der Magier dessen Willen in die unbelebte Schöpfung einfließen lassen und sie zum Leben erwecken.\n\t "Dies, Bella, ist wie Golems arbeiten: durch eine Einprägung von Willen."\n\tAlso wenn ein Golem durch die Einprägung des Willens einer anderen Entität in dessen leere Hülle leben kann, vielleicht bringt eine andere Entität die Körper der Toten als Skelette und Zombies zurück ins Leben. An diesem Punkt zitterte ich und erinnerte mich kurz daran, was in meinem alten Dorf geschah. Nur ein Dämon kann etwas so Grausames tun. Aber um diese Hypothese zu testen, brauchte ich mehr Beweise. +guide.bloodmagic.entry.demon.snare.info.2=Mit etwas Anleitung von Magus und Tiberius, als er mir eine Hand von seiner eigenen Arbeit geben konnte, machte ich mir eine rudimentäre Schlinge aus Eisen, Schnur und ein wenig Redstone. Tiberius, der die Thaumaturgie als disziplinübergreifende Magie seiner Wahl vertieft studierte, sagte, dass die Falle in der Lage sein sollte, den Willen einer Entität zu stören, die ein animiertes Objekt kontrolliert. "Ich habe damit herumgealbert, als ich mit Golems spielte", sagte er lächelnd. Wir alle wussten, wie gut das ausgegangen ist. "Redstone schien die Verbindung zwischen meinen Golems und meinem Willen, sie zu bewegen, zu stören. Theoretisch, wenn etwas die Zombies oder Skelette kontrolliert, solltest du in der Lage sein, den Willen abzuschneiden."\n\tEr sagte, dass alles, was ich tun musste, war, es zu werfen - wenn es funktionierte, sollte etwas weißer Staub für eine gewisse Zeit aus dem Wesen strömen. "Also musst du es töten, wenn das passiert, damit wirklich etwas passiert. Aber die Schlinge könnte nur zu 25%% der Zeit funktionieren, also sei ein wenig großzügig mit ihnen!", nachdem ich sechzehn von ihnen hergestellt hatte, ging ich während der Nacht mit meinem Schwert aus. Es war ziemlich heikel: Ich musste mehrere Zombies ausfindig machen, mich ducken und ihnen ausweichen, während ich ein paar Fallen auf sie warf. Sobald die weißen Partikel von ihnen abgelöst wurden, tötete ich sie schnell und nahm die Ãœberreste ihrer Körper auf. Eine kleine Menge einer blauen viskosen Flüssigkeit schien in dem körnigen Staub zu liegen, der mir zu mir rufen zu schien. Ich hob es auf, und es schien, als käme eine jenseitige "Präsenz" aus der Flüssigkeit. Als ich die Proben schnell verstaute, entschied ich mich, sie tiefer zu betrachten, als ich nach Hause kam. Es schien, dass die Größe und Form jedes "Dämonischen Willens" variierte, als ob die Qualität des Willens von der Quelle abhängt. Mit einer völlig willkürlichen Maßeinheit scheint der Wille, den ich von den Fallen bekommen habe, zwischen null und fünf "Willensqualität" zu liegen. Ich bin mir noch nicht sicher, wofür ich diese Substanz verwenden kann, aber sie ist trotzdem sehr faszinierend. Ich kann nicht sagen, ob dies der Abdruck des Willens eines Dämons ist, oder nur ein zufälliger Kristall, der in ihren Körpern gefunden wurde. Mehr Forschung ist notwendig. +guide.bloodmagic.entry.demon.forge.info.1=Ich habe mehrere Wochen damit verbracht, den Nutzen und die Eigenschaften des dämonischen Willens zu erforschen. In den letzten Tagen gab es einige Erfolge, aber nur selten. Tiberius fragte mich neulich, ob er eine Probe des dämonischen Willens für ein paar seiner anderen Experimente nehmen könnte: Er erwähnte, dass es das sein könnte, was er brauchte, um einen neuen Blutaltar zu bauen, um das ramponierte Becken zu ersetzen, das wir in Magus' Keller benutzten, da der Versuch, dieses alte Ding mit nur Stein zu replizieren, nie den richtigen Behälter für unsere Blutmagie zu schaffen schien.... Mit anderen Worten, er denkt, es könnte helfen. Es war keine komplette Verschwendung. Ich habe verschiedene Alchemie-Lehrbücher zu "Äquivalente Umwandlung" und den vielen verschiedenen Möglichkeiten, Materie zu manipulieren, konsultiert. Ich sprach auch mit ein paar Alchemisten, die vorbeikamen, und sie gaben mir ein paar Tipps, wie man Materie und Energie dekonstruieren kann, um sie genauer zu studieren. (Als Nebenbemerkung muss ich sagen, dass ich die dunkelviolette Rüstung liebte, die ein Alchemist trug - schon beim Betrachten fühlte ich mich, als würde ich von einem dichten Gegenstand angezogen. Von Tiberius mal ganz abgesehen!) Durch die Verwendung dieser einfachen Anordnungen mit den kleinen Proben, die ich hatte, konnte ich sehen, dass es Möglichkeiten gab, die Energiequelle im Inneren des dämonischen Willens anzuzapfen. Ich brauchte nur die richtige Konfiguration. +guide.bloodmagic.entry.demon.forge.info.2=Gerade heute habe ich es geschafft, eine Struktur zu entwickeln, von der ich glaubte, dass sie Elemente mit diesem rohen Willen zusammenfügen würde. Als "Höllenfeuerschmiede" bezeichnet, verwendet die Struktur eine einfache, in das Glas geschnitzte Alchemische Anordnung, um bis zu vier Gegenstände miteinander zu verschmelzen und sie mit dämonischem Willen zu injizieren. Das Stück dämonischen Willens wird auf der rechten Seite platziert und die vier Zutaten werden um den Kreis gelegt. Es scheint, dass es viele verschiedene "Rezepte" in dieser Schmiede gibt, aber es gibt einige Bedingungen für diese. Für den Anfang gibt es ein Minimum an dämonischen Willen, der in der Probe sein muss, damit sich die Gegenstände verbinden können - wenn es nicht genug Willen in der Struktur gibt, scheint nichts zu passieren. Zunächst scheint es, dass, obgleich es eine minimale Menge des Willens benötigt, die meisten Rezepte nicht den gesamten Willen der Probe verwenden. Einige Rezepte benötigen eine große Menge an dämonischem Willen, um den Prozess zu starten, aber nur ein wenig wird in der Herstellung verwendet, wenn überhaupt. Einige Rezepte scheinen in großen Mengen sehr einfach zu erstellen zu sein, aber andere... nicht so sehr. +guide.bloodmagic.entry.demon.petty.info.1=Ich ging auf eines meiner nun allnächtlichen Abenteuer, um etwas dämonischen Willen zu sammeln, als ich anfing, eines der größten Probleme mit der Sammelmethode zu erkennen: meine Tasche wurde immer voller von all den Proben! Aus irgendeinem Grund, vielleicht weil die ultimative Quelle des dämonischen Willens für jede Probe anders ist, würde der Wille nicht in eine überschaubare Form komprimiert. Zumindest die physische Manifestation des Willens. Also ging ich zur Arbeit mit der Höllenfeuerschmiede, die sich in meiner Ecke des Hauses befand, schob einige von Tiberius' weniger unangenehmen Experimenten beiseite und besorgte einige Rohstoffe für mein eigenes Studium. Eines Tages werde ich Tiberius eine eigene Schmiede machen, da ich es satt habe, den ganzen Staub, der meinen Arbeitsplatz bedeckt, von seinen "arkanen Experimenten" loszuwerden. Es ist mir egal, dass du "versuchst, die Kluft zwischen den ätherischen Strängen des Seelen-Netzwerks und der physischen Konstruktion der Schiefertafeln zu überbrücken", hol deine verdammte Asche aus meinen Sachen! +guide.bloodmagic.entry.demon.petty.info.2=Wie auch immer, es dauerte eine Weile, um Materialien zu finden, die am ehesten mit dem dämonischen Willen in Resonanz kamen, um ihn besser zu speichern. Lapis scheint der am leichtesten verfügbare Leiter dieser Energie zu sein, der als Weg für den zu kanalisierenden Willen dient. Nachdem ich etwas Redstone als Abschirmung gegen elektrische Felder in der Luft hinzugefügt hatte (zwei Energien zusammengenommen scheinen katastrophale Auswirkungen zu haben, zumindest sagte Magus das), Gold als Dämpfungsmittel und Glas als einfaches Gehäuse, gelang es mir, einen sehr einfaches "Juwel des Tartaros" zu schaffen. Das heißt "ein Juwel aus der Unterwelt, Tartaros." Nach weiteren Tests fand ich heraus, dass dieses Juwel bis zu einer Willensqualität von 64 halten könnte. Als ich danach versuchte, den dämonischen Willen aufzuheben, schien dieser direkt in den Edelstein zu gehen, wenn er nicht voll war - danach schien der Wille einfach... zu verschwinden. Praktisch für meinen Rucksack, aber sonst ein Rätsel. Ich erfuhr auch, dass, wenn ich den Edelstein in meiner Hand halte und mich konzentriere (Rechtsklick), ungefähr 10% der maximalen Kapazität des Edelsteins in andere Edelsteine fließen würde, die ich auf meiner Person hatte. Ich denke, diese letzte Eigenschaft ist sehr hilfreich, besonders wenn wir andere, mächtigere Juwele entdecken sollten. +guide.bloodmagic.entry.demon.sword.info.1=Meine Fallen haben sich wieder verheddert.\n\tEs scheint keine Rolle zu spielen, wie sehr ich versuche, das Design zu verbessern, die rudimentäre Schlinge scheint nie perfekt zu funktionieren. Es verheddert sich nur die meiste Zeit, und wenn ich es endlich schaffe, einen Zombie damit zu treffen, ist es wahrscheinlicher, dass es nicht funktioniert als dass es tut, was es soll. Um mich davon abzuhalten, mir selbst die Haare auszureißen, ging ich wieder zur Schmiede und machte mich sofort an die Arbeit.\n\tNun, nicht sofort, schließlich musste ich zuerst noch die Asche entfernen. +guide.bloodmagic.entry.demon.sword.info.2=Ich fusionierte die Fähigkeit des Winzigen Juwels des Tartaros, dämonischen Willen zu halten mit einem eisernen Schwert und schuf eine Klinge, die.... sehr stumpf war und kaum mehr Schaden anrichtete als meine Faust. Ich war eigentlich sehr enttäuscht über das Ergebnis, denn es dauerte eine lange Zeit, mit der Schmiede herumzuexperimentieren, sodass sie durch die Belastung, ein Winziges Tatarisches Juwel als Energiequelle zu nutzen, nicht überhitzte.\n\tDoch sobald ich mein Tartarisches Juwel aufhob, begann das Schwert mit einer neuen Energie zu leuchten. Es scheint, dass je höher die Menge des dämonischen Willens, die ich an meiner Person habe, desto mehr Schaden ich mit dem Schwert anzurichten scheine und desto mehr Dämonischer Wille kann von den Kreaturen absorbiert werden. Wann immer du kein Juwel hast, ist die Quantität des Willens sehr.... gering.\n\tNach einem kleinen Test kam ich zu einer anderen Erkenntnis: Je nachdem, was ich töte, bekomme ich unterschiedliche Mengen von Willen. Es scheint proportional zur Menge der maximalen Gesundheit, die das Monster hat - eine Spinne, da sie eine maximale Gesundheit von 8 Herzen hat, gibt 80%% des Willens eines Zombie, der 10 Herzen hat. Das liegt wahrscheinlich daran, dass diese Monster mehr Willen benötigen, um zu animieren. Ich sollte das für spätere Erkenntnisse beachten. +guide.bloodmagic.entry.demon.lesser.info.1=Ich habe mich heute mit Tiberius unterhalten und einige seiner Projekte besprochen. Ich muss sagen, wenn wir über seine Forschung sprechen, scheint es, dass er immer weiter und weiter und weiter geht! Wie auch immer, eine der jüngsten Erfindungen, über die er sprechen wollte, waren seine Siegel: Bis jetzt ist es ihm gelungen, ein Wassersiegel und ein Lavasiegel zu erschaffen, wobei er die Höllenfeuerschmiede benutzte, die ich schließlich für ihn konstruiert habe, um sie zu erschaffen. Ich war mir nicht ganz sicher, wie er sie tatsächlich hergestellt hat - ich wusste, dass er experimentierte, indem er einige Zutaten nahm und sie in der Schmiede mit dem Weinstein als Katalysator kombinierte, aber ich habe ihn noch nicht aktiv experimentieren sehen. Nun, ich habe endlich einen Einblick bekommen, wofür er diese verdammte Asche benutzt.\n\tMal sehen, ob ich genau nachahmen kann, was er gesagt hat. Ahem. "Durch die Verwendung des Dämonenwillens, der in diesen Edelsteinen enthalten ist, um die Inhaltsstoffe umzuwandeln, entsteht eine Reaktion zwischen Dingen, die normalerweise nichts tun, wenn sie kombiniert werden. Indem ich diese erzwungene Synergie nutze, bin ich in der Lage, mehrere arkane Symbole in Muster einzuschreiben, die die Energie zu lenken, die ich selbst hinzufüge, um die gewünschte Aufgabe zu erfüllen." Obgleich es niedergeschrieben nicht sehr anschaulich ist, stell dir sich vor, wie ich das sage, während ich eine Brille den Nasenrücken hochschiebe. Ich bin mir nicht sicher, ob er normalerweise so ist, aber ich schwöre, er wird komplett... wissenschaftlich, wenn er mir die Dinge erklärt. Nach der zugegebenermaßen auffälligen Demonstration kam er dann zum Kern der Diskussion. "Wenn ich versuche, diesen Prozess mit einigen fortschrittlicheren Materialien zu replizieren, scheint es, dass die Reagenzien... explodieren, wenn sie der Alchemischen Anordnung hinzugefügt werden. Sie scheinen sehr instabil zu sein. Ich denken, dass die Zutaten nicht richtig miteinander verschmolzen werden - vielleicht ist nicht genug Energie in der Schmiede, um sie richtig zu verschmelzen."\n\tNachdem ich ein paar Minuten darüber nachgedacht habe, machte ich an die Arbeit - wie ich in einem früheren Eintrag erwähnt habe, dachte ich, dass ein stärkeres Juwel erforderlich wäre, aber ich habe immer noch nicht genau herausgefunden, wie ich das auf elegante Weise machen könnte. Also beschloss ich, dass ein brachialer Ansatz dafür ausreichen würde! +guide.bloodmagic.entry.demon.lesser.info.2=Ich nahm einen Block Lapis, einen Block Redstone und einen Diamanten sowie einen leeres winziges Tartarisches Juwel, das ich herumliegen hatte - Teil eines vergangenen Experiments, das.... nicht gerade gut lief. Alles, was ich dazu sagen kann, ist, dass ich überrascht bin, dass Magus Löcher in einer festen Betonwand einfach verschwinden lassen kann. Dann kombinierte ich diese vier Gegenstände in der Höllenfeuerschmiede mit einem gefüllten winzigen Juwel, um als Energiequelle zu dienen - ein Minimum von 60 Wille scheint erforderlich zu sein. Nach ein wenig Mühe, eine optimale Anordnung zu finden, setzte ich sie dann zusammen und beobachtete, wie der leere Weinstein innerhalb der Schmiede zu wachsen begann.\n\tNur nebenbei, ich versuchte, einen Block Gold statt einen Diamanten zu nutzen, um das Juwel wachsen zu lassen, jedoch scheint es, dass eine weitere Kristallstruktur vorteilhafter ist.\n\tDieses neue, "Geringe Juwel des Tataros" scheint eine wesentlich höhere Kapazität zu besitzen, indem es fähig ist, bis zu 256 Rohen Willen halten zu können. Hoffentlich ist das genug, um Tiberius' Bedarf an großen Mengen an Willen für eine Weile zu stillen. Aber leider scheint es, dass ich dieses Juwel auffüllen muss. Eine weitere lange Nacht liegt vor mir! +guide.bloodmagic.entry.demon.reactions.info=Ich bin heute in einem Krankenbett aufgewacht und habe Schmerzen. Ich öffnete die Augen und sah das dumpfe Magenta, das die Decke des "Mächtige Flüche"-Flügels des Krankenhauses in Veteres bildete, der unserem Dorf am nächsten gelgenen Stadt. Ich war nicht gerade beunruhigt über diese Information: es hat mich so verwirrt, dass ich irgendwie hier gelandet bin, während ich scheinbar nur mit Kratzern und blauen Flecken bedeckt war, plus einem einfachen Gips auf meinem linken Bein. Jemand muss einen "Ossa Fracta"-Fluch auf mich geworfen haben oder so, denn es könnte nur ein einfacher gebrochener Knochen sein! Als Magus mit einer der Schwestern mit einem ernsten Gesicht reinkam, wusste ich, dass es etwas drastischeres war. Anscheinend habe ich einen kleinen Rückschlag mit einem meiner Experimente mit dem neuen Geringen Tatarischen Juwel erlitten und eine kleine, aber kräftige Explosion ausgelöst. So viel konnte ich leicht verstehen, aber das war es nicht: Die Mischung aus Obsidian, Eisen und Diamant, die ich benutzte, beschichtete meinen linken Unterschenkel und bildete eine starre Schale, die nicht entfernt werden konnte. Der Gips, den ich auf meinem Bein hatte, war eigentlich kein Gips, sondern eine Art Runenmatrix, die die hellblaue Schale bedeckte. Ich fragte, was Magus dachte, obwohl ich mir ziemlich sicher war, was passiert war. "Ich glaube", sagte er und blickte auf die Krankenschwester, die ihm aufmerksam zuhörte, bevor sie mich ansah, "dass es einfach eine Art Rückstand ist, der auf Diamanten basiert, was der Hauptgrund dafür ist, dass wir ihn nicht entfernen können. Es ist auch mit etwas... jenseitiger Energie verwebt, was der Hauptgrund dafür ist, dass du hier bist, anstatt in einem Bett in der örtlichen Klinik - das Konglomerat ist seit dem Eldritch-Vorfall ziemlich streng in Bezug auf unbekannte Energie, die direkt mit Menschen in Verbindung ist, also mussten wir sicherstellen, dass es keine Probleme gab. "Ich sehe..." Normalerweise kümmert sich Magus nicht viel um Formalitäten wie z.B. sicherzustellen, dass das Konglomerat über unbekannte Energien informiert ist - ich experimentiere schon eine ganze Weile mit Dämonischen Willen, und es ist nicht so, dass das Konglomerat an unsere Tür klopft, um diese Magie registrieren zu lassen. Ich werde hier nicht viel ins Detail gehen, da ich nicht sehr versiert in der Politik bin, aber ich weiß, dass Magus nur sparsam daran teilnimmt. Das bedeutete, dass die Macht dieses Willens Magus sehr beunruhigte, vielleicht durch einige seiner vergangenen Erfahrungen...?\n\t "Ah gut, genug davon im Moment", sagte Magus und krempelte die Ärmel seiner Roben hoch. "Ich habe versucht, die Schale zu brechen, als ich sie zum ersten Mal sah, offensichtlich nachdem ich überprüft hatte, was sie war. Letztes Mal hatte es keine Wirkung, aber jetzt..." Es gab eine glühende Hitze auf meinem linken Bein, begleitet von einem blendenden roten Licht, als Magus seine Hände auf die blaue Schale schröpfte. Nach einem Moment, der sich wie eine Ewigkeit anfühlte, aber nur ein paar Sekunden gedauert haben muss, begann die Schale zu reißen und zu brechen und zerfiel. Ehrlich gesagt, es war irgendwie enttäuschend. versuchte ich aufzustehen, aber Magus schob mich mit einem kleinen Stoß zurück ins Bett. "Bella, du musst bleiben und dich ausruhen. Du kannst später mit deiner Forschung an den Juwelen fortfahren." Ich war zunächst verärgert, aber das ging schnell vorbei, da ich viel Zeit zum Nachdenken hatte. Der einzige Grund, warum Magus nicht in der Lage war, genau das Gleiche vorher zu tun, war wahrscheinlich, dass ich nach der Explosion immer noch mein Tartarisches Juwel bei mir hatte. Was auch immer mit meinem Bein geschah, musste direkt an den Dämonischen Willen gebunden sein, und sobald mein Juwel genommen wurde, konnte die Schale entfernt werden. Es brachte mich zum Nachdenken... +guide.bloodmagic.entry.demon.sentientGem.info.1=Nach ein paar Tagen "dringend nötiger Bettruhe", die von Magus vorgeschrieben und durchgesetzt wurde, beschloss ich, ein wenig zu recherchieren, vor allem über die empfindsame Ausrüstung, die ich bisher gemacht habe. Es gibt einfach so viel, dass ich nicht über das empfindsame Schwert und den Dämonenwillen im Allgemeinen Bescheid weiß. Sicher, wir wissen etwas von der Theorie, aber wenn man bedenkt, dass Magus und ich diejenigen waren, die die Theorie entwickelt haben, ist es schwer zu sagen, was genau sie ist. Magus sagte mir, dass er immer, wenn er einen Lehrling nimmt, darauf besteht, dass sie neben der Forschung, die er betreibt, eine andere Form der Magie lernen müssen. Tiberius bot mir an, Botanik zu lernen, aber ich spottete über die Idee - ein paar Blumen werden mir nicht viel helfen, wenn ich gegen Dämonen kämpfen muss! +guide.bloodmagic.entry.demon.sentientGem.info.2=Das Juwel der Empfindsamen Rüstung ist ein umschaltbarer Gegenstand, mit dem du deine empfindsame Rüstung an- und ablegen kannst. Wenn du mit der rechten Maustaste auf das Juwel klickst, während du mindestens 16 Dämonenwille in deinem Inventar hast, wird deine Rüstung durch einen Satz empfindsame Rüstung ersetzt, die alle Verzauberungen der ersetzten Rüstung kopiert - wenn du das Juwel wieder deaktivierst, erhältst du deine ursprüngliche Rüstung zurück. Das funktioniert auch, wenn du überhaupt keine Rüstung anhast. Die empfindsame Rüstung wirkt anfangs wie eine einfache eiserne Rüstung, die keine zusätzlichen Fähigkeiten außer Schutz bietet. Ähnlich wie andere empfindsame Werkzeuge bietet die Rüstung jedoch mehr Schutz, wenn du mehr Dämonenwille in deinem Besitz hast. Dies macht den Schutz wirklich mächtig, wenn man eine große Menge an Dämonenwille angesammelt hat. Der Nachteil dabei ist, dass jeder Treffer, den du nimmst, ein kleines Stück Dämonenwille aus deinen tatarischen Juwelen extrahiert, und wenn du zu niedrig wirst, wird deine Rüstung wieder in ihre ursprüngliche Form zurückkehren. Könnte unangenehm werden! +guide.bloodmagic.entry.demon.routing.info=Der Gegenstandstransport in der Blutmagie kommt von der Verbindung von Strängen des Dämonischen Willens zwischen Verteilerknoten, die als Leitungen dienen, um Gegenstände von einem Inventar in ein anderes zu transferieren. Lassen Sie uns zunächst erklären, wie jedes einzelne Element funktioniert: Jedes Verteilersystem benötigt einen Haupt-Verteilerknoten, der als Gehirn des Systems fungiert. Ein Eingangsknoten gibt Elemente in das System ein, und ein Ausgangsknoten gibt Elemente aus Ihrem System aus, und ein normaler Verteilerknoten hat keine spezielle Funktion.\n\tUm ein Netzwerk zu erstellen, musst du Knoten durch Shift-Klicken mit dem Knoten-Router miteinander verbinden. Solange ein Knoten irgendeinen Weg zu einem anderen Knoten verfolgen kann (und wenn er mit einem Haupt-Verteilerknoten verbunden ist), können sie miteinander kommunizieren.\n\tAllgemein kann gesagt werden, dass Gegenstände aus einem Inventar neben einem Eingangsknoten gezogen und in ein Inventar neben einem Ausgangsknoten gelegt werden. Um festzulegen, was wohin geht, sollte ein Filter verwendet werden. Durch Klicken auf eine der Schaltflächen in der Schnittstelle des Knotens kann ausgewählt werden, was in der angegebenen Richtung in das Inventar gelangt (N steht für Norden usw.). Wenn ein Gegenstandsfilter in den linken Schlitz des Knotens gesetzt wird, kann die Anzahl und Art der Elemente angeben werden, mit denen der Knoten auf Grundlage des Filters interagieren kann. Wenn ein Filter auf einen Eingabefilter gesetzt wird, können nur solche Gegenstände aus dem Bestand gezogen (es wird mindestens der angegebene Betrag zurückbehalten, wenn eine Menge angegeben ist). Wenn ein Filter auf einen Ausgabefilter gesetzt wird, kann nur diese Art von Gegenständen in das Inventar gelegt werden, bis zu einem Maximum der angegebenen Menge.\n\tEs gibt vier verschiedene Filterarten:\n\tPräzise - Der Gegenstand muss genau übereinstimmen, einschließlich NBT und Metadaten\n\tMod - Der Gegenstand passt, wenn er von einem der gefilterten Mods stammt.\n\tIgnoriere NBT - Der Gegenstandsfilter berücksichtigt keine NBT-Daten\n\tOre Dictionary - Jeder Gegenstand, der mit einer Ore Dictionary-Referenz der Filter übereinstimmt, ist erlaubt.\n\tDu solltest zwei Nummern sehen, wenn du den Filter in einen Knoten einsetzt: Die Menge und die Priorität. Wenn du auf einen der Gegenstände im Filter klickst, erscheint der Name des ausgewählten Gegenstands und darunter dessen Anzahl. Durch Setzen dieser Nummer kann dem Filter mitgeteilt werden, wie viele dieser Gegenstände im angeschlossenen Inventar auf Lager gehalten werden (entweder bis zu diesem Betrag, wenn es sich um einen Ausgabeknoten handelt, oder um den Betrag, der im Inventar verbleibt, wenn es sich um einen Eingabeknoten handelt). Wenn der Betrag des Filters auf 0 gesetzt ist, wird jede Menge für diesen bestimmten Filter erlaubt. Eingabeknoten ziehen so viel wie möglich aus dem Inventar, und Ausgabeknoten entziehen so viel wie möglich.\n\tDie zweite Zahl ist die Priorität des Knotens, geändert durch die Pfeiltasten daneben. Diese Nummer ist für jede Seite des Knotens unterschiedlich. Der Knoten, der die NIEDRIGSTE NUMMER im Netzwerk hat, wird zuerst verwendet. +guide.bloodmagic.entry.demon.aura.info=Wenn ein Wesen normal getötet wird, verdunstet es mit der Zeit und kehrt zu dessen Schöpfer zurück. Wenn es mit einer Schlinge gefangen wird, wird es aus dem Ätherischen in diese Ebene gezogen und steckt irgendwie fest. Wir haben dessen Programmierung im Grunde gebrochen, und es hat alle Aktionen eingefroren. Wenn wir es verbrennen, kehrt es in einen ätherischen Zustand zurück und kann den normalen Betrieb wieder aufnehmen. Wenn dieser Wille in die Luft gespritzt wird, können wir ihn auf verschiedene Weise nutzen. Einige von ihnen sind einfacher Natur, während andere ziemlich mächtig sind. Jedes Stück hat seinen eigenen gespeicherten Willen, wobei jede Art von Willen einzeln gespeichert ist (mehr dazu in einem anderen Abschnitt). Dieser Wille kann von anderen Blöcken und Gegenständen aufgerufen und manipuliert werden. +guide.bloodmagic.entry.demon.types.info=Bis jetzt ist die einzige Art von Dämonenwille, die wir besprochen haben, der rohe Wille. Wie der Name schon sagt, ist es die roheste und unverfälschteste Form des Willens, die es gibt, aber das bedeutet nicht, dass es rein ist. Tatsächlich nimmt Dämonischer Wille viele verschiedene Formen an: Roh ist der Typ, mit dem wir es normalerweise zu tun haben, aber es gibt auch korrosiv, zerstörerisch, rachsüchtig und standhaft. Der rohe Wille besteht aus einer Mischung aller vier dieser Typen und vielleicht mit anderen, noch unentdeckten Typen, aber wenn man sie einmal in diese verschiedenen Willenstypen aufgeteilt hat, scheint es unmöglich, sie zu rekombinieren.\n\tEs ist noch nicht klar, ob diese verschiedenen Typen von Willen aus verschiedenen Quellen stammen, aber wir kennen den Prozess der Erzeugung dieser verschiedenen Typen von Willen. Das Ritual "Resonanz des facettierten Kristalls" kann einen rohen Willenskristall in seine reinen Teile zerlegen, mehr dazu im entsprechenden Eintrag in "Der Ritualmeister". Ein Gerät, um rohe Willenskristalle zu erhalten, ist der Dämonenkristallisierer, dessen Eintrag weiter unten zu finden ist. Es mag mehr Arten von Willen geben, aber sie sind entweder nicht rein genug oder können einfach nicht in dieser Form erschaffen werden.\n\tKorrosiv repräsentiert den Wunsch, alle Dinge um sich herum zu zerstören, entweder mit Säure oder durch zermalmende Kraft. Wer diesen Willen beherrscht, kann lähmende Status-Effekte ausüben und ist immun gegen schreckliche Gifte.\n\tRachsüchtig kann als das Verlangen angsehen werden, ein Ziel ohne Ermüdung zu jagen. Normalerweise kann dies entweder als eine erhöhte Geschwindigkeit des Körpers gesehen werden, die Beute zu suchen, oder um sicherzustellen, dass ein Ziel nicht in der Lage ist, zu entkommen, während es ständig angegriffen wird.\n\tZerstörerisch, wie du wahrscheinlich ahnst, ist pure Kraft. Wenn dieser Wille richtig eingesetzt wird, können Angriffsstärke und allgemeine körperliche Fähigkeiten gewonnen werden. Es kann auch verwendet werden, um Dinge zu zerquetschen und zu zerschlagen, wenn es in anderen Anwendungen verwendet wird.\n\tStandhaft ist das Verlangen, sich von Schaden zu schützen. In den meisten Fällen sind die Herren dieses Willens das defensive Bollwerk der Gruppe, das in der Lage ist, mächtigen Angriffen standzuhalten und sie nicht einmal zu spüren. Wenn du am Leben bleiben musst, durch Rüstung oder durch Rituale, ist dies eine Wahl, die in Betracht gezogen werden sollte. +guide.bloodmagic.entry.demon.crucible.info=Der Dämonenschmelztiegel ist ein Gerät, das in der Lage ist, den Dämonenwille in einem tartarischen Juwel und anderen Gegenständen zu verbrennen, um ihn in die Aura des Chunks, in dem er sich befindet, zu injizieren. Es gibt verschiedene Möglichkeiten, den Tiegel zu benutzen: Eine der einfachsten Möglichkeiten ist es, ein tartarisches Juwel in den Tiegel zu legen, indem man mit der rechten Maustaste darauf klickt und ein solches Juwel in der Hand hält. Der Tiegel entleert dann den Willen aus dem Juwel, bis entweder die Aura mit dieser Art von Willen gesättigt ist (standardmäßig maximal 100) oder bis das Juwel leer ist.\n\tEin anderer Modus ist, das enthaltene Juwel zu benutzen, um den Willen aus der Aura zu ziehen - dies geschieht, indem man ein starkes Redstonesignal an den Tiegel anlegt und dann wird das enthaltene Juwel versuchen, so viel Willen wie möglich zu entziehen.\n\tZu guter Letzt kann ein einzelnes Stück dämonischen Willens verbrannt werden, solange die Aura genügent Platz bietet. Ein Beispiel dafür ist ein Willenskristall, der einen Wert von 50 hat. +guide.bloodmagic.entry.demon.crystallizer.info=Wie zuvor besprochen, ist die Dämonen-Aura die ätherische Manifestation des Dämonenwillens, und die Substanz, die man erhält, wenn man einen Mob tötet, ist dessen physische Manifestation. Der Dämonenkristallisierer fungiert als Ankerpunkt für den Dämonenwillen in der Aura, sodass sich dieser daran physisch manifestieren kann und verwandelt den ätherischen Willen wieder in eine physische Form als Kristalle.\n\tSicher wundert es dich, warum man den Willen nicht einfach aus einem tartarischen Juwel in einen Kristall formen kann. Denn indem wir den Willen in seine ätherische Form transformieren, reinigen wir ihn und erlauben dem Willen, seinen normalen Betrieb wieder aufzunehmen - denke daran, dass wir die Programmierung des Willens einfrieren, wenn wir ein Monster mit Dämonenwillen töten, so dass es nicht tun kann, wozu es ausgesandt wurde. Durch die Umwandlung in die ätherische Form in der Aura wird der Wille aktiver, und das ist der Wille, der vom Kristallisierer ergriffen wird. Schaut es einfach nicht komisch an.\n\tDamit der Dämonenkristallisierer funktioniert, muss er in einem Chunk mit einem hohen Anteil an Dämonen-Willen (80) eines bestimmten Typs stehen. Nach einer gewissen Zeit wird er den Willen der Aura verbrauchen, um eine Gruppe Dämonenkristalle mit einem einzigen Turm zu erschaffen. Es gibt zwei Möglichkeiten, wie der Kristallisierer wirken kann: Er kann einen Kristall aus einem bestimmten Willenstyp (korrosiv, zerstörerisch, rachsüchtig und unerschütterlich) bilden, wenn es genug Willen dieses bestimmten Typs gibt, oder er wird den rohen Willen aus der Aura nehmen, um einen Kristall zu erschaffen. In früheren Inkarnationen des Geräts war es möglich, rohen Willen aus der Aura in andersartige Kristalle zu verwandeln. Das ist jedoch nicht mehr der Fall: Ihr könnt immer noch neue Türme eines bestimmten, angestrebten Willens erschaffen, wenn es genug davon in der Aura gibt, aber ihr müsst andere Mittel suchen, um die vielen Aspekte vom rohen Willen zu trennen. Siehe den Eintrag "Resonanz des facettierten Kristalls" in "Der Ritualmeister" für weitere Details. +guide.bloodmagic.entry.demon.cluster.info=Der Dämonen-Kristallhaufen kann entweder von einem Dämonen-Kristallisator oder in der Höllenfeuer-Schmiede mit Dämonen-Will-Kristallen erschaffen werden. Handwerkliche Cluster können auf jeder festen Oberfläche, wie z.B. dem Boden, den Wänden und den Decken platziert werden. Es gibt maximal sieben Türme auf dem Kristall, wenn er ausgewachsen ist, und wenn er mit einer Spitzhacke gebrochen wird, wird er die Türme als Dämonen-Will-Kristalle fallen lassen. Wenn du jedoch mit der rechten Maustaste auf den Cluster klickst, wenn du einen Weinstein mit mehr als 1024 rohem Willen in ihm hast, kannst du einen einzelnen Turm aus dem Cluster abbrechen, ohne den Cluster selbst zu brechen; dies wird niemals den Hauptturm aus dem Cluster brechen.\n\tWenn der Cluster zu seinen eigenen Geräten zurückkehrt, wird er einen Willen des gleichen Typs aus der Aura absaugen, um sich langsam zu entwickeln. Es gibt zwei Rituale, die benutzt werden, um diese Kristalle zu züchten und zu ernten: die "Versammlung der Verlassenen Seelen" und der "Riss des gebrochenen Kristalls ". Um herauszufinden, wie man sie benutzt, finde diese in "Der Ritualmeister". +guide.bloodmagic.entry.demon.pylon.info=Wie ihr vielleicht wisst, bleibt die Dämonen-Aura in ihrem eigenen Chunk, wenn es keine äußeren Einflüsse gibt. Nun, das ist einer dieser Einflüsse. Der Dämonenpylon fungiert als Leuchtfeuer für den Willen in der Aura und zieht den Willen aus den benachbarten Chunks (die Chunks, die in den vier Himmelsrichtungen direkt daneben liegen, nicht diagonal) in seinen Chunk. Der Pylon wird versuchen, den Willen in seinem Chunk mit seinem Nachbarn auszugleichen, so dass der Chunk des Pylons für jeden Willenstyp so viel Willen hat wie sein höchster Nachbar. Dieser Prozess geschieht jedoch nur in eine Richtung: Wenn der benachbarte Teil weniger Wille hat als der Teil des Pylons, wird der Wille nicht auf die Nachbarn übertragen. +guide.bloodmagic.entry.demon.gauge.info=Um zu sagen, wie viel Wille du in einem bestimmten Chunk hast, brauchst du einen Dämonischen Auramesser. Wenn sich dieser in deinem Inventar befindet, zeigt die Anzeige den Willen in dem Chunk an, welcher auf fünf Balken oben links auf dem Bildschirm abgebildet wird. Wie viel es genau ist, kann an der Verschiebung erkannt werden; rechts neben den Balken erscheinen Zahlen, die den Betrag auf die nächste ganze Zahl gerundet darstellen. + + + +# Alchemy Entries +guide.bloodmagic.entry.alchemy.intro=Einführung +guide.bloodmagic.entry.alchemy.ash=Arkane Asche +guide.bloodmagic.entry.alchemy.speed=Bewegungs-Anordnung +guide.bloodmagic.entry.alchemy.updraft=Aufwind-Anordnung +guide.bloodmagic.entry.alchemy.bounce=Abprall-Anordnung +guide.bloodmagic.entry.alchemy.turret=Skelettgeschütz-Anordnung +guide.bloodmagic.entry.alchemy.buff=Effekt-Anordnungen +guide.bloodmagic.entry.alchemy.fastMiner=Anordnung der Eile +guide.bloodmagic.entry.alchemy.furnace=Anordnung des Brennenden Ofens +guide.bloodmagic.entry.alchemy.teleport=Teleportations-Anordnung +guide.bloodmagic.entry.alchemy.standardTurret=Geschütz-Anordnung +guide.bloodmagic.entry.alchemy.laputa=Splitter von Laputa + + +# Alchemy Entry Texts +guide.bloodmagic.entry.alchemy.intro.info=Mein Name ist Vlad Highborn, und ich bin ein Blutmagier. Ich habe die komplizierte Funktionsweise der Alchemie und den Prozess des "Äquivalenten Austausches" studiert, der alle Aspekte der Magie regelt. Grundsätzlich kann man nichts aus dem Nichts erschaffen, obwohl viele es bei der Suche nach einem bestimmten Stein versucht haben. Das ist offensichtlich nicht gut ausgegangen, denn auch heute werden viele Leute durch eine Fälschung getäuscht. Natürlich reicht es nicht aus zu sagen, dass ich Alchemist bin, denn eines der wichtigsten Dinge, die ich tue, ist das Studium der Blutmagie mit dem Ritualmeister und dem Architekten, die beide diese Titel durch ihre eigenen Verdienste erworben haben. Magus und Tiberius waren im Laufe der Jahre damit beschäftigt, ihre eigenen Werke aufzunehmen, obwohl ich nicht glaube, dass Magus alles in einem Buch niedergeschrieben hat - ich habe noch keinen wirklichen Beweis gefunden. Von den Anwendungen der Arkanen Asche bis hin zu den komplizierten Funktionen des Alchemietisches findest du alles, was du über einige der komplexeren Elemente der Welt wissen musst. Nicht alles, was du wissen musst, ist in diesem Buch - für ein vollständiges Verständnis über Blutmagie musst du die anderen Einträge in diesem ganzen Band lesen. Du wirst keine Lügen zwischen diesen Seiten finden. +guide.bloodmagic.entry.alchemy.ash.info=Arkane Asche ist notwendig, um Alchemische Anordnungen zu erzeugen, mächtige Kreise, die verschiedene Effekte erzeugen können. Diese Asche wird mit der Höllenfeuerschmiede und Dämonenwilen hergestellt, wenn dir dieses Konzept also neu ist, konsultiere bitte das "Dämonenkind". Die Asche hat insgesamt zwanzig Verwendungen, bevor du eine weitere herstellen musst. Wenn du mit der rechten Maustaste auf den Boden (oder eine Wand, obwohl sie nur eine Richtung darstellt) klickst, schreibst du einen einfachen Kreis aus Asche ein. Wenn du die Asche erneut mit einem Gegenstand anklickst, wird dieser "in die Asche gelegt" - vorausgesetzt, dass dieser Gegenstand gültig ist, ändert sich die Form des Kreises, um anzuzeigen, dass er für den nächsten Gegenstand bereit ist. Wenn es sich nicht ändert, dann hast du etwas falsch gemacht. Sobald es sich verändert hat, kannst du den zweiten Gegenstand hineinlegen. Wenn dieser Gegenstand mit dem ersten übereinstimmt, beginnt sich der Kreis zu drehen und führt je nach dem Rezept, an dem er arbeitet, verschiedene Aktionen aus. Jeder Effekt, der nicht der Herstellung eines neuen Gegenstands dient, der mit diesen Arrays durchgeführt werden kann, kann in diesem Buch gefunden werden, und selbst wenn sich das Rezept durch Dritte ändert, wird es hier aktualisiert angezeigt. Die angezeigten Artikel sind die Reihenfolge, in der sie platziert werden müssen. +guide.bloodmagic.entry.alchemy.speed.info=Die Bewegungs-Anordnung erzeugt in dessen Zentrum einen kleinen Luftwirbel und nutzt eine kleine Menge an Energie, um diesen aufzuheizen. Danach, wenn ein Tier oder eine andere Art von Wesen in seinen Wirkungsbereich kommt, wird es in der Richtung, in die es durch die Kraft der Luft gebracht wurde, nach vorne geschleudert. Außerdem beseitigt das Array bei einem Sturz aus großer Höhe den Sturzschaden, der entstanden wäre. Sei einfach auf eine leichte Bewegung vorbereitet. Die Bewegungsrichtung ist in Richtung des Pfeils auf der Anordnung. Es sollte auch beachtet werden, dass du eine viel größere Distanz gewinnen wirst, wenn du auf das Array fällst oder springst, als wenn du einfach in sein Gebiet gehst. Das hat mit den Turbulenzen deiner Bewegungen zu tun, die eine viel größere Reaktion hervorrufen. +guide.bloodmagic.entry.alchemy.updraft.info=Mit den gleichen Prinzipien wie das Movement Array, lässt diese Anordnung eine Entität, die darauf trifft, in die Luft steigen. Natürlich muss jeder Benutzer vorsichtig sein, denn der Weg nach unten kann etwas beschwerlich sein! +guide.bloodmagic.entry.alchemy.bounce.info=Durch die Verwendung einer Wärmequelle in der Nähe des Zentrums, die nach unten gedrückt wird, versucht diese Anordnung, den Untergrund zu erweichen. Danach wandelt es Kohlenstoff und Wasserstoff in ein gummiartiges Material im Inneren der Erde um. Diese Kombination führt dazu, dass jede Entität, auf der Oberfläche aufprallt und der Sturzschaden beseitigt wird, der sonst entstehen würde. Dieses Aufprallen kann durch einfaches Schleichen gestoppt werden und dämpft dennoch den Sturz. +guide.bloodmagic.entry.alchemy.turret.info=Durch die Verwendung des Dämonenwillens, der immer noch ein Mob kontrolliert, kannst du den Verstand eines Skeletts übernehmen, um es dazu zu bringen, deine Befehle auszuführen. Wenn sich ein Skelett innerhalb des Bereichs dieser Anordnung befindet, wird es als Wachposten fungieren und feindliche Monster in der Nähe angreifen. Leider ist dieser Anordnung immer noch sehr experimentell, so dass es möglicherweise nicht sehr gut oder konsequent funktioniert. +guide.bloodmagic.entry.alchemy.buff.info=Durch rigorose Studien erkennt man, dass Alchemische Anordnungen ein breites Anwendungsspektrum haben. Bis jetzt ist es dir gelungen, mächtige Gegenstände durch Herstellung mit Alchemischen Anordnungen zu erschaffen, sowie ein paar Anordnungen, die funktionelle Vorteile wie schnelle Bewegung und schwache Formen der Teleportation bieten. Eine der Anwendungen, die du bisher noch nicht genutzt hast, ist die Bereitstellung mächtiger Stärkungszauber durch ein aktives Array.\n\t "Sträkungsanordnungen" sind die allgemeine Bezeichnung für Alchemische Anordnungen, die den Spielern in ihrem Wirkungsbereich einige Stärkungszauber bieten. Diese Wirkungsbereiche haben tendenziell einen sehr großen Radius, der nicht manipulierbar ist (im Gegensatz zu Ritualen). Da Alchemische Anordnungen jedoch kein Konzept eines Seelen-Netzwerks haben, müssen sie ihre Wirkung auf andere Weise entfalten: hauptsächlich durch direkte Blutopfer. Vereinfacht ausgedrückt bedeutet dies, dass die Anordnung, wenn es einen Stärkungszauber anwendet, dem Spieler, auf den es gewirkt wird, Schaden zufügt (HP nimmt). Aufgrund der direkten Natur dieser Opfer ist die HP -> Stärkungszauber-Konvertierung für Spieler im frühen Spiel viel günstiger als ähnliche Buffs im Mod. Wenn zum Beispiel ein Stärkungszauber von einem Siegel 100 LP für 10 Sekunden Aktivierung kostet, kann ein stärkerer Stärkungszauber von dem Array für 30 Sekunden für 1 HP angewendet werden (das sind 100 LP in einem T1-Altar ohne Runen). Dies kann in den frühen Stufen als viel effizienter angesehen werden, während es in den späteren Stufen nicht so effizient ist. Wegen des stationären Charakters der Arrays werden sie jedoch einen stärkeren Effekt haben als ihre Siegelgegenstücke, so dass man sie vielleicht noch im späten Spiel verwenden möchte. +guide.bloodmagic.entry.alchemy.fastMiner.info=Wenn es darum geht, ein großes Stück Land auszuheben, ist es manchmal am besten, es einfach von Hand zu machen. Für diese Gelegenheiten ist diese Anordnung genau das Richtige für dich. Die Anordnung wendet einen Eile III Stärkungszauber auf Spieler innerhalb eines Radius von 10 Blöcken an und kostet den Benutzer 1 HP pro 30 Sekunden. Da es sich um einen allgemeinen Eile-Effekt handelt, erhöht es auch dein Angriffstempo im Wirkungsbereich, obwohl du vorsichtig sein musst, da auch andere Spieler davon profitieren werden! +guide.bloodmagic.entry.alchemy.furnace.info=Eines der vielen Probleme, auf die du zu Beginn deines Abenteuers stoßen könntest, ist die Unfähigkeit, deine Öfen in Betrieb zu halten. Ein angezündeter Ofen kann den Unterschied zwischen einem vollen Magen und starken Waffen oder dem Verhungern in einer Höhle bedeuten. Die Anordnung des Brennenden Ofens, wie der Name schon sagt, wird eine dringend benötigte Wärmequelle für jeden Ofen in der Nähe sein. Indem die Anordnung direkt neben einem gewöhnlichen Ofen platziert wird (es können mehrere sein), wird diese dem Ofen Brennstoff liefern, wenn ein Vorgang abgeschlossen werden kann - nichts wird passieren, wenn es neben einem leeren oder vollen Ofen steht, hauptsächlich zu deinem Schutz. \n\tNatürlich kommt das nicht ohne seine Kosten: wenn sich eine Person in der Nähe aufhält (innerhalb eines Radius von 10 Blöcken), wird die Anordnung ein halbes Herz für bis zu zwei Prozesse im Ofen verbrauchen. Dies wird hilfreich sein, um entweder einen schnellen Biss zu bekommen oder einen vollen Erzstapel zu schmelzen, aber leider hast du keine Möglichkeit gefunden, der Anordnung irgendwelche Sicherheitsmaßnahmen hinzuzufügen... +guide.bloodmagic.entry.alchemy.teleport.info=Das Teleportations-Anordnung dient als Möglichkeit, sofort von einem Ort zum anderen zu reisen, mit einigen spezifischen Einschränkungen. Wenn ein Spieler oder eine andere Entität auf die Anordnung tritt, sucht diese bis zu 20 Blöcke entfernt in der Richtung, in die es zeigt, nach einer anderen Alchemischen Anordnung (die nicht aktiv sein muss). Wenn es der Anordnung gelingt, ein Ziel zu finden, wird sie die Entität sofort zur gefundenen Anordnung teleportieren, sogar durch Wände hindurch. Das Studium dieses Arrays hat gezeigt, dass es weitere Einschränkungen gibt: Wegen der Natur des Biegens des Raum-Zeit-Gefüges wird eine Teleportations-Anordnung nicht etwas teleportieren, das innerhalb von 2 Sekunden teleportiert wurde. Dies soll allen Komponenten Zeit geben, sich in gewünschter Weise neu zu ordnen. +guide.bloodmagic.entry.alchemy.standardTurret.info=Die Macht, spitze Gegenstände auf weit entfernte Monster zu werfen, kann nicht hoch genug eingeschätzt werden. Die Geschütz-Anordnung ist in der Lage, ein feindliches Monster in der Nähe zu spüren und durch die Verwendung komplexer alchemistischer Mechanismen einen Pfeil zurückzuziehen und abzufeuern, um sein Ziel zu treffen. Die Anordnung sucht nach einem Inventar direkt darunter. Findet sie entweder einen normalen oder einen getränkten Pfeil, wird er aus dem Inventar abgezogen und auf einen Mob geschossen, der sich in einem Radius von 32 Blöcken befindet. \n\t(Aufgrund einer dummen Minecraft-Physik, bei der Pfeile von Wesen abprallen, die zu nahe am Entstehungsort sind, wird der Turm auch nur auf einen Mob feuern, der mehr als 3 Blocks entfernt ist. Denke daran!) +guide.bloodmagic.entry.alchemy.laputa.info=Es gibt eine Geschichte über ein verlorenes Königreich, das so fortgeschrittene Magie hatte, dass es durch die Wolken fliegen konnte. Obwohl dieses Königreich inzwischen zu Staub zerfallen ist, haben es einige Zeichnungen dieser Burg am Himmel geschafft, exquisite Details über die Mechanismen zu liefern, die sie zu der Legende werden ließen, die sie ist. \n\tDer Splitter von Laputa wandelt die Lebensessenz, die sich in der Erde befindet, in eine mehr aviäre Form um, wodurch die Umgebung in der Luft schwebt. Während das zugrundeliegende Prinzip einfach ist, verursachen die Variationen der Lebensessenz in der Erde ein wenig Inkonsistenz in der Art und Weise, wie viel Land bewegt wird. Das Array bewegt die Erde in einem kugelförmigen Radius zwischen 4 und 8 Blöcken über sich selbst um einen zufälligen Versatz zwischen einem und 5 Blöcken plus dem doppelten Radius des Effekts. Es sollte beachtet werden, dass, sobald der Effekt beginnt, alle Elemente, die zur Aktivierung des Arrays verwendet werden, verloren gehen. diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index 222ea2ab..19683fb1 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -73,14 +73,14 @@ guide.bloodmagic.entry.ritual.wellOfSuffering.info=For those of you who prefer t guide.bloodmagic.entry.ritual.featheredKnife.info=The Ritual of the Feathered Knife taps into the user's body, draining away their life force in order to fill a blood altar nearby. The ritual will look for a blood altar within its range, checking 5 blocks horizontally and 10 blocks vertically unaltered. When it finds an altar, it will store its location internally - if there isn't an altar nearby, the ritual will not work. When a player then enters within the ritual's damage range, which by default is a radius of 15 blocks horizontally and 20 blocks vertically, the ritual will damage the player for 1HP and then place that health into the connected altar directly (respecting blood runes). There are some safety mechanisms on the ritual, which cause it to not work on a player with less than 30%% of their max health. Unaugmented, the ritual does this once every second.\n\tThere are a few useful augmentations that you can use if you use Demon Will. If Raw Will is consumed by the ritual, the ritual will attempt to damage players within its range at a faster rate, operating twice per second. The ritual will consume 0.05 Raw Will per successful operation.\n\tIf you have more than 10 Steadfast Will in the Aura, the ritual will increase its safety threshold and instead will not work on players with less than 70%% health. This function currently does not consume Will.\n\tIf you have more than 10 Vengeful Will in the Aura, the ritual will remove some of its safety limitations, causing it to work on players until they only have 10%% of their maximum health left. If the ritual also has Steadfast Will augmented onto it the threshold will still be 70%% for the owner of the ritual only. This function currently does not consume Will.\n\tWhen Destructive Will is applied to the ritual, the ritual becomes a lot more efficient with its HP to LP conversion. The amount of LP that is added to the altar per health point increases based on the Will in the Aura, up to a maximum of +20%% for 100 Destructive Will. This effect stacks multiplicatively with runes, Living Armour Upgrades, and Incense. This consumes 0.05 Destructive Will per HP sacrificed.\n\tSpeaking of incense, if Corrosive Will is used in the ritual the ritual will respect the effects of incense on you. If you do not have the Soul Fray debuff on and you are empowered by an Incense Altar, the ritual will consume all of your HP up to the set threshold and pump all of the resultant LP into the altar. It will also remove the incense that you incurred and apply Soul Fray onto you. This effect stacks with the Destructive Will buff. guide.bloodmagic.entry.ritual.regen.info=Arguably one of the best rituals for any potential Blood Mage who wishes to use his own life force to fuel his magic, the Ritual of Regeneration casts a veil of energy around itself, healing entities that find themselves within its range. Every 2.5 seconds the ritual will cast Regeneration I on living entities in its 15 block radius, costing 100LP per player and 10LP per other living entities for the 2.5 seconds of regen. \n\tIf Corrosive Will is used to augment the ritual a second range will be available, a "vampiric range". Any non-player entities within this range will be randomly damaged in order to directly heal players within the regular healing range. This costs 0.04 Will to use and will transfer 1HP per operational tick. guide.bloodmagic.entry.ritual.harvest.info=This ritual will seek any harvestable plant block within its range (default is the 9x9x5 high area above the MRS) and try to harvest it, replanting any seeds if the plant can drop seeds. All of the drops from the plant will appear where the plant was harvested. The ritual will attempt to harvest plants once every 5 ticks and will cost 20LP per successful operation.\n\tPlants that can be harvested include, but are not limited to: pumpkins, wheat, carrots, potatos, nether wart, cactus, reeds. Keep in mind that the ritual makes no assumptions about the thing it is harvesting - it can only harvest mod-added crops if the mod in question registers a harvesting handler with the mod. -guide.bloodmagic.entry.ritual.interdiction.info=Based on an archaic alchemical device of legend, the Ritual of Interdiction attempts to forcibly push all non-player mobs away from the center of the ritual. By default, all mobs that are within two blocks of the MRS are pushed away from the MRS by setting their velocity. It should be noted that mobs within this range are not affected by fall damage, though that safety net wares off as soon as they are pushed away. +guide.bloodmagic.entry.ritual.interdiction.info=Based on an archaic alchemical device of legend, the Ritual of Interdiction attempts to forcibly push all non-player mobs away from the center of the ritual. By default, all mobs that are within two blocks of the MRS are pushed away from the MRS by setting their velocity. It should be noted that mobs within this range are not affected by fall damage, though that safety net wears off as soon as they are pushed away. guide.bloodmagic.entry.ritual.containment.info=The opposite of Interdiction, the Ritual of Containment attempts to pull mobs within its area of effect towards the space above the MRS, suspending them in the air where they cannot move. The default range of the ritual is a 3 block horizontal radius from the bottom of the master stone to the top of the top-most runes, though this range can of course be altered.\n\tThis ritual costs 1LP per mob pulled every tick. guide.bloodmagic.entry.ritual.suppression.info=The Dome of Suppression "suppresses" all liquids in a set radius, able to temporarily replace fluids in a hemisphere with a 10 block radius with air. If the ritual is turned off, this fluid will return in the same state it was before. This costs 2LP per operational tick. guide.bloodmagic.entry.ritual.expulsion.info=If you play on a server you can face a situation where you have unwanted player visitors. Sometimes force fields and giant bloody rotors are not enough of a deterrent and they still manage to get into your base. This ritual attempts to alleviate this through the use of teleportation magic!\n\tIf a player that is not the owner enters the range of the ritual (default 12 block radius) the ritual will teleport the player randomly within a radius of 100 blocks away. However, if there is a chest on top of the MRS with a bound item from a player that player will be exempted from the teleportation, acting effectively like a whitelist.\n\tThe ritual costs 2000LP per successful teleportation. guide.bloodmagic.entry.ritual.zephyr.info=Modelled after an ancient sword of proverb, the Call of the Zephyr uses the power of wind to collect the items that are around it and place them inside of the linked chest (default is right above the MRS). This is done instantly, meaning that the items are teleported directly into the inventory - no need to worry about weird suction effects!\n\tThe default item radius is 5 blocks away from the MRS. guide.bloodmagic.entry.ritual.laying.info=As many are aware, being able to place blocks can be important in various automation tasks. This ritual takes the items/blocks from the connected chest (defaults to on top of the MRS) and places the blocks within the ritual, which is a radius of 2 on the same level as the MRS. This can be useful if you are trying to lay out saplings for a tree farm or if there are other blocks that must be placed. The ritual takes 50LP per successful operation. guide.bloodmagic.entry.ritual.timberman.info=Got wood? This ritual has you covered. The Crash of the Timberman tethers a spectral entity using the LP of the owner to harvest the leaves and logs of all trees within its range and places the results inside of the connected chest. It will try to find all "trees" in a 10 block horizontal radius and up to 30 blocks above the MRS (by default) and use 10LP per felled block. -guide.bloodmagic.entry.ritual.meteor.info=For all intents and purposes, this is one of the most powerful rituals currently in the game. It costs one million LP to activate and can only be used once before needing to be reactivated. The ritual, once specific sacrifices are made, pulls a meteor from outer space and causes it to plummet towards the ground, causing a large explosion once it hits something solid. Because these meteors are not from the Overworld, they can hold a rich ore density never seen anywhere else.\n\tSacrifices can include: an iron block, a gold block, a diamond. This is configurable by the mudpack or user. +guide.bloodmagic.entry.ritual.meteor.info=For all intents and purposes, this is one of the most powerful rituals currently in the game. It costs one million LP to activate and can only be used once before needing to be reactivated. The ritual, once specific sacrifices are made, pulls a meteor from outer space and causes it to plummet towards the ground, causing a large explosion once it hits something solid. Because these meteors are not from the Overworld, they can hold a rich ore density never seen anywhere else.\n\tSacrifices can include: an iron block, a gold block, a diamond. This is configurable by the modpack or user. guide.bloodmagic.entry.ritual.downgrade.info=In order to gain more power, sometimes you have to sacrifice something in return. The Penance of the Leadened Soul does just that - by sacrificing a few items to an unseen entity, you may reduce the effectiveness of some aspect of your Living Armour and get an increase in the number of upgrade points as compensation. When you construct the ritual you have to place an item frame on the top-most Blank ritual stone facing towards the Master Ritual stone, and some sort of inventory (see: chest) on top of the Dusk ritual stone. To acquire a Living Armour Downgrade, you then have to place the key item in the item frame and the consumables in the chest. Once the ritual is activated, you can sneak on top of the Master Ritual Stone at any time and acquire the downgrade.\n\tIn the case of the Quenched Living Armour Downgrade, its key item is a water bottle (placed in the item frame) and the recipe is Dragon's Breath (placed in the chest). The key item is never consumed, but the recipe is.\n\tIn order to view the recipe for the downgrades you can look them up in JEI - check the usage of the Master Ritual Stone and you will see the recipes for the Penance ritual. Also you can just check the recipe for the max level downgrade in JEI and then check the usage of the key item - the key item is always the same for the specific downgrade. guide.bloodmagic.entry.ritual.crystalSplit.info=Once Demon Will has crystalized, there is no way to split it into its many aspects - or so I've thought until now. The "Resonance of the Faceted Crystal" works by separating the many aspects inside of an unaspected (or raw) crystal cluster by using the different aspected ritual stones. \n\tIn order to use the ritual, an unaspected crystal cluster has to be placed two blocks above the Master Ritual Stone. In other words, you can place a crystallizer on top of the MRS and a crystal cluster on top of that and it should work well. Next, you must make sure that there are no blocks directly above the four elemental-based ritual stones, and then wait for the crystal cluster to grow. \n\tAfter the cluster has grown a total of five or more spires, the ritual will split these spires off and create one spire each of Corrosive, Steadfast, Vengeful, and Destructive Will on top of the aspected ritual stones. If the unaspected cluster is allowed to grow further and these new clusters remain intact, the process will repeat and more spires will be added. \n\tThe mechanism for this process is quite simple. When the Raw Will crystal has at least five spires, the ritual breaks off four of these spires and converts the Will into its more incorporeal form. This Will is then pushed threw the final spire of the cluster, which forces the different aspects of the Will into more localized clumps of the particular aspect. This Will is then gathered into the ritual stones, which act as bases for which the new aspected crystal clusters can grow from. @@ -141,14 +141,14 @@ guide.bloodmagic.entry.architect.tier3=Tier 3 Under da Sea # Architect Entry Texts guide.bloodmagic.entry.architect.intro.info=Hello, everyone. My name is Tiberius. You can probably tell by this entry that the book is not exactly complete, and you would be right. Because of the 1.7.10 -> 1.8.9 and 1.9.4 (and above) updates, a lot of stuff has changed in the mod. As such, the books have had to be rewritten. Because the ultimate plan for these documents is to have each book in the form of a research journal / actual book, these documents will take a while to flesh out. As such, I am going to be updating this book periodically in order to fill in the necessary gaps. It will start as flavourless garbage to start with (Yeah... not the most appetizing of illustrations to go with for documents, but whatever!), but slowly it will be morphed into a story about a bunch of blood magi on a journey through discovery.\n\tBut enough about that, I need to get into character. *Cough cough*\n\tMy name is Tiberius, and I am a Blood Mage, and also otherwise known as The Architect. This book contains all of my research regarding the ethereal phenomenon called the "Soul Network," as well as the physical properties of some of the most central devices that any Blood Mage in training should be accustomed to. From the art of laying out the structure of a powerful Blood Altar, to the intricacies of sacrificing life force to increase a mage's power, and further to the powers gained through arcane glyphs and sigils, I have discovered, revised, and created new ways into train one's self to new heights.\n\tSo enter, Mage, for a new realm awaits you!\n\t...Yeah, Magus says that I can get a little grandiose, but what can you do? guide.bloodmagic.entry.architect.bloodaltar.info.1=The Blood Altar is one of the most central devices in the mod. There are two main uses for the altar: either for crafting certain items essential for progressing through the mod, or for filling up one's Blood Orb. Both of these actions require the player to fill up the basin with Life Essence, which can be extracted from two different sources: monsters and peaceful creatures, and the player's own health. -guide.bloodmagic.entry.architect.bloodaltar.info.2=To add your own Life Essence into the basin, you need to craft yourself a Sacrificial Knife and right click it while next to the altar. This will take a heart of health and add a total of 200LP to the unupgraded altar. "LP" is Life Points, which is a measure of how much life force is used in a task - no, it is not like YuGi-Oh. The Blood Altar has a capacity of 10,000LP. If you then right-click on the altar, you can place an item into the basin, and if it is a valid item the altar will start the crafting process.\n\tThe altar crafts an item by consuming the LP in the basin if the altar is a high enough tier. If there is enough LP, the altar will drain a bit of LP from the basin each tick and increase the progress of the crafting, emitting red particles. If there is no longer any LP in the basin, the altar will emit gray particles and the crafting will start to lose progress, which is not good at all! Finally, if the altar is filling up a Blood Orb, the altar will emit purple particles to indicate it is syphoning LP from the basin.\n\tThere are actually a total of three tanks in the Blood Altar: the main tank, which has a default capacity of 10 kLP as previously indicated, as well as an input tank and an output tank which both have 10%% of the total capacity of the main tank. Every 20 ticks by default, the LP in the input tank will transfer to the main tank at 20LP/s, and the LP in the main tank will transfer to the output tank at 20LP/s. As the names suggest, the input tank accepts the LP that is pumped into the altar acting as a buffer to limit the speed of transferring from outside sources, and the output tank can be pulled from using pipes out of the altar. +guide.bloodmagic.entry.architect.bloodaltar.info.2=To add your own Life Essence into the basin, you need to craft yourself a Sacrificial Dagger and right click it while next to the altar. This will take a heart of health and add a total of 200LP to the unupgraded altar. "LP" is Life Points, which is a measure of how much life force is used in a task - no, it is not like YuGi-Oh. The Blood Altar has a capacity of 10,000LP. If you then right-click on the altar, you can place an item into the basin, and if it is a valid item the altar will start the crafting process.\n\tThe altar crafts an item by consuming the LP in the basin if the altar is a high enough tier. If there is enough LP, the altar will drain a bit of LP from the basin each tick and increase the progress of the crafting, emitting red particles. If there is no longer any LP in the basin, the altar will emit gray particles and the crafting will start to lose progress, which is not good at all! Finally, if the altar is filling up a Blood Orb, the altar will emit purple particles to indicate it is syphoning LP from the basin.\n\tThere are actually a total of three tanks in the Blood Altar: the main tank, which has a default capacity of 10 kLP as previously indicated, as well as an input tank and an output tank which both have 10%% of the total capacity of the main tank. Every 20 ticks by default, the LP in the input tank will transfer to the main tank at 20LP/s, and the LP in the main tank will transfer to the output tank at 20LP/s. As the names suggest, the input tank accepts the LP that is pumped into the altar acting as a buffer to limit the speed of transferring from outside sources, and the output tank can be pulled from using pipes out of the altar. guide.bloodmagic.entry.architect.ash.info=Although not strictly part of the overall theme of this book, Arcane Ash is necessary in order to progress through the mod and get some of the more powerful devices available. This ash is crafted using the Hellfire Forge and Demon Will, so if you are new to this concept please consult the "Demon Kin." In essence, this is a way to craft items out of two separate items: a reagent of some sort to act as a catalyst, and a secondary item. \n\tThe ash has a total of twenty uses before you need to craft another. When you right click on the ground (or a wall, though it will only render one direction), you will inscribe a simple circle out of ash. If you click on the ash again with an item, it will be "placed inside of the ash" - assuming that this item is a valid catalyst, the circle will change shape to represent that it is ready for the next item. If it doesn't change shape, then you did something wrong.\n\tOnce it has changed shape, you can then place in the secondary item. If this item matches with the first item, the circle will start rotating and performing different actions depending on the recipe it is working on. After a while, if properly executed, an item will pop out.\n\tAll of the recipes for the Arcane Ash crafting (I call it Alchemy Array Crafting) can be found in JEI by checking the uses for Arcane Ash - the first item shown is the catalyst, and the second item is the secondary item. guide.bloodmagic.entry.architect.divination.info=The Divination Sigil is one of the most useful tools in the mod, able to tell you many values that will make your life easier. This sigil is crafted using a piece of redstone and a blank slate (crafted in the Blood Altar) using an alchemy array.\n\tWhen you right click a Blood Altar with the sigil, you can see the current tier, amount of LP inside of the main basin, as well as the max capacity of the Blood Altar. Spam-clicking the altar with the sigil will overwrite the previous text from the sigil, meaning that there will not be any spam in your chat.\n\tIf you right click in the air with the sigil, the sigil will tell you the current amount of LP that is in your Soul Network. Although this is rather mundane to start with, this function alone will make it very likely that you will want to keep this sigil on you at all times. guide.bloodmagic.entry.architect.soulnetwork.info=The Soul Network (commonly abbreviated as SN) is the term for the connections between the player and all of the items and structures that they have linked their soul to. When a blood mage becomes more powerful, the strength of their soul increases and thickens these bonds. These connections are ethereal strands of the soul, and only the most powerful of Blood Magi are able to see these in their physical form. To date, no mage has attained this ability...\n\tIn-game, the Soul Network is tied directly to the player. The data is stored inside of the world, and every player has only a single network - the LP placed into the network is not stored in any item, but is instead placed and drawn from a single pool. \n\tTo bind things to your network, the most common way is to simply right click an item that uses a network to power itself. Once bound, the item will indicate that it is owned by you and it can never be unbound (with current technology). If this item is used and it has an LP cost attributed to it, it will take the LP from the owner's network. If there is not enough LP in this network, it will take the missing LP directly from the user's health (not the owner's). Be careful when using items when you have a low amount of LP - it could end up being deadly. guide.bloodmagic.entry.architect.weakorb.info.1=What good is any mage without a power source? A Blood Orb is a device that consumes physical LP and transfers it into the owner's Soul Network. Although not a battery itself, it does act as a conduit in order to fill up the power reserves of the blood mage. -guide.bloodmagic.entry.architect.weakorb.info.2=The Weak Blood Orb is the first such orb that you can make. By infusing a diamond inside of a Blood Altar with 2 kLP, you can create this orb. When bound and placed inside of an altar with some LP in it, the orb will syphon from the basin and transfer that LP directly into the network. Each orb has a maximum capacity that can only be extended by advanced runes on the altar. For the Weak Blood Orb, this maximum capacity is 5 kLP.\n\tBlood Orbs can also be filled directly from the player by simply right-clicking with them - this will transfer a heart of health into the orb and give you 200LP. This cannot increase past the orb's maximum capacity.\n\tA Blood Orb can only be filled by its tier of altar or higher; this means that if you have a T3 orb, it has to be filled in an altar that is greater than T3. A simple T1 altar would not do in this situation. +guide.bloodmagic.entry.architect.weakorb.info.2=The Weak Blood Orb is the first such orb that you can make. By infusing a diamond inside of a Blood Altar with 2 kLP, you can create this orb. When bound and placed inside of an altar with some LP in it, the orb will syphon from the basin and transfer that LP directly into the network. Each orb has a maximum capacity that can only be extended by advanced runes on the altar. For the Weak Blood Orb, this maximum capacity is 5 kLP.\n\tBlood Orbs can also be filled directly from the player by simply right-clicking with them - this will transfer a heart of health into the orb and give you 200LP. This cannot increase past the orb's maximum capacity.\n\tA Blood Orb can only be filled by its tier of altar or higher; this means that if you have a T3 orb, it has to be filled in an altar that is greater than or equal to T3. A simple T1 altar would not do in this situation. guide.bloodmagic.entry.architect.incense.info.1=One will quickly find that the speed of LP generation can become increasingly burdensome. Sure, by adding special runes to the Blood Altar you are able to increase the yield of self-sacrificing, but this can be a slow process all the same. If only there was a way to further increase how much LP you can get from yourself?\n\tEnter the Incense Altar. The Incense Altar acts as a central point for a tranquil area, calming the soul itself with the gentle wafts that emanate from the basin. Where this scent comes from you aren't entirely sure, but what could possibly go wrong?\n\tThe goal of this block is to create an area of tranquility to increase how much LP you get from a heart of health. When you are near the block (about five blocks) fire particles will be emitted to show that it is working - when you are affected by this tranquility, your Sacrificial Dagger will transform to indicate that you have an increased yield at the Blood Altar. This process takes about 5 seconds, and you will know you are finished when the fire particles stop appearing. At this point, if you use your Sacrificial Dagger at the Blood Altar you will sacrifice 90%% of your maximum health all at once and pump LP into the altar proportional to the amount of health sacrificed multiplied by a bonus based on how tranquil the surrounding area is: this bonus is +20%% by default.\n\tAs a side note, the Divination Sigil can be used on the Incense Altar to determine the amount of Tranquility as well as how much of a bonus the current altar gives. -guide.bloodmagic.entry.architect.incense.info.2=Of course just an additional 20%% is all well and good, but it can be further expanded by expanding the range of influence of the Incense Altar. If you place a row of three Wooden Path blocks two blocks away from the incense altar in each of the cardinal directions (making sure that all path blocks are on the same y-level, up to five blocks up or down from the incense altar) you can define an area. Any block placed within this area (a block that is the same distance horizontally away from the Incense Altar as the path blocks are horizontally, and on the same level or up to two blocks higher vertically from the path blocks) can add to the Tranquility of the Incense Altar. Another row of path blocks can be added past this initial row following the same rule: the new row must all be on the same y-level as each other, and the entire row has to be within 5 blocks vertically from the previous row of path blocks. This means that layouts such as pyramids, inverted pyramids, or more advanced staircase structures are possible.\n\tAll path blocks have a maximum distance that they can be from the Incense Altar in order to take effect. The Wooden Path blocks are able to work up to a total of three rows from the Incense Altar. Stone paths work up to five, worn stone paths seven and obsidian paths to nine. So at a certain point you have to use better path blocks to extend your tranquility area, however you can use higher tiered path blocks in place of lower tiered path blocks, just not the other way around.\n\tBack to Tranquility. Only certain blocks are able to affect the Tranquility of an area, and there are different types of Tranquility blocks. If you place a crop such as potatoes in the area, you add a bit of Tranquility (using the Crops category). However, if you add another crop like potatoes again or even carrots, you will get less tranquility. Adding something from a different Tranquility category, you get the full effect. But adding more stuff using the same category has diminishing returns. Therefore in order to get the most Tranquility out of a certain area, it is most optimal to mix and match using as many different types of Tranquility as possible.\n\tSome things that add Tranquility are: Crops, logs, leaves, lava, netherrack, farmland, water, Life Essence, and other assorted things. +guide.bloodmagic.entry.architect.incense.info.2=Of course just an additional 20%% is all well and good, but it can be further expanded by expanding the range of influence of the Incense Altar. If you place a row of three Wooden Path blocks two blocks away from the incense altar in each of the cardinal directions (making sure that all path blocks are on the same y-level, up to five blocks up or down from the incense altar) you can define an area. Any block placed within this area (a block that is the same distance horizontally away from the Incense Altar as the path blocks are horizontally, and on the same level or up to two blocks higher vertically from the path blocks) can add to the Tranquility of the Incense Altar. Another row of path blocks can be added past this initial row following the same rule: the new row must all be on the same y-level as each other, and the entire row has to be within 5 blocks vertically from the previous row of path blocks. This means that layouts such as pyramids, inverted pyramids, or more advanced staircase structures are possible.\n\tAll path blocks have a maximum distance that they can be from the Incense Altar in order to take effect. The Wooden Path blocks are able to work up to a total of three rows from the Incense Altar. Stone paths work up to five, worn stone paths seven and obsidian paths to nine blocks from the origin. So at a certain point you have to use better path blocks to extend your tranquility area, however you can use higher tiered path blocks in place of lower tiered path blocks, just not the other way around.\n\tBack to Tranquility. Only certain blocks are able to affect the Tranquility of an area, and there are different types of Tranquility blocks. If you place a crop such as potatoes in the area, you add a bit of Tranquility (using the Crops category). However, if you add another crop like potatoes again or even carrots, you will get less tranquility. Adding something from a different Tranquility category, you get the full effect. But adding more stuff using the same category has diminishing returns. Therefore in order to get the most Tranquility out of a certain area, it is most optimal to mix and match using as many different types of Tranquility as possible.\n\tSome things that add Tranquility are: Crops, logs, leaves, lava, netherrack, farmland, water, Life Essence, and other assorted things. guide.bloodmagic.entry.architect.bloodrune.info.1=As you go through the mod you'll slowly learn that the humble blood altar before you is not powerful enough for you to fulfil your true ambitions. By placing special blocks known as Blood Runes around the altar you are able to expand the altar's strength significantly, unlocking higher tiers of recipes as well as allowing you to augment the abilities of the altar itself.\n\tTo upgrade the altar to its second tier, you need to place 8 blood runes around the altar and one level lower. If you are confused about the precise configuration, the item "Inspectoris Scandalum" can tell you the precise placement for the blocks required for the next tier.\n\tAlthough a blank rune is fine for simply getting your altar upgrade and running to a higher tier, it is advantageous to use upgrade runes for your altar. Each of the runes in a blood altar may be swapped out for any upgrade rune (the only exception to this is that at Tier 2 you cannot use the corner runes as upgrade runes - T3 onwards you can use these). There are runes that affect the speed of crafting, the capacity of the altar, as well as the efficiency of sacrificing at the altar. These runes can be found in their respective entries. guide.bloodmagic.entry.architect.inspectoris.info.1=Literally "Block Reader" in Latin, this item's purpose is to give you more information about the more complex blocks in the mod when the blocks are in the world. Currently the only implementation for this item is the Blood Altar, and by simply shift-right clicking on a Blood Altar in the world it will tell you what blocks are required in the world for the next altar tier.\n\tIf this method doesn't suit you, you may shift-right click the item in the air to cycle through the tiers. If you then shift-right click on the altar, the altar will display ghost blocks in the world, showing exactly where the blood runes and the pillars are required in order to achieve that tier. If you set the displayed tier to 1, it will remove the hologram. guide.bloodmagic.entry.architect.runeSpeed.info.1=The speed rune applies a pressure to the altar's basin, forcing the transmutation process so that crafting is a lot quicker. Each speed rune increases the consumption of the altar by +20%% per rune, effectively increasing the speed of the altar. This also affects the speed at which the blood orbs are filled by the altar at the same rate per rune. @@ -163,7 +163,7 @@ guide.bloodmagic.entry.architect.holding.info.1=As you will start to realize, th guide.bloodmagic.entry.architect.air.info.1=The Air Sigil uses a rudimentary form of fission to generate a steady stream of air behind the user by the traces of water vapour in the air, propelling them forward. In essence, by using this sigil you can be launched forward a considerable distance. It should be noted that the sigil will only cancel the user's fall distance when used, so if you want to stick the landing you have to use it close to the ground! guide.bloodmagic.entry.architect.void.info.1=As the name suggests, the Void Sigil will create a vacuum at the point of contact which will suck up the liquid source that it is used on, completely destroying the source. This is probably best used in conjunction with the Water Sigil or the Lava Sigil. guide.bloodmagic.entry.architect.greenGrove.info.1=By using your blood as a simple growth catalyst of sorts, the Sigil of the Green Grove will increase the growth speed of any plants in a nearby area while activated. To activate the sigil, shift-right click it to toggle between activated and deactivated (easily seen by the tooltip or by the glowing symbols on the sigil). Keep in mind that every few seconds the sigil will syphon a bit of LP from the user to fuel the accelerated growth.\n\tIf used directly on a plant, the sigil will apply a bone-meal effect. This can be used to grow tall grass or other crops, just the same as bone-meal. -guide.bloodmagic.entry.architect.fastMiner.info.1=As any good Blood Mage should be aware of, blood has a high amount of iron within it. If skilled enough, one can manipulate blood while it is still within the body - it should be noted, however, that only the most advanced Blood Mages can twist the blood of those that are unwilling.\n\tOne of the principle uses is to accelerate the functions of one's own body. By magnetising the iron in the user's blood, the Sigil of the Fast Miner increases the speed of mining dramatically, applying Haste II while activated. This magnetism is too weak to affect things outside of one's own body, however it is sufficient enough to mine obsidian and a considerable speed. +guide.bloodmagic.entry.architect.fastMiner.info.1=As any good Blood Mage should be aware of, blood has a high amount of iron within it. If skilled enough, one can manipulate blood while it is still within the body - it should be noted, however, that only the most advanced Blood Mages can twist the blood of those that are unwilling.\n\tOne of the principle uses is to accelerate the functions of one's own body. By magnetising the iron in the user's blood, the Sigil of the Fast Miner increases the speed of mining dramatically, applying Haste II while activated. This magnetism is too weak to affect things outside of one's own body, however it is sufficient enough to mine obsidian at a considerable speed. guide.bloodmagic.entry.architect.seer.info.1=When tinkering around with the Blood Altar, you can sometimes get lost in the hidden intricacies of its operation that the Divination Sigil seems to be unable to divine. This is where the Seer's Sigil comes into play. Essentially an upgrade to the Divination Sigil, this sigil provides additional information about different stats of the altar. These range from the speed of the altar, the current LP, as well as the current progress of the crafted item. It also gives info about the player's soul network. guide.bloodmagic.entry.architect.magicianOrb.info.1=Another tier, another Blood Orb. This time, in order to progress further in the mod you will have to craft yourself the Magician Blood Orb. In the default recipe you can see that it takes 25kLP in order to craft, however the maximum capacity of the Blood Altar is 10kLP. This means that for a successful craft to occur you will need to add LP into the Altar while it is in the process of crafting the orb. Be prepared, since it can be a difficult task if you do not have everything you need! guide.bloodmagic.entry.architect.capacity.info.1=You are not exactly sure how it works the way it does, but the Rune of Capacity increases the capacity of the Blood Altar by 2kLP additively. Perhaps there is some sort of resonance effect that decreases the volume of the LP, therefore allowing you to pack more into the static basin? It does give you an idea on how to improve it further, though...\n\tIt should be reiterated that the size of the input and output buffers are 10%% of the maximum capacity of the main tank, so these runes will increase the buffer capacities as well. @@ -187,7 +187,7 @@ guide.bloodmagic.entry.architect.severance.info.1=Teleportation is one of those guide.bloodmagic.entry.architect.teleposition.info.1=The Teleposition Sigil has a contained Teleposer and focus in its structure. If you right click a Teleposer with this sigil, you can bind the coordinates and dimension to the sigil. Now, whenever you right click the sigil it will telepose you directly to the Teleposer (if it is there). Unfortunately, it doesn't seem like you are able to do a return trip... guide.bloodmagic.entry.architect.compression.info.1=A miner will quickly find that during a long expedition their inventory will become filled with redstone dust, lapis, and several other materials. Most of these have recipes that will compress them down to storage blocks such as redstone blocks and blocks of diamonds, however they normally require a crafting table in order to combine them. \n\tThis sigil creases a miniature field of compression in the inventory of the user when activated, compressing items down to the lowest number of slots needed for the inventory. What this means is that if you have 63 redstone dust it will not do anything. However, if you have 64 dust it will compress 9 of them into a block of redstone. While this is technically not the ideal situation if you have exactly a stack of redstone dust, it will guarantee that you aren't left in the dust due to full pockets. If other mods are present this will work for other crafting recipes as well. guide.bloodmagic.entry.architect.bridge.info.1=When activated and while the user is on solid ground, the Sigil of the Phantom Bridge solidifies the air beneath the user so that they may walk on it, essentially creating a Phantom Bridge. When you are shifting in the air, the bridge will instead form directly underneath you, allowing you to catch yourself in the air if you were falling. Although some calibration is needed in order to make it more effective for vertical travel as well as horizontal travel when moving quickly (due to lag messing up the creation of the bridge), it is a fancy way to effectively fly to different areas. -guide.bloodmagic.entry.architect.mimic.info.1=Mimics are arcane constructs that are designed to mimic whatever they are set to. When the mimic comes into contact with some form of block, its molecules shift their orientation in order to take on the shape, look, and feel of the block. Not all of the properties are copied, however: for instance, a normal mimic block when coming into contact with glowstone will not emit any form of light. \n\tWith normal use, there are two ways to use a mimic block. The first is my placing the mimic block down and then right-clicking the mimic with the block that you want it to copy. This will place the block inside of the mimic and have the mimic take on the -default- shape of the block. So if a mimic is clicked with a stair, the mimic will always orient themselves in the same way.\n\tThe second method is to hold the mimic block in your hand and shift-click the block you want to replace. This will replace the block with the mimic and the mimic will have the exact same orientation that the replaced block had. This can be seen with stairs and chests, as well as other orientation-dependent blocks such as logs.\n\tThere are a few different variants of the normal mimics. The Opaque Mimic is the default mimic, able to take on the form and general properties of blocks - light cannot travel through these, however, so care should be taken with glass. The Ethereal Opaque Mimic can be walked through without any trouble because it has no hitbox, which is perfect for hidden doorways. Clear Mimic blocks work the same as their opaque variants, however they allow light through them even if it appears completely solid. Finally, the Lighted Mimic block is opaque and solid, but no matter what is placed inside of it, it will emit a strong light. No more dark areas in your base without torch spam!\n\tThere is one special variant of the mimic that you have to be warry of: the Sentient Mimic. If a player comes too close to one of these in the world, it will get up from where it is and attack you with a high degree of ferocity. These can be found in a variety of areas, but they are especially fond of dungeons. If one is mimicking a chest, however, be careful: they bite.\n\t***Creative Usage Only***\n\tThere are a few interesting features you can add to any mimic block when you are in creative mode. If you right click on a set mimic with a potion or potion flask, you can set the mimic to spawn potions around it if a player is nearby. If it is a regular mimic and you click on the east or west side, you can increase or decrease the radius that the potion will spawn in. If you click on the north or south side, you can increase or decrease the radius that the mimic will check for players around it before spawning the potions. Finally, clicking on the top or bottom of the block will increase or decrease the potion spawning interval, which is the number of ticks between dropped potions.\n\tIf the mimic is a sentient mimic, you can click the mimic anywhere to increase or decrease the detection radius for players - if a player is within this area and they can see the block, the mimic will spawn and jump at the player. \n\tAnother thing is that if the block is placed on the mimic while the placer is in creative, the block that is being mimicked will NOT drop when the mimic is destroyed.\n\tFinally, if the mimic is placed on any inventory or chest, the sentient mimic will place the chest on the ground with its contents once defeated - the regular mimic will instead just spew the contents everywhere when broken. +guide.bloodmagic.entry.architect.mimic.info.1=Mimics are arcane constructs that are designed to mimic whatever they are set to. When the mimic comes into contact with some form of block, its molecules shift their orientation in order to take on the shape, look, and feel of the block. Not all of the properties are copied, however: for instance, a normal mimic block when coming into contact with glowstone will not emit any form of light. \n\tWith normal use, there are two ways to use a mimic block. The first is placing the mimic block down and then right-clicking the mimic with the block that you want it to copy. This will place the block inside of the mimic and have the mimic take on the -default- shape of the block. So if a mimic is clicked with a stair, the mimic will always orient themselves in the same way.\n\tThe second method is to hold the mimic block in your hand and shift-click the block you want to replace. This will replace the block with the mimic and the mimic will have the exact same orientation that the replaced block had. This can be seen with stairs and chests, as well as other orientation-dependent blocks such as logs.\n\tThere are a few different variants of the normal mimics. The Opaque Mimic is the default mimic, able to take on the form and general properties of blocks - light cannot travel through these, however, so care should be taken with glass. The Ethereal Opaque Mimic can be walked through without any trouble because it has no hitbox, which is perfect for hidden doorways. Clear Mimic blocks work the same as their opaque variants, however they allow light through them even if it appears completely solid. Finally, the Lighted Mimic block is opaque and solid, but no matter what is placed inside of it, it will emit a strong light. No more dark areas in your base without torch spam!\n\tThere is one special variant of the mimic that you have to be wary of: the Sentient Mimic. If a player comes too close to one of these in the world, it will get up from where it is and attack you with a high degree of ferocity. These can be found in a variety of areas, but they are especially fond of dungeons. If one is mimicking a chest, however, be careful: they bite.\n\t***Creative Usage Only***\n\tThere are a few interesting features you can add to any mimic block when you are in creative mode. If you right click on a set mimic with a potion or potion flask, you can set the mimic to spawn potions around it if a player is nearby. If it is a regular mimic and you click on the east or west side, you can increase or decrease the radius that the potion will spawn in. If you click on the north or south side, you can increase or decrease the radius that the mimic will check for players around it before spawning the potions. Finally, clicking on the top or bottom of the block will increase or decrease the potion spawning interval, which is the number of ticks between dropped potions.\n\tIf the mimic is a sentient mimic, you can click the mimic anywhere to increase or decrease the detection radius for players - if a player is within this area and they can see the block, the mimic will spawn and jump at the player. \n\tAnother thing is that if the block is placed on the mimic while the placer is in creative, the block that is being mimicked will NOT drop when the mimic is destroyed.\n\tFinally, if the mimic is placed on any inventory or chest, the sentient mimic will place the chest on the ground with its contents once defeated - the regular mimic will instead just spew the contents everywhere when broken. guide.bloodmagic.entry.architect.downgrade.info=Please see the entry "Penance of the Leadened Soul" in "The Ritual Master" for a detailed explanation about what these are as well as how to obtain them. guide.bloodmagic.entry.architect.augmentedCapacity.info=The Rune of Augmented Capacity functions similar to the Rune of Capacity in the sense that it increases the capacity of the Blood Altar. However, multiple runes on the same altar will begin to resonate with each other, increasing the capacity exponentially the more there are. One rune by itself will apply a +10%% increase to the capacity of the altar, however this functions multiplicatively with other Runes of Augmented Capacity: if there are two runes, it is a +21%% increase, three runes is +33.1%% increase, etc.\n\tUnfortunately, this multiplicative effect does not stack with the Rune of Capacity, meaning you will still only get the +2kLP bonus per rune. @@ -223,7 +223,7 @@ guide.bloodmagic.entry.demon.forge.info.2=Just today, I managed to get a structu guide.bloodmagic.entry.demon.petty.info.1=I went out on one of my now-daily nighttime adventures in order to harvest some demonic will when I began to realize one of the major problems with the collection method: my bag kept on getting full from all of the samples! For some reason, perhaps because the ultimate source of the demonic will is different for each sample, the will would not compress into a more manageable form. At least the physical manifestation of the will. \n\tThus, I went to work with the hellfire forge that was nestled in my corner of the house, pushing aside some of Tiberius's least unpleasant experiments and getting some raw materials for my own study. One of these days I am going to make Tiberius his own forge, since I am tired of trying to get rid of all of the dust that coats my workplace from his "arcane experiments". I don't care that you are "trying to bridge the gap between the ethereal strands of the Soul Network and the physical construction of the slates", get your damned ash out of my stuff! guide.bloodmagic.entry.demon.petty.info.2=Anyway, it did take a while in order to find materials that were most likely to resonate with the demonic will in order to store it in a better manner. Lapis seems to be the most readily available conductor of this energy, acting as a pathway for the will to be channeled. After adding some redstone to act as a shielding from electric fields in the air (adding two energies together seem to cause disastrous effects, at least that is what Magus said), gold as a dampening agent, and glass as a simple housing, I managed to create a very simple "Tartaric Gem". This means "a gem from the underworld, Tartarus."\n\tAfter further tests, I found out that this gem could hold up to a will quality of 64. (When I presented these findings to Magus, he remarked that it seemed like a nice, round number.) When I tried to pick up demonic will afterwards, it seemed to go directly into the gem unless full - after that, the will just seemed to... disappear. Convenient for my backpack, but otherwise a mystery. I also learned that if I hold the gem in my hand and focused (right clicked), about 10%% of the maximum capacity of the gem would flow into other gems I had on my person. I think this last feature is very helpful, especially if we were to find other, more powerful tartaric gems. guide.bloodmagic.entry.demon.sword.info.1=My snares got tangled again.\n\tIt doesn't seem to matter how much I try to improve the design of them, the rudimentary snare never seems to work perfectly. It just gets tangled most of the time, and when I finally do manage to hit a zombie with it it's more likely to not work than work. In order to stop myself from pulling my own hair out, I went to the forge again and got to work right away.\n\tWell, not right away, since I had to first clean the ash off the top of it again. -guide.bloodmagic.entry.demon.sword.info.2=I infused the demon will-holding capabilities of the petty tartaric gem with an iron sword, and managed to create a blade that... was very dull and hardly did more damage than my fist. I was actually very disappointed with the outcome, because it took a long time of fiddling with the forge so that it would not overheat from the strain of using a petty tartaric gem as its power source.\n\tHowever, as soon as I picked up my Tartaric gem, the sword started to glow with a new energy. It seems that the higher the amount of demonic Will I have on my person, the more damage I seem to do with the sword as well as the more demon will that drops. Whenever you don't have a gem, the Will amount is very... miniscule.\n\tAfter a bit of testing I came to another realization: depending on what I kill, I receive different amounts of Will. It seems proportional to the amount of maximum health that the monster has - a spider, since it has a max health of 8 hearts gives 80%% the health of a zombie, which has 10 hearts. This is probably because these monsters require more Will to animate. I should keep this in mind for later. +guide.bloodmagic.entry.demon.sword.info.2=I infused the demon will-holding capabilities of the petty tartaric gem with an iron sword, and managed to create a blade that... was very dull and hardly did more damage than my fist. I was actually very disappointed with the outcome, because it took a long time of fiddling with the forge so that it would not overheat from the strain of using a petty tartaric gem as its power source.\n\tHowever, as soon as I picked up my Tartaric gem, the sword started to glow with a new energy. It seems that the higher the amount of demonic Will I have on my person, the more damage I seem to do with the sword as well as the more demon will that drops. Whenever you don't have a gem, the Will amount is very... miniscule.\n\tAfter a bit of testing I came to another realization: depending on what I kill, I receive different amounts of Will. It seems proportional to the amount of maximum health that the monster has - a spider, since it has a max health of 8 hearts gives 80%% the Will of a zombie, which has 10 hearts. This is probably because these monsters require more Will to animate. I should keep this in mind for later. guide.bloodmagic.entry.demon.lesser.info.1=I was chatting with Tiberius today, discussing some of the projects that he is working on. I must say, when we start talking about his research it seems that he just keeps going on and on and on! Anyway, one of the recent inventions he wanted to talk about was his sigils: so far he managed to create a Water Sigil and a Lava Sigil, using the Hellfire Forge I finally constructed for him as a means to create them. I wasn't entirely sure how he actually made them - I knew he experimented by taking some ingredients and combining them inside of the forge using the tartaric gem as a catalyst, but I haven't actually seen him actively experimenting yet. Well, I got some insight finally as to what he uses that blasted ash for.\n\tLet's see if I can mimic what he said properly. Ahem. "By using the Demon Will contained inside of these gems to transmute the ingredients, a reaction occurs between things that normally don't do anything when combined. By harnessing this forced synergy, I am able to inscribe several arcane symbols in patterns that will direct the energy that I add myself to perform the desired task." Although it doesn't show well in writing, picture me saying this while pushing glasses up the bridge of my nose. I'm not sure if he's normally like this, but I swear he gets all... science-y when he explains things to me.\n\tAt any rate, he showed me how he created a Water Sigil by demonstrating it to me. After the, admittedly flashy, demonstration, he then got to the meat of the discussion. "When I try to replicate this process with some more advanced materials, it seems that the reagents tend to... explode when added to the alchemy array. They seem very unstable. My thinking is that the ingredients aren't getting properly fused together - perhaps there is not enough energy in the forge to fuse them properly."\n\tAfter thinking about this for a few minutes, I got to work - as I mentioned in a previous entry, I figured that a more powerful Tartaric gem would be required, but I still haven't figured out exactly how I could do this in an elegant way. So, I decided that a brute-force approach would be sufficient for this! guide.bloodmagic.entry.demon.lesser.info.2=I took a block of lapis, block of redstone, and a diamond as well as an empty petty Tartaric gem that I had lying around - part of a past experiment that... didn't exactly go very well. All I can say about it is that I am surprised Magus can make holes in a solid concrete wall simply disappear. I then combined these four items in the Hellfire forge with a filled petty Tartaric gem to act as a power source - a minimum of 60 Will seems to be needed. After a bit of effort trying to find an optimal arrangement, I then set them together and watched as the empty Tartaric gem started to grow inside of the forge.\n\tJust as a side note, I tried using a block of gold instead of a diamond to grow the gem, but it seems that having another crystal structure was more beneficial.\n\tThis new, "Lesser Tartaric gem" seems to have a much larger capacity, able to hold a total of 256 raw Will. Hopefully this is enough to sate Tiberius's need for large amounts of Will for a while. But alas it seems that I will need to fill up this gem. Another long night is ahead of me! guide.bloodmagic.entry.demon.reactions.info=I woke up in a hospital bed today, aching something fierce. I opened my eyes and saw the dull magenta that made up the ceiling of the "Intense Curse" wing of the hospital in Veteres, which is the closest major city to our village. I wasn't exactly worried by this information: it more so puzzled me that I somehow ended up here while seemingly only covered in scrapes and bruises, plus a simple cast on my left leg. Someone must have cast an "Ossa Fracta" curse on me or something, since all it could be was a simple broken bone! \n\tWhen Magus came in with one of the nurses with a solemn face, I knew it was something more drastic. Apparently, one of my experiments with the new Lesser Tartaric gem rebounded and created a small but forceful explosion. That much I could understand easily enough, but that wasn't it: the mixture of obsidian, iron and diamond that I used coated my lower left leg, forming into a rigid shell that couldn't be removed. The cast that I had on my leg wasn't actually a cast, but some form of runic matrix covering the light-blue shell. \n\tCalmly, I asked what Magus thought, even though I was pretty sure what had occurred. "I think," he said, giving a side-long glance towards the nurse that was listening intently before looking back at me, "that it is simply some sort of residue that is diamond-based, which is the main reason we can't remove it. It is also laced with a bit of... otherworldly energy, which is the main reason that you are here instead of a bed at the local clinic - the Conglomerate is rather stringent about unknown energy directly contacting people, ever since the Eldritch Incident, so we had to make sure that there wasn't any issues."\n\t"I see..." Normally Magus doesn't bother much with formalities such as making sure that the Conglomerate is informed about unknown energies - I've been experimenting with Demon Will for quite a while, and it isn't like the Conglomerate came knocking on our door to have this magic registered. I won't go into much detail here, since I am not well versed in politics, but I know that Magus partakes in it only sparingly. This meant that the power from this Will concerned Magus a lot, perhaps through some of his past dealings...?\n\t"Ah well, enough about that for now," Magus said, rolling up the sleeves of his robes. "I tried to break the shell when I first saw it, obviously after checking what it was. It didn't have an effect last time, but now..."\n\tThere was a searing heat on my left leg, accompanied by a blinding red light as Magus cupped his hands on top of the blue shell. After what felt like an eternity, but what must have been only a couple of seconds, the shell started to crack and fracture, falling apart. Honestly, it was kind of anticlimactic. \n\tI tried to get up, but Magus pushed me back into the bed with a small shove. "Bella, you need to stay and rest. You can work with your research on the gems later." I was initially annoyed, but that soon passed as I had a lot of time to think. The only reason that Magus wasn't able to do the exact same thing earlier was probably because I still had my Tartaric gem on my person after the explosion. So whatever happened to my leg had to be directly tied to the demon Will, and as soon as my gem was taken the shell was able to be removed. It got me thinking... @@ -231,10 +231,10 @@ guide.bloodmagic.entry.demon.sentientGem.info.1=After a few days of some "well n guide.bloodmagic.entry.demon.sentientGem.info.2=The Sentient Armour Gem is a toggleable item that is used to equip and unequip your Sentient Armour. When you right-click with the gem while you have a minimum of 16 Demon Will in your inventory, your armour will be replaced with a set of Sentient Armour that copies all of the enchants from the armour that you replaced - when you activate the gem again, your original armour is returned to you. This also works when you have no armour on at all to begin with.\n\tThe Sentient Armour initially acts as a simple set of iron armour, yielding no additional abilities besides protection. Similarly to other sentient tools, however, the armour provides more protection when you have more Demon Will in your possession. This makes the protection provided really powerful when you have a large quantity of Demon Will accumulated. The downside to this is that every hit you take will syphon a small bit of Demon Will from your Tartaric gems, and if you get too low your armour will revert back to its original form. Could be bad! guide.bloodmagic.entry.demon.routing.info=Item transport in Blood Magic comes from linking strands of Demonic Will between routing nodes, which act as conduits in order to transfer items from one inventory to another. To start off with, let us explain how each individual item works.\n\tEvery single routing system needs a Master Routing node, which acts as the brains of the system. An Input Routing node inputs items into your system, and an Output Routing node outputs items from your system, and a regular routing node doesn't have any special function.\n\tTo form a network, you need to shift-click a node with your Node Router and then shift click another node that you want to connect. This links the two nodes together. As long as a node can trace some form of route to another node (and if it is connected to a Master Routing node) they can "talk" to each other.\n\tAs a rule of thumb, items are pulled from an inventory next to an input node and are pushed into an inventory next to an output node. In order to set what goes where, a filter should be used. By clicking on one of the buttons in the node's interface you can select what goes into the inventory in the given direction (N indicates North, etc). If you place an Item Filter into the left-most slot of the node you can specify the quantities and types of items that the node may interact with based on the filter. If you set a filter on an input filter, you can only pull those types of items from the inventory (keeping at least the given amount if you specify a quantity). If you set a filter on an output filter, you can only push those types of items into the inventory, up to a max of the quantity specified.\n\tThere are four types of filters: \n\tPrecise - The item needs to be matched exactly, including NBT and metadata\n\tMod Item - The item matches if it is from one of the filered mods.\n\tIgnore NBT - The item filter does not take into account any NBT\n\tOre Dictionary - Any item that matches one of the ore dictionary references of the filters are allowed.\n\tThere are two numbers that you will be able to see when you insert the filter into the routing node: the quantity and the priority. When you click on one of the items in the filter, the name of the item you have selected will appear and right below that is the quantity of items. By setting this number you can tell the filter how many of this type of item it will keep in stock in the connected inventory (either filling to that amount if it is an output node or making sure it keeps that amount left in the inventory if it is an input node). If you decrease the filter's amount to 0, you can set so that the filter allows "Everything," as in any amount, for that particular filter. Input nodes will pull as much as it can from the inventory, and output nodes will push as much as possible.\n\tThe second number is the priority of the node, altered by the arrow buttons next to it. This number is different for each side of the node. The node that has the LOWER NUMBER in the network will be used first. guide.bloodmagic.entry.demon.aura.info=When an entity is killed normally, it evaporates over time and returns to the creator. When captured in a snare, it is pulled into this plane from the ethereal and is sort of stuck. We have, for all intents and purposes, broken its programming and it has frozen all action. When we burn it, it returns to an ethereal state and is able to resume normal operations. If this Will is injected into the air, we can then harness it in a variety of ways. Some of them are mundane in nature, whereas others are quite powerful.\n\tDemon Will when injected into the air stays within the chunk that it was put in without migrating. Each chunk has their own stored Will, with each type of Will stored individually (more on that in a different section). This Will can be accessed and manipulated by other blocks and items. -guide.bloodmagic.entry.demon.types.info=So far, the only type of Demon Will that we have discussed is raw Will. As the name suggests, it is the most raw and unadulterated form of Will there is, but this does not mean that it is pure. In fact, Demon Will takes on many different forms: Raw is the type we deal with normally, but there is also Corrosive, Destructive, Vengeful, and Steadfast. Raw Will is composed of a mixture of all four of these types, and perhaps mixed with other as of yet undiscovered types, but once split into these different Will types it seems impossible to recombine them.\n\tIt is not clear yet whether these different types of Will come from different sources, however we do know the process of generating these different types of Will. When Will of the same type bump into each other in the Aura it tends to congregate similar to how impurities in an otherwise homogeneous liquid clump together. If a device is able to latch onto these clumps within the Raw Will in the Aura, chunks of pure Will of a particular type can be gathered. One such device is the Demon Crystallizer, whose entry can be found further down.\n\tEach of these four types of Will represent different aspects of one's desire. There may be more types of Will, however they are either not pure enough or simply cannot be created in this form.\n\tCorrosive represents the desire to break down all things around oneself, either with acid or by crushing force. One who can master this Will can wield debilitating status effects and are immune to horrible poisons.\n\tVengeful can be viewed as the desire to seek a target without tiring. Usually, this can be seen either as an increased speed of the body to seek their pray or to make sure that a target is not able to get away as you continually attack them.\n\tDestructive, as you can probably tell, is pure force. Attack strength and overall physical prowess can be gained if this Will is properly harnessed. It can also be used to crush and smash things when used in other applications.\n\tSteadfast is seen as the desire to prevent damage to oneself. In most cases, masters of this Will are the defensive bulwark of the party, able to withstand powerful attacks and not even feel it. If you need to stay alive, through your armour or by rituals, this is one choice that should be considered. +guide.bloodmagic.entry.demon.types.info=So far, the only type of Demon Will that we have discussed is raw Will. As the name suggests, it is the most raw and unadulterated form of Will there is, but this does not mean that it is pure. In fact, Demon Will takes on many different forms: Raw is the type we deal with normally, but there is also Corrosive, Destructive, Vengeful, and Steadfast. Raw Will is composed of a mixture of all four of these types, and perhaps mixed with other as of yet undiscovered types, but once split into these different Will types it seems impossible to recombine them.\n\tIt is not clear yet whether these different types of Will come from different sources, however we do know the process of generating these different types of Will. The Ritual "Resonance of the Faceted Crystal" can split a Raw Will Crystal into its pure parts, more on that in the corresponding entry in "The Ritual Master". A device able to obtain Raw Will Crystals is the Demon Crystallizer, whose entry can be found further down.\n\tEach of these four types of Will represent different aspects of one's desire. There may be more types of Will, however they are either not pure enough or simply cannot be created in this form.\n\tCorrosive represents the desire to break down all things around oneself, either with acid or by crushing force. One who can master this Will can wield debilitating status effects and are immune to horrible poisons.\n\tVengeful can be viewed as the desire to seek a target without tiring. Usually, this can be seen either as an increased speed of the body to seek their prey or to make sure that a target is not able to get away as you continually attack them.\n\tDestructive, as you can probably tell, is pure force. Attack strength and overall physical prowess can be gained if this Will is properly harnessed. It can also be used to crush and smash things when used in other applications.\n\tSteadfast is seen as the desire to prevent damage to oneself. In most cases, masters of this Will are the defensive bulwark of the party, able to withstand powerful attacks and not even feel it. If you need to stay alive, through your armour or by rituals, this is one choice that should be considered. guide.bloodmagic.entry.demon.crucible.info=The Demon Crucible is a device that is able to burn the Demon Will inside of a Tartaric Gem and other items in order to inject it into the Aura of the chunk that it is in. There are a few different ways to use the crucible: one of the simplest ways is to place a Tartaric Gem inside of the crucible by right clicking on it with a gem in your hand. The crucible will then in that case drain the Will from the gem until either the Aura is saturated with that type of Will (a max of 100 by default) or until the gem is empty.\n\tAnother mode is to use the contained Tartaric Gem to drain the Will from the Aura - this is done by applying a strong redstone signal to the crucible and then the contained gem will attempt to drain as much Will as possible.\n\tFinally, a discrete piece of Will can be burned in the crucible if there is enough room in the Aura of that type. One example of this is a Demon Will Crystal, which has a value of 50. guide.bloodmagic.entry.demon.crystallizer.info=As discussed previously, Demon Aura is the ethereal manifestation of Demon Will, and the substance obtained when killing a mob is its physical manifestation. The Demon Crystallizer acts as an anchoring point for Demon Will in the Aura to latch on to, transforming the ethereal Will back into a physical form once again in the form of a crystal.\n\tYou may be curious why you do not just take the Will from a Tartaric Gem directly and form a crystal from it. That is because by transforming the Will to its ethereal form we purify it and allow the Will to attempt to resume its normal operations - keep in mind that when we kill a monster with Demon Will attached to them, we freeze the programming of the Will so that it cannot do what it was sent out to do. By converting it into the ethereal form in the Aura, the Will becomes more active, and that is the Will that is grabbed by the crystallizer. Just don't look at it funny.\n\tIn order for the Demon Crystallizer to work it must be in a chunk with a high amount of Demon Will (80) of a particular type, and after a certain amount of time it will consume the Will from the Aura in order to create a Demon Crystal Cluster with a single spire. There are two ways for the Crystallizer to work: it can form a crystal from an aspected type of Will (Corrosive, Destructive, Vengeful, and Steadfast) if there is enough Will of that particular type, or it will take Raw Will from the Aura to create a crystal. \n\tIn previous incarnations of the device it was possible to transform Raw Will from the Aura into differently aspected crystals. However, that is no longer the case: you can still create new spires of a certain aspected Will if there is enough of it in the Aura, however you will need to look into other means to separate the many aspects from Raw Will. See the entry on "Resonance of the Faceted Crystal" in The Ritual Master for more details. -guide.bloodmagic.entry.demon.cluster.info=The Demon Crystal Cluster can either be created by a Demon Crystallizer or by crafting one in the Hellfire Forge with Demon Will Crystals. Crafted clusters can be placed on any solid surface, such as the floor, walls, and ceilings. There are a max of seven spires on the crystal when fully grown, and when broken with a pickaxe it will drop the spires as Demon Will Crystals. However, if you right-click the cluster when you have a Tartaric Gem with more than 1024 Raw Will inside of it, you can break off a single spire from the cluster without breaking the cluster itself; this will never break the main spire from the cluster.\n\tWhen left to its own devices, the cluster will syphon some Will of the same type from the Aura to grow itself slowly. This process is a bit slow, but there is a minor net gain.\n\tThere are two rituals that are used to grow and harvest these crystals: the Gathering of the Forsaken Souls and the Crash of the Crystal. In order to find out how to use them, please refer to The Ritual Master. +guide.bloodmagic.entry.demon.cluster.info=The Demon Crystal Cluster can either be created by a Demon Crystallizer or by crafting one in the Hellfire Forge with Demon Will Crystals. Crafted clusters can be placed on any solid surface, such as the floor, walls, and ceilings. There are a max of seven spires on the crystal when fully grown, and when broken with a pickaxe it will drop the spires as Demon Will Crystals. However, if you right-click the cluster when you have a Tartaric Gem with more than 1024 Raw Will inside of it, you can break off a single spire from the cluster without breaking the cluster itself; this will never break the main spire from the cluster.\n\tWhen left to its own devices, the cluster will syphon some Will of the same type from the Aura to grow itself slowly. This process is a bit slow, but there is a minor net gain.\n\tThere are two rituals that are used to grow and harvest these crystals: the "Gathering of the Forsaken Souls" and the "Crack of the fractured Crystal". In order to find out how to use them, please refer to The Ritual Master. guide.bloodmagic.entry.demon.pylon.info=As you may know, Demon Aura remains in its own chunk if there are not any outside influences. Well, this is one of those influences. The Demon Pylon acts as a beacon for Will in the Aura, pulling the Will from neighbouring chunks (those chunks that are directly next to it in the four cardinal directions, not diagonal) into its chunk. The Pylon will attempt to equalize the Will in its chunk with its neighbour so that the Pylon's chunk has as much Will as its highest neighbour for each Will type. This process only happens one way, however: if the neighbouring chunk has less Will in it than the Pylon's chunk, the Will will not transfer the other direction. guide.bloodmagic.entry.demon.gauge.info=In order to tell how much Will you have in a given chunk you need to have a Demon Will Gauge. When in your inventory, the gauge will display the Will in the chunk that you have in five bars in the top-left corner of the screen. You can tell how much there is exactly by shifting; numbers will appear to the right of the bars to give the amount rounded to the nearest whole number. @@ -268,6 +268,3 @@ guide.bloodmagic.entry.alchemy.furnace.info=One of the many problems that you ma guide.bloodmagic.entry.alchemy.teleport.info=The Teleportation Array acts as a way to travel instantly from one location to another with a few specific limitations. When a player or other entity steps onto the array, the array will search up to 20 blocks away in the direction it is facing for another alchemy array (which does not need to be active). If the array manages to successfully find a destination, it will then teleport the entity to its found array instantly, even through walls. \n\tStudying this array has shown that there are further limitations added to it: because of the nature of bending the fabric of space-time, a Teleportation Array will not teleport something that has teleported within 2 seconds. This is to allow time for all components to rearrange themselves in a desirable manner. guide.bloodmagic.entry.alchemy.standardTurret.info=The power of flinging pointy objects at far away monsters cannot be overstated. The Turret Array is able to sense a nearby hostile monster and by utilizing complex alchemical mechanisms it is able to draw back and fire an arrow in order to strike its target. \n\tThe array searches for an inventory directly beneath it. If it finds either a normal or tipped arrow it will syphon from its container and fire at a mob that is within a 32 block radius. \n\t(Due to some silly Minecraft physics that has arrows bounce off of entities that are too close to where they spawn, the turret will also only fire on a mob that is greater than 3 blocks away. Keep that in mind!) guide.bloodmagic.entry.alchemy.laputa.info=There exists a story of a lost kingdom that had such advanced magic that it could fly through the clouds. Although this kingdom has since crumbled to dust, a few drawings of this castle in the sky has managed to provide exquisite detail as to the mechanisms that allowed it to become the legend that it is. \n\tThe Shard of Laputa converts the life essence that is found within the earth into a more avian form, causing the surrounding area to levitate in the air. While the underlying principle is simple, the variations of the life essence in the earth cause a bit of inconsistency in how much land is moved. The array will move the earth in a spherical radius between 4 and 8 blocks up above itself a random offset between one and 5 blocks plus twice the radius of the effect. \n\tIt should be noted that as soon as the effect starts, all items used to activate the array will be lost. - - - From c0570af36ff6265dcc01b769d223fa8e2c781907 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 01:50:26 +0200 Subject: [PATCH 226/493] Disorient upgrade typo fix (#1320) (#1395) --- .../livingArmour/downgrade/LivingArmourUpgradeDisoriented.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index c2a3d980..2d791898 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { public static final int[] costs = new int[]{-10, -20, -30, -40, -70, -80, -100, -140, -180, -220}; - public static final double[] chance = new double[]{0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.008, 0.0010, 0.0012, 0.014}; + public static final double[] chance = new double[]{0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.008, 0.010, 0.012, 0.014}; public LivingArmourUpgradeDisoriented(int level) { super(level); From 2c92a9e0c1d813c6812dac0d6936f6f421187e12 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 02:50:56 +0200 Subject: [PATCH 227/493] Crossdimensional Teleposition (including entities, into unloaded chunks etc) (#1385) * AWAITING ALLOWANCE FROM BRANDON3055 (PERMISSION TO USE CODE SNIPPET FOR INTERDIMENSIONAL/CROSSDIMENSIONAL TELEPORT) COPYRIGHT ALL RIGHTS RESERVED FOR BRANDON3055 (CODE SNIPPET) AWAITING ALLOWANCE FROM TEHNUT, WAYOFTIME TO USE FOREIGN CODE (AS IT NEEDS ALLOWANCE & POSSIBLE CREDITS) DO NOT USE. * Forgot something. Requires permission from Brandon3055 (copyright on code snippet) Requires permission from WayofTime, TehNut (because it uses foreign code that might need attribution) Do not use. * License permits usage. Sorry for bothering everyone involved. Don't merge. Teleposer broken. Teleposition sigil works though. * IT WORKS!!!! - re-enabled cross dimensional telepositioning - works even if target teleposer is unloaded at the time of activation (force loads the chunk so the teleposer can be found, releases ticket when player arrives) - entity teleposition works properly - I'm tired and slightly insane - nobody asked for this. closes #973 (rewrite might still be needed though) might be able to close the following issue: - #1198 (improved cross dimensional teleportation code thanks to brandon3055) * Zombies stop holding onto tickets now. * Oversight. --- .../item/sigil/ItemSigilTeleposition.java | 14 +-- .../bloodmagic/ritual/portal/Teleports.java | 85 ++++++++++++++----- .../bloodmagic/tile/TileTeleposer.java | 34 ++++---- 3 files changed, 90 insertions(+), 43 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 10e44dab..ebca00db 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -26,6 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.List; +import java.util.UUID; public class ItemSigilTeleposition extends ItemSigilBase { @@ -62,16 +63,17 @@ public class ItemSigilTeleposition extends ItemSigilBase { TileEntity tile = teleportTo.getTileEntity(location.pos); if (tile instanceof TileTeleposer) { BlockPos blockPos = location.pos.up(); + UUID bindingOwnerID = binding.getOwnerId(); if (world.provider.getDimension() == location.dim) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, binding.getOwnerId(), true)); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, bindingOwnerID, true)); + + } else { + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, bindingOwnerID, world, tile.getWorld().provider.getDimension(), true)); } - // FIXME - Fix cross-dimension teleports causing major desync -// } else { -// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true)); -// } + } } } - } + return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index 79902bc7..5f253ca1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.core.data.SoulNetwork; + import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.teleport.Teleport; @@ -10,13 +11,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.play.server.SPacketEntityEffect; +import net.minecraft.network.play.server.SPacketPlayerAbilities; +import net.minecraft.network.play.server.SPacketRespawn; import net.minecraft.network.play.server.SPacketUpdateHealth; +import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.management.PlayerList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -39,15 +47,16 @@ public class Teleports { @Override public void teleport() { if (entity != null) { + BlockPos targetTeleposer = new BlockPos(x,y,z); if (entity.timeUntilPortal <= 0) { if (entity instanceof EntityPlayer) { + SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < getTeleportCost()) return; - if (teleposer) - if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z)))) - return; + if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer))) + return; EntityPlayerMP player = (EntityPlayerMP) entity; @@ -60,15 +69,14 @@ public class Teleports { player.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z))); + MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer)); } else { SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < (getTeleportCost() / 10)) return; - if (teleposer) - if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z)))) - return; + if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer))) + return; WorldServer world = (WorldServer) entity.getEntityWorld(); @@ -80,7 +88,7 @@ public class Teleports { entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), new BlockPos(x, y, z))); + MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer)); } } } @@ -115,28 +123,65 @@ public class Teleports { MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); WorldServer oldWorldServer = server.getWorld(entity.dimension); WorldServer newWorldServer = server.getWorld(newWorldID); + BlockPos targetTeleposer = new BlockPos(x,y,z); + ChunkPos teleposerChunk = new ChunkPos(targetTeleposer); + ForgeChunkManager.Ticket chunkTicket = ForgeChunkManager.requestTicket("bloodmagic", newWorldServer, ForgeChunkManager.Type.NORMAL); + ForgeChunkManager.forceChunk(chunkTicket ,teleposerChunk); if (entity instanceof EntityPlayer) { EntityPlayerMP player = (EntityPlayerMP) entity; + if (!player.getEntityWorld().isRemote) { SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < getTeleportCost()) return; - if (teleposer) - if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, new BlockPos(x, y, z)))) + if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer))) return; network.syphon(ticket(oldWorld, player, getTeleportCost())); - player.changeDimension(newWorldID); //TODO: UNTESTED -// server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer)); - player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); - player.getEntityWorld().updateEntityWithOptionalForce(player, false); - player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + + + /* begin brandon3055 "BrandonsCore" intedimensional teleportation code */ + + PlayerList playerList = server.getPlayerList(); + + player.dimension = newWorldID; + player.connection.sendPacket(new SPacketRespawn(player.dimension, newWorldServer.getDifficulty(), newWorldServer.getWorldInfo().getTerrainType(), player.interactionManager.getGameType())); + playerList.updatePermissionLevel(player); + oldWorldServer.removeEntityDangerously(player); + player.isDead = false; + + //region Transfer to world + + player.setLocationAndAngles(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); + player.connection.setPlayerLocation(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); + newWorldServer.spawnEntity(player); + newWorldServer.updateEntityWithOptionalForce(player, false); + player.setWorld(newWorldServer); + + //endregion + + playerList.preparePlayer(player, oldWorldServer); + player.connection.setPlayerLocation(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); + player.interactionManager.setWorld(newWorldServer); + player.connection.sendPacket(new SPacketPlayerAbilities(player.capabilities)); + + playerList.updateTimeAndWeatherForPlayer(player, newWorldServer); + playerList.syncPlayerInventory(player); + + for (PotionEffect potioneffect : player.getActivePotionEffects()) { + player.connection.sendPacket(new SPacketEntityEffect(player.getEntityId(), potioneffect)); + } + FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, entity.dimension, newWorldID); + player.setLocationAndAngles(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); + + /* end brandon3055 teleportation code */ + if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, new BlockPos(x, y, z))); + MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer)); } } else if (!entity.getEntityWorld().isRemote) { @@ -144,9 +189,8 @@ public class Teleports { if (network.getCurrentEssence() < (getTeleportCost() / 10)) return; - if (teleposer) - if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, new BlockPos(x, y, z)))) - return; + if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer))) + return; network.syphon(ticket(oldWorld, entity, getTeleportCost() / 10)); @@ -168,10 +212,11 @@ public class Teleports { oldWorldServer.resetUpdateEntityTick(); newWorldServer.resetUpdateEntityTick(); if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, new BlockPos(x, y, z))); + MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer)); } entity.timeUntilPortal = entity instanceof EntityLiving ? 150 : 20; newWorldServer.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); + ForgeChunkManager.releaseTicket(chunkTicket); } } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 6c1c09b5..aeff21a0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import java.util.List; +import java.util.UUID; public class TileTeleposer extends TileInventory implements ITickable { //TODO FUTURE: Make AreaDescriptor for Teleposer perhaps? @@ -98,34 +99,33 @@ public class TileTeleposer extends TileInventory implements ITickable { originalWorldEntities = getWorld().getEntitiesWithinAABB(Entity.class, originalArea); AxisAlignedBB focusArea = new AxisAlignedBB(focusPos.getX(), focusPos.getY() + 1, focusPos.getZ(), focusPos.getX() + 1, Math.min(focusWorld.getHeight(), focusPos.getY() + 2 * focusLevel), focusPos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); focusWorldEntities = focusWorld.getEntitiesWithinAABB(Entity.class, focusArea); - + UUID bindingOwnerID = binding.getOwnerId(); if (focusWorld.equals(getWorld())) { if (!originalWorldEntities.isEmpty()) { for (Entity entity : originalWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, binding.getOwnerId(), true)); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, true)); } } if (!focusWorldEntities.isEmpty()) { for (Entity entity : focusWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, binding.getOwnerId(), true)); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, true)); + } + } + + } else { + if (!originalWorldEntities.isEmpty()) { + for (Entity entity : originalWorldEntities) { + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, getWorld(), focusWorld.provider.getDimension(), true)); + } + } + + if (!focusWorldEntities.isEmpty()) { + for (Entity entity : focusWorldEntities) { + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, focusWorld, getWorld().provider.getDimension(), true)); } } } - // FIXME - Fix cross-dimension teleports causing major desync -// } else { -// if (!originalWorldEntities.isEmpty()) { -// for (Entity entity : originalWorldEntities) { -// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), getWorld(), focusWorld.provider.getDimension(), true)); -// } -// } -// -// if (!focusWorldEntities.isEmpty()) { -// for (Entity entity : focusWorldEntities) { -// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, getWorld().provider.getDimension(), true)); -// } -// } -// } } } } From ecebe75f333eff0f60d1afa15ea10c97dcde4fc7 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Wed, 8 Aug 2018 02:51:46 +0200 Subject: [PATCH 228/493] Third stage of "Dagger of Sacrifice"-glow (#1389) * Added Soul Fray check. Sacrificial dagger now glows even more if you're fully prepared! Added NBT field for maximum incense altar bonus from the last incense altar the player has encountered. (There is a case in which the dagger glows even if the player is not at maximum incense bonus: The player must have been at maximum incense bonus and then gone into the vincinity of a stronger incense altar. The maximum incense bonus data field only updates once the maximum bonus has been reached for efficiency.) * Multiplayer fixed. * Fixed weirdness that occurred during a phase I don't remember. --- .../item/ItemSacrificialDagger.java | 30 +++++++++++++------ .../WayofTime/bloodmagic/util/Constants.java | 2 ++ .../bloodmagic/util/helper/IncenseHelper.java | 24 +++++++++++++++ .../util/helper/PlayerSacrificeHelper.java | 5 +++- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 6dc81125..5410758f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -8,10 +8,7 @@ import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; +import WayofTime.bloodmagic.util.helper.*; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; @@ -56,7 +53,8 @@ public class ItemSacrificialDagger extends ItemEnum Date: Fri, 17 Aug 2018 20:07:02 -0500 Subject: [PATCH 229/493] Allows custom arrows to work with the Sentient Bow. (#1404) - Checks if the arrow is the vanilla arrow, if it is then it continues with normal use. But, if arrow isn't the vanilla arrow it uses their custom arrow entity. --- .../bloodmagic/item/soul/ItemSentientBow.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 70e48450..f817d6a3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -22,6 +22,7 @@ import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.IItemPropertyGetter; +import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -371,15 +372,17 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien this.recalculatePowers(stack, world, player); EnumDemonWillType type = this.getCurrentType(stack); - //Need to do some stuffs -// ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.arrow)); -// EntityArrow entityArrow = itemarrow.createArrow(world, itemstack, player); - + ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.ARROW)); + EntityArrow entityArrow; double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - EntitySentientArrow entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining)); + if (itemarrow == Items.ARROW) + { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining)); + } else + entityArrow = itemarrow.createArrow(world, itemstack, player); entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); if (newArrowVelocity == 0) From 98e474b28763ffa3af1da7fe0a906a08777afeed Mon Sep 17 00:00:00 2001 From: KohaiKhaos Date: Fri, 17 Aug 2018 20:07:29 -0500 Subject: [PATCH 230/493] Someone missed an import (#1403) * Someone missed an import, how have you people even been compiling to test stuff since you added my commit * Missed GameProfile too apparently --- .../java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index 8d9a662c..1ad109a9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; +import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -11,6 +12,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; From 92e333370179a448a5ed824d5da62aa99e97d1b3 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sat, 18 Aug 2018 03:08:04 +0200 Subject: [PATCH 231/493] Splash potions now throwable! (#1401) --- .../util/handler/event/LivingArmourHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 456482c3..d5750f89 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -24,6 +24,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemArrow; +import net.minecraft.item.ItemSplashPotion; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.world.World; @@ -160,13 +161,12 @@ public class LivingArmourHandler if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) { ItemStack drinkStack = event.getItemStack(); + if(!(drinkStack.getItem() instanceof ItemSplashPotion)) { + LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); - //TODO: See if the item is a splash potion? Those should be usable. - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); - - if (upgrade instanceof LivingArmourUpgradeQuenched) - { - event.setCanceled(true); + if (upgrade instanceof LivingArmourUpgradeQuenched) { + event.setCanceled(true); + } } } } From 3d3ce53dddd1d8c79d5b93d78607e1652f5305c8 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sat, 18 Aug 2018 03:13:00 +0200 Subject: [PATCH 232/493] Fix: Interaction Sigil of Holding + Seer/Divination Sigil (no render) (#1391) * Seer Sigil and Sigil of Divination now work properly when placed inside the Sigil of Holding closes #1285 * cleanup * Cleanup. --- .../element/ElementDivinedInformation.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java index c8244775..8563e015 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -1,12 +1,15 @@ package WayofTime.bloodmagic.client.hud.element; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; +import java.util.List; + public abstract class ElementDivinedInformation extends ElementTileInformation { private final boolean simple; @@ -24,23 +27,38 @@ public abstract class ElementDivinedInformation extends El if (simple) { if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION) flag = true; + else flag = isFlagSigilHolding(sigilStack, true); if (!flag) { sigilStack = player.getHeldItem(EnumHand.OFF_HAND); if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION) flag = true; + else flag = isFlagSigilHolding(sigilStack, true); } + } else { if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; + else flag = isFlagSigilHolding(sigilStack, false); if (!flag) { sigilStack = player.getHeldItem(EnumHand.OFF_HAND); if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; + else flag = isFlagSigilHolding(sigilStack, false); } } - return super.shouldRender(minecraft) && flag; } + + private boolean isFlagSigilHolding(ItemStack sigilStack, boolean simple) { + if (sigilStack.getItem() instanceof ItemSigilHolding) { + List internalInv = ItemSigilHolding.getInternalInventory(sigilStack); + int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilStack); + if(internalInv != null && !internalInv.get(currentSlot).isEmpty()) { + return (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_SEER && !simple) || (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION && simple); + } + } + return false; + } } From f5282bd767efdc895bc276deb63debe782f3ef49 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sat, 18 Aug 2018 03:14:41 +0200 Subject: [PATCH 233/493] Phantom bridge (#1397) * Rework. Desyncs for no apparent reason. Apart from that, it works. Desyncing started after I implemented the "diagTemplate" methods. Can definitely be optimised, some advice for that would be good (lots of duplicated code for the "templates"). * Code cleanup. Reverted stuff that I didn't want to commit. * Some fine tuning for speed. playerVel is not very accurate still but this should work out for most stuff. Might need a lot of testing. Might still not work properly on servers. Diagonal templates are inconsistent, need variables switched. Will deal with that later (maybe). In any case, this works just fine unless you're speeding diagonally. * The occasional stuff that should not be pushed. Meaningless whitespaces or code reformatting. * The occasional stuff that should not be pushed. Meaningless whitespaces or code reformatting. Take 2. * MERGE ME I'M AWESOME * removed unused import * Refactoring, adding braces, renaming constants etc etc. done. * take 2 * take 2 * Removed one-liners they grew organically because I initially created every "bridge" with a unique for loop before I removed duplicate code by passing variables/ranges they were helpful until I found good names for the variables, now they've outlived their usefulness * tiny bit of fine tuning * various fluff / small fixes more fine tuning, code reformatting, meaningful variables, for loop fix (variable mismatch), shrinking a redundant method to a call to an advanced method --- .../bloodmagic/block/BlockPhantom.java | 2 +- .../item/sigil/ItemSigilPhantomBridge.java | 174 +++++++++++++++--- .../bloodmagic/tile/TilePhantomBlock.java | 15 +- 3 files changed, 164 insertions(+), 27 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index bb6ad64a..084e6486 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -77,6 +77,6 @@ public class BlockPhantom extends Block implements IVariantProvider { @Nullable @Override public TileEntity createTileEntity(World world, IBlockState state) { - return new TilePhantomBlock(100); + return new TilePhantomBlock(20); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index eb2d1431..856a971e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -1,7 +1,11 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import com.google.common.base.Predicate; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -9,11 +13,44 @@ import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; import java.util.HashMap; +import java.util.List; import java.util.Map; public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { - private static final double EXPANSION_FACTOR = 2; - private static final int RANGE = 3; + public static final Predicate IS_PHANTOM_ACTIVE = (Entity entity) -> entity instanceof EntityPlayer && isPhantomActive((EntityPlayer) entity); + + public static final String[] CIRCLE7X7 = new String[]{ + " XXX ", + " XXXXX ", + "XXXXXXX", + "XXXXXXX", + "XXXXXXX", + " XXXXX ", + " XXX " + }; + + public static final String[] CIRCLE9X9 = new String[]{ + " XXXXX ", + " XXXXXXX ", + "XXXXXXXXX", + "XXXXXXXXX", + "XXXXXXXXX", + "XXXXXXXXX", + "XXXXXXXXX", + " XXXXXXX ", + " XXXXX " + }; + + //imagine you're looking into positive Z + public static final String[] DIAG = new String[]{ + "XXX ", // ----------------- + "XXXX ", // Template Guide + "XXXXX ", // ----------------- + " XXXXX",// ^ // You stand in the bottom right corner, 1 block right, 1 block below the bottom right X + " XXXX",// | // inverted: flips it so you are in top left corner + " XXX" // Z // XnZ: mirrors the template on the X axis + // <--X + }; private Map> prevPositionMap = new HashMap<>(); @@ -46,6 +83,7 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { double playerVelZ = player.posZ - prevPosition.getRight(); double totalVel = Math.sqrt(playerVelX * playerVelX + playerVelZ * playerVelZ); + //Moves more than totalVel^2 blocks in any direction within a tick if (totalVel > 2) { //I am SURE you are teleporting! playerVelX = 0; @@ -58,32 +96,122 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { int posY = playerPos.getY(); int posZ = playerPos.getZ(); - double offsetPosX = posX + EXPANSION_FACTOR * playerVelX; - double offsetPosZ = posZ + EXPANSION_FACTOR * playerVelZ; - double avgX = (posX + offsetPosX) / 2; - double avgZ = (posZ + offsetPosZ) / 2; - - double C = 2 * (RANGE + EXPANSION_FACTOR * totalVel) + 1; - int truncC = (int) C; - - //TODO: Make this for-loop better. - for (int ix = -truncC; ix <= truncC; ix++) { - for (int iz = -truncC; iz <= truncC; iz++) { - if (computeEllipse(ix + avgX, iz + avgZ, posX, posZ, offsetPosX, offsetPosZ) > C) { - continue; + //Standing still, sneaking or walking with framerate drops + if (totalVel >= 0 && totalVel < 0.3) { + circleTemplate7x7(posX, posY, posZ, verticalOffset, world); + //anything between the first case and being slightly faster than walking + //walking fairly quickly on X-axis + } else if (playerVelZ > -0.2 && playerVelZ < 0.2) { + if (playerVelX > 0.4) { + if (playerVelX > 1) { + rectangleBridge(posX, posY, posZ, verticalOffset, world, -1, 1, 7, 9); // long bridge } - - BlockPos blockPos = new BlockPos(ix + posX, posY + verticalOffset, iz + posZ); - - if (world.isAirBlock(blockPos)) - world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState()); + rectangleBridge(posX, posY, posZ, verticalOffset, world, -2, 2, 1, 6); // short bridge } + if (playerVelX < -0.4) { + if (playerVelX < -1) { + rectangleBridge(posX, posY, posZ, verticalOffset, world, 7, 9, -1, 1); + } + rectangleBridge(posX, posY, posZ, verticalOffset, world, -2, 2, -6, -1); + } + //walking fairly quickly on Z-axis + } else if (playerVelX > -0.2 && playerVelX < 0.2) { + if (playerVelZ > 0.4) { + if (playerVelZ > 1) { + rectangleBridge(posX, posY, posZ, verticalOffset, world, 2, 6, -2, 2); + } + rectangleBridge(posX, posY, posZ, verticalOffset, world, 1, 6, -2, 2); + } + if (playerVelZ < -0.4) { + if (playerVelZ < -1) { + rectangleBridge(posX, posY, posZ, verticalOffset, world, -9, -7, -1, 1); + } + rectangleBridge(posX, posY, posZ, verticalOffset, world, -6, -1, -2, 2); + } + } else if (playerVelX > 0.2) { // diagonal movement + if (playerVelZ > 0.2) { + templateReaderCustom(posX, posY, posZ, verticalOffset, world, 1, 1, DIAG, false, false); + } else if (playerVelZ < -0.2) { + templateReaderCustom(posX, posY, posZ, verticalOffset, world, 1, -1, DIAG, false, true); + } + } else if (playerVelX < -0.2) { + if (playerVelZ > 0.2) { + templateReaderCustom(posX, posY, posZ, verticalOffset, world, -1, 1, DIAG, true, true); + } else if (playerVelZ < -0.2) { + templateReaderCustom(posX, posY, posZ, verticalOffset, world, -1, -1, DIAG, true, false); + } + } else { + circleTemplate9x9(posX, posY, posZ, verticalOffset, world); } prevPositionMap.put(player, Pair.of(player.posX, player.posZ)); } - public static double computeEllipse(double x, double z, double focusX1, double focusZ1, double focusX2, double focusZ2) { - return Math.sqrt((x - focusX1) * (x - focusX1) + (z - focusZ1) * (z - focusZ1)) + Math.sqrt((x - focusX2) * (x - focusX2) + (z - focusZ2) * (z - focusZ2)); + private static void circleTemplate9x9(int posX, int posY, int posZ, int verticalOffset, World world) { + int x = -5; + int z = -5; + templateReader(posX, posY, posZ, verticalOffset, world, z, x, CIRCLE9X9); + } + + private static void circleTemplate7x7(int posX, int posY, int posZ, int verticalOffset, World world) { + int x = -4; + int z = -4; + templateReader(posX, posY, posZ, verticalOffset, world, z, x, CIRCLE7X7); + } + + private static void rectangleBridge(int posX, int posY, int posZ, int verticalOffset, World world, int startZ, int endZ, int startX, int endX) { + for (int z = startZ; z <= endZ; z++) { + for (int x = startX; x <= endX; x++) { + BlockPos blockPos = new BlockPos(posX + x, posY + verticalOffset, posZ + z); + + if (world.isAirBlock(blockPos)) + world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState()); + } + } + } + + private static void templateReader(int posX, int posY, int posZ, int verticalOffset, World world, int offsetZ, int offsetX, String[] template) { + templateReaderCustom(posX, posY, posZ, verticalOffset, world, offsetZ, offsetX, template, false, false); + } + + private static void templateReaderCustom(int posX, int posY, int posZ, int verticalOffset, World world, int offsetZ, int offsetX, String[] template, boolean inverted, boolean XnZ) { + int x = 0; + for (String row : template) { + if (inverted) + x--; + else + x++; + int z = 0; + for (char block : row.toCharArray()) { + if (inverted && !XnZ || XnZ && !inverted) + z--; + else + z++; + if (block == 'X') { + BlockPos blockPos = new BlockPos(posX + offsetX + x, posY + verticalOffset, posZ + offsetZ + z); + + if (world.isAirBlock(blockPos)) + world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState()); + } + } + } + } + + public static boolean isPhantomActive(EntityPlayer entity) { + for (int i = 0; i < entity.inventory.getSizeInventory(); i++) { + ItemStack stack = entity.inventory.getStackInSlot(i); + if (stack.getItem() instanceof ItemSigilPhantomBridge) + return NBTHelper.checkNBT(stack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); + if (stack.getItem() instanceof ItemSigilHolding) { + List inv = ItemSigilHolding.getInternalInventory(stack); + for (int j = 0; j < ItemSigilHolding.inventorySize; j++) { + ItemStack invStack = inv.get(j); + if (invStack.getItem() instanceof ItemSigilPhantomBridge) + return NBTHelper.checkNBT(invStack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); + } + } + + } + return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index cdda27d8..c1d2007f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileTicking; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; public class TilePhantomBlock extends TileTicking { @@ -27,11 +29,18 @@ public class TilePhantomBlock extends TileTicking { @Override public void onUpdate() { - ticksRemaining--; + if(!world.isRemote) { + EntityPlayer player = world.getClosestPlayer(getPos().getX(), getPos().getY(), getPos().getZ(), 10.0D, ItemSigilPhantomBridge.IS_PHANTOM_ACTIVE); + if (player != null && !player.isSneaking()) + return; + ticksRemaining--; + } + if (ticksRemaining <= 0) { - getWorld().setBlockToAir(getPos()); - getWorld().removeTileEntity(getPos()); + world.setBlockToAir(getPos()); + world.removeTileEntity(getPos()); } + } } From 72eb314da80f2d475b508ecd0aeb0225764a6963 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sun, 26 Aug 2018 21:16:14 +0200 Subject: [PATCH 234/493] Ritual Stones have been nerfed to be Rocky instead of Irony. (#1417) Their material strength has been adjusted to the one of the MRS. --- src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 905c8810..8ef70691 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -21,7 +21,7 @@ import java.util.List; public class BlockRitualStone extends BlockEnum implements IRitualStone { public BlockRitualStone() { - super(Material.IRON, EnumRuneType.class); + super(Material.ROCK, EnumRuneType.class); setUnlocalizedName(BloodMagic.MODID + ".ritualStone."); setCreativeTab(BloodMagic.TAB_BM); From 753958ac9cb09400e7a04e37a87eb986f26604c4 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sun, 26 Aug 2018 21:50:02 +0200 Subject: [PATCH 235/493] Ritual portal delay / Bound Pickaxe fix/improvement (#1387) * Teleportation now works similar to the Nether Portal: if teleportation is attempted before the cooldown (10 ticks) is over, the cooldown gets reset. This way teleportation loops are prevented. You can now: - Stand on a loop of permanently activated (well, constantly refreshing through a high-speed redstone clock) Teleposers, only getting teleposed once per stepping on it - AFK in the Gate of the Fold without getting teleported constantly - and other things, I guess. * Bound Pickaxe AoE ability now destroys blocks properly. closes #1001 * Streamlined bound tool harvest code. Cleanup, duplicate code for bound tools moved as method to ItemBoundTool.sharedHarvest() Tested aoe harvest with Stone, Dirt/Grass and Oak trees. Same result as before. * silkTouch and fortuneLvl are now passed instead of recalculated on every block --- .../bloodmagic/item/ItemBoundAxe.java | 22 ++------------ .../bloodmagic/item/ItemBoundPickaxe.java | 20 ++----------- .../bloodmagic/item/ItemBoundShovel.java | 22 +++----------- .../bloodmagic/item/ItemBoundTool.java | 29 +++++++++++++++---- .../bloodmagic/ritual/portal/Teleports.java | 11 ++++--- 5 files changed, 40 insertions(+), 64 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 14094b3d..3e1e2610 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -10,7 +10,6 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -31,7 +30,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -57,8 +55,9 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { if (world.isRemote) return; - boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); + boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; + int range = charge / 6; //Charge is a max of 30 - want 5 to be the max HashMultiset drops = HashMultiset.create(); @@ -81,22 +80,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - if (blockStack.getState().getBlockHardness(world, blockPos) != -1.0F) { - float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); - - if (strengthVsBlock > 1.1F || blockStack.getBlock() instanceof BlockLeaves && world.canMineBlockBody(player, blockPos)) { - if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) - drops.add(new ItemStackWrapper(blockStack)); - else { - List itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); - - for (ItemStack stacks : itemDrops) - drops.add(ItemStackWrapper.getHolder(stacks)); - } - - world.setBlockToAir(blockPos); - } - } + sharedHarvest(stack, world, player, blockPos, blockStack, drops, silkTouch, fortuneLvl); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 68b37547..eb2326a1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -28,7 +28,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -69,8 +68,9 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { if (world.isRemote) return; - boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); + boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; + int range = (charge / 6); //Charge is a max of 30 - want 5 to be the max HashMultiset drops = HashMultiset.create(); @@ -93,21 +93,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) { - float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); - - if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { - if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) - drops.add(new ItemStackWrapper(blockStack)); - else { - List itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); - for (ItemStack stacks : itemDrops) - drops.add(ItemStackWrapper.getHolder(stacks)); - } - - world.setBlockToAir(blockPos); - } - } + sharedHarvest(stack, world, player, blockPos, blockStack, drops, silkTouch, fortuneLvl); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 3634012d..dba37f03 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -28,7 +28,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -53,15 +52,16 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) { if (world.isRemote) return; - - boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); + boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; + int range = charge / 6; //Charge is a max of 30 - want 5 to be the max HashMultiset drops = HashMultiset.create(); BlockPos playerPos = player.getPosition(); + for (int i = -range; i <= range; i++) { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { @@ -79,21 +79,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) { - float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); - - if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { - if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) - drops.add(new ItemStackWrapper(blockStack)); - else { - List itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); - for (ItemStack stacks : itemDrops) - drops.add(ItemStackWrapper.getHolder(stacks)); - } - - world.setBlockToAir(blockPos); - } - } + sharedHarvest(stack, world, player, blockPos, blockStack, drops, silkTouch, fortuneLvl); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index bdc791bf..f2aea812 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -1,20 +1,19 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.event.BoundToolEvent; import WayofTime.bloodmagic.iface.IActivatable; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; +import com.google.common.collect.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -251,4 +250,22 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { world.spawnEntity(new EntityItem(world, posToDrop.getX(), posToDrop.getY(), posToDrop.getZ(), stack.toStack(count))); } } + + protected void sharedHarvest(ItemStack stack, World world, EntityPlayer player, BlockPos blockPos, BlockStack blockStack, HashMultiset drops, boolean silkTouch, int fortuneLvl){ + + if (blockStack.getBlock() != null && blockStack.getState().getBlockHardness(world, blockPos) != -1.0F) { + float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); + + if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { + if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) + drops.add(new ItemStackWrapper(blockStack)); + else { + List itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); + for (ItemStack stacks : itemDrops) + drops.add(ItemStackWrapper.getHolder(stacks)); + } + blockStack.getBlock().removedByPlayer(world.getBlockState(blockPos), world, blockPos,player, false); + } + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index 5f253ca1..2fe03c47 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -49,6 +49,7 @@ public class Teleports { if (entity != null) { BlockPos targetTeleposer = new BlockPos(x,y,z); if (entity.timeUntilPortal <= 0) { + entity.timeUntilPortal = 10; if (entity instanceof EntityPlayer) { SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); @@ -65,7 +66,6 @@ public class Teleports { player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.getEntityWorld().updateEntityWithOptionalForce(player, false); player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); - player.timeUntilPortal = 150; player.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); if (teleposer) @@ -83,13 +83,14 @@ public class Teleports { network.syphon(ticket(world, entity, getTeleportCost() / 10)); entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - entity.timeUntilPortal = 150; world.resetUpdateEntityTick(); entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); if (teleposer) MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer)); } + }else{ + entity.timeUntilPortal = 10; } } } @@ -120,6 +121,7 @@ public class Teleports { public void teleport() { if (entity != null) { if (entity.timeUntilPortal <= 0) { + entity.timeUntilPortal = 10; MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); WorldServer oldWorldServer = server.getWorld(entity.dimension); WorldServer newWorldServer = server.getWorld(newWorldID); @@ -206,7 +208,6 @@ public class Teleports { teleportedEntity.forceSpawn = true; newWorldServer.spawnEntity(teleportedEntity); teleportedEntity.setWorld(newWorldServer); - teleportedEntity.timeUntilPortal = teleportedEntity instanceof EntityPlayer ? 150 : 20; } oldWorldServer.resetUpdateEntityTick(); @@ -214,8 +215,10 @@ public class Teleports { if (teleposer) MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer)); } - entity.timeUntilPortal = entity instanceof EntityLiving ? 150 : 20; newWorldServer.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); + + }else{ + entity.timeUntilPortal = 10; ForgeChunkManager.releaseTicket(chunkTicket); } } From 7942465edcfc7714f25cd41aa0e0250eb3221e93 Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sun, 26 Aug 2018 21:55:23 +0200 Subject: [PATCH 236/493] Well of Suffering item drop control (#1388) * Added a new DamageSource for the Well of Suffering Added an event handler for death through Well of Suffering Added a config option to enable (true) or disable (false) Well of Suffering Mob drops. * Moved the DamageSource creation to RitualManager Renamed the new DamageSource to "RITUAL_DAMAGE" DamageSource "RITUAL_DAMAGE" is now used by RitualForsakenSoul and RitualWellOfSuffering Added death message string for "RITUAL_DAMAGE" for en_US and de_DE * Cleanup, removed the ability to damage entities in creative mode (creative mode should be considered as having infinite health, the rituals only damage mobs anyways). * Update GenericHandler.java --- .../WayofTime/bloodmagic/ConfigHandler.java | 2 + .../bloodmagic/ritual/RitualManager.java | 8 +++- .../ritual/types/RitualForsakenSoul.java | 3 +- .../ritual/types/RitualWellOfSuffering.java | 3 +- .../util/handler/event/GenericHandler.java | 43 +++++++++++++------ .../assets/bloodmagic/lang/de_DE.lang | 3 ++ .../assets/bloodmagic/lang/en_US.lang | 5 +++ 7 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 4bed50be..85b20776 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -66,6 +66,8 @@ public class ConfigHandler public int sacrificialDaggerConversion = 100; @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) public boolean shouldResyncMeteors = true; + @Config.Comment({ "Should mobs that die through the Well of Suffering Ritual drop items?"}) + public boolean wellOfSufferingDrops = true; } public static class ConfigClient diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java index e6e2287b..ff8aa0bc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java @@ -6,12 +6,17 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import net.minecraft.block.state.IBlockState; +import net.minecraft.util.DamageSource; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.discovery.ASMDataTable; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; public class RitualManager { + public static final DamageSource RITUAL_DAMAGE = new DamageSource("ritual_damage").setDamageBypassesArmor(); private final Map rituals; private final Map ritualsReverse; @@ -20,6 +25,7 @@ public class RitualManager { private final Map imperfectRitualsReverse; private final Configuration config; + public RitualManager(Configuration config) { this.rituals = Maps.newTreeMap(); this.ritualsReverse = Maps.newHashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index 0e3207bc..7caf6c88 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -9,7 +9,6 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -110,7 +109,7 @@ public class RitualForsakenSoul extends Ritual { continue; if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { - if (entity.attackEntityFrom(DamageSource.OUT_OF_WORLD, 1)) { + if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) { if (!entity.isEntityAlive()) { int uniqueness = calculateUniqueness(entity); double modifier = 1; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 8e20ebf6..7a27fce3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -7,7 +7,6 @@ import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -89,7 +88,7 @@ public class RitualWellOfSuffering extends Ritual { continue; if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { - if (entity.attackEntityFrom(DamageSource.OUT_OF_WORLD, 1)) { + if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) { if (entity.isChild()) lifeEssenceRatio *= 0.5F; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 0dff68cc..9dbc6711 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -3,37 +3,40 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.block.BlockAltar; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.event.ItemBindEvent; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import WayofTime.bloodmagic.item.ItemAltarMaker; import WayofTime.bloodmagic.item.ItemExperienceBook; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.DemonAuraPacketProcessor; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.potion.BMPotionUtils; -import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.ritual.RitualManager; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.*; +import WayofTime.bloodmagic.util.helper.BindableHelper; +import WayofTime.bloodmagic.util.helper.ItemHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; @@ -79,7 +82,10 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { @@ -405,6 +411,15 @@ public class GenericHandler { } } + @SubscribeEvent + public static void onRitualDeath(LivingDropsEvent event){ + if(!ConfigHandler.values.wellOfSufferingDrops){ + if(event.getSource().equals(RitualManager.RITUAL_DAMAGE)) { + event.getDrops().clear(); + } + } + } + // Experience Tome @SubscribeEvent(priority = EventPriority.LOWEST) public static void onExperiencePickup(PlayerPickupXpEvent event) { diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang index d4d8ce84..0cb12242 100644 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang @@ -857,6 +857,9 @@ bloodmagic.keybind.open_holding=Öffne Siegel der Aufbewahrung bloodmagic.keybind.cycle_holding_pos=Siegelrotation (+) bloodmagic.keybind.cycle_holding_neg=Siegelrotation (-) +death.attack.ritual_damage=%1$s wurde für ein Ritual geopfert. +death.attack.ritual_damage.player=%2$s hat %1$s für ein Ritual geopfert. + # JustEnoughItems jei.bloodmagic.recipe.altar=Blutaltar jei.bloodmagic.recipe.binding=Alchemische Anordnung (Bindung) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 5545c19c..4e51e06b 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -789,6 +789,9 @@ chat.bloodmagic.mimic.detectRadius.down=Player detection radius has been decreas chat.bloodmagic.mimic.potionSpawnRadius.up=Potion spawning radius has been increased to: %d blocks. chat.bloodmagic.mimic.potionSpawnRadius.down=Potion spawning radius has been decreased to: %d blocks. +death.attack.ritual_damage=%1$s has been sacrificed for a ritual. +death.attack.ritual_damage.player=%2$s has sacrificed %1$s for a ritual. + # entity entity.bloodmagic.SentientSpecter.name=Sentient Specter entity.bloodmagic.Mimic.name=Mimic @@ -849,6 +852,8 @@ commands.bloodmagic.soulnetwork.notACommand=That is not a valid command commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) + + # GUI tile.bloodmagic.inputNode.name=Input Node tile.bloodmagic.outputNode.name=Output Node From 81047734a610750b531ad6ddadf2860a1a8bd4a6 Mon Sep 17 00:00:00 2001 From: KohaiKhaos Date: Sun, 26 Aug 2018 14:59:41 -0500 Subject: [PATCH 237/493] Changed the lava, water, and void sigils to work with fluid tanks better (#1406) * Modified sigils of lava, water, and void to interact with tanks correctly. * Fixed up some formatting errors * Fixed? * Reimplemented necessary fluid code as extensible functions in ItemSigilFluidBase and made the fluid sigils draw functions from there rather than FluidUtil * Fixed up formatting and used an actual IDE for once. --- .../item/sigil/ItemSigilFluidBase.java | 128 ++++++++++++++++++ .../bloodmagic/item/sigil/ItemSigilLava.java | 108 +++++---------- .../bloodmagic/item/sigil/ItemSigilVoid.java | 104 ++++---------- .../bloodmagic/item/sigil/ItemSigilWater.java | 128 +++++------------- 4 files changed, 222 insertions(+), 246 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java new file mode 100644 index 00000000..614f87f4 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java @@ -0,0 +1,128 @@ +package WayofTime.bloodmagic.item.sigil; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper; +import net.minecraftforge.fluids.capability.wrappers.BlockWrapper; +import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; + +import javax.annotation.Nullable; + +public abstract class ItemSigilFluidBase extends ItemSigilBase { + //Class for sigils that interact with fluids, either creating or deleting them. + //Sigils still have to define their own onRightClick behavior, but the actual fluid-interacting code is largely limited to here. + public final FluidStack sigilFluid; + + public ItemSigilFluidBase(String name, int lpUsed, FluidStack fluid) { + super(name, lpUsed); + sigilFluid = fluid; + } + + public ItemSigilFluidBase(String name, FluidStack fluid) { + super(name); + sigilFluid = fluid; + } + + public ItemSigilFluidBase(String name) { + super(name); + sigilFluid = null; + } + + //The following are handler functions for fluids, all genericized. + //They're all based off of the Forge FluidUtil methods, but directly taking the sigilFluid constant instead of getting an argument. + + /* Gets a fluid handler for the targeted block and siding. + * Works for both tile entity liquid containers and fluid blocks. + * This one is literally identical to the FluidUtil method of the same signature. + */ + @Nullable + protected IFluidHandler getFluidHandler(World world, BlockPos blockPos, @Nullable EnumFacing side) { + IBlockState state = world.getBlockState(blockPos); + Block block = state.getBlock(); + TileEntity tile = world.getTileEntity(blockPos); + if (tile != null) { + IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); + if (handler != null) + return handler; + } + if (block instanceof IFluidBlock) + return new FluidBlockWrapper((IFluidBlock) block, world, blockPos); + else if (block instanceof BlockLiquid) + return new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); + return null; + } + + /* Tries to insert fluid into a fluid handler. + * If doTransfer is false, only simulate the transfer. If true, actually do so. + * Returns true if the transfer is successful, false otherwise. + */ + protected boolean tryInsertSigilFluid(IFluidHandler destination, boolean doTransfer) { + if (destination == null) + return false; + return destination.fill(sigilFluid, doTransfer) > 0; + } + + /* Tries basically the oppostive of the above, removing fluids instead of adding them + */ + protected boolean tryRemoveFluid(IFluidHandler source, int amount, boolean doTransfer) { + if (source == null) + return false; + return source.drain(amount, doTransfer) != null; + } + + /* Tries to place a fluid block in the world. + * Returns true if successful, otherwise false. + * This is the big troublesome one, oddly enough. + * It's genericized in case anyone wants to create variant sigils with weird fluids. + */ + protected boolean tryPlaceSigilFluid(EntityPlayer player, World world, BlockPos blockPos) { + + //Make sure world coordinants are valid + if (world == null || blockPos == null) { + return false; + } + //Make sure fluid is placeable + Fluid fluid = sigilFluid.getFluid(); + if (!fluid.canBePlacedInWorld()) { + return false; + } + + //Check if the block is an air block or otherwise replaceable + IBlockState state = world.getBlockState(blockPos); + Material mat = state.getMaterial(); + boolean isDestSolid = mat.isSolid(); + boolean isDestReplaceable = state.getBlock().isReplaceable(world, blockPos); + if (!world.isAirBlock(blockPos) && isDestSolid && !isDestReplaceable) { + return false; + } + + //If the fluid vaporizes, this exists here in the lava sigil solely so the code is usable for other fluids + if (world.provider.doesWaterVaporize() && fluid.doesVaporize(sigilFluid)) { + fluid.vaporize(player, world, blockPos, sigilFluid); + return true; + } + + //Finally we've done enough checking to make sure everything at the end is safe, let's place some fluid. + IFluidHandler handler; + Block block = fluid.getBlock(); + if (block instanceof IFluidBlock) + handler = new FluidBlockWrapper((IFluidBlock) block, world, blockPos); + else if (block instanceof BlockLiquid) + handler = new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); + else + handler = new BlockWrapper(block, world, blockPos); + return tryInsertSigilFluid(handler, true); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 6b044a6d..2c235b1a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -4,24 +4,23 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -public class ItemSigilLava extends ItemSigilBase { + +public class ItemSigilLava extends ItemSigilFluidBase { + public ItemSigilLava() { - super("lava", 1000); + super("lava", 1000, new FluidStack(FluidRegistry.LAVA, 1000)); } @Override @@ -35,79 +34,38 @@ public class ItemSigilLava extends ItemSigilBase { if (!world.isRemote && !isUnusable(stack)) { RayTraceResult rayTrace = this.rayTrace(world, player, false); - if (rayTrace != null) { - ActionResult ret = ForgeEventFactory.onBucketUse(player, world, stack, rayTrace); - if (ret != null) - return ret; + if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { + return ActionResult.newResult(EnumActionResult.PASS, stack); + } - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockpos = rayTrace.getBlockPos(); + BlockPos blockPos = rayTrace.getBlockPos(); - if (!world.isBlockModifiable(player, blockpos)) { - return super.onItemRightClick(world, player, hand); - } - - if (!player.canPlayerEdit(blockpos.offset(rayTrace.sideHit), rayTrace.sideHit, stack)) { - return super.onItemRightClick(world, player, hand); - } - - BlockPos blockpos1 = blockpos.offset(rayTrace.sideHit); - - if (!player.canPlayerEdit(blockpos1, rayTrace.sideHit, stack)) { - return super.onItemRightClick(world, player, hand); - } - - if (canPlaceLava(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && tryPlaceLava(world, blockpos1)) { - return super.onItemRightClick(world, player, hand); + if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, rayTrace.sideHit, stack)) { + //Case for if block at blockPos is a fluid handler like a tank + //Try to put fluid into tank + IFluidHandler destination = getFluidHandler(world, blockPos, null); + if (destination != null && tryInsertSigilFluid(destination, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + boolean result = tryInsertSigilFluid(destination, true); + if (result) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } + //Do the same as above, but use sidedness to interact with the fluid handler. + IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); + if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + boolean result = tryInsertSigilFluid(destinationSide, true); + if (result) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } + //Case for if block at blockPos is not a tank + //Place fluid in world + if (destination == null && destinationSide == null) { + BlockPos targetPos = blockPos.offset(rayTrace.sideHit); + if (tryPlaceSigilFluid(player, world, targetPos) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } } } } - return super.onItemRightClick(world, player, hand); } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) { - return EnumActionResult.FAIL; - } - if (!world.canMineBlockBody(player, blockPos)) { - return EnumActionResult.FAIL; - } - - TileEntity tile = world.getTileEntity(blockPos); - if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); - int amount = handler.fill(fluid, false); - - if (amount > 0 && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - handler.fill(fluid, true); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - return EnumActionResult.FAIL; - } - - public boolean canPlaceLava(World world, BlockPos blockPos) { - if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isSolid()) { - return false; - } else if ((world.getBlockState(blockPos).getBlock() == Blocks.LAVA || world.getBlockState(blockPos).getBlock() == Blocks.FLOWING_LAVA) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0) { - return false; - } else { - world.setBlockState(blockPos, Blocks.FLOWING_LAVA.getBlockState().getBaseState(), 3); - return true; - } - } - - public boolean tryPlaceLava(World world, BlockPos pos) { - Material material = world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)); - - return world.isAirBlock(pos) && !material.isSolid(); - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 93796d8d..702e692c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,26 +1,22 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -public class ItemSigilVoid extends ItemSigilBase { +public class ItemSigilVoid extends ItemSigilFluidBase { public ItemSigilVoid() { - super("void", 50); + super("void", 50, null); } @Override @@ -34,81 +30,29 @@ public class ItemSigilVoid extends ItemSigilBase { if (!world.isRemote && !isUnusable(stack)) { RayTraceResult rayTrace = this.rayTrace(world, player, true); - if (rayTrace != null) { - ActionResult ret = ForgeEventFactory.onBucketUse(player, world, stack, rayTrace); - if (ret != null) - return ret; - - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockpos = rayTrace.getBlockPos(); - - if (!world.isBlockModifiable(player, blockpos)) { - return super.onItemRightClick(world, player, hand); - } - - if (!player.canPlayerEdit(blockpos.offset(rayTrace.sideHit), rayTrace.sideHit, stack)) { - return super.onItemRightClick(world, player, hand); - } - - if (!player.canPlayerEdit(blockpos, rayTrace.sideHit, stack)) { - return super.onItemRightClick(world, player, hand); - } - - if (world.getBlockState(blockpos).getBlock().getMaterial(world.getBlockState(blockpos)).isLiquid() && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - world.setBlockToAir(blockpos); - return super.onItemRightClick(world, player, hand); - } - } - } else { - return super.onItemRightClick(world, player, hand); + if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { + return ActionResult.newResult(EnumActionResult.PASS, stack); } - if (!player.capabilities.isCreativeMode) - setUnusable(stack, !NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()); + BlockPos blockPos = rayTrace.getBlockPos(); + + if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, rayTrace.sideHit, stack)) { + //Void is simpler than the other fluid sigils, because getFluidHandler grabs fluid blocks just fine + //So extract from fluid tanks with a null side; or drain fluid blocks. + IFluidHandler destination = getFluidHandler(world, blockPos, null); + if (destination != null && tryRemoveFluid(destination, 1000, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + if (tryRemoveFluid(destination, 1000, true)) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } + //Do the same as above, but use sidedness to interact with the fluid handler. + IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); + if (destinationSide != null && tryRemoveFluid(destinationSide, 1000, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + if (tryRemoveFluid(destinationSide, 1000, true)) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } + } } return super.onItemRightClick(world, player, hand); } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return EnumActionResult.FAIL; - - if (world.isRemote || player.isSneaking() || isUnusable(stack)) { - return EnumActionResult.FAIL; - } - - if (!world.canMineBlockBody(player, blockPos)) { - return EnumActionResult.FAIL; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - TileEntity tile = world.getTileEntity(blockPos); - if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - FluidStack amount = handler.drain(1000, false); - - if (amount != null && amount.amount > 0 && network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - handler.drain(1000, true); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - BlockPos newPos = blockPos.offset(side); - - if (!player.canPlayerEdit(newPos, side, stack)) { - return EnumActionResult.FAIL; - } - - if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - world.setBlockToAir(newPos); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 5737fd32..6e71a24d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -5,24 +5,22 @@ import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.block.BlockCauldron; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -public class ItemSigilWater extends ItemSigilBase { +public class ItemSigilWater extends ItemSigilFluidBase { public ItemSigilWater() { - super("water", 100); + super("water", 100, new FluidStack(FluidRegistry.WATER, 1000)); } @Override @@ -36,98 +34,46 @@ public class ItemSigilWater extends ItemSigilBase { if (!world.isRemote && !isUnusable(stack)) { RayTraceResult rayTrace = this.rayTrace(world, player, false); - if (rayTrace != null) { - ActionResult ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, rayTrace); - if (ret != null) - return ret; + if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { + return ActionResult.newResult(EnumActionResult.PASS, stack); + } - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockpos = rayTrace.getBlockPos(); + BlockPos blockPos = rayTrace.getBlockPos(); - if (!world.isBlockModifiable(player, blockpos)) - return super.onItemRightClick(world, player, hand); + if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, rayTrace.sideHit, stack)) { + //Case for if block at blockPos is a fluid handler like a tank + //Try to put fluid into tank + IFluidHandler destination = getFluidHandler(world, blockPos, null); + if (destination != null && tryInsertSigilFluid(destination, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + boolean result = tryInsertSigilFluid(destination, true); + if (result) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } + //Do the same as above, but use sidedness to interact with the fluid handler. + IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); + if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + boolean result = tryInsertSigilFluid(destinationSide, true); + if (result) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } - if (!player.canPlayerEdit(blockpos.offset(rayTrace.sideHit), rayTrace.sideHit, stack)) - return super.onItemRightClick(world, player, hand); + //Special vanilla cauldron handling, yay. + if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(BlockCauldron.LEVEL, 3)); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } - BlockPos blockpos1 = blockpos.offset(rayTrace.sideHit); - - if (!player.canPlayerEdit(blockpos1, rayTrace.sideHit, stack)) - return super.onItemRightClick(world, player, hand); - - if (canPlaceWater(world, blockpos1) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && tryPlaceWater(world, blockpos1)) - return super.onItemRightClick(world, player, hand); + //Case for if block at blockPos is not a tank + //Place fluid in world + if (destination == null && destinationSide == null) { + BlockPos targetPos = blockPos.offset(rayTrace.sideHit); + if (tryPlaceSigilFluid(player, world, targetPos) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } } } } return super.onItemRightClick(world, player, hand); } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) - return EnumActionResult.FAIL; - - if (!world.canMineBlockBody(player, blockPos)) - return EnumActionResult.FAIL; - - TileEntity tile = world.getTileEntity(blockPos); - if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000); - int amount = handler.fill(fluid, false); - - if (amount > 0 && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - handler.fill(fluid, true); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(BlockCauldron.LEVEL, 3)); - return EnumActionResult.SUCCESS; - } - - return EnumActionResult.FAIL; - } - - public boolean canPlaceWater(World world, BlockPos blockPos) { - if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isSolid()) - return false; - else if ((world.getBlockState(blockPos).getBlock() == Blocks.WATER || world.getBlockState(blockPos).getBlock() == Blocks.FLOWING_WATER) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0) - return false; - else - return true; - } - - public boolean tryPlaceWater(World worldIn, BlockPos pos) { - - Material material = worldIn.getBlockState(pos).getBlock().getMaterial(worldIn.getBlockState(pos)); - boolean notSolid = !material.isSolid(); - - if (!worldIn.isAirBlock(pos) && !notSolid) { - return false; - } else { - if (worldIn.provider.doesWaterVaporize()) { - int i = pos.getX(); - int j = pos.getY(); - int k = pos.getZ(); - worldIn.playSound(null, i, j, k, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F); - - for (int l = 0; l < 8; ++l) - worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D, 0); - } else { - if (!worldIn.isRemote && notSolid && !material.isLiquid()) - worldIn.destroyBlock(pos, true); - - worldIn.setBlockState(pos, Blocks.FLOWING_WATER.getDefaultState(), 3); - } - - return true; - } - } } From 9440d3c0b9187cca3f85424ae3e53bf2db824799 Mon Sep 17 00:00:00 2001 From: KohaiKhaos Date: Sun, 26 Aug 2018 15:00:07 -0500 Subject: [PATCH 238/493] This should fix a few existing issues with Teleposers, they no longer syphon from the bound player. (#1414) --- .../java/WayofTime/bloodmagic/tile/TileTeleposer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index aeff21a0..8aaf092f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.TeleposeEvent; -import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; +import WayofTime.bloodmagic.teleport.TeleportQueue; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -77,7 +76,7 @@ public class TileTeleposer extends TileInventory implements ITickable { final int focusLevel = (getStackInSlot(0).getItemDamage() + 1); final int lpToBeDrained = (int) (0.5F * Math.sqrt((pos.getX() - focusPos.getX()) * (pos.getX() - focusPos.getX()) + (pos.getY() - focusPos.getY() + 1) * (pos.getY() - focusPos.getY() + 1) + (pos.getZ() - focusPos.getZ()) * (pos.getZ() - focusPos.getZ()))); - if (NetworkHelper.getSoulNetwork(binding).syphonAndDamage(PlayerHelper.getPlayerFromUUID(binding.getOwnerId()), SoulTicket.block(world, pos, lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1))).isSuccess()) { + if (NetworkHelper.syphonFromContainer(focusStack, SoulTicket.block(world, pos, lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1)))) { int blocksTransported = 0; for (int i = -(focusLevel - 1); i <= (focusLevel - 1); i++) { From 1f392721fa7596485125e4a11b851892116f3cbd Mon Sep 17 00:00:00 2001 From: AEon - Tobias Date: Sun, 26 Aug 2018 22:05:30 +0200 Subject: [PATCH 239/493] Reinstated Compression sigil. (#1374) * Reinstated Compression sigil. - does not compress wooden planks into crafting tables - searches for reversible 3x3/2x2 recipes with a single material type - probably has a lot of redundant stuff and looks silly - uses try/catch (might want to find a different approach, some people scoff at this) - should probably have spent the night sleeping, I'm taking exams tomorrow and will probably sleep the whole day through. * Learned how to properly handle the "NullPointerException"-situation. * Update BaseCompressionHandler.java * Update CompressionRegistry.java * Removed (almost) all code comments (only a one-liner remains that serves as pointer to a completly commented-out class (StorageBlockCraftingRecipeAssimilator)). Made methods and variables for long function calls to be more efficient. Fixed an oversight that resulted in a NullPointerException after removing redundant checks that were made to prevent exactly that. Rearranged and reformatted code. * corrected something that could be considered a typo but was an oversight * This should be it. An Array should be more efficient but you can correct me if I'm wrong. In either case it does what it is supposed to do. * Fixed. Needed a seperate inventory for the reversible check (or clear the previously used one, but then I'd had to repopulate again and that would just have been messy) * Forgot one of my lines. * Fix and cleanup. Could definitely clean more but that should suffice for now. --- .../compress/AdvancedCompressionHandler.java | 187 ++++++++---------- .../compress/BaseCompressionHandler.java | 57 +----- .../compress/CompressionHandler.java | 46 ++++- .../compress/CompressionRegistry.java | 12 +- .../compress/StorageBlockCraftingManager.java | 26 ++- .../item/sigil/ItemSigilCompression.java | 2 - .../bloodmagic/registry/ModRecipes.java | 3 +- 7 files changed, 153 insertions(+), 180 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index 2050f6b7..b5d78913 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -4,31 +4,98 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; + public class AdvancedCompressionHandler extends CompressionHandler { - @Override - public ItemStack compressInventory(ItemStack[] inv, World world) { - return test(inv, true, world); + + private static InventoryCrafting[] inventoryCrafting = { + new InventoryCrafting(new Container() { + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, + 3, 3), + new InventoryCrafting(new Container() { + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, + 2, 2), + new InventoryCrafting(new Container() { + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, + 1, 1) + + }; + + private static ItemStack reversibleCheck; + + public static boolean isResultStackReversible(ItemStack stack, World world) { + if (stack.isEmpty()) { + return false; + } + + inventoryCrafting[2].setInventorySlotContents(0, stack); + ItemStack returnStack = getNNRecipeOutput(inventoryCrafting[2], world); + + return !returnStack.isEmpty() && CompressionRegistry.areItemStacksEqual(reversibleCheck, returnStack); } - public ItemStack test(ItemStack[] inv, boolean doDrain, World world) { + public static ItemStack getRecipe(ItemStack stack, World world, int gridSize) { + StorageBlockCraftingManager craftingManagerSB = StorageBlockCraftingManager.getInstance(); + InventoryCrafting inventory = inventoryCrafting[3 - gridSize]; + for (int i = 0; i < inventory.getSizeInventory(); i++) { + inventory.setInventorySlotContents(i, stack); + } + ItemStack notEmptyRecipe = craftingManagerSB.findMatchingRecipe(inventory, world); + if (!notEmptyRecipe.isEmpty()) { + return notEmptyRecipe; + } + ItemStack result = getNNRecipeOutput(inventory, world); + + if (isResultStackReversible(result, world)) { + craftingManagerSB.addRecipe(CraftingManager.findMatchingRecipe(inventory, world)); + return result; + } + return ItemStack.EMPTY; + } + + public static ItemStack getNNRecipeOutput(InventoryCrafting inventory, World world) { + IRecipe checkForNull = CraftingManager.findMatchingRecipe(inventory, world); + if (checkForNull != null) { + return checkForNull.getRecipeOutput(); + } + return ItemStack.EMPTY; + } + + public static ItemStack get22Recipe(ItemStack stack, World world) { + return getRecipe(stack, world, 2); + } + + public static ItemStack get33Recipe(ItemStack stack, World world) { + return getRecipe(stack, world, 3); + } + + public ItemStack compressInventory(ItemStack[] inv, World world) { for (ItemStack invStack : inv) { if (invStack.isEmpty()) { continue; } - for (int i = 2; i <= 3; i++) { + for (int i = 3; i >= 2; i--) { + reversibleCheck = invStack; ItemStack stack = getRecipe(invStack, world, i); if (!stack.isEmpty()) { - int threshold = CompressionRegistry.getItemThreshold(invStack); - int needed = i * i; - int neededLeft = iterateThroughInventory(invStack, threshold + invStack.getMaxStackSize() - needed, inv, needed, false); - if (neededLeft <= 0) { - iterateThroughInventory(invStack, 0, inv, needed, true); + int needed = (i == 2 ? 4 : 9); + int remaining = iterateThroughInventory(invStack, invStack.getMaxStackSize() - needed, inv, needed, true); // if more than needed gets consumed at any point, the simulate test was needed after all + if (remaining <= 0) return stack; - } } } } @@ -36,103 +103,5 @@ public class AdvancedCompressionHandler extends CompressionHandler { return ItemStack.EMPTY; } - public int iterateThroughInventory(ItemStack required, int kept, ItemStack[] inv, int needed, boolean doDrain) { - int i = -1; - for (ItemStack invStack : inv) { - i++; - - if (invStack.isEmpty()) { - continue; - } - - if (invStack.isItemEqual(required) && (invStack.getTagCompound() == null ? required.getTagCompound() == null : invStack.getTagCompound().equals(required.getTagCompound()))) { - int stackSize = invStack.getCount(); - int used = 0; - if (kept > 0) { - int remainingFromStack = Math.max(stackSize - kept, 0); - used += stackSize - remainingFromStack; - } - - kept -= used; - - if (kept <= 0 && needed > 0) { - int remainingFromStack = Math.max(stackSize - used - needed, 0); - if (doDrain) { - invStack.setCount(remainingFromStack + used); - if (invStack.isEmpty()) { - inv[i] = ItemStack.EMPTY; - } - } - - needed -= (stackSize - used - remainingFromStack); - } - - if (needed <= 0) { - return 0; - } - } - } - - return needed; - } - - public static boolean isResultStackReversible(ItemStack stack, int gridSize, World world) { - if (stack.isEmpty()) { - return false; - } - InventoryCrafting inventory = new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, 2, 2); - - inventory.setInventorySlotContents(0, stack); - - ItemStack returnStack = StorageBlockCraftingManager.getInstance().findMatchingRecipe(inventory, world); - if (returnStack.isEmpty()) { - return false; - } - - ItemStack compressedStack = ItemStack.EMPTY; - switch (gridSize) { - case 2: - compressedStack = get22Recipe(returnStack, world); - break; - case 3: - compressedStack = get33Recipe(returnStack, world); - break; - } - - return !compressedStack.isEmpty() && CompressionRegistry.areItemStacksEqual(stack, compressedStack); - } - - public static ItemStack getRecipe(ItemStack stack, World world, int gridSize) { - InventoryCrafting inventory = new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, gridSize, gridSize); - for (int i = 0; i < inventory.getSizeInventory(); i++) { - inventory.setInventorySlotContents(i, stack); - } - - return StorageBlockCraftingManager.getInstance().findMatchingRecipe(inventory, world); - } - - public static boolean has22Recipe(ItemStack stack, World world) { - return !get22Recipe(stack, world).isEmpty(); - } - - public static ItemStack get22Recipe(ItemStack stack, World world) { - return getRecipe(stack, world, 2); - } - - public static boolean has33Recipe(ItemStack stack, World world) { - return !get33Recipe(stack, world).isEmpty(); - } - - public static ItemStack get33Recipe(ItemStack stack, World world) { - return getRecipe(stack, world, 3); - } } diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 1af4b63b..94b4ddf6 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -8,11 +8,11 @@ public class BaseCompressionHandler extends CompressionHandler { private final ItemStack result; private final int leftover; - public BaseCompressionHandler(ItemStack requested, ItemStack result, int leftover) { + public BaseCompressionHandler(ItemStack input, ItemStack output, int remainder) { super(); - this.required = requested; - this.result = result; - this.leftover = leftover; + this.required = input; + this.result = output; + this.leftover = remainder; } public ItemStack getResultStack() { @@ -35,57 +35,18 @@ public class BaseCompressionHandler extends CompressionHandler { } public int getRemainingNeeded(ItemStack[] inv) { - return iterateThroughInventory(inv, false); + int needed = this.required.getCount(); + int kept = this.getLeftover(); + return iterateThroughInventory(this.required, kept, inv, needed, true); } public int drainInventory(ItemStack[] inv) { - return iterateThroughInventory(inv, true); - } - - public int iterateThroughInventory(ItemStack[] inv, boolean doDrain) { int needed = this.required.getCount(); int kept = this.getLeftover(); - int i = -1; - - for (ItemStack invStack : inv) { - i++; - - if (invStack == null) { - continue; - } - - if (invStack.isItemEqual(this.required) && (invStack.getTagCompound() == null ? this.required.getTagCompound() == null : invStack.getTagCompound().equals(this.required.getTagCompound()))) { - int stackSize = invStack.getCount(); - int used = 0; - if (kept > 0) { - int remainingFromStack = Math.max(stackSize - kept, 0); - used += stackSize - remainingFromStack; - } - - kept -= used; - - if (kept <= 0 && needed > 0) { - int remainingFromStack = Math.max(stackSize - used - needed, 0); - if (doDrain) { - invStack.setCount(remainingFromStack + used); - if (invStack.isEmpty()) { - inv[i] = ItemStack.EMPTY; - } - } - - needed -= (stackSize - used - remainingFromStack); - } - - if (needed <= 0) { - return 0; - } - } - } - - return needed; + return iterateThroughInventory(this.required, kept, inv, needed, true); } public int getLeftover() { return this.leftover; } -} +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java index b7da216d..2cd74d14 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java @@ -12,4 +12,48 @@ public abstract class CompressionHandler { * @return The result of the compression */ public abstract ItemStack compressInventory(ItemStack[] inv, World world); -} + + public int iterateThroughInventory(ItemStack required, int kept, ItemStack[] inv, int needed, boolean doDrain) { + int i = -1; + + for (ItemStack invStack : inv) { + i++; + + if (invStack.isEmpty()) { + continue; + } + + if (invStack.isItemEqual(required) && (invStack.getTagCompound() == null ? required.getTagCompound() == null : invStack.getTagCompound().equals(required.getTagCompound()))) { + int stackSize = invStack.getCount(); + int used = 0; + if (kept > 0) { + int remainingFromStack = Math.max(stackSize - kept, 0); + used += stackSize - remainingFromStack; + } + + kept -= used; // 0 + + if (kept <= 0 && needed > 0) { + int remainingFromStack = Math.max(stackSize - used - needed, 0); + if (doDrain) { + invStack.setCount(remainingFromStack + used); + if (invStack.isEmpty()) { + inv[i] = ItemStack.EMPTY; + } + } + + needed -= (stackSize - used - remainingFromStack); + } + + if (needed <= 0) { + return 0; + } + } + } + + return needed; + + + } + +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java index 2d975531..8c10fa3a 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java @@ -38,7 +38,7 @@ public class CompressionRegistry { public static ItemStack compressInventory(ItemStack[] inv, World world) { for (CompressionHandler handler : compressionRegistry) { ItemStack stack = handler.compressInventory(inv, world); - if (stack != null) { + if (!stack.isEmpty()) { return stack; } } @@ -78,16 +78,10 @@ public class CompressionRegistry { } public static int getItemThreshold(ItemStack stack) { - for (Map.Entry entry : thresholdMap.entrySet()) { - if (areItemStacksEqual(entry.getKey(), stack)) { - return entry.getValue(); - } - } - - return 0; + return stack.getItem().getItemStackLimit(stack); //this should work according to the guide, leaving behind a full stack of the source item (unless otherwise specified with a BaseCompressionHandler recipe) } public static boolean areItemStacksEqual(ItemStack stack, ItemStack compressedStack) { return stack.isItemEqual(compressedStack) && (stack.getTagCompound() == null ? !compressedStack.hasTagCompound() : stack.getTagCompound().equals(compressedStack.getTagCompound())); } -} +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 19e06bb4..96d31140 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -14,11 +14,17 @@ import java.util.List; public class StorageBlockCraftingManager { private static final StorageBlockCraftingManager instance = new StorageBlockCraftingManager(); - private List recipes = new LinkedList(); + private List recipes = new LinkedList<>(); + public void addRecipe(IRecipe recipe){ + this.recipes.add(recipe); + } + + //recipes are currently added during runtime, this will only return recipes specifically added in init + //through BaseCompressionHandler public void addStorageBlockRecipes() { -// this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); + //this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); BMLog.DEBUG.info("Total number of compression recipes: " + this.recipes.size()); } @@ -26,7 +32,7 @@ public class StorageBlockCraftingManager { return this.findMatchingRecipe(craftingInventory, world, this.recipes); } - private ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world, List list) { + private ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world, List list) { int i = 0; ItemStack itemstack = ItemStack.EMPTY; ItemStack itemstack1 = ItemStack.EMPTY; @@ -62,7 +68,7 @@ public class StorageBlockCraftingManager { return new ItemStack(itemstack.getItem(), 1, i1); } else { for (j = 0; j < list.size(); ++j) { - IRecipe irecipe = (IRecipe) list.get(j); + IRecipe irecipe = list.get(j); if (irecipe.matches(craftingInventory, world)) { return irecipe.getCraftingResult(craftingInventory); @@ -77,7 +83,7 @@ public class StorageBlockCraftingManager { return instance; } - private static boolean isResultStackReversible(ItemStack stack, int gridSize, World world, List list) { + private static boolean isResultStackReversible(ItemStack stack, int gridSize, World world, List list) { if (stack.isEmpty()) { return false; } @@ -107,7 +113,7 @@ public class StorageBlockCraftingManager { return !compressedStack.isEmpty() && CompressionRegistry.areItemStacksEqual(stack, compressedStack); } - private static ItemStack getRecipe(ItemStack stack, World world, int gridSize, List list) { + private static ItemStack getRecipe(ItemStack stack, World world, int gridSize, List list) { InventoryCrafting inventory = new InventoryCrafting(new Container() { public boolean canInteractWith(EntityPlayer player) { return false; @@ -120,19 +126,19 @@ public class StorageBlockCraftingManager { return StorageBlockCraftingManager.getInstance().findMatchingRecipe(inventory, world, list); } - private static boolean has22Recipe(ItemStack stack, World world, List list) { + private static boolean has22Recipe(ItemStack stack, World world, List list) { return !get22Recipe(stack, world, list).isEmpty(); } - private static ItemStack get22Recipe(ItemStack stack, World world, List list) { + private static ItemStack get22Recipe(ItemStack stack, World world, List list) { return getRecipe(stack, world, 2, list); } - private static boolean has33Recipe(ItemStack stack, World world, List list) { + private static boolean has33Recipe(ItemStack stack, World world, List list) { return !get33Recipe(stack, world, list).isEmpty(); } - private static ItemStack get33Recipe(ItemStack stack, World world, List list) { + private static ItemStack get33Recipe(ItemStack stack, World world, List list) { return getRecipe(stack, world, 3, list); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index d23ced18..1359167a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -17,8 +17,6 @@ public class ItemSigilCompression extends ItemSigilToggleableBase { @Override public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - if (true) - return; // TODO - Rewrite compression system if (PlayerHelper.isFakePlayer(player)) return; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 25d54dd2..688c588a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -85,6 +85,7 @@ public class ModRecipes addAlchemyTableRecipes(); addPotionRecipes(); addLivingArmourDowngradeRecipes(); + addCompressionHandlers(); } public static void initOreDict() @@ -140,11 +141,11 @@ public class ModRecipes { Stopwatch stopwatch = Stopwatch.createStarted(); StorageBlockCraftingManager.getInstance().addStorageBlockRecipes(); + CompressionRegistry.registerHandler(new BaseCompressionHandler(new ItemStack(Items.GLOWSTONE_DUST, 4, 0), new ItemStack(Blocks.GLOWSTONE), 64)); CompressionRegistry.registerHandler(new BaseCompressionHandler(new ItemStack(Items.SNOWBALL, 4, 0), new ItemStack(Blocks.SNOW), 8)); CompressionRegistry.registerHandler(new AdvancedCompressionHandler()); - CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.COBBLESTONE), 64); stopwatch.stop(); BMLog.DEBUG.info("Added compression recipes in {}", stopwatch); From 70cf5d2beae9694c26852b0a7226872e0c30fa38 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 26 Aug 2018 13:12:49 -0700 Subject: [PATCH 240/493] Low tier altars should not be able to fill high tier orbs --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 8df2775c..2f9b794f 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -197,8 +197,8 @@ public class BloodAltar implements IFluidHandler } } else if (input.getItem() instanceof IBloodOrb) { - this.isActive = true; - this.canBeFilled = true; + BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); + this.isActive = canBeFilled = orb != null && altarTier.ordinal() >= orb.getTier(); return; } } From 8e16e590eaac5b0ffb25b7a94c4956216b572339 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 26 Aug 2018 13:40:40 -0700 Subject: [PATCH 241/493] Sentient tools should use the proper material and have a repair material crystals are used to repair --- .../WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java | 2 ++ .../java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java | 2 +- .../WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java | 2 +- .../java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index caa7f823..78d38d5f 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -60,6 +60,8 @@ public class RegistrarBloodMagicRecipes OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); + + RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL.setRepairItem(EnumDemonWillType.DEFAULT.getStack()); } public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index 9f9bb426..7da46137 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -72,7 +72,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public final double baseAttackSpeed = -3; public ItemSentientAxe() { - super(Item.ToolMaterial.IRON); + super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL, 8.0F, 3.1F); setMaxDamage(getMaxDamage() * 2); // super(ModItems.soulToolMaterial); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index f939b4e3..511dc6a1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -72,7 +72,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public final double baseAttackSpeed = -2.8; public ItemSentientPickaxe() { - super(Item.ToolMaterial.IRON); + super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); setMaxDamage(getMaxDamage() * 2); // super(ModItems.soulToolMaterial); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 995f80ac..c784998a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -72,7 +72,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public final double baseAttackSpeed = -2.8; public ItemSentientShovel() { - super(Item.ToolMaterial.IRON); + super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); setMaxDamage(getMaxDamage() * 2); // super(ModItems.soulToolMaterial); From 6062b6866135ce9fdbeb2f82d8cadce146a85086 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 26 Aug 2018 13:49:02 -0700 Subject: [PATCH 242/493] Fixed placement of chunk ticket release due to scoping Added in missing ticket releases --- .../bloodmagic/ritual/portal/Teleports.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index 2fe03c47..43e738dc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.core.data.SoulNetwork; - import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.teleport.Teleport; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; @@ -47,7 +47,7 @@ public class Teleports { @Override public void teleport() { if (entity != null) { - BlockPos targetTeleposer = new BlockPos(x,y,z); + BlockPos targetTeleposer = new BlockPos(x, y, z); if (entity.timeUntilPortal <= 0) { entity.timeUntilPortal = 10; if (entity instanceof EntityPlayer) { @@ -89,7 +89,7 @@ public class Teleports { if (teleposer) MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer)); } - }else{ + } else { entity.timeUntilPortal = 10; } } @@ -125,10 +125,10 @@ public class Teleports { MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); WorldServer oldWorldServer = server.getWorld(entity.dimension); WorldServer newWorldServer = server.getWorld(newWorldID); - BlockPos targetTeleposer = new BlockPos(x,y,z); + BlockPos targetTeleposer = new BlockPos(x, y, z); ChunkPos teleposerChunk = new ChunkPos(targetTeleposer); ForgeChunkManager.Ticket chunkTicket = ForgeChunkManager.requestTicket("bloodmagic", newWorldServer, ForgeChunkManager.Type.NORMAL); - ForgeChunkManager.forceChunk(chunkTicket ,teleposerChunk); + ForgeChunkManager.forceChunk(chunkTicket, teleposerChunk); if (entity instanceof EntityPlayer) { EntityPlayerMP player = (EntityPlayerMP) entity; @@ -136,16 +136,18 @@ public class Teleports { if (!player.getEntityWorld().isRemote) { SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); - if (network.getCurrentEssence() < getTeleportCost()) + if (network.getCurrentEssence() < getTeleportCost()) { + ForgeChunkManager.releaseTicket(chunkTicket); return; + } - if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer))) - return; + if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer))) { + ForgeChunkManager.releaseTicket(chunkTicket); + return; + } network.syphon(ticket(oldWorld, player, getTeleportCost())); - - /* begin brandon3055 "BrandonsCore" intedimensional teleportation code */ PlayerList playerList = server.getPlayerList(); @@ -217,9 +219,9 @@ public class Teleports { } newWorldServer.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - }else{ - entity.timeUntilPortal = 10; ForgeChunkManager.releaseTicket(chunkTicket); + } else { + entity.timeUntilPortal = 10; } } } From 6d43e416e4cd5014a4f8501f60210fd96fa1da25 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 26 Aug 2018 14:05:25 -0700 Subject: [PATCH 243/493] *Now* sentient repairing is proper --- .../WayofTime/bloodmagic/item/soul/ItemSentientAxe.java | 6 ------ .../WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java | 6 ------ .../WayofTime/bloodmagic/item/soul/ItemSentientShovel.java | 6 ------ 3 files changed, 18 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index 7da46137..1f7404cc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -29,7 +29,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -90,11 +89,6 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } } - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); - } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index 511dc6a1..e8d45479 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -29,7 +29,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -90,11 +89,6 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } } - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() ? true : super.getIsRepairable(toRepair, repair); - } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index c784998a..c8b219b4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -29,7 +29,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -90,11 +89,6 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } } - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); - } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); From c5d3f8012c7a242f884c165258d8172fed34ea67 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 26 Aug 2018 14:05:41 -0700 Subject: [PATCH 244/493] Update changelog + version --- build.gradle | 2 +- changelog.txt | 30 ++++++++++++++++++++++++++++++ gradle.properties | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9947af35..9f71091d 100644 --- a/build.gradle +++ b/build.gradle @@ -171,7 +171,7 @@ curseforge { project { id = "${curse_id}" changelog = getChangelogText() - releaseType = 'alpha' + releaseType = 'beta' relations curseRelations diff --git a/changelog.txt b/changelog.txt index 3d8a9a5d..770a2682 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,33 @@ +------------------------------------------------------ +Version 2.3.2 +------------------------------------------------------ + +looky bois, we beta now + +- Fixed Sentient Sword attacking mobs and players without being provoked +- Fixed weird Crystal Clusters being weird + - They are now less weird +- Fixed Ritual Reader and Tinkerer not being in the creative tab +- Fixed an NPE that would happen with some blocks in the Ritual of Magnetism's area of effect +- Fixed Mimics not being able to replace blocks during placement +- Fixed issues with inter-dimensional teleportation + - Teleposers and Teleposition Sigils are now fully functional +- Fixed custom arrows not having their effects when fired from the Sentient Bow +- Fixed Splash Potions being unthrowable while Living Armor had the quenched downgrade +- Fixed Ritual Stones being considered Iron instead of Rock +- Fixed the Lava, Water, and Void sigils so they now work properly with tanks +- Fixed an issue where the Teleposer would attempt to damage an offline player +- Fixed the Compression Sigil so it now functions +- Fixed low tier altars being able to fill high tier orbs +- Fixed Sentient Tools having the wrong material +- Fixed Sentient Tools not having a repair material + - It is now demon crystals +- Added a config to disable mob drops from mobs killed by the Well of Suffering +- Added an additional glow to the Dagger of Sacrifice when it has a full incense bonus +- Reworked the Phantom Bridge +- Updated german translation +- Updated chinese translation + ------------------------------------------------------ Version 2.3.1 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index b97442cd..a138a96c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.3.1 +mod_version=2.3.2 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From 6ba4a02c4875547bc181690beb6acc8618c84fc7 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 26 Aug 2018 14:13:07 -0700 Subject: [PATCH 245/493] I love when Curse breaks their API so my buildscript fai;s --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9f71091d..0ad1ff65 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" - id 'com.matthewprenger.cursegradle' version '1.0.10' + id 'com.matthewprenger.cursegradle' version '1.1.0' id 'maven-publish' } From 39087ccf70bf651e0d62b526dcc1c65c993eff86 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 27 Aug 2018 21:30:03 -0700 Subject: [PATCH 246/493] Fix obo causing altars to not fill orbs of the same tier (#1423) --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 2f9b794f..f92049e7 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -198,7 +198,7 @@ public class BloodAltar implements IFluidHandler } else if (input.getItem() instanceof IBloodOrb) { BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); - this.isActive = canBeFilled = orb != null && altarTier.ordinal() >= orb.getTier(); + this.isActive = canBeFilled = orb != null && altarTier.toInt() >= orb.getTier(); return; } } From 2b587e84af9049a46e0fa311a66edb94d19ff090 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 28 Aug 2018 21:51:59 -0700 Subject: [PATCH 247/493] Update changelog + version --- changelog.txt | 6 ++++++ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 770a2682..5109324a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 2.3.3 +------------------------------------------------------ + +- Fixed Altars not filling orbs of their own tier + ------------------------------------------------------ Version 2.3.2 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index a138a96c..48dbcb74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.3.2 +mod_version=2.3.3 mc_version=1.12.2 forge_version=14.23.2.2611 curse_id=224791 From d54c828fba3c673a4401c470a93040f03e0eb2c1 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 3 Sep 2018 11:35:15 -0700 Subject: [PATCH 248/493] Fix Harvest Moon not working with Pumpkins (#1432) --- .../ritual/harvest/HarvestHandlerStem.java | 19 +++++++++++-------- .../ritual/harvest/HarvestRegistry.java | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 2e7bb2fd..7a0ef364 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -10,6 +10,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.Collection; import java.util.List; /** @@ -29,19 +30,21 @@ public class HarvestHandlerStem implements IHarvestHandler { @Override public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { - EnumFacing cropDir = state.getBlock().getActualState(state, world, pos).getValue(BlockStem.FACING); + EnumFacing cropDir = state.getActualState(world, pos).getValue(BlockStem.FACING); if (cropDir != EnumFacing.UP) { BlockPos cropPos = pos.offset(cropDir); IBlockState probableCrop = world.getBlockState(cropPos); - IBlockState registeredCrop = HarvestRegistry.getStemCrops().get(state); + Collection registeredCrops = HarvestRegistry.getStemCrops().get(state); - if (registeredCrop == probableCrop) { - NonNullList blockDrops = NonNullList.create(); - probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0); - drops.addAll(blockDrops); - world.destroyBlock(cropPos, false); - return true; + for (IBlockState registeredCrop : registeredCrops) { + if (registeredCrop == probableCrop) { + NonNullList blockDrops = NonNullList.create(); + probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0); + drops.addAll(blockDrops); + world.destroyBlock(cropPos, false); + return true; + } } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java index c5deba16..82c403e6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java @@ -14,7 +14,7 @@ public class HarvestRegistry { private static final List HARVEST_HANDLERS = Lists.newArrayList(); private static final Map STANDARD_CROPS = Maps.newHashMap(); private static final Set TALL_CROPS = Sets.newHashSet(); - private static final Map STEM_CROPS = Maps.newHashMap(); + private static final Multimap STEM_CROPS = ArrayListMultimap.create(); private static final Map AMPLIFIERS = Maps.newHashMap(); /** @@ -95,8 +95,8 @@ public class HarvestRegistry { return ImmutableSet.copyOf(TALL_CROPS); } - public static Map getStemCrops() { - return ImmutableMap.copyOf(STEM_CROPS); + public static Multimap getStemCrops() { + return ImmutableMultimap.copyOf(STEM_CROPS); } public static Map getAmplifiers() { From fd0326576475c137bc3f7ca73c2e3167aa1f8575 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 16 Sep 2018 11:13:25 -0700 Subject: [PATCH 249/493] Fix "how do i get tier 6" questions --- .../WayofTime/bloodmagic/altar/AltarTier.java | 51 ++++++++++--------- .../api/impl/BloodMagicCorePlugin.java | 4 +- .../block/enums/EnumDecorative.java | 5 +- .../bloodmagic/core/RegistrarBloodMagic.java | 8 +-- .../core/RegistrarBloodMagicRecipes.java | 4 +- .../ritual/types/RitualAltarBuilder.java | 4 +- 6 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index d940e6ab..105efae2 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -100,31 +100,32 @@ public enum AltarTier { } } }, - SIX() { - @Override - public void buildComponents(Consumer components) { - FIVE.getAltarComponents().forEach(components); - - for (int i = -4; i <= 2; i++) { - components.accept(new AltarComponent(new BlockPos(11, i, 11))); - components.accept(new AltarComponent(new BlockPos(-11, i, -11))); - components.accept(new AltarComponent(new BlockPos(11, i, -11))); - components.accept(new AltarComponent(new BlockPos(-11, i, 11))); - } - - components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); - - for (int i = -9; i <= 9; i++) { - components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }; +// SIX() { +// @Override +// public void buildComponents(Consumer components) { +// FIVE.getAltarComponents().forEach(components); +// +// for (int i = -4; i <= 2; i++) { +// components.accept(new AltarComponent(new BlockPos(11, i, 11))); +// components.accept(new AltarComponent(new BlockPos(-11, i, -11))); +// components.accept(new AltarComponent(new BlockPos(11, i, -11))); +// components.accept(new AltarComponent(new BlockPos(-11, i, 11))); +// } +// +// components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); +// components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); +// components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); +// components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); +// +// for (int i = -9; i <= 9; i++) { +// components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); +// components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); +// components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); +// components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); +// } +// } +// }, + ; public static final int MAXTIERS = values().length; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 3a0d0164..e8d2e44d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -76,8 +76,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), ComponentType.BLOODSTONE.name()); api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), ComponentType.BLOODSTONE.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); +// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); +// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (BloodRuneType runeType : BloodRuneType.values()) diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java index d9cdcdff..b0b31622 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java @@ -7,8 +7,9 @@ import java.util.Locale; public enum EnumDecorative implements IStringSerializable { BLOODSTONE_TILE, BLOODSTONE_BRICK, - CRYSTAL_TILE, - CRYSTAL_BRICK,; +// CRYSTAL_TILE, +// CRYSTAL_BRICK, + ; @Override public String toString() { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index c039399d..2b352d8b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -47,8 +47,8 @@ public class RegistrarBloodMagic public static final BloodOrb ORB_MASTER = ORB_DEF; @GameRegistry.ObjectHolder("archmage") public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; - @GameRegistry.ObjectHolder("transcendent") - public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; +// @GameRegistry.ObjectHolder("transcendent") +// public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; public static final Potion BOOST = MobEffects.HASTE; public static final Potion WHIRLWIND = MobEffects.HASTE; @@ -75,8 +75,8 @@ public class RegistrarBloodMagic new BloodOrb("apprentice", 2, 25000, 5).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"), new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), - new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), - new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") + new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage") +// new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 78d38d5f..fb416608 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -98,8 +98,8 @@ public class RegistrarBloodMagicRecipes registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); - registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); +// registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 1cf2f0ce..64242e37 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -28,7 +28,7 @@ import java.util.function.Consumer; @RitualRegister("altar_builder") public class RitualAltarBuilder extends Ritual { - private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); + private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator(); private boolean cycleDone = false; private AltarComponent currentComponent; @@ -52,7 +52,7 @@ public class RitualAltarBuilder extends Ritual { } if (cycleDone) { - altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); + altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator(); } if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) { From b59d5ce5b43892044b0d86c78ebf606473a1da0c Mon Sep 17 00:00:00 2001 From: TeamDman Date: Wed, 2 May 2018 00:20:49 -0400 Subject: [PATCH 250/493] fixed typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c945030e..a6ddd467 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ This mod requires "Minecraft Forge" in order to operate. It is incredibly easy t **Q**: Way, I've just had an amazing idea! Why not add an in-game book just like the Thaumonomicon? -**A**: This has been suggested several times. It I being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. +**A**: This has been suggested several times. It is being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. **Q**: Why do I not have a Sacrificial Orb? It's only showing up as a knife! From 259b631f7d3cd08825b07fcf1fdeae77235adc60 Mon Sep 17 00:00:00 2001 From: TeamDman Date: Wed, 5 Dec 2018 15:47:30 -0500 Subject: [PATCH 251/493] added unregisterAltarComponent method --- .../bloodmagic/api/IBloodMagicAPI.java | 20 +++++++++++++++++++ .../bloodmagic/api/impl/BloodMagicAPI.java | 16 +++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 11ce4bce..99ab8b7b 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -54,4 +54,24 @@ public interface IBloodMagicAPI { * @param componentType The type of Blood Altar component to register as. */ void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); + + /** + * Removes an {@link IBlockState} from the component mappings + *

+ * Valid component types: + *

+ * + * @param state The state to register + * @param componentType The type of Blood Altar component to unregister from. + */ + void unregisterAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); + + } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index a779da4b..528f99ab 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -60,6 +60,22 @@ public class BloodMagicAPI implements IBloodMagicAPI { } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); } + @Override + public void unregisterAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { + ComponentType component = null; + for (ComponentType type : ComponentType.VALUES) { + if (type.name().equalsIgnoreCase(componentType)) { + component = type; + break; + } + } + + if (component != null) { + BMLog.API_VERBOSE.info("Unregistered {} from being a {} altar component.", state, componentType); + altarComponents.remove(component, state); + } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); + } + @Nonnull public List getComponentStates(ComponentType component) { return (List) altarComponents.get(component); From 54a2b053d0c71a9f5532d13a30f8ec51a050512a Mon Sep 17 00:00:00 2001 From: TeamDman Date: Wed, 5 Dec 2018 16:25:58 -0500 Subject: [PATCH 252/493] Fix Binding::fromStack returning null on stacks with binding tags Added Binding::toString --- .../java/WayofTime/bloodmagic/core/data/Binding.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index e8182e9a..f288d6ae 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -57,9 +57,12 @@ public class Binding implements INBTSerializable { @Nullable public static Binding fromStack(ItemStack stack) { - if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. +// if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. +// return null; + if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags return null; + NBTBase bindingTag = stack.getTagCompound().getTag("binding"); if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. return null; @@ -68,4 +71,9 @@ public class Binding implements INBTSerializable { binding.deserializeNBT((NBTTagCompound) bindingTag); return binding; } + + @Override + public String toString() { + return "Binding{" + "uuid=" + uuid + ", name='" + name + '\'' + '}'; + } } From 6f8741694c6277b4ade332916e5bd8f61ecd69f0 Mon Sep 17 00:00:00 2001 From: TeamDman Date: Thu, 6 Dec 2018 18:57:24 -0500 Subject: [PATCH 253/493] Reenable tier 6 with config option Revert of fd0326576475c137bc3f7ca73c2e3167aa1f8575 --- .../WayofTime/bloodmagic/ConfigHandler.java | 3 ++ .../WayofTime/bloodmagic/altar/AltarTier.java | 54 +++++++++---------- .../api/impl/BloodMagicCorePlugin.java | 11 ++-- .../bloodmagic/block/BlockDecorative.java | 13 +++++ .../block/enums/EnumDecorative.java | 5 +- .../compat/jei/BloodMagicJEIPlugin.java | 30 ++++++++--- .../bloodmagic/core/RegistrarBloodMagic.java | 34 ++++++------ .../core/RegistrarBloodMagicRecipes.java | 15 +++--- .../bloodmagic/item/ItemInscriptionTool.java | 7 +-- 9 files changed, 102 insertions(+), 70 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 85b20776..3681b7af 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -42,6 +42,9 @@ public class ConfigHandler public boolean enableAPILogging = false; @Config.Comment({ "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) public boolean enableVerboseAPILogging = false; + @Config.Comment({ "Enables tier 6 related registrations. This is for pack makers."}) + @Config.RequiresMcRestart + public boolean enableTierSixEvenThoughThereIsNoContent = false; } public static class ConfigBlacklist diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index 105efae2..906c61e3 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.altar; +import WayofTime.bloodmagic.ConfigHandler; import com.google.common.collect.Lists; import net.minecraft.util.math.BlockPos; @@ -100,34 +101,33 @@ public enum AltarTier { } } }, -// SIX() { -// @Override -// public void buildComponents(Consumer components) { -// FIVE.getAltarComponents().forEach(components); -// -// for (int i = -4; i <= 2; i++) { -// components.accept(new AltarComponent(new BlockPos(11, i, 11))); -// components.accept(new AltarComponent(new BlockPos(-11, i, -11))); -// components.accept(new AltarComponent(new BlockPos(11, i, -11))); -// components.accept(new AltarComponent(new BlockPos(-11, i, 11))); -// } -// -// components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); -// components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); -// components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); -// components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); -// -// for (int i = -9; i <= 9; i++) { -// components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); -// components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); -// components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); -// components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); -// } -// } -// }, - ; + SIX() { + @Override + public void buildComponents(Consumer components) { + FIVE.getAltarComponents().forEach(components); - public static final int MAXTIERS = values().length; + for (int i = -4; i <= 2; i++) { + components.accept(new AltarComponent(new BlockPos(11, i, 11))); + components.accept(new AltarComponent(new BlockPos(-11, i, -11))); + components.accept(new AltarComponent(new BlockPos(11, i, -11))); + components.accept(new AltarComponent(new BlockPos(-11, i, 11))); + } + + components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); + + for (int i = -9; i <= 9; i++) { + components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); + } + } + }; + + public static final int MAXTIERS = ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent ? values().length : values().length-1; private List altarComponents; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index e8d2e44d..1725d095 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; @@ -17,9 +17,6 @@ import WayofTime.bloodmagic.incense.EnumTranquilityType; import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.EntityEntry; @@ -76,8 +73,10 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), ComponentType.BLOODSTONE.name()); api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), ComponentType.BLOODSTONE.name()); -// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); -// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); + if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); + } BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (BloodRuneType runeType : BloodRuneType.values()) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java index 281b4fb5..76ae3392 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java @@ -1,10 +1,14 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumDecorative; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class BlockDecorative extends BlockEnum { public BlockDecorative() { @@ -17,4 +21,13 @@ public class BlockDecorative extends BlockEnum { setSoundType(SoundType.STONE); setHarvestLevel("pickaxe", 2); } + + @Override + public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { + for (EnumDecorative type : EnumDecorative.values()){ + if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && (type == EnumDecorative.CRYSTAL_TILE || type == EnumDecorative.CRYSTAL_BRICK)) + continue; + subBlocks.add(new ItemStack(this, 1, type.ordinal())); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java index b0b31622..7bceae13 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java @@ -7,9 +7,8 @@ import java.util.Locale; public enum EnumDecorative implements IStringSerializable { BLOODSTONE_TILE, BLOODSTONE_BRICK, -// CRYSTAL_TILE, -// CRYSTAL_BRICK, - ; + CRYSTAL_TILE, + CRYSTAL_BRICK; @Override public String toString() { diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index 7f82a21a..d615e21d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -1,22 +1,17 @@ package WayofTime.bloodmagic.compat.jei; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; +import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeCategory; @@ -29,6 +24,14 @@ import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeJEI; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import mezz.jei.api.*; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; @@ -86,6 +89,17 @@ public class BloodMagicJEIPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING); registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); + + if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + for (ItemStack stack : new ItemStack[]{ +// OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), //unregistered elsewhere + new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal()), + new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal()), + new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal()) + }) { + jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(stack); + } + } } @Override diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 2b352d8b..613d8fcc 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,5 +1,15 @@ package WayofTime.bloodmagic.core; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.entity.mob.*; +import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.entity.projectile.EntityMeteor; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; +import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.potion.PotionBloodMagic; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; @@ -16,20 +26,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryBuilder; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; -import WayofTime.bloodmagic.entity.mob.EntityMimic; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.potion.PotionBloodMagic; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @@ -47,8 +43,8 @@ public class RegistrarBloodMagic public static final BloodOrb ORB_MASTER = ORB_DEF; @GameRegistry.ObjectHolder("archmage") public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; -// @GameRegistry.ObjectHolder("transcendent") -// public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; + @GameRegistry.ObjectHolder("transcendent") + public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; public static final Potion BOOST = MobEffects.HASTE; public static final Potion WHIRLWIND = MobEffects.HASTE; @@ -76,8 +72,12 @@ public class RegistrarBloodMagic new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage") -// new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); + if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + event.getRegistry().register( + new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") + ); + } } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index fb416608..cbb2c54a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -1,17 +1,18 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.altar.AltarTier; +import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.item.ItemSlate; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.PluginUtil; import com.google.common.collect.Sets; import net.minecraft.init.Blocks; @@ -98,8 +99,10 @@ public class RegistrarBloodMagicRecipes registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); -// registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); + if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); + } } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 67e87565..6f4bb703 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,11 +1,12 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -41,7 +42,7 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen return; for (EnumRuneType runeType : types) { - if (runeType == EnumRuneType.BLANK) + if (runeType == EnumRuneType.BLANK || !ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && runeType == EnumRuneType.DAWN) continue; ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); From b8f57eca32dfde47df3b5b66f29a3f741fec38af Mon Sep 17 00:00:00 2001 From: TeamDman Date: Fri, 7 Dec 2018 01:18:02 -0500 Subject: [PATCH 254/493] Fix javadoc typo --- src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 99ab8b7b..ba7258e4 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -68,7 +68,7 @@ public interface IBloodMagicAPI { *
  • NOTAIR
    • * * - * @param state The state to register + * @param state The state to unregister * @param componentType The type of Blood Altar component to unregister from. */ void unregisterAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); From 88e72ee0130dbcd44428a248133e190647a74512 Mon Sep 17 00:00:00 2001 From: TeamDman Date: Fri, 7 Dec 2018 01:19:54 -0500 Subject: [PATCH 255/493] Revert "fixed typo in readme" This reverts commit c6980fba --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6ddd467..c945030e 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ This mod requires "Minecraft Forge" in order to operate. It is incredibly easy t **Q**: Way, I've just had an amazing idea! Why not add an in-game book just like the Thaumonomicon? -**A**: This has been suggested several times. It is being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. +**A**: This has been suggested several times. It I being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. **Q**: Why do I not have a Sacrificial Orb? It's only showing up as a knife! From 002f23c53dfdedb9a5585671a13371925bba62c3 Mon Sep 17 00:00:00 2001 From: TeamDman Date: Fri, 7 Dec 2018 01:57:41 -0500 Subject: [PATCH 256/493] Changed LavaCrystal getBinding behaviour, cleaned up JEI hiding --- .../bloodmagic/compat/jei/BloodMagicJEIPlugin.java | 13 ++++--------- .../WayofTime/bloodmagic/core/data/Binding.java | 5 +---- .../WayofTime/bloodmagic/item/ItemLavaCrystal.java | 13 ++++++++++++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index d615e21d..dce7a1c2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -91,15 +91,10 @@ public class BloodMagicJEIPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { - for (ItemStack stack : new ItemStack[]{ -// OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), //unregistered elsewhere - new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal()), - new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal()), - new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal()) - }) { - jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(stack); - } - } + jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal())); + jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal())); + jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal())); + } } @Override diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index f288d6ae..3d7b8e2a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -57,12 +57,9 @@ public class Binding implements INBTSerializable { @Nullable public static Binding fromStack(ItemStack stack) { -// if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. -// return null; - if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags + if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. return null; - NBTBase bindingTag = stack.getTagCompound().getTag("binding"); if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. return null; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index ed4153a0..1b47e612 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -10,6 +10,9 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.potion.PotionEffect; import javax.annotation.Nonnull; @@ -59,7 +62,15 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide @Nullable @Override public Binding getBinding(ItemStack stack) { - return Binding.fromStack(stack); + if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags + return null; + + NBTBase bindingTag = stack.getTagCompound().getTag("binding"); + if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. + return null; + + NBTTagCompound nbt = (NBTTagCompound) bindingTag; + return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")),nbt.getString("name")); } @Override From 8b9764036a496a5e1730a0668f7519df0977a7d8 Mon Sep 17 00:00:00 2001 From: Bunsan Date: Tue, 11 Dec 2018 13:54:37 +1030 Subject: [PATCH 257/493] Fix for small demon stone brick recipe so that it outputs 4 blocks as expected. (#1486) --- .../demon_decor/demon_brick_2_smallbrick_corrosive.json | 3 ++- .../demon_decor/demon_brick_2_smallbrick_destructive.json | 3 ++- .../recipes/demon_decor/demon_brick_2_smallbrick_raw.json | 3 ++- .../demon_decor/demon_brick_2_smallbrick_steadfast.json | 3 ++- .../recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json index 11e92c0e..b67262f1 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json @@ -1,7 +1,8 @@ { "result": { "item": "bloodmagic:demon_brick_2", - "data": 1 + "data": 1, + "count": 4 }, "pattern": [ "ss", diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json index b3956493..aff6baa3 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json @@ -1,7 +1,8 @@ { "result": { "item": "bloodmagic:demon_brick_2", - "data": 2 + "data": 2, + "count": 4 }, "pattern": [ "ss", diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json index 7137a604..951faf2e 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json @@ -1,7 +1,8 @@ { "result": { "item": "bloodmagic:demon_brick_2", - "data": 0 + "data": 0, + "count": 4 }, "pattern": [ "ss", diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json index 24142cf4..3d1cc8d7 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json @@ -1,7 +1,8 @@ { "result": { "item": "bloodmagic:demon_brick_2", - "data": 4 + "data": 4, + "count": 4 }, "pattern": [ "ss", diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json index 6a889c25..405fe6f5 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json @@ -1,7 +1,8 @@ { "result": { "item": "bloodmagic:demon_brick_2", - "data": 3 + "data": 3, + "count": 4 }, "pattern": [ "ss", From 7435d498245840f9a72ade48c30d23879489b35a Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 31 Dec 2018 01:11:54 +0100 Subject: [PATCH 258/493] Refactored Cry of Eternal Soul for BM2. (#1488) * Refactored Cry of Eternal Soul for BM2. * Added entries for the english translation strings * Ticket handling fix * Using more comprehensive `addOffsetRunes` instead of `addRune`'s * Update src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java Co-Authored-By: Iorce * Update src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java Co-Authored-By: Iorce * Cleanup round 1 * cleanup round 2 --- .../ritual/types/RitualEternalSoul.java | 124 ++++++++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 4 + 2 files changed, 128 insertions(+) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java new file mode 100644 index 00000000..01ff6e08 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java @@ -0,0 +1,124 @@ +package WayofTime.bloodmagic.ritual.types; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.block.BlockLifeEssence; +import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; + +import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; + +@RitualRegister("eternal_soul") +public class RitualEternalSoul extends Ritual { + + + private IBloodAltar altar = null; + + public RitualEternalSoul() { + super("ritualEternalSoul", 2, 2000000, "ritual." + BloodMagic.MODID + ".eternalSoulRitual"); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) { + UUID owner = masterRitualStone.getOwner(); + int currentEssence = NetworkHelper.getSoulNetwork(owner).getCurrentEssence(); + World world = masterRitualStone.getWorldObj(); + BlockPos pos = masterRitualStone.getBlockPos(); + + if (this.altar == null) { + for (int i = -5; i <= 5; i++) { + for (int j = -5; j <= 5; j++) { + for (int k = -10; k <= 10; k++) { + if (world.getTileEntity(new BlockPos(pos.getX() + i, pos.getY() + j, pos.getZ() + k)) instanceof IBloodAltar) { + this.altar = (IBloodAltar) world.getTileEntity(new BlockPos(pos.getX() + i, pos.getY() + j, pos.getZ() + k)); + } + } + } + } + } + if (!(this.altar instanceof IFluidHandler)) + return; + + int horizontalRange = 15; + int verticalRange = 20; + + List list = world.getEntitiesWithinAABB(EntityPlayer.class, + new AxisAlignedBB(pos.getX() - 0.5f, pos.getY() - 0.5f, pos.getZ() - 0.5f, + pos.getX() + 0.5f, pos.getY() + 0.5f, pos.getZ() + 0.5f) + .expand(horizontalRange, verticalRange, horizontalRange)); + + EntityPlayer entityOwner = null; + for (EntityPlayer player : list) { + if (PlayerHelper.getUUIDFromPlayer(player) == owner) + entityOwner = player; + } + + int fillAmount = Math.min(currentEssence / 2, ((IFluidHandler) this.altar).fill(new FluidStack(BlockLifeEssence.getLifeEssence(), 10000), false)); + + ((IFluidHandler) this.altar).fill(new FluidStack(BlockLifeEssence.getLifeEssence(), fillAmount), true); + + if (entityOwner != null && entityOwner.getHealth() > 2.0f && fillAmount != 0) + entityOwner.setHealth(2.0f); + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(fillAmount * 2)); + + } + + + @Override + public int getRefreshCost() { + return 0; + } + + @Override + public int getRefreshTime() { + return 1; + } + + @Override + public void gatherComponents(Consumer components) { + addCornerRunes(components, 0, 1, EnumRuneType.FIRE); + + for (int i = 0; i < 4; i++) { + addCornerRunes(components, 2, i, EnumRuneType.AIR); + } + + addCornerRunes(components, 4, 1, EnumRuneType.EARTH); + + addOffsetRunes(components, 3, 4, 1, EnumRuneType.EARTH); + + + for (int i = 0; i < 2; i++) { + addCornerRunes(components, 4, i + 2, EnumRuneType.WATER); + } + + addCornerRunes(components, 4, 4, EnumRuneType.DUSK); + + addOffsetRunes(components, 6, 5, 0, EnumRuneType.FIRE); + + + for (int i = 0; i < 2; i++) { + addCornerRunes(components, 6, i, EnumRuneType.FIRE); + } + + for (int i = 0; i < 3; i++) { + addCornerRunes(components, 6, i + 2, EnumRuneType.BLANK); + } + + addCornerRunes(components, 6, 5, EnumRuneType.DUSK); + } + + @Override + public Ritual getNewCopy() { + return new RitualEternalSoul(); + } +} diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 4e51e06b..a1a159b0 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -618,6 +618,7 @@ ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar ritual.bloodmagic.portalRitual=The Gate of the Fold ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crystal +ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. @@ -748,6 +749,9 @@ ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Unlike my comrades, I of ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Although your wounds may heal, they will do so slowly if you accept my "offering," and the stings of battle will plague you even more. ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=So think carefully before you rush into something that you may regret, since even though your cup may be empty it will be almost impossible to fill once more... + +ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. + # Chat chat.bloodmagic.altarMaker.setTier=Set Tier to: %d chat.bloodmagic.altarMaker.building=Building a Tier %d Altar From 03d087595f1c60cc556cd68a049e332a2ccef813 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 31 Dec 2018 01:13:13 +0100 Subject: [PATCH 259/493] Reverence of the Condor port (#1490) * Ported Reverence of the Condor from 1.7.10. * Ported Reverence of the Condor from 1.7.10. * Removed my shame --- .../bloodmagic/ritual/types/RitualCondor.java | 89 +++++++++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 2 + 2 files changed, 91 insertions(+) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java new file mode 100644 index 00000000..bc4232c0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java @@ -0,0 +1,89 @@ +package WayofTime.bloodmagic.ritual.types; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.ritual.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.List; +import java.util.function.Consumer; + +@RitualRegister("condor") +public class RitualCondor extends Ritual { + public static final String FLIGHT_RANGE = "flightRange"; + + public RitualCondor() { + super("ritualCondor", 0, 1000000, "ritual." + BloodMagic.MODID + ".condorRitual"); + addBlockRange(FLIGHT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), new BlockPos(10, 30, 10))); + setMaximumVolumeAndDistanceOfRange(FLIGHT_RANGE, 0, 100, 200); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) { + AxisAlignedBB aabb = getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()).expand(-10, 0, -10); + World world = masterRitualStone.getWorldObj(); + + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + List entityPlayers = world.getEntitiesWithinAABB(EntityPlayer.class, aabb); + int entityCount = entityPlayers.size(); + + if (currentEssence < getRefreshCost() * entityCount) { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } else { + entityCount = 0; + for (EntityPlayer player : entityPlayers) { + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FLIGHT, 20, 0)); + } + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * entityCount)); + } + + @Override + public int getRefreshTime() { + return 10; + } + + @Override + public int getRefreshCost() { + return getBlockRange(FLIGHT_RANGE).getVolume() / 10000; // cost of 2 LP per second per player with default configuration + } + + @Override + public void gatherComponents(Consumer components) { + + addParallelRunes(components, 1, 0, EnumRuneType.DUSK); + addCornerRunes(components, 2, 0, EnumRuneType.AIR); + addOffsetRunes(components, 1, 3, 0, EnumRuneType.EARTH); + addParallelRunes(components, 3, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 3, 4, 0, EnumRuneType.WATER); + addParallelRunes(components, 1, 1, EnumRuneType.FIRE); + addParallelRunes(components, 2, 1, EnumRuneType.BLANK); + addParallelRunes(components, 4, 1, EnumRuneType.BLANK); + addParallelRunes(components, 5, 1, EnumRuneType.AIR); + addParallelRunes(components, 5, 0, EnumRuneType.DUSK); + + for (int i = 2; i <= 4; i++) { + addParallelRunes(components, i, 2, EnumRuneType.EARTH); + } + + addOffsetRunes(components, 2, 1, 4, EnumRuneType.FIRE); + addCornerRunes(components, 2, 4, EnumRuneType.AIR); + addCornerRunes(components, 4, 2, EnumRuneType.FIRE); + + for (int i = -1; i <= 1; i++) { + addOffsetRunes(components, 3, i, 4, EnumRuneType.EARTH); + } + } + + @Override + public Ritual getNewCopy() { + return new RitualCondor(); + } +} diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index a1a159b0..03702e15 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -618,6 +618,7 @@ ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar ritual.bloodmagic.portalRitual=The Gate of the Fold ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crystal +ritual.bloodmagic.condorRitual=Reverence of the Condor ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. @@ -749,6 +750,7 @@ ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Unlike my comrades, I of ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Although your wounds may heal, they will do so slowly if you accept my "offering," and the stings of battle will plague you even more. ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=So think carefully before you rush into something that you may regret, since even though your cup may be empty it will be almost impossible to fill once more... +ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. From 6b1e9f401453dd78c0ece5432c9f7f754e025f00 Mon Sep 17 00:00:00 2001 From: iPopstop <26607111+iPopstop@users.noreply.github.com> Date: Mon, 31 Dec 2018 03:13:46 +0300 Subject: [PATCH 260/493] Update ru_RU.lang (#1473) * Update ru_RU.lang Minor grammar fixes * Update ru_RU.lang * Update Added: - alchemic_vial - baseComponent.catalyst_length_1 - baseComponent.catalyst_power_1 - bloodmagic.extraInfo (tooltip) - commands.bloodmagic.error.* Fixed: - bloodmagic.blood_shard - baseComponent.sulfur - bloodmagic.monster_soul.raw - bloodmagic.path.woodtile - bloodmagic.path.stonetile - bloodmagic.path.wornstonetile - bloodmagic.path.obsidiantile Updated: - bloodmagic.sanguineBook --- .../assets/bloodmagic/lang/ru_RU.lang | 322 +++++++++++++----- 1 file changed, 245 insertions(+), 77 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang index db0f46b8..0a76a026 100644 --- a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang +++ b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang @@ -3,17 +3,17 @@ itemGroup.bloodmagic.creativeTab=Blood Magic itemGroup.bloodmagic.creativeTabTome=Blood Magic Upgrade Tomes #Items -item.bloodmagic.activationCrystal.weak.name=Слабый криÑтал активации -item.bloodmagic.activationCrystal.awakened.name=Пробуждённый криÑтал активации -item.bloodmagic.activationCrystal.creative.name=ТворчеÑкий криÑтал активации +item.bloodmagic.activation_crystal.weak.name=Слабый криÑталл активации +item.bloodmagic.activation_crystal.awakened.name=Пробуждённый криÑталл активации +item.bloodmagic.activation_crystal.creative.name=ТворчеÑкий криÑталл активации -item.bloodmagic.sacrificialDagger.normal.name=Жертвенный кинжал -item.bloodmagic.sacrificialDagger.creative.name=ТворчеÑкий жертвенный кинжал +item.bloodmagic.sacrificial_dagger.normal.name=Жертвенный кинжал +item.bloodmagic.sacrificial_dagger.creative.name=ТворчеÑкий жертвенный кинжал item.bloodmagic.pack.selfSacrifice.name=Blood Letter's Pack item.bloodmagic.pack.sacrifice.name=Coat of Arms item.bloodmagic.daggerOfSacrifice.name=Кинжал Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ -item.bloodmagic.lavaCrystal.name=Лавовый криÑтал +item.bloodmagic.lavaCrystal.name=Лавовый криÑталл item.bloodmagic.bound.sword.name=СвÑзанный клинок item.bloodmagic.bound.pickaxe.name=СвÑÐ·Ð°Ð½Ð½Ð°Ñ ÐºÐ¸Ñ€ÐºÐ° @@ -63,50 +63,81 @@ item.bloodmagic.reagent.virtus.name=Virtus item.bloodmagic.reagent.reductus.name=Reductus item.bloodmagic.reagent.potentia.name=Potentia -item.bloodmagic.bloodShard.weak.name=Слабый кровавый оÑколок -item.bloodmagic.bloodShard.demon.name=ДемоничеÑкий кровавый оÑколок +item.bloodmagic.blood_shard.weak.name=Слабый кровавый оÑколок +item.bloodmagic.blood_shard.demonic.name=ДемоничеÑкий кровавый оÑколок -item.bloodmagic.baseComponent.reagentWater.name=Реагент воды -item.bloodmagic.baseComponent.reagentLava.name=Реагент лавы -item.bloodmagic.baseComponent.reagentAir.name=Реагент воздуха -item.bloodmagic.baseComponent.reagentFastMiner.name=Реагент добычи -item.bloodmagic.baseComponent.reagentVoid.name=Реагент пуÑтоты -item.bloodmagic.baseComponent.reagentGrowth.name=Реагент роÑта -item.bloodmagic.baseComponent.reagentAffinity.name=Реагент Ñтихийного родÑтва -item.bloodmagic.baseComponent.reagentSight.name=Реагент взглÑда -item.bloodmagic.baseComponent.reagentBinding.name=Реагент ÑвÑзи -item.bloodmagic.baseComponent.reagentSuppression.name=Реагент Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -item.bloodmagic.baseComponent.frameParts.name=ЧаÑти каркаÑа -item.bloodmagic.baseComponent.reagentBloodLight.name=Реагент Ñвета -item.bloodmagic.baseComponent.reagentMagnetism.name=Реагент притÑÐ¶ÐµÐ½Ð¸Ñ -item.bloodmagic.baseComponent.reagentHaste.name=Реагент ÑкороÑти -item.bloodmagic.baseComponent.reagentBridge.name=Реагент моÑта -item.bloodmagic.baseComponent.reagentCompression.name=Реагент ÑÐ¶Ð°Ñ‚Ð¸Ñ -item.bloodmagic.baseComponent.reagentSeverance.name=Реагент Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ +item.bloodmagic.baseComponent.reagent_water.name=Реагент воды +item.bloodmagic.baseComponent.reagent_lava.name=Реагент лавы +item.bloodmagic.baseComponent.reagent_air.name=Реагент воздуха +item.bloodmagic.baseComponent.reagent_fast_miner.name=Реагент добычи +item.bloodmagic.baseComponent.reagent_void.name=Реагент пуÑтоты +item.bloodmagic.baseComponent.reagent_growth.name=Реагент роÑта +item.bloodmagic.baseComponent.reagent_affinity.name=Реагент Ñтихийного родÑтва +item.bloodmagic.baseComponent.reagent_sight.name=Реагент взглÑда +item.bloodmagic.baseComponent.reagent_binding.name=Реагент ÑвÑзи +item.bloodmagic.baseComponent.reagent_suppression.name=Реагент Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ +item.bloodmagic.baseComponent.reagent_blood_light.name=Реагент Ñвета +item.bloodmagic.baseComponent.reagent_magnetism.name=Реагент притÑÐ¶ÐµÐ½Ð¸Ñ +item.bloodmagic.baseComponent.reagent_haste.name=Реагент ÑкороÑти +item.bloodmagic.baseComponent.reagent_bridge.name=Реагент моÑта +item.bloodmagic.baseComponent.reagent_compression.name=Реагент ÑÐ¶Ð°Ñ‚Ð¸Ñ +item.bloodmagic.baseComponent.reagent_severance.name=Реагент разрыва +item.bloodmagic.baseComponent.reagent_holding.name=Реагент ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ +item.bloodmagic.baseComponent.reagent_claw.name=Реагент крюка +item.bloodmagic.baseComponent.reagent_bounce.name=Реагент ÑлаÑтичноÑти +item.bloodmagic.baseComponent.reagent_frost.name=Реагент заморозки +item.bloodmagic.baseComponent.reagent_teleposition.name=Реагент телепозиции +item.bloodmagic.baseComponent.reagent_transposition.name=Реагент транÑпозиции -item.bloodmagic.baseComponent.reagentTeleposition.name=Реагент телепозиции -item.bloodmagic.baseComponent.reagentTransposition.name=Реагент транÑпозиции +item.bloodmagic.baseComponent.frame_part.name=ЧаÑти каркаÑа +item.bloodmagic.baseComponent.sand_iron.name=Железный пеÑок +item.bloodmagic.baseComponent.sand_gold.name=Золотой пеÑок +item.bloodmagic.baseComponent.sand_coal.name=Угольный пеÑок +item.bloodmagic.baseComponent.plant_oil.name=РаÑтительное маÑло +item.bloodmagic.baseComponent.sulfur.name=Сера +item.bloodmagic.baseComponent.saltpeter.name=Селитра +item.bloodmagic.baseComponent.neuro_toxin.name=ÐейротокÑин +item.bloodmagic.baseComponent.antiseptic.name=ÐнтиÑептик +item.bloodmagic.baseComponent.catalyst_length_1.name=Слабый удлинÑющий катализатор +item.bloodmagic.baseComponent.catalyst_power_1.name=Слабый уÑиливающий катализатор -item.bloodmagic.monsterSoul.base.name=ДемоничеÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ +item.bloodmagic.cutting_fluid.basic.name=Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ñ€ÐµÐ¶ÑƒÑ‰Ð°Ñ Ð¶Ð¸Ð´ÐºÐ¾ÑÑ‚ÑŒ +item.bloodmagic.cutting_fluid.explosive.name=Взрывчатый порошок + +item.bloodmagic.demonCrystal.default.name=КриÑталл демоничеÑкой Ñнергии +item.bloodmagic.demonCrystal.corrosive.name=КриÑталл коррозионной Ñнергии +item.bloodmagic.demonCrystal.destructive.name=КриÑталл разрушающей Ñнергии +item.bloodmagic.demonCrystal.vengeful.name=КриÑталл мÑтительной Ñнергии +item.bloodmagic.demonCrystal.steadfast.name=КриÑталл уÑтойчивой Ñнергии + +item.bloodmagic.monster_soul.raw.name=ДемоничеÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ +item.bloodmagic.monster_soul.corrosive.name=ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¾Ð½Ð½Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ +item.bloodmagic.monster_soul.destructive.name=Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ +item.bloodmagic.monster_soul.vengeful.name=ÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ +item.bloodmagic.monster_soul.steadfast.name=УÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ item.bloodmagic.sigil.air.name=Сигил воздуха -item.bloodmagic.sigil.bloodLight.name=Сигил кровавого Ñветильника +item.bloodmagic.sigil.blood_light.name=Сигил кровавого Ñветильника item.bloodmagic.sigil.compression.name=Сигил ÑÐ¶Ð°Ñ‚Ð¸Ñ item.bloodmagic.sigil.divination.name=Сигил предÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ item.bloodmagic.sigil.water.name=Сигил воды item.bloodmagic.sigil.lava.name=Сигил лавы item.bloodmagic.sigil.void.name=Сигил пуÑтоты -item.bloodmagic.sigil.greenGrove.name=Сигил зеленой рощи -item.bloodmagic.sigil.elementalAffinity.name=Сигил Ñтихийного родÑтва +item.bloodmagic.sigil.green_grove.name=Сигил зеленой рощи +item.bloodmagic.sigil.elemental_affinity.name=Сигил Ñтихийного родÑтва item.bloodmagic.sigil.haste.name=Сигил ÑкороÑти item.bloodmagic.sigil.suppression.name=Сигил Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ item.bloodmagic.sigil.magnetism.name=Сигил притÑÐ¶ÐµÐ½Ð¸Ñ -item.bloodmagic.sigil.fastMiner.name=Сигил быÑтрого ÐºÐ¾Ð¿Ð°Ñ‚ÐµÐ»Ñ +item.bloodmagic.sigil.fast_miner.name=Сигил быÑтрого ÐºÐ¾Ð¿Ð°Ñ‚ÐµÐ»Ñ item.bloodmagic.sigil.seer.name=Сигил Ð·Ñ€ÐµÐ½Ð¸Ñ -item.bloodmagic.sigil.phantomBridge.name=Сигил призрачного моÑта +item.bloodmagic.sigil.phantom_bridge.name=Сигил призрачного моÑта item.bloodmagic.sigil.whirlwind.name=Сигил Ð²Ð¸Ñ…Ñ€Ñ -item.bloodmagic.sigil.enderSeverance.name=Сигил разрыва ÐšÑ€Ð°Ñ - +item.bloodmagic.sigil.ender_severance.name=Сигил разрыва ÐšÑ€Ð°Ñ +item.bloodmagic.sigil.holding.name=Сигил ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ +item.bloodmagic.sigil.holding.display=&r%s: &o&n%s +item.bloodmagic.sigil.claw.name=Сигил ÐºÐ¾Ð³Ñ‚Ñ +item.bloodmagic.sigil.bounce.name=Сигил ÑлаÑтичноÑти +item.bloodmagic.sigil.frost.name=Сигил зимнего Ð´Ñ‹Ñ…Ð°Ð½Ð¸Ñ item.bloodmagic.sigil.teleposition.name=Сигил телепозиции item.bloodmagic.sigil.transposition.name=Сигил транÑпозиции @@ -119,18 +150,20 @@ item.bloodmagic.sentientArmour.chest.name=Ð Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ ÐºÐ¸Ñ€Ð°Ñа item.bloodmagic.sentientArmour.legs.name=Разумные поножи item.bloodmagic.sentientArmour.boots.name=Разумные ботинки -item.bloodmagic.altarMaker.name=Altar Maker +item.bloodmagic.altarMaker.name=Создатель Ð°Ð»Ñ‚Ð°Ñ€Ñ +item.bloodmagic.alchemic_vial.base.name=ÐлхимичеÑÐºÐ°Ñ Ð¿Ñ€Ð¾Ð±Ð¸Ñ€ÐºÐ° item.bloodmagic.ritualDivinernormal.name=ПредÑказатель ритуала item.bloodmagic.ritualDivinerdusk.name=ПредÑказатель ритуала [Сумерки] item.bloodmagic.ritualDivinerdawn.name=ПредÑказатель ритуала [РаÑÑвет] +item.bloodmagic.ritualReader.name=Редактор ритуала item.bloodmagic.arcaneAshes.name=Волшебный пепел item.bloodmagic.upgradeTome.name=Living Armour Upgrade Tome item.bloodmagic.upgradeTrainer.name=Living Armour Training Bracelet item.bloodmagic.sentientSword.name=Разумный меч -item.bloodmagic.soulGem.petty.name=Мелкий адÑкий камень +item.bloodmagic.soulGem.petty.name=Маленький адÑкий камень item.bloodmagic.soulGem.lesser.name=Ðебольшой адÑкий камень item.bloodmagic.soulGem.common.name=Обычный адÑкий камень item.bloodmagic.soulGem.greater.name=Большой адÑкий камень @@ -138,18 +171,33 @@ item.bloodmagic.soulGem.grand.name=Великий адÑкий камень item.bloodmagic.soulSnare.base.name=ПроÑÑ‚Ð°Ñ Ð»Ð¾Ð²ÑƒÑˆÐºÐ° item.bloodmagic.sentientBow.name=Разумный лук item.bloodmagic.sentientArmourGem.name=Разумный камень +item.bloodmagic.sentientAxe.name=Разумный топор +item.bloodmagic.sentientPickaxe.name=Ð Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ ÐºÐ¸Ñ€ÐºÐ° +item.bloodmagic.sentientShovel.name=Ð Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ Ð»Ð¾Ð¿Ð°Ñ‚Ð° item.bloodmagic.nodeRouter.name=Node Router item.bloodmagic.itemFilter.exact.name=Точный фильтр предметов item.bloodmagic.itemFilter.ignoreNBT.name=NBT фильтр предметов item.bloodmagic.itemFilter.modItems.name=Mod фильтр предметов item.bloodmagic.itemFilter.oreDict.name=OreDict фильтр предметов +item.bloodmagic.fluidFilter.exact.name=Фильтр жидкоÑтей + +item.bloodmagic.experienceTome.name=Том иÑÑледований +item.bloodmagic.sanguineBook.name=ИнÑпектор блоков + +item.bloodmagic.living_point_upgrade.draft_angelus.name=Призыв Ðнгела + +item.bloodmagic.willGauge.name=Измеритель ауры демоничеÑкой Ñнергии +item.bloodmagic.potionFlask.name=ФлÑжка Ð´Ð»Ñ Ð·ÐµÐ»Ð¸Ð¹ + +item.bloodmagic.icarusScroll.name=Свиток ИкаруÑа # Blocks tile.bloodmagic.fluid.lifeEssence.name=Ð–Ð¸Ð·Ð½ÐµÐ½Ð½Ð°Ñ ÑÑÑÐµÐ½Ñ†Ð¸Ñ tile.bloodmagic.stone.ritual.master.name=Главный ритуальный камень tile.bloodmagic.stone.ritual.imperfect.name=Ðеполноценный ритуальный камень +tile.bloodmagic.stone.ritual.inverted.name=Инвертированный ритуальный камень tile.bloodmagic.altar.name=Кровавый алтарь tile.bloodmagic.alchemyArray.name=&r&fÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° @@ -158,15 +206,14 @@ tile.bloodmagic.rune.blank.name=ЧиÑÑ‚Ð°Ñ Ñ€ÑƒÐ½Ð° tile.bloodmagic.rune.speed.name=Руна ÑкороÑти tile.bloodmagic.rune.efficiency.name=Руна ÑффективноÑти tile.bloodmagic.rune.sacrifice.name=Руна Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ -tile.bloodmagic.rune.selfSacrifice.name=Руна ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ +tile.bloodmagic.rune.self_sacrifice.name=Руна ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ tile.bloodmagic.rune.displacement.name=Руна Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ tile.bloodmagic.rune.capacity.name=Руна ёмкоÑти -tile.bloodmagic.rune.augCapacity.name=Руна дополнительной ёмкоÑти +tile.bloodmagic.rune.augmented_capacity.name=Руна дополнительной ёмкоÑти tile.bloodmagic.rune.orb.name=Руна шара tile.bloodmagic.rune.acceleration.name=Руна уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ tile.bloodmagic.rune.charging.name=Руна зарÑда - tile.bloodmagic.ritualStone.blank.name=Ритуальный камень tile.bloodmagic.ritualStone.water.name=Ритуальный камень воды tile.bloodmagic.ritualStone.fire.name=Ритуальный камень Ð¾Ð³Ð½Ñ @@ -175,10 +222,10 @@ tile.bloodmagic.ritualStone.air.name=Ритуальный камень возд tile.bloodmagic.ritualStone.dusk.name=Ритуальный камень Ñумерек tile.bloodmagic.ritualStone.dawn.name=Ритуальный камень раÑÑвета -tile.bloodmagic.bloodstonebrick.large.name=Большой кровавый кирпич -tile.bloodmagic.bloodstonebrick.brick.name=Кровавый кирпич -tile.bloodmagic.crystal.large.name=Большой криÑтальный кирпич -tile.bloodmagic.crystal.brick.name=КриÑтальный кирпич +tile.bloodmagic.bloodstone_tile.name=Большой кровавый кирпич +tile.bloodmagic.bloodstone_brick.name=Кровавый кирпич +tile.bloodmagic.crystal_tile.name=Большой криÑтальный кирпич +tile.bloodmagic.crystal_brick.name=КриÑтальный кирпич tile.bloodmagic.bloodLight.name=Кровавый Ñвет tile.bloodmagic.spectralBlock.name=Иллюзорный блок tile.bloodmagic.phantom.name=Призрачный блок @@ -186,7 +233,10 @@ tile.bloodmagic.incenseAltar.name=Жертвенник Ð´Ð»Ñ ÐºÑƒÑ€ÐµÐ½Ð¸Ð¹ tile.bloodmagic.teleposer.name=Телепозер tile.bloodmagic.soulForge.name=ÐдÑÐºÐ°Ñ ÐºÑƒÐ·Ð½Ð¸Ñ†Ð° +tile.bloodmagic.alchemyTable.name=Стол алхимии tile.bloodmagic.demonCrucible.name=ДемоничеÑкий тигель +tile.bloodmagic.demonPylon.name=ДемоничеÑкий пилон +tile.bloodmagic.demonCrystallizer.name=ДемоничеÑкий криÑталлизатор tile.bloodmagic.masterRouting.name=Master Routing Node tile.bloodmagic.outputRouting.name=Output Routing Node @@ -194,29 +244,54 @@ tile.bloodmagic.inputRouting.name=Input Routing Node tile.bloodmagic.itemRouting.name=Routing Node tile.bloodmagic.path.wood.name=ДеревÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.woodTile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ Ð´ÐµÑ€ÐµÐ²ÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° +tile.bloodmagic.path.woodtile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ Ð´ÐµÑ€ÐµÐ²ÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° tile.bloodmagic.path.stone.name=ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.stoneTile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° +tile.bloodmagic.path.stonetile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° tile.bloodmagic.path.wornstone.name=Ð¡Ñ‚Ð°Ñ€Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.wornstoneTile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ ÑÑ‚Ð°Ñ€Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° +tile.bloodmagic.path.wornstonetile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ ÑÑ‚Ð°Ñ€Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° tile.bloodmagic.path.obsidian.name=ОбÑÐ¸Ð´Ð¸Ð°Ð½Ð¾Ð²Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.obsidianTile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ Ð¾Ð±ÑÐ¸Ð´Ð¸Ð°Ð½Ð¾Ð²Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° +tile.bloodmagic.path.obsidiantile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ Ð¾Ð±ÑÐ¸Ð´Ð¸Ð°Ð½Ð¾Ð²Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° tile.bloodmagic.dimensionalPortal.name=ПроÑтранÑтвенный портал tile.bloodmagic.bloodTank.name=Резервуар крови +tile.bloodmagic.demonCrystal.default.name=КриÑтальный клаÑтер демоничеÑкой Ñнергии +tile.bloodmagic.demonCrystal.corrosive.name=КриÑтальный клаÑтер коррозионной Ñнергии +tile.bloodmagic.demonCrystal.destructive.name=КриÑтальный клаÑтер разрушительной Ñнергии +tile.bloodmagic.demonCrystal.vengeful.name=КриÑтальный клаÑтер мÑтительной Ñнергии +tile.bloodmagic.demonCrystal.steadfast.name=КриÑтальный клаÑтер уÑтойчивой Ñнергии + +tile.bloodmagic.mimic.nohitbox.name=Эфирный непрозрачный поддельный блок +tile.bloodmagic.mimic.solidopaque.name=Ðепрозрачный поддельный блок +tile.bloodmagic.mimic.solidclear.name=ЧиÑтый поддельный блок +tile.bloodmagic.mimic.solidlight.name=СветÑщийÑÑ Ð¿Ð¾Ð´Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ блок +tile.bloodmagic.mimic.sentient.name=Разумный поддельный блок + +tile.bloodmagic.bricks1.brick1_raw.name=Сырые каменные кирпичи +tile.bloodmagic.bricks1.brick1_corrosive.name=Коррозионные каменные кирпичи +tile.bloodmagic.bricks1.brick1_destructive.name=Разрушительные каменные кирпичи +tile.bloodmagic.bricks1.brick1_vengeful.name=ÐœÑтительные каменные кирпичи +tile.bloodmagic.bricks1.brick1_steadfast.name=УÑтойчивые каменные кирпичи + +# Fluids +fluid.lifeEssence=Ð–Ð¸Ð·Ð½ÐµÐ½Ð½Ð°Ñ ÑÑÑÐµÐ½Ñ†Ð¸Ñ + +# HUD +hud.bloodmagic.inactive=Ðеактивный + # Tooltips tooltip.bloodmagic.orb.desc=Хранит жизненную ÑÑÑенцию tooltip.bloodmagic.orb.owner=Создан: %s tooltip.bloodmagic.currentOwner=Владелец: %s tooltip.bloodmagic.currentTier=Уровень: %d -tooltip.bloodmagic.config.disabled=Запрещено наÑтройками +tooltip.bloodmagic.config.disabled=Отключено в наÑтройках +tooltip.bloodmagic.tier=Уровень %d tooltip.bloodmagic.activated=Ðктивирован tooltip.bloodmagic.deactivated=Деактивирован tooltip.bloodmagic.sigil.air.desc=&oОщущаетÑÑ Ð»ÐµÐ³ÐºÐ¾ÑÑ‚ÑŒ... -tooltip.bloodmagic.sigil.bloodLight.desc=&oЯ вижу Ñвет! +tooltip.bloodmagic.sigil.blood_light.desc=&oЯ вижу Ñвет! tooltip.bloodmagic.sigil.compression.desc=&oКучи алмазов tooltip.bloodmagic.sigil.divination.desc=&oВзглÑд в душу tooltip.bloodmagic.sigil.divination.otherNetwork=ЗаглÑнем в душу %s @@ -224,15 +299,16 @@ tooltip.bloodmagic.sigil.divination.currentAltarTier=Уровень: %d tooltip.bloodmagic.sigil.divination.currentEssence=ЭÑÑенции: %d LP tooltip.bloodmagic.sigil.divination.currentAltarCapacity=ÐмкоÑÑ‚ÑŒ: %d LP tooltip.bloodmagic.sigil.divination.currentTranquility=СпокойÑтвие: %d +tooltip.bloodmagic.sigil.divination.currentInversion=ИнверÑиÑ: %d tooltip.bloodmagic.sigil.divination.currentBonus=БонуÑ: +%d%% tooltip.bloodmagic.sigil.water.desc=&oÐужна вода? tooltip.bloodmagic.sigil.lava.desc=&oГОРЯЧЕЕ! ÐЕ ЕСТЬ! tooltip.bloodmagic.sigil.void.desc=&oЛучше чем Swiffer! -tooltip.bloodmagic.sigil.greenGrove.desc=&oЭкологичеÑки чиÑтый +tooltip.bloodmagic.sigil.green_grove.desc=&oЭкологичеÑки чиÑтый tooltip.bloodmagic.sigil.magnetism.desc=&oЯ очень притÑÐ³Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚ÑŒ! tooltip.bloodmagic.sigil.suppression.desc=&oЛучше, чем телекинез... tooltip.bloodmagic.sigil.haste.desc=&oПоÑле 42 чашек кофе... -tooltip.bloodmagic.sigil.fastMiner.desc=&oÐ’Ñе глубже и глубже... +tooltip.bloodmagic.sigil.fast_miner.desc=&oÐ’Ñе глубже и глубже... tooltip.bloodmagic.sigil.elementalAffinity.desc=&oÐŸÐ°Ð´Ð°ÑŽÑ‰Ð°Ñ Ð¾Ð³Ð½ÐµÐ½Ð½Ð°Ñ Ñ€Ñ‹Ð±Ð°! tooltip.bloodmagic.sigil.seer.desc=&oКогда проÑто видеть недоÑтаточно tooltip.bloodmagic.sigil.seer.currentAltarProgress=ПрогреÑÑ: %d LP/ %s LP @@ -245,11 +321,15 @@ tooltip.bloodmagic.sigil.seer.currentCharge=ЗарÑд: %d tooltip.bloodmagic.sigil.seer.currentTranquility=СпокойÑтвие: %d tooltip.bloodmagic.sigil.seer.currentBonus=БонуÑ: +%d%% tooltip.bloodmagic.sigil.phantomBridge.desc=&oПрогулки в воздухе... -tooltip.bloodmagic.sigil.whirlwind.desc=&oЛучше не одевать юбку +tooltip.bloodmagic.sigil.whirlwind.desc=&oЛучше не надевать юбку tooltip.bloodmagic.sigil.enderSeverance.desc=&oÐеприÑтноÑти Ð´Ð»Ñ Ñтранников КраÑ! - tooltip.bloodmagic.sigil.teleposition.desc=Я очень близок к возможноÑти перемещениÑ. -tooltip.bloodmagic.sigil.transposition.desc=Ощути Силу, мой юный ученик. +tooltip.bloodmagic.sigil.transposition.desc=Ощути Ñилу, мой юный ученик. +tooltip.bloodmagic.sigil.holding.press=Ðажмите &o%s&r&7 Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ +tooltip.bloodmagic.sigil.holding.desc=Может хранить Ñигилы. +tooltip.bloodmagic.sigil.holding.sigilInSlot=Слот %d: %s + +tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Увеличивает макÑимальное количеÑтво очков Живой Брони до %d. tooltip.bloodmagic.bound.sword.desc=&oОтбраковка Ñлабаков tooltip.bloodmagic.bound.pickaxe.desc=&oБезжалоÑтное уничтожение ÐºÐ°Ð¼Ð½Ñ @@ -260,30 +340,32 @@ tooltip.bloodmagic.sacrificialDagger.desc=Ðебольшой надрез на tooltip.bloodmagic.slate.desc=Камень, наполненный в кровавом алтаре tooltip.bloodmagic.inscriber.desc=ÐадпиÑи на Ñтене... -tooltip.bloodmagic.pack.selfSacrifice.desc=This pack really chafes... +tooltip.bloodmagic.pack.selfSacrifice.desc=Это реально раздражает... tooltip.bloodmagic.pack.sacrifice.desc=Description tooltip.bloodmagic.pack.stored=Ðакоплено: %d LP -tooltip.bloodmagic.activationCrystal.weak=Ðктивирует проÑтые ритуалы -tooltip.bloodmagic.activationCrystal.awakened=Ðктивирует Ñложные ритуалы -tooltip.bloodmagic.activationCrystal.creative=Только в креативе - активирует любые ритуалы +tooltip.bloodmagic.activation_crystal.weak=Ðктивирует проÑтые ритуалы +tooltip.bloodmagic.activation_crystal.awakened=Ðктивирует Ñложные ритуалы +tooltip.bloodmagic.activation_crystal.creative=Только Ð´Ð»Ñ Ñ‚Ð²Ð¾Ñ€Ñ‡ÐµÑкого режима. Ðктивирует любые ритуалы -tooltip.bloodmagic.diviner.currentRitual=Выбранный ритуал: -tooltip.bloodmagic.diviner.blankRune=Ритуальных камней: %d -tooltip.bloodmagic.diviner.waterRune=Камней воды: %d -tooltip.bloodmagic.diviner.airRune=Камней воздуха: %d -tooltip.bloodmagic.diviner.fireRune=Камней огнÑ: %d -tooltip.bloodmagic.diviner.earthRune=Камней земли: %d -tooltip.bloodmagic.diviner.duskRune=Камней Ñумерек: %d -tooltip.bloodmagic.diviner.dawnRune=Камней раÑÑвета: %d -tooltip.bloodmagic.diviner.totalRune=Ð’Ñего ритуальных камней: %d -tooltip.bloodmagic.diviner.extraInfo=Shift Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации +tooltip.bloodmagic.diviner.currentRitual=Выбранный ритуал: %s +tooltip.bloodmagic.diviner.blankRune=ЧиÑтые руны: %d +tooltip.bloodmagic.diviner.waterRune=Руны воды: %d +tooltip.bloodmagic.diviner.airRune=Руны воздуха: %d +tooltip.bloodmagic.diviner.fireRune=Руны огнÑ: %d +tooltip.bloodmagic.diviner.earthRune=Руны земли: %d +tooltip.bloodmagic.diviner.duskRune=Руны Ñумерек: %d +tooltip.bloodmagic.diviner.dawnRune=Руны раÑÑвета: %d +tooltip.bloodmagic.diviner.totalRune=Ð’Ñего рун: %d +tooltip.bloodmagic.diviner.extraInfo=&9-Удерживайте Shift Ð´Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ о рунах- +tooltip.bloodmagic.diviner.extraExtraInfo=&9-Удерживайте Shift+M Ð´Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ о ритуале- tooltip.bloodmagic.diviner.currentDirection=Ðаправление: %s tooltip.bloodmagic.arcaneAshes=Пепел Ð´Ð»Ñ Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸Ñ‡ÐµÑких знаков tooltip.bloodmagic.telepositionFocus.coords=Координаты: (%d, %d, %d) tooltip.bloodmagic.telepositionFocus.dimension=ID ИзмерениÑ: %d +tooltip.bloodmagic.telepositionFocus.bound=Владелец: %s. Координаты: %d, %d, %d tooltip.bloodmagic.telepositionFocus.weak=Может перемещать блоки tooltip.bloodmagic.telepositionFocus.enhanced=Может перемещать блоки tooltip.bloodmagic.telepositionFocus.reinforced=Может перемещать блоки @@ -295,7 +377,7 @@ tooltip.bloodmagic.livingArmour.upgrade.poisonResist=СтойкоÑÑ‚ÑŒ к Ñд tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Твердые ладони tooltip.bloodmagic.livingArmour.upgrade.knockback=КультуриÑÑ‚ tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=ТолÑÑ‚Ð°Ñ ÐºÐ¾Ð¶Ð° -tooltip.bloodmagic.livingArmour.upgrade.health=Здровый +tooltip.bloodmagic.livingArmour.upgrade.health=Здоровый tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Свирепый удар tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Меткий Ñтрелок tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Ð’Ñ‹Ñокий шаг @@ -303,11 +385,38 @@ tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Избежал Ñмерти tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Ð¡Ð¾Ð»Ð½ÐµÑ‡Ð½Ð°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=РуничеÑкий щит tooltip.bloodmagic.livingArmour.upgrade.revealing=Обнаружение +tooltip.bloodmagic.livingArmour.upgrade.experienced=Опытный +tooltip.bloodmagic.livingArmour.upgrade.jump=Сильные ноги +tooltip.bloodmagic.livingArmour.upgrade.fallProtect=ÐœÑгкое падение +tooltip.bloodmagic.livingArmour.upgrade.graveDigger=Копатель могил +tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=ЗарÑженный удар +tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=Сильный удар +tooltip.bloodmagic.livingArmour.upgrade.elytra=Элитра +tooltip.bloodmagic.livingArmour.upgrade.nightSight=ÐÐ¾Ñ‡Ð½Ð°Ñ Ð´Ð¾Ð±Ð»ÐµÑÑ‚ÑŒ +tooltip.bloodmagic.livingArmour.upgrade.repair=ВоÑÑтанавливающий + +tooltip.bloodmagic.livingArmour.upgrade.slowness=Слабые ноги +tooltip.bloodmagic.livingArmour.upgrade.crippledArm=Ð¡Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ€ÑƒÐºÐ° +tooltip.bloodmagic.livingArmour.upgrade.slippery=Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ñ‚Ñга +tooltip.bloodmagic.livingArmour.upgrade.battleHunger=Боевой голод +tooltip.bloodmagic.livingArmour.upgrade.quenched=Охлаждение +tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=Тупой меч +tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=Ð¡Ð»Ð°Ð±Ð°Ñ ÐºÐ¸Ñ€ÐºÐ° +tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=Штурмовик +tooltip.bloodmagic.livingArmour.upgrade.slowHeal=Больной +tooltip.bloodmagic.livingArmour.upgrade.disoriented=Дезориентированный + tooltip.bloodmagic.livingArmour.upgrade.level=%s (Уровень %d) +tooltip.bloodmagic.livingArmour.upgrade.progress=%s (%d/100) tooltip.bloodmagic.livingArmour.upgrade.points=&6Очки улучшениÑ: %s / %s +tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Удерживайте Shift+M Ð´Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ об уровне- + tooltip.bloodmagic.will=Энергии: %1$,.2f tooltip.bloodmagic.sentientSword.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. +tooltip.bloodmagic.sentientAxe.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. +tooltip.bloodmagic.sentientPickaxe.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. +tooltip.bloodmagic.sentientShovel.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. tooltip.bloodmagic.soulGem.petty=Этот камень может хранить очень мало Ñнергии tooltip.bloodmagic.soulGem.lesser=Этот камень может хранить немного Ñнергии tooltip.bloodmagic.soulGem.common=Этот камень может хранить Ñреднее количеÑтво Ñнергии @@ -324,6 +433,32 @@ tooltip.bloodmagic.fluid.type=ЖидкоÑÑ‚ÑŒ: %s tooltip.bloodmagic.fluid.amount=Кол-во: %d / %d мВ tooltip.bloodmagic.fluid.capacity=ÐмкоÑÑ‚ÑŒ: %d мВ +tooltip.bloodmagic.ghost.everything=Ð’Ñе +tooltip.bloodmagic.ghost.amount=КоличеÑтво призрачных предметов: %d + +tooltip.bloodmagic.currentType.default=Содержит Ñырую Ñнергию +tooltip.bloodmagic.currentType.corrosive=Содержит коррозионную Ñнергию +tooltip.bloodmagic.currentType.destructive=Содержит разрушающую Ñнергию +tooltip.bloodmagic.currentType.vengeful=Содержит мÑтительную Ñнергию +tooltip.bloodmagic.currentType.steadfast=Содержит уÑтойчивую Ñнергию + +tooltip.bloodmagic.currentBaseType.default=Ð¡Ñ‹Ñ€Ð°Ñ +tooltip.bloodmagic.currentBaseType.corrosive=ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¾Ð½Ð½Ð°Ñ +tooltip.bloodmagic.currentBaseType.destructive=Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ +tooltip.bloodmagic.currentBaseType.vengeful=ÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ +tooltip.bloodmagic.currentBaseType.steadfast=УÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð°Ñ + +tooltip.bloodmagic.experienceTome=Книга Ð´Ð»Ñ Ñбора опыта +tooltip.bloodmagic.experienceTome.exp=Опыт: %0.3f +tooltip.bloodmagic.experienceTome.expLevel=Уровень: %d + +tooltip.bloodmagic.decoration.safe=БезопаÑно Ð´Ð»Ñ ÑƒÐºÑ€Ð°ÑˆÐµÐ½Ð¸Ñ +tooltip.bloodmagic.decoration.notSafe=ОпаÑно Ð´Ð»Ñ ÑƒÐºÑ€Ð°ÑˆÐµÐ½Ð¸Ñ + +tooltip.bloodmagic.cuttingFluidRatio=%d/%d иÑпользований оÑталоÑÑŒ + +tooltip.bloodmagic.potion.uses=%d иÑпользований оÑталоÑÑŒ + # Ritual ritual.bloodmagic.testRitual=ТеÑтовый ритуал ritual.bloodmagic.waterRitual=Ритуал вызова родника @@ -345,7 +480,11 @@ ritual.bloodmagic.expulsionRitual=Ðура Ð¸Ð·Ð³Ð½Ð°Ð½Ð¸Ñ ritual.bloodmagic.zephyrRitual=Зов Зефира ritual.bloodmagic.upgradeRemoveRitual=Звук Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð¸Ñ Ð´ÑƒÑˆ ritual.bloodmagic.armourEvolveRitual=Ритуал Ñволюции - +ritual.bloodmagic.animalGrowthRitual=Ритуал Шеперда +ritual.bloodmagic.forsakenSoulRitual=Сбор покинутых душ +ritual.bloodmagic.crystalHarvestRitual=Трещина разрушенного криÑталла +ritual.bloodmagic.meteorRitual=Ритуал падающей башни +ritual.bloodmagic.ellipseRitual=Ð¤Ð¾ÐºÑƒÑ ÑллипÑоида ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius ritual.bloodmagic.placerRitual=Ðаполнитель ritual.bloodmagic.fellingRitual=ДровоÑек @@ -353,16 +492,24 @@ ritual.bloodmagic.pumpRitual=Гимн откачки ritual.bloodmagic.altarBuilderRitual=Строитель Ð°Ð»Ñ‚Ð°Ñ€Ñ ritual.bloodmagic.portalRitual=Ритуал врат +ritual.bloodmagic.waterRitual.info=Создаёт иÑточник воды на главном ритуальном камне +ritual.bloodmagic.lavaRitual.info=Создаёт иÑточник лавы на главном ритуальном камне +ritual.bloodmagic.lavaRitual.default.info=(СыраÑ) Уменьшает затраты LP на Ñоздание лавы и позволÑет помещать лаву внутрь привÑзанного контейнера +ritual.bloodmagic.lavaRitual.corrosive.info=(КоррозионнаÑ) Повреждает ÑущноÑтей (ÐаходÑщихÑÑ Ð² зоне дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°), которые невоÑприимчивы к огню. +ritual.bloodmagic.lavaRitual.destructive.info=(РазрушительнаÑ) Ð Ð°Ð´Ð¸ÑƒÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð»Ð°Ð²Ñ‹ увеличиваетÑÑ Ð² завиÑимоÑти от общей Ñнергии. +ritual.bloodmagic.lavaRitual.vengeful.info=(ÐœÑтительнаÑ) Защищает ÑущноÑтей (ÐаходÑщихÑÑ Ð² зоне дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°) от огнÑ. +ritual.bloodmagic.lavaRitual.steadfast.info=(УÑтойчиваÑ) Защищает игроков в пределах заданного диапазона от огнÑ. + # Chat chat.bloodmagic.altarMaker.setTier=УÑтановить уровень: %d chat.bloodmagic.altarMaker.building=СтроитÑÑ Ð°Ð»Ñ‚Ð°Ñ€ÑŒ %d ÑƒÑ€Ð¾Ð²Ð½Ñ chat.bloodmagic.altarMaker.destroy=Разобран алтарь %d ÑƒÑ€Ð¾Ð²Ð½Ñ chat.bloodmagic.altarMaker.creativeOnly=Предмет только Ð´Ð»Ñ ÐºÑ€ÐµÐ°Ñ‚Ð¸Ð²Ð°. -chat.bloodmagic.damageSource=душа %s Ñлишком оÑлабла +chat.bloodmagic.damageSource=Душа %s Ñлишком оÑлабла -chat.bloodmagic.ritual.weak=Ð’Ñ‹ чувÑтвуете толчок, но Ñлишком Ñлабый, чтобы выполнить ритуал. -chat.bloodmagic.ritual.prevent=Ритуал ÑопротивлÑетÑÑ Ð²Ð°ÑˆÐµÐ¼Ñƒ воздейÑтвию! +chat.bloodmagic.ritual.weak=Ð’Ñ‹ Ñлишком Ñлабы, чтобы активировать ритуал. +chat.bloodmagic.ritual.prevent=Ритуал ÑопротивлÑетÑÑ Ð’Ð°Ð¼! chat.bloodmagic.ritual.activate=Потоки Ñнергии текут через ритуал! chat.bloodmagic.ritual.notValid=Ð’Ñ‹ чувÑтвуете, что руны ÑтоÑÑ‚ неправильно... @@ -370,11 +517,28 @@ chat.bloodmagic.livingArmour.upgrade.poisonRemove=You are starting to feel bette chat.bloodmagic.livingArmour.upgrade.grimReaper=&6Темные Ñилы ÑпаÑли Ð²Ð°Ñ Ð·Ð° Ñекунду до Ñмерти! chat.bloodmagic.livingArmour.newUpgrade=&4Получено улучшение! +# Commands +commands.bloodmagic.error.arg.invalid=Ðеправильные аргументы +commands.bloodmagic.error.arg.missing=Мало аргументов +commands.bloodmagic.error.arg.player.missing=Ð’Ñ‹ должны указать никнейм игрока +commands.bloodmagic.error.404=Команда не найдена! +commands.bloodmagic.error.unknown=ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°! +commands.bloodmagic.error.perm=У Ð’Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточно прав Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды. + +commands.bloodmagic.success=Выполнено уÑпешно + +commands.bloodmagic.format.help=%s - %s +commands.bloodmagic.format.error=%s - %s + +commands.bloodmagic.help.usage=/bloodmagic help +commands.bloodmagic.help.help=Отображает информацию о команде "/bloodmagic". + # JustEnoughItems jei.bloodmagic.recipe.altar=Кровавый алтарь jei.bloodmagic.recipe.binding=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° (СвÑзывание) jei.bloodmagic.recipe.alchemyArrayCrafting=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° jei.bloodmagic.recipe.soulForge=ÐдÑÐºÐ°Ñ ÐºÑƒÐ·Ð½Ð¸Ñ†Ð° +jei.bloodmagic.recipe.alchemyTable=Стол алхимии jei.bloodmagic.recipe.requiredLP=LP: %d jei.bloodmagic.recipe.requiredTier=Уровень: %d jei.bloodmagic.recipe.consumptionRate=РаÑход: %d LP/t @@ -382,15 +546,16 @@ jei.bloodmagic.recipe.drainRate=Потери: %d LP/t jei.bloodmagic.recipe.minimumSouls=Минимум: %1$,.2f Ñнергии jei.bloodmagic.recipe.soulsDrained=Затраты: %1$,.2f Ñнергии -jei.bloodmagic.desc.altarBuilder=A creative-only item for use in debugging and testing.\n\nShift + Right click to change the tier to build. Right click an Altar to initiate the build.\n\nBreak an Altar while holding to dismantle it. +jei.bloodmagic.desc.altarBuilder=Креативный предмет, который иÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ и теÑтированиÑ.\n\nShift+ПКМ Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° ÑƒÑ€Ð¾Ð²Ð½Ñ Ð°Ð»Ñ‚Ð°Ñ€Ñ. ПКМ по алтарю Ð´Ð»Ñ Ð¿Ð¾Ñтройки.\n\nЛКМ по алтарю чтобы разобрать алтарь. jei.bloodmagic.desc.demonicWill=An imprint of a demonic entity attached to a creature.\n\nCan be obtained by killing a mob with a sentient weapon or by throwing a snare at a mob and killing it while it has white particles. # WAILA -waila.bloodmagic.sneak=&oSneak for Information +waila.bloodmagic.sneak=&oShift Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ информации waila.bloodmagic.array.reagent=Реагент: %s waila.bloodmagic.array.catalyst=Катализатор: %s -option.bloodmagic.bypassSneak=Bypass Sneak +option.bloodmagic.bypassSneak=ÐŸÐ¾Ð»Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð±ÐµÐ· Shift option.bloodmagic.bloodAltar=Кровавый алтарь +option.bloodmagic.bloodTank=Резервуар крови option.bloodmagic.ritualController=Ритуальные камни option.bloodmagic.teleposer=Телепозер option.bloodmagic.array=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° @@ -402,3 +567,6 @@ tc.research_category.BLOODMAGIC=Sanguine Arcana bloodmagic.research_name.BLOODMAGIC=Blood Magic bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana bloodmagic.research_page.BLOODMAGIC.1=The realm of the Blood Magics has always appeared to be a more solitary and "individual" art with blood mages being notoriously reclusive and a bit insane at times. However, the powers of self-sacrifice and life essence have uses even beyond a normal blood mage's sight, in fact, it is quite apparent that it may have some uses in thaumaturgy after all! + +# Buttons +button.bloodmagic.tooltip.fill=Заполнить Ñеть From 297771af815302e38141a5225df9e96a0f0a06ce Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Sun, 30 Dec 2018 19:14:27 -0500 Subject: [PATCH 261/493] Add Handlers for Ritual of Crushing (#1469) * Add Handlers for Ritual of Crushing Fixes the crushing ritual's corrosive will augment. * Simplify Handler Class Use Primitives, ensure return value is non-null * Make the Handler Handle Draining Per Use * Revert "Make the Handler Handle Draining Per Use" This reverts commit bacaa610febc5a609a7a891ceed41b0e0fb2f05d. --- .../java/WayofTime/bloodmagic/BloodMagic.java | 1 + .../bloodmagic/registry/ModRituals.java | 9 ++++ .../crushing/CrushingHandlerCuttingFluid.java | 49 +++++++++++++++++++ .../ritual/crushing/CrushingRegistry.java | 20 ++++++++ .../ritual/crushing/ICrushingHandler.java | 14 ++++++ .../ritual/types/RitualCrushing.java | 33 +++++-------- 6 files changed, 106 insertions(+), 20 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index c132d776..c0413361 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -91,6 +91,7 @@ public class BloodMagic { ModRecipes.init(); ModRituals.initHarvestHandlers(); + ModRituals.initCuttingFluids(); MeteorConfigHandler.init(new File(configDir, "meteors")); ModArmourTrackers.init(); NetworkRegistry.INSTANCE.registerGuiHandler(BloodMagic.instance, new GuiHandler()); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index f33bbf22..8b1822e9 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.registry; +import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; +import WayofTime.bloodmagic.ritual.crushing.CrushingHandlerCuttingFluid; +import WayofTime.bloodmagic.ritual.crushing.CrushingRegistry; import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; @@ -19,4 +22,10 @@ public class ModRituals HarvestRegistry.registerHandler(new HarvestHandlerTall()); HarvestRegistry.registerHandler(new HarvestHandlerStem()); } + + public static void initCuttingFluids() + { + CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5)); + CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05)); + } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java new file mode 100644 index 00000000..6263059c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java @@ -0,0 +1,49 @@ +package WayofTime.bloodmagic.ritual.crushing; + +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +public class CrushingHandlerCuttingFluid implements ICrushingHandler { + + private int lpDrain; + + private double willDrain; + + private ItemStack cuttingStack; + + public CrushingHandlerCuttingFluid(ItemStack cuttingStack, int lpDrain, double willDrain) { + this.lpDrain = lpDrain; + this.willDrain = willDrain; + this.cuttingStack = cuttingStack; + } + + @Override + @Nonnull + public ItemStack getRecipeOutput(ItemStack inputStack, World world, BlockPos pos) { + List inputList = new ArrayList<>(); + inputList.add(cuttingStack); + inputList.add(inputStack.copy()); + RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(inputList); + + if (recipeAlchemyTable != null) { + return recipeAlchemyTable.getOutput().copy(); + } + + return ItemStack.EMPTY; + } + + public double getWillDrain() { + return willDrain; + } + + public int getLpDrain() { + return lpDrain; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java new file mode 100644 index 00000000..696663ea --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java @@ -0,0 +1,20 @@ +package WayofTime.bloodmagic.ritual.crushing; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + + +public class CrushingRegistry { + + private static List crushingHandlerList = new ArrayList<>(); + + public static void registerCuttingFluid(ICrushingHandler handler) { + crushingHandlerList.add(handler); + } + + public static List getCrushingHandlerList() { + return crushingHandlerList; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java new file mode 100644 index 00000000..fb99faf7 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java @@ -0,0 +1,14 @@ +package WayofTime.bloodmagic.ritual.crushing; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public interface ICrushingHandler { + @Nonnull + ItemStack getRecipeOutput(ItemStack input, World world, BlockPos pos); + int getLpDrain(); + double getWillDrain(); +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 8f1a5855..49940c87 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -5,6 +5,8 @@ import WayofTime.bloodmagic.compress.CompressionRegistry; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.ritual.crushing.CrushingRegistry; +import WayofTime.bloodmagic.ritual.crushing.ICrushingHandler; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; @@ -117,29 +119,19 @@ public class RitualCrushing extends Ritual { ItemStack copyStack = checkStack.copy(); - for (Entry entry : cuttingFluidLPMap.entrySet()) { - ItemStack cuttingStack = entry.getKey(); - int lpDrain = entry.getValue(); - double willDrain = cuttingFluidWillMap.containsKey(cuttingStack) ? cuttingFluidWillMap.get(cuttingStack) : 0; + for (ICrushingHandler handler : CrushingRegistry.getCrushingHandlerList()) { + int lpDrain = handler.getLpDrain(); + double willDrain = handler.getWillDrain(); - if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) { - continue; - } + if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) { + continue; + } - cuttingStack = cuttingStack.copy(); - List input = new ArrayList<>(); - input.add(cuttingStack); - input.add(copyStack); + ItemStack result = handler.getRecipeOutput(copyStack, world, pos); - AlchemyTableRecipe recipe = AlchemyTableRecipeRegistry.getMatchingRecipe(input, world, pos); - if (recipe == null) { - continue; - } - - ItemStack result = recipe.getRecipeOutput(input); - if (result.isEmpty()) { - continue; - } + if (result.isEmpty()) { + continue; + } if (tile != null) { result = Utils.insertStackIntoTile(result, tile, EnumFacing.DOWN); @@ -158,6 +150,7 @@ public class RitualCrushing extends Ritual { isBlockClaimed = true; } + } if (!isBlockClaimed && isSilkTouch && block.canSilkHarvest(world, newPos, state, getFakePlayer((WorldServer) world))) { From 4f04fde1272ce29c23ab5f191f6166ac97674289 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Thu, 3 Jan 2019 06:59:46 +0100 Subject: [PATCH 262/493] Optimized and updated Bound Tools (#1500) Signed-off-by: tobias --- .../bloodmagic/item/ItemBoundAxe.java | 12 +++--- .../bloodmagic/item/ItemBoundPickaxe.java | 18 +++----- .../bloodmagic/item/ItemBoundShovel.java | 18 ++++---- .../bloodmagic/item/ItemBoundTool.java | 43 ++++++------------- 4 files changed, 35 insertions(+), 56 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 3e1e2610..903ce710 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.collect.HashMultiset; @@ -68,26 +67,25 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { BlockPos blockPos = playerPos.add(i, j, k); - BlockStack blockStack = BlockStack.getStackFromPos(world, blockPos); + IBlockState blockState = world.getBlockState(blockPos); - if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos)) + if (world.isAirBlock(blockPos)) continue; - if (blockStack.getState().getMaterial() != Material.WOOD && !EFFECTIVE_ON.contains(blockStack.getBlock())) + if (blockState.getMaterial() != Material.WOOD && !EFFECTIVE_ON.contains(blockState.getBlock())) continue; - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockState, player); if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - sharedHarvest(stack, world, player, blockPos, blockStack, drops, silkTouch, fortuneLvl); + sharedHarvest(stack, world, player, blockPos, blockState, silkTouch, fortuneLvl); } } } NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.1F, false); - dropStacks(drops, world, playerPos.add(0, 1, 0)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index eb2326a1..4b422e55 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -3,10 +3,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.*; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -73,34 +72,31 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { int range = (charge / 6); //Charge is a max of 30 - want 5 to be the max - HashMultiset drops = HashMultiset.create(); - BlockPos playerPos = player.getPosition(); for (int i = -range; i <= range; i++) { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { BlockPos blockPos = playerPos.add(i, j, k); - BlockStack blockStack = BlockStack.getStackFromPos(world, blockPos); + IBlockState blockState = world.getBlockState(blockPos); - if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos)) + if (world.isAirBlock(blockPos)) continue; - if (blockStack.getState().getMaterial() != Material.ROCK && !EFFECTIVE_ON.contains(blockStack.getBlock())) + if (blockState.getMaterial() != Material.ROCK && !EFFECTIVE_ON.contains(blockState.getBlock())) continue; - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockState, player); if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - sharedHarvest(stack, world, player, blockPos, blockStack, drops, silkTouch, fortuneLvl); + sharedHarvest(stack, world, player, blockPos, blockState, silkTouch, fortuneLvl); } } } NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.5F, false); - dropStacks(drops, world, playerPos.add(0, 1, 0)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index dba37f03..ec4b630e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -3,10 +3,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.BlockStack; import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.*; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -66,27 +67,26 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { BlockPos blockPos = playerPos.add(i, j, k); - BlockStack blockStack = BlockStack.getStackFromPos(world, blockPos); + IBlockState blockState = world.getBlockState(blockPos); - if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos)) + if (world.isAirBlock(blockPos)) continue; - Material material = blockStack.getState().getMaterial(); - if (material != Material.GROUND && material != Material.CLAY && material != Material.GRASS && !EFFECTIVE_ON.contains(blockStack.getBlock())) + Material material = blockState.getMaterial(); + if (material != Material.GROUND && material != Material.CLAY && material != Material.GRASS && !EFFECTIVE_ON.contains(blockState.getBlock())) continue; - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockState, player); if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) continue; - sharedHarvest(stack, world, player, blockPos, blockStack, drops, silkTouch, fortuneLvl); + sharedHarvest(stack, world, player, blockPos, blockState, silkTouch, fortuneLvl); } } } NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.5F, false); - dropStacks(drops, world, playerPos.add(0, 1, 0)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index f2aea812..eb89458c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -4,16 +4,15 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.event.BoundToolEvent; import WayofTime.bloodmagic.iface.IActivatable; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.util.ItemStackWrapper; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.*; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -21,10 +20,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.util.ActionResult; @@ -36,6 +35,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import java.util.HashMap; import java.util.List; @@ -235,36 +235,21 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { return chargeTime; } - protected static void dropStacks(Multiset drops, World world, BlockPos posToDrop) { - for (Multiset.Entry entry : drops.entrySet()) { - int count = entry.getCount(); - ItemStackWrapper stack = entry.getElement(); - int maxStackSize = stack.item.getItemStackLimit(stack.toStack(1)); + protected void sharedHarvest(ItemStack stack, World world, EntityPlayer player, BlockPos blockPos, IBlockState blockState, boolean silkTouch, int fortuneLvl) { - while (count >= maxStackSize) { - world.spawnEntity(new EntityItem(world, posToDrop.getX(), posToDrop.getY(), posToDrop.getZ(), stack.toStack(maxStackSize))); - count -= maxStackSize; - } - - if (count > 0) - world.spawnEntity(new EntityItem(world, posToDrop.getX(), posToDrop.getY(), posToDrop.getZ(), stack.toStack(count))); - } - } - - protected void sharedHarvest(ItemStack stack, World world, EntityPlayer player, BlockPos blockPos, BlockStack blockStack, HashMultiset drops, boolean silkTouch, int fortuneLvl){ - - if (blockStack.getBlock() != null && blockStack.getState().getBlockHardness(world, blockPos) != -1.0F) { - float strengthVsBlock = getDestroySpeed(stack, blockStack.getState()); + if (blockState.getBlockHardness(world, blockPos) != -1.0F) { + float strengthVsBlock = getDestroySpeed(stack, blockState); if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { - if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) - drops.add(new ItemStackWrapper(blockStack)); + if (silkTouch && blockState.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(Item.getItemFromBlock(blockState.getBlock()))); else { - List itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); + NonNullList itemDrops = new NonNullList<>(); + blockState.getBlock().getDrops(itemDrops, world, blockPos, world.getBlockState(blockPos), fortuneLvl); for (ItemStack stacks : itemDrops) - drops.add(ItemStackWrapper.getHolder(stacks)); + ItemHandlerHelper.giveItemToPlayer(player, stacks); } - blockStack.getBlock().removedByPlayer(world.getBlockState(blockPos), world, blockPos,player, false); + blockState.getBlock().removedByPlayer(world.getBlockState(blockPos), world, blockPos, player, false); } } } From fa87ed0e17ffce8c097cbadc54f5a01877a270a3 Mon Sep 17 00:00:00 2001 From: tommyTT <3993801+tommyTT@users.noreply.github.com> Date: Sat, 5 Jan 2019 18:34:45 +0100 Subject: [PATCH 263/493] Bugfix attempt to remove render lag (see WayofTime#1457) (#1458) Simplified the whole branch since it got really messed up --- .../java/WayofTime/bloodmagic/tile/TileDemonCrystal.java | 8 ++++++-- .../java/WayofTime/bloodmagic/tile/base/TileBase.java | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index d856cc42..052e8e2a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -35,8 +35,6 @@ public class TileDemonCrystal extends TileTicking { if (getWorld().isRemote) { - if(internalCounter % 20 == 0) - getWorld().markBlockRangeForRenderUpdate(pos, pos); return; } @@ -208,4 +206,10 @@ public class TileDemonCrystal extends TileTicking { this.placement = placement; } + + @Override + protected void onDataPacketClientReceived() { + super.onDataPacketClientReceived(); + notifyUpdate(); + } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java index e39ba05f..18344853 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java @@ -97,6 +97,14 @@ public class TileBase extends TileEntity { public final void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); readFromNBT(pkt.getNbtCompound()); + onDataPacketClientReceived(); + } + + /** + * Hook for performing client side updates after data packets are received and processed + */ + protected void onDataPacketClientReceived() { + // noop } @Override From 7e2251b8e5c25059ba15b23ba55e27e77724374a Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Sun, 20 Jan 2019 23:50:31 +0100 Subject: [PATCH 264/493] Hymn of Syphoning (pump) tank render fix (#1521) * Hymn of Syphoning (pump) tank render fix Every Hymn of Syphoning (RitualPump) filling of the IFluidHandler now also triggers a block update for the block above the MRS, rerendering the tank contents to be up to date with the new fill status immediatly. * Stonestate for replaced blocks --- .../java/WayofTime/bloodmagic/ritual/types/RitualPump.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index 2fb5001a..c713721a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -80,7 +80,8 @@ public class RitualPump extends Ritual { masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); fluidHandler.fill(posInfo.getRight(), true); world.setBlockState(posInfo.getLeft(), Blocks.STONE.getDefaultState()); - world.notifyBlockUpdate(posInfo.getLeft(), tankState, tankState, 3); + world.notifyBlockUpdate(posInfo.getLeft(), Blocks.STONE.getDefaultState(), Blocks.STONE.getDefaultState(), 3); + world.notifyBlockUpdate(tileEntity.getPos(), tankState, tankState, 3); blockPosIterator.remove(); } } From c6a315a51c21c1a101264f612dfeebbbce2f3cf6 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 21 Jan 2019 00:16:22 +0100 Subject: [PATCH 265/493] Fixed compile-time fatal error (#1510) Added Creative handling --- .../bloodmagic/item/ItemBoundTool.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index eb89458c..128751c6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -241,14 +241,15 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { float strengthVsBlock = getDestroySpeed(stack, blockState); if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { - if (silkTouch && blockState.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(Item.getItemFromBlock(blockState.getBlock()))); - else { - NonNullList itemDrops = new NonNullList<>(); - blockState.getBlock().getDrops(itemDrops, world, blockPos, world.getBlockState(blockPos), fortuneLvl); - for (ItemStack stacks : itemDrops) - ItemHandlerHelper.giveItemToPlayer(player, stacks); - } + if (!player.isCreative()) + if (silkTouch && blockState.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(Item.getItemFromBlock(blockState.getBlock()))); + else { + NonNullList itemDrops = NonNullList.create(); + blockState.getBlock().getDrops(itemDrops, world, blockPos, world.getBlockState(blockPos), fortuneLvl); + for (ItemStack stacks : itemDrops) + ItemHandlerHelper.giveItemToPlayer(player, stacks); + } blockState.getBlock().removedByPlayer(world.getBlockState(blockPos), world, blockPos, player, false); } } From ffdf627c187124507020fe39a7d4b1f526f150cd Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 21 Jan 2019 00:17:00 +0100 Subject: [PATCH 266/493] Added simple GuideBook documentation for all rituals (#1515) * Added simple GuideBook documentation for all rituals (including coming ups from PRs) without Lore (added an info at the top of each entry that it requires lore (##REQ-LORE##)). This should enable everyone that uses the GuideBook to use the rituals. * Reverted Bound tool change --- .../compat/guideapi/book/CategoryRitual.java | 19 ++++++++++-- .../assets/bloodmagicguide/lang/en_US.lang | 30 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index 0a82b197..d94d2717 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.util.helper.RecipeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; @@ -116,6 +116,21 @@ public class CategoryRitual addRitualPagesToEntries("meteor", entries); addRitualPagesToEntries("downgrade", entries); addRitualPagesToEntries("crystalSplit", entries); + addRitualPagesToEntries("portal", entries); + addRitualPagesToEntries("altarBuilder", entries); + addRitualPagesToEntries("pump", entries); + addRitualPagesToEntries("cobble", entries); + addRitualPagesToEntries("ellipsoid", entries); + addRitualPagesToEntries("crystalHarvest", entries); + addRitualPagesToEntries("forsakenSoul", entries); + addRitualPagesToEntries("animalGrowth", entries); + addRitualPagesToEntries("livingEvolution", entries); + addRitualPagesToEntries("upgradeRemove", entries); + addRitualPagesToEntries("fullStomach", entries); + addRitualPagesToEntries("eternalSoul", entries); + addRitualPagesToEntries("condor", entries); + addRitualPagesToEntries("featheredEarth", entries); + addRitualPagesToEntries("grounding", entries); for (Entry entry : entries.entrySet()) { diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index 19683fb1..4107efc8 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -51,6 +51,21 @@ guide.bloodmagic.entry.ritual.timberman=Crash of the Timberman guide.bloodmagic.entry.ritual.meteor=Mark of the Falling Tower guide.bloodmagic.entry.ritual.downgrade=Penance of the Leadened Soul guide.bloodmagic.entry.ritual.crystalSplit=Resonance of the Faceted Crystal +guide.bloodmagic.entry.ritual.portal=The Gate of the Fold +guide.bloodmagic.entry.ritual.altarBuilder=The Assembly of the High Altar +guide.bloodmagic.entry.ritual.pump=Hymn of Syphoning +guide.bloodmagic.entry.ritual.cobble=Le Vulcanos Frigius +guide.bloodmagic.entry.ritual.ellipsoid=Focus of the Ellipsoid +guide.bloodmagic.entry.ritual.crystalHarvest=Crack of the Fractured Crystal +guide.bloodmagic.entry.ritual.forsakenSoul=Gathering of the Forsaken Souls +guide.bloodmagic.entry.ritual.animalGrowth=Ritual of the Shephard +guide.bloodmagic.entry.ritual.livingEvolution=Ritual of the Living Evolution +guide.bloodmagic.entry.ritual.upgradeRemove=Ritual of the Cleansing Soul +guide.bloodmagic.entry.ritual.fullStomach=Ritual of the Satiated Stomach +guide.bloodmagic.entry.ritual.eternalSoul=Ritual of the Eternal Soul +guide.bloodmagic.entry.ritual.condor=Reverence of the Condor +guide.bloodmagic.entry.ritual.featheredEarth=Ritual of the Feathered Earth +guide.bloodmagic.entry.ritual.grounding=Ritual of Grounding # Ritual Master Entry Text guide.bloodmagic.entry.ritual.intro.info=Good evening. My name is Magus Arcana. I have had many guises over the years: a thief and a vigilante, a wizard and a warrior, a roaming nomad and even a politician. The title that I hold nowadays is one that many cannot comprehend, that at the very mention of it brings forth images of brutality that in some cases have been earned but in many others are misguided. I am of course talking about being a Blood Mage, though my friends simply call me Magus whereas my enemies refer to me as The Ritual Master.\n\tMy students have been pestering me for many months now, attempting to get me to document all of the myriad adventures that I have had in some form of book for me to distribute among any aspiring mages. I had been resistant, but it was Tiberius who put it best: "Although you may not see the value of it yourself, hearing the intricacies of any sort of craft from a man who has achieved mastership of the field will prove invaluable for future generations. It doesn't matter how accurately someone else retells it, if you don't have the utmost confidence in a source the gold sand could be nothing more than sulfur." You could tell he was delving into a bit of alchemy at that point, but since he was my first student for a long time I tend to value his opinion.\n\tSo, aspiring Blood Mage, training in the arcane that many yet do not fully understand, lend me your ears for these are words worth heeding: the field that you are studying has many aspects, and without careful consideration you may find your tools lacking. Therefore make sure to review this book often - I have put many enchantments on the tome that you carry with you so that whenever I write in my master copy the words will change for you.\n\tSo sit back, relax, and enjoy the teachings of a very old man. You may learn more than you've bargained for. @@ -83,6 +98,21 @@ guide.bloodmagic.entry.ritual.timberman.info=Got wood? This ritual has you cover guide.bloodmagic.entry.ritual.meteor.info=For all intents and purposes, this is one of the most powerful rituals currently in the game. It costs one million LP to activate and can only be used once before needing to be reactivated. The ritual, once specific sacrifices are made, pulls a meteor from outer space and causes it to plummet towards the ground, causing a large explosion once it hits something solid. Because these meteors are not from the Overworld, they can hold a rich ore density never seen anywhere else.\n\tSacrifices can include: an iron block, a gold block, a diamond. This is configurable by the modpack or user. guide.bloodmagic.entry.ritual.downgrade.info=In order to gain more power, sometimes you have to sacrifice something in return. The Penance of the Leadened Soul does just that - by sacrificing a few items to an unseen entity, you may reduce the effectiveness of some aspect of your Living Armour and get an increase in the number of upgrade points as compensation. When you construct the ritual you have to place an item frame on the top-most Blank ritual stone facing towards the Master Ritual stone, and some sort of inventory (see: chest) on top of the Dusk ritual stone. To acquire a Living Armour Downgrade, you then have to place the key item in the item frame and the consumables in the chest. Once the ritual is activated, you can sneak on top of the Master Ritual Stone at any time and acquire the downgrade.\n\tIn the case of the Quenched Living Armour Downgrade, its key item is a water bottle (placed in the item frame) and the recipe is Dragon's Breath (placed in the chest). The key item is never consumed, but the recipe is.\n\tIn order to view the recipe for the downgrades you can look them up in JEI - check the usage of the Master Ritual Stone and you will see the recipes for the Penance ritual. Also you can just check the recipe for the max level downgrade in JEI and then check the usage of the key item - the key item is always the same for the specific downgrade. guide.bloodmagic.entry.ritual.crystalSplit.info=Once Demon Will has crystalized, there is no way to split it into its many aspects - or so I've thought until now. The "Resonance of the Faceted Crystal" works by separating the many aspects inside of an unaspected (or raw) crystal cluster by using the different aspected ritual stones. \n\tIn order to use the ritual, an unaspected crystal cluster has to be placed two blocks above the Master Ritual Stone. In other words, you can place a crystallizer on top of the MRS and a crystal cluster on top of that and it should work well. Next, you must make sure that there are no blocks directly above the four elemental-based ritual stones, and then wait for the crystal cluster to grow. \n\tAfter the cluster has grown a total of five or more spires, the ritual will split these spires off and create one spire each of Corrosive, Steadfast, Vengeful, and Destructive Will on top of the aspected ritual stones. If the unaspected cluster is allowed to grow further and these new clusters remain intact, the process will repeat and more spires will be added. \n\tThe mechanism for this process is quite simple. When the Raw Will crystal has at least five spires, the ritual breaks off four of these spires and converts the Will into its more incorporeal form. This Will is then pushed threw the final spire of the cluster, which forces the different aspects of the Will into more localized clumps of the particular aspect. This Will is then gathered into the ritual stones, which act as bases for which the new aspected crystal clusters can grow from. +guide.bloodmagic.entry.ritual.portal.info=##REQ-LORE##\n\t The Gate of the Fold is a ritual made for interdimensional teleportation without the need of additional interaction. Upon activation, all blocks that touch its ritual stones are used as a key pattern to link portals together. If another Gate of the Fold with the same key exists, the rituals will be linked together and walking through instantly teleports to its twin. Only up to 2 portals with the same key can exist at the same time.\n\t Activation Cost: 50,000LP\n\t Teleportation Cost: 1,000LP (same dimension) / 10,000LP (different dimensions) +guide.bloodmagic.entry.ritual.altarBuilder.info=##REQ-LORE##\n\t The Assembly of the High Altar is a ritual to quickly construct a new altar ziggurat from the blocks in the attached inventory (usually a chest on top of the MRS).\n\tActivation Cost: 450LP\n\tCost per component placed: 75LP +guide.bloodmagic.entry.ritual.pump.info=##REQ-LORE##\n\t The Hymn of Syphoning is used to syphon liquids in world around or below the ritual into an appropiate container (for example a Blood Tank) above the MRS. Liquids in world are replaced with Stone, preventing flowing liquids that could cause performance issues.\n\tActivation Cost: 500LP\n\tCost per operation: 250LP +guide.bloodmagic.entry.ritual.cobble.info=##REQ-LORE##\n\t Got tired of making one of these primitive buildings to generate cobblestone? Got tired of having OSHA on you or accidentally extinguishing your lava source? This ritual is for you. Generate insurmountable masses of cobblestone in a fast and efficient way with future-proof blood instead of using dangerous and limited lava (unless you generate lava from blood, that is). \n\n\t This ritual generates (by default) cobblestone on top of itself which can then be mined for personal use. \n\t Activation Cost: 500LP\n\t Cost per block: 25LP +guide.bloodmagic.entry.ritual.ellipsoid.info=##REQ-LORE##\n\t The Focus of the Ellipsoid creates a hollow sphere (by default) from materials in an inventory connected to the MRS (usually a chest on top of the MRS).\n\t Activiation Cost: 20,000LP\n\t Cost per block placed: 5LP +guide.bloodmagic.entry.ritual.crystalHarvest.info=##REQ-LORE##\n\t The Crack of the Fractured Crystal breaks off all but one spire of all Demon Will Crystal Clusters in range and drops them on the ground. Combined with the ritual "Call of the Zephyr", those items cann be collected and placed into an inventory for later use.\n\t Activation Cost: 40,000LP \n\t Cost per operation: 50LP +guide.bloodmagic.entry.ritual.forsakenSoul.info=##REQ-LORE##\n\t The Gathering of the Forsaken Souls speeds up Demon Crystal growth for crystal clusters above the ritual (by default). It does not generate will on its own though and still requires the crystal clusters to have Demon Crystallizers below them. In order to do that, it utilizes a mechanic known as "uniqueness" of mobs. The more different mobs die, the more efficent the crystal growth will be. It does not itself generate Demonic Will Aura though, so you need to supply it by either feeding back crystals or putting a Tartaric Gem with will into a Demon Crucible. This should eliminate the need for going out to farm demonic will unless you fail to supply mobs to feed it and/or run out of will.\n\t Activiation Cost: 40,000LP\n\t Cost per damage tick and mob: 2LP +guide.bloodmagic.entry.ritual.animalGrowth.info=##REQ-LORE##\n\t The Ritual of the Shephard increases the speed at which animals grow significantly.\n\t It also increases the rate of breeding if supplied with Vengeful Will or make the animals capable of searching hostile mobs and explode on them if supplied with Destructive Will. In either case, if supplied with Steadfast Will, it will automatically feed the animals with food from an inventory above the MRS (by default).\n\t Activation Cost: 10,000LP\n\t Cost per operation and animal: 2LP +guide.bloodmagic.entry.ritual.livingEvolution.info=##REQ-LORE##\n\t The Ritual of the Living Evolution increases the maximum amount of upgrade points for the Living Armor set to 300. To use it, simply activate the ritual and then step on the MRS with an equipped set of Living Armor.\n\t Activiation Cost: 50,000LP +guide.bloodmagic.entry.ritual.upgradeRemove.info=##REQ-LORE##\n\t The Ritual of the Cleansing Soul removes all upgrades and downgrades from a set of Living Armor. To use it, simply activate the ritual and then step on the MRS with an equipped set of Living Armor.\n\t Activiation Cost: 50,000LP +guide.bloodmagic.entry.ritual.fullStomach.info=##REQ-LORE##\n\t The Ritual of the Satiated Stomach feeds players in its area with food from a chest above the MRS. The food is fed in an efficient manner unless the food provides more than max saturation in which case it is fed anyways.\n\t Activation Cost: 100,000\n\tCost per operation: 20LP +guide.bloodmagic.entry.ritual.eternalSoul.info=##REQ-LORE##\n\t The Cry of the Eternal Soul is capable of feeding LP from the Soul Network back into an altar. This falls under the usual restrictions of pumping (liquid) Life Essence into an altar. Every point of LP transferred into the altar costs 2 LP from the network.\n\t Activiation Cost: 2,000,000LP\n\t Cost per operation: 2*transferLP +guide.bloodmagic.entry.ritual.condor.info=##REQ-LORE##\n\t The Reverence of the Condor allows flight for players in a local area around the ritual.\n\t Activation Cost: 1,000,000LP\n\t Cost per operation: 2LP +guide.bloodmagic.entry.ritual.featheredEarth.info=##REQ-LORE##\n\t The Ritual of the Feathered Earth constantly reduces the fall height to 0, effectivly eliminating fall damage.\n\t Activation Cost: 5,000LP\n\tCost per second: 20LP +guide.bloodmagic.entry.ritual.grounding.info=##REQ-LORE##\n\ŧ The Ritual of Grounding manipulates the gravity in its area. By default, it drags mobs to the ground and prevents jumping.\n\t Supplying the ritual with Raw Will makes it affect players in addition to mobs.\n\t Corrosive Will simply disables gravity all together.\n\t Destructive Will vastly increases fall damage of affected entities.\n\t Steadfast Will allows the ritual to affect bosses.\n\t Vengeful Will alone amplifies the grounding effect, in combination with Corrosive Will, however, it transforms the ritual to provide levitation instead. Vengeful Will also increases the effect of Heavy Heart, increasing fall damage even more.\n\t Activiation Cost: 5,000LP\n\tCost per second: 20LP # Architect Entries guide.bloodmagic.entry.architect.intro=Foreword From 31c606495c276ea66cefd8a347b2e6a63c09a2d5 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 21 Jan 2019 00:20:03 +0100 Subject: [PATCH 267/493] Mark of the Falling Tower meteor costs are now configurable (#1518) * Mark of the Falling Tower meteor costs are now configurable via an additonal field "cost" in the .json config files if BM is updated from an old version, this would require meteor configuration to be regenerated or costs to be added manually; meteors would be for free (LP-wise) otherwise. These are the new default costs: IRON: 1,000,000 (same as before) GOLD: 2,500,000 DIAMOND: 5,000,000 (requires Archmage Blood Orb) * Meteor version update * Reverted Bound tool change * Probably proper preconfigured power proposition --- .../WayofTime/bloodmagic/meteor/Meteor.java | 9 ++++++ .../meteor/MeteorConfigHandler.java | 9 ++++-- .../bloodmagic/ritual/types/RitualMeteor.java | 29 +++++++++++++------ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java index f547c205..55f5728f 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java @@ -18,6 +18,7 @@ public class Meteor { private final int radius; private final int maxWeight; public int version; + public int cost = 1000000; public Meteor(ItemStack catalystStack, List components, float explosionStrength, int radius) { this.catalystStack = catalystStack; @@ -103,4 +104,12 @@ public class Meteor { public void setVersion(int version) { this.version = version; } + + public void setCost(int performCost) { + this.cost = performCost; + } + + public int getCost() { + return cost; + } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index c6e1b65c..e72de2e3 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -109,7 +109,8 @@ public class MeteorConfigHandler { ironMeteorList.add(new MeteorComponent(60, "oreLapis")); ironMeteorList.add(new MeteorComponent(100, "oreRedstone")); Meteor ironMeteor = new Meteor(new ItemStack(Blocks.IRON_BLOCK), ironMeteorList, 15, 5); - ironMeteor.setVersion(2); + ironMeteor.setVersion(3); + ironMeteor.setCost(1000000); // Gold List goldMeteorList = Lists.newArrayList(); @@ -122,7 +123,8 @@ public class MeteorConfigHandler { goldMeteorList.add(new MeteorComponent(20, "oreEmerald")); goldMeteorList.add(new MeteorComponent(20, "oreCoal")); Meteor goldMeteor = new Meteor(new ItemStack(Blocks.GOLD_BLOCK), goldMeteorList, 18, 6); - goldMeteor.setVersion(3); + goldMeteor.setVersion(4); + goldMeteor.setCost(2500000); // Diamond List diamondMeteorList = Lists.newArrayList(); @@ -134,7 +136,8 @@ public class MeteorConfigHandler { diamondMeteorList.add(new MeteorComponent(50, "oreRedstone")); diamondMeteorList.add(new MeteorComponent(400, "oreDiamond")); Meteor diamondMeteor = new Meteor(new ItemStack(Blocks.DIAMOND_BLOCK), diamondMeteorList, 10, 3); - diamondMeteor.setVersion(3); + diamondMeteor.setVersion(4); + diamondMeteor.setCost(5000000); holders.add(Pair.of("iron", ironMeteor)); DEFAULT_METEORS.put("iron", ironMeteor); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index b9dbc916..1a5258d8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -1,12 +1,13 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.meteor.Meteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; +import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -21,7 +22,7 @@ public class RitualMeteor extends Ritual { public static final double destructiveWillDrain = 50; public RitualMeteor() { - super("ritualMeteor", 0, 1000000, "ritual." + BloodMagic.MODID + ".meteorRitual"); + super("ritualMeteor", 0, 0, "ritual." + BloodMagic.MODID + ".meteorRitual"); addBlockRange(ITEM_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); setMaximumVolumeAndDistanceOfRange(ITEM_RANGE, 0, 10, 10); } @@ -53,15 +54,25 @@ public class RitualMeteor extends Ritual { for (EntityItem entityItem : itemList) { ItemStack stack = entityItem.getItem(); Meteor meteor = MeteorRegistry.getMeteorForItem(stack); - if (meteor != null) { - EntityMeteor entityMeteor = new EntityMeteor(world, pos.getX(), 260, pos.getZ(), 0, -0.1, 0, radiusModifier, explosionModifier, fillerChance); - entityMeteor.setMeteorStack(stack.copy()); - world.spawnEntity(entityMeteor); - entityItem.setDead(); + if (meteor != null) { + SoulNetwork network = masterRitualStone.getOwnerNetwork(); + int cost = meteor.getCost(); + if (currentEssence < cost) { + network.causeNausea(); + break; + } else { + network.syphon(masterRitualStone.ticket(cost)); + EntityMeteor entityMeteor = new EntityMeteor(world, pos.getX(), 260, pos.getZ(), 0, -0.1, 0, radiusModifier, explosionModifier, fillerChance); + entityMeteor.setMeteorStack(stack.copy()); + world.spawnEntity(entityMeteor); + + entityItem.setDead(); + + } if (destructiveWill >= destructiveWillDrain && currentEssence >= 1000000000) { - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(1000000)); + network.syphon(masterRitualStone.ticket(cost / 10)); } else { masterRitualStone.setActive(false); } From 399c2723d342b0477de592d41de72d41e24889b5 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 21 Jan 2019 00:24:28 +0100 Subject: [PATCH 268/493] Capable fluid sigils (#1517) * Inital commit. Water Sigil can now be used as infinite water tank item to fill machines with water (as long as you have LP) (Doesn't use LP yet). * Should now work for all fluid sigils. * Reverted Bound tool change * Moved the code out of the spacey loft IDE said it's ok... or something --- .../item/sigil/ItemSigilFluidBase.java | 52 +++++++++++- .../bloodmagic/item/sigil/ItemSigilVoid.java | 41 +++++++++- .../bloodmagic/util/ISigilFluidItem.java | 12 +++ .../bloodmagic/util/SigilFluidWrapper.java | 81 +++++++++++++++++++ 4 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java create mode 100644 src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java index 614f87f4..ac1ef35b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java @@ -1,14 +1,23 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.data.SoulTicket; +import WayofTime.bloodmagic.util.ISigilFluidItem; +import WayofTime.bloodmagic.util.SigilFluidWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; @@ -20,7 +29,7 @@ import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; import javax.annotation.Nullable; -public abstract class ItemSigilFluidBase extends ItemSigilBase { +public abstract class ItemSigilFluidBase extends ItemSigilBase implements ISigilFluidItem { //Class for sigils that interact with fluids, either creating or deleting them. //Sigils still have to define their own onRightClick behavior, but the actual fluid-interacting code is largely limited to here. public final FluidStack sigilFluid; @@ -125,4 +134,45 @@ public abstract class ItemSigilFluidBase extends ItemSigilBase { handler = new BlockWrapper(block, world, blockPos); return tryInsertSigilFluid(handler, true); } + + @Override + public FluidStack getFluid(ItemStack sigil) { + return sigilFluid; + } + + @Override + public int getCapacity(ItemStack sigil) { + return 0; + } + + @Override + public FluidStack drain(ItemStack sigil, int maxDrain, boolean doDrain) { + Binding binding = getBinding(sigil); + + if (binding == null) + return null; + + SoulNetwork network = NetworkHelper.getSoulNetwork(binding); + + if (network.getCurrentEssence() < getLpUsed()) { + network.causeNausea(); + return null; + } + + if (doDrain) + network.syphon(SoulTicket.item(sigil, getLpUsed())); + + return sigilFluid; + } + + @Override + public int fill(ItemStack sigil, FluidStack resource, boolean doFill) { + return 0; + } + + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + return new SigilFluidWrapper(stack, this); + } + } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 702e692c..8b321eb4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; @@ -12,6 +14,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; public class ItemSigilVoid extends ItemSigilFluidBase { @@ -52,7 +55,43 @@ public class ItemSigilVoid extends ItemSigilFluidBase { } } } - return super.onItemRightClick(world, player, hand); } + + @Override + public FluidStack getFluid(ItemStack sigil) { + return null; + } + + @Override + public int getCapacity(ItemStack sigil) { + return 10000; + } + + @Override + public int fill(ItemStack sigil, FluidStack resource, boolean doFill) { + if (resource == null || resource.amount <= 0) + return 0; + + Binding binding = getBinding(sigil); + + if (binding == null) + return 0; + + int capacity = getCapacity(sigil); + + if (!doFill) + return Math.min(capacity, resource.amount); + + SoulNetwork network = NetworkHelper.getSoulNetwork(binding); + + if (network.getCurrentEssence() < getLpUsed()) { + network.causeNausea(); + return 0; + } + + network.syphon(SoulTicket.item(sigil, getLpUsed())); + return Math.min(capacity, resource.amount); + } } + diff --git a/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java b/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java new file mode 100644 index 00000000..920b21de --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java @@ -0,0 +1,12 @@ +package WayofTime.bloodmagic.util; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public interface ISigilFluidItem { + FluidStack getFluid(ItemStack sigil); + int getCapacity(ItemStack sigil); + + int fill(ItemStack sigil, FluidStack resource, boolean doFill); + FluidStack drain(ItemStack sigil, int maxDrain, boolean doDrain); +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java b/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java new file mode 100644 index 00000000..51319174 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java @@ -0,0 +1,81 @@ +package WayofTime.bloodmagic.util; + +import WayofTime.bloodmagic.item.sigil.ItemSigilFluidBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankProperties; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; +import net.minecraftforge.fluids.capability.IFluidTankProperties; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class SigilFluidWrapper implements ICapabilityProvider { + + final ItemStack stack; + final ItemSigilFluidBase sigil; + final boolean canFill; + final boolean canDrain; + + public SigilFluidWrapper(ItemStack stackIn, ItemSigilFluidBase fluidSigil) { + stack = stackIn; + sigil = fluidSigil; + canFill = true; + canDrain = true; + } + + public SigilFluidWrapper(ItemStack stackIn, ItemSigilFluidBase fluidSigil, boolean canFillIn, boolean canDrainIn) { + stack = stackIn; + sigil = fluidSigil; + canFill = canFillIn; + canDrain = canDrainIn; + } + + @Override + public boolean hasCapability(Capability capability, EnumFacing from) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY; + } + + @Override + public T getCapability(Capability capability, final EnumFacing from) { + if (!hasCapability(capability, from)) { + return null; + } + return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.cast(new IFluidHandlerItem() { + + @Override + public IFluidTankProperties[] getTankProperties() { + return new IFluidTankProperties[]{new FluidTankProperties(sigil.getFluid(stack), sigil.getCapacity(stack), canFill, canDrain)}; + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + return 0; + } + + @Nullable + @Override + public FluidStack drain(FluidStack resource, boolean doDrain) { + return sigil.drain(stack, resource.amount, doDrain); + } + + @Nullable + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + return sigil.drain(stack, maxDrain, doDrain); + } + + @Nonnull + @Override + public ItemStack getContainer() { + return stack; + } + + }); + } + +} \ No newline at end of file From 415d3f1f4284bbd62a0239abbfa274dbbe16daca Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Tue, 22 Jan 2019 00:06:38 +0100 Subject: [PATCH 269/493] Fixed RitualReader (RitualTinkerer) area setting ability. (#1505) * Fixed RitualReader (RitualTinkerer) area setting ability. Signed-off-by: tobias * Update TileMasterRitualStone.java * Interface tidied up --- .../bloodmagic/ritual/IMasterRitualStone.java | 10 +++ .../WayofTime/bloodmagic/ritual/Ritual.java | 16 +---- .../ritual/types/RitualAnimalGrowth.java | 4 +- .../ritual/types/RitualArmourEvolve.java | 2 +- .../ritual/types/RitualCobblestone.java | 2 +- .../bloodmagic/ritual/types/RitualCondor.java | 4 +- .../ritual/types/RitualContainment.java | 2 +- .../ritual/types/RitualCrushing.java | 4 +- .../ritual/types/RitualCrystalHarvest.java | 2 +- .../ritual/types/RitualEllipsoid.java | 4 +- .../ritual/types/RitualExpulsion.java | 2 +- .../ritual/types/RitualFeatheredKnife.java | 4 +- .../ritual/types/RitualFelling.java | 4 +- .../ritual/types/RitualForsakenSoul.java | 4 +- .../ritual/types/RitualFullStomach.java | 4 +- .../ritual/types/RitualGreenGrove.java | 6 +- .../ritual/types/RitualHarvest.java | 2 +- .../ritual/types/RitualInterdiction.java | 2 +- .../ritual/types/RitualJumping.java | 2 +- .../bloodmagic/ritual/types/RitualLava.java | 10 +-- .../types/RitualLivingArmourDowngrade.java | 2 +- .../ritual/types/RitualMagnetic.java | 2 +- .../bloodmagic/ritual/types/RitualMeteor.java | 2 +- .../bloodmagic/ritual/types/RitualPlacer.java | 4 +- .../bloodmagic/ritual/types/RitualPump.java | 2 +- .../ritual/types/RitualRegeneration.java | 4 +- .../bloodmagic/ritual/types/RitualSpeed.java | 2 +- .../ritual/types/RitualSuppression.java | 2 +- .../ritual/types/RitualUpgradeRemove.java | 2 +- .../bloodmagic/ritual/types/RitualWater.java | 2 +- .../ritual/types/RitualWellOfSuffering.java | 2 +- .../bloodmagic/ritual/types/RitualZephyr.java | 4 +- .../tile/TileMasterRitualStone.java | 64 ++++++++++++++----- 33 files changed, 106 insertions(+), 78 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index eb61019c..2fec7fa8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -9,7 +9,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.UUID; /** @@ -22,6 +24,8 @@ public interface IMasterRitualStone { SoulNetwork getOwnerNetwork(); + Map modableRangeMap = new HashMap<>(); + boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual); void performRitual(World world, BlockPos pos); @@ -61,4 +65,10 @@ public interface IMasterRitualStone { default SoulTicket ticket(int amount) { return SoulTicket.block(getWorldObj(), getBlockPos(), amount); } + + AreaDescriptor getBlockRange(String range); + + void addBlockRanges(Map blockRanges); + + void addBlockRange(String range, AreaDescriptor defaultRange); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index be545f56..7e642e6c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.*; import java.util.Map.Entry; +import java.util.function.BiFunction; import java.util.function.Consumer; /** @@ -185,20 +186,7 @@ public abstract class Ritual { return rangeList.get(0); } - public boolean setBlockRangeByBounds(String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) { - AreaDescriptor descriptor = this.getBlockRange(range); - World world = master.getWorldObj(); - BlockPos masterPos = master.getBlockPos(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, masterPos); - if (canBlockRangeBeModified(range, descriptor, master, offset1, offset2, holder)) { - descriptor.modifyAreaByBlockPositions(offset1, offset2); - return true; - } - - return false; - } - - protected boolean canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) { + public boolean canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) { List willConfig = master.getActiveWillConfig(); int maxVolume = getMaxVolumeForRange(range, willConfig, holder); int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index 401398cc..f92b2db3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -56,7 +56,7 @@ public class RitualAnimalGrowth extends Ritual { int totalGrowths = 0; BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity chest = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); IItemHandler itemHandler = null; if (chest != null) { @@ -83,7 +83,7 @@ public class RitualAnimalGrowth extends Ritual { boolean breedAnimals = steadfastWill >= steadfastWillDrain && itemHandler != null; boolean kamikaze = destructiveWill >= destructiveWillDrain; - AreaDescriptor growingRange = getBlockRange(GROWTH_RANGE); + AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROWTH_RANGE); AxisAlignedBB axis = growingRange.getAABB(masterRitualStone.getBlockPos()); List animalList = world.getEntitiesWithinAABB(EntityAnimal.class, axis); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index 175069ea..77251191 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -33,7 +33,7 @@ public class RitualArmourEvolve extends Ritual { BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor checkRange = getBlockRange(CHECK_RANGE); + AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos)); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index f9d0d6e9..34321638 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -37,7 +37,7 @@ public class RitualCobblestone extends Ritual { int maxEffects = currentEssence / getRefreshCost(); int totalEffects = 0; - AreaDescriptor cobblestoneRange = getBlockRange(COBBLESTONE_RANGE); + AreaDescriptor cobblestoneRange = masterRitualStone.getBlockRange(COBBLESTONE_RANGE); if (tileEntity != null && tileEntity instanceof TileAlchemyArray) { TileAlchemyArray alchemyArray = (TileAlchemyArray) tileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java index bc4232c0..a7f4b618 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java @@ -24,7 +24,7 @@ public class RitualCondor extends Ritual { @Override public void performRitual(IMasterRitualStone masterRitualStone) { - AxisAlignedBB aabb = getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()).expand(-10, 0, -10); + AxisAlignedBB aabb = masterRitualStone.getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()).expand(-10, 0, -10); World world = masterRitualStone.getWorldObj(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); @@ -52,7 +52,7 @@ public class RitualCondor extends Ritual { @Override public int getRefreshCost() { - return getBlockRange(FLIGHT_RANGE).getVolume() / 10000; // cost of 2 LP per second per player with default configuration + return 5; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java index 51c8432e..a8224955 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java @@ -29,7 +29,7 @@ public class RitualContainment extends Ritual { return; } - AreaDescriptor containmentRange = getBlockRange(CONTAINMENT_RANGE); + AreaDescriptor containmentRange = masterRitualStone.getBlockRange(CONTAINMENT_RANGE); for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) { if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 49940c87..2d56e16f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -70,7 +70,7 @@ public class RitualCrushing extends Ritual { } BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); if (tile != null && Utils.getNumberOfFreeSlots(tile, EnumFacing.DOWN) < 1) { @@ -94,7 +94,7 @@ public class RitualCrushing extends Ritual { int fortune = destructiveWill > 0 ? 3 : 0; - AreaDescriptor crushingRange = getBlockRange(CRUSHING_RANGE); + AreaDescriptor crushingRange = masterRitualStone.getBlockRange(CRUSHING_RANGE); boolean hasOperated = false; double rawDrain = 0; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java index a28c8433..7382f09f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java @@ -35,7 +35,7 @@ public class RitualCrystalHarvest extends Ritual { int maxEffects = 1; int totalEffects = 0; - AreaDescriptor crystalRange = getBlockRange(CRYSTAL_RANGE); + AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE); crystalRange.resetIterator(); while (crystalRange.hasNext()) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index 636e5806..ad04ccfd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -42,7 +42,7 @@ public class RitualEllipsoid extends Ritual int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); if (currentEssence < getRefreshCost()) @@ -51,7 +51,7 @@ public class RitualEllipsoid extends Ritual return; } - AreaDescriptor sphereRange = getBlockRange(SPHEROID_RANGE); + AreaDescriptor sphereRange = masterRitualStone.getBlockRange(SPHEROID_RANGE); AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos); int minX = (int) (masterPos.getX() - sphereBB.minX); int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java index 1294ea4f..358925b5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java @@ -48,7 +48,7 @@ public class RitualExpulsion extends Ritual { if (masterRitualStone.getWorldObj().isRemote) return; - AreaDescriptor expulsionRange = getBlockRange(EXPULSION_RANGE); + AreaDescriptor expulsionRange = masterRitualStone.getBlockRange(EXPULSION_RANGE); List whitelist = Lists.newArrayList(); BlockPos masterPos = masterRitualStone.getBlockPos(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index eae72593..7706e112 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -80,7 +80,7 @@ public class RitualFeatheredKnife extends Ritual { TileEntity tile = world.getTileEntity(altarPos); - AreaDescriptor altarRange = getBlockRange(ALTAR_RANGE); + AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof IBloodAltar)) { for (BlockPos newPos : altarRange.getContainedPositions(pos)) { @@ -100,7 +100,7 @@ public class RitualFeatheredKnife extends Ritual { if (tile instanceof IBloodAltar) { IBloodAltar tileAltar = (IBloodAltar) tile; - AreaDescriptor damageRange = getBlockRange(DAMAGE_RANGE); + AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); AxisAlignedBB range = damageRange.getAABB(pos); double destructiveDrain = 0; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java index 6e1f01e1..c116c0b5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java @@ -46,7 +46,7 @@ public class RitualFelling extends Ritual { int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); if (currentEssence < getRefreshCost()) { @@ -55,7 +55,7 @@ public class RitualFelling extends Ritual { } if (!cached || treePartsCache.isEmpty()) { - for (BlockPos blockPos : getBlockRange(FELLING_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { + for (BlockPos blockPos : masterRitualStone.getBlockRange(FELLING_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { if (!treePartsCache.contains(blockPos)) if (!world.isAirBlock(blockPos) && (world.getBlockState(blockPos).getBlock().isWood(world, blockPos) || world.getBlockState(blockPos).getBlock().isLeaves(world.getBlockState(blockPos), world, blockPos))) { treePartsCache.add(blockPos); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index 7caf6c88..ea908c27 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -86,7 +86,7 @@ public class RitualForsakenSoul extends Ritual { List crystalList = new ArrayList<>(); - AreaDescriptor crystalRange = getBlockRange(CRYSTAL_RANGE); + AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE); crystalRange.resetIterator(); while (crystalRange.hasNext()) { @@ -97,7 +97,7 @@ public class RitualForsakenSoul extends Ritual { } } - AreaDescriptor damageRange = getBlockRange(DAMAGE_RANGE); + AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); AxisAlignedBB range = damageRange.getAABB(pos); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, range); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java index b803b810..0618d119 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java @@ -39,14 +39,14 @@ public class RitualFullStomach extends Ritual { int maxEffects = currentEssence / getRefreshCost(); int totalEffects = 0; - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); if (tile == null || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) return; IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); int lastSlot = 0; - AreaDescriptor fillingRange = getBlockRange(FILL_RANGE); + AreaDescriptor fillingRange = masterRitualStone.getBlockRange(FILL_RANGE); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos)); for (EntityPlayer player : playerList) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index d8cdf397..19bd678b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -80,7 +80,7 @@ public class RitualGreenGrove extends Ritual { double rawDrain = 0; double vengefulDrain = 0; - AreaDescriptor growingRange = getBlockRange(GROW_RANGE); + AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROW_RANGE); int maxGrowthVolume = getMaxVolumeForRange(GROW_RANGE, willConfig, holder); if (!growingRange.isWithinRange(getMaxVerticalRadiusForRange(GROW_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(GROW_RANGE, willConfig, holder)) || (maxGrowthVolume != 0 && growingRange.getVolume() > maxGrowthVolume)) { @@ -126,7 +126,7 @@ public class RitualGreenGrove extends Ritual { WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); } - AreaDescriptor hydrateRange = getBlockRange(HYDRATE_RANGE); + AreaDescriptor hydrateRange = masterRitualStone.getBlockRange(HYDRATE_RANGE); double steadfastDrain = 0; if (steadfastWill > steadfastWillDrain) { @@ -167,7 +167,7 @@ public class RitualGreenGrove extends Ritual { double corrosiveDrain = 0; if (corrosiveWill > corrosiveWillDrain) { - AreaDescriptor leechRange = getBlockRange(LEECH_RANGE); + AreaDescriptor leechRange = masterRitualStone.getBlockRange(LEECH_RANGE); AxisAlignedBB mobArea = leechRange.getAABB(pos); List entityList = world.getEntitiesWithinAABB(EntityLivingBase.class, mobArea); for (EntityLivingBase entityLiving : entityList) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index fed3bb5b..78722805 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -52,7 +52,7 @@ public class RitualHarvest extends Ritual { int harvested = 0; - AreaDescriptor harvestArea = getBlockRange(HARVEST_RANGE); + AreaDescriptor harvestArea = masterRitualStone.getBlockRange(HARVEST_RANGE); harvestArea.resetIterator(); while (harvestArea.hasNext()) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java index 861b2f32..a1a38ea0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java @@ -29,7 +29,7 @@ public class RitualInterdiction extends Ritual { return; } - AreaDescriptor interdictionRange = getBlockRange(INTERDICTION_RANGE); + AreaDescriptor interdictionRange = masterRitualStone.getBlockRange(INTERDICTION_RANGE); for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) { if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index 975f84d7..0321bd79 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -34,7 +34,7 @@ public class RitualJumping extends Ritual { int maxEffects = currentEssence / getRefreshCost(); int totalEffects = 0; - AreaDescriptor jumpRange = getBlockRange(JUMP_RANGE); + AreaDescriptor jumpRange = masterRitualStone.getBlockRange(JUMP_RANGE); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, jumpRange.getAABB(masterRitualStone.getBlockPos())); for (EntityLivingBase entity : entities) { if (totalEffects >= maxEffects) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index e7e064a8..b247bcab 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -76,7 +76,7 @@ public class RitualLava extends Ritual { double rawDrained = 0; DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - AreaDescriptor lavaRange = getBlockRange(LAVA_RANGE); + AreaDescriptor lavaRange = masterRitualStone.getBlockRange(LAVA_RANGE); int maxLavaVolume = getMaxVolumeForRange(LAVA_RANGE, willConfig, holder); if (!lavaRange.isWithinRange(getMaxVerticalRadiusForRange(LAVA_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(LAVA_RANGE, willConfig, holder)) || (maxLavaVolume != 0 && lavaRange.getVolume() > maxLavaVolume)) { @@ -102,7 +102,7 @@ public class RitualLava extends Ritual { } if (rawWill > 0) { - AreaDescriptor chestRange = getBlockRange(LAVA_TANK_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(LAVA_TANK_RANGE); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); double drain = getWillCostForRawWill(rawWill); int lpCost = getLPCostForRawWill(rawWill); @@ -131,7 +131,7 @@ public class RitualLava extends Ritual { if (vengefulWill >= vengefulWillDrain) { double vengefulDrained = 0; - AreaDescriptor fuseRange = getBlockRange(FIRE_FUSE_RANGE); + AreaDescriptor fuseRange = masterRitualStone.getBlockRange(FIRE_FUSE_RANGE); AxisAlignedBB fuseArea = fuseRange.getAABB(pos); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, fuseArea); @@ -160,7 +160,7 @@ public class RitualLava extends Ritual { if (steadfastWill >= steadfastWillDrain) { double steadfastDrained = 0; - AreaDescriptor resistRange = getBlockRange(FIRE_RESIST_RANGE); + AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_RESIST_RANGE); int duration = getFireResistForWill(steadfastWill); @@ -186,7 +186,7 @@ public class RitualLava extends Ritual { if (timer % corrosiveRefreshTime == 0 && corrosiveWill >= corrosiveWillDrain) { double corrosiveDrained = 0; - AreaDescriptor resistRange = getBlockRange(FIRE_DAMAGE_RANGE); + AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_DAMAGE_RANGE); float damage = getCorrosiveDamageForWill(corrosiveWill); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index 35aa10ba..ea2da47c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -49,7 +49,7 @@ public class RitualLivingArmourDowngrade extends Ritual { BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor downgradeRange = getBlockRange(DOWNGRADE_RANGE); + AreaDescriptor downgradeRange = masterRitualStone.getBlockRange(DOWNGRADE_RANGE); boolean isActivatorPresent = false; for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index 1ad109a9..108b7c50 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -46,7 +46,7 @@ public class RitualMagnetic extends Ritual { BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor placementRange = getBlockRange(PLACEMENT_RANGE); + AreaDescriptor placementRange = masterRitualStone.getBlockRange(PLACEMENT_RANGE); BlockPos replacement = pos; boolean replace = false; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 1a5258d8..9cffa010 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -42,7 +42,7 @@ public class RitualMeteor extends Ritual { double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - AreaDescriptor itemDetectionRange = getBlockRange(ITEM_RANGE); + AreaDescriptor itemDetectionRange = masterRitualStone.getBlockRange(ITEM_RANGE); List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDetectionRange.getAABB(pos)); double radiusModifier = getRadiusModifier(rawWill); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java index 90469c94..5407b258 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java @@ -33,7 +33,7 @@ public class RitualPlacer extends Ritual { public void performRitual(IMasterRitualStone masterRitualStone) { World world = masterRitualStone.getWorldObj(); BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tileEntity = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); @@ -43,7 +43,7 @@ public class RitualPlacer extends Ritual { return; } - AreaDescriptor areaDescriptor = getBlockRange(PLACER_RANGE); + AreaDescriptor areaDescriptor = masterRitualStone.getBlockRange(PLACER_RANGE); if (tileEntity != null) { if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index c713721a..957145c0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -56,7 +56,7 @@ public class RitualPump extends Ritual { if (fluidHandler.getTankProperties()[0].getContents() != null && fluidHandler.getTankProperties()[0].getContents().amount >= maxDrain) return; - for (BlockPos pos : getBlockRange(PUMP_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { + for (BlockPos pos : masterRitualStone.getBlockRange(PUMP_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { IBlockState state = world.getBlockState(pos); IFluidHandler blockHandler = null; if (state.getBlock() instanceof BlockLiquid) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index 1f431459..50db44a2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -71,10 +71,10 @@ public class RitualRegeneration extends Ritual { float absorptionRate = 1; int maxAbsorption = 20; - AreaDescriptor healArea = getBlockRange(HEAL_RANGE); + AreaDescriptor healArea = masterRitualStone.getBlockRange(HEAL_RANGE); AxisAlignedBB healRange = healArea.getAABB(pos); - AreaDescriptor damageArea = getBlockRange(VAMPIRE_RANGE); + AreaDescriptor damageArea = masterRitualStone.getBlockRange(VAMPIRE_RANGE); AxisAlignedBB damageRange = damageArea.getAABB(pos); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, healRange); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index c40fb66a..5a1eb618 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -50,7 +50,7 @@ public class RitualSpeed extends Ritual { double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - AreaDescriptor speedRange = getBlockRange(SPEED_RANGE); + AreaDescriptor speedRange = masterRitualStone.getBlockRange(SPEED_RANGE); double vengefulDrain = 0; double destructiveDrain = 0; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java index 5934ab9f..bbf02e04 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java @@ -31,7 +31,7 @@ public class RitualSuppression extends Ritual { } final int refresh = 100; - AreaDescriptor suppressionRange = getBlockRange(SUPPRESSION_RANGE); + AreaDescriptor suppressionRange = masterRitualStone.getBlockRange(SUPPRESSION_RANGE); for (BlockPos blockPos : suppressionRange.getContainedPositions(masterRitualStone.getBlockPos())) { IBlockState state = world.getBlockState(blockPos); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index ba9d5a04..c8e210ef 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -40,7 +40,7 @@ public class RitualUpgradeRemove extends Ritual { BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor checkRange = getBlockRange(CHECK_RANGE); + AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos)); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java index c4f7d6b1..27a7b7fd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java @@ -31,7 +31,7 @@ public class RitualWater extends Ritual { int maxEffects = currentEssence / getRefreshCost(); int totalEffects = 0; - AreaDescriptor waterRange = getBlockRange(WATER_RANGE); + AreaDescriptor waterRange = masterRitualStone.getBlockRange(WATER_RANGE); for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos())) { if (world.isAirBlock(newPos)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 7a27fce3..302af3cd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -53,7 +53,7 @@ public class RitualWellOfSuffering extends Ritual { TileEntity tile = world.getTileEntity(altarPos); - AreaDescriptor altarRange = getBlockRange(ALTAR_RANGE); + AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) { for (BlockPos newPos : altarRange.getContainedPositions(pos)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java index 9935e162..1690ac88 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java @@ -32,7 +32,7 @@ public class RitualZephyr extends Ritual { World world = masterRitualStone.getWorldObj(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); if (!masterRitualStone.getWorldObj().isRemote && tileInventory != null) { if (currentEssence < getRefreshCost()) { @@ -40,7 +40,7 @@ public class RitualZephyr extends Ritual { return; } - AreaDescriptor zephyrRange = getBlockRange(ZEPHYR_RANGE); + AreaDescriptor zephyrRange = masterRitualStone.getBlockRange(ZEPHYR_RANGE); List itemList = world.getEntitiesWithinAABB(EntityItem.class, zephyrRange.getAABB(masterRitualStone.getBlockPos())); int count = 0; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 510e8932..1383ae47 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -2,7 +2,10 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.ritual.AreaDescriptor; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.RitualEvent; import WayofTime.bloodmagic.ritual.IMasterRitualStone; @@ -25,9 +28,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import java.awt.geom.Area; +import java.util.*; public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone { private UUID owner; @@ -40,6 +42,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS private EnumFacing direction = EnumFacing.NORTH; private boolean inverted; private List currentActiveWillConfig = new ArrayList<>(); + protected final Map modableRangeMap = new HashMap<>(); @Override public void onUpdate() { @@ -157,6 +160,9 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS this.cachedNetwork = network; this.currentRitual = ritual; + if(!checkBlockRanges(ritual.getModableRangeMap())) + addBlockRanges(ritual.getModableRangeMap()); + notifyUpdate(); return true; } @@ -298,22 +304,14 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public void setActiveWillConfig(EntityPlayer player, List typeList) { this.currentActiveWillConfig = typeList; } - + @Override public boolean setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2) { - if (this.currentRitual != null) { - boolean allowed = this.currentRitual.setBlockRangeByBounds(range, this, offset1, offset2); - if (player != null && !allowed) { - ChatUtil.sendNoSpam(player, this.currentRitual.getErrorForBlockRangeOnFail(player, range, this, offset1, offset2)); - } else { - ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.blockRange.success")); - } - - return allowed; - } - - if (player != null) { - ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.blockRange.inactive")); + AreaDescriptor descriptor = this.getBlockRange(range); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos()); + if (this.currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder)) { + descriptor.modifyAreaByBlockPositions(offset1, offset2); + return true; } return false; @@ -408,4 +406,36 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public void setCurrentActiveWillConfig(List currentActiveWillConfig) { this.currentActiveWillConfig = currentActiveWillConfig; } + + /** + * Used to grab the range of a ritual for a given effect. + * + * @param range - Range that needs to be pulled. + * @return - + */ + public AreaDescriptor getBlockRange(String range) { + if (modableRangeMap.containsKey(range)) { + return modableRangeMap.get(range); + } + + return null; + } + + public void addBlockRange(String range, AreaDescriptor defaultRange) { + modableRangeMap.put(range, defaultRange); + } + + public void addBlockRanges(Map blockRanges){ + for (Map.Entry entry : blockRanges.entrySet()) { + modableRangeMap.put(entry.getKey(), entry.getValue()); + } + } + + public boolean checkBlockRanges(Map blockRanges){ + for (Map.Entry entry : blockRanges.entrySet()) { + if (modableRangeMap.get(entry.getKey()) == null) + return false; + } + return true; + } } From 9af6b4fbfaa3c5d382a5a1f97c34679e63818bb5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 21 Jan 2019 15:18:34 -0800 Subject: [PATCH 270/493] Remove unnecessary field declaration from IMasterRitualStone --- .../java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index 2fec7fa8..8f338258 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -9,7 +9,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -24,8 +23,6 @@ public interface IMasterRitualStone { SoulNetwork getOwnerNetwork(); - Map modableRangeMap = new HashMap<>(); - boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual); void performRitual(World world, BlockPos pos); From e001943c41dd16786d643e3e91243ef5d9f3b80a Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Tue, 22 Jan 2019 19:09:08 +0100 Subject: [PATCH 271/493] Seer Sigil can now be used in place of divination sigil in additon to it's own functions for HUD elements (#1527) (not sure if there might be edge cases that it tries to display both the divination sigil and seer sigil information at the same time (as could be possible for the blood altar), however it doesn't seem to be the case as removing elements from blood_altar_adv removes them from the seer sigil view) --- .../client/hud/element/ElementDivinedInformation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java index 8563e015..c072b646 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -25,13 +25,13 @@ public abstract class ElementDivinedInformation extends El ItemStack sigilStack = player.getHeldItem(EnumHand.MAIN_HAND); boolean flag = false; if (simple) { - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION) + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; else flag = isFlagSigilHolding(sigilStack, true); if (!flag) { sigilStack = player.getHeldItem(EnumHand.OFF_HAND); - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION) + if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; else flag = isFlagSigilHolding(sigilStack, true); } From 74436a1338cc8b3033610b4be04d409adbf2350c Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Wed, 23 Jan 2019 04:34:03 +0100 Subject: [PATCH 272/493] This should do it but I would like you to test it again just in case (not sure if I would have gotten the NPE to begin with) (#1522) --- .../tile/TileMasterRitualStone.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 1383ae47..e21ff121 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,22 +1,22 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.RitualEvent; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.item.ItemActivationCrystal; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.helper.*; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.tile.base.TileTicking; import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.*; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,7 +28,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import javax.annotation.Nullable; -import java.awt.geom.Area; import java.util.*; public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone { @@ -184,11 +183,14 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public void performRitual(World world, BlockPos pos) { if (!world.isRemote && getCurrentRitual() != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(currentRitual), false)) { if (RitualHelper.checkValidRitual(getWorld(), getPos(), currentRitual, getDirection())) { - RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), getCurrentRitual()); + Ritual ritual = getCurrentRitual(); + RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), ritual); if (MinecraftForge.EVENT_BUS.post(event)) return; + if (!checkBlockRanges(ritual.getModableRangeMap())) + addBlockRanges(ritual.getModableRangeMap()); getCurrentRitual().performRitual(this); } else { stopRitual(Ritual.BreakType.BREAK_STONE); From 3751a5193583ed7369e27cdcbe8c398353a9f3e6 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Wed, 23 Jan 2019 19:04:25 +0100 Subject: [PATCH 273/493] Fixed Ritual area (#1532) --- .../java/WayofTime/bloodmagic/ritual/types/RitualCondor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java index a7f4b618..36d31b14 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java @@ -18,13 +18,13 @@ public class RitualCondor extends Ritual { public RitualCondor() { super("ritualCondor", 0, 1000000, "ritual." + BloodMagic.MODID + ".condorRitual"); - addBlockRange(FLIGHT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), new BlockPos(10, 30, 10))); + addBlockRange(FLIGHT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, 0, -10), new BlockPos(10, 30, 10))); setMaximumVolumeAndDistanceOfRange(FLIGHT_RANGE, 0, 100, 200); } @Override public void performRitual(IMasterRitualStone masterRitualStone) { - AxisAlignedBB aabb = masterRitualStone.getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()).expand(-10, 0, -10); + AxisAlignedBB aabb = masterRitualStone.getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()); World world = masterRitualStone.getWorldObj(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); From 5b4e624d443a76820779960c40e52f4249164f1b Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 01:22:00 +0100 Subject: [PATCH 274/493] Make Movement & Updraft arrays stronger by adding more of their ingredients! (#1520) * Make Movement & Updraft arrays stronger by adding more of their ingredients! Reduced base motion for Movement & Updraft arrays * Reverted Bound Tool change * Readability & using tailored methods --- .../AlchemyArrayEffectMovement.java | 10 ++++++- .../AlchemyArrayEffectUpdraft.java | 8 +++++- .../bloodmagic/block/BlockAlchemyArray.java | 27 +++++++++++++++++-- .../bloodmagic/tile/TileAlchemyArray.java | 17 +++++++----- 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java index 3bf96427..92728c9d 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.IAlchemyArray; +import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; @@ -22,8 +23,15 @@ public class AlchemyArrayEffectMovement extends AlchemyArrayEffect { @Override public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { double motionY = 0.5; - double speed = 3; + double motionYGlowstoneMod = 0.05; + double speed = 1.5; + double speedRedstoneMod = 0.15; + EnumFacing direction = array.getRotation(); + TileAlchemyArray tileArray = (TileAlchemyArray) array; + + motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); + speed += speedRedstoneMod * (tileArray.getStackInSlot(1).getCount() - 1); entity.motionY = motionY; entity.fallDistance = 0; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java index f2cb4612..c73d7da1 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.IAlchemyArray; +import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; @@ -20,9 +21,14 @@ public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect { @Override public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { - double motionY = 1.5; + double motionY = 1; + double motionYGlowstoneMod = 0.1; + double motionYFeatherMod = 0.05; entity.fallDistance = 0; + TileAlchemyArray tileArray = (TileAlchemyArray) array; + motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); // Glowstone Dust + motionY += motionYFeatherMod * (tileArray.getStackInSlot(1).getCount() - 1); // Feathers entity.motionY = motionY; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 1e02ef13..4f706b6f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -1,6 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.util.Utils; @@ -9,6 +11,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; @@ -88,11 +91,16 @@ public class BlockAlchemyArray extends Block { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - //TODO: Right click should rotate it TileAlchemyArray array = (TileAlchemyArray) world.getTileEntity(pos); - if (array == null || player.isSneaking()) + if (array == null) return false; + if (player.isSneaking() && array.rotateCooldown == 0) { + array.setRotation(array.getRotation().rotateY()); + array.rotateCooldown = 5; + world.notifyBlockUpdate(pos, state, state, 3); + return false; + } ItemStack playerItem = player.getHeldItem(hand); @@ -105,6 +113,21 @@ public class BlockAlchemyArray extends Block { } else { return true; } + if (array.arrayEffect instanceof AlchemyArrayEffectMovement && (playerItem.getItem() == Items.REDSTONE || playerItem.getItem() == Items.FEATHER) + || array.arrayEffect instanceof AlchemyArrayEffectUpdraft && (playerItem.getItem() == Items.FEATHER || playerItem.getItem() == Items.GLOWSTONE_DUST)) { + for (int i = 0; i < array.getSizeInventory(); i++) { + ItemStack stack = array.getStackInSlot(i); + if (ItemStack.areItemsEqual(stack, playerItem)) { + if (stack.getCount() < 127) { + stack.setCount(stack.getCount() + 1); + playerItem.shrink(1); + } + break; + } + } + world.notifyBlockUpdate(pos, state, state, 3); + return true; + } } world.notifyBlockUpdate(pos, state, state, 3); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index c1c82c2c..828f2891 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,5 +1,12 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.iface.IAlchemyArray; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -9,19 +16,13 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.iface.IAlchemyArray; -import WayofTime.bloodmagic.util.Constants; public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray { public boolean isActive = false; public int activeCounter = 0; public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; + public int rotateCooldown = 0; private String key = "empty"; public AlchemyArrayEffect arrayEffect; @@ -110,6 +111,8 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche arrayEffect = null; key = "empty"; } + if (rotateCooldown > 0) + rotateCooldown--; } /** From 05446742efad6a70530e101957d0097005e7cff2 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 01:25:18 +0100 Subject: [PATCH 275/493] Ported RitualDismantler (#1499) * Ported RitualDismantler Signed-off-by: tobias * Added Hellfire Forge recipe Destructive Will Crystal, Destructive Will Crystal, Ritual Diviner (default), Weak Blood Shard Requires a minimum of 500 will and consumes 100 will to craft * Changed costs (lazy proposal): - 50 LP per normal Ritual Stone - discount cost of 200 LP for a whole ritual (smallest ritual has 4 ritual stones) - 100 LP for an MRS --- .../core/RegistrarBloodMagicItems.java | 103 +++++------------- .../core/RegistrarBloodMagicRecipes.java | 1 + .../bloodmagic/item/ItemRitualDismantler.java | 78 +++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 1 + .../models/item/ritual_dismantler.json | 6 + 5 files changed, 111 insertions(+), 78 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java create mode 100644 src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index fd76818f..e45190fb 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -1,11 +1,28 @@ package WayofTime.bloodmagic.core; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.block.IBMBlock; +import WayofTime.bloodmagic.client.IMeshProvider; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.*; +import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; +import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.item.armour.ItemSentientArmour; +import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; +import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; +import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter; +import WayofTime.bloodmagic.item.routing.ItemNodeRouter; +import WayofTime.bloodmagic.item.routing.ItemRouterFilter; +import WayofTime.bloodmagic.item.sigil.*; +import WayofTime.bloodmagic.item.soul.*; +import WayofTime.bloodmagic.item.soulBreath.ItemFlightScroll; +import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.item.types.ShardType; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; - -import java.util.List; -import java.util.Set; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; @@ -20,81 +37,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.IBMBlock; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.ItemActivationCrystal; -import WayofTime.bloodmagic.item.ItemAlchemicVial; -import WayofTime.bloodmagic.item.ItemAltarMaker; -import WayofTime.bloodmagic.item.ItemArcaneAshes; -import WayofTime.bloodmagic.item.ItemBloodOrb; -import WayofTime.bloodmagic.item.ItemBoundAxe; -import WayofTime.bloodmagic.item.ItemBoundPickaxe; -import WayofTime.bloodmagic.item.ItemBoundShovel; -import WayofTime.bloodmagic.item.ItemBoundSword; -import WayofTime.bloodmagic.item.ItemDaggerOfSacrifice; -import WayofTime.bloodmagic.item.ItemDemonCrystal; -import WayofTime.bloodmagic.item.ItemDemonWillGauge; -import WayofTime.bloodmagic.item.ItemEnum; -import WayofTime.bloodmagic.item.ItemExperienceBook; -import WayofTime.bloodmagic.item.ItemInscriptionTool; -import WayofTime.bloodmagic.item.ItemLavaCrystal; -import WayofTime.bloodmagic.item.ItemPotionFlask; -import WayofTime.bloodmagic.item.ItemRitualDiviner; -import WayofTime.bloodmagic.item.ItemRitualReader; -import WayofTime.bloodmagic.item.ItemSacrificialDagger; -import WayofTime.bloodmagic.item.ItemSanguineBook; -import WayofTime.bloodmagic.item.ItemSlate; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.item.ItemUpgradeTome; -import WayofTime.bloodmagic.item.ItemUpgradeTrainer; -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; -import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; -import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter; -import WayofTime.bloodmagic.item.routing.ItemNodeRouter; -import WayofTime.bloodmagic.item.routing.ItemRouterFilter; -import WayofTime.bloodmagic.item.sigil.ItemSigilAir; -import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight; -import WayofTime.bloodmagic.item.sigil.ItemSigilBounce; -import WayofTime.bloodmagic.item.sigil.ItemSigilClaw; -import WayofTime.bloodmagic.item.sigil.ItemSigilCompression; -import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity; -import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance; -import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner; -import WayofTime.bloodmagic.item.sigil.ItemSigilFrost; -import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove; -import WayofTime.bloodmagic.item.sigil.ItemSigilHaste; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import WayofTime.bloodmagic.item.sigil.ItemSigilLava; -import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism; -import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; -import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression; -import WayofTime.bloodmagic.item.sigil.ItemSigilTeleposition; -import WayofTime.bloodmagic.item.sigil.ItemSigilTransposition; -import WayofTime.bloodmagic.item.sigil.ItemSigilVoid; -import WayofTime.bloodmagic.item.sigil.ItemSigilWater; -import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind; -import WayofTime.bloodmagic.item.soul.ItemMonsterSoul; -import WayofTime.bloodmagic.item.soul.ItemSentientArmourGem; -import WayofTime.bloodmagic.item.soul.ItemSentientAxe; -import WayofTime.bloodmagic.item.soul.ItemSentientBow; -import WayofTime.bloodmagic.item.soul.ItemSentientPickaxe; -import WayofTime.bloodmagic.item.soul.ItemSentientShovel; -import WayofTime.bloodmagic.item.soul.ItemSentientSword; -import WayofTime.bloodmagic.item.soul.ItemSoulGem; -import WayofTime.bloodmagic.item.soul.ItemSoulSnare; -import WayofTime.bloodmagic.item.soulBreath.ItemFlightScroll; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.item.types.ShardType; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import java.util.List; +import java.util.Set; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @@ -111,6 +56,7 @@ public class RegistrarBloodMagicItems public static final Item PACK_SACRIFICE = Items.AIR; public static final Item DAGGER_OF_SACRIFICE = Items.AIR; public static final Item RITUAL_DIVINER = Items.AIR; + public static final Item RITUAL_DISMANTLER = Items.AIR; public static final Item RITUAL_READER = Items.AIR; public static final Item LAVA_CRYSTAL = Items.AIR; public static final Item BOUND_SWORD = Items.AIR; @@ -203,6 +149,7 @@ public class RegistrarBloodMagicItems new ItemPackSelfSacrifice().setRegistryName("pack_self_sacrifice"), new ItemDaggerOfSacrifice().setRegistryName("dagger_of_sacrifice"), new ItemRitualDiviner().setRegistryName("ritual_diviner"), + new ItemRitualDismantler().setRegistryName("ritual_dismantler"), new ItemRitualReader().setRegistryName("ritual_reader"), new ItemLavaCrystal().setRegistryName("lava_crystal"), new ItemBoundSword().setRegistryName("bound_sword"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index cbb2c54a..05f40732 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -213,6 +213,7 @@ public class RegistrarBloodMagicRecipes registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); + registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.RITUAL_DISMANTLER), 500, 100, new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, 2), new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, 2), new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); } public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java new file mode 100644 index 00000000..744b7129 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java @@ -0,0 +1,78 @@ +package WayofTime.bloodmagic.item; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.block.BlockRitualStone; +import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.core.data.SoulTicket; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.ritual.RitualComponent; +import WayofTime.bloodmagic.tile.TileMasterRitualStone; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.RitualHelper; +import com.google.common.collect.Lists; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.items.ItemHandlerHelper; + +import java.util.List; + +public class ItemRitualDismantler extends Item implements IVariantProvider { + public ItemRitualDismantler() { + setUnlocalizedName(BloodMagic.MODID + ".ritualDismantler"); + setCreativeTab(BloodMagic.TAB_BM); + setMaxStackSize(1); + } + + @Override + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + Block block = world.getBlockState(pos).getBlock(); + TileEntity tileEntity = world.getTileEntity(pos); + ItemStack stack = player.getHeldItem(hand); + + if (tileEntity instanceof TileMasterRitualStone) { + TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tileEntity; + EnumFacing direction = masterRitualStone.getDirection(); + + String ritualName = RitualHelper.getValidRitual(world, pos); + masterRitualStone.setActive(false); + + if (ritualName.equals("")) { + world.setBlockToAir(pos); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER)); + NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 100)); + return EnumActionResult.SUCCESS; + } + + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualName); + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + for (RitualComponent component : components) { + BlockPos newPos = pos.add(component.getOffset(direction)); + if (world.getBlockState(newPos).getBlock() instanceof BlockRitualStone) { + world.setBlockToAir(newPos); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); + } + } + + NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 200)); // smallest Ritual has 4 stones + return EnumActionResult.SUCCESS; + + } else if (player.isSneaking() && block instanceof BlockRitualStone) { + block.removedByPlayer(world.getBlockState(pos), world, pos, player, false); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); + NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 50)); + return EnumActionResult.SUCCESS; + } + + return EnumActionResult.FAIL; + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 03702e15..0fcd5be5 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -152,6 +152,7 @@ item.bloodmagic.sentientArmour.boots.name=Sentient Boots item.bloodmagic.altarMaker.name=Altar Maker +item.bloodmagic.ritualDismantler.name=Ritual Dismantler item.bloodmagic.ritualDivinernormal.name=Ritual Diviner item.bloodmagic.ritualDivinerdusk.name=Ritual Diviner [Dusk] item.bloodmagic.ritualDivinerdawn.name=Ritual Diviner [Dawn] diff --git a/src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json b/src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json new file mode 100644 index 00000000..dc88c182 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/ritual_dismantler" + } +} \ No newline at end of file From 6b25caa06df3dce862a0fd5e6ea30611d94c8a4e Mon Sep 17 00:00:00 2001 From: Phillip Date: Thu, 31 Jan 2019 19:28:36 -0500 Subject: [PATCH 276/493] Fixing the previous PR mess. (#1467) --- .../WayofTime/bloodmagic/item/soul/ItemSentientBow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index f817d6a3..fc9b195f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -47,6 +47,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5 }; //TODO public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13, 16, 24 }; public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3, 3, 4 }; + public static float soullessShotVelocity = 2.5F; public ItemSentientBow() { @@ -117,7 +118,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien // setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); // setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setVelocityOfArrow(stack, level >= 0 ? 3 + getVelocityModifier(type, level) : 0); + setVelocityOfArrow(stack, level >= 0 ? 3 + getVelocityModifier(type, level) : soullessShotVelocity); setDamageAdded(stack, level >= 0 ? getDamageModifier(type, level) : 0); } @@ -385,10 +386,9 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien entityArrow = itemarrow.createArrow(world, itemstack, player); entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); - if (newArrowVelocity == 0) + if (Float.compare(getVelocityOfArrow(stack), soullessShotVelocity) < Float.MIN_NORMAL) { world.playSound(null, player.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); - return; } if (arrowVelocity == 1.0F) From 865968a4b83ae377d10e63301302494096f4626f Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 01:29:51 +0100 Subject: [PATCH 277/493] Ported Ritual of the Feathered Earth to BM2. (#1492) * Ported Ritual of the Feathered Earth to BM2. * Changed maximum area * Feathered Earth Hurt timer fall damage negation based on Set part1 * Part 2, switched to handling through potions, digging into area descriptor range bug * Fixed Ritual area * Update gradle.properties --- gradle.properties | 2 +- .../bloodmagic/core/RegistrarBloodMagic.java | 4 +- .../potion/PotionEventHandlers.java | 23 +++-- .../ritual/types/RitualFeatheredEarth.java | 93 +++++++++++++++++++ .../tile/TileMasterRitualStone.java | 7 +- .../util/handler/event/GenericHandler.java | 7 +- .../assets/bloodmagic/lang/en_US.lang | 4 +- 7 files changed, 122 insertions(+), 18 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java diff --git a/gradle.properties b/gradle.properties index 48dbcb74..2b89fa29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ mappings_version=snapshot_20180201 jei_version=4.8.5.147 waila_version=1.8.23-B38_1.12 -guideapi_version=1.12-2.1.4-57 \ No newline at end of file +guideapi_version=1.12-2.1.4-57 diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 613d8fcc..d3f3ebcc 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -59,6 +59,7 @@ public class RegistrarBloodMagic public static final Potion CLING = MobEffects.HASTE; public static final Potion SACRIFICIAL_LAMB = MobEffects.HASTE; public static final Potion FLIGHT = MobEffects.HASTE; + public static final Potion FEATHERED = MobEffects.SPEED; public static IForgeRegistry BLOOD_ORBS = null; @@ -95,7 +96,8 @@ public class RegistrarBloodMagic new PotionBloodMagic("Bounce", false, 0x000000, 1, 1).setRegistryName("bounce"), new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"), new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb"), - new PotionBloodMagic("Flight", false, 0x000000, 4, 0).setRegistryName("flight") + new PotionBloodMagic("Flight", false, 0x000000, 4, 0).setRegistryName("flight"), + new PotionBloodMagic("Feathered", false, 0x000000, 0, 0).setRegistryName("feathered") ); } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 2ffb368b..d875c4d3 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,27 +1,27 @@ package WayofTime.bloodmagic.potion; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDamageEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; + +import java.util.ArrayList; +import java.util.List; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class PotionEventHandlers @@ -169,4 +169,11 @@ public class PotionEventHandlers event.setCanceled(true); } } + + @SubscribeEvent + public static void onEntityHurtEvent(LivingDamageEvent event) { + if (event.getSource() == DamageSource.FALL) + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.FEATHERED)) + event.setCanceled(true); + } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java new file mode 100644 index 00000000..823ceb1b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java @@ -0,0 +1,93 @@ +package WayofTime.bloodmagic.ritual.types; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.ritual.*; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.List; +import java.util.function.Consumer; + +@RitualRegister("feathered_earth") +public class RitualFeatheredEarth extends Ritual { + public static final String FALL_PROTECTION_RANGE = "fallProtRange"; + + public RitualFeatheredEarth() { + super("ritualFeatheredEarth", 0, 5000, "ritual." + BloodMagic.MODID + ".featheredEarthRitual"); + addBlockRange(FALL_PROTECTION_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-25, 0, -25), new BlockPos(25, 30, 25))); + setMaximumVolumeAndDistanceOfRange(FALL_PROTECTION_RANGE, 0, 200, 200); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) { + World world = masterRitualStone.getWorldObj(); + + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + BlockPos pos = masterRitualStone.getBlockPos(); + double x = pos.getX(); + double y = pos.getY(); + double z = pos.getZ(); + + if (currentEssence < getRefreshCost()) { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + int maxEffects = currentEssence / getRefreshCost(); + int totalEffects = 0; + + if (masterRitualStone.getCooldown() > 0) { + world.addWeatherEffect(new EntityLightningBolt(world, x + 4, y + 5, z + 4, false)); + world.addWeatherEffect(new EntityLightningBolt(world, x + 4, y + 5, z - 4, false)); + world.addWeatherEffect(new EntityLightningBolt(world, x - 4, y + 5, z - 4, false)); + world.addWeatherEffect(new EntityLightningBolt(world, x - 4, y + 5, z + 4, false)); + masterRitualStone.setCooldown(0); + } + + AreaDescriptor fallProtRange = masterRitualStone.getBlockRange(FALL_PROTECTION_RANGE); + AxisAlignedBB fallProtBB = fallProtRange.getAABB(masterRitualStone.getBlockPos()); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, fallProtBB); + + for (EntityLivingBase entity : entities) { + if (totalEffects >= maxEffects) { + break; + } + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FEATHERED, 20, 0)); + totalEffects++; + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); + } + + @Override + public int getRefreshTime() { + return 10; + } + + @Override + public int getRefreshCost() { + return 5; + } + + @Override + public void gatherComponents(Consumer components) { + addParallelRunes(components, 1, 0, EnumRuneType.DUSK); + addCornerRunes(components, 2, 0, EnumRuneType.AIR); + addOffsetRunes(components, 1, 3, 0, EnumRuneType.EARTH); + addParallelRunes(components, 3, 0, EnumRuneType.EARTH); + addCornerRunes(components, 4, 4, EnumRuneType.FIRE); + addOffsetRunes(components, 4, 5, 5, EnumRuneType.AIR); + addOffsetRunes(components, 3, 4, 5, EnumRuneType.AIR); + } + + + @Override + public Ritual getNewCopy() { + return new RitualFeatheredEarth(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index e21ff121..e27f53b4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -188,9 +188,10 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (MinecraftForge.EVENT_BUS.post(event)) return; - - if (!checkBlockRanges(ritual.getModableRangeMap())) - addBlockRanges(ritual.getModableRangeMap()); + + if (!checkBlockRanges(getCurrentRitual().getModableRangeMap())) + addBlockRanges(getCurrentRitual().getModableRangeMap()); + getCurrentRitual().performRitual(this); } else { stopRitual(Ritual.BreakType.BREAK_STONE); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 9dbc6711..46a7180a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -29,6 +29,7 @@ import WayofTime.bloodmagic.network.DemonAuraPacketProcessor; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.potion.BMPotionUtils; +import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.RitualManager; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.util.Constants; @@ -82,10 +83,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { @@ -93,6 +91,7 @@ public class GenericHandler { public static Map filledHandMap = new HashMap<>(); private static Map targetTaskMap = new HashMap<>(); private static Map attackTaskMap = new HashMap<>(); + public static Set featherRitualSet; @SubscribeEvent public static void onEntityFall(LivingFallEvent event) { diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 0fcd5be5..a7aea094 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -621,6 +621,7 @@ ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crystal ritual.bloodmagic.condorRitual=Reverence of the Condor ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul +ritual.bloodmagic.featheredEarthRitual=Ritual of the Feathered Earth ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. @@ -751,10 +752,11 @@ ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Unlike my comrades, I of ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Although your wounds may heal, they will do so slowly if you accept my "offering," and the stings of battle will plague you even more. ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=So think carefully before you rush into something that you may regret, since even though your cup may be empty it will be almost impossible to fill once more... +ritual.bloodmagic.featheredEarthRitual.info=Prevents falldamage in an area. ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. - ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. + # Chat chat.bloodmagic.altarMaker.setTier=Set Tier to: %d chat.bloodmagic.altarMaker.building=Building a Tier %d Altar From 827ee85e81d7b3530f872bc2b973f964240e997d Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 01:33:46 +0100 Subject: [PATCH 278/493] Implemented Ritual of Grounding, a Ritual to change gravity behavior (#1501) * Implemented Ritual of Grounding, a Ritual to change gravity behavior [x] <- x are new potion effects - (NoMod) moves entities towards the ground, prevents jumping [Grounded] - (Raw) affects players - (Corrosive) disables gravity [Suspension] - (Destructive) increases fall damage [Heavy Heart] - (Steadfast) affects bosses - (Vengeful) stronger effects, (+Corrosive) applies levitation (+Destructive) stronger effect [Grounded] prevents jumping and moves entities towards the ground, higher amplifiers cause a faster descend, interesting interaction with Sigil of Air [Suspension] disables gravity (keeps movement) [Heavy Heart] increases fall height and fall damage multiplier by 1 per level. Fixed a possible division by 0 in RitualConder. Saved event entity variable in PotionEventHandlers. Made rune configuration more readable in RitualHarvest. Signed-off-by: tobias * Fixed Ritual area * Lists are cleared on world unload. --- .../bloodmagic/core/RegistrarBloodMagic.java | 16 +- .../item/sigil/ItemSigilFilledHand.java | 4 +- .../potion/PotionEventHandlers.java | 125 ++++++----- .../ritual/types/RitualGrounding.java | 199 ++++++++++++++++++ .../ritual/types/RitualHarvest.java | 30 +-- .../util/handler/event/GenericHandler.java | 40 +++- .../assets/bloodmagic/lang/en_US.lang | 16 +- 7 files changed, 335 insertions(+), 95 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index d3f3ebcc..948835d3 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -59,7 +59,10 @@ public class RegistrarBloodMagic public static final Potion CLING = MobEffects.HASTE; public static final Potion SACRIFICIAL_LAMB = MobEffects.HASTE; public static final Potion FLIGHT = MobEffects.HASTE; - public static final Potion FEATHERED = MobEffects.SPEED; + public static final Potion GROUNDED = MobEffects.HASTE; + public static final Potion HEAVY_HEART = MobEffects.HASTE; + public static final Potion SUSPENDED = MobEffects.HASTE; + public static final Potion FEATHERED = MobEffects.HASTE; public static IForgeRegistry BLOOD_ORBS = null; @@ -73,10 +76,10 @@ public class RegistrarBloodMagic new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage") - ); + ); if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { event.getRegistry().register( - new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") + new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); } } @@ -97,8 +100,11 @@ public class RegistrarBloodMagic new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"), new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb"), new PotionBloodMagic("Flight", false, 0x000000, 4, 0).setRegistryName("flight"), + new PotionBloodMagic("Grounded", true, 0x000000, 1, 0).setRegistryName("grounded"), + new PotionBloodMagic("Suspended", false, 0x000000, 1, 0).setRegistryName("suspended"), + new PotionBloodMagic("Heavy Heart", true, 0x000000, 1, 0).setRegistryName("heavy_heart"), new PotionBloodMagic("Feathered", false, 0x000000, 0, 0).setRegistryName("feathered") - ); + ); } @SubscribeEvent @@ -117,7 +123,7 @@ public class RegistrarBloodMagic EntityEntryBuilder.create().id("corrupted_sheep", ++entities).entity(EntityCorruptedSheep.class).name("corrupted_sheep").tracker(16 * 4, 3, true).build(), EntityEntryBuilder.create().id("corrupted_chicken", ++entities).entity(EntityCorruptedChicken.class).name("corrupted_chicken").tracker(16 * 4, 3, true).build(), EntityEntryBuilder.create().id("corrupted_spider", ++entities).entity(EntityCorruptedSpider.class).name("corrupted_spider").tracker(16 * 4, 3, true).build() - ); + ); } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java index 72f428a0..a79affe5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.handler.event.GenericHandler; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -15,6 +15,6 @@ public class ItemSigilFilledHand extends ItemSigilToggleableBase { public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - GenericHandler.filledHandMap.put(player, 4); + GenericHandler.filledHandMapMap.get(world).put(player, 4); } } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index d875c4d3..57f68fc2 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; @@ -11,57 +12,67 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDamageEvent; import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.ArrayList; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class PotionEventHandlers -{ - public static List flightList = new ArrayList(); +public class PotionEventHandlers { + public static Map> flightListMap = new HashMap<>(); + public static Map> noGravityListMap = new HashMap<>(); @SubscribeEvent - public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) - { - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) - { - int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); - event.getEntityLiving().motionY += (0.1f) * (2 + i); + public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) { + EntityLivingBase eventEntityLiving = event.getEntityLiving(); + + if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.BOOST)) { + int i = eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); + eventEntityLiving.motionY += (0.1f) * (2 + i); } - // if (event.getEntityLiving().isPotionActive(ModPotions.heavyHeart)) { - // event.getEntityLiving().motionY = 0; - // } + if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.GROUNDED)) + eventEntityLiving.motionY = 0; } @SubscribeEvent - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) - { - if (event.getEntityLiving() instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if (!player.world.isRemote) - { - if (player.isPotionActive(RegistrarBloodMagic.FLIGHT)) - { - if (!player.isSpectator() && !player.capabilities.allowFlying) - { + public static void onLivingFall(LivingFallEvent event) { + EntityLivingBase eventEntityLiving = event.getEntityLiving(); + + if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.HEAVY_HEART)) { + int i = eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.HEAVY_HEART).getAmplifier() + 1; + event.setDamageMultiplier(event.getDamageMultiplier() + i); + event.setDistance(event.getDistance() + i); + } + } + + @SubscribeEvent + public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { + EntityLivingBase eventEntityLiving = event.getEntityLiving(); + List flightList = flightListMap.get(eventEntityLiving.getEntityWorld()); + + if (eventEntityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) eventEntityLiving; + if (!player.world.isRemote) { + if (player.isPotionActive(RegistrarBloodMagic.FLIGHT)) { + if (!player.isSpectator() && !player.capabilities.allowFlying) { player.capabilities.allowFlying = true; player.sendPlayerAbilities(); flightList.add(player); } - } else - { - if (flightList.contains(player)) - { + } else { + if (flightList.contains(player)) { player.capabilities.allowFlying = false; player.capabilities.isFlying = false; player.sendPlayerAbilities(); @@ -70,30 +81,42 @@ public class PotionEventHandlers } } } -// if (event.getEntityLiving().isPotionActive(ModPotions.boost)) +// if (eventEntityLiving.isPotionActive(ModPotions.boost)) // { -// int i = event.getEntityLiving().getActivePotionEffect(ModPotions.boost).getAmplifier(); +// int i = eventEntityLiving.getActivePotionEffect(ModPotions.boost).getAmplifier(); // { // float percentIncrease = (i + 1) * 0.05f; // -// if (event.getEntityLiving() instanceof EntityPlayer) +// if (eventEntityLiving instanceof EntityPlayer) // { -// EntityPlayer entityPlayer = (EntityPlayer) event.getEntityLiving(); +// EntityPlayer entityPlayer = (EntityPlayer) eventEntityLiving; // // if ((entityPlayer.onGround || entityPlayer.capabilities.isFlying) && entityPlayer.moveForward > 0F) // entityPlayer.moveFlying(0F, 1F, entityPlayer.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease); // } // } // } + List noGravityList = noGravityListMap.get(event.getEntityLiving().getEntityWorld()); + if ((!(eventEntityLiving instanceof EntityPlayer) || !((EntityPlayer) eventEntityLiving).isSpectator()) && eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED)) { + eventEntityLiving.setNoGravity(true); + noGravityList.add(eventEntityLiving); + } else { + eventEntityLiving.setNoGravity(false); + noGravityList.remove(eventEntityLiving); + } - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND)) - { + if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.GROUNDED)) + if (eventEntityLiving instanceof EntityPlayer && ((EntityPlayer) eventEntityLiving).capabilities.isFlying) + eventEntityLiving.motionY -= (0.05D * (double) (eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.GROUNDED).getAmplifier() + 1) - eventEntityLiving.motionY) * 0.2D; + else + eventEntityLiving.motionY -= (0.1D * (double) (eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.GROUNDED).getAmplifier() + 1) - eventEntityLiving.motionY) * 0.2D; + + if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.WHIRLWIND)) { int d0 = 3; - AxisAlignedBB axisAlignedBB = new AxisAlignedBB(event.getEntityLiving().posX - 0.5, event.getEntityLiving().posY - 0.5, event.getEntityLiving().posZ - 0.5, event.getEntityLiving().posX + 0.5, event.getEntityLiving().posY + 0.5, event.getEntityLiving().posZ + 0.5).expand(d0, d0, d0); - List entityList = event.getEntityLiving().getEntityWorld().getEntitiesWithinAABB(Entity.class, axisAlignedBB); + AxisAlignedBB axisAlignedBB = new AxisAlignedBB(eventEntityLiving.posX - 0.5, eventEntityLiving.posY - 0.5, eventEntityLiving.posZ - 0.5, eventEntityLiving.posX + 0.5, eventEntityLiving.posY + 0.5, eventEntityLiving.posZ + 0.5).expand(d0, d0, d0); + List entityList = eventEntityLiving.getEntityWorld().getEntitiesWithinAABB(Entity.class, axisAlignedBB); - for (Entity projectile : entityList) - { + for (Entity projectile : entityList) { if (projectile == null) continue; if (!(projectile instanceof IProjectile)) @@ -106,12 +129,12 @@ public class PotionEventHandlers else if (projectile instanceof EntityThrowable) throwingEntity = ((EntityThrowable) projectile).getThrower(); - if (throwingEntity != null && throwingEntity.equals(event.getEntityLiving())) + if (throwingEntity != null && throwingEntity.equals(eventEntityLiving)) continue; - double delX = projectile.posX - event.getEntityLiving().posX; - double delY = projectile.posY - event.getEntityLiving().posY; - double delZ = projectile.posZ - event.getEntityLiving().posZ; + double delX = projectile.posX - eventEntityLiving.posX; + double delY = projectile.posY - eventEntityLiving.posY; + double delZ = projectile.posZ - eventEntityLiving.posZ; double angle = (delX * projectile.motionX + delY * projectile.motionY + delZ * projectile.motionZ) / (Math.sqrt(delX * delX + delY * delY + delZ * delZ) * Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ)); @@ -120,8 +143,7 @@ public class PotionEventHandlers if (angle < 3 * (Math.PI / 4)) continue; // angle is < 135 degrees - if (throwingEntity != null) - { + if (throwingEntity != null) { delX = -projectile.posX + throwingEntity.posX; delY = -projectile.posY + (throwingEntity.posY + throwingEntity.getEyeHeight()); delZ = -projectile.posZ + throwingEntity.posZ; @@ -141,31 +163,26 @@ public class PotionEventHandlers } @SubscribeEvent - public static void onPlayerRespawn(PlayerEvent.Clone event) - { + public static void onPlayerRespawn(PlayerEvent.Clone event) { if (event.isWasDeath()) event.getEntityPlayer().addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, 400)); } @SubscribeEvent - public static void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event) - { + public static void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event) { if (event.player.isPotionActive(RegistrarBloodMagic.SOUL_FRAY)) event.lpAdded = (int) (event.lpAdded * 0.1D); } @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onPlayerDamageEvent(LivingAttackEvent event) - { + public static void onPlayerDamageEvent(LivingAttackEvent event) { if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND) && event.isCancelable() && event.getSource().isProjectile()) event.setCanceled(true); } @SubscribeEvent - public static void onEndermanTeleportEvent(EnderTeleportEvent event) - { - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.PLANAR_BINDING) && event.isCancelable()) - { + public static void onEndermanTeleportEvent(EnderTeleportEvent event) { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.PLANAR_BINDING) && event.isCancelable()) { event.setCanceled(true); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java new file mode 100644 index 00000000..5a8795c0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java @@ -0,0 +1,199 @@ +package WayofTime.bloodmagic.ritual.types; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.MoverType; +import net.minecraft.entity.boss.EntityDragon; +import net.minecraft.entity.boss.EntityWither; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.List; +import java.util.function.Consumer; + +@RitualRegister("grounding") +public class RitualGrounding extends Ritual { + + public static final int willRefreshTime = 20; + public static final String GROUNDING_RANGE = "groundingRange"; + public static final double willDrain = 0.5; + + public RitualGrounding() { + super("ritualGrounding", 0, 5000, "ritual." + BloodMagic.MODID + ".groundingRitual"); + addBlockRange(GROUNDING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, 0, -10), 21, 30, 21)); + setMaximumVolumeAndDistanceOfRange(GROUNDING_RANGE, 0, 200, 200); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) { + /* Default Ritual Stuff */ + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + BlockPos pos = masterRitualStone.getBlockPos(); + + if (currentEssence < getRefreshCost()) { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + int maxEffects = currentEssence / getRefreshCost(); + int totalEffects = 0; + + /* Default will augment stuff */ + List willConfig = masterRitualStone.getActiveWillConfig(); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); + + double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); + double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); + double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); + double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); + double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); + + double rawDrained = 0; + double corrosiveDrained = 0; + double destructiveDrained = 0; + double steadfastDrained = 0; + double vengefulDrained = 0; + + /* Actual ritual stuff begins here */ + AreaDescriptor groundingRange = getBlockRange(GROUNDING_RANGE); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, groundingRange.getAABB(pos)); + for (EntityLivingBase entity : entities) { + if (totalEffects >= maxEffects) { + break; + } + + if (entity instanceof EntityPlayer && ((EntityPlayer) entity).isCreative()) + continue; + + totalEffects++; + + + if (entity instanceof EntityPlayer) { + /* Raw will effect: Affects players */ + if (world.getTotalWorldTime() % 10 == 0) { + if (rawWill >= willDrain) { + + rawDrained += willDrain; + + double[] drainagePlayer = sharedWillEffects(world, entity, corrosiveWill, destructiveWill, vengefulWill, corrosiveDrained, destructiveDrained, vengefulDrained); + + corrosiveDrained += drainagePlayer[0]; + destructiveDrained += drainagePlayer[1]; + vengefulDrained += drainagePlayer[2]; + } + } + } else if (entity.isNonBoss()) { + if (world.getTotalWorldTime() % 10 == 0) { + double[] drainageEntity = sharedWillEffects(world, entity, corrosiveWill, destructiveWill, vengefulWill, corrosiveDrained, destructiveDrained, vengefulDrained); + + corrosiveDrained += drainageEntity[0]; + destructiveDrained += drainageEntity[1]; + vengefulDrained += drainageEntity[2]; + } + } else if (!entity.isNonBoss()) { + /* Steadfast will effect: Affects bosses + (some bosses, like the wither, have a restriction to motion modification, + others, like the Ender Dragon, don't do potions) */ + if (steadfastWill >= willDrain) { + if (entity instanceof EntityWither || entity instanceof EntityDragon) + entity.move(MoverType.SELF, 0, -0.05, 0); // to work on Wither and EnderDragon without interfering with other mod author's decisions (looking at you, Vazkii) + + steadfastDrained += willDrain / 10f; + + double[] drainagePlayer = sharedWillEffects(world, entity, corrosiveWill, destructiveWill, vengefulWill, corrosiveDrained, destructiveDrained, vengefulDrained); + + corrosiveDrained += drainagePlayer[0]; + destructiveDrained += drainagePlayer[1]; + vengefulDrained += drainagePlayer[2]; + } + } + } + + + if (rawDrained > 0) + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrained, true); + if (corrosiveDrained > 0) + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrained, true); + if (destructiveDrained > 0) + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveDrained, true); + if (steadfastDrained > 0) + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrained, true); + if (vengefulDrained > 0) + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrained, true); + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); + } + + @Override + public int getRefreshTime() { + return 1; + } + + @Override + public int getRefreshCost() { + return Math.max(1, getBlockRange(GROUNDING_RANGE).getVolume() / 10000); + } + + @Override + public void gatherComponents(Consumer components) { + addParallelRunes(components, 1, 0, EnumRuneType.DUSK); + addCornerRunes(components, 2, 2, EnumRuneType.EARTH); + addCornerRunes(components, 3, 3, EnumRuneType.EARTH); + } + + + @Override + public Ritual getNewCopy() { + return new RitualGrounding(); + } + + public double[] sharedWillEffects(World world, EntityLivingBase entity, double corrosiveWill, double destructiveWill, double vengefulWill, double corrosiveDrained, double destructiveDrained, double vengefulDrained) { + /* Combination of corrosive + vengeful will: Levitation */ + if (corrosiveWill >= willDrain && vengefulWill >= willDrain) { + + entity.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 20, 10)); + vengefulDrained += willDrain; + corrosiveDrained += willDrain; + + /* Corrosive will effect: Suspension */ + } else if (corrosiveWill >= willDrain) { + + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SUSPENDED, 20, 0)); + corrosiveDrained += willDrain; + + /* Vengeful will effect: Stronger effect */ + } else if (vengefulWill >= willDrain) { + + vengefulDrained += willDrain; + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.GROUNDED, 40, 20)); + + } else + + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.GROUNDED, 20, 10)); + + /* Destructive will effect: Increased fall damage */ + if (destructiveWill >= willDrain) { + destructiveDrained += willDrain; + + /* Combination of destructive + vengeful will: stronger destructive effect */ + if (vengefulWill >= willDrain + vengefulDrained) { + if (world.getTotalWorldTime() % 100 == 0) { + vengefulDrained += willDrain; + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.HEAVY_HEART, 200, 2)); + } + + } else if (world.getTotalWorldTime() % 50 == 0) + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.HEAVY_HEART, 100, 1)); + } + return new double[]{corrosiveDrained, destructiveDrained, vengefulDrained}; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index 78722805..7376d7e7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.ritual.harvest.IHarvestHandler; import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; +import WayofTime.bloodmagic.ritual.harvest.IHarvestHandler; import com.google.common.collect.Lists; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.InventoryHelper; @@ -77,30 +77,10 @@ public class RitualHarvest extends Ritual { @Override public void gatherComponents(Consumer components) { - components.accept(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.DUSK)); - components.accept(new RitualComponent(new BlockPos(1, 0, -1), EnumRuneType.DUSK)); - components.accept(new RitualComponent(new BlockPos(-1, 0, -1), EnumRuneType.DUSK)); - components.accept(new RitualComponent(new BlockPos(-1, 0, 1), EnumRuneType.DUSK)); - components.accept(new RitualComponent(new BlockPos(2, 0, 0), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-2, 0, 0), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(0, 0, 2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(0, 0, -2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(3, 0, 1), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(3, 0, -1), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-3, 0, 1), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-3, 0, -1), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(1, 0, 3), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-1, 0, 3), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(1, 0, -3), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-1, 0, -3), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(2, 0, 3), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(3, 0, 2), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(2, 0, -3), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(-3, 0, 2), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(-2, 0, 3), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(3, 0, -2), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(-2, 0, -3), EnumRuneType.WATER)); - components.accept(new RitualComponent(new BlockPos(-3, 0, -2), EnumRuneType.WATER)); + addCornerRunes(components, 1, 0, EnumRuneType.DUSK); + addParallelRunes(components, 2, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 3, 1, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 3, 2, 0, EnumRuneType.WATER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 46a7180a..fda8d9da 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -29,6 +29,7 @@ import WayofTime.bloodmagic.network.DemonAuraPacketProcessor; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.potion.BMPotionUtils; +import WayofTime.bloodmagic.potion.PotionEventHandlers; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.RitualManager; import WayofTime.bloodmagic.soul.DemonWillHolder; @@ -76,6 +77,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.ExplosionEvent; +import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -87,10 +89,10 @@ import java.util.*; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { - public static Map bounceMap = new HashMap<>(); - public static Map filledHandMap = new HashMap<>(); - private static Map targetTaskMap = new HashMap<>(); - private static Map attackTaskMap = new HashMap<>(); + public static Map> bounceMapMap = new HashMap<>(); + public static Map> filledHandMapMap = new HashMap<>(); + private static Map> targetTaskMapMap = new HashMap<>(); + private static Map> attackTaskMapMap = new HashMap<>(); public static Set featherRitualSet; @SubscribeEvent @@ -103,7 +105,7 @@ public class GenericHandler { if (player.getEntityWorld().isRemote) { player.motionY *= -0.9; player.fallDistance = 0; - bounceMap.put(player, player.motionY); + bounceMapMap.get(player.getEntityWorld()).put(player, player.motionY); } else { player.fallDistance = 0; event.setCanceled(true); @@ -114,10 +116,13 @@ public class GenericHandler { @SubscribeEvent public static void playerTickPost(TickEvent.PlayerTickEvent event) { + World world = event.player.getEntityWorld(); + Map bounceMap = bounceMapMap.get(world); if (event.phase == TickEvent.Phase.END && bounceMap.containsKey(event.player)) { event.player.motionY = bounceMap.remove(event.player); } + Map filledHandMap = filledHandMapMap.get(world); if (event.phase == TickEvent.Phase.END) { if (filledHandMap.containsKey(event.player)) { int value = filledHandMap.get(event.player) - 1; @@ -217,6 +222,9 @@ public class GenericHandler { sendPlayerDemonWillAura((EntityPlayer) entity); } + World world = entity.getEntityWorld(); + Map targetTaskMap = targetTaskMapMap.get(world); + Map attackTaskMap = attackTaskMapMap.get(world); if (event.getEntityLiving() instanceof EntityAnimal) { EntityAnimal animal = (EntityAnimal) event.getEntityLiving(); if (animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { @@ -449,4 +457,26 @@ public class GenericHandler { private static int durabilityToXp(int durability) { return durability / 2; } + + @SubscribeEvent + public static void onWorldLoad(WorldEvent.Load event) { + World world = event.getWorld(); + bounceMapMap.computeIfAbsent(world, k -> new HashMap<>()); + filledHandMapMap.computeIfAbsent(world, k -> new HashMap<>()); + attackTaskMapMap.computeIfAbsent(world, k -> new HashMap<>()); + targetTaskMapMap.computeIfAbsent(world, k -> new HashMap<>()); + PotionEventHandlers.flightListMap.computeIfAbsent(world, k -> new ArrayList<>()); + PotionEventHandlers.noGravityListMap.computeIfAbsent(world, k -> new ArrayList<>()); + } + + @SubscribeEvent + public static void onWorldUnload(WorldEvent.Unload event) { + World world = event.getWorld(); + bounceMapMap.get(world).clear(); + filledHandMapMap.get(world).clear(); + attackTaskMapMap.get(world).clear(); + targetTaskMapMap.get(world).clear(); + PotionEventHandlers.flightListMap.get(world).clear(); + PotionEventHandlers.noGravityListMap.get(world).clear(); + } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index a7aea094..83614e9a 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -621,6 +621,7 @@ ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crystal ritual.bloodmagic.condorRitual=Reverence of the Condor ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul +ritual.bloodmagic.groundingRitual=Ritual of Grounding ritual.bloodmagic.featheredEarthRitual=Ritual of the Feathered Earth ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. @@ -667,6 +668,14 @@ ritual.bloodmagic.animalGrowthRitual.steadfast.info=(Steadfast) Automatically br ritual.bloodmagic.animalGrowthRitual.default.info=(Raw) Increases the speed of the ritual based on the total Will in the Aura. ritual.bloodmagic.animalGrowthRitual.destructive.info=(Destructive) Causes adults that have not bred lately to run at mobs and explode. ritual.bloodmagic.animalGrowthRitual.corrosive.info=(Corrosive) Unimplemented. +ritual.bloodmagic.groundingRitual.info=Forces entities on the ground and prevents jumping. +ritual.bloodmagic.groundingRitual.default.info=(Raw) Affects players. +ritual.bloodmagic.groundingRitual.corrosive.info=(Corrosive) Disables gravity (+Vengeful) Applies Levitation. +ritual.bloodmagic.groundingRitual.destructive.info=(Destructive) Applies Heavy Heart (increases fall damage) (+Vengeful) Stronger effect. +ritual.bloodmagic.groundingRitual.steadfast.info=(Steadfast) Affects Bosses. Doesn't affect bosses that are immune against motion change or immune against potions (except Wither and Ender Dragon). +ritual.bloodmagic.groundingRitual.vengeful.info=(Vengeful) Makes effects stronger. (+Corrosive) Applies Levitation. (+Destructive) Higher Heavy Heart amplifier. +ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. +ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. ritual.bloodmagic.crystalSplitRitual.info=Splits apart a well-grown Raw crystal cluster into seperal aspected crystal clusters. ritual.bloodmagic.fullStomachRitual.info=Takes food from the linked chest and fills the player's saturation with it. @@ -713,7 +722,7 @@ ritual.bloodmagic.fullStomachRitual.fillRange.info=(Feeding) The range that the ritual.bloodmagic.fullStomachRitual.chest.info=(Chest) The location of the inventory that the ritual will grab food from to feed players in range. ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Push) The area of the ritual where mobs will be pushed. All mobs are pushed away from the master ritual stone, regardless of where this area is. ritual.bloodmagic.containmentRitual.containmentRange.info=(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is. -ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. +ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Suppress) All liquids within the range are suppressed. ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) The area from which players that are not owner or have an orb in the chest will be teleported away from. ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Suction) Items within this range will be sucked into the linked chest. @@ -724,11 +733,11 @@ ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in th ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. -ritual.bloodmagic.ellipseRitual.info=Creates a hollow spheroid around the ritual using the blocks in the attached chest. +ritual.bloodmagic.ellipseRitual.info=Creates a hollow spheroid around the ritual using the blocks in the attached chest. ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated. ritual.bloodmagic.ellipseRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. -ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. +ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down. ritual.bloodmagic.fellingRitual.chest.info=(Chest) The location of the inventory that the ritual will place the results into. @@ -756,7 +765,6 @@ ritual.bloodmagic.featheredEarthRitual.info=Prevents falldamage in an area. ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. - # Chat chat.bloodmagic.altarMaker.setTier=Set Tier to: %d chat.bloodmagic.altarMaker.building=Building a Tier %d Altar From a04e4d7a09558d1e1a92c569e05e6635b12b503c Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 01:36:31 +0100 Subject: [PATCH 279/493] SolarPowered logic fix. (#1454) Need to see the sky AND needs to be day, instead of or. Before: - Solar Powered works at night - Solar Powered works at day underground After: - Solar Powered works only during daytime if the sky is in line of sight, as well --- .../livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index d285c11d..fea3748c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -26,7 +26,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { @Override public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { - if (wearer.getEntityWorld().canSeeSky(wearer.getPosition()) || wearer.getEntityWorld().provider.isDaytime()) { + if (wearer.getEntityWorld().canSeeSky(wearer.getPosition()) && wearer.getEntityWorld().provider.isDaytime()) { return protectionLevel[this.level]; } @@ -36,7 +36,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { @Override public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { counter++; - if (world.canSeeSky(player.getPosition()) || world.provider.isDaytime()) { + if (world.canSeeSky(player.getPosition()) && world.provider.isDaytime()) { if (counter % regenCooldown[this.level] == 0 && player.getHealth() < player.getMaxHealth()) { player.heal(1); } From 2a8e1f1271c022e34934089591db3e1e58b60eaf Mon Sep 17 00:00:00 2001 From: Saurabh Totey Date: Thu, 31 Jan 2019 17:36:55 -0700 Subject: [PATCH 280/493] Fixed Sigil of Magnetism attraction area for #1315 (#1453) --- .../WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index 7a1333fa..93d66134 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -25,8 +25,8 @@ public class ItemSigilMagnetism extends ItemSigilToggleableBase { float posX = Math.round(player.posX); float posY = (float) (player.posY - player.getEyeHeight()); float posZ = Math.round(player.posZ); - List entities = player.getEntityWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); - List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + List entities = player.getEntityWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); + List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); for (EntityItem entity : entities) { if (entity != null && !world.isRemote && !entity.isDead) { From 95d99c0a01e4e14473186cd442dc1072403a9a4b Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 01:46:02 +0100 Subject: [PATCH 281/493] Command rework (#1434) * Network part finished. * Should be more reasonable now * This should be good enough. * Orb finished, needs strings * Bind finished. Needs strings. * Reformat & Help subcommand * Cleanup, strings, no negative amounts * Removed TODOs * Added missing MaxTier check for Blood Orbs. Added TODO: Test with custom Blood Orbs. * Ritual commands finished. Check for valid placement might be optimized. (TODO) * Access modifiers, moved TODO * Added TODOs for localized strings * DrainUtils postponed until the necessary functionality is available with SoulTickets (telling SoulTicket network from soul ticket, a list of all registered soul tickets per network) * Replaced all occurrences of TextHelper with TextComponentTranslation in the commands section * - Moved Teleports.java to teleport package - added teleposer command - added missing strings - cleanup * Fixed spelling of "Successful(ly)" * getUsage() now returns translation keys. getInfo() is now an explicit String ritual creation command now has proper tab completions help is an additional argument with "-h" or "?" cleanup * teleposerSet final cleanup. * Removed ritual removal command Signed-off-by: tobias * Check if the tile has a ritual first Signed-off-by: tobias * A bit more optimisation Signed-off-by: tobias * Cleanup part 1 Signed-off-by: tobias * Cleanup part 2 Signed-off-by: tobias * Part 3 Signed-off-by: tobias * Part 4 Signed-off-by: tobias * Updated language file to reflect cleanup & continuity changes. Signed-off-by: tobias * Change to use an abstract class that gets called instead of calling super on overriden execute() for commands Signed-off-by: tobias * Use player facing for ritual creation. Signed-off-by: tobias --- .../block/BlockDimensionalPortal.java | 6 +- .../bloodmagic/block/BlockTeleposer.java | 5 +- .../bloodmagic/command/CommandBloodMagic.java | 22 +- .../command/sub/SubCommandBind.java | 103 +++--- .../command/sub/SubCommandNetwork.java | 344 ++++++++++-------- .../bloodmagic/command/sub/SubCommandOrb.java | 164 +++++---- .../command/sub/SubCommandRitual.java | 144 ++++++++ .../command/sub/SubCommandTeleposer.java | 329 +++++++++++++++++ .../item/sigil/ItemSigilTeleposition.java | 4 +- .../portal => teleport}/Teleports.java | 5 +- .../bloodmagic/tile/TileTeleposer.java | 20 +- .../bloodmagic/util/helper/RitualHelper.java | 97 ++++- .../assets/bloodmagic/lang/en_US.lang | 70 ++-- 13 files changed, 990 insertions(+), 323 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java create mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java rename src/main/java/WayofTime/bloodmagic/{ritual/portal => teleport}/Teleports.java (98%) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 8939e5f5..658a87f6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.block.base.BlockInteger; import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.block.base.BlockInteger; -import WayofTime.bloodmagic.ritual.portal.LocationsHandler; -import WayofTime.bloodmagic.ritual.portal.Teleports; +import WayofTime.bloodmagic.teleport.Teleports; import WayofTime.bloodmagic.tile.TileDimensionalPortal; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 22fb0307..24978953 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.command.sub.SubCommandTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.Constants; @@ -48,8 +49,10 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, @Override public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { TileTeleposer tileTeleposer = (TileTeleposer) world.getTileEntity(blockPos); - if (tileTeleposer != null) + if (tileTeleposer != null) { tileTeleposer.dropItems(); + SubCommandTeleposer.teleposerSet.remove(tileTeleposer); + } super.breakBlock(world, blockPos, blockState); } diff --git a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java b/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java index 81eb9063..5c143101 100644 --- a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java @@ -1,18 +1,19 @@ package WayofTime.bloodmagic.command; -import WayofTime.bloodmagic.command.sub.SubCommandBind; -import WayofTime.bloodmagic.command.sub.SubCommandNetwork; -import WayofTime.bloodmagic.command.sub.SubCommandOrb; -import WayofTime.bloodmagic.util.helper.TextHelper; +import WayofTime.bloodmagic.command.sub.*; import net.minecraft.command.ICommandSender; -import net.minecraft.util.text.TextComponentString; import net.minecraftforge.server.command.CommandTreeBase; +import net.minecraftforge.server.command.CommandTreeHelp; public class CommandBloodMagic extends CommandTreeBase { + public CommandBloodMagic() { addSubcommand(new SubCommandBind()); addSubcommand(new SubCommandNetwork()); addSubcommand(new SubCommandOrb()); + addSubcommand(new SubCommandRitual()); + addSubcommand(new SubCommandTeleposer()); + addSubcommand(new CommandTreeHelp(this)); } @Override @@ -30,15 +31,4 @@ public class CommandBloodMagic extends CommandTreeBase { return 2; } - public static void displayHelpString(ICommandSender commandSender, String display, Object... info) { - commandSender.sendMessage(new TextComponentString(TextHelper.localizeEffect(display, info))); - } - - public static void displayErrorString(ICommandSender commandSender, String display, Object... info) { - commandSender.sendMessage(new TextComponentString(TextHelper.localizeEffect(display, info))); - } - - public static void displaySuccessString(ICommandSender commandSender, String display, Object... info) { - commandSender.sendMessage(new TextComponentString(TextHelper.localizeEffect(display, info))); - } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index f229ad5b..2d99578a 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -3,17 +3,26 @@ package WayofTime.bloodmagic.command.sub; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.helper.BindableHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.command.PlayerNotFoundException; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.server.command.CommandTreeBase; +import net.minecraftforge.server.command.CommandTreeHelp; + +public class SubCommandBind extends CommandTreeBase { + public EntityPlayerMP player; + + public SubCommandBind() { + addSubcommand(new CommandTreeHelp(this)); + } + + public String getInfo() { + return player.getName(); + } -public class SubCommandBind extends CommandBase { @Override public String getName() { return "bind"; @@ -21,7 +30,11 @@ public class SubCommandBind extends CommandBase { @Override public String getUsage(ICommandSender commandSender) { - return TextHelper.localizeEffect("commands.bloodmagic.bind.usage"); + return "commands.bloodmagic.bind.usage"; + } + + public String getHelp() { + return "commands.bloodmagic.bind.help"; } @Override @@ -30,49 +43,49 @@ public class SubCommandBind extends CommandBase { } @Override - public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException { - if (commandSender.getEntityWorld().isRemote) + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { + sender.sendMessage(new TextComponentTranslation(getHelp())); return; - - try { - EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender); - ItemStack held = player.getHeldItemMainhand(); - boolean bind = true; - - if (held.getItem() instanceof IBindable) { - if (args.length > 0) { - - if (args[0].equalsIgnoreCase("help")) - return; - - if (isBoolean(args[0])) { - bind = Boolean.parseBoolean(args[0]); - - if (args.length > 2) - player = CommandBase.getPlayer(server, commandSender, args[1]); - } else { - player = CommandBase.getPlayer(server, commandSender, args[0]); - } - } - - if (bind) { - Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); - BindableHelper.applyBinding(held, binding); - commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.success")); - } else { - Binding binding = ((IBindable) held.getItem()).getBinding(held); - if (binding != null) { - held.getTagCompound().removeTag("binding"); - commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.remove.success")); - } - } - } - } catch (PlayerNotFoundException e) { - commandSender.sendMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.bloodmagic.error.404"))); } + if (sender.getEntityWorld().isRemote) + return; + EntityPlayerMP player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + ItemStack held = player.getHeldItemMainhand(); + boolean bind = true; + if (held.getItem() instanceof IBindable) { + Binding binding = ((IBindable) held.getItem()).getBinding(held); + if (binding != null) + bind = false; + if (args.length < 2) + if (args.length == 1) + if (isBoolean(args[0])) + bind = Boolean.parseBoolean(args[0]); + else + player = getPlayer(server, sender, args[0]); + if (bind) { + if (binding.getOwnerName().equals(player.getName())) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.error.ownerEqualsTarget")); + return; + } + binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); + BindableHelper.applyBinding(held, binding); + this.player = player; + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.success", getInfo())); + } else { + if (binding == null) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.error.notBound")); + } + held.getTagCompound().removeTag("binding"); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.remove.success")); + } + } else + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.error.notBindable")); + + } private boolean isBoolean(String string) { return string.equalsIgnoreCase("true") || string.equalsIgnoreCase("false"); } -} +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 12db2d7f..a96cef8a 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -2,21 +2,33 @@ package WayofTime.bloodmagic.command.sub; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.command.CommandBase; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.command.PlayerNotFoundException; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.server.command.CommandTreeBase; +import net.minecraftforge.server.command.CommandTreeHelp; -import java.util.Locale; +import java.util.List; + +public class SubCommandNetwork extends CommandTreeBase { + + public SubCommandNetwork() { + addSubcommand(new Syphon()); + addSubcommand(new Add()); + addSubcommand(new Set()); + addSubcommand(new Get()); + addSubcommand(new Cap()); + addSubcommand(new Fill()); + addSubcommand(new Tickets()); + addSubcommand(new CommandTreeHelp(this)); + } -public class SubCommandNetwork extends CommandBase { @Override public String getName() { return "network"; @@ -24,160 +36,190 @@ public class SubCommandNetwork extends CommandBase { @Override public String getUsage(ICommandSender commandSender) { - return TextHelper.localizeEffect("commands.bloodmagic.network.usage"); + return "commands.bloodmagic.network.usage"; } @Override public int getRequiredPermissionLevel() { - return 2; + return 0; } - @Override - public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException { - if (args.length > 1) { - if (args[0].equalsIgnoreCase("help")) + abstract class NetworkCommand extends CommandTreeBase { + + public EntityPlayerMP player; + public SoulNetwork network; + public String uuid; + + public Integer commandHelperAmount(MinecraftServer server, ICommandSender sender, String[] args) { + int amount; + if (args.length == 0) + amount = 1000; + else if (Utils.isInteger(args[0])) + amount = Integer.parseInt(args[0]); + else if (args.length > 1 && Utils.isInteger(args[1])) + amount = Integer.parseInt(args[1]); + else { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.arg.invalid")); + sender.sendMessage(new TextComponentTranslation(this.getUsage(sender))); + return null; + } + if (amount < 0) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.negative")); + return null; + } + return amount; + } + + @Override + public String getUsage(ICommandSender sender) { + return "commands.bloodmagic.network." + getName() + ".usage"; + } + + public String getHelp() { + return "commands.bloodmagic.network." + getName() + ".help"; + } + + public String getInfo() { + return ""; + } + + @Override + public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (!getName().equals("get")) { + if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { + sender.sendMessage(new TextComponentTranslation(getHelp())); + return; + } + this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); + this.network = NetworkHelper.getSoulNetwork(uuid); + } + subExecute(server, sender, args); + } + + protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException; + } + + class Syphon extends NetworkCommand { + @Override + public String getName() { + return "syphon"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer amount = commandHelperAmount(server, sender, args); + if (amount == null) return; - - try { - EntityPlayer player = CommandBase.getPlayer(server, commandSender, args[1]); - - try { - ValidCommands command = ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH)); - command.run(player, commandSender, args.length > 0 && args.length < 2, args); - } catch (IllegalArgumentException e) { - - } - } catch (PlayerNotFoundException e) { - CommandBloodMagic.displayErrorString(commandSender, e.getLocalizedMessage()); + int currE = network.getCurrentEssence(); + if (amount > currE) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.syphon.amountTooHigh")); + if (currE == 0) + return; + amount = Math.min(amount, currE); } - } else { - CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing"); + network.syphonAndDamage(player, SoulTicket.command(sender, this.getName(), amount)); + int newE = network.getCurrentEssence(); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.syphon.success", currE - newE, player.getDisplayName().getFormattedText())); } } - private enum ValidCommands { - SYPHON("commands.bloodmagic.network.syphon.help") { - @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { - if (displayHelp) { - CommandBloodMagic.displayHelpString(sender, this.help); - return; - } - - if (args.length == 3) { - if (Utils.isInteger(args[2])) { - int amount = Integer.parseInt(args[2]); - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.command(sender, "syphon", amount)); - CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.syphon.success", amount, player.getDisplayName().getFormattedText()); - } else { - CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); - } - } else { - CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing"); - } - } - }, - ADD("commands.bloodmagic.network.add.help") { - @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { - if (displayHelp) { - CommandBloodMagic.displayHelpString(sender, this.help); - return; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - if (args.length == 3) { - if (Utils.isInteger(args[2])) { - int amount = Integer.parseInt(args[2]); - int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); - CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, "add", amount), maxOrb), player.getDisplayName().getFormattedText()); - } else { - CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); - } - } else { - CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing"); - } - } - }, - SET("commands.bloodmagic.network.set.help") { - @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { - if (displayHelp) { - CommandBloodMagic.displayHelpString(sender, this.help); - return; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - if (args.length == 3) { - if (Utils.isInteger(args[2])) { - int amount = Integer.parseInt(args[2]); - network.setCurrentEssence(amount); - CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount); - } else { - CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid"); - } - } else { - CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing"); - } - } - }, - GET("commands.bloodmagic.network.get.help") { - @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { - if (displayHelp) { - CommandBloodMagic.displayHelpString(sender, this.help); - return; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - if (args.length > 1) - sender.sendMessage(new TextComponentString(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()))); - - } - }, - FILL("commands.bloodmagic.network.fill.help") { - @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { - if (displayHelp) { - CommandBloodMagic.displayHelpString(sender, this.help, Integer.MAX_VALUE); - return; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - if (args.length > 1) { - network.setCurrentEssence(Integer.MAX_VALUE); - CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText()); - } - } - }, - CAP("commands.bloodmagic.network.cap.help") { - @Override - public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { - if (displayHelp) { - CommandBloodMagic.displayHelpString(sender, this.help); - return; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - if (args.length > 1) { - int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); - network.setCurrentEssence(maxOrb); - CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText()); - } - } - },; - - public String help; - - ValidCommands(String help) { - this.help = help; + class Add extends NetworkCommand { + @Override + public String getName() { + return "add"; } - public abstract void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args); + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer amount = commandHelperAmount(server, sender, args); + if (amount == null) + return; + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, getName(), amount), NetworkHelper.getMaximumForTier(network.getOrbTier())), player.getDisplayName().getFormattedText())); + } } -} + + class Set extends NetworkCommand { + @Override + public String getName() { + return "set"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer amount = commandHelperAmount(server, sender, args); + if (amount == null) + return; + network.setCurrentEssence(amount); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount)); + } + } + + class Get extends NetworkCommand { + + @Override + public String getName() { + return "get"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { + sender.sendMessage(new TextComponentTranslation(getHelp())); + return; + } + this.player = args.length < 1 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + sender.sendMessage(new TextComponentString((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TextComponentTranslation("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText()))); + } + } + + class Cap extends NetworkCommand { + + @Override + public String getName() { + return "cap"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + network.setCurrentEssence(NetworkHelper.getMaximumForTier(network.getOrbTier())); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText())); + } + } + + class Fill extends NetworkCommand { + + @Override + public String getInfo() { + return "" + Integer.MAX_VALUE; + } + + @Override + public String getName() { + return "fill"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + network.setCurrentEssence(Integer.MAX_VALUE); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText())); + } + } + + class Tickets extends NetworkCommand { + + @Override + public String getName() { + return "tickethistory"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + List tickethistory = network.getTicketHistory(); + if (tickethistory.isEmpty()) + for (SoulTicket i : network.getTicketHistory()) + sender.sendMessage(i.getDescription()); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success", player.getDisplayName().getFormattedText())); + } + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index cdba93a2..816c828b 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -1,22 +1,25 @@ package WayofTime.bloodmagic.command.sub; import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.command.CommandBloodMagic; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.command.PlayerNotFoundException; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.server.command.CommandTreeBase; +import net.minecraftforge.server.command.CommandTreeHelp; -import java.util.Locale; +public class SubCommandOrb extends CommandTreeBase { + public SubCommandOrb() { + addSubcommand(new Get()); + addSubcommand(new Set()); + addSubcommand(new CommandTreeHelp(this)); + } -public class SubCommandOrb extends CommandBase { @Override public String getName() { return "orb"; @@ -24,7 +27,7 @@ public class SubCommandOrb extends CommandBase { @Override public String getUsage(ICommandSender commandSender) { - return TextHelper.localizeEffect("commands.bloodmagic.orb.usage"); + return "commands.bloodmagic.orb.usage"; } @Override @@ -32,76 +35,93 @@ public class SubCommandOrb extends CommandBase { return 2; } - @Override - public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException { - if (args.length > 0) { + abstract class OrbCommand extends CommandTreeBase { - if (args[0].equalsIgnoreCase("help")) + public EntityPlayerMP player; + public String uuid; + public SoulNetwork network; + public Object info; + + @Override + public String getUsage(ICommandSender sender) { + return "commands.bloodmagic.orb." + getName() + ".usage"; + } + + public String getHelp() { + return "commands.bloodmagic.orb." + getName() + ".help"; + } + + public String getInfo() { + return ""; + } + + @Override + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { + sender.sendMessage(new TextComponentTranslation(getHelp())); return; - - try { - String givenName = commandSender.getName(); - - if (args.length > 1) - givenName = args[1]; - - EntityPlayer player = CommandBase.getPlayer(server, commandSender, givenName); - String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - SoulNetwork network = NetworkHelper.getSoulNetwork(uuid); - - boolean displayHelp = args.length > 0 && args.length < 2; - - try { - switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH))) { - case SET: { - if (displayHelp) { - CommandBloodMagic.displayHelpString(commandSender, ValidCommands.SET.help); - break; - } - - if (args.length == 3) { - if (Utils.isInteger(args[2])) { - int amount = Integer.parseInt(args[2]); - network.setOrbTier(amount); - CommandBloodMagic.displaySuccessString(commandSender, "commands.bloodmagic.success"); - } else { - CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.invalid"); - } - } else { - CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing"); - } - - break; - } - case GET: { - if (displayHelp) { - CommandBloodMagic.displayHelpString(commandSender, ValidCommands.GET.help); - break; - } - - if (args.length > 1) - commandSender.sendMessage(new TextComponentString(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier()))); - - break; - } - } - } catch (IllegalArgumentException e) { - CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404"); - } - } catch (PlayerNotFoundException e) { - CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404"); } + player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); + network = NetworkHelper.getSoulNetwork(uuid); + + subExecute(server, sender, args); + } + + protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException; + } + + class Get extends OrbCommand { + + @Override + public String getName() { + return "get"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + super.execute(server, sender, args); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.orb.currenttier", network.getOrbTier())); } } - private enum ValidCommands { - SET("commands.bloodmagic.orb.set.help"), - GET("commands.bloodmagic.orb.get.help"); + class Set extends OrbCommand { + //TODO: check whether maxTier check works with custom Blood Orbs + int maxTier = OrbRegistry.getTierMap().size() - 1; - public String help; + @Override + public String getInfo() { + return "" + maxTier; + } - ValidCommands(String help) { - this.help = help; + @Override + public String getName() { + return "set"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + super.execute(server, sender, args); + + int targetTier; + if (args.length == 1 && Utils.isInteger(args[0])) + targetTier = Integer.parseInt(args[0]); + else if (args.length == 2 && Utils.isInteger(args[1])) + targetTier = Integer.parseInt(args[1]); + else { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.arg.invalid")); + sender.sendMessage(new TextComponentTranslation(this.getUsage(sender))); + return; + } + if (targetTier < 0) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.negative")); + return; + } else if (targetTier > maxTier) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.orb.error.tierTooHigh", getInfo())); + return; + } + network.setOrbTier(targetTier); + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); } } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java new file mode 100644 index 00000000..b527ed5f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java @@ -0,0 +1,144 @@ +package WayofTime.bloodmagic.command.sub; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ritual.Ritual; +import WayofTime.bloodmagic.tile.TileMasterRitualStone; +import WayofTime.bloodmagic.util.helper.RitualHelper; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; +import net.minecraftforge.server.command.CommandTreeBase; +import net.minecraftforge.server.command.CommandTreeHelp; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +public class SubCommandRitual extends CommandTreeBase { + public SubCommandRitual() { + addSubcommand(new RitualCreate()); + addSubcommand(new RitualRepair()); + addSubcommand(new CommandTreeHelp(this)); + } + + @Override + public String getName() { + return "ritual"; + } + + @Override + public String getUsage(ICommandSender sender) { + return null; + } + + public TileMasterRitualStone getMRS(ICommandSender sender) { + BlockPos pos = sender.getPosition().down(); + World world = sender.getEntityWorld(); + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileMasterRitualStone) { + return (TileMasterRitualStone) tile; + } + return null; + } + + class RitualCreate extends CommandTreeBase { + public List ritualList = new ArrayList<>(); + public RitualCreate() { + for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { + ritualList.add(BloodMagic.RITUAL_MANAGER.getId(ritual)); + } + } + + @Override + public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) { + return ritualList; + } + + @Override + public String getName() { + return "create"; + } + + @Override + public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException { + if (args.length == 0) { + sender.sendMessage(new TextComponentTranslation("commands.blooodmagic.ritual.create.noRitual")); + return; + } else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) { + sender.sendMessage(new TextComponentTranslation(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getUnlocalizedName() + ".info")); + return; + } + EntityPlayerMP player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]); + boolean safe = false; + if (args.length > 1 && args.length < 4) { + int k = args.length - 1; + if (args[k].equals("true") || args[k].equals("false")) { + safe = Boolean.parseBoolean(args[k]); + } else if (args[1].equals("safe")) + safe = true; + else + player = getPlayer(server, sender, args[1]); + } + + BlockPos pos = player.getPosition().down(); + World world = player.getEntityWorld(); + EnumFacing direction = player.getHorizontalFacing(); + + if (RitualHelper.createRitual(world, pos, direction, BloodMagic.RITUAL_MANAGER.getRitual(args[0]), safe)) + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + else if (!safe) + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); + else + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritaul.create.error.unsafe")); + + } + + @Override + public String getUsage(ICommandSender sender) { + return "commands.bloodmagic.ritual.create.help"; + } + } + + class RitualRepair extends CommandTreeBase { + + @Override + public String getName() { + return "repair"; + } + + @Override + public String getUsage(ICommandSender sender) { + return "commands.bloodmagic.ritual.repair.usage"; + } + + @Override + public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException { + EntityPlayerMP player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + TileMasterRitualStone tile = getMRS(player); + boolean safe = false; + if (args.length > 0 && args.length < 3) { + int k = args.length - 1; + if (args[k].equals("true") || args[k].equals("false")) { + safe = Boolean.parseBoolean(args[k]); + } else if (args[0].equals("safe")) + safe = true; + } + if (tile != null) + if (RitualHelper.repairRitualFromRuins(tile, safe)) + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + else if (!safe) + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); + else + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritaul.create.error.unsafe")); + else + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritual.error.noMRS")); + } + + } +} diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java new file mode 100644 index 00000000..8f74b045 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java @@ -0,0 +1,329 @@ +package WayofTime.bloodmagic.command.sub; + +import WayofTime.bloodmagic.core.data.Binding; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import WayofTime.bloodmagic.teleport.Teleports; +import WayofTime.bloodmagic.tile.TileTeleposer; +import WayofTime.bloodmagic.util.Utils; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; +import net.minecraftforge.server.command.CommandTreeBase; +import net.minecraftforge.server.command.CommandTreeHelp; + +import java.util.HashSet; +import java.util.Set; + +public class SubCommandTeleposer extends CommandTreeBase { + public static final Set teleposerSet = new HashSet<>(); //contains "valid" teleposers (teleposers with focus), teleposers check themselves every 100 ticks. + public static TileTeleposer[] teleposerArray; + + public SubCommandTeleposer() { + addSubcommand(new OutputTeleposerList()); + addSubcommand(new TeleportToTeleposer()); + addSubcommand(new TeleportToTeleposerFocus()); + addSubcommand(new RemoveTeleposer()); + addSubcommand(new RecursiveRemoveTeleposer()); + addSubcommand(new RemoveAllOfPlayer()); + addSubcommand(new CommandTreeHelp(this)); + } + + @Override + public int getRequiredPermissionLevel() { + return 2; + } + + + @Override + public String getName() { + return "teleposer"; + } + + @Override + public String getUsage(ICommandSender sender) { + return "commands.bloodmagic.teleposer.usage"; + } + + abstract class TeleposeHelper extends CommandTreeBase { + public EntityPlayer player; + + @Override + public String getUsage(ICommandSender sender) { + return "commands.bloodmagic.teleposer." + getName() + ".usage"; + } + + public String getHelp() { + return "commands.bloodmagic.teleposer." + getName() + ".help"; + } + + public String getInfo() { + return ""; + } + + @Override + public int getRequiredPermissionLevel() { + return 2; + } + + public TileTeleposer[] cleanUpAndCreateArrayFromTeleposerList(EntityPlayer player) { + if (player == null) + for (TileTeleposer i : teleposerSet) { + if (i == null || i.isInvalid() || i.isEmpty()) { + teleposerSet.remove(i); + } + } + else { + for (TileTeleposer i : teleposerSet) { + if (i == null || i.isInvalid() || i.isEmpty()) { + teleposerSet.remove(i); + continue; + } + ItemStack stack = i.getStackInSlot(0); + ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); + Binding binding = focus.getBinding(stack); + if (binding != null && !binding.getOwnerName().equals(player.getName())) { + teleposerSet.remove(i); + } + } + } + teleposerArray = teleposerSet.toArray(new TileTeleposer[0]); + return teleposerArray; + + } + + public void sendOwnedTeleposerList(ICommandSender sender, EntityPlayer player) { + teleposerArray = cleanUpAndCreateArrayFromTeleposerList(player); + for (int i = 0; i < teleposerArray.length; i++) { + ItemStack stack = teleposerArray[i].getStackInSlot(0); + ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); + Binding binding = focus.getBinding(stack); + if (binding != null) { + String name = binding.getOwnerName(); + if (player != null) { + if (name.equals(player.getName())) + sender.sendMessage(new TextComponentString(i + new TextComponentTranslation("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); + } else + sender.sendMessage(new TextComponentString(i + new TextComponentTranslation("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); + } + } + } + + public Integer getIDFromArgs(ICommandSender sender, String[] args) { + int teleposerID; + if (args.length == 0) { + return null; + } + + if (Utils.isInteger(args[0])) + teleposerID = Integer.parseInt(args[0]); + else if (args.length > 1 && Utils.isInteger(args[1])) + teleposerID = Integer.parseInt(args[1]); + else { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.arg.invalid")); + sender.sendMessage(new TextComponentTranslation(this.getUsage(sender))); + return null; + } + if (teleposerID < 0) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.negative")); + return null; + } + return teleposerID; + } + + @Override + public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (args.length == 1 && args[0].equals("?") || args[0].equals("help")) { + sender.sendMessage(new TextComponentTranslation(getHelp())); + return; + } + if (!(getName().equals("rmrf") || getName().equals("remove"))) { + this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + } + subExecute(server, sender, args); + } + + protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException; + } + + class OutputTeleposerList extends TeleposeHelper { + + @Override + public String getName() { + return "list"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + sendOwnedTeleposerList(sender, player); + } + } + + class TeleportToTeleposer extends TeleposeHelper { + + @Override + public String getName() { + return "teleport"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer teleposerID = getIDFromArgs(sender, args); + if (teleposerID == null) + sendOwnedTeleposerList(sender, null); + else if (!sender.getEntityWorld().isRemote) { + if (teleposerID > teleposerArray.length) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.outofbounds")); + return; + } + TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! + BlockPos brunhildePos = brunhilde.getPos(); + World brunhildeWorld = brunhilde.getWorld(); + if (player.getEntityWorld().equals(brunhildeWorld)) + new Teleports.TeleportSameDim(brunhildePos, player, player.getUniqueID(), false).teleport(); + else + new Teleports.TeleportToDim(brunhildePos, player, player.getUniqueID(), player.getEntityWorld(), brunhildeWorld.provider.getDimension(), false).teleport(); + } else + return; + + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + } + } + + class TeleportToTeleposerFocus extends TeleposeHelper { + + @Override + public String getName() { + return "teleportfocus"; + } + + @Override + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer teleposerID = getIDFromArgs(sender, args); + if (teleposerID == null) + sendOwnedTeleposerList(sender, null); + else if (!sender.getEntityWorld().isRemote) { + if (teleposerID > teleposerArray.length) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.outofbounds")); + return; + } + TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! + ItemStack stack = brunhilde.getStackInSlot(0); + ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); + BlockPos brunhildeFocusPos = focus.getBlockPos(stack); + World brunhildeFocusWorld = focus.getWorld(stack); + if (player.getEntityWorld().equals(brunhildeFocusWorld)) + new Teleports.TeleportSameDim(brunhildeFocusPos, player, player.getUniqueID(), false).teleport(); + else + new Teleports.TeleportToDim(brunhildeFocusPos, player, player.getUniqueID(), player.getEntityWorld(), brunhildeFocusWorld.provider.getDimension(), false).teleport(); + } else + return; + + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + } + } + + class RemoveTeleposer extends TeleposeHelper { + + @Override + public String getName() { + return "remove"; + } + + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer teleposerID = getIDFromArgs(sender, args); + if (teleposerID == null) + sendOwnedTeleposerList(sender, null); + else if (!sender.getEntityWorld().isRemote) { + if (teleposerID > teleposerArray.length) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.outofbounds")); + return; + } + TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! + BlockPos brunhildePos = brunhilde.getPos(); + World brunhildeWorld = brunhilde.getWorld(); + brunhildeWorld.setBlockToAir(brunhildePos); + cleanUpAndCreateArrayFromTeleposerList(null); + } else + return; + + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + } + } + + class RecursiveRemoveTeleposer extends TeleposeHelper { + + @Override + public String getName() { + return "rmrf"; + } + + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + Integer teleposerID = getIDFromArgs(sender, args); + if (teleposerID == null) + sendOwnedTeleposerList(sender, null); + else if (!sender.getEntityWorld().isRemote) { + if (teleposerID > teleposerArray.length) { + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.outofbounds")); + return; + } + TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! + do { + BlockPos brunhildePos = brunhilde.getPos(); + World brunhildeWorld = brunhilde.getWorld(); + ItemStack stack = brunhilde.getStackInSlot(0); + ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); + BlockPos brunhildeFocusPos = focus.getBlockPos(stack); + World brunhildeFocusWorld = focus.getWorld(stack); + brunhilde.setInventorySlotContents(0, ItemStack.EMPTY); + brunhildeWorld.setBlockToAir(brunhildePos); + TileEntity testTile = brunhildeFocusWorld.getTileEntity(brunhildeFocusPos); + if (!(testTile instanceof TileTeleposer) || ((TileTeleposer) testTile).getStackInSlot(0).isEmpty()) + break; + for (TileTeleposer i : teleposerArray) { + if (i.getPos().equals(brunhildeFocusPos)) { + brunhilde = i; + break; + } + + } + } while (true); + cleanUpAndCreateArrayFromTeleposerList(null); + } else + return; + + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + } + + } + + class RemoveAllOfPlayer extends TeleposeHelper { + + @Override + public String getName() { + return "removeall"; + } + + public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + cleanUpAndCreateArrayFromTeleposerList(player); + + if (!sender.getEntityWorld().isRemote) { + for (TileTeleposer i : teleposerArray) { + i.setInventorySlotContents(0, ItemStack.EMPTY); + i.getWorld().setBlockToAir(i.getPos()); + } + + } + cleanUpAndCreateArrayFromTeleposerList(null); + + sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index ebca00db..5a9ea8f0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.teleport.TeleportQueue; +import WayofTime.bloodmagic.teleport.Teleports; +import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.ritual.portal.Teleports; -import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java rename to src/main/java/WayofTime/bloodmagic/teleport/Teleports.java index 43e738dc..646480f3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java @@ -1,9 +1,8 @@ -package WayofTime.bloodmagic.ritual.portal; +package WayofTime.bloodmagic.teleport; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.event.TeleposeEvent; -import WayofTime.bloodmagic.teleport.Teleport; import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -148,7 +147,7 @@ public class Teleports { network.syphon(ticket(oldWorld, player, getTeleportCost())); - /* begin brandon3055 "BrandonsCore" intedimensional teleportation code */ + /* begin brandon3055 "BrandonsCore" interdimensional teleportation code */ PlayerList playerList = server.getPlayerList(); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 8aaf092f..d3c7caf3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,12 +1,13 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.block.BlockTeleposer; +import WayofTime.bloodmagic.command.sub.SubCommandTeleposer; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.ritual.portal.Teleports; import WayofTime.bloodmagic.teleport.TeleportQueue; +import WayofTime.bloodmagic.teleport.Teleports; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NetworkHelper; @@ -56,6 +57,17 @@ public class TileTeleposer extends TileInventory implements ITickable { } previousInput = currentInput; + + if (world.getTotalWorldTime() % 100 == 0) { + ItemStack focusStack = getStackInSlot(0); + if (!focusStack.isEmpty()) { + if (((ItemTelepositionFocus) focusStack.getItem()).getBinding(focusStack) != null) + SubCommandTeleposer.teleposerSet.add(this); + else + SubCommandTeleposer.teleposerSet.remove(this); + } else + SubCommandTeleposer.teleposerSet.remove(this); + } } } @@ -66,14 +78,14 @@ public class TileTeleposer extends TileInventory implements ITickable { Binding binding = focus.getBinding(focusStack); if (binding == null) return; - BlockPos focusPos = focus.getBlockPos(getStackInSlot(0)); - World focusWorld = focus.getWorld(getStackInSlot(0)); + BlockPos focusPos = focus.getBlockPos(focusStack); + World focusWorld = focus.getWorld(focusStack); if (focusWorld == null) return; TileEntity boundTile = focusWorld.getTileEntity(focusPos); if (boundTile instanceof TileTeleposer && boundTile != this) { - final int focusLevel = (getStackInSlot(0).getItemDamage() + 1); + final int focusLevel = (focusStack.getItemDamage() + 1); final int lpToBeDrained = (int) (0.5F * Math.sqrt((pos.getX() - focusPos.getX()) * (pos.getX() - focusPos.getX()) + (pos.getY() - focusPos.getY() + 1) * (pos.getY() - focusPos.getY() + 1) + (pos.getZ() - focusPos.getZ()) * (pos.getZ() - focusPos.getZ()))); if (NetworkHelper.syphonFromContainer(focusStack, SoulTicket.block(world, pos, lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1)))) { diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index eedf6f7c..b9da4f00 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -1,10 +1,12 @@ package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.ritual.IRitualStone; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.RitualComponent; +import WayofTime.bloodmagic.tile.TileMasterRitualStone; import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -14,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; +import org.apache.commons.lang3.tuple.Pair; import java.util.List; @@ -96,10 +99,8 @@ public class RitualHelper { return true; else if (tile instanceof IRitualStone.Tile) return true; - else if (tile != null && tile.hasCapability(RUNE_CAPABILITY, null)) - return true; + else return tile != null && tile.hasCapability(RUNE_CAPABILITY, null); - return false; } public static void setRuneType(World world, BlockPos pos, EnumRuneType type) { @@ -117,4 +118,94 @@ public class RitualHelper { world.notifyBlockUpdate(pos, state, state, 3); } } + + public static boolean createRitual(World world, BlockPos pos, EnumFacing direction, Ritual ritual, boolean safe) { + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + + if (abortConstruction(world, pos, direction, safe, components)) return false; + + IBlockState mrs = RegistrarBloodMagicBlocks.RITUAL_CONTROLLER.getDefaultState(); + world.setBlockState(pos, mrs); + + setRitualStones(direction, world, pos, components); + return true; + } + + public static boolean abortConstruction(World world, BlockPos pos, EnumFacing direction, boolean safe, List components) { + //TODO: can be optimized to check only for the first and last component if every ritual has those at the highest and lowest y-level respectivly. + for (RitualComponent component : components) { + BlockPos offset = component.getOffset(direction); + BlockPos newPos = pos.add(offset); + if (world.isOutsideBuildHeight(newPos) || (safe && !world.isAirBlock(newPos))) + return true; + } + return false; + } + + public static boolean repairRitualFromRuins(TileMasterRitualStone tile, boolean safe) { + Ritual ritual = tile.getCurrentRitual(); + EnumFacing direction; + Pair pair; + if (ritual == null) { + pair = getRitualFromRuins(tile); + ritual = pair.getKey(); + direction = pair.getValue(); + } else + direction = tile.getDirection(); + + World world = tile.getWorld(); + BlockPos pos = tile.getPos(); + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + + if (abortConstruction(world, pos, direction, safe, components)) return false; + + setRitualStones(direction, world, pos, components); + return true; + } + + public static void setRitualStones(EnumFacing direction, World world, BlockPos pos, List gatheredComponents) { + for (RitualComponent component : gatheredComponents) { + BlockPos offset = component.getOffset(direction); + BlockPos newPos = pos.add(offset); + int meta = component.getRuneType().ordinal(); + IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); + world.setBlockState(newPos, newState); + } + } + + + public static Pair getRitualFromRuins(TileMasterRitualStone tile) { + BlockPos pos = tile.getPos(); + World world = tile.getWorld(); + Ritual possibleRitual = tile.getCurrentRitual(); + EnumFacing possibleDirection = tile.getDirection(); + int highestCount = 0; + + if (possibleRitual == null || possibleDirection == null) + for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { + for (EnumFacing direction : EnumFacing.HORIZONTALS) { + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + int currentCount = 0; + + for (RitualComponent component : components) { + BlockPos newPos = pos.add(component.getOffset(direction)); + if (isRuneType(world, newPos, component.getRuneType())) + currentCount += 1; + } + if (currentCount > highestCount) { + highestCount = currentCount; + possibleRitual = ritual; + possibleDirection = direction; + } + + } + + } + return Pair.of(possibleRitual, possibleDirection); + } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 83614e9a..82c23c2e 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -817,9 +817,8 @@ entity.bloodmagic.Mimic.name=Mimic commands.bloodmagic.error.arg.invalid=Invalid arguments commands.bloodmagic.error.arg.missing=Not enough arguments commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on. -commands.bloodmagic.error.404=Command not found! -commands.bloodmagic.error.unknown=Unknown command! -commands.bloodmagic.error.perm=You do not have permission to use this command. +commands.bloodmagic.error.negative=Amount must be a positive Integer. +commands.bloodmagic.error.outofbounds=Given integer is too large (must be within list ID boundaries). commands.bloodmagic.success=Executed successfully @@ -833,42 +832,67 @@ commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] commands.bloodmagic.network.help=LP network utilities commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network. commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s. +commands.bloodmagic.network.syphon.usage=/bloodmagic network syphon [player] [amount] +commands.bloodmagic.network.syphon.amountTooHigh=Cannot syphon more LP than available. commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. +commands.bloodmagic.network.add.usage=/bloodmagic network add [player] [amount] commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network. commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount. +commands.bloodmagic.network.set.usage=/bloodmagic network set [player] [amount] commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP. commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network. +commands.bloodmagic.network.get.usage=/bloodmagic network get [player] commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d. +commands.bloodmagic.network.fill.usage=/bloodmagic network fill [player] commands.bloodmagic.network.fill.success=Successfully filled %s's LP network. commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. +commands.bloodmagic.network.cap.usage=/bloodmagic network cap [player] commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network. -commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] + +commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] ("?" or "help" for help) commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item. -commands.bloodmagic.bind.success=Binding successful +commands.bloodmagic.bind.success=Successfully bound to %d. commands.bloodmagic.bind.remove.success=Unbinding successful +commands.bloodmagic.bind.error.ownerEqualsTarget=Nothing changed: Target and current owner are equal. +commands.bloodmagic.bind.error.notBound=Cannot unbind: Item not bound. +commands.bloodmagic.bind.error.notBindable=Cannot bind: Item not bindable. -commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] +commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] ("?" or "help" for help) commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier. +commands.bloodmagic.orb.get.help=Used to get the Player's max Blood Orb tier. +commands.bloodmagic.orb.get.usage=/bloodmagic orb get [player|?|help] +commands.bloodmagic.orb.set.help=Used to set the Player's max Blood Orb tier. +commands.bloodmagic.orb.set.usage=/bloodmagic orb set [player|?|help] +commands.bloodmagic.orb.currenttier=Current Orb tier is %d. +commands.bloodmagic.orb.error.tierTooHigh=Orb tier cannot be higher than %d. -commands.bloodmagic.bind.failed.noPlayer=There is no player specified -commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it -commands.bloodmagic.bind.failed.notBindable=Item cannot be bound -commands.bloodmagic.unbind.usage=/unbind -commands.bloodmagic.unbind.success=Item successfully unbound! -commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound -commands.bloodmagic.soulnetwork.usage=/soulnetwork [amount] -commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! -commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! -commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network! -commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network! -commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network! -commands.bloodmagic.soulnetwork.noPlayer=There is no player specified -commands.bloodmagic.soulnetwork.noCommand=There is no command specified -commands.bloodmagic.soulnetwork.notACommand=That is not a valid command -commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! -commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) +commands.bloodmagic.ritual.create.help=Creates the specified ritual with the MRS at your feet, ignores other blocks by default. (Optional parameters: ([ (safe|true|false)] | [safe|true|false])) +commands.bloodmagic.ritual.repair.help=Repairs the ritual with the closest match to the remaining ritual stones, ignores other blocks by default. (Optional parameters: ([ (safe|true|false)] | [safe|true|false])) +commands.bloodmagic.ritual.create.noRitual=You must select a ritual. (Tab-completions are available!) +commands.bloodmagic.ritaul.create.error.unsafe=Created or repaired ritual cannot be placed safely. +commands.bloodmagic.ritual.create.error.outOfWorldBoundaries=Created or repaired ritual would be out of world boundaries. +commands.bloodmagic.ritual.error.noMRS=You need to stand on a Master Ritual Stone to execute the command! + +commands.bloodmagic.teleposer.usage=Teleposer Utilities ("?" or "help" for help) +commands.bloodmagic.teleposer.list.help=Returns a list of all valid teleposers, optionally possessed by [player]. +commands.bloodmagic.teleposer.list.usage=/bloodmagic teleposer list [player|?|help] +commands.bloodmagic.teleposer.teleport.help=Teleports to the location of the specified teleposer. +commands.bloodmagic.teleposer.teleport.usage=/bloodmagic teleposer teleport [ID|?|help] +commands.bloodmagic.teleposer.teleportfocus.help=Teleports to the location stored in the specified teleposer's focus. +commands.bloodmagic.teleposer.teleportfocus.usage=/bloodmagic teleposer teleportfocus [ID|?|help] +commands.bloodmagic.teleposer.rmrf.help=Follows teleposer foci and removes all teleposers along the path, starting with the specified teleposer. +commands.bloodmagic.teleposer.rmrf.usage=/bloodmagic teleposer rmrf [ID|?|help] +commands.bloodmagic.teleposer.remove.help=Removes the specified teleposer. +commands.bloodmagic.teleposer.remove.usage=/bloodmagic teleposer remove [ID|?|help] +commands.bloodmagic.teleposer.removeall.help=Removes all teleposers or all teleposers containing a focus bound to [player], if specified. +commands.bloodmagic.teleposer.removeall.usage=/bloodmagic teleposer removeall [player|?|help] + +#Used by commands.bloodmagic.teleposer.list for the dump sent to the player +commands.bloodmagic.teleposer.anddimension=: Teleposer: DimID: +commands.bloodmagic.teleposer.focusanddim=Focus: DimID: +commands.bloodmagic.teleposer.owner=Owner: # GUI From e8eb44632dbc4011e0a5c98e4cbf04ce7b07be7e Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 02:11:32 +0100 Subject: [PATCH 282/493] Ritual Reader Quality of Life (#1528) * Groundwork for Reader part 1 * More Ritual Reader information & more intuitive to use. * Added `getCurrentRitual()` to `IMasterRitualStone` RitualReader can now only be used on MRS with a set Ritual (this prevents a (caught) NPE). * Refactored * Added Enum --- gradle.properties | 2 +- .../bloodmagic/item/ItemRitualReader.java | 36 ++++++++++++++++--- .../potion/PotionEventHandlers.java | 7 +--- .../ritual/EnumReaderBoundaries.java | 22 ++++++++++++ .../bloodmagic/ritual/IMasterRitualStone.java | 4 ++- .../WayofTime/bloodmagic/ritual/Ritual.java | 7 ++-- .../tile/TileMasterRitualStone.java | 25 ++++++------- 7 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java diff --git a/gradle.properties b/gradle.properties index 2b89fa29..48dbcb74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ mappings_version=snapshot_20180201 jei_version=4.8.5.147 waila_version=1.8.23-B38_1.12 -guideapi_version=1.12-2.1.4-57 +guideapi_version=1.12-2.1.4-57 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index b6f7297d..bceeb86e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.ritual.EnumRitualReaderState; import WayofTime.bloodmagic.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.util.ChatUtil; @@ -20,6 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -90,6 +92,8 @@ public class ItemRitualReader extends Item implements IVariantProvider { TileEntity tile = world.getTileEntity(pos); if (tile instanceof IMasterRitualStone) { IMasterRitualStone master = (IMasterRitualStone) tile; + if (master.getCurrentRitual() == null) + super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); this.setMasterBlockPos(stack, pos); this.setBlockPos(stack, BlockPos.ORIGIN); @@ -99,7 +103,8 @@ public class ItemRitualReader extends Item implements IVariantProvider { break; case SET_AREA: String range = this.getCurrentBlockRange(stack); - if (player.isSneaking()) { + + if (range == null || player.isSneaking()) { String newRange = master.getNextBlockRange(range); range = newRange; this.setCurrentBlockRange(stack, newRange); @@ -136,16 +141,37 @@ public class ItemRitualReader extends Item implements IVariantProvider { if (!masterPos.equals(BlockPos.ORIGIN)) { BlockPos containedPos = getBlockPos(stack); if (containedPos.equals(BlockPos.ORIGIN)) { - this.setBlockPos(stack, pos.subtract(masterPos)); + BlockPos pos1 = pos.subtract(masterPos); + this.setBlockPos(stack, pos1); player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.firstBlock"), true); - //TODO: Notify player. + player.sendMessage(new TextComponentString(pos1.toString())); } else { tile = world.getTileEntity(masterPos); if (tile instanceof IMasterRitualStone) { IMasterRitualStone master = (IMasterRitualStone) tile; - master.setBlockRangeByBounds(player, this.getCurrentBlockRange(stack), containedPos, pos.subtract(masterPos)); - } + BlockPos pos2 = pos.subtract(masterPos); + String range = this.getCurrentBlockRange(stack); + Ritual ritual = master.getCurrentRitual(); + //TODO: Fix AreaDescriptor area handling to be inclusive, then remove the "-1" for range calculation below. + int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, null, null) - 1; + int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, null, null) - 1; + int maxVolume = ritual.getMaxVolumeForRange(range, null, null); + switch (master.setBlockRangeByBounds(player, range, containedPos, pos2)) { + case SUCCESS: + player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.success"), true); + break; + case NOT_WITHIN_BOUNDARIES: + player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.tooFar", maxVerticalRange, maxHorizontalRange), false); + break; + case VOLUME_TOO_LARGE: + player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.tooBig", maxVolume), false); + break; + default: + player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.noRange"), false); + break; + } + } this.setBlockPos(stack, BlockPos.ORIGIN); } } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 57f68fc2..46b12fc1 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -13,11 +13,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import net.minecraftforge.event.entity.living.LivingAttackEvent; -import net.minecraftforge.event.entity.living.LivingDamageEvent; -import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; @@ -26,7 +22,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ArrayList; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class PotionEventHandlers { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java new file mode 100644 index 00000000..0f69f17c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java @@ -0,0 +1,22 @@ +package WayofTime.bloodmagic.ritual; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum EnumReaderBoundaries implements IStringSerializable { + SUCCESS, + VOLUME_TOO_LARGE, + NOT_WITHIN_BOUNDARIES; + + + @Override + public String toString() { + return name().toLowerCase(Locale.ROOT); + } + + @Override + public String getName() { + return toString(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index 8f338258..6ed5924b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -55,7 +55,7 @@ public interface IMasterRitualStone { void setActiveWillConfig(EntityPlayer player, List typeList); - boolean setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2); + EnumReaderBoundaries setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2); List getActiveWillConfig(); @@ -68,4 +68,6 @@ public interface IMasterRitualStone { void addBlockRanges(Map blockRanges); void addBlockRange(String range, AreaDescriptor defaultRange); + + Ritual getCurrentRitual(); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 7e642e6c..95504bce 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,7 +15,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.*; import java.util.Map.Entry; -import java.util.function.BiFunction; import java.util.function.Consumer; /** @@ -186,13 +185,13 @@ public abstract class Ritual { return rangeList.get(0); } - public boolean canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) { + public EnumReaderBoundaries canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) { List willConfig = master.getActiveWillConfig(); int maxVolume = getMaxVolumeForRange(range, willConfig, holder); int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder); int maxHorizontal = getMaxHorizontalRadiusForRange(range, willConfig, holder); - return (maxVolume <= 0 || descriptor.getVolumeForOffsets(offset1, offset2) <= maxVolume) && descriptor.isWithinRange(offset1, offset2, maxVertical, maxHorizontal); + return (maxVolume <= 0 || descriptor.getVolumeForOffsets(offset1, offset2) <= maxVolume) ? descriptor.isWithinRange(offset1, offset2, maxVertical, maxHorizontal) ? EnumReaderBoundaries.SUCCESS : EnumReaderBoundaries.NOT_WITHIN_BOUNDARIES : EnumReaderBoundaries.VOLUME_TOO_LARGE; } protected void setMaximumVolumeAndDistanceOfRange(String range, int volume, int horizontalRadius, int verticalRadius) { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index e27f53b4..1f803f26 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -9,6 +9,7 @@ import WayofTime.bloodmagic.event.RitualEvent; import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.ritual.AreaDescriptor; +import WayofTime.bloodmagic.ritual.EnumReaderBoundaries; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.soul.DemonWillHolder; @@ -159,7 +160,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS this.cachedNetwork = network; this.currentRitual = ritual; - if(!checkBlockRanges(ritual.getModableRangeMap())) + if (!checkBlockRanges(ritual.getModableRangeMap())) addBlockRanges(ritual.getModableRangeMap()); notifyUpdate(); @@ -188,10 +189,10 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (MinecraftForge.EVENT_BUS.post(event)) return; - + if (!checkBlockRanges(getCurrentRitual().getModableRangeMap())) addBlockRanges(getCurrentRitual().getModableRangeMap()); - + getCurrentRitual().performRitual(this); } else { stopRitual(Ritual.BreakType.BREAK_STONE); @@ -307,17 +308,17 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public void setActiveWillConfig(EntityPlayer player, List typeList) { this.currentActiveWillConfig = typeList; } - + @Override - public boolean setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2) { + public EnumReaderBoundaries setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2) { AreaDescriptor descriptor = this.getBlockRange(range); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos()); - if (this.currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder)) { - descriptor.modifyAreaByBlockPositions(offset1, offset2); - return true; - } - return false; + EnumReaderBoundaries modificationType = currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder); + if (modificationType == EnumReaderBoundaries.SUCCESS) + descriptor.modifyAreaByBlockPositions(offset1, offset2); + + return modificationType; } @Override @@ -428,13 +429,13 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS modableRangeMap.put(range, defaultRange); } - public void addBlockRanges(Map blockRanges){ + public void addBlockRanges(Map blockRanges) { for (Map.Entry entry : blockRanges.entrySet()) { modableRangeMap.put(entry.getKey(), entry.getValue()); } } - public boolean checkBlockRanges(Map blockRanges){ + public boolean checkBlockRanges(Map blockRanges) { for (Map.Entry entry : blockRanges.entrySet()) { if (modableRangeMap.get(entry.getKey()) == null) return false; From 4bf8e94d26378243b331a10d08652120e0310ff0 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 02:13:24 +0100 Subject: [PATCH 283/493] Changed required Activation Crystal levels for Ritual Activation (#1456) These Rituals will require an Awakened Activation Crystal: From 1.7.10: - RitualMeteor (Mark of the falling Tower) New: - all Living Armor related Rituals (because it is the most end-game/powerful stuff right now). I changed the Activation Crystal level for the Living Armor related rituals based on the (old) Bound Armor related rituals. Remaining (non-ported) Rituals (from 1.7.10) that require an Awakened Activation Crystal: NOTE: Some of those Rituals represent an outdated concept, don't assume that they will be ported. - DrillOfTheDead (Sanguimancy - More powerful version of Well of Suffering) - AW016FeatheredEarth (no fall damage?); "Ritual of the Feathered Earth" - AW017Gaia (no idea); "Ritual of Gaia's Transformation" - AW018Condor (localized creative flight); "Ritual of the Condor" - AW025Conduit (transferring LP from network to Altar); "Cry of the Eternal Soul" - AW031Convocation (how do I get Tier6?); "Convocation of the Damned" - AW032Symmetry (Omega upgrade for Bound Armor); "Symmetry of the Omega" - AW033Stalling (permanent Omega upgrade?); "Duet of the Fused Souls" - AW036SphereIsland (Shard of Laputa alike); "Blood of the New Moon" --- .../bloodmagic/ritual/types/RitualArmourEvolve.java | 2 +- .../ritual/types/RitualLivingArmourDowngrade.java | 6 +++--- .../WayofTime/bloodmagic/ritual/types/RitualMeteor.java | 3 ++- .../bloodmagic/ritual/types/RitualUpgradeRemove.java | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index 77251191..8f2ed0a5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -19,7 +19,7 @@ public class RitualArmourEvolve extends Ritual { public static final String CHECK_RANGE = "fillRange"; public RitualArmourEvolve() { - super("ritualArmourEvolve", 0, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual"); + super("ritualArmourEvolve", 2, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual"); addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index ea2da47c..0d633b79 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; @@ -33,7 +33,7 @@ public class RitualLivingArmourDowngrade extends Ritual { private int internalTimer = 0; public RitualLivingArmourDowngrade() { - super("ritualDowngrade", 0, 10000, "ritual." + BloodMagic.MODID + ".downgradeRitual"); + super("ritualDowngrade", 2, 10000, "ritual." + BloodMagic.MODID + ".downgradeRitual"); addBlockRange(DOWNGRADE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 0, -3), 7)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 9cffa010..9579495f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -22,7 +22,8 @@ public class RitualMeteor extends Ritual { public static final double destructiveWillDrain = 50; public RitualMeteor() { - super("ritualMeteor", 0, 0, "ritual." + BloodMagic.MODID + ".meteorRitual"); + super("ritualMeteor", 2, 0, "ritual." + BloodMagic.MODID + ".meteorRitual"); + addBlockRange(ITEM_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); setMaximumVolumeAndDistanceOfRange(ITEM_RANGE, 0, 10, 10); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index c8e210ef..1addb3c6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; @@ -26,7 +26,7 @@ public class RitualUpgradeRemove extends Ritual { public static final String CHECK_RANGE = "fillRange"; public RitualUpgradeRemove() { - super("ritualUpgradeRemove", 0, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual"); + super("ritualUpgradeRemove", 2, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual"); addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); } From 95464ca509fb8c753e585dfc007921db2f6573b7 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 02:15:11 +0100 Subject: [PATCH 284/493] Bounding boxes / Collision boxes rework (#1464) * Bounding boxes, first part: - BlockDemonCrystal ATTACHED "UP" (facing upwards) (AABB_UP) finished all ages - BlockDemonCrystal Age 0 finished for all ATTACHED values TODO: Remaining ATTACHED/AGE values, making it look a bit more tidy. - BlockIncenseAltar: changed bounding box to the closest full pixel - BlockDemonPylon: Made bounding box a bit higher TODO: remaining blocks that are visually higher or smaller than a full block, how should values be displayed: "x / 16F" or "0.X" * Bounding boxes, second part: - up to EAST, age 1 TODO: Remaining ATTACHED/AGE values. TODO: remaining blocks that are visually higher or smaller than a full block, how should values be displayed: "x / 16F" or "0.X" * Finished EAST, started WEST * finished WEST * Changed Bounding and Collision boxes for: BlockAlchemyTable - lowered by 2 pixels (fits with base model without "accessoires" on the table) BlockAltar - lowered by 4 pixels (fits with base model) BlockDemonCrucible - seperated into ARMS, BODY and LEGS, each with their own collision boxes. Uses BODY as Bounding box BlockDemonPylon - seperated into BODY and LEGS, uses BODY as Bounding box. * Alchemy Table BB --- .../bloodmagic/block/BlockAlchemyTable.java | 8 +- .../bloodmagic/block/BlockAltar.java | 12 +- .../bloodmagic/block/BlockDemonCrucible.java | 70 +++++++ .../bloodmagic/block/BlockDemonCrystal.java | 195 +++++++++++++++--- .../bloodmagic/block/BlockDemonPylon.java | 66 ++++++ .../bloodmagic/block/BlockIncenseAltar.java | 2 +- 6 files changed, 325 insertions(+), 28 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 8d9c9b8f..6e6fe841 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; import WayofTime.bloodmagic.tile.TileAlchemyTable; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; @@ -17,6 +17,7 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -26,6 +27,7 @@ import javax.annotation.Nullable; public class BlockAlchemyTable extends Block implements IBMBlock { public static final PropertyBool INVISIBLE = PropertyBool.create("invisible"); public static final PropertyEnum DIRECTION = PropertyEnum.create("direction", EnumFacing.class); + private static final AxisAlignedBB BODY = new AxisAlignedBB(0, 0, 0, 16 / 16F, 13 / 16F, 16 / 16F); public BlockAlchemyTable() { super(Material.ROCK); @@ -40,6 +42,10 @@ public class BlockAlchemyTable extends Block implements IBMBlock { // setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); } + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return BODY; + } + @Override public boolean isOpaqueCube(IBlockState state) { return false; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 3f979f47..136f7801 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.*; +import WayofTime.bloodmagic.altar.AltarUtil; +import WayofTime.bloodmagic.altar.ComponentType; +import WayofTime.bloodmagic.altar.IAltarManipulator; +import WayofTime.bloodmagic.altar.IBloodAltar; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulNetwork; @@ -23,6 +26,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; @@ -35,6 +39,8 @@ import java.util.ArrayList; import java.util.List; public class BlockAltar extends Block implements IVariantProvider, IDocumentedBlock, IBMBlock { + private static final AxisAlignedBB BODY = new AxisAlignedBB(0, 0, 0, 16 / 16F, 12 / 16F, 16 / 16F); + public BlockAltar() { super(Material.ROCK); @@ -45,6 +51,10 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl setHarvestLevel("pickaxe", 1); } + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return BODY; + } + @Override public boolean hasComparatorInputOverride(IBlockState state) { return true; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 5627ce9d..b4d5c1d2 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -6,9 +6,11 @@ import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -16,13 +18,34 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBlock { + protected static final AxisAlignedBB BODY = new AxisAlignedBB(2 / 16F, 7 / 16F, 2 / 16F, 14 / 16F, 15 / 16F, 14 / 16F); + private static final AxisAlignedBB[] ARMS = { + new AxisAlignedBB(5 / 16F, 13 / 16F, 0 / 16F, 11 / 16F, 25 / 16F, 2 / 16F), // N + new AxisAlignedBB(14 / 16F, 13 / 16F, 5 / 16F, 16 / 16F, 25 / 16F, 11 / 16F), // E + new AxisAlignedBB(5 / 16F, 13 / 16F, 14 / 16F, 11 / 16F, 25 / 16F, 16 / 16F), // S + new AxisAlignedBB(0 / 16F, 13 / 16F, 5 / 16F, 2 / 16F, 25 / 16F, 11 / 16F) // W + }; + private static final AxisAlignedBB[] FEET = { + new AxisAlignedBB(10 / 16F, 0F, 2 / 16F, 14 / 16F, 7 / 16F, 6 / 16F), // NE + new AxisAlignedBB(10 / 16F, 0F, 10 / 16F, 14 / 16F, 7 / 16F, 14 / 16F), // SE + new AxisAlignedBB(2 / 16F, 0F, 10 / 16F, 6 / 16F, 7 / 16F, 14 / 16F), // SW + new AxisAlignedBB(2 / 16F, 0F, 2 / 16F, 6 / 16F, 7 / 16F, 6 / 16F) // NW + }; + + public BlockDemonCrucible() { super(Material.ROCK); @@ -35,6 +58,18 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl // setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); } + private static List getCollisionBoxList(IBlockState state) { + ArrayList collBox = new ArrayList<>(Arrays.asList(ARMS)); + collBox.add(BODY); + collBox.addAll(Arrays.asList(FEET)); + return collBox; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return BODY; + } + @Override public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { return false; @@ -99,4 +134,39 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl public ItemBlock getItem() { return new ItemBlock(this); } + + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + List list = Lists.newArrayList(); + + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { + list.add(this.rayTrace(pos, start, end, axisalignedbb)); + } + + RayTraceResult rayTrace = null; + double d1 = 0.0D; + + for (RayTraceResult raytraceresult : list) { + if (raytraceresult != null) { + double d0 = raytraceresult.hitVec.squareDistanceTo(end); + + if (d0 > d1) { + rayTrace = raytraceresult; + d1 = d0; + } + } + } + + return rayTrace; + } + + @Override + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + state = this.getActualState(state, worldIn, pos); + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { + addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 61b7073c..78a54ba5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.tile.TileDemonCrystal; +import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -15,6 +16,7 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -23,17 +25,81 @@ import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.EnumMap; +import java.util.List; public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvider { + public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", EnumFacing.class); + private static final EnumMap bounds = new EnumMap<>(EnumFacing.class); + + // Bounding / Collision boxes + private static final AxisAlignedBB[] UP = { + new AxisAlignedBB(6 / 16F, 0, 5 / 16F, 10 / 16F, 13 / 16F, 9 / 16F), + new AxisAlignedBB(7 / 16F, 0, 0, 13 / 16F, 6 / 16F, 5 / 16F), + new AxisAlignedBB(9 / 16F, 0, 9 / 16F, 13 / 16F, 5 / 16F, 14 / 16F), + new AxisAlignedBB(2 / 16F, 0, 1 / 16F, 7 / 16F, 6 / 16F, 7 / 16F), + new AxisAlignedBB(5 / 16F, 0, 9 / 16F, 9 / 16F, 7 / 16F, 15 / 16F), + new AxisAlignedBB(0, 0, 7 / 16F, 6 / 16F, 6 / 16F, 10 / 16F), + new AxisAlignedBB(10 / 16F, 0, 6 / 16F, 15 / 16F, 6 / 16F, 9 / 16F) + }; + private static final AxisAlignedBB[] DOWN = { + new AxisAlignedBB(6 / 16F, 3 / 16F, 7 / 16F, 10 / 16F, 16 / 16F, 11 / 16F), + new AxisAlignedBB(7 / 16F, 10 / 16F, 11 / 16F, 13 / 16F, 16 / 16F, 16 / 16F), + new AxisAlignedBB(9 / 16F, 11 / 16F, 2 / 16F, 13 / 16F, 16 / 16F, 7 / 16F), + new AxisAlignedBB(2 / 16F, 9 / 16F, 11 / 16F, 7 / 16F, 16 / 16F, 15 / 16F), + new AxisAlignedBB(5 / 16F, 9 / 16F, 1 / 16F, 9 / 16F, 16 / 16F, 7 / 16F), + new AxisAlignedBB(0, 10 / 16F, 6 / 16F, 6 / 16F, 16 / 16F, 9 / 16F), + new AxisAlignedBB(10 / 16F, 11 / 16F, 7 / 16F, 15 / 16F, 16 / 16F, 10 / 16F) + }; + private static final AxisAlignedBB[] NORTH = { + new AxisAlignedBB(6 / 16F, 5 / 16F, 3 / 16F, 10 / 16F, 9 / 16F, 16 / 16F), + new AxisAlignedBB(9 / 16F, 0, 6 / 16F, 13 / 16F, 5 / 16F, 16 / 16F), + new AxisAlignedBB(8 / 16F, 9 / 16F, 11 / 16F, 13 / 16F, 14 / 16F, 16 / 16F), + new AxisAlignedBB(2 / 16F, 1 / 16F, 9 / 16F, 7 / 16F, 7 / 16F, 16 / 16F), + new AxisAlignedBB(5 / 16F, 9 / 16F, 9 / 16F, 9 / 16F, 15 / 16F, 16 / 16F), + new AxisAlignedBB(0, 7 / 16F, 10 / 16F, 6 / 16F, 10 / 16F, 16 / 16F), + new AxisAlignedBB(10 / 16F, 7 / 16F, 10 / 16F, 15 / 16F, 9 / 16F, 15 / 16F), + }; + private static final AxisAlignedBB[] SOUTH = { + new AxisAlignedBB(6 / 16F, 7 / 16F, 0 / 16F, 10 / 16F, 11 / 16F, 13 / 16F), + new AxisAlignedBB(7 / 16F, 11 / 16F, 0, 13 / 16F, 16 / 16F, 6 / 16F), + new AxisAlignedBB(8 / 16F, 2 / 16F, 9 / 16F, 13 / 16F, 7 / 16F, 14 / 16F), + new AxisAlignedBB(2 / 16F, 9 / 16F, 1 / 16F, 7 / 16F, 14 / 16F, 7 / 16F), + new AxisAlignedBB(5 / 16F, 1 / 16F, 9 / 16F, 9 / 16F, 7 / 16F, 9 / 16F), + new AxisAlignedBB(0, 6 / 16F, 1 / 16F, 6 / 16F, 9 / 16F, 7 / 16F), + new AxisAlignedBB(10 / 16F, 8 / 16F, 1 / 16F, 15 / 16F, 10 / 16F, 6 / 16F) + }; + private static final AxisAlignedBB[] EAST = { + new AxisAlignedBB(0, 6 / 16F, 5 / 16F, 13 / 16F, 10 / 16F, 9 / 16F), + new AxisAlignedBB(0, 3 / 16F, 0, 6 / 16F, 9 / 16F, 5 / 16F), + new AxisAlignedBB(0 / 16F, 3 / 16F, 9 / 16F, 5 / 16F, 8 / 16F, 14 / 16F), + new AxisAlignedBB(1 / 16F, 9 / 16F, 1 / 16F, 7 / 16F, 13 / 16F, 7 / 16F), + new AxisAlignedBB(1 / 16F, 0, 9 / 16F, 7 / 16F, 11 / 16F, 15 / 16F), + new AxisAlignedBB(0, 10 / 16F, 7 / 16F, 6 / 16F, 16 / 16F, 10 / 16F), + new AxisAlignedBB(0, 1 / 16F, 6 / 16F, 5 / 16F, 6 / 16F, 9 / 16F) + }; + private static final AxisAlignedBB[] WEST = { + new AxisAlignedBB(3 / 16F, 6 / 16F, 5 / 16F, 16 / 16F, 10 / 16F, 9 / 16F), + new AxisAlignedBB(9 / 16F, 7 / 16F, 0, 16 / 16F, 12 / 16F, 5 / 16F), + new AxisAlignedBB(11 / 16F, 4 / 16F, 9 / 16F, 16 / 16F, 13 / 16F, 14 / 16F), + new AxisAlignedBB(9 / 16F, 3 / 16F, 1 / 16F, 16 / 16F, 8 / 16F, 7 / 16F), + new AxisAlignedBB(9 / 16F, 6 / 16F, 9 / 16F, 16 / 16F, 8 / 16F, 15 / 16F), + new AxisAlignedBB(10 / 16F, 1 / 16F, 7 / 16F, 16 / 16F, 6 / 16F, 10 / 16F), + new AxisAlignedBB(10 / 16F, 6 / 16F, 6 / 16F, 15 / 16F, 15 / 16F, 9 / 16F) + }; public BlockDemonCrystal() { super(Material.ROCK); @@ -46,6 +112,72 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid setHarvestLevel("pickaxe", 2); } + public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) { + ItemStack stack = ItemStack.EMPTY; + switch (type) { + case CORROSIVE: + stack = EnumDemonWillType.CORROSIVE.getStack(); + break; + case DEFAULT: + stack = EnumDemonWillType.DEFAULT.getStack(); + break; + case DESTRUCTIVE: + stack = EnumDemonWillType.DESTRUCTIVE.getStack(); + break; + case STEADFAST: + stack = EnumDemonWillType.STEADFAST.getStack(); + break; + case VENGEFUL: + stack = EnumDemonWillType.VENGEFUL.getStack(); + break; + } + + stack.setCount(crystalNumber); + return stack; + } + + // collects a sublist from 0 to age for the collision boxes + private static List getCollisionBoxList(IBlockState state) { + int age = state.getValue(BlockDemonCrystal.AGE) + 1; + switch (state.getValue(BlockDemonCrystal.ATTACHED)) { + case DOWN: + return Arrays.asList(DOWN).subList(0, age); + case NORTH: + return Arrays.asList(NORTH).subList(0, age); + case SOUTH: + return Arrays.asList(SOUTH).subList(0, age); + case WEST: + return Arrays.asList(WEST).subList(0, age); + case EAST: + return Arrays.asList(EAST).subList(0, age); + case UP: + default: + return Arrays.asList(UP).subList(0, age); + } + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + TileEntity tile = source.getTileEntity(pos); + if (tile != null) + state = getActualState(state, tile.getWorld(), pos); + switch (state.getValue(ATTACHED)) { + case DOWN: + return DOWN[0]; + case NORTH: + return NORTH[0]; + case SOUTH: + return SOUTH[0]; + case EAST: + return EAST[0]; + case WEST: + return WEST[0]; + case UP: + default: + return UP[0]; + } + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { @@ -62,7 +194,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid if (!crystal.getWorld().isRemote && isCreative && holdsCrystal) { if (crystal.crystalCount < 7) { crystal.internalCounter = 0; - if(crystal.progressToNextCrystal > 0) + if (crystal.progressToNextCrystal > 0) crystal.progressToNextCrystal--; crystal.crystalCount++; crystal.markDirty(); @@ -167,6 +299,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid @Override public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE).ordinal(); } @@ -186,30 +319,6 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid return new TileDemonCrystal(); } - public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) { - ItemStack stack = ItemStack.EMPTY; - switch (type) { - case CORROSIVE: - stack = EnumDemonWillType.CORROSIVE.getStack(); - break; - case DEFAULT: - stack = EnumDemonWillType.DEFAULT.getStack(); - break; - case DESTRUCTIVE: - stack = EnumDemonWillType.DESTRUCTIVE.getStack(); - break; - case STEADFAST: - stack = EnumDemonWillType.STEADFAST.getStack(); - break; - case VENGEFUL: - stack = EnumDemonWillType.VENGEFUL.getStack(); - break; - } - - stack.setCount(crystalNumber); - return stack; - } - @Override public ItemBlock getItem() { return new ItemBlockDemonCrystal(this); @@ -220,4 +329,40 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid for (EnumDemonWillType willType : EnumDemonWillType.values()) variants.put(willType.ordinal(), "age=3,attached=up,type=" + willType.getName()); } + + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + List list = Lists.newArrayList(); + + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { + list.add(this.rayTrace(pos, start, end, axisalignedbb)); + } + + RayTraceResult rayTrace = null; + double d1 = 0.0D; + + for (RayTraceResult raytraceresult : list) { + if (raytraceresult != null) { + double d0 = raytraceresult.hitVec.squareDistanceTo(end); + + if (d0 > d1) { + rayTrace = raytraceresult; + d1 = d0; + } + } + } + + return rayTrace; + } + + @Override + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + state = this.getActualState(state, worldIn, pos); + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { + addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); + } + } + } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 60fdafea..38a64240 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -3,17 +3,36 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonPylon; +import com.google.common.collect.Lists; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVariantProvider { + protected static final AxisAlignedBB BODY = new AxisAlignedBB(2 / 16F, 7 / 16F, 2 / 16F, 14 / 16F, 20 / 16F, 14 / 16F); + private static final AxisAlignedBB[] FEET = { + new AxisAlignedBB(10 / 16F, 0F, 2 / 16F, 14 / 16F, 7 / 16F, 6 / 16F), // NE + new AxisAlignedBB(10 / 16F, 0F, 10 / 16F, 14 / 16F, 7 / 16F, 14 / 16F), // SE + new AxisAlignedBB(2 / 16F, 0F, 10 / 16F, 6 / 16F, 7 / 16F, 14 / 16F), // SW + new AxisAlignedBB(2 / 16F, 0F, 2 / 16F, 6 / 16F, 7 / 16F, 6 / 16F) // NW + }; + private static final AxisAlignedBB[] ARMS = {}; + public BlockDemonPylon() { super(Material.ROCK); @@ -26,6 +45,18 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian // setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); } + private static List getCollisionBoxList(IBlockState state) { + ArrayList collBox = new ArrayList<>(Arrays.asList(ARMS)); + collBox.add(BODY); + collBox.addAll(Arrays.asList(FEET)); + return collBox; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return BODY; + } + @Override public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { return false; @@ -60,4 +91,39 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian public ItemBlock getItem() { return new ItemBlock(this); } + + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + List list = Lists.newArrayList(); + + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { + list.add(this.rayTrace(pos, start, end, axisalignedbb)); + } + + RayTraceResult rayTrace = null; + double d1 = 0.0D; + + for (RayTraceResult raytraceresult : list) { + if (raytraceresult != null) { + double d0 = raytraceresult.hitVec.squareDistanceTo(end); + + if (d0 > d1) { + rayTrace = raytraceresult; + d1 = d0; + } + } + } + + return rayTrace; + } + + @Override + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + state = this.getActualState(state, worldIn, pos); + + for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { + addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index e77d0982..12d9d77e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; import javax.annotation.Nullable; public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlock { - protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); + protected static final AxisAlignedBB AABB = new AxisAlignedBB(5 / 16F, 0F, 5 / 16F, 12 / 16F, 1F, 11 / 16F); public BlockIncenseAltar() { super(Material.ROCK); From 05f0bb733bc378ff2e2db51ee0c3c78aee7e6b8c Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 02:16:02 +0100 Subject: [PATCH 285/493] Removed some redundant stuff for Bindable items, improved inheritance (#1455) * Added explicit Tooltip for unbound items and restructured Bindable inheritance - Added a "Item is not bound" tooltip to ItemBindableBase - Streamlined inheritance. All Sigils now extend ItemBindableBase at some point. - removed redundant hasTextCompound check * Removed TextHelper usages in the affected files. * Nobody likes tooltips. * Forgot the translation entry. * Reverted change --- .../WayofTime/bloodmagic/item/ItemBindableBase.java | 4 ++-- .../WayofTime/bloodmagic/item/sigil/ItemSigil.java | 7 +++---- .../bloodmagic/item/sigil/ItemSigilBase.java | 13 +++---------- .../item/sigil/ItemSigilToggleableBase.java | 9 ++------- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index 71bafcd7..fa5d84e8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,6 +29,6 @@ public class ItemBindableBase extends Item implements IBindable { Binding binding = getBinding(stack); if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + tooltip.add(new TextComponentTranslation("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).getFormattedText()); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java index 70be6e84..496958e1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.item.ItemBindableBase; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; /** * Base class for all (static) sigils. */ -public class ItemSigil extends Item implements IBindable, ISigil { +public class ItemSigil extends ItemBindableBase implements ISigil { private int lpUsed; public ItemSigil(int lpUsed) { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index c62a8ca8..dd4471dc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -2,14 +2,15 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.text.WordUtils; import javax.annotation.Nonnull; import java.util.Arrays; @@ -24,7 +25,6 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { super(lpUsed); setUnlocalizedName(BloodMagic.MODID + ".sigil." + name); - setCreativeTab(BloodMagic.TAB_BM); this.name = name; this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; @@ -38,14 +38,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (TextHelper.canTranslate(tooltipBase + "desc")) - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(tooltipBase + "desc")))); - - if (!stack.hasTagCompound()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + tooltip.addAll(Arrays.asList(WordUtils.wrap(new TextComponentTranslation(tooltipBase + "desc").getFormattedText(), 30, "/cut", false).split("/cut"))); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 08fb9dff..2586e266 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -3,11 +3,10 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -38,11 +37,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes if (!stack.hasTagCompound()) return; - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated"))); - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + tooltip.add(new TextComponentTranslation("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated")).getFormattedText()); } @Override From 1426e49164325d2880496b9370ed06635bdb8525 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Fri, 1 Feb 2019 02:17:00 +0100 Subject: [PATCH 286/493] Potion tipped & modded arrows now get the will effects applied alongside them. (#1424) * Potion tipped arrows now get the will effects applied alongside them - Destructive releases a splash potion at the target location - potion amplifiers are increased if the potion effect is already applied by the will type (poison, levitation, slowness) * On hold for now, I'll do the commands first (I've had enough of arrows for this week). * Revert Sentient Bow/Arrow to handle only potion arrows and fire regular modded arrows. * Removed last remnants of modded arrow creation code. * arrowHit() now supports modded Arrows (onUpdate() has the issue of TNT arrows exploding indefinitely atm) * Crashes when firing a TNT arrow from the SimplyArrows mod with destructive will infused sentient bow * Fixed potion arrows. Modded arrows now work fully when hitting the ground (no splash visual effect). * Added scaling for explosive potion arrows + cleanup --- .../projectile/EntitySentientArrow.java | 320 +++++++++++++----- .../bloodmagic/item/soul/ItemSentientBow.java | 241 ++++++------- 2 files changed, 330 insertions(+), 231 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index 1e91024e..aa90eaa3 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,59 +1,94 @@ package WayofTime.bloodmagic.entity.projectile; -import java.util.Locale; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityTippedArrow; -import net.minecraft.init.Items; -import net.minecraft.init.MobEffects; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.EnumDifficulty; -import net.minecraft.world.World; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.util.Constants; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntityTippedArrow; +import net.minecraft.init.Items; +import net.minecraft.init.MobEffects; +import net.minecraft.init.PotionTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.PotionType; +import net.minecraft.potion.PotionUtils; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.World; -public class EntitySentientArrow extends EntityTippedArrow -{ +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Locale; + +public class EntitySentientArrow extends EntityTippedArrow { + public PotionType potion = PotionTypes.EMPTY; public double reimbursedAmountOnHit = 0; public EnumDemonWillType type = EnumDemonWillType.DEFAULT; public int currentLevel = 0; - public float[] destructiveExplosionRadius = { 0.5f, 1, 1.5f, 2, 2.5f, 3, 3.5f }; - public int[] poisonDuration = { 50, 100, 150, 80, 120, 160, 200 }; - public int[] poisonLevel = { 0, 0, 0, 1, 1, 1, 1 }; - public int[] levitationDuration = { 20, 40, 60, 80, 100, 120, 160 }; - public int[] levitationLevel = { 0, 0, 0, 1, 1, 1, 2 }; - public int[] slownessDuration = { 40, 60, 100, 150, 200, 250, 300 }; - public int[] slownessLevel = { 0, 0, 0, 1, 1, 1, 2 }; + public ItemStack itemStack; + public Class specialArrowClass; + public float[] destructiveExplosionRadius = {0.5f, 1, 1.5f, 2, 2.5f, 3, 3.5f}; + public int[] poisonDuration = {50, 100, 150, 80, 120, 160, 200}; + public int[] poisonLevel = {0, 0, 0, 1, 1, 1, 1}; + public int[] levitationDuration = {20, 40, 60, 80, 100, 120, 160}; + public int[] levitationLevel = {0, 0, 0, 1, 1, 1, 2}; + public int[] slownessDuration = {40, 60, 100, 150, 200, 250, 300}; + public int[] slownessLevel = {0, 0, 0, 1, 1, 1, 2}; + public EntityArrow specialEntity; + public MethodHandle specialHitMH; + public Method specialHit; - public EntitySentientArrow(World worldIn) - { + public EntitySentientArrow(World worldIn) { super(worldIn); } - public EntitySentientArrow(World worldIn, double x, double y, double z) - { + public EntitySentientArrow(World worldIn, double x, double y, double z) { super(worldIn, x, y, z); } - public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reinburseAmount, int currentLevel) - { + public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel) { super(worldIn, shooter); - this.reimbursedAmountOnHit = reinburseAmount; + this.reimbursedAmountOnHit = reimburseAmount; this.type = type; this.currentLevel = currentLevel; } - public void reimbursePlayer(EntityLivingBase hitEntity, float damage) - { - if (this.shootingEntity instanceof EntityPlayer) - { - if (hitEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(hitEntity instanceof IMob)) - { + public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, PotionType potion) { + super(worldIn, shooter); + this.reimbursedAmountOnHit = reimburseAmount; + this.type = type; + this.currentLevel = currentLevel; + this.potion = potion; + } + + public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, ItemStack itemStack) { + super(worldIn, shooter); + this.reimbursedAmountOnHit = reimburseAmount; + this.type = type; + this.currentLevel = currentLevel; + this.potion = PotionUtils.getPotionFromItem(itemStack); + } + + public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, EntityArrow specialArrow) { + super(worldIn, shooter); + this.reimbursedAmountOnHit = reimburseAmount; + this.type = type; + this.currentLevel = currentLevel; + this.specialEntity = specialArrow; + this.specialArrowClass = specialArrow.getClass(); + } + + public void reimbursePlayer(EntityLivingBase hitEntity, float damage) { + if (this.shootingEntity instanceof EntityPlayer) { + if (hitEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(hitEntity instanceof IMob)) { return; } @@ -62,68 +97,169 @@ public class EntitySentientArrow extends EntityTippedArrow } @Override - protected void arrowHit(EntityLivingBase living) - { - super.arrowHit(living); - - switch (type) - { - case CORROSIVE: - living.addPotionEffect(new PotionEffect(MobEffects.POISON, currentLevel >= 0 ? poisonDuration[currentLevel] : 0, currentLevel >= 0 ? poisonLevel[currentLevel] : 0)); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); - break; - case STEADFAST: - living.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, currentLevel >= 0 ? levitationDuration[currentLevel] : 0, currentLevel >= 0 ? levitationLevel[currentLevel] : 0)); - break; - case VENGEFUL: - living.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, currentLevel >= 0 ? slownessDuration[currentLevel] : 0, currentLevel >= 0 ? slownessLevel[currentLevel] : 0)); - break; - default: - break; - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - if (!this.world.isRemote && this.inGround && this.timeInGround > 0) - { - switch (type) - { - case DESTRUCTIVE: - this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); - this.setDead(); - break; + protected void arrowHit(EntityLivingBase living) { + int amp = -1; + switch (type) { case CORROSIVE: + if (this.potion != null) + for (PotionEffect i : this.potion.getEffects()) { + if (i.getEffectName().equals("poison")) { + amp = i.getAmplifier(); + continue; + } + living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + } + living.addPotionEffect(new PotionEffect(MobEffects.POISON, currentLevel >= 0 ? (amp > -1 && poisonLevel[currentLevel] != amp) ? poisonDuration[currentLevel] / 2 : poisonDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(poisonLevel[currentLevel], amp) + 1 : poisonLevel[currentLevel] : 0)); break; case DEFAULT: + if (this.potion != null) + for (PotionEffect i : this.potion.getEffects()) { + living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + } + break; + case DESTRUCTIVE: + this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); + createPotionFromArrow(living); break; case STEADFAST: + if (this.potion != null) + for (PotionEffect i : this.potion.getEffects()) { + if (i.getEffectName().equals("levitation")) { + amp = i.getAmplifier(); + continue; + } + living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + } + living.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, currentLevel >= 0 ? (amp > -1 && levitationLevel[currentLevel] != amp) ? levitationDuration[currentLevel] / 2 : levitationDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(levitationLevel[currentLevel], amp) + 1 : levitationLevel[currentLevel] : 0)); break; case VENGEFUL: + if (this.potion != null) + for (PotionEffect i : this.potion.getEffects()) { + if (i.getEffectName().equals("slowness")) { + amp = i.getAmplifier(); + continue; + } + living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + } + living.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, currentLevel >= 0 ? (amp > -1 && slownessLevel[currentLevel] != amp) ? slownessDuration[currentLevel] / 2 : slownessDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(slownessLevel[currentLevel], amp) + 1 : slownessLevel[currentLevel] : 0)); break; default: break; + } + if (this.specialArrowClass != null) { + try { + this.specialHit = this.specialArrowClass.getMethod("arrowHit", EntityLivingBase.class); + this.specialHitMH = MethodHandles.lookup().unreflect(this.specialHit).bindTo(this.specialEntity); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } finally { + try { + if (this.specialHitMH != null) + this.specialHitMH.invoke(living); + } catch (Throwable throwable) { + throwable.printStackTrace(); + } } } -// else if (this.inGround && this.timeInGround != 0 && !this.customPotionEffects.isEmpty() && this.timeInGround >= 600) -// { -// this.world.setEntityState(this, (byte)0); -// this.potion = PotionTypes.EMPTY; -// this.customPotionEffects.clear(); -// this.dataManager.set(COLOR, Integer.valueOf(-1)); -// } } @Override - public void writeEntityToNBT(NBTTagCompound tag) - { + public void onUpdate() { + super.onUpdate(); + switch (type) { + case DESTRUCTIVE: + if (this.potion != null) { + this.spawnPotionParticles(2); + } + if (!this.world.isRemote && this.inGround) { + this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); + if (this.potion != null && this.specialArrowClass == null) { + createPotionFromArrow(null); + this.setDead(); + } + } + break; + case CORROSIVE: + this.spawnPotionParticles(2); + + break; + case DEFAULT: + if (this.potion != null) { + this.spawnPotionParticles(2); + } + break; + case STEADFAST: + if (this.potion != null) { + this.spawnPotionParticles(2); + } + break; + case VENGEFUL: + if (this.potion != null) { + this.spawnPotionParticles(2); + } + break; + default: + break; + } + + if (this.specialArrowClass != null) { + if (!this.world.isRemote) { + this.specialEntity.posX = this.posX; + this.specialEntity.posY = this.posY; + this.specialEntity.posZ = this.posZ; + + this.specialEntity.onUpdate(); + if (this.inGround) { + this.setDead(); + this.specialEntity.setDead(); + } + } + } + } + + //TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect. + private void createPotionFromArrow(EntityLivingBase living) { + if (this.potion != null) { + float radius = currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0; + AxisAlignedBB axisalignedbb = this.getEntityBoundingBox().grow(radius * 2, radius, radius * 2); + List list = this.world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); + + if (!list.isEmpty()) { + for (EntityLivingBase entitylivingbase : list) { + if (entitylivingbase.canBeHitWithPotion()) { + double d0 = this.getDistanceSq(entitylivingbase); + + if (d0 < 16.0D) { + double d1 = 1.0D - Math.sqrt(d0) / 4.0D; + + if (entitylivingbase == living) { + d1 = 1.0D; + } + + for (PotionEffect potioneffect : this.potion.getEffects()) { + Potion potion = potioneffect.getPotion(); + + if (potion.isInstant()) { + potion.affectEntity(this, this.shootingEntity, entitylivingbase, potioneffect.getAmplifier(), d1); + } else { + int i = (int) (d1 * (double) potioneffect.getDuration() + 0.5D); + + if (i > 20) { + entitylivingbase.addPotionEffect(new PotionEffect(potion, i, potioneffect.getAmplifier(), potioneffect.getIsAmbient(), potioneffect.doesShowParticles())); + } + } + } + } + } + } + } + } + } + + @Override + public void writeEntityToNBT(NBTTagCompound tag) { super.writeEntityToNBT(tag); tag.setDouble("reimbursement", reimbursedAmountOnHit); @@ -132,8 +268,7 @@ public class EntitySentientArrow extends EntityTippedArrow } @Override - public void readEntityFromNBT(NBTTagCompound tag) - { + public void readEntityFromNBT(NBTTagCompound tag) { super.readEntityFromNBT(tag); reimbursedAmountOnHit = tag.getDouble("reimbursement"); @@ -142,8 +277,21 @@ public class EntitySentientArrow extends EntityTippedArrow } @Override - protected ItemStack getArrowStack() - { + protected ItemStack getArrowStack() { return new ItemStack(Items.ARROW); } + + public void spawnPotionParticles(int particleCount) { + int i = this.getColor(); + + if (i != -1 && particleCount > 0) { + double d0 = (double) (i >> 16 & 255) / 255.0D; + double d1 = (double) (i >> 8 & 255) / 255.0D; + double d2 = (double) (i >> 0 & 255) / 255.0D; + + for (int j = 0; j < particleCount; ++j) { + this.world.spawnParticle(EnumParticleTypes.SPELL_MOB, this.posX + (this.rand.nextDouble() - 0.5D) * (double) this.width, this.posY + this.rand.nextDouble() * (double) this.height, this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, d0, d1, d2); + } + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index fc9b195f..e6df6969 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -19,6 +19,7 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityTippedArrow; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; +import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.IItemPropertyGetter; @@ -26,6 +27,8 @@ import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.PotionType; import net.minecraft.stats.StatList; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; @@ -41,67 +44,56 @@ import java.util.Locale; public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider { - public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000, 2000, 4000 }; - public static double[] defaultDamageAdded = new double[] { 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75 }; - public static float[] velocityAdded = new float[] { 0.25f, 0.5f, 0.75f, 1, 1.25f, 1.5f, 1.75f }; - public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5 }; //TODO - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13, 16, 24 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3, 3, 4 }; + public static int[] soulBracket = new int[] {16, 60, 200, 400, 1000, 2000, 4000}; + public static double[] defaultDamageAdded = new double[] {0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75}; + public static float[] velocityAdded = new float[] {0.25f, 0.5f, 0.75f, 1, 1.25f, 1.5f, 1.75f}; + public static double[] soulDrainPerSwing = new double[] {0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5}; //TODO + public static double[] soulDrop = new double[] {2, 4, 7, 10, 13, 16, 24}; + public static double[] staticDrop = new double[] {1, 1, 2, 3, 3, 3, 4}; public static float soullessShotVelocity = 2.5F; - public ItemSentientBow() - { + public ItemSentientBow() { + super(); setUnlocalizedName(BloodMagic.MODID + ".sentientBow"); setCreativeTab(BloodMagic.TAB_BM); - this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() - { + this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) - { - if (entityIn == null) - { + public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { + if (entityIn == null) { return 0.0F; - } else - { + } else { ItemStack itemstack = entityIn.getActiveItemStack(); return !itemstack.isEmpty() && itemstack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F; } } }); - this.addPropertyOverride(new ResourceLocation("pulling"), new IItemPropertyGetter() - { + this.addPropertyOverride(new ResourceLocation("pulling"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) - { + public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { return entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F; } }); - this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() - { + this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) - { + public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { return ((ItemSentientBow) RegistrarBloodMagicItems.SENTIENT_BOW).getCurrentType(stack).ordinal(); } }); } @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { + public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) - { + public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); recalculatePowers(stack, type, soulsRemaining); } - public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) - { + public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) { this.setCurrentType(stack, will > 0 ? type : EnumDemonWillType.DEFAULT); int level = getLevel(will); // @@ -122,13 +114,10 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien setDamageAdded(stack, level >= 0 ? getDamageModifier(type, level) : 0); } - private int getLevel(double soulsRemaining) - { + private int getLevel(double soulsRemaining) { int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { + for (int i = 0; i < soulBracket.length; i++) { + if (soulsRemaining >= soulBracket[i]) { lvl = i; } } @@ -137,49 +126,42 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public EnumDemonWillType getCurrentType(ItemStack stack) - { + public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) - { + if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; } return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); } - public double getDamageModifier(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return 0; - case DEFAULT: - case CORROSIVE: - case DESTRUCTIVE: - case STEADFAST: - return defaultDamageAdded[willBracket]; + public double getDamageModifier(EnumDemonWillType type, int willBracket) { + switch (type) { + case VENGEFUL: + return 0; + case DEFAULT: + case CORROSIVE: + case DESTRUCTIVE: + case STEADFAST: + return defaultDamageAdded[willBracket]; } return 0; } - public float getVelocityModifier(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return velocityAdded[willBracket]; - default: - return 0; + public float getVelocityModifier(EnumDemonWillType type, int willBracket) { + switch (type) { + case VENGEFUL: + return velocityAdded[willBracket]; + default: + return 0; } } - public void setDamageAdded(ItemStack stack, double damage) - { + public void setDamageAdded(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -187,8 +169,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setDouble("damage", damage); } - public double getDamageAdded(ItemStack stack) - { + public double getDamageAdded(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -196,8 +177,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien return tag.getDouble("damage"); } - public void setVelocityOfArrow(ItemStack stack, float velocity) - { + public void setVelocityOfArrow(ItemStack stack, float velocity) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -205,22 +185,19 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setFloat("velocity", velocity); } - public float getVelocityOfArrow(ItemStack stack) - { + public float getVelocityOfArrow(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); - if (tag.hasKey("velocity")) - { + if (tag.hasKey("velocity")) { return tag.getFloat("velocity"); } return 3; } - public void setCurrentType(ItemStack stack, EnumDemonWillType type) - { + public void setCurrentType(ItemStack stack, EnumDemonWillType type) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -228,16 +205,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } - public double getDrainOfActivatedBow(ItemStack stack) - { + public double getDrainOfActivatedBow(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } - public void setDrainOfActivatedBow(ItemStack stack, double drain) - { + public void setDrainOfActivatedBow(ItemStack stack, double drain) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -245,16 +220,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } - public double getStaticDropOfActivatedBow(ItemStack stack) - { + public double getStaticDropOfActivatedBow(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } - public void setStaticDropOfActivatedBow(ItemStack stack, double drop) - { + public void setStaticDropOfActivatedBow(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -262,16 +235,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } - public double getDropOfActivatedBow(ItemStack stack) - { + public double getDropOfActivatedBow(ItemStack stack) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } - public void setDropOfActivatedBow(ItemStack stack, double drop) - { + public void setDropOfActivatedBow(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); @@ -280,28 +251,25 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) - { + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); this.recalculatePowers(stack, world, player); return super.onItemRightClick(world, player, hand); } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) - { + public void gatherVariants(@Nonnull Int2ObjectMap variants) { variants.put(0, "inventory"); } - public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) - { + public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) { EnumDemonWillType type = this.getCurrentType(stack); double amount = user instanceof EntityPlayer ? (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)) : 0; float newArrowVelocity = velocity * getVelocityOfArrow(stack); double soulsRemaining = user instanceof EntityPlayer ? (PlayerDemonWillHandler.getTotalDemonWill(type, (EntityPlayer) user)) : 0; - EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount, getLevel(soulsRemaining)); + EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount, getLevel(soulsRemaining), (PotionType) null); double d0 = target.posX - user.posX; double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entityArrow.posY; @@ -309,14 +277,12 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); entityArrow.shoot(d0, d1 + d3 * 0.05, d2, newArrowVelocity, 0); - if (newArrowVelocity == 0) - { + if (newArrowVelocity == 0) { world.playSound(null, user.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); return null; } - if (velocity == 1.0F) - { + if (velocity == 1.0F) { entityArrow.setIsCritical(true); } @@ -326,13 +292,11 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - if (k > 0) - { + if (k > 0) { entityArrow.setKnockbackStrength(k); } - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) - { + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { entityArrow.setFire(100); } @@ -342,10 +306,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) - { - if (entityLiving instanceof EntityPlayer) - { + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) { + if (entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entityLiving; boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; ItemStack itemstack = this.getFiredArrow(player); @@ -355,21 +317,17 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien if (i < 0) return; - if (itemstack != null || flag) - { - if (itemstack == null) - { + if (itemstack != null || flag) { + if (itemstack == null) { itemstack = new ItemStack(Items.ARROW); } float arrowVelocity = getArrowVelocity(i); - if ((double) arrowVelocity >= 0.1D) - { + if ((double) arrowVelocity >= 0.1D) { boolean flag1 = flag && itemstack.getItem() == Items.ARROW; //Forge: Fix consuming custom arrows. - if (!world.isRemote) - { + if (!world.isRemote) { this.recalculatePowers(stack, world, player); EnumDemonWillType type = this.getCurrentType(stack); @@ -378,12 +336,20 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); - if (itemarrow == Items.ARROW) - { + if (itemarrow == Items.ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining)); - } else - entityArrow = itemarrow.createArrow(world, itemstack, player); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), (PotionType) null); + } else if (itemarrow == Items.TIPPED_ARROW) { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), itemstack); + } else if (itemarrow == Items.SPECTRAL_ARROW) { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), new PotionType(new PotionEffect(MobEffects.GLOWING, 200, 0))); + } else { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), itemarrow.createArrow(world, stack, entityLiving)); + } + entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); if (Float.compare(getVelocityOfArrow(stack), soullessShotVelocity) < Float.MIN_NORMAL) @@ -391,8 +357,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien world.playSound(null, player.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); } - if (arrowVelocity == 1.0F) - { + if (arrowVelocity == 1.0F) { entityArrow.setIsCritical(true); } @@ -402,20 +367,17 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - if (k > 0) - { + if (k > 0) { entityArrow.setKnockbackStrength(k); } - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) - { + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { entityArrow.setFire(100); } stack.damageItem(1, player); - if (flag1) - { + if (flag1) { entityArrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; } @@ -424,12 +386,10 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + arrowVelocity * 0.5F); - if (!flag1) - { + if (!flag1) { itemstack.shrink(1); - if (itemstack.isEmpty()) - { + if (itemstack.isEmpty()) { player.inventory.deleteStack(itemstack); } } @@ -440,22 +400,16 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } } - protected ItemStack getFiredArrow(EntityPlayer player) - { - if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) - { + protected ItemStack getFiredArrow(EntityPlayer player) { + if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) { return player.getHeldItem(EnumHand.OFF_HAND); - } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) - { + } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) { return player.getHeldItem(EnumHand.MAIN_HAND); - } else - { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) - { + } else { + for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { ItemStack itemstack = player.inventory.getStackInSlot(i); - if (this.isArrow(itemstack)) - { + if (this.isArrow(itemstack)) { return itemstack; } } @@ -465,17 +419,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) - { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { World world = player.getEntityWorld(); - if (!world.isRemote) - { + if (!world.isRemote) { this.recalculatePowers(droppedStack, world, player); EnumDemonWillType type = this.getCurrentType(droppedStack); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) - { + if (soulsRemaining < 1024) { return false; } From 83f0eefa152a878fe2e8cd690cf3813a247689f5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 31 Jan 2019 19:10:37 -0800 Subject: [PATCH 287/493] Update mappings + dependencies --- gradle.properties | 10 +++++----- .../java/WayofTime/bloodmagic/BloodMagic.java | 4 ++-- .../alchemyArray/AlchemyCircleRenderer.java | 2 +- .../bloodmagic/block/BlockAlchemyArray.java | 6 +++--- .../bloodmagic/block/BlockAlchemyTable.java | 2 +- .../bloodmagic/block/BlockAltar.java | 2 +- .../bloodmagic/block/BlockBloodLight.java | 4 ++-- .../bloodmagic/block/BlockBloodRune.java | 2 +- .../bloodmagic/block/BlockBloodTank.java | 8 ++++---- .../bloodmagic/block/BlockDecorative.java | 2 +- .../bloodmagic/block/BlockDemonBase.java | 2 +- .../bloodmagic/block/BlockDemonCrucible.java | 2 +- .../bloodmagic/block/BlockDemonCrystal.java | 2 +- .../block/BlockDemonCrystallizer.java | 2 +- .../bloodmagic/block/BlockDemonLight.java | 2 +- .../block/BlockDemonPillarBase.java | 2 +- .../block/BlockDemonPillarCapBase.java | 2 +- .../bloodmagic/block/BlockDemonPylon.java | 2 +- .../block/BlockDemonStairsBase.java | 2 +- .../bloodmagic/block/BlockDemonWallBase.java | 2 +- .../block/BlockDimensionalPortal.java | 6 +++--- .../bloodmagic/block/BlockIncenseAltar.java | 2 +- .../block/BlockInputRoutingNode.java | 2 +- .../block/BlockInversionPillar.java | 2 +- .../block/BlockInversionPillarEnd.java | 2 +- .../block/BlockItemRoutingNode.java | 2 +- .../bloodmagic/block/BlockLifeEssence.java | 4 ++-- .../block/BlockMasterRoutingNode.java | 2 +- .../bloodmagic/block/BlockMimic.java | 2 +- .../block/BlockOutputRoutingNode.java | 2 +- .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../bloodmagic/block/BlockPhantom.java | 4 ++-- .../block/BlockRitualController.java | 4 ++-- .../bloodmagic/block/BlockRitualStone.java | 2 +- .../bloodmagic/block/BlockSoulForge.java | 2 +- .../bloodmagic/block/BlockSpectral.java | 4 ++-- .../bloodmagic/block/BlockTeleposer.java | 2 +- .../block/base/BlockEnumPillarCap.java | 2 +- .../block/base/BlockEnumStairs.java | 2 +- .../client/gui/GuiItemRoutingNode.java | 2 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 2 +- .../DualAlchemyCircleRenderer.java | 2 +- .../MobSacrificeAlchemyCircleRenderer.java | 2 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../TurretAlchemyCircleRenderer.java | 2 +- .../render/entity/RenderEntityMimic.java | 2 +- .../command/sub/SubCommandRitual.java | 2 +- .../DataProviderRitualController.java | 4 ++-- .../bloodmagic/core/data/Binding.java | 2 +- .../demonAura/WorldDemonWillHandler.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 2 +- .../bloodmagic/gson/Serializers.java | 4 ++-- .../bloodmagic/item/ItemAltarMaker.java | 2 +- .../bloodmagic/item/ItemArcaneAshes.java | 2 +- .../bloodmagic/item/ItemBloodOrb.java | 10 +++++----- .../bloodmagic/item/ItemBoundSword.java | 2 +- .../bloodmagic/item/ItemBoundTool.java | 2 +- .../item/ItemDaggerOfSacrifice.java | 2 +- .../bloodmagic/item/ItemDemonWillGauge.java | 2 +- .../WayofTime/bloodmagic/item/ItemEnum.java | 6 +++--- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemLavaCrystal.java | 4 ++-- .../bloodmagic/item/ItemPotionFlask.java | 2 +- .../bloodmagic/item/ItemRitualDismantler.java | 2 +- .../bloodmagic/item/ItemRitualDiviner.java | 20 +++++++++---------- .../bloodmagic/item/ItemRitualReader.java | 2 +- .../bloodmagic/item/ItemSanguineBook.java | 2 +- .../bloodmagic/item/ItemUpgradeTome.java | 10 +++++----- .../bloodmagic/item/ItemUpgradeTrainer.java | 4 ++-- .../item/armour/ItemLivingArmour.java | 10 +++++----- .../item/armour/ItemSentientArmour.java | 6 +++--- .../item/block/ItemBlockAlchemyTable.java | 2 +- .../item/block/ItemBlockDemonCrystal.java | 4 ++-- .../item/block/base/ItemBlockEnum.java | 4 ++-- .../item/block/base/ItemBlockInteger.java | 4 ++-- .../item/gear/ItemPackSacrifice.java | 2 +- .../item/gear/ItemPackSelfSacrifice.java | 2 +- .../item/routing/ItemFluidRouterFilter.java | 6 +++--- .../item/routing/ItemNodeRouter.java | 2 +- .../item/routing/ItemRouterFilter.java | 6 +++--- .../bloodmagic/item/sigil/ItemSigilBase.java | 2 +- .../item/sigil/ItemSigilHolding.java | 2 +- .../item/sigil/ItemSigilToggleableBase.java | 2 +- .../item/soul/ItemSentientArmourGem.java | 2 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 2 +- .../bloodmagic/item/soul/ItemSentientBow.java | 2 +- .../item/soul/ItemSentientPickaxe.java | 2 +- .../item/soul/ItemSentientShovel.java | 2 +- .../item/soul/ItemSentientSword.java | 2 +- .../bloodmagic/item/soul/ItemSoulGem.java | 6 +++--- .../bloodmagic/item/soul/ItemSoulSnare.java | 6 +++--- .../item/soulBreath/ItemFlightScroll.java | 2 +- .../bloodmagic/livingArmour/LivingArmour.java | 2 +- .../livingArmour/LivingArmourUpgrade.java | 2 +- .../LivingArmourUpgradeBattleHungry.java | 2 +- .../LivingArmourUpgradeCrippledArm.java | 2 +- .../LivingArmourUpgradeDigSlowdown.java | 2 +- .../LivingArmourUpgradeDisoriented.java | 2 +- .../LivingArmourUpgradeMeleeDecrease.java | 2 +- .../LivingArmourUpgradeQuenched.java | 2 +- .../LivingArmourUpgradeSlippery.java | 2 +- .../LivingArmourUpgradeSlowHeal.java | 2 +- .../LivingArmourUpgradeSlowness.java | 2 +- .../LivingArmourUpgradeStormTrooper.java | 2 +- .../LivingArmourUpgradeArrowProtect.java | 2 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 2 +- .../LivingArmourUpgradeCriticalStrike.java | 2 +- .../upgrade/LivingArmourUpgradeDigging.java | 2 +- .../upgrade/LivingArmourUpgradeElytra.java | 2 +- .../LivingArmourUpgradeExperience.java | 2 +- .../LivingArmourUpgradeFallProtect.java | 2 +- .../LivingArmourUpgradeFireResist.java | 2 +- .../LivingArmourUpgradeGraveDigger.java | 2 +- .../LivingArmourUpgradeGrimReaperSprint.java | 2 +- .../LivingArmourUpgradeHealthboost.java | 2 +- .../upgrade/LivingArmourUpgradeJump.java | 2 +- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 2 +- .../LivingArmourUpgradeNightSight.java | 2 +- .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../LivingArmourUpgradePoisonResist.java | 2 +- .../upgrade/LivingArmourUpgradeRepairing.java | 2 +- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSolarPowered.java | 2 +- .../upgrade/LivingArmourUpgradeSpeed.java | 2 +- .../LivingArmourUpgradeSprintAttack.java | 2 +- .../LivingArmourUpgradeStepAssist.java | 2 +- .../WayofTime/bloodmagic/ritual/Ritual.java | 8 ++++---- .../ritual/imperfect/ImperfectRitual.java | 2 +- .../ritual/types/RitualAnimalGrowth.java | 12 +++++------ .../ritual/types/RitualCrushing.java | 12 +++++------ .../ritual/types/RitualCrystalSplit.java | 2 +- .../ritual/types/RitualFeatheredKnife.java | 2 +- .../ritual/types/RitualGreenGrove.java | 2 +- .../bloodmagic/ritual/types/RitualLava.java | 2 +- .../bloodmagic/ritual/types/RitualSpeed.java | 2 +- .../structures/DungeonRoomLoader.java | 6 +++--- .../bloodmagic/tile/TileAlchemyTable.java | 2 +- .../bloodmagic/tile/TileDemonCrystal.java | 2 +- .../tile/TileMasterRitualStone.java | 2 +- .../tile/routing/TileRoutingNode.java | 2 +- .../bloodmagic/util/GhostItemHelper.java | 2 +- .../bloodmagic/util/ItemStackWrapper.java | 2 +- .../java/WayofTime/bloodmagic/util/Utils.java | 7 ++++--- .../util/handler/event/ClientHandler.java | 6 +++--- 147 files changed, 224 insertions(+), 223 deletions(-) diff --git a/gradle.properties b/gradle.properties index 48dbcb74..85df68d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,11 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic mod_version=2.3.3 mc_version=1.12.2 -forge_version=14.23.2.2611 +forge_version=14.23.5.2808 curse_id=224791 -mappings_version=snapshot_20180201 +mappings_version=stable_39 -jei_version=4.8.5.147 -waila_version=1.8.23-B38_1.12 -guideapi_version=1.12-2.1.4-57 \ No newline at end of file +jei_version=4.14.4.264 +waila_version=1.8.26-B41_1.12.2 +guideapi_version=1.12-2.1.8-63 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index c0413361..4f763a30 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -42,13 +42,13 @@ public class BloodMagic { public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg"))); public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { @Override - public ItemStack getTabIconItem() { + public ItemStack createIcon() { return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); } }; public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") { @Override - public ItemStack getTabIconItem() { + public ItemStack createIcon() { return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 89b0e042..51782a6b 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -89,7 +89,7 @@ public class AlchemyCircleRenderer { EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { case DOWN: diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 4f706b6f..589c8b16 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -36,7 +36,7 @@ public class BlockAlchemyArray extends Block { public BlockAlchemyArray() { super(Material.CLOTH); - setUnlocalizedName(BloodMagic.MODID + ".alchemyArray"); + setTranslationKey(BloodMagic.MODID + ".alchemyArray"); setHardness(0.1f); } @@ -46,7 +46,7 @@ public class BlockAlchemyArray extends Block { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileAlchemyArray) { ((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity); @@ -60,7 +60,7 @@ public class BlockAlchemyArray extends Block { @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 6e6fe841..c8867b87 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -33,7 +33,7 @@ public class BlockAlchemyTable extends Block implements IBMBlock { super(Material.ROCK); // this.setDefaultState(this.blockState.getBaseState().withProperty(DIRECTION, EnumFacing.DOWN).withProperty(INVISIBLE, false)); - setUnlocalizedName(BloodMagic.MODID + ".alchemyTable"); + setTranslationKey(BloodMagic.MODID + ".alchemyTable"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 136f7801..73923dcb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -44,7 +44,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl public BlockAltar() { super(Material.ROCK); - setUnlocalizedName(BloodMagic.MODID + ".altar"); + setTranslationKey(BloodMagic.MODID + ".altar"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index 7076f77f..99b5a6e2 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -28,7 +28,7 @@ public class BlockBloodLight extends Block { public BlockBloodLight() { super(Material.CLOTH); - setUnlocalizedName(BloodMagic.MODID + ".bloodLight"); + setTranslationKey(BloodMagic.MODID + ".bloodLight"); } @Override @@ -49,7 +49,7 @@ public class BlockBloodLight extends Block { @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index 471bc99d..538385b8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -22,7 +22,7 @@ public class BlockBloodRune extends BlockEnum implements IBloodRu public BlockBloodRune() { super(Material.ROCK, BloodRuneType.class); - setUnlocalizedName(BloodMagic.MODID + ".rune."); + setTranslationKey(BloodMagic.MODID + ".rune."); setCreativeTab(BloodMagic.TAB_BM); setSoundType(SoundType.STONE); setHardness(2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 47e03d74..7dfa8ce2 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -39,7 +39,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB public BlockBloodTank() { super(Material.IRON, TileBloodTank.CAPACITIES.length - 1, "tier"); - setUnlocalizedName(BloodMagic.MODID + ".bloodTank"); + setTranslationKey(BloodMagic.MODID + ".bloodTank"); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.GLASS); @@ -60,7 +60,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } @@ -91,7 +91,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB if (success) { world.checkLight(blockPos); world.updateComparatorOutputLevel(blockPos, this); - world.markAndNotifyBlock(blockPos, world.getChunkFromBlockCoords(blockPos), state, state, 3); + world.markAndNotifyBlock(blockPos, world.getChunk(blockPos), state, state, 3); return true; } @@ -138,7 +138,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB world.checkLight(pos); world.updateComparatorOutputLevel(pos, this); - world.markAndNotifyBlock(pos, world.getChunkFromBlockCoords(pos), blockState, blockState, 3); + world.markAndNotifyBlock(pos, world.getChunk(pos), blockState, blockState, 3); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java index 76ae3392..065f340e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java @@ -14,7 +14,7 @@ public class BlockDecorative extends BlockEnum { public BlockDecorative() { super(Material.ROCK, EnumDecorative.class); - setUnlocalizedName(BloodMagic.MODID + "."); + setTranslationKey(BloodMagic.MODID + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java index 782758fa..0fbe5fd7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java @@ -11,7 +11,7 @@ public class BlockDemonBase & IStringSerializable> extends Blo public BlockDemonBase(String baseName, Class enumClass) { super(Material.ROCK, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index b4d5c1d2..69b59a5a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -49,7 +49,7 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl public BlockDemonCrucible() { super(Material.ROCK); - setUnlocalizedName(BloodMagic.MODID + ".demonCrucible"); + setTranslationKey(BloodMagic.MODID + ".demonCrucible"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 78a54ba5..9463e459 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -105,7 +105,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid super(Material.ROCK); this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP)); - setUnlocalizedName(BloodMagic.MODID + ".demonCrystal."); + setTranslationKey(BloodMagic.MODID + ".demonCrystal."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 26ecfb88..b5dd79c5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -21,7 +21,7 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr public BlockDemonCrystallizer() { super(Material.ROCK); - setUnlocalizedName(BloodMagic.MODID + ".demonCrystallizer"); + setTranslationKey(BloodMagic.MODID + ".demonCrystallizer"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java index f78e7266..45c5f9cc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java @@ -10,7 +10,7 @@ public class BlockDemonLight extends BlockEnum { public BlockDemonLight() { super(Material.ROCK, EnumSubWillType.class); - setUnlocalizedName(BloodMagic.MODID + ".demonlight."); + setTranslationKey(BloodMagic.MODID + ".demonlight."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java index 5db379bb..10fb1fa0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java @@ -14,7 +14,7 @@ public class BlockDemonPillarBase & IStringSerializable> exten public BlockDemonPillarBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java index b31b09b1..7621d7ca 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java @@ -14,7 +14,7 @@ public class BlockDemonPillarCapBase & IStringSerializable> ex public BlockDemonPillarCapBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 38a64240..5fb6a912 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -36,7 +36,7 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian public BlockDemonPylon() { super(Material.ROCK); - setUnlocalizedName(BloodMagic.MODID + ".demonPylon"); + setTranslationKey(BloodMagic.MODID + ".demonPylon"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java index 05bd1d75..1402fe47 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java @@ -11,7 +11,7 @@ public class BlockDemonStairsBase & IStringSerializable> exten public BlockDemonStairsBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java index ba6699fa..158ebdb9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java @@ -11,7 +11,7 @@ public class BlockDemonWallBase & IStringSerializable> extends public BlockDemonWallBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 658a87f6..50f69dbc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -32,7 +32,7 @@ public class BlockDimensionalPortal extends BlockInteger { public BlockDimensionalPortal() { super(Material.PORTAL, 2); - setUnlocalizedName(BloodMagic.MODID + ".dimensionalPortal"); + setTranslationKey(BloodMagic.MODID + ".dimensionalPortal"); setBlockUnbreakable(); setResistance(2000); setLightOpacity(0); @@ -72,7 +72,7 @@ public class BlockDimensionalPortal extends BlockInteger { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState blockState, Entity entity) { + public void onEntityCollision(World world, BlockPos pos, IBlockState blockState, Entity entity) { if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) { TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos); @@ -129,7 +129,7 @@ public class BlockDimensionalPortal extends BlockInteger { @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index 12d9d77e..c97d1861 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -22,7 +22,7 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo public BlockIncenseAltar() { super(Material.ROCK); - setUnlocalizedName(BloodMagic.MODID + ".incenseAltar"); + setTranslationKey(BloodMagic.MODID + ".incenseAltar"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 85aab8ae..15ed0f5a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -17,7 +17,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode { public BlockInputRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".inputRouting"); + setTranslationKey(BloodMagic.MODID + ".inputRouting"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java index f9c17e29..70c68a04 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java @@ -20,7 +20,7 @@ public class BlockInversionPillar extends BlockEnum { public BlockInversionPillar() { super(Material.ROCK, EnumSubWillType.class); - setUnlocalizedName(BloodMagic.MODID + ".inversionpillar."); + setTranslationKey(BloodMagic.MODID + ".inversionpillar."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java index 54193ee9..0b233797 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java @@ -16,7 +16,7 @@ public class BlockInversionPillarEnd extends BlockEnum impleme public BlockInversionPillarEnd() { super(Material.ROCK, EnumInversionCap.class); - setUnlocalizedName(BloodMagic.MODID + ".inversionpillarend."); + setTranslationKey(BloodMagic.MODID + ".inversionpillarend."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java index 1bb62034..805e9d9c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java @@ -14,7 +14,7 @@ public class BlockItemRoutingNode extends BlockRoutingNode { public BlockItemRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".itemRouting"); + setTranslationKey(BloodMagic.MODID + ".itemRouting"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 8828d7c0..e94badd6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -21,7 +21,7 @@ public class BlockLifeEssence extends BlockFluidClassic { public BlockLifeEssence() { super(LIFE_ESSENCE, Material.WATER); - setUnlocalizedName(BloodMagic.MODID + ".fluid.lifeEssence"); + setTranslationKey(BloodMagic.MODID + ".fluid.lifeEssence"); getLifeEssence().setBlock(this); } @@ -36,7 +36,7 @@ public class BlockLifeEssence extends BlockFluidClassic { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.SOLID; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java index d04ab3f2..c69e9caa 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java @@ -12,7 +12,7 @@ public class BlockMasterRoutingNode extends BlockRoutingNode { public BlockMasterRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".masterRouting"); + setTranslationKey(BloodMagic.MODID + ".masterRouting"); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index b0feb7eb..38b9ac62 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -37,7 +37,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent public BlockMimic() { super(Material.ROCK, EnumMimic.class); - setUnlocalizedName(BloodMagic.MODID + ".mimic."); + setTranslationKey(BloodMagic.MODID + ".mimic."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index 5882dc30..204db890 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -17,7 +17,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode { public BlockOutputRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".outputRouting"); + setTranslationKey(BloodMagic.MODID + ".outputRouting"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 92fae1bf..779c1389 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -20,7 +20,7 @@ public class BlockPath extends BlockEnum implements IIncensePath { public BlockPath() { super(Material.ROCK, EnumPath.class); - setUnlocalizedName(BloodMagic.MODID + ".path."); + setTranslationKey(BloodMagic.MODID + ".path."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 084e6486..bfcedb11 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -23,7 +23,7 @@ public class BlockPhantom extends Block implements IVariantProvider { public BlockPhantom() { super(Material.CLOTH); - setUnlocalizedName(BloodMagic.MODID + ".phantom"); + setTranslationKey(BloodMagic.MODID + ".phantom"); setCreativeTab(BloodMagic.TAB_BM); } @@ -54,7 +54,7 @@ public class BlockPhantom extends Block implements IVariantProvider { @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index d08eb08c..f6a09218 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -35,7 +35,7 @@ public class BlockRitualController extends BlockEnum imple public BlockRitualController() { super(Material.ROCK, EnumRitualController.class); - setUnlocalizedName(BloodMagic.MODID + ".stone.ritual."); + setTranslationKey(BloodMagic.MODID + ".stone.ritual."); setCreativeTab(BloodMagic.TAB_BM); setSoundType(SoundType.STONE); setHardness(2.0F); @@ -97,7 +97,7 @@ public class BlockRitualController extends BlockEnum imple } @Override - public void onBlockDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) { + public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMasterRitualStone) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 8ef70691..432861d3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -23,7 +23,7 @@ public class BlockRitualStone extends BlockEnum implements IRitual public BlockRitualStone() { super(Material.ROCK, EnumRuneType.class); - setUnlocalizedName(BloodMagic.MODID + ".ritualStone."); + setTranslationKey(BloodMagic.MODID + ".ritualStone."); setCreativeTab(BloodMagic.TAB_BM); setSoundType(SoundType.STONE); setHardness(2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 4f93536b..d8eb932d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -27,7 +27,7 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock public BlockSoulForge() { super(Material.IRON); - setUnlocalizedName(BloodMagic.MODID + ".soulForge"); + setTranslationKey(BloodMagic.MODID + ".soulForge"); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.METAL); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 6802804b..c6f8985c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -28,7 +28,7 @@ public class BlockSpectral extends Block { public BlockSpectral() { super(Material.CLOTH); - setUnlocalizedName(BloodMagic.MODID + ".spectral"); + setTranslationKey(BloodMagic.MODID + ".spectral"); } @Override @@ -58,7 +58,7 @@ public class BlockSpectral extends Block { @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 24978953..37bad79e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -24,7 +24,7 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, super(Material.ROCK); setCreativeTab(BloodMagic.TAB_BM); - setUnlocalizedName(BloodMagic.MODID + ".teleposer"); + setTranslationKey(BloodMagic.MODID + ".teleposer"); setHardness(2.0F); setResistance(5.0F); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java index 365dd875..d4998c28 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java @@ -32,7 +32,7 @@ public class BlockEnumPillarCap & IStringSerializable> extends @Override public IBlockState getStateFromMeta(int meta) { IBlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 2]); - return state.withProperty(FACING, EnumFacing.getFront(meta / 2)); + return state.withProperty(FACING, EnumFacing.byIndex(meta / 2)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java index 7a0203c4..f34b2e76 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java @@ -116,7 +116,7 @@ public class BlockEnumStairs & IStringSerializable> extends Bl @Override public IBlockState getStateFromMeta(int meta) { IBlockState state = getBlockState().getBaseState().withProperty(BlockStairs.HALF, (meta & 8) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM); - state = state.withProperty(FACING, EnumFacing.getFront(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]); + state = state.withProperty(FACING, EnumFacing.byIndex(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]); return state; } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index e879512a..2a9d0590 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -41,7 +41,7 @@ public class GuiItemRoutingNode extends GuiContainer { } private int getCurrentActiveSlotPriority() { - EnumFacing direction = EnumFacing.getFront(inventory.currentActiveSlot); + EnumFacing direction = EnumFacing.byIndex(inventory.currentActiveSlot); if (direction != null) { return inventory.getPriority(direction); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 4e330f9e..348bc98f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -81,7 +81,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer { EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { case DOWN: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 699916ca..191fde6f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -109,7 +109,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { // Specify which face this "circle" is located on EnumFacing sideHit = EnumFacing.UP; - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { case DOWN: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index 29f03cbb..d6fc3741 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -67,7 +67,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { case DOWN: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java index d4590a5d..2f5bdfc7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -92,7 +92,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index f409062a..cafb9b63 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -65,7 +65,7 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer { EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { case DOWN: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index a1e2b461..5153f6b8 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -70,7 +70,7 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer { EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { case DOWN: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index 967b4638..35702b83 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -101,7 +101,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer EnumFacing sideHit = EnumFacing.UP; EnumFacing rotation = tileArray.getRotation(); - GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); + GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java index 27a39056..2612345a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java @@ -69,7 +69,7 @@ public class RenderEntityMimic extends RenderLiving { String s = nbttagcompound.getString("SkullOwner"); if (!StringUtils.isNullOrEmpty(s)) { - gameprofile = TileEntitySkull.updateGameprofile(new GameProfile(null, s)); + gameprofile = TileEntitySkull.updateGameProfile(new GameProfile(null, s)); nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile)); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java index b527ed5f..bf1a7dca 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java @@ -71,7 +71,7 @@ public class SubCommandRitual extends CommandTreeBase { sender.sendMessage(new TextComponentTranslation("commands.blooodmagic.ritual.create.noRitual")); return; } else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) { - sender.sendMessage(new TextComponentTranslation(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getUnlocalizedName() + ".info")); + sender.sendMessage(new TextComponentTranslation(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getTranslationKey() + ".info")); return; } EntityPlayerMP player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index cadada2e..da4d5b21 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -59,7 +59,7 @@ public class DataProviderRitualController implements IWailaDataProvider { TileMasterRitualStone mrs = (TileMasterRitualStone) te; tag.setBoolean("master", true); if (mrs.getCurrentRitual() != null) { - tag.setString("ritual", mrs.getCurrentRitual().getUnlocalizedName()); + tag.setString("ritual", mrs.getCurrentRitual().getTranslationKey()); tag.setBoolean("active", mrs.isActive()); if (mrs.getOwner() != null) tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); @@ -70,7 +70,7 @@ public class DataProviderRitualController implements IWailaDataProvider { ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); if (ritual != null) { - tag.setString("ritual", ritual.getUnlocalizedName()); + tag.setString("ritual", ritual.getTranslationKey()); tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index 3d7b8e2a..671f6a1b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -61,7 +61,7 @@ public class Binding implements INBTSerializable { return null; NBTBase bindingTag = stack.getTagCompound().getTag("binding"); - if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. + if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. return null; Binding binding = new Binding(); diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index bd37857a..06639138 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -138,7 +138,7 @@ public class WorldDemonWillHandler { public static WillChunk getWillChunk(World world, BlockPos pos) { WillChunk willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); if (willChunk == null) { - Chunk chunk = world.getChunkFromBlockCoords(pos); + Chunk chunk = world.getChunk(pos); generateWill(chunk); willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index c69b1e76..21d5b273 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -413,7 +413,7 @@ public class EntitySentientSpecter extends EntityDemonBase { entitytippedarrow.shoot(d0, d1 + d3 * 0.2, d2, 1.6F, 0); //TODO: Yes, it is an accurate arrow. Don't be hatin' int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.POWER, this); int j = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.PUNCH, this); - entitytippedarrow.setDamage((double) (velocity * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.getEntityWorld().getDifficulty().getDifficultyId() * 0.11F)); + entitytippedarrow.setDamage((double) (velocity * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.getEntityWorld().getDifficulty().getId() * 0.11F)); if (i > 0) { entitytippedarrow.setDamage(entitytippedarrow.getDamage() + (double) i * 0.5D + 0.5D); diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index a2171911..1f940d2e 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -65,8 +65,8 @@ public class Serializers { @Override public JsonElement serialize(ResourceLocation src, Type typeOfSrc, JsonSerializationContext context) { JsonObject object = new JsonObject(); - object.addProperty("domain", src.getResourceDomain()); - object.addProperty("path", src.getResourcePath()); + object.addProperty("domain", src.getNamespace()); + object.addProperty("path", src.getPath()); return object; } }; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index e1da3b10..9800cce6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -33,7 +33,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP public ItemAltarMaker() { super(); - setUnlocalizedName(BloodMagic.MODID + ".altarMaker"); + setTranslationKey(BloodMagic.MODID + ".altarMaker"); setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); setFull3D(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 41ebf298..12524c89 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -23,7 +23,7 @@ import java.util.List; public class ItemArcaneAshes extends Item implements IVariantProvider { public ItemArcaneAshes() { - setUnlocalizedName(BloodMagic.MODID + ".arcaneAshes"); + setTranslationKey(BloodMagic.MODID + ".arcaneAshes"); setMaxStackSize(1); setMaxDamage(19); //Allows for 20 uses setCreativeTab(BloodMagic.TAB_BM); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index c8516244..9e31e607 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -24,18 +24,18 @@ import java.util.List; public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { public ItemBloodOrb() { - setUnlocalizedName(BloodMagic.MODID + ".orb"); + setTranslationKey(BloodMagic.MODID + ".orb"); this.setMaxDamage(0); setHasSubtypes(true); } @Override - public String getUnlocalizedName(ItemStack stack) { + public String getTranslationKey(ItemStack stack) { BloodOrb orb = getOrb(stack); if (orb == null) - return super.getUnlocalizedName(stack); + return super.getTranslationKey(stack); - return super.getUnlocalizedName(stack) + "." + orb.getName(); + return super.getTranslationKey(stack) + "." + orb.getName(); } @Override @@ -94,7 +94,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { BloodOrb orb = getOrb(stack); if (flag.isAdvanced() && orb != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getResourceDomain())); + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getNamespace())); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index e9b30300..935395da 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -36,7 +36,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable public ItemBoundSword() { super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL); - setUnlocalizedName(BloodMagic.MODID + ".bound.sword"); + setTranslationKey(BloodMagic.MODID + ".bound.sword"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 128751c6..4031565f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -51,7 +51,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { public ItemBoundTool(String name, float damage, Set effectiveBlocks) { super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks); - setUnlocalizedName(BloodMagic.MODID + ".bound." + name); + setTranslationKey(BloodMagic.MODID + ".bound." + name); setCreativeTab(BloodMagic.TAB_BM); setHarvestLevel(name, 4); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index c3b3ecfd..919a3039 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -25,7 +25,7 @@ import javax.annotation.Nonnull; public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { public ItemDaggerOfSacrifice() { super(); - setUnlocalizedName(BloodMagic.MODID + ".daggerOfSacrifice"); + setTranslationKey(BloodMagic.MODID + ".daggerOfSacrifice"); setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); setFull3D(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index bc8448ea..a2649334 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -19,7 +19,7 @@ import java.util.List; public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemonWillViewer { public ItemDemonWillGauge() { - setUnlocalizedName(BloodMagic.MODID + ".willGauge"); + setTranslationKey(BloodMagic.MODID + ".willGauge"); setMaxStackSize(1); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index 0fed5b36..1881a7d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -21,14 +21,14 @@ public class ItemEnum & ISubItem> extends Item { this.types = enumClass.getEnumConstants(); - setUnlocalizedName(BloodMagic.MODID + "." + baseName); + setTranslationKey(BloodMagic.MODID + "." + baseName); setHasSubtypes(types.length > 1); setCreativeTab(BloodMagic.TAB_BM); } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + "." + getItemType(stack).getInternalName(); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 5d8bc69e..381d817c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -24,7 +24,7 @@ import java.util.List; public class ItemExperienceBook extends Item implements IVariantProvider { public ItemExperienceBook() { - setUnlocalizedName(BloodMagic.MODID + ".experienceTome"); + setTranslationKey(BloodMagic.MODID + ".experienceTome"); setMaxStackSize(1); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 1b47e612..a537d1ec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -23,7 +23,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide public ItemLavaCrystal() { super(); - setUnlocalizedName(BloodMagic.MODID + ".lavaCrystal"); + setTranslationKey(BloodMagic.MODID + ".lavaCrystal"); } @Override @@ -66,7 +66,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide return null; NBTBase bindingTag = stack.getTagCompound().getTag("binding"); - if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. + if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. return null; NBTTagCompound nbt = (NBTTagCompound) bindingTag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 12e0a2d4..098a2b62 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -28,7 +28,7 @@ import java.util.function.Consumer; public class ItemPotionFlask extends Item implements IMeshProvider { public ItemPotionFlask() { - setUnlocalizedName(BloodMagic.MODID + ".potionFlask"); + setTranslationKey(BloodMagic.MODID + ".potionFlask"); setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); setMaxDamage(8); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java index 744b7129..f79d8bc1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java @@ -27,7 +27,7 @@ import java.util.List; public class ItemRitualDismantler extends Item implements IVariantProvider { public ItemRitualDismantler() { - setUnlocalizedName(BloodMagic.MODID + ".ritualDismantler"); + setTranslationKey(BloodMagic.MODID + ".ritualDismantler"); setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 6d026756..05601f00 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -46,15 +46,15 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { public static String[] names = {"normal", "dusk", "dawn"}; public ItemRitualDiviner() { - setUnlocalizedName(BloodMagic.MODID + ".ritualDiviner"); + setTranslationKey(BloodMagic.MODID + ".ritualDiviner"); setCreativeTab(BloodMagic.TAB_BM); setHasSubtypes(true); setMaxStackSize(1); } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + names[stack.getItemDamage()]; } @Override @@ -66,7 +66,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { if (ritual == null) return displayName; - return displayName + ": " + TextHelper.localize(ritual.getUnlocalizedName()); + return displayName + ": " + TextHelper.localize(ritual.getTranslationKey()); } @Override @@ -208,7 +208,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); if (ritual != null) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual", TextHelper.localize(ritual.getUnlocalizedName()))); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual", TextHelper.localize(ritual.getTranslationKey()))); boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); @@ -217,8 +217,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { tooltip.add(""); for (EnumDemonWillType type : EnumDemonWillType.values()) { - if (TextHelper.canTranslate(ritual.getUnlocalizedName() + "." + type.getName().toLowerCase() + ".info")) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getUnlocalizedName() + "." + type.getName().toLowerCase() + ".info")))); + if (TextHelper.canTranslate(ritual.getTranslationKey() + "." + type.getName().toLowerCase() + ".info")) { + tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getTranslationKey() + "." + type.getName().toLowerCase() + ".info")))); } } } else if (sneaking) { @@ -281,8 +281,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { tooltip.add(TextHelper.localize(tooltipBase + "totalRune", totalRunes)); } else { tooltip.add(""); - if (TextHelper.canTranslate(ritual.getUnlocalizedName() + ".info")) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getUnlocalizedName() + ".info")))); + if (TextHelper.canTranslate(ritual.getTranslationKey() + ".info")) { + tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getTranslationKey() + ".info")))); tooltip.add(""); } @@ -453,7 +453,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { public void notifyRitualChange(String key, EntityPlayer player) { Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); if (ritual != null) { - player.sendStatusMessage(new TextComponentTranslation(ritual.getUnlocalizedName()), true); + player.sendStatusMessage(new TextComponentTranslation(ritual.getTranslationKey()), true); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index bceeb86e..f96afc24 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -38,7 +38,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemRitualReader() { super(); - setUnlocalizedName(BloodMagic.MODID + ".ritualReader"); + setTranslationKey(BloodMagic.MODID + ".ritualReader"); setMaxStackSize(1); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index ca2d37f9..9dc458f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -38,7 +38,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa private AltarTier currentDisplayedTier = AltarTier.ONE; public ItemSanguineBook() { - setUnlocalizedName(BloodMagic.MODID + ".sanguineBook"); + setTranslationKey(BloodMagic.MODID + ".sanguineBook"); setCreativeTab(BloodMagic.TAB_BM); setMaxStackSize(1); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index dc7d64b3..8563c02b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -31,7 +31,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { super(); setCreativeTab(BloodMagic.TAB_TOMES); - setUnlocalizedName(BloodMagic.MODID + ".upgradeTome"); + setTranslationKey(BloodMagic.MODID + ".upgradeTome"); setHasSubtypes(true); setMaxStackSize(1); } @@ -65,15 +65,15 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { } @Override - public String getUnlocalizedName(ItemStack stack) { + public String getTranslationKey(ItemStack stack) { if (!stack.hasTagCompound()) - return super.getUnlocalizedName(stack); + return super.getTranslationKey(stack); LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); if (upgrade != null && upgrade.isDowngrade()) return "item." + BloodMagic.MODID + ".downgradeTome"; - return super.getUnlocalizedName(stack); + return super.getTranslationKey(stack); } @Override @@ -106,7 +106,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { return; LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); if (upgrade != null) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getUnlocalizedName()), upgrade.getUpgradeLevel() + 1)); + tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getTranslationKey()), upgrade.getUpgradeLevel() + 1)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index cef99437..f37785d1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -27,7 +27,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian super(); setCreativeTab(BloodMagic.TAB_TOMES); - setUnlocalizedName(BloodMagic.MODID + ".upgradeTrainer"); + setTranslationKey(BloodMagic.MODID + ".upgradeTrainer"); setHasSubtypes(true); setMaxStackSize(1); } @@ -55,7 +55,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian return; LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); if (upgrade != null) { - tooltip.add(TextHelper.localize(upgrade.getUnlocalizedName())); + tooltip.add(TextHelper.localize(upgrade.getTranslationKey())); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 001b3264..2d7ab288 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -62,7 +62,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP public ItemLivingArmour(EntityEquipmentSlot armorType) { super(ItemArmor.ArmorMaterial.IRON, 0, armorType); - setUnlocalizedName(BloodMagic.MODID + ".livingArmour."); + setTranslationKey(BloodMagic.MODID + ".livingArmour."); // setMaxDamage(250); setMaxDamage((int) (getMaxDamage() * 1.5)); setCreativeTab(BloodMagic.TAB_BM); @@ -259,10 +259,10 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP if (tracker != null) { double progress = tracker.getProgress(armour, upgrade.getUpgradeLevel()); - tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.progress", TextHelper.localize(upgrade.getUnlocalizedName()), MathHelper.clamp((int) (progress * 100D), 0, 100))); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.progress", TextHelper.localize(upgrade.getTranslationKey()), MathHelper.clamp((int) (progress * 100D), 0, 100))); } } else { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getUnlocalizedName()), upgrade.getUpgradeLevel() + 1)); + tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getTranslationKey()), upgrade.getUpgradeLevel() + 1)); } } } @@ -344,8 +344,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[3 - armorType.getIndex()]; + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + names[3 - armorType.getIndex()]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 5b043282..35261f98 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -56,7 +56,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public ItemSentientArmour(EntityEquipmentSlot armorType) { super(ItemArmor.ArmorMaterial.IRON, 0, armorType); - setUnlocalizedName(BloodMagic.MODID + ".sentientArmour."); + setTranslationKey(BloodMagic.MODID + ".sentientArmour."); setMaxDamage(250); setCreativeTab(BloodMagic.TAB_BM); } @@ -268,8 +268,8 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[3 - armorType.getIndex()]; + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + names[3 - armorType.getIndex()]; } public void revertArmour(EntityPlayer player, ItemStack itemStack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java index 3a42a40e..25cc5b0b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java @@ -23,7 +23,7 @@ public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider float yaw = player.rotationYaw; EnumFacing direction = EnumFacing.fromAngle(yaw); - if (direction.getFrontOffsetY() != 0) { + if (direction.getYOffset() != 0) { return false; } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 75ab9457..0d72a4a5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -21,8 +21,8 @@ public class ItemBlockDemonCrystal extends ItemBlock { } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + EnumDemonWillType.values()[stack.getItemDamage()].toString().toLowerCase(Locale.ENGLISH); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + EnumDemonWillType.values()[stack.getItemDamage()].toString().toLowerCase(Locale.ENGLISH); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java index 25f7375d..c7555739 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java @@ -22,8 +22,8 @@ public class ItemBlockEnum & IStringSerializable> extends Item } @Override - public String getUnlocalizedName(ItemStack stack) { - return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName(); + public String getTranslationKey(ItemStack stack) { + return getBlock().getTranslationKey() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName(); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java index 038c4e22..1797aa60 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java @@ -20,8 +20,8 @@ public class ItemBlockInteger extends ItemBlock { } @Override - public String getUnlocalizedName(ItemStack stack) { - return getBlock().getUnlocalizedName() + "." + stack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return getBlock().getTranslationKey() + "." + stack.getItemDamage(); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 31dfe5b2..2033e618 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -31,7 +31,7 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I public ItemPackSacrifice() { super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST); - setUnlocalizedName(BloodMagic.MODID + ".pack.sacrifice"); + setTranslationKey(BloodMagic.MODID + ".pack.sacrifice"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index a0c08a87..15508082 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -47,7 +47,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato public ItemPackSelfSacrifice() { super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST); - setUnlocalizedName(BloodMagic.MODID + ".pack.selfSacrifice"); + setTranslationKey(BloodMagic.MODID + ".pack.selfSacrifice"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index a72dfd3f..aa6ca4a1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -31,15 +31,15 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, { super(); - setUnlocalizedName(BloodMagic.MODID + ".fluidFilter."); + setTranslationKey(BloodMagic.MODID + ".fluidFilter."); setHasSubtypes(true); setCreativeTab(BloodMagic.TAB_BM); } @Override - public String getUnlocalizedName(ItemStack stack) + public String getTranslationKey(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + return super.getTranslationKey(stack) + names[stack.getItemDamage()]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 7994c36b..4ea9be03 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -30,7 +30,7 @@ import java.util.List; public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvider { public ItemNodeRouter() { - setUnlocalizedName(BloodMagic.MODID + ".nodeRouter"); + setTranslationKey(BloodMagic.MODID + ".nodeRouter"); setMaxStackSize(1); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index f80cf9aa..e62a77be 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -30,15 +30,15 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari { super(); - setUnlocalizedName(BloodMagic.MODID + ".itemFilter."); + setTranslationKey(BloodMagic.MODID + ".itemFilter."); setHasSubtypes(true); setCreativeTab(BloodMagic.TAB_BM); } @Override - public String getUnlocalizedName(ItemStack stack) + public String getTranslationKey(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + return super.getTranslationKey(stack) + names[stack.getItemDamage()]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index dd4471dc..650ff280 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -24,7 +24,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { public ItemSigilBase(String name, int lpUsed) { super(lpUsed); - setUnlocalizedName(BloodMagic.MODID + ".sigil." + name); + setTranslationKey(BloodMagic.MODID + ".sigil." + name); this.name = name; this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 6399e817..b3fb15da 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -248,7 +248,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl NBTTagList tagList = tagCompound.getTagList(Constants.NBT.ITEMS, 10); - if (tagList.hasNoTags()) { + if (tagList.isEmpty()) { return NonNullList.withSize(inventorySize, ItemStack.EMPTY); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 2586e266..ce7517a9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -23,7 +23,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes public ItemSigilToggleableBase(String name, int lpUsed) { super(lpUsed); - setUnlocalizedName(BloodMagic.MODID + ".sigil." + name); + setTranslationKey(BloodMagic.MODID + ".sigil." + name); setCreativeTab(BloodMagic.TAB_BM); this.name = name; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index 9cb62f6d..c1442db8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -26,7 +26,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { super(); setCreativeTab(BloodMagic.TAB_BM); - setUnlocalizedName(BloodMagic.MODID + ".sentientArmourGem"); + setTranslationKey(BloodMagic.MODID + ".sentientArmourGem"); setMaxStackSize(1); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index 1f7404cc..db43014d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -75,7 +75,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP setMaxDamage(getMaxDamage() * 2); // super(ModItems.soulToolMaterial); - setUnlocalizedName(BloodMagic.MODID + ".sentientAxe"); + setTranslationKey(BloodMagic.MODID + ".sentientAxe"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index e6df6969..71092325 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -55,7 +55,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public ItemSentientBow() { super(); - setUnlocalizedName(BloodMagic.MODID + ".sentientBow"); + setTranslationKey(BloodMagic.MODID + ".sentientBow"); setCreativeTab(BloodMagic.TAB_BM); this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index e8d45479..47f3491e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -75,7 +75,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon setMaxDamage(getMaxDamage() * 2); // super(ModItems.soulToolMaterial); - setUnlocalizedName(BloodMagic.MODID + ".sentientPickaxe"); + setTranslationKey(BloodMagic.MODID + ".sentientPickaxe"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index c8b219b4..644b0b9e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -75,7 +75,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I setMaxDamage(getMaxDamage() * 2); // super(ModItems.soulToolMaterial); - setUnlocalizedName(BloodMagic.MODID + ".sentientShovel"); + setTranslationKey(BloodMagic.MODID + ".sentientShovel"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index d97cab1c..3f932d34 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -68,7 +68,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public ItemSentientSword() { super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); - setUnlocalizedName(BloodMagic.MODID + ".sentientSword"); + setTranslationKey(BloodMagic.MODID + ".sentientSword"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index aa678159..62948034 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -37,15 +37,15 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I public ItemSoulGem() { super(); - setUnlocalizedName(BloodMagic.MODID + ".soulGem."); + setTranslationKey(BloodMagic.MODID + ".soulGem."); setHasSubtypes(true); setMaxStackSize(1); setCreativeTab(BloodMagic.TAB_BM); } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + names[stack.getItemDamage()]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 50971b17..c9483d33 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -26,7 +26,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { public ItemSoulSnare() { super(); - setUnlocalizedName(BloodMagic.MODID + ".soulSnare."); + setTranslationKey(BloodMagic.MODID + ".soulSnare."); setCreativeTab(BloodMagic.TAB_BM); setHasSubtypes(true); setMaxStackSize(16); @@ -51,8 +51,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider { } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + names[stack.getItemDamage()]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index a4878215..12073a87 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -42,7 +42,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr public ItemFlightScroll() { super(); - setUnlocalizedName(BloodMagic.MODID + ".icarusScroll"); + setTranslationKey(BloodMagic.MODID + ".icarusScroll"); setCreativeTab(BloodMagic.TAB_BM); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 19f9a7a1..ab2fe989 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -239,7 +239,7 @@ public class LivingArmour implements ILivingArmour { StatTracker tracker = (StatTracker) obj; String key = tracker.getUniqueIdentifier(); NBTTagCompound trackerTag = tag.getCompoundTag(key); - if (!trackerTag.hasNoTags()) { + if (!trackerTag.isEmpty()) { tracker.readFromNBT(trackerTag); } trackerMap.put(key, tracker); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java index c160c6cd..41cfb72e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java @@ -55,7 +55,7 @@ public abstract class LivingArmourUpgrade { public abstract String getUniqueIdentifier(); - public abstract String getUnlocalizedName(); + public abstract String getTranslationKey(); public abstract int getMaxTier(); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index fe02490a..e7aec23e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -60,7 +60,7 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "battleHunger"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index 88b31e64..0467e0a7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -43,7 +43,7 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "crippledArm"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index 6c1dece3..69d041ee 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -54,7 +54,7 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "digSlowdown"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index 2d791898..25daaaf4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -52,7 +52,7 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "disoriented"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index a67a5cfb..0e59b0ba 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "meleeDecrease"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index 9272cd48..1294fe29 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -43,7 +43,7 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "quenched"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index afca233c..413eac26 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -80,7 +80,7 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "slippery"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index 0b964731..f7d0c6ba 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -51,7 +51,7 @@ public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "slowHeal"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index db12a7ac..a36c48b3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -61,7 +61,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "slowness"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index d90aa3e5..5f9ed0fa 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -48,7 +48,7 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "stormTrooper"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index f50e5d59..94ccca9a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -49,7 +49,7 @@ public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "arrowProtect"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index 64e99f67..a83e62ad 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -46,7 +46,7 @@ public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "arrowShot"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 64b1ff05..5f82954e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -57,7 +57,7 @@ public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "criticalStrike"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index a88e42c9..8e977049 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -65,7 +65,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "digging"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index d1699406..9e1c4a3a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -45,7 +45,7 @@ public class LivingArmourUpgradeElytra extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "elytra"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index ba5abaaa..e36e05bf 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -42,7 +42,7 @@ public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "experienced"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index c394a4af..56971eb9 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -49,7 +49,7 @@ public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "fallProtect"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index a4725a05..1e0a465c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "fireResist"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index 69a58009..1c1ec121 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -55,7 +55,7 @@ public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "graveDigger"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 1e8fdfd3..92fba1a7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -59,7 +59,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "grimReaper"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 08ecc06c..4b3a82bf 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "health"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index 4bb03e62..723ef2ab 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -57,7 +57,7 @@ public class LivingArmourUpgradeJump extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "jump"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index 8909473e..39a34a08 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -61,7 +61,7 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "knockback"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 22e206f8..7a4fc138 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "meleeDamage"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index b9171625..3493b8e1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -71,7 +71,7 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "nightSight"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 9b755a27..52a60199 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -49,7 +49,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "physicalProtect"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index 49bd19c0..08c75b19 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -64,7 +64,7 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "poisonResist"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 80f7093d..d9d00733 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -67,7 +67,7 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "repair"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index 0c3a6db7..4b68bb79 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -43,7 +43,7 @@ public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "selfSacrifice"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index fea3748c..114508d2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -73,7 +73,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "solarPowered"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index d0392eec..8b9288a6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -98,7 +98,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade } @Override - public String getUnlocalizedName() + public String getTranslationKey() { return tooltipBase + "speed"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index 49504483..e4963af3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -68,7 +68,7 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "sprintAttack"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 83d414d4..9392f6ec 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -45,7 +45,7 @@ public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "stepAssist"; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 95504bce..d357c6c5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -51,7 +51,7 @@ public abstract class Ritual { public void readFromNBT(NBTTagCompound tag) { NBTTagList tags = tag.getTagList("areas", 10); - if (tags.hasNoTags()) { + if (tags.isEmpty()) { return; } @@ -237,12 +237,12 @@ public abstract class Ritual { } public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info")}; } public ITextComponent provideInformationOfRangeToPlayer(EntityPlayer player, String range) { if (getListOfRanges().contains(range)) { - return new TextComponentTranslation(this.getUnlocalizedName() + "." + range + ".info"); + return new TextComponentTranslation(this.getTranslationKey() + "." + range + ".info"); } else { return new TextComponentTranslation("ritual.bloodmagic.blockRange.noRange"); } @@ -301,7 +301,7 @@ public abstract class Ritual { return renderer; } - public String getUnlocalizedName() { + public String getTranslationKey() { return unlocalizedName; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java index 6aa24daa..3a314984 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java @@ -60,7 +60,7 @@ public abstract class ImperfectRitual { return lightShow; } - public String getUnlocalizedName() { + public String getTranslationKey() { return unlocalizedName; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index f92b2db3..15bb17ac 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -192,12 +192,12 @@ public class RitualAnimalGrowth extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { return new ITextComponent[]{ - new TextComponentTranslation(this.getUnlocalizedName() + ".info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info") + new TextComponentTranslation(this.getTranslationKey() + ".info"), + new TextComponentTranslation(this.getTranslationKey() + ".default.info"), + new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), + new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info") }; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 2d56e16f..271ddac4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -261,12 +261,12 @@ public class RitualCrushing extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { return new ITextComponent[]{ - new TextComponentTranslation(this.getUnlocalizedName() + ".info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info") + new TextComponentTranslation(this.getTranslationKey() + ".info"), + new TextComponentTranslation(this.getTranslationKey() + ".default.info"), + new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), + new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info") }; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java index a52f5181..d5f666be 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java @@ -185,6 +185,6 @@ public class RitualCrystalSplit extends Ritual @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[] { new TextComponentTranslation(this.getUnlocalizedName() + ".info") }; + return new ITextComponent[] { new TextComponentTranslation(this.getTranslationKey() + ".info") }; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index 7706e112..352725a3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -203,7 +203,7 @@ public class RitualFeatheredKnife extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } public double getLPModifierForWill(double destructiveWill) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index 19bd678b..4bfddd31 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -267,7 +267,7 @@ public class RitualGreenGrove extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index b247bcab..d9c67d1a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -230,7 +230,7 @@ public class RitualLava extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index 5a1eb618..244c038e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -171,7 +171,7 @@ public class RitualSpeed extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } public double getVerticalSpeedForWill(double rawWill) { diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java index a8b3038f..2b712a20 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java @@ -54,8 +54,8 @@ public class DungeonRoomLoader { public static void test() { ResourceLocation id = new ResourceLocation(BloodMagic.MODID, "testGson"); - String s = id.getResourceDomain(); - String s1 = id.getResourcePath(); + String s = id.getNamespace(); + String s1 = id.getPath(); InputStream inputstream = null; try { @@ -70,6 +70,6 @@ public class DungeonRoomLoader { } public static String resLocToResourcePath(ResourceLocation resourceLocation) { - return "/assets/" + resourceLocation.getResourceDomain() + "/schematics/" + resourceLocation.getResourcePath() + ".json"; + return "/assets/" + resourceLocation.getNamespace() + "/schematics/" + resourceLocation.getPath() + ".json"; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index b023c5c0..57d7d8e1 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -81,7 +81,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); - direction = EnumFacing.getFront(tag.getInteger(Constants.NBT.DIRECTION)); + direction = EnumFacing.byIndex(tag.getInteger(Constants.NBT.DIRECTION)); connectedPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); burnTime = tag.getInteger("burnTime"); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 052e8e2a..827e31b0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -173,7 +173,7 @@ public class TileDemonCrystal extends TileTicking { holder.readFromNBT(tag, "Will"); crystalCount = tag.getInteger("crystalCount"); - placement = EnumFacing.getFront(tag.getInteger("placement")); + placement = EnumFacing.byIndex(tag.getInteger("placement")); progressToNextCrystal = tag.getDouble("progress"); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 1f803f26..46e6332d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -80,7 +80,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { NBTTagCompound ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); - if (!ritualTag.hasNoTags()) { + if (!ritualTag.isEmpty()) { currentRitual.readFromNBT(ritualTag); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index 66c6b4df..0062ce60 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -30,7 +30,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte @Override public void update() { if (!getWorld().isRemote) { - currentInput = getWorld().isBlockIndirectlyGettingPowered(pos); + currentInput = getWorld().getRedstonePowerFromNeighbors(pos); // currentInput = getWorld().getStrongPower(pos); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 6c454ba8..54a2e614 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -46,7 +46,7 @@ public class GhostItemHelper { NBTTagCompound tag = newStack.getTagCompound(); int amount = getItemGhostAmount(ghostStack); tag.removeTag(Constants.NBT.GHOST_STACK_SIZE); - if (tag.hasNoTags()) { + if (tag.isEmpty()) { newStack.setTagCompound(null); } newStack.setCount(amount); diff --git a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java index d1d648d0..70b19397 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java @@ -56,7 +56,7 @@ public class ItemStackWrapper { @Override public String toString() { - return stackSize + "x" + item.getUnlocalizedName() + "@" + this.meta; + return stackSize + "x" + item.getTranslationKey() + "@" + this.meta; } public ItemStack toStack(int count) { diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 3e6fecc0..90f1d312 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -41,6 +41,7 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -59,7 +60,7 @@ public class Utils { static { try { - Field colorValue = ReflectionHelper.findField(EnumDyeColor.class, "field_193351_w", "colorValue"); + Field colorValue = ObfuscationReflectionHelper.findField(EnumDyeColor.class, "field_193351_w"); colorValue.setAccessible(true); for (EnumDyeColor color : EnumDyeColor.values()) { DYE_COLOR_VALUES.put(color, (int) colorValue.get(color)); @@ -130,7 +131,7 @@ public class Utils { public static boolean canEntitySeeBlock(World world, Entity entity, BlockPos pos) { Vec3d relativePosition = new Vec3d(entity.posX - pos.getX() - 0.5, entity.posY + (double) entity.getEyeHeight() - pos.getY() - 0.5, entity.posZ - pos.getZ() - 0.5); EnumFacing dir = EnumFacing.getFacingFromVector((float) relativePosition.x, (float) relativePosition.y, (float) relativePosition.z); - RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getFrontOffsetX() * 0.4, pos.getY() + 0.5 + dir.getFrontOffsetY() * 0.4, pos.getZ() + 0.5 + dir.getFrontOffsetZ() * 0.4), false, true, true); + RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getXOffset() * 0.4, pos.getY() + 0.5 + dir.getYOffset() * 0.4, pos.getZ() + 0.5 + dir.getZOffset() * 0.4), false, true, true); return result == null || pos.equals(result.getBlockPos()); } @@ -967,7 +968,7 @@ public class Utils { if (player instanceof EntityPlayerMP) reachDistance = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance(); - Vec3d reachPosition = eyePosition.addVector((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); + Vec3d reachPosition = eyePosition.add((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 8f29bfab..b929e0e9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -185,13 +185,13 @@ public class ClientHandler { // Collect all Blood Magic model errors List errored = new ArrayList<>(); for (ResourceLocation modelError : modelErrors.keySet()) - if (modelError.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID)) + if (modelError.getNamespace().equalsIgnoreCase(BloodMagic.MODID)) errored.add(modelError); // Collect all Blood Magic variant errors List missing = new ArrayList<>(); for (ModelResourceLocation missingVariant : missingVariants) - if (missingVariant.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID)) + if (missingVariant.getNamespace().equalsIgnoreCase(BloodMagic.MODID)) missing.add(missingVariant); // Remove discovered model errors @@ -226,7 +226,7 @@ public class ClientHandler { if (missingTextures.containsKey(mc)) { Set missingMCTextures = missingTextures.get(mc); for (ResourceLocation texture : missingMCTextures) - if (texture.getResourcePath().equalsIgnoreCase(String.format(format, "node")) || texture.getResourcePath().equalsIgnoreCase(String.format(format, "crystal"))) + if (texture.getPath().equalsIgnoreCase(String.format(format, "node")) || texture.getPath().equalsIgnoreCase(String.format(format, "crystal"))) toRemove.add(texture); } From 465a2beadeb165b37a045e11fbcbeea9a9123bf6 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 31 Jan 2019 19:42:42 -0800 Subject: [PATCH 288/493] Update changelog + version --- changelog.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++++ gradle.properties | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 5109324a..0595047d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,49 @@ +------------------------------------------------------ +Version 2.4.0 +------------------------------------------------------ + +It's been a while, eh? Some of you may be asking yourself "whats up with bloodmagic" like that damned recon on a certain +social media site. Well here's what's up: put something snarky here when done writing changelog + +There's so much here, I'm probably going to miss some. Here's a general overview from just skimming commit titles. + +Much of this was done via PR because I'm ~~lazy~~ too busy having fun with Fabric. + +- Fixed harvest moon not working with pumpkins +- [API] Added a way to unregister an altar component +- Moved anything related to Tier 6 behind an opt-in config. Please stop asking me how to get it. +- Fixed small demon stone bricks recipe so it returns 4 instead of 1 +- Ported some old rituals from 1.7 + - Cry of the Eternal Soul + - Reverence of the Condor + - Ritual of the Feathered Earth +- Added a new ritual, Ritual of Grounding +- Optimized bound tool harvesting +- Fixed render issues with demon crystals +- Fixed Hymn of Syphoning not updating some tanks visually +- Added very basic documentation for several rituals to the guide book +- Made meteor costs for Mark of the Falling Tower configurable in the meteor json +- Fluid related sigils should now work identically to buckets of the fluid +- Fixed ritual tinkerer area setting behaving wonkily +- Fixed Seer Sigil not working for incense altars +- Added the ability to buff movement and updraft arrays by providing more of their ingredient +- Ported the ritual dismantler from 1.7.10 +- Logic fix for the Solar Powered + - Now it requires a clear line of sight to the sky as well as it being day time +- Fixed Sigil of Magnetism AOE being offset from the player +- Rewrote commands + - They're different in some way, some how + - Don't ask me how +- Quality of life improvements for the ritual tinkerer +- Changed the activation crystal levels of some rituals to use the awakened crystal + - Mark of the Falling Tower + - All the living armor ones + - It's late and I'm tired don't hate me for being too lazy to look up their names +- Fixed up some bounding boxes for some blocks with fancier models +- Sentient Bow now properly handles modded and potion-ified arrows + +I can't wait for this to turn out to be very broken so I can yell at the contributor :> + ------------------------------------------------------ Version 2.3.3 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 85df68d7..0e38a009 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.3.3 +mod_version=2.4.0 mc_version=1.12.2 forge_version=14.23.5.2808 curse_id=224791 From 0e4f6c0fb9f80fcb6e0377fd54a671cac6d9266e Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 31 Jan 2019 19:45:47 -0800 Subject: [PATCH 289/493] Let's start pushing to curse under my name so people stop blaming Way --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0ad1ff65..947187be 100644 --- a/build.gradle +++ b/build.gradle @@ -165,7 +165,7 @@ def curseRelations = { } curseforge { - if (project.hasProperty('curse_key_WayofTime')) + if (project.hasProperty('curse_key_TehNut')) apiKey = project.curse_key_WayofTime project { From 5903cc7e0ad410e67ddf270f63c2e6fb6ac32693 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 31 Jan 2019 19:53:46 -0800 Subject: [PATCH 290/493] big kek --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 947187be..35276bea 100644 --- a/build.gradle +++ b/build.gradle @@ -166,7 +166,7 @@ def curseRelations = { curseforge { if (project.hasProperty('curse_key_TehNut')) - apiKey = project.curse_key_WayofTime + apiKey = project.curse_key_TehNut project { id = "${curse_id}" From 2c49be1bddd1748a093dc78b9cedcc4d1839cd1c Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 8 Feb 2019 13:04:41 -0500 Subject: [PATCH 291/493] Trickshot Arrows to reset hurtresistancetime. (#1487) (#1535) * Added a tag to arrows created through Living Armor's Trickshot Ability. Added a subscribeevent method for the onProjectileImpact event that removes the tag and sets the hurtresistanttime to zero. * Formatted trickshot arrow tags to snake_case --- .../handler/event/LivingArmourHandler.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index d5750f89..daa87642 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.world.World; import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import net.minecraftforge.event.entity.ProjectileImpactEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingHealEvent; @@ -161,10 +162,12 @@ public class LivingArmourHandler if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) { ItemStack drinkStack = event.getItemStack(); - if(!(drinkStack.getItem() instanceof ItemSplashPotion)) { + if (!(drinkStack.getItem() instanceof ItemSplashPotion)) + { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); - if (upgrade instanceof LivingArmourUpgradeQuenched) { + if (upgrade instanceof LivingArmourUpgradeQuenched) + { event.setCanceled(true); } } @@ -341,7 +344,7 @@ public class LivingArmourHandler ItemArrow itemarrow = (ItemArrow) ((stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW)); EntityArrow entityarrow = itemarrow.createArrow(world, arrowStack, player); entityarrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, velocity * 3.0F, 1.0F); - + entityarrow.addTag("arrow_shot"); float velocityModifier = 0.6f * velocity; entityarrow.motionX += (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; @@ -372,4 +375,19 @@ public class LivingArmourHandler } } } + + // Applies: Arrow Shot + @SubscribeEvent + public static void onProjectileImpact(ProjectileImpactEvent.Arrow event) + { + if (event.getArrow().removeTag("arrow_shot")) + { + Entity entity = event.getRayTraceResult().entityHit; + + if (entity != null) + { + entity.hurtResistantTime = 0; + } + } + } } From 28b5caa5aaccbfd90df78f1bf753fd82d0e3f91e Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 8 Feb 2019 22:34:41 -0500 Subject: [PATCH 292/493] (#1415) Soft Fall / fallProtect Implementation (#1536) * Fixed softFall / fallProtect upgrade for living armour. Previously it relied on regular armor properties, which fall damage bypasses by being marked is unblockable. Created a method subscribed to onPlayerFall which applies the damage multiplier and the fallProtect stat-tracker. Removed the armorProperties method of LivingAmourUpgradeFallProtect.java and replaced it with getDamageMultiplier. * Fixed formatting issues. [1+1 vs 1 + 1, 1.0F instead of 1.0f] --- .../LivingArmourUpgradeFallProtect.java | 12 +++----- .../handler/event/LivingArmourHandler.java | 28 ++++++++++++++++++- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index 56971eb9..66b48fdc 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -8,19 +8,15 @@ import net.minecraft.util.DamageSource; public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { public static final int[] costs = new int[]{2, 5, 9, 15, 25}; - public static final double[] protectionLevel = new double[]{0.2, 0.4, 0.6, 0.8, 1}; + public static final float[] protectionLevel = new float[]{0.2F, 0.4F, 0.6F, 0.8F, 1F}; public LivingArmourUpgradeFallProtect(int level) { super(level); } - @Override - public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { - if (source.equals(DamageSource.FALL)) { - return protectionLevel[this.level]; - } - - return 0; + + public float getDamageMultiplier() { + return 1 - protectionLevel[this.level]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index daa87642..81b60284 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -11,6 +11,7 @@ import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowHeal; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTrooper; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerFallProtect; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerGrimReaperSprint; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerJump; import WayofTime.bloodmagic.livingArmour.upgrade.*; @@ -32,6 +33,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.ProjectileImpactEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHealEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -374,8 +376,32 @@ public class LivingArmourHandler } } } - } + } + // Applies: Softfall + @SubscribeEvent + public static void onPlayerFall(LivingFallEvent event) { + if (event.getEntityLiving() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (LivingArmour.hasFullSet(player)) + { + + ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); + if (armour != null) + { + StatTrackerFallProtect.incrementCounter(armour, event.getDamageMultiplier() * (event.getDistance() - 3)); + LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.fallProtect", chestStack); + if (upgrade instanceof LivingArmourUpgradeFallProtect) { + LivingArmourUpgradeFallProtect fallUpgrade = (LivingArmourUpgradeFallProtect) upgrade; + event.setDamageMultiplier(event.getDamageMultiplier() * fallUpgrade.getDamageMultiplier()); + } + } + } + } + } + // Applies: Arrow Shot @SubscribeEvent public static void onProjectileImpact(ProjectileImpactEvent.Arrow event) From cb69f84ed63d7d248253eede2ab19f79d3978619 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 8 Feb 2019 20:21:59 -0800 Subject: [PATCH 293/493] Fix oredict filter passing invalid stacks to oredict (#1481) --- .../java/WayofTime/bloodmagic/routing/OreDictItemFilter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java index 812c4cc3..aa209492 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java @@ -17,6 +17,9 @@ public class OreDictItemFilter extends TestItemFilter { @Override public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { + if (filterStack.isEmpty() || testStack.isEmpty()) + return false; + int[] filterIds = OreDictionary.getOreIDs(filterStack); int[] testIds = OreDictionary.getOreIDs(testStack); From 8e2a93fa34f54e2e3d6feae60d1b408b2d930454 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Fri, 8 Feb 2019 20:33:43 -0800 Subject: [PATCH 294/493] Improve nocturnal prowess behavior (#1461) No more flickering. If you're in the dark, it will apply a max duration effect. If you're in the light and (as far as it can tell) the effect was applied by the armor, the effect will be removed. --- .../upgrade/LivingArmourUpgradeNightSight.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index 3493b8e1..e18b3c1b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -31,17 +31,13 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { if (world.getLight(player.getPosition(), false) <= 9) { isActive = true; - if (player.isPotionActive(MobEffects.NIGHT_VISION)) { - int dur = player.getActivePotionEffect(MobEffects.NIGHT_VISION).getDuration(); - if (dur > 100 && dur < 20 * 60 * 20) { - //Don't override the potion effect if the other potion effect is sufficiently long. - return; - } - } + if (player.isPotionActive(MobEffects.NIGHT_VISION)) + return; - player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, Constants.Misc.NIGHT_VISION_CONSTANT_BEGIN, 0, false, false)); - } else { + player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false)); + } else if (isActive) { isActive = false; + player.removePotionEffect(MobEffects.NIGHT_VISION); } } From 77ca407630c4b8e90a362a66d3065d3bf704d39a Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 11 Feb 2019 02:29:57 +0100 Subject: [PATCH 295/493] no idea why I didn't put it before the switch statement to begin with; (#1538) that would just have been too logical #1537 --- .../projectile/EntitySentientArrow.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index aa90eaa3..fe91c8ac 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -168,6 +168,18 @@ public class EntitySentientArrow extends EntityTippedArrow { @Override public void onUpdate() { super.onUpdate(); + if (this.specialArrowClass != null) { + if (!this.world.isRemote) { + this.specialEntity.posX = this.posX; + this.specialEntity.posY = this.posY; + this.specialEntity.posZ = this.posZ; + + this.specialEntity.onUpdate(); + if (this.inGround) { + this.specialEntity.setDead(); + } + } + } switch (type) { case DESTRUCTIVE: if (this.potion != null) { @@ -177,8 +189,8 @@ public class EntitySentientArrow extends EntityTippedArrow { this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); if (this.potion != null && this.specialArrowClass == null) { createPotionFromArrow(null); - this.setDead(); } + this.setDead(); } break; case CORROSIVE: @@ -204,19 +216,7 @@ public class EntitySentientArrow extends EntityTippedArrow { break; } - if (this.specialArrowClass != null) { - if (!this.world.isRemote) { - this.specialEntity.posX = this.posX; - this.specialEntity.posY = this.posY; - this.specialEntity.posZ = this.posZ; - this.specialEntity.onUpdate(); - if (this.inGround) { - this.setDead(); - this.specialEntity.setDead(); - } - } - } } //TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect. From 4a59dede53c098dd98a7fe0e1ba5f7ab5c06e6b8 Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 13 Feb 2019 18:59:56 -0500 Subject: [PATCH 296/493] Fixed an error where firing a tipped arrow with a sentient bow without (#1542) demon will would still result in the effect of the tipped arrow being multiplied. --- .../WayofTime/bloodmagic/item/soul/ItemSentientBow.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 71092325..031f5a57 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -334,9 +334,12 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.ARROW)); EntityArrow entityArrow; double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); - + float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); - if (itemarrow == Items.ARROW) { + + if (getLevel(PlayerDemonWillHandler.getTotalDemonWill(type, player)) <= 0) { + entityArrow = itemarrow.createArrow(world, itemstack, entityLiving); + } else if (itemarrow == Items.ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), (PotionType) null); } else if (itemarrow == Items.TIPPED_ARROW) { From 2d49fab8931c7a6bbb921e605c955a3150c3ef5f Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 13 Feb 2019 19:27:41 -0500 Subject: [PATCH 297/493] Trickshot - Sentient Arrows Implementation (#1540) * The onArrowFire event handler for LivingArmour now checks whether the arrows were fired from a sentient bow, and if they are it calls a getDuplicateArrows method in ItemSentientBow. Said method gets the will and potion types, without changing the bow's durability or consuming will or arrows. * Extra line breaks removed --- .../bloodmagic/item/soul/ItemSentientBow.java | 27 +++++++++++++++++++ .../handler/event/LivingArmourHandler.java | 14 ++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 031f5a57..1b804351 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -305,6 +305,33 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien return entityArrow; } + public EntitySentientArrow getDuplicateArrow(ItemStack bowStack, World world, EntityPlayer player, double reimburseMultiplier) { + + EnumDemonWillType willType = this.getCurrentType(bowStack); + ItemStack arrow = this.getFiredArrow(player); + + ItemArrow itemarrow = ((ItemArrow) (arrow.getItem() instanceof ItemArrow ? arrow.getItem() : Items.ARROW)); + EntitySentientArrow entityArrow; + double reimburseAmount = (this.getDropOfActivatedBow(bowStack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(bowStack)) * reimburseMultiplier; + + if (itemarrow == Items.ARROW) { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); + entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), (PotionType) null); + } else if (itemarrow == Items.TIPPED_ARROW) { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); + entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), arrow); + } else if (itemarrow == Items.SPECTRAL_ARROW) { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); + entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), new PotionType(new PotionEffect(MobEffects.GLOWING, 200, 0))); + } else { + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); + entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), itemarrow.createArrow(world, bowStack, player)); + } + + player.addStat(StatList.getObjectUseStats(this)); + return entityArrow; + } + @Override public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) { if (entityLiving instanceof EntityPlayer) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 81b60284..1bff2668 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -5,6 +5,7 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.item.soul.ItemSentientBow; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; @@ -314,6 +315,7 @@ public class LivingArmourHandler World world = event.getEntityPlayer().getEntityWorld(); ItemStack stack = event.getBow(); EntityPlayer player = event.getEntityPlayer(); + boolean sentientShot = false; if (world.isRemote) return; @@ -338,13 +340,21 @@ public class LivingArmourHandler if (velocity > 1.0F) velocity = 1.0F; - + if (event.getBow().getItem() instanceof ItemSentientBow) { + sentientShot = true; + } int extraArrows = ((LivingArmourUpgradeArrowShot) upgrade).getExtraArrows(); for (int n = 0; n < extraArrows; n++) { ItemStack arrowStack = new ItemStack(Items.ARROW); ItemArrow itemarrow = (ItemArrow) ((stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW)); - EntityArrow entityarrow = itemarrow.createArrow(world, arrowStack, player); + EntityArrow entityarrow; + if (sentientShot) { // if the arrow was fired from a sentient bow + ItemSentientBow sentientBow = (ItemSentientBow) stack.getItem(); + entityarrow = sentientBow.getDuplicateArrow(stack, world, player, 1 / extraArrows); + } else { + entityarrow = itemarrow.createArrow(world, arrowStack, player); + } entityarrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, velocity * 3.0F, 1.0F); entityarrow.addTag("arrow_shot"); float velocityModifier = 0.6f * velocity; From 069051bf3bb416765723c8e453d40c5836359826 Mon Sep 17 00:00:00 2001 From: Phil Date: Sun, 17 Feb 2019 16:45:57 -0500 Subject: [PATCH 298/493] Modified Living Armour's Step Assist to only apply when the player is not sneaking. (#1545) --- .../util/handler/event/LivingArmourHandler.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 1bff2668..6a701a0f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -265,8 +265,14 @@ public class LivingArmourHandler if (upgrade instanceof LivingArmourUpgradeStepAssist) { - player.stepHeight = ((LivingArmourUpgradeStepAssist) upgrade).getStepAssist(); - hasAssist = true; + if (!player.isSneaking()) + { + player.stepHeight = ((LivingArmourUpgradeStepAssist) upgrade).getStepAssist(); + hasAssist = true; + } else + { + player.stepHeight = 0.6F; + } } } } From 22ac5b0da5c24f61b028ebe37886193ce5319245 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Wed, 20 Feb 2019 22:28:04 +0000 Subject: [PATCH 299/493] Tested everything again, noticed 2 oversights that didn't have any impact. (#1548) Usable in both SSP (creative mode) and SMP (op). Required permission level for commands is 2 (server's "op" permission level can be seen and changed in the server.properties). --- .../WayofTime/bloodmagic/command/sub/SubCommandNetwork.java | 2 +- .../WayofTime/bloodmagic/command/sub/SubCommandRitual.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index a96cef8a..1cf0b421 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -41,7 +41,7 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public int getRequiredPermissionLevel() { - return 0; + return 2; } abstract class NetworkCommand extends CommandTreeBase { diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java index bf1a7dca..db0ec96d 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java @@ -141,4 +141,9 @@ public class SubCommandRitual extends CommandTreeBase { } } + + @Override + public int getRequiredPermissionLevel() { + return 2; + } } From c8b004c9b6d5798adf404f7f97b41c63b2d0bc99 Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 28 Feb 2019 15:13:48 -0500 Subject: [PATCH 300/493] Added Whirlwind to the potion registry - fixing a bug where the fast miner sigil would also cause the whirlwind effect. Increased the effect of the fast miner sigil to haste 2, to correspond with what the Sanguine Scientium states. (#1552) --- .../java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java | 1 + .../WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 948835d3..83a0a0e1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -89,6 +89,7 @@ public class RegistrarBloodMagic { event.getRegistry().registerAll( new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 0).setRegistryName("boost"), + new PotionBloodMagic("Whirlwind", false, 0xFFFFFF, 0, 0).setRegistryName("whirlwind"), new PotionBloodMagic("Planar Binding", false, 0, 2, 0).setRegistryName("planar_binding"), new PotionBloodMagic("Soul Snare", false, 0xFFFFFF, 3, 0).setRegistryName("soul_snare"), new PotionBloodMagic("Soul Fray", true, 0xFFFFFF, 4, 0).setRegistryName("soul_fray"), diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 6297abde..090dc98b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -21,7 +21,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase { public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(MobEffects.HASTE, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(MobEffects.HASTE, 2, 1, true, false)); } @Override From bc168a3937c2e0f372576bdf6fa1b5e6d7a20728 Mon Sep 17 00:00:00 2001 From: Richard Freimer Date: Sun, 3 Mar 2019 02:16:25 -0500 Subject: [PATCH 301/493] Use TextFormatting rather than including color codes in block lang name (#1546) --- .../compat/waila/provider/DataProviderAlchemyArray.java | 3 ++- src/main/resources/assets/bloodmagic/lang/de_DE.lang | 2 +- src/main/resources/assets/bloodmagic/lang/en_US.lang | 2 +- src/main/resources/assets/bloodmagic/lang/fr_FR.lang | 2 +- src/main/resources/assets/bloodmagic/lang/ja_JP.lang | 2 +- src/main/resources/assets/bloodmagic/lang/ru_RU.lang | 2 +- src/main/resources/assets/bloodmagic/lang/zh_CN.lang | 2 +- src/main/resources/assets/bloodmagic/lang/zh_TW.lang | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index bc8ade1c..abfe0957 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import javax.annotation.Nonnull; @@ -25,7 +26,7 @@ public class DataProviderAlchemyArray implements IWailaDataProvider { @Nonnull @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextHelper.getFormattedText(RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName())); + return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextFormatting.WHITE + RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName()); } @Nonnull diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang index 0cb12242..db60bfb1 100644 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang @@ -201,7 +201,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=Imperfekter Ritualstein tile.bloodmagic.stone.ritual.inverted.name=Umgekehrter Meisterritualstein tile.bloodmagic.altar.name=Blutaltar -tile.bloodmagic.alchemyArray.name=&r&fAlchemische Anordnung +tile.bloodmagic.alchemyArray.name=Alchemische Anordnung tile.bloodmagic.rune.blank.name=Leere Rune tile.bloodmagic.rune.speed.name=Geschwindigkeitsrune diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 82c23c2e..f5cc5ff4 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -201,7 +201,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=Imperfect Ritual Stone tile.bloodmagic.stone.ritual.inverted.name=Inverted Master Ritual Stone tile.bloodmagic.altar.name=Blood Altar -tile.bloodmagic.alchemyArray.name=&r&fAlchemy Array +tile.bloodmagic.alchemyArray.name=Alchemy Array tile.bloodmagic.rune.blank.name=Blank Rune tile.bloodmagic.rune.speed.name=Speed Rune diff --git a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang index f75e010a..3493e25d 100644 --- a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang +++ b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang @@ -181,7 +181,7 @@ tile.bloodmagic.stone.ritual.master.name=Pierre Rituelle Maîtresse tile.bloodmagic.stone.ritual.imperfect.name=Pierre Rituelle Imparfaite tile.bloodmagic.altar.name=Autel de Sang -tile.bloodmagic.alchemyArray.name=&r&fÉtalage d'Alchimie +tile.bloodmagic.alchemyArray.name=Étalage d'Alchimie tile.bloodmagic.rune.blank.name=Rune de Sang tile.bloodmagic.rune.speed.name=Rune de Vitesse diff --git a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang index 58d7b932..5cffaa40 100644 --- a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang +++ b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang @@ -201,7 +201,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=簡易儀å¼çŸ³ tile.bloodmagic.stone.ritual.inverted.name=å転マスター儀å¼çŸ³ tile.bloodmagic.altar.name=è¡€ã®ç¥­å£‡ -tile.bloodmagic.alchemyArray.name=&r&f錬金術魔法陣 +tile.bloodmagic.alchemyArray.name=錬金術魔法陣 tile.bloodmagic.rune.blank.name=空ã®ãƒ«ãƒ¼ãƒ³ tile.bloodmagic.rune.speed.name=速度ã®ãƒ«ãƒ¼ãƒ³ diff --git a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang index 0a76a026..a91e66e9 100644 --- a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang +++ b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang @@ -200,7 +200,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=Ðеполноценный риту tile.bloodmagic.stone.ritual.inverted.name=Инвертированный ритуальный камень tile.bloodmagic.altar.name=Кровавый алтарь -tile.bloodmagic.alchemyArray.name=&r&fÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° +tile.bloodmagic.alchemyArray.name=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° tile.bloodmagic.rune.blank.name=ЧиÑÑ‚Ð°Ñ Ñ€ÑƒÐ½Ð° tile.bloodmagic.rune.speed.name=Руна ÑкороÑти diff --git a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang index 6ccec15a..d27f9496 100644 --- a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang @@ -198,7 +198,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=ä¸å®Œå–„的仪å¼çŸ³ tile.bloodmagic.stone.ritual.inverted.name=å转的主仪å¼çŸ³ tile.bloodmagic.altar.name=è¡€ä¹‹ç¥­å› -tile.bloodmagic.alchemyArray.name=&r&f炼金矩阵 +tile.bloodmagic.alchemyArray.name=炼金矩阵 tile.bloodmagic.rune.blank.name=空白符文 tile.bloodmagic.rune.speed.name=速度符文 diff --git a/src/main/resources/assets/bloodmagic/lang/zh_TW.lang b/src/main/resources/assets/bloodmagic/lang/zh_TW.lang index 3632a10a..bdabcb85 100644 --- a/src/main/resources/assets/bloodmagic/lang/zh_TW.lang +++ b/src/main/resources/assets/bloodmagic/lang/zh_TW.lang @@ -152,7 +152,7 @@ tile.bloodmagic.stone.ritual.master.name=魔導師儀å¼çŸ³ tile.bloodmagic.stone.ritual.imperfect.name=次級儀å¼çŸ³ tile.bloodmagic.altar.name=血祭壇 -tile.bloodmagic.alchemyArray.name=&r&f煉金矩陣 +tile.bloodmagic.alchemyArray.name=煉金矩陣 tile.bloodmagic.rune.blank.name=空白符文石 tile.bloodmagic.rune.speed.name=速度符文石 From dea733a76eb3a91b27ed4ecf9722643400902a5a Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Sun, 10 Mar 2019 21:52:42 +0000 Subject: [PATCH 302/493] Fixed Sigil tooltip formatting (#1559) --- .../java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 650ff280..26b44789 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -6,7 +6,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -38,7 +37,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (TextHelper.canTranslate(tooltipBase + "desc")) - tooltip.addAll(Arrays.asList(WordUtils.wrap(new TextComponentTranslation(tooltipBase + "desc").getFormattedText(), 30, "/cut", false).split("/cut"))); + tooltip.addAll(Arrays.asList(WordUtils.wrap(TextHelper.localizeEffect(tooltipBase + "desc"), 30, "/cut", false).split("/cut"))); super.addInformation(stack, world, tooltip, flag); } From 6b176bebf3cd2869b05d836a99fdc9bd9ac6a785 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Sun, 31 Mar 2019 21:53:35 +0000 Subject: [PATCH 303/493] Block range fixes (#1571) * Veil of Evil class creation Signed-off-by: tobias * Some getBlockRange() oversights. * Delete RitualVeilOfEvil.java should not be in this branch. * Removed TODO. --- .../java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java | 2 +- .../bloodmagic/ritual/types/RitualWellOfSuffering.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java index 5a8795c0..2aa7a7d1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java @@ -64,7 +64,7 @@ public class RitualGrounding extends Ritual { double vengefulDrained = 0; /* Actual ritual stuff begins here */ - AreaDescriptor groundingRange = getBlockRange(GROUNDING_RANGE); + AreaDescriptor groundingRange = masterRitualStone.getBlockRange(GROUNDING_RANGE); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, groundingRange.getAABB(pos)); for (EntityLivingBase entity : entities) { if (totalEffects >= maxEffects) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 302af3cd..921963ff 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -71,7 +71,7 @@ public class RitualWellOfSuffering extends Ritual { if (tile instanceof TileAltar) { TileAltar tileAltar = (TileAltar) tile; - AreaDescriptor damageRange = getBlockRange(DAMAGE_RANGE); + AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); AxisAlignedBB range = damageRange.getAABB(pos); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, range); From 7c1565a68cddd5cc31660dd51e4d86545bfe9c8d Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 5 Apr 2019 17:26:18 -0400 Subject: [PATCH 304/493] Quick fix for ritual of grounding, which was applying gravity to every entity. (#1576) Added a check to determine if an entity already has no gravity, in which case it would not track them. --- .../java/WayofTime/bloodmagic/potion/PotionEventHandlers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 46b12fc1..18d12e9c 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -92,10 +92,10 @@ public class PotionEventHandlers { // } // } List noGravityList = noGravityListMap.get(event.getEntityLiving().getEntityWorld()); - if ((!(eventEntityLiving instanceof EntityPlayer) || !((EntityPlayer) eventEntityLiving).isSpectator()) && eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED)) { + if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED) && !eventEntityLiving.hasNoGravity()) { eventEntityLiving.setNoGravity(true); noGravityList.add(eventEntityLiving); - } else { + } else if (noGravityList.contains(eventEntityLiving)) { eventEntityLiving.setNoGravity(false); noGravityList.remove(eventEntityLiving); } From 53b6030ba948e71f408223f2fcf9cefec4b86606 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 14 Apr 2019 08:22:42 -0700 Subject: [PATCH 305/493] Run code formatter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🦀 Way is gone 🦀 --- .../WayofTime/bloodmagic/ConfigHandler.java | 78 ++--- .../AlchemyArrayEffectArrowTurret.java | 102 ++---- .../AlchemyArrayEffectFurnaceFuel.java | 72 ++-- .../AlchemyArrayEffectLaputa.java | 60 ++-- .../AlchemyArrayEffectMobSacrifice.java | 84 ++--- .../alchemyArray/AlchemyArrayEffectSpike.java | 24 +- .../AlchemyArrayEffectTeleport.java | 42 +-- .../WayofTime/bloodmagic/altar/AltarTier.java | 2 +- .../bloodmagic/altar/BloodAltar.java | 260 +++++---------- .../api/impl/BloodMagicCorePlugin.java | 33 +- .../api/impl/BloodMagicRecipeRegistrar.java | 135 +++----- .../api/impl/recipe/RecipeSacrificeCraft.java | 15 +- .../bloodmagic/block/BlockDecorative.java | 2 +- .../bloodmagic/block/BlockMimic.java | 2 +- .../block/enums/EnumRitualController.java | 3 +- .../client/hud/ElementRegistry.java | 3 +- .../bloodmagic/client/hud/GuiEditHUD.java | 4 +- .../element/ElementDivinedInformation.java | 2 +- .../bloodmagic/client/key/KeyBindings.java | 3 +- .../LowAlchemyCircleRenderer.java | 12 +- .../LowStaticAlchemyCircleRenderer.java | 15 +- .../MobSacrificeAlchemyCircleRenderer.java | 160 ++++----- .../TurretAlchemyCircleRenderer.java | 143 +++----- .../command/sub/SubCommandRitual.java | 1 + .../compress/BaseCompressionHandler.java | 4 +- .../compress/StorageBlockCraftingManager.java | 2 +- .../bloodmagic/core/RegistrarBloodMagic.java | 21 +- .../core/RegistrarBloodMagicItems.java | 11 +- .../core/RegistrarBloodMagicRecipes.java | 36 +- .../entity/mob/EntitySentientSpecter.java | 6 +- .../item/ItemActivationCrystal.java | 3 +- .../bloodmagic/item/ItemAlchemicVial.java | 9 +- .../bloodmagic/item/ItemBloodOrb.java | 2 +- .../bloodmagic/item/ItemLavaCrystal.java | 2 +- .../item/ItemSacrificialDagger.java | 12 +- .../WayofTime/bloodmagic/item/ItemSlate.java | 3 +- .../item/ItemTelepositionFocus.java | 3 +- .../bloodmagic/item/block/ItemBlockMimic.java | 73 ++-- .../item/routing/ItemFluidRouterFilter.java | 70 ++-- .../item/routing/ItemRouterFilter.java | 106 +++--- .../item/sigil/ItemSigilBloodLight.java | 39 +-- .../item/sigil/ItemSigilTeleposition.java | 2 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 3 +- .../bloodmagic/item/soul/ItemSentientBow.java | 21 +- .../item/soulBreath/ItemFlightScroll.java | 159 +++------ .../soulBreath/ItemSoulBreathContainer.java | 30 +- .../item/types/AlchemicVialType.java | 24 +- .../bloodmagic/item/types/ComponentTypes.java | 3 +- .../bloodmagic/item/types/ShardType.java | 3 +- .../LivingArmourUpgradeFallProtect.java | 2 +- .../upgrade/LivingArmourUpgradeSpeed.java | 54 ++- .../bloodmagic/proxy/ClientProxy.java | 39 +-- .../bloodmagic/registry/ModRecipes.java | 114 +++---- .../bloodmagic/registry/ModRituals.java | 9 +- .../ritual/crushing/ICrushingHandler.java | 2 + .../ritual/types/RitualAltarBuilder.java | 2 +- .../ritual/types/RitualCobblestone.java | 10 +- .../ritual/types/RitualCrushing.java | 18 +- .../ritual/types/RitualCrystalSplit.java | 104 +++--- .../ritual/types/RitualEllipsoid.java | 69 ++-- .../routing/RoutingFluidFilter.java | 108 ++---- .../bloodmagic/soul/ISoulBreathContainer.java | 3 +- .../bloodmagic/tile/TileAlchemyArray.java | 90 ++--- .../bloodmagic/tile/TileAlchemyTable.java | 314 +++++++----------- .../bloodmagic/tile/TileDemonCrystal.java | 94 ++---- .../tile/TileDemonCrystallizer.java | 72 ++-- .../WayofTime/bloodmagic/tile/TileMimic.java | 12 +- .../bloodmagic/tile/TilePhantomBlock.java | 2 +- .../tile/routing/TileMasterRoutingNode.java | 255 +++++--------- .../WayofTime/bloodmagic/util/Constants.java | 18 +- .../bloodmagic/util/ISigilFluidItem.java | 2 + .../WayofTime/bloodmagic/util/PluginUtil.java | 5 +- .../util/handler/event/GenericHandler.java | 8 +- .../handler/event/LivingArmourHandler.java | 197 ++++------- .../bloodmagic/util/helper/IncenseHelper.java | 3 +- .../bloodmagic/util/helper/NetworkHelper.java | 9 +- .../util/helper/PlayerSacrificeHelper.java | 2 +- 77 files changed, 1289 insertions(+), 2232 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 3681b7af..c00b81d5 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -9,90 +9,82 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class ConfigHandler -{ +public class ConfigHandler { - @Config.Comment({ "General settings" }) + @Config.Comment({"General settings"}) public static ConfigGeneral general = new ConfigGeneral(); - @Config.Comment({ "Blacklist options for various features" }) + @Config.Comment({"Blacklist options for various features"}) public static ConfigBlacklist blacklist = new ConfigBlacklist(); - @Config.Comment({ "Value modifiers for various features" }) + @Config.Comment({"Value modifiers for various features"}) public static ConfigValues values = new ConfigValues(); - @Config.Comment({ "Settings that only pertain to the client" }) + @Config.Comment({"Settings that only pertain to the client"}) public static ConfigClient client = new ConfigClient(); - @Config.Comment({ "Compatibility settings" }) + @Config.Comment({"Compatibility settings"}) public static ConfigCompat compat = new ConfigCompat(); @SubscribeEvent - public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) - { - if (event.getModID().equals(BloodMagic.MODID)) - { + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { + if (event.getModID().equals(BloodMagic.MODID)) { ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values BloodMagic.RITUAL_MANAGER.syncConfig(); MeteorConfigHandler.handleMeteors(false); // Reload meteors } } - public static class ConfigGeneral - { - @Config.Comment({ "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) + public static class ConfigGeneral { + @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) public boolean enableDebugLogging = false; - @Config.Comment({ "Enables extra information to be printed to the log." }) + @Config.Comment({"Enables extra information to be printed to the log."}) public boolean enableAPILogging = false; - @Config.Comment({ "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) + @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) public boolean enableVerboseAPILogging = false; - @Config.Comment({ "Enables tier 6 related registrations. This is for pack makers."}) + @Config.Comment({"Enables tier 6 related registrations. This is for pack makers."}) @Config.RequiresMcRestart public boolean enableTierSixEvenThoughThereIsNoContent = false; } - public static class ConfigBlacklist - { - @Config.Comment({ "Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state." }) - public String[] teleposer = { "bedrock", "mob_spawner" }; - @Config.Comment({ "Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid." }) - public String[] transposer = { "bedrock", "mob_spawner" }; - @Config.Comment({ "Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid." }) + public static class ConfigBlacklist { + @Config.Comment({"Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state."}) + public String[] teleposer = {"bedrock", "mob_spawner"}; + @Config.Comment({"Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid."}) + public String[] transposer = {"bedrock", "mob_spawner"}; + @Config.Comment({"Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid."}) public String[] wellOfSuffering = {}; } - public static class ConfigValues - { - @Config.Comment({ "Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid." }) - public String[] sacrificialValues = { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100" }; - @Config.Comment({ "Amount of LP the Coat of Arms should provide for each damage dealt." }) + public static class ConfigValues { + @Config.Comment({"Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid."}) + public String[] sacrificialValues = {"villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100"}; + @Config.Comment({"Amount of LP the Coat of Arms should provide for each damage dealt."}) @Config.RangeInt(min = 0, max = 100) public int coatOfArmsConversion = 20; - @Config.Comment({ "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) + @Config.Comment({"Amount of LP the Sacrificial Dagger should provide for each damage dealt."}) @Config.RangeInt(min = 0, max = 10000) public int sacrificialDaggerConversion = 100; - @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) + @Config.Comment({"Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated."}) public boolean shouldResyncMeteors = true; - @Config.Comment({ "Should mobs that die through the Well of Suffering Ritual drop items?"}) + @Config.Comment({"Should mobs that die through the Well of Suffering Ritual drop items?"}) public boolean wellOfSufferingDrops = true; } - public static class ConfigClient - { - @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) + public static class ConfigClient { + @Config.Comment({"Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held."}) public boolean alwaysRenderRoutingLines = false; - @Config.Comment({ "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) + @Config.Comment({"Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed."}) public boolean invisibleSpectralBlocks = true; - @Config.Comment({ "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar." }) + @Config.Comment({"When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar."}) public boolean sigilHoldingSkipsEmptySlots = false; } - public static class ConfigCompat - { - @Config.Comment({ "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) + public static class ConfigCompat { + @Config.Comment({"The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory."}) public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; - public enum AltarDisplayMode - { + public enum AltarDisplayMode { ALWAYS, SIGIL_HELD, - SIGIL_CONTAINED, ; + SIGIL_CONTAINED, + ; } } } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java index ccebac1f..67dc2ac6 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java @@ -22,8 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.util.Utils; -public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect -{ +public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { public EntityLiving target; public int arrowTimer; public static final int ARROW_WINDUP = 50; @@ -34,49 +33,39 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect private double yaw = 0; private double lastYaw = 0; - public AlchemyArrayEffectArrowTurret(String key) - { + public AlchemyArrayEffectArrowTurret(String key) { super(key); } @Override - public boolean update(TileEntity tile, int ticksActive) - { + public boolean update(TileEntity tile, int ticksActive) { BlockPos pos = tile.getPos(); World world = tile.getWorld(); BlockPos chestPos = pos.down(); TileEntity chestTile = world.getTileEntity(chestPos); - if (chestTile == null) - { + if (chestTile == null) { return false; } IItemHandler itemHandler = Utils.getInventory(chestTile, EnumFacing.UP); - if (itemHandler == null) - { + if (itemHandler == null) { return false; } ItemStack arrowStack = new ItemStack(Items.AIR); - if (lastChestSlot >= 0 && lastChestSlot < itemHandler.getSlots()) - { + if (lastChestSlot >= 0 && lastChestSlot < itemHandler.getSlots()) { ItemStack testStack = itemHandler.extractItem(lastChestSlot, 1, true); - if (testStack.isEmpty() || !(testStack.getItem() instanceof ItemArrow)) - { + if (testStack.isEmpty() || !(testStack.getItem() instanceof ItemArrow)) { lastChestSlot = -1; - } else - { + } else { arrowStack = testStack; } } - if (lastChestSlot < 0) - { - for (int i = 0; i < itemHandler.getSlots(); i++) - { + if (lastChestSlot < 0) { + for (int i = 0; i < itemHandler.getSlots(); i++) { ItemStack testStack = itemHandler.extractItem(i, 1, true); - if (!testStack.isEmpty() && testStack.getItem() instanceof ItemArrow) - { + if (!testStack.isEmpty() && testStack.getItem() instanceof ItemArrow) { arrowStack = testStack; lastChestSlot = i; break; @@ -85,13 +74,11 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect } - if (lastChestSlot < 0) - { + if (lastChestSlot < 0) { return false; //No arrows in the chest. Welp! } - if (canFireOnMob(world, pos, target)) - { + if (canFireOnMob(world, pos, target)) { Vector2d pitchYaw = getPitchYaw(pos, target); lastPitch = pitch; lastYaw = yaw; @@ -99,27 +86,23 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect yaw = pitchYaw.y; arrowTimer++; - if (arrowTimer >= ARROW_WINDUP) - { + if (arrowTimer >= ARROW_WINDUP) { // ItemStack arrowStack = new ItemStack(Items.ARROW); fireOnTarget(world, pos, arrowStack, target); - if (!world.isRemote) - { + if (!world.isRemote) { itemHandler.extractItem(lastChestSlot, 1, false); } arrowTimer = 0; } return false; - } else - { + } else { target = null; arrowTimer = -1; } List mobsInRange = world.getEntitiesWithinAABB(EntityMob.class, getBounds(pos)); - for (EntityMob entity : mobsInRange) - { + for (EntityMob entity : mobsInRange) { if (canFireOnMob(world, pos, entity))// && isMobInFilter(ent)) { target = entity; @@ -133,34 +116,27 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect return false; } - public double getPitch() - { + public double getPitch() { return pitch; } - public double getLastPitch() - { + public double getLastPitch() { return lastPitch; } - public double getYaw() - { + public double getYaw() { return yaw; } - public double getLastYaw() - { + public double getLastYaw() { return lastYaw; } - public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, EntityLiving targetMob) - { + public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, EntityLiving targetMob) { float vel = 3f; double damage = 2; - if (!world.isRemote) - { - if (arrowStack.getItem() instanceof ItemArrow) - { + if (!world.isRemote) { + if (arrowStack.getItem() instanceof ItemArrow) { // ItemArrow arrow = (ItemArrow) arrowStack.getItem(); // EntityArrow entityarrow = arrow.createArrow(world, arrowStack, targetMob); EntityTippedArrow entityarrow = new EntityTippedArrow(world); @@ -180,10 +156,8 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect } } - public static Vector2d getPitchYaw(BlockPos pos, Entity entityIn) - { - if (entityIn == null) - { + public static Vector2d getPitchYaw(BlockPos pos, Entity entityIn) { + if (entityIn == null) { return new Vector2d(0, 0); } @@ -197,46 +171,38 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect return new Vector2d(pitch, yaw); } - public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) - { + public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) { return world.rayTraceBlocks(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), new Vec3d(entityIn.posX, entityIn.posY + (double) entityIn.getEyeHeight(), entityIn.posZ), false, true, false) == null; } - public boolean canFireOnMob(World world, BlockPos pos, Entity entityIn) - { + public boolean canFireOnMob(World world, BlockPos pos, Entity entityIn) { return entityIn != null && !entityIn.isDead && entityIn.getDistanceSqToCenter(pos) <= getRange() * getRange() && entityIn.getDistanceSqToCenter(pos) >= getMinRange() * getMinRange() && canEntityBeSeen(world, pos, entityIn); } - public AxisAlignedBB getBounds(BlockPos pos) - { + public AxisAlignedBB getBounds(BlockPos pos) { return new AxisAlignedBB(pos).grow(getRange(), getRange(), getRange()); } - public float getRange() - { + public float getRange() { return 32; } - public float getMinRange() - { + public float getMinRange() { return 3; } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { } @Override - public AlchemyArrayEffect getNewCopy() - { + public AlchemyArrayEffect getNewCopy() { return new AlchemyArrayEffectArrowTurret(key); } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java index c21135ac..16ce80b1 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java @@ -17,25 +17,21 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect -{ +public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { static double radius = 10; static int burnTicksAdded = 401; //Set to +1 more than it needs to be due to a hacky method - basically done so that the array doesn't double dip your health if you only add one item. - public AlchemyArrayEffectFurnaceFuel(String key) - { + public AlchemyArrayEffectFurnaceFuel(String key) { super(key); } @Override - public boolean update(TileEntity tile, int ticksActive) - { + public boolean update(TileEntity tile, int ticksActive) { BlockPos pos = tile.getPos(); World world = tile.getWorld(); EntityPlayer sacrifice = null; - for (EnumFacing face : EnumFacing.VALUES) - { + for (EnumFacing face : EnumFacing.VALUES) { BlockPos furnacePos = pos.offset(face); Block block = world.getBlockState(furnacePos).getBlock(); if (block != Blocks.FURNACE) //This will only work vanilla furnaces. No others! @@ -44,33 +40,25 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect } TileEntity bottomTile = world.getTileEntity(furnacePos); - if (bottomTile instanceof TileEntityFurnace) - { + if (bottomTile instanceof TileEntityFurnace) { TileEntityFurnace furnaceTile = (TileEntityFurnace) bottomTile; - if (canFurnaceSmelt(furnaceTile) && !furnaceTile.isBurning()) - { - if (sacrifice == null || sacrifice.isDead) - { + if (canFurnaceSmelt(furnaceTile) && !furnaceTile.isBurning()) { + if (sacrifice == null || sacrifice.isDead) { AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); - for (EntityPlayer player : playerList) - { - if (!player.isDead) - { + for (EntityPlayer player : playerList) { + if (!player.isDead) { sacrifice = player; } } } - if (sacrifice == null || sacrifice.isDead) - { + if (sacrifice == null || sacrifice.isDead) { return false; } - if (addFuelTime(furnaceTile, world, furnacePos, burnTicksAdded)) - { - if (!sacrifice.capabilities.isCreativeMode) - { + if (addFuelTime(furnaceTile, world, furnacePos, burnTicksAdded)) { + if (!sacrifice.capabilities.isCreativeMode) { sacrifice.hurtResistantTime = 0; sacrifice.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); //No. } @@ -82,41 +70,32 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect return false; } - public static boolean addFuelTime(TileEntityFurnace furnaceTile, World world, BlockPos furnacePos, int cookTime) - { + public static boolean addFuelTime(TileEntityFurnace furnaceTile, World world, BlockPos furnacePos, int cookTime) { furnaceTile.setField(0, cookTime); BlockFurnace.setState(true, world, furnacePos); return true; } - public static boolean canFurnaceSmelt(TileEntityFurnace furnaceTile) - { + public static boolean canFurnaceSmelt(TileEntityFurnace furnaceTile) { ItemStack burnStack = furnaceTile.getStackInSlot(0); - if (burnStack.isEmpty()) - { + if (burnStack.isEmpty()) { return false; - } else - { + } else { ItemStack resultStack = FurnaceRecipes.instance().getSmeltingResult(burnStack); - if (resultStack.isEmpty()) - { + if (resultStack.isEmpty()) { return false; - } else - { + } else { ItemStack finishStack = furnaceTile.getStackInSlot(2); - if (finishStack.isEmpty()) - { + if (finishStack.isEmpty()) { return true; - } else if (!finishStack.isItemEqual(resultStack)) - { + } else if (!finishStack.isItemEqual(resultStack)) { return false; } else if (finishStack.getCount() + resultStack.getCount() <= furnaceTile.getInventoryStackLimit() && finishStack.getCount() + resultStack.getCount() <= finishStack.getMaxStackSize()) // Forge fix: make furnace respect stack sizes in furnace recipes { return true; - } else - { + } else { return finishStack.getCount() + resultStack.getCount() <= resultStack.getMaxStackSize(); // Forge fix: make furnace respect stack sizes in furnace recipes } } @@ -124,20 +103,17 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { } @Override - public AlchemyArrayEffect getNewCopy() - { + public AlchemyArrayEffect getNewCopy() { return new AlchemyArrayEffectFurnaceFuel(key); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index ce64e7f3..1368cb50 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -13,8 +13,7 @@ import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; -public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect -{ +public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { public static final int TELEPOSE_DELAY = 4; private BlockPos currentPos = BlockPos.ORIGIN; @@ -22,20 +21,16 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect private int radius = -1; private int teleportHeightOffset = 5; - public AlchemyArrayEffectLaputa(String key) - { + public AlchemyArrayEffectLaputa(String key) { super(key); } @Override - public boolean update(TileEntity tile, int ticksActive) - { - if (ticksActive >= 100) - { + public boolean update(TileEntity tile, int ticksActive) { + if (ticksActive >= 100) { World world = tile.getWorld(); - if (radius == -1) - { + if (radius == -1) { ((TileAlchemyArray) tile).setItemDrop(false); radius = getRandomRadius(world.rand); teleportHeightOffset = getRandomHeightOffset(world.rand); @@ -43,8 +38,7 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect } BlockPos pos = tile.getPos(); - if (world.isRemote) - { + if (world.isRemote) { return false; } @@ -52,8 +46,7 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect int i = -radius; int k = -radius; - if (currentPos != null) - { + if (currentPos != null) { j = currentPos.getY(); i = currentPos.getX(); k = currentPos.getZ(); @@ -61,34 +54,27 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect int checks = 0; int maxChecks = 100; - while (j <= radius) - { - while (i <= radius) - { - while (k <= radius) - { - if (i == 0 && j == 0 && k == 0) - { + while (j <= radius) { + while (i <= radius) { + while (k <= radius) { + if (i == 0 && j == 0 && k == 0) { k++; continue; } checks++; - if (checks >= maxChecks) - { + if (checks >= maxChecks) { this.currentPos = new BlockPos(i, j, k); return false; } - if (checkIfSphere(radius, i, j, k)) - { + if (checkIfSphere(radius, i, j, k)) { BlockPos newPos = pos.add(i, j, k); BlockPos offsetPos = newPos.up(teleportHeightOffset); IBlockState state = world.getBlockState(newPos); TeleposeEvent event = new TeleposeEvent(world, newPos, world, offsetPos); - if (state.getBlockHardness(world, newPos) > 0 && !MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) - { + if (state.getBlockHardness(world, newPos) > 0 && !MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) { k++; this.currentPos = new BlockPos(i, j, k); @@ -112,25 +98,21 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect return false; } - public boolean checkIfSphere(float radius, float xOff, float yOff, float zOff) - { + public boolean checkIfSphere(float radius, float xOff, float yOff, float zOff) { float possOffset = 0.5f; return xOff * xOff + yOff * yOff + zOff * zOff <= ((radius + possOffset) * (radius + possOffset)); } - public int getRandomRadius(Random rand) - { + public int getRandomRadius(Random rand) { return rand.nextInt(5) + 4; } - public int getRandomHeightOffset(Random rand) - { + public int getRandomHeightOffset(Random rand) { return radius * 2 + 1 + rand.nextInt(5); } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { tag.setInteger("radius", radius); tag.setInteger("teleportHeightOffset", teleportHeightOffset); tag.setInteger(Constants.NBT.X_COORD, currentPos.getX()); @@ -139,16 +121,14 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { radius = tag.getInteger("radius"); teleportHeightOffset = tag.getInteger("teleportHeightOffset"); currentPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); } @Override - public AlchemyArrayEffect getNewCopy() - { + public AlchemyArrayEffect getNewCopy() { return new AlchemyArrayEffectLaputa(key); } } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java index 77224e58..d0b08483 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java @@ -29,29 +29,24 @@ import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.PurificationHelper; -public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect -{ +public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { public static final AreaDescriptor itemDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); public static final AreaDescriptor mobDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); public int craftTime = 0; public static final int REQUIRED_CRAFT_TIME = 200; - public AlchemyArrayEffectMobSacrifice(String key) - { + public AlchemyArrayEffectMobSacrifice(String key) { super(key); } @Override - public boolean update(TileEntity tile, int ticksActive) - { + public boolean update(TileEntity tile, int ticksActive) { World world = tile.getWorld(); - if (world.isRemote && ticksActive < 200 && ticksActive > 40) - { + if (world.isRemote && ticksActive < 200 && ticksActive > 40) { BlockPos pos = tile.getPos(); Random rand = world.rand; - for (int i = 0; i < 2; i++) - { + for (int i = 0; i < 2; i++) { double d0 = (double) pos.getX() + 0.5D + (rand.nextDouble() - 0.5D) * 2.5D; double d1 = (double) pos.getY() + 0.2D + (rand.nextDouble() - 0.5D) * 0.2D; double d2 = (double) pos.getZ() + 0.5D + (rand.nextDouble() - 0.5D) * 2.5D; @@ -61,26 +56,22 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect //We need to do the check on both sides to correctly do particles. - if (ticksActive >= 200) - { + if (ticksActive >= 200) { BlockPos pos = tile.getPos(); List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDescriptor.getAABB(pos)); List inputList = new ArrayList(); - for (EntityItem entityItem : itemList) - { - if (entityItem.isDead || entityItem.getItem().isEmpty()) - { + for (EntityItem entityItem : itemList) { + if (entityItem.isDead || entityItem.getItem().isEmpty()) { continue; } inputList.add(entityItem.getItem().copy()); } - if (inputList.isEmpty()) - { + if (inputList.isEmpty()) { return false; } @@ -90,52 +81,42 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect } RecipeSacrificeCraft recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getSacrificeCraft(inputList); - if (recipe != null) - { + if (recipe != null) { double healthRequired = recipe.getHealthRequired(); double healthAvailable = 0; List livingEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, mobDescriptor.getAABB(pos)); - for (EntityLivingBase living : livingEntities) - { + for (EntityLivingBase living : livingEntities) { double health = getEffectiveHealth(living); - if (health > 0) - { + if (health > 0) { healthAvailable += health; } } - if (healthAvailable < healthRequired) - { + if (healthAvailable < healthRequired) { craftTime = 0; return false; } craftTime++; - if (craftTime >= REQUIRED_CRAFT_TIME) - { - if (!world.isRemote) - { - for (EntityLivingBase living : livingEntities) - { + if (craftTime >= REQUIRED_CRAFT_TIME) { + if (!world.isRemote) { + for (EntityLivingBase living : livingEntities) { double health = getEffectiveHealth(living); - if (healthAvailable > 0 && health > 0) - { + if (healthAvailable > 0 && health > 0) { healthAvailable -= health; living.getEntityWorld().playSound(null, living.posX, living.posY, living.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (living.getEntityWorld().rand.nextFloat() - living.getEntityWorld().rand.nextFloat()) * 0.8F); living.setHealth(-1); living.onDeath(DamageSourceBloodMagic.INSTANCE); } - if (healthAvailable <= 0) - { + if (healthAvailable <= 0) { break; } } - for (EntityItem itemEntity : itemList) - { + for (EntityItem itemEntity : itemList) { itemEntity.getItem().setCount(itemEntity.getItem().getCount() - 1); if (itemEntity.getItem().isEmpty()) //TODO: Check container { @@ -146,13 +127,10 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5, recipe.getOutput())); craftTime = 0; } - } else - { - if (world.isRemote) - { + } else { + if (world.isRemote) { Vec3d spawnPosition = new Vec3d(pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5); - for (EntityItem itemEntity : itemList) - { + for (EntityItem itemEntity : itemList) { ItemStack stack = itemEntity.getItem(); double velocityFactor = 0.1; @@ -168,11 +146,9 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect // world.spawnParticle(EnumParticleTypes.ITEM_CRACK, spawnPosition.x, spawnPosition.y, spawnPosition.z, velVec2.x, velVec2.y, velVec2.z, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); } - for (EntityLivingBase living : livingEntities) - { + for (EntityLivingBase living : livingEntities) { double health = getEffectiveHealth(living); - if (health <= 0) - { + if (health <= 0) { continue; } double d0 = (double) living.posX + (world.rand.nextDouble() - 0.5D) * 0.5D; @@ -189,8 +165,7 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect } //Future-proofing in case I want to make different mobs give different effective health - public double getEffectiveHealth(EntityLivingBase living) - { + public double getEffectiveHealth(EntityLivingBase living) { if (living == null) return 0; @@ -214,20 +189,17 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { } @Override - public AlchemyArrayEffect getNewCopy() - { + public AlchemyArrayEffect getNewCopy() { return new AlchemyArrayEffectMobSacrifice(key); } } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java index a0bbf514..57d7f774 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java @@ -10,43 +10,35 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import WayofTime.bloodmagic.iface.IAlchemyArray; -public class AlchemyArrayEffectSpike extends AlchemyArrayEffect -{ - public AlchemyArrayEffectSpike(String key) - { +public class AlchemyArrayEffectSpike extends AlchemyArrayEffect { + public AlchemyArrayEffectSpike(String key) { super(key); } @Override - public boolean update(TileEntity tile, int ticksActive) - { + public boolean update(TileEntity tile, int ticksActive) { return false; } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) - { - if (entity instanceof EntityLivingBase) - { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { + if (entity instanceof EntityLivingBase) { entity.attackEntityFrom(DamageSource.CACTUS, 2); } } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { } @Override - public AlchemyArrayEffect getNewCopy() - { + public AlchemyArrayEffect getNewCopy() { return new AlchemyArrayEffectSpike(key); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java index 9437e86b..82b16d12 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java @@ -17,58 +17,47 @@ import net.minecraft.world.WorldServer; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.iface.IAlchemyArray; -public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect -{ +public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect { public static final int MAX_SEARCH = 20; public static final int TELEPORT_DELAY = 40; - public AlchemyArrayEffectTeleport(String key) - { + public AlchemyArrayEffectTeleport(String key) { super(key); } @Override - public boolean update(TileEntity tile, int ticksActive) - { + public boolean update(TileEntity tile, int ticksActive) { return false; } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) - { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { EnumFacing direction = array.getRotation(); teleportEntityInDirection(world, pos, entity, direction); } - public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, EnumFacing direction) - { - if (entity != null && entity.timeUntilPortal <= 0) - { - for (int i = 1; i <= MAX_SEARCH; i++) - { + public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, EnumFacing direction) { + if (entity != null && entity.timeUntilPortal <= 0) { + for (int i = 1; i <= MAX_SEARCH; i++) { BlockPos offsetPos = currentPos.offset(direction, i); Block testBlock = world.getBlockState(offsetPos).getBlock(); - if (testBlock == RegistrarBloodMagicBlocks.ALCHEMY_ARRAY) - { + if (testBlock == RegistrarBloodMagicBlocks.ALCHEMY_ARRAY) { int x = offsetPos.getX(); int y = offsetPos.getY(); int z = offsetPos.getZ(); entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); entity.timeUntilPortal = TELEPORT_DELAY; - if (!world.isRemote) - { - if (entity instanceof EntityPlayer) - { + if (!world.isRemote) { + if (entity instanceof EntityPlayer) { EntityPlayerMP player = (EntityPlayerMP) entity; player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.getEntityWorld().updateEntityWithOptionalForce(player, false); player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); - } else - { + } else { WorldServer worldServer = (WorldServer) entity.getEntityWorld(); entity.setPosition(x + 0.5, y + 0.5, z + 0.5); @@ -82,20 +71,17 @@ public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { } @Override - public AlchemyArrayEffect getNewCopy() - { + public AlchemyArrayEffect getNewCopy() { return new AlchemyArrayEffectTeleport(key); } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index 906c61e3..a347fa15 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -127,7 +127,7 @@ public enum AltarTier { } }; - public static final int MAXTIERS = ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent ? values().length : values().length-1; + public static final int MAXTIERS = ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent ? values().length : values().length - 1; private List altarComponents; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index f92049e7..7a111dd0 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -31,8 +31,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.items.ItemHandlerHelper; -public class BloodAltar implements IFluidHandler -{ +public class BloodAltar implements IFluidHandler { public boolean isActive; protected FluidStack fluidOutput = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); @@ -69,15 +68,12 @@ public class BloodAltar implements IFluidHandler private RecipeBloodAltar recipe; private AltarTier currentTierDisplayed = AltarTier.ONE; - public BloodAltar(TileAltar tileAltar) - { + public BloodAltar(TileAltar tileAltar) { this.tileAltar = tileAltar; } - public void readFromNBT(NBTTagCompound tagCompound) - { - if (!tagCompound.hasKey(Constants.NBT.EMPTY)) - { + public void readFromNBT(NBTTagCompound tagCompound) { + if (!tagCompound.hasKey(Constants.NBT.EMPTY)) { FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagCompound); if (fluid != null) @@ -120,8 +116,7 @@ public class BloodAltar implements IFluidHandler currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); } - public void writeToNBT(NBTTagCompound tagCompound) - { + public void writeToNBT(NBTTagCompound tagCompound) { if (fluid != null) fluid.writeToNBT(tagCompound); @@ -164,8 +159,7 @@ public class BloodAltar implements IFluidHandler tagCompound.setString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); } - public void startCycle() - { + public void startCycle() { if (tileAltar.getWorld() != null) tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); @@ -179,14 +173,11 @@ public class BloodAltar implements IFluidHandler ItemStack input = tileAltar.getStackInSlot(0); - if (!input.isEmpty()) - { + if (!input.isEmpty()) { // Do recipes RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(input); - if (recipe != null) - { - if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) - { + if (recipe != null) { + if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) { this.isActive = true; this.recipe = recipe; this.liquidRequired = recipe.getSyphon(); @@ -195,8 +186,7 @@ public class BloodAltar implements IFluidHandler this.canBeFilled = false; return; } - } else if (input.getItem() instanceof IBloodOrb) - { + } else if (input.getItem() instanceof IBloodOrb) { BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); this.isActive = canBeFilled = orb != null && altarTier.toInt() >= orb.getTier(); return; @@ -206,8 +196,7 @@ public class BloodAltar implements IFluidHandler isActive = false; } - public void update() - { + public void update() { World world = tileAltar.getWorld(); BlockPos pos = tileAltar.getPos(); @@ -220,17 +209,14 @@ public class BloodAltar implements IFluidHandler if (lockdownDuration > 0) lockdownDuration--; - if (internalCounter % 20 == 0) - { - for (EnumFacing facing : EnumFacing.VALUES) - { + if (internalCounter % 20 == 0) { + for (EnumFacing facing : EnumFacing.VALUES) { BlockPos newPos = pos.offset(facing); IBlockState block = world.getBlockState(newPos); block.getBlock().onNeighborChange(world, newPos, pos); } } - if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) - { + if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) { int syphonMax = (int) (20 * this.dislocationMultiplier); int fluidInputted; int fluidOutputted; @@ -245,8 +231,7 @@ public class BloodAltar implements IFluidHandler tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) - { + if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) { int chargeInputted = Math.min(chargingRate, this.fluid.amount); chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge); totalCharge += chargeInputted; @@ -260,17 +245,14 @@ public class BloodAltar implements IFluidHandler updateAltar(); } - private void updateAltar() - { - if (!isActive) - { + private void updateAltar() { + if (!isActive) { if (cooldownAfterCrafting > 0) cooldownAfterCrafting--; return; } - if (!canBeFilled && recipe == null) - { + if (!canBeFilled && recipe == null) { startCycle(); return; } @@ -286,13 +268,11 @@ public class BloodAltar implements IFluidHandler if (world.isRemote) return; - if (!canBeFilled) - { + if (!canBeFilled) { boolean hasOperated = false; int stackSize = input.getCount(); - if (totalCharge > 0) - { + if (totalCharge > 0) { int chargeDrained = Math.min(liquidRequired * stackSize - progress, totalCharge); totalCharge -= chargeDrained; @@ -300,8 +280,7 @@ public class BloodAltar implements IFluidHandler hasOperated = true; } - if (fluid != null && fluid.amount >= 1) - { + if (fluid != null && fluid.amount >= 1) { int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); if (liquidDrained > (liquidRequired * stackSize - progress)) @@ -312,27 +291,22 @@ public class BloodAltar implements IFluidHandler hasOperated = true; - if (internalCounter % 4 == 0 && world instanceof WorldServer) - { + if (internalCounter % 4 == 0 && world instanceof WorldServer) { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.2, 0, 0.2, 0); } - } else if (!hasOperated && progress > 0) - { + } else if (!hasOperated && progress > 0) { progress -= (int) (efficiencyMultiplier * drainRate); - if (internalCounter % 2 == 0 && world instanceof WorldServer) - { + if (internalCounter % 2 == 0 && world instanceof WorldServer) { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0); } } - if (hasOperated) - { - if (progress >= liquidRequired * stackSize) - { + if (hasOperated) { + if (progress >= liquidRequired * stackSize) { ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(result, input.copy()); @@ -340,8 +314,7 @@ public class BloodAltar implements IFluidHandler tileAltar.setInventorySlotContents(0, event.getOutput()); progress = 0; - if (world instanceof WorldServer) - { + if (world instanceof WorldServer) { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); } @@ -350,8 +323,7 @@ public class BloodAltar implements IFluidHandler this.isActive = false; } } - } else - { + } else { ItemStack contained = tileAltar.getStackInSlot(0); if (contained.isEmpty() || !(contained.getItem() instanceof IBloodOrb) || !(contained.getItem() instanceof IBindable)) @@ -363,14 +335,12 @@ public class BloodAltar implements IFluidHandler if (binding == null || orb == null) return; - if (fluid != null && fluid.amount >= 1) - { + if (fluid != null && fluid.amount >= 1) { int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); int drain = NetworkHelper.getSoulNetwork(binding).add(SoulTicket.block(world, pos, liquidDrained), (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; - if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) - { + if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) { WorldServer server = (WorldServer) world; server.spawnParticle(EnumParticleTypes.SPELL_WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0, 0, 0, 0.001); } @@ -380,8 +350,7 @@ public class BloodAltar implements IFluidHandler tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - public void checkTier() - { + public void checkTier() { AltarTier tier = AltarUtil.getTier(tileAltar.getWorld(), tileAltar.getPos()); this.altarTier = tier; @@ -390,8 +359,7 @@ public class BloodAltar implements IFluidHandler if (tier.equals(currentTierDisplayed)) currentTierDisplayed = AltarTier.ONE; - if (tier.equals(AltarTier.ONE)) - { + if (tier.equals(AltarTier.ONE)) { upgrade = null; isUpgraded = false; this.consumptionMultiplier = 0; @@ -407,8 +375,7 @@ public class BloodAltar implements IFluidHandler this.maxCharge = 0; this.totalCharge = 0; return; - } else if (!tier.equals(AltarTier.ONE)) - { + } else if (!tier.equals(AltarTier.ONE)) { this.isUpgraded = true; this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); @@ -438,128 +405,103 @@ public class BloodAltar implements IFluidHandler tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - public int fillMainTank(int amount) - { + public int fillMainTank(int amount) { int filledAmount = Math.min(capacity - fluid.amount, amount); fluid.amount += filledAmount; return filledAmount; } - public void sacrificialDaggerCall(int amount, boolean isSacrifice) - { - if (this.lockdownDuration > 0) - { + public void sacrificialDaggerCall(int amount, boolean isSacrifice) { + if (this.lockdownDuration > 0) { int amt = (int) Math.min(bufferCapacity - fluidInput.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); fluidInput.amount += amt; - } else - { + } else { fluid.amount += Math.min(capacity - fluid.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); } } - public void setMainFluid(FluidStack fluid) - { + public void setMainFluid(FluidStack fluid) { this.fluid = fluid; } - public void setOutputFluid(FluidStack fluid) - { + public void setOutputFluid(FluidStack fluid) { this.fluidOutput = fluid; } - public void setInputFluid(FluidStack fluid) - { + public void setInputFluid(FluidStack fluid) { this.fluidInput = fluid; } - public AltarUpgrade getUpgrade() - { + public AltarUpgrade getUpgrade() { return upgrade; } - public void setUpgrade(AltarUpgrade upgrade) - { + public void setUpgrade(AltarUpgrade upgrade) { this.upgrade = upgrade; } - public int getCapacity() - { + public int getCapacity() { return capacity; } - public FluidStack getFluid() - { + public FluidStack getFluid() { return fluid; } - public int getFluidAmount() - { + public int getFluidAmount() { return fluid.amount; } - public int getCurrentBlood() - { + public int getCurrentBlood() { return getFluidAmount(); } - public AltarTier getTier() - { + public AltarTier getTier() { return altarTier; } - public void setTier(AltarTier tier) - { + public void setTier(AltarTier tier) { this.altarTier = tier; } - public int getProgress() - { + public int getProgress() { return progress; } - public float getSacrificeMultiplier() - { + public float getSacrificeMultiplier() { return sacrificeEfficiencyMultiplier; } - public float getSelfSacrificeMultiplier() - { + public float getSelfSacrificeMultiplier() { return selfSacrificeEfficiencyMultiplier; } - public float getOrbMultiplier() - { + public float getOrbMultiplier() { return orbCapacityMultiplier; } - public float getDislocationMultiplier() - { + public float getDislocationMultiplier() { return dislocationMultiplier; } - public float getConsumptionMultiplier() - { + public float getConsumptionMultiplier() { return consumptionMultiplier; } - public float getConsumptionRate() - { + public float getConsumptionRate() { return consumptionRate; } - public int getLiquidRequired() - { + public int getLiquidRequired() { return liquidRequired; } - public int getBufferCapacity() - { + public int getBufferCapacity() { return bufferCapacity; } - public boolean setCurrentTierDisplayed(AltarTier altarTier) - { + public boolean setCurrentTierDisplayed(AltarTier altarTier) { if (currentTierDisplayed == altarTier) return false; else @@ -567,99 +509,79 @@ public class BloodAltar implements IFluidHandler return true; } - public void addToDemonBloodDuration(int dur) - { + public void addToDemonBloodDuration(int dur) { this.demonBloodDuration += dur; } - public boolean hasDemonBlood() - { + public boolean hasDemonBlood() { return this.demonBloodDuration > 0; } - public void decrementDemonBlood() - { + public void decrementDemonBlood() { this.demonBloodDuration = Math.max(0, this.demonBloodDuration - 1); } - public void setActive() - { - if (tileAltar.getStackInSlot(0).isEmpty()) - { + public void setActive() { + if (tileAltar.getStackInSlot(0).isEmpty()) { isActive = false; } } - public boolean isActive() - { + public boolean isActive() { return isActive; } - public void requestPauseAfterCrafting(int amount) - { - if (this.isActive) - { + public void requestPauseAfterCrafting(int amount) { + if (this.isActive) { this.cooldownAfterCrafting = amount; } } - public int getChargingRate() - { + public int getChargingRate() { return chargingRate; } - public int getTotalCharge() - { + public int getTotalCharge() { return totalCharge; } - public int getChargingFrequency() - { + public int getChargingFrequency() { return chargingFrequency == 0 ? 1 : chargingFrequency; } @Override - public int fill(FluidStack resource, boolean doFill) - { - if (resource == null || resource.getFluid() != BlockLifeEssence.getLifeEssence()) - { + public int fill(FluidStack resource, boolean doFill) { + if (resource == null || resource.getFluid() != BlockLifeEssence.getLifeEssence()) { return 0; } - if (!doFill) - { - if (fluidInput == null) - { + if (!doFill) { + if (fluidInput == null) { return Math.min(bufferCapacity, resource.amount); } - if (!fluidInput.isFluidEqual(resource)) - { + if (!fluidInput.isFluidEqual(resource)) { return 0; } return Math.min(bufferCapacity - fluidInput.amount, resource.amount); } - if (fluidInput == null) - { + if (fluidInput == null) { fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.amount)); return fluidInput.amount; } - if (!fluidInput.isFluidEqual(resource)) - { + if (!fluidInput.isFluidEqual(resource)) { return 0; } int filled = bufferCapacity - fluidInput.amount; - if (resource.amount < filled) - { + if (resource.amount < filled) { fluidInput.amount += resource.amount; filled = resource.amount; - } else - { + } else { fluidInput.amount = bufferCapacity; } @@ -667,45 +589,37 @@ public class BloodAltar implements IFluidHandler } @Override - public FluidStack drain(FluidStack resource, boolean doDrain) - { - if (resource == null || !resource.isFluidEqual(fluidOutput)) - { + public FluidStack drain(FluidStack resource, boolean doDrain) { + if (resource == null || !resource.isFluidEqual(fluidOutput)) { return null; } return drain(resource.amount, doDrain); } @Override - public FluidStack drain(int maxDrain, boolean doDrain) - { - if (fluidOutput == null) - { + public FluidStack drain(int maxDrain, boolean doDrain) { + if (fluidOutput == null) { return null; } int drained = maxDrain; - if (fluidOutput.amount < drained) - { + if (fluidOutput.amount < drained) { drained = fluidOutput.amount; } FluidStack stack = new FluidStack(fluidOutput, drained); - if (doDrain) - { + if (doDrain) { fluidOutput.amount -= drained; } return stack; } @Override - public IFluidTankProperties[] getTankProperties() - { - return new IFluidTankProperties[] { new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity)) }; + public IFluidTankProperties[] getTankProperties() { + return new IFluidTankProperties[]{new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity))}; } - public AltarTier getCurrentTierDisplayed() - { + public AltarTier getCurrentTierDisplayed() { return currentTierDisplayed; } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 1725d095..c59bbbe6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -23,12 +23,10 @@ import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; @BloodMagicPlugin -public class BloodMagicCorePlugin implements IBloodMagicPlugin -{ +public class BloodMagicCorePlugin implements IBloodMagicPlugin { @Override - public void register(IBloodMagicAPI apiInterface) - { + public void register(IBloodMagicAPI apiInterface) { BloodMagicAPI api = (BloodMagicAPI) apiInterface; // Add forced blacklistings api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); @@ -84,8 +82,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin } @Override - public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) - { + public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { RegistrarBloodMagicRecipes.registerAltarRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); RegistrarBloodMagicRecipes.registerAlchemyTableRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); RegistrarBloodMagicRecipes.registerTartaricForgeRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); @@ -93,10 +90,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin RegistrarBloodMagicRecipes.registerSacrificeCraftRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); } - private static void handleConfigValues(BloodMagicAPI api) - { - for (String value : ConfigHandler.values.sacrificialValues) - { + private static void handleConfigValues(BloodMagicAPI api) { + for (String value : ConfigHandler.values.sacrificialValues) { String[] split = value.split(";"); if (split.length != 2) // Not valid format continue; @@ -104,18 +99,15 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin api.getValueManager().setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); } - for (String value : ConfigHandler.blacklist.teleposer) - { + for (String value : ConfigHandler.blacklist.teleposer) { EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); - if (entityEntry == null) - { // It's not an entity (or at least not a valid one), so let's try a block. + if (entityEntry == null) { // It's not an entity (or at least not a valid one), so let's try a block. String[] blockData = value.split("\\["); Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); if (block == Blocks.AIR || block == null) // Not a valid block either continue; - if (blockData.length > 1) - { // We have properties listed, so let's build a state. + if (blockData.length > 1) { // We have properties listed, so let's build a state. api.getBlacklist().addTeleposer(StateUtil.parseState(value)); continue; } @@ -127,15 +119,13 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin api.getBlacklist().addTeleposer(entityEntry.getRegistryName()); } - for (String value : ConfigHandler.blacklist.transposer) - { + for (String value : ConfigHandler.blacklist.transposer) { String[] blockData = value.split("\\["); Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); if (block == Blocks.AIR || block == null) // Not a valid block continue; - if (blockData.length > 1) - { // We have properties listed, so let's build a state. + if (blockData.length > 1) { // We have properties listed, so let's build a state. api.getBlacklist().addTeleposer(StateUtil.parseState(value)); continue; } @@ -143,8 +133,7 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin api.getBlacklist().addTeleposer(block); } - for (String value : ConfigHandler.blacklist.wellOfSuffering) - { + for (String value : ConfigHandler.blacklist.wellOfSuffering) { EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); if (entityEntry == null) // Not a valid entity continue; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index 776d762d..215f3981 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -27,8 +27,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar -{ +public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { private final Set altarRecipes; private final Set alchemyRecipes; @@ -36,8 +35,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar private final Set alchemyArrayRecipes; private final Set sacrificeCraftRecipes; - public BloodMagicRecipeRegistrar() - { + public BloodMagicRecipeRegistrar() { this.altarRecipes = Sets.newHashSet(); this.alchemyRecipes = Sets.newHashSet(); this.tartaricForgeRecipes = Sets.newHashSet(); @@ -46,8 +44,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) - { + public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); @@ -59,16 +56,14 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public boolean removeBloodAltar(@Nonnull ItemStack input) - { + public boolean removeBloodAltar(@Nonnull ItemStack input) { Preconditions.checkNotNull(input, "input cannot be null."); return altarRecipes.remove(getBloodAltar(input)); } @Override - public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) - { + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); @@ -79,8 +74,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); } - public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) - { + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); @@ -88,10 +82,8 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar Preconditions.checkNotNull(input, "input cannot be null."); List ingredients = Lists.newArrayList(); - for (Object object : input) - { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) - { + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); continue; } @@ -102,14 +94,12 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0])); } - public void addAlchemyTable(RecipeAlchemyTable recipe) - { + public void addAlchemyTable(RecipeAlchemyTable recipe) { alchemyRecipes.add(recipe); } @Override - public boolean removeAlchemyTable(@Nonnull ItemStack... input) - { + public boolean removeAlchemyTable(@Nonnull ItemStack... input) { Preconditions.checkNotNull(input, "inputs cannot be null."); for (ItemStack stack : input) @@ -119,8 +109,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) - { + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); @@ -131,8 +120,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public boolean removeTartaricForge(@Nonnull ItemStack... input) - { + public boolean removeTartaricForge(@Nonnull ItemStack... input) { Preconditions.checkNotNull(input, "inputs cannot be null."); for (ItemStack stack : input) @@ -141,18 +129,15 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); } - public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) - { + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); Preconditions.checkNotNull(input, "input cannot be null."); List ingredients = Lists.newArrayList(); - for (Object object : input) - { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) - { + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); continue; } @@ -164,8 +149,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) - { + public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); @@ -174,16 +158,14 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) - { + public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst)); } - public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) - { + public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); @@ -191,17 +173,14 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture); } - public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Object... input) - { + public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Object... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); Preconditions.checkNotNull(input, "input cannot be null."); List ingredients = Lists.newArrayList(); - for (Object object : input) - { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) - { + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); continue; } @@ -213,8 +192,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public boolean removeSacrificeCraft(@Nonnull ItemStack... input) - { + public boolean removeSacrificeCraft(@Nonnull ItemStack... input) { Preconditions.checkNotNull(input, "inputs cannot be null."); for (ItemStack stack : input) @@ -224,8 +202,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Override - public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input) - { + public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input) { Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); Preconditions.checkNotNull(input, "input cannot be null."); @@ -235,8 +212,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Nullable - public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) - { + public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; @@ -249,27 +225,23 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Nullable - public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) - { + public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; - mainLoop: for (RecipeAlchemyTable recipe : alchemyRecipes) - { + mainLoop: + for (RecipeAlchemyTable recipe : alchemyRecipes) { if (recipe.getInput().size() != input.size()) continue; List recipeInput = new ArrayList<>(recipe.getInput()); - for (int i = 0; i < input.size(); i++) - { + for (int i = 0; i < input.size(); i++) { boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) - { + for (int j = 0; j < recipeInput.size(); j++) { Ingredient ingredient = recipeInput.get(j); - if (ingredient.apply(input.get(i))) - { + if (ingredient.apply(input.get(i))) { matched = true; recipeInput.remove(j); break; @@ -287,27 +259,23 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Nullable - public RecipeTartaricForge getTartaricForge(@Nonnull List input) - { + public RecipeTartaricForge getTartaricForge(@Nonnull List input) { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; - mainLoop: for (RecipeTartaricForge recipe : tartaricForgeRecipes) - { + mainLoop: + for (RecipeTartaricForge recipe : tartaricForgeRecipes) { if (recipe.getInput().size() != input.size()) continue; List recipeInput = new ArrayList<>(recipe.getInput()); - for (int i = 0; i < input.size(); i++) - { + for (int i = 0; i < input.size(); i++) { boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) - { + for (int j = 0; j < recipeInput.size(); j++) { Ingredient ingredient = recipeInput.get(j); - if (ingredient.apply(input.get(i))) - { + if (ingredient.apply(input.get(i))) { matched = true; recipeInput.remove(j); break; @@ -325,27 +293,23 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Nullable - public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List input) - { + public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List input) { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; - mainLoop: for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes) - { + mainLoop: + for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes) { if (recipe.getInput().size() != input.size()) continue; List recipeInput = new ArrayList<>(recipe.getInput()); - for (int i = 0; i < input.size(); i++) - { + for (int i = 0; i < input.size(); i++) { boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) - { + for (int j = 0; j < recipeInput.size(); j++) { Ingredient ingredient = recipeInput.get(j); - if (ingredient.apply(input.get(i))) - { + if (ingredient.apply(input.get(i))) { matched = true; recipeInput.remove(j); break; @@ -363,8 +327,7 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar } @Nullable - public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) - { + public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { Preconditions.checkNotNull(input, "input cannot be null."); if (input.isEmpty()) return null; @@ -376,23 +339,19 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar return null; } - public Set getAltarRecipes() - { + public Set getAltarRecipes() { return ImmutableSet.copyOf(altarRecipes); } - public Set getAlchemyRecipes() - { + public Set getAlchemyRecipes() { return ImmutableSet.copyOf(alchemyRecipes); } - public Set getTartaricForgeRecipes() - { + public Set getTartaricForgeRecipes() { return ImmutableSet.copyOf(tartaricForgeRecipes); } - public Set getAlchemyArrayRecipes() - { + public Set getAlchemyArrayRecipes() { return ImmutableSet.copyOf(alchemyArrayRecipes); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java index 95bf3354..f2e000f6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java @@ -8,8 +8,7 @@ import net.minecraft.util.NonNullList; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; -public class RecipeSacrificeCraft -{ +public class RecipeSacrificeCraft { @Nonnull private final NonNullList input; @Nonnull @@ -17,8 +16,7 @@ public class RecipeSacrificeCraft @Nonnegative private final double healthRequired; - public RecipeSacrificeCraft(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double healthRequired) - { + public RecipeSacrificeCraft(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double healthRequired) { Preconditions.checkNotNull(input, "input cannot be null."); Preconditions.checkNotNull(output, "output cannot be null."); Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); @@ -29,20 +27,17 @@ public class RecipeSacrificeCraft } @Nonnull - public final NonNullList getInput() - { + public final NonNullList getInput() { return input; } @Nonnull - public final ItemStack getOutput() - { + public final ItemStack getOutput() { return output; } @Nonnegative - public final double getHealthRequired() - { + public final double getHealthRequired() { return healthRequired; } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java index 065f340e..12a14983 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java @@ -24,7 +24,7 @@ public class BlockDecorative extends BlockEnum { @Override public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { - for (EnumDecorative type : EnumDecorative.values()){ + for (EnumDecorative type : EnumDecorative.values()) { if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && (type == EnumDecorative.CRYSTAL_TILE || type == EnumDecorative.CRYSTAL_BRICK)) continue; subBlocks.add(new ItemStack(this, 1, type.ordinal())); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index 38b9ac62..6675b63e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -219,7 +219,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } return null; } - + @Override public ItemBlock getItem() { return new ItemBlockMimic(this); diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java index 531ab6a2..bfc67190 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java @@ -7,7 +7,8 @@ import java.util.Locale; public enum EnumRitualController implements IStringSerializable { MASTER, IMPERFECT, - INVERTED,; + INVERTED, + ; @Override public String toString() { diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java index d83cb03c..9c62ee31 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java @@ -98,7 +98,8 @@ public class ElementRegistry { return; try (FileReader reader = new FileReader(CONFIG)) { - Map toLoad = GSON.fromJson(reader, new TypeToken>() {}.getType()); + Map toLoad = GSON.fromJson(reader, new TypeToken>() { + }.getType()); for (Map.Entry entry : toLoad.entrySet()) { ElementInfo info = ELEMENT_INFO.get(new ResourceLocation(entry.getKey())); if (info != null) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java index a25a5b6c..94531576 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java @@ -34,7 +34,9 @@ public class GuiEditHUD extends GuiScreen { public void initGui() { super.initGui(); - addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")){{enabled = false;}}); + addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")) {{ + enabled = false; + }}); addButton(new GuiButtonExt(1, width / 2 - 75, height - 30, 70, 20, I18n.format("gui.bloodmagic.default"))); addButton(new GuiButtonExt(2, width / 2 + 5, height - 30, 70, 20, I18n.format("gui.bloodmagic.save"))); addButton(new GuiButtonExt(3, width / 2 + 90, height - 30, 70, 20, I18n.format("gui.bloodmagic.cancel"))); diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java index c072b646..0d9beb6c 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -55,7 +55,7 @@ public abstract class ElementDivinedInformation extends El if (sigilStack.getItem() instanceof ItemSigilHolding) { List internalInv = ItemSigilHolding.getInternalInventory(sigilStack); int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilStack); - if(internalInv != null && !internalInv.get(currentSlot).isEmpty()) { + if (internalInv != null && !internalInv.get(currentSlot).isEmpty()) { return (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_SEER && !simple) || (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION && simple); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java index a9d8a8af..6fa069bd 100644 --- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java +++ b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java @@ -46,7 +46,8 @@ public enum KeyBindings { if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1); } - },; + }, + ; // @formatter:on private final IKeyConflictContext keyConflictContext; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java index bce8f30f..687ecdc8 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java @@ -2,21 +2,17 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.util.ResourceLocation; -public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer -{ - public LowAlchemyCircleRenderer() - { +public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer { + public LowAlchemyCircleRenderer() { this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); } - public LowAlchemyCircleRenderer(ResourceLocation arrayResource) - { + public LowAlchemyCircleRenderer(ResourceLocation arrayResource) { super(arrayResource); } @Override - public float getVerticalOffset(float craftTime) - { + public float getVerticalOffset(float craftTime) { return 0; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java index 0256ec93..8b57713b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java @@ -2,25 +2,20 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.util.ResourceLocation; -public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer -{ - public LowStaticAlchemyCircleRenderer() - { +public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer { + public LowStaticAlchemyCircleRenderer() { this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); } - public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) - { + public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) { super(arrayResource); } @Override - public float getRotation(float craftTime) - { + public float getRotation(float craftTime) { float offset = 2; float duration = 180; - if (craftTime >= offset && craftTime < offset + duration) - { + if (craftTime >= offset && craftTime < offset + duration) { float modifier = (craftTime - offset) * 2f; return modifier * 1f; } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java index 2f5bdfc7..76a98ab3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -13,41 +13,33 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; -public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer -{ +public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"); private ResourceLocation mobSacrificeSwirlResource = new ResourceLocation("bloodmagic", "textures/models/mobsacrificeswirl.png"); - public MobSacrificeAlchemyCircleRenderer(ResourceLocation location) - { + public MobSacrificeAlchemyCircleRenderer(ResourceLocation location) { super(location); } - public MobSacrificeAlchemyCircleRenderer() - { + public MobSacrificeAlchemyCircleRenderer() { this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/mobsacrifice.png")); } @Override - public float getSizeModifier(float craftTime) - { - if (craftTime < 40) - { + public float getSizeModifier(float craftTime) { + if (craftTime < 40) { return 0; - } else if (craftTime > 40 && craftTime < 100) - { + } else if (craftTime > 40 && craftTime < 100) { return (craftTime - 40) / 60f; } return 1; } @Override - public float getRotation(float craftTime) - { + public float getRotation(float craftTime) { float offset = 50; - if (craftTime >= offset) - { + if (craftTime >= offset) { float modifier = (craftTime - offset) * 5f; return modifier * 1f; } @@ -55,16 +47,13 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer } @Override - public float getSecondaryRotation(float craftTime) - { + public float getSecondaryRotation(float craftTime) { return 0; } @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) - { - if (!(tile instanceof TileAlchemyArray)) - { + public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { + if (!(tile instanceof TileAlchemyArray)) { return; } @@ -94,30 +83,29 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - switch (sideHit) - { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; + switch (sideHit) { + case DOWN: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(-90.0f, 1, 0, 0); + break; + case EAST: + GlStateManager.rotate(-90.0f, 0, 1, 0); + GlStateManager.translate(0, 0, -1); + break; + case NORTH: + break; + case SOUTH: + GlStateManager.rotate(180.0f, 0, 1, 0); + GlStateManager.translate(-1, 0, -1); + break; + case UP: + GlStateManager.translate(0, 1, 0); + GlStateManager.rotate(90.0f, 1, 0, 0); + break; + case WEST: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(90.0f, 0, 1, 0); + break; } GlStateManager.pushMatrix(); @@ -136,8 +124,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer // GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1); // GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); - for (int i = 1; i <= 3; i++) - { + for (int i = 1; i <= 3; i++) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i); @@ -153,11 +140,9 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer //Render the swirlz float swirlSize = 3; - if (craftTime <= 40) - { + if (craftTime <= 40) { swirlSize = 0; - } else if (craftTime <= 100) - { + } else if (craftTime <= 100) { swirlSize = 3 * (craftTime - 40) / 60; } GlStateManager.pushMatrix(); @@ -180,66 +165,58 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer GlStateManager.popMatrix(); } - public float getStartupPitchYawRatio(float craftTime) - { - if (craftTime <= 80) - { + public float getStartupPitchYawRatio(float craftTime) { + if (craftTime <= 80) { return 0; - } else if (craftTime > 80 && craftTime < 140) - { + } else if (craftTime > 80 && craftTime < 140) { return (craftTime - 80) / 60f; } return 1; } - private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle) - { + private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle) { double verticalOffset = 2; float primaryRotation = 0; float secondaryRotation = 0; - if (craftTime >= 40) - { + if (craftTime >= 40) { primaryRotation = (craftTime - 40) * 4f; secondaryRotation = (craftTime - 40) * 2f; } float translationOffset = 1; - if (craftTime < 80) - { + if (craftTime < 80) { translationOffset = 0; - } else if (craftTime < 140) - { + } else if (craftTime < 140) { translationOffset = (craftTime - 80) / 60; } - switch (circle) - { - case 1: - GlStateManager.translate(0, 0, -verticalOffset); - GlStateManager.rotate(rotation / 200, 1, 0, 0); - GlStateManager.rotate(rotation / 10, 0, 0, 1); - GlStateManager.translate(1.7 * translationOffset, 0, 0); - break; - case 2: - GlStateManager.translate(0, 0, -verticalOffset); + switch (circle) { + case 1: + GlStateManager.translate(0, 0, -verticalOffset); + GlStateManager.rotate(rotation / 200, 1, 0, 0); + GlStateManager.rotate(rotation / 10, 0, 0, 1); + GlStateManager.translate(1.7 * translationOffset, 0, 0); + break; + case 2: + GlStateManager.translate(0, 0, -verticalOffset); // GlStateManager.rotate(254, 0, 0, 1); - GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0); - GlStateManager.rotate(120, 0, 1, 0); - GlStateManager.rotate(-rotation / 10, 0, 0, 1); - GlStateManager.translate(1.2 * translationOffset, 0, 0); - break; - case 3: - GlStateManager.translate(0, 0, -verticalOffset); + GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0); + GlStateManager.rotate(120, 0, 1, 0); + GlStateManager.rotate(-rotation / 10, 0, 0, 1); + GlStateManager.translate(1.2 * translationOffset, 0, 0); + break; + case 3: + GlStateManager.translate(0, 0, -verticalOffset); // GlStateManager.rotate(130, 0, 0, 1); - GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0); - GlStateManager.rotate(240, 0, 1, 0); - GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1); - GlStateManager.translate(2 * translationOffset, 0, 0); - break; - default: - //What are you doing, Way??? + GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0); + GlStateManager.rotate(240, 0, 1, 0); + GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1); + GlStateManager.translate(2 * translationOffset, 0, 0); + break; + default: + //What are you doing, Way??? } GlStateManager.rotate(primaryRotation, 0, 1, 0); @@ -249,8 +226,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer renderStandardCircle(tessellator, builder, size); } - private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) - { + private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) { double var31 = 0.0D; double var33 = 1.0D; double var35 = 0; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index 35702b83..b9967d3a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -15,33 +15,27 @@ import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; -public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer -{ +public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"); private ResourceLocation middleArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"); - public TurretAlchemyCircleRenderer(ResourceLocation location) - { + public TurretAlchemyCircleRenderer(ResourceLocation location) { super(location); } - public TurretAlchemyCircleRenderer() - { + public TurretAlchemyCircleRenderer() { this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png")); } @Override - public float getSizeModifier(float craftTime) - { + public float getSizeModifier(float craftTime) { return 1; } @Override - public float getRotation(float craftTime) - { + public float getRotation(float craftTime) { float offset = 50; - if (craftTime >= offset) - { + if (craftTime >= offset) { float modifier = (craftTime - offset) * 5f; return modifier * 1f; } @@ -49,16 +43,13 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer } @Override - public float getSecondaryRotation(float craftTime) - { + public float getSecondaryRotation(float craftTime) { return 0; } @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) - { - if (!(tile instanceof TileAlchemyArray)) - { + public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { + if (!(tile instanceof TileAlchemyArray)) { return; } @@ -69,8 +60,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer double pitch = 0; double yaw = 0; int arrowTimer = -1; - if (effect instanceof AlchemyArrayEffectArrowTurret) - { + if (effect instanceof AlchemyArrayEffectArrowTurret) { AlchemyArrayEffectArrowTurret turretEffect = (AlchemyArrayEffectArrowTurret) effect; pitch = (turretEffect.getPitch() - turretEffect.getLastPitch()) * f + turretEffect.getLastPitch(); yaw = (turretEffect.getYaw() - turretEffect.getLastYaw()) * f + turretEffect.getLastYaw(); @@ -103,30 +93,29 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - switch (sideHit) - { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; + switch (sideHit) { + case DOWN: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(-90.0f, 1, 0, 0); + break; + case EAST: + GlStateManager.rotate(-90.0f, 0, 1, 0); + GlStateManager.translate(0, 0, -1); + break; + case NORTH: + break; + case SOUTH: + GlStateManager.rotate(180.0f, 0, 1, 0); + GlStateManager.translate(-1, 0, -1); + break; + case UP: + GlStateManager.translate(0, 1, 0); + GlStateManager.rotate(90.0f, 1, 0, 0); + break; + case WEST: + GlStateManager.translate(0, 0, 1); + GlStateManager.rotate(90.0f, 0, 1, 0); + break; } GlStateManager.pushMatrix(); @@ -177,93 +166,71 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer GlStateManager.popMatrix(); } - public float getStartupPitchYawRatio(float craftTime) - { - if (craftTime <= 80) - { + public float getStartupPitchYawRatio(float craftTime) { + if (craftTime <= 80) { return 0; - } else if (craftTime > 80 && craftTime < 140) - { + } else if (craftTime > 80 && craftTime < 140) { return (craftTime - 80) / 60f; } return 1; } - public double getBottomHeightOffset(double craftTime, double arrowAnimation) - { - if (craftTime <= 40) - { + public double getBottomHeightOffset(double craftTime, double arrowAnimation) { + if (craftTime <= 40) { return 0; - } else if (craftTime > 40 && craftTime < 100) - { + } else if (craftTime > 40 && craftTime < 100) { return -0.4 * (craftTime - 40) / 60d; - } else if (craftTime >= 100 && craftTime < 140) - { + } else if (craftTime >= 100 && craftTime < 140) { return -0.4 * (140 - craftTime) / 40d; } - if (arrowAnimation > 0 && arrowAnimation < 45) - { + if (arrowAnimation > 0 && arrowAnimation < 45) { return -0.4 * (arrowAnimation) / 45; - } else if (arrowAnimation >= 45 && arrowAnimation < 50) - { + } else if (arrowAnimation >= 45 && arrowAnimation < 50) { return -0.4 * (50 - arrowAnimation) / 5; } return 0; } - public double getMiddleHeightOffset(double craftTime, double arrowAnimation) - { - if (craftTime <= 40) - { + public double getMiddleHeightOffset(double craftTime, double arrowAnimation) { + if (craftTime <= 40) { return 0; - } else if (craftTime > 40 && craftTime < 100) - { + } else if (craftTime > 40 && craftTime < 100) { return 0.1 * (craftTime - 40) / 60d; - } else if (craftTime >= 100 && craftTime < 140) - { + } else if (craftTime >= 100 && craftTime < 140) { return 0.1 * (140 - craftTime) / 40d; } - if (arrowAnimation > 0 && arrowAnimation < 45) - { + if (arrowAnimation > 0 && arrowAnimation < 45) { return 0.1 * (arrowAnimation) / 45; - } else if (arrowAnimation >= 45 && arrowAnimation < 50) - { + } else if (arrowAnimation >= 45 && arrowAnimation < 50) { return 0.1 * (50 - arrowAnimation) / 5; } return 0; } - public double getTopHeightOffset(double craftTime, double arrowAnimation) - { - if (craftTime <= 40) - { + public double getTopHeightOffset(double craftTime, double arrowAnimation) { + if (craftTime <= 40) { return 0; - } else if (craftTime > 40 && craftTime < 100) - { + } else if (craftTime > 40 && craftTime < 100) { return 0.4 * (craftTime - 40) / 60d; - } else if (craftTime >= 100 && craftTime < 140) - { + } else if (craftTime >= 100 && craftTime < 140) { return 0.4 * (140 - craftTime) / 40d; } - if (arrowAnimation > 0 && arrowAnimation < 45) - { + if (arrowAnimation > 0 && arrowAnimation < 45) { return 0.4 * (arrowAnimation) / 45; - } else if (arrowAnimation >= 45 && arrowAnimation < 50) - { + } else if (arrowAnimation >= 45 && arrowAnimation < 50) { return 0.4 * (50 - arrowAnimation) / 5; } return 0; } - private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) - { + private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) { double var31 = 0.0D; double var33 = 1.0D; double var35 = 0; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java index db0ec96d..b64efcf9 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java @@ -49,6 +49,7 @@ public class SubCommandRitual extends CommandTreeBase { class RitualCreate extends CommandTreeBase { public List ritualList = new ArrayList<>(); + public RitualCreate() { for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { ritualList.add(BloodMagic.RITUAL_MANAGER.getId(ritual)); diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 94b4ddf6..59530a63 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -37,13 +37,13 @@ public class BaseCompressionHandler extends CompressionHandler { public int getRemainingNeeded(ItemStack[] inv) { int needed = this.required.getCount(); int kept = this.getLeftover(); - return iterateThroughInventory(this.required, kept, inv, needed, true); + return iterateThroughInventory(this.required, kept, inv, needed, true); } public int drainInventory(ItemStack[] inv) { int needed = this.required.getCount(); int kept = this.getLeftover(); - return iterateThroughInventory(this.required, kept, inv, needed, true); + return iterateThroughInventory(this.required, kept, inv, needed, true); } public int getLeftover() { diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 96d31140..cfe039c1 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -16,7 +16,7 @@ public class StorageBlockCraftingManager { private static final StorageBlockCraftingManager instance = new StorageBlockCraftingManager(); private List recipes = new LinkedList<>(); - public void addRecipe(IRecipe recipe){ + public void addRecipe(IRecipe recipe) { this.recipes.add(recipe); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 83a0a0e1..fb6269d2 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -29,8 +29,7 @@ import net.minecraftforge.registries.RegistryBuilder; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) -public class RegistrarBloodMagic -{ +public class RegistrarBloodMagic { private static final BloodOrb ORB_DEF = new BloodOrb("", 0, 0, 0); @GameRegistry.ObjectHolder("weak") @@ -67,8 +66,7 @@ public class RegistrarBloodMagic public static IForgeRegistry BLOOD_ORBS = null; @SubscribeEvent - public static void registerBloodOrbs(RegistryEvent.Register event) - { + public static void registerBloodOrbs(RegistryEvent.Register event) { ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName(); event.getRegistry().registerAll( new BloodOrb("weak", 1, 5000, 2).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), @@ -85,8 +83,7 @@ public class RegistrarBloodMagic } @SubscribeEvent - public static void registerPotions(RegistryEvent.Register event) - { + public static void registerPotions(RegistryEvent.Register event) { event.getRegistry().registerAll( new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 0).setRegistryName("boost"), new PotionBloodMagic("Whirlwind", false, 0xFFFFFF, 0, 0).setRegistryName("whirlwind"), @@ -109,8 +106,7 @@ public class RegistrarBloodMagic } @SubscribeEvent - public static void registerEntities(RegistryEvent.Register event) - { + public static void registerEntities(RegistryEvent.Register event) { int entities = 0; event.getRegistry().registerAll( @@ -128,8 +124,7 @@ public class RegistrarBloodMagic } @SubscribeEvent - public static void onRegistryCreation(RegistryEvent.NewRegistry event) - { + public static void onRegistryCreation(RegistryEvent.NewRegistry event) { BLOOD_ORBS = new RegistryBuilder() .setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")) .setIDRange(0, Short.MAX_VALUE) @@ -140,10 +135,8 @@ public class RegistrarBloodMagic @SideOnly(Side.CLIENT) @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) - { - for (BloodOrb orb : BLOOD_ORBS) - { + public static void registerModels(ModelRegistryEvent event) { + for (BloodOrb orb : BLOOD_ORBS) { ModelResourceLocation modelLocation = orb.getModelLocation(); if (modelLocation == null) modelLocation = new ModelResourceLocation(orb.getRegistryName(), "inventory"); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index e45190fb..0938c425 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -44,8 +44,7 @@ import java.util.Set; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @SuppressWarnings("unchecked") -public class RegistrarBloodMagicItems -{ +public class RegistrarBloodMagicItems { public static final Item BLOOD_ORB = Items.AIR; public static final Item ACTIVATION_CRYSTAL = Items.AIR; @@ -129,8 +128,7 @@ public class RegistrarBloodMagicItems public static List items; @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) - { + public static void registerItems(RegistryEvent.Register event) { items = Lists.newArrayList(); RegistrarBloodMagicBlocks.blocks.stream().filter(block -> block instanceof IBMBlock && ((IBMBlock) block).getItem() != null).forEach(block -> @@ -215,15 +213,14 @@ public class RegistrarBloodMagicItems new ItemPotionFlask().setRegistryName("potion_flask"), new ItemAlchemicVial().setRegistryName("alchemic_vial"), new ItemFlightScroll().setRegistryName("icarus_scroll") - )); + )); event.getRegistry().registerAll(items.toArray(new Item[0])); } @SideOnly(Side.CLIENT) @SubscribeEvent - public static void registerRenders(ModelRegistryEvent event) - { + public static void registerRenders(ModelRegistryEvent event) { items.stream().filter(i -> i instanceof IVariantProvider).forEach(i -> { Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 05f40732..d967e0b8 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -37,16 +37,12 @@ import java.util.List; import java.util.Set; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class RegistrarBloodMagicRecipes -{ +public class RegistrarBloodMagicRecipes { @SubscribeEvent - public static void registerRecipes(RegistryEvent.Register event) - { - for (int i = 0; i < ItemSoulGem.names.length; i++) - { - for (EnumDemonWillType willType : EnumDemonWillType.values()) - { + public static void registerRecipes(RegistryEvent.Register event) { + for (int i = 0; i < ItemSoulGem.names.length; i++) { + for (EnumDemonWillType willType : EnumDemonWillType.values()) { ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); @@ -65,8 +61,7 @@ public class RegistrarBloodMagicRecipes RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL.setRepairItem(EnumDemonWillType.DEFAULT.getStack()); } - public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) - { + public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { // ONE registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), AltarTier.ONE.ordinal(), 2000, 2, 1); registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); @@ -105,8 +100,7 @@ public class RegistrarBloodMagicRecipes } } - public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) - { + public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addAlchemyTable(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); registrar.addAlchemyTable(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); registrar.addAlchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); @@ -139,16 +133,13 @@ public class RegistrarBloodMagicRecipes Set addedOreRecipeList = Sets.newHashSet("oreIron", "oreGold", "oreCoal", "oreRedstone"); // We already added these above String[] oreList = OreDictionary.getOreNames().clone(); - for (String ore : oreList) - { - if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) - { + for (String ore : oreList) { + if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) { String dustName = ore.replaceFirst("ore", "dust"); List discoveredOres = OreDictionary.getOres(ore); List dustList = OreDictionary.getOres(dustName); - if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) - { + if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) { ItemStack dustStack = dustList.get(0).copy(); dustStack.setCount(2); registrar.addAlchemyTable(dustStack, 400, 200, 1, ore, ItemCuttingFluid.FluidType.BASIC.getStack()); @@ -158,8 +149,7 @@ public class RegistrarBloodMagicRecipes } } - public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) - { + public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", ItemSlate.SlateType.IMBUED.getStack()); @@ -216,8 +206,7 @@ public class RegistrarBloodMagicRecipes registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.RITUAL_DISMANTLER), 500, 100, new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, 2), new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, 2), new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); } - public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) - { + public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); registrar.addAlchemyArray(ComponentTypes.REAGENT_WATER.getStack(), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); @@ -244,8 +233,7 @@ public class RegistrarBloodMagicRecipes } - public static void registerSacrificeCraftRecipes(BloodMagicRecipeRegistrar registrar) - { + public static void registerSacrificeCraftRecipes(BloodMagicRecipeRegistrar registrar) { registrar.addSacrificeCraft(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER), 10, Items.REDSTONE); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 21d5b273..321f3d30 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -385,9 +385,9 @@ public class EntitySentientSpecter extends EntityDemonBase { @Override public boolean shouldAttackEntity(EntityLivingBase attacker, EntityLivingBase owner) { if (!(attacker instanceof EntityCreeper) && !(attacker instanceof EntityGhast)) { - return super.shouldAttackEntity(attacker, owner); - } - return false; + return super.shouldAttackEntity(attacker, owner); + } + return false; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 65c0c354..ca52fadd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -47,7 +47,8 @@ public class ItemActivationCrystal extends ItemEnum.Variant -{ - public ItemAlchemicVial() - { +public class ItemAlchemicVial extends ItemEnum.Variant { + public ItemAlchemicVial() { super(AlchemicVialType.class, "alchemic_vial"); } @Override - public void gatherVariants(Int2ObjectMap variants) - { + public void gatherVariants(Int2ObjectMap variants) { for (AlchemicVialType type : types) variants.put(type.ordinal(), "type=normal"); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 9e31e607..71d20e33 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -82,7 +82,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { if (binding.getOwnerId().equals(player.getGameProfile().getId())) ownerNetwork.setOrbTier(orb.getTier()); - ownerNetwork.add(SoulTicket.item(stack, world, player,200), orb.getCapacity()); // Add LP to owner's network + ownerNetwork.add(SoulTicket.item(stack, world, player, 200), orb.getCapacity()); // Add LP to owner's network ownerNetwork.hurtPlayer(player, 200); // Hurt whoever is using it return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index a537d1ec..f99408df 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -70,7 +70,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide return null; NBTTagCompound nbt = (NBTTagCompound) bindingTag; - return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")),nbt.getString("name")); + return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 5410758f..960b52a0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -53,7 +53,7 @@ public class ItemSacrificialDagger extends ItemEnum { REINFORCED, IMBUED, DEMONIC, - ETHEREAL,; + ETHEREAL, + ; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 2d645ba2..1cce2154 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -93,7 +93,8 @@ public class ItemTelepositionFocus extends ItemEnum.Variant list) - { + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; @@ -55,35 +51,30 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localize("tooltip.bloodmagic.fluidFilter." + names[stack.getItemDamage()])); super.addInformation(stack, world, tooltip, flag); } @Override - public IFluidFilter getInputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) - { + public IFluidFilter getInputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { IFluidFilter testFilter; - switch (filterStack.getMetadata()) - { - case 0: - testFilter = new RoutingFluidFilter(); - break; + switch (filterStack.getMetadata()) { + case 0: + testFilter = new RoutingFluidFilter(); + break; - default: - testFilter = new RoutingFluidFilter(); + default: + testFilter = new RoutingFluidFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); - for (int i = 0; i < inv.getSizeInventory(); i++) - { + for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) - { + if (stack.isEmpty()) { continue; } @@ -96,32 +87,27 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public IFluidFilter getOutputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) - { + public IFluidFilter getOutputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { IFluidFilter testFilter; - switch (filterStack.getMetadata()) - { - case 0: - testFilter = new RoutingFluidFilter(); - break; + switch (filterStack.getMetadata()) { + case 0: + testFilter = new RoutingFluidFilter(); + break; - default: - testFilter = new RoutingFluidFilter(); + default: + testFilter = new RoutingFluidFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. - for (int i = 0; i < inv.getSizeInventory(); i++) - { + for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) - { + if (stack.isEmpty()) { continue; } ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.isEmpty()) - { + if (ghostStack.isEmpty()) { ghostStack.setCount(Integer.MAX_VALUE); } @@ -133,14 +119,12 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) - { + public void gatherVariants(@Nonnull Int2ObjectMap variants) { variants.put(0, "type=exact"); } @Override - public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) - { + public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) { ItemStack copyStack = keyStack.copy(); GhostItemHelper.setItemGhostAmount(copyStack, 0); copyStack.setCount(1); diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index e62a77be..70e55aec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -22,12 +22,10 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider -{ - public static String[] names = { "exact", "ignoreNBT", "modItems", "oreDict" }; +public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider { + public static String[] names = {"exact", "ignoreNBT", "modItems", "oreDict"}; - public ItemRouterFilter() - { + public ItemRouterFilter() { super(); setTranslationKey(BloodMagic.MODID + ".itemFilter."); @@ -36,15 +34,13 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public String getTranslationKey(ItemStack stack) - { + public String getTranslationKey(ItemStack stack) { return super.getTranslationKey(stack) + names[stack.getItemDamage()]; } @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) - { + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; @@ -54,44 +50,39 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localize("tooltip.bloodmagic.itemFilter." + names[stack.getItemDamage()])); super.addInformation(stack, world, tooltip, flag); } @Override - public IItemFilter getInputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) - { + public IItemFilter getInputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) { IItemFilter testFilter = new TestItemFilter(); - switch (filterStack.getMetadata()) - { - case 0: - testFilter = new TestItemFilter(); - break; - case 1: - testFilter = new IgnoreNBTItemFilter(); - break; - case 2: - testFilter = new ModIdItemFilter(); - break; - case 3: - testFilter = new OreDictItemFilter(); - break; + switch (filterStack.getMetadata()) { + case 0: + testFilter = new TestItemFilter(); + break; + case 1: + testFilter = new IgnoreNBTItemFilter(); + break; + case 2: + testFilter = new ModIdItemFilter(); + break; + case 3: + testFilter = new OreDictItemFilter(); + break; - default: - testFilter = new DefaultItemFilter(); + default: + testFilter = new DefaultItemFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); - for (int i = 0; i < inv.getSizeInventory(); i++) - { + for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) - { + if (stack.isEmpty()) { continue; } @@ -105,42 +96,37 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public IItemFilter getOutputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) - { + public IItemFilter getOutputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) { IItemFilter testFilter; - switch (filterStack.getMetadata()) - { - case 0: - testFilter = new TestItemFilter(); - break; - case 1: - testFilter = new IgnoreNBTItemFilter(); - break; - case 2: - testFilter = new ModIdItemFilter(); - break; - case 3: - testFilter = new OreDictItemFilter(); - break; + switch (filterStack.getMetadata()) { + case 0: + testFilter = new TestItemFilter(); + break; + case 1: + testFilter = new IgnoreNBTItemFilter(); + break; + case 2: + testFilter = new ModIdItemFilter(); + break; + case 3: + testFilter = new OreDictItemFilter(); + break; - default: - testFilter = new DefaultItemFilter(); + default: + testFilter = new DefaultItemFilter(); } List filteredList = new ArrayList<>(); ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. - for (int i = 0; i < inv.getSizeInventory(); i++) - { + for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) - { + if (stack.isEmpty()) { continue; } ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.isEmpty()) - { + if (ghostStack.isEmpty()) { ghostStack.setCount(Integer.MAX_VALUE); } @@ -152,8 +138,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) - { + public void gatherVariants(@Nonnull Int2ObjectMap variants) { variants.put(0, "type=exact"); variants.put(1, "type=ignorenbt"); variants.put(2, "type=moditems"); @@ -161,8 +146,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari } @Override - public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) - { + public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) { ItemStack copyStack = keyStack.copy(); GhostItemHelper.setItemGhostAmount(copyStack, 0); copyStack.setCount(1); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 8c161786..957187bc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -15,23 +15,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -public class ItemSigilBloodLight extends ItemSigilBase -{ - public ItemSigilBloodLight() - { +public class ItemSigilBloodLight extends ItemSigilBase { + public ItemSigilBloodLight() { super("blood_light", 10); } @Override - public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) - { + public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { if (getCooldownRemainder(stack) > 0) reduceCooldown(stack); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) - { + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); @@ -43,15 +39,12 @@ public class ItemSigilBloodLight extends ItemSigilBase if (getCooldownRemainder(stack) > 0) return super.onItemRightClick(world, player, hand); - if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) - { + if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); - if (world.isAirBlock(blockPos)) - { + if (world.isAirBlock(blockPos)) { world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); - if (!world.isRemote) - { + if (!world.isRemote) { SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); } @@ -59,10 +52,8 @@ public class ItemSigilBloodLight extends ItemSigilBase player.swingArm(hand); return super.onItemRightClick(world, player, hand); } - } else - { - if (!world.isRemote) - { + } else { + if (!world.isRemote) { SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); world.spawnEntity(new EntityBloodLight(world, player)); network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); @@ -74,23 +65,19 @@ public class ItemSigilBloodLight extends ItemSigilBase } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { return oldStack.getItem() != newStack.getItem(); } - public int getCooldownRemainder(ItemStack stack) - { + public int getCooldownRemainder(ItemStack stack) { return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING); } - public void reduceCooldown(ItemStack stack) - { + public void reduceCooldown(ItemStack stack) { NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); } - public void resetCooldown(ItemStack stack) - { + public void resetCooldown(ItemStack stack) { NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 5a9ea8f0..7d25804c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -71,8 +71,8 @@ public class ItemSigilTeleposition extends ItemSigilBase { TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, bindingOwnerID, world, tile.getWorld().provider.getDimension(), true)); } } - } } + } return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 6e83eb7e..487f80a2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -104,7 +104,8 @@ public class ItemMonsterSoul extends ItemEnum.Variant CORROSIVE, DESTRUCTIVE, VENGEFUL, - STEADFAST,; + STEADFAST, + ; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 1b804351..4d72a199 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -44,12 +44,12 @@ import java.util.Locale; public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider { - public static int[] soulBracket = new int[] {16, 60, 200, 400, 1000, 2000, 4000}; - public static double[] defaultDamageAdded = new double[] {0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75}; - public static float[] velocityAdded = new float[] {0.25f, 0.5f, 0.75f, 1, 1.25f, 1.5f, 1.75f}; - public static double[] soulDrainPerSwing = new double[] {0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5}; //TODO - public static double[] soulDrop = new double[] {2, 4, 7, 10, 13, 16, 24}; - public static double[] staticDrop = new double[] {1, 1, 2, 3, 3, 3, 4}; + public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000, 2000, 4000}; + public static double[] defaultDamageAdded = new double[]{0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75}; + public static float[] velocityAdded = new float[]{0.25f, 0.5f, 0.75f, 1, 1.25f, 1.5f, 1.75f}; + public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5}; //TODO + public static double[] soulDrop = new double[]{2, 4, 7, 10, 13, 16, 24}; + public static double[] staticDrop = new double[]{1, 1, 2, 3, 3, 3, 4}; public static float soullessShotVelocity = 2.5F; public ItemSentientBow() { @@ -331,7 +331,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien player.addStat(StatList.getObjectUseStats(this)); return entityArrow; } - + @Override public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) { if (entityLiving instanceof EntityPlayer) { @@ -361,9 +361,9 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.ARROW)); EntityArrow entityArrow; double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); - + float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); - + if (getLevel(PlayerDemonWillHandler.getTotalDemonWill(type, player)) <= 0) { entityArrow = itemarrow.createArrow(world, itemstack, entityLiving); } else if (itemarrow == Items.ARROW) { @@ -382,8 +382,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); - if (Float.compare(getVelocityOfArrow(stack), soullessShotVelocity) < Float.MIN_NORMAL) - { + if (Float.compare(getVelocityOfArrow(stack), soullessShotVelocity) < Float.MIN_NORMAL) { world.playSound(null, player.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index 12073a87..b16fe78a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -32,31 +32,26 @@ import WayofTime.bloodmagic.iface.IActivatable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshProvider, IActivatable -{ +public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshProvider, IActivatable { public static Map> floatMap = new HashMap>(); public static Map heldEntityMap = new HashMap(); public static Map heldEntityOffsetMap = new HashMap(); //TODO: A lot of this stuff could be moved to a toggle-able variant - public ItemFlightScroll() - { + public ItemFlightScroll() { super(); setTranslationKey(BloodMagic.MODID + ".icarusScroll"); setCreativeTab(BloodMagic.TAB_BM); } @Override - public boolean getActivated(ItemStack stack) - { + public boolean getActivated(ItemStack stack) { return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); } @Override - public ItemStack setActivatedState(ItemStack stack, boolean activated) - { - if (!stack.isEmpty()) - { + public ItemStack setActivatedState(ItemStack stack, boolean activated) { + if (!stack.isEmpty()) { NBTHelper.checkNBT(stack).getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); return stack; } @@ -65,27 +60,20 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) - { + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote) - { - if (player.isSneaking()) - { - if (!getActivated(stack)) - { + if (!world.isRemote) { + if (player.isSneaking()) { + if (!getActivated(stack)) { double drainNeeded = getBreathCostPerSecond(stack); - if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) - { + if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) { setActivatedState(stack, true); } - } else - { + } else { setActivatedState(stack, false); } - } else - { + } else { //TODO: Add an effect where it "draws back" like a bow in order to cast Levitation on a mob. //Only Levitated mobs can be grabbed. } @@ -95,27 +83,21 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) - { - if (entity.world.isRemote) - { + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { + if (entity.world.isRemote) { return false; } //TODO: Do check to see if the entity is levitating - will only "ensnare" a mob that is levitating. - if (player.isSneaking()) - { + if (player.isSneaking()) { //TODO: Release entity completely? removeEntity(player, entity); - } else - { + } else { EntityLivingBase heldEntity = getHeldEntity(player); - if (heldEntity != null && heldEntity.equals(entity)) - { + if (heldEntity != null && heldEntity.equals(entity)) { heldEntityMap.remove(player); - } else - { + } else { holdEntity(player, entity); //Hold the entity so you can place it around yourself where needed. } } @@ -124,18 +106,13 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) - { - if (!world.isRemote && entity instanceof EntityPlayerMP && getActivated(stack)) - { - if (entity.ticksExisted % 20 == 0) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if (!world.isRemote && entity instanceof EntityPlayerMP && getActivated(stack)) { + if (entity.ticksExisted % 20 == 0) { double drainNeeded = getBreathCostPerSecond(stack); - if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) - { + if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) { this.drainBreath(stack, drainNeeded, true); - } else - { + } else { this.setActivatedState(stack, false); } } @@ -143,40 +120,32 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr onEffectUpdate(stack, world, (EntityPlayer) entity, itemSlot, isSelected); } - if (!world.isRemote) - { - if (entity instanceof EntityPlayer) - { + if (!world.isRemote) { + if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; updateHeldEntityPosition(player); - if (floatMap.containsKey(player)) - { + if (floatMap.containsKey(player)) { Map entityMap = floatMap.get(player); - if (entityMap == null) - { + if (entityMap == null) { return; } List removalList = new ArrayList(); - for (Entry entry : entityMap.entrySet()) - { + for (Entry entry : entityMap.entrySet()) { EntityLivingBase floatingEntity = entry.getKey(); - if (floatingEntity == null || floatingEntity.isDead || floatingEntity.dimension != player.dimension) - { + if (floatingEntity == null || floatingEntity.isDead || floatingEntity.dimension != player.dimension) { removalList.add(floatingEntity); } followOwner(player, floatingEntity, entry.getValue()); } - for (EntityLivingBase livingEntity : removalList) - { + for (EntityLivingBase livingEntity : removalList) { entityMap.remove(livingEntity); } - if (entityMap.isEmpty()) - { + if (entityMap.isEmpty()) { floatMap.remove(player); } @@ -185,16 +154,13 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } - public static boolean updateEntityOffset(EntityPlayer player, EntityLivingBase living, Vector3d updatedOffset) - { + public static boolean updateEntityOffset(EntityPlayer player, EntityLivingBase living, Vector3d updatedOffset) { //TODO: Check if this entity is contained in another player's map to prevent weird things. - if (floatMap.containsKey(player)) - { + if (floatMap.containsKey(player)) { Map entityMap = floatMap.get(player); entityMap.put(living, updatedOffset); return true; - } else - { + } else { Map entityMap = new HashMap(); entityMap.put(living, updatedOffset); floatMap.put(player, entityMap); @@ -203,28 +169,23 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Nullable - public static EntityLivingBase getHeldEntity(EntityPlayer player) - { - if (heldEntityMap.containsKey(player)) - { + public static EntityLivingBase getHeldEntity(EntityPlayer player) { + if (heldEntityMap.containsKey(player)) { return heldEntityMap.get(player); } return null; } - public static double getHeldEntityOffset(EntityPlayer player) - { - if (heldEntityMap.containsKey(player)) - { + public static double getHeldEntityOffset(EntityPlayer player) { + if (heldEntityMap.containsKey(player)) { return heldEntityOffsetMap.get(player); } return 1; } - public static void holdEntity(EntityPlayer player, EntityLivingBase entityLiving) - { + public static void holdEntity(EntityPlayer player, EntityLivingBase entityLiving) { float distance = player.getDistance(entityLiving); Vec3d lookVec = player.getLookVec(); heldEntityMap.put(player, entityLiving); @@ -232,41 +193,33 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * distance, lookVec.y * distance, lookVec.z * distance)); } - public static void updateHeldEntityPosition(EntityPlayer player) - { + public static void updateHeldEntityPosition(EntityPlayer player) { EntityLivingBase entityLiving = getHeldEntity(player); - if (entityLiving != null) - { + if (entityLiving != null) { double offset = getHeldEntityOffset(player); Vec3d lookVec = player.getLookVec(); updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * offset, lookVec.y * offset, lookVec.z * offset)); } } - public static void removeEntity(EntityPlayer player, EntityLivingBase living) - { - if (living == null) - { + public static void removeEntity(EntityPlayer player, EntityLivingBase living) { + if (living == null) { return; } - if (floatMap.containsKey(player)) - { + if (floatMap.containsKey(player)) { Map entityMap = floatMap.get(player); - if (entityMap.containsKey(living)) - { + if (entityMap.containsKey(living)) { entityMap.remove(living); } - if (entityMap.isEmpty()) - { + if (entityMap.isEmpty()) { floatMap.remove(player); } } } - public void followOwner(EntityPlayer owner, EntityLivingBase livingEntity, Vector3d offset) - { + public void followOwner(EntityPlayer owner, EntityLivingBase livingEntity, Vector3d offset) { double offsetX = offset.x; double offsetY = offset.y; double offsetZ = offset.z; @@ -287,40 +240,34 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr vec.normalize(); - if (speed <= 0.00001) - { + if (speed <= 0.00001) { return; } livingEntity.setVelocity(vec.x * speed, vec.y * speed, vec.z * speed); } - public void onEffectUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) - { + public void onEffectUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FLIGHT, 2, 0)); } @Override - public int getMaxBreath(ItemStack stack) - { + public int getMaxBreath(ItemStack stack) { return 20; } - public double getBreathCostPerSecond(ItemStack stack) - { + public double getBreathCostPerSecond(ItemStack stack) { return 0.01; } @Override @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() - { + public ItemMeshDefinition getMeshDefinition() { return new CustomMeshDefinitionActivatable("icarus_scroll"); } @Override - public void gatherVariants(Consumer variants) - { + public void gatherVariants(Consumer variants) { variants.accept("active=false"); variants.accept("active=true"); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java index 1dfb41cd..43c3b3ed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java @@ -6,33 +6,28 @@ import net.minecraft.nbt.NBTTagCompound; import WayofTime.bloodmagic.soul.ISoulBreathContainer; import WayofTime.bloodmagic.util.Constants; -public abstract class ItemSoulBreathContainer extends Item implements ISoulBreathContainer -{ +public abstract class ItemSoulBreathContainer extends Item implements ISoulBreathContainer { @Override - public double getBreath(ItemStack stack) - { + public double getBreath(ItemStack stack) { NBTTagCompound tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.BREATH); } @Override - public void setBreath(ItemStack stack, double amount) - { + public void setBreath(ItemStack stack, double amount) { NBTTagCompound tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.BREATH, amount); } @Override - public double drainBreath(ItemStack stack, double drainAmount, boolean doDrain) - { + public double drainBreath(ItemStack stack, double drainAmount, boolean doDrain) { double breath = getBreath(stack); double breathDrained = Math.min(drainAmount, breath); - if (doDrain) - { + if (doDrain) { setBreath(stack, breath - breathDrained); } @@ -40,15 +35,13 @@ public abstract class ItemSoulBreathContainer extends Item implements ISoulBreat } @Override - public double fillBreath(ItemStack stack, double fillAmount, boolean doFill) - { + public double fillBreath(ItemStack stack, double fillAmount, boolean doFill) { double current = this.getBreath(stack); double maxBreath = this.getMaxBreath(stack); double filled = Math.min(fillAmount, maxBreath - current); - if (doFill) - { + if (doFill) { this.setBreath(stack, filled + current); } @@ -56,17 +49,14 @@ public abstract class ItemSoulBreathContainer extends Item implements ISoulBreat } @Override - public boolean showDurabilityBar(ItemStack stack) - { + public boolean showDurabilityBar(ItemStack stack) { return true; } @Override - public double getDurabilityForDisplay(ItemStack stack) - { + public double getDurabilityForDisplay(ItemStack stack) { double maxWill = getMaxBreath(stack); - if (maxWill <= 0) - { + if (maxWill <= 0) { return 1; } return 1.0 - (getBreath(stack) / maxWill); diff --git a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java index db637b99..1539372c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java @@ -6,44 +6,36 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; import java.util.Locale; -public enum AlchemicVialType implements ISubItem -{ +public enum AlchemicVialType implements ISubItem { BASE(0x2e35ff); final int potionColour; - AlchemicVialType(int colour1) - { + AlchemicVialType(int colour1) { potionColour = colour1; } @Nonnull @Override - public String getInternalName() - { + public String getInternalName() { return name().toLowerCase(Locale.ROOT); } @Nonnull @Override - public ItemStack getStack(int count) - { + public ItemStack getStack(int count) { return new ItemStack(RegistrarBloodMagicItems.ALCHEMIC_VIAL, count, ordinal()); } - public int getColourForLayer(int layer) - { - if (layer == 0) - { + public int getColourForLayer(int layer) { + if (layer == 0) { return potionColour; } return -1; } - public static int getColourForLayer(int variant, int layer) - { - if (variant >= AlchemicVialType.values().length) - { + public static int getColourForLayer(int variant, int layer) { + if (variant >= AlchemicVialType.values().length) { return -1; } diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java index 89474201..c49aa09b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java @@ -40,7 +40,8 @@ public enum ComponentTypes implements ISubItem { CATALYST_POWER_1, REAGENT_CLAW, REAGENT_BOUNCE, - REAGENT_FROST,; + REAGENT_FROST, + ; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java index f3ca9233..d3edd6e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java @@ -9,7 +9,8 @@ import java.util.Locale; public enum ShardType implements ISubItem { WEAK, - DEMONIC,; + DEMONIC, + ; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index 66b48fdc..79368bdb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -14,7 +14,7 @@ public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { super(level); } - + public float getDamageMultiplier() { return 1 - protectionLevel[this.level]; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 8b9288a6..3a0a2890 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -16,45 +16,37 @@ import org.apache.commons.codec.binary.StringUtils; import java.util.UUID; -public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade -{ - public static final int[] costs = new int[] { 3, 7, 13, 26, 42, 60, 90, 130, 180, 250 }; - public static final double[] speedModifier = new double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5 }; - public static final int[] sprintSpeedTime = new int[] { 0, 0, 0, 0, 0, 20, 60, 60, 100, 200 }; - public static final int[] sprintSpeedLevel = new int[] { 0, 0, 0, 0, 0, 0, 0, 1, 1, 2 }; - public static final int[] healthModifier = new int[] { 0, 0, 0, 0, 0, 0, 0, 4, 10, 20 }; - public static final int[] sprintRegenTime = new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 25 }; +public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { + public static final int[] costs = new int[]{3, 7, 13, 26, 42, 60, 90, 130, 180, 250}; + public static final double[] speedModifier = new double[]{0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5}; + public static final int[] sprintSpeedTime = new int[]{0, 0, 0, 0, 0, 20, 60, 60, 100, 200}; + public static final int[] sprintSpeedLevel = new int[]{0, 0, 0, 0, 0, 0, 0, 1, 1, 2}; + public static final int[] healthModifier = new int[]{0, 0, 0, 0, 0, 0, 0, 4, 10, 20}; + public static final int[] sprintRegenTime = new int[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 25}; - public LivingArmourUpgradeSpeed(int level) - { + public LivingArmourUpgradeSpeed(int level) { super(level); } - public double getSpeedModifier() - { + public double getSpeedModifier() { return speedModifier[this.level]; } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) - { - if (player.isSprinting()) - { - if (sprintSpeedTime[this.level] > 0) - { + public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + if (player.isSprinting()) { + if (sprintSpeedTime[this.level] > 0) { player.addPotionEffect(new PotionEffect(MobEffects.SPEED, sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); } - if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(MobEffects.REGENERATION)) - { + if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(MobEffects.REGENERATION)) { player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, sprintRegenTime[this.level], 0, false, false)); } } } @Override - public Multimap getAttributeModifiers() - { + public Multimap getAttributeModifiers() { Multimap modifierMap = HashMultimap.create(); // modifierMap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Speed modifier" + 1, speedModifier[this.level], 1)); @@ -68,38 +60,32 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade } @Override - public String getUniqueIdentifier() - { + public String getUniqueIdentifier() { return BloodMagic.MODID + ".upgrade.movement"; } @Override - public int getMaxTier() - { + public int getMaxTier() { return 10; } @Override - public int getCostOfUpgrade() - { + public int getCostOfUpgrade() { return costs[this.level]; } @Override - public void writeToNBT(NBTTagCompound tag) - { + public void writeToNBT(NBTTagCompound tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) - { + public void readFromNBT(NBTTagCompound tag) { // EMPTY } @Override - public String getTranslationKey() - { + public String getTranslationKey() { return tooltipBase + "speed"; } } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index f8dd774e..204d1db4 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -40,22 +40,18 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import java.awt.Color; import java.util.Map; -public class ClientProxy extends CommonProxy -{ +public class ClientProxy extends CommonProxy { public static DemonWillHolder currentAura = new DemonWillHolder(); @Override - public void preInit() - { + public void preInit() { super.preInit(); OBJLoader.INSTANCE.addDomain(BloodMagic.MODID); - ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR() - { + ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR() { @Override - public void handleEvents(TileInversionPillar chest, float time, Iterable pastEvents) - { + public void handleEvents(TileInversionPillar chest, float time, Iterable pastEvents) { chest.handleEvents(time, pastEvents); } }); @@ -73,8 +69,7 @@ public class ClientProxy extends CommonProxy } @Override - public void registerRenderers() - { + public void registerRenderers() { RenderingRegistry.registerEntityRenderingHandler(EntitySoulSnare.class, new SoulSnareRenderFactory()); RenderingRegistry.registerEntityRenderingHandler(EntitySentientArrow.class, new SentientArrowRenderFactory()); RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new BloodLightRenderFactory()); @@ -90,18 +85,15 @@ public class ClientProxy extends CommonProxy } @Override - public void init() - { + public void init() { super.init(); Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { - try - { + try { if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) if (tintIndex == 1) return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); - } catch (NumberFormatException e) - { + } catch (NumberFormatException e) { return -1; } return -1; @@ -130,29 +122,24 @@ public class ClientProxy extends CommonProxy } @Override - public void postInit() - { + public void postInit() { Elements.registerElements(); } - private void addElytraLayer() - { + private void addElytraLayer() { RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); - try - { + try { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); BMLog.DEBUG.info("Elytra layer added"); - } catch (Exception e) - { + } catch (Exception e) { BMLog.DEBUG.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade: {}", e.getMessage()); } } @Override - public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) - { + public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) { return ModelLoaderRegistry.loadASM(location, parameters); } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 688c588a..6a748789 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -70,14 +70,12 @@ import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Stopwatch; -public class ModRecipes -{ +public class ModRecipes { static ItemStack mundaneLengtheningStack = ComponentTypes.CATALYST_LENGTH_1.getStack(); static ItemStack mundanePowerStack = ComponentTypes.CATALYST_POWER_1.getStack(); - public static void init() - { + public static void init() { initOreDict(); addFurnaceRecipes(); addAltarRecipes(); @@ -88,8 +86,7 @@ public class ModRecipes addCompressionHandlers(); } - public static void initOreDict() - { + public static void initOreDict() { OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); @@ -97,19 +94,16 @@ public class ModRecipes OreDictionary.registerOre("dustSaltpeter", ComponentTypes.SALTPETER.getStack()); } - public static void addFurnaceRecipes() - { + public static void addFurnaceRecipes() { FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_IRON.getStack(), new ItemStack(Items.IRON_INGOT), (float) 0.15); FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_GOLD.getStack(), new ItemStack(Items.GOLD_INGOT), (float) 0.15); } - public static void addAltarRecipes() - { + public static void addAltarRecipes() { } - public static void addAlchemyArrayRecipes() - { + public static void addAlchemyArrayRecipes() { AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); @@ -137,8 +131,7 @@ public class ModRecipes } - public static void addCompressionHandlers() - { + public static void addCompressionHandlers() { Stopwatch stopwatch = Stopwatch.createStarted(); StorageBlockCraftingManager.getInstance().addStorageBlockRecipes(); @@ -151,13 +144,11 @@ public class ModRecipes BMLog.DEBUG.info("Added compression recipes in {}", stopwatch); } - public static void addAlchemyTableRecipes() - { + public static void addAlchemyTableRecipes() { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); } - public static void addPotionRecipes() - { + public static void addPotionRecipes() { addPotionRecipe(1000, 1, new ItemStack(Items.GHAST_TEAR), new PotionEffect(MobEffects.REGENERATION, 450)); addPotionRecipe(1000, 1, new ItemStack(Items.GOLDEN_CARROT), new PotionEffect(MobEffects.NIGHT_VISION, 2 * 60 * 20)); addPotionRecipe(1000, 1, new ItemStack(Items.MAGMA_CREAM), new PotionEffect(MobEffects.FIRE_RESISTANCE, 2 * 60 * 20)); @@ -181,8 +172,7 @@ public class ModRecipes addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(RegistrarBloodMagic.DEAFNESS, 450)); } - public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, PotionEffect baseEffect) - { + public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, PotionEffect baseEffect) { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(lpDrained, 100, tier, inputStack, baseEffect)); List lengtheningList = new ArrayList<>(); @@ -196,8 +186,7 @@ public class ModRecipes AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getPowerAugmentRecipe(lpDrained, 100, tier, powerList, baseEffect, 1)); } - public static void addLivingArmourDowngradeRecipes() - { + public static void addLivingArmourDowngradeRecipes() { String messageBase = "ritual.bloodmagic.downgradeRitual.dialogue."; ItemStack bowStack = new ItemStack(Items.BOW); @@ -211,18 +200,16 @@ public class ModRecipes ItemStack stringStack = new ItemStack(Items.STRING); Map> dialogueMap = new HashMap<>(); - dialogueMap.put(bowStack, Pair.of("bow", new int[] { 1, 100, 300, 500 })); - dialogueMap.put(bottleStack, Pair.of("quenched", new int[] { 1, 100, 300, 500 })); - dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[] { 1, 100, 300, 500, 700 })); - dialogueMap.put(goldenAppleStack, Pair.of("slowHeal", new int[] { 1, 100, 300, 500, 700 })); + dialogueMap.put(bowStack, Pair.of("bow", new int[]{1, 100, 300, 500})); + dialogueMap.put(bottleStack, Pair.of("quenched", new int[]{1, 100, 300, 500})); + dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[]{1, 100, 300, 500, 700})); + dialogueMap.put(goldenAppleStack, Pair.of("slowHeal", new int[]{1, 100, 300, 500, 700})); - for (Entry> entry : dialogueMap.entrySet()) - { + for (Entry> entry : dialogueMap.entrySet()) { ItemStack keyStack = entry.getKey(); String str = entry.getValue().getKey(); Map> textMap = new HashMap<>(); - for (int tick : entry.getValue().getValue()) - { + for (int tick : entry.getValue().getValue()) { List textList = new ArrayList<>(); textList.add(new TextComponentTranslation("\u00A74%s", new TextComponentTranslation(messageBase + str + "." + tick))); textMap.put(tick, textList); @@ -240,8 +227,7 @@ public class ModRecipes LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeQuenched(0), bottleStack, Items.DRAGON_BREATH); LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeCrippledArm(0), shieldStack, "gemDiamond"); - for (int i = 0; i < 10; i++) - { + for (int i = 0; i < 10; i++) { addRecipeForTieredDowngrade(new LivingArmourUpgradeMeleeDecrease(i), swordStack, i); addRecipeForTieredDowngrade(new LivingArmourUpgradeSlowHeal(i), goldenAppleStack, i); addRecipeForTieredDowngrade(new LivingArmourUpgradeBattleHungry(i), fleshStack, i); @@ -251,39 +237,37 @@ public class ModRecipes } } - public static void addRecipeForTieredDowngrade(LivingArmourUpgrade upgrade, ItemStack stack, int tier) - { - switch (tier) - { - case 0: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); - break; - case 1: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); - break; - case 2: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); - break; - case 3: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); - break; - case 4: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - break; - case 5: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - break; - case 6: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); - break; - case 7: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); - break; - case 8: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); - break; - case 9: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); + public static void addRecipeForTieredDowngrade(LivingArmourUpgrade upgrade, ItemStack stack, int tier) { + switch (tier) { + case 0: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); + break; + case 1: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); + break; + case 2: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); + break; + case 3: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); + break; + case 4: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + break; + case 5: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); + break; + case 6: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); + break; + case 7: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); + break; + case 8: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); + break; + case 9: + LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 8b1822e9..57f5d24a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -9,11 +9,9 @@ import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall; import net.minecraft.init.Blocks; -public class ModRituals -{ +public class ModRituals { // TODO Move elsewhere - public static void initHarvestHandlers() - { + public static void initHarvestHandlers() { HarvestRegistry.registerRangeAmplifier(Blocks.DIAMOND_BLOCK.getDefaultState(), 15); HarvestRegistry.registerRangeAmplifier(Blocks.GOLD_BLOCK.getDefaultState(), 10); HarvestRegistry.registerRangeAmplifier(Blocks.IRON_BLOCK.getDefaultState(), 6); @@ -23,8 +21,7 @@ public class ModRituals HarvestRegistry.registerHandler(new HarvestHandlerStem()); } - public static void initCuttingFluids() - { + public static void initCuttingFluids() { CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5)); CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java index fb99faf7..10d586cb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java @@ -9,6 +9,8 @@ import javax.annotation.Nonnull; public interface ICrushingHandler { @Nonnull ItemStack getRecipeOutput(ItemStack input, World world, BlockPos pos); + int getLpDrain(); + double getWillDrain(); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 64242e37..9e3592b9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -160,7 +160,7 @@ public class RitualAltarBuilder extends Ritual { } /* - * + * * These methods are utilities for this ritual. They support both the old * forge inventory system, and the new one. */ diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index 34321638..f0617d47 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -53,11 +53,11 @@ public class RitualCobblestone extends Ritual { alchemyArray.decrStackSize(0, 1); world.setBlockToAir(alchemyArray.getPos()); break; - /* - * case 4: block = Blocks.end_stone; - * alchemyArray.decrStackSize(0, 1); - * world.setBlockToAir(alchemyArray.getPos()); break; - */ + /* + * case 4: block = Blocks.end_stone; + * alchemyArray.decrStackSize(0, 1); + * world.setBlockToAir(alchemyArray.getPos()); break; + */ default: break; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 271ddac4..4b6d7955 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -120,18 +120,18 @@ public class RitualCrushing extends Ritual { ItemStack copyStack = checkStack.copy(); for (ICrushingHandler handler : CrushingRegistry.getCrushingHandlerList()) { - int lpDrain = handler.getLpDrain(); - double willDrain = handler.getWillDrain(); + int lpDrain = handler.getLpDrain(); + double willDrain = handler.getWillDrain(); - if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) { - continue; - } + if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) { + continue; + } - ItemStack result = handler.getRecipeOutput(copyStack, world, pos); + ItemStack result = handler.getRecipeOutput(copyStack, world, pos); - if (result.isEmpty()) { - continue; - } + if (result.isEmpty()) { + continue; + } if (tile != null) { result = Utils.insertStackIntoTile(result, tile, EnumFacing.DOWN); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java index d5f666be..70b683f9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java @@ -17,21 +17,17 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.TileDemonCrystal; @RitualRegister("crystal_split") -public class RitualCrystalSplit extends Ritual -{ - public RitualCrystalSplit() - { +public class RitualCrystalSplit extends Ritual { + public RitualCrystalSplit() { super("ritualCrystalSplit", 0, 20000, "ritual." + BloodMagic.MODID + ".crystalSplitRitual"); } @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { + public void performRitual(IMasterRitualStone masterRitualStone) { World world = masterRitualStone.getWorldObj(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - if (currentEssence < getRefreshCost()) - { + if (currentEssence < getRefreshCost()) { masterRitualStone.getOwnerNetwork().causeNausea(); return; } @@ -41,16 +37,14 @@ public class RitualCrystalSplit extends Ritual BlockPos rawPos = pos.up(2); TileEntity tile = world.getTileEntity(rawPos); - if (!(tile instanceof TileDemonCrystal) || ((TileDemonCrystal) tile).getType() != EnumDemonWillType.DEFAULT) - { + if (!(tile instanceof TileDemonCrystal) || ((TileDemonCrystal) tile).getType() != EnumDemonWillType.DEFAULT) { return; } IBlockState rawState = world.getBlockState(rawPos); TileDemonCrystal rawTile = (TileDemonCrystal) tile; - if (rawTile.crystalCount >= 5) - { + if (rawTile.crystalCount >= 5) { BlockPos vengefulPos = pos.offset(rotateFacing(EnumFacing.NORTH, direction)).up(); BlockPos corrosivePos = pos.offset(rotateFacing(EnumFacing.EAST, direction)).up(); BlockPos steadfastPos = pos.offset(rotateFacing(EnumFacing.SOUTH, direction)).up(); @@ -62,50 +56,38 @@ public class RitualCrystalSplit extends Ritual int destructiveCrystals = 0; tile = world.getTileEntity(vengefulPos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.VENGEFUL && ((TileDemonCrystal) tile).crystalCount < 7) - { + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.VENGEFUL && ((TileDemonCrystal) tile).crystalCount < 7) { vengefulCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(vengefulPos)) - { + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(vengefulPos)) { // #donothing, no point setting the crystal to 0 again - } else - { + } else { return; } tile = world.getTileEntity(corrosivePos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.CORROSIVE && ((TileDemonCrystal) tile).crystalCount < 7) - { + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.CORROSIVE && ((TileDemonCrystal) tile).crystalCount < 7) { corrosiveCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(corrosivePos)) - { + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(corrosivePos)) { - } else - { + } else { return; } tile = world.getTileEntity(steadfastPos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.STEADFAST && ((TileDemonCrystal) tile).crystalCount < 7) - { + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.STEADFAST && ((TileDemonCrystal) tile).crystalCount < 7) { steadfastCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(steadfastPos)) - { + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(steadfastPos)) { - } else - { + } else { return; } tile = world.getTileEntity(destructivePos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.DESTRUCTIVE && ((TileDemonCrystal) tile).crystalCount < 7) - { + if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.DESTRUCTIVE && ((TileDemonCrystal) tile).crystalCount < 7) { destructiveCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(destructivePos)) - { + } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(destructivePos)) { - } else - { + } else { return; } @@ -120,29 +102,24 @@ public class RitualCrystalSplit extends Ritual } } - public EnumFacing rotateFacing(EnumFacing facing, EnumFacing rotation) - { - switch (rotation) - { - case EAST: - return facing.rotateY(); - case SOUTH: - return facing.rotateY().rotateY(); - case WEST: - return facing.rotateYCCW(); - case NORTH: - default: - return facing; + public EnumFacing rotateFacing(EnumFacing facing, EnumFacing rotation) { + switch (rotation) { + case EAST: + return facing.rotateY(); + case SOUTH: + return facing.rotateY().rotateY(); + case WEST: + return facing.rotateYCCW(); + case NORTH: + default: + return facing; } } - public void growCrystal(World world, BlockPos pos, EnumDemonWillType type, int currentCrystalCount) - { - if (currentCrystalCount <= 0) - { + public void growCrystal(World world, BlockPos pos, EnumDemonWillType type, int currentCrystalCount) { + if (currentCrystalCount <= 0) { world.setBlockState(pos, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal()), 3); - } else - { + } else { TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); tile.crystalCount++; tile.markDirty(); @@ -152,20 +129,17 @@ public class RitualCrystalSplit extends Ritual } @Override - public int getRefreshTime() - { + public int getRefreshTime() { return 20; } @Override - public int getRefreshCost() - { + public int getRefreshCost() { return 1000; } @Override - public void gatherComponents(Consumer components) - { + public void gatherComponents(Consumer components) { addRune(components, 0, 0, -1, EnumRuneType.FIRE); addRune(components, 1, 0, 0, EnumRuneType.EARTH); addRune(components, 0, 0, 1, EnumRuneType.WATER); @@ -177,14 +151,12 @@ public class RitualCrystalSplit extends Ritual } @Override - public Ritual getNewCopy() - { + public Ritual getNewCopy() { return new RitualCrystalSplit(); } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) - { - return new ITextComponent[] { new TextComponentTranslation(this.getTranslationKey() + ".info") }; + public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info")}; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index ad04ccfd..cece930d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -17,16 +17,14 @@ import net.minecraftforge.items.IItemHandler; import java.util.function.Consumer; @RitualRegister("ellipsoid") -public class RitualEllipsoid extends Ritual -{ +public class RitualEllipsoid extends Ritual { public static final String SPHEROID_RANGE = "spheroidRange"; public static final String CHEST_RANGE = "chest"; private boolean cached = false; private BlockPos currentPos; //Offset - public RitualEllipsoid() - { + public RitualEllipsoid() { super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual"); addBlockRange(SPHEROID_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), new BlockPos(11, 11, 11))); addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); @@ -36,8 +34,7 @@ public class RitualEllipsoid extends Ritual } @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { + public void performRitual(IMasterRitualStone masterRitualStone) { World world = masterRitualStone.getWorldObj(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); @@ -45,8 +42,7 @@ public class RitualEllipsoid extends Ritual AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); - if (currentEssence < getRefreshCost()) - { + if (currentEssence < getRefreshCost()) { masterRitualStone.getOwnerNetwork().causeNausea(); return; } @@ -60,20 +56,16 @@ public class RitualEllipsoid extends Ritual int minZ = (int) (masterPos.getZ() - sphereBB.minZ); int maxZ = (int) (sphereBB.maxZ - masterPos.getZ()) - 1; - if (tileInventory != null) - { - if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) - { + if (tileInventory != null) { + if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); - if (itemHandler.getSlots() <= 0) - { + if (itemHandler.getSlots() <= 0) { return; } int blockSlot = -1; - for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) - { + for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) { ItemStack stack = itemHandler.extractItem(invSlot, 1, true); if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock)) continue; @@ -82,8 +74,7 @@ public class RitualEllipsoid extends Ritual break; } - if (blockSlot == -1) - { + if (blockSlot == -1) { return; } @@ -95,8 +86,7 @@ public class RitualEllipsoid extends Ritual int i = -minY; int k = -minZ; - if (currentPos != null) - { + if (currentPos != null) { j = currentPos.getY(); i = Math.min(xR, Math.max(-minX, currentPos.getX())); k = Math.min(zR, Math.max(-minZ, currentPos.getZ())); @@ -104,25 +94,19 @@ public class RitualEllipsoid extends Ritual int checks = 0; int maxChecks = 100; - while (j <= maxY) - { - while (i <= maxX) - { - while (k <= maxZ) - { + while (j <= maxY) { + while (i <= maxX) { + while (k <= maxZ) { checks++; - if (checks >= maxChecks) - { + if (checks >= maxChecks) { this.currentPos = new BlockPos(i, j, k); return; } - if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) - { + if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) { BlockPos newPos = masterPos.add(i, j, k); // - if (!world.getBlockState(newPos).getBlock().isReplaceable(world, newPos)) - { + if (!world.getBlockState(newPos).getBlock().isReplaceable(world, newPos)) { k++; continue; } @@ -156,11 +140,9 @@ public class RitualEllipsoid extends Ritual } } - public boolean checkIfEllipsoidShell(int xR, int yR, int zR, int xOff, int yOff, int zOff) - { + public boolean checkIfEllipsoidShell(int xR, int yR, int zR, int xOff, int yOff, int zOff) { //Checking shell in the x-direction - if (!checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) - { + if (!checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) { return false; } @@ -186,21 +168,18 @@ public class RitualEllipsoid extends Ritual // return false; } - public boolean checkIfEllipsoid(float xR, float yR, float zR, float xOff, float yOff, float zOff) - { + public boolean checkIfEllipsoid(float xR, float yR, float zR, float xOff, float yOff, float zOff) { float possOffset = 0.5f; return xOff * xOff / ((xR + possOffset) * (xR + possOffset)) + yOff * yOff / ((yR + possOffset) * (yR + possOffset)) + zOff * zOff / ((zR + possOffset) * (zR + possOffset)) <= 1; } @Override - public int getRefreshCost() - { + public int getRefreshCost() { return 5; } @Override - public int getRefreshTime() - { + public int getRefreshTime() { return 1; } @@ -212,8 +191,7 @@ public class RitualEllipsoid extends Ritual // } @Override - public void gatherComponents(Consumer components) - { + public void gatherComponents(Consumer components) { addCornerRunes(components, 1, 0, EnumRuneType.DUSK); addRune(components, 4, 0, 0, EnumRuneType.FIRE); @@ -254,8 +232,7 @@ public class RitualEllipsoid extends Ritual } @Override - public Ritual getNewCopy() - { + public Ritual getNewCopy() { return new RitualEllipsoid(); } } diff --git a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java index 6ff9f8d9..9f4b47a7 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java @@ -15,54 +15,42 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -public class RoutingFluidFilter implements IFluidFilter -{ +public class RoutingFluidFilter implements IFluidFilter { protected List requestList; protected TileEntity accessedTile; protected IFluidHandler fluidHandler; @Override - public void initializeFilter(List filteredList, TileEntity tile, IFluidHandler fluidHandler, boolean isFilterOutput) - { + public void initializeFilter(List filteredList, TileEntity tile, IFluidHandler fluidHandler, boolean isFilterOutput) { this.accessedTile = tile; this.fluidHandler = fluidHandler; - if (isFilterOutput) - { + if (isFilterOutput) { //The requestList contains a list of how much can be extracted. requestList = new ArrayList<>(); - for (ItemStack filterStack : filteredList) - { + for (ItemStack filterStack : filteredList) { FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); - if (fluidFilterStack != null) - { + if (fluidFilterStack != null) { requestList.add(fluidFilterStack); } } IFluidTankProperties[] properties = fluidHandler.getTankProperties(); - for (IFluidTankProperties property : properties) - { + for (IFluidTankProperties property : properties) { FluidStack containedStack = property.getContents(); - if (containedStack != null) - { - for (FluidStack fluidFilterStack : requestList) - { - if (doStacksMatch(fluidFilterStack, containedStack)) - { + if (containedStack != null) { + for (FluidStack fluidFilterStack : requestList) { + if (doStacksMatch(fluidFilterStack, containedStack)) { fluidFilterStack.amount = Math.max(fluidFilterStack.amount - containedStack.amount, 0); } } } } - } else - { + } else { requestList = new ArrayList<>(); - for (ItemStack filterStack : filteredList) - { + for (ItemStack filterStack : filteredList) { FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); - if (fluidFilterStack != null) - { + if (fluidFilterStack != null) { fluidFilterStack.amount *= -1; requestList.add(fluidFilterStack); } @@ -70,15 +58,11 @@ public class RoutingFluidFilter implements IFluidFilter IFluidTankProperties[] properties = fluidHandler.getTankProperties(); - for (IFluidTankProperties property : properties) - { + for (IFluidTankProperties property : properties) { FluidStack containedStack = property.getContents(); - if (containedStack != null) - { - for (FluidStack fluidFilterStack : requestList) - { - if (doStacksMatch(fluidFilterStack, containedStack)) - { + if (containedStack != null) { + for (FluidStack fluidFilterStack : requestList) { + if (doStacksMatch(fluidFilterStack, containedStack)) { fluidFilterStack.amount += containedStack.amount; } } @@ -91,20 +75,16 @@ public class RoutingFluidFilter implements IFluidFilter * Gives the remainder~ */ @Override - public FluidStack transferStackThroughOutputFilter(FluidStack fluidStack) - { + public FluidStack transferStackThroughOutputFilter(FluidStack fluidStack) { int allowedAmount = 0; - for (FluidStack filterStack : requestList) - { - if (doStacksMatch(filterStack, fluidStack)) - { + for (FluidStack filterStack : requestList) { + if (doStacksMatch(filterStack, fluidStack)) { allowedAmount = Math.min(filterStack.amount, fluidStack.amount); break; } } - if (allowedAmount <= 0) - { + if (allowedAmount <= 0) { return fluidStack; } @@ -113,14 +93,11 @@ public class RoutingFluidFilter implements IFluidFilter copyStack.amount = fluidStack.amount - filledAmount; Iterator itr = requestList.iterator(); - while (itr.hasNext()) - { + while (itr.hasNext()) { FluidStack filterStack = itr.next(); - if (doStacksMatch(filterStack, copyStack)) - { + if (doStacksMatch(filterStack, copyStack)) { filterStack.amount -= filledAmount; - if (filterStack.amount <= 0) - { + if (filterStack.amount <= 0) { itr.remove(); } } @@ -134,13 +111,10 @@ public class RoutingFluidFilter implements IFluidFilter } @Override - public int transferThroughInputFilter(IFluidFilter outputFilter, int maxTransfer) - { - for (FluidStack filterFluidStack : requestList) - { + public int transferThroughInputFilter(IFluidFilter outputFilter, int maxTransfer) { + for (FluidStack filterFluidStack : requestList) { int allowedAmount = Math.min(filterFluidStack.amount, maxTransfer); - if (allowedAmount <= 0) - { + if (allowedAmount <= 0) { continue; } @@ -152,8 +126,7 @@ public class RoutingFluidFilter implements IFluidFilter FluidStack remainderStack = outputFilter.transferStackThroughOutputFilter(drainStack); int drained = remainderStack == null ? copyStack.amount : (copyStack.amount - remainderStack.amount); - if (drained > 0) - { + if (drained > 0) { drainStack.amount = drained; fluidHandler.drain(drainStack, true); @@ -161,14 +134,11 @@ public class RoutingFluidFilter implements IFluidFilter } Iterator itr = requestList.iterator(); - while (itr.hasNext()) - { + while (itr.hasNext()) { FluidStack filterStack = itr.next(); - if (doStacksMatch(filterStack, copyStack)) - { + if (doStacksMatch(filterStack, copyStack)) { filterStack.amount -= drained; - if (filterStack.amount <= 0) - { + if (filterStack.amount <= 0) { itr.remove(); } } @@ -186,12 +156,9 @@ public class RoutingFluidFilter implements IFluidFilter } @Override - public boolean doesStackMatchFilter(FluidStack testStack) - { - for (FluidStack filterStack : requestList) - { - if (doStacksMatch(filterStack, testStack)) - { + public boolean doesStackMatchFilter(FluidStack testStack) { + for (FluidStack filterStack : requestList) { + if (doStacksMatch(filterStack, testStack)) { return true; } } @@ -200,17 +167,14 @@ public class RoutingFluidFilter implements IFluidFilter } @Override - public boolean doStacksMatch(FluidStack filterStack, FluidStack testStack) - { + public boolean doStacksMatch(FluidStack filterStack, FluidStack testStack) { return testStack != null && filterStack.getFluid() == testStack.getFluid(); } @Nullable - public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) - { + public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) { boolean isEmpty = false; - if (inputStack.getCount() == 0) - { + if (inputStack.getCount() == 0) { isEmpty = true; inputStack.setCount(1); } diff --git a/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java index f8b9b137..da0f4d07 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java +++ b/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java @@ -2,8 +2,7 @@ package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; -public interface ISoulBreathContainer -{ +public interface ISoulBreathContainer { double getBreath(ItemStack stack); void setBreath(ItemStack stack, double amount); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 828f2891..4173ca2c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -17,8 +17,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray -{ +public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray { public boolean isActive = false; public int activeCounter = 0; public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; @@ -28,22 +27,18 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche public AlchemyArrayEffect arrayEffect; private boolean doDropIngredients = true; - public TileAlchemyArray() - { + public TileAlchemyArray() { super(2, "alchemyArray"); } - public void onEntityCollidedWithBlock(IBlockState state, Entity entity) - { - if (arrayEffect != null) - { + public void onEntityCollidedWithBlock(IBlockState state, Entity entity) { + if (arrayEffect != null) { arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity); } } @Override - public void deserialize(NBTTagCompound tagCompound) - { + public void deserialize(NBTTagCompound tagCompound) { super.deserialize(tagCompound); this.isActive = tagCompound.getBoolean("isActive"); this.activeCounter = tagCompound.getInteger("activeCounter"); @@ -51,23 +46,20 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche if (!tagCompound.hasKey("doDropIngredients")) //Check if the array is old { this.doDropIngredients = true; - } else - { + } else { this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); } this.rotation = EnumFacing.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; NBTTagCompound arrayTag = tagCompound.getCompoundTag("arrayTag"); arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); - if (arrayEffect != null) - { + if (arrayEffect != null) { arrayEffect.readFromNBT(arrayTag); } } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) - { + public NBTTagCompound serialize(NBTTagCompound tagCompound) { super.serialize(tagCompound); tagCompound.setBoolean("isActive", isActive); tagCompound.setInteger("activeCounter", activeCounter); @@ -76,8 +68,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); NBTTagCompound arrayTag = new NBTTagCompound(); - if (arrayEffect != null) - { + if (arrayEffect != null) { arrayEffect.writeToNBT(arrayTag); } tagCompound.setTag("arrayTag", arrayTag); @@ -86,25 +77,20 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } @Override - public int getInventoryStackLimit() - { + public int getInventoryStackLimit() { return 1; } //Use this to prevent the Array from dropping items - useful for arrays that need to "consume" ingredients well before the effect. - public void setItemDrop(boolean dropItems) - { + public void setItemDrop(boolean dropItems) { this.doDropIngredients = dropItems; } @Override - public void update() - { - if (isActive && attemptCraft()) - { + public void update() { + if (isActive && attemptCraft()) { activeCounter++; - } else - { + } else { isActive = false; doDropIngredients = true; activeCounter = 0; @@ -119,61 +105,48 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche * This occurs when the block is destroyed. */ @Override - public void dropItems() - { - if (arrayEffect == null || doDropIngredients) - { + public void dropItems() { + if (arrayEffect == null || doDropIngredients) { super.dropItems(); } } - public boolean attemptCraft() - { + public boolean attemptCraft() { AlchemyArrayEffect effect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(this.getStackInSlot(0), this.getStackInSlot(1)); - if (effect != null) - { - if (arrayEffect == null) - { + if (effect != null) { + if (arrayEffect == null) { arrayEffect = effect; key = effect.getKey(); - } else - { + } else { String effectKey = effect.getKey(); - if (effectKey.equals(key)) - { + if (effectKey.equals(key)) { //Good! Moving on. - } else - { + } else { //Something has changed, therefore we have to move our stuffs. //TODO: Add an AlchemyArrayEffect.onBreak(); ? arrayEffect = effect; key = effect.getKey(); } } - } else - { + } else { RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(getStackInSlot(0), getStackInSlot(1)); if (recipe == null) return false; AlchemyArrayEffect newEffect = new AlchemyArrayEffectCraftingNew(recipe); - if (arrayEffect == null) - { + if (arrayEffect == null) { arrayEffect = newEffect; key = newEffect.key; - } else if (!newEffect.key.equals(key)) - { + } else if (!newEffect.key.equals(key)) { arrayEffect = newEffect; key = newEffect.key; } } - if (arrayEffect != null) - { + if (arrayEffect != null) { isActive = true; - if (arrayEffect.update(this, this.activeCounter)) - { + if (arrayEffect.update(this, this.activeCounter)) { this.decrStackSize(0, 1); this.decrStackSize(1, 1); this.getWorld().setBlockToAir(getPos()); @@ -186,20 +159,17 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } @Override - public EnumFacing getRotation() - { + public EnumFacing getRotation() { return rotation; } - public void setRotation(EnumFacing rotation) - { + public void setRotation(EnumFacing rotation) { this.rotation = rotation; } @Override @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() - { + public AxisAlignedBB getRenderBoundingBox() { return Block.FULL_BLOCK_AABB.offset(getPos()); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 57d7d8e1..ac701257 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -29,8 +29,7 @@ import org.apache.commons.lang3.ArrayUtils; import java.util.ArrayList; import java.util.List; -public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable -{ +public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable { public static final int orbSlot = 6; public static final int toolSlot = 7; public static final int outputSlot = 8; @@ -41,43 +40,36 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, public int ticksRequired = 1; public BlockPos connectedPos = BlockPos.ORIGIN; - public boolean[] blockedSlots = new boolean[] { false, false, false, false, false, false }; + public boolean[] blockedSlots = new boolean[]{false, false, false, false, false, false}; - public TileAlchemyTable() - { + public TileAlchemyTable() { super(9, "alchemyTable"); } - public void setInitialTableParameters(EnumFacing direction, boolean isSlave, BlockPos connectedPos) - { + public void setInitialTableParameters(EnumFacing direction, boolean isSlave, BlockPos connectedPos) { this.isSlave = isSlave; this.connectedPos = connectedPos; - if (!isSlave) - { + if (!isSlave) { this.direction = direction; } } - public boolean isInvisible() - { + public boolean isInvisible() { return isSlave(); } - public boolean isInputSlotAccessible(int slot) - { + public boolean isInputSlotAccessible(int slot) { return !(slot < 6 && slot >= 0) || !blockedSlots[slot]; } - public void toggleInputSlotAccessible(int slot) - { + public void toggleInputSlotAccessible(int slot) { if (slot < 6 && slot >= 0) blockedSlots[slot] = !blockedSlots[slot]; } @Override - public void deserialize(NBTTagCompound tag) - { + public void deserialize(NBTTagCompound tag) { super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); @@ -93,8 +85,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public NBTTagCompound serialize(NBTTagCompound tag) - { + public NBTTagCompound serialize(NBTTagCompound tag) { super.serialize(tag); tag.setBoolean("isSlave", isSlave); @@ -116,19 +107,14 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, @SuppressWarnings("unchecked") @Override - public T getCapability(Capability capability, EnumFacing facing) - { - if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) - { - if (this.isSlave()) - { + public T getCapability(Capability capability, EnumFacing facing) { + if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + if (this.isSlave()) { TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) - { + if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { return (T) tile.getCapability(capability, facing); } - } else - { + } else { return super.getCapability(capability, facing); } } @@ -137,89 +123,70 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public int[] getSlotsForFace(EnumFacing side) - { - switch (side) - { - case DOWN: - return new int[] { outputSlot }; - case UP: - return new int[] { orbSlot, toolSlot }; - default: - return new int[] { 0, 1, 2, 3, 4, 5 }; + public int[] getSlotsForFace(EnumFacing side) { + switch (side) { + case DOWN: + return new int[]{outputSlot}; + case UP: + return new int[]{orbSlot, toolSlot}; + default: + return new int[]{0, 1, 2, 3, 4, 5}; } } @Override - public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) - { - switch (direction) - { - case DOWN: - return index != outputSlot && index != orbSlot && index != toolSlot; - case UP: - if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) - { - return true; - } else if (index == toolSlot) - { - return false; //TODO: - } else - { - return true; - } - default: - if (this.isSlave) - { - TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) - { - return ((TileAlchemyTable) tile).canInsertItem(index, stack, direction); + public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { + switch (direction) { + case DOWN: + return index != outputSlot && index != orbSlot && index != toolSlot; + case UP: + if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) { + return true; + } else if (index == toolSlot) { + return false; //TODO: + } else { + return true; } - } - return getAccessibleInputSlots(direction).contains(index); + default: + if (this.isSlave) { + TileEntity tile = getWorld().getTileEntity(connectedPos); + if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { + return ((TileAlchemyTable) tile).canInsertItem(index, stack, direction); + } + } + return getAccessibleInputSlots(direction).contains(index); } } @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) - { - switch (direction) - { - case DOWN: - return index == outputSlot; - case UP: - if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) - { - return true; - } else if (index == toolSlot) - { - return true; //TODO: - } else - { - return true; - } - default: - if (this.isSlave) - { - TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) - { - return ((TileAlchemyTable) tile).canExtractItem(index, stack, direction); + public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { + switch (direction) { + case DOWN: + return index == outputSlot; + case UP: + if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) { + return true; + } else if (index == toolSlot) { + return true; //TODO: + } else { + return true; } - } - return getAccessibleInputSlots(direction).contains(index); + default: + if (this.isSlave) { + TileEntity tile = getWorld().getTileEntity(connectedPos); + if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { + return ((TileAlchemyTable) tile).canExtractItem(index, stack, direction); + } + } + return getAccessibleInputSlots(direction).contains(index); } } - public List getAccessibleInputSlots(EnumFacing direction) - { + public List getAccessibleInputSlots(EnumFacing direction) { List list = new ArrayList<>(); - for (int i = 0; i < 6; i++) - { - if (isInputSlotAccessible(i)) - { + for (int i = 0; i < 6; i++) { + if (isInputSlotAccessible(i)) { list.add(i); } } @@ -228,19 +195,15 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public void update() - { - if (isSlave()) - { + public void update() { + if (isSlave()) { return; } List inputList = new ArrayList<>(); - for (int i = 0; i < 6; i++) - { - if (!getStackInSlot(i).isEmpty()) - { + for (int i = 0; i < 6; i++) { + if (!getStackInSlot(i).isEmpty()) { inputList.add(getStackInSlot(i)); } } @@ -249,31 +212,24 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, // special recipes like dying AlchemyTableRecipe recipe = AlchemyTableRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); - if (recipe != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipe.getTierRequired() && this.getContainedLp() >= recipe.getLpDrained()))) - { + if (recipe != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipe.getTierRequired() && this.getContainedLp() >= recipe.getLpDrained()))) { if (burnTime == 1) notifyUpdate(); - if (canCraft(recipe.getRecipeOutput(inputList))) - { + if (canCraft(recipe.getRecipeOutput(inputList))) { ticksRequired = recipe.getTicksRequired(); burnTime++; - if (burnTime == ticksRequired) - { - if (!getWorld().isRemote) - { + if (burnTime == ticksRequired) { + if (!getWorld().isRemote) { int requiredLp = recipe.getLpDrained(); - if (requiredLp > 0) - { - if (!getWorld().isRemote) - { + if (requiredLp > 0) { + if (!getWorld().isRemote) { consumeLp(requiredLp); } } - if (!getWorld().isRemote) - { + if (!getWorld().isRemote) { craftItem(inputList, recipe); } } @@ -282,34 +238,25 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, IBlockState state = getWorld().getBlockState(pos); getWorld().notifyBlockUpdate(getPos(), state, state, 3); - } else if (burnTime > ticksRequired + 10) - { + } else if (burnTime > ticksRequired + 10) { burnTime = 0; } - } else - { + } else { burnTime = 0; } - } else - { // Simple recipes + } else { // Simple recipes RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(inputList); - if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) - { + if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) { if (burnTime == 1) notifyUpdate(); - if (canCraft(recipeAlchemyTable.getOutput())) - { + if (canCraft(recipeAlchemyTable.getOutput())) { ticksRequired = recipeAlchemyTable.getTicks(); burnTime++; - if (burnTime >= ticksRequired) - { - if (!getWorld().isRemote) - { - if (recipeAlchemyTable.getSyphon() > 0) - { - if (consumeLp(recipeAlchemyTable.getSyphon()) < recipeAlchemyTable.getSyphon()) - { + if (burnTime >= ticksRequired) { + if (!getWorld().isRemote) { + if (recipeAlchemyTable.getSyphon() > 0) { + if (consumeLp(recipeAlchemyTable.getSyphon()) < recipeAlchemyTable.getSyphon()) { //There was not enough LP to craft or there was no orb burnTime = 0; notifyUpdate(); @@ -330,8 +277,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, else outputSlotStack.grow(event.getOutput().getCount()); - for (int i = 0; i < 6; i++) - { + for (int i = 0; i < 6; i++) { ItemStack currentStack = getStackInSlot(i); if (currentStack.getItem().hasContainerItem(currentStack)) setInventorySlotContents(i, currentStack.getItem().getContainerItem(currentStack)); @@ -346,20 +292,17 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } } - } else - { + } else { burnTime = 0; } } } - public double getProgressForGui() - { + public double getProgressForGui() { return ((double) burnTime) / ticksRequired; } - private boolean canCraft(ItemStack output) - { + private boolean canCraft(ItemStack output) { ItemStack currentOutputStack = getStackInSlot(outputSlot); if (output.isEmpty()) return false; @@ -371,13 +314,10 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); } - public int getTierOfOrb() - { + public int getTierOfOrb() { ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) - { - if (orbStack.getItem() instanceof IBloodOrb) - { + if (!orbStack.isEmpty()) { + if (orbStack.getItem() instanceof IBloodOrb) { BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); return orb == null ? 0 : orb.getTier(); } @@ -386,16 +326,12 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return 0; } - public int getContainedLp() - { + public int getContainedLp() { ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) - { - if (orbStack.getItem() instanceof IBloodOrb) - { + if (!orbStack.isEmpty()) { + if (orbStack.getItem() instanceof IBloodOrb) { Binding binding = ((IBindable) orbStack.getItem()).getBinding(orbStack); - if (binding == null) - { + if (binding == null) { return 0; } @@ -408,11 +344,9 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return 0; } - public void craftItem(List inputList, AlchemyTableRecipe recipe) - { + public void craftItem(List inputList, AlchemyTableRecipe recipe) { ItemStack outputStack = recipe.getRecipeOutput(inputList); - if (this.canCraft(outputStack)) - { + if (this.canCraft(outputStack)) { ItemStack currentOutputStack = getStackInSlot(outputSlot); ItemStack[] inputs = new ItemStack[0]; @@ -423,11 +357,9 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, MinecraftForge.EVENT_BUS.post(event); outputStack = event.getOutput(); - if (currentOutputStack.isEmpty()) - { + if (currentOutputStack.isEmpty()) { setInventorySlotContents(outputSlot, outputStack); - } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) - { + } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) { currentOutputStack.grow(outputStack.getCount()); } @@ -435,16 +367,12 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } - public int consumeLp(int requested) - { + public int consumeLp(int requested) { ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) - { - if (orbStack.getItem() instanceof IBloodOrb) - { - if (NetworkHelper.syphonFromContainer(orbStack, SoulTicket.item(orbStack, world, pos, requested))) - { + if (!orbStack.isEmpty()) { + if (orbStack.getItem() instanceof IBloodOrb) { + if (NetworkHelper.syphonFromContainer(orbStack, SoulTicket.item(orbStack, world, pos, requested))) { return requested; } } @@ -453,64 +381,52 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, return 0; } - public void consumeInventory(AlchemyTableRecipe recipe) - { + public void consumeInventory(AlchemyTableRecipe recipe) { ItemStack[] input = new ItemStack[6]; - for (int i = 0; i < 6; i++) - { + for (int i = 0; i < 6; i++) { input[i] = getStackInSlot(i); } ItemStack[] result = recipe.getRemainingItems(input); - for (int i = 0; i < 6; i++) - { + for (int i = 0; i < 6; i++) { setInventorySlotContents(i, result[i]); } } - public EnumFacing getDirection() - { + public EnumFacing getDirection() { return direction; } - public boolean isSlave() - { + public boolean isSlave() { return isSlave; } - public int getBurnTime() - { + public int getBurnTime() { return burnTime; } - public int getTicksRequired() - { + public int getTicksRequired() { return ticksRequired; } - public BlockPos getConnectedPos() - { + public BlockPos getConnectedPos() { return connectedPos; } - public boolean[] getBlockedSlots() - { + public boolean[] getBlockedSlots() { return blockedSlots; } - public static int getOrbSlot() - { + public static int getOrbSlot() { return orbSlot; } - public static int getToolSlot() - { + public static int getToolSlot() { return toolSlot; } - public static int getOutputSlot() - { + public static int getOutputSlot() { return outputSlot; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 827e31b0..9d2e5c4e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -12,8 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.MathHelper; -public class TileDemonCrystal extends TileTicking -{ +public class TileDemonCrystal extends TileTicking { public static final double sameWillConversionRate = 50; public static final double defaultWillConversionRate = 100; public static final double timeDelayForWrongWill = 0.6; @@ -25,45 +24,35 @@ public class TileDemonCrystal extends TileTicking public int crystalCount = 1; public EnumFacing placement = EnumFacing.UP; //Side that this crystal is placed on. - public TileDemonCrystal() - { + public TileDemonCrystal() { this.crystalCount = 1; } @Override - public void onUpdate() - { - if (getWorld().isRemote) - { + public void onUpdate() { + if (getWorld().isRemote) { return; } internalCounter++; - if (internalCounter % 20 == 0 && crystalCount < 7) - { + if (internalCounter % 20 == 0 && crystalCount < 7) { EnumDemonWillType type = getType(); double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - if (type != EnumDemonWillType.DEFAULT) - { - if (value >= 0.5) - { + if (type != EnumDemonWillType.DEFAULT) { + if (value >= 0.5) { double nextProgress = getCrystalGrowthPerSecond(value); progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; - } else - { + } else { value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT); - if (value > 0.5) - { + if (value > 0.5) { double nextProgress = getCrystalGrowthPerSecond(value) * timeDelayForWrongWill; progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), EnumDemonWillType.DEFAULT, nextProgress * defaultWillConversionRate, true) / defaultWillConversionRate; } } - } else - { - if (value > 0.5) - { + } else { + if (value > 0.5) { double nextProgress = getCrystalGrowthPerSecond(value); progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; @@ -84,17 +73,14 @@ public class TileDemonCrystal extends TileTicking * Encourages the crystal to grow by a large percentage by telling it to * drain will from the aura. * - * @param willDrain - * The amount of drain that is needed for the crystal to grow - * successfully for the desired amount. Can be more than the base - * amount. + * @param willDrain The amount of drain that is needed for the crystal to grow + * successfully for the desired amount. Can be more than the base + * amount. * @param progressPercentage * @return percentage actually grown. */ - public double growCrystalWithWillAmount(double willDrain, double progressPercentage) - { - if (crystalCount >= 7) - { + public double growCrystalWithWillAmount(double willDrain, double progressPercentage) { + if (crystalCount >= 7) { return 0; } @@ -104,8 +90,7 @@ public class TileDemonCrystal extends TileTicking double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); double percentDrain = willDrain <= 0 ? 1 : Math.min(1, value / willDrain); - if (percentDrain <= 0) - { + if (percentDrain <= 0) { return 0; } @@ -118,15 +103,12 @@ public class TileDemonCrystal extends TileTicking return percentDrain * progressPercentage; } - public EnumDemonWillType getType() - { + public EnumDemonWillType getType() { return EnumDemonWillType.values()[this.getBlockMetadata()]; } - public void checkAndGrowCrystal() - { - if (progressToNextCrystal >= 1 && internalCounter % 100 == 0) - { + public void checkAndGrowCrystal() { + if (progressToNextCrystal >= 1 && internalCounter % 100 == 0) { progressToNextCrystal--; crystalCount++; markDirty(); @@ -134,20 +116,16 @@ public class TileDemonCrystal extends TileTicking } } - public double getMaxWillForCrystal() - { + public double getMaxWillForCrystal() { return 50; } - public boolean dropSingleCrystal() - { - if (!getWorld().isRemote && crystalCount > 1) - { + public boolean dropSingleCrystal() { + if (!getWorld().isRemote && crystalCount > 1) { IBlockState state = getWorld().getBlockState(pos); EnumDemonWillType type = state.getValue(BlockDemonCrystal.TYPE); ItemStack stack = BlockDemonCrystal.getItemStackDropped(type, 1); - if (!stack.isEmpty()) - { + if (!stack.isEmpty()) { crystalCount--; InventoryHelper.spawnItemStack(getWorld(), pos.getX(), pos.getY(), pos.getZ(), stack); notifyUpdate(); @@ -158,19 +136,16 @@ public class TileDemonCrystal extends TileTicking return false; } - public double getCrystalGrowthPerSecond(double will) - { + public double getCrystalGrowthPerSecond(double will) { return 1.0 / 200 * Math.sqrt(will / 200); } - public int getCrystalCountForRender() - { + public int getCrystalCountForRender() { return MathHelper.clamp(crystalCount - 1, 0, 6); } @Override - public void deserialize(NBTTagCompound tag) - { + public void deserialize(NBTTagCompound tag) { holder.readFromNBT(tag, "Will"); crystalCount = tag.getInteger("crystalCount"); placement = EnumFacing.byIndex(tag.getInteger("placement")); @@ -178,8 +153,7 @@ public class TileDemonCrystal extends TileTicking } @Override - public NBTTagCompound serialize(NBTTagCompound tag) - { + public NBTTagCompound serialize(NBTTagCompound tag) { holder.writeToNBT(tag, "Will"); tag.setInteger("crystalCount", crystalCount); tag.setInteger("placement", placement.getIndex()); @@ -187,23 +161,19 @@ public class TileDemonCrystal extends TileTicking return tag; } - public int getCrystalCount() - { + public int getCrystalCount() { return crystalCount; } - public void setCrystalCount(int crystalCount) - { + public void setCrystalCount(int crystalCount) { this.crystalCount = crystalCount; } - public EnumFacing getPlacement() - { + public EnumFacing getPlacement() { return placement; } - public void setPlacement(EnumFacing placement) - { + public void setPlacement(EnumFacing placement) { this.placement = placement; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 0fd56f0c..e462b767 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -11,8 +11,7 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.tile.base.TileTicking; -public class TileDemonCrystallizer extends TileTicking implements IDemonWillConduit -{ +public class TileDemonCrystallizer extends TileTicking implements IDemonWillConduit { public static final int maxWill = 100; public static final double drainRate = 1; public static final double willToFormCrystal = 99; @@ -21,16 +20,13 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond public DemonWillHolder holder = new DemonWillHolder(); public double internalCounter = 0; - public TileDemonCrystallizer() - { + public TileDemonCrystallizer() { } @Override - public void onUpdate() - { - if (getWorld().isRemote) - { + public void onUpdate() { + if (getWorld().isRemote) { return; } @@ -39,15 +35,11 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond { EnumDemonWillType highestType = WorldDemonWillHandler.getHighestDemonWillType(getWorld(), pos); double amount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, highestType); - if (amount >= willToFormCrystal) - { + if (amount >= willToFormCrystal) { internalCounter += getCrystalFormationRate(amount); - if (internalCounter >= totalFormationTime) - { - if (WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, false) >= willToFormCrystal) - { - if (formCrystal(highestType, offsetPos)) - { + if (internalCounter >= totalFormationTime) { + if (WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, false) >= willToFormCrystal) { + if (formCrystal(highestType, offsetPos)) { WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, true); internalCounter = 0; } @@ -57,12 +49,10 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } } - public boolean formCrystal(EnumDemonWillType type, BlockPos position) - { + public boolean formCrystal(EnumDemonWillType type, BlockPos position) { getWorld().setBlockState(position, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal())); TileEntity tile = getWorld().getTileEntity(position); - if (tile instanceof TileDemonCrystal) - { + if (tile instanceof TileDemonCrystal) { ((TileDemonCrystal) tile).setPlacement(EnumFacing.UP); return true; } @@ -70,21 +60,18 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond return false; } - public double getCrystalFormationRate(double currentWill) - { + public double getCrystalFormationRate(double currentWill) { return 1; } @Override - public void deserialize(NBTTagCompound tag) - { + public void deserialize(NBTTagCompound tag) { holder.readFromNBT(tag, "Will"); internalCounter = tag.getDouble("internalCounter"); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) - { + public NBTTagCompound serialize(NBTTagCompound tag) { holder.writeToNBT(tag, "Will"); tag.setDouble("internalCounter", internalCounter); return tag; @@ -93,26 +80,21 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond // IDemonWillConduit @Override - public int getWeight() - { + public int getWeight() { return 10; } @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) - { - if (amount <= 0) - { + public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) { + if (amount <= 0) { return 0; } - if (!canFill(type)) - { + if (!canFill(type)) { return 0; } - if (!doFill) - { + if (!doFill) { return Math.min(maxWill - holder.getWill(type), amount); } @@ -120,17 +102,14 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) - { + public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) { double drained = amount; double current = holder.getWill(type); - if (current < drained) - { + if (current < drained) { drained = current; } - if (doDrain) - { + if (doDrain) { return holder.drainWill(type, amount); } @@ -138,20 +117,17 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } @Override - public boolean canFill(EnumDemonWillType type) - { + public boolean canFill(EnumDemonWillType type) { return true; } @Override - public boolean canDrain(EnumDemonWillType type) - { + public boolean canDrain(EnumDemonWillType type) { return true; } @Override - public double getCurrentWill(EnumDemonWillType type) - { + public double getCurrentWill(EnumDemonWillType type) { return holder.getWill(type); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java index 11b80f2e..ea0558b6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java @@ -42,7 +42,7 @@ public class TileMimic extends TileInventory implements ITickable { public NBTTagCompound tileTag = new NBTTagCompound(); public TileEntity mimicedTile = null; IBlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); - + public int playerCheckRadius = 5; public int potionSpawnRadius = 5; public int potionSpawnInterval = 40; @@ -137,7 +137,7 @@ public class TileMimic extends TileInventory implements ITickable { Utils.insertItemToTile(this, player, 0); ItemStack stack = getStackInSlot(0); - if(stateOfReplacedBlock == Blocks.AIR.getDefaultState()) { + if (stateOfReplacedBlock == Blocks.AIR.getDefaultState()) { if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { Block block = ((ItemBlock) stack.getItem()).getBlock(); stateOfReplacedBlock = block.getDefaultState(); @@ -273,7 +273,7 @@ public class TileMimic extends TileInventory implements ITickable { tag.setInteger("playerCheckRadius", playerCheckRadius); tag.setInteger("potionSpawnRadius", potionSpawnRadius); tag.setInteger("potionSpawnInterval", potionSpawnInterval); - tag.setString("stateOfReplacedBlock",stateOfReplacedBlock.toString()); + tag.setString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); return tag; } @@ -296,11 +296,11 @@ public class TileMimic extends TileInventory implements ITickable { public IBlockState getReplacedState() { return stateOfReplacedBlock; } - + public void setReplacedState(IBlockState state) { stateOfReplacedBlock = state; } - + @Override public boolean isItemValidForSlot(int slot, ItemStack itemstack) { return slot == 0 && dropItemsOnBreak; @@ -312,7 +312,7 @@ public class TileMimic extends TileInventory implements ITickable { replaceMimicWithBlockActual(world, pos, mimic.getStackInSlot(0), mimic.tileTag, mimic.stateOfReplacedBlock); } - + public static boolean replaceMimicWithBlockActual(World world, BlockPos pos, ItemStack stack, NBTTagCompound tileTag, IBlockState replacementState) { if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { Block block = ((ItemBlock) stack.getItem()).getBlock(); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index c1d2007f..fc9552ad 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -29,7 +29,7 @@ public class TilePhantomBlock extends TileTicking { @Override public void onUpdate() { - if(!world.isRemote) { + if (!world.isRemote) { EntityPlayer player = world.getClosestPlayer(getPos().getX(), getPos().getY(), getPos().getZ(), 10.0D, ItemSigilPhantomBridge.IS_PHANTOM_ACTIVE); if (player != null && !player.isSneaking()) return; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index 51318fdc..afbb3410 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -16,8 +16,7 @@ import net.minecraft.world.World; import java.util.*; import java.util.Map.Entry; -public class TileMasterRoutingNode extends TileInventory implements IMasterRoutingNode, ITickable -{ +public class TileMasterRoutingNode extends TileInventory implements IMasterRoutingNode, ITickable { public static final int tickRate = 20; private int currentInput; // A list of connections @@ -26,16 +25,13 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti private List outputNodeList = new LinkedList<>(); private List inputNodeList = new LinkedList<>(); - public TileMasterRoutingNode() - { + public TileMasterRoutingNode() { super(0, "masterRoutingNode"); } @Override - public void update() - { - if (!getWorld().isRemote) - { + public void update() { + if (!getWorld().isRemote) { // currentInput = getWorld().isBlockIndirectlyGettingPowered(pos); currentInput = getWorld().getStrongPower(pos); @@ -50,31 +46,23 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti Map> outputMap = new TreeMap<>(); Map> outputFluidMap = new TreeMap<>(); - for (BlockPos outputPos : outputNodeList) - { + for (BlockPos outputPos : outputNodeList) { TileEntity outputTile = getWorld().getTileEntity(outputPos); - if (this.isConnected(new LinkedList<>(), outputPos)) - { - if (outputTile instanceof IOutputItemRoutingNode) - { + if (this.isConnected(new LinkedList<>(), outputPos)) { + if (outputTile instanceof IOutputItemRoutingNode) { IOutputItemRoutingNode outputNode = (IOutputItemRoutingNode) outputTile; - for (EnumFacing facing : EnumFacing.VALUES) - { - if (!outputNode.isInventoryConnectedToSide(facing) || !outputNode.isOutput(facing)) - { + for (EnumFacing facing : EnumFacing.VALUES) { + if (!outputNode.isInventoryConnectedToSide(facing) || !outputNode.isOutput(facing)) { continue; } IItemFilter filter = outputNode.getOutputFilterForSide(facing); - if (filter != null) - { + if (filter != null) { int priority = outputNode.getPriority(facing); - if (outputMap.containsKey(priority)) - { + if (outputMap.containsKey(priority)) { outputMap.get(priority).add(filter); - } else - { + } else { List filterList = new LinkedList<>(); filterList.add(filter); outputMap.put(priority, filterList); @@ -83,26 +71,20 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - if (outputTile instanceof IOutputFluidRoutingNode) - { + if (outputTile instanceof IOutputFluidRoutingNode) { IOutputFluidRoutingNode outputNode = (IOutputFluidRoutingNode) outputTile; - for (EnumFacing facing : EnumFacing.VALUES) - { - if (!outputNode.isTankConnectedToSide(facing) || !outputNode.isFluidOutput(facing)) - { + for (EnumFacing facing : EnumFacing.VALUES) { + if (!outputNode.isTankConnectedToSide(facing) || !outputNode.isFluidOutput(facing)) { continue; } IFluidFilter filter = outputNode.getOutputFluidFilterForSide(facing); - if (filter != null) - { + if (filter != null) { int priority = outputNode.getPriority(facing); - if (outputFluidMap.containsKey(priority)) - { + if (outputFluidMap.containsKey(priority)) { outputFluidMap.get(priority).add(filter); - } else - { + } else { List filterList = new LinkedList<>(); filterList.add(filter); outputFluidMap.put(priority, filterList); @@ -116,31 +98,23 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti Map> inputMap = new TreeMap<>(); Map> inputFluidMap = new TreeMap<>(); - for (BlockPos inputPos : inputNodeList) - { + for (BlockPos inputPos : inputNodeList) { TileEntity inputTile = getWorld().getTileEntity(inputPos); - if (this.isConnected(new LinkedList<>(), inputPos)) - { - if (inputTile instanceof IInputItemRoutingNode) - { + if (this.isConnected(new LinkedList<>(), inputPos)) { + if (inputTile instanceof IInputItemRoutingNode) { IInputItemRoutingNode inputNode = (IInputItemRoutingNode) inputTile; - for (EnumFacing facing : EnumFacing.VALUES) - { - if (!inputNode.isInventoryConnectedToSide(facing) || !inputNode.isInput(facing)) - { + for (EnumFacing facing : EnumFacing.VALUES) { + if (!inputNode.isInventoryConnectedToSide(facing) || !inputNode.isInput(facing)) { continue; } IItemFilter filter = inputNode.getInputFilterForSide(facing); - if (filter != null) - { + if (filter != null) { int priority = inputNode.getPriority(facing); - if (inputMap.containsKey(priority)) - { + if (inputMap.containsKey(priority)) { inputMap.get(priority).add(filter); - } else - { + } else { List filterList = new LinkedList<>(); filterList.add(filter); inputMap.put(priority, filterList); @@ -149,26 +123,20 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - if (inputTile instanceof IInputFluidRoutingNode) - { + if (inputTile instanceof IInputFluidRoutingNode) { IInputFluidRoutingNode inputNode = (IInputFluidRoutingNode) inputTile; - for (EnumFacing facing : EnumFacing.VALUES) - { - if (!inputNode.isTankConnectedToSide(facing) || !inputNode.isFluidInput(facing)) - { + for (EnumFacing facing : EnumFacing.VALUES) { + if (!inputNode.isTankConnectedToSide(facing) || !inputNode.isFluidInput(facing)) { continue; } IFluidFilter filter = inputNode.getInputFluidFilterForSide(facing); - if (filter != null) - { + if (filter != null) { int priority = inputNode.getPriority(facing); - if (inputFluidMap.containsKey(priority)) - { + if (inputFluidMap.containsKey(priority)) { inputFluidMap.get(priority).add(filter); - } else - { + } else { List filterList = new LinkedList<>(); filterList.add(filter); inputFluidMap.put(priority, filterList); @@ -182,19 +150,14 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti int maxTransfer = this.getMaxTransferForDemonWill(WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT)); int maxFluidTransfer = 1000; - for (Entry> outputEntry : outputMap.entrySet()) - { + for (Entry> outputEntry : outputMap.entrySet()) { List outputList = outputEntry.getValue(); - for (IItemFilter outputFilter : outputList) - { - for (Entry> inputEntry : inputMap.entrySet()) - { + for (IItemFilter outputFilter : outputList) { + for (Entry> inputEntry : inputMap.entrySet()) { List inputList = inputEntry.getValue(); - for (IItemFilter inputFilter : inputList) - { + for (IItemFilter inputFilter : inputList) { maxTransfer -= inputFilter.transferThroughInputFilter(outputFilter, maxTransfer); - if (maxTransfer <= 0) - { + if (maxTransfer <= 0) { return; } } @@ -202,19 +165,14 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - for (Entry> outputEntry : outputFluidMap.entrySet()) - { + for (Entry> outputEntry : outputFluidMap.entrySet()) { List outputList = outputEntry.getValue(); - for (IFluidFilter outputFilter : outputList) - { - for (Entry> inputEntry : inputFluidMap.entrySet()) - { + for (IFluidFilter outputFilter : outputList) { + for (Entry> inputEntry : inputFluidMap.entrySet()) { List inputList = inputEntry.getValue(); - for (IFluidFilter inputFilter : inputList) - { + for (IFluidFilter inputFilter : inputList) { maxFluidTransfer -= inputFilter.transferThroughInputFilter(outputFilter, maxFluidTransfer); - if (maxFluidTransfer <= 0) - { + if (maxFluidTransfer <= 0) { return; } } @@ -223,18 +181,15 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } } - public int getMaxTransferForDemonWill(double will) - { + public int getMaxTransferForDemonWill(double will) { return 64; } @Override - public NBTTagCompound serialize(NBTTagCompound tag) - { + public NBTTagCompound serialize(NBTTagCompound tag) { super.serialize(tag); NBTTagList tags = new NBTTagList(); - for (BlockPos pos : generalNodeList) - { + for (BlockPos pos : generalNodeList) { NBTTagCompound posTag = new NBTTagCompound(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); @@ -244,8 +199,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti tag.setTag(Constants.NBT.ROUTING_MASTER_GENERAL, tags); tags = new NBTTagList(); - for (BlockPos pos : inputNodeList) - { + for (BlockPos pos : inputNodeList) { NBTTagCompound posTag = new NBTTagCompound(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); @@ -255,8 +209,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti tag.setTag(Constants.NBT.ROUTING_MASTER_INPUT, tags); tags = new NBTTagList(); - for (BlockPos pos : outputNodeList) - { + for (BlockPos pos : outputNodeList) { NBTTagCompound posTag = new NBTTagCompound(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); @@ -268,29 +221,25 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public void deserialize(NBTTagCompound tag) - { + public void deserialize(NBTTagCompound tag) { super.deserialize(tag); NBTTagList tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); - for (int i = 0; i < tags.tagCount(); i++) - { + for (int i = 0; i < tags.tagCount(); i++) { NBTTagCompound blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); generalNodeList.add(newPos); } tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_INPUT, 10); - for (int i = 0; i < tags.tagCount(); i++) - { + for (int i = 0; i < tags.tagCount(); i++) { NBTTagCompound blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); inputNodeList.add(newPos); } tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); - for (int i = 0; i < tags.tagCount(); i++) - { + for (int i = 0; i < tags.tagCount(); i++) { NBTTagCompound blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); outputNodeList.add(newPos); @@ -298,16 +247,14 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public boolean isConnected(List path, BlockPos nodePos) - { + public boolean isConnected(List path, BlockPos nodePos) { //TODO: Figure out how to make it so the path is obtained // if (!connectionMap.containsKey(nodePos)) // { // return false; // } TileEntity tile = getWorld().getTileEntity(nodePos); - if (!(tile instanceof IRoutingNode)) - { + if (!(tile instanceof IRoutingNode)) { // connectionMap.remove(nodePos); return false; } @@ -316,22 +263,17 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti List connectionList = node.getConnected(); // List testPath = path.subList(0, path.size()); path.add(nodePos); - for (BlockPos testPos : connectionList) - { - if (path.contains(testPos)) - { + for (BlockPos testPos : connectionList) { + if (path.contains(testPos)) { continue; } - if (testPos.equals(this.getPos()) && node.isConnectionEnabled(testPos)) - { + if (testPos.equals(this.getPos()) && node.isConnectionEnabled(testPos)) { // path.clear(); // path.addAll(testPath); return true; - } else if (NodeHelper.isNodeConnectionEnabled(getWorld(), node, testPos)) - { - if (isConnected(path, testPos)) - { + } else if (NodeHelper.isNodeConnectionEnabled(getWorld(), node, testPos)) { + if (isConnected(path, testPos)) { // path.clear(); // path.addAll(testPath); return true; @@ -343,56 +285,44 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public boolean isConnectionEnabled(BlockPos testPos) - { + public boolean isConnectionEnabled(BlockPos testPos) { return currentInput <= 0; } @Override - public void addNodeToList(IRoutingNode node) - { + public void addNodeToList(IRoutingNode node) { BlockPos newPos = node.getBlockPos(); - if (!generalNodeList.contains(newPos)) - { + if (!generalNodeList.contains(newPos)) { generalNodeList.add(newPos); } - if (node instanceof IInputItemRoutingNode && !inputNodeList.contains(newPos)) - { + if (node instanceof IInputItemRoutingNode && !inputNodeList.contains(newPos)) { inputNodeList.add(newPos); } - if (node instanceof IOutputItemRoutingNode && !outputNodeList.contains(newPos)) - { + if (node instanceof IOutputItemRoutingNode && !outputNodeList.contains(newPos)) { outputNodeList.add(newPos); } } @Override - public void addConnections(BlockPos pos, List connectionList) - { - for (BlockPos testPos : connectionList) - { + public void addConnections(BlockPos pos, List connectionList) { + for (BlockPos testPos : connectionList) { addConnection(pos, testPos); } } @Override - public void addConnection(BlockPos pos1, BlockPos pos2) - { - if (connectionMap.containsKey(pos1) && !connectionMap.get(pos1).contains(pos2)) - { + public void addConnection(BlockPos pos1, BlockPos pos2) { + if (connectionMap.containsKey(pos1) && !connectionMap.get(pos1).contains(pos2)) { connectionMap.get(pos1).add(pos2); - } else - { + } else { List list = new LinkedList<>(); list.add(pos2); connectionMap.put(pos1, list); } - if (connectionMap.containsKey(pos2) && !connectionMap.get(pos2).contains(pos1)) - { + if (connectionMap.containsKey(pos2) && !connectionMap.get(pos2).contains(pos1)) { connectionMap.get(pos2).add(pos1); - } else - { + } else { List list = new LinkedList<>(); list.add(pos1); connectionMap.put(pos2, list); @@ -400,84 +330,69 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public void removeConnection(BlockPos pos1, BlockPos pos2) - { - if (connectionMap.containsKey(pos1)) - { + public void removeConnection(BlockPos pos1, BlockPos pos2) { + if (connectionMap.containsKey(pos1)) { List posList = connectionMap.get(pos1); posList.remove(pos2); - if (posList.isEmpty()) - { + if (posList.isEmpty()) { connectionMap.remove(pos1); } } - if (connectionMap.containsKey(pos2)) - { + if (connectionMap.containsKey(pos2)) { List posList = connectionMap.get(pos2); posList.remove(pos1); - if (posList.isEmpty()) - { + if (posList.isEmpty()) { connectionMap.remove(pos2); } } } @Override - public void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master) - { + public void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master) { return; } @Override - public BlockPos getBlockPos() - { + public BlockPos getBlockPos() { return this.getPos(); } @Override - public List getConnected() - { + public List getConnected() { return new LinkedList<>(); } @Override - public BlockPos getMasterPos() - { + public BlockPos getMasterPos() { return this.getPos(); } @Override - public boolean isMaster(IMasterRoutingNode master) - { + public boolean isMaster(IMasterRoutingNode master) { return false; } @Override - public void addConnection(BlockPos pos1) - { + public void addConnection(BlockPos pos1) { // Empty } @Override - public void removeConnection(BlockPos pos1) - { + public void removeConnection(BlockPos pos1) { generalNodeList.remove(pos1); inputNodeList.remove(pos1); outputNodeList.remove(pos1); } @Override - public void removeAllConnections() - { + public void removeAllConnections() { List list = generalNodeList.subList(0, generalNodeList.size()); Iterator itr = list.iterator(); - while (itr.hasNext()) - { + while (itr.hasNext()) { BlockPos testPos = itr.next(); TileEntity tile = getWorld().getTileEntity(testPos); - if (tile instanceof IRoutingNode) - { + if (tile instanceof IRoutingNode) { ((IRoutingNode) tile).removeConnection(pos); getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(testPos), getWorld().getBlockState(testPos), 3); } diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index b368bf9c..7e5eb83f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -7,10 +7,8 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import java.util.Locale; -public class Constants -{ - public static class NBT - { +public class Constants { + public static class NBT { public static final String OWNER_UUID = "ownerUUID"; public static final String OWNER_NAME = "ownerNAME"; public static final String USES = "uses"; @@ -133,13 +131,11 @@ public class Constants public static final String BREATH = "breath"; } - public static class Mod - { + public static class Mod { public static final String DOMAIN = BloodMagic.MODID.toLowerCase(Locale.ENGLISH) + ":"; } - public static final class Gui - { + public static final class Gui { public static final int TELEPOSER_GUI = 0; public static final int SOUL_FORGE_GUI = 1; public static final int ROUTING_NODE_GUI = 2; @@ -148,8 +144,7 @@ public class Constants public static final int SIGIL_HOLDING_GUI = 5; } - public static class Compat - { + public static class Compat { public static final String JEI_CATEGORY_ALTAR = BloodMagic.MODID + ":altar"; public static final String JEI_CATEGORY_BINDING = BloodMagic.MODID + ":binding"; public static final String JEI_CATEGORY_ALCHEMYARRAY = BloodMagic.MODID + ":alchemyArray"; @@ -166,8 +161,7 @@ public class Constants public static final Item THAUMCRAFT_GOGGLES = ForgeRegistries.ITEMS.getValue(new ResourceLocation("Thaumcraft", "goggles")); } - public static class Misc - { + public static class Misc { public static final int POTION_ARRAY_SIZE = 256; public static final float ALTERED_STEP_HEIGHT = 1.00314159f; public static final int NIGHT_VISION_CONSTANT_BEGIN = 30020; diff --git a/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java b/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java index 920b21de..f035728e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java +++ b/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java @@ -5,8 +5,10 @@ import net.minecraftforge.fluids.FluidStack; public interface ISigilFluidItem { FluidStack getFluid(ItemStack sigil); + int getCapacity(ItemStack sigil); int fill(ItemStack sigil, FluidStack resource, boolean doFill); + FluidStack drain(ItemStack sigil, int maxDrain, boolean doDrain); } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java index aeed6037..1297d964 100644 --- a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java @@ -45,7 +45,7 @@ public class PluginUtil { // Bring core plugin up to top discoveredAnnotations.sort((o1, o2) -> { if (o1.getLeft().getClass() == BloodMagicCorePlugin.class) - return -1; + return -1; return o1.getClass().getCanonicalName().compareToIgnoreCase(o2.getClass().getCanonicalName()); }); @@ -120,8 +120,7 @@ public class PluginUtil { public enum RegistrationStep { PLUGIN_REGISTER(p -> p.getLeft().register(BloodMagicAPI.INSTANCE)), - RECIPE_REGISTER(p -> p.getLeft().registerRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar())) - ; + RECIPE_REGISTER(p -> p.getLeft().registerRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar())); private final Consumer> consumer; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index fda8d9da..bcd12000 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -360,7 +360,7 @@ public class GenericHandler { BindableHelper.applyBinding(held, player); // Bind item to the player } - // If the binding exists, we'll check if the player's name has changed since they last used it and update that if so. + // If the binding exists, we'll check if the player's name has changed since they last used it and update that if so. } else if (binding.getOwnerId().equals(player.getGameProfile().getId()) && !binding.getOwnerName().equals(player.getGameProfile().getName())) { binding.setOwnerName(player.getGameProfile().getName()); BindableHelper.applyBinding(held, binding); @@ -419,9 +419,9 @@ public class GenericHandler { } @SubscribeEvent - public static void onRitualDeath(LivingDropsEvent event){ - if(!ConfigHandler.values.wellOfSufferingDrops){ - if(event.getSource().equals(RitualManager.RITUAL_DAMAGE)) { + public static void onRitualDeath(LivingDropsEvent event) { + if (!ConfigHandler.values.wellOfSufferingDrops) { + if (event.getSource().equals(RitualManager.RITUAL_DAMAGE)) { event.getDrops().clear(); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 6a701a0f..447fffa0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -45,31 +45,24 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class LivingArmourHandler -{ +public class LivingArmourHandler { @SubscribeEvent - public static void onEntityHealed(LivingHealEvent event) - { - if (event.getEntityLiving() instanceof EntityPlayer) - { + public static void onEntityHealed(LivingHealEvent event) { + if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntity(); - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { double modifier = 1; LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.slowHeal", chestStack); - if (upgrade instanceof LivingArmourUpgradeSlowHeal) - { + if (upgrade instanceof LivingArmourUpgradeSlowHeal) { modifier *= ((LivingArmourUpgradeSlowHeal) upgrade).getHealingModifier(); } - if (modifier != 1) - { + if (modifier != 1) { event.setAmount((float) (event.getAmount() * modifier)); } } @@ -78,23 +71,18 @@ public class LivingArmourHandler } @SubscribeEvent - public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) - { + public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { EntityPlayer player = event.getEntityPlayer(); - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { double modifier = 1; - for (LivingArmourUpgrade upgrade : armour.upgradeMap.values()) - { + for (LivingArmourUpgrade upgrade : armour.upgradeMap.values()) { modifier *= upgrade.getMiningSpeedModifier(player); } - if (modifier != 1) - { + if (modifier != 1) { event.setNewSpeed((float) (event.getOriginalSpeed() * modifier)); } } @@ -103,31 +91,24 @@ public class LivingArmourHandler // Applies: Storm Trooper @SubscribeEvent - public static void onEntityJoinedWorld(EntityJoinWorldEvent event) - { + public static void onEntityJoinedWorld(EntityJoinWorldEvent event) { Entity owner = null; - if (event.getEntity() instanceof EntityArrow) - { + if (event.getEntity() instanceof EntityArrow) { owner = ((EntityArrow) event.getEntity()).shootingEntity; - } else if (event.getEntity() instanceof EntityThrowable) - { + } else if (event.getEntity() instanceof EntityThrowable) { owner = ((EntityThrowable) event.getEntity()).getThrower(); } - if (owner instanceof EntityPlayer) - { + if (owner instanceof EntityPlayer) { Entity projectile = event.getEntity(); EntityPlayer player = (EntityPlayer) owner; - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stormTrooper", chestStack); - if (upgrade instanceof LivingArmourUpgradeStormTrooper) - { + if (upgrade instanceof LivingArmourUpgradeStormTrooper) { float velocityModifier = (float) (((LivingArmourUpgradeStormTrooper) upgrade).getArrowJiggle(player) * Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ)); projectile.motionX += 2 * (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; @@ -140,37 +121,28 @@ public class LivingArmourHandler } @SubscribeEvent - public static void onPlayerClick(PlayerInteractEvent event) - { - if (event.isCancelable()) - { + public static void onPlayerClick(PlayerInteractEvent event) { + if (event.isCancelable()) { EntityPlayer player = event.getEntityPlayer(); - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { - if (event.getHand() == EnumHand.OFF_HAND) - { + if (armour != null) { + if (event.getHand() == EnumHand.OFF_HAND) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.crippledArm", chestStack); - if (upgrade instanceof LivingArmourUpgradeCrippledArm) - { + if (upgrade instanceof LivingArmourUpgradeCrippledArm) { event.setCanceled(true); } } - if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) - { + if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) { ItemStack drinkStack = event.getItemStack(); - if (!(drinkStack.getItem() instanceof ItemSplashPotion)) - { + if (!(drinkStack.getItem() instanceof ItemSplashPotion)) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); - if (upgrade instanceof LivingArmourUpgradeQuenched) - { + if (upgrade instanceof LivingArmourUpgradeQuenched) { event.setCanceled(true); } } @@ -182,24 +154,19 @@ public class LivingArmourHandler // Applies: Grim Reaper @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onEntityDeath(LivingDeathEvent event) - { - if (event.getEntityLiving() instanceof EntityPlayer) - { + public static void onEntityDeath(LivingDeathEvent event) { + if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { StatTrackerGrimReaperSprint.incrementCounter(armour); LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.grimReaper", chestStack); - if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint && ((LivingArmourUpgradeGrimReaperSprint) upgrade).canSavePlayer(player)) - { + if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint && ((LivingArmourUpgradeGrimReaperSprint) upgrade).canSavePlayer(player)) { ((LivingArmourUpgradeGrimReaperSprint) upgrade).applyEffectOnRebirth(player); event.setCanceled(true); event.setResult(Event.Result.DENY); @@ -213,26 +180,20 @@ public class LivingArmourHandler // Applies: Jump @SubscribeEvent - public static void onJumpEvent(LivingEvent.LivingJumpEvent event) - { - if (event.getEntityLiving() instanceof EntityPlayer) - { + public static void onJumpEvent(LivingEvent.LivingJumpEvent event) { + if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { StatTrackerJump.incrementCounter(armour); - if (!player.isSneaking()) - { + if (!player.isSneaking()) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.jump", chestStack); - if (upgrade instanceof LivingArmourUpgradeJump) - { + if (upgrade instanceof LivingArmourUpgradeJump) { player.motionY += ((LivingArmourUpgradeJump) upgrade).getJumpModifier(); } } @@ -243,34 +204,25 @@ public class LivingArmourHandler // Applies: Step Assist, Speed Boost @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) - { - if (event.getEntityLiving() instanceof EntityPlayer) - { + public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { + if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); boolean hasAssist = false; - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) - { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { hasAssist = true; player.stepHeight = Constants.Misc.ALTERED_STEP_HEIGHT; - } else - { - if (LivingArmour.hasFullSet(player)) - { + } else { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour != null) - { + if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stepAssist", chestStack); - if (upgrade instanceof LivingArmourUpgradeStepAssist) - { - if (!player.isSneaking()) - { + if (upgrade instanceof LivingArmourUpgradeStepAssist) { + if (!player.isSneaking()) { player.stepHeight = ((LivingArmourUpgradeStepAssist) upgrade).getStepAssist(); hasAssist = true; - } else - { + } else { player.stepHeight = 0.6F; } } @@ -283,31 +235,26 @@ public class LivingArmourHandler float percentIncrease = 0; - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour != null) - { + if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.movement", chestStack); - if (upgrade instanceof LivingArmourUpgradeSpeed) - { + if (upgrade instanceof LivingArmourUpgradeSpeed) { percentIncrease += ((LivingArmourUpgradeSpeed) upgrade).getSpeedModifier(); } } } - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) - { + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); { percentIncrease += (i + 1) * 0.5f; } } - if (percentIncrease > 0 && (player.onGround || player.capabilities.isFlying) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0)) - { + if (percentIncrease > 0 && (player.onGround || player.capabilities.isFlying) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0)) { player.travel(player.moveStrafing * percentIncrease, 0, player.moveForward * percentIncrease); } } @@ -316,8 +263,7 @@ public class LivingArmourHandler // Applies: Arrow Shot // Tracks: Arrow Shot @SubscribeEvent - public static void onArrowFire(ArrowLooseEvent event) - { + public static void onArrowFire(ArrowLooseEvent event) { World world = event.getEntityPlayer().getEntityWorld(); ItemStack stack = event.getBow(); EntityPlayer player = event.getEntityPlayer(); @@ -326,17 +272,14 @@ public class LivingArmourHandler if (world.isRemote) return; - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { StatTrackerArrowShot.incrementCounter(armour); LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.arrowShot", chestStack); - if (upgrade instanceof LivingArmourUpgradeArrowShot) - { + if (upgrade instanceof LivingArmourUpgradeArrowShot) { int charge = event.getCharge(); float velocity = (float) charge / 20.0F; velocity = (velocity * velocity + velocity * 2.0F) / 3.0F; @@ -350,8 +293,7 @@ public class LivingArmourHandler sentientShot = true; } int extraArrows = ((LivingArmourUpgradeArrowShot) upgrade).getExtraArrows(); - for (int n = 0; n < extraArrows; n++) - { + for (int n = 0; n < extraArrows; n++) { ItemStack arrowStack = new ItemStack(Items.ARROW); ItemArrow itemarrow = (ItemArrow) ((stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW)); EntityArrow entityarrow; @@ -392,21 +334,19 @@ public class LivingArmourHandler } } } - } + } + // Applies: Softfall @SubscribeEvent public static void onPlayerFall(LivingFallEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) - { + if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if (LivingArmour.hasFullSet(player)) - { + if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) - { + if (armour != null) { StatTrackerFallProtect.incrementCounter(armour, event.getDamageMultiplier() * (event.getDistance() - 3)); LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.fallProtect", chestStack); if (upgrade instanceof LivingArmourUpgradeFallProtect) { @@ -417,17 +357,14 @@ public class LivingArmourHandler } } } - + // Applies: Arrow Shot @SubscribeEvent - public static void onProjectileImpact(ProjectileImpactEvent.Arrow event) - { - if (event.getArrow().removeTag("arrow_shot")) - { + public static void onProjectileImpact(ProjectileImpactEvent.Arrow event) { + if (event.getArrow().removeTag("arrow_shot")) { Entity entity = event.getRayTraceResult().entityHit; - if (entity != null) - { + if (entity != null) { entity.hurtResistantTime = 0; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java index 559690ee..5059d631 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java @@ -21,7 +21,7 @@ public class IncenseHelper { data.setDouble(Constants.NBT.CURRENT_INCENSE, amount); } - public static void setMaxIncense(EntityPlayer player, double amount){ + public static void setMaxIncense(EntityPlayer player, double amount) { NBTTagCompound data = player.getEntityData(); data.setDouble(Constants.NBT.MAX_INCENSE, amount); } @@ -38,6 +38,7 @@ public class IncenseHelper { stack = NBTHelper.checkNBT(stack); stack.getTagCompound().setBoolean(Constants.NBT.HAS_MAX_INCENSE, isMax); } + public static boolean getHasMaxIncense(ItemStack stack) { stack = NBTHelper.checkNBT(stack); return stack.getTagCompound().getBoolean(Constants.NBT.HAS_MAX_INCENSE); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index bd79a435..c87b8209 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -115,12 +115,11 @@ public class NetworkHelper { /** * Syphons a player from within a container. * - * @param stack - ItemStack in the Container. - * @param ticket - SoulTicket to syphon + * @param stack - ItemStack in the Container. + * @param ticket - SoulTicket to syphon * @return - If the syphon was successful. */ - public static boolean syphonFromContainer(ItemStack stack, SoulTicket ticket) - { + public static boolean syphonFromContainer(ItemStack stack, SoulTicket ticket) { if (!(stack.getItem() instanceof IBindable)) return false; @@ -131,7 +130,7 @@ public class NetworkHelper { SoulNetwork network = getSoulNetwork(binding); SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, ticket, stack); - return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(),true) >= ticket.getAmount(); + return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(), true) >= ticket.getAmount(); } /** diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java index 1fc54b05..6498132d 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java @@ -35,7 +35,7 @@ public class PlayerSacrificeHelper { amount = amount + Math.min(increment, incenseAddition - amount); setPlayerIncense(player, amount); - if(amount == incenseAddition) { + if (amount == incenseAddition) { IncenseHelper.setMaxIncense(player, incenseAddition); } // System.out.println("Amount of incense: " + amount + ", Increment: " + From f832103386b9afbc9a5a47ecd795abfda9f74e76 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 14 Apr 2019 08:23:02 -0700 Subject: [PATCH 306/493] Fix state parsing (#1573) --- .../WayofTime/bloodmagic/util/StateUtil.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java index 03dce756..5c3d35b9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java @@ -8,30 +8,31 @@ import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; -public class StateUtil -{ - public static IBlockState parseState(String blockInfo) - { - String[] split = blockInfo.split("\\["); - split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state +public class StateUtil { + public static IBlockState parseState(String state) { + if (state.contains("[")) { + String[] split = state.split("\\["); + split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block - if (block == Blocks.AIR) - return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); + if (block == Blocks.AIR) + return block.getDefaultState(); - BlockStateContainer blockState = block.getBlockState(); - IBlockState returnState = blockState.getBaseState(); + BlockStateContainer blockState = block.getBlockState(); + IBlockState returnState = blockState.getBaseState(); - // Force our values into the state - String[] stateValues = split[1].split(","); // Splits up each value - for (String value : stateValues) - { - String[] valueSplit = value.split("="); // Separates property and value - IProperty property = blockState.getProperty(valueSplit[0]); - if (property != null) - returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state + // Force our values into the state + String[] stateValues = split[1].split(","); // Splits up each value + for (String value : stateValues) { + String[] valueSplit = value.split("="); + IProperty property = blockState.getProperty(valueSplit[0]); + if (property != null) + returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); + } + + return returnState; + } else { + return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(state)).getDefaultState(); } - - return returnState; } } \ No newline at end of file From eec64695b5e0f21d3df237aee07d8be628d4bd9c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 14 Apr 2019 08:28:46 -0700 Subject: [PATCH 307/493] Fix Blood Letter's Pack and Coat of Arms passing the wrong hand (#1582) --- .../WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java | 4 ++-- .../WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 2033e618..9c01900b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -44,13 +44,13 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I RayTraceResult rayTrace = this.rayTrace(world, player, false); if (rayTrace == null) { - return super.onItemRightClick(world, player, EnumHand.MAIN_HAND); + return super.onItemRightClick(world, player, hand); } else { if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); if (!(tile instanceof IBloodAltar)) - return super.onItemRightClick(world, player, EnumHand.MAIN_HAND); + return super.onItemRightClick(world, player, hand); LPContainer.tryAndFillAltar((IBloodAltar) tile, stack, world, rayTrace.getBlockPos()); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 15508082..cc15fe1f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -60,13 +60,13 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato RayTraceResult position = this.rayTrace(world, player, false); if (position == null) { - return super.onItemRightClick(world, player, EnumHand.MAIN_HAND); + return super.onItemRightClick(world, player, hand); } else { if (position.typeOfHit == RayTraceResult.Type.BLOCK) { TileEntity tile = world.getTileEntity(position.getBlockPos()); if (!(tile instanceof IBloodAltar)) - return super.onItemRightClick(world, player, EnumHand.MAIN_HAND); + return super.onItemRightClick(world, player, hand); LPContainer.tryAndFillAltar((IBloodAltar) tile, stack, world, position.getBlockPos()); } From 7c767b3bbf13805b7a9e180cbd19b702f2e16371 Mon Sep 17 00:00:00 2001 From: Phil Date: Sun, 14 Apr 2019 11:29:51 -0400 Subject: [PATCH 308/493] Stop insertions into Demon Crucible if the inventory is not empty (#1567) --- src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 7685e0fc..52ff0be5 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -204,7 +204,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo @Override public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { - return !stack.isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill); + return !stack.isEmpty() && inventory.get(0).isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill); } @Override From 572d8eff4f44bfc89e7f4b6219b03a5b4d58dac8 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Sun, 14 Apr 2019 15:38:17 +0000 Subject: [PATCH 309/493] Possible fix to (many of the) abnormal death events concerning the sacrificial Dagger (#1554) * Possible fix to (many of the) abnormal death events concerning the sacrifical dagger. => #1444 Works with Grim Reaper's Sprint, not tested for anything else. * Being special, players can survive massive blood loss up until 1 heart remains. (Math.floor() caused players to die when they sacrificed with 3 health remaining) --- .../bloodmagic/item/ItemSacrificialDagger.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 5410758f..a67cbced 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -94,14 +94,16 @@ public class ItemSacrificialDagger extends ItemEnum Date: Sun, 14 Apr 2019 08:48:47 -0700 Subject: [PATCH 310/493] Fix incompatibility with Unmending mod (#1566) --- .../bloodmagic/util/handler/event/GenericHandler.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index bcd12000..d1431db8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -78,6 +78,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -433,10 +434,12 @@ public class GenericHandler { EntityPlayer player = event.getEntityPlayer(); ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantments.MENDING, player); - if (!itemstack.isEmpty() && itemstack.isItemDamaged()) { - int i = Math.min(xpToDurability(event.getOrb().xpValue), itemstack.getItemDamage()); - event.getOrb().xpValue -= durabilityToXp(i); - itemstack.setItemDamage(itemstack.getItemDamage() - i); + if (Loader.isModLoaded("unmending")) { + if (!itemstack.isEmpty() && itemstack.isItemDamaged()) { + int i = Math.min(xpToDurability(event.getOrb().xpValue), itemstack.getItemDamage()); + event.getOrb().xpValue -= durabilityToXp(i); + itemstack.setItemDamage(itemstack.getItemDamage() - i); + } } if (!player.getEntityWorld().isRemote) { From f997aee8917176d39d92bd80aea1ff6cbcc452fb Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 14 Apr 2019 08:49:26 -0700 Subject: [PATCH 311/493] Fix crash on world unload Don't know how to reproduce, but this will make sure we don't call clear on null --- .../util/handler/event/GenericHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index d1431db8..7d094f3e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -475,11 +475,11 @@ public class GenericHandler { @SubscribeEvent public static void onWorldUnload(WorldEvent.Unload event) { World world = event.getWorld(); - bounceMapMap.get(world).clear(); - filledHandMapMap.get(world).clear(); - attackTaskMapMap.get(world).clear(); - targetTaskMapMap.get(world).clear(); - PotionEventHandlers.flightListMap.get(world).clear(); - PotionEventHandlers.noGravityListMap.get(world).clear(); + bounceMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + filledHandMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + attackTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + targetTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + PotionEventHandlers.flightListMap.getOrDefault(world, Collections.emptyList()).clear(); + PotionEventHandlers.noGravityListMap.getOrDefault(world, Collections.emptyList()).clear(); } } From 73d2459c6c92f53a71e5504a383d22c7d74abae7 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 14 Apr 2019 08:59:21 -0700 Subject: [PATCH 312/493] angery --- .../WayofTime/bloodmagic/util/handler/event/GenericHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 7d094f3e..09416dcf 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -434,7 +434,7 @@ public class GenericHandler { EntityPlayer player = event.getEntityPlayer(); ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantments.MENDING, player); - if (Loader.isModLoaded("unmending")) { + if (!Loader.isModLoaded("unmending")) { if (!itemstack.isEmpty() && itemstack.isItemDamaged()) { int i = Math.min(xpToDurability(event.getOrb().xpValue), itemstack.getItemDamage()); event.getOrb().xpValue -= durabilityToXp(i); From 21f3b9047cd238d045df61c94866e3e62d74f2c9 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Thu, 25 Apr 2019 07:09:15 +0000 Subject: [PATCH 313/493] Made teleposers a bit more foolproof (#1592) Fixed an issue where a teleposer that somehow got filled with nasty items would crash on tick because the teleposer throws a fit at that nasty item. --- src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index d3c7caf3..b9d665e8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -49,7 +49,7 @@ public class TileTeleposer extends TileInventory implements ITickable { @Override public void update() { - if (!getWorld().isRemote) { + if (!getWorld().isRemote && canInitiateTeleport()) { int currentInput = getWorld().getStrongPower(pos); if (previousInput == 0 && currentInput != 0) { From 0090ec0a567b71a83ec329db8ab58d070f90efc6 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 15:03:49 +0000 Subject: [PATCH 314/493] Lava will not replaced with lava anymore unless it's flowing lava. (#1599) * Lava will not replaced with lava anymore unless it's flowing lava. * Fixed Flowing Liquid detection * Removed unnecessary function arguments --- .../WayofTime/bloodmagic/ritual/types/RitualLava.java | 10 +++++----- src/main/java/WayofTime/bloodmagic/util/Utils.java | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index d9c67d1a..2bddc06b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -85,7 +85,7 @@ public class RitualLava extends Ritual { for (BlockPos newPos : lavaRange.getContainedPositions(pos)) { IBlockState state = world.getBlockState(newPos); - if (world.isAirBlock(newPos) || Utils.isFlowingLiquid(world, newPos, state)) { + if (world.isAirBlock(newPos) || Utils.isFlowingLiquid(state)) { int lpCost = getLPCostForRawWill(rawWill); if (currentEssence < lpCost) { break; diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 90f1d312..26a42fa4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.iface.IDemonWillViewer; -import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; +import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; import WayofTime.bloodmagic.tile.TileInventory; +import WayofTime.bloodmagic.util.helper.NBTHelper; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import net.minecraft.block.Block; -import net.minecraft.block.BlockLiquid; import net.minecraft.block.BlockPortal; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; @@ -42,7 +41,6 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -799,9 +797,9 @@ public class Utils { return (state instanceof IFluidBlock || state.getMaterial().isLiquid()); } - public static boolean isFlowingLiquid(World world, BlockPos pos, IBlockState state) { + public static boolean isFlowingLiquid(IBlockState state) { Block block = state.getBlock(); - return ((block instanceof IFluidBlock && Math.abs(((IFluidBlock) block).getFilledPercentage(world, pos)) == 1) || (block instanceof BlockLiquid && block.getMetaFromState(state) != 0)); + return isBlockLiquid(state) && !(state == block.getDefaultState()); } public static boolean spawnStackAtBlock(World world, BlockPos pos, @Nullable EnumFacing pushDirection, ItemStack stack) { From bf35baac77363fa5ccd06134ef89258a78b230ad Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 15:34:04 +0000 Subject: [PATCH 315/493] Improved Compression Sigil performance & fixed leftover eating bug (#1603) * Performance improvements, small cleanup * Moved the saved stacks to class scope to have an actual effect. * Variable scope change (no effect) * Saving known recipes to a Map in CompressionRegistry now, allowing quick lookup as long as the server has not been restarted for all but the first compression recipe of every itemstack type encountered. Fixed compression process consuming items even though the compression would not finish. --- .../compress/AdvancedCompressionHandler.java | 96 +++--------- .../compress/CompressionHandler.java | 23 ++- .../compress/CompressionRegistry.java | 22 ++- .../compress/StorageBlockCraftingManager.java | 146 ++++++++++-------- 4 files changed, 135 insertions(+), 152 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index b5d78913..e2dc02d1 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -1,86 +1,12 @@ package WayofTime.bloodmagic.compress; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.Tuple; import net.minecraft.world.World; public class AdvancedCompressionHandler extends CompressionHandler { - private static InventoryCrafting[] inventoryCrafting = { - new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, - 3, 3), - new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, - 2, 2), - new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, - 1, 1) - - }; - - private static ItemStack reversibleCheck; - - public static boolean isResultStackReversible(ItemStack stack, World world) { - if (stack.isEmpty()) { - return false; - } - - inventoryCrafting[2].setInventorySlotContents(0, stack); - ItemStack returnStack = getNNRecipeOutput(inventoryCrafting[2], world); - - return !returnStack.isEmpty() && CompressionRegistry.areItemStacksEqual(reversibleCheck, returnStack); - } - - public static ItemStack getRecipe(ItemStack stack, World world, int gridSize) { - StorageBlockCraftingManager craftingManagerSB = StorageBlockCraftingManager.getInstance(); - InventoryCrafting inventory = inventoryCrafting[3 - gridSize]; - for (int i = 0; i < inventory.getSizeInventory(); i++) { - inventory.setInventorySlotContents(i, stack); - } - ItemStack notEmptyRecipe = craftingManagerSB.findMatchingRecipe(inventory, world); - if (!notEmptyRecipe.isEmpty()) { - return notEmptyRecipe; - } - ItemStack result = getNNRecipeOutput(inventory, world); - - if (isResultStackReversible(result, world)) { - craftingManagerSB.addRecipe(CraftingManager.findMatchingRecipe(inventory, world)); - return result; - } - return ItemStack.EMPTY; - } - - public static ItemStack getNNRecipeOutput(InventoryCrafting inventory, World world) { - IRecipe checkForNull = CraftingManager.findMatchingRecipe(inventory, world); - if (checkForNull != null) { - return checkForNull.getRecipeOutput(); - } - return ItemStack.EMPTY; - } - - public static ItemStack get22Recipe(ItemStack stack, World world) { - return getRecipe(stack, world, 2); - } - - public static ItemStack get33Recipe(ItemStack stack, World world) { - return getRecipe(stack, world, 3); - } - public ItemStack compressInventory(ItemStack[] inv, World world) { for (ItemStack invStack : inv) { if (invStack.isEmpty()) { @@ -88,12 +14,26 @@ public class AdvancedCompressionHandler extends CompressionHandler { } for (int i = 3; i >= 2; i--) { - reversibleCheck = invStack; - ItemStack stack = getRecipe(invStack, world, i); + ItemStack invStackCopy = invStack.copy(); + invStackCopy.setCount(1); + Tuple stackTuple = CompressionRegistry.compressionMap.get(invStackCopy); + ItemStack stack; + if (stackTuple == null) { + StorageBlockCraftingManager.reversibleCheck = invStack; + stack = StorageBlockCraftingManager.getRecipe(invStack, world, i); + if (stack.isEmpty()) + continue; + CompressionRegistry.compressionMap.put(invStackCopy, new Tuple<>(stack, i * i)); + } else { + stack = stackTuple.getFirst(); + if (stackTuple.getSecond() != i * i) + return ItemStack.EMPTY; + } + if (!stack.isEmpty()) { int needed = (i == 2 ? 4 : 9); - int remaining = iterateThroughInventory(invStack, invStack.getMaxStackSize() - needed, inv, needed, true); // if more than needed gets consumed at any point, the simulate test was needed after all + int remaining = iterateThroughInventory(invStack, CompressionRegistry.getItemThreshold(invStack, needed), inv, needed, true); if (remaining <= 0) return stack; } diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java index 2cd74d14..715a7b19 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java @@ -3,6 +3,9 @@ package WayofTime.bloodmagic.compress; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import java.util.HashSet; +import java.util.Set; + public abstract class CompressionHandler { /** * Called to look at the inventory and syphons the required stack. Returns @@ -14,7 +17,9 @@ public abstract class CompressionHandler { public abstract ItemStack compressInventory(ItemStack[] inv, World world); public int iterateThroughInventory(ItemStack required, int kept, ItemStack[] inv, int needed, boolean doDrain) { + int oldNeeded = needed; int i = -1; + Set consumeSet = new HashSet<>(); for (ItemStack invStack : inv) { i++; @@ -31,26 +36,32 @@ public abstract class CompressionHandler { used += stackSize - remainingFromStack; } - kept -= used; // 0 + kept -= used; if (kept <= 0 && needed > 0) { int remainingFromStack = Math.max(stackSize - used - needed, 0); - if (doDrain) { + needed -= (stackSize - used - remainingFromStack); + if (needed != 0 && needed < oldNeeded) { + consumeSet.add(i); + } + + if (doDrain && (!(needed < oldNeeded) || needed == 0)) { invStack.setCount(remainingFromStack + used); + for (Integer j : consumeSet) { + inv[j].setCount(0); + inv[j] = ItemStack.EMPTY; + } + consumeSet.clear(); if (invStack.isEmpty()) { inv[i] = ItemStack.EMPTY; } } - - needed -= (stackSize - used - remainingFromStack); } - if (needed <= 0) { return 0; } } } - return needed; diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java index 8c10fa3a..fb1de055 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Tuple; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -18,8 +19,9 @@ import java.util.Map; * form. */ public class CompressionRegistry { - public static List compressionRegistry = new ArrayList<>(); + private static List compressionRegistry = new ArrayList<>(); public static Map thresholdMap = new HashMap<>(); + static Map> compressionMap = new HashMap<>(); public static void registerHandler(CompressionHandler handler) { compressionRegistry.add(handler); @@ -77,10 +79,24 @@ public class CompressionRegistry { return Pair.of(ItemStack.EMPTY, false); } - public static int getItemThreshold(ItemStack stack) { - return stack.getItem().getItemStackLimit(stack); //this should work according to the guide, leaving behind a full stack of the source item (unless otherwise specified with a BaseCompressionHandler recipe) + + public static int getItemThreshold(ItemStack stack, int needed) { + Integer threshold = thresholdMap.get(stack); + if (threshold != null) + return threshold; + else + return stack.getMaxStackSize() - needed; } + public static int getItemThreshold(ItemStack stack) { + Integer threshold = thresholdMap.get(stack); + if (threshold != null) + return threshold; + else + return stack.getMaxStackSize(); + } + + public static boolean areItemStacksEqual(ItemStack stack, ItemStack compressedStack) { return stack.isItemEqual(compressedStack) && (stack.getTagCompound() == null ? !compressedStack.hasTagCompound() : stack.getTagCompound().equals(compressedStack.getTagCompound())); } diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index cfe039c1..71b6120e 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -6,15 +6,89 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import java.util.LinkedList; -import java.util.List; +import java.util.HashSet; +import java.util.Set; public class StorageBlockCraftingManager { private static final StorageBlockCraftingManager instance = new StorageBlockCraftingManager(); - private List recipes = new LinkedList<>(); + private static InventoryCrafting[] inventoryCrafting = { + new InventoryCrafting(new Container() { + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, + 3, 3), + new InventoryCrafting(new Container() { + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, + 2, 2), + new InventoryCrafting(new Container() { + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, + 1, 1) + + }; + static ItemStack reversibleCheck; + private HashSet recipes = new HashSet<>(); // TODO: Clear when recipes are reloaded in 1.14 + private Set blacklist = new HashSet<>(); + + public static boolean isResultStackReversible(ItemStack stack, World world) { + if (stack.isEmpty()) { + return false; + } + + inventoryCrafting[2].setInventorySlotContents(0, stack); + ItemStack returnStack = getNNRecipeOutput(inventoryCrafting[2], world); + + return !returnStack.isEmpty() && CompressionRegistry.areItemStacksEqual(reversibleCheck, returnStack); + } + + public static ItemStack getRecipe(ItemStack stack, World world, int gridSize) { + StorageBlockCraftingManager craftingManagerSB = getInstance(); + if (craftingManagerSB.blacklist.contains(stack)) { + return ItemStack.EMPTY; + } + InventoryCrafting inventory = inventoryCrafting[3 - gridSize]; + for (int i = 0; i < inventory.getSizeInventory(); i++) { + inventory.setInventorySlotContents(i, stack); + } + ItemStack notEmptyRecipe = craftingManagerSB.findMatchingRecipe(inventory, world); + if (!notEmptyRecipe.isEmpty()) { + return notEmptyRecipe; + } + ItemStack result = getNNRecipeOutput(inventory, world); + + if (isResultStackReversible(result, world)) { + craftingManagerSB.addRecipe(CraftingManager.findMatchingRecipe(inventory, world)); + return result; + } + craftingManagerSB.blacklist.add(stack); + return ItemStack.EMPTY; + } + + public static ItemStack getNNRecipeOutput(InventoryCrafting inventory, World world) { + IRecipe checkForNull = CraftingManager.findMatchingRecipe(inventory, world); + if (checkForNull != null) { + return checkForNull.getRecipeOutput(); + } + return ItemStack.EMPTY; + } + + public static ItemStack get22Recipe(ItemStack stack, World world) { + return getRecipe(stack, world, 2); + } + + public static ItemStack get33Recipe(ItemStack stack, World world) { + return getRecipe(stack, world, 3); + } public void addRecipe(IRecipe recipe) { this.recipes.add(recipe); @@ -32,7 +106,7 @@ public class StorageBlockCraftingManager { return this.findMatchingRecipe(craftingInventory, world, this.recipes); } - private ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world, List list) { + private ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world, HashSet list) { int i = 0; ItemStack itemstack = ItemStack.EMPTY; ItemStack itemstack1 = ItemStack.EMPTY; @@ -67,11 +141,10 @@ public class StorageBlockCraftingManager { return new ItemStack(itemstack.getItem(), 1, i1); } else { - for (j = 0; j < list.size(); ++j) { - IRecipe irecipe = list.get(j); + for (IRecipe iRecipe : list) { - if (irecipe.matches(craftingInventory, world)) { - return irecipe.getCraftingResult(craftingInventory); + if (iRecipe.matches(craftingInventory, world)) { + return iRecipe.getCraftingResult(craftingInventory); } } @@ -83,62 +156,5 @@ public class StorageBlockCraftingManager { return instance; } - private static boolean isResultStackReversible(ItemStack stack, int gridSize, World world, List list) { - if (stack.isEmpty()) { - return false; - } - InventoryCrafting inventory = new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, 2, 2); - inventory.setInventorySlotContents(0, stack); - - ItemStack returnStack = StorageBlockCraftingManager.getInstance().findMatchingRecipe(inventory, world, list); - if (returnStack.isEmpty()) { - return false; - } - - ItemStack compressedStack = ItemStack.EMPTY; - switch (gridSize) { - case 2: - compressedStack = get22Recipe(returnStack, world, list); - break; - case 3: - compressedStack = get33Recipe(returnStack, world, list); - break; - } - - return !compressedStack.isEmpty() && CompressionRegistry.areItemStacksEqual(stack, compressedStack); - } - - private static ItemStack getRecipe(ItemStack stack, World world, int gridSize, List list) { - InventoryCrafting inventory = new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { - return false; - } - }, gridSize, gridSize); - for (int i = 0; i < inventory.getSizeInventory(); i++) { - inventory.setInventorySlotContents(i, stack); - } - - return StorageBlockCraftingManager.getInstance().findMatchingRecipe(inventory, world, list); - } - - private static boolean has22Recipe(ItemStack stack, World world, List list) { - return !get22Recipe(stack, world, list).isEmpty(); - } - - private static ItemStack get22Recipe(ItemStack stack, World world, List list) { - return getRecipe(stack, world, 2, list); - } - - private static boolean has33Recipe(ItemStack stack, World world, List list) { - return !get33Recipe(stack, world, list).isEmpty(); - } - - private static ItemStack get33Recipe(ItemStack stack, World world, List list) { - return getRecipe(stack, world, 3, list); - } } From 7f5a5a24ff3238dbf7211d2ed75d9f7e10aa9ba3 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 15:35:38 +0000 Subject: [PATCH 316/493] Veil of Evil & Ward of Sacrosanctity (#1578) * Veil of Evil class creation Signed-off-by: tobias * Transplanted legacy code. * VeilOfEvil and WardOfSacrosanctity base finished. Added isActive() to IMasterRitualStone * Renaming, commented out arimethric error * make it static to make it work * removed sout & renamed rituals * Finished up base Veil of Evil & Ward of Sacrosanctity. Temporarily removed Gaia's Transformation. --- .../compat/guideapi/book/CategoryRitual.java | 2 + .../bloodmagic/ritual/IMasterRitualStone.java | 2 + .../ritual/types/RitualVeilOfEvil.java | 102 +++++++++++++++++ .../types/RitualWardOfSacrosanctity.java | 105 ++++++++++++++++++ .../util/handler/event/GenericHandler.java | 83 ++++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 2 + .../assets/bloodmagicguide/lang/en_US.lang | 12 +- 7 files changed, 304 insertions(+), 4 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java create mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index d94d2717..35a2adb3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -131,6 +131,8 @@ public class CategoryRitual addRitualPagesToEntries("condor", entries); addRitualPagesToEntries("featheredEarth", entries); addRitualPagesToEntries("grounding", entries); + addRitualPagesToEntries("veilOfEvil", entries); + addRitualPagesToEntries("wardOfSacrosanctity", entries); for (Entry entry : entries.entrySet()) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index 6ed5924b..1ce20d8b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -33,6 +33,8 @@ public interface IMasterRitualStone { void setCooldown(int cooldown); + boolean isActive(); + void setActive(boolean active); EnumFacing getDirection(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java new file mode 100644 index 00000000..df962827 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java @@ -0,0 +1,102 @@ +package WayofTime.bloodmagic.ritual.types; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.handler.event.GenericHandler; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +@RitualRegister("veil_of_evil") +public class RitualVeilOfEvil extends Ritual { + public static final String VEIL_RANGE = "veilRange"; + + public RitualVeilOfEvil() { + super("ritualVeilOfEvil", 0, 40000, "ritual." + BloodMagic.MODID + ".veilOfEvilRitual"); + addBlockRange(VEIL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-16, 0, -16), 33)); + setMaximumVolumeAndDistanceOfRange(VEIL_RANGE, 0, 256, 256); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) { + /* Default Ritual Stuff */ + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + BlockPos pos = masterRitualStone.getBlockPos(); + + if (currentEssence < getRefreshCost()) { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + // int maxEffects = currentEssence / getRefreshCost(); + // int totalEffects = 0; + + /* Default will augment stuff */ + List willConfig = masterRitualStone.getActiveWillConfig(); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); + + double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); + double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); + double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); + double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); + double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); + + double rawDrained = 0; + double corrosiveDrained = 0; + double destructiveDrained = 0; + double steadfastDrained = 0; + double vengefulDrained = 0; + + /* Actual ritual stuff begins here */ + + if (GenericHandler.forceSpawnMap.containsKey(world)) { + Map forceSpawnMap = GenericHandler.forceSpawnMap.get(world); + if (forceSpawnMap != null) { + forceSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(VEIL_RANGE)); + } else { + forceSpawnMap = new HashMap<>(); + forceSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(VEIL_RANGE)); + GenericHandler.forceSpawnMap.put(world, forceSpawnMap); + } + } else { + HashMap forceSpawnMap = new HashMap<>(); + forceSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(VEIL_RANGE)); + GenericHandler.forceSpawnMap.put(world, forceSpawnMap); + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); + } + + @Override + public int getRefreshCost() { + return 0; + } + + @Override + public void gatherComponents(Consumer components) { + + addOffsetRunes(components, 1, 0, 2, EnumRuneType.DUSK); + addCornerRunes(components, 3, 0, EnumRuneType.FIRE); + + for (int i = 0; i <= 1; i++) { + addParallelRunes(components, (4 + i), i, EnumRuneType.DUSK); + addOffsetRunes(components, (4 + i), i, -1, EnumRuneType.BLANK); + addOffsetRunes(components, 4, 5, i, EnumRuneType.EARTH); + } + + addCornerRunes(components, 5, 1, EnumRuneType.BLANK); + } + + @Override + public Ritual getNewCopy() { + return new RitualVeilOfEvil(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java new file mode 100644 index 00000000..8e631f4c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java @@ -0,0 +1,105 @@ +package WayofTime.bloodmagic.ritual.types; + +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.handler.event.GenericHandler; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +@RitualRegister("ward_of_sacrosanctity") +public class RitualWardOfSacrosanctity extends Ritual { + public static final String SPAWN_WARD = "spawnWard"; + + public RitualWardOfSacrosanctity() { + super("ritualWardOfSacrosanctity", 0, 40000, "ritual." + BloodMagic.MODID + ".wardOfSacrosanctityRitual"); + addBlockRange(SPAWN_WARD, new AreaDescriptor.Rectangle(new BlockPos(-16, -10, -16), 33)); + + setMaximumVolumeAndDistanceOfRange(SPAWN_WARD, 0, 256, 256); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) { + /* Default Ritual Stuff */ + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + BlockPos pos = masterRitualStone.getBlockPos(); + + if (currentEssence < getRefreshCost()) { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + // int maxEffects = currentEssence / getRefreshCost(); + // int totalEffects = 0; + + /* Default will augment stuff */ + List willConfig = masterRitualStone.getActiveWillConfig(); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); + + double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); + double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); + double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); + double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); + double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); + + double rawDrained = 0; + double corrosiveDrained = 0; + double destructiveDrained = 0; + double steadfastDrained = 0; + double vengefulDrained = 0; + + /* Actual ritual stuff begins here */ + + if (GenericHandler.preventSpawnMap.containsKey(world)) { + Map preventSpawnMap = GenericHandler.preventSpawnMap.get(world); + if (preventSpawnMap != null) { + preventSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(SPAWN_WARD)); + } else { + preventSpawnMap = new HashMap<>(); + preventSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(SPAWN_WARD)); + GenericHandler.preventSpawnMap.put(world, preventSpawnMap); + } + } else { + HashMap preventSpawnMap = new HashMap<>(); + preventSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(SPAWN_WARD)); + GenericHandler.preventSpawnMap.put(world, preventSpawnMap); + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); + } + + @Override + public int getRefreshTime() { + return 25; + } + + @Override + public int getRefreshCost() { + return 2; + } + + @Override + public void gatherComponents(Consumer components) { + for (int i = 2; i < 5; i++) { + if (i < 4) { + addParallelRunes(components, 1, 0, EnumRuneType.AIR); + } + addCornerRunes(components, i, 0, EnumRuneType.FIRE); + } + addParallelRunes(components, 5, 0, EnumRuneType.DUSK); + addOffsetRunes(components, 5, 6, 0, EnumRuneType.WATER); + } + + @Override + public Ritual getNewCopy() { + return new RitualWardOfSacrosanctity(); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 09416dcf..30479efe 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -30,8 +30,11 @@ import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.potion.PotionEventHandlers; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.RitualManager; +import WayofTime.bloodmagic.ritual.types.RitualVeilOfEvil; +import WayofTime.bloodmagic.ritual.types.RitualWardOfSacrosanctity; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; @@ -73,6 +76,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; @@ -80,6 +84,7 @@ import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; @@ -94,6 +99,8 @@ public class GenericHandler { public static Map> filledHandMapMap = new HashMap<>(); private static Map> targetTaskMapMap = new HashMap<>(); private static Map> attackTaskMapMap = new HashMap<>(); + public static Map> preventSpawnMap = new HashMap<>(); + public static Map> forceSpawnMap = new HashMap<>(); public static Set featherRitualSet; @SubscribeEvent @@ -461,6 +468,80 @@ public class GenericHandler { return durability / 2; } + // VeilOfEvil, WardOfSacrosanctity + @SubscribeEvent + public static void onLivingSpawnEvent(LivingSpawnEvent.CheckSpawn event) { + World world = event.getWorld(); + + if (!(event.getEntityLiving() instanceof EntityMob)) { + return; + } + + /* WardOfSacrosanctity */ + + if (preventSpawnMap.containsKey(world)) { + Map pMap = preventSpawnMap.get(world); + + if (pMap != null) { + for (Map.Entry entry : pMap.entrySet()) { + IMasterRitualStone masterRitualStone = entry.getKey(); + AreaDescriptor blockRange = entry.getValue(); + + if (masterRitualStone != null && masterRitualStone.isActive() && masterRitualStone.getCurrentRitual() instanceof RitualWardOfSacrosanctity) { + if (blockRange.offset(masterRitualStone.getBlockPos()).isWithinArea(new BlockPos(event.getX(), event.getY(), event.getZ()))) { + switch (event.getResult()) { + case ALLOW: + event.setResult(Result.DEFAULT); + break; + case DEFAULT: + event.setResult(Result.DENY); + break; + default: + break; + } + break; + } + } else { + pMap.remove(masterRitualStone); + } + } + } + } + + /* VeilOfEvil */ + + if (forceSpawnMap.containsKey(world)) { + Map fMap = forceSpawnMap.get(world); + + if (fMap != null) { + for (Map.Entry entry : fMap.entrySet()) { + IMasterRitualStone masterRitualStone = entry.getKey(); + AreaDescriptor blockRange = entry.getValue(); + System.out.println("found a map"); + + if (masterRitualStone != null && masterRitualStone.isActive() && masterRitualStone.getCurrentRitual() instanceof RitualVeilOfEvil) { + System.out.println("is active"); + if (blockRange.offset(masterRitualStone.getBlockPos()).isWithinArea(new BlockPos(event.getX(), event.getY(), event.getZ()))) { + System.out.println("is in"); + switch (event.getResult()) { + case DEFAULT: + event.setResult(Result.ALLOW); + break; + case DENY: + event.setResult(Result.DEFAULT); + default: + break; + } + break; + } + } else { + fMap.remove(masterRitualStone); + } + } + } + } + } + @SubscribeEvent public static void onWorldLoad(WorldEvent.Load event) { World world = event.getWorld(); @@ -468,6 +549,8 @@ public class GenericHandler { filledHandMapMap.computeIfAbsent(world, k -> new HashMap<>()); attackTaskMapMap.computeIfAbsent(world, k -> new HashMap<>()); targetTaskMapMap.computeIfAbsent(world, k -> new HashMap<>()); + forceSpawnMap.computeIfAbsent(world, k -> new HashMap<>()); + preventSpawnMap.computeIfAbsent(world, k -> new HashMap<>()); PotionEventHandlers.flightListMap.computeIfAbsent(world, k -> new ArrayList<>()); PotionEventHandlers.noGravityListMap.computeIfAbsent(world, k -> new ArrayList<>()); } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index f5cc5ff4..2ee80af3 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -623,6 +623,8 @@ ritual.bloodmagic.condorRitual=Reverence of the Condor ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul ritual.bloodmagic.groundingRitual=Ritual of Grounding ritual.bloodmagic.featheredEarthRitual=Ritual of the Feathered Earth +ritual.bloodmagic.veilOfEvilRitual=Veil of Evil +ritual.bloodmagic.wardOfSacrosanctityRitual=Ward of Sacrosanctity ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index 4107efc8..eb1d180a 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -66,15 +66,17 @@ guide.bloodmagic.entry.ritual.eternalSoul=Ritual of the Eternal Soul guide.bloodmagic.entry.ritual.condor=Reverence of the Condor guide.bloodmagic.entry.ritual.featheredEarth=Ritual of the Feathered Earth guide.bloodmagic.entry.ritual.grounding=Ritual of Grounding +guide.bloodmagic.entry.ritual.veilOfEvil=Veil of Evil +guide.bloodmagic.entry.ritual.wardOfSacrosanctity=Ward of Sacrosanctity # Ritual Master Entry Text guide.bloodmagic.entry.ritual.intro.info=Good evening. My name is Magus Arcana. I have had many guises over the years: a thief and a vigilante, a wizard and a warrior, a roaming nomad and even a politician. The title that I hold nowadays is one that many cannot comprehend, that at the very mention of it brings forth images of brutality that in some cases have been earned but in many others are misguided. I am of course talking about being a Blood Mage, though my friends simply call me Magus whereas my enemies refer to me as The Ritual Master.\n\tMy students have been pestering me for many months now, attempting to get me to document all of the myriad adventures that I have had in some form of book for me to distribute among any aspiring mages. I had been resistant, but it was Tiberius who put it best: "Although you may not see the value of it yourself, hearing the intricacies of any sort of craft from a man who has achieved mastership of the field will prove invaluable for future generations. It doesn't matter how accurately someone else retells it, if you don't have the utmost confidence in a source the gold sand could be nothing more than sulfur." You could tell he was delving into a bit of alchemy at that point, but since he was my first student for a long time I tend to value his opinion.\n\tSo, aspiring Blood Mage, training in the arcane that many yet do not fully understand, lend me your ears for these are words worth heeding: the field that you are studying has many aspects, and without careful consideration you may find your tools lacking. Therefore make sure to review this book often - I have put many enchantments on the tome that you carry with you so that whenever I write in my master copy the words will change for you.\n\tSo sit back, relax, and enjoy the teachings of a very old man. You may learn more than you've bargained for. guide.bloodmagic.entry.ritual.basics.info=Modern day rituals are a lot different from those that were conducted centuries past. There was a time when people would inscribe arcane constructs out of dust on the ground and dance around until they got what they wanted. I even remember one hermit witch who gathered energy from her garden. I laughed at it all until she sicced her pet owl on me. \n\tThe rituals that Blood Mages use require the precise alignment of marked stones to focus and transform the power that a mage pumps into it. One day, my apprentice Tiberius was rummaging through some of the old artifacts that I had procured over the years in the closet of his new room. There was a vial of liquid Etherium that I haven't touched in ages (I was meaning to get back to that, but I haven't had any time) as well as a crystal ball that always seemed to say "Tuesday" when you peered through the glass. When one of the boxes that was labeled "Runic Dust" was knocked over a small red gem tumbled out and knocked against Tiberius's foot. Immediately a bright ruby light emanated from it and reacted with the dust in the box that he was carrying.\n\tNaturally, an explosion occurred. The unfocused energy that Tiberius inadvertently released through the gem sparked the runic dust and stones around him, and without a means of containing the power it simply was pushed outwards. After a few days in the medical ward, Tiberius and I started to get to work.\n\tThrough a mixture of several sleepless nights and a hardy helping of caffeine (I've really got to thank Mister Player for the coffee supply, I salute your efforts for a more awake tomorrow!) we eventually perfected the key ingredients for all rituals.\n\tThrough our experimentation, we learned that we needed four different things: we needed a bunch of ritual stones placed around an area in a set pattern, a few different inks that are applied to the ritual stones to help further specify the pattern, a central ritual stone that acts as a central conduit of power, and a crystal that activates the ritual. I think it's best to talk about these one by one. guide.bloodmagic.entry.ritual.ritualStone.info.1=The Ritual Stone acts as a simple receptacle for magical energy, shaping it and further redirecting it in different ways depending on how the stone is configured. When you start off, there are five different stones that you have access to: Blank (the base stone that does not have any markings applied), Water, Fire, Air, and Earth. Every single ritual will have a number of these, and depending on how they are arranged around the Master Ritual Stone the overall effect will be different. guide.bloodmagic.entry.ritual.ritualStone.info.2=In order to inscribe the correct symbols onto the ritual stones you must have a set of inscription tools. I have since developed a method for people to more easily apply the correct inks to the ritual stones while placing them in the correct configuration, but if one were to wish to do this manually they can use these tools. When you activate a ritual stone with one of the inscription tools in your hand (right clicking on the stone) you will apply some ink to the stone, changing it to the same type as the tool. In early tiers, you only have access to the base four colours, however once you become more powerful you will have more tools at your disposal. -guide.bloodmagic.entry.ritual.masterRitualStone.info=As with most magics, without a guiding force the effect of the ritual will either become uncontrollable or simply will not work at all. Thus, in order to control the rituals a Master Ritual Stone is required (I usually abbreviate this to "MRS" in my notes, but saying it in public is a little awkward. "I need more mrs please!"). The MRS takes in power from the owner's Soul Network and pushes it through the ritual stones, thus performing the ritual. \n\tAttaching the Soul Network to a large stone that we don't hold in our hands proved to be a bit tricky. I managed to do this one time by meditating on top of the stone in the lotus position, focusing my power through the stone and trying to link the tendrils of my network into the inner workings of the ritual. Although I got it working for a few minutes, all I was really awarded was a pair of wet pants as water condensed onto the ritual stones. I've learned to not meditate on any of my experiments again. +guide.bloodmagic.entry.ritual.masterRitualStone.info=As with most magics, without a guiding force the effect of the ritual will either become uncontrollable or simply will not work at all. Thus, in order to control the rituals a Master Ritual Stone is required (I usually abbreviate this to "MRS" in my notes, but saying it in public is a little awkward. "I need more mrs please!"). The MRS takes in power from the owner's Soul Network and pushes it through the ritual stones, thus performing the ritual. \n\tAttaching the Soul Network to a large stone that we don't hold in our hands proved to be a bit tricky. I managed to do this one time by meditating on top of the stone in the lotus position, focusing my power through the stone and trying to link the tendrils of my network into the inner workings of the ritual. Although I got it working for a few minutes, all I was really awarded was a pair of wet pants as water condensed onto the ritual stones. I've learned to not meditate on any of my experiments again. guide.bloodmagic.entry.ritual.activationCrystal.info.1=Instead of waiting an hour at a time to meditate a ritual active, we took the red gem that fell out of the box originally and started to analyze it. Tiberius was certain that it had the ability to "establish links between the corporeal realm of our reality and the incorporeal essence that is the manifested Soul Network." Sometimes I wonder if it was a good idea to have him become my apprentice, but it is times like these that I see his knack for the more arcane aspects of magic. Oh, I should probably write what he meant in English: by using this crystal, we could link our soul networks to the Master Ritual Stone in order to supply it with energy. -guide.bloodmagic.entry.ritual.activationCrystal.info.2=Thus we had ourselves a Weak Activation Crystal and a means in which to recreate its structure. The main ingredient for the crystal is another crystal that can be linked to my Soul Network: a Lava Crystal. Then, by quickly inscribing some instructions onto the crystal's surface the Blood Altar can do the rest of the work to transmute it into an activation crystal. Naturally, this crystal has to be bound to the user's soul network in order to function. When the ritual's stones are laid correctly around the MRS, the user should touch the activation crystal to the MRS and push out enough energy to jump start the ritual in question. If you have enough LP inside of your Soul Network the ritual will activate. If you do not, or if the stones are not laid out correctly, the ritual will simply not activate and no LP cost is incurred. +guide.bloodmagic.entry.ritual.activationCrystal.info.2=Thus we had ourselves a Weak Activation Crystal and a means in which to recreate its structure. The main ingredient for the crystal is another crystal that can be linked to my Soul Network: a Lava Crystal. Then, by quickly inscribing some instructions onto the crystal's surface the Blood Altar can do the rest of the work to transmute it into an activation crystal. Naturally, this crystal has to be bound to the user's soul network in order to function. When the ritual's stones are laid correctly around the MRS, the user should touch the activation crystal to the MRS and push out enough energy to jump start the ritual in question. If you have enough LP inside of your Soul Network the ritual will activate. If you do not, or if the stones are not laid out correctly, the ritual will simply not activate and no LP cost is incurred. guide.bloodmagic.entry.ritual.diviner.info.1=After discerning the size and layout of many rituals I started to find it a little bothersome to continually consult my notes in order to build the rituals. That is why I worked to create a device that would allow anyone to simply place down the stones in the correct position through simple gestures and movements. I've placed this entry further up the list chronologically because it is best for people to learn of this item before starting with the actual construction of rituals. Otherwise they may find out that they don't have everything they need, or will summon a meteor from hell instead of a fresh bottle of spring water. guide.bloodmagic.entry.ritual.diviner.info.2=The Ritual Diviner is essentially an encyclopaedia for rituals. By cycling through the diviner (shift-left click and shift-right click) you can select a different ritual from its store of knowledge. Gazing into the diviner will also tell you some simple information about the ritual. If you have Ritual Stones on your person and you touch the diviner onto the MRS (right click) you can place a stone for the ritual you want to construct. Doing this enough times will net you a completed ritual! guide.bloodmagic.entry.ritual.fullSpring.info=A few years ago a travelling merchant stopped by the village near my house, peddling his wares to all who were willing to part with their coin. There was a drought at the time and the crops were dying, so the merchant brought forth a silver talisman with a blue gem set inside of it. "This, my friends," he said with great zeal, "will make sure that your rivers will not dry out! By using alchemy I can bring forth water from the very air!"\n\tUnfortunately for the village it seemed that the gem was a simple piece of sapphire, and before anyone realized that they were tricked he was already several miles away. I tend to not intervene in the affairs of the village because they tend not to like my magic, but in this case I made an exception. After I had a lovely chat with the "alchemist," I spent a few hours meditating near the irrigation channels. By condensing the water vapour in the air I managed to create enough water to keep the crops watered until the next downfall. This wasn't exactly an efficient method and I was drained for the next few days, using some of the water from the channel to rehydrate myself.\n\tRemembering this, I employed the same principles to create the Ritual of the Full Spring. By channeling a small amount of energy into the ritual, it condenses the moisture in the air around it to produce a source of water on top of the master ritual stone. The cost to activate the ritual is fairly insignificant, and the maintenance even more so. \n\tThe water's range can be expanded by using the ritual tinkerer and even placed in a different location, so one does not need to worry about where a ritual is placed if they are worrying about aesthetics. The miracles of magic! @@ -84,7 +86,7 @@ guide.bloodmagic.entry.ritual.magnetism.info=The Ritual of Magnetism is the brea guide.bloodmagic.entry.ritual.crusher.info=The Ritual of the Crusher's operation is rather simple. The ritual needs to have some form of inventory linked to it, which when unaltered simply sits on top of the MRS. While in operation, the ritual will look inside of its crushing range (by default the 3x3x3 area below the ritual) and break one block at a time at a rate of once every 2 seconds at the cost of 7 LP per successful operation. The broken blocks will then be transferred to the linked inventory - if there is no room for the items, they will instead be spewed on top of the chest.\n\tWhen fueled with Raw Will, the ritual will work at a faster rate based on the total amount of Will in the Aura. While sped up, it will consume 0.05 Raw Will per successful operation.\n\tDestructive Will causes blocks that are broken by the ritual to have Fortune applied to it. Currently the fortune level does not vary and is instead level 3 regardless of the Will amount. This will consume 0.2 Will per successful operation, regardless of whether it was useful.\n\tSteadfast Will will instead cause blocks to be broken with the Silk Touch effect. This costs 0.02 Will per operation, and will override the Destructive effect where possible.\n\tCorrosive Will makes it so that blocks that are broken by the ritual will be processed with some form of cutting fluid. This means that for instance if it is an iron block the result will be two pieces of iron sand. The current "cutting fluids" that the ritual uses are: Basic Cutting Fluid and Explosive Powder. The ritual consumes a different amount of Will based on what was used, and will only consume the Will if the effect applies. This overrides Silk Touch where applicable.\n\tVengeful Will causes it so that when a successful operation takes place the inventory has its contents compressed similar to the Sigil of Compression: if there is 65 redstone dust inside of the chest, one block of redstone will be crafted and 56 dust will remain. Will is only consumed when this is successful, and it costs 0.2 Will. guide.bloodmagic.entry.ritual.highJump.info=This ritual uses a huge burst of air to propel all those who walk on top of it into the sky. What is more, if the user lands in the ritual's area of effect they will not suffer any fall damage. Players who sneak inside this ritual also are not affected.\n\tThe ritual costs 5LP per entity per tick of successful operation, so it won't cost anything if it doesn't fling people in the air. guide.bloodmagic.entry.ritual.speed.info=As the name may suggest, the Ritual of Speed is used for transportation of various sorts. The ritual may be placed in the direction of any of the cardinal directions and any entities within its range will be launched in the direction that the ritual is pointing. When looking at a ritual, this direction is where the dusk ritual stone is. By default, the ritual has a radius of 2 blocks from the MRS, though this can be expanded or contracted when using a ritual tinkerer. This will apply a speed of 3 blocks/tick in the direction of the ritual and 1.2 blocks/tick vertically.\n\tIf the ritual is fueled with Raw Will, the speed of the ritual is increased substantially based on the Will that is in the Aura. For instance, the speed will be doubled if there is 100 Will inside of the Aura. For each successful operation, 0.1 Will is consumed.\n\tVengeful Will prevents the ritual from moving adult mobs, and Destructive Will prevents the ritual from moving child mobs. If either one of these are used, players are also prevented from using the ritual. If both of them are used, however, the effect is that only players may use the ritual and mobs cannot. These augmentations can be used effectively for sorting animal farms or even getting rid of those pesky child zombies in your sacrificial pen. The ritual will consume 0.05 Will for each type that is in effect on successful operation, so if a child enters the ritual space when you use Destructive Will it will not cost Will or LP. -guide.bloodmagic.entry.ritual.wellOfSuffering.info=For those of you who prefer to use mobs instead of your own health, the Well of Suffering damages all living non-player entities in a 10 block radius and places the health in a connected altar. The ritual will look for a blood altar within its range, checking 5 blocks horizontally and 10 blocks vertically unaltered. When it finds an altar, it will store its location internally - if there isn't an altar nearby, the ritual will not work. The ritual will deal 1 HP per entity and place 25 LP into the altar (100 for peaceful animals), which can be augmented with Sacrifice runes. +guide.bloodmagic.entry.ritual.wellOfSuffering.info=For those of you who prefer to use mobs instead of your own health, the Well of Suffering damages all living non-player entities in a 10 block radius and places the health in a connected altar. The ritual will look for a blood altar within its range, checking 5 blocks horizontally and 10 blocks vertically unaltered. When it finds an altar, it will store its location internally - if there isn't an altar nearby, the ritual will not work. The ritual will deal 1 HP per entity and place 25 LP into the altar (100 for peaceful animals), which can be augmented with Sacrifice runes. guide.bloodmagic.entry.ritual.featheredKnife.info=The Ritual of the Feathered Knife taps into the user's body, draining away their life force in order to fill a blood altar nearby. The ritual will look for a blood altar within its range, checking 5 blocks horizontally and 10 blocks vertically unaltered. When it finds an altar, it will store its location internally - if there isn't an altar nearby, the ritual will not work. When a player then enters within the ritual's damage range, which by default is a radius of 15 blocks horizontally and 20 blocks vertically, the ritual will damage the player for 1HP and then place that health into the connected altar directly (respecting blood runes). There are some safety mechanisms on the ritual, which cause it to not work on a player with less than 30%% of their max health. Unaugmented, the ritual does this once every second.\n\tThere are a few useful augmentations that you can use if you use Demon Will. If Raw Will is consumed by the ritual, the ritual will attempt to damage players within its range at a faster rate, operating twice per second. The ritual will consume 0.05 Raw Will per successful operation.\n\tIf you have more than 10 Steadfast Will in the Aura, the ritual will increase its safety threshold and instead will not work on players with less than 70%% health. This function currently does not consume Will.\n\tIf you have more than 10 Vengeful Will in the Aura, the ritual will remove some of its safety limitations, causing it to work on players until they only have 10%% of their maximum health left. If the ritual also has Steadfast Will augmented onto it the threshold will still be 70%% for the owner of the ritual only. This function currently does not consume Will.\n\tWhen Destructive Will is applied to the ritual, the ritual becomes a lot more efficient with its HP to LP conversion. The amount of LP that is added to the altar per health point increases based on the Will in the Aura, up to a maximum of +20%% for 100 Destructive Will. This effect stacks multiplicatively with runes, Living Armour Upgrades, and Incense. This consumes 0.05 Destructive Will per HP sacrificed.\n\tSpeaking of incense, if Corrosive Will is used in the ritual the ritual will respect the effects of incense on you. If you do not have the Soul Fray debuff on and you are empowered by an Incense Altar, the ritual will consume all of your HP up to the set threshold and pump all of the resultant LP into the altar. It will also remove the incense that you incurred and apply Soul Fray onto you. This effect stacks with the Destructive Will buff. guide.bloodmagic.entry.ritual.regen.info=Arguably one of the best rituals for any potential Blood Mage who wishes to use his own life force to fuel his magic, the Ritual of Regeneration casts a veil of energy around itself, healing entities that find themselves within its range. Every 2.5 seconds the ritual will cast Regeneration I on living entities in its 15 block radius, costing 100LP per player and 10LP per other living entities for the 2.5 seconds of regen. \n\tIf Corrosive Will is used to augment the ritual a second range will be available, a "vampiric range". Any non-player entities within this range will be randomly damaged in order to directly heal players within the regular healing range. This costs 0.04 Will to use and will transfer 1HP per operational tick. guide.bloodmagic.entry.ritual.harvest.info=This ritual will seek any harvestable plant block within its range (default is the 9x9x5 high area above the MRS) and try to harvest it, replanting any seeds if the plant can drop seeds. All of the drops from the plant will appear where the plant was harvested. The ritual will attempt to harvest plants once every 5 ticks and will cost 20LP per successful operation.\n\tPlants that can be harvested include, but are not limited to: pumpkins, wheat, carrots, potatos, nether wart, cactus, reeds. Keep in mind that the ritual makes no assumptions about the thing it is harvesting - it can only harvest mod-added crops if the mod in question registers a harvesting handler with the mod. @@ -112,7 +114,9 @@ guide.bloodmagic.entry.ritual.fullStomach.info=##REQ-LORE##\n\t The Ritual of th guide.bloodmagic.entry.ritual.eternalSoul.info=##REQ-LORE##\n\t The Cry of the Eternal Soul is capable of feeding LP from the Soul Network back into an altar. This falls under the usual restrictions of pumping (liquid) Life Essence into an altar. Every point of LP transferred into the altar costs 2 LP from the network.\n\t Activiation Cost: 2,000,000LP\n\t Cost per operation: 2*transferLP guide.bloodmagic.entry.ritual.condor.info=##REQ-LORE##\n\t The Reverence of the Condor allows flight for players in a local area around the ritual.\n\t Activation Cost: 1,000,000LP\n\t Cost per operation: 2LP guide.bloodmagic.entry.ritual.featheredEarth.info=##REQ-LORE##\n\t The Ritual of the Feathered Earth constantly reduces the fall height to 0, effectivly eliminating fall damage.\n\t Activation Cost: 5,000LP\n\tCost per second: 20LP -guide.bloodmagic.entry.ritual.grounding.info=##REQ-LORE##\n\ŧ The Ritual of Grounding manipulates the gravity in its area. By default, it drags mobs to the ground and prevents jumping.\n\t Supplying the ritual with Raw Will makes it affect players in addition to mobs.\n\t Corrosive Will simply disables gravity all together.\n\t Destructive Will vastly increases fall damage of affected entities.\n\t Steadfast Will allows the ritual to affect bosses.\n\t Vengeful Will alone amplifies the grounding effect, in combination with Corrosive Will, however, it transforms the ritual to provide levitation instead. Vengeful Will also increases the effect of Heavy Heart, increasing fall damage even more.\n\t Activiation Cost: 5,000LP\n\tCost per second: 20LP +guide.bloodmagic.entry.ritual.grounding.info=##REQ-LORE##\n\t The Ritual of Grounding manipulates the gravity in its area. By default, it drags mobs to the ground and prevents jumping.\n\t Supplying the ritual with Raw Will makes it affect players in addition to mobs.\n\t Corrosive Will simply disables gravity all together.\n\t Destructive Will vastly increases fall damage of affected entities.\n\t Steadfast Will allows the ritual to affect bosses.\n\t Vengeful Will alone amplifies the grounding effect, in combination with Corrosive Will, however, it transforms the ritual to provide levitation instead. Vengeful Will also increases the effect of Heavy Heart, increasing fall damage even more.\n\t Activiation Cost: 5,000LP\n\tCost per second: 20LP +guide.bloodmagic.entry.ritual.veilOfEvil.info=##REQ-LORE##\n\t The Veil of Evil casts a magical shroud over its area, allowing mobs to form where they usually would not. Spawns following vanilla rules will be forced to spawn. Spawns that are denied will follow vanilla spawning rules. +guide.bloodmagic.entry.ritual.wardOfSacrosanctity.info=##REQ-LORE##\n\t The Ward of Sacrosanctity provides a powerful ward, preventing mobs from forming even though they usually would. Spawns following vanilla rules will be prevented from spawning. Spawns that are forced or allowed will follow vanilla spawning rules. # Architect Entries guide.bloodmagic.entry.architect.intro=Foreword From a5a5899b7cc8b31757e97f6d7ba77517df64094b Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 15:36:05 +0000 Subject: [PATCH 317/493] Fixed `/bloodmagic network get` not having a network to get from, (#1604) added translation keys for tickethistory --- .../command/sub/SubCommandNetwork.java | 16 +++++++--------- .../resources/assets/bloodmagic/lang/en_US.lang | 4 +++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 1cf0b421..236d3014 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -85,11 +85,11 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { + sender.sendMessage(new TextComponentTranslation(getHelp())); + return; + } if (!getName().equals("get")) { - if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TextComponentTranslation(getHelp())); - return; - } this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); this.network = NetworkHelper.getSoulNetwork(uuid); @@ -164,11 +164,9 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TextComponentTranslation(getHelp())); - return; - } this.player = args.length < 1 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); + this.network = NetworkHelper.getSoulNetwork(uuid); sender.sendMessage(new TextComponentString((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TextComponentTranslation("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText()))); } } @@ -216,7 +214,7 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { List tickethistory = network.getTicketHistory(); - if (tickethistory.isEmpty()) + if (!tickethistory.isEmpty()) for (SoulTicket i : network.getTicketHistory()) sender.sendMessage(i.getDescription()); sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success", player.getDisplayName().getFormattedText())); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 2ee80af3..0d4c026d 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -832,6 +832,7 @@ commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] commands.bloodmagic.network.help=LP network utilities + commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network. commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s. commands.bloodmagic.network.syphon.usage=/bloodmagic network syphon [player] [amount] @@ -850,7 +851,8 @@ commands.bloodmagic.network.fill.success=Successfully filled %s's LP network. commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. commands.bloodmagic.network.cap.usage=/bloodmagic network cap [player] commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network. - +commands.bloodmagic.network.tickethistory.help=Shows the soul ticket history containing information about LP consumers for the player +commands.bloodmagic.network.tickethistory.usage=/bloodmagic network tickethistory [player] commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] ("?" or "help" for help) commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item. From 39f1ac0c7dbb07a38c91a5d3904090d8d95115d4 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 15:37:21 +0000 Subject: [PATCH 318/493] Added JEI recipes for repairing Sentient Tools & Living Armor (#1606) * Added sentient tool repair recipes to JEI. * Added living armor repair recipes to JEI. --- .../compat/jei/BloodMagicJEIPlugin.java | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index dce7a1c2..2384c305 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -34,9 +34,15 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import mezz.jei.api.*; import mezz.jei.api.recipe.IRecipeCategoryRegistration; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.IVanillaRecipeFactory; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; import java.util.Map; @JEIPlugin @@ -58,6 +64,8 @@ public class BloodMagicJEIPlugin implements IModPlugin { registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); registry.addRecipes(AlchemyTableRecipeRegistry.getRecipeList(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.addRecipes(getAnvilRecipes(), VanillaRecipeCategoryUid.ANVIL); + registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); registry.handleRecipes(RecipeTartaricForge.class, TartaricForgeRecipeJEI::new, Constants.Compat.JEI_CATEGORY_SOULFORGE); registry.handleRecipes(RecipeAlchemyArray.class, AlchemyArrayCraftingRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); @@ -127,4 +135,98 @@ public class BloodMagicJEIPlugin implements IModPlugin { new ArmourDowngradeRecipeCategory() ); } + + public Collection getAnvilRecipes() { + IVanillaRecipeFactory vanillaRecipeFactory = jeiHelper.getVanillaRecipeFactory(); + + + /* Sentient Tool repair recipes */ + + List outputSwords = new LinkedList<>(); + List outputPickaxes = new LinkedList<>(); + List outputAxes = new LinkedList<>(); + List outputBows = new LinkedList<>(); + List outputShovels = new LinkedList<>(); + + List inputRightSentient = new LinkedList<>(); + + List> sentientOutputs = new LinkedList<>(); + + List sentientTools = new LinkedList<>(); + sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE)); + sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE)); + sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW)); + sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL)); + sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD)); + + for (int i = 4; i > 0; i--) { + for (ItemStack j : sentientTools) { + int maxDmg = j.getMaxDamage(); + j.setItemDamage(maxDmg - (maxDmg / 4) * i); + } + outputAxes.add(sentientTools.get(0).copy()); + outputPickaxes.add(sentientTools.get(1).copy()); + outputBows.add(sentientTools.get(2).copy()); + outputShovels.add(sentientTools.get(3).copy()); + outputSwords.add(sentientTools.get(4).copy()); + + inputRightSentient.add(new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, i)); + } + sentientOutputs.add(outputAxes); + sentientOutputs.add(outputPickaxes); + sentientOutputs.add(outputBows); + sentientOutputs.add(outputShovels); + sentientOutputs.add(outputSwords); + + + Collection collection = new LinkedList<>(); + + for (int i = 0; i < 5; i++) { + ItemStack inputLeft = sentientTools.get(i); + inputLeft.setItemDamage(inputLeft.getMaxDamage()); + collection.add(vanillaRecipeFactory.createAnvilRecipe(inputLeft, inputRightSentient, sentientOutputs.get(i))); + } + + /* Living Armor repair recipes */ + + List outputHelmets = new LinkedList<>(); + List outputChestplates = new LinkedList<>(); + List outputLeggings = new LinkedList<>(); + List outputBoots = new LinkedList<>(); + + List inputRightLiving = new LinkedList<>(); + + List> livingOutputs = new LinkedList<>(); + + List livingTools = new LinkedList<>(); + livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)); + livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)); + livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS)); + livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)); + + for (int i = 4; i > 0; i--) { + for (ItemStack j : livingTools) { + int maxDmg = j.getMaxDamage(); + j.setItemDamage(maxDmg - (maxDmg / 4) * i); + } + outputHelmets.add(livingTools.get(0).copy()); + outputChestplates.add(livingTools.get(1).copy()); + outputLeggings.add(livingTools.get(2).copy()); + outputBoots.add(livingTools.get(3).copy()); + + inputRightLiving.add(new ItemStack(RegistrarBloodMagicItems.COMPONENT, i, 8)); + } + livingOutputs.add(outputHelmets); + livingOutputs.add(outputChestplates); + livingOutputs.add(outputLeggings); + livingOutputs.add(outputBoots); + + for (int i = 0; i < 4; i++) { + ItemStack inputLeft = livingTools.get(i); + inputLeft.setItemDamage(inputLeft.getMaxDamage()); + collection.add(vanillaRecipeFactory.createAnvilRecipe(inputLeft, inputRightLiving, livingOutputs.get(i))); + } + + return collection; + } } From 6420c2635e92c99345a163f0ddd9fd62d8ae599f Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 19 May 2019 09:04:20 -0700 Subject: [PATCH 319/493] Fix tough palms being trainable without an altar nearby (#1588) *When using an empowered sacrificial dagger --- .../util/helper/PlayerSacrificeHelper.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java index 6498132d..54ceea6a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java @@ -66,11 +66,15 @@ public class PlayerSacrificeHelper { float sacrificedHealth = health - maxHealth / 10.0f; int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion * getModifier(amount)); - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); - if (MinecraftForge.EVENT_BUS.post(evt)) - return false; + IBloodAltar altar = getAltar(player.getEntityWorld(), player.getPosition()); + if (altar != null) { + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); + if (MinecraftForge.EVENT_BUS.post(evt)) + return false; + + altar.sacrificialDaggerCall(evt.lpAdded, false); + altar.startCycle(); - if (findAndFillAltar(player.getEntityWorld(), player, evt.lpAdded, false)) { player.setHealth(maxHealth / 10.0f); setPlayerIncense(player, 0); player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); From f87a63ba995b5747054a57eb6d3c2f309477ce20 Mon Sep 17 00:00:00 2001 From: Big Energy Date: Sun, 19 May 2019 19:23:49 +0300 Subject: [PATCH 320/493] Add russian guide book (#1607) * Create tussian guide book * Delete English phrases --- .../assets/bloodmagicguide/lang/ru_RU.lang | 239 ++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang diff --git a/src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang b/src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang new file mode 100644 index 00000000..236db6e7 --- /dev/null +++ b/src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang @@ -0,0 +1,239 @@ +# Book Information +guide.bloodmagic.title=Ðаука крови +guide.bloodmagic.display=Ðаука крови +guide.bloodmagic.author=Blood Magic +guide.bloodmagic.welcome=Blood Magic + +# Page Information +guide.bloodmagic.page.bloodAltar=Рецепт Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ +guide.bloodmagic.page.soulForge=Рецепт Кузницы ÐдÑкого Пламени +guide.bloodmagic.shapelessOrb=БеÑформенный рецепт шара +guide.bloodmagic.shapedOrb=Форменный рецепт шара + + +# Categories +guide.bloodmagic.category.architect=Ðрхитектор +guide.bloodmagic.category.ritual=Ритуал МаÑтер +guide.bloodmagic.category.demon=Демон Кин +guide.bloodmagic.category.spell=Боевой Маг +guide.bloodmagic.category.alchemy=Ðлхимик + +# Ritual Master Entries +guide.bloodmagic.entry.ritual.intro=Ð’Ñтупление + +# Ritual Master Entry Text +guide.bloodmagic.entry.ritual.intro.info=Добрый вечер. ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ ÐœÐ°Ð³ÑƒÑ Ðркана. За Ñти годы у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¾ много обликов: вор и дружинник, волшебник и воин, бродÑчий кочевник и даже политик. Ðазвание, которое Ñ Ð´ÐµÑ€Ð¶Ñƒ в наÑтоÑщее времÑ, - Ñто то, что многие не могут понÑÑ‚ÑŒ, что при Ñамом упоминании о нем возникают образы жеÑтокоÑти, которые в некоторых ÑлучаÑÑ… были заÑлужены, но во многих других введены в заблуждение. Я, конечно, говорю о том, чтобы быть Кровавым Магом, Ñ…Ð¾Ñ‚Ñ Ð¼Ð¾Ð¸ Ð´Ñ€ÑƒÐ·ÑŒÑ Ð¿Ñ€Ð¾Ñто называют Ð¼ÐµÐ½Ñ ÐœÐ°Ð³Ð¾Ð¼, тогда как мои враги называют Ð¼ÐµÐ½Ñ ÐœÐ°Ñтером Ритуала.\n\tМои ученики приÑтавали ко мне уже много меÑÑцев, пытаÑÑÑŒ заÑтавить Ð¼ÐµÐ½Ñ Ð·Ð°Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ вÑе беÑчиÑленные приключениÑ, которые у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¸, в какой-то форме книги, которую Ñ Ð¼Ð¾Ð³ бы раÑпроÑтранÑÑ‚ÑŒ Ñреди любых начинающих магов. Я был наÑтойчив, но Ñто был Тиберий, который выразил Ñто лучше вÑего: Â«Ð¥Ð¾Ñ‚Ñ Ð²Ñ‹, возможно, и Ñами не Ñможете оценить его ценноÑÑ‚ÑŒ, уÑлышать тонкоÑти любого рода ремеÑла от человека, который доÑтиг маÑтерÑтва в Ñтой облаÑти, окажетÑÑ Ð½ÐµÐ¾Ñ†ÐµÐ½Ð¸Ð¼Ñ‹Ð¼ Ð´Ð»Ñ Ð±ÑƒÐ´ÑƒÑ‰Ð¸Ñ… поколений. «Ðеважно, наÑколько точно кто-то другой переÑказывает Ñто, еÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ полной уверенноÑти в иÑточнике, золотой пеÑок может быть не чем иным, как Ñерой». Ð’Ñ‹ могли бы Ñказать, что в тот момент он углублÑлÑÑ Ð² алхимию, но так как он долгое Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð» моим первым учеником, Ñ Ñклонен ценить его мнение.\n\tТак, начинающий кровавый маг, тренирующийÑÑ Ð² тайне, который многие еще делают не до конца понимаю, подайте мне уши, потому что Ñти Ñлова заÑлуживают вниманиÑ: облаÑÑ‚ÑŒ, которую вы изучаете, имеет много аÑпектов, и без тщательного раÑÑÐ¼Ð¾Ñ‚Ñ€ÐµÐ½Ð¸Ñ Ð²Ñ‹ можете обнаружить, что ваши инÑтрументы не хватает. ПоÑтому не забывайте чаÑто читать Ñту книгу - Ñ Ð²Ð»Ð¾Ð¶Ð¸Ð» много чар в книгу, которую вы ноÑите Ñ Ñобой, чтобы вÑÑкий раз, когда Ñ Ð¿Ð¸ÑˆÑƒ в Ñвоей оÑновной копии, Ñлова менÑлиÑÑŒ Ð´Ð»Ñ Ð²Ð°Ñ.\n\tТак что ÑÑдьте, раÑÑлабьтеÑÑŒ и наÑлаждайтеÑÑŒ учением очень Ñтарого человека. Ð’Ñ‹ можете узнать больше, чем вы раÑÑчитывали. +guide.bloodmagic.entry.ritual.basics.info=Современные ритуалы Ð´Ð½Ñ Ñильно отличаютÑÑ Ð¾Ñ‚ тех, которые проводилиÑÑŒ в прошлом. Было времÑ, когда люди пиÑали на земле тайные конÑтрукции из пыли и танцевали, пока не получили то, что хотели. Я даже помню одну ведьму-отшельницу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñобирала Ñнергию из ее Ñада. Я ÑмеÑлаÑÑŒ над вÑем Ñтим, пока она не накурила на Ð¼ÐµÐ½Ñ Ñвою любимую Ñову. \n\tРитуалы, которые иÑпользуют Маги Крови, требуют точного Ð²Ñ‹Ñ€Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð½Ñ‹Ñ… камней, чтобы ÑфокуÑировать и преобразовать Ñилу, которую маг накачивает в него. Однажды мой ученик Тиберий копалÑÑ Ð² некоторых Ñтарых артефактах, которые Ñ Ð¿Ñ€Ð¸Ð¾Ð±Ñ€ÐµÐ» за Ñти годы в шкафу его новой комнаты. Был флакон Ñ Ð¶Ð¸Ð´ÐºÐ¸Ð¼ Этериумом, которого Ñ Ð½Ðµ трогал целую вечноÑÑ‚ÑŒ (Ñ Ñ…Ð¾Ñ‚ÐµÐ» вернутьÑÑ Ðº Ñтому, но у Ð¼ÐµÐ½Ñ Ð½Ðµ было времени), а также хруÑтальный шар, который, казалоÑÑŒ, вÑегда говорил «вторник», когда вы вглÑделÑÑ Ð² Ñтекло. Когда одна из коробок Ñ Ð½Ð°Ð´Ð¿Ð¸Ñью «РуничеÑÐºÐ°Ñ Ð¿Ñ‹Ð»ÑŒÂ» была опрокинута на маленькую краÑную жемчужину, она упала на ногу ТибериÑ. Сразу же от него иÑходил Ñркий рубиновый Ñвет, который реагировал Ñ Ð¿Ñ‹Ð»ÑŒÑŽ в коробке, которую он неÑ.\n\tЕÑтеÑтвенно, произошел взрыв. ÐеÑфокуÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÑнергиÑ, которую Тиберий непреднамеренно выÑвободил через драгоценный камень, зажгла руничеÑкую пыль и камни вокруг него, и без ÑредÑтв ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ñилы ее проÑто вытолкнули наружу. ПоÑле неÑкольких дней в медицинÑком отделении мы Ñ Ð¢Ð¸Ð±ÐµÑ€Ð¸ÐµÐ¼ приÑтупили к работе.\n\tÐ‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñочетанию неÑкольких беÑÑонных ночей и крепкой порции кофеина (Ñ Ð´ÐµÐ¹Ñтвительно должен поблагодарить МиÑтера Плейера за поÑтавку кофе, Ñ Ð¿Ñ€Ð¸Ð²ÐµÑ‚Ñтвую ваши уÑÐ¸Ð»Ð¸Ñ Ð¿Ð¾ более бодрÑтвующему завтра!), Ð’ итоге мы уÑовершенÑтвовали ключевые ингредиенты Ð´Ð»Ñ Ð²Ñех ритуалов.\n\tÐ’ результате наших ÑкÑпериментов мы узнали, что нам нужны четыре разные вещи: нам нужна куча ритуальных камней, помещенных вокруг облаÑти по заданному шаблону, неÑколько разных чернил, которые наноÑÑÑ‚ÑÑ Ð½Ð° ритуальные камни, чтобы помочь в дальнейшем определить образец, центральный ритуал камень, который дейÑтвует как центральный канал влаÑти, и криÑталл, который активирует ритуал. Я думаю, что лучше поговорить об Ñтом один за другим. +guide.bloodmagic.entry.ritual.ritualStone.info.1=Ритуальный Камень дейÑтвует как проÑÑ‚Ð°Ñ ÐµÐ¼ÐºÐ¾ÑÑ‚ÑŒ Ð´Ð»Ñ Ð¼Ð°Ð³Ð¸Ñ‡ÐµÑкой Ñнергии, формирует ее и дополнительно перенаправлÑет по-разному в завиÑимоÑти от конфигурации камнÑ. Когда вы начинаете, еÑÑ‚ÑŒ пÑÑ‚ÑŒ различных камней, к которым у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп: ПуÑтой (базовый камень, на который не нанеÑена маркировка), Вода, Огонь, Воздух и ЗемлÑ. Каждый ритуал будет иметь неÑколько из них, и в завиÑимоÑти от того, как они раÑположены вокруг МаÑтерÑкого ритуального камнÑ, общий Ñффект будет разным. +guide.bloodmagic.entry.ritual.ritualStone.info.2=Чтобы впиÑать правильные Ñимволы в ритуальные камни, у Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть набор инÑтрументов Ð´Ð»Ñ Ð½Ð°Ð´Ð¿Ð¸Ñи. С тех пор Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð» метод, позволÑющий людÑм легче наноÑить правильные чернила на ритуальные камни, Ð¿Ð¾Ð¼ÐµÑ‰Ð°Ñ Ð¸Ñ… в правильную конфигурацию, но еÑли кто-то захочет Ñделать Ñто вручную, они могут иÑпользовать Ñти инÑтрументы. Когда вы активируете ритуальный камень Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ одного из инÑтрументов Ð´Ð»Ñ Ð½Ð°Ð´Ð¿Ð¸Ñи в руке (щелкнув правой кнопкой мыши по камню), вы нанеÑете немного чернил на камень, изменив его на тот же тип, что и инÑтрумент. Ðа ранних уровнÑÑ… у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп только к четырем базовым цветам, однако, как только вы Ñтанете более могущеÑтвенным, в вашем раÑпорÑжении будет больше инÑтрументов. +guide.bloodmagic.entry.ritual.masterRitualStone.info=Как и в Ñлучае большинÑтва магии, без направлÑющей Ñилы Ñффект ритуала либо Ñтанет неуправлÑемым, либо проÑто не будет работать вообще. Таким образом, Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы контролировать ритуалы, требуетÑÑ ÐœÐ°ÑтерÑкий ритуальный камень (Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾ Ñокращаю Ñто до «MRS» в Ñвоих заметках, но говорить Ñто публично немного неловко. «Мне нужно больше миÑÑиÑ, пожалуйÑта!»). MRS получает влаÑÑ‚ÑŒ от Сети Души владельца и проталкивает ее через ритуальные камни, таким образом выполнÑÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð». \n\tПриÑоединение Сети Души к большому камню, который мы не держим в руках, оказалоÑÑŒ немного Ñложным. Мне удалоÑÑŒ Ñделать Ñто один раз, Ð¼ÐµÐ´Ð¸Ñ‚Ð¸Ñ€ÑƒÑ Ð½Ð° вершине ÐºÐ°Ð¼Ð½Ñ Ð² позе лотоÑа, ÑоÑÑ€ÐµÐ´Ð¾Ñ‚Ð°Ñ‡Ð¸Ð²Ð°Ñ Ñвою Ñилу через камень и пытаÑÑÑŒ ÑвÑзать уÑики моей Ñети Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ работой ритуала. Ð¥Ð¾Ñ‚Ñ Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð» неÑколько минут, вÑе, что Ñ Ð±Ñ‹Ð» дейÑтвительно награжден, - Ñто пара мокрых штанов, когда вода ринулаÑÑŒ на ритуальные камни. Я научилÑÑ Ð½Ðµ медитировать ни на одном из моих ÑкÑпериментов Ñнова. +guide.bloodmagic.entry.ritual.activationCrystal.info.1=ВмеÑто того чтобы ждать Ñ‡Ð°Ñ Ð·Ð° тем, чтобы медитировать ритуальный актив, мы взÑли краÑный драгоценный камень, который изначально выпал из коробки, и начали его анализировать. Тиберий был уверен, что у него была ÑпоÑобноÑÑ‚ÑŒ «уÑтановить ÑвÑзи между телеÑным царÑтвом нашей реальноÑти и беÑтелеÑной ÑущноÑтью, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ð¿Ñ€Ð¾Ñвленной Сетью Души». Иногда Ñ Ð·Ð°Ð´Ð°ÑŽÑÑŒ вопроÑом, было ли хорошей идеей, чтобы он Ñтал моим учеником, но в такие времена Ñ Ð²Ð¸Ð¶Ñƒ его ловкоÑÑ‚ÑŒ в более загадочных аÑпектах магии. О, Ñ, наверное, должен напиÑать, что он имел в виду на английÑком: иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñтот криÑталл, мы могли бы ÑвÑзать наши Ñети душ Ñ ÐšÐ°Ð¼Ð½ÐµÐ¼ МаÑтера Ритуала, чтобы Ñнабдить его Ñнергией. +guide.bloodmagic.entry.ritual.activationCrystal.info.2=Таким образом, мы получили Ñлабый активационный криÑталл и ÑредÑтво Ð´Ð»Ñ Ð²Ð¾ÑÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐµÐ³Ð¾ Ñтруктуры. ОÑновным компонентом криÑталла ÑвлÑетÑÑ ÐµÑ‰Ðµ один криÑталл, который может быть ÑвÑзан Ñ Ð¼Ð¾ÐµÐ¹ Ñетью душ: криÑталл лавы. Затем, быÑтро впиÑав некоторые инÑтрукции на поверхноÑÑ‚ÑŒ криÑталла, Ðлтарь Крови может выполнить оÑтавшуюÑÑ Ñ‡Ð°ÑÑ‚ÑŒ работы по превращению его в активационный криÑталл. ЕÑтеÑтвенно, Ñтот криÑталл должен быть ÑвÑзан Ñ Ð´ÑƒÑˆÐµÐ²Ð½Ð¾Ð¹ Ñетью пользователÑ, чтобы функционировать. Когда камни ритуала правильно уложены вокруг MRS, пользователь должен прикоÑнутьÑÑ Ðº криÑталлу активации к MRS и вытолкнуть доÑтаточно Ñнергии, чтобы начать Ñтот ритуал. ЕÑли у Ð²Ð°Ñ Ð´Ð¾Ñтаточно LP внутри вашей Soul Network, ритуал активируетÑÑ. ЕÑли вы Ñтого не Ñделаете, или еÑли камни не выложены правильно, ритуал проÑто не будет активирован, и никаких затрат на LP не будет. +guide.bloodmagic.entry.ritual.diviner.info.1=Изучив размер и раÑположение многих ритуалов, Ñ Ð½Ð°Ñ‡Ð°Ð» находить, что немного Ñкучно поÑтоÑнно проÑматривать Ñвои запиÑи, чтобы ÑоÑтавить ритуалы. Вот почему Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð» над Ñозданием уÑтройÑтва, которое позволÑло бы кому-либо проÑто помеÑтить камни в правильное положение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ проÑÑ‚Ñ‹Ñ… жеÑтов и движений. Я размеÑтил Ñту запиÑÑŒ дальше в хронологичеÑком порÑдке, потому что людÑм лучше вÑего изучить Ñтот предмет, прежде чем начинать Ñ Ñ„Ð°ÐºÑ‚Ð¸Ñ‡ÐµÑкого поÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð². Ð’ противном Ñлучае они могут узнать, что у них нет вÑего, что им нужно, или вызовут метеор из ада вмеÑто Ñвежей бутылки родниковой воды. +guide.bloodmagic.entry.ritual.diviner.info.2=Ritual Diviner - Ñто ÑÐ½Ñ†Ð¸ÐºÐ»Ð¾Ð¿ÐµÐ´Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð². ÐŸÐµÑ€ÐµÐ±Ð¸Ñ€Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñ†Ð°Ñ‚ÐµÐ»ÑŒ (щелчок левой кнопкой мыши и щелчок правой кнопкой мыши), вы можете выбрать другой ритуал из хранилища знаний. ВзглÑд на Ð¿Ñ€Ð¾Ñ€Ð¸Ñ†Ð°Ñ‚ÐµÐ»Ñ Ñ‚Ð°ÐºÐ¶Ðµ раÑÑкажет вам проÑтую информацию о ритуале. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ритуальные камни на вашем лице, и вы каÑаетеÑÑŒ предÑÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° MRS (щелчок правой кнопкой мыши), вы можете помеÑтить камень Ð´Ð»Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, который вы хотите поÑтроить. Ð”ÐµÐ»Ð°Ñ Ñто доÑтаточно раз, вы получите завершенный ритуал! +guide.bloodmagic.entry.ritual.fullSpring.info=ÐеÑколько лет назад торговец оÑтановилÑÑ Ð²Ð¾Ð·Ð»Ðµ деревни возле моего дома, Ð¿Ñ€Ð¾Ð´Ð°Ð²Ð°Ñ Ñвои товары вÑем, кто хотел раÑÑтатьÑÑ Ñо Ñвоей монетой. Ð’ то Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð»Ð° заÑуха, и поÑевы умирали, поÑтому торговец Ð¿Ñ€Ð¸Ð½ÐµÑ ÑеребрÑный талиÑман Ñ Ð³Ð¾Ð»ÑƒÐ±Ñ‹Ð¼ камнем внутри. «Это, Ð´Ñ€ÑƒÐ·ÑŒÑ Ð¼Ð¾Ð¸, - Ñказал он Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ уÑердием, - позаботитÑÑ Ð¾ том, чтобы ваши реки не выÑохли! ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ð»Ñ…Ð¸Ð¼Ð¸ÑŽ, Ñ Ð¼Ð¾Ð³Ñƒ вывеÑти воду из Ñамого воздуха!»\n\tК неÑчаÑтью Ð´Ð»Ñ Ð´ÐµÑ€ÐµÐ²Ð½Ð¸, казалоÑÑŒ, что Ñтот драгоценный камень был проÑтым куÑочком Ñапфира, и, прежде чем кто-то понÑл, что их обманули, он уже был в неÑкольких милÑÑ… отÑюда. Я Ñклонен не вмешиватьÑÑ Ð² дела деревни, потому что им не нравитÑÑ Ð¼Ð¾Ñ Ð¼Ð°Ð³Ð¸Ñ, но в Ñтом Ñлучае Ñ Ñделал иÑключение. ПоÑле того, как Ñ Ð¼Ð¸Ð»Ð¾ поболтал Ñ Â«Ð°Ð»Ñ…Ð¸Ð¼Ð¸ÐºÐ¾Ð¼Â», Ñ Ð¿Ñ€Ð¾Ð²ÐµÐ» неÑколько чаÑов, размышлÑÑ Ð²Ð¾Ð·Ð»Ðµ ирригационных каналов. КонденÑировав водÑной пар в воздухе, мне удалоÑÑŒ Ñоздать доÑтаточно воды, чтобы поливать урожай до Ñледующего падениÑ. Это был не ÑовÑем Ñффективный метод, и в течение Ñледующих неÑкольких дней Ð¼ÐµÐ½Ñ Ð¸Ñтощали, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‡Ð°ÑÑ‚ÑŒ воды из канала Ð´Ð»Ñ Ñ€ÐµÐ³Ð¸Ð´Ñ€Ð°Ñ‚Ð°Ñ†Ð¸Ð¸.\n\tÐŸÐ¾Ð¼Ð½Ñ Ð¾Ð± Ñтом, Ñ Ð¸Ñпользовал те же принципы Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð Ð¸Ñ‚ÑƒÐ°Ð»Ð° Полной ВеÑны. ÐаправлÑÑ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¾Ðµ количеÑтво Ñнергии в ритуал, он конденÑирует влагу в воздухе вокруг него, ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð¸Ñточник воды поверх оÑновного ритуального камнÑ. СтоимоÑÑ‚ÑŒ активации ритуала довольно незначительна, а обÑлуживание тем более. \n\tДиапазон воды может быть раÑширен Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ритуальной повозки и даже помещен в другое меÑто, поÑтому вам не нужно беÑпокоитьÑÑ Ð¾ том, где находитÑÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð», еÑли они беÑпокоÑÑ‚ÑÑ Ð¾Ð± ÑÑтетике. ЧудеÑа магии! +guide.bloodmagic.entry.ritual.lava.info=Лава, пожалуй, один из Ñамых Ñлементарных иÑточников Ñнергии. Я не очень чаÑто иÑпользую его в Ñвоих ÑобÑтвенных иÑÑледованиÑÑ…, потому что Ñ Ð½Ð¸Ð¼ может быть немного Ñложно работать - Ñто не то, что вы можете иÑпользовать проÑтое железное ведро, чтобы взÑÑ‚ÑŒ его! \n\tОдин один из меÑтных тинкеров пришел ко мне домой однажды и ÑпроÑил, еÑÑ‚ÑŒ ли поблизоÑти какие-нибудь иÑточники, поÑкольку недавно они приобрели какое-то новое оборудование, необходимое Ð´Ð»Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ. Я Ñказал, что их было неÑколько, но большинÑтво из них уже были в ÑобÑтвенноÑти, но Ñ Ñ€ÐµÑˆÐ¸Ð» приехать к нему, чтобы оÑмотреть уÑтройÑтво. \n\t Это был плавильный завод выÑотой не менее 5 метров и такой же ширины, подключенный к неÑкольким танки, которые ÑтоÑли пуÑтыми и беÑплодными. Ð¥Ð¾Ñ‚Ñ Ñ Ð½Ðµ был полноÑтью уверен в том, как он работает, Ñ Ð¼Ð¾Ð³ Ñказать, что Ð´Ð»Ñ Ñтого идеально подойдет Ñырое тепло лавы - ÑлектричеÑтво будет работать хорошо, еÑли его правильно модифицировать, но Ñ Ð¼Ð¾Ð³ Ñказать, что Ñто не от Immersive Industries. \n\tПоÑле небольшого разговора Ñ Ñ‚Ð¸Ð½ÐºÐµÑ€Ð¾Ð¼ деньги перешли к другому, и Ñ Ð¿Ð¾Ð¿Ñ€Ð¾Ñил его отойти в Ñторону, пока Ñ Ð³Ð¾Ñ‚Ð¾Ð²Ð¸Ð» Ñвои ритуальные камни. Чтобы иÑполнить то, что Ñ Ñ…Ð¾Ñ‚ÐµÐ», Ñ Ð²Ð·Ñл четыре огненных ÐºÐ°Ð¼Ð½Ñ Ð¸ раÑположил их в креÑте вокруг оÑновного ритуального камнÑ, а затем Ñильно толкнул Ñвоим криÑталлом активации, Ð²Ð¾Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ð² Ñвоей голове. ТеоретичеÑки Ñто должно быть проÑто: взÑÑ‚ÑŒ неÑколько камней из глубины земли и Ñжать их Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ñнергией, заÑтавлÑÑ Ð¸Ñ… плавитьÑÑ Ð¿Ð¾Ð´ Ñильным давлением и превращатьÑÑ Ð² раÑплавленный. Эту лаву можно было бы извлечь из ритуального камнÑ, и Ñтот процеÑÑ Ð¼Ð¾Ð¶Ð½Ð¾ повторить. Ð¥Ð¾Ñ‚Ñ Ñ‚ÐµÐ¾Ñ€ÐµÑ‚Ð¸Ñ‡ÐµÑки Ñто было проÑто, на практике Ñто было немного Ñложно. Ð”Ð»Ñ Ð¼Ð¾ÐµÐ¹ проÑтой Ñети в то Ð²Ñ€ÐµÐ¼Ñ ÑтоимоÑÑ‚ÑŒ активации была довольно выÑокой из-за первоначального требуемого давлениÑ, и Ñ Ð½Ðµ был готов к Ñтоку каждого иÑточника лавы. (20000 LP, чтобы активировать, 500 LP за иÑходный блок) \n\tЯ вышел из Ð·Ð´Ð°Ð½Ð¸Ñ Ñ ÑƒÑмешкой на моем лице, однако: танки были полны лавы, Ñтого доÑтаточно, чтобы держать тинкера в бизнеÑе на пару недель, пока он может обеÑпечить более поÑтоÑнный иÑточник лавы. Я вÑе же Ñобрал Ñвои ритуальные камни поÑле того, как закончил. \n\t ---------- \n\tБез изменений в ритуале, ритуал будет пытатьÑÑ Ð¿Ð¾Ð¼ÐµÑтить иÑточник лавы в блок непоÑредÑтвенно над Ñобой по цене 500 LP за каждый тик, еÑли еÑÑ‚ÑŒ Ñто меÑто, вытеÑнÑющее жидкоÑти, еÑли они текут. Этот диапазон Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию может быть раÑширен до 9 блоков на макÑимальном раÑÑтоÑнии 3 от ритуала. \n\tПри раÑширении ритуала Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Raw Will ÑтоимоÑÑ‚ÑŒ LP будет уменьшатьÑÑ Ð¿Ñ€Ð¾Ð¿Ð¾Ñ€Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾ воле, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ð² ауре, поглощающей волю, пропорционально количеÑтву Ñохраненного LP. ИÑпользование Ñтой воли может также предоÑтавить возможноÑÑ‚ÑŒ помещать лаву непоÑредÑтвенно во внутренние резервуары блока Ñо ÑкороÑтью, Ñравнимой Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼Ð¸ ритуальными операциÑми. \n\tCorrosive Will заÑтавлÑет ритуал инвертировать непобедимоÑÑ‚ÑŒ, обеÑпечиваемую иммунитетом к огню, в результате чего вÑе ÑущноÑти, обладающие иммунитетом ÑтрелÑÑ‚ÑŒ в пределах заданной облаÑти, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñерьезно повреждена в завиÑимоÑти от количеÑтва Воли в Ðуре. Те, кто не невоÑприимчив к огню, не поÑтрадают от Ñтого Ñффекта. \n\tПри мÑтительном желании, примененном к ритуалу, выделÑетÑÑ Ð»ÐµÑ‚ÑƒÑ‡Ð¸Ð¹ газ, из-за которого Огненный предохранитель воздейÑтвует на вÑех неигровых ÑущноÑтей в пределах указанного диапазона. Когда таймер дебаффа ÑтановитÑÑ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 0, ÑущноÑÑ‚ÑŒ взорветÑÑ, Ñилой взорвав их в воздух Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ взрывной Ñилы. \n\tDestructive Will увеличивает макÑимальную дальноÑÑ‚ÑŒ и объем, на которые может влиÑÑ‚ÑŒ ритуал. Чем больше у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚, тем больше лавовых блоков можно размеÑтить за один ритуал. К ÑчаÑтью, ритуал не иÑтощает никакой Разрушительной Воли, однако, еÑли ваша Ð’Ð¾Ð»Ñ Ð¿Ð°Ð´Ð°ÐµÑ‚ и макÑимальный диапазон ритуала ниже того, на котором вы его уÑтановили, ритуал не будет работать вообще до тех пор, пока не будет иÑправлен. \n\tÐаконец, Steadfast Will предоÑтавит вÑем игрокам в пределах его диапазона бафф огнеÑтойкоÑти, Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ ÑтоимоÑÑ‚ÑŒ которого в Воли завиÑÑÑ‚ от количеÑтва Воли в Ðуре. Ðеобходимо Ñоблюдать оÑторожноÑÑ‚ÑŒ, потому что еÑли вы подвержены воздейÑтвию огнеÑтойкоÑти, вы можете быть повреждены Ñффектом ритуала. +guide.bloodmagic.entry.ritual.greenGrove.info=Ðа прошлой неделе Ñ Ð½Ð°Ñ‡Ð°Ð» учить Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ Ñвоей междиÑциплинарной магии. Каждый мой ученик должен был изучать другую форму магии, Ð¸Ð·ÑƒÑ‡Ð°Ñ Ð¼Ð°Ð³Ð¸ÑŽ крови. Ðеважно, какой из них они выберут, пока он не потреблÑет какую-то форму ограниченного реÑурÑа - Ñ Ð¸Ñпользовал магию из клана ÐÑ€Ñ Ñ Ð”Ð°Ð»ÑŒÐ½ÐµÐ³Ð¾ ВоÑтока, но так как мировой иÑточник Ð­Ñ‚ÐµÑ€Ð¸Ñ Ð±Ñ‹Ð» поглощен в дефицит Ñто вымерло давно. \n\tТиберий решил изучить Тауматургию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ñпользует магию мира, чтобы выполнить Ñвою магию. Это хороший Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð¾Ð²ÐµÑ Ð¼Ð°Ð³Ð¸Ð¸ крови, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ñпользует магию жизни. Таким образом, Ñти магичеÑкие ÑредÑтва иÑпользуют разные ÑредÑтва Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¸Ñ… и тех же задач. Чтобы продемонÑтрировать, Ñ Ñ€ÐµÑˆÐ¸Ð» выделить Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ñ Ð¢Ð¸Ð±ÐµÑ€Ð¸ÑƒÑом, когда речь заходит о роÑте урожаÑ. \n\t "Ð¢Ð°ÑƒÐ¼Ð°Ñ‚ÑƒÑ€Ð³Ð¸Ñ Ð¸Ñпользует катализатор роÑта, который питаетÑÑ Ð¾Ñ‚ ÐÑпекты Herba", - заÑвлÑÑŽ Ñ, ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ Ð½Ð° блок-Ñхему Essentia, прикрепленную к клаÑÑной комнате. Ñтены. Конечно, Тиберий Ñидел за единÑтвенным Ñтолом там, но иногда парню нужно повеÑелитьÑÑ. «ÐÐµÐ±Ð¾Ð»ÑŒÑˆÐ°Ñ Ñтруйка ауры и Ñтой ÑÑÑенции Ñтимулирует процеÑÑ Ñ„Ð¾Ñ‚Ð¾Ñинтеза раÑтениÑ, Ð¿Ð¾Ð±ÑƒÐ¶Ð´Ð°Ñ ÐµÐ³Ð¾ раÑти, Ð´Ð°Ð²Ð°Ñ ÐµÐ¼Ñƒ больше Ñолнечной Ñнергии. Этот процеÑÑ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚, чтобы почва была хорошо удобрена, иначе урожай может проÑто заÑохнуть и умереть». \ Затем Ñ Ð±ÐµÑ€Ñƒ четыре ритуальных ÐºÐ°Ð¼Ð½Ñ Ð·ÐµÐ¼Ð»Ð¸ и воды и помещаю их в круг вокруг оÑновного ритуального камнÑ. «И наоборот, Blood Magic иÑпользует другой процеÑÑ». Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð° Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€ÑƒÑŽ ритуал и покрываю его проÑтой грÑзью. «ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñвою жизненную Ñилу или Ñнергию животных, вы можете удобрÑÑ‚ÑŒ раÑÑ‚ÐµÐ½Ð¸Ñ Ñ‚Ð°ÐºÐ¸Ð¼ образом, чтобы они не нуждалиÑÑŒ в таком большом количеÑтве удобрений. По Ñути, они наÑильÑтвенно кормÑÑ‚ раÑтениÑ, чтобы они вÑегда имели выÑокую концентрацию питательных вещеÑтв». . "\n\tЯ броÑаю неÑколько ÑемÑн в грÑзь и Ñлегка прикрываю их, Ð¾Ñ‚ÐºÑƒÐ¿Ð¾Ñ€Ð¸Ð²Ð°Ñ Ð¸ опорожнÑÑ Ñ„Ð»Ð°ÐºÐ¾Ð½ Ñ Ð²Ð¾Ð´Ð¾Ð¹ из моей мантии. «Этот процеÑÑ Ð½Ðµ нуждаетÑÑ Ð² дополнительном Ñолнечном Ñвете, потому что он иÑпользует другой иÑточник Ñнергии. Ð¥Ð¾Ñ‚Ñ Ð¾Ð½ работает намного лучше, когда еÑÑ‚ÑŒ немного Ñвета - раÑтение точно не привыкло к такого рода уÑловиÑм!» \n\tA неÑколько побегов уже выÑунули Ñвои лиÑÑ‚ÑŒÑ Ð¸Ð· грÑзи, пока Ñ Ð¾Ð±ÑŠÑÑнÑл, по-видимому, Ð¼Ð°Ñ…Ð°Ñ Ð² ответ. Я чувÑтвовал легкую нагрузку на Ñвое тело, когда каждый новый лиÑÑ‚ прораÑтал, каждый раз незначительный, но при накоплении он начинал ÑкладыватьÑÑ. Закончив урок, Ñ Ð¾Ñ‡Ð¸Ñтил ÑкÑперимент от грÑзи и решил прогулÑÑ‚ÑŒÑÑ Ð´Ð¾ деревни: у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð» бушель пшеницы, который нужно было продать. \n\t ---------- \n\tРитуал Зеленой рощи, как Ñледует из названиÑ, уÑкорÑет темпы роÑта находÑщихÑÑ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾Ñти раÑтений. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÑ€Ð¾Ð²ÑŒ игрока в качеÑтве богатого удобрениÑ, он будет пытатьÑÑ Ð²Ñ‹Ñ€Ð°Ñтить вÑе, что он Ñчитает раÑтением, например, пшеницу и морковь, периодичеÑки Ð²Ñ‹Ñ€Ð°Ñ‰Ð¸Ð²Ð°Ñ Ñ‡Ñ‚Ð¾-либо в пределах Ñвоего диапазона. С помощью операций по умолчанию ритуал будет Ñмотреть на облаÑÑ‚ÑŒ 3Ñ…3 на два блока выше ÑÐµÐ±Ñ Ð¸ пытатьÑÑ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ‚ÑŒ каждый блок Ñ Ð²ÐµÑ€Ð¾ÑтноÑтью уÑпеха 30 %% каждую Ñекунду. При манипулировании Ñ Ritual Tinkerer, ритуал может обрабатывать макÑимум 81 урожай за один раз в радиуÑе 5 блоков от MRS. Как еще одно примечание \n\t, когда оно дополнено волей демонов, еÑÑ‚ÑŒ неÑколько Ñффектов, которые можно получить. ЕÑли иÑпользуетÑÑ ÐÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð°Ñ Ð’Ð¾Ð»Ñ, ритуал будет выполнÑÑ‚ÑŒ вÑе операции Ñ ÑƒÑкоренной ÑкороÑтью, потреблÑÑ 0,05 Воли за каждый уÑпешный роÑÑ‚ и ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ Ñвою ÑкороÑÑ‚ÑŒ отноÑительно количеÑтва Воли в Ðуре. \n\tЕÑли вливаетÑÑ Ð² ÐœÑтительную Волю, ритуал будет поглощать 0.05 Ð’Ð¾Ð»Ñ Ð·Ð° уÑпешный роÑÑ‚ и увеличит вероÑтноÑÑ‚ÑŒ того, что данный рабочий тик будет уÑпешным на заводе. По умолчанию без Воли Ñто ÑоÑтавлÑет 30 %%, но, например, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ 100 ÐœÑтительного ВолÑ, показатель увеличитÑÑ Ð´Ð¾ 80 %%. \n\tDestructive Ð’Ð¾Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ макÑимальный Ñффективный диапазон ритуала, то еÑÑ‚ÑŒ чем больше у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚, тем больше культур / раÑтений, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ может ÑправитьÑÑ Ð¾Ð´Ð¸Ð½ ритуал. К ÑчаÑтью, ритуал не иÑтощает никакой разрушительной воли, однако, еÑли ваша Ð²Ð¾Ð»Ñ Ð¿Ð°Ð´Ð°ÐµÑ‚ и макÑимальный диапазон ритуала ниже того, на котором вы его уÑтановили, ритуал не будет работать вообще до тех пор, пока не будет иÑправлен. \n\tSteadfast ПредоÑтавит возможноÑÑ‚ÑŒ уÑтановить облаÑÑ‚ÑŒ вокруг ритуала, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ автоматичеÑки обрабатыватьÑÑ Ð¸ увлажнÑÑ‚ÑŒÑÑ. Кроме того, любое ÑемÑ, которое находитÑÑ Ð² Ñтом диапазоне, будет поÑеÑно в ÑоÑеднем блоке, еÑли Ñто возможно. Это Ñтоит небольшого количеÑтва УÑтойчивой Воли, и ее Ñффекты не маÑштабируютÑÑ Ñ Ð’Ð¾Ð»Ð¸ в Ðуре. \n\t Когда ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¹Ð½Ð°Ñ Ð’Ð¾Ð»Ñ Ð¸ÑпользуетÑÑ Ð² ритуале, Ñ„ÑƒÐ½Ð´Ð°Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¸Ñ€Ð¾Ð´Ð° ритуала может изменитьÑÑ. При поÑтавке и правильной наÑтройке нового диапазона на вÑех мобов, попадающих в зону влиÑÐ½Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, будет применÑÑ‚ÑŒÑÑ Ñффект «ПиÑвка». Каждые неÑколько тиков раÑÑ‚ÐµÐ½Ð¸Ñ Ð²Ð¾Ð·Ð»Ðµ мобов будут повреждены, а моб будет поврежден пропорционально. Оплодотворение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ мобов может оказатьÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ‹Ð¼! Каждые 10 Ñекунд Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´ÐµÐ±Ð°Ñ„Ñ„Ð° на моба будет поглощатьÑÑ 0,2 ед. +guide.bloodmagic.entry.ritual.magnetism.info=Ритуал магнетизма хлеб Ñ Ð¼Ð°Ñлом, кто пользуетÑÑ ÐºÐ°Ñ€ÑŒÐµÑ€Ð°Ð¼Ð¸. Ритуал Ñоздает вращающееÑÑ Ð¼Ð°Ð³Ð½Ð¸Ñ‚Ð½Ð¾Ðµ поле, подтÑгивание богатые руды Ñ Ð·ÐµÐ¼Ð»Ð¸ под ним и размещением Ñодержимого в Ñвоей облаÑти. Это не вытеÑнÑет какой-либо камень, так что никакие зиÑющие отверÑÑ‚Ð¸Ñ Ð½Ðµ будут поÑвлÑÑ‚ÑŒÑÑ Ð½Ð° земле - при уÑловии, что Ð·ÐµÐ¼Ð»Ñ Ð½Ðµ полноÑтью ÑоÑтоит из ротовой полоÑти. Ритуал дейÑтвует один раз каждые 40 тиков и раÑходы 50LP через уÑпешную операцию.\n\tÐ Ð°Ð´Ð¸ÑƒÑ Ð¿Ð¾ умолчанию, которым управлÑет Ñтот ритуал, ÑоÑтавлÑет 3 блока в каждом кардинальном направлении, Ð´Ð°Ð²Ð°Ñ Ð¿Ð»Ð¾Ñ‰Ð°Ð´ÑŒ 7x7 блоков Ñ Ñ†ÐµÐ½Ñ‚Ñ€Ð¾Ð¼ в MRS. ПоÑкольку у ритуала в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½ÐµÑ‚ никаких дополнений к Воли, вы можете только увеличить Ñ€Ð°Ð´Ð¸ÑƒÑ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, помеÑтив ценный блок непоÑредÑтвенно под MRS. ЕÑли иÑпользуетÑÑ Ð¶ÐµÐ»ÐµÐ·Ð½Ñ‹Ð¹ блок, Ñ€Ð°Ð´Ð¸ÑƒÑ ÑтановитÑÑ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 7. ЕÑли иÑпользуетÑÑ Ð·Ð¾Ð»Ð¾Ñ‚Ð¾Ð¹ блок, Ñ€Ð°Ð´Ð¸ÑƒÑ ÑтановитÑÑ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 15. Ðаконец, еÑли иÑпользуетÑÑ Ð°Ð»Ð¼Ð°Ð·Ð½Ñ‹Ð¹ блок, Ñ€Ð°Ð´Ð¸ÑƒÑ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð´Ð¾ 31, что означает, что Ð»ÑŽÐ±Ð°Ñ Ñ€ÑƒÐ´Ð° ниже ритуала в облаÑти 63x63 будет медленно подтÑнулÑÑ Ðº Ñвоему объему 3x3x3 выше MRS. +guide.bloodmagic.entry.ritual.crusher.info=Ритуал дейÑÑ‚Ð²Ð¸Ñ Ð´Ñ€Ð¾Ð±Ð¸Ð»ÐºÐ¸ довольно проÑÑ‚. Ритуал должен иметь какую-то форму инвентарÑ, ÑвÑзанную Ñ Ð½Ð¸Ð¼, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð² неизмененном виде проÑто раÑполагаетÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ… MRS. Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ ритуал будет Ñмотреть в пределах Ñвоего диапазона Ð´Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¸Ñ (по умолчанию облаÑÑ‚ÑŒ 3x3x3 ниже ритуала) и разбивать по одному блоку за раз Ñо ÑкороÑтью один раз каждые 2 Ñекунды за Ñчет 7 LP за уÑпешную операцию. Затем разбитые блоки будут перенеÑены в ÑвÑзанный инвентарь - еÑли нет меÑта Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð², они вмеÑто Ñтого будут извергатьÑÑ Ñверху Ñундука.\n\tПри заправке Ñырой волей ритуал будет работать быÑтрее, в завиÑимоÑти от общего количеÑтва воли в ауре. При уÑкорении он будет потреблÑÑ‚ÑŒ 0,05 необработанной воли за каждую уÑпешную операцию.\n\tÐ Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð¾Ð´Ð¸Ñ‚ к тому, что блоки, разбитые ритуалом, применÑÑŽÑ‚ к нему Фортуну. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ ÑоÑтоÑÐ½Ð¸Ñ Ð½Ðµ менÑетÑÑ Ð¸ ÑоÑтавлÑет 3 ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½ÐµÐ·Ð°Ð²Ð¸Ñимо от количеÑтва Воли. Это будет потреблÑÑ‚ÑŒ 0,2 Воли за уÑпешную операцию, незавиÑимо от того, была ли она полезной.\n\tВмеÑто Ñтого, Steadfast Will будет разрушать блоки Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñффекта Silk Touch. Это будет Ñтоить 0,02 Воли за операцию, и будет перекрывать Ñффект РазрушениÑ, где Ñто возможно.\n\tÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¹Ð½Ð°Ñ Ð²Ð¾Ð»Ñ Ð´ÐµÐ»Ð°ÐµÑ‚ так, чтобы блоки, разбитые ритуалом, обрабатывалиÑÑŒ какой-либо формой Ñмазочно-охлаждающей жидкоÑти. Это означает, что, например, еÑли Ñто железный блок, результатом будет два куÑка железного пеÑка. Текущие «Ñмазочно-охлаждающие жидкоÑти», которые иÑпользуютÑÑ Ð² ритуале: Ð±Ð°Ð·Ð¾Ð²Ð°Ñ Ñмазочно-Ð¾Ñ…Ð»Ð°Ð¶Ð´Ð°ÑŽÑ‰Ð°Ñ Ð¶Ð¸Ð´ÐºÐ¾ÑÑ‚ÑŒ и взрывчатый порошок. Ритуал потреблÑет различное количеÑтво Воли в завиÑимоÑти от того, что было иÑпользовано, и будет потреблÑÑ‚ÑŒ Волю только в том Ñлучае, еÑли применÑетÑÑ Ñффект. Это отменÑет Silk Touch, где Ñто применимо.\n\tÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð¾Ð´Ð¸Ñ‚ к тому, что при уÑпешной операции инвентарь Ñжимает Ñодержимое, аналогично Ñимволу ÑжатиÑ: еÑли внутри Ñундука 65 пыль краÑного камнÑ, то будет Ñоздан один блок краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ оÑтанетÑÑ 56 пыли. Ð’Ð¾Ð»Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð»ÑетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ тогда, когда Ñто уÑпешно, и Ñтоит 0,2 воли. +guide.bloodmagic.entry.ritual.highJump.info=Этот ритуал иÑпользует огромный взрыв воздуха, чтобы поднÑÑ‚ÑŒ вÑех тех, кто идет по нему, в небо. Более того, еÑли пользователь приземлитÑÑ Ð² зоне дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, он не получит никакого урона от падениÑ. Игроки, которые крадутÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ñтого ритуала, также не затрагиваютÑÑ.\n\tРитуал Ñтоит 5LP за единицу за такт уÑпешной операции, поÑтому ничего не будет Ñтоить, еÑли он не броÑит людей в воздух. +guide.bloodmagic.entry.ritual.speed.info=Как Ñледует из названиÑ, Ритуал СкороÑти иÑпользуетÑÑ Ð´Ð»Ñ Ñ‚Ñ€Ð°Ð½Ñпортировки различных видов. Ритуал может быть размещен в направлении любого из оÑновных направлений, и любые объекты в пределах его диапазона будут запущены в направлении, указанном ритуалом. При взглÑде на ритуал, Ñто направление, где находитÑÑ Ñумеречный ритуал. По умолчанию ритуал имеет Ñ€Ð°Ð´Ð¸ÑƒÑ 2 блока от MRS, Ñ…Ð¾Ñ‚Ñ ÐµÐ³Ð¾ можно раÑширить или Ñократить при иÑпользовании ритуала. Это будет применÑÑ‚ÑŒ ÑкороÑÑ‚ÑŒ 3 блока / тик в направлении ритуала и 1,2 блока / тик по вертикали.\n\tЕÑли ритуал заправлен Сырой Волей, ÑкороÑÑ‚ÑŒ ритуала ÑущеÑтвенно увеличиваетÑÑ Ð½Ð° оÑнове Воли, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð² Ðуре. Ðапример, ÑкороÑÑ‚ÑŒ будет удвоена, еÑли внутри Ðуры будет 100 Воли. Ðа каждую уÑпешную операцию раÑходуетÑÑ 0,1 Воли.\n\tÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð½Ðµ позволÑет ритуалу перемещать взроÑлых мобов, а ДеÑÑ‚Ñ€ÑƒÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð²Ð¾Ð»Ñ Ð½Ðµ дает ритуалу перемещать детÑких мобов. ЕÑли один из них иÑпользуетÑÑ, игрокам также запрещаетÑÑ Ð¸Ñпользовать ритуал. Однако, еÑли они оба иÑпользуютÑÑ, Ñффект ÑоÑтоит в том, что только игроки могут иÑпользовать ритуал, а мобы - нет. Эти Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ Ñффективно иÑпользоватьÑÑ Ð´Ð»Ñ Ñортировки ферм животных или даже Ð¸Ð·Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ñтих надоедливых детÑких зомби в вашей жертвенной ручке. Ритуал будет потреблÑÑ‚ÑŒ 0,05 Воли Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ типа, который дейÑтвует при уÑпешной операции, поÑтому, еÑли ребенок входит в ритуальное проÑтранÑтво, когда вы иÑпользуете Разрушительную волю, Ñто не будет Ñтоить Уилла или LP. +guide.bloodmagic.entry.ritual.wellOfSuffering.info=Ð”Ð»Ñ Ñ‚ÐµÑ… из ваÑ, кто предпочитает иÑпользовать мобов вмеÑто ÑобÑтвенного здоровьÑ, колодец Ñтраданий наноÑит урон вÑем живым ÑущеÑтвам, не ÑвлÑющимÑÑ Ð¸Ð³Ñ€Ð¾ÐºÐ°Ð¼Ð¸, в радиуÑе 10 блоков и помещает здоровье в подключенный алтарь. Ритуал будет иÑкать алтарь крови в пределах его диапазона, проверÑÑ 5 блоков по горизонтали и 10 блоков по вертикали без изменений. Когда он находит алтарь, он ÑохранÑет Ñвое меÑтоположение внутри - еÑли поблизоÑти нет алтарÑ, ритуал не будет работать. Ритуал будет давать 1 HP за единицу и помещать 25 алмазов в алтарь (100 Ð´Ð»Ñ Ð¼Ð¸Ñ€Ð½Ñ‹Ñ… животных), который может быть увеличен рунами ЖертвоприношениÑ. +guide.bloodmagic.entry.ritual.featheredKnife.info=Ритуал Пернатого Ðожа врезаетÑÑ Ð² тело пользователÑ, иÑÑ‚Ð¾Ñ‰Ð°Ñ ÐµÐ³Ð¾ жизненную Ñилу, чтобы заполнить кровавый алтарь поблизоÑти. Ритуал будет иÑкать алтарь крови в пределах его диапазона, проверÑÑ 5 блоков по горизонтали и 10 блоков по вертикали без изменений. Когда он находит алтарь, он ÑохранÑет Ñвое меÑтоположение внутри - еÑли поблизоÑти нет алтарÑ, ритуал не будет работать. Когда игрок входит в диапазон урона ритуала, который по умолчанию равен радиуÑу 15 блоков по горизонтали и 20 блоков по вертикали, ритуал наноÑит игроку урон в течение 1HP, а затем помещает Ñто здоровье непоÑредÑтвенно в подключенный алтарь (Ñ ÑƒÑ‡ÐµÑ‚Ð¾Ð¼ кровавых рун). Ð’ ритуале еÑÑ‚ÑŒ неÑколько механизмов безопаÑноÑти, которые не позволÑÑŽÑ‚ игроку, чье здоровье ÑоÑтавлÑет менее 30%. Ðе подвергаÑÑÑŒ Ñомнению, ритуал делает Ñто раз в Ñекунду. \n\tЕÑÑ‚ÑŒ неÑколько полезных дополнений, которые вы можете иÑпользовать, еÑли будете иÑпользовать Волю Демона. ЕÑли ÑÑ‹Ñ€Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ð¾Ð³Ð»Ð¾Ñ‰Ð°ÐµÑ‚ÑÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð¼, ритуал будет пытатьÑÑ Ð½Ð°Ð½Ð¾Ñить урон игрокам в пределах Ñвоего диапазона Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ ÑкороÑтью, Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ Ð´Ð²Ð° раза в Ñекунду. Ритуал потреблÑет 0,05 необработанной воли за каждую уÑпешную операцию. \n\tЕÑли у Ð²Ð°Ñ Ð² ауре более 10 Ñтойких волей, ритуал повыÑит Ñвой порог безопаÑноÑти и вмеÑто Ñтого не будет работать Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°Ð¼Ð¸, чье здоровье ÑоÑтавлÑет менее 70%. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½Ðµ потреблÑет Воли. \n\tЕÑли у Ð²Ð°Ñ Ð² Ðуре более 10 ÐœÑтительных желаний, ритуал Ñнимает некоторые Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти, заÑтавлÑÑ ÐµÐ³Ð¾ работать на игроков, пока у них не будет только 10 %% от их макÑимального здоровьÑ. оÑтавил. ЕÑли в ритуале также еÑÑ‚ÑŒ Steadfast Will, порог вÑе равно будет 70 %% только Ð´Ð»Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð° ритуала. Эта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð² наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½Ðµ потреблÑет Воли. \n\t Когда ДемонÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ Ð’Ð¾Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑетÑÑ Ðº ритуалу, ритуал ÑтановитÑÑ Ð½Ð°Ð¼Ð½Ð¾Ð³Ð¾ более Ñффективным Ñ ÐµÐ³Ð¾ преобразованием HP в LP. КоличеÑтво LP, которое добавлÑетÑÑ Ðº алтарю за единицу здоровьÑ, увеличиваетÑÑ Ð² завиÑимоÑти от Воли в Ðуре, макÑимум до + 20 %% за 100 Разрушительного ВолÑ. Этот Ñффект ÑкладываетÑÑ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¿Ð»Ð¸ÐºÐ°Ñ‚Ð¸Ð²Ð½Ð¾ Ñ Ñ€ÑƒÐ½Ð°Ð¼Ð¸, УлучшениÑми Живой Брони и БлаговониÑми. Это потреблÑет 0,05 Разрушительной Воли за принеÑенное в жертву HP. \n\t Ð“Ð¾Ð²Ð¾Ñ€Ñ Ð¾ благовониÑÑ…, еÑли в обрÑде иÑпользуетÑÑ ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð²Ð½Ð°Ñ Ð’Ð¾Ð»Ñ, ритуал будет уважать воздейÑтвие благовоний на ваÑ. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ дебаффа Soul Fray, и вы наделены Ñилой ÐÐ»Ñ‚Ð°Ñ€Ñ Ð‘Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ð¹, ритуал израÑходует вÑе ваши HP до уÑтановленного порога и накачает вÑе получившиеÑÑ LP в алтарь. Это также удалит благовониÑ, которые вы понеÑли, и нанеÑет на Ð²Ð°Ñ Soul Fray. Этот Ñффект накладываетÑÑ Ð½Ð° бафф Â«Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ». +guide.bloodmagic.entry.ritual.regen.info=Возможно, один из лучших ритуалов Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð³Ð¾ потенциального Кровавого Мага, который хочет иÑпользовать Ñвою ÑобÑтвенную жизненную Ñилу Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ‚ÐºÐ¸ Ñвоей магии, Ритуал Регенерации Ñоздает вокруг ÑÐµÐ±Ñ Ð·Ð°Ð²ÐµÑу Ñнергии, иÑцелÑющие ÑущноÑти, находÑщиеÑÑ Ð² его пределах. Каждые 2,5 Ñекунды ритуал разыгрывает Регенерацию I на живых ÑущеÑтвах в радиуÑе 15 блоков, ÑтоимоÑÑ‚ÑŒ 100 фунтов на игрока и 10 фунтов на других живых ÑущеÑтв в течение 2,5 Ñекунд регенерации. \n\tЕÑли Corrosive Will иÑпользуетÑÑ Ð´Ð»Ñ ÑƒÑÐ¸Ð»ÐµÐ½Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, будет доÑтупен второй диапазон, «вампиричеÑкий диапазон». Любые неигровые ÑущеÑтва в Ñтом диапазоне будут Ñлучайным образом повреждены, чтобы непоÑредÑтвенно иÑцелить игроков в обычном диапазоне иÑцелениÑ. Это Ñтоит 0,04 воли Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ будет переводить 1HP за операционный тик. +guide.bloodmagic.entry.ritual.harvest.info=Этот ритуал будет иÑкать любой Ñобираемый раÑтительный блок в пределах его диапазона (по умолчанию облаÑÑ‚ÑŒ 9x9x5 выше MRS) и попытатьÑÑ Ñобрать его, переÑÐ°Ð¶Ð¸Ð²Ð°Ñ Ð»ÑŽÐ±Ñ‹Ðµ Ñемена, еÑли раÑтение может пропуÑтить Ñемена. Ð’Ñе капли Ñ Ñ€Ð°ÑÑ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾ÑвÑÑ‚ÑÑ Ñ‚Ð°Ð¼, где было Ñобрано раÑтение. Ритуал будет пытатьÑÑ Ñобирать раÑÑ‚ÐµÐ½Ð¸Ñ Ð¾Ð´Ð¸Ð½ раз в 5 тиков и будет Ñтоить 20 фунтов Ñтерлингов за уÑпешную операцию.\n\tРаÑтениÑ, которые можно Ñобирать, включают, но не ограничиваютÑÑ Ð¸Ð¼Ð¸: тыквы, пшеницу, морковь, картофель, бородавку, кактуÑ, троÑтник. Имейте в виду, что ритуал не делает никаких предположений отноÑительно того, что он Ñобирает - он может Ñобирать урожай только Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¼ модом, еÑли данный мод региÑтрирует обработчик уборки Ñ Ð¼Ð¾Ð´Ð¾Ð¼. +guide.bloodmagic.entry.ritual.interdiction.info=ОÑнованный на архаичеÑком алхимичеÑком уÑтройÑтве легенды, Ритуал Запрета пытаетÑÑ Ð½Ð°Ñильно оттолкнуть вÑех неигровых мобов от центра ритуала. По умолчанию вÑе мобы, которые находÑÑ‚ÑÑ Ð² двух блоках MRS, отталкиваютÑÑ Ð¾Ñ‚ MRS, уÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ Ð¸Ñ… ÑкороÑÑ‚ÑŒ. Следует отметить, что мобы в Ñтом диапазоне не подвержены урону от падениÑ, Ñ…Ð¾Ñ‚Ñ Ñта Ð·Ð°Ñ‰Ð¸Ñ‚Ð½Ð°Ñ Ñетка ÑтираетÑÑ, как только их отталкивают. +guide.bloodmagic.entry.ritual.containment.info=Ð’ противоположноÑÑ‚ÑŒ Запрету, Ритуал ÑÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÑÑ Ð¿Ð¾Ð´Ñ‚Ñнуть мобов в пределах его зоны дейÑÑ‚Ð²Ð¸Ñ Ðº проÑтранÑтву над MRS, Ð¿Ð¾Ð´Ð²ÐµÑˆÐ¸Ð²Ð°Ñ Ð¸Ñ… в воздухе, где они не могут двигатьÑÑ. Диапазон ритуала по умолчанию - горизонтальный Ñ€Ð°Ð´Ð¸ÑƒÑ Ð² 3 блока от нижней чаÑти маÑтер-ÐºÐ°Ð¼Ð½Ñ Ð´Ð¾ верхней чаÑти Ñамых верхних рун, Ñ…Ð¾Ñ‚Ñ Ñтот диапазон, конечно, можно изменить.\n\tЭтот ритуал Ñтоит 1LP за моба, потÑнувшего каждый тик. +guide.bloodmagic.entry.ritual.suppression.info=Купол Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Â«Ð¿Ð¾Ð´Ð°Ð²Ð»Ñет» вÑе жидкоÑти в заданном радиуÑе, ÑпоÑобные временно заменить жидкоÑти в полушарии Ñ Ñ€Ð°Ð´Ð¸ÑƒÑом 10 блоков воздухом. ЕÑли ритуал выключен, Ñта жидкоÑÑ‚ÑŒ вернетÑÑ Ð² то же ÑоÑтоÑние, в котором она была раньше. Это Ñтоит 2LP за операционный такт. +guide.bloodmagic.entry.ritual.expulsion.info=ЕÑли вы играете на Ñервере, вы можете ÑтолкнутьÑÑ Ñ Ñитуацией, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ нежелательные поÑетители. Иногда Ñиловые Ð¿Ð¾Ð»Ñ Ð¸ гигантÑкие кровавые роторы не ÑвлÑÑŽÑ‚ÑÑ Ð´Ð¾Ñтаточным Ñдерживающим фактором, и им вÑе же удаетÑÑ Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½ÑƒÑ‚ÑŒ на вашу базу. Этот ритуал пытаетÑÑ Ð¾Ð±Ð»ÐµÐ³Ñ‡Ð¸Ñ‚ÑŒ Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ магии телепортации!\n\tЕÑли игрок, не ÑвлÑющийÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼, входит в зону дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð° (по умолчанию Ñ€Ð°Ð´Ð¸ÑƒÑ 12 блоков), ритуал Ñлучайным образом телепортирует игрока в радиуÑе 100 блоков. Однако, еÑли на MRS еÑÑ‚ÑŒ Ñундук Ñ Ð¿Ñ€Ð¸Ð²Ñзанным предметом от игрока, Ñтот игрок будет оÑвобожден от телепортации, дейÑÑ‚Ð²ÑƒÑ Ñффективно как белый ÑпиÑок.\n\tРитуал Ñтоит 2000LP за уÑпешную телепортацию. +guide.bloodmagic.entry.ritual.zephyr.info=Созданный по образцу древнего меча поÑловицы, Зов Зефира иÑпользует Ñилу ветра, чтобы Ñобрать предметы, которые находÑÑ‚ÑÑ Ð²Ð¾ÐºÑ€ÑƒÐ³ него, и помеÑтить их в ÑвÑзанный Ñундук (по умолчанию прÑмо над MRS). Это делаетÑÑ Ð¼Ð³Ð½Ð¾Ð²ÐµÐ½Ð½Ð¾, что означает, что предметы телепортируютÑÑ Ð¿Ñ€Ñмо в инвентарь - не нужно беÑпокоитьÑÑ Ð¾ Ñтранных Ñффектах вÑаÑываниÑ!\n\tÐ Ð°Ð´Ð¸ÑƒÑ Ñлемента по умолчанию ÑоÑтавлÑет 5 блоков от MRS. +guide.bloodmagic.entry.ritual.laying.info=Как извеÑтно многим, возможноÑÑ‚ÑŒ размещать блоки может быть важной в различных задачах автоматизации. Этот ритуал берет предметы / блоки из подключенного Ñундука (по умолчанию Ñверху MRS) и помещает блоки в ритуал, Ñ€Ð°Ð´Ð¸ÑƒÑ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ равен 2 на том же уровне, что и MRS. Это может быть полезно, еÑли вы пытаетеÑÑŒ выложить Ñаженцы Ð´Ð»Ñ Ñ„ÐµÑ€Ð¼Ñ‹ деревьев или еÑли еÑÑ‚ÑŒ другие блоки, которые необходимо размеÑтить. Ритуал берет 50LP за уÑпешную операцию. +guide.bloodmagic.entry.ritual.timberman.info=ЕÑÑ‚ÑŒ дерево? Этот ритуал покрыл тебÑ. Crash of the Timberman привÑзывает Ñпектральную ÑущноÑÑ‚ÑŒ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ LP владельца, чтобы Ñобрать лиÑÑ‚ÑŒÑ Ð¸ бревна вÑех деревьев в пределах Ñвоего диапазона и помещает результаты в подключенный Ñундук. Он попытаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ вÑе «деревьÑ» в горизонтальном радиуÑе 10 блоков и до 30 блоков выше MRS (по умолчанию) и иÑпользовать 10LP на Ñрубленный блок. +guide.bloodmagic.entry.ritual.meteor.info=Ð”Ð»Ñ Ð²Ñех намерений и целей, Ñто один из Ñамых мощных ритуалов в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð² игре. ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñтоит один миллион LP и может быть иÑпользована только один раз перед повторной активацией. Ритуал, когда ÑовершаютÑÑ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ñ‹Ðµ жертвы, вытÑгивает метеор из коÑмоÑа и заÑтавлÑет его резко упаÑÑ‚ÑŒ к земле, Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ взрыв, когда он попадает во что-то твердое. ПоÑкольку Ñти метеоры не из Мира, они могут Ñодержать богатую плотноÑÑ‚ÑŒ руды, которую никогда не видели больше нигде.\n\tÐ–ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ включать в ÑебÑ: железный блок, золотой блок, алмаз. Это наÑтраиваетÑÑ Ð¼Ð¾Ð´Ð¿Ð°ÐºÐ¾Ð¼ или пользователем. +guide.bloodmagic.entry.ritual.downgrade.info=Чтобы получить больше Ñилы, иногда приходитÑÑ Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ñ‚ÑŒ чем-то взамен. ПокаÑние ОÑвобожденной Души делает именно Ñто - Ð¶ÐµÑ€Ñ‚Ð²ÑƒÑ Ð½ÐµÑколькими предметами невидимой ÑущноÑти, вы можете Ñнизить ÑффективноÑÑ‚ÑŒ какого-либо аÑпекта вашей Живой Брони и увеличить количеÑтво очков ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð² качеÑтве компенÑации. Когда вы Ñоздаете ритуал, вы должны размеÑтить рамку предмета на Ñамом верхнем ПуÑтом ритуальном камне, обращенном к Камню Главного Ритуала, и какой-то инвентарь (Ñм. Сундук) на вершине ÐšÐ°Ð¼Ð½Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ заката. Чтобы получить Понижение ÑƒÑ€Ð¾Ð²Ð½Ñ Ð–Ð¸Ð²Ð¾Ð¹ Брони, вы должны помеÑтить ключевой предмет в раму предмета и раÑходные материалы в Ñундук. Как только ритуал активирован, вы можете в любой момент прокраÑÑ‚ÑŒÑÑ Ð½Ð° МаÑтер ритуальный камень и получить понижение рейтинга.\n\tÐ’ Ñлучае Ð¿Ð¾Ð½Ð¸Ð¶ÐµÐ½Ð¸Ñ Â«Ð—Ð°ÐºÐ°Ð»ÐµÐ½Ð½Ð°Ñ Ð¶Ð¸Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ» его ключевым предметом ÑвлÑетÑÑ Ð±ÑƒÑ‚Ñ‹Ð»ÐºÐ° Ñ Ð²Ð¾Ð´Ð¾Ð¹ (помещаетÑÑ Ð² рамку предмета), а рецептом ÑвлÑетÑÑ Â«Ð”Ñ‹Ñ…Ð°Ð½Ð¸Ðµ дракона» (помещаетÑÑ Ð² Ñундук). Ключевой предмет никогда не раÑходуетÑÑ, но рецепт еÑÑ‚ÑŒ.\n\tЧтобы проÑмотреть рецепт понижениÑ, вы можете поÑмотреть их в JEI - проверьте иÑпользование Master Ritual Stone, и вы увидите рецепты Ð´Ð»Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð° ПокаÑниÑ. Также вы можете проÑто проверить рецепт Ð´Ð»Ñ Ð¼Ð°ÐºÑимального ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð² JEI, а затем проверить иÑпользование ключевого Ñлемента - ключевой Ñлемент вÑегда одинаков Ð´Ð»Ñ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ рейтинга. +guide.bloodmagic.entry.ritual.crystalSplit.info=ПоÑле того, как Ð’Ð¾Ð»Ñ Ð”ÐµÐ¼Ð¾Ð½Ð° криÑталлизовалаÑÑŒ, невозможно разделить ее на множеÑтво аÑпектов - или Ñ Ñ‚Ð°Ðº думал до Ñих пор. Â«Ð ÐµÐ·Ð¾Ð½Ð°Ð½Ñ Ð¾Ð³Ñ€Ð°Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ криÑталла» работает путем Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼Ð½Ð¾Ð¶ÐµÑтва аÑпектов внутри неведомого (или необработанного) клаÑтера криÑталлов Ñ Ð¸Ñпользованием различных аÑпектированных ритуальных камней. \n\tЧтобы иÑпользовать ритуал, неожиданный клаÑтер криÑталлов должен быть размещен в двух кварталах над Камнем МаÑтера Ритуала. Другими Ñловами, вы можете помеÑтить криÑталлизатор поверх MRS и клаÑтер криÑталлов поверх него, и он должен хорошо работать. Затем вы должны убедитьÑÑ, что нет никаких блоков непоÑредÑтвенно над Ñ‡ÐµÑ‚Ñ‹Ñ€ÑŒÐ¼Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¼Ð¸ камнÑми на оÑнове Ñлементов, а затем дождатьÑÑ Ñ€Ð¾Ñта клаÑтера криÑталлов. \n\tПоÑле того, как клаÑтер Ð²Ñ‹Ñ€Ð¾Ñ Ð² общей ÑложноÑти пÑÑ‚ÑŒ или более духа, ритуал отделилаÑÑŒ и Ñоздать Ñти шпили коррозионного каждый один дух, твердо, мÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸ Ñ€Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»ÑŽ аÑпектированного ритуала на вершине камней. Unaspected, еÑли клаÑтер имеет право раÑти и дальше, и Ñти новые клаÑтеры оÑтаютÑÑ Ð½ÐµÑ‚Ñ€Ð¾Ð½ÑƒÑ‚Ñ‹Ð¼Ð¸, процеÑÑ Ð±ÑƒÐ´ÐµÑ‚ повторÑÑ‚ÑŒÑÑ ÑˆÐ¿Ð¸Ð»Ñми и больше будет добавлен. \n\tМеханизм Ñтого процеÑÑа довольно проÑÑ‚. Когда у криÑталла Ðеобработанной Воли еÑÑ‚ÑŒ по крайней мере пÑÑ‚ÑŒ шпилей, ритуал разрывает четыре из Ñтих шпилей и преобразует Волю в ее более беÑтелеÑную форму. Затем Ñта Ð’Ð¾Ð»Ñ Ð¾Ñ‚Ð±Ñ€Ð°Ñывает поÑледний шпиль ÑкоплениÑ, что заÑтавлÑет различные аÑпекты Воли превращатьÑÑ Ð² более локализованные ÑÐºÐ¾Ð¿Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ аÑпекта. Затем Ñта Ð’Ð¾Ð»Ñ ÑобираетÑÑ Ð² ритуальные камни, которые Ñлужат оÑновой, из которой могут выраÑтать новые аÑпектированные криÑталличеÑкие клаÑтеры. +guide.bloodmagic.entry.ritual.portal.info=##REQ-LORE##\n\t Врата Сгиба - Ñто ритуал, предназначенный Ð´Ð»Ñ Ð¼ÐµÐ¶Ð¿Ñ€Ð¾ÑтранÑтвенной телепортации без необходимоÑти дополнительного взаимодейÑтвиÑ. ПоÑле активации вÑе блоки, которые каÑаютÑÑ ÐµÐ³Ð¾ ритуальных камней, иÑпользуютÑÑ Ð² качеÑтве ключевого шаблона Ð´Ð»Ñ ÑвÑзи порталов вмеÑте. ЕÑли ÑущеÑтвуют другие Ворота Сгиба Ñ Ñ‚ÐµÐ¼ же ключом, ритуалы будут ÑвÑзаны вмеÑте и мгновенно пройдут через телепортацию к Ñвоему близнецу. Одновременно могут ÑущеÑтвовать только до 2 порталов Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼ ключом.\n\t СтоимоÑÑ‚ÑŒ активации: 50,000LP\n\t СтоимоÑÑ‚ÑŒ телепортации: 1,000LP (одинаковое измерение) / 10,000LP (разные размеры) +guide.bloodmagic.entry.ritual.altarBuilder.info=##REQ-LORE##\n\t Сборка Ð’Ñ‹Ñокого ÐÐ»Ñ‚Ð°Ñ€Ñ - Ñто ритуал, позволÑющий быÑтро поÑтроить новый алтарь-зиккурат из блоков в прилагаемом инвентаре (обычно Ñто Ñундук Ñверху MRS).\n\tСтоимоÑÑ‚ÑŒ активации: 450LP\n\tСтоимоÑÑ‚ÑŒ за размещенный компонент: 75LP +guide.bloodmagic.entry.ritual.pump.info=##REQ-LORE##\n\t Гимн Ð¡Ð¸Ñ„Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñтей в мире вокруг или под ритуалом в подходÑщий контейнер (например, в Кровавый Бак) над MRS. ЖидкоÑти в мире заменены каменными, Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰Ð°Ñ Ñ‚ÐµÐºÑƒÑ‡Ð¸Ðµ жидкоÑти, которые могут вызвать проблемы Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñтью.\n\tСтоимоÑÑ‚ÑŒ активации: 500LP\n\tСтоимоÑÑ‚ÑŒ за операцию: 250LP +guide.bloodmagic.entry.ritual.cobble.info=##REQ-LORE##\n\t УÑтали от ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из Ñтих примитивных зданий Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ булыжника? Ð’Ñ‹ уÑтали от Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ OSHA на Ð²Ð°Ñ Ð¸Ð»Ð¸ Ñлучайно погаÑили ваш иÑточник лавы? Этот ритуал Ð´Ð»Ñ Ð²Ð°Ñ. Генерируйте непреодолимые маÑÑÑ‹ булыжника быÑтрым и Ñффективным ÑпоÑобом Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ крови, пригодной Ð´Ð»Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ³Ð¾, вмеÑто иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð¿Ð°Ñной и ограниченной лавы (еÑли только вы не генерируете лаву из крови). \n\n\t Этот ритуал генерирует (по умолчанию) булыжник поверх Ñамого ÑебÑ, который затем может быть добыт Ð´Ð»Ñ Ð»Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ иÑпользованиÑ. \n\t СтоимоÑÑ‚ÑŒ активации: 500LP\n\t СтоимоÑÑ‚ÑŒ за блок: 25LP +guide.bloodmagic.entry.ritual.ellipsoid.info=##REQ-LORE##\n\t Ð¤Ð¾ÐºÑƒÑ ÑллипÑоида Ñоздает полую Ñферу (по умолчанию) из материалов в инвентаре, подключенном к MRS (обычно Ñундук поверх MRS).\n\t СтоимоÑÑ‚ÑŒ активации: 20,000LP\n\t СтоимоÑÑ‚ÑŒ за размещенный блок: 5LP +guide.bloodmagic.entry.ritual.crystalHarvest.info=##REQ-LORE##\n\t Трещина Ñломанного криÑталла разрывает вÑе, кроме одного ÑˆÐ¿Ð¸Ð»Ñ Ð²Ñех клаÑтеров КриÑталла Воли Демона, и броÑает их на землю. Ð’ Ñочетании Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð¼ «Зов Зефира» Ñти предметы не могут быть Ñобраны и помещены в инвентарь Ð´Ð»Ñ Ð¿Ð¾Ñледующего иÑпользованиÑ.\n\t СтоимоÑÑ‚ÑŒ активации: 40,000LP \n\t СтоимоÑÑ‚ÑŒ за операцию: 50LP +guide.bloodmagic.entry.ritual.forsakenSoul.info=##REQ-LORE##\n\t Сбор ОтрекшихÑÑ Ð”ÑƒÑˆ уÑкорÑет роÑÑ‚ КриÑталлов Демонов Ð´Ð»Ñ ÐºÐ»Ð°Ñтеров криÑталлов выше ритуала (по умолчанию). Он не генерирует волю Ñам по Ñебе, но требует, чтобы под клаÑтерами криÑталлов были КриÑталлизаторы Демонов. Чтобы Ñделать Ñто, он иÑпользует механику, извеÑтную как «уникальноÑть» мобов. Чем больше мобов погибнет, тем Ñффективнее будет роÑÑ‚ криÑталлов. Сама она не генерирует Ðуру ДемоничеÑкой Воли, поÑтому вам нужно Ñнабдить ее либо путем подачи обратно криÑталлов, либо путем Ð¿Ð¾Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¢Ð°Ñ€Ñ‚Ð°Ñ€Ð½Ð¾Ð³Ð¾ ÐšÐ°Ð¼Ð½Ñ Ñ Ð²Ð¾Ð»ÐµÐ¹ в Тигель Демона. Это должно иÑключить необходимоÑÑ‚ÑŒ выходить на ферму демоничеÑкой воли, еÑли только вы не предоÑтавите мобов, чтобы накормить ее и / или иÑчерпать волю.\n\t СтоимоÑÑ‚ÑŒ активации: 40,000LP\n\t СтоимоÑÑ‚ÑŒ за тик урона и моб: 2LP +guide.bloodmagic.entry.ritual.animalGrowth.info=##REQ-LORE##\n\t Ритуал Шефарда значительно увеличивает ÑкороÑÑ‚ÑŒ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ животные раÑтут.\n\t Это также увеличивает ÑкороÑÑ‚ÑŒ размножениÑ, еÑли поÑтавлÑетÑÑ Ñ Vengeful Will или делает животных ÑпоÑобными иÑкать враждебных мобов и взрыватьÑÑ Ð½Ð° них, еÑли Ñнабжено Destructive Will. Ð’ любом Ñлучае, еÑли поÑтавлÑетÑÑ Ñ Steadfast Will, он автоматичеÑки будет кормить животных едой из Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ð²Ñ‹ÑˆÐµ MRS (по умолчанию).\n\t СтоимоÑÑ‚ÑŒ активации: 10,000LP\n\t СтоимоÑÑ‚ÑŒ за операцию и животное: 2LP +guide.bloodmagic.entry.ritual.livingEvolution.info=##REQ-LORE##\n\t Ритуал Живой Эволюции увеличивает макÑимальное количеÑтво очков ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð–Ð¸Ð²Ð¾Ð¹ Брони до 300. Чтобы иÑпользовать его, проÑто активируйте ритуал, а затем наÑтупите на MRS Ñ Ñкипированным набором Живой Брони.\n\t СтоимоÑÑ‚ÑŒ активации: 50,000LP +guide.bloodmagic.entry.ritual.upgradeRemove.info=##REQ-LORE##\n\t Ритуал Очищающей Души удалÑет вÑе ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð¸ Ð¿Ð¾Ð½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· набора Живой Брони. Чтобы иÑпользовать его, проÑто активируйте ритуал, а затем наÑтупите на MRS Ñ Ñкипированным набором Living Armor.\n\t СтоимоÑÑ‚ÑŒ активации: 50,000LP +guide.bloodmagic.entry.ritual.fullStomach.info=##REQ-LORE##\n\t Ритуал наÑыщенного желудка кормит игроков в Ñтой облаÑти едой из Ñундука над MRS. Пищу кормÑÑ‚ Ñффективным ÑпоÑобом, еÑли пища не обеÑпечивает более макÑимального наÑыщениÑ, и в Ñтом Ñлучае ее вÑе равно кормÑÑ‚.\n\t СтоимоÑÑ‚ÑŒ активации: 100 000\n\tСтоимоÑÑ‚ÑŒ за операцию: 20LP +guide.bloodmagic.entry.ritual.eternalSoul.info=##REQ-LORE##\n\t Крик Вечной Души ÑпоÑобен кормить LP из Сети Души обратно в алтарь. Это подпадает под обычные Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð°ÐºÐ°Ñ‡ÐºÐ¸ (жидкой) жизненной ÑущноÑти в алтарь. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° LP, Ð¿ÐµÑ€ÐµÐ´Ð°Ð½Ð½Ð°Ñ Ð² алтарь, Ñтоит 2 LP от Ñети.\n\t СтоимоÑÑ‚ÑŒ активации: 2,000,000LP\n\t СтоимоÑÑ‚ÑŒ за операцию: 2 LP +guide.bloodmagic.entry.ritual.condor.info=##REQ-LORE##\n\t Уважение к Кондору позволÑет игрокам Ñовершать полеты в окреÑтноÑÑ‚ÑÑ… ритуала.\n\t СтоимоÑÑ‚ÑŒ активации: 1,000,000LP\n\t СтоимоÑÑ‚ÑŒ за операцию: 2LP +guide.bloodmagic.entry.ritual.featheredEarth.info=##REQ-LORE##\n\t Ритуал Пернатой Земли поÑтоÑнно уменьшает выÑоту Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð´Ð¾ 0, Ñффективно уÑтранÑÑ ÑƒÑ€Ð¾Ð½ от падениÑ.\n\t СтоимоÑÑ‚ÑŒ активации: 5,000LP\n\tСтоимоÑÑ‚ÑŒ за Ñекунду: 20LP +guide.bloodmagic.entry.ritual.grounding.info=##REQ-LORE##\n\ŧ Ритуал Ð—Ð°Ð·ÐµÐ¼Ð»ÐµÐ½Ð¸Ñ Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€ÑƒÐµÑ‚ гравитацией в Ñвоей облаÑти. По умолчанию он перетаÑкивает мобов на землю и предотвращает прыжки.\n\t Снабжение ритуала Ñырой волей влиÑет на игроков в дополнение к мобам.\n\t Ð Ð°Ð·ÑŠÐµÐ´Ð°ÑŽÑ‰Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ñто отключает гравитацию вÑе вмеÑте.\n\t Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ увеличивает урон от падений пораженных ÑущеÑтв.\n\t ÐÐµÐ¿Ð¾ÐºÐ¾Ð»ÐµÐ±Ð¸Ð¼Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет ритуалу воздейÑтвовать на боÑÑов.\n\t Одна лишь ÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð’Ð¾Ð»Ñ ÑƒÑиливает Ñффект Ð·Ð°Ð·ÐµÐ¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñочетании Ñ ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¹Ð½Ð¾Ð¹ волей, однако вмеÑто Ñтого она транÑформирует ритуал, чтобы обеÑпечить левитацию. Vengeful Will также увеличивает Ñффект Heavy Heart, еще больше ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÑƒÑ€Ð¾Ð½ от падениÑ.\n\t СтоимоÑÑ‚ÑŒ активации: 5,000LP\n\tСтоимоÑÑ‚ÑŒ за Ñекунду: 20LP + +# Architect Entries +guide.bloodmagic.entry.architect.intro=ПредиÑловие +guide.bloodmagic.entry.architect.bloodaltar=Кровавый алтарь +guide.bloodmagic.entry.architect.ash=Тайный пепел +guide.bloodmagic.entry.architect.divination=Символ Ð³Ð°Ð´Ð°Ð½Ð¸Ñ +guide.bloodmagic.entry.architect.soulnetwork=Душа Сеть +guide.bloodmagic.entry.architect.weakorb=Ð¡Ð»Ð°Ð±Ð°Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ð¡Ñ„ÐµÑ€Ð° +guide.bloodmagic.entry.architect.incense=Ðлтарь ладана +guide.bloodmagic.entry.architect.bloodrune=Обновление вашего ÐÐ»Ñ‚Ð°Ñ€Ñ +guide.bloodmagic.entry.architect.inspectoris=ИнÑпектор блок (блок Ñчитывание) +guide.bloodmagic.entry.architect.runeSpeed=СкороÑÑ‚Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° +guide.bloodmagic.entry.architect.water=Сигил воды +guide.bloodmagic.entry.architect.lava=Сигил лавы +guide.bloodmagic.entry.architect.lavaCrystal=КриÑталл лавы +guide.bloodmagic.entry.architect.apprenticeorb=Ученик Кровавого Шара +guide.bloodmagic.entry.architect.dagger=Кинжал Ð–ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ +guide.bloodmagic.entry.architect.runeSacrifice=Руна Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ +guide.bloodmagic.entry.architect.runeSelfSacrifice=Руна ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ +guide.bloodmagic.entry.architect.holding=Сигил ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ +guide.bloodmagic.entry.architect.air=Сигил воздуха +guide.bloodmagic.entry.architect.void=Сигил пуÑтоты +guide.bloodmagic.entry.architect.greenGrove=Сигил зеленой рощи +guide.bloodmagic.entry.architect.fastMiner=Sigil of the Fast Miner +guide.bloodmagic.entry.architect.seer=Сигил провидца +guide.bloodmagic.entry.architect.magicianOrb=Маги Кровавый Шар +guide.bloodmagic.entry.architect.capacity=Руна ЕмкоÑти +guide.bloodmagic.entry.architect.displacement=Руна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ +guide.bloodmagic.entry.architect.affinity=Sigil of Elemental Affinity +guide.bloodmagic.entry.architect.lamp=Сигил кровавого Ñветильника +guide.bloodmagic.entry.architect.magnetism=Сигил магнетизм +guide.bloodmagic.entry.architect.peritia=Фолиант ÑкÑпертизы +guide.bloodmagic.entry.architect.livingArmour=Ð–Ð¸Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ +guide.bloodmagic.entry.architect.upgradeTome=Ð–Ð¸Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Томов +guide.bloodmagic.entry.architect.teleposer=Телепортер +guide.bloodmagic.entry.architect.boundBlade=СвÑзанный клинок +guide.bloodmagic.entry.architect.boundTool=СвÑзанные инÑтрументы +guide.bloodmagic.entry.architect.weakShard=Слабый кровавый оÑколок +guide.bloodmagic.entry.architect.masterOrb=МаÑтер крови Ñфере +guide.bloodmagic.entry.architect.runeOrb=Руна Ñфера +guide.bloodmagic.entry.architect.suppression=Сигил ÐŸÐ¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ +guide.bloodmagic.entry.architect.haste=Cигил уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ +guide.bloodmagic.entry.architect.severance=Sigil of Ender Severance +guide.bloodmagic.entry.architect.teleposition=Сигил телепозиции +guide.bloodmagic.entry.architect.compression=Сигил ÑÐ¶Ð°Ñ‚Ð¸Ñ +guide.bloodmagic.entry.architect.bridge=Сигил призрачного моÑта +guide.bloodmagic.entry.architect.mimic=Mimics подражает +guide.bloodmagic.entry.architect.downgrade=Понижение живой брони + +guide.bloodmagic.entry.architect.augmentedCapacity=Руна дополненной ÑпоÑобноÑти +guide.bloodmagic.entry.architect.charging=ЗарÑÐ´Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° +guide.bloodmagic.entry.architect.acceleration=Руна уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ + +guide.bloodmagic.entry.architect.tier3=Уровень 3 под морем + +# Architect Entry Texts +guide.bloodmagic.entry.architect.intro.info=ЗдравÑтвуйте вÑе. ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Тиберий. По Ñтой запиÑи вы, вероÑтно, можете Ñказать, что книга не ÑовÑем завершена, и вы были бы правы. Из-за обновлений 1.7.10 -> 1.8.9 и 1.9.4 (и выше) в моде многое изменилоÑÑŒ. Таким образом, книги должны были быть перепиÑаны. ПоÑкольку окончательный план Ð´Ð»Ñ Ñтих документов ÑоÑтоит в том, чтобы ÐºÐ°Ð¶Ð´Ð°Ñ ÐºÐ½Ð¸Ð³Ð° имела форму иÑÑледовательÑкого журнала / фактичеÑкой книги, Ñти документы потребуют времени, чтобы конкретизировать. ПоÑтому Ñ Ð±ÑƒÐ´Ñƒ периодичеÑки обновлÑÑ‚ÑŒ Ñту книгу, чтобы заполнить необходимые пробелы. Это начнетÑÑ ÐºÐ°Ðº муÑор без запаха, чтобы начать Ñ (Да ... не Ñамые аппетитные иллюÑтрации, чтобы пойти Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸, но безотноÑительно!), Ðо поÑтепенно Ñто превратитÑÑ Ð² иÑторию о куче кровавых магов во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÑƒÑ‚ÐµÑˆÐµÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾ открытие.\n\tÐо хватит об Ñтом, мне нужно войти в характер. * Кашель *\n\tÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Тиберий, и Ñ ÐœÐ°Ð³ крови, и также извеÑтный как Ðрхитектор. Эта книга Ñодержит вÑе мои иÑÑледованиÑ, каÑающиеÑÑ Ñфирного феномена, называемого «Сетью Души», а также физичеÑких ÑвойÑтв некоторых из Ñамых центральных уÑтройÑтв, к которым должен привыкнуть любой Кровавый Маг. Я обнаружил, переÑмотрел и Ñоздал новые пути в иÑкуÑÑтве ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñтруктуры мощного Кровавого ÐлтарÑ, в хитроÑплетениÑÑ… жертвенной жизненной Ñилы, чтобы увеличить Ñилу мага, и в дальнейшем к Ñилам, полученным Ð±Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñ‚Ð°Ð¹Ð½Ñ‹Ð¼ глифам и Ñимволам. тренировать ÑÐµÐ±Ñ Ðº новым выÑотам.\n\tТак что входите, Маг, ибо новое царÑтво ждет ваÑ!\n\t... Да, Маг говорит, что Ñ Ð¼Ð¾Ð³Ñƒ Ñтать немного грандиозным, но что Ñ‚Ñ‹ можешь Ñделать? +guide.bloodmagic.entry.architect.bloodaltar.info.1=Кровавый Ðлтарь - одно из Ñамых центральных уÑтройÑтв в моде. У Ð°Ð»Ñ‚Ð°Ñ€Ñ ÐµÑÑ‚ÑŒ два оÑновных ÑпоÑоба иÑпользованиÑ: либо Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ñ… предметов, необходимых Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´Ð°, либо Ð´Ð»Ñ Ð½Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñвоей Кровавой Сферы. Оба Ñтих дейÑÑ‚Ð²Ð¸Ñ Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ от игрока Ð½Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð±Ð°ÑÑейна Жизненной СущноÑтью, которую можно извлечь из двух разных иÑточников: монÑтров и мирных ÑущеÑтв, а также из ÑобÑтвенного Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð¸Ð³Ñ€Ð¾ÐºÐ°. +guide.bloodmagic.entry.architect.bloodaltar.info.2=Чтобы добавить Ñвою ÑобÑтвенную СущноÑÑ‚ÑŒ Жизни в баÑÑейн, вам нужно изготовить Ñебе Жертвенный Кинжал и щелкнуть по нему правой кнопкой мыши Ñ€Ñдом Ñ Ð°Ð»Ñ‚Ð°Ñ€ÐµÐ¼. Это обретет душевное здоровье и добавит 200 фунтов к алтарю без улучшений. «LP» - Ñто «Очки жизни», которые Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÑŽÑ‚, Ñколько жизненной Ñилы иÑпользуетÑÑ Ð² задании - нет, Ñто не похоже на YuGi-Oh. Кровавый Ðлтарь имеет вмеÑтимоÑÑ‚ÑŒ 10000 латов. ЕÑли вы затем щелкните правой кнопкой мыши на алтаре, вы можете помеÑтить предмет в баÑÑейн, и, еÑли Ñто дейÑтвительный предмет, алтарь начнет процеÑÑ Ð¸Ð·Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ.\n\tÐлтарь обрабатывает предмет, потреблÑÑ Ð›ÐŸ в тазу, еÑли алтарь доÑтаточно выÑокого уровнÑ. ЕÑли будет доÑтаточно LP, алтарь будет отводить немного LP из баÑÑейна каждый тик и увеличивать ход крафта, иÑпуÑÐºÐ°Ñ ÐºÑ€Ð°Ñные чаÑтицы. ЕÑли в баÑÑейне больше нет LP, алтарь иÑпуÑтит Ñерые чаÑтицы, и ремеÑло начнет терÑÑ‚ÑŒ прогреÑÑ, что ÑовÑем не хорошо! Ðаконец, еÑли алтарь заполнÑет Сферу Крови, алтарь будет иÑпуÑкать пурпурные чаÑтицы, чтобы указать, что он Ñифонирует LP из баÑÑейна.\n\tÐа Ñамом деле в Ðлтаре Крови находитÑÑ Ñ‚Ñ€Ð¸ танка: оÑновной танк, емкоÑÑ‚ÑŒ которого по умолчанию ÑоÑтавлÑет 10 кПа, как указано ранее, а также входной и выходной баки, каждый из которых имеет 10 %% от общей вмеÑтимоÑти. оÑновной танк. Каждые 20 тиков по умолчанию LP во входном баке будет передаватьÑÑ Ð² оÑновной бак Ñо ÑкороÑтью 20 л / Ñ, а LP в оÑновном баке будет передаватьÑÑ Ð² выходной бак Ñо ÑкороÑтью 20 л / Ñ. Как Ñледует из названий, входной резервуар принимает LP, который закачиваетÑÑ Ð² алтарь, выÑÑ‚ÑƒÐ¿Ð°Ñ Ð² качеÑтве буфера Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑкороÑти передачи из внешних иÑточников, и выходной резервуар можно извлечь из труб из алтарÑ. +guide.bloodmagic.entry.architect.ash.info=Ð¥Ð¾Ñ‚Ñ Arcane Ash не ÑвлÑетÑÑ Ñ‡Ð°Ñтью общей темы Ñтой книги, он необходим Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы пройти через мод и получить доÑтуп к некоторым из более мощных уÑтройÑтв. Этот пепел Ñоздан Ñ Ð¸Ñпользованием Кузницы ÐдÑкого Пламени и Воли Демона, поÑтому, еÑли вы новичок в Ñтой концепции, обратитеÑÑŒ к «Кин Демона». По Ñути, Ñто ÑпоÑоб Ð¸Ð·Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð² из двух отдельных предметов: какого-то реагента, который дейÑтвует как катализатор, и вторичного предмета. \n\tПепел имеет в общей ÑложноÑти двадцать применений, прежде чем вам понадобитÑÑ Ñоздать еще один. Когда вы щелкнете правой кнопкой мыши по земле (или Ñтене, Ñ…Ð¾Ñ‚Ñ Ð¾Ð½Ð° будет отображать только одно направление), вы начертите проÑтой круг из пепла. ЕÑли Ñнова щелкнуть по пеплу Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð¼, он будет «помещен в пепел» - при уÑловии, что Ñтот предмет ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным катализатором, круг изменит форму, чтобы показать, что он готов к Ñледующему предмету. ЕÑли Ñто не менÑет форму, значит, вы Ñделали что-то не так.\n\tКак только он изменил форму, вы можете помеÑтить его в дополнительный предмет. ЕÑли Ñтот Ñлемент Ñовпадает Ñ Ð¿ÐµÑ€Ð²Ñ‹Ð¼, круг начнет вращатьÑÑ Ð¸ выполнÑÑ‚ÑŒ различные дейÑÑ‚Ð²Ð¸Ñ Ð² завиÑимоÑти от рецепта, над которым он работает. Через некоторое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¸ правильном выполнении Ñлемент выÑкочит.\n\tÐ’Ñе рецепты Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð·Ð°ÐºÐ»Ð¸Ð½Ð°Ð½Ð¸Ñ Â«Ð§Ð°Ñ€Ð¾Ð´ÐµÐ¹Ñкий пепел» (Ñ Ð½Ð°Ð·Ñ‹Ð²Ð°ÑŽ Ñто «Создание алхимичеÑкого маÑÑива») можно найти в JEI, проверив иÑпользование «ЧародейÑкого пепла» - первый показанный предмет - катализатор, а второй - вторичный предмет. +guide.bloodmagic.entry.architect.divination.info=Символ Ð³Ð°Ð´Ð°Ð½Ð¸Ñ - один из Ñамых полезных инÑтрументов в моде, ÑпоÑобный раÑÑказать вам о многих ценноÑÑ‚ÑÑ…, которые Ñделают вашу жизнь проще. Этот Ñимвол изготовлен Ñ Ð¸Ñпользованием куÑочка краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ чиÑтого лиÑта (Ñозданного в Ðлтаре Крови) Ñ Ð¸Ñпользованием набора алхимии.\n\tКогда вы щелкнете правой кнопкой мыши на Ðлтаре Крови Ñ Ñимволом, вы увидите текущий уровень, количеÑтво ЛП внутри оÑновного баÑÑейна, а также макÑимальную емкоÑÑ‚ÑŒ Кровавого ÐлтарÑ. Ðажатие Ñпама на алтарь Ñ Ñимволом перезапишет предыдущий текÑÑ‚ Ñ Ñимвола, означаÑ, что в вашем чате не будет никакого Ñпама.\n\tЕÑли вы щелкнете правой кнопкой мыши в Ñфире Ñ Ñимволом, он Ñообщит вам текущее количеÑтво LP, которое находитÑÑ Ð² вашей Душа Сеть. Ð¥Ð¾Ñ‚Ñ Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° Ñто довольно обыденно, одна только Ñта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¾Ñ‡ÐµÐ½ÑŒ вероÑтно, что вы захотите вÑегда держать Ñтот Ñимвол на Ñебе. +guide.bloodmagic.entry.architect.soulnetwork.info=Сеть Души (обычно Ñокращенно SN) - Ñто термин, обозначающий ÑвÑзи между игроком и вÑеми предметами и Ñтруктурами, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ он ÑвÑзал Ñвою душу. Когда маг крови ÑтановитÑÑ Ð±Ð¾Ð»ÐµÐµ могущеÑтвенным, Ñила их души увеличиваетÑÑ Ð¸ укреплÑет Ñти ÑвÑзи. Эти ÑвÑзи ÑвлÑÑŽÑ‚ÑÑ Ñфирными нитÑми души, и только Ñамые могущеÑтвенные из Кровавых Волхвов ÑпоÑобны увидеть их в их физичеÑкой форме. Ðа ÑегоднÑшний день ни один маг не доÑтиг Ñтой ÑпоÑобноÑти ...\n\tÐ’ игре Сеть Души привÑзана непоÑредÑтвенно к игроку. Данные хранÑÑ‚ÑÑ Ð² мире, и у каждого игрока еÑÑ‚ÑŒ только одна Ñеть - LP, помещенный в Ñеть, не хранитÑÑ Ð½Ð¸ в одном Ñлементе, а вмеÑто Ñтого помещаетÑÑ Ð¸ беретÑÑ Ð¸Ð· одного пула. \n\tЧтобы ÑвÑзать вещи Ñ Ð²Ð°ÑˆÐµÐ¹ Ñетью, наиболее раÑпроÑтраненный ÑпоÑоб - проÑто щелкнуть правой кнопкой мыши Ñлемент, который иÑпользует Ñеть Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ. ПоÑле привÑзки предмет будет указывать, что он принадлежит вам, и он никогда не может быть оÑвобожден (Ñ Ð¸Ñпользованием текущей технологии). ЕÑли Ñтот предмет иÑпользуетÑÑ Ð¸ ему припиÑана ÑтоимоÑÑ‚ÑŒ ЛП, он получит ЛП из Ñети владельца. ЕÑли в Ñтой Ñети недоÑтаточно LP, недоÑтающий LP будет извлечен непоÑредÑтвенно из ÑоÑтоÑÐ½Ð¸Ñ Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (а не владельца). Будьте оÑторожны при иÑпользовании предметов, когда у Ð²Ð°Ñ Ð¼Ð°Ð»Ð¾ LP - Ñто может закончитьÑÑ Ñмертельным иÑходом. +guide.bloodmagic.entry.architect.weakorb.info.1=Что хорошего в Ñтом маге без иÑточника Ñнергии? Blood Orb - Ñто уÑтройÑтво, которое потреблÑет физичеÑкий LP и передает его в Душа Сеть владельца. Ð¥Ð¾Ñ‚Ñ Ñто и не Ñама батареÑ, она дейÑтвует как канал, чтобы воÑполнить резервы Ñнергии мага крови. +guide.bloodmagic.entry.architect.weakorb.info.2=Ð¡Ð»Ð°Ð±Ð°Ñ Ð¡Ñ„ÐµÑ€Ð° Крови - Ñто Ð¿ÐµÑ€Ð²Ð°Ñ Ñ‚Ð°ÐºÐ°Ñ Ñфера, которую вы можете Ñоздать. Ð’Ð»Ð¸Ð²Ð°Ñ Ð°Ð»Ð¼Ð°Ð· внутри ÐÐ»Ñ‚Ð°Ñ€Ñ ÐšÑ€Ð¾Ð²Ð¸ Ñ 2 кПа, вы можете Ñоздать Ñтот шар. Будучи ÑвÑзанным и помещенным в алтарь Ñ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ количеÑтвом ЛП в нем, Ñфера будет откачивать из баÑÑейна и передавать Ñтот ЛП непоÑредÑтвенно в Ñеть. ÐšÐ°Ð¶Ð´Ð°Ñ Ñфера имеет макÑимальную вмеÑтимоÑÑ‚ÑŒ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть раÑширена только продвинутыми рунами на алтаре. Ð”Ð»Ñ Weak Blood Orb Ñта макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð¼ÐµÑтимоÑÑ‚ÑŒ ÑоÑтавлÑет 5 LP.\n\tКровавые шары также можно заполнить непоÑредÑтвенно от игрока, проÑто щелкнув по ним правой кнопкой мыши - Ñто перенеÑет Ñердце Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð² шар и даÑÑ‚ вам 200LP. Это не может превышать макÑимальную емкоÑÑ‚ÑŒ шара.\n\tÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ñфера может быть заполнена только уровнем Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¸Ð»Ð¸ выше; Ñто означает, что еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ шар T3, он должен быть заполнен в алтаре, который больше или равен T3. ПроÑтой алтарь Т1 не подойдет в Ñтой Ñитуации. +guide.bloodmagic.entry.architect.incense.info.1=БыÑтро обнаружитÑÑ, что ÑкороÑÑ‚ÑŒ генерации LP может Ñтать вÑе более обременительной. Конечно, добавлÑÑ Ñпециальные руны к Кровавому Ðлтару, вы можете увеличить количеÑтво Ñамоотверженных жертв, но Ñто вÑе равно может быть медленным процеÑÑом. ЕÑли бы только был ÑпоÑоб еще больше увеличить, Ñколько LP вы можете получить от ÑебÑ?\n\tВойдите в алтарь ладана. Ðлтарь ладана дейÑтвует как Ñ†ÐµÐ½Ñ‚Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° Ð´Ð»Ñ Ñпокойной облаÑти, уÑÐ¿Ð¾ÐºÐ°Ð¸Ð²Ð°Ñ Ð´ÑƒÑˆÑƒ нежными волнами, которые иÑходÑÑ‚ из баÑÑейна. Откуда иÑходит Ñтот запах, вы не ÑовÑем уверены, но что может пойти не так?\n\tЦель Ñтого блока - Ñоздать зону ÑпокойÑтвиÑ, чтобы увеличить количеÑтво LP, которое вы получаете из Ñердца здоровьÑ. Когда вы находитеÑÑŒ Ñ€Ñдом Ñ Ð±Ð»Ð¾ÐºÐ¾Ð¼ (около пÑти блоков), огненные чаÑтицы будут излучатьÑÑ, чтобы показать, что он работает - когда на Ð²Ð°Ñ Ð²Ð¾Ð·Ð´ÐµÐ¹Ñтвует Ñто ÑпокойÑтвие, ваш Жертвенный Кинжал изменитÑÑ, показываÑ, что у Ð²Ð°Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½ урожай на Ðлтаре Крови. Этот процеÑÑ Ð·Ð°Ð½Ð¸Ð¼Ð°ÐµÑ‚ около 5 Ñекунд, и вы узнаете, что закончили, когда чаÑтицы Ð¾Ð³Ð½Ñ Ð¿ÐµÑ€ÐµÑтают поÑвлÑÑ‚ÑŒÑÑ. Ð’ Ñтот момент, еÑли вы иÑпользуете Ñвой Жертвенный Кинжал на Кровавом Ðлтаре, вы пожертвуете 90 %% от вашего макÑимального Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ñразу и накачаете LP в алтарь пропорционально количеÑтву пожертвованного здоровьÑ, умноженному на бонуÑ, оÑнованный на том, наÑколько Ñпокойным окружающий Площадь: по умолчанию Ñтот Ð±Ð¾Ð½ÑƒÑ + 20%.\n\tÐ’ качеÑтве дополнительного примечаниÑ, Символ Ð“Ð°Ð´Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован на Ðлтаре Ладана Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва СпокойÑтвиÑ, а также того, Ñколько бонуÑа дает текущий алтарь. +guide.bloodmagic.entry.architect.incense.info.2=Конечно, только дополнительные 20% - Ñто хорошо, но Ñто может быть раÑширено за Ñчет раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° влиÑÐ½Ð¸Ñ ÐÐ»Ñ‚Ð°Ñ€Ñ Ð‘Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ð¹. ЕÑли вы размеÑтите Ñ€Ñд из трех блоков «ДеревÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ°Â» в двух кварталах от Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð° в каждом из оÑновных направлений (убедитеÑÑŒ, что вÑе блоки дорожек находÑÑ‚ÑÑ Ð½Ð° одном и том же уровне y, до пÑти блоков вверх или вниз от Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð°) Ð’Ñ‹ можете определить облаÑÑ‚ÑŒ. Любой блок, размещенный в Ñтой облаÑти (блок, который находитÑÑ Ð½Ð° том же раÑÑтоÑнии по горизонтали от ÐÐ»Ñ‚Ð°Ñ€Ñ Ð±Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ð¹, что и блоки пути по горизонтали, и на том же уровне или на два ÑƒÑ€Ð¾Ð²Ð½Ñ Ð²Ñ‹ÑˆÐµ по вертикали от блоков пути), может добавить к СпокойÑтвию Ðлтарь ладана. ПоÑле Ñтой начальной Ñтроки можно добавить еще один Ñ€Ñд блоков пути, ÑÐ»ÐµÐ´ÑƒÑ Ñ‚Ð¾Ð¼Ñƒ же правилу: вÑе новые Ñтроки должны находитьÑÑ Ð½Ð° одном уровне y друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼, а вÑÑ Ñтрока должна находитьÑÑ Ð² пределах 5 блоков вертикально от предыдущей Ñтроки пути. блоки. Это означает, что возможны такие макеты, как пирамиды, перевернутые пирамиды или более Ñложные конÑтрукции леÑтниц. \n\tÐ’Ñе блоки пути имеют макÑимальное раÑÑтоÑние, которое они могут иметь от ÐÐ»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð°, чтобы иметь Ñффект. Блоки «ДеревÑÐ½Ð½Ð°Ñ Ñ‚Ñ€Ð¾Ð¿Ð°Â» могут работать в трех Ñ€Ñдах от ÐÐ»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð°. Каменные дорожки работают до пÑти, изношенные каменные дорожки - Ñемь, а обÑидиановые - до девÑти кварталов от иÑточника. Таким образом, в определенный момент вы должны иÑпользовать более качеÑтвенные блоки пути, чтобы раÑширить зону ÑпокойÑтвиÑ, однако вы можете иÑпользовать блоки более выÑокого ÑƒÑ€Ð¾Ð²Ð½Ñ Ð¿ÑƒÑ‚Ð¸ вмеÑто блоков более низкого ÑƒÑ€Ð¾Ð²Ð½Ñ Ð¿ÑƒÑ‚Ð¸, а не наоборот.\n\tВернутьÑÑ Ðº ÑпокойÑтвию. Только определенные блоки могут влиÑÑ‚ÑŒ на СпокойÑтвие облаÑти, и еÑÑ‚ÑŒ различные типы блоков СпокойÑтвиÑ. ЕÑли вы помеÑтите урожай, такой как картофель, в облаÑÑ‚ÑŒ, вы добавите немного СпокойÑÑ‚Ð²Ð¸Ñ (иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸ÑŽ «Зерновые культуры»). Однако, еÑли вы добавите еще одну культуру, например, картофель или даже морковь, вы получите меньше ÑпокойÑтвиÑ. ДобавлÑÑ Ñ‡Ñ‚Ð¾-то из другой категории Tranquility, вы получаете полный Ñффект. Ðо добавление большего количеÑтва материала Ñ Ð¸Ñпользованием той же категории имеет убывающую отдачу. ПоÑтому, чтобы получить наибольшее ÑпокойÑтвие из определенной облаÑти, наиболее оптимально Ñмешивать и Ñочетать, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ°Ðº можно больше разных типов ÑпокойÑтвиÑ..\n\tÐекоторые вещи, которые добавлÑÑŽÑ‚ СпокойÑтвие: Урожай, бревна, лиÑÑ‚ÑŒÑ, лава, пуÑтошь, ÑельхозугодьÑ, вода, ÑущноÑÑ‚ÑŒ жизни и другие разные вещи. +guide.bloodmagic.entry.architect.bloodrune.info.1=ÐŸÑ€Ð¾Ñ…Ð¾Ð´Ñ Ð¼Ð¾Ð´, вы поÑтепенно узнаете, что Ñкромный кровавый алтарь перед вами недоÑтаточно Ñилен, чтобы вы могли выполнить Ñвои иÑтинные амбиции. Ð Ð°Ð·Ð¼ÐµÑ‰Ð°Ñ Ñпециальные блоки, извеÑтные как Кровавые Руны, вокруг алтарÑ, вы можете значительно увеличить Ñилу алтарÑ, Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°Ñ Ð±Ð¾Ð»ÐµÐµ выÑокие уровни рецептов, а также ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÑпоÑобноÑти Ñамого алтарÑ.\n\tЧтобы улучшить алтарь до его второго уровнÑ, вам нужно размеÑтить 8 алтуров крови вокруг Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¸ на один уровень ниже. ЕÑли вы не уверены в точной конфигурации, пункт «Inspectoris Scandalum» может подÑказать вам точное размещение блоков, необходимых Ð´Ð»Ñ Ñледующего уровнÑ.\n\tÐ¥Ð¾Ñ‚Ñ Ð¿ÑƒÑтые руны хороши Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы проÑто получить обновление Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¸ перейти на более выÑокий уровень, полезно иÑпользовать руны Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñвоего алтарÑ. ÐšÐ°Ð¶Ð´Ð°Ñ Ð¸Ð· рун в кровавом алтаре может быть заменена на любую руну ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ (единÑтвенное иÑключение - Ñто то, что на Уровне 2 вы не можете иÑпользовать угловые руны в качеÑтве рун Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ - T3 и далее вы можете иÑпользовать их). ЕÑÑ‚ÑŒ руны, которые влиÑÑŽÑ‚ на ÑкороÑÑ‚ÑŒ изготовлениÑ, мощноÑÑ‚ÑŒ алтарÑ, а также ÑффективноÑÑ‚ÑŒ Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ñƒ алтарÑ. Эти руны можно найти в ÑоответÑтвующих запиÑÑÑ…. +guide.bloodmagic.entry.architect.inspectoris.info.1=Буквально «Блок чтение» на латыни, цель Ñтого предмета - дать вам больше информации о более Ñложных блоках в моде, когда блоки находÑÑ‚ÑÑ Ð² мире. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÐµÐ´Ð¸Ð½Ñтвенной реализацией Ñтого предмета ÑвлÑетÑÑ ÐšÑ€Ð¾Ð²Ð°Ð²Ñ‹Ð¹ Ðлтарь, и, проÑто щелкнув правой кнопкой мыши на Кровавом Ðлтаре в мире, он Ñкажет вам, какие блоки требуютÑÑ Ð² мире Ð´Ð»Ñ Ñледующего ÑƒÑ€Ð¾Ð²Ð½Ñ ÐлтарÑ.\n\tЕÑли Ñтот метод вам не подходит, вы можете щелкнуть правой кнопкой мыши на Ñлементе в воздухе, чтобы переключитьÑÑ Ð¼ÐµÐ¶Ð´Ñƒ уровнÑми. ЕÑли вы затем щелкните правой кнопкой мыши на алтаре, на алтаре поÑвÑÑ‚ÑÑ Ð¿Ñ€Ð¸Ð·Ñ€Ð°Ñ‡Ð½Ñ‹Ðµ блоки в мире, показывающие, где именно находÑÑ‚ÑÑ Ñ€ÑƒÐ½Ñ‹ крови и Ñтолбы, необходимые Ð´Ð»Ñ Ð´Ð¾ÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñтого уровнÑ. ЕÑли вы уÑтановите отображаемый уровень на 1, голограмма будет удалена. +guide.bloodmagic.entry.architect.runeSpeed.info.1=СкороÑÑ‚Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° оказывает давление на таз алтарÑ, форÑÐ¸Ñ€ÑƒÑ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ñ‚Ñ€Ð°Ð½Ñмутации, так что крафт намного быÑтрее. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° ÑкороÑти увеличивает потребление Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð½Ð° + 20 %% за руну, Ñффективно ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÑкороÑÑ‚ÑŒ алтарÑ. Это также влиÑет на ÑкороÑÑ‚ÑŒ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ шары крови заполнÑÑŽÑ‚ÑÑ Ð°Ð»Ñ‚Ð°Ñ€ÐµÐ¼ Ñ Ñ‚Ð¾Ð¹ же ÑкороÑтью на руну. +guide.bloodmagic.entry.architect.water.info.1=Сигил воды, как Ñледует из названиÑ, ÑпоÑобен Ñобирать влагу из воздуха, ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð¸Ñточник воды в точке ÑоприкоÑÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ñ Ð·ÐµÐ¼Ð»ÐµÐ¹. Более того, щелкнув по машине, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ жидкоÑÑ‚ÑŒ, вы можете вÑтавить в машину до 1000mB воды за ту же цену, как еÑли бы вы положили ее на землю. Ð”Ð»Ñ Ð²Ñех намерений и целей он дейÑтвует как беÑконечное ведро воды - однако, он не будет работать, еÑли вы помеÑтите его внутрь машины. 50LP за иÑпользование. +guide.bloodmagic.entry.architect.lava.info.1=Инь, Ян, чтобы Ñигилы вода, Ñто запечатанное нагревает камень в локальной облаÑти и Ñобирает ее в одном меÑте, Ð¾Ð±Ñ€Ð°Ð·ÑƒÑ Ð¸Ñточник Ñтирки, где незапечатанный замыкающий контакт. Ðналогичный процеÑÑ Ð¿Ñ€Ð¾Ð¸Ñходит, когда вы взаимодейÑтвуете на машине флюид прием, генерировать до 1000mB лавы внутри машины по той же цене. По какой-то причине ваша рука не ÑжигаетÑÑ, когда вы иÑпользуете его, однако Ñто не означает, что Ñто мудрый выбор, чтобы принÑÑ‚ÑŒ ванну в нем! 1000LP Ð´Ð»Ñ Ð¸ÑпользованиÑ. +guide.bloodmagic.entry.architect.lavaCrystal.info.1=КриÑталл лавы - Ñто камень, в центре которого находитÑÑ ÐºÑƒÑочек лавы, не терÑющий тепла. При размещении в качеÑтве иÑточника топлива внутри печи, оно «Ñгорает» на количеÑтво, доÑтаточное Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ предмета в Ñтандартной печи по цене 50 LP из Ñети владельца. ЕÑли в Ñети недоÑтаточно Ñнергии (или нет владельца), криÑталл проÑто не Ñгорит и вызовет тошноту у владельца из-за нагрузки.\n\tЭтот криÑталл будет работать на любой машине, работающей на твердом топливе, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ любое топливо. +guide.bloodmagic.entry.architect.apprenticeorb.info.1=При иÑпользовании различных уÑтройÑтв вы быÑтро поймете, что ваша макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÐµÐ¼ÐºÐ¾ÑÑ‚ÑŒ 5 LP в вашей Душа Сеть быÑтро иÑÑÑкнет. ЗдеÑÑŒ вы начнете иÑкать более мощный шар Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ Ñети.\n\tÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ñфера Ученика требует Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð£Ñ€Ð¾Ð²Ð½Ñ 2 и имеет макÑимальную вмеÑтимоÑÑ‚ÑŒ 25 LP. Это также позволÑет Ñоздавать более мощные предметы и руны. +guide.bloodmagic.entry.architect.dagger.info.1=Через некоторое Ð²Ñ€ÐµÐ¼Ñ ÑƒÐºÑ€ÐµÐ¿Ð»ÐµÐ½Ð¸Ñ ÑÐµÐ±Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ можете попытатьÑÑ Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ñ‚ÑŒ кровью мобов. Dagger of Sacrifice, когда он иÑпользуетÑÑ Ð½Ð° не-боÑÑе, не игроке Ñ€Ñдом Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ñ‹Ð¼ Ðлтарем, убьет ÑущеÑтво одним ударом и накачает вÑÑŽ кровь в алтарь, Ð¿Ñ€ÐµÐ²Ñ€Ð°Ñ‰Ð°Ñ ÐµÐµ в ÑущноÑÑ‚ÑŒ жизни в завиÑимоÑти от качеÑтва толпа. Обычно, враждебные мобы будут давать гораздо больше LP, чем мирные мобы. +guide.bloodmagic.entry.architect.runeSacrifice.info.1=Руна жертвоприношениÑ, как Ñледует из названиÑ, увеличивает урожайноÑÑ‚ÑŒ вÑех видов деÑтельноÑти, которые приноÑÑÑ‚ в жертву здоровье мобов в обмен на LP. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° обеÑпечивает + 10% -ное увеличение урожаÑ, в добавок. +guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=Как и в Ñлучае Ñ Rune of Sacrifice, Rune of Self Sacrifice увеличивает доходноÑÑ‚ÑŒ LP от игрока. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° обеÑпечивает + 10% -ное увеличение урожаÑ, в добавок. +guide.bloodmagic.entry.architect.holding.info.1=Как вы начнете понимать, еÑÑ‚ÑŒ много полезных Ñимволов, некоторые из которых можно переключать, другие активно иÑпользовать. Из-за Ñтого ваш инвентарь быÑтро забьетÑÑ. Эта потребноÑÑ‚ÑŒ заполнÑетÑÑ Ð¡Ð¸Ð³Ð¸Ð»Ð¾Ð¹ Холдинга.\n\tЭтот Ñимвол может Ñодержать до пÑти других Ñимволов (нет, он не может Ñодержать других Ñимволов холдинга) во внутреннем инвентаре. Ðажав клавишу «Удержание», по умолчанию «H», вы можете открыть графичеÑкий Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñигил, чтобы изменить раÑположение удерживаемых Ñигил. ЕÑли вы перемещаете и иÑпользуете колеÑо прокрутки, пока оно уÑтановлено, вы будете перебирать ÑодержащиеÑÑ Ð² нем Ñигилы. Как только вы приземлитеÑÑŒ на тот Ñимвол, который хотите иÑпользовать, вы можете иÑпользовать Ñтот Ñимвол, как еÑли бы он был выбран! \n\tЕÑтеÑтвенно, у Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть неÑколько Сигил Холдинга, каждый Ñо Ñвоим инвентарем. Чтобы определить, какой из них Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ взглÑда, вы можете покраÑить Ñимвол, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ðлхимии. Чтобы Ñделать Ñто, помеÑтите Сигилу Ð”ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ð² ÐлхимичеÑкую Таблицу Ñ ÐºÑ€Ð°Ñителем или Сигилу Ñ Ñ‚ÐµÐ³Ð¾Ð¼ имени нужного цвета в формате 0xZZZZZZ Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸. +guide.bloodmagic.entry.architect.air.info.1=Воздух Ñигил иÑпользует Ñлементарную форму делениÑ, чтобы генерировать Ñтабильный поток воздуха за пользователем по Ñледам водÑного пара в воздухе, Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ Ð¸Ñ… вперед. Ð’ ÑущноÑти, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтого незапечатанный, вы можете быть запущен вперед на значительное раÑÑтоÑние. Следует отметить, что запечатано только отменить раÑÑтоÑние Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ иÑпользовании, так что еÑли вы хотите придерживатьÑÑ Ð¿Ð¾Ñадок вы должны иÑпользовать его близко к земле! +guide.bloodmagic.entry.architect.void.info.1=Как Ñледует из названиÑ, пуÑтота Ñигил будет Ñоздавать вакуум в точке контакта, который будет вÑаÑывать жидкий иÑточник, который иÑпользуетÑÑ Ð½Ð°, полноÑтью уничтожить иÑточник. Это, вероÑтно, лучше вÑего иÑпользовать в Ñочетании Ñ Ñ‡Ð¸Ñтой Ñигилой Water или Ñигилами. +guide.bloodmagic.entry.architect.greenGrove.info.1=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñвою кровь в качеÑтве проÑтого катализатора роÑта Ñортов, Ñигил Зеленой Рощи увеличит ÑкороÑÑ‚ÑŒ роÑта любых раÑтений в ÑоÑеднем районе, а активируетÑÑ. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы активировать запечатанный, Ñдвиг-щелчок правой кнопкой Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ активируетÑÑ Ð¸ деактивируетÑÑ (легко видеть по подÑказке или ÑветÑщимиÑÑ Ñимволами на незакрытых). Имейте в виду, что каждые неÑколько Ñекунд запечатанные будет перекачать немного LP от Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ðº топливу уÑкоренного роÑта.\n\tЕÑли иÑпользуютÑÑ Ð½ÐµÐ¿Ð¾ÑредÑтвенно на плоÑкоÑти, Ñигил применит коÑÑ‚ÑŒ еды Ñффекта. Это может быть иÑпользовано Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ñ‰Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹Ñокой травы или других культур, так же, как коÑти еда. +guide.bloodmagic.entry.architect.fastMiner.info.1=Как должен знать любой хороший маг крови, в крови много железа. ЕÑли вы доÑтаточно опытны, вы можете манипулировать кровью, пока она еще находитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ тела - однако Ñледует отметить, что только Ñамые продвинутые Маги Крови могут Ñкручивать кровь тех, кто не желает.\n\tОдин из принципов, который иÑпользует Ñтот принцип, заключаетÑÑ Ð² уÑкорении функций ÑобÑтвенного тела. ÐÐ°Ð¼Ð°Ð³Ð½Ð¸Ñ‡Ð¸Ð²Ð°Ñ Ð¶ÐµÐ»ÐµÐ·Ð¾ в крови пользователÑ, Sigil of the Fast Miner резко увеличивает ÑкороÑÑ‚ÑŒ майнинга, применÑÑ Haste II во Ð²Ñ€ÐµÐ¼Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸. Этот магнетизм Ñлишком Ñлаб, чтобы воздейÑтвовать на вещи вне ÑобÑтвенного тела, однако его доÑтаточно Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы добывать обÑидиан Ñо значительной ÑкороÑтью. +guide.bloodmagic.entry.architect.seer.info.1=Ð Ð°Ð±Ð¾Ñ‚Ð°Ñ Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ñ‹Ð¼ Ðлтарем, вы иногда можете заблудитьÑÑ Ð² Ñкрытых тонкоÑÑ‚ÑÑ… его дейÑтвиÑ, которые, по-видимому, Гадательный Символ не может угадать. ЗдеÑÑŒ в игру вÑтупает Сигил Провидца. По Ñути, Ñто повышение до ГаданиÑ, Ñтот Ñимвол предоÑтавлÑет дополнительную информацию о различных характериÑтиках алтарÑ. Они варьируютÑÑ Ð¾Ñ‚ ÑкороÑти алтарÑ, текущего LP, а также текущего прогреÑÑа Ñозданного предмета. Это также дает информацию о душевной Ñети игрока. +guide.bloodmagic.entry.architect.magicianOrb.info.1=Еще один уровень, еще одна ÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ñфера. Ðа Ñтот раз, чтобы продвинутьÑÑ Ð´Ð°Ð»ÑŒÑˆÐµ в моде, вам нужно будет Ñоздать Ñебе Магию Кровавого Шара. Ð’ рецепте по умолчанию вы можете видеть, что Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÑ€Ð°Ñ„Ñ‚Ð° требуетÑÑ 25kLP, однако макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð¼ÐµÑтимоÑÑ‚ÑŒ ÐÐ»Ñ‚Ð°Ñ€Ñ ÐšÑ€Ð¾Ð²Ð¸ ÑоÑтавлÑет 10kLP. Это означает, что Ð´Ð»Ñ ÑƒÑпешного ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ¾Ñ€Ð°Ð±Ð»Ñ Ð²Ð°Ð¼ нужно будет добавить LP в Ðлтарь, пока он находитÑÑ Ð² процеÑÑе ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑˆÐ°Ñ€Ð°. Будьте готовы, так как Ñто может быть трудной задачей, еÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ вÑего, что вам нужно! +guide.bloodmagic.entry.architect.capacity.info.1=Ð’Ñ‹ не ÑовÑем уверены, как Ñто работает так, как работает, но Руна СпоÑобноÑти увеличивает ÑпоÑобноÑÑ‚ÑŒ Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ Ð½Ð° 2kLP аддитивно. Возможно, ÑущеÑтвует какой-то резонанÑный Ñффект, который уменьшает объем LP, поÑтому позволÑет вам больше упаковывать в ÑтатичеÑкий таз? Это дает вам предÑтавление о том, как улучшить его, Ñ…Ð¾Ñ‚Ñ ...\n\tСледует повторить, что размер входного и выходного буферов ÑоÑтавлÑет 10 %% от макÑимальной емкоÑти оÑновного резервуара, поÑтому Ñти руны также увеличат буферные емкоÑти. +guide.bloodmagic.entry.architect.displacement.info.1=По умолчанию передача LP между буфером и оÑновными резервуарами ограничена 20LP / Ñ. Ð”Ð»Ñ ÑиÑтем, которые хотÑÑ‚ удалить и повторно добавить LP к алтарю, Ñта ÑкороÑÑ‚ÑŒ ÑвлÑетÑÑ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ñ‹Ð¼ Ñканированием. Вот где Ñта руна вÑтупает в игру.\n\tРуна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ количеÑтво ЛП, передаваемых за операцию. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° умножает ÑкороÑÑ‚ÑŒ передачи в 1,2 раза, умножаÑÑÑŒ на Ñтопку. Таким образом, одна руна будет 24LP на операцию, две руны будут 28.8LP на операцию и три руны 34.56LP. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ 20 рун на алтаре, Ñто прыгает до 767LP за операцию - Ñто очиÑтит полный алтарь вÑего за 13 Ñекунд. +guide.bloodmagic.entry.architect.affinity.info.1=Ðа первый взглÑд, Символ СродÑтва Стихий проÑто дает иммунитет к огню, утоплению и урону Ñ Ð²Ñ‹Ñоты при активации. Однако, его работа намного более тонкаÑ. Этот Ñимвол Ñоздает тонкий барьер воздуха вокруг пользователÑ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð¾Ñ‚ (и, при необходимоÑти, кровь) от пользователÑ, ÑƒÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ Ñ‚ÐµÐ»Ð¾ вдали от резких Ñлементов. \n\tЭтот воздушный барьер дейÑтвует как буфер между кожей и огнем или лавой, Ñ†Ð¸Ñ€ÐºÑƒÐ»Ð¸Ñ€ÑƒÑ Ð¿Ñ€Ð¸ необходимоÑти Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ³Ñ€ÐµÐ²Ð°. Он также заполнÑет легкие, находÑÑÑŒ под водой, чтобы выровнÑÑ‚ÑŒ давление тела и окружающей воды. Ðаконец, при падении Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ выÑоты воздух ÑмещаетÑÑ Ð½Ð¸Ð¶Ðµ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½Ð¾Ð³ человека, выÑÑ‚ÑƒÐ¿Ð°Ñ Ð² качеÑтве подушки Ð´Ð»Ñ ÑмÑÐ³Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ. +guide.bloodmagic.entry.architect.lamp.info.1=Ð’ теле и крови человека довольно много «примеÑей». Ð¡Ð¾Ð±Ð¸Ñ€Ð°Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ благородные газы и Ð·Ð°ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¸Ñ… в иÑточник тепла, вы можете Ñоздать шар Ñвета, который можно отброÑить на большое раÑÑтоÑние, Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ñ Ðº поверхноÑти, на которую он ударÑет.\n\tСигил Кровавой Светильника имеет два назначениÑ: вы можете либо щелкнуть по блоку напрÑмую и помеÑтить иÑточник Ñвета, либо выÑтрелить ÑнарÑдом, который будет генерировать иÑточник Ñвета в точке контакта. Эти иÑточники Ñвета могут быть разбиты так же, как факелы за один удар. +guide.bloodmagic.entry.architect.magnetism.info.1=Этот Ñимвол намагничивает железо в потоке крови пользователÑ, притÑÐ³Ð¸Ð²Ð°Ñ Ðº нему мелкие предметы, обеÑÐ¿ÐµÑ‡Ð¸Ð²Ð°Ñ Ð±Ñ‹Ñтрый и безболезненный захват. По Ñути, Ñто дейÑтвует как магнит предмета, но вмеÑто того, чтобы фактичеÑки «пылеÑоÑить» предметы по отношению к игроку, он заÑтавлÑет игрока подбирать предмет Ñ Ñ€Ð°ÑÑтоÑниÑ, поÑтому предметы не должны летать вокруг меÑта. К ÑчаÑтью, магнетизм наÑтроен так, что он не притÑгивает к Ñебе живые объекты, поÑтому вы не найдете лианы, внезапно желающие обнÑÑ‚ÑŒ Ð²Ð°Ñ Ð½Ð° Mach 3. + +guide.bloodmagic.entry.architect.peritia.info.1=Ð’ мире определенные дейÑÑ‚Ð²Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´ÑÑ‚ впечатление на человека: убийÑтво монÑтров, добыча Ñлементов, плавка Ñлитков или пищи может дать опыт, накопленный за определенный период времени. Через некоторые тайные механизмы некоторые Ñтруктуры и уÑтройÑтва фактичеÑки иÑтощают Ñтот опыт у ваÑ, чтобы подпитывать Ñвои ÑобÑтвенные процеÑÑÑ‹. ПоÑтому может быть полезно хранить Ñтот опыт в некоторой Ñреде.\n\tÐ¥Ð¾Ñ‚Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ контейнеры хранÑÑ‚ опыт как физичеÑкую ÑубÑтанцию, «Фолиант Перитии» позволÑет человеку транÑкрибировать Ñвои Ð¿ÐµÑ€ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð² книгу - напиÑав в томе, Ñтраницы наполнены вашими мыÑлÑми и прошлыми дейÑтвиÑми, ÑохранÑÑ Ð¸Ñ… Ð´Ð»Ñ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐµÐ³Ð¾ иÑпользованиÑ. ЕÑли затем вы захотите получить Ñтот опыт обратно, вы можете поднеÑти руку к Ñтранице и откачать их обратно; Ñто удалит запиÑÑŒ Ñо Ñтраницы и передаÑÑ‚ Ñти дейÑÑ‚Ð²Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ в вашу памÑÑ‚ÑŒ. \n\tÐ¡ÐµÐ¹Ñ‡Ð°Ñ Ð´Ð»Ñ Ñ„Ð°ÐºÑ‚Ð¸Ñ‡ÐµÑкого иÑпользованиÑ; щелкнув правой кнопкой мыши на томе в Ñвоей руке, вы можете Ñохранить уровень опыта в книге (или до уровнÑ, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ чаÑтичный уровень). ЕÑли щелкнуть правой кнопкой мыши на томе, вы перейдете на Ñледующий уровень, еÑли в книге доÑтаточно опыта. Общий опыт, а также Ñохраненный Ñквивалентный уровень отображаютÑÑ Ð²Ð¾ вÑплывающей подÑказке в томе. +guide.bloodmagic.entry.architect.livingArmour.info.1=Любой человек в Minecraft, оÑобенно Ñ Ð½Ð¾Ð²Ñ‹Ð¼Ð¸ воплощениÑми мира, будет знать, что хороший набор доÑпехов означает разницу между жизнью и Ñмертью. Обычно, когда вы выбираете набор брони, вы выбираете ÑтатичеÑкий набор преимущеÑтв - обеÑпечивает ли Ñта Ð±Ñ€Ð¾Ð½Ñ Ð±Ð¾Ð»ÑŒÑˆÑƒÑŽ защиту? Получу ли Ñ Ñ€ÐµÐ¹Ñ, когда ношу Ñто? Могу ли Ñ Ð¿Ñ€Ñ‹Ð³Ð½ÑƒÑ‚ÑŒ очень выÑоко или двигатьÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ быÑтро? Ð’Ñе Ñто допуÑтимые параметры Ð´Ð»Ñ Ð½Ð°Ð±Ð¾Ñ€Ð° брони, но вы никогда не Ñможете получить набор, который точно ÑоответÑтвует вашим потребноÑÑ‚Ñм. По крайней мере, так они думали.\n\tÐабор Living Armor - Ñто ÑÐ¿Ñ€Ð¾ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð° жизни, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ð½Ñ‚ÐµÐ³Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð° Ñ Ð¿Ñ€Ð¾Ñтым набором железной брони. При ношении он вÑтупает в ÑимбиотичеÑкие Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ - когда вы двигаетеÑÑŒ, он движетÑÑ. Когда вы атакуете, он атакует. Когда вы едите, он Ñто чувÑтвует и компенÑирует. И так же, как нормальное человечеÑкое тело, оно начнет раÑти и укреплÑÑ‚ÑŒÑÑ Ð² завиÑимоÑти от того, что вы делаете, будучи обученным вашими дейÑтвиÑми. \n\tДавайте приведем пример. ЕÑли вы наденете новый комплект брони и будете много бегать, вы заметите, что вы получите апгрейд на нагрудную плиту под названием «БыÑтрые ноги» - Ñто апгрейд обеÑпечивает поÑтепенное увеличение вашей ÑкороÑти на уровне 1, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº поÑледующие уровни обеÑпечить больший импульÑ. Ð’Ñ‹ также заметите, что «Точки обновлениÑ» теперь читаютÑÑ ÐºÐ°Ðº «3/100» - каждое обновление требует Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ количеÑтва точек обновлениÑ, а на Ñундуке еÑÑ‚ÑŒ макÑимальное количеÑтво очков, которое она может удержать. ЕÑли обновление, которое вы можете получить, невозможно получить Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтвом имеющихÑÑ Ñƒ Ð²Ð°Ñ Ð±ÐµÑплатных точек обновлениÑ, его невозможно получить. \n\tИмейте в виду, что Живую Броню можно тренировать только тогда, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ полный комплект брони, а Ñффекты брони будут дейÑтвовать только тогда, когда иÑпользуетÑÑ Ð¿Ð¾Ð»Ð½Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ.\n\tМакÑимальное количеÑтво точек Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ изменить неÑколькими различными ÑпоÑобами. Одним из них ÑвлÑетÑÑ Ñоздание алхимичеÑких ÑмеÑей, которые укрепÑÑ‚ ÑвÑзи между пользователем и Живой Броней, значительно ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтво очков, которое вы можете получить на данном наборе ÑнарÑжениÑ. Одним из таких примеров ÑвлÑетÑÑ Â«Ð§ÐµÑ€Ð½Ð¾Ð²Ð¸Ðº Ðнгела», который увеличивает макÑимальное количеÑтво очков до 200. Информацию об Ñтих варевах, а также о том, как их Ñоздавать, можно найти в «Ðлхимике». +guide.bloodmagic.entry.architect.upgradeTome.info.1=Иногда вы можете быть недовольны улучшениÑми, которые вы получили в Ñвоей Живой Броне. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð» «Звук Очищающей Души» (дополнительную информацию можно найти в «Ритуальном МаÑтере»), вы можете удалить вÑе ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ñ Ð´Ð¾Ñпехов и получить их в виде «Ðпгрейдовых фолиантов». ЕÑли вы щелкнете по ним правой кнопкой мыши, Ð½Ð°Ð´ÐµÐ²Ð°Ñ Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ комплект Living Armor (и когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ меÑто Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ), вы можете добавить обновление к Ñвоей броне. \n\tЭти тома также могут быть объединены в наковальне - еÑли вы комбинируете два одинаковых тома Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ (одно и то же улучшение, тот же уровень) вмеÑте в наковальне, вы можете получить один том на один уровень выше. Таким образом, еÑли вы объедините Quick Feet II Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ Quick Feet II, вы получите Quick Feet III. Это может быть применено к броне таким же образом. +guide.bloodmagic.entry.architect.teleposer.info.1=Teleposer - Ñто уÑтройÑтво, которое телепортирует не только объекты, но и блоки. Чтобы наÑтроить Teleposer, вам нужно как минимум два Teleposers и один Teleposition focus. Один из Teleposers дейÑтвует как Ðазначение, а другой дейÑтвует как Ðачало.\n\tЧтобы наÑтроить Ñто, вам нужно Ñначала привÑзать Ñ„Ð¾ÐºÑƒÑ Ðº Ñебе, щелкнув по нему правой кнопкой мыши. Затем вы щелкаете правой кнопкой мыши по фокуÑу на Teleposer назначениÑ, чтобы Ñохранить его меÑтоположение (и размер), а затем вÑтавлÑете Ñ„Ð¾ÐºÑƒÑ Ð² Beginning Teleposer, Ñ‰ÐµÐ»ÐºÐ°Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ кнопкой мыши Teleposer без фокуÑа в руке и Ð¿Ð¾Ð¼ÐµÑ‰Ð°Ñ Ñ„Ð¾ÐºÑƒÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ GUI.\n\tВключение начинающего телепортера (тот, который в фокуÑе) Ñ Ñильным Ñигналом краÑного ÐºÐ°Ð¼Ð½Ñ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÐµÑ‚ к тому, что телепродавцы поменÑÑŽÑ‚ÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°Ð¼Ð¸ и блоками (Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð»ÑŽÐ±Ð¾Ð¹ контент в тайлах, таких как инвентарь Ñундуков) между телепозиционерами, предполагаÑ, что в телепоÑтере еÑÑ‚ÑŒ МеÑто назначениÑ. \n\tУ Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть один Teleposer Ñ Ñ„Ð¾ÐºÑƒÑом, у обоих Teleposrs еÑÑ‚ÑŒ фокуÑÑ‹, которые ÑвÑзаны друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼, или вы можете иметь один Teleposer, ÑвÑзанный Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Teleposer, который не ÑвÑзан Ñ Ð½Ð¸Ð¼, поÑтому в завиÑимоÑти от того, как вы их наÑтроили, вы можете может иметь очень Ñложные ÑиÑтемы.\n\tИмейте в виду, что в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Teleposer будет менÑÑ‚ÑŒ меÑтами только те блоки и объекты, которые находÑÑ‚ÑÑ Ð¿Ñ€Ñмо над блоком, а размер завиÑит от фокуÑа - Ñ„Ð¾ÐºÑƒÑ T1 менÑет меÑтами только блок поверх Teleposer, Ñ„Ð¾ÐºÑƒÑ T2 менÑет облаÑÑ‚ÑŒ 3x3x3 выше Телепортер и др. +guide.bloodmagic.entry.architect.boundBlade.info.1=СвÑзанный Клинок - Ñто артефакт из прошлого, клинок, Ñозданный путем привÑзки ÑущеÑтва к мечу в том же процеÑÑе, что и Ð–Ð¸Ð²Ð°Ñ Ð‘Ñ€Ð¾Ð½Ñ. Следует отметить, что Ñто, как и Bound Tools, изменитÑÑ Ð² более поздних верÑиÑÑ… мода.\n\tМеч имеет активный и неактивный режим, который можно переключать, Ñ‰ÐµÐ»ÐºÐ°Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ кнопкой мыши. Меч не наноÑит никакого урона вообще, когда неактивен, но когда он активен, Ñо временем произойдет небольшой раÑход ЛП. Точно так же, когда вы наноÑите урон мобу, вы вытÑгиваете LP из Ñвоей Ñети. Конечно, у Ð²Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾ урона, но Ñто может Ð²Ð°Ñ ÑƒÐ±Ð¸Ñ‚ÑŒ!\n\tКогда монÑÑ‚Ñ€ убит, у него еÑÑ‚ÑŒ ÑˆÐ°Ð½Ñ ÑброÑить оÑколок Ñлабой крови. Эти оÑколки иÑпользуютÑÑ Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÐÐ»Ñ‚Ð°Ñ€Ñ ÐšÑ€Ð¾Ð²Ð¸ до Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¢4. +guide.bloodmagic.entry.architect.boundTool.info.1=Подобно Bound Blade, Ñти Bound Tools (кирка, топор и лопата) в конечном итоге будут модифицированы Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ ÑоответÑÑ‚Ð²Ð¸Ñ Ð¼Ð¾Ð´Ñƒ. Как и Blade, инÑтрументы имеют активный и неактивный режим, который можно переключать, Ñ‰ÐµÐ»ÐºÐ°Ñ Ð¸Ñ… правой кнопкой мыши. \n\tТо, что еÑÑ‚ÑŒ в Ñтих инÑтрументах, называетÑÑ Â«Ð ÐµÐ¶Ð¸Ð¼ зверÑ». ЕÑли вы удерживаете правой кнопкой мыши, вы можете зарÑдить инÑтрумент и выÑвободить мощное раÑщепление, которое мгновенно Ñломает блоки, которые могут быть разбиты данным инÑтрументом - при полной зарÑдке Ñто куб размером 11x11x11 над вами по цене 10kLP. Будьте оÑторожны Ñ Ñтим мощным инÑтрументом, так как он может быть вашим поÑледним! +guide.bloodmagic.entry.architect.weakShard.info.1=Ð’Ñе, что имеет жизнь, может иметь Ñфирные ÑвÑзи, извеÑтные как Сеть Души. Как видно из вашего опыта, к неживым вещам также может быть приÑоединена Сеть Души, Ñ‚Ð°ÐºÐ°Ñ ÐºÐ°Ðº Ñигилы и ритуалы; однако Ñти ÑвÑзи наиболее Ñильны у ÑущеÑтв и, еÑтеÑтвенно, у людей. \n\tКогда вы атакуете монÑтра Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Bound Blade, их Ñеть душ временно затвердевает, и чаÑÑ‚ÑŒ ее оÑтанетÑÑ Ð¿Ð¾Ñле Ñмерти. Эта чаÑÑ‚ÑŒ принимает форму оÑколка Ñлабой крови, названного так в Ñилу того, что ее краÑноватый оттенок ÑоответÑтвует цвету шара Ñлабой крови. Ðа данный момент неÑÑно, ÑущеÑтвуют ли более Ñильные формы кровÑных оÑколков, но вы можете Ñказать, что Ñто было бы очень полезно Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ñ‰Ð½Ð¾Ñти вашей ÑобÑтвенной Сети Души. +guide.bloodmagic.entry.architect.masterOrb.info.1=Одно из применений Ñтого увеличенного ÑродÑтва к Сети Души - иÑпользование Слабого Кровавого ОÑколка в новом кровавом шаре: МаÑтер Кровавого Шара. Этот шар имеет макÑимальную вмеÑтимоÑÑ‚ÑŒ 1 миллион LP, и, таким образом, владелец шара может получить доÑтуп к более мощным предметам и ритуалам. Возможно, метеоры не за пределами вашей доÑÑгаемоÑти ... +guide.bloodmagic.entry.architect.runeOrb.info.1=Изначально Ñту руну можно Ñчитать неÑколько беÑполезной. УкреплÑÑ ÑвÑзи между Ñферой крови в алтаре и Сетью Души, Руна Сферы увеличивает макÑимальную вмеÑтимоÑÑ‚ÑŒ шара крови, заполненного Кровавым Ðлтарем, на + 2 %% за каждую руну. Ð”Ð»Ñ Ñ‡ÐµÐ³Ð¾-то вроде Слабой Сферы Крови Ñто вÑего лишь емкоÑÑ‚ÑŒ + 100LP, однако Ð´Ð»Ñ Master Blood Orb Ñто Ð·Ð°Ð¼ÐµÑ‡Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐµÐ¼ÐºÐ¾ÑÑ‚ÑŒ + 20kLP на руну. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ выÑокоуровневый шар крови и неÑколько дополнительных рун, которые вы можете ÑÑкономить на Ñвоем алтаре, Ñто может быть чем-то, что может обогатить вашу Ñеть. +guide.bloodmagic.entry.architect.suppression.info.1=Символ Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ñпользует технологию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸ÑпользуетÑÑ Ð² Teleposer Ð´Ð»Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñтей, которые находÑÑ‚ÑÑ Ñ€Ñдом Ñ Ð½Ð¸Ð¼, когда активны. Это делаетÑÑ Ð¿ÑƒÑ‚ÐµÐ¼ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñтей в Ñфере вокруг Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ðº Ñкрытому карманному размеру, заменÑÑ Ð¶Ð¸Ð´ÐºÐ¾ÑÑ‚ÑŒ воздухом. К Ñожалению, из-за того, что вы перезарÑжаете поле, иÑпользуемое Teleposer, Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð° - еÑли пользователь уходит из облаÑти, в которой была удалена жидкоÑÑ‚ÑŒ, или деактивирует Ñигил, жидкоÑти будут возвращатьÑÑ Ñ‚ÑƒÐ´Ð°, где они были раньше, как будто ничего произошло, еÑли предположить, что там нет новых блоков. Это позволÑет Ñовершить необычную транÑпортировку пешком, гулÑÑ Ð¿Ð¾Ð´ водой вмеÑто того, чтобы плыть через нее или даже раÑÑтаватьÑÑ Ñ ÐºÑ€Ð°Ñными морÑми ПуÑтоты. +guide.bloodmagic.entry.architect.haste.info.1=Сахар и кофеин - интереÑные химичеÑкие вещеÑтва, которые человечеÑкий организм может перерабатывать. Один дейÑтвует как резервуар Ñнергии, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ñтро Ñгорает, тогда как другой увеличивает ваше бодрÑтвование и позволÑет вам получить доÑтуп к Ñнергии другими ÑпоÑобами. ÐŸÐ¾Ð´Ñ€Ð°Ð¶Ð°Ñ Ñтим химичеÑким процеÑÑам, чтобы выÑвободить больше химичеÑкой Ñнергии, Sigil of Haste позволÑет пользователю увеличить Ñвои ÑпоÑобноÑти к движению. \n\tПри активации пользователь может работать намного быÑтрее и может прыгать значительно выше. Более того, Ñигил также предлагает «Step Assist», который позволÑет пользователю поднÑÑ‚ÑŒÑÑ Ð½Ð° один блок выÑокими гребнÑми без необходимоÑти прыгать. Это как автоматичеÑкий прыжок, но менее отÑтойный. +guide.bloodmagic.entry.architect.severance.info.1=Ð¢ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ - одна из тех Ñтранных ÑпоÑобноÑтей, которые люди не могут полноÑтью объÑÑнить. Ð’ большинÑтве Ñлучаев Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть опиÑана как Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð´ÐµÑ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² проÑтранÑтве-времени, ÑвÑÐ·Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ Ð´Ð²Ð° меÑта в проÑтранÑтве так, что раÑÑматриваемый объект может проÑто «перешагнуть» на другую Ñторону. Sigil of Ender Severance пытаетÑÑ Ð¾Ñтановить Ñту деформацию, необходимую Ð´Ð»Ñ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ð¸, Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰Ð°Ñ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸ÑŽ ÑущеÑтв, когда они находÑÑ‚ÑÑ Ñ€Ñдом Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼. Это не оÑтановит некоторые из более крупных ÑредÑтв телепортации, таких как порталы, но предотвратит иÑпользование Эндерманом Ñвоих ÑпоÑобноÑтей Ð´Ð»Ñ Ð´ÐµÑ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ вокруг пользователÑ. +guide.bloodmagic.entry.architect.teleposition.info.1=Символ Телепозиции имеет в Ñвоем ÑоÑтаве Teleposer и фокуÑ. ЕÑли вы щелкните правой кнопкой мыши на Teleposer Ñ Ñтим Ñимволом, вы можете привÑзать координаты и размер к Ñимволу. Теперь, когда вы щелкнете правой кнопкой мыши по Ñимволу, он будет телепортировать Ð²Ð°Ñ Ð¿Ñ€Ñмо в Teleposer (еÑли он там еÑÑ‚ÑŒ). К Ñожалению, не похоже, что вы можете Ñовершить обратную поездку ... +guide.bloodmagic.entry.architect.compression.info.1=Шахтер быÑтро обнаружит, что во Ð²Ñ€ÐµÐ¼Ñ Ð´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ ÑкÑпедиции их инвентарь будет заполнен краÑнокаменной пылью, лÑпиÑом и неÑколькими другими материалами. У большинÑтва из них еÑÑ‚ÑŒ рецепты, которые Ñжимают их до блоков хранениÑ, таких как блоки из краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ блоки Ñ Ð±Ñ€Ð¸Ð»Ð»Ð¸Ð°Ð½Ñ‚Ð°Ð¼Ð¸, однако Ð´Ð»Ñ Ð¸Ñ… Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾ требуетÑÑ Ñтол Ð´Ð»Ñ ÐºÑ€Ð°Ñ„Ñ‚Ð°. \n\tЭтот Ñимвол Ñоздает миниатюрное поле ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð² инвентаре Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ активации, ÑÐ¶Ð¸Ð¼Ð°Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ñ‹ до минимального количеÑтва Ñлотов, необходимых Ð´Ð»Ñ Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ. Это означает, что еÑли у Ð²Ð°Ñ 63 краÑных камнÑ, Ñто ничего не даÑÑ‚. Однако, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ 64 пыли, он Ñожмет 9 из них в блок из краÑного камнÑ. Ð¥Ð¾Ñ‚Ñ Ñто техничеÑки не Ð¸Ð´ÐµÐ°Ð»ÑŒÐ½Ð°Ñ ÑитуациÑ, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ровно куча краÑной пыли, Ñто гарантирует, что вы не оÑтанетеÑÑŒ в пыли из-за полных карманов. ЕÑли приÑутÑтвуют другие моды, Ñто будет работать и Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… рецептов крафта. +guide.bloodmagic.entry.architect.bridge.info.1=Когда активировано и когда пользователь находитÑÑ Ð½Ð° твердой поверхноÑти, Сигилла Фантомного МоÑта затвердевает в воздухе под пользователем, так что они могут идти по нему, ÑоздаваÑ, по ÑущеÑтву, Фантомный МоÑÑ‚. Когда вы перемещаетеÑÑŒ в воздухе, моÑÑ‚ будет формироватьÑÑ Ð½ÐµÐ¿Ð¾ÑредÑтвенно под вами, позволÑÑ Ð²Ð°Ð¼ поймать ÑÐµÐ±Ñ Ð² воздухе, еÑли вы упадете. Ð¥Ð¾Ñ‚Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐºÐ°Ð»Ð¸Ð±Ñ€Ð¾Ð²ÐºÐ° необходима Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñделать ее более Ñффективной Ð´Ð»Ñ Ð²ÐµÑ€Ñ‚Ð¸ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ перемещениÑ, а также горизонтального Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ быÑтром движении (из-за запаздываниÑ, мешающего Ñозданию моÑта), Ñто Ñффективный ÑпоÑоб Ñффективно летать в разные районы. +guide.bloodmagic.entry.architect.mimic.info.1=Мимики - Ñто тайные конÑтрукции, которые предназначены Ð´Ð»Ñ Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ð¸ того, на что они наÑтроены. Когда мимика вÑтупает в контакт Ñ ÐºÐ°ÐºÐ¾Ð¹-либо формой блока, его молекулы изменÑÑŽÑ‚ Ñвою ориентацию, чтобы принÑÑ‚ÑŒ форму, внешний вид и ощущение блока. Однако не вÑе ÑвойÑтва копируютÑÑ: например, нормальный мимичеÑкий блок при контакте Ñо ÑветÑщимÑÑ ÐºÐ°Ð¼Ð½ÐµÐ¼ не будет излучать никакой формы Ñвета. \n\tПри обычном иÑпользовании, еÑÑ‚ÑŒ два ÑпоÑоба иÑпользовать блок мнемоÑхемы. Первый - помеÑтить блок мнемоники вниз, а затем щелкнуть правой кнопкой мыши на мнемоÑхеме Ñ Ð±Ð»Ð¾ÐºÐ¾Ð¼, который вы хотите Ñкопировать. Это помеÑтит блок в мнемоÑхему и придаÑÑ‚ ей форму -default-. Таким образом, еÑли щелкнуть по леÑтнице мимику, она вÑегда будет ориентироватьÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ð¾.\n\tВторой ÑпоÑоб заключаетÑÑ Ð² том, чтобы держать блок мимики в руке и нажимать клавишу Shift, щелкнув блок, который вы хотите заменить. Это заменит блок на мнемоÑхему, и мимик будет иметь ту же ориентацию, что и замененный блок. Это можно увидеть по леÑтницам и Ñундукам, а также по другим завиÑимым от ориентации блокам, таким как бревна.\n\tЕÑÑ‚ÑŒ неÑколько разных вариантов нормальной мимики. Ðепрозрачный мимик - Ñто имитатор по умолчанию, ÑпоÑобный принимать форму и общие ÑвойÑтва блоков - однако Ñвет не может проходить через них, поÑтому Ñледует Ñоблюдать оÑторожноÑÑ‚ÑŒ Ñо Ñтеклом. Ð’ Ethereal Opaque Mimic можно пройти без каких-либо проблем, поÑкольку у него нет хитбокÑа, который идеально подходит Ð´Ð»Ñ Ñкрытых дверных проемов. Блоки Clear Mimic работают так же, как и их непрозрачные варианты, однако они пропуÑкают Ñвет через них, даже еÑли он кажетÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ñтью Ñплошным. Ðаконец, блок Lighted Mimic непрозрачен и Ñплошен, но незавиÑимо от того, что находитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ него, он будет излучать Ñильный Ñвет. Ðет больше темных облаÑтей на вашей базе без факела Ñпам!\n\tЕÑÑ‚ÑŒ один оÑобый вариант подражаниÑ, к которому вы должны отноÑитьÑÑ Ñ Ð¾ÑторожноÑтью: чувÑтвующий подражатель. ЕÑли игрок подходит Ñлишком близко к одному из них в мире, он вÑтанет оттуда, где находитÑÑ, и нападет на Ð²Ð°Ñ Ñ Ð²Ñ‹Ñокой Ñтепенью ÑвирепоÑти. Их можно найти в Ñамых разных меÑтах, но оÑобенно они любÑÑ‚ подземельÑ. Однако еÑли имитировать Ñундук, будьте оÑторожны: они куÑаютÑÑ.\n\t*** Только Ð´Ð»Ñ Ñ‚Ð²Ð¾Ñ€Ñ‡ÐµÑкого иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ***\n\tЕÑÑ‚ÑŒ неÑколько интереÑных функций, которые вы можете добавить к любому блоку мнемоÑхемы, когда находитеÑÑŒ в творчеÑком режиме. ЕÑли вы щелкнете правой кнопкой мыши на мимике Ñ Ð·ÐµÐ»ÑŒÐµÐ¼ или флÑжкой Ñ Ð·ÐµÐ»ÑŒÐµÐ¼, вы можете уÑтановить мимику так, чтобы вокруг нее поÑвлÑлиÑÑŒ зельÑ, еÑли Ñ€Ñдом находитÑÑ Ð¸Ð³Ñ€Ð¾Ðº. ЕÑли Ñто Ð¾Ð±Ñ‹Ñ‡Ð½Ð°Ñ Ð¼Ð¸Ð¼Ð¸ÐºÐ°, и вы нажимаете на воÑточную или западную Ñторону, вы можете увеличивать или уменьшать радиуÑ, в котором будет поÑвлÑÑ‚ÑŒÑÑ Ð·ÐµÐ»ÑŒÐµ. ЕÑли вы нажмете на Ñеверную или южную Ñторону, вы можете увеличить или уменьшить радиуÑ, который имитирует проверим игроков вокруг него до поÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð·ÐµÐ»Ð¸Ð¹. Ðаконец, нажатие на верхнюю или нижнюю чаÑÑ‚ÑŒ блока увеличит или уменьшит интервал Ð¿Ð¾Ñ€Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð·ÐµÐ»ÑŒÑ, который предÑтавлÑет Ñобой чиÑло тактов между опущенными зельÑми. \n\tЕÑли мимика ÑвлÑетÑÑ Ñ€Ð°Ð·ÑƒÐ¼Ð½Ð¾Ð¹ мимикой, вы можете нажать на мимику в любом меÑте, чтобы увеличить или уменьшить Ñ€Ð°Ð´Ð¸ÑƒÑ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ¾Ð² - еÑли игрок находитÑÑ Ð² Ñтой облаÑти, и они могут видеть блок, мимика будет поÑвлÑÑ‚ÑŒÑÑ Ð¸ прыгать на игрока. \n\tДругое дело, что еÑли блок размещен на мнемоÑхеме, когда роÑÑыпь находитÑÑ Ð² креативе, то блок, который имитируетÑÑ, ÐЕ будет выпадать при уничтожении мимики. \n\t Ðаконец, еÑли мимик помещен в любой инвентарь или Ñундук, разумный мимик положит Ñундук на землю Ñ ÐµÐ³Ð¾ Ñодержимым поÑле Ð¿Ð¾Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ - вмеÑто Ñтого обычный мимик будет проÑто извергать Ñодержимое повÑюду, когда разбит. +guide.bloodmagic.entry.architect.downgrade.info=ПожалуйÑта, ознакомьтеÑÑŒ Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð¼ «ПокаÑние отмершей души» в «Ритуальном маÑтере», где подробно объÑÑнÑÑŽÑ‚ÑÑ, что Ñто такое, а также как их получить. + +guide.bloodmagic.entry.architect.augmentedCapacity.info=Руна дополненной ÑпоÑобноÑти функционирует аналогично Руне вмеÑтимоÑти в том ÑмыÑле, что она увеличивает емкоÑÑ‚ÑŒ Кровавого ÐлтарÑ. Тем не менее, неÑколько рун на одном алтаре начнут резонировать друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼, ÑкÑпоненциально ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ Ð²Ð¼ÐµÑтимоÑÑ‚ÑŒ. Одна руна Ñама по Ñебе увеличивает емкоÑÑ‚ÑŒ Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð½Ð° + 10%, однако она мультипликативно работает Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ рунами увеличенной вмеÑтимоÑти: еÑли еÑÑ‚ÑŒ две руны, Ñто увеличение на + 21%, три руны +33,1. %% увеличение и Ñ‚. д.\n\tК Ñожалению, Ñтот мультипликативный Ñффект не ÑкладываетÑÑ Ñ Ð ÑƒÐ½Ð¾Ð¹ ЕмкоÑти, то еÑÑ‚ÑŒ вы вÑе равно получите Ð±Ð¾Ð½ÑƒÑ + 2kLP за руну. +guide.bloodmagic.entry.architect.charging.info=ЗарÑÐ´Ð¾Ñ‡Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° - одна из тех краÑавиц, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð»Ð½Ð¾Ñтью изменит дейÑтвие Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ Ð½Ð° что-то, что может быть Ñочтено более полезным Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð¹ оÑтановки. Медленно ÑÐ¸Ñ„Ð¾Ð½Ð¸Ñ€ÑƒÑ LP Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ð¾Ð³Ð¾ ÐлтарÑ, Руна ЗарÑдки начинает хранить «ЗарÑд», внутреннее значение Кровавого ÐлтарÑ, которое можно увидеть Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Sigil of Sight. ЕÑли у Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ Ð´Ð¾Ñтаточно ЗарÑда, когда он получает что-то Ð´Ð»Ñ Ð¸Ð·Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, он немедленно иÑпользует требуемую ЗарÑдку и мгновенно Ñоздает предмет. ЕÑли зарÑда недоÑтаточно, веÑÑŒ зарÑд иÑпользуетÑÑ Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€ÐµÑÑа предмета в Ñоотношении зарÑд: LP 1: 1. \n\tМакÑимальное количеÑтво ЗарÑда, которое может быть Ñохранено в Ðлтаре Крови, ÑвлÑетÑÑ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ количеÑтва ЗарÑжающих Рун, которое оно умножило на текущую емкоÑÑ‚ÑŒ Ð°Ð»Ñ‚Ð°Ñ€Ñ (емкоÑÑ‚ÑŒ Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð²Ñтупает в Ñилу, только еÑли она превышает 20k) , СкороÑÑ‚ÑŒ, которую он зарÑжает, также напрÑмую ÑвÑзана Ñо ÑкороÑтью алтарÑ, умноженной на количеÑтво зарÑженных рун, и он будет конвертировать LP в зарÑд каждые 20 тиков (одна Ñекунда). Так что, еÑли бы вы разработали Ðлтарь Крови Ñ Ñтой руной, нужно будет тщательно раÑÑмотреть вÑе его ÑинергетичеÑкие отношениÑ. +guide.bloodmagic.entry.architect.acceleration.info=Ð’ отличие от большинÑтва рун, Руна уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐµ вÑего работает только в Ñочетании Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ рунами, и ее Ñффекты только увеличиваютÑÑ Ð´Ð¾ ограниченного количеÑтва. Эта руна увеличивает количеÑтво тактов обработки, которые могут произойти за определенный период времени, оÑобенно когда речь идет о Руне Ð¡Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¸ Руне ЗарÑдки. Ð”Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ добавленной руны количеÑтво тактов перед Ñледующим тактом обработки уменьшаетÑÑ Ð½Ð° единицу. Ðапример, по умолчанию Руна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð²Ñ‹Ñ‚ÐµÑнÑет жидкоÑти Ñо ÑкороÑтью одной операции на 20 тиков - при 10 Рунах уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ñто проиÑходит Ñо ÑкороÑтью одной операции на 10 тиков.\n\tОчевидно, что макÑимальное количеÑтво рун уÑкорениÑ, которые в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð¼ÐµÑŽÑ‚ значение, ÑоÑтавлÑет 19 - еÑли у Ð²Ð°Ñ Ð¸Ñ… Ñтолько, Руна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¸ Руна зарÑдки будут активировать Ñвои Ñффекты каждый тик. Noice! + +guide.bloodmagic.entry.architect.tier3.info=Хорошо извеÑтно, что алтарь Ð£Ñ€Ð¾Ð²Ð½Ñ 3 требует, чтобы вы закрыли четыре колонны блоками ÑветÑщихÑÑ ÐºÐ°Ð¼Ð½ÐµÐ¹ из ПуÑтоты. Что не так хорошо понÑто, так Ñто то, что вы можете вмеÑто Ñтого иÑпользовать МорÑкие Фонари. ПоÑтому, еÑли вы оказалиÑÑŒ очень далеко от перехода в ПуÑтоту, но у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп к океанÑким храмам, вы можете иÑпользовать другие ÑпоÑобы Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð² Магии Крови. + +# Demon Kin Entries +# TODO + +# Demon Kin Entry Texts +guide.bloodmagic.entry.demon.intro.info=ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Белла Хайборн, и Ñ Ð¸Ð·Ð²ÐµÑтна как Король Демонов. ÐеÑколько меÑÑцев назад на мою деревню напала волна демонов, убив вÑех оÑтальных людей и уничтожив вÑе зданиÑ. Я мало что помню о нападении,кроме криков боли, когда каждый человек, которого Ñ Ð·Ð½Ð°Ð», покидал Ñтот мир ради более ÑчаÑтливого. К ÑчаÑтью, демоны не уÑлышали менÑ, когда Ñ Ð·Ð°Ð±Ð¸Ð»Ð°ÑÑŒ под корзины Ñ Ñ„Ñ€ÑƒÐºÑ‚Ð°Ð¼Ð¸ в подвале церкви ИнтактилиÑ, отчаÑнно пытаÑÑÑŒ не дать Ñвоим крикам приÑоединитьÑÑ Ðº хору других голоÑов. \nБыл один ужаÑный момент, когда Ñ Ñлучайно опрокинула алтарь Ñ Ð±Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ñми в церкви, и демон ворвалÑÑ Ð² ÑвÑтилище, невозмутимый тем, что мы Ñчитали ÑвÑщенным меÑтом. Это было огромное четвероногое чудовище Ñ ÐºÑ€Ð¸Ð²Ñ‹Ð¼Ð¸ клыками, ÑвиÑающими из выÑтупающей паÑти, Ñлюна капала на зазубренные мечи вмеÑто когтей. Он оглÑдел комнату и, клÑнуÑÑŒ, на Ñекунду вÑтретилÑÑ Ñо мной взглÑдом, но потом проÑто ушел, Ñловно ничего не видел и не Ñлышал. Потом вÑе было как в тумане. \nПрошел целый день, прежде чем кто-то пришел поÑмотреть, что ÑлучилоÑÑŒ. Торговый караван увидел вдалеке дым и решил пройти длинным путем мимо демонов. Многие из торговцев даже не хотели Ñмотреть на менÑ, опаÑаÑÑÑŒ, что Ñто дурное предзнаменование, потому что только мне удалоÑÑŒ оÑтатьÑÑ Ð½ÐµÐ²Ñ€ÐµÐ´Ð¸Ð¼Ñ‹Ð¼. Ðо два брата решили ÑжалитьÑÑ Ð½Ð°Ð´Ð¾ мной и попытатьÑÑ ÑƒÐ±ÐµÐ´Ð¸Ñ‚ÑŒ оÑтальных членов каравана взÑÑ‚ÑŒ Ð¼ÐµÐ½Ñ Ñ Ñобой. Мне пришлоÑÑŒ продать жезл жрицы и заперетьÑÑ, но мне удалоÑÑŒ купить безопаÑный проход в деревню доÑтаточно далеко от пути демонов разрушениÑ. +guide.bloodmagic.entry.demon.snare.info.1=Однажды маг Ñказал мне, что у каждого живого ÑущеÑтва еÑÑ‚ÑŒ душа: люди, куры, овцы и даже ползучие раÑÑ‚ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð°Ð´Ð°ÑŽÑ‚ жизненной Ñилой, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð´Ð°ÐµÑ‚ телу волю к жизни. КажетÑÑ, что маг в Ñвое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ð²ÐµÐ» много ÑкÑпериментов и даже Ñлышал о могущеÑтвенном маге, который мог взÑÑ‚ÑŒ Ñти души и перелить их в пуÑтые ÑоÑуды, такие как зомби. Ðо Ñто заÑтавило Ð¼ÐµÐ½Ñ Ð·Ð°Ð´ÑƒÐ¼Ð°Ñ‚ÑŒÑÑ: еÑли у зомби и Ñкелетов не было души, как же у них была Ð²Ð¾Ð»Ñ Ðº жизни? Что заÑтавило их попытатьÑÑ Ð²Ñ‹Ñледить любое живое ÑущеÑтво и убить его? \n\tÐ’Ñе Ñто возвращалоÑÑŒ к Уиллу, каждый раз. Ð’Ñе "живое" должно иметь волю, чтобы выжить, но Ñто не значит, что оно должно быть их ÑобÑтвенным. Когда Ñ Ñ€Ð°ÑÑказал об Ñтом магу, он немного поразмыÑлил, а потом доÑтал доÑку и мел (откуда, кто знает) и начал набраÑывать какие-то заметки о других видах магии. - Ð’ Тавматургии, - Ñказал он, риÑÑƒÑ Ñ„Ð¸Ð³ÑƒÑ€Ñƒ Ñоломенного человека, - големы-Ñто живые ÑущеÑтва, которым поручено выполнÑÑ‚ÑŒ многие мирÑкие операции. Они живут, дышат и даже могут умереть, еÑли окажутÑÑ Ð² немилоÑти у Ñвоих хозÑев. Ð’ нынешней итерации Тауматургии, и да, на протÑжении веков ÑущеÑтвовало неÑколько верÑий Ñтого иÑкуÑÑтва, маг наполнÑл Ñвоей волей их неодушевленное творение и оживлÑл их.\n\t- Вот так, Белла, дейÑтвуют големы: Ñилой воли."\n\tТак что, еÑли голем может жить за Ñчет другого ÑущеÑтва, вкладывающего Ñвою волю в пуÑтую оболочку, возможно, какое-то другое ÑущеÑтво вкладывает Ñвою волю в тела мертвых, ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð·Ð¾Ð¼Ð±Ð¸ и Ñкелеты. Тут Ñ Ð²Ð·Ð´Ñ€Ð¾Ð³Ð½ÑƒÐ», вÑпомнив, что произошло в моей Ñтарой деревне. Только демон ÑпоÑобен на такую жеÑтокоÑÑ‚ÑŒ. Ðо чтобы проверить Ñту гипотезу, мне нужно было больше доказательÑтв. +guide.bloodmagic.entry.demon.snare.info.2=По указанию мага и ТибериÑ, когда он мог протÑнуть руку помощи, Ñ Ñделал Ñебе рудиментарную ловушку из железа, веревки и куÑка краÑного камнÑ. Тиберий, глубоко изучавший Тавматургию как магию выбора между диÑциплинами, Ñказал, что Ñилок должен быть ÑпоÑобен нарушить волю ÑущеÑтва, управлÑющего одушевленным объектом. -Я возилÑÑ Ñ Ñтим, когда играл Ñ Ð³Ð¾Ð»ÐµÐ¼Ð°Ð¼Ð¸, - Ñказал он Ñ ÑƒÐ»Ñ‹Ð±ÐºÐ¾Ð¹. Мы вÑе знали, как хорошо вÑе обернулоÑÑŒ. - РедÑтоун, казалоÑÑŒ, нарушил ÑвÑзь между моими големами и моей волей к движению. ТеоретичеÑки, еÑли что-то управлÑет зомби или Ñкелетами, вы должны быть в ÑоÑтоÑнии отрезать волю."\n\tОн Ñказал, что вÑе, что мне нужно Ñделать, Ñто броÑить его - еÑли Ñто Ñработает, какаÑ-то Ð±ÐµÐ»Ð°Ñ Ð¿Ñ‹Ð»ÑŒ должна ÑтруитьÑÑ Ð¾Ñ‚ ÑущеÑтва в течение некоторого времени. "ПоÑтому вы должны убить его поÑле того, как Ñто произойдет, чтобы что-то дейÑтвительно произошло. Ðо ловушка может работать только в 25% Ñлучаев, поÑтому будьте немного либеральны Ñ Ð½Ð¸Ð¼Ð¸!"\n\tСотворив шеÑтнадцать из них, Ñ Ð²Ñ‹ÑˆÐµÐ» ночью Ñ Ð¼ÐµÑ‡Ð¾Ð¼. Ðа Ñамом деле Ñто было довольно Ñложно: мне пришлоÑÑŒ выÑледить неÑкольких зомби, нырÑÑ Ð¸ уворачиваÑÑÑŒ от их неуклюжих ударов, броÑÐ°Ñ Ð² них неÑколько Ñилков. Как только белые чаÑтицы отделилиÑÑŒ от них, Ñ Ð±Ñ‹Ñтро убил их и подобрал то, что оÑталоÑÑŒ от их тел. Ðебольшое количеÑтво голубой вÑзкой жидкоÑти, казалоÑÑŒ, лежало в пеÑчаной пыли, ÐœÐ°Ð½Ñ Ð¼ÐµÐ½Ñ. Я поднÑл его, и мне показалоÑÑŒ, что из жидкоÑти иÑходит какое-то потуÑтороннее "приÑутÑтвие". БыÑтро убрав образцы, Ñ Ñ€ÐµÑˆÐ¸Ð» взглÑнуть на них более глубоко, когда вернуÑÑŒ домой. \n\tКазалоÑÑŒ, что размер и форма каждой "демоничеÑкой воли" варьировалиÑÑŒ, как будто качеÑтво воли завиÑело от иÑточника. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñовершенно произвольную единицу измерениÑ, волÑ, которую Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð» от Ñилков, кажетÑÑ, колеблетÑÑ Ð¾Ñ‚ Ð½ÑƒÐ»Ñ Ð´Ð¾ пÑти "волевых качеÑтв". Я не уверен, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ Ñ Ð¼Ð¾Ð³Ñƒ иÑпользовать Ñто вещеÑтво, но тем не менее Ñто очень интригующе. Я не могу Ñказать, отпечаток ли Ñто воли какого-то демона, или проÑто Ñлучайный криÑталл, найденный в их телах. Ðеобходимы дополнительные иÑÑледованиÑ. +guide.bloodmagic.entry.demon.forge.info.1=Я провел неÑколько недель, иÑÑÐ»ÐµÐ´ÑƒÑ Ð¸Ñпользование и ÑвойÑтва демоничеÑкой воли. Ð’ поÑледние неÑколько дней был некоторый уÑпех, однако он был нечаÑтым. Тиберий ÑпроÑил Ð¼ÐµÐ½Ñ Ð½Ð° днÑÑ…, может ли он взÑÑ‚ÑŒ образец демоничеÑкой воли Ð´Ð»Ñ Ð½ÐµÑкольких других Ñвоих ÑкÑпериментов: он упомÑнул, что Ñто может быть то, что ему нужно, чтобы поÑтроить новый кровавый алтарь, чтобы заменить побитый баÑÑейн, который мы иÑпользовали в подвале Мага, так как попытка воÑпроизвеÑти Ñту Ñтарую вещь Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ только камнÑ, казалоÑÑŒ, никогда не Ñоздавала правильную... вмеÑтилище нашей магии крови. Другими Ñловами, он думает, что Ñто может помочь.\n\tОднако Ñто не было полной потерей! Я проÑмотрел неÑколько учебников по алхимии, в которых обÑуждалÑÑ "Ñквивалентный обмен" и множеÑтво различных ÑпоÑобов Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð°Ñ‚ÐµÑ€Ð¸ÐµÐ¹. Я также поговорил Ñ Ð´Ð²ÑƒÐ¼Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸ÐºÐ°Ð¼Ð¸, которые проходили мимо, и они дали мне неÑколько Ñоветов о том, как деконÑтруировать материю и Ñнергию, чтобы изучить ее более внимательно. (КÑтати, Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° Ñказать, что мне нравилаÑÑŒ темно - Ñ„Ð¸Ð¾Ð»ÐµÑ‚Ð¾Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ, которую ноÑил один алхимик-проÑто глÑÐ´Ñ Ð½Ð° нее, Ñ Ñ‡ÑƒÐ²Ñтвовала, что Ð¼ÐµÐ½Ñ Ñ‚Ñнет какой-то плотный предмет. Ðе Ð³Ð¾Ð²Ð¾Ñ€Ñ ÑƒÐ¶Ðµ о Тиберии! ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñти проÑтые маÑÑивы Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¸Ð¼Ð¸ образцами, которые у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¸, Ñ Ñмог увидеть, что еÑÑ‚ÑŒ ÑпоÑобы фактичеÑки подключитьÑÑ Ðº иÑточнику Ñнергии внутри демоничеÑкой воли. Мне проÑто нужна была Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ. +guide.bloodmagic.entry.demon.forge.info.2=Только ÑÐµÐ³Ð¾Ð´Ð½Ñ Ð¼Ð½Ðµ удалоÑÑŒ получить Ñтруктуру, котораÑ, как Ñ Ð¿Ð¾Ð»Ð°Ð³Ð°Ð», объединит Ñлементы, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñту Ñырую волю. ÐÐ°Ð·Ð²Ð°Ð½Ð½Ð°Ñ "кузницей адÑкого огнÑ", Ñтруктура иÑпользует проÑтой маÑÑив алхимии, вырезанный в Ñтекле на его вершине, чтобы Ñплавить до четырех предметов вмеÑте, впрыÑÐºÐ¸Ð²Ð°Ñ ÐµÐ³Ð¾ Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей. ЧаÑÑ‚ÑŒ демоничеÑкой воли помещаетÑÑ Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ Ñтороны, а четыре ингредиента помещаютÑÑ Ð¿Ð¾ кругу. Похоже, что в Ñтой кузнице еÑÑ‚ÑŒ много разных "рецептов", но на них еÑÑ‚ÑŒ некоторые Ñффекты ÑтробированиÑ. \n\tÐ”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°, ÑущеÑтвует минимальное количеÑтво демоничеÑкой воли, которое должно быть в образце, чтобы Ñлементы объединÑлиÑÑŒ - еÑли в Ñтруктуре недоÑтаточно воли, ничего не проиÑходит. Далее, кажетÑÑ, что, Ñ…Ð¾Ñ‚Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ количеÑтво воли, большинÑтво рецептов не иÑтощают веÑÑŒ образец Ñвоей воли. Ðекоторые рецепты требуют огромного количеÑтва демоничеÑкой воли Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы начать процеÑÑ, но только немного иÑпользуетÑÑ Ð² крафте, еÑли таковые вообще еÑÑ‚ÑŒ. Ðекоторые рецепты кажутÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ легкими Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð² больших количеÑтвах, но другие... не Ñтолько. +guide.bloodmagic.entry.demon.petty.info.1=Я отправилÑÑ Ð² одно из Ñвоих ежедневных ночных приключений, чтобы Ñобрать немного демоничеÑкой воли, когда Ñ Ð½Ð°Ñ‡Ð°Ð» оÑознавать одну из главных проблем Ñ Ð¼ÐµÑ‚Ð¾Ð´Ð¾Ð¼ Ñбора: Ð¼Ð¾Ñ Ñумка продолжала наполнÑÑ‚ÑŒÑÑ Ð¾Ñ‚ вÑех образцов! По какой-то причине, возможно, потому, что конечный иÑточник демоничеÑкой воли различен Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ образца, Ð²Ð¾Ð»Ñ Ð½Ðµ будет ÑжиматьÑÑ Ð² более управлÑемую форму. По крайней мере, физичеÑкое проÑвление воли. \n\tТаким образом, Ñ Ð½Ð°Ñ‡Ð°Ð» работать Ñ Ð³Ð¾Ñ€Ð½Ð¾Ð¼ адÑкого огнÑ, который был раÑположен в моем углу дома, Ð¾Ñ‚Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ из наименее неприÑтных ÑкÑпериментов Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ Ñырье Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑобÑтвенного иÑÑледованиÑ. Ðа днÑÑ… Ñ ÑобираюÑÑŒ Ñделать Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ ÐµÐ³Ð¾ ÑобÑтвенной кузницей, так как Ñ ÑƒÑтал пытатьÑÑ Ð¸Ð·Ð±Ð°Ð²Ð¸Ñ‚ÑŒÑÑ Ð¾Ñ‚ вÑей пыли, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾ÐºÑ€Ñ‹Ð²Ð°ÐµÑ‚ мое рабочее меÑто от его "тайных ÑкÑпериментов". Мне вÑе равно, что вы "пытаетеÑÑŒ преодолеть разрыв между Ñфирными нитÑми Ñети души и физичеÑкой конÑтрукцией Ñланцев", уберите Ñвой проклÑтый пепел из моих вещей! +guide.bloodmagic.entry.demon.petty.info.2=Как бы то ни было, потребовалоÑÑŒ времÑ, чтобы найти материалы, которые, Ñкорее вÑего, резонировали бы Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей, чтобы лучше хранить их. ЛÑпиÑ, по-видимому, Ñамый доÑтупный проводник Ñтой Ñнергии, дейÑтвующий как путь Ð´Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð¾Ð»Ð¸. Добавив немного редÑтона в качеÑтве защиты от ÑлектричеÑких полей в воздухе (Ñложение двух Ñнергий вмеÑте, кажетÑÑ, вызывает катаÑтрофичеÑкие поÑледÑтвиÑ, по крайней мере, так Ñказал МагуÑ), золото в качеÑтве демпфирующего агента и Ñтекло в качеÑтве проÑтого корпуÑа, мне удалоÑÑŒ Ñоздать очень проÑтой "винный камень". Это означает " Драгоценный камень из подземного мира, Тартар."\n\tПоÑле дальнейших теÑтов Ñ ÑƒÐ·Ð½Ð°Ð», что Ñтот камень может выдержать качеÑтво воли 64. (Когда Ñ Ð¿Ñ€ÐµÐ´Ñтавил Ñти результаты МагуÑу, он заметил, что Ñто похоже на хорошее круглое чиÑло.) Когда Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ð»ÑÑ Ð²Ð¿Ð¾ÑледÑтвии забрать демоничеÑкую волю, она, казалоÑÑŒ,шла прÑмо в камень, еÑли не была полной - поÑле Ñтого они проÑто казалиÑÑŒ... иÑчезнуть. Удобно Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ рюкзака, но в оÑтальном загадка. Я также узнал, что еÑли Ñ Ð´ÐµÑ€Ð¶Ñƒ камень в руке и фокуÑируюÑÑŒ (щелкнув правой кнопкой мыши), около 10% макÑимальной емкоÑти ÐºÐ°Ð¼Ð½Ñ Ð±ÑƒÐ´ÐµÑ‚ перетекать в другие камни, которые у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¸ на моем лице. Я думаю, что Ñта поÑледнÑÑ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¾Ñ‡ÐµÐ½ÑŒ полезна, оÑобенно еÑли мы найдем другие, более мощные татарÑкие камни. +guide.bloodmagic.entry.demon.sword.info.1=Мои Ñилки Ñнова запуталиÑÑŒ.\n\tКажетÑÑ, не имеет значениÑ, наÑколько Ñ ÑтараюÑÑŒ улучшить их дизайн, Ñ€ÑƒÐ´Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð½Ð°Ñ Ð»Ð¾Ð²ÑƒÑˆÐºÐ° никогда не работает идеально. Он проÑто запутываетÑÑ Ð±Ð¾Ð»ÑŒÑˆÑƒÑŽ чаÑÑ‚ÑŒ времени, и когда мне наконец удаетÑÑ ÑƒÐ´Ð°Ñ€Ð¸Ñ‚ÑŒ им зомби, Ñто Ñкорее не Ñработает, чем Ñработает. Чтобы не рвать на Ñебе волоÑÑ‹, Ñ Ñнова пошел в кузницу и Ñразу принÑлÑÑ Ð·Ð° работу.\n\tÐу, не Ñразу, так как Ñначала Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ был Ñнова очиÑтить пепел Ñверху. +guide.bloodmagic.entry.demon.sword.info.2=Я вливал железный меч в демоничеÑкие Ñилы воли мелкого татарÑкого Ñамоцвета,и мне удалоÑÑŒ Ñоздать клинок... был очень тупым и едва ли причинил больше вреда, чем мой кулак. Ðа Ñамом деле Ñ Ð±Ñ‹Ð» очень разочарован результатом, потому что потребовалоÑÑŒ много времени, чтобы возитьÑÑ Ñ Ð³Ð¾Ñ€Ð½Ð¾Ð¼, чтобы оно не перегрелоÑÑŒ от напрÑÐ¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ иÑпользовании мелкого татарÑкого ÐºÐ°Ð¼Ð½Ñ Ð² качеÑтве иÑточника Ñнергии.\n\tОднако, как только Ñ Ð¿Ð¾Ð´Ð½Ñл Ñвой татарÑкий камень, меч начал ÑветитьÑÑ Ð½Ð¾Ð²Ð¾Ð¹ Ñнергией. КажетÑÑ, чем больше демоничеÑкой воли у Ð¼ÐµÐ½Ñ Ð½Ð° душе, тем больше вреда Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½ÑÑŽ мечом, а также тем больше демоничеÑкой воли падает. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ камнÑ, то будет очень... мизерный.поÑле небольшого иÑÐ¿Ñ‹Ñ‚Ð°Ð½Ð¸Ñ Ñ Ð¿Ñ€Ð¸ÑˆÐµÐ» к другому пониманию: в завиÑимоÑти от того, кого Ñ ÑƒÐ±Ð¸Ð²Ð°ÑŽ, Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°ÑŽ разное количеÑтво воли. КажетÑÑ, пропорционально количеÑтву макÑимального здоровьÑ, которое имеет монÑÑ‚Ñ€-паук, так как у него макÑимальное здоровье 8 Ñердец дает 80% воли зомби, у которого 10 Ñердец. Это, вероÑтно, потому, что Ñти монÑтры требуют больше воли, чтобы оживить. Я должен иметь Ñто в виду на потом. +guide.bloodmagic.entry.demon.lesser.info.1=Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ Ñ Ð±ÐµÑедовал Ñ Ð¢Ð¸Ð±ÐµÑ€Ð¸ÐµÐ¼, обÑуждал некоторые проекты, над которыми он работает. Должен Ñказать, когда мы начинаем говорить о его иÑÑледованиÑÑ…, кажетÑÑ, что он вÑе продолжает и продолжает! Как бы то ни было, одним из недавних изобретений, о которых он хотел поговорить, были его Ñигилы: до Ñих пор ему удавалоÑÑŒ Ñоздавать водный и лавовый Ñигилы, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ð´Ñкую кузницу, которую Ñ, наконец, поÑтроил Ð´Ð»Ñ Ð½ÐµÐ³Ð¾, как ÑредÑтво Ð´Ð»Ñ Ð¸Ñ… ÑозданиÑ. Я не был до конца уверен, как он их делал - Ñ Ð·Ð½Ð°Ð», что он ÑкÑпериментировал, ÑÐ¾Ð±Ð¸Ñ€Ð°Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ингредиенты и ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ€ÑƒÑ Ð¸Ñ… внутри кузницы, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‚Ð°Ñ‚Ð°Ñ€Ñкий камень в качеÑтве катализатора, но Ñ ÐµÑ‰Ðµ не видел, чтобы он активно ÑкÑпериментировал. Ðу, Ñ Ð½Ð°ÐºÐ¾Ð½ÐµÑ†-то понÑл, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ он иÑпользует Ñтот чертов пепел.\n\tПоÑмотрим, Ñмогу ли Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ то, что он Ñказал. Гм. - ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð²Ð¾Ð»ÑŽ демона, заключенную в Ñтих камнÑÑ…, чтобы преобразовать ингредиенты, проиÑходит Ñ€ÐµÐ°ÐºÑ†Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ вещами, которые обычно ничего не делают, когда объединÑÑŽÑ‚ÑÑ. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñту вынужденную Ñинергию, Ñ Ð¼Ð¾Ð³Ñƒ впиÑать неÑколько тайных Ñимволов в узоры, которые направÑÑ‚ Ñнергию, которую Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑŽ Ñебе Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ð¹ задачи."Ð¥Ð¾Ñ‚Ñ Ñто не очень хорошо видно в пиÑьменной форме, предÑтавьте, что Ñ Ð³Ð¾Ð²Ð¾Ñ€ÑŽ Ñто, Ñдвинув очки на переноÑицу. Я не уверен, что он обычно такой, но Ñ ÐºÐ»ÑнуÑÑŒ, он получает вÑе... наукой, когда он мне вÑе объÑÑнÑет.\n\tВо вÑÑком Ñлучае, он показал мне, как он Ñоздал водный знак, продемонÑтрировав его мне. ПоÑле, по общему признанию, Ñркой демонÑтрации, он перешел к Ñути диÑкуÑÑии. "Когда Ñ Ð¿Ñ‹Ñ‚Ð°ÑŽÑÑŒ воÑпроизвеÑти Ñтот процеÑÑ Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ более продвинутыми материалами, кажетÑÑ, что реагенты имеют тенденцию... взрываетÑÑ Ð¿Ñ€Ð¸ добавлении в маÑÑив алхимии. Они кажутÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ неÑтабильными. Я думаю, что ингредиенты не ÑплавлÑÑŽÑ‚ÑÑ Ð´Ð¾Ð»Ð¶Ð½Ñ‹Ð¼ образом - возможно, в кузнице недоÑтаточно Ñнергии, чтобы Ñплавить их должным образом."\n\tПодумав об Ñтом неÑколько минут, Ñ Ð¿Ñ€Ð¸Ñтупил к работе - как Ñ ÑƒÐ¶Ðµ упоминал в предыдущей запиÑи, Ñ Ñ€ÐµÑˆÐ¸Ð», что потребуетÑÑ Ð±Ð¾Ð»ÐµÐµ мощный татарÑкий камень, но Ñ Ð²Ñе еще не понÑл, как Ñ Ð¼Ð¾Ð³Ñƒ Ñделать Ñто Ñлегантным ÑпоÑобом. Итак, Ñ Ñ€ÐµÑˆÐ¸Ð», что Ð´Ð»Ñ Ñтого будет доÑтаточно подхода грубой Ñилы! +guide.bloodmagic.entry.demon.lesser.info.2=Я взÑл блок ЛÑпиÑа, блок краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ бриллиант, а также пуÑтой мелкий татарÑкий камень, который лежал вокруг - чаÑÑ‚ÑŒ прошлого ÑкÑперимента... вÑе прошло не очень хорошо. Ð’Ñе, что Ñ Ð¼Ð¾Ð³Ñƒ Ñказать об Ñтом, Ñто то, что Ñ ÑƒÐ´Ð¸Ð²Ð»ÐµÐ½, что маг может Ñделать отверÑÑ‚Ð¸Ñ Ð² твердой бетонной Ñтене проÑто иÑчезнуть. Затем Ñ Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½Ð¸Ð» Ñти четыре предмета в кузнице адÑкого Ð¾Ð³Ð½Ñ Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ñ‹Ð¼ мелким татарÑким камнем, чтобы дейÑтвовать как иÑточник Ñнергии-кажетÑÑ, требуетÑÑ Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼ 60 воли. ПоÑле некоторого уÑилиÑ, пытаÑÑÑŒ найти оптимальное раÑположение, Ñ Ñобрал их вмеÑте и наблюдал, как пуÑтой камень начал раÑти внутри кузницы.\n\tПроÑто в качеÑтве примечаниÑ, Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ð»ÑÑ Ð¸Ñпользовать блок золота вмеÑто алмаза, чтобы выраÑтить драгоценный камень, но, похоже, что наличие другой криÑталличеÑкой Ñтруктуры было более полезным.\n\tЭтот новый, "меньший татарÑкий камень", похоже, имеет гораздо большую емкоÑÑ‚ÑŒ, ÑпоÑобную вмеÑтить в общей ÑложноÑти 256 Ñырых Воль. ÐадеюÑÑŒ, Ñтого доÑтаточно, чтобы удовлетворить потребноÑÑ‚ÑŒ Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ Ð² большом количеÑтве воли на некоторое времÑ. Ðо, увы, похоже, мне придетÑÑ Ð¿Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ñтот драгоценный камень. Еще одна Ð´Ð¾Ð»Ð³Ð°Ñ Ð½Ð¾Ñ‡ÑŒ впереди! +guide.bloodmagic.entry.demon.reactions.info=Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ Ñ Ð¿Ñ€Ð¾ÑнулаÑÑŒ на больничной койке, иÑÐ¿Ñ‹Ñ‚Ñ‹Ð²Ð°Ñ Ñильную боль. Я открыл глаза и увидел туÑкло-пурпурный потолок крыла больницы "интенÑивное проклÑтие" в ВетереÑе, ближайшем к нашей деревне крупном городе. ÐœÐµÐ½Ñ Ñта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ðµ оÑобенно беÑпокоила: она наÑтолько озадачила менÑ, что Ñ ÐºÐ°ÐºÐ¸Ð¼-то образом оказалÑÑ Ð·Ð´ÐµÑÑŒ, покрытый только царапинами и ÑинÑками, Ð¿Ð»ÑŽÑ Ð¿Ñ€Ð¾Ñтой Ð³Ð¸Ð¿Ñ Ð½Ð° левой ноге. Кто-то, должно быть, наложил на Ð¼ÐµÐ½Ñ Ð¿Ñ€Ð¾ÐºÐ»Ñтие "Ossa Fracta" или что-то в Ñтом роде, так как Ñто могла быть проÑто ÑÐ»Ð¾Ð¼Ð°Ð½Ð½Ð°Ñ ÐºÐ¾ÑÑ‚ÑŒ! \n\tКогда ÐœÐ°Ð³ÑƒÑ Ð²Ð¾ÑˆÐµÐ» Ñ Ð¾Ð´Ð½Ð¾Ð¹ из медÑеÑтер Ñ Ñерьезным лицом, Ñ Ð·Ð½Ð°Ð», что Ñто было что-то более радикальное. Очевидно, один из моих ÑкÑпериментов Ñ Ð½Ð¾Ð²Ñ‹Ð¼ камнем малого ÐºÐ°Ð¼Ð½Ñ Ð¾Ñ‚Ñкочил и вызвал небольшой, но мощный взрыв. Это Ñ Ð¼Ð¾Ð³ понÑÑ‚ÑŒ доÑтаточно легко, но Ñто было не так: ÑмеÑÑŒ обÑидиана, железа и Ðлмаза, которую Ñ Ð¸Ñпользовал, покрывала мою нижнюю левую ногу, Ð¾Ð±Ñ€Ð°Ð·ÑƒÑ Ð¶ÐµÑткую оболочку, которую Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ‹Ð»Ð¾ удалить. ГипÑ, который был у Ð¼ÐµÐ½Ñ Ð½Ð° ноге, на Ñамом деле не был гипÑом, а какой-то формой руничеÑкой матрицы, покрывающей Ñветло-голубую оболочку. \n\tЯ Ñпокойно ÑпроÑил, что думает МагуÑ, Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹Ð» Ñовершенно уверен в том, что произошло. -Я думаю,-Ñказал он, иÑкоÑа взглÑнув на медÑеÑтру, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð²Ð½Ð¸Ð¼Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñлушала, прежде чем Ñнова поÑмотреть на менÑ,-что Ñто проÑто какой-то оÑадок на оÑнове алмазов, и Ñто Ð³Ð»Ð°Ð²Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°, по которой мы не можем его удалить. Он также пронизан немного... потуÑтороннÑÑ ÑнергиÑ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ð¾Ñновной причиной того, что вы здеÑÑŒ вмеÑто кровати в меÑтной клинике - конгломерат довольно Ñтрог в отношении неизвеÑтной Ñнергии, непоÑредÑтвенно контактирующей Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð¸Ð½Ñ†Ð¸Ð´ÐµÐ½Ñ‚Ð° Eldritch, поÑтому мы должны были убедитьÑÑ, что не было никаких проблем."\n\t- Понимаю...- Обычно маг не утруждает ÑÐµÐ±Ñ Ñ‚Ð°ÐºÐ¸Ð¼Ð¸ формальноÑÑ‚Ñми, как получение информации от конгломерата о неизвеÑтных ÑнергиÑÑ… - Ñ Ð´Ð¾Ð²Ð¾Ð»ÑŒÐ½Ð¾ долго ÑкÑпериментировал Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей, и Ñто не похоже на то, что конгломерат поÑтучал в нашу дверь, чтобы зарегиÑтрировать Ñту магию. Я не буду вдаватьÑÑ Ð² подробноÑти, так как Ñ Ð½Ðµ очень хорошо разбираюÑÑŒ в политике, но Ñ Ð·Ð½Ð°ÑŽ, что маг учаÑтвует в ней очень редко. Это означало, что Ñила Ñтой воли Ñильно беÑпокоила МагуÑа, возможно, из-за некоторых его прошлых Ñделок...?\n\t- Ðу ладно, пока хватит об Ñтом, - Ñказал маг, Ð·Ð°ÐºÐ°Ñ‚Ñ‹Ð²Ð°Ñ Ñ€ÑƒÐºÐ°Ð²Ð° мантии. -Я пыталÑÑ Ñ€Ð°Ð·Ð±Ð¸Ñ‚ÑŒ Ñкорлупу, когда впервые увидел ее, очевидно, проверив, что Ñто такое. Ð’ прошлый раз Ñто не подейÑтвовало, но теперь подейÑтвовало..."\n\tÐа моей левой ноге был обжигающий жар, Ñопровождаемый оÑлепительным краÑным Ñветом, когда ÐœÐ°Ð³Ð½ÑƒÑ Ñложил ладони на голубой раковине. КазалоÑÑŒ, прошла Ñ†ÐµÐ»Ð°Ñ Ð²ÐµÑ‡Ð½Ð¾ÑÑ‚ÑŒ, но, должно быть, прошло вÑего неÑколько Ñекунд, прежде чем оболочка начала треÑкатьÑÑ Ð¸ раÑÑыпатьÑÑ Ð½Ð° чаÑти. ЧеÑтно говорÑ, Ñто было немного разочаровывающе. \n\tЯ попыталÑÑ Ð²Ñтать, но Халдей толкнул Ð¼ÐµÐ½Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ в кровать. - Белла, тебе нужно оÑтатьÑÑ Ð¸ отдохнуть. Ð’Ñ‹ можете поработать Ñ Ð²Ð°ÑˆÐ¸Ð¼Ð¸ иÑÑледованиÑми о драгоценных камнÑÑ… позже."Сначала Ñ Ð±Ñ‹Ð» раздражен, но вÑкоре Ñто прошло, так как у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¾ много времени, чтобы подумать. ЕдинÑÑ‚Ð²ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°, по которой ÐœÐ°Ð³ÑƒÑ Ð½Ðµ Ñмог Ñделать то же Ñамое раньше, вероÑтно, потому, что у Ð¼ÐµÐ½Ñ Ð²Ñе еще был мой татарÑкий камень поÑле взрыва. ПоÑтому, что бы ни ÑлучилоÑÑŒ Ñ Ð¼Ð¾ÐµÐ¹ ногой, Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° была быть напрÑмую ÑвÑзана Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð¼ Уиллом, и как только мой камень был взÑÑ‚, раковину можно было ÑнÑÑ‚ÑŒ. Это заÑтавило Ð¼ÐµÐ½Ñ Ð·Ð°Ð´ÑƒÐ¼Ð°Ñ‚ÑŒÑÑ... +guide.bloodmagic.entry.demon.sentientGem.info.1=ПоÑле неÑкольких дней "хорошо необходимого поÑтельного режима", предпиÑанного и навÑзанного магом, Ñ Ñ€ÐµÑˆÐ¸Ð» провеÑти небольшое иÑÑледование в первую очередь на разумном оборудовании, которое Ñ Ñделал до Ñих пор. ЕÑÑ‚ÑŒ только так много, что Ñ Ð½Ðµ знаю о разумном мече, а также демон будет в целом. Конечно, мы знаем кое-что из теории, но, учитываÑ, что маг и Ñ Ð±Ñ‹Ð»Ð¸ теми, кто разработал теорию в первую очередь, трудно Ñказать, наÑколько она точна.\n\tÐ”Ð»Ñ Ñтого мне нужно было проÑвить творчеÑкий подход. Маг Ñказал мне, что вÑÑкий раз, когда он берет ученика, он наÑтаивает, что они должны изучать другую форму магии нарÑду Ñ Ð¸ÑÑледованиÑми, которые он проводит. Тиберий предложил мне изучать ботанику, но Ñ Ð¿Ð¾ÑмеÑлаÑÑŒ над Ñтой идеей - букет цветов не очень-то поможет мне в борьбе Ñ Ð´ÐµÐ¼Ð¾Ð½Ð°Ð¼Ð¸! +guide.bloodmagic.entry.demon.sentientGem.info.2=Sentient Armour Gem-Ñто переключаемый предмет, который иÑпользуетÑÑ Ð´Ð»Ñ Ð¾ÑÐ½Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸ оÑÐ½Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ чувÑтвительной брони. Когда вы щелкнете Правой Кнопкой Мыши Ñ Ð´Ñ€Ð°Ð³Ð¾Ñ†ÐµÐ½Ð½Ñ‹Ð¼ камнем, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ минимум 16 демонов в инвентаре, ваша Ð±Ñ€Ð¾Ð½Ñ Ð±ÑƒÐ´ÐµÑ‚ заменена набором разумных доÑпехов, который копирует вÑе Ð·Ð°ÐºÐ»Ð¸Ð½Ð°Ð½Ð¸Ñ Ð¸Ð· брони, которую вы заменили - когда вы активируете драгоценный камень Ñнова, ваша Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚ÑÑ Ðº вам. Это также работает, когда у Ð²Ð°Ñ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ нет брони.\n\tÐ Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ Ð¿ÐµÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾ дейÑтвует как проÑтой набор железных доÑпехов, не Ð´Ð°Ð²Ð°Ñ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ… дополнительных ÑпоÑобноÑтей, кроме защиты. Однако, как и другие разумные инÑтрументы, Ð±Ñ€Ð¾Ð½Ñ Ð¾Ð±ÐµÑпечивает большую защиту, когда у Ð²Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ демоничеÑкой воли. Это делает защиту, предоÑтавлÑемую дейÑтвительно мощным, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ большое количеÑтво демона будет накоплено. ÐедоÑтатком Ñтого ÑвлÑетÑÑ Ñ‚Ð¾, что каждый удар будут Ñифон маленький куÑочек демон из винной камней, и еÑли вы получаете Ñлишком низок броню вернетÑÑ Ðº Ñвоей первоначальной форме. Может быть плохо! +guide.bloodmagic.entry.demon.routing.info=ТранÑпортировка предметов в магии крови проиÑходит от ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð¸Ñ‚ÐµÐ¹ демоничеÑкой воли между узлами маршрутизации, которые дейÑтвуют как каналы Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ предметов из одного Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ð² другой. Ð”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° давайте объÑÑним, как работает каждый отдельный Ñлемент.\n\tÐšÐ°Ð¶Ð´Ð°Ñ ÑиÑтема маршрутизации нуждаетÑÑ Ð² Главном узле маршрутизации, который дейÑтвует как мозг ÑиÑтемы. Входной узел маршрутизации вводит Ñлементы в ÑиÑтему, а выходной узел маршрутизации выводит Ñлементы из ÑиÑтемы, а обычный узел маршрутизации не имеет Ñпециальной функции.\n\tЧтобы Ñформировать Ñеть, необходимо щелкнуть узел Ñ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ узла, а затем щелкнуть другой узел, который требуетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ. Это ÑвÑзывает два узла вмеÑте. Пока узел может отÑлеживать некоторую форму маршрута к другому узлу (и еÑли он подключен к главному узлу маршрутизации), они могут "разговаривать" друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼.\n\tКак правило, Ñлементы извлекаютÑÑ Ð¸Ð· Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ñ€Ñдом Ñ Ð²Ñ…Ð¾Ð´Ð½Ñ‹Ð¼ узлом и помещаютÑÑ Ð² инвентарь Ñ€Ñдом Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ð¼ узлом. Чтобы уÑтановить, что куда идет, Ñледует иÑпользовать фильтр. Ðажав на одну из кнопок в интерфейÑе узла, вы можете выбрать, что входит в инвентарь в заданном направлении (N указывает на Ñевер и Ñ‚. д.). ЕÑли помеÑтить фильтр Ñлементов в Ñамый левый Ñлот узла, можно указать количеÑтва и типы Ñлементов, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ узел может взаимодейÑтвовать на оÑнове фильтра. При уÑтановке фильтра на входном фильтре можно извлекать только Ñти типы номенклатур из запаÑов (ÑохранÑÑ, по крайней мере, заданную Ñумму, еÑли указано количеÑтво). ЕÑли фильтр уÑтановлен на фильтре вывода, можно только перемеÑтить Ñти типы номенклатур в запаÑ, не более указанного количеÑтва.\n\tСущеÑтвует четыре типа фильтров: \n\tТочный-Ñлемент должен быть точно ÑопоÑтавлен, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ NBT и метаданные\n\tMod Item-предмет ÑоответÑтвует, еÑли он из одного из отфильтрованных модов.\n\tИгнорировать NBT - фильтр Ñлементов не учитывает NBT\n\tРудный Ñловарь - допуÑкаетÑÑ Ð»ÑŽÐ±Ð¾Ð¹ Ñлемент, ÑоответÑтвующий одной из ÑÑылок Рудного ÑÐ»Ð¾Ð²Ð°Ñ€Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð².\n\tЕÑÑ‚ÑŒ два чиÑла, которые вы Ñможете увидеть при вÑтавке фильтра в узел маршрутизации: количеÑтво и приоритет. При нажатии на один из Ñлементов в фильтре поÑвитÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ выбранного Ñлемента, а прÑмо под ним-количеÑтво Ñлементов. УÑтановив Ñтот номер, вы можете указать фильтру, Ñколько из Ñтого типа номенклатуры он будет хранить на Ñкладе в подключенном инвентаре (либо заполнÑÑ Ñту Ñумму, еÑли Ñто выходной узел, либо убедившиÑÑŒ, что он ÑохранÑет Ñту Ñумму, оÑтавленную в инвентаре, еÑли Ñто входной узел). ЕÑли вы уменьшите количеÑтво фильтра до 0, вы можете уÑтановить так, чтобы фильтр разрешал "вÑе", как в любом количеÑтве, Ð´Ð»Ñ Ñтого конкретного фильтра. Входные узлы будут вытÑгивать как можно больше из инвентарÑ, а выходные узлы будут толкать как можно больше.\n\tВторое чиÑло-Ñто приоритет узла, изменÑемый кнопками Ñо Ñтрелками Ñ€Ñдом Ñ Ð½Ð¸Ð¼. Это чиÑло отличаетÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ñтороны узла. Сначала будет иÑпользоватьÑÑ ÑƒÐ·ÐµÐ» Ñ Ð¼ÐµÐ½ÑŒÑˆÐ¸Ð¼ номером в Ñети. +guide.bloodmagic.entry.demon.aura.info=Когда ÑущноÑÑ‚ÑŒ убита нормально, она Ñо временем иÑпарÑетÑÑ Ð¸ возвращаетÑÑ Ðº Творцу. Когда он попадает в ловушку, он втÑгиваетÑÑ Ð² Ñтот план из Ñфирного и как бы заÑтревает. У Ð½Ð°Ñ ÐµÑÑ‚ÑŒ, Ð´Ð»Ñ Ð²Ñех намерений и целей, нарушена его программированиÑ, и он заморозил вÑе дейÑтвиÑ. Когда мы Ñжигаем его, он возвращаетÑÑ Ð² Ñфирное ÑоÑтоÑние и может возобновить нормальные операции. ЕÑли Ñто впрыÑкиваетÑÑ Ð² воздух, то мы можем иÑпользовать его в различных направлениÑÑ…. Ðекоторые из них мирÑкие по Ñвоей природе, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº другие довольно могущеÑтвенны.\n\tДемон будет при инъекции в воздух оÑтаетÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ куÑка, который он был введен без миграции. Каждый куÑок имеет Ñвою ÑобÑтвенную Ñохраненную волю, причем каждый тип воли хранитÑÑ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ð¾ (подробнее об Ñтом в другом разделе). Это будет доÑтупно и управлÑÑ‚ÑŒÑÑ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ блоками и Ñлементами. +guide.bloodmagic.entry.demon.types.info=До Ñих пор единÑтвенный тип демоничеÑкой Воли, который мы обÑуждали, - Ñто Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð°Ñ Ð²Ð¾Ð»Ñ. Как Ñледует из названиÑ, Ñто ÑÐ°Ð¼Ð°Ñ Ð³Ñ€ÑƒÐ±Ð°Ñ Ð¸ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÐ»ÑŒÐ½Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð° воли, но Ñто не значит, что она чиÑта. Ðа Ñамом деле, Ð²Ð¾Ð»Ñ Ð´ÐµÐ¼Ð¾Ð½Ð° принимает много различных форм: Ñырой-Ñто тип, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ мы имеем дело обычно, но еÑÑ‚ÑŒ также разъедающий, разрушительный, мÑтительный и Ñтойкий. ÐÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð°Ñ Ð²Ð¾Ð»Ñ ÑоÑтоит из ÑмеÑи вÑех четырех Ñтих типов и, возможно, Ñмешана Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸, еще не открытыми типами, но поÑле Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð½Ð° Ñти различные типы воли кажетÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼ их рекомбинировать.\n\tПока неÑÑно, проиÑходÑÑ‚ ли Ñти разные типы воли из разных иÑточников, однако мы знаем процеÑÑ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ñтих разных типов воли. Ритуальный " Ñ€ÐµÐ·Ð¾Ð½Ð°Ð½Ñ Ð³Ñ€Ð°Ð½ÐµÐ½Ð¾Ð³Ð¾ криÑталла "может раÑколоть необработанный КриÑталл воли на его чиÑтые чаÑти, подробнее об Ñтом в ÑоответÑтвующей запиÑи в"ритуальном МаÑтере". УÑтройÑтво, ÑпоÑобное получать необработанные криÑталлы воли, - Ñто криÑталлизатор демона, вход в который находитÑÑ Ð½Ð¸Ð¶Ðµ.\n\tКаждый из Ñтих четырех типов воли предÑтавлÑет различные аÑпекты желаниÑ. Могут быть и другие типы воли, однако они либо недоÑтаточно чиÑÑ‚Ñ‹, либо проÑто не могут быть Ñозданы в Ñтой форме.\n\tÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ñ Ð¿Ñ€ÐµÐ´ÑтавлÑет Ñобой желание разрушить вÑе вокруг ÑебÑ, либо киÑлотой, либо Ñокрушительной Ñилой. Тот, кто может овладеть Ñтой волей, может обладать оÑлаблÑющими ÑтатуÑными Ñффектами и невоÑприимчив к ужаÑным Ñдам.мÑтительноÑÑ‚ÑŒ можно раÑÑматривать как желание без уÑтали иÑкать цель. Обычно Ñто можно раÑÑматривать либо как увеличение ÑкороÑти тела, чтобы иÑкать Ñвою добычу, либо чтобы убедитьÑÑ, что цель не в ÑоÑтоÑнии уйти, как вы поÑтоÑнно атакуете их.\n\tРазрушение, как вы, вероÑтно, можете Ñказать, Ñто чиÑÑ‚Ð°Ñ Ñила. Сила атаки и Ð¾Ð±Ñ‰Ð°Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð´Ð¾Ð±Ð»ÐµÑÑ‚ÑŒ могут быть получены, еÑли Ñта Ð²Ð¾Ð»Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹Ð¼ образом обуздана. Его можно также иÑпользовать Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы задавить и поломать вещи при иÑпользовании в других применениÑÑ….\n\tСтойкоÑÑ‚ÑŒ раÑÑматриваетÑÑ ÐºÐ°Ðº желание предотвратить вред Ñебе. Ð’ большинÑтве Ñлучаев хозÑева Ñтой воли ÑвлÑÑŽÑ‚ÑÑ Ð¾Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ оплотом партии, ÑпоÑобным противоÑтоÑÑ‚ÑŒ мощным атакам и даже не чувÑтвовать их. ЕÑли вам нужно оÑтатьÑÑ Ð² живых, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ доÑпехов или ритуалов, Ñто один из вариантов, который Ñледует раÑÑмотреть. +guide.bloodmagic.entry.demon.crucible.info=Тигель демона-Ñто уÑтройÑтво, которое ÑпоÑобно Ñжечь волю демона внутри ÐºÐ°Ð¼Ð½Ñ Ð¸ других предметов, чтобы ввеÑти его в ауру куÑка, в котором он находитÑÑ. ЕÑÑ‚ÑŒ неÑколько различных ÑпоÑобов иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚Ð¸Ð³Ð»Ñ: один из Ñамых проÑÑ‚Ñ‹Ñ… ÑпоÑобов-помеÑтить камень внутри тиглÑ, щелкнув по нему правой кнопкой мыши Ñ ÐºÐ°Ð¼Ð½ÐµÐ¼ в руке. Ð’ Ñтом Ñлучае тигель будет Ñливать волю из драгоценного ÐºÐ°Ð¼Ð½Ñ Ð´Ð¾ тех пор, пока аура не будет наÑыщена Ñтим типом воли (макÑимум 100 по умолчанию) или пока драгоценный камень не опуÑтеет.\n\tДругой ÑпоÑоб - иÑпользовать ÑодержащийÑÑ Ð² камне винный камень, чтобы Ñлить волю из ауры-Ñто делаетÑÑ Ð¿ÑƒÑ‚ÐµÐ¼ подачи Ñильного Ñигнала краÑного ÐºÐ°Ð¼Ð½Ñ Ð² тигель, а затем ÑодержащийÑÑ ÐºÐ°Ð¼ÐµÐ½ÑŒ попытаетÑÑ Ñлить как можно больше воли.\n\tÐаконец, отдельный куÑочек воли может быть Ñожжен в тигле, еÑли в ауре такого типа доÑтаточно меÑта. Одним из примеров Ñтого ÑвлÑетÑÑ ÐšÑ€Ð¸Ñталл воли демона, который имеет значение 50. +guide.bloodmagic.entry.demon.crystallizer.info=Как уже говорилоÑÑŒ ранее, аура демона-Ñто Ñфирное проÑвление воли демона, а вещеÑтво, получаемое при убийÑтве толпы, - ее физичеÑкое проÑвление. КриÑталлизатор демона дейÑтвует как Ð¯ÐºÐ¾Ñ€Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° Ð´Ð»Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой воли в ауре, чтобы зацепитьÑÑ, ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·ÑƒÑ Ñфирную волю обратно в физичеÑкую форму Ñнова в форме криÑталла.\n\tВам может быть интереÑно, почему вы проÑто не берете волю из татарÑкого ÐºÐ°Ð¼Ð½Ñ Ð½Ð°Ð¿Ñ€Ñмую и не формируете из нее КриÑталл. Это проиÑходит потому, что, транÑÑ„Ð¾Ñ€Ð¼Ð¸Ñ€ÑƒÑ Ð²Ð¾Ð»ÑŽ в ее Ñфирную форму, мы очищаем ее и позволÑем воле попытатьÑÑ Ð²Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñвои обычные дейÑÑ‚Ð²Ð¸Ñ - имейте в виду, что когда мы убиваем монÑтра Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей, прикрепленной к ним, мы замораживаем Программирование воли, чтобы она не могла делать то, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ она была поÑлана. ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·ÑƒÑ ÐµÐ³Ð¾ в Ñфирную форму в ауре, Ð²Ð¾Ð»Ñ ÑтановитÑÑ Ð±Ð¾Ð»ÐµÐµ активной, и Ñто та волÑ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñхвачена криÑталлизатором. Только не Ñмотри на Ñто Ñмешно.\n\tÐ”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы криÑталлизатор демона работал, он должен быть в куÑке Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ количеÑтвом демоничеÑкой воли (80) определенного типа, и через определенное количеÑтво времени он будет потреблÑÑ‚ÑŒ волю из ауры, чтобы Ñоздать клаÑтер криÑталлов демона Ñ Ð¾Ð´Ð½Ð¸Ð¼ шпилем. ЕÑÑ‚ÑŒ два ÑпоÑоба работы криÑталлизатора: он может Ñформировать КриÑталл из определенного типа воли (агреÑÑивной, разрушительной, мÑтительной и Ñтойкой), еÑли будет доÑтаточно воли Ñтого конкретного типа, или он возьмет Ñырую волю из ауры, чтобы Ñоздать КриÑталл. \n\tÐ’ предыдущих воплощениÑÑ… уÑтройÑтва было возможно транÑформировать Ñырую волю из ауры в криÑталлы Ñ Ñ€Ð°Ð·Ð½Ñ‹Ð¼Ð¸ направлениÑми. Однако Ñто уже не так: вы вÑе еще можете Ñоздавать новые шпили определенной уÑтремленной воли, еÑли ее доÑтаточно в ауре, однако вам нужно будет иÑкать другие ÑредÑтва, чтобы отделить многие аÑпекты от Ñырой воли. Более подробно Ñмотрите запиÑÑŒ "Ñ€ÐµÐ·Ð¾Ð½Ð°Ð½Ñ Ð³Ñ€Ð°Ð½ÐµÐ½Ð¾Ð³Ð¾ КриÑталла" в ритуальном МаÑтере. +guide.bloodmagic.entry.demon.cluster.info=КлаÑтер криÑталлов демона может быть Ñоздан либо КриÑталлизатором демона, либо путем ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐµÐ³Ð¾ в кузнице адÑкого Ð¾Ð³Ð½Ñ Ñ ÐºÑ€Ð¸Ñталлами демона воли. Обработанные клаÑтеры могут быть размещены на любой твердой поверхноÑти, такой как пол, Ñтены и потолки. Ðа криÑталле еÑÑ‚ÑŒ макÑимум Ñемь шпилей, когда он полноÑтью выроÑ, и когда он Ñломан киркой, он уронит шпили, как демон криÑталлы. Однако, еÑли вы щелкните правой кнопкой мыши клаÑтер, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Виннокаменный камень Ñ Ð±Ð¾Ð»ÐµÐµ чем 1024 необработанной волей внутри него, вы можете Ñломать один шпиль из клаÑтера, не Ð½Ð°Ñ€ÑƒÑˆÐ°Ñ Ñам клаÑтер; Ñто никогда не Ñломает главный шпиль клаÑтера.\n\tПредоÑтавленный Ñамому Ñебе, клаÑтер будет Ñифонировать некую волю того же типа из ауры, чтобы раÑти медленно. Этот процеÑÑ Ð½ÐµÐ¼Ð½Ð¾Ð³Ð¾ медленный, но еÑÑ‚ÑŒ небольшой чиÑтый выигрыш.\n\tЕÑÑ‚ÑŒ два ритуала, которые иÑпользуютÑÑ Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ñ‰Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¸ Ñбора Ñтих криÑталлов:" Ñбор покинутых душ "и"трещина разбитого КриÑталла". Чтобы узнать, как их иÑпользовать, обратитеÑÑŒ к маÑтеру ритуала. +guide.bloodmagic.entry.demon.pylon.info=Как вы, возможно, знаете, аура демона оÑтаетÑÑ Ð² Ñвоем ÑобÑтвенном куÑке, еÑли нет никаких внешних влиÑний. Ðу, Ñто одно из таких влиÑний. Пилон демона дейÑтвует как маÑк Ð´Ð»Ñ Ð’Ð¾Ð»Ð¸ в ауре, вытÑÐ³Ð¸Ð²Ð°Ñ Ð²Ð¾Ð»ÑŽ из ÑоÑедних куÑков (тех куÑков, которые находÑÑ‚ÑÑ Ð½ÐµÐ¿Ð¾ÑредÑтвенно Ñ€Ñдом Ñ Ð½Ð¸Ð¼ в четырех кардинальных направлениÑÑ…, а не по диагонали) в Ñвой куÑок. Пилон попытаетÑÑ ÑƒÑ€Ð°Ð²Ð½ÑÑ‚ÑŒ волю в Ñвоем куÑке Ñо Ñвоим ÑоÑедом так, чтобы у куÑка пилона было Ñтолько же воли, Ñколько у его выÑшего ÑоÑеда Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ типа. Однако Ñтот процеÑÑ Ð¿Ñ€Ð¾Ð¸Ñходит только в одном направлении: еÑли в ÑоÑеднем куÑке меньше воли, чем в куÑке пилона, Ð’Ð¾Ð»Ñ Ð½Ðµ будет передавать другое направление. +guide.bloodmagic.entry.demon.gauge.info=Чтобы Ñказать, Ñколько у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ в данном куÑке, вам нужно, чтобы демон измерил. Когда в вашем инвентаре, датчик будет отображать волю в куÑке, который у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ в пÑти барах в левом верхнем углу Ñкрана. Ð’Ñ‹ можете Ñказать, Ñколько точно, Ñдвинув; чиÑла поÑвÑÑ‚ÑÑ Ñправа от баров, чтобы дать Ñумму, округленную до ближайшего целого чиÑла. + + + +# Alchemy Entries +guide.bloodmagic.entry.alchemy.intro=Ð’Ñтупление +guide.bloodmagic.entry.alchemy.ash=Тайный пепел +guide.bloodmagic.entry.alchemy.speed=Движение МаÑÑив +guide.bloodmagic.entry.alchemy.updraft=МаÑÑив обновлений +guide.bloodmagic.entry.alchemy.bounce=Прыгающий маÑÑив +guide.bloodmagic.entry.alchemy.turret=Револьверный Ñкелет маÑÑива +guide.bloodmagic.entry.alchemy.buff=ОÑлаблÑющие маÑÑивы +guide.bloodmagic.entry.alchemy.fastMiner=МаÑÑив Fast Miner +guide.bloodmagic.entry.alchemy.furnace=Сжигание печи маÑÑив +guide.bloodmagic.entry.alchemy.teleport=МаÑÑив Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ +guide.bloodmagic.entry.alchemy.standardTurret=МаÑÑив турель +guide.bloodmagic.entry.alchemy.laputa=ОÑколок Лапута + + +# Alchemy Entry Texts +guide.bloodmagic.entry.alchemy.intro.info=ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Влад Хайборн, и Ñ Ð¼Ð°Ð³ крови. Я изучал Ñложную работу алхимии и процеÑÑ "Ñквивалентного обмена", который управлÑет вÑеми аÑпектами магии. Ð’ принципе, вы не можете Ñоздать что-то из ничего, Ñ…Ð¾Ñ‚Ñ Ð¼Ð½Ð¾Ð³Ð¸Ðµ пыталиÑÑŒ при поиÑке определенного камнÑ. Это, очевидно, не закончилоÑÑŒ хорошо, потому что люди требуют поддельного варианта даже ÑегоднÑ. Конечно, проÑто Ñказать, что Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸Ðº, недоÑтаточно, потому что одна из главных вещей, которую Ñ Ð´ÐµÐ»Ð°ÑŽ, Ñто изучаю магию крови Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¼ маÑтером и архитектором, оба из которых доÑтигли Ñтих титулов по Ñвоим ÑобÑтвенным заÑлугам. Маг и Тиберий были занÑÑ‚Ñ‹ запиÑью Ñвоих ÑобÑтвенных работ на протÑжении многих лет, Ñ…Ð¾Ñ‚Ñ Ñ Ð½Ðµ думаю, что у мага вÑе запиÑано в книге - Ñ ÐµÑ‰Ðµ не нашел никаких фактичеÑких доказательÑтв.Ð¼Ð¾Ñ ÐºÐ½Ð¸Ð³Ð° поÑвÑщена вÑем алхимичеÑким вещам в магии крови. От иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚Ð°Ð¹Ð½Ð¾Ð³Ð¾ пепла до Ñложной работы таблицы алхимии, вы найдете вÑе, что вам нужно знать о некоторых из более Ñложных Ñлементов в мире. Ðе вÑе, что вам нужно знать, еÑÑ‚ÑŒ в Ñтой книге - Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð½Ð¸Ð¼Ð°Ð½Ð¸Ñ Ð¼Ð°Ð³Ð¸Ð¸ крови вам нужно будет прочитать другие запиÑи во вÑем Ñтом томе.\n\tBut а пока, надеюÑÑŒ, вам понравÑÑ‚ÑÑ Ð¼Ð¾Ð¸ запиÑи. Ты не найдешь никакой лжи между Ñтими покрывалами. +guide.bloodmagic.entry.alchemy.ash.info=Arcane Ash необходим Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñоздавать алхимичеÑкие маÑÑивы, мощные круги, которые ÑпоÑобны обеÑпечить различные Ñффекты. Этот пепел изготовлен Ñ Ð¸Ñпользованием Hellfire Forge и Demon Will, поÑтому, еÑли вы новичок в Ñтой концепции, обратитеÑÑŒ к "Королю демонов"." \n\tПепел имеет в общей ÑложноÑти двадцать применений, прежде чем вам нужно Ñоздать другой. Когда вы щелкните правой кнопкой мыши по земле (или Ñтене, Ñ…Ð¾Ñ‚Ñ Ð¾Ð½Ð° будет отображать только одно направление), вы напишете проÑтой круг из пепла. ЕÑли вы Ñнова нажмете на золу Ñ Ñлементом, он будет" помещен внутри золы " - предполагаÑ, что Ñтот Ñлемент дейÑтвителен, круг изменит форму, чтобы предÑтавить, что он готов к Ñледующему Ñлементу. ЕÑли он не менÑет форму, значит, вы Ñделали что-то не так.\n\tПоÑле того, как он изменил форму, вы можете помеÑтить во вторичный Ñлемент. ЕÑли Ñтот Ñлемент Ñовпадает Ñ Ð¿ÐµÑ€Ð²Ñ‹Ð¼ Ñлементом, круг начнет вращатьÑÑ Ð¸ выполнÑÑ‚ÑŒ различные дейÑÑ‚Ð²Ð¸Ñ Ð² завиÑимоÑти от рецепта, над которым он работает. \n\tКаждый не-крафтовый Ñффект, который можно выполнить Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтих маÑÑивов, можно найти в Ñтой книге, и даже еÑли рецепт изменитÑÑ Ñ‡ÐµÑ€ÐµÐ· 3rd party, он будет отображатьÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¼ здеÑÑŒ. Показанные Ñлементы-Ñто порÑдок, в котором они должны быть размещены. +guide.bloodmagic.entry.alchemy.speed.info=МаÑÑив Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñоздает небольшой вихрь воздуха в его центре и иÑпользует небольшое количеÑтво Ñнергии Ð´Ð»Ñ ÐµÐ³Ð¾ нагрева. ПоÑле Ñтого, как только животное или любой другой тип ÑущеÑтва войдет в зону его дейÑтвиÑ, они будут запущены вперед в том направлении, в котором он был помещен Ñилой воздуха. Более того, еÑли упаÑÑ‚ÑŒ Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ выÑоты, маÑÑив уÑтранит урон от падениÑ, который был бы нанеÑен. ПроÑто будьте готовы к некоторым мÑгким движением опоÑлÑ. \n\tÐаправление движениÑ-в направлении Ñтрелки на маÑÑиве.\n\tСледует также отметить, что вы получите гораздо большее раÑÑтоÑние, еÑли упадете или прыгнете на маÑÑив, чем еÑли бы вы проÑто вошли в его облаÑÑ‚ÑŒ. Это ÑвÑзано Ñ Ñ‚ÑƒÑ€Ð±ÑƒÐ»ÐµÐ½Ñ‚Ð½Ð¾Ñтью ваших движений, вызывающей гораздо большую реакцию. +guide.bloodmagic.entry.alchemy.updraft.info=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‚Ðµ же принципы, что и маÑÑив Movement, Ñтот маÑÑив запуÑкает объект, который Ñтупает поверх него вертикально в воздухе. ЕÑтеÑтвенно, любой пользователь должен быть оÑторожен, потому что путь вниз может быть немного трудным! +guide.bloodmagic.entry.alchemy.bounce.info=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¸Ñточник тепла вблизи Ñвоего центра, который толкаетÑÑ Ð²Ð½Ð¸Ð·, маÑÑив пытаетÑÑ ÑмÑгчить землю под ним. ПоÑле Ñтого он преобразует углерод и водород в резиновый материал внутри Земли. Эта ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ñет любую ÑущноÑÑ‚ÑŒ ударить поверхноÑÑ‚ÑŒ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы отÑкочить в воздухе и иÑключать повреждение Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ в противном Ñлучае было бы терпеть. Этот отÑкок может быть оÑтановлен проÑтым перемещением, и он вÑе равно ÑмÑгчит ваше падение. +guide.bloodmagic.entry.alchemy.turret.info=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð²Ð¾Ð»ÑŽ демона, который вÑе еще контролирует толпу, вы можете захватить разум Ñкелета, чтобы заÑтавить его выполнÑÑ‚ÑŒ ваши приказы. ЕÑли Ñкелет окажетÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ облаÑти Ñтого маÑÑива, он будет дейÑтвовать как чаÑовой и атаковать враждебных монÑтров поблизоÑти. К Ñожалению, Ñтот маÑÑив вÑе еще очень ÑкÑпериментален, поÑтому он может работать не очень хорошо или поÑледовательно. +guide.bloodmagic.entry.alchemy.buff.info=Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñ‚Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¼Ñƒ изучению вы понимаете, что алхимичеÑкие маÑÑивы имеют широкий Ñпектр приложений. До Ñих пор вам удавалоÑÑŒ Ñоздавать мощные предметы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ крафтовых маÑÑивов, а также неÑкольких маÑÑивов, которые обеÑпечивают функциональные преимущеÑтва, такие как быÑтрое движение и Ñлабые формы телепортации. Однако одно из применений, которое вам еще предÑтоит иÑпользовать, - Ñто предоÑтавление мощных буферов через активный маÑÑив.\n\t"Бафф-маÑÑивы" - Ñто общий термин Ð´Ð»Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸Ñ‡ÐµÑких маÑÑивов, которые предоÑтавлÑÑŽÑ‚ некоторый бафф игрокам в пределах Ñвоей облаÑти дейÑтвиÑ. Эти зоны влиÑÐ½Ð¸Ñ Ð¸Ð¼ÐµÑŽÑ‚ тенденцию иметь очень большой радиуÑ, которым Ð½ÐµÐ»ÑŒÐ·Ñ Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ (в отличие от ритуалов). Однако, поÑкольку алхимичеÑкие маÑÑивы не имеют понÑÑ‚Ð¸Ñ Ð¾ Ñети душ, они должны питать Ñвои Ñффекты другими ÑредÑтвами: в оÑновном через прÑмые кровавые подношениÑ.Проще говорÑ, Ñто означает, что вÑÑкий раз, когда маÑÑив будет применÑÑ‚ÑŒ бафф, он повредит (возьмет HP) у игрока, на которого он брошен. \n\tИз-за прÑмого характера Ñтих жертв преобразование HP - > buff намного более благоприÑтно Ð´Ð»Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ¾Ð² в ранней игре по Ñравнению Ñ Ð°Ð½Ð°Ð»Ð¾Ð³Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ баффами в моде. Ðапример, еÑли бафф из Ñигила Ñтоит 100 ЛП за 10 Ñекунд активации, более мощный бафф может быть применен маÑÑивом за 30 Ñекунд за 1 ЛП (что ÑоÑтавлÑет 100 ЛП в алтаре T1 без рун). Это можно раÑÑматривать как намного более Ñффективное на ранних уровнÑÑ…, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº на более поздних уровнÑÑ… Ñто не так Ñффективно. Однако, из-за Ñтационарной природы маÑÑивов, они, как правило, обеÑпечивают более Ñильный Ñффект, чем их Ñигил-Ñчетчики, поÑтому люди могут захотеть иÑпользовать его в конце игры. +guide.bloodmagic.entry.alchemy.fastMiner.info=Когда поÑтавлена задача вырезать большую площадь земли, иногда лучше вÑего проÑто Ñделать Ñто вручную. Ð”Ð»Ñ Ñ‚Ð°ÐºÐ¸Ñ… Ñлучаев, Ñтот маÑÑив Ð´Ð»Ñ Ð²Ð°Ñ. МаÑÑив применÑет Haste III buff к игрокам в радиуÑе 10 блоков, что Ñтоит пользователю 1 HP за 30 Ñекунд. Потому что Ñто Ð¾Ð±Ñ‰Ð°Ñ Ñпешка бафф, он также увеличит ÑкороÑÑ‚ÑŒ атаки в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº в Ñвоей облаÑти Ñффекта, Ñ…Ð¾Ñ‚Ñ Ð²Ð°Ð¼ придетÑÑ Ð±Ñ‹Ñ‚ÑŒ оÑторожным, так как другие игроки тоже выиграют от Ñтого! +guide.bloodmagic.entry.alchemy.furnace.info=Одна из многих проблем, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ вы можете ÑтолкнутьÑÑ Ð² начале Ñвоего приключениÑ, - Ñто неÑпоÑобноÑÑ‚ÑŒ поддерживать огонь в печи. ГорÑÑ‰Ð°Ñ Ð¿ÐµÑ‡ÑŒ может означать разницу между полным желудком и Ñильным оружием или голодом в пещере. \n\tГорÑщий маÑÑив печи, как Ñледует из названиÑ, обеÑпечит Ñтоль необходимый иÑточник тепла Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ близлежащей печи. Ð Ð°Ð·Ð¼ÐµÑ‰Ð°Ñ Ð¼Ð°ÑÑив непоÑредÑтвенно Ñ€Ñдом Ñ Ð²Ð°Ð½Ð¸Ð»ÑŒÐ½Ð¾Ð¹ печью (он может быть Ñ€Ñдом Ñ Ð½ÐµÑколькими), он обеÑпечит топливо Ð´Ð»Ñ Ð¿ÐµÑ‡Ð¸, еÑли Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть завершена - ничего не произойдет, еÑли она находитÑÑ Ñ€Ñдом Ñ Ð¿ÑƒÑтой или полной печью, в оÑновном Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ защиты. \n\tОднако Ñто не беÑплатно: когда человек находитÑÑ Ñ€Ñдом (в радиуÑе 10 кварталов), он заберет половину Ñердца здоровьÑ, чтобы приготовить до двух вещей в печи. Это будет полезно либо быÑтро перекуÑить, либо раÑплавить полный штабель руды, но, к Ñожалению, вы не нашли ÑпоÑоба добавить какие-либо меры безопаÑноÑти в маÑÑив... +guide.bloodmagic.entry.alchemy.teleport.info=МаÑÑив телепортации дейÑтвует как ÑпоÑоб мгновенно перемещатьÑÑ Ð¸Ð· одного меÑта в другое Ñ Ð½ÐµÑколькими конкретными ограничениÑми. Когда игрок или другой объект входит в маÑÑив, маÑÑив будет иÑкать до 20 блоков в направлении, в котором он ÑталкиваетÑÑ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ маÑÑивом алхимии (который не должен быть активным). ЕÑли маÑÑиву удаÑÑ‚ÑÑ ÑƒÑпешно найти пункт назначениÑ, он телепортирует объект в найденный маÑÑив мгновенно, даже через Ñтены. \n\tИзучение Ñтого маÑÑива показало, что к нему добавлÑÑŽÑ‚ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ограничениÑ: из-за природы изгиба ткани проÑтранÑтва-времени маÑÑив телепортации не будет телепортировать то, что телепортировалоÑÑŒ в течение 2 Ñекунд. Это должно дать Ð²Ñ€ÐµÐ¼Ñ Ð²Ñем компонентам переÑтроитьÑÑ Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ образом. +guide.bloodmagic.entry.alchemy.standardTurret.info=Ðевозможно переоценить Ñилу Ð¼ÐµÑ‚Ð°Ð½Ð¸Ñ Ð¾Ñтрых предметов в далеких монÑтров. Ð‘Ð°ÑˆÐµÐ½Ð½Ð°Ñ Ñ€ÐµÑˆÐµÑ‚ÐºÐ° ÑпоÑобна ощутить близкого враждебного монÑтра и, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñложные алхимичеÑкие механизмы, ÑпоÑобна отÑтупить и выÑтрелить Ñтрелой, чтобы поразить Ñвою цель. \ n \ t маÑÑив ищет инвентарь непоÑредÑтвенно под ним. ЕÑли он найдет нормальную или наклоненную Ñтрелку, он будет Ñифон из Ñвоего контейнера и ÑтрелÑÑ‚ÑŒ в толпу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð² радиуÑе 32 блока. \n\t(Из-за какой-то глупой физики Minecraft, в которой Ñтрелки отÑкакивают от объектов, которые Ñлишком близки к тому, где они поÑвлÑÑŽÑ‚ÑÑ, Ð±Ð°ÑˆÐ½Ñ Ñ‚Ð°ÐºÐ¶Ðµ будет ÑтрелÑÑ‚ÑŒ только по толпе, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ, чем в 3 кварталах. Имейте Ñто в виду!) +guide.bloodmagic.entry.alchemy.laputa.info=СущеÑтвует иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¾ потерÑнном королевÑтве, которое обладало такой развитой магией, что могло летать Ñквозь облака. Ð¥Ð¾Ñ‚Ñ Ñто королевÑтво Ñ Ñ‚ÐµÑ… пор раÑÑыпалоÑÑŒ в пыль, неÑколько риÑунков Ñтого замка в небе Ñумели предоÑтавить изыÑканные детали механизмов, которые позволили ему Ñтать легендой, что Ñто так. \n\tОÑколок Лапуты превращает ÑущноÑÑ‚ÑŒ жизни, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Земли, в более птичью форму, заÑтавлÑÑ Ð¾ÐºÑ€ÑƒÐ¶Ð°ÑŽÑ‰ÑƒÑŽ облаÑÑ‚ÑŒ левитировать в воздухе. Ð¥Ð¾Ñ‚Ñ Ð¾Ñновной принцип проÑÑ‚, вариации жизненной ÑущноÑти Земли вызывают некоторую непоÑледовательноÑÑ‚ÑŒ в том, Ñколько Земли перемещаетÑÑ. МаÑÑив будет перемещать землю в ÑферичеÑком радиуÑе между 4 и 8 блоками над Ñобой Ñлучайное Ñмещение между одним и 5 блоками Ð¿Ð»ÑŽÑ Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ñ€Ð°Ð´Ð¸ÑƒÑ Ñффекта. \n\tСледует отметить, что как только начнетÑÑ Ñффект, вÑе Ñлементы, иÑпользуемые Ð´Ð»Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸ маÑÑива, будут потерÑны. From 28057bd3f6dde04ca20a8c2decab273203dd2d68 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 19 May 2019 09:40:48 -0700 Subject: [PATCH 321/493] Fix sigil of holding saving data to the wrong inventory tag (#1584) --- .../bloodmagic/item/sigil/ItemSigilHolding.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index b3fb15da..7238a07d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -131,10 +131,10 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl public void saveInventory(ItemStack itemStack, List inventory) { NBTTagCompound itemTag = itemStack.getTagCompound(); - if (itemTag == null) { - itemStack.setTagCompound(new NBTTagCompound()); - } + if (itemTag == null) + itemStack.setTagCompound(itemTag = new NBTTagCompound()); + NBTTagCompound inventoryTag = new NBTTagCompound(); NBTTagList itemList = new NBTTagList(); for (int i = 0; i < inventorySize; i++) { @@ -146,7 +146,8 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } } - itemTag.setTag(Constants.NBT.ITEMS, itemList); + inventoryTag.setTag(Constants.NBT.ITEMS, itemList); + itemTag.setTag(Constants.NBT.ITEM_INVENTORY, inventoryTag); } @Override @@ -246,7 +247,8 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl return NonNullList.withSize(inventorySize, ItemStack.EMPTY); } - NBTTagList tagList = tagCompound.getTagList(Constants.NBT.ITEMS, 10); + NBTTagCompound inventoryTag = tagCompound.getCompoundTag(Constants.NBT.ITEM_INVENTORY); + NBTTagList tagList = inventoryTag.getTagList(Constants.NBT.ITEMS, 10); if (tagList.isEmpty()) { return NonNullList.withSize(inventorySize, ItemStack.EMPTY); From 1d52a137d51ffb8019185735bef0e19a5a568719 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 16:59:25 +0000 Subject: [PATCH 322/493] Added getHeight() to AreaDescriptor, Jumping power modifyable (#1608) --- .../bloodmagic/ritual/AreaDescriptor.java | 20 +++++++++++++++++++ .../ritual/types/RitualJumping.java | 7 +++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java index b6bcdd7d..b6f5dc83 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java @@ -41,6 +41,8 @@ public abstract class AreaDescriptor implements Iterator { public abstract int getVolume(); + public abstract int getHeight(); + public abstract boolean isWithinRange(int verticalLimit, int horizontalLimit); /** @@ -115,6 +117,11 @@ public abstract class AreaDescriptor implements Iterator { return tempAABB.offset(pos.getX(), pos.getY(), pos.getZ()); } + @Override + public int getHeight() { + return this.maximumOffset.getY() - this.minimumOffset.getY(); + } + /** * Sets the offsets of the AreaDescriptor in a safe way that will make * minimumOffset the lowest corner @@ -270,6 +277,13 @@ public abstract class AreaDescriptor implements Iterator { blockPosCache = new ArrayList<>(); } + + @Override + public int getHeight() { + return this.radius * 2; + } + + @Override public List getContainedPositions(BlockPos pos) { if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { @@ -403,6 +417,12 @@ public abstract class AreaDescriptor implements Iterator { this.blockPosCache = new ArrayList<>(); } + @Override + public int getHeight() { + return this.size * 2 + 1; + } + + @Override public List getContainedPositions(BlockPos pos) { if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index 0321bd79..d38f2085 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -14,11 +14,14 @@ import java.util.function.Consumer; @RitualRegister("jumping") public class RitualJumping extends Ritual { public static final String JUMP_RANGE = "jumpRange"; + public static final String JUMP_POWER = "jumpPower"; public RitualJumping() { super("ritualJump", 0, 5000, "ritual." + BloodMagic.MODID + ".jumpRitual"); addBlockRange(JUMP_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3, 1, 3)); setMaximumVolumeAndDistanceOfRange(JUMP_RANGE, 0, 5, 5); + addBlockRange(JUMP_POWER, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 0, 5, 0)); + setMaximumVolumeAndDistanceOfRange(JUMP_POWER, 0, 0, 100); } @Override @@ -41,7 +44,7 @@ public class RitualJumping extends Ritual { break; } - double motionY = 1.5; + double motionY = masterRitualStone.getBlockRange(JUMP_POWER).getHeight() * 0.3; entity.fallDistance = 0; if (entity.isSneaking()) { @@ -66,7 +69,7 @@ public class RitualJumping extends Ritual { @Override public int getRefreshCost() { - return 5; + return getBlockRange(JUMP_POWER).getHeight(); } @Override From 1250f1015ef45308192881d4e5698b7cdb2934d1 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 May 2019 17:06:01 +0000 Subject: [PATCH 323/493] Changelog. (#1601) * Changelog. Some stuff still pending. * "Unbending" mod has been renamed to "Unmending" * Clarifications & Formatting * Update * Added Compression Sigil PR * Update changelog.txt * Added Network command PR change * Added JEI Recipes PR * Update changelog.txt * Removed empty bugfix category. From V2.0.0 * Update changelog.txt * Moved pending PR texts, added RitualJumping PR text, bumped version number * forgot version number * Remove pending merges --- changelog.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++- gradle.properties | 2 +- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 0595047d..11ab26ad 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,60 @@ +------------------------------------------------------ +Version 2.4.1 +------------------------------------------------------ + +Nut was too lazy to create a changelog, it's AEon's turn now! +Changes made from Feb 02 - now (Fill end date in later) + + +Living Armor: + - Fixed "Soft Fall" not preventing damage + - "Nocturnal Prowess" should not flash anymore + - "Trickshot" now ignores HurtResistanceTime + - "Trickshot" now works properly with sentient arrows + - "Step Assist" does not take effect while sneaking + +Sentient Bow: + - Fixed Destructive Will arrows exploding continuously + - Fixed Tipped Arrows getting improved even if no Will can be used + +Sigils: + - Buffed "Sigil of the Fast Miner" to be in accordance to the "Sanguine Scientium" + - Fixed a bug where "Sigil of the Fast Miner" would also cause the whirlwind effect + - Added "Whirlwind" to the potion registry + - Fixed broken Sigil tooltip formatting + - Fixed Sigil of Holding not updating some Sigil data, allowing for exploits + - Greatly improved "Sigil of Compression" performance + - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) + + +Rituals: + - Ported Veil of Evil & Ward of Sacrosanctity + - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) + - Added configurability to Ritual of the High Jump by modifying a new ritual area with the Ritual Tinkerer + +Misc: + - Fixed routing node oredict filter (crashes) + - Fixed mimic vanishing in some cases + - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) + - Stop insertions into Demon Crucible if the inventory is not empty + - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) (Gravestone bugginess) + - Fixed "Unmending" mod incompatibility + - Fixed Teleposers crashing the game if someone force-fed it junk + - added Nut being angery at contributors for messing stuff up + - Added some Russian language strings for the guide book + - Added repair recipes for Sentient Tools & Living Armor to JEI + + +Technical Stuff no player cares about: + - Formatted Project code + - Fixed BlockState parsing (mimic vanishing) + - Fixed some and streamlined ritual block ranges + - Mystery drain still mysterious + - Use TextFormatting rather than color codes in block lang names + - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) + - Fixed `/bloodmagic network get` command + - Added translation keys for tickethistory command help strings + ------------------------------------------------------ Version 2.4.0 ------------------------------------------------------ @@ -1107,4 +1164,4 @@ Changed - A graphical overhaul of everything has been implemented. These textures were provided by CyanideX's Unity texture pack. BBoldt and Yulife (Inap) from the Unity team are our new permanent texture artists. Bug Fixes -- \ No newline at end of file +- diff --git a/gradle.properties b/gradle.properties index 0e38a009..21145a3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.4.0 +mod_version=2.4.1 mc_version=1.12.2 forge_version=14.23.5.2808 curse_id=224791 From f34a89efa77ca3dd93fa6ff577d2c63c541c7e10 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 7 Aug 2019 17:29:38 +0200 Subject: [PATCH 324/493] Level 4 StormTrooper downgrade to correctly cost -65 upgrade points (was 65) (#1631) --- .../livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index 5f9ed0fa..61252106 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -25, -40, 65, -90}; + public static final int[] costs = new int[]{-10, -25, -40, -65, -90}; public static final float[] inaccuracy = new float[]{0.04f, 0.08f, 0.12f, 0.16f, 0.2f}; public LivingArmourUpgradeStormTrooper(int level) { From a6a5704a42e158995b563154d2ca8fe9a50f40f6 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 11 Aug 2019 20:49:30 +0200 Subject: [PATCH 325/493] Removed overseen debug print statements from Rituals veil of evel & ward of sacrosanctity (#1639) --- .../bloodmagic/util/handler/event/GenericHandler.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 30479efe..e2548df8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -517,12 +517,9 @@ public class GenericHandler { for (Map.Entry entry : fMap.entrySet()) { IMasterRitualStone masterRitualStone = entry.getKey(); AreaDescriptor blockRange = entry.getValue(); - System.out.println("found a map"); if (masterRitualStone != null && masterRitualStone.isActive() && masterRitualStone.getCurrentRitual() instanceof RitualVeilOfEvil) { - System.out.println("is active"); if (blockRange.offset(masterRitualStone.getBlockPos()).isWithinArea(new BlockPos(event.getX(), event.getY(), event.getZ()))) { - System.out.println("is in"); switch (event.getResult()) { case DEFAULT: event.setResult(Result.ALLOW); From cbefc14f72f7dcc7bfdba2fafdde6dab14f42268 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 4 Sep 2019 17:38:42 +0200 Subject: [PATCH 326/493] Fixes `/bloodmagic network` command permissions required for executing the command. (#1613) Inheriting from CommandTreeBase, the required permission level was 4. All other BloodMagic commands had a required permission level of 2. This resulted in network command not able to be executed from a Command Block, which have a permission level of 2. --- .../WayofTime/bloodmagic/command/sub/SubCommandNetwork.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 236d3014..ff1038c8 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -50,6 +50,11 @@ public class SubCommandNetwork extends CommandTreeBase { public SoulNetwork network; public String uuid; + @Override + public int getRequiredPermissionLevel() { + return 2; + } + public Integer commandHelperAmount(MinecraftServer server, ICommandSender sender, String[] args) { int amount; if (args.length == 0) From 65870682960ea4b4ecd6499895ba6c84a6c8b7d1 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Wed, 4 Sep 2019 17:39:25 +0200 Subject: [PATCH 327/493] Fix GLSL shader compilation with certain graphics drivers (fixes #1325) (#1624) --- src/main/resources/assets/bloodmagic/shaders/beam-broken.frag | 2 +- src/main/resources/assets/bloodmagic/shaders/beam.frag | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag b/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag index 63693c95..e3b2e255 100644 --- a/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag +++ b/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag @@ -4,7 +4,7 @@ void main() { vec2 texcoord = vec2(gl_TexCoord[0]); vec4 color = texture2D(bgl_RenderedTexture, texcoord); - float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; + float r = sin(texcoord.x * 6.0 - 1.5 + sin(texcoord.y - float(time) / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; gl_FragColor = vec4(min(1 - r, color.r * gl_Color.r), min(1 - r, color.g * gl_Color.g), color.b * gl_Color.b, color.a * gl_Color.a); } diff --git a/src/main/resources/assets/bloodmagic/shaders/beam.frag b/src/main/resources/assets/bloodmagic/shaders/beam.frag index 62741dfc..2ccc5dcd 100644 --- a/src/main/resources/assets/bloodmagic/shaders/beam.frag +++ b/src/main/resources/assets/bloodmagic/shaders/beam.frag @@ -5,8 +5,8 @@ vec2 texcoord = vec2(gl_TexCoord[0]); vec4 color = texture2D(bgl_RenderedTexture, texcoord); - float gs = (color.r + color.g + color.b) / 3; - float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; + float gs = (color.r + color.g + color.b) / 3.0; + float r = sin(texcoord.x * 6.0 - 1.5 + sin(texcoord.y - float(time) / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; gl_FragColor = vec4(gs, gs, max(gs, r), gl_Color.a); } From 3cdf4517a80253c419d6db94370c78a69edb37a4 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:38:52 +0200 Subject: [PATCH 328/493] Fixed some black magic that occurred when a mob was summoned in a world that was loaded but didn't have a list entry that is supposed to be generated on world load. (#1618) --- .../bloodmagic/potion/PotionEventHandlers.java | 5 +++-- .../util/handler/event/GenericHandler.java | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 18d12e9c..a2805904 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; +import com.google.common.collect.Lists; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; @@ -55,7 +56,7 @@ public class PotionEventHandlers { @SubscribeEvent public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { EntityLivingBase eventEntityLiving = event.getEntityLiving(); - List flightList = flightListMap.get(eventEntityLiving.getEntityWorld()); + List flightList = flightListMap.getOrDefault(eventEntityLiving.getEntityWorld(), Lists.newArrayList()); if (eventEntityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) eventEntityLiving; @@ -91,7 +92,7 @@ public class PotionEventHandlers { // } // } // } - List noGravityList = noGravityListMap.get(event.getEntityLiving().getEntityWorld()); + List noGravityList = noGravityListMap.getOrDefault(event.getEntityLiving().getEntityWorld(), Lists.newArrayList()); if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED) && !eventEntityLiving.hasNoGravity()) { eventEntityLiving.setNoGravity(true); noGravityList.add(eventEntityLiving); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index e2548df8..9a2c457d 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -555,11 +555,11 @@ public class GenericHandler { @SubscribeEvent public static void onWorldUnload(WorldEvent.Unload event) { World world = event.getWorld(); - bounceMapMap.getOrDefault(world, Collections.emptyMap()).clear(); - filledHandMapMap.getOrDefault(world, Collections.emptyMap()).clear(); - attackTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); - targetTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); - PotionEventHandlers.flightListMap.getOrDefault(world, Collections.emptyList()).clear(); - PotionEventHandlers.noGravityListMap.getOrDefault(world, Collections.emptyList()).clear(); + bounceMapMap.remove(world); + filledHandMapMap.remove(world); + attackTaskMapMap.remove(world); + targetTaskMapMap.remove(world); + PotionEventHandlers.flightListMap.remove(world); + PotionEventHandlers.noGravityListMap.remove(world); } } From 97d4967d3116ce6bc58c7a1340ae6766d75a95b2 Mon Sep 17 00:00:00 2001 From: Sam Kirby Date: Thu, 5 Sep 2019 03:39:54 +0200 Subject: [PATCH 329/493] Fixes for Ritual of the Eternal Soul (#1633) * Fixes for Ritual of the Eternal Soul * Use the same code to determine altar location and only cache its offset as is done in Well of Suffering. This prevents keeping a TileEntity loaded after it has been removed from the world, and also means the ritual will function if there are multiple master ritual stones using it in the world. * Use getCapability to obtain the BloodAltar which implements IFluidHandler, and fill that instead of trying to fill the tile entity. * Change the structure to match that found in previous versions. * Set owner HP to 2 (1 heart) if within ritual vincinity. * Add Soul Fray to every player in the vincinity of the ritual. --- .../ritual/types/RitualEternalSoul.java | 61 ++++++++++++------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java index 01ff6e08..e2b668a1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java @@ -1,17 +1,21 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.altar.BloodAltar; import WayofTime.bloodmagic.block.BlockLifeEssence; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.ritual.*; +import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.PotionEffect; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import java.util.List; import java.util.UUID; @@ -19,12 +23,15 @@ import java.util.function.Consumer; @RitualRegister("eternal_soul") public class RitualEternalSoul extends Ritual { + public static final String ALTAR_RANGE = "altar"; - - private IBloodAltar altar = null; + private BlockPos altarOffsetPos = new BlockPos(0, 0, 0); public RitualEternalSoul() { super("ritualEternalSoul", 2, 2000000, "ritual." + BloodMagic.MODID + ".eternalSoulRitual"); + addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); + + setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); } @Override @@ -33,20 +40,29 @@ public class RitualEternalSoul extends Ritual { int currentEssence = NetworkHelper.getSoulNetwork(owner).getCurrentEssence(); World world = masterRitualStone.getWorldObj(); BlockPos pos = masterRitualStone.getBlockPos(); + BlockPos altarPos = pos.add(altarOffsetPos); - if (this.altar == null) { - for (int i = -5; i <= 5; i++) { - for (int j = -5; j <= 5; j++) { - for (int k = -10; k <= 10; k++) { - if (world.getTileEntity(new BlockPos(pos.getX() + i, pos.getY() + j, pos.getZ() + k)) instanceof IBloodAltar) { - this.altar = (IBloodAltar) world.getTileEntity(new BlockPos(pos.getX() + i, pos.getY() + j, pos.getZ() + k)); - } - } + TileEntity tile = world.getTileEntity(altarPos); + AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); + + if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) { + for (BlockPos newPos : altarRange.getContainedPositions(pos)) { + TileEntity nextTile = world.getTileEntity(newPos); + if (nextTile instanceof TileAltar) { + tile = nextTile; + altarOffsetPos = newPos.subtract(pos); + + altarRange.resetCache(); + break; } } } - if (!(this.altar instanceof IFluidHandler)) + + if (!(tile instanceof TileAltar)) { return; + } + + BloodAltar altar = (BloodAltar) tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); int horizontalRange = 15; int verticalRange = 20; @@ -54,21 +70,20 @@ public class RitualEternalSoul extends Ritual { List list = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.getX() - 0.5f, pos.getY() - 0.5f, pos.getZ() - 0.5f, pos.getX() + 0.5f, pos.getY() + 0.5f, pos.getZ() + 0.5f) - .expand(horizontalRange, verticalRange, horizontalRange)); + .expand(horizontalRange, verticalRange, horizontalRange).expand(0, -verticalRange, 0)); - EntityPlayer entityOwner = null; - for (EntityPlayer player : list) { - if (PlayerHelper.getUUIDFromPlayer(player) == owner) - entityOwner = player; - } + EntityPlayer entityOwner = PlayerHelper.getPlayerFromUUID(owner); - int fillAmount = Math.min(currentEssence / 2, ((IFluidHandler) this.altar).fill(new FluidStack(BlockLifeEssence.getLifeEssence(), 10000), false)); + int fillAmount = Math.min(currentEssence / 2, altar.fill(new FluidStack(BlockLifeEssence.getLifeEssence(), 10000), false)); - ((IFluidHandler) this.altar).fill(new FluidStack(BlockLifeEssence.getLifeEssence(), fillAmount), true); + altar.fill(new FluidStack(BlockLifeEssence.getLifeEssence(), fillAmount), true); - if (entityOwner != null && entityOwner.getHealth() > 2.0f && fillAmount != 0) + if (entityOwner != null && list.contains(entityOwner) && entityOwner.getHealth() > 2.0f && fillAmount != 0) entityOwner.setHealth(2.0f); + for (EntityPlayer player : list) + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, 100)); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(fillAmount * 2)); } @@ -86,7 +101,7 @@ public class RitualEternalSoul extends Ritual { @Override public void gatherComponents(Consumer components) { - addCornerRunes(components, 0, 1, EnumRuneType.FIRE); + addCornerRunes(components, 1, 0, EnumRuneType.FIRE); for (int i = 0; i < 4; i++) { addCornerRunes(components, 2, i, EnumRuneType.AIR); From 845ca65cabc419c22b88bcc5922d5a562b08f926 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:48:54 +0200 Subject: [PATCH 330/493] Changed SoundType and visible Material of wooden path blocks from stone/rock to wood (#1638) * Changed SoundType and visible Material of wooden path blocks from stone/rock to wood. Breaking wooden path blocks is now effective & faster with an axe and slow with a pickaxe type tool. * Moved hacky to getter. * Cleanup unneeded override * Using Enums instead of meta IDs --- .../WayofTime/bloodmagic/block/BlockPath.java | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 779c1389..fc60a3b5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -9,10 +9,12 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class BlockPath extends BlockEnum implements IIncensePath { @@ -26,14 +28,14 @@ public class BlockPath extends BlockEnum implements IIncensePath { setResistance(5.0F); setSoundType(SoundType.STONE); - setHarvestLevel("axe", 0, getStateFromMeta(0)); - setHarvestLevel("axe", 0, getStateFromMeta(1)); - setHarvestLevel("pickaxe", 0, getStateFromMeta(2)); - setHarvestLevel("pickaxe", 0, getStateFromMeta(3)); - setHarvestLevel("pickaxe", 0, getStateFromMeta(4)); - setHarvestLevel("pickaxe", 0, getStateFromMeta(5)); - setHarvestLevel("pickaxe", 3, getStateFromMeta(6)); - setHarvestLevel("pickaxe", 3, getStateFromMeta(7)); + setHarvestLevel("axe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WOOD)); + setHarvestLevel("axe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WOODTILE)); + setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.STONE)); + setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.STONETILE)); + setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WORNSTONE)); + setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WORNSTONETILE)); + setHarvestLevel("pickaxe", 3, getDefaultState().withProperty(getProperty(), EnumPath.OBSIDIAN)); + setHarvestLevel("pickaxe", 3, getDefaultState().withProperty(getProperty(), EnumPath.OBSIDIANTILE)); } @Override @@ -42,6 +44,24 @@ public class BlockPath extends BlockEnum implements IIncensePath { super.addInformation(stack, world, tooltip, tooltipFlag); } + @Override + public Material getMaterial(IBlockState state) { + EnumPath path = state.getValue(getProperty()); + if (path.equals(EnumPath.WOOD) || path.equals(EnumPath.WOODTILE)) + return Material.WOOD; + else + return Material.ROCK; + } + + @Override + public SoundType getSoundType(IBlockState state, World world, BlockPos pos, @Nullable Entity entity) { + EnumPath path = state.getValue(getProperty()); + if (path.equals(EnumPath.WOOD) || path.equals(EnumPath.WOODTILE)) + return SoundType.WOOD; + else + return super.getSoundType(); + } + @Override public int getLevelOfPath(World world, BlockPos pos, IBlockState state) { switch (this.getMetaFromState(state)) { From 0cbaa13cfcdede86f5fee09345462b3c428d7767 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:49:05 +0200 Subject: [PATCH 331/493] Some fixes to the German translation because of the translation keys got changed. (#1640) * Some fixes to the German translation because of the translation keys got changed. Added chapter title translation to newly documented rituals but not the chapters itself. * Changed Tartaric Gem translation from "Weinstein" -> "Tartarisches Juwel" --- .../assets/bloodmagic/lang/de_DE.lang | 149 +++++++++--------- .../assets/bloodmagicguide/lang/de_DE.lang | 26 ++- 2 files changed, 100 insertions(+), 75 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang index db60bfb1..c6627a6c 100644 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang @@ -1,20 +1,18 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=Blood Magic +# Creative Tab itemGroup.bloodmagic.creativeTabTome=Blood Magic - Upgrades -#Items -item.bloodmagic.activationCrystal.weak.name=Schwacher Aktivierungskristall -item.bloodmagic.activationCrystal.awakened.name=Erweckter Aktivierungskristall -item.bloodmagic.activationCrystal.creative.name=Kreativer Aktivierungskristall +# Items -item.bloodmagic.sacrificialDagger.normal.name=Opferdolch -item.bloodmagic.sacrificialDagger.creative.name=Kreativer Opferdolch item.bloodmagic.pack.selfSacrifice.name=Blutweste item.bloodmagic.pack.sacrifice.name=Vampirische Weste item.bloodmagic.daggerOfSacrifice.name=Opfermesser item.bloodmagic.lavaCrystal.name=Lavakristall +item.bloodmagic.activation_crystal.awakened.name=Erweckter Aktivierungskristall +item.bloodmagic.activation_crystal.creative.name=Kreativer Aktivierungskristall +item.bloodmagic.activation_crystal.weak.name=Schwacher Aktivierungskristall + item.bloodmagic.bound.sword.name=Gebundene Klinge item.bloodmagic.bound.pickaxe.name=Gebundene Spitzhacke item.bloodmagic.bound.axe.name=Gebundene Axt @@ -63,19 +61,21 @@ item.bloodmagic.reagent.virtus.name=Virtus item.bloodmagic.reagent.reductus.name=Reductus item.bloodmagic.reagent.potentia.name=Potentia -item.bloodmagic.bloodShard.weak.name=Schwache Blutscherbe -item.bloodmagic.bloodShard.demon.name=Dämonische Blutscherbe +item.bloodmagic.blood_shard.demonic.name=Dämonische Blutscherbe +item.bloodmagic.blood_shard.weak.name=Schwache Blutscherbe +item.bloodmagic.sacrificial_dagger.creative.name=Kreativer Opferdolch +item.bloodmagic.sacrificial_dagger.normal.name=Opferdolch -item.bloodmagic.baseComponent.reagentWater.name=Wasserreagenz -item.bloodmagic.baseComponent.reagentLava.name=Lavareagenz -item.bloodmagic.baseComponent.reagentAir.name=Luftreagenz -item.bloodmagic.baseComponent.reagentFastMiner.name=Reagenz der Eile -item.bloodmagic.baseComponent.reagentVoid.name=Reagenz der Leere -item.bloodmagic.baseComponent.reagentGrowth.name=Wachstumsreagenz -item.bloodmagic.baseComponent.reagentAffinity.name=Reagenz der elementaren Verbundenheit -item.bloodmagic.baseComponent.reagentSight.name=Sichtreagenz -item.bloodmagic.baseComponent.reagentBinding.name=Bindendes Reagenz -item.bloodmagic.baseComponent.reagentSuppression.name=Verdrängendes Reagenz +item.bloodmagic.baseComponent.reagent_affinity.name=Reagenz der elementaren Verbundenheit +item.bloodmagic.baseComponent.reagent_air.name=Luftreagenz +item.bloodmagic.baseComponent.reagent_binding.name=Bindendes Reagenz +item.bloodmagic.baseComponent.reagent_fast_miner.name=Reagenz der Eile +item.bloodmagic.baseComponent.reagent_growth.name=Wachstumsreagenz +item.bloodmagic.baseComponent.reagent_lava.name=Lavareagenz +item.bloodmagic.baseComponent.reagent_sight.name=Sichtreagenz +item.bloodmagic.baseComponent.reagent_suppression.name=Verdrängendes Reagenz +item.bloodmagic.baseComponent.reagent_void.name=Reagenz der Leere +item.bloodmagic.baseComponent.reagent_water.name=Wasserreagenz item.bloodmagic.baseComponent.reagent_blood_light.name=Blutlampenreagenz item.bloodmagic.baseComponent.reagent_magnetism.name=Magnetismusreagenz item.bloodmagic.baseComponent.reagent_haste.name=Reagenz der Hast @@ -110,29 +110,23 @@ item.bloodmagic.demonCrystal.destructive.name=Kristall zerstörender dämonische item.bloodmagic.demonCrystal.vengeful.name=Kristall rachsüchtiger dämonischer Willenskraft item.bloodmagic.demonCrystal.steadfast.name=Kristall standhafter dämonischer Willenskraft -item.bloodmagic.monsterSoul.base.name=Dämonische Willenskraft +item.bloodmagic.monster_soul.raw.name=Dämonische Willenskraft item.bloodmagic.monster_soul.corrosive.name=Korrosive dämonische Willenskraft item.bloodmagic.monster_soul.destructive.name=Zerstörerische dämonische Willenskraft item.bloodmagic.monster_soul.vengeful.name=Rachsüchtige dämonische Willenskraft item.bloodmagic.monster_soul.steadfast.name=Standhafte dämonische Willenskraft item.bloodmagic.sigil.air.name=Luftsiegel -item.bloodmagic.sigil.bloodLight.name=Siegel der Blutlampe item.bloodmagic.sigil.compression.name=Siegel der Kompression item.bloodmagic.sigil.divination.name=Siegel der Weissagung item.bloodmagic.sigil.water.name=Wassersiegel item.bloodmagic.sigil.lava.name=Lavasiegel item.bloodmagic.sigil.void.name=Siegel der Leere -item.bloodmagic.sigil.greenGrove.name=Siegel des grünen Hains -item.bloodmagic.sigil.elementalAffinity.name=Siegel der elementaren Verbundenheit item.bloodmagic.sigil.haste.name=Siegel der Hast item.bloodmagic.sigil.suppression.name=Siegel der Verdrängung item.bloodmagic.sigil.magnetism.name=Siegel des Magnetismus -item.bloodmagic.sigil.fastMiner.name=Siegel des Eile item.bloodmagic.sigil.seer.name=Siegel des Sehers -item.bloodmagic.sigil.phantomBridge.name=Siegel der Phantombrücke item.bloodmagic.sigil.whirlwind.name=Siegel des Wirbelwindes -item.bloodmagic.sigil.enderSeverance.name=Siegel des Endertrennens item.bloodmagic.sigil.holding.name=Siegel der Aufbewahrung item.bloodmagic.sigil.holding.display=&r%s: &o&n%s item.bloodmagic.sigil.teleposition.name=Telepositionssiegel @@ -140,6 +134,12 @@ item.bloodmagic.sigil.transposition.name=Transpositionssiegel item.bloodmagic.sigil.claw.name=Siegel der Klaue item.bloodmagic.sigil.bounce.name=Siegel der Elastizität item.bloodmagic.sigil.frost.name=Siegel des Winteratems +item.bloodmagic.sigil.blood_light.name=Siegel der Blutlampe +item.bloodmagic.sigil.elemental_affinity.name=Siegel der elementaren Verbundenheit +item.bloodmagic.sigil.ender_severance.name=Siegel des Endertrennens +item.bloodmagic.sigil.fast_miner.name=Siegel des Eile +item.bloodmagic.sigil.green_grove.name=Siegel des grünen Hains +item.bloodmagic.sigil.phantom_bridge.name=Siegel der Phantombrücke item.bloodmagic.livingArmour.helmet.name=Lebender Helm item.bloodmagic.livingArmour.chest.name=Lebender Brustpanzer @@ -152,6 +152,7 @@ item.bloodmagic.sentientArmour.boots.name=Empfindsame Schuhe item.bloodmagic.altarMaker.name=Altarersteller +item.bloodmagic.ritualDismantler.name=Ritual Dismantler item.bloodmagic.ritualDivinernormal.name=Ritualrute item.bloodmagic.ritualDivinerdusk.name=Ritualrute [Abenddämmerung] item.bloodmagic.ritualDivinerdawn.name=Ritualrute [Morgendämmerung] @@ -162,7 +163,6 @@ item.bloodmagic.upgradeTome.name=These zur Verbesserung lebender Rüstung item.bloodmagic.downgradeTome.name=These zur Schwächung lebender Rüstung item.bloodmagic.upgradeTrainer.name=Trainingsband für Lebende Rüstung - item.bloodmagic.sentientSword.name=Empfindsames Schwert item.bloodmagic.soulGem.petty.name=Winziges Juwel des Tartaros item.bloodmagic.soulGem.lesser.name=Niederes Juwel des Tartaros @@ -196,6 +196,14 @@ item.bloodmagic.icarusScroll.name=Ikarusrolle # Blocks tile.bloodmagic.fluid.lifeEssence.name=Lebensessenz +tile.bloodmagic.bloodstone_brick.name=Blutsteinziegel +tile.bloodmagic.bloodstone_tile.name=Großer Blutsteinziegel + +tile.bloodmagic.crystal_brick.name=Kristallklumpenziegel +tile.bloodmagic.crystal_tile.name=Kristallklumpen + +tile.bloodmagic.phantom.name=Phantomblock + tile.bloodmagic.stone.ritual.master.name=Meisterritualstein tile.bloodmagic.stone.ritual.imperfect.name=Imperfekter Ritualstein tile.bloodmagic.stone.ritual.inverted.name=Umgekehrter Meisterritualstein @@ -207,13 +215,13 @@ tile.bloodmagic.rune.blank.name=Leere Rune tile.bloodmagic.rune.speed.name=Geschwindigkeitsrune tile.bloodmagic.rune.efficiency.name=Effizienzrune tile.bloodmagic.rune.sacrifice.name=Rune der Opferung -tile.bloodmagic.rune.selfSacrifice.name=Rune der Selbstopferung tile.bloodmagic.rune.displacement.name=Rune der Verlagerung tile.bloodmagic.rune.capacity.name=Kapazitätsrune -tile.bloodmagic.rune.augCapacity.name=Rune der erweiterten Kapazität tile.bloodmagic.rune.orb.name=Rune der Blutkugel tile.bloodmagic.rune.acceleration.name=Beschleunigungsrune tile.bloodmagic.rune.charging.name=Aufladungsrune +tile.bloodmagic.rune.augmented_capacity.name=Rune der erweiterten Kapazität +tile.bloodmagic.rune.self_sacrifice.name=Rune der Selbstopferung tile.bloodmagic.ritualStone.blank.name=Ritualstein tile.bloodmagic.ritualStone.water.name=Wasserritualstein @@ -223,13 +231,8 @@ tile.bloodmagic.ritualStone.air.name=Luftritualstein tile.bloodmagic.ritualStone.dusk.name=Abenddämmerungsritualstein tile.bloodmagic.ritualStone.dawn.name=Morgendämmerungsritualstein -tile.bloodmagic.bloodstonebrick.large.name=Großer Blutsteinziegel -tile.bloodmagic.bloodstonebrick.brick.name=Blutsteinziegel -tile.bloodmagic.crystal.large.name=Kristallklumpen -tile.bloodmagic.crystal.brick.name=Kristallklumpenziegel tile.bloodmagic.bloodLight.name=Blutlampe tile.bloodmagic.spectralBlock.name=Spektralblock -tile.bloodmagic.phantomBlock.name=Phantomblock tile.bloodmagic.incenseAltar.name=Räucheraltar tile.bloodmagic.teleposer.name=Teleposer @@ -374,6 +377,9 @@ tile.bloodmagic.stairs3.steadfast.name=Standhafte Steintreppe # Fluids fluid.lifeEssence=Lebensessenz +# HUD +hud.bloodmagic.inactive=Inactive + # Tooltips tooltip.bloodmagic.extraInfo=&9-Halte Shift für mehr Info- @@ -387,10 +393,14 @@ tooltip.bloodmagic.tier=Ausbaustufe %d tooltip.bloodmagic.activated=Aktiviert tooltip.bloodmagic.deactivated=Deaktiviert +tooltip.bloodmagic.activation_crystal.awakened=Aktiviert mächtigere Rituale +tooltip.bloodmagic.activation_crystal.creative=Kreativmodus: Aktiviert jedes Ritual +tooltip.bloodmagic.activation_crystal.weak=Aktiviert niedrig-levelige Rituale + tooltip.bloodmagic.sigil.air.desc=&oIch fühl mich schon leichter... -tooltip.bloodmagic.sigil.bloodLight.desc=&oIch sehe ein Licht! tooltip.bloodmagic.sigil.compression.desc=&oDiamanthände tooltip.bloodmagic.sigil.divination.desc=&oSpähe in die Seele +tooltip.bloodmagic.sigil.divination.otherNetwork=Peering into the soul of %s tooltip.bloodmagic.sigil.divination.currentAltarTier=Ausbaustufe: %d tooltip.bloodmagic.sigil.divination.currentEssence=Gespeicherte Lebensessenz: %d LP tooltip.bloodmagic.sigil.divination.currentAltarCapacity=Maximale Kapazität: %d LP @@ -400,11 +410,9 @@ tooltip.bloodmagic.sigil.divination.currentBonus=Momentaner Bonus: +%d%% tooltip.bloodmagic.sigil.water.desc=&oHat jemand nach unendlichem Wasser gefragt? tooltip.bloodmagic.sigil.lava.desc=&oHEISS! NICHT ESSEN! tooltip.bloodmagic.sigil.void.desc=&oBesser als Swiffer®! -tooltip.bloodmagic.sigil.greenGrove.desc=&oUmweltverträglich tooltip.bloodmagic.sigil.magnetism.desc=&oIch habe eine anziehende Persönlichkeit tooltip.bloodmagic.sigil.suppression.desc=&oBesser als Telekinese tooltip.bloodmagic.sigil.haste.desc=&o42 Dosen Koffein später... -tooltip.bloodmagic.sigil.fastMiner.desc=&oHacke wie ein Weltmeister tooltip.bloodmagic.sigil.elementalAffinity.desc=&oAchtung! Fallende Feuerfische tooltip.bloodmagic.sigil.seer.desc=&oWenn allsehend nicht genug ist tooltip.bloodmagic.sigil.seer.currentAltarProgress=Fortschritt: %d LP/ %s LP @@ -416,14 +424,17 @@ tooltip.bloodmagic.sigil.seer.currentAltarCapacity=Maximale Kapazität: %d LP tooltip.bloodmagic.sigil.seer.currentCharge=Ladung: %d tooltip.bloodmagic.sigil.seer.currentTranquility=Momentane Gelassenheit: %d tooltip.bloodmagic.sigil.seer.currentBonus=Momentaner Bonus: +%d%% -tooltip.bloodmagic.sigil.phantomBridge.desc=&oLaufen auf dünner Luft... tooltip.bloodmagic.sigil.whirlwind.desc=&oBesser keinen Rock tragen -tooltip.bloodmagic.sigil.enderSeverance.desc=&oBringt Endermen in Notlage tooltip.bloodmagic.sigil.teleposition.desc=Das ist beinahe ein bewegender Moment. tooltip.bloodmagic.sigil.transposition.desc=Spüre die Stärke der Macht, mein junger Schüler. tooltip.bloodmagic.sigil.holding.press=Drücke &o%s&r&7 zum ändern tooltip.bloodmagic.sigil.holding.desc=Gesiegelte Siegel tooltip.bloodmagic.sigil.holding.sigilInSlot=Platz %d: %s +tooltip.bloodmagic.sigil.blood_light.desc=&oIch sehe ein Licht! +tooltip.bloodmagic.sigil.ender_severance.desc=&oBringt Endermen in Notlage +tooltip.bloodmagic.sigil.fast_miner.desc=&oHacke wie ein Weltmeister +tooltip.bloodmagic.sigil.green_grove.desc=&oUmweltverträglich +tooltip.bloodmagic.sigil.phantom_bridge.desc=&oLaufen auf dünner Luft... tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Erhöht die maximalen Punkte der Lebenden Rüstung auf %d. @@ -441,9 +452,6 @@ tooltip.bloodmagic.pack.selfSacrifice.desc=Es scheuert richtig... tooltip.bloodmagic.pack.sacrifice.desc=Beschreibung tooltip.bloodmagic.pack.stored=Enthält: %d LP -tooltip.bloodmagic.activationCrystal.weak=Aktiviert niedrig-levelige Rituale -tooltip.bloodmagic.activationCrystal.awakened=Aktiviert mächtigere Rituale -tooltip.bloodmagic.activationCrystal.creative=Kreativmodus: Aktiviert jedes Ritual tooltip.bloodmagic.diviner.currentRitual=Ritual: tooltip.bloodmagic.diviner.blankRune=Leere Runen: %d @@ -470,6 +478,7 @@ tooltip.bloodmagic.arcaneAshes=Asche gebraucht für einen alchemischen Kreis tooltip.bloodmagic.telepositionFocus.coords=Koordinaten: (%d, %d, %d) tooltip.bloodmagic.telepositionFocus.dimension=Dimensions-ID: %d +tooltip.bloodmagic.telepositionFocus.bound=Bound: %s at %d, %d, %d tooltip.bloodmagic.telepositionFocus.weak=Benutzt, um Blöcke zu teleportieren tooltip.bloodmagic.telepositionFocus.enhanced=Benutzt, um Blöcke zu teleportieren tooltip.bloodmagic.telepositionFocus.reinforced=Benutzt, um Blöcke zu teleportieren @@ -518,7 +527,6 @@ tooltip.bloodmagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Halte Shift + M für Fortschrittsinfo- - tooltip.bloodmagic.will=Willensqualität: %1$,.2f tooltip.bloodmagic.sentientSword.desc=Benutzt Dämonenwille um volles Potential freizusetzen tooltip.bloodmagic.sentientAxe.desc=Benutzt Dämonenwille um volles Potential freizusetzen @@ -615,6 +623,12 @@ ritual.bloodmagic.altarBuilderRitual=Die Zusammensetzung des hohen Altares ritual.bloodmagic.portalRitual=Das Tor der Faltung ritual.bloodmagic.downgradeRitual=Sühne der belasteten Seele ritual.bloodmagic.crystalSplitRitual=Resonanz des facettierten Kristalls +ritual.bloodmagic.condorRitual=Reverence of the Condor +ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul +ritual.bloodmagic.groundingRitual=Ritual of Grounding +ritual.bloodmagic.featheredEarthRitual=Ritual of the Feathered Earth +ritual.bloodmagic.veilOfEvilRitual=Veil of Evil +ritual.bloodmagic.wardOfSacrosanctityRitual=Ward of Sacrosanctity ritual.bloodmagic.waterRitual.info=Generiert eine Wasserquelle auf dem Meisterritualstein. ritual.bloodmagic.lavaRitual.info=Generiert eine Lavaquelle auf dem Meisterritualstein. @@ -660,6 +674,14 @@ ritual.bloodmagic.animalGrowthRitual.steadfast.info=(Standhaft) Züchtet Erwachs ritual.bloodmagic.animalGrowthRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen in der Aura. ritual.bloodmagic.animalGrowthRitual.destructive.info=(Zerstörerisch) Lässt Erwachsene, die sich länger nicht mehr gedeckt haben, auf Monster zulaufen und explodieren. ritual.bloodmagic.animalGrowthRitual.corrosive.info=(Korrosiv) Nicht implementiert. +ritual.bloodmagic.groundingRitual.info=Forces entities on the ground and prevents jumping. +ritual.bloodmagic.groundingRitual.default.info=(Raw) Affects players. +ritual.bloodmagic.groundingRitual.corrosive.info=(Corrosive) Disables gravity (+Vengeful) Applies Levitation. +ritual.bloodmagic.groundingRitual.destructive.info=(Destructive) Applies Heavy Heart (increases fall damage) (+Vengeful) Stronger effect. +ritual.bloodmagic.groundingRitual.steadfast.info=(Steadfast) Affects Bosses. Doesn't affect bosses that are immune against motion change or immune against potions (except Wither and Ender Dragon). +ritual.bloodmagic.groundingRitual.vengeful.info=(Vengeful) Makes effects stronger. (+Corrosive) Applies Levitation. (+Destructive) Higher Heavy Heart amplifier. +ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. +ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. ritual.bloodmagic.crystalSplitRitual.info=Spaltet eine ausgewachsene rohe Kristallgruppe in die Aspekte auf. ritual.bloodmagic.fullStomachRitual.info=Entfernt Essen aus der verbundenen Truhe, um die Sättigung des Spielers zu füllen. @@ -745,6 +767,8 @@ ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Anders als meine Brüder ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Auch wenn deine Wunden noch heilen mögen, werden sie es doch nur langsam, fall du mein "Angebot" akzeptieren solltest und die Wunden der Schlacht werden dir noch mehr schmerzen. ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=Also überlege gut, bevor du einen Handel eingehst, den du bereuen wirst. Denn auch wenn dein Glas leer sein sollte, wird es nahezu unmöglich sein, es wieder zu füllen... +ritual.bloodmagic.featheredEarthRitual.info=Prevents falldamage in an area. + # Chat chat.bloodmagic.altarMaker.setTier=Setze Ausbaustufe auf: %d chat.bloodmagic.altarMaker.building=Baue Stufe %d-Altar @@ -786,6 +810,9 @@ chat.bloodmagic.mimic.detectRadius.down=Spieler-Erfassungsradius wurde verringer chat.bloodmagic.mimic.potionSpawnRadius.up=Trankerzeugungsradius wurde erhöht auf: %d Blöcke. chat.bloodmagic.mimic.potionSpawnRadius.down=Trankerzeugungsradis wurde verringert auf: %d Blöcke. +death.attack.ritual_damage=%1$s wurde für ein Ritual geopfert. +death.attack.ritual_damage.player=%2$s hat %1$s für ein Ritual geopfert. + # entity entity.bloodmagic.SentientSpecter.name=Empfindsamer Geist entity.bloodmagic.Mimic.name=Mimik @@ -794,9 +821,8 @@ entity.bloodmagic.Mimic.name=Mimik commands.bloodmagic.error.arg.invalid=Ungültige Argumente commands.bloodmagic.error.arg.missing=Nicht genug Argumente commands.bloodmagic.error.arg.player.missing=Du musst einen Spieler für diese Aktion bestimmen. -commands.bloodmagic.error.404=Befehl nicht gefunden! -commands.bloodmagic.error.unknown=Unbekannter Befehl! -commands.bloodmagic.error.perm=Du hast keine Berechtigung, diesen Befehl zu nutzen! +commands.bloodmagic.error.negative=Amount must be a positive Integer. +commands.bloodmagic.error.outofbounds=Given integer is too large (must be within list ID boundaries). commands.bloodmagic.success=Erfolgreich ausgeführt @@ -808,6 +834,7 @@ commands.bloodmagic.help.help=Zeigt hilfe für den Befehl "/bloodmagic" an. commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] Spieler [amount] commands.bloodmagic.network.help=LP Netzwerk Befehle + commands.bloodmagic.network.syphon.help=Zieht den gegebenen Wert an LP vom LP-Netzwerk des gegebenen Spielers ab. commands.bloodmagic.network.syphon.success=Erfolgreich %d LP von %s abgezogen. commands.bloodmagic.network.add.help=Fügt den gegebenen Wert an LP dem LP-Netzwerk des gegebenen Spielers zu. Folgt normalen LP Regeln. @@ -822,32 +849,15 @@ commands.bloodmagic.network.cap.success=%ss LP-Netzwerk erfolgreich gefüllt. commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [Spieler] commands.bloodmagic.bind.help=Versucht, den gehaltenen Gegenstand zu binden bzw. die Bindung zu entfernen. -commands.bloodmagic.bind.success=Erfolgreich gebunden +commands.bloodmagic.bind.success=Gegenstand erfolgreich gebunden! commands.bloodmagic.bind.remove.success=Bindung erfolgreich entfernt +commands.bloodmagic.bind.error.ownerEqualsTarget=Es hat sich nichts geändert: Ziel und Besitzer sind identsich. +commands.bloodmagic.bind.error.notBound=Bindung kann nicht gelöscht werden: Nicht gebunden. +commands.bloodmagic.bind.error.notBindable=Kann nicht gebunden werden: Gegenstand nicht bindbar. commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] Spieler [tier] commands.bloodmagic.orb.help=Setzt oder zeigt die Blutkugel-Ausbaustufe des Spielers. -commands.bloodmagic.bind.usage=/bind -commands.bloodmagic.bind.success=Gegenstand erfolgreich gebunden! -commands.bloodmagic.bind.failed.noPlayer=Kein Spieler angegeben -commands.bloodmagic.bind.failed.alreadyBound=Gegenstand ist schon gebunden; benutze /unbind um die Bindung zu entfernen -commands.bloodmagic.bind.failed.notBindable=Gegenstand kann nicht gebunden werden -commands.bloodmagic.unbind.usage=/unbind -commands.bloodmagic.unbind.success=Bindung erfolgreich entfernt. -commands.bloodmagic.unbind.failed.notBindable=Bindung kann nicht entfernt werden. -commands.bloodmagic.soulnetwork.usage=/soulnetwork [Menge] -commands.bloodmagic.soulnetwork.add.success=Erfolgreich %dLP zu %ss LP-Netzwerk hinzugefügt! -commands.bloodmagic.soulnetwork.subtract.success=Erfolgreich %dLP von %ss LP-Netzwerk entfernt! -commands.bloodmagic.soulnetwork.fill.success=Erfolgreich %ss LP-Netzwerk gefüllt! -commands.bloodmagic.soulnetwork.empty.success=Erfolgreich %ss LP-Netzwerk geleert! -commands.bloodmagic.soulnetwork.get.success=In %ss LP-Netzwerk sind %dLP! -commands.bloodmagic.soulnetwork.noPlayer=Kein Spieler angegeben -commands.bloodmagic.soulnetwork.noCommand=Kein Befehl angegeben -commands.bloodmagic.soulnetwork.notACommand=Das ist kein gültiger Befehl -commands.bloodmagic.soulnetwork.fillMax.success=%ss LP-Netzwerk erfolgreich zu deren Blutkugel-Maximum befüllt! -commands.bloodmagic.soulnetwork.create.success=%ss LP-Netzwerk erfolgreich erstellt! (Blutkugel-Ausbaustufe: %d) - # GUI tile.bloodmagic.inputNode.name=Eingangsknoten tile.bloodmagic.outputNode.name=Ausgangsknoten @@ -857,9 +867,6 @@ bloodmagic.keybind.open_holding=Öffne Siegel der Aufbewahrung bloodmagic.keybind.cycle_holding_pos=Siegelrotation (+) bloodmagic.keybind.cycle_holding_neg=Siegelrotation (-) -death.attack.ritual_damage=%1$s wurde für ein Ritual geopfert. -death.attack.ritual_damage.player=%2$s hat %1$s für ein Ritual geopfert. - # JustEnoughItems jei.bloodmagic.recipe.altar=Blutaltar jei.bloodmagic.recipe.binding=Alchemische Anordnung (Bindung) diff --git a/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang b/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang index 3715be0f..21cf0a86 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang @@ -51,6 +51,23 @@ guide.bloodmagic.entry.ritual.timberman=Kahlschlag des Holzfällers guide.bloodmagic.entry.ritual.meteor=Zeichen des fallenden Turms guide.bloodmagic.entry.ritual.downgrade=Sühne der belasteten Seele guide.bloodmagic.entry.ritual.crystalSplit=Resonanz des facettierten Kristalls +guide.bloodmagic.entry.ritual.portal=Das Tor der Faltung (Englisch) +guide.bloodmagic.entry.ritual.altarBuilder=Die Zusammensetzung des hohen Altars (Englisch) +guide.bloodmagic.entry.ritual.pump=Die Hymne des Siphonierens (Englisch) +guide.bloodmagic.entry.ritual.cobble=Der gefrorene Vulkan (Englisch) +guide.bloodmagic.entry.ritual.ellipsoid=Fokus des Ellipsoids (Englisch) +guide.bloodmagic.entry.ritual.crystalHarvest=Bruch des frakturierten Kristalls (Englisch) +guide.bloodmagic.entry.ritual.forsakenSoul=Versammlung der verlassenen Seelen (Englisch) +guide.bloodmagic.entry.ritual.animalGrowth=Ritual des Schäfers (Englisch) +guide.bloodmagic.entry.ritual.livingEvolution=Ritual der lebenden Evolution (Englisch) +guide.bloodmagic.entry.ritual.upgradeRemove=Ritual der reinigenden Seele (Englisch) +guide.bloodmagic.entry.ritual.fullStomach=Ritual des gesättigten Magens (Englisch) +guide.bloodmagic.entry.ritual.eternalSoul=Ritual der ewigen Seele (Englisch) +guide.bloodmagic.entry.ritual.condor=Anbetung des Condors (Englisch) +guide.bloodmagic.entry.ritual.featheredEarth=Ritual der gefederten Erde (Englisch) +guide.bloodmagic.entry.ritual.grounding=Ritual der Erdung (Englisch) +guide.bloodmagic.entry.ritual.veilOfEvil=Schleier des Bösen (Englisch) +guide.bloodmagic.entry.ritual.wardOfSacrosanctity=Schutz der Unantastbarkeit (Englisch) # Ritual Master Entry Text guide.bloodmagic.entry.ritual.intro.info=Guten Abend. Mein Name ist Magus Arcana. Ich habe über die Jahre viele Gestalten angenommen: ein Dieb und ein Wächter, ein Zauberer und ein Krieger, ein umherwandernder Nomade und sogar ein Politiker. Der Titel, den ich dieser Tage trage ist einer, der sich dem Verständnis der meisten Leute entzieht, bei dessen bloßer Erwähnung Bilder von Brutalität hervorkommen, welche in manchen Fällen wohl verdient, in vielen anderen jedoch schlicht fehlgeleitet sind. Natürlich rede ich davon, ein Blutmagier zu sein, doch meine Freunde nennen mich einfach Magus, während meine Feine mich als den Ritualmeister bezeichnen.\n\tMeine Schüler bedrängen mich nun schon seit Monaten, versuchen mich zu überzeugen, dass ich all meine Abenteuer niederschreibe, in die ich verwickelt war, um sie unter den aufstrebenden Magiern zu verteilen. Ich hatte mich geweigert, aber Tiberius hat es am besten in Worte gefasst: "Auch wenn du selbst nicht den Wert darin sehen kannst, ist es für spätere Generationen doch unbezahlbar, die Feinheiten eines Handwerks von jemanden zu hören, der dieses gemeistert hat. Es spielt keine Rolle wie genau es jemand anderes wiedergibt, wenn man nicht absolutes Vertrauen in die Quelle hat, könnte der Goldsand auch nichts weiter als Schwefel sein." Man konnte sehen, dass er sich zu der Zeit ein wenig mit Alchemie beschäftigt hat, aber da er seit langer Zeit mein erster Student war, tendiere ich dazu, seine Meinung zu respektieren.\n\tNun denn, angehender Blutmagier, der du das Arkane studierst, dass viele noch nicht vollständig begreifen, leihe mir deine Aufmerksamkeit für diese Worte, die es wert sind, befolgt zu werden: das Gebiet, dass du studierst hat viele Aspekte und ohne wohl überlegte Planung wirst du deine Werkzeuge als unzureichend empfinden. Deswegen solltest du sicher stellen, dass du dieses Buch oft zu rate ziehst - Ich habe einen Folianten mit vielen Verzauberungen versehen, sodass es, wann auch immer ich etwas in meiner Meister-Kopie schreiben sollte, sich die Worte für dich verändern werden.\n\tNun lehne dich zurück, entspanne dich und genieße die Lehren eines sehr alten Mannes. Du mögest mehr lernen, als du erhofft hast. @@ -136,7 +153,7 @@ guide.bloodmagic.entry.architect.augmentedCapacity=Rune der erweiterten Kapazit guide.bloodmagic.entry.architect.charging=Aufladungsrune guide.bloodmagic.entry.architect.acceleration=Beschleunigungsrune -//--// needs a better string. Literal translation loses its rhyme and just sounds silly. This one is simply "An Altar from the depths" +# //--// needs a better string. Literal translation loses its rhyme and just sounds silly. This one is simply "An Altar from the depths" guide.bloodmagic.entry.architect.tier3=Ein Altar aus den Tiefen (Stufe 3) # Architect Entry Texts @@ -177,6 +194,7 @@ guide.bloodmagic.entry.architect.peritia.info.1=Bestimmte Aktionen in der Welt b guide.bloodmagic.entry.architect.livingArmour.info.1=Jeder Person in Minecraft, besonders in den neueren Versionen der Welt, wird bewusst, dass eine gute Rüstung einen Unterschied zwischen Leben und Tod bedeutet. Normalerweise wählt man bei der Auswahl einer Rüstung einen statischen Satz von Vorteilen - bietet diese Rüstung mehr Schutz? Bekomme ich die Fähigkeit, zu fliegen, wenn ich das trage? Kann ich wirklich hoch springen oder mich schnell bewegen? Das sind alles gültige Optionen für eine Rüstung, aber man kann nie ein Set bekommen, das genau auf seine Bedürfnisse zugeschnitten ist. Zumindest das dachten die Leute. Ein Set Lebendiger Rüstung ist eine konstruierte Lebensform, die mit einer einfachen Eisenrüstung integriert ist. Wenn es getragen wird, geht es eine symbiotische Beziehung mit dem Benutzer ein - wenn man sich bewegt, bewegt es sich. Wenn man angreift, greift es an. Wenn man isst, spürt es das und kompensiert es. Und genau wie ein normaler menschlicher Körper beginnt es zu wachsen und zu stärken, je nachdem, was man tut, indem man es durch seine Handlungen trainiert.\n\tLass mich ein Beispiel nennen: Wenn du eine neue Rüstung ausrüstest und viel herumläufst, wirst du feststellen, dass du ein Upgrade auf der Brustplatte namens "Schnelle Füße" erhältst - dieses Upgrade bietet eine stufenweise Erhöhung deiner Geschwindigkeit, während die folgenden Stufen einen größeren Schub bringen. Du wirst auch feststellen, dass die "Upgrade-Punkte" jetzt "3/100" lauten - jedes Upgrade erfordert eine Anzahl von Upgrade-Punkten, und die Brustplatte hat eine maximale Anzahl von Punkten, die sie halten kann. Wenn ein Upgrade, das du erhalten kannst, nicht mit der Anzahl der kostenlosen Upgrade-Punkte erhältlich ist, die du hast, kann es nicht erworben werden. Behalte im Hinterkopf, dass die Lebende Rüstung nur trainiert wird, wenn du eine vollständige Rüstung anhast, und die Effekte der Rüstung nur wirksam werden, wenn eine vollständige Rüstung verwendet wird.\n\tDie maximale Anzahl von Aufrüstungspunkten kann auf verschiedene Weisen verändert werden. Eine von ihnen ist es, alchemistische Zubereitungen zu kreieren, die die Bindungen zwischen dem Benutzer und der Lebenden Rüstung stärken und die Anzahl der Punkte, die man auf einer bestimmten Ausrüstung haben kann, enorm erhöhen. Ein Beispiel ist der "Trank der Engelsmacht", der die maximale Punktzahl auf 200 erhöht. Informationen über diese Gebräue und wie man sie herstellt, können in "Der Alchemist" gefunden werden. guide.bloodmagic.entry.architect.upgradeTome.info.1=Manchmal ist man mit den Aufrüstungen, die man für die Lebende Rüstung erhalten hat, nicht zufrieden. Mit dem Ritual "Klang der reinigenden Seele" (weitere Informationen unter "Der Ritualmeister") können alle Aufrüstungen von der Rüstung entfernt und in Form von "Thesen der Lebenden Rüstung" erhalten werden. Klicke mit der rechten Maustaste darauf, während du einen kompletten Satz Lebende Rüstung trägst (und Platz für die Aufrüstung hast), um die Eigenschaft zu deiner Rüstung hinzuzufügen. Diese Thesen können auch in einem Amboss kombiniert werden - wenn man zwei der exakt gleichen Thesen (gleiches Upgrade, gleiche Stufe) in einem Amboss kombiniert, kann man eine einzelne These erhalten, die eine Stufe höher ist. Wenn du also Schnelle Füße II mit einem anderen Schnelle Füße II kombinierst, erhälst du Schnelle Füße III. Diese These kann dann in gleicher Weise auf die Rüstung aufgebracht werden. guide.bloodmagic.entry.architect.teleposer.info.1=Der Teleposer ist ein Gerät, das nicht nur Objekte, sondern auch Entitäten teleportiert. Um einen Teleposer einzurichten, benötigst du mindestens zwei Teleposer und einen Telepositionsfokus. Einer der Teleposer fungiert als das Ziel und der andere als der Anfang. Um das einzurichten, musst du zuerst den Fokus an dich binden, indem du mit der rechten Maustaste darauf klickst. Dann klickst du mit der rechten Maustaste auf den Ziel-Teleposer, um seine Position (und Dimension) zu speichern, und fügst dann den Fokus in den beginnenden Teleposer ein, indem du mit der rechten Maustaste auf den Teleposer ohne Fokus in deiner Hand klickst und den Fokus in das GUI platzierst.\n\tMit einem starken Redstonesignal kann ein Teleposer aktiviert werden, wodurch die Teleposer alle Entitäten und Blöcke tauschen, vorausgesetzt, dass ein Teleposer an der Zielposition existiert.\n\tDu kannst entweder einen Teleposer haben, der einen Fokus hat, beide Teleposer haben Fokusse, die miteinander verbunden sind, oder du kannst einen Teleposer haben, der mit einem anderen Teleposer verbunden ist, der nicht mit ersteren verbunden ist, also abhängig davon, wie du sie einrichtest, kannst du sehr komplizierte Systeme haben.\n\tBeachte, dass der Teleposer derzeit nur die Blöcke und Entitäten vertauscht, die sich direkt über dem Block befinden, und die Größe hängt vom Fokus ab - der T1-Fokus vertauscht nur den Block über dem Teleposer, der T2-Fokus vertauscht einen 3x3x3-Bereich über dem Teleposer usw. +guide.bloodmagic.entry.architect.boundBlade.info.1=The Bound Blade is an artifact from the past, a blade that is created by binding an entity to a sword in the same process that creates the Living Armour. It should be noted that this, as well as the Bound Tools, will change in later versions of the mod.\n\tThe sword has an active and inactive mode, which can be toggled by shift-right clicking. The sword does not deal any damage at all when inactive, but while active there will be a small LP drain over time. Likewise, when you damage a mob you will drain LP from your network. Sure, you have a lot of damage, but it may kill you!\n\tWhen a monster is killed, the monster has a chance to drop a Weak Blood Shard. These shards are used in order to upgrade your Blood Altar to a T4 altar. guide.bloodmagic.entry.architect.boundTool.info.1=Ähnlich wie bei der Gebundenen Klinge werden diese gebundenen Werkzeuge (Spitzhacke, Axt und Schaufel) irgendwann modifiziert, um besser in die Mod zu passen. Wie bei der Klinge haben die Werkzeuge einen aktiven und einen inaktiven Modus, zwischen denen man durch Klicken mit der rechten Maustaste umschalten kann.\n\tEtwas, das diese Werkzeuge haben, ist etwas, das man "Beast Mode" nennt. Wenn du die rechte Maustaste gedrückt hältst, kannst du das Werkzeug aufladen und einen mächtigen Spalt freisetzen, der sofort die Blöcke zerbricht, die von dem gegebenen Werkzeug gebrochen werden können - wenn es vollständig aufgeladen ist, ist das ein 11x11x11 Würfel über dir zu einem Preis von 10kLP. Sei vorsichtig mit diesem mächtigen Werkzeug, da es dein letztes sein kann! guide.bloodmagic.entry.architect.weakShard.info.1=Alles, was Leben hat, kann die ätherischen Verbindungen haben, die als das Seelen-Netzwerk bekannt sind. Wie aus euren Erfahrungen hervorgeht, können auch nicht-lebende Dinge ein Seelen-Netzwerk haben, wie Siegel und Rituale; aber diese Verbindungen sind die stärksten in den Geschöpfen und natürlich den Menschen. Wenn du ein Monster mit einer Gebundenen Klinge angreifst, wird ihr Seelen-Netzwerk vorübergehend hart und ein Stück davon wird nach dem Tod bleiben. Dieses Stück hat die Form eines Schwachen Blutsplitters, so benannt nach der Tatsache, dass sein rötlicher Farbton der Farbe der Schwachen Blutkugel entspricht. An diesem Punkt ist es nicht klar, ob es stärkere Formen von Blutsplittern gibt, aber man kann sagen, dass dies sehr hilfreich wäre, um die Macht des eigenen Seelen-Netzwerks zu erhöhen. guide.bloodmagic.entry.architect.masterOrb.info.1=Eine der Anwendungen für diese erhöhte Affinität zum Seelennetzwerk ist die Verwendung des Schwachen Blutsplitters in einer neuen Blutkugel: der Blutkugel des Meisters. Diese Kugel hat eine maximale Kapazität von 1 Million LP und ermöglicht so dem Besitzer den Zugriff auf mächtigere Gegenstände und Rituale. Vielleicht sind Meteore doch in Reichweite... @@ -224,8 +242,8 @@ guide.bloodmagic.entry.demon.petty.info.1=Ich ging auf eines meiner nun allnäch guide.bloodmagic.entry.demon.petty.info.2=Wie auch immer, es dauerte eine Weile, um Materialien zu finden, die am ehesten mit dem dämonischen Willen in Resonanz kamen, um ihn besser zu speichern. Lapis scheint der am leichtesten verfügbare Leiter dieser Energie zu sein, der als Weg für den zu kanalisierenden Willen dient. Nachdem ich etwas Redstone als Abschirmung gegen elektrische Felder in der Luft hinzugefügt hatte (zwei Energien zusammengenommen scheinen katastrophale Auswirkungen zu haben, zumindest sagte Magus das), Gold als Dämpfungsmittel und Glas als einfaches Gehäuse, gelang es mir, einen sehr einfaches "Juwel des Tartaros" zu schaffen. Das heißt "ein Juwel aus der Unterwelt, Tartaros." Nach weiteren Tests fand ich heraus, dass dieses Juwel bis zu einer Willensqualität von 64 halten könnte. Als ich danach versuchte, den dämonischen Willen aufzuheben, schien dieser direkt in den Edelstein zu gehen, wenn er nicht voll war - danach schien der Wille einfach... zu verschwinden. Praktisch für meinen Rucksack, aber sonst ein Rätsel. Ich erfuhr auch, dass, wenn ich den Edelstein in meiner Hand halte und mich konzentriere (Rechtsklick), ungefähr 10% der maximalen Kapazität des Edelsteins in andere Edelsteine fließen würde, die ich auf meiner Person hatte. Ich denke, diese letzte Eigenschaft ist sehr hilfreich, besonders wenn wir andere, mächtigere Juwele entdecken sollten. guide.bloodmagic.entry.demon.sword.info.1=Meine Fallen haben sich wieder verheddert.\n\tEs scheint keine Rolle zu spielen, wie sehr ich versuche, das Design zu verbessern, die rudimentäre Schlinge scheint nie perfekt zu funktionieren. Es verheddert sich nur die meiste Zeit, und wenn ich es endlich schaffe, einen Zombie damit zu treffen, ist es wahrscheinlicher, dass es nicht funktioniert als dass es tut, was es soll. Um mich davon abzuhalten, mir selbst die Haare auszureißen, ging ich wieder zur Schmiede und machte mich sofort an die Arbeit.\n\tNun, nicht sofort, schließlich musste ich zuerst noch die Asche entfernen. guide.bloodmagic.entry.demon.sword.info.2=Ich fusionierte die Fähigkeit des Winzigen Juwels des Tartaros, dämonischen Willen zu halten mit einem eisernen Schwert und schuf eine Klinge, die.... sehr stumpf war und kaum mehr Schaden anrichtete als meine Faust. Ich war eigentlich sehr enttäuscht über das Ergebnis, denn es dauerte eine lange Zeit, mit der Schmiede herumzuexperimentieren, sodass sie durch die Belastung, ein Winziges Tatarisches Juwel als Energiequelle zu nutzen, nicht überhitzte.\n\tDoch sobald ich mein Tartarisches Juwel aufhob, begann das Schwert mit einer neuen Energie zu leuchten. Es scheint, dass je höher die Menge des dämonischen Willens, die ich an meiner Person habe, desto mehr Schaden ich mit dem Schwert anzurichten scheine und desto mehr Dämonischer Wille kann von den Kreaturen absorbiert werden. Wann immer du kein Juwel hast, ist die Quantität des Willens sehr.... gering.\n\tNach einem kleinen Test kam ich zu einer anderen Erkenntnis: Je nachdem, was ich töte, bekomme ich unterschiedliche Mengen von Willen. Es scheint proportional zur Menge der maximalen Gesundheit, die das Monster hat - eine Spinne, da sie eine maximale Gesundheit von 8 Herzen hat, gibt 80%% des Willens eines Zombie, der 10 Herzen hat. Das liegt wahrscheinlich daran, dass diese Monster mehr Willen benötigen, um zu animieren. Ich sollte das für spätere Erkenntnisse beachten. -guide.bloodmagic.entry.demon.lesser.info.1=Ich habe mich heute mit Tiberius unterhalten und einige seiner Projekte besprochen. Ich muss sagen, wenn wir über seine Forschung sprechen, scheint es, dass er immer weiter und weiter und weiter geht! Wie auch immer, eine der jüngsten Erfindungen, über die er sprechen wollte, waren seine Siegel: Bis jetzt ist es ihm gelungen, ein Wassersiegel und ein Lavasiegel zu erschaffen, wobei er die Höllenfeuerschmiede benutzte, die ich schließlich für ihn konstruiert habe, um sie zu erschaffen. Ich war mir nicht ganz sicher, wie er sie tatsächlich hergestellt hat - ich wusste, dass er experimentierte, indem er einige Zutaten nahm und sie in der Schmiede mit dem Weinstein als Katalysator kombinierte, aber ich habe ihn noch nicht aktiv experimentieren sehen. Nun, ich habe endlich einen Einblick bekommen, wofür er diese verdammte Asche benutzt.\n\tMal sehen, ob ich genau nachahmen kann, was er gesagt hat. Ahem. "Durch die Verwendung des Dämonenwillens, der in diesen Edelsteinen enthalten ist, um die Inhaltsstoffe umzuwandeln, entsteht eine Reaktion zwischen Dingen, die normalerweise nichts tun, wenn sie kombiniert werden. Indem ich diese erzwungene Synergie nutze, bin ich in der Lage, mehrere arkane Symbole in Muster einzuschreiben, die die Energie zu lenken, die ich selbst hinzufüge, um die gewünschte Aufgabe zu erfüllen." Obgleich es niedergeschrieben nicht sehr anschaulich ist, stell dir sich vor, wie ich das sage, während ich eine Brille den Nasenrücken hochschiebe. Ich bin mir nicht sicher, ob er normalerweise so ist, aber ich schwöre, er wird komplett... wissenschaftlich, wenn er mir die Dinge erklärt. Nach der zugegebenermaßen auffälligen Demonstration kam er dann zum Kern der Diskussion. "Wenn ich versuche, diesen Prozess mit einigen fortschrittlicheren Materialien zu replizieren, scheint es, dass die Reagenzien... explodieren, wenn sie der Alchemischen Anordnung hinzugefügt werden. Sie scheinen sehr instabil zu sein. Ich denken, dass die Zutaten nicht richtig miteinander verschmolzen werden - vielleicht ist nicht genug Energie in der Schmiede, um sie richtig zu verschmelzen."\n\tNachdem ich ein paar Minuten darüber nachgedacht habe, machte ich an die Arbeit - wie ich in einem früheren Eintrag erwähnt habe, dachte ich, dass ein stärkeres Juwel erforderlich wäre, aber ich habe immer noch nicht genau herausgefunden, wie ich das auf elegante Weise machen könnte. Also beschloss ich, dass ein brachialer Ansatz dafür ausreichen würde! -guide.bloodmagic.entry.demon.lesser.info.2=Ich nahm einen Block Lapis, einen Block Redstone und einen Diamanten sowie einen leeres winziges Tartarisches Juwel, das ich herumliegen hatte - Teil eines vergangenen Experiments, das.... nicht gerade gut lief. Alles, was ich dazu sagen kann, ist, dass ich überrascht bin, dass Magus Löcher in einer festen Betonwand einfach verschwinden lassen kann. Dann kombinierte ich diese vier Gegenstände in der Höllenfeuerschmiede mit einem gefüllten winzigen Juwel, um als Energiequelle zu dienen - ein Minimum von 60 Wille scheint erforderlich zu sein. Nach ein wenig Mühe, eine optimale Anordnung zu finden, setzte ich sie dann zusammen und beobachtete, wie der leere Weinstein innerhalb der Schmiede zu wachsen begann.\n\tNur nebenbei, ich versuchte, einen Block Gold statt einen Diamanten zu nutzen, um das Juwel wachsen zu lassen, jedoch scheint es, dass eine weitere Kristallstruktur vorteilhafter ist.\n\tDieses neue, "Geringe Juwel des Tataros" scheint eine wesentlich höhere Kapazität zu besitzen, indem es fähig ist, bis zu 256 Rohen Willen halten zu können. Hoffentlich ist das genug, um Tiberius' Bedarf an großen Mengen an Willen für eine Weile zu stillen. Aber leider scheint es, dass ich dieses Juwel auffüllen muss. Eine weitere lange Nacht liegt vor mir! +guide.bloodmagic.entry.demon.lesser.info.1=Ich habe mich heute mit Tiberius unterhalten und einige seiner Projekte besprochen. Ich muss sagen, wenn wir über seine Forschung sprechen, scheint es, dass er immer weiter und weiter und weiter geht! Wie auch immer, eine der jüngsten Erfindungen, über die er sprechen wollte, waren seine Siegel: Bis jetzt ist es ihm gelungen, ein Wassersiegel und ein Lavasiegel zu erschaffen, wobei er die Höllenfeuerschmiede benutzte, die ich schließlich für ihn konstruiert habe, um sie zu erschaffen. Ich war mir nicht ganz sicher, wie er sie tatsächlich hergestellt hat - ich wusste, dass er experimentierte, indem er einige Zutaten nahm und sie in der Schmiede mit dem Tartarischen Juwel als Katalysator kombinierte, aber ich habe ihn noch nicht aktiv experimentieren sehen. Nun, ich habe endlich einen Einblick bekommen, wofür er diese verdammte Asche benutzt.\n\tMal sehen, ob ich genau nachahmen kann, was er gesagt hat. Ahem. "Durch die Verwendung des Dämonenwillens, der in diesen Edelsteinen enthalten ist, um die Inhaltsstoffe umzuwandeln, entsteht eine Reaktion zwischen Dingen, die normalerweise nichts tun, wenn sie kombiniert werden. Indem ich diese erzwungene Synergie nutze, bin ich in der Lage, mehrere arkane Symbole in Muster einzuschreiben, die die Energie zu lenken, die ich selbst hinzufüge, um die gewünschte Aufgabe zu erfüllen." Obgleich es niedergeschrieben nicht sehr anschaulich ist, stell dir sich vor, wie ich das sage, während ich eine Brille den Nasenrücken hochschiebe. Ich bin mir nicht sicher, ob er normalerweise so ist, aber ich schwöre, er wird komplett... wissenschaftlich, wenn er mir die Dinge erklärt. Nach der zugegebenermaßen auffälligen Demonstration kam er dann zum Kern der Diskussion. "Wenn ich versuche, diesen Prozess mit einigen fortschrittlicheren Materialien zu replizieren, scheint es, dass die Reagenzien... explodieren, wenn sie der Alchemischen Anordnung hinzugefügt werden. Sie scheinen sehr instabil zu sein. Ich denken, dass die Zutaten nicht richtig miteinander verschmolzen werden - vielleicht ist nicht genug Energie in der Schmiede, um sie richtig zu verschmelzen."\n\tNachdem ich ein paar Minuten darüber nachgedacht habe, machte ich an die Arbeit - wie ich in einem früheren Eintrag erwähnt habe, dachte ich, dass ein stärkeres Juwel erforderlich wäre, aber ich habe immer noch nicht genau herausgefunden, wie ich das auf elegante Weise machen könnte. Also beschloss ich, dass ein brachialer Ansatz dafür ausreichen würde! +guide.bloodmagic.entry.demon.lesser.info.2=Ich nahm einen Block Lapis, einen Block Redstone und einen Diamanten sowie einen leeres winziges Tartarisches Juwel, das ich herumliegen hatte - Teil eines vergangenen Experiments, das.... nicht gerade gut lief. Alles, was ich dazu sagen kann, ist, dass ich überrascht bin, dass Magus Löcher in einer festen Betonwand einfach verschwinden lassen kann. Dann kombinierte ich diese vier Gegenstände in der Höllenfeuerschmiede mit einem gefüllten winzigen Juwel, um als Energiequelle zu dienen - ein Minimum von 60 Wille scheint erforderlich zu sein. Nach ein wenig Mühe, eine optimale Anordnung zu finden, setzte ich sie dann zusammen und beobachtete, wie das leere Tartarische Juwel innerhalb der Schmiede zu wachsen begann.\n\tNur nebenbei, ich versuchte, einen Block Gold statt einen Diamanten zu nutzen, um das Juwel wachsen zu lassen, jedoch scheint es, dass eine weitere Kristallstruktur vorteilhafter ist.\n\tDieses neue, "Geringe Juwel des Tataros" scheint eine wesentlich höhere Kapazität zu besitzen, indem es fähig ist, bis zu 256 Rohen Willen halten zu können. Hoffentlich ist das genug, um Tiberius' Bedarf an großen Mengen an Willen für eine Weile zu stillen. Aber leider scheint es, dass ich dieses Juwel auffüllen muss. Eine weitere lange Nacht liegt vor mir! guide.bloodmagic.entry.demon.reactions.info=Ich bin heute in einem Krankenbett aufgewacht und habe Schmerzen. Ich öffnete die Augen und sah das dumpfe Magenta, das die Decke des "Mächtige Flüche"-Flügels des Krankenhauses in Veteres bildete, der unserem Dorf am nächsten gelgenen Stadt. Ich war nicht gerade beunruhigt über diese Information: es hat mich so verwirrt, dass ich irgendwie hier gelandet bin, während ich scheinbar nur mit Kratzern und blauen Flecken bedeckt war, plus einem einfachen Gips auf meinem linken Bein. Jemand muss einen "Ossa Fracta"-Fluch auf mich geworfen haben oder so, denn es könnte nur ein einfacher gebrochener Knochen sein! Als Magus mit einer der Schwestern mit einem ernsten Gesicht reinkam, wusste ich, dass es etwas drastischeres war. Anscheinend habe ich einen kleinen Rückschlag mit einem meiner Experimente mit dem neuen Geringen Tatarischen Juwel erlitten und eine kleine, aber kräftige Explosion ausgelöst. So viel konnte ich leicht verstehen, aber das war es nicht: Die Mischung aus Obsidian, Eisen und Diamant, die ich benutzte, beschichtete meinen linken Unterschenkel und bildete eine starre Schale, die nicht entfernt werden konnte. Der Gips, den ich auf meinem Bein hatte, war eigentlich kein Gips, sondern eine Art Runenmatrix, die die hellblaue Schale bedeckte. Ich fragte, was Magus dachte, obwohl ich mir ziemlich sicher war, was passiert war. "Ich glaube", sagte er und blickte auf die Krankenschwester, die ihm aufmerksam zuhörte, bevor sie mich ansah, "dass es einfach eine Art Rückstand ist, der auf Diamanten basiert, was der Hauptgrund dafür ist, dass wir ihn nicht entfernen können. Es ist auch mit etwas... jenseitiger Energie verwebt, was der Hauptgrund dafür ist, dass du hier bist, anstatt in einem Bett in der örtlichen Klinik - das Konglomerat ist seit dem Eldritch-Vorfall ziemlich streng in Bezug auf unbekannte Energie, die direkt mit Menschen in Verbindung ist, also mussten wir sicherstellen, dass es keine Probleme gab. "Ich sehe..." Normalerweise kümmert sich Magus nicht viel um Formalitäten wie z.B. sicherzustellen, dass das Konglomerat über unbekannte Energien informiert ist - ich experimentiere schon eine ganze Weile mit Dämonischen Willen, und es ist nicht so, dass das Konglomerat an unsere Tür klopft, um diese Magie registrieren zu lassen. Ich werde hier nicht viel ins Detail gehen, da ich nicht sehr versiert in der Politik bin, aber ich weiß, dass Magus nur sparsam daran teilnimmt. Das bedeutete, dass die Macht dieses Willens Magus sehr beunruhigte, vielleicht durch einige seiner vergangenen Erfahrungen...?\n\t "Ah gut, genug davon im Moment", sagte Magus und krempelte die Ärmel seiner Roben hoch. "Ich habe versucht, die Schale zu brechen, als ich sie zum ersten Mal sah, offensichtlich nachdem ich überprüft hatte, was sie war. Letztes Mal hatte es keine Wirkung, aber jetzt..." Es gab eine glühende Hitze auf meinem linken Bein, begleitet von einem blendenden roten Licht, als Magus seine Hände auf die blaue Schale schröpfte. Nach einem Moment, der sich wie eine Ewigkeit anfühlte, aber nur ein paar Sekunden gedauert haben muss, begann die Schale zu reißen und zu brechen und zerfiel. Ehrlich gesagt, es war irgendwie enttäuschend. versuchte ich aufzustehen, aber Magus schob mich mit einem kleinen Stoß zurück ins Bett. "Bella, du musst bleiben und dich ausruhen. Du kannst später mit deiner Forschung an den Juwelen fortfahren." Ich war zunächst verärgert, aber das ging schnell vorbei, da ich viel Zeit zum Nachdenken hatte. Der einzige Grund, warum Magus nicht in der Lage war, genau das Gleiche vorher zu tun, war wahrscheinlich, dass ich nach der Explosion immer noch mein Tartarisches Juwel bei mir hatte. Was auch immer mit meinem Bein geschah, musste direkt an den Dämonischen Willen gebunden sein, und sobald mein Juwel genommen wurde, konnte die Schale entfernt werden. Es brachte mich zum Nachdenken... guide.bloodmagic.entry.demon.sentientGem.info.1=Nach ein paar Tagen "dringend nötiger Bettruhe", die von Magus vorgeschrieben und durchgesetzt wurde, beschloss ich, ein wenig zu recherchieren, vor allem über die empfindsame Ausrüstung, die ich bisher gemacht habe. Es gibt einfach so viel, dass ich nicht über das empfindsame Schwert und den Dämonenwillen im Allgemeinen Bescheid weiß. Sicher, wir wissen etwas von der Theorie, aber wenn man bedenkt, dass Magus und ich diejenigen waren, die die Theorie entwickelt haben, ist es schwer zu sagen, was genau sie ist. Magus sagte mir, dass er immer, wenn er einen Lehrling nimmt, darauf besteht, dass sie neben der Forschung, die er betreibt, eine andere Form der Magie lernen müssen. Tiberius bot mir an, Botanik zu lernen, aber ich spottete über die Idee - ein paar Blumen werden mir nicht viel helfen, wenn ich gegen Dämonen kämpfen muss! guide.bloodmagic.entry.demon.sentientGem.info.2=Das Juwel der Empfindsamen Rüstung ist ein umschaltbarer Gegenstand, mit dem du deine empfindsame Rüstung an- und ablegen kannst. Wenn du mit der rechten Maustaste auf das Juwel klickst, während du mindestens 16 Dämonenwille in deinem Inventar hast, wird deine Rüstung durch einen Satz empfindsame Rüstung ersetzt, die alle Verzauberungen der ersetzten Rüstung kopiert - wenn du das Juwel wieder deaktivierst, erhältst du deine ursprüngliche Rüstung zurück. Das funktioniert auch, wenn du überhaupt keine Rüstung anhast. Die empfindsame Rüstung wirkt anfangs wie eine einfache eiserne Rüstung, die keine zusätzlichen Fähigkeiten außer Schutz bietet. Ähnlich wie andere empfindsame Werkzeuge bietet die Rüstung jedoch mehr Schutz, wenn du mehr Dämonenwille in deinem Besitz hast. Dies macht den Schutz wirklich mächtig, wenn man eine große Menge an Dämonenwille angesammelt hat. Der Nachteil dabei ist, dass jeder Treffer, den du nimmst, ein kleines Stück Dämonenwille aus deinen tatarischen Juwelen extrahiert, und wenn du zu niedrig wirst, wird deine Rüstung wieder in ihre ursprüngliche Form zurückkehren. Könnte unangenehm werden! @@ -234,7 +252,7 @@ guide.bloodmagic.entry.demon.aura.info=Wenn ein Wesen normal getötet wird, verd guide.bloodmagic.entry.demon.types.info=Bis jetzt ist die einzige Art von Dämonenwille, die wir besprochen haben, der rohe Wille. Wie der Name schon sagt, ist es die roheste und unverfälschteste Form des Willens, die es gibt, aber das bedeutet nicht, dass es rein ist. Tatsächlich nimmt Dämonischer Wille viele verschiedene Formen an: Roh ist der Typ, mit dem wir es normalerweise zu tun haben, aber es gibt auch korrosiv, zerstörerisch, rachsüchtig und standhaft. Der rohe Wille besteht aus einer Mischung aller vier dieser Typen und vielleicht mit anderen, noch unentdeckten Typen, aber wenn man sie einmal in diese verschiedenen Willenstypen aufgeteilt hat, scheint es unmöglich, sie zu rekombinieren.\n\tEs ist noch nicht klar, ob diese verschiedenen Typen von Willen aus verschiedenen Quellen stammen, aber wir kennen den Prozess der Erzeugung dieser verschiedenen Typen von Willen. Das Ritual "Resonanz des facettierten Kristalls" kann einen rohen Willenskristall in seine reinen Teile zerlegen, mehr dazu im entsprechenden Eintrag in "Der Ritualmeister". Ein Gerät, um rohe Willenskristalle zu erhalten, ist der Dämonenkristallisierer, dessen Eintrag weiter unten zu finden ist. Es mag mehr Arten von Willen geben, aber sie sind entweder nicht rein genug oder können einfach nicht in dieser Form erschaffen werden.\n\tKorrosiv repräsentiert den Wunsch, alle Dinge um sich herum zu zerstören, entweder mit Säure oder durch zermalmende Kraft. Wer diesen Willen beherrscht, kann lähmende Status-Effekte ausüben und ist immun gegen schreckliche Gifte.\n\tRachsüchtig kann als das Verlangen angsehen werden, ein Ziel ohne Ermüdung zu jagen. Normalerweise kann dies entweder als eine erhöhte Geschwindigkeit des Körpers gesehen werden, die Beute zu suchen, oder um sicherzustellen, dass ein Ziel nicht in der Lage ist, zu entkommen, während es ständig angegriffen wird.\n\tZerstörerisch, wie du wahrscheinlich ahnst, ist pure Kraft. Wenn dieser Wille richtig eingesetzt wird, können Angriffsstärke und allgemeine körperliche Fähigkeiten gewonnen werden. Es kann auch verwendet werden, um Dinge zu zerquetschen und zu zerschlagen, wenn es in anderen Anwendungen verwendet wird.\n\tStandhaft ist das Verlangen, sich von Schaden zu schützen. In den meisten Fällen sind die Herren dieses Willens das defensive Bollwerk der Gruppe, das in der Lage ist, mächtigen Angriffen standzuhalten und sie nicht einmal zu spüren. Wenn du am Leben bleiben musst, durch Rüstung oder durch Rituale, ist dies eine Wahl, die in Betracht gezogen werden sollte. guide.bloodmagic.entry.demon.crucible.info=Der Dämonenschmelztiegel ist ein Gerät, das in der Lage ist, den Dämonenwille in einem tartarischen Juwel und anderen Gegenständen zu verbrennen, um ihn in die Aura des Chunks, in dem er sich befindet, zu injizieren. Es gibt verschiedene Möglichkeiten, den Tiegel zu benutzen: Eine der einfachsten Möglichkeiten ist es, ein tartarisches Juwel in den Tiegel zu legen, indem man mit der rechten Maustaste darauf klickt und ein solches Juwel in der Hand hält. Der Tiegel entleert dann den Willen aus dem Juwel, bis entweder die Aura mit dieser Art von Willen gesättigt ist (standardmäßig maximal 100) oder bis das Juwel leer ist.\n\tEin anderer Modus ist, das enthaltene Juwel zu benutzen, um den Willen aus der Aura zu ziehen - dies geschieht, indem man ein starkes Redstonesignal an den Tiegel anlegt und dann wird das enthaltene Juwel versuchen, so viel Willen wie möglich zu entziehen.\n\tZu guter Letzt kann ein einzelnes Stück dämonischen Willens verbrannt werden, solange die Aura genügent Platz bietet. Ein Beispiel dafür ist ein Willenskristall, der einen Wert von 50 hat. guide.bloodmagic.entry.demon.crystallizer.info=Wie zuvor besprochen, ist die Dämonen-Aura die ätherische Manifestation des Dämonenwillens, und die Substanz, die man erhält, wenn man einen Mob tötet, ist dessen physische Manifestation. Der Dämonenkristallisierer fungiert als Ankerpunkt für den Dämonenwillen in der Aura, sodass sich dieser daran physisch manifestieren kann und verwandelt den ätherischen Willen wieder in eine physische Form als Kristalle.\n\tSicher wundert es dich, warum man den Willen nicht einfach aus einem tartarischen Juwel in einen Kristall formen kann. Denn indem wir den Willen in seine ätherische Form transformieren, reinigen wir ihn und erlauben dem Willen, seinen normalen Betrieb wieder aufzunehmen - denke daran, dass wir die Programmierung des Willens einfrieren, wenn wir ein Monster mit Dämonenwillen töten, so dass es nicht tun kann, wozu es ausgesandt wurde. Durch die Umwandlung in die ätherische Form in der Aura wird der Wille aktiver, und das ist der Wille, der vom Kristallisierer ergriffen wird. Schaut es einfach nicht komisch an.\n\tDamit der Dämonenkristallisierer funktioniert, muss er in einem Chunk mit einem hohen Anteil an Dämonen-Willen (80) eines bestimmten Typs stehen. Nach einer gewissen Zeit wird er den Willen der Aura verbrauchen, um eine Gruppe Dämonenkristalle mit einem einzigen Turm zu erschaffen. Es gibt zwei Möglichkeiten, wie der Kristallisierer wirken kann: Er kann einen Kristall aus einem bestimmten Willenstyp (korrosiv, zerstörerisch, rachsüchtig und unerschütterlich) bilden, wenn es genug Willen dieses bestimmten Typs gibt, oder er wird den rohen Willen aus der Aura nehmen, um einen Kristall zu erschaffen. In früheren Inkarnationen des Geräts war es möglich, rohen Willen aus der Aura in andersartige Kristalle zu verwandeln. Das ist jedoch nicht mehr der Fall: Ihr könnt immer noch neue Türme eines bestimmten, angestrebten Willens erschaffen, wenn es genug davon in der Aura gibt, aber ihr müsst andere Mittel suchen, um die vielen Aspekte vom rohen Willen zu trennen. Siehe den Eintrag "Resonanz des facettierten Kristalls" in "Der Ritualmeister" für weitere Details. -guide.bloodmagic.entry.demon.cluster.info=Der Dämonen-Kristallhaufen kann entweder von einem Dämonen-Kristallisator oder in der Höllenfeuer-Schmiede mit Dämonen-Will-Kristallen erschaffen werden. Handwerkliche Cluster können auf jeder festen Oberfläche, wie z.B. dem Boden, den Wänden und den Decken platziert werden. Es gibt maximal sieben Türme auf dem Kristall, wenn er ausgewachsen ist, und wenn er mit einer Spitzhacke gebrochen wird, wird er die Türme als Dämonen-Will-Kristalle fallen lassen. Wenn du jedoch mit der rechten Maustaste auf den Cluster klickst, wenn du einen Weinstein mit mehr als 1024 rohem Willen in ihm hast, kannst du einen einzelnen Turm aus dem Cluster abbrechen, ohne den Cluster selbst zu brechen; dies wird niemals den Hauptturm aus dem Cluster brechen.\n\tWenn der Cluster zu seinen eigenen Geräten zurückkehrt, wird er einen Willen des gleichen Typs aus der Aura absaugen, um sich langsam zu entwickeln. Es gibt zwei Rituale, die benutzt werden, um diese Kristalle zu züchten und zu ernten: die "Versammlung der Verlassenen Seelen" und der "Riss des gebrochenen Kristalls ". Um herauszufinden, wie man sie benutzt, finde diese in "Der Ritualmeister". +guide.bloodmagic.entry.demon.cluster.info=Der Dämonen-Kristallhaufen kann entweder von einem Dämonen-Kristallisator oder in der Höllenfeuer-Schmiede mit Dämonen-Will-Kristallen erschaffen werden. Handwerkliche Cluster können auf jeder festen Oberfläche, wie z.B. dem Boden, den Wänden und den Decken platziert werden. Es gibt maximal sieben Türme auf dem Kristall, wenn er ausgewachsen ist, und wenn er mit einer Spitzhacke gebrochen wird, wird er die Türme als Dämonen-Will-Kristalle fallen lassen. Wenn du jedoch mit der rechten Maustaste auf den Cluster klickst, wenn du ein Tartarisches Juwel mit mehr als 1024 rohem Willen in ihm hast, kannst du einen einzelnen Turm aus dem Cluster abbrechen, ohne den Cluster selbst zu brechen; dies wird niemals den Hauptturm aus dem Cluster brechen.\n\tWenn der Cluster zu seinen eigenen Geräten zurückkehrt, wird er einen Willen des gleichen Typs aus der Aura absaugen, um sich langsam zu entwickeln. Es gibt zwei Rituale, die benutzt werden, um diese Kristalle zu züchten und zu ernten: die "Versammlung der Verlassenen Seelen" und der "Riss des gebrochenen Kristalls ". Um herauszufinden, wie man sie benutzt, finde diese in "Der Ritualmeister". guide.bloodmagic.entry.demon.pylon.info=Wie ihr vielleicht wisst, bleibt die Dämonen-Aura in ihrem eigenen Chunk, wenn es keine äußeren Einflüsse gibt. Nun, das ist einer dieser Einflüsse. Der Dämonenpylon fungiert als Leuchtfeuer für den Willen in der Aura und zieht den Willen aus den benachbarten Chunks (die Chunks, die in den vier Himmelsrichtungen direkt daneben liegen, nicht diagonal) in seinen Chunk. Der Pylon wird versuchen, den Willen in seinem Chunk mit seinem Nachbarn auszugleichen, so dass der Chunk des Pylons für jeden Willenstyp so viel Willen hat wie sein höchster Nachbar. Dieser Prozess geschieht jedoch nur in eine Richtung: Wenn der benachbarte Teil weniger Wille hat als der Teil des Pylons, wird der Wille nicht auf die Nachbarn übertragen. guide.bloodmagic.entry.demon.gauge.info=Um zu sagen, wie viel Wille du in einem bestimmten Chunk hast, brauchst du einen Dämonischen Auramesser. Wenn sich dieser in deinem Inventar befindet, zeigt die Anzeige den Willen in dem Chunk an, welcher auf fünf Balken oben links auf dem Bildschirm abgebildet wird. Wie viel es genau ist, kann an der Verschiebung erkannt werden; rechts neben den Balken erscheinen Zahlen, die den Betrag auf die nächste ganze Zahl gerundet darstellen. From 24b3552b60d96f8468f1826cdbedc3d472a16e65 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:50:21 +0200 Subject: [PATCH 332/493] Guide capacity recipe, rearranged some entries (#1641) * Fix meta ID's (recipes shown) in the guide book for Displacement and Capacity * Rearranged topics to be closer to a natural progression. --- .../compat/guideapi/book/CategoryAlchemy.java | 31 +++--- .../guideapi/book/CategoryArchitect.java | 105 +++++++++--------- 2 files changed, 65 insertions(+), 71 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index 307cc083..f0b66b63 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.util.helper.RecipeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; @@ -63,6 +63,20 @@ public class CategoryAlchemy speedPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "speed" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "speed"), new EntryText(speedPages, TextHelper.localize(keyBase + "speed"), true)); + List buffPages = new ArrayList<>(); + + buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "buff"), new EntryText(buffPages, TextHelper.localize(keyBase + "buff"), true)); + + List fastMinerPages = new ArrayList<>(); + + PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner"); + if (fastMinerRecipePage != null) { + fastMinerPages.add(fastMinerRecipePage); + } + fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info"), 370)); + entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); + List updraftPages = new ArrayList<>(); PageAlchemyArray updraftRecipePage = BookUtils.getAlchemyPage("updraft"); @@ -123,21 +137,6 @@ public class CategoryAlchemy laputaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "laputa" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "laputa"), new EntryText(laputaPages, TextHelper.localize(keyBase + "laputa"), true)); - List buffPages = new ArrayList<>(); - - buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "buff"), new EntryText(buffPages, TextHelper.localize(keyBase + "buff"), true)); - - List fastMinerPages = new ArrayList<>(); - - PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner"); - if (fastMinerRecipePage != null) - { - fastMinerPages.add(fastMinerRecipePage); - } - fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); - for (Entry entry : entries.entrySet()) { for (IPage page : entry.getValue().pageList) diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index ac330963..005e7ced 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -1,9 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; @@ -12,7 +9,10 @@ import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.util.helper.RecipeHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.IPage; @@ -60,6 +60,16 @@ public class CategoryArchitect altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.2"), 370)); entries.put(new ResourceLocation(keyBase + "bloodaltar"), new EntryText(altarPages, TextHelper.localize(keyBase + "bloodaltar"), true)); + List daggerPages = new ArrayList<>(); + + AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE)); + if (daggerOfSacrificeRecipe != null) { + daggerPages.add(new PageAltarRecipe(daggerOfSacrificeRecipe)); + } + + daggerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "dagger" + ".info.1"), 370)); + entries.put(new ResourceLocation(keyBase + "dagger"), new EntryText(daggerPages, TextHelper.localize(keyBase + "dagger"), true)); + List ashPages = new ArrayList<>(); TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); @@ -206,17 +216,6 @@ public class CategoryArchitect apprenticeorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "apprenticeorb" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "apprenticeorb"), new EntryText(apprenticeorbPages, TextHelper.localize(keyBase + "apprenticeorb"), true)); - List daggerPages = new ArrayList<>(); - - AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE)); - if (daggerOfSacrificeRecipe != null) - { - daggerPages.add(new PageAltarRecipe(daggerOfSacrificeRecipe)); - } - - daggerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "dagger" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "dagger"), new EntryText(daggerPages, TextHelper.localize(keyBase + "dagger"), true)); - List runeSacrificePages = new ArrayList<>(); IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3)); @@ -359,7 +358,7 @@ public class CategoryArchitect List capacityPages = new ArrayList<>(); - IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); + IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6)); if (capacityRecipe != null) { capacityPages.add(BookUtils.getPageForRecipe(capacityRecipe)); @@ -370,7 +369,7 @@ public class CategoryArchitect List displacementPages = new ArrayList<>(); - IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); + IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 5)); if (displacementRecipe != null) { displacementPages.add(BookUtils.getPageForRecipe(displacementRecipe)); @@ -486,6 +485,41 @@ public class CategoryArchitect downgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "downgrade" + ".info"), 370)); entries.put(new ResourceLocation(keyBase + "downgrade"), new EntryText(downgradePages, TextHelper.localize(keyBase + "downgrade"), true)); + List boundBladePages = new ArrayList<>(); + + PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD)); + if (boundBladePage != null) { + boundBladePages.add(boundBladePage); + } + + boundBladePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundBlade" + ".info.1"), 370)); + entries.put(new ResourceLocation(keyBase + "boundBlade"), new EntryText(boundBladePages, TextHelper.localize(keyBase + "boundBlade"), true)); + + List boundToolPages = new ArrayList<>(); + + PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)); + if (boundToolPage != null) { + boundToolPages.add(boundToolPage); + } + + boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)); + if (boundToolPage != null) { + boundToolPages.add(boundToolPage); + } + + boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)); + if (boundToolPage != null) { + boundToolPages.add(boundToolPage); + } + + boundToolPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundTool" + ".info.1"), 370)); + entries.put(new ResourceLocation(keyBase + "boundTool"), new EntryText(boundToolPages, TextHelper.localize(keyBase + "boundTool"), true)); + + List weakShardPages = new ArrayList<>(); + + weakShardPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakShard" + ".info.1"), 370)); + entries.put(new ResourceLocation(keyBase + "weakShard"), new EntryText(weakShardPages, TextHelper.localize(keyBase + "weakShard"), true)); + List teleposerPages = new ArrayList<>(); AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)); @@ -503,45 +537,6 @@ public class CategoryArchitect teleposerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposer" + ".info.1"), 370)); entries.put(new ResourceLocation(keyBase + "teleposer"), new EntryText(teleposerPages, TextHelper.localize(keyBase + "teleposer"), true)); - List boundBladePages = new ArrayList<>(); - - PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD)); - if (boundBladePage != null) - { - boundBladePages.add(boundBladePage); - } - - boundBladePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundBlade" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "boundBlade"), new EntryText(boundBladePages, TextHelper.localize(keyBase + "boundBlade"), true)); - - List boundToolPages = new ArrayList<>(); - - PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)); - if (boundToolPage != null) - { - boundToolPages.add(boundToolPage); - } - - boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)); - if (boundToolPage != null) - { - boundToolPages.add(boundToolPage); - } - - boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)); - if (boundToolPage != null) - { - boundToolPages.add(boundToolPage); - } - - boundToolPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundTool" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "boundTool"), new EntryText(boundToolPages, TextHelper.localize(keyBase + "boundTool"), true)); - - List weakShardPages = new ArrayList<>(); - - weakShardPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakShard" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "weakShard"), new EntryText(weakShardPages, TextHelper.localize(keyBase + "weakShard"), true)); - List masterOrbPages = new ArrayList<>(); AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER)); From 4f1308874d1507cfa1e47d56d2f0abcc92f4b701 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:51:25 +0200 Subject: [PATCH 333/493] Fixes BloodAltar being able to obtain negative progress. (#1649) * Fixes BloodAltar being able to obtain negative progress. * Updated to use Math.max() --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 7a111dd0..66b1d2f2 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -3,16 +3,16 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.block.enums.BloodRuneType; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.base.Enums; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -297,7 +297,7 @@ public class BloodAltar implements IFluidHandler { } } else if (!hasOperated && progress > 0) { - progress -= (int) (efficiencyMultiplier * drainRate); + progress = Math.max(0, progress - (int) (efficiencyMultiplier * drainRate)); if (internalCounter % 2 == 0 && world instanceof WorldServer) { WorldServer server = (WorldServer) world; From a23cd355565ec8531f9161a9e1e354a6bb5de5dd Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:55:53 +0200 Subject: [PATCH 334/493] Implemented BloodAltar modification with redstone lamp below altar (#1635) * Implemented BloodAltar modification with redstone lamp below altar - strong and weak Redstone signal of power 15 (similar to BlockLever) - activates when crafting finishes and a BlockRedstoneLight is directly below the altar - deactivates when the next crafting cycle is about to begin Use case: - Redstone-controlled automatic ejection of crafted goods * Removed Docs * Meta to use 0 for off, 1 for on * Syntactic sugar & storing value --- .../bloodmagic/altar/BloodAltar.java | 19 ++++++++- .../bloodmagic/block/BlockAltar.java | 41 +++++++++++++++++++ .../assets/bloodmagic/blockstates/altar.json | 8 ++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 66b1d2f2..5dda98bc 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -3,8 +3,10 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.block.enums.BloodRuneType; +import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.IBindable; @@ -14,6 +16,7 @@ import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.base.Enums; +import net.minecraft.block.BlockRedstoneLight; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -239,8 +242,15 @@ public class BloodAltar implements IFluidHandler { tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); } - if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) + if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) { + /* Redstone Lamp below altar: Switch Off */ + IBlockState state = world.getBlockState(pos); + if (state.getValue(BlockAltar.POWERED)) { + world.setBlockState(pos, state.cycleProperty(BlockAltar.POWERED), 3); + world.notifyNeighborsOfStateChange(pos, RegistrarBloodMagicBlocks.ALTAR, false); + } startCycle(); + } updateAltar(); } @@ -319,6 +329,13 @@ public class BloodAltar implements IFluidHandler { server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); } + /* Redstone Lamp below altar: Switch On */ + /* Switches on when crafting finishes */ + if (world.getBlockState(pos.down()).getBlock() instanceof BlockRedstoneLight) { + world.setBlockState(pos, world.getBlockState(pos).cycleProperty(BlockAltar.POWERED), 3); + world.notifyNeighborsOfStateChange(pos, RegistrarBloodMagicBlocks.ALTAR, false); + } + this.cooldownAfterCrafting = 30; this.isActive = false; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 73923dcb..712adb94 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -18,7 +18,10 @@ import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -39,10 +42,13 @@ import java.util.ArrayList; import java.util.List; public class BlockAltar extends Block implements IVariantProvider, IDocumentedBlock, IBMBlock { + public static final PropertyBool POWERED = PropertyBool.create("powered"); private static final AxisAlignedBB BODY = new AxisAlignedBB(0, 0, 0, 16 / 16F, 12 / 16F, 16 / 16F); public BlockAltar() { super(Material.ROCK); + this.setDefaultState(this.blockState.getBaseState().withProperty(POWERED, false)); + setTranslationKey(BloodMagic.MODID + ".altar"); setCreativeTab(BloodMagic.TAB_BM); @@ -180,4 +186,39 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl public ItemBlock getItem() { return new ItemBlock(this); } + + /* Redstone code, taken from BlockLever */ + + public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + return blockState.getValue(POWERED) ? 15 : 0; + } + + public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + if (!blockState.getValue(POWERED)) { + return 0; + } else { + return 15; + } + } + + public boolean canProvidePower(IBlockState state) { + return true; + } + + public IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(POWERED, meta > 0); + } + + public int getMetaFromState(IBlockState state) { + return state.getValue(POWERED) ? 1 : 0; + } + + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, POWERED); + } + + public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + + return this.getDefaultState().withProperty(POWERED, false); + } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/altar.json b/src/main/resources/assets/bloodmagic/blockstates/altar.json index 24191a55..7fa4988e 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/altar.json +++ b/src/main/resources/assets/bloodmagic/blockstates/altar.json @@ -8,6 +8,14 @@ }, "variants": { "normal": [{ + } + ], + "powered=true": [ + { + } + ], + "powered=false": [ + { }] } From 1155be6d6bfc286404f1e6a96e3109a5f29c7ade Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 03:58:45 +0200 Subject: [PATCH 335/493] Fixed Ritual Tinkerer & added range reset (#1636) * Add getMinimumOffset() and getMaximumOffset to AreaDescriptor Add the ability to reset BlockRanges to the Ritual Tinkerer * Added copy-constructors and functions to AreaDescriptor Added the ability to reset BlockRanges to the Ritual Tinkerer - Mode: Define Area, with BloodOrb in offhand & sneaking, right click on MRS Changed "addBlockRange" and "addBlockRanges" to use .putIfAbsent Added "setBlockRange" and "setBlockRanges" to IMasterRitualStone - reference implementation in TileMasterRitualStone is identical to old "addBlockRange" and "addBlockRanges" Fixed range setting for good. Tested behavior with RitualWater. * Minor cleanup * Remove TODO --- .../bloodmagic/item/ItemRitualReader.java | 26 ++++++++++---- .../bloodmagic/ritual/AreaDescriptor.java | 34 +++++++++++++++++++ .../bloodmagic/ritual/IMasterRitualStone.java | 4 +++ .../tile/TileMasterRitualStone.java | 20 +++++++++-- 4 files changed, 75 insertions(+), 9 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index f96afc24..6358762a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.ritual.EnumRitualReaderState; import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.Ritual; @@ -21,7 +22,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -100,11 +100,21 @@ public class ItemRitualReader extends Item implements IVariantProvider { switch (state) { case INFORMATION: master.provideInformationOfRitualToPlayer(player); + break; case SET_AREA: + if (player.isSneaking() && player.getHeldItem(EnumHand.OFF_HAND).getItem() instanceof ItemBloodOrb) { + Ritual ritual = master.getCurrentRitual(); + for (String range : ritual.getListOfRanges()) { + AreaDescriptor aabb = ritual.getBlockRange(range); + master.setBlockRange(range, aabb); + } + break; + } + String range = this.getCurrentBlockRange(stack); - if (range == null || player.isSneaking()) { + if (range == null || range.isEmpty() || player.isSneaking()) { String newRange = master.getNextBlockRange(range); range = newRange; this.setCurrentBlockRange(stack, newRange); @@ -144,17 +154,21 @@ public class ItemRitualReader extends Item implements IVariantProvider { BlockPos pos1 = pos.subtract(masterPos); this.setBlockPos(stack, pos1); player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.firstBlock"), true); - player.sendMessage(new TextComponentString(pos1.toString())); } else { tile = world.getTileEntity(masterPos); if (tile instanceof IMasterRitualStone) { IMasterRitualStone master = (IMasterRitualStone) tile; BlockPos pos2 = pos.subtract(masterPos); String range = this.getCurrentBlockRange(stack); + if (range == null || range.isEmpty()) { + String newRange = master.getNextBlockRange(range); + range = newRange; + this.setCurrentBlockRange(stack, newRange); + } Ritual ritual = master.getCurrentRitual(); - //TODO: Fix AreaDescriptor area handling to be inclusive, then remove the "-1" for range calculation below. - int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, null, null) - 1; - int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, null, null) - 1; + + int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, null, null); + int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, null, null); int maxVolume = ritual.getMaxVolumeForRange(range, null, null); switch (master.setBlockRangeByBounds(player, range, containedPos, pos2)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java index b6f5dc83..e51a062d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java @@ -35,6 +35,8 @@ public abstract class AreaDescriptor implements Iterator { } + public abstract AreaDescriptor copy(); + public abstract int getVolumeForOffsets(BlockPos offset1, BlockPos offset2); public abstract boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit); @@ -91,6 +93,14 @@ public abstract class AreaDescriptor implements Iterator { this(minimumOffset, size, size, size); } + public Rectangle(AreaDescriptor.Rectangle rectangle) { + this(rectangle.minimumOffset, rectangle.maximumOffset); + } + + public AreaDescriptor.Rectangle copy() { + return new AreaDescriptor.Rectangle(this); + } + @Override public List getContainedPositions(BlockPos pos) { if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { @@ -122,6 +132,14 @@ public abstract class AreaDescriptor implements Iterator { return this.maximumOffset.getY() - this.minimumOffset.getY(); } + public BlockPos getMinimumOffset() { + return minimumOffset; + } + + public BlockPos getMaximumOffset() { + return maximumOffset; + } + /** * Sets the offsets of the AreaDescriptor in a safe way that will make * minimumOffset the lowest corner @@ -271,6 +289,14 @@ public abstract class AreaDescriptor implements Iterator { setRadius(minimumOffset, radius); } + public HemiSphere(AreaDescriptor.HemiSphere hemiSphere) { + this(hemiSphere.minimumOffset, hemiSphere.radius); + } + + public AreaDescriptor.HemiSphere copy() { + return new AreaDescriptor.HemiSphere(this); + } + public void setRadius(BlockPos minimumOffset, int radius) { this.minimumOffset = new BlockPos(Math.min(minimumOffset.getX(), minimumOffset.getX()), Math.min(minimumOffset.getY(), minimumOffset.getY()), Math.min(minimumOffset.getZ(), minimumOffset.getZ())); this.radius = radius; @@ -417,6 +443,14 @@ public abstract class AreaDescriptor implements Iterator { this.blockPosCache = new ArrayList<>(); } + public Cross(AreaDescriptor.Cross cross) { + this(cross.centerPos, cross.size); + } + + public AreaDescriptor.Cross copy() { + return new AreaDescriptor.Cross(this); + } + @Override public int getHeight() { return this.size * 2 + 1; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index 1ce20d8b..1ba75a6f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -71,5 +71,9 @@ public interface IMasterRitualStone { void addBlockRange(String range, AreaDescriptor defaultRange); + void setBlockRanges(Map blockRanges); + + void setBlockRange(String range, AreaDescriptor defaultRange); + Ritual getCurrentRitual(); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 46e6332d..88ae398b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -32,6 +32,7 @@ import javax.annotation.Nullable; import java.util.*; public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone { + protected final Map modableRangeMap = new HashMap<>(); private UUID owner; private SoulNetwork cachedNetwork; private boolean active; @@ -42,7 +43,6 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS private EnumFacing direction = EnumFacing.NORTH; private boolean inverted; private List currentActiveWillConfig = new ArrayList<>(); - protected final Map modableRangeMap = new HashMap<>(); @Override public void onUpdate() { @@ -425,13 +425,27 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS return null; } + @Override public void addBlockRange(String range, AreaDescriptor defaultRange) { - modableRangeMap.put(range, defaultRange); + modableRangeMap.putIfAbsent(range, defaultRange.copy()); } + @Override public void addBlockRanges(Map blockRanges) { for (Map.Entry entry : blockRanges.entrySet()) { - modableRangeMap.put(entry.getKey(), entry.getValue()); + modableRangeMap.putIfAbsent(entry.getKey(), entry.getValue().copy()); + } + } + + @Override + public void setBlockRange(String range, AreaDescriptor defaultRange) { + modableRangeMap.put(range, defaultRange.copy()); + } + + @Override + public void setBlockRanges(Map blockRanges) { + for (Map.Entry entry : blockRanges.entrySet()) { + modableRangeMap.put(entry.getKey(), entry.getValue().copy()); } } From 39cdc0c42ff4cf77446277cbf18bc7dee0d14fc7 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 04:02:39 +0200 Subject: [PATCH 336/493] Lava Crystals can now set things on fire! (#1652) * Lava Crystals can now set things on fire! * Remove unecessary else --- .../bloodmagic/item/ItemLavaCrystal.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index f99408df..f4144990 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -7,13 +7,23 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -73,6 +83,26 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); } + @Override + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + pos = pos.offset(facing); + ItemStack itemstack = player.getHeldItem(hand); + + if (!player.canPlayerEdit(pos, facing, itemstack)) + return EnumActionResult.FAIL; + + if (worldIn.isAirBlock(pos) && NetworkHelper.getSoulNetwork(getBinding(player.getHeldItem(hand))).syphonAndDamage(player, SoulTicket.item(player.getHeldItem(hand), 100)).isSuccess()) { + worldIn.playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + worldIn.setBlockState(pos, Blocks.FIRE.getDefaultState(), 11); + } else + return EnumActionResult.FAIL; + + if (player instanceof EntityPlayerMP) + CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP) player, pos, itemstack); + + return EnumActionResult.SUCCESS; + } + @Override public void gatherVariants(@Nonnull Int2ObjectMap variants) { variants.put(0, "type=normal"); From 5cb3ff5af54b34f364a9e4e5c306e14d36e2c595 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 5 Sep 2019 04:24:43 +0200 Subject: [PATCH 337/493] Tentative changelog for next version (#1610) * Tentative changelog for next version * Updated changelog to feature all PRs since the last changelog PR. Added PR #s for every change. * Added the Sentient sword sigil buffs PR to the changelog * Added NPE World load/unload PR * Added changes from most recent PRs * Removed duplicate sentient sword sigil effect PR. Moved 2 commits to "Technical stuff", as they have been committed * Updated changelog * Updated changelog + flavor * Remove Gaia Transformation note --- changelog.txt | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 11ab26ad..4c070f99 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,32 @@ +------------------------------------------------------ +Version 2.4.2 +------------------------------------------------------ +Now with no guarantees for working textures! + +Blood Altar: + - A Blood Altar with a Redstone Lamp below it will now emit a redstone signal upon finishing crafting (#1635) + - Fixed Blood Altar being able to obtain negative progress (#1649) + +Living Armor: + - Fixed Storm Trooper Level 4 costing 65 instead of -65 upgrade points (#1631) + +Rituals: + - Fixed Ritual of the Eternal Soul (Ritual Stone layout & didn't work) (#1633) + - Fixed Ritual Tinkerer (ritual area is now unique per ritual instance), added the ability to reset the ritual ranges to default (#1636) + +Misc: + - Lava Crystals can now set things on fire (#1652) + - Fixed parts of the German translation. Other translations still need to be reworked to accomodate changed translation keys (#1640) + - Fixed Guidebook showing wrong recipes (Rune of Self-Sacrifice instead of others) (#1641) + - Wooden Paths now behave like wood instead of stone (sound & efficient tool) (#1638) + + +Technical Stuff: + - Fixed Veil of Evil and Ward of Sacrosanctity console spam (which could eventually lead to an out of memory exception) (#1639) + - Fixed GLSL shader compilation errors (affected Mesa driver (AMD GPU) on Linux) (#1624) + - Fixed `/bloodmagic network` command permissions (#1613) + - Fixed a rare crash that could occur when summoning mobs (#1618) + ------------------------------------------------------ Version 2.4.1 ------------------------------------------------------ @@ -43,7 +72,7 @@ Misc: - added Nut being angery at contributors for messing stuff up - Added some Russian language strings for the guide book - Added repair recipes for Sentient Tools & Living Armor to JEI - + - Many translation keys have changed which makes affected translations fall back to english Technical Stuff no player cares about: - Formatted Project code From 1caae69992618c1b7a5bba60a79c4ea664717a91 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 4 Sep 2019 19:25:07 -0700 Subject: [PATCH 338/493] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 21145a3d..04505448 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.4.1 +mod_version=2.4.2 mc_version=1.12.2 forge_version=14.23.5.2808 curse_id=224791 From 4035d911514900467b33abcdf2a0a349591cf14d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 22 Sep 2019 12:55:43 -0700 Subject: [PATCH 339/493] Run migration mappings Everything is still broken, but at least we reduced the amount of errors by hundreds, if not thousands. --- build.gradle | 93 +++++------ gradle.properties | 13 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/WayofTime/bloodmagic/BloodMagic.java | 6 +- .../alchemyArray/AlchemyArrayEffect.java | 10 +- .../AlchemyArrayEffectArrowTurret.java | 36 ++-- .../AlchemyArrayEffectAttractor.java | 100 +++++------ .../AlchemyArrayEffectBinding.java | 14 +- .../AlchemyArrayEffectBounce.java | 14 +- .../AlchemyArrayEffectCrafting.java | 10 +- .../AlchemyArrayEffectCraftingNew.java | 10 +- .../AlchemyArrayEffectFurnaceFuel.java | 34 ++-- .../AlchemyArrayEffectLaputa.java | 10 +- .../AlchemyArrayEffectMobSacrifice.java | 41 +++-- .../AlchemyArrayEffectMovement.java | 14 +- .../alchemyArray/AlchemyArrayEffectSigil.java | 6 +- .../AlchemyArrayEffectSkeletonTurret.java | 42 ++--- .../alchemyArray/AlchemyArrayEffectSpike.java | 14 +- .../AlchemyArrayEffectTeleport.java | 34 ++-- .../AlchemyArrayEffectUpdraft.java | 10 +- .../alchemyArray/AlchemyCircleRenderer.java | 6 +- .../WayofTime/bloodmagic/altar/AltarUtil.java | 12 +- .../bloodmagic/altar/BloodAltar.java | 38 ++--- .../bloodmagic/altar/IAltarComponent.java | 4 +- .../bloodmagic/api/impl/BloodMagicAPI.java | 12 +- .../api/impl/BloodMagicBlacklist.java | 26 +-- .../api/impl/BloodMagicCorePlugin.java | 2 +- .../api/impl/BloodMagicValueManager.java | 10 +- .../bloodmagic/block/BlockAlchemyArray.java | 40 ++--- .../bloodmagic/block/BlockAlchemyTable.java | 48 +++--- .../bloodmagic/block/BlockAltar.java | 62 +++---- .../bloodmagic/block/BlockBloodLight.java | 26 +-- .../bloodmagic/block/BlockBloodRune.java | 4 +- .../bloodmagic/block/BlockBloodTank.java | 58 +++---- .../bloodmagic/block/BlockDecorative.java | 4 +- .../bloodmagic/block/BlockDemonCrucible.java | 42 ++--- .../bloodmagic/block/BlockDemonCrystal.java | 72 ++++---- .../block/BlockDemonCrystallizer.java | 32 ++-- .../block/BlockDemonPillarBase.java | 4 +- .../block/BlockDemonPillarCapBase.java | 6 +- .../bloodmagic/block/BlockDemonPylon.java | 34 ++-- .../block/BlockDimensionalPortal.java | 22 +-- .../bloodmagic/block/BlockIncenseAltar.java | 30 ++-- .../block/BlockInputRoutingNode.java | 16 +- .../block/BlockInversionPillar.java | 25 ++- .../block/BlockInversionPillarEnd.java | 16 +- .../block/BlockItemRoutingNode.java | 8 +- .../block/BlockMasterRoutingNode.java | 6 +- .../bloodmagic/block/BlockMimic.java | 67 ++++---- .../block/BlockOutputRoutingNode.java | 16 +- .../WayofTime/bloodmagic/block/BlockPath.java | 8 +- .../bloodmagic/block/BlockPhantom.java | 24 +-- .../block/BlockRitualController.java | 32 ++-- .../bloodmagic/block/BlockRitualStone.java | 10 +- .../bloodmagic/block/BlockRoutingNode.java | 44 ++--- .../bloodmagic/block/BlockSoulForge.java | 38 ++--- .../bloodmagic/block/BlockSpectral.java | 30 ++-- .../bloodmagic/block/BlockTeleposer.java | 28 ++-- .../WayofTime/bloodmagic/block/IBMBlock.java | 4 +- .../bloodmagic/block/base/BlockEnum.java | 16 +- .../block/base/BlockEnumPillar.java | 54 +++--- .../block/base/BlockEnumPillarCap.java | 26 +-- .../block/base/BlockEnumStairs.java | 154 ++++++++--------- .../bloodmagic/block/base/BlockEnumWall.java | 40 ++--- .../bloodmagic/block/base/BlockInteger.java | 12 +- .../client/gui/GuiAlchemyTable.java | 10 +- .../client/gui/GuiBloodMagicConfig.java | 6 +- .../bloodmagic/client/gui/GuiHandler.java | 10 +- .../bloodmagic/client/gui/GuiHolding.java | 14 +- .../client/gui/GuiItemRoutingNode.java | 42 ++--- .../client/gui/GuiMasterRoutingNode.java | 8 +- .../bloodmagic/client/gui/GuiSoulForge.java | 8 +- .../bloodmagic/client/gui/GuiTeleposer.java | 8 +- .../bloodmagic/client/hud/GuiEditHUD.java | 12 +- .../client/hud/element/ElementDemonAura.java | 4 +- .../element/ElementDivinedInformation.java | 12 +- .../client/hud/element/ElementHolding.java | 4 +- .../bloodmagic/client/key/IKeybindable.java | 4 +- .../bloodmagic/client/key/KeyBindings.java | 6 +- .../mesh/CustomMeshDefinitionActivatable.java | 2 +- .../mesh/CustomMeshDefinitionMultiWill.java | 2 +- .../mesh/CustomMeshDefinitionWillGem.java | 2 +- .../client/render/LayerBloodElytra.java | 20 +-- .../AttractorAlchemyCircleRenderer.java | 6 +- .../BindingAlchemyCircleRenderer.java | 4 +- .../DualAlchemyCircleRenderer.java | 6 +- .../MobSacrificeAlchemyCircleRenderer.java | 6 +- .../SingleAlchemyCircleRenderer.java | 6 +- .../StaticAlchemyCircleRenderer.java | 6 +- .../TurretAlchemyCircleRenderer.java | 6 +- .../render/block/RenderAlchemyArray.java | 4 +- .../client/render/block/RenderAltar.java | 16 +- .../client/render/block/RenderBloodTank.java | 8 +- .../render/block/RenderDemonCrucible.java | 14 +- .../client/render/block/RenderFakeBlocks.java | 4 +- .../render/block/RenderItemRoutingNode.java | 4 +- .../client/render/block/RenderMimic.java | 4 +- .../entity/BloodLightRenderFactory.java | 6 +- .../entity/CorruptedChickenRenderFactory.java | 6 +- .../entity/CorruptedSheepRenderFactory.java | 6 +- .../entity/CorruptedSpiderRenderFactory.java | 6 +- .../entity/CorruptedZombieRenderFactory.java | 6 +- .../render/entity/MeteorRenderFactory.java | 6 +- .../render/entity/MimicRenderFactory.java | 6 +- .../render/entity/RenderCorruptedChicken.java | 8 +- .../render/entity/RenderCorruptedSheep.java | 8 +- .../render/entity/RenderCorruptedSpider.java | 8 +- .../render/entity/RenderCorruptedZombie.java | 23 ++- .../render/entity/RenderEntityBloodLight.java | 20 +-- .../render/entity/RenderEntityMeteor.java | 8 +- .../render/entity/RenderEntityMimic.java | 34 ++-- .../entity/RenderEntitySentientArrow.java | 8 +- .../render/entity/RenderEntitySoulSnare.java | 20 +-- .../render/entity/RenderSentientSpecter.java | 40 ++--- .../entity/SentientArrowRenderFactory.java | 6 +- .../entity/SentientSpecterRenderFactory.java | 6 +- .../render/entity/SoulSnareRenderFactory.java | 6 +- .../entity/layer/LayerCorruptedSheepWool.java | 8 +- .../client/render/entity/layer/LayerWill.java | 6 +- .../render/model/ModelCorruptedSheep.java | 4 +- .../render/model/ModelCorruptedSheep2.java | 4 +- .../command/sub/SubCommandBind.java | 20 +-- .../command/sub/SubCommandNetwork.java | 32 ++-- .../bloodmagic/command/sub/SubCommandOrb.java | 20 +-- .../command/sub/SubCommandRitual.java | 30 ++-- .../command/sub/SubCommandTeleposer.java | 42 ++--- .../compat/guideapi/GuideBloodMagic.java | 2 +- .../compat/guideapi/page/PageAltarRecipe.java | 2 +- .../page/PageTartaricForgeRecipe.java | 2 +- .../provider/DataProviderAlchemyArray.java | 6 +- .../provider/DataProviderBloodAltar.java | 18 +- .../waila/provider/DataProviderBloodTank.java | 8 +- .../waila/provider/DataProviderMimic.java | 12 +- .../DataProviderRitualController.java | 8 +- .../waila/provider/DataProviderTeleposer.java | 10 +- .../compress/StorageBlockCraftingManager.java | 28 ++-- .../bloodmagic/core/RegistrarBloodMagic.java | 42 ++--- .../core/RegistrarBloodMagicBlocks.java | 8 +- .../core/RegistrarBloodMagicItems.java | 22 +-- .../core/RegistrarBloodMagicRecipes.java | 10 +- .../core/data/BMWorldSavedData.java | 18 +- .../bloodmagic/core/data/Binding.java | 12 +- .../bloodmagic/core/data/SoulNetwork.java | 34 ++-- .../bloodmagic/core/data/SoulTicket.java | 14 +- .../core/recipe/IngredientBloodOrb.java | 2 +- .../recipe/IngredientBloodOrbFactory.java | 4 +- .../bloodmagic/core/registry/OrbRegistry.java | 4 +- .../entity/ai/EntityAIAttackRangedBow.java | 18 +- .../entity/ai/EntityAIAttackStealthMelee.java | 18 +- .../entity/ai/EntityAIEatAndCorruptBlock.java | 10 +- .../entity/ai/EntityAIFollowOwner.java | 28 ++-- .../ai/EntityAIGrabEffectsFromOwner.java | 28 ++-- .../ai/EntityAIHurtByTargetIgnoreTamed.java | 12 +- .../entity/ai/EntityAIMimicReform.java | 4 +- .../entity/ai/EntityAIOwnerHurtByTarget.java | 12 +- .../entity/ai/EntityAIOwnerHurtTarget.java | 12 +- .../entity/ai/EntityAIPickUpAlly.java | 18 +- .../entity/ai/EntityAIProtectAlly.java | 14 +- .../entity/ai/EntityAIRetreatToHeal.java | 12 +- .../entity/ai/EntityAIStealthRetreat.java | 12 +- .../ai/EntityAIStealthTowardsTarget.java | 20 +-- .../entity/mob/EntityAspectedDemonBase.java | 16 +- .../entity/mob/EntityCorruptedChicken.java | 38 ++--- .../entity/mob/EntityCorruptedSheep.java | 98 +++++------ .../entity/mob/EntityCorruptedSpider.java | 46 +++--- .../entity/mob/EntityCorruptedZombie.java | 52 +++--- .../entity/mob/EntityDemonBase.java | 68 ++++---- .../bloodmagic/entity/mob/EntityMimic.java | 78 ++++----- .../entity/mob/EntitySentientSpecter.java | 155 +++++++++-------- .../entity/projectile/EntityBloodLight.java | 30 ++-- .../entity/projectile/EntityMeteor.java | 16 +- .../projectile/EntitySentientArrow.java | 88 +++++----- .../entity/projectile/EntitySoulSnare.java | 14 +- .../bloodmagic/event/BoundToolEvent.java | 10 +- .../bloodmagic/event/ItemBindEvent.java | 8 +- .../bloodmagic/event/RitualEvent.java | 16 +- .../event/SacrificeKnifeUsedEvent.java | 6 +- .../bloodmagic/event/SoulNetworkEvent.java | 8 +- .../bloodmagic/event/TeleposeEvent.java | 6 +- .../fakePlayer/FakeNetHandlerPlayServer.java | 74 ++++----- .../bloodmagic/fakePlayer/FakePlayerBM.java | 12 +- .../bloodmagic/gson/Serializers.java | 16 +- .../bloodmagic/iface/IActivatable.java | 4 +- .../bloodmagic/iface/IAlchemyArray.java | 4 +- .../WayofTime/bloodmagic/iface/IBindable.java | 4 +- .../bloodmagic/iface/IBloodRune.java | 4 +- .../bloodmagic/iface/IDemonWillViewer.java | 6 +- .../bloodmagic/iface/IDocumentedBlock.java | 6 +- .../iface/ISentientSwordEffectProvider.java | 4 +- .../bloodmagic/iface/ISentientTool.java | 4 +- .../WayofTime/bloodmagic/iface/ISigil.java | 4 +- .../bloodmagic/incense/IIncensePath.java | 4 +- .../incense/ITranquilityHandler.java | 4 +- .../incense/IncenseAltarComponent.java | 16 +- .../incense/IncenseAltarHandler.java | 10 +- .../incense/IncenseTranquilityRegistry.java | 4 +- .../inversion/CorruptionHandler.java | 20 +-- .../bloodmagic/item/ItemAltarMaker.java | 24 +-- .../bloodmagic/item/ItemArcaneAshes.java | 16 +- .../bloodmagic/item/ItemBindableBase.java | 4 +- .../bloodmagic/item/ItemBloodOrb.java | 16 +- .../bloodmagic/item/ItemBoundAxe.java | 24 +-- .../bloodmagic/item/ItemBoundPickaxe.java | 28 ++-- .../bloodmagic/item/ItemBoundShovel.java | 24 +-- .../bloodmagic/item/ItemBoundSword.java | 28 ++-- .../bloodmagic/item/ItemBoundTool.java | 57 +++---- .../item/ItemDaggerOfSacrifice.java | 20 +-- .../bloodmagic/item/ItemDemonWillGauge.java | 6 +- .../WayofTime/bloodmagic/item/ItemEnum.java | 4 +- .../bloodmagic/item/ItemExperienceBook.java | 28 ++-- .../bloodmagic/item/ItemInscriptionTool.java | 26 +-- .../bloodmagic/item/ItemLavaCrystal.java | 39 +++-- .../bloodmagic/item/ItemPotionFlask.java | 36 ++-- .../bloodmagic/item/ItemRitualDismantler.java | 20 +-- .../bloodmagic/item/ItemRitualDiviner.java | 108 ++++++------ .../bloodmagic/item/ItemRitualReader.java | 50 +++--- .../item/ItemSacrificialDagger.java | 38 ++--- .../bloodmagic/item/ItemSanguineBook.java | 21 ++- .../item/ItemTelepositionFocus.java | 12 +- .../bloodmagic/item/ItemUpgradeTome.java | 14 +- .../bloodmagic/item/ItemUpgradeTrainer.java | 4 +- .../item/alchemy/ItemCuttingFluid.java | 6 +- .../ItemLivingArmourPointsUpgrade.java | 34 ++-- .../item/armour/ItemLivingArmour.java | 80 ++++----- .../item/armour/ItemSentientArmour.java | 130 +++++++-------- .../item/block/ItemBlockAlchemyTable.java | 16 +- .../item/block/ItemBlockBloodTank.java | 12 +- .../item/block/ItemBlockDemonCrystal.java | 12 +- .../bloodmagic/item/block/ItemBlockMimic.java | 43 +++-- .../item/block/base/ItemBlockEnum.java | 4 +- .../item/block/base/ItemBlockInteger.java | 4 +- .../item/gear/ItemPackSacrifice.java | 22 +-- .../item/gear/ItemPackSelfSacrifice.java | 22 +-- .../item/inventory/ContainerHolding.java | 24 +-- .../item/inventory/InventoryHolding.java | 12 +- .../item/inventory/ItemInventory.java | 34 ++-- .../item/routing/ItemFluidRouterFilter.java | 4 +- .../item/routing/ItemNodeRouter.java | 62 +++---- .../item/routing/ItemRouterFilter.java | 4 +- .../bloodmagic/item/sigil/ItemSigilAir.java | 18 +- .../item/sigil/ItemSigilBloodLight.java | 6 +- .../item/sigil/ItemSigilBounce.java | 8 +- .../bloodmagic/item/sigil/ItemSigilClaw.java | 8 +- .../item/sigil/ItemSigilCompression.java | 8 +- .../item/sigil/ItemSigilDivination.java | 12 +- .../sigil/ItemSigilElementalAffinity.java | 12 +- .../item/sigil/ItemSigilEnderSeverance.java | 12 +- .../item/sigil/ItemSigilFastMiner.java | 18 +- .../item/sigil/ItemSigilFilledHand.java | 4 +- .../item/sigil/ItemSigilFluidBase.java | 18 +- .../bloodmagic/item/sigil/ItemSigilFrost.java | 8 +- .../item/sigil/ItemSigilGreenGrove.java | 24 +-- .../bloodmagic/item/sigil/ItemSigilHaste.java | 8 +- .../item/sigil/ItemSigilHolding.java | 46 +++--- .../bloodmagic/item/sigil/ItemSigilLava.java | 18 +- .../item/sigil/ItemSigilMagnetism.java | 16 +- .../item/sigil/ItemSigilPhantomBridge.java | 10 +- .../item/sigil/ItemSigilSuppression.java | 8 +- .../item/sigil/ItemSigilTeleposition.java | 40 ++--- .../item/sigil/ItemSigilToggleable.java | 30 ++-- .../item/sigil/ItemSigilToggleableBase.java | 4 +- .../item/sigil/ItemSigilTransposition.java | 48 +++--- .../bloodmagic/item/sigil/ItemSigilVoid.java | 16 +- .../bloodmagic/item/sigil/ItemSigilWater.java | 26 +-- .../item/sigil/ItemSigilWhirlwind.java | 8 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 6 +- .../item/soul/ItemSentientArmourGem.java | 15 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 96 +++++------ .../bloodmagic/item/soul/ItemSentientBow.java | 124 +++++++------- .../item/soul/ItemSentientPickaxe.java | 96 +++++------ .../item/soul/ItemSentientShovel.java | 96 +++++------ .../item/soul/ItemSentientSword.java | 88 +++++----- .../bloodmagic/item/soul/ItemSoulGem.java | 27 ++- .../bloodmagic/item/soul/ItemSoulSnare.java | 12 +- .../item/soulBreath/ItemFlightScroll.java | 70 ++++---- .../soulBreath/ItemSoulBreathContainer.java | 6 +- .../livingArmour/ILivingArmour.java | 22 +-- .../bloodmagic/livingArmour/LivingArmour.java | 58 +++---- .../livingArmour/LivingArmourHandler.java | 4 +- .../livingArmour/LivingArmourUpgrade.java | 20 +-- .../bloodmagic/livingArmour/StatTracker.java | 12 +- .../LivingArmourUpgradeBattleHungry.java | 10 +- .../LivingArmourUpgradeCrippledArm.java | 10 +- .../LivingArmourUpgradeDigSlowdown.java | 12 +- .../LivingArmourUpgradeDisoriented.java | 10 +- .../LivingArmourUpgradeMeleeDecrease.java | 10 +- .../LivingArmourUpgradeQuenched.java | 10 +- .../LivingArmourUpgradeSlippery.java | 10 +- .../LivingArmourUpgradeSlowHeal.java | 10 +- .../LivingArmourUpgradeSlowness.java | 10 +- .../LivingArmourUpgradeStormTrooper.java | 12 +- .../tracker/StatTrackerArrowProtect.java | 12 +- .../tracker/StatTrackerArrowShot.java | 12 +- .../tracker/StatTrackerCriticalStrike.java | 12 +- .../tracker/StatTrackerDigging.java | 12 +- .../tracker/StatTrackerExperience.java | 12 +- .../tracker/StatTrackerFallProtect.java | 12 +- .../tracker/StatTrackerFireResist.java | 12 +- .../livingArmour/tracker/StatTrackerFood.java | 14 +- .../tracker/StatTrackerGraveDigger.java | 12 +- .../tracker/StatTrackerGrimReaperSprint.java | 12 +- .../tracker/StatTrackerHealthboost.java | 12 +- .../livingArmour/tracker/StatTrackerJump.java | 12 +- .../tracker/StatTrackerMeleeDamage.java | 12 +- .../tracker/StatTrackerMovement.java | 16 +- .../tracker/StatTrackerNightSight.java | 16 +- .../tracker/StatTrackerPhysicalProtect.java | 12 +- .../tracker/StatTrackerPoison.java | 16 +- .../tracker/StatTrackerRepairing.java | 12 +- .../tracker/StatTrackerSelfSacrifice.java | 12 +- .../tracker/StatTrackerSolarPowered.java | 12 +- .../tracker/StatTrackerSprintAttack.java | 12 +- .../tracker/StatTrackerStepAssist.java | 16 +- .../LivingArmourUpgradeArrowProtect.java | 10 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 10 +- .../LivingArmourUpgradeCriticalStrike.java | 16 +- .../upgrade/LivingArmourUpgradeDigging.java | 18 +- .../upgrade/LivingArmourUpgradeElytra.java | 10 +- .../LivingArmourUpgradeExperience.java | 6 +- .../LivingArmourUpgradeFallProtect.java | 8 +- .../LivingArmourUpgradeFireResist.java | 20 +-- .../LivingArmourUpgradeGraveDigger.java | 16 +- .../LivingArmourUpgradeGrimReaperSprint.java | 26 +-- .../LivingArmourUpgradeHealthboost.java | 10 +- .../upgrade/LivingArmourUpgradeJump.java | 10 +- .../LivingArmourUpgradeKnockbackResist.java | 6 +- .../LivingArmourUpgradeMeleeDamage.java | 10 +- .../LivingArmourUpgradeNightSight.java | 25 ++- .../LivingArmourUpgradePhysicalProtect.java | 10 +- .../LivingArmourUpgradePoisonResist.java | 24 +-- .../upgrade/LivingArmourUpgradeRepairing.java | 14 +- .../LivingArmourUpgradeSelfSacrifice.java | 6 +- .../LivingArmourUpgradeSolarPowered.java | 20 +-- .../upgrade/LivingArmourUpgradeSpeed.java | 24 ++- .../LivingArmourUpgradeSprintAttack.java | 14 +- .../LivingArmourUpgradeStepAssist.java | 6 +- .../WayofTime/bloodmagic/meteor/Meteor.java | 12 +- .../bloodmagic/meteor/MeteorComponent.java | 14 +- .../meteor/MeteorConfigHandler.java | 2 +- .../bloodmagic/meteor/MeteorRegistry.java | 4 +- .../network/BloodMagicPacketHandler.java | 4 +- .../bloodmagic/network/KeyProcessor.java | 4 +- .../PlayerFallDistancePacketProcessor.java | 4 +- .../PlayerVelocityPacketProcessor.java | 4 +- .../WayofTime/bloodmagic/orb/BloodOrb.java | 2 +- .../bloodmagic/potion/BMPotionUtils.java | 46 +++--- .../bloodmagic/potion/PotionBloodMagic.java | 22 +-- .../potion/PotionEventHandlers.java | 40 ++--- .../bloodmagic/proxy/ClientProxy.java | 8 +- .../AlchemyTableDyeableRecipe.java | 16 +- .../AlchemyTablePotionAugmentRecipe.java | 30 ++-- .../AlchemyTablePotionRecipe.java | 16 +- .../registry/ModCorruptionBlocks.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 54 +++--- .../bloodmagic/registry/ModRituals.java | 2 +- .../registry/ModTranquilityHandlers.java | 16 +- .../bloodmagic/ritual/AreaDescriptor.java | 14 +- .../bloodmagic/ritual/CapabilityRuneType.java | 12 +- .../bloodmagic/ritual/EnumRuneType.java | 4 +- .../bloodmagic/ritual/IMasterRitualStone.java | 18 +- .../WayofTime/bloodmagic/ritual/Ritual.java | 46 +++--- .../bloodmagic/ritual/RitualComponent.java | 8 +- .../bloodmagic/ritual/RitualManager.java | 4 +- .../harvest/HarvestHandlerPlantable.java | 12 +- .../ritual/harvest/HarvestHandlerStem.java | 32 ++-- .../ritual/harvest/HarvestHandlerTall.java | 20 +-- .../ritual/harvest/HarvestRegistry.java | 26 +-- .../ritual/harvest/IHarvestHandler.java | 14 +- .../imperfect/IImperfectRitualStone.java | 4 +- .../ritual/imperfect/ImperfectRitual.java | 16 +- .../ritual/types/RitualAltarBuilder.java | 30 ++-- .../ritual/types/RitualAnimalGrowth.java | 28 ++-- .../ritual/types/RitualArmourEvolve.java | 10 +- .../ritual/types/RitualCobblestone.java | 2 +- .../bloodmagic/ritual/types/RitualCondor.java | 10 +- .../ritual/types/RitualContainment.java | 8 +- .../ritual/types/RitualCrushing.java | 56 +++---- .../ritual/types/RitualCrystalHarvest.java | 4 +- .../ritual/types/RitualCrystalSplit.java | 28 ++-- .../ritual/types/RitualEllipsoid.java | 14 +- .../ritual/types/RitualEternalSoul.java | 12 +- .../ritual/types/RitualExpulsion.java | 26 +-- .../ritual/types/RitualFeatheredEarth.java | 20 +-- .../ritual/types/RitualFeatheredKnife.java | 20 +-- .../ritual/types/RitualFelling.java | 12 +- .../ritual/types/RitualForsakenSoul.java | 22 +-- .../ritual/types/RitualFullStomach.java | 6 +- .../ritual/types/RitualGreenGrove.java | 36 ++-- .../ritual/types/RitualGrounding.java | 36 ++-- .../ritual/types/RitualHarvest.java | 12 +- .../ritual/types/RitualInterdiction.java | 10 +- .../ritual/types/RitualJumping.java | 12 +- .../bloodmagic/ritual/types/RitualLava.java | 40 ++--- .../types/RitualLivingArmourDowngrade.java | 32 ++-- .../ritual/types/RitualMagnetic.java | 14 +- .../bloodmagic/ritual/types/RitualMeteor.java | 6 +- .../bloodmagic/ritual/types/RitualPlacer.java | 14 +- .../bloodmagic/ritual/types/RitualPortal.java | 44 ++--- .../bloodmagic/ritual/types/RitualPump.java | 14 +- .../ritual/types/RitualRegeneration.java | 30 ++-- .../bloodmagic/ritual/types/RitualSpeed.java | 22 +-- .../ritual/types/RitualSuppression.java | 4 +- .../ritual/types/RitualUpgradeRemove.java | 14 +- .../bloodmagic/ritual/types/RitualWater.java | 2 +- .../ritual/types/RitualWellOfSuffering.java | 10 +- .../bloodmagic/ritual/types/RitualZephyr.java | 10 +- .../types/imperfect/ImperfectRitualDay.java | 6 +- .../types/imperfect/ImperfectRitualNight.java | 6 +- .../types/imperfect/ImperfectRitualRain.java | 6 +- .../imperfect/ImperfectRitualResistance.java | 12 +- .../imperfect/ImperfectRitualZombie.java | 20 +-- .../bloodmagic/routing/IFluidRoutingNode.java | 6 +- .../routing/IInputFluidRoutingNode.java | 6 +- .../routing/IInputItemRoutingNode.java | 6 +- .../bloodmagic/routing/IItemRoutingNode.java | 6 +- .../routing/IOutputFluidRoutingNode.java | 6 +- .../routing/IOutputItemRoutingNode.java | 6 +- .../bloodmagic/soul/DemonWillHolder.java | 10 +- .../bloodmagic/soul/IDemonWillWeapon.java | 4 +- .../soul/PlayerDemonWillHandler.java | 16 +- .../structures/BuildTestStructure.java | 10 +- .../bloodmagic/structures/Dungeon.java | 30 ++-- .../bloodmagic/structures/DungeonRoom.java | 18 +- .../structures/DungeonStructure.java | 10 +- .../bloodmagic/structures/DungeonTester.java | 6 +- .../bloodmagic/structures/DungeonUtil.java | 12 +- .../bloodmagic/teleport/PortalLocation.java | 10 +- .../teleport/TeleporterBloodMagic.java | 4 +- .../bloodmagic/teleport/Teleports.java | 49 +++--- .../bloodmagic/tile/TileAlchemyArray.java | 24 +-- .../bloodmagic/tile/TileAlchemyTable.java | 30 ++-- .../WayofTime/bloodmagic/tile/TileAltar.java | 16 +- .../bloodmagic/tile/TileBloodTank.java | 14 +- .../bloodmagic/tile/TileDemonCrucible.java | 14 +- .../bloodmagic/tile/TileDemonCrystal.java | 22 +-- .../tile/TileDemonCrystallizer.java | 12 +- .../bloodmagic/tile/TileDemonPylon.java | 10 +- .../tile/TileDimensionalPortal.java | 6 +- .../tile/TileImperfectRitualStone.java | 8 +- .../bloodmagic/tile/TileIncenseAltar.java | 28 ++-- .../bloodmagic/tile/TileInventory.java | 46 +++--- .../bloodmagic/tile/TileInversionPillar.java | 26 +-- .../tile/TileMasterRitualStone.java | 52 +++--- .../WayofTime/bloodmagic/tile/TileMimic.java | 100 +++++------ .../bloodmagic/tile/TilePhantomBlock.java | 10 +- .../tile/TilePurificationAltar.java | 18 +- .../bloodmagic/tile/TileSoulForge.java | 6 +- .../bloodmagic/tile/TileSpectralBlock.java | 12 +- .../bloodmagic/tile/TileTeleposer.java | 6 +- .../bloodmagic/tile/base/TileBase.java | 38 ++--- .../bloodmagic/tile/base/TileTicking.java | 6 +- .../tile/container/ContainerAlchemyTable.java | 20 +-- .../container/ContainerItemRoutingNode.java | 22 +-- .../container/ContainerMasterRoutingNode.java | 10 +- .../tile/container/ContainerSoulForge.java | 14 +- .../tile/container/ContainerTeleposer.java | 14 +- .../tile/routing/TileFilteredRoutingNode.java | 32 ++-- .../tile/routing/TileInputRoutingNode.java | 12 +- .../tile/routing/TileMasterRoutingNode.java | 38 ++--- .../tile/routing/TileOutputRoutingNode.java | 12 +- .../tile/routing/TileRoutingNode.java | 26 +-- .../WayofTime/bloodmagic/util/BlockStack.java | 8 +- .../WayofTime/bloodmagic/util/ChatUtil.java | 56 +++---- .../util/DamageSourceBloodMagic.java | 8 +- .../bloodmagic/util/GhostItemHelper.java | 10 +- .../bloodmagic/util/ItemStackWrapper.java | 8 +- .../bloodmagic/util/SigilFluidWrapper.java | 6 +- .../WayofTime/bloodmagic/util/StateUtil.java | 8 +- .../java/WayofTime/bloodmagic/util/Utils.java | 156 +++++++++--------- .../util/handler/event/ClientHandler.java | 38 ++--- .../util/handler/event/CraftingHandler.java | 21 ++- .../util/handler/event/GenericHandler.java | 132 +++++++-------- .../handler/event/LivingArmourHandler.java | 92 +++++------ .../handler/event/StatTrackerHandler.java | 48 +++--- .../util/handler/event/WillHandler.java | 38 ++--- .../util/helper/BindableHelper.java | 8 +- .../bloodmagic/util/helper/IncenseHelper.java | 22 +-- .../bloodmagic/util/helper/ItemHelper.java | 10 +- .../bloodmagic/util/helper/NBTHelper.java | 4 +- .../bloodmagic/util/helper/NetworkHelper.java | 8 +- .../bloodmagic/util/helper/PlayerHelper.java | 10 +- .../util/helper/PlayerSacrificeHelper.java | 24 +-- .../util/helper/PurificationHelper.java | 14 +- .../bloodmagic/util/helper/RitualHelper.java | 34 ++-- 484 files changed, 4924 insertions(+), 4962 deletions(-) diff --git a/build.gradle b/build.gradle index 35276bea..b3c27f49 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,23 @@ buildscript { repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + jcenter() mavenCentral() - maven { url "http://files.minecraftforge.net/maven" } - maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true } } plugins { - id "net.minecraftforge.gradle.forge" version "2.0.2" - id 'com.matthewprenger.cursegradle' version '1.1.0' - id 'maven-publish' + id "com.matthewprenger.cursegradle" version "1.3.0" + id "maven-publish" } -def build_number = 'CUSTOM' -if (System.getenv('BUILD_NUMBER') != null) - build_number = System.getenv('BUILD_NUMBER') +apply plugin: 'net.minecraftforge.gradle' -def username = "${mod_name}" -if (project.hasProperty('dev_username')) - username = "${dev_username}" +def build_number = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : 'CUSTOM' +def username = project.hasProperty('dev_username') ? "${dev_username}" : "${mod_name}" group = package_group archivesBaseName = mod_name @@ -33,38 +29,54 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" - deobfCompile "mcp.mobius.waila:Hwyla:${waila_version}" - deobfCompile "info.amerifrance.guideapi:Guide-API:${guideapi_version}" + minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" + compile fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") + compile fg.deobf("mcp.mobius.waila:Hwyla:${waila_version}") } minecraft { - version = "${mc_version}-${forge_version}" - runDir = "run" + mappings channel: "snapshot", version: "20190912-1.14.3" - replace "@VERSION@", project.version - replaceIn "BloodMagic.java" + runs { + client { + workingDirectory project.file('run') + property 'forge.logging.markers', '' + property 'forge.logging.console.level', 'info' + property 'username', username - clientRunArgs += "--username=${username}" + mods { + bloodmagic { + source sourceSets.main + } + } + } - if (project.hasProperty('mappings_version')) - mappings = project.mappings_version + server { + workingDirectory project.file('run/server') + property 'forge.logging.markers', '' + property 'forge.logging.console.level', 'info' + + mods { + bloodmagic { + source sourceSets.main + } + } + } + } } +apply from: "gradle/process_mod_info.gradle" + processResources { inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version from(sourceSets.main.resources.srcDirs) { - include '**/*.info' - include '**/*.properties' + include '**/*.toml' - expand 'version': project.version, 'mcversion': project.minecraft.version + expand 'version': project.version } - from(sourceSets.main.resources.srcDirs) { - exclude '**/*.info' - exclude '**/*.properties' + exclude '**/*.toml' } } @@ -77,7 +89,6 @@ allprojects { jar { classifier = '' from sourceSets.main.output - from sourceSets.api.output manifest.mainAttributes( "Built-By": System.getProperty('user.name'), "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", @@ -87,28 +98,21 @@ jar { ) } +// API jar task apiJar(type: Jar) { classifier = 'api' - from sourceSets.api.output - - // TODO: when FG bug is fixed, remove allJava from the api jar. - // https://github.com/MinecraftForge/ForgeGradle/issues/369 - // Gradle should be able to pull them from the -sources jar. - from sourceSets.api.allJava -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - from javadoc.destinationDir - classifier = 'javadoc' + include 'com/WayofTime/bloodmagic/api/**/*' + exclude 'com/WayofTime/bloodmagic/api/impl/**/*' + from sourceSets.main.allSource + from sourceSets.main.output } task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allJava - from sourceSets.api.allJava } -tasks.build.dependsOn javadoc, javadocJar, apiJar, sourcesJar +tasks.build.dependsOn apiJar, sourcesJar tasks.withType(JavaCompile) { task -> task.options.encoding = 'UTF-8' @@ -119,7 +123,6 @@ publishing { publications { mavenJava(MavenPublication) { artifact jar - artifact javadocJar artifact sourcesJar artifact apiJar } @@ -161,7 +164,6 @@ String getChangelogText() { def curseRelations = { optionalLibrary 'jei' optionalLibrary 'hwyla' - requiredLibrary 'guide-api' } curseforge { @@ -175,7 +177,6 @@ curseforge { relations curseRelations - addArtifact javadocJar addArtifact sourcesJar addArtifact apiJar } diff --git a/gradle.properties b/gradle.properties index 04505448..2e6ce016 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,13 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.4.2 -mc_version=1.12.2 -forge_version=14.23.5.2808 +mod_version=2.5.0 +mc_version=1.14.4 +forge_version=28.1.1 curse_id=224791 -mappings_version=stable_39 +mapping_channel=snapshot +mapping_version=20190912-1.14.3 -jei_version=4.14.4.264 -waila_version=1.8.26-B41_1.12.2 +jei_version=6.0.0.11 +waila_version=1.10.6-B67_1.14.4 guideapi_version=1.12-2.1.8-63 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a5ffca25..9d7c377b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 4f763a30..19437999 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -16,7 +16,7 @@ import WayofTime.bloodmagic.structures.ModDungeons; import WayofTime.bloodmagic.util.PluginUtil; import WayofTime.bloodmagic.util.handler.IMCHandler; import com.google.common.collect.Lists; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.common.config.Configuration; @@ -40,13 +40,13 @@ public class BloodMagic { public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); public static final List> PLUGINS = Lists.newArrayList(); public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg"))); - public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { + public static final ItemGroup TAB_BM = new ItemGroup(MODID + ".creativeTab") { @Override public ItemStack createIcon() { return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); } }; - public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") { + public static ItemGroup TAB_TOMES = new ItemGroup(MODID + ".creativeTabTome") { @Override public ItemStack createIcon() { return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java index 6bac1e53..3db3f305 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.IAlchemyArray; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,13 +17,13 @@ public abstract class AlchemyArrayEffect { public abstract boolean update(TileEntity tile, int ticksActive); - public abstract void writeToNBT(NBTTagCompound tag); + public abstract void writeToNBT(CompoundNBT tag); - public abstract void readFromNBT(NBTTagCompound tag); + public abstract void readFromNBT(CompoundNBT tag); public abstract AlchemyArrayEffect getNewCopy(); - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java index 67dc2ac6..1f234cd9 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java @@ -5,15 +5,15 @@ import java.util.List; import javax.vecmath.Vector2d; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.projectile.EntityTippedArrow; -import net.minecraft.init.Items; -import net.minecraft.item.ItemArrow; +import net.minecraft.entity.MobEntity; +import net.minecraft.entity.monster.MonsterEntity; +import net.minecraft.entity.projectile.ArrowEntity; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.Items; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -23,7 +23,7 @@ import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.util.Utils; public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { - public EntityLiving target; + public MobEntity target; public int arrowTimer; public static final int ARROW_WINDUP = 50; private int lastChestSlot = -1; @@ -47,7 +47,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { if (chestTile == null) { return false; } - IItemHandler itemHandler = Utils.getInventory(chestTile, EnumFacing.UP); + IItemHandler itemHandler = Utils.getInventory(chestTile, Direction.UP); if (itemHandler == null) { return false; } @@ -55,7 +55,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { ItemStack arrowStack = new ItemStack(Items.AIR); if (lastChestSlot >= 0 && lastChestSlot < itemHandler.getSlots()) { ItemStack testStack = itemHandler.extractItem(lastChestSlot, 1, true); - if (testStack.isEmpty() || !(testStack.getItem() instanceof ItemArrow)) { + if (testStack.isEmpty() || !(testStack.getItem() instanceof ArrowItem)) { lastChestSlot = -1; } else { arrowStack = testStack; @@ -65,7 +65,7 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { if (lastChestSlot < 0) { for (int i = 0; i < itemHandler.getSlots(); i++) { ItemStack testStack = itemHandler.extractItem(i, 1, true); - if (!testStack.isEmpty() && testStack.getItem() instanceof ItemArrow) { + if (!testStack.isEmpty() && testStack.getItem() instanceof ArrowItem) { arrowStack = testStack; lastChestSlot = i; break; @@ -100,9 +100,9 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { arrowTimer = -1; } - List mobsInRange = world.getEntitiesWithinAABB(EntityMob.class, getBounds(pos)); + List mobsInRange = world.getEntitiesWithinAABB(MonsterEntity.class, getBounds(pos)); - for (EntityMob entity : mobsInRange) { + for (MonsterEntity entity : mobsInRange) { if (canFireOnMob(world, pos, entity))// && isMobInFilter(ent)) { target = entity; @@ -132,14 +132,14 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { return lastYaw; } - public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, EntityLiving targetMob) { + public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, MobEntity targetMob) { float vel = 3f; double damage = 2; if (!world.isRemote) { - if (arrowStack.getItem() instanceof ItemArrow) { + if (arrowStack.getItem() instanceof ArrowItem) { // ItemArrow arrow = (ItemArrow) arrowStack.getItem(); // EntityArrow entityarrow = arrow.createArrow(world, arrowStack, targetMob); - EntityTippedArrow entityarrow = new EntityTippedArrow(world); + ArrowEntity entityarrow = new ArrowEntity(world); entityarrow.setPotionEffect(arrowStack); entityarrow.posX = pos.getX() + 0.5; entityarrow.posY = pos.getY() + 0.5; @@ -192,12 +192,12 @@ public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index 9d8d63d5..3be0cbb8 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -5,12 +5,12 @@ import WayofTime.bloodmagic.fakePlayer.FakePlayerBM; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.mojang.authlib.GameProfile; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.EntityAITasks; -import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.entity.MobEntity; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.ai.goal.GoalSelector; +import net.minecraft.entity.ai.goal.GoalSelector.EntityAITaskEntry; import net.minecraft.entity.monster.*; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.pathfinding.Path; import net.minecraft.pathfinding.PathFinder; import net.minecraft.pathfinding.WalkNodeProcessor; @@ -28,7 +28,7 @@ import java.util.*; */ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { private FakePlayer target; - private Set tracking = new HashSet<>(); + private Set tracking = new HashSet<>(); private int counter = 0; private int maxMobsAttracted = 10000; @@ -48,7 +48,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { BlockPos pos = tile.getPos(); counter++; if (counter < 10) { - for (EntityLiving ent : tracking) { + for (MobEntity ent : tracking) { onEntityTick(pos, ent); } @@ -59,10 +59,10 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { World world = tile.getWorld(); - Set trackingThisTick = new HashSet<>(); - List entsInBounds = world.getEntitiesWithinAABB(EntityLiving.class, getBounds(pos)); + Set trackingThisTick = new HashSet<>(); + List entsInBounds = world.getEntitiesWithinAABB(MobEntity.class, getBounds(pos)); - for (EntityLiving ent : entsInBounds) { + for (MobEntity ent : entsInBounds) { if (!ent.isDead)// && isMobInFilter(ent)) { double x = (pos.getX() + 0.5D - ent.posX); @@ -92,7 +92,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { } } - for (EntityLiving e : tracking) { + for (MobEntity e : tracking) { if (!trackingThisTick.contains(e)) { onUntracked(e); } @@ -103,7 +103,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { return false; } - public boolean canEntityBeTracked(BlockPos pos, EntityLiving entity) { + public boolean canEntityBeTracked(BlockPos pos, MobEntity entity) { return getEntityCooldown(pos, entity) <= 0; } @@ -111,15 +111,15 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { return "BMAttractor:" + pos; } - public int getEntityCooldown(BlockPos pos, EntityLiving entity) { + public int getEntityCooldown(BlockPos pos, MobEntity entity) { return entity.getEntityData().getInteger(getPosKey(pos)); } - public void setEntityCooldown(BlockPos pos, EntityLiving entity, int cooldown) { + public void setEntityCooldown(BlockPos pos, MobEntity entity, int cooldown) { entity.getEntityData().setInteger(getPosKey(pos), cooldown); } - public void decrementEntityCooldown(BlockPos pos, EntityLiving entity) { + public void decrementEntityCooldown(BlockPos pos, MobEntity entity) { int cooldown = getEntityCooldown(pos, entity); if (cooldown > 0) { setEntityCooldown(pos, entity, cooldown - 1); @@ -134,29 +134,29 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { return 10; } - private void onUntracked(EntityLiving e) { - if (e instanceof EntityEnderman) { + private void onUntracked(MobEntity e) { + if (e instanceof EndermanEntity) { e.getEntityData().setBoolean("BM:tracked", false); } } - private void onTracked(EntityLiving e) { - if (e instanceof EntityEnderman) { + private void onTracked(MobEntity e) { + if (e instanceof EndermanEntity) { e.getEntityData().setBoolean("BM:tracked", true); } } - private void onEntityTick(BlockPos pos, EntityLiving ent) { - if (ent instanceof EntitySlime) { + private void onEntityTick(BlockPos pos, MobEntity ent) { + if (ent instanceof SlimeEntity) { ent.faceEntity(getTarget(ent.getEntityWorld(), pos), 10.0F, 20.0F); - } else if (ent instanceof EntitySilverfish) { + } else if (ent instanceof SilverfishEntity) { if (counter < 10) { return; } - EntitySilverfish sf = (EntitySilverfish) ent; + SilverfishEntity sf = (SilverfishEntity) ent; Path pathentity = getPathEntityToEntity(ent, getTarget(ent.getEntityWorld(), pos), getRange()); sf.getNavigator().setPath(pathentity, sf.getAIMoveSpeed()); - } else if (ent instanceof EntityBlaze) { + } else if (ent instanceof BlazeEntity) { double x = (pos.getX() + 0.5D - ent.posX); double y = (pos.getY() + 1D - ent.posY); double z = (pos.getZ() + 0.5D - ent.posZ); @@ -169,21 +169,21 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { } ent.motionZ += z / distance * speed; } - } else if (ent instanceof EntityPigZombie || ent instanceof EntitySpider) { + } else if (ent instanceof ZombiePigmanEntity || ent instanceof SpiderEntity) { forceMove(pos, ent); // ent.setAttackTarget(target); - } else if (ent instanceof EntityEnderman) { + } else if (ent instanceof EndermanEntity) { ent.setAttackTarget(getTarget(ent.getEntityWorld(), pos)); } } - private void forceMove(BlockPos pos, EntityLiving ent) { + private void forceMove(BlockPos pos, MobEntity ent) { double x = (pos.getX() + 0.5D - ent.posX); double y = (pos.getY() + 1D - ent.posY); double z = (pos.getZ() + 0.5D - ent.posZ); double distance = Math.sqrt(x * x + y * y + z * z); if (distance > 2) { - EntityMob mod = (EntityMob) ent; + MonsterEntity mod = (MonsterEntity) ent; mod.faceEntity(getTarget(ent.getEntityWorld(), pos), 180, 0); mod.getMoveHelper().strafe(0, 0.3f); if (mod.posY < pos.getY()) { @@ -200,10 +200,10 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { int targZ = MathHelper.floor(targetEntity.posZ); PathFinder pf = new PathFinder(new WalkNodeProcessor()); - return pf.findPath(targetEntity.getEntityWorld(), (EntityLiving) entity, new BlockPos(targX, targY, targZ), range); + return pf.findPath(targetEntity.getEntityWorld(), (MobEntity) entity, new BlockPos(targX, targY, targZ), range); } - private boolean trackMob(BlockPos pos, EntityLiving ent) { + private boolean trackMob(BlockPos pos, MobEntity ent) { //TODO: Figure out if this crud is needed if (useSetTarget(ent)) { ent.setAttackTarget(getTarget(ent.getEntityWorld(), pos)); @@ -215,13 +215,13 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { } } - private boolean useSetTarget(EntityLiving ent) { - return ent instanceof EntityPigZombie || ent instanceof EntitySpider || ent instanceof EntitySilverfish; + private boolean useSetTarget(MobEntity ent) { + return ent instanceof ZombiePigmanEntity || ent instanceof SpiderEntity || ent instanceof SilverfishEntity; } - public void removeAssignedAITask(BlockPos pos, EntityLiving ent) { + public void removeAssignedAITask(BlockPos pos, MobEntity ent) { Set entries = ent.tasks.taskEntries; - EntityAIBase remove = null; + Goal remove = null; for (EntityAITaskEntry entry : entries) { if (entry.action instanceof AttractTask) { AttractTask at = (AttractTask) entry.action; @@ -237,11 +237,11 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { } } - private boolean attractUsingAITask(BlockPos pos, EntityLiving ent) { + private boolean attractUsingAITask(BlockPos pos, MobEntity ent) { tracking.add(ent); Set entries = ent.tasks.taskEntries; // boolean hasTask = false; - EntityAIBase remove = null; + Goal remove = null; // boolean isTracked; for (EntityAITaskEntry entry : entries) { if (entry.action instanceof AttractTask) { @@ -263,10 +263,10 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { return true; } - private void cancelCurrentTasks(EntityLiving ent) { + private void cancelCurrentTasks(MobEntity ent) { Iterator iterator = ent.tasks.taskEntries.iterator(); - List currentTasks = new ArrayList<>(); + List currentTasks = new ArrayList<>(); while (iterator.hasNext()) { EntityAITaskEntry entityaitaskentry = iterator.next(); if (entityaitaskentry != null) { @@ -285,24 +285,24 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { } } - private boolean applySpecialCase(BlockPos pos, EntityLiving ent) { - if (ent instanceof EntitySlime) { + private boolean applySpecialCase(BlockPos pos, MobEntity ent) { + if (ent instanceof SlimeEntity) { ent.faceEntity(getTarget(ent.getEntityWorld(), pos), 10.0F, 20.0F); // ent.setAttackTarget(getTarget(ent.worldObj, pos)); return true; - } else if (ent instanceof EntitySilverfish) { - EntitySilverfish es = (EntitySilverfish) ent; + } else if (ent instanceof SilverfishEntity) { + SilverfishEntity es = (SilverfishEntity) ent; Path pathentity = getPathEntityToEntity(ent, getTarget(ent.getEntityWorld(), pos), getRange()); es.getNavigator().setPath(pathentity, es.getAIMoveSpeed()); return true; - } else if (ent instanceof EntityBlaze) { + } else if (ent instanceof BlazeEntity) { return true; } return false; } - private boolean useSpecialCase(EntityLiving ent) { - return ent instanceof EntitySlime || ent instanceof EntitySilverfish || ent instanceof EntityBlaze; + private boolean useSpecialCase(MobEntity ent) { + return ent instanceof SlimeEntity || ent instanceof SilverfishEntity || ent instanceof BlazeEntity; } public FakePlayer getTarget(World world, BlockPos pos) { @@ -315,12 +315,12 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @@ -329,15 +329,15 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { return new AlchemyArrayEffectAttractor(key); } - private static class AttractTask extends EntityAIBase { - private EntityLiving mob; + private static class AttractTask extends Goal { + private MobEntity mob; private BlockPos coord; private FakePlayer target; private int updatesSincePathing; private boolean started = false; - private AttractTask(EntityLiving mob, FakePlayer target, BlockPos coord) { + private AttractTask(MobEntity mob, FakePlayer target, BlockPos coord) { this.mob = mob; this.coord = coord; this.target = target; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index d3e9849c..6659fbf1 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.effect.LightningBoltEntity; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -30,7 +30,7 @@ public class AlchemyArrayEffectBinding extends AlchemyArrayEffectCrafting { BlockPos pos = tile.getPos(); ItemStack output = outputStack.copy(); - EntityItem outputEntity = new EntityItem(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); + ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); tile.getWorld().spawnEntity(outputEntity); @@ -49,18 +49,18 @@ public class AlchemyArrayEffectBinding extends AlchemyArrayEffectCrafting { double dispX = distance * Math.sin(angle); double dispZ = -distance * Math.cos(angle); - EntityLightningBolt lightning = new EntityLightningBolt(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ, true); + LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ, true); world.spawnEntity(lightning); } } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { //EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { //EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java index cd35b720..69f5be05 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.IAlchemyArray; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -20,13 +20,13 @@ public class AlchemyArrayEffectBounce extends AlchemyArrayEffect { } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { if (entity.isSneaking()) { entity.fallDistance = 0; } else if (entity.motionY < 0.0D) { entity.motionY = -entity.motionY; - if (!(entity instanceof EntityLivingBase)) { + if (!(entity instanceof LivingEntity)) { entity.motionY *= 0.8D; } @@ -35,12 +35,12 @@ public class AlchemyArrayEffectBounce extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java index 9f658335..df9ee547 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.alchemyArray; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -36,7 +36,7 @@ public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect { ItemStack output = outputStack.copy(); - EntityItem outputEntity = new EntityItem(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); + ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); tile.getWorld().spawnEntity(outputEntity); @@ -47,12 +47,12 @@ public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java index b96c9052..34f2eae3 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -31,7 +31,7 @@ public class AlchemyArrayEffectCraftingNew extends AlchemyArrayEffect { ItemStack output = recipe.getOutput().copy(); - EntityItem outputEntity = new EntityItem(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); + ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); tile.getWorld().spawnEntity(outputEntity); @@ -42,12 +42,12 @@ public class AlchemyArrayEffectCraftingNew extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java index 16ce80b1..73d8c090 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java @@ -4,15 +4,15 @@ import java.util.List; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import net.minecraft.block.Block; -import net.minecraft.block.BlockFurnace; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; +import net.minecraft.block.FurnaceBlock; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.FurnaceTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -29,9 +29,9 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { public boolean update(TileEntity tile, int ticksActive) { BlockPos pos = tile.getPos(); World world = tile.getWorld(); - EntityPlayer sacrifice = null; + PlayerEntity sacrifice = null; - for (EnumFacing face : EnumFacing.VALUES) { + for (Direction face : Direction.VALUES) { BlockPos furnacePos = pos.offset(face); Block block = world.getBlockState(furnacePos).getBlock(); if (block != Blocks.FURNACE) //This will only work vanilla furnaces. No others! @@ -40,13 +40,13 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { } TileEntity bottomTile = world.getTileEntity(furnacePos); - if (bottomTile instanceof TileEntityFurnace) { - TileEntityFurnace furnaceTile = (TileEntityFurnace) bottomTile; + if (bottomTile instanceof FurnaceTileEntity) { + FurnaceTileEntity furnaceTile = (FurnaceTileEntity) bottomTile; if (canFurnaceSmelt(furnaceTile) && !furnaceTile.isBurning()) { if (sacrifice == null || sacrifice.isDead) { AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); - for (EntityPlayer player : playerList) { + List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, bb); + for (PlayerEntity player : playerList) { if (!player.isDead) { sacrifice = player; } @@ -70,13 +70,13 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { return false; } - public static boolean addFuelTime(TileEntityFurnace furnaceTile, World world, BlockPos furnacePos, int cookTime) { + public static boolean addFuelTime(FurnaceTileEntity furnaceTile, World world, BlockPos furnacePos, int cookTime) { furnaceTile.setField(0, cookTime); - BlockFurnace.setState(true, world, furnacePos); + FurnaceBlock.setState(true, world, furnacePos); return true; } - public static boolean canFurnaceSmelt(TileEntityFurnace furnaceTile) { + public static boolean canFurnaceSmelt(FurnaceTileEntity furnaceTile) { ItemStack burnStack = furnaceTile.getStackInSlot(0); if (burnStack.isEmpty()) { return false; @@ -103,12 +103,12 @@ public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index 1368cb50..ad2de048 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.alchemyArray; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.block.BlockState; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -71,7 +71,7 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { if (checkIfSphere(radius, i, j, k)) { BlockPos newPos = pos.add(i, j, k); BlockPos offsetPos = newPos.up(teleportHeightOffset); - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); TeleposeEvent event = new TeleposeEvent(world, newPos, world, offsetPos); if (state.getBlockHardness(world, newPos) > 0 && !MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) { @@ -112,7 +112,7 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger("radius", radius); tag.setInteger("teleportHeightOffset", teleportHeightOffset); tag.setInteger(Constants.NBT.X_COORD, currentPos.getX()); @@ -121,7 +121,7 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { radius = tag.getInteger("radius"); teleportHeightOffset = tag.getInteger("teleportHeightOffset"); currentPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java index d0b08483..8277ff93 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java @@ -4,30 +4,27 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityRegistry; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeSacrificeCraft; import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.PurificationHelper; public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { public static final AreaDescriptor itemDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); @@ -59,11 +56,11 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { if (ticksActive >= 200) { BlockPos pos = tile.getPos(); - List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDescriptor.getAABB(pos)); + List itemList = world.getEntitiesWithinAABB(ItemEntity.class, itemDescriptor.getAABB(pos)); List inputList = new ArrayList(); - for (EntityItem entityItem : itemList) { + for (ItemEntity entityItem : itemList) { if (entityItem.isDead || entityItem.getItem().isEmpty()) { continue; } @@ -85,8 +82,8 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { double healthRequired = recipe.getHealthRequired(); double healthAvailable = 0; - List livingEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, mobDescriptor.getAABB(pos)); - for (EntityLivingBase living : livingEntities) { + List livingEntities = world.getEntitiesWithinAABB(LivingEntity.class, mobDescriptor.getAABB(pos)); + for (LivingEntity living : livingEntities) { double health = getEffectiveHealth(living); if (health > 0) { healthAvailable += health; @@ -102,7 +99,7 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { if (craftTime >= REQUIRED_CRAFT_TIME) { if (!world.isRemote) { - for (EntityLivingBase living : livingEntities) { + for (LivingEntity living : livingEntities) { double health = getEffectiveHealth(living); if (healthAvailable > 0 && health > 0) { healthAvailable -= health; @@ -116,7 +113,7 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { } } - for (EntityItem itemEntity : itemList) { + for (ItemEntity itemEntity : itemList) { itemEntity.getItem().setCount(itemEntity.getItem().getCount() - 1); if (itemEntity.getItem().isEmpty()) //TODO: Check container { @@ -124,13 +121,13 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { } } - world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5, recipe.getOutput())); + world.spawnEntity(new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5, recipe.getOutput())); craftTime = 0; } } else { if (world.isRemote) { Vec3d spawnPosition = new Vec3d(pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5); - for (EntityItem itemEntity : itemList) { + for (ItemEntity itemEntity : itemList) { ItemStack stack = itemEntity.getItem(); double velocityFactor = 0.1; @@ -146,7 +143,7 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { // world.spawnParticle(EnumParticleTypes.ITEM_CRACK, spawnPosition.x, spawnPosition.y, spawnPosition.z, velVec2.x, velVec2.y, velVec2.z, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); } - for (EntityLivingBase living : livingEntities) { + for (LivingEntity living : livingEntities) { double health = getEffectiveHealth(living); if (health <= 0) { continue; @@ -165,14 +162,14 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { } //Future-proofing in case I want to make different mobs give different effective health - public double getEffectiveHealth(EntityLivingBase living) { + public double getEffectiveHealth(LivingEntity living) { if (living == null) return 0; if (!living.isNonBoss()) return 0; - if (living instanceof EntityPlayer) + if (living instanceof PlayerEntity) return 0; if (living.isChild() && !(living instanceof IMob)) @@ -189,12 +186,12 @@ public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java index 92728c9d..c626a085 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.IAlchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -21,13 +21,13 @@ public class AlchemyArrayEffectMovement extends AlchemyArrayEffect { } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { double motionY = 0.5; double motionYGlowstoneMod = 0.05; double speed = 1.5; double speedRedstoneMod = 0.15; - EnumFacing direction = array.getRotation(); + Direction direction = array.getRotation(); TileAlchemyArray tileArray = (TileAlchemyArray) array; motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); @@ -66,12 +66,12 @@ public class AlchemyArrayEffectMovement extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java index beb4ba46..2188ff18 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.ISigil; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; public class AlchemyArrayEffectSigil extends AlchemyArrayEffect { @@ -23,12 +23,12 @@ public class AlchemyArrayEffectSigil extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index d297eb60..170877e6 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -2,15 +2,15 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.google.common.base.Predicate; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.MobEntity; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.EntityAINearestAttackableTarget; -import net.minecraft.entity.ai.EntityAITasks; -import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.ai.goal.GoalSelector; +import net.minecraft.entity.ai.goal.GoalSelector.EntityAITaskEntry; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; +import net.minecraft.entity.monster.MonsterEntity; +import net.minecraft.entity.monster.SkeletonEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -25,8 +25,8 @@ import java.util.List; * Credits for the initial code go to Crazy Pants of EIO. */ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { - public static Predicate checkSkeleton = input -> !(input instanceof EntitySkeleton); - private EntitySkeleton turret; + public static Predicate checkSkeleton = input -> !(input instanceof SkeletonEntity); + private SkeletonEntity turret; public AlchemyArrayEffectSkeletonTurret(String key) { super(key); @@ -55,9 +55,9 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { World world = tile.getWorld(); - List skeletonsInRange = world.getEntitiesWithinAABB(EntitySkeleton.class, getBounds(pos)); + List skeletonsInRange = world.getEntitiesWithinAABB(SkeletonEntity.class, getBounds(pos)); - for (EntitySkeleton entity : skeletonsInRange) { + for (SkeletonEntity entity : skeletonsInRange) { if (!entity.isDead)// && isMobInFilter(ent)) { modifyAITargetTasks(entity); @@ -87,20 +87,20 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { // e.getEntityData().setBoolean("BM:tracked", true); // } - private boolean modifyAITargetTasks(EntitySkeleton entity) { + private boolean modifyAITargetTasks(SkeletonEntity entity) { cancelCurrentTargetTasks(entity); // entity.setCombatTask(); - entity.targetTasks.addTask(1, new EntityAINearestAttackableTarget(entity, EntityMob.class, 10, true, false, checkSkeleton)); + entity.targetTasks.addTask(1, new NearestAttackableTargetGoal(entity, MonsterEntity.class, 10, true, false, checkSkeleton)); entity.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0); entity.getEntityAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(1); return true; } - private void cancelCurrentTargetTasks(EntityLiving entity) { + private void cancelCurrentTargetTasks(MobEntity entity) { Iterator iterator = entity.targetTasks.taskEntries.iterator(); - List currentTasks = new ArrayList<>(); + List currentTasks = new ArrayList<>(); while (iterator.hasNext()) { EntityAITaskEntry entityaitaskentry = iterator.next(); if (entityaitaskentry != null)// && entityaitaskentry.action instanceof EntityAITarget) @@ -115,12 +115,12 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @@ -129,15 +129,15 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { return new AlchemyArrayEffectSkeletonTurret(key); } - private static class AttractTask extends EntityAIBase { - private EntityLiving mob; + private static class AttractTask extends Goal { + private MobEntity mob; private BlockPos coord; private FakePlayer target; private int updatesSincePathing; private boolean started = false; - private AttractTask(EntityLiving mob, FakePlayer target, BlockPos coord) { + private AttractTask(MobEntity mob, FakePlayer target, BlockPos coord) { this.mob = mob; this.coord = coord; this.target = target; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java index 57d7f774..47d36731 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.alchemyArray; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -21,19 +21,19 @@ public class AlchemyArrayEffectSpike extends AlchemyArrayEffect { } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { - if (entity instanceof EntityLivingBase) { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { + if (entity instanceof LivingEntity) { entity.attackEntityFrom(DamageSource.CACTUS, 2); } } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java index 82b16d12..04fee39c 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.alchemyArray; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.SoundEvents; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.SPacketUpdateHealth; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; +import net.minecraft.util.SoundEvents; +import net.minecraft.network.play.server.SUpdateHealthPacket; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ServerWorld; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.iface.IAlchemyArray; @@ -31,13 +31,13 @@ public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect { } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { - EnumFacing direction = array.getRotation(); + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { + Direction direction = array.getRotation(); teleportEntityInDirection(world, pos, entity, direction); } - public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, EnumFacing direction) { + public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, Direction direction) { if (entity != null && entity.timeUntilPortal <= 0) { for (int i = 1; i <= MAX_SEARCH; i++) { BlockPos offsetPos = currentPos.offset(direction, i); @@ -50,15 +50,15 @@ public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect { entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); entity.timeUntilPortal = TELEPORT_DELAY; if (!world.isRemote) { - if (entity instanceof EntityPlayer) { - EntityPlayerMP player = (EntityPlayerMP) entity; + if (entity instanceof PlayerEntity) { + ServerPlayerEntity player = (ServerPlayerEntity) entity; player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.getEntityWorld().updateEntityWithOptionalForce(player, false); - player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + player.connection.sendPacket(new SUpdateHealthPacket(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); } else { - WorldServer worldServer = (WorldServer) entity.getEntityWorld(); + ServerWorld worldServer = (ServerWorld) entity.getEntityWorld(); entity.setPosition(x + 0.5, y + 0.5, z + 0.5); worldServer.resetUpdateEntityTick(); @@ -71,12 +71,12 @@ public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java index c73d7da1..dfd9f1be 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.iface.IAlchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -20,7 +20,7 @@ public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect { } @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { double motionY = 1; double motionYGlowstoneMod = 0.1; double motionYFeatherMod = 0.05; @@ -34,12 +34,12 @@ public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 51782a6b..0f24ac37 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; public class AlchemyCircleRenderer { @@ -86,8 +86,8 @@ public class AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java index acde6d6d..abbf30c4 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.tile.TileAltar; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,7 +26,7 @@ public class AltarUtil { for (AltarTier tier : AltarTier.values()) { for (AltarComponent component : tier.getAltarComponents()) { BlockPos componentPos = pos.add(component.getOffset()); - IBlockState worldState = world.getBlockState(componentPos); + BlockState worldState = world.getBlockState(componentPos); if (worldState.getBlock() instanceof IAltarComponent) if (((IAltarComponent) worldState.getBlock()).getType(world, worldState, componentPos) == component.getComponent()) @@ -35,7 +35,7 @@ public class AltarUtil { if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) continue; - List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); if (!validStates.contains(worldState)) return lastCheck; } @@ -55,7 +55,7 @@ public class AltarUtil { continue; BlockPos componentPos = pos.add(component.getOffset()); - IBlockState state = world.getBlockState(componentPos); + BlockState state = world.getBlockState(componentPos); if (state.getBlock() instanceof BlockBloodRune) upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos, state)); } @@ -71,11 +71,11 @@ public class AltarUtil { for (AltarTier tier : AltarTier.values()) { for (AltarComponent component : tier.getAltarComponents()) { BlockPos componentPos = pos.add(component.getOffset()); - IBlockState worldState = world.getBlockState(componentPos); + BlockState worldState = world.getBlockState(componentPos); if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) continue; - List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); if (!validStates.contains(worldState)) return Pair.of(componentPos, component.getComponent()); } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 5dda98bc..7d13dc2e 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -16,15 +16,15 @@ import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.base.Enums; -import net.minecraft.block.BlockRedstoneLight; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; +import net.minecraft.block.RedstoneLampBlock; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -75,7 +75,7 @@ public class BloodAltar implements IFluidHandler { this.tileAltar = tileAltar; } - public void readFromNBT(NBTTagCompound tagCompound) { + public void readFromNBT(CompoundNBT tagCompound) { if (!tagCompound.hasKey(Constants.NBT.EMPTY)) { FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagCompound); @@ -119,7 +119,7 @@ public class BloodAltar implements IFluidHandler { currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); } - public void writeToNBT(NBTTagCompound tagCompound) { + public void writeToNBT(CompoundNBT tagCompound) { if (fluid != null) fluid.writeToNBT(tagCompound); @@ -213,9 +213,9 @@ public class BloodAltar implements IFluidHandler { lockdownDuration--; if (internalCounter % 20 == 0) { - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { BlockPos newPos = pos.offset(facing); - IBlockState block = world.getBlockState(newPos); + BlockState block = world.getBlockState(newPos); block.getBlock().onNeighborChange(world, newPos, pos); } } @@ -244,7 +244,7 @@ public class BloodAltar implements IFluidHandler { if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) { /* Redstone Lamp below altar: Switch Off */ - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); if (state.getValue(BlockAltar.POWERED)) { world.setBlockState(pos, state.cycleProperty(BlockAltar.POWERED), 3); world.notifyNeighborsOfStateChange(pos, RegistrarBloodMagicBlocks.ALTAR, false); @@ -301,16 +301,16 @@ public class BloodAltar implements IFluidHandler { hasOperated = true; - if (internalCounter % 4 == 0 && world instanceof WorldServer) { - WorldServer server = (WorldServer) world; + if (internalCounter % 4 == 0 && world instanceof ServerWorld) { + ServerWorld server = (ServerWorld) world; server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.2, 0, 0.2, 0); } } else if (!hasOperated && progress > 0) { progress = Math.max(0, progress - (int) (efficiencyMultiplier * drainRate)); - if (internalCounter % 2 == 0 && world instanceof WorldServer) { - WorldServer server = (WorldServer) world; + if (internalCounter % 2 == 0 && world instanceof ServerWorld) { + ServerWorld server = (ServerWorld) world; server.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0); } } @@ -324,14 +324,14 @@ public class BloodAltar implements IFluidHandler { tileAltar.setInventorySlotContents(0, event.getOutput()); progress = 0; - if (world instanceof WorldServer) { - WorldServer server = (WorldServer) world; + if (world instanceof ServerWorld) { + ServerWorld server = (ServerWorld) world; server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); } /* Redstone Lamp below altar: Switch On */ /* Switches on when crafting finishes */ - if (world.getBlockState(pos.down()).getBlock() instanceof BlockRedstoneLight) { + if (world.getBlockState(pos.down()).getBlock() instanceof RedstoneLampBlock) { world.setBlockState(pos, world.getBlockState(pos).cycleProperty(BlockAltar.POWERED), 3); world.notifyNeighborsOfStateChange(pos, RegistrarBloodMagicBlocks.ALTAR, false); } @@ -357,8 +357,8 @@ public class BloodAltar implements IFluidHandler { int drain = NetworkHelper.getSoulNetwork(binding).add(SoulTicket.block(world, pos, liquidDrained), (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; - if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer) { - WorldServer server = (WorldServer) world; + if (drain > 0 && internalCounter % 4 == 0 && world instanceof ServerWorld) { + ServerWorld server = (ServerWorld) world; server.spawnParticle(EnumParticleTypes.SPELL_WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0, 0, 0, 0.001); } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java index 6a96dc66..b1b4635a 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.altar; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -8,5 +8,5 @@ import javax.annotation.Nullable; public interface IAltarComponent { @Nullable - ComponentType getType(World world, IBlockState state, BlockPos pos); + ComponentType getType(World world, BlockState state, BlockPos pos); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 528f99ab..8401afe0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import javax.annotation.Nonnull; import java.util.List; @@ -17,7 +17,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { private final BloodMagicBlacklist blacklist; private final BloodMagicRecipeRegistrar recipeRegistrar; private final BloodMagicValueManager valueManager; - private final Multimap altarComponents; + private final Multimap altarComponents; public BloodMagicAPI() { this.blacklist = new BloodMagicBlacklist(); @@ -45,7 +45,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { } @Override - public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { + public void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) { ComponentType component = null; for (ComponentType type : ComponentType.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { @@ -61,7 +61,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { } @Override - public void unregisterAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { + public void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) { ComponentType component = null; for (ComponentType type : ComponentType.VALUES) { if (type.name().equalsIgnoreCase(componentType)) { @@ -77,7 +77,7 @@ public class BloodMagicAPI implements IBloodMagicAPI { } @Nonnull - public List getComponentStates(ComponentType component) { - return (List) altarComponents.get(component); + public List getComponentStates(ComponentType component) { + return (List) altarComponents.get(component); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java index 18029c71..74a668fc 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; @@ -13,10 +13,10 @@ import java.util.Set; public class BloodMagicBlacklist implements IBloodMagicBlacklist { - private final Set teleposer; + private final Set teleposer; private final Set teleposerEntities; - private final Set transposition; - private final Set greenGrove; + private final Set transposition; + private final Set greenGrove; private final Set sacrifice; public BloodMagicBlacklist() { @@ -28,7 +28,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } @Override - public void addTeleposer(@Nonnull IBlockState state) { + public void addTeleposer(@Nonnull BlockState state) { if (!teleposer.contains(state)) { BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state); teleposer.add(state); @@ -36,7 +36,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } public void addTeleposer(@Nonnull Block block) { - for (IBlockState state : block.getBlockState().getValidStates()) + for (BlockState state : block.getBlockState().getValidStates()) addTeleposer(state); } @@ -49,7 +49,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } @Override - public void addTransposition(@Nonnull IBlockState state) { + public void addTransposition(@Nonnull BlockState state) { if (!transposition.contains(state)) { BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state); transposition.add(state); @@ -57,12 +57,12 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } public void addTransposition(@Nonnull Block block) { - for (IBlockState state : block.getBlockState().getValidStates()) + for (BlockState state : block.getBlockState().getValidStates()) addTransposition(state); } @Override - public void addGreenGrove(@Nonnull IBlockState state) { + public void addGreenGrove(@Nonnull BlockState state) { if (!greenGrove.contains(state)) { BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state); greenGrove.add(state); @@ -70,7 +70,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { } public void addGreenGrove(@Nonnull Block block) { - for (IBlockState state : block.getBlockState().getValidStates()) + for (BlockState state : block.getBlockState().getValidStates()) addGreenGrove(state); } @@ -84,7 +84,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { // Internal use getters - public Set getTeleposer() { + public Set getTeleposer() { return ImmutableSet.copyOf(teleposer); } @@ -92,11 +92,11 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist { return ImmutableSet.copyOf(teleposerEntities); } - public Set getTransposition() { + public Set getTransposition() { return ImmutableSet.copyOf(transposition); } - public Set getGreenGrove() { + public Set getGreenGrove() { return ImmutableSet.copyOf(greenGrove); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index c59bbbe6..5f4bb3d3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -17,7 +17,7 @@ import WayofTime.bloodmagic.incense.EnumTranquilityType; import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java index 5c894574..830db0c3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java @@ -7,7 +7,7 @@ import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; @@ -16,7 +16,7 @@ import java.util.Map; public class BloodMagicValueManager implements IBloodMagicValueManager { private final Map sacrificial; - private final Map tranquility; + private final Map tranquility; public BloodMagicValueManager() { this.sacrificial = Maps.newHashMap(); @@ -30,7 +30,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { } @Override - public void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value) { + public void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value) { EnumTranquilityType tranquility = null; for (EnumTranquilityType type : EnumTranquilityType.values()) { if (type.name().equalsIgnoreCase(tranquilityType)) { @@ -46,7 +46,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { } public void setTranquility(Block block, TranquilityStack tranquilityStack) { - for (IBlockState state : block.getBlockState().getValidStates()) { + for (BlockState state : block.getBlockState().getValidStates()) { BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); tranquility.put(state, tranquilityStack); } @@ -56,7 +56,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager { return ImmutableMap.copyOf(sacrificial); } - public Map getTranquility() { + public Map getTranquility() { return ImmutableMap.copyOf(tranquility); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 589c8b16..95ed17c9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -7,17 +7,17 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -41,12 +41,12 @@ public class BlockAlchemyArray extends Block { } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { + public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { // No-op } @Override - public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollision(World world, BlockPos pos, BlockState state, Entity entity) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileAlchemyArray) { ((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity); @@ -54,7 +54,7 @@ public class BlockAlchemyArray extends Block { } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return ARRAY_AABB; } @@ -65,32 +65,32 @@ public class BlockAlchemyArray extends Block { } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.INVISIBLE; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.INVISIBLE; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { TileAlchemyArray array = (TileAlchemyArray) world.getTileEntity(pos); if (array == null) @@ -135,7 +135,7 @@ public class BlockAlchemyArray extends Block { } @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES); } @@ -145,7 +145,7 @@ public class BlockAlchemyArray extends Block { } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileAlchemyArray alchemyArray = (TileAlchemyArray) world.getTileEntity(blockPos); if (alchemyArray != null) alchemyArray.dropItems(); @@ -154,13 +154,13 @@ public class BlockAlchemyArray extends Block { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileAlchemyArray(); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index c8867b87..2520e983 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -5,18 +5,18 @@ import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; import WayofTime.bloodmagic.tile.TileAlchemyTable; import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -26,7 +26,7 @@ import javax.annotation.Nullable; public class BlockAlchemyTable extends Block implements IBMBlock { public static final PropertyBool INVISIBLE = PropertyBool.create("invisible"); - public static final PropertyEnum DIRECTION = PropertyEnum.create("direction", EnumFacing.class); + public static final PropertyEnum DIRECTION = PropertyEnum.create("direction", Direction.class); private static final AxisAlignedBB BODY = new AxisAlignedBB(0, 0, 0, 16 / 16F, 13 / 16F, 16 / 16F); public BlockAlchemyTable() { @@ -42,42 +42,42 @@ public class BlockAlchemyTable extends Block implements IBMBlock { // setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); } - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return BODY; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { + public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.TRANSLUCENT; } @Override - public IBlockState getStateFromMeta(int meta) { + public BlockState getStateFromMeta(int meta) { return this.getDefaultState(); } @@ -85,12 +85,12 @@ public class BlockAlchemyTable extends Block implements IBMBlock { * Convert the BlockState into the correct metadata value */ @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { return 0; } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileAlchemyTable) { return state.withProperty(INVISIBLE, ((TileAlchemyTable) tile).isInvisible()).withProperty(DIRECTION, ((TileAlchemyTable) tile).getDirection()); @@ -105,7 +105,7 @@ public class BlockAlchemyTable extends Block implements IBMBlock { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { BlockPos position = pos; TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileAlchemyTable) { @@ -124,7 +124,7 @@ public class BlockAlchemyTable extends Block implements IBMBlock { } @Override - public void breakBlock(World world, BlockPos pos, IBlockState blockState) { + public void breakBlock(World world, BlockPos pos, BlockState blockState) { TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos); if (tile != null && !tile.isSlave()) { tile.dropItems(); @@ -134,18 +134,18 @@ public class BlockAlchemyTable extends Block implements IBMBlock { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileAlchemyTable(); } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos); if (tile != null) { BlockPos connectedPos = tile.getConnectedPos(); @@ -158,7 +158,7 @@ public class BlockAlchemyTable extends Block implements IBMBlock { } @Override - public ItemBlock getItem() { + public BlockItem getItem() { return new ItemBlockAlchemyTable(this); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 712adb94..60482da1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -17,22 +17,22 @@ import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; @@ -57,17 +57,17 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl setHarvestLevel("pickaxe", 1); } - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return BODY; } @Override - public boolean hasComparatorInputOverride(IBlockState state) { + public boolean hasComparatorInputOverride(BlockState state) { return true; } @Override - public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) { if (world.isRemote) return 0; @@ -102,32 +102,32 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return true; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { TileAltar altar = (TileAltar) world.getTileEntity(pos); if (altar == null || player.isSneaking()) @@ -150,7 +150,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileEntity tile = world.getTileEntity(blockPos); if (tile instanceof TileAltar) ((TileAltar) tile).dropItems(); @@ -159,41 +159,41 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileAltar(); } // IDocumentedBlock @Override - public List getDocumentation(EntityPlayer player, World world, BlockPos pos, IBlockState state) { + public List getDocumentation(PlayerEntity player, World world, BlockPos pos, BlockState state) { List docs = new ArrayList<>(); IBloodAltar altar = ((IBloodAltar) world.getTileEntity(pos)); Pair missingBlock = AltarUtil.getFirstMissingComponent(world, pos, altar.getTier().toInt()); if (missingBlock != null) - docs.add(new TextComponentTranslation("chat.bloodmagic.altar.nextTier", new TextComponentTranslation(missingBlock.getRight().getKey()), Utils.prettifyBlockPosString(missingBlock.getLeft()))); + docs.add(new TranslationTextComponent("chat.bloodmagic.altar.nextTier", new TranslationTextComponent(missingBlock.getRight().getKey()), Utils.prettifyBlockPosString(missingBlock.getLeft()))); return docs; } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } /* Redstone code, taken from BlockLever */ - public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + public int getWeakPower(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { return blockState.getValue(POWERED) ? 15 : 0; } - public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + public int getStrongPower(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { if (!blockState.getValue(POWERED)) { return 0; } else { @@ -201,15 +201,15 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl } } - public boolean canProvidePower(IBlockState state) { + public boolean canProvidePower(BlockState state) { return true; } - public IBlockState getStateFromMeta(int meta) { + public BlockState getStateFromMeta(int meta) { return this.getDefaultState().withProperty(POWERED, meta > 0); } - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { return state.getValue(POWERED) ? 1 : 0; } @@ -217,7 +217,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl return new BlockStateContainer(this, POWERED); } - public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + public BlockState getStateForPlacement(World worldIn, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer) { return this.getDefaultState().withProperty(POWERED, false); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index 99b5a6e2..cfa597dc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -3,14 +3,14 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.particle.ParticleManager; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -32,13 +32,13 @@ public class BlockBloodLight extends Block { } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return AABB; } @Nullable @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(BlockState blockState, IBlockAccess worldIn, BlockPos pos) { return NULL_AABB; } @@ -54,27 +54,27 @@ public class BlockBloodLight extends Block { } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public int getLightValue(IBlockState state) { + public int getLightValue(BlockState state) { return 15; } @@ -90,12 +90,12 @@ public class BlockBloodLight extends Block { @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - EntityPlayerSP player = Minecraft.getMinecraft().player; + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { + ClientPlayerEntity player = Minecraft.getMinecraft().player; if (rand.nextInt(3) != 0) { world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - ItemStack heldItem = player.getHeldItem(EnumHand.MAIN_HAND); + ItemStack heldItem = player.getHeldItem(Hand.MAIN_HAND); if (heldItem.isEmpty() || heldItem.getItem() != RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT) return; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index 538385b8..2f1d3a77 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -5,9 +5,9 @@ import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.BloodRuneType; import WayofTime.bloodmagic.iface.IBloodRune; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -32,7 +32,7 @@ public class BlockBloodRune extends BlockEnum implements IBloodRu @Nullable @Override - public BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, IBlockState state) { + public BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, BlockState state) { return state.getValue(getProperty()); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 7dfa8ce2..a3bdfd77 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -6,19 +6,19 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.ItemBlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -49,13 +49,13 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return BOX; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override @@ -65,28 +65,28 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity tile, ItemStack stack) { + public void harvestBlock(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable TileEntity tile, ItemStack stack) { super.harvestBlock(world, player, pos, state, tile, stack); world.setBlockToAir(pos); } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest) { return willHarvest || super.removedByPlayer(state, world, pos, player, willHarvest); } @Override - public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos blockPos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { boolean success = FluidUtil.interactWithFluidHandler(player, hand, world, blockPos, side); if (success) { world.checkLight(blockPos); @@ -99,23 +99,23 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { + public void onBlockHarvested(World worldIn, BlockPos pos, BlockState state, PlayerEntity player) { if (!player.capabilities.isCreativeMode) this.dropBlockAsItem(worldIn, pos, state, 0); super.onBlockHarvested(worldIn, pos, state, player); } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState blockState, int fortune) { + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, BlockState blockState, int fortune) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBloodTank) { TileBloodTank bloodTank = (TileBloodTank) tile; ItemStack drop = new ItemStack(this, 1, bloodTank.getBlockMetadata()); - NBTTagCompound fluidTag = new NBTTagCompound(); + CompoundNBT fluidTag = new CompoundNBT(); if (bloodTank.getTank().getFluid() != null) { bloodTank.getTank().getFluid().writeToNBT(fluidTag); - NBTTagCompound dropTag = new NBTTagCompound(); + CompoundNBT dropTag = new CompoundNBT(); dropTag.setTag("Fluid", fluidTag); drop.setTagCompound(dropTag); } @@ -125,11 +125,11 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState blockState, EntityLivingBase placer, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, BlockState blockState, LivingEntity placer, ItemStack stack) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBloodTank) { TileBloodTank bloodTank = (TileBloodTank) tile; - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("Fluid")); bloodTank.getTank().setFluid(fluidStack); @@ -142,7 +142,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(BlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBloodTank) { FluidStack fluidStack = ((TileBloodTank) tile).getTank().getFluid(); @@ -153,17 +153,17 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { return new ItemStack(this, 1, getMetaFromState(state)); } @Override - public boolean hasComparatorInputOverride(IBlockState state) { + public boolean hasComparatorInputOverride(BlockState state) { return true; } @Override - public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBloodTank) return ((TileBloodTank) tile).getComparatorOutput(); @@ -171,17 +171,17 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB } @Override - public TileEntity createTileEntity(World worldIn, IBlockState blockState) { + public TileEntity createTileEntity(World worldIn, BlockState blockState) { return new TileBloodTank(getMetaFromState(blockState)); } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Override - public ItemBlock getItem() { + public BlockItem getItem() { return new ItemBlockBloodTank(this); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java index 12a14983..13c04c99 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumDecorative; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -23,7 +23,7 @@ public class BlockDecorative extends BlockEnum { } @Override - public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { + public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) { for (EnumDecorative type : EnumDecorative.values()) { if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && (type == EnumDecorative.CRYSTAL_TILE || type == EnumDecorative.CRYSTAL_BRICK)) continue; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 69b59a5a..52df7b4d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -8,16 +8,16 @@ import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; import com.google.common.collect.Lists; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -58,7 +58,7 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl // setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); } - private static List getCollisionBoxList(IBlockState state) { + private static List getCollisionBoxList(BlockState state) { ArrayList collBox = new ArrayList<>(Arrays.asList(ARMS)); collBox.add(BODY); collBox.addAll(Arrays.asList(FEET)); @@ -66,32 +66,32 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return BODY; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack heldItem = player.getHeldItem(hand); TileDemonCrucible crucible = (TileDemonCrucible) world.getTileEntity(pos); @@ -111,7 +111,7 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileDemonCrucible tile = (TileDemonCrucible) world.getTileEntity(blockPos); if (tile != null) tile.dropItems(); @@ -120,23 +120,23 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileDemonCrucible(); } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } @Override - public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { List list = Lists.newArrayList(); @@ -162,7 +162,7 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { state = this.getActualState(state, worldIn, pos); for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 9463e459..a98e8d43 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -10,20 +10,20 @@ import WayofTime.bloodmagic.tile.TileDemonCrystal; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemGroup; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -42,8 +42,8 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); - public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", EnumFacing.class); - private static final EnumMap bounds = new EnumMap<>(EnumFacing.class); + public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", Direction.class); + private static final EnumMap bounds = new EnumMap<>(Direction.class); // Bounding / Collision boxes private static final AxisAlignedBB[] UP = { @@ -103,7 +103,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid public BlockDemonCrystal() { super(Material.ROCK); - this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP)); + this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, Direction.UP)); setTranslationKey(BloodMagic.MODID + ".demonCrystal."); setCreativeTab(BloodMagic.TAB_BM); @@ -137,7 +137,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } // collects a sublist from 0 to age for the collision boxes - private static List getCollisionBoxList(IBlockState state) { + private static List getCollisionBoxList(BlockState state) { int age = state.getValue(BlockDemonCrystal.AGE) + 1; switch (state.getValue(BlockDemonCrystal.ATTACHED)) { case DOWN: @@ -157,7 +157,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { TileEntity tile = source.getTileEntity(pos); if (tile != null) state = getActualState(state, tile.getWorld(), pos); @@ -179,7 +179,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileDemonCrystal) { @@ -207,7 +207,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, BlockState state, int fortune) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileDemonCrystal) { EnumDemonWillType type = state.getValue(TYPE); @@ -218,7 +218,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileDemonCrystal) { TileDemonCrystal crystal = (TileDemonCrystal) tile; @@ -229,13 +229,13 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileDemonCrystal) { TileDemonCrystal crystal = (TileDemonCrystal) tile; - EnumFacing placement = crystal.getPlacement(); + Direction placement = crystal.getPlacement(); BlockPos offsetPos = pos.offset(placement.getOpposite()); - IBlockState offsetState = world.getBlockState(offsetPos); + BlockState offsetState = world.getBlockState(offsetPos); if (!offsetState.isSideSolid(world, offsetPos, placement)) world.destroyBlock(pos, true); @@ -243,62 +243,62 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side) { + public boolean canPlaceBlockOnSide(World world, BlockPos pos, Direction side) { BlockPos offsetPos = pos.offset(side.getOpposite()); - IBlockState offsetState = world.getBlockState(offsetPos); + BlockState offsetState = world.getBlockState(offsetPos); return offsetState.isSideSolid(world, offsetPos, side) && this.canPlaceBlockAt(world, pos); } @Override - public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { + public void getSubBlocks(ItemGroup creativeTabs, NonNullList list) { for (EnumDemonWillType willType : EnumDemonWillType.values()) list.add(new ItemStack(this, 1, willType.ordinal())); } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity tile, ItemStack stack) { + public void harvestBlock(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable TileEntity tile, ItemStack stack) { super.harvestBlock(world, player, pos, state, tile, stack); world.setBlockToAir(pos); } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest) { return willHarvest || super.removedByPlayer(state, world, pos, player, false); } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public IBlockState getStateFromMeta(int meta) { + public BlockState getStateFromMeta(int meta) { return this.getDefaultState().withProperty(TYPE, EnumDemonWillType.values()[meta]); } @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { return state.getValue(TYPE).ordinal(); } @@ -309,18 +309,18 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileDemonCrystal(); } @Override - public ItemBlock getItem() { + public BlockItem getItem() { return new ItemBlockDemonCrystal(this); } @@ -331,7 +331,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { List list = Lists.newArrayList(); @@ -357,7 +357,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { state = this.getActualState(state, worldIn, pos); for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index b5dd79c5..099f13f6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -4,20 +4,20 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrystallizer; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.BlockState; +import net.minecraft.block.ContainerBlock; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import javax.annotation.Nonnull; -public class BlockDemonCrystallizer extends BlockContainer implements IVariantProvider, IBMBlock { +public class BlockDemonCrystallizer extends ContainerBlock implements IVariantProvider, IBMBlock { public BlockDemonCrystallizer() { super(Material.ROCK); @@ -31,33 +31,33 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - return side == EnumFacing.UP; + public boolean isSideSolid(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { + return side == Direction.UP; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override @@ -71,7 +71,7 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java index 10fb1fa0..9ee5eca8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.block.base.BlockEnumPillar; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.IStringSerializable; import javax.annotation.Nonnull; @@ -24,7 +24,7 @@ public class BlockDemonPillarBase & IStringSerializable> exten @Override public void gatherVariants(@Nonnull Int2ObjectMap variants) { - EnumFacing.Axis[] axis = new EnumFacing.Axis[]{EnumFacing.Axis.Y, EnumFacing.Axis.X, EnumFacing.Axis.Z}; + Direction.Axis[] axis = new Direction.Axis[]{Direction.Axis.Y, Direction.Axis.X, Direction.Axis.Z}; for (int i = 0; i < 3; i++) for (int j = 0; j < this.getTypes().length; j++) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java index 7621d7ca..ddf7253b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.block.base.BlockEnumPillarCap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.IStringSerializable; import javax.annotation.Nonnull; @@ -24,8 +24,8 @@ public class BlockDemonPillarCapBase & IStringSerializable> ex @Override public void gatherVariants(@Nonnull Int2ObjectMap variants) { - for (int i = 0; i < EnumFacing.values().length; i++) + for (int i = 0; i < Direction.values().length; i++) for (int j = 0; j < this.getTypes().length; j++) - variants.put(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j]); + variants.put(i * 2 + j, "facing=" + Direction.values()[i] + ",type=" + this.getTypes()[j]); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 5fb6a912..e1cca4d9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -4,13 +4,13 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonPylon; import com.google.common.collect.Lists; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.BlockState; +import net.minecraft.block.ContainerBlock; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.block.BlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVariantProvider { +public class BlockDemonPylon extends ContainerBlock implements IBMBlock, IVariantProvider { protected static final AxisAlignedBB BODY = new AxisAlignedBB(2 / 16F, 7 / 16F, 2 / 16F, 14 / 16F, 20 / 16F, 14 / 16F); private static final AxisAlignedBB[] FEET = { new AxisAlignedBB(10 / 16F, 0F, 2 / 16F, 14 / 16F, 7 / 16F, 6 / 16F), // NE @@ -45,7 +45,7 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian // setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); } - private static List getCollisionBoxList(IBlockState state) { + private static List getCollisionBoxList(BlockState state) { ArrayList collBox = new ArrayList<>(Arrays.asList(ARMS)); collBox.add(BODY); collBox.addAll(Arrays.asList(FEET)); @@ -53,33 +53,33 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return BODY; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override @@ -88,12 +88,12 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } @Override - public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { List list = Lists.newArrayList(); @@ -119,7 +119,7 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { state = this.getActualState(state, worldIn, pos); for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 50f69dbc..7c4471d1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -8,8 +8,8 @@ import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.teleport.Teleports; import WayofTime.bloodmagic.tile.TileDimensionalPortal; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; @@ -39,22 +39,22 @@ public class BlockDimensionalPortal extends BlockInteger { } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(BlockState state, IBlockAccess world, BlockPos pos) { return null; } @@ -67,12 +67,12 @@ public class BlockDimensionalPortal extends BlockInteger { } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(BlockState state, IBlockAccess world, BlockPos pos) { return 12; } @Override - public void onEntityCollision(World world, BlockPos pos, IBlockState blockState, Entity entity) { + public void onEntityCollision(World world, BlockPos pos, BlockState blockState, Entity entity) { if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) { TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos); @@ -109,7 +109,7 @@ public class BlockDimensionalPortal extends BlockInteger { } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess world, BlockPos pos) { int meta = state.getBlock().getMetaFromState(state); if (meta == 0) { return AABB_0; @@ -135,18 +135,18 @@ public class BlockDimensionalPortal extends BlockInteger { @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { this.spawnParticles(world, pos.getX(), pos.getY(), pos.getZ()); } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileDimensionalPortal(); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index c97d1861..e4c22de3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -4,11 +4,11 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileIncenseAltar; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -30,37 +30,37 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return AABB; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileIncenseAltar TileIncenseAltar = (TileIncenseAltar) world.getTileEntity(blockPos); if (TileIncenseAltar != null) TileIncenseAltar.dropItems(); @@ -69,18 +69,18 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileIncenseAltar(); } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 15ed0f5a..7e52286f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -3,11 +3,11 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -22,7 +22,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode { @Override //TODO: Combine BlockInputRoutingNode and BlockInputRoutingNode so they have the same superclass - public void breakBlock(World world, BlockPos pos, IBlockState state) { + public void breakBlock(World world, BlockPos pos, BlockState state) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileInputRoutingNode) { ((TileInputRoutingNode) tile).removeAllConnections(); @@ -32,7 +32,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { if (world.getTileEntity(pos) instanceof TileInputRoutingNode) { player.openGui(BloodMagic.instance, Constants.Gui.ROUTING_NODE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); } @@ -41,13 +41,13 @@ public class BlockInputRoutingNode extends BlockRoutingNode { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileInputRoutingNode(); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java index 70c68a04..ec8f6737 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java @@ -8,13 +8,12 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.block.BlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.property.Properties; public class BlockInversionPillar extends BlockEnum { public BlockInversionPillar() { @@ -29,7 +28,7 @@ public class BlockInversionPillar extends BlockEnum { } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileEntity tile = world.getTileEntity(blockPos); if (tile instanceof TileInversionPillar) { TileInversionPillar tilePillar = (TileInversionPillar) world.getTileEntity(blockPos); @@ -40,33 +39,33 @@ public class BlockInversionPillar extends BlockEnum { } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { return super.getActualState(state, world, pos).withProperty(Properties.StaticProperty, true); } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override @@ -76,12 +75,12 @@ public class BlockInversionPillar extends BlockEnum { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileInversionPillar(state.getValue(getProperty()).getType()); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java index 0b233797..d373d242 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java @@ -5,10 +5,10 @@ import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumInversionCap; import WayofTime.bloodmagic.client.IVariantProvider; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -25,28 +25,28 @@ public class BlockInversionPillarEnd extends BlockEnum impleme } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java index 805e9d9c..585a11b4 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -18,7 +18,7 @@ public class BlockItemRoutingNode extends BlockRoutingNode { } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) { + public void breakBlock(World world, BlockPos pos, BlockState state) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileRoutingNode) { ((TileRoutingNode) tile).removeAllConnections(); @@ -27,13 +27,13 @@ public class BlockItemRoutingNode extends BlockRoutingNode { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileItemRoutingNode(); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java index c69e9caa..c985563d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -20,13 +20,13 @@ public class BlockMasterRoutingNode extends BlockRoutingNode { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileMasterRoutingNode(); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index 6675b63e..a3e10e77 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -9,19 +9,18 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMimic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.item.block.ItemBlockMimic; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; +import net.minecraft.block.*; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -48,7 +47,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent @Nullable @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(BlockState state, IBlockAccess world, BlockPos pos) { switch (this.getMetaFromState(state)) { case 1: case 2: @@ -60,7 +59,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent if (mimicBlock == Blocks.AIR) { return FULL_BLOCK_AABB; } - IBlockState mimicState = tileMimic.getReplacedState(); + BlockState mimicState = tileMimic.getReplacedState(); if (mimicBlock != this) { return mimicState.getCollisionBoundingBox(world, pos); } @@ -76,14 +75,14 @@ public class BlockMimic extends BlockEnum implements IAltarComponent @Override @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getSelectedBoundingBox(BlockState state, World world, BlockPos pos) { TileMimic tileMimic = (TileMimic) world.getTileEntity(pos); if (tileMimic != null && !tileMimic.getStackInSlot(0).isEmpty()) { Block mimicBlock = Block.getBlockFromItem(tileMimic.getStackInSlot(0).getItem()); if (mimicBlock == Blocks.AIR) { return FULL_BLOCK_AABB; } - IBlockState mimicState = tileMimic.getReplacedState(); + BlockState mimicState = tileMimic.getReplacedState(); if (mimicBlock != this) { return mimicState.getSelectedBoundingBox(world, pos); } @@ -93,7 +92,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public int getLightOpacity(IBlockState state) { + public int getLightOpacity(BlockState state) { switch (this.getMetaFromState(state)) { case 2: case 4: @@ -104,7 +103,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public int getLightValue(IBlockState state) { + public int getLightValue(BlockState state) { switch (this.getMetaFromState(state)) { case 3: return 15; @@ -114,7 +113,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { if (state.getBlock() == this) { return super.getMetaFromState(state); } @@ -123,23 +122,23 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { TileMimic mimic = (TileMimic) world.getTileEntity(pos); return mimic != null && mimic.onBlockActivated(world, pos, state, player, hand, player.getHeldItem(hand), side); } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMimic) { TileMimic mimic = (TileMimic) tile; ItemStack stack = mimic.getStackInSlot(0); - if (stack.getItem() instanceof ItemBlock) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState mimicState = mimic.getReplacedState(); + if (stack.getItem() instanceof BlockItem) { + Block block = ((BlockItem) stack.getItem()).getBlock(); + BlockState mimicState = mimic.getReplacedState(); if (block != this) { - if (block.getRenderType(mimicState) == EnumBlockRenderType.ENTITYBLOCK_ANIMATED) { + if (block.getRenderType(mimicState) == BlockRenderType.ENTITYBLOCK_ANIMATED) { return RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState(); //Small and invisible-ish, basically this is returned in order to not render over the animated block (TESR) } @@ -151,32 +150,32 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { + public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.CUTOUT; } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileEntity tile = world.getTileEntity(blockPos); if (tile instanceof TileMimic) { TileMimic TileMimic = (TileMimic) world.getTileEntity(blockPos); @@ -188,12 +187,12 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileMimic(); } @@ -201,13 +200,13 @@ public class BlockMimic extends BlockEnum implements IAltarComponent @Nullable @Override - public ComponentType getType(World world, IBlockState state, BlockPos pos) { + public ComponentType getType(World world, BlockState state, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMimic) { TileMimic mimic = (TileMimic) tile; ItemStack stack = mimic.getStackInSlot(0); - if (stack.getItem() instanceof ItemBlock) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); + if (stack.getItem() instanceof BlockItem) { + Block block = ((BlockItem) stack.getItem()).getBlock(); if (block instanceof IAltarComponent) { return ((IAltarComponent) block).getType(world, mimic.getReplacedState(), pos); } else { @@ -221,7 +220,7 @@ public class BlockMimic extends BlockEnum implements IAltarComponent } @Override - public ItemBlock getItem() { + public BlockItem getItem() { return new ItemBlockMimic(this); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index 204db890..cc4eda8b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -3,11 +3,11 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -22,7 +22,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode { @Override //TODO: Combine BlockOutputRoutingNode and BlockInputRoutingNode so they have the same superclass - public void breakBlock(World world, BlockPos pos, IBlockState state) { + public void breakBlock(World world, BlockPos pos, BlockState state) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileOutputRoutingNode) { ((TileOutputRoutingNode) tile).removeAllConnections(); @@ -32,7 +32,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { if (world.getTileEntity(pos) instanceof TileOutputRoutingNode) { player.openGui(BloodMagic.instance, Constants.Gui.ROUTING_NODE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); } @@ -41,13 +41,13 @@ public class BlockOutputRoutingNode extends BlockRoutingNode { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileOutputRoutingNode(); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index fc60a3b5..97ba5250 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -5,9 +5,9 @@ import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumPath; import WayofTime.bloodmagic.incense.IIncensePath; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; @@ -45,7 +45,7 @@ public class BlockPath extends BlockEnum implements IIncensePath { } @Override - public Material getMaterial(IBlockState state) { + public Material getMaterial(BlockState state) { EnumPath path = state.getValue(getProperty()); if (path.equals(EnumPath.WOOD) || path.equals(EnumPath.WOODTILE)) return Material.WOOD; @@ -54,7 +54,7 @@ public class BlockPath extends BlockEnum implements IIncensePath { } @Override - public SoundType getSoundType(IBlockState state, World world, BlockPos pos, @Nullable Entity entity) { + public SoundType getSoundType(BlockState state, World world, BlockPos pos, @Nullable Entity entity) { EnumPath path = state.getValue(getProperty()); if (path.equals(EnumPath.WOOD) || path.equals(EnumPath.WOODTILE)) return SoundType.WOOD; @@ -63,7 +63,7 @@ public class BlockPath extends BlockEnum implements IIncensePath { } @Override - public int getLevelOfPath(World world, BlockPos pos, IBlockState state) { + public int getLevelOfPath(World world, BlockPos pos, BlockState state) { switch (this.getMetaFromState(state)) { case 0: case 1: diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index bfcedb11..81281cbc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -4,12 +4,12 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TilePhantomBlock; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -28,28 +28,28 @@ public class BlockPhantom extends Block implements IVariantProvider { } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override @@ -60,7 +60,7 @@ public class BlockPhantom extends Block implements IVariantProvider { @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { return world.getBlockState(pos.offset(side)) != state || state.getBlock() != this && super.shouldSideBeRendered(state, world, pos, side); } @@ -70,13 +70,13 @@ public class BlockPhantom extends Block implements IVariantProvider { } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TilePhantomBlock(20); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index f6a09218..7c896b63 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -13,17 +13,17 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import amerifrance.guideapi.api.IGuideLinked; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -44,7 +44,7 @@ public class BlockRitualController extends BlockEnum imple } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack heldItem = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); @@ -57,7 +57,7 @@ public class BlockRitualController extends BlockEnum imple if (!key.isEmpty()) { Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); if (ritual != null) { - EnumFacing direction = RitualHelper.getDirectionOfRitual(world, pos, ritual); + Direction direction = RitualHelper.getDirectionOfRitual(world, pos, ritual); // TODO: Give a message stating that this ritual is not a valid ritual. if (direction != null && RitualHelper.checkValidRitual(world, pos, ritual, direction)) { if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, BloodMagic.RITUAL_MANAGER.getRitual(key))) { @@ -66,17 +66,17 @@ public class BlockRitualController extends BlockEnum imple ((TileMasterRitualStone) tile).setInverted(true); } } else { - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); } } else { - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); } } else { - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); } } } else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone) { - IBlockState ritualBlock = world.getBlockState(pos.up()); + BlockState ritualBlock = world.getBlockState(pos.up()); ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(ritualBlock); if (ritual == null) return false; @@ -89,7 +89,7 @@ public class BlockRitualController extends BlockEnum imple } @Override - public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public void onBlockHarvested(World world, BlockPos pos, BlockState state, PlayerEntity player) { TileEntity tile = world.getTileEntity(pos); if (getMetaFromState(state) == 0 && tile instanceof TileMasterRitualStone) @@ -105,12 +105,12 @@ public class BlockRitualController extends BlockEnum imple } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return state.getValue(getProperty()) != EnumRitualController.IMPERFECT ? new TileMasterRitualStone() : new TileImperfectRitualStone(); } @@ -118,8 +118,8 @@ public class BlockRitualController extends BlockEnum imple @Override @Nullable - public ResourceLocation getLinkedEntry(World world, BlockPos pos, EntityPlayer player, ItemStack stack) { - IBlockState state = world.getBlockState(pos); + public ResourceLocation getLinkedEntry(World world, BlockPos pos, PlayerEntity player, ItemStack stack) { + BlockState state = world.getBlockState(pos); if (state.getValue(getProperty()).equals(EnumRitualController.MASTER)) { TileMasterRitualStone mrs = (TileMasterRitualStone) world.getTileEntity(pos); if (mrs == null || mrs.getCurrentRitual() == null) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 432861d3..33ddfd90 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -8,9 +8,9 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -39,12 +39,12 @@ public class BlockRitualStone extends BlockEnum implements IRitual } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return 0; } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, BlockState state, PlayerEntity player) { return false; } @@ -56,7 +56,7 @@ public class BlockRitualStone extends BlockEnum implements IRitual @Override public void setRuneType(World world, BlockPos pos, EnumRuneType runeType) { int meta = runeType.ordinal(); - IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); + BlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); world.setBlockState(pos, newState); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java index bb26cf20..be4adeb1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java @@ -6,15 +6,15 @@ import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -43,47 +43,47 @@ public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvide } @Override - public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean canConnectRedstone(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { return true; } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return AABB; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { + public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.TRANSLUCENT; } @Override - public IBlockState getStateFromMeta(int meta) { + public BlockState getStateFromMeta(int meta) { return this.getDefaultState(); } @@ -91,13 +91,13 @@ public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvide * Convert the BlockState into the correct metadata value */ @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { return 0; } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(UP, this.shouldConnect(state, worldIn, pos.up(), EnumFacing.DOWN)).withProperty(DOWN, this.shouldConnect(state, worldIn, pos.down(), EnumFacing.UP)).withProperty(NORTH, this.shouldConnect(state, worldIn, pos.north(), EnumFacing.SOUTH)).withProperty(EAST, this.shouldConnect(state, worldIn, pos.east(), EnumFacing.WEST)).withProperty(SOUTH, this.shouldConnect(state, worldIn, pos.south(), EnumFacing.NORTH)).withProperty(WEST, this.shouldConnect(state, worldIn, pos.west(), EnumFacing.EAST)); + public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) { + return state.withProperty(UP, this.shouldConnect(state, worldIn, pos.up(), Direction.DOWN)).withProperty(DOWN, this.shouldConnect(state, worldIn, pos.down(), Direction.UP)).withProperty(NORTH, this.shouldConnect(state, worldIn, pos.north(), Direction.SOUTH)).withProperty(EAST, this.shouldConnect(state, worldIn, pos.east(), Direction.WEST)).withProperty(SOUTH, this.shouldConnect(state, worldIn, pos.south(), Direction.NORTH)).withProperty(WEST, this.shouldConnect(state, worldIn, pos.west(), Direction.EAST)); } @Override @@ -105,14 +105,14 @@ public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvide return new BlockStateContainer(this, UP, DOWN, NORTH, EAST, WEST, SOUTH); } - public boolean shouldConnect(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing attachedSide) { - IBlockState blockState = world.getBlockState(pos); + public boolean shouldConnect(BlockState state, IBlockAccess world, BlockPos pos, Direction attachedSide) { + BlockState blockState = world.getBlockState(pos); Block block = blockState.getBlock(); return block.getMaterial(blockState).isOpaque() && blockState.isFullCube(); } @Override - public void breakBlock(World world, BlockPos pos, IBlockState blockState) { + public void breakBlock(World world, BlockPos pos, BlockState blockState) { if (!world.isRemote) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileRoutingNode) { @@ -126,8 +126,8 @@ public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvide } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index d8eb932d..bdfbc5f6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -5,15 +5,15 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -36,37 +36,37 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return AABB; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { if (world.getTileEntity(pos) instanceof TileSoulForge) player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); @@ -74,7 +74,7 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileSoulForge tileSoulForge = (TileSoulForge) world.getTileEntity(blockPos); if (tileSoulForge != null) tileSoulForge.dropItems(); @@ -83,18 +83,18 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileSoulForge(); } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index c6f8985c..7602a807 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -4,13 +4,13 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.tile.TileSpectralBlock; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -32,27 +32,27 @@ public class BlockSpectral extends Block { } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { return AABB; } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { return false; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public boolean causesSuffocation(IBlockState state) { + public boolean causesSuffocation(BlockState state) { return false; } @@ -63,18 +63,18 @@ public class BlockSpectral extends Block { } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return ConfigHandler.client.invisibleSpectralBlocks ? EnumBlockRenderType.INVISIBLE : EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return ConfigHandler.client.invisibleSpectralBlocks ? BlockRenderType.INVISIBLE : BlockRenderType.MODEL; } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { return world.getBlockState(pos.offset(side)) != state || state.getBlock() != this && super.shouldSideBeRendered(state, world, pos, side); } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List list, Entity collidingEntity, boolean bool) { + public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List list, Entity collidingEntity, boolean bool) { } @Override @@ -88,18 +88,18 @@ public class BlockSpectral extends Block { } @Override - public boolean isAir(IBlockState state, IBlockAccess world, BlockPos blockPos) { + public boolean isAir(BlockState state, IBlockAccess world, BlockPos blockPos) { return true; } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(BlockState state) { return true; } @Nullable @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, BlockState state) { return new TileSpectralBlock(); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 37bad79e..5dac961b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -6,20 +6,20 @@ import WayofTime.bloodmagic.command.sub.SubCommandTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.Constants; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.ContainerBlock; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockTeleposer extends BlockContainer implements IVariantProvider, IBMBlock { +public class BlockTeleposer extends ContainerBlock implements IVariantProvider, IBMBlock { public BlockTeleposer() { super(Material.ROCK); @@ -30,12 +30,12 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.MODEL; + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack playerItem = player.getHeldItem(hand); if (playerItem.getItem() instanceof ItemTelepositionFocus) @@ -47,7 +47,7 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, } @Override - public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { + public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { TileTeleposer tileTeleposer = (TileTeleposer) world.getTileEntity(blockPos); if (tileTeleposer != null) { tileTeleposer.dropItems(); @@ -63,7 +63,7 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider, } @Override - public ItemBlock getItem() { - return new ItemBlock(this); + public BlockItem getItem() { + return new BlockItem(this); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java index 7dd5b818..7c4b1e51 100644 --- a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java +++ b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; public interface IBMBlock { - ItemBlock getItem(); + BlockItem getItem(); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java index 0734740e..79a1fb0b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java @@ -5,12 +5,12 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.NonNullList; @@ -46,22 +46,22 @@ public class BlockEnum & IStringSerializable> extends Block im } @Override - public IBlockState getStateFromMeta(int meta) { + public BlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(property, types[meta]); } @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { return state.getValue(property).ordinal(); } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return getMetaFromState(state); } @Override - public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { + public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) { for (E type : types) subBlocks.add(new ItemStack(this, 1, type.ordinal())); } @@ -71,7 +71,7 @@ public class BlockEnum & IStringSerializable> extends Block im } @Override - public ItemBlock getItem() { + public BlockItem getItem() { return new ItemBlockEnum<>(this); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java index 418c8de7..b85224e7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.block.base; -import net.minecraft.block.BlockRotatedPillar; +import net.minecraft.block.BlockState; +import net.minecraft.block.RotatedPillarBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.IStringSerializable; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; @@ -28,25 +28,25 @@ public class BlockEnumPillar & IStringSerializable> extends Bl @Override protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), BlockRotatedPillar.AXIS).build(); + return new BlockStateContainer.Builder(this).add(getProperty(), RotatedPillarBlock.AXIS).build(); } @Override - public IBlockState getStateFromMeta(int meta) { - IBlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 5]); + public BlockState getStateFromMeta(int meta) { + BlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 5]); switch (meta / 5) { case 0: - state = state.withProperty(BlockRotatedPillar.AXIS, EnumFacing.Axis.Y); + state = state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Y); break; case 1: - state = state.withProperty(BlockRotatedPillar.AXIS, EnumFacing.Axis.X); + state = state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.X); break; case 2: - state = state.withProperty(BlockRotatedPillar.AXIS, EnumFacing.Axis.Z); + state = state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Z); break; default: - state.withProperty(BlockRotatedPillar.AXIS, EnumFacing.Axis.Y); + state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Y); break; } @@ -54,16 +54,16 @@ public class BlockEnumPillar & IStringSerializable> extends Bl } @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { return new ItemStack(this, 1, damageDropped(state)); } @SuppressWarnings("incomplete-switch") @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { int i = ArrayUtils.indexOf(getTypes(), state.getValue(getProperty())); - switch (state.getValue(BlockRotatedPillar.AXIS)) { + switch (state.getValue(RotatedPillarBlock.AXIS)) { case X: i = i + 5; break; @@ -76,10 +76,10 @@ public class BlockEnumPillar & IStringSerializable> extends Bl } @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { - IBlockState state = world.getBlockState(pos); + public boolean rotateBlock(World world, BlockPos pos, Direction axis) { + BlockState state = world.getBlockState(pos); for (IProperty prop : state.getProperties().keySet()) { - if (prop == BlockRotatedPillar.AXIS) { + if (prop == RotatedPillarBlock.AXIS) { world.setBlockState(pos, state.cycleProperty(prop)); return true; } @@ -88,15 +88,15 @@ public class BlockEnumPillar & IStringSerializable> extends Bl } @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { + public BlockState withRotation(BlockState state, Rotation rot) { switch (rot) { case COUNTERCLOCKWISE_90: case CLOCKWISE_90: - switch (state.getValue(BlockRotatedPillar.AXIS)) { + switch (state.getValue(RotatedPillarBlock.AXIS)) { case X: - return state.withProperty(BlockRotatedPillar.AXIS, EnumFacing.Axis.Z); + return state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Z); case Z: - return state.withProperty(BlockRotatedPillar.AXIS, EnumFacing.Axis.X); + return state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.X); default: return state; } @@ -107,18 +107,18 @@ public class BlockEnumPillar & IStringSerializable> extends Bl } @Override - protected ItemStack getSilkTouchDrop(IBlockState state) { + protected ItemStack getSilkTouchDrop(BlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { - return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand).withProperty(BlockRotatedPillar.AXIS, facing.getAxis()); + public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer, Hand hand) { + return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand).withProperty(RotatedPillarBlock.AXIS, facing.getAxis()); } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return super.getMetaFromState(state); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java index d4998c28..3d4a02b3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.block.base; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; @@ -30,44 +30,44 @@ public class BlockEnumPillarCap & IStringSerializable> extends } @Override - public IBlockState getStateFromMeta(int meta) { - IBlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 2]); - return state.withProperty(FACING, EnumFacing.byIndex(meta / 2)); + public BlockState getStateFromMeta(int meta) { + BlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 2]); + return state.withProperty(FACING, Direction.byIndex(meta / 2)); } @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { int i = ArrayUtils.indexOf(getTypes(), state.getValue(getProperty())); return i + 2 * state.getValue(FACING).getIndex(); } @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { return new ItemStack(this, 1, damageDropped(state)); } @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { + public BlockState withRotation(BlockState state, Rotation rot) { return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); } @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { + public BlockState withMirror(BlockState state, Mirror mirrorIn) { return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); } @Override - protected ItemStack getSilkTouchDrop(IBlockState state) { + protected ItemStack getSilkTouchDrop(BlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { + public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer, Hand hand) { return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand).withProperty(FACING, facing); } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return super.getMetaFromState(state); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java index f34b2e76..b21d89ab 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.block.base; import com.google.common.collect.Lists; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.BlockStairs; -import net.minecraft.block.BlockStairs.EnumHalf; -import net.minecraft.block.BlockStairs.EnumShape; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalBlock; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.StairsBlock.EnumHalf; +import net.minecraft.block.StairsBlock.EnumShape; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; @@ -27,7 +27,7 @@ import javax.annotation.Nullable; import java.util.List; public class BlockEnumStairs & IStringSerializable> extends BlockEnum { - public static final PropertyDirection FACING = BlockHorizontal.FACING; + public static final PropertyDirection FACING = HorizontalBlock.FACING; protected static final AxisAlignedBB AABB_SLAB_TOP = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); protected static final AxisAlignedBB AABB_QTR_TOP_WEST = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 0.5D, 1.0D, 1.0D); @@ -58,11 +58,11 @@ public class BlockEnumStairs & IStringSerializable> extends Bl @Override protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), FACING, BlockStairs.HALF, BlockStairs.SHAPE).build(); + return new BlockStateContainer.Builder(this).add(getProperty(), FACING, StairsBlock.HALF, StairsBlock.SHAPE).build(); } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { + public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { state = this.getActualState(state, worldIn, pos); for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { @@ -71,24 +71,24 @@ public class BlockEnumStairs & IStringSerializable> extends Bl } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } @Override - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @Override - public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { - IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); - state = state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.STRAIGHT); - return facing != EnumFacing.DOWN && (facing == EnumFacing.UP || (double) hitY <= 0.5D) ? state.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.BOTTOM) : state.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.TOP); + public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer, Hand hand) { + BlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); + state = state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.STRAIGHT); + return facing != Direction.DOWN && (facing == Direction.UP || (double) hitY <= 0.5D) ? state.withProperty(StairsBlock.HALF, StairsBlock.EnumHalf.BOTTOM) : state.withProperty(StairsBlock.HALF, StairsBlock.EnumHalf.TOP); } @Override - public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { List list = Lists.newArrayList(); for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { @@ -114,18 +114,18 @@ public class BlockEnumStairs & IStringSerializable> extends Bl // Meta looks like: {1|11|1} = {HALF|FACING|TYPE} @Override - public IBlockState getStateFromMeta(int meta) { - IBlockState state = getBlockState().getBaseState().withProperty(BlockStairs.HALF, (meta & 8) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM); - state = state.withProperty(FACING, EnumFacing.byIndex(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]); + public BlockState getStateFromMeta(int meta) { + BlockState state = getBlockState().getBaseState().withProperty(StairsBlock.HALF, (meta & 8) > 0 ? StairsBlock.EnumHalf.TOP : StairsBlock.EnumHalf.BOTTOM); + state = state.withProperty(FACING, Direction.byIndex(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]); return state; } // Meta looks like: {1|11|1} = {HALF|FACING|TYPE} @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { int i = 0; - if (state.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP) { + if (state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP) { i |= 4; } @@ -134,34 +134,34 @@ public class BlockEnumStairs & IStringSerializable> extends Bl } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(BlockStairs.SHAPE, getStairsShape(state, worldIn, pos)); + public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) { + return state.withProperty(StairsBlock.SHAPE, getStairsShape(state, worldIn, pos)); } @Override - public IBlockState withRotation(IBlockState state, Rotation rot) { + public BlockState withRotation(BlockState state, Rotation rot) { return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); } @SuppressWarnings("incomplete-switch") @Override - public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { - EnumFacing facing = state.getValue(FACING); - BlockStairs.EnumShape stairShape = state.getValue(BlockStairs.SHAPE); + public BlockState withMirror(BlockState state, Mirror mirrorIn) { + Direction facing = state.getValue(FACING); + StairsBlock.EnumShape stairShape = state.getValue(StairsBlock.SHAPE); switch (mirrorIn) { case LEFT_RIGHT: - if (facing.getAxis() == EnumFacing.Axis.Z) { + if (facing.getAxis() == Direction.Axis.Z) { switch (stairShape) { case OUTER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_RIGHT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_RIGHT); case OUTER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_LEFT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_LEFT); case INNER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_LEFT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_LEFT); case INNER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_RIGHT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_RIGHT); default: return state.withRotation(Rotation.CLOCKWISE_180); } @@ -170,16 +170,16 @@ public class BlockEnumStairs & IStringSerializable> extends Bl break; case FRONT_BACK: - if (facing.getAxis() == EnumFacing.Axis.X) { + if (facing.getAxis() == Direction.Axis.X) { switch (stairShape) { case OUTER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_RIGHT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_RIGHT); case OUTER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.OUTER_LEFT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_LEFT); case INNER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_RIGHT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_RIGHT); case INNER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(BlockStairs.SHAPE, BlockStairs.EnumShape.INNER_LEFT); + return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_LEFT); case STRAIGHT: return state.withRotation(Rotation.CLOCKWISE_180); } @@ -190,22 +190,22 @@ public class BlockEnumStairs & IStringSerializable> extends Bl } @Override - protected ItemStack getSilkTouchDrop(IBlockState state) { + protected ItemStack getSilkTouchDrop(BlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return super.getMetaFromState(state); } @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { return new ItemStack(this, 1, damageDropped(state)); } @Override - public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) { + public boolean doesSideBlockRendering(BlockState state, IBlockAccess world, BlockPos pos, Direction face) { if (ForgeModContainer.disableStairSlabCulling) return super.doesSideBlockRendering(state, world, pos, face); @@ -214,12 +214,12 @@ public class BlockEnumStairs & IStringSerializable> extends Bl state = this.getActualState(state, world, pos); - EnumHalf half = state.getValue(BlockStairs.HALF); - EnumFacing side = state.getValue(FACING); - EnumShape shape = state.getValue(BlockStairs.SHAPE); - if (face == EnumFacing.UP) + EnumHalf half = state.getValue(StairsBlock.HALF); + Direction side = state.getValue(FACING); + EnumShape shape = state.getValue(StairsBlock.SHAPE); + if (face == Direction.UP) return half == EnumHalf.TOP; - if (face == EnumFacing.DOWN) + if (face == Direction.DOWN) return half == EnumHalf.BOTTOM; if (shape == EnumShape.OUTER_LEFT || shape == EnumShape.OUTER_RIGHT) return false; @@ -232,25 +232,25 @@ public class BlockEnumStairs & IStringSerializable> extends Bl return false; } - private static List getCollisionBoxList(IBlockState state) { + private static List getCollisionBoxList(BlockState state) { List list = Lists.newArrayList(); - boolean flag = state.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP; + boolean flag = state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP; list.add(flag ? AABB_SLAB_TOP : AABB_SLAB_BOTTOM); - BlockStairs.EnumShape stairShape = state.getValue(BlockStairs.SHAPE); + StairsBlock.EnumShape stairShape = state.getValue(StairsBlock.SHAPE); - if (stairShape == BlockStairs.EnumShape.STRAIGHT || stairShape == BlockStairs.EnumShape.INNER_LEFT || stairShape == BlockStairs.EnumShape.INNER_RIGHT) { + if (stairShape == StairsBlock.EnumShape.STRAIGHT || stairShape == StairsBlock.EnumShape.INNER_LEFT || stairShape == StairsBlock.EnumShape.INNER_RIGHT) { list.add(getCollQuarterBlock(state)); } - if (stairShape != BlockStairs.EnumShape.STRAIGHT) { + if (stairShape != StairsBlock.EnumShape.STRAIGHT) { list.add(getCollEighthBlock(state)); } return list; } - private static AxisAlignedBB getCollQuarterBlock(IBlockState state) { - boolean flag = state.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP; + private static AxisAlignedBB getCollQuarterBlock(BlockState state) { + boolean flag = state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP; switch (state.getValue(FACING)) { case NORTH: @@ -265,11 +265,11 @@ public class BlockEnumStairs & IStringSerializable> extends Bl } } - private static AxisAlignedBB getCollEighthBlock(IBlockState state) { - EnumFacing facing = state.getValue(FACING); - EnumFacing newFacing; + private static AxisAlignedBB getCollEighthBlock(BlockState state) { + Direction facing = state.getValue(FACING); + Direction newFacing; - switch (state.getValue(BlockStairs.SHAPE)) { + switch (state.getValue(StairsBlock.SHAPE)) { case OUTER_LEFT: default: newFacing = facing; @@ -284,7 +284,7 @@ public class BlockEnumStairs & IStringSerializable> extends Bl newFacing = facing.rotateYCCW(); } - boolean isTop = state.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.TOP; + boolean isTop = state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP; switch (newFacing) { case NORTH: @@ -299,45 +299,45 @@ public class BlockEnumStairs & IStringSerializable> extends Bl } } - private static BlockStairs.EnumShape getStairsShape(IBlockState state, IBlockAccess world, BlockPos pos) { - EnumFacing facing = state.getValue(FACING); - IBlockState offsetState = world.getBlockState(pos.offset(facing)); + private static StairsBlock.EnumShape getStairsShape(BlockState state, IBlockAccess world, BlockPos pos) { + Direction facing = state.getValue(FACING); + BlockState offsetState = world.getBlockState(pos.offset(facing)); - if (isBlockStairs(offsetState) && state.getValue(BlockStairs.HALF) == offsetState.getValue(BlockStairs.HALF)) { - EnumFacing offsetFacing = offsetState.getValue(FACING); + if (isBlockStairs(offsetState) && state.getValue(StairsBlock.HALF) == offsetState.getValue(StairsBlock.HALF)) { + Direction offsetFacing = offsetState.getValue(FACING); if (offsetFacing.getAxis() != state.getValue(FACING).getAxis() && isDifferentStairs(state, world, pos, offsetFacing.getOpposite())) { if (offsetFacing == facing.rotateYCCW()) { - return BlockStairs.EnumShape.OUTER_LEFT; + return StairsBlock.EnumShape.OUTER_LEFT; } - return BlockStairs.EnumShape.OUTER_RIGHT; + return StairsBlock.EnumShape.OUTER_RIGHT; } } - IBlockState oppositeOffsetState = world.getBlockState(pos.offset(facing.getOpposite())); + BlockState oppositeOffsetState = world.getBlockState(pos.offset(facing.getOpposite())); - if (isBlockStairs(oppositeOffsetState) && state.getValue(BlockStairs.HALF) == oppositeOffsetState.getValue(BlockStairs.HALF)) { - EnumFacing oppositeOffsetFacing = oppositeOffsetState.getValue(FACING); + if (isBlockStairs(oppositeOffsetState) && state.getValue(StairsBlock.HALF) == oppositeOffsetState.getValue(StairsBlock.HALF)) { + Direction oppositeOffsetFacing = oppositeOffsetState.getValue(FACING); if (oppositeOffsetFacing.getAxis() != (state.getValue(FACING)).getAxis() && isDifferentStairs(state, world, pos, oppositeOffsetFacing)) { if (oppositeOffsetFacing == facing.rotateYCCW()) { - return BlockStairs.EnumShape.INNER_LEFT; + return StairsBlock.EnumShape.INNER_LEFT; } - return BlockStairs.EnumShape.INNER_RIGHT; + return StairsBlock.EnumShape.INNER_RIGHT; } } - return BlockStairs.EnumShape.STRAIGHT; + return StairsBlock.EnumShape.STRAIGHT; } - private static boolean isDifferentStairs(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing facing) { - IBlockState offsetState = world.getBlockState(pos.offset(facing)); - return !isBlockStairs(offsetState) || offsetState.getValue(FACING) != state.getValue(FACING) || offsetState.getValue(BlockStairs.HALF) != state.getValue(BlockStairs.HALF); + private static boolean isDifferentStairs(BlockState state, IBlockAccess world, BlockPos pos, Direction facing) { + BlockState offsetState = world.getBlockState(pos.offset(facing)); + return !isBlockStairs(offsetState) || offsetState.getValue(FACING) != state.getValue(FACING) || offsetState.getValue(StairsBlock.HALF) != state.getValue(StairsBlock.HALF); } - public static boolean isBlockStairs(IBlockState state) { - return state.getBlock() instanceof BlockStairs || state.getBlock() instanceof BlockEnumStairs; + public static boolean isBlockStairs(BlockState state) { + return state.getBlock() instanceof StairsBlock || state.getBlock() instanceof BlockEnumStairs; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java index 325689e6..60b2523c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.block.base; import net.minecraft.block.Block; -import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockState; +import net.minecraft.block.FenceGateBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -42,18 +42,18 @@ public class BlockEnumWall & IStringSerializable> extends Bloc } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { state = state.getActualState(source, pos); return AABB_BY_INDEX[getAABBIndex(state)]; } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(BlockState blockState, IBlockAccess worldIn, BlockPos pos) { blockState = blockState.getActualState(worldIn, pos); return CLIP_AABB_BY_INDEX[getAABBIndex(blockState)]; } - public boolean isFullCube(IBlockState state) { + public boolean isFullCube(BlockState state) { return false; } @@ -62,24 +62,24 @@ public class BlockEnumWall & IStringSerializable> extends Bloc } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(BlockState state) { return false; } private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState worldState = worldIn.getBlockState(pos); + BlockState worldState = worldIn.getBlockState(pos); Block block = worldState.getBlock(); - return block != Blocks.BARRIER && (!(block != this && !(block instanceof BlockFenceGate)) || ((worldState.getMaterial().isOpaque() && worldState.isFullCube()) && worldState.getMaterial() != Material.GOURD)); + return block != Blocks.BARRIER && (!(block != this && !(block instanceof FenceGateBlock)) || ((worldState.getMaterial().isOpaque() && worldState.isFullCube()) && worldState.getMaterial() != Material.GOURD)); } @SideOnly(Side.CLIENT) @Override - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - return side != EnumFacing.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side); + public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { + return side != Direction.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side); } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) { boolean canNorth = this.canConnectTo(worldIn, pos.north()); boolean canEast = this.canConnectTo(worldIn, pos.east()); boolean canSouth = this.canConnectTo(worldIn, pos.south()); @@ -89,32 +89,32 @@ public class BlockEnumWall & IStringSerializable> extends Bloc } @Override - protected ItemStack getSilkTouchDrop(IBlockState state) { + protected ItemStack getSilkTouchDrop(BlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return super.getMetaFromState(state); } - private static int getAABBIndex(IBlockState state) { + private static int getAABBIndex(BlockState state) { int i = 0; if (state.getValue(NORTH)) { - i |= 1 << EnumFacing.NORTH.getHorizontalIndex(); + i |= 1 << Direction.NORTH.getHorizontalIndex(); } if (state.getValue(EAST)) { - i |= 1 << EnumFacing.EAST.getHorizontalIndex(); + i |= 1 << Direction.EAST.getHorizontalIndex(); } if (state.getValue(SOUTH)) { - i |= 1 << EnumFacing.SOUTH.getHorizontalIndex(); + i |= 1 << Direction.SOUTH.getHorizontalIndex(); } if (state.getValue(WEST)) { - i |= 1 << EnumFacing.WEST.getHorizontalIndex(); + i |= 1 << Direction.WEST.getHorizontalIndex(); } return i; diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java index 3e2a13f9..0427e11a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java @@ -4,8 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -43,22 +43,22 @@ public class BlockInteger extends Block { } @Override - public IBlockState getStateFromMeta(int meta) { + public BlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(property, meta); } @Override - public int getMetaFromState(IBlockState state) { + public int getMetaFromState(BlockState state) { return state.getValue(property); } @Override - public int damageDropped(IBlockState state) { + public int damageDropped(BlockState state) { return getMetaFromState(state); } @Override - public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { + public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) { for (int i = 0; i < maxMeta; i++) subBlocks.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java index 3392b3f3..3a203214 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java @@ -4,20 +4,20 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.tile.TileAlchemyTable; import WayofTime.bloodmagic.tile.container.ContainerAlchemyTable; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiAlchemyTable extends GuiContainer { +public class GuiAlchemyTable extends ContainerScreen { public IInventory tileTable; - public GuiAlchemyTable(InventoryPlayer playerInventory, IInventory tileTable) { + public GuiAlchemyTable(PlayerInventory playerInventory, IInventory tileTable) { super(new ContainerAlchemyTable(playerInventory, tileTable)); this.tileTable = tileTable; this.xSize = 176; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java index f96654ca..b4f55629 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.client.hud.ConfigEntryEditHUD; import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.screen.Screen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.IModGuiFactory; import net.minecraftforge.fml.client.config.DummyConfigElement; @@ -18,7 +18,7 @@ import java.util.Set; public class GuiBloodMagicConfig extends GuiConfig { - public GuiBloodMagicConfig(GuiScreen parentScreen) { + public GuiBloodMagicConfig(Screen parentScreen) { super(parentScreen, getElements(), BloodMagic.MODID, false, false, BloodMagic.NAME); } @@ -52,7 +52,7 @@ public class GuiBloodMagicConfig extends GuiConfig { } @Override - public GuiScreen createConfigGui(GuiScreen parentScreen) { + public Screen createConfigGui(Screen parentScreen) { return new GuiBloodMagicConfig(parentScreen); } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java index 80705ac1..a942839d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -9,15 +9,15 @@ import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.tile.container.*; import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Object getServerGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) { BlockPos pos = new BlockPos(x, y, z); switch (id) { @@ -39,8 +39,8 @@ public class GuiHandler implements IGuiHandler { } @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - if (world instanceof WorldClient) { + public Object getClientGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) { + if (world instanceof ClientWorld) { BlockPos pos = new BlockPos(x, y, z); switch (id) { diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java index 95fbd50f..d20cb33e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java @@ -6,21 +6,21 @@ import WayofTime.bloodmagic.item.inventory.ContainerHolding; import WayofTime.bloodmagic.item.inventory.InventoryHolding; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiHolding extends GuiContainer { +public class GuiHolding extends ContainerScreen { private ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "gui/SigilHolding.png"); - private EntityPlayer player; + private PlayerEntity player; - public GuiHolding(EntityPlayer player, InventoryHolding inventoryHolding) { + public GuiHolding(PlayerEntity player, InventoryHolding inventoryHolding) { super(new ContainerHolding(player, inventoryHolding)); xSize = 176; ySize = 121; @@ -48,7 +48,7 @@ public class GuiHolding extends GuiContainer { int x = (width - xSize) / 2; int y = (height - ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - ItemStack held = player.getHeldItem(EnumHand.MAIN_HAND); + ItemStack held = player.getHeldItem(Hand.MAIN_HAND); if (!held.isEmpty() && held.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.drawTexturedModalRect(4 + x + 36 * ItemSigilHolding.getCurrentItemOrdinal(player.getHeldItemMainhand()), y + 13, 0, 123, 24, 24); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 2a9d0590..72ffef7b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -8,15 +8,15 @@ import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode; import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; import WayofTime.bloodmagic.util.GhostItemHelper; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -24,15 +24,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.io.IOException; @SideOnly(Side.CLIENT) -public class GuiItemRoutingNode extends GuiContainer { - private GuiTextField textBox; +public class GuiItemRoutingNode extends ContainerScreen { + private TextFieldWidget textBox; private TileFilteredRoutingNode inventory; private ContainerItemRoutingNode container; private int left, top; - public GuiItemRoutingNode(InventoryPlayer playerInventory, IInventory tileRoutingNode) { + public GuiItemRoutingNode(PlayerInventory playerInventory, IInventory tileRoutingNode) { super(new ContainerItemRoutingNode(playerInventory, tileRoutingNode)); this.xSize = 201; this.ySize = 169; @@ -41,7 +41,7 @@ public class GuiItemRoutingNode extends GuiContainer { } private int getCurrentActiveSlotPriority() { - EnumFacing direction = EnumFacing.byIndex(inventory.currentActiveSlot); + Direction direction = Direction.byIndex(inventory.currentActiveSlot); if (direction != null) { return inventory.getPriority(direction); } @@ -56,17 +56,17 @@ public class GuiItemRoutingNode extends GuiContainer { top = (this.height - this.ySize) / 2; this.buttonList.clear(); - this.buttonList.add(new GuiButton(0, left + 176, top + 14, 18, 18, "D")); - this.buttonList.add(new GuiButton(1, left + 176, top + 32, 18, 18, "U")); - this.buttonList.add(new GuiButton(2, left + 176, top + 50, 18, 18, "N")); - this.buttonList.add(new GuiButton(3, left + 176, top + 68, 18, 18, "S")); - this.buttonList.add(new GuiButton(4, left + 176, top + 86, 18, 18, "W")); - this.buttonList.add(new GuiButton(5, left + 176, top + 104, 18, 18, "E")); - this.buttonList.add(new GuiButton(6, left + 160, top + 50, 10, 18, ">")); - this.buttonList.add(new GuiButton(7, left + 132, top + 50, 10, 18, "<")); + this.buttonList.add(new Button(0, left + 176, top + 14, 18, 18, "D")); + this.buttonList.add(new Button(1, left + 176, top + 32, 18, 18, "U")); + this.buttonList.add(new Button(2, left + 176, top + 50, 18, 18, "N")); + this.buttonList.add(new Button(3, left + 176, top + 68, 18, 18, "S")); + this.buttonList.add(new Button(4, left + 176, top + 86, 18, 18, "W")); + this.buttonList.add(new Button(5, left + 176, top + 104, 18, 18, "E")); + this.buttonList.add(new Button(6, left + 160, top + 50, 10, 18, ">")); + this.buttonList.add(new Button(7, left + 132, top + 50, 10, 18, "<")); disableDirectionalButton(inventory.currentActiveSlot); - this.textBox = new GuiTextField(0, this.fontRenderer, left + 94, top + 37, 70, 12); + this.textBox = new TextFieldWidget(0, this.fontRenderer, left + 94, top + 37, 70, 12); this.textBox.setEnableBackgroundDrawing(false); this.textBox.setText(""); } @@ -137,7 +137,7 @@ public class GuiItemRoutingNode extends GuiContainer { * for buttons) */ @Override - protected void actionPerformed(GuiButton button) throws IOException { + protected void actionPerformed(Button button) throws IOException { if (button.enabled) { BloodMagicPacketHandler.INSTANCE.sendToServer(new ItemRouterButtonPacketProcessor(button.id, inventory.getPos(), inventory.getWorld())); if (button.id < 6) { @@ -149,7 +149,7 @@ public class GuiItemRoutingNode extends GuiContainer { } private void enableAllDirectionalButtons() { - for (GuiButton button : this.buttonList) { + for (Button button : this.buttonList) { button.enabled = true; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java index c64d1b21..f8693ba3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java @@ -2,18 +2,18 @@ package WayofTime.bloodmagic.client.gui; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiMasterRoutingNode extends GuiContainer { +public class GuiMasterRoutingNode extends ContainerScreen { - public GuiMasterRoutingNode(InventoryPlayer playerInventory, IInventory tileRoutingNode) { + public GuiMasterRoutingNode(PlayerInventory playerInventory, IInventory tileRoutingNode) { super(new ContainerMasterRoutingNode(playerInventory, tileRoutingNode)); this.xSize = 216; this.ySize = 216; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java index 6a1d85b0..3e890f88 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java @@ -4,19 +4,19 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.tile.TileSoulForge; import WayofTime.bloodmagic.tile.container.ContainerSoulForge; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiSoulForge extends GuiContainer { +public class GuiSoulForge extends ContainerScreen { public IInventory tileSoulForge; - public GuiSoulForge(InventoryPlayer playerInventory, IInventory tileSoulForge) { + public GuiSoulForge(PlayerInventory playerInventory, IInventory tileSoulForge) { super(new ContainerSoulForge(playerInventory, tileSoulForge)); this.tileSoulForge = tileSoulForge; this.xSize = 176; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java index e5db4c67..be9cde2e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java @@ -3,17 +3,17 @@ package WayofTime.bloodmagic.client.gui; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.tile.container.ContainerTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiTeleposer extends GuiContainer { - public GuiTeleposer(InventoryPlayer playerInventory, IInventory tileTeleposer) { +public class GuiTeleposer extends ContainerScreen { + public GuiTeleposer(PlayerInventory playerInventory, IInventory tileTeleposer) { super(new ContainerTeleposer(playerInventory, tileTeleposer)); } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java index 94531576..c14d65c4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.client.hud.element.HUDElement; import com.google.common.collect.Maps; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -17,16 +17,16 @@ import javax.vecmath.Vector2f; import java.awt.Point; import java.util.Map; -public class GuiEditHUD extends GuiScreen { +public class GuiEditHUD extends Screen { private static final int LINE_COLOR = 0x2D2D2D; - private final GuiScreen parent; + private final Screen parent; private final Map currentOverrides = Maps.newHashMap(); private HUDElement dragged; public boolean changes; - public GuiEditHUD(GuiScreen parent) { + public GuiEditHUD(Screen parent) { this.parent = parent; } @@ -102,7 +102,7 @@ public class GuiEditHUD extends GuiScreen { } @Override - protected void actionPerformed(GuiButton button) { + protected void actionPerformed(Button button) { switch (button.id) { case 0: { Minecraft.getMinecraft().displayGuiScreen(parent); diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java index 29c7a889..a039b541 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java @@ -8,7 +8,7 @@ import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.ResourceLocation; import java.util.List; @@ -32,7 +32,7 @@ public class ElementDemonAura extends HUDElement { @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { Minecraft minecraft = Minecraft.getMinecraft(); - EntityPlayer player = minecraft.player; + PlayerEntity player = minecraft.player; minecraft.getTextureManager().bindTexture(BAR_LOCATION); GlStateManager.color(1.0F, 1.0F, 1.0F); diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java index 0d9beb6c..4854f312 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.client.hud.element; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import java.util.List; @@ -21,8 +21,8 @@ public abstract class ElementDivinedInformation extends El @Override public boolean shouldRender(Minecraft minecraft) { - EntityPlayer player = Minecraft.getMinecraft().player; - ItemStack sigilStack = player.getHeldItem(EnumHand.MAIN_HAND); + PlayerEntity player = Minecraft.getMinecraft().player; + ItemStack sigilStack = player.getHeldItem(Hand.MAIN_HAND); boolean flag = false; if (simple) { if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) @@ -30,7 +30,7 @@ public abstract class ElementDivinedInformation extends El else flag = isFlagSigilHolding(sigilStack, true); if (!flag) { - sigilStack = player.getHeldItem(EnumHand.OFF_HAND); + sigilStack = player.getHeldItem(Hand.OFF_HAND); if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; else flag = isFlagSigilHolding(sigilStack, true); @@ -42,7 +42,7 @@ public abstract class ElementDivinedInformation extends El else flag = isFlagSigilHolding(sigilStack, false); if (!flag) { - sigilStack = player.getHeldItem(EnumHand.OFF_HAND); + sigilStack = player.getHeldItem(Hand.OFF_HAND); if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) flag = true; else flag = isFlagSigilHolding(sigilStack, false); diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java index 9206f124..c83e9966 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java @@ -8,7 +8,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -62,7 +62,7 @@ public class ElementHolding extends HUDElement { return true; } - protected void renderHotbarItem(int x, int y, float partialTicks, EntityPlayer player, ItemStack stack) { + protected void renderHotbarItem(int x, int y, float partialTicks, PlayerEntity player, ItemStack stack) { if (!stack.isEmpty()) { float animation = (float) stack.getAnimationsToGo() - partialTicks; diff --git a/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java b/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java index c325019f..a7fe5286 100644 --- a/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java +++ b/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.key; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public interface IKeybindable { - void onKeyPressed(ItemStack stack, EntityPlayer player, KeyBindings key, boolean showInChat); + void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat); } diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java index 6fa069bd..8d7b86d4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java +++ b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.KeyProcessor; import WayofTime.bloodmagic.util.handler.event.ClientHandler; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraftforge.client.settings.IKeyConflictContext; @@ -33,7 +33,7 @@ public enum KeyBindings { @SideOnly(Side.CLIENT) @Override public void handleKeybind() { - EntityPlayerSP player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getMinecraft().player; if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, -1); } @@ -42,7 +42,7 @@ public enum KeyBindings { @SideOnly(Side.CLIENT) @Override public void handleKeybind() { - EntityPlayerSP player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getMinecraft().player; if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1); } diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index a674b457..bf43d69a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.iface.IActivatable; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java index 58f7fc64..0b3a91b9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.iface.IMultiWillTool; import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java index a1e3af67..ec857e14 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java index 25a9d228..ca303032 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java @@ -3,30 +3,30 @@ package WayofTime.bloodmagic.client.render; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.model.ModelElytra; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.client.renderer.entity.layers.LayerArmorBase; +import net.minecraft.client.renderer.entity.PlayerRenderer; +import net.minecraft.client.renderer.entity.layers.ArmorLayer; import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public class LayerBloodElytra implements LayerRenderer { +public class LayerBloodElytra implements LayerRenderer { private static final ResourceLocation TEXTURE_BLOOD_ELYTRA = new ResourceLocation("bloodmagic", "textures/entities/bloodElytra.png"); - private final RenderPlayer renderPlayer; + private final PlayerRenderer renderPlayer; private final ModelElytra modelElytra = new ModelElytra(); - public LayerBloodElytra(RenderPlayer renderPlayer) { + public LayerBloodElytra(PlayerRenderer renderPlayer) { this.renderPlayer = renderPlayer; } @Override - public void doRenderLayer(AbstractClientPlayer clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + public void doRenderLayer(AbstractClientPlayerEntity clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { if (LivingArmour.hasFullSet(clientPlayer)) { - ItemStack chestStack = clientPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = clientPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST); if (ItemLivingArmour.hasUpgrade(BloodMagic.MODID + ".upgrade.elytra", chestStack)) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.enableBlend(); @@ -39,7 +39,7 @@ public class LayerBloodElytra implements LayerRenderer { modelElytra.render(clientPlayer, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); if (chestStack.isItemEnchanted()) - LayerArmorBase.renderEnchantedGlint(this.renderPlayer, clientPlayer, this.modelElytra, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale); + ArmorLayer.renderEnchantedGlint(this.renderPlayer, clientPlayer, this.modelElytra, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale); GlStateManager.popMatrix(); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 348bc98f..057ee09d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer { @@ -78,8 +78,8 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 191fde6f..6fc89ccb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { @@ -108,7 +108,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; + Direction sideHit = Direction.UP; GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); switch (sideHit) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index d6fc3741..ec483fc2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { @@ -64,8 +64,8 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java index 76a98ab3..8c84e8f1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -78,8 +78,8 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index cafb9b63..26472bb5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer { @@ -62,8 +62,8 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index 5153f6b8..36652fc6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer { @@ -67,8 +67,8 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index b9967d3a..0603abc8 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -88,8 +88,8 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.translate(x, y, z); // Specify which face this "circle" is located on - EnumFacing sideHit = EnumFacing.UP; - EnumFacing rotation = tileArray.getRotation(); + Direction sideHit = Direction.UP; + Direction rotation = tileArray.getRotation(); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index b954ce52..fecc0a15 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -5,10 +5,10 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.item.ItemStack; -public class RenderAlchemyArray extends TileEntitySpecialRenderer { +public class RenderAlchemyArray extends TileEntityRenderer { @Override public void render(TileAlchemyArray alchemyArray, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { ItemStack inputStack = alchemyArray.getStackInSlot(0); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 2dba9db8..5b8d2cc4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -6,12 +6,12 @@ import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.handler.event.ClientHandler; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -20,7 +20,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -public class RenderAltar extends TileEntitySpecialRenderer { +public class RenderAltar extends TileEntityRenderer { private static final float MIN_HEIGHT = 0.499f; private static final float MAX_HEIGHT = 0.745f; @@ -58,7 +58,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { int fluidColor = fluid.getColor(fluidStack); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + Minecraft.getMinecraft().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); setGLColorFromInt(fluidColor); double uMin = (double) fluidStillSprite.getMinU(); @@ -78,7 +78,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { } private void renderItem(ItemStack stack) { - RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); + ItemRenderer itemRenderer = Minecraft.getMinecraft().getRenderItem(); if (!stack.isEmpty()) { GlStateManager.translate(0.5, 1, 0.5); GlStateManager.pushMatrix(); @@ -100,7 +100,7 @@ public class RenderAltar extends TileEntitySpecialRenderer { } private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) { - EntityPlayerSP player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getMinecraft().player; World world = player.world; if (tier == AltarTier.ONE) diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java index 235fb836..5dd1e340 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java @@ -6,9 +6,9 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.relauncher.Side; @@ -16,7 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderBloodTank extends TileEntitySpecialRenderer { +public class RenderBloodTank extends TileEntityRenderer { private static final Minecraft mc = Minecraft.getMinecraft(); @Override @@ -30,7 +30,7 @@ public class RenderBloodTank extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); - bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); renderFluid(bloodTank.getRenderHeight(), renderFluid, x, y, z); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java index 439b9618..a7fceec7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java @@ -4,15 +4,15 @@ import WayofTime.bloodmagic.tile.TileDemonCrucible; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -public class RenderDemonCrucible extends TileEntitySpecialRenderer { +public class RenderDemonCrucible extends TileEntityRenderer { public static Minecraft mc = Minecraft.getMinecraft(); public static ResourceLocation resource = new ResourceLocation("bloodmagic", "textures/blocks/lifeEssenceStill.png"); public static float minHeight = 0.6497f; @@ -29,10 +29,10 @@ public class RenderDemonCrucible extends TileEntitySpecialRenderer { +public class RenderItemRoutingNode extends TileEntityRenderer { private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png"); private static final Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java index 8909df07..b4b6f66d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java @@ -2,13 +2,13 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.tile.TileMimic; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderMimic extends TileEntitySpecialRenderer { +public class RenderMimic extends TileEntityRenderer { public void render(TileMimic mimic, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (mimic.getStackInSlot(0) != null) { TileEntity testTile = mimic.mimicedTile; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java index 1237c0c7..272972c9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class BloodLightRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderEntityBloodLight(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java index 6429a137..59944834 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class CorruptedChickenRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderCorruptedChicken(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java index 20c9c2c9..35c041ba 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class CorruptedSheepRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderCorruptedSheep(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java index 95debc39..51ced8ba 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class CorruptedSpiderRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderCorruptedSpider(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java index 2e29c50e..3532162d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class CorruptedZombieRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderCorruptedZombie(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java index 5b57d12d..50c24346 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class MeteorRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderEntityMeteor(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java index bc015688..6fb47c9a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntityMimic; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class MimicRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderEntityMimic(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java index 6db0f642..10c028e3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java @@ -3,18 +3,18 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; import WayofTime.bloodmagic.client.render.model.ModelCorruptedChicken; import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.MobRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderCorruptedChicken extends RenderLiving { +public class RenderCorruptedChicken extends MobRenderer { private static final ResourceLocation CHICKEN_TEXTURES = new ResourceLocation("textures/entity/chicken.png"); - public RenderCorruptedChicken(RenderManager renderManagerIn) { + public RenderCorruptedChicken(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelCorruptedChicken(0), 0.3f); this.addLayer(new LayerWill<>(this, new ModelCorruptedChicken(1.1f))); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java index d8024973..744c1e78 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java @@ -6,17 +6,17 @@ import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep; import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep2; import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.MobRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderCorruptedSheep extends RenderLiving { +public class RenderCorruptedSheep extends MobRenderer { private static final ResourceLocation SHEARED_SHEEP_TEXTURES = new ResourceLocation("textures/entity/sheep/sheep.png"); - public RenderCorruptedSheep(RenderManager renderManagerIn) { + public RenderCorruptedSheep(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelCorruptedSheep2(0), 0.7F); this.addLayer(new LayerCorruptedSheepWool(this)); this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep(1.1f))); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java index bef6c894..e57c3094 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java @@ -5,17 +5,17 @@ import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; import WayofTime.bloodmagic.client.render.model.ModelCorruptedSpider; import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; import net.minecraft.client.model.ModelSpider; -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderCorruptedSpider extends RenderLiving { +public class RenderCorruptedSpider extends MobRenderer { private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png"); - public RenderCorruptedSpider(RenderManager renderManagerIn) { + public RenderCorruptedSpider(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelSpider(), 1.0F); this.addLayer(new LayerCorruptedSpiderEyes(this)); this.addLayer(new LayerWill<>(this, new ModelCorruptedSpider(1.1f))); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java index f7ffad16..cc4bfdb3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java @@ -4,27 +4,26 @@ import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; import net.minecraft.client.model.ModelZombie; import net.minecraft.client.model.ModelZombieVillager; -import net.minecraft.client.renderer.entity.RenderBiped; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; -import net.minecraft.client.renderer.entity.layers.LayerCustomHead; -import net.minecraft.client.renderer.entity.layers.LayerHeldItem; -import net.minecraft.client.renderer.entity.layers.LayerRenderer; +import net.minecraft.client.renderer.entity.BipedRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.entity.layers.*; +import net.minecraft.client.renderer.entity.layers.BipedArmorLayer; +import net.minecraft.client.renderer.entity.layers.HeldItemLayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderCorruptedZombie extends RenderBiped { +public class RenderCorruptedZombie extends BipedRenderer { private static final ResourceLocation ZOMBIE_TEXTURES = new ResourceLocation("textures/entity/zombie/zombie.png"); private final ModelZombieVillager zombieVillagerModel; - public RenderCorruptedZombie(RenderManager renderManagerIn) { + public RenderCorruptedZombie(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelZombie(), 0.5F); LayerRenderer layerrenderer = this.layerRenderers.get(0); this.zombieVillagerModel = new ModelZombieVillager(); - this.addLayer(new LayerHeldItem(this)); - LayerBipedArmor layerbipedarmor = new LayerBipedArmor(this) { + this.addLayer(new HeldItemLayer(this)); + BipedArmorLayer layerbipedarmor = new BipedArmorLayer(this) { protected void initArmor() { this.modelLeggings = new ModelZombie(0.5F, true); this.modelArmor = new ModelZombie(1.0F, true); @@ -32,9 +31,9 @@ public class RenderCorruptedZombie extends RenderBiped { }; this.addLayer(layerbipedarmor); - if (layerrenderer instanceof LayerCustomHead) { + if (layerrenderer instanceof HeadLayer) { layerRenderers.remove(layerrenderer); - this.addLayer(new LayerCustomHead(this.zombieVillagerModel.bipedHead)); + this.addLayer(new HeadLayer(this.zombieVillagerModel.bipedHead)); } this.layerRenderers.remove(layerbipedarmor); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 64430836..45214ac1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -4,17 +4,17 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.item.types.ComponentTypes; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.util.ResourceLocation; -public class RenderEntityBloodLight extends Render { - private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); +public class RenderEntityBloodLight extends EntityRenderer { + private final ItemRenderer renderItem = Minecraft.getMinecraft().getRenderItem(); - public RenderEntityBloodLight(RenderManager renderManagerIn) { + public RenderEntityBloodLight(EntityRendererManager renderManagerIn) { super(renderManagerIn); } @@ -25,7 +25,7 @@ public class RenderEntityBloodLight extends Render { GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + this.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); this.renderItem.renderItem(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); @@ -33,6 +33,6 @@ public class RenderEntityBloodLight extends Render { } protected ResourceLocation getEntityTexture(EntityBloodLight entity) { - return TextureMap.LOCATION_BLOCKS_TEXTURE; + return AtlasTexture.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java index 77c9cdbc..e9752d3d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java @@ -5,18 +5,18 @@ import WayofTime.bloodmagic.client.render.model.ModelMeteor; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.util.ResourceLocation; -public class RenderEntityMeteor extends Render { +public class RenderEntityMeteor extends EntityRenderer { private static final ResourceLocation TEXTURE = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png"); private static final float SCALE = 1; public ModelBase model = new ModelMeteor(); - public RenderEntityMeteor(RenderManager renderManagerIn) { + public RenderEntityMeteor(EntityRendererManager renderManagerIn) { super(renderManagerIn); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java index 2612345a..6cde4204 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java @@ -5,30 +5,30 @@ import WayofTime.bloodmagic.entity.mob.EntityMimic; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; -import net.minecraft.init.Items; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.entity.MobRenderer; +import net.minecraft.client.renderer.tileentity.SkullTileEntityRenderer; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.Items; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; -import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.EnumFacing; +import net.minecraft.tileentity.SkullTileEntity; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderEntityMimic extends RenderLiving { +public class RenderEntityMimic extends MobRenderer { private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png"); Minecraft minecraft = Minecraft.getMinecraft(); - public RenderEntityMimic(RenderManager renderManagerIn) { + public RenderEntityMimic(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelMimic(), 1.0F); } @@ -61,7 +61,7 @@ public class RenderEntityMimic extends RenderLiving { GameProfile gameprofile = null; if (itemstack.hasTagCompound()) { - NBTTagCompound nbttagcompound = itemstack.getTagCompound(); + CompoundNBT nbttagcompound = itemstack.getTagCompound(); if (nbttagcompound.hasKey("SkullOwner", 10)) { gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner")); @@ -69,14 +69,14 @@ public class RenderEntityMimic extends RenderLiving { String s = nbttagcompound.getString("SkullOwner"); if (!StringUtils.isNullOrEmpty(s)) { - gameprofile = TileEntitySkull.updateGameProfile(new GameProfile(null, s)); - nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile)); + gameprofile = SkullTileEntity.updateGameProfile(new GameProfile(null, s)); + nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile)); } } } - TileEntitySkullRenderer.instance.renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), gameprofile, -1, 0); - } else if (!(item instanceof ItemArmor) || ((ItemArmor) item).getEquipmentSlot() != EntityEquipmentSlot.HEAD) { + SkullTileEntityRenderer.instance.renderSkull(-0.5F, 0.0F, -0.5F, Direction.UP, 180.0F, itemstack.getMetadata(), gameprofile, -1, 0); + } else if (!(item instanceof ArmorItem) || ((ArmorItem) item).getEquipmentSlot() != EquipmentSlotType.HEAD) { GlStateManager.translate(0, 0.5f, 0); GlStateManager.rotate(-(mimic.prevRotationYawHead + partialTicks * (mimic.rotationYawHead - mimic.prevRotationYawHead)) - 180, 0, 1, 0); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java index 3e522850..53721ceb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; @@ -14,14 +14,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderEntitySentientArrow extends Render { +public class RenderEntitySentientArrow extends EntityRenderer { private static final ResourceLocation defaultTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow.png"); private static final ResourceLocation corrosiveTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_corrosive.png"); private static final ResourceLocation vengefulTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_vengeful.png"); private static final ResourceLocation destructiveTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_destructive.png"); private static final ResourceLocation steadfastTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_steadfast.png"); - public RenderEntitySentientArrow(RenderManager renderManagerIn) { + public RenderEntitySentientArrow(EntityRendererManager renderManagerIn) { super(renderManagerIn); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java index cfe46aed..106ec48e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java @@ -4,18 +4,18 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public class RenderEntitySoulSnare extends Render { - private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); +public class RenderEntitySoulSnare extends EntityRenderer { + private final ItemRenderer renderItem = Minecraft.getMinecraft().getRenderItem(); - public RenderEntitySoulSnare(RenderManager renderManagerIn) { + public RenderEntitySoulSnare(EntityRendererManager renderManagerIn) { super(renderManagerIn); } @@ -26,7 +26,7 @@ public class RenderEntitySoulSnare extends Render { GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + this.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); this.renderItem.renderItem(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); @@ -34,6 +34,6 @@ public class RenderEntitySoulSnare extends Render { } protected ResourceLocation getEntityTexture(EntitySoulSnare entity) { - return TextureMap.LOCATION_BLOCKS_TEXTURE; + return AtlasTexture.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java index 4c8ab7fe..1275180d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java @@ -3,29 +3,29 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderBiped; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.layers.LayerArrow; -import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; -import net.minecraft.client.renderer.entity.layers.LayerCustomHead; -import net.minecraft.client.renderer.entity.layers.LayerHeldItem; -import net.minecraft.item.EnumAction; +import net.minecraft.client.renderer.entity.BipedRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.entity.layers.*; +import net.minecraft.client.renderer.entity.layers.BipedArmorLayer; +import net.minecraft.client.renderer.entity.layers.HeadLayer; +import net.minecraft.client.renderer.entity.layers.HeldItemLayer; +import net.minecraft.item.UseAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumHandSide; +import net.minecraft.util.HandSide; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderSentientSpecter extends RenderBiped { +public class RenderSentientSpecter extends BipedRenderer { public static final ResourceLocation texture = new ResourceLocation("bloodmagic", "textures/entities/specter.png"); - public RenderSentientSpecter(RenderManager renderManager) { + public RenderSentientSpecter(EntityRendererManager renderManager) { super(renderManager, new ModelBiped(0.0F), 0); - this.addLayer(new LayerBipedArmor(this)); - this.addLayer(new LayerHeldItem(this)); - this.addLayer(new LayerArrow(this)); - this.addLayer(new LayerCustomHead(this.getMainModel().bipedHead)); + this.addLayer(new BipedArmorLayer(this)); + this.addLayer(new HeldItemLayer(this)); + this.addLayer(new ArrowLayer(this)); + this.addLayer(new HeadLayer(this.getMainModel().bipedHead)); } public ModelBiped getMainModel() { @@ -55,11 +55,11 @@ public class RenderSentientSpecter extends RenderBiped { modelbiped$armpose = ModelBiped.ArmPose.ITEM; if (clientPlayer.getItemInUseCount() > 0) { - EnumAction enumaction = itemstack.getItemUseAction(); + UseAction enumaction = itemstack.getItemUseAction(); - if (enumaction == EnumAction.BLOCK) { + if (enumaction == UseAction.BLOCK) { modelbiped$armpose = ModelBiped.ArmPose.BLOCK; - } else if (enumaction == EnumAction.BOW) { + } else if (enumaction == UseAction.BOW) { modelbiped$armpose = ModelBiped.ArmPose.BOW_AND_ARROW; } } @@ -69,15 +69,15 @@ public class RenderSentientSpecter extends RenderBiped { modelbiped$armpose1 = ModelBiped.ArmPose.ITEM; if (clientPlayer.getItemInUseCount() > 0) { - EnumAction enumaction1 = itemstack1.getItemUseAction(); + UseAction enumaction1 = itemstack1.getItemUseAction(); - if (enumaction1 == EnumAction.BLOCK) { + if (enumaction1 == UseAction.BLOCK) { modelbiped$armpose1 = ModelBiped.ArmPose.BLOCK; } } } - if (clientPlayer.getPrimaryHand() == EnumHandSide.RIGHT) { + if (clientPlayer.getPrimaryHand() == HandSide.RIGHT) { modelplayer.rightArmPose = modelbiped$armpose; modelplayer.leftArmPose = modelbiped$armpose1; } else { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java index 49ec7093..15003afb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class SentientArrowRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderEntitySentientArrow(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java index 8e92253c..0048ddcb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class SentientSpecterRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderSentientSpecter(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java index 0ced4e40..cada7206 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraftforge.fml.client.registry.IRenderFactory; public class SoulSnareRenderFactory implements IRenderFactory { @Override - public Render createRenderFor(RenderManager manager) { + public EntityRenderer createRenderFor(EntityRendererManager manager) { return new RenderEntitySoulSnare(manager); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java index 92c55940..e95e027e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep; import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.DyeColor; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -27,12 +27,12 @@ public class LayerCorruptedSheepWool implements LayerRenderer implements LayerRenderer { private static final ResourceLocation RAW_TEXTURE = new ResourceLocation("bloodmagic", "textures/entities/overlay/overlay_raw.png"); - private final RenderLiving renderer; + private final MobRenderer renderer; private final ModelBase model; - public LayerWill(RenderLiving rendererIn, ModelBase model) { + public LayerWill(MobRenderer rendererIn, ModelBase model) { this.renderer = rendererIn; this.model = model; } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java index a1c27e01..14b72d05 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; import net.minecraft.client.model.ModelQuadruped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +40,7 @@ public class ModelCorruptedSheep extends ModelQuadruped { * float params here are the same second and third as in the * setRotationAngles method. */ - public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) { + public void setLivingAnimations(LivingEntity entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) { super.setLivingAnimations(entitylivingbaseIn, p_78086_2_, p_78086_3_, partialTickTime); this.head.rotationPointY = 6.0F + ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationPointY(partialTickTime) * 9.0F; this.headRotationAngleX = ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java index fb5d5497..d80c4205 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; import net.minecraft.client.model.ModelQuadruped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -27,7 +27,7 @@ public class ModelCorruptedSheep2 extends ModelQuadruped { * float params here are the same second and third as in the * setRotationAngles method. */ - public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) { + public void setLivingAnimations(LivingEntity entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) { super.setLivingAnimations(entitylivingbaseIn, p_78086_2_, p_78086_3_, partialTickTime); this.head.rotationPointY = 6.0F + ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationPointY(partialTickTime) * 9.0F; this.headRotationAngleX = ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime); diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 2d99578a..7eedd178 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -5,15 +5,15 @@ import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.helper.BindableHelper; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.server.command.CommandTreeBase; import net.minecraftforge.server.command.CommandTreeHelp; public class SubCommandBind extends CommandTreeBase { - public EntityPlayerMP player; + public ServerPlayerEntity player; public SubCommandBind() { addSubcommand(new CommandTreeHelp(this)); @@ -45,12 +45,12 @@ public class SubCommandBind extends CommandTreeBase { @Override public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TextComponentTranslation(getHelp())); + sender.sendMessage(new TranslationTextComponent(getHelp())); return; } if (sender.getEntityWorld().isRemote) return; - EntityPlayerMP player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); ItemStack held = player.getHeldItemMainhand(); boolean bind = true; if (held.getItem() instanceof IBindable) { @@ -65,22 +65,22 @@ public class SubCommandBind extends CommandTreeBase { player = getPlayer(server, sender, args[0]); if (bind) { if (binding.getOwnerName().equals(player.getName())) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.error.ownerEqualsTarget")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.ownerEqualsTarget")); return; } binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); BindableHelper.applyBinding(held, binding); this.player = player; - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.success", getInfo())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.success", getInfo())); } else { if (binding == null) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.error.notBound")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBound")); } held.getTagCompound().removeTag("binding"); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.remove.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.remove.success")); } } else - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.error.notBindable")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBindable")); } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index ff1038c8..230dbf08 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -7,10 +7,10 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.server.command.CommandTreeBase; import net.minecraftforge.server.command.CommandTreeHelp; @@ -46,7 +46,7 @@ public class SubCommandNetwork extends CommandTreeBase { abstract class NetworkCommand extends CommandTreeBase { - public EntityPlayerMP player; + public ServerPlayerEntity player; public SoulNetwork network; public String uuid; @@ -64,12 +64,12 @@ public class SubCommandNetwork extends CommandTreeBase { else if (args.length > 1 && Utils.isInteger(args[1])) amount = Integer.parseInt(args[1]); else { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.arg.invalid")); - sender.sendMessage(new TextComponentTranslation(this.getUsage(sender))); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid")); + sender.sendMessage(new TranslationTextComponent(this.getUsage(sender))); return null; } if (amount < 0) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.negative")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative")); return null; } return amount; @@ -91,7 +91,7 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TextComponentTranslation(getHelp())); + sender.sendMessage(new TranslationTextComponent(getHelp())); return; } if (!getName().equals("get")) { @@ -118,14 +118,14 @@ public class SubCommandNetwork extends CommandTreeBase { return; int currE = network.getCurrentEssence(); if (amount > currE) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.syphon.amountTooHigh")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.syphon.amountTooHigh")); if (currE == 0) return; amount = Math.min(amount, currE); } network.syphonAndDamage(player, SoulTicket.command(sender, this.getName(), amount)); int newE = network.getCurrentEssence(); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.syphon.success", currE - newE, player.getDisplayName().getFormattedText())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.syphon.success", currE - newE, player.getDisplayName().getFormattedText())); } } @@ -140,7 +140,7 @@ public class SubCommandNetwork extends CommandTreeBase { Integer amount = commandHelperAmount(server, sender, args); if (amount == null) return; - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, getName(), amount), NetworkHelper.getMaximumForTier(network.getOrbTier())), player.getDisplayName().getFormattedText())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, getName(), amount), NetworkHelper.getMaximumForTier(network.getOrbTier())), player.getDisplayName().getFormattedText())); } } @@ -156,7 +156,7 @@ public class SubCommandNetwork extends CommandTreeBase { if (amount == null) return; network.setCurrentEssence(amount); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount)); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount)); } } @@ -172,7 +172,7 @@ public class SubCommandNetwork extends CommandTreeBase { this.player = args.length < 1 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); this.network = NetworkHelper.getSoulNetwork(uuid); - sender.sendMessage(new TextComponentString((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TextComponentTranslation("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText()))); + sender.sendMessage(new StringTextComponent((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TranslationTextComponent("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText()))); } } @@ -186,7 +186,7 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { network.setCurrentEssence(NetworkHelper.getMaximumForTier(network.getOrbTier())); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText())); } } @@ -205,7 +205,7 @@ public class SubCommandNetwork extends CommandTreeBase { @Override public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { network.setCurrentEssence(Integer.MAX_VALUE); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText())); } } @@ -222,7 +222,7 @@ public class SubCommandNetwork extends CommandTreeBase { if (!tickethistory.isEmpty()) for (SoulTicket i : network.getTicketHistory()) sender.sendMessage(i.getDescription()); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success", player.getDisplayName().getFormattedText())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success", player.getDisplayName().getFormattedText())); } } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 816c828b..10b01fb0 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -7,9 +7,9 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.server.command.CommandTreeBase; import net.minecraftforge.server.command.CommandTreeHelp; @@ -37,7 +37,7 @@ public class SubCommandOrb extends CommandTreeBase { abstract class OrbCommand extends CommandTreeBase { - public EntityPlayerMP player; + public ServerPlayerEntity player; public String uuid; public SoulNetwork network; public Object info; @@ -58,7 +58,7 @@ public class SubCommandOrb extends CommandTreeBase { @Override public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TextComponentTranslation(getHelp())); + sender.sendMessage(new TranslationTextComponent(getHelp())); return; } player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); @@ -81,7 +81,7 @@ public class SubCommandOrb extends CommandTreeBase { @Override public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { super.execute(server, sender, args); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.orb.currenttier", network.getOrbTier())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.orb.currenttier", network.getOrbTier())); } } @@ -109,19 +109,19 @@ public class SubCommandOrb extends CommandTreeBase { else if (args.length == 2 && Utils.isInteger(args[1])) targetTier = Integer.parseInt(args[1]); else { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.arg.invalid")); - sender.sendMessage(new TextComponentTranslation(this.getUsage(sender))); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid")); + sender.sendMessage(new TranslationTextComponent(this.getUsage(sender))); return; } if (targetTier < 0) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.negative")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative")); return; } else if (targetTier > maxTier) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.orb.error.tierTooHigh", getInfo())); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.orb.error.tierTooHigh", getInfo())); return; } network.setOrbTier(targetTier); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); } } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java index b64efcf9..e531cf29 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java @@ -6,12 +6,12 @@ import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.helper.RitualHelper; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.server.command.CommandTreeBase; import net.minecraftforge.server.command.CommandTreeHelp; @@ -69,13 +69,13 @@ public class SubCommandRitual extends CommandTreeBase { @Override public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException { if (args.length == 0) { - sender.sendMessage(new TextComponentTranslation("commands.blooodmagic.ritual.create.noRitual")); + sender.sendMessage(new TranslationTextComponent("commands.blooodmagic.ritual.create.noRitual")); return; } else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) { - sender.sendMessage(new TextComponentTranslation(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getTranslationKey() + ".info")); + sender.sendMessage(new TranslationTextComponent(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getTranslationKey() + ".info")); return; } - EntityPlayerMP player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]); + ServerPlayerEntity player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]); boolean safe = false; if (args.length > 1 && args.length < 4) { int k = args.length - 1; @@ -89,14 +89,14 @@ public class SubCommandRitual extends CommandTreeBase { BlockPos pos = player.getPosition().down(); World world = player.getEntityWorld(); - EnumFacing direction = player.getHorizontalFacing(); + Direction direction = player.getHorizontalFacing(); if (RitualHelper.createRitual(world, pos, direction, BloodMagic.RITUAL_MANAGER.getRitual(args[0]), safe)) - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); else if (!safe) - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); else - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritaul.create.error.unsafe")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritaul.create.error.unsafe")); } @@ -120,7 +120,7 @@ public class SubCommandRitual extends CommandTreeBase { @Override public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException { - EntityPlayerMP player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); + ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); TileMasterRitualStone tile = getMRS(player); boolean safe = false; if (args.length > 0 && args.length < 3) { @@ -132,13 +132,13 @@ public class SubCommandRitual extends CommandTreeBase { } if (tile != null) if (RitualHelper.repairRitualFromRuins(tile, safe)) - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); else if (!safe) - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); else - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritaul.create.error.unsafe")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritaul.create.error.unsafe")); else - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.ritual.error.noMRS")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.error.noMRS")); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java index 8f74b045..3187aeeb 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java @@ -7,13 +7,13 @@ import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.Utils; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.server.command.CommandTreeBase; import net.minecraftforge.server.command.CommandTreeHelp; @@ -52,7 +52,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } abstract class TeleposeHelper extends CommandTreeBase { - public EntityPlayer player; + public PlayerEntity player; @Override public String getUsage(ICommandSender sender) { @@ -72,7 +72,7 @@ public class SubCommandTeleposer extends CommandTreeBase { return 2; } - public TileTeleposer[] cleanUpAndCreateArrayFromTeleposerList(EntityPlayer player) { + public TileTeleposer[] cleanUpAndCreateArrayFromTeleposerList(PlayerEntity player) { if (player == null) for (TileTeleposer i : teleposerSet) { if (i == null || i.isInvalid() || i.isEmpty()) { @@ -98,7 +98,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } - public void sendOwnedTeleposerList(ICommandSender sender, EntityPlayer player) { + public void sendOwnedTeleposerList(ICommandSender sender, PlayerEntity player) { teleposerArray = cleanUpAndCreateArrayFromTeleposerList(player); for (int i = 0; i < teleposerArray.length; i++) { ItemStack stack = teleposerArray[i].getStackInSlot(0); @@ -108,9 +108,9 @@ public class SubCommandTeleposer extends CommandTreeBase { String name = binding.getOwnerName(); if (player != null) { if (name.equals(player.getName())) - sender.sendMessage(new TextComponentString(i + new TextComponentTranslation("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); + sender.sendMessage(new StringTextComponent(i + new TranslationTextComponent("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); } else - sender.sendMessage(new TextComponentString(i + new TextComponentTranslation("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TextComponentTranslation("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); + sender.sendMessage(new StringTextComponent(i + new TranslationTextComponent("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); } } } @@ -126,12 +126,12 @@ public class SubCommandTeleposer extends CommandTreeBase { else if (args.length > 1 && Utils.isInteger(args[1])) teleposerID = Integer.parseInt(args[1]); else { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.arg.invalid")); - sender.sendMessage(new TextComponentTranslation(this.getUsage(sender))); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid")); + sender.sendMessage(new TranslationTextComponent(this.getUsage(sender))); return null; } if (teleposerID < 0) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.negative")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative")); return null; } return teleposerID; @@ -140,7 +140,7 @@ public class SubCommandTeleposer extends CommandTreeBase { @Override public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 1 && args[0].equals("?") || args[0].equals("help")) { - sender.sendMessage(new TextComponentTranslation(getHelp())); + sender.sendMessage(new TranslationTextComponent(getHelp())); return; } if (!(getName().equals("rmrf") || getName().equals("remove"))) { @@ -179,7 +179,7 @@ public class SubCommandTeleposer extends CommandTreeBase { sendOwnedTeleposerList(sender, null); else if (!sender.getEntityWorld().isRemote) { if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.error.outofbounds")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.outofbounds")); return; } TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! @@ -192,7 +192,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } else return; - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); } } @@ -210,7 +210,7 @@ public class SubCommandTeleposer extends CommandTreeBase { sendOwnedTeleposerList(sender, null); else if (!sender.getEntityWorld().isRemote) { if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.outofbounds")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds")); return; } TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! @@ -225,7 +225,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } else return; - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); } } @@ -242,7 +242,7 @@ public class SubCommandTeleposer extends CommandTreeBase { sendOwnedTeleposerList(sender, null); else if (!sender.getEntityWorld().isRemote) { if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.outofbounds")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds")); return; } TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! @@ -253,7 +253,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } else return; - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); } } @@ -270,7 +270,7 @@ public class SubCommandTeleposer extends CommandTreeBase { sendOwnedTeleposerList(sender, null); else if (!sender.getEntityWorld().isRemote) { if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.outofbounds")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds")); return; } TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! @@ -298,7 +298,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } else return; - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); } } @@ -322,7 +322,7 @@ public class SubCommandTeleposer extends CommandTreeBase { } cleanUpAndCreateArrayFromTeleposerList(null); - sender.sendMessage(new TextComponentTranslation("commands.bloodmagic.success")); + sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java index e1ba4eee..fadb82ea 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java @@ -12,7 +12,7 @@ import amerifrance.guideapi.api.GuideBook; import amerifrance.guideapi.api.IGuideBook; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.category.CategoryItemStack; -import net.minecraft.init.Items; +import net.minecraft.item.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index eca0eff2..2d661567 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -9,9 +9,9 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; +import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index a26dd233..64302417 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -9,9 +9,9 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; +import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index abfe0957..95109a73 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -8,9 +8,9 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; @@ -45,7 +45,7 @@ public class DataProviderAlchemyArray implements IWailaDataProvider { @Nonnull @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileAlchemyArray alchemyArray = (TileAlchemyArray) te; if (!alchemyArray.getStackInSlot(0).isEmpty()) tag.setString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 1614bee5..d144fb3f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -9,10 +9,10 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -36,7 +36,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { return currenttip; if (accessor.getNBTData().hasKey("altar")) { - NBTTagCompound altarData = accessor.getNBTData().getCompoundTag("altar"); + CompoundNBT altarData = accessor.getNBTData().getCompoundTag("altar"); currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInteger("tier"))); currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInteger("capacity"))); currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInteger("stored"))); @@ -52,7 +52,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { @Nonnull @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileAltar altar = (TileAltar) te; boolean hasSigil = false; @@ -78,7 +78,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { if (!hasSeer && !hasSigil) return tag; - NBTTagCompound altarData = new NBTTagCompound(); + CompoundNBT altarData = new CompoundNBT(); altarData.setInteger("tier", altar.getTier().toInt()); altarData.setInteger("capacity", altar.getCapacity()); altarData.setInteger("stored", altar.getCurrentBlood()); @@ -92,7 +92,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { return tag; } - public static boolean hasStack(ItemStack stack, EntityPlayer player) { + public static boolean hasStack(ItemStack stack, PlayerEntity player) { for (ItemStack inventoryStack : player.inventory.mainInventory) if (inventoryStack != null && inventoryStack.isItemEqual(stack)) return true; @@ -100,7 +100,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { return false; } - private static boolean holdingSeerSigil(EntityPlayer player) { + private static boolean holdingSeerSigil(PlayerEntity player) { if (player.getHeldItemMainhand().getItem() == RegistrarBloodMagicItems.SIGIL_SEER) return true; @@ -110,7 +110,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider { return false; } - private static boolean holdingDivinationSigil(EntityPlayer player) { + private static boolean holdingDivinationSigil(PlayerEntity player) { if (player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination) return true; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index b664531c..ed35e77b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -6,9 +6,9 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -40,12 +40,12 @@ public class DataProviderBloodTank implements IWailaDataProvider { @Nonnull @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileBloodTank tank = (TileBloodTank) te; tag.setInteger("tier", tank.getBlockMetadata() + 1); tag.setInteger("capacity", tank.capacity); if (tank.getTank().getFluid() != null) - tag.setTag("fluid", tank.getTank().getFluid().writeToNBT(new NBTTagCompound())); + tag.setTag("fluid", tank.getTank().getFluid().writeToNBT(new CompoundNBT())); return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java index e4bf0264..43d11f75 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.tile.TileMimic; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -24,7 +24,7 @@ public class DataProviderMimic implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { if (accessor.getNBTData().hasKey("mimiced")) { - NBTTagCompound mimiced = accessor.getNBTData().getCompoundTag("mimiced"); + CompoundNBT mimiced = accessor.getNBTData().getCompoundTag("mimiced"); Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(mimiced.getString("id"))); int meta = mimiced.getInteger("data"); ItemStack ret = new ItemStack(item, 1, meta); @@ -39,14 +39,14 @@ public class DataProviderMimic implements IWailaDataProvider { @Nonnull @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileMimic mimic = (TileMimic) te; ItemStack mimiced = mimic.getStackInSlot(0); if (!mimiced.isEmpty()) { - NBTTagCompound item = new NBTTagCompound(); + CompoundNBT item = new CompoundNBT(); item.setString("id", mimiced.getItem().getRegistryName().toString()); item.setInteger("data", mimiced.getMetadata()); - NBTTagCompound shareTag = mimiced.getItem().getNBTShareTag(mimiced); + CompoundNBT shareTag = mimiced.getItem().getNBTShareTag(mimiced); if (shareTag != null) item.setTag("nbt", shareTag); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index da4d5b21..4cf4ca0b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -9,9 +9,9 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -29,7 +29,7 @@ public class DataProviderRitualController implements IWailaDataProvider { if (!config.getConfig(Constants.Compat.WAILA_CONFIG_RITUAL)) return currenttip; - NBTTagCompound tag = accessor.getNBTData(); + CompoundNBT tag = accessor.getNBTData(); if (tag.getBoolean("master")) { if (tag.hasKey("ritual")) { currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); @@ -53,7 +53,7 @@ public class DataProviderRitualController implements IWailaDataProvider { @Nonnull @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { if (te instanceof TileMasterRitualStone) { TileMasterRitualStone mrs = (TileMasterRitualStone) te; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index 8f21ea90..d30b65d4 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -7,9 +7,9 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -31,7 +31,7 @@ public class DataProviderTeleposer implements IWailaDataProvider { return currenttip; if (accessor.getNBTData().hasKey("focus")) { - NBTTagCompound focusData = accessor.getNBTData().getCompoundTag("focus"); + CompoundNBT focusData = accessor.getNBTData().getCompoundTag("focus"); BlockPos boundPos = NBTUtil.getPosFromTag(focusData.getCompoundTag("pos")); int boundDim = focusData.getInteger("dim"); String dimName = WordUtils.capitalizeFully(DimensionManager.getProviderType(boundDim).getName().replace("_", " ")); @@ -43,12 +43,12 @@ public class DataProviderTeleposer implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileTeleposer teleposer = (TileTeleposer) te; ItemStack contained = teleposer.getStackInSlot(0); if (!contained.isEmpty() && contained.hasTagCompound()) { ItemTelepositionFocus focus = (ItemTelepositionFocus) contained.getItem(); - NBTTagCompound focusData = new NBTTagCompound(); + CompoundNBT focusData = new CompoundNBT(); focusData.setTag("pos", NBTUtil.createPosTag(focus.getBlockPos(contained))); focusData.setInteger("dim", contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); tag.setTag("focus", focusData); diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 71b6120e..4b61f7e0 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.container.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -15,21 +15,21 @@ import java.util.Set; public class StorageBlockCraftingManager { private static final StorageBlockCraftingManager instance = new StorageBlockCraftingManager(); - private static InventoryCrafting[] inventoryCrafting = { - new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { + private static CraftingInventory[] inventoryCrafting = { + new CraftingInventory(new Container() { + public boolean canInteractWith(PlayerEntity player) { return false; } }, 3, 3), - new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { + new CraftingInventory(new Container() { + public boolean canInteractWith(PlayerEntity player) { return false; } }, 2, 2), - new InventoryCrafting(new Container() { - public boolean canInteractWith(EntityPlayer player) { + new CraftingInventory(new Container() { + public boolean canInteractWith(PlayerEntity player) { return false; } }, @@ -56,7 +56,7 @@ public class StorageBlockCraftingManager { if (craftingManagerSB.blacklist.contains(stack)) { return ItemStack.EMPTY; } - InventoryCrafting inventory = inventoryCrafting[3 - gridSize]; + CraftingInventory inventory = inventoryCrafting[3 - gridSize]; for (int i = 0; i < inventory.getSizeInventory(); i++) { inventory.setInventorySlotContents(i, stack); } @@ -74,7 +74,7 @@ public class StorageBlockCraftingManager { return ItemStack.EMPTY; } - public static ItemStack getNNRecipeOutput(InventoryCrafting inventory, World world) { + public static ItemStack getNNRecipeOutput(CraftingInventory inventory, World world) { IRecipe checkForNull = CraftingManager.findMatchingRecipe(inventory, world); if (checkForNull != null) { return checkForNull.getRecipeOutput(); @@ -102,11 +102,11 @@ public class StorageBlockCraftingManager { BMLog.DEBUG.info("Total number of compression recipes: " + this.recipes.size()); } - public ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world) { + public ItemStack findMatchingRecipe(CraftingInventory craftingInventory, World world) { return this.findMatchingRecipe(craftingInventory, world, this.recipes); } - private ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world, HashSet list) { + private ItemStack findMatchingRecipe(CraftingInventory craftingInventory, World world, HashSet list) { int i = 0; ItemStack itemstack = ItemStack.EMPTY; ItemStack itemstack1 = ItemStack.EMPTY; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index fb6269d2..e5aaa84a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -10,9 +10,9 @@ import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.potion.PotionBloodMagic; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.init.MobEffects; -import net.minecraft.potion.Potion; +import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.potion.Effect; +import net.minecraft.potion.Effects; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; @@ -45,23 +45,23 @@ public class RegistrarBloodMagic { @GameRegistry.ObjectHolder("transcendent") public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; - public static final Potion BOOST = MobEffects.HASTE; - public static final Potion WHIRLWIND = MobEffects.HASTE; - public static final Potion PLANAR_BINDING = MobEffects.HASTE; - public static final Potion SOUL_SNARE = MobEffects.HASTE; - public static final Potion SOUL_FRAY = MobEffects.HASTE; - public static final Potion FIRE_FUSE = MobEffects.HASTE; - public static final Potion CONSTRICT = MobEffects.HASTE; - public static final Potion PLANT_LEECH = MobEffects.HASTE; - public static final Potion DEAFNESS = MobEffects.HASTE; - public static final Potion BOUNCE = MobEffects.HASTE; - public static final Potion CLING = MobEffects.HASTE; - public static final Potion SACRIFICIAL_LAMB = MobEffects.HASTE; - public static final Potion FLIGHT = MobEffects.HASTE; - public static final Potion GROUNDED = MobEffects.HASTE; - public static final Potion HEAVY_HEART = MobEffects.HASTE; - public static final Potion SUSPENDED = MobEffects.HASTE; - public static final Potion FEATHERED = MobEffects.HASTE; + public static final Effect BOOST = Effects.HASTE; + public static final Effect WHIRLWIND = Effects.HASTE; + public static final Effect PLANAR_BINDING = Effects.HASTE; + public static final Effect SOUL_SNARE = Effects.HASTE; + public static final Effect SOUL_FRAY = Effects.HASTE; + public static final Effect FIRE_FUSE = Effects.HASTE; + public static final Effect CONSTRICT = Effects.HASTE; + public static final Effect PLANT_LEECH = Effects.HASTE; + public static final Effect DEAFNESS = Effects.HASTE; + public static final Effect BOUNCE = Effects.HASTE; + public static final Effect CLING = Effects.HASTE; + public static final Effect SACRIFICIAL_LAMB = Effects.HASTE; + public static final Effect FLIGHT = Effects.HASTE; + public static final Effect GROUNDED = Effects.HASTE; + public static final Effect HEAVY_HEART = Effects.HASTE; + public static final Effect SUSPENDED = Effects.HASTE; + public static final Effect FEATHERED = Effects.HASTE; public static IForgeRegistry BLOOD_ORBS = null; @@ -83,7 +83,7 @@ public class RegistrarBloodMagic { } @SubscribeEvent - public static void registerPotions(RegistryEvent.Register event) { + public static void registerPotions(RegistryEvent.Register event) { event.getRegistry().registerAll( new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 0).setRegistryName("boost"), new PotionBloodMagic("Whirlwind", false, 0xFFFFFF, 0, 0).setRegistryName("whirlwind"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java index 7838a879..62815e21 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -10,11 +10,11 @@ import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import com.google.common.collect.Lists; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.init.Blocks; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; @@ -134,7 +134,7 @@ public class RegistrarBloodMagicBlocks { public static void registerModels(ModelRegistryEvent event) { ModelLoader.setCustomStateMapper(LIFE_ESSENCE, new StateMapperBase() { @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + protected ModelResourceLocation getModelResourceLocation(BlockState state) { return new ModelResourceLocation(state.getBlock().getRegistryName(), "fluid"); } }); diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index 0938c425..c4421b41 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -23,9 +23,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.init.Items; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.item.Items; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; @@ -182,14 +182,14 @@ public class RegistrarBloodMagicItems { new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_tome"), new ItemEnum.Variant<>(ShardType.class, "blood_shard").setRegistryName("blood_shard"), - new ItemLivingArmour(EntityEquipmentSlot.HEAD).setRegistryName("living_armour_helmet"), - new ItemLivingArmour(EntityEquipmentSlot.CHEST).setRegistryName("living_armour_chest"), - new ItemLivingArmour(EntityEquipmentSlot.LEGS).setRegistryName("living_armour_leggings"), - new ItemLivingArmour(EntityEquipmentSlot.FEET).setRegistryName("living_armour_boots"), - new ItemSentientArmour(EntityEquipmentSlot.HEAD).setRegistryName("sentient_armour_helmet"), - new ItemSentientArmour(EntityEquipmentSlot.CHEST).setRegistryName("sentient_armour_chest"), - new ItemSentientArmour(EntityEquipmentSlot.LEGS).setRegistryName("sentient_armour_leggings"), - new ItemSentientArmour(EntityEquipmentSlot.FEET).setRegistryName("sentient_armour_boots"), + new ItemLivingArmour(EquipmentSlotType.HEAD).setRegistryName("living_armour_helmet"), + new ItemLivingArmour(EquipmentSlotType.CHEST).setRegistryName("living_armour_chest"), + new ItemLivingArmour(EquipmentSlotType.LEGS).setRegistryName("living_armour_leggings"), + new ItemLivingArmour(EquipmentSlotType.FEET).setRegistryName("living_armour_boots"), + new ItemSentientArmour(EquipmentSlotType.HEAD).setRegistryName("sentient_armour_helmet"), + new ItemSentientArmour(EquipmentSlotType.CHEST).setRegistryName("sentient_armour_chest"), + new ItemSentientArmour(EquipmentSlotType.LEGS).setRegistryName("sentient_armour_leggings"), + new ItemSentientArmour(EquipmentSlotType.FEET).setRegistryName("sentient_armour_boots"), new ItemAltarMaker().setRegistryName("altar_maker"), new ItemUpgradeTome().setRegistryName("upgrade_tome"), new ItemUpgradeTrainer().setRegistryName("upgrade_trainer"), diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index d967e0b8..1b4cbdd3 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -15,9 +15,9 @@ import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.PluginUtil; import com.google.common.collect.Sets; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.init.PotionTypes; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; +import net.minecraft.potion.Potions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; @@ -114,7 +114,7 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, "dustSaltpeter", "dustSulfur", new ItemStack(Items.COAL, 1, 1)); registrar.addAlchemyTable(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT); - registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER)); + registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.WATER)); registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.FluidType.BASIC.getStack()); registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.FluidType.BASIC.getStack()); @@ -127,7 +127,7 @@ public class RegistrarBloodMagicRecipes { registrar.addAlchemyTable(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); registrar.addAlchemyTable(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); registrar.addAlchemyTable(ItemLivingArmourPointsUpgrade.UpgradeType.DRAFT_ANGELUS.getStack(), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); - registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER), "cropNetherWart", "dustRedstone", "dustGlowstone"); + registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.WATER), "cropNetherWart", "dustRedstone", "dustGlowstone"); registrar.addAlchemyTable(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); registrar.addAlchemyTable(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); diff --git a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index 70338a16..c7de2d48 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.core.data; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.world.storage.WorldSavedData; import java.util.HashMap; @@ -23,7 +23,7 @@ public class BMWorldSavedData extends WorldSavedData { this(ID); } - public SoulNetwork getNetwork(EntityPlayer player) { + public SoulNetwork getNetwork(PlayerEntity player) { return getNetwork(PlayerHelper.getUUIDFromPlayer(player)); } @@ -34,11 +34,11 @@ public class BMWorldSavedData extends WorldSavedData { } @Override - public void readFromNBT(NBTTagCompound tagCompound) { - NBTTagList networkData = tagCompound.getTagList("networkData", 10); + public void readFromNBT(CompoundNBT tagCompound) { + ListNBT networkData = tagCompound.getTagList("networkData", 10); for (int i = 0; i < networkData.tagCount(); i++) { - NBTTagCompound data = networkData.getCompoundTagAt(i); + CompoundNBT data = networkData.getCompoundTagAt(i); SoulNetwork network = SoulNetwork.fromNBT(data); network.setParent(this); soulNetworks.put(network.getPlayerId(), network); @@ -46,8 +46,8 @@ public class BMWorldSavedData extends WorldSavedData { } @Override - public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { - NBTTagList networkData = new NBTTagList(); + public CompoundNBT writeToNBT(CompoundNBT tagCompound) { + ListNBT networkData = new ListNBT(); for (SoulNetwork soulNetwork : soulNetworks.values()) networkData.appendTag(soulNetwork.serializeNBT()); diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index 671f6a1b..4d107cef 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.core.data; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraftforge.common.util.INBTSerializable; import javax.annotation.Nullable; import java.util.UUID; -public class Binding implements INBTSerializable { +public class Binding implements INBTSerializable { private UUID uuid; private String name; @@ -24,15 +24,15 @@ public class Binding implements INBTSerializable { } @Override - public NBTTagCompound serializeNBT() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT serializeNBT() { + CompoundNBT tag = new CompoundNBT(); tag.setTag("id", NBTUtil.createUUIDTag(uuid)); tag.setString("name", name); return tag; } @Override - public void deserializeNBT(NBTTagCompound nbt) { + public void deserializeNBT(CompoundNBT nbt) { this.uuid = NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")); this.name = nbt.getString("name"); } @@ -65,7 +65,7 @@ public class Binding implements INBTSerializable { return null; Binding binding = new Binding(); - binding.deserializeNBT((NBTTagCompound) bindingTag); + binding.deserializeNBT((CompoundNBT) bindingTag); return binding; } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index 4ba15109..e4eacb8f 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -7,10 +7,10 @@ import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.PlayerHelper; import com.google.common.collect.EvictingQueue; import com.google.common.collect.ImmutableList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.INBTSerializable; @@ -19,11 +19,11 @@ import java.util.List; import java.util.Queue; import java.util.UUID; -public class SoulNetwork implements INBTSerializable { +public class SoulNetwork implements INBTSerializable { private final Queue ticketHistory; private BMWorldSavedData parent; - private EntityPlayer cachedPlayer; + private PlayerEntity cachedPlayer; private UUID playerId; private int currentEssence; private int orbTier; @@ -104,7 +104,7 @@ public class SoulNetwork implements INBTSerializable { return syphon(new SoulTicket(amount)); } - public BooleanResult syphonAndDamage(EntityPlayer user, SoulTicket ticket) { + public BooleanResult syphonAndDamage(PlayerEntity user, SoulTicket ticket) { if (user.getEntityWorld().isRemote) return BooleanResult.newResult(false, 0); @@ -127,16 +127,16 @@ public class SoulNetwork implements INBTSerializable { } /** - * @deprecated Use {@link #syphonAndDamage(EntityPlayer, SoulTicket)} instead. + * @deprecated Use {@link #syphonAndDamage(PlayerEntity, SoulTicket)} instead. */ @Deprecated - public boolean syphonAndDamage(EntityPlayer user, int amount) { + public boolean syphonAndDamage(PlayerEntity user, int amount) { return syphonAndDamage(user, new SoulTicket(amount)).isSuccess(); } public void causeNausea() { if (getPlayer() != null) - getPlayer().addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99)); + getPlayer().addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); } /** @@ -147,7 +147,7 @@ public class SoulNetwork implements INBTSerializable { causeNausea(); } - public void hurtPlayer(EntityPlayer user, float syphon) { + public void hurtPlayer(PlayerEntity user, float syphon) { if (user != null) { if (syphon < 100 && syphon > 0) { if (!user.capabilities.isCreativeMode) { @@ -174,7 +174,7 @@ public class SoulNetwork implements INBTSerializable { } @Nullable - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { if (cachedPlayer == null) cachedPlayer = PlayerHelper.getPlayerFromUUID(playerId); @@ -191,7 +191,7 @@ public class SoulNetwork implements INBTSerializable { return this; } - public EntityPlayer getCachedPlayer() { + public PlayerEntity getCachedPlayer() { return cachedPlayer; } @@ -226,8 +226,8 @@ public class SoulNetwork implements INBTSerializable { // INBTSerializable @Override - public NBTTagCompound serializeNBT() { - NBTTagCompound tagCompound = new NBTTagCompound(); + public CompoundNBT serializeNBT() { + CompoundNBT tagCompound = new CompoundNBT(); tagCompound.setString("playerId", getPlayerId().toString()); tagCompound.setInteger("currentEssence", getCurrentEssence()); tagCompound.setInteger("orbTier", getOrbTier()); @@ -235,13 +235,13 @@ public class SoulNetwork implements INBTSerializable { } @Override - public void deserializeNBT(NBTTagCompound nbt) { + public void deserializeNBT(CompoundNBT nbt) { this.playerId = UUID.fromString(nbt.getString("playerId")); this.currentEssence = nbt.getInteger("currentEssence"); this.orbTier = nbt.getInteger("orbTier"); } - public static SoulNetwork fromNBT(NBTTagCompound tagCompound) { + public static SoulNetwork fromNBT(CompoundNBT tagCompound) { SoulNetwork soulNetwork = new SoulNetwork(); soulNetwork.deserializeNBT(tagCompound); return soulNetwork; diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java index 6d209dd5..5c04038b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java @@ -5,12 +5,12 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; public class SoulTicket { - private static final ITextComponent EMPTY = new TextComponentString(""); + private static final ITextComponent EMPTY = new StringTextComponent(""); private final ITextComponent description; private final int amount; @@ -40,32 +40,32 @@ public class SoulTicket { * @return A description in the format block|dimensionID|pos */ public static SoulTicket block(World world, BlockPos pos, int amount) { - return new SoulTicket(new TextComponentString("block|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + return new SoulTicket(new StringTextComponent("block|" + world.provider.getDimension() + "|" + pos.toLong()), amount); } /** * @return A description in the format item|item registry name|dimensionID|entityName|entityPos */ public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) { - return new SoulTicket(new TextComponentString("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + entity.getPersistentID()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + entity.getPersistentID()), amount); } /** * @return A description in the format item|item registry name|dimensionID|pos */ public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) { - return new SoulTicket(new TextComponentString("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + pos.toLong()), amount); } /** * @return A description in the format item|item registry name|dimensionID */ public static SoulTicket item(ItemStack itemStack, int amount) { - return new SoulTicket(new TextComponentString("item|" + itemStack.getItem().getRegistryName()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName()), amount); } public static SoulTicket command(ICommandSender sender, String command, int amount) { - return new SoulTicket(new TextComponentString("command|" + command + "|" + sender.getName()), amount); + return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.getName()), amount); } // TODO maybe make it check the amount?? diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index c61289d9..aab60d48 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.core.registry.OrbRegistry; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; -import net.minecraft.client.util.RecipeItemHelper; +import net.minecraft.item.crafting.RecipeItemHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java index bd7060ee..4c6ab978 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.core.recipe; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import com.google.gson.JsonObject; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.JsonUtils; +import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.crafting.IIngredientFactory; import net.minecraftforge.common.crafting.JsonContext; @@ -15,7 +15,7 @@ public class IngredientBloodOrbFactory implements IIngredientFactory { @Nonnull @Override public Ingredient parse(JsonContext context, JsonObject json) { - ResourceLocation orb = new ResourceLocation(JsonUtils.getString(json, "orb")); + ResourceLocation orb = new ResourceLocation(JSONUtils.getString(json, "orb")); return new IngredientBloodOrb(RegistrarBloodMagic.BLOOD_ORBS.getValue(orb)); } } diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 81267670..497d90fc 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.orb.BloodOrb; import com.google.common.collect.ArrayListMultimap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.common.registry.GameRegistry; import java.util.ArrayList; @@ -50,7 +50,7 @@ public class OrbRegistry { public static ItemStack getOrbStack(BloodOrb orb) { ItemStack ret = new ItemStack(ORB_ITEM); - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); tag.setString("orb", orb.getRegistryName().toString()); ret.setTagCompound(tag); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java index f6eb575c..c776b47a 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.item.ItemBow; -import net.minecraft.util.EnumHand; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.item.BowItem; +import net.minecraft.util.Hand; -public class EntityAIAttackRangedBow extends EntityAIBase { +public class EntityAIAttackRangedBow extends Goal { private final EntityDemonBase entity; private final double moveSpeedAmp; private final float maxAttackDistance; @@ -37,7 +37,7 @@ public class EntityAIAttackRangedBow extends EntityAIBase { } protected boolean isBowInMainhand() { - return this.entity.getHeldItemMainhand().getItem() instanceof ItemBow; + return this.entity.getHeldItemMainhand().getItem() instanceof BowItem; } /** @@ -68,7 +68,7 @@ public class EntityAIAttackRangedBow extends EntityAIBase { * Updates the task */ public void updateTask() { - EntityLivingBase entitylivingbase = this.entity.getAttackTarget(); + LivingEntity entitylivingbase = this.entity.getAttackTarget(); if (entitylivingbase != null) { double d0 = this.entity.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ); @@ -126,12 +126,12 @@ public class EntityAIAttackRangedBow extends EntityAIBase { if (i >= 20) { this.entity.resetActiveHand(); - this.entity.attackEntityWithRangedAttack(entitylivingbase, ItemBow.getArrowVelocity(i)); + this.entity.attackEntityWithRangedAttack(entitylivingbase, BowItem.getArrowVelocity(i)); this.attackTime = this.attackCooldown; } } } else if (--this.attackTime <= 0 && this.seeTime >= -60) { - this.entity.setActiveHand(EnumHand.MAIN_HAND); + this.entity.setActiveHand(Hand.MAIN_HAND); } } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java index 0a2df18c..08ecf2d4 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.pathfinding.Path; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.world.World; -public class EntityAIAttackStealthMelee extends EntityAIBase { +public class EntityAIAttackStealthMelee extends Goal { protected final int attackInterval = 20; protected EntityCorruptedChicken chicken; /** @@ -50,7 +50,7 @@ public class EntityAIAttackStealthMelee extends EntityAIBase { return false; } - EntityLivingBase entitylivingbase = this.chicken.getAttackTarget(); + LivingEntity entitylivingbase = this.chicken.getAttackTarget(); if (entitylivingbase == null) { return false; @@ -85,7 +85,7 @@ public class EntityAIAttackStealthMelee extends EntityAIBase { @Override public void updateTask() { - EntityLivingBase entitylivingbase = this.chicken.getAttackTarget(); + LivingEntity entitylivingbase = this.chicken.getAttackTarget(); this.chicken.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F); double d0 = this.chicken.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ); --this.delayCounter; @@ -124,19 +124,19 @@ public class EntityAIAttackStealthMelee extends EntityAIBase { this.attackEntity(entitylivingbase, d0); } - protected void attackEntity(EntityLivingBase attacked, double distance) { + protected void attackEntity(LivingEntity attacked, double distance) { double d0 = this.getAttackReachSqr(attacked); if (distance <= d0 && this.attackTick <= 0) { this.attackTick = 20; - this.chicken.swingArm(EnumHand.MAIN_HAND); + this.chicken.swingArm(Hand.MAIN_HAND); this.chicken.attackEntityAsMob(attacked); chicken.attackStateMachine = 2; } } - protected double getAttackReachSqr(EntityLivingBase attackTarget) { + protected double getAttackReachSqr(LivingEntity attackTarget) { return (double) (this.chicken.width * 2.0F * this.chicken.width * 2.0F + attackTarget.width); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java index a7718a6b..0f6d167a 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java @@ -3,12 +3,12 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; import WayofTime.bloodmagic.inversion.CorruptionHandler; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.block.BlockState; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class EntityAIEatAndCorruptBlock extends EntityAIBase { +public class EntityAIEatAndCorruptBlock extends Goal { /** * The entity owner of this AITask */ @@ -36,7 +36,7 @@ public class EntityAIEatAndCorruptBlock extends EntityAIBase { return false; } else { BlockPos pos = new BlockPos(this.grassEaterEntity.posX, this.grassEaterEntity.posY, this.grassEaterEntity.posZ).down(); - IBlockState offsetState = world.getBlockState(pos); + BlockState offsetState = world.getBlockState(pos); Block offsetBlock = offsetState.getBlock(); return CorruptionHandler.isBlockCorruptible(world, grassEaterEntity.getType(), pos, offsetState, offsetBlock); } @@ -82,7 +82,7 @@ public class EntityAIEatAndCorruptBlock extends EntityAIBase { BlockPos blockpos = new BlockPos(this.grassEaterEntity.posX, this.grassEaterEntity.posY, this.grassEaterEntity.posZ); BlockPos offsetPos = blockpos.down(); - IBlockState offsetState = world.getBlockState(offsetPos); + BlockState offsetState = world.getBlockState(offsetPos); Block offsetBlock = offsetState.getBlock(); if (CorruptionHandler.isBlockCorruptible(world, grassEaterEntity.getType(), offsetPos, offsetState, offsetBlock)) { diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java index cd82198d..6fe42c3b 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java @@ -2,26 +2,26 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityDemonBase; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.pathfinding.GroundPathNavigator; +import net.minecraft.pathfinding.PathNavigator; import net.minecraft.pathfinding.PathNodeType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -public class EntityAIFollowOwner extends EntityAIBase { +public class EntityAIFollowOwner extends Goal { World theWorld; float maxDist; float minDist; private EntityDemonBase thePet; - private EntityLivingBase theOwner; + private LivingEntity theOwner; private double followSpeed; - private PathNavigate petPathfinder; + private PathNavigator petPathfinder; private int timeToRecalcPath; private float oldWaterCost; @@ -34,7 +34,7 @@ public class EntityAIFollowOwner extends EntityAIBase { this.maxDist = maxDistIn; this.setMutexBits(3); - if (!(thePetIn.getNavigator() instanceof PathNavigateGround)) { + if (!(thePetIn.getNavigator() instanceof GroundPathNavigator)) { throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal"); } } @@ -43,11 +43,11 @@ public class EntityAIFollowOwner extends EntityAIBase { * Returns whether the EntityAIBase should begin execution. */ public boolean shouldExecute() { - EntityLivingBase entitylivingbase = this.thePet.getOwner(); + LivingEntity entitylivingbase = this.thePet.getOwner(); if (entitylivingbase == null) { return false; - } else if (entitylivingbase instanceof EntityPlayer && ((EntityPlayer) entitylivingbase).isSpectator()) { + } else if (entitylivingbase instanceof PlayerEntity && ((PlayerEntity) entitylivingbase).isSpectator()) { return false; } else if (this.thePet.isStationary()) { return false; @@ -85,7 +85,7 @@ public class EntityAIFollowOwner extends EntityAIBase { } private boolean isEmptyBlock(BlockPos pos) { - IBlockState iblockstate = this.theWorld.getBlockState(pos); + BlockState iblockstate = this.theWorld.getBlockState(pos); Block block = iblockstate.getBlock(); return block == Blocks.AIR || !iblockstate.isFullCube(); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java index 3b42eec1..83092001 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java @@ -2,25 +2,25 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.pathfinding.PathNavigator; +import net.minecraft.pathfinding.GroundPathNavigator; import net.minecraft.pathfinding.PathNodeType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -public class EntityAIGrabEffectsFromOwner extends EntityAIBase { +public class EntityAIGrabEffectsFromOwner extends Goal { World theWorld; float minDist; private EntitySentientSpecter thePet; - private EntityLivingBase theOwner; + private LivingEntity theOwner; private double followSpeed; - private PathNavigate petPathfinder; + private PathNavigator petPathfinder; private int timeToRecalcPath; private float oldWaterCost; @@ -36,7 +36,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { this.minDist = minDistIn; this.setMutexBits(3); - if (!(thePetIn.getNavigator() instanceof PathNavigateGround)) { + if (!(thePetIn.getNavigator() instanceof GroundPathNavigator)) { throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal"); } } @@ -45,11 +45,11 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { * Returns whether the EntityAIBase should begin execution. */ public boolean shouldExecute() { - EntityLivingBase entitylivingbase = this.thePet.getOwner(); + LivingEntity entitylivingbase = this.thePet.getOwner(); if (entitylivingbase == null) { return false; - } else if (entitylivingbase instanceof EntityPlayer && ((EntityPlayer) entitylivingbase).isSpectator()) { + } else if (entitylivingbase instanceof PlayerEntity && ((PlayerEntity) entitylivingbase).isSpectator()) { return false; } else if (this.thePet.isStationary()) { return false; @@ -90,7 +90,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase { } private boolean isEmptyBlock(BlockPos pos) { - IBlockState iblockstate = this.theWorld.getBlockState(pos); + BlockState iblockstate = this.theWorld.getBlockState(pos); Block block = iblockstate.getBlock(); return block == Blocks.AIR || !iblockstate.isFullCube(); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java index 371ed1be..44690ec5 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.entity.ai; -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.CreatureEntity; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.IEntityOwnable; -import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.goal.HurtByTargetGoal; import java.util.UUID; -public class EntityAIHurtByTargetIgnoreTamed extends EntityAIHurtByTarget { - public EntityAIHurtByTargetIgnoreTamed(EntityCreature creatureIn, boolean entityCallsForHelpIn, Class... targetClassesIn) { +public class EntityAIHurtByTargetIgnoreTamed extends HurtByTargetGoal { + public EntityAIHurtByTargetIgnoreTamed(CreatureEntity creatureIn, boolean entityCallsForHelpIn, Class... targetClassesIn) { super(creatureIn, true, targetClassesIn); } @Override - public boolean isSuitableTarget(EntityLivingBase target, boolean includeInvincibles) { + public boolean isSuitableTarget(LivingEntity target, boolean includeInvincibles) { if (this.taskOwner instanceof IEntityOwnable && target instanceof IEntityOwnable) { UUID thisId = ((IEntityOwnable) this.taskOwner).getOwnerId(); UUID targetId = ((IEntityOwnable) target).getOwnerId(); diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java index cf35ee3b..787dcaec 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityMimic; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.util.math.BlockPos; -public class EntityAIMimicReform extends EntityAIBase { +public class EntityAIMimicReform extends Goal { private final EntityMimic theEntity; public EntityAIMimicReform(EntityMimic creatureIn) { diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java index 42bfb5fa..371c3b4c 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAITarget; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.TargetGoal; -public class EntityAIOwnerHurtByTarget extends EntityAITarget { +public class EntityAIOwnerHurtByTarget extends TargetGoal { EntityDemonBase theDefendingTameable; - EntityLivingBase theOwnerAttacker; + LivingEntity theOwnerAttacker; private int timestamp; public EntityAIOwnerHurtByTarget(EntityDemonBase theDefendingTameableIn) { @@ -22,7 +22,7 @@ public class EntityAIOwnerHurtByTarget extends EntityAITarget { if (!this.theDefendingTameable.isTamed()) { return false; } else { - EntityLivingBase owner = this.theDefendingTameable.getOwner(); + LivingEntity owner = this.theDefendingTameable.getOwner(); if (owner == null) { return false; @@ -39,7 +39,7 @@ public class EntityAIOwnerHurtByTarget extends EntityAITarget { */ public void startExecuting() { this.taskOwner.setAttackTarget(this.theOwnerAttacker); - EntityLivingBase owner = this.theDefendingTameable.getOwner(); + LivingEntity owner = this.theDefendingTameable.getOwner(); if (owner != null) { this.timestamp = owner.getRevengeTimer(); diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java index 20ee7204..61433ccd 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAITarget; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.TargetGoal; -public class EntityAIOwnerHurtTarget extends EntityAITarget { +public class EntityAIOwnerHurtTarget extends TargetGoal { EntityDemonBase theEntityDemonBase; - EntityLivingBase theTarget; + LivingEntity theTarget; private int timestamp; public EntityAIOwnerHurtTarget(EntityDemonBase theEntityDemonBaseIn) { @@ -22,7 +22,7 @@ public class EntityAIOwnerHurtTarget extends EntityAITarget { if (!this.theEntityDemonBase.isTamed()) { return false; } else { - EntityLivingBase entitylivingbase = this.theEntityDemonBase.getOwner(); + LivingEntity entitylivingbase = this.theEntityDemonBase.getOwner(); if (entitylivingbase == null) { return false; @@ -39,7 +39,7 @@ public class EntityAIOwnerHurtTarget extends EntityAITarget { */ public void startExecuting() { this.taskOwner.setAttackTarget(this.theTarget); - EntityLivingBase entitylivingbase = this.theEntityDemonBase.getOwner(); + LivingEntity entitylivingbase = this.theEntityDemonBase.getOwner(); if (entitylivingbase != null) { this.timestamp = entitylivingbase.getLastAttackedEntityTime(); diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java index eb69d601..77e9f9d9 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java @@ -2,15 +2,15 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.pathfinding.Path; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import java.util.List; -public class EntityAIPickUpAlly extends EntityAIBase { +public class EntityAIPickUpAlly extends Goal { protected final int attackInterval = 20; protected EntityAspectedDemonBase entity; /** @@ -39,7 +39,7 @@ public class EntityAIPickUpAlly extends EntityAIBase { private int failedPathFindingPenalty = 0; private boolean canPenalize = false; - private EntityLivingBase pickupTarget = null; + private LivingEntity pickupTarget = null; public EntityAIPickUpAlly(EntityAspectedDemonBase creature, double speedIn, boolean useLongMemory) { this.entity = creature; @@ -58,8 +58,8 @@ public class EntityAIPickUpAlly extends EntityAIBase { } AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5); - List list = this.entity.getEntityWorld().getEntitiesWithinAABB(EntityLivingBase.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); - for (EntityLivingBase testEntity : list) { + List list = this.entity.getEntityWorld().getEntitiesWithinAABB(LivingEntity.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); + for (LivingEntity testEntity : list) { if (testEntity != this.entity) { Path path = this.entity.getNavigator().getPathToEntityLiving(testEntity); if (path != null) { @@ -100,7 +100,7 @@ public class EntityAIPickUpAlly extends EntityAIBase { * Updates the task */ public void updateTask() { - EntityLivingBase entitylivingbase = this.pickupTarget; + LivingEntity entitylivingbase = this.pickupTarget; this.entity.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F); double d0 = this.entity.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ); --this.delayCounter; @@ -139,7 +139,7 @@ public class EntityAIPickUpAlly extends EntityAIBase { this.pickUpEntity(entitylivingbase, d0); } - protected void pickUpEntity(EntityLivingBase potentialPickup, double distance) { + protected void pickUpEntity(LivingEntity potentialPickup, double distance) { double d0 = this.getAttackReachSqr(potentialPickup); if (distance <= d0 && this.attackTick <= 0 && !potentialPickup.isRiding()) { @@ -148,7 +148,7 @@ public class EntityAIPickUpAlly extends EntityAIBase { } } - protected double getAttackReachSqr(EntityLivingBase attackTarget) { + protected double getAttackReachSqr(LivingEntity attackTarget) { return (double) (this.entity.width * 2.0F * this.entity.width * 2.0F + attackTarget.width); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java index d831c487..5f7b7981 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java @@ -2,14 +2,14 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import java.util.List; -public class EntityAIProtectAlly extends EntityAIBase { +public class EntityAIProtectAlly extends Goal { /** * The entity owner of this AITask */ @@ -39,8 +39,8 @@ public class EntityAIProtectAlly extends EntityAIBase { @Override public boolean shouldExecute() { AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5); - List list = world.getEntitiesWithinAABB(EntityLivingBase.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); - for (EntityLivingBase testEntity : list) { + List list = world.getEntitiesWithinAABB(LivingEntity.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); + for (LivingEntity testEntity : list) { if (testEntity != this.entity) { if (this.entity.canProtectAlly(testEntity)) { return true; @@ -85,8 +85,8 @@ public class EntityAIProtectAlly extends EntityAIBase { this.castTimer = Math.max(0, this.castTimer - 1); if (castTimer == 0) { AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5); - List list = world.getEntitiesWithinAABB(EntityLivingBase.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); - for (EntityLivingBase testEntity : list) { + List list = world.getEntitiesWithinAABB(LivingEntity.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); + for (LivingEntity testEntity : list) { if (testEntity != this.entity) { if (this.entity.applyProtectionToAlly(testEntity)) { return; diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java index a2468fbe..76d47389 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java @@ -4,16 +4,16 @@ import WayofTime.bloodmagic.entity.mob.EntityDemonBase; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.pathfinding.Path; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.util.EntitySelectors; +import net.minecraft.pathfinding.PathNavigator; +import net.minecraft.util.EntityPredicates; import net.minecraft.util.math.Vec3d; import java.util.List; -public class EntityAIRetreatToHeal extends EntityAIBase { +public class EntityAIRetreatToHeal extends Goal { private final Predicate canBeSeenSelector; /** * The entity we are attached to @@ -31,7 +31,7 @@ public class EntityAIRetreatToHeal extends EntityAIBase { /** * The PathNavigate of our entity */ - private PathNavigate entityPathNavigate; + private PathNavigator entityPathNavigate; private Class classToAvoid; private Predicate avoidTargetSelector; @@ -61,7 +61,7 @@ public class EntityAIRetreatToHeal extends EntityAIBase { } //This part almost doesn't matter - List list = this.theEntity.getEntityWorld().getEntitiesWithinAABB(this.classToAvoid, this.theEntity.getEntityBoundingBox().expand((double) this.avoidDistance, 3.0D, (double) this.avoidDistance), Predicates.and(EntitySelectors.CAN_AI_TARGET, this.canBeSeenSelector, this.avoidTargetSelector)); + List list = this.theEntity.getEntityWorld().getEntitiesWithinAABB(this.classToAvoid, this.theEntity.getEntityBoundingBox().expand((double) this.avoidDistance, 3.0D, (double) this.avoidDistance), Predicates.and(EntityPredicates.CAN_AI_TARGET, this.canBeSeenSelector, this.avoidTargetSelector)); if (list.isEmpty()) { return true; //No entities nearby, so I can freely heal diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java index 51600496..43d4e275 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java @@ -1,21 +1,21 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.pathfinding.Path; -import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.pathfinding.PathNavigator; import net.minecraft.util.math.Vec3d; -public class EntityAIStealthRetreat extends EntityAIBase { +public class EntityAIStealthRetreat extends Goal { private final double farSpeed; private final double nearSpeed; private final float avoidDistance; /** * The PathNavigate of our entity */ - private final PathNavigate entityPathNavigate; + private final PathNavigator entityPathNavigate; /** * The entity we are attached to */ @@ -38,7 +38,7 @@ public class EntityAIStealthRetreat extends EntityAIBase { @Override public boolean shouldExecute() { if (this.entity.attackStateMachine == 2) { - EntityLivingBase attacked = this.entity.getAttackTarget(); + LivingEntity attacked = this.entity.getAttackTarget(); if (attacked == null) { return false; } diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java index 74dd9ba6..7e25dd39 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.entity.ai; import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.CreatureEntity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.util.math.Vec3d; -public class EntityAIStealthTowardsTarget extends EntityAIBase { +public class EntityAIStealthTowardsTarget extends Goal { private final EntityCorruptedChicken entity; private final double speed; private double xPosition; @@ -27,10 +27,10 @@ public class EntityAIStealthTowardsTarget extends EntityAIBase { return false; } - EntityLivingBase target = this.entity.getAttackTarget(); + LivingEntity target = this.entity.getAttackTarget(); Vec3d vec3d = null; - if (target instanceof EntityCreature) { - vec3d = RandomPositionGenerator.findRandomTarget((EntityCreature) target, 10, 7); + if (target instanceof CreatureEntity) { + vec3d = RandomPositionGenerator.findRandomTarget((CreatureEntity) target, 10, 7); } else { vec3d = RandomPositionGenerator.findRandomTarget(this.entity, 10, 7); } @@ -61,10 +61,10 @@ public class EntityAIStealthTowardsTarget extends EntityAIBase { this.entity.cloak(); if (this.entity.getNavigator().noPath()) { - EntityLivingBase target = this.entity.getAttackTarget(); + LivingEntity target = this.entity.getAttackTarget(); Vec3d vec3d; - if (target instanceof EntityCreature) { - vec3d = RandomPositionGenerator.findRandomTarget((EntityCreature) target, 10, 7); + if (target instanceof CreatureEntity) { + vec3d = RandomPositionGenerator.findRandomTarget((CreatureEntity) target, 10, 7); } else { vec3d = RandomPositionGenerator.findRandomTarget(this.entity, 10, 7); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index 47f9cf1d..d47c1e68 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -4,9 +4,9 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.gson.Serializers; import com.google.common.base.Predicate; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.DamageSource; @@ -182,14 +182,14 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); tag.setString(Constants.NBT.WILL_TYPE, this.getType().toString()); } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(CompoundNBT tag) { super.readEntityFromNBT(tag); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { @@ -200,7 +200,7 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { } //Returns true if the inputted mob is on the same team. - public static class WillTypePredicate implements Predicate { + public static class WillTypePredicate implements Predicate { private final EnumDemonWillType type; public WillTypePredicate(EnumDemonWillType type) { @@ -209,7 +209,7 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { //Returns true if this mob is the same type. @Override - public boolean apply(EntityLivingBase input) { + public boolean apply(LivingEntity input) { if (input instanceof EntityAspectedDemonBase) { if (((EntityAspectedDemonBase) input).getType() == type) { return true; @@ -220,7 +220,7 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { } } - public class TeamAttackPredicate implements Predicate { + public class TeamAttackPredicate implements Predicate { private final EntityAspectedDemonBase demon; public TeamAttackPredicate(EntityAspectedDemonBase demon) { @@ -229,7 +229,7 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { //Returns true if this mob can attack the inputted mob. @Override - public boolean apply(EntityLivingBase input) { + public boolean apply(LivingEntity input) { if (input instanceof EntityAspectedDemonBase) { if (((EntityAspectedDemonBase) input).getType() == demon.getType()) { return false; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index 450bb4f9..1ea7e265 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -6,15 +6,15 @@ import WayofTime.bloodmagic.entity.ai.EntityAIStealthRetreat; import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.*; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Items; +import net.minecraft.potion.Effects; +import net.minecraft.util.SoundEvents; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.pathfinding.PathNodeType; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -55,16 +55,16 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { } protected void initEntityAI() { - this.tasks.addTask(0, new EntityAISwimming(this)); + this.tasks.addTask(0, new SwimGoal(this)); // this.tasks.addTask(1, new EntityAIPanic(this, 1.4D)); this.tasks.addTask(attackPriority, new EntityAIStealthTowardsTarget(this, 1)); this.tasks.addTask(attackPriority, new EntityAIStealthRetreat(this, 6.0F, 1.4D, 1.4D)); - this.tasks.addTask(5, new EntityAIWander(this, 1.0D)); - this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); - this.tasks.addTask(7, new EntityAILookIdle(this)); + this.tasks.addTask(5, new RandomWalkingGoal(this, 1.0D)); + this.tasks.addTask(6, new LookAtGoal(this, PlayerEntity.class, 6.0F)); + this.tasks.addTask(7, new LookRandomlyGoal(this)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); + this.targetTasks.addTask(1, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); + this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); } @Override @@ -78,7 +78,7 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { } public void cloak() { - this.addPotionEffect(new PotionEffect(MobEffects.INVISIBILITY, 50, 0, false, false)); + this.addPotionEffect(new EffectInstance(Effects.INVISIBILITY, 50, 0, false, false)); } @Override @@ -172,7 +172,7 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { } @Override - public void readEntityFromNBT(NBTTagCompound compound) { + public void readEntityFromNBT(CompoundNBT compound) { super.readEntityFromNBT(compound); if (compound.hasKey("EggLayTime")) { @@ -181,7 +181,7 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { } @Override - public void writeEntityToNBT(NBTTagCompound compound) { + public void writeEntityToNBT(CompoundNBT compound) { super.writeEntityToNBT(compound); compound.setInteger("EggLayTime", this.timeUntilNextEgg); } @@ -195,8 +195,8 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { float f3 = 0.0F; passenger.setPosition(this.posX + (double) (0.1F * f), this.posY + (double) (this.height * 0.5F) + passenger.getYOffset() + 0.0D, this.posZ - (double) (0.1F * f1)); - if (passenger instanceof EntityLivingBase) { - ((EntityLivingBase) passenger).renderYawOffset = this.renderYawOffset; + if (passenger instanceof LivingEntity) { + ((LivingEntity) passenger).renderYawOffset = this.renderYawOffset; } } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index bd12e3e9..621b1a63 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -5,21 +5,21 @@ import WayofTime.bloodmagic.entity.ai.EntityAIEatAndCorruptBlock; import WayofTime.bloodmagic.entity.ai.EntityAIProtectAlly; import com.google.common.collect.Maps; import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IEntityLivingData; -import net.minecraft.entity.ai.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.entity.ILivingEntityData; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.*; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.item.DyeColor; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -38,26 +38,26 @@ import java.util.Random; public class EntityCorruptedSheep extends EntityAspectedDemonBase implements IShearable { private static final DataParameter DYE_COLOR = EntityDataManager.createKey(EntityCorruptedSheep.class, DataSerializers.BYTE); - private static final Map DYE_TO_RGB = Maps.newEnumMap(EnumDyeColor.class); + private static final Map DYE_TO_RGB = Maps.newEnumMap(DyeColor.class); public static int maxProtectionCooldown = 90 * 20; //90 second cooldown static { - DYE_TO_RGB.put(EnumDyeColor.WHITE, new float[]{1.0F, 1.0F, 1.0F}); - DYE_TO_RGB.put(EnumDyeColor.ORANGE, new float[]{0.85F, 0.5F, 0.2F}); - DYE_TO_RGB.put(EnumDyeColor.MAGENTA, new float[]{0.7F, 0.3F, 0.85F}); - DYE_TO_RGB.put(EnumDyeColor.LIGHT_BLUE, new float[]{0.4F, 0.6F, 0.85F}); - DYE_TO_RGB.put(EnumDyeColor.YELLOW, new float[]{0.9F, 0.9F, 0.2F}); - DYE_TO_RGB.put(EnumDyeColor.LIME, new float[]{0.5F, 0.8F, 0.1F}); - DYE_TO_RGB.put(EnumDyeColor.PINK, new float[]{0.95F, 0.5F, 0.65F}); - DYE_TO_RGB.put(EnumDyeColor.GRAY, new float[]{0.3F, 0.3F, 0.3F}); - DYE_TO_RGB.put(EnumDyeColor.SILVER, new float[]{0.6F, 0.6F, 0.6F}); - DYE_TO_RGB.put(EnumDyeColor.CYAN, new float[]{0.3F, 0.5F, 0.6F}); - DYE_TO_RGB.put(EnumDyeColor.PURPLE, new float[]{0.5F, 0.25F, 0.7F}); - DYE_TO_RGB.put(EnumDyeColor.BLUE, new float[]{0.2F, 0.3F, 0.7F}); - DYE_TO_RGB.put(EnumDyeColor.BROWN, new float[]{0.4F, 0.3F, 0.2F}); - DYE_TO_RGB.put(EnumDyeColor.GREEN, new float[]{0.4F, 0.5F, 0.2F}); - DYE_TO_RGB.put(EnumDyeColor.RED, new float[]{0.6F, 0.2F, 0.2F}); - DYE_TO_RGB.put(EnumDyeColor.BLACK, new float[]{0.1F, 0.1F, 0.1F}); + DYE_TO_RGB.put(DyeColor.WHITE, new float[]{1.0F, 1.0F, 1.0F}); + DYE_TO_RGB.put(DyeColor.ORANGE, new float[]{0.85F, 0.5F, 0.2F}); + DYE_TO_RGB.put(DyeColor.MAGENTA, new float[]{0.7F, 0.3F, 0.85F}); + DYE_TO_RGB.put(DyeColor.LIGHT_BLUE, new float[]{0.4F, 0.6F, 0.85F}); + DYE_TO_RGB.put(DyeColor.YELLOW, new float[]{0.9F, 0.9F, 0.2F}); + DYE_TO_RGB.put(DyeColor.LIME, new float[]{0.5F, 0.8F, 0.1F}); + DYE_TO_RGB.put(DyeColor.PINK, new float[]{0.95F, 0.5F, 0.65F}); + DYE_TO_RGB.put(DyeColor.GRAY, new float[]{0.3F, 0.3F, 0.3F}); + DYE_TO_RGB.put(DyeColor.SILVER, new float[]{0.6F, 0.6F, 0.6F}); + DYE_TO_RGB.put(DyeColor.CYAN, new float[]{0.3F, 0.5F, 0.6F}); + DYE_TO_RGB.put(DyeColor.PURPLE, new float[]{0.5F, 0.25F, 0.7F}); + DYE_TO_RGB.put(DyeColor.BLUE, new float[]{0.2F, 0.3F, 0.7F}); + DYE_TO_RGB.put(DyeColor.BROWN, new float[]{0.4F, 0.3F, 0.2F}); + DYE_TO_RGB.put(DyeColor.GREEN, new float[]{0.4F, 0.5F, 0.2F}); + DYE_TO_RGB.put(DyeColor.RED, new float[]{0.6F, 0.2F, 0.2F}); + DYE_TO_RGB.put(DyeColor.BLACK, new float[]{0.1F, 0.1F, 0.1F}); } private final int attackPriority = 3; @@ -70,7 +70,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh private int castTimer = 0; private EntityAIEatAndCorruptBlock entityAIEatGrass; private EntityAIProtectAlly entityAIProtectAlly; - private EntityAIAttackMelee aiAttackOnCollide; + private MeleeAttackGoal aiAttackOnCollide; public EntityCorruptedSheep(World world) { this(world, EnumDemonWillType.DEFAULT); @@ -87,15 +87,15 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh this.entityAIEatGrass = new EntityAIEatAndCorruptBlock(this); this.entityAIProtectAlly = new EntityAIProtectAlly(this); - this.tasks.addTask(0, new EntityAISwimming(this)); + this.tasks.addTask(0, new SwimGoal(this)); this.tasks.addTask(2, entityAIProtectAlly); this.tasks.addTask(5, this.entityAIEatGrass); - this.tasks.addTask(6, new EntityAIWander(this, 1.0D)); - this.tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); - this.tasks.addTask(8, new EntityAILookIdle(this)); + this.tasks.addTask(6, new RandomWalkingGoal(this, 1.0D)); + this.tasks.addTask(7, new LookAtGoal(this, PlayerEntity.class, 6.0F)); + this.tasks.addTask(8, new LookRandomlyGoal(this)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); + this.targetTasks.addTask(1, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); + this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); } @Override @@ -104,7 +104,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh this.tasks.removeTask(aiAttackOnCollide); } - aiAttackOnCollide = new EntityAIAttackMelee(this, this.getBaseSprintModifier(getType()), false); + aiAttackOnCollide = new MeleeAttackGoal(this, this.getBaseSprintModifier(getType()), false); this.tasks.addTask(attackPriority, aiAttackOnCollide); } @@ -130,13 +130,13 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh super.onLivingUpdate(); } - public boolean canProtectAlly(EntityLivingBase entity) { - return this.protectionCooldown <= 0 && entity.getHealth() < entity.getMaxHealth() && !entity.isPotionActive(MobEffects.RESISTANCE); + public boolean canProtectAlly(LivingEntity entity) { + return this.protectionCooldown <= 0 && entity.getHealth() < entity.getMaxHealth() && !entity.isPotionActive(Effects.RESISTANCE); } - public boolean applyProtectionToAlly(EntityLivingBase entity) { + public boolean applyProtectionToAlly(LivingEntity entity) { if (canProtectAlly(entity)) { - entity.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 20 * 20, 3)); + entity.addPotionEffect(new EffectInstance(Effects.RESISTANCE, 20 * 20, 3)); this.protectionCooldown = maxProtectionCooldown; } @@ -212,7 +212,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); tag.setBoolean("Sheared", this.getSheared()); tag.setByte("Color", (byte) this.getFleeceColor().getMetadata()); @@ -220,10 +220,10 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(CompoundNBT tag) { super.readEntityFromNBT(tag); this.setSheared(tag.getBoolean("Sheared")); - this.setFleeceColor(EnumDyeColor.byMetadata(tag.getByte("Color"))); + this.setFleeceColor(DyeColor.byMetadata(tag.getByte("Color"))); this.protectionCooldown = tag.getInteger("protection"); } @@ -255,14 +255,14 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh /** * Gets the wool color of this sheep. */ - public EnumDyeColor getFleeceColor() { - return EnumDyeColor.byMetadata(this.dataManager.get(DYE_COLOR) & 15); + public DyeColor getFleeceColor() { + return DyeColor.byMetadata(this.dataManager.get(DYE_COLOR) & 15); } /** * Sets the wool color of this sheep */ - public void setFleeceColor(EnumDyeColor color) { + public void setFleeceColor(DyeColor color) { byte b0 = this.dataManager.get(DYE_COLOR); this.dataManager.set(DYE_COLOR, (byte) (b0 & 240 | color.getMetadata() & 15)); } @@ -307,7 +307,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh * from nbt. Mainly used for initializing attributes and inventory */ @Override - public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, @Nullable IEntityLivingData livingdata) { + public ILivingEntityData onInitialSpawn(DifficultyInstance difficulty, @Nullable ILivingEntityData livingdata) { livingdata = super.onInitialSpawn(difficulty, livingdata); this.setFleeceColor(getRandomSheepColor(this.getEntityWorld().rand)); return livingdata; @@ -340,15 +340,15 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh return castTimer; } - public static float[] getDyeRgb(EnumDyeColor dyeColor) { + public static float[] getDyeRgb(DyeColor dyeColor) { return DYE_TO_RGB.get(dyeColor); } /** * Chooses a "vanilla" sheep color based on the provided random. */ - public static EnumDyeColor getRandomSheepColor(Random random) { + public static DyeColor getRandomSheepColor(Random random) { int i = random.nextInt(100); - return i < 5 ? EnumDyeColor.BLACK : (i < 10 ? EnumDyeColor.GRAY : (i < 15 ? EnumDyeColor.SILVER : (i < 18 ? EnumDyeColor.BROWN : (random.nextInt(500) == 0 ? EnumDyeColor.PINK : EnumDyeColor.WHITE)))); + return i < 5 ? DyeColor.BLACK : (i < 10 ? DyeColor.GRAY : (i < 15 ? DyeColor.SILVER : (i < 18 ? DyeColor.BROWN : (random.nextInt(500) == 0 ? DyeColor.PINK : DyeColor.WHITE)))); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index 589f6e72..1a35bddd 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -3,18 +3,18 @@ package WayofTime.bloodmagic.entity.mob; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIPickUpAlly; import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.EnumCreatureAttribute; -import net.minecraft.entity.ai.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.ai.goal.*; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.pathfinding.ClimberPathNavigator; +import net.minecraft.pathfinding.PathNavigator; +import net.minecraft.potion.Effects; +import net.minecraft.util.SoundEvents; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathNavigateClimber; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -34,17 +34,17 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { } protected void initEntityAI() { - this.tasks.addTask(1, new EntityAISwimming(this)); - this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F)); + this.tasks.addTask(1, new SwimGoal(this)); + this.tasks.addTask(3, new LeapAtTargetGoal(this, 0.4F)); this.tasks.addTask(3, new EntityAIPickUpAlly(this, 1, true)); this.tasks.addTask(4, new EntityCorruptedSpider.AISpiderAttack(this)); - this.tasks.addTask(5, new EntityAIWander(this, 0.8D)); - this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); - this.tasks.addTask(6, new EntityAILookIdle(this)); - this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false)); + this.tasks.addTask(5, new RandomWalkingGoal(this, 0.8D)); + this.tasks.addTask(6, new LookAtGoal(this, PlayerEntity.class, 8.0F)); + this.tasks.addTask(6, new LookRandomlyGoal(this)); + this.targetTasks.addTask(1, new HurtByTargetGoal(this, false)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); + this.targetTasks.addTask(1, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); + this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); } @Override @@ -78,8 +78,8 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { } @Override - protected PathNavigate createNavigator(World worldIn) { - return new PathNavigateClimber(this, worldIn); + protected PathNavigator createNavigator(World worldIn) { + return new ClimberPathNavigator(this, worldIn); } @Override @@ -137,8 +137,8 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { } @Override - public boolean isPotionApplicable(PotionEffect potioneffectIn) { - return potioneffectIn.getPotion() != MobEffects.POISON && super.isPotionApplicable(potioneffectIn); + public boolean isPotionApplicable(EffectInstance potioneffectIn) { + return potioneffectIn.getPotion() != Effects.POISON && super.isPotionApplicable(potioneffectIn); } public boolean isBesideClimbableBlock() { @@ -162,7 +162,7 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { return 0.65F; } - static class AISpiderAttack extends EntityAIAttackMelee { + static class AISpiderAttack extends MeleeAttackGoal { public AISpiderAttack(EntityCorruptedSpider spider) { super(spider, 1.0D, true); } @@ -181,12 +181,12 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase { } } - protected double getAttackReachSqr(EntityLivingBase attackTarget) { + protected double getAttackReachSqr(LivingEntity attackTarget) { return (double) (4.0F + attackTarget.width); } } - static class AISpiderTarget extends EntityAINearestAttackableTarget { + static class AISpiderTarget extends NearestAttackableTargetGoal { public AISpiderTarget(EntityCorruptedSpider spider, Class classTarget) { super(spider, classTarget, true); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java index f9927f48..cae520a3 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java @@ -4,27 +4,27 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.*; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.ItemBow; +import net.minecraft.entity.ai.goal.*; +import net.minecraft.entity.monster.CreeperEntity; +import net.minecraft.entity.monster.GhastEntity; +import net.minecraft.entity.monster.ZombiePigmanEntity; +import net.minecraft.entity.passive.IronGolemEntity; +import net.minecraft.entity.merchant.villager.VillagerEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BowItem; +import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; public class EntityCorruptedZombie extends EntityAspectedDemonBase { private final EntityAIAttackRangedBow aiArrowAttack = new EntityAIAttackRangedBow(this, 1.0D, 20, 15.0F); - private final EntityAIAttackMelee aiAttackOnCollide = new EntityAIAttackMelee(this, 1.0D, false); + private final MeleeAttackGoal aiAttackOnCollide = new MeleeAttackGoal(this, 1.0D, false); private final int attackPriority = 3; @@ -32,18 +32,18 @@ public class EntityCorruptedZombie extends EntityAspectedDemonBase { super(worldIn); this.setSize(0.6F, 1.95F); // ((PathNavigateGround) getNavigator()).setCanSwim(false); - this.tasks.addTask(0, new EntityAISwimming(this)); + this.tasks.addTask(0, new SwimGoal(this)); this.tasks.addTask(attackPriority, aiAttackOnCollide); - this.tasks.addTask(5, new EntityAIMoveTowardsRestriction(this, 1.0D)); - this.tasks.addTask(7, new EntityAIWander(this, 1.0D)); - this.tasks.addTask(8, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); - this.tasks.addTask(8, new EntityAILookIdle(this)); + this.tasks.addTask(5, new MoveTowardsRestrictionGoal(this, 1.0D)); + this.tasks.addTask(7, new RandomWalkingGoal(this, 1.0D)); + this.tasks.addTask(8, new LookAtGoal(this, PlayerEntity.class, 8.0F)); + this.tasks.addTask(8, new LookRandomlyGoal(this)); - this.tasks.addTask(6, new EntityAIMoveThroughVillage(this, 1.0D, false)); - this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, true, EntityPigZombie.class)); - this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true)); - this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityVillager.class, false)); - this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityIronGolem.class, true)); + this.tasks.addTask(6, new MoveThroughVillageGoal(this, 1.0D, false)); + this.targetTasks.addTask(1, new HurtByTargetGoal(this, true, ZombiePigmanEntity.class)); + this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); + this.targetTasks.addTask(3, new NearestAttackableTargetGoal<>(this, VillagerEntity.class, false)); + this.targetTasks.addTask(3, new NearestAttackableTargetGoal<>(this, IronGolemEntity.class, true)); this.setCombatTask(); // this.targetTasks.addTask(8, new EntityAINearestAttackableTarget(this, EntityMob.class, 10, true, false, new TargetPredicate(this))); @@ -66,10 +66,10 @@ public class EntityCorruptedZombie extends EntityAspectedDemonBase { this.tasks.removeTask(this.aiArrowAttack); ItemStack itemstack = this.getHeldItemMainhand(); - if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemBow) { + if (!itemstack.isEmpty() && itemstack.getItem() instanceof BowItem) { int i = 20; - if (this.getEntityWorld().getDifficulty() != EnumDifficulty.HARD) { + if (this.getEntityWorld().getDifficulty() != Difficulty.HARD) { i = 40; } @@ -146,8 +146,8 @@ public class EntityCorruptedZombie extends EntityAspectedDemonBase { //TODO: Change to fit the given AI @Override - public boolean shouldAttackEntity(EntityLivingBase attacker, EntityLivingBase owner) { - return !(attacker instanceof EntityCreeper) && !(attacker instanceof EntityGhast) && super.shouldAttackEntity(attacker, owner); + public boolean shouldAttackEntity(LivingEntity attacker, LivingEntity owner) { + return !(attacker instanceof CreeperEntity) && !(attacker instanceof GhastEntity) && super.shouldAttackEntity(attacker, owner); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java index b82cfc8d..5f0d0245 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java @@ -5,21 +5,21 @@ import com.google.common.base.Predicate; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.*; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemAxe; +import net.minecraft.entity.monster.CreeperEntity; +import net.minecraft.entity.monster.GhastEntity; +import net.minecraft.entity.monster.MonsterEntity; +import net.minecraft.entity.passive.horse.HorseEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Items; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.util.SoundEvents; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.potion.PotionEffect; import net.minecraft.server.management.PreYggdrasilConverter; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; @@ -28,12 +28,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import javax.annotation.Nullable; import java.util.UUID; -public class EntityDemonBase extends EntityCreature implements IEntityOwnable { +public class EntityDemonBase extends CreatureEntity implements IEntityOwnable { protected static final DataParameter TAMED = EntityDataManager.createKey(EntityDemonBase.class, DataSerializers.BYTE); protected static final DataParameter> OWNER_UNIQUE_ID = EntityDataManager.createKey(EntityDemonBase.class, DataSerializers.OPTIONAL_UNIQUE_ID); @@ -59,7 +59,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } @Override - public boolean isPotionApplicable(PotionEffect effect) { + public boolean isPotionApplicable(EffectInstance effect) { return super.isPotionApplicable(effect); } @@ -83,8 +83,8 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { float f = (float) this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getAttributeValue(); int i = 0; - if (attackedEntity instanceof EntityLivingBase) { - f += EnchantmentHelper.getModifierForCreature(this.getHeldItemMainhand(), ((EntityLivingBase) attackedEntity).getCreatureAttribute()); + if (attackedEntity instanceof LivingEntity) { + f += EnchantmentHelper.getModifierForCreature(this.getHeldItemMainhand(), ((LivingEntity) attackedEntity).getCreatureAttribute()); i += EnchantmentHelper.getKnockbackModifier(this); } @@ -92,7 +92,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { if (flag) { if (i > 0) { - ((EntityLivingBase) attackedEntity).knockBack(this, (float) i * 0.5F, (double) MathHelper.sin(this.rotationYaw * 0.017453292F), (double) (-MathHelper.cos(this.rotationYaw * 0.017453292F))); + ((LivingEntity) attackedEntity).knockBack(this, (float) i * 0.5F, (double) MathHelper.sin(this.rotationYaw * 0.017453292F), (double) (-MathHelper.cos(this.rotationYaw * 0.017453292F))); this.motionX *= 0.6D; this.motionZ *= 0.6D; } @@ -103,12 +103,12 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { attackedEntity.setFire(j * 4); } - if (attackedEntity instanceof EntityPlayer) { - EntityPlayer entityplayer = (EntityPlayer) attackedEntity; + if (attackedEntity instanceof PlayerEntity) { + PlayerEntity entityplayer = (PlayerEntity) attackedEntity; ItemStack itemstack = this.getHeldItemMainhand(); ItemStack itemstack1 = entityplayer.isHandActive() ? entityplayer.getActiveItemStack() : ItemStack.EMPTY; - if (!itemstack.isEmpty() && !itemstack1.isEmpty() && itemstack.getItem() instanceof ItemAxe && itemstack1.getItem() == Items.SHIELD) { + if (!itemstack.isEmpty() && !itemstack1.isEmpty() && itemstack.getItem() instanceof AxeItem && itemstack1.getItem() == Items.SHIELD) { float f1 = 0.25F + (float) EnchantmentHelper.getEfficiencyModifier(this) * 0.05F; if (this.rand.nextFloat() < f1) { @@ -125,10 +125,10 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } @Override - public void setItemStackToSlot(EntityEquipmentSlot slotIn, ItemStack stack) { + public void setItemStackToSlot(EquipmentSlotType slotIn, ItemStack stack) { super.setItemStackToSlot(slotIn, stack); - if (!this.getEntityWorld().isRemote && slotIn == EntityEquipmentSlot.MAINHAND) { + if (!this.getEntityWorld().isRemote && slotIn == EquipmentSlotType.MAINHAND) { this.setCombatTask(); } } @@ -144,8 +144,8 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { public void performEmergencyHeal(double toHeal) { this.heal((float) toHeal); - if (getEntityWorld() instanceof WorldServer) { - WorldServer server = (WorldServer) getEntityWorld(); + if (getEntityWorld() instanceof ServerWorld) { + ServerWorld server = (ServerWorld) getEntityWorld(); server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0); } } @@ -160,7 +160,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); if (this.getOwnerId() == null) { @@ -172,7 +172,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(CompoundNBT tag) { super.readEntityFromNBT(tag); String s; @@ -197,8 +197,8 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } //TODO: Change to fit the given AI - public boolean shouldAttackEntity(EntityLivingBase attacker, EntityLivingBase owner) { - if (!(attacker instanceof EntityCreeper) && !(attacker instanceof EntityGhast)) { + public boolean shouldAttackEntity(LivingEntity attacker, LivingEntity owner) { + if (!(attacker instanceof CreeperEntity) && !(attacker instanceof GhastEntity)) { if (attacker instanceof IEntityOwnable) { IEntityOwnable entityOwnable = (IEntityOwnable) attacker; @@ -207,13 +207,13 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } } - return !(attacker instanceof EntityPlayer && owner instanceof EntityPlayer && !((EntityPlayer) owner).canAttackPlayer((EntityPlayer) attacker)) && (!(attacker instanceof EntityHorse) || !((EntityHorse) attacker).isTame()); + return !(attacker instanceof PlayerEntity && owner instanceof PlayerEntity && !((PlayerEntity) owner).canAttackPlayer((PlayerEntity) attacker)) && (!(attacker instanceof HorseEntity) || !((HorseEntity) attacker).isTame()); } else { return false; } } - public void attackEntityWithRangedAttack(EntityLivingBase target, float velocity) { + public void attackEntityWithRangedAttack(LivingEntity target, float velocity) { } @@ -276,7 +276,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } @Override - public EntityLivingBase getOwner() { + public LivingEntity getOwner() { try { UUID uuid = this.getOwnerId(); return uuid == null ? null : this.getEntityWorld().getPlayerEntityByUUID(uuid); @@ -285,11 +285,11 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } } - public void setOwner(EntityPlayer player) { + public void setOwner(PlayerEntity player) { setOwnerId(player.getUniqueID()); } - public class TargetPredicate implements Predicate { + public class TargetPredicate implements Predicate { EntityDemonBase entity; public TargetPredicate(EntityDemonBase entity) { @@ -297,7 +297,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable { } @Override - public boolean apply(EntityMob input) { + public boolean apply(MonsterEntity input) { return entity.shouldAttackEntity(input, this.entity.getOwner()); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java index 54e39197..41361017 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java @@ -6,30 +6,30 @@ import WayofTime.bloodmagic.entity.ai.EntityAIMimicReform; import WayofTime.bloodmagic.tile.TileMimic; import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.*; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.ai.goal.*; +import net.minecraft.entity.passive.IronGolemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.pathfinding.ClimberPathNavigator; +import net.minecraft.pathfinding.PathNavigator; +import net.minecraft.potion.Effects; +import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathNavigateClimber; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; public class EntityMimic extends EntityDemonBase { @@ -39,31 +39,31 @@ public class EntityMimic extends EntityDemonBase { private static final DataParameter CLIMBING = EntityDataManager.createKey(EntityMimic.class, DataSerializers.BYTE); public boolean dropItemsOnBreak = true; - public NBTTagCompound tileTag = new NBTTagCompound(); + public CompoundNBT tileTag = new CompoundNBT(); public int metaOfReplacedBlock = 0; - public IBlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); + public BlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); public int playerCheckRadius = 5; public EntityMimic(World worldIn) { super(worldIn); this.setSize(0.9F, 0.9F); - this.tasks.addTask(1, new EntityAISwimming(this)); - this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F)); + this.tasks.addTask(1, new SwimGoal(this)); + this.tasks.addTask(3, new LeapAtTargetGoal(this, 0.4F)); this.tasks.addTask(4, new EntityMimic.AISpiderAttack(this)); - this.tasks.addTask(5, new EntityAIMoveTowardsRestriction(this, 1)); - this.tasks.addTask(6, new EntityAIWander(this, 0.8D)); - this.tasks.addTask(8, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); - this.tasks.addTask(8, new EntityAILookIdle(this)); + this.tasks.addTask(5, new MoveTowardsRestrictionGoal(this, 1)); + this.tasks.addTask(6, new RandomWalkingGoal(this, 0.8D)); + this.tasks.addTask(8, new LookAtGoal(this, PlayerEntity.class, 8.0F)); + this.tasks.addTask(8, new LookRandomlyGoal(this)); this.tasks.addTask(7, new EntityAIMimicReform(this)); - this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false)); - this.targetTasks.addTask(2, new EntityMimic.AISpiderTarget(this, EntityPlayer.class)); - this.targetTasks.addTask(3, new EntityMimic.AISpiderTarget(this, EntityIronGolem.class)); + this.targetTasks.addTask(1, new HurtByTargetGoal(this, false)); + this.targetTasks.addTask(2, new EntityMimic.AISpiderTarget(this, PlayerEntity.class)); + this.targetTasks.addTask(3, new EntityMimic.AISpiderTarget(this, IronGolemEntity.class)); } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); @@ -74,7 +74,7 @@ public class EntityMimic extends EntityDemonBase { } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(CompoundNBT tag) { super.readEntityFromNBT(tag); dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); @@ -85,11 +85,11 @@ public class EntityMimic extends EntityDemonBase { } public ItemStack getMimicItemStack() { - return this.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + return this.getItemStackFromSlot(EquipmentSlotType.CHEST); } public void setMimicItemStack(ItemStack stack) { - this.setItemStackToSlot(EntityEquipmentSlot.CHEST, stack); + this.setItemStackToSlot(EquipmentSlotType.CHEST, stack); } public boolean spawnHeldBlockOnDeath(World world, BlockPos pos) { @@ -98,7 +98,7 @@ public class EntityMimic extends EntityDemonBase { public boolean spawnMimicBlockAtPosition(World world, BlockPos pos) { if (world.isAirBlock(pos)) { - IBlockState mimicState = RegistrarBloodMagicBlocks.MIMIC.getStateFromMeta(BlockMimic.sentientMimicMeta); + BlockState mimicState = RegistrarBloodMagicBlocks.MIMIC.getStateFromMeta(BlockMimic.sentientMimicMeta); world.setBlockState(pos, mimicState, 3); TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMimic) { @@ -116,7 +116,7 @@ public class EntityMimic extends EntityDemonBase { return false; } - public void initializeMimic(ItemStack heldStack, NBTTagCompound tileTag, boolean dropItemsOnBreak, IBlockState stateOfReplacedBlock, int playerCheckRadius, BlockPos homePosition) { + public void initializeMimic(ItemStack heldStack, CompoundNBT tileTag, boolean dropItemsOnBreak, BlockState stateOfReplacedBlock, int playerCheckRadius, BlockPos homePosition) { this.setMimicItemStack(heldStack); this.tileTag = tileTag; this.dropItemsOnBreak = dropItemsOnBreak; @@ -195,8 +195,8 @@ public class EntityMimic extends EntityDemonBase { * Returns new PathNavigateGround instance */ @Override - protected PathNavigate createNavigator(World worldIn) { - return new PathNavigateClimber(this, worldIn); + protected PathNavigator createNavigator(World worldIn) { + return new ClimberPathNavigator(this, worldIn); } @Override @@ -211,7 +211,7 @@ public class EntityMimic extends EntityDemonBase { */ @Override public void onUpdate() { - if (!this.getEntityWorld().isRemote && this.getEntityWorld().getDifficulty() == EnumDifficulty.PEACEFUL) { + if (!this.getEntityWorld().isRemote && this.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL) { if (reformIntoMimicBlock(this.getPosition())) { this.setDead(); } @@ -276,8 +276,8 @@ public class EntityMimic extends EntityDemonBase { } @Override - public boolean isPotionApplicable(PotionEffect potioneffectIn) { - return potioneffectIn.getPotion() != MobEffects.POISON && super.isPotionApplicable(potioneffectIn); + public boolean isPotionApplicable(EffectInstance potioneffectIn) { + return potioneffectIn.getPotion() != Effects.POISON && super.isPotionApplicable(potioneffectIn); } /** @@ -308,18 +308,18 @@ public class EntityMimic extends EntityDemonBase { return 0.65F; } - static class AISpiderAttack extends EntityAIAttackMelee { + static class AISpiderAttack extends MeleeAttackGoal { public AISpiderAttack(EntityMimic spider) { super(spider, 1.0D, true); } @Override - protected double getAttackReachSqr(EntityLivingBase attackTarget) { + protected double getAttackReachSqr(LivingEntity attackTarget) { return (double) (4.0F + attackTarget.width); } } - static class AISpiderTarget extends EntityAINearestAttackableTarget { + static class AISpiderTarget extends NearestAttackableTargetGoal { public AISpiderTarget(EntityMimic spider, Class classTarget) { super(spider, classTarget, true); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 321f3d30..6ec43ae9 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -12,35 +12,32 @@ import WayofTime.bloodmagic.entity.ai.EntityAIOwnerHurtTarget; import WayofTime.bloodmagic.item.soul.ItemSentientBow; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.*; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityTippedArrow; -import net.minecraft.init.Enchantments; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemBow; +import net.minecraft.entity.*; +import net.minecraft.entity.CreatureEntity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.*; +import net.minecraft.entity.monster.CreeperEntity; +import net.minecraft.entity.monster.GhastEntity; +import net.minecraft.entity.monster.MonsterEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.ArrowEntity; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.util.*; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.BowItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumHand; +import net.minecraft.potion.Effect; +import net.minecraft.util.Hand; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.SoundEvent; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.world.EnumDifficulty; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.*; +import net.minecraft.world.Difficulty; +import net.minecraft.world.ServerWorld; import java.util.ArrayList; import java.util.List; @@ -48,7 +45,7 @@ import java.util.Locale; public class EntitySentientSpecter extends EntityDemonBase { private final EntityAIAttackRangedBow aiArrowAttack = new EntityAIAttackRangedBow(this, 1.0D, 20, 15.0F); - private final EntityAIAttackMelee aiAttackOnCollide = new EntityAIAttackMelee(this, 1.0D, false); + private final MeleeAttackGoal aiAttackOnCollide = new MeleeAttackGoal(this, 1.0D, false); private final int attackPriority = 3; protected EnumDemonWillType type = EnumDemonWillType.DESTRUCTIVE; protected boolean wasGivenSentientArmour = false; @@ -57,18 +54,18 @@ public class EntitySentientSpecter extends EntityDemonBase { super(worldIn); this.setSize(0.6F, 1.95F); // ((PathNavigateGround) getNavigator()).setCanSwim(false); - this.tasks.addTask(0, new EntityAISwimming(this)); - this.tasks.addTask(2, new EntityAIRetreatToHeal<>(this, EntityCreature.class, 6.0F, 1.0D, 1.2D)); + this.tasks.addTask(0, new SwimGoal(this)); + this.tasks.addTask(2, new EntityAIRetreatToHeal<>(this, CreatureEntity.class, 6.0F, 1.0D, 1.2D)); this.tasks.addTask(attackPriority, aiAttackOnCollide); this.tasks.addTask(4, new EntityAIGrabEffectsFromOwner(this, 2.0D, 1.0F)); this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F)); - this.tasks.addTask(6, new EntityAIWander(this, 1.0D)); - this.tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); - this.tasks.addTask(8, new EntityAILookIdle(this)); + this.tasks.addTask(6, new RandomWalkingGoal(this, 1.0D)); + this.tasks.addTask(7, new LookAtGoal(this, PlayerEntity.class, 6.0F)); + this.tasks.addTask(8, new LookRandomlyGoal(this)); this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this)); this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this)); - this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityMob.class, true)); + this.targetTasks.addTask(3, new NearestAttackableTargetGoal<>(this, MonsterEntity.class, true)); this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false)); @@ -91,10 +88,10 @@ public class EntitySentientSpecter extends EntityDemonBase { this.tasks.removeTask(this.aiArrowAttack); ItemStack itemstack = this.getHeldItemMainhand(); - if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemBow) { + if (!itemstack.isEmpty() && itemstack.getItem() instanceof BowItem) { int i = 20; - if (this.getEntityWorld().getDifficulty() != EnumDifficulty.HARD) { + if (this.getEntityWorld().getDifficulty() != Difficulty.HARD) { i = 40; } @@ -107,23 +104,23 @@ public class EntitySentientSpecter extends EntityDemonBase { } @Override - public boolean isPotionApplicable(PotionEffect effect) { - Potion potion = effect.getPotion(); + public boolean isPotionApplicable(EffectInstance effect) { + Effect potion = effect.getPotion(); //Specter cannot be healed by normal means - return !(potion == MobEffects.REGENERATION || potion == MobEffects.INSTANT_HEALTH) && super.isPotionApplicable(effect); + return !(potion == Effects.REGENERATION || potion == Effects.INSTANT_HEALTH) && super.isPotionApplicable(effect); } - public boolean canStealEffectFromOwner(EntityLivingBase owner, PotionEffect effect) { + public boolean canStealEffectFromOwner(LivingEntity owner, EffectInstance effect) { return effect.getPotion().isBadEffect() && this.type == EnumDemonWillType.CORROSIVE; } - public boolean canStealEffectFromOwner(EntityLivingBase owner) { + public boolean canStealEffectFromOwner(LivingEntity owner) { if (this.type != EnumDemonWillType.CORROSIVE) { return false; } - for (PotionEffect eff : owner.getActivePotionEffects()) { + for (EffectInstance eff : owner.getActivePotionEffects()) { if (canStealEffectFromOwner(owner, eff)) { return true; } @@ -132,23 +129,23 @@ public class EntitySentientSpecter extends EntityDemonBase { return false; } - public boolean stealEffectsFromOwner(EntityLivingBase owner) { + public boolean stealEffectsFromOwner(LivingEntity owner) { if (this.type != EnumDemonWillType.CORROSIVE) { return false; } boolean hasStolenEffect = false; - List removedEffects = new ArrayList<>(); + List removedEffects = new ArrayList<>(); - for (PotionEffect eff : owner.getActivePotionEffects()) { + for (EffectInstance eff : owner.getActivePotionEffects()) { if (canStealEffectFromOwner(owner, eff)) { removedEffects.add(eff); hasStolenEffect = true; } } - for (PotionEffect eff : removedEffects) { + for (EffectInstance eff : removedEffects) { owner.removePotionEffect(eff.getPotion()); this.addPotionEffect(eff); } @@ -156,16 +153,16 @@ public class EntitySentientSpecter extends EntityDemonBase { return hasStolenEffect; } - public boolean applyNegativeEffectsToAttacked(EntityLivingBase attackedEntity, float percentTransmitted) { + public boolean applyNegativeEffectsToAttacked(LivingEntity attackedEntity, float percentTransmitted) { boolean hasProvidedEffect = false; - List removedEffects = new ArrayList<>(); - for (PotionEffect eff : this.getActivePotionEffects()) { + List removedEffects = new ArrayList<>(); + for (EffectInstance eff : this.getActivePotionEffects()) { if (eff.getPotion().isBadEffect() && attackedEntity.isPotionApplicable(eff)) { if (!attackedEntity.isPotionActive(eff.getPotion())) { removedEffects.add(eff); hasProvidedEffect = true; } else { - PotionEffect activeEffect = attackedEntity.getActivePotionEffect(eff.getPotion()); + EffectInstance activeEffect = attackedEntity.getActivePotionEffect(eff.getPotion()); if (activeEffect.getAmplifier() < eff.getAmplifier() || activeEffect.getDuration() < eff.getDuration() * percentTransmitted) { removedEffects.add(eff); hasProvidedEffect = true; @@ -174,21 +171,21 @@ public class EntitySentientSpecter extends EntityDemonBase { } } - for (PotionEffect eff : removedEffects) { + for (EffectInstance eff : removedEffects) { if (!attackedEntity.isPotionActive(eff.getPotion())) { - PotionEffect newEffect = new PotionEffect(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); + EffectInstance newEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); attackedEntity.addPotionEffect(newEffect); - PotionEffect newSentientEffect = new PotionEffect(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); + EffectInstance newSentientEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); this.removePotionEffect(eff.getPotion()); this.addPotionEffect(newSentientEffect); } else { - PotionEffect activeEffect = attackedEntity.getActivePotionEffect(eff.getPotion()); + EffectInstance activeEffect = attackedEntity.getActivePotionEffect(eff.getPotion()); - PotionEffect newEffect = new PotionEffect(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), activeEffect.getIsAmbient(), activeEffect.doesShowParticles()); + EffectInstance newEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), activeEffect.getIsAmbient(), activeEffect.doesShowParticles()); attackedEntity.addPotionEffect(newEffect); - PotionEffect newSentientEffect = new PotionEffect(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); + EffectInstance newSentientEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); this.removePotionEffect(eff.getPotion()); this.addPotionEffect(newSentientEffect); } @@ -197,25 +194,25 @@ public class EntitySentientSpecter extends EntityDemonBase { return hasProvidedEffect; } - public List getPotionEffectsForArrowRemovingDuration(float percentTransmitted) { - List arrowEffects = new ArrayList<>(); + public List getPotionEffectsForArrowRemovingDuration(float percentTransmitted) { + List arrowEffects = new ArrayList<>(); if (type != EnumDemonWillType.CORROSIVE) { return arrowEffects; } - List removedEffects = new ArrayList<>(); - for (PotionEffect eff : this.getActivePotionEffects()) { + List removedEffects = new ArrayList<>(); + for (EffectInstance eff : this.getActivePotionEffects()) { if (eff.getPotion().isBadEffect()) { removedEffects.add(eff); } } - for (PotionEffect eff : removedEffects) { - PotionEffect newEffect = new PotionEffect(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); + for (EffectInstance eff : removedEffects) { + EffectInstance newEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); arrowEffects.add(newEffect); - PotionEffect newSentientEffect = new PotionEffect(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); + EffectInstance newSentientEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); this.removePotionEffect(eff.getPotion()); this.addPotionEffect(newSentientEffect); } @@ -236,9 +233,9 @@ public class EntitySentientSpecter extends EntityDemonBase { boolean flag = super.attackEntityAsMob(attackedEntity); if (flag) { - if (this.type == EnumDemonWillType.CORROSIVE && attackedEntity instanceof EntityLivingBase) { + if (this.type == EnumDemonWillType.CORROSIVE && attackedEntity instanceof LivingEntity) { // ((EntityLivingBase) attackedEntity).addPotionEffect(new PotionEffect(MobEffects.WITHER, 200)); - applyNegativeEffectsToAttacked((EntityLivingBase) attackedEntity, 1); + applyNegativeEffectsToAttacked((LivingEntity) attackedEntity, 1); } return true; @@ -264,7 +261,7 @@ public class EntitySentientSpecter extends EntityDemonBase { @Override public boolean absorbExplosion(Explosion explosion) { if (this.type == EnumDemonWillType.DESTRUCTIVE) { - this.addPotionEffect(new PotionEffect(MobEffects.STRENGTH, 600, 1)); + this.addPotionEffect(new EffectInstance(Effects.STRENGTH, 600, 1)); explosion.doExplosionB(true); @@ -275,9 +272,9 @@ public class EntitySentientSpecter extends EntityDemonBase { } @Override - public boolean processInteract(EntityPlayer player, EnumHand hand) { + public boolean processInteract(PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); - if (this.isTamed() && player.equals(this.getOwner()) && hand == EnumHand.MAIN_HAND) { + if (this.isTamed() && player.equals(this.getOwner()) && hand == Hand.MAIN_HAND) { if (stack.isEmpty() && player.isSneaking()) //Should return to the entity { if (!getEntityWorld().isRemote) { @@ -309,8 +306,8 @@ public class EntitySentientSpecter extends EntityDemonBase { public void performEmergencyHeal(double toHeal) { this.heal((float) toHeal); - if (getEntityWorld() instanceof WorldServer) { - WorldServer server = (WorldServer) getEntityWorld(); + if (getEntityWorld() instanceof ServerWorld) { + ServerWorld server = (ServerWorld) getEntityWorld(); server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0); } } @@ -358,7 +355,7 @@ public class EntitySentientSpecter extends EntityDemonBase { } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); @@ -367,7 +364,7 @@ public class EntitySentientSpecter extends EntityDemonBase { } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(CompoundNBT tag) { super.readEntityFromNBT(tag); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { @@ -383,21 +380,21 @@ public class EntitySentientSpecter extends EntityDemonBase { //TODO: Change to fit the given AI @Override - public boolean shouldAttackEntity(EntityLivingBase attacker, EntityLivingBase owner) { - if (!(attacker instanceof EntityCreeper) && !(attacker instanceof EntityGhast)) { + public boolean shouldAttackEntity(LivingEntity attacker, LivingEntity owner) { + if (!(attacker instanceof CreeperEntity) && !(attacker instanceof GhastEntity)) { return super.shouldAttackEntity(attacker, owner); } return false; } @Override - public void attackEntityWithRangedAttack(EntityLivingBase target, float velocity) { - ItemStack heldStack = this.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND); + public void attackEntityWithRangedAttack(LivingEntity target, float velocity) { + ItemStack heldStack = this.getItemStackFromSlot(EquipmentSlotType.MAINHAND); if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW) { - EntityTippedArrow arrowEntity = ((ItemSentientBow) heldStack.getItem()).getArrowEntity(getEntityWorld(), heldStack, target, this, velocity); + ArrowEntity arrowEntity = ((ItemSentientBow) heldStack.getItem()).getArrowEntity(getEntityWorld(), heldStack, target, this, velocity); if (arrowEntity != null) { - List effects = getPotionEffectsForArrowRemovingDuration(0.2f); - for (PotionEffect eff : effects) { + List effects = getPotionEffectsForArrowRemovingDuration(0.2f); + for (EffectInstance eff : effects) { arrowEntity.addEffect(eff); } @@ -405,7 +402,7 @@ public class EntitySentientSpecter extends EntityDemonBase { this.getEntityWorld().spawnEntity(arrowEntity); } } else { - EntityTippedArrow entitytippedarrow = new EntityTippedArrow(this.getEntityWorld(), this); //TODO: Change to an arrow created by the Sentient Bow + ArrowEntity entitytippedarrow = new ArrowEntity(this.getEntityWorld(), this); //TODO: Change to an arrow created by the Sentient Bow double d0 = target.posX - this.posX; double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entitytippedarrow.posY; double d2 = target.posZ - this.posZ; @@ -432,7 +429,7 @@ public class EntitySentientSpecter extends EntityDemonBase { if (true) //TODO: Add potion effects to the arrows { - entitytippedarrow.addEffect(new PotionEffect(MobEffects.SLOWNESS, 600)); + entitytippedarrow.addEffect(new EffectInstance(Effects.SLOWNESS, 600)); } this.playSound(SoundEvents.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F)); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index 5e2e4e43..1ed0d6ef 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -3,13 +3,13 @@ package WayofTime.bloodmagic.entity.projectile; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import io.netty.buffer.ByteBuf; +import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; @@ -17,8 +17,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.common.registry.IThrowableEntity; -public class EntityBloodLight extends EntityThrowable implements IThrowableEntity, IEntityAdditionalSpawnData { - public EntityLivingBase shootingEntity; +public class EntityBloodLight extends ThrowableEntity implements IThrowableEntity, IEntityAdditionalSpawnData { + public LivingEntity shootingEntity; protected int ticksInAir = 0; protected int maxTicksInAir = 600; @@ -33,7 +33,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit this.setPosition(x, y, z); } - public EntityBloodLight(World world, EntityLivingBase player) { + public EntityBloodLight(World world, LivingEntity player) { super(world, player); shootingEntity = player; float par3 = 0.8F; @@ -91,7 +91,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit this.onImpact(mop.entityHit); } else if (mop.typeOfHit == RayTraceResult.Type.BLOCK) { - EnumFacing sideHit = mop.sideHit; + Direction sideHit = mop.sideHit; BlockPos blockPos = mop.getBlockPos().offset(sideHit); if (getEntityWorld().isAirBlock(blockPos)) { @@ -107,8 +107,8 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1); this.setDead(); } else { - if (mop instanceof EntityLivingBase) { - ((EntityLivingBase) mop).setRevengeTarget(shootingEntity); + if (mop instanceof LivingEntity) { + ((LivingEntity) mop).setRevengeTarget(shootingEntity); doDamage(1, mop); } } @@ -140,14 +140,14 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit } @Override - public void writeEntityToNBT(NBTTagCompound nbt) { + public void writeEntityToNBT(CompoundNBT nbt) { super.writeEntityToNBT(nbt); nbt.setInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); nbt.setInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); } @Override - public void readEntityFromNBT(NBTTagCompound nbt) { + public void readEntityFromNBT(CompoundNBT nbt) { super.readEntityFromNBT(nbt); ticksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR); maxTicksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); @@ -165,7 +165,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit @Override public void setThrower(Entity entity) { - if (entity instanceof EntityLivingBase) - this.shootingEntity = (EntityLivingBase) entity; + if (entity instanceof LivingEntity) + this.shootingEntity = (LivingEntity) entity; } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index 4c701ace..7fd8ae60 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -3,18 +3,18 @@ package WayofTime.bloodmagic.entity.projectile; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.meteor.MeteorRegistry; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IThrowableEntity; -public class EntityMeteor extends EntityThrowable implements IThrowableEntity { +public class EntityMeteor extends ThrowableEntity implements IThrowableEntity { public ItemStack meteorStack = ItemStack.EMPTY; protected int ticksInAir = 0; protected int maxTicksInAir = 600; @@ -63,7 +63,7 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity { } protected void onImpact(Entity mop) { - if (mop instanceof EntityLivingBase) { + if (mop instanceof LivingEntity) { doDamage(100, mop); } @@ -86,7 +86,7 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity { } @Override - public void writeEntityToNBT(NBTTagCompound nbt) { + public void writeEntityToNBT(CompoundNBT nbt) { super.writeEntityToNBT(nbt); nbt.setInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); nbt.setInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); @@ -100,7 +100,7 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity { } @Override - public void readEntityFromNBT(NBTTagCompound nbt) { + public void readEntityFromNBT(CompoundNBT nbt) { super.readEntityFromNBT(nbt); ticksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR); maxTicksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index fe91c8ac..6fc72e52 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -3,23 +3,21 @@ package WayofTime.bloodmagic.entity.projectile; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.util.Constants; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.entity.projectile.EntityTippedArrow; -import net.minecraft.init.Items; -import net.minecraft.init.MobEffects; -import net.minecraft.init.PotionTypes; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.AbstractArrowEntity; +import net.minecraft.entity.projectile.ArrowEntity; +import net.minecraft.item.Items; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Effects; +import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.potion.PotionType; -import net.minecraft.potion.PotionUtils; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; import java.lang.invoke.MethodHandle; @@ -28,13 +26,13 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Locale; -public class EntitySentientArrow extends EntityTippedArrow { - public PotionType potion = PotionTypes.EMPTY; +public class EntitySentientArrow extends ArrowEntity { + public Potion potion = Potions.EMPTY; public double reimbursedAmountOnHit = 0; public EnumDemonWillType type = EnumDemonWillType.DEFAULT; public int currentLevel = 0; public ItemStack itemStack; - public Class specialArrowClass; + public Class specialArrowClass; public float[] destructiveExplosionRadius = {0.5f, 1, 1.5f, 2, 2.5f, 3, 3.5f}; public int[] poisonDuration = {50, 100, 150, 80, 120, 160, 200}; public int[] poisonLevel = {0, 0, 0, 1, 1, 1, 1}; @@ -42,7 +40,7 @@ public class EntitySentientArrow extends EntityTippedArrow { public int[] levitationLevel = {0, 0, 0, 1, 1, 1, 2}; public int[] slownessDuration = {40, 60, 100, 150, 200, 250, 300}; public int[] slownessLevel = {0, 0, 0, 1, 1, 1, 2}; - public EntityArrow specialEntity; + public AbstractArrowEntity specialEntity; public MethodHandle specialHitMH; public Method specialHit; @@ -54,14 +52,14 @@ public class EntitySentientArrow extends EntityTippedArrow { super(worldIn, x, y, z); } - public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel) { + public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel) { super(worldIn, shooter); this.reimbursedAmountOnHit = reimburseAmount; this.type = type; this.currentLevel = currentLevel; } - public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, PotionType potion) { + public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, Potion potion) { super(worldIn, shooter); this.reimbursedAmountOnHit = reimburseAmount; this.type = type; @@ -69,7 +67,7 @@ public class EntitySentientArrow extends EntityTippedArrow { this.potion = potion; } - public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, ItemStack itemStack) { + public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, ItemStack itemStack) { super(worldIn, shooter); this.reimbursedAmountOnHit = reimburseAmount; this.type = type; @@ -77,7 +75,7 @@ public class EntitySentientArrow extends EntityTippedArrow { this.potion = PotionUtils.getPotionFromItem(itemStack); } - public EntitySentientArrow(World worldIn, EntityLivingBase shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, EntityArrow specialArrow) { + public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, AbstractArrowEntity specialArrow) { super(worldIn, shooter); this.reimbursedAmountOnHit = reimburseAmount; this.type = type; @@ -86,35 +84,35 @@ public class EntitySentientArrow extends EntityTippedArrow { this.specialArrowClass = specialArrow.getClass(); } - public void reimbursePlayer(EntityLivingBase hitEntity, float damage) { - if (this.shootingEntity instanceof EntityPlayer) { - if (hitEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(hitEntity instanceof IMob)) { + public void reimbursePlayer(LivingEntity hitEntity, float damage) { + if (this.shootingEntity instanceof PlayerEntity) { + if (hitEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(hitEntity instanceof IMob)) { return; } - PlayerDemonWillHandler.addDemonWill(type, (EntityPlayer) this.shootingEntity, reimbursedAmountOnHit * damage / 20f); + PlayerDemonWillHandler.addDemonWill(type, (PlayerEntity) this.shootingEntity, reimbursedAmountOnHit * damage / 20f); } } @Override - protected void arrowHit(EntityLivingBase living) { + protected void arrowHit(LivingEntity living) { int amp = -1; switch (type) { case CORROSIVE: if (this.potion != null) - for (PotionEffect i : this.potion.getEffects()) { + for (EffectInstance i : this.potion.getEffects()) { if (i.getEffectName().equals("poison")) { amp = i.getAmplifier(); continue; } - living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); } - living.addPotionEffect(new PotionEffect(MobEffects.POISON, currentLevel >= 0 ? (amp > -1 && poisonLevel[currentLevel] != amp) ? poisonDuration[currentLevel] / 2 : poisonDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(poisonLevel[currentLevel], amp) + 1 : poisonLevel[currentLevel] : 0)); + living.addPotionEffect(new EffectInstance(Effects.POISON, currentLevel >= 0 ? (amp > -1 && poisonLevel[currentLevel] != amp) ? poisonDuration[currentLevel] / 2 : poisonDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(poisonLevel[currentLevel], amp) + 1 : poisonLevel[currentLevel] : 0)); break; case DEFAULT: if (this.potion != null) - for (PotionEffect i : this.potion.getEffects()) { - living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + for (EffectInstance i : this.potion.getEffects()) { + living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); } break; case DESTRUCTIVE: @@ -123,32 +121,32 @@ public class EntitySentientArrow extends EntityTippedArrow { break; case STEADFAST: if (this.potion != null) - for (PotionEffect i : this.potion.getEffects()) { + for (EffectInstance i : this.potion.getEffects()) { if (i.getEffectName().equals("levitation")) { amp = i.getAmplifier(); continue; } - living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); } - living.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, currentLevel >= 0 ? (amp > -1 && levitationLevel[currentLevel] != amp) ? levitationDuration[currentLevel] / 2 : levitationDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(levitationLevel[currentLevel], amp) + 1 : levitationLevel[currentLevel] : 0)); + living.addPotionEffect(new EffectInstance(Effects.LEVITATION, currentLevel >= 0 ? (amp > -1 && levitationLevel[currentLevel] != amp) ? levitationDuration[currentLevel] / 2 : levitationDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(levitationLevel[currentLevel], amp) + 1 : levitationLevel[currentLevel] : 0)); break; case VENGEFUL: if (this.potion != null) - for (PotionEffect i : this.potion.getEffects()) { + for (EffectInstance i : this.potion.getEffects()) { if (i.getEffectName().equals("slowness")) { amp = i.getAmplifier(); continue; } - living.addPotionEffect(new PotionEffect(i.getPotion(), i.getDuration(), i.getAmplifier())); + living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); } - living.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, currentLevel >= 0 ? (amp > -1 && slownessLevel[currentLevel] != amp) ? slownessDuration[currentLevel] / 2 : slownessDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(slownessLevel[currentLevel], amp) + 1 : slownessLevel[currentLevel] : 0)); + living.addPotionEffect(new EffectInstance(Effects.SLOWNESS, currentLevel >= 0 ? (amp > -1 && slownessLevel[currentLevel] != amp) ? slownessDuration[currentLevel] / 2 : slownessDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(slownessLevel[currentLevel], amp) + 1 : slownessLevel[currentLevel] : 0)); break; default: break; } if (this.specialArrowClass != null) { try { - this.specialHit = this.specialArrowClass.getMethod("arrowHit", EntityLivingBase.class); + this.specialHit = this.specialArrowClass.getMethod("arrowHit", LivingEntity.class); this.specialHitMH = MethodHandles.lookup().unreflect(this.specialHit).bindTo(this.specialEntity); } catch (IllegalAccessException e) { e.printStackTrace(); @@ -220,14 +218,14 @@ public class EntitySentientArrow extends EntityTippedArrow { } //TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect. - private void createPotionFromArrow(EntityLivingBase living) { + private void createPotionFromArrow(LivingEntity living) { if (this.potion != null) { float radius = currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0; AxisAlignedBB axisalignedbb = this.getEntityBoundingBox().grow(radius * 2, radius, radius * 2); - List list = this.world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); + List list = this.world.getEntitiesWithinAABB(LivingEntity.class, axisalignedbb); if (!list.isEmpty()) { - for (EntityLivingBase entitylivingbase : list) { + for (LivingEntity entitylivingbase : list) { if (entitylivingbase.canBeHitWithPotion()) { double d0 = this.getDistanceSq(entitylivingbase); @@ -238,8 +236,8 @@ public class EntitySentientArrow extends EntityTippedArrow { d1 = 1.0D; } - for (PotionEffect potioneffect : this.potion.getEffects()) { - Potion potion = potioneffect.getPotion(); + for (EffectInstance potioneffect : this.potion.getEffects()) { + Effect potion = potioneffect.getPotion(); if (potion.isInstant()) { potion.affectEntity(this, this.shootingEntity, entitylivingbase, potioneffect.getAmplifier(), d1); @@ -247,7 +245,7 @@ public class EntitySentientArrow extends EntityTippedArrow { int i = (int) (d1 * (double) potioneffect.getDuration() + 0.5D); if (i > 20) { - entitylivingbase.addPotionEffect(new PotionEffect(potion, i, potioneffect.getAmplifier(), potioneffect.getIsAmbient(), potioneffect.doesShowParticles())); + entitylivingbase.addPotionEffect(new EffectInstance(potion, i, potioneffect.getAmplifier(), potioneffect.getIsAmbient(), potioneffect.doesShowParticles())); } } } @@ -259,7 +257,7 @@ public class EntitySentientArrow extends EntityTippedArrow { } @Override - public void writeEntityToNBT(NBTTagCompound tag) { + public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); tag.setDouble("reimbursement", reimbursedAmountOnHit); @@ -268,7 +266,7 @@ public class EntitySentientArrow extends EntityTippedArrow { } @Override - public void readEntityFromNBT(NBTTagCompound tag) { + public void readEntityFromNBT(CompoundNBT tag) { super.readEntityFromNBT(tag); reimbursedAmountOnHit = tag.getDouble("reimbursement"); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java index f0a5ef66..5fc9ff13 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java @@ -1,21 +1,21 @@ package WayofTime.bloodmagic.entity.projectile; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -public class EntitySoulSnare extends EntityThrowable { +public class EntitySoulSnare extends ThrowableEntity { public EntitySoulSnare(World worldIn) { super(worldIn); } - public EntitySoulSnare(World worldIn, EntityLivingBase throwerIn) { + public EntitySoulSnare(World worldIn, LivingEntity throwerIn) { super(worldIn, throwerIn); } @@ -28,9 +28,9 @@ public class EntitySoulSnare extends EntityThrowable { if (result.entityHit == this.getThrower() || this.ticksExisted < 2 || getEntityWorld().isRemote) return; - if (result.entityHit instanceof EntityLivingBase) { + if (result.entityHit instanceof LivingEntity) { if (result.entityHit.getEntityWorld().rand.nextDouble() < 0.25) - ((EntityLivingBase) result.entityHit).addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_SNARE, 300, 0)); + ((LivingEntity) result.entityHit).addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_SNARE, 300, 0)); result.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), (float) 0); } diff --git a/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java index 66c70ea9..68a94aa6 100644 --- a/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.event; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; public class BoundToolEvent extends Event { - public EntityPlayer player; + public PlayerEntity player; - public BoundToolEvent(EntityPlayer player) { + public BoundToolEvent(PlayerEntity player) { this.player = player; } @@ -23,7 +23,7 @@ public class BoundToolEvent extends Event { public static class Charge extends BoundToolEvent { public ItemStack result; - public Charge(EntityPlayer player, ItemStack result) { + public Charge(PlayerEntity player, ItemStack result) { super(player); this.result = result; } @@ -41,7 +41,7 @@ public class BoundToolEvent extends Event { public final ItemStack boundTool; public int charge; - public Release(EntityPlayer player, ItemStack boundTool, int charge) { + public Release(PlayerEntity player, ItemStack boundTool, int charge) { super(player); this.boundTool = boundTool; this.charge = charge; diff --git a/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java index e5cf73c5..ec613007 100644 --- a/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.event; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; @Cancelable public class ItemBindEvent extends Event { - private final EntityPlayer player; + private final PlayerEntity player; private final ItemStack itemStack; /** @@ -20,12 +20,12 @@ public class ItemBindEvent extends Event { *

    * This event is {@link Cancelable}.
    */ - public ItemBindEvent(EntityPlayer player, ItemStack itemStack) { + public ItemBindEvent(PlayerEntity player, ItemStack itemStack) { this.player = player; this.itemStack = itemStack; } - public EntityPlayer getNewOwner() { + public PlayerEntity getNewOwner() { return player; } diff --git a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java index 08d94f85..2a5d5536 100644 --- a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.Ritual; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.Cancelable; @@ -40,16 +40,16 @@ public class RitualEvent extends Event { * This event is called when a ritual is activated. If cancelled, it will * not activate. *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, EntityPlayer, Ritual)} + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} */ @Cancelable public static class RitualActivatedEvent extends RitualEvent { - private final EntityPlayer player; + private final PlayerEntity player; private final ItemStack crystalStack; private final int crystalTier; - public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, EntityPlayer player, ItemStack activationCrystal, int crystalTier) { + public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, PlayerEntity player, ItemStack activationCrystal, int crystalTier) { super(mrs, ownerId, ritual); this.player = player; @@ -57,7 +57,7 @@ public class RitualEvent extends Event { this.crystalTier = crystalTier; } - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @@ -109,10 +109,10 @@ public class RitualEvent extends Event { public static class ImperfectRitualActivatedEvent extends Event { private final IImperfectRitualStone ims; - private final EntityPlayer activator; + private final PlayerEntity activator; private final ImperfectRitual imperfectRitual; - public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, EntityPlayer activator, ImperfectRitual imperfectRitual) { + public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, PlayerEntity activator, ImperfectRitual imperfectRitual) { this.ims = ims; this.activator = activator; this.imperfectRitual = imperfectRitual; @@ -122,7 +122,7 @@ public class RitualEvent extends Event { return ims; } - public EntityPlayer getActivator() { + public PlayerEntity getActivator() { return activator; } diff --git a/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java index 982166b7..0893883f 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.event; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; @Cancelable public class SacrificeKnifeUsedEvent extends Event { - public final EntityPlayer player; + public final PlayerEntity player; public final int healthDrained; public int lpAdded; public boolean shouldDrainHealth; @@ -25,7 +25,7 @@ public class SacrificeKnifeUsedEvent extends Event { *

    * This event is {@link Cancelable}.
    */ - public SacrificeKnifeUsedEvent(EntityPlayer player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded) { + public SacrificeKnifeUsedEvent(PlayerEntity player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded) { this.player = player; this.shouldDrainHealth = shouldDrainHealth; this.shouldFillAltar = shouldFillAltar; diff --git a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index 560b19a5..0aae8212 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.event; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; @@ -63,15 +63,15 @@ public class SoulNetworkEvent extends Event { public static class User extends Syphon { - private final EntityPlayer user; + private final PlayerEntity user; - public User(SoulNetwork network, SoulTicket ticket, EntityPlayer user) { + public User(SoulNetwork network, SoulTicket ticket, PlayerEntity user) { super(network, ticket); this.user = user; } - public EntityPlayer getUser() { + public PlayerEntity getUser() { return user; } } diff --git a/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java index 856c9917..527f9e19 100644 --- a/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.event; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -17,11 +17,11 @@ import net.minecraftforge.fml.common.eventhandler.Event; public class TeleposeEvent extends Event { public final World initalWorld; public final BlockPos initialBlockPos; - public final IBlockState initialState; + public final BlockState initialState; public final World finalWorld; public final BlockPos finalBlockPos; - public final IBlockState finalState; + public final BlockState finalState; public TeleposeEvent(World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos) { this.initalWorld = initialWorld; diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java index eb33e3fe..92508702 100644 --- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java +++ b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.fakePlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.EnumPacketDirection; -import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.network.IPacket; +import net.minecraft.network.PacketDirection; +import net.minecraft.network.play.ServerPlayNetHandler; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; import net.minecraft.network.play.client.*; -import net.minecraft.network.play.server.SPacketPlayerPosLook; +import net.minecraft.network.play.server.SPlayerPositionLookPacket; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -15,9 +15,9 @@ import java.util.Set; /** * All credits for this go to CrazyPants, from EIO */ -public class FakeNetHandlerPlayServer extends NetHandlerPlayServer { - public FakeNetHandlerPlayServer(EntityPlayerMP p_i1530_3_) { - super(FMLCommonHandler.instance().getMinecraftServerInstance(), new net.minecraft.network.NetworkManager(EnumPacketDirection.CLIENTBOUND), p_i1530_3_); +public class FakeNetHandlerPlayServer extends ServerPlayNetHandler { + public FakeNetHandlerPlayServer(ServerPlayerEntity p_i1530_3_) { + super(FMLCommonHandler.instance().getMinecraftServerInstance(), new net.minecraft.network.NetworkManager(PacketDirection.CLIENTBOUND), p_i1530_3_); } @Override @@ -34,39 +34,39 @@ public class FakeNetHandlerPlayServer extends NetHandlerPlayServer { } @Override - public void processVehicleMove(CPacketVehicleMove packetIn) { + public void processVehicleMove(CMoveVehiclePacket packetIn) { } @Override - public void processConfirmTeleport(CPacketConfirmTeleport packetIn) { + public void processConfirmTeleport(CConfirmTeleportPacket packetIn) { } @Override - public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set relativeSet) { + public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set relativeSet) { } @Override - public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) { + public void processTryUseItemOnBlock(CPlayerTryUseItemOnBlockPacket packetIn) { } @Override - public void processTryUseItem(CPacketPlayerTryUseItem packetIn) { + public void processTryUseItem(CPlayerTryUseItemPacket packetIn) { } @Override - public void processSteerBoat(CPacketSteerBoat packetIn) { + public void processSteerBoat(CSteerBoatPacket packetIn) { } @Override - public void processCustomPayload(CPacketCustomPayload packetIn) { + public void processCustomPayload(CCustomPayloadPacket packetIn) { } @Override - public void processInput(CPacketInput p_147358_1_) { + public void processInput(CInputPacket p_147358_1_) { } @Override - public void processPlayer(CPacketPlayer p_147347_1_) { + public void processPlayer(CPlayerPacket p_147347_1_) { } @Override @@ -74,7 +74,7 @@ public class FakeNetHandlerPlayServer extends NetHandlerPlayServer { } @Override - public void processPlayerDigging(CPacketPlayerDigging p_147345_1_) { + public void processPlayerDigging(CPlayerDiggingPacket p_147345_1_) { } @Override @@ -82,79 +82,79 @@ public class FakeNetHandlerPlayServer extends NetHandlerPlayServer { } @Override - public void sendPacket(Packet p_147359_1_) { + public void sendPacket(IPacket p_147359_1_) { } @Override - public void processHeldItemChange(CPacketHeldItemChange p_147355_1_) { + public void processHeldItemChange(CHeldItemChangePacket p_147355_1_) { } @Override - public void processChatMessage(CPacketChatMessage p_147354_1_) { + public void processChatMessage(CChatMessagePacket p_147354_1_) { } @Override - public void handleAnimation(CPacketAnimation packetIn) { + public void handleAnimation(CAnimateHandPacket packetIn) { } @Override - public void processEntityAction(CPacketEntityAction p_147357_1_) { + public void processEntityAction(CEntityActionPacket p_147357_1_) { } @Override - public void processUseEntity(CPacketUseEntity p_147340_1_) { + public void processUseEntity(CUseEntityPacket p_147340_1_) { } @Override - public void processClientStatus(CPacketClientStatus p_147342_1_) { + public void processClientStatus(CClientStatusPacket p_147342_1_) { } @Override - public void processCloseWindow(CPacketCloseWindow p_147356_1_) { + public void processCloseWindow(CCloseWindowPacket p_147356_1_) { } @Override - public void processClickWindow(CPacketClickWindow p_147351_1_) { + public void processClickWindow(CClickWindowPacket p_147351_1_) { } @Override - public void processEnchantItem(CPacketEnchantItem p_147338_1_) { + public void processEnchantItem(CEnchantItemPacket p_147338_1_) { } @Override - public void processCreativeInventoryAction(CPacketCreativeInventoryAction p_147344_1_) { + public void processCreativeInventoryAction(CCreativeInventoryActionPacket p_147344_1_) { } @Override - public void processConfirmTransaction(CPacketConfirmTransaction p_147339_1_) { + public void processConfirmTransaction(CConfirmTransactionPacket p_147339_1_) { } @Override - public void processUpdateSign(CPacketUpdateSign p_147343_1_) { + public void processUpdateSign(CUpdateSignPacket p_147343_1_) { } @Override - public void processKeepAlive(CPacketKeepAlive p_147353_1_) { + public void processKeepAlive(CKeepAlivePacket p_147353_1_) { } @Override - public void processPlayerAbilities(CPacketPlayerAbilities p_147348_1_) { + public void processPlayerAbilities(CPlayerAbilitiesPacket p_147348_1_) { } @Override - public void processTabComplete(CPacketTabComplete p_147341_1_) { + public void processTabComplete(CTabCompletePacket p_147341_1_) { } @Override - public void processClientSettings(CPacketClientSettings p_147352_1_) { + public void processClientSettings(CClientSettingsPacket p_147352_1_) { } @Override - public void handleSpectate(CPacketSpectate packetIn) { + public void handleSpectate(CSpectatePacket packetIn) { } @Override - public void handleResourcePackStatus(CPacketResourcePackStatus packetIn) { + public void handleResourcePackStatus(CResourcePackStatusPacket packetIn) { } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java index 03fc7b83..e8436777 100644 --- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java +++ b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.fakePlayer; import com.mojang.authlib.GameProfile; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -17,7 +17,7 @@ import javax.annotation.Nullable; @SuppressWarnings("EntityConstructor") public class FakePlayerBM extends FakePlayer { - public FakePlayerBM(WorldServer world, GameProfile name) { + public FakePlayerBM(ServerWorld world, GameProfile name) { super(world, name); } @@ -30,15 +30,15 @@ public class FakePlayerBM extends FakePlayer { } @Override - protected void onNewPotionEffect(PotionEffect p_70670_1_) { + protected void onNewPotionEffect(EffectInstance p_70670_1_) { } @Override - protected void onChangedPotionEffect(PotionEffect effect, boolean p_70695_2_) { + protected void onChangedPotionEffect(EffectInstance effect, boolean p_70695_2_) { } @Override - protected void onFinishedPotionEffect(PotionEffect effect) { + protected void onFinishedPotionEffect(EffectInstance effect) { } protected void playEquipSound(@Nullable ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index 1f940d2e..543c3e38 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -5,9 +5,9 @@ import com.google.gson.*; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializer; +import net.minecraft.network.datasync.IDataSerializer; import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; @@ -15,7 +15,7 @@ import java.lang.reflect.Type; public class Serializers { // Data serializers - public static final DataSerializer WILL_TYPE_SERIALIZER = new DataSerializer() { + public static final IDataSerializer WILL_TYPE_SERIALIZER = new IDataSerializer() { @Override public void write(PacketBuffer buf, EnumDemonWillType value) { buf.writeEnumValue(value); @@ -38,15 +38,15 @@ public class Serializers { }; // Serializers - public static final SerializerBase FACING_SERIALIZER = new SerializerBase() { + public static final SerializerBase FACING_SERIALIZER = new SerializerBase() { @Override - public Class getType() { - return EnumFacing.class; + public Class getType() { + return Direction.class; } @Override - public EnumFacing deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - return EnumFacing.byName(json.getAsString()); + public Direction deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + return Direction.byName(json.getAsString()); } }; public static final SerializerBase RESOURCELOCATION_SERIALIZER = new SerializerBase() { diff --git a/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java index e5ee95e9..f5435580 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.iface; import WayofTime.bloodmagic.util.Constants; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import javax.annotation.Nonnull; @@ -16,7 +16,7 @@ public interface IActivatable { default ItemStack setActivatedState(ItemStack stack, boolean activated) { if (!stack.isEmpty()) { if (!stack.hasTagCompound()) - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); stack.getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java index f8026ce3..4b3321c6 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.iface; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IAlchemyArray { - EnumFacing getRotation(); + Direction getRotation(); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java index cc2dad03..6253c37b 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.iface; import WayofTime.bloodmagic.core.data.Binding; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; @@ -32,7 +32,7 @@ public interface IBindable { * @param stack - The ItemStack to attempt binding * @return If binding was successful. */ - default boolean onBind(EntityPlayer player, ItemStack stack) { + default boolean onBind(PlayerEntity player, ItemStack stack) { return true; } } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java b/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java index 39863d68..51ae4323 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.iface; import WayofTime.bloodmagic.block.enums.BloodRuneType; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -11,5 +11,5 @@ import javax.annotation.Nullable; public interface IBloodRune { @Nullable - BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, IBlockState state); + BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, BlockState state); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java index 10c58212..2647c6f6 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.iface; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; public interface IDemonWillViewer { - boolean canSeeDemonWillAura(World world, ItemStack stack, EntityPlayer player); + boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player); - int getDemonWillAuraResolution(World world, ItemStack stack, EntityPlayer player); + int getDemonWillAuraResolution(World world, ItemStack stack, PlayerEntity player); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java index 7a991bab..5038d0a0 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.iface; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; @@ -28,5 +28,5 @@ public interface IDocumentedBlock { * Provide an empty list if there is no available documentation. */ @Nonnull - List getDocumentation(EntityPlayer player, World world, BlockPos pos, IBlockState state); + List getDocumentation(PlayerEntity player, World world, BlockPos pos, BlockState state); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java index db74ba4a..e620478f 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.iface; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; public interface ISentientSwordEffectProvider { - boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, EntityLivingBase attacker, EntityLivingBase target); + boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, LivingEntity attacker, LivingEntity target); boolean providesEffectForWill(EnumDemonWillType type); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java index 3f9693ab..a36935e2 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.iface; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public interface ISentientTool { - boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player); + boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java index 017df5c1..683fdf3c 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.iface; import WayofTime.bloodmagic.item.sigil.ItemSigil; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -24,6 +24,6 @@ public interface ISigil { interface Holding { @Nonnull - ItemStack getHeldItem(ItemStack holdingStack, EntityPlayer player); + ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player); } } diff --git a/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java b/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java index fa747980..77efdb42 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.incense; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -10,5 +10,5 @@ public interface IIncensePath { * still functioning. 0 represents a block that can work when it is two * blocks horizontally away from the altar. */ - int getLevelOfPath(World world, BlockPos pos, IBlockState state); + int getLevelOfPath(World world, BlockPos pos, BlockState state); } diff --git a/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java index 6f4cef45..af9e425c 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public interface ITranquilityHandler { - TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state); + TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state); } diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java index b9ef76f0..ebdd88ca 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java @@ -1,33 +1,33 @@ package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; public class IncenseAltarComponent { public final BlockPos offsetPos; public final Block block; - public final IBlockState state; + public final BlockState state; - public IncenseAltarComponent(BlockPos offsetPos, Block block, IBlockState state) { + public IncenseAltarComponent(BlockPos offsetPos, Block block, BlockState state) { this.offsetPos = offsetPos; this.block = block; this.state = state; } - public boolean doesBlockMatch(Block block, IBlockState state) { + public boolean doesBlockMatch(Block block, BlockState state) { return this.block == block && block.getMetaFromState(state) == this.block.getMetaFromState(this.state); } /** * Base rotation is north. */ - public BlockPos getOffset(EnumFacing rotation) { + public BlockPos getOffset(Direction rotation) { return new BlockPos(this.getX(rotation), offsetPos.getY(), this.getZ(rotation)); } - public int getX(EnumFacing direction) { + public int getX(Direction direction) { switch (direction) { case EAST: return -this.offsetPos.getZ(); @@ -40,7 +40,7 @@ public class IncenseAltarComponent { } } - public int getZ(EnumFacing direction) { + public int getZ(Direction direction) { switch (direction) { case EAST: return this.offsetPos.getX(); diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java index f41928c1..ad8a1659 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -28,7 +28,7 @@ public class IncenseAltarHandler { } } - public static void registerIncenseComponent(int altarLevel, BlockPos offsetPos, Block block, IBlockState state) { + public static void registerIncenseComponent(int altarLevel, BlockPos offsetPos, Block block, BlockState state) { registerIncenseComponent(altarLevel, new IncenseAltarComponent(offsetPos, block, state)); } @@ -42,8 +42,8 @@ public class IncenseAltarHandler { } else { boolean hasAllComponentsThisTier = true; for (IncenseAltarComponent component : incenseComponentMap.get(i)) { - BlockPos offsetPos = pos.add(component.getOffset(EnumFacing.NORTH)); - IBlockState state = world.getBlockState(offsetPos); + BlockPos offsetPos = pos.add(component.getOffset(Direction.NORTH)); + BlockState state = world.getBlockState(offsetPos); Block block = state.getBlock(); if (component.doesBlockMatch(block, state)) { hasAllComponentsThisTier = false; diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java index e291bbf9..8273d848 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -15,7 +15,7 @@ public class IncenseTranquilityRegistry { handlerList.add(handler); } - public static TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { + public static TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state) { for (ITranquilityHandler handler : handlerList) { TranquilityStack tranq = handler.getTranquilityOfBlock(world, pos, block, state); if (tranq != null) { diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java index 1e916933..baad0d7b 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.inversion; import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; @@ -11,36 +11,36 @@ import java.util.HashMap; import java.util.Map; public class CorruptionHandler { - public static Map, Map> corruptBlockMap = new HashMap<>(); + public static Map, Map> corruptBlockMap = new HashMap<>(); - public static void registerBlockCorruption(EnumDemonWillType type, Block block, int meta, IBlockState corruptedState) { + public static void registerBlockCorruption(EnumDemonWillType type, Block block, int meta, BlockState corruptedState) { Pair pair = Pair.of(block, meta); if (corruptBlockMap.containsKey(pair)) { - Map stateMap = corruptBlockMap.get(pair); + Map stateMap = corruptBlockMap.get(pair); stateMap.put(type, corruptedState); } else { - Map stateMap = new HashMap<>(); + Map stateMap = new HashMap<>(); stateMap.put(type, corruptedState); corruptBlockMap.put(pair, stateMap); } } - public static boolean isBlockCorruptible(World world, EnumDemonWillType type, BlockPos pos, IBlockState state, Block block) { + public static boolean isBlockCorruptible(World world, EnumDemonWillType type, BlockPos pos, BlockState state, Block block) { int meta = block.getMetaFromState(state); Pair pair = Pair.of(block, meta); if (corruptBlockMap.containsKey(pair)) { - Map stateMap = corruptBlockMap.get(pair); + Map stateMap = corruptBlockMap.get(pair); return stateMap.containsKey(type); } return false; } - public static boolean corruptBlock(World world, EnumDemonWillType type, BlockPos pos, IBlockState state, Block block) { + public static boolean corruptBlock(World world, EnumDemonWillType type, BlockPos pos, BlockState state, Block block) { int meta = block.getMetaFromState(state); Pair pair = Pair.of(block, meta); if (corruptBlockMap.containsKey(pair)) { - Map stateMap = corruptBlockMap.get(pair); + Map stateMap = corruptBlockMap.get(pair); if (stateMap.containsKey(type)) { return world.setBlockState(pos, stateMap.get(type)); } @@ -75,7 +75,7 @@ public class CorruptionHandler { } BlockPos offsetPos = centerPos.add(i, j, k); - IBlockState offsetState = world.getBlockState(offsetPos); + BlockState offsetState = world.getBlockState(offsetPos); Block offsetBlock = offsetState.getBlock(); corruptBlock(world, type, offsetPos, offsetState, offsetBlock); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 9800cce6..8ed4f7b7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -10,17 +10,17 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -48,13 +48,13 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (world.isRemote) return super.onItemRightClick(world, player, hand); if (!player.capabilities.isCreativeMode) { - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.creativeOnly"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.creativeOnly"), true); return super.onItemRightClick(world, player, hand); } @@ -67,7 +67,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); setTierToBuild(AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); return super.onItemRightClick(world, player, hand); } @@ -75,9 +75,9 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) return super.onItemRightClick(world, player, hand); - IBlockState state = world.getBlockState(rayTrace.getBlockPos()); + BlockState state = world.getBlockState(rayTrace.getBlockPos()); if (state.getBlock() instanceof BlockAltar) { - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.building", NumeralHelper.toRoman(tierToBuild.toInt())), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.building", NumeralHelper.toRoman(tierToBuild.toInt())), true); buildAltar(world, rayTrace.getBlockPos()); world.notifyBlockUpdate(rayTrace.getBlockPos(), state, state, 3); @@ -115,14 +115,14 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP ((IBloodAltar) world.getTileEntity(pos)).checkTier(); } - public String destroyAltar(EntityPlayer player) { + public String destroyAltar(PlayerEntity player) { World world = player.getEntityWorld(); if (world.isRemote) return ""; RayTraceResult rayTrace = rayTrace(world, player, false); BlockPos pos = rayTrace.getBlockPos(); - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); AltarTier altarTier = AltarUtil.getTier(world, pos); if (altarTier.equals(AltarTier.ONE)) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 12524c89..df8f3037 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -7,13 +7,13 @@ import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -36,13 +36,13 @@ public class ItemArcaneAshes extends Item implements IVariantProvider { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos blockPos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); BlockPos newPos = blockPos.offset(side); if (world.isAirBlock(newPos)) { if (!world.isRemote) { - EnumFacing rotation = EnumFacing.fromAngle(player.getRotationYawHead()); + Direction rotation = Direction.fromAngle(player.getRotationYawHead()); world.setBlockState(newPos, RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getDefaultState()); TileEntity tile = world.getTileEntity(newPos); if (tile instanceof TileAlchemyArray) { @@ -52,10 +52,10 @@ public class ItemArcaneAshes extends Item implements IVariantProvider { stack.damageItem(1, player); } - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index fa5d84e8..fb39ec76 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.iface.IBindable; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,6 +29,6 @@ public class ItemBindableBase extends Item implements IBindable { Binding binding = getBinding(stack); if (binding != null) - tooltip.add(new TextComponentTranslation("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).getFormattedText()); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).getFormattedText()); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 71d20e33..a343b514 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -9,11 +9,11 @@ import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -39,13 +39,13 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { } @Override - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; for (BloodOrb orb : RegistrarBloodMagic.BLOOD_ORBS) { ItemStack orbStack = new ItemStack(this); - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); tag.setString("orb", orb.getRegistryName().toString()); orbStack.setTagCompound(tag); list.add(orbStack); @@ -53,12 +53,12 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); BloodOrb orb = getOrb(stack); if (orb == null) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); if (world == null) return super.onItemRightClick(world, player, hand); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 903ce710..934a4efd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -9,17 +9,17 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Enchantments; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -40,17 +40,17 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState block, BlockPos pos, EntityLivingBase entityLiving) { + public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { return true; } @Override - protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) { + protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { if (world.isRemote) return; @@ -67,7 +67,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { BlockPos blockPos = playerPos.add(i, j, k); - IBlockState blockState = world.getBlockState(blockPos); + BlockState blockState = world.getBlockState(blockPos); if (world.isAirBlock(blockPos)) continue; @@ -89,9 +89,9 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { } @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot, ItemStack stack) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { + if (equipmentSlot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 11 : 2, 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -3.0, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 4b422e55..9c648e11 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -7,17 +7,17 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Enchantments; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -38,24 +38,24 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState block, BlockPos pos, EntityLivingBase entityLiving) { + public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { return true; } @Override - public boolean canHarvestBlock(IBlockState blockIn) { + public boolean canHarvestBlock(BlockState blockIn) { return blockIn == Blocks.OBSIDIAN ? this.toolMaterial.getHarvestLevel() == 3 : (blockIn != Blocks.DIAMOND_BLOCK && blockIn != Blocks.DIAMOND_ORE ? (blockIn != Blocks.EMERALD_ORE && blockIn != Blocks.EMERALD_BLOCK ? (blockIn != Blocks.GOLD_BLOCK && blockIn != Blocks.GOLD_ORE ? (blockIn != Blocks.IRON_BLOCK && blockIn != Blocks.IRON_ORE ? (blockIn != Blocks.LAPIS_BLOCK && blockIn != Blocks.LAPIS_ORE ? (blockIn != Blocks.REDSTONE_ORE && blockIn != Blocks.LIT_REDSTONE_ORE ? (blockIn.getMaterial() == Material.ROCK || (blockIn.getMaterial() == Material.IRON || blockIn.getMaterial() == Material.ANVIL)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2); } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, BlockState state) { if (!getActivated(stack)) return 1.0F; @@ -63,7 +63,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { } @Override - protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) { + protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { if (world.isRemote) return; @@ -78,7 +78,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { BlockPos blockPos = playerPos.add(i, j, k); - IBlockState blockState = world.getBlockState(blockPos); + BlockState blockState = world.getBlockState(blockPos); if (world.isAirBlock(blockPos)) continue; @@ -100,9 +100,9 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { } @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot, ItemStack stack) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { + if (equipmentSlot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 5 : 2, 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -2.5, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index ec4b630e..1606f0e5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -9,17 +9,17 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Enchantments; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -40,17 +40,17 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState block, BlockPos pos, EntityLivingBase entityLiving) { + public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { return true; } @Override - protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) { + protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { if (world.isRemote) return; int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); @@ -67,7 +67,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { for (int j = 0; j <= 2 * range; j++) { for (int k = -range; k <= range; k++) { BlockPos blockPos = playerPos.add(i, j, k); - IBlockState blockState = world.getBlockState(blockPos); + BlockState blockState = world.getBlockState(blockPos); if (world.isAirBlock(blockPos)) continue; @@ -90,9 +90,9 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { } @Override - public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { + public Multimap getItemAttributeModifiers(EquipmentSlotType equipmentSlot) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { + if (equipmentSlot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", 5, 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -2.5, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 935395da..d3536283 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -13,16 +13,16 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.ItemGroup; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; +import net.minecraft.item.SwordItem; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,7 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import java.util.function.Consumer; -public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider { +public class ItemBoundSword extends SwordItem implements IBindable, IActivatable, IMeshProvider { public ItemBoundSword() { super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL); @@ -41,7 +41,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) setActivatedState(stack, !getActivated(stack)); @@ -67,17 +67,17 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable return; } - if (entity instanceof EntityPlayer && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) - NetworkHelper.getSoulNetwork(binding).syphonAndDamage((EntityPlayer) entity, SoulTicket.item(stack, world, entity, 20)); + if (entity instanceof PlayerEntity && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) + NetworkHelper.getSoulNetwork(binding).syphonAndDamage((PlayerEntity) entity, SoulTicket.item(stack, world, entity, 20)); } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState block, BlockPos pos, EntityLivingBase entityLiving) { + public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { return true; } @@ -88,7 +88,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs tab, NonNullList subItems) { + public void getSubItems(ItemGroup tab, NonNullList subItems) { if (!isInCreativeTab(tab)) return; @@ -112,9 +112,9 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable } @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot, ItemStack stack) { Multimap multimap = HashMultimap.create(); - if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { + if (equipmentSlot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 8 : 2, 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4, 0)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 4031565f..83bedf2d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -14,21 +14,18 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.*; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; +import net.minecraft.item.ToolItem; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -42,7 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { +public class ItemBoundTool extends ToolItem implements IBindable, IActivatable { public final int chargeTime = 30; protected final String tooltipBase; private final String name; @@ -60,7 +57,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, BlockState state) { return getActivated(stack) ? toolMaterial.getEfficiency() : 1.0F; } @@ -70,7 +67,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } @Override - public void getSubItems(CreativeTabs tab, NonNullList subItems) { + public void getSubItems(ItemGroup tab, NonNullList subItems) { if (!isInCreativeTab(tab)) return; @@ -85,15 +82,15 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { return; } - if (entity instanceof EntityPlayer && getActivated(stack) && isSelected && getBeingHeldDown(stack) && stack == ((EntityPlayer) entity).getActiveItemStack()) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof PlayerEntity && getActivated(stack) && isSelected && getBeingHeldDown(stack) && stack == ((PlayerEntity) entity).getActiveItemStack()) { + PlayerEntity player = (PlayerEntity) entity; setHeldDownCount(stack, Math.min(player.getItemInUseCount(), chargeTime)); } else if (!isSelected) { setBeingHeldDown(stack, false); } - if (entity instanceof EntityPlayer && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) - NetworkHelper.getSoulNetwork(binding).syphonAndDamage((EntityPlayer) entity, SoulTicket.item(stack, world, entity, 20)); + if (entity instanceof PlayerEntity && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) + NetworkHelper.getSoulNetwork(binding).syphonAndDamage((PlayerEntity) entity, SoulTicket.item(stack, world, entity, 20)); } protected int getHeldDownCount(ItemStack stack) { @@ -119,7 +116,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) setActivatedState(stack, !getActivated(stack)); @@ -127,19 +124,19 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { if (!player.isSneaking() && getActivated(stack)) { BoundToolEvent.Charge event = new BoundToolEvent.Charge(player, stack); if (MinecraftForge.EVENT_BUS.post(event)) - return new ActionResult<>(EnumActionResult.FAIL, event.result); + return new ActionResult<>(ActionResultType.FAIL, event.result); player.setActiveHand(hand); - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } return super.onItemRightClick(world, player, hand); } @Override - public void onPlayerStoppedUsing(ItemStack stack, World worldIn, EntityLivingBase entityLiving, int timeLeft) { - if (entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entityLiving; + public void onPlayerStoppedUsing(ItemStack stack, World worldIn, LivingEntity entityLiving, int timeLeft) { + if (entityLiving instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entityLiving; if (!player.isSneaking() && getActivated(stack)) { int i = this.getMaxItemUseDuration(stack) - timeLeft; BoundToolEvent.Release event = new BoundToolEvent.Release(player, stack, i); @@ -154,12 +151,12 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } } - protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) { + protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving) { + public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity entityLiving) { return stack; } @@ -169,8 +166,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { } @Override - public EnumAction getItemUseAction(ItemStack stack) { - return EnumAction.BOW; + public UseAction getItemUseAction(ItemStack stack) { + return UseAction.BOW; } @Override @@ -201,7 +198,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { return ImmutableSet.of(name); } - public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { + public Multimap getItemAttributeModifiers(EquipmentSlotType equipmentSlot) { return ArrayListMultimap.create(); // No-op } @@ -235,7 +232,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { return chargeTime; } - protected void sharedHarvest(ItemStack stack, World world, EntityPlayer player, BlockPos blockPos, IBlockState blockState, boolean silkTouch, int fortuneLvl) { + protected void sharedHarvest(ItemStack stack, World world, PlayerEntity player, BlockPos blockPos, BlockState blockState, boolean silkTouch, int fortuneLvl) { if (blockState.getBlockHardness(world, blockPos) != -1.0F) { float strengthVsBlock = getDestroySpeed(stack, blockState); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 919a3039..3d4f6c19 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -7,12 +7,12 @@ import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.util.helper.PurificationHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundCategory; @@ -32,17 +32,17 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { if (attacker instanceof FakePlayer) return false; - if (target == null || attacker == null || attacker.getEntityWorld().isRemote || (attacker instanceof EntityPlayer && !(attacker instanceof EntityPlayerMP))) + if (target == null || attacker == null || attacker.getEntityWorld().isRemote || (attacker instanceof PlayerEntity && !(attacker instanceof ServerPlayerEntity))) return false; if (!target.isNonBoss()) return false; - if (target instanceof EntityPlayer) + if (target instanceof PlayerEntity) return false; if (target.isChild() && !(target instanceof IMob)) @@ -60,8 +60,8 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { return false; int lifeEssence = (int) (lifeEssenceRatio * target.getHealth()); - if (target instanceof EntityAnimal) { - lifeEssence = (int) (lifeEssence * (1 + PurificationHelper.getCurrentPurity((EntityAnimal) target))); + if (target instanceof AnimalEntity) { + lifeEssence = (int) (lifeEssence * (1 + PurificationHelper.getCurrentPurity((AnimalEntity) target))); } if (target.isChild()) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index a2649334..e26e7d49 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -36,12 +36,12 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon } @Override - public boolean canSeeDemonWillAura(World world, ItemStack stack, EntityPlayer player) { + public boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player) { return true; } @Override - public int getDemonWillAuraResolution(World world, ItemStack stack, EntityPlayer player) { + public int getDemonWillAuraResolution(World world, ItemStack stack, PlayerEntity player) { return 100; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index 1881a7d6..bec6de84 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.types.ISubItem; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -33,7 +33,7 @@ public class ItemEnum & ISubItem> extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs tab, NonNullList subItems) { + public void getSubItems(ItemGroup tab, NonNullList subItems) { if (!isInCreativeTab(tab)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 381d817c..3ca9e276 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -7,14 +7,14 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -50,7 +50,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { if (player.isSneaking()) @@ -59,7 +59,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { giveOneLevelExpToPlayer(stack, player); } - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } @Override @@ -67,7 +67,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { variants.put(0, "type=experiencetome"); } - public void giveOneLevelExpToPlayer(ItemStack stack, EntityPlayer player) { + public void giveOneLevelExpToPlayer(ItemStack stack, PlayerEntity player) { float progress = player.experience; int expToNext = getExperienceForNextLevel(player.experienceLevel); @@ -90,7 +90,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { } } - public void absorbOneLevelExpFromPlayer(ItemStack stack, EntityPlayer player) { + public void absorbOneLevelExpFromPlayer(ItemStack stack, PlayerEntity player) { float progress = player.experience; if (progress > 0) { @@ -107,11 +107,11 @@ public class ItemExperienceBook extends Item implements IVariantProvider { } // Credits to Ender IO for some of the experience code, although now modified slightly for my convenience. - public static int getPlayerXP(EntityPlayer player) { + public static int getPlayerXP(PlayerEntity player) { return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap())); } - public static void addPlayerXP(EntityPlayer player, int amount) { + public static void addPlayerXP(PlayerEntity player, int amount) { int experience = Math.max(0, getPlayerXP(player) + amount); player.experienceTotal = experience; player.experienceLevel = getLevelForExperience(experience); @@ -122,7 +122,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { public static void setStoredExperience(ItemStack stack, double exp) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("experience", exp); } @@ -130,7 +130,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { public static double getStoredExperience(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("experience"); } @@ -164,7 +164,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { return res; } - public static double getExperienceAcquiredToNext(EntityPlayer player) { + public static double getExperienceAcquiredToNext(PlayerEntity player) { return player.experience * player.xpBarCap(); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 6f4bb703..26f900c8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -8,15 +8,15 @@ import WayofTime.bloodmagic.ritual.EnumRuneType; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemGroup; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -37,7 +37,7 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; @@ -46,7 +46,7 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen continue; ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); tag.setInteger(Constants.NBT.USES, 10); stack.setTagCompound(tag); list.add(stack); @@ -54,9 +54,9 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof BlockRitualStone && !((BlockRitualStone) state.getBlock()).isRuneType(world, pos, getItemType(stack))) { stack = NBTHelper.checkNBT(stack); @@ -68,10 +68,10 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen if (uses <= 0) player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); } - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index f4144990..78ebbe37 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -8,20 +8,19 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.util.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -61,9 +60,9 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide if (NetworkHelper.syphonFromContainer(stack, SoulTicket.item(stack, 25))) return 200; else { - EntityPlayer player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); + PlayerEntity player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); if (player != null) - player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99)); + player.addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); } return -1; @@ -79,28 +78,28 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. return null; - NBTTagCompound nbt = (NBTTagCompound) bindingTag; + CompoundNBT nbt = (CompoundNBT) bindingTag; return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); } @Override - public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World worldIn, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { pos = pos.offset(facing); ItemStack itemstack = player.getHeldItem(hand); if (!player.canPlayerEdit(pos, facing, itemstack)) - return EnumActionResult.FAIL; + return ActionResultType.FAIL; if (worldIn.isAirBlock(pos) && NetworkHelper.getSoulNetwork(getBinding(player.getHeldItem(hand))).syphonAndDamage(player, SoulTicket.item(player.getHeldItem(hand), 100)).isSuccess()) { worldIn.playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); worldIn.setBlockState(pos, Blocks.FIRE.getDefaultState(), 11); } else - return EnumActionResult.FAIL; + return ActionResultType.FAIL; - if (player instanceof EntityPlayerMP) - CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP) player, pos, itemstack); + if (player instanceof ServerPlayerEntity) + CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, itemstack); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 098a2b62..b97c9313 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -6,15 +6,15 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.EnumAction; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.UseAction; +import net.minecraft.potion.EffectInstance; +import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionUtils; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; @@ -36,8 +36,8 @@ public class ItemPotionFlask extends Item implements IMeshProvider { } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving) { - EntityPlayer player = entityLiving instanceof EntityPlayer ? (EntityPlayer) entityLiving : null; + public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity entityLiving) { + PlayerEntity player = entityLiving instanceof PlayerEntity ? (PlayerEntity) entityLiving : null; int remainingUses = stack.getMaxDamage() - stack.getItemDamage(); if (remainingUses <= 0) { @@ -51,8 +51,8 @@ public class ItemPotionFlask extends Item implements IMeshProvider { } if (!world.isRemote) { - for (PotionEffect potioneffect : PotionUtils.getEffectsFromStack(stack)) { - entityLiving.addPotionEffect(new PotionEffect(potioneffect)); + for (EffectInstance potioneffect : PotionUtils.getEffectsFromStack(stack)) { + entityLiving.addPotionEffect(new EffectInstance(potioneffect)); } } @@ -65,8 +65,8 @@ public class ItemPotionFlask extends Item implements IMeshProvider { } @Override - public EnumAction getItemUseAction(ItemStack stack) { - return EnumAction.DRINK; + public UseAction getItemUseAction(ItemStack stack) { + return UseAction.DRINK; } @Override @@ -75,34 +75,34 @@ public class ItemPotionFlask extends Item implements IMeshProvider { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); int remainingUses = stack.getMaxDamage() - stack.getItemDamage(); if (remainingUses > 0 || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("empty")) - return EnumActionResult.PASS; + return ActionResultType.PASS; RayTraceResult trace = rayTrace(world, player, true); if (trace.typeOfHit == RayTraceResult.Type.BLOCK && world.getBlockState(trace.getBlockPos()).getMaterial() == Material.WATER) { world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.NEUTRAL, 1.0F, 1.0F); player.setHeldItem(hand, new ItemStack(this)); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); int remainingUses = stack.getMaxDamage() - stack.getItemDamage(); if (remainingUses <= 0) { NBTHelper.checkNBT(stack); stack.getTagCompound().setBoolean("empty", true); - return new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(ActionResultType.PASS, stack); } player.setActiveHand(hand); - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java index f79d8bc1..af90c890 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java @@ -12,13 +12,13 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.RitualHelper; import com.google.common.collect.Lists; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; @@ -33,14 +33,14 @@ public class ItemRitualDismantler extends Item implements IVariantProvider { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { Block block = world.getBlockState(pos).getBlock(); TileEntity tileEntity = world.getTileEntity(pos); ItemStack stack = player.getHeldItem(hand); if (tileEntity instanceof TileMasterRitualStone) { TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tileEntity; - EnumFacing direction = masterRitualStone.getDirection(); + Direction direction = masterRitualStone.getDirection(); String ritualName = RitualHelper.getValidRitual(world, pos); masterRitualStone.setActive(false); @@ -49,7 +49,7 @@ public class ItemRitualDismantler extends Item implements IVariantProvider { world.setBlockToAir(pos); ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER)); NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 100)); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualName); @@ -64,15 +64,15 @@ public class ItemRitualDismantler extends Item implements IVariantProvider { } NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 200)); // smallest Ritual has 4 stones - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } else if (player.isSneaking() && block instanceof BlockRitualStone) { block.removedByPlayer(world.getBlockState(pos), world, pos, player, false); ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 50)); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 05601f00..6f2e534a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -17,20 +17,20 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -71,7 +71,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; @@ -80,24 +80,24 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) { if (world.isRemote) { trySetDisplayedRitual(stack, world, pos); } - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } else if (addRuneToRitual(stack, world, pos, player)) { if (world.isRemote) { spawnParticles(world, pos.up(), 15); } - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; // TODO: Have the diviner automagically build the ritual } - return EnumActionResult.PASS; + return ActionResultType.PASS; } /** @@ -109,13 +109,13 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { * @param player - The Player attempting to place the ritual * @return - True if a rune was successfully added */ - public boolean addRuneToRitual(ItemStack stack, World world, BlockPos pos, EntityPlayer player) { + public boolean addRuneToRitual(ItemStack stack, World world, BlockPos pos, PlayerEntity player) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileMasterRitualStone) { Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); if (ritual != null) { - EnumFacing direction = getDirection(stack); + Direction direction = getDirection(stack); List components = Lists.newArrayList(); ritual.gatherComponents(components::add); for (RitualComponent component : components) { @@ -124,7 +124,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } BlockPos offset = component.getOffset(direction); BlockPos newPos = pos.add(offset); - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); Block block = state.getBlock(); if (RitualHelper.isRune(world, newPos)) { if (RitualHelper.isRuneType(world, newPos, component.getRuneType())) { @@ -141,7 +141,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { return false; } int meta = component.getRuneType().ordinal(); - IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); + BlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); world.setBlockState(newPos, newState); return true; } else { @@ -164,7 +164,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tile; if (ritual != null) { - EnumFacing direction = getDirection(itemStack); + Direction direction = getDirection(itemStack); ClientHandler.setRitualHolo(masterRitualStone, ritual, direction, true); } } @@ -176,7 +176,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } // TODO: Make this work for any IRitualStone - public boolean consumeStone(ItemStack stack, World world, EntityPlayer player) { + public boolean consumeStone(ItemStack stack, World world, PlayerEntity player) { if (player.capabilities.isCreativeMode) { return true; } @@ -188,8 +188,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { continue; } Item item = newStack.getItem(); - if (item instanceof ItemBlock) { - Block block = ((ItemBlock) item).getBlock(); + if (item instanceof BlockItem) { + Block block = ((BlockItem) item).getBlock(); if (block == RegistrarBloodMagicBlocks.RITUAL_STONE) { newStack.shrink(1); return true; @@ -293,11 +293,11 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); RayTraceResult ray = this.rayTrace(world, player, false); if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(ActionResultType.PASS, stack); } if (player.isSneaking()) { @@ -305,16 +305,16 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { cycleRitual(stack, player, false); } - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } - return new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(ActionResultType.PASS, stack); } @Override - public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) { - if (!entityLiving.world.isRemote && entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entityLiving; + public boolean onEntitySwing(LivingEntity entityLiving, ItemStack stack) { + if (!entityLiving.world.isRemote && entityLiving instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entityLiving; RayTraceResult ray = this.rayTrace(player.getEntityWorld(), player, false); if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { @@ -340,64 +340,64 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { variants.put(2, "type=dawn"); } - public void cycleDirection(ItemStack stack, EntityPlayer player) { - EnumFacing direction = getDirection(stack); - EnumFacing newDirection; + public void cycleDirection(ItemStack stack, PlayerEntity player) { + Direction direction = getDirection(stack); + Direction newDirection; switch (direction) { case NORTH: - newDirection = EnumFacing.EAST; + newDirection = Direction.EAST; break; case EAST: - newDirection = EnumFacing.SOUTH; + newDirection = Direction.SOUTH; break; case SOUTH: - newDirection = EnumFacing.WEST; + newDirection = Direction.WEST; break; case WEST: - newDirection = EnumFacing.NORTH; + newDirection = Direction.NORTH; break; default: - newDirection = EnumFacing.NORTH; + newDirection = Direction.NORTH; } setDirection(stack, newDirection); notifyDirectionChange(newDirection, player); } - public void notifyDirectionChange(EnumFacing direction, EntityPlayer player) { - player.sendStatusMessage(new TextComponentTranslation(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.name())), true); + public void notifyDirectionChange(Direction direction, PlayerEntity player) { + player.sendStatusMessage(new TranslationTextComponent(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.name())), true); } - public void setDirection(ItemStack stack, EnumFacing direction) { + public void setDirection(ItemStack stack, Direction direction) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); } - public EnumFacing getDirection(ItemStack stack) { + public Direction getDirection(ItemStack stack) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); - return EnumFacing.NORTH; + stack.setTagCompound(new CompoundNBT()); + return Direction.NORTH; } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); int dir = tag.getInteger(Constants.NBT.DIRECTION); if (dir == 0) { - return EnumFacing.NORTH; + return Direction.NORTH; } - return EnumFacing.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; + return Direction.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; } /** * Cycles the ritual forward or backward */ - public void cycleRitual(ItemStack stack, EntityPlayer player, boolean reverse) { + public void cycleRitual(ItemStack stack, PlayerEntity player, boolean reverse) { String key = getCurrentRitual(stack); List rituals = BloodMagic.RITUAL_MANAGER.getSortedRituals(); if (reverse) @@ -450,29 +450,29 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { return true; } - public void notifyRitualChange(String key, EntityPlayer player) { + public void notifyRitualChange(String key, PlayerEntity player) { Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); if (ritual != null) { - player.sendStatusMessage(new TextComponentTranslation(ritual.getTranslationKey()), true); + player.sendStatusMessage(new TranslationTextComponent(ritual.getTranslationKey()), true); } } public void setCurrentRitual(ItemStack stack, String key) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString("current_ritual", key); } public String getCurrentRitual(ItemStack stack) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getString("current_ritual"); } @@ -495,7 +495,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { } public static void spawnParticles(World worldIn, BlockPos pos, int amount) { - IBlockState state = worldIn.getBlockState(pos); + BlockState state = worldIn.getBlockState(pos); Block block = worldIn.getBlockState(pos).getBlock(); if (block.isAir(state, worldIn, pos)) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 6358762a..ae919cb9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -14,15 +14,15 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -66,11 +66,11 @@ public class ItemRitualReader extends Item implements IVariantProvider { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); RayTraceResult ray = this.rayTrace(world, player, false); if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(ActionResultType.PASS, stack); } if (player.isSneaking()) { @@ -78,14 +78,14 @@ public class ItemRitualReader extends Item implements IVariantProvider { cycleReader(stack, player); } - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } - return new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(ActionResultType.PASS, stack); } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { EnumRitualReaderState state = this.getState(stack); @@ -103,7 +103,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { break; case SET_AREA: - if (player.isSneaking() && player.getHeldItem(EnumHand.OFF_HAND).getItem() instanceof ItemBloodOrb) { + if (player.isSneaking() && player.getHeldItem(Hand.OFF_HAND).getItem() instanceof ItemBloodOrb) { Ritual ritual = master.getCurrentRitual(); for (String range : ritual.getListOfRanges()) { AreaDescriptor aabb = ritual.getBlockRange(range); @@ -144,7 +144,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { break; } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } else { if (state == EnumRitualReaderState.SET_AREA) { BlockPos masterPos = this.getMasterBlockPos(stack); @@ -153,7 +153,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { if (containedPos.equals(BlockPos.ORIGIN)) { BlockPos pos1 = pos.subtract(masterPos); this.setBlockPos(stack, pos1); - player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.firstBlock"), true); + player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.firstBlock"), true); } else { tile = world.getTileEntity(masterPos); if (tile instanceof IMasterRitualStone) { @@ -173,16 +173,16 @@ public class ItemRitualReader extends Item implements IVariantProvider { switch (master.setBlockRangeByBounds(player, range, containedPos, pos2)) { case SUCCESS: - player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.success"), true); + player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.success"), true); break; case NOT_WITHIN_BOUNDARIES: - player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.tooFar", maxVerticalRange, maxHorizontalRange), false); + player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVerticalRange, maxHorizontalRange), false); break; case VOLUME_TOO_LARGE: - player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.tooBig", maxVolume), false); + player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume), false); break; default: - player.sendStatusMessage(new TextComponentTranslation("ritual.bloodmagic.blockRange.noRange"), false); + player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"), false); break; } } @@ -203,7 +203,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { stack = NBTHelper.checkNBT(stack); - NBTTagCompound itemTag = stack.getTagCompound(); + CompoundNBT itemTag = stack.getTagCompound(); itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); @@ -217,7 +217,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemStack setMasterBlockPos(ItemStack stack, BlockPos pos) { stack = NBTHelper.checkNBT(stack); - NBTTagCompound itemTag = stack.getTagCompound(); + CompoundNBT itemTag = stack.getTagCompound(); itemTag.setInteger(Constants.NBT.X_COORD + "master", pos.getX()); itemTag.setInteger(Constants.NBT.Y_COORD + "master", pos.getY()); itemTag.setInteger(Constants.NBT.Z_COORD + "master", pos.getZ()); @@ -227,7 +227,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { public String getCurrentBlockRange(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getString("range"); } @@ -235,12 +235,12 @@ public class ItemRitualReader extends Item implements IVariantProvider { public void setCurrentBlockRange(ItemStack stack, String range) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString("range", range); } - public void cycleReader(ItemStack stack, EntityPlayer player) { + public void cycleReader(ItemStack stack, PlayerEntity player) { EnumRitualReaderState prevState = getState(stack); int val = prevState.ordinal(); int nextVal = val + 1 >= EnumRitualReaderState.values().length ? 0 : val + 1; @@ -250,25 +250,25 @@ public class ItemRitualReader extends Item implements IVariantProvider { notifyPlayerOfStateChange(nextState, player); } - public void notifyPlayerOfStateChange(EnumRitualReaderState state, EntityPlayer player) { - ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentState", new TextComponentTranslation(tooltipBase + state.toString().toLowerCase()))); + public void notifyPlayerOfStateChange(EnumRitualReaderState state, PlayerEntity player) { + ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + "currentState", new TranslationTextComponent(tooltipBase + state.toString().toLowerCase()))); } public void setState(ItemStack stack, EnumRitualReaderState state) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setInteger(Constants.NBT.RITUAL_READER, state.ordinal()); } public EnumRitualReaderState getState(ItemStack stack) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); return EnumRitualReaderState.INFORMATION; } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return EnumRitualReaderState.values()[tag.getInteger(Constants.NBT.RITUAL_READER)]; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 62632247..657724c0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -10,13 +10,13 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.*; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; -import net.minecraft.item.EnumAction; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.SoundEvents; +import net.minecraft.item.UseAction; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; @@ -51,10 +51,10 @@ public class ItemSacrificialDagger extends ItemEnum onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (PlayerHelper.isFakePlayer(player)) return super.onItemRightClick(world, player, hand); if (this.canUseForSacrifice(stack)) { player.setActiveHand(hand); - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; @@ -131,19 +131,19 @@ public class ItemSacrificialDagger extends ItemEnum 0); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index 9dc458f5..a3088076 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -12,20 +12,19 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -44,11 +43,11 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { if (world.isRemote) return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - IBlockState hitState = world.getBlockState(pos); + BlockState hitState = world.getBlockState(pos); if (player.isSneaking()) { if (hitState.getBlock() instanceof IDocumentedBlock) { trySetDisplayedTier(world, pos); @@ -65,7 +64,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (world.isRemote) return super.onItemRightClick(world, player, hand); @@ -80,7 +79,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); currentDisplayedTier = AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]; - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); return super.onItemRightClick(world, player, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 1cce2154..4f45001a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -8,11 +8,11 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -34,7 +34,7 @@ public class ItemTelepositionFocus extends ItemEnum.Variant onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { if (player.isSneaking()) { RayTraceResult mop = rayTrace(world, player, false); @@ -59,7 +59,7 @@ public class ItemTelepositionFocus extends ItemEnum.Variant onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (world.isRemote) { return super.onItemRightClick(world, player, hand); @@ -48,7 +48,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { return super.onItemRightClick(world, player, hand); } - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); if (chestStack.getItem() instanceof ItemLivingArmour) { LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); if (armour == null) { @@ -78,7 +78,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider { @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index f37785d1..aad3bc39 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -9,7 +9,7 @@ import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -34,7 +34,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index c53c6da0..1c450ccf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -8,7 +8,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -36,14 +36,14 @@ public class ItemCuttingFluid extends ItemEnum.Variant onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) { playerIn.setActiveHand(hand); - return new ActionResult<>(EnumActionResult.SUCCESS, playerIn.getHeldItem(hand)); + return new ActionResult<>(ActionResultType.SUCCESS, playerIn.getHeldItem(hand)); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) { - if (!(entityLiving instanceof EntityPlayer)) + public ItemStack onItemUseFinish(ItemStack stack, World worldIn, LivingEntity entityLiving) { + if (!(entityLiving instanceof PlayerEntity)) return super.onItemUseFinish(stack, worldIn, entityLiving); - EntityPlayer player = (EntityPlayer) entityLiving; + PlayerEntity player = (PlayerEntity) entityLiving; if (!player.capabilities.isCreativeMode) stack.shrink(1); if (!worldIn.isRemote) { - player.addPotionEffect(new PotionEffect(MobEffects.WITHER, 300, 5)); - player.addPotionEffect(new PotionEffect(MobEffects.POISON, 300, 5)); - player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 400, 1)); + player.addPotionEffect(new EffectInstance(Effects.WITHER, 300, 5)); + player.addPotionEffect(new EffectInstance(Effects.POISON, 300, 5)); + player.addPotionEffect(new EffectInstance(Effects.REGENERATION, 400, 1)); if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; @@ -81,8 +81,8 @@ public class ItemLivingArmourPointsUpgrade extends ItemEnum.Variant FLAGS = null; - public ItemLivingArmour(EntityEquipmentSlot armorType) { - super(ItemArmor.ArmorMaterial.IRON, 0, armorType); + public ItemLivingArmour(EquipmentSlotType armorType) { + super(ArmorItem.ArmorMaterial.IRON, 0, armorType); setTranslationKey(BloodMagic.MODID + ".livingArmour."); // setMaxDamage(250); setMaxDamage((int) (getMaxDamage() * 1.5)); @@ -69,14 +69,14 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) { + public void onCreated(ItemStack stack, World world, PlayerEntity player) { if (stack != null && !world.isRemote && stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { Utils.setUUID(stack); } } @Override - public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { + public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlotType slot, String type) { if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET || this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS) { return "bloodmagic:models/armor/livingArmour_layer_1.png"; } @@ -106,7 +106,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack stack, DamageSource source, double damage, int slot) { + public ArmorProperties getProperties(LivingEntity player, ItemStack stack, DamageSource source, double damage, int slot) { double armourReduction = 0.0; double damageAmount = 0.25; @@ -133,9 +133,9 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { armourReduction = 0.24 / 0.64; // This values puts it at iron level - ItemStack helmet = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - ItemStack leggings = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS); - ItemStack boots = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); + ItemStack helmet = player.getItemStackFromSlot(EquipmentSlotType.HEAD); + ItemStack leggings = player.getItemStackFromSlot(EquipmentSlotType.LEGS); + ItemStack boots = player.getItemStackFromSlot(EquipmentSlotType.FEET); if (helmet.isEmpty() || leggings.isEmpty() || boots.isEmpty()) { damageAmount *= (armourReduction); @@ -178,7 +178,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + public int getArmorDisplay(PlayerEntity player, ItemStack armor, int slot) { if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET) { return 3; } @@ -199,7 +199,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + public void damageArmor(LivingEntity entity, ItemStack stack, DamageSource source, int damage, int slot) { if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { int preDamage = stack.getItemDamage(); if (source.isUnblockable()) { @@ -208,8 +208,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP if (damage > this.getMaxDamage(stack) - this.getDamage(stack)) { //TODO: Syphon a load of LP. - if (entity.getEntityWorld().isRemote && entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity.getEntityWorld().isRemote && entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; SoulNetwork network = NetworkHelper.getSoulNetwork(player); network.syphonAndDamage(player, SoulTicket.item(stack, entity.getEntityWorld(), entity, damage * 100)); } @@ -220,8 +220,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP stack.damageItem(damage, entity); int receivedDamage = stack.getItemDamage() - preDamage; - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; if (LivingArmour.hasFullSet(player)) { LivingArmour armour = ItemLivingArmour.getLivingArmour(stack); if (armour != null) { @@ -277,13 +277,13 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { super.onArmorTick(world, player, stack); if (world.isRemote && this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - if (player instanceof EntityPlayerSP) //Sanity check + if (player instanceof ClientPlayerEntity) //Sanity check { - EntityPlayerSP spPlayer = (EntityPlayerSP) player; + ClientPlayerEntity spPlayer = (ClientPlayerEntity) player; if (FLAGS == null) { try { @@ -295,7 +295,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP if (FLAGS != null) { if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.elytra", chestStack); if (upgrade instanceof LivingArmourUpgradeElytra) { if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.capabilities.isFlying) { @@ -333,8 +333,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST) { + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { + if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EquipmentSlotType.CHEST) { LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(stack); return armour.getAttributeModifiers(); @@ -377,7 +377,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } public void setLivingArmour(ItemStack stack, LivingArmour armour, boolean forceWrite) { - NBTTagCompound livingTag = new NBTTagCompound(); + CompoundNBT livingTag = new CompoundNBT(); if (!forceWrite) { livingTag = getArmourTag(stack); @@ -389,43 +389,43 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP setArmourTag(stack, livingTag); } - public void setArmourTag(ItemStack stack, NBTTagCompound livingTag) { + public void setArmourTag(ItemStack stack, CompoundNBT livingTag) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setTag(Constants.NBT.LIVING_ARMOUR, livingTag); } public void setIsEnabled(ItemStack stack, boolean bool) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setBoolean("enabled", bool); } public boolean isEnabled(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getBoolean("enabled"); } public void setIsElytra(ItemStack stack, boolean bool) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setBoolean("elytra", bool); } public boolean isElytra(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getBoolean("elytra"); } @Nullable public static LivingArmour getLivingArmourFromStack(ItemStack stack) { - NBTTagCompound livingTag = getArmourTag(stack); + CompoundNBT livingTag = getArmourTag(stack); LivingArmour livingArmour = new LivingArmour(); livingArmour.readFromNBT(livingTag); @@ -433,12 +433,12 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP return livingArmour; } - public static NBTTagCompound getArmourTag(ItemStack stack) { + public static CompoundNBT getArmourTag(ItemStack stack) { if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getCompoundTag(Constants.NBT.LIVING_ARMOUR); } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 35261f98..de559ee6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -11,20 +11,20 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemArmor; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -38,7 +38,7 @@ import java.util.Map; import java.util.UUID; import java.util.function.Consumer; -public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMeshProvider, IMultiWillTool { +public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMeshProvider, IMultiWillTool { public static String[] names = {"helmet", "chest", "legs", "boots"}; public static double[] willBracket = new double[]{30, 200, 600, 1500, 4000, 6000, 8000, 16000}; @@ -54,15 +54,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public static double[] speedBonus = new double[]{0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4}; - public ItemSentientArmour(EntityEquipmentSlot armorType) { - super(ItemArmor.ArmorMaterial.IRON, 0, armorType); + public ItemSentientArmour(EquipmentSlotType armorType) { + super(ArmorItem.ArmorMaterial.IRON, 0, armorType); setTranslationKey(BloodMagic.MODID + ".sentientArmour."); setMaxDamage(250); setCreativeTab(BloodMagic.TAB_BM); } @Override - public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { + public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlotType slot, String type) { if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS) { switch (this.getCurrentType(stack)) { case DEFAULT: @@ -99,16 +99,16 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - if (this.armorType == EntityEquipmentSlot.CHEST) { + public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { + if (this.armorType == EquipmentSlotType.CHEST) { EnumDemonWillType type = this.getCurrentType(stack); switch (type) { case CORROSIVE: - if (player.isPotionActive(MobEffects.POISON)) { - player.removeActivePotionEffect(MobEffects.POISON); + if (player.isPotionActive(Effects.POISON)) { + player.removeActivePotionEffect(Effects.POISON); } - if (player.isPotionActive(MobEffects.WITHER)) { - player.removeActivePotionEffect(MobEffects.WITHER); + if (player.isPotionActive(Effects.WITHER)) { + player.removeActivePotionEffect(Effects.WITHER); } break; default: @@ -116,14 +116,14 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } } - public void onPlayerAttacked(ItemStack stack, DamageSource source, EntityPlayer attackedPlayer) { - if (source.getTrueSource() instanceof EntityLivingBase) { - EntityLivingBase attacker = (EntityLivingBase) source.getTrueSource(); + public void onPlayerAttacked(ItemStack stack, DamageSource source, PlayerEntity attackedPlayer) { + if (source.getTrueSource() instanceof LivingEntity) { + LivingEntity attacker = (LivingEntity) source.getTrueSource(); EnumDemonWillType type = this.getCurrentType(stack); switch (type) { case CORROSIVE: if (!source.isProjectile()) { - attacker.addPotionEffect(new PotionEffect(MobEffects.POISON, 100)); //TODO: customize duration + attacker.addPotionEffect(new EffectInstance(Effects.POISON, 100)); //TODO: customize duration } break; case DEFAULT: @@ -139,7 +139,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack stack, DamageSource source, double damage, int slot) { + public ArmorProperties getProperties(LivingEntity player, ItemStack stack, DamageSource source, double damage, int slot) { double armourReduction = 0.0; double damageAmount = 0.25; @@ -166,9 +166,9 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST) { armourReduction = 0.24 / 0.64; // This values puts it at iron level - ItemStack helmet = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - ItemStack leggings = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS); - ItemStack boots = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); + ItemStack helmet = player.getItemStackFromSlot(EquipmentSlotType.HEAD); + ItemStack leggings = player.getItemStackFromSlot(EquipmentSlotType.LEGS); + ItemStack boots = player.getItemStackFromSlot(EquipmentSlotType.FEET); if (helmet.isEmpty() || leggings.isEmpty() || boots.isEmpty()) { damageAmount *= (armourReduction); @@ -201,7 +201,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + public int getArmorDisplay(PlayerEntity player, ItemStack armor, int slot) { if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET) { return 3; } @@ -222,9 +222,9 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + public void damageArmor(LivingEntity entity, ItemStack stack, DamageSource source, int damage, int slot) { + if (entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; EnumDemonWillType type = getCurrentType(stack); @@ -241,28 +241,28 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public double getCostModifier(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("costModifier"); } public void setCostModifier(ItemStack stack, double modifier) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("costModifier", modifier); } public double getArmourModifier(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("armourModifier"); } public void setArmourModifier(ItemStack stack, double modifier) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("armourModifier", modifier); } @@ -272,7 +272,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes return super.getTranslationKey(stack) + names[3 - armorType.getIndex()]; } - public void revertArmour(EntityPlayer player, ItemStack itemStack) { + public void revertArmour(PlayerEntity player, ItemStack itemStack) { ItemStack stack = this.getContainedArmourStack(itemStack); player.setItemStackToSlot(armorType, stack); } @@ -312,9 +312,9 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); - if (slot == EntityEquipmentSlot.CHEST) { + if (slot == EquipmentSlotType.CHEST) { multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 318145), "Armor modifier", this.getHealthBonus(stack), 0)); multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(new UUID(0, 8145), "Armor modifier", this.getKnockbackResistance(stack), 0)); multimap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(new UUID(0, 94021), "Armor modifier", this.getSpeedBoost(stack), 2)); @@ -329,12 +329,12 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes return; } - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); previousArmour.writeToNBT(tag); - NBTTagCompound omegaTag = newArmour.getTagCompound(); + CompoundNBT omegaTag = newArmour.getTagCompound(); if (omegaTag == null) { - omegaTag = new NBTTagCompound(); + omegaTag = new CompoundNBT(); newArmour.setTagCompound(omegaTag); } @@ -344,12 +344,12 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } public ItemStack getContainedArmourStack(ItemStack newArmour) { - NBTTagCompound omegaTag = newArmour.getTagCompound(); + CompoundNBT omegaTag = newArmour.getTagCompound(); if (omegaTag == null) { return null; } - NBTTagCompound tag = omegaTag.getCompoundTag("armour"); + CompoundNBT tag = omegaTag.getCompoundTag("armour"); return new ItemStack(tag); } @@ -366,7 +366,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -378,7 +378,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public void setCurrentType(EnumDemonWillType type, ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @@ -391,7 +391,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes this.setCostModifier(armourStack, recurringCost); this.setCurrentType(type, armourStack); - if (this.armorType == EntityEquipmentSlot.CHEST) { + if (this.armorType == EquipmentSlotType.CHEST) { this.setArmourModifier(armourStack, getArmourModifier(type, willBracket)); this.setHealthBonus(armourStack, this.getHealthModifier(type, willBracket)); this.setKnockbackResistance(armourStack, getKnockbackModifier(type, willBracket)); @@ -459,14 +459,14 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public double getHealthBonus(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); } public void setHealthBonus(ItemStack stack, double hp) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } @@ -474,14 +474,14 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public double getKnockbackResistance(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("knockback"); } public void setKnockbackResistance(ItemStack stack, double kb) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("knockback", kb); } @@ -489,14 +489,14 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public double getSpeedBoost(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("speed"); } public void setSpeedBoost(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("speed", speed); } @@ -504,14 +504,14 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public double getDamageBoost(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("damage"); } public void setDamageBoost(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("damage", damage); } @@ -519,19 +519,19 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public double getAttackSpeedBoost(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("attackSpeed"); } public void setAttackSpeedBoost(ItemStack stack, double attackSpeed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("attackSpeed", attackSpeed); } - public static void revertAllArmour(EntityPlayer player) { + public static void revertAllArmour(PlayerEntity player) { NonNullList armourInventory = player.inventory.armorInventory; for (ItemStack stack : armourInventory) { if (stack != null && stack.getItem() instanceof ItemSentientArmour) { @@ -540,15 +540,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes } } - public static boolean convertPlayerArmour(EnumDemonWillType type, double will, EntityPlayer player) { + public static boolean convertPlayerArmour(EnumDemonWillType type, double will, PlayerEntity player) { if (!canSustainArmour(type, will)) { return false; } - ItemStack helmetStack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); - ItemStack leggingsStack = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS); - ItemStack bootsStack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); + ItemStack helmetStack = player.getItemStackFromSlot(EquipmentSlotType.HEAD); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); + ItemStack leggingsStack = player.getItemStackFromSlot(EquipmentSlotType.LEGS); + ItemStack bootsStack = player.getItemStackFromSlot(EquipmentSlotType.FEET); { ItemStack omegaHelmetStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack); @@ -556,10 +556,10 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes ItemStack omegaLeggingsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGGINGS).getSubstituteStack(type, will, leggingsStack); ItemStack omegaBootsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack); - player.setItemStackToSlot(EntityEquipmentSlot.HEAD, omegaHelmetStack); - player.setItemStackToSlot(EntityEquipmentSlot.CHEST, omegaChestStack); - player.setItemStackToSlot(EntityEquipmentSlot.LEGS, omegaLeggingsStack); - player.setItemStackToSlot(EntityEquipmentSlot.FEET, omegaBootsStack); + player.setItemStackToSlot(EquipmentSlotType.HEAD, omegaHelmetStack); + player.setItemStackToSlot(EquipmentSlotType.CHEST, omegaChestStack); + player.setItemStackToSlot(EquipmentSlotType.LEGS, omegaLeggingsStack); + player.setItemStackToSlot(EquipmentSlotType.FEET, omegaBootsStack); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java index 25cc5b0b..9715a33d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java @@ -4,24 +4,24 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAlchemyTable; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider { +public class ItemBlockAlchemyTable extends BlockItem implements IVariantProvider { public ItemBlockAlchemyTable(Block block) { super(block); } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + public boolean placeBlockAt(ItemStack stack, PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, BlockState newState) { float yaw = player.rotationYaw; - EnumFacing direction = EnumFacing.fromAngle(yaw); + Direction direction = Direction.fromAngle(yaw); if (direction.getYOffset() != 0) { return false; @@ -41,7 +41,7 @@ public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider return false; } - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); if (state.getBlock() == this.block) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileAlchemyTable) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java index f614ed34..f0e80c1d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java @@ -5,10 +5,10 @@ import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemBlockBloodTank extends ItemBlock { +public class ItemBlockBloodTank extends BlockItem { public ItemBlockBloodTank(Block block) { super(block); @@ -58,7 +58,7 @@ public class ItemBlockBloodTank extends ItemBlock { @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; @@ -72,7 +72,7 @@ public class ItemBlockBloodTank extends ItemBlock { } @Override - public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT nbt) { return new FluidHandlerItemStack(stack, getCapacity(stack)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 0d72a4a5..7aed772a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -3,18 +3,18 @@ package WayofTime.bloodmagic.item.block; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.Locale; -public class ItemBlockDemonCrystal extends ItemBlock { +public class ItemBlockDemonCrystal extends BlockItem { public ItemBlockDemonCrystal(Block block) { super(block); setHasSubtypes(true); @@ -31,7 +31,7 @@ public class ItemBlockDemonCrystal extends ItemBlock { } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + public boolean placeBlockAt(ItemStack stack, PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, BlockState newState) { if (super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState)) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileDemonCrystal) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java index 3e4218bb..242e2974 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java @@ -1,27 +1,22 @@ package WayofTime.bloodmagic.item.block; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; +import net.minecraft.tileentity.ChestTileEntity; +import net.minecraft.util.*; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.block.BlockMimic; import WayofTime.bloodmagic.tile.TileMimic; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; -import WayofTime.bloodmagic.util.ChatUtil; - public class ItemBlockMimic extends ItemBlockEnum { public ItemBlockMimic(BlockEnum block) { super(block); @@ -29,7 +24,7 @@ public class ItemBlockMimic extends ItemBlockEnum { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); //If not sneaking, do normal item use @@ -40,12 +35,12 @@ public class ItemBlockMimic extends ItemBlockEnum { //IF sneaking and player has permission, replace the targeted block if (player.canPlayerEdit(pos, facing, stack)) { //Store information about the block being replaced and its appropriate itemstack - IBlockState replacedBlockstate = world.getBlockState(pos); + BlockState replacedBlockstate = world.getBlockState(pos); Block replacedBlock = replacedBlockstate.getBlock(); ItemStack replacedStack = replacedBlock.getItem(world, pos, replacedBlockstate); //Get the state for the mimic - IBlockState mimicBlockstate = this.getBlock().getStateFromMeta(stack.getMetadata()); + BlockState mimicBlockstate = this.getBlock().getStateFromMeta(stack.getMetadata()); //Check if the block can be replaced @@ -57,13 +52,13 @@ public class ItemBlockMimic extends ItemBlockEnum { //Check if the tile entity, if any, can be replaced TileEntity tileReplaced = world.getTileEntity(pos); if (!canReplaceTile(tileReplaced)) { - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } //If tile can be replaced, store info about the tile - NBTTagCompound tileTag = getTagFromTileEntity(tileReplaced); + CompoundNBT tileTag = getTagFromTileEntity(tileReplaced); if (tileReplaced != null) { - NBTTagCompound voidTag = new NBTTagCompound(); + CompoundNBT voidTag = new CompoundNBT(); voidTag.setInteger("x", pos.getX()); voidTag.setInteger("y", pos.getY()); voidTag.setInteger("z", pos.getZ()); @@ -93,27 +88,27 @@ public class ItemBlockMimic extends ItemBlockEnum { mimic.dropItemsOnBreak = false; } } - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } public boolean canReplaceTile(TileEntity tile) { - if (tile instanceof TileEntityChest) { + if (tile instanceof ChestTileEntity) { return true; } return tile == null; } - public boolean canReplaceBlock(World world, BlockPos pos, IBlockState state) { + public boolean canReplaceBlock(World world, BlockPos pos, BlockState state) { return state.getBlockHardness(world, pos) != -1.0F; } - public NBTTagCompound getTagFromTileEntity(TileEntity tile) { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT getTagFromTileEntity(TileEntity tile) { + CompoundNBT tag = new CompoundNBT(); if (tile != null) { return tile.writeToNBT(tag); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java index c7555739..4739bec2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.block.base; import WayofTime.bloodmagic.block.base.BlockEnum; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.MathHelper; -public class ItemBlockEnum & IStringSerializable> extends ItemBlock { +public class ItemBlockEnum & IStringSerializable> extends BlockItem { public ItemBlockEnum(BlockEnum block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java index 1797aa60..20f656cd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.block.base; import WayofTime.bloodmagic.block.base.BlockInteger; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -public class ItemBlockInteger extends ItemBlock { +public class ItemBlockInteger extends BlockItem { public ItemBlockInteger(BlockInteger block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 9c01900b..116c1c22 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -11,35 +11,35 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemArmor; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import javax.annotation.Nonnull; import java.util.List; -public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, IItemLPContainer, IVariantProvider { +public class ItemPackSacrifice extends ArmorItem implements IAltarManipulator, IItemLPContainer, IVariantProvider { public final int CAPACITY = 10000; // Max LP storage public ItemPackSacrifice() { - super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST); + super(ArmorMaterial.CHAIN, 0, EquipmentSlotType.CHEST); setTranslationKey(BloodMagic.MODID + ".pack.sacrifice"); setCreativeTab(BloodMagic.TAB_BM); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (world.isRemote) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); RayTraceResult rayTrace = this.rayTrace(world, player, false); @@ -56,11 +56,11 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I } } - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); } @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { if (getStoredLP(stack) > CAPACITY) setStoredLP(stack, CAPACITY); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index cc15fe1f..4c70b592 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -12,21 +12,21 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemArmor; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import javax.annotation.Nonnull; import java.util.List; -public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulator, IItemLPContainer, IVariantProvider { +public class ItemPackSelfSacrifice extends ArmorItem implements IAltarManipulator, IItemLPContainer, IVariantProvider { /** * How much LP per half heart */ @@ -45,17 +45,17 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato public final float HEALTHREQ = 0.5f; public ItemPackSelfSacrifice() { - super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST); + super(ArmorMaterial.CHAIN, 0, EquipmentSlotType.CHEST); setTranslationKey(BloodMagic.MODID + ".pack.selfSacrifice"); setCreativeTab(BloodMagic.TAB_BM); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (world.isRemote) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); RayTraceResult position = this.rayTrace(world, player, false); @@ -72,11 +72,11 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato } } - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); } @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { if (world.isRemote || player.capabilities.isCreativeMode) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java index ed9d22cf..d4608ab9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.item.inventory; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.container.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -13,9 +13,9 @@ public class ContainerHolding extends Container { public final InventoryHolding inventoryHolding; private final int PLAYER_INVENTORY_ROWS = 3; private final int PLAYER_INVENTORY_COLUMNS = 9; - private final EntityPlayer player; + private final PlayerEntity player; - public ContainerHolding(EntityPlayer player, InventoryHolding inventoryHolding) { + public ContainerHolding(PlayerEntity player, InventoryHolding inventoryHolding) { this.player = player; this.inventoryHolding = inventoryHolding; int currentSlotHeldIn = player.inventory.currentItem; @@ -40,12 +40,12 @@ public class ContainerHolding extends Container { } @Override - public boolean canInteractWith(EntityPlayer entityPlayer) { + public boolean canInteractWith(PlayerEntity entityPlayer) { return true; } @Override - public void onContainerClosed(EntityPlayer entityPlayer) { + public void onContainerClosed(PlayerEntity entityPlayer) { super.onContainerClosed(entityPlayer); if (!entityPlayer.getEntityWorld().isRemote) { @@ -63,7 +63,7 @@ public class ContainerHolding extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + public ItemStack transferStackInSlot(PlayerEntity entityPlayer, int slotIndex) { ItemStack stack = ItemStack.EMPTY; Slot slotObject = inventorySlots.get(slotIndex); int slots = inventorySlots.size(); @@ -106,15 +106,15 @@ public class ContainerHolding extends Container { return stack; } - public void saveInventory(EntityPlayer entityPlayer) { + public void saveInventory(PlayerEntity entityPlayer) { inventoryHolding.onGuiSaved(entityPlayer); } private class SlotHolding extends Slot { - private final EntityPlayer player; + private final PlayerEntity player; private ContainerHolding containerHolding; - public SlotHolding(ContainerHolding containerHolding, IInventory inventory, EntityPlayer player, int slotIndex, int x, int y) { + public SlotHolding(ContainerHolding containerHolding, IInventory inventory, PlayerEntity player, int slotIndex, int x, int y) { super(inventory, slotIndex, x, y); this.player = player; this.containerHolding = containerHolding; @@ -146,7 +146,7 @@ public class ContainerHolding extends Container { } @Override - public boolean canTakeStack(EntityPlayer player) { + public boolean canTakeStack(PlayerEntity player) { return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java index 133d341e..a6eb1973 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java @@ -4,9 +4,9 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import java.util.UUID; @@ -17,7 +17,7 @@ public class InventoryHolding extends ItemInventory { super(itemStack, ItemSigilHolding.inventorySize, "SigilOfHolding"); } - public void onGuiSaved(EntityPlayer entityPlayer) { + public void onGuiSaved(PlayerEntity entityPlayer) { masterStack = findParentStack(entityPlayer); if (!masterStack.isEmpty()) { @@ -25,7 +25,7 @@ public class InventoryHolding extends ItemInventory { } } - public ItemStack findParentStack(EntityPlayer entityPlayer) { + public ItemStack findParentStack(PlayerEntity entityPlayer) { if (Utils.hasUUID(masterStack)) { UUID parentStackUUID = new UUID(masterStack.getTagCompound().getLong(Constants.NBT.MOST_SIG), masterStack.getTagCompound().getLong(Constants.NBT.LEAST_SIG)); for (int i = 0; i < entityPlayer.inventory.getSizeInventory(); i++) { @@ -43,10 +43,10 @@ public class InventoryHolding extends ItemInventory { } public void save() { - NBTTagCompound nbtTagCompound = masterStack.getTagCompound(); + CompoundNBT nbtTagCompound = masterStack.getTagCompound(); if (nbtTagCompound == null) { - nbtTagCompound = new NBTTagCompound(); + nbtTagCompound = new CompoundNBT(); UUID uuid = UUID.randomUUID(); nbtTagCompound.setLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java index 0a08e330..329f5aea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java @@ -2,14 +2,14 @@ package WayofTime.bloodmagic.item.inventory; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; public class ItemInventory implements IInventory { protected int[] syncedSlots = new int[0]; @@ -43,13 +43,13 @@ public class ItemInventory implements IInventory { return false; } - public void readFromNBT(NBTTagCompound tagCompound) { - NBTTagList tags = tagCompound.getTagList(Constants.NBT.ITEMS, 10); + public void readFromNBT(CompoundNBT tagCompound) { + ListNBT tags = tagCompound.getTagList(Constants.NBT.ITEMS, 10); inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - NBTTagCompound data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompoundTagAt(i); byte j = data.getByte(Constants.NBT.SLOT); if (j >= 0 && j < inventory.size()) { @@ -59,12 +59,12 @@ public class ItemInventory implements IInventory { } } - public void writeToNBT(NBTTagCompound tagCompound) { - NBTTagList tags = new NBTTagList(); + public void writeToNBT(CompoundNBT tagCompound) { + ListNBT tags = new ListNBT(); for (int i = 0; i < inventory.size(); i++) { if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) { - NBTTagCompound data = new NBTTagCompound(); + CompoundNBT data = new CompoundNBT(); data.setByte(Constants.NBT.SLOT, (byte) i); inventory.get(i).writeToNBT(data); tags.appendTag(data); @@ -77,7 +77,7 @@ public class ItemInventory implements IInventory { public void readFromStack(ItemStack masterStack) { if (masterStack != null) { NBTHelper.checkNBT(masterStack); - NBTTagCompound tag = masterStack.getTagCompound(); + CompoundNBT tag = masterStack.getTagCompound(); readFromNBT(tag.getCompoundTag(Constants.NBT.ITEM_INVENTORY)); } } @@ -85,8 +85,8 @@ public class ItemInventory implements IInventory { public void writeToStack(ItemStack masterStack) { if (masterStack != null) { NBTHelper.checkNBT(masterStack); - NBTTagCompound tag = masterStack.getTagCompound(); - NBTTagCompound invTag = new NBTTagCompound(); + CompoundNBT tag = masterStack.getTagCompound(); + CompoundNBT invTag = new CompoundNBT(); writeToNBT(invTag); tag.setTag(Constants.NBT.ITEM_INVENTORY, invTag); } @@ -152,17 +152,17 @@ public class ItemInventory implements IInventory { } @Override - public boolean isUsableByPlayer(EntityPlayer player) { + public boolean isUsableByPlayer(PlayerEntity player) { return true; } @Override - public void openInventory(EntityPlayer player) { + public void openInventory(PlayerEntity player) { } @Override - public void closeInventory(EntityPlayer player) { + public void closeInventory(PlayerEntity player) { } @@ -203,7 +203,7 @@ public class ItemInventory implements IInventory { @Override public ITextComponent getDisplayName() { - return new TextComponentString(getName()); + return new StringTextComponent(getName()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 1a263103..45a7f63d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -9,7 +9,7 @@ import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -41,7 +41,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 4ea9be03..6665b7fd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -10,16 +10,16 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +40,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); BlockPos coords = getBlockPos(stack); if (coords != null && tag != null) { @@ -49,10 +49,10 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi } @Override - public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { + public ActionResultType onItemUseFirst(PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (world.isRemote) { - return EnumActionResult.PASS; + return ActionResultType.PASS; } TileEntity tileHit = world.getTileEntity(pos); @@ -62,17 +62,17 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi BlockPos containedPos = getBlockPos(stack); if (!containedPos.equals(BlockPos.ORIGIN)) { this.setBlockPos(stack, BlockPos.ORIGIN); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.remove"), true); - return EnumActionResult.FAIL; + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.remove"), true); + return ActionResultType.FAIL; } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } IRoutingNode node = (IRoutingNode) tileHit; BlockPos containedPos = getBlockPos(stack); if (containedPos.equals(BlockPos.ORIGIN)) { this.setBlockPos(stack, pos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.set"), true); - return EnumActionResult.SUCCESS; + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.set"), true); + return ActionResultType.SUCCESS; } else { TileEntity pastTile = world.getTileEntity(containedPos); if (pastTile instanceof IRoutingNode) { @@ -87,16 +87,16 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi master.addConnection(pos, containedPos); master.addNodeToList(node); node.addConnection(containedPos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link.master"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } else { master.addConnection(pos, containedPos); node.addConnection(containedPos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link.master"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } else if (node instanceof IMasterRoutingNode) { @@ -109,16 +109,16 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi master.addConnection(pos, containedPos); pastNode.addConnection(pos); master.addNodeToList(pastNode); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link.master"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } else { master.addConnection(pos, containedPos); pastNode.addConnection(pos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link.master"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } else { //Both nodes are not master nodes, so normal linking @@ -132,9 +132,9 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi } pastNode.addConnection(pos); node.addConnection(containedPos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link.master"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } else if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //pastNode is not connected to a master, but node is { TileEntity tile = world.getTileEntity(node.getMasterPos()); @@ -146,9 +146,9 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi } pastNode.addConnection(pos); node.addConnection(containedPos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } else if (node.getMasterPos().equals(BlockPos.ORIGIN)) //node is not connected to a master, but pastNode is { TileEntity tile = world.getTileEntity(pastNode.getMasterPos()); @@ -160,18 +160,18 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi } pastNode.addConnection(pos); node.addConnection(containedPos); - player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.routing.link"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link"), true); this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } else { this.setBlockPos(stack, BlockPos.ORIGIN); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } } } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } @Override @@ -186,7 +186,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { NBTHelper.checkNBT(stack); - NBTTagCompound itemTag = stack.getTagCompound(); + CompoundNBT itemTag = stack.getTagCompound(); itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index 70e55aec..b5f1da4e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -8,7 +8,7 @@ import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -40,7 +40,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index da71b84d..e849c0c5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -7,12 +7,12 @@ import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.Effects; +import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.*; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -23,12 +23,12 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); boolean unusable = isUnusable(stack); if (world.isRemote && !unusable) { @@ -59,8 +59,8 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP } @Override - public boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, EntityLivingBase attacker, EntityLivingBase target) { - target.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 200, 0)); + public boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, LivingEntity attacker, LivingEntity target) { + target.addPotionEffect(new EffectInstance(Effects.LEVITATION, 200, 0)); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 957187bc..db5c1c32 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -8,7 +8,7 @@ import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.*; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; @@ -27,12 +27,12 @@ public class ItemSigilBloodLight extends ItemSigilBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); RayTraceResult mop = this.rayTrace(world, player, false); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java index a209952d..9e6359d9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.world.World; public class ItemSigilBounce extends ItemSigilToggleableBase { @@ -13,10 +13,10 @@ public class ItemSigilBounce extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOUNCE, 2, 0, true, false)); + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.BOUNCE, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java index 49358bcd..d69e9a40 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.world.World; public class ItemSigilClaw extends ItemSigilToggleableBase { @@ -13,10 +13,10 @@ public class ItemSigilClaw extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.CLING, 2, 0, true, false)); + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.CLING, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index 1359167a..e0cb5d17 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.compress.CompressionRegistry; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -16,7 +16,7 @@ public class ItemSigilCompression extends ItemSigilToggleableBase { // TODO for now, there is a semi-working system in place @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; @@ -24,7 +24,7 @@ public class ItemSigilCompression extends ItemSigilToggleableBase { ItemStack compressedStack = CompressionRegistry.compressInventory(player.inventory.mainInventory.toArray(new ItemStack[player.inventory.mainInventory.size()]), world); if (compressedStack != null) { - EntityItem entityItem = new EntityItem(world, player.posX, player.posY, player.posZ, compressedStack); + ItemEntity entityItem = new ItemEntity(world, player.posX, player.posY, player.posZ, compressedStack); world.spawnEntity(entityItem); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index a25a5122..89f8663c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -7,11 +7,11 @@ import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import com.google.common.collect.Lists; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import java.util.List; @@ -23,12 +23,12 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); if (!world.isRemote) { super.onItemRightClick(world, player, hand); @@ -38,8 +38,8 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); List toSend = Lists.newArrayList(); if (!binding.getOwnerId().equals(player.getGameProfile().getId())) - toSend.add(new TextComponentTranslation(tooltipBase + "otherNetwork", binding.getOwnerName())); - toSend.add(new TextComponentTranslation(tooltipBase + "currentEssence", currentEssence)); + toSend.add(new TranslationTextComponent(tooltipBase + "otherNetwork", binding.getOwnerName())); + toSend.add(new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence)); ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index 8de0be57..96061711 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; public class ItemSigilElementalAffinity extends ItemSigilToggleableBase { @@ -13,13 +13,13 @@ public class ItemSigilElementalAffinity extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; player.fallDistance = 0; player.extinguish(); - player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 2, 1, true, false)); - player.addPotionEffect(new PotionEffect(MobEffects.WATER_BREATHING, 2, 0, true, false)); + player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 2, 1, true, false)); + player.addPotionEffect(new EffectInstance(Effects.WATER_BREATHING, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index 8b445fe3..26855657 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.monster.EndermanEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.world.World; import java.util.List; @@ -17,14 +17,14 @@ public class ItemSigilEnderSeverance extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; List entityList = world.getEntitiesWithinAABB(Entity.class, new net.minecraft.util.math.AxisAlignedBB(player.posX - 4.5, player.posY - 4.5, player.posZ - 4.5, player.posX + 4.5, player.posY + 4.5, player.posZ + 4.5)); for (Entity entity : entityList) { - if (entity instanceof EntityEnderman) - ((EntityEnderman) entity).addPotionEffect(new PotionEffect(RegistrarBloodMagic.PLANAR_BINDING, 40, 0)); + if (entity instanceof EndermanEntity) + ((EndermanEntity) entity).addPotionEffect(new EffectInstance(RegistrarBloodMagic.PLANAR_BINDING, 40, 0)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 090dc98b..bedc2c06 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -18,10 +18,10 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(MobEffects.HASTE, 2, 1, true, false)); + player.addPotionEffect(new EffectInstance(Effects.HASTE, 2, 1, true, false)); } @Override @@ -31,10 +31,10 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase { int potionPotency = 2; AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); - for (EntityPlayer player : playerList) { - if (!player.isPotionActive(MobEffects.HASTE) || (player.isPotionActive(MobEffects.HASTE) && player.getActivePotionEffect(MobEffects.HASTE).getAmplifier() < potionPotency)) { - player.addPotionEffect(new PotionEffect(MobEffects.HASTE, ticks, potionPotency)); + List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, bb); + for (PlayerEntity player : playerList) { + if (!player.isPotionActive(Effects.HASTE) || (player.isPotionActive(Effects.HASTE) && player.getActivePotionEffect(Effects.HASTE).getAmplifier() < potionPotency)) { + player.addPotionEffect(new EffectInstance(Effects.HASTE, ticks, potionPotency)); if (!player.capabilities.isCreativeMode) { player.hurtResistantTime = 0; player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java index a79affe5..67a0d430 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -12,7 +12,7 @@ public class ItemSigilFilledHand extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; GenericHandler.filledHandMapMap.get(world).put(player, 4); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java index ac1ef35b..f9ef8238 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java @@ -8,13 +8,13 @@ import WayofTime.bloodmagic.util.SigilFluidWrapper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -57,8 +57,8 @@ public abstract class ItemSigilFluidBase extends ItemSigilBase implements ISigil * This one is literally identical to the FluidUtil method of the same signature. */ @Nullable - protected IFluidHandler getFluidHandler(World world, BlockPos blockPos, @Nullable EnumFacing side) { - IBlockState state = world.getBlockState(blockPos); + protected IFluidHandler getFluidHandler(World world, BlockPos blockPos, @Nullable Direction side) { + BlockState state = world.getBlockState(blockPos); Block block = state.getBlock(); TileEntity tile = world.getTileEntity(blockPos); if (tile != null) { @@ -96,7 +96,7 @@ public abstract class ItemSigilFluidBase extends ItemSigilBase implements ISigil * This is the big troublesome one, oddly enough. * It's genericized in case anyone wants to create variant sigils with weird fluids. */ - protected boolean tryPlaceSigilFluid(EntityPlayer player, World world, BlockPos blockPos) { + protected boolean tryPlaceSigilFluid(PlayerEntity player, World world, BlockPos blockPos) { //Make sure world coordinants are valid if (world == null || blockPos == null) { @@ -109,7 +109,7 @@ public abstract class ItemSigilFluidBase extends ItemSigilBase implements ISigil } //Check if the block is an air block or otherwise replaceable - IBlockState state = world.getBlockState(blockPos); + BlockState state = world.getBlockState(blockPos); Material mat = state.getMaterial(); boolean isDestSolid = mat.isSolid(); boolean isDestReplaceable = state.getBlock().isReplaceable(world, blockPos); @@ -171,7 +171,7 @@ public abstract class ItemSigilFluidBase extends ItemSigilBase implements ISigil } @Override - public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT nbt) { return new SigilFluidWrapper(stack, this); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java index 23e6bfa8..0f4b8118 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.enchantment.EnchantmentFrostWalker; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.enchantment.FrostWalkerEnchantment; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -12,10 +12,10 @@ public class ItemSigilFrost extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - EnchantmentFrostWalker.freezeNearby(player, world, player.getPosition(), 1); + FrostWalkerEnchantment.freezeNearby(player, world, player.getPosition(), 1); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 8f479995..41faf9ba 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -5,11 +5,11 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.block.IGrowable; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -22,7 +22,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase { } @Override - public boolean onSigilUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onSigilUse(ItemStack stack, PlayerEntity player, World world, BlockPos blockPos, Direction side, float hitX, float hitY, float hitZ) { if (PlayerHelper.isFakePlayer(player)) return false; @@ -37,7 +37,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World worldIn, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World worldIn, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; @@ -51,15 +51,15 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase { for (int iz = posZ - range; iz <= posZ + range; iz++) { for (int iy = posY - verticalRange; iy <= posY + verticalRange; iy++) { BlockPos blockPos = new BlockPos(ix, iy, iz); - IBlockState state = worldIn.getBlockState(blockPos); + BlockState state = worldIn.getBlockState(blockPos); if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { if (state.getBlock() instanceof IGrowable) { if (worldIn.rand.nextInt(50) == 0) { - IBlockState preBlockState = worldIn.getBlockState(blockPos); + BlockState preBlockState = worldIn.getBlockState(blockPos); state.getBlock().updateTick(worldIn, blockPos, state, worldIn.rand); - IBlockState newState = worldIn.getBlockState(blockPos); + BlockState newState = worldIn.getBlockState(blockPos); if (!newState.equals(preBlockState) && !worldIn.isRemote) worldIn.playEvent(2005, blockPos, 0); } @@ -70,10 +70,10 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase { } } - private boolean applyBonemeal(World worldIn, BlockPos target, EntityPlayer player, ItemStack sigilStack) { - IBlockState iblockstate = worldIn.getBlockState(target); + private boolean applyBonemeal(World worldIn, BlockPos target, PlayerEntity player, ItemStack sigilStack) { + BlockState iblockstate = worldIn.getBlockState(target); - BonemealEvent event = new BonemealEvent(player, worldIn, target, iblockstate, EnumHand.MAIN_HAND, sigilStack); + BonemealEvent event = new BonemealEvent(player, worldIn, target, iblockstate, Hand.MAIN_HAND, sigilStack); if (MinecraftForge.EVENT_BUS.post(event)) return false; else if (event.getResult() == Result.ALLOW) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index 06d6de8e..ddd1937e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.world.World; public class ItemSigilHaste extends ItemSigilToggleableBase { @@ -13,10 +13,10 @@ public class ItemSigilHaste extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOOST, 2, 0, true, false)); + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.BOOST, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 7238a07d..18a8c3a8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -15,13 +15,13 @@ import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -41,7 +41,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } @Override - public void onKeyPressed(ItemStack stack, EntityPlayer player, KeyBindings key, boolean showInChat) { + public void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat) { if (stack == player.getHeldItemMainhand() && stack.getItem() instanceof ItemSigilHolding && key.equals(KeyBindings.OPEN_HOLDING)) { Utils.setUUID(stack); player.openGui(BloodMagic.instance, Constants.Gui.SIGIL_HOLDING_GUI, player.getEntityWorld(), (int) player.posX, (int) player.posY, (int) player.posZ); @@ -84,62 +84,62 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (PlayerHelper.isFakePlayer(player)) - return EnumActionResult.FAIL; + return ActionResultType.FAIL; int currentSlot = getCurrentItemOrdinal(stack); List inv = getInternalInventory(stack); ItemStack itemUsing = inv.get(currentSlot); if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) - return EnumActionResult.PASS; + return ActionResultType.PASS; - EnumActionResult result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); + ActionResultType result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); saveInventory(stack, inv); return result; } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); int currentSlot = getCurrentItemOrdinal(stack); List inv = getInternalInventory(stack); ItemStack itemUsing = inv.get(currentSlot); if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) - return ActionResult.newResult(EnumActionResult.PASS, stack); + return ActionResult.newResult(ActionResultType.PASS, stack); itemUsing.getItem().onItemRightClick(world, player, hand); saveInventory(stack, inv); - return ActionResult.newResult(EnumActionResult.PASS, stack); + return ActionResult.newResult(ActionResultType.PASS, stack); } @Nonnull @Override - public ItemStack getHeldItem(ItemStack holdingStack, EntityPlayer player) { + public ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player) { return getInternalInventory(holdingStack).get(getCurrentItemOrdinal(holdingStack)); } public void saveInventory(ItemStack itemStack, List inventory) { - NBTTagCompound itemTag = itemStack.getTagCompound(); + CompoundNBT itemTag = itemStack.getTagCompound(); if (itemTag == null) - itemStack.setTagCompound(itemTag = new NBTTagCompound()); + itemStack.setTagCompound(itemTag = new CompoundNBT()); - NBTTagCompound inventoryTag = new NBTTagCompound(); - NBTTagList itemList = new NBTTagList(); + CompoundNBT inventoryTag = new CompoundNBT(); + ListNBT itemList = new ListNBT(); for (int i = 0; i < inventorySize; i++) { if (!inventory.get(i).isEmpty()) { - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); tag.setByte(Constants.NBT.SLOT, (byte) i); inventory.get(i).writeToNBT(tag); itemList.appendTag(tag); @@ -241,14 +241,14 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl public static List getInternalInventory(ItemStack stack) { initModeTag(stack); - NBTTagCompound tagCompound = stack.getTagCompound(); + CompoundNBT tagCompound = stack.getTagCompound(); if (tagCompound == null) { return NonNullList.withSize(inventorySize, ItemStack.EMPTY); } - NBTTagCompound inventoryTag = tagCompound.getCompoundTag(Constants.NBT.ITEM_INVENTORY); - NBTTagList tagList = inventoryTag.getTagList(Constants.NBT.ITEMS, 10); + CompoundNBT inventoryTag = tagCompound.getCompoundTag(Constants.NBT.ITEM_INVENTORY); + ListNBT tagList = inventoryTag.getTagList(Constants.NBT.ITEMS, 10); if (tagList.isEmpty()) { return NonNullList.withSize(inventorySize, ItemStack.EMPTY); @@ -257,7 +257,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl List inv = NonNullList.withSize(inventorySize, ItemStack.EMPTY); for (int i = 0; i < tagList.tagCount(); i++) { - NBTTagCompound data = tagList.getCompoundTagAt(i); + CompoundNBT data = tagList.getCompoundTagAt(i); byte j = data.getByte(Constants.NBT.SLOT); if (j >= 0 && j < inv.size()) { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 2c235b1a..9d259798 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -4,11 +4,11 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -24,18 +24,18 @@ public class ItemSigilLava extends ItemSigilFluidBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); if (!world.isRemote && !isUnusable(stack)) { RayTraceResult rayTrace = this.rayTrace(world, player, false); if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { - return ActionResult.newResult(EnumActionResult.PASS, stack); + return ActionResult.newResult(ActionResultType.PASS, stack); } BlockPos blockPos = rayTrace.getBlockPos(); @@ -47,21 +47,21 @@ public class ItemSigilLava extends ItemSigilFluidBase { if (destination != null && tryInsertSigilFluid(destination, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { boolean result = tryInsertSigilFluid(destination, true); if (result) - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } //Do the same as above, but use sidedness to interact with the fluid handler. IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { boolean result = tryInsertSigilFluid(destinationSide, true); if (result) - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } //Case for if block at blockPos is not a tank //Place fluid in world if (destination == null && destinationSide == null) { BlockPos targetPos = blockPos.offset(rayTrace.sideHit); if (tryPlaceSigilFluid(player, world, targetPos) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index 93d66134..6bf62a91 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.item.ExperienceOrbEntity; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; @@ -16,7 +16,7 @@ public class ItemSigilMagnetism extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; @@ -25,16 +25,16 @@ public class ItemSigilMagnetism extends ItemSigilToggleableBase { float posX = Math.round(player.posX); float posY = (float) (player.posY - player.getEyeHeight()); float posZ = Math.round(player.posZ); - List entities = player.getEntityWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); - List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); + List entities = player.getEntityWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); + List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(ExperienceOrbEntity.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); - for (EntityItem entity : entities) { + for (ItemEntity entity : entities) { if (entity != null && !world.isRemote && !entity.isDead) { entity.onCollideWithPlayer(player); } } - for (EntityXPOrb xpOrb : xpOrbs) { + for (ExperienceOrbEntity xpOrb : xpOrbs) { if (xpOrb != null && !world.isRemote) { xpOrb.onCollideWithPlayer(player); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index 856a971e..5edc3928 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import com.google.common.base.Predicate; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { - public static final Predicate IS_PHANTOM_ACTIVE = (Entity entity) -> entity instanceof EntityPlayer && isPhantomActive((EntityPlayer) entity); + public static final Predicate IS_PHANTOM_ACTIVE = (Entity entity) -> entity instanceof PlayerEntity && isPhantomActive((PlayerEntity) entity); public static final String[] CIRCLE7X7 = new String[]{ " XXX ", @@ -52,14 +52,14 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { // <--X }; - private Map> prevPositionMap = new HashMap<>(); + private Map> prevPositionMap = new HashMap<>(); public ItemSigilPhantomBridge() { super("phantom_bridge", 100); } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; @@ -197,7 +197,7 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { } } - public static boolean isPhantomActive(EntityPlayer entity) { + public static boolean isPhantomActive(PlayerEntity entity) { for (int i = 0; i < entity.inventory.getSizeInventory(); i++) { ItemStack stack = entity.inventory.getStackInSlot(i); if (stack.getItem() instanceof ItemSigilPhantomBridge) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 16783af4..686e57eb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -16,7 +16,7 @@ public class ItemSigilSuppression extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; @@ -34,7 +34,7 @@ public class ItemSigilSuppression extends ItemSigilToggleableBase { } BlockPos blockPos = new BlockPos(x + i, y + j, z + k); - IBlockState state = world.getBlockState(blockPos); + BlockState state = world.getBlockState(blockPos); if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 7d25804c..4303d3fd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -9,14 +9,14 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; @@ -48,12 +48,12 @@ public class ItemSigilTeleposition extends ItemSigilBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); TeleportLocation location = getTeleportLocation(stack); Binding binding = getBinding(stack); @@ -78,21 +78,21 @@ public class ItemSigilTeleposition extends ItemSigilBase { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return EnumActionResult.FAIL; + return ActionResultType.FAIL; if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) { if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) { TeleportLocation teleportLocation = new TeleportLocation(world.provider.getDimension(), pos); updateLocation(stack, teleportLocation); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } @Nullable @@ -103,7 +103,7 @@ public class ItemSigilTeleposition extends ItemSigilBase { if (!stack.hasTagCompound()) return null; - NBTTagCompound locationTag = stack.getSubCompound("tplocation"); + CompoundNBT locationTag = stack.getSubCompound("tplocation"); if (locationTag == null) return null; @@ -111,16 +111,16 @@ public class ItemSigilTeleposition extends ItemSigilBase { } public void updateLocation(ItemStack stack, TeleportLocation location) { - NBTTagCompound tagCompound; + CompoundNBT tagCompound; if (!stack.hasTagCompound()) - stack.setTagCompound(tagCompound = new NBTTagCompound()); + stack.setTagCompound(tagCompound = new CompoundNBT()); else tagCompound = stack.getTagCompound(); tagCompound.setTag("tplocation", location.serializeNBT()); } - public static class TeleportLocation implements INBTSerializable { + public static class TeleportLocation implements INBTSerializable { private int dim; private BlockPos pos; @@ -138,20 +138,20 @@ public class ItemSigilTeleposition extends ItemSigilBase { } @Override - public NBTTagCompound serializeNBT() { - NBTTagCompound tag = new NBTTagCompound(); + public CompoundNBT serializeNBT() { + CompoundNBT tag = new CompoundNBT(); tag.setInteger("dim", dim); tag.setLong("pos", pos.toLong()); return tag; } @Override - public void deserializeNBT(NBTTagCompound nbt) { + public void deserializeNBT(CompoundNBT nbt) { this.dim = nbt.getInteger("dim"); this.pos = BlockPos.fromLong(nbt.getLong("pos")); } - public static TeleportLocation fromTag(NBTTagCompound tpTag) { + public static TeleportLocation fromTag(CompoundNBT tpTag) { TeleportLocation location = new TeleportLocation(); location.deserializeNBT(tpTag); return location; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java index 4a354186..bb21d6d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java @@ -9,13 +9,13 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,12 +44,12 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); if (!world.isRemote && !isUnusable(stack)) { if (player.isSneaking()) @@ -62,35 +62,35 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); Binding binding = getBinding(stack); if (binding == null || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while toggling state - return EnumActionResult.PASS; + return ActionResultType.PASS; - return onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ) ? ActionResultType.SUCCESS : ActionResultType.FAIL; } - public boolean onSigilUse(ItemStack itemStack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onSigilUse(ItemStack itemStack, PlayerEntity player, World world, BlockPos blockPos, Direction side, float hitX, float hitY, float hitZ) { return false; } @Override public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { - if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) { + if (!worldIn.isRemote && entityIn instanceof ServerPlayerEntity && getActivated(stack)) { if (entityIn.ticksExisted % 100 == 0) { - if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((EntityPlayer) entityIn, SoulTicket.item(stack, worldIn, entityIn, getLpUsed())).isSuccess()) { + if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((PlayerEntity) entityIn, SoulTicket.item(stack, worldIn, entityIn, getLpUsed())).isSuccess()) { setActivatedState(stack, false); } } - onSigilUpdate(stack, worldIn, (EntityPlayer) entityIn, itemSlot, isSelected); + onSigilUpdate(stack, worldIn, (PlayerEntity) entityIn, itemSlot, isSelected); } } - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index ce7517a9..190e8b98 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -37,7 +37,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes if (!stack.hasTagCompound()) return; - tooltip.add(new TextComponentTranslation("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated")).getFormattedText()); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated")).getFormattedText()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index 4cba37ed..a2dc3b3d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -5,14 +5,14 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -35,7 +35,7 @@ public class ItemSigilTransposition extends ItemSigilBase { if (!stack.hasTagCompound()) return; - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (tag.hasKey("stored")) { tooltip.add(" "); @@ -49,7 +49,7 @@ public class ItemSigilTransposition extends ItemSigilBase { if (!stack.hasTagCompound()) return super.getItemStackDisplayName(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (tag.hasKey("stored")) return super.getItemStackDisplayName(stack) + " (" + tag.getCompoundTag("stored").getString("display") + ")"; @@ -57,32 +57,32 @@ public class ItemSigilTransposition extends ItemSigilBase { } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos blockPos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return EnumActionResult.FAIL; + return ActionResultType.FAIL; - IBlockState state = world.getBlockState(blockPos); + BlockState state = world.getBlockState(blockPos); if (!world.isRemote) { if (BloodMagicAPI.INSTANCE.getBlacklist().getTransposition().contains(state)) - return EnumActionResult.FAIL; + return ActionResultType.FAIL; if (player.isSneaking() && stack.hasTagCompound() && !stack.getTagCompound().hasKey("stored")) { if (state.getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && state.getBlockHardness(world, blockPos) >= 0) { int cost = getLpUsed(); - NBTTagCompound stored = new NBTTagCompound(); - stored.setTag("state", NBTUtil.writeBlockState(new NBTTagCompound(), state)); + CompoundNBT stored = new CompoundNBT(); + stored.setTag("state", NBTUtil.writeBlockState(new CompoundNBT(), state)); stored.setString("display", state.getBlock().getPickBlock(state, null, world, blockPos, player).getDisplayName()); if (state.getBlock().hasTileEntity(state)) { TileEntity tile = world.getTileEntity(blockPos); if (tile != null) { cost *= 5; - stored.setTag("tileData", tile.writeToNBT(new NBTTagCompound())); + stored.setTag("tileData", tile.writeToNBT(new CompoundNBT())); - if (world.getTileEntity(blockPos) instanceof TileEntityMobSpawner) + if (world.getTileEntity(blockPos) instanceof MobSpawnerTileEntity) cost *= 6; } } @@ -91,13 +91,13 @@ public class ItemSigilTransposition extends ItemSigilBase { NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, cost)); world.removeTileEntity(blockPos); world.setBlockToAir(blockPos); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } else if (stack.hasTagCompound() && stack.getTagCompound().hasKey("stored")) { - IBlockState worldState = world.getBlockState(blockPos); - NBTTagCompound storedTag = stack.getTagCompound().getCompoundTag("stored"); - IBlockState storedState = NBTUtil.readBlockState(storedTag.getCompoundTag("state")); - NBTTagCompound tileData = storedTag.hasKey("tileData") ? storedTag.getCompoundTag("tileData") : null; + BlockState worldState = world.getBlockState(blockPos); + CompoundNBT storedTag = stack.getTagCompound().getCompoundTag("stored"); + BlockState storedState = NBTUtil.readBlockState(storedTag.getCompoundTag("state")); + CompoundNBT tileData = storedTag.hasKey("tileData") ? storedTag.getCompoundTag("tileData") : null; if (!worldState.getBlock().isReplaceable(world, blockPos)) blockPos = blockPos.offset(side); @@ -117,23 +117,23 @@ public class ItemSigilTransposition extends ItemSigilBase { world.notifyBlockUpdate(blockPos, state, state, 3); stack.getTagCompound().removeTag("stored"); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } } } - return EnumActionResult.FAIL; + return ActionResultType.FAIL; } // We only want to send the display name to the client rather than the bloated tag with tile data and such @Nullable @Override - public NBTTagCompound getNBTShareTag(ItemStack stack) { + public CompoundNBT getNBTShareTag(ItemStack stack) { if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("stored")) return super.getNBTShareTag(stack); - NBTTagCompound shareTag = stack.getTagCompound().copy(); - NBTTagCompound storedTag = shareTag.getCompoundTag("stored"); + CompoundNBT shareTag = stack.getTagCompound().copy(); + CompoundNBT storedTag = shareTag.getCompoundTag("stored"); storedTag.removeTag("state"); storedTag.removeTag("stored"); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 8b321eb4..809042d1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -6,11 +6,11 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -23,18 +23,18 @@ public class ItemSigilVoid extends ItemSigilFluidBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); if (!world.isRemote && !isUnusable(stack)) { RayTraceResult rayTrace = this.rayTrace(world, player, true); if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { - return ActionResult.newResult(EnumActionResult.PASS, stack); + return ActionResult.newResult(ActionResultType.PASS, stack); } BlockPos blockPos = rayTrace.getBlockPos(); @@ -45,13 +45,13 @@ public class ItemSigilVoid extends ItemSigilFluidBase { IFluidHandler destination = getFluidHandler(world, blockPos, null); if (destination != null && tryRemoveFluid(destination, 1000, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { if (tryRemoveFluid(destination, 1000, true)) - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } //Do the same as above, but use sidedness to interact with the fluid handler. IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); if (destinationSide != null && tryRemoveFluid(destinationSide, 1000, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { if (tryRemoveFluid(destinationSide, 1000, true)) - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 6e71a24d..9417adc1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -4,13 +4,13 @@ import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.BlockCauldron; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; +import net.minecraft.block.CauldronBlock; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -24,18 +24,18 @@ public class ItemSigilWater extends ItemSigilFluidBase { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (stack.getItem() instanceof ISigil.Holding) stack = ((Holding) stack.getItem()).getHeldItem(stack, player); if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(ActionResultType.FAIL, stack); if (!world.isRemote && !isUnusable(stack)) { RayTraceResult rayTrace = this.rayTrace(world, player, false); if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { - return ActionResult.newResult(EnumActionResult.PASS, stack); + return ActionResult.newResult(ActionResultType.PASS, stack); } BlockPos blockPos = rayTrace.getBlockPos(); @@ -47,20 +47,20 @@ public class ItemSigilWater extends ItemSigilFluidBase { if (destination != null && tryInsertSigilFluid(destination, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { boolean result = tryInsertSigilFluid(destination, true); if (result) - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } //Do the same as above, but use sidedness to interact with the fluid handler. IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { boolean result = tryInsertSigilFluid(destinationSide, true); if (result) - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } //Special vanilla cauldron handling, yay. if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(BlockCauldron.LEVEL, 3)); - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(CauldronBlock.LEVEL, 3)); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } //Case for if block at blockPos is not a tank @@ -68,7 +68,7 @@ public class ItemSigilWater extends ItemSigilFluidBase { if (destination == null && destinationSide == null) { BlockPos targetPos = blockPos.offset(rayTrace.sideHit); if (tryPlaceSigilFluid(player, world, targetPos) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(ActionResultType.SUCCESS, stack); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index 9577fd78..fffbb349 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.world.World; public class ItemSigilWhirlwind extends ItemSigilToggleableBase { @@ -13,10 +13,10 @@ public class ItemSigilWhirlwind extends ItemSigilToggleableBase { } @Override - public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.WHIRLWIND, 2, 0, true, false)); + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.WHIRLWIND, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 487f80a2..c96bda23 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -10,7 +10,7 @@ import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -50,7 +50,7 @@ public class ItemMonsterSoul extends ItemEnum.Variant NBTHelper.checkNBT(soulStack); - NBTTagCompound tag = soulStack.getTagCompound(); + CompoundNBT tag = soulStack.getTagCompound(); return tag.getDouble(Constants.NBT.SOULS); } @@ -59,7 +59,7 @@ public class ItemMonsterSoul extends ItemEnum.Variant public void setWill(EnumDemonWillType type, ItemStack soulStack, double souls) { NBTHelper.checkNBT(soulStack); - NBTTagCompound tag = soulStack.getTagCompound(); + CompoundNBT tag = soulStack.getTagCompound(); soulStack.setItemDamage(type.ordinal()); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index c1442db8..a7c64efa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -7,14 +7,13 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; +import net.minecraft.util.*; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,7 +34,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { boolean hasSentientArmour = false; NonNullList armourInventory = player.inventory.armorInventory; for (ItemStack armourStack : armourInventory) { @@ -54,7 +53,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { ItemSentientArmour.convertPlayerArmour(type, will, player); } - return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand)); + return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand)); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index db43014d..f6ca9758 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -17,25 +17,25 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemAxe; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.util.Hand; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,7 +43,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.*; import java.util.function.Consumer; -public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { +public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; public static double[] defaultDamageAdded = new double[]{1, 2, 3, 3.5, 4}; public static double[] destructiveDamageAdded = new double[]{2, 3, 4, 5, 6}; @@ -80,7 +80,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, BlockState state) { float value = super.getDestroySpeed(stack, state); if (value > 1) { return (float) (value + getDigSpeedOfSword(stack)); @@ -89,7 +89,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { + public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); @@ -166,10 +166,10 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } } - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, EntityLivingBase target, EntityPlayer attacker) { + public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) { switch (type) { case CORROSIVE: - target.addPotionEffect(new PotionEffect(MobEffects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); + target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); break; case DEFAULT: break; @@ -178,7 +178,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP case STEADFAST: if (!target.isEntityAlive()) { float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, absorptionTime[willBracket], 127)); + attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); } break; @@ -188,10 +188,10 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof EntityPlayer) { - EntityPlayer attackerPlayer = (EntityPlayer) attacker; + if (attacker instanceof PlayerEntity) { + PlayerEntity attackerPlayer = (PlayerEntity) attacker; this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); EnumDemonWillType type = this.getCurrentType(stack); double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); @@ -199,7 +199,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP applyEffectToEntity(type, willBracket, target, attackerPlayer); - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); + ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); if (offStack.getItem() instanceof ISentientSwordEffectProvider) { ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); if (provider.providesEffectForWill(type)) { @@ -218,7 +218,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -230,13 +230,13 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public void setCurrentType(ItemStack stack, EnumDemonWillType type) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { recalculatePowers(player.getHeldItem(hand), world, player); return super.onItemRightClick(world, player, hand); @@ -269,7 +269,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } @Override - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { recalculatePowers(stack, player.getEntityWorld(), player); double drain = this.getDrainOfActivatedSword(stack); @@ -300,14 +300,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP } @Override - public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { + public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { List soulList = new ArrayList<>(); - if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { + if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; } - double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1; + double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); @@ -325,9 +325,9 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP //TODO: Change attack speed. @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); - if (slot == EntityEquipmentSlot.MAINHAND) { + if (slot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); @@ -340,14 +340,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getDamageOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); } public void setDamageOfActivatedSword(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } @@ -355,14 +355,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getDrainOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } public void setDrainOfActivatedSword(ItemStack stack, double drain) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } @@ -370,14 +370,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getStaticDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } @@ -385,14 +385,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } public void setDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @@ -400,14 +400,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getHealthBonusOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); } public void setHealthBonusOfSword(ItemStack stack, double hp) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } @@ -415,14 +415,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getAttackSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); } public void setAttackSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } @@ -430,14 +430,14 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); } public void setSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } @@ -445,20 +445,20 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP public double getDigSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); } public void setDigSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { World world = player.getEntityWorld(); if (!world.isRemote) { this.recalculatePowers(droppedStack, world, player); @@ -475,7 +475,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP specterEntity.setPosition(player.posX, player.posY, player.posZ); world.spawnEntity(specterEntity); - specterEntity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, droppedStack.copy()); + specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); specterEntity.setType(this.getCurrentType(droppedStack)); specterEntity.setOwner(player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 4d72a199..9516da29 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -13,25 +13,23 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.entity.projectile.EntityTippedArrow; -import net.minecraft.init.Enchantments; -import net.minecraft.init.Items; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.ItemArrow; -import net.minecraft.item.ItemBow; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.potion.PotionType; -import net.minecraft.stats.StatList; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.AbstractArrowEntity; +import net.minecraft.entity.projectile.ArrowEntity; +import net.minecraft.item.*; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.stats.Stats; +import net.minecraft.util.SoundEvents; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.BowItem; +import net.minecraft.item.Items; +import net.minecraft.potion.Effects; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Potion; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.MathHelper; @@ -42,7 +40,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import java.util.Locale; -public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider +public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000, 2000, 4000}; public static double[] defaultDamageAdded = new double[]{0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75}; @@ -59,7 +57,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien setCreativeTab(BloodMagic.TAB_BM); this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { + public float apply(ItemStack stack, World world, LivingEntity entityIn) { if (entityIn == null) { return 0.0F; } else { @@ -70,13 +68,13 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien }); this.addPropertyOverride(new ResourceLocation("pulling"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { + public float apply(ItemStack stack, World world, LivingEntity entityIn) { return entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F; } }); this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, EntityLivingBase entityIn) { + public float apply(ItemStack stack, World world, LivingEntity entityIn) { return ((ItemSentientBow) RegistrarBloodMagicItems.SENTIENT_BOW).getCurrentType(stack).ordinal(); } }); @@ -87,7 +85,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { + public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); recalculatePowers(stack, type, soulsRemaining); @@ -129,7 +127,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -164,7 +162,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public void setDamageAdded(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble("damage", damage); } @@ -172,7 +170,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public double getDamageAdded(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble("damage"); } @@ -180,7 +178,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public void setVelocityOfArrow(ItemStack stack, float velocity) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setFloat("velocity", velocity); } @@ -188,7 +186,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public float getVelocityOfArrow(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (tag.hasKey("velocity")) { return tag.getFloat("velocity"); @@ -200,7 +198,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public void setCurrentType(ItemStack stack, EnumDemonWillType type) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @@ -208,14 +206,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public double getDrainOfActivatedBow(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } public void setDrainOfActivatedBow(ItemStack stack, double drain) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } @@ -223,14 +221,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public double getStaticDropOfActivatedBow(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } public void setStaticDropOfActivatedBow(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } @@ -238,20 +236,20 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien public double getDropOfActivatedBow(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } public void setDropOfActivatedBow(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); this.recalculatePowers(stack, world, player); return super.onItemRightClick(world, player, hand); @@ -262,14 +260,14 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien variants.put(0, "inventory"); } - public EntityTippedArrow getArrowEntity(World world, ItemStack stack, EntityLivingBase target, EntityLivingBase user, float velocity) { + public ArrowEntity getArrowEntity(World world, ItemStack stack, LivingEntity target, LivingEntity user, float velocity) { EnumDemonWillType type = this.getCurrentType(stack); - double amount = user instanceof EntityPlayer ? (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)) : 0; + double amount = user instanceof PlayerEntity ? (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)) : 0; float newArrowVelocity = velocity * getVelocityOfArrow(stack); - double soulsRemaining = user instanceof EntityPlayer ? (PlayerDemonWillHandler.getTotalDemonWill(type, (EntityPlayer) user)) : 0; - EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount, getLevel(soulsRemaining), (PotionType) null); + double soulsRemaining = user instanceof PlayerEntity ? (PlayerDemonWillHandler.getTotalDemonWill(type, (PlayerEntity) user)) : 0; + EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount, getLevel(soulsRemaining), (Potion) null); double d0 = target.posX - user.posX; double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entityArrow.posY; @@ -300,47 +298,47 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien entityArrow.setFire(100); } - entityArrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + entityArrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; return entityArrow; } - public EntitySentientArrow getDuplicateArrow(ItemStack bowStack, World world, EntityPlayer player, double reimburseMultiplier) { + public EntitySentientArrow getDuplicateArrow(ItemStack bowStack, World world, PlayerEntity player, double reimburseMultiplier) { EnumDemonWillType willType = this.getCurrentType(bowStack); ItemStack arrow = this.getFiredArrow(player); - ItemArrow itemarrow = ((ItemArrow) (arrow.getItem() instanceof ItemArrow ? arrow.getItem() : Items.ARROW)); + ArrowItem itemarrow = ((ArrowItem) (arrow.getItem() instanceof ArrowItem ? arrow.getItem() : Items.ARROW)); EntitySentientArrow entityArrow; double reimburseAmount = (this.getDropOfActivatedBow(bowStack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(bowStack)) * reimburseMultiplier; if (itemarrow == Items.ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); - entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), (PotionType) null); + entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), (Potion) null); } else if (itemarrow == Items.TIPPED_ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), arrow); } else if (itemarrow == Items.SPECTRAL_ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); - entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), new PotionType(new PotionEffect(MobEffects.GLOWING, 200, 0))); + entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), new Potion(new EffectInstance(Effects.GLOWING, 200, 0))); } else { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), itemarrow.createArrow(world, bowStack, player)); } - player.addStat(StatList.getObjectUseStats(this)); + player.addStat(Stats.getObjectUseStats(this)); return entityArrow; } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) { - if (entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entityLiving; + public void onPlayerStoppedUsing(ItemStack stack, World world, LivingEntity entityLiving, int timeLeft) { + if (entityLiving instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entityLiving; boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; ItemStack itemstack = this.getFiredArrow(player); int i = this.getMaxItemUseDuration(stack) - timeLeft; - i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, (EntityPlayer) entityLiving, i, itemstack != null || flag); + i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, (PlayerEntity) entityLiving, i, itemstack != null || flag); if (i < 0) return; @@ -358,8 +356,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien this.recalculatePowers(stack, world, player); EnumDemonWillType type = this.getCurrentType(stack); - ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.ARROW)); - EntityArrow entityArrow; + ArrowItem itemarrow = ((ArrowItem) (itemstack.getItem() instanceof ArrowItem ? itemstack.getItem() : Items.ARROW)); + AbstractArrowEntity entityArrow; double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); @@ -368,13 +366,13 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien entityArrow = itemarrow.createArrow(world, itemstack, entityLiving); } else if (itemarrow == Items.ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), (PotionType) null); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), (Potion) null); } else if (itemarrow == Items.TIPPED_ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), itemstack); } else if (itemarrow == Items.SPECTRAL_ARROW) { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), new PotionType(new PotionEffect(MobEffects.GLOWING, 200, 0))); + entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), new Potion(new EffectInstance(Effects.GLOWING, 200, 0))); } else { double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), itemarrow.createArrow(world, stack, entityLiving)); @@ -407,7 +405,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien stack.damageItem(1, player); if (flag1) { - entityArrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + entityArrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; } world.spawnEntity(entityArrow); @@ -423,17 +421,17 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } } - player.addStat(StatList.getObjectUseStats(this)); + player.addStat(Stats.getObjectUseStats(this)); } } } } - protected ItemStack getFiredArrow(EntityPlayer player) { - if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) { - return player.getHeldItem(EnumHand.OFF_HAND); - } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) { - return player.getHeldItem(EnumHand.MAIN_HAND); + protected ItemStack getFiredArrow(PlayerEntity player) { + if (this.isArrow(player.getHeldItem(Hand.OFF_HAND))) { + return player.getHeldItem(Hand.OFF_HAND); + } else if (this.isArrow(player.getHeldItem(Hand.MAIN_HAND))) { + return player.getHeldItem(Hand.MAIN_HAND); } else { for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { ItemStack itemstack = player.inventory.getStackInSlot(i); @@ -448,7 +446,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { World world = player.getEntityWorld(); if (!world.isRemote) { this.recalculatePowers(droppedStack, world, player); @@ -465,7 +463,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien specterEntity.setPosition(player.posX, player.posY, player.posZ); world.spawnEntity(specterEntity); - specterEntity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, droppedStack.copy()); + specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); specterEntity.setType(this.getCurrentType(droppedStack)); specterEntity.setOwner(player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index 47f3491e..a2714804 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -17,25 +17,25 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemPickaxe; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.item.PickaxeItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.util.Hand; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,7 +43,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.*; import java.util.function.Consumer; -public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { +public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; public static double[] defaultDamageAdded = new double[]{1, 2, 3, 3.5, 4}; public static double[] destructiveDamageAdded = new double[]{2, 3, 4, 5, 6}; @@ -80,7 +80,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, BlockState state) { float value = super.getDestroySpeed(stack, state); if (value > 1) { return (float) (value + getDigSpeedOfSword(stack)); @@ -89,7 +89,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { + public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); @@ -166,10 +166,10 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } } - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, EntityLivingBase target, EntityPlayer attacker) { + public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) { switch (type) { case CORROSIVE: - target.addPotionEffect(new PotionEffect(MobEffects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); + target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); break; case DEFAULT: break; @@ -178,7 +178,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon case STEADFAST: if (!target.isEntityAlive()) { float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, absorptionTime[willBracket], 127)); + attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); } break; @@ -188,10 +188,10 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof EntityPlayer) { - EntityPlayer attackerPlayer = (EntityPlayer) attacker; + if (attacker instanceof PlayerEntity) { + PlayerEntity attackerPlayer = (PlayerEntity) attacker; this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); EnumDemonWillType type = this.getCurrentType(stack); double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); @@ -199,7 +199,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon applyEffectToEntity(type, willBracket, target, attackerPlayer); - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); + ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); if (offStack.getItem() instanceof ISentientSwordEffectProvider) { ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); if (provider.providesEffectForWill(type)) { @@ -218,7 +218,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -230,13 +230,13 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public void setCurrentType(ItemStack stack, EnumDemonWillType type) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { recalculatePowers(player.getHeldItem(hand), world, player); return super.onItemRightClick(world, player, hand); } @@ -268,7 +268,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } @Override - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { recalculatePowers(stack, player.getEntityWorld(), player); double drain = this.getDrainOfActivatedSword(stack); @@ -299,14 +299,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon } @Override - public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { + public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { List soulList = new ArrayList<>(); - if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { + if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; } - double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1; + double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); @@ -324,9 +324,9 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon //TODO: Change attack speed. @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); - if (slot == EntityEquipmentSlot.MAINHAND) { + if (slot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); @@ -339,14 +339,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getDamageOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); } public void setDamageOfActivatedSword(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } @@ -354,14 +354,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getDrainOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } public void setDrainOfActivatedSword(ItemStack stack, double drain) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } @@ -369,14 +369,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getStaticDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } @@ -384,14 +384,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } public void setDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @@ -399,14 +399,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getHealthBonusOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); } public void setHealthBonusOfSword(ItemStack stack, double hp) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } @@ -414,14 +414,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getAttackSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); } public void setAttackSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } @@ -429,14 +429,14 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); } public void setSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } @@ -444,20 +444,20 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon public double getDigSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); } public void setDigSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { World world = player.getEntityWorld(); if (!world.isRemote) { this.recalculatePowers(droppedStack, world, player); @@ -474,7 +474,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon specterEntity.setPosition(player.posX, player.posY, player.posZ); world.spawnEntity(specterEntity); - specterEntity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, droppedStack.copy()); + specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); specterEntity.setType(this.getCurrentType(droppedStack)); specterEntity.setOwner(player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 644b0b9e..5bb7104f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -17,25 +17,25 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemSpade; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.ShovelItem; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.util.Hand; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,7 +43,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.*; import java.util.function.Consumer; -public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { +public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; public static double[] defaultDamageAdded = new double[]{1, 2, 3, 3.5, 4}; public static double[] destructiveDamageAdded = new double[]{2, 3, 4, 5, 6}; @@ -80,7 +80,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, BlockState state) { float value = super.getDestroySpeed(stack, state); if (value > 1) { return (float) (value + getDigSpeedOfSword(stack)); @@ -89,7 +89,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { + public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); @@ -166,10 +166,10 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } } - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, EntityLivingBase target, EntityPlayer attacker) { + public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) { switch (type) { case CORROSIVE: - target.addPotionEffect(new PotionEffect(MobEffects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); + target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); break; case DEFAULT: break; @@ -178,7 +178,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I case STEADFAST: if (!target.isEntityAlive()) { float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, absorptionTime[willBracket], 127)); + attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); } break; @@ -188,10 +188,10 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof EntityPlayer) { - EntityPlayer attackerPlayer = (EntityPlayer) attacker; + if (attacker instanceof PlayerEntity) { + PlayerEntity attackerPlayer = (PlayerEntity) attacker; this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); EnumDemonWillType type = this.getCurrentType(stack); double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); @@ -199,7 +199,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I applyEffectToEntity(type, willBracket, target, attackerPlayer); - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); + ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); if (offStack.getItem() instanceof ISentientSwordEffectProvider) { ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); if (provider.providesEffectForWill(type)) { @@ -218,7 +218,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -230,13 +230,13 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public void setCurrentType(ItemStack stack, EnumDemonWillType type) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { recalculatePowers(player.getHeldItem(hand), world, player); return super.onItemRightClick(world, player, hand); @@ -269,7 +269,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } @Override - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { recalculatePowers(stack, player.getEntityWorld(), player); double drain = this.getDrainOfActivatedSword(stack); @@ -300,14 +300,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I } @Override - public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { + public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { List soulList = new ArrayList<>(); - if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { + if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; } - double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1; + double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); @@ -325,9 +325,9 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I //TODO: Change attack speed. @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); - if (slot == EntityEquipmentSlot.MAINHAND) { + if (slot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); @@ -340,14 +340,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getDamageOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); } public void setDamageOfActivatedSword(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } @@ -355,14 +355,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getDrainOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } public void setDrainOfActivatedSword(ItemStack stack, double drain) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } @@ -370,14 +370,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getStaticDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } @@ -385,14 +385,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } public void setDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @@ -400,14 +400,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getHealthBonusOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); } public void setHealthBonusOfSword(ItemStack stack, double hp) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } @@ -415,14 +415,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getAttackSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); } public void setAttackSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } @@ -430,14 +430,14 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); } public void setSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } @@ -445,20 +445,20 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I public double getDigSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); } public void setDigSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { World world = player.getEntityWorld(); if (!world.isRemote) { this.recalculatePowers(droppedStack, world, player); @@ -475,7 +475,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I specterEntity.setPosition(player.posX, player.posY, player.posZ); world.spawnEntity(specterEntity); - specterEntity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, droppedStack.copy()); + specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); specterEntity.setType(this.getCurrentType(droppedStack)); specterEntity.setOwner(player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 3f932d34..befbfd10 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -20,21 +20,21 @@ import com.google.common.collect.Multimap; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.SwordItem; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.util.Hand; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +42,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.*; import java.util.function.Consumer; -public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { +public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000, 2000, 4000}; public static double[] defaultDamageAdded = new double[]{1, 1.5, 2, 2.5, 3, 3.5, 4}; public static double[] destructiveDamageAdded = new double[]{1.5, 2.25, 3, 3.75, 4.5, 5.25, 6}; @@ -77,7 +77,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); } - public void recalculatePowers(ItemStack stack, World world, EntityPlayer player) { + public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); recalculatePowers(stack, type, soulsRemaining); @@ -148,10 +148,10 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM } } - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, EntityLivingBase target, EntityLivingBase attacker) { + public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, LivingEntity attacker) { switch (type) { case CORROSIVE: - target.addPotionEffect(new PotionEffect(MobEffects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); + target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); break; case DEFAULT: break; @@ -160,7 +160,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM case STEADFAST: if (!target.isEntityAlive()) { float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, absorptionTime[willBracket], 127)); + attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); } break; @@ -170,10 +170,10 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof EntityPlayer) { - EntityPlayer attackerPlayer = (EntityPlayer) attacker; + if (attacker instanceof PlayerEntity) { + PlayerEntity attackerPlayer = (PlayerEntity) attacker; this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); EnumDemonWillType type = this.getCurrentType(stack); double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); @@ -181,7 +181,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM applyEffectToEntity(type, willBracket, target, attackerPlayer); - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); + ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); if (offStack.getItem() instanceof ISentientSwordEffectProvider) { ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); if (provider.providesEffectForWill(type)) { @@ -200,7 +200,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public EnumDemonWillType getCurrentType(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -212,13 +212,13 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public void setCurrentType(ItemStack stack, EnumDemonWillType type) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { recalculatePowers(player.getHeldItem(hand), world, player); return super.onItemRightClick(world, player, hand); } @@ -250,7 +250,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM } @Override - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { recalculatePowers(stack, player.getEntityWorld(), player); double drain = this.getDrainOfActivatedSword(stack); @@ -281,14 +281,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM } @Override - public List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) { + public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { List soulList = new ArrayList<>(); - if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) { + if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { return soulList; } - double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1; + double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); @@ -306,9 +306,9 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM //TODO: Change attack speed. @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); - if (slot == EntityEquipmentSlot.MAINHAND) { + if (slot == EquipmentSlotType.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); @@ -321,14 +321,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getDamageOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); } public void setDamageOfActivatedSword(ItemStack stack, double damage) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } @@ -336,14 +336,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getDrainOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); } public void setDrainOfActivatedSword(ItemStack stack, double drain) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } @@ -351,14 +351,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getStaticDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); } public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } @@ -366,14 +366,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getDropOfActivatedSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); } public void setDropOfActivatedSword(ItemStack stack, double drop) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @@ -381,14 +381,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getHealthBonusOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); } public void setHealthBonusOfSword(ItemStack stack, double hp) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } @@ -396,14 +396,14 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getAttackSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); } public void setAttackSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } @@ -411,20 +411,20 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM public double getSpeedOfSword(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); } public void setSpeedOfSword(ItemStack stack, double speed) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, EntityPlayer player) { + public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { World world = player.getEntityWorld(); if (!world.isRemote) { this.recalculatePowers(droppedStack, world, player); @@ -441,7 +441,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM specterEntity.setPosition(player.posX, player.posY, player.posZ); world.spawnEntity(specterEntity); - specterEntity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, droppedStack.copy()); + specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); specterEntity.setType(this.getCurrentType(droppedStack)); specterEntity.setOwner(player); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index 62948034..2df52e4f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -13,15 +13,14 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.*; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -49,7 +48,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); EnumDemonWillType type = this.getCurrentType(stack); double drain = Math.min(this.getWill(type, stack), this.getMaxWill(type, stack) / 10); @@ -57,7 +56,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack); this.drainWill(type, stack, filled, true); - return new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(ActionResultType.PASS, stack); } @Override @@ -78,7 +77,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I } @Override - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; @@ -166,7 +165,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I return 0; } - NBTTagCompound tag = soulGemStack.getTagCompound(); + CompoundNBT tag = soulGemStack.getTagCompound(); return tag.getDouble(Constants.NBT.SOULS); } @@ -175,7 +174,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I public void setWill(EnumDemonWillType type, ItemStack soulGemStack, double souls) { setCurrentType(type, soulGemStack); - NBTTagCompound tag = soulGemStack.getTagCompound(); + CompoundNBT tag = soulGemStack.getTagCompound(); tag.setDouble(Constants.NBT.SOULS, souls); } @@ -223,7 +222,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I public EnumDemonWillType getCurrentType(ItemStack soulGemStack) { NBTHelper.checkNBT(soulGemStack); - NBTTagCompound tag = soulGemStack.getTagCompound(); + CompoundNBT tag = soulGemStack.getTagCompound(); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { return EnumDemonWillType.DEFAULT; @@ -235,7 +234,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I public void setCurrentType(EnumDemonWillType type, ItemStack soulGemStack) { NBTHelper.checkNBT(soulGemStack); - NBTTagCompound tag = soulGemStack.getTagCompound(); + CompoundNBT tag = soulGemStack.getTagCompound(); if (type == EnumDemonWillType.DEFAULT) { if (tag.hasKey(Constants.NBT.WILL_TYPE)) { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index c9483d33..83ee8e05 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -6,9 +6,9 @@ import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.util.helper.TextHelper; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemGroup; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.*; @@ -33,7 +33,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { } @Override - public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) { ItemStack stack = playerIn.getHeldItem(hand); if (!playerIn.capabilities.isCreativeMode) { stack.shrink(1); @@ -47,7 +47,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { worldIn.spawnEntity(snare); } - return new ActionResult<>(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } @Override @@ -57,7 +57,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider { @Override @SideOnly(Side.CLIENT) - public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + public void getSubItems(ItemGroup creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index b16fe78a..42a33ceb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -12,14 +12,14 @@ import javax.vecmath.Vector3d; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.MobEffects; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -33,9 +33,9 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshProvider, IActivatable { - public static Map> floatMap = new HashMap>(); - public static Map heldEntityMap = new HashMap(); - public static Map heldEntityOffsetMap = new HashMap(); + public static Map> floatMap = new HashMap>(); + public static Map heldEntityMap = new HashMap(); + public static Map heldEntityOffsetMap = new HashMap(); //TODO: A lot of this stuff could be moved to a toggle-able variant public ItemFlightScroll() { @@ -60,7 +60,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { @@ -83,7 +83,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { + public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { if (entity.world.isRemote) { return false; } @@ -94,7 +94,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr //TODO: Release entity completely? removeEntity(player, entity); } else { - EntityLivingBase heldEntity = getHeldEntity(player); + LivingEntity heldEntity = getHeldEntity(player); if (heldEntity != null && heldEntity.equals(entity)) { heldEntityMap.remove(player); } else { @@ -107,7 +107,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr @Override public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { - if (!world.isRemote && entity instanceof EntityPlayerMP && getActivated(stack)) { + if (!world.isRemote && entity instanceof ServerPlayerEntity && getActivated(stack)) { if (entity.ticksExisted % 20 == 0) { double drainNeeded = getBreathCostPerSecond(stack); if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) { @@ -117,23 +117,23 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } - onEffectUpdate(stack, world, (EntityPlayer) entity, itemSlot, isSelected); + onEffectUpdate(stack, world, (PlayerEntity) entity, itemSlot, isSelected); } if (!world.isRemote) { - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; updateHeldEntityPosition(player); if (floatMap.containsKey(player)) { - Map entityMap = floatMap.get(player); + Map entityMap = floatMap.get(player); if (entityMap == null) { return; } - List removalList = new ArrayList(); + List removalList = new ArrayList(); - for (Entry entry : entityMap.entrySet()) { - EntityLivingBase floatingEntity = entry.getKey(); + for (Entry entry : entityMap.entrySet()) { + LivingEntity floatingEntity = entry.getKey(); if (floatingEntity == null || floatingEntity.isDead || floatingEntity.dimension != player.dimension) { removalList.add(floatingEntity); } @@ -141,7 +141,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr followOwner(player, floatingEntity, entry.getValue()); } - for (EntityLivingBase livingEntity : removalList) { + for (LivingEntity livingEntity : removalList) { entityMap.remove(livingEntity); } @@ -154,14 +154,14 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } - public static boolean updateEntityOffset(EntityPlayer player, EntityLivingBase living, Vector3d updatedOffset) { + public static boolean updateEntityOffset(PlayerEntity player, LivingEntity living, Vector3d updatedOffset) { //TODO: Check if this entity is contained in another player's map to prevent weird things. if (floatMap.containsKey(player)) { - Map entityMap = floatMap.get(player); + Map entityMap = floatMap.get(player); entityMap.put(living, updatedOffset); return true; } else { - Map entityMap = new HashMap(); + Map entityMap = new HashMap(); entityMap.put(living, updatedOffset); floatMap.put(player, entityMap); return true; @@ -169,7 +169,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } @Nullable - public static EntityLivingBase getHeldEntity(EntityPlayer player) { + public static LivingEntity getHeldEntity(PlayerEntity player) { if (heldEntityMap.containsKey(player)) { return heldEntityMap.get(player); } @@ -177,7 +177,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr return null; } - public static double getHeldEntityOffset(EntityPlayer player) { + public static double getHeldEntityOffset(PlayerEntity player) { if (heldEntityMap.containsKey(player)) { return heldEntityOffsetMap.get(player); } @@ -185,7 +185,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr return 1; } - public static void holdEntity(EntityPlayer player, EntityLivingBase entityLiving) { + public static void holdEntity(PlayerEntity player, LivingEntity entityLiving) { float distance = player.getDistance(entityLiving); Vec3d lookVec = player.getLookVec(); heldEntityMap.put(player, entityLiving); @@ -193,8 +193,8 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * distance, lookVec.y * distance, lookVec.z * distance)); } - public static void updateHeldEntityPosition(EntityPlayer player) { - EntityLivingBase entityLiving = getHeldEntity(player); + public static void updateHeldEntityPosition(PlayerEntity player) { + LivingEntity entityLiving = getHeldEntity(player); if (entityLiving != null) { double offset = getHeldEntityOffset(player); Vec3d lookVec = player.getLookVec(); @@ -202,13 +202,13 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } - public static void removeEntity(EntityPlayer player, EntityLivingBase living) { + public static void removeEntity(PlayerEntity player, LivingEntity living) { if (living == null) { return; } if (floatMap.containsKey(player)) { - Map entityMap = floatMap.get(player); + Map entityMap = floatMap.get(player); if (entityMap.containsKey(living)) { entityMap.remove(living); } @@ -219,7 +219,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr } } - public void followOwner(EntityPlayer owner, EntityLivingBase livingEntity, Vector3d offset) { + public void followOwner(PlayerEntity owner, LivingEntity livingEntity, Vector3d offset) { double offsetX = offset.x; double offsetY = offset.y; double offsetZ = offset.z; @@ -228,7 +228,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr double speed = Math.max(ownerSpeed * 20, 2); //May just want to call it a day and set this to "2" - livingEntity.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 20, 0, false, true)); + livingEntity.addPotionEffect(new EffectInstance(Effects.LEVITATION, 20, 0, false, true)); double wantedX = owner.posX + offsetX; double wantedY = owner.posY + offsetY; @@ -247,8 +247,8 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr livingEntity.setVelocity(vec.x * speed, vec.y * speed, vec.z * speed); } - public void onEffectUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FLIGHT, 2, 0)); + public void onEffectUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FLIGHT, 2, 0)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java index 43c3b3ed..de5180bf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java @@ -2,21 +2,21 @@ package WayofTime.bloodmagic.item.soulBreath; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import WayofTime.bloodmagic.soul.ISoulBreathContainer; import WayofTime.bloodmagic.util.Constants; public abstract class ItemSoulBreathContainer extends Item implements ISoulBreathContainer { @Override public double getBreath(ItemStack stack) { - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getDouble(Constants.NBT.BREATH); } @Override public void setBreath(ItemStack stack, double amount) { - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setDouble(Constants.NBT.BREATH, amount); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java index af259cb3..414a920d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.livingArmour; import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; /** @@ -14,13 +14,13 @@ import net.minecraft.world.World; public interface ILivingArmour { Multimap getAttributeModifiers(); - boolean canApplyUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade); + boolean canApplyUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade); - boolean upgradeArmour(EntityPlayer user, LivingArmourUpgrade upgrade); + boolean upgradeArmour(PlayerEntity user, LivingArmourUpgrade upgrade); - boolean removeUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade); + boolean removeUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade); - void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade); + void notifyPlayerOfUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade); /** * Ticks the upgrades and stat trackers, passing in the world and player as @@ -29,11 +29,11 @@ public interface ILivingArmour { * @param world - The World * @param player - The player wearing the Armour */ - void onTick(World world, EntityPlayer player); + void onTick(World world, PlayerEntity player); - void readFromNBT(NBTTagCompound tag); + void readFromNBT(CompoundNBT tag); - void writeToNBT(NBTTagCompound tag, boolean forceWrite); + void writeToNBT(CompoundNBT tag, boolean forceWrite); /** * Writes the LivingArmour to the NBTTag. This will only write the trackers @@ -41,7 +41,7 @@ public interface ILivingArmour { * * @param tag - The NBT tag to write to */ - void writeDirtyToNBT(NBTTagCompound tag); + void writeDirtyToNBT(CompoundNBT tag); - void writeToNBT(NBTTagCompound tag); + void writeToNBT(CompoundNBT tag); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index ab2fe989..8144dbfd 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -5,14 +5,14 @@ import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import java.lang.reflect.Constructor; @@ -33,7 +33,7 @@ public class LivingArmour implements ILivingArmour { return trackerMap.get(key); } - public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { double total = 0; for (Entry entry : upgradeMap.entrySet()) { total += entry.getValue().getAdditionalDamageOnHit(damage, wearer, hitEntity, weapon); @@ -42,7 +42,7 @@ public class LivingArmour implements ILivingArmour { return total; } - public double getKnockbackOnHit(EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getKnockbackOnHit(PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { double total = 0; for (Entry entry : upgradeMap.entrySet()) { total += entry.getValue().getKnockbackOnHit(wearer, hitEntity, weapon); @@ -74,7 +74,7 @@ public class LivingArmour implements ILivingArmour { } @Override - public boolean upgradeArmour(EntityPlayer user, LivingArmourUpgrade upgrade) { + public boolean upgradeArmour(PlayerEntity user, LivingArmourUpgrade upgrade) { String key = upgrade.getUniqueIdentifier(); if (upgradeMap.containsKey(key)) { //Check if this is a higher level than the previous upgrade @@ -112,7 +112,7 @@ public class LivingArmour implements ILivingArmour { } @Override - public boolean canApplyUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade) { + public boolean canApplyUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade) { String key = upgrade.getUniqueIdentifier(); if (upgradeMap.containsKey(key)) { //Check if this is a higher level than the previous upgrade @@ -136,8 +136,8 @@ public class LivingArmour implements ILivingArmour { } @Override - public void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade) { - user.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "newUpgrade")), true); + public void notifyPlayerOfUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade) { + user.sendStatusMessage(new StringTextComponent(TextHelper.localizeEffect(chatBase + "newUpgrade")), true); } /** @@ -148,7 +148,7 @@ public class LivingArmour implements ILivingArmour { * @param player */ @Override - public void onTick(World world, EntityPlayer player) { + public void onTick(World world, PlayerEntity player) { for (Entry entry : upgradeMap.entrySet()) { LivingArmourUpgrade upgrade = entry.getValue(); @@ -211,16 +211,16 @@ public class LivingArmour implements ILivingArmour { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { maxUpgradePoints = Math.max(100, tag.getInteger("maxUpgradePoints")); - NBTTagList upgradeTags = tag.getTagList("upgrades", 10); + ListNBT upgradeTags = tag.getTagList("upgrades", 10); if (upgradeTags != null) { for (int i = 0; i < upgradeTags.tagCount(); i++) { - NBTTagCompound upgradeTag = upgradeTags.getCompoundTagAt(i); + CompoundNBT upgradeTag = upgradeTags.getCompoundTagAt(i); String key = upgradeTag.getString("key"); int level = upgradeTag.getInteger("level"); - NBTTagCompound nbtTag = upgradeTag.getCompoundTag("upgrade"); + CompoundNBT nbtTag = upgradeTag.getCompoundTag("upgrade"); LivingArmourUpgrade upgrade = LivingArmourHandler.generateUpgradeFromKey(key, level, nbtTag); if (upgrade != null) { upgradeMap.put(key, upgrade); @@ -238,7 +238,7 @@ public class LivingArmour implements ILivingArmour { } StatTracker tracker = (StatTracker) obj; String key = tracker.getUniqueIdentifier(); - NBTTagCompound trackerTag = tag.getCompoundTag(key); + CompoundNBT trackerTag = tag.getCompoundTag(key); if (!trackerTag.isEmpty()) { tracker.readFromNBT(trackerTag); } @@ -250,16 +250,16 @@ public class LivingArmour implements ILivingArmour { } @Override - public void writeToNBT(NBTTagCompound tag, boolean forceWrite) { + public void writeToNBT(CompoundNBT tag, boolean forceWrite) { tag.setInteger("maxUpgradePoints", maxUpgradePoints); - NBTTagList tags = new NBTTagList(); + ListNBT tags = new ListNBT(); for (Entry entry : upgradeMap.entrySet()) { - NBTTagCompound upgradeTag = new NBTTagCompound(); + CompoundNBT upgradeTag = new CompoundNBT(); LivingArmourUpgrade upgrade = entry.getValue(); - NBTTagCompound nbtTag = new NBTTagCompound(); + CompoundNBT nbtTag = new CompoundNBT(); upgrade.writeToNBT(nbtTag); upgradeTag.setString("key", upgrade.getUniqueIdentifier()); @@ -281,7 +281,7 @@ public class LivingArmour implements ILivingArmour { String key = tracker.getUniqueIdentifier(); if (forceWrite || tracker.isDirty()) { - NBTTagCompound trackerTag = new NBTTagCompound(); + CompoundNBT trackerTag = new CompoundNBT(); tracker.writeToNBT(trackerTag); tag.setTag(key, trackerTag); @@ -298,17 +298,17 @@ public class LivingArmour implements ILivingArmour { * @param tag */ @Override - public void writeDirtyToNBT(NBTTagCompound tag) { + public void writeDirtyToNBT(CompoundNBT tag) { writeToNBT(tag, false); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { writeToNBT(tag, true); } @Override - public boolean removeUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade) { + public boolean removeUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade) { String key = upgrade.getUniqueIdentifier(); if (upgradeMap.containsKey(key)) { upgradeMap.remove(key); @@ -319,9 +319,9 @@ public class LivingArmour implements ILivingArmour { return false; } - public static boolean hasFullSet(EntityPlayer player) { - for (EntityEquipmentSlot slot : EntityEquipmentSlot.values()) { - if (slot.getSlotType() != EntityEquipmentSlot.Type.ARMOR) { + public static boolean hasFullSet(PlayerEntity player) { + for (EquipmentSlotType slot : EquipmentSlotType.values()) { + if (slot.getSlotType() != EquipmentSlotType.Type.ARMOR) { continue; } ItemStack slotStack = player.getItemStackFromSlot(slot); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java index c15afafb..6fbb06ca 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour; import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -45,7 +45,7 @@ public class LivingArmourHandler { return generateUpgradeFromKey(key, level, null); } - public static LivingArmourUpgrade generateUpgradeFromKey(String key, int level, NBTTagCompound tag) { + public static LivingArmourUpgrade generateUpgradeFromKey(String key, int level, CompoundNBT tag) { Constructor ctor = upgradeConstructorMap.get(key); if (ctor != null) { try { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java index 41cfb72e..46a13263 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.livingArmour; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -31,11 +31,11 @@ public abstract class LivingArmourUpgrade { this.level = Math.min(level, getMaxTier() - 1); } - public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { return 0; } - public double getKnockbackOnHit(EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getKnockbackOnHit(PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { return 0; } @@ -45,7 +45,7 @@ public abstract class LivingArmourUpgrade { * * @return 0 for no damage blocked, 1 for full damage blocked */ - public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { + public double getArmourProtection(LivingEntity wearer, DamageSource source) { return 0; } @@ -61,20 +61,20 @@ public abstract class LivingArmourUpgrade { public abstract int getCostOfUpgrade(); - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } public Multimap getAttributeModifiers() { return HashMultimap.create(); } - public double getMiningSpeedModifier(EntityPlayer player) { + public double getMiningSpeedModifier(PlayerEntity player) { return 1; } - public abstract void writeToNBT(NBTTagCompound tag); + public abstract void writeToNBT(CompoundNBT tag); - public abstract void readFromNBT(NBTTagCompound tag); + public abstract void readFromNBT(CompoundNBT tag); public int getRunicShielding() { return 0; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java index c9d4d182..02f5f971 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.List; @@ -17,9 +17,9 @@ public abstract class StatTracker { */ public abstract void resetTracker(); - public abstract void readFromNBT(NBTTagCompound tag); + public abstract void readFromNBT(CompoundNBT tag); - public abstract void writeToNBT(NBTTagCompound tag); + public abstract void writeToNBT(CompoundNBT tag); /** * Called each tick to update the tracker's information. Called in @@ -30,9 +30,9 @@ public abstract class StatTracker { * @param livingArmour The equipped LivingArmour * @return True if there is a new upgrade unlocked this tick. */ - public abstract boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour); + public abstract boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour); - public abstract void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour); + public abstract void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour); public abstract List getUpgrades(); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index e7aec23e..37c20df3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { @@ -23,7 +23,7 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (timer > 0) { timer--; return; @@ -50,12 +50,12 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger("timer", timer); } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { timer = tag.getInteger("timer"); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index 0467e0a7..8a01bc0b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade { @@ -15,7 +15,7 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -35,11 +35,11 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index 69d041ee..e3b250e3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.HashMap; @@ -19,12 +19,12 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade { } @Override - public double getMiningSpeedModifier(EntityPlayer player) { + public double getMiningSpeedModifier(PlayerEntity player) { return digSpeedModifier[this.level]; } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -44,12 +44,12 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index 25daaaf4..1c8fe54d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { @@ -16,7 +16,7 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (world.isRemote && player.ticksExisted % 20 == 0 && world.rand.nextDouble() <= chance[this.level]) { player.rotationYaw = world.rand.nextFloat() * 360; player.rotationPitch = world.rand.nextFloat() * 180 - 90; @@ -44,11 +44,11 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index 0e59b0ba..cbccbfde 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -7,8 +7,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import org.apache.commons.codec.binary.StringUtils; @@ -23,7 +23,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -53,12 +53,12 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index 1294fe29..edf6dc1c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade { @@ -15,7 +15,7 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -35,11 +35,11 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index 413eac26..3d694dbf 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,7 +17,7 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (world.isRemote && player.onGround) { // if (player.moveForward == 0) { @@ -72,11 +72,11 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index f7d0c6ba..ac3fb774 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade { @@ -21,7 +21,7 @@ public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -41,12 +41,12 @@ public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index a36c48b3..75d40db8 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -7,8 +7,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import org.apache.commons.codec.binary.StringUtils; @@ -33,7 +33,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -53,11 +53,11 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index 61252106..464c408b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { @@ -16,11 +16,11 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } - public float getArrowJiggle(EntityPlayer player) { + public float getArrowJiggle(PlayerEntity player) { return inaccuracy[this.level]; } @@ -40,11 +40,11 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index 51671858..65f9706f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowProtect; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerArrowProtect extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.arrowProtect"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerArrowProtect extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index ed0e225d..1b9550f5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerArrowShot extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalShots = tag.getInteger(BloodMagic.MODID + ".tracker.trickShot"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.trickShot", totalShots); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { int change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerArrowShot extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index fef5ed19..9096e539 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeCriticalStrike; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerCriticalStrike extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.criticalStrike"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerCriticalStrike extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index c04c1951..9b407907 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerDigging extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalBlocksDug = tag.getInteger(BloodMagic.MODID + ".tracker.digging"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.digging", totalBlocksDug); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { int change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerDigging extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 379d3631..09f2c95e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerExperience extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalExperienceGained = tag.getDouble(BloodMagic.MODID + ".tracker.experienced"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerExperience extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index 76f6248d..481a91f0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerFallProtect extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.fallProtect"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.fallProtect", totalDamage); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerFallProtect extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index c6e467d1..fcbcd93c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFireResist; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -28,17 +28,17 @@ public class StatTrackerFireResist extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalFireTicks = tag.getInteger(BloodMagic.MODID + ".tracker.fire"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.fire", totalFireTicks); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (player.isBurning()) { totalFireTicks++; this.markDirty(); @@ -49,7 +49,7 @@ public class StatTrackerFireResist extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index b00fbb71..757de371 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; public class StatTrackerFood extends StatTracker { - public static Map lastFoodEatenMap = new HashMap<>(); + public static Map lastFoodEatenMap = new HashMap<>(); public static int[] foodRequired = new int[]{100, 200, 300, 500, 1000}; @@ -33,18 +33,18 @@ public class StatTrackerFood extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { foodEaten = tag.getInteger(BloodMagic.MODID + ".tracker.foodEaten"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.foodEaten", foodEaten); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (!lastFoodEatenMap.containsKey(player)) { lastFoodEatenMap.put(player, 20); return false; @@ -66,7 +66,7 @@ public class StatTrackerFood extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (lastFoodEatenMap.containsKey(player)) { lastFoodEatenMap.remove(player); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index 209a8316..0797ba9c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerGraveDigger extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.graveDigger"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerGraveDigger extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 0234bbf2..9b2e087b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -7,8 +7,8 @@ import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; import WayofTime.bloodmagic.util.BMLog; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -31,17 +31,17 @@ public class StatTrackerGrimReaperSprint extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDeaths = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -59,7 +59,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index 666cf88f..56aa43c5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerHealthboost extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.health"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerHealthboost extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index d5214fa6..cd9ac778 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -31,18 +31,18 @@ public class StatTrackerJump extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalJumps = tag.getInteger(BloodMagic.MODID + ".tracker.jump"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.jump", totalJumps); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { int change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -60,7 +60,7 @@ public class StatTrackerJump extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index a7172372..82b7ece1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerMeleeDamage extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.meleeDamage"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerMeleeDamage extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 49a598d1..0b68e699 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; public class StatTrackerMovement extends StatTracker { - public static Map lastPosX = new HashMap<>(); - public static Map lastPosZ = new HashMap<>(); + public static Map lastPosX = new HashMap<>(); + public static Map lastPosZ = new HashMap<>(); public static int[] blocksRequired = new int[]{200, 1000, 2000, 4000, 7000, 15000, 25000, 35000, 50000, 70000}; @@ -34,18 +34,18 @@ public class StatTrackerMovement extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.movement"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.movement", totalMovement); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (!lastPosX.containsKey(player)) { lastPosX.put(player, player.posX); lastPosZ.put(player, player.posZ); @@ -76,7 +76,7 @@ public class StatTrackerMovement extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index ca2a181b..12791b42 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -6,9 +6,9 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeNightSight; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; import net.minecraft.world.World; import java.util.ArrayList; @@ -34,19 +34,19 @@ public class StatTrackerNightSight extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.nightSight"); totalNightVision = tag.getInteger(BloodMagic.MODID + ".tracker.nightSightVision"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt); tag.setInteger(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { boolean test = false; if (changeMap.containsKey(livingArmour)) { @@ -60,7 +60,7 @@ public class StatTrackerNightSight extends StatTracker { } } - if (world.getLight(player.getPosition()) <= 9 && player.isPotionActive(MobEffects.NIGHT_VISION)) { + if (world.getLight(player.getPosition()) <= 9 && player.isPotionActive(Effects.NIGHT_VISION)) { totalNightVision++; test = true; } @@ -73,7 +73,7 @@ public class StatTrackerNightSight extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 7fca6648..e60c6788 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerPhysicalProtect extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.physicalProtect"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerPhysicalProtect extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index fb002e49..94c394d6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -6,9 +6,9 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; import net.minecraft.world.World; import java.util.ArrayList; @@ -29,18 +29,18 @@ public class StatTrackerPoison extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalPoisonTicks = tag.getInteger(BloodMagic.MODID + ".tracker.poison"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { - if (player.isPotionActive(MobEffects.POISON)) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { + if (player.isPotionActive(Effects.POISON)) { totalPoisonTicks++; this.markDirty(); return true; @@ -50,7 +50,7 @@ public class StatTrackerPoison extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index 458b5eb6..981f349f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRepairing; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerRepairing extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamage = tag.getDouble(BloodMagic.MODID + ".tracker.repair"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.repair", totalDamage); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerRepairing extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index 631ac1d2..d62f2f47 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -31,18 +31,18 @@ public class StatTrackerSelfSacrifice extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalSacrifices = tag.getInteger(BloodMagic.MODID + ".tracker.selfSacrifice"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { int change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -60,7 +60,7 @@ public class StatTrackerSelfSacrifice extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 29d656ac..87be975d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerSolarPowered extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.solarPowered"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerSolarPowered extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index 09d2f220..ae828d2e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -30,17 +30,17 @@ public class StatTrackerSprintAttack extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.sprintAttack"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { double change = Math.abs(changeMap.get(livingArmour)); if (change > 0) { @@ -58,7 +58,7 @@ public class StatTrackerSprintAttack extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (changeMap.containsKey(livingArmour)) { changeMap.remove(livingArmour); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 77ad3f12..657edb74 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -5,8 +5,8 @@ import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import java.util.ArrayList; @@ -15,8 +15,8 @@ import java.util.List; import java.util.Map; public class StatTrackerStepAssist extends StatTracker { - public static Map lastPosX = new HashMap<>(); - public static Map lastPosZ = new HashMap<>(); + public static Map lastPosX = new HashMap<>(); + public static Map lastPosZ = new HashMap<>(); public static int blocksRequired = 1000; @@ -33,18 +33,18 @@ public class StatTrackerStepAssist extends StatTracker { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.stepAssist"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement); } @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { if (!lastPosX.containsKey(player)) { lastPosX.put(player, player.posX); lastPosZ.put(player, player.posZ); @@ -76,7 +76,7 @@ public class StatTrackerStepAssist extends StatTracker { } @Override - public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) { + public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index 94ccca9a..994091cc 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade { @@ -15,7 +15,7 @@ public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade { } @Override - public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { + public double getArmourProtection(LivingEntity wearer, DamageSource source) { if (source.isProjectile()) { return protectionLevel[this.level]; } @@ -39,12 +39,12 @@ public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index a83e62ad..ca457179 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { @@ -16,7 +16,7 @@ public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -36,12 +36,12 @@ public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 5f82954e..2254a320 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade { public static final int[] costs = new int[]{5, 12, 22, 35, 49}; @@ -17,8 +17,8 @@ public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade { } @Override - public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { - boolean flag = wearer.fallDistance > 0.0F && !wearer.onGround && !wearer.isOnLadder() && !wearer.isInWater() && !wearer.isPotionActive(MobEffects.BLINDNESS) && !wearer.isRiding() && !wearer.isSprinting(); + public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { + boolean flag = wearer.fallDistance > 0.0F && !wearer.onGround && !wearer.isOnLadder() && !wearer.isInWater() && !wearer.isPotionActive(Effects.BLINDNESS) && !wearer.isRiding() && !wearer.isSprinting(); if (flag) { return getDamageModifier() * damage; @@ -47,12 +47,12 @@ public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 8e977049..559fc941 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.potion.EffectInstance; import net.minecraft.world.World; import java.util.HashMap; @@ -24,17 +24,17 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { } @Override - public double getMiningSpeedModifier(EntityPlayer player) { + public double getMiningSpeedModifier(PlayerEntity player) { return digSpeedModifier[this.level]; } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (changeMap.containsKey(livingArmour) && changeMap.get(livingArmour)) { changeMap.put(livingArmour, false); if (digSpeedTime[this.level] > 0) { - player.addPotionEffect(new PotionEffect(MobEffects.SPEED, digSpeedTime[this.level], digSpeedLevel[this.level], false, false)); + player.addPotionEffect(new EffectInstance(Effects.SPEED, digSpeedTime[this.level], digSpeedLevel[this.level], false, false)); } } } @@ -55,12 +55,12 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index 9e1c4a3a..695df8f6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeElytra extends LivingArmourUpgrade { @@ -15,7 +15,7 @@ public class LivingArmourUpgradeElytra extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -35,12 +35,12 @@ public class LivingArmourUpgradeElytra extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index e36e05bf..92719265 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { public static final int[] costs = new int[]{7, 13, 22, 40, 65, 90, 130, 180, 250, 350}; @@ -32,12 +32,12 @@ public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index 79368bdb..d831435c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -2,9 +2,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; +import net.minecraft.nbt.CompoundNBT; public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { public static final int[] costs = new int[]{2, 5, 9, 15, 25}; @@ -35,12 +33,12 @@ public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index 1e0a465c..827bc8c8 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -5,11 +5,11 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.Effects; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { @@ -24,13 +24,13 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (player.isBurning() && fireCooldown <= 0) { - player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, fireResistDuration[this.level])); + player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, fireResistDuration[this.level])); fireCooldown = fireCooldownTime[this.level]; - player.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "fireRemove")), true); + player.sendStatusMessage(new StringTextComponent(TextHelper.localizeEffect(chatBase + "fireRemove")), true); } else if (fireCooldown > 0) { fireCooldown--; @@ -53,12 +53,12 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(Constants.NBT.UPGRADE_FIRE_TIMER, fireCooldown); } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { fireCooldown = tag.getInteger(Constants.NBT.UPGRADE_FIRE_TIMER); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index 1c1ec121..b3b984d2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemSpade; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ShovelItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade { public static final int[] costs = new int[]{5, 12, 20, 35, 49, 78, 110, 160, 215, 320}; @@ -17,8 +17,8 @@ public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade { } @Override - public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { - if (!weapon.isEmpty() && weapon.getItem() instanceof ItemSpade) { + public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { + if (!weapon.isEmpty() && weapon.getItem() instanceof ShovelItem) { return getDamageModifier(); } @@ -45,12 +45,12 @@ public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 92fba1a7..6e198169 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -4,11 +4,11 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { @@ -27,7 +27,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (deathTimer > 0) { deathTimer--; } @@ -49,12 +49,12 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { deathTimer = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", deathTimer); } @@ -63,24 +63,24 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { return tooltipBase + "grimReaper"; } - public void applyEffectOnRebirth(EntityPlayer player) { + public void applyEffectOnRebirth(PlayerEntity player) { player.setHealth(player.getMaxHealth() * healthOnRevive[this.level]); int strDur = strengthDuration[this.level]; if (strDur > 0) { - player.addPotionEffect(new PotionEffect(MobEffects.STRENGTH, strDur, strengthValue[this.level])); + player.addPotionEffect(new EffectInstance(Effects.STRENGTH, strDur, strengthValue[this.level])); } int resDur = resistanceDuration[this.level]; if (resDur > 0) { - player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, resDur, resistanceValue[this.level])); + player.addPotionEffect(new EffectInstance(Effects.RESISTANCE, resDur, resistanceValue[this.level])); } deathTimer = rebirthDelay[this.level]; - player.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "grimReaper")), true); + player.sendStatusMessage(new StringTextComponent(TextHelper.localizeEffect(chatBase + "grimReaper")), true); } - public boolean canSavePlayer(EntityPlayer player) { + public boolean canSavePlayer(PlayerEntity player) { return deathTimer <= 0; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 4b3a82bf..3a1aaf13 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -7,8 +7,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import org.apache.commons.codec.binary.StringUtils; @@ -23,7 +23,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -53,12 +53,12 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index 723ef2ab..3fc4e734 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeJump extends LivingArmourUpgrade { @@ -31,7 +31,7 @@ public class LivingArmourUpgradeJump extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (!world.isRemote) { double motionY = player.motionY; @@ -47,12 +47,12 @@ public class LivingArmourUpgradeJump extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index 39a34a08..15914a0f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -6,7 +6,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import org.apache.commons.codec.binary.StringUtils; import java.util.UUID; @@ -51,12 +51,12 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 7a4fc138..d08722fd 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -7,8 +7,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import org.apache.commons.codec.binary.StringUtils; @@ -23,7 +23,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { } @@ -53,12 +53,12 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index e18b3c1b..a33a241a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -1,15 +1,14 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { @@ -23,21 +22,21 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { } @Override - public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { return isActive ? meleeDamage[this.level] : 0; } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (world.getLight(player.getPosition(), false) <= 9) { isActive = true; - if (player.isPotionActive(MobEffects.NIGHT_VISION)) + if (player.isPotionActive(Effects.NIGHT_VISION)) return; - player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false)); + player.addPotionEffect(new EffectInstance(Effects.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false)); } else if (isActive) { isActive = false; - player.removePotionEffect(MobEffects.NIGHT_VISION); + player.removePotionEffect(Effects.NIGHT_VISION); } } @@ -57,12 +56,12 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 52a60199..1b69b807 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { @@ -15,7 +15,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { } @Override - public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { + public double getArmourProtection(LivingEntity wearer, DamageSource source) { if (source.getTrueSource() != null && !source.isMagicDamage() && !source.isProjectile()) { return protectionLevel[this.level]; } @@ -39,12 +39,12 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index 08c75b19..23620d2a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -5,11 +5,11 @@ import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { @@ -24,14 +24,14 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { - if (player.isPotionActive(MobEffects.POISON) && poisonCooldown <= 0) { - PotionEffect eff = player.getActivePotionEffect(MobEffects.POISON); + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { + if (player.isPotionActive(Effects.POISON) && poisonCooldown <= 0) { + EffectInstance eff = player.getActivePotionEffect(Effects.POISON); if (eff.getAmplifier() <= poisonMaxCure[this.level]) { - player.removePotionEffect(MobEffects.POISON); + player.removePotionEffect(Effects.POISON); poisonCooldown = poisonCooldownTime[this.level]; - player.sendStatusMessage(new TextComponentString(TextHelper.localize(chatBase + "poisonRemove")), true); + player.sendStatusMessage(new StringTextComponent(TextHelper.localize(chatBase + "poisonRemove")), true); } } else if (poisonCooldown > 0) { poisonCooldown--; @@ -54,12 +54,12 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(Constants.NBT.UPGRADE_POISON_TIMER, poisonCooldown); } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { poisonCooldown = tag.getInteger(Constants.NBT.UPGRADE_POISON_TIMER); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index d9d00733..71e0f1ff 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { @@ -22,11 +22,11 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (delay <= 0) { delay = repairDelay[this.level]; - EntityEquipmentSlot randomSlot = EntityEquipmentSlot.values()[2 + world.rand.nextInt(4)]; + EquipmentSlotType randomSlot = EquipmentSlotType.values()[2 + world.rand.nextInt(4)]; ItemStack repairStack = player.getItemStackFromSlot(randomSlot); if (!repairStack.isEmpty()) { if (repairStack.isItemStackDamageable() && repairStack.isItemDamaged()) { @@ -57,12 +57,12 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger("repairingDelay", delay); } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { delay = tag.getInteger("repairingDelay"); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index 4b68bb79..997a72ab 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { //TODO: Add extra effects for higher levels @@ -33,12 +33,12 @@ public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 114508d2..810a9673 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -3,11 +3,11 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -25,7 +25,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { } @Override - public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { + public double getArmourProtection(LivingEntity wearer, DamageSource source) { if (wearer.getEntityWorld().canSeeSky(wearer.getPosition()) && wearer.getEntityWorld().provider.isDaytime()) { return protectionLevel[this.level]; } @@ -34,7 +34,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { counter++; if (world.canSeeSky(player.getPosition()) && world.provider.isDaytime()) { if (counter % regenCooldown[this.level] == 0 && player.getHealth() < player.getMaxHealth()) { @@ -42,7 +42,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { } if (fireResistTime[this.level] != 0 && counter % fireResistCooldown[this.level] == 0) { - player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, fireResistTime[this.level], 0, false, false)); + player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, fireResistTime[this.level], 0, false, false)); } } } @@ -63,12 +63,12 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(BloodMagic.MODID + ".tracker.solarPowered", counter); } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { counter = tag.getInteger(BloodMagic.MODID + ".tracker.solarPowered"); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 3a0a2890..4b595b5b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -5,16 +5,12 @@ import WayofTime.bloodmagic.livingArmour.ILivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.world.World; -import org.apache.commons.codec.binary.StringUtils; - -import java.util.UUID; public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { public static final int[] costs = new int[]{3, 7, 13, 26, 42, 60, 90, 130, 180, 250}; @@ -33,14 +29,14 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { } @Override - public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { + public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { if (player.isSprinting()) { if (sprintSpeedTime[this.level] > 0) { - player.addPotionEffect(new PotionEffect(MobEffects.SPEED, sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); + player.addPotionEffect(new EffectInstance(Effects.SPEED, sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); } - if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(MobEffects.REGENERATION)) { - player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, sprintRegenTime[this.level], 0, false, false)); + if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(Effects.REGENERATION)) { + player.addPotionEffect(new EffectInstance(Effects.REGENERATION, sprintRegenTime[this.level], 0, false, false)); } } } @@ -75,12 +71,12 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index e4963af3..4b9fa00b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { public static final int[] costs = new int[]{3, 7, 15, 25, 40}; @@ -17,7 +17,7 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { } @Override - public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { if (wearer.isSprinting()) { return getDamageModifier(); } @@ -26,7 +26,7 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { } @Override - public double getKnockbackOnHit(EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) { + public double getKnockbackOnHit(PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { if (wearer.isSprinting()) { return getKnockbackModifier(); } @@ -58,12 +58,12 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 9392f6ec..26cdf8e3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { public static final int[] costs = new int[]{20}; @@ -35,12 +35,12 @@ public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { // EMPTY } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { // EMPTY } diff --git a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java index 55f5728f..bd5d9158 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.meteor; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,7 +32,7 @@ public class Meteor { this.maxWeight = weight; } - public void generateMeteor(World world, BlockPos pos, IBlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { + public void generateMeteor(World world, BlockPos pos, BlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), (float) (explosionStrength * explosionModifier), true, true); int radius = (int) Math.ceil(getRadius() * radiusModifier); double floatingRadius = getRadius() * radiusModifier; @@ -45,10 +45,10 @@ public class Meteor { } BlockPos newPos = pos.add(i, j, k); - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); if (world.isAirBlock(newPos) || Utils.isBlockLiquid(state)) { - IBlockState placedState = getRandomOreFromComponents(fillerBlock, fillerChance); + BlockState placedState = getRandomOreFromComponents(fillerBlock, fillerChance); if (placedState != null) { world.setBlockState(newPos, placedState); } @@ -59,13 +59,13 @@ public class Meteor { } //fillerChance is the chance that the filler block will NOT be placed - public IBlockState getRandomOreFromComponents(IBlockState fillerBlock, double fillerChance) { + public BlockState getRandomOreFromComponents(BlockState fillerBlock, double fillerChance) { int goal = RAND.nextInt(getMaxWeight()); for (MeteorComponent component : getComponents()) { goal -= component.getWeight(); if (goal < 0) { - IBlockState state = component.getStateFromOre(); + BlockState state = component.getStateFromOre(); if (state != null) { return state; } else { diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java index df810fe5..5e820a31 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.meteor; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; @@ -21,7 +21,7 @@ public class MeteorComponent { this.oreName = oreName; } - public IBlockState getStateFromOre() { + public BlockState getStateFromOre() { if (oreName.contains(":")) { String[] stringList = oreName.split(":"); String domain = stringList[0]; @@ -40,9 +40,9 @@ public class MeteorComponent { List list = OreDictionary.getOres(oreName); if (list != null && !list.isEmpty()) { for (ItemStack stack : list) { - if (stack != null && stack.getItem() instanceof ItemBlock) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState state = block.getStateFromMeta(stack.getItemDamage()); + if (stack != null && stack.getItem() instanceof BlockItem) { + Block block = ((BlockItem) stack.getItem()).getBlock(); + BlockState state = block.getStateFromMeta(stack.getItemDamage()); return state; } diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index e72de2e3..0be375e3 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.filefilter.FileFilterUtils; diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java index aaf4d0b3..a74f5c43 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.meteor; import com.google.common.collect.Maps; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -36,7 +36,7 @@ public class MeteorRegistry { return null; } - public static void generateMeteorForItem(ItemStack stack, World world, BlockPos pos, IBlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { + public static void generateMeteorForItem(ItemStack stack, World world, BlockPos pos, BlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { Meteor meteor = getMeteorForItem(stack); if (meteor != null) meteor.generateMeteor(world, pos, fillerBlock, radiusModifier, explosionModifier, fillerChance); diff --git a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java index 98856381..06f2c1a0 100644 --- a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java +++ b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.network; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.ChatUtil; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -31,7 +31,7 @@ public class BloodMagicPacketHandler { sendToAllAround(message, te, 64); } - public static void sendTo(IMessage message, EntityPlayerMP player) { + public static void sendTo(IMessage message, ServerPlayerEntity player) { INSTANCE.sendTo(message, player); } } diff --git a/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java b/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java index d3620782..513e56cc 100644 --- a/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.network; import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.KeyBindings; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -35,7 +35,7 @@ public class KeyProcessor implements IMessage, IMessageHandler effects) { + public static ItemStack setEffects(ItemStack stack, Collection effects) { if (effects.isEmpty()) { return stack; } else { - NBTTagCompound nbttagcompound = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound(); - NBTTagList nbttaglist = new NBTTagList(); + CompoundNBT nbttagcompound = stack.hasTagCompound() ? stack.getTagCompound() : new CompoundNBT(); + ListNBT nbttaglist = new ListNBT(); - for (PotionEffect potioneffect : effects) { - nbttaglist.appendTag(potioneffect.writeCustomPotionEffectToNBT(new NBTTagCompound())); + for (EffectInstance potioneffect : effects) { + nbttaglist.appendTag(potioneffect.writeCustomPotionEffectToNBT(new CompoundNBT())); } nbttagcompound.setTag("CustomPotionEffects", nbttaglist); @@ -119,19 +119,19 @@ public class BMPotionUtils { } } - public static AlchemyTablePotionAugmentRecipe getLengthAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, PotionEffect baseEffect, double lengthAugment) { + public static AlchemyTablePotionAugmentRecipe getLengthAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect, double lengthAugment) { return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect, lengthAugment, 0); } - public static AlchemyTablePotionAugmentRecipe getPowerAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, PotionEffect baseEffect, int powerAugment) { + public static AlchemyTablePotionAugmentRecipe getPowerAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect, int powerAugment) { return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect, 0, powerAugment); } - public static AlchemyTablePotionAugmentRecipe getLengthAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, PotionEffect baseEffect, double lengthAugment) { + public static AlchemyTablePotionAugmentRecipe getLengthAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect, double lengthAugment) { return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItem, baseEffect, lengthAugment, 0); } - public static AlchemyTablePotionAugmentRecipe getPowerAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, PotionEffect baseEffect, int powerAugment) { + public static AlchemyTablePotionAugmentRecipe getPowerAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect, int powerAugment) { return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItem, baseEffect, 0, powerAugment); } } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java index d9d552b5..4aa8bb2c 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java @@ -2,14 +2,14 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.BloodMagic; import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.LivingEntity; +import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class PotionBloodMagic extends Potion { +public class PotionBloodMagic extends Effect { public static ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "textures/misc/potions.png"); public PotionBloodMagic(String name, boolean badEffect, int potionColor, int iconIndexX, int iconIndexY) { @@ -19,22 +19,22 @@ public class PotionBloodMagic extends Potion { } @Override - public boolean shouldRenderInvText(PotionEffect effect) { + public boolean shouldRenderInvText(EffectInstance effect) { return true; } - public PotionEffect apply(EntityLivingBase entity, int duration) { + public EffectInstance apply(LivingEntity entity, int duration) { return apply(entity, duration, 0); } - public PotionEffect apply(EntityLivingBase entity, int duration, int level) { - PotionEffect effect = new PotionEffect(this, duration, level, false, false); + public EffectInstance apply(LivingEntity entity, int duration, int level) { + EffectInstance effect = new EffectInstance(this, duration, level, false, false); entity.addPotionEffect(effect); return effect; } - public int getLevel(EntityLivingBase entity) { - PotionEffect effect = entity.getActivePotionEffect(this); + public int getLevel(LivingEntity entity) { + EffectInstance effect = entity.getActivePotionEffect(this); if (effect != null) { return effect.getAmplifier(); } @@ -42,7 +42,7 @@ public class PotionBloodMagic extends Potion { } @Override - public boolean shouldRender(PotionEffect effect) { + public boolean shouldRender(EffectInstance effect) { return true; } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index a2805904..a2ce2462 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -5,12 +5,12 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import com.google.common.collect.Lists; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.IProjectile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.AbstractArrowEntity; +import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; @@ -26,12 +26,12 @@ import java.util.Map; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class PotionEventHandlers { - public static Map> flightListMap = new HashMap<>(); - public static Map> noGravityListMap = new HashMap<>(); + public static Map> flightListMap = new HashMap<>(); + public static Map> noGravityListMap = new HashMap<>(); @SubscribeEvent public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) { - EntityLivingBase eventEntityLiving = event.getEntityLiving(); + LivingEntity eventEntityLiving = event.getEntityLiving(); if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.BOOST)) { int i = eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); @@ -44,7 +44,7 @@ public class PotionEventHandlers { @SubscribeEvent public static void onLivingFall(LivingFallEvent event) { - EntityLivingBase eventEntityLiving = event.getEntityLiving(); + LivingEntity eventEntityLiving = event.getEntityLiving(); if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.HEAVY_HEART)) { int i = eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.HEAVY_HEART).getAmplifier() + 1; @@ -55,11 +55,11 @@ public class PotionEventHandlers { @SubscribeEvent public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { - EntityLivingBase eventEntityLiving = event.getEntityLiving(); - List flightList = flightListMap.getOrDefault(eventEntityLiving.getEntityWorld(), Lists.newArrayList()); + LivingEntity eventEntityLiving = event.getEntityLiving(); + List flightList = flightListMap.getOrDefault(eventEntityLiving.getEntityWorld(), Lists.newArrayList()); - if (eventEntityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) eventEntityLiving; + if (eventEntityLiving instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) eventEntityLiving; if (!player.world.isRemote) { if (player.isPotionActive(RegistrarBloodMagic.FLIGHT)) { if (!player.isSpectator() && !player.capabilities.allowFlying) { @@ -92,7 +92,7 @@ public class PotionEventHandlers { // } // } // } - List noGravityList = noGravityListMap.getOrDefault(event.getEntityLiving().getEntityWorld(), Lists.newArrayList()); + List noGravityList = noGravityListMap.getOrDefault(event.getEntityLiving().getEntityWorld(), Lists.newArrayList()); if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED) && !eventEntityLiving.hasNoGravity()) { eventEntityLiving.setNoGravity(true); noGravityList.add(eventEntityLiving); @@ -102,7 +102,7 @@ public class PotionEventHandlers { } if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.GROUNDED)) - if (eventEntityLiving instanceof EntityPlayer && ((EntityPlayer) eventEntityLiving).capabilities.isFlying) + if (eventEntityLiving instanceof PlayerEntity && ((PlayerEntity) eventEntityLiving).capabilities.isFlying) eventEntityLiving.motionY -= (0.05D * (double) (eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.GROUNDED).getAmplifier() + 1) - eventEntityLiving.motionY) * 0.2D; else eventEntityLiving.motionY -= (0.1D * (double) (eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.GROUNDED).getAmplifier() + 1) - eventEntityLiving.motionY) * 0.2D; @@ -120,10 +120,10 @@ public class PotionEventHandlers { Entity throwingEntity = null; - if (projectile instanceof EntityArrow) - throwingEntity = ((EntityArrow) projectile).shootingEntity; - else if (projectile instanceof EntityThrowable) - throwingEntity = ((EntityThrowable) projectile).getThrower(); + if (projectile instanceof AbstractArrowEntity) + throwingEntity = ((AbstractArrowEntity) projectile).shootingEntity; + else if (projectile instanceof ThrowableEntity) + throwingEntity = ((ThrowableEntity) projectile).getThrower(); if (throwingEntity != null && throwingEntity.equals(eventEntityLiving)) continue; @@ -161,7 +161,7 @@ public class PotionEventHandlers { @SubscribeEvent public static void onPlayerRespawn(PlayerEvent.Clone event) { if (event.isWasDeath()) - event.getEntityPlayer().addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, 400)); + event.getEntityPlayer().addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, 400)); } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 204d1db4..31c3d98e 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -23,8 +23,8 @@ import WayofTime.bloodmagic.util.Constants; import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.RenderPlayer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.entity.PlayerRenderer; import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoaderRegistry; @@ -127,9 +127,9 @@ public class ClientProxy extends CommonProxy { } private void addElytraLayer() { - RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); + EntityRendererManager renderManager = Minecraft.getMinecraft().getRenderManager(); try { - Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); + Map skinMap = ObfuscationReflectionHelper.getPrivateValue(EntityRendererManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); BMLog.DEBUG.info("Elytra layer added"); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 93c0feb9..0ea30ab0 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.recipe.alchemyTable; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemBanner; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.item.*; +import net.minecraft.item.DyeColor; +import net.minecraft.item.BannerItem; +import net.minecraft.item.Items; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -65,16 +65,16 @@ public class AlchemyTableDyeableRecipe extends AlchemyTableRecipe { if (tagOrDyeStack.getItem() == Items.NAME_TAG) { if (!outputStack.hasTagCompound()) { - outputStack.setTagCompound(new NBTTagCompound()); + outputStack.setTagCompound(new CompoundNBT()); } outputStack.getTagCompound().setString(Constants.NBT.COLOR, tagOrDyeStack.getDisplayName()); return outputStack; } else { - EnumDyeColor dyeColor = ItemBanner.getBaseColor(tagOrDyeStack); + DyeColor dyeColor = BannerItem.getBaseColor(tagOrDyeStack); if (!outputStack.hasTagCompound()) { - outputStack.setTagCompound(new NBTTagCompound()); + outputStack.setTagCompound(new CompoundNBT()); } outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(Utils.DYE_COLOR_VALUES.getOrDefault(dyeColor, 0))); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java index 17162a39..9d6c401d 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.recipe.alchemyTable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.potion.BMPotionUtils; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectInstance; import net.minecraft.potion.PotionUtils; import java.util.ArrayList; @@ -14,9 +14,9 @@ import java.util.List; public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { protected double lengthAugment = 0; protected int powerAugment = 0; - protected Potion wantedPotion; + protected Effect wantedPotion; - public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, PotionEffect baseEffect, double lengthAugment, int powerAugment) { + public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect, double lengthAugment, int powerAugment) { super(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect); ArrayList recipe = new ArrayList<>(); @@ -30,14 +30,14 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { this.powerAugment = powerAugment; } - public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, PotionEffect baseEffect, double lengthAugment, int powerAugment) { + public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect, double lengthAugment, int powerAugment) { this(lpDrained, ticksRequired, tierRequired, Collections.singletonList(inputItem), baseEffect, lengthAugment, powerAugment); } @Override public boolean isPotionFlaskValidInput(ItemStack stack) { - List effectList = PotionUtils.getEffectsFromStack(stack); - for (PotionEffect eff : effectList) { + List effectList = PotionUtils.getEffectsFromStack(stack); + for (EffectInstance eff : effectList) { if (eff.getPotion() == wantedPotion) { double currentAugment = BMPotionUtils.getLengthAugment(stack, wantedPotion); @@ -53,9 +53,9 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { if (inputStack.isEmpty()) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - List effectList = new ArrayList<>(); + List effectList = new ArrayList<>(); int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), lengthAugment, powerAugment - baseEffect.getAmplifier()); - effectList.add(new PotionEffect(wantedPotion, potionLength, powerAugment - baseEffect.getAmplifier())); + effectList.add(new EffectInstance(wantedPotion, potionLength, powerAugment - baseEffect.getAmplifier())); BMPotionUtils.setEffects(outputStack, effectList); @@ -64,15 +64,15 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { ItemStack outputStack = inputStack.copy(); - List effectList = PotionUtils.getEffectsFromStack(outputStack); - List newEffectList = new ArrayList<>(); + List effectList = PotionUtils.getEffectsFromStack(outputStack); + List newEffectList = new ArrayList<>(); - for (PotionEffect effect : effectList) { + for (EffectInstance effect : effectList) { if (effect.getPotion() == wantedPotion) { double currentLengthAugment = Math.max(lengthAugment, BMPotionUtils.getLengthAugment(outputStack, wantedPotion)); int currentPowerAugment = Math.max(powerAugment, effect.getAmplifier()); int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), currentLengthAugment, currentPowerAugment); - newEffectList.add(new PotionEffect(wantedPotion, potionLength, currentPowerAugment)); + newEffectList.add(new EffectInstance(wantedPotion, potionLength, currentPowerAugment)); BMPotionUtils.setLengthAugment(outputStack, wantedPotion, currentLengthAugment); } else { newEffectList.add(effect); @@ -84,10 +84,10 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { return outputStack; } - public static ItemStack getAugmentedPotionFlask(PotionEffect baseEffect) { + public static ItemStack getAugmentedPotionFlask(EffectInstance baseEffect) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - List effectList = new ArrayList<>(); + List effectList = new ArrayList<>(); effectList.add(baseEffect); BMPotionUtils.setEffects(outputStack, effectList); diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index 172af124..6a7874d9 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.recipe.alchemyTable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.potion.PotionUtils; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -16,10 +16,10 @@ import java.util.List; public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { public static final ItemStack basePotionFlaskStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE); public static final int temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember = 3; - protected PotionEffect baseEffect; + protected EffectInstance baseEffect; protected double baseAddedImpurity = 5; - public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, PotionEffect baseEffect) { + public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect) { super(basePotionFlaskStack, lpDrained, ticksRequired, tierRequired); ArrayList recipe = new ArrayList<>(); @@ -30,7 +30,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { this.baseEffect = baseEffect; } - public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, PotionEffect baseEffect) { + public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect) { this(lpDrained, ticksRequired, tierRequired, Collections.singletonList(inputItem), baseEffect); } @@ -101,12 +101,12 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { } public boolean isPotionFlaskValidInput(ItemStack stack) { - List effectList = PotionUtils.getEffectsFromStack(stack); + List effectList = PotionUtils.getEffectsFromStack(stack); if (effectList.size() >= temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember) { return false; } - for (PotionEffect eff : effectList) { + for (EffectInstance eff : effectList) { if (eff.getPotion() == baseEffect.getPotion()) { return false; } @@ -119,7 +119,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { if (inputStack.isEmpty()) { ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - List effectList = new ArrayList<>(); + List effectList = new ArrayList<>(); effectList.add(baseEffect); PotionUtils.appendEffects(outputStack, effectList); @@ -129,7 +129,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { ItemStack outputStack = inputStack.copy(); - List effectList = PotionUtils.getEffectsFromStack(outputStack); + List effectList = PotionUtils.getEffectsFromStack(outputStack); effectList.add(baseEffect); PotionUtils.appendEffects(outputStack, effectList); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java index 80525583..c18f6f11 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.inversion.CorruptionHandler; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; public class ModCorruptionBlocks { public static void init() { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 6a748789..0d7ee452 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -6,15 +6,15 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.init.MobEffects; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; @@ -149,30 +149,30 @@ public class ModRecipes { } public static void addPotionRecipes() { - addPotionRecipe(1000, 1, new ItemStack(Items.GHAST_TEAR), new PotionEffect(MobEffects.REGENERATION, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.GOLDEN_CARROT), new PotionEffect(MobEffects.NIGHT_VISION, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.MAGMA_CREAM), new PotionEffect(MobEffects.FIRE_RESISTANCE, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.WATER_BUCKET), new PotionEffect(MobEffects.WATER_BREATHING, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.SUGAR), new PotionEffect(MobEffects.SPEED, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.SPECKLED_MELON), new PotionEffect(MobEffects.INSTANT_HEALTH, 1)); - addPotionRecipe(1000, 1, new ItemStack(Items.SPIDER_EYE), new PotionEffect(MobEffects.POISON, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.DYE, 1, 0), new PotionEffect(MobEffects.BLINDNESS, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.FERMENTED_SPIDER_EYE), new PotionEffect(MobEffects.WEAKNESS, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.BLAZE_POWDER), new PotionEffect(MobEffects.STRENGTH, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.FEATHER), new PotionEffect(MobEffects.JUMP_BOOST, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.CLAY_BALL), new PotionEffect(MobEffects.SLOWNESS, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.REDSTONE), new PotionEffect(MobEffects.HASTE, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.GLASS_BOTTLE), new PotionEffect(MobEffects.INVISIBILITY, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.POISONOUS_POTATO), new PotionEffect(MobEffects.SATURATION, 1)); - addPotionRecipe(1000, 1, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), new PotionEffect(MobEffects.HEALTH_BOOST, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Blocks.SLIME_BLOCK), new PotionEffect(RegistrarBloodMagic.BOUNCE, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new PotionEffect(RegistrarBloodMagic.CLING, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.CAKE), new PotionEffect(RegistrarBloodMagic.FLIGHT, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.GHAST_TEAR), new EffectInstance(Effects.REGENERATION, 450)); + addPotionRecipe(1000, 1, new ItemStack(Items.GOLDEN_CARROT), new EffectInstance(Effects.NIGHT_VISION, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.MAGMA_CREAM), new EffectInstance(Effects.FIRE_RESISTANCE, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.WATER_BUCKET), new EffectInstance(Effects.WATER_BREATHING, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.SUGAR), new EffectInstance(Effects.SPEED, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.SPECKLED_MELON), new EffectInstance(Effects.INSTANT_HEALTH, 1)); + addPotionRecipe(1000, 1, new ItemStack(Items.SPIDER_EYE), new EffectInstance(Effects.POISON, 450)); + addPotionRecipe(1000, 1, new ItemStack(Items.DYE, 1, 0), new EffectInstance(Effects.BLINDNESS, 450)); + addPotionRecipe(1000, 1, new ItemStack(Items.FERMENTED_SPIDER_EYE), new EffectInstance(Effects.WEAKNESS, 450)); + addPotionRecipe(1000, 1, new ItemStack(Items.BLAZE_POWDER), new EffectInstance(Effects.STRENGTH, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.FEATHER), new EffectInstance(Effects.JUMP_BOOST, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.CLAY_BALL), new EffectInstance(Effects.SLOWNESS, 450)); + addPotionRecipe(1000, 1, new ItemStack(Items.REDSTONE), new EffectInstance(Effects.HASTE, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.GLASS_BOTTLE), new EffectInstance(Effects.INVISIBILITY, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.POISONOUS_POTATO), new EffectInstance(Effects.SATURATION, 1)); + addPotionRecipe(1000, 1, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), new EffectInstance(Effects.HEALTH_BOOST, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Blocks.SLIME_BLOCK), new EffectInstance(RegistrarBloodMagic.BOUNCE, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new EffectInstance(RegistrarBloodMagic.CLING, 2 * 60 * 20)); + addPotionRecipe(1000, 1, new ItemStack(Items.CAKE), new EffectInstance(RegistrarBloodMagic.FLIGHT, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(RegistrarBloodMagic.DEAFNESS, 450)); + addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new EffectInstance(RegistrarBloodMagic.DEAFNESS, 450)); } - public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, PotionEffect baseEffect) { + public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, EffectInstance baseEffect) { AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(lpDrained, 100, tier, inputStack, baseEffect)); List lengtheningList = new ArrayList<>(); @@ -211,7 +211,7 @@ public class ModRecipes { Map> textMap = new HashMap<>(); for (int tick : entry.getValue().getValue()) { List textList = new ArrayList<>(); - textList.add(new TextComponentTranslation("\u00A74%s", new TextComponentTranslation(messageBase + str + "." + tick))); + textList.add(new TranslationTextComponent("\u00A74%s", new TranslationTextComponent(messageBase + str + "." + tick))); textMap.put(tick, textList); } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 57f5d24a..548b58b4 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -7,7 +7,7 @@ import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; public class ModRituals { // TODO Move elsewhere diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java index d4fd77b7..e8d5b9d3 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java @@ -4,18 +4,18 @@ import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.incense.EnumTranquilityType; import WayofTime.bloodmagic.incense.IncenseTranquilityRegistry; import WayofTime.bloodmagic.incense.TranquilityStack; -import net.minecraft.block.BlockFire; -import net.minecraft.block.BlockGrass; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockLog; +import net.minecraft.block.LeavesBlock; +import net.minecraft.block.LogBlock; +import net.minecraft.block.FireBlock; +import net.minecraft.block.GrassBlock; public class ModTranquilityHandlers { public static void init() { - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockLeaves ? new TranquilityStack(EnumTranquilityType.PLANT, 1.0D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockFire ? new TranquilityStack(EnumTranquilityType.FIRE, 1.0D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockGrass ? new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof BlockLog ? new TranquilityStack(EnumTranquilityType.TREE, 1.0D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof LeavesBlock ? new TranquilityStack(EnumTranquilityType.PLANT, 1.0D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof FireBlock ? new TranquilityStack(EnumTranquilityType.FIRE, 1.0D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof GrassBlock ? new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5D) : null); + IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof LogBlock ? new TranquilityStack(EnumTranquilityType.TREE, 1.0D) : null); IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> BloodMagicAPI.INSTANCE.getValueManager().getTranquility().get(state)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java index e51a062d..cba24d19 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.util.Constants; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.structure.template.PlacementSettings; -import net.minecraft.world.gen.structure.template.Template; +import net.minecraft.world.gen.feature.template.PlacementSettings; +import net.minecraft.world.gen.feature.template.Template; import java.util.ArrayList; import java.util.Collections; @@ -27,11 +27,11 @@ public abstract class AreaDescriptor implements Iterator { public abstract void resetIterator(); - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { } - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { } @@ -205,13 +205,13 @@ public abstract class AreaDescriptor implements Iterator { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { minimumOffset = new BlockPos(tag.getInteger(Constants.NBT.X_COORD + "min"), tag.getInteger(Constants.NBT.Y_COORD + "min"), tag.getInteger(Constants.NBT.Z_COORD + "min")); maximumOffset = new BlockPos(tag.getInteger(Constants.NBT.X_COORD + "max"), tag.getInteger(Constants.NBT.Y_COORD + "max"), tag.getInteger(Constants.NBT.Z_COORD + "max")); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { tag.setInteger(Constants.NBT.X_COORD + "min", minimumOffset.getX()); tag.setInteger(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); tag.setInteger(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java index c8800b94..cebfc676 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; +import net.minecraft.nbt.ByteNBT; import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagByte; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; import java.util.concurrent.Callable; @@ -10,13 +10,13 @@ import java.util.concurrent.Callable; public final class CapabilityRuneType { public static class RuneTypeStorage implements Capability.IStorage { @Override - public NBTBase writeNBT(Capability capability, IRitualStone.Tile instance, EnumFacing side) { - return new NBTTagByte((byte) instance.getRuneType().ordinal()); + public NBTBase writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) { + return new ByteNBT((byte) instance.getRuneType().ordinal()); } @Override - public void readNBT(Capability capability, IRitualStone.Tile instance, EnumFacing side, NBTBase nbt) { - instance.setRuneType(EnumRuneType.byMetadata(((NBTTagByte) nbt).getByte())); + public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, NBTBase nbt) { + instance.setRuneType(EnumRuneType.byMetadata(((ByteNBT) nbt).getByte())); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java index d827c436..eb0734d6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.Constants; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; @@ -47,7 +47,7 @@ public enum EnumRuneType implements IStringSerializable, ISubItem { @Override public ItemStack getStack(int count) { ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); tag.setInteger(Constants.NBT.USES, 10); ret.setTagCompound(tag); return ret; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java index 1ba75a6f..64e64175 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java @@ -3,9 +3,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -23,7 +23,7 @@ public interface IMasterRitualStone { SoulNetwork getOwnerNetwork(); - boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual); + boolean activateRitual(ItemStack activationCrystal, PlayerEntity activator, Ritual ritual); void performRitual(World world, BlockPos pos); @@ -37,7 +37,7 @@ public interface IMasterRitualStone { void setActive(boolean active); - EnumFacing getDirection(); + Direction getDirection(); boolean areTanksEmpty(); @@ -49,15 +49,15 @@ public interface IMasterRitualStone { String getNextBlockRange(String range); - void provideInformationOfRitualToPlayer(EntityPlayer player); + void provideInformationOfRitualToPlayer(PlayerEntity player); - void provideInformationOfRangeToPlayer(EntityPlayer player, String range); + void provideInformationOfRangeToPlayer(PlayerEntity player, String range); - void provideInformationOfWillConfigToPlayer(EntityPlayer player, List typeList); + void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList); - void setActiveWillConfig(EntityPlayer player, List typeList); + void setActiveWillConfig(PlayerEntity player, List typeList); - EnumReaderBoundaries setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2); + EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2); List getActiveWillConfig(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index d357c6c5..26d7f834 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -3,13 +3,13 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -49,17 +49,17 @@ public abstract class Ritual { this(name, crystalLevel, activationCost, null, unlocalizedName); } - public void readFromNBT(NBTTagCompound tag) { - NBTTagList tags = tag.getTagList("areas", 10); + public void readFromNBT(CompoundNBT tag) { + ListNBT tags = tag.getTagList("areas", 10); if (tags.isEmpty()) { return; } for (int i = 0; i < tags.tagCount(); i++) { - NBTTagCompound newTag = tags.getCompoundTagAt(i); + CompoundNBT newTag = tags.getCompoundTagAt(i); String rangeKey = newTag.getString("key"); - NBTTagCompound storedTag = newTag.getCompoundTag("area"); + CompoundNBT storedTag = newTag.getCompoundTag("area"); AreaDescriptor desc = this.getBlockRange(rangeKey); if (desc != null) { desc.readFromNBT(storedTag); @@ -67,13 +67,13 @@ public abstract class Ritual { } } - public void writeToNBT(NBTTagCompound tag) { - NBTTagList tags = new NBTTagList(); + public void writeToNBT(CompoundNBT tag) { + ListNBT tags = new ListNBT(); for (Entry entry : modableRangeMap.entrySet()) { - NBTTagCompound newTag = new NBTTagCompound(); + CompoundNBT newTag = new CompoundNBT(); newTag.setString("key", entry.getKey()); - NBTTagCompound storedTag = new NBTTagCompound(); + CompoundNBT storedTag = new CompoundNBT(); entry.getValue().writeToNBT(storedTag); @@ -88,7 +88,7 @@ public abstract class Ritual { /** * Called when the player attempts to activate the ritual. *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, EntityPlayer, Ritual)} + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} * * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is bound to * @param player - The activating player @@ -96,7 +96,7 @@ public abstract class Ritual { * owner of the ritual if being reactivated. * @return - Whether activation was successful */ - public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player, UUID owner) { + public boolean activateRitual(IMasterRitualStone masterRitualStone, PlayerEntity player, UUID owner) { return true; } @@ -216,10 +216,10 @@ public abstract class Ritual { return horizontalRangeMap.get(range); } - public ITextComponent getErrorForBlockRangeOnFail(EntityPlayer player, String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) { + public ITextComponent getErrorForBlockRangeOnFail(PlayerEntity player, String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) { AreaDescriptor descriptor = this.getBlockRange(range); if (descriptor == null) { - return new TextComponentTranslation("ritual.bloodmagic.blockRange.tooBig", "?"); + return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", "?"); } List willConfig = master.getActiveWillConfig(); @@ -230,21 +230,21 @@ public abstract class Ritual { int maxHorizontal = this.getMaxHorizontalRadiusForRange(range, willConfig, holder); if (maxVolume > 0 && descriptor.getVolumeForOffsets(offset1, offset2) > maxVolume) { - return new TextComponentTranslation("ritual.bloodmagic.blockRange.tooBig", maxVolume); + return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume); } else { - return new TextComponentTranslation("ritual.bloodmagic.blockRange.tooFar", maxVertical, maxHorizontal); + return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVertical, maxHorizontal); } } - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info")}; + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { + return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info")}; } - public ITextComponent provideInformationOfRangeToPlayer(EntityPlayer player, String range) { + public ITextComponent provideInformationOfRangeToPlayer(PlayerEntity player, String range) { if (getListOfRanges().contains(range)) { - return new TextComponentTranslation(this.getTranslationKey() + "." + range + ".info"); + return new TranslationTextComponent(this.getTranslationKey() + "." + range + ".info"); } else { - return new TextComponentTranslation("ritual.bloodmagic.blockRange.noRange"); + return new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java index 92feb8ec..9af0c1ab 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.ritual; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; /** @@ -16,7 +16,7 @@ public class RitualComponent { this.runeType = runeType; } - public int getX(EnumFacing direction) { + public int getX(Direction direction) { switch (direction) { case EAST: return -this.getOffset().getZ(); @@ -33,7 +33,7 @@ public class RitualComponent { return this.getOffset().getY(); } - public int getZ(EnumFacing direction) { + public int getZ(Direction direction) { switch (direction) { case EAST: return this.getOffset().getX(); @@ -46,7 +46,7 @@ public class RitualComponent { } } - public BlockPos getOffset(EnumFacing direction) { + public BlockPos getOffset(Direction direction) { return new BlockPos(getX(direction), offset.getY(), getZ(direction)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java index ff8aa0bc..70e5b951 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.util.BMLog; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.util.DamageSource; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.discovery.ASMDataTable; @@ -107,7 +107,7 @@ public class RitualManager { return ritualsReverse.get(ritual); } - public ImperfectRitual getImperfectRitual(IBlockState state) { + public ImperfectRitual getImperfectRitual(BlockState state) { for (ImperfectRitual ritual : imperfectRituals.values()) if (ritual.getBlockRequirement().test(state)) return ritual; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 38a405f9..ca4ecf43 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -2,9 +2,9 @@ package WayofTime.bloodmagic.ritual.harvest; import WayofTime.bloodmagic.util.BMLog; import net.minecraft.block.Block; -import net.minecraft.block.BlockCrops; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; +import net.minecraft.block.BlockState; +import net.minecraft.block.CropsBlock; +import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -51,7 +51,7 @@ public class HarvestHandlerPlantable implements IHarvestHandler { } @Override - public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { + public boolean harvest(World world, BlockPos pos, BlockState state, List drops) { NonNullList blockDrops = NonNullList.create(); state.getBlock().getDrops(blockDrops, world, pos, state, 0); boolean foundSeed = false; @@ -84,7 +84,7 @@ public class HarvestHandlerPlantable implements IHarvestHandler { } @Override - public boolean test(World world, BlockPos pos, IBlockState state) { + public boolean test(World world, BlockPos pos, BlockState state) { return HarvestRegistry.getStandardCrops().containsKey(state.getBlock()) && state.getBlock().getMetaFromState(state) == HarvestRegistry.getStandardCrops().get(state.getBlock()); } @@ -106,7 +106,7 @@ public class HarvestHandlerPlantable implements IHarvestHandler { Field names = pamRegistry.getDeclaredField("cropNames"); Method getCrop = pamRegistry.getMethod("getCrop", String.class); for (String name : (String[]) names.get(null)) { - BlockCrops crop = (BlockCrops) getCrop.invoke(null, name); + CropsBlock crop = (CropsBlock) getCrop.invoke(null, name); HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); } } catch (ClassNotFoundException e) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 7a0ef364..582b1dff 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual.harvest; -import net.minecraft.block.BlockPumpkin; -import net.minecraft.block.BlockStem; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; +import net.minecraft.block.PumpkinBlock; +import net.minecraft.block.StemBlock; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,27 +17,27 @@ import java.util.List; * Harvest handler for crops with stems such as Pumpkins and Melons. Rotation based crop blocks are a good reason * to use this (see pumpkins).
    * Register a new crop for this handler with - * {@link HarvestRegistry#registerStemCrop(IBlockState, IBlockState)} + * {@link HarvestRegistry#registerStemCrop(BlockState, BlockState)} */ public class HarvestHandlerStem implements IHarvestHandler { public HarvestHandlerStem() { - for (EnumFacing facing : EnumFacing.HORIZONTALS) - HarvestRegistry.registerStemCrop(Blocks.PUMPKIN.getDefaultState().withProperty(BlockPumpkin.FACING, facing), Blocks.PUMPKIN_STEM.getDefaultState().withProperty(BlockStem.AGE, 7)); + for (Direction facing : Direction.HORIZONTALS) + HarvestRegistry.registerStemCrop(Blocks.PUMPKIN.getDefaultState().withProperty(PumpkinBlock.FACING, facing), Blocks.PUMPKIN_STEM.getDefaultState().withProperty(StemBlock.AGE, 7)); - HarvestRegistry.registerStemCrop(Blocks.MELON_BLOCK.getDefaultState(), Blocks.MELON_STEM.getDefaultState().withProperty(BlockStem.AGE, 7)); + HarvestRegistry.registerStemCrop(Blocks.MELON_BLOCK.getDefaultState(), Blocks.MELON_STEM.getDefaultState().withProperty(StemBlock.AGE, 7)); } @Override - public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { - EnumFacing cropDir = state.getActualState(world, pos).getValue(BlockStem.FACING); + public boolean harvest(World world, BlockPos pos, BlockState state, List drops) { + Direction cropDir = state.getActualState(world, pos).getValue(StemBlock.FACING); - if (cropDir != EnumFacing.UP) { + if (cropDir != Direction.UP) { BlockPos cropPos = pos.offset(cropDir); - IBlockState probableCrop = world.getBlockState(cropPos); - Collection registeredCrops = HarvestRegistry.getStemCrops().get(state); + BlockState probableCrop = world.getBlockState(cropPos); + Collection registeredCrops = HarvestRegistry.getStemCrops().get(state); - for (IBlockState registeredCrop : registeredCrops) { + for (BlockState registeredCrop : registeredCrops) { if (registeredCrop == probableCrop) { NonNullList blockDrops = NonNullList.create(); probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0); @@ -52,7 +52,7 @@ public class HarvestHandlerStem implements IHarvestHandler { } @Override - public boolean test(World world, BlockPos pos, IBlockState state) { + public boolean test(World world, BlockPos pos, BlockState state) { return HarvestRegistry.getStemCrops().containsKey(state); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index 544a3d83..7f75934d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.harvest; -import net.minecraft.block.BlockCactus; -import net.minecraft.block.BlockReed; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; +import net.minecraft.block.CactusBlock; +import net.minecraft.block.SugarCaneBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; @@ -14,20 +14,20 @@ import java.util.List; /** * Harvest handler for crops that grow vertically such as Sugar Cane and Cactus.
    * Register a new crop for this handler with - * {@link HarvestRegistry#registerTallCrop(IBlockState)} + * {@link HarvestRegistry#registerTallCrop(BlockState)} */ public class HarvestHandlerTall implements IHarvestHandler { public HarvestHandlerTall() { for (int i = 0; i < 15; i++) { - HarvestRegistry.registerTallCrop(Blocks.REEDS.getDefaultState().withProperty(BlockReed.AGE, i)); - HarvestRegistry.registerTallCrop(Blocks.CACTUS.getDefaultState().withProperty(BlockCactus.AGE, i)); + HarvestRegistry.registerTallCrop(Blocks.REEDS.getDefaultState().withProperty(SugarCaneBlock.AGE, i)); + HarvestRegistry.registerTallCrop(Blocks.CACTUS.getDefaultState().withProperty(CactusBlock.AGE, i)); } } @Override - public boolean harvest(World world, BlockPos pos, IBlockState state, List drops) { - IBlockState up = world.getBlockState(pos.up()); + public boolean harvest(World world, BlockPos pos, BlockState state, List drops) { + BlockState up = world.getBlockState(pos.up()); if (up.getBlock() == state.getBlock()) { NonNullList blockDrops = NonNullList.create(); up.getBlock().getDrops(blockDrops, world, pos.up(), up, 0); @@ -40,7 +40,7 @@ public class HarvestHandlerTall implements IHarvestHandler { } @Override - public boolean test(World world, BlockPos pos, IBlockState state) { + public boolean test(World world, BlockPos pos, BlockState state) { return HarvestRegistry.getTallCrops().contains(state); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java index 82c403e6..2338a34a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.ritual.harvest; import com.google.common.collect.*; import net.minecraft.block.Block; -import net.minecraft.block.BlockStem; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; +import net.minecraft.block.StemBlock; import java.util.List; import java.util.Map; @@ -13,9 +13,9 @@ public class HarvestRegistry { private static final List HARVEST_HANDLERS = Lists.newArrayList(); private static final Map STANDARD_CROPS = Maps.newHashMap(); - private static final Set TALL_CROPS = Sets.newHashSet(); - private static final Multimap STEM_CROPS = ArrayListMultimap.create(); - private static final Map AMPLIFIERS = Maps.newHashMap(); + private static final Set TALL_CROPS = Sets.newHashSet(); + private static final Multimap STEM_CROPS = ArrayListMultimap.create(); + private static final Map AMPLIFIERS = Maps.newHashMap(); /** * Registers a handler for the Harvest Ritual to call. @@ -49,7 +49,7 @@ public class HarvestRegistry { * * @param crop - The crop block to handle. */ - public static void registerTallCrop(IBlockState crop) { + public static void registerTallCrop(BlockState crop) { if (!TALL_CROPS.contains(crop)) TALL_CROPS.add(crop); } @@ -62,13 +62,13 @@ public class HarvestRegistry { * Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to * accept any meta for the crop block. *

    - * The Stem must be instanceof {@link BlockStem} + * The Stem must be instanceof {@link StemBlock} * * @param crop - The crop block to handle. * @param stem - The stem of the crop */ - public static void registerStemCrop(IBlockState crop, IBlockState stem) { - if (!STEM_CROPS.containsKey(crop) && stem.getBlock() instanceof BlockStem) + public static void registerStemCrop(BlockState crop, BlockState stem) { + if (!STEM_CROPS.containsKey(crop) && stem.getBlock() instanceof StemBlock) STEM_CROPS.put(stem, crop); } @@ -78,7 +78,7 @@ public class HarvestRegistry { * @param block - The block for the amplifier. * @param range - The range the amplifier provides. */ - public static void registerRangeAmplifier(IBlockState block, int range) { + public static void registerRangeAmplifier(BlockState block, int range) { if (!AMPLIFIERS.containsKey(block)) AMPLIFIERS.put(block, range); } @@ -91,15 +91,15 @@ public class HarvestRegistry { return ImmutableMap.copyOf(STANDARD_CROPS); } - public static Set getTallCrops() { + public static Set getTallCrops() { return ImmutableSet.copyOf(TALL_CROPS); } - public static Multimap getStemCrops() { + public static Multimap getStemCrops() { return ImmutableMultimap.copyOf(STEM_CROPS); } - public static Map getAmplifiers() { + public static Map getAmplifiers() { return ImmutableMap.copyOf(AMPLIFIERS); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java index b8b49316..e2e50824 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.ritual.harvest; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -18,20 +18,20 @@ public interface IHarvestHandler { * Add the items to be dropped to the drops list.
    * * @param world - The world - * @param pos - The position of the {@link IBlockState} being checked - * @param state - The {@link IBlockState} being checked + * @param pos - The position of the {@link BlockState} being checked + * @param state - The {@link BlockState} being checked * @param drops - The items to be dropped * @return If the block was successfully harvested. */ - boolean harvest(World world, BlockPos pos, IBlockState state, List drops); + boolean harvest(World world, BlockPos pos, BlockState state, List drops); /** * Tests to see if the block is valid for harvest. * * @param world The world - * @param pos The position in the world of the {@link IBlockState} being checked - * @param state The {@link IBlockState} being checked + * @param pos The position in the world of the {@link BlockState} being checked + * @param state The {@link BlockState} being checked * @return if this block is valid for harvest. */ - boolean test(World world, BlockPos pos, IBlockState state); + boolean test(World world, BlockPos pos, BlockState state); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java index 205bdf87..e18477ed 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.ritual.imperfect; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -11,7 +11,7 @@ import net.minecraft.world.World; */ public interface IImperfectRitualStone { - boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player); + boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, PlayerEntity player); World getRitualWorld(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java index 3a314984..5f2169a1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual.imperfect; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.World; import java.util.function.Predicate; @@ -12,12 +12,12 @@ import java.util.function.Predicate; public abstract class ImperfectRitual { private final String name; - private final Predicate blockRequirement; + private final Predicate blockRequirement; private final int activationCost; private final boolean lightShow; private final String unlocalizedName; - public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, boolean lightShow, String unlocalizedName) { + public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, boolean lightShow, String unlocalizedName) { this.name = name; this.blockRequirement = blockRequirement; this.activationCost = activationCost; @@ -30,25 +30,25 @@ public abstract class ImperfectRitual { * @param blockRequirement The block required above the ImperfectRitualStone * @param activationCost Base LP cost for activating the ritual */ - public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, String unlocalizedName) { + public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, String unlocalizedName) { this(name, blockRequirement, activationCost, false, unlocalizedName); } /** * Called when the player activates the ritual - * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, EntityPlayer)} + * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, PlayerEntity)} * * @param imperfectRitualStone - The {@link IImperfectRitualStone} that the ritual is bound to * @param player - The player activating the ritual * @return - Whether activation was successful */ - public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player); + public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player); public String getName() { return name; } - public Predicate getBlockRequirement() { + public Predicate getBlockRequirement() { return blockRequirement; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 9e3592b9..f28025da 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -10,13 +10,13 @@ import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; +import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.inventory.IInventory; +import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; @@ -156,7 +156,7 @@ public class RitualAltarBuilder extends Ritual { } public void lightning(World world, BlockPos blockPos) { - world.addWeatherEffect(new EntityLightningBolt(world, blockPos.getX(), blockPos.getY(), blockPos.getZ(), true)); + world.addWeatherEffect(new LightningBoltEntity(world, blockPos.getX(), blockPos.getY(), blockPos.getZ(), true)); } /* @@ -166,8 +166,8 @@ public class RitualAltarBuilder extends Ritual { */ public boolean hasItem(TileEntity tileEntity, Item item, int damage, boolean consumeItem) { if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { + IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); if (itemHandler.getSlots() <= 0) { return false; @@ -195,15 +195,15 @@ public class RitualAltarBuilder extends Ritual { public BlockStack getBloodRune(TileEntity tileEntity) { if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { + IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); if (itemHandler.getSlots() <= 0) { return null; } for (int i = 0; i < itemHandler.getSlots(); i++) { - if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof ItemBlock && Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune && itemHandler.extractItem(i, 1, true) != null) { + if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof BlockItem && Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune && itemHandler.extractItem(i, 1, true) != null) { BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(ComponentType.BLOODRUNE), itemHandler.getStackInSlot(i).getItemDamage()); itemHandler.extractItem(i, 1, false); return blockStack; @@ -212,7 +212,7 @@ public class RitualAltarBuilder extends Ritual { } else if (tileEntity instanceof IInventory) { IInventory inv = (IInventory) tileEntity; for (int i = 0; i < inv.getSizeInventory(); i++) { - if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof ItemBlock && Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune) { + if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof BlockItem && Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune) { BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(ComponentType.BLOODRUNE), inv.getStackInSlot(i).getItemDamage()); inv.decrStackSize(i, 1); return blockStack; @@ -225,15 +225,15 @@ public class RitualAltarBuilder extends Ritual { public BlockStack getMundaneBlock(TileEntity tileEntity) { if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { + IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); if (itemHandler.getSlots() <= 0) { return null; } for (int i = 0; i < itemHandler.getSlots(); i++) { - if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune) && !itemHandler.extractItem(i, 1, true).isEmpty()) { + if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof BlockItem && !(Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune) && !itemHandler.extractItem(i, 1, true).isEmpty()) { Block block = Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()); if (block != Blocks.AIR && block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK) { BlockStack blockStack = new BlockStack(block, itemHandler.getStackInSlot(i).getItemDamage()); @@ -245,7 +245,7 @@ public class RitualAltarBuilder extends Ritual { } else if (tileEntity instanceof IInventory) { IInventory inv = (IInventory) tileEntity; for (int i = 0; i < inv.getSizeInventory(); i++) { - if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune)) { + if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof BlockItem && !(Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune)) { Block block = Block.getBlockFromItem(inv.getStackInSlot(i).getItem()); if (block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK) { BlockStack blockStack = new BlockStack(block, inv.getStackInSlot(i).getItemDamage()); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index 15bb17ac..a6b61133 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -6,15 +6,15 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -85,11 +85,11 @@ public class RitualAnimalGrowth extends Ritual { AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROWTH_RANGE); AxisAlignedBB axis = growingRange.getAABB(masterRitualStone.getBlockPos()); - List animalList = world.getEntitiesWithinAABB(EntityAnimal.class, axis); + List animalList = world.getEntitiesWithinAABB(AnimalEntity.class, axis); boolean performedEffect = false; - for (EntityAnimal animal : animalList) { + for (AnimalEntity animal : animalList) { if (animal.getGrowingAge() < 0) { animal.addGrowth(5); totalGrowths++; @@ -109,7 +109,7 @@ public class RitualAnimalGrowth extends Ritual { if (kamikaze) { if (destructiveWill >= destructiveWillDrain) { if (!animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { - animal.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SACRIFICIAL_LAMB, 1200)); + animal.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SACRIFICIAL_LAMB, 1200)); destructiveDrain += destructiveWillDrain; destructiveWill -= destructiveWillDrain; performedEffect = true; @@ -190,14 +190,14 @@ public class RitualAnimalGrowth extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { return new ITextComponent[]{ - new TextComponentTranslation(this.getTranslationKey() + ".info"), - new TextComponentTranslation(this.getTranslationKey() + ".default.info"), - new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), - new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), - new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), - new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info") + new TranslationTextComponent(this.getTranslationKey() + ".info"), + new TranslationTextComponent(this.getTranslationKey() + ".default.info"), + new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), + new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java index 8f2ed0a5..482acf7c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java @@ -5,8 +5,8 @@ import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.ritual.*; import com.google.common.collect.Iterables; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.effect.LightningBoltEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -35,9 +35,9 @@ public class RitualArmourEvolve extends Ritual { AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos)); + List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, checkRange.getAABB(pos)); - for (EntityPlayer player : playerList) { + for (PlayerEntity player : playerList) { if (LivingArmour.hasFullSet(player)) { ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); @@ -48,7 +48,7 @@ public class RitualArmourEvolve extends Ritual { masterRitualStone.setActive(false); - world.spawnEntity(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); + world.spawnEntity(new LightningBoltEntity(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java index f0617d47..2e91a184 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java index 36d31b14..a126275b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -29,7 +29,7 @@ public class RitualCondor extends Ritual { int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - List entityPlayers = world.getEntitiesWithinAABB(EntityPlayer.class, aabb); + List entityPlayers = world.getEntitiesWithinAABB(PlayerEntity.class, aabb); int entityCount = entityPlayers.size(); if (currentEssence < getRefreshCost() * entityCount) { @@ -37,8 +37,8 @@ public class RitualCondor extends Ritual { return; } else { entityCount = 0; - for (EntityPlayer player : entityPlayers) { - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FLIGHT, 20, 0)); + for (PlayerEntity player : entityPlayers) { + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FLIGHT, 20, 0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java index a8224955..d458bd29 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -31,8 +31,8 @@ public class RitualContainment extends Ritual { AreaDescriptor containmentRange = masterRitualStone.getBlockRange(CONTAINMENT_RANGE); - for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) + for (LivingEntity entity : world.getEntitiesWithinAABB(LivingEntity.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) { + if (entity instanceof PlayerEntity && (((PlayerEntity) entity).capabilities.isCreativeMode || ((PlayerEntity) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) continue; double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 4b6d7955..99cc2548 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -2,8 +2,6 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.compress.CompressionRegistry; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.crushing.CrushingRegistry; import WayofTime.bloodmagic.ritual.crushing.ICrushingHandler; @@ -13,25 +11,23 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.function.Consumer; @RitualRegister("crushing") @@ -73,7 +69,7 @@ public class RitualCrushing extends Ritual { AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - if (tile != null && Utils.getNumberOfFreeSlots(tile, EnumFacing.DOWN) < 1) { + if (tile != null && Utils.getNumberOfFreeSlots(tile, Direction.DOWN) < 1) { return; } @@ -104,7 +100,7 @@ public class RitualCrushing extends Ritual { continue; } - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); Block block = state.getBlock(); if (block.equals(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER) || block.equals(RegistrarBloodMagicBlocks.RITUAL_STONE) || block.getBlockHardness(state, world, newPos) == -1.0F || Utils.isBlockLiquid(state)) { continue; @@ -134,12 +130,12 @@ public class RitualCrushing extends Ritual { } if (tile != null) { - result = Utils.insertStackIntoTile(result, tile, EnumFacing.DOWN); + result = Utils.insertStackIntoTile(result, tile, Direction.DOWN); if (!result.isEmpty()) { - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, result); + Utils.spawnStackAtBlock(world, pos, Direction.UP, result); } } else { - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, result); + Utils.spawnStackAtBlock(world, pos, Direction.UP, result); } WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, willDrain, true); @@ -153,7 +149,7 @@ public class RitualCrushing extends Ritual { } - if (!isBlockClaimed && isSilkTouch && block.canSilkHarvest(world, newPos, state, getFakePlayer((WorldServer) world))) { + if (!isBlockClaimed && isSilkTouch && block.canSilkHarvest(world, newPos, state, getFakePlayer((ServerWorld) world))) { ItemStack checkStack = block.getItem(world, newPos, state); if (checkStack.isEmpty()) { continue; @@ -169,12 +165,12 @@ public class RitualCrushing extends Ritual { } if (tile != null) - copyStack = Utils.insertStackIntoTile(copyStack, tile, EnumFacing.DOWN); + copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); else - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, copyStack); + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); if (!copyStack.isEmpty()) { - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, copyStack); + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); } } else if (!isBlockClaimed) { if (fortune > 0 && destructiveWill < destructiveWillDrain) { @@ -187,13 +183,13 @@ public class RitualCrushing extends Ritual { ItemStack copyStack = item.copy(); if (tile != null) { - copyStack = Utils.insertStackIntoTile(copyStack, tile, EnumFacing.DOWN); + copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); } else { - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, copyStack); + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); continue; } if (!copyStack.isEmpty()) { - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, copyStack); + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); } } @@ -220,7 +216,7 @@ public class RitualCrushing extends Ritual { if (pair.getRight()) { ItemStack returned = pair.getLeft(); if (returned != null) { - Utils.spawnStackAtBlock(world, pos, EnumFacing.UP, returned); + Utils.spawnStackAtBlock(world, pos, Direction.UP, returned); } WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulWillDrain, true); @@ -259,14 +255,14 @@ public class RitualCrushing extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { return new ITextComponent[]{ - new TextComponentTranslation(this.getTranslationKey() + ".info"), - new TextComponentTranslation(this.getTranslationKey() + ".default.info"), - new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), - new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), - new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), - new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info") + new TranslationTextComponent(this.getTranslationKey() + ".info"), + new TranslationTextComponent(this.getTranslationKey() + ".default.info"), + new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), + new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; } @@ -280,7 +276,7 @@ public class RitualCrushing extends Ritual { cuttingFluidWillMap.put(stack, willDrain); } - private FakePlayer getFakePlayer(WorldServer world) { + private FakePlayer getFakePlayer(ServerWorld world) { return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_crushing")) : fakePlayer; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java index 7382f09f..2e66f058 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,7 +44,7 @@ public class RitualCrystalHarvest extends Ritual { if (tile instanceof TileDemonCrystal) { TileDemonCrystal demonCrystal = (TileDemonCrystal) tile; if (demonCrystal.dropSingleCrystal()) { - IBlockState state = world.getBlockState(nextPos); + BlockState state = world.getBlockState(nextPos); world.notifyBlockUpdate(nextPos, state, state, 3); totalEffects++; if (totalEffects >= maxEffects) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java index 70b683f9..7a74317f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java @@ -3,13 +3,13 @@ package WayofTime.bloodmagic.ritual.types; import java.util.function.Consumer; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; @@ -33,7 +33,7 @@ public class RitualCrystalSplit extends Ritual { } BlockPos pos = masterRitualStone.getBlockPos(); - EnumFacing direction = masterRitualStone.getDirection(); + Direction direction = masterRitualStone.getDirection(); BlockPos rawPos = pos.up(2); TileEntity tile = world.getTileEntity(rawPos); @@ -41,14 +41,14 @@ public class RitualCrystalSplit extends Ritual { return; } - IBlockState rawState = world.getBlockState(rawPos); + BlockState rawState = world.getBlockState(rawPos); TileDemonCrystal rawTile = (TileDemonCrystal) tile; if (rawTile.crystalCount >= 5) { - BlockPos vengefulPos = pos.offset(rotateFacing(EnumFacing.NORTH, direction)).up(); - BlockPos corrosivePos = pos.offset(rotateFacing(EnumFacing.EAST, direction)).up(); - BlockPos steadfastPos = pos.offset(rotateFacing(EnumFacing.SOUTH, direction)).up(); - BlockPos destructivePos = pos.offset(rotateFacing(EnumFacing.WEST, direction)).up(); + BlockPos vengefulPos = pos.offset(rotateFacing(Direction.NORTH, direction)).up(); + BlockPos corrosivePos = pos.offset(rotateFacing(Direction.EAST, direction)).up(); + BlockPos steadfastPos = pos.offset(rotateFacing(Direction.SOUTH, direction)).up(); + BlockPos destructivePos = pos.offset(rotateFacing(Direction.WEST, direction)).up(); int vengefulCrystals = 0; int corrosiveCrystals = 0; @@ -102,7 +102,7 @@ public class RitualCrystalSplit extends Ritual { } } - public EnumFacing rotateFacing(EnumFacing facing, EnumFacing rotation) { + public Direction rotateFacing(Direction facing, Direction rotation) { switch (rotation) { case EAST: return facing.rotateY(); @@ -123,7 +123,7 @@ public class RitualCrystalSplit extends Ritual { TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); tile.crystalCount++; tile.markDirty(); - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); world.notifyBlockUpdate(pos, state, state, 3); } } @@ -156,7 +156,7 @@ public class RitualCrystalSplit extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info")}; + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { + return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info")}; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java index cece930d..9e6a33bd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java @@ -3,11 +3,11 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -57,8 +57,8 @@ public class RitualEllipsoid extends Ritual { int maxZ = (int) (sphereBB.maxZ - masterPos.getZ()) - 1; if (tileInventory != null) { - if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { + IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); if (itemHandler.getSlots() <= 0) { return; @@ -67,7 +67,7 @@ public class RitualEllipsoid extends Ritual { int blockSlot = -1; for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) { ItemStack stack = itemHandler.extractItem(invSlot, 1, true); - if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock)) + if (stack.isEmpty() || !(stack.getItem() instanceof BlockItem)) continue; blockSlot = invSlot; @@ -111,7 +111,7 @@ public class RitualEllipsoid extends Ritual { continue; } - IBlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(blockSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(blockSlot).getItemDamage()); + BlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(blockSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(blockSlot).getItemDamage()); world.setBlockState(newPos, placeState); itemHandler.extractItem(blockSlot, 1, false); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java index e2b668a1..5c03479f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java @@ -8,8 +8,8 @@ import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -67,12 +67,12 @@ public class RitualEternalSoul extends Ritual { int horizontalRange = 15; int verticalRange = 20; - List list = world.getEntitiesWithinAABB(EntityPlayer.class, + List list = world.getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(pos.getX() - 0.5f, pos.getY() - 0.5f, pos.getZ() - 0.5f, pos.getX() + 0.5f, pos.getY() + 0.5f, pos.getZ() + 0.5f) .expand(horizontalRange, verticalRange, horizontalRange).expand(0, -verticalRange, 0)); - EntityPlayer entityOwner = PlayerHelper.getPlayerFromUUID(owner); + PlayerEntity entityOwner = PlayerHelper.getPlayerFromUUID(owner); int fillAmount = Math.min(currentEssence / 2, altar.fill(new FluidStack(BlockLifeEssence.getLifeEssence(), 10000), false)); @@ -81,8 +81,8 @@ public class RitualEternalSoul extends Ritual { if (entityOwner != null && list.contains(entityOwner) && entityOwner.getHealth() > 2.0f && fillAmount != 0) entityOwner.setHealth(2.0f); - for (EntityPlayer player : list) - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, 100)); + for (PlayerEntity player : list) + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, 100)); masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(fillAmount * 2)); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java index 358925b5..0ec231d5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java @@ -6,10 +6,10 @@ import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; import com.google.common.collect.Lists; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumParticleTypes; @@ -70,7 +70,7 @@ public class RitualExpulsion extends Ritual { final int teleportDistance = 100; - for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, expulsionRange.getAABB(masterRitualStone.getBlockPos()))) { + for (PlayerEntity player : world.getEntitiesWithinAABB(PlayerEntity.class, expulsionRange.getAABB(masterRitualStone.getBlockPos()))) { if (player.capabilities.isCreativeMode || player.getGameProfile().getId().equals(masterRitualStone.getOwner()) || whitelist.contains(player.getGameProfile().getId())) continue; @@ -81,9 +81,9 @@ public class RitualExpulsion extends Ritual { whitelist.clear(); } - public boolean teleportRandomly(EntityLivingBase entityLiving, double distance) { - if (entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entityLiving; + public boolean teleportRandomly(LivingEntity entityLiving, double distance) { + if (entityLiving instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entityLiving; if (player.capabilities.isCreativeMode) return false; } @@ -107,7 +107,7 @@ public class RitualExpulsion extends Ritual { return i >= 100; } - public boolean teleportTo(EntityLivingBase entityLiving, double par1, double par3, double par5, double lastX, double lastY, double lastZ) { + public boolean teleportTo(LivingEntity entityLiving, double par1, double par3, double par5, double lastX, double lastY, double lastZ) { EnderTeleportEvent event = new EnderTeleportEvent(entityLiving, par1, par3, par5, 0); if (MinecraftForge.EVENT_BUS.post(event)) { @@ -125,7 +125,7 @@ public class RitualExpulsion extends Ritual { boolean flag1 = false; while (!flag1 && j > 0) { - IBlockState state = entityLiving.getEntityWorld().getBlockState(new BlockPos(i, j - 1, k)); + BlockState state = entityLiving.getEntityWorld().getBlockState(new BlockPos(i, j - 1, k)); if (state.getMaterial().blocksMovement()) { flag1 = true; @@ -163,9 +163,9 @@ public class RitualExpulsion extends Ritual { } } - public void moveEntityViaTeleport(EntityLivingBase entityLiving, double x, double y, double z) { - if (entityLiving instanceof EntityPlayerMP) { - EntityPlayerMP player = (EntityPlayerMP) entityLiving; + public void moveEntityViaTeleport(LivingEntity entityLiving, double x, double y, double z) { + if (entityLiving instanceof ServerPlayerEntity) { + ServerPlayerEntity player = (ServerPlayerEntity) entityLiving; EnderTeleportEvent event = new EnderTeleportEvent(player, x, y, z, 5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java index 823ceb1b..ea4d70e8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java @@ -3,9 +3,9 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.LightningBoltEntity; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -42,22 +42,22 @@ public class RitualFeatheredEarth extends Ritual { int totalEffects = 0; if (masterRitualStone.getCooldown() > 0) { - world.addWeatherEffect(new EntityLightningBolt(world, x + 4, y + 5, z + 4, false)); - world.addWeatherEffect(new EntityLightningBolt(world, x + 4, y + 5, z - 4, false)); - world.addWeatherEffect(new EntityLightningBolt(world, x - 4, y + 5, z - 4, false)); - world.addWeatherEffect(new EntityLightningBolt(world, x - 4, y + 5, z + 4, false)); + world.addWeatherEffect(new LightningBoltEntity(world, x + 4, y + 5, z + 4, false)); + world.addWeatherEffect(new LightningBoltEntity(world, x + 4, y + 5, z - 4, false)); + world.addWeatherEffect(new LightningBoltEntity(world, x - 4, y + 5, z - 4, false)); + world.addWeatherEffect(new LightningBoltEntity(world, x - 4, y + 5, z + 4, false)); masterRitualStone.setCooldown(0); } AreaDescriptor fallProtRange = masterRitualStone.getBlockRange(FALL_PROTECTION_RANGE); AxisAlignedBB fallProtBB = fallProtRange.getAABB(masterRitualStone.getBlockPos()); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, fallProtBB); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, fallProtBB); - for (EntityLivingBase entity : entities) { + for (LivingEntity entity : entities) { if (totalEffects >= maxEffects) { break; } - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FEATHERED, 20, 0)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FEATHERED, 20, 0)); totalEffects++; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index 352725a3..9fe7fa5a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -12,15 +12,15 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import java.util.List; @@ -105,9 +105,9 @@ public class RitualFeatheredKnife extends Ritual { double destructiveDrain = 0; - List entities = world.getEntitiesWithinAABB(EntityPlayer.class, range); + List entities = world.getEntitiesWithinAABB(PlayerEntity.class, range); - for (EntityPlayer player : entities) { + for (PlayerEntity player : entities) { float healthThreshold = steadfastWill >= steadfastWillThreshold ? 0.7f : 0.3f; if (vengefulWill >= vengefulWillThreshold && !player.getGameProfile().getId().equals(masterRitualStone.getOwner())) { @@ -128,7 +128,7 @@ public class RitualFeatheredKnife extends Ritual { lpModifier *= PlayerSacrificeHelper.getModifier(incenseAmount); PlayerSacrificeHelper.setPlayerIncense(player, 0); - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, PlayerSacrificeHelper.soulFrayDuration)); + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, PlayerSacrificeHelper.soulFrayDuration)); } if (destructiveWill >= destructiveWillDrain * sacrificedHealth) { @@ -138,7 +138,7 @@ public class RitualFeatheredKnife extends Ritual { } if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack); @@ -202,8 +202,8 @@ public class RitualFeatheredKnife extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { + return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; } public double getLPModifierForWill(double destructiveWill) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java index c116c0b5..78a31db5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java @@ -3,11 +3,11 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.block.BlockState; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -69,7 +69,7 @@ public class RitualFelling extends Ritual { if (blockPosIterator.hasNext() && tileInventory != null) { masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); currentPos = blockPosIterator.next(); - IItemHandler inventory = Utils.getInventory(tileInventory, EnumFacing.DOWN); + IItemHandler inventory = Utils.getInventory(tileInventory, Direction.DOWN); placeInInventory(world.getBlockState(currentPos), world, currentPos, inventory); world.setBlockToAir(currentPos); blockPosIterator.remove(); @@ -97,14 +97,14 @@ public class RitualFelling extends Ritual { return new RitualFelling(); } - private void placeInInventory(IBlockState choppedState, World world, BlockPos choppedPos, @Nullable IItemHandler inventory) { + private void placeInInventory(BlockState choppedState, World world, BlockPos choppedPos, @Nullable IItemHandler inventory) { if (inventory == null) return; for (ItemStack stack : choppedState.getBlock().getDrops(world, choppedPos, world.getBlockState(choppedPos), 0)) { ItemStack remainder = ItemHandlerHelper.insertItem(inventory, stack, false); if (!remainder.isEmpty()) - world.spawnEntity(new EntityItem(world, choppedPos.getX() + 0.4, choppedPos.getY() + 2, choppedPos.getZ() + 0.4, remainder)); + world.spawnEntity(new ItemEntity(world, choppedPos.getX() + 0.4, choppedPos.getY() + 2, choppedPos.getZ() + 0.4, remainder)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index ea908c27..a77b9506 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -42,7 +42,7 @@ public class RitualForsakenSoul extends Ritual { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); willBuffer = tag.getDouble("willBuffer"); @@ -58,7 +58,7 @@ public class RitualForsakenSoul extends Ritual { } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); tag.setDouble("willBuffer", willBuffer); @@ -100,20 +100,20 @@ public class RitualForsakenSoul extends Ritual { AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); AxisAlignedBB range = damageRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, range); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, range); - for (EntityLivingBase entity : entities) { + for (LivingEntity entity : entities) { EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) continue; - if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { + if (entity.isEntityAlive() && !(entity instanceof PlayerEntity)) { if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) { if (!entity.isEntityAlive()) { int uniqueness = calculateUniqueness(entity); double modifier = 1; - if (entity instanceof EntityAnimal && !((EntityAnimal) entity).collided) { + if (entity instanceof AnimalEntity && !((AnimalEntity) entity).collided) { modifier = 4; } @@ -147,7 +147,7 @@ public class RitualForsakenSoul extends Ritual { * @param mob * @return The amount of uniqueness to the last 10 mobs killed */ - public int calculateUniqueness(EntityLivingBase mob) { + public int calculateUniqueness(LivingEntity mob) { int key = mob.getClass().hashCode(); keyList.add(key); if (keyList.size() > MAX_UNIQUENESS) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java index 0618d119..3a193e91 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -47,9 +47,9 @@ public class RitualFullStomach extends Ritual { IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); int lastSlot = 0; AreaDescriptor fillingRange = masterRitualStone.getBlockRange(FILL_RANGE); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos)); + List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, fillingRange.getAABB(pos)); - for (EntityPlayer player : playerList) { + for (PlayerEntity player : playerList) { FoodStats foodStats = player.getFoodStats(); float satLevel = foodStats.getSaturationLevel(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index 4bfddd31..f1ff9f71 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -9,15 +9,15 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.*; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.potion.PotionEffect; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import java.util.List; @@ -36,7 +36,7 @@ public class RitualGreenGrove extends Ritual { public static double steadfastWillDrain = 0.05; public static int defaultRefreshTime = 20; public static double defaultGrowthChance = 0.3; - public static IBlockState farmlandState = Blocks.FARMLAND.getDefaultState().withProperty(BlockFarmland.MOISTURE, 7); + public static BlockState farmlandState = Blocks.FARMLAND.getDefaultState().withProperty(FarmlandBlock.MOISTURE, 7); public int refreshTime = 20; public RitualGreenGrove() { @@ -88,14 +88,14 @@ public class RitualGreenGrove extends Ritual { } for (BlockPos newPos : growingRange.getContainedPositions(pos)) { - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { - boolean flag = state.getBlock() instanceof IGrowable || state.getBlock() instanceof BlockCactus || state.getBlock() instanceof BlockReed; + boolean flag = state.getBlock() instanceof IGrowable || state.getBlock() instanceof CactusBlock || state.getBlock() instanceof SugarCaneBlock; if (flag) { if (world.rand.nextDouble() < growthChance) { state.getBlock().updateTick(world, newPos, state, new Random()); - IBlockState newState = world.getBlockState(newPos); + BlockState newState = world.getBlockState(newPos); if (!newState.equals(state)) { world.playEvent(2005, newPos, 0); totalGrowths++; @@ -139,7 +139,7 @@ public class RitualGreenGrove extends Ritual { break; } - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); Block block = state.getBlock(); boolean hydratedBlock = false; @@ -169,21 +169,21 @@ public class RitualGreenGrove extends Ritual { if (corrosiveWill > corrosiveWillDrain) { AreaDescriptor leechRange = masterRitualStone.getBlockRange(LEECH_RANGE); AxisAlignedBB mobArea = leechRange.getAABB(pos); - List entityList = world.getEntitiesWithinAABB(EntityLivingBase.class, mobArea); - for (EntityLivingBase entityLiving : entityList) { + List entityList = world.getEntitiesWithinAABB(LivingEntity.class, mobArea); + for (LivingEntity entityLiving : entityList) { if (corrosiveWill < corrosiveWillDrain) { break; } - if (entityLiving instanceof EntityPlayer) { + if (entityLiving instanceof PlayerEntity) { continue; } - if (entityLiving.isPotionActive(RegistrarBloodMagic.PLANT_LEECH) || !entityLiving.isPotionApplicable(new PotionEffect(RegistrarBloodMagic.PLANT_LEECH))) { + if (entityLiving.isPotionActive(RegistrarBloodMagic.PLANT_LEECH) || !entityLiving.isPotionApplicable(new EffectInstance(RegistrarBloodMagic.PLANT_LEECH))) { continue; } - entityLiving.addPotionEffect(new PotionEffect(RegistrarBloodMagic.PLANT_LEECH, 200, 0)); + entityLiving.addPotionEffect(new EffectInstance(RegistrarBloodMagic.PLANT_LEECH, 200, 0)); corrosiveWill -= corrosiveWillDrain; corrosiveDrain += corrosiveWillDrain; @@ -266,8 +266,8 @@ public class RitualGreenGrove extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { + return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java index 2aa7a7d1..f3ee4078 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java @@ -6,13 +6,13 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MoverType; -import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.EntityWither; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.boss.dragon.EnderDragonEntity; +import net.minecraft.entity.boss.WitherEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -65,19 +65,19 @@ public class RitualGrounding extends Ritual { /* Actual ritual stuff begins here */ AreaDescriptor groundingRange = masterRitualStone.getBlockRange(GROUNDING_RANGE); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, groundingRange.getAABB(pos)); - for (EntityLivingBase entity : entities) { + List entities = world.getEntitiesWithinAABB(LivingEntity.class, groundingRange.getAABB(pos)); + for (LivingEntity entity : entities) { if (totalEffects >= maxEffects) { break; } - if (entity instanceof EntityPlayer && ((EntityPlayer) entity).isCreative()) + if (entity instanceof PlayerEntity && ((PlayerEntity) entity).isCreative()) continue; totalEffects++; - if (entity instanceof EntityPlayer) { + if (entity instanceof PlayerEntity) { /* Raw will effect: Affects players */ if (world.getTotalWorldTime() % 10 == 0) { if (rawWill >= willDrain) { @@ -104,7 +104,7 @@ public class RitualGrounding extends Ritual { (some bosses, like the wither, have a restriction to motion modification, others, like the Ender Dragon, don't do potions) */ if (steadfastWill >= willDrain) { - if (entity instanceof EntityWither || entity instanceof EntityDragon) + if (entity instanceof WitherEntity || entity instanceof EnderDragonEntity) entity.move(MoverType.SELF, 0, -0.05, 0); // to work on Wither and EnderDragon without interfering with other mod author's decisions (looking at you, Vazkii) steadfastDrained += willDrain / 10f; @@ -156,29 +156,29 @@ public class RitualGrounding extends Ritual { return new RitualGrounding(); } - public double[] sharedWillEffects(World world, EntityLivingBase entity, double corrosiveWill, double destructiveWill, double vengefulWill, double corrosiveDrained, double destructiveDrained, double vengefulDrained) { + public double[] sharedWillEffects(World world, LivingEntity entity, double corrosiveWill, double destructiveWill, double vengefulWill, double corrosiveDrained, double destructiveDrained, double vengefulDrained) { /* Combination of corrosive + vengeful will: Levitation */ if (corrosiveWill >= willDrain && vengefulWill >= willDrain) { - entity.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 20, 10)); + entity.addPotionEffect(new EffectInstance(Effects.LEVITATION, 20, 10)); vengefulDrained += willDrain; corrosiveDrained += willDrain; /* Corrosive will effect: Suspension */ } else if (corrosiveWill >= willDrain) { - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SUSPENDED, 20, 0)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SUSPENDED, 20, 0)); corrosiveDrained += willDrain; /* Vengeful will effect: Stronger effect */ } else if (vengefulWill >= willDrain) { vengefulDrained += willDrain; - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.GROUNDED, 40, 20)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.GROUNDED, 40, 20)); } else - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.GROUNDED, 20, 10)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.GROUNDED, 20, 10)); /* Destructive will effect: Increased fall damage */ if (destructiveWill >= willDrain) { @@ -188,11 +188,11 @@ public class RitualGrounding extends Ritual { if (vengefulWill >= willDrain + vengefulDrained) { if (world.getTotalWorldTime() % 100 == 0) { vengefulDrained += willDrain; - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.HEAVY_HEART, 200, 2)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.HEAVY_HEART, 200, 2)); } } else if (world.getTotalWorldTime() % 50 == 0) - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.HEAVY_HEART, 100, 1)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.HEAVY_HEART, 100, 1)); } return new double[]{corrosiveDrained, destructiveDrained, vengefulDrained}; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java index 7376d7e7..73cb2ed2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java @@ -5,11 +5,11 @@ import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; import WayofTime.bloodmagic.ritual.harvest.IHarvestHandler; import com.google.common.collect.Lists; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; @@ -27,7 +27,7 @@ import java.util.function.Consumer; *

    * This ritual includes a way to change the range based on what block is above * the MasterRitualStone. You can use - * {@link HarvestRegistry#registerRangeAmplifier(net.minecraft.block.state.IBlockState, int)} to register a + * {@link HarvestRegistry#registerRangeAmplifier(BlockState, int)} to register a * new amplifier. */ @RitualRegister("harvest") @@ -89,11 +89,11 @@ public class RitualHarvest extends Ritual { } public static boolean harvestBlock(World world, BlockPos cropPos, BlockPos controllerPos) { - IBlockState harvestState = world.getBlockState(cropPos); + BlockState harvestState = world.getBlockState(cropPos); TileEntity potentialInventory = world.getTileEntity(controllerPos.up()); IItemHandler itemHandler = null; - if (potentialInventory != null && potentialInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) - itemHandler = potentialInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (potentialInventory != null && potentialInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) + itemHandler = potentialInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); for (IHarvestHandler handler : HarvestRegistry.getHarvestHandlers()) { if (handler.test(world, cropPos, harvestState)) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java index a1a38ea0..56d3323b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -31,8 +31,8 @@ public class RitualInterdiction extends Ritual { AreaDescriptor interdictionRange = masterRitualStone.getBlockRange(INTERDICTION_RANGE); - for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) + for (LivingEntity entity : world.getEntitiesWithinAABB(LivingEntity.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) { + if (entity instanceof PlayerEntity && (((PlayerEntity) entity).capabilities.isCreativeMode || ((PlayerEntity) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) continue; double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); @@ -44,7 +44,7 @@ public class RitualInterdiction extends Ritual { entity.motionZ = 0.1 * zDif; entity.fallDistance = 0; - if (entity instanceof EntityPlayer) { + if (entity instanceof PlayerEntity) { entity.velocityChanged = true; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java index d38f2085..bfc32dc2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -38,8 +38,8 @@ public class RitualJumping extends Ritual { int totalEffects = 0; AreaDescriptor jumpRange = masterRitualStone.getBlockRange(JUMP_RANGE); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, jumpRange.getAABB(masterRitualStone.getBlockPos())); - for (EntityLivingBase entity : entities) { + List entities = world.getEntitiesWithinAABB(LivingEntity.class, jumpRange.getAABB(masterRitualStone.getBlockPos())); + for (LivingEntity entity : entities) { if (totalEffects >= maxEffects) { break; } @@ -54,8 +54,8 @@ public class RitualJumping extends Ritual { entity.motionY = motionY; totalEffects++; - if (entity instanceof EntityPlayer) { - Utils.setPlayerSpeedFromServer((EntityPlayer) entity, entity.motionX, entity.motionY, entity.motionZ); + if (entity instanceof PlayerEntity) { + Utils.setPlayerSpeedFromServer((PlayerEntity) entity, entity.motionX, entity.motionY, entity.motionZ); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index 2bddc06b..4c1f8d11 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -8,17 +8,17 @@ import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.potion.PotionEffect; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -84,7 +84,7 @@ public class RitualLava extends Ritual { } for (BlockPos newPos : lavaRange.getContainedPositions(pos)) { - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); if (world.isAirBlock(newPos) || Utils.isFlowingLiquid(state)) { int lpCost = getLPCostForRawWill(rawWill); if (currentEssence < lpCost) { @@ -134,19 +134,19 @@ public class RitualLava extends Ritual { AreaDescriptor fuseRange = masterRitualStone.getBlockRange(FIRE_FUSE_RANGE); AxisAlignedBB fuseArea = fuseRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, fuseArea); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, fuseArea); - for (EntityLivingBase entity : entities) { + for (LivingEntity entity : entities) { if (vengefulWill < vengefulWillDrain) { break; } - if (entity instanceof EntityPlayer) { + if (entity instanceof PlayerEntity) { continue; } if (!entity.isPotionActive(RegistrarBloodMagic.FIRE_FUSE)) { - entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FIRE_FUSE, 100, 0)); + entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FIRE_FUSE, 100, 0)); vengefulDrained += vengefulWillDrain; vengefulWill -= vengefulWillDrain; @@ -165,14 +165,14 @@ public class RitualLava extends Ritual { int duration = getFireResistForWill(steadfastWill); AxisAlignedBB resistArea = resistRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(EntityPlayer.class, resistArea); + List entities = world.getEntitiesWithinAABB(PlayerEntity.class, resistArea); - for (EntityPlayer entity : entities) { + for (PlayerEntity entity : entities) { if (steadfastWill < steadfastWillDrain) { break; } - if (!entity.isPotionActive(MobEffects.FIRE_RESISTANCE) || (entity.getActivePotionEffect(MobEffects.FIRE_RESISTANCE).getDuration() < 2)) { - entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 100, 0)); + if (!entity.isPotionActive(Effects.FIRE_RESISTANCE) || (entity.getActivePotionEffect(Effects.FIRE_RESISTANCE).getDuration() < 2)) { + entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 100, 0)); steadfastDrained += steadfastWillDrain; steadfastWill -= steadfastWillDrain; @@ -191,9 +191,9 @@ public class RitualLava extends Ritual { float damage = getCorrosiveDamageForWill(corrosiveWill); AxisAlignedBB damageArea = resistRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, damageArea); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, damageArea); - for (EntityLivingBase entity : entities) { + for (LivingEntity entity : entities) { if (corrosiveWill < corrosiveWillDrain) { break; } @@ -229,8 +229,8 @@ public class RitualLava extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { + return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index 0d633b79..dcf2d4d7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -9,14 +9,14 @@ import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.effect.LightningBoltEntity; +import net.minecraft.entity.item.ItemFrameEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -52,7 +52,7 @@ public class RitualLivingArmourDowngrade extends Ritual { AreaDescriptor downgradeRange = masterRitualStone.getBlockRange(DOWNGRADE_RANGE); boolean isActivatorPresent = false; - for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) { + for (PlayerEntity player : world.getEntitiesWithinAABB(PlayerEntity.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) { if (player.getGameProfile().getId().equals(masterRitualStone.getOwner())) { ItemStack keyStack = getStackFromItemFrame(world, masterPos, masterRitualStone.getDirection()); if (keyStack.isEmpty()) { @@ -67,12 +67,12 @@ public class RitualLivingArmourDowngrade extends Ritual { internalTimer++; if (player.isSneaking()) { - double distance2 = masterPos.offset(EnumFacing.UP).distanceSqToCenter(player.posX, player.posY, player.posZ); + double distance2 = masterPos.offset(Direction.UP).distanceSqToCenter(player.posX, player.posY, player.posZ); if (distance2 > 1) { return; } - BlockPos chestPos = masterPos.offset(masterRitualStone.getDirection(), 2).offset(EnumFacing.UP); + BlockPos chestPos = masterPos.offset(masterRitualStone.getDirection(), 2).offset(Direction.UP); TileEntity tile = world.getTileEntity(chestPos); if (tile == null) { return; @@ -91,7 +91,7 @@ public class RitualLivingArmourDowngrade extends Ritual { if (recipe != null) { LivingArmourUpgrade upgrade = recipe.getRecipeOutput(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { if (armour.canApplyUpgrade(player, upgrade)) { @@ -100,7 +100,7 @@ public class RitualLivingArmourDowngrade extends Ritual { recipe.consumeInventory(inv); - EntityLightningBolt lightning = new EntityLightningBolt(world, chestPos.getX(), chestPos.getY(), chestPos.getZ(), true); + LightningBoltEntity lightning = new LightningBoltEntity(world, chestPos.getX(), chestPos.getY(), chestPos.getZ(), true); world.spawnEntity(lightning); masterRitualStone.setActive(false); @@ -125,26 +125,26 @@ public class RitualLivingArmourDowngrade extends Ritual { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); this.internalTimer = tag.getInteger("internalTimer"); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); tag.setInteger("internalTimer", internalTimer); } - public ItemStack getStackFromItemFrame(World world, BlockPos masterPos, EnumFacing direction) { + public ItemStack getStackFromItemFrame(World world, BlockPos masterPos, Direction direction) { BlockPos offsetPos = new BlockPos(0, 3, 0); offsetPos = offsetPos.offset(direction, 2); AxisAlignedBB bb = new AxisAlignedBB(masterPos.add(offsetPos)); - List frames = world.getEntitiesWithinAABB(EntityItemFrame.class, bb); - for (EntityItemFrame frame : frames) { + List frames = world.getEntitiesWithinAABB(ItemFrameEntity.class, bb); + for (ItemFrameEntity frame : frames) { if (!frame.getDisplayedItem().isEmpty()) { return frame.getDisplayedItem(); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java index 108b7c50..5be8d54a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java @@ -5,14 +5,14 @@ import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; @@ -59,7 +59,7 @@ public class RitualMagnetic extends Ritual { } } - IBlockState downState = world.getBlockState(pos.down()); + BlockState downState = world.getBlockState(pos.down()); int radius = getRadius(downState.getBlock()); if (replace) { @@ -78,9 +78,9 @@ public class RitualMagnetic extends Ritual { while (k <= radius) { BlockPos newPos = pos.add(i, j, k); Vec3d newPosVector = new Vec3d(newPos); - IBlockState state = world.getBlockState(newPos); + BlockState state = world.getBlockState(newPos); RayTraceResult fakeRayTrace = world.rayTraceBlocks(MRSpos, newPosVector, false); - ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((WorldServer) world)); + ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((ServerWorld) world)); if (isBlockOre(checkStack)) { Utils.swapLocations(world, newPos, world, replacement); masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); @@ -145,7 +145,7 @@ public class RitualMagnetic extends Ritual { return new RitualMagnetic(); } - private FakePlayer getFakePlayer(WorldServer world) { + private FakePlayer getFakePlayer(ServerWorld world) { return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_magnetic")) : fakePlayer; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java index 9579495f..38919ab6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java @@ -8,7 +8,7 @@ import WayofTime.bloodmagic.meteor.Meteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,7 +44,7 @@ public class RitualMeteor extends Ritual { double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); AreaDescriptor itemDetectionRange = masterRitualStone.getBlockRange(ITEM_RANGE); - List itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDetectionRange.getAABB(pos)); + List itemList = world.getEntitiesWithinAABB(ItemEntity.class, itemDetectionRange.getAABB(pos)); double radiusModifier = getRadiusModifier(rawWill); double explosionModifier = getExplosionModifier(steadfastWill); @@ -52,7 +52,7 @@ public class RitualMeteor extends Ritual { boolean successful = false; - for (EntityItem entityItem : itemList) { + for (ItemEntity entityItem : itemList) { ItemStack stack = entityItem.getItem(); Meteor meteor = MeteorRegistry.getMeteorForItem(stack); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java index 5407b258..a5173a28 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java @@ -3,11 +3,11 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemBlock; +import net.minecraft.block.BlockState; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; @@ -46,8 +46,8 @@ public class RitualPlacer extends Ritual { AreaDescriptor areaDescriptor = masterRitualStone.getBlockRange(PLACER_RANGE); if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { + IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); if (itemHandler.getSlots() <= 0) { return; @@ -60,10 +60,10 @@ public class RitualPlacer extends Ritual { for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) { ItemStack stack = itemHandler.extractItem(invSlot, 1, true); - if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock)) + if (stack.isEmpty() || !(stack.getItem() instanceof BlockItem)) continue; - IBlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(invSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(invSlot).getItemDamage()); + BlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(invSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(invSlot).getItemDamage()); world.setBlockState(blockPos, placeState); itemHandler.extractItem(invSlot, 1, false); tileEntity.markDirty(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java index 8ec0b006..c64a1713 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java @@ -6,10 +6,10 @@ import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.tile.TileDimensionalPortal; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; @@ -22,28 +22,28 @@ public class RitualPortal extends Ritual { public static final String PORTAL_NBT_TAG = "PortalRitualTag"; public static final String PORTAL_ID_TAG = "PortalRitualID"; - private NBTTagCompound portalRitualTag; + private CompoundNBT portalRitualTag; public RitualPortal() { super("ritualPortal", 0, 50000, "ritual." + BloodMagic.MODID + ".portalRitual"); - portalRitualTag = new NBTTagCompound(); + portalRitualTag = new CompoundNBT(); } @Override - public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player, UUID owner) { + public boolean activateRitual(IMasterRitualStone masterRitualStone, PlayerEntity player, UUID owner) { World world = masterRitualStone.getWorldObj(); int x = masterRitualStone.getBlockPos().getX(); int y = masterRitualStone.getBlockPos().getY(); int z = masterRitualStone.getBlockPos().getZ(); - EnumFacing direction = masterRitualStone.getDirection(); + Direction direction = masterRitualStone.getDirection(); String name = owner.toString(); - IBlockState blockState; + BlockState blockState; if (!world.isRemote) { portalRitualTag.removeTag(PORTAL_ID_TAG); - if (direction == EnumFacing.NORTH || direction == EnumFacing.SOUTH) { + if (direction == Direction.NORTH || direction == Direction.SOUTH) { for (int i = x - 3; i <= x + 3; i++) { for (int k = z - 2; k <= z + 2; k++) { if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { @@ -64,7 +64,7 @@ public class RitualPortal extends Ritual { name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); } } - } else if (direction == EnumFacing.EAST || direction == EnumFacing.WEST) { + } else if (direction == Direction.EAST || direction == Direction.WEST) { for (int k = z - 3; k <= z + 3; k++) { for (int i = x - 2; i <= x + 2; i++) { if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { @@ -105,15 +105,15 @@ public class RitualPortal extends Ritual { int x = masterRitualStone.getBlockPos().getX(); int y = masterRitualStone.getBlockPos().getY(); int z = masterRitualStone.getBlockPos().getZ(); - EnumFacing direction = masterRitualStone.getDirection(); + Direction direction = masterRitualStone.getDirection(); - if (direction == EnumFacing.NORTH || direction == EnumFacing.SOUTH) { + if (direction == Direction.NORTH || direction == Direction.SOUTH) { for (int i = x - 1; i <= x + 1; i++) { for (int j = y + 1; j <= y + 3; j++) { BlockPos tempPos = new BlockPos(i, j, z); if (world.isAirBlock(tempPos)) { - IBlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(0); + BlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(0); world.setBlockState(tempPos, blockState, 3); if (world.getTileEntity(tempPos) != null && world.getTileEntity(tempPos) instanceof TileDimensionalPortal) { @@ -124,12 +124,12 @@ public class RitualPortal extends Ritual { } } } - } else if (direction == EnumFacing.EAST || direction == EnumFacing.WEST) { + } else if (direction == Direction.EAST || direction == Direction.WEST) { for (int k = z - 1; k <= z + 1; k++) { for (int j = y + 1; j <= y + 3; j++) { BlockPos tempPos = new BlockPos(x, j, k); if (world.isAirBlock(tempPos)) { - IBlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(1); + BlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(1); world.setBlockState(tempPos, blockState, 3); if (world.getTileEntity(tempPos) != null && world.getTileEntity(tempPos) instanceof TileDimensionalPortal) { @@ -150,11 +150,11 @@ public class RitualPortal extends Ritual { int x = masterRitualStone.getBlockPos().getX(); int y = masterRitualStone.getBlockPos().getY(); int z = masterRitualStone.getBlockPos().getZ(); - EnumFacing direction = masterRitualStone.getDirection(); + Direction direction = masterRitualStone.getDirection(); LocationsHandler.getLocationsHandler().removeLocation(portalRitualTag.getString(PORTAL_ID_TAG), new PortalLocation(x, y + 1, z, world.provider.getDimension())); - if (direction == EnumFacing.NORTH || direction == EnumFacing.SOUTH) { + if (direction == Direction.NORTH || direction == Direction.SOUTH) { for (int i = x - 2; i <= x + 2; i++) { for (int j = y + 1; j <= y + 3; j++) { if (getBlockState(world, i, j, z).getBlock() == RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL) { @@ -162,7 +162,7 @@ public class RitualPortal extends Ritual { } } } - } else if (direction == EnumFacing.EAST || direction == EnumFacing.WEST) { + } else if (direction == Direction.EAST || direction == Direction.WEST) { for (int k = z - 2; k <= z + 2; k++) { for (int j = y + 1; j <= y + 3; j++) { if (getBlockState(world, x, j, k).getBlock() == RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL) { @@ -207,20 +207,20 @@ public class RitualPortal extends Ritual { } @Override - public void readFromNBT(NBTTagCompound tag) { + public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); portalRitualTag = tag.getCompoundTag(PORTAL_NBT_TAG); } @Override - public void writeToNBT(NBTTagCompound tag) { + public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); tag.setTag(PORTAL_NBT_TAG, portalRitualTag); } - public IBlockState getBlockState(World world, int x, int y, int z) { + public BlockState getBlockState(World world, int x, int y, int z) { return world.getBlockState(new BlockPos(x, y, z)); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java index 957145c0..c98e359d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import com.google.common.collect.Lists; import net.minecraft.block.BlockLiquid; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -48,16 +48,16 @@ public class RitualPump extends Ritual { return; } - if (tileEntity != null && tileEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - IFluidHandler fluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN); - IBlockState tankState = world.getBlockState(masterRitualStone.getBlockPos().up()); + if (tileEntity != null && tileEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, Direction.DOWN)) { + IFluidHandler fluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, Direction.DOWN); + BlockState tankState = world.getBlockState(masterRitualStone.getBlockPos().up()); int maxDrain = fluidHandler.getTankProperties()[0].getCapacity(); if (fluidHandler.getTankProperties()[0].getContents() != null && fluidHandler.getTankProperties()[0].getContents().amount >= maxDrain) return; for (BlockPos pos : masterRitualStone.getBlockRange(PUMP_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); IFluidHandler blockHandler = null; if (state.getBlock() instanceof BlockLiquid) blockHandler = new BlockLiquidWrapper((BlockLiquid) state.getBlock(), world, pos); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java index 50db44a2..fcd279d0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java @@ -6,10 +6,10 @@ import WayofTime.bloodmagic.util.DamageSourceBloodMagic; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.Effects; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -77,17 +77,17 @@ public class RitualRegeneration extends Ritual { AreaDescriptor damageArea = masterRitualStone.getBlockRange(VAMPIRE_RANGE); AxisAlignedBB damageRange = damageArea.getAABB(pos); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, healRange); - List players = world.getEntitiesWithinAABB(EntityPlayer.class, healRange); - List damagedEntities = world.getEntitiesWithinAABB(EntityLivingBase.class, damageRange); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, healRange); + List players = world.getEntitiesWithinAABB(PlayerEntity.class, healRange); + List damagedEntities = world.getEntitiesWithinAABB(LivingEntity.class, damageRange); if (syphonHealth) { - for (EntityPlayer player : players) { + for (PlayerEntity player : players) { if (player.getHealth() <= player.getMaxHealth() - 1) { float syphonedHealthAmount = getSyphonAmountForWill(corrosiveWill); Collections.shuffle(damagedEntities); - for (EntityLivingBase damagedEntity : damagedEntities) { - if (damagedEntity instanceof EntityPlayer) { + for (LivingEntity damagedEntity : damagedEntities) { + if (damagedEntity instanceof PlayerEntity) { continue; } @@ -108,11 +108,11 @@ public class RitualRegeneration extends Ritual { } } - for (EntityLivingBase entity : entities) { + for (LivingEntity entity : entities) { float health = entity.getHealth(); if (health <= entity.getMaxHealth() - 1) { - if (entity.isPotionApplicable(new PotionEffect(MobEffects.REGENERATION))) { - if (entity instanceof EntityPlayer) { + if (entity.isPotionApplicable(new EffectInstance(Effects.REGENERATION))) { + if (entity instanceof PlayerEntity) { totalCost += getRefreshCost(); currentEssence -= getRefreshCost(); } else { @@ -120,7 +120,7 @@ public class RitualRegeneration extends Ritual { currentEssence -= getRefreshCost() / 10; } - entity.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 50, 0, false, false)); + entity.addPotionEffect(new EffectInstance(Effects.REGENERATION, 50, 0, false, false)); totalEffects++; @@ -129,7 +129,7 @@ public class RitualRegeneration extends Ritual { } } } - if (applyAbsorption && entity instanceof EntityPlayer) { + if (applyAbsorption && entity instanceof PlayerEntity) { if (applyAbsorption) { float added = Utils.addAbsorptionToMaximum(entity, absorptionRate, maxAbsorption, 1000); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index 244c038e..38ecde78 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -5,12 +5,12 @@ import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumFacing; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import java.util.List; @@ -60,7 +60,7 @@ public class RitualSpeed extends Ritual { rawWill = 0; //Simplifies later calculations } - for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, speedRange.getAABB(masterRitualStone.getBlockPos()))) { + for (LivingEntity entity : world.getEntitiesWithinAABB(LivingEntity.class, speedRange.getAABB(masterRitualStone.getBlockPos()))) { if (entity.isSneaking()) continue; @@ -71,7 +71,7 @@ public class RitualSpeed extends Ritual { continue; } - if (entity instanceof EntityPlayer && (transportChildren ^ transportAdults)) { + if (entity instanceof PlayerEntity && (transportChildren ^ transportAdults)) { continue; } @@ -87,7 +87,7 @@ public class RitualSpeed extends Ritual { double motionY = getVerticalSpeedForWill(rawWill); double speed = getHorizontalSpeedForWill(rawWill); - EnumFacing direction = masterRitualStone.getDirection(); + Direction direction = masterRitualStone.getDirection(); if (rawWill >= rawWillDrain) { rawWill -= rawWillDrain; @@ -125,8 +125,8 @@ public class RitualSpeed extends Ritual { break; } - if (entity instanceof EntityPlayer) { - Utils.setPlayerSpeedFromServer((EntityPlayer) entity, entity.motionX, entity.motionY, entity.motionZ); + if (entity instanceof PlayerEntity) { + Utils.setPlayerSpeedFromServer((PlayerEntity) entity, entity.motionX, entity.motionY, entity.motionZ); } } @@ -170,8 +170,8 @@ public class RitualSpeed extends Ritual { } @Override - public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { + return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; } public double getVerticalSpeedForWill(double rawWill) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java index bbf02e04..157bd08d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java @@ -4,7 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -34,7 +34,7 @@ public class RitualSuppression extends Ritual { AreaDescriptor suppressionRange = masterRitualStone.getBlockRange(SUPPRESSION_RANGE); for (BlockPos blockPos : suppressionRange.getContainedPositions(masterRitualStone.getBlockPos())) { - IBlockState state = world.getBlockState(blockPos); + BlockState state = world.getBlockState(blockPos); if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java index 1addb3c6..e322fec6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java @@ -9,9 +9,9 @@ import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import com.google.common.collect.Iterables; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.effect.LightningBoltEntity; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -42,9 +42,9 @@ public class RitualUpgradeRemove extends Ritual { AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); - List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos)); + List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, checkRange.getAABB(pos)); - for (EntityPlayer player : playerList) { + for (PlayerEntity player : playerList) { if (LivingArmour.hasFullSet(player)) { boolean removedUpgrade = false; @@ -66,7 +66,7 @@ public class RitualUpgradeRemove extends Ritual { if (successful) { removedUpgrade = true; - world.spawnEntity(new EntityItem(world, player.posX, player.posY, player.posZ, upgradeStack)); + world.spawnEntity(new ItemEntity(world, player.posX, player.posY, player.posZ, upgradeStack)); for (Entry trackerEntry : armour.trackerMap.entrySet()) { StatTracker tracker = trackerEntry.getValue(); if (tracker != null) { @@ -85,7 +85,7 @@ public class RitualUpgradeRemove extends Ritual { masterRitualStone.setActive(false); - world.spawnEntity(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); + world.spawnEntity(new LightningBoltEntity(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java index 27a7b7fd..a06bbfcb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java index 921963ff..96637f32 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.tile.TileAltar; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -74,9 +74,9 @@ public class RitualWellOfSuffering extends Ritual { AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); AxisAlignedBB range = damageRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, range); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, range); - for (EntityLivingBase entity : entities) { + for (LivingEntity entity : entities) { EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) @@ -87,7 +87,7 @@ public class RitualWellOfSuffering extends Ritual { if (lifeEssenceRatio <= 0) continue; - if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { + if (entity.isEntityAlive() && !(entity instanceof PlayerEntity)) { if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) { if (entity.isChild()) lifeEssenceRatio *= 0.5F; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java index 1690ac88..5ca867d6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.ritual.types; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -42,17 +42,17 @@ public class RitualZephyr extends Ritual { AreaDescriptor zephyrRange = masterRitualStone.getBlockRange(ZEPHYR_RANGE); - List itemList = world.getEntitiesWithinAABB(EntityItem.class, zephyrRange.getAABB(masterRitualStone.getBlockPos())); + List itemList = world.getEntitiesWithinAABB(ItemEntity.class, zephyrRange.getAABB(masterRitualStone.getBlockPos())); int count = 0; - for (EntityItem entityItem : itemList) { + for (ItemEntity entityItem : itemList) { if (entityItem.isDead) { continue; } ItemStack copyStack = entityItem.getItem().copy(); int originalAmount = copyStack.getCount(); - ItemStack newStack = Utils.insertStackIntoTile(copyStack, tileInventory, EnumFacing.DOWN); + ItemStack newStack = Utils.insertStackIntoTile(copyStack, tileInventory, Direction.DOWN); if (!newStack.isEmpty() && newStack.getCount() < originalAmount) { count++; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java index 9d2a87ed..674232c4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.ritual.types.imperfect; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; //@RitualRegister.Imperfect("day") public class ImperfectRitualDay extends ImperfectRitual { @@ -13,7 +13,7 @@ public class ImperfectRitualDay extends ImperfectRitual { } @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { + public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { if (!imperfectRitualStone.getRitualWorld().isRemote) imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java index f5a8746b..31fa5e29 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; @RitualRegister.Imperfect("night") public class ImperfectRitualNight extends ImperfectRitual { @@ -14,7 +14,7 @@ public class ImperfectRitualNight extends ImperfectRitual { } @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { + public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { if (!imperfectRitualStone.getRitualWorld().isRemote) imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000 + 13800); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java index b7790a1e..963a77f2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; @RitualRegister.Imperfect("rain") public class ImperfectRitualRain extends ImperfectRitual { @@ -14,7 +14,7 @@ public class ImperfectRitualRain extends ImperfectRitual { } @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { + public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { if (!imperfectRitualStone.getRitualWorld().isRemote) { imperfectRitualStone.getRitualWorld().getWorldInfo().setRaining(true); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java index b0281f53..6ba7d951 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.potion.Effects; +import net.minecraft.potion.EffectInstance; @RitualRegister.Imperfect("resistance") public class ImperfectRitualResistance extends ImperfectRitual { @@ -16,9 +16,9 @@ public class ImperfectRitualResistance extends ImperfectRitual { } @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { + public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { - player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 1200, 1)); + player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 1200, 1)); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java index bc8cb7cf..a0fc85ec 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java @@ -4,11 +4,11 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ritual.RitualRegister; import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.monster.ZombieEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.block.Blocks; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; @RitualRegister.Imperfect("zombie") public class ImperfectRitualZombie extends ImperfectRitual { @@ -17,12 +17,12 @@ public class ImperfectRitualZombie extends ImperfectRitual { } @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { - EntityZombie zombie = new EntityZombie(imperfectRitualStone.getRitualWorld()); + public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { + ZombieEntity zombie = new ZombieEntity(imperfectRitualStone.getRitualWorld()); zombie.setPosition(imperfectRitualStone.getRitualPos().getX() + 0.5, imperfectRitualStone.getRitualPos().getY() + 2.1, imperfectRitualStone.getRitualPos().getZ() + 0.5); - zombie.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 2000)); - zombie.addPotionEffect(new PotionEffect(MobEffects.STRENGTH, 20000, 7)); - zombie.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 20000, 3)); + zombie.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 2000)); + zombie.addPotionEffect(new EffectInstance(Effects.STRENGTH, 20000, 7)); + zombie.addPotionEffect(new EffectInstance(Effects.RESISTANCE, 20000, 3)); if (!imperfectRitualStone.getRitualWorld().isRemote) imperfectRitualStone.getRitualWorld().spawnEntity(zombie); diff --git a/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java index 97bfdb01..0c795a44 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IFluidRoutingNode extends IRoutingNode { - boolean isTankConnectedToSide(EnumFacing side); + boolean isTankConnectedToSide(Direction side); - int getPriority(EnumFacing side); + int getPriority(Direction side); } diff --git a/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java index 8f8e7a6d..697df7dc 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IInputFluidRoutingNode extends IFluidRoutingNode { - boolean isFluidInput(EnumFacing side); + boolean isFluidInput(Direction side); - IFluidFilter getInputFluidFilterForSide(EnumFacing side); + IFluidFilter getInputFluidFilterForSide(Direction side); } diff --git a/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java index 6e833a54..1d19cfa8 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IInputItemRoutingNode extends IItemRoutingNode { - boolean isInput(EnumFacing side); + boolean isInput(Direction side); - IItemFilter getInputFilterForSide(EnumFacing side); + IItemFilter getInputFilterForSide(Direction side); } diff --git a/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java index d52126a0..21dee0c6 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IItemRoutingNode extends IRoutingNode { - boolean isInventoryConnectedToSide(EnumFacing side); + boolean isInventoryConnectedToSide(Direction side); - int getPriority(EnumFacing side); + int getPriority(Direction side); } diff --git a/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java index 08c3ce67..5ef76540 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IOutputFluidRoutingNode extends IFluidRoutingNode { - boolean isFluidOutput(EnumFacing side); + boolean isFluidOutput(Direction side); - IFluidFilter getOutputFluidFilterForSide(EnumFacing side); + IFluidFilter getOutputFluidFilterForSide(Direction side); } diff --git a/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java index 819e2813..8bf50ec4 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface IOutputItemRoutingNode extends IItemRoutingNode { - boolean isOutput(EnumFacing side); + boolean isOutput(Direction side); - IItemFilter getOutputFilterForSide(EnumFacing side); + IItemFilter getOutputFilterForSide(Direction side); } diff --git a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java index 5ac2397d..84c06e33 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.soul; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import java.util.HashMap; import java.util.Map.Entry; @@ -53,8 +53,8 @@ public class DemonWillHolder { return 0; } - public void readFromNBT(NBTTagCompound tag, String key) { - NBTTagCompound willTag = tag.getCompoundTag(key); + public void readFromNBT(CompoundNBT tag, String key) { + CompoundNBT willTag = tag.getCompoundTag(key); willMap.clear(); @@ -66,8 +66,8 @@ public class DemonWillHolder { } } - public void writeToNBT(NBTTagCompound tag, String key) { - NBTTagCompound willTag = new NBTTagCompound(); + public void writeToNBT(CompoundNBT tag, String key) { + CompoundNBT willTag = new CompoundNBT(); for (Entry entry : willMap.entrySet()) { willTag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); } diff --git a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java index f90c2c98..3a56b4c4 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.soul; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import java.util.List; public interface IDemonWillWeapon { - List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting); + List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting); } diff --git a/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java index 89d3b97a..51f080d8 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.soul; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -19,7 +19,7 @@ public class PlayerDemonWillHandler { * @param player - The player to check the will of * @return - The amount of will the player contains */ - public static double getTotalDemonWill(EnumDemonWillType type, EntityPlayer player) { + public static double getTotalDemonWill(EnumDemonWillType type, PlayerEntity player) { NonNullList inventory = player.inventory.mainInventory; double souls = 0; @@ -34,7 +34,7 @@ public class PlayerDemonWillHandler { return souls; } - public static EnumDemonWillType getLargestWillType(EntityPlayer player) { + public static EnumDemonWillType getLargestWillType(PlayerEntity player) { EnumDemonWillType type = EnumDemonWillType.DEFAULT; double max = getTotalDemonWill(type, player); @@ -55,7 +55,7 @@ public class PlayerDemonWillHandler { * @param player - The player to check the Will of * @return - True if all Will containers are full, false if not. */ - public static boolean isDemonWillFull(EnumDemonWillType type, EntityPlayer player) { + public static boolean isDemonWillFull(EnumDemonWillType type, PlayerEntity player) { NonNullList inventory = player.inventory.mainInventory; boolean hasGem = false; @@ -77,7 +77,7 @@ public class PlayerDemonWillHandler { * @param amount - The amount of will to consume * @return - The amount of will consumed. */ - public static double consumeDemonWill(EnumDemonWillType type, EntityPlayer player, double amount) { + public static double consumeDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) { double consumed = 0; NonNullList inventory = player.inventory.mainInventory; @@ -107,7 +107,7 @@ public class PlayerDemonWillHandler { * @param willStack - ItemStack that contains an IDemonWill to be added * @return - The modified willStack */ - public static ItemStack addDemonWill(EntityPlayer player, ItemStack willStack) { + public static ItemStack addDemonWill(PlayerEntity player, ItemStack willStack) { if (willStack.isEmpty()) return ItemStack.EMPTY; @@ -133,7 +133,7 @@ public class PlayerDemonWillHandler { * @param amount - The amount of will to add * @return - The amount of will added */ - public static double addDemonWill(EnumDemonWillType type, EntityPlayer player, double amount) { + public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) { NonNullList inventory = player.inventory.mainInventory; double remaining = amount; @@ -158,7 +158,7 @@ public class PlayerDemonWillHandler { * @param ignored - A stack to ignore * @return - The amount of will added */ - public static double addDemonWill(EnumDemonWillType type, EntityPlayer player, double amount, ItemStack ignored) { + public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount, ItemStack ignored) { NonNullList inventory = player.inventory.mainInventory; double remaining = amount; diff --git a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java index bf1d7826..a9897ce0 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java +++ b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java @@ -7,15 +7,15 @@ import net.minecraft.util.Mirror; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import net.minecraft.world.gen.structure.template.PlacementSettings; -import net.minecraft.world.gen.structure.template.Template; -import net.minecraft.world.gen.structure.template.TemplateManager; +import net.minecraft.world.ServerWorld; +import net.minecraft.world.gen.feature.template.PlacementSettings; +import net.minecraft.world.gen.feature.template.Template; +import net.minecraft.world.gen.feature.template.TemplateManager; import java.util.Random; public class BuildTestStructure { - public boolean placeStructureAtPosition(Random rand, Rotation baseRotation, WorldServer world, BlockPos pos, int iteration) { + public boolean placeStructureAtPosition(Random rand, Rotation baseRotation, ServerWorld world, BlockPos pos, int iteration) { if (pos == null) return false; diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index dab32935..0575197a 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -2,22 +2,22 @@ package WayofTime.bloodmagic.structures; import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import net.minecraft.world.gen.structure.template.PlacementSettings; +import net.minecraft.world.ServerWorld; +import net.minecraft.world.gen.feature.template.PlacementSettings; import org.apache.commons.lang3.tuple.Pair; import java.util.*; import java.util.Map.Entry; public class Dungeon { - public static boolean placeStructureAtPosition(Random rand, WorldServer world, BlockPos pos) { + public static boolean placeStructureAtPosition(Random rand, ServerWorld world, BlockPos pos) { long startTime = System.nanoTime(); - Map> availableDoorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. + Map> availableDoorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. List descriptorList = new ArrayList<>(); Map> roomMap = new HashMap<>(); // Placement positions in terms of actual positions @@ -37,7 +37,7 @@ public class Dungeon { DungeonRoom room = getRandomRoom(rand); roomMap.put(pos, Pair.of(room, settings.copy())); descriptorList.addAll(room.getAreaDescriptors(settings, pos)); - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { if (availableDoorMap.containsKey(facing)) { List doorList = availableDoorMap.get(facing); doorList.addAll(room.getDoorOffsetsForFacing(settings, facing, pos)); @@ -49,8 +49,8 @@ public class Dungeon { //Initial AreaDescriptors and door positions are initialized. Time for fun! for (int i = 0; i < 100; i++) { - List facingList = new ArrayList<>(); - for (Entry> entry : availableDoorMap.entrySet()) { + List facingList = new ArrayList<>(); + for (Entry> entry : availableDoorMap.entrySet()) { if (entry.getValue() != null && !entry.getValue().isEmpty()) { facingList.add(entry.getKey()); } @@ -58,12 +58,12 @@ public class Dungeon { Collections.shuffle(facingList); //Shuffle the list so that it is random what is chosen - Pair removedDoor1 = null; - Pair removedDoor2 = null; + Pair removedDoor1 = null; + Pair removedDoor2 = null; BlockPos roomLocation = null; - for (EnumFacing doorFacing : facingList) { - EnumFacing oppositeDoorFacing = doorFacing.getOpposite(); + for (Direction doorFacing : facingList) { + Direction oppositeDoorFacing = doorFacing.getOpposite(); List availableDoorList = availableDoorMap.get(doorFacing); //May need to copy here Collections.shuffle(availableDoorList); @@ -105,7 +105,7 @@ public class Dungeon { } if (removedDoor1 != null) { - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { if (availableDoorMap.containsKey(facing)) { List doorList = availableDoorMap.get(facing); doorList.addAll(room.getDoorOffsetsForFacing(settings, facing, roomLocation)); @@ -115,14 +115,14 @@ public class Dungeon { } } - EnumFacing face = removedDoor1.getKey(); + Direction face = removedDoor1.getKey(); if (availableDoorMap.containsKey(face)) { availableDoorMap.get(face).remove(removedDoor1.getRight()); } } if (removedDoor2 != null) { - EnumFacing face = removedDoor2.getKey(); + Direction face = removedDoor2.getKey(); if (availableDoorMap.containsKey(face)) { availableDoorMap.get(face).remove(removedDoor2.getRight()); } diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index cef16685..76b242bd 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.structures; import WayofTime.bloodmagic.ritual.AreaDescriptor; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import net.minecraft.world.gen.structure.template.PlacementSettings; -import net.minecraft.world.gen.structure.template.Template; +import net.minecraft.world.ServerWorld; +import net.minecraft.world.gen.feature.template.PlacementSettings; +import net.minecraft.world.gen.feature.template.Template; import java.util.*; import java.util.Map.Entry; @@ -15,10 +15,10 @@ public class DungeonRoom { public int dungeonWeight = 1; public Map structureMap = new HashMap<>(); - public Map> doorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. + public Map> doorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. public List descriptorList = new ArrayList<>(); - public DungeonRoom(Map structureMap, Map> doorMap, List descriptorList) { + public DungeonRoom(Map structureMap, Map> doorMap, List descriptorList) { this.structureMap = structureMap; this.doorMap = doorMap; this.descriptorList = descriptorList; @@ -34,10 +34,10 @@ public class DungeonRoom { return newList; } - public List getDoorOffsetsForFacing(PlacementSettings settings, EnumFacing facing, BlockPos offset) { + public List getDoorOffsetsForFacing(PlacementSettings settings, Direction facing, BlockPos offset) { List offsetList = new ArrayList<>(); - EnumFacing originalFacing = DungeonUtil.reverseRotate(settings.getMirror(), settings.getRotation(), facing); + Direction originalFacing = DungeonUtil.reverseRotate(settings.getMirror(), settings.getRotation(), facing); if (doorMap.containsKey(originalFacing)) { List doorList = doorMap.get(originalFacing); for (BlockPos doorPos : doorList) { @@ -48,7 +48,7 @@ public class DungeonRoom { return offsetList; } - public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, WorldServer world, BlockPos pos) { + public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, ServerWorld world, BlockPos pos) { for (Entry entry : structureMap.entrySet()) { ResourceLocation location = new ResourceLocation(entry.getKey()); DungeonStructure structure = new DungeonStructure(location); diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java index 198869e6..7f5b8705 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.util.BMLog; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import net.minecraft.world.gen.structure.template.PlacementSettings; -import net.minecraft.world.gen.structure.template.Template; -import net.minecraft.world.gen.structure.template.TemplateManager; +import net.minecraft.world.ServerWorld; +import net.minecraft.world.gen.feature.template.PlacementSettings; +import net.minecraft.world.gen.feature.template.Template; +import net.minecraft.world.gen.feature.template.TemplateManager; import java.util.Random; @@ -18,7 +18,7 @@ public class DungeonStructure { this.resource = resource; } - public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, WorldServer world, BlockPos pos) { + public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, ServerWorld world, BlockPos pos) { if (pos == null) return false; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java index 70bc4aaf..68483ead 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.structures; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import java.util.Random; public class DungeonTester { - public static void testDungeonGeneration(WorldServer world, BlockPos pos) { + public static void testDungeonGeneration(ServerWorld world, BlockPos pos) { } - public static void testDungeonElementWithOutput(WorldServer world, BlockPos pos) { + public static void testDungeonElementWithOutput(ServerWorld world, BlockPos pos) { Dungeon.placeStructureAtPosition(new Random(), world, pos); // ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "Corridor1"); // diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java index ddf6c518..31cbbb1c 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java @@ -1,25 +1,25 @@ package WayofTime.bloodmagic.structures; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.structure.template.PlacementSettings; +import net.minecraft.world.gen.feature.template.PlacementSettings; import java.util.ArrayList; import java.util.List; import java.util.Map; public class DungeonUtil { - public static EnumFacing rotate(Mirror mirror, Rotation rotation, EnumFacing original) { + public static Direction rotate(Mirror mirror, Rotation rotation, Direction original) { return rotation.rotate(mirror.mirror(original)); } - public static EnumFacing reverseRotate(Mirror mirror, Rotation rotation, EnumFacing original) { + public static Direction reverseRotate(Mirror mirror, Rotation rotation, Direction original) { return mirror.mirror(getOppositeRotation(rotation).rotate(original)); } - public static EnumFacing getFacingForSettings(PlacementSettings settings, EnumFacing original) { + public static Direction getFacingForSettings(PlacementSettings settings, Direction original) { return rotate(settings.getMirror(), settings.getRotation(), original); } @@ -34,7 +34,7 @@ public class DungeonUtil { } } - public static void addRoom(Map> doorMap, EnumFacing facing, BlockPos offsetPos) { + public static void addRoom(Map> doorMap, Direction facing, BlockPos offsetPos) { if (doorMap.containsKey(facing)) { doorMap.get(facing).add(offsetPos); } else { diff --git a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java index ccb55eeb..37460c8f 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.teleport; import WayofTime.bloodmagic.util.Constants; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import java.io.Serializable; @@ -23,8 +23,8 @@ public class PortalLocation implements Serializable { this(blockPos.getX(), blockPos.getY(), blockPos.getZ(), dimension); } - public NBTTagCompound writeToNBT(NBTTagCompound tag) { - NBTTagCompound locationTag = new NBTTagCompound(); + public CompoundNBT writeToNBT(CompoundNBT tag) { + CompoundNBT locationTag = new CompoundNBT(); locationTag.setInteger(Constants.NBT.X_COORD, x); locationTag.setInteger(Constants.NBT.Y_COORD, y); @@ -80,9 +80,9 @@ public class PortalLocation implements Serializable { return dimension; } - public static PortalLocation readFromNBT(NBTTagCompound tag) { + public static PortalLocation readFromNBT(CompoundNBT tag) { if (tag.hasKey(Constants.NBT.PORTAL_LOCATION)) { - NBTTagCompound locationTag = tag.getCompoundTag(Constants.NBT.PORTAL_LOCATION); + CompoundNBT locationTag = tag.getCompoundTag(Constants.NBT.PORTAL_LOCATION); return new PortalLocation(locationTag.getInteger(Constants.NBT.X_COORD), locationTag.getInteger(Constants.NBT.Y_COORD), locationTag.getInteger(Constants.NBT.Z_COORD), locationTag.getInteger(Constants.NBT.DIMENSION_ID)); } return null; diff --git a/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java index 4a02d90a..8ff084ce 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java @@ -3,10 +3,10 @@ package WayofTime.bloodmagic.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; import net.minecraft.world.Teleporter; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; public class TeleporterBloodMagic extends Teleporter { - public TeleporterBloodMagic(WorldServer worldServer) { + public TeleporterBloodMagic(ServerWorld worldServer) { super(worldServer); } diff --git a/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java index 646480f3..e5ff2b56 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java @@ -6,23 +6,22 @@ import WayofTime.bloodmagic.event.TeleposeEvent; import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.SoundEvents; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.SPacketEntityEffect; -import net.minecraft.network.play.server.SPacketPlayerAbilities; -import net.minecraft.network.play.server.SPacketRespawn; -import net.minecraft.network.play.server.SPacketUpdateHealth; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.play.server.*; +import net.minecraft.potion.EffectInstance; +import net.minecraft.util.SoundEvents; +import net.minecraft.network.play.server.SPlayEntityEffectPacket; +import net.minecraft.network.play.server.SUpdateHealthPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.PlayerList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -49,7 +48,7 @@ public class Teleports { BlockPos targetTeleposer = new BlockPos(x, y, z); if (entity.timeUntilPortal <= 0) { entity.timeUntilPortal = 10; - if (entity instanceof EntityPlayer) { + if (entity instanceof PlayerEntity) { SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); if (network.getCurrentEssence() < getTeleportCost()) @@ -58,13 +57,13 @@ public class Teleports { if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer))) return; - EntityPlayerMP player = (EntityPlayerMP) entity; + ServerPlayerEntity player = (ServerPlayerEntity) entity; network.syphon(ticket(entity.world, player, getTeleportCost())); player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.getEntityWorld().updateEntityWithOptionalForce(player, false); - player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + player.connection.sendPacket(new SUpdateHealthPacket(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); player.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); if (teleposer) @@ -77,7 +76,7 @@ public class Teleports { if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer))) return; - WorldServer world = (WorldServer) entity.getEntityWorld(); + ServerWorld world = (ServerWorld) entity.getEntityWorld(); network.syphon(ticket(world, entity, getTeleportCost() / 10)); @@ -122,15 +121,15 @@ public class Teleports { if (entity.timeUntilPortal <= 0) { entity.timeUntilPortal = 10; MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - WorldServer oldWorldServer = server.getWorld(entity.dimension); - WorldServer newWorldServer = server.getWorld(newWorldID); + ServerWorld oldWorldServer = server.getWorld(entity.dimension); + ServerWorld newWorldServer = server.getWorld(newWorldID); BlockPos targetTeleposer = new BlockPos(x, y, z); ChunkPos teleposerChunk = new ChunkPos(targetTeleposer); ForgeChunkManager.Ticket chunkTicket = ForgeChunkManager.requestTicket("bloodmagic", newWorldServer, ForgeChunkManager.Type.NORMAL); ForgeChunkManager.forceChunk(chunkTicket, teleposerChunk); - if (entity instanceof EntityPlayer) { - EntityPlayerMP player = (EntityPlayerMP) entity; + if (entity instanceof PlayerEntity) { + ServerPlayerEntity player = (ServerPlayerEntity) entity; if (!player.getEntityWorld().isRemote) { @@ -152,7 +151,7 @@ public class Teleports { PlayerList playerList = server.getPlayerList(); player.dimension = newWorldID; - player.connection.sendPacket(new SPacketRespawn(player.dimension, newWorldServer.getDifficulty(), newWorldServer.getWorldInfo().getTerrainType(), player.interactionManager.getGameType())); + player.connection.sendPacket(new SRespawnPacket(player.dimension, newWorldServer.getDifficulty(), newWorldServer.getWorldInfo().getTerrainType(), player.interactionManager.getGameType())); playerList.updatePermissionLevel(player); oldWorldServer.removeEntityDangerously(player); player.isDead = false; @@ -170,13 +169,13 @@ public class Teleports { playerList.preparePlayer(player, oldWorldServer); player.connection.setPlayerLocation(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); player.interactionManager.setWorld(newWorldServer); - player.connection.sendPacket(new SPacketPlayerAbilities(player.capabilities)); + player.connection.sendPacket(new SPlayerAbilitiesPacket(player.capabilities)); playerList.updateTimeAndWeatherForPlayer(player, newWorldServer); playerList.syncPlayerInventory(player); - for (PotionEffect potioneffect : player.getActivePotionEffects()) { - player.connection.sendPacket(new SPacketEntityEffect(player.getEntityId(), potioneffect)); + for (EffectInstance potioneffect : player.getActivePotionEffects()) { + player.connection.sendPacket(new SPlayEntityEffectPacket(player.getEntityId(), potioneffect)); } FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, entity.dimension, newWorldID); player.setLocationAndAngles(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); @@ -197,7 +196,7 @@ public class Teleports { network.syphon(ticket(oldWorld, entity, getTeleportCost() / 10)); - NBTTagCompound tag = new NBTTagCompound(); + CompoundNBT tag = new CompoundNBT(); entity.writeToNBTOptional(tag); entity.setDead(); @@ -244,6 +243,6 @@ public class Teleports { } public static SoulTicket ticket(World world, Entity entity, int amount) { - return new SoulTicket(new TextComponentString("teleport|" + world.provider.getDimension() + "|" + entity.getName() + "|" + entity.getPosition().toLong()), amount); + return new SoulTicket(new StringTextComponent("teleport|" + world.provider.getDimension() + "|" + entity.getName() + "|" + entity.getPosition().toLong()), amount); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 4173ca2c..8f753ecf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -8,10 +8,10 @@ import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.iface.IAlchemyArray; import WayofTime.bloodmagic.util.Constants; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; @@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray { public boolean isActive = false; public int activeCounter = 0; - public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; + public Direction rotation = Direction.HORIZONTALS[0]; public int rotateCooldown = 0; private String key = "empty"; @@ -31,14 +31,14 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche super(2, "alchemyArray"); } - public void onEntityCollidedWithBlock(IBlockState state, Entity entity) { + public void onEntityCollidedWithBlock(BlockState state, Entity entity) { if (arrayEffect != null) { arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity); } } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); this.isActive = tagCompound.getBoolean("isActive"); this.activeCounter = tagCompound.getInteger("activeCounter"); @@ -49,9 +49,9 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } else { this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); } - this.rotation = EnumFacing.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; + this.rotation = Direction.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; - NBTTagCompound arrayTag = tagCompound.getCompoundTag("arrayTag"); + CompoundNBT arrayTag = tagCompound.getCompoundTag("arrayTag"); arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); if (arrayEffect != null) { arrayEffect.readFromNBT(arrayTag); @@ -59,7 +59,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); tagCompound.setBoolean("isActive", isActive); tagCompound.setInteger("activeCounter", activeCounter); @@ -67,7 +67,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche tagCompound.setBoolean("doDropIngredients", doDropIngredients); tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); - NBTTagCompound arrayTag = new NBTTagCompound(); + CompoundNBT arrayTag = new CompoundNBT(); if (arrayEffect != null) { arrayEffect.writeToNBT(arrayTag); } @@ -159,11 +159,11 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } @Override - public EnumFacing getRotation() { + public Direction getRotation() { return rotation; } - public void setRotation(EnumFacing rotation) { + public void setRotation(Direction rotation) { this.rotation = rotation; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index ac701257..9b9aec1a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -12,12 +12,12 @@ import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; @@ -34,7 +34,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, public static final int toolSlot = 7; public static final int outputSlot = 8; - public EnumFacing direction = EnumFacing.NORTH; + public Direction direction = Direction.NORTH; public boolean isSlave = false; public int burnTime = 0; public int ticksRequired = 1; @@ -46,7 +46,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, super(9, "alchemyTable"); } - public void setInitialTableParameters(EnumFacing direction, boolean isSlave, BlockPos connectedPos) { + public void setInitialTableParameters(Direction direction, boolean isSlave, BlockPos connectedPos) { this.isSlave = isSlave; this.connectedPos = connectedPos; @@ -69,11 +69,11 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); - direction = EnumFacing.byIndex(tag.getInteger(Constants.NBT.DIRECTION)); + direction = Direction.byIndex(tag.getInteger(Constants.NBT.DIRECTION)); connectedPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); burnTime = tag.getInteger("burnTime"); @@ -85,7 +85,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setBoolean("isSlave", isSlave); @@ -107,7 +107,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, @SuppressWarnings("unchecked") @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(Capability capability, Direction facing) { if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { if (this.isSlave()) { TileEntity tile = getWorld().getTileEntity(connectedPos); @@ -123,7 +123,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public int[] getSlotsForFace(EnumFacing side) { + public int[] getSlotsForFace(Direction side) { switch (side) { case DOWN: return new int[]{outputSlot}; @@ -135,7 +135,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { + public boolean canInsertItem(int index, ItemStack stack, Direction direction) { switch (direction) { case DOWN: return index != outputSlot && index != orbSlot && index != toolSlot; @@ -159,7 +159,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { + public boolean canExtractItem(int index, ItemStack stack, Direction direction) { switch (direction) { case DOWN: return index == outputSlot; @@ -182,7 +182,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } - public List getAccessibleInputSlots(EnumFacing direction) { + public List getAccessibleInputSlots(Direction direction) { List list = new ArrayList<>(); for (int i = 0; i < 6; i++) { @@ -236,7 +236,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, burnTime = 0; - IBlockState state = getWorld().getBlockState(pos); + BlockState state = getWorld().getBlockState(pos); getWorld().notifyBlockUpdate(getPos(), state, state, 3); } else if (burnTime > ticksRequired + 10) { burnTime = 0; @@ -394,7 +394,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } } - public EnumFacing getDirection() { + public Direction getDirection() { return direction; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index b0ecd0c9..35dc8cdf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.altar.BloodAltar; import WayofTime.bloodmagic.altar.AltarTier; import WayofTime.bloodmagic.altar.IBloodAltar; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.ITickable; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -22,19 +22,19 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); - NBTTagCompound altarTag = tagCompound.getCompoundTag("bloodAltar"); + CompoundNBT altarTag = tagCompound.getCompoundTag("bloodAltar"); this.bloodAltar.readFromNBT(altarTag); } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); - NBTTagCompound altarTag = new NBTTagCompound(); + CompoundNBT altarTag = new CompoundNBT(); this.bloodAltar.writeToNBT(altarTag); tagCompound.setTag("bloodAltar", altarTag); @@ -170,7 +170,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { } @Override - public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable Direction facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return true; } @@ -180,7 +180,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { @SuppressWarnings("unchecked") @Override - public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable Direction facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return (T) bloodAltar; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index f0b0b41a..8a7cfe0d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; @@ -25,7 +25,7 @@ public class TileBloodTank extends TileBase { } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); tank.readFromNBT(tagCompound.getCompoundTag(Constants.NBT.TANK)); capacity = tagCompound.getInteger(Constants.NBT.ALTAR_CAPACITY); @@ -33,10 +33,10 @@ public class TileBloodTank extends TileBase { } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); if (tank.getFluidAmount() != 0) - tagCompound.setTag(Constants.NBT.TANK, tank.writeToNBT(new NBTTagCompound())); + tagCompound.setTag(Constants.NBT.TANK, tank.writeToNBT(new CompoundNBT())); tagCompound.setInteger(Constants.NBT.ALTAR_CAPACITY, capacity); return tagCompound; } @@ -66,13 +66,13 @@ public class TileBloodTank extends TileBase { } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { + public boolean hasCapability(Capability capability, Direction facing) { return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } @SuppressWarnings("unchecked") @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(Capability capability, Direction facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return (T) tank; return super.getCapability(capability, facing); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 52ff0be5..6f4ba7f7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -7,8 +7,8 @@ import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.ITickable; import java.util.HashMap; @@ -89,7 +89,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); willMap.clear(); @@ -103,7 +103,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); for (Entry entry : willMap.entrySet()) { @@ -198,17 +198,17 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo } @Override - public int[] getSlotsForFace(EnumFacing side) { + public int[] getSlotsForFace(Direction side) { return new int[]{0}; } @Override - public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { + public boolean canInsertItem(int index, ItemStack stack, Direction direction) { return !stack.isEmpty() && inventory.get(0).isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill); } @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { + public boolean canExtractItem(int index, ItemStack stack, Direction direction) { return true; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 9d2e5c4e..125d3557 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -5,11 +5,11 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.base.TileTicking; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.math.MathHelper; public class TileDemonCrystal extends TileTicking { @@ -22,7 +22,7 @@ public class TileDemonCrystal extends TileTicking { public double progressToNextCrystal = 0; public int internalCounter = 0; public int crystalCount = 1; - public EnumFacing placement = EnumFacing.UP; //Side that this crystal is placed on. + public Direction placement = Direction.UP; //Side that this crystal is placed on. public TileDemonCrystal() { this.crystalCount = 1; @@ -84,7 +84,7 @@ public class TileDemonCrystal extends TileTicking { return 0; } - IBlockState state = getWorld().getBlockState(pos); + BlockState state = getWorld().getBlockState(pos); int meta = this.getBlockType().getMetaFromState(state); EnumDemonWillType type = EnumDemonWillType.values()[meta]; @@ -122,7 +122,7 @@ public class TileDemonCrystal extends TileTicking { public boolean dropSingleCrystal() { if (!getWorld().isRemote && crystalCount > 1) { - IBlockState state = getWorld().getBlockState(pos); + BlockState state = getWorld().getBlockState(pos); EnumDemonWillType type = state.getValue(BlockDemonCrystal.TYPE); ItemStack stack = BlockDemonCrystal.getItemStackDropped(type, 1); if (!stack.isEmpty()) { @@ -145,15 +145,15 @@ public class TileDemonCrystal extends TileTicking { } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { holder.readFromNBT(tag, "Will"); crystalCount = tag.getInteger("crystalCount"); - placement = EnumFacing.byIndex(tag.getInteger("placement")); + placement = Direction.byIndex(tag.getInteger("placement")); progressToNextCrystal = tag.getDouble("progress"); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); tag.setInteger("crystalCount", crystalCount); tag.setInteger("placement", placement.getIndex()); @@ -169,11 +169,11 @@ public class TileDemonCrystal extends TileTicking { this.crystalCount = crystalCount; } - public EnumFacing getPlacement() { + public Direction getPlacement() { return placement; } - public void setPlacement(EnumFacing placement) { + public void setPlacement(Direction placement) { this.placement = placement; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index e462b767..fe9137c4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; @@ -30,7 +30,7 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond return; } - BlockPos offsetPos = pos.offset(EnumFacing.UP); + BlockPos offsetPos = pos.offset(Direction.UP); if (getWorld().isAirBlock(offsetPos)) //Room for a crystal to grow { EnumDemonWillType highestType = WorldDemonWillHandler.getHighestDemonWillType(getWorld(), pos); @@ -53,7 +53,7 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond getWorld().setBlockState(position, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal())); TileEntity tile = getWorld().getTileEntity(position); if (tile instanceof TileDemonCrystal) { - ((TileDemonCrystal) tile).setPlacement(EnumFacing.UP); + ((TileDemonCrystal) tile).setPlacement(Direction.UP); return true; } @@ -65,13 +65,13 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { holder.readFromNBT(tag, "Will"); internalCounter = tag.getDouble("internalCounter"); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); tag.setDouble("internalCounter", internalCounter); return tag; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index 80817ce6..dc4c7def 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -5,8 +5,8 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; public class TileDemonPylon extends TileTicking implements IDemonWillConduit { @@ -27,7 +27,7 @@ public class TileDemonPylon extends TileTicking implements IDemonWillConduit { for (EnumDemonWillType type : EnumDemonWillType.values()) { double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - for (EnumFacing side : EnumFacing.HORIZONTALS) { + for (Direction side : Direction.HORIZONTALS) { BlockPos offsetPos = pos.offset(side, 16); double sideAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), offsetPos, type); if (sideAmount > currentAmount) { @@ -40,12 +40,12 @@ public class TileDemonPylon extends TileTicking implements IDemonWillConduit { } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { holder.readFromNBT(tag, "Will"); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index c58a02be..afabdfe7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.ritual.types.RitualPortal; import WayofTime.bloodmagic.tile.base.TileBase; import com.google.common.base.Strings; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; public class TileDimensionalPortal extends TileBase { @@ -12,7 +12,7 @@ public class TileDimensionalPortal extends TileBase { public int masterStoneY; public int masterStoneZ; - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { portalID = tagCompound.getString(RitualPortal.PORTAL_ID_TAG); masterStoneX = tagCompound.getInteger("masterStoneX"); @@ -20,7 +20,7 @@ public class TileDimensionalPortal extends TileBase { masterStoneZ = tagCompound.getInteger("masterStoneZ"); } - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { tagCompound.setString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID); tagCompound.setInteger("masterStoneX", masterStoneX); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index e10d556e..222dce55 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -7,8 +7,8 @@ import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.tile.base.TileBase; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.effect.LightningBoltEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,13 +17,13 @@ import javax.annotation.Nullable; public class TileImperfectRitualStone extends TileBase implements IImperfectRitualStone { @Override - public boolean performRitual(World world, BlockPos pos, @Nullable ImperfectRitual imperfectRitual, EntityPlayer player) { + public boolean performRitual(World world, BlockPos pos, @Nullable ImperfectRitual imperfectRitual, PlayerEntity player) { if (imperfectRitual != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(imperfectRitual), true)) { if (!PlayerHelper.isFakePlayer(player) && !world.isRemote) { NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.block(getWorld(), getPos(), imperfectRitual.getActivationCost())); if (imperfectRitual.onActivate(this, player)) { if (imperfectRitual.isLightShow()) - getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); + getWorld().addWeatherEffect(new LightningBoltEntity(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); return true; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index f0da8c4a..1f645991 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -4,15 +4,15 @@ import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.*; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import java.util.HashMap; import java.util.List; @@ -35,7 +35,7 @@ public class TileIncenseAltar extends TileInventory implements ITickable { @Override public void update() { AxisAlignedBB aabb = incenseArea.getAABB(getPos()); - List playerList = getWorld().getEntitiesWithinAABB(EntityPlayer.class, aabb); + List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, aabb); if (playerList.isEmpty()) { return; } @@ -46,29 +46,29 @@ public class TileIncenseAltar extends TileInventory implements ITickable { boolean hasPerformed = false; - for (EntityPlayer player : playerList) { + for (PlayerEntity player : playerList) { if (PlayerSacrificeHelper.incrementIncense(player, 0, incenseAddition, incenseAddition / 100)) { hasPerformed = true; } } if (hasPerformed) { - if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof WorldServer) { - WorldServer server = (WorldServer) getWorld(); + if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof ServerWorld) { + ServerWorld server = (ServerWorld) getWorld(); server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); } } } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); tranquility = tag.getDouble("tranquility"); incenseAddition = tag.getDouble("incenseAddition"); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setDouble("tranquility", tranquility); tag.setDouble("incenseAddition", incenseAddition); @@ -90,11 +90,11 @@ public class TileIncenseAltar extends TileInventory implements ITickable { canFormRoad = true; level: - for (EnumFacing horizontalFacing : EnumFacing.HORIZONTALS) { + for (Direction horizontalFacing : Direction.HORIZONTALS) { BlockPos facingOffsetPos = verticalPos.offset(horizontalFacing, currentDistance); for (int j = -1; j <= 1; j++) { BlockPos offsetPos = facingOffsetPos.offset(horizontalFacing.rotateY(), j); - IBlockState state = getWorld().getBlockState(offsetPos); + BlockState state = getWorld().getBlockState(offsetPos); Block block = state.getBlock(); if (!(block instanceof IIncensePath && ((IIncensePath) block).getLevelOfPath(getWorld(), offsetPos, state) >= currentDistance - 2)) { canFormRoad = false; @@ -118,7 +118,7 @@ public class TileIncenseAltar extends TileInventory implements ITickable { for (int y = yOffset; y <= 2 + yOffset; y++) { BlockPos offsetPos = pos.add(i, y, j); - IBlockState state = getWorld().getBlockState(offsetPos); + BlockState state = getWorld().getBlockState(offsetPos); Block block = state.getBlock(); TranquilityStack stack = IncenseTranquilityRegistry.getTranquilityOfBlock(getWorld(), offsetPos, block, state); if (stack != null) { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index 11e2edf3..5d6607f0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -2,17 +2,17 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.tile.base.TileBase; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -50,14 +50,14 @@ public class TileInventory extends TileBase implements IInventory { } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); - NBTTagList tags = tagCompound.getTagList("Items", 10); + ListNBT tags = tagCompound.getTagList("Items", 10); inventory = NonNullList.withSize(size, ItemStack.EMPTY); for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - NBTTagCompound data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompoundTagAt(i); byte j = data.getByte("Slot"); if (j >= 0 && j < inventory.size()) { @@ -68,13 +68,13 @@ public class TileInventory extends TileBase implements IInventory { } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); - NBTTagList tags = new NBTTagList(); + ListNBT tags = new ListNBT(); for (int i = 0; i < inventory.size(); i++) { if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) { - NBTTagCompound data = new NBTTagCompound(); + CompoundNBT data = new CompoundNBT(); data.setByte("Slot", (byte) i); inventory.get(i).writeToNBT(data); tags.appendTag(data); @@ -146,12 +146,12 @@ public class TileInventory extends TileBase implements IInventory { } @Override - public void openInventory(EntityPlayer player) { + public void openInventory(PlayerEntity player) { } @Override - public void closeInventory(EntityPlayer player) { + public void closeInventory(PlayerEntity player) { } @@ -192,7 +192,7 @@ public class TileInventory extends TileBase implements IInventory { } @Override - public boolean isUsableByPlayer(EntityPlayer player) { + public boolean isUsableByPlayer(PlayerEntity player) { return true; } @@ -208,17 +208,17 @@ public class TileInventory extends TileBase implements IInventory { @Override public ITextComponent getDisplayName() { - return new TextComponentString(getName()); + return new StringTextComponent(getName()); } protected void initializeItemHandlers() { if (this instanceof ISidedInventory) { - handlerDown = new SidedInvWrapper((ISidedInventory) this, EnumFacing.DOWN); - handlerUp = new SidedInvWrapper((ISidedInventory) this, EnumFacing.UP); - handlerNorth = new SidedInvWrapper((ISidedInventory) this, EnumFacing.NORTH); - handlerSouth = new SidedInvWrapper((ISidedInventory) this, EnumFacing.SOUTH); - handlerWest = new SidedInvWrapper((ISidedInventory) this, EnumFacing.WEST); - handlerEast = new SidedInvWrapper((ISidedInventory) this, EnumFacing.EAST); + handlerDown = new SidedInvWrapper((ISidedInventory) this, Direction.DOWN); + handlerUp = new SidedInvWrapper((ISidedInventory) this, Direction.UP); + handlerNorth = new SidedInvWrapper((ISidedInventory) this, Direction.NORTH); + handlerSouth = new SidedInvWrapper((ISidedInventory) this, Direction.SOUTH); + handlerWest = new SidedInvWrapper((ISidedInventory) this, Direction.WEST); + handlerEast = new SidedInvWrapper((ISidedInventory) this, Direction.EAST); } else { handlerDown = new InvWrapper(this); handlerUp = handlerDown; @@ -231,7 +231,7 @@ public class TileInventory extends TileBase implements IInventory { @SuppressWarnings("unchecked") @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(Capability capability, Direction facing) { if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { switch (facing) { case DOWN: @@ -255,7 +255,7 @@ public class TileInventory extends TileBase implements IInventory { } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { + public boolean hasCapability(Capability capability, Direction facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index a947fda7..41ee1d2f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -10,10 +10,10 @@ import WayofTime.bloodmagic.inversion.InversionPillarHandler; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -133,9 +133,9 @@ public class TileInversionPillar extends TileTicking { BlockPos candidatePos = findCandidatePositionForPillar(getWorld(), type, pos, allConnectedPos, 5, 10); if (!candidatePos.equals(BlockPos.ORIGIN)) { currentInversion = 0; - IBlockState pillarState = RegistrarBloodMagicBlocks.INVERSION_PILLAR.getStateFromMeta(type.ordinal()); - IBlockState bottomState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2); - IBlockState topState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2 + 1); + BlockState pillarState = RegistrarBloodMagicBlocks.INVERSION_PILLAR.getStateFromMeta(type.ordinal()); + BlockState bottomState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2); + BlockState topState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2 + 1); getWorld().setBlockState(candidatePos, pillarState); getWorld().setBlockState(candidatePos.down(), bottomState); getWorld().setBlockState(candidatePos.up(), topState); @@ -166,7 +166,7 @@ public class TileInversionPillar extends TileTicking { return; } - for (EnumFacing side : EnumFacing.HORIZONTALS) { + for (Direction side : Direction.HORIZONTALS) { BlockPos offsetPos = pos.offset(side, 16); double sideAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), offsetPos, type); if (currentAmount > sideAmount) { @@ -194,7 +194,7 @@ public class TileInversionPillar extends TileTicking { } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { @@ -211,7 +211,7 @@ public class TileInversionPillar extends TileTicking { } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setString(Constants.NBT.WILL_TYPE, type.toString()); @@ -282,7 +282,7 @@ public class TileInversionPillar extends TileTicking { return 1; //Invalid block (itself!) } - IBlockState state = getWorld().getBlockState(offsetPos); + BlockState state = getWorld().getBlockState(offsetPos); if (!state.getBlock().isAir(state, getWorld(), offsetPos)) { //Consume Will and set this block Block block = state.getBlock(); @@ -314,7 +314,7 @@ public class TileInversionPillar extends TileTicking { } @Override - public boolean hasCapability(Capability capability, EnumFacing side) { + public boolean hasCapability(Capability capability, Direction side) { if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return true; } @@ -322,7 +322,7 @@ public class TileInversionPillar extends TileTicking { } @Override - public T getCapability(Capability capability, EnumFacing side) { + public T getCapability(Capability capability, Direction side) { if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 88ae398b..ac7531db 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -19,12 +19,12 @@ import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.*; import com.google.common.base.Strings; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -40,7 +40,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS private int activeTime; private int cooldown; private Ritual currentRitual; - private EnumFacing direction = EnumFacing.NORTH; + private Direction direction = Direction.NORTH; private boolean inverted; private List currentActiveWillConfig = new ArrayList<>(); @@ -73,20 +73,20 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { owner = tag.hasUniqueId("owner") ? tag.getUniqueId("owner") : null; if (owner != null) cachedNetwork = NetworkHelper.getSoulNetwork(owner); currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { - NBTTagCompound ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); + CompoundNBT ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); if (!ritualTag.isEmpty()) { currentRitual.readFromNBT(ritualTag); } } active = tag.getBoolean(Constants.NBT.IS_RUNNING); activeTime = tag.getInteger(Constants.NBT.RUNTIME); - direction = EnumFacing.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; + direction = Direction.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; redstoned = tag.getBoolean(Constants.NBT.IS_REDSTONED); for (EnumDemonWillType type : EnumDemonWillType.values()) { @@ -97,13 +97,13 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); if (owner != null) tag.setUniqueId("owner", owner); tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); if (currentRitual != null) { - NBTTagCompound ritualTag = new NBTTagCompound(); + CompoundNBT ritualTag = new CompoundNBT(); currentRitual.writeToNBT(ritualTag); tag.setTag(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); } @@ -120,7 +120,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public boolean activateRitual(ItemStack activationCrystal, @Nullable EntityPlayer activator, Ritual ritual) { + public boolean activateRitual(ItemStack activationCrystal, @Nullable PlayerEntity activator, Ritual ritual) { if (PlayerHelper.isFakePlayer(activator)) return false; @@ -133,7 +133,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS SoulNetwork network = NetworkHelper.getSoulNetwork(binding); if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() && (activator != null && !activator.capabilities.isCreativeMode)) { - activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.weak"), true); + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.weak"), true); return false; } @@ -144,7 +144,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS if (MinecraftForge.EVENT_BUS.post(event)) { if (activator != null) - activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.prevent"), true); + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.prevent"), true); return false; } @@ -153,7 +153,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS network.syphon(ticket(ritual.getActivationCost())); if (activator != null) - activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.activate"), true); + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.activate"), true); this.active = true; this.owner = binding.getOwnerId(); @@ -174,7 +174,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } } else { if (activator != null) - activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true); + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); } return false; @@ -229,11 +229,11 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public EnumFacing getDirection() { + public Direction getDirection() { return direction; } - public void setDirection(EnumFacing direction) { + public void setDirection(Direction direction) { this.direction = direction; } @@ -291,26 +291,26 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public void provideInformationOfRitualToPlayer(EntityPlayer player) { + public void provideInformationOfRitualToPlayer(PlayerEntity player) { if (this.currentRitual != null) { ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRitualToPlayer(player)); } } @Override - public void provideInformationOfRangeToPlayer(EntityPlayer player, String range) { + public void provideInformationOfRangeToPlayer(PlayerEntity player, String range) { if (this.currentRitual != null && this.currentRitual.getListOfRanges().contains(range)) { ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRangeToPlayer(player, range)); } } @Override - public void setActiveWillConfig(EntityPlayer player, List typeList) { + public void setActiveWillConfig(PlayerEntity player, List typeList) { this.currentActiveWillConfig = typeList; } @Override - public EnumReaderBoundaries setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2) { + public EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2) { AreaDescriptor descriptor = this.getBlockRange(range); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos()); @@ -327,10 +327,10 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } @Override - public void provideInformationOfWillConfigToPlayer(EntityPlayer player, List typeList) { + public void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList) { //There is probably an easier way to make expanded chat messages if (typeList.size() >= 1) { - Object[] translations = new TextComponentTranslation[typeList.size()]; + Object[] translations = new TranslationTextComponent[typeList.size()]; StringBuilder constructedString = new StringBuilder("%s"); for (int i = 1; i < typeList.size(); i++) { @@ -338,12 +338,12 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } for (int i = 0; i < typeList.size(); i++) { - translations[i] = new TextComponentTranslation("tooltip.bloodmagic.currentBaseType." + typeList.get(i).name.toLowerCase()); + translations[i] = new TranslationTextComponent("tooltip.bloodmagic.currentBaseType." + typeList.get(i).name.toLowerCase()); } - ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.willConfig.set", new TextComponentTranslation(constructedString.toString(), translations))); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.set", new TranslationTextComponent(constructedString.toString(), translations))); } else { - ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.willConfig.void")); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.void")); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java index ea0558b6..88829e15 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java @@ -8,26 +8,26 @@ import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityPotion; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.PotionEntity; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; import net.minecraft.potion.PotionUtils; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -39,9 +39,9 @@ public class TileMimic extends TileInventory implements ITickable { private static Field _blockMetadata = ReflectionHelper.findField(TileEntity.class, "blockMetadata", "field_145847_g"); public boolean dropItemsOnBreak = true; - public NBTTagCompound tileTag = new NBTTagCompound(); + public CompoundNBT tileTag = new CompoundNBT(); public TileEntity mimicedTile = null; - IBlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); + BlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); public int playerCheckRadius = 5; public int potionSpawnRadius = 5; @@ -64,9 +64,9 @@ public class TileMimic extends TileInventory implements ITickable { ItemStack potionStack = this.getStackInSlot(1); if (!potionStack.isEmpty()) { AxisAlignedBB bb = new AxisAlignedBB(this.getPos()).expand(playerCheckRadius, playerCheckRadius, playerCheckRadius); - List playerList = getWorld().getEntitiesWithinAABB(EntityPlayer.class, bb); + List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, bb); - for (EntityPlayer player : playerList) { + for (PlayerEntity player : playerList) { if (!player.capabilities.isCreativeMode) { double posX = this.pos.getX() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius; double posY = this.pos.getY() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius; @@ -75,7 +75,7 @@ public class TileMimic extends TileInventory implements ITickable { ItemStack newStack = new ItemStack(potionStack.getItem() == RegistrarBloodMagicItems.POTION_FLASK ? Items.SPLASH_POTION : potionStack.getItem()); newStack.setTagCompound(potionStack.getTagCompound()); - EntityPotion potionEntity = new EntityPotion(getWorld(), posX, posY, posZ, newStack); + PotionEntity potionEntity = new PotionEntity(getWorld(), posX, posY, posZ, newStack); getWorld().spawnEntity(potionEntity); break; @@ -84,11 +84,11 @@ public class TileMimic extends TileInventory implements ITickable { } } - if (this.getBlockMetadata() == BlockMimic.sentientMimicMeta && getWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(mimicedTile instanceof IInventory)) { + if (this.getBlockMetadata() == BlockMimic.sentientMimicMeta && getWorld().getDifficulty() != Difficulty.PEACEFUL && !(mimicedTile instanceof IInventory)) { AxisAlignedBB bb = new AxisAlignedBB(this.getPos()).expand(playerCheckRadius, playerCheckRadius, playerCheckRadius); - List playerList = getWorld().getEntitiesWithinAABB(EntityPlayer.class, bb); + List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, bb); - for (EntityPlayer player : playerList) { + for (PlayerEntity player : playerList) { if (!player.capabilities.isCreativeMode && Utils.canEntitySeeBlock(getWorld(), player, getPos())) { spawnMimicEntity(player); break; @@ -98,14 +98,14 @@ public class TileMimic extends TileInventory implements ITickable { } - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, ItemStack heldItem, Direction side) { if (!heldItem.isEmpty() && player.capabilities.isCreativeMode) { - List list = PotionUtils.getEffectsFromStack(heldItem); + List list = PotionUtils.getEffectsFromStack(heldItem); if (!list.isEmpty()) { if (!world.isRemote) { setInventorySlotContents(1, heldItem.copy()); world.notifyBlockUpdate(pos, state, state, 3); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionSet")); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSet")); } return true; } else if (heldItem.getItem() == RegistrarBloodMagicItems.POTION_FLASK) { @@ -113,7 +113,7 @@ public class TileMimic extends TileInventory implements ITickable { if (!world.isRemote) { setInventorySlotContents(1, ItemStack.EMPTY); world.notifyBlockUpdate(pos, state, state, 3); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionRemove")); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionRemove")); } return true; } @@ -138,8 +138,8 @@ public class TileMimic extends TileInventory implements ITickable { Utils.insertItemToTile(this, player, 0); ItemStack stack = getStackInSlot(0); if (stateOfReplacedBlock == Blocks.AIR.getDefaultState()) { - if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); + if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) { + Block block = ((BlockItem) stack.getItem()).getBlock(); stateOfReplacedBlock = block.getDefaultState(); } } @@ -153,16 +153,16 @@ public class TileMimic extends TileInventory implements ITickable { return true; } - public boolean performSpecialAbility(EntityPlayer player, EnumFacing sideHit) { + public boolean performSpecialAbility(PlayerEntity player, Direction sideHit) { switch (this.getBlockMetadata()) { case BlockMimic.sentientMimicMeta: if (player.capabilities.isCreativeMode) { if (player.isSneaking()) { playerCheckRadius = Math.max(playerCheckRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); } else { playerCheckRadius++; - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); } return false; @@ -180,30 +180,30 @@ public class TileMimic extends TileInventory implements ITickable { case WEST: if (player.isSneaking()) { potionSpawnRadius = Math.max(potionSpawnRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionSpawnRadius.down", potionSpawnRadius)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSpawnRadius.down", potionSpawnRadius)); } else { potionSpawnRadius++; - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionSpawnRadius.up", potionSpawnRadius)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSpawnRadius.up", potionSpawnRadius)); } break; case NORTH: //When the block is clicked on the NORTH or SOUTH side, detectRadius is edited. case SOUTH: if (player.isSneaking()) { playerCheckRadius = Math.max(playerCheckRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); } else { playerCheckRadius++; - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); } break; case UP: //When the block is clicked on the UP or DOWN side, potionSpawnInterval is edited. case DOWN: if (player.isSneaking()) { potionSpawnInterval = Math.max(potionSpawnInterval - 1, 1); - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionInterval.down", potionSpawnInterval)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionInterval.down", potionSpawnInterval)); } else { potionSpawnInterval++; - ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionInterval.up", potionSpawnInterval)); + ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionInterval.up", potionSpawnInterval)); } break; default: @@ -217,8 +217,8 @@ public class TileMimic extends TileInventory implements ITickable { return false; } - public boolean spawnMimicEntity(EntityPlayer target) { - if (this.getWorld().getDifficulty() == EnumDifficulty.PEACEFUL) { + public boolean spawnMimicEntity(PlayerEntity target) { + if (this.getWorld().getDifficulty() == Difficulty.PEACEFUL) { return false; } @@ -252,7 +252,7 @@ public class TileMimic extends TileInventory implements ITickable { } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); @@ -265,7 +265,7 @@ public class TileMimic extends TileInventory implements ITickable { } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); @@ -293,11 +293,11 @@ public class TileMimic extends TileInventory implements ITickable { } } - public IBlockState getReplacedState() { + public BlockState getReplacedState() { return stateOfReplacedBlock; } - public void setReplacedState(IBlockState state) { + public void setReplacedState(BlockState state) { stateOfReplacedBlock = state; } @@ -313,10 +313,10 @@ public class TileMimic extends TileInventory implements ITickable { replaceMimicWithBlockActual(world, pos, mimic.getStackInSlot(0), mimic.tileTag, mimic.stateOfReplacedBlock); } - public static boolean replaceMimicWithBlockActual(World world, BlockPos pos, ItemStack stack, NBTTagCompound tileTag, IBlockState replacementState) { - if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState state = replacementState; + public static boolean replaceMimicWithBlockActual(World world, BlockPos pos, ItemStack stack, CompoundNBT tileTag, BlockState replacementState) { + if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) { + Block block = ((BlockItem) stack.getItem()).getBlock(); + BlockState state = replacementState; if (world.setBlockState(pos, state, 3)) { TileEntity tile = world.getTileEntity(pos); if (tile != null) { @@ -334,10 +334,10 @@ public class TileMimic extends TileInventory implements ITickable { } @Nullable - public static TileEntity getTileFromStackWithTag(World world, BlockPos pos, ItemStack stack, @Nullable NBTTagCompound tag, IBlockState replacementState) { - if (!stack.isEmpty() && stack.getItem() instanceof ItemBlock) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); - IBlockState state = replacementState; + public static TileEntity getTileFromStackWithTag(World world, BlockPos pos, ItemStack stack, @Nullable CompoundNBT tag, BlockState replacementState) { + if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) { + Block block = ((BlockItem) stack.getItem()).getBlock(); + BlockState state = replacementState; if (block.hasTileEntity(state)) { TileEntity tile = block.createTileEntity(world, state); @@ -345,7 +345,7 @@ public class TileMimic extends TileInventory implements ITickable { return null; if (tag != null) { - NBTTagCompound copyTag = tag.copy(); + CompoundNBT copyTag = tag.copy(); copyTag.setInteger("x", pos.getX()); copyTag.setInteger("y", pos.getY()); copyTag.setInteger("z", pos.getZ()); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index fc9552ad..b9e2ad30 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -3,8 +3,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileTicking; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; public class TilePhantomBlock extends TileTicking { private int ticksRemaining = 10; @@ -17,12 +17,12 @@ public class TilePhantomBlock extends TileTicking { } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { this.ticksRemaining = tagCompound.getInteger(Constants.NBT.TICKS_REMAINING); } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); return tagCompound; } @@ -30,7 +30,7 @@ public class TilePhantomBlock extends TileTicking { @Override public void onUpdate() { if (!world.isRemote) { - EntityPlayer player = world.getClosestPlayer(getPos().getX(), getPos().getY(), getPos().getZ(), 10.0D, ItemSigilPhantomBridge.IS_PHANTOM_ACTIVE); + PlayerEntity player = world.getClosestPlayer(getPos().getX(), getPos().getY(), getPos().getZ(), 10.0D, ItemSigilPhantomBridge.IS_PHANTOM_ACTIVE); if (player != null && !player.isSneaking()) return; ticksRemaining--; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index fdcab9f4..e4a74df2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -3,14 +3,14 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.iface.IPurificationAsh; import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.util.helper.PurificationHelper; -import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; +import net.minecraft.world.ServerWorld; import java.util.List; @@ -39,14 +39,14 @@ public class TilePurificationAltar extends TileInventory implements ITickable { } AxisAlignedBB aabb = purityArea.getAABB(getPos()); - List animalList = getWorld().getEntitiesWithinAABB(EntityAnimal.class, aabb); + List animalList = getWorld().getEntitiesWithinAABB(AnimalEntity.class, aabb); if (animalList.isEmpty()) { return; } boolean hasPerformed = false; - for (EntityAnimal animal : animalList) { + for (AnimalEntity animal : animalList) { double added = PurificationHelper.addPurity(animal, Math.min(purityRate, totalPurity), maxPurity); if (added > 0) { totalPurity -= purityRate; @@ -55,15 +55,15 @@ public class TilePurificationAltar extends TileInventory implements ITickable { } if (hasPerformed) { - if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof WorldServer) { - WorldServer server = (WorldServer) getWorld(); + if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof ServerWorld) { + ServerWorld server = (ServerWorld) getWorld(); server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); } } } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); totalPurity = tag.getDouble("totalPurity"); maxPurity = tag.getDouble("maxPurity"); @@ -71,7 +71,7 @@ public class TilePurificationAltar extends TileInventory implements ITickable { } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setDouble("totalPurity", totalPurity); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 4e737ae9..1ceab097 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -10,7 +10,7 @@ import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ITickable; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.items.ItemHandlerHelper; @@ -34,14 +34,14 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); burnTime = tag.getInteger(Constants.NBT.SOUL_FORGE_BURN); } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setInteger(Constants.NBT.SOUL_FORGE_BURN, burnTime); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index d2d41e2d..54475123 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -5,8 +5,8 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.base.Strings; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.block.BlockState; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -21,14 +21,14 @@ public class TileSpectralBlock extends TileTicking { } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { ticksRemaining = tagCompound.getInteger(Constants.NBT.TICKS_REMAINING); containedBlockName = tagCompound.getString(Constants.NBT.CONTAINED_BLOCK_NAME); containedBlockMeta = tagCompound.getInteger(Constants.NBT.CONTAINED_BLOCK_META); } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); tagCompound.setString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); tagCompound.setInteger(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); @@ -48,7 +48,7 @@ public class TileSpectralBlock extends TileTicking { } } - private void setContainedBlockInfo(IBlockState blockState) { + private void setContainedBlockInfo(BlockState blockState) { containedBlockName = blockState.getBlock().getRegistryName().toString(); containedBlockMeta = blockState.getBlock().getMetaFromState(blockState); } @@ -75,7 +75,7 @@ public class TileSpectralBlock extends TileTicking { public static void createSpectralBlock(World world, BlockPos blockPos, int duration) { if (world.isAirBlock(blockPos)) return; - IBlockState cachedState = world.getBlockState(blockPos); + BlockState cachedState = world.getBlockState(blockPos); world.setBlockState(blockPos, RegistrarBloodMagicBlocks.SPECTRAL.getDefaultState()); TileSpectralBlock tile = (TileSpectralBlock) world.getTileEntity(blockPos); tile.setContainedBlockInfo(cachedState); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index b9d665e8..30009812 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -13,7 +13,7 @@ import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; @@ -35,13 +35,13 @@ public class TileTeleposer extends TileInventory implements ITickable { } @Override - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); previousInput = tagCompound.getInteger(Constants.NBT.PREVIOUS_INPUT); } @Override - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); tagCompound.setInteger(Constants.NBT.PREVIOUS_INPUT, previousInput); return tagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java index 18344853..8a05ad0e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile.base; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.block.BlockState; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,27 +17,27 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public class TileBase extends TileEntity { @Override - public final void readFromNBT(NBTTagCompound compound) { + public final void readFromNBT(CompoundNBT compound) { super.readFromNBT(compound); deserializeBase(compound); deserialize(compound); } @Override - public final NBTTagCompound writeToNBT(NBTTagCompound compound) { + public final CompoundNBT writeToNBT(CompoundNBT compound) { super.writeToNBT(compound); serializeBase(compound); return serialize(compound); } /** - * Called by {@link #readFromNBT(NBTTagCompound)} + * Called by {@link #readFromNBT(CompoundNBT)} *

    * Internal data (such as coordinates) are handled for you. Just read the data you need. * * @param tagCompound - The tag compound to read from */ - public void deserialize(NBTTagCompound tagCompound) { + public void deserialize(CompoundNBT tagCompound) { } @@ -47,19 +47,19 @@ public class TileBase extends TileEntity { * @param tagCompound - The tag compound to read from * @see TileTicking */ - void deserializeBase(NBTTagCompound tagCompound) { + void deserializeBase(CompoundNBT tagCompound) { } /** - * Called by {@link #writeToNBT(NBTTagCompound)} + * Called by {@link #writeToNBT(CompoundNBT)} *

    * Internal data (such as coordinates) are handled for you. Just read the data you need. * * @param tagCompound - The tag compound to write to. * @return the modified tag compound */ - public NBTTagCompound serialize(NBTTagCompound tagCompound) { + public CompoundNBT serialize(CompoundNBT tagCompound) { return tagCompound; } @@ -71,30 +71,30 @@ public class TileBase extends TileEntity { * @return the modified tag compound * @see TileTicking */ - NBTTagCompound serializeBase(NBTTagCompound tagCompound) { + CompoundNBT serializeBase(CompoundNBT tagCompound) { return tagCompound; } public void notifyUpdate() { - IBlockState state = getWorld().getBlockState(getPos()); + BlockState state = getWorld().getBlockState(getPos()); getWorld().notifyBlockUpdate(getPos(), state, state, 3); } // Data syncing @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, BlockState oldState, BlockState newState) { return oldState.getBlock() != newState.getBlock(); } @Override - public final SPacketUpdateTileEntity getUpdatePacket() { - return new SPacketUpdateTileEntity(getPos(), -999, writeToNBT(new NBTTagCompound())); + public final SUpdateTileEntityPacket getUpdatePacket() { + return new SUpdateTileEntityPacket(getPos(), -999, writeToNBT(new CompoundNBT())); } @Override @SideOnly(Side.CLIENT) - public final void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { + public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) { super.onDataPacket(net, pkt); readFromNBT(pkt.getNbtCompound()); onDataPacketClientReceived(); @@ -108,12 +108,12 @@ public class TileBase extends TileEntity { } @Override - public final NBTTagCompound getUpdateTag() { - return writeToNBT(new NBTTagCompound()); + public final CompoundNBT getUpdateTag() { + return writeToNBT(new CompoundNBT()); } @Override - public final void handleUpdateTag(NBTTagCompound tag) { + public final void handleUpdateTag(CompoundNBT tag) { readFromNBT(tag); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java index f0a532ad..33c18025 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.base; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ITickable; /** @@ -20,13 +20,13 @@ public abstract class TileTicking extends TileBase implements ITickable { } @Override - void deserializeBase(NBTTagCompound tagCompound) { + void deserializeBase(CompoundNBT tagCompound) { this.ticksExisted = tagCompound.getInteger("ticksExisted"); this.shouldTick = tagCompound.getBoolean("shouldTick"); } @Override - NBTTagCompound serializeBase(NBTTagCompound tagCompound) { + CompoundNBT serializeBase(CompoundNBT tagCompound) { tagCompound.setInteger("ticksExisted", getTicksExisted()); tagCompound.setBoolean("shouldTick", shouldTick()); return tagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java index 879a0ed3..5c3f2801 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java @@ -2,18 +2,18 @@ package WayofTime.bloodmagic.tile.container; import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.tile.TileAlchemyTable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; public class ContainerAlchemyTable extends Container { private final IInventory tileTable; - public ContainerAlchemyTable(InventoryPlayer inventoryPlayer, IInventory tileTable) { + public ContainerAlchemyTable(PlayerInventory inventoryPlayer, IInventory tileTable) { this.tileTable = tileTable; this.addSlotToContainer(new Slot(tileTable, 0, 62, 15)); this.addSlotToContainer(new Slot(tileTable, 1, 80, 51)); @@ -37,8 +37,8 @@ public class ContainerAlchemyTable extends Container { } @Override - public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { - InventoryPlayer inventoryPlayer = player.inventory; + public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, PlayerEntity player) { + PlayerInventory inventoryPlayer = player.inventory; if (slotId < 6 && slotId >= 0) { Slot slot = this.getSlot(slotId); @@ -51,7 +51,7 @@ public class ContainerAlchemyTable extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { + public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { ItemStack itemstack = ItemStack.EMPTY; Slot slot = this.inventorySlots.get(index); @@ -95,7 +95,7 @@ public class ContainerAlchemyTable extends Container { } @Override - public boolean canInteractWith(EntityPlayer playerIn) { + public boolean canInteractWith(PlayerEntity playerIn) { return this.tileTable.isUsableByPlayer(playerIn); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java index fa230b5a..d8441416 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java @@ -4,12 +4,12 @@ import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.item.routing.IRoutingFilterProvider; import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; import WayofTime.bloodmagic.util.GhostItemHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; @@ -21,7 +21,7 @@ public class ContainerItemRoutingNode extends Container { // private final ItemInventory itemInventory; private int slotsOccupied; - public ContainerItemRoutingNode(InventoryPlayer inventoryPlayer, IInventory tileItemRoutingNode) { + public ContainerItemRoutingNode(PlayerInventory inventoryPlayer, IInventory tileItemRoutingNode) { this.tileItemRoutingNode = tileItemRoutingNode; inventory = (TileFilteredRoutingNode) tileItemRoutingNode; @@ -55,8 +55,8 @@ public class ContainerItemRoutingNode extends Container { * Overridden in order to handle ghost item slots. */ @Override - public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { - InventoryPlayer inventoryPlayer = player.inventory; + public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, PlayerEntity player) { + PlayerInventory inventoryPlayer = player.inventory; // if (!player.worldObj.isRemote) { if (slotId >= 0) { @@ -111,7 +111,7 @@ public class ContainerItemRoutingNode extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { + public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { ItemStack itemstack = ItemStack.EMPTY; Slot slot = this.inventorySlots.get(index); @@ -154,7 +154,7 @@ public class ContainerItemRoutingNode extends Container { } @Override - public boolean canInteractWith(EntityPlayer playerIn) { + public boolean canInteractWith(PlayerEntity playerIn) { return this.tileItemRoutingNode.isUsableByPlayer(playerIn); } @@ -218,7 +218,7 @@ public class ContainerItemRoutingNode extends Container { } @Override - public boolean canTakeStack(EntityPlayer playerIn) { + public boolean canTakeStack(PlayerEntity playerIn) { return false; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java index a9959c27..806f657e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java @@ -1,20 +1,20 @@ package WayofTime.bloodmagic.tile.container; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; import net.minecraft.inventory.IInventory; public class ContainerMasterRoutingNode extends Container { private final IInventory tileMasterRoutingNode; - public ContainerMasterRoutingNode(InventoryPlayer inventoryPlayer, IInventory tileMasterRoutingNode) { + public ContainerMasterRoutingNode(PlayerInventory inventoryPlayer, IInventory tileMasterRoutingNode) { this.tileMasterRoutingNode = tileMasterRoutingNode; } @Override - public boolean canInteractWith(EntityPlayer playerIn) { + public boolean canInteractWith(PlayerEntity playerIn) { return this.tileMasterRoutingNode.isUsableByPlayer(playerIn); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index a86e82d4..457cb101 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -3,17 +3,17 @@ package WayofTime.bloodmagic.tile.container; import WayofTime.bloodmagic.soul.IDemonWill; import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.tile.TileSoulForge; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; public class ContainerSoulForge extends Container { private final IInventory tileForge; - public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileForge) { + public ContainerSoulForge(PlayerInventory inventoryPlayer, IInventory tileForge) { this.tileForge = tileForge; this.addSlotToContainer(new Slot(tileForge, 0, 8, 15)); this.addSlotToContainer(new Slot(tileForge, 1, 80, 15)); @@ -34,7 +34,7 @@ public class ContainerSoulForge extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { + public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { ItemStack itemstack = ItemStack.EMPTY; Slot slot = this.inventorySlots.get(index); @@ -77,7 +77,7 @@ public class ContainerSoulForge extends Container { } @Override - public boolean canInteractWith(EntityPlayer playerIn) { + public boolean canInteractWith(PlayerEntity playerIn) { return this.tileForge.isUsableByPlayer(playerIn); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java index 82588b45..7852a260 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.tile.container; import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; public class ContainerTeleposer extends Container { private final IInventory tileTeleposer; - public ContainerTeleposer(InventoryPlayer inventoryPlayer, IInventory tileTeleposer) { + public ContainerTeleposer(PlayerInventory inventoryPlayer, IInventory tileTeleposer) { this.tileTeleposer = tileTeleposer; this.addSlotToContainer(new SlotTeleposer(tileTeleposer, 0, 80, 33)); @@ -27,7 +27,7 @@ public class ContainerTeleposer extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slot) { + public ItemStack transferStackInSlot(PlayerEntity player, int slot) { ItemStack stack = ItemStack.EMPTY; Slot slotObject = inventorySlots.get(slot); int slots = inventorySlots.size(); @@ -63,7 +63,7 @@ public class ContainerTeleposer extends Container { } @Override - public boolean canInteractWith(EntityPlayer playerIn) { + public boolean canInteractWith(PlayerEntity playerIn) { return this.tileTeleposer.isUsableByPlayer(playerIn); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 7fb17330..ccadc1e4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -3,12 +3,12 @@ package WayofTime.bloodmagic.tile.routing; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.util.GhostItemHelper; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumFacing; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedInventory { @@ -21,7 +21,7 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn super(size, name); } - public ItemStack getFilterStack(EnumFacing side) { + public ItemStack getFilterStack(Direction side) { int index = side.getIndex(); return getStackInSlot(index); @@ -37,12 +37,12 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn } @Override - public boolean isInventoryConnectedToSide(EnumFacing side) { + public boolean isInventoryConnectedToSide(Direction side) { return true; } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); currentActiveSlot = tag.getInteger("currentSlot"); priorities = tag.getIntArray(Constants.NBT.ROUTING_PRIORITY); @@ -51,11 +51,11 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn } if (!tag.getBoolean("updated")) { - NBTTagList tags = tag.getTagList("Items", 10); + ListNBT tags = tag.getTagList("Items", 10); inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - NBTTagCompound data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompoundTagAt(i); byte j = data.getByte("Slot"); if (j == 0) { @@ -71,7 +71,7 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); tag.setInteger("currentSlot", currentActiveSlot); tag.setIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); @@ -86,34 +86,34 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn } @Override - public int[] getSlotsForFace(EnumFacing side) { + public int[] getSlotsForFace(Direction side) { return new int[0]; } @Override - public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) { + public boolean canInsertItem(int index, ItemStack itemStackIn, Direction direction) { return false; } @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { + public boolean canExtractItem(int index, ItemStack stack, Direction direction) { return false; } @Override - public int getPriority(EnumFacing side) { + public int getPriority(Direction side) { return priorities[side.getIndex()]; } public void incrementCurrentPriotiryToMaximum(int max) { priorities[currentActiveSlot] = Math.min(priorities[currentActiveSlot] + 1, max); - IBlockState state = getWorld().getBlockState(pos); + BlockState state = getWorld().getBlockState(pos); getWorld().notifyBlockUpdate(pos, state, state, 3); } public void decrementCurrentPriority() { priorities[currentActiveSlot] = Math.max(priorities[currentActiveSlot] - 1, 0); - IBlockState state = getWorld().getBlockState(pos); + BlockState state = getWorld().getBlockState(pos); getWorld().notifyBlockUpdate(pos, state, state, 3); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java index d758f2b5..bdc0c21c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; @@ -17,12 +17,12 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn } @Override - public boolean isInput(EnumFacing side) { + public boolean isInput(Direction side) { return true; } @Override - public IItemFilter getInputFilterForSide(EnumFacing side) { + public IItemFilter getInputFilterForSide(Direction side) { TileEntity tile = getWorld().getTileEntity(pos.offset(side)); if (tile != null) { IItemHandler handler = Utils.getInventory(tile, side.getOpposite()); @@ -46,12 +46,12 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn } @Override - public boolean isFluidInput(EnumFacing side) { + public boolean isFluidInput(Direction side) { return true; } @Override - public IFluidFilter getInputFluidFilterForSide(EnumFacing side) { + public IFluidFilter getInputFluidFilterForSide(Direction side) { TileEntity tile = getWorld().getTileEntity(pos.offset(side)); if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); @@ -67,7 +67,7 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn } @Override - public boolean isTankConnectedToSide(EnumFacing side) { + public boolean isTankConnectedToSide(Direction side) { return true; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index afbb3410..a0457aee 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -5,10 +5,10 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.tile.TileInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -52,7 +52,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (outputTile instanceof IOutputItemRoutingNode) { IOutputItemRoutingNode outputNode = (IOutputItemRoutingNode) outputTile; - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { if (!outputNode.isInventoryConnectedToSide(facing) || !outputNode.isOutput(facing)) { continue; } @@ -74,7 +74,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (outputTile instanceof IOutputFluidRoutingNode) { IOutputFluidRoutingNode outputNode = (IOutputFluidRoutingNode) outputTile; - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { if (!outputNode.isTankConnectedToSide(facing) || !outputNode.isFluidOutput(facing)) { continue; } @@ -104,7 +104,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (inputTile instanceof IInputItemRoutingNode) { IInputItemRoutingNode inputNode = (IInputItemRoutingNode) inputTile; - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { if (!inputNode.isInventoryConnectedToSide(facing) || !inputNode.isInput(facing)) { continue; } @@ -126,7 +126,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti if (inputTile instanceof IInputFluidRoutingNode) { IInputFluidRoutingNode inputNode = (IInputFluidRoutingNode) inputTile; - for (EnumFacing facing : EnumFacing.VALUES) { + for (Direction facing : Direction.VALUES) { if (!inputNode.isTankConnectedToSide(facing) || !inputNode.isFluidInput(facing)) { continue; } @@ -186,11 +186,11 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - NBTTagList tags = new NBTTagList(); + ListNBT tags = new ListNBT(); for (BlockPos pos : generalNodeList) { - NBTTagCompound posTag = new NBTTagCompound(); + CompoundNBT posTag = new CompoundNBT(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); @@ -198,9 +198,9 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } tag.setTag(Constants.NBT.ROUTING_MASTER_GENERAL, tags); - tags = new NBTTagList(); + tags = new ListNBT(); for (BlockPos pos : inputNodeList) { - NBTTagCompound posTag = new NBTTagCompound(); + CompoundNBT posTag = new CompoundNBT(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); @@ -208,9 +208,9 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } tag.setTag(Constants.NBT.ROUTING_MASTER_INPUT, tags); - tags = new NBTTagList(); + tags = new ListNBT(); for (BlockPos pos : outputNodeList) { - NBTTagCompound posTag = new NBTTagCompound(); + CompoundNBT posTag = new CompoundNBT(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); @@ -221,26 +221,26 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); - NBTTagList tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); + ListNBT tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); for (int i = 0; i < tags.tagCount(); i++) { - NBTTagCompound blockTag = tags.getCompoundTagAt(i); + CompoundNBT blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); generalNodeList.add(newPos); } tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_INPUT, 10); for (int i = 0; i < tags.tagCount(); i++) { - NBTTagCompound blockTag = tags.getCompoundTagAt(i); + CompoundNBT blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); inputNodeList.add(newPos); } tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); for (int i = 0; i < tags.tagCount(); i++) { - NBTTagCompound blockTag = tags.getCompoundTagAt(i); + CompoundNBT blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); outputNodeList.add(newPos); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java index 9c57f30c..e52757bd 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java @@ -6,7 +6,7 @@ import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; @@ -17,12 +17,12 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO } @Override - public boolean isOutput(EnumFacing side) { + public boolean isOutput(Direction side) { return true; } @Override - public IItemFilter getOutputFilterForSide(EnumFacing side) { + public IItemFilter getOutputFilterForSide(Direction side) { TileEntity tile = getWorld().getTileEntity(pos.offset(side)); if (tile != null) { IItemHandler handler = Utils.getInventory(tile, side.getOpposite()); @@ -46,12 +46,12 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO } @Override - public boolean isFluidOutput(EnumFacing side) { + public boolean isFluidOutput(Direction side) { return true; } @Override - public IFluidFilter getOutputFluidFilterForSide(EnumFacing side) { + public IFluidFilter getOutputFluidFilterForSide(Direction side) { TileEntity tile = getWorld().getTileEntity(pos.offset(side)); if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); @@ -67,7 +67,7 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO } @Override - public boolean isTankConnectedToSide(EnumFacing side) { + public boolean isTankConnectedToSide(Direction side) { return true; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index 0062ce60..fb402861 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -5,10 +5,10 @@ import WayofTime.bloodmagic.routing.IItemRoutingNode; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; import WayofTime.bloodmagic.tile.TileInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -36,17 +36,17 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte } @Override - public NBTTagCompound serialize(NBTTagCompound tag) { + public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - NBTTagCompound masterTag = new NBTTagCompound(); + CompoundNBT masterTag = new CompoundNBT(); masterTag.setInteger(Constants.NBT.X_COORD, masterPos.getX()); masterTag.setInteger(Constants.NBT.Y_COORD, masterPos.getY()); masterTag.setInteger(Constants.NBT.Z_COORD, masterPos.getZ()); tag.setTag(Constants.NBT.ROUTING_MASTER, masterTag); - NBTTagList tags = new NBTTagList(); + ListNBT tags = new ListNBT(); for (BlockPos pos : connectionList) { - NBTTagCompound posTag = new NBTTagCompound(); + CompoundNBT posTag = new CompoundNBT(); posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); @@ -57,15 +57,15 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte } @Override - public void deserialize(NBTTagCompound tag) { + public void deserialize(CompoundNBT tag) { super.deserialize(tag); connectionList.clear(); - NBTTagCompound masterTag = tag.getCompoundTag(Constants.NBT.ROUTING_MASTER); + CompoundNBT masterTag = tag.getCompoundTag(Constants.NBT.ROUTING_MASTER); masterPos = new BlockPos(masterTag.getInteger(Constants.NBT.X_COORD), masterTag.getInteger(Constants.NBT.Y_COORD), masterTag.getInteger(Constants.NBT.Z_COORD)); - NBTTagList tags = tag.getTagList(Constants.NBT.ROUTING_CONNECTION, 10); + ListNBT tags = tag.getTagList(Constants.NBT.ROUTING_CONNECTION, 10); for (int i = 0; i < tags.tagCount(); i++) { - NBTTagCompound blockTag = tags.getCompoundTagAt(i); + CompoundNBT blockTag = tags.getCompoundTagAt(i); BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); connectionList.add(newPos); } @@ -159,12 +159,12 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte } @Override - public boolean isInventoryConnectedToSide(EnumFacing side) { + public boolean isInventoryConnectedToSide(Direction side) { return false; } @Override - public int getPriority(EnumFacing side) { + public int getPriority(Direction side) { return 0; } diff --git a/src/main/java/WayofTime/bloodmagic/util/BlockStack.java b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java index 85428c4d..426b43fd 100644 --- a/src/main/java/WayofTime/bloodmagic/util/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -10,7 +10,7 @@ import net.minecraft.world.World; public class BlockStack { private final Block block; private final int meta; - private final IBlockState state; + private final BlockState state; public BlockStack(Block block, int meta) { this.block = block; @@ -34,7 +34,7 @@ public class BlockStack { return meta; } - public IBlockState getState() { + public BlockState getState() { return state; } @@ -62,7 +62,7 @@ public class BlockStack { } public static BlockStack getStackFromPos(World world, BlockPos pos) { - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); return new BlockStack(state.getBlock(), state.getBlock().getMetaFromState(state)); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index b82710f9..68428f47 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -4,12 +4,12 @@ import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.util.helper.TextHelper; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiNewChat; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.client.gui.NewChatGui; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -20,7 +20,7 @@ public class ChatUtil { private static int lastAdded; private static void sendNoSpamMessages(ITextComponent[] messages) { - GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI(); + NewChatGui chat = Minecraft.getMinecraft().ingameGUI.getChatGUI(); for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) { chat.deleteChatLine(i); } @@ -31,14 +31,14 @@ public class ChatUtil { } /** - * Returns a standard {@link TextComponentString} for the given + * Returns a standard {@link StringTextComponent} for the given * {@link String} . * * @param s The string to wrap. * @return An {@link ITextComponent} containing the string. */ public static ITextComponent wrap(String s) { - return new TextComponentString(s); + return new StringTextComponent(s); } /** @@ -60,7 +60,7 @@ public class ChatUtil { * @param args The args to apply to the format */ public static ITextComponent wrapFormatted(String s, Object... args) { - return new TextComponentTranslation(s, args); + return new TranslationTextComponent(s, args); } /** @@ -69,16 +69,16 @@ public class ChatUtil { * @param player The player to send the chat to * @param lines The lines to send */ - public static void sendChat(EntityPlayer player, String... lines) { + public static void sendChat(PlayerEntity player, String... lines) { sendChat(player, wrap(lines)); } /** * Localizes the lines before sending them. * - * @see #sendChat(EntityPlayer, String...) + * @see #sendChat(PlayerEntity, String...) */ - public static void sendChatUnloc(EntityPlayer player, String... unlocLines) { + public static void sendChatUnloc(PlayerEntity player, String... unlocLines) { sendChat(player, TextHelper.localizeAll(unlocLines)); } @@ -88,7 +88,7 @@ public class ChatUtil { * @param player The player to send the chat lines to. * @param lines The {@link ITextComponent chat components} to send.yes */ - public static void sendChat(EntityPlayer player, ITextComponent... lines) { + public static void sendChat(PlayerEntity player, ITextComponent... lines) { for (ITextComponent c : lines) { player.sendMessage(c); } @@ -117,7 +117,7 @@ public class ChatUtil { /** * Skips the packet sending, unsafe to call on servers. * - * @see #sendNoSpam(EntityPlayerMP, ITextComponent...) + * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) */ public static void sendNoSpamClient(ITextComponent... lines) { sendNoSpamMessages(lines); @@ -126,46 +126,46 @@ public class ChatUtil { /** * Localizes the strings before sending them. * - * @see #sendNoSpam(EntityPlayer, String...) + * @see #sendNoSpam(PlayerEntity, String...) */ - public static void sendNoSpamUnloc(EntityPlayer player, String... unlocLines) { + public static void sendNoSpamUnloc(PlayerEntity player, String... unlocLines) { sendNoSpam(player, TextHelper.localizeAll(unlocLines)); } /** * @see #wrap(String) - * @see #sendNoSpam(EntityPlayer, ITextComponent...) + * @see #sendNoSpam(PlayerEntity, ITextComponent...) */ - public static void sendNoSpam(EntityPlayer player, String... lines) { + public static void sendNoSpam(PlayerEntity player, String... lines) { sendNoSpam(player, wrap(lines)); } /** - * First checks if the player is instanceof {@link EntityPlayerMP} before + * First checks if the player is instanceof {@link ServerPlayerEntity} before * casting. * - * @see #sendNoSpam(EntityPlayerMP, ITextComponent...) + * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) */ - public static void sendNoSpam(EntityPlayer player, ITextComponent... lines) { - if (player instanceof EntityPlayerMP) { - sendNoSpam((EntityPlayerMP) player, lines); + public static void sendNoSpam(PlayerEntity player, ITextComponent... lines) { + if (player instanceof ServerPlayerEntity) { + sendNoSpam((ServerPlayerEntity) player, lines); } } /** * Localizes the strings before sending them. * - * @see #sendNoSpam(EntityPlayerMP, String...) + * @see #sendNoSpam(ServerPlayerEntity, String...) */ - public static void sendNoSpamUnloc(EntityPlayerMP player, String... unlocLines) { + public static void sendNoSpamUnloc(ServerPlayerEntity player, String... unlocLines) { sendNoSpam(player, TextHelper.localizeAll(unlocLines)); } /** * @see #wrap(String) - * @see #sendNoSpam(EntityPlayerMP, ITextComponent...) + * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) */ - public static void sendNoSpam(EntityPlayerMP player, String... lines) { + public static void sendNoSpam(ServerPlayerEntity player, String... lines) { sendNoSpam(player, wrap(lines)); } @@ -178,7 +178,7 @@ public class ChatUtil { * @param player The player to send the chat message to * @param lines The chat lines to send. */ - public static void sendNoSpam(EntityPlayerMP player, ITextComponent... lines) { + public static void sendNoSpam(ServerPlayerEntity player, ITextComponent... lines) { if (lines.length > 0) BloodMagicPacketHandler.INSTANCE.sendTo(new PacketNoSpamChat(lines), player); } diff --git a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java index 28a29658..3025075b 100644 --- a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.LivingEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; public class DamageSourceBloodMagic extends DamageSource { @@ -18,7 +18,7 @@ public class DamageSourceBloodMagic extends DamageSource { } @Override - public ITextComponent getDeathMessage(EntityLivingBase livingBase) { - return new TextComponentString(TextHelper.localizeEffect("chat.bloodmagic.damageSource", livingBase.getName())); + public ITextComponent getDeathMessage(LivingEntity livingBase) { + return new StringTextComponent(TextHelper.localizeEffect("chat.bloodmagic.damageSource", livingBase.getName())); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 54a2e614..cb1ef51b 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -2,19 +2,19 @@ package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.util.helper.NBTHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class GhostItemHelper { public static void setItemGhostAmount(ItemStack stack, int amount) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setInteger(Constants.NBT.GHOST_STACK_SIZE, amount); } public static int getItemGhostAmount(ItemStack stack) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getInteger(Constants.NBT.GHOST_STACK_SIZE); } @@ -24,7 +24,7 @@ public class GhostItemHelper { return false; } - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.hasKey(Constants.NBT.GHOST_STACK_SIZE); } @@ -43,7 +43,7 @@ public class GhostItemHelper { public static ItemStack getStackFromGhost(ItemStack ghostStack) { ItemStack newStack = ghostStack.copy(); NBTHelper.checkNBT(newStack); - NBTTagCompound tag = newStack.getTagCompound(); + CompoundNBT tag = newStack.getTagCompound(); int amount = getItemGhostAmount(ghostStack); tag.removeTag(Constants.NBT.GHOST_STACK_SIZE); if (tag.isEmpty()) { diff --git a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java index 70b19397..771492c2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.util; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import javax.annotation.Nullable; import java.util.ArrayList; @@ -14,7 +14,7 @@ public class ItemStackWrapper { public final Item item; public final int stackSize; public final int meta; - public NBTTagCompound nbtTag; + public CompoundNBT nbtTag; public ItemStackWrapper(Item item, int stackSize, int meta) { this.item = item; @@ -77,11 +77,11 @@ public class ItemStackWrapper { return meta; } - public NBTTagCompound getNbtTag() { + public CompoundNBT getNbtTag() { return nbtTag; } - public void setNbtTag(NBTTagCompound nbtTag) { + public void setNbtTag(CompoundNBT nbtTag) { this.nbtTag = nbtTag; } diff --git a/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java b/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java index 51319174..fb2342a5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.item.sigil.ItemSigilFluidBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.FluidStack; @@ -36,12 +36,12 @@ public class SigilFluidWrapper implements ICapabilityProvider { } @Override - public boolean hasCapability(Capability capability, EnumFacing from) { + public boolean hasCapability(Capability capability, Direction from) { return capability == CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY; } @Override - public T getCapability(Capability capability, final EnumFacing from) { + public T getCapability(Capability capability, final Direction from) { if (!hasCapability(capability, from)) { return null; } diff --git a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java index 5c3d35b9..ba653735 100644 --- a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.util; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; public class StateUtil { - public static IBlockState parseState(String state) { + public static BlockState parseState(String state) { if (state.contains("[")) { String[] split = state.split("\\["); split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state @@ -19,7 +19,7 @@ public class StateUtil { return block.getDefaultState(); BlockStateContainer blockState = block.getBlockState(); - IBlockState returnState = blockState.getBaseState(); + BlockState returnState = blockState.getBaseState(); // Force our values into the state String[] stateValues = split[1].split(","); // Splits up each value diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 26a42fa4..c78454d9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -10,30 +10,28 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import net.minecraft.block.Block; -import net.minecraft.block.BlockPortal; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.NetherPortalBlock; +import net.minecraft.block.BlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.*; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.util.*; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.DyeColor; +import net.minecraft.item.ArmorItem; +import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.Direction; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; @@ -54,13 +52,13 @@ import java.util.*; public class Utils { - public static final EnumMap DYE_COLOR_VALUES = Maps.newEnumMap(EnumDyeColor.class); + public static final EnumMap DYE_COLOR_VALUES = Maps.newEnumMap(DyeColor.class); static { try { - Field colorValue = ObfuscationReflectionHelper.findField(EnumDyeColor.class, "field_193351_w"); + Field colorValue = ObfuscationReflectionHelper.findField(DyeColor.class, "field_193351_w"); colorValue.setAccessible(true); - for (EnumDyeColor color : EnumDyeColor.values()) { + for (DyeColor color : DyeColor.values()) { DYE_COLOR_VALUES.put(color, (int) colorValue.get(color)); } } catch (IllegalAccessException e) { @@ -68,7 +66,7 @@ public class Utils { } } - public static float addAbsorptionToMaximum(EntityLivingBase entity, float added, int maximum, int duration) { + public static float addAbsorptionToMaximum(LivingEntity entity, float added, int maximum, int duration) { float currentAmount = entity.getAbsorptionAmount(); added = Math.min(maximum - currentAmount, added); @@ -78,7 +76,7 @@ public class Utils { if (duration > 0) { int potionLevel = (int) ((currentAmount + added) / 4); - entity.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, duration, potionLevel, true, false)); + entity.addPotionEffect(new EffectInstance(Effects.ABSORPTION, duration, potionLevel, true, false)); } entity.setAbsorptionAmount(currentAmount + added); @@ -86,21 +84,21 @@ public class Utils { return added; } - public static boolean isImmuneToFireDamage(EntityLivingBase entity) { - return entity.isImmuneToFire() || entity.isPotionActive(MobEffects.FIRE_RESISTANCE); + public static boolean isImmuneToFireDamage(LivingEntity entity) { + return entity.isImmuneToFire() || entity.isPotionActive(Effects.FIRE_RESISTANCE); } - public static boolean isPlayerBesideSolidBlockFace(EntityPlayer player) { + public static boolean isPlayerBesideSolidBlockFace(PlayerEntity player) { World world = player.getEntityWorld(); double minimumDistanceFromAxis = 0.7; BlockPos centralPos = player.getPosition(); - for (EnumFacing facing : EnumFacing.HORIZONTALS) { + for (Direction facing : Direction.HORIZONTALS) { BlockPos offsetPos = centralPos.offset(facing); double distance = Math.min(offsetPos.getX() + 0.5 - player.posX, offsetPos.getZ() + 0.5 - player.posZ); if (distance > minimumDistanceFromAxis) { continue; } - IBlockState state = world.getBlockState(offsetPos); + BlockState state = world.getBlockState(offsetPos); if (state.isSideSolid(world, offsetPos, facing.getOpposite())) { return true; } @@ -109,7 +107,7 @@ public class Utils { return false; } - public static boolean canPlayerSeeDemonWill(EntityPlayer player) { + public static boolean canPlayerSeeDemonWill(PlayerEntity player) { IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); for (int i = 0; i < inventory.getSlots(); i++) { @@ -128,16 +126,16 @@ public class Utils { public static boolean canEntitySeeBlock(World world, Entity entity, BlockPos pos) { Vec3d relativePosition = new Vec3d(entity.posX - pos.getX() - 0.5, entity.posY + (double) entity.getEyeHeight() - pos.getY() - 0.5, entity.posZ - pos.getZ() - 0.5); - EnumFacing dir = EnumFacing.getFacingFromVector((float) relativePosition.x, (float) relativePosition.y, (float) relativePosition.z); + Direction dir = Direction.getFacingFromVector((float) relativePosition.x, (float) relativePosition.y, (float) relativePosition.z); RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getXOffset() * 0.4, pos.getY() + 0.5 + dir.getYOffset() * 0.4, pos.getZ() + 0.5 + dir.getZOffset() * 0.4), false, true, true); return result == null || pos.equals(result.getBlockPos()); } public static int plantSeedsInArea(World world, AxisAlignedBB aabb, int horizontalRadius, int verticalRadius) { int placedBlocks = 0; - List itemEntities = world.getEntitiesWithinAABB(EntityItem.class, aabb); + List itemEntities = world.getEntitiesWithinAABB(ItemEntity.class, aabb); - for (EntityItem itemEntity : itemEntities) { + for (ItemEntity itemEntity : itemEntities) { placedBlocks += plantEntityItem(itemEntity, horizontalRadius, verticalRadius); } @@ -167,10 +165,10 @@ public class Utils { BlockPos newPos = centralPos.add(i, j, k); if (world.isAirBlock(newPos)) { - BlockPos offsetPos = newPos.offset(EnumFacing.DOWN); - IBlockState state = world.getBlockState(offsetPos); - if (state.getBlock().canSustainPlant(state, world, offsetPos, EnumFacing.UP, (IPlantable) item)) { - IBlockState plantState = ((IPlantable) item).getPlant(world, newPos); + BlockPos offsetPos = newPos.offset(Direction.DOWN); + BlockState state = world.getBlockState(offsetPos); + if (state.getBlock().canSustainPlant(state, world, offsetPos, Direction.UP, (IPlantable) item)) { + BlockState plantState = ((IPlantable) item).getPlant(world, newPos); world.setBlockState(newPos, plantState, 3); world.playEvent(2001, newPos, Block.getIdFromBlock(plantState.getBlock()) + (plantState.getBlock().getMetaFromState(plantState) << 12)); stack.shrink(1); @@ -189,7 +187,7 @@ public class Utils { return planted; } - public static int plantEntityItem(EntityItem itemEntity, int horizontalRadius, int verticalRadius) { + public static int plantEntityItem(ItemEntity itemEntity, int horizontalRadius, int verticalRadius) { if (itemEntity == null || itemEntity.isDead) { return 0; } @@ -207,7 +205,7 @@ public class Utils { return planted; } - public static int getDemonWillResolution(EntityPlayer player) { + public static int getDemonWillResolution(PlayerEntity player) { IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); for (int i = 0; i < inventory.getSlots(); i++) { @@ -224,22 +222,22 @@ public class Utils { return 1; } - public static NBTTagCompound getPersistentDataTag(EntityPlayer player) { - NBTTagCompound forgeData = player.getEntityData().getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); - NBTTagCompound beaconData = forgeData.getCompoundTag("BloodMagic"); + public static CompoundNBT getPersistentDataTag(PlayerEntity player) { + CompoundNBT forgeData = player.getEntityData().getCompoundTag(PlayerEntity.PERSISTED_NBT_TAG); + CompoundNBT beaconData = forgeData.getCompoundTag("BloodMagic"); //Creates/sets the tags if they don't exist if (!forgeData.hasKey("BloodMagic")) forgeData.setTag("BloodMagic", beaconData); - if (!player.getEntityData().hasKey(EntityPlayer.PERSISTED_NBT_TAG)) - player.getEntityData().setTag(EntityPlayer.PERSISTED_NBT_TAG, forgeData); + if (!player.getEntityData().hasKey(PlayerEntity.PERSISTED_NBT_TAG)) + player.getEntityData().setTag(PlayerEntity.PERSISTED_NBT_TAG, forgeData); return beaconData; } - public static void setPlayerSpeedFromServer(EntityPlayer player, double motionX, double motionY, double motionZ) { - if (!player.getEntityWorld().isRemote && player instanceof EntityPlayerMP) { - BloodMagicPacketHandler.sendTo(new PlayerVelocityPacketProcessor(motionX, motionY, motionZ), (EntityPlayerMP) player); + public static void setPlayerSpeedFromServer(PlayerEntity player, double motionX, double motionY, double motionZ) { + if (!player.getEntityWorld().isRemote && player instanceof ServerPlayerEntity) { + BloodMagicPacketHandler.sendTo(new PlayerVelocityPacketProcessor(motionX, motionY, motionZ), (ServerPlayerEntity) player); } } @@ -266,9 +264,9 @@ public class Utils { * @param player - The player to take the item from. * @return {@code true} if the ItemStack is inserted, {@code false} * otherwise - * @see #insertItemToTile(TileInventory, EntityPlayer, int) + * @see #insertItemToTile(TileInventory, PlayerEntity, int) */ - public static boolean insertItemToTile(TileInventory tile, EntityPlayer player) { + public static boolean insertItemToTile(TileInventory tile, PlayerEntity player) { return insertItemToTile(tile, player, 0); } @@ -284,7 +282,7 @@ public class Utils { * @return {@code true} if the ItemStack is inserted, {@code false} * otherwise */ - public static boolean insertItemToTile(TileInventory tile, EntityPlayer player, int slot) { + public static boolean insertItemToTile(TileInventory tile, PlayerEntity player, int slot) { ItemStack slotStack = tile.getStackInSlot(slot); if (slotStack.isEmpty() && !player.getHeldItemMainhand().isEmpty()) { ItemStack input = player.getHeldItemMainhand().copy(); @@ -311,9 +309,9 @@ public class Utils { } @Nullable - public static IItemHandler getInventory(TileEntity tile, @Nullable EnumFacing facing) { + public static IItemHandler getInventory(TileEntity tile, @Nullable Direction facing) { if (facing == null) - facing = EnumFacing.DOWN; + facing = Direction.DOWN; IItemHandler itemHandler = null; @@ -358,7 +356,7 @@ public class Utils { } } - public static float getModifiedDamage(EntityLivingBase attackedEntity, DamageSource source, float amount) { + public static float getModifiedDamage(LivingEntity attackedEntity, DamageSource source, float amount) { if (!attackedEntity.isEntityInvulnerable(source)) { if (amount <= 0) return 0; @@ -374,7 +372,7 @@ public class Utils { return 0; } - public static float applyArmor(EntityLivingBase entity, ItemStack[] inventory, DamageSource source, double damage) { + public static float applyArmor(LivingEntity entity, ItemStack[] inventory, DamageSource source, double damage) { damage *= 25; ArrayList dmgVals = new ArrayList<>(); for (int x = 0; x < inventory.length; x++) { @@ -386,8 +384,8 @@ public class Utils { if (stack.getItem() instanceof ISpecialArmor) { ISpecialArmor armor = (ISpecialArmor) stack.getItem(); prop = armor.getProperties(entity, stack, source, damage / 25D, x).copy(); - } else if (stack.getItem() instanceof ItemArmor && !source.isUnblockable()) { - ItemArmor armor = (ItemArmor) stack.getItem(); + } else if (stack.getItem() instanceof ArmorItem && !source.isUnblockable()) { + ArmorItem armor = (ArmorItem) stack.getItem(); prop = new ArmorProperties(0, armor.damageReduceAmount / 25D, Integer.MAX_VALUE); } if (prop != null) { @@ -414,8 +412,8 @@ public class Utils { return (float) (damage / 25.0F); } - public static float applyPotionDamageCalculations(EntityLivingBase attackedEntity, DamageSource source, float damage) { - Potion resistance = MobEffects.RESISTANCE; + public static float applyPotionDamageCalculations(LivingEntity attackedEntity, DamageSource source, float damage) { + Effect resistance = Effects.RESISTANCE; if (source.isDamageAbsolute()) { return damage; @@ -513,7 +511,7 @@ public class Utils { return returned; } - public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, EnumFacing dir) { + public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, Direction dir) { if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir)) { IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); @@ -525,7 +523,7 @@ public class Utils { return stack; } - public static int getNumberOfFreeSlots(TileEntity tile, EnumFacing dir) { + public static int getNumberOfFreeSlots(TileEntity tile, Direction dir) { int slots = 0; if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir)) { @@ -572,7 +570,7 @@ public class Utils { * @param limit * @return */ - public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, EnumFacing dir, int limit) { + public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, Direction dir, int limit) { if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir)) { IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); int numberOfSlots = handler.getSlots(); @@ -622,7 +620,7 @@ public class Utils { return stack; } - public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, EnumFacing dir) { + public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, Direction dir) { if (stack.isEmpty()) { return ItemStack.EMPTY; } @@ -657,11 +655,11 @@ public class Utils { return stack; } - public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, EnumFacing dir) { + public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, Direction dir) { return canInsertStackFullyIntoInventory(stack, inventory, dir, false, 0); } - public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, EnumFacing dir, boolean fillToLimit, int limit) { + public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, Direction dir, boolean fillToLimit, int limit) { if (stack.isEmpty()) { return true; } @@ -734,7 +732,7 @@ public class Utils { * @param limit * @return */ - public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, EnumFacing dir, int limit) { + public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, Direction dir, int limit) { if (stack.isEmpty()) { return ItemStack.EMPTY; } @@ -793,17 +791,17 @@ public class Utils { return stack; } - public static boolean isBlockLiquid(IBlockState state) { + public static boolean isBlockLiquid(BlockState state) { return (state instanceof IFluidBlock || state.getMaterial().isLiquid()); } - public static boolean isFlowingLiquid(IBlockState state) { + public static boolean isFlowingLiquid(BlockState state) { Block block = state.getBlock(); return isBlockLiquid(state) && !(state == block.getDefaultState()); } - public static boolean spawnStackAtBlock(World world, BlockPos pos, @Nullable EnumFacing pushDirection, ItemStack stack) { - EntityItem entityItem = new EntityItem(world); + public static boolean spawnStackAtBlock(World world, BlockPos pos, @Nullable Direction pushDirection, ItemStack stack) { + ItemEntity entityItem = new ItemEntity(world); BlockPos spawnPos = new BlockPos(pos); double velocity = 0.15D; if (pushDirection != null) { @@ -854,17 +852,17 @@ public class Utils { public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos, boolean playSound) { TileEntity initialTile = initialWorld.getTileEntity(initialPos); TileEntity finalTile = finalWorld.getTileEntity(finalPos); - NBTTagCompound initialTag = new NBTTagCompound(); - NBTTagCompound finalTag = new NBTTagCompound(); + CompoundNBT initialTag = new CompoundNBT(); + CompoundNBT finalTag = new CompoundNBT(); if (initialTile != null) initialTile.writeToNBT(initialTag); if (finalTile != null) finalTile.writeToNBT(finalTag); - IBlockState initialState = initialWorld.getBlockState(initialPos); - IBlockState finalState = finalWorld.getBlockState(finalPos); + BlockState initialState = initialWorld.getBlockState(initialPos); + BlockState finalState = finalWorld.getBlockState(finalPos); - if ((initialState.getBlock().equals(Blocks.AIR) && finalState.getBlock().equals(Blocks.AIR)) || initialState.getBlock() instanceof BlockPortal || finalState.getBlock() instanceof BlockPortal) + if ((initialState.getBlock().equals(Blocks.AIR) && finalState.getBlock().equals(Blocks.AIR)) || initialState.getBlock() instanceof NetherPortalBlock || finalState.getBlock() instanceof NetherPortalBlock) return false; if (playSound) { @@ -879,8 +877,8 @@ public class Utils { initialWorld.removeTileEntity(initialPos); //TILES CLEARED - IBlockState initialBlockState = initialWorld.getBlockState(initialPos); - IBlockState finalBlockState = finalWorld.getBlockState(finalPos); + BlockState initialBlockState = initialWorld.getBlockState(initialPos); + BlockState finalBlockState = finalWorld.getBlockState(finalPos); finalWorld.setBlockState(finalPos, initialBlockState, 3); if (initialTile != null) { @@ -950,7 +948,7 @@ public class Utils { } } - public static RayTraceResult rayTrace(EntityPlayer player, boolean useLiquids) { + public static RayTraceResult rayTrace(PlayerEntity player, boolean useLiquids) { float pitch = player.rotationPitch; float yaw = player.rotationYaw; Vec3d eyePosition = new Vec3d(player.posX, player.posY + (double) player.getEyeHeight(), player.posZ); @@ -963,8 +961,8 @@ public class Utils { float f7 = f2 * f4; double reachDistance = 5.0D; - if (player instanceof EntityPlayerMP) - reachDistance = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance(); + if (player instanceof ServerPlayerEntity) + reachDistance = ((ServerPlayerEntity) player).interactionManager.getBlockReachDistance(); Vec3d reachPosition = eyePosition.add((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index b929e0e9..b8bddf1f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -20,20 +20,20 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.SetMultimap; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraftforge.client.event.*; import net.minecraftforge.client.event.sound.PlaySoundEvent; @@ -71,7 +71,7 @@ public class ClientHandler { public static Minecraft minecraft = Minecraft.getMinecraft(); private static TileMasterRitualStone mrsHoloTile; private static Ritual mrsHoloRitual; - private static EnumFacing mrsHoloDirection; + private static Direction mrsHoloDirection; private static boolean mrsHoloDisplay; @SubscribeEvent @@ -93,7 +93,7 @@ public class ClientHandler { @SubscribeEvent public static void onSoundEvent(PlaySoundEvent event) { - EntityPlayer player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getMinecraft().player; if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { event.setResultSound(null); } @@ -121,7 +121,7 @@ public class ClientHandler { @SubscribeEvent public static void render(RenderWorldLastEvent event) { - EntityPlayerSP player = minecraft.player; + ClientPlayerEntity player = minecraft.player; World world = player.getEntityWorld(); if (mrsHoloTile != null) { @@ -146,7 +146,7 @@ public class ClientHandler { @SubscribeEvent public static void onMouseEvent(MouseEvent event) { - EntityPlayerSP player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getMinecraft().player; if (event.getDwheel() != 0 && player != null && player.isSneaking()) { ItemStack stack = player.getHeldItemMainhand(); @@ -241,10 +241,10 @@ public class ClientHandler { BMLog.DEBUG.info("Suppressed required texture errors in {}", stopwatch.stop()); } - private static void renderRitualStones(EntityPlayerSP player, float partialTicks) { + private static void renderRitualStones(ClientPlayerEntity player, float partialTicks) { World world = player.getEntityWorld(); ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); - EnumFacing direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); + Direction direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); if (ritual == null) @@ -303,7 +303,7 @@ public class ClientHandler { GlStateManager.popMatrix(); } - public static void cycleSigil(ItemStack stack, EntityPlayer player, int dWheel) { + public static void cycleSigil(ItemStack stack, PlayerEntity player, int dWheel) { int mode = dWheel; if (!ConfigHandler.client.sigilHoldingSkipsEmptySlots) { mode = ItemSigilHolding.getCurrentItemOrdinal(stack); @@ -313,17 +313,17 @@ public class ClientHandler { ItemSigilHolding.cycleToNextSigil(stack, mode); BloodMagicPacketHandler.INSTANCE.sendToServer(new SigilHoldingPacketProcessor(player.inventory.currentItem, mode)); ItemStack newStack = ItemSigilHolding.getItemStackInSlot(stack, ItemSigilHolding.getCurrentItemOrdinal(stack)); - player.sendStatusMessage(newStack.isEmpty() ? new TextComponentString("") : newStack.getTextComponent(), true); + player.sendStatusMessage(newStack.isEmpty() ? new StringTextComponent("") : newStack.getTextComponent(), true); } - private static TextureAtlasSprite forName(TextureMap textureMap, String name, String dir) { + private static TextureAtlasSprite forName(AtlasTexture textureMap, String name, String dir) { return textureMap.registerSprite(new ResourceLocation(Constants.Mod.DOMAIN + dir + "/" + name)); } public static void renderRitualStones(TileMasterRitualStone masterRitualStone, float partialTicks) { - EntityPlayerSP player = minecraft.player; + ClientPlayerEntity player = minecraft.player; World world = player.getEntityWorld(); - EnumFacing direction = mrsHoloDirection; + Direction direction = mrsHoloDirection; Ritual ritual = mrsHoloRitual; if (ritual == null) @@ -382,7 +382,7 @@ public class ClientHandler { GlStateManager.popMatrix(); } - public static void setRitualHolo(TileMasterRitualStone masterRitualStone, Ritual ritual, EnumFacing direction, boolean displayed) { + public static void setRitualHolo(TileMasterRitualStone masterRitualStone, Ritual ritual, Direction direction, boolean displayed) { mrsHoloDisplay = displayed; mrsHoloTile = masterRitualStone; mrsHoloRitual = ritual; @@ -393,6 +393,6 @@ public class ClientHandler { mrsHoloDisplay = false; mrsHoloTile = null; mrsHoloRitual = null; - mrsHoloDirection = EnumFacing.NORTH; + mrsHoloDirection = Direction.NORTH; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 4d97a8d4..72f4cec8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -12,12 +12,11 @@ import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemInscriptionTool; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemBanner; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.item.*; +import net.minecraft.item.BannerItem; +import net.minecraft.item.Items; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.FurnaceTileEntity; import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent; @@ -46,7 +45,7 @@ public class CraftingHandler { } if (event.getOutput().getItem() == ForgeModContainer.getInstance().universalBucket && event.getAltarRecipe().getSyphon() == 1000) { - NBTTagCompound bucketTags = FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)).getTagCompound(); + CompoundNBT bucketTags = FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)).getTagCompound(); event.getOutput().setTagCompound(bucketTags); } } @@ -73,7 +72,7 @@ public class CraftingHandler { if (event.getRight().getItem() == Items.NAME_TAG) { ItemStack output = event.getLeft().copy(); if (!output.hasTagCompound()) - output.setTagCompound(new NBTTagCompound()); + output.setTagCompound(new CompoundNBT()); output.getTagCompound().setString(Constants.NBT.COLOR, event.getRight().getDisplayName()); event.setCost(1); @@ -83,10 +82,10 @@ public class CraftingHandler { } if (event.getRight().getItem() == Items.DYE) { - EnumDyeColor dyeColor = ItemBanner.getBaseColor(event.getRight()); + DyeColor dyeColor = BannerItem.getBaseColor(event.getRight()); ItemStack output = event.getLeft().copy(); if (!output.hasTagCompound()) - output.setTagCompound(new NBTTagCompound()); + output.setTagCompound(new CompoundNBT()); output.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(Utils.DYE_COLOR_VALUES.getOrDefault(dyeColor, 0))); event.setCost(1); @@ -145,6 +144,6 @@ public class CraftingHandler { @SubscribeEvent public static void handleFuelLevel(FurnaceFuelBurnTimeEvent event) { if (ItemStack.areItemsEqual(event.getItemStack(), ComponentTypes.SAND_COAL.getStack())) - event.setBurnTime(TileEntityFurnace.getItemBurnTime(new ItemStack(Items.COAL))); + event.setBurnTime(FurnaceTileEntity.getItemBurnTime(new ItemStack(Items.COAL))); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 9a2c457d..23165c69 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -43,31 +43,31 @@ import WayofTime.bloodmagic.util.helper.ItemHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIAttackMelee; -import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.ai.EntityAINearestAttackableTarget; -import net.minecraft.entity.ai.EntityAITarget; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Enchantments; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; +import net.minecraft.entity.ai.goal.TargetGoal; +import net.minecraft.entity.ai.goal.MeleeAttackGoal; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.monster.MonsterEntity; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.potion.Effects; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumHand; +import net.minecraft.util.Hand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -95,18 +95,18 @@ import java.util.*; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class GenericHandler { - public static Map> bounceMapMap = new HashMap<>(); - public static Map> filledHandMapMap = new HashMap<>(); - private static Map> targetTaskMapMap = new HashMap<>(); - private static Map> attackTaskMapMap = new HashMap<>(); + public static Map> bounceMapMap = new HashMap<>(); + public static Map> filledHandMapMap = new HashMap<>(); + private static Map> targetTaskMapMap = new HashMap<>(); + private static Map> attackTaskMapMap = new HashMap<>(); public static Map> preventSpawnMap = new HashMap<>(); public static Map> forceSpawnMap = new HashMap<>(); public static Set featherRitualSet; @SubscribeEvent public static void onEntityFall(LivingFallEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (event.getEntityLiving() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntityLiving(); if (player.isPotionActive(RegistrarBloodMagic.BOUNCE) && !player.isSneaking() && event.getDistance() > 2) { event.setDamageMultiplier(0); @@ -125,12 +125,12 @@ public class GenericHandler { @SubscribeEvent public static void playerTickPost(TickEvent.PlayerTickEvent event) { World world = event.player.getEntityWorld(); - Map bounceMap = bounceMapMap.get(world); + Map bounceMap = bounceMapMap.get(world); if (event.phase == TickEvent.Phase.END && bounceMap.containsKey(event.player)) { event.player.motionY = bounceMap.remove(event.player); } - Map filledHandMap = filledHandMapMap.get(world); + Map filledHandMap = filledHandMapMap.get(world); if (event.phase == TickEvent.Phase.END) { if (filledHandMap.containsKey(event.player)) { int value = filledHandMap.get(event.player) - 1; @@ -146,9 +146,9 @@ public class GenericHandler { @SubscribeEvent public static void onPlayerClick(PlayerInteractEvent event) { if (event.isCancelable() && event.getEntityPlayer().isPotionActive(RegistrarBloodMagic.CONSTRICT)) { - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); int level = player.getActivePotionEffect(RegistrarBloodMagic.CONSTRICT).getAmplifier(); - if (event.getHand() == EnumHand.OFF_HAND || level > 1) { + if (event.getHand() == Hand.OFF_HAND || level > 1) { event.setCanceled(true); } } @@ -156,7 +156,7 @@ public class GenericHandler { @SubscribeEvent public static void onPlayerDropItem(ItemTossEvent event) { - EntityItem itemEntity = event.getEntityItem(); + ItemEntity itemEntity = event.getEntityItem(); if (itemEntity != null) { ItemStack stack = itemEntity.getItem(); Item item = stack.getItem(); @@ -192,22 +192,22 @@ public class GenericHandler { if (event.getEntity().getEntityWorld().isRemote) return; - if (event.getSource().getTrueSource() instanceof EntityPlayer && !PlayerHelper.isFakePlayer((EntityPlayer) event.getSource().getTrueSource())) { - EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); + if (event.getSource().getTrueSource() instanceof PlayerEntity && !PlayerHelper.isFakePlayer((PlayerEntity) event.getSource().getTrueSource())) { + PlayerEntity player = (PlayerEntity) event.getSource().getTrueSource(); - if (!player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty() && player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() instanceof ItemPackSacrifice) { - ItemPackSacrifice pack = (ItemPackSacrifice) player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem(); + if (!player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty() && player.getItemStackFromSlot(EquipmentSlotType.CHEST).getItem() instanceof ItemPackSacrifice) { + ItemPackSacrifice pack = (ItemPackSacrifice) player.getItemStackFromSlot(EquipmentSlotType.CHEST).getItem(); - boolean shouldSyphon = pack.getStoredLP(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) < pack.CAPACITY; + boolean shouldSyphon = pack.getStoredLP(player.getItemStackFromSlot(EquipmentSlotType.CHEST)) < pack.CAPACITY; float damageDone = event.getEntityLiving().getHealth() < event.getAmount() ? event.getAmount() - event.getEntityLiving().getHealth() : event.getAmount(); int totalLP = Math.round(damageDone * ConfigHandler.values.coatOfArmsConversion); if (shouldSyphon) - ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST), totalLP, pack.CAPACITY); + ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EquipmentSlotType.CHEST), totalLP, pack.CAPACITY); } if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { @@ -224,21 +224,21 @@ public class GenericHandler { @SubscribeEvent public static void onLivingUpdate(LivingUpdateEvent event) { if (!event.getEntityLiving().getEntityWorld().isRemote) { - EntityLivingBase entity = event.getEntityLiving(); - if (entity instanceof EntityPlayer && entity.ticksExisted % 50 == 0) //TODO: Change to an incremental counter + LivingEntity entity = event.getEntityLiving(); + if (entity instanceof PlayerEntity && entity.ticksExisted % 50 == 0) //TODO: Change to an incremental counter { - sendPlayerDemonWillAura((EntityPlayer) entity); + sendPlayerDemonWillAura((PlayerEntity) entity); } World world = entity.getEntityWorld(); - Map targetTaskMap = targetTaskMapMap.get(world); - Map attackTaskMap = attackTaskMapMap.get(world); - if (event.getEntityLiving() instanceof EntityAnimal) { - EntityAnimal animal = (EntityAnimal) event.getEntityLiving(); + Map targetTaskMap = targetTaskMapMap.get(world); + Map attackTaskMap = attackTaskMapMap.get(world); + if (event.getEntityLiving() instanceof AnimalEntity) { + AnimalEntity animal = (AnimalEntity) event.getEntityLiving(); if (animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { if (!targetTaskMap.containsKey(animal)) { - EntityAITarget task = new EntityAINearestAttackableTarget<>(animal, EntityMob.class, false); - EntityAIBase attackTask = new EntityAIAttackMelee(animal, 1.0D, false); + TargetGoal task = new NearestAttackableTargetGoal<>(animal, MonsterEntity.class, false); + Goal attackTask = new MeleeAttackGoal(animal, 1.0D, false); animal.targetTasks.addTask(1, task); animal.tasks.addTask(1, attackTask); targetTaskMap.put(animal, task); @@ -257,10 +257,10 @@ public class GenericHandler { } } - EntityLivingBase entity = event.getEntityLiving(); + LivingEntity entity = event.getEntityLiving(); - if (entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; if (player.isSneaking() && player.isPotionActive(RegistrarBloodMagic.CLING) && Utils.isPlayerBesideSolidBlockFace(player) && !player.onGround) { if (player.getEntityWorld().isRemote) { player.motionY = 0; @@ -272,10 +272,10 @@ public class GenericHandler { } } - if (entity.isPotionActive(MobEffects.NIGHT_VISION)) { - int duration = entity.getActivePotionEffect(MobEffects.NIGHT_VISION).getDuration(); + if (entity.isPotionActive(Effects.NIGHT_VISION)) { + int duration = entity.getActivePotionEffect(Effects.NIGHT_VISION).getDuration(); if (duration == Constants.Misc.NIGHT_VISION_CONSTANT_END) { - entity.removePotionEffect(MobEffects.NIGHT_VISION); + entity.removePotionEffect(Effects.NIGHT_VISION); } } @@ -301,14 +301,14 @@ public class GenericHandler { } // @SideOnly(Side.SERVER) - public static void sendPlayerDemonWillAura(EntityPlayer player) { - if (player instanceof EntityPlayerMP) { + public static void sendPlayerDemonWillAura(PlayerEntity player) { + if (player instanceof ServerPlayerEntity) { BlockPos pos = player.getPosition(); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(player.getEntityWorld().provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); if (holder != null) { - BloodMagicPacketHandler.sendTo(new DemonAuraPacketProcessor(holder), (EntityPlayerMP) player); + BloodMagicPacketHandler.sendTo(new DemonAuraPacketProcessor(holder), (ServerPlayerEntity) player); } else { - BloodMagicPacketHandler.sendTo(new DemonAuraPacketProcessor(new DemonWillHolder()), (EntityPlayerMP) player); + BloodMagicPacketHandler.sendTo(new DemonAuraPacketProcessor(new DemonWillHolder()), (ServerPlayerEntity) player); } } } @@ -316,11 +316,11 @@ public class GenericHandler { // Handles destroying altar @SubscribeEvent public static void harvestEvent(PlayerEvent.HarvestCheck event) { - IBlockState state = event.getTargetBlock(); + BlockState state = event.getTargetBlock(); Block block = state.getBlock(); - if (block instanceof BlockAltar && event.getEntityPlayer() != null && event.getEntityPlayer() instanceof EntityPlayerMP && !event.getEntityPlayer().getHeldItemMainhand().isEmpty() && event.getEntityPlayer().getHeldItemMainhand().getItem() instanceof ItemAltarMaker) { + if (block instanceof BlockAltar && event.getEntityPlayer() != null && event.getEntityPlayer() instanceof ServerPlayerEntity && !event.getEntityPlayer().getHeldItemMainhand().isEmpty() && event.getEntityPlayer().getHeldItemMainhand().getItem() instanceof ItemAltarMaker) { ItemAltarMaker altarMaker = (ItemAltarMaker) event.getEntityPlayer().getHeldItemMainhand().getItem(); - event.getEntityPlayer().sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.altarMaker.destroy", altarMaker.destroyAltar(event.getEntityPlayer())), true); + event.getEntityPlayer().sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.destroy", altarMaker.destroyAltar(event.getEntityPlayer())), true); } } @@ -351,7 +351,7 @@ public class GenericHandler { if (event.getWorld().isRemote) return; - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); if (PlayerHelper.isFakePlayer(player)) return; @@ -390,10 +390,10 @@ public class GenericHandler { @SubscribeEvent public static void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { - EntityPlayer player = event.player; + PlayerEntity player = event.player; if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { StatTrackerSelfSacrifice.incrementCounter(armour, event.healthDrained / 2); @@ -411,18 +411,18 @@ public class GenericHandler { // Drop Blood Shards @SubscribeEvent public static void onLivingDrops(LivingDropsEvent event) { - EntityLivingBase attackedEntity = event.getEntityLiving(); + LivingEntity attackedEntity = event.getEntityLiving(); DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); - if (entity != null && entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity != null && entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; ItemStack heldStack = player.getHeldItemMainhand(); - if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.BOUND_SWORD && !(attackedEntity instanceof EntityAnimal)) + if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.BOUND_SWORD && !(attackedEntity instanceof AnimalEntity)) for (int i = 0; i <= EnchantmentHelper.getLootingModifier(player); i++) if (attackedEntity.getEntityWorld().rand.nextDouble() < 0.2) - event.getDrops().add(new EntityItem(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0))); + event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0))); } } @@ -438,7 +438,7 @@ public class GenericHandler { // Experience Tome @SubscribeEvent(priority = EventPriority.LOWEST) public static void onExperiencePickup(PlayerPickupXpEvent event) { - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantments.MENDING, player); if (!Loader.isModLoaded("unmending")) { @@ -473,7 +473,7 @@ public class GenericHandler { public static void onLivingSpawnEvent(LivingSpawnEvent.CheckSpawn event) { World world = event.getWorld(); - if (!(event.getEntityLiving() instanceof EntityMob)) { + if (!(event.getEntityLiving() instanceof MonsterEntity)) { return; } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 447fffa0..5c65682b 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -18,17 +18,17 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerJump; import WayofTime.bloodmagic.livingArmour.upgrade.*; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Enchantments; -import net.minecraft.init.Items; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemArrow; -import net.minecraft.item.ItemSplashPotion; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumHand; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.AbstractArrowEntity; +import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.*; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.SplashPotionItem; +import net.minecraft.item.Items; +import net.minecraft.item.UseAction; +import net.minecraft.util.Hand; import net.minecraft.world.World; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.ProjectileImpactEvent; @@ -49,10 +49,10 @@ public class LivingArmourHandler { @SubscribeEvent public static void onEntityHealed(LivingHealEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntity(); + if (event.getEntityLiving() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntity(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { double modifier = 1; @@ -72,9 +72,9 @@ public class LivingArmourHandler { @SubscribeEvent public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { double modifier = 1; @@ -93,17 +93,17 @@ public class LivingArmourHandler { @SubscribeEvent public static void onEntityJoinedWorld(EntityJoinWorldEvent event) { Entity owner = null; - if (event.getEntity() instanceof EntityArrow) { - owner = ((EntityArrow) event.getEntity()).shootingEntity; - } else if (event.getEntity() instanceof EntityThrowable) { - owner = ((EntityThrowable) event.getEntity()).getThrower(); + if (event.getEntity() instanceof AbstractArrowEntity) { + owner = ((AbstractArrowEntity) event.getEntity()).shootingEntity; + } else if (event.getEntity() instanceof ThrowableEntity) { + owner = ((ThrowableEntity) event.getEntity()).getThrower(); } - if (owner instanceof EntityPlayer) { + if (owner instanceof PlayerEntity) { Entity projectile = event.getEntity(); - EntityPlayer player = (EntityPlayer) owner; + PlayerEntity player = (PlayerEntity) owner; if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stormTrooper", chestStack); @@ -123,13 +123,13 @@ public class LivingArmourHandler { @SubscribeEvent public static void onPlayerClick(PlayerInteractEvent event) { if (event.isCancelable()) { - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { - if (event.getHand() == EnumHand.OFF_HAND) { + if (event.getHand() == Hand.OFF_HAND) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.crippledArm", chestStack); if (upgrade instanceof LivingArmourUpgradeCrippledArm) { @@ -137,9 +137,9 @@ public class LivingArmourHandler { } } - if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) { + if (event.getItemStack().getItemUseAction() == UseAction.DRINK) { ItemStack drinkStack = event.getItemStack(); - if (!(drinkStack.getItem() instanceof ItemSplashPotion)) { + if (!(drinkStack.getItem() instanceof SplashPotionItem)) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); if (upgrade instanceof LivingArmourUpgradeQuenched) { @@ -155,11 +155,11 @@ public class LivingArmourHandler { // Applies: Grim Reaper @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onEntityDeath(LivingDeathEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (event.getEntityLiving() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntityLiving(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { StatTrackerGrimReaperSprint.incrementCounter(armour); @@ -181,11 +181,11 @@ public class LivingArmourHandler { // Applies: Jump @SubscribeEvent public static void onJumpEvent(LivingEvent.LivingJumpEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (event.getEntityLiving() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntityLiving(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { StatTrackerJump.incrementCounter(armour); @@ -205,15 +205,15 @@ public class LivingArmourHandler { // Applies: Step Assist, Speed Boost @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (event.getEntityLiving() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntityLiving(); boolean hasAssist = false; if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { hasAssist = true; player.stepHeight = Constants.Misc.ALTERED_STEP_HEIGHT; } else { if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stepAssist", chestStack); @@ -236,7 +236,7 @@ public class LivingArmourHandler { float percentIncrease = 0; if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.movement", chestStack); @@ -266,14 +266,14 @@ public class LivingArmourHandler { public static void onArrowFire(ArrowLooseEvent event) { World world = event.getEntityPlayer().getEntityWorld(); ItemStack stack = event.getBow(); - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); boolean sentientShot = false; if (world.isRemote) return; if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { StatTrackerArrowShot.incrementCounter(armour); @@ -295,8 +295,8 @@ public class LivingArmourHandler { int extraArrows = ((LivingArmourUpgradeArrowShot) upgrade).getExtraArrows(); for (int n = 0; n < extraArrows; n++) { ItemStack arrowStack = new ItemStack(Items.ARROW); - ItemArrow itemarrow = (ItemArrow) ((stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW)); - EntityArrow entityarrow; + ArrowItem itemarrow = (ArrowItem) ((stack.getItem() instanceof ArrowItem ? arrowStack.getItem() : Items.ARROW)); + AbstractArrowEntity entityarrow; if (sentientShot) { // if the arrow was fired from a sentient bow ItemSentientBow sentientBow = (ItemSentientBow) stack.getItem(); entityarrow = sentientBow.getDuplicateArrow(stack, world, player, 1 / extraArrows); @@ -327,7 +327,7 @@ public class LivingArmourHandler { if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) entityarrow.setFire(100); - entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + entityarrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; world.spawnEntity(entityarrow); } @@ -339,12 +339,12 @@ public class LivingArmourHandler { // Applies: Softfall @SubscribeEvent public static void onPlayerFall(LivingFallEvent event) { - if (event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if (event.getEntityLiving() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntityLiving(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { StatTrackerFallProtect.incrementCounter(armour, event.getDamageMultiplier() * (event.getDistance() - 3)); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index a894a655..163e3ef9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -10,11 +10,11 @@ import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemSpade; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.ShovelItem; +import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.MathHelper; @@ -35,10 +35,10 @@ public class StatTrackerHandler { // Tracks: Digging, DigSlowdown @SubscribeEvent public static void blockBreakEvent(BlockEvent.BreakEvent event) { - EntityPlayer player = event.getPlayer(); + PlayerEntity player = event.getPlayer(); if (player != null) { if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); if (chestStack.getItem() instanceof ItemLivingArmour) { LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); @@ -54,15 +54,15 @@ public class StatTrackerHandler { // Tracks: Health Boost @SubscribeEvent public static void onEntityHealed(LivingHealEvent event) { - EntityLivingBase healedEntity = event.getEntityLiving(); - if (!(healedEntity instanceof EntityPlayer)) { + LivingEntity healedEntity = event.getEntityLiving(); + if (!(healedEntity instanceof PlayerEntity)) { return; } - EntityPlayer player = (EntityPlayer) healedEntity; + PlayerEntity player = (PlayerEntity) healedEntity; if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { StatTrackerHealthboost.incrementCounter(armour, event.getAmount()); @@ -83,15 +83,15 @@ public class StatTrackerHandler { public static void entityHurt(LivingHurtEvent event) { DamageSource source = event.getSource(); Entity sourceEntity = event.getSource().getTrueSource(); - EntityLivingBase attackedEntity = event.getEntityLiving(); + LivingEntity attackedEntity = event.getEntityLiving(); - if (attackedEntity instanceof EntityPlayer) { - EntityPlayer attackedPlayer = (EntityPlayer) attackedEntity; + if (attackedEntity instanceof PlayerEntity) { + PlayerEntity attackedPlayer = (PlayerEntity) attackedEntity; // Living Armor Handling if (LivingArmour.hasFullSet(attackedPlayer)) { float amount = Math.min(Utils.getModifiedDamage(attackedPlayer, event.getSource(), event.getAmount()), attackedPlayer.getHealth()); - ItemStack chestStack = attackedPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = attackedPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { if (sourceEntity != null && !source.isMagicDamage() && !source.isProjectile()) @@ -104,7 +104,7 @@ public class StatTrackerHandler { StatTrackerArrowProtect.incrementCounter(armour, amount); } } else { - ItemStack chestStack = attackedPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = attackedPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST); if (chestStack.getItem() instanceof ItemSentientArmour) { ItemSentientArmour armour = (ItemSentientArmour) chestStack.getItem(); armour.onPlayerAttacked(chestStack, source, attackedPlayer); @@ -112,15 +112,15 @@ public class StatTrackerHandler { } } - if (sourceEntity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) sourceEntity; + if (sourceEntity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) sourceEntity; // Living Armor Handling if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { - ItemStack mainWeapon = player.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND); + ItemStack mainWeapon = player.getItemStackFromSlot(EquipmentSlotType.MAINHAND); event.setAmount((float) (event.getAmount() + lastPlayerSwingStrength * armour.getAdditionalDamageOnHit(event.getAmount(), player, attackedEntity, mainWeapon))); @@ -132,13 +132,13 @@ public class StatTrackerHandler { if (player.getEntityWorld().getLight(player.getPosition()) <= 9) StatTrackerNightSight.incrementCounter(armour, amount); - if (mainWeapon.getItem() instanceof ItemSpade) + if (mainWeapon.getItem() instanceof ShovelItem) StatTrackerGraveDigger.incrementCounter(armour, amount); if (player.isSprinting()) StatTrackerSprintAttack.incrementCounter(armour, amount); - boolean isCritical = lastPlayerSwingStrength > 0.9 && player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding() && !player.isSprinting(); + boolean isCritical = lastPlayerSwingStrength > 0.9 && player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Effects.BLINDNESS) && !player.isRiding() && !player.isSprinting(); if (isCritical) StatTrackerCriticalStrike.incrementCounter(armour, amount); @@ -154,10 +154,10 @@ public class StatTrackerHandler { // Tracks: Experienced @SubscribeEvent(priority = EventPriority.LOW) public static void onExperiencePickup(PlayerPickupXpEvent event) { - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); if (armour != null) { LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.experienced", chestStack); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 4b735090..acfda0d0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -9,18 +9,18 @@ import WayofTime.bloodmagic.demonAura.WillChunk; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.monster.MonsterEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; +import net.minecraft.util.IndirectEntityDamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.Difficulty; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; @@ -44,7 +44,7 @@ public class WillHandler { public static void onItemPickup(EntityItemPickupEvent event) { ItemStack stack = event.getItem().getItem(); if (stack.getItem() instanceof IDemonWill) { - EntityPlayer player = event.getEntityPlayer(); + PlayerEntity player = event.getEntityPlayer(); EnumDemonWillType pickupType = ((IDemonWill) stack.getItem()).getType(stack); ItemStack remainder = PlayerDemonWillHandler.addDemonWill(player, stack); @@ -57,7 +57,7 @@ public class WillHandler { @SubscribeEvent public static void onEntityAttacked(LivingDeathEvent event) { - if (event.getSource() instanceof EntityDamageSourceIndirect) { + if (event.getSource() instanceof IndirectEntityDamageSource) { Entity sourceEntity = event.getSource().getImmediateSource(); if (sourceEntity instanceof EntitySentientArrow) { @@ -69,21 +69,21 @@ public class WillHandler { // Add/Drop Demon Will for Player @SubscribeEvent public static void onLivingDrops(LivingDropsEvent event) { - EntityLivingBase attackedEntity = event.getEntityLiving(); + LivingEntity attackedEntity = event.getEntityLiving(); DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); - if (attackedEntity.isPotionActive(RegistrarBloodMagic.SOUL_SNARE) && (attackedEntity instanceof EntityMob || attackedEntity.getEntityWorld().getDifficulty() == EnumDifficulty.PEACEFUL)) { - PotionEffect eff = attackedEntity.getActivePotionEffect(RegistrarBloodMagic.SOUL_SNARE); + if (attackedEntity.isPotionActive(RegistrarBloodMagic.SOUL_SNARE) && (attackedEntity instanceof MonsterEntity || attackedEntity.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL)) { + EffectInstance eff = attackedEntity.getActivePotionEffect(RegistrarBloodMagic.SOUL_SNARE); int lvl = eff.getAmplifier(); double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 5; ItemStack soulStack = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL).createWill(0, amountOfSouls); - event.getDrops().add(new EntityItem(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack)); + event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack)); } - if (entity != null && entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if (entity != null && entity instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) entity; ItemStack heldStack = player.getHeldItemMainhand(); if (heldStack.getItem() instanceof IDemonWillWeapon && !player.getEntityWorld().isRemote) { IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem(); @@ -96,7 +96,7 @@ public class WillHandler { if (!remainder.isEmpty()) { EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder); if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001) { - event.getDrops().add(new EntityItem(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, remainder)); + event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, remainder)); } } } @@ -138,7 +138,7 @@ public class WillHandler { int dim = event.getWorld().provider.getDimension(); ChunkPos loc = event.getChunk().getPos(); - NBTTagCompound nbt = new NBTTagCompound(); + CompoundNBT nbt = new CompoundNBT(); event.getData().setTag("BloodMagic", nbt); WillChunk ac = WorldDemonWillHandler.getWillChunk(dim, loc.x, loc.z); @@ -154,7 +154,7 @@ public class WillHandler { public static void chunkLoad(ChunkDataEvent.Load event) { int dim = event.getWorld().provider.getDimension(); if (event.getData().getCompoundTag("BloodMagic").hasKey("base")) { - NBTTagCompound nbt = event.getData().getCompoundTag("BloodMagic"); + CompoundNBT nbt = event.getData().getCompoundTag("BloodMagic"); short base = nbt.getShort("base"); DemonWillHolder current = new DemonWillHolder(); current.readFromNBT(nbt, "current"); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java index 2606eae9..63b7dc3b 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java @@ -3,20 +3,20 @@ package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.event.ItemBindEvent; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class BindableHelper { - public static void applyBinding(ItemStack stack, EntityPlayer player) { + public static void applyBinding(ItemStack stack, PlayerEntity player) { Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); applyBinding(stack, binding); } public static void applyBinding(ItemStack stack, Binding binding) { if (!stack.hasTagCompound()) - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); stack.getTagCompound().setTag("binding", binding.serializeNBT()); } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java index 5059d631..9e5796f5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.util.Constants; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class IncenseHelper { - public static double getCurrentIncense(EntityPlayer player) { - NBTTagCompound data = player.getEntityData(); + public static double getCurrentIncense(PlayerEntity player) { + CompoundNBT data = player.getEntityData(); if (data.hasKey(Constants.NBT.CURRENT_INCENSE)) { return data.getDouble(Constants.NBT.CURRENT_INCENSE); } @@ -16,25 +16,25 @@ public class IncenseHelper { return 0; } - public static void setCurrentIncense(EntityPlayer player, double amount) { - NBTTagCompound data = player.getEntityData(); + public static void setCurrentIncense(PlayerEntity player, double amount) { + CompoundNBT data = player.getEntityData(); data.setDouble(Constants.NBT.CURRENT_INCENSE, amount); } - public static void setMaxIncense(EntityPlayer player, double amount) { - NBTTagCompound data = player.getEntityData(); + public static void setMaxIncense(PlayerEntity player, double amount) { + CompoundNBT data = player.getEntityData(); data.setDouble(Constants.NBT.MAX_INCENSE, amount); } - public static double getMaxIncense(EntityPlayer player) { - NBTTagCompound data = player.getEntityData(); + public static double getMaxIncense(PlayerEntity player) { + CompoundNBT data = player.getEntityData(); if (data.hasKey(Constants.NBT.MAX_INCENSE)) { return data.getDouble(Constants.NBT.MAX_INCENSE); } return 0; } - public static void setHasMaxIncense(ItemStack stack, EntityPlayer player, boolean isMax) { + public static void setHasMaxIncense(ItemStack stack, PlayerEntity player, boolean isMax) { stack = NBTHelper.checkNBT(stack); stack.getTagCompound().setBoolean(Constants.NBT.HAS_MAX_INCENSE, isMax); } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java index 24912b87..760bf085 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java @@ -7,7 +7,7 @@ import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.ItemUpgradeTome; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -91,7 +91,7 @@ public class ItemHelper { public static void setKey(ItemStack stack, String key) { if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setString("key", key); } @@ -100,7 +100,7 @@ public class ItemHelper { public static String getKey(ItemStack stack) { if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getString("key"); } @@ -111,7 +111,7 @@ public class ItemHelper { public static void setLevel(ItemStack stack, int level) { if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); tag.setInteger("level", level); } @@ -120,7 +120,7 @@ public class ItemHelper { public static int getLevel(ItemStack stack) { if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { NBTHelper.checkNBT(stack); - NBTTagCompound tag = stack.getTagCompound(); + CompoundNBT tag = stack.getTagCompound(); return tag.getInteger("level"); } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java index 59a73f3e..691fb556 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.helper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; public class NBTHelper { public static ItemStack checkNBT(ItemStack stack) { if (stack.getTagCompound() == null) - stack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new CompoundNBT()); return stack; } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index c87b8209..b16d47b2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -9,7 +9,7 @@ import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.core.data.BMWorldSavedData; import WayofTime.bloodmagic.core.data.SoulNetwork; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; @@ -53,7 +53,7 @@ public class NetworkHelper { * @param player - The Player * @see NetworkHelper#getSoulNetwork(String) */ - public static SoulNetwork getSoulNetwork(EntityPlayer player) { + public static SoulNetwork getSoulNetwork(PlayerEntity player) { return getSoulNetwork(PlayerHelper.getUUIDFromPlayer(player)); } @@ -98,10 +98,10 @@ public class NetworkHelper { * @param user - User of the item. * @param toSyphon - Amount of LP to syphon * @return - Whether the action should be performed. - * @deprecated Use {@link #getSoulNetwork(EntityPlayer)} and {@link SoulNetwork#syphonAndDamage$(EntityPlayer, SoulTicket)} + * @deprecated Use {@link #getSoulNetwork(PlayerEntity)} and {@link SoulNetwork#syphonAndDamage$(PlayerEntity, SoulTicket)} */ @Deprecated - public static boolean syphonAndDamage(SoulNetwork soulNetwork, EntityPlayer user, int toSyphon) { + public static boolean syphonAndDamage(SoulNetwork soulNetwork, PlayerEntity user, int toSyphon) { // if (soulNetwork.getNewOwner() == null) // { diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java index 601a9240..505ffbee 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.helper; import com.google.common.collect.Lists; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.common.UsernameCache; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -18,18 +18,18 @@ public class PlayerHelper { */ private static final ArrayList knownFakePlayers = Lists.newArrayList(); - public static EntityPlayer getPlayerFromId(UUID uuid) { + public static PlayerEntity getPlayerFromId(UUID uuid) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return null; return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(uuid); } - public static EntityPlayer getPlayerFromUUID(UUID uuid) { + public static PlayerEntity getPlayerFromUUID(UUID uuid) { return getPlayerFromId(uuid); } - public static UUID getUUIDFromPlayer(EntityPlayer player) { + public static UUID getUUIDFromPlayer(PlayerEntity player) { return player.getGameProfile().getId(); } @@ -43,7 +43,7 @@ public class PlayerHelper { * @param player - The player in question * @return If the player is fake or not */ - public static boolean isFakePlayer(EntityPlayer player) { + public static boolean isFakePlayer(PlayerEntity player) { return player instanceof FakePlayer || (player != null && knownFakePlayers.contains(player.getClass().getCanonicalName())); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java index 54ceea6a..da4312d2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java @@ -4,10 +4,10 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.altar.IBloodAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -16,17 +16,17 @@ import net.minecraftforge.common.MinecraftForge; public class PlayerSacrificeHelper { public static float scalingOfSacrifice = 1f; public static int soulFrayDuration = 400; - public static Potion soulFrayId; + public static Effect soulFrayId; - public static double getPlayerIncense(EntityPlayer player) { + public static double getPlayerIncense(PlayerEntity player) { return IncenseHelper.getCurrentIncense(player); } - public static void setPlayerIncense(EntityPlayer player, double amount) { + public static void setPlayerIncense(PlayerEntity player, double amount) { IncenseHelper.setCurrentIncense(player, amount); } - public static boolean incrementIncense(EntityPlayer player, double min, double incenseAddition, double increment) { + public static boolean incrementIncense(PlayerEntity player, double min, double incenseAddition, double increment) { double amount = getPlayerIncense(player); if (amount < min || amount >= incenseAddition) { return false; @@ -51,7 +51,7 @@ public class PlayerSacrificeHelper { * @param player - The player sacrificing * @return Whether or not the health sacrificing succeeded */ - public static boolean sacrificePlayerHealth(EntityPlayer player) { + public static boolean sacrificePlayerHealth(PlayerEntity player) { if (player.isPotionActive(soulFrayId)) { return false; } @@ -77,7 +77,7 @@ public class PlayerSacrificeHelper { player.setHealth(maxHealth / 10.0f); setPlayerIncense(player, 0); - player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); + player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); return true; } @@ -96,12 +96,12 @@ public class PlayerSacrificeHelper { * * @param world - The world * @param sacrificingEntity - The entity having the sacrifice done on (can be - * {@link EntityPlayer} for self-sacrifice) + * {@link PlayerEntity} for self-sacrifice) * @param amount - The amount of which the altar should be filled * @param isSacrifice - Whether this is a Sacrifice or a Self-Sacrifice * @return Whether the altar is found and (attempted) filled */ - public static boolean findAndFillAltar(World world, EntityLivingBase sacrificingEntity, int amount, boolean isSacrifice) { + public static boolean findAndFillAltar(World world, LivingEntity sacrificingEntity, int amount, boolean isSacrifice) { IBloodAltar altarEntity = getAltar(world, sacrificingEntity.getPosition()); if (altarEntity == null) diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java index 49057296..40695916 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.util.Constants; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.nbt.CompoundNBT; public class PurificationHelper { - public static double getCurrentPurity(EntityAnimal animal) { - NBTTagCompound data = animal.getEntityData(); + public static double getCurrentPurity(AnimalEntity animal) { + CompoundNBT data = animal.getEntityData(); if (data.hasKey(Constants.NBT.CURRENT_PURITY)) { return data.getDouble(Constants.NBT.CURRENT_PURITY); } @@ -14,12 +14,12 @@ public class PurificationHelper { return 0; } - public static void setCurrentPurity(EntityAnimal animal, double amount) { - NBTTagCompound data = animal.getEntityData(); + public static void setCurrentPurity(AnimalEntity animal, double amount) { + CompoundNBT data = animal.getEntityData(); data.setDouble(Constants.NBT.CURRENT_PURITY, amount); } - public static double addPurity(EntityAnimal animal, double added, double max) { + public static double addPurity(AnimalEntity animal, double added, double max) { double currentPurity = getCurrentPurity(animal); double newAmount = Math.min(max, currentPurity + added); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index b9da4f00..ef5e7bfe 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -9,9 +9,9 @@ import WayofTime.bloodmagic.ritual.RitualComponent; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import com.google.common.collect.Lists; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; @@ -38,7 +38,7 @@ public class RitualHelper { */ public static String getValidRitual(World world, BlockPos pos) { for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { - for (EnumFacing direction : EnumFacing.HORIZONTALS) { + for (Direction direction : Direction.HORIZONTALS) { if (checkValidRitual(world, pos, ritual, direction)) return BloodMagic.RITUAL_MANAGER.getId(ritual); } @@ -47,8 +47,8 @@ public class RitualHelper { return ""; } - public static EnumFacing getDirectionOfRitual(World world, BlockPos pos, Ritual ritual) { - for (EnumFacing direction : EnumFacing.HORIZONTALS) { + public static Direction getDirectionOfRitual(World world, BlockPos pos, Ritual ritual) { + for (Direction direction : Direction.HORIZONTALS) { if (checkValidRitual(world, pos, ritual, direction)) return direction; } @@ -56,7 +56,7 @@ public class RitualHelper { return null; } - public static boolean checkValidRitual(World world, BlockPos pos, Ritual ritual, EnumFacing direction) { + public static boolean checkValidRitual(World world, BlockPos pos, Ritual ritual, Direction direction) { if (ritual == null) { return false; } @@ -106,7 +106,7 @@ public class RitualHelper { public static void setRuneType(World world, BlockPos pos, EnumRuneType type) { if (world == null) return; - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); TileEntity tile = world.getTileEntity(pos); if (state.getBlock() instanceof IRitualStone) @@ -119,21 +119,21 @@ public class RitualHelper { } } - public static boolean createRitual(World world, BlockPos pos, EnumFacing direction, Ritual ritual, boolean safe) { + public static boolean createRitual(World world, BlockPos pos, Direction direction, Ritual ritual, boolean safe) { List components = Lists.newArrayList(); ritual.gatherComponents(components::add); if (abortConstruction(world, pos, direction, safe, components)) return false; - IBlockState mrs = RegistrarBloodMagicBlocks.RITUAL_CONTROLLER.getDefaultState(); + BlockState mrs = RegistrarBloodMagicBlocks.RITUAL_CONTROLLER.getDefaultState(); world.setBlockState(pos, mrs); setRitualStones(direction, world, pos, components); return true; } - public static boolean abortConstruction(World world, BlockPos pos, EnumFacing direction, boolean safe, List components) { + public static boolean abortConstruction(World world, BlockPos pos, Direction direction, boolean safe, List components) { //TODO: can be optimized to check only for the first and last component if every ritual has those at the highest and lowest y-level respectivly. for (RitualComponent component : components) { BlockPos offset = component.getOffset(direction); @@ -146,8 +146,8 @@ public class RitualHelper { public static boolean repairRitualFromRuins(TileMasterRitualStone tile, boolean safe) { Ritual ritual = tile.getCurrentRitual(); - EnumFacing direction; - Pair pair; + Direction direction; + Pair pair; if (ritual == null) { pair = getRitualFromRuins(tile); ritual = pair.getKey(); @@ -167,27 +167,27 @@ public class RitualHelper { return true; } - public static void setRitualStones(EnumFacing direction, World world, BlockPos pos, List gatheredComponents) { + public static void setRitualStones(Direction direction, World world, BlockPos pos, List gatheredComponents) { for (RitualComponent component : gatheredComponents) { BlockPos offset = component.getOffset(direction); BlockPos newPos = pos.add(offset); int meta = component.getRuneType().ordinal(); - IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); + BlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); world.setBlockState(newPos, newState); } } - public static Pair getRitualFromRuins(TileMasterRitualStone tile) { + public static Pair getRitualFromRuins(TileMasterRitualStone tile) { BlockPos pos = tile.getPos(); World world = tile.getWorld(); Ritual possibleRitual = tile.getCurrentRitual(); - EnumFacing possibleDirection = tile.getDirection(); + Direction possibleDirection = tile.getDirection(); int highestCount = 0; if (possibleRitual == null || possibleDirection == null) for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { - for (EnumFacing direction : EnumFacing.HORIZONTALS) { + for (Direction direction : Direction.HORIZONTALS) { List components = Lists.newArrayList(); ritual.gatherComponents(components::add); int currentCount = 0; From c8996c8fba736d0cc7620a24640da1f2f752a32b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 23 Sep 2019 09:51:22 -0700 Subject: [PATCH 340/493] Sweeping changes, mainly NBT related --- .../AlchemyArrayEffectLaputa.java | 16 ++-- .../alchemyArray/AlchemyCircleRenderer.java | 2 +- .../bloodmagic/altar/BloodAltar.java | 96 +++++++++---------- .../bloodmagic/block/BlockBloodLight.java | 2 +- .../bloodmagic/block/BlockBloodTank.java | 4 +- .../WayofTime/bloodmagic/client/Sprite.java | 2 +- .../client/gui/GuiBloodMagicConfig.java | 2 +- .../client/gui/GuiItemRoutingNode.java | 2 +- .../client/hud/ElementRegistry.java | 4 +- .../bloodmagic/client/hud/GuiEditHUD.java | 10 +- .../client/hud/element/ElementDemonAura.java | 4 +- .../element/ElementDivinedInformation.java | 2 +- .../client/hud/element/ElementHolding.java | 6 +- .../client/hud/element/ElementItemStack.java | 2 +- .../client/hud/element/ElementString.java | 6 +- .../hud/element/ElementTileInformation.java | 8 +- .../bloodmagic/client/key/KeyBindings.java | 4 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 4 +- .../DualAlchemyCircleRenderer.java | 4 +- .../MobSacrificeAlchemyCircleRenderer.java | 8 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../TurretAlchemyCircleRenderer.java | 8 +- .../client/render/block/RenderAltar.java | 8 +- .../client/render/block/RenderBloodTank.java | 4 +- .../render/block/RenderDemonCrucible.java | 2 +- .../client/render/block/RenderFakeBlocks.java | 2 +- .../render/block/RenderItemRoutingNode.java | 2 +- .../render/entity/RenderEntityBloodLight.java | 2 +- .../render/entity/RenderEntityMimic.java | 6 +- .../render/entity/RenderEntitySoulSnare.java | 2 +- .../entity/layer/LayerAlchemyCircle.java | 2 +- .../compat/guideapi/entry/EntryText.java | 2 +- .../guideapi/page/PageAlchemyArray.java | 4 +- .../compat/guideapi/page/PageAltarRecipe.java | 2 +- .../page/PageTartaricForgeRecipe.java | 2 +- .../compat/waila/BloodMagicHwylaPlugin.java | 14 ++- .../provider/DataProviderAlchemyArray.java | 4 +- .../provider/DataProviderBloodAltar.java | 64 ++++++------- .../waila/provider/DataProviderBloodTank.java | 6 +- .../waila/provider/DataProviderMimic.java | 2 +- .../DataProviderRitualController.java | 16 ++-- .../waila/provider/DataProviderTeleposer.java | 2 +- .../core/data/BMWorldSavedData.java | 14 +-- .../bloodmagic/core/data/Binding.java | 14 +-- .../bloodmagic/core/data/SoulNetwork.java | 14 +-- .../bloodmagic/core/data/SoulTicket.java | 12 +-- .../bloodmagic/core/registry/OrbRegistry.java | 2 +- .../entity/mob/EntityAspectedDemonBase.java | 2 +- .../entity/mob/EntityCorruptedChicken.java | 4 +- .../entity/mob/EntityCorruptedSheep.java | 8 +- .../entity/mob/EntityDemonBase.java | 4 +- .../bloodmagic/entity/mob/EntityMimic.java | 16 ++-- .../entity/mob/EntitySentientSpecter.java | 4 +- .../entity/projectile/EntityBloodLight.java | 8 +- .../entity/projectile/EntityMeteor.java | 16 ++-- .../projectile/EntitySentientArrow.java | 8 +- .../bloodmagic/event/SoulNetworkEvent.java | 4 +- .../bloodmagic/item/ItemBloodOrb.java | 2 +- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemInscriptionTool.java | 2 +- .../bloodmagic/item/ItemLavaCrystal.java | 6 +- .../bloodmagic/item/ItemRitualDiviner.java | 8 +- .../bloodmagic/item/ItemRitualReader.java | 18 ++-- .../item/ItemTelepositionFocus.java | 10 +- .../item/alchemy/ItemCuttingFluid.java | 4 +- .../item/armour/ItemLivingArmour.java | 8 +- .../item/armour/ItemSentientArmour.java | 20 ++-- .../bloodmagic/item/block/ItemBlockMimic.java | 6 +- .../item/inventory/InventoryHolding.java | 4 +- .../item/inventory/ItemInventory.java | 8 +- .../item/routing/ItemNodeRouter.java | 6 +- .../item/sigil/ItemSigilHolding.java | 8 +- .../item/sigil/ItemSigilTeleposition.java | 8 +- .../item/sigil/ItemSigilTransposition.java | 10 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 2 +- .../item/soul/ItemSentientArmourGem.java | 2 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 18 ++-- .../bloodmagic/item/soul/ItemSentientBow.java | 12 +-- .../item/soul/ItemSentientPickaxe.java | 18 ++-- .../item/soul/ItemSentientShovel.java | 18 ++-- .../item/soul/ItemSentientSword.java | 16 ++-- .../bloodmagic/item/soul/ItemSoulGem.java | 4 +- .../soulBreath/ItemSoulBreathContainer.java | 2 +- .../bloodmagic/livingArmour/LivingArmour.java | 24 ++--- .../LivingArmourUpgradeBattleHungry.java | 4 +- .../tracker/StatTrackerArrowProtect.java | 4 +- .../tracker/StatTrackerArrowShot.java | 4 +- .../tracker/StatTrackerCriticalStrike.java | 2 +- .../tracker/StatTrackerDigging.java | 4 +- .../tracker/StatTrackerExperience.java | 2 +- .../tracker/StatTrackerFallProtect.java | 4 +- .../tracker/StatTrackerFireResist.java | 4 +- .../livingArmour/tracker/StatTrackerFood.java | 4 +- .../tracker/StatTrackerGraveDigger.java | 2 +- .../tracker/StatTrackerGrimReaperSprint.java | 4 +- .../tracker/StatTrackerHealthboost.java | 2 +- .../livingArmour/tracker/StatTrackerJump.java | 4 +- .../tracker/StatTrackerMeleeDamage.java | 2 +- .../tracker/StatTrackerMovement.java | 2 +- .../tracker/StatTrackerNightSight.java | 6 +- .../tracker/StatTrackerPhysicalProtect.java | 4 +- .../tracker/StatTrackerPoison.java | 4 +- .../tracker/StatTrackerRepairing.java | 2 +- .../tracker/StatTrackerSelfSacrifice.java | 4 +- .../tracker/StatTrackerSolarPowered.java | 2 +- .../tracker/StatTrackerSprintAttack.java | 2 +- .../tracker/StatTrackerStepAssist.java | 2 +- .../LivingArmourUpgradeFireResist.java | 4 +- .../LivingArmourUpgradeGrimReaperSprint.java | 4 +- .../LivingArmourUpgradePoisonResist.java | 4 +- .../upgrade/LivingArmourUpgradeRepairing.java | 4 +- .../LivingArmourUpgradeSolarPowered.java | 4 +- .../PlayerVelocityPacketProcessor.java | 2 +- .../bloodmagic/potion/BMPotionUtils.java | 4 +- .../bloodmagic/potion/PotionBloodMagic.java | 2 +- .../bloodmagic/proxy/ClientProxy.java | 8 +- .../bloodmagic/ritual/AreaDescriptor.java | 16 ++-- .../bloodmagic/ritual/CapabilityRuneType.java | 6 +- .../bloodmagic/ritual/EnumRuneType.java | 2 +- .../WayofTime/bloodmagic/ritual/Ritual.java | 16 ++-- .../bloodmagic/ritual/RitualRenderer.java | 2 +- .../ritual/types/RitualForsakenSoul.java | 8 +- .../types/RitualLivingArmourDowngrade.java | 4 +- .../bloodmagic/ritual/types/RitualPortal.java | 6 +- .../bloodmagic/soul/DemonWillHolder.java | 6 +- .../bloodmagic/soul/EnumDemonWillType.java | 2 +- .../bloodmagic/teleport/PortalLocation.java | 14 +-- .../bloodmagic/tile/TileAlchemyArray.java | 16 ++-- .../bloodmagic/tile/TileAlchemyTable.java | 24 ++--- .../WayofTime/bloodmagic/tile/TileAltar.java | 2 +- .../bloodmagic/tile/TileBloodTank.java | 6 +- .../bloodmagic/tile/TileDemonCrucible.java | 2 +- .../bloodmagic/tile/TileDemonCrystal.java | 10 +- .../tile/TileDemonCrystallizer.java | 2 +- .../tile/TileDimensionalPortal.java | 14 +-- .../bloodmagic/tile/TileIncenseAltar.java | 4 +- .../bloodmagic/tile/TileInventory.java | 4 +- .../bloodmagic/tile/TileInversionPillar.java | 14 +-- .../tile/TileMasterRitualStone.java | 22 ++--- .../WayofTime/bloodmagic/tile/TileMimic.java | 32 +++---- .../bloodmagic/tile/TilePhantomBlock.java | 4 +- .../tile/TilePurificationAltar.java | 6 +- .../bloodmagic/tile/TileSoulForge.java | 4 +- .../bloodmagic/tile/TileSpectralBlock.java | 10 +- .../bloodmagic/tile/TileTeleposer.java | 4 +- .../bloodmagic/tile/base/TileBase.java | 29 +++--- .../bloodmagic/tile/base/TileTicking.java | 12 +-- .../tile/routing/TileFilteredRoutingNode.java | 12 +-- .../tile/routing/TileMasterRoutingNode.java | 42 ++++---- .../tile/routing/TileRoutingNode.java | 30 +++--- .../WayofTime/bloodmagic/util/ChatUtil.java | 4 +- .../bloodmagic/util/GhostItemHelper.java | 4 +- .../util/handler/event/ClientHandler.java | 6 +- .../util/handler/event/WillHandler.java | 2 +- .../bloodmagic/util/helper/ItemHelper.java | 6 +- 157 files changed, 622 insertions(+), 623 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index ad2de048..73030287 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -113,18 +113,18 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger("radius", radius); - tag.setInteger("teleportHeightOffset", teleportHeightOffset); - tag.setInteger(Constants.NBT.X_COORD, currentPos.getX()); - tag.setInteger(Constants.NBT.Y_COORD, currentPos.getY()); - tag.setInteger(Constants.NBT.Z_COORD, currentPos.getZ()); + tag.putInt("radius", radius); + tag.putInt("teleportHeightOffset", teleportHeightOffset); + tag.putInt(Constants.NBT.X_COORD, currentPos.getX()); + tag.putInt(Constants.NBT.Y_COORD, currentPos.getY()); + tag.putInt(Constants.NBT.Z_COORD, currentPos.getZ()); } @Override public void readFromNBT(CompoundNBT tag) { - radius = tag.getInteger("radius"); - teleportHeightOffset = tag.getInteger("teleportHeightOffset"); - currentPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); + radius = tag.getInt("radius"); + teleportHeightOffset = tag.getInt("teleportHeightOffset"); + currentPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 0f24ac37..1c80f949 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -77,7 +77,7 @@ public class AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 7d13dc2e..036aea15 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -82,21 +82,21 @@ public class BloodAltar implements IFluidHandler { if (fluid != null) setMainFluid(fluid); - FluidStack fluidOut = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInteger(Constants.NBT.OUTPUT_AMOUNT)); + FluidStack fluidOut = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInt(Constants.NBT.OUTPUT_AMOUNT)); setOutputFluid(fluidOut); - FluidStack fluidIn = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInteger(Constants.NBT.INPUT_AMOUNT)); + FluidStack fluidIn = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInt(Constants.NBT.INPUT_AMOUNT)); setInputFluid(fluidIn); } - internalCounter = tagCompound.getInteger("internalCounter"); + internalCounter = tagCompound.getInt("internalCounter"); altarTier = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(AltarTier.ONE); isActive = tagCompound.getBoolean(Constants.NBT.ALTAR_ACTIVE); - liquidRequired = tagCompound.getInteger(Constants.NBT.ALTAR_LIQUID_REQ); + liquidRequired = tagCompound.getInt(Constants.NBT.ALTAR_LIQUID_REQ); canBeFilled = tagCompound.getBoolean(Constants.NBT.ALTAR_FILLABLE); isUpgraded = tagCompound.getBoolean(Constants.NBT.ALTAR_UPGRADED); - consumptionRate = tagCompound.getInteger(Constants.NBT.ALTAR_CONSUMPTION_RATE); - drainRate = tagCompound.getInteger(Constants.NBT.ALTAR_DRAIN_RATE); + consumptionRate = tagCompound.getInt(Constants.NBT.ALTAR_CONSUMPTION_RATE); + drainRate = tagCompound.getInt(Constants.NBT.ALTAR_DRAIN_RATE); consumptionMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER); efficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER); selfSacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER); @@ -104,18 +104,18 @@ public class BloodAltar implements IFluidHandler { capacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER); orbCapacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER); dislocationMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER); - capacity = tagCompound.getInteger(Constants.NBT.ALTAR_CAPACITY); - bufferCapacity = tagCompound.getInteger(Constants.NBT.ALTAR_BUFFER_CAPACITY); - progress = tagCompound.getInteger(Constants.NBT.ALTAR_PROGRESS); + capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); + bufferCapacity = tagCompound.getInt(Constants.NBT.ALTAR_BUFFER_CAPACITY); + progress = tagCompound.getInt(Constants.NBT.ALTAR_PROGRESS); isResultBlock = tagCompound.getBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK); - lockdownDuration = tagCompound.getInteger(Constants.NBT.ALTAR_LOCKDOWN_DURATION); - accelerationUpgrades = tagCompound.getInteger(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); - demonBloodDuration = tagCompound.getInteger(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); - cooldownAfterCrafting = tagCompound.getInteger(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); - chargingRate = tagCompound.getInteger(Constants.NBT.ALTAR_CHARGE_RATE); - chargingFrequency = tagCompound.getInteger(Constants.NBT.ALTAR_CHARGE_FREQUENCY); - totalCharge = tagCompound.getInteger(Constants.NBT.ALTAR_TOTAL_CHARGE); - maxCharge = tagCompound.getInteger(Constants.NBT.ALTAR_MAX_CHARGE); + lockdownDuration = tagCompound.getInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION); + accelerationUpgrades = tagCompound.getInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); + demonBloodDuration = tagCompound.getInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); + cooldownAfterCrafting = tagCompound.getInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); + chargingRate = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_RATE); + chargingFrequency = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY); + totalCharge = tagCompound.getInt(Constants.NBT.ALTAR_TOTAL_CHARGE); + maxCharge = tagCompound.getInt(Constants.NBT.ALTAR_MAX_CHARGE); currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); } @@ -124,42 +124,42 @@ public class BloodAltar implements IFluidHandler { if (fluid != null) fluid.writeToNBT(tagCompound); else - tagCompound.setString(Constants.NBT.EMPTY, ""); + tagCompound.putString(Constants.NBT.EMPTY, ""); if (fluidOutput != null) - tagCompound.setInteger(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.amount); + tagCompound.putInt(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.amount); if (fluidInput != null) - tagCompound.setInteger(Constants.NBT.INPUT_AMOUNT, fluidInput.amount); + tagCompound.putInt(Constants.NBT.INPUT_AMOUNT, fluidInput.amount); - tagCompound.setInteger("internalCounter", internalCounter); - tagCompound.setString(Constants.NBT.ALTAR_TIER, altarTier.name()); - tagCompound.setBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); - tagCompound.setInteger(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); - tagCompound.setBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); - tagCompound.setBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); - tagCompound.setInteger(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); - tagCompound.setInteger(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); - tagCompound.setFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); - tagCompound.setBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); - tagCompound.setFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); - tagCompound.setInteger(Constants.NBT.ALTAR_CAPACITY, capacity); - tagCompound.setInteger(Constants.NBT.ALTAR_PROGRESS, progress); - tagCompound.setInteger(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); - tagCompound.setInteger(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); - tagCompound.setInteger(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); - tagCompound.setInteger(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); - tagCompound.setInteger(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); - tagCompound.setInteger(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); - tagCompound.setInteger(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); - tagCompound.setInteger(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); - tagCompound.setInteger(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); - tagCompound.setString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); + tagCompound.putInt("internalCounter", internalCounter); + tagCompound.putString(Constants.NBT.ALTAR_TIER, altarTier.name()); + tagCompound.putBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); + tagCompound.putInt(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); + tagCompound.putBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); + tagCompound.putBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); + tagCompound.putInt(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); + tagCompound.putInt(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); + tagCompound.putFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); + tagCompound.putBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); + tagCompound.putFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); + tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); + tagCompound.putInt(Constants.NBT.ALTAR_PROGRESS, progress); + tagCompound.putInt(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); + tagCompound.putInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); + tagCompound.putInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); + tagCompound.putInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); + tagCompound.putInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); + tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); + tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); + tagCompound.putInt(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); + tagCompound.putInt(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); + tagCompound.putString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); } public void startCycle() { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index cfa597dc..ebc22ba0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -91,7 +91,7 @@ public class BlockBloodLight extends Block { @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (rand.nextInt(3) != 0) { world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index a3bdfd77..b289bfd8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -116,7 +116,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB if (bloodTank.getTank().getFluid() != null) { bloodTank.getTank().getFluid().writeToNBT(fluidTag); CompoundNBT dropTag = new CompoundNBT(); - dropTag.setTag("Fluid", fluidTag); + dropTag.put("Fluid", fluidTag); drop.setTagCompound(dropTag); } @@ -131,7 +131,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB TileBloodTank bloodTank = (TileBloodTank) tile; CompoundNBT tag = stack.getTagCompound(); if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("Fluid")); + FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompound("Fluid")); bloodTank.getTank().setFluid(fluidStack); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/Sprite.java b/src/main/java/WayofTime/bloodmagic/client/Sprite.java index cb92dcd1..f6e54ea6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/Sprite.java +++ b/src/main/java/WayofTime/bloodmagic/client/Sprite.java @@ -43,7 +43,7 @@ public class Sprite { } public void draw(int x, int y) { - Minecraft.getMinecraft().renderEngine.bindTexture(textureLocation); + Minecraft.getInstance().renderEngine.bindTexture(textureLocation); float f = 0.00390625F; float f1 = 0.00390625F; Tessellator tessellator = Tessellator.getInstance(); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java index b4f55629..a14c5710 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java @@ -27,7 +27,7 @@ public class GuiBloodMagicConfig extends GuiConfig { elements.addAll(ConfigElement.from(ConfigHandler.class).getChildElements()); elements.add(new ConfigElement(BloodMagic.RITUAL_MANAGER.getConfig().getCategory("rituals"))); - if (Minecraft.getMinecraft().world != null) + if (Minecraft.getInstance().world != null) elements.add(new DummyElementEditHUD(BloodMagic.NAME, "config." + BloodMagic.MODID + ".edit_hud")); return elements; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 72ffef7b..edf65f6a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -129,7 +129,7 @@ public class GuiItemRoutingNode extends ContainerScreen { super.drawScreen(mouseX, mouseY, partialTicks); this.renderHoveredToolTip(mouseX, mouseY); - Minecraft.getMinecraft().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); + Minecraft.getInstance().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); } /** diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java index 9c62ee31..642ea5e4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java @@ -114,10 +114,10 @@ public class ElementRegistry { @SubscribeEvent public static void onRenderOverlay(RenderGameOverlayEvent.Pre event) { if (event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); for (HUDElement element : HUD_ELEMENTS.values()) { - if (!element.shouldRender(Minecraft.getMinecraft())) + if (!element.shouldRender(Minecraft.getInstance())) continue; Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition(); diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java index c14d65c4..af605d69 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java @@ -47,7 +47,7 @@ public class GuiEditHUD extends Screen { drawDefaultBackground(); super.drawScreen(mouseX, mouseY, partialTicks); - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); for (HUDElement element : ElementRegistry.getElements()) { if (dragged == element) continue; @@ -87,7 +87,7 @@ public class GuiEditHUD extends Screen { @Override protected void mouseReleased(int mouseX, int mouseY, int state) { if (dragged != null) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); Point bounded = getBoundedDrag(resolution, mouseX, mouseY); float xPos = (float) ((bounded.x) / resolution.getScaledWidth_double()); float yPos = (float) ((bounded.y) / resolution.getScaledHeight_double()); @@ -105,7 +105,7 @@ public class GuiEditHUD extends Screen { protected void actionPerformed(Button button) { switch (button.id) { case 0: { - Minecraft.getMinecraft().displayGuiScreen(parent); + Minecraft.getInstance().displayGuiScreen(parent); break; } case 1: { @@ -116,12 +116,12 @@ public class GuiEditHUD extends Screen { } case 2: { ElementRegistry.save(currentOverrides); - Minecraft.getMinecraft().displayGuiScreen(parent); + Minecraft.getInstance().displayGuiScreen(parent); break; } case 3: { currentOverrides.clear(); - Minecraft.getMinecraft().displayGuiScreen(parent); + Minecraft.getInstance().displayGuiScreen(parent); break; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java index a039b541..4a75a97e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java @@ -31,7 +31,7 @@ public class ElementDemonAura extends HUDElement { @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); PlayerEntity player = minecraft.player; minecraft.getTextureManager().bindTexture(BAR_LOCATION); @@ -73,6 +73,6 @@ public class ElementDemonAura extends HUDElement { @Override public boolean shouldRender(Minecraft minecraft) { - return Utils.canPlayerSeeDemonWill(Minecraft.getMinecraft().player); + return Utils.canPlayerSeeDemonWill(Minecraft.getInstance().player); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java index 4854f312..d461e8f9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -21,7 +21,7 @@ public abstract class ElementDivinedInformation extends El @Override public boolean shouldRender(Minecraft minecraft) { - PlayerEntity player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; ItemStack sigilStack = player.getHeldItem(Hand.MAIN_HAND); boolean flag = false; if (simple) { diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java index c83e9966..bd8fefe2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java @@ -28,7 +28,7 @@ public class ElementHolding extends HUDElement { GlStateManager.color(1.0F, 1.0F, 1.0F); HOLDING_BAR.draw(drawX, drawY); - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); // Check mainhand for Sigil of Holding if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) @@ -74,12 +74,12 @@ public class ElementHolding extends HUDElement { GlStateManager.translate((float) (-(x + 8)), (float) (-(y + 12)), 0.0F); } - Minecraft.getMinecraft().getRenderItem().renderItemAndEffectIntoGUI(player, stack, x, y); + Minecraft.getInstance().getRenderItem().renderItemAndEffectIntoGUI(player, stack, x, y); if (animation > 0.0F) GlStateManager.popMatrix(); - Minecraft.getMinecraft().getRenderItem().renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, x, y); + Minecraft.getInstance().getRenderItem().renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, x, y); } } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java index 5f783e55..d7dee606 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java @@ -17,7 +17,7 @@ public class ElementItemStack extends HUDElement { @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { RenderHelper.enableGUIStandardItemLighting(); - Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(stack, drawX, drawY); + Minecraft.getInstance().getRenderItem().renderItemIntoGUI(stack, drawX, drawY); RenderHelper.disableStandardItemLighting(); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java index 419ebe25..88016c2d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java @@ -10,14 +10,14 @@ public class ElementString extends HUDElement { private ITextComponent[] display; public ElementString(ITextComponent... display) { - super(getMaxStringWidth(display), (Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 2) * display.length - 2); + super(getMaxStringWidth(display), (Minecraft.getInstance().fontRenderer.FONT_HEIGHT + 2) * display.length - 2); this.display = display; } @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; for (ITextComponent drawText : display) { fontRenderer.drawStringWithShadow(drawText.getFormattedText(), drawX, drawY, 14737632); drawY += fontRenderer.FONT_HEIGHT + 2; @@ -25,7 +25,7 @@ public class ElementString extends HUDElement { } private static int getMaxStringWidth(ITextComponent... display) { - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; int maxWidth = 0; for (ITextComponent drawText : display) if (fontRenderer.getStringWidth(drawText.getFormattedText()) > maxWidth) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java index f8092cf6..9b6f88fe 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java @@ -31,24 +31,24 @@ public abstract class ElementTileInformation extends HUDEl @SuppressWarnings("unchecked") @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - T tile = (T) Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); + T tile = (T) Minecraft.getInstance().world.getTileEntity(Minecraft.getInstance().objectMouseOver.getBlockPos()); int yOffset = 0; for (Pair> sprite : information) { sprite.getLeft().draw(drawX, drawY + yOffset); int textY = drawY + yOffset + (sprite.getLeft().getTextureHeight() / 4); - Minecraft.getMinecraft().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); + Minecraft.getInstance().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); yOffset += sprite.getLeft().getTextureHeight() + 2; } } @Override public boolean shouldRender(Minecraft minecraft) { - RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; + RayTraceResult trace = Minecraft.getInstance().objectMouseOver; if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) return false; - TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(trace.getBlockPos()); + TileEntity tile = Minecraft.getInstance().world.getTileEntity(trace.getBlockPos()); if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) return false; diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java index 8d7b86d4..583f54da 100644 --- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java +++ b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java @@ -33,7 +33,7 @@ public enum KeyBindings { @SideOnly(Side.CLIENT) @Override public void handleKeybind() { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, -1); } @@ -42,7 +42,7 @@ public enum KeyBindings { @SideOnly(Side.CLIENT) @Override public void handleKeybind() { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 057ee09d..3131c610 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -69,7 +69,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 6fc89ccb..8f487060 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -99,7 +99,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 3.0F; // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); @@ -159,7 +159,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { for (int i = 0; i < 5; i++) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(arraysResources[i]); + Minecraft.getInstance().renderEngine.bindTexture(arraysResources[i]); float newSize = 1; float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(i, craftTime); float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(i, craftTime); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index ec483fc2..44661394 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -99,7 +99,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.pushMatrix(); GlStateManager.rotate(rot, 0, 0, 1); double var31 = 0.0D; @@ -119,7 +119,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.popMatrix(); // Bind the second texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(secondaryArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(secondaryArrayResource); GlStateManager.pushMatrix(); GlStateManager.rotate(-rot, 0, 0, 1); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java index 8c84e8f1..62c3a02e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -69,7 +69,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); @@ -126,14 +126,14 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { for (int i = 1; i <= 3; i++) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource); translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i); GlStateManager.popMatrix(); } //Render the main array. GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); // GlStateManager.rotate(rot, 0, 0, 1); renderStandardCircle(tessellator, wr, 3); GlStateManager.popMatrix(); @@ -146,7 +146,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { swirlSize = 3 * (craftTime - 40) / 60; } GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(mobSacrificeSwirlResource); + Minecraft.getInstance().renderEngine.bindTexture(mobSacrificeSwirlResource); GlStateManager.translate(0, 0, 0.1); GlStateManager.rotate(rot / 3, 0, 0, 1); renderStandardCircle(tessellator, wr, swirlSize); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index 26472bb5..1e292998 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -97,7 +97,7 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.pushMatrix(); GlStateManager.rotate(rot, 0, 0, 1); double var31 = 0.0D; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index 36652fc6..80d58a79 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -58,7 +58,7 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index 0603abc8..77a72a3f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -79,7 +79,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); @@ -135,21 +135,21 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource); GlStateManager.rotate(-rot, 0, 0, 1); GlStateManager.translate(0, 0, -bottomHeightOffset); renderStandardCircle(tessellator, wr, size / 2); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(middleArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(middleArrayResource); GlStateManager.rotate(0, 0, 0, 1); GlStateManager.translate(0, 0, -middleHeightOffset); renderStandardCircle(tessellator, wr, size); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.rotate(rot, 0, 0, 1); GlStateManager.translate(0, 0, -topHeightOffset); renderStandardCircle(tessellator, wr, size); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 5b8d2cc4..6a094932 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -54,11 +54,11 @@ public class RenderAltar extends TileEntityRenderer { float size = 0.8f; - TextureAtlasSprite fluidStillSprite = Minecraft.getMinecraft().getTextureMapBlocks().getTextureExtry(fluid.getStill().toString()); + TextureAtlasSprite fluidStillSprite = Minecraft.getInstance().getTextureMapBlocks().getTextureExtry(fluid.getStill().toString()); int fluidColor = fluid.getColor(fluidStack); - Minecraft.getMinecraft().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); setGLColorFromInt(fluidColor); double uMin = (double) fluidStillSprite.getMinU(); @@ -78,7 +78,7 @@ public class RenderAltar extends TileEntityRenderer { } private void renderItem(ItemStack stack) { - ItemRenderer itemRenderer = Minecraft.getMinecraft().getRenderItem(); + ItemRenderer itemRenderer = Minecraft.getInstance().getRenderItem(); if (!stack.isEmpty()) { GlStateManager.translate(0.5, 1, 0.5); GlStateManager.pushMatrix(); @@ -100,7 +100,7 @@ public class RenderAltar extends TileEntityRenderer { } private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; World world = player.world; if (tier == AltarTier.ONE) diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java index 5dd1e340..1c384246 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java @@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderBloodTank extends TileEntityRenderer { - private static final Minecraft mc = Minecraft.getMinecraft(); + private static final Minecraft mc = Minecraft.getInstance(); @Override public void render(TileBloodTank bloodTank, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { @@ -49,7 +49,7 @@ public class RenderBloodTank extends TileEntityRenderer { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); - TextureAtlasSprite fluid = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString()); + TextureAtlasSprite fluid = Minecraft.getInstance().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString()); fluid = fluid == null ? mc.getTextureMapBlocks().getMissingSprite() : fluid; buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java index a7fceec7..c69a2053 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class RenderDemonCrucible extends TileEntityRenderer { - public static Minecraft mc = Minecraft.getMinecraft(); + public static Minecraft mc = Minecraft.getInstance(); public static ResourceLocation resource = new ResourceLocation("bloodmagic", "textures/blocks/lifeEssenceStill.png"); public static float minHeight = 0.6497f; public static float maxHeight = 0.79f; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java index 62516e8f..331fc733 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java @@ -18,7 +18,7 @@ public class RenderFakeBlocks { double maxZ = minZ + 1; Tessellator tessellator = Tessellator.getInstance(); BufferBuilder wr = tessellator.getBuffer(); - Minecraft.getMinecraft().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index 6f16f809..9fa0fccb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -20,7 +20,7 @@ import java.util.List; public class RenderItemRoutingNode extends TileEntityRenderer { private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png"); - private static final Minecraft mc = Minecraft.getMinecraft(); + private static final Minecraft mc = Minecraft.getInstance(); @Override public void render(TileRoutingNode tileNode, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 45214ac1..8a6c56f2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.util.ResourceLocation; public class RenderEntityBloodLight extends EntityRenderer { - private final ItemRenderer renderItem = Minecraft.getMinecraft().getRenderItem(); + private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem(); public RenderEntityBloodLight(EntityRendererManager renderManagerIn) { super(renderManagerIn); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java index 6cde4204..9ef06886 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderEntityMimic extends MobRenderer { private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png"); - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); public RenderEntityMimic(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelMimic(), 1.0F); @@ -49,7 +49,7 @@ public class RenderEntityMimic extends MobRenderer { ItemStack itemstack = mimic.getMimicItemStack(); Item item = itemstack.getItem(); - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); GlStateManager.pushMatrix(); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); @@ -70,7 +70,7 @@ public class RenderEntityMimic extends MobRenderer { if (!StringUtils.isNullOrEmpty(s)) { gameprofile = SkullTileEntity.updateGameProfile(new GameProfile(null, s)); - nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile)); + nbttagcompound.putTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java index 106ec48e..783d68d4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public class RenderEntitySoulSnare extends EntityRenderer { - private final ItemRenderer renderItem = Minecraft.getMinecraft().getRenderItem(); + private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem(); public RenderEntitySoulSnare(EntityRendererManager renderManagerIn) { super(renderManagerIn); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java index 5e5da140..d818f024 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java @@ -37,7 +37,7 @@ public class LayerAlchemyCircle implements Layer float size = 3.0F; // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(ARRAY_TEXTURE); + Minecraft.getInstance().renderEngine.bindTexture(ARRAY_TEXTURE); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java index 577e4f85..9ce5c229 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java @@ -28,7 +28,7 @@ public class EntryText extends EntryResourceLocation { @Override @SideOnly(Side.CLIENT) public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - Minecraft.getMinecraft().getTextureManager().bindTexture(image); + Minecraft.getInstance().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F); boolean startFlag = fontRendererObj.getUnicodeFlag(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java index caa0df9a..b3325e86 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java @@ -51,13 +51,13 @@ public class PageAlchemyArray extends Page { int x = guiLeft + 65; int y = guiTop + 30; - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/alchemyArrayCrafting.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/alchemyArrayCrafting.png")); guiBase.drawTexturedModalRect(x, y, 0, 0, 62, 88 + (outputStack.isEmpty() ? 0 : 26)); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.alchemyArray"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); for (ResourceLocation arrayResource : arrayResources) { - Minecraft.getMinecraft().getTextureManager().bindTexture(arrayResource); + Minecraft.getInstance().getTextureManager().bindTexture(arrayResource); GlStateManager.pushMatrix(); GlStateManager.translate(x + 2, y + 28, 0); GlStateManager.scale(scale, scale, scale); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 2d661567..a2327e95 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -37,7 +37,7 @@ public class PageAltarRecipe extends Page { @Override @SideOnly(Side.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.bloodAltar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index 64302417..7b3dad2b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -44,7 +44,7 @@ public class PageTartaricForgeRecipe extends Page { @Override @SideOnly(Side.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/soulForge.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/soulForge.png")); guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.soulForge"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index 46e16f45..3366cd65 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -4,18 +4,22 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.waila.provider.*; import WayofTime.bloodmagic.tile.*; +import mcp.mobius.waila.api.IRegistrar; import mcp.mobius.waila.api.IWailaPlugin; -import mcp.mobius.waila.api.IWailaRegistrar; +import mcp.mobius.waila.api.TooltipPosition; import mcp.mobius.waila.api.WailaPlugin; +import net.minecraft.util.ResourceLocation; @WailaPlugin public class BloodMagicHwylaPlugin implements IWailaPlugin { + public static final ResourceLocation CONFIG_SHOW_ALTAR_STATS = new ResourceLocation(BloodMagic.MODID, "show_altar_stats"); + @Override - public void register(IWailaRegistrar registrar) { - registrar.registerBodyProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); - registrar.registerNBTProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true); + public void register(IRegistrar registrar) { + registrar.registerComponentProvider(DataProviderBloodAltar.INSTANCE, TooltipPosition.BODY, TileAltar.class); + registrar.registerBlockDataProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); + registrar.addConfig(CONFIG_SHOW_ALTAR_STATS, true); registrar.registerBodyProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); registrar.registerNBTProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index 95109a73..31471c74 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -48,9 +48,9 @@ public class DataProviderAlchemyArray implements IWailaDataProvider { public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileAlchemyArray alchemyArray = (TileAlchemyArray) te; if (!alchemyArray.getStackInSlot(0).isEmpty()) - tag.setString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); + tag.putString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); if (!alchemyArray.getStackInSlot(1).isEmpty()) - tag.setString("catalyst", alchemyArray.getStackInSlot(1).getDisplayName()); + tag.putString("catalyst", alchemyArray.getStackInSlot(1).getDisplayName()); return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index d144fb3f..95169561 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -1,23 +1,23 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.compat.waila.BloodMagicHwylaPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IComponentProvider; +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; +import mcp.mobius.waila.api.IServerDataProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; -import javax.annotation.Nonnull; import java.util.List; /** @@ -25,35 +25,31 @@ import java.util.List; * href="https://github.com/tterrag1098">tterrag1098. Originally implemented * in ImLookingAtBlood by Pokefenn. */ -public class DataProviderBloodAltar implements IWailaDataProvider { +public class DataProviderBloodAltar implements IComponentProvider, IServerDataProvider { - public static final IWailaDataProvider INSTANCE = new DataProviderBloodAltar(); + public static final DataProviderBloodAltar INSTANCE = new DataProviderBloodAltar(); - @Nonnull @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) - return currenttip; + public void appendBody(List tooltip, IDataAccessor accessor, IPluginConfig config) { + if (!config.get(BloodMagicHwylaPlugin.CONFIG_SHOW_ALTAR_STATS)) + return; - if (accessor.getNBTData().hasKey("altar")) { - CompoundNBT altarData = accessor.getNBTData().getCompoundTag("altar"); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInteger("tier"))); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInteger("capacity"))); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInteger("stored"))); + if (accessor.getServerData().contains("altar")) { + CompoundNBT altarData = accessor.getServerData().getCompound("altar"); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInt("tier"))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInt("capacity"))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInt("stored"))); - if (altarData.hasKey("charge")) { - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", altarData.getInteger("progress") + "%")); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentCharge", altarData.getInteger("charge"))); + if (altarData.contains("charge")) { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", altarData.getInt("progress") + "%")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentCharge", altarData.getInt("charge"))); } } - - return currenttip; } - @Nonnull @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - TileAltar altar = (TileAltar) te; + public void appendServerData(CompoundNBT tag, ServerPlayerEntity player, World world, TileEntity tileEntity) { + TileAltar altar = (TileAltar) tileEntity; boolean hasSigil = false; boolean hasSeer = false; @@ -76,20 +72,18 @@ public class DataProviderBloodAltar implements IWailaDataProvider { } if (!hasSeer && !hasSigil) - return tag; + return; CompoundNBT altarData = new CompoundNBT(); - altarData.setInteger("tier", altar.getTier().toInt()); - altarData.setInteger("capacity", altar.getCapacity()); - altarData.setInteger("stored", altar.getCurrentBlood()); + altarData.putInt("tier", altar.getTier().toInt()); + altarData.putInt("capacity", altar.getCapacity()); + altarData.putInt("stored", altar.getCurrentBlood()); if (hasSeer) { - altarData.setInteger("progress", (int) (((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100) / altar.getStackInSlot(0).getCount())); - altarData.setInteger("charge", altar.getTotalCharge()); + altarData.putInt("progress", (int) (((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100) / altar.getStackInSlot(0).getCount())); + altarData.putInt("charge", altar.getTotalCharge()); } - tag.setTag("altar", altarData); - - return tag; + tag.put("altar", altarData); } public static boolean hasStack(ItemStack stack, PlayerEntity player) { diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index ed35e77b..6083ae52 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -42,10 +42,10 @@ public class DataProviderBloodTank implements IWailaDataProvider { @Override public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileBloodTank tank = (TileBloodTank) te; - tag.setInteger("tier", tank.getBlockMetadata() + 1); - tag.setInteger("capacity", tank.capacity); + tag.putInt("tier", tank.getBlockMetadata() + 1); + tag.putInt("capacity", tank.capacity); if (tank.getTank().getFluid() != null) - tag.setTag("fluid", tank.getTank().getFluid().writeToNBT(new CompoundNBT())); + tag.put("fluid", tank.getTank().getFluid().writeToNBT(new CompoundNBT())); return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java index 43d11f75..551fb29f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java @@ -50,7 +50,7 @@ public class DataProviderMimic implements IWailaDataProvider { if (shareTag != null) item.setTag("nbt", shareTag); - tag.setTag("mimiced", item); + tag.put("mimiced", item); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 4cf4ca0b..5d6bad56 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -57,21 +57,21 @@ public class DataProviderRitualController implements IWailaDataProvider { if (te instanceof TileMasterRitualStone) { TileMasterRitualStone mrs = (TileMasterRitualStone) te; - tag.setBoolean("master", true); + tag.putBoolean("master", true); if (mrs.getCurrentRitual() != null) { - tag.setString("ritual", mrs.getCurrentRitual().getTranslationKey()); - tag.setBoolean("active", mrs.isActive()); + tag.putString("ritual", mrs.getCurrentRitual().getTranslationKey()); + tag.putBoolean("active", mrs.isActive()); if (mrs.getOwner() != null) - tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); - tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(mrs.getCurrentRitual()), false)); + tag.putString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); + tag.putBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(mrs.getCurrentRitual()), false)); } } else { - tag.setBoolean("master", false); + tag.putBoolean("master", false); ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); if (ritual != null) { - tag.setString("ritual", ritual.getTranslationKey()); - tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); + tag.putString("ritual", ritual.getTranslationKey()); + tag.putBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index d30b65d4..03b9611b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -51,7 +51,7 @@ public class DataProviderTeleposer implements IWailaDataProvider { CompoundNBT focusData = new CompoundNBT(); focusData.setTag("pos", NBTUtil.createPosTag(focus.getBlockPos(contained))); focusData.setInteger("dim", contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); - tag.setTag("focus", focusData); + tag.put("focus", focusData); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index c7de2d48..135aaabd 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -34,11 +34,11 @@ public class BMWorldSavedData extends WorldSavedData { } @Override - public void readFromNBT(CompoundNBT tagCompound) { - ListNBT networkData = tagCompound.getTagList("networkData", 10); + public void read(CompoundNBT tagCompound) { + ListNBT networkData = tagCompound.getList("networkData", 10); - for (int i = 0; i < networkData.tagCount(); i++) { - CompoundNBT data = networkData.getCompoundTagAt(i); + for (int i = 0; i < networkData.size(); i++) { + CompoundNBT data = networkData.getCompound(i); SoulNetwork network = SoulNetwork.fromNBT(data); network.setParent(this); soulNetworks.put(network.getPlayerId(), network); @@ -46,12 +46,12 @@ public class BMWorldSavedData extends WorldSavedData { } @Override - public CompoundNBT writeToNBT(CompoundNBT tagCompound) { + public CompoundNBT write(CompoundNBT tagCompound) { ListNBT networkData = new ListNBT(); for (SoulNetwork soulNetwork : soulNetworks.values()) - networkData.appendTag(soulNetwork.serializeNBT()); + networkData.add(soulNetwork.serializeNBT()); - tagCompound.setTag("networkData", networkData); + tagCompound.put("networkData", networkData); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index 4d107cef..3c2e9ed1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.core.data; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBT; import net.minecraft.nbt.NBTUtil; import net.minecraftforge.common.util.INBTSerializable; @@ -26,14 +26,14 @@ public class Binding implements INBTSerializable { @Override public CompoundNBT serializeNBT() { CompoundNBT tag = new CompoundNBT(); - tag.setTag("id", NBTUtil.createUUIDTag(uuid)); - tag.setString("name", name); + tag.put("id", NBTUtil.writeUniqueId(uuid)); + tag.putString("name", name); return tag; } @Override public void deserializeNBT(CompoundNBT nbt) { - this.uuid = NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")); + this.uuid = NBTUtil.readUniqueId(nbt.getCompound("id")); this.name = nbt.getString("name"); } @@ -57,11 +57,11 @@ public class Binding implements INBTSerializable { @Nullable public static Binding fromStack(ItemStack stack) { - if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. + if (!stack.hasTag()) // Definitely hasn't been bound yet. return null; - NBTBase bindingTag = stack.getTagCompound().getTag("binding"); - if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. + INBT bindingTag = stack.getTag().get("binding"); + if (bindingTag == null || bindingTag.getId() != 10) // Make sure it's both a tag compound and that it has actual data. return null; Binding binding = new Binding(); diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index e4eacb8f..30ec5dea 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -150,13 +150,13 @@ public class SoulNetwork implements INBTSerializable { public void hurtPlayer(PlayerEntity user, float syphon) { if (user != null) { if (syphon < 100 && syphon > 0) { - if (!user.capabilities.isCreativeMode) { + if (!user.isCreative()) { user.hurtResistantTime = 0; user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); } } else if (syphon >= 100) { - if (!user.capabilities.isCreativeMode) { + if (!user.isCreative()) { for (int i = 0; i < ((syphon + 99) / 100); i++) { user.hurtResistantTime = 0; user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); @@ -228,17 +228,17 @@ public class SoulNetwork implements INBTSerializable { @Override public CompoundNBT serializeNBT() { CompoundNBT tagCompound = new CompoundNBT(); - tagCompound.setString("playerId", getPlayerId().toString()); - tagCompound.setInteger("currentEssence", getCurrentEssence()); - tagCompound.setInteger("orbTier", getOrbTier()); + tagCompound.putString("playerId", getPlayerId().toString()); + tagCompound.putInt("currentEssence", getCurrentEssence()); + tagCompound.putInt("orbTier", getOrbTier()); return tagCompound; } @Override public void deserializeNBT(CompoundNBT nbt) { this.playerId = UUID.fromString(nbt.getString("playerId")); - this.currentEssence = nbt.getInteger("currentEssence"); - this.orbTier = nbt.getInteger("orbTier"); + this.currentEssence = nbt.getInt("currentEssence"); + this.orbTier = nbt.getInt("orbTier"); } public static SoulNetwork fromNBT(CompoundNBT tagCompound) { diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java index 5c04038b..412048d9 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.core.data; -import net.minecraft.command.ICommandSender; +import net.minecraft.command.ICommandSource; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -40,21 +40,21 @@ public class SoulTicket { * @return A description in the format block|dimensionID|pos */ public static SoulTicket block(World world, BlockPos pos, int amount) { - return new SoulTicket(new StringTextComponent("block|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + return new SoulTicket(new StringTextComponent("block|" + world.dimension.getDimension() + "|" + pos.toLong()), amount); } /** * @return A description in the format item|item registry name|dimensionID|entityName|entityPos */ public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + entity.getPersistentID()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.dimension.getDimension() + "|" + entity.getCachedUniqueIdString()), amount); } /** * @return A description in the format item|item registry name|dimensionID|pos */ public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.dimension.getDimension() + "|" + pos.toLong()), amount); } /** @@ -64,8 +64,8 @@ public class SoulTicket { return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName()), amount); } - public static SoulTicket command(ICommandSender sender, String command, int amount) { - return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.getName()), amount); + public static SoulTicket command(ICommandSource sender, String command, int amount) { + return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.toString()), amount); } // TODO maybe make it check the amount?? diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 497d90fc..189ab880 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -51,7 +51,7 @@ public class OrbRegistry { public static ItemStack getOrbStack(BloodOrb orb) { ItemStack ret = new ItemStack(ORB_ITEM); CompoundNBT tag = new CompoundNBT(); - tag.setString("orb", orb.getRegistryName().toString()); + tag.putString("orb", orb.getRegistryName().toString()); ret.setTagCompound(tag); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index d47c1e68..4200cf0d 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -185,7 +185,7 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setString(Constants.NBT.WILL_TYPE, this.getType().toString()); + tag.putString(Constants.NBT.WILL_TYPE, this.getType().toString()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index 1ea7e265..417d62d5 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -176,14 +176,14 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { super.readEntityFromNBT(compound); if (compound.hasKey("EggLayTime")) { - this.timeUntilNextEgg = compound.getInteger("EggLayTime"); + this.timeUntilNextEgg = compound.getInt("EggLayTime"); } } @Override public void writeEntityToNBT(CompoundNBT compound) { super.writeEntityToNBT(compound); - compound.setInteger("EggLayTime", this.timeUntilNextEgg); + compound.putInt("EggLayTime", this.timeUntilNextEgg); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index 621b1a63..5e4acc3b 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -214,9 +214,9 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh @Override public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setBoolean("Sheared", this.getSheared()); - tag.setByte("Color", (byte) this.getFleeceColor().getMetadata()); - tag.setInteger("protection", this.protectionCooldown); + tag.putBoolean("Sheared", this.getSheared()); + tag.putByte("Color", (byte) this.getFleeceColor().getMetadata()); + tag.putInt("protection", this.protectionCooldown); } @Override @@ -224,7 +224,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh super.readEntityFromNBT(tag); this.setSheared(tag.getBoolean("Sheared")); this.setFleeceColor(DyeColor.byMetadata(tag.getByte("Color"))); - this.protectionCooldown = tag.getInteger("protection"); + this.protectionCooldown = tag.getInt("protection"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java index 5f0d0245..c43c7b98 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java @@ -164,9 +164,9 @@ public class EntityDemonBase extends CreatureEntity implements IEntityOwnable { super.writeEntityToNBT(tag); if (this.getOwnerId() == null) { - tag.setString("OwnerUUID", ""); + tag.putString("OwnerUUID", ""); } else { - tag.setString("OwnerUUID", this.getOwnerId().toString()); + tag.putString("OwnerUUID", this.getOwnerId().toString()); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java index 41361017..40ca056f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java @@ -66,11 +66,11 @@ public class EntityMimic extends EntityDemonBase { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.setTag("tileTag", tileTag); - tag.setInteger("metaOfReplacedBlock", metaOfReplacedBlock); - tag.setInteger("playerCheckRadius", playerCheckRadius); - tag.setString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); + tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); + tag.put("tileTag", tileTag); + tag.putInt("metaOfReplacedBlock", metaOfReplacedBlock); + tag.putInt("playerCheckRadius", playerCheckRadius); + tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); } @Override @@ -78,9 +78,9 @@ public class EntityMimic extends EntityDemonBase { super.readEntityFromNBT(tag); dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompoundTag("tileTag"); - metaOfReplacedBlock = tag.getInteger("metaOfReplacedBlock"); - playerCheckRadius = tag.getInteger("playerCheckRadius"); + tileTag = tag.getCompound("tileTag"); + metaOfReplacedBlock = tag.getInt("metaOfReplacedBlock"); + playerCheckRadius = tag.getInt("playerCheckRadius"); stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 6ec43ae9..f2b2f999 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -358,9 +358,9 @@ public class EntitySentientSpecter extends EntityDemonBase { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - tag.setBoolean("sentientArmour", wasGivenSentientArmour); + tag.putBoolean("sentientArmour", wasGivenSentientArmour); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index 1ed0d6ef..bb8b8cab 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -142,15 +142,15 @@ public class EntityBloodLight extends ThrowableEntity implements IThrowableEntit @Override public void writeEntityToNBT(CompoundNBT nbt) { super.writeEntityToNBT(nbt); - nbt.setInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); - nbt.setInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); + nbt.putInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); + nbt.putInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); } @Override public void readEntityFromNBT(CompoundNBT nbt) { super.readEntityFromNBT(nbt); - ticksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR); - maxTicksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); + ticksInAir = nbt.getInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR); + maxTicksInAir = nbt.getInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index 7fd8ae60..5a73d56e 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -88,22 +88,22 @@ public class EntityMeteor extends ThrowableEntity implements IThrowableEntity { @Override public void writeEntityToNBT(CompoundNBT nbt) { super.writeEntityToNBT(nbt); - nbt.setInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); - nbt.setInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); - nbt.setDouble("radiusModifier", radiusModifier); - nbt.setDouble("explosionModifier", explosionModifier); - nbt.setDouble("fillerChance", fillerChance); + nbt.putInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); + nbt.putInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); + nbt.putDouble("radiusModifier", radiusModifier); + nbt.putDouble("explosionModifier", explosionModifier); + nbt.putDouble("fillerChance", fillerChance); if (!meteorStack.isEmpty()) meteorStack.writeToNBT(nbt); else - nbt.setBoolean("noItem", true); + nbt.putBoolean("noItem", true); } @Override public void readEntityFromNBT(CompoundNBT nbt) { super.readEntityFromNBT(nbt); - ticksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR); - maxTicksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); + ticksInAir = nbt.getInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR); + maxTicksInAir = nbt.getInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); radiusModifier = nbt.getDouble("radiusModifier"); explosionModifier = nbt.getDouble("explosionModifier"); fillerChance = nbt.getDouble("fillerChance"); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index 6fc72e52..baf6538f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -260,9 +260,9 @@ public class EntitySentientArrow extends ArrowEntity { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setDouble("reimbursement", reimbursedAmountOnHit); - tag.setInteger("currentLevel", currentLevel); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putDouble("reimbursement", reimbursedAmountOnHit); + tag.putInt("currentLevel", currentLevel); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -271,7 +271,7 @@ public class EntitySentientArrow extends ArrowEntity { reimbursedAmountOnHit = tag.getDouble("reimbursement"); type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - currentLevel = tag.getInteger("currentLevel"); + currentLevel = tag.getInt("currentLevel"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index 0aae8212..2f27c0d0 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; public class SoulNetworkEvent extends Event { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index a343b514..7b15599a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -46,7 +46,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { for (BloodOrb orb : RegistrarBloodMagic.BLOOD_ORBS) { ItemStack orbStack = new ItemStack(this); CompoundNBT tag = new CompoundNBT(); - tag.setString("orb", orb.getRegistryName().toString()); + tag.putString("orb", orb.getRegistryName().toString()); orbStack.setTagCompound(tag); list.add(orbStack); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 3ca9e276..426c4679 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -124,7 +124,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("experience", exp); + tag.putDouble("experience", exp); } public static double getStoredExperience(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 26f900c8..fda68ca5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -47,7 +47,7 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); CompoundNBT tag = new CompoundNBT(); - tag.setInteger(Constants.NBT.USES, 10); + tag.putInt(Constants.NBT.USES, 10); stack.setTagCompound(tag); list.add(stack); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 78ebbe37..78ad52d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -16,7 +16,7 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; @@ -74,12 +74,12 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags return null; - NBTBase bindingTag = stack.getTagCompound().getTag("binding"); + INBT bindingTag = stack.getTagCompound().getTag("binding"); if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. return null; CompoundNBT nbt = (CompoundNBT) bindingTag; - return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); + return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompound("id")), nbt.getString("name")); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 6f2e534a..bb914f7e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -375,7 +375,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); } public Direction getDirection(ItemStack stack) { @@ -386,12 +386,12 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - int dir = tag.getInteger(Constants.NBT.DIRECTION); + int dir = tag.getInt(Constants.NBT.DIRECTION); if (dir == 0) { return Direction.NORTH; } - return Direction.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; + return Direction.VALUES[tag.getInt(Constants.NBT.DIRECTION)]; } /** @@ -464,7 +464,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setString("current_ritual", key); + tag.putString("current_ritual", key); } public String getCurrentRitual(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index ae919cb9..9888fad3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -204,9 +204,9 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { stack = NBTHelper.checkNBT(stack); CompoundNBT itemTag = stack.getTagCompound(); - itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); + itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); return stack; } @@ -218,9 +218,9 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemStack setMasterBlockPos(ItemStack stack, BlockPos pos) { stack = NBTHelper.checkNBT(stack); CompoundNBT itemTag = stack.getTagCompound(); - itemTag.setInteger(Constants.NBT.X_COORD + "master", pos.getX()); - itemTag.setInteger(Constants.NBT.Y_COORD + "master", pos.getY()); - itemTag.setInteger(Constants.NBT.Z_COORD + "master", pos.getZ()); + itemTag.putInt(Constants.NBT.X_COORD + "master", pos.getX()); + itemTag.putInt(Constants.NBT.Y_COORD + "master", pos.getY()); + itemTag.putInt(Constants.NBT.Z_COORD + "master", pos.getZ()); return stack; } @@ -237,7 +237,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setString("range", range); + tag.putString("range", range); } public void cycleReader(ItemStack stack, PlayerEntity player) { @@ -259,7 +259,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setInteger(Constants.NBT.RITUAL_READER, state.ordinal()); + tag.putInt(Constants.NBT.RITUAL_READER, state.ordinal()); } public EnumRitualReaderState getState(ItemStack stack) { @@ -270,7 +270,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - return EnumRitualReaderState.values()[tag.getInteger(Constants.NBT.RITUAL_READER)]; + return EnumRitualReaderState.values()[tag.getInt(Constants.NBT.RITUAL_READER)]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 4f45001a..0bf4a0b3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -64,7 +64,7 @@ public class ItemTelepositionFocus extends ItemEnum.Variant enchantmentMap = EnchantmentHelper.getEnchantments(previousArmour); EnchantmentHelper.setEnchantments(enchantmentMap, newArmour); } @@ -349,7 +349,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes return null; } - CompoundNBT tag = omegaTag.getCompoundTag("armour"); + CompoundNBT tag = omegaTag.getCompound("armour"); return new ItemStack(tag); } @@ -380,7 +380,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } public void setAbilitiesOfArmour(EnumDemonWillType type, double willValue, ItemStack armourStack) { @@ -468,7 +468,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getKnockbackResistance(ItemStack stack) { @@ -483,7 +483,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("knockback", kb); + tag.putDouble("knockback", kb); } public double getSpeedBoost(ItemStack stack) { @@ -498,7 +498,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("speed", speed); + tag.putDouble("speed", speed); } public double getDamageBoost(ItemStack stack) { @@ -513,7 +513,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("damage", damage); + tag.putDouble("damage", damage); } public double getAttackSpeedBoost(ItemStack stack) { @@ -528,7 +528,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("attackSpeed", attackSpeed); + tag.putDouble("attackSpeed", attackSpeed); } public static void revertAllArmour(PlayerEntity player) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java index 242e2974..c3ef8980 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java @@ -59,9 +59,9 @@ public class ItemBlockMimic extends ItemBlockEnum { CompoundNBT tileTag = getTagFromTileEntity(tileReplaced); if (tileReplaced != null) { CompoundNBT voidTag = new CompoundNBT(); - voidTag.setInteger("x", pos.getX()); - voidTag.setInteger("y", pos.getY()); - voidTag.setInteger("z", pos.getZ()); + voidTag.putInt("x", pos.getX()); + voidTag.putInt("y", pos.getY()); + voidTag.putInt("z", pos.getZ()); tileReplaced.readFromNBT(voidTag); } diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java index a6eb1973..56c517c7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java @@ -49,8 +49,8 @@ public class InventoryHolding extends ItemInventory { nbtTagCompound = new CompoundNBT(); UUID uuid = UUID.randomUUID(); - nbtTagCompound.setLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); - nbtTagCompound.setLong(Constants.NBT.LEAST_SIG, uuid.getLeastSignificantBits()); + nbtTagCompound.putLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); + nbtTagCompound.putLong(Constants.NBT.LEAST_SIG, uuid.getLeastSignificantBits()); } writeToNBT(nbtTagCompound); diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java index 329f5aea..93c07286 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java @@ -49,7 +49,7 @@ public class ItemInventory implements IInventory { for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompound(i); byte j = data.getByte(Constants.NBT.SLOT); if (j >= 0 && j < inventory.size()) { @@ -71,14 +71,14 @@ public class ItemInventory implements IInventory { } } - tagCompound.setTag(Constants.NBT.ITEMS, tags); + tagCompound.putTag(Constants.NBT.ITEMS, tags); } public void readFromStack(ItemStack masterStack) { if (masterStack != null) { NBTHelper.checkNBT(masterStack); CompoundNBT tag = masterStack.getTagCompound(); - readFromNBT(tag.getCompoundTag(Constants.NBT.ITEM_INVENTORY)); + readFromNBT(tag.getCompound(Constants.NBT.ITEM_INVENTORY)); } } @@ -88,7 +88,7 @@ public class ItemInventory implements IInventory { CompoundNBT tag = masterStack.getTagCompound(); CompoundNBT invTag = new CompoundNBT(); writeToNBT(invTag); - tag.setTag(Constants.NBT.ITEM_INVENTORY, invTag); + tag.put(Constants.NBT.ITEM_INVENTORY, invTag); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 6665b7fd..4d475a5f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -187,9 +187,9 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { NBTHelper.checkNBT(stack); CompoundNBT itemTag = stack.getTagCompound(); - itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); + itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); return stack; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 18a8c3a8..425e9ee6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -140,14 +140,14 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl for (int i = 0; i < inventorySize; i++) { if (!inventory.get(i).isEmpty()) { CompoundNBT tag = new CompoundNBT(); - tag.setByte(Constants.NBT.SLOT, (byte) i); + tag.putByte(Constants.NBT.SLOT, (byte) i); inventory.get(i).writeToNBT(tag); itemList.appendTag(tag); } } - inventoryTag.setTag(Constants.NBT.ITEMS, itemList); - itemTag.setTag(Constants.NBT.ITEM_INVENTORY, inventoryTag); + inventoryTag.put(Constants.NBT.ITEMS, itemList); + itemTag.put(Constants.NBT.ITEM_INVENTORY, inventoryTag); } @Override @@ -248,7 +248,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } CompoundNBT inventoryTag = tagCompound.getCompoundTag(Constants.NBT.ITEM_INVENTORY); - ListNBT tagList = inventoryTag.getTagList(Constants.NBT.ITEMS, 10); + ListNBT tagList = inventoryTag.getList(Constants.NBT.ITEMS, 10); if (tagList.isEmpty()) { return NonNullList.withSize(inventorySize, ItemStack.EMPTY); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 4303d3fd..3950db3b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -117,7 +117,7 @@ public class ItemSigilTeleposition extends ItemSigilBase { else tagCompound = stack.getTagCompound(); - tagCompound.setTag("tplocation", location.serializeNBT()); + tagCompound.putTag("tplocation", location.serializeNBT()); } public static class TeleportLocation implements INBTSerializable { @@ -140,14 +140,14 @@ public class ItemSigilTeleposition extends ItemSigilBase { @Override public CompoundNBT serializeNBT() { CompoundNBT tag = new CompoundNBT(); - tag.setInteger("dim", dim); - tag.setLong("pos", pos.toLong()); + tag.putInt("dim", dim); + tag.putLong("pos", pos.toLong()); return tag; } @Override public void deserializeNBT(CompoundNBT nbt) { - this.dim = nbt.getInteger("dim"); + this.dim = nbt.getInt("dim"); this.pos = BlockPos.fromLong(nbt.getLong("pos")); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index a2dc3b3d..fa898cb9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -39,7 +39,7 @@ public class ItemSigilTransposition extends ItemSigilBase { if (tag.hasKey("stored")) { tooltip.add(" "); - tooltip.add(tag.getCompoundTag("stored").getString("display")); + tooltip.add(tag.getCompound("stored").getString("display")); } } @@ -51,7 +51,7 @@ public class ItemSigilTransposition extends ItemSigilBase { CompoundNBT tag = stack.getTagCompound(); if (tag.hasKey("stored")) - return super.getItemStackDisplayName(stack) + " (" + tag.getCompoundTag("stored").getString("display") + ")"; + return super.getItemStackDisplayName(stack) + " (" + tag.getCompound("stored").getString("display") + ")"; return super.getItemStackDisplayName(stack); } @@ -96,8 +96,8 @@ public class ItemSigilTransposition extends ItemSigilBase { } else if (stack.hasTagCompound() && stack.getTagCompound().hasKey("stored")) { BlockState worldState = world.getBlockState(blockPos); CompoundNBT storedTag = stack.getTagCompound().getCompoundTag("stored"); - BlockState storedState = NBTUtil.readBlockState(storedTag.getCompoundTag("state")); - CompoundNBT tileData = storedTag.hasKey("tileData") ? storedTag.getCompoundTag("tileData") : null; + BlockState storedState = NBTUtil.readBlockState(storedTag.getCompound("state")); + CompoundNBT tileData = storedTag.hasKey("tileData") ? storedTag.getCompound("tileData") : null; if (!worldState.getBlock().isReplaceable(world, blockPos)) blockPos = blockPos.offset(side); @@ -133,7 +133,7 @@ public class ItemSigilTransposition extends ItemSigilBase { return super.getNBTShareTag(stack); CompoundNBT shareTag = stack.getTagCompound().copy(); - CompoundNBT storedTag = shareTag.getCompoundTag("stored"); + CompoundNBT storedTag = shareTag.getCompound("stored"); storedTag.removeTag("state"); storedTag.removeTag("stored"); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index c96bda23..3445bbe1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -63,7 +63,7 @@ public class ItemMonsterSoul extends ItemEnum.Variant soulStack.setItemDamage(type.ordinal()); - tag.setDouble(Constants.NBT.SOULS, souls); + tag.putDouble(Constants.NBT.SOULS, souls); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index a7c64efa..2406975f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -61,7 +61,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { public ItemMeshDefinition getMeshDefinition() { return stack -> { boolean flag = false; - NonNullList armourInventory = Minecraft.getMinecraft().player.inventory.armorInventory; + NonNullList armourInventory = Minecraft.getInstance().player.inventory.armorInventory; for (ItemStack armourStack : armourInventory) { if (armourStack != null && armourStack.getItem() instanceof ItemSentientArmour) { flag = true; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index f6ca9758..5fcc00bb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -232,7 +232,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -349,7 +349,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -364,7 +364,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -379,7 +379,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -394,7 +394,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -409,7 +409,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -424,7 +424,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -439,7 +439,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } public double getDigSpeedOfSword(ItemStack stack) { @@ -454,7 +454,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 9516da29..d23b0a96 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -164,7 +164,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("damage", damage); + tag.putDouble("damage", damage); } public double getDamageAdded(ItemStack stack) { @@ -180,7 +180,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setFloat("velocity", velocity); + tag.putFloat("velocity", velocity); } public float getVelocityOfArrow(ItemStack stack) { @@ -200,7 +200,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } public double getDrainOfActivatedBow(ItemStack stack) { @@ -215,7 +215,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedBow(ItemStack stack) { @@ -230,7 +230,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedBow(ItemStack stack) { @@ -245,7 +245,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index a2714804..a1556a5b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -232,7 +232,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -348,7 +348,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -363,7 +363,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -378,7 +378,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -393,7 +393,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -408,7 +408,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -423,7 +423,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -438,7 +438,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } public double getDigSpeedOfSword(ItemStack stack) { @@ -453,7 +453,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 5bb7104f..d04beea9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -232,7 +232,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -349,7 +349,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -364,7 +364,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -379,7 +379,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -394,7 +394,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -409,7 +409,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -424,7 +424,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -439,7 +439,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } public double getDigSpeedOfSword(ItemStack stack) { @@ -454,7 +454,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index befbfd10..4953ba3b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -214,7 +214,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -330,7 +330,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -345,7 +345,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -360,7 +360,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -375,7 +375,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -390,7 +390,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -405,7 +405,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -420,7 +420,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index 2df52e4f..9cec0e42 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -176,7 +176,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I CompoundNBT tag = soulGemStack.getTagCompound(); - tag.setDouble(Constants.NBT.SOULS, souls); + tag.putDouble(Constants.NBT.SOULS, souls); } @Override @@ -244,7 +244,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I return; } - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java index de5180bf..47743536 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java @@ -18,7 +18,7 @@ public abstract class ItemSoulBreathContainer extends Item implements ISoulBreat public void setBreath(ItemStack stack, double amount) { CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.BREATH, amount); + tag.putDouble(Constants.NBT.BREATH, amount); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 8144dbfd..ac8474d6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -212,15 +212,15 @@ public class LivingArmour implements ILivingArmour { @Override public void readFromNBT(CompoundNBT tag) { - maxUpgradePoints = Math.max(100, tag.getInteger("maxUpgradePoints")); + maxUpgradePoints = Math.max(100, tag.getInt("maxUpgradePoints")); - ListNBT upgradeTags = tag.getTagList("upgrades", 10); + ListNBT upgradeTags = tag.getList("upgrades", 10); if (upgradeTags != null) { for (int i = 0; i < upgradeTags.tagCount(); i++) { - CompoundNBT upgradeTag = upgradeTags.getCompoundTagAt(i); + CompoundNBT upgradeTag = upgradeTags.getCompound(i); String key = upgradeTag.getString("key"); - int level = upgradeTag.getInteger("level"); - CompoundNBT nbtTag = upgradeTag.getCompoundTag("upgrade"); + int level = upgradeTag.getInt("level"); + CompoundNBT nbtTag = upgradeTag.getCompound("upgrade"); LivingArmourUpgrade upgrade = LivingArmourHandler.generateUpgradeFromKey(key, level, nbtTag); if (upgrade != null) { upgradeMap.put(key, upgrade); @@ -238,7 +238,7 @@ public class LivingArmour implements ILivingArmour { } StatTracker tracker = (StatTracker) obj; String key = tracker.getUniqueIdentifier(); - CompoundNBT trackerTag = tag.getCompoundTag(key); + CompoundNBT trackerTag = tag.getCompound(key); if (!trackerTag.isEmpty()) { tracker.readFromNBT(trackerTag); } @@ -251,7 +251,7 @@ public class LivingArmour implements ILivingArmour { @Override public void writeToNBT(CompoundNBT tag, boolean forceWrite) { - tag.setInteger("maxUpgradePoints", maxUpgradePoints); + tag.putInt("maxUpgradePoints", maxUpgradePoints); ListNBT tags = new ListNBT(); @@ -262,14 +262,14 @@ public class LivingArmour implements ILivingArmour { CompoundNBT nbtTag = new CompoundNBT(); upgrade.writeToNBT(nbtTag); - upgradeTag.setString("key", upgrade.getUniqueIdentifier()); - upgradeTag.setInteger("level", upgrade.getUpgradeLevel()); - upgradeTag.setTag("upgrade", nbtTag); + upgradeTag.putString("key", upgrade.getUniqueIdentifier()); + upgradeTag.putInt("level", upgrade.getUpgradeLevel()); + upgradeTag.put("upgrade", nbtTag); tags.appendTag(upgradeTag); } - tag.setTag("upgrades", tags); + tag.put("upgrades", tags); for (Entry entry : trackerMap.entrySet()) { StatTracker tracker = entry.getValue(); @@ -284,7 +284,7 @@ public class LivingArmour implements ILivingArmour { CompoundNBT trackerTag = new CompoundNBT(); tracker.writeToNBT(trackerTag); - tag.setTag(key, trackerTag); + tag.put(key, trackerTag); tracker.resetDirty(); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index 37c20df3..868b5b27 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -51,12 +51,12 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger("timer", timer); + tag.putInt("timer", timer); } @Override public void readFromNBT(CompoundNBT tag) { - timer = tag.getInteger("timer"); + timer = tag.getInt("timer"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index 65f9706f..66aa6b7d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -31,12 +31,12 @@ public class StatTrackerArrowProtect extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.arrowProtect"); + totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.arrowProtect"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage); + tag.putInt(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 1b9550f5..fb9c3932 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -31,12 +31,12 @@ public class StatTrackerArrowShot extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalShots = tag.getInteger(BloodMagic.MODID + ".tracker.trickShot"); + totalShots = tag.getInt(BloodMagic.MODID + ".tracker.trickShot"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.trickShot", totalShots); + tag.putInt(BloodMagic.MODID + ".tracker.trickShot", totalShots); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index 9096e539..2d5f2e23 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -36,7 +36,7 @@ public class StatTrackerCriticalStrike extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 9b407907..fe324590 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -31,12 +31,12 @@ public class StatTrackerDigging extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalBlocksDug = tag.getInteger(BloodMagic.MODID + ".tracker.digging"); + totalBlocksDug = tag.getInt(BloodMagic.MODID + ".tracker.digging"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.digging", totalBlocksDug); + tag.putInt(BloodMagic.MODID + ".tracker.digging", totalBlocksDug); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 09f2c95e..6e334002 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -36,7 +36,7 @@ public class StatTrackerExperience extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained); + tag.putDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index 481a91f0..f40aaad7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -31,12 +31,12 @@ public class StatTrackerFallProtect extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.fallProtect"); + totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.fallProtect"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.fallProtect", totalDamage); + tag.putInt(BloodMagic.MODID + ".tracker.fallProtect", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index fcbcd93c..becc5329 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -29,12 +29,12 @@ public class StatTrackerFireResist extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalFireTicks = tag.getInteger(BloodMagic.MODID + ".tracker.fire"); + totalFireTicks = tag.getInt(BloodMagic.MODID + ".tracker.fire"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.fire", totalFireTicks); + tag.putInt(BloodMagic.MODID + ".tracker.fire", totalFireTicks); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index 757de371..06a2bd42 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -34,12 +34,12 @@ public class StatTrackerFood extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - foodEaten = tag.getInteger(BloodMagic.MODID + ".tracker.foodEaten"); + foodEaten = tag.getInt(BloodMagic.MODID + ".tracker.foodEaten"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.foodEaten", foodEaten); + tag.putInt(BloodMagic.MODID + ".tracker.foodEaten", foodEaten); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index 0797ba9c..465d68a2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -36,7 +36,7 @@ public class StatTrackerGraveDigger extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 9b2e087b..9fb78303 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -32,12 +32,12 @@ public class StatTrackerGrimReaperSprint extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDeaths = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper"); + totalDeaths = tag.getInt(BloodMagic.MODID + ".tracker.grimReaper"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths); + tag.putInt(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index 56aa43c5..04efda5f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -36,7 +36,7 @@ public class StatTrackerHealthboost extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned); + tag.putDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index cd9ac778..155c8b70 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -32,12 +32,12 @@ public class StatTrackerJump extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalJumps = tag.getInteger(BloodMagic.MODID + ".tracker.jump"); + totalJumps = tag.getInt(BloodMagic.MODID + ".tracker.jump"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.jump", totalJumps); + tag.putInt(BloodMagic.MODID + ".tracker.jump", totalJumps); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 82b7ece1..54aafd31 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -36,7 +36,7 @@ public class StatTrackerMeleeDamage extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 0b68e699..ab355dbd 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -40,7 +40,7 @@ public class StatTrackerMovement extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.movement", totalMovement); + tag.putDouble(BloodMagic.MODID + ".tracker.movement", totalMovement); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 12791b42..85978584 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -36,13 +36,13 @@ public class StatTrackerNightSight extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.nightSight"); - totalNightVision = tag.getInteger(BloodMagic.MODID + ".tracker.nightSightVision"); + totalNightVision = tag.getInt(BloodMagic.MODID + ".tracker.nightSightVision"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt); - tag.setInteger(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision); + tag.putDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt); + tag.putInt(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index e60c6788..2cf5da7d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -31,12 +31,12 @@ public class StatTrackerPhysicalProtect extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.physicalProtect"); + totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.physicalProtect"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage); + tag.putInt(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 94c394d6..56d4b125 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -30,12 +30,12 @@ public class StatTrackerPoison extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalPoisonTicks = tag.getInteger(BloodMagic.MODID + ".tracker.poison"); + totalPoisonTicks = tag.getInt(BloodMagic.MODID + ".tracker.poison"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks); + tag.putInt(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index 981f349f..4ab0bb17 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -36,7 +36,7 @@ public class StatTrackerRepairing extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.repair", totalDamage); + tag.putDouble(BloodMagic.MODID + ".tracker.repair", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index d62f2f47..06712f6c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -32,12 +32,12 @@ public class StatTrackerSelfSacrifice extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalSacrifices = tag.getInteger(BloodMagic.MODID + ".tracker.selfSacrifice"); + totalSacrifices = tag.getInt(BloodMagic.MODID + ".tracker.selfSacrifice"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices); + tag.putInt(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 87be975d..6e738b1a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -36,7 +36,7 @@ public class StatTrackerSolarPowered extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned); + tag.putDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index ae828d2e..3ab852ed 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -36,7 +36,7 @@ public class StatTrackerSprintAttack extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 657edb74..5a55d555 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -39,7 +39,7 @@ public class StatTrackerStepAssist extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement); + tag.putDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index 827bc8c8..ec34a3cc 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -54,12 +54,12 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(Constants.NBT.UPGRADE_FIRE_TIMER, fireCooldown); + tag.putInt(Constants.NBT.UPGRADE_FIRE_TIMER, fireCooldown); } @Override public void readFromNBT(CompoundNBT tag) { - fireCooldown = tag.getInteger(Constants.NBT.UPGRADE_FIRE_TIMER); + fireCooldown = tag.getInt(Constants.NBT.UPGRADE_FIRE_TIMER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 6e198169..ffea15d0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -50,12 +50,12 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { @Override public void readFromNBT(CompoundNBT tag) { - deathTimer = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper"); + deathTimer = tag.getInt(BloodMagic.MODID + ".tracker.grimReaper"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", deathTimer); + tag.putInt(BloodMagic.MODID + ".tracker.grimReaper", deathTimer); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index 23620d2a..87e2d273 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -55,12 +55,12 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(Constants.NBT.UPGRADE_POISON_TIMER, poisonCooldown); + tag.putInt(Constants.NBT.UPGRADE_POISON_TIMER, poisonCooldown); } @Override public void readFromNBT(CompoundNBT tag) { - poisonCooldown = tag.getInteger(Constants.NBT.UPGRADE_POISON_TIMER); + poisonCooldown = tag.getInt(Constants.NBT.UPGRADE_POISON_TIMER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 71e0f1ff..36b8ad84 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -58,12 +58,12 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger("repairingDelay", delay); + tag.putInt("repairingDelay", delay); } @Override public void readFromNBT(CompoundNBT tag) { - delay = tag.getInteger("repairingDelay"); + delay = tag.getInt("repairingDelay"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 810a9673..81be945d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -64,12 +64,12 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.solarPowered", counter); + tag.putInt(BloodMagic.MODID + ".tracker.solarPowered", counter); } @Override public void readFromNBT(CompoundNBT tag) { - counter = tag.getInteger(BloodMagic.MODID + ".tracker.solarPowered"); + counter = tag.getInt(BloodMagic.MODID + ".tracker.solarPowered"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java index 5b5d1595..324c4d0f 100644 --- a/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java @@ -51,7 +51,7 @@ public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler< @SideOnly(Side.CLIENT) public void onMessageFromServer() { - PlayerEntity player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; player.motionX = motionX; player.motionY = motionY; player.motionZ = motionZ; diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 0c97612e..be6b60bf 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -88,7 +88,7 @@ public class BMPotionUtils { NBTHelper.checkNBT(flaskStack); CompoundNBT tag = flaskStack.getTagCompound(); - tag.setDouble(Constants.NBT.POTION_AUGMENT_LENGHT + potion.getName(), value); + tag.putDouble(Constants.NBT.POTION_AUGMENT_LENGHT + potion.getName(), value); } public static int getAugmentedLength(int originalLength, double lengthAugment, double powerAugment) { @@ -113,7 +113,7 @@ public class BMPotionUtils { nbttaglist.appendTag(potioneffect.writeCustomPotionEffectToNBT(new CompoundNBT())); } - nbttagcompound.setTag("CustomPotionEffects", nbttaglist); + nbttagcompound.putTag("CustomPotionEffects", nbttaglist); stack.setTagCompound(nbttagcompound); return stack; } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java index 4aa8bb2c..cc29bc82 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java @@ -49,7 +49,7 @@ public class PotionBloodMagic extends Effect { @Override @SideOnly(Side.CLIENT) public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); + Minecraft.getInstance().renderEngine.bindTexture(texture); return super.getStatusIconIndex(); } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 31c3d98e..4cd83fb9 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -87,7 +87,7 @@ public class ClientProxy extends CommonProxy { @Override public void init() { super.init(); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { try { if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) @@ -98,7 +98,7 @@ public class ClientProxy extends CommonProxy { } return -1; }, RegistrarBloodMagicItems.SIGIL_HOLDING); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { if (tintIndex != 0 && tintIndex != 2) return -1; @@ -108,7 +108,7 @@ public class ClientProxy extends CommonProxy { return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack)); }, RegistrarBloodMagicItems.POTION_FLASK); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { // if (tintIndex != 0 && tintIndex != 2) // return -1; @@ -127,7 +127,7 @@ public class ClientProxy extends CommonProxy { } private void addElytraLayer() { - EntityRendererManager renderManager = Minecraft.getMinecraft().getRenderManager(); + EntityRendererManager renderManager = Minecraft.getInstance().getRenderManager(); try { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(EntityRendererManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java index cba24d19..a4117e2f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java @@ -206,18 +206,18 @@ public abstract class AreaDescriptor implements Iterator { @Override public void readFromNBT(CompoundNBT tag) { - minimumOffset = new BlockPos(tag.getInteger(Constants.NBT.X_COORD + "min"), tag.getInteger(Constants.NBT.Y_COORD + "min"), tag.getInteger(Constants.NBT.Z_COORD + "min")); - maximumOffset = new BlockPos(tag.getInteger(Constants.NBT.X_COORD + "max"), tag.getInteger(Constants.NBT.Y_COORD + "max"), tag.getInteger(Constants.NBT.Z_COORD + "max")); + minimumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "min"), tag.getInt(Constants.NBT.Y_COORD + "min"), tag.getInt(Constants.NBT.Z_COORD + "min")); + maximumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "max"), tag.getInt(Constants.NBT.Y_COORD + "max"), tag.getInt(Constants.NBT.Z_COORD + "max")); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(Constants.NBT.X_COORD + "min", minimumOffset.getX()); - tag.setInteger(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); - tag.setInteger(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); - tag.setInteger(Constants.NBT.X_COORD + "max", maximumOffset.getX()); - tag.setInteger(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); - tag.setInteger(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); + tag.putInt(Constants.NBT.X_COORD + "min", minimumOffset.getX()); + tag.putInt(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); + tag.putInt(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); + tag.putInt(Constants.NBT.X_COORD + "max", maximumOffset.getX()); + tag.putInt(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); + tag.putInt(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java index cebfc676..1b47776e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import net.minecraft.nbt.ByteNBT; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBT; import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; @@ -10,12 +10,12 @@ import java.util.concurrent.Callable; public final class CapabilityRuneType { public static class RuneTypeStorage implements Capability.IStorage { @Override - public NBTBase writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) { + public INBT writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) { return new ByteNBT((byte) instance.getRuneType().ordinal()); } @Override - public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, NBTBase nbt) { + public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, INBT nbt) { instance.setRuneType(EnumRuneType.byMetadata(((ByteNBT) nbt).getByte())); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java index eb0734d6..585c1e33 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java @@ -48,7 +48,7 @@ public enum EnumRuneType implements IStringSerializable, ISubItem { public ItemStack getStack(int count) { ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); CompoundNBT tag = new CompoundNBT(); - tag.setInteger(Constants.NBT.USES, 10); + tag.putInt(Constants.NBT.USES, 10); ret.setTagCompound(tag); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 26d7f834..f4a1f8d4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -50,16 +50,16 @@ public abstract class Ritual { } public void readFromNBT(CompoundNBT tag) { - ListNBT tags = tag.getTagList("areas", 10); + ListNBT tags = tag.getList("areas", 10); if (tags.isEmpty()) { return; } - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT newTag = tags.getCompoundTagAt(i); + for (int i = 0; i < tags.size(); i++) { + CompoundNBT newTag = tags.getCompound(i); String rangeKey = newTag.getString("key"); - CompoundNBT storedTag = newTag.getCompoundTag("area"); + CompoundNBT storedTag = newTag.getCompound("area"); AreaDescriptor desc = this.getBlockRange(rangeKey); if (desc != null) { desc.readFromNBT(storedTag); @@ -72,17 +72,17 @@ public abstract class Ritual { for (Entry entry : modableRangeMap.entrySet()) { CompoundNBT newTag = new CompoundNBT(); - newTag.setString("key", entry.getKey()); + newTag.putString("key", entry.getKey()); CompoundNBT storedTag = new CompoundNBT(); entry.getValue().writeToNBT(storedTag); - newTag.setTag("area", storedTag); + newTag.put("area", storedTag); - tags.appendTag(newTag); + tags.add(newTag); } - tag.setTag("areas", tags); + tag.put("areas", tags); } /** diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java index a5df2590..2cd14840 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java @@ -7,6 +7,6 @@ public abstract class RitualRenderer { public abstract void renderAt(IMasterRitualStone masterRitualStone, double x, double y, double z); protected void bindTexture(ResourceLocation resourceLocation) { - Minecraft.getMinecraft().getTextureManager().bindTexture(resourceLocation); + Minecraft.getInstance().getTextureManager().bindTexture(resourceLocation); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index a77b9506..30dbc856 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -52,7 +52,7 @@ public class RitualForsakenSoul extends Ritual { for (int i = 0; i < MAX_UNIQUENESS; i++) { String key = "uniq" + i; if (tag.hasKey(key)) { - keyList.add(tag.getInteger(key)); + keyList.add(tag.getInt(key)); } } } @@ -61,12 +61,12 @@ public class RitualForsakenSoul extends Ritual { public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); - tag.setDouble("willBuffer", willBuffer); - tag.setDouble("crystalBuffer", crystalBuffer); + tag.putDouble("willBuffer", willBuffer); + tag.putDouble("crystalBuffer", crystalBuffer); for (int i = 0; i < Math.min(MAX_UNIQUENESS, keyList.size()); i++) { String key = "uniq" + i; - tag.setInteger(key, keyList.get(i)); + tag.putInt(key, keyList.get(i)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index dcf2d4d7..4fa5220c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -128,14 +128,14 @@ public class RitualLivingArmourDowngrade extends Ritual { public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); - this.internalTimer = tag.getInteger("internalTimer"); + this.internalTimer = tag.getInt("internalTimer"); } @Override public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); - tag.setInteger("internalTimer", internalTimer); + tag.putInt("internalTimer", internalTimer); } public ItemStack getStackFromItemFrame(World world, BlockPos masterPos, Direction direction) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java index c64a1713..1a85c233 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java @@ -88,7 +88,7 @@ public class RitualPortal extends Ritual { } if (LocationsHandler.getLocationsHandler().addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimension()))) { - portalRitualTag.setString(PORTAL_ID_TAG, name); + portalRitualTag.putString(PORTAL_ID_TAG, name); return true; } } @@ -210,14 +210,14 @@ public class RitualPortal extends Ritual { public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); - portalRitualTag = tag.getCompoundTag(PORTAL_NBT_TAG); + portalRitualTag = tag.getCompound(PORTAL_NBT_TAG); } @Override public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); - tag.setTag(PORTAL_NBT_TAG, portalRitualTag); + tag.put(PORTAL_NBT_TAG, portalRitualTag); } public BlockState getBlockState(World world, int x, int y, int z) { diff --git a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java index 84c06e33..884431b0 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java @@ -54,7 +54,7 @@ public class DemonWillHolder { } public void readFromNBT(CompoundNBT tag, String key) { - CompoundNBT willTag = tag.getCompoundTag(key); + CompoundNBT willTag = tag.getCompound(key); willMap.clear(); @@ -69,10 +69,10 @@ public class DemonWillHolder { public void writeToNBT(CompoundNBT tag, String key) { CompoundNBT willTag = new CompoundNBT(); for (Entry entry : willMap.entrySet()) { - willTag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); + willTag.putDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); } - tag.setTag(key, willTag); + tag.put(key, willTag); } public void clearWill() { diff --git a/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java index 8854afb6..86f5898f 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java @@ -41,6 +41,6 @@ public enum EnumDemonWillType implements IStringSerializable, ISubItem { @Nonnull @Override public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count, ordinal()); + return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count); } } diff --git a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java index 37460c8f..91e41cac 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java @@ -26,11 +26,11 @@ public class PortalLocation implements Serializable { public CompoundNBT writeToNBT(CompoundNBT tag) { CompoundNBT locationTag = new CompoundNBT(); - locationTag.setInteger(Constants.NBT.X_COORD, x); - locationTag.setInteger(Constants.NBT.Y_COORD, y); - locationTag.setInteger(Constants.NBT.Z_COORD, z); - locationTag.setInteger(Constants.NBT.DIMENSION_ID, dimension); - tag.setTag(Constants.NBT.PORTAL_LOCATION, locationTag); + locationTag.putInt(Constants.NBT.X_COORD, x); + locationTag.putInt(Constants.NBT.Y_COORD, y); + locationTag.putInt(Constants.NBT.Z_COORD, z); + locationTag.putInt(Constants.NBT.DIMENSION_ID, dimension); + tag.put(Constants.NBT.PORTAL_LOCATION, locationTag); return tag; } @@ -82,8 +82,8 @@ public class PortalLocation implements Serializable { public static PortalLocation readFromNBT(CompoundNBT tag) { if (tag.hasKey(Constants.NBT.PORTAL_LOCATION)) { - CompoundNBT locationTag = tag.getCompoundTag(Constants.NBT.PORTAL_LOCATION); - return new PortalLocation(locationTag.getInteger(Constants.NBT.X_COORD), locationTag.getInteger(Constants.NBT.Y_COORD), locationTag.getInteger(Constants.NBT.Z_COORD), locationTag.getInteger(Constants.NBT.DIMENSION_ID)); + CompoundNBT locationTag = tag.getCompound(Constants.NBT.PORTAL_LOCATION); + return new PortalLocation(locationTag.getInt(Constants.NBT.X_COORD), locationTag.getInt(Constants.NBT.Y_COORD), locationTag.getInt(Constants.NBT.Z_COORD), locationTag.getInt(Constants.NBT.DIMENSION_ID)); } return null; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 8f753ecf..b4d528b1 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -41,7 +41,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); this.isActive = tagCompound.getBoolean("isActive"); - this.activeCounter = tagCompound.getInteger("activeCounter"); + this.activeCounter = tagCompound.getInt("activeCounter"); this.key = tagCompound.getString("key"); if (!tagCompound.hasKey("doDropIngredients")) //Check if the array is old { @@ -49,7 +49,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } else { this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); } - this.rotation = Direction.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; + this.rotation = Direction.HORIZONTALS[tagCompound.getInt(Constants.NBT.DIRECTION)]; CompoundNBT arrayTag = tagCompound.getCompoundTag("arrayTag"); arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); @@ -61,17 +61,17 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche @Override public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); - tagCompound.setBoolean("isActive", isActive); - tagCompound.setInteger("activeCounter", activeCounter); - tagCompound.setString("key", "".equals(key) ? "empty" : key); - tagCompound.setBoolean("doDropIngredients", doDropIngredients); - tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); + tagCompound.putBoolean("isActive", isActive); + tagCompound.putInt("activeCounter", activeCounter); + tagCompound.putString("key", "".equals(key) ? "empty" : key); + tagCompound.putBoolean("doDropIngredients", doDropIngredients); + tagCompound.putInt(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); CompoundNBT arrayTag = new CompoundNBT(); if (arrayEffect != null) { arrayEffect.writeToNBT(arrayTag); } - tagCompound.setTag("arrayTag", arrayTag); + tagCompound.putTag("arrayTag", arrayTag); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 9b9aec1a..fb5a286c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -73,11 +73,11 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); - direction = Direction.byIndex(tag.getInteger(Constants.NBT.DIRECTION)); - connectedPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); + direction = Direction.byIndex(tag.getInt(Constants.NBT.DIRECTION)); + connectedPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); - burnTime = tag.getInteger("burnTime"); - ticksRequired = tag.getInteger("ticksRequired"); + burnTime = tag.getInt("burnTime"); + ticksRequired = tag.getInt("ticksRequired"); byte[] array = tag.getByteArray("blockedSlots"); for (int i = 0; i < array.length; i++) @@ -88,20 +88,20 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setBoolean("isSlave", isSlave); - tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); - tag.setInteger(Constants.NBT.X_COORD, connectedPos.getX()); - tag.setInteger(Constants.NBT.Y_COORD, connectedPos.getY()); - tag.setInteger(Constants.NBT.Z_COORD, connectedPos.getZ()); + tag.putBoolean("isSlave", isSlave); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putInt(Constants.NBT.X_COORD, connectedPos.getX()); + tag.putInt(Constants.NBT.Y_COORD, connectedPos.getY()); + tag.putInt(Constants.NBT.Z_COORD, connectedPos.getZ()); - tag.setInteger("burnTime", burnTime); - tag.setInteger("ticksRequired", ticksRequired); + tag.putInt("burnTime", burnTime); + tag.putInt("ticksRequired", ticksRequired); byte[] blockedSlotArray = new byte[blockedSlots.length]; for (int i = 0; i < blockedSlots.length; i++) blockedSlotArray[i] = (byte) (blockedSlots[i] ? 1 : 0); - tag.setByteArray("blockedSlots", blockedSlotArray); + tag.putByteArray("blockedSlots", blockedSlotArray); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 35dc8cdf..eb8eb4be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -37,7 +37,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { CompoundNBT altarTag = new CompoundNBT(); this.bloodAltar.writeToNBT(altarTag); - tagCompound.setTag("bloodAltar", altarTag); + tagCompound.putTag("bloodAltar", altarTag); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 8a7cfe0d..a1ccbbeb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -28,7 +28,7 @@ public class TileBloodTank extends TileBase { public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); tank.readFromNBT(tagCompound.getCompoundTag(Constants.NBT.TANK)); - capacity = tagCompound.getInteger(Constants.NBT.ALTAR_CAPACITY); + capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); tank.setCapacity(capacity); } @@ -36,8 +36,8 @@ public class TileBloodTank extends TileBase { public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); if (tank.getFluidAmount() != 0) - tagCompound.setTag(Constants.NBT.TANK, tank.writeToNBT(new CompoundNBT())); - tagCompound.setInteger(Constants.NBT.ALTAR_CAPACITY, capacity); + tagCompound.putTag(Constants.NBT.TANK, tank.writeToNBT(new CompoundNBT())); + tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 6f4ba7f7..92c8721b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -107,7 +107,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo super.serialize(tag); for (Entry entry : willMap.entrySet()) { - tag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); + tag.putDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 125d3557..22037b11 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -147,17 +147,17 @@ public class TileDemonCrystal extends TileTicking { @Override public void deserialize(CompoundNBT tag) { holder.readFromNBT(tag, "Will"); - crystalCount = tag.getInteger("crystalCount"); - placement = Direction.byIndex(tag.getInteger("placement")); + crystalCount = tag.getInt("crystalCount"); + placement = Direction.byIndex(tag.getInt("placement")); progressToNextCrystal = tag.getDouble("progress"); } @Override public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); - tag.setInteger("crystalCount", crystalCount); - tag.setInteger("placement", placement.getIndex()); - tag.setDouble("progress", progressToNextCrystal); + tag.putInt("crystalCount", crystalCount); + tag.putInt("placement", placement.getIndex()); + tag.putDouble("progress", progressToNextCrystal); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index fe9137c4..00e80f0b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -73,7 +73,7 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond @Override public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); - tag.setDouble("internalCounter", internalCounter); + tag.putDouble("internalCounter", internalCounter); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index afabdfe7..f450095d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -15,17 +15,17 @@ public class TileDimensionalPortal extends TileBase { public void deserialize(CompoundNBT tagCompound) { portalID = tagCompound.getString(RitualPortal.PORTAL_ID_TAG); - masterStoneX = tagCompound.getInteger("masterStoneX"); - masterStoneY = tagCompound.getInteger("masterStoneY"); - masterStoneZ = tagCompound.getInteger("masterStoneZ"); + masterStoneX = tagCompound.getInt("masterStoneX"); + masterStoneY = tagCompound.getInt("masterStoneY"); + masterStoneZ = tagCompound.getInt("masterStoneZ"); } public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.setString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID); + tagCompound.putString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID); - tagCompound.setInteger("masterStoneX", masterStoneX); - tagCompound.setInteger("masterStoneY", masterStoneY); - tagCompound.setInteger("masterStoneZ", masterStoneZ); + tagCompound.putInt("masterStoneX", masterStoneX); + tagCompound.putInt("masterStoneY", masterStoneY); + tagCompound.putInt("masterStoneZ", masterStoneZ); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 1f645991..6a417023 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -70,8 +70,8 @@ public class TileIncenseAltar extends TileInventory implements ITickable { @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setDouble("tranquility", tranquility); - tag.setDouble("incenseAddition", incenseAddition); + tag.putDouble("tranquility", tranquility); + tag.putDouble("incenseAddition", incenseAddition); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index 5d6607f0..dc3ae9da 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -57,7 +57,7 @@ public class TileInventory extends TileBase implements IInventory { for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompound(i); byte j = data.getByte("Slot"); if (j >= 0 && j < inventory.size()) { @@ -81,7 +81,7 @@ public class TileInventory extends TileBase implements IInventory { } } - tagCompound.setTag("Items", tags); + tagCompound.putTag("Items", tags); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 41ee1d2f..491a7cb6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -203,8 +203,8 @@ public class TileInversionPillar extends TileTicking { type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); currentInversion = tag.getDouble("currentInversion"); - currentInfectionRadius = tag.getInteger("currentInfectionRadius"); - consecutiveFailedChecks = tag.getInteger("consecutiveFailedChecks"); + currentInfectionRadius = tag.getInt("currentInfectionRadius"); + consecutiveFailedChecks = tag.getInt("consecutiveFailedChecks"); animationOffsetValue = tag.getFloat("animationOffset"); animationOffset.setValue(animationOffsetValue); @@ -214,11 +214,11 @@ public class TileInversionPillar extends TileTicking { public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); - tag.setDouble("currentInversion", currentInversion); - tag.setInteger("currentInfectionRadius", currentInfectionRadius); - tag.setInteger("consecutiveFailedChecks", consecutiveFailedChecks); - tag.setFloat("animationOffset", animationOffsetValue); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putDouble("currentInversion", currentInversion); + tag.putInt("currentInfectionRadius", currentInfectionRadius); + tag.putInt("consecutiveFailedChecks", consecutiveFailedChecks); + tag.putFloat("animationOffset", animationOffsetValue); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index ac7531db..ce5a84c0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -79,14 +79,14 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS cachedNetwork = NetworkHelper.getSoulNetwork(owner); currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { - CompoundNBT ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); + CompoundNBT ritualTag = tag.getCompound(Constants.NBT.CURRENT_RITUAL_TAG); if (!ritualTag.isEmpty()) { currentRitual.readFromNBT(ritualTag); } } active = tag.getBoolean(Constants.NBT.IS_RUNNING); - activeTime = tag.getInteger(Constants.NBT.RUNTIME); - direction = Direction.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; + activeTime = tag.getInt(Constants.NBT.RUNTIME); + direction = Direction.VALUES[tag.getInt(Constants.NBT.DIRECTION)]; redstoned = tag.getBoolean(Constants.NBT.IS_REDSTONED); for (EnumDemonWillType type : EnumDemonWillType.values()) { @@ -100,20 +100,20 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public CompoundNBT serialize(CompoundNBT tag) { String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); if (owner != null) - tag.setUniqueId("owner", owner); - tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); + tag.putUniqueId("owner", owner); + tag.putString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); if (currentRitual != null) { CompoundNBT ritualTag = new CompoundNBT(); currentRitual.writeToNBT(ritualTag); - tag.setTag(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); + tag.put(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); } - tag.setBoolean(Constants.NBT.IS_RUNNING, isActive()); - tag.setInteger(Constants.NBT.RUNTIME, getActiveTime()); - tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); - tag.setBoolean(Constants.NBT.IS_REDSTONED, redstoned); + tag.putBoolean(Constants.NBT.IS_RUNNING, isActive()); + tag.putInt(Constants.NBT.RUNTIME, getActiveTime()); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putBoolean(Constants.NBT.IS_REDSTONED, redstoned); for (EnumDemonWillType type : currentActiveWillConfig) { - tag.setBoolean("EnumWill" + type, true); + tag.putBoolean("EnumWill" + type, true); } return tag; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java index 88829e15..6e5fd68a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java @@ -256,24 +256,24 @@ public class TileMimic extends TileInventory implements ITickable { super.deserialize(tag); dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompoundTag("tileTag"); + tileTag = tag.getCompound("tileTag"); stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, stateOfReplacedBlock); - playerCheckRadius = tag.getInteger("playerCheckRadius"); - potionSpawnRadius = tag.getInteger("potionSpawnRadius"); - potionSpawnInterval = Math.max(1, tag.getInteger("potionSpawnInterval")); + playerCheckRadius = tag.getInt("playerCheckRadius"); + potionSpawnRadius = tag.getInt("potionSpawnRadius"); + potionSpawnInterval = Math.max(1, tag.getInt("potionSpawnInterval")); } @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.setTag("tileTag", tileTag); - tag.setInteger("playerCheckRadius", playerCheckRadius); - tag.setInteger("potionSpawnRadius", potionSpawnRadius); - tag.setInteger("potionSpawnInterval", potionSpawnInterval); - tag.setString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); + tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); + tag.put("tileTag", tileTag); + tag.putInt("playerCheckRadius", playerCheckRadius); + tag.putInt("potionSpawnRadius", potionSpawnRadius); + tag.putInt("potionSpawnInterval", potionSpawnInterval); + tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); return tag; } @@ -320,9 +320,9 @@ public class TileMimic extends TileInventory implements ITickable { if (world.setBlockState(pos, state, 3)) { TileEntity tile = world.getTileEntity(pos); if (tile != null) { - tileTag.setInteger("x", pos.getX()); - tileTag.setInteger("y", pos.getY()); - tileTag.setInteger("z", pos.getZ()); + tileTag.putInt("x", pos.getX()); + tileTag.putInt("y", pos.getY()); + tileTag.putInt("z", pos.getZ()); tile.readFromNBT(tileTag); } @@ -346,9 +346,9 @@ public class TileMimic extends TileInventory implements ITickable { if (tag != null) { CompoundNBT copyTag = tag.copy(); - copyTag.setInteger("x", pos.getX()); - copyTag.setInteger("y", pos.getY()); - copyTag.setInteger("z", pos.getZ()); + copyTag.putInt("x", pos.getX()); + copyTag.putInt("y", pos.getY()); + copyTag.putInt("z", pos.getZ()); tile.readFromNBT(copyTag); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index b9e2ad30..553fc9bf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -18,12 +18,12 @@ public class TilePhantomBlock extends TileTicking { @Override public void deserialize(CompoundNBT tagCompound) { - this.ticksRemaining = tagCompound.getInteger(Constants.NBT.TICKS_REMAINING); + this.ticksRemaining = tagCompound.getInt(Constants.NBT.TICKS_REMAINING); } @Override public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); + tagCompound.putInt(Constants.NBT.TICKS_REMAINING, ticksRemaining); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index e4a74df2..6710da46 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -74,9 +74,9 @@ public class TilePurificationAltar extends TileInventory implements ITickable { public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setDouble("totalPurity", totalPurity); - tag.setDouble("maxPurity", maxPurity); - tag.setDouble("purityRate", purityRate); + tag.putDouble("totalPurity", totalPurity); + tag.putDouble("maxPurity", maxPurity); + tag.putDouble("purityRate", purityRate); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 1ceab097..8d1b7807 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -37,14 +37,14 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil public void deserialize(CompoundNBT tag) { super.deserialize(tag); - burnTime = tag.getInteger(Constants.NBT.SOUL_FORGE_BURN); + burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); } @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setInteger(Constants.NBT.SOUL_FORGE_BURN, burnTime); + tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 54475123..4d5d1eef 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -22,16 +22,16 @@ public class TileSpectralBlock extends TileTicking { @Override public void deserialize(CompoundNBT tagCompound) { - ticksRemaining = tagCompound.getInteger(Constants.NBT.TICKS_REMAINING); + ticksRemaining = tagCompound.getInt(Constants.NBT.TICKS_REMAINING); containedBlockName = tagCompound.getString(Constants.NBT.CONTAINED_BLOCK_NAME); - containedBlockMeta = tagCompound.getInteger(Constants.NBT.CONTAINED_BLOCK_META); + containedBlockMeta = tagCompound.getInt(Constants.NBT.CONTAINED_BLOCK_META); } @Override public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); - tagCompound.setString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); - tagCompound.setInteger(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); + tagCompound.putInt(Constants.NBT.TICKS_REMAINING, ticksRemaining); + tagCompound.putString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); + tagCompound.putInt(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 30009812..a6d19da3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -37,13 +37,13 @@ public class TileTeleposer extends TileInventory implements ITickable { @Override public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); - previousInput = tagCompound.getInteger(Constants.NBT.PREVIOUS_INPUT); + previousInput = tagCompound.getInt(Constants.NBT.PREVIOUS_INPUT); } @Override public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); - tagCompound.setInteger(Constants.NBT.PREVIOUS_INPUT, previousInput); + tagCompound.putInt(Constants.NBT.PREVIOUS_INPUT, previousInput); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java index 8a05ad0e..257b1487 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java @@ -16,22 +16,23 @@ import net.minecraftforge.fml.relauncher.SideOnly; * Handles data syncing and core data writing/reading. */ public class TileBase extends TileEntity { + @Override - public final void readFromNBT(CompoundNBT compound) { - super.readFromNBT(compound); - deserializeBase(compound); - deserialize(compound); + public final void deserializeNBT(CompoundNBT nbt) { + super.deserializeNBT(nbt); + deserializeBase(nbt); + deserialize(nbt); } @Override - public final CompoundNBT writeToNBT(CompoundNBT compound) { - super.writeToNBT(compound); - serializeBase(compound); - return serialize(compound); + public final CompoundNBT serializeNBT() { + CompoundNBT tag = super.serializeNBT(); + serializeBase(tag); + return serialize(tag); } /** - * Called by {@link #readFromNBT(CompoundNBT)} + * Called by {@link #deserializeNBT(CompoundNBT)} *

    * Internal data (such as coordinates) are handled for you. Just read the data you need. * @@ -52,7 +53,7 @@ public class TileBase extends TileEntity { } /** - * Called by {@link #writeToNBT(CompoundNBT)} + * Called by {@link #serializeNBT()} *

    * Internal data (such as coordinates) are handled for you. Just read the data you need. * @@ -89,14 +90,14 @@ public class TileBase extends TileEntity { @Override public final SUpdateTileEntityPacket getUpdatePacket() { - return new SUpdateTileEntityPacket(getPos(), -999, writeToNBT(new CompoundNBT())); + return new SUpdateTileEntityPacket(getPos(), -999, serializeNBT()); } @Override @SideOnly(Side.CLIENT) public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) { super.onDataPacket(net, pkt); - readFromNBT(pkt.getNbtCompound()); + deserialize(pkt.getNbtCompound()); onDataPacketClientReceived(); } @@ -109,11 +110,11 @@ public class TileBase extends TileEntity { @Override public final CompoundNBT getUpdateTag() { - return writeToNBT(new CompoundNBT()); + return serializeNBT(); } @Override public final void handleUpdateTag(CompoundNBT tag) { - readFromNBT(tag); + deserializeNBT(tag); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java index 33c18025..85e3154d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java @@ -1,18 +1,18 @@ package WayofTime.bloodmagic.tile.base; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ITickable; +import net.minecraft.tileentity.ITickableTileEntity; /** * Base class for tiles that tick. Allows disabling the ticking programmatically. */ // TODO - Move implementations that depend on existed ticks to new methods from here. -public abstract class TileTicking extends TileBase implements ITickable { +public abstract class TileTicking extends TileBase implements ITickableTileEntity { private int ticksExisted; private boolean shouldTick = true; @Override - public final void update() { + public final void tick() { if (shouldTick()) { ticksExisted++; onUpdate(); @@ -21,14 +21,14 @@ public abstract class TileTicking extends TileBase implements ITickable { @Override void deserializeBase(CompoundNBT tagCompound) { - this.ticksExisted = tagCompound.getInteger("ticksExisted"); + this.ticksExisted = tagCompound.getInt("ticksExisted"); this.shouldTick = tagCompound.getBoolean("shouldTick"); } @Override CompoundNBT serializeBase(CompoundNBT tagCompound) { - tagCompound.setInteger("ticksExisted", getTicksExisted()); - tagCompound.setBoolean("shouldTick", shouldTick()); + tagCompound.putInt("ticksExisted", getTicksExisted()); + tagCompound.putBoolean("shouldTick", shouldTick()); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index ccadc1e4..b22c997f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -44,18 +44,18 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn @Override public void deserialize(CompoundNBT tag) { super.deserialize(tag); - currentActiveSlot = tag.getInteger("currentSlot"); + currentActiveSlot = tag.getInt("currentSlot"); priorities = tag.getIntArray(Constants.NBT.ROUTING_PRIORITY); if (priorities.length != 6) { priorities = new int[6]; } if (!tag.getBoolean("updated")) { - ListNBT tags = tag.getTagList("Items", 10); + ListNBT tags = tag.getList("Items", 10); inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompound(i); byte j = data.getByte("Slot"); if (j == 0) { @@ -73,9 +73,9 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setInteger("currentSlot", currentActiveSlot); - tag.setIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); - tag.setBoolean("updated", true); + tag.putInt("currentSlot", currentActiveSlot); + tag.putIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); + tag.putBoolean("updated", true); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index a0457aee..5391ee41 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -191,32 +191,32 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti ListNBT tags = new ListNBT(); for (BlockPos pos : generalNodeList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); tags.appendTag(posTag); } - tag.setTag(Constants.NBT.ROUTING_MASTER_GENERAL, tags); + tag.put(Constants.NBT.ROUTING_MASTER_GENERAL, tags); tags = new ListNBT(); for (BlockPos pos : inputNodeList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); tags.appendTag(posTag); } - tag.setTag(Constants.NBT.ROUTING_MASTER_INPUT, tags); + tag.put(Constants.NBT.ROUTING_MASTER_INPUT, tags); tags = new ListNBT(); for (BlockPos pos : outputNodeList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); tags.appendTag(posTag); } - tag.setTag(Constants.NBT.ROUTING_MASTER_OUTPUT, tags); + tag.put(Constants.NBT.ROUTING_MASTER_OUTPUT, tags); return tag; } @@ -224,24 +224,24 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti public void deserialize(CompoundNBT tag) { super.deserialize(tag); - ListNBT tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); + ListNBT tags = tag.getList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); generalNodeList.add(newPos); } - tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_INPUT, 10); + tags = tag.getList(Constants.NBT.ROUTING_MASTER_INPUT, 10); for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); inputNodeList.add(newPos); } - tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); + tags = tag.getList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); outputNodeList.add(newPos); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index fb402861..3fa08545 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -39,20 +39,20 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); CompoundNBT masterTag = new CompoundNBT(); - masterTag.setInteger(Constants.NBT.X_COORD, masterPos.getX()); - masterTag.setInteger(Constants.NBT.Y_COORD, masterPos.getY()); - masterTag.setInteger(Constants.NBT.Z_COORD, masterPos.getZ()); - tag.setTag(Constants.NBT.ROUTING_MASTER, masterTag); + masterTag.putInt(Constants.NBT.X_COORD, masterPos.getX()); + masterTag.putInt(Constants.NBT.Y_COORD, masterPos.getY()); + masterTag.putInt(Constants.NBT.Z_COORD, masterPos.getZ()); + tag.put(Constants.NBT.ROUTING_MASTER, masterTag); ListNBT tags = new ListNBT(); for (BlockPos pos : connectionList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); - tags.appendTag(posTag); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); + tags.add(posTag); } - tag.setTag(Constants.NBT.ROUTING_CONNECTION, tags); + tag.put(Constants.NBT.ROUTING_CONNECTION, tags); return tag; } @@ -60,13 +60,13 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte public void deserialize(CompoundNBT tag) { super.deserialize(tag); connectionList.clear(); - CompoundNBT masterTag = tag.getCompoundTag(Constants.NBT.ROUTING_MASTER); - masterPos = new BlockPos(masterTag.getInteger(Constants.NBT.X_COORD), masterTag.getInteger(Constants.NBT.Y_COORD), masterTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT masterTag = tag.getCompound(Constants.NBT.ROUTING_MASTER); + masterPos = new BlockPos(masterTag.getInt(Constants.NBT.X_COORD), masterTag.getInt(Constants.NBT.Y_COORD), masterTag.getInt(Constants.NBT.Z_COORD)); - ListNBT tags = tag.getTagList(Constants.NBT.ROUTING_CONNECTION, 10); - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + ListNBT tags = tag.getList(Constants.NBT.ROUTING_CONNECTION, 10); + for (int i = 0; i < tags.size(); i++) { + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); connectionList.add(newPos); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 68428f47..8a792f99 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -20,7 +20,7 @@ public class ChatUtil { private static int lastAdded; private static void sendNoSpamMessages(ITextComponent[] messages) { - NewChatGui chat = Minecraft.getMinecraft().ingameGUI.getChatGUI(); + NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI(); for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) { chat.deleteChatLine(i); } @@ -219,7 +219,7 @@ public class ChatUtil { public static class Handler implements IMessageHandler { @Override public IMessage onMessage(final PacketNoSpamChat message, MessageContext ctx) { - Minecraft.getMinecraft().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); + Minecraft.getInstance().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index cb1ef51b..5621e3f0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -9,14 +9,14 @@ public class GhostItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - tag.setInteger(Constants.NBT.GHOST_STACK_SIZE, amount); + tag.putInt(Constants.NBT.GHOST_STACK_SIZE, amount); } public static int getItemGhostAmount(ItemStack stack) { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - return tag.getInteger(Constants.NBT.GHOST_STACK_SIZE); + return tag.getInt(Constants.NBT.GHOST_STACK_SIZE); } public static boolean hasGhostAmount(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index b8bddf1f..06fd87a4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -68,7 +68,7 @@ public class ClientHandler { public static TextureAtlasSprite bloodStoneBrick; public static TextureAtlasSprite beacon; public static TextureAtlasSprite crystalCluster; - public static Minecraft minecraft = Minecraft.getMinecraft(); + public static Minecraft minecraft = Minecraft.getInstance(); private static TileMasterRitualStone mrsHoloTile; private static Ritual mrsHoloRitual; private static Direction mrsHoloDirection; @@ -93,7 +93,7 @@ public class ClientHandler { @SubscribeEvent public static void onSoundEvent(PlaySoundEvent event) { - PlayerEntity player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { event.setResultSound(null); } @@ -146,7 +146,7 @@ public class ClientHandler { @SubscribeEvent public static void onMouseEvent(MouseEvent event) { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (event.getDwheel() != 0 && player != null && player.isSneaking()) { ItemStack stack = player.getHeldItemMainhand(); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index acfda0d0..0380cf30 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -143,7 +143,7 @@ public class WillHandler { WillChunk ac = WorldDemonWillHandler.getWillChunk(dim, loc.x, loc.z); if (ac != null) { - nbt.setShort("base", ac.getBase()); + nbt.putShort("base", ac.getBase()); ac.getCurrentWill().writeToNBT(nbt, "current"); if (!event.getChunk().isLoaded()) WorldDemonWillHandler.removeWillChunk(dim, loc.x, loc.z); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java index 760bf085..a0e53917 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java @@ -93,7 +93,7 @@ public class ItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - tag.setString("key", key); + tag.putString("key", key); } } @@ -113,7 +113,7 @@ public class ItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - tag.setInteger("level", level); + tag.putInt("level", level); } } @@ -122,7 +122,7 @@ public class ItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - return tag.getInteger("level"); + return tag.getInt("level"); } return 0; From 0e02b983f101aded5976eb4f60ee0db39edbc318 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 30 Oct 2019 21:25:48 -0700 Subject: [PATCH 341/493] Add missing gradle file --- gradle/process_mod_info.gradle | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 gradle/process_mod_info.gradle diff --git a/gradle/process_mod_info.gradle b/gradle/process_mod_info.gradle new file mode 100644 index 00000000..bd9371de --- /dev/null +++ b/gradle/process_mod_info.gradle @@ -0,0 +1,28 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.moandjiezana.toml:toml4j:0.7.2' + classpath "blue.endless:jankson:1.1.0" + } +} + +processResources { + filesMatching('**/mods.json') { + filter(Json5ToTomlFilter) + path = path.replaceFirst(/\.json$/, '.toml') + } +} + +import blue.endless.jankson.Jankson +import com.moandjiezana.toml.TomlWriter +import groovy.json.JsonSlurper + +//shitshow ahead: groovy is too magic to call methods before call to super +class Json5ToTomlFilter extends FilterReader { + Json5ToTomlFilter(Reader input) { + super(new StringReader(new TomlWriter().write(new JsonSlurper().parseText(Jankson.builder().build().load(input.text).toJson())))) + } +} \ No newline at end of file From d617911d7a401e4eda08f23075e6523c588761f5 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 24 Oct 2020 08:59:04 -0400 Subject: [PATCH 342/493] Creation of 1.16.3 branch Initial publishing of the 1.16.3 branch of the mod. A lot of systems are missing (such as Rituals and Living Armour), but enough is present for a decent Alpha release. --- .settings/BloodMagic1.8IDEA.jar | Bin 1882 -> 0 bytes .settings/org.eclipse.buildship.core.prefs | 2 + .settings/org.eclipse.jdt.core.prefs | 685 ++--- .settings/org.eclipse.jdt.ui.prefs | 25 +- CREDITS.txt | 65 + LICENSE | 87 - LICENSE.txt | 520 ++++ README.md | 120 - README.txt | 53 + build.gradle | 229 +- changelog.txt | 2249 ++++++++--------- gradle.properties | 18 +- gradle/process_mod_info.gradle | 28 - gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 110 +- gradlew.bat | 14 +- runClient.launch | 21 + runData.launch | 27 + runServer.launch | 26 + settings.gradle | 1 - .../bloodmagic/api/BloodMagicPlugin.java | 29 - .../bloodmagic/api/IBloodMagicAPI.java | 77 - .../bloodmagic/api/IBloodMagicBlacklist.java | 47 - .../bloodmagic/api/IBloodMagicPlugin.java | 26 - .../api/IBloodMagicRecipeRegistrar.java | 96 - .../api/IBloodMagicValueManager.java | 42 - .../api/event/BloodMagicCraftedEvent.java | 71 - .../bloodmagic/api/package-info.java | 4 - src/generated/resources/.cache/cache | 170 ++ .../blockstates/accelerationrune.json | 7 + .../blockstates/altarcapacityrune.json | 7 + .../blockstates/bettercapacityrune.json | 7 + .../bloodmagic/blockstates/blankrune.json | 7 + .../bloodmagic/blockstates/bloodlight.json | 7 + .../bloodmagic/blockstates/chargingrune.json | 7 + .../blockstates/dislocationrune.json | 7 + .../blockstates/orbcapacityrune.json | 7 + .../bloodmagic/blockstates/sacrificerune.json | 7 + .../blockstates/selfsacrificerune.json | 7 + .../bloodmagic/blockstates/speedrune.json | 7 + .../assets/bloodmagic/lang/en_us.json | 115 + .../models/block/accelerationrune.json | 6 + .../models/block/altarcapacityrune.json | 6 + .../models/block/bettercapacityrune.json | 6 + .../bloodmagic/models/block/blankrune.json | 6 + .../bloodmagic/models/block/bloodlight.json | 6 + .../bloodmagic/models/block/chargingrune.json | 6 + .../models/block/dislocationrune.json | 6 + .../models/block/orbcapacityrune.json | 6 + .../models/block/sacrificerune.json | 6 + .../models/block/selfsacrificerune.json | 6 + .../bloodmagic/models/block/speedrune.json | 6 + .../models/item/accelerationrune.json | 3 + .../bloodmagic/models/item/airsigil.json | 6 + .../models/item/altarcapacityrune.json | 3 + .../models/item/apprenticebloodorb.json | 6 + .../bloodmagic/models/item/arcaneashes.json | 6 + .../models/item/basemonstersoul.json | 6 + .../item/basemonstersoul_corrosive.json | 6 + .../item/basemonstersoul_destructive.json | 6 + .../item/basemonstersoul_steadfast.json | 6 + .../models/item/basemonstersoul_vengeful.json | 6 + .../models/item/bettercapacityrune.json | 3 + .../bloodmagic/models/item/blankrune.json | 3 + .../bloodmagic/models/item/blankslate.json | 6 + .../models/item/bloodlightsigil.json | 6 + .../bloodmagic/models/item/chargingrune.json | 3 + .../models/item/daggerofsacrifice.json | 6 + .../bloodmagic/models/item/demonslate.json | 6 + .../models/item/dislocationrune.json | 3 + .../models/item/divinationsigil.json | 6 + .../bloodmagic/models/item/etherealslate.json | 6 + .../bloodmagic/models/item/growthsigil.json | 16 + .../bloodmagic/models/item/icesigil.json | 16 + .../bloodmagic/models/item/infusedslate.json | 6 + .../bloodmagic/models/item/lavasigil.json | 6 + .../models/item/magicianbloodorb.json | 6 + .../models/item/masterbloodorb.json | 6 + .../bloodmagic/models/item/miningsigil.json | 16 + .../models/item/orbcapacityrune.json | 3 + .../bloodmagic/models/item/reagentair.json | 6 + .../models/item/reagentbloodlight.json | 6 + .../models/item/reagentfastminer.json | 6 + .../bloodmagic/models/item/reagentgrowth.json | 6 + .../bloodmagic/models/item/reagentlava.json | 6 + .../models/item/reagentmagnetism.json | 6 + .../bloodmagic/models/item/reagentvoid.json | 6 + .../bloodmagic/models/item/reagentwater.json | 6 + .../models/item/reinforcedslate.json | 6 + .../bloodmagic/models/item/sacrificerune.json | 3 + .../models/item/sacrificialdagger.json | 6 + .../models/item/selfsacrificerune.json | 3 + .../models/item/sigilofmagnetism.json | 16 + .../bloodmagic/models/item/soulgemcommon.json | 34 + .../bloodmagic/models/item/soulgemlesser.json | 34 + .../bloodmagic/models/item/soulgempetty.json | 34 + .../bloodmagic/models/item/soulsnare.json | 6 + .../bloodmagic/models/item/soulsword.json | 74 + .../bloodmagic/models/item/speedrune.json | 3 + .../item/variants/growthsigil_activated.json | 6 + .../variants/growthsigil_deactivated.json | 6 + .../item/variants/icesigil_activated.json | 6 + .../item/variants/icesigil_deactivated.json | 6 + .../item/variants/miningsigil_activated.json | 6 + .../variants/miningsigil_deactivated.json | 6 + .../variants/sigilofmagnetism_activated.json | 6 + .../sigilofmagnetism_deactivated.json | 6 + .../models/item/variants/soulgemcommon.json | 6 + .../variants/soulgemcommon_corrosive.json | 6 + .../variants/soulgemcommon_destructive.json | 6 + .../variants/soulgemcommon_steadfast.json | 6 + .../item/variants/soulgemcommon_vengeful.json | 6 + .../models/item/variants/soulgemlesser.json | 6 + .../variants/soulgemlesser_corrosive.json | 6 + .../variants/soulgemlesser_destructive.json | 6 + .../variants/soulgemlesser_steadfast.json | 6 + .../item/variants/soulgemlesser_vengeful.json | 6 + .../models/item/variants/soulgempetty.json | 6 + .../item/variants/soulgempetty_corrosive.json | 6 + .../variants/soulgempetty_destructive.json | 6 + .../item/variants/soulgempetty_steadfast.json | 6 + .../item/variants/soulgempetty_vengeful.json | 6 + .../item/variants/soulsword_activated.json | 6 + .../soulsword_corrosive_activated.json | 6 + .../soulsword_corrosive_deactivated.json | 6 + .../item/variants/soulsword_deactivated.json | 6 + .../soulsword_destructive_activated.json | 6 + .../soulsword_destructive_deactivated.json | 6 + .../soulsword_steadfast_activated.json | 6 + .../soulsword_steadfast_deactivated.json | 6 + .../soulsword_vengeful_activated.json | 6 + .../soulsword_vengeful_deactivated.json | 6 + .../bloodmagic/models/item/voidsigil.json | 6 + .../bloodmagic/models/item/watersigil.json | 6 + .../bloodmagic/models/item/weakbloodorb.json | 6 + .../recipes/bloodmagictab/blood_altar.json | 32 + .../bloodmagictab/blood_rune_blank.json | 32 + .../bloodmagictab/blood_rune_capacity.json | 32 + .../bloodmagictab/blood_rune_charging.json | 32 + .../recipes/bloodmagictab/blood_rune_orb.json | 32 + .../bloodmagictab/blood_rune_sacrifice.json | 32 + .../blood_rune_self_sacrifice.json | 32 + .../bloodmagictab/blood_rune_speed.json | 32 + .../bloodmagictab/sacrificial_dagger.json | 32 + .../recipes/bloodmagictab/soul_forge.json | 32 + .../recipes/bloodmagictab/soul_snare.json | 32 + .../loot_tables/blocks/accelerationrune.json | 19 + .../loot_tables/blocks/alchemyarray.json | 10 + .../bloodmagic/loot_tables/blocks/altar.json | 19 + .../loot_tables/blocks/altarcapacityrune.json | 19 + .../blocks/bettercapacityrune.json | 19 + .../loot_tables/blocks/blankrune.json | 19 + .../loot_tables/blocks/bloodlight.json | 10 + .../loot_tables/blocks/chargingrune.json | 19 + .../loot_tables/blocks/dislocationrune.json | 19 + .../loot_tables/blocks/orbcapacityrune.json | 19 + .../loot_tables/blocks/sacrificerune.json | 19 + .../loot_tables/blocks/selfsacrificerune.json | 19 + .../loot_tables/blocks/soulforge.json | 19 + .../loot_tables/blocks/speedrune.json | 19 + .../recipes/altar/apprenticebloodorb.json | 13 + .../recipes/altar/daggerofsacrifice.json | 13 + .../recipes/altar/demonicslate.json | 13 + .../bloodmagic/recipes/altar/imbuedslate.json | 13 + .../recipes/altar/magicianbloodorb.json | 13 + .../recipes/altar/reinforcedslate.json | 13 + .../data/bloodmagic/recipes/altar/slate.json | 13 + .../recipes/altar/weakbloodorb.json | 13 + .../bloodmagic/recipes/array/airsigil.json | 13 + .../recipes/array/bloodlightsigil.json | 13 + .../recipes/array/divinationsigil.json | 13 + .../recipes/array/fastminersigil.json | 13 + .../bloodmagic/recipes/array/growthsigil.json | 13 + .../bloodmagic/recipes/array/lavasigil.json | 13 + .../recipes/array/magnetismsigil.json | 13 + .../bloodmagic/recipes/array/voidsigil.json | 13 + .../bloodmagic/recipes/array/watersigil.json | 13 + .../data/bloodmagic/recipes/blood_altar.json} | 15 +- .../bloodmagic/recipes/blood_rune_blank.json | 23 + .../recipes/blood_rune_capacity.json | 25 + .../recipes/blood_rune_charging.json | 29 + .../bloodmagic/recipes/blood_rune_orb.json | 27 + .../recipes/blood_rune_sacrifice.json | 29 + .../recipes/blood_rune_self_sacrifice.json | 29 + .../bloodmagic/recipes/blood_rune_speed.json | 25 + .../recipes/sacrificial_dagger.json | 22 + .../data/bloodmagic/recipes/soul_forge.json | 25 + .../data/bloodmagic/recipes/soul_snare.json | 23 + .../recipes/soulforge/arcaneashes.json | 21 + .../recipes/soulforge/commontartaricgem.json | 20 + .../recipes/soulforge/lessertartaricgem.json | 20 + .../recipes/soulforge/pettytartaricgem.json | 20 + .../recipes/soulforge/reagent_fastminer.json | 20 + .../recipes/soulforge/reagent_growth.json | 20 + .../recipes/soulforge/reagent_lava.json | 20 + .../recipes/soulforge/reagent_magnetism.json | 20 + .../recipes/soulforge/reagent_void.json | 20 + .../recipes/soulforge/reagent_water.json | 17 + .../recipes/soulforge/sentientsword.json | 15 + .../java/WayofTime/bloodmagic/BloodMagic.java | 307 ++- .../WayofTime/bloodmagic/ConfigHandler.java | 213 +- .../alchemyArray/AlchemyArrayEffect.java | 33 - .../AlchemyArrayEffectArrowTurret.java | 209 -- .../AlchemyArrayEffectAttractor.java | 393 --- .../AlchemyArrayEffectBinding.java | 71 - .../AlchemyArrayEffectBounce.java | 51 - .../AlchemyArrayEffectCrafting.java | 63 - .../AlchemyArrayEffectCraftingNew.java | 58 - .../AlchemyArrayEffectFurnaceFuel.java | 119 - .../AlchemyArrayEffectLaputa.java | 134 - .../AlchemyArrayEffectMobSacrifice.java | 202 -- .../AlchemyArrayEffectMovement.java | 82 - .../alchemyArray/AlchemyArrayEffectSigil.java | 39 - .../AlchemyArrayEffectSkeletonTurret.java | 186 -- .../alchemyArray/AlchemyArrayEffectSpike.java | 44 - .../AlchemyArrayEffectTeleport.java | 87 - .../AlchemyArrayEffectUpdraft.java | 50 - .../alchemyArray/AlchemyCircleRenderer.java | 151 -- .../bloodmagic/altar/AltarComponent.java | 91 +- .../WayofTime/bloodmagic/altar/AltarTier.java | 283 ++- .../bloodmagic/altar/AltarUpgrade.java | 37 +- .../WayofTime/bloodmagic/altar/AltarUtil.java | 139 +- .../bloodmagic/altar/BloodAltar.java | 1436 ++++++----- .../bloodmagic/altar/ComponentType.java | 34 +- .../bloodmagic/altar/IAltarComponent.java | 15 +- .../bloodmagic/altar/IAltarManipulator.java | 8 - .../bloodmagic/altar/IBloodAltar.java | 63 +- .../bloodmagic/api/impl/BloodMagicAPI.java | 156 +- .../api/impl/BloodMagicBlacklist.java | 106 - .../api/impl/BloodMagicCorePlugin.java | 163 +- .../api/impl/BloodMagicRecipeRegistrar.java | 779 +++--- .../api/impl/BloodMagicValueManager.java | 62 - .../api/impl/recipe/RecipeAlchemyArray.java | 118 +- .../api/impl/recipe/RecipeAlchemyTable.java | 59 - .../api/impl/recipe/RecipeBloodAltar.java | 150 +- .../api/impl/recipe/RecipeSacrificeCraft.java | 43 - .../api/impl/recipe/RecipeTartaricForge.java | 106 +- .../bloodmagic/block/BlockAlchemyArray.java | 166 -- .../bloodmagic/block/BlockAlchemyTable.java | 164 -- .../bloodmagic/block/BlockAltar.java | 224 -- .../bloodmagic/block/BlockBloodLight.java | 112 - .../bloodmagic/block/BlockBloodRune.java | 44 - .../bloodmagic/block/BlockBloodTank.java | 195 -- .../bloodmagic/block/BlockDecorative.java | 33 - .../bloodmagic/block/BlockDemonBase.java | 21 - .../bloodmagic/block/BlockDemonCrucible.java | 172 -- .../bloodmagic/block/BlockDemonCrystal.java | 368 --- .../block/BlockDemonCrystallizer.java | 77 - .../bloodmagic/block/BlockDemonLight.java | 21 - .../block/BlockDemonPillarBase.java | 33 - .../block/BlockDemonPillarCapBase.java | 31 - .../bloodmagic/block/BlockDemonPylon.java | 129 - .../block/BlockDemonStairsBase.java | 27 - .../bloodmagic/block/BlockDemonWallBase.java | 27 - .../block/BlockDimensionalPortal.java | 183 -- .../bloodmagic/block/BlockIncenseAltar.java | 86 - .../block/BlockInputRoutingNode.java | 53 - .../block/BlockInversionPillar.java | 90 - .../block/BlockInversionPillarEnd.java | 57 - .../block/BlockItemRoutingNode.java | 39 - .../bloodmagic/block/BlockLifeEssence.java | 66 - .../block/BlockMasterRoutingNode.java | 43 - .../bloodmagic/block/BlockMimic.java | 227 -- .../block/BlockOutputRoutingNode.java | 53 - .../WayofTime/bloodmagic/block/BlockPath.java | 84 - .../bloodmagic/block/BlockPhantom.java | 82 - .../block/BlockRitualController.java | 136 - .../bloodmagic/block/BlockRitualStone.java | 62 - .../bloodmagic/block/BlockRoutingNode.java | 137 - .../bloodmagic/block/BlockSoulForge.java | 100 - .../bloodmagic/block/BlockSpectral.java | 105 - .../bloodmagic/block/BlockTeleposer.java | 69 - .../WayofTime/bloodmagic/block/IBMBlock.java | 8 - .../bloodmagic/block/base/BlockEnum.java | 98 - .../block/base/BlockEnumPillar.java | 124 - .../block/base/BlockEnumPillarCap.java | 73 - .../block/base/BlockEnumStairs.java | 343 --- .../bloodmagic/block/base/BlockEnumWall.java | 122 - .../bloodmagic/block/base/BlockInteger.java | 81 - .../bloodmagic/block/enums/BloodRuneType.java | 47 +- .../block/enums/EnumDecorative.java | 22 - .../block/enums/EnumDemonBlock1.java | 23 - .../block/enums/EnumDemonBlock2.java | 33 - .../block/enums/EnumDemonBlock3.java | 33 - .../block/enums/EnumInversionCap.java | 28 - .../bloodmagic/block/enums/EnumMimic.java | 23 - .../bloodmagic/block/enums/EnumPath.java | 26 - .../block/enums/EnumRitualController.java | 22 - .../block/enums/EnumSubWillType.java | 33 - .../block/enums/EnumSubWillType1.java | 20 - .../block/enums/EnumSubWillType2.java | 20 - .../block/enums/EnumSubWillType3.java | 19 - .../bloodmagic/block/enums/EnumWillWall.java | 33 - .../bloodmagic/client/IMeshProvider.java | 40 - .../bloodmagic/client/IVariantProvider.java | 13 - .../WayofTime/bloodmagic/client/Sprite.java | 58 - .../client/gui/GuiAlchemyTable.java | 65 - .../client/gui/GuiBloodMagicConfig.java | 64 - .../bloodmagic/client/gui/GuiHandler.java | 64 - .../bloodmagic/client/gui/GuiHolding.java | 57 - .../client/gui/GuiItemRoutingNode.java | 200 -- .../client/gui/GuiMasterRoutingNode.java | 44 - .../bloodmagic/client/gui/GuiSoulForge.java | 56 - .../bloodmagic/client/gui/GuiTeleposer.java | 42 - .../client/helper/ShaderHelper.java | 182 -- .../client/hud/ConfigEntryEditHUD.java | 39 - .../bloodmagic/client/hud/ElementInfo.java | 39 - .../client/hud/ElementRegistry.java | 149 -- .../bloodmagic/client/hud/Elements.java | 136 - .../bloodmagic/client/hud/GuiEditHUD.java | 185 -- .../client/hud/element/ElementDemonAura.java | 78 - .../element/ElementDivinedInformation.java | 64 - .../client/hud/element/ElementHolding.java | 85 - .../client/hud/element/ElementItemStack.java | 23 - .../client/hud/element/ElementSprite.java | 20 - .../client/hud/element/ElementString.java | 36 - .../hud/element/ElementTileInformation.java | 57 - .../client/hud/element/HUDElement.java | 58 - .../bloodmagic/client/key/IKeybindable.java | 8 - .../client/key/KeyBindingBloodMagic.java | 16 - .../bloodmagic/client/key/KeyBindings.java | 97 - .../mesh/CustomMeshDefinitionActivatable.java | 25 - .../mesh/CustomMeshDefinitionMultiWill.java | 27 - .../mesh/CustomMeshDefinitionWillGem.java | 28 - .../client/render/LayerBloodElytra.java | 53 - .../AttractorAlchemyCircleRenderer.java | 142 -- .../BindingAlchemyCircleRenderer.java | 236 -- .../DualAlchemyCircleRenderer.java | 145 -- .../LowAlchemyCircleRenderer.java | 18 - .../LowStaticAlchemyCircleRenderer.java | 24 - .../MobSacrificeAlchemyCircleRenderer.java | 243 -- .../SingleAlchemyCircleRenderer.java | 127 - .../StaticAlchemyCircleRenderer.java | 131 - .../TurretAlchemyCircleRenderer.java | 247 -- .../render/block/RenderAlchemyArray.java | 57 +- .../client/render/block/RenderAltar.java | 363 ++- .../client/render/block/RenderBloodTank.java | 109 - .../render/block/RenderDemonCrucible.java | 55 - .../client/render/block/RenderFakeBlocks.java | 62 - .../render/block/RenderItemRoutingNode.java | 110 - .../client/render/block/RenderMimic.java | 20 - .../entity/BloodLightRenderFactory.java | 13 - .../entity/CorruptedChickenRenderFactory.java | 13 - .../entity/CorruptedSheepRenderFactory.java | 13 - .../entity/CorruptedSpiderRenderFactory.java | 13 - .../entity/CorruptedZombieRenderFactory.java | 13 - .../render/entity/MeteorRenderFactory.java | 13 - .../render/entity/MimicRenderFactory.java | 13 - .../render/entity/RenderCorruptedChicken.java | 33 - .../render/entity/RenderCorruptedSheep.java | 31 - .../render/entity/RenderCorruptedSpider.java | 35 - .../render/entity/RenderCorruptedZombie.java | 65 - .../render/entity/RenderEntityBloodLight.java | 38 - .../render/entity/RenderEntityMeteor.java | 41 - .../render/entity/RenderEntityMimic.java | 117 - .../entity/RenderEntitySentientArrow.java | 108 - .../render/entity/RenderEntitySoulSnare.java | 39 - .../render/entity/RenderSentientSpecter.java | 110 - .../entity/SentientArrowRenderFactory.java | 13 - .../entity/SentientSpecterRenderFactory.java | 13 - .../render/entity/SoulSnareRenderFactory.java | 13 - .../entity/layer/LayerAlchemyCircle.java | 82 - .../entity/layer/LayerCorruptedSheepWool.java | 51 - .../layer/LayerCorruptedSpiderEyes.java | 51 - .../client/render/entity/layer/LayerWill.java | 58 - .../render/model/ModelCorruptedChicken.java | 102 - .../render/model/ModelCorruptedSheep.java | 59 - .../render/model/ModelCorruptedSheep2.java | 46 - .../render/model/ModelCorruptedSpider.java | 166 -- .../client/render/model/ModelMeteor.java | 89 - .../client/render/model/ModelMimic.java | 136 - .../bloodmagic/command/CommandBloodMagic.java | 34 - .../command/sub/SubCommandBind.java | 91 - .../command/sub/SubCommandNetwork.java | 228 -- .../bloodmagic/command/sub/SubCommandOrb.java | 127 - .../command/sub/SubCommandRitual.java | 150 -- .../command/sub/SubCommandTeleposer.java | 329 --- .../bloodmagic/compat/guideapi/BookUtils.java | 62 - .../compat/guideapi/GuideBloodMagic.java | 58 - .../compat/guideapi/book/CategoryAlchemy.java | 153 -- .../guideapi/book/CategoryArchitect.java | 721 ------ .../compat/guideapi/book/CategoryDemon.java | 191 -- .../compat/guideapi/book/CategoryRitual.java | 157 -- .../compat/guideapi/book/CategorySpell.java | 17 - .../compat/guideapi/entry/EntryText.java | 52 - .../guideapi/page/PageAlchemyArray.java | 94 - .../compat/guideapi/page/PageAltarRecipe.java | 70 - .../page/PageTartaricForgeRecipe.java | 125 - .../compat/jei/BloodMagicJEIPlugin.java | 274 +- .../AlchemyArrayCraftingCategory.java | 75 - .../AlchemyArrayCraftingRecipeJEI.java | 33 - .../AlchemyTableRecipeCategory.java | 75 - .../alchemyTable/AlchemyTableRecipeJEI.java | 60 - .../compat/jei/altar/AltarRecipeCategory.java | 68 - .../compat/jei/altar/AltarRecipeJEI.java | 58 - .../ArmourDowngradeRecipeCategory.java | 93 - .../ArmourDowngradeRecipeHandler.java | 32 - .../ArmourDowngradeRecipeJEI.java | 34 - .../ArmourDowngradeRecipeMaker.java | 21 - .../jei/binding/BindingRecipeCategory.java | 75 - .../jei/binding/BindingRecipeHandler.java | 31 - .../compat/jei/binding/BindingRecipeJEI.java | 34 - .../jei/binding/BindingRecipeMaker.java | 39 - .../forge/TartaricForgeRecipeCategory.java | 224 +- .../jei/forge/TartaricForgeRecipeJEI.java | 66 - .../compat/waila/BloodMagicHwylaPlugin.java | 46 - .../provider/DataProviderAlchemyArray.java | 56 - .../provider/DataProviderBloodAltar.java | 116 - .../waila/provider/DataProviderBloodTank.java | 51 - .../waila/provider/DataProviderMimic.java | 57 - .../DataProviderRitualController.java | 80 - .../waila/provider/DataProviderTeleposer.java | 58 - .../compress/AdvancedCompressionHandler.java | 47 - .../compress/BaseCompressionHandler.java | 52 - .../compress/CompressionHandler.java | 70 - .../compress/CompressionRegistry.java | 103 - .../compress/StorageBlockCraftingManager.java | 160 -- ...StorageBlockCraftingRecipeAssimilator.java | 285 --- .../bloodmagic/core/RegistrarBloodMagic.java | 171 +- .../core/RegistrarBloodMagicBlocks.java | 167 -- .../core/RegistrarBloodMagicItems.java | 255 -- .../core/RegistrarBloodMagicRecipes.java | 298 +-- .../core/data/BMWorldSavedData.java | 94 +- .../bloodmagic/core/data/Binding.java | 127 +- .../bloodmagic/core/data/SoulNetwork.java | 432 ++-- .../bloodmagic/core/data/SoulTicket.java | 141 +- .../core/recipe/IngredientBloodOrb.java | 154 +- .../recipe/IngredientBloodOrbFactory.java | 21 - .../registry/AlchemyArrayRecipeRegistry.java | 350 --- .../registry/AlchemyTableRecipeRegistry.java | 39 - .../core/registry/AltarRecipeRegistry.java | 215 -- .../LivingArmourDowngradeRecipeRegistry.java | 60 - .../bloodmagic/core/registry/OrbRegistry.java | 87 +- .../registry/TartaricForgeRecipeRegistry.java | 39 - .../WayofTime/bloodmagic/demonAura/PosXY.java | 65 - .../bloodmagic/demonAura/WillChunk.java | 60 - .../bloodmagic/demonAura/WillWorld.java | 40 - .../demonAura/WorldDemonWillHandler.java | 178 -- .../entity/ai/EntityAIAttackRangedBow.java | 138 - .../entity/ai/EntityAIAttackStealthMelee.java | 142 -- .../entity/ai/EntityAIEatAndCorruptBlock.java | 99 - .../entity/ai/EntityAIFollowOwner.java | 125 - .../ai/EntityAIGrabEffectsFromOwner.java | 136 - .../ai/EntityAIHurtByTargetIgnoreTamed.java | 27 - .../entity/ai/EntityAIMimicReform.java | 27 - .../entity/ai/EntityAIOwnerHurtByTarget.java | 50 - .../entity/ai/EntityAIOwnerHurtTarget.java | 50 - .../entity/ai/EntityAIPickUpAlly.java | 154 -- .../entity/ai/EntityAIProtectAlly.java | 98 - .../entity/ai/EntityAIRetreatToHeal.java | 135 - .../entity/ai/EntityAIStealthRetreat.java | 96 - .../ai/EntityAIStealthTowardsTarget.java | 87 - .../entity/mob/EntityAspectedDemonBase.java | 242 -- .../entity/mob/EntityCorruptedChicken.java | 202 -- .../entity/mob/EntityCorruptedSheep.java | 354 --- .../entity/mob/EntityCorruptedSpider.java | 202 -- .../entity/mob/EntityCorruptedZombie.java | 185 -- .../entity/mob/EntityDemonBase.java | 304 --- .../bloodmagic/entity/mob/EntityMimic.java | 327 --- .../entity/mob/EntitySentientSpecter.java | 483 ---- .../entity/projectile/EntityBloodLight.java | 241 +- .../entity/projectile/EntityMeteor.java | 134 - .../projectile/EntitySentientArrow.java | 295 --- .../entity/projectile/EntitySoulSnare.java | 109 +- .../bloodmagic/event/AddToNetworkEvent.java | 26 - .../bloodmagic/event/AltarCraftedEvent.java | 33 - .../bloodmagic/event/BoundToolEvent.java | 50 - .../bloodmagic/event/ItemBindEvent.java | 57 +- .../bloodmagic/event/RitualEvent.java | 133 - .../event/SacrificeKnifeUsedEvent.java | 62 +- .../bloodmagic/event/SoulNetworkEvent.java | 155 +- .../bloodmagic/event/TeleposeEvent.java | 78 - .../fakePlayer/FakeNetHandlerPlayServer.java | 160 -- .../bloodmagic/fakePlayer/FakePlayerBM.java | 46 - .../bloodmagic/gson/SerializerBase.java | 19 - .../bloodmagic/gson/Serializers.java | 100 - .../bloodmagic/iface/IActivatable.java | 42 +- .../bloodmagic/iface/IAlchemyArray.java | 7 - .../bloodmagic/iface/IAltarReader.java | 7 +- .../WayofTime/bloodmagic/iface/IBindable.java | 64 +- .../bloodmagic/iface/IBloodRune.java | 19 +- .../iface/ICustomAlchemyConsumable.java | 11 - .../bloodmagic/iface/IDemonWillViewer.java | 11 - .../bloodmagic/iface/IDocumentedBlock.java | 32 - .../bloodmagic/iface/IItemLPContainer.java | 14 - .../bloodmagic/iface/IMultiWillTool.java | 11 +- .../bloodmagic/iface/INodeRenderer.java | 8 - .../bloodmagic/iface/IPurificationAsh.java | 11 - .../iface/ISentientSwordEffectProvider.java | 11 - .../bloodmagic/iface/ISentientTool.java | 8 - .../WayofTime/bloodmagic/iface/ISigil.java | 39 +- .../bloodmagic/iface/IUpgradeTrainer.java | 15 - .../incense/EnumTranquilityType.java | 12 - .../bloodmagic/incense/IIncensePath.java | 14 - .../incense/ITranquilityHandler.java | 10 - .../incense/IncenseAltarComponent.java | 55 - .../incense/IncenseAltarHandler.java | 92 - .../incense/IncenseTranquilityRegistry.java | 28 - .../bloodmagic/incense/TranquilityStack.java | 11 - .../inversion/CorruptionHandler.java | 86 - .../inversion/InversionPillarHandler.java | 193 -- .../item/ItemActivationCrystal.java | 65 - .../bloodmagic/item/ItemAlchemicVial.java | 16 - .../bloodmagic/item/ItemAltarMaker.java | 140 - .../bloodmagic/item/ItemArcaneAshes.java | 65 - .../bloodmagic/item/ItemBindableBase.java | 34 - .../bloodmagic/item/ItemBloodOrb.java | 123 - .../bloodmagic/item/ItemBoundAxe.java | 112 - .../bloodmagic/item/ItemBoundPickaxe.java | 123 - .../bloodmagic/item/ItemBoundShovel.java | 113 - .../bloodmagic/item/ItemBoundSword.java | 135 - .../bloodmagic/item/ItemBoundTool.java | 254 -- .../item/ItemDaggerOfSacrifice.java | 84 - .../bloodmagic/item/ItemDemonCrystal.java | 45 - .../bloodmagic/item/ItemDemonWillGauge.java | 47 - .../WayofTime/bloodmagic/item/ItemEnum.java | 60 - .../bloodmagic/item/ItemExperienceBook.java | 184 -- .../bloodmagic/item/ItemInscriptionTool.java | 108 - .../bloodmagic/item/ItemLavaCrystal.java | 109 - .../bloodmagic/item/ItemPotionFlask.java | 133 - .../bloodmagic/item/ItemRitualDismantler.java | 78 - .../bloodmagic/item/ItemRitualDiviner.java | 517 ---- .../bloodmagic/item/ItemRitualReader.java | 280 -- .../item/ItemSacrificialDagger.java | 205 -- .../bloodmagic/item/ItemSanguineBook.java | 115 - .../WayofTime/bloodmagic/item/ItemSlate.java | 50 - .../item/ItemTelepositionFocus.java | 111 - .../bloodmagic/item/ItemUpgradeTome.java | 112 - .../bloodmagic/item/ItemUpgradeTrainer.java | 88 - .../item/alchemy/ItemCuttingFluid.java | 99 - .../ItemLivingArmourPointsUpgrade.java | 105 - .../item/armour/ItemLivingArmour.java | 505 ---- .../item/armour/ItemSentientArmour.java | 583 ----- .../item/block/ItemBlockAlchemyTable.java | 67 - .../item/block/ItemBlockBloodTank.java | 78 - .../item/block/ItemBlockDemonCrystal.java | 46 - .../bloodmagic/item/block/ItemBlockMimic.java | 124 - .../item/block/base/ItemBlockEnum.java | 33 - .../item/block/base/ItemBlockInteger.java | 31 - .../item/gear/ItemPackSacrifice.java | 100 - .../item/gear/ItemPackSelfSacrifice.java | 125 - .../item/inventory/ContainerHolding.java | 153 -- .../item/inventory/InventoryHolding.java | 69 - .../item/inventory/ItemInventory.java | 224 -- .../item/routing/IFluidFilterProvider.java | 12 - .../item/routing/IItemFilterProvider.java | 12 - .../item/routing/IRoutingFilterProvider.java | 14 - .../item/routing/ItemFluidRouterFilter.java | 133 - .../item/routing/ItemNodeRouter.java | 195 -- .../item/routing/ItemRouterFilter.java | 155 -- .../bloodmagic/item/sigil/ItemSigil.java | 39 - .../bloodmagic/item/sigil/ItemSigilAir.java | 71 - .../bloodmagic/item/sigil/ItemSigilBase.java | 53 - .../item/sigil/ItemSigilBloodLight.java | 83 - .../item/sigil/ItemSigilBounce.java | 22 - .../bloodmagic/item/sigil/ItemSigilClaw.java | 22 - .../item/sigil/ItemSigilCompression.java | 31 - .../item/sigil/ItemSigilDivination.java | 49 - .../sigil/ItemSigilElementalAffinity.java | 25 - .../item/sigil/ItemSigilEnderSeverance.java | 30 - .../item/sigil/ItemSigilFastMiner.java | 52 - .../item/sigil/ItemSigilFilledHand.java | 20 - .../item/sigil/ItemSigilFluidBase.java | 178 -- .../bloodmagic/item/sigil/ItemSigilFrost.java | 21 - .../item/sigil/ItemSigilGreenGrove.java | 96 - .../bloodmagic/item/sigil/ItemSigilHaste.java | 22 - .../item/sigil/ItemSigilHolding.java | 303 --- .../bloodmagic/item/sigil/ItemSigilLava.java | 71 - .../item/sigil/ItemSigilMagnetism.java | 43 - .../item/sigil/ItemSigilPhantomBridge.java | 217 -- .../item/sigil/ItemSigilSuppression.java | 50 - .../item/sigil/ItemSigilTeleposition.java | 160 -- .../item/sigil/ItemSigilToggleable.java | 96 - .../item/sigil/ItemSigilToggleableBase.java | 54 - .../item/sigil/ItemSigilTransposition.java | 142 -- .../bloodmagic/item/sigil/ItemSigilVoid.java | 97 - .../bloodmagic/item/sigil/ItemSigilWater.java | 79 - .../item/sigil/ItemSigilWhirlwind.java | 22 - .../bloodmagic/item/soul/ItemMonsterSoul.java | 122 - .../item/soul/ItemSentientArmourGem.java | 80 - .../bloodmagic/item/soul/ItemSentientAxe.java | 489 ---- .../bloodmagic/item/soul/ItemSentientBow.java | 477 ---- .../item/soul/ItemSentientPickaxe.java | 488 ---- .../item/soul/ItemSentientShovel.java | 489 ---- .../item/soul/ItemSentientSword.java | 455 ---- .../bloodmagic/item/soul/ItemSoulGem.java | 267 -- .../bloodmagic/item/soul/ItemSoulSnare.java | 80 - .../item/soulBreath/ItemFlightScroll.java | 274 -- .../soulBreath/ItemSoulBreathContainer.java | 65 - .../item/types/AlchemicVialType.java | 44 - .../bloodmagic/item/types/ComponentTypes.java | 64 - .../bloodmagic/item/types/ISubItem.java | 19 - .../bloodmagic/item/types/ShardType.java | 26 - .../livingArmour/ILivingArmour.java | 47 - .../bloodmagic/livingArmour/LivingArmour.java | 334 --- .../livingArmour/LivingArmourHandler.java | 64 - .../livingArmour/LivingArmourUpgrade.java | 90 - .../bloodmagic/livingArmour/StatTracker.java | 66 - .../LivingArmourUpgradeBattleHungry.java | 71 - .../LivingArmourUpgradeCrippledArm.java | 54 - .../LivingArmourUpgradeDigSlowdown.java | 65 - .../LivingArmourUpgradeDisoriented.java | 63 - .../LivingArmourUpgradeMeleeDecrease.java | 74 - .../LivingArmourUpgradeQuenched.java | 54 - .../LivingArmourUpgradeSlippery.java | 91 - .../LivingArmourUpgradeSlowHeal.java | 62 - .../LivingArmourUpgradeSlowness.java | 72 - .../LivingArmourUpgradeStormTrooper.java | 59 - .../tracker/StatTrackerArrowProtect.java | 104 - .../tracker/StatTrackerArrowShot.java | 104 - .../tracker/StatTrackerCriticalStrike.java | 104 - .../tracker/StatTrackerDigging.java | 104 - .../tracker/StatTrackerExperience.java | 104 - .../tracker/StatTrackerFallProtect.java | 104 - .../tracker/StatTrackerFireResist.java | 89 - .../livingArmour/tracker/StatTrackerFood.java | 108 - .../tracker/StatTrackerGraveDigger.java | 104 - .../tracker/StatTrackerGrimReaperSprint.java | 111 - .../tracker/StatTrackerHealthboost.java | 104 - .../livingArmour/tracker/StatTrackerJump.java | 106 - .../tracker/StatTrackerMeleeDamage.java | 104 - .../tracker/StatTrackerMovement.java | 116 - .../tracker/StatTrackerNightSight.java | 124 - .../tracker/StatTrackerPhysicalProtect.java | 104 - .../tracker/StatTrackerPoison.java | 90 - .../tracker/StatTrackerRepairing.java | 104 - .../tracker/StatTrackerSelfSacrifice.java | 106 - .../tracker/StatTrackerSolarPowered.java | 104 - .../tracker/StatTrackerSprintAttack.java | 104 - .../tracker/StatTrackerStepAssist.java | 114 - .../LivingArmourUpgradeArrowProtect.java | 55 - .../upgrade/LivingArmourUpgradeArrowShot.java | 56 - .../LivingArmourUpgradeCriticalStrike.java | 63 - .../upgrade/LivingArmourUpgradeDigging.java | 75 - .../upgrade/LivingArmourUpgradeElytra.java | 51 - .../LivingArmourUpgradeExperience.java | 48 - .../LivingArmourUpgradeFallProtect.java | 49 - .../LivingArmourUpgradeFireResist.java | 69 - .../LivingArmourUpgradeGraveDigger.java | 61 - .../LivingArmourUpgradeGrimReaperSprint.java | 86 - .../LivingArmourUpgradeHealthboost.java | 69 - .../upgrade/LivingArmourUpgradeJump.java | 63 - .../LivingArmourUpgradeKnockbackResist.java | 67 - .../LivingArmourUpgradeMeleeDamage.java | 69 - .../LivingArmourUpgradeNightSight.java | 72 - .../LivingArmourUpgradePhysicalProtect.java | 55 - .../LivingArmourUpgradePoisonResist.java | 70 - .../upgrade/LivingArmourUpgradeRepairing.java | 73 - .../LivingArmourUpgradeSelfSacrifice.java | 49 - .../LivingArmourUpgradeSolarPowered.java | 79 - .../upgrade/LivingArmourUpgradeSpeed.java | 87 - .../LivingArmourUpgradeSprintAttack.java | 74 - .../LivingArmourUpgradeStepAssist.java | 55 - .../WayofTime/bloodmagic/meteor/Meteor.java | 115 - .../bloodmagic/meteor/MeteorComponent.java | 70 - .../meteor/MeteorConfigHandler.java | 165 -- .../bloodmagic/meteor/MeteorRegistry.java | 44 - .../network/BloodMagicPacketHandler.java | 74 +- .../network/DemonAuraPacketProcessor.java | 57 - .../ItemRouterAmountPacketProcessor.java | 70 - .../ItemRouterButtonPacketProcessor.java | 74 - .../bloodmagic/network/KeyProcessor.java | 52 - .../PlayerFallDistancePacketProcessor.java | 45 - .../PlayerVelocityPacketProcessor.java | 59 - .../network/SigilHoldingPacketProcessor.java | 48 - .../WayofTime/bloodmagic/orb/BloodOrb.java | 109 +- .../WayofTime/bloodmagic/orb/IBloodOrb.java | 15 +- .../bloodmagic/potion/BMPotionUtils.java | 137 - .../bloodmagic/potion/PotionBloodMagic.java | 62 +- .../potion/PotionEventHandlers.java | 192 -- .../bloodmagic/proxy/ClientProxy.java | 145 -- .../bloodmagic/proxy/CommonProxy.java | 40 - .../recipe/LivingArmourDowngradeRecipe.java | 151 -- .../recipe/TartaricForgeRecipe.java | 160 -- .../AlchemyTableCustomRecipe.java | 44 - .../AlchemyTableDyeableRecipe.java | 116 - .../AlchemyTablePotionAugmentRecipe.java | 97 - .../AlchemyTablePotionRecipe.java | 139 - .../alchemyTable/AlchemyTableRecipe.java | 201 -- .../registry/ModArmourTrackers.java | 66 - .../registry/ModCorruptionBlocks.java | 16 - .../bloodmagic/registry/ModRecipes.java | 273 -- .../bloodmagic/registry/ModRituals.java | 28 - .../registry/ModTranquilityHandlers.java | 21 - .../bloodmagic/ritual/AreaDescriptor.java | 549 ---- .../bloodmagic/ritual/CapabilityRuneType.java | 47 - .../ritual/EnumReaderBoundaries.java | 22 - .../ritual/EnumRitualReaderState.java | 8 - .../bloodmagic/ritual/EnumRuneType.java | 64 - .../bloodmagic/ritual/IMasterRitualStone.java | 79 - .../bloodmagic/ritual/IRitualStone.java | 23 - .../WayofTime/bloodmagic/ritual/Ritual.java | 371 --- .../bloodmagic/ritual/RitualComponent.java | 60 - .../bloodmagic/ritual/RitualManager.java | 154 -- .../bloodmagic/ritual/RitualRegister.java | 49 - .../bloodmagic/ritual/RitualRenderer.java | 12 - .../crushing/CrushingHandlerCuttingFluid.java | 49 - .../ritual/crushing/CrushingRegistry.java | 20 - .../ritual/crushing/ICrushingHandler.java | 16 - .../harvest/HarvestHandlerPlantable.java | 120 - .../ritual/harvest/HarvestHandlerStem.java | 58 - .../ritual/harvest/HarvestHandlerTall.java | 46 - .../ritual/harvest/HarvestRegistry.java | 105 - .../ritual/harvest/IHarvestHandler.java | 37 - .../imperfect/IImperfectRitualStone.java | 19 - .../ritual/imperfect/ImperfectRitual.java | 91 - .../ritual/imperfect/package-info.java | 7 - .../ritual/portal/LocationsHandler.java | 108 - .../ritual/types/RitualAltarBuilder.java | 261 -- .../ritual/types/RitualAnimalGrowth.java | 220 -- .../ritual/types/RitualArmourEvolve.java | 87 - .../ritual/types/RitualCobblestone.java | 96 - .../bloodmagic/ritual/types/RitualCondor.java | 89 - .../ritual/types/RitualContainment.java | 71 - .../ritual/types/RitualCrushing.java | 282 --- .../ritual/types/RitualCrystalHarvest.java | 87 - .../ritual/types/RitualCrystalSplit.java | 162 -- .../ritual/types/RitualEllipsoid.java | 238 -- .../ritual/types/RitualEternalSoul.java | 139 - .../ritual/types/RitualExpulsion.java | 237 -- .../ritual/types/RitualFeatheredEarth.java | 93 - .../ritual/types/RitualFeatheredKnife.java | 220 -- .../ritual/types/RitualFelling.java | 110 - .../ritual/types/RitualForsakenSoul.java | 198 -- .../ritual/types/RitualFullStomach.java | 109 - .../ritual/types/RitualGreenGrove.java | 277 -- .../ritual/types/RitualGrounding.java | 199 -- .../ritual/types/RitualHarvest.java | 122 - .../ritual/types/RitualInterdiction.java | 73 - .../ritual/types/RitualJumping.java | 85 - .../bloodmagic/ritual/types/RitualLava.java | 297 --- .../types/RitualLivingArmourDowngrade.java | 208 -- .../ritual/types/RitualMagnetic.java | 164 -- .../bloodmagic/ritual/types/RitualMeteor.java | 155 -- .../bloodmagic/ritual/types/RitualPlacer.java | 104 - .../bloodmagic/ritual/types/RitualPortal.java | 230 -- .../bloodmagic/ritual/types/RitualPump.java | 109 - .../ritual/types/RitualRegeneration.java | 185 -- .../bloodmagic/ritual/types/RitualSpeed.java | 184 -- .../ritual/types/RitualSuppression.java | 76 - .../ritual/types/RitualUpgradeRemove.java | 125 - .../ritual/types/RitualVeilOfEvil.java | 102 - .../types/RitualWardOfSacrosanctity.java | 105 - .../bloodmagic/ritual/types/RitualWater.java | 69 - .../ritual/types/RitualWellOfSuffering.java | 135 - .../bloodmagic/ritual/types/RitualZephyr.java | 95 - .../types/imperfect/ImperfectRitualDay.java | 23 - .../types/imperfect/ImperfectRitualNight.java | 24 - .../types/imperfect/ImperfectRitualRain.java | 29 - .../imperfect/ImperfectRitualResistance.java | 25 - .../imperfect/ImperfectRitualZombie.java | 32 - .../bloodmagic/routing/DefaultItemFilter.java | 117 - .../bloodmagic/routing/IFluidFilter.java | 33 - .../bloodmagic/routing/IFluidRoutingNode.java | 9 - .../routing/IInputFluidRoutingNode.java | 9 - .../routing/IInputItemRoutingNode.java | 9 - .../bloodmagic/routing/IItemFilter.java | 32 - .../bloodmagic/routing/IItemRoutingNode.java | 9 - .../routing/IMasterRoutingNode.java | 17 - .../routing/IOutputFluidRoutingNode.java | 9 - .../routing/IOutputItemRoutingNode.java | 9 - .../bloodmagic/routing/IRoutingFilter.java | 5 - .../bloodmagic/routing/IRoutingNode.java | 26 - .../routing/IgnoreNBTItemFilter.java | 21 - .../bloodmagic/routing/ModIdItemFilter.java | 16 - .../bloodmagic/routing/NodeHelper.java | 21 - .../bloodmagic/routing/OreDictItemFilter.java | 40 - .../routing/RoutingFluidFilter.java | 189 -- .../bloodmagic/routing/TestItemFilter.java | 214 -- .../bloodmagic/soul/DemonWillHolder.java | 81 - .../bloodmagic/soul/EnumDemonWillType.java | 46 - .../WayofTime/bloodmagic/soul/IDemonWill.java | 52 - .../bloodmagic/soul/IDemonWillConduit.java | 18 - .../bloodmagic/soul/IDemonWillGem.java | 27 - .../bloodmagic/soul/IDemonWillWeapon.java | 10 - .../bloodmagic/soul/IDiscreteDemonWill.java | 40 - .../bloodmagic/soul/ISoulBreathContainer.java | 15 - .../soul/PlayerDemonWillHandler.java | 176 -- .../structures/BuildTestStructure.java | 56 - .../bloodmagic/structures/Dungeon.java | 152 -- .../bloodmagic/structures/DungeonRoom.java | 62 - .../structures/DungeonRoomLoader.java | 75 - .../structures/DungeonRoomRegistry.java | 28 - .../structures/DungeonStructure.java | 47 - .../bloodmagic/structures/DungeonTester.java | 82 - .../bloodmagic/structures/DungeonUtil.java | 46 - .../bloodmagic/structures/ModDungeons.java | 26 - .../bloodmagic/teleport/ITeleport.java | 7 - .../bloodmagic/teleport/PortalLocation.java | 90 - .../bloodmagic/teleport/Teleport.java | 70 - .../bloodmagic/teleport/TeleportQueue.java | 37 - .../teleport/TeleporterBloodMagic.java | 32 - .../bloodmagic/teleport/Teleports.java | 248 -- .../bloodmagic/tile/TileAlchemyArray.java | 283 +-- .../bloodmagic/tile/TileAlchemyTable.java | 432 ---- .../WayofTime/bloodmagic/tile/TileAltar.java | 339 +-- .../bloodmagic/tile/TileBloodTank.java | 80 - .../bloodmagic/tile/TileDemonCrucible.java | 214 -- .../bloodmagic/tile/TileDemonCrystal.java | 185 -- .../tile/TileDemonCrystallizer.java | 133 - .../bloodmagic/tile/TileDemonPylon.java | 106 - .../tile/TileDimensionalPortal.java | 41 - .../tile/TileImperfectRitualStone.java | 46 - .../bloodmagic/tile/TileIncenseAltar.java | 160 -- .../bloodmagic/tile/TileInventory.java | 478 ++-- .../bloodmagic/tile/TileInversionPillar.java | 532 ---- .../tile/TileMasterRitualStone.java | 459 ---- .../WayofTime/bloodmagic/tile/TileMimic.java | 369 --- .../bloodmagic/tile/TilePhantomBlock.java | 46 - .../tile/TilePurificationAltar.java | 83 - .../bloodmagic/tile/TileSoulForge.java | 587 +++-- .../bloodmagic/tile/TileSpectralBlock.java | 84 - .../bloodmagic/tile/TileTeleposer.java | 149 -- .../bloodmagic/tile/base/TileBase.java | 204 +- .../bloodmagic/tile/base/TileTicking.java | 55 - .../tile/container/ContainerAlchemyTable.java | 123 - .../container/ContainerItemRoutingNode.java | 235 -- .../container/ContainerMasterRoutingNode.java | 20 - .../tile/container/ContainerSoulForge.java | 105 - .../tile/container/ContainerTeleposer.java | 80 - .../tile/routing/TileFilteredRoutingNode.java | 119 - .../tile/routing/TileInputRoutingNode.java | 73 - .../tile/routing/TileItemRoutingNode.java | 7 - .../tile/routing/TileMasterRoutingNode.java | 405 --- .../tile/routing/TileOutputRoutingNode.java | 73 - .../tile/routing/TileRoutingNode.java | 176 -- .../java/WayofTime/bloodmagic/util/BMLog.java | 116 +- .../WayofTime/bloodmagic/util/BlockStack.java | 68 - .../bloodmagic/util/BooleanResult.java | 42 +- .../WayofTime/bloodmagic/util/ChatUtil.java | 435 ++-- .../WayofTime/bloodmagic/util/Constants.java | 286 +-- .../util/DamageSourceBloodMagic.java | 32 +- .../bloodmagic/util/GhostItemHelper.java | 56 - .../bloodmagic/util/ISigilFluidItem.java | 14 - .../bloodmagic/util/ItemStackWrapper.java | 113 - .../WayofTime/bloodmagic/util/PluginUtil.java | 136 - .../bloodmagic/util/SigilFluidWrapper.java | 81 - .../WayofTime/bloodmagic/util/StateUtil.java | 38 - .../java/WayofTime/bloodmagic/util/Utils.java | 1013 +------- .../bloodmagic/util/handler/IMCHandler.java | 61 - .../util/handler/event/ClientHandler.java | 398 --- .../util/handler/event/CraftingHandler.java | 149 -- .../util/handler/event/GenericHandler.java | 624 +---- .../handler/event/LivingArmourHandler.java | 372 --- .../handler/event/StatTrackerHandler.java | 175 -- .../util/handler/event/WillHandler.java | 253 +- .../util/helper/BindableHelper.java | 79 +- .../bloodmagic/util/helper/IncenseHelper.java | 46 - .../bloodmagic/util/helper/ItemHelper.java | 131 - .../bloodmagic/util/helper/NBTHelper.java | 18 +- .../bloodmagic/util/helper/NetworkHelper.java | 281 +- .../bloodmagic/util/helper/NumeralHelper.java | 51 +- .../bloodmagic/util/helper/PlayerHelper.java | 93 +- .../util/helper/PlayerSacrificeHelper.java | 244 +- .../util/helper/PurificationHelper.java | 33 - .../bloodmagic/util/helper/RecipeHelper.java | 55 - .../bloodmagic/util/helper/RitualHelper.java | 211 -- .../bloodmagic/util/helper/TextHelper.java | 108 +- .../bloodmagic/api/IBloodMagicAPI.java | 80 + .../api/IBloodMagicRecipeRegistrar.java | 100 + .../bloodmagic/api/SerializerHelper.java | 60 + .../api/event/BloodMagicCraftedEvent.java | 84 + .../api/impl/recipe/BloodMagicRecipe.java | 69 + .../api/inventory/IgnoredIInventory.java | 67 + .../api/providers/IBaseProvider.java | 23 + .../api/providers/IEntityTypeProvider.java | 32 + .../api/text/IHasTextComponent.java | 8 + .../api/text/IHasTranslationKey.java | 6 + .../bloodmagic/client/ClientEvents.java | 98 + .../client/render/BloodMagicRenderer.java | 104 + .../client/render/RenderResizableCuboid.java | 168 ++ .../render/RenderResizableQuadrilateral.java | 167 ++ .../alchemyarray/AlchemyArrayRenderer.java | 114 + .../render/entity/BloodLightRenderer.java | 24 + .../render/entity/SoulSnareRenderer.java | 24 + .../bloodmagic/client/screens/ScreenBase.java | 68 + .../client/screens/ScreenSoulForge.java | 85 + .../alchemyarray/AlchemyArrayEffect.java | 15 + .../AlchemyArrayEffectCrafting.java | 69 + .../common/block/BlockAlchemyArray.java | 112 + .../bloodmagic/common/block/BlockAltar.java | 100 + .../common/block/BlockBloodLight.java | 64 + .../common/block/BlockBloodRune.java | 45 + .../common/block/BlockSoulForge.java | 95 + .../common/block/BloodMagicBlocks.java | 88 + .../common/block/BloodstoneBlock.java | 13 + .../common/data/GeneratorBaseRecipes.java | 51 + .../common/data/GeneratorBlockStates.java | 38 + .../common/data/GeneratorItemModels.java | 105 + .../common/data/GeneratorLanguage.java | 161 ++ .../common/data/GeneratorLootTable.java | 99 + .../data/recipe/BaseRecipeProvider.java | 44 + .../data/recipe/BloodMagicRecipeBuilder.java | 145 ++ .../data/recipe/BloodMagicRecipeProvider.java | 25 + .../common/data/recipe/RecipeCriterion.java | 20 + .../builder/AlchemyArrayRecipeBuilder.java | 58 + .../builder/BloodAltarRecipeBuilder.java | 63 + .../builder/TartaricForgeRecipeBuilder.java | 75 + .../common/item/BloodMagicItems.java | 113 + .../common/item/ItemArcaneAshes.java | 98 + .../bloodmagic/common/item/ItemBase.java | 38 + .../common/item/ItemBindableBase.java | 35 + .../bloodmagic/common/item/ItemBloodOrb.java | 106 + .../common/item/ItemDaggerOfSacrifice.java | 75 + .../common/item/ItemSacrificialDagger.java | 204 ++ .../bloodmagic/common/item/ItemSigil.java | 64 + .../common/item/sigil/ItemSigilAir.java | 62 + .../common/item/sigil/ItemSigilBase.java | 51 + .../item/sigil/ItemSigilBloodLight.java | 104 + .../item/sigil/ItemSigilDivination.java | 114 + .../common/item/sigil/ItemSigilFastMiner.java | 61 + .../common/item/sigil/ItemSigilFluidBase.java | 152 ++ .../common/item/sigil/ItemSigilFrost.java | 24 + .../item/sigil/ItemSigilGreenGrove.java | 114 + .../common/item/sigil/ItemSigilLava.java | 90 + .../common/item/sigil/ItemSigilMagnetism.java | 54 + .../item/sigil/ItemSigilToggleable.java | 119 + .../item/sigil/ItemSigilToggleableBase.java | 54 + .../common/item/sigil/ItemSigilVoid.java | 85 + .../common/item/sigil/ItemSigilWater.java | 100 + .../common/item/soul/ItemMonsterSoul.java | 128 + .../common/item/soul/ItemSentientSword.java | 503 ++++ .../common/item/soul/ItemSoulGem.java | 260 ++ .../common/item/soul/ItemSoulSnare.java | 76 + .../recipe/AlchemyArrayRecipeProvider.java | 38 + .../recipe/BloodAltarRecipeProvider.java | 72 + .../common/recipe/BloodMagicRecipeType.java | 13 + .../common/recipe/ISubRecipeProvider.java | 14 + .../recipe/TartaricForgeRecipeProvider.java | 36 + .../AlchemyArrayRecipeSerializer.java | 89 + .../BloodAltarRecipeSerializer.java | 85 + .../TartaricForgeRecipeSerializer.java | 100 + .../common/registration/INamedEntry.java | 11 + .../registration/WrappedDeferredRegister.java | 49 + .../registration/WrappedRegistryObject.java | 32 + .../impl/BloodOrbDeferredRegister.java | 26 + .../impl/BloodOrbRegistryObject.java | 13 + .../impl/EntityTypeDeferredRegister.java | 20 + .../impl/EntityTypeRegistryObject.java | 26 + .../IRecipeSerializerDeferredRegister.java | 23 + .../impl/IRecipeSerializerRegistryObject.java | 24 + .../registries/BloodMagicEntityTypes.java | 22 + .../BloodMagicRecipeSerializers.java | 33 + .../jei/altar/BloodAltarRecipeCategory.java | 130 + .../array/AlchemyArrayCraftingCategory.java | 93 + .../core/registry/AlchemyArrayRegistry.java | 53 + .../AlchemyArrayRendererRegistry.java | 67 + .../bloodmagic/entity/BloodMagicEntities.java | 30 + .../bloodmagic/network/BasePacketHandler.java | 151 ++ .../bloodmagic/potion/BloodMagicPotions.java | 16 + .../bloodmagic/potion/PotionSoulSnare.java | 11 + .../recipe/IRecipeAlchemyArray.java | 31 + .../bloodmagic/recipe/IRecipeBloodAltar.java | 30 + .../recipe/IRecipeTartaricForge.java | 35 + .../tile/contailer/ContainerSoulForge.java | 154 ++ .../bloodmagic/will/DemonWillHolder.java | 99 + .../bloodmagic/will/EnumDemonWillType.java | 33 + .../wayoftime/bloodmagic/will/IDemonWill.java | 45 + .../bloodmagic/will/IDemonWillConduit.java | 19 + .../bloodmagic/will/IDemonWillGem.java | 29 + .../bloodmagic/will/IDemonWillWeapon.java | 11 + .../bloodmagic/will/IDiscreteDemonWill.java | 41 + .../will/PlayerDemonWillHandler.java | 200 ++ src/main/resources/META-INF/mods.toml | 59 + .../armatures/block/pillar_mid.json | 42 - .../asms/block/inversion_pillar.json | 13 - .../blockstates/activation_crystal.json | 26 - .../bloodmagic/blockstates/alchemic_vial.json | 18 - .../bloodmagic/blockstates/alchemy_array.json | 7 +- .../bloodmagic/blockstates/alchemy_table.json | 50 - .../assets/bloodmagic/blockstates/altar.json | 21 +- .../bloodmagic/blockstates/altar_maker.json | 16 - .../bloodmagic/blockstates/arcane_ashes.json | 16 - .../blockstates/base_fluid_filter.json | 16 - .../blockstates/base_item_filter.json | 31 - .../bloodmagic/blockstates/blood_light.json | 10 - .../bloodmagic/blockstates/blood_orb.json | 41 - .../bloodmagic/blockstates/blood_rune.json | 67 - .../bloodmagic/blockstates/blood_shard.json | 21 - .../bloodmagic/blockstates/blood_tank.json | 29 - .../bloodmagic/blockstates/bound_axe.json | 21 - .../bloodmagic/blockstates/bound_pickaxe.json | 21 - .../bloodmagic/blockstates/bound_shovel.json | 21 - .../bloodmagic/blockstates/bound_sword.json | 21 - .../bloodmagic/blockstates/component.json | 176 -- .../bloodmagic/blockstates/cutting_fluid.json | 21 - .../blockstates/dagger_of_sacrifice.json | 16 - .../blockstates/decorative_brick.json | 32 - .../bloodmagic/blockstates/demon_brick_1.json | 35 - .../bloodmagic/blockstates/demon_brick_2.json | 88 - .../blockstates/demon_crucible.json | 14 - .../bloodmagic/blockstates/demon_crystal.json | 146 -- .../blockstates/demon_crystallizer.json | 14 - .../bloodmagic/blockstates/demon_extras.json | 88 - .../bloodmagic/blockstates/demon_light.json | 38 - .../blockstates/demon_pillar_1.json | 58 - .../blockstates/demon_pillar_2.json | 58 - .../blockstates/demon_pillar_cap_1.json | 57 - .../blockstates/demon_pillar_cap_2.json | 57 - .../blockstates/demon_pillar_cap_3.json | 50 - .../bloodmagic/blockstates/demon_pylon.json | 14 - .../blockstates/demon_stairs_1.json | 100 - .../blockstates/demon_stairs_2.json | 100 - .../blockstates/demon_stairs_3.json | 59 - .../bloodmagic/blockstates/demon_wall_1.json | 109 - .../blockstates/demon_will_gauge.json | 16 - .../blockstates/dimensional_portal.json | 14 - .../blockstates/experience_tome.json | 16 - .../bloodmagic/blockstates/icarus_scroll.json | 21 - .../bloodmagic/blockstates/incense_altar.json | 14 - .../blockstates/input_routing_node.json | 66 - .../blockstates/inscription_tool.json | 42 - .../blockstates/inversion_pillar.json | 51 - .../blockstates/inversion_pillar_end.json | 72 - .../blockstates/item_demon_crystal.json | 36 - .../blockstates/item_routing_node.json | 66 - .../bloodmagic/blockstates/lava_crystal.json | 16 - .../bloodmagic/blockstates/life_essence.json | 9 - .../bloodmagic/blockstates/living_armour.json | 31 - .../blockstates/master_routing_node.json | 65 - .../assets/bloodmagic/blockstates/mimic.json | 38 - .../bloodmagic/blockstates/monster_soul.json | 36 - .../bloodmagic/blockstates/node_router.json | 16 - .../blockstates/output_routing_node.json | 66 - .../blockstates/pack_sacrifice.json | 16 - .../blockstates/pack_self_sacrifice.json | 16 - .../assets/bloodmagic/blockstates/path.json | 53 - .../bloodmagic/blockstates/phantom.json | 5 - .../blockstates/points_upgrade.json | 16 - .../bloodmagic/blockstates/potion_flask.json | 23 - .../blockstates/ritual_controller.json | 27 - .../blockstates/ritual_diviner.json | 26 - .../bloodmagic/blockstates/ritual_reader.json | 16 - .../bloodmagic/blockstates/ritual_stone.json | 47 - .../blockstates/sacrificial_dagger.json | 26 - .../bloodmagic/blockstates/sanguine_book.json | 16 - .../blockstates/sentient_armour.json | 111 - .../blockstates/sentient_armour_gem.json | 21 - .../bloodmagic/blockstates/sentient_axe.json | 36 - .../bloodmagic/blockstates/sentient_bow.json | 34 - .../blockstates/sentient_pickaxe.json | 36 - .../blockstates/sentient_shovel.json | 36 - .../blockstates/sentient_sword.json | 36 - .../bloodmagic/blockstates/sigil_air.json | 16 - .../blockstates/sigil_blood_light.json | 16 - .../bloodmagic/blockstates/sigil_bounce.json | 22 - .../bloodmagic/blockstates/sigil_claw.json | 21 - .../blockstates/sigil_compression.json | 21 - .../blockstates/sigil_divination.json | 16 - .../blockstates/sigil_elemental_affinity.json | 21 - .../blockstates/sigil_ender_severance.json | 21 - .../blockstates/sigil_fast_miner.json | 21 - .../bloodmagic/blockstates/sigil_frost.json | 22 - .../blockstates/sigil_green_grove.json | 21 - .../bloodmagic/blockstates/sigil_haste.json | 21 - .../bloodmagic/blockstates/sigil_holding.json | 22 - .../bloodmagic/blockstates/sigil_lava.json | 16 - .../blockstates/sigil_magnetism.json | 21 - .../blockstates/sigil_phantom_bridge.json | 21 - .../bloodmagic/blockstates/sigil_seer.json | 16 - .../blockstates/sigil_suppression.json | 21 - .../blockstates/sigil_teleposition.json | 16 - .../blockstates/sigil_transposition.json | 16 - .../bloodmagic/blockstates/sigil_void.json | 16 - .../bloodmagic/blockstates/sigil_water.json | 16 - .../blockstates/sigil_whirlwind.json | 21 - .../assets/bloodmagic/blockstates/slate.json | 36 - .../bloodmagic/blockstates/soul_forge.json | 14 - .../bloodmagic/blockstates/soul_gem.json | 136 - .../bloodmagic/blockstates/soul_snare.json | 16 - .../bloodmagic/blockstates/soulforge.json | 7 + .../bloodmagic/blockstates/spectral.json | 10 - .../bloodmagic/blockstates/teleposer.json | 17 - .../blockstates/teleposition_focus.json | 31 - .../blockstates/test_spell_block.json | 29 - .../bloodmagic/blockstates/upgrade_tome.json | 16 - .../blockstates/upgrade_trainer.json | 16 - .../assets/bloodmagic/books/architect.xml | 106 - .../assets/bloodmagic/lang/bg_BG.lang | 85 - .../assets/bloodmagic/lang/de_DE.lang | 908 ------- .../assets/bloodmagic/lang/en_US.lang | 954 ------- .../assets/bloodmagic/lang/en_US.lang_old | 542 ---- .../assets/bloodmagic/lang/fr_FR.lang | 649 ----- .../assets/bloodmagic/lang/it_IT.lang | 181 -- .../assets/bloodmagic/lang/ja_JP.lang | 892 ------- .../assets/bloodmagic/lang/ko_KR.lang | 194 -- .../assets/bloodmagic/lang/ru_RU.lang | 572 ----- .../assets/bloodmagic/lang/zh_CN.lang | 890 ------- .../assets/bloodmagic/lang/zh_TW.lang | 404 --- .../bloodmagic/loot_tables/bm_loot_table.json | 25 - .../bloodmagic/models/block/blockaltar.obj | 2 +- .../models/block/blockhellfireforge.obj | 2 +- .../bloodmagic/models/block/bloodaltar.json | 10 + .../bloodmagic/models/block/soulforge.json | 10 + .../assets/bloodmagic/models/item/altar.json | 3 + .../models/item/life_essence_bucket.json | 5 + .../bloodmagic/models/item/soulforge.json | 3 + .../assets/bloodmagic/recipes/_constants.json | 128 - .../assets/bloodmagic/recipes/_factories.json | 5 - .../recipes/activation_crystal.json | 16 - .../bloodmagic/recipes/alchemy_table.json | 29 - .../recipes/base_fluid_filter_0.json | 24 - .../recipes/base_item_filter_0.json | 24 - .../recipes/base_item_filter_1.json | 24 - .../recipes/base_item_filter_2.json | 24 - .../recipes/base_item_filter_3.json | 24 - .../blood_rune/blood_rune_acceleration.json | 32 - .../blood_rune/blood_rune_augcapacity.json | 32 - .../recipes/blood_rune/blood_rune_blank.json | 25 - .../blood_rune/blood_rune_capacity.json | 28 - .../blood_rune/blood_rune_charging.json | 32 - .../blood_rune/blood_rune_displacement.json | 28 - .../recipes/blood_rune/blood_rune_orb.json | 29 - .../blood_rune/blood_rune_sacrifice.json | 32 - .../blood_rune/blood_rune_selfsacrifice.json | 32 - .../recipes/blood_rune/blood_rune_speed.json | 28 - .../recipes/blood_tank/blood_tank_0.json | 25 - .../recipes/blood_tank/blood_tank_1.json | 26 - .../recipes/blood_tank/blood_tank_10.json | 26 - .../recipes/blood_tank/blood_tank_11.json | 26 - .../recipes/blood_tank/blood_tank_12.json | 26 - .../recipes/blood_tank/blood_tank_13.json | 26 - .../recipes/blood_tank/blood_tank_14.json | 26 - .../recipes/blood_tank/blood_tank_15.json | 26 - .../recipes/blood_tank/blood_tank_2.json | 26 - .../recipes/blood_tank/blood_tank_3.json | 26 - .../recipes/blood_tank/blood_tank_4.json | 26 - .../recipes/blood_tank/blood_tank_5.json | 26 - .../recipes/blood_tank/blood_tank_6.json | 26 - .../recipes/blood_tank/blood_tank_7.json | 26 - .../recipes/blood_tank/blood_tank_8.json | 26 - .../recipes/blood_tank/blood_tank_9.json | 26 - .../decorative_brick_bloodstone_brick.json | 18 - .../decorative_brick_bloodstone_tile.json | 17 - .../demon_brick_1_brick1_corrosive.json | 18 - .../demon_brick_1_brick1_destructive.json | 18 - .../demon_decor/demon_brick_1_brick1_raw.json | 18 - .../demon_brick_1_brick1_steadfast.json | 18 - .../demon_brick_1_brick1_vengeful.json | 18 - .../demon_brick_2_smallbrick_corrosive.json | 18 - .../demon_brick_2_smallbrick_destructive.json | 18 - .../demon_brick_2_smallbrick_raw.json | 18 - .../demon_brick_2_smallbrick_steadfast.json | 18 - .../demon_brick_2_smallbrick_vengeful.json | 18 - .../demon_brick_2_tile_corrosive.json | 23 - .../demon_brick_2_tile_destructive.json | 23 - .../demon_decor/demon_brick_2_tile_raw.json | 23 - .../demon_brick_2_tile_steadfast.json | 23 - .../demon_brick_2_tile_vengeful.json | 23 - .../demon_brick_2_tilespecial_corrosive.json | 27 - ...demon_brick_2_tilespecial_destructive.json | 27 - .../demon_brick_2_tilespecial_raw.json | 27 - .../demon_brick_2_tilespecial_steadfast.json | 27 - .../demon_brick_2_tilespecial_vengeful.json | 27 - ...demon_extras_polished_stone_corrosive.json | 18 - ...mon_extras_polished_stone_destructive.json | 18 - .../demon_extras_polished_stone_raw.json | 18 - ...demon_extras_polished_stone_steadfast.json | 18 - .../demon_extras_polished_stone_vengeful.json | 18 - .../demon_extras_stone_corrosive.json | 38 - .../demon_extras_stone_destructive.json | 38 - .../demon_decor/demon_extras_stone_raw.json | 38 - .../demon_extras_stone_steadfast.json | 38 - .../demon_extras_stone_vengeful.json | 38 - .../demon_decor/demon_light_corrosive.json | 22 - .../demon_decor/demon_light_destructive.json | 22 - .../recipes/demon_decor/demon_light_raw.json | 22 - .../demon_decor/demon_light_steadfast.json | 22 - .../demon_decor/demon_light_vengeful.json | 22 - .../demon_decor/demon_pillar_1_corrosive.json | 19 - .../demon_pillar_1_destructive.json | 19 - .../demon_decor/demon_pillar_1_raw.json | 19 - .../demon_decor/demon_pillar_1_steadfast.json | 19 - .../demon_decor/demon_pillar_1_vengeful.json | 19 - .../demon_decor/demon_pillar_2_corrosive.json | 23 - .../demon_pillar_2_destructive.json | 23 - .../demon_decor/demon_pillar_2_raw.json | 23 - .../demon_decor/demon_pillar_2_steadfast.json | 23 - .../demon_decor/demon_pillar_2_vengeful.json | 23 - .../demon_pillar_cap_1_corrosive.json | 18 - .../demon_decor/demon_pillar_cap_1_raw.json | 18 - .../demon_pillar_cap_2_destructive.json | 18 - .../demon_pillar_cap_2_vengeful.json | 18 - .../demon_pillar_cap_3_steadfast.json | 17 - .../demon_decor/demon_stairs_1_corrosive.json | 19 - .../demon_decor/demon_stairs_1_raw.json | 19 - .../demon_stairs_2_destructive.json | 19 - .../demon_decor/demon_stairs_2_vengeful.json | 19 - .../demon_decor/demon_stairs_3_steadfast.json | 18 - .../demon_wall_1_brick_corrosive.json | 18 - .../demon_wall_1_brick_destructive.json | 18 - .../demon_decor/demon_wall_1_brick_raw.json | 18 - .../demon_wall_1_brick_steadfast.json | 18 - .../demon_wall_1_brick_vengeful.json | 18 - .../demon_wall_1_large_corrosive.json | 18 - .../demon_wall_1_large_destructive.json | 18 - .../demon_decor/demon_wall_1_large_raw.json | 18 - .../demon_wall_1_large_steadfast.json | 18 - .../demon_wall_1_large_vengeful.json | 18 - .../demon_wall_1_smallbrick_corrosive.json | 18 - .../demon_wall_1_smallbrick_destructive.json | 18 - .../demon_wall_1_smallbrick_raw.json | 18 - .../demon_wall_1_smallbrick_steadfast.json | 18 - .../demon_wall_1_smallbrick_vengeful.json | 18 - .../bloodmagic/recipes/experience_tome.json | 33 - .../bloodmagic/recipes/incense_altar.json | 27 - .../bloodmagic/recipes/lava_crystal.json | 29 - .../bloodmagic/recipes/mimic_nohitbox.json | 27 - .../bloodmagic/recipes/mimic_solidclear.json | 30 - .../bloodmagic/recipes/mimic_solidlight.json | 33 - .../bloodmagic/recipes/mimic_solidopaque.json | 30 - .../bloodmagic/recipes/pack_sacrifice.json | 29 - .../recipes/pack_self_sacrifice.json | 29 - .../recipes/path/path_obsidian.json | 26 - .../recipes/path/path_obsidiantile.json | 26 - .../bloodmagic/recipes/path/path_stone.json | 26 - .../recipes/path/path_stonetile.json | 26 - .../bloodmagic/recipes/path/path_wood.json | 26 - .../recipes/path/path_woodtile.json | 26 - .../recipes/path/path_wornstone.json | 30 - .../recipes/path/path_wornstonetile.json | 26 - .../recipes/ritual_controller_imperfect.json | 24 - .../recipes/ritual_controller_inverted.json | 20 - .../recipes/ritual_controller_master.json | 25 - .../recipes/ritual_controller_master_alt.json | 13 - .../bloodmagic/recipes/ritual_diviner_0.json | 36 - .../bloodmagic/recipes/ritual_diviner_1.json | 26 - .../bloodmagic/recipes/ritual_reader.json | 27 - .../recipes/ritual_stone_blank.json | 26 - .../recipes/ritual_stone_reset.json | 13 - .../recipes/sacrificial_dagger.json | 23 - .../assets/bloodmagic/recipes/soul_forge.json | 25 - .../assets/bloodmagic/recipes/soul_snare.json | 24 - .../assets/bloodmagic/recipes/teleposer.json | 23 - .../recipes/teleposition_focus_2.json | 17 - .../recipes/teleposition_focus_3.json | 17 - .../bloodmagic/recipes/upgrade_trainer.json | 27 - .../bloodmagic/schematics/corridor1.json | 49 - .../bloodmagic/schematics/hallchest1.json | 41 - .../bloodmagic/schematics/rawbuilding1.json | 47 - .../bloodmagic/schematics/schematics.json | 5 - .../bloodmagic/shaders/beam-broken.frag | 10 - .../assets/bloodmagic/shaders/beam.frag | 12 - .../bloodmagic/structures/building1.nbt | 0 .../bloodmagic/structures/corridor1.nbt | 0 .../bloodmagic/structures/hallchest1.nbt | 0 .../{blocks => block}/accelerationrune.png | Bin .../{blocks => block}/airritualstone.png | Bin .../{blocks => block}/altarcapacityrune.png | Bin .../{blocks => block}/bettercapacityrune.png | Bin .../textures/{blocks => block}/blankrune.png | Bin .../bloodlight.png} | Bin .../{blocks => block}/bloodsocket.png | Bin .../{blocks => block}/bloodstonebrick.png | Bin .../textures/{blocks => block}/bloodtank.png | Bin .../{blocks => block}/chargingrune.png | Bin .../{blocks => block}/dislocationrune.png | Bin .../dungeon/dungeon_brick1.png | Bin .../dungeon/dungeon_brick1_c.png | Bin .../dungeon/dungeon_brick1_d.png | Bin .../dungeon/dungeon_brick1_s.png | Bin .../dungeon/dungeon_brick1_v.png | Bin .../dungeon/dungeon_brick2.png | Bin .../dungeon/dungeon_brick2_c.png | Bin .../dungeon/dungeon_brick2_d.png | Bin .../dungeon/dungeon_brick2_s.png | Bin .../dungeon/dungeon_brick2_v.png | Bin .../dungeon/dungeon_brick3.png | Bin .../dungeon/dungeon_brick3_c.png | Bin .../dungeon/dungeon_brick3_d.png | Bin .../dungeon/dungeon_brick3_s.png | Bin .../dungeon/dungeon_brick3_v.png | Bin .../{blocks => block}/dungeon/dungeon_eye.png | Bin .../dungeon/dungeon_eye_c.png | Bin .../dungeon/dungeon_eye_d.png | Bin .../dungeon/dungeon_eye_s.png | Bin .../dungeon/dungeon_eye_v.png | Bin .../dungeon/dungeon_metal.png | Bin .../dungeon/dungeon_metal_c.png | Bin .../dungeon/dungeon_metal_d.png | Bin .../dungeon/dungeon_metal_s.png | Bin .../dungeon/dungeon_metal_v.png | Bin .../dungeon/dungeon_pillar.png | Bin .../dungeon/dungeon_pillar_c.png | Bin .../dungeon/dungeon_pillar_d.png | Bin .../dungeon/dungeon_pillar_s.png | Bin .../dungeon/dungeon_pillar_v.png | Bin .../dungeon/dungeon_pillarbottom.png | Bin .../dungeon/dungeon_pillarbottom_c.png | Bin .../dungeon/dungeon_pillarbottom_d.png | Bin .../dungeon/dungeon_pillarbottom_s.png | Bin .../dungeon/dungeon_pillarbottom_v.png | Bin .../dungeon/dungeon_pillarheart.png | Bin .../dungeon/dungeon_pillarheart_c.png | Bin .../dungeon/dungeon_pillarheart_d.png | Bin .../dungeon/dungeon_pillarheart_s.png | Bin .../dungeon/dungeon_pillarheart_v.png | Bin .../dungeon/dungeon_pillarspecial.png | Bin .../dungeon/dungeon_pillarspecial_c.png | Bin .../dungeon/dungeon_pillarspecial_d.png | Bin .../dungeon/dungeon_pillarspecial_s.png | Bin .../dungeon/dungeon_pillarspecial_v.png | Bin .../dungeon/dungeon_pillartop.png | Bin .../dungeon/dungeon_pillartop_c.png | Bin .../dungeon/dungeon_pillartop_d.png | Bin .../dungeon/dungeon_pillartop_s.png | Bin .../dungeon/dungeon_pillartop_v.png | Bin .../dungeon/dungeon_polished.png | Bin .../dungeon/dungeon_polished_c.png | Bin .../dungeon/dungeon_polished_d.png | Bin .../dungeon/dungeon_polished_s.png | Bin .../dungeon/dungeon_polished_v.png | Bin .../dungeon/dungeon_smallbrick.png | Bin .../dungeon/dungeon_smallbrick_c.png | Bin .../dungeon/dungeon_smallbrick_d.png | Bin .../dungeon/dungeon_smallbrick_s.png | Bin .../dungeon/dungeon_smallbrick_v.png | Bin .../dungeon/dungeon_stone.png | Bin .../dungeon/dungeon_stone_c.png | Bin .../dungeon/dungeon_stone_d.png | Bin .../dungeon/dungeon_stone_s.png | Bin .../dungeon/dungeon_stone_v.png | Bin .../dungeon/dungeon_tile.png | Bin .../dungeon/dungeon_tile_c.png | Bin .../dungeon/dungeon_tile_d.png | Bin .../dungeon/dungeon_tile_s.png | Bin .../dungeon/dungeon_tile_v.png | Bin .../dungeon/dungeon_tilespecial.png | Bin .../dungeon/dungeon_tilespecial_c.png | Bin .../dungeon/dungeon_tilespecial_d.png | Bin .../dungeon/dungeon_tilespecial_s.png | Bin .../dungeon/dungeon_tilespecial_v.png | Bin .../{blocks => block}/duskritualstone.png | Bin .../{blocks => block}/earthritualstone.png | Bin .../{blocks => block}/efficiencyrune.png | Bin .../textures/{blocks => block}/empty.png | Bin .../{blocks => block}/emptysocket.png | Bin .../{blocks => block}/etherealopaquemimic.png | Bin .../{blocks => block}/fireritualstone.png | Bin .../imperfectritualstone.png | Bin .../textures/block/largebloodstonebrick.png | Bin 0 -> 598 bytes .../{blocks => block}/lifeessenceflowing.png | Bin .../lifeessenceflowing.png.mcmeta | 0 .../{blocks => block}/lifeessencestill.png | Bin .../lifeessencestill.png.mcmeta | 0 .../{blocks => block}/lightritualstone.png | Bin .../{blocks => block}/masterritualstone.png | Bin .../masterritualstone_inverted.png | Bin .../{blocks => block}/obsidianbrickpath.png | Bin .../{blocks => block}/obsidiantilepath.png | Bin .../{blocks => block}/orbcapacityrune.png | Bin .../{blocks => block}/phantomblock.png | Bin .../{blocks => block}/ritualstone.png | Bin .../sacrificerune.png} | Bin .../selfsacrificerune.png} | Bin .../{blocks => block}/sentientmimic.png | Bin .../{blocks => block}/shardcluster.png | Bin .../{blocks => block}/shardclusterbrick.png | Bin .../{blocks => block}/simpletranscircle.png | Bin .../{blocks => block}/solidclearmimic.png | Bin .../{blocks => block}/solidlightmimic.png | Bin .../{blocks => block}/solidopaquemimic.png | Bin .../bloodmagic/textures/block/soul_forge.png | Bin 0 -> 1502 bytes .../textures/{blocks => block}/soulforge.png | Bin .../{blocks => block}/spectralblock.png | Bin .../textures/{blocks => block}/speedrune.png | Bin .../{blocks => block}/stonebrickpath.png | Bin .../{blocks => block}/stonetilepath.png | Bin .../{blocks => block}/teleposer_side.png | Bin .../{blocks => block}/teleposer_top.png | Bin .../{blocks => block}/waterritualstone.png | Bin .../{blocks => block}/woodbrickpath.png | Bin .../{blocks => block}/woodtilepath.png | Bin .../{blocks => block}/wornstonebrickpath.png | Bin .../{blocks => block}/wornstonetilepath.png | Bin .../activationcrystalawakened.png | Bin .../activationcrystalcreative.png | Bin .../{items => item}/activationcrystalweak.png | Bin .../{items => item}/airscribetool.png | Bin .../textures/{items => item}/airsigil.png | Bin .../{items => item}/alchemic_liquid.png | Bin .../{items => item}/alchemic_ribbon.png | Bin .../{items => item}/alchemic_vial.png | Bin .../textures/{items => item}/altarmaker.png | Bin .../textures/{items => item}/ampouleempty.png | Bin .../textures/{items => item}/ampoulefull.png | Bin .../textures/{items => item}/antiseptic.png | Bin .../{items => item}/apprenticebloodorb.png | Bin .../textures/{items => item}/arcaneashes.png | Bin .../{items => item}/archmagebloodorb.png | Bin .../{items => item}/basemonstersoul.png | Bin .../basemonstersoul_corrosive.png | Bin .../basemonstersoul_destructive.png | Bin .../basemonstersoul_steadfast.png | Bin .../basemonstersoul_vengeful.png | Bin .../{items => item}/basiccuttingfluid.png | Bin .../textures/{items => item}/blackpudding.png | Bin .../textures/{items => item}/blanksigil.png | Bin .../textures/{items => item}/blankslate.png | Bin .../{items => item}/bloodlightsigil.png | Bin .../textures/{items => item}/bloodpack.png | Bin .../{items => item}/bouncesigil_activated.png | Bin .../bouncesigil_deactivated.png | Bin .../{items => item}/boundaxe_activated.png | Bin .../boundpickaxe_activated.png | Bin .../{items => item}/boundshovel_activated.png | Bin .../{items => item}/boundsword_activated.png | Bin .../textures/{items => item}/boundtool.png | Bin .../{items => item}/bridgesigil_activated.png | Bin .../bridgesigil_deactivated.png | Bin .../{items => item}/ceremonialdagger.png | Bin .../{items => item}/clawsigil_activated.png | Bin .../{items => item}/clawsigil_deactivated.png | Bin .../textures/{items => item}/coagulant.png | Bin .../textures/{items => item}/coalsand.png | Bin .../{items => item}/componentframeparts.png | Bin .../compressionsigil_activated.png | Bin .../compressionsigil_deactivated.png | Bin .../{items => item}/corrosivecrystal.png | Bin .../{items => item}/crucibleupgrade.png | Bin .../{items => item}/daggerofsacrifice.png | Bin .../{items => item}/dawnscribetool.png | Bin .../{items => item}/defaultcrystal.png | Bin .../{items => item}/demonbloodshard.png | Bin .../{items => item}/demonicteleposerfocus.png | Bin .../textures/{items => item}/demonslate.png | Bin .../{items => item}/demonwillgauge.png | Bin .../{items => item}/destructivecrystal.png | Bin .../{items => item}/divinationsigil.png | Bin .../{items => item}/duskscribetool.png | Bin .../{items => item}/earthscribetool.png | Bin .../elementalsigil_activated.png | Bin .../elementalsigil_deactivated.png | Bin .../enhancedteleposerfocus.png | Bin .../{items => item}/etherealslate.png | Bin .../{items => item}/experiencebook.png | Bin .../{items => item}/explosivepowder.png | Bin .../{items => item}/firescribetool.png | Bin .../fluidrouterfilterexact.png | Bin .../textures/{items => item}/goldsand.png | Bin .../{items => item}/growthsigil_activated.png | Bin .../growthsigil_deactivated.png | Bin .../harvestgoddesssigil_activated.png | Bin .../harvestgoddesssigil_deactivated.png | Bin .../{items => item}/hastesigil_activated.png | Bin .../hastesigil_deactivated.png | Bin .../icarusscroll_activated.png | Bin .../icarusscroll_deactivated.png | Bin .../{items => item}/icesigil_activated.png | Bin .../{items => item}/icesigil_deactivated.png | Bin .../textures/{items => item}/information.png | Bin .../textures/{items => item}/infusedslate.png | Bin .../{items => item}/inputroutingfocus.png | Bin .../textures/{items => item}/ironsand.png | Bin .../{items => item}/item_deactivated.png | Bin .../{items => item}/itemrouterfilterexact.png | Bin .../itemrouterfilterignorenbt.png | Bin .../itemrouterfiltermoditems.png | Bin .../itemrouterfilteroredict.png | Bin .../textures/{items => item}/lavacrystal.png | Bin .../textures/{items => item}/lavasigil.png | Bin .../textures/{items => item}/lifebucket.png | Bin .../textures/{items => item}/livingboots.png | Bin .../textures/{items => item}/livinghelmet.png | Bin .../{items => item}/livingleggings.png | Bin .../textures/{items => item}/livingplate.png | Bin .../{items => item}/magicianbloodorb.png | Bin .../textures/{items => item}/mailorder.png | Bin .../{items => item}/masterbloodorb.png | Bin .../{items => item}/miningsigil_activated.png | Bin .../miningsigil_deactivated.png | Bin .../mundanelengtheningcatalyst.png | Bin .../{items => item}/mundanepowercatalyst.png | Bin .../textures/{items => item}/neurotoxin.png | Bin .../textures/{items => item}/noderouter.png | Bin .../textures/{items => item}/plantfibres.png | Bin .../textures/{items => item}/plantoil.png | Bin .../{items => item}/potionflask_outline.png | Bin .../{items => item}/potionflask_overlay.png | Bin .../{items => item}/potionflask_underlay.png | Bin .../{items => item}/reagentaffinity.png | Bin .../textures/{items => item}/reagentair.png | Bin .../{items => item}/reagentbinding.png | Bin .../{items => item}/reagentbloodlight.png | Bin .../{items => item}/reagentbounce.png | Bin .../{items => item}/reagentbridge.png | Bin .../textures/{items => item}/reagentclaw.png | Bin .../{items => item}/reagentcompression.png | Bin .../{items => item}/reagentfastminer.png | Bin .../textures/{items => item}/reagentfrost.png | Bin .../{items => item}/reagentgrowth.png | Bin .../textures/{items => item}/reagenthaste.png | Bin .../{items => item}/reagentholding.png | Bin .../textures/{items => item}/reagentlava.png | Bin .../{items => item}/reagentmagnetism.png | Bin .../{items => item}/reagentseverance.png | Bin .../textures/{items => item}/reagentsight.png | Bin .../{items => item}/reagentsuppression.png | Bin .../{items => item}/reagentteleposition.png | Bin .../{items => item}/reagenttransposition.png | Bin .../textures/{items => item}/reagentvoid.png | Bin .../textures/{items => item}/reagentwater.png | Bin .../textures/{items => item}/reagentwind.png | Bin .../{items => item}/reinforcedslate.png | Bin .../reinforcedteleposerfocus.png | Bin .../{items => item}/ritual_dismantler.png | Bin .../{items => item}/ritualdiviner.png | Bin .../{items => item}/ritualtinkerer.png | Bin .../{items => item}/sacrificeplate.png | Bin .../{items => item}/sacrificialdagger.png | Bin .../textures/{items => item}/saltpeter.png | Bin .../textures/{items => item}/sanguinebook.png | Bin .../textures/{items => item}/seersigil.png | Bin .../{items => item}/selfsacrificeplate.png | Bin .../sentientarmourgem_activated.png | Bin .../sentientarmourgem_corrosive_activated.png | Bin ...entientarmourgem_corrosive_deactivated.png | Bin .../sentientarmourgem_deactivated.png | Bin ...entientarmourgem_destructive_activated.png | Bin ...tientarmourgem_destructive_deactivated.png | Bin .../sentientarmourgem_steadfast_activated.png | Bin ...entientarmourgem_steadfast_deactivated.png | Bin .../sentientarmourgem_vengeful_activated.png | Bin ...sentientarmourgem_vengeful_deactivated.png | Bin .../{items => item}/sentientarrow.png | Bin .../{items => item}/sentientboots.png | Bin .../sentientboots_corrosive.png | Bin .../sentientboots_destructive.png | Bin .../sentientboots_steadfast.png | Bin .../sentientboots_vengeful.png | Bin .../textures/{items => item}/sentientbow.png | Bin .../{items => item}/sentientbow_corrosive.png | Bin .../sentientbow_corrosive_pulling_0.png | Bin .../sentientbow_corrosive_pulling_1.png | Bin .../sentientbow_corrosive_pulling_2.png | Bin .../sentientbow_destructive.png | Bin .../sentientbow_destructive_pulling_0.png | Bin .../sentientbow_destructive_pulling_1.png | Bin .../sentientbow_destructive_pulling_2.png | Bin .../{items => item}/sentientbow_pulling_0.png | Bin .../{items => item}/sentientbow_pulling_1.png | Bin .../{items => item}/sentientbow_pulling_2.png | Bin .../{items => item}/sentientbow_steadfast.png | Bin .../sentientbow_steadfast_pulling_0.png | Bin .../sentientbow_steadfast_pulling_1.png | Bin .../sentientbow_steadfast_pulling_2.png | Bin .../{items => item}/sentientbow_vengeful.png | Bin .../sentientbow_vengeful_pulling_0.png | Bin .../sentientbow_vengeful_pulling_1.png | Bin .../sentientbow_vengeful_pulling_2.png | Bin .../{items => item}/sentienthelmet.png | Bin .../sentienthelmet_corrosive.png | Bin .../sentienthelmet_destructive.png | Bin .../sentienthelmet_steadfast.png | Bin .../sentienthelmet_vengeful.png | Bin .../{items => item}/sentientleggings.png | Bin .../sentientleggings_corrosive.png | Bin .../sentientleggings_destructive.png | Bin .../sentientleggings_steadfast.png | Bin .../sentientleggings_vengeful.png | Bin .../{items => item}/sentientplate.png | Bin .../sentientplate_corrosive.png | Bin .../sentientplate_destructive.png | Bin .../sentientplate_steadfast.png | Bin .../sentientplate_vengeful.png | Bin .../textures/{items => item}/set_area.png | Bin .../{items => item}/set_will_types.png | Bin .../textures/{items => item}/sheatheditem.png | Bin .../{items => item}/sigilofholding.png | Bin .../sigilofmagnetism_activated.png | Bin .../sigilofmagnetism_deactivated.png | Bin .../sigilofseverance_activated.png | Bin .../sigilofseverance_deactivated.png | Bin .../sigilofsuppression_activated.png | Bin .../sigilofsuppression_deactivated.png | Bin .../textures/{items => item}/sigiloverlay.png | Bin .../textures/{items => item}/soulaxe.png | Bin .../{items => item}/soulaxe_corrosive.png | Bin .../{items => item}/soulaxe_destructive.png | Bin .../{items => item}/soulaxe_steadfast.png | Bin .../{items => item}/soulaxe_vengeful.png | Bin .../{items => item}/soulgemcommon.png | Bin .../soulgemcommon_corrosive.png | Bin .../soulgemcommon_destructive.png | Bin .../soulgemcommon_steadfast.png | Bin .../soulgemcommon_vengeful.png | Bin .../textures/{items => item}/soulgemgrand.png | Bin .../soulgemgrand_corrosive.png | Bin .../soulgemgrand_destructive.png | Bin .../soulgemgrand_steadfast.png | Bin .../{items => item}/soulgemgrand_vengeful.png | Bin .../{items => item}/soulgemgreater.png | Bin .../soulgemgreater_corrosive.png | Bin .../soulgemgreater_destructive.png | Bin .../soulgemgreater_steadfast.png | Bin .../soulgemgreater_vengeful.png | Bin .../{items => item}/soulgemlesser.png | Bin .../soulgemlesser_corrosive.png | Bin .../soulgemlesser_destructive.png | Bin .../soulgemlesser_steadfast.png | Bin .../soulgemlesser_vengeful.png | Bin .../textures/{items => item}/soulgempetty.png | Bin .../soulgempetty_corrosive.png | Bin .../soulgempetty_destructive.png | Bin .../soulgempetty_steadfast.png | Bin .../{items => item}/soulgempetty_vengeful.png | Bin .../textures/{items => item}/soulpickaxe.png | Bin .../{items => item}/soulpickaxe_corrosive.png | Bin .../soulpickaxe_destructive.png | Bin .../{items => item}/soulpickaxe_steadfast.png | Bin .../{items => item}/soulpickaxe_vengeful.png | Bin .../textures/{items => item}/soulshovel.png | Bin .../{items => item}/soulshovel_corrosive.png | Bin .../soulshovel_destructive.png | Bin .../{items => item}/soulshovel_steadfast.png | Bin .../{items => item}/soulshovel_vengeful.png | Bin .../textures/{items => item}/soulsnare.png | Bin .../{items => item}/soulsnare_corrosive.png | Bin .../{items => item}/soulsnare_destructive.png | Bin .../{items => item}/soulsnare_steadfast.png | Bin .../{items => item}/soulsnare_vengeful.png | Bin .../{items => item}/soulsword_activated.png | Bin .../soulsword_corrosive_activated.png | Bin .../soulsword_corrosive_deactivated.png | Bin .../{items => item}/soulsword_deactivated.png | Bin .../soulsword_destructive_activated.png | Bin .../soulsword_destructive_deactivated.png | Bin .../soulsword_steadfast_activated.png | Bin .../soulsword_steadfast_deactivated.png | Bin .../soulsword_vengeful_activated.png | Bin .../soulsword_vengeful_deactivated.png | Bin .../{items => item}/steadfastcrystal.png | Bin .../textures/{items => item}/sulfur.png | Bin .../{items => item}/teleposerfocus.png | Bin .../{items => item}/telepositionsigil.png | Bin .../{items => item}/transcendentbloodorb.png | Bin .../{items => item}/transpositionsigil.png | Bin .../textures/{items => item}/upgradetome.png | Bin .../{items => item}/upgradetrainer.png | Bin .../{items => item}/vengefulcrystal.png | Bin .../textures/{items => item}/voidsigil.png | Bin .../warriorsigil_activated.png | Bin .../warriorsigil_deactivated.png | Bin .../{items => item}/waterscribetool.png | Bin .../textures/{items => item}/watersigil.png | Bin .../textures/{items => item}/weakbloodorb.png | Bin .../{items => item}/weakbloodshard.png | Bin .../{items => item}/windsigil_activated.png | Bin .../{items => item}/windsigil_deactivated.png | Bin .../models/alchemyarrays/basearray.png | Bin 20705 -> 35529 bytes .../assets/bloodmagicguide/lang/de_DE.lang | 288 --- .../assets/bloodmagicguide/lang/en_US.lang | 304 --- .../assets/bloodmagicguide/lang/ru_RU.lang | 239 -- .../assets/bloodmagicguide/lang/zh_CN.lang | 270 -- .../assets/bloodmagicguide/lang/zh_TW.lang | 258 -- .../textures/gui/alchemyarraycrafting.png | Bin 2464 -> 0 bytes .../bloodmagicguide/textures/gui/altar.png | Bin 18703 -> 0 bytes .../textures/gui/bullet_point.png | Bin 17840 -> 0 bytes .../textures/gui/soulforge.png | Bin 3452 -> 0 bytes src/main/resources/mcmod.info | 16 - src/main/resources/pack.mcmeta | 7 + 1662 files changed, 18791 insertions(+), 85075 deletions(-) delete mode 100644 .settings/BloodMagic1.8IDEA.jar create mode 100644 .settings/org.eclipse.buildship.core.prefs create mode 100644 CREDITS.txt delete mode 100644 LICENSE create mode 100644 LICENSE.txt delete mode 100644 README.md create mode 100644 README.txt delete mode 100644 gradle/process_mod_info.gradle create mode 100644 runClient.launch create mode 100644 runData.launch create mode 100644 runServer.launch delete mode 100644 settings.gradle delete mode 100644 src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java delete mode 100644 src/api/java/WayofTime/bloodmagic/api/package-info.java create mode 100644 src/generated/resources/.cache/cache create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/blankrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/speedrune.json create mode 100644 src/generated/resources/assets/bloodmagic/lang/en_us.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/blankrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/bloodlight.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/chargingrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/speedrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/airsigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/blankrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/blankslate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/chargingrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/demonslate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/etherealslate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/growthsigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/icesigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/infusedslate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/lavasigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/miningsigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentair.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentlava.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reagentwater.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/soulsnare.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/soulsword.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/speedrune.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/voidsigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/watersigil.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/slate.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/airsigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/watersigil.json rename src/{main/resources/assets/bloodmagic/recipes/altar.json => generated/resources/data/bloodmagic/recipes/blood_altar.json} (61%) create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soul_forge.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soul_snare.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_fastminer.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_growth.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_lava.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_magnetism.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_void.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_water.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java delete mode 100644 src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockAltar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockPath.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/IBMBlock.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java delete mode 100644 src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/Sprite.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/Elements.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java delete mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java delete mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java delete mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java delete mode 100644 src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java delete mode 100644 src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java delete mode 100644 src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java delete mode 100644 src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java delete mode 100644 src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/event/RitualEvent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java delete mode 100644 src/main/java/WayofTime/bloodmagic/gson/SerializerBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/gson/Serializers.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java delete mode 100644 src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java delete mode 100644 src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemEnum.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemSlate.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/routing/IFluidFilterProvider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/routing/IRoutingFilterProvider.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/types/ShardType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java delete mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java delete mode 100644 src/main/java/WayofTime/bloodmagic/meteor/Meteor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java delete mode 100644 src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java delete mode 100644 src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java delete mode 100644 src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java delete mode 100644 src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java delete mode 100644 src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java delete mode 100644 src/main/java/WayofTime/bloodmagic/registry/ModRituals.java delete mode 100644 src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/Ritual.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IFluidFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IRoutingFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/IgnoreNBTItemFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/Dungeon.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java delete mode 100644 src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java delete mode 100644 src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java delete mode 100644 src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java delete mode 100644 src/main/java/WayofTime/bloodmagic/teleport/Teleport.java delete mode 100644 src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java delete mode 100644 src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/teleport/Teleports.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileMimic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/routing/TileItemRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/BlockStack.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/PluginUtil.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/StateUtil.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/inventory/IgnoredIInventory.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/providers/IBaseProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/providers/IEntityTypeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/text/IHasTextComponent.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/text/IHasTranslationKey.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/ClientEvents.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java create mode 100644 src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java create mode 100644 src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java create mode 100644 src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java create mode 100644 src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java create mode 100644 src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java create mode 100644 src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java create mode 100644 src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java create mode 100644 src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java create mode 100644 src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java create mode 100644 src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java create mode 100644 src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java create mode 100644 src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/EnumDemonWillType.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/IDemonWill.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/IDemonWillConduit.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/IDemonWillGem.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/IDemonWillWeapon.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/IDiscreteDemonWill.java create mode 100644 src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java create mode 100644 src/main/resources/META-INF/mods.toml delete mode 100644 src/main/resources/assets/bloodmagic/armatures/block/pillar_mid.json delete mode 100644 src/main/resources/assets/bloodmagic/asms/block/inversion_pillar.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/alchemy_table.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/altar_maker.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/arcane_ashes.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/base_fluid_filter.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/base_item_filter.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/blood_light.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/blood_orb.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/blood_rune.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/blood_shard.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/blood_tank.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/bound_axe.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/bound_pickaxe.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/bound_shovel.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/bound_sword.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/component.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/dagger_of_sacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_brick_1.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_brick_2.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_crucible.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_crystal.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_crystallizer.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_extras.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_light.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_pillar_1.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_pillar_2.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_1.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_2.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_3.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_pylon.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_stairs_1.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_stairs_2.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_stairs_3.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_wall_1.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/demon_will_gauge.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/dimensional_portal.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/experience_tome.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/incense_altar.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/input_routing_node.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/inversion_pillar.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/inversion_pillar_end.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/item_routing_node.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/lava_crystal.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/life_essence.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/living_armour.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/master_routing_node.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/mimic.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/monster_soul.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/node_router.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/output_routing_node.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/pack_sacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/pack_self_sacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/path.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/phantom.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/potion_flask.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/ritual_controller.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/ritual_diviner.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/ritual_reader.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/ritual_stone.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sacrificial_dagger.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sanguine_book.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_armour.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_armour_gem.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_axe.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_bow.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_pickaxe.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_shovel.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sentient_sword.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_air.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_bounce.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_claw.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_compression.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_elemental_affinity.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_ender_severance.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_fast_miner.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_frost.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_green_grove.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_haste.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_holding.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_magnetism.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_phantom_bridge.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_seer.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_suppression.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_void.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_water.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/sigil_whirlwind.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/slate.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/soul_forge.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/soul_gem.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/soul_snare.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/soulforge.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/spectral.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/teleposer.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/teleposition_focus.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/test_spell_block.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/upgrade_tome.json delete mode 100644 src/main/resources/assets/bloodmagic/blockstates/upgrade_trainer.json delete mode 100644 src/main/resources/assets/bloodmagic/books/architect.xml delete mode 100644 src/main/resources/assets/bloodmagic/lang/bg_BG.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/de_DE.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/en_US.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/en_US.lang_old delete mode 100644 src/main/resources/assets/bloodmagic/lang/fr_FR.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/it_IT.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/ja_JP.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/ko_KR.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/ru_RU.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/zh_CN.lang delete mode 100644 src/main/resources/assets/bloodmagic/lang/zh_TW.lang delete mode 100644 src/main/resources/assets/bloodmagic/loot_tables/bm_loot_table.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/bloodaltar.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/soulforge.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/altar.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/soulforge.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/_constants.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/_factories.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/activation_crystal.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/alchemy_table.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/experience_tome.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/incense_altar.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/lava_crystal.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_stone.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wood.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_reader.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/soul_forge.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/soul_snare.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposer.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json delete mode 100644 src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json delete mode 100644 src/main/resources/assets/bloodmagic/schematics/corridor1.json delete mode 100644 src/main/resources/assets/bloodmagic/schematics/hallchest1.json delete mode 100644 src/main/resources/assets/bloodmagic/schematics/rawbuilding1.json delete mode 100644 src/main/resources/assets/bloodmagic/schematics/schematics.json delete mode 100644 src/main/resources/assets/bloodmagic/shaders/beam-broken.frag delete mode 100644 src/main/resources/assets/bloodmagic/shaders/beam.frag delete mode 100644 src/main/resources/assets/bloodmagic/structures/building1.nbt delete mode 100644 src/main/resources/assets/bloodmagic/structures/corridor1.nbt delete mode 100644 src/main/resources/assets/bloodmagic/structures/hallchest1.nbt rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/accelerationrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/airritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/altarcapacityrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/bettercapacityrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/blankrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks/largebloodstonebrick.png => block/bloodlight.png} (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/bloodsocket.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/bloodstonebrick.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/bloodtank.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/chargingrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dislocationrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick1.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick1_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick1_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick1_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick1_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick2.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick2_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick2_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick2_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick2_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick3.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick3_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick3_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick3_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_brick3_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_eye.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_eye_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_eye_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_eye_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_eye_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_metal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_metal_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_metal_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_metal_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_metal_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillar.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillar_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillar_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillar_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillar_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarbottom.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarbottom_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarbottom_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarbottom_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarbottom_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarheart.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarheart_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarheart_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarheart_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarheart_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarspecial.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarspecial_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarspecial_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarspecial_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillarspecial_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillartop.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillartop_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillartop_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillartop_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_pillartop_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_polished.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_polished_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_polished_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_polished_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_polished_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_smallbrick.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_smallbrick_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_smallbrick_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_smallbrick_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_smallbrick_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_stone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_stone_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_stone_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_stone_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_stone_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tile.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tile_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tile_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tile_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tile_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tilespecial.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tilespecial_c.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tilespecial_d.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tilespecial_s.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/dungeon/dungeon_tilespecial_v.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/duskritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/earthritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/efficiencyrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/empty.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/emptysocket.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/etherealopaquemimic.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/fireritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/imperfectritualstone.png (100%) create mode 100644 src/main/resources/assets/bloodmagic/textures/block/largebloodstonebrick.png rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/lifeessenceflowing.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/lifeessenceflowing.png.mcmeta (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/lifeessencestill.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/lifeessencestill.png.mcmeta (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/lightritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/masterritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/masterritualstone_inverted.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/obsidianbrickpath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/obsidiantilepath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/orbcapacityrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/phantomblock.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/ritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks/runeofsacrifice.png => block/sacrificerune.png} (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks/runeofselfsacrifice.png => block/selfsacrificerune.png} (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/sentientmimic.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/shardcluster.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/shardclusterbrick.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/simpletranscircle.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/solidclearmimic.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/solidlightmimic.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/solidopaquemimic.png (100%) create mode 100644 src/main/resources/assets/bloodmagic/textures/block/soul_forge.png rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/soulforge.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/spectralblock.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/speedrune.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/stonebrickpath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/stonetilepath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/teleposer_side.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/teleposer_top.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/waterritualstone.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/woodbrickpath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/woodtilepath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/wornstonebrickpath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{blocks => block}/wornstonetilepath.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/activationcrystalawakened.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/activationcrystalcreative.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/activationcrystalweak.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/airscribetool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/airsigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/alchemic_liquid.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/alchemic_ribbon.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/alchemic_vial.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/altarmaker.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ampouleempty.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ampoulefull.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/antiseptic.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/apprenticebloodorb.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/arcaneashes.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/archmagebloodorb.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/basemonstersoul.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/basemonstersoul_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/basemonstersoul_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/basemonstersoul_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/basemonstersoul_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/basiccuttingfluid.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/blackpudding.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/blanksigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/blankslate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/bloodlightsigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/bloodpack.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/bouncesigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/bouncesigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/boundaxe_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/boundpickaxe_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/boundshovel_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/boundsword_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/boundtool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/bridgesigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/bridgesigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ceremonialdagger.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/clawsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/clawsigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/coagulant.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/coalsand.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/componentframeparts.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/compressionsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/compressionsigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/corrosivecrystal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/crucibleupgrade.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/daggerofsacrifice.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/dawnscribetool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/defaultcrystal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/demonbloodshard.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/demonicteleposerfocus.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/demonslate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/demonwillgauge.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/destructivecrystal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/divinationsigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/duskscribetool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/earthscribetool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/elementalsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/elementalsigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/enhancedteleposerfocus.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/etherealslate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/experiencebook.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/explosivepowder.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/firescribetool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/fluidrouterfilterexact.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/goldsand.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/growthsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/growthsigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/harvestgoddesssigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/harvestgoddesssigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/hastesigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/hastesigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/icarusscroll_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/icarusscroll_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/icesigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/icesigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/information.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/infusedslate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/inputroutingfocus.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ironsand.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/item_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/itemrouterfilterexact.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/itemrouterfilterignorenbt.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/itemrouterfiltermoditems.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/itemrouterfilteroredict.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/lavacrystal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/lavasigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/lifebucket.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/livingboots.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/livinghelmet.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/livingleggings.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/livingplate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/magicianbloodorb.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/mailorder.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/masterbloodorb.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/miningsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/miningsigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/mundanelengtheningcatalyst.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/mundanepowercatalyst.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/neurotoxin.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/noderouter.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/plantfibres.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/plantoil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/potionflask_outline.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/potionflask_overlay.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/potionflask_underlay.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentaffinity.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentair.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentbinding.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentbloodlight.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentbounce.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentbridge.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentclaw.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentcompression.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentfastminer.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentfrost.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentgrowth.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagenthaste.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentholding.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentlava.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentmagnetism.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentseverance.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentsight.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentsuppression.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentteleposition.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagenttransposition.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentvoid.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentwater.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reagentwind.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reinforcedslate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/reinforcedteleposerfocus.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ritual_dismantler.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ritualdiviner.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/ritualtinkerer.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sacrificeplate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sacrificialdagger.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/saltpeter.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sanguinebook.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/seersigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/selfsacrificeplate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_corrosive_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_corrosive_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_destructive_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_destructive_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_steadfast_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_steadfast_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_vengeful_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarmourgem_vengeful_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientarrow.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientboots.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientboots_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientboots_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientboots_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientboots_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_corrosive_pulling_0.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_corrosive_pulling_1.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_corrosive_pulling_2.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_destructive_pulling_0.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_destructive_pulling_1.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_destructive_pulling_2.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_pulling_0.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_pulling_1.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_pulling_2.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_steadfast_pulling_0.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_steadfast_pulling_1.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_steadfast_pulling_2.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_vengeful_pulling_0.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_vengeful_pulling_1.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientbow_vengeful_pulling_2.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentienthelmet.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentienthelmet_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentienthelmet_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentienthelmet_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentienthelmet_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientleggings.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientleggings_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientleggings_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientleggings_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientleggings_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientplate.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientplate_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientplate_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientplate_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sentientplate_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/set_area.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/set_will_types.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sheatheditem.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofholding.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofmagnetism_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofmagnetism_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofseverance_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofseverance_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofsuppression_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigilofsuppression_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sigiloverlay.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulaxe.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulaxe_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulaxe_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulaxe_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulaxe_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemcommon.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemcommon_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemcommon_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemcommon_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemcommon_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgrand.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgrand_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgrand_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgrand_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgrand_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgreater.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgreater_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgreater_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgreater_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemgreater_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemlesser.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemlesser_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemlesser_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemlesser_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgemlesser_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgempetty.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgempetty_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgempetty_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgempetty_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulgempetty_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulpickaxe.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulpickaxe_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulpickaxe_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulpickaxe_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulpickaxe_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulshovel.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulshovel_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulshovel_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulshovel_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulshovel_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsnare.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsnare_corrosive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsnare_destructive.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsnare_steadfast.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsnare_vengeful.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_corrosive_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_corrosive_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_destructive_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_destructive_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_steadfast_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_steadfast_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_vengeful_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/soulsword_vengeful_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/steadfastcrystal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/sulfur.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/teleposerfocus.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/telepositionsigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/transcendentbloodorb.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/transpositionsigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/upgradetome.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/upgradetrainer.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/vengefulcrystal.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/voidsigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/warriorsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/warriorsigil_deactivated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/waterscribetool.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/watersigil.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/weakbloodorb.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/weakbloodshard.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/windsigil_activated.png (100%) rename src/main/resources/assets/bloodmagic/textures/{items => item}/windsigil_deactivated.png (100%) delete mode 100644 src/main/resources/assets/bloodmagicguide/lang/de_DE.lang delete mode 100644 src/main/resources/assets/bloodmagicguide/lang/en_US.lang delete mode 100644 src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang delete mode 100644 src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang delete mode 100644 src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang delete mode 100644 src/main/resources/assets/bloodmagicguide/textures/gui/alchemyarraycrafting.png delete mode 100644 src/main/resources/assets/bloodmagicguide/textures/gui/altar.png delete mode 100644 src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png delete mode 100644 src/main/resources/assets/bloodmagicguide/textures/gui/soulforge.png delete mode 100644 src/main/resources/mcmod.info create mode 100644 src/main/resources/pack.mcmeta diff --git a/.settings/BloodMagic1.8IDEA.jar b/.settings/BloodMagic1.8IDEA.jar deleted file mode 100644 index 839031f4b68356c13ee33e461722e0551f2acf57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1882 zcmWIWW@Zs#;Nak32wpeeodF5R0onNlC7Jno#rnzlDXDtJC6zfqGC3nPH?>%=A~$EV zr;f&nlRkbrC(oSU{5U9JgXg*Px+l(ipVbaL;eEz;YiQ9qe@|Y$m1jJ8{myxu_2u=` z)jWB|TR)6RlTGWqKEunFmAt%MMPIo)`OCf)d@b$$Ui_srG)Tkyj3(3jQOHNWkCMDfGtI+V%za_tg zb?f%+ldF9E?AiOq){gTnz7CE#GkcOn+~)6;fBA1l>BPn@PExx=CPZjnaGO&nC3N(C z@Ny?nQ-`x6{yfv0O4b}$I(gTc0_{+qV+%I1rQKS@V1H=ARPEX;NAK4z+q~$;)7y); z`+t6`d3PFnqjiBB-)&3vHUQn|Z(t-$0%8j_K@2NE*pKYf&wSubhNWLVy# z$I6ritXSIxB9j7&ak7BXKZergK)$#o<3&f7)Z>lZ!WD{uYnQmM&HeuX5Hg*8XQiiAj>k&o zr3tQjHtngZKW&3-TIn!Em9>=*B{rPMBx&OGFUEaK+?X`a< z?tkJqbMKS*s>x^5LZ2-A75rrH#aICzbNkg_m)ZPLHJlkWox!)|73==ZNyoe8*_z`n z7=v5 zCBt9MihZUF7f(?5WnR}T;<@VNykNN!hsG~4NBg+V(my0~a|HQJ@qTuxYuQcB-BT90 zzPk2dyT!tb#a$bubAz@$jnEP}IBBg|*oIf-D(d>VtLxt0YEhc-DfCsI=)PE3 zjEi+kiPh1+BLCD=Up+n+fAnkIJ&yNt_};y(K6raqS*?Qg(=)-xJtzWeO? z?v;Q;#m=u+dvEOLvV9Y8J8SXozmFcK%Kc>p6=#k;Y5Y$a85owcBPW(aXvLW% zm89n6WO^xhy0|(jxaZ_2CFUpurAwUK* qib-f03)vi4D8qsb6v_xNm6br42Y9oxft0fXVG=M39|1KmFaQ8c&(xOy diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 00000000..e8895216 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 74e1c18e..d06adbc3 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,299 +1,392 @@ -# -#Tue Dec 13 20:41:11 EST 2016 -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=1 -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=1 -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.comment.format_line_comments=false -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.alignment_for_compact_if=49 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.lineSplit=600 -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert eclipse.preferences.version=1 -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes= +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=1 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=1 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=1 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=1 +org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=1 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=1 +org.eclipse.jdt.core.formatter.alignment_for_record_components=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=1 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=17 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=next_line +org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=false +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=true +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=true +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.text_block_indentation=0 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 3f2271a9..1994e3f7 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,11 +1,12 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_BloodMagic -formatter_settings_version=12 +formatter_profile=_WayofTime-Dev +formatter_settings_version=20 org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true @@ -21,29 +22,39 @@ sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=false sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=false sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.lazy_logical_operator=false sp_cleanup.make_local_variable_final=true sp_cleanup.make_parameters_final=false sp_cleanup.make_private_fields_final=true sp_cleanup.make_type_abstract_if_missing_method=false sp_cleanup.make_variable_declarations_final=false +sp_cleanup.merge_conditional_blocks=false sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.number_suffix=false +sp_cleanup.objects_equals=false sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=false +sp_cleanup.organize_imports=true +sp_cleanup.precompile_regex=false +sp_cleanup.push_down_negation=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=false sp_cleanup.remove_trailing_whitespaces=false sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=false sp_cleanup.remove_unnecessary_casts=true sp_cleanup.remove_unnecessary_nls_tags=false sp_cleanup.remove_unused_imports=false @@ -52,15 +63,19 @@ sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true +sp_cleanup.simplify_lambda_expression_and_method_ref=false sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_directly_map_method=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false sp_cleanup.use_this_for_non_static_field_access=false sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_method_access=false sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_type_arguments=false +sp_cleanup.use_unboxing=false +sp_cleanup.use_var=false diff --git a/CREDITS.txt b/CREDITS.txt new file mode 100644 index 00000000..a70c53d5 --- /dev/null +++ b/CREDITS.txt @@ -0,0 +1,65 @@ +Minecraft Forge: Credits/Thank You + +Forge is a set of tools and modifications to the Minecraft base game code to assist +mod developers in creating new and exciting content. It has been in development for +several years now, but I would like to take this time thank a few people who have +helped it along it's way. + +First, the people who originally created the Forge projects way back in Minecraft +alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance +of me taking over the project, who knows what Minecraft modding would be today. + +Secondly, someone who has worked with me, and developed some of the core features +that allow modding to be as functional, and as simple as it is, cpw. For developing +FML, which stabelized the client and server modding ecosystem. As well as the base +loading system that allows us to modify Minecraft's code as elegently as possible. + +Mezz, who has stepped up as the issue and pull request manager. Helping to keep me +sane as well as guiding the community into creating better additions to Forge. + +Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which +I am a part}. For creating some of the core tools needed to make Minecraft modding +both possible, and as stable as can be. + On that note, here is some specific information of the MCP data we use: + * Minecraft Coder Pack (MCP) * + Forge Mod Loader and Minecraft Forge have permission to distribute and automatically + download components of MCP and distribute MCP data files. This permission is not + transitive and others wishing to redistribute the Minecraft Forge source independently + should seek permission of MCP or remove the MCP data files and request their users + to download MCP separately. + +And lastly, the countless community members who have spent time submitting bug reports, +pull requests, and just helping out the community in general. Thank you. + +--LexManos + +========================================================================= + +This is Forge Mod Loader. + +You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml + +This minecraft mod is a clean open source implementation of a mod loader for minecraft servers +and minecraft clients. + +The code is authored by cpw. + +It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. +http://www.minecraftforum.net/topic/75440- +This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. + +It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. +http://www.minecraftforge.net/ + +Additionally, it contains an implementation of topological sort based on that +published at http://keithschwarz.com/interesting/code/?dir=topological-sort + +It also contains code from the Maven project for performing versioned dependency +resolution. http://maven.apache.org/ + +It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ +with credit to it's authors. + +Forge Mod Loader downloads components from the Minecraft Coder Pack +(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. + diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 264519f7..00000000 --- a/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Creative Commons Attribution 4.0 International Public License - -By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. - -Section 1 – Definitions. - -Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. -Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. -Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. -Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. -Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. -Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. -Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. -Licensor means the individual(s) or entity(ies) granting rights under this Public License. -Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. -Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. -You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. -Section 2 – Scope. - -License grant. -Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: -reproduce and Share the Licensed Material, in whole or in part; and -produce, reproduce, and Share Adapted Material. -Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. -Term. The term of this Public License is specified in Section 6(a). -Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. -Downstream recipients. -Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. -No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. -No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). -Other rights. - -Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. -Patent and trademark rights are not licensed under this Public License. -To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. -Section 3 – License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the following conditions. - -Attribution. - -If You Share the Licensed Material (including in modified form), You must: - -retain the following if it is supplied by the Licensor with the Licensed Material: -identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); -a copyright notice; -a notice that refers to this Public License; -a notice that refers to the disclaimer of warranties; -a URI or hyperlink to the Licensed Material to the extent reasonably practicable; -indicate if You modified the Licensed Material and retain an indication of any previous modifications; and -indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. -You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. -If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. -If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. -Section 4 – Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: - -for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; -if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and -You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. -For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. -Section 5 – Disclaimer of Warranties and Limitation of Liability. - -Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. -To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. -The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. -Section 6 – Term and Termination. - -This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. -Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: - -automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or -upon express reinstatement by the Licensor. -For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. -For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. -Sections 1, 5, 6, 7, and 8 survive termination of this Public License. -Section 7 – Other Terms and Conditions. - -The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. -Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. -Section 8 – Interpretation. - -For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. -To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. -No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. -Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..b0cbe2b3 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,520 @@ +Unless noted below, Minecraft Forge, Forge Mod Loader, and all +parts herein are licensed under the terms of the LGPL 2.1 found +here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and +copied below. + +Homepage: http://minecraftforge.net/ + https://github.com/MinecraftForge/MinecraftForge + + +A note on authorship: +All source artifacts are property of their original author, with +the exclusion of the contents of the patches directory and others +copied from it from time to time. Authorship of the contents of +the patches directory is retained by the Minecraft Forge project. +This is because the patches are partially machine generated +artifacts, and are changed heavily due to the way forge works. +Individual attribution within them is impossible. + +Consent: +All contributions to Forge must consent to the release of any +patch content to the Forge project. + +A note on infectivity: +The LGPL is chosen specifically so that projects may depend on Forge +features without being infected with its license. That is the +purpose of the LGPL. Mods and others using this code via ordinary +Java mechanics for referencing libraries are specifically not bound +by Forge's license for the Mod code. + + +=== MCP Data === +This software includes data from the Minecraft Coder Pack (MCP), with kind permission +from them. The license to MCP data is not transitive - distribution of this data by +third parties requires independent licensing from the MCP team. This data is not +redistributable without permission from the MCP team. + +=== Sharing === +I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of +the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. + +-- Runtime patcher -- +License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher +and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +-- ASM transformers -- +License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) +under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +========================================================================= +This software includes portions from the Apache Maven project at +http://maven.apache.org/ specifically the ComparableVersion.java code. It is +included based on guidelines at +http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html +with notices intact. The only change is a non-functional change of package name. + +This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating +binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ +authored by genman, heikok, pivot. +The only changes are to replace some Trove collection types with standard Java collections, and repackaged. +========================================================================= + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md deleted file mode 100644 index c945030e..00000000 --- a/README.md +++ /dev/null @@ -1,120 +0,0 @@ -# Blood Magic: Alchemical Wizardry [![](http://cf.way2muchnoise.eu/full_blood-magic_downloads.svg)](https://minecraft.curseforge.com/projects/blood-magic) [![Discord](https://img.shields.io/discord/259683256348311552.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/VtNrGrs) - -### Gruesome? Probably. Worth it? Definitely! -### [Downloads](http://minecraft.curseforge.com/projects/blood-magic/files) - -## Information - -Have you ever picked up a magic mod for Minecraft, and thought that it was too tame? Was there not enough danger involved when creating your next high-tech gadget? Bored with all of those peaceful animals just staring at you without a care in the world? Well then, I am glad you came here! - -Blood Magic is an arcane art that is practiced by mages who attempt to gather a vast amount of power through utilizing a forbidden material: blood. Even though it does grant a huge amount of power, every single action that is performed with this volatile magic can prove deadly. You have been warned. - -## Links -* Twitter: [@WayofTime](https://twitter.com/WayofTime) -* Wiki: Found at [FTBWiki](http://ftbwiki.org/Blood_Magic) -* [Minecraft Forum Thread](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1290532-bm) -* [Curseforge](http://minecraft.curseforge.com/projects/blood-magic) -* [Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=J7SNY7L82PQ82) -* [Patreon](https://www.patreon.com/BloodMagic) - -## Development Setup - -1. Fork this project to your own Github repository and clone it to your desktop. -2. Navigate to the directory you cloned to. Follow the [Forge Documentation](http://mcforge.readthedocs.io/en/latest/gettingstarted/#from-zero-to-modding) (start at step 4) to setup your workspace. If you use IDEA, follow [this set](http://mcforge.readthedocs.io/en/latest/gettingstarted/#terminal-free-intellij-idea-configuration) of steps. - -#### IntelliJ IDEA extra steps - -1. Navigate to `File > Settings > Plugins > Browse repositories...`. Search for Lombok and install the plugin. -2. Navigate to `File > Settings > Build, Execution, Deployment > Compiler > Annotation Processors`. Check `Enable annotation processing`. - -[Setup video](https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be) by LexManos. For more information, refer to the [Forge Forums](http://www.minecraftforge.net/forum/index.php/topic,14048.0.html). - - -## Developing Addons - -Add to your build.gradle: - - repositories { - maven { - url "http://tehnut.info/maven/" - } - } - - dependencies { - deobfCompile "com.wayoftime.bloodmagic:BloodMagic:" - } - -`` can be found on CurseForge (or via the Maven itself), check the file name of the version you want. - -## Custom Builds - -**Custom builds are *unsupported*. If you have an issue while using an unofficial build, it is not guaranteed that you will get support.** - -#### How to make a custom build: - -1. Clone directly from this repository to your desktop. -2. Navigate to the directory you cloned to. Open a command window there and run `gradlew build` -3. Once it completes, your new build will be found at `../build/libs/BloodMagic-*.jar`. You can ignore the `deobf`, `sources`, and `javadoc` jars. - -## License - -![CCA4.0](https://licensebuttons.net/l/by/4.0/88x31.png) - -Blood Magic: AlchemicalWizardry by WayofTime is licensed under a [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/). - -## Installation Instructions - -This mod requires "Minecraft Forge" in order to operate. It is incredibly easy to download and set up, so might as well get to it! - -1. Download [Forge](http://files.minecraftforge.net/). Usually "Recommended" is best - you want the "universal", not the source. Forge also has an "install" option now, so all you need to do is launch that program and it will make a lovely Forge profile. If you haven't, look up how to use the installer and the new 1.6.x launcher if you are confused! - -2. Download the latest version of BloodMagic from [Curseforge](http://minecraft.curseforge.com/mc-mods/224791-blood-magic). - -3. Place the mod in the **mods** folder of your .minecraft. If you are unsure of where that is located, it is here: `../Users/you/AppData/roaming/.minecraft`. - -## FAQ - -**Q**: My weak blood orb doesn't show my current LP! Fix it please. - -**A**: The mechanic for viewing the player's essence has changed due to some issues with mechanics. You now need a Divination Sigil to view a player's essence. It does other things, too, so it is worth it! - -**Q**: Why am I dying so much? - -**A**: It might be a good idea to make sure that you have enough essence to do a task. If you don't have enough essence for, say, an imperfect ritual, it will take it out of your health. If your health reaches 0... Well, you don't have to be a genius to see what would happen. - -**Q**: Waffles? - -**A**: Waffles! - -**Q**: Where is x? When I watched spotlight "w," it had an item called x. Don't you need x to make y, before you can create z? - -**A**: It might be wise to look at an updated spotlight, or check the changelogs. I'm not evil, so I do document everything that I can. There was most likely some issues with balance with the item, so it may have been removed for those reasons. Or you just grabbed the item from NEI without seeing it was a test item, in which case: shame on you! - -**Q**: Isn't that armour ... - -**A**: Yes, the armour texture is from the mod EE2. Pahimar and I are good friends, and I decided to use it for the armour and tools. He has given me his express permission for it, so need not worry! -[Proof](https://twitter.com/Pahimar/status/453590600689139712). - -**Q**: My game is crashing with the latest TC4! - -**A**: To help stop this, remove the TC4 API from my Blood Magic zip file (if it is there). It should solve things. - -**Q**: But, my Thaumcraft aspects are messed up! - -**A**: Once again, remove the TC4 API from the Blood Magic zip file to solve this. Azanor changed some aspect combinations. - -**Q**: When will 1.7.2 be released? - -**A**: It's out! Go get it! - -**Q**: Way, I've just had an amazing idea! Why not add an in-game book just like the Thaumonomicon? - -**A**: This has been suggested several times. It I being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. - -**Q**: Why do I not have a Sacrificial Orb? It's only showing up as a knife! - -**A**: This is a config option. The person you saw with an orb had a config that changed the knife to an orb. The orb and knife function exactly the same way, but you can change it in the configs by looking for the "Idontlikefun" option. - -**Q**: When I respawn, I appear to only come back with 3 hearts. What's happening? - -**A**: This is due to another config option in the "WhimpySettings," which is due to my attempt to combat Zerg Rushing. You can disable this if you really want to, but it shouldn't hurt unduly. diff --git a/README.txt b/README.txt new file mode 100644 index 00000000..6904b377 --- /dev/null +++ b/README.txt @@ -0,0 +1,53 @@ +------------------------------------------- +Source installation information for modders +------------------------------------------- +This code follows the Minecraft Forge installation methodology. It will apply +some small patches to the vanilla MCP source code, giving you and it access +to some of the data and functions you need to build a successful mod. + +Note also that the patches are built against "unrenamed" MCP source code (aka +srgnames) - this means that you will not be able to read them directly against +normal code. + +Source pack installation information: + +Standalone source installation +============================== + +See the Forge Documentation online for more detailed instructions: +http://mcforge.readthedocs.io/en/latest/gettingstarted/ + +Step 1: Open your command-line and browse to the folder where you extracted the zip file. + +Step 2: You're left with a choice. +If you prefer to use Eclipse: +1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux) +2. Open Eclipse, Import > Existing Gradle Project > Select Folder + or run "gradlew eclipse" to generate the project. +(Current Issue) +4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment +5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4. + +If you prefer to use IntelliJ: +1. Open IDEA, and import project. +2. Select your build.gradle file and have it import. +3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux) +4. Refresh the Gradle Project in IDEA if required. + +If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again. + +Should it still not work, +Refer to #ForgeGradle on EsperNet for more information about the gradle environment. +or the Forge Project Discord discord.gg/UvedJ9m + +Forge source installation +========================= +MinecraftForge ships with this code and installs it as part of the forge +installation process, no further action is required on your part. + +LexManos' Install Video +======================= +https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be + +For more details update more often refer to the Forge Forums: +http://www.minecraftforge.net/forum/index.php/topic,14048.0.html diff --git a/build.gradle b/build.gradle index b3c27f49..f06f3e9a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,41 +8,40 @@ buildscript { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true } } - -plugins { - id "com.matthewprenger.cursegradle" version "1.3.0" - id "maven-publish" -} - apply plugin: 'net.minecraftforge.gradle' +// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +apply plugin: 'eclipse' +apply plugin: 'maven-publish' -def build_number = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : 'CUSTOM' -def username = project.hasProperty('dev_username') ? "${dev_username}" : "${mod_name}" +version = '1.16.3-3.0-0' +group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'BloodMagic' -group = package_group -archivesBaseName = mod_name -version = "${mc_version}-${mod_version}-${build_number}" - -repositories { - maven { url "http://dvs1.progwml6.com/files/maven" } - maven { url "http://tehnut.info/maven" } -} - -dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" - compile fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") - compile fg.deobf("mcp.mobius.waila:Hwyla:${waila_version}") -} +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. +println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { - mappings channel: "snapshot", version: "20190912-1.14.3" + // The mappings can be changed at any time, and must be in the following format. + // snapshot_YYYYMMDD Snapshot are built nightly. + // stable_# Stables are built at the discretion of the MCP team. + // Use non-default mappings at your own risk. they may not always work. + // Simply re-run your setup task after changing the mappings to update your workspace. + mappings channel: 'snapshot', version: '20200916-1.16.2' + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. runs { client { workingDirectory project.file('run') - property 'forge.logging.markers', '' - property 'forge.logging.console.level', 'info' - property 'username', username + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' mods { bloodmagic { @@ -52,9 +51,31 @@ minecraft { } server { - workingDirectory project.file('run/server') - property 'forge.logging.markers', '' - property 'forge.logging.console.level', 'info' + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + bloodmagic { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + args '--mod', 'bloodmagic', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') mods { bloodmagic { @@ -65,119 +86,79 @@ minecraft { } } -apply from: "gradle/process_mod_info.gradle" - -processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include '**/*.toml' - - expand 'version': project.version - } - from(sourceSets.main.resources.srcDirs) { - exclude '**/*.toml' +repositories { + maven { + url "http://dvs1.progwml6.com/files/maven/" } } -allprojects { - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } +dependencies { + // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft 'net.minecraftforge:forge:1.16.3-34.1.11' + + // compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") + // runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") + + //deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}" + + compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19") + // You may put jars on which you depend on in ./libs or you may define them like so.. + // compile "some.group:artifact:version:classifier" + // compile "some.group:artifact:version" + + // Real examples + // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // These dependencies get remapped to your current MCP mappings + // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // For more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + } +// Example for how to get properties into the manifest for reading by the runtime.. jar { - classifier = '' - from sourceSets.main.output - manifest.mainAttributes( - "Built-By": System.getProperty('user.name'), - "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", + manifest { + attributes([ + "Specification-Title": "bloodmagic", + "Specification-Vendor": "bloodmagicsareus", + "Specification-Version": "1", // We are version 1 of ourselves "Implementation-Title": project.name, - "Implementation-Version": project.version, - "Built-On": "${mc_version}-${forge_version}" - ) + "Implementation-Version": "${version}", + "Implementation-Vendor" :"bloodmagicsareus", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } } -// API jar -task apiJar(type: Jar) { - classifier = 'api' - include 'com/WayofTime/bloodmagic/api/**/*' - exclude 'com/WayofTime/bloodmagic/api/impl/**/*' - from sourceSets.main.allSource - from sourceSets.main.output -} +// Example configuration to allow publishing using the maven-publish task +// This is the preferred method to reobfuscate your jar file +jar.finalizedBy('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +//publish.dependsOn('reobfJar') -task sourcesJar(type: Jar) { - classifier = 'sources' - from sourceSets.main.allJava -} - -tasks.build.dependsOn apiJar, sourcesJar - -tasks.withType(JavaCompile) { task -> - task.options.encoding = 'UTF-8' +sourceSets.main.resources { + srcDir 'src/generated/resources' } publishing { - tasks.publish.dependsOn 'build' publications { mavenJava(MavenPublication) { artifact jar - artifact sourcesJar - artifact apiJar } } repositories { - if (project.hasProperty('maven_repo')) { - maven { url maven_repo } - } else { - mavenLocal() + maven { + url "file:///${project.projectDir}/mcmodsrepo" } } -} - -String getChangelogText() { - def changelogFile = new File('changelog.txt') - String str = '' - String separator = '---' - int lineCount = 0 - boolean done = false - changelogFile.eachLine { - if (done || it == null) { - return - } - if (lineCount < 3) { - lineCount++ - if (it.startsWith(separator)) { - return - } - } - if (!it.startsWith(separator)) { - str += "$it" + (lineCount < 3 ? ':\n\n' : '\n') - return - } - done = true // once we go past the first version block, parse no more - } - return str -} - -def curseRelations = { - optionalLibrary 'jei' - optionalLibrary 'hwyla' -} - -curseforge { - if (project.hasProperty('curse_key_TehNut')) - apiKey = project.curse_key_TehNut - - project { - id = "${curse_id}" - changelog = getChangelogText() - releaseType = 'beta' - - relations curseRelations - - addArtifact sourcesJar - addArtifact apiJar - } -} +} \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index 4c070f99..64fa0593 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,1196 +1,1053 @@ ------------------------------------------------------- -Version 2.4.2 ------------------------------------------------------- -Now with no guarantees for working textures! - -Blood Altar: - - A Blood Altar with a Redstone Lamp below it will now emit a redstone signal upon finishing crafting (#1635) - - Fixed Blood Altar being able to obtain negative progress (#1649) - -Living Armor: - - Fixed Storm Trooper Level 4 costing 65 instead of -65 upgrade points (#1631) - -Rituals: - - Fixed Ritual of the Eternal Soul (Ritual Stone layout & didn't work) (#1633) - - Fixed Ritual Tinkerer (ritual area is now unique per ritual instance), added the ability to reset the ritual ranges to default (#1636) - -Misc: - - Lava Crystals can now set things on fire (#1652) - - Fixed parts of the German translation. Other translations still need to be reworked to accomodate changed translation keys (#1640) - - Fixed Guidebook showing wrong recipes (Rune of Self-Sacrifice instead of others) (#1641) - - Wooden Paths now behave like wood instead of stone (sound & efficient tool) (#1638) - - -Technical Stuff: - - Fixed Veil of Evil and Ward of Sacrosanctity console spam (which could eventually lead to an out of memory exception) (#1639) - - Fixed GLSL shader compilation errors (affected Mesa driver (AMD GPU) on Linux) (#1624) - - Fixed `/bloodmagic network` command permissions (#1613) - - Fixed a rare crash that could occur when summoning mobs (#1618) - ------------------------------------------------------- -Version 2.4.1 ------------------------------------------------------- - -Nut was too lazy to create a changelog, it's AEon's turn now! -Changes made from Feb 02 - now (Fill end date in later) - - -Living Armor: - - Fixed "Soft Fall" not preventing damage - - "Nocturnal Prowess" should not flash anymore - - "Trickshot" now ignores HurtResistanceTime - - "Trickshot" now works properly with sentient arrows - - "Step Assist" does not take effect while sneaking - -Sentient Bow: - - Fixed Destructive Will arrows exploding continuously - - Fixed Tipped Arrows getting improved even if no Will can be used - -Sigils: - - Buffed "Sigil of the Fast Miner" to be in accordance to the "Sanguine Scientium" - - Fixed a bug where "Sigil of the Fast Miner" would also cause the whirlwind effect - - Added "Whirlwind" to the potion registry - - Fixed broken Sigil tooltip formatting - - Fixed Sigil of Holding not updating some Sigil data, allowing for exploits - - Greatly improved "Sigil of Compression" performance - - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) - - -Rituals: - - Ported Veil of Evil & Ward of Sacrosanctity - - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) - - Added configurability to Ritual of the High Jump by modifying a new ritual area with the Ritual Tinkerer - -Misc: - - Fixed routing node oredict filter (crashes) - - Fixed mimic vanishing in some cases - - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) - - Stop insertions into Demon Crucible if the inventory is not empty - - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) (Gravestone bugginess) - - Fixed "Unmending" mod incompatibility - - Fixed Teleposers crashing the game if someone force-fed it junk - - added Nut being angery at contributors for messing stuff up - - Added some Russian language strings for the guide book - - Added repair recipes for Sentient Tools & Living Armor to JEI - - Many translation keys have changed which makes affected translations fall back to english - -Technical Stuff no player cares about: - - Formatted Project code - - Fixed BlockState parsing (mimic vanishing) - - Fixed some and streamlined ritual block ranges - - Mystery drain still mysterious - - Use TextFormatting rather than color codes in block lang names - - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) - - Fixed `/bloodmagic network get` command - - Added translation keys for tickethistory command help strings - ------------------------------------------------------- -Version 2.4.0 ------------------------------------------------------- - -It's been a while, eh? Some of you may be asking yourself "whats up with bloodmagic" like that damned recon on a certain -social media site. Well here's what's up: put something snarky here when done writing changelog - -There's so much here, I'm probably going to miss some. Here's a general overview from just skimming commit titles. - -Much of this was done via PR because I'm ~~lazy~~ too busy having fun with Fabric. - -- Fixed harvest moon not working with pumpkins -- [API] Added a way to unregister an altar component -- Moved anything related to Tier 6 behind an opt-in config. Please stop asking me how to get it. -- Fixed small demon stone bricks recipe so it returns 4 instead of 1 -- Ported some old rituals from 1.7 - - Cry of the Eternal Soul - - Reverence of the Condor - - Ritual of the Feathered Earth -- Added a new ritual, Ritual of Grounding -- Optimized bound tool harvesting -- Fixed render issues with demon crystals -- Fixed Hymn of Syphoning not updating some tanks visually -- Added very basic documentation for several rituals to the guide book -- Made meteor costs for Mark of the Falling Tower configurable in the meteor json -- Fluid related sigils should now work identically to buckets of the fluid -- Fixed ritual tinkerer area setting behaving wonkily -- Fixed Seer Sigil not working for incense altars -- Added the ability to buff movement and updraft arrays by providing more of their ingredient -- Ported the ritual dismantler from 1.7.10 -- Logic fix for the Solar Powered - - Now it requires a clear line of sight to the sky as well as it being day time -- Fixed Sigil of Magnetism AOE being offset from the player -- Rewrote commands - - They're different in some way, some how - - Don't ask me how -- Quality of life improvements for the ritual tinkerer -- Changed the activation crystal levels of some rituals to use the awakened crystal - - Mark of the Falling Tower - - All the living armor ones - - It's late and I'm tired don't hate me for being too lazy to look up their names -- Fixed up some bounding boxes for some blocks with fancier models -- Sentient Bow now properly handles modded and potion-ified arrows - -I can't wait for this to turn out to be very broken so I can yell at the contributor :> - ------------------------------------------------------- -Version 2.3.3 ------------------------------------------------------- - -- Fixed Altars not filling orbs of their own tier - ------------------------------------------------------- -Version 2.3.2 ------------------------------------------------------- - -looky bois, we beta now - -- Fixed Sentient Sword attacking mobs and players without being provoked -- Fixed weird Crystal Clusters being weird - - They are now less weird -- Fixed Ritual Reader and Tinkerer not being in the creative tab -- Fixed an NPE that would happen with some blocks in the Ritual of Magnetism's area of effect -- Fixed Mimics not being able to replace blocks during placement -- Fixed issues with inter-dimensional teleportation - - Teleposers and Teleposition Sigils are now fully functional -- Fixed custom arrows not having their effects when fired from the Sentient Bow -- Fixed Splash Potions being unthrowable while Living Armor had the quenched downgrade -- Fixed Ritual Stones being considered Iron instead of Rock -- Fixed the Lava, Water, and Void sigils so they now work properly with tanks -- Fixed an issue where the Teleposer would attempt to damage an offline player -- Fixed the Compression Sigil so it now functions -- Fixed low tier altars being able to fill high tier orbs -- Fixed Sentient Tools having the wrong material -- Fixed Sentient Tools not having a repair material - - It is now demon crystals -- Added a config to disable mob drops from mobs killed by the Well of Suffering -- Added an additional glow to the Dagger of Sacrifice when it has a full incense bonus -- Reworked the Phantom Bridge -- Updated german translation -- Updated chinese translation - ------------------------------------------------------- -Version 2.3.1 ------------------------------------------------------- - -- Fixed Ritual of Magnetism not being registered -- Fixed Mob Sacrifice Array so it no longer kills bosses and players -- Fixed Will type serializer using lowercase names -- Fixed item rendering for the Sigil of Holding HUD -- Added mod id to command localization keys to prevent potential conflicts - ------------------------------------------------------- -Version 2.3.0 ------------------------------------------------------- - -- Fixed Basic Cutting Fluid recipe so it no longer requires an unobtainable potion -- Fixed Teleposer Blacklist not working -- Fixed the bounding box on the Blood Tank -- Fixed crafted Inscription Tools not having their uses tag applied -- Fixed JEI queries with bound Blood Orbs -- Fixed Crushing Ritual not passing a valid player -- Fixed Mending applying to Potion Flasks -- Fixed Teleposition Sigil not checking for a Teleposer at it's destination -- Fixed Lava Crystal not syphoning LP -- Fixed the Laputa array moving unbreakable blocks - - ie: Bedrock -- Fixed the Ritual of the Green Grove not working on Cactus and Reeds -- Added a Mob Sacrifice array -- Updated the HUD system - - You can now edit the HUD layout via the in-game config editor with a drag'n'drop system. - - This screen is only available while in a world. -- Updated the German translation -- Updated the Chinese translation -- [API] Reworked how rituals are registered - - This will break any addons that work with rituals - - If you report an issue to me regarding broken addons, it will be closed without any comment - ------------------------------------------------------- -Version 2.2.12 ------------------------------------------------------- -- Fixed Hellfire Forge and Alchemy Table's shape-crafted-ness. -- Fixed Cutting Fluids so they now work properly. -- Fixed the Fluid filters so that they now work perfectly in the routing system. -- Fixed the Living Armour Upgrade that provides night vision, so it is no longer as finicky. -- Proved that Way could update the version number properly without being told by the maid. - ------------------------------------------------------- -Version 2.2.11 ------------------------------------------------------- -- Fixed the Alchemy Array from voiding items when broken when it shouldn't have. -- Fixed Blood Tank NBT transfer between item/tile form. -- Made sure to not offend TehNut's sensibilities :NutMaid: - ------------------------------------------------------- -Version 2.2.10 ------------------------------------------------------- -- Fixed Turret Array crash on servers. -- Fixed the Blood Altar so it can actually fill Blood Orbs (derp). - ------------------------------------------------------- -Version 2.2.9 ------------------------------------------------------- -- Fixed stupid NPE in the Furnace Array -- Fixed various issues with the Alchemy Table: - - Now works for recipes that require an LP cost. - - Hoppers no longer lose items when items are placed into the "slave" Alchemy Table who has some slots restricted. -- Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. -- Fixed the Demon Will crystals growing when they shouldn't. Also lowered the time between natural crystal growths in Will-enriched areas. - - Side note: who's bright idea was it to have to wait 15 minutes per crystal growth? -- Added the "Resonance of the Faceted Crystal", which can be used to create your first aspected Will crystal clusters. -- Made it so the Crystallizer no longer generates a random aspected Will crystal cluster. -- Fixed rare crash with the Blood Altar, which only has a chance of occuring on restart. - ------------------------------------------------------- -Version 2.2.8 ------------------------------------------------------- -- Fixed a client side null-pointer exception with the Blood Lamp - - It's a bright idea to fix this as soon as I can. -- Changed the recipe of the Teleport Array: - - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! -- Added new arrays - - The Turret Array: - > Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. - - Spike Array: - > Place a piece of cobblestone and iron ingot in the array. The array deals damage to any living entity that enters -- Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. -- Added additional effects to the Sentient Bow when aspected to different Will types. -- Added in book entries for the Teleport Array and the Turret Array. -- Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. -- Removed added health from "Quick Feet" - seriously, why was this a thing? -- Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. - - Note: The dictionary definition for "Ellipsoid" is a three-dimensional figure whose plane sections are ellipses or circles. For those who weren't born in a math class, it means it is a sphere that has different radii in each direction. -- Fixed an off by one in altar upgrade management causing the first of any upgrade to not be counted -- Fixed the LP cost of the Master Blood Orb - - This bug has gone unnoticed for 2 years now. -- Potion Flasks can be crafted now -- Fixed a server crash when handling dye recipes -- Moved several text outputs out of the chat and into the action bar -- Fixed a crash when trying to use unbound toggle-able sigils in the Sigil of Holding -- Fixed an issue where unbound sigils could be used inside the Sigil of Holding -- Added missing items for Demon Crystals and Demon Pylons - ------------------------------------------------------- -Version 2.2.7 ------------------------------------------------------- -- Added the Furnace Array: - - Name pending. - - Takes health from nearby players to power adjacent furnaces. - - Not covered by standard medical insurance. -- Added a new Teleport Array: - - Please keep all hands and feet inside the floating circle until you have come to a complete stop. - - Note to Scotty: Feed the non-floating circle a Feather followed by an Apple to initiate the Beaming sequence. -- Seer Sigil should now properly mimic all functions of the Divination Sigil. -- Fixed some console error spam when using Lava/Water/Void sigils. -- Registered Sulfur (dustSulfur) and Saltpeter (dustSaltpeter) to the ore dictionary. -- Rewrote how IBindable stores it's data: - - This will probably break existing worlds if you have Rituals running. Stop them before updating. - - This will also unbind any of your bound items. Bind them again after updating. - - *glances at the big red A next to all 1.12 files* -- Fixed Haste being *constricted* when above level 2. -- De-nerf Fast Miner array so it provides Haste 3 again. -- Prepped API for recipe tweaking mods. - ------------------------------------------------------- -Version 2.2.6 ------------------------------------------------------- - -- Fixed a weird thing where slates were weird -- Added HUD elements for Tranquility and Inversion -- Fixed Sigils stacking 64 times higher than they should have - -As a side note, I've been listening to http://loli.dance/ for the last like 2 hours now. - ------------------------------------------------------- -Version 2.2.5 ------------------------------------------------------- - -- We are now even more sure we're looking at a block before doing blocky things -- Fix Lava Crystal being consumed by furnaces -- Augmented Capacity and Self Sacrifice runes remember their names now -- Satiated Stomach will now let you gorge yourself on overly high saturation foods - - I'm looking at you, Pam. Stop being weird and giving your foods 28 saturation. -- Made Mod ID node filter dumber so it actually, like, works properly -- "Temporarily" disabled cross-dimensional teleports for entities. Temporarily. - - Did I mention this is temporary? As in totally not permanently? - - Who am I kidding? I'll probably forget about this. -- Bounce Arrays are no longer death traps when sneaking. - ------------------------------------------------------- -Version 2.2.4 ------------------------------------------------------- - -- Make sure we're looking at a block before doing blocky things -- Slightly altered the altar's renderer -- Added new spammy logging with config options - - Prints out information like mods registering things via the API and stuff - ------------------------------------------------------- -Version 2.2.3 ------------------------------------------------------- - -- Fixed mundane components being really really really thirsty - - (everything required water reagents. everything.) -- Buffed the Fast Miner array with a nerf - - Vanilla doesn't like Haste 3 I guess? -- Moved Divination Sigil altar output to a HUD element - - RIP Blood Altar chat spam 2014-2018 -- Mark of the Falling Tower is now re-opened and ready for sacrifices. -- Polished Demon Stones are no longer lonely uncraftable bois -- Somewhat more efficient (at least LoC wise) altar upgrade checking -- Blood Altar is now less stingy about outputs -- Coerced augmented Potion Flask recipe outputs out of hiding - ------------------------------------------------------- -Version 2.2.2 ------------------------------------------------------- - -- Fixed Alchemy Arrays so they might actually function now. Might. - - How did this even function properly before? I have no idea. -- Soul Snare should now stop giving the thrower ghosty debuffs. Should. -- Blood Magic is now in the mood to launch on servers. Probably. -- Soul Forge crafting works again! Potentially! -- Fixed the altar nuking any and all NBT attached to output items. -- Fixed the version not being replaced properly -- Rewrote Hwyla integration. - - Should now function a lot nicer. -- Implemented a new API for recipe registration - - Still need to move the alchemy table over, but otherwise this seems to function just fine. -- Implemented a new API for registering tranquility blocks. - - Will allow Chisel to stop crashing - ------------------------------------------------------- -Version 2.2.1 ------------------------------------------------------- - -- Fixed crashes when using systems that depended on internal entity names -- Fixed a crash when attempting to get the owner from unbound bindable items -- Fixed a server crash on startup -- Fixed GUIs not displaying the background and tooltips properly -- Helped the Sentient Sword get over it's identity crisis -- By the way I'm not actually upset or anything guys. - - Please stop overreacting Reddit. - ------------------------------------------------------- -Version 2.2.0 ------------------------------------------------------- - -- Basic port to 1.12 - - Does not include the vast majority of rewrites and cleanup I did on the other branch - - Completely untested. Done out of spite. Go away. - - There, you have it. Screw off now. - ------------------------------------------------------- -Version 2.1.11 ------------------------------------------------------- - -- Added support for some modded crops (Untested. Theoretically they work) - - Harvestcraft - - Actually Additions - - Extra Utilities -- Fixed permission level for sub-commands -- Large Bloodstone Bricks should receive 4 from a craft -- Fixed Diamond Meteor giving blocks of diamond -- Dynamically calculate Meteor Weight -- Fixed NPE in fluid filter -- Fixed Blood Tank capacity being reset when the chunk reloaded -- Updated russian translation -- Fixed Rune Type capability not registering on physical client -- Updated Sigil of Holding texture so set color is more visible -- Fixed blocks destroyed by bound tools not storing any NBT data -- Fixed Harvest ritual not working on Melons and Pumpkins -- [API] Methods for removing recipes - ------------------------------------------------------- -Version 2.1.10 ------------------------------------------------------- - -- Fixed malicious clients being able to load arbitrary chunks on the server -- Fixed Bound tools not setting their tool class and harvest level - ------------------------------------------------------- -Version 2.1.9 ------------------------------------------------------- - -- Fixed Alchemy Table overwriting output each time it crafted something - - https://github.com/WayofTime/BloodMagic/issues/1119 -- Blood Magic commands (/bloodmagic) can now be used in Command Blocks - - https://github.com/WayofTime/BloodMagic/issues/1117 -- Re-implemented the Soul Fray debuff on death - - No more exploiting sacrifice by killing yourself over and over (again) - - https://github.com/WayofTime/BloodMagic/issues/1118 -- Updated Traditional Chinese localization - - https://github.com/WayofTime/BloodMagic/pull/1116 - ------------------------------------------------------- -Version 2.1.8 ------------------------------------------------------- - -- Fixed more null stack issues - - Will it ever end? -- Fixed a crash when activating a ritual via Redstone -- Fixed a fluid handling issue with Blood Tanks - - https://github.com/WayofTime/BloodMagic/issues/1108 -- Fixed issue where Sigils inside a Sigil of Holding were using the wrong item - - https://github.com/WayofTime/BloodMagic/issues/1102 -- Fixed crash when activing Bound Tools - - https://github.com/WayofTime/BloodMagic/issues/1114 -- Updated the Chinese localization - - https://github.com/WayofTime/BloodMagic/pull/1052 -- Placer Ritual is now much more performant -- Many recipes have been moved over to support the Ore Dictionary - - https://github.com/WayofTime/BloodMagic/issues/1101 - ------------------------------------------------------- -Version 2.1.7 ------------------------------------------------------- - -- Fixed Grave Digger not applying damage bonus - - https://github.com/WayofTime/BloodMagic/issues/1098 -- Fixed crash when attempting to handle the dropping of Demonic Will - - https://github.com/WayofTime/BloodMagic/issues/1091 -- Fixed Crash of the Timberman dupe - - This also adds support for IItemHandler based inventories - - https://github.com/WayofTime/BloodMagic/issues/1090 -- Fixed a crash when a Meteor struck the ground - - https://github.com/WayofTime/BloodMagic/issues/1088 -- Fixed the Seer's Sigil not using Roman Numerals to display the altar tier - - https://github.com/WayofTime/BloodMagic/pull/1094 - ------------------------------------------------------- -Version 2.1.6 ------------------------------------------------------- -- Fixed invisible Sentient Specters destroying everything and everybody around their owners - - lol - - https://github.com/WayofTime/BloodMagic/issues/1065 -- Fixed occasional crash when Blood Altar checked it's recipe - - https://github.com/WayofTime/BloodMagic/issues/1086 -- Fixed Blood Light acting as a collidable block in obfuscated environments - - I think - - https://github.com/WayofTime/BloodMagic/issues/1083 -- Fixed crash when Alchemy Table fully depleted a Cutting Fluid item - - https://github.com/WayofTime/BloodMagic/issues/1082 -- Fixed crash when scrolling through Sigil of Holding - - https://github.com/WayofTime/BloodMagic/issues/1081 -- Fixed not being able to take Gems out of Demon Crucibles - - https://github.com/WayofTime/BloodMagic/issues/1079 -- Fixed some more null stack issues - - When is this going to be over... - - https://github.com/WayofTime/BloodMagic/issues/1068 -- Fixed JEI not displaying Armor Tomes -- Fixed Body Builder level 4 being 5x more expensive than level 5 - - https://github.com/WayofTime/BloodMagic/pull/1080 -- Updated Japanese localization - - https://github.com/WayofTime/BloodMagic/pull/1076 - ------------------------------------------------------- -Version 2.1.5 ------------------------------------------------------- -- Fixed Hellfire Forge slots acting up - - i is not j no matter how similar they look -- Fixed JEI compat for Alchemy Table recipes -- Fixed a lot more null stack checks -- Fixed (yet another) crash when creating an "invalid" stack of the Blood Tank -- Fixed Demon Will Crystal and Teleposer crashy interaction -- Fixed crash when working with toggleable sigils - ------------------------------------------------------- -Version 2.1.4 ------------------------------------------------------- -- Fixed a crash when checking if two items could be combined -- Fixed a crash when attempting to open the Sigil of Holding GUI -- Fixed a crash when somebody made an "invalid" stack of the Blood Tank -- Fixed a crash/hilarity where a Blood Altar would update itself as a Comparator - - Thanks to Arcaratus for causing this. I haven't laughed that hard in a while. - ------------------------------------------------------- -Version 2.1.3 ------------------------------------------------------- -- Added a new Master Ritual Stone that inverts it's redstone activity -- Fixed Living Armor attributes overriding eachother instead of adding up -- Fixed Ore doubling sometimes adding invalid recipes -- Downgrade tomes are now called Downgrade Tomes -- Added some caching to rituals to (hopefully) increase performance with less world data query-ing - ------------------------------------------------------- -Version 2.1.2 ------------------------------------------------------- -- Fixed server crash when creating the guide entries - ------------------------------------------------------- -Version 2.1.1-70 ------------------------------------------------------- -- Updated to Minecraft 1.11(.2) -- Fixed the Living Armour Sacrificial Upgrade -- Fixed Bound Tools not draining LP -- Implemented the Blood Tank - - Current recipes are temporaryâ„¢ -- Empty flasks can now be refilled to create a new flask -- Fixed Aura of Expulsion whitelist -- Added the Altar's Charge value to the Waila Tooltip when holding a Seer's Sigil -- Fixed meteor config error caused by EnderCore reloading configs early into startup -- Fixed meteor config not generating new entries -- Blacklisted Sentient Spectres from the Well of Suffering -- Fixed Sigils drawing from the user instead of the bound network -- Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter. -- Made it so the book does not give the filling recipe when the Blood Orb recipe is queried. -- Added a null check for the Will getter for the Aura incase the WillChunk somehow does not generate. -- [API] Added a new IMC API for modders to register their blocks as an altar component. - - Example: Chisel Glowstone can now be used for the Tier 3 caps (once Chisel implements it) - ------------------------------------------------------- -Version 2.1.0-69 ------------------------------------------------------- -- Fixed Phantom Bridge sigil glitch when travelling between dimensions and teleporting large distances. -- Added deprecated methods for easier updating - Oops! - ------------------------------------------------------- -Version 2.1.0-68 ------------------------------------------------------- -- Fixed Ritual of Regeneration's text -- Fixed silly dupe bug with the Zephyr ritual. - ------------------------------------------------------- -Version 2.1.0-67 ------------------------------------------------------- -- Added the Destructive Will effect to the Ritual of the Green Grove. This ritual now is done~ -- Finished the Augments for the Serenade of the Nether. -- Implemented a new model for the Blood Altar to be more in-line with the rest of the mod (Thanks, wiiv!) -- Made the Blood Altar respect the new capability system for fluid management. -- Finished the Augments for the Ritual of the Feathered Knife. -- Finished the Augments for the Ritual of the Crusher. -- Finished most of the Augments for the Ritual of the Shepherd. -- Changed the Ritual of the Feathered Knife so it respects the Tough Palms Living Armour Upgrade. -- Fixed the Ritual of the Feathered Knife so that its health threshold is percent-based. -- Made the aspected Sentient Tools drop their corresponding Will type on killing enemies. -- Made it so peaceful animals provide more LP by default (to encourage creating your own farm). -- Increased the effectiveness of animals for the Gathering of the Forsaken Souls ritual by a factor of 4. -- Added the framework for the Purification Altar. -- Fixed a crash with the Ritual Diviner when attempting to replace certain blocks. -- Snares can no longer hit the thrower of the snare within 20 ticks of throwing it. -- Updated the book so it contains most of the rituals. -- Added some placeholder recipes for the Living Armour Downgrades - they will eventually change. - ------------------------------------------------------- -Version 2.1.0-66 ------------------------------------------------------- -- Made it so that when you acquire a Living Armour Upgrade from a Tome, it raises the corresponding Stat Tracker up to that upgrade level. -- Added some more framework for the Living Armour Downgrades. -- Modified the Grim Reaper's Sprint so it is better at later levels. -- Added a Repairing Living Armour Upgrade (trained by damaging the chestplate of the Living Armour while you have a full set on - it repairs all of your armour pieces over time) -- Modified the Dwarven Might skill to better change the mining speed when mining. -- Added a Dig Slowdown armour downgrade called "Weakened Pick". -- Added the framework for a ritual that grants downgrades (instead of the potion method). -- Fixed the recipes for some of the Demon Will blocks -- Added the Sigil of Elasticity, the Sigil of the Claw, and the Sigil of Winter's Breath. -- Changed most of the BlockString blocks to a BlockEnum in order to solve a loading issue with schematics. -- Added the entries for the Skeleton Turret Array and the Updraft Array -- Added the Bounce Array -- Modified the Sigil of the Phantom Bridge so it better performs with speed modifications -- Added the ability to use Mimic Blocks containing a valid Altar Component to work with the altar (#945) - - Note: If using a Blood Rune, you do not get the ability of said rune. It just counts as a valid block. -- Fixed `/bloodmagic network get NAME` using the wrong localization (#955) -- Fixed Mimic Blocks causing an NPE with some Tile Entities (#951) -- Fixed a massive FPS drop when looking at a Master Ritual Stone while holding a Ritual Tinkerer (#950) -- Fixed an occasional crash when looking at a Mimic block with WAILA installed (#949) -- Fixed the displayed Lesser Tartaric Gem recipe in the Guide (#947) -- Fixed Dagger of Sacrifice one-shotting bosses. It now just doesn't work (#932) -- Fixed controls re-binding after each startup (#922) -- Added an alchemy array, the Array of the Fast Miner - ------------------------------------------------------- -Version 2.1.0-65 ------------------------------------------------------- -- Fixed NPE when attacking mobs when you don't have a set of Living Armour. Oops. - ------------------------------------------------------- -Version 2.1.0-64 ------------------------------------------------------- -- Fixed the symmetry issues of the Ritual of Containment -- Changed the recipe of the Acceleration rune so that it is a T4 rune. -- Added the Charging rune, which accumulates charge by using the LP from the Blood Altar (1 charge = 1 LP always). If enough charge is stored when crafting, the crafting occurs instantly. -- Added the entries for the Rune of Augmented Capacity, Charging Rune, and Rune of Acceleration -- Fixed the Sigil of Translocation so that it does not crash when picking up certain blocks. Also removed the damned lightning. -- Changed the Quick Feet upgrade and the speed boost sigil so that their speeds are applied when strafing and walking backwards as well. - ------------------------------------------------------- -Version 2.1.0-63 ------------------------------------------------------- -- Removed the darn testing code from the Divination Sigil. >.> - ------------------------------------------------------- -Version 2.1.0-62 ------------------------------------------------------- -- Fixed the fact rituals were not working (Might have been a compiler error). - ------------------------------------------------------- -Version 2.1.0-61 ------------------------------------------------------- -- Added fancy rendering for the Inversion Pillars. -- Made the Meteor registry more manageable by separating the meteors into independent .json files. -- Fixed the Sigil of Holding so that it does not crash servers when pressing the Holding key ('H' by default) - ------------------------------------------------------- -Version 2.1.0-60 ------------------------------------------------------- -- Fixed routing node serialization. -- Removed unwanted System.out lines when clicking on the slots in the routing node. - ------------------------------------------------------- -Version 2.1.0-59 ------------------------------------------------------- -- Added the Living Armour Upgrade, Nocturnal Prowess, which gives night vision in dark areas and increases damage while the area is dark. -- Added a LOT of dungeon blocks. I mean a lot. -- Finished adding the recipes for all of the blocks (except the Demon Alloy) -- Added a temporary texture (finally) for the Inspectoris Scandalum -- Fixed Specters spawning with the /give command -- Fixed the sacrifice range of the altar. -- Fixed the Regeneration ritual so that it works on non-players -- Added Mimic entry to The Architect. -- Configurified the Meteor Ritual - Modpacks and users can edit all of the major properties of the meteor ritual, including what items need to be dropped onto the ritual as well as what you get in the ritual, radius, etc. The config will refresh if there is a version change unless you set "resyncOnVersionChange" to false. -- Merged the three brick variants into one. -- Added the Inversion Pillar models and caps - ------------------------------------------------------- -Version 2.0.4-58 ------------------------------------------------------- -- Temporarily removed the dungeon stuff so that it doesn't crash. - ------------------------------------------------------- -Version 2.0.4-57 ------------------------------------------------------- -- Changed the Demon Will Aura Gauge so it refreshes based on the player's ticks existed -- Made Draft of Angelus craftable with gold dust -- Fixed Elytra upgrade -- Added the Mimics - the real ones -- Implemented a bit of framework for some T5 shenanigans. -- Fixed the Incense Altar so it properly detected the south sides of the altar. -- Updated the Filtered Item Routing Nodes' GUI so that it behaved less like ass. Also added the necessary nbt porting code. -- Further improved the routing GUI by allowing an amount to be typed into the amount bar. -- Updated the toggleable sigils so they drain the user's LP based on the user's total ticks existed instead of the world time. This is to solve the doDaylightCycle glitch in this scenario. - ------------------------------------------------------- -Version 2.0.4-56 ------------------------------------------------------- -- Fixed an incompatability between the 1.10.2 and the 1.9.4 versions - ------------------------------------------------------- -Version 2.0.4-55 ------------------------------------------------------- -- Made Guide-API a required mod. -- Fixed a funky issue where the Sound of the Cleansing Soul did not reset the upgrade points internally. -- Added Sentient Specters, which are essentially tamable companions. Drop a sentient tool if you have more than 1024 Will of a given type to summon one (at the cost of 100 Will). -- Added Mimic Blocks! - ------------------------------------------------------- -Version 2.0.3-54 ------------------------------------------------------- -- Eliminated some of the "wonkiness" from the Air Sigil -- Fixed the Hellfire Forge so that swapping Tartaric gems will not give free stuff. -- Added the Potion Flask and a few of the potion effects - max amount of effects that can be added to a single flask is currently 3. -- Fixed the Aura gauge not resetting in chunks that do not have any Aura -- Added tooltips for the progress to the next upgrade for Living Armour (hold shift + M) -- Finished off The Architect docs for now -- Finished off The Demon Kin docs for the time being - ------------------------------------------------------- -Version 2.0.3-53 ------------------------------------------------------- -- Fixed issue where the mod doesn't load on servers. Oops. - ------------------------------------------------------- -Version 2.0.3-52 ------------------------------------------------------- -- Updated the Sanguine Scientiem with Alchemy Array recipes -- Fixed the Blood Altar so that it can (again) work on a stack size larger than 1. - ------------------------------------------------------- -Version 2.0.3-51 ------------------------------------------------------- -- Added the Demon Will Aura Gauge to accurately determine the Will in the Aura. -- Added the ability for rituals to have a Demon Will set on them. Now to get rituals to use them. -- Fixed it so that the Crushing Ritual now ignores liquids -- Added the Mark of the Falling Tower ritual. -- Changed the tooltip of the ritual diviner so that it gives information about the selected ritual. -- Added more to the Sanguine Scientiem, including Hellfire Forge recipes and Altar recipes -- Updated a lot of the text in the Sanguine Scientiem - ------------------------------------------------------- -Version 2.0.2-50 ------------------------------------------------------- -- Fixed bad NPE when using the WoS. (Well, I guess all NPEs are technically bad, but I guess it depends on your perspective. That said, I don't think a changelog is the best place for a theoretical discussion about the rights and wrongs of errors, so I will stop now.) - ------------------------------------------------------- -Version 2.0.2-49 ------------------------------------------------------- -- All Alchemy Array recipes are WIP and are subject to change! ^.^ They are created using the Arcane Ash and are shown as first item + second item. -- Added the Movement Array (feather + redstone) -- Added the Mob Beacon Array (2x Zombie Flesh) -- Added the Updraft Array (feather + glowstone) -- Added the Skeleton Turret Array (Arrow + feather) -- Fixed the Lava Crystal recipe so that it can use all tiers of blood orb -- Nerfed the Bound Blade. This is temporary, since the sword eventually will be modified. -- Fixed Teleposers so they no longer crash 1.10 instances when teleposing tiles. - ------------------------------------------------------- -Version 2.0.2-48 ------------------------------------------------------- -- Fixed a stupid bug by a stupid Way - ------------------------------------------------------- -Version 2.0.2-47 ------------------------------------------------------- -- Fixed horrible memory leak in the Living Armour. -- Item Nodes can now be disabled by a (weak) redstone signal. - ------------------------------------------------------- -Version 2.0.2-46 ------------------------------------------------------- -- Fixed it so Ritual stones can be placed by the Ritual Diviner again. Also made it so that rituals are activateable and don't crash servers. - ------------------------------------------------------- -Version 2.0.2-45 ------------------------------------------------------- -- Changed the recipe of the Sanguine Scientiem -- Fixed the Routing system so that it properly eliminates the connection to the Master node when the Master node is broken. -- Fixed an issue where the Spectral Blocks (from the Sigil of Suppression) would return the liquid on the client side before the sigil was deactivated. -- Made it so that the bound tools are (supposedly more so) unbreakable. This will probably come bite me on the ehem later, but we'll see. -- Added Fire Resistance Living Armour Upgrade, "Gift of Ignis." -- Updated The Architect section of the documentation. -- Fixed it so the Ritual will call stopRitual when a ritual stone is broken. -- Added the recipe for the Inspectoris Scandalum (I had to check if I spelled that right) which acts as a helper for Altar Building -- Right-clicking a MRS with the Ritual Diviner will affix the ritual hologram to the MRS. - ------------------------------------------------------- -Version 2.0.2-44 ------------------------------------------------------- -- Added the Draft of Angelus, which increases the max number of upgrade points for Living Armour. It's strawberry flavoured! -- Fixed the Tome of Peritia again - <= and < are the same, right? -- Fixed an interaction between the Tome of Peritia and the Experienced upgrade - ------------------------------------------------------- -Version 2.0.1-43 ------------------------------------------------------- -- Added an initial method to divine where a blood rune is missing for the next tier of altar. -- Fixed an NPE with the Gathering of the Forsaken Souls -- Fixed Absorption Hearts remaining after the absorption buff ends for the Steadfast Sentient Sword -- Updated the Guide (Woooooooooooooo........) -- (Possibly?) fixed Tome of Peritia bug of the Negative Speed of Light -- Added recipes for all ores -> dust in the alchemy table. -- Added the recipes for the Sentient Tools - yes, they all drop Will. -- Fixed the bow so that it now gives you Will when you kill a mob - it does not drop the Will, it goes directly to you. - ------------------------------------------------------- -Version 2.0.1-42 ------------------------------------------------------- -- Fixed Demon Crucible's weird behaviour where right-clicking it with an invalid item would still put the item in the crucible - and give the player an item with a stacksize of 0. -- WAILA! -- Oh, and demon wings with the Elytra. - ------------------------------------------------------- -Version 2.0.1-40 ------------------------------------------------------- -- Bug fix version, and added several translations - some of these are still WIP. -- Fixed render bug with the Alchemy Table -- Demon WIll now drops from slimes at a reduced rate instead of not at all -- Fixed Jesus Water effect with Life Essence -- Added the Vengeful Will crystal cluster recipe. Oops! >.> -- Changed the "Default" Will into "Raw" Will. -- Fixed an item duplication bug with how item pick-up is handled with the Zephyr ritual and the magnetism sigil. -- Made the bound Axe function... correctly -- Fixed a command block only issue with BM commands - ------------------------------------------------------- -Version 2.0.0-39 ------------------------------------------------------- -- Updated to 1.9.4! -- Fixed the Trick Shot upgrade -- Fixed Gate of the Fold endless loop -- Added rune type colors to the Ritual Diviner tooltip -- Crusher ritual ignores unbreakable blocks - ------------------------------------------------------- -Version 2.0.0-38 ------------------------------------------------------- -- Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil -- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices -- Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources. -- Fixed bound sword stuttering - ------------------------------------------------------- -Version 2.0.0-37 ------------------------------------------------------- -- Fixed Elytra upgrade not working on servers. Oops! - ------------------------------------------------------- -Version 2.0.0-36 ------------------------------------------------------- -- Added JEI compat for the Alchemy Table -- Changed the Item Routing system so that it used capabilities instead -- Updated the Alchemy Table recipe system so that it can provide better custom recipes. -- Added some more recipes (like rudimentary ore doubling) to the alchemy table. -- Added Explosive Powder, which is used to reduce cobblestone into gravel and gravel into sand (64 uses) - ------------------------------------------------------- -Version 2.0.0-35 ------------------------------------------------------- -- Changed Living Armour so that it is now damagable. The Living Armour Chestplate will be damaged, but will not break. If it gets to ~0 durability, it will damage your LP network heavily. -- Living Armour is now repairable in an anvil with Binding Reagent. -- Started adding in the Alchemy Table... not really started. -- Changed it so that the Mending enchantment consumes the EXP before the Tome of Peritia does -- Added fall distance mitigation to the jump upgrade -- Fixed Lava Crystals... again. -- Worked on the Alchemy Table -- Added the Elytra upgrade - craft the tome in an anvil by using a book and a full Elytra. - ------------------------------------------------------- -Version 2.0.0-34 ------------------------------------------------------- -- Added config to Blood Magic that will prevent the compression handler from reading the recipes added by the Compression mod (default is true). -- Added Japanese localization and fixed Czech (I can't spell) localization. - ------------------------------------------------------- -Version 2.0.0-33 ------------------------------------------------------- -- Fixed a few localization derps. -- Fixed a few minor bugs. - ------------------------------------------------------- -Version 2.0.0-32 ------------------------------------------------------- -- Changed Tome of Peritia's recipe -- Added step assist living armour upgrade tracker. -- Added new Living Armour upgrades: - - Added Charging Strike, which increases knockback and damage for attacks while sprinting - - Added True Strike, increasing the damage of critical hits -- Updated for Forge 12.16.0.1859 -- Did some work on the Sentient Bow to start adding abilities to it -- Fixed the Speed and Jump rituals so that they correctly update the player's motion. -- Implemented the "Ritual Tinkerer" and added its recipe. - ------------------------------------------------------- -Version 2.0.0-31 ------------------------------------------------------- -- Fixed NPE when using an empty bucket. -- Added Living Armour Upgrades: - - Strong Legs increases jump height. Pro tip: hold shift to bypass this jump boost. - - Soft Fall decreases all fall damage, up to 100% at level 5. - - Grave Digger, for fun times with alternative weapons -- Added increase in speed for Routing nodes inside of a chunk with Demon Aura -- Fixed OutOfBoundsException in the Sentient Sword when you didn't have enough Will. -- Fixed custom potion effects so they could be applied server-sided -- Added recipe for the Tome of Peritia - ------------------------------------------------------- -Version 2.0.0-30 ------------------------------------------------------- -- Wow, there are a lot of bug fixes lately. -- Fixed it so that the blood orb is no longer consumed in the crafting grid. - ------------------------------------------------------- -Version 2.0.0-29 ------------------------------------------------------- -- Fixed formatting not working properly on servers. - ------------------------------------------------------- -Version 2.0.0-28 ------------------------------------------------------- -- Fixed the soul snare. -- Removed health buff from Steadfast armour -- Changed corrosive sword's effect from poison to wither -- Fixed living armour's training bracelet so that it deactivates any training of upgrades not supported -- Added "Experienced" living armour upgrade, which provides more xp from picked up orbs. -- Updated to Forge 1826 - ------------------------------------------------------- -Version 2.0.0-27 ------------------------------------------------------- -- Added OreDict support for the altar (was done in 26) -- Made it so that the Tartaric gem would show visually what type of will was contained -- Allowed the Sentient Sword to use different wills, and change its colour based on the used one. Also made it so you do not toggle it by right clicking, but it simply - rechecks itself when you smack something and when you right-click. -- Fixed item binding. Yusssss. -- Added Sword, Armour, and Bow texture changes when you have different demonic will in your inventory. -- Finalized sentient sword effects -- Did work on the unique demon will effects for armour -- FINALLY changed it so farm animals do not drop demon will. - ------------------------------------------------------- -Version 2.0.0-23 ------------------------------------------------------- -- Fixed "see through world" syndrome for most blocks -- Fixed .obj models so that they will properly render while in-hand -- Fixed routing node attaching logic -- Changed the growth behavior of the crystals -- Fixed Potion getting for various methods -- Started work on crystal automation ritual -- Finished first iteration of the iterator of AreaDescriptor (hehe) -- Finished the crystal automation ritual, "Gathering of the Forsaken Souls." This ritual damages mobs in it's area (21^3 cube around the MRS) and once it kills a mob it - uses its life essence to feed the demonic will crystals inside of its area (two blocks above the ritual stone, 7x7 region and 5 high). This costs LP and - demonic will from the aura of the particular type, and costs less will the more... varied the mobs killed are. Growth amount is dictated by the max health - of the mobs killed. -- Updated to Forge 1811 - ------------------------------------------------------- -Version 2.0.0-22 ------------------------------------------------------- -- Fixed client disconnect when joining servers -- Fixed Bound Blade having same damage between activated and deactivated states -- Fixed Sentient Armour gem so it works, now -- Fixed Armour model textures -- Fixed crash on newer versions of Forge -- Updated zh_CN localization - ------------------------------------------------------- -Version 2.0.0-21 ------------------------------------------------------- -- Initial release to 1.9. Many glitches that have yet to be ironed out, some of them Forge issues. Probably best not to play with this one until Forge stabilizes. - ------------------------------------------------------- -Version 2.0.0-20 ------------------------------------------------------- -- Fixed Blood Altar crashing on odd occasions. -- Fixed GUI of hellfire forge. -- Fixed issue with Will Chunks not generating when requested in new chunks -- Fixed issue where Orb Tier was never set for a player internally -- Fixed Creative Dagger. It now works correctly. Shift + Right Click on an Altar to fill it to capacity. -- Fixed step height being set to incorrect value. Your Chisels and Bits stairs should work, now! -- Fixed Bound Tools not being enchantable. -- Fixed Bound Tools "Beast Mode" breaking blocks unreliably. -- Fixed Blood Light Sigil not using LP -- Changed Will system so that it automatically goes into your inventory and then drops any excess Will on the ground. -- Changed Blood Light to render more particles when the sigil is held to make them easier to find. -- Added debug commands. These work exactly the same as in the 1.7.10 version -- [API] Fixed AddToNetworkEvent not being cancellable even though it should be -- [API] Helper method in NetworkHelper to obtain the highest possible capacity for a given tier. - ------------------------------------------------------- -Version 2.0.0-19 ------------------------------------------------------- -- Fixed path blocks so they are actually craftable. -- Added gui stuff to enable priority in the item routing system: nodes with a lower value priority will be accessed first. (May be rotated in the future) -- Grayed out the currently active side's button in the item routers. -- Added Demon Pylon -- Changed behaviour of Demon Crucible -- Fully implemented the behaviour of the crystal growing process. - - A Demon Crucible will be able to syphon the demon will from the tartaric gems inside of its inventory - right click with a gem to place it into the inventory. - - The syphoned will from the gem will go into the chunk, staying in the air - it will not move to neighbouring chunks unless forced to do so through other means - - The Demon Pylon draws will in the air from surrounding chunks and puts it into its own chunk - this acts as sort of like a pressure system, where it will even out the will distribution, but only goes one way. - - The Demon Crystallizer takes 100 will from the air (need a demon crucible for it to work) and forms a demon crystal on top of it. There is a 10% chance that this crystal will be of a special type. - - The Demon Crystals can be mined in order to collect their crystals. These crystals can be used for crafting more powerful stuff. If you have over 1024 will on your person when you right click the crystal, you can harvest a single crystal instead of the entire thing. - - You can put the harvested crystals inside of a demon crucible. Each crystal is worth 10 will, so this acts as a way to semi-automate will creation. - - When a hellfire forge is inside of a chunk with demon will, it will fill its contained tartaric gem with will. - - Changed a few recipes (like the greater tartaric gem) to match this new system. - ------------------------------------------------------- -Version 2.0.0-18 ------------------------------------------------------- -- Fixed issue with lava crystal working even their is no LP available. -- Added upgrade trainer -- Fixed step height issue with C&B stuff. Apparently step height is now 0.6 by default instead of 0.5. -- Added Ritual: Song of the Cleansing Soul to remove Living Armour upgrades from the armour. -- Added Ritual: Ritual of Living Evolution, which is used to set the living armour's max upgrade points to 300. -- Added Ritual: The Timberman to cut down trees. Requires a chest on top of the MRS in order to collect the drops from harvested trees. -- Added Ritual: Hymn of Syphoning, which syphons up fluids around it in a 16 block radius and puts the fluid in the tank above it. The tank above it must have at least one bucket of the fluid you want to syphon inside of it. -- Added Ritual: The Assembly of the High Altar, which places runes and blocks from the inventory above it in the world in the form of a blood altar. Autobuilding altars~ -- Added Ritual: The Gate of the Fold. -- Added Ritual: The Filler. Places blocks from the inventory on top of it in the world. -- Added Ritual: Le Vulcanos Frigius - -- Added tooltip to living armour to show the current upgrade points of the armour. -- Added recipe for the training bracelet. Combine in an anvil with an upgrade tome to set it as the upgrade to train. -- Ammended range of Zephyr ritual -- Fixed Green Grove ritual -- Fixed Crusher ritual so it didn't break everything at once. -- Removed the FOV effect from the Quick Feet speed upgrade. -- Minor work on the Demon Crucible. -- Crucibles now fill the tartaric gems of close-by hellfire forges -- Fixed rituals not correctly re-activating when taking off a redstone signal after reloading the world. -- Added Teleposition Sigil, which teleports the user to the bound Teleposer. -- Added Transposition Sigil, which picks up the block clicked on including the NBT of the given tile. - ------------------------------------------------------- -Version 2.0.0-17 ------------------------------------------------------- -- Added Living Armour Upgrades - - Solar Powered - - Grim Reaper's Sprint - - [Thaumcraft] Runic Shielding -- Fixed Blood Altar's progress resetting when clicking with another item -- Fixed Divination and Seer sigils crashing when clicking on an altar while not bound -- Added crafting recipes for the following sigils: - - Compression - - Phantom Bridge - - Ender Severance - - Haste -- Dagger now bypasses checks of armour - ------------------------------------------------------- -Version 2.0.0-16 ------------------------------------------------------- -- Fixed a major bug with the Blood Orbs. - ------------------------------------------------------- -Version 2.0.0-15 ------------------------------------------------------- -- Added blood lamp sigil array texture and reagent. Made it so the blood lamp sigil will place the light when right clicking on a block. -- Added magnetism sigil array texture and reagent. -- Added the ability for the blood altar to have its buffer tanks accessed (Semi-tested) -- Improved readability for large numbers -- Fixed break particle for Alchemy Array -- Waila handling for Alchemy Array -- Fixed Ritual eating LP when reactivated via a Redstone signal -- Ritual Stones now always drop blank stones -- Bound Blade is now enchant-able -- Goggles of Revealing upgrade for Living Helmet. Combine a Living Helmet and Goggles of Revealing in an Anvil -- Fixed config for disabling rituals -- [API] Lots of changes to the binding system. It's now handled automatically for all items that implement IBindable. -- Added Incense Altar system. -- Added models for the routing nodes, incense altar, and the hellfire forge. - ------------------------------------------------------- -Version 2.0.0-14 ------------------------------------------------------- -- [API] Added support for some IMC methods: - - FMLInterModComs.sendMessage("BloodMagic", "teleposerBlacklist", ItemStack) - - FMLInterModComs.sendMessage("BloodMagic", "sacrificeValue", "ClassName;Value") - - FMLInterModComs.sendMessage("BloodMagic", "greenGroveBlacklist", "domain:name") -- Fixed the bound sword so that it now drops weak blood shards. -- Fixed the demon will so that you can actually pick it up! - ------------------------------------------------------- -Version 2.0.0-13 ------------------------------------------------------- -- Added recipes and temp textures for path blocks. More path blocks to come. -- Tweaked the Incense altar and added its recipe. -- Fixed Blood Light sigil not providing the right coloured particles -- Added the ability for the divination sigil to look up information about the incense altar. -- Fix another NPE when checking of a player has a full set of Living Armor - ------------------------------------------------------- -Version 2.0.0-12 ------------------------------------------------------- -- This build doesn't exist. Shhh - ------------------------------------------------------- -Version 2.0.0-11 ------------------------------------------------------- -- Fix NPE when checking if a player has a full Living Armor set - ------------------------------------------------------- -Version 2.0.0-10 ------------------------------------------------------- -- Added recipe for Sentient Armour - craft a Sentient Armour Gem and right click with it to toggle the armour. -- Added recipes for the Greater and Grand Tartaric gems. These are temporary recipes. -- Updated textures. -- Added ability to fill gems from other gems. Right click with a gem to fill other gems in your inventory. -- Un-nerfed the Ritual Stone recipe to provide 4 again -- Rituals can now be toggled with Redstone. Provide a redstone signal to the Master Ritual Stone to turn it off. -- Made the Sentient sword able to block. -- Fixed the Sentient Sword so that even when not activated it will still do damage - just at a reduced amount. -- Made it so that Demon Will will be voided if all of the player's tartaric gems are filled. - ------------------------------------------------------- -Version 2.0.0-9 ------------------------------------------------------- -- Fixed the rituals so that they no longer caused nausea no matter what. - ------------------------------------------------------- -Version 2.0.0-8 ------------------------------------------------------- -- Fixed crash when activating rituals while operating on servers -- Added the majority of stuff for the item routing system. - ------------------------------------------------------- -Version 2.0.0-7 ------------------------------------------------------- -- JEI now displays more information for Altar recipes. Hover over the Altar image to view it. -- Added particles to the Blood Altar on the server-side. -- Allow configuration of entity sacrificial values -- [API] Allow setting of entity sacrificial values via API. Takes precedence over config values. -- [API] Method to easily get instances of Items and Blocks -- [API] Allow mods to blacklist their blocks from the Green Grove ritual/sigil - ------------------------------------------------------- -Version 2.0.0-6 ------------------------------------------------------- -- Fixed the LivingArmourTracker for defense so that it no longer ate up armour (om nom nom nom) - ------------------------------------------------------- -Version 2.0.0-5 ------------------------------------------------------- -- Tweaked Sentient Sword's will drop rate -- No longer 1.8.8 compatible -- Cleaned some clutter from JEI -- Added a potential fix to some server mod issues. - - ------------------------------------------------------- -Version 2.0.0-4 ------------------------------------------------------- -- Added Physical resistance upgrade (Tough skin) -- Added health boost upgrade (Healthy) -- Added melee damage upgrade (Fierce strike) -- Added trick shot upgrade (Have fun finding it! :D) -- Added T5 orb recipe and Demonic Activation Crystal -- Added Rituals: - - Animal Growth ritual - - Harvest ritual - - Magnetism ritual - - Crushing ritual - - Full Stomach ritual - -- Added parts for the new Demon Will System - - Added the Demon Will item - - Added the Sentient Sword, which will be powered by consuming demon will - - Added a Lesser Tartaric Gem in order to hold onto more will - - SSSSSSSSoooooooouuuuuuulllllllllsssssss - - Added Hellfire Forge block - - Added rudimentary snare and recipe - has 25% chance for monster to drop its soul - - Added Sentient Bow - - Added Sentient Armour - -- Fixed binding of togglable sigils -- Added saving for ritual tags - ------------------------------------------------------- -Version 2.0.0-3 ------------------------------------------------------- -- Fixed client-side issue when shift-clicking lava crystals into a furnace while on a server. -- Added poison upgrade to Living Armour -- Fixed digging upgrade -- Added self sacrifice upgrade to Living Armour (Tough Palms) -- Added knockback resistance upgrade to Living Armour, trained via eating (Body Builder) - - ------------------------------------------------------- -Version 2.0.0-2 ------------------------------------------------------- -- Added Life Essence bucket recipe -- Added the rendering of LP inside of the altar -- Added Living Armour including some upgrades: - - Added speed upgrade - - Added digging upgrade -- Modified Divination Sigil recipe - no longer uses a block of glass because of issues on servers (tempramental) -- Modified Apprentice Blood Orb recipe to require a block of redstone instead. -- Added the Reagent Air recipe. - - ------------------------------------------------------- -Version 2.0.0 ------------------------------------------------------- - -Initial release of the open beta for the mod to Minecraft v1.8.9! This mod version has a lot of changes. Because it is a full-on rewrite, some of the mechanics of the mod have changed/are going to change. As such, the feel of the mod will be slightly different than previous iterations. -This mod has a large amount of compatibility with the recipe look-up mod, Just Enough Items (JEI). It is VERY much recommended that you download JEI, since it will make your life a lot easier with the new mechanics. -Because this is a beta of a rewrite, there will be a lot of missing content. I am trying my hardest to add new content as fast as I can, but my team and I are only human and can only code so fast. Please give a little patience while we make the mod the best it possibly can! -Also, please submit bug reports or feature requests to the github, https://github.com/WayofTime/BloodMagic. We'll get to the issue soon! - -New -- Added "Alchemy Array" crafting - this is achieved by making some "Arcane Ash" and clicking on the ground to create an array. You then click on the array with the first ingredient and then the second - breaking the array will give the items back. -- Added JEI compatibility -- Added WAILA compatibility (No more needing 3rd-party addons!) - -Changed -- Lots of internals have changed. Too many to list. -- A graphical overhaul of everything has been implemented. These textures were provided by CyanideX's Unity texture pack. BBoldt and Yulife (Inap) from the Unity team are our new permanent texture artists. - -Bug Fixes -- +Build: 1.16.3-34.1.0 - Thu Sep 24 07:05:13 GMT 2020 + lex: + Prep new RB. + +========= +Build: 1.16.3-34.0.21 - Thu Sep 24 06:46:57 GMT 2020 + ichttt: + Fix grass disappearing when alwaysSetupTerrainOffThread is true (#7291) + +========= +Build: 1.16.3-34.0.20 - Thu Sep 24 06:41:41 GMT 2020 + 35673674+alcatrazEscapee: + Accessors for inspecting and removal of biome generation settings. Fixed carvers still being immutable. (#7339) + +========= +Build: 1.16.3-34.0.19 - Thu Sep 24 06:36:25 GMT 2020 + lex: + Revive BiomeManager and BiomeLayer hooks. + +========= +Build: 1.16.3-34.0.18 - Thu Sep 24 03:12:19 GMT 2020 + richard: + Fix a few minor issues with custom tag types and fix OptionalNamedTags (#7316) + +========= +Build: 1.16.3-34.0.17 - Wed Sep 23 22:10:11 GMT 2020 + diesieben07: + Fix ToggleableKeyBinding differences to vanilla. (#7338) + +========= +Build: 1.16.3-34.0.16 - Wed Sep 23 21:34:47 GMT 2020 + Yunus1903: + Updated build badge versions to 1.16.3 in readme (#7325) + + diesieben07: + Fix forge light pipeline applying block offsets twice (#7323) + +========= +Build: 1.16.3-34.0.14 - Wed Sep 23 21:16:46 GMT 2020 + ichttt: + Add a better license error screen (#7350) + +========= +Build: 1.16.3-34.0.13 - Tue Sep 22 19:14:17 GMT 2020 + darklime: + Fixed container item being consumed in brewing stand. #7307 (#7314) + +========= +Build: 1.16.3-34.0.12 - Tue Sep 22 19:06:10 GMT 2020 + sciwhiz12: + Fix parse results of CommandEvent being disregarded (#7303) + +========= +Build: 1.16.3-34.0.11 - Tue Sep 22 18:58:28 GMT 2020 + 17338378+Nightenom: + [1.16] Fix possible crash when using rendering regionCache (#7207) + +========= +Build: 1.16.3-34.0.10 - Tue Sep 22 18:41:16 GMT 2020 + 35673674+alcatrazEscapee: + [1.16] Reimplement ICloudRenderHandler, ISkyRenderHandler and IWeatherRenderHandler (#6994) + +========= +Build: 1.16.3-34.0.9 - Fri Sep 18 00:58:08 GMT 2020 + 35673674+alcatrazEscapee: + Make Biome.Climate and BiomeAmbiance fields accessible (#7336) + +========= +Build: 1.16.3-34.0.8 - Thu Sep 17 20:42:53 GMT 2020 + cpw: + Use mixin 0.8.1. Should fix problems with mixin not working properly with latest modlauncher. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.0.7 - Tue Sep 15 20:07:25 GMT 2020 + sebastian: + Sets the empty/fill sounds for vanilla fluids. + Use Fluid's fillSound rather than emptySound when filling buckets. + +========= +Build: 1.16.3-34.0.6 - Tue Sep 15 19:47:08 GMT 2020 + cyborgmas18: + Add MatrixStack-aware alternatives to the methods in GuiUtils (#7127) + +========= +Build: 1.16.3-34.0.5 - Tue Sep 15 16:51:58 GMT 2020 + justin_wiblin: + Fix json biomes not setting registry name correctly for the BiomeLoadingEvent. (#7329) + +========= +Build: 1.16.3-34.0.4 - Tue Sep 15 14:18:16 GMT 2020 + David Quintana: + Fix inconsistencies in how the values from the model are passed into the baked model. + This puts them in line with vanilla, as intended. + +========= +Build: 1.16.3-34.0.3 - Tue Sep 15 13:23:05 GMT 2020 + Yunus1903: + Reimplemented drawHoveringText (#7268) + +========= +Build: 1.16.3-34.0.2 - Tue Sep 15 00:43:19 GMT 2020 + lex: + New BiomeLoadingEvent that allows modders to edit biomes as they are being deserialized. + +========= +Build: 1.16.3-34.0.1 - Fri Sep 11 15:55:28 GMT 2020 + lex: + Bump MCP version for lambda issue. + +========= +Build: 1.16.3-34.0.0 - Thu Sep 10 19:10:33 GMT 2020 + lex: + 1.16.3 Update + Also included a bunch of warning cleanups. + +========= +Build: 1.16.2-33.0.61 - Thu Sep 10 18:54:56 GMT 2020 + 42962686+RedstoneDubstep: + Fix tile entities being replaced when not needed. (#7318) + +========= +Build: 1.16.2-33.0.60 - Thu Sep 10 18:02:15 GMT 2020 + malte0811: + Fix exception when getting rendering box for tile entities with no collision boxes. (#7301) + +========= +Build: 1.16.2-33.0.59 - Wed Sep 09 23:05:21 GMT 2020 + cpw: + More crash reporting tweaks. Don't crash when trying to show warnings. Also, put the exception name in the error screen on the second line! + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.58 - Wed Sep 09 17:09:09 GMT 2020 + diesieben07: + Fix Minecart speed cap on rail being initialized to 0 (#7315) + +========= +Build: 1.16.2-33.0.57 - Wed Sep 09 02:10:45 GMT 2020 + richard: + Add support for custom tag types (#7289) + +========= +Build: 1.16.2-33.0.56 - Wed Sep 09 00:06:22 GMT 2020 + cpw: + More crash report tweaks. Put a button to open the generated crash report on the error screen, tweak formatting of crash report, and add the enhanced stack trace data (transformers et al) + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.55 - Tue Sep 08 21:00:19 GMT 2020 + championash5357: + New hook for better custom scaffolding movement (#7261) + +========= +Build: 1.16.2-33.0.54 - Tue Sep 08 20:47:48 GMT 2020 + mrtschipp: + Add partialTicks to RenderNameplateEvent (#7277) + + cyborgmas18: + Prevent duplicate wrapper tags from crashing (#7283) + + matthrewp: + Fix custom teleporters NPE (#7296) + + cyborgmas18: + Fixed crash with zip paths (#7300) + +========= +Build: 1.16.2-33.0.50 - Tue Sep 08 20:23:27 GMT 2020 + nrbeech: + Fixing logic in getCurrentRailPosition to correctly identify the rail… (#7276) + +========= +Build: 1.16.2-33.0.49 - Tue Sep 08 20:14:58 GMT 2020 + sciwhiz12: + Remove dead ForgeHooks.canToolHarvestBlock function. (#7262) + + sciwhiz12: + Bump resource pack version to 6 (#7299) + + Edwin.mindcraft: + [1.16.x] Fixes for Bamboo, Enchantments and Conduits, small adjustments to bring some patches closer to the vanilla code. (#7239) + +========= +Build: 1.16.2-33.0.46 - Tue Sep 08 19:50:14 GMT 2020 + championash5357: + Re-implement DrawHighlightEvent$HighlightEntity Firing (#7233) + +========= +Build: 1.16.2-33.0.45 - Tue Sep 08 19:25:58 GMT 2020 + ichttt: + Reimplement FarmlandWaterManager (#7213) + +========= +Build: 1.16.2-33.0.44 - Tue Sep 08 19:11:16 GMT 2020 + cyborgmas18: + Add dataprovider for Global Loot Modifiers (#6960) + +========= +Build: 1.16.2-33.0.43 - Tue Sep 08 19:01:09 GMT 2020 + ichttt: + Fix crash when dumping crash report for an exception that has a null cause (#7308) + +========= +Build: 1.16.2-33.0.42 - Mon Sep 07 01:29:40 GMT 2020 + cpw: + Tweak crash report dump to visit all the causes up to the top. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.41 - Sun Sep 06 23:39:13 GMT 2020 + cpw: + Fix ExplodedDirectoryLocator visiting non-existent paths. Closes #7203 + + Also, bump modlauncher to 7.0.1 to fix resources. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.40 - Sun Sep 06 22:08:22 GMT 2020 + cpw: + Use new enumeration mechanism in ModLauncher, to allow getResources to work. This enables serviceloader-in-mods, and other stuff that might need to visit multiple mod jars. Also, tweaked the visitor code slightly, may result in a trivial performance change. Closing #7302 as it's not really relevant any more. + + Signed-off-by: cpw + + cpw: + Park the polling thread for a bit, if we're not the one driving the task list forwards. This allows for the actual driver to work on low cpu count machines. + + Signed-off-by: cpw + + cpw: + Fix some potential issues in crash dumping during mod loading + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.37 - Thu Sep 03 16:37:38 GMT 2020 + cpw: + Fix compiler issue in eclipse properly + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.36 - Thu Sep 03 12:40:52 GMT 2020 + sciwhiz12: + Fix crash caused by previous commit (#7298) + +========= +Build: 1.16.2-33.0.35 - Thu Sep 03 04:15:27 GMT 2020 + lex: + Dirty casting hacks to fix eclipse compiler inference issue. I'm sorry cpw. + +========= +Build: 1.16.2-33.0.34 - Thu Sep 03 03:38:16 GMT 2020 + tterrag: + Fix broken ExistingFileHelper import + + Add licenses to some new files + + tterrag: + Add validation via resources for tag providers (#7271) + + BREAKING CHANGE: Moved ExistingFileHelper to common package + Remove various workarounds from forge tag providers + +========= +Build: 1.16.2-33.0.32 - Tue Sep 01 18:36:21 GMT 2020 + cpw: + Move the "modloading" thread activity onto _our_ worker pool. It turns out that the vanilla worker pool can deadlock during stitching if it's insufficiently large, if modloader "waitForTransition" is also a worker member of that pool. + + Closes #7293 (to reproduce issue easily, modify Util.func_240979_a_ and change the values in the MathHelper.clamp call). I've verified that 3 and below for "max" cause the problem. (I didn't test a whole range of values, just sufficient to reproduce problem and verify fix). Note that setting it to zero (and using the "direct executor" that's inaccessible in normal operation) works as well with this fix. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.31 - Tue Sep 01 02:27:07 GMT 2020 + cpw: + Fix missed debugging code. Read the config from the config. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.30 - Tue Sep 01 01:31:57 GMT 2020 + cpw: + Revert "Shut down all other mod handlers if the loading cycle errors. This prevents other mods from throwing errors and being blamed for initial cause. This is a temporary hack until cpw re-writes the mod event dispatcher." + + This reverts commit 7592bbe8 + + Signed-off-by: cpw + + cpw: + Revert "Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected." + + This reverts commit 30bad1e2 + + Signed-off-by: cpw + + cpw: + Redo event dispatch, removes a bunch of nonsense, and tries to integrate with the vanilla CF system where possible + + Signed-off-by: cpw + + cpw: + Fix up all the things. Removed SidedProvider because it served no real purpose anymore. + + Signed-off-by: cpw + + cpw: + Fix up slight registry change and other 1.16.2 stuffs. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.23 - Sun Aug 30 23:05:24 GMT 2020 + ichttt: + Add particle culling (#6981) + +========= +Build: 1.16.2-33.0.22 - Wed Aug 26 16:50:02 GMT 2020 + lex: + Wrap vanilla's 'default' biome registry in ForgeRegistry. + This should allow registering mod dimensions like in 1.16.1, while the data driven system is fleshed out. + +========= +Build: 1.16.2-33.0.21 - Tue Aug 25 01:11:38 GMT 2020 + David Quintana: + Clarify in the LazyOptional which methods carry the lazyness over to the returned value and which don't. (#6750) + + For consistency, this meant making a few changes: + - Renamed the existing lazy mapping method to lazyMap, to indicate that it doesn't run the mapping immediately. + - Added a new implementation of map(), which returns Optional, and resolves the value in the process. + - Changed filter() to return Optional, since there's no way to filter lazily. + - Added a new method resolve(), which helps convert the custom LazyOptional class into a standard Optional, for use + with library methods that expect Optional. + + * Update License headers. + +========= +Build: 1.16.2-33.0.20 - Fri Aug 21 21:27:21 GMT 2020 + sciwhiz12: + Add user-friendly exceptions when config loading fails (#7214) + +========= +Build: 1.16.2-33.0.19 - Fri Aug 21 18:53:46 GMT 2020 + dev: + Replace EntityHeight event with EntitySize event (#6858) + +========= +Build: 1.16.2-33.0.18 - Fri Aug 21 18:38:31 GMT 2020 + davide2910: + [1.16] ForgeEventFactory#canCreateFluidSource reintroduced (#7181) + +========= +Build: - Fri Aug 21 18:31:19 GMT 2020 + cyborgmas18: + Cleanup and expand Forge tags (#7004) + +========= +Build: 1.16.2-33.0.16 - Fri Aug 21 18:25:49 GMT 2020 + sciwhiz12: + Fix modproperties property in mods.toml causing exception (#7192) + +========= +Build: 1.16.2-33.0.15 - Fri Aug 21 18:15:53 GMT 2020 + me: + Log info about server list warning (#7209) + + Make it easier to figure out what mods are missing or have to be marked as client/server side only. + +========= +Build: 1.16.2-33.0.14 - Fri Aug 21 18:06:47 GMT 2020 + goto.minecraft: + Fix ItemStack#isDamageable is not calling Item#isDamagable (#7221) + +========= +Build: 1.16.2-33.0.13 - Fri Aug 21 17:48:58 GMT 2020 + diesieben07: + Improve performance and cleanup code for DelegatingResourcePack (#7228) + +========= +Build: 1.16.2-33.0.12 - Fri Aug 21 17:29:33 GMT 2020 + cyborgmas18: + Fix small logging issues with loading pack.png for mods (#7265) + +========= +Build: 1.16.2-33.0.11 - Fri Aug 21 17:23:30 GMT 2020 + diesieben07: + Fix config iteration order (#7230) + +========= +Build: 1.16.2-33.0.10 - Fri Aug 21 09:47:23 GMT 2020 + lex: + Cleanup Forge's build script, fix some unneeded patches. + Add checkExcscheckAll tasks. + +========= +Build: 1.16.2-33.0.9 - Fri Aug 21 04:35:17 GMT 2020 + championash5357: + Readding DifficultyChangeEvent hooks (#7240) + +========= +Build: 1.16.2-33.0.8 - Fri Aug 21 04:29:10 GMT 2020 + malte0811: + Improve startup time by caching the manifest data for mod jars (#7256) + +========= +Build: 1.16.2-33.0.7 - Wed Aug 19 05:47:46 GMT 2020 + Yunus1903: + Removed HarvestDropsEvent (#7193) + +========= +Build: 1.16.2-33.0.6 - Wed Aug 19 05:22:45 GMT 2020 + cyborgmas18: + Remove forge optional tags in favor of Vanilla's new system. (#7246) + +========= +Build: 1.16.2-33.0.5 - Fri Aug 14 19:05:15 GMT 2020 + lex: + Fix creating nether portals. + + lex: + New method for creating modded tag references, fix connecting to vanilla servers. + +========= +Build: 1.16.2-33.0.3 - Fri Aug 14 02:17:01 GMT 2020 + 43609023+spnda: + Print mod file name on InvalidModFileException (#7241) + +========= +Build: 1.16.2-33.0.2 - Thu Aug 13 19:26:22 GMT 2020 + cyborgmas18: + Fix server connection, misapplied patch (#7245) + + Yunus1903: + Updated MDK and README for 1.16.2 (#7243) + +========= +Build: 1.16.2-33.0.0 - Thu Aug 13 07:37:04 GMT 2020 + lex: + Initial 1.16.2 Update + +========= +Build: 1.16.1-32.0.108 - Sun Aug 09 20:05:01 GMT 2020 + David Quintana: + Fix ModelRegistryEvent firing every time resources reload instead of just once. + +========= +Build: 1.16.1-32.0.107 - Sat Aug 08 01:00:42 GMT 2020 + David Quintana: + Move ModelRegistryEvent invocation to when the model loading is about to start. + Freeze the ModelLoaderRegistry right after this event happens, just before model loading actually begins. + This means ModelRegistryEvent is now the correct place to register loaders, as it was intended. + This is a slight breaking change, but any mod that used FMLClientSetupEvent before will need to be updated regardless due to the existing race condition. + +========= +Build: 1.16.1-32.0.106 - Tue Aug 04 00:19:22 GMT 2020 + diesieben07: + Fix wrong BlockState param passed into canSustainPlant from FarmlandBlock (#7212) + +========= +Build: 1.16.1-32.0.105 - Tue Aug 04 00:06:45 GMT 2020 + sciwhiz12: + Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 (#7189) + +========= +Build: 1.16.1-32.0.104 - Tue Aug 04 00:00:40 GMT 2020 + sciwhiz12: + Fix debug world not generating modded blocks (#6926) + + championash5357: + New IForgeBlock#getToolModifiedState hook allow better control over tools interacting with blocks. (#7176) + + email.squishling: + Added new hook to allow Biomes to control their Edge biomes (#7000) + +========= +Build: 1.16.1-32.0.101 - Mon Aug 03 22:55:18 GMT 2020 + diesieben07: + Re-introduce "outdated" notification on Mods button in main menu (#7123) + + brandon4261: + Add support for custom elytra (#7202) + +========= +Build: 1.16.1-32.0.99 - Mon Aug 03 18:53:31 GMT 2020 + sciwhiz12: + Fix RenderTickEvent using wrong partial ticks value when game is paused. Fixes #6991 (#7208) + +========= +Build: 1.16.1-32.0.98 - Thu Jul 30 03:18:00 GMT 2020 + tterrag: + Implement forge IBakedModel methods in vanilla wrapper models + +========= +Build: 1.16.1-32.0.97 - Tue Jul 28 23:44:41 GMT 2020 + lex: + Fix another case of swallowed errors not shutting down mods. + +========= +Build: 1.16.1-32.0.96 - Tue Jul 28 21:40:06 GMT 2020 + lex: + Shut down all other mod handlers if the loading cycle errors. + This prevents other mods from throwing errors and being blamed for initial cause. + This is a temporary hack until cpw re-writes the mod event dispatcher. + +========= +Build: - Tue Jul 28 19:01:27 GMT 2020 + lex: + Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected. + + lex: + Enable EventBus type check during ForgeDev, and add IModBusEvent marker to ModelRegistryEvent. + +========= +Build: 1.16.1-32.0.93 - Tue Jul 28 07:16:31 GMT 2020 + lex: + Make license toml entry optional during 1.16.1 + There are to many existing mods to make this required. + Yes, we are technically before a RB and can do breaking changes. However this is too large. + +========= +Build: 1.16.1-32.0.92 - Tue Jul 28 01:14:20 GMT 2020 + cpw: + Missed one event. NewRegistry needs the marker. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.91 - Tue Jul 28 01:07:03 GMT 2020 + cpw: + Update MDK license to default to All rights reserved, and offer a link to chooseyourlicense.com as a place to research appropriate licenses. + + Note: the license field _is_ backwards compatible and will simply be ignored on older forge versions. + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.90 - Tue Jul 28 00:47:35 GMT 2020 + cpw: + Update modlauncher, eventbus, accesstransformers and more to use a newer mechanism for generating ASM. + + Introduced IModBusEvent as a marker interface for events on the ModBus. Expect exceptions if you use + the modbus for events not listened there. + + Signed-off-by: cpw + + cpw: + Update coremods and spi, include mandatory license field in metadata. Added at top level of mods.toml file. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.88 - Mon Jul 27 23:35:24 GMT 2020 + ray.neiheiser: + Fix rail 180 rotations (#7177) + + jmansfield: + Fire AnimalTameEvent for cats (#7172) Closes #7171 + +========= +Build: 1.16.1-32.0.86 - Mon Jul 27 22:56:16 GMT 2020 + lex: + Fix Biome generation error. + +========= +Build: 1.16.1-32.0.85 - Mon Jul 27 21:36:07 GMT 2020 + dev: + Fix SleepingTimeCheckEvent not being fired in initial sleep test. (#7005) + +========= +Build: 1.16.1-32.0.84 - Mon Jul 27 21:30:24 GMT 2020 + Yunus1903: + Fix ClimberPathNavigator spinning when width is small. Closes #6993 (#6997) + +========= +Build: 1.16.1-32.0.83 - Mon Jul 27 21:19:50 GMT 2020 + mrtschipp: + Re-added PlayerEvent.NameFormat (#6992) + +========= +Build: 1.16.1-32.0.82 - Mon Jul 27 21:14:02 GMT 2020 + email.squishling: + Fixed modded overworld biomes not spawning [1.16.x] (#6990) + +========= +Build: 1.16.1-32.0.81 - Mon Jul 27 21:08:23 GMT 2020 + christ.klinge: + Added EntityLeaveWorldEvent (#6984) + +========= +Build: 1.16.1-32.0.80 - Mon Jul 27 21:02:53 GMT 2020 + aqscode: + Re-implement moddable flammabilities (#6983) + +========= +Build: 1.16.1-32.0.79 - Mon Jul 27 20:46:11 GMT 2020 + diesieben07: + Re-add patch for PlayerSetSpawnEvent (#6977) + + Yunus1903: + Updated versions in README and removed flocker.tv mentions (#6978) + +========= +Build: 1.16.1-32.0.77 - Mon Jul 27 20:40:33 GMT 2020 + sciwhiz12: + Fix ChunkDataEvents using different data tags (#6961) Fixes #6957 + +========= +Build: - Mon Jul 27 20:27:00 GMT 2020 + joetarbit: + Post SoundLoadEvent on mod bus instead of forge bus (#6955) + +========= +Build: 1.16.1-32.0.75 - Wed Jul 22 01:26:19 GMT 2020 + cpw: + Remove startupquery. Currently wasn't functional, and 1.16 has out of band state loading in all cases, so the complex functionality there is no longer needed. Going to research using the Lifecycle indicator from DFU as a proxy/replacement. Probably with some codec FUN. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.74 - Wed Jul 22 00:34:43 GMT 2020 + lex: + Run Forge's data generators to sync 1.16 vanilla changes. + +========= +Build: 1.16.1-32.0.73 - Wed Jul 22 00:13:48 GMT 2020 + cpw: + Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds. + + Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.72 - Tue Jul 21 23:56:54 GMT 2020 + cpw: + Add mixin + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.71 - Mon Jul 20 22:56:31 GMT 2020 + cyborgmas18: + Load Modded Datapacks in DatapackScreen, before world creation (#6913) + +========= +Build: 1.16.1-32.0.70 - Sat Jul 18 22:35:53 GMT 2020 + tterrag: + Fix inconsistencies with model/blockstate datagen + +========= +Build: 1.16.1-32.0.69 - Fri Jul 17 17:35:47 GMT 2020 + dev: + Filter duplicate mod files from mod file scan data (#6855) + +========= +Build: 1.16.1-32.0.68 - Thu Jul 16 21:56:30 GMT 2020 + lex: + Fixed Forge commands. Closes #6973 Closes #6974 Closes #6976 + +========= +Build: 1.16.1-32.0.67 - Wed Jul 15 19:30:53 GMT 2020 + jaredlll08: + Added an event for registering commands. closes #6968 (#6969) + +========= +Build: 1.16.1-32.0.66 - Tue Jul 14 00:15:41 GMT 2020 + darklime: + Make all functions in Style common. (#6931) + +========= +Build: 1.16.1-32.0.65 - Mon Jul 13 22:44:53 GMT 2020 + 55965249+seymourimadeit: + Mark Raid.WaveMembers as an extensible enum. (#6878) + +========= +Build: 1.16.1-32.0.64 - Mon Jul 13 22:17:58 GMT 2020 + lex: + Fix checkPatches task. Closes #6956 + Fix patched in method using srg name. Closes #6965 + Fix capabilities not being collected for ClientWorld. Closes #6966 + Fix TagEmptyCondition using client side copy of tags instead of server. Closes #6949 + Fix ExtendedButton using narrator text. Closes #6958, Closes #6959 + Fix misaligned patch in RepairContainer. Closes #6950, Closes #6953 + Fix LivingJumpEvent not being fired for players jumping horses. Closes #6929 + Remove extra getToughness method in ArmorItem. Closes #6970 + Remove GetCollisionBoxesEvent. Closes #6921 + +========= +Build: 1.16.1-32.0.63 - Fri Jul 10 22:28:22 GMT 2020 + richard: + Fix race condition with DeferredRegister for custom registries (#6951) + +========= +Build: 1.16.1-32.0.62 - Fri Jul 10 17:49:51 GMT 2020 + sciwhiz12: + Remove hooks into beacon base/payments. Vanilla uses tags now for extensibility. (#6948) + +========= +Build: 1.16.1-32.0.61 - Wed Jul 08 21:33:38 GMT 2020 + jaredlll08: + Expose the DataPackRegistries instance to the AddReloadListenerEvent (#6933) + +========= +Build: 1.16.1-32.0.60 - Wed Jul 08 21:13:18 GMT 2020 + sciwhiz12: + Fix canRepair not being set true as default (#6936) + + Closes #6934 and #6935 + +========= +Build: 1.16.1-32.0.59 - Wed Jul 08 14:56:39 GMT 2020 + David Quintana: + Fix particles sometimes "losing" the lightmap and drawing fullbright. + + David Quintana: + Fix misaligned patch causing LivingEquipmentChangeEvent to never be posted. + +========= +Build: 1.16.1-32.0.57 - Mon Jul 06 21:32:33 GMT 2020 + JDLogic: + Add simple patch checker and cleanup patches (#6851) + + * Add simple patch checker and cleanup patches + + * Address comments + * move task implementation + * genPatches is now finalized by checkPatches + * the S2S artifacts are automatically removed + * added class and method access checking + +========= +Build: 1.16.1-32.0.56 - Mon Jul 06 21:27:02 GMT 2020 + richard: + Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 (#6902) + +========= +Build: 1.16.1-32.0.55 - Mon Jul 06 21:12:45 GMT 2020 + richard: + Fix harvest level and tool type not actually getting set #6906 (#6922) + +========= +Build: 1.16.1-32.0.54 - Mon Jul 06 20:46:01 GMT 2020 + richard: + Reimplement ITeleporter Patches (#6886) + +========= +Build: 1.16.1-32.0.53 - Mon Jul 06 20:39:37 GMT 2020 + 40738104+Mysterious-Dev: + Add function to add items with the same behavior as the pumpkin for enderman (#6890) + +========= +Build: 1.16.1-32.0.52 - Mon Jul 06 20:33:17 GMT 2020 + richard: + Custom Item integration with Piglins (#6914) + +========= +Build: 1.16.1-32.0.51 - Mon Jul 06 20:20:02 GMT 2020 + ichttt: + Some dead code cleanup, and re-implement some bed hooks. (#6903) + +========= +Build: 1.16.1-32.0.50 - Mon Jul 06 20:06:39 GMT 2020 + diesieben07: + Fix missing null checks in ForgeIngameGui (#6907) + +========= +Build: 1.16.1-32.0.49 - Mon Jul 06 19:50:02 GMT 2020 + sciwhiz12: + Fix swap offhand keybind not working in GUIs (#6920) + +========= +Build: 1.16.1-32.0.48 - Mon Jul 06 19:42:07 GMT 2020 + thpetuaudletang: + New AddReloadListenerEvent that gathers server side data reload handlers. (#6849) + +========= +Build: 1.16.1-32.0.47 - Fri Jul 03 12:40:42 GMT 2020 + David Quintana: + Attempt to use a more compatible method to initialize stencil support. + In case the separate attachments don't work for everyone, there's a new setting to choose the combined attachment. + +========= +Build: 1.16.1-32.0.46 - Fri Jul 03 04:00:22 GMT 2020 + David Quintana: + Update copyright year to 2020. + + David Quintana: + Fix multi-layer item rendering. + +========= +Build: 1.16.1-32.0.44 - Thu Jul 02 17:17:45 GMT 2020 + David Quintana: + Model system improvements: + - Port some things I did in 1.14 which I couldn't do in 1.15 due to breaking changes. + - Fix multi-layer block models not working (1.16 RenderType doesn't override toString the same way anymore) + - Implement multi-layer item rendering. + - Improve CompositeModel submodel data passing. + +========= +Build: 1.16.1-32.0.43 - Thu Jul 02 12:54:03 GMT 2020 + MartijnvandenBrand: + Include model data in getQuads call (#6884) + + The model data wasn't included when getting quads from specific sides, but was when getting quads for side = null. + + thpetuaudletang: + Pass matrixstack in tooltip render events (#6885) + +========= +Build: 1.16.1-32.0.41 - Thu Jul 02 05:54:25 GMT 2020 + tterrag: + Fix improper handling of baked lighting in forge light pipeline + + Closes #6812 + +========= +Build: 1.16.1-32.0.40 - Thu Jul 02 01:59:30 GMT 2020 + richard: + Fix FMLServerAboutToStartEvent being fired too late on the integrated server https://github.com/MinecraftForge/MinecraftForge/issues/6859 + +========= +Build: 1.16.1-32.0.39 - Wed Jul 01 18:14:25 GMT 2020 + ichttt: + Fix miss-aligned patch ItemEntity (#6895) + +========= +Build: 1.16.1-32.0.38 - Tue Jun 30 20:19:32 GMT 2020 + info: + Add hoe tool type (#6872) + +========= +Build: 1.16.1-32.0.36 - Tue Jun 30 20:09:21 GMT 2020 + curle: + Allow any armor to have custom knockback resistance (#6877) + +========= +Build: 1.16.1-32.0.35 - Tue Jun 30 19:57:32 GMT 2020 + diesieben07: + Add senderUUID to ClientChatReceivedEvent (#6881) + +========= +Build: 1.16.1-32.0.34 - Tue Jun 30 02:33:58 GMT 2020 + lex: + Re-write checkATs function and automate making Items/Blocks public. + +========= +Build: 1.16.1-32.0.33 - Tue Jun 30 02:10:14 GMT 2020 + cpw: + Reorganize modloading on the dediserver. This removes the DedicatedServer parameter from the FMLDedicatedServerSetupEvent. + Code for customizing the server instance should be moved to the ServerAboutToStartEvent or similar, where the server instance + is available. + + This reorganization means that mods will load fully before the server is even constructed, or the server properties loaded. We also move the EULA right to the front so we don't have to wait for bootstrap. + + This should fix the problems with mods which customize world data and other things. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.32 - Mon Jun 29 23:43:01 GMT 2020 + thpetuaudletang: + Fix datagen resolving tags and exploding. (#6865) + +========= +Build: 1.16.1-32.0.31 - Mon Jun 29 23:37:30 GMT 2020 + mattmess1221: + Fix Language.javaLocale parsing (#6862) + +========= +Build: 1.16.1-32.0.30 - Mon Jun 29 22:58:30 GMT 2020 + diesieben07: + Fix IItemHandler wrappers for chests not updating both chests (#6875) + +========= +Build: 1.16.1-32.0.29 - Mon Jun 29 21:08:55 GMT 2020 + lex: + Fix missed patch in PlayerList and EntitySelectioonContext. Closes #6846 Closes #6850 + +========= +Build: 1.16.1-32.0.27 - Mon Jun 29 20:09:12 GMT 2020 + richard: + Fix access levels being hardcoded to private via patch overriding AT entry (#6848) + +========= +Build: 1.16.1-32.0.26 - Mon Jun 29 19:42:50 GMT 2020 + lex: + Fix tag related issues when connecting to a vanilla server. + +========= +Build: 1.16.1-32.0.25 - Sun Jun 28 22:08:15 GMT 2020 + lex: + Fix Forge's internal handler being registered in wrong place. + Fix double call to loader end. + +========= +Build: 1.16.1-32.0.24 - Sat Jun 27 22:50:54 GMT 2020 + David Quintana: + Add a model loader that lets mods specify different models for different perspectives. + Allow custom models to reference vanilla item models as child models. + +========= +Build: 1.16.1-32.0.23 - Fri Jun 26 23:55:23 GMT 2020 + thpetuaudletang: + fix misapplied patch + + also sneak in an import patch removal + +========= +Build: 1.16.1-32.0.21 - Fri Jun 26 22:40:19 GMT 2020 + lex: + Fix blocks being harvested with incorrect tools. + +========= +Build: 1.16.1-32.0.20 - Fri Jun 26 19:53:02 GMT 2020 + lex: + Make installer use MCPConfig version to identify MC assets. + +========= +Build: 1.16.1-32.0.19 - Fri Jun 26 18:27:49 GMT 2020 + cpw: + Tweak the server startup a bit, make sure methods that can't work because they run before a server exists explode saying so. + Also fix other launch profiles. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.18 - Fri Jun 26 16:56:37 GMT 2020 + lex: + Fix dedicated server loading by constructing mods before data packs are created. + +========= +Build: 1.16.1-32.0.17 - Fri Jun 26 15:20:37 GMT 2020 + David Quintana: + Fix create method. + Fix test mods not loading correctly. + +========= +Build: 1.16.1-32.0.16 - Fri Jun 26 14:43:19 GMT 2020 + David Quintana: + Reintroduce missed patch in EntityClassification. + +========= +Build: 1.16.1-32.0.15 - Fri Jun 26 13:55:42 GMT 2020 + thpetuaudletang: + Include a getter for the matrix stack in OverlayEvent (#6834) + +========= +Build: 1.16.1-32.0.14 - Fri Jun 26 13:23:07 GMT 2020 + thpetuaudletang: + Fix block render types not being properly applied to item entities (#6832) + +========= +Build: 1.16.1-32.0.13 - Fri Jun 26 13:05:18 GMT 2020 + mods.itsmeow: + [1.16.x] Allow GlobalEntityTypeAttributes' EntityType -> AttributeModifierMap to be added to (#6822) + + * Make GlobalEntityTypeAttributes map able to be added to + + * Split get patch into two lines + + * Favor Forge's map over vanilla + +========= +Build: 1.16.1-32.0.12 - Fri Jun 26 12:59:19 GMT 2020 + thpetuaudletang: + Fixed creative screen arrows (#6827) + + Yunus1903: + Added call to method for tooltip with FontRenderer (#6831) + +========= +Build: 1.16.1-32.0.10 - Fri Jun 26 12:36:59 GMT 2020 + curle: + Retarget Block.Properties patch to the new AbstractBlock, reintroduce harvestLevel and harvestTool fields (#6819) + + * Retarget Block.Properties patch to the new AbstractBlock, reintroduces the harvestLevel and harvestTool fields. + + * Slight adjustment to fix the lootTableSupplier. + +========= +Build: 1.16.1-32.0.9 - Fri Jun 26 12:31:37 GMT 2020 + Yunus1903: + Fixed sneaking while swimming (#6817) + +========= +Build: - Fri Jun 26 12:25:07 GMT 2020 + thpetuaudletang: + Fixed tooltip rendering issues (#6815) + +========= +Build: 1.16.1-32.0.7 - Fri Jun 26 02:30:54 GMT 2020 + thpetuaudletang: + Fixed villager trades having non-applicable enchants + + Also added an AT at lex's request + +========= +Build: 1.16.1-32.0.6 - Fri Jun 26 01:52:19 GMT 2020 + thpetuaudletang: + Fix locate command (#6811) + + thpetuaudletang: + Fix block drops (#6810) + + contact: + Add missing patch to ScreenShotHelper (#6809) + + Adds the missed patch back + + Yunus1903: + Updated MDK mods.toml versions (#6808) + + thpetuaudletang: + Fix locate command (#6811) + + thpetuaudletang: + Fix block drops (#6810) + + contact: + Add missing patch to ScreenShotHelper (#6809) + + Adds the missed patch back + + Yunus1903: + Updated MDK mods.toml versions (#6808) + + thpetuaudletang: + Fix locate command (#6811) + + thpetuaudletang: + Fix block drops (#6810) + + contact: + Add missing patch to ScreenShotHelper (#6809) + + Adds the missed patch back + + Yunus1903: + Updated MDK mods.toml versions (#6808) + +========= +Build: 1.16.1-32.0.2 - Fri Jun 26 01:41:51 GMT 2020 + lex: + Rework BlockSnapshot and fix client notifications. Closes #6807 + +========= +Build: 1.16.1-32.0.1 - Thu Jun 25 23:24:48 GMT 2020 + lex: + Bump MCPConfig version. diff --git a/gradle.properties b/gradle.properties index 2e6ce016..6d57271b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,9 @@ -mod_name=BloodMagic -package_group=com.wayoftime.bloodmagic -mod_version=2.5.0 -mc_version=1.14.4 -forge_version=28.1.1 -curse_id=224791 +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false -mapping_channel=snapshot -mapping_version=20190912-1.14.3 +minecraft_version=1.16.3 -jei_version=6.0.0.11 -waila_version=1.10.6-B67_1.14.4 -guideapi_version=1.12-2.1.8-63 \ No newline at end of file +#Mod dependencies +jei_version=7.6.0.49 \ No newline at end of file diff --git a/gradle/process_mod_info.gradle b/gradle/process_mod_info.gradle deleted file mode 100644 index bd9371de..00000000 --- a/gradle/process_mod_info.gradle +++ /dev/null @@ -1,28 +0,0 @@ -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.moandjiezana.toml:toml4j:0.7.2' - classpath "blue.endless:jankson:1.1.0" - } -} - -processResources { - filesMatching('**/mods.json') { - filter(Json5ToTomlFilter) - path = path.replaceFirst(/\.json$/, '.toml') - } -} - -import blue.endless.jankson.Jankson -import com.moandjiezana.toml.TomlWriter -import groovy.json.JsonSlurper - -//shitshow ahead: groovy is too magic to call methods before call to super -class Json5ToTomlFilter extends FilterReader { - Json5ToTomlFilter(Reader input) { - super(new StringReader(new TomlWriter().write(new JsonSlurper().parseText(Jankson.builder().build().load(input.text).toJson())))) - } -} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3d0dee6e8edfecc92e04653ec780de06f7b34f8b..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644 GIT binary patch delta 37025 zcmZ6RV{j!vv-h*%#qK{KNb(sQVoHmA`bzH0S5N{I~W+4C|DvAG17l`Jc&ngiTqmpStq!6ZntjV!2Y-K zKMyeQ|1AFozrn~LkPc0osms~Q+Q7BLLgt8=f9EX381D6gY)Tntqu9jmd`7-mOYcp?&Q4SJ zeOm+035)S-H=#MZWaYT0ul8l~lmGqvc(w*J>Q`nH^U)tMos`%4=^{Ep!ZfZkM2VZ8 zxHpl6K%8c2(68CsjXneiEHC-dPPN+^N{hRxlj>Z+FSwl`wiVe9x+8rxSBeQ~n!c&Z!B}n}XJFXTECD|$-_C(1RTAvAfInz_oa5)N1 zE>l<2Sd%es+g@UBYgP{2jCO&J0xm6UL3b~>)X9mB-gS%PGD$HVNU6y_53*aG%);DZ zzAX+ao@-q+eC*Ad)hzxgvz}&!VPzO?MTNzYJH>Zfp%pCf(29yh(#6D_B^g~>t*R?h zKG9R6hY_&E;Q+Fv_H5OV%e0F}WxcS&nN%_`mi^P%?v_~OB?Inz?$1wgm35z<(PMf9 ziSP$jhoQc?Cf5Z3q~Kl2Xunis27FFg%_vN|PTcG3f^6-}RFeu+Y45TUVv;V*uC<;P~LvmYV_~*4_6Sj`YG|foE6QT;mPJ;e! z^po$KoS<~S;YM-+Jfio{T=r@ z7!Ld5(Rt;0CY+Ya{n9TwA~Q^{<8Ovlp`pqc{?RiP@kV$_ow{b--{FKtE3n-dg%@Ev zLDPfpV*Tkaa{c1|ib0$0Wj*a>`{->n^l72a82&NWCzuz$Mzr`KEerls43>P33123& z3@?fDXOm`NWKTaC6DZP}-R*QkPJ&&)O{tj8=G@YWlubwrFM}LM%7T z4A5-N5FI2vLWG%FfNyyTt)PEtMU1IjOz>;AjKK%qU40@t8PXy54qaGecd%dtM0F|U zPPg{6U^(W>F@o98cI&!=;->XtlrAjME&s;&a7=OT_W}~OZccrb15JkmM_945Lk>CcWlS7B!2I{?9wUOS(3BZjnMF7Vf^?4U0bTGFcoh) zlfKCnExi!e|b<8ESc`x8qR+cfDFImJojrsZ>y){dS_v@SJc3X2od{_sn28RuO zE|AN*6b1l(9qWo^DF3yvKA&CUJ`5-ruA|5WHK?|UJbb>j8?55|A}WH~#)L1hvOmuK z?#fcO9+=)hNSOfrC(kKHwtWc#j$h#|qr?gXpvA)!Y9mUA_R!N%XI_x4M z_+VriWS69sJ(%cS9oc;`TlA27K6)RWcpc6-tAgrbQt|nXn53aai11qffRLh8 zVh~+eGif+Ad*t7Yti1Td?~Fiu$GR#xS2WZK>?eDKRb0j=`y*fNqu40UH+zB%=IF={ zNnZ~6miyoH@B;%+tYpT&qev9({c%1bV_Nvg!3_*Z@x`H6UENZPpeF*QA9C^e`$O=( zYtbos_Xb!mX4DUb6jLVR$5Ar|T3tKJEy&Fo9YAT5kt|DQ-IxZ%Wwp#muiP$~HS$Ji zPzE7!)fS0LAJG4eqyL1_&s)@KWF#;!DgrPt(*MK_A&|-3!PMP7R~Oy{W7$(sd2JIn zPKsDdrorUK>=)J>9{vwT1SvFd$Rrd!iY60>gcfpJQ%>@kX>d1v?s)M%4#kZYS0N=c zY9+mAz;mzPOwV=i z<8j~XDR2gSg_a3NW~VdQv|D3v%i7{zceR@#Tl?UQ`Q#-h*m#K9_Qetc+6l)8v(Ict z`xdbJkyY~Qx%v?vyndS%zP)&(51nj`9zbjFZ`o7j9<}^P{W$3UpJk=R_W){QbG&ii( z(a)vmusl?o)vgEzepIl(VgwwQE5B?J@mX|dW_+;v&|SYxR!_V31%E6yA4N_;95O?G zBE}`=r6PfbI(svuzSNHwHZ5iIYHcYN0XlBK6pBNbBac8UBWpm^=D?M1Wa4IbIS{z@ zWM1LU$dz1N#pH1cJNs>l+qu>Ujoe0ZTC0Z@x-UUh^IP(=Z?bO7^RXLnwF{W~otB(` z=a}}pinT6Z5FcxC=6AcFmdhsgVCJJ;mWxeGbnlz(k)=Mp#y+t(l&nq7s>xYp1(Kqi zc%v_No6?-FkY{$tuJhX}mM!XT(9(070%Uoom7zaYDHMBbIa4c(x~i%m za!(HwMw%y73nq;=>7pJajADOH)pi6BtX~rm<4;~^d2}IDs)N>4o6%q^;aFR8QdDGD zY=ut`p6iUKq0`M0(f>skA5nn@Q^!+%7}JyhlO7oOVFF;)z$fUAUuOZ&IU zSvI8yb5}@e$RE^tmSs!mzLn#D=}*0 z*g^T`cj1n}rP4#Llv%)&NA!HByL}0_qohH>A2)Gl027Z8AYNg9)a|Nne=F#)G%2a7 zBed#!Hu!EH+Q82{a{hBUAdkisz8d_2?x0WZcnQNc5p&jV+W3}Epp_+;v?WVG9>0-? zAQ5G^13#2PaBD55H_O3B=p}{4bnO)49j^1#yqYW1L76*j^N3=)(vz?HP&2AK`&J5L zaTE)aNxS@&`5qZj>QuJkjQ7+8P=JJUc?e0pWtTU& zPLpj0l-dS!80n?xkx``XVOzA0(H4_i)-Jwby9e7nJOp#wLhBXPl@SQ1I#({Xq?9s( z^rMbLJcUUXwac>tsiH+lDbyhArN6E(@ZVTO^!mrG{*J_eQaH_v9eAmHIakW zJX*J3!Iq&Eh(~qXRKYdO>nfCxqxR$|8UJQb#d~_>F&;yw$de_LX{K}o*?*fH!3WEt zJ;_{5-@v8$TMS&4*RS$?-k{2!?UbSuNw4>id2(H$-y^8gc4^WbLbzOyxL(3J_|?s} znbk;UjJL~TrWvYT_J{V3BA+ko=}g_;y9M7_dmu+HFf-q~Qk-nO1Bxp4WG>1SYBeIW z(@k_M71<3}s@o||IsOPe_aWChx&?tJwWE{i;65Xh`0!p`+=-`+qqyU=&R~sWMW4&D zQUT=Z*XifSx7I1xqy5=dTw)JrY$4Mmr(|YS*}&J{(rw!s3QEpShqiR+zpa(0tfLw3 z2R~;7QdQ}RB}M&we}O-{)6op-4APHg8<%q?cYKGrw53np>uGE}Akvd6e`1lpC*N1L zGX<24#o@!JPpidYX7T6C_}Xf&=2GNl)~RT@I)>= z2F1Un_)r3x>d^W#53)sQ3OPBCcZXIZ$-OkO>FHn{y5qI-WiaVX3G;HU8fB41fr^-A zw8n?1ZkkmKC8NEUejz$P#Usd^nJusKTe~w_+Sx6c>HT~$Tm5HLvY)Q^Sj8^kxaDJk zQ7p-2->s$cS}SYD`Fu6bx>8Cc=MLz6}`_Lgl%nQG=kTH5e;S$n!EdN(~S@}}* zac`^jvlY|sE^N)43Ttoszji_?6$ZXBp=E~7({~f`D*bAh@juH4uqap%zTuMs9e(lV zSPMfHz_}CfQ<`I&zDk$~GZ@33oger4)8E+td?I6NG~BTv5QTiHwYA44%#A@|u5ct$ z4b^lgo~8ZrTd|)&-SfK*IP-4Dqm-%0!_X}CRnuujyR|VILN`e4+i-N!m(bLI*VJh9 zG?FY}L~D;W(I3?eZ7*OP+eC;1UTVp$k9>lPiQ3E%s}&YE-y zo8=w_N@Ff$Yr%64WGyX*P7LvzwGMp*5wt6!Z75aDaw{PZNT&t~1x-$$HbL_YRyEUV1epz2%BT5WjYo}jpzPyWbKo0txjdUOoRv508M?nbhf%)M8e>Bg720HT3fs~u z4IZN-Enj~gSXSRO|`ikWTk9Kfiu^X4t zXX=i{4Mdq@Cd1oG8fIJuHgXbefg&%N+ZH*O4M0zet&3I8j`Ej!8+_XLTh_B%PqG>j z`pqk@a*AtycD(4F!3`fR-1zDGXF_2h6h3laPj^ME%NgK#Zgj-cc`T%}NCIT@$ys+W zXqurje{?A?eEdAiAc3R%BV=IB-Y1vJkI-0iJLeRbVFP}3R1pEhc%J`wkBs>oS`K)) z{>E2|?Kd|Hd}odP7K=v8N-zQ$&+-C|Ya<<1V=ghvLdX_E?Mk4We1^^woL^=in75cu z{%9Y$56=_Fyo=Bq+x!AYRDk8`pX5==* z_0ye;88b{dooY<^jgSU>)B%CC%88G#kjMl>uwpv%r$AGJYG>#{+IhR+R@$&q{}IyH z=2)NMM^_B63%l`HZf=Kk*rkrb0<h*kB%}Gn7m!n4bwsWiqC?1*;D&m*o zKeI|Ql(u{hudEx#_I&!Jg;$b2Z@yH>kwewCxuq#@8Q`J5(@+kjQUkue7?6;>Lt&bD zFoX;~aS4E9W-cY<{u=QKP(1P4+@>@mt9c^jB>gT}hGpozy{wCP(V?F8~)wuJKAY3(h*Q)D9JO@-b zm8B3BImf=lpt>GMc8o^0jYe_U7QLUoK9;=jBpLw~&uU*(pTKi;6Nm@zJ=S=$IJuvB z2tW5GcP>2BUM2g` zPFDWTlYTkDz=B5Vn1x*41Y=U6X$I3eNke$$Ir8gbx@+sCFR&l)r)b9440O%vg^ADX zYqvo6vo|(eG3}K4>H}s~Kx^-BLCU1*@au9h@!e**4ww?RU6|D;$N}UrWfq4qWg3Ci z3i@Z1hF~3mU&<_4<>}_PDxrdmXwk!uPdeSKi~UmPv4(?-scb7k;;nh5V#J57pR8N{ zGpHcqW5O3$&lGarusdnkU5w_0mTK7qpqe5fLOOm76!=!daRRqb`tYKDcwSl*8AsF;zKW696a zz7w{PN6dyT2tD9=?F9ZGJ{=gzf@%Z}26hOaO!}Q4sPB$`j2kGVJHK|$$%Vv&I?6dK z!L}0eAVSwgA=R%z;@;%CA1byqAJOB}T3x3VB(E$hzgFVtE4LQzwvc^9wvcH>g^Ds0 zYS7Bw<5b>Pklt~sXzi=|=HJznh}@1o^TOX7aU8IH?57RG_U!TZ)S=IxcVcREN1eUMfz%t0;?ndJ+fJp=-M;4tgTOPjnAbx&^+0^F^J(G_9l*7eR5or_c z5^dxWd+;KXhRQQurGCT`;2*a|Q@0_n%biFOGD8}RGRQqZy~6NS(dD@M<9O@?buF$m z9nfgZt&Cw?>;1@7AfwrqQvcy&^`gc(l`ymCNdHgOL-S}|dXDc@FWsnvbbOjzlNLU( z&A?vk4Kk}`03vwK10&+nGIhhHr5Xm5%m{F*yn3HUYywQUri|_?$S;;#*Zo#2h#foE zTsJm}r2am3D|ZjhPbQk~CGVbgE?17lXM%B0r`m)`h~A7A7Cl)tH+l8yqgrI=F>vWHwkE(pS7M5))@m)+#${yK~q~3m)`%6nsE6l8~fk=9iP#4<21gH03}y+GOTD?|7fPz*hr~Lx;Nz z{t6^uVTptQm$J8k?hSK>7wCNpBdlFl(tU&O{c(-=LS#g$9G)}Z9jyJQAEnoM2d3S2 zhm-RIgBQn?#GGHU!PG>Ol))LmsbBcOm&WjXoEO?H4wa$y@O<1C-ayh>Uffpbg)WCGoxm|` z2Q&#=rL-ygG(wiG+4nnn)?#jZXru2`)^;zc!EHC7aAW)zL?@e<+F)-NwLwORzClE- zGt&n~Q{=!hr+)61tZ337Wn@OVuP549IqL}gqEd?d`8O59CG`NK8dNsrg7{W!7Ekx3ZTN3Yu6kGNDn_zwvh;?BJ2b0kV z8$V$UA&jbF-Y55sA4nI&R2PE_0<7em{zS%+fe@ii676d7W(GhYs&Ns<=FqrI0X)hK z1DQ}yU+@rF(t>w^>*|(>bp3Q;@H9V*65<^fw(>CkNoSb2-PQvV-=B>D_|KS=OsBIa zr!urszjP1cE@n5_M0vIpMhIdOuLZuECwq==Hdh~1{c;$;_p6;-1F}?` zohSpgR0k4FIH4Dy9~}UDT@4nAW6tZI3Doz#gKlZo@aGZfO@j$aU(TfqO|4_arDI1R!HAWcwk`=usPr_4D~ITB<@^gMKvUcDyoa)Vkgf@`EX&HUBhgN0}HRGF;OOtS?ak>9HcVuW*69 zTlRWpx0)0P|8Xo`F8f$M$Y1cu^wwsge3&pnpd5aDEIuhku`pC# zt*oN{m*H6FMdK^BF4%8{`i5z5_!&S@Zi2ljb@cZ0yRjAl^X&(jGtY67@G z7=QF-+`qy<1MXfOemJm@A&7!8JA@^Mu7oZ&BH~!!JD8ivh#|c;NK)h`D#coPQV_~! zgFL7<*=4C^^;hGPe@?fYDm`z}Z~7(t?c$$k@(2QcLJ4oaZ?!GI8|8h>3?_VAA>pcA z3GdQ$7?MA@Q|stf=(okBL^B9Ur}qg164yWMYq~w#Vb=Ex25y{>+GBPrNu~}}4V)kD z;%juHI;-7SVR9n9Fw%kcYm<)G5AM7=y2XbB+W&p?!EK$6c2S&c(xvSS!fjQXVQ!V1 z;ZD=|s0`zc9SRAQ?0g3Li%1d*RglHNzH-v0Baa=L3YUHONQ4n5jDMQLO;`B<35d0B zQT;WBM{is)^M9ek303Z>(}8wmG4n^PKVE7|UUP`^wQrzaUnK!ADFPo!77r=J#%Zy= zd!yQz{)%gEZ3ewpql9(Qz2NWsZMc}=1W|`uaAi0;Jrxh zq4QN_jU{v0vIJaeKi+oRNmDtBef?#WhYz-(-f9|k^h^wg6yn0A)!$@*8{hL~PWShv z=(-2DuDrbjeHmnn{b9f080v&|9GVynmE)3(TSps%&fK<2%OU9qV>58Kh+^;sY6+Ax z1zOCc^u!=jQf&2dS@+W7&nsK{6aKvVO6@ngL}bdGjG@|I5aCC}ju%mH&Rp6C5Vo4-~woXN9~yA9|96vWtt=R%5!0P#TeCwGYKQmGI_bEzy8+*k50(I`fx?)Wst$yno()%M>C*YAwyg zk6h#;)SN}Sau}%wZK>c)gw=7qvSBS^7ryQ*$X4nw5hjIWZY^&Er`Sb#C;mwUlqeZL zEv9i!<+LY%Cd#cF*p*pgr0luE^jE@EC9%z0QDJhfEex?fg#IeZaoQZajXeyKtsu8@0tsPlO1FR-f$Rdo+wF$1K|ngj}Tb1M>8<+0;7y+Us}VrciM({sZ`t;(AiI# z75_@Z+Px44*6$*}6o&}gzOa7{lw{FXs!+HO?tV&ql!4;aFI zRqh(UwEa>;e)gQ`B}i!A5kTUfLLY0dOlW}Np{C{#z;2TVGJjcv*2`$0PL_21_#7!# zRMpY0`wULN7Xc*3Q+a8i_QYG<29I?e(jkE|y+GetgNP=}GDbPjJ?8F$L=?@R(1A!e zVNG<)_FTsUy>R|ksRDs~iHahFd0Pi;_tV?xidl)$3bi3{MFxy-k{b3!QVeQCW{Qi^ zlpbpUyQD8*-dOsV!hAGk>_(vmc|~MtR=dpEIlmY?XQKiG_R3Nrb#fUd9_vXwBswWZ z-1+GPk03suS(#W}C+QYJAvrBOYV=(ae@%Iu%I2Df;Y1C`CBOe-q+XT|sg_(6sbWpi zUWjQ|QntDh?abYrohz&Ox_!7q%Fh_ItSdAP(qsZ)VG3S-T3r;USuNF46kqVf@4-vX z!jeq~u~S!aJbpBGDY3=_-j_C-A|rIf_V~-y;vN<^LaT6(W z7Z?o@VCy=)rNiT_`OtSAdx+B%prN@UAa{8rV2T!Cx`=f|g!1E+u&nV~eFT3DYv=HK z43mbXo6y@Z_G#wdv~!=6VJTm=09isk>o)?Idm^U8!kS>azPe+3n8Hp+t^s`2qwC-p zgP@Qy;)ii$Wz^}OeZY|?^NJhO6TuXm;p|C&(@oyym`2pZZFv^2&n|8Q&yS0ZKk7C7 z)JK*bJ>3k5)!ONUg=uUf`<(=GYPLiUmHFy8JtLsbj>P$oDqNe0ZXN=B+uY&mAVOfl zg2xtPb$K=8)Jmz@Ql$$i(r_J*aQHsV>$qDuv(RjG`*cpyc9MH;V|t=G1vkVomBq1J zT#MoijUMM2m`D&6!!wxHCJkXiwVDjX6|%HI1{qA(O0_$FqNjx zv}~#S-{oaLI~-OEzObUrwbL?3jNBieT!>(7IY}Dk^zUAB1uOtM<5*YED&N9x9LvK>vy$32(?Byy4uK5(nZw4+8vB z-ys0+a97Ajm-Mov2N2=skD;NYF!lu{uHbv3_=hOVYWVHo+%A6zAWwKEx7j3E#Td|H z7BIAxR`!!Kux+!3K8Tolw`fxklnYw^U_V$EULe285rqML0t*~WR#3v~osLd1AcQ zz4zmRk={c{Tjc&+@pJi>86vU9Y$V9H-+04cQ|`f>Byx28Ov!>N0sol6Zp@zZfod8WGFU9FTcBs`q zx#@<7AY&1%wga7(E}vG=fNssPv3mg}%Jg0mtOJe3a`I>$*JymbNBZWcNA9AZHYb-= zBW=u-u0htYW!JU1qy?OQcs7;GumuV1OX(!fSXpTPZJ6m?m@*rz+k zTaUvx``GaGEtPJD%)-#9r$rKlDtpc!A?n*i&v0Lrx!yVEPAckK3P%h|ze!>4-lRViPr54vJR zOb4h|h00WgaZZH`Dqmg&pmG088*8vPtEV@+V`*z#%Ir{V#}A{Qn^lA}gZHq;vM2Bv z(;*p$55M3qZAx9s?VpMGqfX~WM0BzIu0-RKK^qrSMbgH;Kr{$;-kpO=NmyJ4OVY`M z0l2Op3U7Gtj*YhV4f=8xnKH~2mf(OeTu*hPbh-2xlR4QM?7ztW8!07+L+)Vwx75w8 z#(7!%2V%I8lYc_uCHF`n1GV4%Ftl+4m7mxqtb$PVT=Z?`q*fRZ;R{t@gW+Hu#nVOb z#URZ+oA@1|so2ji7}BdA!`nc1)mo)?JsL6Il}VHsj_0*&Z!v#^`rfo(Dz3Skvo{^m zz8?Xea(K7>)1Upf`L}ri@7wjg&?fj_AO!uJb_C*-U2!%XHifaDKxML+5NP%&NF_TO zszeDO zW4hgX2A{VqpAhH}Dpf7Pc+E#$Yc|X-p^tl*#|{U|6gMyNJ`<@&B6UDn1z1kIP0o!^rkoOTmX#oF^3qPQ4mMjDqDxt(!>PT)Z3* zgPFDWv;Q^vI5R$<(CiCRrmMl+X?P;rRPI4)gTffziVIovq^fqsQ-`NEb-G9Dk2S?b-ChC%n7E9y!aR&(b0bm zhL&rLpWdjqgEyTYUuZ_e4+X(+OPMKA6?(O3vvkD zRAZp7*0Zl{2pls*vlz6<6M*yH;6ds?5?r_eLPXPF*sV*gaRo^l8&NP4ngHe=5^%uj zDSnPTRe;)WwTurw&O^Dp0!C}y zBHbxnud?a7yoR|GaK1Ru%@6LaG7Wv`-(9ZK-tDs;Iov$0@vY-}i)CkUpBcCY9tNI( z8|%Jo!|(%g&B0#T1&+oed}| z-1YdgUf)}!ox%0k-JOo)>tR-Czj^)L)-JZve%^M&E5!}(@mv(3Cv(^d;G9^W)*9;S zJZOOAaju^dVEd6-ZpCuHgJ6|c)7>fkfLIe<&DspWqI17y;A0B_Hb+{h z&FM<8SFSLaWor0i-A-!S)T=Z@AiKma5XJsAiub+gMtx^N==gCfQ-syyEfALBqs?qA zz2|cT$5*A}ML4#vJ%?NOK$qrSzoRldUfunvf>&wwN3v$yK=N6#rcfk`#lO)Psm&0H zvCB9Jt0&aP0(p6kcSET2icE)Q}7sXe@yCI0uefTPXB0pTWn;VTCFL?LB6vq7%C$bH)BSKWo^@>tL z9X=&`rqFtC9%xh#h}XQmqN^V8`M5nS!{WBhim(|{^>%KLZF#HZC7D$K60&=@Cjtl} zprc_%f4mF z-+Q6fWD=Pkw7Fy`#Iudi`CgY_nsXY3 zUytDI(om|(jdVRF7LJOALmMYHaHmxkUEiTS#Q!On?Aql)J?TRp{qYL9Mckb|1d{=G z1JoRz;dpsx{@?FmE_{aw1v(hm6D=4R$$!-J$&iX@$+3h;KwVgW%)?e;>gS{Bsi_7i zvGy8rv@s$t4jQ~9l15SzQ&y5a3h$)Y4a(_Ud9-saVlBPPBF{EV?}}1Q4KxlqkmvH6 zUM*;8$=W{PvO1vN`P8r8nf4lJ<>cg)B>L+h-Px-5u;#CO?|lH^(OFqgUIPBL80FDb z1Wz)nfCDfO485B@kS`uTZbwPI^9iGViQEokk|52aF;6a`{eEkaN2X{RS?;D9>9lV< zABverR75Kvel(-uqxI7|!UxG7E+4JvRDgS^{7&GMHtmQb>^Q;(DFN9PHa)x|ZQ`KW zAPdfx?!F_s8q)~nAPkN<2{%TZBR^f{?>q@}^06B#@Yw^GpIk!H0Q~^-PJlgOW-pag zD0>EWw^nOclT;7M2&X!^%qR=GutAR|2mgR`exc$900(6Htte_lPdG)&7qKkcEHrd{ z4;`j2))GDn11J{YmQ}~yo9dR_g~xD8mDLw-iEj(5$Yj>=@r%?8b!IolI3T=pZRALW zJ14aR9&&}Pi?_tBhY-Lvp&lS5wy`I4tzgtL!QLqWq$D#k25wP2e3jU%bC;W zAj~N_{TxY)q7Cz=-9RsL%FNy|(w(J_Hp1GQxj(!EbaWe%3UwIl(q~4>I>wG7Rx?#m zCrc&K8f-UodZ{mr5I)8+;&XG~LZi+#JBJBLA&KF4rn zuAWgo^Go|rR)Sd}OxmnaMN!jAgJxNCDGhwp{EUKVoK=1dJzeV!RoOYBHUH$Dg10te z2`p1jSt~mEMA%H5otv8QsOFBUg#yd={cjh%IvkrPjtON+M@;6exSV$D>v0xtwM5H6 z!quuC8V&;YZ@;0YIrhtXl1__~l;_SDIC*Xx;(Xa{*>iU*`>~#3BfK(lY319dB>W{S z&pp^x8M#okTdWhSXYiZhaxixdob_-E!#%YKkMyUUUc(uK(TnxdC^5gl zH$wWKG%${)(0rW6Wavtb=JwCod^1;ujL8L7cYn@Aky2Q7EF??$jk8_$p0)l0k_G8F zd*R9IYk5U3z_SbB?QhcJdmsvitA^u(J66Uc1^Z5eG$TPEAs^#5&oTiPPfC+4E~zTb zX}Z~rRoj);+uv4$Z2WIcj;*ALVBuJ?^UgKC<^}30m+QXdt4^7lbrT<`3n6^yo0vEW zTHKlOdFs+)z4dRP^eD_egoWMI$VdCrG2we-a5j4K_yMejyARu zyXDPmOu39SAa~Laz%}Oa8kx5{D1pXJq=1sPa0`N*MoIM4{Y*LzO`**WP{nEt_o1`0 zKx>^rogiklXj5Urm-Cl2?O}UtigaiPZ%?; z-(d1hJ^46|v!yTBgKqrPkYq~C77MXikEW*Edz4fw@7=Jh0+*~s=6f#SF0?5ok5n%v zLHWGB!!mLStxyxd)&fFeHlmA}5e^=v&enGK#YT45r83aUY3XV%wv1f7OJ35#YU4TG zknGON)23X|@Xa#Z+`K7+uij?LrFl+c`<*A5>mC+dZcRjwLH zku12C>{Ke<^r#)^((Fy^tGM&*mfmF^8%@{j&2v_HrT2#b9h=j0Iv1k6SB)F**NcZa zAfiq&+S}2qmeBYYk8|I0qx@M#Z!*J_IDrat)_TS2)jV7WzIdfx@9-z;b=yOSU8}uj ze=w$AAN9~}4?fGe=Z`lijdMl*R+^|YTk*#Tqc$%x-jIIaM)Nb`)mK^_N3(tQ4R;6N&aBsZq z1>30^82KCp?0>5MaNL?``OFY20Z{jo6%Gq!L(&OPZmZfdZx-Ku`>Gq?{-N1ELEAj( zMg7e_3Ta9{9ElJqI!BFwIlc|NIM3b8H-D-0nyrOvFw!1Gbe@K&f6jVYSGCu!{!^cI z>T2GRBb;lyc_XjhQy-S0<()&PQ`x6Ordol#mQD}}*vd(($H@-6uTw-$fSyR13575fw;|A9jNK=D~Nx#IxY)<*H5&p<{LGzrv9N+n~Ow08{4Oe zto038oJ|g4S5)dpOLpNSo4#;iSt%ZMj2gi>`u;VK+FXemB_c~vy;pIm@rBw~c$1*{ z1>0A7r~Jwo``B(-Fz$RmqY)UfEs1!h`(E+D|J5Gy<46SwuM zc`2Kev-lHGitvexDPClW%;U9_9?=5nx2U>`%xB0Nj|#gS_el7+=VeVgY zbbceZWKw*C3rPJ9K+jwOpjW!(a3@YgY}L;#&ymj)l%df2)G=I_!`ja&I57EzjO<&g z#R*?rmxp8-02JzA3xEbZEHdhP69d66PLhB_FwCcg#p8;TIaRkbu~9aax}cg=jvrMd zui(!*9t~7&v-!>GR$Afi z@3u#5z{0;*#lX7n$8T_j2Q>lG!c`~btDLiLO6Opn zpb?R&`{&WDSC%q%zY70}husfeG7l!)mSDaUvonh1&J(px$XRx=5_q&=xfniI+(_jr$N{O?17%@lD14{sml_6{$ z%njBrcgleDUKnmm{1;ST4#bRdRx%ZPrXPmx+4T7(3pheqTr&6i@NyqBDz?@2MTack zHV>s)^nx{-xCIS(eOI0-G!IqqM0y#(bZwG*1HTCgYQW$lK=kky+crZWcx@pK zkn!qtgcB8yieAG$RK;VK9HaO)d7hOAw`~}fmKVlW zFJ}A5)%-!4cQbkQfW2bBDj4=zL4fqL`D=dOfq26NBKY}MY*;d&~ z^+JXjmKrj}v^dzG7P!^~1&~A=fSP)@shaSjH@e?khR^=iHSch=F3q0a9};uphSG^m zR`g7s@cZ8N02SK-TNQQ9&*an3wDG<16etjci#%s05rBA9FE-gmI^c(LtWDlqFRgGb zIV2ECvx3ZrJh+vx_vxzhhGJ%p;vxV}(u=(FiPV6$?FEq|7&(G{N~!Z{=OE0yK)=%- zVKrABWQMZA;2UQYk#288{TaCxlukUdLA;-`(xw-Ed^iaP^T5cU)h&fFTf1{%hP zJI}8pwYVR!(f7DI4X6JK^zDxy^td%Ic~;j~2Z;I!OS%yi82tUV9jtJI$s-UCCOk8z zQQ(NDLXM~4Nm~M_=E&Rf9H5hSnpp5B3QY-_Iy_Vo(AYJtd92OR3|8DpVS_QkY{vR# z3~`W-c%U@?NVsyDtkb_3HYnD93;c_Q@W7_i6Jp|nN#%z~d*Mm(p>2bTfnAsuWXNjO zBi$FevX4rXG#jAfjyL(2Ui#n=*PXH4nEz<}|8e!sL7p^0*XY=`?b)%tW9`_sZO?DV zwr$(CZQIt4edoLJ-5byQMs!DXMPx_+(V1CQndh8}tN41TUV)HB0poyI47qg6qOWf! zi0d90tADC z8pCcXy_;vkekiMR)!&>>^*g6HLu9qs-;N5JH{#=_9+A0hcm&5H7SXpOu+6y?G>^J5 zy%ER+ZX1~MBXX<$o@h7~HlB?6eP%TK#z%gNnET+hXz&fCnUh=nic00<@BJnhEy~eL za9_LSE79X;(_)nINv8_=y9HAJ3xL%eRK<+Z74}8k6|@PK4$_NzcQg$Pya@op1W-&g z8-B#>9+|FP%u(u7XCI2Y%xUX}mFK&pebeLUDV!~$@x4cXLD!y&@|K9DIDPv+?c_b_ z$uE9j!gTZqoqkXM1`%N)!4U5Ij1C==zauqE$vC*&;s+`Y{aPEV#73rs0G!R_UWc## z<;t&BRE@5pxpSDCtEBYneuigT-%-z93a#picQ zR$POnuwr~uI^%b6+8aiE!+^F$Sk0di?V^!vS8UlM8aKkUYWhuo&whK(-4Sw1a({~h zq%%DDDoG_Np;!u-pYR_FjSrI<`rwL)sM_8=kz8G$ABphs+iK+C`eiTArt$39bFQa5 z>NlY)?GfHPBm1@+V+`QN4HW1?oX+lLA*KcUodC86Wu+)D-@yN~;8x_p*sl72^ee!D zfCzuURe(QsW@i5%jyWjd-ELkUZKNk9$M6QI3NgTXpry&^rIm1q!}JXy&*RHhhWW>b58^K`g()kMUqR9*fj-7v8VOh zD5X#c_$8tf$|JOyWKSd*H>)2SQv%_J4OoR9SZ5hv-aLV;JD0pl)wS{J#je*G*sm!W z;CI_D^GT3p?`SSgA1OD2;^B;JD;W;VTWrGDnZtL{cRVU6h!)#aXm74|Dj7mzv&qVn zzsfEnR31{M(>ZI4HaMe;lgIftCbHB8M~k4G^H&2jc-YYUUD?IcoA)SrSgR>00)Uy_ zLM2PKOkosksE#MhlDKvjsCa;?<}&!eo!CcfQ?icmXo|yU6Kp(_&5a|#Jh-a(WsM;6 z2L~IkI8I1Yh$YIam0?d12T?(yAXHq47h@m#2s(>-VEFsP?#)cQ0HkG_Hq5d*ypG}J znO{bmzYx|-N&&nFbwG7{9!6Ue44@XWDDjnPw7xB&UObem-I#;Ezc;j?7e+lT-sKzw zX4AFR2oWU80&)>L0V=Duom>*UZ1p zuw+PH8F`DWRUu;iZn#v9S00j_xQ}3SpWs#IRxoIj`5OAa4NmsSvdw(<$N(PT7ZsrC z*WE2 z0jYulC4Bvn0#rCOHLq(mdW2eCtnX_{3!;D#HwIx4dQ<(0CzfqrgHMo&_?GIEzs(cq zB~;;M37#)S@?K4IdZ%|?0Cf&ka82r0K_SY?JWS%v_;fxfP`uc%jm9YFFz%d& z=a8ssbk?A}`firf%G~}lVk^BwV#i6l9>k|x4~qm?0OoF_@d3!MciZ|zUQ;5L!ybgn z<^N&=yUri(Bzm1bu`1IDz9e(hR{yT2{vQcQoIV@OnIeq+-KcPX0&{N&0Ktg*du&L?(s$nCsvQh_liZv zQxCvnXR9dy60c-5)M=!c2K7f}H3~8FYfW4Y<@d&2MT0YFY=`Xew3w_X04KL~RQv=3 zl(%D8{6UzaZ;jzIqaSNnvIkDg-nv6J=z5|15lm#aifDQ$M+_6U=u8hPaore0D<)rJ zXgiVnT1?)!JIE&t;&)qA-ISDis&_u<0`m6O?Tys{OiG!Nrm3cItK?tcn#=WYUiqaw z(R);!E*`$tj-Hk-76z8SkK@+1KSX&4ejXU!vaq4IGE#7@8O$j1k=mL>cF_S2qh#io4AB4zl9=@5GhM~mY&>mM zq;x94QJJgrdShhT_;I=c!?~5H@CWRR$rif_zIE^>d_w7aiL@*6LC5%J{iEYrEsIlo z2h(sVdzr<;T-~AX%KnvkpZ)WFUAnc&1vS95ab-$qXj#l3qmYp7kOE-?eOz(Hc-RPN)q4pI2$9)MtM^zU&I%)H2qsS{ulupc3-f^>(c*|4nE+3{_rXlU8h?op=Q8>JC@NL4loC}>!2`( z>nvv*e;N80B{61+40&$TY>}i6YAHzMMCqHZ*kWCDA|v)pO^gkU^&MOCZZ9qkci~(} zHCLXS9&y#glkSg?(_;B*xp7lbpUK-=5Vr=HW#HJt3Qv4x8N~c!f`BC)P@hok?5S$` zSKHEO1`l!dp?`+TUw;5q$_t8DML}@s&B?L0YHhTf6IA`nWU!4w< zwgQ3QoRq^$RtwacW$nlK#5yK=Sx4Xz9-Mb&qEGKB!;e>FpOZ&3P5&koaz`S}FMO4H zVI1a+@Vo2nJy=BBO2v{W(i7Gi7)S005hxN0^nm)zE=uTj)t4mmBPXI@#9sYi;490t zE16emTtONy3burrDGUZIu!+zIyXIAo>doOGT#+;@3PY-CqK6!ab2^7`Dmyd=Pe<&% zw~suX4L_fG&dVRj8)J^BDQ@juOTg>!JlcCA?WG!11#n7<$q~!U3a|FpVy>eTI`cJd zq>}JeqWk9Pn$oYkpHno^$0jS)z5wYEv7r|JgH}W;&Khu!R}2KCduM_$k81~UA{K_$ zc7>y|WoBB4><17&_1&v-v^HyK|z+rT>dB-2*=4wYK>O0ls~6o0*9h zmeU>r>FB)5$0B0K*TLC^LXy9Y^TrKX?ru-n5-}+C0mriR9c=arr}S0rvl-=pCk|QDfqYFH0jbL@>I@}kNRQ)wL;mG;x^YO37|SnhL)}vC z{9%m_8uPd<$k~-(dsDT)1+TlW%PPmLw9uGIdeD&l9SCT?&Vwa<n-Bv##_fehvicn8i0?X#Ky*wPIUm7M;0cm9yD%`O37_mA!Zxk zSvzq0sni&<>XO_sXzaO3?tYVJql!^1+!><>)DWe&M>JH+2 zasAV}m51?AP0Si~w+FsGZO0P@z9H;W^{kfXg4+)Vn^?D7)8OeN|Z!#g06{ zt_`>o%(0Joe<7v<7rjIs)sPIK@-IpEO5_Rm5@cHSr2XX0!(vP;{>|YI#ZJnhca%3l z((7Ge@N|C{zvfjHYbBlA(t`hZs>#8S6fDiSv^pRL85qX;84NG8(4CbAQZ4 zrA=J?-k=9qGp#_XdwawGdX2B=HhD|~7$41Dt#n#anjRDB12i1yn)26zGcluVDJ_h_ zf=_<&AWN;Ti%B8cY-n;_bOw(ZovtVU?SaE(TF@xjCHccxH%$sKHt?jZF2NsQK6BavEVyAy zG@!20Z8?u~X{zrm9v~>V42$|j$A6MW+ge4FCkQ0*k89Y<2z#u9M2Qa4Hzfa2B^XGd z=XyLtd1k^jIHNl7;`k&yDL4YA{2^`Hv#u^b5@{ zQRbyeDQ^wM1k;RpPFrG@ye=XFR2zb7?!1@JprYsOv!Lf3_=Pjv7Wvlzl)aOgO=0a=9iwC5gE2Q`3?Lj5+@?6bD&)Hq0GY zCS%j~V`$!JxYZq@NpFh~b3fj6dL2iAE~L_$%XBMo;4gsH>2 zB)GRRJwlC(6SL4pFs^6?TuM3vl!kER)kc1z0z~Xb$S;Fe@S0t<$YV)u!$y8*6!b%S zg9jwHv~^);)HQKWo6hi*TW0Dd`v6+;GxDa!XorV=GwnVrmR~`HJ5DQ%(u@kfWc%Eb z)|W>Fy7r_nBL-}GZ@?_mcXrBGjoHn-J1W(A)`c`A z7b(mw(3Bj|SC?H@q=%G$Kb4D#cf^~CtRa`RnC+4J?kGkp6UqvRPv7u~B$>CCh6*oS zd3r6wX59EHH|=VC;lQKA&FSjd($}z^cW6z$9bZ>Oak#(-jIzLG`VxQ9-m#&@uE_5f zPXeNXf#F5BIUjTMlB&7&_Qft{*I^lfze0c%L+`@ShF-4n7@+jfy2-q`9zgXob1oUP zT&ZS8V=e@G9~3Xa9J&%Y1(_q23^Knk#u*au#p12Op~D>$sr3`{nIh#?BOnw^BY6kV zwb4_s4n63~0OH3NYqg0;nGp$Q`wrTu`vCIu=sR1VH?TCPMD5fpqNyqSe)~moidzZT zopF174m2VMY-2@eX2ApWpQl1GoGwJDZ^n;(EveW-IOYPdwkin8aU!R}v>Q-GB%%bV z*h;wiT(GtRh_P{^7|HuWLSfbce14CE7;`Ufe!~7wuU-EN0Ur5LbWKD}sAXaRsD*i<{%k_4;(mE(z>Q+n zGKB$w3dJ+IwZ^02Ds8^W)8Se!3~NYRd4*M?SD^2*S_pX-p6RSN5_idYjx_4ewL3hyRTF-}nb9)?Jh2dW5*Z;Lr}{_^bKJ^6bp1Mj zIW|djV2iYqH0RpPARsuu!oj}A$HOATKF5`VhcEUF4i+aDd6O+KS(?sF&pH32Rh*r} zO=KY1633uvxy@aCER`O(O!K!|_>2Hih>gX?{G~Lctvx)A-_zWC;6}OP?wx$U>(>E2VCcpz1#-yaFZuC7)ZuI$?#SA}#(yR<`m<&vABX%lrCfMTfVu)l+B{OM(#N#SnOF;=r3tO-M?OTWW(7#2D ze9-dHrhb69MYTQMpS4@2{4+e=gW-;`a@Rz=;7i-Vy)?1q0eh;75n6Jj*c_Y}z%4l} z!eRHzHrf=P{=k^)tD{nXFB_&W8R7{!7`ytX+Mx1aCV0tydfYBJq zUuLydn*Ho@W|}UqTX~0*oIRy=t|8~0zFEzCy0*3ZE~1je$JQgtL~tPrf&tE@niSkj zB{^HbS)lpl)4RcS)%j>gJ>{ztxyV4b%ug_3v~+_Z&9=nLl&PZp^CMMcL1DpiFX!H!Hs@>P8Tj20>t>82vhMG{!pYOv7MXH(qF(1EgMpWDyAemB_ z)s|GX0I0_9;h?qlNq;!uTfT^!`)PU%4_@kH)%oP!w$GoDr4EFEi_;4L)91LwZ&-rf z0FkcnQf_O~x7ZL}QRkEpU18^zknWJv0Rm6HIX(hUQj*PF3;aC-I@9xYRtDlNpHs>) z;QV$4Ioezk;Q3RKbFqUsQ4=r>Bs{u;?#S89zqo~S7@L7;QQCXs;I8t{Zt;t@?c;odZ86ne47xEsseQhg1Hjzh zK*V^1;F~d+r|U{2j==e9hF~KiWGD8S)4wY@edE;~3>W7J`PNwfRhgV=<4;|o<%$rB z(s=|Z`OohGnA4Bv1bMWm>5k{PQc5>fMMQcse7gxC0Em^8_|`*GxD#{ugI%0{9I@9N zDCoJb#QQNF?F)v8B(-s)%^uc0z+41ts>9I-u&Z1&$sOaXIvEt7h0Z`Sh4t|i7kEYJ zD$Iav&hqSBC+mOf;Fs9sYBv{hWG8hgU(Y&$yuD5U$SqlX6KB$N$=Wn;3)iJ)MfktH zI8^OXg%m=_*2Qg6-Ug`o{gq9&#ntF>#nn>JWrqIpw&_WE0MD7M^ff^iT*BsiGl0z$ z-=zcNB`1~OK%rCj0vF-oeN#vYZ%DxP9`zp{rm?s=!S2bzs?Xl9-{Sc})o;5+>FxqT zb(01FE^;E$>w391XbivT1R?1_GA9yn60(ev2Ie#yd3g|9AkMop*inbw+yvh}cOe-0 zq@_3c+d`GqC9Gg-ZURzt{6f;e#!)e;H)4(Kh<5ZaHH@lrFw?OVGf}d{QkLE29>CbKEXkct@Lg(gakPxkk4NRM`u8NBU{=ejZ z5+Kyc|D#Xez^3j8@*h&#p2slbpP$mj2~5IumIy!%_orkb%WR;Z>KImto`)X07+5$6 zTht^um#Byfk0}FgVRcD{-9KwgG5v?}1A0ei!cA`@ML}CyE$0*e3&ABvQUaA?K9O7_ z)9ESO=k;mZ>?Td%`|Ao3=%#>p4}~A&E-WxY;{GT)P-QczHrOlkBQfV%dh};&kweN8 z=>o8ZGeXt!elScF)kCPUHc=pwM-M{Qj{E-onPk277*UctXx=fKKBEJ zE~~JLN-xt)hNWJm&EU7mX5KQO5e8SV4uB+O52*7LIS?HoT3S~*#ynwdkJ!RIDRp)9 zsCJ7e?qvKac3#_6DJW+^iSiboA2-%luiCl*+^@W!&e%O=YoFgC4lQjl5Ek>ZB0V+W zioVb5b-R+dF?Bh9P&c+1OI|oN3V_NUS>3~CfDWo8v0eQwjHAced44&Nx4ZBO*wXzpS!+~Gf#F}X3p|P@%~e#T%R%K8UVbExhFlN zUw~n-U3wQX43HKsu_>jHexr)W2{0DE)m_b5d9|+RkjWr;+O!_T|3iv&Zgy8~aG!{B zcEW;aT23u&TP~Vq;t$ZJpHd#*30|+=dcG9)bULS>`>eKVX)pcRBGmz!~@12yibBjx?cK!`TW)f`9|$?Us-s=P=H=9<3Lt_0l(zJ z_fE}s=`{&vgx_wd2BJTJA%gN|ZGE@4$~oW}>kN2Jp2LxRx9Guv{Xp2M2K4y}w9w8{ z9O8j3A0R+1ABcn_K)C68!VBfPg#VRYxMA);j3Z68(6l14mos=XBLi?qp;8I0MU;|rUL0u_V_usf8J{-W>wB#wPTj~fX-G>CLPnZ@U1I(>QhOsLllV!k{0 zH#*)gl3UR|Ke~h)L8Y~_puC{CU^>=TQZ3jfSftHyI`-0CxUY6DsoI?<>mdjL7=A|( zh0(F=&2qYyc8LiXyX}I*dgA6qYQ}})h|TLn>6%TsZat8pZ<`UGF=Mn@LH8Zm6C|SA zb6L3`SzbL67FP!q*9^?EcPlOLKJX>_n8z8X2;dL3T^u%O^XjW4gfeYDX(unl(xHmi{=pkC9Nj5o zt_!2XXB|)ZerE<4<-i)QY8Hj=>3=q2u^%jP-e1;Tyb3Lut?JfMSW?#mU|9#gxINQ@ zWeL$u=FE}ls-=i%rEUmpn`-%R6n*3Z%d{$>j1+9&1i%L^IJu>I-}}Ii1IaE~uhL?>`W|fNz>gB%XEtFrdWjF2 ze37_yT(^hqcfmx3KEl*hZ}ZYE8G2NH!PXdThPPg<+CmpqD>J}#Xuyw^ZRh!#!B53e zwtY-B``%B7ASBI4kf%CYvQaDzw{Qosa!cNBwE);xT|19+Ff?!8V{O#j)sPiNbOB4F zcBXnph@SM!b(3BU50rsuysI;zKI^3GPZ16N(3yq%WUJW25{y`>daDW4^fR#ngm+=< zMbJ6Yt!yT%aqMVxz8>i8VYXUTnt@DvLgklQh%oz&{SLEr5I6tK0kcB)YUq{6?AEe2jB@{ zEVc(@2MU_whrn8nU@cDm?s=ro!wjyQercBB3c5yN{Zf7sYD(#T?me@7Hr`gxHScIA zw*-%Pz`!kp$H{lgh4PERbI{ml<+f;x%>?j;+(tnGlRjJ?2)PC+BhW!i+)6Sh<^ z{z%FsKhw_Q5#9&cr*w@zbbHVdTF<&cu?fYLaOm#gB+eG(?}}y*1*2plnau*r!*?Nn zz!N=M1m(3hs}C0!ahND^kCd#>%8QUeCO37Z>Y!9`wJId;k(im*G1SlgGLx6JYx`r! z4VS#v<9%qHB}-h6c%hSXhh(2+fiiQO`M}E%&G6eMr=eB+gmvjx6p6-BD7|7Onq>H5 zD4vgFxVzt`-Tw-gP`CU4F$(}^to=6%us&@L0Y6co@-q|sf8jz2IMdAiSD@b%s-9Og zs`wjF zwbSX*px5K`0hb%-0t-E#>Byg%<>!|a}SU9kuhr_q$h24XkpV`VRo77(>jR>DUu^QP| zUX8ZLb%oTpencxrI}lxyO7}tBwe$)~N5b>)mEe4O3#oGiRLx%Z)m4TZ>B{9<`uB$3 z`pl@&T+rWhOu)7Mq-wG!e;!_M-Zy&SbrmnZ)i6XSp_V z{6rBHVaZCvsX^4>5+5#A5uyrPqOIRS=gLnAeV_bLIt~aF8hnL`=0{Q*Ql zMuE$~SBKPv5^}CUtx*oAd-+e!0Xw8(zWOEZeyMjD#dio|)?RmNR$HUled&zT$R}5q zZK^X!9P2syorWo)n9zK)-88&10GL|^xO*n!SI%R=3)nwz6mtF`mFzI6Dwl9qXbT$@ zCFC*uP2wojHWg$0lv9(q0lxXjMFiv-*D$+T*~r6Lp*z?~(KmX=)vt-O5bhzx_3Sf> zHL|geDkF{-`Ym8>rlcG=g6<1qDD+J6d<7C1m7SA0Ia+6Qj;$2J!e7!C|Mj(051vR zm{B~C(BE5T5#>ZMMyTKrcL~{ezp+25X+R34`HM7<3KjYKK5AuEs-lvi3YAqihBg&G zTm05HSC89T8(wx^8=h8LXFX48X_J2tD4q@uF8RD_x|Y{3?rxggwm)9lP(@fH$Awgj+1am?aC|n1$7v1u}x01D2y_u-89m z;gZ}s0|`Fbzevr-%)%r8Jl?UIk1hCkHxIKo17H{<4pE|{UCIrg9MT$({y~q1!@MfP z1kmj9DDgLl$Tiuz666dx9V+GCX=hE=2_$xgWE$u@OLgko5Aij>?B z!AQHb%bQ}{x8bauJJ&I44?B5lQ>t>wnI^xRmq>8w@nfEP6W7FUi{j{IieI=F#ayu2 z0%EUeklWTrtVC|4y*H_PRxG{CWYwS!T(pV09{0olK7iop9UoAvtw3aHdK5gczq&W5 zpEzc<+@f=5bS{ld-jA_(pem84zh)7WDnu%ItN8Zm`7n^_guSi*Rf*+gk6c(E2c1X?uWa0y^V z4dHe)3)LX7Y=S^cR4z*_j^nKS$l?E8*D+ljkB#6Roxtk#jdHeP%Br(`Tt~0K0W`BN zE;H=Zx4T}gAEmG|zN*=>xTUM;-07FnST<>NRH$Y+n4{~CveFpRc2x3=87bqqbge5N_HukxdQ_;?{z)W$!Ue0??Y(vlJ@Ul)L|;Q6b{4*9XMWur>1I3^JAWBj_-L4$)lkWSSmFSg{2aH+~yg>IM zSOaBExN&HW{T(DYPAOEV`b$wiuouRX*bfb0n!=vPS%5G>Y;~`)hh>Ji*7chWCp%F4 zb(7ouH_#Mys()QVsCfbnfveAAw6-x+`CV|C;Sao-EvmyxS{D;!3%8A~8Z4@ZF4w~{ z3kM$sOL;p_Lfp|Id`Mw@B0z)7dfmXo>ECY%5I>YSvFG9tBez+}O?eBkbk6I+3rq*Cp4YP@2?yNI%@Rn+&81{EK00J*_323?Swic; zmAsr3gJWkB&6XGJi~!_KrG&af+Io{-bS7GrQTGzcGta=m z5#z>2(phd~2?LvpCDW(MH0P#H4d@Xv89YuD3lH&mg1Knmzo)O$Kxt1V#+`y29OdWY zjq84^ACmh{DwhAk;vWzk3bI2!y%G|#i*y#vP#A!Yj=>(xR|H^TIb&|w%nG(I?jL0pr^N@6la` z1wIIY{uoQ|!QC3D7Hdd^arOYhgBl7@64V}Y-|nov-6n+z|9~`8_=dl@t+HV*Jrp@3 z@V@>%*_&n{ivt@~$;$TAxD@x7(wTj7|CF$`%A&-kY`K_OeR2Gdsn}0b9%ut%!hv)4 z%;5Qlmsg~p1Dyx3iIRd7Lex^R`c!s#+5q~LuMkUN!v zBLU>v2-EoS=A$P8;KKEsThjgZ`&+MBeilz9J>u|?;d1w4Om6P>+^1uPt*@D%_I+qC ztSLo%yFSMS;;(0C_=*glooCTQRndZo&`%DX_PLca+@&fS0-m#UfPnU6vpkG(z8Y-Q z%Xk>`gWdL8XZth(643VE-{>E^tks1N&VZtVZ`PoSQ`Y6z;h40m0jj{@ZYcyG%rTok1!Tm*SgL0uHyCw5FI>^oMO!ce*pr?tu1Lh6~Z;sA%#b{(wYr)rBM{t``}7@ ztxlaFYPeWTXbzEnNyuZ`@k93Hh#!F|_Oi)o*Kod)URh9BmH9UNY|_;A{J84rN5MF) zR0Q~chr|vXMyHc?@>b$)c}0{C)%-I z*dInE9Pq^%12t+Uvlr1SZ&hA3RwK@pu?$|}K;+iod#}G-k(H@DPd=%3b;UWeX^5)k zUCy0b5L&h9(v{C&1$>%evE2%E+h%5KV}_a*OgiUX?VLjnny8GADX7$W!y$i#3UU`j zRItYs+uVS;hJZ(UbbL!nqwYVxDy+?jn&@P6>Zn4eGyVs-jLhp2 z$WXKjNYqO91o1i9Ul&E%wF?=Z)Hhgdvux?(TV1UCSa(1NLJ}03!GIf(+KK{b=WGX&xZ`xc?}g^>?X)mrchPKD<3aM-9lA#efhAp zrOI^N(sS*6(2BK>UY*qKW8!6(jOc#tc#9#_H8~)+%0m(AAb@yW) z?2X;BX}WRr1Qh|1`#Rc>c%P}#ITnp`=w#3Eqs`#YHt)m532}33=P^k&4kkcgF=9~) z(%HDlJx;VYFQ6em8j|0eY+!LOue$j3X z6E0kF#ebo^^GVd&8V{(QS-osaCY(8Vf^><;S~C|5vJ7Mg(X(ekSSX!dJdmB?2~P_I zp|{OiR-``)+S=x;N!2VY`5-f%DVf9+_;TW^*ay4*enERO`Effjkzm&(wGkIv13_8u zw&P0SNrBSSfonr%X&k~CIxwhjp7a_L#($D$fOq7z1=q>=<90RXc6a9Oi!^PhTv7i+ zYa22o960|vkFJnIY&N9%r?b4<<8nGQLlFLh9(vRVWhKzZV%?g|v_ zWY2&Nnu4iSkO+Y*X1U@>>Ltyue`1qCUMT^@e6c-> zuMrtn6G`IQ47FJiY<5H2y{(H{4#FdWr*BU82Pq%8mt3Mm>`o3M{hI<4`cfPw1t8S1 zCb7E&1&eBdE0%sOlrELLg;*s^^za1^{Nxlk_YRe^LmbF2H0%9`Qlq2=C~RlX+cV>2 z*6mgMjbLT&xh-mYPv?PtM@ryO?R4aW`!i6^Um9f_A>WXbT3>VpD3#pUiTIt#6Sk90 zq9?0c*p8HUr^EuNgOcf;C-CWc5fHvK`$*NlCCz3moCsMD5AKU2r)c2-H@gba`pw@J zQOCAhI!soYVBxoocp3urs_mQRD}-aI^ZiTqGy;0dpk)n&x6!ilvC?XGwt${e6>2H186tYSH?6K zV^Xm4DWopCQxFty0!@D$KLT@IY8IY=)PF!_H$n6kDbA}t_)(BJkriUh)&LWHBjkDz z{=Uzl0{@0h+ORX{^2zP216v1^xBaC3#C^6nfqaG=pGHoC@@kLT(1l zWS!;KoB{%tgWnK=>c!7m0MM~EAtuHvl;anml*z5-TcX!th;!Ay#EB~?6(U~V z%bLn+>EeL0hYuFFr3IBa;}19D?>8DwViYBQEzAk;4M3+$uuu7N0KE_UYHpGhnK8I5 zL!!MD9y}L@E7No&>0bXv0p5m%!(&)t1=$gpGk;?t`V>x=1NhnS1M(+M?Wjn;WW5;O z=pr3qS@@rUg+z5=Fk2kX0y6gAFTmT zZ7%H?S1wpNfvy7UGx=Qv_oC(kAx{vE9PLi0Kp6tUC;aA8CO(BrX@p3nfYuEX6EOs{!3y$=1D-#3D z$u`$B&xyBL+q}Tn`-lMO3*)w2E^06wiyu-X#-T#81GQf%prdxMfMh^6cWA4OqAqYk zQoFC-otN}L13O1L7hMcwp$V%g+|e!CSOb zFZuxe&R4~}lS0;)Ev#m*Ufov*$Xj^$!l5(nH)40%V1~Q&skbz5Hywf9*h_TamFe2D zOo5}Z$8xhXpkOqsEaE(#TfOOVez#GRAa0hq0uz3zS~EQ`Axckt%S4hbJb=D;G|>Vb zG9p=%$|B&N+~?L|soXpW+Q~tI4MwRwFU#>)bR;sDN^@hl>FTv=(cDX=snSv3a28Mi zLTnLTy0m5=q?Co4wKRT9_>$O9ysM)GuWnL4wUO`1<{ zUhHjJBJ@uxxQzSEt!a703EKtqos5v@c&3`PnX)vdm0iQoQ6@#8P=X9Ju}@9l6ZZ|C zQM1KehNA0>GiXxm7R^@Vz{B+AnmdIAk0HZp63`Zf_xZSK)YB7DFqt#!e64o1f&=Go zz{B-5AgnPG%*06AOmuj^S%dcF$y!eyB~e;sVR<;JzpxB8KOlk7nOXHN)bkDcx|PzO%iBhQK(Olw;;KEo#LTEyFmK-8RL8f3c&sQ z`TFP^5LnSF++3?Ja>ov>LwVM!sj(ZBuMhMN z$l$lXrR}ssq~Z(&MY-1a=C;*1uP0LP6Tel!RzvR$a5M2%>wCWS0T<{+Bsac3=3r@N zQ$_oL5=g#7Wgir~Hu+HQo4Iv@hU{|S%seYQWQoFz>sWEu3hRRCRXSm)k42x{P4q|q z@K>9mPzrDpD49xjTVC+RJ+>nCOVE}Srz#56 zj@e>Dva03MwzH+|h8eH^pSrFE9LjAC|7v7}hQm-88ux1q)wYLRa|uJ@$dT&QNpuoL z=z>v5wo977y>pq#*^{U(qEnL?*HOxLD^E}CQc*H>>`7Zu6leXjY5q0NS@ZnQv*uav zyT0#Rm)|n$Ti^0^sc#l4%(&lObFa4S1wEL|&n#E_qEpfJYCX-E$|lF3jlK}T7Stu) ztO?RADid}1eD^LkBzC$pf14bql0sv!G^hZ zeKQAntN2Had(--5`$B`VXllJY{}k(c(_P%3ek}?J(M`%ti<+n~bd1sD{gN$AB($w2 zMv;n275OH@evQK>CY?bq`(GaQvlu$^v-J+MfP+4|r17o)G-ht}%vYz7TR#7x~G|tekft2yD3=2Pvmr`(^^MmOp+38Us1kPK6kl-I&~%5Fkc;~WzAS;Z?CS= zvKmg|rz`F-+H}$35L;%zYiL&v^;G$TY|nApYuw9;V4C|BXk#h+;t?is^R2P}N z;gv7E&ZxMz%6BY(F6u7zAKv86)=px%CY=mU_hZ)SPZ}TY&WOwLY0TjKJ5GgaM4_3r z)hf@WR_$MrLwva5x0g&iQPJC}r^Kv7ulLH&4cUVOgHMD;x2F6&?}p80>Yv<@IpF5{ zM?tRWm|RxUbYpRU{Q8n-zw_(3@fG9!9h|1onBm#|j)OCt4xyX&_Xa}upUCGUDk*z< z1qR9N_yo3^Uu;CtIwJ>lLPU++nZO^eKlISH(Qgeb>Fg^F$zL_fyx-^RdRo~2p0H2h zv5Liw?oWi0OKmP=DoH27bz=u^&lcZflgDhP?^rnW2?jeA#zVV=m$YX%5u6F z_i}mkmYPh1u}jw)J}^THx>arzuaHmUhTEnLPJR}B7z(^PHC;!xFPYr;Rnc%q!j3Ow zZhA&uq#M2dyN#ov_~&{IGEHujn|g`Iw48gMJ@LuMP{ z>*z6IG;M=``q^UeXr9%r<_Y$U)hE&K!zRi7re%cVO~Jlyjla6(UDR_kl#6@Ml-fY$ zaKAu%P!p*g(1t3#>b?waPl_}r*b3s%BY#1c@{BCZO*(qK8EZ^=BW7k@=Jz`pHy3;c ziSv7006L#g<*hol=028Y-JLxX=3NYL%j@eN*b=~MLXPNNF@69<^F>s^v)M;xi5en_ zb&sa<)a@54VYmmmSZ?z30O5dPl-=3a-cA4&1RhL3NkSj+C`?>^SP9q>7AN4Xh)YEv z9}^p~sBR3hz)-;95u|aR@u&Ob|0jY?JOr~(lHRZw8s<_qygL?p{vA;15jgv4DS?8V zwhSu6AhYUqjd6xVp4_wdA}D+W9?XYRl7g3^Ew{|@*p3)_90}Oq460u%0fHP|4q$aq z=UNILpZ{K^n}kJY01l#52wyA@@D!UrFR+yE1^DJmJnxMLMsxk&_h3p_Be`c1L2U80 zAOkD0hCu1W)fUpEZ})-$6XDi7tt%$IsfC&kx-JY7Vx=d>Z*kCABxH0fB<>dgegYmn zh(xgzlL~9q@a-tMs6iSpw?>TTdyp0hkq&Mxk)yRvOv<4sp-pwNctKEn9ti>DlD#mF z9X?)5DXk0(d|KO$H$7q5JC;@Y+GAnjySL5T+fgP7e>4oFkO( zN~6DFaB#9v6K%Q;HGt$47lN2TB9?^BbL7xo+6wewJ;amtgqBcA;pk^RG>fpZg%<%y z0tC6}a5TR`T>&>c(VB*pU?g(F(XIwNym1mYX$1N9UK3Yl5(%)YP{lS=JYJ};^oJ)1 zdgB8m(;%T;QE1I2ZM1FI;&EzB@KRg_ND+VpLZsu;KcZ3U9c#P*iKir(?>Hoa2x7zn zNG&RmWy+11WrgveP#^VgRD=q1?_z}+2`Eiqf)-sTFB&^LNsbRMVrqf^8R5yTbqtW` zP;Fs%u-Zt;Vo}9+R^#=SIA9`(2c&o42{AsW73w`FjmWunAT$%ai8ny__i1AMKob>T z{}xwy%4MMF6!4&Pfbgn0V*KDXEws528cmRU9>gJ^0UW1AtpT~|K?EWTr8Ya_6=Fw) z^^}87EnA96O;hzBLFK0C!4`Eq-t)oUF%~d@4V<6gmR3D4#@7o}@Oa2s3esh=P>d%x zX+gbXDemiDHYn6b9jjFqS@&x9BjX{UK{RM~?60#V8JCDjSDN+l8hrD3F_RvO;aq^% zL+4td_lo4V2WhQ!aWf``Pn6%&B!Lhv62D3J#a_RTK?7M4u-#Spm45|>^J YQ11q9HCZqq5yS?3c7g?yQycc}zf%9XmjD0& delta 33455 zcmZ6yV~{R96E--uZJTFo+r}B&w(qfR+qP|6XKdS^eRgZBzI``UNu?{PPJVQCU+KQm zTm?E23yPp90}2KM1Ox>IBxy<|mViKr@P8zbVs`2T9(5j^bL0Z1AOxs* zI=h(KDmvLam^!&wnmYeC^Y9dMb+ItDbFnlwbg_40Ft#ytb}mt|wMP*`^24AC8(TQ2 zFsMn{SoKmpj`^?jiM#N(PkZ+Z06z^b?w9gI9t{G2QcD zP0zB-O*b`p3;6kcBjiVqQ7lrW1L_t3)Ta*0p_8nT3#UhgnBgltkAIKbK9whzVo zoPg(Un1=I=fQE|F+dzkwbYh0D^%RK^@7{^zk+|{MIQ{y|DBO+>1YdX{4}JU)DIZuU zgz6HfP?9{vLayXqgbRAg)e27-^uT}+Tl2?}2xXr>E4FU89?|Q!`%ZL;0$lZjzxxqA zt)2Y_V1}Hu%lT;55KXN?9tZsmhp1Nt?&7xKgPqJN)!?>FfhOE%SCnhd28LtZv0$80 zu&2N4DYFhr%Epqof~2(~L*OtfM)Cf_Md6opmele;Y)VRkzS1S{E#iLx&$i?IV^VB& zAVhQt3xgnFy8795z;^0W1IPncoyz+Y^N@Y;T67ih!&&+&6xo4>(wFfk6c%GP(~k6s zz$uuK{gATp;FBWLRJ*oUOHW9N4pOsQ!M$VC@~wIbPqjEr zEWr#3xker4PeK(*T|N4<-Y=$AqXc53L!2du@XpjBtrTNpRRXjIYrE*^qP>P*b)+B zLEMJ{_k$zYjJa5h1jD;+S*gAF2=4^Hr?;gZZEAT*whe<@O1x+Bx#lwro67EQP zc&~?|Nc=95QvfN)3+Q}}D@!3R^3+};`J&yp0H9egCDL#JYAKZ!9d4J7t=g?P=k9-kL=znv=~= z4cR3ou59df)bHI^BO8n+PewwxDm<*Zwo@j{!UZx+$=O!Ow=#c$wI!PV_f5 z7S>*L#sHj*Leq*+d>N`v2HsZI>8OvlJx?~{rSv>vZMUo$tT^N(J2P>z<&H!Mc=J&7 zA;ssw!vMqRaM_B-eI^!I!|?fJkeTIQL?US5{W-SAQRV1rt_z6EME1FV*MEmm`(?&Y zw&;Yi92k>pbklz$zHHzLbnp$WxwoCtKZI6AW&oQwxWT>)RmX563|h;#R&rx$X3uxN zD>Zy-QY%eDS8Pml7Ho`S;4;)rYCA}8vc+szm_=V5 zD|@bm{l?4pdz%ojrFzXPsF8fr*t!gBzD?yCUbts* zh-tm;$m%JG@XNWE454@mOvW z!bX=I4z@?O{>-LZ);MLvY<3+m3IOA6wPan#WOp7bz1q!oI|*=jjioyRWs+K)%z8`* z`N5c@>|j#FIi{;3v~7=zw}Ld_2^P@X{u}D#xqgm6@B(oG)T+UOI;DzS@Eu(dThyvK zsRw%0dVcULGyK#9P>{V6kc=(8qm26*s{G$@Gc4uU7BDp#qZ{oUS2@B|dH{mb3vP*z zn>j<8Iz;ad#S)tb9Cn>v9?~n;nS8f=Frwy!+>i-s8<-GJio%&DgVwDrXM9(b19Zc} ztqUwNiZP1)ZD*v~HxdFJJqiyNJuZd%2MU&Vu2RRSjLwkV9A84eLHyI7wx%?$jJ|NM z+OG6hD(CfnSq|k!Xvp;YAOLU48%GV{=ezv{GF$?8;8?r_%kFScd$79f0TN%!f(D3w z5&mvI=ughZkrw9zGks2=D?m_A&;ecypx!-l{Z5u}@GDEhA8pu1rE0pPd9Gt!(du_d<*wnXaN8gAKn z;io97c9;KZ(^}!*M&2TuqgVS1=vAZ06C7j}(`EBEe;dxXq|{Q*)<#(%+8^r=`z<7K~e9-nm432L5E;gN7@~#}L^jvyjGXW}7yA z#Y|u>Fzgcv8bXkQGZ`-E$($b0 zrpJx&Xyz2IjDA2lVN$_N?TE^yxN1gLB_gm+0-9>U5^7-u7kS4kk&Yl@k^GB2k?`4C zu!)|6<_FY>!-s=xpoHuqgvba?VA-CriL^kRw4oA@g$Q7T)JKT^5*#605zGNmQxLfa z6EPz;(t~x-LL_*`mzDp^0alh4Tum4Mh5cV6RPx2QJpK>tV*dw0{v;WyvH>ogQPt3X zZL>^<+@^{YrKLllKrBDP{n2e;Xy&C$5Xltj0z2jGlR`{5Y}lL8(evKKzX#!Bhcx)P zf`+jAXUE-tsh-_A3TC1<%)D-TPF?5TbDZa{c7MO#G5x>a{thujmwSkapo+6*50^)B zu)UE#CPSbbKm1{EN2Q@q%Lb_5r-rIWgE@-VLQBm`JIM#dRuIivd*CiDUJ1kQ42)pt z40a`UQ!?^UmfTwZ`9mtDJVY0)nrkftV~JiGIRyhEQfk^MfzB$?S%&r&yV)c>5X!WK zf*Nua?J$eOg6*_1dR3f|!HlPpJ0+W!#r_E6HD*JJF2glyBR+hBPYOswm8WY+cNcqU zHh$d8BmpeeQ@I_$u$KjE)2h|8FuVP0Hyf7aVK*`p?e21+Yd51{w>z@HWUUFlgd(jX zQZ3=JI)<^65@ibsXkna^pbW!IBstA&75n>$-azGiUyMB@Jz`;|MIE_Zy-%?;_}A@b z`zkzHbMHG>a@2scLKvW~Y1fiAkugPbuDoN?n{OZ!5~QTT8EP%F`P^~rV!CXiYF?dR zQr$2fY>I4!Jnw|=Z(D;@2Sm*>fz4pwf@A8`Nfs&dSQ*H0l8fP*|FKcvRe!-Haqgfy zDEl{5+u_XE|@yX)6K4HmG?PF&vzYNW#7R;~Ipu78zN8ab@1uZAdI<< zacbk8wCj*_^l>->q^Fb)KDbU2@C@yGx_;=s5ujLLqsB;RjD&yQ5udQ~O>%6kz2E>9 zKQHjFPw1R0UOxbnrgzy<#i@62jiz_up1ybKp3hIwQD!XeO-jh+8Zjea`K1q}2So+} zvuW!bj{#FNd!sfURDz<;U^BA(flUS;z-)Y4!h#(uw%se~+vKv=Fey1^{WQhs%J!Xa zou+A%A=yL1RtQg0zLzb>^V01jtM`RJ=Mm&nF2$4ecnA1PUJ@F|(a)8NR2$r^976}A zU4`Xjmuikg=$qm-Vq;Zx%G}$WkcR~8vftEQf)jgO;9k%CacDUt6m64h#(606pNer>Y zqMFwqQRv}EQ+Vk~gf&hq>h2o^F!xRVHUSmQD3nurx+iL{k9_%7w;jZPmXsBLJHZ!B znVPS_Sdg-Dxyg>!kifu>zOed=l$F

    lyqKu>&A!4IY%gMN5w@NrML(S-(rw{MUEu^S)6-D^0Gu1%g%m0(jlo_ zI|tlT2(;QcZf%bWZH>sZE6hN0UIlPNz8fyfPx0?yNMK$YZEcHF(!V|~T~hE7=2kI2*06=a1I{m9K5b7bxQ;4QeZU~y>hyY^%CNo z-3K?}e)5tFG}M~q#TpnT(8JVb*H4e z&``##`3}gUlA@dIWh2xia_CLHnxUgPLV$5?x?#abKjE=$+$`5&zQzf`vq`DluBdH3 z2Q*&w^1Nr=dmpz+zdr?DcR?I*eiI$gO87XV)Sz+fBw4*v!xFISr4O8LHlqIeUrw9I9U0eeXB^ z!*}iusNXNgeWmDjW3EW9Ja$WT&_4a0N9}zZY zwSHFm6RMG>t~<&zwBjN3yd0Scemb;OM?jPla<1$6yV(P76>y7 zFKMb>8F3||@pWb0l&0Rgv|Ocwt(cIzOcxPt$g|lsS5G8F^Ku4)zze1$%4KL2%vxk^ zJIzC^aMD9h>LkBHv;a4Nnl|d691rj39g$q%6ioakAF&2?aLHlAUXNLAUOXhKyRV%{ ztH07xIrGw$rm$y^(R8jOOl;nyIlJ#1|H9HZY%nY~TO5HwN<1yX)~-GxJ5N;58n%#B zwN+}cI99GYYc5i!TqND0QNodkC7RzyUM((P6D})ra`R@c6WLe*-1e!L+&irlr`D>T zaWRfGiQ4`@+y5+d{E^m@5isD!bd)@khIhz{kok#?(b7zGhK))5$Vj6Ir`|YoQyao5 zO?|*rT+-aVQtwf_X^gRHU8=N|qItAB$}^e$CfNms<{}cBqxJ8s(E5_^X>-4E>R>n@ zcf@A-{YVemn9c40WGOerDg06;mp1w7dc6g;>m+`Zhp%s-+uvWqT*!drd&;lBqZE2c z_n2R5f@$8x!uyMdTGVBmRuM{lvk*ldLC6~5cyNk={<)(!)kT|HV%zuT_M;AyBkgwU z_i8A1I!kMKJU3G2!MsnLBbq_12$=GJll9YC=|;`lZbcT+0zZC6~L zK|(P828n5b_Dg2l$jmS-<>fdN$@9_F=@`{Nyc=NzT()y;O70Rdpl(TEbMAClyVr>l zfMU;<>u8Fx5r2*X8DNsFV$;tJ#p_wUjA{Tiyp@5Pn{SKd3KGlY{A;{zczL~B2id0iDyBlwe;HfJY!F#or zGM5QJ2a!OopF8)fOqP(_mQ+ErVGVVhB*GS4mN-;_LxL%+jfDALX94fsN<_apFGSlB z+0)?5>JnyAZUlhO!5rLdh0L@umTSGSDR-o53<-*wxN&eV4y~Q>;^qsVPtR9{Xdslr zBTi+(8su)6s?fa`TvO?anQE5M8h9L6qTc|VEz9u=HMwzDEzw@{DkTwrN)-~x`n`}S zG(r7cyqu*xg!o1+JZ&H&wy8T%gbyn-k{Glx1>Aiv`HLAh9^7 zQ__L5>i4VIv6H$!k-n8j^~UtU_!KK7vBB2RqIs{Ko}y;poz0Q+6bDTa9vxkKGCJ9A~F*!t|bvkVo!8zF~FF=JG26l3r5CT&e;* zl3Ri;eGK}b*U^yjLXuMPi8jCUwC)hJ_Tp?rx`h{VAMn2+^lkev;tl}_D2E6Li0Hrk zIYyE!8v;NR+6V2_6`(o!JMe3IQm!fAtD((-s8g1!$fWfIrMb ze#j+bp6Z0Oq(*|`%(xTO>woA8aKw5IF zfmveKskgIBdW!|>>R|36@q5Iu(xUfLOY(KA@4E_J9JT=K5$?eQBR~#Zo+$5(w+YhL zB02;;Wd(1VS>mAE!7Ng7$Sf(3)@)J8bpZzPg>cFU^Y`WdwTtc7z}UksD*eOVzjiW! zd^*Vy+8OCOc6N`qKW2E}A}!j6xiy7(e!jgWAmnvvv^Th#9|*|37Xc+5qLk=D#5btK zNK8ijUIj?C`IovBeArG{;bE4IS1~Ip+;hxqcAGPFx3*U&|1P@N(ErV zoa39*+nR~DaYKA8UOM@RHz~MMCVBaglxoZ3M&V=4>;{QgKmD7~q_NCic*SMv@pe*H zpa^RYW~WEvj#N79I{}V=yk$cP?TM>syT2ak>9vsy%joVgQ#IG(vLJifSM?EYL$K6D z`^-qvx~ezBe#psv+9-=ATiPhh9sx8qV2Q%XYjv7k`id`_b+(kJOKcI`q%)VQq?+NH z87U-PG7nuLjg0IhyaVpwPlfvzkT5@EtE;DGS5}fvDH)6R8VVZ-<^d9nr9$k@ zD>GNGeT*RGP+PBU=*XJz9;Rfqvg}j&`M4~xS!yG9$_<5D)NY`w$G9OHFwNC5g$?Z} zK*R15d%R&gu7~~!POD)j56KkUYRyjY99!J3&{Yxqmy}lZvX@mb2!KqNhJ%wHi#`uF zE2H!6U`kD7B+=1TZu>NUo&Y4%e?(uXZ%I;&oB$0dTZM&?V_Y;o@>Nt&Z!Z=>y3${S znk~j=Qoof@#69~hMOy!N!Mjl;(|i_|fadtqYNe@UqFX6!rZkkf{^Kc*@yJ|qL}Uo@ zM$Ugpu3^qbM8K))R->y$@7jS3W{ByI^MCjKo-*&-Qw4ui90!|2`vFiL5Tk5~6479b zq|Gm^?D!#pW=@((NhL~rr82?VVss%f(#*%j^y5*C?EXO$DvGm z!(5<~_EeEqKIU&v!L~D|-}~!05+{nmlwpO1cjz zBrfpK4;#Fb-w~=hbAS_!V;u^4>ojKt5!d5lE*6gX@x$HRC2D&=1;+}VZgQCH94e#@ zp-jLaF!2k)<$#Xt749sI~ugHR@M%VFqoJYdM!Y%+6MH^1WC_qtK8 zBriWt^&Ix8Te?qluJTFgBV8IINBw-rMTk7<7N`ri^Y3_pUCKeS;yHgL^;VG+<16(R zuR0831+VNJ(fe_{+n<#BnD$&bW!cxA z^Ld0*jmo=|P{7fN!}4;{ez0YjBV#=qDe@|c^Sar2QY$snCc#Z!&OjIe{HB=)%mi)q zoK=#W4MR71mwhe17{eIAJ)uQVlIr+)Nl50v9eGvR}jKplAUZg z>D9ay9gr%SLjSMz=emka#knpcQVc(zysn7mrmcucR|bU2Op{?OFdU7s#fDf{{}a%aq1V?felbXKOo z@*hvhwB(CvB44=G!WqgBwvgj?`|(E{CqS|TCh*w`n#B+Z5(K{VVzkh!){f4p&rKMZ zp%w4?VeU8=1AU5u9M&>4hF4ot;Uuw@V6HDSHc;xu>H<@CBB-z?eIiZnIF}E_Ya3OH zCAHC2W6a;ytWrY_*$l}+yw@mv(Fu>C-G1#vOn860qxMZsCt5W{Te|Pkgx&x743Pim zvFR;>r1JuntU29VKY0hNLJ95&38V=N;O4qnq01V#xu1B~yn?2)kY{r$LBFR>?Gwup#mC2DBSro# zb_Lq5ZVL_9_dkCz9_W?Din)$pJ+(2*opLMn$}Z*@6U-s#ytu3dq1vMv+pkP110u1jFEl_IFC797oj`R4>v6bmG*#MSe3zj z@r*tV-!MLqKfq?!01IZFk^(T#c7cm|!;(6iIcm*3H5Ne2qCJV#UN_UI>F-RCSOT%X z9><*shxUOo)F-VLT;lJos(H=Beqa-_%Ck^3suDM#H z809TfxDT@`+G&hOS!FMjmWR&E4U#$aE2)z;kInF(twmX70Q|@1N9Jq&V%-F>4g7@b zHU`Btkn8gY#zj56_8J-F%j+l?@SXgPcxBHn*bqeno7@{tr}qnYkx5=xME%kghBZC7 zsV&1_hfUmOuDI8qlI{j|Ps$Hk#qQAD(y8Ucr#U5kZh3h{`VH!IKb#Zha+rj_LFrqe zX!9Y%^FhV=fB_xz`cLBYFD9&SbEGPTrJ#Ivi8&%8{;+%J@T^m07RIH|bG554jKWhM zhbT_B&`F10{DC_%*&igf`LeUJ{(F#`qCALOp!RLV%Dm91uKr(^rzVGcmi14xZ@iOS zcX0)tH$U3Tm$tK}*v+al>!(Moh*13ySrvr;V2Iop;8@8gMe<9Pz#{=7x9D|x$s1Ce z2J+Oh{K)dbGw+!z3U0Dt=~-h8)nRU@x3D+}MIrFIj>fj-{6tZnp@?45Tm_f<0A;8IdPJmwD+F&;Wt zaim2#Kpc;i2qhC4yyk5O28=SN`FN;XxKFkZq+tpfH&4XI!@&&IH@B9PDV5@)AYh)yibr40Cq*mxCDdwLMbw7omS_koW4Vw1Z<85 z)9nV1gAa)|On~7M&kuE`BM1PN?}%?%^)rD3i4OFiq3I_B8($v6t^pdc^&i4_SaIY$ zXRS6F6vp^~G{_4xh<5Zi+yMoWaPGdHCm0uJTGz4>Vc{U zz+R~r=!$;43WiFYqxbJ-(IfL|jt(z%@P-WdnnRn~B-v>zC*|i`wKf3IR`i;hwFX za}XJE9el%6W|)cTpy%%vGnOfB#qlWvYEn)xlGOmU`5*X!)(`G^C zCCmOtxAV89Qf~QaY}A{*2ViRMK{7~TebRkt{97rpdVMNtQF(4fOL^#Hw~?US`XcnS z!jy~$yVyAb`E_NwnihG9v|`XbJ-%Qp@1wsE--b-Y9h}$JP!azGoL+vJ;^`yEtHGq+ zy(LGlh9Q5x1^)NJyxlJwG5lZsEd~1jDFVv@;{&ue)sgrH8^J44`fZrN96->rM&wnb zar0TBL+Y^-4N|#_qv{#OMN`Y^P|s2sEI)BSHqv_88AI!Q!651)KAnLx?9lPk6b!1;RizisV};Mc-(cy?oEep6 z8(kh651WsuX(yIUMIRpKG8R-}j$?Tt=;lyrTAq6akhy zJ^0-8R)vO^fZ-oH6*CE8oex=Sv5h@|1=l~I1)sZPyLTFj!x)Ma4<$hLlo{lJ=^b%b zy?O+y;u>0IzN$6=F*Bde&V|7##b2(tVu#)6qB~QD!tjN_ysd^{E25IOOa|E6@{I9; zK|(eLA%oA|^M$3D5pQcTgdDAq@-{T&@|tRYz& z(P}Hrz!#X@pi}v&k0hW`;H*phho~Bbt$ORw0EtGb>k!EinAll+ttDGx?oOT2)LwMZ z+d@}Od%V{)om+AL#UoM&wFbyv>b(1b6keGri!=z(Y9QaLbu_EGkbP5&Ih+*Zw%W*a zG~h4b@u^~s_THTuL=)Y&O7QQEWLFLt|ZbVjbnq#6{|h>0bM)$T}AwP6x^ea83kN6M=jFLU*U6y z-UVW~o)s;eLh;Ni6dm9g0M#wY#-S279)$f;@I;)<6eJig*JKYSApyeD@1jrkXNE8Z z0+J=ZnQ$nEQOALq;?_V4^(PJ&gE{t|^(ih#gUi6>?s+pQeSq@>Q2>K1vY)9lmIyr{hnD6^T z0rNDPvdBmZTkwLE>S@X=hqa#n?Oew+$>GdlK9kh8(4@DO!kh=kKew}pfNvL+*_>bO zd1cu4o|k*~bvHjR)>*s@+wFSY;Q;J z99<)Ki=4Pm&UPJLDuUgnzVk76a|FIleEDJXBMm^B{=~zD4YgASB1X-|LEZK!xg3OR zveE0aJhO|Q8i%WRwOw)+>Vr&vGS zQfGntZ+3r?-?o}j#g@I1wQ;9}bz1&!6s9*TtwdO8q+72=nkZMT-Q?-BjySG6)M?qw zmb|g>K&IbP=2>=qv#k2gEE#{aOVshzV@>H(bK@ea=Tp&Oc&UUto6T|Ow;j=O|*4hYc#qd z*WCVnn(Pz%KTe@NN(1Bpt?Hz{c!;euid5AT?ps|PHK%+o!Y{=GXEpp>5@|>De1N*Y zUU5nWFtM0o;}}zl4$_x68bb1IJZ;fWQuQ!q3({$ay8IETa8$wf^rO3rEzzWlTSlfC zvFMisInqm+HRi3Ba60(FS&KH>ZPM~wk~X=UrGcHYe>HtqmzjrpMQypLS;5=F6O2pF zH&mriJwKeLmE663v3AXtDP1<>AOQn=@?sb?7S_Jp)VQno;}P3xH5&NZuR@6*#fTA?zkS{1Yk6rfT2*J;ri={RlF*2(3`#4N2Uf3c`RkSkE?}cc#WMhSgzZ9)82OmL>Z@WaMDsSMiEuN zkOWXd1k5UOOeU+=W2;o7jQ~-RHS47Z|FBdHi^>Q48PEj=6e{QrX&V`8@~hsk2{i7V zw#pAq3u^<7G@B^ZzJ#g#sKYK=#QDY2UDKX5obE0oLDLR7obI%_ETGQPgUdJR%vccM z7XKc2gCI3cQ$sc&4D7qp$T}XplDr|l6-5e6tmQRC^^mG8NH!hJ1OPfj?{G>ZyW<&Z zmS1b}Ym96d?C-BBskJv3 zkqL8_VZD6f5@trno&oJ83K?A$^#++8v2PCQ=Ie(ef##V{?0U@j=Er3Ec~FP9fja`K zTO@Cc&zOaE`!bxr6$kon?pVJ{_xcspzU%0tNi;uWf>e=}%T$kOHaM(@@@x5AFD74B zzIj!x@oP&)cA*epX0v#1bhRqqQt=xSRIeY4^#v}3@b7MOynvr7v)cWJ>pANb$6l2Y zaPy9y!c<*l<#vslz$j3!ir-m>D1r72cJOEWN`2MxUUtkjb$+zq%7P20lmpW;Yk1Wa zMJSS53}RD1x|%Lr@@qHJTV`?CpAheZ1azOM;Rwde1*xem6|cw@C0QE23K=nmWbfFx zitOu`&qdtIF95S0O+wk$v{X_6a7Bw8$uN}Vtc-%tL$RGyovEV3F#Bm?_r4|gYkHfy z@qClY0GD6Ic2Z`_VjcBGN3))x`pBi9quK*EBiea`4|y9zZ(lYXG$)bZc{R16w&PbC z>`*#I!!@s24xYe2$PFe#n9kEcJ?`cz10G-<{I}XFCjg=OUD+YXPk-%@6P!VO6>+Uq z{E^pso8IViO7HWzPTbq-j82))rCRue>C|odR@>|}?OKK>s`B z)rnzN5`eqGKe~%iqlNh(%|Gmn37v=+a2Wh_UZ?>V7ff-+xFO9;GYEMb#iyA*9ahA1 zL>e`Xsdz109Xw1yUXgmD3uSl%2cnaO$#$s_u3Fwzbc%a!zh?Zf-_$dH^h2J!&^Q8M8YVA{Kg>PP_t}&)sso z`UIImQ$w%w2TeyQLkrIxuw~-_U8F%PxdX@(ATaALz)(w;2v>3241g zAAnP9W_$AsYBgJ&QAZNdYoQ?y^vxfg0?TGXJK8b26N}4&7rpZK==1f{s7RRD!XI>7O&N`PDAR!J68Tq0^DvY_pq=}5|0WKEK*FQDfb=+zY6;9z9oCoEq zy2!cGeT6r6W|f+A%NvSG3LVz2l3%G&+3>wRj%k&&pTG2VU{|= z$hg!8ivcg|EY{m(l&TdCigX#7qouYwY^@4Kmwqm52AjlmSPom~|0r@>B2=2|ATT0J zTsX6y!62$bfiFx~5dNHDYuPnSMi#Hne0U?P=zq!0_W?WU4K3m12IuU-UP1E0SpgjQ zVC3tlijY&<+QUZujEMKOxuSNMK)OBiV_x(|`=$_yxv88JxwJ)!E*3-wDMni=(1Ovy zP*v5&=qk;9jH4Y;Pt7V(K@Sm@X=Pfv7AFKOv13@>5lf~sTG9YMKAyHmyt62i;o2I$ zEASP2u@e~9C{SRz|w*V!(q(efyyc=Y?G^%5Fq~t(tC1n z+hM2wZfl(9kfOCnd){B;PjOr7LrkGGjKVY8wW+_1PpvH( zQIBtqZ9b4pD%J2Rb6+~K$Yi%%>LRl><**Z;E0(+c?7e;Jy>0%zl5V7c9gqs^6h7>RpV~IK42VGmg=s zbt{XtY}Jic9X(X3bwkvtIb^})HGOfT_jvS(cIhIxt0wNrqr30J!`!Ifi8J0LT-qx) z;Ml7>)J0Nkl^LP$6z!H zPI3k8lpO%R-~1!t%+#j$gJ=i_y8{uaJv2v3JVZw832C5cKkFP zgh_&NUiVVaPt=SA8h4fzQ}j-6(U=?)x8^->*^&Pd(O`PdM$(S<8LQr4dTGMyD&Dwz z3l6g0QU$+n5^i=BclU#ed`ZJz;jS-vcv*e&0Tuwoe#}mJfl^3gFC!XGEApa<3Wk6S z0+xivr(m|yvBglq{38$h-GG}PMSXjM|F|Bk$SrO#$t}&X&>mjXP>2k$VyL4A-29eg zh-XPmA`dJ>UN*7{;>WyQXAPxA)B*6sEL`Z>(iaKo$h^7B=4R0*4sCq+?q;7)7J(0* z2VVe~Y8x(9nw}Y51$pGURa0%j84|=Zselp$v1K?t{21&lUG5~-4ok6^WF2J1#8S&= zaVc%4B1#nqKs9|b3tkk2_q2zOf@pE$5IcMT&5+pvR=`n!?Fgi}LMa_7f3~?A(0me) zINV5fL!nCutW1_d@gClUwX#?}YeJF!MkHV~5cX180rHY4WZQVOq^i;EoX0SDDOIW> zYkP~SH(h$8=~i@oeBy7F1j)!GG;0eT`{O~zQ~E`{qo^evi9NmB;zKoS2(Oiv^f*|< zDrXe*5DWp{IU!$0{S&HZfYf0O6T$JV51olrNlc^7Xtc>>Y5CMWm2{dhLICO+8acqS zc-n>8#-&Ws_{=c?-SgiEDvRaR-xDQUX8ag2@#uQwoQ4MzcAtV|%$DrUU-FBpqE;k% ztU9`hA_S>gL%2g67rdqT&=O*hNMue8AL}>vUJ-#DB3JJK)BA%!~?Z~?&5o%2_qVLj5O_tWwdzpwZZ<9%?b{{9-yfk$lU z#3fIa$`{Lt+^WPloj&^BY0E*(YvhH29pZ*F*oSMd4S72et%+!hu6>)1%?WDeG9 z&H0V$WO!3MIr(J8N==2yyq(wSoAW%iY3xgr4N#UAFT zcAxOAEEFKc_@f>9Lbx^VB^*v3NwpL#kxW}Cj2d}I zQ>ctuSzg#Po2bM3EbI|ojH=FRcf>*6F^{HH6H%h9I)`jk9${K2ZeSjlE19lNWHgWB zI4Velx1>^mjlZL<3%#7%2-wrH#q!Q9*q@K;$rp8L2hMj(0L;p z(~?`3a{I~8amz}Q-$Boms79haUlC$4NCIml3(%2P33ee7W^lC&QA2$$6hifDkls@^ zGJzE#GSmnav>Jtyh!c&GB+BFj^$R0Ww>|)gZc6Q32JxyLlYQJWf(0DgBp$C3r|1@i zi_5V_05vJ-l!v!uYKGyWFVLwRrqiu7qFHn<$G*FTT=eV%wmh~ zR%~e1F`uxS+jXvjPI2Jji0D?i>~CGy2EQctAu6i(jT| zHWDNAU+UMrvzn?2HK{Xwxs#BO1Ka`2q8*4yrR=cMUoIut-V-!uc>*bcZc%pX1y zD^5lBxY^XS{8~?_qReoORiJ%z{s#tct(dmPN^dzm?BY2fS=#RS{{B9B4boy`SR=9O zCE+w_)8NHYEDQnxSbU9BJr zb9@{3j$6KjC<4&!K*-H$n%1QFG=VPZwq{4uy6tyarh>fiR%b2F+tTSa#o*P+~5E&*GY(TSilQop6 z_=z|9;t05dn=SG&!a&a<=%WNR-MXa)VC_UO>mQ#5kCnxmDW(Ll^T$~!(_hoQrpa`g z`YC8bu;rjTYwlFMq1UQU4@o3$z+EtF?w`(1%Gd37c_KV#5r_`qedVP5OtyMfXQq!` zK<|P(YqCU*da}yB^)x|E9}Id{lMi;nWn#K)h5&G4FZYC4TK>kBtcQCw8^CKhLT@;N zvln3ELoF14Hl#3CMLD8vzL9mnaqKy5$%x2w;W@gD8S>`nBi`&=+a$JD4(C8UuAz|Z zjxHrpk^a>D@fZ|&qW;M!q>aZ9Q%l1-wplCWm!OD-f`F!M0{^Ko ztS*)^H%T{S`%ki>FiR_^uPpMQq>V_g(#F~!>6};8J+*cRgENTz$NJUw!FD#^7-PVw zoe$jM*^`ssv&q4I$w2ugK+9&rz#0P6)B)fKk#^NXxKiM$!@a;CH6@=kcHDc7?XnX9 z(Q$V9z#EN^YHC~L+-`)yqhKD=;e?@))9AS}&%W81$eIZGXT0TG2VWRJ6q||^E=B3e z#O%0QLqY<73_7z_fsvXW-pShFu|htB64Y<*yyrzPJfiECbs=kB3{-~nbzT4b5Ew#^ zL*m`_sU!Ratfbb2TZ5(GGGkf}ZqIC^B?kk6xxSS}wF|2l6mG5uPO-umm#bN2DXYA# znr7RB!tTTiRU>a?K4t%}7%cDR3$kq9-QS+D>-iG=O`jBOxSd#TN=+{8NdwIdAB0a# z-doW!)R!u(D_G=t3rg53gj{PCf!qHd_wmNtqZ0=L2xtK=iI9OBpnk4_s)6>)$4tx= z9Z98CO;ytzN;TY46G#Q3WhDv@-qPwSnQQ2h9`S!Q_7*^KJk9?w?(VLE;7%ZDaEIXT zPH+o;xclMm1b2eFyGw9)3j`1OU-Ek-Jl}e&-lMLLt?f@w&+JU^?6v{nL)SjHE`4iX z@@{YyqeuUdk(IUc)#u9iSNIE}&Bgee55fh5@x9vT?H6}GpWQFUNdfv#$Xx_FSwTFf zJ7$7h{Hr%GXg%PhC@>$xMFjYWd`V&5904g3G51$AcQG})a9jjj-m9XJhr(m1!@&GH zG>J}99&J*@O>QJL)P(N9ei-q|U%!TpZ_!70P#JmFqHAzcE_AvR_>=3PwU*)}kOkvkysi=IAwO zrCyuMH1mtzlns8!2p@OUUi<+^Q=t~gmr6J-x136F2)q@ji1989tuEtFtGMQ)S4k-a zgPKE`O>iyCr2@vkkuf(=X$>BthXROCB*UH{7~|N(U|^#E=;OAh@~G&7Sd4`*59B4X z{1k0k_uy+rn%wwFU?qVq$+|9Bws*z|VjGRssa#YPMLNLo!`Mi1mnaSHSbrmfgn?m4 zNN-q1GAFc5+ILzm_J~`cV(MlFwYOW=(Ec+U2Rq67+GkmD_hQX8kJY)11UbML##!W| zQ_O}ji;>2{qd;w1CE0?d#x=E(Xz4|FPQneCcllV2>59G5$7Wv1&W{x-sLWs7(3wk| zUlvL=f;_O1R|9Lb`gz)9;gq>PIuN8os@h_NrW%26-M?!icBf}2&)ZIJ__?(OCKLH4`; zxA$`)lPX@(%qm`CRVrRlc3$^t{q9}|z0lYj*C>Ky!f(su2xbh?N^!#rOi?jcWA4L* z>o@oc-(r;K%Pw-`(E1E83q+PSh04(Rm?luWx(v&5$|NeMF#8?jV~PXXsFP)}Lc6xL zFGRfZ8|R3Y#a*bYYYvCcU7plN`AP?sozdVL9KOB(4h1rsN6VPU4AieuTurwr6UGKn z9q%XEVGq1JI-P?pE-S7YQiEi?;Z35)&>&%O9p42I-`UPL|Dm&(95XuMTpJ zS`vEJs;GGPr2IdQ$tLGFM_Vpzpp4TBR37w4{d!{Dw{>&UN|Gtl6 zZt6fLl;k+^_EouaoMma;~W_$W)g~o!s?~NEG!}NL0Cx ztZu@pBX|i@*lx`6fJUf0MQ!O%9}e%7%ghEMuD}Sov*DZvE9Cc5b zCKPP7qWtQnPuZJ*uuM?>GFQO*gy2mcHwPS8MOUek&G&*rlp@nOq}z|mH=5Jc^g$8W zOPB0pN{uMQH|dk(9(`Q+C_70VctvlL-dfX&TNI-N$_l77?k)tHwr zkPnqtvTU>4+OW9=rN=w;4T6+w($|k+VyhUGcA`bkZ69(u{PWr8in(MAAcDW?;y=ls zPTY7_bLF21b3uc{#i|ms0e<~YZjjR=HLf~vFfcVpFfi^v-t*PNRDeV!Z5cu#td|M1 zwRz|Hrgn=HMk(*ml~J{$bS1RHk8pG}0`~^I=}5yvEritRw{{Iv9}fcra|ES5%#aFe zgb#ZsGFCpP_P(?{xFZ`NPMWg>nVY(4yqgYxujXC;^abO&@fi1@R3hb*Uic)1n)|a} zp`-a6&&RY)Y~A?{Hxa-WE~m9HUafj%e86fzVEJi4N(BedmBRu96<7^2VK;7Yb*UVk=?vWMh0LPaxMO=6gTzvZ<`Pa zS7aZ2wS4hqVJ}(F^5vIa05PWnT2f*QVKMPC%XDys!J4Kn7=%{O=5EiE31|eUL_q^+ zA4~8e8hg|G7_yx*bi4dU@A41((Xf8{Vzv|IVYL(V{2XwBy-w;K^D-$?h{SLUg~F~> zNsX$}*hGEDrWLIi71=WF5&4#~BE@dolkPEkW>IiAi_w+Q(4Lot;tj((qU(kKwPzPf z(&%nSEN!4@ONu_mT!djl(R?%?7^Q`S_lT^s#QXBxdO%UDr6*zAk;ch^J9|N+%ZX)g zN7ier+q@QTtR;k;&2Goo>wrf$4`Jp9MGEvEl@MHImy%9Wlep|~M)JgpN^@Mi&gV*o zm#>fJmZic`8t5(9WeWXo624Yg*3n?~6)~kGk4^hqGDa2gzqMl|&aXCHX|vY>nJ==( z0NU;sP5vTbPd4YtHm@=NarEYe4`jaqbc&?XS~g}Y;{%*T7$j&}E2=#V@{-SetH zkGLj@Clj%&qvaUS8qL~J*?bwDmqOZA<4xxi(3!q3w=2MhLOl=6jm;q#0%km{CVM2SuNi^au;AS z3O$SIl&(p4D1F0KhMfsDZzY;cxF3`VO#IeT^QDyMxYR>x`CJ@Z-1@7cThB1ltmZc+ zUQO~`vmiUQuFxA}vM>io3H!M&Oh;~Te;nQ0wi!t&wV*NWeg))bBtdoiXK?I>U%yCs z@NLBUnUUIpzN$XYbX8q`f&{(ELCydSNMU!fU!qjjad2%B-8Ex1i)%?r82{iXHSygT z-9n{%vDnmo9`4f2poIF)AM6dG^1R%oZ$H+h?;z4I2YIn&2cy@;sMZ%6z5+w1q3ST$ zwc)VXMWBXUE~DW^BF?0$$y!=Q_sxcI)JQk)+j;0-U7k~;nDt}Z4UxSBYEwHP4Dy`y zS7)c;2<6ABICex_4LiDZu1j!%f-Oi3GB>&Uk`|AP0B$1XDa{yd-URL1<;_%k2KcIx zTUBV-bdI_rm-S?~kNV#P_dmy!*+O=H|KW2SEAQNN(vQLlh@*C z6&~t})t=g+jKsyQ&B1HIOJm{5Bd7H)dU;-F!9@j|xxshq-zs?0Lzf|lJH3N34hEi- zqbh8J1K+XQqRp1RQLndBBZkT=!x!afJ>BJZEMT*s+XHBMNkDg)(r8!f0%{s4yhC>F zrd`9Sd-T$bT&VUTVqNBbA2Yl@ zY#!S3CfdO(o*wAwru*Tbi!Q;hdj$>&X-ynay*s@lpqSfLWIgPbWl2x;l7;!>(_tm< zAnn;2%i!#N6Ts&9rkD0b765~EIq0K{{5ia}u#z69CE$`@bTP*)LDk|jTFGF7Pe%9SFd7ek(#8@@=u90Ox()pol|-e+XNQ1ccpAjjgx&uIY8?dc|i$ zb=L0#+J|1Kt;YP=r&nUzp#nsUTCU=BOP)VF?+VVh5N`WL?sED?uy0T{M1I*r$LL7t z&sdbI74q16xdAUQdN={)m;7q?iP|OPrnw@@HvP2(YmN~^E@@wO@jvZ#C_I^$2j~g(Y9gK~b5Cl<>J40J zP6*$)L@r3cU$DUIUTz`Ba->Q`JCE+8<=CQGEPf&ElgRn?KaNJ5#&7EtL1rEWAhjtS zyYj@i0`0hzs-%?M=-4R3@Yv*z((U-9GMqdkD7D^47LHmr)><|Wb$eH26h#&`7LF}C zprR=u;U2_aX$09oc?l`*UA;y?Z1KT?FTErHeuZ}1UNW?G_e8qGuB8OOLhV92nX<}x z{0WpeaK!5Q!K&GU_OqwOC~b{r_XtYtbVrJJ>!C4dCGR5363MXe+;DPo*cI%FoZb&i z>9rSj%MsKcPs6k3DiXs}Mt$$eac-aEMuK^Y)^)Ujr_@wv-E%4O7*V{b-xem%1r$r{yGL0yKMh; zSVtat4}l3Xu7R>Q{w8lLmt%_qWi<)_BBv<;3~h41=NmNmYvq14p(T@)4lM|SuR+H| z3R^EaD?-wA9X?OGuj(33hxNRI2%{dT0|kALyH*H)vf_4LPrvJMzgV$bzZsll-T=e8 z8tX#aN5-?7uE{Z;_6??LNa0CRO|w=U43Aa~_G3I6GDs&+$`&-38nIn7!Yh#+^qA)Z zRBEjgDmKuvX*qoA5kSjQd7}9O9WrAsd65Y<<8lkBz!O#L=|#bZ-b5l|wCKQ4WsSJ; z74EC1LwoS@rRZAYSQ?{T4+&y%Wm-ELY!sJf@<`$Y1>MLe{m zlc$IN_?E!cUtsvbx2C=5Lds#aKbT9$KYZIKrTW?uv{a-t(6Mr3wSZV+%egjhD@80# z=4S$-P*Z6fu;s2FZMvo18g2K!18KKpo}Xma8?AIFABsBGOj7q?yxO7HvPG$!5rEU{ z#@v8Ma@z@?hPUEK&~11hY(Zf5nAy$7FB~Agjl-{rtOGC8YWOYH#8L}QzX|G>EXp8U z1ti^&vSeJg1*ARU&POM)@1h}s%-s9m1ZYOz6yL9y#-tUfC}qT>uHzvBB8Aos>Pyp=&9u2P`#r>NoWZwgl)(>u-vL z<9VAzNZvY@4Q(<_k5Ytq?pl@*Q)ESjb{5D+T07=m5WMWx5e)z#|V^FLaPa_{P z9-ok|#=^;|xFuK17Z3cA#J&dOj4)7Q5dEE%59O*Z1<{7Y*n}O6R2V#emmi-jVvcOh z09+yV;V+Z$pINJa~4> zm(Zd}gm$LBWJu^4MmV@EspMD2_~Q&mS~ISF*;}Yv5&B({M)#*N6j>|poT{a_L_8Cztq~Wu{e-0_rLlAA0xt$n zh@r>sY=f7yWdmS)a z@Ys5d`I6eOEzzgw{biH@rACG|+SIg@<3NqlC3)Qn-fy`jWt_7g;a8^0MM(C6`%NwE z?!f#ZviWCX=*QUBAhJt_0m|>D+x6bfT`cGqQ~t~|x`Y6jJAyAnmT%LntkiTXJfaQf zBmAPsl$+n}tar!hU5959_#kYp^thBx4KPB(tDxLF*J#pXxzAHyK$sj>61d1*r}5<{ z{vvKT!Y_KPLL$7<{PxDG*@`POt;6`TamY0=`(O@%?NI#^MjN9MU+rQELnvt_ou1HU z^H~{VosI^uMeMRSF3f7(AIxA`sn@8p=7>DWJlGCPsZ`(XS0_!p^D3T{MS_~14BI97`rs*B3~w<03pjs)x6Vb zWc4wLsQ!j&go8?DAhWSwhg~}dpZARm7WrjT{u&tIOhwDGGB!gXU9liAMjS{%eI_$C=Fm`S)6wwi|=~`}j@b zH8|dXRXim}@JBk(!)y~87#KAe5M_=6DBl1F_}7!{N~j@{_&}|gQ8~9kAVWU4oE9v) z7AP?s>*kw+fhC(6@TmTex#aoitd_t^spJBgcw70qL?+wxo078@pBArA*)PF9C&@42 zEf?+V7#IXrkABSu>+e^dvYaME0nZ0902q6u&iUBB+VB`FIKyU0%>>nQi%^erKsbW7 z$m&YD>$W?0=9eDqn6z+CY-WqYf!bguoufV;B5Y>YZR2}4BIXh|&HUxJ9H-rHRlTG| z5Jnxmw92!?cIu40#Vp$B7z7u?CVSCWnBidcRj#y%sy^X$CG%XFdWju+sq(FVyejgy z^_*`wmHyH9Sbn0Bh@nuF6vauY4{)k*^!cX2NOPFdAdTHy@xI8vuEK7x&1U&a!uPCz zo`kc6?^J^{N#oB(%Oir8+^ThMGkTh=bp5ntMp-~~#GRYfhT{~~x@`}M`Gw88BALV| zZ3PGjX^DO8MONwzC7Yo0LyOPAO0|Ma_C_-f(7*x6(ZCr(pFE8 zJcghgtJ5Jh6^8R~KVHtqkpQsRLVyml)_u{!`#>A`ynqN&6a2ErELDXs2qf+s6Vw_?iy4ch8TazOSfjOdp%Aas*cx;Y%ZN9uD|oV>5%i9U7f*uwd%aXrD_&#Xtho*8sn^6ZR#5~Foj<3!d=PXBOqeOJLqRDp9AEcKDXQ?$llE* zk;i}eDt(Rje$}-J*;iM*hK4_jYlPE@uyQ$ln)AXN_Qy$}AYqQ@o!&3O&Ex21qpH*& zZUHs{R9(DI^JZshbrxBTeKzuq&7|m3CvJFlaZ_^f)KSM6f;c?UWQ(`{BDxYJs5DD; z4@Nx>kuKd8(Xdw}*!qCkD;F=3el8a;M0J<8C_8$|4MtO(Pv(J#_b44@+n&$1)`hzL zcP`Ihf-3e?q@MXl-BwI%kKO3zi~|QaNy}9{6Gqa5F_*?Z@{Orb8NZtAqq8@QiJ(My zCN|-TNxMQ^o{@2LizX4?;fXz=$uV2Udl(gXneKS_#irVLzYbZgd} zr`u!;`q33rps_n=9FPfle4-F}d;$>9L>p@g$THCP6zV65C)7rN>C{kaor}+!Gfex8 zfDe(gi;xt4Uf+}yv(**^E;cq-4S>PZ%17N8AlA(x0 z0wVnlTpQ%MzB#dk^+oiDIi@;|5E3UikOIu8A0W9S1DjUJ=+1@lwzAY)Y6J)PFC2`2 zp>b5A?zAUtz|#D@$@#v!cPdA-yaG4AA$re4ft8PCyqK#5h*UmpLOB~^bf!z0So5#k zq?=G$D%`9(Olyv^Jw7FgB5L=`(w3ybiz>?N(9@Dsa+tJWc=8lgs!`d+@#sxiX}X?_ z;_dWQr+7bc0LSwnOYYzPteGWBdTSUvdACC%yRE0e?Tb4VgX@6COdciigiP=S`#P2%LeV(MU%;O>;u;|miv`K*emocdTq0*JZqwS_ z&@tA@?ufz~K248~^bCv0HdBaV99F-zv!;#{lukM%Wnpy?z@OSr}Ew}DJR zP!(sBG)Bc?rNF*xXcLS^33)A%~8I8kG#2%9iRMzJ6qt%V-U+-Y{F$2(-0iPs9&DZ+2I(Of#(37K2Tp{S>@J+s9 z9)2^M)ms$E=hNbr+Sd=K=z}x)AiGE9^g*Tma$()OvgC7qhX^XjBF0g@neR4MmB*BU z*8dUC>B5$FlftulN##R(T+YO2X#9M***lFZ#HEd%(a6J?j0{fvVD6SwyJRTc?UpwO zVxsL@H&dar%;rH9RIIqdbL)(>=#9yiXZ=2_60?l0isFPQVD-Y+(wI5t;yJcQdY3J4 zY|8((0Q}jOK6j3Q|0^H;?_)M=^+svXHWUh!5?ma}n)n77??(p^!s2K5V%Ri_YrNO& z4^LulEqpX0i;^}Heq$v(dj}4aVYY1Jnmo|C4cP2YPP;eox|P7cU?7x5guxU^@jRGl zKA7PDe0xx3w*k&^$p;Ckz$SS_<;UNifUM%&WR+vPS>op%Y$EfXj@u|Sk^U{xRU>Z# z5~1$i(C1kxeUCvvo}KcW4HwuR0raeyCmK9d0lMrhA?^Fxo%@+9)tm`a=F0?j+g2d^ zR#?{$Q0U!`WR(r#MsmVs%ZZ2ar_-=p#tOd*h93Dq_BmBSxXENaOJq}EH(nrb%Ya_9 zC*4GlDWbXcc-;7&WTD9WbIlx`;@l@q2!?3XlDb@iC_D|o0m9SMO9>Iw_+F^lK{g5# zriA%pfnk@?2g$FE58}#`c{j`-f}Itjh|y&mFe*BAT?lAa9x3%dH9t}2johr3aK+js zkk}fQtaiw=#dULH!dj$oL(!(TN}C#CYQto)wmomK>KkQq^;I{NQU3 zizHqIwg~hBZo^>Byf@?fik!Q*T;U_$<9s%xQJ(1{hpKJ!l zl8x8mRTT^{uo94uEH!AdQU1$Fk*Nvqr83|At7FX3+?ENA0vtw@BEp2q7lX_? zI5a#S45k|{GX16&@{!PP#%XxfC1vM6a;1k_MhNyuqbvq4C?9OO1Ec_AZ`b~3;Dqd>6*pLj806HS+~OIp_s2T9ee2@15E|FeLq0A`R;yuA9=E|@}G zoY6xDHKj5nAF|T-8?Z^h)V*^iU5e>JDnat0N8TOZUWt>os<$crq!~G)iaP+3Et5 zExnTDap8Kk1Sq>k`{`WRoLqffN0{h$ouVfWzPrz8ms~wO)MqgR;4bN+P6}7Zv@20A z3F16$e3=tAq6n&HkJt>o&~YX0+MDupJoX6e;4b^~)PeF9UST)yVBCNj=5-Uv-*GaT zjoG`j#W3#kH4ktaAy(;tHUwYU(SbE=1P$9R=(Ru_+`~G7mi43du*!dNTd#YiF4|?60NQIM8A8? zlFw*Ry=oQJUje!i8e2lnowMzzEp%kcK4?NpB2mt2$rhIb^y+N)j)NJI8-CC?mY3*$ zwe1f=md#aN8Otq+I4|Wi!%z~#WsM47?qRx+zrsrt(zSE-r(VLdjYu1= zj$@`sdZkWG9?khZ9}AhAGEVn3ENgj%UglX zoJQT-Fa28<+|3EY%1SL+!`ir?YD6_d=cndt=EJKng{>Rt7Oce=(yywYU18dXZ&~_M z9^qS-v*ONVW*pyB4EsPg2gr8FYxZz-n(P?RC+*u70`9+>Si_+_j6(|6)F2Y(?1rz6 ztI?4eHb7J1tI(5&S#YBG&OotUh>93S6L#iQVWM+q@tEFUgdP}OWkp2qd}_A<9CvmE3FF2lSHX5&|0 zSq_8yT89v3*H???A3mp28Awqo2J!Iw}Z-vJ}Sr-^=-vL+dw=ipXZkCqx zNoeshGb?{eY6z#fWXpA|sWOY}=4!WPqLmRxJdlxTSVJE-LbTj$&*5vVD>yxAG`xc& zbv&SAy#-ko>Tb@2;w*fXe=|HVk;&v)yH!iO|LqQ}O})p3Lx;I*a&uy7tG zV%|$91ofJ8e`$hafN9s2JdCQTbYr*T?!E%l1Za$5z`(3Yea3h8J!d&YbS@LpFW^m~ zE^wqIkhvJCl4@1BjjA;3{9q0lRHpf%2(Zv;>Y)3Hij1Qy)ZYdFBzYq z1MK!zd`+oFF$z)o<26lTHYW73@_3O1x;{fx&9}*pG7w_{_IQmG)6EmfDcNH=R4pn) z2aO#9E--Qjk>!`{3&b2#a~FjKOfJ^|&r|^y=pw75U-7+2H|#DUy^6b0XVzc@`}7y? z4FgEgZJSYu5-eay_p1tw$O&7hoI4WtHeDP>{R2|>k?LFto20^ANE0X3kzWV|lV)bS zuMb_zsECuVLx%b8Ud%3co<)=B8m^j_8H?7Z|3Q1gp0(gL1J|hn+ZbMvkr>Rcm+KkL(-Uw$EFNBzw?qiO{xxk*G-0 zr09<@+OHyfjyDmJ%fycwi0?N8$jCS_7*~WfOwUQy$pIzPu1u~f?Q7fJ%=X4KVb)~7 zT0A2MbPh9rdJZ?~^C^nz-PIt95O0Y{H=ZuQj~1SqaAiku+1}dU-gk8?$0twv;5DLG zy3FRZ@D`^0%qvQt^PUsk#Avw4)bpK-o+2UmMmynb`v_zDs5G)q=7z5#AS9A%6>)+f z-eM>@AV>t1@Qt#^etYd_n4jf&ai=gcY`DUAK2|$7d!EAvqo#+9C$nyqE6a1K-tMQ< zyXf!0+13KRefQZ+NiE`lb+l8U+w=#qY$x#*^#>w1VW|TyOb8{VJ!>MJr$iK{JqZ&- zEW9syBpCzA30dWQNSOuP0PNI(=8a?4I&ZxGiK)f@+>2JHIoqIs!VlwEu9bUTQw%@Y zDo=s}B*44Q%<{UwWvaxy`-0rA_`_IMszlpQcgoP!E|JiKFSUggC$TA^GI@xwFPe!x zeu!MM84-#eR`V?TYglk^Q?qUcp{%ow9Cxm^O6^R;Dhc^?W^NA^6M*iSoy&UhYf9XN znUTp4YIaXN^_PrdWJV&J8rRXa4a7vX@EG-$vLbp0CC%ab)p5>j*9)%$dubgqF5}J; zrbb_M_4T*3qXl0S24?QAG1R9e8a1U7xFEMrTrII`pcAxjes~aLf?hfW5*I11B zL5H&y4j{x$&Qen?9RX}>4se$64RWoxP*H55l(qR5=9|eGo^Z^B1Nc5ku8tG&TxY_K z3nk6ve%XIsDu0LZ0Cg|aa`=(vCpQZZ{ot8IQrt3}1>ub~{WQojr+34%muln}As1{( z^~<$PJJo!*%cPxl;Y#X54>R}=qdW_UC7<@6(c2P>D5OtRCYu0kGIpq7-ydU(@nN>9 z{Aku43zF&(N>L7V)beA71C`e>)tAb{X~c7thj7U!rIE5rxrvH<=0DHKqCPpeh>#kn zgv?Z<-&={LS1=GRkDi=~Md)xZ7T-sWY*GVoA&TlX!t7VAq(Ei|@D`R_PD-75F}@J@6P$-s;byf4_@gkntFF z@tqo{+{5WK)O;evZ>PQ#&shJIZkxw1_qS9N@<<`+em1-jJE_|IC2~XK9$0b!_CP~w z-S$&uYEB_PeI$!YffSqV#|&*dM^Q(1c-jbEQ}V#Ogu7{O9fvk@JJKj~o*_Fa=Dr)3 zw2wPwNDm&M6u1G;ZbRzaH6hf*1^zy1t8ZkAIf(W>S#(xKiir#0bC4cB@HK=K&EJc> zkffpb^OL3I!kGnmLCbg?-dJ_YX+njk3YP`dqxrZqD}R!yKGb2LQ;m>UuGh;JL1-k; z7L?=KgG(gNqxhH{@QAi|rwmP``aqH7`(=RHD&*N4z(J1+&aUS6kV%~Ae3RANDz2Q6 zCemD0n_b#v;kuPUl1AU>Sv(IV>_@_LO@*EIZOjI;<}WSB~{#c}yLxR-RY@-!D3 z8$*EvfUO|$1!5zLgJg?8>YXy9uJpkyj+R7nTo_=*lHNs`T~~_HnNoA8T1`}wkYDEP z1|#T*w?4`Tq4bVcm{buqGlwQ72QMaHK1-ChDP>znS}IFHcU6+to$_qkW^O#w`Ta#9 z{XNXL-k2#pAEeHh83CQ6sx5U(!A_CIs}N^?z^`cAZNVwVXZ4mu!J?IGP}!X#c!5|2~p8KQ0vfInZ>@0wP z#&HkOScSy7YpGreF#!ylb?Zr1!b2h0-puqoeh(hmnb%Wjs2Wn=^+u!B+)dZssgm4N zlOvhaO^_hGeM0LLtUAo^mqku|mon8P4SH65Lxdxtb~9hCBiz&iNT(7u&WlYUUd+J-J^{eX zM$>)$UD};pMNA3wpDdtdrxgymoDUY<=o2}ud<~=d*Wf^I&0R@ch(2+X$~ALQf^auko>-A;+q)K^m!PEvnSf|^>< zaVx1vV2)@TKC!RI&1yn7Y}z|=hSQ7g!ia^Z@Dq{TQj+Atg>Qo~G^DV}mjuk}N-7W6 zK9S8k1g>|Ib@>FdJc4a~*AAT0N8=!!)h?f1@$Iv70&nj%pZR>x@W`|{eb*GVzNdRb zvLP(EseUN&%=0s410or#jrc?VWs)zpF0?^XEV9vs#F5SALiN+xjg1HF)&sa4>=J+2 z@&-kHXPH{LU%3R@xlbuMVIIJ1Y31W)@s&v;js$p=jqlUNv?rc6Vzia4KTjggp?9{A zZ!GHf(HoIR^mwwq$(a~(zmWa!Yq7U#--YXN58u*_zpk?YW-~CVL1Uo+{$;Fok7%J_gJBRvX zb6=-(sSFt|Qt+e3?uA^IbAmC|y|ED^k)-g9?yJl{QU{9xz)pFAPQRkwziIKz`c?}!`C6+BcX4qio2QGJIX`HPF8Ur1smRBH@=78{KO}I z){Z3}L@Cw5$l1yN`2|j_kByigi+^{j&(ZSM6MSj$ZZ@8pmfy3au0z;Qf!ar*Qnt8O zeR!`zlDz8)8*)&FGpg$@h9md|O7d4I&Q!KxdgoOC4Hp(VpqM|U6+j@~oSI5voPl?m zd*CovkmHRc9Z7kdGA;rGSAUS(sV>wC>)N3s)QSt+1Bbn+mk~TWJLSWNd^SjI(TV?( zm@z~TN2dI;@}9VCD%`xUXMND|`1Cl^Xv;xOTjsBr zm(ALgkQ(;WAA>iAUjSO;XmZ>^t~VcvG|u^D^(NU>)Ka*`hs|le*O!vRga=yf4td?Y z6u3UZX)@xy4{x#8#q6FCX(d!|w5?Ch*NwhKsP~*YhmM)dX;*r1fIYiDcIN!{iA4ba z%%?tE%#(3HV#){Q%*6s!Ds39sLJ;+laC#l8zv*|1O>Q`@9?Vwu%8Ll^Ove@PmaY;4^_L)(Z-fEL-Zne=a9=g%lDt1ad{AB_oIQ z?3}@{SV@>Ay{j*LDwdhOS*Yl*fQ!mKPyG`_8yy+-?4QIhC@$H4WG2;xnxFzAx69@i zc7Uf0@B5u9eE_UIw4fw+$O=UgRYpJYdbwm%gaTDL#dvY{)iggmez}y!-~ie?z|{j< z$A=`YJJ`!YDAY!nYW_e6ul~2ZZSG{-P+I9(dw}!8fix1j%e{EezjJnT}m%f zRFwnOlrYU#QoNzyYPCLueWNlC1?bg~;#cEY{qij>mpw9sGSz$ULs&9)JJ#g4qM~F; zm!3ioi3aS7avc03k8(|DcBQM1k9Aj%=&*|tt`Q%4ZDV#u*sHL68d(awwR_GPfCbJD;w$VqwRkpOII_tILF zs?thL-^W6a8QZXAd^HcAq^a(M-dVSsMwgNl4bx8CtOK0dXKNRnine4 zoO_*RlA1abJ%ns1u&$6zxyllq`(10Fb_lPRi&utdyDM*zhnAb;Hq;SaDYkJGM~;)- zoeFvL&-S(fx;=X8%;SFEAW>r=lKwP3rw5*5`Hhi-ur5y##bVd<{wV#Ej45{-56y)c<` z7)rmupK$J{r}TH{@hhg&#=0eBIa@fNl1?qu5}QA}4Kqve(QU|eBn0>zPRJKz_go|F z49=^sE0-H*T6xkFdpg+oNq?oc|AnKZda7(&MR}VX?YtZe ze|%frwn@8(C8wd3Cb7K|nRuRaGf8Qf>SbZR<&3Wv_0VuWQ|eB6spB}W2zUN*fJvkp z7u)jX&78$kRJG^l?0$gRROyw7+^rkUk@Mu+_ju=2xMqjH`rlv1zzx{(H(X3H$n&qs z-S1}y{1k>nr7row+e22=by1P;d))*E2f>UiFF1Q_?ykUdVOVKeFa1sLm|5Jrv%795 z)2=Ih4gCvdE%N<>5%T?_5eGIQ-qOqBCoqTxAe3`>#{oJ;3{f}0c~%S4j~!t;CT<;0 zHHYQQtj#SJ=kDdL`<-%jgkvW%(mOI@!%)MYGw3G4+10`U>`2U8&9t&`ep@i&INm}V zlXwx+&Npzzde(ydZ^qk%^dbG=$qz9}xGvQ`9bMqonD2I<$l?aTGs1^+c;Gh-SMNS3TV<%fM86e%!KqqJ3JD%M;-q>A3hWsGXY?Z#!{dC|b zgCpgbIRGJLyGa?+nVwJkJuwIUz#x&qF@461;}&BF87lk7m<>>~BR3J9c*AD~8 zKS5Bp?kWWNmv0kE{(`Xt$dOSDSl&ym{{P26vYzeT-~N#_Ba_l{Otg)AbadnN!((y{ ze|#muA+R9-&q?HW6=$GA9}X`X*qIQhAuu^H6(L3`d2!~CGOwwAS9cZ!5vYK^SidR% z^(pWJ=JXK*{^Ixh1ZepFd_YS6UmrBEpF(M%|9_W#{$Jj|N&byM{1-i_+9C+i@h`-` za)A7Q0ztMAFw9rTqu)_EX#WcUPWIzL)%y{F1HnhI;|H+c{w4RTiqik#1qN2{2L|zf zt9g`Vq80^j0Gj zf7Aad#Pz!l7pRg5^(*?H*dThwziD4p9C<~nP5g(qEGP0mI`H4DtN+`9For)MIdB4C zXFv4c4ZTWV_^P24);}1^QG&ne|2OH(zajO0otfH zHht5WA`smn=u7j8zE%sE>q?2s`hSsI|Jzp}`qb~`mZklh2>5Y|?B65zo9Ta?qCrCN zzhauB2V{+*1@fl7)+)b2z^t*~93u@u9EpGnV?=**6vVaoH3(WFAt3$qnj?kr9|>3j ziC$gv-yHwr)C#%>alH~l^wS?P5)HTtj+uu!_4*%TcTOYzr~>N7}kmhbt)AU z*YtoylTQgkurtCdK_q0*}vsB#52H`J4W=tKokE^?sk-|K)fH z^G}Io=YC7P=L0!LQT)424EA(m&Y#_ZbHajQ5os3z?wVEd2M_ z{k%@>kU#Zm5~) z|CH}#{P$3*)q*Ja|IyZec0izZNME&e+5oKSCCB+F0}Wauppv+tzh01=t9|3|qyGo) Cs97KY diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9d7c377b..1d5b29fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Sep 26 11:20:52 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip diff --git a/gradlew b/gradlew index 91a7e269..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,47 +6,6 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..f9553162 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/runClient.launch b/runClient.launch new file mode 100644 index 00000000..664cf9fe --- /dev/null +++ b/runClient.launch @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/runData.launch b/runData.launch new file mode 100644 index 00000000..296ac5fd --- /dev/null +++ b/runData.launch @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/runServer.launch b/runServer.launch new file mode 100644 index 00000000..581f8b9c --- /dev/null +++ b/runServer.launch @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index af2ab34f..00000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'BloodMagic' \ No newline at end of file diff --git a/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java b/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java deleted file mode 100644 index 3cbeb4b9..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java +++ /dev/null @@ -1,29 +0,0 @@ -package WayofTime.bloodmagic.api; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * This annotation lets Blood Magic detect mod plugins. - * All {@link IBloodMagicPlugin} must have this annotation and a constructor with no arguments. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface BloodMagicPlugin { - - /** - * This annotation will inject the active {@link IBloodMagicAPI} into a {@code static} field of the same - * type. Fields with invalid types will be ignored and an error will be logged. - * - * These fields are populated during {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent}. - * - * {@code public static @BloodMagicPlugin.Inject IBloodMagicAPI API_INSTANCE = null;} - */ - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - @interface Inject { - - } -} diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java deleted file mode 100644 index ba7258e4..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ /dev/null @@ -1,77 +0,0 @@ -package WayofTime.bloodmagic.api; - -import net.minecraft.block.state.IBlockState; - -import javax.annotation.Nonnull; - -/** - * The main interface between a plugin and Blood Magic's internals. - * - * This API is intended for compatibility between other mods and Blood Magic. More advanced integration is out of the scope of this API and are considered "addons". - * - * To get an instance of this without actually creating an {@link IBloodMagicPlugin}, use {@link BloodMagicPlugin.Inject}. - */ -public interface IBloodMagicAPI { - - /** - * Retrieves the instance of the blacklist. - * - * @return the active {@link IBloodMagicBlacklist} instance - */ - @Nonnull - IBloodMagicBlacklist getBlacklist(); - - /** - * Retrieves the instance of the recipe registrar. - * - * @return the active {@link IBloodMagicRecipeRegistrar} instance - */ - @Nonnull - IBloodMagicRecipeRegistrar getRecipeRegistrar(); - - /** - * Retrieves the instance of the value manager. - * - * @return the active {@link IBloodMagicValueManager} instance - */ - @Nonnull - IBloodMagicValueManager getValueManager(); - - /** - * Registers an {@link IBlockState} as a given component for the Blood Altar. - *

    - * Valid component types: - *

      - *
    • GLOWSTONE
      • - *
    • BLOODSTONE
      • - *
    • BEACON
      • - *
    • BLOODRUNE
      • - *
    • CRYSTAL
      • - *
    • NOTAIR
      • - *
    - * - * @param state The state to register - * @param componentType The type of Blood Altar component to register as. - */ - void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); - - /** - * Removes an {@link IBlockState} from the component mappings - *

    - * Valid component types: - *

      - *
    • GLOWSTONE
      • - *
    • BLOODSTONE
      • - *
    • BEACON
      • - *
    • BLOODRUNE
      • - *
    • CRYSTAL
      • - *
    • NOTAIR
      • - *
    - * - * @param state The state to unregister - * @param componentType The type of Blood Altar component to unregister from. - */ - void unregisterAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); - - -} diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java deleted file mode 100644 index e99c1609..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java +++ /dev/null @@ -1,47 +0,0 @@ -package WayofTime.bloodmagic.api; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; - -/** - * Allows blacklisting of various objects from different Blood Magic systems. - */ -public interface IBloodMagicBlacklist { - - /** - * Blacklists a given {@link IBlockState} from being teleposed. - * - * @param state The {@link IBlockState} to blacklist. - */ - void addTeleposer(@Nonnull IBlockState state); - - /** - * Blacklists a {@link net.minecraft.entity.Entity} from being teleposed based on the given registry name. - * - * @param entityId The registry name to blacklist. - */ - void addTeleposer(@Nonnull ResourceLocation entityId); - - /** - * Blacklists a given {@link IBlockState} from being transposed. - * - * @param state The {@link IBlockState} to blacklist. - */ - void addTransposition(@Nonnull IBlockState state); - - /** - * Blacklists a given {@link IBlockState} from being accelerated by the growth enhancement ritual and sigil. - * - * @param state The {@link IBlockState} to blacklist. - */ - void addGreenGrove(@Nonnull IBlockState state); - - /** - * Blacklists a {@link net.minecraft.entity.Entity} from being sacrificed via the Well of Suffering ritual. - * - * @param entityId The registry name to blacklist. - */ - void addWellOfSuffering(@Nonnull ResourceLocation entityId); -} diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java deleted file mode 100644 index c18d3c1d..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.api; - -/** - * The main class to implement to create a Blood Magic plugin. Everything communicated between a mod and Blood Magic is through this class. - * IBloodMagicPlugins must have the {@link BloodMagicPlugin} annotation to get loaded by Blood Magic. - */ -public interface IBloodMagicPlugin { - - /** - * Register mod content with the API. Called during {@link net.minecraftforge.fml.common.event.FMLInitializationEvent}. - * - * @param api The active instance of the {@link IBloodMagicAPI} - */ - default void register(IBloodMagicAPI api) { - // No-op - } - - /** - * Register recipes with the API. Called during {@link net.minecraftforge.event.RegistryEvent.Register}. - * - * @param recipeRegistrar The active instance of the {@link IBloodMagicRecipeRegistrar} - */ - default void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { - // No-op - } -} diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java deleted file mode 100644 index 93e13c45..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java +++ /dev/null @@ -1,96 +0,0 @@ -package WayofTime.bloodmagic.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -/** - * Allows recipe addition and removal. - */ -public interface IBloodMagicRecipeRegistrar -{ - - /** - * Adds a new recipe to the Blood Altar. - * - * @param input An input {@link Ingredient}. - * @param output An output {@link ItemStack}. - * @param minimumTier The minimum Blood Altar tier required for this recipe. - * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. - * @param consumeRate How quickly the Life Essence is syphoned. - * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. - */ - void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); - - /** - * Removes a Blood Altar recipe based on an input {@link ItemStack}. - * - * @param input The input item to remove the recipe of. - * @return Whether or not a recipe was removed. - */ - boolean removeBloodAltar(@Nonnull ItemStack input); - - /** - * Adds a new recipe to the Alchemy Table. - * - * @param output An output {@link ItemStack}. - * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. - * @param ticks The amount of ticks it takes to complete the craft. - * @param minimumTier The minimum Blood Orb tier required for this recipe. - * @param input An array of {@link Ingredient}s to accept as inputs. - */ - void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); - - /** - * Removes an Alchemy Table recipe based on an input {@link ItemStack} array. - * - * @param input The input items to remove the recipe of. - * @return Whether or not a recipe was removed. - */ - boolean removeAlchemyTable(@Nonnull ItemStack... input); - - /** - * Adds a new recipe to the Soul/Tartaric Forge. - * - * @param output An output {@link ItemStack}. - * @param minimumSouls The minimum number of souls that must be contained in the Soul Gem. - * @param soulDrain The number of souls to drain from the Soul Gem. - * @param input An array of {@link Ingredient}s to accept as inputs. - */ - void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); - - /** - * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} array. - * - * @param input The input items to remove the recipe of. - * @return Whether or not a recipe was removed. - */ - boolean removeTartaricForge(@Nonnull ItemStack... input); - - /** - * Adds a new recipe to the Alchemy Array. - * - * @param input An input {@link Ingredient}. First item put into the Alchemy Array. - * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. - * @param output An output {@link ItemStack}. - * @param circleTexture The texture to render for the Alchemy Array circle. - */ - void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture); - - /** - * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's catalyst {@link ItemStack}. - * - * @param input The input item to remove the recipe of. - * @param catalyst The catalyst item to remove the recipe of. - * @return Whether or not a recipe was removed. - */ - boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); - - void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input); - - boolean removeSacrificeCraft(@Nonnull ItemStack... input); -} diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java deleted file mode 100644 index f51db50c..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java +++ /dev/null @@ -1,42 +0,0 @@ -package WayofTime.bloodmagic.api; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -/** - * Allows value modification for various features of Blood Magic such as Sacrificial values. - */ -public interface IBloodMagicValueManager { - - /** - * Sets the amount of LP received per health point from sacrificing the given entity. By default, this is 25. Setting - * the value to 0 effectively disables sacrificing. - * - * @param entityId The registry name of the entity. - * @param value The amount of LP per health point to receive upon sacrifice. - */ - void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); - - /** - * Sets the Tranquility value of a given {@link IBlockState}. - *

    - * Valid tranquility types: - *

      - *
    • PLANT
      • - *
    • CROP
      • - *
    • TREE
      • - *
    • EARTHEN
      • - *
    • WATER
      • - *
    • FIRE
      • - *
    • LAVA
      • - *
    - * - * @param state The {@link IBlockState} to set the value of. - * @param tranquilityType The type of Tranquility this block should provide. - * @param value The amount of tranquility this block should provide. - */ - void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value); -} diff --git a/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java deleted file mode 100644 index 0b92284c..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/event/BloodMagicCraftedEvent.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.api.event; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.eventhandler.Event; - -public class BloodMagicCraftedEvent extends Event { - - private final boolean modifiable; - private final ItemStack[] inputs; - private ItemStack output; - - public BloodMagicCraftedEvent(ItemStack output, ItemStack[] inputs, boolean modifiable) { - this.modifiable = modifiable; - this.inputs = inputs; - this.output = output; - } - - public boolean isModifiable() { - return modifiable; - } - - public ItemStack[] getInputs() { - return inputs; - } - - public ItemStack getOutput() { - return output; - } - - public void setOutput(ItemStack output) { - if (isModifiable()) - this.output = output; - } - - /** - * Fired whenever a craft is completed in a Blood Altar. - * - * It is not cancelable, however you can modify the output stack. - */ - public static class Altar extends BloodMagicCraftedEvent { - - public Altar(ItemStack output, ItemStack input) { - super(output, new ItemStack[] { input }, true); - } - } - - /** - * Fired whenever a craft is completed in a Soul Forge. - * - * It is not cancelable, however you can modify the output stack. - */ - public static class SoulForge extends BloodMagicCraftedEvent { - - public SoulForge(ItemStack output, ItemStack[] inputs) { - super(output, inputs, true); - } - } - - /** - * Fired whenever a craft is completed in an Alchemy Table. - * - * It is not cancelable, however you can modify the output stack. - */ - public static class AlchemyTable extends BloodMagicCraftedEvent { - - public AlchemyTable(ItemStack output, ItemStack[] inputs) { - super(output, inputs, true); - } - } - -} diff --git a/src/api/java/WayofTime/bloodmagic/api/package-info.java b/src/api/java/WayofTime/bloodmagic/api/package-info.java deleted file mode 100644 index 9d563054..00000000 --- a/src/api/java/WayofTime/bloodmagic/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API(owner = "bloodmagic", provides = "bloodmagic-api", apiVersion = "2.0.0") -package WayofTime.bloodmagic.api; - -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache new file mode 100644 index 00000000..3d4fa05e --- /dev/null +++ b/src/generated/resources/.cache/cache @@ -0,0 +1,170 @@ +cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerationrune.json +4a60c54def00d68368ed0a0d4783979aa63d5f60 assets/bloodmagic/blockstates/altarcapacityrune.json +950fff9f06033741091aa8a66a62857da673efb9 assets/bloodmagic/blockstates/bettercapacityrune.json +8a5edb859a6f4d0adfbe2f608bab6b8c8addf01a assets/bloodmagic/blockstates/blankrune.json +904d9baa649250571bce5f965cf48fbec69c2c1a assets/bloodmagic/blockstates/bloodlight.json +631b579c38652efbcd9e5771d09ad6e476f3ba00 assets/bloodmagic/blockstates/chargingrune.json +6bd58d1d02a40416cec29409dee7ef80038b26d5 assets/bloodmagic/blockstates/dislocationrune.json +372ecd737f7082a4c2c70e46745f893b1179f885 assets/bloodmagic/blockstates/orbcapacityrune.json +285618c1a8ec36e36d479f577190579ae7616529 assets/bloodmagic/blockstates/sacrificerune.json +b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json +487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json +f7a92ca94cbd68344d89b92dc6c26c15cd1b85b5 assets/bloodmagic/lang/en_us.json +34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json +3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json +7cd62092c6fb3109e016d42090cf89bfa3ab7fca assets/bloodmagic/models/block/bettercapacityrune.json +1fe0f89895addb7abcacf6ce7e39b6ddc87b0d85 assets/bloodmagic/models/block/blankrune.json +3c83e090a1cff00e2bb2c7eb475785954b6eb980 assets/bloodmagic/models/block/bloodlight.json +320827ad2feaa51a90ebb7064a70bdc6d3765203 assets/bloodmagic/models/block/chargingrune.json +6adbeedc17f649ef47419845a6da0d50cfc76742 assets/bloodmagic/models/block/dislocationrune.json +c3a813b735cd229f8597e41d04465926b2e65fe1 assets/bloodmagic/models/block/orbcapacityrune.json +a8a1d06fcc2f8395530c72d2846133fff37d5537 assets/bloodmagic/models/block/sacrificerune.json +791c9f2e27215ff0a45eed7efe385276bfc09aed assets/bloodmagic/models/block/selfsacrificerune.json +65fe5e01ed2660e45a5c329ff2389a87e4d791ec assets/bloodmagic/models/block/speedrune.json +9462d62d9bc9408359d30728de8651dc104aacf1 assets/bloodmagic/models/item/accelerationrune.json +17cbe9142ef3950ea1b6be11694b849f55e93f13 assets/bloodmagic/models/item/airsigil.json +f150f178edf7d6d250bcfd84af1c28a21cff09c6 assets/bloodmagic/models/item/altarcapacityrune.json +866b8cdd3da56e2e82dbd5f16ab5117b5a503749 assets/bloodmagic/models/item/apprenticebloodorb.json +719e38516b76596e177809508b4e2b28f05acfb0 assets/bloodmagic/models/item/arcaneashes.json +b95ae11c1910a67770fcdc0c7704282ce7b3f564 assets/bloodmagic/models/item/basemonstersoul.json +cbf1f930da06b0d1194760411a39f55b8ced1189 assets/bloodmagic/models/item/basemonstersoul_corrosive.json +09839c1f062c6a9ef143d81b6ad89065a9f4e39f assets/bloodmagic/models/item/basemonstersoul_destructive.json +23e9b2f79cea038b8d4c840854946ebedd444532 assets/bloodmagic/models/item/basemonstersoul_steadfast.json +f5bcdfe42e526de447df29ed801798bb33a90dfa assets/bloodmagic/models/item/basemonstersoul_vengeful.json +d3c33ff908880e7abc8a2cd977304419ec48a23d assets/bloodmagic/models/item/bettercapacityrune.json +7a1c55d55fe59d8a70bc2a867d127cb303c1ba23 assets/bloodmagic/models/item/blankrune.json +3f207755d189c316cf06734a268669afc6b77766 assets/bloodmagic/models/item/blankslate.json +ef26c203159e9f55672ed5ea75107d4a9d081cfe assets/bloodmagic/models/item/bloodlightsigil.json +7315e49149eca494e6b132d383082cb76fc9c0e4 assets/bloodmagic/models/item/chargingrune.json +f404148f9df3a61da3c18175885ffa56b2a85a6a assets/bloodmagic/models/item/daggerofsacrifice.json +9671199681493a396e07d7bcab20137c22d981d5 assets/bloodmagic/models/item/demonslate.json +7af07ab578bbd20e2f834b26d9cafb5fe23bc7d4 assets/bloodmagic/models/item/dislocationrune.json +f4531e22aa1db1cff324db5ccb344d3b9fa85c8d assets/bloodmagic/models/item/divinationsigil.json +4c39378f6c14dc243a7d52564e5a21df94683415 assets/bloodmagic/models/item/etherealslate.json +44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json +f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json +109b5485c25d978af55b46682d5bfa7008909458 assets/bloodmagic/models/item/infusedslate.json +588c5208e3f4ef941cd8375aeceeed44484d85d3 assets/bloodmagic/models/item/lavasigil.json +15d8178b626da912334774142d40d1012fb21fa0 assets/bloodmagic/models/item/magicianbloodorb.json +0a3566d3c86403f24c22977dd32ffaec727a9ad3 assets/bloodmagic/models/item/masterbloodorb.json +7596826c5b40c2809eb0a42eb5f5f2089290e3e5 assets/bloodmagic/models/item/miningsigil.json +ff9b802098659824626dc90dbb5a0d8960234228 assets/bloodmagic/models/item/orbcapacityrune.json +b4e1259784354b048cd7ec5ef888a182e3909dc6 assets/bloodmagic/models/item/reagentair.json +919b17ed4620c7b76c86494683951ab6e7fc7864 assets/bloodmagic/models/item/reagentbloodlight.json +c0a7633527bdd25fc85e78fc4838733063726d88 assets/bloodmagic/models/item/reagentfastminer.json +4ff6b8f6943d96a0f292ff4e0b0973edff550229 assets/bloodmagic/models/item/reagentgrowth.json +c82717c2706ec2ef1518f95c6aefdff9bdae09b8 assets/bloodmagic/models/item/reagentlava.json +baafdb5915c5fbc99b84a54670ed64a6f26cb0fe assets/bloodmagic/models/item/reagentmagnetism.json +95b2925e96a7df71d72568e0ed7b03290293cbe7 assets/bloodmagic/models/item/reagentvoid.json +fd1447d943ddc4540a51a72dcbb245d77d45da71 assets/bloodmagic/models/item/reagentwater.json +50bf796adbed412488df48ed9250fc9b0ecd851f assets/bloodmagic/models/item/reinforcedslate.json +db73abb3bcb1731b6fc389e3577910b6aab87b10 assets/bloodmagic/models/item/sacrificerune.json +9403d6195d4d38d5876c2a42f4edfb9bdcd05210 assets/bloodmagic/models/item/sacrificialdagger.json +cc71421e98ee7ee047a4cfbb6cb69529c2b02d4e assets/bloodmagic/models/item/selfsacrificerune.json +ea5747638d0b5dcc03f008b202cc60a11e0827bb assets/bloodmagic/models/item/sigilofmagnetism.json +9ec68a2dcf04b987c3c5d5c6c52195e3deccacbb assets/bloodmagic/models/item/soulgemcommon.json +ad010d9680cd748bd04c8fc36262c236f7d90105 assets/bloodmagic/models/item/soulgemlesser.json +b49e7f34913e32ccb68eeb6f6c196ff6b209f482 assets/bloodmagic/models/item/soulgempetty.json +f8db155d49b0f2c37504bac46a8974d4bf90db3e assets/bloodmagic/models/item/soulsnare.json +fe2b201007c974229509f6900c6eb8b03d158b0a assets/bloodmagic/models/item/soulsword.json +52d21027ac6fed000e77b5e8ad9102319b25cb33 assets/bloodmagic/models/item/speedrune.json +e8fe01c5cddc268538681889f3161472a8f1c8ad assets/bloodmagic/models/item/variants/growthsigil_activated.json +20c802279de4df496057795c2e891fa54a21376f assets/bloodmagic/models/item/variants/growthsigil_deactivated.json +2778ea3a62ce6dd718a557beee7b5329bb185ff9 assets/bloodmagic/models/item/variants/icesigil_activated.json +11f5516cea8ac65bbb0f5958d6492170482ae8d8 assets/bloodmagic/models/item/variants/icesigil_deactivated.json +be3772fd711ccf4a2adfad122a8b39e8a36e874a assets/bloodmagic/models/item/variants/miningsigil_activated.json +7dec45f3167426d975564692a80196cdb3f4bdb4 assets/bloodmagic/models/item/variants/miningsigil_deactivated.json +79c61e61656a934397c92626809c1869b0617fc3 assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json +129ace1f4a25f22bd09215603248a25adcf234e0 assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json +cddaa2be8db3aff90933fb772b92cab735ebf11e assets/bloodmagic/models/item/variants/soulgemcommon.json +874aa708d02de2315e29033b2f67fd313edc8aff assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json +3ca3c4251a8907c1c47caf49e53a711265e0e92c assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json +3ad2785d3e893943ea769c7e39d69cedd71e556a assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json +016ccdfb8a6e0101975e64f9f548e6a93d32f53c assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json +2b2322dfd3f7e28ea5d0ad2d9df2223d7ee47f00 assets/bloodmagic/models/item/variants/soulgemlesser.json +8eaab2fddfe201dc83d2d2ffd65e1537a3e5a388 assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json +24608fc7a19e41d71ec84a80c18ceccbc869cd79 assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json +1ef6dd3ceed7f6ffd3e91283146fbe3f6db46d10 assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json +7801bda9366c21aad10137d30151ac4154acbea1 assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json +0b37376d07ecf8ff91df345435abd5d94d28714e assets/bloodmagic/models/item/variants/soulgempetty.json +fb9e51a933316daa4a99b6e6c9a2606dc354f0dc assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json +0a15d2c90a8d139c1689579460379e5feefaddec assets/bloodmagic/models/item/variants/soulgempetty_destructive.json +a94516c3019969baa379f4a32d68736010cb473a assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json +eabd2e88451ef42250e86c6675868b322aa0db92 assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json +0cd32e8e693d85b8a81e96ea305ffafb4a72e861 assets/bloodmagic/models/item/variants/soulsword_activated.json +60831276c8b0a5ecfa8e1a7beee6c5a4838cae69 assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json +792bb3a3e613808890cf0c31585318dc8e16891d assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json +ba7a7366b1471dd58b27b523bde130e39220fe01 assets/bloodmagic/models/item/variants/soulsword_deactivated.json +ef838be270d9d87651aec70c6b59197b01e48a6c assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json +ec6f6bf7f520182b2044f3cc5a10f1d4c7a8d7ab assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json +149f3e3049bd4f4ed559e56db79027bda9e8478e assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json +7d22fdba9bb8593c247a0b33df11f3b26a16c254 assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json +2029220112f89a3f4d432ab4749dff6143846659 assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json +0f5a3e1e5993a03ccda156eed855b71fbd0be0a2 assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json +836b5a7f19915af809795a72983a23f0d5f9c5b2 assets/bloodmagic/models/item/voidsigil.json +7426fed5f833ce3d08602f727f1467dd3e107991 assets/bloodmagic/models/item/watersigil.json +f72efc172699d43405019add97f455bd6b7f452b assets/bloodmagic/models/item/weakbloodorb.json +828c0f89e747d48d37c6a86030a8ec59ca5c29cb data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json +f8b66411c96c6a7a409fb10f6888d078f1f8fa14 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json +ab5612f33028487c08e51de4b91bb786df1b1b95 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json +e59e508cdbd51f62f83559edeb5f2a89226d7694 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json +e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json +4a53004c651901cd1245de452810161736d9b067 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json +263f7c251d2f163db5bd229f2ab8a222f23ae03a data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json +7ca400d1141ff4be1b529cd060950b42cf3b9bfb data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json +832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json +2d29dd0c24c4c11d7438cdeeb26b9357d4359e2c data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json +7a7f9f995d2414289d07c0a145647c8e735a6b78 data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json +639ebb2ccabb2eaece59be96c2e6f28c31f4d2f4 data/bloodmagic/loot_tables/blocks/accelerationrune.json +443550be9eaf1021b11fd2bbe6afcfe2cee6f7ad data/bloodmagic/loot_tables/blocks/alchemyarray.json +17d8dcc62320d5d2eeb781e925963d9b9d5eec54 data/bloodmagic/loot_tables/blocks/altar.json +05bb6268d7e884c962061a632e162d5baf73271e data/bloodmagic/loot_tables/blocks/altarcapacityrune.json +87d44fa5143733864c12608443d11744b91e0496 data/bloodmagic/loot_tables/blocks/bettercapacityrune.json +867d0fa555de94140215d9edb7cd7ae533bbc619 data/bloodmagic/loot_tables/blocks/blankrune.json +f1a8e3131d85077665563372cad868534a72fb31 data/bloodmagic/loot_tables/blocks/bloodlight.json +779b809a2a51e6dab46f9e6799249f2f14653ebb data/bloodmagic/loot_tables/blocks/chargingrune.json +a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/dislocationrune.json +95442c1bb740fab2eb8ee051f7184813f6023afa data/bloodmagic/loot_tables/blocks/orbcapacityrune.json +e0239eff7762a414a4e4faa0158d844dffb8c1f6 data/bloodmagic/loot_tables/blocks/sacrificerune.json +9b697e37046b6238b3a19eae9113b88010ccff32 data/bloodmagic/loot_tables/blocks/selfsacrificerune.json +f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soulforge.json +015e07226fd90935f7ec663f4bcf3873a57a82d1 data/bloodmagic/loot_tables/blocks/speedrune.json +f41b0e9dfab608c42a85c3c5c5bbc050b03f02a1 data/bloodmagic/recipes/altar/apprenticebloodorb.json +2a67e37497a571b5ee944375d315fddccea87697 data/bloodmagic/recipes/altar/daggerofsacrifice.json +c5a4a256a7437f2e13c574a6f0c4d75fc2e718cb data/bloodmagic/recipes/altar/demonicslate.json +9aeb0d2d33d839eedb2d9bbdaf76fc73e0b39941 data/bloodmagic/recipes/altar/imbuedslate.json +2643d1516f6dae79128fdc8c48c4cfe23453f171 data/bloodmagic/recipes/altar/magicianbloodorb.json +f38355165034ce314a9f0344ebc3a6cad22c76c8 data/bloodmagic/recipes/altar/reinforcedslate.json +584d01dff4d64bb88bd3783751a29723700f1728 data/bloodmagic/recipes/altar/slate.json +7551501cf361667ec7454c307b9d2368536fbed6 data/bloodmagic/recipes/altar/weakbloodorb.json +e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json +d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json +1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json +4bd220ced486f1d8fc4468ebd61dac755670d716 data/bloodmagic/recipes/array/fastminersigil.json +f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsigil.json +78c880321f0bfad14239d4b9d2edae170a7fa86e data/bloodmagic/recipes/array/lavasigil.json +8b1007de1b7fca5d27b54d7c9839cde9e47ab1c0 data/bloodmagic/recipes/array/magnetismsigil.json +cabe693e7c714203ad708a1068f302b3ee3120b0 data/bloodmagic/recipes/array/voidsigil.json +5e68d933fff631142a8dd819aee235d343d43cff data/bloodmagic/recipes/array/watersigil.json +de8dbcf4d69bd3b47693c4631578a9b5c0e3f50c data/bloodmagic/recipes/blood_altar.json +68edddac5949c404e00b2ebe897c9fd3045cb907 data/bloodmagic/recipes/blood_rune_blank.json +5c4e4af372250a3f967666f0f97198547cfbd5e1 data/bloodmagic/recipes/blood_rune_capacity.json +f905c1a8ca4d3a9f841ca6c44caa91de327fc29d data/bloodmagic/recipes/blood_rune_charging.json +89563d5c176d465632a45005cbe5e570791fd8dd data/bloodmagic/recipes/blood_rune_orb.json +b63d77c3762f86d4a91f62e192c3e9b26e3b52ca data/bloodmagic/recipes/blood_rune_sacrifice.json +7c4e247c1df6ef594bbb2fc2196afb102f45982b data/bloodmagic/recipes/blood_rune_self_sacrifice.json +e2bcf2a6f951fbcef45554ec90ba28d14e261d18 data/bloodmagic/recipes/blood_rune_speed.json +aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json +d699e777c72a5f61c4e6cdfea8705628e1c2b855 data/bloodmagic/recipes/soul_forge.json +2455bf8c205c7244fef2b7d7afeef060e30520b7 data/bloodmagic/recipes/soul_snare.json +f4763a58a8f471ec1aaa997cbd36eac8c7d51a12 data/bloodmagic/recipes/soulforge/arcaneashes.json +8b64af8453c60b6b1ae55bd0dd1a68fe95e8ba19 data/bloodmagic/recipes/soulforge/commontartaricgem.json +d46b61779b3c8382862d4e66c3909a1241ecca18 data/bloodmagic/recipes/soulforge/lessertartaricgem.json +d6e06747c75fc06e708a15358911f1c63eee86b1 data/bloodmagic/recipes/soulforge/pettytartaricgem.json +6b59a7e95e596997b7bbb894b6fbaf5015b213b5 data/bloodmagic/recipes/soulforge/reagent_fastminer.json +ae3a6a760e9f793d5a62e2f0f6c45219b0017816 data/bloodmagic/recipes/soulforge/reagent_growth.json +1c391181ea77f5ed01f7226e0782b3b45162ab3c data/bloodmagic/recipes/soulforge/reagent_lava.json +e517023dc3e32929344ff5415397fc833bfbc29a data/bloodmagic/recipes/soulforge/reagent_magnetism.json +c0e75e0e12290d191245c5b0b5b13bc739d2ff44 data/bloodmagic/recipes/soulforge/reagent_void.json +a222d09abf1ea61feb684f2ac23d011c2034f526 data/bloodmagic/recipes/soulforge/reagent_water.json +7e281841a2953c1284d332c2bbf75097f8128241 data/bloodmagic/recipes/soulforge/sentientsword.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json b/src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json new file mode 100644 index 00000000..dc97d5de --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/accelerationrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json b/src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json new file mode 100644 index 00000000..f5a088ea --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/altarcapacityrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json b/src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json new file mode 100644 index 00000000..ead6c945 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/bettercapacityrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/blankrune.json b/src/generated/resources/assets/bloodmagic/blockstates/blankrune.json new file mode 100644 index 00000000..d211f0a6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/blankrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/blankrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json b/src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json new file mode 100644 index 00000000..dfa612f0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/bloodlight" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json b/src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json new file mode 100644 index 00000000..5c238290 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/chargingrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json b/src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json new file mode 100644 index 00000000..e788f3d5 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dislocationrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json b/src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json new file mode 100644 index 00000000..afa6fb84 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/orbcapacityrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json b/src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json new file mode 100644 index 00000000..1564fd64 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/sacrificerune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json b/src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json new file mode 100644 index 00000000..05620681 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/selfsacrificerune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/speedrune.json b/src/generated/resources/assets/bloodmagic/blockstates/speedrune.json new file mode 100644 index 00000000..9ebf2703 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/speedrune.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/speedrune" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json new file mode 100644 index 00000000..bc3f1ecf --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -0,0 +1,115 @@ +{ + "block.bloodmagic.accelerationrune": "Acceleration Rune", + "block.bloodmagic.altar": "Blood Altar", + "block.bloodmagic.altarcapacityrune": "Rune of Capacity", + "block.bloodmagic.bettercapacityrune": "Rune of Augmented Capacity", + "block.bloodmagic.blankrune": "Blank Rune", + "block.bloodmagic.chargingrune": "Charging Rune", + "block.bloodmagic.dislocationrune": "DisplacementRune", + "block.bloodmagic.orbcapacityrune": "Rune of the Orb", + "block.bloodmagic.sacrificerune": "Rune of Sacrifice", + "block.bloodmagic.selfsacrificerune": "Rune of Self Sacrifice", + "block.bloodmagic.soulforge": "Hellfire Forge", + "block.bloodmagic.speedrune": "Speed Rune", + "item.bloodmagic.airsigil": "Air Sigil", + "item.bloodmagic.apprenticebloodorb": "Apprentice Blood Orb", + "item.bloodmagic.arcaneashes": "Arcane Ashes", + "item.bloodmagic.basemonstersoul": "Demon Will", + "item.bloodmagic.basemonstersoul_corrosive": "Demon Will", + "item.bloodmagic.basemonstersoul_destructive": "Demon Will", + "item.bloodmagic.basemonstersoul_steadfast": "Demon Will", + "item.bloodmagic.basemonstersoul_vengeful": "Demon Will", + "item.bloodmagic.blankslate": "Blank Slate", + "item.bloodmagic.bloodlightsigil": "Sigil of the Blood Lamp", + "item.bloodmagic.daggerofsacrifice": "Dagger of Sacrifice", + "item.bloodmagic.demonslate": "Demonic Slate", + "item.bloodmagic.divinationsigil": "Divination Sigil", + "item.bloodmagic.etherealslate": "Ethereal Slate", + "item.bloodmagic.growthsigil": "Sigil of the Green Grove", + "item.bloodmagic.icesigil": "Sigil of the Frozen Lake", + "item.bloodmagic.infusedslate": "Imbued Slate", + "item.bloodmagic.lavasigil": "Lava Sigil", + "item.bloodmagic.life_essence_bucket": "Bucket of Life", + "item.bloodmagic.magicianbloodorb": "Magician Blood Orb", + "item.bloodmagic.masterbloodorb": "Master Blood Orb", + "item.bloodmagic.miningsigil": "Sigil of the Fast Miner", + "item.bloodmagic.reagentair": "Air Reagent", + "item.bloodmagic.reagentbloodlight": "Blood Lamp Reagent", + "item.bloodmagic.reagentfastminer": "Mining Reagent", + "item.bloodmagic.reagentgrowth": "Growth Reagent", + "item.bloodmagic.reagentlava": "Lava Reagent", + "item.bloodmagic.reagentmagnetism": "Magnetism Reagent", + "item.bloodmagic.reagentvoid": "Void Reagent", + "item.bloodmagic.reagentwater": "Water Reagent", + "item.bloodmagic.reinforcedslate": "Reinforced Slate", + "item.bloodmagic.sacrificialdagger": "Sacrificial Knife", + "item.bloodmagic.sigilofmagnetism": "Sigil of Magnetism", + "item.bloodmagic.soulgemcommon": "Common Tartaric Gem", + "item.bloodmagic.soulgemlesser": "Lesser Tartaric Gem", + "item.bloodmagic.soulgempetty": "Petty Tartaric Gem", + "item.bloodmagic.soulsnare": "Soul Snare", + "item.bloodmagic.soulsword": "Sentient Sword", + "item.bloodmagic.voidsigil": "Void Sigil", + "item.bloodmagic.watersigil": "Water Sigil", + "item.bloodmagic.weakbloodorb": "Weak Blood Orb", + "itemGroup.bloodmagic.creativeTab": "Blood Magic", + "itemGroup.bloodmagictab": "Blood Magic", + "jei.bloodmagic.recipe.alchemyarraycrafting": "Alchemy Array", + "jei.bloodmagic.recipe.altar": "Blood Altar", + "jei.bloodmagic.recipe.consumptionrate": "Consumption: %s LP/t", + "jei.bloodmagic.recipe.drainrate": "Drain: %s LP/t", + "jei.bloodmagic.recipe.minimumsouls": "Minimum: %s Will", + "jei.bloodmagic.recipe.requiredlp": "LP: %d", + "jei.bloodmagic.recipe.requiredtier": "Tier: %d", + "jei.bloodmagic.recipe.soulforge": "Hellfire Forge", + "jei.bloodmagic.recipe.soulsdrained": "Drained: %s Will", + "tile.bloodmagic.soulforge.name": "Hellfire Forge", + "tooltip.bloodmagic.arcaneAshes": "Ashes used to draw an alchemy circle", + "tooltip.bloodmagic.config.disabled": "Currently disabled in the Config", + "tooltip.bloodmagic.currentBaseType.corrosive": "Corrosive", + "tooltip.bloodmagic.currentBaseType.default": "Raw", + "tooltip.bloodmagic.currentBaseType.destructive": "Destructive", + "tooltip.bloodmagic.currentBaseType.steadfast": "Steadfast", + "tooltip.bloodmagic.currentBaseType.vengeful": "Vengeful", + "tooltip.bloodmagic.currentOwner": "Current owner: %s", + "tooltip.bloodmagic.currentTier": "Current tier: %d", + "tooltip.bloodmagic.currentType.corrosive": "Contains: Corrosive Will", + "tooltip.bloodmagic.currentType.default": "Contains: Raw Will", + "tooltip.bloodmagic.currentType.destructive": "Contains: Destructive Will", + "tooltip.bloodmagic.currentType.steadfast": "Contains: Steadfast Will", + "tooltip.bloodmagic.currentType.vengeful": "Contains: Vengeful Will", + "tooltip.bloodmagic.decoration.notSafe": "Dangerous for decoration", + "tooltip.bloodmagic.decoration.safe": "Safe for decoration", + "tooltip.bloodmagic.extraInfo": "&9-Hold shift for more info-", + "tooltip.bloodmagic.orb.desc": "Stores raw Life Essence", + "tooltip.bloodmagic.orb.owner": "Added by: %s", + "tooltip.bloodmagic.sacrificialdagger.desc": "Just a prick of the finger will suffice...", + "tooltip.bloodmagic.sentientAxe.desc": "Uses demon will to unleash its full potential.", + "tooltip.bloodmagic.sentientPickaxe.desc": "Uses demon will to unleash its full potential.", + "tooltip.bloodmagic.sentientShovel.desc": "Uses demon will to unleash its full potential.", + "tooltip.bloodmagic.sentientSword.desc": "Uses demon will to unleash its full potential.", + "tooltip.bloodmagic.sigil.air.desc": "I feel lighter already...", + "tooltip.bloodmagic.sigil.bloodlight.desc": "I see a light!", + "tooltip.bloodmagic.sigil.divination.currentAltarCapacity": "Current Capacity: %d LP", + "tooltip.bloodmagic.sigil.divination.currentAltarTier": "Current Tier: %d", + "tooltip.bloodmagic.sigil.divination.currentBonus": "Current Bonus: +%d%%", + "tooltip.bloodmagic.sigil.divination.currentEssence": "Current Essence: %d LP", + "tooltip.bloodmagic.sigil.divination.currentTranquility": "Current Tranquility: %d", + "tooltip.bloodmagic.sigil.divination.desc": "Peer into the soul", + "tooltip.bloodmagic.sigil.divination.otherNetwork": "Peering into the soul of %s", + "tooltip.bloodmagic.sigil.fastminer.desc": "Keep mining, and mining...", + "tooltip.bloodmagic.sigil.greengrove.desc": "Environmentally friendly", + "tooltip.bloodmagic.sigil.lava.desc": "HOT! DO NOT EAT", + "tooltip.bloodmagic.sigil.magnetism.desc": "I have a very magnetic personality", + "tooltip.bloodmagic.sigil.void.desc": "Better than a Swiffer\u00AE!", + "tooltip.bloodmagic.sigil.water.desc": "Infinite water, anyone?", + "tooltip.bloodmagic.slate.desc": "Infused stone inside of a Blood Altar", + "tooltip.bloodmagic.soulGem.common": "A gem used to contain more will", + "tooltip.bloodmagic.soulGem.grand": "A gem used to contain a large amount of will", + "tooltip.bloodmagic.soulGem.greater": "A gem used to contain a greater amount of will", + "tooltip.bloodmagic.soulGem.lesser": "A gem used to contain some will", + "tooltip.bloodmagic.soulGem.petty": "A gem used to contain a little will", + "tooltip.bloodmagic.soulSnare.desc": "Throw at a monster and then kill them to obtain their demonic will", + "tooltip.bloodmagic.tier": "Tier %d", + "tooltip.bloodmagic.will": "Will Quality: %s" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json b/src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json new file mode 100644 index 00000000..fd09a780 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/accelerationrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json new file mode 100644 index 00000000..c8a6d830 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/altarcapacityrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json b/src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json new file mode 100644 index 00000000..3ffccb3a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/bettercapacityrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/blankrune.json b/src/generated/resources/assets/bloodmagic/models/block/blankrune.json new file mode 100644 index 00000000..ab6f65ac --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/blankrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/blankrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/bloodlight.json b/src/generated/resources/assets/bloodmagic/models/block/bloodlight.json new file mode 100644 index 00000000..1a06cf8d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/bloodlight.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/bloodlight" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/chargingrune.json b/src/generated/resources/assets/bloodmagic/models/block/chargingrune.json new file mode 100644 index 00000000..8a0996cf --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/chargingrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/chargingrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json b/src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json new file mode 100644 index 00000000..a4b7b5f3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dislocationrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json new file mode 100644 index 00000000..db85074a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/orbcapacityrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json b/src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json new file mode 100644 index 00000000..9f99851f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/sacrificerune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json b/src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json new file mode 100644 index 00000000..bad7ca8e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/selfsacrificerune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/speedrune.json b/src/generated/resources/assets/bloodmagic/models/block/speedrune.json new file mode 100644 index 00000000..d33d1f07 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/speedrune.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/speedrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json b/src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json new file mode 100644 index 00000000..4551c1a8 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/accelerationrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/airsigil.json b/src/generated/resources/assets/bloodmagic/models/item/airsigil.json new file mode 100644 index 00000000..3ab0c0a0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/airsigil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/airsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json new file mode 100644 index 00000000..819ef814 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/altarcapacityrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json new file mode 100644 index 00000000..8f560341 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/apprenticebloodorb" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json b/src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json new file mode 100644 index 00000000..0d5a4393 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/arcaneashes" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json new file mode 100644 index 00000000..fdab63dc --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/basemonstersoul" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json new file mode 100644 index 00000000..36fac70b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/basemonstersoul_corrosive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json new file mode 100644 index 00000000..023694b7 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/basemonstersoul_destructive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json new file mode 100644 index 00000000..388830d5 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/basemonstersoul_steadfast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json new file mode 100644 index 00000000..e0384b54 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/basemonstersoul_vengeful" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json b/src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json new file mode 100644 index 00000000..f8b79342 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/bettercapacityrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/blankrune.json b/src/generated/resources/assets/bloodmagic/models/item/blankrune.json new file mode 100644 index 00000000..7bf5795e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/blankrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/blankrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/blankslate.json b/src/generated/resources/assets/bloodmagic/models/item/blankslate.json new file mode 100644 index 00000000..858ddfd3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/blankslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/blankslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json b/src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json new file mode 100644 index 00000000..e235a36b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/bloodlightsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/chargingrune.json b/src/generated/resources/assets/bloodmagic/models/item/chargingrune.json new file mode 100644 index 00000000..ccd29652 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/chargingrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/chargingrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json b/src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json new file mode 100644 index 00000000..e9b34ea0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/daggerofsacrifice" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/demonslate.json b/src/generated/resources/assets/bloodmagic/models/item/demonslate.json new file mode 100644 index 00000000..4225c748 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/demonslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/demonslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json b/src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json new file mode 100644 index 00000000..1ddb2946 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dislocationrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json b/src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json new file mode 100644 index 00000000..63a6f8ad --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/divinationsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/etherealslate.json b/src/generated/resources/assets/bloodmagic/models/item/etherealslate.json new file mode 100644 index 00000000..1ef42d33 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/etherealslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/etherealslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/growthsigil.json b/src/generated/resources/assets/bloodmagic/models/item/growthsigil.json new file mode 100644 index 00000000..545030bf --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/growthsigil.json @@ -0,0 +1,16 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/growthsigil_deactivated" + }, + { + "predicate": { + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/growthsigil_activated" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/icesigil.json b/src/generated/resources/assets/bloodmagic/models/item/icesigil.json new file mode 100644 index 00000000..67d4348e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/icesigil.json @@ -0,0 +1,16 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/icesigil_deactivated" + }, + { + "predicate": { + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/icesigil_activated" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/infusedslate.json b/src/generated/resources/assets/bloodmagic/models/item/infusedslate.json new file mode 100644 index 00000000..740b02e3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/infusedslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/infusedslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/lavasigil.json b/src/generated/resources/assets/bloodmagic/models/item/lavasigil.json new file mode 100644 index 00000000..0bb30f15 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/lavasigil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/lavasigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json new file mode 100644 index 00000000..b20996e9 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/magicianbloodorb" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json new file mode 100644 index 00000000..8f610344 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/masterbloodorb" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/miningsigil.json b/src/generated/resources/assets/bloodmagic/models/item/miningsigil.json new file mode 100644 index 00000000..f2f8923a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/miningsigil.json @@ -0,0 +1,16 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/miningsigil_deactivated" + }, + { + "predicate": { + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/miningsigil_activated" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json new file mode 100644 index 00000000..c851584c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/orbcapacityrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentair.json b/src/generated/resources/assets/bloodmagic/models/item/reagentair.json new file mode 100644 index 00000000..d9fcf24e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentair.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentair" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json b/src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json new file mode 100644 index 00000000..bf54ca70 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentbloodlight" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json b/src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json new file mode 100644 index 00000000..679e78e3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentfastminer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json b/src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json new file mode 100644 index 00000000..9a54fd87 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentgrowth" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentlava.json b/src/generated/resources/assets/bloodmagic/models/item/reagentlava.json new file mode 100644 index 00000000..542efbd6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentlava.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentlava" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json b/src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json new file mode 100644 index 00000000..45334c4a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentmagnetism" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json b/src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json new file mode 100644 index 00000000..313e8d91 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentvoid" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentwater.json b/src/generated/resources/assets/bloodmagic/models/item/reagentwater.json new file mode 100644 index 00000000..cd6aa9a9 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reagentwater.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reagentwater" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json b/src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json new file mode 100644 index 00000000..73ca020e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/reinforcedslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json b/src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json new file mode 100644 index 00000000..dcbe6138 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/sacrificerune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json b/src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json new file mode 100644 index 00000000..20e1c9f1 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/sacrificialdagger" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json b/src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json new file mode 100644 index 00000000..ab853e7b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/selfsacrificerune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json b/src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json new file mode 100644 index 00000000..8a5253db --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json @@ -0,0 +1,16 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/sigilofmagnetism_deactivated" + }, + { + "predicate": { + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/sigilofmagnetism_activated" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json b/src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json new file mode 100644 index 00000000..7629117a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json @@ -0,0 +1,34 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:type": 0.0 + }, + "model": "bloodmagic:item/variants/soulgemcommon" + }, + { + "predicate": { + "bloodmagic:type": 1.0 + }, + "model": "bloodmagic:item/variants/soulgemcommon_corrosive" + }, + { + "predicate": { + "bloodmagic:type": 2.0 + }, + "model": "bloodmagic:item/variants/soulgemcommon_destructive" + }, + { + "predicate": { + "bloodmagic:type": 3.0 + }, + "model": "bloodmagic:item/variants/soulgemcommon_vengeful" + }, + { + "predicate": { + "bloodmagic:type": 4.0 + }, + "model": "bloodmagic:item/variants/soulgemcommon_steadfast" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json b/src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json new file mode 100644 index 00000000..3489ce2f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json @@ -0,0 +1,34 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:type": 0.0 + }, + "model": "bloodmagic:item/variants/soulgemlesser" + }, + { + "predicate": { + "bloodmagic:type": 1.0 + }, + "model": "bloodmagic:item/variants/soulgemlesser_corrosive" + }, + { + "predicate": { + "bloodmagic:type": 2.0 + }, + "model": "bloodmagic:item/variants/soulgemlesser_destructive" + }, + { + "predicate": { + "bloodmagic:type": 3.0 + }, + "model": "bloodmagic:item/variants/soulgemlesser_vengeful" + }, + { + "predicate": { + "bloodmagic:type": 4.0 + }, + "model": "bloodmagic:item/variants/soulgemlesser_steadfast" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json b/src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json new file mode 100644 index 00000000..b8c2358c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json @@ -0,0 +1,34 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:type": 0.0 + }, + "model": "bloodmagic:item/variants/soulgempetty" + }, + { + "predicate": { + "bloodmagic:type": 1.0 + }, + "model": "bloodmagic:item/variants/soulgempetty_corrosive" + }, + { + "predicate": { + "bloodmagic:type": 2.0 + }, + "model": "bloodmagic:item/variants/soulgempetty_destructive" + }, + { + "predicate": { + "bloodmagic:type": 3.0 + }, + "model": "bloodmagic:item/variants/soulgempetty_vengeful" + }, + { + "predicate": { + "bloodmagic:type": 4.0 + }, + "model": "bloodmagic:item/variants/soulgempetty_steadfast" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulsnare.json b/src/generated/resources/assets/bloodmagic/models/item/soulsnare.json new file mode 100644 index 00000000..45b82d85 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/soulsnare.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsnare" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulsword.json b/src/generated/resources/assets/bloodmagic/models/item/soulsword.json new file mode 100644 index 00000000..47e58c18 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/soulsword.json @@ -0,0 +1,74 @@ +{ + "overrides": [ + { + "predicate": { + "bloodmagic:type": 0.0, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/soulsword_deactivated" + }, + { + "predicate": { + "bloodmagic:type": 1.0, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/soulsword_corrosive_deactivated" + }, + { + "predicate": { + "bloodmagic:type": 2.0, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/soulsword_destructive_deactivated" + }, + { + "predicate": { + "bloodmagic:type": 3.0, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/soulsword_vengeful_deactivated" + }, + { + "predicate": { + "bloodmagic:type": 4.0, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/variants/soulsword_steadfast_deactivated" + }, + { + "predicate": { + "bloodmagic:type": 0.0, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/soulsword_activated" + }, + { + "predicate": { + "bloodmagic:type": 1.0, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/soulsword_corrosive_activated" + }, + { + "predicate": { + "bloodmagic:type": 2.0, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/soulsword_destructive_activated" + }, + { + "predicate": { + "bloodmagic:type": 3.0, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/soulsword_vengeful_activated" + }, + { + "predicate": { + "bloodmagic:type": 4.0, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/variants/soulsword_steadfast_activated" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/speedrune.json b/src/generated/resources/assets/bloodmagic/models/item/speedrune.json new file mode 100644 index 00000000..d2bec661 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/speedrune.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/speedrune" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json new file mode 100644 index 00000000..0f5b60bd --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/growthsigil_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json new file mode 100644 index 00000000..5d14ea40 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/growthsigil_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json new file mode 100644 index 00000000..9f6e940a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/icesigil_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json new file mode 100644 index 00000000..5a461a5d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/icesigil_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json new file mode 100644 index 00000000..12877c52 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/miningsigil_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json new file mode 100644 index 00000000..858e701f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/miningsigil_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json new file mode 100644 index 00000000..b49d9096 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/sigilofmagnetism_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json new file mode 100644 index 00000000..f0b2fa42 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/sigilofmagnetism_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json new file mode 100644 index 00000000..460ba68b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemcommon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json new file mode 100644 index 00000000..0fa3a377 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemcommon_corrosive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json new file mode 100644 index 00000000..2e30b739 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemcommon_destructive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json new file mode 100644 index 00000000..56b5b375 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemcommon_steadfast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json new file mode 100644 index 00000000..fc3b3fd5 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemcommon_vengeful" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json new file mode 100644 index 00000000..7a253c28 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemlesser" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json new file mode 100644 index 00000000..a191b1f6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemlesser_corrosive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json new file mode 100644 index 00000000..241d5b93 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemlesser_destructive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json new file mode 100644 index 00000000..9ea458c2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemlesser_steadfast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json new file mode 100644 index 00000000..dbc3cc32 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgemlesser_vengeful" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json new file mode 100644 index 00000000..3085ac3b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgempetty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json new file mode 100644 index 00000000..b5c185ea --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgempetty_corrosive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json new file mode 100644 index 00000000..955e2c62 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgempetty_destructive" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json new file mode 100644 index 00000000..5031e33f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgempetty_steadfast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json new file mode 100644 index 00000000..e7ae0df4 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulgempetty_vengeful" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json new file mode 100644 index 00000000..9ade5a1a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json new file mode 100644 index 00000000..55c0bb87 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_corrosive_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json new file mode 100644 index 00000000..610f36ce --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_corrosive_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json new file mode 100644 index 00000000..c87c8ee7 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json new file mode 100644 index 00000000..e34becaa --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_destructive_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json new file mode 100644 index 00000000..78ddb49b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_destructive_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json new file mode 100644 index 00000000..40313e52 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_steadfast_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json new file mode 100644 index 00000000..13aa70f1 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_steadfast_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json new file mode 100644 index 00000000..1547ea7e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_vengeful_activated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json new file mode 100644 index 00000000..64c72e95 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/soulsword_vengeful_deactivated" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/voidsigil.json b/src/generated/resources/assets/bloodmagic/models/item/voidsigil.json new file mode 100644 index 00000000..cb05222b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/voidsigil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/voidsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/watersigil.json b/src/generated/resources/assets/bloodmagic/models/item/watersigil.json new file mode 100644 index 00000000..8835296c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/watersigil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/watersigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json new file mode 100644 index 00000000..3fd10ae6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/weakbloodorb" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json new file mode 100644 index 00000000..616d7793 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_altar" + ] + }, + "criteria": { + "has_will": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:basemonstersoul" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_altar" + } + } + }, + "requirements": [ + [ + "has_will", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json new file mode 100644 index 00000000..3de3b9d5 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_blank" + ] + }, + "criteria": { + "has_weak_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:weakbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_blank" + } + } + }, + "requirements": [ + [ + "has_weak_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json new file mode 100644 index 00000000..85b29fb4 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_capacity" + ] + }, + "criteria": { + "has_imbued_slate": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:infusedslate" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_capacity" + } + } + }, + "requirements": [ + [ + "has_imbued_slate", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json new file mode 100644 index 00000000..c2add425 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_charging" + ] + }, + "criteria": { + "has_master_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:masterbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_charging" + } + } + }, + "requirements": [ + [ + "has_master_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json new file mode 100644 index 00000000..46aaf95c --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_orb" + ] + }, + "criteria": { + "has_master_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:masterbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_orb" + } + } + }, + "requirements": [ + [ + "has_master_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json new file mode 100644 index 00000000..2b7ee148 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_sacrifice" + ] + }, + "criteria": { + "has_apprentice_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:apprenticebloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_sacrifice" + } + } + }, + "requirements": [ + [ + "has_apprentice_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json new file mode 100644 index 00000000..076daaee --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_self_sacrifice" + ] + }, + "criteria": { + "has_apprentice_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:apprenticebloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_self_sacrifice" + } + } + }, + "requirements": [ + [ + "has_apprentice_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json new file mode 100644 index 00000000..7a866e04 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:blood_rune_speed" + ] + }, + "criteria": { + "has_blank_rune": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:blankrune" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:blood_rune_speed" + } + } + }, + "requirements": [ + [ + "has_blank_rune", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json new file mode 100644 index 00000000..744c16e1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:sacrificial_dagger" + ] + }, + "criteria": { + "has_glass": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:glass" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:sacrificial_dagger" + } + } + }, + "requirements": [ + [ + "has_glass", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json new file mode 100644 index 00000000..b8553a53 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:soul_forge" + ] + }, + "criteria": { + "has_gold": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:soul_forge" + } + } + }, + "requirements": [ + [ + "has_gold", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json new file mode 100644 index 00000000..0c03b3ab --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:soul_snare" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:soul_snare" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json new file mode 100644 index 00000000..bff0c94d --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:accelerationrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json new file mode 100644 index 00000000..f27b7f82 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "bloodmagic:alchemyarray", + "rolls": 1.0, + "entries": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json new file mode 100644 index 00000000..49c1cf36 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:altar" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json new file mode 100644 index 00000000..a71126ce --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:altarcapacityrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json new file mode 100644 index 00000000..eb0cce26 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:bettercapacityrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json new file mode 100644 index 00000000..80a59b7a --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:blankrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json new file mode 100644 index 00000000..20e1ab88 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "bloodmagic:bloodlight", + "rolls": 1.0, + "entries": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json new file mode 100644 index 00000000..66c32d3f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:chargingrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json new file mode 100644 index 00000000..d158c403 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dislocationrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json new file mode 100644 index 00000000..239dcb53 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:orbcapacityrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json new file mode 100644 index 00000000..30afc854 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:sacrificerune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json new file mode 100644 index 00000000..edbac39e --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:selfsacrificerune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json new file mode 100644 index 00000000..32b39be4 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:soulforge" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json new file mode 100644 index 00000000..37341278 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:speedrune" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json new file mode 100644 index 00000000..3637afb8 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:storage_blocks/redstone" + }, + "output": { + "item": "bloodmagic:apprenticebloodorb" + }, + "upgradeLevel": 1, + "altarSyphon": 5000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json b/src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json new file mode 100644 index 00000000..f1d7fc16 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "minecraft:iron_sword" + }, + "output": { + "item": "bloodmagic:daggerofsacrifice" + }, + "upgradeLevel": 1, + "altarSyphon": 3000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json new file mode 100644 index 00000000..60a29822 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "bloodmagic:infusedslate" + }, + "output": { + "item": "bloodmagic:demonslate" + }, + "upgradeLevel": 3, + "altarSyphon": 15000, + "consumptionRate": 20, + "drainRate": 20 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json new file mode 100644 index 00000000..b1a577b1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "bloodmagic:reinforcedslate" + }, + "output": { + "item": "bloodmagic:infusedslate" + }, + "upgradeLevel": 2, + "altarSyphon": 5000, + "consumptionRate": 15, + "drainRate": 10 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json new file mode 100644 index 00000000..941c312f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:storage_blocks/gold" + }, + "output": { + "item": "bloodmagic:magicianbloodorb" + }, + "upgradeLevel": 2, + "altarSyphon": 25000, + "consumptionRate": 20, + "drainRate": 20 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json new file mode 100644 index 00000000..9e16f279 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "bloodmagic:blankslate" + }, + "output": { + "item": "bloodmagic:reinforcedslate" + }, + "upgradeLevel": 2, + "altarSyphon": 2000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/slate.json b/src/generated/resources/data/bloodmagic/recipes/altar/slate.json new file mode 100644 index 00000000..3be29e67 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/slate.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:stone" + }, + "output": { + "item": "bloodmagic:blankslate" + }, + "upgradeLevel": 0, + "altarSyphon": 1000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json new file mode 100644 index 00000000..e489f7e0 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:gems/diamond" + }, + "output": { + "item": "bloodmagic:weakbloodorb" + }, + "upgradeLevel": 0, + "altarSyphon": 2000, + "consumptionRate": 2, + "drainRate": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/airsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/airsigil.json new file mode 100644 index 00000000..7cd5e7ff --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/airsigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/airsigil.png", + "baseinput": { + "item": "bloodmagic:reagentair" + }, + "addedinput": { + "item": "bloodmagic:reinforcedslate" + }, + "output": { + "item": "bloodmagic:airsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json new file mode 100644 index 00000000..2e6e3e48 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/lightsigil.png", + "baseinput": { + "item": "bloodmagic:reagentbloodlight" + }, + "addedinput": { + "item": "bloodmagic:infusedslate" + }, + "output": { + "item": "bloodmagic:bloodlightsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json new file mode 100644 index 00000000..b7b8d0bf --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/divinationsigil.png", + "baseinput": { + "item": "minecraft:redstone" + }, + "addedinput": { + "item": "bloodmagic:blankslate" + }, + "output": { + "item": "bloodmagic:divinationsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json b/src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json new file mode 100644 index 00000000..b3644330 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/fastminersigil.png", + "baseinput": { + "item": "bloodmagic:reagentfastminer" + }, + "addedinput": { + "item": "bloodmagic:reinforcedslate" + }, + "output": { + "item": "bloodmagic:miningsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json new file mode 100644 index 00000000..22e90ecc --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/growthsigil.png", + "baseinput": { + "item": "bloodmagic:reagentgrowth" + }, + "addedinput": { + "item": "bloodmagic:reinforcedslate" + }, + "output": { + "item": "bloodmagic:growthsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json b/src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json new file mode 100644 index 00000000..f71cd318 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/lavasigil.png", + "baseinput": { + "item": "bloodmagic:reagentlava" + }, + "addedinput": { + "item": "bloodmagic:blankslate" + }, + "output": { + "item": "bloodmagic:lavasigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json new file mode 100644 index 00000000..324ec177 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/magnetismsigil.png", + "baseinput": { + "item": "bloodmagic:reagentmagnetism" + }, + "addedinput": { + "item": "bloodmagic:infusedslate" + }, + "output": { + "item": "bloodmagic:sigilofmagnetism" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json new file mode 100644 index 00000000..4d10c446 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/voidsigil.png", + "baseinput": { + "item": "bloodmagic:reagentvoid" + }, + "addedinput": { + "item": "bloodmagic:reinforcedslate" + }, + "output": { + "item": "bloodmagic:voidsigil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/watersigil.json b/src/generated/resources/data/bloodmagic/recipes/array/watersigil.json new file mode 100644 index 00000000..0862f909 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/watersigil.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/watersigil.png", + "baseinput": { + "item": "bloodmagic:reagentwater" + }, + "addedinput": { + "item": "bloodmagic:blankslate" + }, + "output": { + "item": "bloodmagic:watersigil" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/altar.json b/src/generated/resources/data/bloodmagic/recipes/blood_altar.json similarity index 61% rename from src/main/resources/assets/bloodmagic/recipes/altar.json rename to src/generated/resources/data/bloodmagic/recipes/blood_altar.json index f346a26f..0985743c 100644 --- a/src/main/resources/assets/bloodmagic/recipes/altar.json +++ b/src/generated/resources/data/bloodmagic/recipes/blood_altar.json @@ -1,26 +1,25 @@ { - "result": { - "item": "bloodmagic:altar" - }, + "type": "minecraft:crafting_shaped", "pattern": [ "a a", "aba", "cdc" ], - "type": "forge:ore_shaped", "key": { "a": { - "item": "#STONE" + "tag": "forge:stone" }, "b": { "item": "minecraft:furnace" }, "c": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" }, "d": { - "item": "bloodmagic:monster_soul", - "data": 0 + "item": "bloodmagic:basemonstersoul" } + }, + "result": { + "item": "bloodmagic:altar" } } \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json new file mode 100644 index 00000000..698aa70e --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "sos", + "aaa" + ], + "key": { + "a": { + "tag": "forge:stone" + }, + "s": { + "item": "bloodmagic:blankslate" + }, + "o": { + "type": "bloodmagic:bloodorb", + "orb_tier": 1 + } + }, + "result": { + "item": "bloodmagic:blankrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json new file mode 100644 index 00000000..daf3fef6 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ada" + ], + "key": { + "a": { + "tag": "forge:stone" + }, + "b": { + "item": "minecraft:bucket" + }, + "c": { + "item": "bloodmagic:blankrune" + }, + "d": { + "item": "bloodmagic:infusedslate" + } + }, + "result": { + "item": "bloodmagic:altarcapacityrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json new file mode 100644 index 00000000..acd341f6 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RsR", + "GrG", + "ReR" + ], + "key": { + "R": { + "tag": "forge:dusts/redstone" + }, + "r": { + "item": "bloodmagic:blankrune" + }, + "s": { + "item": "bloodmagic:demonslate" + }, + "e": { + "type": "bloodmagic:bloodorb", + "orb_tier": 4 + }, + "G": { + "tag": "forge:dusts/glowstone" + } + }, + "result": { + "item": "bloodmagic:chargingrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json new file mode 100644 index 00000000..1ca7d126 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aba" + ], + "key": { + "a": { + "tag": "forge:stone" + }, + "b": { + "type": "bloodmagic:bloodorb", + "orb_tier": 1 + }, + "c": { + "item": "bloodmagic:blankrune" + }, + "d": { + "type": "bloodmagic:bloodorb", + "orb_tier": 4 + } + }, + "result": { + "item": "bloodmagic:orbcapacityrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json new file mode 100644 index 00000000..3d43229b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aea" + ], + "key": { + "a": { + "tag": "forge:stone" + }, + "b": { + "item": "bloodmagic:reinforcedslate" + }, + "c": { + "tag": "forge:ingots/gold" + }, + "d": { + "item": "bloodmagic:blankrune" + }, + "e": { + "type": "bloodmagic:bloodorb", + "orb_tier": 2 + } + }, + "result": { + "item": "bloodmagic:sacrificerune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json new file mode 100644 index 00000000..054a70d8 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aea" + ], + "key": { + "a": { + "tag": "forge:stone" + }, + "b": { + "item": "bloodmagic:reinforcedslate" + }, + "c": { + "item": "minecraft:glowstone_dust" + }, + "d": { + "item": "bloodmagic:blankrune" + }, + "e": { + "type": "bloodmagic:bloodorb", + "orb_tier": 2 + } + }, + "result": { + "item": "bloodmagic:selfsacrificerune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json new file mode 100644 index 00000000..7ef75bfc --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aba" + ], + "key": { + "a": { + "tag": "forge:stone" + }, + "b": { + "item": "bloodmagic:blankslate" + }, + "c": { + "item": "minecraft:sugar" + }, + "d": { + "item": "bloodmagic:blankrune" + } + }, + "result": { + "item": "bloodmagic:speedrune" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json b/src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json new file mode 100644 index 00000000..23a4dcab --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ggg", + " Gg", + "i g" + ], + "key": { + "g": { + "tag": "forge:glass" + }, + "G": { + "tag": "forge:ingots/gold" + }, + "i": { + "tag": "forge:ingots/iron" + } + }, + "result": { + "item": "bloodmagic:sacrificialdagger" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soul_forge.json b/src/generated/resources/data/bloodmagic/recipes/soul_forge.json new file mode 100644 index 00000000..0916ce88 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soul_forge.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "i i", + "sgs", + "sos" + ], + "key": { + "s": { + "tag": "forge:stone" + }, + "g": { + "tag": "forge:ingots/gold" + }, + "i": { + "tag": "forge:ingots/iron" + }, + "o": { + "tag": "forge:storage_blocks/iron" + } + }, + "result": { + "item": "bloodmagic:soulforge" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soul_snare.json b/src/generated/resources/data/bloodmagic/recipes/soul_snare.json new file mode 100644 index 00000000..a6cb99f2 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soul_snare.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sis", + "iri", + "sis" + ], + "key": { + "r": { + "tag": "forge:dusts/redstone" + }, + "s": { + "tag": "forge:string" + }, + "i": { + "tag": "forge:ingots/iron" + } + }, + "result": { + "item": "bloodmagic:soulsnare", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json new file mode 100644 index 00000000..70e27273 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json @@ -0,0 +1,21 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "tag": "forge:dusts/redstone" + }, + "input1": { + "tag": "forge:dyes/white" + }, + "input2": { + "tag": "forge:gunpowder" + }, + "input3": { + "tag": "minecraft:coals" + }, + "output": { + "item": "bloodmagic:arcaneashes", + "nbt": "{Damage:0}" + }, + "minimumDrain": 0.0, + "drain": 0.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json new file mode 100644 index 00000000..c87b1cc0 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "bloodmagic:soulgemlesser" + }, + "input1": { + "tag": "forge:gems/diamond" + }, + "input2": { + "tag": "forge:storage_blocks/gold" + }, + "input3": { + "item": "bloodmagic:infusedslate" + }, + "output": { + "item": "bloodmagic:soulgemcommon" + }, + "minimumDrain": 240.0, + "drain": 50.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json new file mode 100644 index 00000000..cf5f5b19 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "bloodmagic:soulgempetty" + }, + "input1": { + "tag": "forge:gems/diamond" + }, + "input2": { + "tag": "forge:storage_blocks/redstone" + }, + "input3": { + "tag": "forge:storage_blocks/lapis" + }, + "output": { + "item": "bloodmagic:soulgemlesser" + }, + "minimumDrain": 60.0, + "drain": 20.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json new file mode 100644 index 00000000..10c7417a --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "tag": "forge:dusts/redstone" + }, + "input1": { + "tag": "forge:ingots/gold" + }, + "input2": { + "tag": "forge:glass" + }, + "input3": { + "tag": "forge:gems/lapis" + }, + "output": { + "item": "bloodmagic:soulgempetty" + }, + "minimumDrain": 1.0, + "drain": 1.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_fastminer.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_fastminer.json new file mode 100644 index 00000000..57d85e28 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_fastminer.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "minecraft:iron_pickaxe" + }, + "input1": { + "item": "minecraft:iron_axe" + }, + "input2": { + "item": "minecraft:iron_shovel" + }, + "input3": { + "tag": "forge:gunpowder" + }, + "output": { + "item": "bloodmagic:reagentfastminer" + }, + "minimumDrain": 128.0, + "drain": 20.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_growth.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_growth.json new file mode 100644 index 00000000..60fc06d0 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_growth.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "tag": "minecraft:saplings" + }, + "input1": { + "tag": "minecraft:saplings" + }, + "input2": { + "item": "minecraft:sugar_cane" + }, + "input3": { + "item": "minecraft:sugar" + }, + "output": { + "item": "bloodmagic:reagentgrowth" + }, + "minimumDrain": 128.0, + "drain": 20.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_lava.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_lava.json new file mode 100644 index 00000000..cb11cff3 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_lava.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "minecraft:lava_bucket" + }, + "input1": { + "tag": "forge:dusts/redstone" + }, + "input2": { + "tag": "forge:cobblestone" + }, + "input3": { + "tag": "forge:storage_blocks/coal" + }, + "output": { + "item": "bloodmagic:reagentlava" + }, + "minimumDrain": 32.0, + "drain": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_magnetism.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_magnetism.json new file mode 100644 index 00000000..6857c571 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_magnetism.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "tag": "forge:string" + }, + "input1": { + "tag": "forge:ingots/gold" + }, + "input2": { + "tag": "forge:ingots/gold" + }, + "input3": { + "tag": "forge:storage_blocks/iron" + }, + "output": { + "item": "bloodmagic:reagentmagnetism" + }, + "minimumDrain": 600.0, + "drain": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_void.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_void.json new file mode 100644 index 00000000..b3df934b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_void.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "minecraft:bucket" + }, + "input1": { + "tag": "forge:string" + }, + "input2": { + "tag": "forge:string" + }, + "input3": { + "tag": "forge:gunpowder" + }, + "output": { + "item": "bloodmagic:reagentvoid" + }, + "minimumDrain": 64.0, + "drain": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_water.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_water.json new file mode 100644 index 00000000..425d066c --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_water.json @@ -0,0 +1,17 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "minecraft:sugar" + }, + "input1": { + "item": "minecraft:water_bucket" + }, + "input2": { + "item": "minecraft:water_bucket" + }, + "output": { + "item": "bloodmagic:reagentwater" + }, + "minimumDrain": 10.0, + "drain": 3.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json new file mode 100644 index 00000000..ca642e55 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json @@ -0,0 +1,15 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "bloodmagic:soulgempetty" + }, + "input1": { + "item": "minecraft:iron_sword" + }, + "output": { + "item": "bloodmagic:soulsword", + "nbt": "{Damage:0}" + }, + "minimumDrain": 0.0, + "drain": 0.0 +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 19437999..3ad54158 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,124 +1,233 @@ -package WayofTime.bloodmagic; +package wayoftime.bloodmagic; -import WayofTime.bloodmagic.api.BloodMagicPlugin; -import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.ritual.RitualManager; -import WayofTime.bloodmagic.client.gui.GuiHandler; -import WayofTime.bloodmagic.command.CommandBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.meteor.MeteorConfigHandler; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.proxy.CommonProxy; -import WayofTime.bloodmagic.registry.*; -import WayofTime.bloodmagic.structures.ModDungeons; -import WayofTime.bloodmagic.util.PluginUtil; -import WayofTime.bloodmagic.util.handler.IMCHandler; -import com.google.common.collect.Lists; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.google.gson.Gson; + +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.launchwrapper.Launch; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.Loader; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.potion.Effect; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.*; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import org.apache.commons.lang3.tuple.Pair; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.impl.BloodMagicCorePlugin; +import wayoftime.bloodmagic.client.ClientEvents; +import wayoftime.bloodmagic.client.render.entity.BloodLightRenderer; +import wayoftime.bloodmagic.client.render.entity.SoulSnareRenderer; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.data.GeneratorBaseRecipes; +import wayoftime.bloodmagic.common.data.GeneratorBlockStates; +import wayoftime.bloodmagic.common.data.GeneratorItemModels; +import wayoftime.bloodmagic.common.data.GeneratorLanguage; +import wayoftime.bloodmagic.common.data.GeneratorLootTable; +import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeProvider; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; +import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; +import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; +import wayoftime.bloodmagic.core.registry.OrbRegistry; +import wayoftime.bloodmagic.network.BloodMagicPacketHandler; +import wayoftime.bloodmagic.potion.BloodMagicPotions; +import wayoftime.bloodmagic.tile.TileAlchemyArray; +import wayoftime.bloodmagic.tile.TileAltar; +import wayoftime.bloodmagic.tile.TileSoulForge; +import wayoftime.bloodmagic.util.handler.event.GenericHandler; +import wayoftime.bloodmagic.util.handler.event.WillHandler; -import java.io.File; -import java.util.List; +@Mod("bloodmagic") +//@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class BloodMagic +{ + public static final String MODID = "bloodmagic"; + // Directly reference a log4j logger. + private static final Logger LOGGER = LogManager.getLogger(); -@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.GuiBloodMagicConfig$Factory") -public class BloodMagic { - public static final String MODID = "bloodmagic"; - public static final String NAME = "Blood Magic: Alchemical Wizardry"; - public static final String VERSION = "@VERSION@"; - public static final String DEPEND = "required-after:guideapi;"; - public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - public static final List> PLUGINS = Lists.newArrayList(); - public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg"))); - public static final ItemGroup TAB_BM = new ItemGroup(MODID + ".creativeTab") { - @Override - public ItemStack createIcon() { - return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); - } - }; - public static ItemGroup TAB_TOMES = new ItemGroup(MODID + ".creativeTabTome") { - @Override - public ItemStack createIcon() { - return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - } + private static Gson GSON = null; - @Override - public boolean hasSearchBar() { - return true; - } - }.setNoTitle().setBackgroundImageName("item_search.png"); + public static final BloodMagicPacketHandler packetHandler = new BloodMagicPacketHandler(); - @SidedProxy(serverSide = "WayofTime.bloodmagic.proxy.CommonProxy", clientSide = "WayofTime.bloodmagic.proxy.ClientProxy") - public static CommonProxy proxy; - @Mod.Instance(BloodMagic.MODID) - public static BloodMagic instance; + public BloodMagic() + { + IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); - static { - FluidRegistry.enableUniversalBucket(); - } + modBus.addListener(this::setup); + modBus.addListener(this::onLoadComplete); - private File configDir; + BloodMagicBlocks.BLOCKS.register(modBus); + BloodMagicItems.ITEMS.register(modBus); +// RegistrarBloodMagic.BLOOD_ORBS.createAndRegister(modBus, "bloodorbs"); + BloodMagicItems.BLOOD_ORBS.createAndRegister(modBus, "bloodorbs"); + BloodMagicItems.BASICITEMS.register(modBus); + BloodMagicBlocks.BASICBLOCKS.register(modBus); + BloodMagicBlocks.FLUIDS.register(modBus); + BloodMagicBlocks.CONTAINERS.register(modBus); + BloodMagicEntityTypes.ENTITY_TYPES.register(modBus); - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - configDir = new File(event.getModConfigurationDirectory(), "bloodmagic"); + BloodMagicRecipeSerializers.RECIPE_SERIALIZERS.register(modBus); - PLUGINS.addAll(PluginUtil.gatherPlugins(event.getAsmData())); - PluginUtil.injectAPIInstances(PluginUtil.gatherInjections(event.getAsmData())); + // Register the setup method for modloading + modBus.addListener(this::setup); + // Register the enqueueIMC method for modloading + modBus.addListener(this::enqueueIMC); + // Register the processIMC method for modloading + modBus.addListener(this::processIMC); + // Register the doClientStuff method for modloading + modBus.addListener(this::doClientStuff); + modBus.addListener(this::gatherData); - ModTranquilityHandlers.init(); - ModDungeons.init(); - RITUAL_MANAGER.discover(event.getAsmData()); + modBus.addGenericListener(Fluid.class, this::registerFluids); + modBus.addGenericListener(TileEntityType.class, this::registerTileEntityTypes); + modBus.addGenericListener(IRecipeSerializer.class, this::registerRecipes); + modBus.addGenericListener(Effect.class, BloodMagicPotions::registerPotions); - proxy.preInit(); - } + MinecraftForge.EVENT_BUS.register(new GenericHandler()); - @Mod.EventHandler - public void init(FMLInitializationEvent event) { - BloodMagicPacketHandler.init(); + MinecraftForge.EVENT_BUS.register(new WillHandler()); +// MinecraftForge.EVENT_BUS.register(new BloodMagicBlocks()); +// MinecraftForge.EVENT_BUS.addListener(this::commonSetup); - PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.PLUGIN_REGISTER); + // Register ourselves for server and other game events we are interested in + MinecraftForge.EVENT_BUS.register(this); + } - ModRecipes.init(); - ModRituals.initHarvestHandlers(); - ModRituals.initCuttingFluids(); - MeteorConfigHandler.init(new File(configDir, "meteors")); - ModArmourTrackers.init(); - NetworkRegistry.INSTANCE.registerGuiHandler(BloodMagic.instance, new GuiHandler()); - ModCorruptionBlocks.init(); + private void registerRecipes(RegistryEvent.Register> event) + { + System.out.println("Registering IngredientBloodOrb Serializer."); + CraftingHelper.register(IngredientBloodOrb.NAME, IngredientBloodOrb.Serializer.INSTANCE); - proxy.init(); - } +// event.getRegistry().registerAll( +// new SewingRecipe.Serializer().setRegistryName("sewing") +// ); + } - @Mod.EventHandler - public void postInit(FMLPostInitializationEvent event) { - ModRecipes.addCompressionHandlers(); + public static ResourceLocation rl(String name) + { + return new ResourceLocation(BloodMagic.MODID, name); + } - proxy.postInit(); - } + public void registerFluids(RegistryEvent.Register event) + { - @Mod.EventHandler - public void modMapping(FMLModIdMappingEvent event) { + } - } + public void onLoadComplete(FMLLoadCompleteEvent event) + { + OrbRegistry.tierMap.put(BloodMagicItems.ORB_WEAK.get().getTier(), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get())); + BloodMagicCorePlugin.INSTANCE.register(BloodMagicAPI.INSTANCE); - @Mod.EventHandler - public void serverStarting(FMLServerStartingEvent event) { - event.registerServerCommand(new CommandBloodMagic()); - } + } - @Mod.EventHandler - public void onIMCRecieved(FMLInterModComms.IMCEvent event) { - IMCHandler.handleIMC(event); - } + public void registerTileEntityTypes(RegistryEvent.Register> event) + { + LOGGER.info("Attempting to register Tile Entities"); + event.getRegistry().register(TileEntityType.Builder.create(TileAltar::new, BloodMagicBlocks.BLOOD_ALTAR.get()).build(null).setRegistryName("altar")); + event.getRegistry().register(TileEntityType.Builder.create(TileAlchemyArray::new, BloodMagicBlocks.ALCHEMY_ARRAY.get()).build(null).setRegistryName("alchemyarray")); + event.getRegistry().register(TileEntityType.Builder.create(TileSoulForge::new, BloodMagicBlocks.SOUL_FORGE.get()).build(null).setRegistryName("soulforge")); + } + + @SubscribeEvent + public void gatherData(GatherDataEvent event) + { +// GSON = new GsonBuilder().registerTypeAdapter(Variant.class, new Variant.Deserializer()).registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer()).registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer()).create(); + + DataGenerator gen = event.getGenerator(); + +// if(event.includeClient()) + { + ItemModelProvider itemModels = new GeneratorItemModels(gen, event.getExistingFileHelper()); + gen.addProvider(itemModels); + gen.addProvider(new GeneratorBlockStates(gen, itemModels.existingFileHelper)); + gen.addProvider(new GeneratorLanguage(gen)); + gen.addProvider(new BloodMagicRecipeProvider(gen)); + gen.addProvider(new GeneratorBaseRecipes(gen)); + gen.addProvider(new GeneratorLootTable(gen)); + } + } + + private void setup(final FMLCommonSetupEvent event) + { + // some preinit code +// LOGGER.info("HELLO FROM PREINIT"); +// LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); + packetHandler.initialize(); + } + + private void doClientStuff(final FMLClientSetupEvent event) + { + // do something that can only be done on the client +// LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings); + ClientEvents.registerContainerScreens(); + + RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.SNARE.getEntityType(), SoulSnareRenderer::new); + RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.BLOOD_LIGHT.getEntityType(), BloodLightRenderer::new); + ClientEvents.registerItemModelProperties(event); + } + + private void enqueueIMC(final InterModEnqueueEvent event) + { + // some example code to dispatch IMC to another mod +// InterModComms.sendTo("examplemod", "helloworld", () -> { +// LOGGER.info("Hello world from the MDK"); +// return "Hello world"; +// }); + } + + private void processIMC(final InterModProcessEvent event) + { + // some example code to receive and process InterModComms from other mods +// LOGGER.info("Got IMC {}", event.getIMCStream().map(m -> m.getMessageSupplier().get()).collect(Collectors.toList())); + } + + // You can use SubscribeEvent and let the Event Bus discover methods to call + @SubscribeEvent + public void onServerStarting(FMLServerStartingEvent event) + { + // do something when the server starts +// LOGGER.info("HELLO from server starting"); + } + + // You can use EventBusSubscriber to automatically subscribe events on the + // contained class (this is subscribing to the MOD + // Event bus for receiving Registry Events) + @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) + public static class RegistryEvents + { + @SubscribeEvent + public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) + { + // register a new block here +// LOGGER.info("HELLO from Register Block"); + } + } + + // Custom ItemGroup TAB + public static final ItemGroup TAB = new ItemGroup("bloodmagictab") + { + @Override + public ItemStack createIcon() + { + return new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()); + } + }; } diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index c00b81d5..ef072b52 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -1,90 +1,135 @@ -package WayofTime.bloodmagic; +package wayoftime.bloodmagic; -import WayofTime.bloodmagic.meteor.MeteorConfigHandler; -import net.minecraftforge.common.config.Config; -import net.minecraftforge.common.config.ConfigManager; -import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class ConfigHandler { +public class ConfigHandler +{ + // Most of this stuff is commented out because a proper replacement for the + // ConfigHandler is not yet implemented. - @Config.Comment({"General settings"}) - public static ConfigGeneral general = new ConfigGeneral(); - @Config.Comment({"Blacklist options for various features"}) - public static ConfigBlacklist blacklist = new ConfigBlacklist(); - @Config.Comment({"Value modifiers for various features"}) - public static ConfigValues values = new ConfigValues(); - @Config.Comment({"Settings that only pertain to the client"}) - public static ConfigClient client = new ConfigClient(); - @Config.Comment({"Compatibility settings"}) - public static ConfigCompat compat = new ConfigCompat(); +// @Config.Comment( +// { "General settings" }) +// public static ConfigGeneral general = new ConfigGeneral(); +// @Config.Comment( +// { "Blacklist options for various features" }) +// public static ConfigBlacklist blacklist = new ConfigBlacklist(); +// @Config.Comment( +// { "Value modifiers for various features" }) +// public static ConfigValues values = new ConfigValues(); +// @Config.Comment( +// { "Settings that only pertain to the client" }) +// public static ConfigClient client = new ConfigClient(); +// @Config.Comment( +// { "Compatibility settings" }) +// public static ConfigCompat compat = new ConfigCompat(); +// +// @SubscribeEvent +// public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) +// { +// if (event.getModID().equals(BloodMagic.MODID)) +// { +// ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values +// BloodMagic.RITUAL_MANAGER.syncConfig(); +// MeteorConfigHandler.handleMeteors(false); // Reload meteors +// } +// } +// +// public static class ConfigGeneral +// { +// @Config.Comment( +// { "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) +// public boolean enableDebugLogging = false; +// @Config.Comment( +// { "Enables extra information to be printed to the log." }) +// public boolean enableAPILogging = false; +// @Config.Comment( +// { "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) +// public boolean enableVerboseAPILogging = false; +// @Config.Comment( +// { "Enables tier 6 related registrations. This is for pack makers." }) +// @Config.RequiresMcRestart +// public boolean enableTierSixEvenThoughThereIsNoContent = false; +// } +// +// public static class ConfigBlacklist +// { +// @Config.Comment( +// { "Stops listed blocks and entities from being teleposed.", +// "Use the registry name of the block or entity. Vanilla objects do not require the modid.", +// "If a block is specified, you can list the variants to only blacklist a given state." }) +// public String[] teleposer = +// { "bedrock", "mob_spawner" }; +// @Config.Comment( +// { "Stops listed blocks from being transposed.", +// "Use the registry name of the block. Vanilla blocks do not require the modid." }) +// public String[] transposer = +// { "bedrock", "mob_spawner" }; +// @Config.Comment( +// { "Stops the listed entities from being used in the Well of Suffering.", +// "Use the registry name of the entity. Vanilla entities do not require the modid." }) +// public String[] wellOfSuffering = +// {}; +// } +// +// public static class ConfigValues +// { +// @Config.Comment( +// { "Declares the amount of LP gained per HP sacrificed for the given entity.", +// "Setting the value to 0 will blacklist it.", +// "Use the registry name of the entity followed by a ';' and then the value you want.", +// "Vanilla entities do not require the modid." }) +// public String[] sacrificialValues = +// { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", +// "ocelot;100", "pig;100", "rabbit;100" }; +// @Config.Comment( +// { "Amount of LP the Coat of Arms should provide for each damage dealt." }) +// @Config.RangeInt(min = 0, max = 100) +// public int coatOfArmsConversion = 20; +// @Config.Comment( +// { "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) +// @Config.RangeInt(min = 0, max = 10000) +// public int sacrificialDaggerConversion = 100; +// @Config.Comment( +// { "Will rewrite any default meteor types with new versions.", +// "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) +// public boolean shouldResyncMeteors = true; +// @Config.Comment( +// { "Should mobs that die through the Well of Suffering Ritual drop items?" }) +// public boolean wellOfSufferingDrops = true; +// } +// +// public static class ConfigClient +// { +// @Config.Comment( +// { "Always render the beams between routing nodes.", +// "If disabled, the beams will only render while the Node Router is held." }) +// public boolean alwaysRenderRoutingLines = false; +// @Config.Comment( +// { "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) +// public boolean invisibleSpectralBlocks = true; +// @Config.Comment( +// { "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", +// "If disabled, it will behave identically to the default hotbar." }) +// public boolean sigilHoldingSkipsEmptySlots = false; +// } +// +// public static class ConfigCompat +// { +// @Config.Comment( +// { "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", +// "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", +// "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) +// public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; +// +// public enum AltarDisplayMode +// { +// ALWAYS, SIGIL_HELD, SIGIL_CONTAINED,; +// } +// } - @SubscribeEvent - public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.getModID().equals(BloodMagic.MODID)) { - ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values - BloodMagic.RITUAL_MANAGER.syncConfig(); - MeteorConfigHandler.handleMeteors(false); // Reload meteors - } - } - - public static class ConfigGeneral { - @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) - public boolean enableDebugLogging = false; - @Config.Comment({"Enables extra information to be printed to the log."}) - public boolean enableAPILogging = false; - @Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."}) - public boolean enableVerboseAPILogging = false; - @Config.Comment({"Enables tier 6 related registrations. This is for pack makers."}) - @Config.RequiresMcRestart - public boolean enableTierSixEvenThoughThereIsNoContent = false; - } - - public static class ConfigBlacklist { - @Config.Comment({"Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state."}) - public String[] teleposer = {"bedrock", "mob_spawner"}; - @Config.Comment({"Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid."}) - public String[] transposer = {"bedrock", "mob_spawner"}; - @Config.Comment({"Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid."}) - public String[] wellOfSuffering = {}; - } - - public static class ConfigValues { - @Config.Comment({"Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid."}) - public String[] sacrificialValues = {"villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100"}; - @Config.Comment({"Amount of LP the Coat of Arms should provide for each damage dealt."}) - @Config.RangeInt(min = 0, max = 100) - public int coatOfArmsConversion = 20; - @Config.Comment({"Amount of LP the Sacrificial Dagger should provide for each damage dealt."}) - @Config.RangeInt(min = 0, max = 10000) - public int sacrificialDaggerConversion = 100; - @Config.Comment({"Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated."}) - public boolean shouldResyncMeteors = true; - @Config.Comment({"Should mobs that die through the Well of Suffering Ritual drop items?"}) - public boolean wellOfSufferingDrops = true; - } - - public static class ConfigClient { - @Config.Comment({"Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held."}) - public boolean alwaysRenderRoutingLines = false; - @Config.Comment({"Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed."}) - public boolean invisibleSpectralBlocks = true; - @Config.Comment({"When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar."}) - public boolean sigilHoldingSkipsEmptySlots = false; - } - - public static class ConfigCompat { - @Config.Comment({"The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory."}) - public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; - - public enum AltarDisplayMode { - ALWAYS, - SIGIL_HELD, - SIGIL_CONTAINED, - ; - } - } -} + public static class values + { + public static int sacrificialDaggerConversion = 100; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java deleted file mode 100644 index 3db3f305..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.iface.IAlchemyArray; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public abstract class AlchemyArrayEffect { - public final String key; - - public AlchemyArrayEffect(String key) { - this.key = key; - } - - public abstract boolean update(TileEntity tile, int ticksActive); - - public abstract void writeToNBT(CompoundNBT tag); - - public abstract void readFromNBT(CompoundNBT tag); - - public abstract AlchemyArrayEffect getNewCopy(); - - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { - - } - - public String getKey() { - return key; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java deleted file mode 100644 index 1f234cd9..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectArrowTurret.java +++ /dev/null @@ -1,209 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import java.util.List; - -import javax.vecmath.Vector2d; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.MobEntity; -import net.minecraft.entity.monster.MonsterEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.item.ArrowItem; -import net.minecraft.item.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; -import WayofTime.bloodmagic.util.Utils; - -public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect { - public MobEntity target; - public int arrowTimer; - public static final int ARROW_WINDUP = 50; - private int lastChestSlot = -1; - - private double pitch = 0; - private double lastPitch = 0; - private double yaw = 0; - private double lastYaw = 0; - - public AlchemyArrayEffectArrowTurret(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - BlockPos pos = tile.getPos(); - World world = tile.getWorld(); - - BlockPos chestPos = pos.down(); - TileEntity chestTile = world.getTileEntity(chestPos); - if (chestTile == null) { - return false; - } - IItemHandler itemHandler = Utils.getInventory(chestTile, Direction.UP); - if (itemHandler == null) { - return false; - } - - ItemStack arrowStack = new ItemStack(Items.AIR); - if (lastChestSlot >= 0 && lastChestSlot < itemHandler.getSlots()) { - ItemStack testStack = itemHandler.extractItem(lastChestSlot, 1, true); - if (testStack.isEmpty() || !(testStack.getItem() instanceof ArrowItem)) { - lastChestSlot = -1; - } else { - arrowStack = testStack; - } - } - - if (lastChestSlot < 0) { - for (int i = 0; i < itemHandler.getSlots(); i++) { - ItemStack testStack = itemHandler.extractItem(i, 1, true); - if (!testStack.isEmpty() && testStack.getItem() instanceof ArrowItem) { - arrowStack = testStack; - lastChestSlot = i; - break; - } - } - - } - - if (lastChestSlot < 0) { - return false; //No arrows in the chest. Welp! - } - - if (canFireOnMob(world, pos, target)) { - Vector2d pitchYaw = getPitchYaw(pos, target); - lastPitch = pitch; - lastYaw = yaw; - pitch = pitchYaw.x; - yaw = pitchYaw.y; - arrowTimer++; - - if (arrowTimer >= ARROW_WINDUP) { -// ItemStack arrowStack = new ItemStack(Items.ARROW); - fireOnTarget(world, pos, arrowStack, target); - if (!world.isRemote) { - itemHandler.extractItem(lastChestSlot, 1, false); - } - arrowTimer = 0; - } - return false; - } else { - target = null; - arrowTimer = -1; - } - - List mobsInRange = world.getEntitiesWithinAABB(MonsterEntity.class, getBounds(pos)); - - for (MonsterEntity entity : mobsInRange) { - if (canFireOnMob(world, pos, entity))// && isMobInFilter(ent)) - { - target = entity; - arrowTimer = 0; - return false; - } - } - arrowTimer = -1; - target = null; - - return false; - } - - public double getPitch() { - return pitch; - } - - public double getLastPitch() { - return lastPitch; - } - - public double getYaw() { - return yaw; - } - - public double getLastYaw() { - return lastYaw; - } - - public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, MobEntity targetMob) { - float vel = 3f; - double damage = 2; - if (!world.isRemote) { - if (arrowStack.getItem() instanceof ArrowItem) { -// ItemArrow arrow = (ItemArrow) arrowStack.getItem(); -// EntityArrow entityarrow = arrow.createArrow(world, arrowStack, targetMob); - ArrowEntity entityarrow = new ArrowEntity(world); - entityarrow.setPotionEffect(arrowStack); - entityarrow.posX = pos.getX() + 0.5; - entityarrow.posY = pos.getY() + 0.5; - entityarrow.posZ = pos.getZ() + 0.5; - - double d0 = targetMob.posX - (pos.getX() + 0.5); - double d1 = targetMob.posY + targetMob.height - (pos.getY() + 0.5); - double d2 = targetMob.posZ - (pos.getZ() + 0.5); - double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); - entityarrow.setDamage(damage); - entityarrow.shoot(d0, d1 + d3 * 0.05, d2, vel, 0); - world.spawnEntity(entityarrow); - } - } - } - - public static Vector2d getPitchYaw(BlockPos pos, Entity entityIn) { - if (entityIn == null) { - return new Vector2d(0, 0); - } - - double distanceX = entityIn.posX - (pos.getX() + 0.5); - double distanceY = entityIn.posY + (double) entityIn.getEyeHeight() - (pos.getY() + 0.5); - double distanceZ = entityIn.posZ - (pos.getZ() + 0.5); - double radialDistance = Math.sqrt(distanceX * distanceX + distanceZ * distanceZ); - double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI; - double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI; - - return new Vector2d(pitch, yaw); - } - - public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn) { - return world.rayTraceBlocks(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), new Vec3d(entityIn.posX, entityIn.posY + (double) entityIn.getEyeHeight(), entityIn.posZ), false, true, false) == null; - } - - public boolean canFireOnMob(World world, BlockPos pos, Entity entityIn) { - return entityIn != null && !entityIn.isDead && entityIn.getDistanceSqToCenter(pos) <= getRange() * getRange() && entityIn.getDistanceSqToCenter(pos) >= getMinRange() * getMinRange() && canEntityBeSeen(world, pos, entityIn); - } - - public AxisAlignedBB getBounds(BlockPos pos) { - return new AxisAlignedBB(pos).grow(getRange(), getRange(), getRange()); - } - - public float getRange() { - return 32; - } - - public float getMinRange() { - return 3; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectArrowTurret(key); - } - -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java deleted file mode 100644 index 3be0cbb8..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ /dev/null @@ -1,393 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.fakePlayer.FakePlayerBM; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import com.mojang.authlib.GameProfile; -import net.minecraft.entity.Entity; -import net.minecraft.entity.MobEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.ai.goal.GoalSelector; -import net.minecraft.entity.ai.goal.GoalSelector.EntityAITaskEntry; -import net.minecraft.entity.monster.*; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.pathfinding.Path; -import net.minecraft.pathfinding.PathFinder; -import net.minecraft.pathfinding.WalkNodeProcessor; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.FakePlayer; - -import java.util.*; - -/** - * Credits for the initial code go to Crazy Pants of EIO. - */ -public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { - private FakePlayer target; - private Set tracking = new HashSet<>(); - - private int counter = 0; - private int maxMobsAttracted = 10000; - - private int cooldown = 50; - - public AlchemyArrayEffectAttractor(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - if (tile.getWorld().isRemote) { - return false; - } - - BlockPos pos = tile.getPos(); - counter++; - if (counter < 10) { - for (MobEntity ent : tracking) { - onEntityTick(pos, ent); - } - - return false; - } - - counter = 0; - - World world = tile.getWorld(); - - Set trackingThisTick = new HashSet<>(); - List entsInBounds = world.getEntitiesWithinAABB(MobEntity.class, getBounds(pos)); - - for (MobEntity ent : entsInBounds) { - if (!ent.isDead)// && isMobInFilter(ent)) - { - double x = (pos.getX() + 0.5D - ent.posX); - double y = (pos.getY() + 1D - ent.posY); - double z = (pos.getZ() + 0.5D - ent.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - - if (distance < 2 && tracking.contains(ent)) { - setEntityCooldown(pos, ent, cooldown); - removeAssignedAITask(pos, ent); - continue; - } - - if (!canEntityBeTracked(pos, ent)) { -// System.out.println("Cooldown: " + getEntityCooldown(pos, ent)); - decrementEntityCooldown(pos, ent); - continue; - } - - if (tracking.contains(ent)) { - trackingThisTick.add(ent); - onEntityTick(pos, ent); - } else if (tracking.size() < maxMobsAttracted && trackMob(pos, ent)) { - trackingThisTick.add(ent); - onTracked(ent); - } - } - } - - for (MobEntity e : tracking) { - if (!trackingThisTick.contains(e)) { - onUntracked(e); - } - } - tracking.clear(); - tracking = trackingThisTick; - - return false; - } - - public boolean canEntityBeTracked(BlockPos pos, MobEntity entity) { - return getEntityCooldown(pos, entity) <= 0; - } - - private String getPosKey(BlockPos pos) { - return "BMAttractor:" + pos; - } - - public int getEntityCooldown(BlockPos pos, MobEntity entity) { - return entity.getEntityData().getInteger(getPosKey(pos)); - } - - public void setEntityCooldown(BlockPos pos, MobEntity entity, int cooldown) { - entity.getEntityData().setInteger(getPosKey(pos), cooldown); - } - - public void decrementEntityCooldown(BlockPos pos, MobEntity entity) { - int cooldown = getEntityCooldown(pos, entity); - if (cooldown > 0) { - setEntityCooldown(pos, entity, cooldown - 1); - } - } - - public AxisAlignedBB getBounds(BlockPos pos) { - return new AxisAlignedBB(pos).expand(getRange(), getRange(), getRange()); - } - - public float getRange() { - return 10; - } - - private void onUntracked(MobEntity e) { - if (e instanceof EndermanEntity) { - e.getEntityData().setBoolean("BM:tracked", false); - } - } - - private void onTracked(MobEntity e) { - if (e instanceof EndermanEntity) { - e.getEntityData().setBoolean("BM:tracked", true); - } - } - - private void onEntityTick(BlockPos pos, MobEntity ent) { - if (ent instanceof SlimeEntity) { - ent.faceEntity(getTarget(ent.getEntityWorld(), pos), 10.0F, 20.0F); - } else if (ent instanceof SilverfishEntity) { - if (counter < 10) { - return; - } - SilverfishEntity sf = (SilverfishEntity) ent; - Path pathentity = getPathEntityToEntity(ent, getTarget(ent.getEntityWorld(), pos), getRange()); - sf.getNavigator().setPath(pathentity, sf.getAIMoveSpeed()); - } else if (ent instanceof BlazeEntity) { - double x = (pos.getX() + 0.5D - ent.posX); - double y = (pos.getY() + 1D - ent.posY); - double z = (pos.getZ() + 0.5D - ent.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - if (distance > 1.25) { - double speed = 0.01; - ent.motionX += x / distance * speed; - if (y > 0) { - ent.motionY += (0.3 - ent.motionY) * 0.3; - } - ent.motionZ += z / distance * speed; - } - } else if (ent instanceof ZombiePigmanEntity || ent instanceof SpiderEntity) { - forceMove(pos, ent); -// ent.setAttackTarget(target); - } else if (ent instanceof EndermanEntity) { - ent.setAttackTarget(getTarget(ent.getEntityWorld(), pos)); - } - } - - private void forceMove(BlockPos pos, MobEntity ent) { - double x = (pos.getX() + 0.5D - ent.posX); - double y = (pos.getY() + 1D - ent.posY); - double z = (pos.getZ() + 0.5D - ent.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - if (distance > 2) { - MonsterEntity mod = (MonsterEntity) ent; - mod.faceEntity(getTarget(ent.getEntityWorld(), pos), 180, 0); - mod.getMoveHelper().strafe(0, 0.3f); - if (mod.posY < pos.getY()) { - mod.setJumping(true); - } else { - mod.setJumping(false); - } - } - } - - public Path getPathEntityToEntity(Entity entity, Entity targetEntity, float range) { - int targX = MathHelper.floor(targetEntity.posX); - int targY = MathHelper.floor(targetEntity.posY + 1.0D); - int targZ = MathHelper.floor(targetEntity.posZ); - - PathFinder pf = new PathFinder(new WalkNodeProcessor()); - return pf.findPath(targetEntity.getEntityWorld(), (MobEntity) entity, new BlockPos(targX, targY, targZ), range); - } - - private boolean trackMob(BlockPos pos, MobEntity ent) { - //TODO: Figure out if this crud is needed - if (useSetTarget(ent)) { - ent.setAttackTarget(getTarget(ent.getEntityWorld(), pos)); - return true; - } else if (useSpecialCase(ent)) { - return applySpecialCase(pos, ent); - } else { - return attractUsingAITask(pos, ent); - } - } - - private boolean useSetTarget(MobEntity ent) { - return ent instanceof ZombiePigmanEntity || ent instanceof SpiderEntity || ent instanceof SilverfishEntity; - } - - public void removeAssignedAITask(BlockPos pos, MobEntity ent) { - Set entries = ent.tasks.taskEntries; - Goal remove = null; - for (EntityAITaskEntry entry : entries) { - if (entry.action instanceof AttractTask) { - AttractTask at = (AttractTask) entry.action; - if (at.coord.equals(pos)) { - remove = entry.action; - } else { - continue; - } - } - } - if (remove != null) { - ent.tasks.removeTask(remove); - } - } - - private boolean attractUsingAITask(BlockPos pos, MobEntity ent) { - tracking.add(ent); - Set entries = ent.tasks.taskEntries; - // boolean hasTask = false; - Goal remove = null; - // boolean isTracked; - for (EntityAITaskEntry entry : entries) { - if (entry.action instanceof AttractTask) { - AttractTask at = (AttractTask) entry.action; - if (at.coord.equals(pos) || !at.shouldExecute()) { - remove = entry.action; - } else { - return false; - } - } - } - if (remove != null) { - ent.tasks.removeTask(remove); - } - - cancelCurrentTasks(ent); - ent.tasks.addTask(0, new AttractTask(ent, getTarget(ent.getEntityWorld(), pos), pos)); - - return true; - } - - private void cancelCurrentTasks(MobEntity ent) { - Iterator iterator = ent.tasks.taskEntries.iterator(); - - List currentTasks = new ArrayList<>(); - while (iterator.hasNext()) { - EntityAITaskEntry entityaitaskentry = iterator.next(); - if (entityaitaskentry != null) { - if (entityaitaskentry.action instanceof AttractTask) { - continue; - } - - currentTasks.add(entityaitaskentry); - } - } - // Only available way to stop current execution is to remove all current - // tasks, then re-add them - for (EntityAITaskEntry task : currentTasks) { - ent.tasks.removeTask(task.action); - ent.tasks.addTask(task.priority, task.action); - } - } - - private boolean applySpecialCase(BlockPos pos, MobEntity ent) { - if (ent instanceof SlimeEntity) { - ent.faceEntity(getTarget(ent.getEntityWorld(), pos), 10.0F, 20.0F); -// ent.setAttackTarget(getTarget(ent.worldObj, pos)); - return true; - } else if (ent instanceof SilverfishEntity) { - SilverfishEntity es = (SilverfishEntity) ent; - Path pathentity = getPathEntityToEntity(ent, getTarget(ent.getEntityWorld(), pos), getRange()); - es.getNavigator().setPath(pathentity, es.getAIMoveSpeed()); - return true; - } else if (ent instanceof BlazeEntity) { - return true; - } - return false; - } - - private boolean useSpecialCase(MobEntity ent) { - return ent instanceof SlimeEntity || ent instanceof SilverfishEntity || ent instanceof BlazeEntity; - } - - public FakePlayer getTarget(World world, BlockPos pos) { - if (target == null) { -// System.out.println("...Hi? " + pos); - target = new Target(world, pos); - } - - return target; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectAttractor(key); - } - - private static class AttractTask extends Goal { - private MobEntity mob; - private BlockPos coord; - private FakePlayer target; - private int updatesSincePathing; - - private boolean started = false; - - private AttractTask(MobEntity mob, FakePlayer target, BlockPos coord) { - this.mob = mob; - this.coord = coord; - this.target = target; - } - - @Override - public boolean shouldExecute() { - boolean res = false; - //TODO: - TileEntity te = mob.getEntityWorld().getTileEntity(coord); - if (te instanceof TileAlchemyArray) { - res = true; - } - - return res; - } - - @Override - public void resetTask() { - started = false; - updatesSincePathing = 0; - } - - @Override - public boolean isInterruptible() { - return true; - } - - @Override - public void updateTask() { - if (!started || updatesSincePathing > 20) { - started = true; - int speed = 1; - // mob.getNavigator().setAvoidsWater(false); - boolean res = mob.getNavigator().tryMoveToEntityLiving(target, speed); - if (!res) { - mob.getNavigator().tryMoveToXYZ(target.posX, target.posY + 1, target.posZ, speed); - } - updatesSincePathing = 0; - } else { - updatesSincePathing++; - } - } - - } - - private class Target extends FakePlayerBM { - public Target(World world, BlockPos pos) { - super(world, pos, new GameProfile(null, BloodMagic.MODID + "ArrayAttractor" + ":" + pos)); - posY += 1; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java deleted file mode 100644 index 6659fbf1..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class AlchemyArrayEffectBinding extends AlchemyArrayEffectCrafting { - public AlchemyArrayEffectBinding(String key, ItemStack outputStack) { - super(key, outputStack, 200); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - if (ticksActive >= 50 && ticksActive <= 250) { - // TODO: Find a way to spawn lightning from only the server side - - // does not render when just spawned on server, not client. - this.spawnLightningOnCircle(tile.getWorld(), tile.getPos(), ticksActive); - } - - if (tile.getWorld().isRemote) { - return false; - } - - if (ticksActive >= 300) { - BlockPos pos = tile.getPos(); - - ItemStack output = outputStack.copy(); - ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); - - tile.getWorld().spawnEntity(outputEntity); - - return true; - } - - return false; - } - - public void spawnLightningOnCircle(World world, BlockPos pos, int ticksActive) { - if (ticksActive % 50 == 0) { - int circle = ticksActive / 50 - 1; - float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(circle, ticksActive); - float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(circle, ticksActive); - - double dispX = distance * Math.sin(angle); - double dispZ = -distance * Math.cos(angle); - - LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ, true); - world.spawnEntity(lightning); - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - //EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - //EMPTY - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectBinding(key, outputStack); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java deleted file mode 100644 index 69f5be05..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ /dev/null @@ -1,51 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.iface.IAlchemyArray; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class AlchemyArrayEffectBounce extends AlchemyArrayEffect { - public AlchemyArrayEffectBounce(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - return false; - } - - @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { - if (entity.isSneaking()) { - entity.fallDistance = 0; - } else if (entity.motionY < 0.0D) { - entity.motionY = -entity.motionY; - - if (!(entity instanceof LivingEntity)) { - entity.motionY *= 0.8D; - } - - entity.fallDistance = 0; - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectBounce(key); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java deleted file mode 100644 index df9ee547..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java +++ /dev/null @@ -1,63 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; - -public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect { - public final ItemStack outputStack; - public int tickLimit; - - public AlchemyArrayEffectCrafting(ItemStack outputStack) { - this(outputStack, 200); - } - - public AlchemyArrayEffectCrafting(ItemStack outputStack, int tickLimit) { - this(outputStack.toString() + tickLimit, outputStack, tickLimit); - } - - public AlchemyArrayEffectCrafting(String key, ItemStack outputStack, int tickLimit) { - super(key); - this.outputStack = outputStack; - this.tickLimit = tickLimit; - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - // TODO: Add recipe rechecking to verify nothing screwy is going on. - if (tile.getWorld().isRemote) { - return false; - } - - if (ticksActive >= tickLimit) { - BlockPos pos = tile.getPos(); - - ItemStack output = outputStack.copy(); - - ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); - - tile.getWorld().spawnEntity(outputEntity); - - return true; - } - - return false; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectCrafting(key, outputStack, tickLimit); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java deleted file mode 100644 index 34f2eae3..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; - -public class AlchemyArrayEffectCraftingNew extends AlchemyArrayEffect { - - private final RecipeAlchemyArray recipe; - - public AlchemyArrayEffectCraftingNew(RecipeAlchemyArray recipe) { - this(recipe.getOutput().toString() + 200, recipe); - } - - public AlchemyArrayEffectCraftingNew(String key, RecipeAlchemyArray recipeAlchemyArray) { - super(key); - - this.recipe = recipeAlchemyArray; - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - if (tile.getWorld().isRemote) - return false; - - if (ticksActive >= 200) { - BlockPos pos = tile.getPos(); - - ItemStack output = recipe.getOutput().copy(); - - ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); - - tile.getWorld().spawnEntity(outputEntity); - - return true; - } - - return false; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectCraftingNew(key, recipe); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java deleted file mode 100644 index 73d8c090..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectFurnaceFuel.java +++ /dev/null @@ -1,119 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import java.util.List; - -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.FurnaceBlock; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.FurnaceTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class AlchemyArrayEffectFurnaceFuel extends AlchemyArrayEffect { - static double radius = 10; - static int burnTicksAdded = 401; //Set to +1 more than it needs to be due to a hacky method - basically done so that the array doesn't double dip your health if you only add one item. - - public AlchemyArrayEffectFurnaceFuel(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - BlockPos pos = tile.getPos(); - World world = tile.getWorld(); - PlayerEntity sacrifice = null; - - for (Direction face : Direction.VALUES) { - BlockPos furnacePos = pos.offset(face); - Block block = world.getBlockState(furnacePos).getBlock(); - if (block != Blocks.FURNACE) //This will only work vanilla furnaces. No others! - { - continue; - } - - TileEntity bottomTile = world.getTileEntity(furnacePos); - if (bottomTile instanceof FurnaceTileEntity) { - FurnaceTileEntity furnaceTile = (FurnaceTileEntity) bottomTile; - if (canFurnaceSmelt(furnaceTile) && !furnaceTile.isBurning()) { - if (sacrifice == null || sacrifice.isDead) { - AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, bb); - for (PlayerEntity player : playerList) { - if (!player.isDead) { - sacrifice = player; - } - } - } - - if (sacrifice == null || sacrifice.isDead) { - return false; - } - - if (addFuelTime(furnaceTile, world, furnacePos, burnTicksAdded)) { - if (!sacrifice.capabilities.isCreativeMode) { - sacrifice.hurtResistantTime = 0; - sacrifice.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); //No. - } - } - } - } - } - - return false; - } - - public static boolean addFuelTime(FurnaceTileEntity furnaceTile, World world, BlockPos furnacePos, int cookTime) { - furnaceTile.setField(0, cookTime); - FurnaceBlock.setState(true, world, furnacePos); - return true; - } - - public static boolean canFurnaceSmelt(FurnaceTileEntity furnaceTile) { - ItemStack burnStack = furnaceTile.getStackInSlot(0); - if (burnStack.isEmpty()) { - return false; - } else { - ItemStack resultStack = FurnaceRecipes.instance().getSmeltingResult(burnStack); - - if (resultStack.isEmpty()) { - return false; - } else { - ItemStack finishStack = furnaceTile.getStackInSlot(2); - - if (finishStack.isEmpty()) { - return true; - } else if (!finishStack.isItemEqual(resultStack)) { - return false; - } else if (finishStack.getCount() + resultStack.getCount() <= furnaceTile.getInventoryStackLimit() && finishStack.getCount() + resultStack.getCount() <= finishStack.getMaxStackSize()) // Forge fix: make furnace respect stack sizes in furnace recipes - { - return true; - } else { - return finishStack.getCount() + resultStack.getCount() <= resultStack.getMaxStackSize(); // Forge fix: make furnace respect stack sizes in furnace recipes - } - } - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectFurnaceFuel(key); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java deleted file mode 100644 index 73030287..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ /dev/null @@ -1,134 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import java.util.Random; - -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import WayofTime.bloodmagic.event.TeleposeEvent; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; - -public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { - public static final int TELEPOSE_DELAY = 4; - - private BlockPos currentPos = BlockPos.ORIGIN; - - private int radius = -1; - private int teleportHeightOffset = 5; - - public AlchemyArrayEffectLaputa(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - if (ticksActive >= 100) { - World world = tile.getWorld(); - - if (radius == -1) { - ((TileAlchemyArray) tile).setItemDrop(false); - radius = getRandomRadius(world.rand); - teleportHeightOffset = getRandomHeightOffset(world.rand); - currentPos = new BlockPos(-radius, -radius, -radius); - } - - BlockPos pos = tile.getPos(); - if (world.isRemote) { - return false; - } - - int j = -radius; - int i = -radius; - int k = -radius; - - if (currentPos != null) { - j = currentPos.getY(); - i = currentPos.getX(); - k = currentPos.getZ(); - } - int checks = 0; - int maxChecks = 100; - - while (j <= radius) { - while (i <= radius) { - while (k <= radius) { - if (i == 0 && j == 0 && k == 0) { - k++; - continue; - } - - checks++; - if (checks >= maxChecks) { - this.currentPos = new BlockPos(i, j, k); - return false; - } - - if (checkIfSphere(radius, i, j, k)) { - BlockPos newPos = pos.add(i, j, k); - BlockPos offsetPos = newPos.up(teleportHeightOffset); - BlockState state = world.getBlockState(newPos); - - TeleposeEvent event = new TeleposeEvent(world, newPos, world, offsetPos); - if (state.getBlockHardness(world, newPos) > 0 && !MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) { - k++; - this.currentPos = new BlockPos(i, j, k); - - return false; - } - } - k++; - } - i++; - k = -radius; - } - j++; - i = -radius; - this.currentPos = new BlockPos(i, j, k); - return false; - } - - return true; - } - - return false; - } - - public boolean checkIfSphere(float radius, float xOff, float yOff, float zOff) { - float possOffset = 0.5f; - return xOff * xOff + yOff * yOff + zOff * zOff <= ((radius + possOffset) * (radius + possOffset)); - } - - public int getRandomRadius(Random rand) { - return rand.nextInt(5) + 4; - } - - public int getRandomHeightOffset(Random rand) { - return radius * 2 + 1 + rand.nextInt(5); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt("radius", radius); - tag.putInt("teleportHeightOffset", teleportHeightOffset); - tag.putInt(Constants.NBT.X_COORD, currentPos.getX()); - tag.putInt(Constants.NBT.Y_COORD, currentPos.getY()); - tag.putInt(Constants.NBT.Z_COORD, currentPos.getZ()); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - radius = tag.getInt("radius"); - teleportHeightOffset = tag.getInt("teleportHeightOffset"); - currentPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectLaputa(key); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java deleted file mode 100644 index 8277ff93..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java +++ /dev/null @@ -1,202 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityRegistry; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeSacrificeCraft; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; - -public class AlchemyArrayEffectMobSacrifice extends AlchemyArrayEffect { - public static final AreaDescriptor itemDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); - public static final AreaDescriptor mobDescriptor = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); - public int craftTime = 0; - public static final int REQUIRED_CRAFT_TIME = 200; - - public AlchemyArrayEffectMobSacrifice(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - World world = tile.getWorld(); - if (world.isRemote && ticksActive < 200 && ticksActive > 40) { - BlockPos pos = tile.getPos(); - Random rand = world.rand; - - for (int i = 0; i < 2; i++) { - double d0 = (double) pos.getX() + 0.5D + (rand.nextDouble() - 0.5D) * 2.5D; - double d1 = (double) pos.getY() + 0.2D + (rand.nextDouble() - 0.5D) * 0.2D; - double d2 = (double) pos.getZ() + 0.5D + (rand.nextDouble() - 0.5D) * 2.5D; - world.spawnParticle(EnumParticleTypes.SPELL_MOB, d0, d1, d2, 1D, 0.0D, 0.0D); - } - } - - //We need to do the check on both sides to correctly do particles. - - if (ticksActive >= 200) { - BlockPos pos = tile.getPos(); - - List itemList = world.getEntitiesWithinAABB(ItemEntity.class, itemDescriptor.getAABB(pos)); - - List inputList = new ArrayList(); - - for (ItemEntity entityItem : itemList) { - if (entityItem.isDead || entityItem.getItem().isEmpty()) { - continue; - } - - inputList.add(entityItem.getItem().copy()); - } - - if (inputList.isEmpty()) { - return false; - } - - if (inputList.size() == 1) //TODO: Test if it is a something that can be filled with Soul Breath - { - - } - - RecipeSacrificeCraft recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getSacrificeCraft(inputList); - if (recipe != null) { - double healthRequired = recipe.getHealthRequired(); - double healthAvailable = 0; - - List livingEntities = world.getEntitiesWithinAABB(LivingEntity.class, mobDescriptor.getAABB(pos)); - for (LivingEntity living : livingEntities) { - double health = getEffectiveHealth(living); - if (health > 0) { - healthAvailable += health; - } - } - - if (healthAvailable < healthRequired) { - craftTime = 0; - return false; - } - - craftTime++; - - if (craftTime >= REQUIRED_CRAFT_TIME) { - if (!world.isRemote) { - for (LivingEntity living : livingEntities) { - double health = getEffectiveHealth(living); - if (healthAvailable > 0 && health > 0) { - healthAvailable -= health; - living.getEntityWorld().playSound(null, living.posX, living.posY, living.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (living.getEntityWorld().rand.nextFloat() - living.getEntityWorld().rand.nextFloat()) * 0.8F); - living.setHealth(-1); - living.onDeath(DamageSourceBloodMagic.INSTANCE); - } - - if (healthAvailable <= 0) { - break; - } - } - - for (ItemEntity itemEntity : itemList) { - itemEntity.getItem().setCount(itemEntity.getItem().getCount() - 1); - if (itemEntity.getItem().isEmpty()) //TODO: Check container - { - itemEntity.setDead(); - } - } - - world.spawnEntity(new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5, recipe.getOutput())); - craftTime = 0; - } - } else { - if (world.isRemote) { - Vec3d spawnPosition = new Vec3d(pos.getX() + 0.5, pos.getY() + 2.5, pos.getZ() + 0.5); - for (ItemEntity itemEntity : itemList) { - ItemStack stack = itemEntity.getItem(); - double velocityFactor = 0.1; - - Vec3d itemPosition = new Vec3d(itemEntity.posX, itemEntity.posY + 0.5, itemEntity.posZ); - Vec3d velVec1 = new Vec3d((world.rand.nextDouble() - 0.5) * velocityFactor, (world.rand.nextDouble() - 0.5) * velocityFactor, (world.rand.nextDouble() - 0.5) * velocityFactor); -// Vec3d velVec2 = new Vec3d((world.rand.nextDouble() - 0.5) * velocityFactor, (world.rand.nextDouble()) * velocityFactor, (world.rand.nextDouble() - 0.5) * velocityFactor); - -// vec3d1 = vec3d1.addVector(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ); -// if (this.world instanceof WorldServer) //Forge: Fix MC-2518 spawnParticle is nooped on server, need to use server specific variant -// ((WorldServer)this.world).spawnParticle(EnumParticleTypes.ITEM_CRACK, vec3d1.x, vec3d1.y, vec3d1.z, 0, vec3d.x, vec3d.y + 0.05D, vec3d.z, 0.0D, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); -// else //Fix the fact that spawning ItemCrack uses TWO arguments. - world.spawnParticle(EnumParticleTypes.ITEM_CRACK, itemPosition.x + (spawnPosition.x - itemPosition.x) * craftTime / REQUIRED_CRAFT_TIME, itemPosition.y + (spawnPosition.y - itemPosition.y) * craftTime / REQUIRED_CRAFT_TIME, itemPosition.z + (spawnPosition.z - itemPosition.z) * craftTime / REQUIRED_CRAFT_TIME, velVec1.x, velVec1.y, velVec1.z, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); -// world.spawnParticle(EnumParticleTypes.ITEM_CRACK, spawnPosition.x, spawnPosition.y, spawnPosition.z, velVec2.x, velVec2.y, velVec2.z, Item.getIdFromItem(stack.getItem()), stack.getMetadata()); - } - - for (LivingEntity living : livingEntities) { - double health = getEffectiveHealth(living); - if (health <= 0) { - continue; - } - double d0 = (double) living.posX + (world.rand.nextDouble() - 0.5D) * 0.5D; - double d1 = (double) living.posY + 0.5D + (world.rand.nextDouble() - 0.5D) * 1D; - double d2 = (double) living.posZ + (world.rand.nextDouble() - 0.5D) * 0.5D; - world.spawnParticle(EnumParticleTypes.SPELL_MOB, d0, d1, d2, 1D, 0.0D, 0.0D); - } - } - } - } - } - - return false; - } - - //Future-proofing in case I want to make different mobs give different effective health - public double getEffectiveHealth(LivingEntity living) { - if (living == null) - return 0; - - if (!living.isNonBoss()) - return 0; - - if (living instanceof PlayerEntity) - return 0; - - if (living.isChild() && !(living instanceof IMob)) - return 0; - - if (living.isDead || living.getHealth() < 0.5F) - return 0; - - EntityEntry entityEntry = EntityRegistry.getEntry(living.getClass()); - if (entityEntry == null) - return 0; - - return living.getHealth(); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectMobSacrifice(key); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java deleted file mode 100644 index c626a085..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ /dev/null @@ -1,82 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.iface.IAlchemyArray; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class AlchemyArrayEffectMovement extends AlchemyArrayEffect { - public AlchemyArrayEffectMovement(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - return false; - } - - @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { - double motionY = 0.5; - double motionYGlowstoneMod = 0.05; - double speed = 1.5; - double speedRedstoneMod = 0.15; - - Direction direction = array.getRotation(); - TileAlchemyArray tileArray = (TileAlchemyArray) array; - - motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); - speed += speedRedstoneMod * (tileArray.getStackInSlot(1).getCount() - 1); - - entity.motionY = motionY; - entity.fallDistance = 0; - - switch (direction) { - case NORTH: - entity.motionX = 0; - entity.motionY = motionY; - entity.motionZ = -speed; - break; - - case SOUTH: - entity.motionX = 0; - entity.motionY = motionY; - entity.motionZ = speed; - break; - - case WEST: - entity.motionX = -speed; - entity.motionY = motionY; - entity.motionZ = 0; - break; - - case EAST: - entity.motionX = speed; - entity.motionY = motionY; - entity.motionZ = 0; - break; - default: - break; - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectMovement(key); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java deleted file mode 100644 index 2188ff18..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.iface.ISigil; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; - -public class AlchemyArrayEffectSigil extends AlchemyArrayEffect { - private final ISigil sigil; - - public AlchemyArrayEffectSigil(String key, ISigil sigil) { - super(key); - this.sigil = sigil; - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - //TODO: Need particles. - if (sigil.hasArrayEffect()) { - sigil.performArrayEffect(tile.getWorld(), tile.getPos()); - } - - return false; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectSigil(key, sigil); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java deleted file mode 100644 index 170877e6..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ /dev/null @@ -1,186 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import com.google.common.base.Predicate; -import net.minecraft.entity.MobEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.goal.GoalSelector; -import net.minecraft.entity.ai.goal.GoalSelector.EntityAITaskEntry; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; -import net.minecraft.entity.monster.MonsterEntity; -import net.minecraft.entity.monster.SkeletonEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.util.FakePlayer; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * Credits for the initial code go to Crazy Pants of EIO. - */ -public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect { - public static Predicate checkSkeleton = input -> !(input instanceof SkeletonEntity); - private SkeletonEntity turret; - - public AlchemyArrayEffectSkeletonTurret(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { -// if (tile.getWorld().isRemote) -// { -// return false; -// } - - BlockPos pos = tile.getPos(); - - if (turret != null && !turret.isDead) { - double x = (pos.getX() + 0.5D - turret.posX); - double y = (pos.getY() + 1D - turret.posY); - double z = (pos.getZ() + 0.5D - turret.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - - if (distance < 2) { -// turret.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 100, 100)); - return false; - } - } - - World world = tile.getWorld(); - - List skeletonsInRange = world.getEntitiesWithinAABB(SkeletonEntity.class, getBounds(pos)); - - for (SkeletonEntity entity : skeletonsInRange) { - if (!entity.isDead)// && isMobInFilter(ent)) - { - modifyAITargetTasks(entity); - turret = entity; - break; - } - } - - return false; - } - - public AxisAlignedBB getBounds(BlockPos pos) { - return new AxisAlignedBB(pos).expand(getRange(), getRange(), getRange()); - } - - public float getRange() { - return 0; - } - -// private void onUntracked(EntityLiving e) -// { -// e.getEntityData().setBoolean("BM:tracked", false); -// } -// -// private void onTracked(EntityLiving e) -// { -// e.getEntityData().setBoolean("BM:tracked", true); -// } - - private boolean modifyAITargetTasks(SkeletonEntity entity) { - cancelCurrentTargetTasks(entity); - -// entity.setCombatTask(); - entity.targetTasks.addTask(1, new NearestAttackableTargetGoal(entity, MonsterEntity.class, 10, true, false, checkSkeleton)); - entity.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0); - entity.getEntityAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(1); - return true; - } - - private void cancelCurrentTargetTasks(MobEntity entity) { - Iterator iterator = entity.targetTasks.taskEntries.iterator(); - - List currentTasks = new ArrayList<>(); - while (iterator.hasNext()) { - EntityAITaskEntry entityaitaskentry = iterator.next(); - if (entityaitaskentry != null)// && entityaitaskentry.action instanceof EntityAITarget) - { - currentTasks.add(entityaitaskentry); - } - } - - for (EntityAITaskEntry task : currentTasks) { - entity.targetTasks.removeTask(task.action); - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectSkeletonTurret(key); - } - - private static class AttractTask extends Goal { - private MobEntity mob; - private BlockPos coord; - private FakePlayer target; - private int updatesSincePathing; - - private boolean started = false; - - private AttractTask(MobEntity mob, FakePlayer target, BlockPos coord) { - this.mob = mob; - this.coord = coord; - this.target = target; - } - - @Override - public boolean shouldExecute() { - boolean res = false; - //TODO: - TileEntity te = mob.getEntityWorld().getTileEntity(coord); - if (te instanceof TileAlchemyArray) { - res = true; - } - - return res; - } - - @Override - public void resetTask() { - started = false; - updatesSincePathing = 0; - } - - @Override - public boolean isInterruptible() { - return true; - } - - @Override - public void updateTask() { - if (!started || updatesSincePathing > 20) { - started = true; - int speed = 1; - // mob.getNavigator().setAvoidsWater(false); - boolean res = mob.getNavigator().tryMoveToEntityLiving(target, speed); - if (!res) { - mob.getNavigator().tryMoveToXYZ(target.posX, target.posY + 1, target.posZ, speed); - } - updatesSincePathing = 0; - } else { - updatesSincePathing++; - } - } - - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java deleted file mode 100644 index 47d36731..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSpike.java +++ /dev/null @@ -1,44 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.iface.IAlchemyArray; - -public class AlchemyArrayEffectSpike extends AlchemyArrayEffect { - public AlchemyArrayEffectSpike(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - return false; - } - - @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { - if (entity instanceof LivingEntity) { - entity.attackEntityFrom(DamageSource.CACTUS, 2); - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectSpike(key); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java deleted file mode 100644 index 04fee39c..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectTeleport.java +++ /dev/null @@ -1,87 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundEvents; -import net.minecraft.network.play.server.SUpdateHealthPacket; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; -import net.minecraft.world.World; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.iface.IAlchemyArray; - -public class AlchemyArrayEffectTeleport extends AlchemyArrayEffect { - public static final int MAX_SEARCH = 20; - public static final int TELEPORT_DELAY = 40; - - public AlchemyArrayEffectTeleport(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - return false; - } - - @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { - Direction direction = array.getRotation(); - - teleportEntityInDirection(world, pos, entity, direction); - } - - public void teleportEntityInDirection(World world, BlockPos currentPos, Entity entity, Direction direction) { - if (entity != null && entity.timeUntilPortal <= 0) { - for (int i = 1; i <= MAX_SEARCH; i++) { - BlockPos offsetPos = currentPos.offset(direction, i); - Block testBlock = world.getBlockState(offsetPos).getBlock(); - if (testBlock == RegistrarBloodMagicBlocks.ALCHEMY_ARRAY) { - int x = offsetPos.getX(); - int y = offsetPos.getY(); - int z = offsetPos.getZ(); - - entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - entity.timeUntilPortal = TELEPORT_DELAY; - if (!world.isRemote) { - if (entity instanceof PlayerEntity) { - ServerPlayerEntity player = (ServerPlayerEntity) entity; - - player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); - player.getEntityWorld().updateEntityWithOptionalForce(player, false); - player.connection.sendPacket(new SUpdateHealthPacket(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); - - } else { - ServerWorld worldServer = (ServerWorld) entity.getEntityWorld(); - - entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - worldServer.resetUpdateEntityTick(); - } - } - return; - } - } - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectTeleport(key); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java deleted file mode 100644 index dfd9f1be..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.iface.IAlchemyArray; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect { - public AlchemyArrayEffectUpdraft(String key) { - super(key); - } - - @Override - public boolean update(TileEntity tile, int ticksActive) { - return false; - } - - @Override - public void onEntityCollidedWithBlock(IAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) { - double motionY = 1; - double motionYGlowstoneMod = 0.1; - double motionYFeatherMod = 0.05; - - entity.fallDistance = 0; - TileAlchemyArray tileArray = (TileAlchemyArray) array; - motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); // Glowstone Dust - motionY += motionYFeatherMod * (tileArray.getStackInSlot(1).getCount() - 1); // Feathers - - entity.motionY = motionY; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public AlchemyArrayEffect getNewCopy() { - return new AlchemyArrayEffectUpdraft(key); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java deleted file mode 100644 index 1c80f949..00000000 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java +++ /dev/null @@ -1,151 +0,0 @@ -package WayofTime.bloodmagic.alchemyArray; - -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class AlchemyCircleRenderer { - public final ResourceLocation arrayResource; - public float offsetFromFace = -0.9f; - - public AlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - } - - public AlchemyCircleRenderer(ResourceLocation arrayResource) { - this.arrayResource = arrayResource; - } - - public float getRotation(float craftTime) { - float offset = 2; - if (craftTime >= offset) { - float modifier = (float) Math.pow(craftTime - offset, 1.5); - return modifier * 1f; - } - return 0; - } - - public float getSecondaryRotation(float craftTime) { - float offset = 50; - if (craftTime >= offset) { - float modifier = (float) Math.pow(craftTime - offset, 1.7); - return modifier * 0.5f; - } - return 0; - } - - public float getSizeModifier(float craftTime) { - if (craftTime >= 150 && craftTime <= 250) { - return (200 - craftTime) / 50f; - } - return 1.0f; - } - - public float getVerticalOffset(float craftTime) { - if (craftTime >= 5) { - if (craftTime <= 40) { - return (float) ((-0.4) * Math.pow((craftTime - 5) / 35f, 3)); - } else { - return -0.4f; - } - } - return 0; - } - - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / - // this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f; - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); - GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 0, 1); - GlStateManager.rotate(secondaryRot, 1, 0, 0); - GlStateManager.rotate(secondaryRot * 0.45812f, 0, 0, 1); - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java index abc937c7..bb9b4562 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java @@ -1,55 +1,62 @@ -package WayofTime.bloodmagic.altar; +package wayoftime.bloodmagic.altar; import net.minecraft.util.math.BlockPos; /** * Used for building the altar structure. */ -public class AltarComponent { - private final BlockPos offset; - private final ComponentType component; - private boolean upgradeSlot; +public class AltarComponent +{ + private final BlockPos offset; + private final ComponentType component; + private boolean upgradeSlot; - /** - * Sets a component location for the altar. - * - * @param offset - Where the block should be in relation to the Altar - * @param component - The type of Component the location should contain - */ - public AltarComponent(BlockPos offset, ComponentType component) { - this.offset = offset; - this.component = component; - } + /** + * Sets a component location for the altar. + * + * @param offset - Where the block should be in relation to the Altar + * @param component - The type of Component the location should contain + */ + public AltarComponent(BlockPos offset, ComponentType component) + { + this.offset = offset; + this.component = component; + } - /** - * Use for setting a location at which there must be a block, but the type - * of block does not matter. - * - * @param offset - Where the block should be in relation to the Altar - */ - public AltarComponent(BlockPos offset) { - this(offset, ComponentType.NOTAIR); - } + /** + * Use for setting a location at which there must be a block, but the type of + * block does not matter. + * + * @param offset - Where the block should be in relation to the Altar + */ + public AltarComponent(BlockPos offset) + { + this(offset, ComponentType.NOTAIR); + } - /** - * Sets the location to an upgrade slot. - * - * @return the current instance for further use. - */ - public AltarComponent setUpgradeSlot() { - this.upgradeSlot = true; - return this; - } + /** + * Sets the location to an upgrade slot. + * + * @return the current instance for further use. + */ + public AltarComponent setUpgradeSlot() + { + this.upgradeSlot = true; + return this; + } - public BlockPos getOffset() { - return offset; - } + public BlockPos getOffset() + { + return offset; + } - public boolean isUpgradeSlot() { - return upgradeSlot; - } + public boolean isUpgradeSlot() + { + return upgradeSlot; + } - public ComponentType getComponent() { - return component; - } + public ComponentType getComponent() + { + return component; + } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index a347fa15..7ab6c3ff 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -1,149 +1,172 @@ -package WayofTime.bloodmagic.altar; - -import WayofTime.bloodmagic.ConfigHandler; -import com.google.common.collect.Lists; -import net.minecraft.util.math.BlockPos; +package wayoftime.bloodmagic.altar; import java.util.List; import java.util.function.Consumer; -public enum AltarTier { - ONE() { - @Override - public void buildComponents(Consumer components) { - // Nada - } - }, TWO() { - @Override - public void buildComponents(Consumer components) { - components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE)); - components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE)); - components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE)); - components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE)); - } - }, - THREE() { - @Override - public void buildComponents(Consumer components) { - // Doesn't pull from tier 2 because upgrades slots are different - components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-3, -1, -3))); - components.accept(new AltarComponent(new BlockPos(-3, 0, -3))); - components.accept(new AltarComponent(new BlockPos(3, -1, -3))); - components.accept(new AltarComponent(new BlockPos(3, 0, -3))); - components.accept(new AltarComponent(new BlockPos(-3, -1, 3))); - components.accept(new AltarComponent(new BlockPos(-3, 0, 3))); - components.accept(new AltarComponent(new BlockPos(3, -1, 3))); - components.accept(new AltarComponent(new BlockPos(3, 0, 3))); - components.accept(new AltarComponent(new BlockPos(-3, 1, -3), ComponentType.GLOWSTONE)); - components.accept(new AltarComponent(new BlockPos(3, 1, -3), ComponentType.GLOWSTONE)); - components.accept(new AltarComponent(new BlockPos(-3, 1, 3), ComponentType.GLOWSTONE)); - components.accept(new AltarComponent(new BlockPos(3, 1, 3), ComponentType.GLOWSTONE)); +import com.google.common.collect.Lists; - for (int i = -2; i <= 2; i++) { - components.accept(new AltarComponent(new BlockPos(3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -2, 3), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -2, -3), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }, - FOUR() { - @Override - public void buildComponents(Consumer components) { - THREE.getAltarComponents().forEach(components); +import net.minecraft.util.math.BlockPos; - for (int i = -3; i <= 3; i++) { - components.accept(new AltarComponent(new BlockPos(5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -3, 5), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -3, -5), ComponentType.BLOODRUNE).setUpgradeSlot()); - } +public enum AltarTier +{ + ONE() + { + @Override + public void buildComponents(Consumer components) + { + // Nada + } + }, + TWO() + { + @Override + public void buildComponents(Consumer components) + { + components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE)); + components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE)); + components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE)); + components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE)); + } + }, + THREE() + { + @Override + public void buildComponents(Consumer components) + { + // Doesn't pull from tier 2 because upgrades slots are different + components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-3, -1, -3))); + components.accept(new AltarComponent(new BlockPos(-3, 0, -3))); + components.accept(new AltarComponent(new BlockPos(3, -1, -3))); + components.accept(new AltarComponent(new BlockPos(3, 0, -3))); + components.accept(new AltarComponent(new BlockPos(-3, -1, 3))); + components.accept(new AltarComponent(new BlockPos(-3, 0, 3))); + components.accept(new AltarComponent(new BlockPos(3, -1, 3))); + components.accept(new AltarComponent(new BlockPos(3, 0, 3))); + components.accept(new AltarComponent(new BlockPos(-3, 1, -3), ComponentType.GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(3, 1, -3), ComponentType.GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(-3, 1, 3), ComponentType.GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(3, 1, 3), ComponentType.GLOWSTONE)); - for (int i = -2; i <= 1; i++) { - components.accept(new AltarComponent(new BlockPos(5, i, 5))); - components.accept(new AltarComponent(new BlockPos(5, i, -5))); - components.accept(new AltarComponent(new BlockPos(-5, i, -5))); - components.accept(new AltarComponent(new BlockPos(-5, i, 5))); - } + for (int i = -2; i <= 2; i++) + { + components.accept(new AltarComponent(new BlockPos(3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -2, 3), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -2, -3), ComponentType.BLOODRUNE).setUpgradeSlot()); + } + } + }, + FOUR() + { + @Override + public void buildComponents(Consumer components) + { + THREE.getAltarComponents().forEach(components); - components.accept(new AltarComponent(new BlockPos(5, 2, 5), ComponentType.BLOODSTONE)); - components.accept(new AltarComponent(new BlockPos(5, 2, -5), ComponentType.BLOODSTONE)); - components.accept(new AltarComponent(new BlockPos(-5, 2, -5), ComponentType.BLOODSTONE)); - components.accept(new AltarComponent(new BlockPos(-5, 2, 5), ComponentType.BLOODSTONE)); - } - }, - FIVE() { - @Override - public void buildComponents(Consumer components) { - FOUR.getAltarComponents().forEach(components); - components.accept(new AltarComponent(new BlockPos(-8, -3, 8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(-8, -3, -8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(8, -3, -8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(8, -3, 8), ComponentType.BEACON)); + for (int i = -3; i <= 3; i++) + { + components.accept(new AltarComponent(new BlockPos(5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -3, 5), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -3, -5), ComponentType.BLOODRUNE).setUpgradeSlot()); + } - for (int i = -6; i <= 6; i++) { - components.accept(new AltarComponent(new BlockPos(8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -4, 8), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -4, -8), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }, - SIX() { - @Override - public void buildComponents(Consumer components) { - FIVE.getAltarComponents().forEach(components); + for (int i = -2; i <= 1; i++) + { + components.accept(new AltarComponent(new BlockPos(5, i, 5))); + components.accept(new AltarComponent(new BlockPos(5, i, -5))); + components.accept(new AltarComponent(new BlockPos(-5, i, -5))); + components.accept(new AltarComponent(new BlockPos(-5, i, 5))); + } - for (int i = -4; i <= 2; i++) { - components.accept(new AltarComponent(new BlockPos(11, i, 11))); - components.accept(new AltarComponent(new BlockPos(-11, i, -11))); - components.accept(new AltarComponent(new BlockPos(11, i, -11))); - components.accept(new AltarComponent(new BlockPos(-11, i, 11))); - } + components.accept(new AltarComponent(new BlockPos(5, 2, 5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(5, 2, -5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(-5, 2, -5), ComponentType.BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(-5, 2, 5), ComponentType.BLOODSTONE)); + } + }, + FIVE() + { + @Override + public void buildComponents(Consumer components) + { + FOUR.getAltarComponents().forEach(components); + components.accept(new AltarComponent(new BlockPos(-8, -3, 8), ComponentType.BEACON)); + components.accept(new AltarComponent(new BlockPos(-8, -3, -8), ComponentType.BEACON)); + components.accept(new AltarComponent(new BlockPos(8, -3, -8), ComponentType.BEACON)); + components.accept(new AltarComponent(new BlockPos(8, -3, 8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); + for (int i = -6; i <= 6; i++) + { + components.accept(new AltarComponent(new BlockPos(8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -4, 8), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -4, -8), ComponentType.BLOODRUNE).setUpgradeSlot()); + } + } + }, + SIX() + { + @Override + public void buildComponents(Consumer components) + { + FIVE.getAltarComponents().forEach(components); - for (int i = -9; i <= 9; i++) { - components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }; + for (int i = -4; i <= 2; i++) + { + components.accept(new AltarComponent(new BlockPos(11, i, 11))); + components.accept(new AltarComponent(new BlockPos(-11, i, -11))); + components.accept(new AltarComponent(new BlockPos(11, i, -11))); + components.accept(new AltarComponent(new BlockPos(-11, i, 11))); + } - public static final int MAXTIERS = ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent ? values().length : values().length - 1; + components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); - private List altarComponents; + for (int i = -9; i <= 9; i++) + { + components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); + } + } + }; - AltarTier() { - this.altarComponents = Lists.newArrayList(); + public static final int MAXTIERS = values().length; - buildComponents(altarComponents::add); - } + private List altarComponents; - public abstract void buildComponents(Consumer components); + AltarTier() + { + this.altarComponents = Lists.newArrayList(); - public int toInt() { - return ordinal() + 1; - } + buildComponents(altarComponents::add); + } - public List getAltarComponents() { - return altarComponents; - } -} + public abstract void buildComponents(Consumer components); + + public int toInt() + { + return ordinal() + 1; + } + + public List getAltarComponents() + { + return altarComponents; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java index fce1de92..f7d9cc43 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java @@ -1,24 +1,29 @@ -package WayofTime.bloodmagic.altar; - -import WayofTime.bloodmagic.block.enums.BloodRuneType; -import com.google.common.collect.Maps; +package wayoftime.bloodmagic.altar; import java.util.EnumMap; -public class AltarUpgrade { +import com.google.common.collect.Maps; - private final EnumMap upgradeLevels; +import wayoftime.bloodmagic.block.enums.BloodRuneType; - public AltarUpgrade() { - this.upgradeLevels = Maps.newEnumMap(BloodRuneType.class); - } +public class AltarUpgrade +{ - public AltarUpgrade upgrade(BloodRuneType rune) { - upgradeLevels.compute(rune, (r, l) -> l == null ? 1 : l + 1); - return this; - } + private final EnumMap upgradeLevels; - public int getLevel(BloodRuneType rune) { - return upgradeLevels.getOrDefault(rune, 0); - } + public AltarUpgrade() + { + this.upgradeLevels = Maps.newEnumMap(BloodRuneType.class); + } + + public AltarUpgrade upgrade(BloodRuneType rune) + { + upgradeLevels.compute(rune, (r, l) -> l == null ? 1 : l + 1); + return this; + } + + public int getLevel(BloodRuneType rune) + { + return upgradeLevels.getOrDefault(rune, 0); + } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java index abbf30c4..9bdfd94c 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUtil.java @@ -1,86 +1,99 @@ -package WayofTime.bloodmagic.altar; +package wayoftime.bloodmagic.altar; + +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import org.apache.commons.lang3.tuple.Pair; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.block.BlockBloodRune; -import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Pair; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.common.block.BlockBloodRune; +import wayoftime.bloodmagic.tile.TileAltar; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; +public class AltarUtil +{ -public class AltarUtil { + @Nonnull + public static AltarTier getTier(World world, BlockPos pos) + { + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileAltar)) + return AltarTier.ONE; - @Nonnull - public static AltarTier getTier(World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (!(tile instanceof TileAltar)) - return AltarTier.ONE; + AltarTier lastCheck = AltarTier.ONE; + for (AltarTier tier : AltarTier.values()) + { + for (AltarComponent component : tier.getAltarComponents()) + { + BlockPos componentPos = pos.add(component.getOffset()); + BlockState worldState = world.getBlockState(componentPos); - AltarTier lastCheck = AltarTier.ONE; - for (AltarTier tier : AltarTier.values()) { - for (AltarComponent component : tier.getAltarComponents()) { - BlockPos componentPos = pos.add(component.getOffset()); - BlockState worldState = world.getBlockState(componentPos); + if (worldState.getBlock() instanceof IAltarComponent) + if (((IAltarComponent) worldState.getBlock()).getType(world, worldState, componentPos) == component.getComponent()) + continue; - if (worldState.getBlock() instanceof IAltarComponent) - if (((IAltarComponent) worldState.getBlock()).getType(world, worldState, componentPos) == component.getComponent()) - continue; + if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR + && !worldState.getMaterial().isLiquid()) + continue; - if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) - continue; + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); + if (!validStates.contains(worldState)) + return lastCheck; + } - List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); - if (!validStates.contains(worldState)) - return lastCheck; - } + lastCheck = tier; + } - lastCheck = tier; - } + return lastCheck; + } - return lastCheck; - } + @Nonnull + public static AltarUpgrade getUpgrades(World world, BlockPos pos, AltarTier currentTier) + { + AltarUpgrade upgrades = new AltarUpgrade(); - @Nonnull - public static AltarUpgrade getUpgrades(World world, BlockPos pos, AltarTier currentTier) { - AltarUpgrade upgrades = new AltarUpgrade(); + for (AltarComponent component : currentTier.getAltarComponents()) + { + if (!component.isUpgradeSlot() || component.getComponent() != ComponentType.BLOODRUNE) + continue; - for (AltarComponent component : currentTier.getAltarComponents()) { - if (!component.isUpgradeSlot() || component.getComponent() != ComponentType.BLOODRUNE) - continue; + BlockPos componentPos = pos.add(component.getOffset()); + BlockState state = world.getBlockState(componentPos); + if (state.getBlock() instanceof BlockBloodRune) + upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos)); + } - BlockPos componentPos = pos.add(component.getOffset()); - BlockState state = world.getBlockState(componentPos); - if (state.getBlock() instanceof BlockBloodRune) - upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos, state)); - } + return upgrades; + } - return upgrades; - } + @Nullable + public static Pair getFirstMissingComponent(World world, BlockPos pos, int altarTier) + { + if (altarTier >= AltarTier.MAXTIERS) + return null; - @Nullable - public static Pair getFirstMissingComponent(World world, BlockPos pos, int altarTier) { - if (altarTier >= AltarTier.MAXTIERS) - return null; + for (AltarTier tier : AltarTier.values()) + { + for (AltarComponent component : tier.getAltarComponents()) + { + BlockPos componentPos = pos.add(component.getOffset()); + BlockState worldState = world.getBlockState(componentPos); + if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR + && !worldState.getMaterial().isLiquid()) + continue; - for (AltarTier tier : AltarTier.values()) { - for (AltarComponent component : tier.getAltarComponents()) { - BlockPos componentPos = pos.add(component.getOffset()); - BlockState worldState = world.getBlockState(componentPos); - if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR && !worldState.getMaterial().isLiquid()) - continue; + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); + if (!validStates.contains(worldState)) + return Pair.of(componentPos, component.getComponent()); + } + } - List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); - if (!validStates.contains(worldState)) - return Pair.of(componentPos, component.getComponent()); - } - } - - return null; - } + return null; + } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 036aea15..34b6a77d 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,642 +1,818 @@ -package WayofTime.bloodmagic.altar; +package wayoftime.bloodmagic.altar; -import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.block.enums.BloodRuneType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.base.Enums; + import net.minecraft.block.BlockState; -import net.minecraft.block.RedstoneLampBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.particles.ParticleTypes; +import net.minecraft.particles.RedstoneParticleData; import net.minecraft.util.Direction; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.fluids.capability.templates.FluidTank; import net.minecraftforge.items.ItemHandlerHelper; - -public class BloodAltar implements IFluidHandler { - - public boolean isActive; - protected FluidStack fluidOutput = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); - protected FluidStack fluidInput = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); - private TileAltar tileAltar; - private int internalCounter = 0; - private AltarTier altarTier = AltarTier.ONE; - private AltarUpgrade upgrade; - private int capacity = Fluid.BUCKET_VOLUME * 10; - private FluidStack fluid = new FluidStack(BlockLifeEssence.getLifeEssence(), 0); - private int liquidRequired; // mB - private boolean canBeFilled; - private int consumptionRate; - private int drainRate; - private float consumptionMultiplier; - private float efficiencyMultiplier; - private float sacrificeEfficiencyMultiplier; - private float selfSacrificeEfficiencyMultiplier; - private float capacityMultiplier = 1; - private float orbCapacityMultiplier; - private float dislocationMultiplier; - private int accelerationUpgrades; - private boolean isUpgraded; - private boolean isResultBlock; - private int bufferCapacity = Fluid.BUCKET_VOLUME; - private int progress; - private int lockdownDuration; - private int demonBloodDuration; - private int totalCharge = 0; //TODO save - private int chargingRate = 0; - private int chargingFrequency = 0; - private int maxCharge = 0; - private int cooldownAfterCrafting = 60; - private RecipeBloodAltar recipe; - private AltarTier currentTierDisplayed = AltarTier.ONE; - - public BloodAltar(TileAltar tileAltar) { - this.tileAltar = tileAltar; - } - - public void readFromNBT(CompoundNBT tagCompound) { - if (!tagCompound.hasKey(Constants.NBT.EMPTY)) { - FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagCompound); - - if (fluid != null) - setMainFluid(fluid); - - FluidStack fluidOut = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInt(Constants.NBT.OUTPUT_AMOUNT)); - setOutputFluid(fluidOut); - - FluidStack fluidIn = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInt(Constants.NBT.INPUT_AMOUNT)); - setInputFluid(fluidIn); - } - - internalCounter = tagCompound.getInt("internalCounter"); - altarTier = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(AltarTier.ONE); - isActive = tagCompound.getBoolean(Constants.NBT.ALTAR_ACTIVE); - liquidRequired = tagCompound.getInt(Constants.NBT.ALTAR_LIQUID_REQ); - canBeFilled = tagCompound.getBoolean(Constants.NBT.ALTAR_FILLABLE); - isUpgraded = tagCompound.getBoolean(Constants.NBT.ALTAR_UPGRADED); - consumptionRate = tagCompound.getInt(Constants.NBT.ALTAR_CONSUMPTION_RATE); - drainRate = tagCompound.getInt(Constants.NBT.ALTAR_DRAIN_RATE); - consumptionMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER); - efficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER); - selfSacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER); - sacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER); - capacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER); - orbCapacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER); - dislocationMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER); - capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); - bufferCapacity = tagCompound.getInt(Constants.NBT.ALTAR_BUFFER_CAPACITY); - progress = tagCompound.getInt(Constants.NBT.ALTAR_PROGRESS); - isResultBlock = tagCompound.getBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK); - lockdownDuration = tagCompound.getInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION); - accelerationUpgrades = tagCompound.getInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); - demonBloodDuration = tagCompound.getInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); - cooldownAfterCrafting = tagCompound.getInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); - chargingRate = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_RATE); - chargingFrequency = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY); - totalCharge = tagCompound.getInt(Constants.NBT.ALTAR_TOTAL_CHARGE); - maxCharge = tagCompound.getInt(Constants.NBT.ALTAR_MAX_CHARGE); - currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); - } - - public void writeToNBT(CompoundNBT tagCompound) { - - if (fluid != null) - fluid.writeToNBT(tagCompound); - else - tagCompound.putString(Constants.NBT.EMPTY, ""); - - if (fluidOutput != null) - tagCompound.putInt(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.amount); - - if (fluidInput != null) - tagCompound.putInt(Constants.NBT.INPUT_AMOUNT, fluidInput.amount); - - tagCompound.putInt("internalCounter", internalCounter); - tagCompound.putString(Constants.NBT.ALTAR_TIER, altarTier.name()); - tagCompound.putBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); - tagCompound.putInt(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); - tagCompound.putBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); - tagCompound.putBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); - tagCompound.putInt(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); - tagCompound.putInt(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); - tagCompound.putFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); - tagCompound.putBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); - tagCompound.putFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); - tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); - tagCompound.putInt(Constants.NBT.ALTAR_PROGRESS, progress); - tagCompound.putInt(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); - tagCompound.putInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); - tagCompound.putInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); - tagCompound.putInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); - tagCompound.putInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); - tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); - tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); - tagCompound.putInt(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); - tagCompound.putInt(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); - tagCompound.putString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); - } - - public void startCycle() { - if (tileAltar.getWorld() != null) - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - - checkTier(); - - if ((fluid == null || fluid.amount <= 0) && totalCharge <= 0) - return; - - if (!isActive) - progress = 0; - - ItemStack input = tileAltar.getStackInSlot(0); - - if (!input.isEmpty()) { - // Do recipes - RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(input); - if (recipe != null) { - if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) { - this.isActive = true; - this.recipe = recipe; - this.liquidRequired = recipe.getSyphon(); - this.consumptionRate = recipe.getConsumeRate(); - this.drainRate = recipe.getDrainRate(); - this.canBeFilled = false; - return; - } - } else if (input.getItem() instanceof IBloodOrb) { - BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); - this.isActive = canBeFilled = orb != null && altarTier.toInt() >= orb.getTier(); - return; - } - } - - isActive = false; - } - - public void update() { - World world = tileAltar.getWorld(); - BlockPos pos = tileAltar.getPos(); - - if (world.isRemote) - return; - - // Used instead of the world time for checks that do not happen every tick - internalCounter++; - - if (lockdownDuration > 0) - lockdownDuration--; - - if (internalCounter % 20 == 0) { - for (Direction facing : Direction.VALUES) { - BlockPos newPos = pos.offset(facing); - BlockState block = world.getBlockState(newPos); - block.getBlock().onNeighborChange(world, newPos, pos); - } - } - if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) { - int syphonMax = (int) (20 * this.dislocationMultiplier); - int fluidInputted; - int fluidOutputted; - fluidInputted = Math.min(syphonMax, -this.fluid.amount + capacity); - fluidInputted = Math.min(this.fluidInput.amount, fluidInputted); - this.fluid.amount += fluidInputted; - this.fluidInput.amount -= fluidInputted; - fluidOutputted = Math.min(syphonMax, this.bufferCapacity - this.fluidOutput.amount); - fluidOutputted = Math.min(this.fluid.amount, fluidOutputted); - this.fluidOutput.amount += fluidOutputted; - this.fluid.amount -= fluidOutputted; - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) { - int chargeInputted = Math.min(chargingRate, this.fluid.amount); - chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge); - totalCharge += chargeInputted; - this.fluid.amount -= chargeInputted; - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) { - /* Redstone Lamp below altar: Switch Off */ - BlockState state = world.getBlockState(pos); - if (state.getValue(BlockAltar.POWERED)) { - world.setBlockState(pos, state.cycleProperty(BlockAltar.POWERED), 3); - world.notifyNeighborsOfStateChange(pos, RegistrarBloodMagicBlocks.ALTAR, false); - } - startCycle(); - } - - updateAltar(); - } - - private void updateAltar() { - if (!isActive) { - if (cooldownAfterCrafting > 0) - cooldownAfterCrafting--; - return; - } - - if (!canBeFilled && recipe == null) { - startCycle(); - return; - } - - ItemStack input = tileAltar.getStackInSlot(0); - - if (input.isEmpty()) - return; - - World world = tileAltar.getWorld(); - BlockPos pos = tileAltar.getPos(); - - if (world.isRemote) - return; - - if (!canBeFilled) { - boolean hasOperated = false; - int stackSize = input.getCount(); - - if (totalCharge > 0) { - int chargeDrained = Math.min(liquidRequired * stackSize - progress, totalCharge); - - totalCharge -= chargeDrained; - progress += chargeDrained; - - hasOperated = true; - } - if (fluid != null && fluid.amount >= 1) { - int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); - - if (liquidDrained > (liquidRequired * stackSize - progress)) - liquidDrained = liquidRequired * stackSize - progress; - - fluid.amount = fluid.amount - liquidDrained; - progress += liquidDrained; - - hasOperated = true; - - if (internalCounter % 4 == 0 && world instanceof ServerWorld) { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.2, 0, 0.2, 0); - } - - } else if (!hasOperated && progress > 0) { - progress = Math.max(0, progress - (int) (efficiencyMultiplier * drainRate)); - - if (internalCounter % 2 == 0 && world instanceof ServerWorld) { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0); - } - } - - if (hasOperated) { - if (progress >= liquidRequired * stackSize) { - ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); - - BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(result, input.copy()); - MinecraftForge.EVENT_BUS.post(event); - tileAltar.setInventorySlotContents(0, event.getOutput()); - progress = 0; - - if (world instanceof ServerWorld) { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); - } - - /* Redstone Lamp below altar: Switch On */ - /* Switches on when crafting finishes */ - if (world.getBlockState(pos.down()).getBlock() instanceof RedstoneLampBlock) { - world.setBlockState(pos, world.getBlockState(pos).cycleProperty(BlockAltar.POWERED), 3); - world.notifyNeighborsOfStateChange(pos, RegistrarBloodMagicBlocks.ALTAR, false); - } - - this.cooldownAfterCrafting = 30; - this.isActive = false; - } - } - } else { - ItemStack contained = tileAltar.getStackInSlot(0); - - if (contained.isEmpty() || !(contained.getItem() instanceof IBloodOrb) || !(contained.getItem() instanceof IBindable)) - return; - - BloodOrb orb = ((IBloodOrb) contained.getItem()).getOrb(contained); - Binding binding = ((IBindable) contained.getItem()).getBinding(contained); - - if (binding == null || orb == null) - return; - - if (fluid != null && fluid.amount >= 1) { - int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); - int drain = NetworkHelper.getSoulNetwork(binding).add(SoulTicket.block(world, pos, liquidDrained), (int) (orb.getCapacity() * this.orbCapacityMultiplier)); - fluid.amount = fluid.amount - drain; - - if (drain > 0 && internalCounter % 4 == 0 && world instanceof ServerWorld) { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(EnumParticleTypes.SPELL_WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0, 0, 0, 0.001); - } - } - } - - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - public void checkTier() { - AltarTier tier = AltarUtil.getTier(tileAltar.getWorld(), tileAltar.getPos()); - this.altarTier = tier; - - upgrade = AltarUtil.getUpgrades(tileAltar.getWorld(), tileAltar.getPos(), tier); - - if (tier.equals(currentTierDisplayed)) - currentTierDisplayed = AltarTier.ONE; - - if (tier.equals(AltarTier.ONE)) { - upgrade = null; - isUpgraded = false; - this.consumptionMultiplier = 0; - this.efficiencyMultiplier = 1; - this.sacrificeEfficiencyMultiplier = 0; - this.selfSacrificeEfficiencyMultiplier = 0; - this.capacityMultiplier = 1; - this.orbCapacityMultiplier = 1; - this.dislocationMultiplier = 1; - this.accelerationUpgrades = 0; - this.chargingFrequency = 20; - this.chargingRate = 0; - this.maxCharge = 0; - this.totalCharge = 0; - return; - } else if (!tier.equals(AltarTier.ONE)) { - this.isUpgraded = true; - this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); - this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); - this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getLevel(BloodRuneType.EFFICIENCY)); - this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SACRIFICE)); - this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SELF_SACRIFICE)); - this.capacityMultiplier = (float) ((1 * Math.pow(1.10, upgrade.getLevel(BloodRuneType.AUGMENTED_CAPACITY))) + 0.20 * upgrade.getLevel(BloodRuneType.CAPACITY)); - this.dislocationMultiplier = (float) (Math.pow(1.2, upgrade.getLevel(BloodRuneType.DISPLACEMENT))); - this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrade.getLevel(BloodRuneType.ORB)); - this.chargingFrequency = Math.max(20 - accelerationUpgrades, 1); - this.chargingRate = (int) (10 * upgrade.getLevel(BloodRuneType.CHARGING) * (1 + consumptionMultiplier / 2)); - this.maxCharge = (int) (Fluid.BUCKET_VOLUME * Math.max(0.5 * capacityMultiplier, 1) * upgrade.getLevel(BloodRuneType.CHARGING)); - } - - this.capacity = (int) (Fluid.BUCKET_VOLUME * 10 * capacityMultiplier); - this.bufferCapacity = (int) (Fluid.BUCKET_VOLUME * 1 * capacityMultiplier); - - if (this.fluid.amount > this.capacity) - this.fluid.amount = this.capacity; - if (this.fluidOutput.amount > this.bufferCapacity) - this.fluidOutput.amount = this.bufferCapacity; - if (this.fluidInput.amount > this.bufferCapacity) - this.fluidInput.amount = this.bufferCapacity; - if (this.totalCharge > this.maxCharge) - this.totalCharge = this.maxCharge; - - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - public int fillMainTank(int amount) { - int filledAmount = Math.min(capacity - fluid.amount, amount); - fluid.amount += filledAmount; - - return filledAmount; - } - - public void sacrificialDaggerCall(int amount, boolean isSacrifice) { - if (this.lockdownDuration > 0) { - int amt = (int) Math.min(bufferCapacity - fluidInput.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); - fluidInput.amount += amt; - } else { - fluid.amount += Math.min(capacity - fluid.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); - } - } - - public void setMainFluid(FluidStack fluid) { - this.fluid = fluid; - } - - public void setOutputFluid(FluidStack fluid) { - this.fluidOutput = fluid; - } - - public void setInputFluid(FluidStack fluid) { - this.fluidInput = fluid; - } - - public AltarUpgrade getUpgrade() { - return upgrade; - } - - public void setUpgrade(AltarUpgrade upgrade) { - this.upgrade = upgrade; - } - - public int getCapacity() { - return capacity; - } - - public FluidStack getFluid() { - return fluid; - } - - public int getFluidAmount() { - return fluid.amount; - } - - public int getCurrentBlood() { - return getFluidAmount(); - } - - public AltarTier getTier() { - return altarTier; - } - - public void setTier(AltarTier tier) { - this.altarTier = tier; - } - - public int getProgress() { - return progress; - } - - public float getSacrificeMultiplier() { - return sacrificeEfficiencyMultiplier; - } - - public float getSelfSacrificeMultiplier() { - return selfSacrificeEfficiencyMultiplier; - } - - public float getOrbMultiplier() { - return orbCapacityMultiplier; - } - - public float getDislocationMultiplier() { - return dislocationMultiplier; - } - - public float getConsumptionMultiplier() { - return consumptionMultiplier; - } - - public float getConsumptionRate() { - return consumptionRate; - } - - public int getLiquidRequired() { - return liquidRequired; - } - - public int getBufferCapacity() { - return bufferCapacity; - } - - public boolean setCurrentTierDisplayed(AltarTier altarTier) { - if (currentTierDisplayed == altarTier) - return false; - else - currentTierDisplayed = altarTier; - return true; - } - - public void addToDemonBloodDuration(int dur) { - this.demonBloodDuration += dur; - } - - public boolean hasDemonBlood() { - return this.demonBloodDuration > 0; - } - - public void decrementDemonBlood() { - this.demonBloodDuration = Math.max(0, this.demonBloodDuration - 1); - } - - public void setActive() { - if (tileAltar.getStackInSlot(0).isEmpty()) { - isActive = false; - } - } - - public boolean isActive() { - return isActive; - } - - public void requestPauseAfterCrafting(int amount) { - if (this.isActive) { - this.cooldownAfterCrafting = amount; - } - } - - public int getChargingRate() { - return chargingRate; - } - - public int getTotalCharge() { - return totalCharge; - } - - public int getChargingFrequency() { - return chargingFrequency == 0 ? 1 : chargingFrequency; - } - - @Override - public int fill(FluidStack resource, boolean doFill) { - if (resource == null || resource.getFluid() != BlockLifeEssence.getLifeEssence()) { - return 0; - } - - if (!doFill) { - if (fluidInput == null) { - return Math.min(bufferCapacity, resource.amount); - } - - if (!fluidInput.isFluidEqual(resource)) { - return 0; - } - - return Math.min(bufferCapacity - fluidInput.amount, resource.amount); - } - - if (fluidInput == null) { - fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.amount)); - - return fluidInput.amount; - } - - if (!fluidInput.isFluidEqual(resource)) { - return 0; - } - int filled = bufferCapacity - fluidInput.amount; - - if (resource.amount < filled) { - fluidInput.amount += resource.amount; - filled = resource.amount; - } else { - fluidInput.amount = bufferCapacity; - } - - return filled; - } - - @Override - public FluidStack drain(FluidStack resource, boolean doDrain) { - if (resource == null || !resource.isFluidEqual(fluidOutput)) { - return null; - } - return drain(resource.amount, doDrain); - } - - @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - if (fluidOutput == null) { - return null; - } - - int drained = maxDrain; - if (fluidOutput.amount < drained) { - drained = fluidOutput.amount; - } - - FluidStack stack = new FluidStack(fluidOutput, drained); - if (doDrain) { - fluidOutput.amount -= drained; - } - return stack; - } - - @Override - public IFluidTankProperties[] getTankProperties() { - return new IFluidTankProperties[]{new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity))}; - } - - public AltarTier getCurrentTierDisplayed() { - return currentTierDisplayed; - } -} +import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.block.enums.BloodRuneType; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.iface.IBindable; +import wayoftime.bloodmagic.orb.BloodOrb; +import wayoftime.bloodmagic.orb.IBloodOrb; +import wayoftime.bloodmagic.tile.TileAltar; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NetworkHelper; + +public class BloodAltar// implements IFluidHandler +{ + + public boolean isActive; + + protected FluidStack fluidOutput = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 0); // TODO: Fix + protected FluidStack fluidInput = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 0); + + protected FluidTank tank = new FluidTank(FluidAttributes.BUCKET_VOLUME); + + private final LazyOptional holder = LazyOptional.of(() -> tank); + + private TileAltar tileAltar; + private int internalCounter = 0; + private AltarTier altarTier = AltarTier.ONE; + private AltarUpgrade upgrade; + private int capacity = FluidAttributes.BUCKET_VOLUME * 10; + private FluidStack fluid = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 0); + private int liquidRequired; // mB + private boolean canBeFilled; + private int consumptionRate; + private int drainRate; + private float consumptionMultiplier; + private float efficiencyMultiplier; + private float sacrificeEfficiencyMultiplier; + private float selfSacrificeEfficiencyMultiplier; + private float capacityMultiplier = 1; + private float orbCapacityMultiplier; + private float dislocationMultiplier; + private int accelerationUpgrades; + private boolean isUpgraded; + private boolean isResultBlock; + private int bufferCapacity = FluidAttributes.BUCKET_VOLUME; + private int progress; + private int lockdownDuration; + private int demonBloodDuration; + private int totalCharge = 0; // TODO save + private int chargingRate = 0; + private int chargingFrequency = 0; + private int maxCharge = 0; + private int cooldownAfterCrafting = 60; + private RecipeBloodAltar recipe; + private AltarTier currentTierDisplayed = AltarTier.ONE; + + public BloodAltar(TileAltar tileAltar) + { + this.tileAltar = tileAltar; + } + + public void readFromNBT(CompoundNBT tagCompound) + { + if (!tagCompound.contains(Constants.NBT.EMPTY)) + { + FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagCompound); + + if (fluid != null) + { + setMainFluid(new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), fluid.getAmount())); +// setMainFluid(fluid); + } else + { +// setMainFluid(new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), fluid.getAmount())); + } + + FluidStack fluidOut = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), tagCompound.getInt(Constants.NBT.OUTPUT_AMOUNT)); + setOutputFluid(fluidOut); + + FluidStack fluidIn = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), tagCompound.getInt(Constants.NBT.INPUT_AMOUNT)); + setInputFluid(fluidIn); + } + + internalCounter = tagCompound.getInt("internalCounter"); + altarTier = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(AltarTier.ONE); + isActive = tagCompound.getBoolean(Constants.NBT.ALTAR_ACTIVE); + liquidRequired = tagCompound.getInt(Constants.NBT.ALTAR_LIQUID_REQ); + canBeFilled = tagCompound.getBoolean(Constants.NBT.ALTAR_FILLABLE); + isUpgraded = tagCompound.getBoolean(Constants.NBT.ALTAR_UPGRADED); + consumptionRate = tagCompound.getInt(Constants.NBT.ALTAR_CONSUMPTION_RATE); + drainRate = tagCompound.getInt(Constants.NBT.ALTAR_DRAIN_RATE); + consumptionMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER); + efficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER); + selfSacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER); + sacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER); + capacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER); + orbCapacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER); + dislocationMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER); + capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); + bufferCapacity = tagCompound.getInt(Constants.NBT.ALTAR_BUFFER_CAPACITY); + progress = tagCompound.getInt(Constants.NBT.ALTAR_PROGRESS); + isResultBlock = tagCompound.getBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK); + lockdownDuration = tagCompound.getInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION); + accelerationUpgrades = tagCompound.getInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); + demonBloodDuration = tagCompound.getInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); + cooldownAfterCrafting = tagCompound.getInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); + chargingRate = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_RATE); + chargingFrequency = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY); + totalCharge = tagCompound.getInt(Constants.NBT.ALTAR_TOTAL_CHARGE); + maxCharge = tagCompound.getInt(Constants.NBT.ALTAR_MAX_CHARGE); + currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); + } + + public void writeToNBT(CompoundNBT tagCompound) + { + + if (fluid != null) + fluid.writeToNBT(tagCompound); + else + tagCompound.putString(Constants.NBT.EMPTY, ""); + + if (fluidOutput != null) + tagCompound.putInt(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.getAmount()); + + if (fluidInput != null) + tagCompound.putInt(Constants.NBT.INPUT_AMOUNT, fluidInput.getAmount()); + + tagCompound.putInt("internalCounter", internalCounter); + tagCompound.putString(Constants.NBT.ALTAR_TIER, altarTier.name()); + tagCompound.putBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); + tagCompound.putInt(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); + tagCompound.putBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); + tagCompound.putBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); + tagCompound.putInt(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); + tagCompound.putInt(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); + tagCompound.putFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); + tagCompound.putBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); + tagCompound.putFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); + tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); + tagCompound.putInt(Constants.NBT.ALTAR_PROGRESS, progress); + tagCompound.putInt(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); + tagCompound.putInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); + tagCompound.putInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); + tagCompound.putInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); + tagCompound.putInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); + tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); + tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); + tagCompound.putInt(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); + tagCompound.putInt(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); + tagCompound.putString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); + } + + public void startCycle() + { +// System.out.println("Starting Cycle"); + if (tileAltar.getWorld() != null) + tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); + + checkTier(); + + // Temporary thing to test the recipes. +// fluid.setAmount(10000); +// this.setMainFluid(new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 10000)); + + if ((fluid == null || fluid.getAmount() <= 0) && totalCharge <= 0) + return; + + if (!isActive) + progress = 0; + + ItemStack input = tileAltar.getStackInSlot(0); + + if (!input.isEmpty()) + { + // Do recipes + RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(tileAltar.getWorld(), input); + if (recipe != null) + { + if (recipe.getMinimumTier().ordinal() <= altarTier.ordinal()) + { + this.isActive = true; + this.recipe = recipe; + this.liquidRequired = recipe.getSyphon(); + this.consumptionRate = recipe.getConsumeRate(); + this.drainRate = recipe.getDrainRate(); + this.canBeFilled = false; + return; + } + } else if (input.getItem() instanceof IBloodOrb) + { + this.isActive = true; + this.canBeFilled = true; + return; + } + } + + isActive = false; + } + + public void update() + { +// World world = tileAltar.getWorld(); +// +// RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(world, new ItemStack(Items.DIAMOND)); +// +// if (recipe != null) +// { +// System.out.println("Found a recipe!"); +// } +// +// List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR); +// +// System.out.println("There are currently " + altarRecipes.size() + " Altar Recipes loaded."); +// + World world = tileAltar.getWorld(); + BlockPos pos = tileAltar.getPos(); + + if (world.isRemote) + return; + + // Used instead of the world time for checks that do not happen every tick + internalCounter++; + + if (lockdownDuration > 0) + lockdownDuration--; + + if (internalCounter % 20 == 0) + { + for (Direction facing : Direction.values()) + { + BlockPos newPos = pos.offset(facing); + BlockState block = world.getBlockState(newPos); + block.getBlock().onNeighborChange(block, world, newPos, pos); + } + } + if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) + { + int syphonMax = (int) (20 * this.dislocationMultiplier); + int fluidInputted; + int fluidOutputted; + fluidInputted = Math.min(syphonMax, -this.fluid.getAmount() + capacity); + fluidInputted = Math.min(this.fluidInput.getAmount(), fluidInputted); + this.fluid.setAmount(this.fluid.getAmount() + fluidInputted); + this.fluidInput.setAmount(this.fluidInput.getAmount() - fluidInputted); + fluidOutputted = Math.min(syphonMax, this.bufferCapacity - this.fluidOutput.getAmount()); + fluidOutputted = Math.min(this.fluid.getAmount(), fluidOutputted); + this.fluidOutput.setAmount(this.fluidOutput.getAmount() + fluidOutputted); + this.fluid.setAmount(this.fluid.getAmount() - fluidOutputted); + tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); + } + + if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) + { +// int chargeInputted = Math.min(chargingRate, this.fluid.getAmount()); +// chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge); +// totalCharge += chargeInputted; +// this.fluid.setAmount(this.fluid.getAmount() - chargeInputted); +// tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); + } + + if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) + startCycle(); + + updateAltar(); + } + + private void updateAltar() + { +// System.out.println("Updating altar."); + if (!isActive) + { + if (cooldownAfterCrafting > 0) + cooldownAfterCrafting--; + return; + } + + if (!canBeFilled && recipe == null) + { + startCycle(); + return; + } + + ItemStack input = tileAltar.getStackInSlot(0); + + if (input.isEmpty()) + return; + + World world = tileAltar.getWorld(); + BlockPos pos = tileAltar.getPos(); + + if (world.isRemote) + return; + + if (!canBeFilled) + { + boolean hasOperated = false; + int stackSize = input.getCount(); + + if (totalCharge > 0) + { + int chargeDrained = Math.min(liquidRequired * stackSize - progress, totalCharge); + + totalCharge -= chargeDrained; + progress += chargeDrained; + hasOperated = true; + } + if (fluid != null && fluid.getAmount() >= 1) + { + System.out.println("Draining in order to craft! Progress: " + progress + "/" + liquidRequired); +// int liquidDrained = Math.min((int) (altarTier.ordinal() >= 1 +// ? consumptionRate * (1 + consumptionMultiplier) +// : consumptionRate), fluid.getAmount()); + int liquidDrained = Math.min((int) (consumptionRate * (1 + consumptionMultiplier)), fluid.getAmount()); + + if (liquidDrained > (liquidRequired * stackSize - progress)) + liquidDrained = liquidRequired * stackSize - progress; + + fluid.setAmount(fluid.getAmount() - liquidDrained); + progress += liquidDrained; + + hasOperated = true; + + if (internalCounter % 4 == 0 && world instanceof ServerWorld) + { + ServerWorld server = (ServerWorld) world; +// server.spawnParticle(ParticleTypes.SPLASH, (double) pos.getX() +// + worldIn.rand.nextDouble(), (double) (pos.getY() + 1), (double) pos.getZ() +// + worldIn.rand.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); + server.spawnParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5, pos.getY() + + 1.0, pos.getZ() + 0.5, 1, 0.2, 0.0, 0.2, 0.0); + } + + } else if (!hasOperated && progress > 0) + { + progress -= (int) (efficiencyMultiplier * drainRate); + + if (internalCounter % 2 == 0 && world instanceof ServerWorld) + { + ServerWorld server = (ServerWorld) world; + server.spawnParticle(ParticleTypes.LARGE_SMOKE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + + 0.5, 1, 0.1, 0, 0.1, 0); + } + } + + if (hasOperated) + { + if (progress >= liquidRequired * stackSize) + { + ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); + + BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(result, input.copy()); + MinecraftForge.EVENT_BUS.post(event); + tileAltar.setInventorySlotContents(0, event.getOutput()); + progress = 0; + + if (world instanceof ServerWorld) + { + ServerWorld server = (ServerWorld) world; + server.spawnParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5, pos.getY() + + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); + } + + this.cooldownAfterCrafting = 30; + this.isActive = false; + } + } + } else + { + ItemStack contained = tileAltar.getStackInSlot(0); + + if (contained.isEmpty() || !(contained.getItem() instanceof IBloodOrb) + || !(contained.getItem() instanceof IBindable)) + return; + + BloodOrb orb = ((IBloodOrb) contained.getItem()).getOrb(contained); + Binding binding = ((IBindable) contained.getItem()).getBinding(contained); + + if (binding == null || orb == null) + return; + + if (fluid != null && fluid.getAmount() >= 1) + { +// int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 +// ? orb.getFillRate() * (1 + consumptionMultiplier) +// : orb.getFillRate()), fluid.getAmount()); + int liquidDrained = Math.min((int) (orb.getFillRate() + * (1 + consumptionMultiplier)), fluid.getAmount()); + int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() + * this.orbCapacityMultiplier)); + fluid.setAmount(fluid.getAmount() - drain); + + if (drain > 0 && internalCounter % 4 == 0 && world instanceof ServerWorld) + { + ServerWorld server = (ServerWorld) world; + server.spawnParticle(ParticleTypes.WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + + 0.5, 1, 0, 0, 0, 0.001); + } + } + } + + tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); + } + + public void checkTier() + { + AltarTier tier = AltarUtil.getTier(tileAltar.getWorld(), tileAltar.getPos()); + this.altarTier = tier; + + upgrade = AltarUtil.getUpgrades(tileAltar.getWorld(), tileAltar.getPos(), tier); + + if (tier.equals(currentTierDisplayed)) + currentTierDisplayed = AltarTier.ONE; + + if (tier.equals(AltarTier.ONE)) + { + upgrade = null; + isUpgraded = false; + this.consumptionMultiplier = 0; + this.efficiencyMultiplier = 1; + this.sacrificeEfficiencyMultiplier = 0; + this.selfSacrificeEfficiencyMultiplier = 0; + this.capacityMultiplier = 1; + this.orbCapacityMultiplier = 1; + this.dislocationMultiplier = 1; + this.accelerationUpgrades = 0; + this.chargingFrequency = 20; + this.chargingRate = 0; + this.maxCharge = 0; + this.totalCharge = 0; + return; + } else if (!tier.equals(AltarTier.ONE)) + { + this.isUpgraded = true; + this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); + this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); + this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getLevel(BloodRuneType.EFFICIENCY)); + this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SACRIFICE)); + this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SELF_SACRIFICE)); + this.capacityMultiplier = (float) ((1 * Math.pow(1.10, upgrade.getLevel(BloodRuneType.AUGMENTED_CAPACITY))) + + 0.20 * upgrade.getLevel(BloodRuneType.CAPACITY)); + this.dislocationMultiplier = (float) (Math.pow(1.2, upgrade.getLevel(BloodRuneType.DISPLACEMENT))); + this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrade.getLevel(BloodRuneType.ORB)); + this.chargingFrequency = Math.max(20 - accelerationUpgrades, 1); + this.chargingRate = (int) (10 * upgrade.getLevel(BloodRuneType.CHARGING) * (1 + consumptionMultiplier / 2)); + this.maxCharge = (int) (FluidAttributes.BUCKET_VOLUME * Math.max(0.5 * capacityMultiplier, 1) + * upgrade.getLevel(BloodRuneType.CHARGING)); + } + + this.capacity = (int) (FluidAttributes.BUCKET_VOLUME * 10 * capacityMultiplier); + this.bufferCapacity = (int) (FluidAttributes.BUCKET_VOLUME * 1 * capacityMultiplier); + + if (this.fluid.getAmount() > this.capacity) + this.fluid.setAmount(this.capacity); + if (this.fluidOutput.getAmount() > this.bufferCapacity) + this.fluidOutput.setAmount(this.bufferCapacity); + if (this.fluidInput.getAmount() > this.bufferCapacity) + this.fluidInput.setAmount(this.bufferCapacity); + if (this.totalCharge > this.maxCharge) + this.totalCharge = this.maxCharge; + + tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); + } + + public int fillMainTank(int amount) + { + int filledAmount = Math.min(capacity - fluid.getAmount(), amount); + fluid.setAmount(fluid.getAmount() + filledAmount); + + return filledAmount; + } + + public void sacrificialDaggerCall(int amount, boolean isSacrifice) + { + if (this.lockdownDuration > 0) + { + int amt = (int) Math.min(bufferCapacity + - fluidInput.getAmount(), (isSacrifice ? 1 + sacrificeEfficiencyMultiplier + : 1 + selfSacrificeEfficiencyMultiplier) * amount); + fluidInput.setAmount(fluidInput.getAmount() + amt); + } else + { + fluid.setAmount((int) (fluid.getAmount() + + Math.min(capacity - fluid.getAmount(), (isSacrifice ? 1 + sacrificeEfficiencyMultiplier + : 1 + selfSacrificeEfficiencyMultiplier) * amount))); + } + } + + public void setMainFluid(FluidStack fluid) + { + this.fluid = fluid; + } + + public void setOutputFluid(FluidStack fluid) + { + this.fluidOutput = fluid; + } + + public void setInputFluid(FluidStack fluid) + { + this.fluidInput = fluid; + } + + public AltarUpgrade getUpgrade() + { + return upgrade; + } + + public void setUpgrade(AltarUpgrade upgrade) + { + this.upgrade = upgrade; + } + + public int getCapacity() + { + return capacity; + } + + public FluidStack getFluid() + { + return fluid; + } + + public int getFluidAmount() + { + return fluid.getAmount(); + } + + public int getCurrentBlood() + { + return getFluidAmount(); + } + + public AltarTier getTier() + { + return altarTier; + } + + public void setTier(AltarTier tier) + { + this.altarTier = tier; + } + + public int getProgress() + { + return progress; + } + + public float getSacrificeMultiplier() + { + return sacrificeEfficiencyMultiplier; + } + + public float getSelfSacrificeMultiplier() + { + return selfSacrificeEfficiencyMultiplier; + } + + public float getOrbMultiplier() + { + return orbCapacityMultiplier; + } + + public float getDislocationMultiplier() + { + return dislocationMultiplier; + } + + public float getConsumptionMultiplier() + { + return consumptionMultiplier; + } + + public float getConsumptionRate() + { + return consumptionRate; + } + + public int getLiquidRequired() + { + return liquidRequired; + } + + public int getBufferCapacity() + { + return bufferCapacity; + } + + public boolean setCurrentTierDisplayed(AltarTier altarTier) + { + if (currentTierDisplayed == altarTier) + return false; + else + currentTierDisplayed = altarTier; + return true; + } + + public void addToDemonBloodDuration(int dur) + { + this.demonBloodDuration += dur; + } + + public boolean hasDemonBlood() + { + return this.demonBloodDuration > 0; + } + + public void decrementDemonBlood() + { + this.demonBloodDuration = Math.max(0, this.demonBloodDuration - 1); + } + + public void setActive() + { +// if (tileAltar.getStackInSlot(0).isEmpty()) +// { +// isActive = false; +// } + } + + public boolean isActive() + { + return isActive; + } + + public void requestPauseAfterCrafting(int amount) + { + if (this.isActive) + { + this.cooldownAfterCrafting = amount; + } + } + + public int getChargingRate() + { + return chargingRate; + } + + public int getTotalCharge() + { + return totalCharge; + } + + public int getChargingFrequency() + { + return chargingFrequency == 0 ? 1 : chargingFrequency; + } + + public int fill(FluidStack resource, boolean doFill) + { + if (resource == null || resource.getFluid() != BloodMagicBlocks.LIFE_ESSENCE_FLUID.get()) + { + return 0; + } + + if (!doFill) + { + if (fluidInput == null) + { + return Math.min(bufferCapacity, resource.getAmount()); + } + + if (!fluidInput.isFluidEqual(resource)) + { + return 0; + } + + return Math.min(bufferCapacity - fluidInput.getAmount(), resource.getAmount()); + } + + if (fluidInput == null) + { + fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.getAmount())); + + return fluidInput.getAmount(); + } + + if (!fluidInput.isFluidEqual(resource)) + { + return 0; + } + int filled = bufferCapacity - fluidInput.getAmount(); + + if (resource.getAmount() < filled) + { + fluidInput.setAmount(fluidInput.getAmount() + resource.getAmount()); + filled = resource.getAmount(); + } else + { + fluidInput.setAmount(bufferCapacity); + } + + return filled; + } + + public FluidStack drain(FluidStack resource, boolean doDrain) + { + if (resource == null || !resource.isFluidEqual(fluidOutput)) + { + return null; + } + return drain(resource.getAmount(), doDrain); + } + + public FluidStack drain(int maxDrain, boolean doDrain) + { + if (fluidOutput == null) + { + return null; + } + + int drained = maxDrain; + if (fluidOutput.getAmount() < drained) + { + drained = fluidOutput.getAmount(); + } + + FluidStack stack = new FluidStack(fluidOutput, drained); + if (doDrain) + { + fluidOutput.setAmount(fluidOutput.getAmount() - drained); + } + return stack; + } + +// @Override +// public IFluidTankProperties[] getTankProperties() +// { +// return new IFluidTankProperties[] +// { new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity)) }; +// } + + public AltarTier getCurrentTierDisplayed() + { + return currentTierDisplayed; + } + + static class VariableSizeFluidHandler implements IFluidHandler + { + BloodAltar altar; + + VariableSizeFluidHandler(BloodAltar altar) + { + this.altar = altar; + } + + @Override + public int getTanks() + { + // TODO Auto-generated method stub + return 1; + } + + @Override + public FluidStack getFluidInTank(int tank) + { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getTankCapacity(int tank) + { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isFluidValid(int tank, FluidStack stack) + { + return false; + } + + @Override + public int fill(FluidStack resource, FluidAction action) + { + return altar.fill(resource, action == FluidAction.EXECUTE); + } + + @Override + public FluidStack drain(FluidStack resource, FluidAction action) + { + return altar.drain(resource, action == FluidAction.EXECUTE); + } + + @Override + public FluidStack drain(int maxDrain, FluidAction action) + { + // TODO Auto-generated method stub + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/altar/ComponentType.java b/src/main/java/WayofTime/bloodmagic/altar/ComponentType.java index 1eec1f0d..6c9c6a5e 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/ComponentType.java +++ b/src/main/java/WayofTime/bloodmagic/altar/ComponentType.java @@ -1,27 +1,25 @@ -package WayofTime.bloodmagic.altar; +package wayoftime.bloodmagic.altar; import java.util.Locale; /** * List of different components used to construct different tiers of altars. */ -public enum ComponentType { - GLOWSTONE, - BLOODSTONE, - BEACON, - BLOODRUNE, - CRYSTAL, - NOTAIR; +public enum ComponentType +{ + GLOWSTONE, BLOODSTONE, BEACON, BLOODRUNE, CRYSTAL, NOTAIR; - public static final ComponentType[] VALUES = values(); - private static final String BASE = "chat.bloodmagic.altar.comp."; - private String key; + public static final ComponentType[] VALUES = values(); + private static final String BASE = "chat.bloodmagic.altar.comp."; + private String key; - ComponentType() { - this.key = BASE + name().toLowerCase(Locale.ENGLISH); - } + ComponentType() + { + this.key = BASE + name().toLowerCase(Locale.ENGLISH); + } - public String getKey() { - return key; - } -} + public String getKey() + { + return key; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java index b1b4635a..3ecc87d6 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java @@ -1,12 +1,13 @@ -package WayofTime.bloodmagic.altar; +package wayoftime.bloodmagic.altar; + +import javax.annotation.Nullable; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; - -public interface IAltarComponent { - @Nullable - ComponentType getType(World world, BlockState state, BlockPos pos); -} +public interface IAltarComponent +{ + @Nullable + ComponentType getType(World world, BlockState state, BlockPos pos); +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java deleted file mode 100644 index 5ce9f00c..00000000 --- a/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java +++ /dev/null @@ -1,8 +0,0 @@ -package WayofTime.bloodmagic.altar; - -/** - * Any item that implements this interface will not be pulled into the Altar on - * right click. - */ -public interface IAltarManipulator { -} diff --git a/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java index 0270ac3e..626a1a9b 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java @@ -1,54 +1,55 @@ -package WayofTime.bloodmagic.altar; +package wayoftime.bloodmagic.altar; -public interface IBloodAltar { - int getCapacity(); +public interface IBloodAltar +{ + int getCapacity(); - int getCurrentBlood(); + int getCurrentBlood(); - AltarTier getTier(); + AltarTier getTier(); - int getProgress(); + int getProgress(); - float getSacrificeMultiplier(); + float getSacrificeMultiplier(); - float getSelfSacrificeMultiplier(); + float getSelfSacrificeMultiplier(); - float getOrbMultiplier(); + float getOrbMultiplier(); - float getDislocationMultiplier(); + float getDislocationMultiplier(); - float getConsumptionMultiplier(); + float getConsumptionMultiplier(); - float getConsumptionRate(); + float getConsumptionRate(); - int getChargingRate(); + int getChargingRate(); - int getChargingFrequency(); + int getChargingFrequency(); - int getTotalCharge(); + int getTotalCharge(); - int getLiquidRequired(); + int getLiquidRequired(); - int getBufferCapacity(); + int getBufferCapacity(); - void sacrificialDaggerCall(int amount, boolean isSacrifice); + void sacrificialDaggerCall(int amount, boolean isSacrifice); - void startCycle(); + void startCycle(); - void checkTier(); + void checkTier(); - boolean isActive(); + boolean isActive(); - void setActive(); + void setActive(); - int fillMainTank(int amount); + int fillMainTank(int amount); - /** - * Will set the altar to initiate a cooldown cycle after it crafts before - * starting to craft again, giving the user time to interact with the altar. - * This can only be set while the altar is not active. - * - * @param cooldown - How long the cooldown should last - */ - void requestPauseAfterCrafting(int cooldown); + /** + * Will set the altar to initiate a cooldown cycle after it crafts before + * starting to craft again, giving the user time to interact with the altar. + * This can only be set while the altar is not active. + * + * @param cooldown - How long the cooldown should last + */ + void requestPauseAfterCrafting(int cooldown); } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 8401afe0..b6119974 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,83 +1,101 @@ -package WayofTime.bloodmagic.api.impl; +package wayoftime.bloodmagic.api.impl; -import WayofTime.bloodmagic.api.IBloodMagicAPI; -import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.block.BlockState; - -import javax.annotation.Nonnull; import java.util.List; -public class BloodMagicAPI implements IBloodMagicAPI { +import javax.annotation.Nonnull; - public static final BloodMagicAPI INSTANCE = new BloodMagicAPI(); +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; - private final BloodMagicBlacklist blacklist; - private final BloodMagicRecipeRegistrar recipeRegistrar; - private final BloodMagicValueManager valueManager; - private final Multimap altarComponents; +import net.minecraft.block.BlockState; +import wayoftime.bloodmagic.altar.ComponentType; +import wayoftime.bloodmagic.api.IBloodMagicAPI; +import wayoftime.bloodmagic.util.BMLog; - public BloodMagicAPI() { - this.blacklist = new BloodMagicBlacklist(); - this.recipeRegistrar = new BloodMagicRecipeRegistrar(); - this.valueManager = new BloodMagicValueManager(); - this.altarComponents = ArrayListMultimap.create(); - } +public class BloodMagicAPI implements IBloodMagicAPI +{ - @Nonnull - @Override - public BloodMagicBlacklist getBlacklist() { - return blacklist; - } + public static final BloodMagicAPI INSTANCE = new BloodMagicAPI(); - @Nonnull - @Override - public BloodMagicRecipeRegistrar getRecipeRegistrar() { - return recipeRegistrar; - } +// private final BloodMagicBlacklist blacklist; + private final BloodMagicRecipeRegistrar recipeRegistrar; +// private final BloodMagicValueManager valueManager; + private final Multimap altarComponents; - @Nonnull - @Override - public BloodMagicValueManager getValueManager() { - return valueManager; - } + public BloodMagicAPI() + { +// this.blacklist = new BloodMagicBlacklist(); + this.recipeRegistrar = new BloodMagicRecipeRegistrar(); +// this.valueManager = new BloodMagicValueManager(); + this.altarComponents = ArrayListMultimap.create(); + } - @Override - public void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) { - ComponentType component = null; - for (ComponentType type : ComponentType.VALUES) { - if (type.name().equalsIgnoreCase(componentType)) { - component = type; - break; - } - } +// @Nonnull +// @Override +// public BloodMagicBlacklist getBlacklist() +// { +// return blacklist; +// } +// + @Nonnull + @Override + public BloodMagicRecipeRegistrar getRecipeRegistrar() + { + return recipeRegistrar; + } +// +// @Nonnull +// @Override +// public BloodMagicValueManager getValueManager() +// { +// return valueManager; +// } - if (component != null) { - BMLog.API_VERBOSE.info("Registered {} as a {} altar component.", state, componentType); - altarComponents.put(component, state); - } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); - } + @Override + public void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) + { + ComponentType component = null; + for (ComponentType type : ComponentType.VALUES) + { + if (type.name().equalsIgnoreCase(componentType)) + { + component = type; + break; + } + } - @Override - public void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) { - ComponentType component = null; - for (ComponentType type : ComponentType.VALUES) { - if (type.name().equalsIgnoreCase(componentType)) { - component = type; - break; - } - } + if (component != null) + { + BMLog.API_VERBOSE.info("Registered {} as a {} altar component.", state, componentType); + altarComponents.put(component, state); + } else + BMLog.API.warn("Invalid Altar component type: {}.", componentType); + } - if (component != null) { - BMLog.API_VERBOSE.info("Unregistered {} from being a {} altar component.", state, componentType); - altarComponents.remove(component, state); - } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); - } + @Override + public void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) + { + ComponentType component = null; + for (ComponentType type : ComponentType.VALUES) + { + if (type.name().equalsIgnoreCase(componentType)) + { + component = type; + break; + } + } - @Nonnull - public List getComponentStates(ComponentType component) { - return (List) altarComponents.get(component); - } -} + if (component != null) + { + BMLog.API_VERBOSE.info("Unregistered {} from being a {} altar component.", state, componentType); + altarComponents.remove(component, state); + } else + BMLog.API.warn("Invalid Altar component type: {}.", componentType); + } + + @Nonnull + public List getComponentStates(ComponentType component) + { + return (List) altarComponents.get(component); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java deleted file mode 100644 index 74a668fc..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java +++ /dev/null @@ -1,106 +0,0 @@ -package WayofTime.bloodmagic.api.impl; - -import WayofTime.bloodmagic.api.IBloodMagicBlacklist; -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import java.util.Set; - -public class BloodMagicBlacklist implements IBloodMagicBlacklist { - - private final Set teleposer; - private final Set teleposerEntities; - private final Set transposition; - private final Set greenGrove; - private final Set sacrifice; - - public BloodMagicBlacklist() { - this.teleposer = Sets.newHashSet(); - this.teleposerEntities = Sets.newHashSet(); - this.transposition = Sets.newHashSet(); - this.greenGrove = Sets.newHashSet(); - this.sacrifice = Sets.newHashSet(); - } - - @Override - public void addTeleposer(@Nonnull BlockState state) { - if (!teleposer.contains(state)) { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state); - teleposer.add(state); - } - } - - public void addTeleposer(@Nonnull Block block) { - for (BlockState state : block.getBlockState().getValidStates()) - addTeleposer(state); - } - - @Override - public void addTeleposer(@Nonnull ResourceLocation entityId) { - if (!teleposerEntities.contains(entityId)) { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", entityId); - teleposerEntities.add(entityId); - } - } - - @Override - public void addTransposition(@Nonnull BlockState state) { - if (!transposition.contains(state)) { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state); - transposition.add(state); - } - } - - public void addTransposition(@Nonnull Block block) { - for (BlockState state : block.getBlockState().getValidStates()) - addTransposition(state); - } - - @Override - public void addGreenGrove(@Nonnull BlockState state) { - if (!greenGrove.contains(state)) { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state); - greenGrove.add(state); - } - } - - public void addGreenGrove(@Nonnull Block block) { - for (BlockState state : block.getBlockState().getValidStates()) - addGreenGrove(state); - } - - @Override - public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { - if (!sacrifice.contains(entityId)) { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId); - sacrifice.add(entityId); - } - } - - // Internal use getters - - public Set getTeleposer() { - return ImmutableSet.copyOf(teleposer); - } - - public Set getTeleposerEntities() { - return ImmutableSet.copyOf(teleposerEntities); - } - - public Set getTransposition() { - return ImmutableSet.copyOf(transposition); - } - - public Set getGreenGrove() { - return ImmutableSet.copyOf(greenGrove); - } - - public Set getSacrifice() { - return ImmutableSet.copyOf(sacrifice); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 5f4bb3d3..e14ed76a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -1,144 +1,29 @@ -package WayofTime.bloodmagic.api.impl; +package wayoftime.bloodmagic.api.impl; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.api.BloodMagicPlugin; -import WayofTime.bloodmagic.api.IBloodMagicAPI; -import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.block.BlockBloodRune; -import WayofTime.bloodmagic.block.BlockDecorative; -import WayofTime.bloodmagic.block.enums.BloodRuneType; -import WayofTime.bloodmagic.block.enums.EnumDecorative; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.TranquilityStack; -import WayofTime.bloodmagic.util.StateUtil; -import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.ForgeRegistries; +import wayoftime.bloodmagic.altar.ComponentType; +import wayoftime.bloodmagic.api.IBloodMagicAPI; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -@BloodMagicPlugin -public class BloodMagicCorePlugin implements IBloodMagicPlugin { +public class BloodMagicCorePlugin +{ + public static final BloodMagicCorePlugin INSTANCE = new BloodMagicCorePlugin(); - @Override - public void register(IBloodMagicAPI apiInterface) { - BloodMagicAPI api = (BloodMagicAPI) apiInterface; - // Add forced blacklistings - api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); - api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); - api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE); - api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE); - api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE); - api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE); - api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE); - api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE); - api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.DEMON_CRYSTAL); - api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.DEMON_CRYSTAL); - api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INVERSION_PILLAR); - api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INVERSION_PILLAR); - api.getBlacklist().addWellOfSuffering(new ResourceLocation("armor_stand")); - api.getBlacklist().addWellOfSuffering(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); + public void register(IBloodMagicAPI apiInterface) + { + apiInterface.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), ComponentType.GLOWSTONE.name()); + apiInterface.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), ComponentType.GLOWSTONE.name()); + apiInterface.registerAltarComponent(Blocks.BEACON.getDefaultState(), ComponentType.BEACON.name()); - api.getValueManager().setSacrificialValue(new ResourceLocation("armor_stand"), 0); - api.getValueManager().setSacrificialValue(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), 0); - - api.getValueManager().setTranquility(Blocks.LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); - api.getValueManager().setTranquility(Blocks.FLOWING_LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); - api.getValueManager().setTranquility(Blocks.WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); - api.getValueManager().setTranquility(Blocks.FLOWING_WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); - api.getValueManager().setTranquility(RegistrarBloodMagicBlocks.LIFE_ESSENCE, new TranquilityStack(EnumTranquilityType.WATER, 1.5D)); - api.getValueManager().setTranquility(Blocks.NETHERRACK, new TranquilityStack(EnumTranquilityType.FIRE, 0.5D)); - api.getValueManager().setTranquility(Blocks.DIRT, new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25D)); - api.getValueManager().setTranquility(Blocks.FARMLAND, new TranquilityStack(EnumTranquilityType.EARTHEN, 1.0D)); - api.getValueManager().setTranquility(Blocks.POTATOES, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.CARROTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.WHEAT, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.NETHER_WART, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.BEETROOTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - - handleConfigValues(api); - - // Add standard blocks for altar components - api.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), ComponentType.GLOWSTONE.name()); - api.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), ComponentType.GLOWSTONE.name()); - api.registerAltarComponent(Blocks.BEACON.getDefaultState(), ComponentType.BEACON.name()); - - BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), ComponentType.BLOODSTONE.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), ComponentType.BLOODSTONE.name()); - if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); - } - - BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; - for (BloodRuneType runeType : BloodRuneType.values()) - api.registerAltarComponent(bloodRune.getDefaultState().withProperty(bloodRune.getProperty(), runeType), ComponentType.BLOODRUNE.name()); - } - - @Override - public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { - RegistrarBloodMagicRecipes.registerAltarRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); - RegistrarBloodMagicRecipes.registerAlchemyTableRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); - RegistrarBloodMagicRecipes.registerTartaricForgeRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); - RegistrarBloodMagicRecipes.registerAlchemyArrayRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); - RegistrarBloodMagicRecipes.registerSacrificeCraftRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); - } - - private static void handleConfigValues(BloodMagicAPI api) { - for (String value : ConfigHandler.values.sacrificialValues) { - String[] split = value.split(";"); - if (split.length != 2) // Not valid format - continue; - - api.getValueManager().setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); - } - - for (String value : ConfigHandler.blacklist.teleposer) { - EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); - if (entityEntry == null) { // It's not an entity (or at least not a valid one), so let's try a block. - String[] blockData = value.split("\\["); - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); - if (block == Blocks.AIR || block == null) // Not a valid block either - continue; - - if (blockData.length > 1) { // We have properties listed, so let's build a state. - api.getBlacklist().addTeleposer(StateUtil.parseState(value)); - continue; - } - - api.getBlacklist().addTeleposer(block); - continue; - } - - api.getBlacklist().addTeleposer(entityEntry.getRegistryName()); - } - - for (String value : ConfigHandler.blacklist.transposer) { - String[] blockData = value.split("\\["); - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); - if (block == Blocks.AIR || block == null) // Not a valid block - continue; - - if (blockData.length > 1) { // We have properties listed, so let's build a state. - api.getBlacklist().addTeleposer(StateUtil.parseState(value)); - continue; - } - - api.getBlacklist().addTeleposer(block); - } - - for (String value : ConfigHandler.blacklist.wellOfSuffering) { - EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); - if (entityEntry == null) // Not a valid entity - continue; - - api.getBlacklist().addWellOfSuffering(entityEntry.getRegistryName()); - } - } -} \ No newline at end of file + apiInterface.registerAltarComponent(BloodMagicBlocks.BLANK_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.SPEED_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.SACRIFICE_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.SELF_SACRIFICE_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.DISPLACEMENT_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.CAPACITY_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.ORB_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.ACCELERATION_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + apiInterface.registerAltarComponent(BloodMagicBlocks.CHARGING_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index 215f3981..bb0652a8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -1,357 +1,448 @@ -package WayofTime.bloodmagic.api.impl; +package wayoftime.bloodmagic.api.impl; import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; -import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.api.impl.recipe.RecipeSacrificeCraft; -import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; +import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { - - private final Set altarRecipes; - private final Set alchemyRecipes; - private final Set tartaricForgeRecipes; - private final Set alchemyArrayRecipes; - private final Set sacrificeCraftRecipes; - - public BloodMagicRecipeRegistrar() { - this.altarRecipes = Sets.newHashSet(); - this.alchemyRecipes = Sets.newHashSet(); - this.tartaricForgeRecipes = Sets.newHashSet(); - this.alchemyArrayRecipes = Sets.newHashSet(); - this.sacrificeCraftRecipes = Sets.newHashSet(); - } - - @Override - public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); - Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative."); - - altarRecipes.add(new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); - } - - @Override - public boolean removeBloodAltar(@Nonnull ItemStack input) { - Preconditions.checkNotNull(input, "input cannot be null."); - - return altarRecipes.remove(getBloodAltar(input)); - } - - @Override - public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - Preconditions.checkNotNull(input, "input cannot be null."); - - NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); - alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); - } - - public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) { - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - Preconditions.checkNotNull(input, "input cannot be null."); - - List ingredients = Lists.newArrayList(); - for (Object object : input) { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { - ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); - continue; - } - - ingredients.add(CraftingHelper.getIngredient(object)); - } - - addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0])); - } - - public void addAlchemyTable(RecipeAlchemyTable recipe) { - alchemyRecipes.add(recipe); - } - - @Override - public boolean removeAlchemyTable(@Nonnull ItemStack... input) { - Preconditions.checkNotNull(input, "inputs cannot be null."); - - for (ItemStack stack : input) - Preconditions.checkNotNull(stack, "input cannot be null."); - - return alchemyRecipes.remove(getAlchemyTable(Lists.newArrayList(input))); - } - - @Override - public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); - Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); - Preconditions.checkNotNull(input, "input cannot be null."); - - NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); - tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); - } - - @Override - public boolean removeTartaricForge(@Nonnull ItemStack... input) { - Preconditions.checkNotNull(input, "inputs cannot be null."); - - for (ItemStack stack : input) - Preconditions.checkNotNull(stack, "input cannot be null."); - - return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); - } - - public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); - Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); - Preconditions.checkNotNull(input, "input cannot be null."); - - List ingredients = Lists.newArrayList(); - for (Object object : input) { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { - ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); - continue; - } - - ingredients.add(CraftingHelper.getIngredient(object)); - } - - addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); - } - - @Override - public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - - alchemyArrayRecipes.add(new RecipeAlchemyArray(input, catalyst, output, circleTexture)); - } - - @Override - public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); - - return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst)); - } - - public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - - addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture); - } - - public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Object... input) { - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); - Preconditions.checkNotNull(input, "input cannot be null."); - - List ingredients = Lists.newArrayList(); - for (Object object : input) { - if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { - ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); - continue; - } - - ingredients.add(CraftingHelper.getIngredient(object)); - } - - addSacrificeCraft(output, healthRequired, ingredients.toArray(new Ingredient[0])); - } - - @Override - public boolean removeSacrificeCraft(@Nonnull ItemStack... input) { - Preconditions.checkNotNull(input, "inputs cannot be null."); - - for (ItemStack stack : input) - Preconditions.checkNotNull(stack, "input cannot be null."); - - return sacrificeCraftRecipes.remove(getSacrificeCraft(Lists.newArrayList(input))); - } - - @Override - public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input) { - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); - Preconditions.checkNotNull(input, "input cannot be null."); - - NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); - sacrificeCraftRecipes.add(new RecipeSacrificeCraft(inputs, output, healthRequired)); - } - - @Nullable - public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - for (RecipeBloodAltar recipe : altarRecipes) - if (recipe.getInput().test(input)) - return recipe; - - return null; - } - - @Nullable - public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - mainLoop: - for (RecipeAlchemyTable recipe : alchemyRecipes) { - if (recipe.getInput().size() != input.size()) - continue; - - List recipeInput = new ArrayList<>(recipe.getInput()); - - for (int i = 0; i < input.size(); i++) { - boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) { - Ingredient ingredient = recipeInput.get(j); - if (ingredient.apply(input.get(i))) { - matched = true; - recipeInput.remove(j); - break; - } - } - - if (!matched) - continue mainLoop; - } - - return recipe; - } - - return null; - } - - @Nullable - public RecipeTartaricForge getTartaricForge(@Nonnull List input) { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - mainLoop: - for (RecipeTartaricForge recipe : tartaricForgeRecipes) { - if (recipe.getInput().size() != input.size()) - continue; - - List recipeInput = new ArrayList<>(recipe.getInput()); - - for (int i = 0; i < input.size(); i++) { - boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) { - Ingredient ingredient = recipeInput.get(j); - if (ingredient.apply(input.get(i))) { - matched = true; - recipeInput.remove(j); - break; - } - } - - if (!matched) - continue mainLoop; - } - - return recipe; - } - - return null; - } - - @Nullable - public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List input) { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - mainLoop: - for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes) { - if (recipe.getInput().size() != input.size()) - continue; - - List recipeInput = new ArrayList<>(recipe.getInput()); - - for (int i = 0; i < input.size(); i++) { - boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) { - Ingredient ingredient = recipeInput.get(j); - if (ingredient.apply(input.get(i))) { - matched = true; - recipeInput.remove(j); - break; - } - } - - if (!matched) - continue mainLoop; - } - - return recipe; - } - - return null; - } - - @Nullable - public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - for (RecipeAlchemyArray recipe : alchemyArrayRecipes) - if (recipe.getInput().test(input) && recipe.getCatalyst().test(catalyst)) - return recipe; - - return null; - } - - public Set getAltarRecipes() { - return ImmutableSet.copyOf(altarRecipes); - } - - public Set getAlchemyRecipes() { - return ImmutableSet.copyOf(alchemyRecipes); - } - - public Set getTartaricForgeRecipes() { - return ImmutableSet.copyOf(tartaricForgeRecipes); - } - - public Set getAlchemyArrayRecipes() { - return ImmutableSet.copyOf(alchemyArrayRecipes); - } +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.world.World; +import wayoftime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; + +public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar +{ + +// private final Set altarRecipes; +// private final Set alchemyRecipes; +// private final Set tartaricForgeRecipes; +// private final Set alchemyArrayRecipes; +// private final Set sacrificeCraftRecipes; + + public BloodMagicRecipeRegistrar() + { +// this.altarRecipes = Sets.newHashSet(); +// this.alchemyRecipes = Sets.newHashSet(); +// this.tartaricForgeRecipes = Sets.newHashSet(); +// this.alchemyArrayRecipes = Sets.newHashSet(); +// this.sacrificeCraftRecipes = Sets.newHashSet(); + } + +// @Override +// public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, +// @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); +// Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); +// Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); +// Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative."); +// +// // TODO: Got to adda ResourceLocation argument. +// altarRecipes.add(new IRecipeBloodAltar(null, input, output, minimumTier, syphon, consumeRate, drainRate)); +// } +// +// @Override +// public boolean removeBloodAltar(@Nonnull ItemStack input) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// return altarRecipes.remove(getBloodAltar(input)); +// } + +// @Override +// public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, +// @Nonnegative int minimumTier, @Nonnull Ingredient... input) +// { +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); +// Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); +// Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); +// alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); +// } +// +// public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, +// @Nonnegative int minimumTier, @Nonnull Object... input) +// { +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); +// Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); +// Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// List ingredients = Lists.newArrayList(); +// for (Object object : input) +// { +// if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) +// { +// ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); +// continue; +// } +// +// ingredients.add(CraftingHelper.getIngredient(object)); +// } +// +// addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0])); +// } +// +// public void addAlchemyTable(RecipeAlchemyTable recipe) +// { +// alchemyRecipes.add(recipe); +// } +// +// @Override +// public boolean removeAlchemyTable(@Nonnull ItemStack... input) +// { +// Preconditions.checkNotNull(input, "inputs cannot be null."); +// +// for (ItemStack stack : input) Preconditions.checkNotNull(stack, "input cannot be null."); +// +// return alchemyRecipes.remove(getAlchemyTable(Lists.newArrayList(input))); +// } +// +// @Override +// public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, +// @Nonnegative double soulDrain, @Nonnull Ingredient... input) +// { +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); +// Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); +// tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); +// } +// +// @Override +// public boolean removeTartaricForge(@Nonnull ItemStack... input) +// { +// Preconditions.checkNotNull(input, "inputs cannot be null."); +// +// for (ItemStack stack : input) Preconditions.checkNotNull(stack, "input cannot be null."); +// +// return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); +// } +// +// public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, +// @Nonnegative double soulDrain, @Nonnull Object... input) +// { +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); +// Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// List ingredients = Lists.newArrayList(); +// for (Object object : input) +// { +// if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) +// { +// ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); +// continue; +// } +// +// ingredients.add(CraftingHelper.getIngredient(object)); +// } +// +// addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); +// } +// +// @Override +// public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, +// @Nullable ResourceLocation circleTexture) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); +// Preconditions.checkNotNull(output, "output cannot be null."); +// +// alchemyArrayRecipes.add(new RecipeAlchemyArray(input, catalyst, output, circleTexture)); +// } +// +// @Override +// public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); +// +// return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst)); +// } +// +// public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, +// @Nullable ResourceLocation circleTexture) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); +// Preconditions.checkNotNull(output, "output cannot be null."); +// +// addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture); +// } +// +// public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, +// @Nonnull Object... input) +// { +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// List ingredients = Lists.newArrayList(); +// for (Object object : input) +// { +// if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) +// { +// ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); +// continue; +// } +// +// ingredients.add(CraftingHelper.getIngredient(object)); +// } +// +// addSacrificeCraft(output, healthRequired, ingredients.toArray(new Ingredient[0])); +// } +// +// @Override +// public boolean removeSacrificeCraft(@Nonnull ItemStack... input) +// { +// Preconditions.checkNotNull(input, "inputs cannot be null."); +// +// for (ItemStack stack : input) Preconditions.checkNotNull(stack, "input cannot be null."); +// +// return sacrificeCraftRecipes.remove(getSacrificeCraft(Lists.newArrayList(input))); +// } +// +// @Override +// public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, +// @Nonnull Ingredient... input) +// { +// Preconditions.checkNotNull(output, "output cannot be null."); +// Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); +// Preconditions.checkNotNull(input, "input cannot be null."); +// +// NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); +// sacrificeCraftRecipes.add(new RecipeSacrificeCraft(inputs, output, healthRequired)); +// } + + @Nullable + public RecipeBloodAltar getBloodAltar(World world, @Nonnull ItemStack input) + { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR); + + for (RecipeBloodAltar recipe : altarRecipes) if (recipe.getInput().test(input)) + return recipe; + + return null; + } + +// @Nullable +// public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// if (input.isEmpty()) +// return null; +// +// mainLoop: for (RecipeAlchemyTable recipe : alchemyRecipes) +// { +// if (recipe.getInput().size() != input.size()) +// continue; +// +// List recipeInput = new ArrayList<>(recipe.getInput()); +// +// for (int i = 0; i < input.size(); i++) +// { +// boolean matched = false; +// for (int j = 0; j < recipeInput.size(); j++) +// { +// Ingredient ingredient = recipeInput.get(j); +// if (ingredient.apply(input.get(i))) +// { +// matched = true; +// recipeInput.remove(j); +// break; +// } +// } +// +// if (!matched) +// continue mainLoop; +// } +// +// return recipe; +// } +// +// return null; +// } +// + @Nullable + public RecipeTartaricForge getTartaricForge(World world, @Nonnull List input) + { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + List tartaricForgeRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.TARTARICFORGE); + mainLoop: for (RecipeTartaricForge recipe : tartaricForgeRecipes) + { + if (recipe.getInput().size() != input.size()) + continue; + + List recipeInput = new ArrayList<>(recipe.getInput()); + + for (int i = 0; i < input.size(); i++) + { + boolean matched = false; + for (int j = 0; j < recipeInput.size(); j++) + { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.test(input.get(i))) + { + matched = true; + recipeInput.remove(j); + break; + } + } + + if (!matched) + continue mainLoop; + } + + return recipe; + } + + return null; + } + +// +// @Nullable +// public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List input) +// { +// Preconditions.checkNotNull(input, "input cannot be null."); +// if (input.isEmpty()) +// return null; +// +// mainLoop: for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes) +// { +// if (recipe.getInput().size() != input.size()) +// continue; +// +// List recipeInput = new ArrayList<>(recipe.getInput()); +// +// for (int i = 0; i < input.size(); i++) +// { +// boolean matched = false; +// for (int j = 0; j < recipeInput.size(); j++) +// { +// Ingredient ingredient = recipeInput.get(j); +// if (ingredient.apply(input.get(i))) +// { +// matched = true; +// recipeInput.remove(j); +// break; +// } +// } +// +// if (!matched) +// continue mainLoop; +// } +// +// return recipe; +// } +// +// return null; +// } +// + /** + * + * @param world + * @param input + * @param catalyst + * @return If false and the recipe is nonnull, it is a partial match. If true, + * the returned recipe is a full match. + */ + @Nullable + public Pair getAlchemyArray(World world, @Nonnull ItemStack input, @Nonnull ItemStack catalyst) + { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARRAY); + + RecipeAlchemyArray partialMatch = null; + for (RecipeAlchemyArray recipe : altarRecipes) + { + if (recipe.getBaseInput().test(input)) + { + if (recipe.getAddedInput().test(catalyst)) + { + return Pair.of(true, recipe); + } else if (partialMatch == null) + { + partialMatch = recipe; + } + } + } + + return Pair.of(false, partialMatch); + } + + public Set getAltarRecipes(World world) + { + return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR)); + } + + public Set getTartaricForgeRecipes(World world) + { + return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.TARTARICFORGE)); + } + + public Set getAlchemyArrayRecipes(World world) + { + return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARRAY)); + } + + public Set getCraftingAlchemyArrayRecipes(World world) + { + Set recipes = Set.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARRAY)); + Set copyRecipes = Set.of(); + for (RecipeAlchemyArray recipe : recipes) + { + if (!recipe.getOutput().isEmpty()) + { + copyRecipes.add(recipe); + } + } + + return copyRecipes; + } + +// public Set getAlchemyRecipes() +// { +// return ImmutableSet.copyOf(alchemyRecipes); +// } +// +// public Set getTartaricForgeRecipes() +// { +// return ImmutableSet.copyOf(tartaricForgeRecipes); +// } +// +// public Set getAlchemyArrayRecipes() +// { +// return ImmutableSet.copyOf(alchemyArrayRecipes); +// } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java deleted file mode 100644 index 830db0c3..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package WayofTime.bloodmagic.api.impl; - -import WayofTime.bloodmagic.api.IBloodMagicValueManager; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.TranquilityStack; -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import java.util.Map; - -public class BloodMagicValueManager implements IBloodMagicValueManager { - - private final Map sacrificial; - private final Map tranquility; - - public BloodMagicValueManager() { - this.sacrificial = Maps.newHashMap(); - this.tranquility = Maps.newHashMap(); - } - - @Override - public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { - BMLog.API_VERBOSE.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value); - sacrificial.put(entityId, value); - } - - @Override - public void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value) { - EnumTranquilityType tranquility = null; - for (EnumTranquilityType type : EnumTranquilityType.values()) { - if (type.name().equalsIgnoreCase(tranquilityType)) { - tranquility = type; - break; - } - } - - if (tranquility != null) { - BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value); - this.tranquility.put(state, new TranquilityStack(tranquility, value)); - } else BMLog.API.warn("Invalid tranquility type: {}.", tranquilityType); - } - - public void setTranquility(Block block, TranquilityStack tranquilityStack) { - for (BlockState state : block.getBlockState().getValidStates()) { - BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); - tranquility.put(state, tranquilityStack); - } - } - - public Map getSacrificial() { - return ImmutableMap.copyOf(sacrificial); - } - - public Map getTranquility() { - return ImmutableMap.copyOf(tranquility); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java index 02b4f153..c0f6d1ee 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java @@ -1,53 +1,87 @@ -package WayofTime.bloodmagic.api.impl.recipe; - -import WayofTime.bloodmagic.BloodMagic; -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; +package wayoftime.bloodmagic.api.impl.recipe; import javax.annotation.Nonnull; -import javax.annotation.Nullable; -public class RecipeAlchemyArray { +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; - @Nonnull - private final Ingredient input; - @Nonnull - private final Ingredient catalyst; - @Nonnull - private final ItemStack output; - @Nonnull - private final ResourceLocation circleTexture; +public abstract class RecipeAlchemyArray extends BloodMagicRecipe +{ + private final ResourceLocation id; + private final ResourceLocation texture; + @Nonnull + private final Ingredient baseInput; + @Nonnull + private final Ingredient addedInput; + @Nonnull + private final ItemStack output; - public RecipeAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); + protected RecipeAlchemyArray(ResourceLocation id, ResourceLocation texture, @Nonnull Ingredient baseIngredient, @Nonnull Ingredient addedIngredient, @Nonnull ItemStack result) + { + super(id); + this.id = id; + this.texture = texture; + this.baseInput = baseIngredient; + this.addedInput = addedIngredient; + this.output = result; + } - this.input = input; - this.catalyst = catalyst; - this.output = output; - this.circleTexture = circleTexture == null ? new ResourceLocation(BloodMagic.MODID, "textures/models/AlchemyArrays/WIPArray.png") : circleTexture; - } + @Nonnull + public final ResourceLocation getId() + { + return id; + } - @Nonnull - public Ingredient getInput() { - return input; - } + @Nonnull + public final ResourceLocation getTexture() + { + return texture; + } - @Nonnull - public Ingredient getCatalyst() { - return catalyst; - } + @Nonnull + public final Ingredient getBaseInput() + { + return baseInput; + } - @Nonnull - public ItemStack getOutput() { - return output; - } + @Nonnull + public final Ingredient getAddedInput() + { + return addedInput; + } - @Nonnull - public ResourceLocation getCircleTexture() { - return circleTexture; - } + @Override + public final NonNullList getIngredients() + { + NonNullList list = NonNullList.create(); + list.add(getBaseInput()); + list.add(getAddedInput()); + return list; + } + + @Nonnull + public final ItemStack getOutput() + { + return output; + } + + @Override + public void write(PacketBuffer buffer) + { + if (texture != null) + { + buffer.writeBoolean(true); + buffer.writeResourceLocation(texture); + } else + { + buffer.writeBoolean(false); + } + + baseInput.write(buffer); + addedInput.write(buffer); + buffer.writeItemStack(output); + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java deleted file mode 100644 index 7fe572b0..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java +++ /dev/null @@ -1,59 +0,0 @@ -package WayofTime.bloodmagic.api.impl.recipe; - -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.NonNullList; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -public class RecipeAlchemyTable { - - @Nonnull - private final NonNullList input; - @Nonnull - private final ItemStack output; - @Nonnegative - private final int syphon; - @Nonnegative - private final int ticks; - @Nonnegative - private final int minimumTier; - - public RecipeAlchemyTable(@Nonnull NonNullList input, @Nonnull ItemStack output, int syphon, int ticks, int minimumTier) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - - this.input = input; - this.output = output; - this.syphon = syphon; - this.ticks = ticks; - this.minimumTier = minimumTier; - } - - @Nonnull - public final NonNullList getInput() { - return input; - } - - @Nonnull - public final ItemStack getOutput() { - return output; - } - - public final int getSyphon() { - return syphon; - } - - public final int getTicks() { - return ticks; - } - - public final int getMinimumTier() { - return minimumTier; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java index 5682645e..8b8ab1c8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -1,72 +1,104 @@ -package WayofTime.bloodmagic.api.impl.recipe; - -import WayofTime.bloodmagic.altar.AltarTier; -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; +package wayoftime.bloodmagic.api.impl.recipe; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; -public class RecipeBloodAltar { +import com.google.common.base.Preconditions; - @Nonnull - private final Ingredient input; - @Nonnull - private final ItemStack output; - @Nonnull - private final AltarTier minimumTier; - @Nonnegative - private final int syphon; - @Nonnegative - private final int consumeRate; - @Nonnegative - private final int drainRate; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.altar.AltarTier; - public RecipeBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - Preconditions.checkArgument(minimumTier <= AltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); - Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); +public abstract class RecipeBloodAltar extends BloodMagicRecipe +{ - this.input = input; - this.output = output; - this.minimumTier = AltarTier.values()[minimumTier]; - this.syphon = syphon; - this.consumeRate = consumeRate; - this.drainRate = drainRate; - } + @Nonnull + private final Ingredient input; + @Nonnull + private final ItemStack output; + @Nonnull + private final AltarTier minimumTier; + @Nonnegative + private final int syphon; + @Nonnegative + private final int consumeRate; + @Nonnegative + private final int drainRate; - @Nonnull - public final Ingredient getInput() { - return input; - } + public RecipeBloodAltar(ResourceLocation id, @Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) + { + super(id); + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkArgument(minimumTier <= AltarTier.MAXTIERS, "minimumTier cannot be higher than max tier"); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); - @Nonnull - public final ItemStack getOutput() { - return output; - } + this.input = input; + this.output = output; + this.minimumTier = AltarTier.values()[minimumTier]; + this.syphon = syphon; + this.consumeRate = consumeRate; + this.drainRate = drainRate; + } - @Nonnull - public AltarTier getMinimumTier() { - return minimumTier; - } + @Nonnull + public final Ingredient getInput() + { + return input; + } - @Nonnegative - public final int getSyphon() { - return syphon; - } + @Override + public final NonNullList getIngredients() + { + NonNullList list = NonNullList.create(); + list.add(getInput()); + return list; + } - @Nonnegative - public final int getConsumeRate() { - return consumeRate; - } + @Nonnull + public final ItemStack getOutput() + { + return output; + } - @Nonnegative - public final int getDrainRate() { - return drainRate; - } -} + @Nonnull + public AltarTier getMinimumTier() + { + return minimumTier; + } + + @Nonnegative + public final int getSyphon() + { + return syphon; + } + + @Nonnegative + public final int getConsumeRate() + { + return consumeRate; + } + + @Nonnegative + public final int getDrainRate() + { + return drainRate; + } + + @Override + public void write(PacketBuffer buffer) + { + input.write(buffer); + buffer.writeItemStack(output); + buffer.writeInt(minimumTier.ordinal()); + buffer.writeInt(syphon); + buffer.writeInt(consumeRate); + buffer.writeInt(drainRate); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java deleted file mode 100644 index f2e000f6..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java +++ /dev/null @@ -1,43 +0,0 @@ -package WayofTime.bloodmagic.api.impl.recipe; - -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.NonNullList; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -public class RecipeSacrificeCraft { - @Nonnull - private final NonNullList input; - @Nonnull - private final ItemStack output; - @Nonnegative - private final double healthRequired; - - public RecipeSacrificeCraft(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double healthRequired) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); - - this.input = input; - this.output = output; - this.healthRequired = healthRequired; - } - - @Nonnull - public final NonNullList getInput() { - return input; - } - - @Nonnull - public final ItemStack getOutput() { - return output; - } - - @Nonnegative - public final double getHealthRequired() { - return healthRequired; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java index 96021cad..f0b65de7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java @@ -1,53 +1,77 @@ -package WayofTime.bloodmagic.api.impl.recipe; +package wayoftime.bloodmagic.api.impl.recipe; -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.NonNullList; +import java.util.List; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; -public class RecipeTartaricForge { +import com.google.common.base.Preconditions; - @Nonnull - private final NonNullList input; - @Nonnull - private final ItemStack output; - @Nonnegative - private final double minimumSouls; - @Nonnegative - private final double soulDrain; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ResourceLocation; - public RecipeTartaricForge(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); - Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); +public abstract class RecipeTartaricForge extends BloodMagicRecipe +{ + @Nonnull + private final List input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final double minimumSouls; + @Nonnegative + private final double soulDrain; - this.input = input; - this.output = output; - this.minimumSouls = minimumSouls; - this.soulDrain = soulDrain; - } + public RecipeTartaricForge(ResourceLocation id, @Nonnull List input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) + { + super(id); + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); - @Nonnull - public final NonNullList getInput() { - return input; - } + this.input = input; + this.output = output; + this.minimumSouls = minimumSouls; + this.soulDrain = soulDrain; + } - @Nonnull - public final ItemStack getOutput() { - return output; - } + @Nonnull + public final List getInput() + { + return input; + } - @Nonnegative - public final double getMinimumSouls() { - return minimumSouls; - } + @Nonnull + public final ItemStack getOutput() + { + return output; + } - @Nonnegative - public final double getSoulDrain() { - return soulDrain; - } -} + @Nonnegative + public final double getMinimumSouls() + { + return minimumSouls; + } + + @Nonnegative + public final double getSoulDrain() + { + return soulDrain; + } + + @Override + public void write(PacketBuffer buffer) + { + buffer.writeInt(input.size()); + for (int i = 0; i < input.size(); i++) + { + input.get(i).write(buffer); + } + buffer.writeItemStack(output); + buffer.writeDouble(minimumSouls); + buffer.writeDouble(soulDrain); + + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java deleted file mode 100644 index 95ed17c9..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ /dev/null @@ -1,166 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; - -public class BlockAlchemyArray extends Block { - protected static final AxisAlignedBB ARRAY_AABB = new AxisAlignedBB(0, 0, 0, 1, 0.1, 1); - - public BlockAlchemyArray() { - super(Material.CLOTH); - - setTranslationKey(BloodMagic.MODID + ".alchemyArray"); - setHardness(0.1f); - } - - @Override - public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) { - // No-op - } - - @Override - public void onEntityCollision(World world, BlockPos pos, BlockState state, Entity entity) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyArray) { - ((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity); - } - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return ARRAY_AABB; - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.CUTOUT; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.INVISIBLE; - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - TileAlchemyArray array = (TileAlchemyArray) world.getTileEntity(pos); - - if (array == null) - return false; - if (player.isSneaking() && array.rotateCooldown == 0) { - array.setRotation(array.getRotation().rotateY()); - array.rotateCooldown = 5; - world.notifyBlockUpdate(pos, state, state, 3); - return false; - } - - ItemStack playerItem = player.getHeldItem(hand); - - if (!playerItem.isEmpty()) { - if (array.getStackInSlot(0).isEmpty()) { - Utils.insertItemToTile(array, player, 0); - } else if (!array.getStackInSlot(0).isEmpty()) { - Utils.insertItemToTile(array, player, 1); - array.attemptCraft(); - } else { - return true; - } - if (array.arrayEffect instanceof AlchemyArrayEffectMovement && (playerItem.getItem() == Items.REDSTONE || playerItem.getItem() == Items.FEATHER) - || array.arrayEffect instanceof AlchemyArrayEffectUpdraft && (playerItem.getItem() == Items.FEATHER || playerItem.getItem() == Items.GLOWSTONE_DUST)) { - for (int i = 0; i < array.getSizeInventory(); i++) { - ItemStack stack = array.getStackInSlot(i); - if (ItemStack.areItemsEqual(stack, playerItem)) { - if (stack.getCount() < 127) { - stack.setCount(stack.getCount() + 1); - playerItem.shrink(1); - } - break; - } - } - world.notifyBlockUpdate(pos, state, state, 3); - return true; - } - } - - world.notifyBlockUpdate(pos, state, state, 3); - return true; - } - - @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { - return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES); - } - - @Override - public int quantityDropped(Random random) { - return 0; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileAlchemyArray alchemyArray = (TileAlchemyArray) world.getTileEntity(blockPos); - if (alchemyArray != null) - alchemyArray.dropItems(); - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileAlchemyArray(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java deleted file mode 100644 index 2520e983..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ /dev/null @@ -1,164 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; -import WayofTime.bloodmagic.tile.TileAlchemyTable; -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockAlchemyTable extends Block implements IBMBlock { - public static final PropertyBool INVISIBLE = PropertyBool.create("invisible"); - public static final PropertyEnum DIRECTION = PropertyEnum.create("direction", Direction.class); - private static final AxisAlignedBB BODY = new AxisAlignedBB(0, 0, 0, 16 / 16F, 13 / 16F, 16 / 16F); - - public BlockAlchemyTable() { - super(Material.ROCK); -// this.setDefaultState(this.blockState.getBaseState().withProperty(DIRECTION, EnumFacing.DOWN).withProperty(INVISIBLE, false)); - - setTranslationKey(BloodMagic.MODID + ".alchemyTable"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 0); - -// setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); - } - - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return BODY; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) { - return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.TRANSLUCENT; - } - - @Override - public BlockState getStateFromMeta(int meta) { - return this.getDefaultState(); - } - - /** - * Convert the BlockState into the correct metadata value - */ - @Override - public int getMetaFromState(BlockState state) { - return 0; - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyTable) { - return state.withProperty(INVISIBLE, ((TileAlchemyTable) tile).isInvisible()).withProperty(DIRECTION, ((TileAlchemyTable) tile).getDirection()); - } - - return state.withProperty(INVISIBLE, false); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, DIRECTION, INVISIBLE); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - BlockPos position = pos; - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyTable) { - if (((TileAlchemyTable) tile).isSlave()) { - position = ((TileAlchemyTable) tile).getConnectedPos(); - tile = world.getTileEntity(position); - if (!(tile instanceof TileAlchemyTable)) { - return false; - } - } - } - - player.openGui(BloodMagic.instance, Constants.Gui.ALCHEMY_TABLE_GUI, world, position.getX(), position.getY(), position.getZ()); - - return true; - } - - @Override - public void breakBlock(World world, BlockPos pos, BlockState blockState) { - TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos); - if (tile != null && !tile.isSlave()) { - tile.dropItems(); - } - - super.breakBlock(world, pos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileAlchemyTable(); - } - - @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { - TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos); - if (tile != null) { - BlockPos connectedPos = tile.getConnectedPos(); - TileEntity connectedTile = world.getTileEntity(connectedPos); - if (!(connectedTile instanceof TileAlchemyTable && ((TileAlchemyTable) connectedTile).getConnectedPos().equals(pos))) { - this.breakBlock(world, pos, state); - world.setBlockToAir(pos); - } - } - } - - @Override - public BlockItem getItem() { - return new ItemBlockAlchemyTable(this); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java deleted file mode 100644 index 60482da1..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ /dev/null @@ -1,224 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.AltarUtil; -import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.altar.IAltarManipulator; -import WayofTime.bloodmagic.altar.IBloodAltar; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.iface.IAltarReader; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.iface.IDocumentedBlock; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Pair; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -public class BlockAltar extends Block implements IVariantProvider, IDocumentedBlock, IBMBlock { - public static final PropertyBool POWERED = PropertyBool.create("powered"); - private static final AxisAlignedBB BODY = new AxisAlignedBB(0, 0, 0, 16 / 16F, 12 / 16F, 16 / 16F); - - public BlockAltar() { - super(Material.ROCK); - this.setDefaultState(this.blockState.getBaseState().withProperty(POWERED, false)); - - - setTranslationKey(BloodMagic.MODID + ".altar"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 1); - } - - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return BODY; - } - - @Override - public boolean hasComparatorInputOverride(BlockState state) { - return true; - } - - @Override - public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) { - if (world.isRemote) - return 0; - - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileAltar) { - TileAltar altar = (TileAltar) tile; - ItemStack orbStack = altar.getStackInSlot(0); - - if (world.getBlockState(pos.down()).getBlock() instanceof BlockDecorative) { - if (orbStack.getItem() instanceof IBloodOrb && orbStack.getItem() instanceof IBindable) { - BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); - Binding binding = ((IBindable) orbStack.getItem()).getBinding(orbStack); - if (orb != null && binding != null) { - SoulNetwork soulNetwork = NetworkHelper.getSoulNetwork(binding); - - int maxEssence = orb.getCapacity(); - int currentEssence = soulNetwork.getCurrentEssence(); - int level = currentEssence * 15 / maxEssence; - return Math.min(15, level) % 16; - } - } - } else { - int maxEssence = altar.getCapacity(); - int currentEssence = altar.getCurrentBlood(); - int level = currentEssence * 15 / maxEssence; - return Math.min(15, level) % 16; - } - } - - return 0; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return true; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - TileAltar altar = (TileAltar) world.getTileEntity(pos); - - if (altar == null || player.isSneaking()) - return false; - - ItemStack playerItem = player.getHeldItem(hand); - - if (playerItem.getItem() instanceof IAltarReader || playerItem.getItem() instanceof IAltarManipulator) { - playerItem.getItem().onItemRightClick(world, player, hand); - return true; - } - - if (Utils.insertItemToTile(altar, player)) - altar.startCycle(); - else - altar.setActive(); - - world.notifyBlockUpdate(pos, state, state, 3); - return true; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TileAltar) - ((TileAltar) tile).dropItems(); - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileAltar(); - } - - // IDocumentedBlock - - @Override - public List getDocumentation(PlayerEntity player, World world, BlockPos pos, BlockState state) { - List docs = new ArrayList<>(); - IBloodAltar altar = ((IBloodAltar) world.getTileEntity(pos)); - Pair missingBlock = AltarUtil.getFirstMissingComponent(world, pos, altar.getTier().toInt()); - if (missingBlock != null) - docs.add(new TranslationTextComponent("chat.bloodmagic.altar.nextTier", new TranslationTextComponent(missingBlock.getRight().getKey()), Utils.prettifyBlockPosString(missingBlock.getLeft()))); - - return docs; - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } - - /* Redstone code, taken from BlockLever */ - - public int getWeakPower(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { - return blockState.getValue(POWERED) ? 15 : 0; - } - - public int getStrongPower(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { - if (!blockState.getValue(POWERED)) { - return 0; - } else { - return 15; - } - } - - public boolean canProvidePower(BlockState state) { - return true; - } - - public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(POWERED, meta > 0); - } - - public int getMetaFromState(BlockState state) { - return state.getValue(POWERED) ? 1 : 0; - } - - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, POWERED); - } - - public BlockState getStateForPlacement(World worldIn, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer) { - - return this.getDefaultState().withProperty(POWERED, false); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java deleted file mode 100644 index ebc22ba0..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ /dev/null @@ -1,112 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.Hand; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.Random; - -public class BlockBloodLight extends Block { - protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.4, 0.4, 0.4, 0.6, 0.6, 0.6); - - public BlockBloodLight() { - super(Material.CLOTH); - - setTranslationKey(BloodMagic.MODID + ".bloodLight"); - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return AABB; - } - - @Nullable - @Override - public AxisAlignedBB getCollisionBoundingBox(BlockState blockState, IBlockAccess worldIn, BlockPos pos) { - return NULL_AABB; - } - - @Override - public boolean isReplaceable(IBlockAccess world, BlockPos pos) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.CUTOUT; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public int getLightValue(BlockState state) { - return 15; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager particleManager) { - if (world.getBlockState(pos).getBlock() == this) { - Random random = new Random(); - particleManager.spawnEffectParticle(EnumParticleTypes.REDSTONE.getParticleID(), pos.getX() + 0.5D + random.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + random.nextGaussian() / 8, 0, 0, 0); - } - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { - ClientPlayerEntity player = Minecraft.getInstance().player; - - if (rand.nextInt(3) != 0) { - world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - ItemStack heldItem = player.getHeldItem(Hand.MAIN_HAND); - - if (heldItem.isEmpty() || heldItem.getItem() != RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT) - return; - - for (int i = 0; i < 8; i++) - world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); - } - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java deleted file mode 100644 index 2f1d3a77..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ /dev/null @@ -1,44 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.BloodRuneType; -import WayofTime.bloodmagic.iface.IBloodRune; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.List; - -public class BlockBloodRune extends BlockEnum implements IBloodRune { - - public BlockBloodRune() { - super(Material.ROCK, BloodRuneType.class); - - setTranslationKey(BloodMagic.MODID + ".rune."); - setCreativeTab(BloodMagic.TAB_BM); - setSoundType(SoundType.STONE); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 2); - } - - @Nullable - @Override - public BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, BlockState state) { - return state.getValue(getProperty()); - } - - @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag tooltipFlag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.decoration.safe")); - super.addInformation(stack, world, tooltip, tooltipFlag); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java deleted file mode 100644 index b289bfd8..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ /dev/null @@ -1,195 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockInteger; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.block.ItemBlockBloodTank; -import WayofTime.bloodmagic.tile.TileBloodTank; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class BlockBloodTank extends BlockInteger implements IVariantProvider, IBMBlock { - public static final AxisAlignedBB BOX = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.8, 0.75); - - public BlockBloodTank() { - super(Material.IRON, TileBloodTank.CAPACITIES.length - 1, "tier"); - - setTranslationKey(BloodMagic.MODID + ".bloodTank"); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.GLASS); - setHarvestLevel("pickaxe", 1); - setCreativeTab(BloodMagic.TAB_BM); - setLightOpacity(0); - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return BOX; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.CUTOUT_MIPPED; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public void harvestBlock(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable TileEntity tile, ItemStack stack) { - super.harvestBlock(world, player, pos, state, tile, stack); - world.setBlockToAir(pos); - } - - @Override - public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest) { - return willHarvest || super.removedByPlayer(state, world, pos, player, willHarvest); - } - - @Override - public boolean onBlockActivated(World world, BlockPos blockPos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - boolean success = FluidUtil.interactWithFluidHandler(player, hand, world, blockPos, side); - if (success) { - world.checkLight(blockPos); - world.updateComparatorOutputLevel(blockPos, this); - world.markAndNotifyBlock(blockPos, world.getChunk(blockPos), state, state, 3); - return true; - } - - return true; - } - - @Override - public void onBlockHarvested(World worldIn, BlockPos pos, BlockState state, PlayerEntity player) { - if (!player.capabilities.isCreativeMode) - this.dropBlockAsItem(worldIn, pos, state, 0); - super.onBlockHarvested(worldIn, pos, state, player); - } - - @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, BlockState blockState, int fortune) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBloodTank) { - TileBloodTank bloodTank = (TileBloodTank) tile; - ItemStack drop = new ItemStack(this, 1, bloodTank.getBlockMetadata()); - CompoundNBT fluidTag = new CompoundNBT(); - - if (bloodTank.getTank().getFluid() != null) { - bloodTank.getTank().getFluid().writeToNBT(fluidTag); - CompoundNBT dropTag = new CompoundNBT(); - dropTag.put("Fluid", fluidTag); - drop.setTagCompound(dropTag); - } - - drops.add(drop); - } - } - - @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState blockState, LivingEntity placer, ItemStack stack) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBloodTank) { - TileBloodTank bloodTank = (TileBloodTank) tile; - CompoundNBT tag = stack.getTagCompound(); - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompound("Fluid")); - bloodTank.getTank().setFluid(fluidStack); - } - } - - world.checkLight(pos); - world.updateComparatorOutputLevel(pos, this); - world.markAndNotifyBlock(pos, world.getChunk(pos), blockState, blockState, 3); - } - - @Override - public int getLightValue(BlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBloodTank) { - FluidStack fluidStack = ((TileBloodTank) tile).getTank().getFluid(); - return fluidStack == null || fluidStack.amount <= 0 ? 0 : fluidStack.getFluid().getLuminosity(fluidStack); - } - - return super.getLightValue(state, world, pos); - } - - @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { - return new ItemStack(this, 1, getMetaFromState(state)); - } - - @Override - public boolean hasComparatorInputOverride(BlockState state) { - return true; - } - - @Override - public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBloodTank) - return ((TileBloodTank) tile).getComparatorOutput(); - return 0; - } - - @Override - public TileEntity createTileEntity(World worldIn, BlockState blockState) { - return new TileBloodTank(getMetaFromState(blockState)); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Override - public BlockItem getItem() { - return new ItemBlockBloodTank(this); - } - - // IVariantProvider - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) - variants.put(i, "inventory"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java deleted file mode 100644 index 13c04c99..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumDecorative; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -public class BlockDecorative extends BlockEnum { - public BlockDecorative() { - super(Material.ROCK, EnumDecorative.class); - - setTranslationKey(BloodMagic.MODID + "."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) { - for (EnumDecorative type : EnumDecorative.values()) { - if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && (type == EnumDecorative.CRYSTAL_TILE || type == EnumDecorative.CRYSTAL_BRICK)) - continue; - subBlocks.add(new ItemStack(this, 1, type.ordinal())); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java deleted file mode 100644 index 0fbe5fd7..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.IStringSerializable; - -public class BlockDemonBase & IStringSerializable> extends BlockEnum implements IVariantProvider { - public BlockDemonBase(String baseName, Class enumClass) { - super(Material.ROCK, enumClass); - - setTranslationKey(BloodMagic.MODID + "." + baseName + "."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java deleted file mode 100644 index 52df7b4d..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ /dev/null @@ -1,172 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.soul.IDemonWillGem; -import WayofTime.bloodmagic.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.tile.TileDemonCrucible; -import WayofTime.bloodmagic.util.Utils; -import com.google.common.collect.Lists; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBlock { - protected static final AxisAlignedBB BODY = new AxisAlignedBB(2 / 16F, 7 / 16F, 2 / 16F, 14 / 16F, 15 / 16F, 14 / 16F); - private static final AxisAlignedBB[] ARMS = { - new AxisAlignedBB(5 / 16F, 13 / 16F, 0 / 16F, 11 / 16F, 25 / 16F, 2 / 16F), // N - new AxisAlignedBB(14 / 16F, 13 / 16F, 5 / 16F, 16 / 16F, 25 / 16F, 11 / 16F), // E - new AxisAlignedBB(5 / 16F, 13 / 16F, 14 / 16F, 11 / 16F, 25 / 16F, 16 / 16F), // S - new AxisAlignedBB(0 / 16F, 13 / 16F, 5 / 16F, 2 / 16F, 25 / 16F, 11 / 16F) // W - }; - private static final AxisAlignedBB[] FEET = { - new AxisAlignedBB(10 / 16F, 0F, 2 / 16F, 14 / 16F, 7 / 16F, 6 / 16F), // NE - new AxisAlignedBB(10 / 16F, 0F, 10 / 16F, 14 / 16F, 7 / 16F, 14 / 16F), // SE - new AxisAlignedBB(2 / 16F, 0F, 10 / 16F, 6 / 16F, 7 / 16F, 14 / 16F), // SW - new AxisAlignedBB(2 / 16F, 0F, 2 / 16F, 6 / 16F, 7 / 16F, 6 / 16F) // NW - }; - - - public BlockDemonCrucible() { - super(Material.ROCK); - - setTranslationKey(BloodMagic.MODID + ".demonCrucible"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 0); - -// setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); - } - - private static List getCollisionBoxList(BlockState state) { - ArrayList collBox = new ArrayList<>(Arrays.asList(ARMS)); - collBox.add(BODY); - collBox.addAll(Arrays.asList(FEET)); - return collBox; - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return BODY; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack heldItem = player.getHeldItem(hand); - TileDemonCrucible crucible = (TileDemonCrucible) world.getTileEntity(pos); - - if (crucible == null || player.isSneaking()) - return false; - - if (!heldItem.isEmpty()) { - if (!(heldItem.getItem() instanceof IDiscreteDemonWill) && !(heldItem.getItem() instanceof IDemonWillGem)) { - return true; - } - } - - Utils.insertItemToTile(crucible, player); - - world.notifyBlockUpdate(pos, state, state, 3); - return true; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileDemonCrucible tile = (TileDemonCrucible) world.getTileEntity(blockPos); - if (tile != null) - tile.dropItems(); - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileDemonCrucible(); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } - - @Override - public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { - List list = Lists.newArrayList(); - - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { - list.add(this.rayTrace(pos, start, end, axisalignedbb)); - } - - RayTraceResult rayTrace = null; - double d1 = 0.0D; - - for (RayTraceResult raytraceresult : list) { - if (raytraceresult != null) { - double d0 = raytraceresult.hitVec.squareDistanceTo(end); - - if (d0 > d1) { - rayTrace = raytraceresult; - d1 = d0; - } - } - } - - return rayTrace; - } - - @Override - public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { - state = this.getActualState(state, worldIn, pos); - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { - addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java deleted file mode 100644 index a98e8d43..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ /dev/null @@ -1,368 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.ItemDemonCrystal; -import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.tile.TileDemonCrystal; -import com.google.common.collect.Lists; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.properties.PropertyInteger; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemGroup; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.EnumMap; -import java.util.List; - -public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvider { - - public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6); - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumDemonWillType.class); - public static final PropertyEnum ATTACHED = PropertyEnum.create("attached", Direction.class); - private static final EnumMap bounds = new EnumMap<>(Direction.class); - - // Bounding / Collision boxes - private static final AxisAlignedBB[] UP = { - new AxisAlignedBB(6 / 16F, 0, 5 / 16F, 10 / 16F, 13 / 16F, 9 / 16F), - new AxisAlignedBB(7 / 16F, 0, 0, 13 / 16F, 6 / 16F, 5 / 16F), - new AxisAlignedBB(9 / 16F, 0, 9 / 16F, 13 / 16F, 5 / 16F, 14 / 16F), - new AxisAlignedBB(2 / 16F, 0, 1 / 16F, 7 / 16F, 6 / 16F, 7 / 16F), - new AxisAlignedBB(5 / 16F, 0, 9 / 16F, 9 / 16F, 7 / 16F, 15 / 16F), - new AxisAlignedBB(0, 0, 7 / 16F, 6 / 16F, 6 / 16F, 10 / 16F), - new AxisAlignedBB(10 / 16F, 0, 6 / 16F, 15 / 16F, 6 / 16F, 9 / 16F) - }; - private static final AxisAlignedBB[] DOWN = { - new AxisAlignedBB(6 / 16F, 3 / 16F, 7 / 16F, 10 / 16F, 16 / 16F, 11 / 16F), - new AxisAlignedBB(7 / 16F, 10 / 16F, 11 / 16F, 13 / 16F, 16 / 16F, 16 / 16F), - new AxisAlignedBB(9 / 16F, 11 / 16F, 2 / 16F, 13 / 16F, 16 / 16F, 7 / 16F), - new AxisAlignedBB(2 / 16F, 9 / 16F, 11 / 16F, 7 / 16F, 16 / 16F, 15 / 16F), - new AxisAlignedBB(5 / 16F, 9 / 16F, 1 / 16F, 9 / 16F, 16 / 16F, 7 / 16F), - new AxisAlignedBB(0, 10 / 16F, 6 / 16F, 6 / 16F, 16 / 16F, 9 / 16F), - new AxisAlignedBB(10 / 16F, 11 / 16F, 7 / 16F, 15 / 16F, 16 / 16F, 10 / 16F) - }; - private static final AxisAlignedBB[] NORTH = { - new AxisAlignedBB(6 / 16F, 5 / 16F, 3 / 16F, 10 / 16F, 9 / 16F, 16 / 16F), - new AxisAlignedBB(9 / 16F, 0, 6 / 16F, 13 / 16F, 5 / 16F, 16 / 16F), - new AxisAlignedBB(8 / 16F, 9 / 16F, 11 / 16F, 13 / 16F, 14 / 16F, 16 / 16F), - new AxisAlignedBB(2 / 16F, 1 / 16F, 9 / 16F, 7 / 16F, 7 / 16F, 16 / 16F), - new AxisAlignedBB(5 / 16F, 9 / 16F, 9 / 16F, 9 / 16F, 15 / 16F, 16 / 16F), - new AxisAlignedBB(0, 7 / 16F, 10 / 16F, 6 / 16F, 10 / 16F, 16 / 16F), - new AxisAlignedBB(10 / 16F, 7 / 16F, 10 / 16F, 15 / 16F, 9 / 16F, 15 / 16F), - }; - private static final AxisAlignedBB[] SOUTH = { - new AxisAlignedBB(6 / 16F, 7 / 16F, 0 / 16F, 10 / 16F, 11 / 16F, 13 / 16F), - new AxisAlignedBB(7 / 16F, 11 / 16F, 0, 13 / 16F, 16 / 16F, 6 / 16F), - new AxisAlignedBB(8 / 16F, 2 / 16F, 9 / 16F, 13 / 16F, 7 / 16F, 14 / 16F), - new AxisAlignedBB(2 / 16F, 9 / 16F, 1 / 16F, 7 / 16F, 14 / 16F, 7 / 16F), - new AxisAlignedBB(5 / 16F, 1 / 16F, 9 / 16F, 9 / 16F, 7 / 16F, 9 / 16F), - new AxisAlignedBB(0, 6 / 16F, 1 / 16F, 6 / 16F, 9 / 16F, 7 / 16F), - new AxisAlignedBB(10 / 16F, 8 / 16F, 1 / 16F, 15 / 16F, 10 / 16F, 6 / 16F) - }; - private static final AxisAlignedBB[] EAST = { - new AxisAlignedBB(0, 6 / 16F, 5 / 16F, 13 / 16F, 10 / 16F, 9 / 16F), - new AxisAlignedBB(0, 3 / 16F, 0, 6 / 16F, 9 / 16F, 5 / 16F), - new AxisAlignedBB(0 / 16F, 3 / 16F, 9 / 16F, 5 / 16F, 8 / 16F, 14 / 16F), - new AxisAlignedBB(1 / 16F, 9 / 16F, 1 / 16F, 7 / 16F, 13 / 16F, 7 / 16F), - new AxisAlignedBB(1 / 16F, 0, 9 / 16F, 7 / 16F, 11 / 16F, 15 / 16F), - new AxisAlignedBB(0, 10 / 16F, 7 / 16F, 6 / 16F, 16 / 16F, 10 / 16F), - new AxisAlignedBB(0, 1 / 16F, 6 / 16F, 5 / 16F, 6 / 16F, 9 / 16F) - }; - private static final AxisAlignedBB[] WEST = { - new AxisAlignedBB(3 / 16F, 6 / 16F, 5 / 16F, 16 / 16F, 10 / 16F, 9 / 16F), - new AxisAlignedBB(9 / 16F, 7 / 16F, 0, 16 / 16F, 12 / 16F, 5 / 16F), - new AxisAlignedBB(11 / 16F, 4 / 16F, 9 / 16F, 16 / 16F, 13 / 16F, 14 / 16F), - new AxisAlignedBB(9 / 16F, 3 / 16F, 1 / 16F, 16 / 16F, 8 / 16F, 7 / 16F), - new AxisAlignedBB(9 / 16F, 6 / 16F, 9 / 16F, 16 / 16F, 8 / 16F, 15 / 16F), - new AxisAlignedBB(10 / 16F, 1 / 16F, 7 / 16F, 16 / 16F, 6 / 16F, 10 / 16F), - new AxisAlignedBB(10 / 16F, 6 / 16F, 6 / 16F, 15 / 16F, 15 / 16F, 9 / 16F) - }; - - public BlockDemonCrystal() { - super(Material.ROCK); - this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, Direction.UP)); - - setTranslationKey(BloodMagic.MODID + ".demonCrystal."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 2); - } - - public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) { - ItemStack stack = ItemStack.EMPTY; - switch (type) { - case CORROSIVE: - stack = EnumDemonWillType.CORROSIVE.getStack(); - break; - case DEFAULT: - stack = EnumDemonWillType.DEFAULT.getStack(); - break; - case DESTRUCTIVE: - stack = EnumDemonWillType.DESTRUCTIVE.getStack(); - break; - case STEADFAST: - stack = EnumDemonWillType.STEADFAST.getStack(); - break; - case VENGEFUL: - stack = EnumDemonWillType.VENGEFUL.getStack(); - break; - } - - stack.setCount(crystalNumber); - return stack; - } - - // collects a sublist from 0 to age for the collision boxes - private static List getCollisionBoxList(BlockState state) { - int age = state.getValue(BlockDemonCrystal.AGE) + 1; - switch (state.getValue(BlockDemonCrystal.ATTACHED)) { - case DOWN: - return Arrays.asList(DOWN).subList(0, age); - case NORTH: - return Arrays.asList(NORTH).subList(0, age); - case SOUTH: - return Arrays.asList(SOUTH).subList(0, age); - case WEST: - return Arrays.asList(WEST).subList(0, age); - case EAST: - return Arrays.asList(EAST).subList(0, age); - case UP: - default: - return Arrays.asList(UP).subList(0, age); - } - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - TileEntity tile = source.getTileEntity(pos); - if (tile != null) - state = getActualState(state, tile.getWorld(), pos); - switch (state.getValue(ATTACHED)) { - case DOWN: - return DOWN[0]; - case NORTH: - return NORTH[0]; - case SOUTH: - return SOUTH[0]; - case EAST: - return EAST[0]; - case WEST: - return WEST[0]; - case UP: - default: - return UP[0]; - } - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - if (!world.isRemote) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - TileDemonCrystal crystal = (TileDemonCrystal) tile; - boolean isCreative = player.capabilities.isCreativeMode; - boolean holdsCrystal = player.getHeldItem(hand).getItem() instanceof ItemDemonCrystal; - - if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024 && !(holdsCrystal && isCreative)) { - crystal.dropSingleCrystal(); - - } - if (!crystal.getWorld().isRemote && isCreative && holdsCrystal) { - if (crystal.crystalCount < 7) { - crystal.internalCounter = 0; - if (crystal.progressToNextCrystal > 0) - crystal.progressToNextCrystal--; - crystal.crystalCount++; - crystal.markDirty(); - crystal.notifyUpdate(); - } - } - } - } - return true; - } - - @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, BlockState state, int fortune) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - EnumDemonWillType type = state.getValue(TYPE); - int number = ((TileDemonCrystal) tile).getCrystalCount(); - - drops.add(getItemStackDropped(type, number)); - } - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - TileDemonCrystal crystal = (TileDemonCrystal) tile; - state = state.withProperty(AGE, crystal.getCrystalCountForRender()); - state = state.withProperty(ATTACHED, crystal.getPlacement()); - } - return state; - } - - @Override - public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - TileDemonCrystal crystal = (TileDemonCrystal) tile; - Direction placement = crystal.getPlacement(); - BlockPos offsetPos = pos.offset(placement.getOpposite()); - BlockState offsetState = world.getBlockState(offsetPos); - - if (!offsetState.isSideSolid(world, offsetPos, placement)) - world.destroyBlock(pos, true); - } - } - - @Override - public boolean canPlaceBlockOnSide(World world, BlockPos pos, Direction side) { - BlockPos offsetPos = pos.offset(side.getOpposite()); - BlockState offsetState = world.getBlockState(offsetPos); - - return offsetState.isSideSolid(world, offsetPos, side) && this.canPlaceBlockAt(world, pos); - } - - @Override - public void getSubBlocks(ItemGroup creativeTabs, NonNullList list) { - for (EnumDemonWillType willType : EnumDemonWillType.values()) - list.add(new ItemStack(this, 1, willType.ordinal())); - } - - @Override - public void harvestBlock(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable TileEntity tile, ItemStack stack) { - super.harvestBlock(world, player, pos, state, tile, stack); - world.setBlockToAir(pos); - } - - @Override - public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest) { - return willHarvest || super.removedByPlayer(state, world, pos, player, false); - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(TYPE, EnumDemonWillType.values()[meta]); - } - - @Override - public int getMetaFromState(BlockState state) { - - return state.getValue(TYPE).ordinal(); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, TYPE, AGE, ATTACHED); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileDemonCrystal(); - } - - @Override - public BlockItem getItem() { - return new ItemBlockDemonCrystal(this); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - for (EnumDemonWillType willType : EnumDemonWillType.values()) - variants.put(willType.ordinal(), "age=3,attached=up,type=" + willType.getName()); - } - - @Override - public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { - List list = Lists.newArrayList(); - - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { - list.add(this.rayTrace(pos, start, end, axisalignedbb)); - } - - RayTraceResult rayTrace = null; - double d1 = 0.0D; - - for (RayTraceResult raytraceresult : list) { - if (raytraceresult != null) { - double d0 = raytraceresult.hitVec.squareDistanceTo(end); - - if (d0 > d1) { - rayTrace = raytraceresult; - d1 = d0; - } - } - } - - return rayTrace; - } - - @Override - public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { - state = this.getActualState(state, worldIn, pos); - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { - addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); - } - } - -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java deleted file mode 100644 index 099f13f6..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ /dev/null @@ -1,77 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.TileDemonCrystallizer; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.BlockState; -import net.minecraft.block.ContainerBlock; -import net.minecraft.block.material.Material; -import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; - -public class BlockDemonCrystallizer extends ContainerBlock implements IVariantProvider, IBMBlock { - public BlockDemonCrystallizer() { - super(Material.ROCK); - - setTranslationKey(BloodMagic.MODID + ".demonCrystallizer"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 0); - -// setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); - } - - @Override - public boolean isSideSolid(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { - return side == Direction.UP; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public TileEntity createNewTileEntity(World world, int meta) { - return new TileDemonCrystallizer(); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "normal"); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java deleted file mode 100644 index 45c5f9cc..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumSubWillType; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; - -public class BlockDemonLight extends BlockEnum { - public BlockDemonLight() { - super(Material.ROCK, EnumSubWillType.class); - - setTranslationKey(BloodMagic.MODID + ".demonlight."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - setLightLevel(1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java deleted file mode 100644 index 9ee5eca8..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnumPillar; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; - -import javax.annotation.Nonnull; - -public class BlockDemonPillarBase & IStringSerializable> extends BlockEnumPillar { - public BlockDemonPillarBase(String baseName, Material materialIn, Class enumClass) { - super(materialIn, enumClass); - - setTranslationKey(BloodMagic.MODID + "." + baseName + "."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - Direction.Axis[] axis = new Direction.Axis[]{Direction.Axis.Y, Direction.Axis.X, Direction.Axis.Z}; - - for (int i = 0; i < 3; i++) - for (int j = 0; j < this.getTypes().length; j++) - variants.put(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j]); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java deleted file mode 100644 index ddf7253b..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnumPillarCap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; - -import javax.annotation.Nonnull; - -public class BlockDemonPillarCapBase & IStringSerializable> extends BlockEnumPillarCap { - public BlockDemonPillarCapBase(String baseName, Material materialIn, Class enumClass) { - super(materialIn, enumClass); - - setTranslationKey(BloodMagic.MODID + "." + baseName + "."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - for (int i = 0; i < Direction.values().length; i++) - for (int j = 0; j < this.getTypes().length; j++) - variants.put(i * 2 + j, "facing=" + Direction.values()[i] + ",type=" + this.getTypes()[j]); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java deleted file mode 100644 index e1cca4d9..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ /dev/null @@ -1,129 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.TileDemonPylon; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; -import net.minecraft.block.ContainerBlock; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class BlockDemonPylon extends ContainerBlock implements IBMBlock, IVariantProvider { - protected static final AxisAlignedBB BODY = new AxisAlignedBB(2 / 16F, 7 / 16F, 2 / 16F, 14 / 16F, 20 / 16F, 14 / 16F); - private static final AxisAlignedBB[] FEET = { - new AxisAlignedBB(10 / 16F, 0F, 2 / 16F, 14 / 16F, 7 / 16F, 6 / 16F), // NE - new AxisAlignedBB(10 / 16F, 0F, 10 / 16F, 14 / 16F, 7 / 16F, 14 / 16F), // SE - new AxisAlignedBB(2 / 16F, 0F, 10 / 16F, 6 / 16F, 7 / 16F, 14 / 16F), // SW - new AxisAlignedBB(2 / 16F, 0F, 2 / 16F, 6 / 16F, 7 / 16F, 6 / 16F) // NW - }; - private static final AxisAlignedBB[] ARMS = {}; - - public BlockDemonPylon() { - super(Material.ROCK); - - setTranslationKey(BloodMagic.MODID + ".demonPylon"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 0); - -// setBlockBounds(0.3F, 0F, 0.3F, 0.72F, 1F, 0.72F); - } - - private static List getCollisionBoxList(BlockState state) { - ArrayList collBox = new ArrayList<>(Arrays.asList(ARMS)); - collBox.add(BODY); - collBox.addAll(Arrays.asList(FEET)); - return collBox; - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return BODY; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public TileEntity createNewTileEntity(World world, int meta) { - return new TileDemonPylon(); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } - - @Override - public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { - List list = Lists.newArrayList(); - - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { - list.add(this.rayTrace(pos, start, end, axisalignedbb)); - } - - RayTraceResult rayTrace = null; - double d1 = 0.0D; - - for (RayTraceResult raytraceresult : list) { - if (raytraceresult != null) { - double d0 = raytraceresult.hitVec.squareDistanceTo(end); - - if (d0 > d1) { - rayTrace = raytraceresult; - d1 = d0; - } - } - } - - return rayTrace; - } - - @Override - public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { - state = this.getActualState(state, worldIn, pos); - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { - addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java deleted file mode 100644 index 1402fe47..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnumStairs; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.IStringSerializable; - -public class BlockDemonStairsBase & IStringSerializable> extends BlockEnumStairs { - public BlockDemonStairsBase(String baseName, Material materialIn, Class enumClass) { - super(materialIn, enumClass); - - setTranslationKey(BloodMagic.MODID + "." + baseName + "."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - for (int i = 0; i < this.getTypes().length; i++) - variants.put(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i]); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java deleted file mode 100644 index 158ebdb9..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnumWall; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.IStringSerializable; - -public class BlockDemonWallBase & IStringSerializable> extends BlockEnumWall { - public BlockDemonWallBase(String baseName, Material materialIn, Class enumClass) { - super(materialIn, enumClass); - - setTranslationKey(BloodMagic.MODID + "." + baseName + "."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - for (int i = 0; i < this.getTypes().length; i++) - variants.put(i, "east=true,north=false,south=false,type=" + this.getTypes()[i] + ",up=true,west=true"); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java deleted file mode 100644 index 7c4471d1..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ /dev/null @@ -1,183 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockInteger; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.portal.LocationsHandler; -import WayofTime.bloodmagic.teleport.PortalLocation; -import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.teleport.Teleports; -import WayofTime.bloodmagic.tile.TileDimensionalPortal; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Random; - -public class BlockDimensionalPortal extends BlockInteger { - protected static final AxisAlignedBB AABB_0 = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D); - protected static final AxisAlignedBB AABB_1 = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_DEFAULT = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D); - - public BlockDimensionalPortal() { - super(Material.PORTAL, 2); - setTranslationKey(BloodMagic.MODID + ".dimensionalPortal"); - setBlockUnbreakable(); - setResistance(2000); - setLightOpacity(0); - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public AxisAlignedBB getCollisionBoundingBox(BlockState state, IBlockAccess world, BlockPos pos) { - return null; - } - - public boolean isOpaqueCube() { - return false; - } - - public boolean isFullCube() { - return false; - } - - @Override - public int getLightValue(BlockState state, IBlockAccess world, BlockPos pos) { - return 12; - } - - @Override - public void onEntityCollision(World world, BlockPos pos, BlockState blockState, Entity entity) { - if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) { - TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos); - - if (LocationsHandler.getLocationsHandler() != null) { - ArrayList linkedLocations = LocationsHandler.getLocationsHandler().getLinkedLocations(tile.portalID); - - if (linkedLocations != null && !linkedLocations.isEmpty() && linkedLocations.size() > 1) { - if (world.getTileEntity(tile.getMasterStonePos()) != null && world.getTileEntity(tile.getMasterStonePos()) instanceof IMasterRitualStone) { - IMasterRitualStone masterRitualStone = (IMasterRitualStone) world.getTileEntity(tile.getMasterStonePos()); - if (linkedLocations.get(0).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension()))) { - PortalLocation portal = linkedLocations.get(1); - if (portal.getDimension() == world.provider.getDimension()) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false)); - } else { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false)); - } - } else if (linkedLocations.get(1).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension()))) { - PortalLocation portal = linkedLocations.get(0); - if (portal.getDimension() == world.provider.getDimension()) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false)); - } else { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false)); - } - } - } - } - } - } - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess world, BlockPos pos) { - int meta = state.getBlock().getMetaFromState(state); - if (meta == 0) { - return AABB_0; - } else if (meta == 1) { - return AABB_1; - } else { - return AABB_DEFAULT; - } - } - -// -// @Override -// public void setBlockBoundsForItemRender() -// { -// setBlockBounds(0f, 0f, 0.375f, 1f, 1f, 0.625f); -// } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { - this.spawnParticles(world, pos.getX(), pos.getY(), pos.getZ()); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileDimensionalPortal(); - } - - private void spawnParticles(World world, int x, int y, int z) { - Random random = world.rand; - double d0 = 0.0625D; - for (int i = 0; i < 6; ++i) { - double particleX = (double) ((float) x + random.nextFloat()); - double particleY = (double) ((float) y + random.nextFloat()); - double particleZ = (double) ((float) z + random.nextFloat()); - if (i == 0 && !world.getBlockState(new BlockPos(x, y + 1, z)).isOpaqueCube()) { - particleY = (double) (y + 1) + d0; - } - if (i == 1 && !world.getBlockState(new BlockPos(x, y - 1, z)).isOpaqueCube()) { - particleY = (double) y - d0; - } - if (i == 2 && !world.getBlockState(new BlockPos(x, y, z + 1)).isOpaqueCube()) { - particleZ = (double) (z + 1) + d0; - } - if (i == 3 && !world.getBlockState(new BlockPos(x, y, z - 1)).isOpaqueCube()) { - particleZ = (double) z - d0; - } - if (i == 4 && !world.getBlockState(new BlockPos(x + 1, y, z)).isOpaqueCube()) { - particleX = (double) (x + 1) + d0; - } - if (i == 5 && !world.getBlockState(new BlockPos(x - 1, y, z)).isOpaqueCube()) { - particleX = (double) x - d0; - } - if (particleX < (double) x || particleX > (double) (x + 1) || particleY < 0.0D || particleY > (double) (y + 1) || particleZ < (double) z || particleZ > (double) (z + 1)) { - world.spawnParticle(EnumParticleTypes.REDSTONE, particleX, particleY, particleZ, 0.0D, 0.0D, 0.0D); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java deleted file mode 100644 index e4c22de3..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ /dev/null @@ -1,86 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.TileIncenseAltar; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlock { - protected static final AxisAlignedBB AABB = new AxisAlignedBB(5 / 16F, 0F, 5 / 16F, 12 / 16F, 1F, 11 / 16F); - - public BlockIncenseAltar() { - super(Material.ROCK); - - setTranslationKey(BloodMagic.MODID + ".incenseAltar"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 0); - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return AABB; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileIncenseAltar TileIncenseAltar = (TileIncenseAltar) world.getTileEntity(blockPos); - if (TileIncenseAltar != null) - TileIncenseAltar.dropItems(); - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileIncenseAltar(); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java deleted file mode 100644 index 7e52286f..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ /dev/null @@ -1,53 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockInputRoutingNode extends BlockRoutingNode { - public BlockInputRoutingNode() { - super(); - - setTranslationKey(BloodMagic.MODID + ".inputRouting"); - } - - @Override - //TODO: Combine BlockInputRoutingNode and BlockInputRoutingNode so they have the same superclass - public void breakBlock(World world, BlockPos pos, BlockState state) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileInputRoutingNode) { - ((TileInputRoutingNode) tile).removeAllConnections(); - ((TileInputRoutingNode) tile).dropItems(); - } - super.breakBlock(world, pos, state); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - if (world.getTileEntity(pos) instanceof TileInputRoutingNode) { - player.openGui(BloodMagic.instance, Constants.Gui.ROUTING_NODE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileInputRoutingNode(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java deleted file mode 100644 index ec8f6737..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ /dev/null @@ -1,90 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumSubWillType; -import WayofTime.bloodmagic.tile.TileInversionPillar; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class BlockInversionPillar extends BlockEnum { - public BlockInversionPillar() { - super(Material.ROCK, EnumSubWillType.class); - - setTranslationKey(BloodMagic.MODID + ".inversionpillar."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TileInversionPillar) { - TileInversionPillar tilePillar = (TileInversionPillar) world.getTileEntity(blockPos); - tilePillar.removePillarFromMap(); - } - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { - return super.getActualState(state, world, pos).withProperty(Properties.StaticProperty, true); - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - for (int i = 0; i < this.getTypes().length; i++) - variants.put(i, "static=false,type=" + this.getTypes()[i]); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileInversionPillar(state.getValue(getProperty()).getType()); - } - - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), Properties.StaticProperty).add(Properties.AnimationProperty).build(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java deleted file mode 100644 index d373d242..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ /dev/null @@ -1,57 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumInversionCap; -import WayofTime.bloodmagic.client.IVariantProvider; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class BlockInversionPillarEnd extends BlockEnum implements IVariantProvider { - public BlockInversionPillarEnd() { - super(Material.ROCK, EnumInversionCap.class); - - setTranslationKey(BloodMagic.MODID + ".inversionpillarend."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - for (int i = 0; i < this.getTypes().length; i++) - variants.put(i, "type=" + this.getTypes()[i]); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java deleted file mode 100644 index 585a11b4..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockItemRoutingNode extends BlockRoutingNode { - public BlockItemRoutingNode() { - super(); - - setTranslationKey(BloodMagic.MODID + ".itemRouting"); - } - - @Override - public void breakBlock(World world, BlockPos pos, BlockState state) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileRoutingNode) { - ((TileRoutingNode) tile).removeAllConnections(); - } - super.breakBlock(world, pos, state); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileItemRoutingNode(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java deleted file mode 100644 index e94badd6..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ /dev/null @@ -1,66 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.material.Material; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import java.awt.Color; - -public class BlockLifeEssence extends BlockFluidClassic { - private static final Fluid LIFE_ESSENCE = new FluidLifeEssence(); - - public BlockLifeEssence() { - super(LIFE_ESSENCE, Material.WATER); - - setTranslationKey(BloodMagic.MODID + ".fluid.lifeEssence"); - getLifeEssence().setBlock(this); - } - - @Override - public boolean canDisplace(IBlockAccess world, BlockPos blockPos) { - return !world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isLiquid() && super.canDisplace(world, blockPos); - } - - @Override - public boolean displaceIfPossible(World world, BlockPos blockPos) { - return !world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isLiquid() && super.displaceIfPossible(world, blockPos); - } - - @Override - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.SOLID; - } - - public static Fluid getLifeEssence() { - return LIFE_ESSENCE; - } - - public static class FluidLifeEssence extends Fluid { - - public FluidLifeEssence() { - super("lifeEssence", new ResourceLocation(Constants.Mod.DOMAIN + "blocks/lifeEssenceStill"), new ResourceLocation(Constants.Mod.DOMAIN + "blocks/lifeEssenceFlowing")); - - setDensity(2000); - setViscosity(2000); - } - - @Override - public int getColor() { - return Color.RED.getRGB(); - } - - @Override - public String getLocalizedName(FluidStack fluidStack) { - return TextHelper.localize("tile.bloodmagic.fluid.lifeEssence.name"); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java deleted file mode 100644 index c985563d..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ /dev/null @@ -1,43 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockMasterRoutingNode extends BlockRoutingNode { - public BlockMasterRoutingNode() { - super(); - - setTranslationKey(BloodMagic.MODID + ".masterRouting"); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileMasterRoutingNode(); - } - - // @Override -// public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) -// { -// if (world.getTileEntity(pos) instanceof TileMasterRoutingNode) -// { -// player.openGui(BloodMagic.instance, Constants.Gui.MASTER_ROUTING_NODE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); -// } -// -// return true; -// } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java deleted file mode 100644 index a3e10e77..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ /dev/null @@ -1,227 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.altar.IAltarComponent; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumMimic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.tile.TileMimic; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.item.block.ItemBlockMimic; -import net.minecraft.block.*; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; - -public class BlockMimic extends BlockEnum implements IAltarComponent { - public static final int sentientMimicMeta = 4; - - public BlockMimic() { - super(Material.ROCK, EnumMimic.class); - - setTranslationKey(BloodMagic.MODID + ".mimic."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setHarvestLevel("pickaxe", 0); - setLightOpacity(15); - } - - @Nullable - @Override - public AxisAlignedBB getCollisionBoundingBox(BlockState state, IBlockAccess world, BlockPos pos) { - switch (this.getMetaFromState(state)) { - case 1: - case 2: - case 3: - case 4: - TileMimic tileMimic = (TileMimic) world.getTileEntity(pos); - if (tileMimic != null && !tileMimic.getStackInSlot(0).isEmpty()) { - Block mimicBlock = Block.getBlockFromItem(tileMimic.getStackInSlot(0).getItem()); - if (mimicBlock == Blocks.AIR) { - return FULL_BLOCK_AABB; - } - BlockState mimicState = tileMimic.getReplacedState(); - if (mimicBlock != this) { - return mimicState.getCollisionBoundingBox(world, pos); - } - } else { - return FULL_BLOCK_AABB; - } - case 0: - default: - return NULL_AABB; - } - - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBox(BlockState state, World world, BlockPos pos) { - TileMimic tileMimic = (TileMimic) world.getTileEntity(pos); - if (tileMimic != null && !tileMimic.getStackInSlot(0).isEmpty()) { - Block mimicBlock = Block.getBlockFromItem(tileMimic.getStackInSlot(0).getItem()); - if (mimicBlock == Blocks.AIR) { - return FULL_BLOCK_AABB; - } - BlockState mimicState = tileMimic.getReplacedState(); - if (mimicBlock != this) { - return mimicState.getSelectedBoundingBox(world, pos); - } - } - - return FULL_BLOCK_AABB; - } - - @Override - public int getLightOpacity(BlockState state) { - switch (this.getMetaFromState(state)) { - case 2: - case 4: - return 0; - default: - return this.lightOpacity; - } - } - - @Override - public int getLightValue(BlockState state) { - switch (this.getMetaFromState(state)) { - case 3: - return 15; - default: - return this.lightValue; - } - } - - @Override - public int getMetaFromState(BlockState state) { - if (state.getBlock() == this) { - return super.getMetaFromState(state); - } - - return state.getBlock().getMetaFromState(state); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - TileMimic mimic = (TileMimic) world.getTileEntity(pos); - - return mimic != null && mimic.onBlockActivated(world, pos, state, player, hand, player.getHeldItem(hand), side); - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMimic) { - TileMimic mimic = (TileMimic) tile; - ItemStack stack = mimic.getStackInSlot(0); - if (stack.getItem() instanceof BlockItem) { - Block block = ((BlockItem) stack.getItem()).getBlock(); - BlockState mimicState = mimic.getReplacedState(); - if (block != this) { - if (block.getRenderType(mimicState) == BlockRenderType.ENTITYBLOCK_ANIMATED) { - return RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState(); //Small and invisible-ish, basically this is returned in order to not render over the animated block (TESR) - } - - return block.getActualState(mimicState, world, pos); - } - } - } - return state; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) { - return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.CUTOUT; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TileMimic) { - TileMimic TileMimic = (TileMimic) world.getTileEntity(blockPos); - if (TileMimic != null) - TileMimic.dropItems(); - } - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileMimic(); - } - - // IAltarComponent - - @Nullable - @Override - public ComponentType getType(World world, BlockState state, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMimic) { - TileMimic mimic = (TileMimic) tile; - ItemStack stack = mimic.getStackInSlot(0); - if (stack.getItem() instanceof BlockItem) { - Block block = ((BlockItem) stack.getItem()).getBlock(); - if (block instanceof IAltarComponent) { - return ((IAltarComponent) block).getType(world, mimic.getReplacedState(), pos); - } else { - for (ComponentType altarComponent : ComponentType.values()) - if (block == Utils.getBlockForComponent(altarComponent)) - return altarComponent; - } - } - } - return null; - } - - @Override - public BlockItem getItem() { - return new ItemBlockMimic(this); - } - -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java deleted file mode 100644 index cc4eda8b..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ /dev/null @@ -1,53 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockOutputRoutingNode extends BlockRoutingNode { - public BlockOutputRoutingNode() { - super(); - - setTranslationKey(BloodMagic.MODID + ".outputRouting"); - } - - @Override - //TODO: Combine BlockOutputRoutingNode and BlockInputRoutingNode so they have the same superclass - public void breakBlock(World world, BlockPos pos, BlockState state) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileOutputRoutingNode) { - ((TileOutputRoutingNode) tile).removeAllConnections(); - ((TileOutputRoutingNode) tile).dropItems(); - } - super.breakBlock(world, pos, state); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - if (world.getTileEntity(pos) instanceof TileOutputRoutingNode) { - player.openGui(BloodMagic.instance, Constants.Gui.ROUTING_NODE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileOutputRoutingNode(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java deleted file mode 100644 index 97ba5250..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ /dev/null @@ -1,84 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumPath; -import WayofTime.bloodmagic.incense.IIncensePath; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.List; - -public class BlockPath extends BlockEnum implements IIncensePath { - - public BlockPath() { - super(Material.ROCK, EnumPath.class); - - setTranslationKey(BloodMagic.MODID + ".path."); - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - - setHarvestLevel("axe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WOOD)); - setHarvestLevel("axe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WOODTILE)); - setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.STONE)); - setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.STONETILE)); - setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WORNSTONE)); - setHarvestLevel("pickaxe", 0, getDefaultState().withProperty(getProperty(), EnumPath.WORNSTONETILE)); - setHarvestLevel("pickaxe", 3, getDefaultState().withProperty(getProperty(), EnumPath.OBSIDIAN)); - setHarvestLevel("pickaxe", 3, getDefaultState().withProperty(getProperty(), EnumPath.OBSIDIANTILE)); - } - - @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag tooltipFlag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.decoration.safe")); - super.addInformation(stack, world, tooltip, tooltipFlag); - } - - @Override - public Material getMaterial(BlockState state) { - EnumPath path = state.getValue(getProperty()); - if (path.equals(EnumPath.WOOD) || path.equals(EnumPath.WOODTILE)) - return Material.WOOD; - else - return Material.ROCK; - } - - @Override - public SoundType getSoundType(BlockState state, World world, BlockPos pos, @Nullable Entity entity) { - EnumPath path = state.getValue(getProperty()); - if (path.equals(EnumPath.WOOD) || path.equals(EnumPath.WOODTILE)) - return SoundType.WOOD; - else - return super.getSoundType(); - } - - @Override - public int getLevelOfPath(World world, BlockPos pos, BlockState state) { - switch (this.getMetaFromState(state)) { - case 0: - case 1: - return 2; - case 2: - case 3: - return 4; - case 4: - case 5: - return 6; - case 6: - case 7: - return 8; - default: - return 0; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java deleted file mode 100644 index 81281cbc..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ /dev/null @@ -1,82 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.TilePhantomBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.Random; - -public class BlockPhantom extends Block implements IVariantProvider { - public BlockPhantom() { - super(Material.CLOTH); - - setTranslationKey(BloodMagic.MODID + ".phantom"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { - return world.getBlockState(pos.offset(side)) != state || state.getBlock() != this && super.shouldSideBeRendered(state, world, pos, side); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TilePhantomBlock(20); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java deleted file mode 100644 index 7c896b63..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ /dev/null @@ -1,136 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.event.RitualEvent; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.util.helper.RitualHelper; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.block.enums.EnumRitualController; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.tile.TileImperfectRitualStone; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import amerifrance.guideapi.api.IGuideLinked; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - -import javax.annotation.Nullable; - -public class BlockRitualController extends BlockEnum implements IGuideLinked { - - public BlockRitualController() { - super(Material.ROCK, EnumRitualController.class); - - setTranslationKey(BloodMagic.MODID + ".stone.ritual."); - setCreativeTab(BloodMagic.TAB_BM); - setSoundType(SoundType.STONE); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 2); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack heldItem = player.getHeldItem(hand); - TileEntity tile = world.getTileEntity(pos); - - if (state.getValue(getProperty()) != EnumRitualController.IMPERFECT && tile instanceof TileMasterRitualStone) { - if (heldItem.getItem() == RegistrarBloodMagicItems.ACTIVATION_CRYSTAL) { - if (((IBindable) heldItem.getItem()).getBinding(heldItem) == null) - return false; - - String key = RitualHelper.getValidRitual(world, pos); - if (!key.isEmpty()) { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); - if (ritual != null) { - Direction direction = RitualHelper.getDirectionOfRitual(world, pos, ritual); - // TODO: Give a message stating that this ritual is not a valid ritual. - if (direction != null && RitualHelper.checkValidRitual(world, pos, ritual, direction)) { - if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, BloodMagic.RITUAL_MANAGER.getRitual(key))) { - ((TileMasterRitualStone) tile).setDirection(direction); - if (state.getValue(getProperty()) == EnumRitualController.INVERTED) - ((TileMasterRitualStone) tile).setInverted(true); - } - } else { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); - } - } else { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); - } - } else { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); - } - } - } else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone) { - BlockState ritualBlock = world.getBlockState(pos.up()); - ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(ritualBlock); - if (ritual == null) - return false; - - RitualEvent.ImperfectRitualActivatedEvent event = new RitualEvent.ImperfectRitualActivatedEvent((IImperfectRitualStone) tile, player, ritual); - return !MinecraftForge.EVENT_BUS.post(event) && ((TileImperfectRitualStone) tile).performRitual(world, pos, ritual, player); - } - - return false; - } - - @Override - public void onBlockHarvested(World world, BlockPos pos, BlockState state, PlayerEntity player) { - TileEntity tile = world.getTileEntity(pos); - - if (getMetaFromState(state) == 0 && tile instanceof TileMasterRitualStone) - ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.BREAK_MRS); - } - - @Override - public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion) { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) - ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.EXPLOSION); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return state.getValue(getProperty()) != EnumRitualController.IMPERFECT ? new TileMasterRitualStone() : new TileImperfectRitualStone(); - } - - // IGuideLinked - - @Override - @Nullable - public ResourceLocation getLinkedEntry(World world, BlockPos pos, PlayerEntity player, ItemStack stack) { - BlockState state = world.getBlockState(pos); - if (state.getValue(getProperty()).equals(EnumRitualController.MASTER)) { - TileMasterRitualStone mrs = (TileMasterRitualStone) world.getTileEntity(pos); - if (mrs == null || mrs.getCurrentRitual() == null) - return null; - else - return new ResourceLocation("bloodmagic", "ritual_" + mrs.getCurrentRitual().getName()); - } else if (state.getValue(getProperty()).equals(EnumRitualController.IMPERFECT)) { - ImperfectRitual imperfectRitual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); - if (imperfectRitual != null) - return new ResourceLocation("bloodmagic", "ritual_" + imperfectRitual.getName()); - } - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java deleted file mode 100644 index 33ddfd90..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ /dev/null @@ -1,62 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.IRitualStone; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class BlockRitualStone extends BlockEnum implements IRitualStone { - public BlockRitualStone() { - super(Material.ROCK, EnumRuneType.class); - - setTranslationKey(BloodMagic.MODID + ".ritualStone."); - setCreativeTab(BloodMagic.TAB_BM); - setSoundType(SoundType.STONE); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 2); - } - - @SideOnly(Side.CLIENT) - @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag tooltipFlag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.decoration.safe")); - super.addInformation(stack, world, tooltip, tooltipFlag); - } - - @Override - public int damageDropped(BlockState state) { - return 0; - } - - @Override - public boolean canSilkHarvest(World world, BlockPos pos, BlockState state, PlayerEntity player) { - return false; - } - - @Override - public boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType) { - return runeType == this.getTypes()[getMetaFromState(world.getBlockState(pos))]; - } - - @Override - public void setRuneType(World world, BlockPos pos, EnumRuneType runeType) { - int meta = runeType.ordinal(); - BlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); - world.setBlockState(pos, newState); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java deleted file mode 100644 index be4adeb1..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java +++ /dev/null @@ -1,137 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; - -public class BlockRoutingNode extends Block implements IBMBlock, IVariantProvider { - public static final PropertyBool UP = PropertyBool.create("up"); - public static final PropertyBool DOWN = PropertyBool.create("down"); - public static final PropertyBool NORTH = PropertyBool.create("north"); - public static final PropertyBool EAST = PropertyBool.create("east"); - public static final PropertyBool SOUTH = PropertyBool.create("south"); - public static final PropertyBool WEST = PropertyBool.create("west"); - protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.378F, 0.378F, 0.378F, 0.625F, 0.625F, 0.625F); - - public BlockRoutingNode() { - super(Material.ROCK); - - setCreativeTab(BloodMagic.TAB_BM); - setHardness(2.0F); - setResistance(5.0F); - setHarvestLevel("pickaxe", 2); - - this.setDefaultState(this.blockState.getBaseState().withProperty(DOWN, false).withProperty(UP, false).withProperty(NORTH, false).withProperty(EAST, false).withProperty(SOUTH, false).withProperty(WEST, false)); - } - - @Override - public boolean canConnectRedstone(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { - return true; - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return AABB; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) { - return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.TRANSLUCENT; - } - - @Override - public BlockState getStateFromMeta(int meta) { - return this.getDefaultState(); - } - - /** - * Convert the BlockState into the correct metadata value - */ - @Override - public int getMetaFromState(BlockState state) { - return 0; - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(UP, this.shouldConnect(state, worldIn, pos.up(), Direction.DOWN)).withProperty(DOWN, this.shouldConnect(state, worldIn, pos.down(), Direction.UP)).withProperty(NORTH, this.shouldConnect(state, worldIn, pos.north(), Direction.SOUTH)).withProperty(EAST, this.shouldConnect(state, worldIn, pos.east(), Direction.WEST)).withProperty(SOUTH, this.shouldConnect(state, worldIn, pos.south(), Direction.NORTH)).withProperty(WEST, this.shouldConnect(state, worldIn, pos.west(), Direction.EAST)); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, UP, DOWN, NORTH, EAST, WEST, SOUTH); - } - - public boolean shouldConnect(BlockState state, IBlockAccess world, BlockPos pos, Direction attachedSide) { - BlockState blockState = world.getBlockState(pos); - Block block = blockState.getBlock(); - return block.getMaterial(blockState).isOpaque() && blockState.isFullCube(); - } - - @Override - public void breakBlock(World world, BlockPos pos, BlockState blockState) { - if (!world.isRemote) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileRoutingNode) { - ((TileRoutingNode) tile).removeAllConnections(); - } else if (tile instanceof TileMasterRoutingNode) { - ((TileMasterRoutingNode) tile).removeAllConnections(); - } - } - - super.breakBlock(world, pos, blockState); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "inventory"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java deleted file mode 100644 index bdfbc5f6..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ /dev/null @@ -1,100 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.TileSoulForge; -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock { - protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.06F, 0.0F, 0.06F, 0.94F, 0.75F, 0.94F); - - public BlockSoulForge() { - super(Material.IRON); - - setTranslationKey(BloodMagic.MODID + ".soulForge"); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.METAL); - setHarvestLevel("pickaxe", 1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return AABB; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - if (world.getTileEntity(pos) instanceof TileSoulForge) - player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - - return true; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileSoulForge tileSoulForge = (TileSoulForge) world.getTileEntity(blockPos); - if (tileSoulForge != null) - tileSoulForge.dropItems(); - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileSoulForge(); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java deleted file mode 100644 index 7602a807..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ /dev/null @@ -1,105 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.tile.TileSpectralBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; - -public class BlockSpectral extends Block { - protected static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); - - public BlockSpectral() { - super(Material.CLOTH); - - setTranslationKey(BloodMagic.MODID + ".spectral"); - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - return AABB; - } - - @Override - public boolean isNormalCube(BlockState state, IBlockAccess world, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public boolean causesSuffocation(BlockState state) { - return false; - } - - @SideOnly(Side.CLIENT) - @Override - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.TRANSLUCENT; - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return ConfigHandler.client.invisibleSpectralBlocks ? BlockRenderType.INVISIBLE : BlockRenderType.MODEL; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { - return world.getBlockState(pos.offset(side)) != state || state.getBlock() != this && super.shouldSideBeRendered(state, world, pos, side); - } - - @Override - public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List list, Entity collidingEntity, boolean bool) { - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; - } - - @Override - public boolean isReplaceable(IBlockAccess worldIn, BlockPos pos) { - return true; - } - - @Override - public boolean isAir(BlockState state, IBlockAccess world, BlockPos blockPos) { - return true; - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(World world, BlockState state) { - return new TileSpectralBlock(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java deleted file mode 100644 index 5dac961b..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ /dev/null @@ -1,69 +0,0 @@ -package WayofTime.bloodmagic.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.command.sub.SubCommandTeleposer; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.block.ContainerBlock; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class BlockTeleposer extends ContainerBlock implements IVariantProvider, IBMBlock { - public BlockTeleposer() { - super(Material.ROCK); - - setCreativeTab(BloodMagic.TAB_BM); - setTranslationKey(BloodMagic.MODID + ".teleposer"); - setHardness(2.0F); - setResistance(5.0F); - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack playerItem = player.getHeldItem(hand); - - if (playerItem.getItem() instanceof ItemTelepositionFocus) - ((ItemTelepositionFocus) playerItem.getItem()).setBlockPos(playerItem, world, pos); - else if (world.getTileEntity(pos) instanceof TileTeleposer) - player.openGui(BloodMagic.instance, Constants.Gui.TELEPOSER_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - - return true; - } - - @Override - public void breakBlock(World world, BlockPos blockPos, BlockState blockState) { - TileTeleposer tileTeleposer = (TileTeleposer) world.getTileEntity(blockPos); - if (tileTeleposer != null) { - tileTeleposer.dropItems(); - SubCommandTeleposer.teleposerSet.remove(tileTeleposer); - } - - super.breakBlock(world, blockPos, blockState); - } - - @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { - return new TileTeleposer(); - } - - @Override - public BlockItem getItem() { - return new BlockItem(this); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java deleted file mode 100644 index 7c4b1e51..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java +++ /dev/null @@ -1,8 +0,0 @@ -package WayofTime.bloodmagic.block; - -import net.minecraft.item.BlockItem; - -public interface IBMBlock { - - BlockItem getItem(); -} diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java deleted file mode 100644 index 79a1fb0b..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java +++ /dev/null @@ -1,98 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import WayofTime.bloodmagic.block.IBMBlock; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.NonNullList; - -import javax.annotation.Nonnull; - -public class BlockEnum & IStringSerializable> extends Block implements IBMBlock, IVariantProvider { - private final E[] types; - private final PropertyEnum property; - private final BlockStateContainer realStateContainer; - - public BlockEnum(Material material, Class enumClass, String propName) { - super(material); - - this.types = enumClass.getEnumConstants(); - this.property = PropertyEnum.create(propName, enumClass); - this.realStateContainer = createStateContainer(); - setDefaultState(getBlockState().getBaseState()); - } - - public BlockEnum(Material material, Class enumClass) { - this(material, enumClass, "type"); - } - - @Override - protected final BlockStateContainer createBlockState() { - return new BlockStateContainer.Builder(this).build(); // Blank to avoid crashes - } - - @Override - public final BlockStateContainer getBlockState() { - return realStateContainer; - } - - @Override - public BlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(property, types[meta]); - } - - @Override - public int getMetaFromState(BlockState state) { - return state.getValue(property).ordinal(); - } - - @Override - public int damageDropped(BlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) { - for (E type : types) - subBlocks.add(new ItemStack(this, 1, type.ordinal())); - } - - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(property).build(); - } - - @Override - public BlockItem getItem() { - return new ItemBlockEnum<>(this); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - if (getItem() == null) - return; - - for (int i = 0; i < types.length; i++) - variants.put(i, getProperty().getName() + "=" + types[i].name()); - } - - public E[] getTypes() { - return types; - } - - public PropertyEnum getProperty() { - return property; - } - - public BlockStateContainer getRealStateContainer() { - return realStateContainer; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java deleted file mode 100644 index b85224e7..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillar.java +++ /dev/null @@ -1,124 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import net.minecraft.block.BlockState; -import net.minecraft.block.RotatedPillarBlock; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import org.apache.commons.lang3.ArrayUtils; - -public class BlockEnumPillar & IStringSerializable> extends BlockEnum { - public BlockEnumPillar(Material material, Class enumClass, String propName) { - super(material, enumClass, propName); - } - - public BlockEnumPillar(Material material, Class enumClass) { - this(material, enumClass, "type"); - } - - @Override - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), RotatedPillarBlock.AXIS).build(); - } - - @Override - public BlockState getStateFromMeta(int meta) { - BlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 5]); - - switch (meta / 5) { - case 0: - state = state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Y); - break; - case 1: - state = state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.X); - break; - case 2: - state = state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Z); - break; - default: - state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Y); - break; - } - - return state; - } - - @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { - return new ItemStack(this, 1, damageDropped(state)); - } - - @SuppressWarnings("incomplete-switch") - @Override - public int getMetaFromState(BlockState state) { - int i = ArrayUtils.indexOf(getTypes(), state.getValue(getProperty())); - - switch (state.getValue(RotatedPillarBlock.AXIS)) { - case X: - i = i + 5; - break; - case Z: - i = i + 10; - break; - } - - return i; - } - - @Override - public boolean rotateBlock(World world, BlockPos pos, Direction axis) { - BlockState state = world.getBlockState(pos); - for (IProperty prop : state.getProperties().keySet()) { - if (prop == RotatedPillarBlock.AXIS) { - world.setBlockState(pos, state.cycleProperty(prop)); - return true; - } - } - return false; - } - - @Override - public BlockState withRotation(BlockState state, Rotation rot) { - switch (rot) { - case COUNTERCLOCKWISE_90: - case CLOCKWISE_90: - switch (state.getValue(RotatedPillarBlock.AXIS)) { - case X: - return state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.Z); - case Z: - return state.withProperty(RotatedPillarBlock.AXIS, Direction.Axis.X); - default: - return state; - } - - default: - return state; - } - } - - @Override - protected ItemStack getSilkTouchDrop(BlockState state) { - return new ItemStack(this, 1, damageDropped(state)); - } - - - @Override - public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer, Hand hand) { - return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand).withProperty(RotatedPillarBlock.AXIS, facing.getAxis()); - } - - @Override - public int damageDropped(BlockState state) { - return super.getMetaFromState(state); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java deleted file mode 100644 index 3d4a02b3..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import org.apache.commons.lang3.ArrayUtils; - -public class BlockEnumPillarCap & IStringSerializable> extends BlockEnum { - public static final PropertyDirection FACING = PropertyDirection.create("facing"); - - public BlockEnumPillarCap(Material material, Class enumClass, String propName) { - super(material, enumClass, propName); - } - - public BlockEnumPillarCap(Material material, Class enumClass) { - this(material, enumClass, "type"); - } - - @Override - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), FACING).build(); - } - - @Override - public BlockState getStateFromMeta(int meta) { - BlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 2]); - return state.withProperty(FACING, Direction.byIndex(meta / 2)); - } - - @Override - public int getMetaFromState(BlockState state) { - int i = ArrayUtils.indexOf(getTypes(), state.getValue(getProperty())); - return i + 2 * state.getValue(FACING).getIndex(); - } - - @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { - return new ItemStack(this, 1, damageDropped(state)); - } - - @Override - public BlockState withRotation(BlockState state, Rotation rot) { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - - @Override - public BlockState withMirror(BlockState state, Mirror mirrorIn) { - return state.withRotation(mirrorIn.toRotation(state.getValue(FACING))); - } - - @Override - protected ItemStack getSilkTouchDrop(BlockState state) { - return new ItemStack(this, 1, damageDropped(state)); - } - - @Override - public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer, Hand hand) { - return super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand).withProperty(FACING, facing); - } - - @Override - public int damageDropped(BlockState state) { - return super.getMetaFromState(state); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java deleted file mode 100644 index b21d89ab..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java +++ /dev/null @@ -1,343 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.block.StairsBlock.EnumHalf; -import net.minecraft.block.StairsBlock.EnumShape; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeModContainer; -import org.apache.commons.lang3.ArrayUtils; - -import javax.annotation.Nullable; -import java.util.List; - -public class BlockEnumStairs & IStringSerializable> extends BlockEnum { - public static final PropertyDirection FACING = HorizontalBlock.FACING; - - protected static final AxisAlignedBB AABB_SLAB_TOP = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_QTR_TOP_WEST = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 0.5D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_QTR_TOP_EAST = new AxisAlignedBB(0.5D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_QTR_TOP_NORTH = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 0.5D); - protected static final AxisAlignedBB AABB_QTR_TOP_SOUTH = new AxisAlignedBB(0.0D, 0.5D, 0.5D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_OCT_TOP_NW = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 0.5D, 1.0D, 0.5D); - protected static final AxisAlignedBB AABB_OCT_TOP_NE = new AxisAlignedBB(0.5D, 0.5D, 0.0D, 1.0D, 1.0D, 0.5D); - protected static final AxisAlignedBB AABB_OCT_TOP_SW = new AxisAlignedBB(0.0D, 0.5D, 0.5D, 0.5D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_OCT_TOP_SE = new AxisAlignedBB(0.5D, 0.5D, 0.5D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB AABB_SLAB_BOTTOM = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D); - protected static final AxisAlignedBB AABB_QTR_BOT_WEST = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.5D, 0.5D, 1.0D); - protected static final AxisAlignedBB AABB_QTR_BOT_EAST = new AxisAlignedBB(0.5D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D); - protected static final AxisAlignedBB AABB_QTR_BOT_NORTH = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 0.5D); - protected static final AxisAlignedBB AABB_QTR_BOT_SOUTH = new AxisAlignedBB(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); - protected static final AxisAlignedBB AABB_OCT_BOT_NW = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.5D, 0.5D, 0.5D); - protected static final AxisAlignedBB AABB_OCT_BOT_NE = new AxisAlignedBB(0.5D, 0.0D, 0.0D, 1.0D, 0.5D, 0.5D); - protected static final AxisAlignedBB AABB_OCT_BOT_SW = new AxisAlignedBB(0.0D, 0.0D, 0.5D, 0.5D, 0.5D, 1.0D); - protected static final AxisAlignedBB AABB_OCT_BOT_SE = new AxisAlignedBB(0.5D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); - - public BlockEnumStairs(Material material, Class enumClass, String propName) { - super(material, enumClass, propName); - } - - public BlockEnumStairs(Material material, Class enumClass) { - this(material, enumClass, "type"); - } - - @Override - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), FACING, StairsBlock.HALF, StairsBlock.SHAPE).build(); - } - - @Override - public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean bool) { - state = this.getActualState(state, worldIn, pos); - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(state)) { - addCollisionBoxToList(pos, entityBox, collidingBoxes, axisalignedbb); - } - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - @Override - public boolean isFullCube(BlockState state) { - return false; - } - - @Override - public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, LivingEntity placer, Hand hand) { - BlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, placer, hand); - state = state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.STRAIGHT); - return facing != Direction.DOWN && (facing == Direction.UP || (double) hitY <= 0.5D) ? state.withProperty(StairsBlock.HALF, StairsBlock.EnumHalf.BOTTOM) : state.withProperty(StairsBlock.HALF, StairsBlock.EnumHalf.TOP); - } - - @Override - public RayTraceResult collisionRayTrace(BlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { - List list = Lists.newArrayList(); - - for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { - list.add(this.rayTrace(pos, start, end, axisalignedbb)); - } - - RayTraceResult rayTrace = null; - double d1 = 0.0D; - - for (RayTraceResult raytraceresult : list) { - if (raytraceresult != null) { - double d0 = raytraceresult.hitVec.squareDistanceTo(end); - - if (d0 > d1) { - rayTrace = raytraceresult; - d1 = d0; - } - } - } - - return rayTrace; - } - - // Meta looks like: {1|11|1} = {HALF|FACING|TYPE} - @Override - public BlockState getStateFromMeta(int meta) { - BlockState state = getBlockState().getBaseState().withProperty(StairsBlock.HALF, (meta & 8) > 0 ? StairsBlock.EnumHalf.TOP : StairsBlock.EnumHalf.BOTTOM); - state = state.withProperty(FACING, Direction.byIndex(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]); - return state; - } - - // Meta looks like: {1|11|1} = {HALF|FACING|TYPE} - @Override - public int getMetaFromState(BlockState state) { - int i = 0; - - if (state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP) { - i |= 4; - } - - i = i | 5 - state.getValue(FACING).getIndex(); - return i * 2 + ArrayUtils.indexOf(getTypes(), state.getValue(getProperty())); - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) { - return state.withProperty(StairsBlock.SHAPE, getStairsShape(state, worldIn, pos)); - } - - @Override - public BlockState withRotation(BlockState state, Rotation rot) { - return state.withProperty(FACING, rot.rotate(state.getValue(FACING))); - } - - @SuppressWarnings("incomplete-switch") - @Override - public BlockState withMirror(BlockState state, Mirror mirrorIn) { - Direction facing = state.getValue(FACING); - StairsBlock.EnumShape stairShape = state.getValue(StairsBlock.SHAPE); - - switch (mirrorIn) { - case LEFT_RIGHT: - - if (facing.getAxis() == Direction.Axis.Z) { - switch (stairShape) { - case OUTER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_RIGHT); - case OUTER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_LEFT); - case INNER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_LEFT); - case INNER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_RIGHT); - default: - return state.withRotation(Rotation.CLOCKWISE_180); - } - } - - break; - case FRONT_BACK: - - if (facing.getAxis() == Direction.Axis.X) { - switch (stairShape) { - case OUTER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_RIGHT); - case OUTER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.OUTER_LEFT); - case INNER_RIGHT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_RIGHT); - case INNER_LEFT: - return state.withRotation(Rotation.CLOCKWISE_180).withProperty(StairsBlock.SHAPE, StairsBlock.EnumShape.INNER_LEFT); - case STRAIGHT: - return state.withRotation(Rotation.CLOCKWISE_180); - } - } - } - - return super.withMirror(state, mirrorIn); - } - - @Override - protected ItemStack getSilkTouchDrop(BlockState state) { - return new ItemStack(this, 1, damageDropped(state)); - } - - @Override - public int damageDropped(BlockState state) { - return super.getMetaFromState(state); - } - - @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player) { - return new ItemStack(this, 1, damageDropped(state)); - } - - @Override - public boolean doesSideBlockRendering(BlockState state, IBlockAccess world, BlockPos pos, Direction face) { - if (ForgeModContainer.disableStairSlabCulling) - return super.doesSideBlockRendering(state, world, pos, face); - - if (state.isOpaqueCube()) - return true; - - state = this.getActualState(state, world, pos); - - EnumHalf half = state.getValue(StairsBlock.HALF); - Direction side = state.getValue(FACING); - EnumShape shape = state.getValue(StairsBlock.SHAPE); - if (face == Direction.UP) - return half == EnumHalf.TOP; - if (face == Direction.DOWN) - return half == EnumHalf.BOTTOM; - if (shape == EnumShape.OUTER_LEFT || shape == EnumShape.OUTER_RIGHT) - return false; - if (face == side) - return true; - if (shape == EnumShape.INNER_LEFT && face.rotateY() == side) - return true; - if (shape == EnumShape.INNER_RIGHT && face.rotateYCCW() == side) - return true; - return false; - } - - private static List getCollisionBoxList(BlockState state) { - List list = Lists.newArrayList(); - boolean flag = state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP; - list.add(flag ? AABB_SLAB_TOP : AABB_SLAB_BOTTOM); - StairsBlock.EnumShape stairShape = state.getValue(StairsBlock.SHAPE); - - if (stairShape == StairsBlock.EnumShape.STRAIGHT || stairShape == StairsBlock.EnumShape.INNER_LEFT || stairShape == StairsBlock.EnumShape.INNER_RIGHT) { - list.add(getCollQuarterBlock(state)); - } - - if (stairShape != StairsBlock.EnumShape.STRAIGHT) { - list.add(getCollEighthBlock(state)); - } - - return list; - } - - private static AxisAlignedBB getCollQuarterBlock(BlockState state) { - boolean flag = state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP; - - switch (state.getValue(FACING)) { - case NORTH: - default: - return flag ? AABB_QTR_BOT_NORTH : AABB_QTR_TOP_NORTH; - case SOUTH: - return flag ? AABB_QTR_BOT_SOUTH : AABB_QTR_TOP_SOUTH; - case WEST: - return flag ? AABB_QTR_BOT_WEST : AABB_QTR_TOP_WEST; - case EAST: - return flag ? AABB_QTR_BOT_EAST : AABB_QTR_TOP_EAST; - } - } - - private static AxisAlignedBB getCollEighthBlock(BlockState state) { - Direction facing = state.getValue(FACING); - Direction newFacing; - - switch (state.getValue(StairsBlock.SHAPE)) { - case OUTER_LEFT: - default: - newFacing = facing; - break; - case OUTER_RIGHT: - newFacing = facing.rotateY(); - break; - case INNER_RIGHT: - newFacing = facing.getOpposite(); - break; - case INNER_LEFT: - newFacing = facing.rotateYCCW(); - } - - boolean isTop = state.getValue(StairsBlock.HALF) == StairsBlock.EnumHalf.TOP; - - switch (newFacing) { - case NORTH: - default: - return isTop ? AABB_OCT_BOT_NW : AABB_OCT_TOP_NW; - case SOUTH: - return isTop ? AABB_OCT_BOT_SE : AABB_OCT_TOP_SE; - case WEST: - return isTop ? AABB_OCT_BOT_SW : AABB_OCT_TOP_SW; - case EAST: - return isTop ? AABB_OCT_BOT_NE : AABB_OCT_TOP_NE; - } - } - - private static StairsBlock.EnumShape getStairsShape(BlockState state, IBlockAccess world, BlockPos pos) { - Direction facing = state.getValue(FACING); - BlockState offsetState = world.getBlockState(pos.offset(facing)); - - if (isBlockStairs(offsetState) && state.getValue(StairsBlock.HALF) == offsetState.getValue(StairsBlock.HALF)) { - Direction offsetFacing = offsetState.getValue(FACING); - - if (offsetFacing.getAxis() != state.getValue(FACING).getAxis() && isDifferentStairs(state, world, pos, offsetFacing.getOpposite())) { - if (offsetFacing == facing.rotateYCCW()) { - return StairsBlock.EnumShape.OUTER_LEFT; - } - - return StairsBlock.EnumShape.OUTER_RIGHT; - } - } - - BlockState oppositeOffsetState = world.getBlockState(pos.offset(facing.getOpposite())); - - if (isBlockStairs(oppositeOffsetState) && state.getValue(StairsBlock.HALF) == oppositeOffsetState.getValue(StairsBlock.HALF)) { - Direction oppositeOffsetFacing = oppositeOffsetState.getValue(FACING); - - if (oppositeOffsetFacing.getAxis() != (state.getValue(FACING)).getAxis() && isDifferentStairs(state, world, pos, oppositeOffsetFacing)) { - if (oppositeOffsetFacing == facing.rotateYCCW()) { - return StairsBlock.EnumShape.INNER_LEFT; - } - - return StairsBlock.EnumShape.INNER_RIGHT; - } - } - - return StairsBlock.EnumShape.STRAIGHT; - } - - private static boolean isDifferentStairs(BlockState state, IBlockAccess world, BlockPos pos, Direction facing) { - BlockState offsetState = world.getBlockState(pos.offset(facing)); - return !isBlockStairs(offsetState) || offsetState.getValue(FACING) != state.getValue(FACING) || offsetState.getValue(StairsBlock.HALF) != state.getValue(StairsBlock.HALF); - } - - public static boolean isBlockStairs(BlockState state) { - return state.getBlock() instanceof StairsBlock || state.getBlock() instanceof BlockEnumStairs; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java deleted file mode 100644 index 60b2523c..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumWall.java +++ /dev/null @@ -1,122 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class BlockEnumWall & IStringSerializable> extends BlockEnum { - public static final PropertyBool UP = PropertyBool.create("up"); - public static final PropertyBool NORTH = PropertyBool.create("north"); - public static final PropertyBool EAST = PropertyBool.create("east"); - public static final PropertyBool SOUTH = PropertyBool.create("south"); - public static final PropertyBool WEST = PropertyBool.create("west"); - protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[]{new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), - new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)}; - protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[]{AABB_BY_INDEX[0].setMaxY(1.5D), AABB_BY_INDEX[1].setMaxY(1.5D), AABB_BY_INDEX[2].setMaxY(1.5D), AABB_BY_INDEX[3].setMaxY(1.5D), AABB_BY_INDEX[4].setMaxY(1.5D), AABB_BY_INDEX[5].setMaxY(1.5D), AABB_BY_INDEX[6].setMaxY(1.5D), AABB_BY_INDEX[7].setMaxY(1.5D), AABB_BY_INDEX[8].setMaxY(1.5D), AABB_BY_INDEX[9].setMaxY(1.5D), AABB_BY_INDEX[10].setMaxY(1.5D), AABB_BY_INDEX[11].setMaxY(1.5D), AABB_BY_INDEX[12].setMaxY(1.5D), AABB_BY_INDEX[13].setMaxY(1.5D), AABB_BY_INDEX[14].setMaxY(1.5D), - AABB_BY_INDEX[15].setMaxY(1.5D)}; - - // Most of this is copied from BlockWall - if there is an issue when porting, look there first. - public BlockEnumWall(Material material, Class enumClass, String propName) { - super(material, enumClass, propName); - } - - public BlockEnumWall(Material material, Class enumClass) { - this(material, enumClass, "type"); - } - - @Override - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(getProperty(), UP, NORTH, EAST, SOUTH, WEST).build(); - } - - @Override - public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { - state = state.getActualState(source, pos); - return AABB_BY_INDEX[getAABBIndex(state)]; - } - - @Override - public AxisAlignedBB getCollisionBoundingBox(BlockState blockState, IBlockAccess worldIn, BlockPos pos) { - blockState = blockState.getActualState(worldIn, pos); - return CLIP_AABB_BY_INDEX[getAABBIndex(blockState)]; - } - - public boolean isFullCube(BlockState state) { - return false; - } - - public boolean isPassable(IBlockAccess worldIn, BlockPos pos) { - return false; - } - - @Override - public boolean isOpaqueCube(BlockState state) { - return false; - } - - private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - BlockState worldState = worldIn.getBlockState(pos); - Block block = worldState.getBlock(); - return block != Blocks.BARRIER && (!(block != this && !(block instanceof FenceGateBlock)) || ((worldState.getMaterial().isOpaque() && worldState.isFullCube()) && worldState.getMaterial() != Material.GOURD)); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { - return side != Direction.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side); - } - - @Override - public BlockState getActualState(BlockState state, IBlockAccess worldIn, BlockPos pos) { - boolean canNorth = this.canConnectTo(worldIn, pos.north()); - boolean canEast = this.canConnectTo(worldIn, pos.east()); - boolean canSouth = this.canConnectTo(worldIn, pos.south()); - boolean canWest = this.canConnectTo(worldIn, pos.west()); - boolean flag4 = canNorth && !canEast && canSouth && !canWest || !canNorth && canEast && !canSouth && canWest; - return state.withProperty(UP, !flag4 || !worldIn.isAirBlock(pos.up())).withProperty(NORTH, canNorth).withProperty(EAST, canEast).withProperty(SOUTH, canSouth).withProperty(WEST, canWest); - } - - @Override - protected ItemStack getSilkTouchDrop(BlockState state) { - return new ItemStack(this, 1, damageDropped(state)); - } - - @Override - public int damageDropped(BlockState state) { - return super.getMetaFromState(state); - } - - private static int getAABBIndex(BlockState state) { - int i = 0; - - if (state.getValue(NORTH)) { - i |= 1 << Direction.NORTH.getHorizontalIndex(); - } - - if (state.getValue(EAST)) { - i |= 1 << Direction.EAST.getHorizontalIndex(); - } - - if (state.getValue(SOUTH)) { - i |= 1 << Direction.SOUTH.getHorizontalIndex(); - } - - if (state.getValue(WEST)) { - i |= 1 << Direction.WEST.getHorizontalIndex(); - } - - return i; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java deleted file mode 100644 index 0427e11a..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java +++ /dev/null @@ -1,81 +0,0 @@ -package WayofTime.bloodmagic.block.base; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyInteger; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -/** - * Creates a block that has multiple meta-based states. - *

    - * These states will be numbered 0 through {@code maxMeta}. - */ -public class BlockInteger extends Block { - private final int maxMeta; - private final PropertyInteger property; - private final BlockStateContainer realStateContainer; - - public BlockInteger(Material material, int maxMeta, String propName) { - super(material); - - this.maxMeta = maxMeta; - this.property = PropertyInteger.create(propName, 0, maxMeta); - this.realStateContainer = createStateContainer(); - setDefaultState(getBlockState().getBaseState()); - } - - public BlockInteger(Material material, int maxMeta) { - this(material, maxMeta, "meta"); - } - - @Override - protected final BlockStateContainer createBlockState() { - return new BlockStateContainer.Builder(this).build(); // Blank to avoid crashes - } - - @Override - public final BlockStateContainer getBlockState() { - return realStateContainer; - } - - @Override - public BlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(property, meta); - } - - @Override - public int getMetaFromState(BlockState state) { - return state.getValue(property); - } - - @Override - public int damageDropped(BlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(ItemGroup tab, NonNullList subBlocks) { - for (int i = 0; i < maxMeta; i++) - subBlocks.add(new ItemStack(this, 1, i)); - } - - protected BlockStateContainer createStateContainer() { - return new BlockStateContainer.Builder(this).add(property).build(); - } - - public int getMaxMeta() { - return maxMeta; - } - - public PropertyInteger getProperty() { - return property; - } - - public BlockStateContainer getRealStateContainer() { - return realStateContainer; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java b/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java index 702fe5d9..2c7f6d8d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/BloodRuneType.java @@ -1,29 +1,28 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; +package wayoftime.bloodmagic.block.enums; import java.util.Locale; -public enum BloodRuneType implements IStringSerializable { - BLANK, - SPEED, - EFFICIENCY, - SACRIFICE, - SELF_SACRIFICE, - DISPLACEMENT, - CAPACITY, - AUGMENTED_CAPACITY, - ORB, - ACCELERATION, - CHARGING; +import net.minecraft.util.IStringSerializable; - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } +public enum BloodRuneType implements IStringSerializable +{ + BLANK, SPEED, EFFICIENCY, SACRIFICE, SELF_SACRIFICE, DISPLACEMENT, CAPACITY, AUGMENTED_CAPACITY, ORB, ACCELERATION, + CHARGING; - @Override - public String getName() { - return this.toString(); - } -} + @Override + public String toString() + { + return name().toLowerCase(Locale.ENGLISH); + } + + /** + * getName() + * + * @return + */ + @Override + public String getString() + { + return this.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java deleted file mode 100644 index 7bceae13..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumDecorative implements IStringSerializable { - BLOODSTONE_TILE, - BLOODSTONE_BRICK, - CRYSTAL_TILE, - CRYSTAL_BRICK; - - @Override - public String toString() { - return name().toLowerCase(Locale.ROOT); - } - - @Override - public String getName() { - return toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java deleted file mode 100644 index 84b42602..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock1.java +++ /dev/null @@ -1,23 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumDemonBlock1 implements IStringSerializable { - BRICK1_RAW, - BRICK1_CORROSIVE, - BRICK1_DESTRUCTIVE, - BRICK1_VENGEFUL, - BRICK1_STEADFAST; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java deleted file mode 100644 index b9a35aab..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock2.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumDemonBlock2 implements IStringSerializable { - SMALLBRICK_RAW, - SMALLBRICK_CORROSIVE, - SMALLBRICK_DESTRUCTIVE, - SMALLBRICK_VENGEFUL, - SMALLBRICK_STEADFAST, - TILE_RAW, - TILE_CORROSIVE, - TILE_DESTRUCTIVE, - TILE_VENGEFUL, - TILE_STEADFAST, - TILESPECIAL_RAW, - TILESPECIAL_CORROSIVE, - TILESPECIAL_DESTRUCTIVE, - TILESPECIAL_VENGEFUL, - TILESPECIAL_STEADFAST; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java deleted file mode 100644 index c7a54ac6..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDemonBlock3.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumDemonBlock3 implements IStringSerializable { - STONE_RAW, - STONE_CORROSIVE, - STONE_DESTRUCTIVE, - STONE_VENGEFUL, - STONE_STEADFAST, - POLISHED_RAW, - POLISHED_CORROSIVE, - POLISHED_DESTRUCTIVE, - POLISHED_VENGEFUL, - POLISHED_STEADFAST, - METAL_RAW, - METAL_CORROSIVE, - METAL_DESTRUCTIVE, - METAL_VENGEFUL, - METAL_STEADFAST; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java deleted file mode 100644 index b760a46b..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumInversionCap.java +++ /dev/null @@ -1,28 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumInversionCap implements IStringSerializable { - RAW_BOTTOM, - RAW_TOP, - CORROSIVE_BOTTOM, - CORROSIVE_TOP, - DESTRUCTIVE_BOTTOM, - DESTRUCTIVE_TOP, - VENGEFUL_BOTTOM, - VENGEFUL_TOP, - STEADFAST_BOTTOM, - STEADFAST_TOP; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java deleted file mode 100644 index 18e2053e..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumMimic.java +++ /dev/null @@ -1,23 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumMimic implements IStringSerializable { - NOHITBOX, - SOLIDOPAQUE, - SOLIDCLEAR, - SOLIDLIGHT, - SENTIENT; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java deleted file mode 100644 index 79c768bb..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumPath.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumPath implements IStringSerializable { - WOOD, - WOODTILE, - STONE, - STONETILE, - WORNSTONE, - WORNSTONETILE, - OBSIDIAN, - OBSIDIANTILE; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java deleted file mode 100644 index bfc67190..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumRitualController implements IStringSerializable { - MASTER, - IMPERFECT, - INVERTED, - ; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java deleted file mode 100644 index 01c05b88..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumSubWillType implements IStringSerializable { - RAW, - CORROSIVE, - DESTRUCTIVE, - VENGEFUL, - STEADFAST; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } - - public EnumDemonWillType getType() { - String name = name(); - - if (this == RAW) - name = EnumDemonWillType.DEFAULT.name(); - - return EnumDemonWillType.valueOf(name); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java deleted file mode 100644 index 4f51f8e8..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType1.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumSubWillType1 implements IStringSerializable { - RAW, - CORROSIVE; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java deleted file mode 100644 index 5f1a6aca..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType2.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumSubWillType2 implements IStringSerializable { - DESTRUCTIVE, - VENGEFUL; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java deleted file mode 100644 index 963704e8..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType3.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumSubWillType3 implements IStringSerializable { - STEADFAST; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java deleted file mode 100644 index 172c6d2b..00000000 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumWillWall.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.block.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumWillWall implements IStringSerializable { - BRICK_RAW, - BRICK_CORROSIVE, - BRICK_DESTRUCTIVE, - BRICK_VENGEFUL, - BRICK_STEADFAST, - SMALLBRICK_RAW, - SMALLBRICK_CORROSIVE, - SMALLBRICK_DESTRUCTIVE, - SMALLBRICK_VENGEFUL, - SMALLBRICK_STEADFAST, - LARGE_RAW, - LARGE_CORROSIVE, - LARGE_DESTRUCTIVE, - LARGE_VENGEFUL, - LARGE_STEADFAST; - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java deleted file mode 100644 index fb8ec3c2..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java +++ /dev/null @@ -1,40 +0,0 @@ -package WayofTime.bloodmagic.client; - -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.function.Consumer; - -/** - * Provides a custom {@link ItemMeshDefinition} for automatic registration of - * renders. - */ -public interface IMeshProvider { - /** - * Gets the custom ItemMeshDefinition to use for the item. - * - * @return - the custom ItemMeshDefinition to use for the item. - */ - @SideOnly(Side.CLIENT) - ItemMeshDefinition getMeshDefinition(); - - /** - * Gathers all possible variants for this item - */ - void gatherVariants(Consumer variants); - - /** - * If a custom ResourceLocation is required, return it here. - *

    - * Can be null if unneeded. - * - * @return - The custom ResourceLocation - */ - @Nullable - default ResourceLocation getCustomLocation() { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java b/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java deleted file mode 100644 index cffbd900..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/IVariantProvider.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client; - -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.Block; - -import javax.annotation.Nonnull; - -public interface IVariantProvider { - - default void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, this instanceof Block ? "normal" : "inventory"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/Sprite.java b/src/main/java/WayofTime/bloodmagic/client/Sprite.java deleted file mode 100644 index f6e54ea6..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/Sprite.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.client; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.ResourceLocation; - -public class Sprite { - - private final ResourceLocation textureLocation; - private final int textureX; - private final int textureY; - private final int textureWidth; - private final int textureHeight; - - public Sprite(ResourceLocation textureLocation, int textureX, int textureY, int textureWidth, int textureHeight) { - this.textureLocation = textureLocation; - this.textureX = textureX; - this.textureY = textureY; - this.textureWidth = textureWidth; - this.textureHeight = textureHeight; - } - - public ResourceLocation getTextureLocation() { - return textureLocation; - } - - public int getTextureX() { - return textureX; - } - - public int getTextureY() { - return textureY; - } - - public int getTextureWidth() { - return textureWidth; - } - - public int getTextureHeight() { - return textureHeight; - } - - public void draw(int x, int y) { - Minecraft.getInstance().renderEngine.bindTexture(textureLocation); - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder buffer = tessellator.getBuffer(); - buffer.begin(7, DefaultVertexFormats.POSITION_TEX); - buffer.pos((double) x, (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex(); - buffer.pos((double) (x + getTextureWidth()), (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex(); - buffer.pos((double) (x + getTextureWidth()), (double) (y), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY()) * f1)).endVertex(); - buffer.pos((double) x, (double) (y), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY()) * f1)).endVertex(); - tessellator.draw(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java deleted file mode 100644 index 3a203214..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.tile.TileAlchemyTable; -import WayofTime.bloodmagic.tile.container.ContainerAlchemyTable; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiAlchemyTable extends ContainerScreen { - public IInventory tileTable; - - public GuiAlchemyTable(PlayerInventory playerInventory, IInventory tileTable) { - super(new ContainerAlchemyTable(playerInventory, tileTable)); - this.tileTable = tileTable; - this.xSize = 176; - this.ySize = 205; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.alchemyTable.name"), 8, 5, 4210752); - this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/alchemyTable.png"); - this.mc.getTextureManager().bindTexture(soulForgeGuiTextures); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize); - - int l = this.getCookProgressScaled(90); - this.drawTexturedModalRect(i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); - - for (int slotId = 0; slotId < 6; slotId++) { - if (!((TileAlchemyTable) tileTable).isInputSlotAccessible(slotId)) { - Slot slot = this.inventorySlots.getSlot(slotId); - - this.drawTexturedModalRect(i + slot.xPos, j + slot.yPos, 195, 1, 16, 16); - } - } - } - - public int getCookProgressScaled(int scale) { - double progress = ((TileAlchemyTable) tileTable).getProgressForGui(); - return (int) (progress * scale); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java deleted file mode 100644 index a14c5710..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.client.hud.ConfigEntryEditHUD; -import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.fml.client.IModGuiFactory; -import net.minecraftforge.fml.client.config.DummyConfigElement; -import net.minecraftforge.fml.client.config.GuiConfig; -import net.minecraftforge.fml.client.config.IConfigElement; - -import java.util.Collections; -import java.util.List; -import java.util.Set; - -public class GuiBloodMagicConfig extends GuiConfig { - - public GuiBloodMagicConfig(Screen parentScreen) { - super(parentScreen, getElements(), BloodMagic.MODID, false, false, BloodMagic.NAME); - } - - public static List getElements() { - List elements = Lists.newArrayList(); - - elements.addAll(ConfigElement.from(ConfigHandler.class).getChildElements()); - elements.add(new ConfigElement(BloodMagic.RITUAL_MANAGER.getConfig().getCategory("rituals"))); - if (Minecraft.getInstance().world != null) - elements.add(new DummyElementEditHUD(BloodMagic.NAME, "config." + BloodMagic.MODID + ".edit_hud")); - - return elements; - } - - public static class DummyElementEditHUD extends DummyConfigElement.DummyCategoryElement { - - public DummyElementEditHUD(String name, String langKey) { - super(name, langKey, Collections.emptyList(), ConfigEntryEditHUD.class); - } - } - - public static class Factory implements IModGuiFactory { - @Override - public void initialize(Minecraft minecraftInstance) { - - } - - @Override - public boolean hasConfigGui() { - return true; - } - - @Override - public Screen createConfigGui(Screen parentScreen) { - return new GuiBloodMagicConfig(parentScreen); - } - - @Override - public Set runtimeGuiCategories() { - return null; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java deleted file mode 100644 index a942839d..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.item.inventory.ContainerHolding; -import WayofTime.bloodmagic.item.inventory.InventoryHolding; -import WayofTime.bloodmagic.tile.TileAlchemyTable; -import WayofTime.bloodmagic.tile.TileSoulForge; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.tile.container.*; -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.network.IGuiHandler; - -public class GuiHandler implements IGuiHandler { - @Override - public Object getServerGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) { - BlockPos pos = new BlockPos(x, y, z); - - switch (id) { - case Constants.Gui.TELEPOSER_GUI: - return new ContainerTeleposer(player.inventory, (TileTeleposer) world.getTileEntity(pos)); - case Constants.Gui.SOUL_FORGE_GUI: - return new ContainerSoulForge(player.inventory, (TileSoulForge) world.getTileEntity(pos)); - case Constants.Gui.ROUTING_NODE_GUI: - return new ContainerItemRoutingNode(player.inventory, (TileFilteredRoutingNode) world.getTileEntity(pos)); - case Constants.Gui.MASTER_ROUTING_NODE_GUI: - return new ContainerMasterRoutingNode(player.inventory, (TileMasterRoutingNode) world.getTileEntity(pos)); - case Constants.Gui.ALCHEMY_TABLE_GUI: - return new ContainerAlchemyTable(player.inventory, (TileAlchemyTable) world.getTileEntity(pos)); - case Constants.Gui.SIGIL_HOLDING_GUI: - return new ContainerHolding(player, new InventoryHolding(player.getHeldItemMainhand())); - } - - return null; - } - - @Override - public Object getClientGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) { - if (world instanceof ClientWorld) { - BlockPos pos = new BlockPos(x, y, z); - - switch (id) { - case Constants.Gui.TELEPOSER_GUI: - return new GuiTeleposer(player.inventory, (TileTeleposer) world.getTileEntity(pos)); - case Constants.Gui.SOUL_FORGE_GUI: - return new GuiSoulForge(player.inventory, (TileSoulForge) world.getTileEntity(pos)); - case Constants.Gui.ROUTING_NODE_GUI: - return new GuiItemRoutingNode(player.inventory, (TileFilteredRoutingNode) world.getTileEntity(pos)); - case Constants.Gui.MASTER_ROUTING_NODE_GUI: - return new GuiMasterRoutingNode(player.inventory, (TileMasterRoutingNode) world.getTileEntity(pos)); - case Constants.Gui.ALCHEMY_TABLE_GUI: - return new GuiAlchemyTable(player.inventory, (TileAlchemyTable) world.getTileEntity(pos)); - case Constants.Gui.SIGIL_HOLDING_GUI: - return new GuiHolding(player, new InventoryHolding(player.getHeldItemMainhand())); - } - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java deleted file mode 100644 index d20cb33e..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java +++ /dev/null @@ -1,57 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.inventory.ContainerHolding; -import WayofTime.bloodmagic.item.inventory.InventoryHolding; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiHolding extends ContainerScreen { - private ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "gui/SigilHolding.png"); - private PlayerEntity player; - - public GuiHolding(PlayerEntity player, InventoryHolding inventoryHolding) { - super(new ContainerHolding(player, inventoryHolding)); - xSize = 176; - ySize = 121; - this.player = player; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - //the parameters for drawString are: string, x, y, color - fontRenderer.drawString(TextHelper.localize("item.bloodmagic.sigil.holding.name"), 53, 4, 4210752); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouse) { - //draw your Gui here, only thing you need to change is the path - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(texture); - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - ItemStack held = player.getHeldItem(Hand.MAIN_HAND); - if (!held.isEmpty() && held.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.drawTexturedModalRect(4 + x + 36 * ItemSigilHolding.getCurrentItemOrdinal(player.getHeldItemMainhand()), y + 13, 0, 123, 24, 24); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java deleted file mode 100644 index edf65f6a..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ /dev/null @@ -1,200 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.ItemRouterAmountPacketProcessor; -import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor; -import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; -import WayofTime.bloodmagic.util.GhostItemHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.io.IOException; - -@SideOnly(Side.CLIENT) -public class GuiItemRoutingNode extends ContainerScreen { - private TextFieldWidget textBox; - - private TileFilteredRoutingNode inventory; - private ContainerItemRoutingNode container; - - private int left, top; - - public GuiItemRoutingNode(PlayerInventory playerInventory, IInventory tileRoutingNode) { - super(new ContainerItemRoutingNode(playerInventory, tileRoutingNode)); - this.xSize = 201; - this.ySize = 169; - inventory = (TileFilteredRoutingNode) tileRoutingNode; - container = (ContainerItemRoutingNode) this.inventorySlots; - } - - private int getCurrentActiveSlotPriority() { - Direction direction = Direction.byIndex(inventory.currentActiveSlot); - if (direction != null) { - return inventory.getPriority(direction); - } - - return 0; - } - - @Override - public void initGui() { - super.initGui(); - left = (this.width - this.xSize) / 2; - top = (this.height - this.ySize) / 2; - - this.buttonList.clear(); - this.buttonList.add(new Button(0, left + 176, top + 14, 18, 18, "D")); - this.buttonList.add(new Button(1, left + 176, top + 32, 18, 18, "U")); - this.buttonList.add(new Button(2, left + 176, top + 50, 18, 18, "N")); - this.buttonList.add(new Button(3, left + 176, top + 68, 18, 18, "S")); - this.buttonList.add(new Button(4, left + 176, top + 86, 18, 18, "W")); - this.buttonList.add(new Button(5, left + 176, top + 104, 18, 18, "E")); - this.buttonList.add(new Button(6, left + 160, top + 50, 10, 18, ">")); - this.buttonList.add(new Button(7, left + 132, top + 50, 10, 18, "<")); - disableDirectionalButton(inventory.currentActiveSlot); - - this.textBox = new TextFieldWidget(0, this.fontRenderer, left + 94, top + 37, 70, 12); - this.textBox.setEnableBackgroundDrawing(false); - this.textBox.setText(""); - } - - @Override - protected void keyTyped(char typedChar, int keyCode) throws IOException { - if (this.textBox.textboxKeyTyped(typedChar, keyCode)) { - if (container.lastGhostSlotClicked != -1) { -// this.renameItem(); - String str = this.textBox.getText(); - int amount = 0; - - if (!str.isEmpty()) { - try { - Integer testVal = Integer.decode(str); - if (testVal != null) { - amount = testVal; - } - } catch (NumberFormatException d) { - } - } - -// inventory.setGhostItemAmount(container.lastGhostSlotClicked, amount); - setValueOfGhostItemInSlot(container.lastGhostSlotClicked, amount); - } - } else { - super.keyTyped(typedChar, keyCode); - } - } - - private void setValueOfGhostItemInSlot(int ghostItemSlot, int amount) { - BloodMagicPacketHandler.INSTANCE.sendToServer(new ItemRouterAmountPacketProcessor(ghostItemSlot, amount, inventory.getPos(), inventory.getWorld())); - } - - /** - * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton - */ - @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - super.mouseClicked(mouseX, mouseY, mouseButton); - this.textBox.mouseClicked(mouseX, mouseY, mouseButton); - if (container.lastGhostSlotClicked != -1) { - Slot slot = container.getSlot(container.lastGhostSlotClicked + 1); - ItemStack stack = slot.getStack(); - if (!stack.isEmpty()) { - int amount = GhostItemHelper.getItemGhostAmount(stack); - this.textBox.setText("" + amount); - } else { - this.textBox.setText(""); - } - } - } - - /** - * Draws the screen and all the components in it. - */ - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - - Minecraft.getInstance().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); - } - - /** - * Called by the controls from the buttonList when activated. (Mouse pressed - * for buttons) - */ - @Override - protected void actionPerformed(Button button) throws IOException { - if (button.enabled) { - BloodMagicPacketHandler.INSTANCE.sendToServer(new ItemRouterButtonPacketProcessor(button.id, inventory.getPos(), inventory.getWorld())); - if (button.id < 6) { - inventory.currentActiveSlot = button.id; - enableAllDirectionalButtons(); - button.enabled = false; - } - } - } - - private void enableAllDirectionalButtons() { - for (Button button : this.buttonList) { - button.enabled = true; - } - } - - private void disableDirectionalButton(int id) { - this.buttonList.get(id).enabled = false; - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRenderer.drawString("" + getCurrentActiveSlotPriority(), 143 + 5, 51 + 4, 0xFFFFFF); - String s = ""; - if (container.lastGhostSlotClicked != -1) { - ItemStack clickedStack = inventorySlots.getSlot(1 + container.lastGhostSlotClicked).getStack(); - if (!clickedStack.isEmpty()) { - s = clickedStack.getDisplayName(); - } - } - - this.fontRenderer.drawStringWithShadow(s.substring(0, Math.min(16, s.length())), 81, 19, 0xFFFFFF); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/routingNode.png"); - this.mc.getTextureManager().bindTexture(soulForgeGuiTextures); - this.drawTexturedModalRect(left, top, 0, 0, this.xSize, this.ySize); - GlStateManager.disableLighting(); - GlStateManager.disableBlend(); - this.textBox.drawTextBox(); - } - -// @Override -// public void sendSlotContents(Container containerToSend, int slotInd, ItemStack stack) -// { -// if (slotInd == 0) -// { -// this.nameField.setText(stack == null ? "" : stack.getOwnerName()); -// this.nameField.setEnabled(stack != null); -// -// if (stack != null) -// { -// this.renameItem(); -// } -// } -// } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java deleted file mode 100644 index f8693ba3..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java +++ /dev/null @@ -1,44 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiMasterRoutingNode extends ContainerScreen { - - public GuiMasterRoutingNode(PlayerInventory playerInventory, IInventory tileRoutingNode) { - super(new ContainerMasterRoutingNode(playerInventory, tileRoutingNode)); - this.xSize = 216; - this.ySize = 216; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { -// this.fontRendererObj.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752); -// this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/masterRoutingNode.png"); - this.mc.getTextureManager().bindTexture(soulForgeGuiTextures); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java deleted file mode 100644 index 3e890f88..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ /dev/null @@ -1,56 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.tile.TileSoulForge; -import WayofTime.bloodmagic.tile.container.ContainerSoulForge; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiSoulForge extends ContainerScreen { - public IInventory tileSoulForge; - - public GuiSoulForge(PlayerInventory playerInventory, IInventory tileSoulForge) { - super(new ContainerSoulForge(playerInventory, tileSoulForge)); - this.tileSoulForge = tileSoulForge; - this.xSize = 176; - this.ySize = 205; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752); - this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/soulForge.png"); - this.mc.getTextureManager().bindTexture(soulForgeGuiTextures); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize); - - int l = this.getCookProgressScaled(90); - this.drawTexturedModalRect(i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); - } - - public int getCookProgressScaled(int scale) { - double progress = ((TileSoulForge) tileSoulForge).getProgressForGui(); - return (int) (progress * scale); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java deleted file mode 100644 index be9cde2e..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java +++ /dev/null @@ -1,42 +0,0 @@ -package WayofTime.bloodmagic.client.gui; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.tile.container.ContainerTeleposer; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiTeleposer extends ContainerScreen { - public GuiTeleposer(PlayerInventory playerInventory, IInventory tileTeleposer) { - super(new ContainerTeleposer(playerInventory, tileTeleposer)); - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.teleposer.name"), 64, 23, 4210752); - this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - ResourceLocation teleposerGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/teleposer.png"); - this.mc.getTextureManager().bindTexture(teleposerGuiTextures); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(i, j + 18, 0, 0, this.xSize, this.ySize); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java deleted file mode 100644 index 950af569..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java +++ /dev/null @@ -1,182 +0,0 @@ -package WayofTime.bloodmagic.client.helper; - -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraftforge.fml.common.FMLLog; -import org.apache.logging.log4j.Level; -import org.lwjgl.opengl.ARBFragmentShader; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.ARBVertexShader; -import org.lwjgl.opengl.GL11; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; - -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

    - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - *

    - * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)] - */ -public final class ShaderHelper { - private static final int VERT_ST = ARBVertexShader.GL_VERTEX_SHADER_ARB; - private static final int FRAG_ST = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB; - - private static final int VERT = 1; - private static final int FRAG = 2; - - private static final String VERT_EXTENSION = ".vsh"; - private static final String FRAG_EXTENSION = ".frag"; - - public static int psiBar; - - public static void init() { - if (!useShaders()) - return; - - psiBar = createProgram("/assets/bloodmagic/shaders/beam", FRAG); - } - - public static void useShader(int shader, int ticks) { - if (!useShaders()) - return; - - ARBShaderObjects.glUseProgramObjectARB(shader); - - if (shader != 0) { - int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time"); - ARBShaderObjects.glUniform1iARB(time, ticks); - } - } - - public static void releaseShader() { - useShader(0, 0); - } - - public static boolean useShaders() { - return OpenGlHelper.shadersSupported; - } - - private static int createProgram(String s, int sides) { - boolean vert = (sides & VERT) != 0; - boolean frag = (sides & FRAG) != 0; - - return createProgram(vert ? (s + VERT_EXTENSION) : null, frag ? (s + FRAG_EXTENSION) : null); - } - - // Most of the code taken from the LWJGL wiki - // http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL - - private static int createProgram(String vert, String frag) { - int vertId = 0, fragId = 0, program = 0; - if (vert != null) - vertId = createShader(vert, VERT_ST); - if (frag != null) - fragId = createShader(frag, FRAG_ST); - - program = ARBShaderObjects.glCreateProgramObjectARB(); - if (program == 0) - return 0; - - if (vert != null) - ARBShaderObjects.glAttachObjectARB(program, vertId); - if (frag != null) - ARBShaderObjects.glAttachObjectARB(program, fragId); - - ARBShaderObjects.glLinkProgramARB(program); - if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_LINK_STATUS_ARB) == GL11.GL_FALSE) { - FMLLog.log(Level.ERROR, getLogInfo(program)); - return 0; - } - - ARBShaderObjects.glValidateProgramARB(program); - if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_VALIDATE_STATUS_ARB) == GL11.GL_FALSE) { - FMLLog.log(Level.ERROR, getLogInfo(program)); - return 0; - } - - return program; - } - - private static int createShader(String filename, int shaderType) { - int shader = 0; - try { - shader = ARBShaderObjects.glCreateShaderObjectARB(shaderType); - - if (shader == 0) - return 0; - - ARBShaderObjects.glShaderSourceARB(shader, readFileAsString(filename)); - ARBShaderObjects.glCompileShaderARB(shader); - - if (ARBShaderObjects.glGetObjectParameteriARB(shader, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB) == GL11.GL_FALSE) - throw new RuntimeException("Error creating shader: " + getLogInfo(shader)); - - return shader; - } catch (Exception e) { - ARBShaderObjects.glDeleteObjectARB(shader); - e.printStackTrace(); - return -1; - } - } - - private static String getLogInfo(int obj) { - return ARBShaderObjects.glGetInfoLogARB(obj, ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB)); - } - - private static String readFileAsString(String filename) throws Exception { - StringBuilder source = new StringBuilder(); - InputStream in = ShaderHelper.class.getResourceAsStream(filename); - Exception exception = null; - BufferedReader reader; - - if (in == null) - return ""; - - try { - reader = new BufferedReader(new InputStreamReader(in, "UTF-8")); - - Exception innerExc = null; - try { - String line; - while ((line = reader.readLine()) != null) - source.append(line).append('\n'); - } catch (Exception exc) { - exception = exc; - } finally { - try { - reader.close(); - } catch (Exception exc) { - if (innerExc == null) - innerExc = exc; - else - exc.printStackTrace(); - } - } - - if (innerExc != null) - throw innerExc; - } catch (Exception exc) { - exception = exc; - } finally { - try { - in.close(); - } catch (Exception exc) { - if (exception == null) - exception = exc; - else - exc.printStackTrace(); - } - - if (exception != null) - throw exception; - } - - return source.toString(); - } - -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java deleted file mode 100644 index d713e3b6..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/ConfigEntryEditHUD.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import net.minecraftforge.fml.client.config.GuiConfig; -import net.minecraftforge.fml.client.config.GuiConfigEntries; -import net.minecraftforge.fml.client.config.IConfigElement; - -public class ConfigEntryEditHUD extends GuiConfigEntries.CategoryEntry { - - public ConfigEntryEditHUD(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement element) { - super(owningScreen, owningEntryList, element); - - this.childScreen = new GuiEditHUD(owningScreen); - } - - @Override - public boolean isDefault() { - return true; - } - - @Override - public void setToDefault() { - ElementRegistry.resetPos(); - } - - @Override - public boolean isChanged() { - return ((GuiEditHUD) childScreen).changes; - } - - @Override - public void undoChanges() { - - } - - @Override - public boolean saveConfigElement() { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java deleted file mode 100644 index 9544dcdc..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementInfo.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import javax.vecmath.Vector2f; - -public class ElementInfo { - - public static final ElementInfo DUMMY = new ElementInfo(new Vector2f(0F, 0F), ElementRegistry.getRandomColor()); - - private final Vector2f defaultPosition; - private final int boxColor; - private Vector2f currentPosition; - - public ElementInfo(Vector2f defaultPosition, int boxColor) { - this.defaultPosition = defaultPosition; - this.boxColor = boxColor; - this.currentPosition = defaultPosition; - } - - public Vector2f getDefaultPosition() { - return defaultPosition; - } - - public int getBoxColor() { - return boxColor; - } - - public ElementInfo setPosition(Vector2f position) { - this.currentPosition = position; - return this; - } - - public Vector2f getPosition() { - return currentPosition; - } - - public void resetPosition() { - this.currentPosition = defaultPosition; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java deleted file mode 100644 index 642ea5e4..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java +++ /dev/null @@ -1,149 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.hud.element.HUDElement; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.vecmath.Vector2f; -import java.awt.Color; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.function.BiFunction; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Side.CLIENT) -public class ElementRegistry { - - private static final File CONFIG = new File(Loader.instance().getConfigDir(), BloodMagic.MODID + "/hud_elements.json"); - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final Map HUD_ELEMENTS = Maps.newLinkedHashMap(); - private static final Map REVERSE = Maps.newHashMap(); - private static final Map ELEMENT_INFO = Maps.newHashMap(); - - public static void registerHandler(ResourceLocation key, HUDElement element, Vector2f defaultPosition) { - HUD_ELEMENTS.put(key, element); - REVERSE.put(element, key); - - - ELEMENT_INFO.put(key, new ElementInfo(defaultPosition, getRandomColor())); - } - - public static void resetPos() { - ELEMENT_INFO.values().forEach(ElementInfo::resetPosition); - } - - public static List getElements() { - return ImmutableList.copyOf(HUD_ELEMENTS.values()); - } - - public static ResourceLocation getKey(HUDElement element) { - return REVERSE.get(element); - } - - public static int getColor(ResourceLocation element) { - return ELEMENT_INFO.getOrDefault(element, ElementInfo.DUMMY).getBoxColor(); - } - - public static Vector2f getPosition(ResourceLocation element) { - return ELEMENT_INFO.get(element).getPosition(); - } - - public static void setPosition(ResourceLocation element, Vector2f point) { - ELEMENT_INFO.compute(element, (resourceLocation, elementInfo) -> { - if (elementInfo == null) - return new ElementInfo(point, getRandomColor()); - - elementInfo.setPosition(point); - return elementInfo; - }); - } - - public static void save(Map newLocations) { - newLocations.forEach((k, v) -> { - ElementInfo info = ELEMENT_INFO.get(k); - if (info != null) - info.setPosition(v); - }); - - Map toWrite = Maps.newHashMap(); - for (Map.Entry entry : ELEMENT_INFO.entrySet()) - toWrite.put(entry.getKey().toString(), entry.getValue().getPosition()); - - String json = GSON.toJson(toWrite); - try (FileWriter writer = new FileWriter(CONFIG)) { - writer.write(json); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void readConfig() { - if (!CONFIG.exists()) - return; - - try (FileReader reader = new FileReader(CONFIG)) { - Map toLoad = GSON.fromJson(reader, new TypeToken>() { - }.getType()); - for (Map.Entry entry : toLoad.entrySet()) { - ElementInfo info = ELEMENT_INFO.get(new ResourceLocation(entry.getKey())); - if (info != null) - info.setPosition(entry.getValue()); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public static void onRenderOverlay(RenderGameOverlayEvent.Pre event) { - if (event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); - - for (HUDElement element : HUD_ELEMENTS.values()) { - if (!element.shouldRender(Minecraft.getInstance())) - continue; - - Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition(); - int xPos = (int) (resolution.getScaledWidth_double() * position.x); - if (xPos - element.getWidth() < 0) - xPos *= 2; - if (xPos + element.getWidth() > resolution.getScaledWidth()) - xPos -= element.getWidth(); - - int yPos = (int) (resolution.getScaledHeight_double() * position.y); - if (yPos - element.getHeight() < 0) - yPos *= 2; - if (yPos + element.getHeight() > resolution.getScaledHeight()) - yPos -= element.getHeight(); - - element.draw(event.getResolution(), event.getPartialTicks(), xPos, yPos); - } - } - } - - public static int getRandomColor() { - Random rand = new Random(); - float r = rand.nextFloat() / 2F + 0.5F; - float g = rand.nextFloat() / 2F + 0.5F; - float b = rand.nextFloat() / 2F + 0.5F; - float a = 0.5F; - return new Color(r, g, b, a).getRGB(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java b/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java deleted file mode 100644 index cc11d92c..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/Elements.java +++ /dev/null @@ -1,136 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.Sprite; -import WayofTime.bloodmagic.client.hud.element.ElementDemonAura; -import WayofTime.bloodmagic.client.hud.element.ElementDivinedInformation; -import WayofTime.bloodmagic.client.hud.element.ElementHolding; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.tile.TileIncenseAltar; -import WayofTime.bloodmagic.tile.TileInversionPillar; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.lang3.tuple.Pair; - -import javax.vecmath.Vector2f; -import java.awt.Point; -import java.util.function.Consumer; -import java.util.function.Function; - -public class Elements { - - public static void registerElements() { - ElementRegistry.registerHandler( - new ResourceLocation(BloodMagic.MODID, "blood_altar"), - new ElementDivinedInformation(2, true, TileAltar.class) { - @Override - public void gatherInformation(Consumer>> information) { - // Current tier - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), - altar -> altar == null ? "IV" : NumeralHelper.toRoman(altar.getTier().toInt()) - )); - // Stored/Capacity - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), - altar -> String.format("%d/%d", altar == null ? 0 : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity()) - )); - } - }, - new Vector2f(0.01F, 0.01F) - ); - - ElementRegistry.registerHandler( - new ResourceLocation(BloodMagic.MODID, "blood_altar_adv"), - new ElementDivinedInformation(5, false, TileAltar.class) { - @Override - public void gatherInformation(Consumer>> information) { - // Current tier - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), - altar -> altar == null ? "IV" : NumeralHelper.toRoman(altar.getTier().toInt()) - )); - // Stored/Capacity - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), - altar -> String.format("%d/%d", altar == null ? 0 : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity()) - )); - // Crafting progress/Crafting requirement - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), - altar -> { - if (altar == null || !altar.isActive()) - return I18n.format("hud.bloodmagic.inactive"); - int progress = altar.getProgress(); - int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); - return String.format("%d/%d", progress, totalLiquidRequired); - } - )); - // Consumption rate - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), - altar -> altar == null ? "0" : String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))) - )); - // Total charge - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), - altar -> altar == null ? "0" : String.valueOf(altar.getTotalCharge()) - )); - } - }, - new Vector2f(0.01F, 0.01F) - ); - - ElementRegistry.registerHandler( - new ResourceLocation(BloodMagic.MODID, "incense_altar"), - new ElementDivinedInformation(2, true, TileIncenseAltar.class) { - @Override - public void gatherInformation(Consumer>> information) { - // Current tranquility - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 80, 46, 16, 16), - incense -> incense == null ? "0" : String.valueOf((int) ((100D * (int) (100 * incense.tranquility)) / 100D)) - )); - // Sacrifice bonus - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 96, 46, 16, 16), - incense -> incense == null ? "0" : String.valueOf((int) (100 * incense.incenseAddition)) - )); - } - }, - new Vector2f(0.01F, 0.01F) - ); - - ElementRegistry.registerHandler( - new ResourceLocation(BloodMagic.MODID, "inversion_pillar"), - new ElementDivinedInformation(1, true, TileInversionPillar.class) { - @Override - public void gatherInformation(Consumer>> information) { - // Current inversion - information.accept(Pair.of( - new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 112, 46, 16, 16), - pillar -> pillar == null ? "0" : String.valueOf(((int) (10 * pillar.getCurrentInversion())) / 10D) - )); - } - }, - new Vector2f(0.01F, 0.01F) - ); - - ElementRegistry.registerHandler( - new ResourceLocation(BloodMagic.MODID, "demon_will_aura"), - new ElementDemonAura(), - new Vector2f(0.01F, 0.01F) - ); - - ElementRegistry.registerHandler( - new ResourceLocation(BloodMagic.MODID, "holding"), - new ElementHolding(), - new Vector2f(0.72F, 1.0F) - ); - - ElementRegistry.readConfig(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java deleted file mode 100644 index af605d69..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java +++ /dev/null @@ -1,185 +0,0 @@ -package WayofTime.bloodmagic.client.hud; - -import WayofTime.bloodmagic.client.hud.element.HUDElement; -import com.google.common.collect.Maps; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.client.config.GuiButtonExt; -import org.lwjgl.input.Keyboard; - -import javax.annotation.Nullable; -import javax.vecmath.Vector2f; -import java.awt.Point; -import java.util.Map; - -public class GuiEditHUD extends Screen { - - private static final int LINE_COLOR = 0x2D2D2D; - - private final Screen parent; - private final Map currentOverrides = Maps.newHashMap(); - private HUDElement dragged; - public boolean changes; - - public GuiEditHUD(Screen parent) { - this.parent = parent; - } - - @Override - public void initGui() { - super.initGui(); - - addButton(new GuiButtonExt(0, width / 2 - 155, height - 30, 70, 20, I18n.format("gui.bloodmagic.toggle")) {{ - enabled = false; - }}); - addButton(new GuiButtonExt(1, width / 2 - 75, height - 30, 70, 20, I18n.format("gui.bloodmagic.default"))); - addButton(new GuiButtonExt(2, width / 2 + 5, height - 30, 70, 20, I18n.format("gui.bloodmagic.save"))); - addButton(new GuiButtonExt(3, width / 2 + 90, height - 30, 70, 20, I18n.format("gui.bloodmagic.cancel"))); - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - - ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); - for (HUDElement element : ElementRegistry.getElements()) { - if (dragged == element) - continue; - - ResourceLocation key = ElementRegistry.getKey(element); - Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key)); - int xPos = (int) (resolution.getScaledWidth_double() * position.x); - int yPos = (int) (resolution.getScaledHeight_double() * position.y); - - drawWithBox(resolution, element, partialTicks, xPos, yPos); - } - - if (dragged != null) { - Point bounded = getBoundedDrag(resolution, mouseX, mouseY); - drawWithBox(resolution, dragged, partialTicks, bounded.x, bounded.y); - } - } - - @Override - public boolean doesGuiPauseGame() { - return true; - } - - @Override - protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { - if (dragged != null) - return; - - HUDElement element = getHoveredElement(mouseX, mouseY); - if (element == null) - return; - - if (clickedMouseButton == 0) - dragged = element; - } - - @Override - protected void mouseReleased(int mouseX, int mouseY, int state) { - if (dragged != null) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); - Point bounded = getBoundedDrag(resolution, mouseX, mouseY); - float xPos = (float) ((bounded.x) / resolution.getScaledWidth_double()); - float yPos = (float) ((bounded.y) / resolution.getScaledHeight_double()); - - currentOverrides.put(ElementRegistry.getKey(dragged), new Vector2f(xPos, yPos)); - changes = true; - dragged = null; - return; - } - - super.mouseReleased(mouseX, mouseY, state); - } - - @Override - protected void actionPerformed(Button button) { - switch (button.id) { - case 0: { - Minecraft.getInstance().displayGuiScreen(parent); - break; - } - case 1: { - currentOverrides.clear(); - ElementRegistry.resetPos(); - changes = false; - break; - } - case 2: { - ElementRegistry.save(currentOverrides); - Minecraft.getInstance().displayGuiScreen(parent); - break; - } - case 3: { - currentOverrides.clear(); - Minecraft.getInstance().displayGuiScreen(parent); - break; - } - } - } - - @Nullable - public HUDElement getHoveredElement(int mouseX, int mouseY) { - for (HUDElement element : ElementRegistry.getElements()) { - ResourceLocation key = ElementRegistry.getKey(element); - Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key)); - ScaledResolution resolution = new ScaledResolution(mc); - int xPos = (int) (resolution.getScaledWidth_double() * position.x); - int yPos = (int) (resolution.getScaledHeight_double() * position.y); - - if (mouseX < xPos || mouseX > xPos + element.getWidth()) - continue; - - if (mouseY < yPos || mouseY > yPos + element.getHeight()) - continue; - - return element; - } - - return null; - } - - protected Point getBoundedDrag(ScaledResolution resolution, int mouseX, int mouseY) { - int drawX = mouseX - dragged.getWidth() / 2; - if (drawX + dragged.getWidth() >= resolution.getScaledWidth()) - drawX = resolution.getScaledWidth() - dragged.getWidth(); - if (drawX < 0) - drawX = 0; - - int drawY = mouseY - dragged.getHeight() / 2; - if (drawY + dragged.getHeight() >= resolution.getScaledHeight()) - drawY = resolution.getScaledHeight() - dragged.getHeight(); - if (drawY < 0) - drawY = 0; - - return new Point(drawX, drawY); - } - - protected void drawWithBox(ScaledResolution resolution, HUDElement element, float partialTicks, int drawX, int drawY) { - int color = ElementRegistry.getColor(ElementRegistry.getKey(element)); - GlStateManager.pushMatrix(); - GlStateManager.enableAlpha(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); - drawVerticalLine(drawX, drawY, drawY + element.getHeight() - 1, color); - drawVerticalLine(drawX + element.getWidth() - 1, drawY, drawY + element.getHeight() - 1, color); - drawHorizontalLine(drawX, drawX + element.getWidth() - 1, drawY, color); - drawHorizontalLine(drawX, drawX + element.getWidth() - 1, drawY + element.getHeight() - 1, color); - GlStateManager.disableBlend(); - GlStateManager.disableAlpha(); - GlStateManager.popMatrix(); - GlStateManager.color(1.0F, 1.0F, 1.0F); - GlStateManager.enableTexture2D(); - element.draw(resolution, partialTicks, drawX, drawY); - GlStateManager.disableTexture2D(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java deleted file mode 100644 index 4a75a97e..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java +++ /dev/null @@ -1,78 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.proxy.ClientProxy; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.Utils; -import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.ResourceLocation; - -import java.util.List; - -public class ElementDemonAura extends HUDElement { - - private static final ResourceLocation BAR_LOCATION = new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png"); - - private final List orderedTypes = Lists.newArrayList( - EnumDemonWillType.DEFAULT, - EnumDemonWillType.CORROSIVE, - EnumDemonWillType.STEADFAST, - EnumDemonWillType.DESTRUCTIVE, - EnumDemonWillType.VENGEFUL - ); - - public ElementDemonAura() { - super(80, 46); - } - - @Override - public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - Minecraft minecraft = Minecraft.getInstance(); - PlayerEntity player = minecraft.player; - - minecraft.getTextureManager().bindTexture(BAR_LOCATION); - GlStateManager.color(1.0F, 1.0F, 1.0F); - this.drawTexturedModalRect(drawX, drawY, 0, 210, 80, 46); - - double maxAmount = Utils.getDemonWillResolution(player); - - int i = 0; - for (EnumDemonWillType type : orderedTypes) { - i++; - GlStateManager.color(1.0F, 1.0F, 1.0F); - minecraft.getTextureManager().bindTexture(BAR_LOCATION); - int textureXOffset = (i > 3) ? (i - 3) : (3 - i); - int maxBarSize = 30 - 2 * textureXOffset; - - double amount = ClientProxy.currentAura == null ? 0 : ClientProxy.currentAura.getWill(type); - double ratio = Math.max(Math.min(amount / maxAmount, 1), 0); - - double width = maxBarSize * ratio * 2; - double height = 2; - double x = drawX + 2 * textureXOffset + 10; - double y = drawY + 4 * i + 10; - - double textureX = 2 * textureXOffset + 2 * 42; - double textureY = 4 * i + 220; - - this.drawTexturedModalRect(x, y, textureX, textureY, width, height); - - if (player.isSneaking()) { - GlStateManager.pushMatrix(); - GlStateManager.translate(x - 2 * textureXOffset + 70, (y - 1), 0); - GlStateManager.scale(0.5, 0.5, 1); - minecraft.fontRenderer.drawStringWithShadow(String.valueOf((int) amount), 0, 2, 0xffffff); - GlStateManager.popMatrix(); - } - } - } - - @Override - public boolean shouldRender(Minecraft minecraft) { - return Utils.canPlayerSeeDemonWill(Minecraft.getInstance().player); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java deleted file mode 100644 index d461e8f9..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Hand; - -import java.util.List; - -public abstract class ElementDivinedInformation extends ElementTileInformation { - - private final boolean simple; - - public ElementDivinedInformation(int lines, boolean simple, Class tileClass) { - super(100, lines, tileClass); - this.simple = simple; - } - - @Override - public boolean shouldRender(Minecraft minecraft) { - PlayerEntity player = Minecraft.getInstance().player; - ItemStack sigilStack = player.getHeldItem(Hand.MAIN_HAND); - boolean flag = false; - if (simple) { - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - flag = true; - else flag = isFlagSigilHolding(sigilStack, true); - - if (!flag) { - sigilStack = player.getHeldItem(Hand.OFF_HAND); - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - flag = true; - else flag = isFlagSigilHolding(sigilStack, true); - } - - } else { - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - flag = true; - else flag = isFlagSigilHolding(sigilStack, false); - - if (!flag) { - sigilStack = player.getHeldItem(Hand.OFF_HAND); - if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - flag = true; - else flag = isFlagSigilHolding(sigilStack, false); - } - } - return super.shouldRender(minecraft) && flag; - } - - private boolean isFlagSigilHolding(ItemStack sigilStack, boolean simple) { - if (sigilStack.getItem() instanceof ItemSigilHolding) { - List internalInv = ItemSigilHolding.getInternalInventory(sigilStack); - int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilStack); - if (internalInv != null && !internalInv.get(currentSlot).isEmpty()) { - return (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_SEER && !simple) || (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION && simple); - } - } - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java deleted file mode 100644 index bd8fefe2..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java +++ /dev/null @@ -1,85 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.Sprite; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import java.util.List; - -public class ElementHolding extends HUDElement { - - private static final Sprite HOLDING_BAR = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 0, 102, 22); - private static final Sprite SELECTED_OVERLAY = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 22, 24, 24); - - public ElementHolding() { - super(HOLDING_BAR.getTextureWidth(), HOLDING_BAR.getTextureHeight()); - } - - @Override - public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - GlStateManager.color(1.0F, 1.0F, 1.0F); - HOLDING_BAR.draw(drawX, drawY); - - Minecraft minecraft = Minecraft.getInstance(); - ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); - // Check mainhand for Sigil of Holding - if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) - sigilHolding = minecraft.player.getHeldItemOffhand(); - // Check offhand for Sigil of Holding - if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) - return; - - int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilHolding); - SELECTED_OVERLAY.draw(drawX - 1 + (currentSlot * 20), drawY - 1); - - RenderHelper.enableGUIStandardItemLighting(); - List inventory = ItemSigilHolding.getInternalInventory(sigilHolding); - int xOffset = 0; - for (ItemStack stack : inventory) { - renderHotbarItem(drawX + 3 + xOffset, drawY + 3, partialTicks, minecraft.player, stack); - xOffset += 20; - } - } - - @Override - public boolean shouldRender(Minecraft minecraft) { - ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); - // Check mainhand for Sigil of Holding - if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) - sigilHolding = minecraft.player.getHeldItemOffhand(); - // Check offhand for Sigil of Holding - if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) - return false; - - return true; - } - - protected void renderHotbarItem(int x, int y, float partialTicks, PlayerEntity player, ItemStack stack) { - if (!stack.isEmpty()) { - float animation = (float) stack.getAnimationsToGo() - partialTicks; - - if (animation > 0.0F) { - GlStateManager.pushMatrix(); - float f1 = 1.0F + animation / 5.0F; - GlStateManager.translate((float) (x + 8), (float) (y + 12), 0.0F); - GlStateManager.scale(1.0F / f1, (f1 + 1.0F) / 2.0F, 1.0F); - GlStateManager.translate((float) (-(x + 8)), (float) (-(y + 12)), 0.0F); - } - - Minecraft.getInstance().getRenderItem().renderItemAndEffectIntoGUI(player, stack, x, y); - - if (animation > 0.0F) - GlStateManager.popMatrix(); - - Minecraft.getInstance().getRenderItem().renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, x, y); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java deleted file mode 100644 index d7dee606..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java +++ /dev/null @@ -1,23 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; - -public class ElementItemStack extends HUDElement { - private ItemStack stack; - - public ElementItemStack(ItemStack stack) { - super(16, 16); - - this.stack = stack; - } - - @Override - public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - RenderHelper.enableGUIStandardItemLighting(); - Minecraft.getInstance().getRenderItem().renderItemIntoGUI(stack, drawX, drawY); - RenderHelper.disableStandardItemLighting(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java deleted file mode 100644 index e574ffef..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementSprite.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import WayofTime.bloodmagic.client.Sprite; -import net.minecraft.client.gui.ScaledResolution; - -public class ElementSprite extends HUDElement { - - private final Sprite sprite; - - public ElementSprite(Sprite sprite) { - super(sprite.getTextureWidth(), sprite.getTextureHeight()); - - this.sprite = sprite; - } - - @Override - public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - sprite.draw(drawX, drawY); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java deleted file mode 100644 index 88016c2d..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java +++ /dev/null @@ -1,36 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.util.text.ITextComponent; - -public class ElementString extends HUDElement { - - private ITextComponent[] display; - - public ElementString(ITextComponent... display) { - super(getMaxStringWidth(display), (Minecraft.getInstance().fontRenderer.FONT_HEIGHT + 2) * display.length - 2); - - this.display = display; - } - - @Override - public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; - for (ITextComponent drawText : display) { - fontRenderer.drawStringWithShadow(drawText.getFormattedText(), drawX, drawY, 14737632); - drawY += fontRenderer.FONT_HEIGHT + 2; - } - } - - private static int getMaxStringWidth(ITextComponent... display) { - FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; - int maxWidth = 0; - for (ITextComponent drawText : display) - if (fontRenderer.getStringWidth(drawText.getFormattedText()) > maxWidth) - maxWidth = fontRenderer.getStringWidth(drawText.getFormattedText()); - - return maxWidth; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java deleted file mode 100644 index 9b6f88fe..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java +++ /dev/null @@ -1,57 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import WayofTime.bloodmagic.client.Sprite; -import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.RayTraceResult; -import org.apache.commons.lang3.tuple.Pair; - -import java.awt.Color; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; - -public abstract class ElementTileInformation extends HUDElement { - - protected final Class tileClass; - private final List>> information; - - public ElementTileInformation(int width, int lines, Class tileClass) { - super(width, 18 * lines - 2); - - this.tileClass = tileClass; - this.information = Lists.newArrayList(); - gatherInformation(information::add); - } - - public abstract void gatherInformation(Consumer>> information); - - @SuppressWarnings("unchecked") - @Override - public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - T tile = (T) Minecraft.getInstance().world.getTileEntity(Minecraft.getInstance().objectMouseOver.getBlockPos()); - - int yOffset = 0; - for (Pair> sprite : information) { - sprite.getLeft().draw(drawX, drawY + yOffset); - int textY = drawY + yOffset + (sprite.getLeft().getTextureHeight() / 4); - Minecraft.getInstance().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); - yOffset += sprite.getLeft().getTextureHeight() + 2; - } - } - - @Override - public boolean shouldRender(Minecraft minecraft) { - RayTraceResult trace = Minecraft.getInstance().objectMouseOver; - if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) - return false; - - TileEntity tile = Minecraft.getInstance().world.getTileEntity(trace.getBlockPos()); - if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) - return false; - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java deleted file mode 100644 index 10eed1cd..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/HUDElement.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.client.hud.element; - -import WayofTime.bloodmagic.client.hud.ElementRegistry; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.vecmath.Vector2f; -import java.awt.Point; - -@SideOnly(Side.CLIENT) -public abstract class HUDElement { - - private int width; - private int height; - - public HUDElement(int width, int height) { - this.width = width; - this.height = height; - } - - public boolean shouldRender(Minecraft minecraft) { - return true; - } - - public abstract void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY); - - public final int getWidth() { - return width; - } - - public final int getHeight() { - return height; - } - - protected void drawTexturedModalRect(double x, double y, double textureX, double textureY, double width, double height) { - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder buffer = tessellator.getBuffer(); - buffer.begin(7, DefaultVertexFormats.POSITION_TEX); - buffer.pos(x + 0, y + height, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - buffer.pos(x + width, y + height, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - buffer.pos(x + width, y + 0, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); - buffer.pos(x + 0, y + 0, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); - tessellator.draw(); - } - - @Override - public String toString() { - Vector2f point = ElementRegistry.getPosition(ElementRegistry.getKey(this)); - return ElementRegistry.getKey(this) + "@" + point.x + "," + point.y; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java b/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java deleted file mode 100644 index a7fe5286..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/key/IKeybindable.java +++ /dev/null @@ -1,8 +0,0 @@ -package WayofTime.bloodmagic.client.key; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; - -public interface IKeybindable { - void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat); -} diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java deleted file mode 100644 index b1b18335..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java +++ /dev/null @@ -1,16 +0,0 @@ -package WayofTime.bloodmagic.client.key; - -import WayofTime.bloodmagic.BloodMagic; -import net.minecraft.client.settings.KeyBinding; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class KeyBindingBloodMagic extends KeyBinding { - public KeyBindingBloodMagic(KeyBindings key) { - super(key.getDescription(), key.getKeyConflictContext(), key.getKeyModifier(), key.getKeyCode(), BloodMagic.NAME); - - ClientRegistry.registerKeyBinding(this); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java deleted file mode 100644 index 583f54da..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java +++ /dev/null @@ -1,97 +0,0 @@ -package WayofTime.bloodmagic.client.key; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.KeyProcessor; -import WayofTime.bloodmagic.util.handler.event.ClientHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.settings.IKeyConflictContext; -import net.minecraftforge.client.settings.KeyConflictContext; -import net.minecraftforge.client.settings.KeyModifier; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Keyboard; - -import java.util.Locale; - -public enum KeyBindings { - // @formatter:off - OPEN_HOLDING(KeyConflictContext.IN_GAME, KeyModifier.NONE, Keyboard.KEY_H) { - @SideOnly(Side.CLIENT) - @Override - public void handleKeybind() { - ItemStack itemStack = ClientHandler.minecraft.player.getHeldItemMainhand(); - if (itemStack.getItem() instanceof IKeybindable) - BloodMagicPacketHandler.INSTANCE.sendToServer(new KeyProcessor(this, false)); - } - }, - CYCLE_HOLDING_POS(KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_EQUALS) { - @SideOnly(Side.CLIENT) - @Override - public void handleKeybind() { - ClientPlayerEntity player = Minecraft.getInstance().player; - if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) - ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, -1); - } - }, - CYCLE_HOLDING_NEG(KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_MINUS) { - @SideOnly(Side.CLIENT) - @Override - public void handleKeybind() { - ClientPlayerEntity player = Minecraft.getInstance().player; - if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) - ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1); - } - }, - ; - // @formatter:on - - private final IKeyConflictContext keyConflictContext; - private final KeyModifier keyModifier; - private final int keyCode; - - @SideOnly(Side.CLIENT) - private KeyBinding key; - - KeyBindings(IKeyConflictContext keyConflictContext, KeyModifier keyModifier, int keyCode) { - this.keyConflictContext = keyConflictContext; - this.keyModifier = keyModifier; - this.keyCode = keyCode; - } - - @SideOnly(Side.CLIENT) - public abstract void handleKeybind(); - - public IKeyConflictContext getKeyConflictContext() { - return keyConflictContext; - } - - public KeyModifier getKeyModifier() { - return keyModifier; - } - - public int getKeyCode() { - return keyCode; - } - - @SideOnly(Side.CLIENT) - public KeyBinding getKey() { - if (key == null) - key = new KeyBindingBloodMagic(this); - - return key; - } - - @SideOnly(Side.CLIENT) - public void setKey(KeyBinding key) { - this.key = key; - } - - public String getDescription() { - return BloodMagic.MODID + ".keybind." + name().toLowerCase(Locale.ENGLISH); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java deleted file mode 100644 index bf43d69a..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ /dev/null @@ -1,25 +0,0 @@ -package WayofTime.bloodmagic.client.mesh; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.iface.IActivatable; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -public class CustomMeshDefinitionActivatable implements ItemMeshDefinition { - private final String name; - - public CustomMeshDefinitionActivatable(String name) { - this.name = name; - } - - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (!stack.isEmpty() && stack.getItem() instanceof IActivatable) - if (((IActivatable) stack.getItem()).getActivated(stack)) - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "active=true"); - - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "active=false"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java deleted file mode 100644 index 0b3a91b9..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.client.mesh; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -public class CustomMeshDefinitionMultiWill implements ItemMeshDefinition { - private final String name; - - public CustomMeshDefinitionMultiWill(String name) { - this.name = name; - } - - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (!stack.isEmpty() && stack.getItem() instanceof IMultiWillTool) { - EnumDemonWillType type = ((IMultiWillTool) stack.getItem()).getCurrentType(stack); - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=" + type.getName().toLowerCase()); - } - - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=default"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java deleted file mode 100644 index ec857e14..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ /dev/null @@ -1,28 +0,0 @@ -package WayofTime.bloodmagic.client.mesh; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.soul.ItemSoulGem; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -public class CustomMeshDefinitionWillGem implements ItemMeshDefinition { - private final String name; - - public CustomMeshDefinitionWillGem(String name) { - this.name = name; - } - - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (!stack.isEmpty() && stack.getItem() == RegistrarBloodMagicItems.SOUL_GEM) { - EnumDemonWillType type = ((ItemSoulGem) stack.getItem()).getCurrentType(stack); - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=" + ItemSoulGem.names[stack.getItemDamage()] + "_" + type.getName().toLowerCase()); - } - - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), "type=petty_default"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java deleted file mode 100644 index ca303032..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java +++ /dev/null @@ -1,53 +0,0 @@ -package WayofTime.bloodmagic.client.render; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import net.minecraft.client.entity.player.AbstractClientPlayerEntity; -import net.minecraft.client.model.ModelElytra; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.PlayerRenderer; -import net.minecraft.client.renderer.entity.layers.ArmorLayer; -import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -public class LayerBloodElytra implements LayerRenderer { - - private static final ResourceLocation TEXTURE_BLOOD_ELYTRA = new ResourceLocation("bloodmagic", "textures/entities/bloodElytra.png"); - private final PlayerRenderer renderPlayer; - private final ModelElytra modelElytra = new ModelElytra(); - - public LayerBloodElytra(PlayerRenderer renderPlayer) { - this.renderPlayer = renderPlayer; - } - - @Override - public void doRenderLayer(AbstractClientPlayerEntity clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if (LivingArmour.hasFullSet(clientPlayer)) { - ItemStack chestStack = clientPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST); - if (ItemLivingArmour.hasUpgrade(BloodMagic.MODID + ".upgrade.elytra", chestStack)) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - GlStateManager.enableBlend(); - - renderPlayer.bindTexture(TEXTURE_BLOOD_ELYTRA); - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.0F, 0.0F, 0.125F); - modelElytra.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, clientPlayer); - modelElytra.render(clientPlayer, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); - - if (chestStack.isItemEnchanted()) - ArmorLayer.renderEnchantedGlint(this.renderPlayer, clientPlayer, this.modelElytra, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale); - - GlStateManager.popMatrix(); - } - } - } - - @Override - public boolean shouldCombineTextures() { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java deleted file mode 100644 index 3131c610..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ /dev/null @@ -1,142 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer { - public AttractorAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ZombieBeacon.png")); - } - - public AttractorAlchemyCircleRenderer(ResourceLocation resourceLocation) { - super(resourceLocation); - } - - @Override - public float getSizeModifier(float craftTime) { - return 1; - } - - @Override - public float getRotation(float craftTime) { - float offset = 2; - if (craftTime >= offset) { - float modifier = (craftTime - offset) * 5f; - return modifier * 1f; - } - return 0; - } - - @Override - public float getSecondaryRotation(float craftTime) { - float offset = 50; - float secondaryOffset = 150; - if (craftTime >= offset) { - if (craftTime < secondaryOffset) { - float modifier = 90 * (craftTime - offset) / (secondaryOffset - offset); - return modifier; - } else { - return 90; - } - } - return 0; - } - - @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); - GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 0, 1); - GlStateManager.rotate(secondaryRot, 1, 0, 0); - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java deleted file mode 100644 index 8f487060..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ /dev/null @@ -1,236 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { - public static final int numberOfSweeps = 5; - public static final int startTime = 50; - public static final int sweepTime = 40; - public static final int inwardRotationTime = 50; - public static final float arcLength = (float) Math.sqrt(2 * (2 * 2) - 2 * 2 * 2 * Math.cos(2 * Math.PI * 2 / 5)); - public static final float theta2 = (float) (18f * Math.PI / 180f); - public static final int endTime = 300; - public final ResourceLocation[] arraysResources; - public float offsetFromFace = -0.9f; - - public BindingAlchemyCircleRenderer() { - super(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingArray.png")); - arraysResources = new ResourceLocation[5]; - arraysResources[0] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png"); - arraysResources[1] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png"); - arraysResources[2] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png"); - arraysResources[3] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png"); - arraysResources[4] = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BindingLightningArray.png"); - } - - public float getRotation(int circle, float craftTime) { - float offset = 2; - if (circle == -1) { - return craftTime * 360 * 2 / 5 / sweepTime; - } - if (craftTime >= offset) { - float modifier = (float) Math.pow(craftTime - offset, 1.5); - return modifier * 0.5f; - } - return 0; - } - - public float getSecondaryRotation(int circle, float craftTime) { - float offset = 50; - if (craftTime >= offset) { - float modifier = (float) Math.pow(craftTime - offset, 1.7); - return modifier * 0.5f; - } - return 0; - } - - public float getVerticalOffset(int circle, float craftTime) { - if (circle >= 0 && circle <= 4) { - if (craftTime >= 5) { - if (craftTime <= 40) { - return (float) ((-0.4) * Math.pow((craftTime - 5) / 35f, 3)); - } else { - return -0.4f; - } - } - - return 0; - } - - if (craftTime >= 5) { - if (craftTime <= 40) { - return (float) ((-0.4) * Math.pow((craftTime - 5) / 35f, 3)); - } else { - return -0.4f; - } - } - return 0; - } - - public float getInwardRotation(int circle, float craftTime) { - float offset = startTime + numberOfSweeps * sweepTime; - if (craftTime >= offset) { - if (craftTime <= offset + inwardRotationTime) { - return 90f / inwardRotationTime * (craftTime - offset); - } else { - return 90; - } - } - - return 0; - } - - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - - float rot = getRotation(-1, craftTime); - - float size = 3.0F; - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); - - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - // GlStateManager.color(0.5f, 1f, 1f, 1f); - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 0, 1); - - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - GlStateManager.popMatrix(); - - for (int i = 0; i < 5; i++) { - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(arraysResources[i]); - float newSize = 1; - float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(i, craftTime); - float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(i, craftTime); - float rotation = this.getRotation(i, craftTime); - - GlStateManager.translate(distance * Math.sin(angle), -distance * Math.cos(angle), this.getVerticalOffset(i, craftTime)); - GlStateManager.rotate(i * 360 / 5, 0, 0, 1); - GlStateManager.rotate(getInwardRotation(i, craftTime), 1, 0, 0); - GlStateManager.rotate(rotation, 0, 0, 1); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - wr.pos(newSize / 2f, newSize / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(newSize / 2f, -newSize / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-newSize / 2f, -newSize / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-newSize / 2f, newSize / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - } - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - } - - public static float getAngleOfCircle(int circle, float craftTime) { - if (circle >= 0 && circle <= 4) { - float originalAngle = (float) (circle * 2 * Math.PI / 5d); - - double sweep = (craftTime - startTime) / sweepTime; - if (sweep >= 0 && sweep < numberOfSweeps) { - float offset = ((int) sweep) * sweepTime + startTime; - originalAngle += 2 * Math.PI * 2 / 5 * (int) sweep + getAngle(craftTime - offset, (int) sweep); - } else if (sweep >= numberOfSweeps) { - originalAngle += 2 * Math.PI * 2 / 5 * numberOfSweeps + (craftTime - 5 * sweepTime - startTime) * 2 * Math.PI * 2 / 5 / sweepTime; - } - - return originalAngle; - } - - return 0; - } - - public static float getAngle(float craftTime, int sweep) { - float rDP = craftTime / sweepTime * arcLength; - float rEnd = (float) Math.sqrt(rDP * rDP + 2 * 2 - 2 * rDP * 2 * Math.cos(theta2)); - return (float) (Math.acos((2 * 2 + rEnd * rEnd - rDP * rDP) / (2 * rEnd * 2))); - } - - /** - * Returns the center-to-center distance of this circle. - */ - public static float getDistanceOfCircle(int circle, float craftTime) { // TODO Change this so it doesn't use angle, since it is a constant speed. - double sweep = (craftTime - startTime) / sweepTime; - if (sweep >= 0 && sweep < numberOfSweeps) { - float offset = ((int) sweep) * sweepTime + startTime; - float angle = getAngle(craftTime - offset, (int) sweep); - float thetaPrime = (float) (Math.PI - theta2 - angle); - // if(thetaPrime > 0 && thetaPrime < Math.PI) { - return (float) (2 * Math.sin(theta2) / Math.sin(thetaPrime)); - // } - } else if (sweep >= numberOfSweeps && craftTime < endTime) { - return 2 - 2 * (craftTime - startTime - numberOfSweeps * sweepTime) / (endTime - startTime - numberOfSweeps * sweepTime); - } else if (craftTime >= endTime) { - return 0; - } - - return 2; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java deleted file mode 100644 index 44661394..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ /dev/null @@ -1,145 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { - public final ResourceLocation secondaryArrayResource; - public float offsetFromFace = -0.9f; - - public DualAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png")); - } - - public DualAlchemyCircleRenderer(ResourceLocation arrayResource, ResourceLocation secondaryArrayResource) { - super(arrayResource); - this.secondaryArrayResource = secondaryArrayResource; - } - - @Override - public float getSizeModifier(float craftTime) { - return 1; - } - - @Override - public float getRotation(float craftTime) { - float offset = 2; - if (craftTime >= offset) { - float modifier = (craftTime - offset) * 2f; - return modifier * 1f; - } - return 0; - } - - @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / - // this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f; - float rot = getRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); - GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 0, 1); - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - // Bind the second texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(secondaryArrayResource); - GlStateManager.pushMatrix(); - GlStateManager.rotate(-rot, 0, 0, 1); - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java deleted file mode 100644 index 687ecdc8..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowAlchemyCircleRenderer.java +++ /dev/null @@ -1,18 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import net.minecraft.util.ResourceLocation; - -public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer { - public LowAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); - } - - public LowAlchemyCircleRenderer(ResourceLocation arrayResource) { - super(arrayResource); - } - - @Override - public float getVerticalOffset(float craftTime) { - return 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java deleted file mode 100644 index 8b57713b..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/LowStaticAlchemyCircleRenderer.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import net.minecraft.util.ResourceLocation; - -public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer { - public LowStaticAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); - } - - public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) { - super(arrayResource); - } - - @Override - public float getRotation(float craftTime) { - float offset = 2; - float duration = 180; - if (craftTime >= offset && craftTime < offset + duration) { - float modifier = (craftTime - offset) * 2f; - return modifier * 1f; - } - return 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java deleted file mode 100644 index 62c3a02e..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ /dev/null @@ -1,243 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; - -public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { - private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"); - - private ResourceLocation mobSacrificeSwirlResource = new ResourceLocation("bloodmagic", "textures/models/mobsacrificeswirl.png"); - - public MobSacrificeAlchemyCircleRenderer(ResourceLocation location) { - super(location); - } - - public MobSacrificeAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/mobsacrifice.png")); - } - - @Override - public float getSizeModifier(float craftTime) { - if (craftTime < 40) { - return 0; - } else if (craftTime > 40 && craftTime < 100) { - return (craftTime - 40) / 60f; - } - return 1; - } - - @Override - public float getRotation(float craftTime) { - float offset = 50; - if (craftTime >= offset) { - float modifier = (craftTime - offset) * 5f; - return modifier * 1f; - } - return 0; - } - - @Override - public float getSecondaryRotation(float craftTime) { - return 0; - } - - @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - - float rot = getRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); -// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - GlStateManager.pushMatrix(); - - double topHeightOffset = 0; - double middleHeightOffset = 0; - double bottomHeightOffset = 0; - - BlockPos pos = tileArray.getPos(); - World world = tileArray.getWorld(); - -// GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1); -// GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); - - for (int i = 1; i <= 3; i++) { - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource); - translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i); - GlStateManager.popMatrix(); - } - - //Render the main array. - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); -// GlStateManager.rotate(rot, 0, 0, 1); - renderStandardCircle(tessellator, wr, 3); - GlStateManager.popMatrix(); - - //Render the swirlz - float swirlSize = 3; - if (craftTime <= 40) { - swirlSize = 0; - } else if (craftTime <= 100) { - swirlSize = 3 * (craftTime - 40) / 60; - } - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(mobSacrificeSwirlResource); - GlStateManager.translate(0, 0, 0.1); - GlStateManager.rotate(rot / 3, 0, 0, 1); - renderStandardCircle(tessellator, wr, swirlSize); - GlStateManager.popMatrix(); - -// GlStateManager.popMatrix(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } - - public float getStartupPitchYawRatio(float craftTime) { - if (craftTime <= 80) { - return 0; - } else if (craftTime > 80 && craftTime < 140) { - return (craftTime - 80) / 60f; - } - - return 1; - } - - private void translateAndRotateFloatingArray(Tessellator tessellator, BufferBuilder builder, double size, float rotation, float craftTime, int circle) { - double verticalOffset = 2; - - float primaryRotation = 0; - float secondaryRotation = 0; - if (craftTime >= 40) { - primaryRotation = (craftTime - 40) * 4f; - secondaryRotation = (craftTime - 40) * 2f; - } - - float translationOffset = 1; - if (craftTime < 80) { - translationOffset = 0; - } else if (craftTime < 140) { - translationOffset = (craftTime - 80) / 60; - } - - switch (circle) { - case 1: - GlStateManager.translate(0, 0, -verticalOffset); - GlStateManager.rotate(rotation / 200, 1, 0, 0); - GlStateManager.rotate(rotation / 10, 0, 0, 1); - GlStateManager.translate(1.7 * translationOffset, 0, 0); - break; - case 2: - GlStateManager.translate(0, 0, -verticalOffset); -// GlStateManager.rotate(254, 0, 0, 1); - GlStateManager.rotate((float) (rotation / 150 + 120), 1, 0, 0); - GlStateManager.rotate(120, 0, 1, 0); - GlStateManager.rotate(-rotation / 10, 0, 0, 1); - GlStateManager.translate(1.2 * translationOffset, 0, 0); - break; - case 3: - GlStateManager.translate(0, 0, -verticalOffset); -// GlStateManager.rotate(130, 0, 0, 1); - GlStateManager.rotate((float) (rotation / 100 + 284), 1, 0, 0); - GlStateManager.rotate(240, 0, 1, 0); - GlStateManager.rotate(-rotation / 7 + 180, 0, 0, 1); - GlStateManager.translate(2 * translationOffset, 0, 0); - break; - default: - //What are you doing, Way??? - } - - GlStateManager.rotate(primaryRotation, 0, 1, 0); - GlStateManager.rotate(secondaryRotation, 1, 0, 0); - GlStateManager.rotate(secondaryRotation * 0.41831f, 0, 0, 1); - - renderStandardCircle(tessellator, builder, size); - } - - private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) { - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - GlStateManager.color(1f, 1f, 1f, 1f); - builder.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex(); - builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex(); - builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex(); - builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex(); - tessellator.draw(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java deleted file mode 100644 index 1e292998..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ /dev/null @@ -1,127 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer { - public float offsetFromFace = -0.9f; - - public SingleAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")); - } - - public SingleAlchemyCircleRenderer(ResourceLocation arrayResource) { - super(arrayResource); - } - - @Override - public float getSizeModifier(float craftTime) { - return 1; - } - - @Override - public float getRotation(float craftTime) { - float offset = 2; - if (craftTime >= offset) { - float modifier = (craftTime - offset) * 2f; - return modifier * 1f; - } - return 0; - } - - @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / - // this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f; - float rot = getRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); - GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 0, 1); - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java deleted file mode 100644 index 80d58a79..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ /dev/null @@ -1,131 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer { - public StaticAlchemyCircleRenderer(ResourceLocation location) { - super(location); - } - - public StaticAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png")); - } - - @Override - public float getSizeModifier(float craftTime) { - return 1; - } - - @Override - public float getRotation(float craftTime) { - float offset = 50; - if (craftTime >= offset) { - float modifier = (craftTime - offset) * 5f; - return modifier * 1f; - } - return 0; - } - - @Override - public float getSecondaryRotation(float craftTime) { - return 0; - } - - @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - - float rot = getRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); - GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 1, 0); - - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java deleted file mode 100644 index 77a72a3f..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ /dev/null @@ -1,247 +0,0 @@ -package WayofTime.bloodmagic.client.render.alchemyArray; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; - -public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { - private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"); - private ResourceLocation middleArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"); - - public TurretAlchemyCircleRenderer(ResourceLocation location) { - super(location); - } - - public TurretAlchemyCircleRenderer() { - this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png")); - } - - @Override - public float getSizeModifier(float craftTime) { - return 1; - } - - @Override - public float getRotation(float craftTime) { - float offset = 50; - if (craftTime >= offset) { - float modifier = (craftTime - offset) * 5f; - return modifier * 1f; - } - return 0; - } - - @Override - public float getSecondaryRotation(float craftTime) { - return 0; - } - - @Override - public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { - if (!(tile instanceof TileAlchemyArray)) { - return; - } - - float f = 0; //Not working - - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - AlchemyArrayEffect effect = tileArray.arrayEffect; - double pitch = 0; - double yaw = 0; - int arrowTimer = -1; - if (effect instanceof AlchemyArrayEffectArrowTurret) { - AlchemyArrayEffectArrowTurret turretEffect = (AlchemyArrayEffectArrowTurret) effect; - pitch = (turretEffect.getPitch() - turretEffect.getLastPitch()) * f + turretEffect.getLastPitch(); - yaw = (turretEffect.getYaw() - turretEffect.getLastYaw()) * f + turretEffect.getLastYaw(); - arrowTimer = turretEffect.arrowTimer; - } - - double arrowAnimation = arrowTimer + f; - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - - float rot = getRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - - GlStateManager.translate(x, y, z); - - // Specify which face this "circle" is located on - Direction sideHit = Direction.UP; - Direction rotation = tileArray.getRotation(); - - GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace); - - switch (sideHit) { - case DOWN: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(-90.0f, 1, 0, 0); - break; - case EAST: - GlStateManager.rotate(-90.0f, 0, 1, 0); - GlStateManager.translate(0, 0, -1); - break; - case NORTH: - break; - case SOUTH: - GlStateManager.rotate(180.0f, 0, 1, 0); - GlStateManager.translate(-1, 0, -1); - break; - case UP: - GlStateManager.translate(0, 1, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - break; - case WEST: - GlStateManager.translate(0, 0, 1); - GlStateManager.rotate(90.0f, 0, 1, 0); - break; - } - - GlStateManager.pushMatrix(); - GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime)); -// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); - - GlStateManager.pushMatrix(); - - double topHeightOffset = getTopHeightOffset(craftTime, arrowAnimation); - double middleHeightOffset = getMiddleHeightOffset(craftTime, arrowAnimation); - double bottomHeightOffset = getBottomHeightOffset(craftTime, arrowAnimation); - - BlockPos pos = tileArray.getPos(); - World world = tileArray.getWorld(); - - GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1); - GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); - - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource); - GlStateManager.rotate(-rot, 0, 0, 1); - GlStateManager.translate(0, 0, -bottomHeightOffset); - renderStandardCircle(tessellator, wr, size / 2); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(middleArrayResource); - GlStateManager.rotate(0, 0, 0, 1); - GlStateManager.translate(0, 0, -middleHeightOffset); - renderStandardCircle(tessellator, wr, size); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - Minecraft.getInstance().renderEngine.bindTexture(arrayResource); - GlStateManager.rotate(rot, 0, 0, 1); - GlStateManager.translate(0, 0, -topHeightOffset); - renderStandardCircle(tessellator, wr, size); - GlStateManager.popMatrix(); - - GlStateManager.popMatrix(); - - // GlStateManager.depthMask(true); - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } - - public float getStartupPitchYawRatio(float craftTime) { - if (craftTime <= 80) { - return 0; - } else if (craftTime > 80 && craftTime < 140) { - return (craftTime - 80) / 60f; - } - - return 1; - } - - public double getBottomHeightOffset(double craftTime, double arrowAnimation) { - if (craftTime <= 40) { - return 0; - } else if (craftTime > 40 && craftTime < 100) { - return -0.4 * (craftTime - 40) / 60d; - } else if (craftTime >= 100 && craftTime < 140) { - return -0.4 * (140 - craftTime) / 40d; - } - - if (arrowAnimation > 0 && arrowAnimation < 45) { - return -0.4 * (arrowAnimation) / 45; - } else if (arrowAnimation >= 45 && arrowAnimation < 50) { - return -0.4 * (50 - arrowAnimation) / 5; - } - - return 0; - } - - public double getMiddleHeightOffset(double craftTime, double arrowAnimation) { - if (craftTime <= 40) { - return 0; - } else if (craftTime > 40 && craftTime < 100) { - return 0.1 * (craftTime - 40) / 60d; - } else if (craftTime >= 100 && craftTime < 140) { - return 0.1 * (140 - craftTime) / 40d; - } - - if (arrowAnimation > 0 && arrowAnimation < 45) { - return 0.1 * (arrowAnimation) / 45; - } else if (arrowAnimation >= 45 && arrowAnimation < 50) { - return 0.1 * (50 - arrowAnimation) / 5; - } - - return 0; - } - - public double getTopHeightOffset(double craftTime, double arrowAnimation) { - if (craftTime <= 40) { - return 0; - } else if (craftTime > 40 && craftTime < 100) { - return 0.4 * (craftTime - 40) / 60d; - } else if (craftTime >= 100 && craftTime < 140) { - return 0.4 * (140 - craftTime) / 40d; - } - - if (arrowAnimation > 0 && arrowAnimation < 45) { - return 0.4 * (arrowAnimation) / 45; - } else if (arrowAnimation >= 45 && arrowAnimation < 50) { - return 0.4 * (50 - arrowAnimation) / 5; - } - - return 0; - } - - private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size) { - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - GlStateManager.color(1f, 1f, 1f, 1f); - builder.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex(); - builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex(); - builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex(); - builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex(); - tessellator.draw(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index fecc0a15..83a9e972 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -1,26 +1,43 @@ -package WayofTime.bloodmagic.client.render.block; +package wayoftime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.tile.TileAlchemyArray; +import com.mojang.blaze3d.matrix.MatrixStack; + +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; +import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer; +import wayoftime.bloodmagic.core.registry.AlchemyArrayRendererRegistry; +import wayoftime.bloodmagic.tile.TileAlchemyArray; -public class RenderAlchemyArray extends TileEntityRenderer { - @Override - public void render(TileAlchemyArray alchemyArray, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - ItemStack inputStack = alchemyArray.getStackInSlot(0); - ItemStack catalystStack = alchemyArray.getStackInSlot(1); - int craftTime = alchemyArray.activeCounter; - AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack); - if (renderer == AlchemyArrayRecipeRegistry.DEFAULT_RENDERER) { - RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(inputStack, catalystStack); - if (recipe != null) - renderer = new AlchemyCircleRenderer(recipe.getCircleTexture()); - } +public class RenderAlchemyArray extends TileEntityRenderer +{ + public static final AlchemyArrayRenderer arrayRenderer = new AlchemyArrayRenderer(); - renderer.renderAt(alchemyArray, x, y, z, (craftTime > 0 ? craftTime + partialTicks : 0)); - } + public RenderAlchemyArray(TileEntityRendererDispatcher rendererDispatcherIn) + { + super(rendererDispatcherIn); + } + + @Override + public void render(TileAlchemyArray tileArray, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) + { + ItemStack inputStack = tileArray.getStackInSlot(0); + ItemStack catalystStack = tileArray.getStackInSlot(1); +// arrayRenderer.renderAt(tileArray, 0, 0, 0, tileArray.activeCounter +// + partialTicks, matrixStack, buffer, combinedLightIn, combinedOverlayIn); + + AlchemyArrayRenderer renderer = AlchemyArrayRendererRegistry.getRenderer(tileArray.getWorld(), inputStack, catalystStack); + if (renderer == null) + { + renderer = AlchemyArrayRendererRegistry.DEFAULT_RENDERER; + } + + renderer.renderAt(tileArray, 0, 0, 0, tileArray.activeCounter + + partialTicks, matrixStack, buffer, combinedLightIn, combinedOverlayIn); +// arrayRenderer.renderAt(tileArray, 0, 0, 0, 0, matrixStack, buffer, combinedLightIn, combinedOverlayIn); + +// if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE) +// renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); + } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 6a094932..e30c3cb1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -1,164 +1,281 @@ -package WayofTime.bloodmagic.client.render.block; +package wayoftime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.altar.AltarComponent; -import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.handler.event.ClientHandler; +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.block.RedstoneBlock; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.entity.LivingEntity; +import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.Fluid; +import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; +import wayoftime.bloodmagic.client.render.RenderResizableCuboid; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.tile.TileAltar; -public class RenderAltar extends TileEntityRenderer { - private static final float MIN_HEIGHT = 0.499f; - private static final float MAX_HEIGHT = 0.745f; +public class RenderAltar extends TileEntityRenderer +{ + public RenderAltar(TileEntityRendererDispatcher rendererDispatcherIn) + { + super(rendererDispatcherIn); + } - @Override - public void render(TileAltar tileAltar, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - ItemStack inputStack = tileAltar.getStackInSlot(0); + private static final float MIN_HEIGHT = 0.499f; + private static final float MAX_HEIGHT = 0.745f; - float level = ((float) tileAltar.getCurrentBlood()) / (float) tileAltar.getCapacity(); + @Override + public void render(TileAltar tileAltar, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) + { + RedstoneBlock d; + ItemStack inputStack = tileAltar.getStackInSlot(0); - GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, z); - if (level > 0) - this.renderFluid(level); - this.renderItem(inputStack); - GlStateManager.popMatrix(); + float level = ((float) tileAltar.getCurrentBlood()) / (float) tileAltar.getCapacity(); - if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE) - renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); - } + this.renderItem(inputStack, tileAltar, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - private void renderFluid(float fluidLevel) { - GlStateManager.pushMatrix(); + renderFluid(level, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - Fluid fluid = BlockLifeEssence.getLifeEssence(); - FluidStack fluidStack = new FluidStack(fluid, 1000); +// if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE) +// renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); + } - GlStateManager.translate(0.5, MIN_HEIGHT + (fluidLevel) * (MAX_HEIGHT - MIN_HEIGHT), 0.5); + private void renderFluid(float fluidLevel, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) + { + Fluid fluid = BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(); + FluidStack fluidStack = new FluidStack(fluid, 1000); - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); + FluidRenderData data = new FluidRenderData(fluidStack); + matrixStack.push(); - float size = 0.8f; + Model3D model = getFluidModel(fluidLevel, data); + IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); - TextureAtlasSprite fluidStillSprite = Minecraft.getInstance().getTextureMapBlocks().getTextureExtry(fluid.getStill().toString()); +// matrixStack.translate(data.loca, y, z); +// int glow = data.calculateGlowLight(0); + RenderResizableCuboid.INSTANCE.renderCube(model, matrixStack, buffer, data.getColorARGB(1), combinedLightIn, combinedOverlayIn); - int fluidColor = fluid.getColor(fluidStack); + matrixStack.pop(); + } - Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - setGLColorFromInt(fluidColor); + public float getRotation(float craftTime) + { + float offset = 2; + if (craftTime >= offset) + { + float modifier = (float) Math.pow(craftTime - offset, 1.5); + return modifier * 1f; + } + return 0; + } - double uMin = (double) fluidStillSprite.getMinU(); - double uMax = (double) fluidStillSprite.getMaxU(); - double vMin = (double) fluidStillSprite.getMinV(); - double vMax = (double) fluidStillSprite.getMaxV(); + public float getSecondaryRotation(float craftTime) + { + float offset = 50; + if (craftTime >= offset) + { + float modifier = (float) Math.pow(craftTime - offset, 1.7); + return modifier * 0.5f; + } + return 0; + } - wr.begin(7, DefaultVertexFormats.POSITION_TEX); -// wr.setBrightness(200); - wr.pos(size / 2f, 0, size / 2f).tex(uMax, vMax).endVertex(); - wr.pos(size / 2f, 0, -size / 2f).tex(uMax, vMin).endVertex(); - wr.pos(-size / 2f, 0, -size / 2f).tex(uMin, vMin).endVertex(); - wr.pos(-size / 2f, 0, size / 2f).tex(uMin, vMax).endVertex(); - tessellator.draw(); + public float getSizeModifier(float craftTime) + { + if (craftTime >= 150 && craftTime <= 250) + { + return (200 - craftTime) / 50f; + } + return 1.0f; + } - GlStateManager.popMatrix(); - } + public float getVerticalOffset(float craftTime) + { + if (craftTime >= 5) + { + if (craftTime <= 40) + { + return (float) ((-0.4) * Math.pow((craftTime - 5) / 35f, 3)); + } else + { + return -0.4f; + } + } + return 0; + } - private void renderItem(ItemStack stack) { - ItemRenderer itemRenderer = Minecraft.getInstance().getRenderItem(); - if (!stack.isEmpty()) { - GlStateManager.translate(0.5, 1, 0.5); - GlStateManager.pushMatrix(); - GlStateManager.disableLighting(); + private void renderItem(ItemStack stack, TileAltar tileAltar, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) + { + matrixStack.push(); + Minecraft mc = Minecraft.getInstance(); + ItemRenderer itemRenderer = mc.getItemRenderer(); + if (!stack.isEmpty()) + { + matrixStack.translate(0.5, 1, 0.5); + matrixStack.push(); - float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); + float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); - GlStateManager.rotate(rotation, 0.0F, 1.0F, 0); - GlStateManager.scale(0.75F, 0.75F, 0.75F); - GlStateManager.pushAttrib(); - RenderHelper.enableStandardItemLighting(); - itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.GROUND); - RenderHelper.disableStandardItemLighting(); - GlStateManager.popAttrib(); + matrixStack.rotate(Vector3f.YP.rotationDegrees(rotation)); + matrixStack.scale(0.5F, 0.5F, 0.5F); + RenderHelper.enableStandardItemLighting(); + IBakedModel ibakedmodel = itemRenderer.getItemModelWithOverrides(stack, tileAltar.getWorld(), (LivingEntity) null); + itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.FIXED, true, matrixStack, buffer, combinedLightIn, combinedOverlayIn, ibakedmodel); // renderItem + RenderHelper.disableStandardItemLighting(); - GlStateManager.enableLighting(); - GlStateManager.popMatrix(); - } - } + matrixStack.pop(); + } - private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) { - ClientPlayerEntity player = Minecraft.getInstance().player; - World world = player.world; + matrixStack.pop(); + } - if (tier == AltarTier.ONE) - return; + private Model3D getFluidModel(float fluidLevel, FluidRenderData data) + { + Model3D model = new BloodMagicRenderer.Model3D(); + model.setTexture(data.getTexture()); + model.minX = 0.1; + model.minY = MIN_HEIGHT; + model.minZ = 0.1; + model.maxX = 0.9; + model.maxY = (MAX_HEIGHT - MIN_HEIGHT) * fluidLevel + MIN_HEIGHT; + model.maxZ = 0.9; - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 0.6125F); + return model; + } - BlockPos vec3, vX; - vec3 = altar.getPos(); - double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks; - double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; - double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; + public class FluidRenderData + { + public BlockPos location; - for (AltarComponent altarComponent : tier.getAltarComponents()) { - vX = vec3.add(altarComponent.getOffset()); - double minX = vX.getX() - posX; - double minY = vX.getY() - posY; - double minZ = vX.getZ() - posZ; + public int height; + public int length; + public int width; - if (!world.getBlockState(vX).isOpaqueCube()) { - TextureAtlasSprite texture = null; + public final FluidStack fluidType; - switch (altarComponent.getComponent()) { - case BLOODRUNE: - texture = ClientHandler.blankBloodRune; - break; - case NOTAIR: - texture = ClientHandler.stoneBrick; - break; - case GLOWSTONE: - texture = ClientHandler.glowstone; - break; - case BLOODSTONE: - texture = ClientHandler.bloodStoneBrick; - break; - case BEACON: - texture = ClientHandler.beacon; - break; - case CRYSTAL: - texture = ClientHandler.crystalCluster; - break; - } + public FluidRenderData(FluidStack fluidType) + { + this.fluidType = fluidType; + } - RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); - } - } + public TextureAtlasSprite getTexture() + { + return Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(fluidType.getFluid().getAttributes().getStillTexture()); + } - GlStateManager.popMatrix(); - } + public boolean isGaseous() + { + return fluidType.getFluid().getAttributes().isGaseous(fluidType); + } - private static void setGLColorFromInt(int color) { - float red = (color >> 16 & 0xFF) / 255.0F; - float green = (color >> 8 & 0xFF) / 255.0F; - float blue = (color & 0xFF) / 255.0F; + public int getColorARGB(float scale) + { + return fluidType.getFluid().getAttributes().getColor(fluidType); + } - GlStateManager.color(red, green, blue, 1.0F); - } + public int calculateGlowLight(int light) + { + return light; + } + + @Override + public int hashCode() + { + int code = super.hashCode(); + code = 31 * code + fluidType.getFluid().getRegistryName().hashCode(); + if (fluidType.hasTag()) + { + code = 31 * code + fluidType.getTag().hashCode(); + } + return code; + } + + @Override + public boolean equals(Object data) + { + return super.equals(data) && data instanceof FluidRenderData + && fluidType.isFluidEqual(((FluidRenderData) data).fluidType); + } + } +// +// private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) +// { +// EntityPlayerSP player = Minecraft.getMinecraft().player; +// World world = player.world; +// +// if (tier == AltarTier.ONE) +// return; +// +// GlStateManager.pushMatrix(); +// GlStateManager.enableBlend(); +// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); +// GlStateManager.color(1F, 1F, 1F, 0.6125F); +// +// BlockPos vec3, vX; +// vec3 = altar.getPos(); +// double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks; +// double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; +// double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; +// +// for (AltarComponent altarComponent : tier.getAltarComponents()) +// { +// vX = vec3.add(altarComponent.getOffset()); +// double minX = vX.getX() - posX; +// double minY = vX.getY() - posY; +// double minZ = vX.getZ() - posZ; +// +// if (!world.getBlockState(vX).isOpaqueCube()) +// { +// TextureAtlasSprite texture = null; +// +// switch (altarComponent.getComponent()) +// { +// case BLOODRUNE: +// texture = ClientHandler.blankBloodRune; +// break; +// case NOTAIR: +// texture = ClientHandler.stoneBrick; +// break; +// case GLOWSTONE: +// texture = ClientHandler.glowstone; +// break; +// case BLOODSTONE: +// texture = ClientHandler.bloodStoneBrick; +// break; +// case BEACON: +// texture = ClientHandler.beacon; +// break; +// case CRYSTAL: +// texture = ClientHandler.crystalCluster; +// break; +// } +// +// RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); +// } +// } +// +// GlStateManager.popMatrix(); +// } + +// private static void setGLColorFromInt(int color) +// { +// float red = (color >> 16 & 0xFF) / 255.0F; +// float green = (color >> 8 & 0xFF) / 255.0F; +// float blue = (color & 0xFF) / 255.0F; +// +// GlStateManager.color(red, green, blue, 1.0F); +// } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java deleted file mode 100644 index 1c384246..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java +++ /dev/null @@ -1,109 +0,0 @@ -package WayofTime.bloodmagic.client.render.block; - -import WayofTime.bloodmagic.tile.TileBloodTank; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderBloodTank extends TileEntityRenderer { - private static final Minecraft mc = Minecraft.getInstance(); - - @Override - public void render(TileBloodTank bloodTank, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - if (bloodTank == null) - return; - - Fluid renderFluid = bloodTank.getClientRenderFluid(); - if (bloodTank.getRenderHeight() == 0 || renderFluid == null) - return; - - GlStateManager.pushMatrix(); - - bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - - renderFluid(bloodTank.getRenderHeight(), renderFluid, x, y, z); - - GlStateManager.popMatrix(); - } - - public void renderFluid(float maxHeight, Fluid renderFluid, double x, double y, double z) { - maxHeight = maxHeight * 0.575F; - - GlStateManager.translate(x, y, z); - RenderHelper.disableStandardItemLighting(); - - GlStateManager.disableRescaleNormal(); - GlStateManager.disableBlend(); - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder buffer = tessellator.getBuffer(); - - TextureAtlasSprite fluid = Minecraft.getInstance().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString()); - fluid = fluid == null ? mc.getTextureMapBlocks().getMissingSprite() : fluid; - - buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - - final int rgbaColor = renderFluid.getColor(); - final int rColor = rgbaColor >> 16 & 0xFF; - final int gColor = rgbaColor >> 8 & 0xFF; - final int bColor = rgbaColor & 0xFF; - final int aColor = rgbaColor >> 24 & 0xFF; - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(rColor, gColor, bColor, aColor); - - float u1 = fluid.getMinU(); - float v1 = fluid.getMinV(); - float u2 = fluid.getMaxU(); - float v2 = fluid.getMaxV(); - - if (maxHeight > 0) { - float texWidth = u2 - u1; - - // TOP - buffer.pos(0.25, maxHeight + 0.05, 0.25).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, maxHeight + 0.05, 0.75).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - - // NORTH - buffer.pos(0.75, maxHeight + 0.05, 0.25).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, 0, 0.25).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, 0, 0.25).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - - // EAST - buffer.pos(0.25, 0, 0.75).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, 0, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - - // SOUTH - buffer.pos(0.75, 0, 0.75).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, maxHeight + 0.05, 0.75).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.25, 0, 0.75).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - - // WEST - buffer.pos(0.75, maxHeight + 0.05, 0.75).tex(u1 + 0.75 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, 0, 0.75).tex(u1 + 0.75 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, 0, 0.25).tex(u1 + 0.25 * texWidth, v1).color(rColor, gColor, bColor, aColor).endVertex(); - buffer.pos(0.75, maxHeight + 0.05, 0.25).tex(u1 + 0.25 * texWidth, v1 + (maxHeight + 0.05) * texWidth).color(rColor, gColor, bColor, aColor).endVertex(); - } - - tessellator.draw(); - - RenderHelper.enableStandardItemLighting(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java deleted file mode 100644 index c69a2053..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.client.render.block; - -import WayofTime.bloodmagic.tile.TileDemonCrucible; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - -public class RenderDemonCrucible extends TileEntityRenderer { - public static Minecraft mc = Minecraft.getInstance(); - public static ResourceLocation resource = new ResourceLocation("bloodmagic", "textures/blocks/lifeEssenceStill.png"); - public static float minHeight = 0.6497f; - public static float maxHeight = 0.79f; - - @Override - public void render(TileDemonCrucible tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - ItemStack inputStack = tile.getStackInSlot(0); - - GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, z); - this.renderItem(tile.getWorld(), inputStack, partialTicks); - GlStateManager.popMatrix(); - } - - private void renderItem(World world, ItemStack stack, float partialTicks) { - ItemRenderer itemRenderer = mc.getRenderItem(); - if (!stack.isEmpty()) { - GlStateManager.translate(0.5, 1.5, 0.5); - ItemEntity entityitem = new ItemEntity(world, 0.0D, 0.0D, 0.0D, stack); - entityitem.getItem().setCount(1); - entityitem.hoverStart = 0.0F; - GlStateManager.pushMatrix(); - GlStateManager.disableLighting(); - - float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); - - GlStateManager.rotate(rotation, 0.0F, 1.0F, 0); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.pushAttrib(); - RenderHelper.enableStandardItemLighting(); - itemRenderer.renderItem(entityitem.getItem(), ItemCameraTransforms.TransformType.FIXED); - RenderHelper.disableStandardItemLighting(); - GlStateManager.popAttrib(); - - GlStateManager.enableLighting(); - GlStateManager.popMatrix(); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java deleted file mode 100644 index 331fc733..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java +++ /dev/null @@ -1,62 +0,0 @@ -package WayofTime.bloodmagic.client.render.block; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import org.lwjgl.opengl.GL11; - -public class RenderFakeBlocks { - public static void drawFakeBlock(TextureAtlasSprite texture, double minX, double minY, double minZ) { - if (texture == null) - return; - - double maxX = minX + 1; - double maxY = minY + 1; - double maxZ = minZ + 1; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - - float texMinU = texture.getMinU(); - float texMinV = texture.getMinV(); - float texMaxU = texture.getMaxU(); - float texMaxV = texture.getMaxV(); - - wr.pos(minX, minY, minZ).tex(texMinU, texMinV).endVertex(); - wr.pos(maxX, minY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); - - wr.pos(minX, maxY, maxZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(maxX, minY, minZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(minX, minY, minZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(minX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(maxX, maxY, minZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(minX, maxY, maxZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(minX, minY, minZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(minX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(minX, maxY, maxZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(maxX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(maxX, minY, minZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(maxX, maxY, maxZ).tex(texMinU, texMinV).endVertex(); - - tessellator.draw(); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java deleted file mode 100644 index 9fa0fccb..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ /dev/null @@ -1,110 +0,0 @@ -package WayofTime.bloodmagic.client.render.block; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.iface.INodeRenderer; -import WayofTime.bloodmagic.client.helper.ShaderHelper; -import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import org.lwjgl.opengl.GL11; - -import java.util.List; - -public class RenderItemRoutingNode extends TileEntityRenderer { - private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png"); - private static final Minecraft mc = Minecraft.getInstance(); - - @Override - public void render(TileRoutingNode tileNode, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - if (mc.player.getHeldItemMainhand().getItem() instanceof INodeRenderer || ConfigHandler.client.alwaysRenderRoutingLines) { - List connectionList = tileNode.getConnected(); - for (BlockPos wantedPos : connectionList) { - BlockPos offsetPos = wantedPos.subtract(tileNode.getPos()); - - //The beam renders towards the east by default. - - int xd = offsetPos.getX(); - int yd = offsetPos.getY(); - int zd = offsetPos.getZ(); - double distance = Math.sqrt(xd * xd + yd * yd + zd * zd); - double subLength = MathHelper.sqrt(xd * xd + zd * zd); - float rotYaw = -((float) (Math.atan2(zd, xd) * 180.0D / Math.PI)); - float rotPitch = ((float) (Math.atan2(yd, subLength) * 180.0D / Math.PI)); - - GlStateManager.pushMatrix(); - float f1 = 1.0f; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - this.bindTexture(beamTexture); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); - GlStateManager.disableLighting(); - GlStateManager.disableCull(); - float f2 = 0; - float f3 = -f2 * 0.2F - (float) MathHelper.floor(-f2 * 0.1F); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - double width = 0.06; - - float test = (tileNode.getWorld().getTotalWorldTime() + partialTicks) / 5f; - - double d18 = -width / 2; - double d19 = -width / 2; - double d20 = width / 2; - double d21 = -width / 2; - double d22 = -width / 2; - double d23 = width / 2; - double d24 = width / 2; - double d25 = width / 2; - double d26 = distance * f1; - double d27 = 0.0D; - double d28 = 1.0D; - double d29 = (double) (f3) + test; - double d30 = distance * f1 + d29; - - GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); - - GlStateManager.rotate(rotYaw, 0, 1, 0); - GlStateManager.rotate(rotPitch, 0, 0, 1); - -// tessellator.setBrightness(240); -// float s = 1F / 16F; - wr.begin(7, DefaultVertexFormats.POSITION_TEX); -// tessellator.setColorRGBA(255, 255, 255, 100); - wr.pos(d26, d18, d19).tex(d28, d30).endVertex(); - wr.pos(0, d18, d19).tex(d28, d29).endVertex(); - wr.pos(0, d20, d21).tex(d27, d29).endVertex(); - wr.pos(d26, d20, d21).tex(d27, d30).endVertex(); - wr.pos(d26, d24, d25).tex(d28, d30).endVertex(); - wr.pos(0, d24, d25).tex(d28, d29).endVertex(); - wr.pos(0, d22, d23).tex(d27, d29).endVertex(); - wr.pos(d26, d22, d23).tex(d27, d30).endVertex(); - wr.pos(d26, d20, d21).tex(d28, d30).endVertex(); - wr.pos(0, d20, d21).tex(d28, d29).endVertex(); - wr.pos(0, d24, d25).tex(d27, d29).endVertex(); - wr.pos(d26, d24, d25).tex(d27, d30).endVertex(); - wr.pos(d26, d22, d23).tex(d28, d30).endVertex(); - wr.pos(0, d22, d23).tex(d28, d29).endVertex(); - wr.pos(0, d18, d19).tex(d27, d29).endVertex(); - wr.pos(d26, d18, d19).tex(d27, d30).endVertex(); - - ShaderHelper.useShader(ShaderHelper.psiBar, (int) tileNode.getWorld().getTotalWorldTime()); - tessellator.draw(); - ShaderHelper.releaseShader(); - - GlStateManager.enableLighting(); - GlStateManager.enableTexture2D(); - GlStateManager.popMatrix(); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java deleted file mode 100644 index b4b6f66d..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderMimic.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.client.render.block; - -import WayofTime.bloodmagic.tile.TileMimic; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderMimic extends TileEntityRenderer { - public void render(TileMimic mimic, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - if (mimic.getStackInSlot(0) != null) { - TileEntity testTile = mimic.mimicedTile; - if (mimic != null) { - TileEntityRendererDispatcher.instance.render(testTile, x, y, z, partialTicks, destroyStage); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java deleted file mode 100644 index 272972c9..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/BloodLightRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class BloodLightRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderEntityBloodLight(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java deleted file mode 100644 index 59944834..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedChickenRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class CorruptedChickenRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderCorruptedChicken(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java deleted file mode 100644 index 35c041ba..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSheepRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class CorruptedSheepRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderCorruptedSheep(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java deleted file mode 100644 index 51ced8ba..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedSpiderRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class CorruptedSpiderRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderCorruptedSpider(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java deleted file mode 100644 index 3532162d..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/CorruptedZombieRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class CorruptedZombieRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderCorruptedZombie(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java deleted file mode 100644 index 50c24346..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/MeteorRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class MeteorRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderEntityMeteor(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java deleted file mode 100644 index 6fb47c9a..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/MimicRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntityMimic; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class MimicRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderEntityMimic(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java deleted file mode 100644 index 10c028e3..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; -import WayofTime.bloodmagic.client.render.model.ModelCorruptedChicken; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.client.renderer.entity.MobRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderCorruptedChicken extends MobRenderer { - private static final ResourceLocation CHICKEN_TEXTURES = new ResourceLocation("textures/entity/chicken.png"); - - public RenderCorruptedChicken(EntityRendererManager renderManagerIn) { - super(renderManagerIn, new ModelCorruptedChicken(0), 0.3f); - this.addLayer(new LayerWill<>(this, new ModelCorruptedChicken(1.1f))); - } - - @Override - protected ResourceLocation getEntityTexture(EntityCorruptedChicken entity) { - return CHICKEN_TEXTURES; - } - - @Override - protected float handleRotationFloat(EntityCorruptedChicken livingBase, float partialTicks) { - float f = livingBase.oFlap + (livingBase.wingRotation - livingBase.oFlap) * partialTicks; - float f1 = livingBase.oFlapSpeed + (livingBase.destPos - livingBase.oFlapSpeed) * partialTicks; - return (MathHelper.sin(f) + 1.0F) * f1; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java deleted file mode 100644 index 744c1e78..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.client.render.entity.layer.LayerAlchemyCircle; -import WayofTime.bloodmagic.client.render.entity.layer.LayerCorruptedSheepWool; -import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; -import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep; -import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep2; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.renderer.entity.MobRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderCorruptedSheep extends MobRenderer { - private static final ResourceLocation SHEARED_SHEEP_TEXTURES = new ResourceLocation("textures/entity/sheep/sheep.png"); - - public RenderCorruptedSheep(EntityRendererManager renderManagerIn) { - super(renderManagerIn, new ModelCorruptedSheep2(0), 0.7F); - this.addLayer(new LayerCorruptedSheepWool(this)); - this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep(1.1f))); - this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep2(1.1f))); - this.addLayer(new LayerAlchemyCircle<>()); - } - - @Override - protected ResourceLocation getEntityTexture(EntityCorruptedSheep entity) { - return SHEARED_SHEEP_TEXTURES; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java deleted file mode 100644 index e57c3094..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java +++ /dev/null @@ -1,35 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.client.render.entity.layer.LayerCorruptedSpiderEyes; -import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; -import WayofTime.bloodmagic.client.render.model.ModelCorruptedSpider; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; -import net.minecraft.client.model.ModelSpider; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.entity.MobRenderer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderCorruptedSpider extends MobRenderer { - private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png"); - - public RenderCorruptedSpider(EntityRendererManager renderManagerIn) { - super(renderManagerIn, new ModelSpider(), 1.0F); - this.addLayer(new LayerCorruptedSpiderEyes(this)); - this.addLayer(new LayerWill<>(this, new ModelCorruptedSpider(1.1f))); - } - - protected float getDeathMaxRotation(EntityCorruptedSpider entityLivingBaseIn) { - return 180.0F; - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called - * unless you call Render.bindEntityTexture. - */ - protected ResourceLocation getEntityTexture(EntityCorruptedSpider entity) { - return SPIDER_TEXTURES; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java deleted file mode 100644 index cc4bfdb3..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.client.render.entity.layer.LayerWill; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; -import net.minecraft.client.model.ModelZombie; -import net.minecraft.client.model.ModelZombieVillager; -import net.minecraft.client.renderer.entity.BipedRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.entity.layers.*; -import net.minecraft.client.renderer.entity.layers.BipedArmorLayer; -import net.minecraft.client.renderer.entity.layers.HeldItemLayer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderCorruptedZombie extends BipedRenderer { - private static final ResourceLocation ZOMBIE_TEXTURES = new ResourceLocation("textures/entity/zombie/zombie.png"); - private final ModelZombieVillager zombieVillagerModel; - - public RenderCorruptedZombie(EntityRendererManager renderManagerIn) { - super(renderManagerIn, new ModelZombie(), 0.5F); - LayerRenderer layerrenderer = this.layerRenderers.get(0); - this.zombieVillagerModel = new ModelZombieVillager(); - this.addLayer(new HeldItemLayer(this)); - BipedArmorLayer layerbipedarmor = new BipedArmorLayer(this) { - protected void initArmor() { - this.modelLeggings = new ModelZombie(0.5F, true); - this.modelArmor = new ModelZombie(1.0F, true); - } - }; - this.addLayer(layerbipedarmor); - - if (layerrenderer instanceof HeadLayer) { - layerRenderers.remove(layerrenderer); - this.addLayer(new HeadLayer(this.zombieVillagerModel.bipedHead)); - } - - this.layerRenderers.remove(layerbipedarmor); - this.addLayer(new LayerWill<>(this, new ModelZombie(1.2f, false))); - } - - /** - * Allows the render to do state modifications necessary before the model is - * rendered. - */ - protected void preRenderCallback(EntityCorruptedZombie entitylivingbaseIn, float partialTickTime) { - super.preRenderCallback(entitylivingbaseIn, partialTickTime); - } - - /** - * Renders the desired {@code T} type Entity. - */ - public void doRender(EntityCorruptedZombie entity, double x, double y, double z, float entityYaw, float partialTicks) { - super.doRender(entity, x, y, z, entityYaw, partialTicks); - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called - * unless you call Render.bindEntityTexture. - */ - protected ResourceLocation getEntityTexture(EntityCorruptedZombie entity) { - return ZOMBIE_TEXTURES; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java deleted file mode 100644 index 8a6c56f2..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ /dev/null @@ -1,38 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.util.ResourceLocation; - -public class RenderEntityBloodLight extends EntityRenderer { - private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem(); - - public RenderEntityBloodLight(EntityRendererManager renderManagerIn) { - super(renderManagerIn); - } - - public void doRender(EntityBloodLight entity, double x, double y, double z, float entityYaw, float partialTicks) { - GlStateManager.pushMatrix(); - GlStateManager.translate((float) x, (float) y, (float) z); - GlStateManager.enableRescaleNormal(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - this.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - this.renderItem.renderItem(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), ItemCameraTransforms.TransformType.GROUND); - GlStateManager.disableRescaleNormal(); - GlStateManager.popMatrix(); - super.doRender(entity, x, y, z, entityYaw, partialTicks); - } - - protected ResourceLocation getEntityTexture(EntityBloodLight entity) { - return AtlasTexture.LOCATION_BLOCKS_TEXTURE; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java deleted file mode 100644 index e9752d3d..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java +++ /dev/null @@ -1,41 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.render.model.ModelMeteor; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.util.ResourceLocation; - -public class RenderEntityMeteor extends EntityRenderer { - - private static final ResourceLocation TEXTURE = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png"); - private static final float SCALE = 1; - - public ModelBase model = new ModelMeteor(); - - public RenderEntityMeteor(EntityRendererManager renderManagerIn) { - super(renderManagerIn); - } - - @Override - public void doRender(EntityMeteor entity, double x, double y, double z, float entityYaw, float partialTicks) { - GlStateManager.pushMatrix(); - GlStateManager.translate((float) x, (float) y, (float) z); - GlStateManager.enableRescaleNormal(); - GlStateManager.scale(SCALE, SCALE, SCALE); - this.bindTexture(TEXTURE); - model.render(entity, 0, (float) x, (float) y, (float) z, entityYaw, partialTicks); - GlStateManager.disableRescaleNormal(); - GlStateManager.popMatrix(); - - super.doRender(entity, x, y, z, entityYaw, partialTicks); - } - - @Override - protected ResourceLocation getEntityTexture(EntityMeteor entity) { - return TEXTURE; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java deleted file mode 100644 index 9ef06886..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java +++ /dev/null @@ -1,117 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.client.render.model.ModelMimic; -import WayofTime.bloodmagic.entity.mob.EntityMimic; -import com.mojang.authlib.GameProfile; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.MobRenderer; -import net.minecraft.client.renderer.tileentity.SkullTileEntityRenderer; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Items; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.tileentity.SkullTileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StringUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderEntityMimic extends MobRenderer { - private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png"); - Minecraft minecraft = Minecraft.getInstance(); - - public RenderEntityMimic(EntityRendererManager renderManagerIn) { - super(renderManagerIn, new ModelMimic(), 1.0F); - } - - @Override - public void doRender(EntityMimic mimic, double x, double y, double z, float entityYaw, float partialTicks) { - super.doRender(mimic, x, y, z, entityYaw, partialTicks); - - GlStateManager.pushMatrix(); - if (mimic.getMimicItemStack() != null) { - GlStateManager.pushMatrix(); - - if (this.renderOutlines) { - GlStateManager.enableColorMaterial(); - GlStateManager.enableOutlineMode(this.getTeamColor(mimic)); - } - - GlStateManager.translate(x, y, z); - - ItemStack itemstack = mimic.getMimicItemStack(); - Item item = itemstack.getItem(); - Minecraft minecraft = Minecraft.getInstance(); - GlStateManager.pushMatrix(); - - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - - if (item == Items.SKULL) { - float f2 = 1.1875F; - GlStateManager.scale(1.1875F, -1.1875F, -1.1875F); - - GameProfile gameprofile = null; - - if (itemstack.hasTagCompound()) { - CompoundNBT nbttagcompound = itemstack.getTagCompound(); - - if (nbttagcompound.hasKey("SkullOwner", 10)) { - gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner")); - } else if (nbttagcompound.hasKey("SkullOwner", 8)) { - String s = nbttagcompound.getString("SkullOwner"); - - if (!StringUtils.isNullOrEmpty(s)) { - gameprofile = SkullTileEntity.updateGameProfile(new GameProfile(null, s)); - nbttagcompound.putTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile)); - } - } - } - - SkullTileEntityRenderer.instance.renderSkull(-0.5F, 0.0F, -0.5F, Direction.UP, 180.0F, itemstack.getMetadata(), gameprofile, -1, 0); - } else if (!(item instanceof ArmorItem) || ((ArmorItem) item).getEquipmentSlot() != EquipmentSlotType.HEAD) { - GlStateManager.translate(0, 0.5f, 0); - GlStateManager.rotate(-(mimic.prevRotationYawHead + partialTicks * (mimic.rotationYawHead - mimic.prevRotationYawHead)) - 180, 0, 1, 0); - - minecraft.getItemRenderer().renderItem(mimic, itemstack, ItemCameraTransforms.TransformType.HEAD); - } - - GlStateManager.popMatrix(); - - if (this.renderOutlines) { - GlStateManager.disableOutlineMode(); - GlStateManager.disableColorMaterial(); - } - - GlStateManager.popMatrix(); - super.doRender(mimic, x, y, z, entityYaw, partialTicks); - - } - GlStateManager.popMatrix(); - - if (!this.renderOutlines) { - this.renderLeash(mimic, x, y, z, entityYaw, partialTicks); - } - } - - @Override - protected float getDeathMaxRotation(EntityMimic mimic) { - return 180.0F; - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called - * unless you call Render.bindEntityTexture. - */ - @Override - protected ResourceLocation getEntityTexture(EntityMimic mimic) { - return SPIDER_TEXTURES; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java deleted file mode 100644 index 53721ceb..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java +++ /dev/null @@ -1,108 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderEntitySentientArrow extends EntityRenderer { - private static final ResourceLocation defaultTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow.png"); - private static final ResourceLocation corrosiveTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_corrosive.png"); - private static final ResourceLocation vengefulTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_vengeful.png"); - private static final ResourceLocation destructiveTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_destructive.png"); - private static final ResourceLocation steadfastTexture = new ResourceLocation("bloodmagic:textures/entities/soulArrow_steadfast.png"); - - public RenderEntitySentientArrow(EntityRendererManager renderManagerIn) { - super(renderManagerIn); - } - - public void doRender(EntitySentientArrow entity, double x, double y, double z, float entityYaw, float partialTicks) { - this.bindEntityTexture(entity); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - GlStateManager.pushMatrix(); - GlStateManager.translate((float) x, (float) y, (float) z); - GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTicks, 0.0F, 0.0F, 1.0F); - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder worldrenderer = tessellator.getBuffer(); - int i = 0; - float f = 0.0F; - float f1 = 0.5F; - float f2 = (float) (i * 10) / 32.0F; - float f3 = (float) (5 + i * 10) / 32.0F; - float f4 = 0.0F; - float f5 = 0.15625F; - float f6 = (float) (5 + i * 10) / 32.0F; - float f7 = (float) (10 + i * 10) / 32.0F; - float f8 = 0.05625F; - GlStateManager.enableRescaleNormal(); - float f9 = (float) entity.arrowShake - partialTicks; - - if (f9 > 0.0F) { - float f10 = -MathHelper.sin(f9 * 3.0F) * f9; - GlStateManager.rotate(f10, 0.0F, 0.0F, 1.0F); - } - - GlStateManager.rotate(45.0F, 1.0F, 0.0F, 0.0F); - GlStateManager.scale(f8, f8, f8); - GlStateManager.translate(-4.0F, 0.0F, 0.0F); - GL11.glNormal3f(f8, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); - worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double) f4, (double) f6).endVertex(); - worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double) f5, (double) f6).endVertex(); - worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double) f5, (double) f7).endVertex(); - worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double) f4, (double) f7).endVertex(); - tessellator.draw(); - GL11.glNormal3f(-f8, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); - worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double) f4, (double) f6).endVertex(); - worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double) f5, (double) f6).endVertex(); - worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double) f5, (double) f7).endVertex(); - worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double) f4, (double) f7).endVertex(); - tessellator.draw(); - - for (int j = 0; j < 4; ++j) { - GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glNormal3f(0.0F, 0.0F, f8); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); - worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double) f, (double) f2).endVertex(); - worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double) f1, (double) f2).endVertex(); - worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double) f1, (double) f3).endVertex(); - worldrenderer.pos(-8.0D, 2.0D, 0.0D).tex((double) f, (double) f3).endVertex(); - tessellator.draw(); - } - - GlStateManager.disableRescaleNormal(); - GlStateManager.popMatrix(); - super.doRender(entity, x, y, z, entityYaw, partialTicks); - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called - * unless you call Render.bindEntityTexture. - */ - protected ResourceLocation getEntityTexture(EntitySentientArrow entity) { - switch (entity.type) { - case CORROSIVE: - return corrosiveTexture; - case DESTRUCTIVE: - return destructiveTexture; - case STEADFAST: - return steadfastTexture; - case VENGEFUL: - return vengefulTexture; - case DEFAULT: - default: - return defaultTexture; - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java deleted file mode 100644 index 783d68d4..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -public class RenderEntitySoulSnare extends EntityRenderer { - private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem(); - - public RenderEntitySoulSnare(EntityRendererManager renderManagerIn) { - super(renderManagerIn); - } - - public void doRender(EntitySoulSnare entity, double x, double y, double z, float entityYaw, float partialTicks) { - GlStateManager.pushMatrix(); - GlStateManager.translate((float) x, (float) y, (float) z); - GlStateManager.enableRescaleNormal(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - this.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - this.renderItem.renderItem(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND); - GlStateManager.disableRescaleNormal(); - GlStateManager.popMatrix(); - super.doRender(entity, x, y, z, entityYaw, partialTicks); - } - - protected ResourceLocation getEntityTexture(EntitySoulSnare entity) { - return AtlasTexture.LOCATION_BLOCKS_TEXTURE; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java deleted file mode 100644 index 1275180d..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java +++ /dev/null @@ -1,110 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.BipedRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.entity.layers.*; -import net.minecraft.client.renderer.entity.layers.BipedArmorLayer; -import net.minecraft.client.renderer.entity.layers.HeadLayer; -import net.minecraft.client.renderer.entity.layers.HeldItemLayer; -import net.minecraft.item.UseAction; -import net.minecraft.item.ItemStack; -import net.minecraft.util.HandSide; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderSentientSpecter extends BipedRenderer { - public static final ResourceLocation texture = new ResourceLocation("bloodmagic", "textures/entities/specter.png"); - - public RenderSentientSpecter(EntityRendererManager renderManager) { - super(renderManager, new ModelBiped(0.0F), 0); - this.addLayer(new BipedArmorLayer(this)); - this.addLayer(new HeldItemLayer(this)); - this.addLayer(new ArrowLayer(this)); - this.addLayer(new HeadLayer(this.getMainModel().bipedHead)); - } - - public ModelBiped getMainModel() { - return (ModelBiped) super.getMainModel(); - } - - /** - * Renders the desired {@code T} type Entity. - */ - public void doRender(EntitySentientSpecter entity, double x, double y, double z, float entityYaw, float partialTicks) { - this.setModelVisibilities(entity); - super.doRender(entity, x, y, z, entityYaw, partialTicks); - } - - private void setModelVisibilities(EntitySentientSpecter clientPlayer) { - ModelBiped modelplayer = this.getMainModel(); - - ItemStack itemstack = clientPlayer.getHeldItemMainhand(); - ItemStack itemstack1 = clientPlayer.getHeldItemOffhand(); - modelplayer.setVisible(false); - - modelplayer.isSneak = clientPlayer.isSneaking(); - ModelBiped.ArmPose modelbiped$armpose = ModelBiped.ArmPose.EMPTY; - ModelBiped.ArmPose modelbiped$armpose1 = ModelBiped.ArmPose.EMPTY; - - if (!itemstack.isEmpty()) { - modelbiped$armpose = ModelBiped.ArmPose.ITEM; - - if (clientPlayer.getItemInUseCount() > 0) { - UseAction enumaction = itemstack.getItemUseAction(); - - if (enumaction == UseAction.BLOCK) { - modelbiped$armpose = ModelBiped.ArmPose.BLOCK; - } else if (enumaction == UseAction.BOW) { - modelbiped$armpose = ModelBiped.ArmPose.BOW_AND_ARROW; - } - } - } - - if (!itemstack1.isEmpty()) { - modelbiped$armpose1 = ModelBiped.ArmPose.ITEM; - - if (clientPlayer.getItemInUseCount() > 0) { - UseAction enumaction1 = itemstack1.getItemUseAction(); - - if (enumaction1 == UseAction.BLOCK) { - modelbiped$armpose1 = ModelBiped.ArmPose.BLOCK; - } - } - } - - if (clientPlayer.getPrimaryHand() == HandSide.RIGHT) { - modelplayer.rightArmPose = modelbiped$armpose; - modelplayer.leftArmPose = modelbiped$armpose1; - } else { - modelplayer.rightArmPose = modelbiped$armpose1; - modelplayer.leftArmPose = modelbiped$armpose; - } - - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called - * unless you call Render.bindEntityTexture. - */ - protected ResourceLocation getEntityTexture(EntitySentientSpecter entity) { - return texture; - } - - public void transformHeldFull3DItemLayer() { - GlStateManager.translate(0.0F, 0.1875F, 0.0F); - } - - /** - * Allows the render to do state modifications necessary before the model is - * rendered. - */ - protected void preRenderCallback(EntitySentientSpecter entitylivingbaseIn, float partialTickTime) { - float f = 0.9375F; - GlStateManager.scale(0.9375F, 0.9375F, 0.9375F); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java deleted file mode 100644 index 15003afb..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class SentientArrowRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderEntitySentientArrow(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java deleted file mode 100644 index 0048ddcb..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientSpecterRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class SentientSpecterRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderSentientSpecter(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java deleted file mode 100644 index cada7206..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity; - -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -public class SoulSnareRenderFactory implements IRenderFactory { - @Override - public EntityRenderer createRenderFor(EntityRendererManager manager) { - return new RenderEntitySoulSnare(manager); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java deleted file mode 100644 index d818f024..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java +++ /dev/null @@ -1,82 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity.layer; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class LayerAlchemyCircle implements LayerRenderer { - private static final ResourceLocation ARRAY_TEXTURE = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"); - - float rotationspeed = 10; - - public LayerAlchemyCircle() { - - } - - @Override - public void doRenderLayer(EntityCorruptedSheep demon, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if (demon.getCastTimer() <= 0) { - return; - } - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - GlStateManager.pushMatrix(); - float rot = this.rotationspeed * (partialTicks + demon.ticksExisted); - float secondaryRot = 0; - - float size = 3.0F; - - // Bind the texture to the circle - Minecraft.getInstance().renderEngine.bindTexture(ARRAY_TEXTURE); - - GlStateManager.disableCull(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); - GlStateManager.translate(0, 1.5, 0); - GlStateManager.rotate(90.0f, 1, 0, 0); - - GlStateManager.pushMatrix(); -// GlStateManager.translate(0, 0.5f, 0); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(rot, 0, 0, 1); - GlStateManager.rotate(secondaryRot, 1, 0, 0); - GlStateManager.rotate(secondaryRot * 0.45812f, 0, 0, 1); - double var31 = 0.0D; - double var33 = 1.0D; - double var35 = 0; - double var37 = 1; - - GlStateManager.color(1f, 1f, 1f, 1f); - wr.begin(7, DefaultVertexFormats.POSITION_TEX); - // wr.setBrightness(200); - wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); - wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); - wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); - wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); - tessellator.draw(); - - GlStateManager.popMatrix(); - - GlStateManager.disableBlend(); - GlStateManager.enableCull(); - - GlStateManager.popMatrix(); - GlStateManager.popMatrix(); - } - - @Override - public boolean shouldCombineTextures() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java deleted file mode 100644 index e95e027e..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSheepWool.java +++ /dev/null @@ -1,51 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity.layer; - -import WayofTime.bloodmagic.client.render.entity.RenderCorruptedSheep; -import WayofTime.bloodmagic.client.render.model.ModelCorruptedSheep; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.item.DyeColor; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class LayerCorruptedSheepWool implements LayerRenderer { - private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/sheep/sheep_fur.png"); - private final RenderCorruptedSheep sheepRenderer; - private final ModelCorruptedSheep sheepModel = new ModelCorruptedSheep(1); - - public LayerCorruptedSheepWool(RenderCorruptedSheep renderCorruptedSheep) { - this.sheepRenderer = renderCorruptedSheep; - } - - public void doRenderLayer(EntityCorruptedSheep entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if (!entitylivingbaseIn.getSheared() && !entitylivingbaseIn.isInvisible()) { - this.sheepRenderer.bindTexture(TEXTURE); - - if (entitylivingbaseIn.hasCustomName() && "jeb_".equals(entitylivingbaseIn.getCustomNameTag())) { - int i1 = 25; - int i = entitylivingbaseIn.ticksExisted / 25 + entitylivingbaseIn.getEntityId(); - int j = DyeColor.values().length; - int k = i % j; - int l = (i + 1) % j; - float f = ((float) (entitylivingbaseIn.ticksExisted % 25) + partialTicks) / 25.0F; - float[] afloat1 = EntityCorruptedSheep.getDyeRgb(DyeColor.byMetadata(k)); - float[] afloat2 = EntityCorruptedSheep.getDyeRgb(DyeColor.byMetadata(l)); - GlStateManager.color(afloat1[0] * (1.0F - f) + afloat2[0] * f, afloat1[1] * (1.0F - f) + afloat2[1] * f, afloat1[2] * (1.0F - f) + afloat2[2] * f); - } else { - float[] afloat = EntityCorruptedSheep.getDyeRgb(entitylivingbaseIn.getFleeceColor()); - GlStateManager.color(afloat[0], afloat[1], afloat[2]); - } - - this.sheepModel.setModelAttributes(this.sheepRenderer.getMainModel()); - this.sheepModel.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTicks); - this.sheepModel.render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); - } - } - - public boolean shouldCombineTextures() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java deleted file mode 100644 index 3d975c05..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java +++ /dev/null @@ -1,51 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity.layer; - -import WayofTime.bloodmagic.client.render.entity.RenderCorruptedSpider; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class LayerCorruptedSpiderEyes implements LayerRenderer { - private static final ResourceLocation SPIDER_EYES = new ResourceLocation("textures/entity/spider_eyes.png"); - private final RenderCorruptedSpider spiderRenderer; - - public LayerCorruptedSpiderEyes(RenderCorruptedSpider spiderRendererIn) { - this.spiderRenderer = spiderRendererIn; - } - - public void doRenderLayer(EntityCorruptedSpider entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - this.spiderRenderer.bindTexture(SPIDER_EYES); - GlStateManager.enableBlend(); - GlStateManager.disableAlpha(); - GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); - - if (entitylivingbaseIn.isInvisible()) { - GlStateManager.depthMask(false); - } else { - GlStateManager.depthMask(true); - } - - int i = 61680; - int j = i % 65536; - int k = i / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j, (float) k); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.spiderRenderer.getMainModel().render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); - i = entitylivingbaseIn.getBrightnessForRender(); - j = i % 65536; - k = i / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j, (float) k); - this.spiderRenderer.setLightmap(entitylivingbaseIn); - GlStateManager.disableBlend(); - GlStateManager.enableAlpha(); - } - - public boolean shouldCombineTextures() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java deleted file mode 100644 index cdb86db5..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerWill.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.client.render.entity.layer; - -import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.MobRenderer; -import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class LayerWill implements LayerRenderer { - private static final ResourceLocation RAW_TEXTURE = new ResourceLocation("bloodmagic", "textures/entities/overlay/overlay_raw.png"); - private final MobRenderer renderer; - private final ModelBase model; - - public LayerWill(MobRenderer rendererIn, ModelBase model) { - this.renderer = rendererIn; - this.model = model; - } - - @Override - public void doRenderLayer(EntityDemonBase demon, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { -// if (demon.getPowered()) - - if (demon.isInvisible()) { - return; //TODO: Make this also check if the demon wants the Will layer - } - - boolean flag = demon.isInvisible(); - GlStateManager.depthMask(!flag); - this.renderer.bindTexture(RAW_TEXTURE); - GlStateManager.matrixMode(5890); - GlStateManager.loadIdentity(); - float f = (float) demon.ticksExisted + partialTicks; - GlStateManager.translate(f * 0.01F, f * 0.01F, 0.0F); - GlStateManager.matrixMode(5888); - GlStateManager.enableBlend(); - float f1 = 0.5F; - GlStateManager.color(f1, f1, f1, 1.0F); - GlStateManager.disableLighting(); - GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); - this.model.setModelAttributes(this.renderer.getMainModel()); - this.model.render(demon, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); - GlStateManager.matrixMode(5890); - GlStateManager.loadIdentity(); - GlStateManager.matrixMode(5888); - GlStateManager.enableLighting(); - GlStateManager.disableBlend(); - GlStateManager.depthMask(flag); - } - - @Override - public boolean shouldCombineTextures() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java deleted file mode 100644 index 578cac99..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedChicken.java +++ /dev/null @@ -1,102 +0,0 @@ -package WayofTime.bloodmagic.client.render.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelCorruptedChicken extends ModelBase { - public ModelRenderer head; - public ModelRenderer body; - public ModelRenderer rightLeg; - public ModelRenderer leftLeg; - public ModelRenderer rightWing; - public ModelRenderer leftWing; - public ModelRenderer bill; - public ModelRenderer chin; - - public ModelCorruptedChicken(float scale) { - this.head = new ModelRenderer(this, 0, 0); - this.head.addBox(-2.0F, -6.0F, -2.0F, 4, 6, 3, scale); - this.head.setRotationPoint(0.0F, 15.0F, -4.0F); - this.bill = new ModelRenderer(this, 14, 0); - this.bill.addBox(-2.0F, -4.0F, -4.0F, 4, 2, 2, scale); - this.bill.setRotationPoint(0.0F, 15.0F, -4.0F); - this.chin = new ModelRenderer(this, 14, 4); - this.chin.addBox(-1.0F, -2.0F, -3.0F, 2, 2, 2, scale); - this.chin.setRotationPoint(0.0F, 15.0F, -4.0F); - this.body = new ModelRenderer(this, 0, 9); - this.body.addBox(-3.0F, -4.0F, -3.0F, 6, 8, 6, scale); - this.body.setRotationPoint(0.0F, 16.0F, 0.0F); - this.rightLeg = new ModelRenderer(this, 26, 0); - this.rightLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3, scale); - this.rightLeg.setRotationPoint(-2.0F, 19.0F, 1.0F); - this.leftLeg = new ModelRenderer(this, 26, 0); - this.leftLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3, scale); - this.leftLeg.setRotationPoint(1.0F, 19.0F, 1.0F); - this.rightWing = new ModelRenderer(this, 24, 13); - this.rightWing.addBox(0.0F, 0.0F, -3.0F, 1, 4, 6, scale); - this.rightWing.setRotationPoint(-4.0F, 13.0F, 0.0F); - this.leftWing = new ModelRenderer(this, 24, 13); - this.leftWing.addBox(-1.0F, 0.0F, -3.0F, 1, 4, 6, scale); - this.leftWing.setRotationPoint(4.0F, 13.0F, 0.0F); - } - - /** - * Sets the models various rotation angles then renders the model. - */ - public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - this.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn); - - if (this.isChild) { - GlStateManager.pushMatrix(); - GlStateManager.translate(0.0F, 5.0F * scale, 2.0F * scale); - this.head.render(scale); - this.bill.render(scale); - this.chin.render(scale); - GlStateManager.popMatrix(); - GlStateManager.pushMatrix(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(0.0F, 24.0F * scale, 0.0F); - this.body.render(scale); - this.rightLeg.render(scale); - this.leftLeg.render(scale); - this.rightWing.render(scale); - this.leftWing.render(scale); - GlStateManager.popMatrix(); - } else { - this.head.render(scale); - this.bill.render(scale); - this.chin.render(scale); - this.body.render(scale); - this.rightLeg.render(scale); - this.leftLeg.render(scale); - this.rightWing.render(scale); - this.leftWing.render(scale); - } - } - - /** - * Sets the model's various rotation angles. For bipeds, par1 and par2 are - * used for animating the movement of arms and legs, where par1 represents - * the time(so that arms and legs swing back and forth) and par2 represents - * how "far" arms and legs can swing at most. - */ - public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { - this.head.rotateAngleX = headPitch * 0.017453292F; - this.head.rotateAngleY = netHeadYaw * 0.017453292F; - this.bill.rotateAngleX = this.head.rotateAngleX; - this.bill.rotateAngleY = this.head.rotateAngleY; - this.chin.rotateAngleX = this.head.rotateAngleX; - this.chin.rotateAngleY = this.head.rotateAngleY; - this.body.rotateAngleX = ((float) Math.PI / 2F); - this.rightLeg.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount; - this.leftLeg.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F + (float) Math.PI) * 1.4F * limbSwingAmount; - this.rightWing.rotateAngleZ = ageInTicks; - this.leftWing.rotateAngleZ = -ageInTicks; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java deleted file mode 100644 index 14b72d05..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep.java +++ /dev/null @@ -1,59 +0,0 @@ -package WayofTime.bloodmagic.client.render.model; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.model.ModelQuadruped; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelCorruptedSheep extends ModelQuadruped { - private float headRotationAngleX; - - public ModelCorruptedSheep(float scale) { - super(12, scale); - this.head = new ModelRenderer(this, 0, 0); - this.head.addBox(-3.0F, -4.0F, -4.0F, 6, 6, 6, 0.6F * scale); - this.head.setRotationPoint(0.0F, 6.0F, -8.0F); - this.body = new ModelRenderer(this, 28, 8); - this.body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, 1.75F * scale); - this.body.setRotationPoint(0.0F, 5.0F, 2.0F); - float f = 0.5F; - this.leg1 = new ModelRenderer(this, 0, 16); - this.leg1.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale); - this.leg1.setRotationPoint(-3.0F, 12.0F, 7.0F); - this.leg2 = new ModelRenderer(this, 0, 16); - this.leg2.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale); - this.leg2.setRotationPoint(3.0F, 12.0F, 7.0F); - this.leg3 = new ModelRenderer(this, 0, 16); - this.leg3.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale); - this.leg3.setRotationPoint(-3.0F, 12.0F, -5.0F); - this.leg4 = new ModelRenderer(this, 0, 16); - this.leg4.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.5F * scale); - this.leg4.setRotationPoint(3.0F, 12.0F, -5.0F); - } - - /** - * Used for easily adding entity-dependent animations. The second and third - * float params here are the same second and third as in the - * setRotationAngles method. - */ - public void setLivingAnimations(LivingEntity entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) { - super.setLivingAnimations(entitylivingbaseIn, p_78086_2_, p_78086_3_, partialTickTime); - this.head.rotationPointY = 6.0F + ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationPointY(partialTickTime) * 9.0F; - this.headRotationAngleX = ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime); - } - - /** - * Sets the model's various rotation angles. For bipeds, par1 and par2 are - * used for animating the movement of arms and legs, where par1 represents - * the time(so that arms and legs swing back and forth) and par2 represents - * how "far" arms and legs can swing at most. - */ - public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { - super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); - this.head.rotateAngleX = this.headRotationAngleX; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java deleted file mode 100644 index d80c4205..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSheep2.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.client.render.model; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.client.model.ModelQuadruped; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelCorruptedSheep2 extends ModelQuadruped { - private float headRotationAngleX; - - public ModelCorruptedSheep2(float scale) { - super(12, scale); - this.head = new ModelRenderer(this, 0, 0); - this.head.addBox(-3.0F, -4.0F, -6.0F, 6, 6, 8, scale); - this.head.setRotationPoint(0.0F, 6.0F, -8.0F); - this.body = new ModelRenderer(this, 28, 8); - this.body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, scale); - this.body.setRotationPoint(0.0F, 5.0F, 2.0F); - } - - /** - * Used for easily adding entity-dependent animations. The second and third - * float params here are the same second and third as in the - * setRotationAngles method. - */ - public void setLivingAnimations(LivingEntity entitylivingbaseIn, float p_78086_2_, float p_78086_3_, float partialTickTime) { - super.setLivingAnimations(entitylivingbaseIn, p_78086_2_, p_78086_3_, partialTickTime); - this.head.rotationPointY = 6.0F + ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationPointY(partialTickTime) * 9.0F; - this.headRotationAngleX = ((EntityCorruptedSheep) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime); - } - - /** - * Sets the model's various rotation angles. For bipeds, par1 and par2 are - * used for animating the movement of arms and legs, where par1 represents - * the time(so that arms and legs swing back and forth) and par2 represents - * how "far" arms and legs can swing at most. - */ - public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { - super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); - this.head.rotateAngleX = this.headRotationAngleX; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java deleted file mode 100644 index 3f92fad3..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelCorruptedSpider.java +++ /dev/null @@ -1,166 +0,0 @@ -package WayofTime.bloodmagic.client.render.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelCorruptedSpider extends ModelBase { - /** - * The spider's head box - */ - public ModelRenderer spiderHead; - /** - * The spider's neck box - */ - public ModelRenderer spiderNeck; - /** - * The spider's body box - */ - public ModelRenderer spiderBody; - /** - * Spider's first leg - */ - public ModelRenderer spiderLeg1; - /** - * Spider's second leg - */ - public ModelRenderer spiderLeg2; - /** - * Spider's third leg - */ - public ModelRenderer spiderLeg3; - /** - * Spider's fourth leg - */ - public ModelRenderer spiderLeg4; - /** - * Spider's fifth leg - */ - public ModelRenderer spiderLeg5; - /** - * Spider's sixth leg - */ - public ModelRenderer spiderLeg6; - /** - * Spider's seventh leg - */ - public ModelRenderer spiderLeg7; - /** - * Spider's eight leg - */ - public ModelRenderer spiderLeg8; - - public ModelCorruptedSpider(float scale) { - float f = 0.0F; - int i = 15; - this.spiderHead = new ModelRenderer(this, 32, 4); - this.spiderHead.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 8, scale); - this.spiderHead.setRotationPoint(0.0F, 15.0F, -3.0F); - this.spiderNeck = new ModelRenderer(this, 0, 0); - this.spiderNeck.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6, scale); - this.spiderNeck.setRotationPoint(0.0F, 15.0F, 0.0F); - this.spiderBody = new ModelRenderer(this, 0, 12); - this.spiderBody.addBox(-5.0F, -4.0F, -6.0F, 10, 8, 12, scale); - this.spiderBody.setRotationPoint(0.0F, 15.0F, 9.0F); - this.spiderLeg1 = new ModelRenderer(this, 18, 0); - this.spiderLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg1.setRotationPoint(-4.0F, 15.0F, 2.0F); - this.spiderLeg2 = new ModelRenderer(this, 18, 0); - this.spiderLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg2.setRotationPoint(4.0F, 15.0F, 2.0F); - this.spiderLeg3 = new ModelRenderer(this, 18, 0); - this.spiderLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg3.setRotationPoint(-4.0F, 15.0F, 1.0F); - this.spiderLeg4 = new ModelRenderer(this, 18, 0); - this.spiderLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg4.setRotationPoint(4.0F, 15.0F, 1.0F); - this.spiderLeg5 = new ModelRenderer(this, 18, 0); - this.spiderLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg5.setRotationPoint(-4.0F, 15.0F, 0.0F); - this.spiderLeg6 = new ModelRenderer(this, 18, 0); - this.spiderLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg6.setRotationPoint(4.0F, 15.0F, 0.0F); - this.spiderLeg7 = new ModelRenderer(this, 18, 0); - this.spiderLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg7.setRotationPoint(-4.0F, 15.0F, -1.0F); - this.spiderLeg8 = new ModelRenderer(this, 18, 0); - this.spiderLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, scale); - this.spiderLeg8.setRotationPoint(4.0F, 15.0F, -1.0F); - } - - /** - * Sets the models various rotation angles then renders the model. - */ - public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - this.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn); - this.spiderHead.render(scale); - this.spiderNeck.render(scale); - this.spiderBody.render(scale); - this.spiderLeg1.render(scale); - this.spiderLeg2.render(scale); - this.spiderLeg3.render(scale); - this.spiderLeg4.render(scale); - this.spiderLeg5.render(scale); - this.spiderLeg6.render(scale); - this.spiderLeg7.render(scale); - this.spiderLeg8.render(scale); - } - - /** - * Sets the model's various rotation angles. For bipeds, par1 and par2 are - * used for animating the movement of arms and legs, where par1 represents - * the time(so that arms and legs swing back and forth) and par2 represents - * how "far" arms and legs can swing at most. - */ - public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { - this.spiderHead.rotateAngleY = netHeadYaw * 0.017453292F; - this.spiderHead.rotateAngleX = headPitch * 0.017453292F; - float f = ((float) Math.PI / 4F); - this.spiderLeg1.rotateAngleZ = -((float) Math.PI / 4F); - this.spiderLeg2.rotateAngleZ = ((float) Math.PI / 4F); - this.spiderLeg3.rotateAngleZ = -0.58119464F; - this.spiderLeg4.rotateAngleZ = 0.58119464F; - this.spiderLeg5.rotateAngleZ = -0.58119464F; - this.spiderLeg6.rotateAngleZ = 0.58119464F; - this.spiderLeg7.rotateAngleZ = -((float) Math.PI / 4F); - this.spiderLeg8.rotateAngleZ = ((float) Math.PI / 4F); - float f1 = -0.0F; - float f2 = 0.3926991F; - this.spiderLeg1.rotateAngleY = ((float) Math.PI / 4F); - this.spiderLeg2.rotateAngleY = -((float) Math.PI / 4F); - this.spiderLeg3.rotateAngleY = 0.3926991F; - this.spiderLeg4.rotateAngleY = -0.3926991F; - this.spiderLeg5.rotateAngleY = -0.3926991F; - this.spiderLeg6.rotateAngleY = 0.3926991F; - this.spiderLeg7.rotateAngleY = -((float) Math.PI / 4F); - this.spiderLeg8.rotateAngleY = ((float) Math.PI / 4F); - float f3 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + 0.0F) * 0.4F) * limbSwingAmount; - float f4 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + (float) Math.PI) * 0.4F) * limbSwingAmount; - float f5 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount; - float f6 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount; - float f7 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + 0.0F) * 0.4F) * limbSwingAmount; - float f8 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + (float) Math.PI) * 0.4F) * limbSwingAmount; - float f9 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount; - float f10 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount; - this.spiderLeg1.rotateAngleY += f3; - this.spiderLeg2.rotateAngleY += -f3; - this.spiderLeg3.rotateAngleY += f4; - this.spiderLeg4.rotateAngleY += -f4; - this.spiderLeg5.rotateAngleY += f5; - this.spiderLeg6.rotateAngleY += -f5; - this.spiderLeg7.rotateAngleY += f6; - this.spiderLeg8.rotateAngleY += -f6; - this.spiderLeg1.rotateAngleZ += f7; - this.spiderLeg2.rotateAngleZ += -f7; - this.spiderLeg3.rotateAngleZ += f8; - this.spiderLeg4.rotateAngleZ += -f8; - this.spiderLeg5.rotateAngleZ += f9; - this.spiderLeg6.rotateAngleZ += -f9; - this.spiderLeg7.rotateAngleZ += f10; - this.spiderLeg8.rotateAngleZ += -f10; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java deleted file mode 100644 index 8e75b6c8..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMeteor.java +++ /dev/null @@ -1,89 +0,0 @@ -package WayofTime.bloodmagic.client.render.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * This is a direct copy of the meteor model from 1.7.10. As such it probably - * needs to be... better. - */ -public class ModelMeteor extends ModelBase { - //fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - - public ModelMeteor() { - textureWidth = 64; - textureHeight = 64; - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(-8F, -8F, -8F, 16, 16, 16); - Shape1.setRotationPoint(0F, 0F, 0F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 32); - Shape2.addBox(3F, -10F, -1F, 12, 12, 12); - Shape2.setRotationPoint(0F, 0F, 0F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 32); - Shape3.addBox(0F, 0F, -10F, 12, 12, 12); - Shape3.setRotationPoint(0F, 0F, 0F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 32); - Shape4.addBox(1F, 2F, 2F, 12, 12, 12); - Shape4.setRotationPoint(0F, 0F, 0F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 32); - Shape5.addBox(-12F, -5F, 0F, 12, 12, 12); - Shape5.setRotationPoint(0F, 0F, 0F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 32); - Shape6.addBox(-13F, -2F, -11F, 12, 12, 12); - Shape6.setRotationPoint(0F, 0F, 0F); - Shape6.setTextureSize(64, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 0, 32); - Shape7.addBox(-6F, -14F, -9F, 12, 12, 12); - Shape7.setRotationPoint(0F, 0F, 0F); - Shape7.setTextureSize(64, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java deleted file mode 100644 index e06c1220..00000000 --- a/src/main/java/WayofTime/bloodmagic/client/render/model/ModelMimic.java +++ /dev/null @@ -1,136 +0,0 @@ -package WayofTime.bloodmagic.client.render.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelMimic extends ModelBase { - /** - * Spider's first leg - */ - public ModelRenderer mimicLeg1; - /** - * Spider's second leg - */ - public ModelRenderer mimicLeg2; - /** - * Spider's third leg - */ - public ModelRenderer mimicLeg3; - /** - * Spider's fourth leg - */ - public ModelRenderer mimicLeg4; - /** - * Spider's fifth leg - */ - public ModelRenderer mimicLeg5; - /** - * Spider's sixth leg - */ - public ModelRenderer mimicLeg6; - /** - * Spider's seventh leg - */ - public ModelRenderer mimicLeg7; - /** - * Spider's eight leg - */ - public ModelRenderer mimicLeg8; - - public ModelMimic() { - this.mimicLeg1 = new ModelRenderer(this, 18, 0); - this.mimicLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg1.setRotationPoint(-4.0F, 15.0F, 2.0F); - this.mimicLeg2 = new ModelRenderer(this, 18, 0); - this.mimicLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg2.setRotationPoint(4.0F, 15.0F, 2.0F); - this.mimicLeg3 = new ModelRenderer(this, 18, 0); - this.mimicLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg3.setRotationPoint(-4.0F, 15.0F, 1.0F); - this.mimicLeg4 = new ModelRenderer(this, 18, 0); - this.mimicLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg4.setRotationPoint(4.0F, 15.0F, 1.0F); - this.mimicLeg5 = new ModelRenderer(this, 18, 0); - this.mimicLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg5.setRotationPoint(-4.0F, 15.0F, 0.0F); - this.mimicLeg6 = new ModelRenderer(this, 18, 0); - this.mimicLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg6.setRotationPoint(4.0F, 15.0F, 0.0F); - this.mimicLeg7 = new ModelRenderer(this, 18, 0); - this.mimicLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg7.setRotationPoint(-4.0F, 15.0F, -1.0F); - this.mimicLeg8 = new ModelRenderer(this, 18, 0); - this.mimicLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, 0.0F); - this.mimicLeg8.setRotationPoint(4.0F, 15.0F, -1.0F); - } - - /** - * Sets the models various rotation angles then renders the model. - */ - public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - this.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn); - this.mimicLeg1.render(scale); - this.mimicLeg2.render(scale); - this.mimicLeg3.render(scale); - this.mimicLeg4.render(scale); - this.mimicLeg5.render(scale); - this.mimicLeg6.render(scale); - this.mimicLeg7.render(scale); - this.mimicLeg8.render(scale); - } - - /** - * Sets the model's various rotation angles. For bipeds, par1 and par2 are - * used for animating the movement of arms and legs, where par1 represents - * the time(so that arms and legs swing back and forth) and par2 represents - * how "far" arms and legs can swing at most. - */ - public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { - this.mimicLeg1.rotateAngleZ = -((float) Math.PI / 4F); - this.mimicLeg2.rotateAngleZ = ((float) Math.PI / 4F); - this.mimicLeg3.rotateAngleZ = -0.58119464F; - this.mimicLeg4.rotateAngleZ = 0.58119464F; - this.mimicLeg5.rotateAngleZ = -0.58119464F; - this.mimicLeg6.rotateAngleZ = 0.58119464F; - this.mimicLeg7.rotateAngleZ = -((float) Math.PI / 4F); - this.mimicLeg8.rotateAngleZ = ((float) Math.PI / 4F); - - this.mimicLeg1.rotateAngleY = ((float) Math.PI / 4F); - this.mimicLeg2.rotateAngleY = -((float) Math.PI / 4F); - this.mimicLeg3.rotateAngleY = 0.3926991F; - this.mimicLeg4.rotateAngleY = -0.3926991F; - this.mimicLeg5.rotateAngleY = -0.3926991F; - this.mimicLeg6.rotateAngleY = 0.3926991F; - this.mimicLeg7.rotateAngleY = -((float) Math.PI / 4F); - this.mimicLeg8.rotateAngleY = ((float) Math.PI / 4F); - float f3 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + 0.0F) * 0.4F) * limbSwingAmount; - float f4 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + (float) Math.PI) * 0.4F) * limbSwingAmount; - float f5 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount; - float f6 = -(MathHelper.cos(limbSwing * 0.6662F * 2.0F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount; - float f7 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + 0.0F) * 0.4F) * limbSwingAmount; - float f8 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + (float) Math.PI) * 0.4F) * limbSwingAmount; - float f9 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI / 2F)) * 0.4F) * limbSwingAmount; - float f10 = Math.abs(MathHelper.sin(limbSwing * 0.6662F + ((float) Math.PI * 3F / 2F)) * 0.4F) * limbSwingAmount; - this.mimicLeg1.rotateAngleY += f3; - this.mimicLeg2.rotateAngleY += -f3; - this.mimicLeg3.rotateAngleY += f4; - this.mimicLeg4.rotateAngleY += -f4; - this.mimicLeg5.rotateAngleY += f5; - this.mimicLeg6.rotateAngleY += -f5; - this.mimicLeg7.rotateAngleY += f6; - this.mimicLeg8.rotateAngleY += -f6; - this.mimicLeg1.rotateAngleZ += f7; - this.mimicLeg2.rotateAngleZ += -f7; - this.mimicLeg3.rotateAngleZ += f8; - this.mimicLeg4.rotateAngleZ += -f8; - this.mimicLeg5.rotateAngleZ += f9; - this.mimicLeg6.rotateAngleZ += -f9; - this.mimicLeg7.rotateAngleZ += f10; - this.mimicLeg8.rotateAngleZ += -f10; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java b/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java deleted file mode 100644 index 5c143101..00000000 --- a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.command; - -import WayofTime.bloodmagic.command.sub.*; -import net.minecraft.command.ICommandSender; -import net.minecraftforge.server.command.CommandTreeBase; -import net.minecraftforge.server.command.CommandTreeHelp; - -public class CommandBloodMagic extends CommandTreeBase { - - public CommandBloodMagic() { - addSubcommand(new SubCommandBind()); - addSubcommand(new SubCommandNetwork()); - addSubcommand(new SubCommandOrb()); - addSubcommand(new SubCommandRitual()); - addSubcommand(new SubCommandTeleposer()); - addSubcommand(new CommandTreeHelp(this)); - } - - @Override - public String getName() { - return "bloodmagic"; - } - - @Override - public String getUsage(ICommandSender sender) { - return "/bloodmagic help"; - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - -} diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java deleted file mode 100644 index 7eedd178..00000000 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ /dev/null @@ -1,91 +0,0 @@ -package WayofTime.bloodmagic.command.sub; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.BindableHelper; -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.server.command.CommandTreeBase; -import net.minecraftforge.server.command.CommandTreeHelp; - -public class SubCommandBind extends CommandTreeBase { - public ServerPlayerEntity player; - - public SubCommandBind() { - addSubcommand(new CommandTreeHelp(this)); - } - - public String getInfo() { - return player.getName(); - } - - @Override - public String getName() { - return "bind"; - } - - @Override - public String getUsage(ICommandSender commandSender) { - return "commands.bloodmagic.bind.usage"; - } - - public String getHelp() { - return "commands.bloodmagic.bind.help"; - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - - @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TranslationTextComponent(getHelp())); - return; - } - if (sender.getEntityWorld().isRemote) - return; - ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); - ItemStack held = player.getHeldItemMainhand(); - boolean bind = true; - if (held.getItem() instanceof IBindable) { - Binding binding = ((IBindable) held.getItem()).getBinding(held); - if (binding != null) - bind = false; - if (args.length < 2) - if (args.length == 1) - if (isBoolean(args[0])) - bind = Boolean.parseBoolean(args[0]); - else - player = getPlayer(server, sender, args[0]); - if (bind) { - if (binding.getOwnerName().equals(player.getName())) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.ownerEqualsTarget")); - return; - } - binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); - BindableHelper.applyBinding(held, binding); - this.player = player; - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.success", getInfo())); - } else { - if (binding == null) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBound")); - } - held.getTagCompound().removeTag("binding"); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.remove.success")); - } - } else - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBindable")); - - - } - - private boolean isBoolean(String string) { - return string.equalsIgnoreCase("true") || string.equalsIgnoreCase("false"); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java deleted file mode 100644 index 230dbf08..00000000 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ /dev/null @@ -1,228 +0,0 @@ -package WayofTime.bloodmagic.command.sub; - -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.server.command.CommandTreeBase; -import net.minecraftforge.server.command.CommandTreeHelp; - -import java.util.List; - -public class SubCommandNetwork extends CommandTreeBase { - - public SubCommandNetwork() { - addSubcommand(new Syphon()); - addSubcommand(new Add()); - addSubcommand(new Set()); - addSubcommand(new Get()); - addSubcommand(new Cap()); - addSubcommand(new Fill()); - addSubcommand(new Tickets()); - addSubcommand(new CommandTreeHelp(this)); - } - - @Override - public String getName() { - return "network"; - } - - @Override - public String getUsage(ICommandSender commandSender) { - return "commands.bloodmagic.network.usage"; - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - - abstract class NetworkCommand extends CommandTreeBase { - - public ServerPlayerEntity player; - public SoulNetwork network; - public String uuid; - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - - public Integer commandHelperAmount(MinecraftServer server, ICommandSender sender, String[] args) { - int amount; - if (args.length == 0) - amount = 1000; - else if (Utils.isInteger(args[0])) - amount = Integer.parseInt(args[0]); - else if (args.length > 1 && Utils.isInteger(args[1])) - amount = Integer.parseInt(args[1]); - else { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid")); - sender.sendMessage(new TranslationTextComponent(this.getUsage(sender))); - return null; - } - if (amount < 0) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative")); - return null; - } - return amount; - } - - @Override - public String getUsage(ICommandSender sender) { - return "commands.bloodmagic.network." + getName() + ".usage"; - } - - public String getHelp() { - return "commands.bloodmagic.network." + getName() + ".help"; - } - - public String getInfo() { - return ""; - } - - @Override - public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TranslationTextComponent(getHelp())); - return; - } - if (!getName().equals("get")) { - this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); - this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - this.network = NetworkHelper.getSoulNetwork(uuid); - } - subExecute(server, sender, args); - } - - protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException; - } - - class Syphon extends NetworkCommand { - @Override - public String getName() { - return "syphon"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer amount = commandHelperAmount(server, sender, args); - if (amount == null) - return; - int currE = network.getCurrentEssence(); - if (amount > currE) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.syphon.amountTooHigh")); - if (currE == 0) - return; - amount = Math.min(amount, currE); - } - network.syphonAndDamage(player, SoulTicket.command(sender, this.getName(), amount)); - int newE = network.getCurrentEssence(); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.syphon.success", currE - newE, player.getDisplayName().getFormattedText())); - } - } - - class Add extends NetworkCommand { - @Override - public String getName() { - return "add"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer amount = commandHelperAmount(server, sender, args); - if (amount == null) - return; - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.add.success", network.add(SoulTicket.command(sender, getName(), amount), NetworkHelper.getMaximumForTier(network.getOrbTier())), player.getDisplayName().getFormattedText())); - } - } - - class Set extends NetworkCommand { - @Override - public String getName() { - return "set"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer amount = commandHelperAmount(server, sender, args); - if (amount == null) - return; - network.setCurrentEssence(amount); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount)); - } - } - - class Get extends NetworkCommand { - - @Override - public String getName() { - return "get"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - this.player = args.length < 1 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); - this.uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - this.network = NetworkHelper.getSoulNetwork(uuid); - sender.sendMessage(new StringTextComponent((player != sender ? player.getDisplayName().getFormattedText() + " " : "" + new TranslationTextComponent("tooltip.bloodmagic.sigil.divination.currentEssence", network.getCurrentEssence()).getFormattedText()))); - } - } - - class Cap extends NetworkCommand { - - @Override - public String getName() { - return "cap"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - network.setCurrentEssence(NetworkHelper.getMaximumForTier(network.getOrbTier())); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText())); - } - } - - class Fill extends NetworkCommand { - - @Override - public String getInfo() { - return "" + Integer.MAX_VALUE; - } - - @Override - public String getName() { - return "fill"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - network.setCurrentEssence(Integer.MAX_VALUE); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText())); - } - } - - class Tickets extends NetworkCommand { - - @Override - public String getName() { - return "tickethistory"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - List tickethistory = network.getTicketHistory(); - if (!tickethistory.isEmpty()) - for (SoulTicket i : network.getTicketHistory()) - sender.sendMessage(i.getDescription()); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success", player.getDisplayName().getFormattedText())); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java deleted file mode 100644 index 10b01fb0..00000000 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ /dev/null @@ -1,127 +0,0 @@ -package WayofTime.bloodmagic.command.sub; - -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.server.command.CommandTreeBase; -import net.minecraftforge.server.command.CommandTreeHelp; - -public class SubCommandOrb extends CommandTreeBase { - public SubCommandOrb() { - addSubcommand(new Get()); - addSubcommand(new Set()); - addSubcommand(new CommandTreeHelp(this)); - } - - @Override - public String getName() { - return "orb"; - } - - @Override - public String getUsage(ICommandSender commandSender) { - return "commands.bloodmagic.orb.usage"; - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - - abstract class OrbCommand extends CommandTreeBase { - - public ServerPlayerEntity player; - public String uuid; - public SoulNetwork network; - public Object info; - - @Override - public String getUsage(ICommandSender sender) { - return "commands.bloodmagic.orb." + getName() + ".usage"; - } - - public String getHelp() { - return "commands.bloodmagic.orb." + getName() + ".help"; - } - - public String getInfo() { - return ""; - } - - @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) { - sender.sendMessage(new TranslationTextComponent(getHelp())); - return; - } - player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); - uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - network = NetworkHelper.getSoulNetwork(uuid); - - subExecute(server, sender, args); - } - - protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException; - } - - class Get extends OrbCommand { - - @Override - public String getName() { - return "get"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - super.execute(server, sender, args); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.orb.currenttier", network.getOrbTier())); - } - } - - class Set extends OrbCommand { - //TODO: check whether maxTier check works with custom Blood Orbs - int maxTier = OrbRegistry.getTierMap().size() - 1; - - @Override - public String getInfo() { - return "" + maxTier; - } - - @Override - public String getName() { - return "set"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - super.execute(server, sender, args); - - int targetTier; - if (args.length == 1 && Utils.isInteger(args[0])) - targetTier = Integer.parseInt(args[0]); - else if (args.length == 2 && Utils.isInteger(args[1])) - targetTier = Integer.parseInt(args[1]); - else { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid")); - sender.sendMessage(new TranslationTextComponent(this.getUsage(sender))); - return; - } - if (targetTier < 0) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative")); - return; - } else if (targetTier > maxTier) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.orb.error.tierTooHigh", getInfo())); - return; - } - network.setOrbTier(targetTier); - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java deleted file mode 100644 index e531cf29..00000000 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java +++ /dev/null @@ -1,150 +0,0 @@ -package WayofTime.bloodmagic.command.sub; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.helper.RitualHelper; -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.server.command.CommandTreeBase; -import net.minecraftforge.server.command.CommandTreeHelp; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -public class SubCommandRitual extends CommandTreeBase { - public SubCommandRitual() { - addSubcommand(new RitualCreate()); - addSubcommand(new RitualRepair()); - addSubcommand(new CommandTreeHelp(this)); - } - - @Override - public String getName() { - return "ritual"; - } - - @Override - public String getUsage(ICommandSender sender) { - return null; - } - - public TileMasterRitualStone getMRS(ICommandSender sender) { - BlockPos pos = sender.getPosition().down(); - World world = sender.getEntityWorld(); - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMasterRitualStone) { - return (TileMasterRitualStone) tile; - } - return null; - } - - class RitualCreate extends CommandTreeBase { - public List ritualList = new ArrayList<>(); - - public RitualCreate() { - for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { - ritualList.add(BloodMagic.RITUAL_MANAGER.getId(ritual)); - } - } - - @Override - public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) { - return ritualList; - } - - @Override - public String getName() { - return "create"; - } - - @Override - public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException { - if (args.length == 0) { - sender.sendMessage(new TranslationTextComponent("commands.blooodmagic.ritual.create.noRitual")); - return; - } else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) { - sender.sendMessage(new TranslationTextComponent(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getTranslationKey() + ".info")); - return; - } - ServerPlayerEntity player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]); - boolean safe = false; - if (args.length > 1 && args.length < 4) { - int k = args.length - 1; - if (args[k].equals("true") || args[k].equals("false")) { - safe = Boolean.parseBoolean(args[k]); - } else if (args[1].equals("safe")) - safe = true; - else - player = getPlayer(server, sender, args[1]); - } - - BlockPos pos = player.getPosition().down(); - World world = player.getEntityWorld(); - Direction direction = player.getHorizontalFacing(); - - if (RitualHelper.createRitual(world, pos, direction, BloodMagic.RITUAL_MANAGER.getRitual(args[0]), safe)) - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - else if (!safe) - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); - else - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritaul.create.error.unsafe")); - - } - - @Override - public String getUsage(ICommandSender sender) { - return "commands.bloodmagic.ritual.create.help"; - } - } - - class RitualRepair extends CommandTreeBase { - - @Override - public String getName() { - return "repair"; - } - - @Override - public String getUsage(ICommandSender sender) { - return "commands.bloodmagic.ritual.repair.usage"; - } - - @Override - public void execute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException { - ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); - TileMasterRitualStone tile = getMRS(player); - boolean safe = false; - if (args.length > 0 && args.length < 3) { - int k = args.length - 1; - if (args[k].equals("true") || args[k].equals("false")) { - safe = Boolean.parseBoolean(args[k]); - } else if (args[0].equals("safe")) - safe = true; - } - if (tile != null) - if (RitualHelper.repairRitualFromRuins(tile, safe)) - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - else if (!safe) - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.create.error.outOfWorldBoundaries")); - else - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritaul.create.error.unsafe")); - else - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.ritual.error.noMRS")); - } - - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java deleted file mode 100644 index 3187aeeb..00000000 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandTeleposer.java +++ /dev/null @@ -1,329 +0,0 @@ -package WayofTime.bloodmagic.command.sub; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.teleport.Teleports; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.server.command.CommandTreeBase; -import net.minecraftforge.server.command.CommandTreeHelp; - -import java.util.HashSet; -import java.util.Set; - -public class SubCommandTeleposer extends CommandTreeBase { - public static final Set teleposerSet = new HashSet<>(); //contains "valid" teleposers (teleposers with focus), teleposers check themselves every 100 ticks. - public static TileTeleposer[] teleposerArray; - - public SubCommandTeleposer() { - addSubcommand(new OutputTeleposerList()); - addSubcommand(new TeleportToTeleposer()); - addSubcommand(new TeleportToTeleposerFocus()); - addSubcommand(new RemoveTeleposer()); - addSubcommand(new RecursiveRemoveTeleposer()); - addSubcommand(new RemoveAllOfPlayer()); - addSubcommand(new CommandTreeHelp(this)); - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - - - @Override - public String getName() { - return "teleposer"; - } - - @Override - public String getUsage(ICommandSender sender) { - return "commands.bloodmagic.teleposer.usage"; - } - - abstract class TeleposeHelper extends CommandTreeBase { - public PlayerEntity player; - - @Override - public String getUsage(ICommandSender sender) { - return "commands.bloodmagic.teleposer." + getName() + ".usage"; - } - - public String getHelp() { - return "commands.bloodmagic.teleposer." + getName() + ".help"; - } - - public String getInfo() { - return ""; - } - - @Override - public int getRequiredPermissionLevel() { - return 2; - } - - public TileTeleposer[] cleanUpAndCreateArrayFromTeleposerList(PlayerEntity player) { - if (player == null) - for (TileTeleposer i : teleposerSet) { - if (i == null || i.isInvalid() || i.isEmpty()) { - teleposerSet.remove(i); - } - } - else { - for (TileTeleposer i : teleposerSet) { - if (i == null || i.isInvalid() || i.isEmpty()) { - teleposerSet.remove(i); - continue; - } - ItemStack stack = i.getStackInSlot(0); - ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); - Binding binding = focus.getBinding(stack); - if (binding != null && !binding.getOwnerName().equals(player.getName())) { - teleposerSet.remove(i); - } - } - } - teleposerArray = teleposerSet.toArray(new TileTeleposer[0]); - return teleposerArray; - - } - - public void sendOwnedTeleposerList(ICommandSender sender, PlayerEntity player) { - teleposerArray = cleanUpAndCreateArrayFromTeleposerList(player); - for (int i = 0; i < teleposerArray.length; i++) { - ItemStack stack = teleposerArray[i].getStackInSlot(0); - ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); - Binding binding = focus.getBinding(stack); - if (binding != null) { - String name = binding.getOwnerName(); - if (player != null) { - if (name.equals(player.getName())) - sender.sendMessage(new StringTextComponent(i + new TranslationTextComponent("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); - } else - sender.sendMessage(new StringTextComponent(i + new TranslationTextComponent("commands.bloodmagic.teleposer.anddimension").getFormattedText() + teleposerArray[i].getWorld().provider.getDimension() + " " + teleposerArray[i].getPos() + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.focusanddim").getFormattedText() + " " + focus.getWorld(stack).provider.getDimension() + " " + focus.getBlockPos(stack) + " " + new TranslationTextComponent("commands.bloodmagic.teleposer.owner").getFormattedText() + " " + name)); - } - } - } - - public Integer getIDFromArgs(ICommandSender sender, String[] args) { - int teleposerID; - if (args.length == 0) { - return null; - } - - if (Utils.isInteger(args[0])) - teleposerID = Integer.parseInt(args[0]); - else if (args.length > 1 && Utils.isInteger(args[1])) - teleposerID = Integer.parseInt(args[1]); - else { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.arg.invalid")); - sender.sendMessage(new TranslationTextComponent(this.getUsage(sender))); - return null; - } - if (teleposerID < 0) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.negative")); - return null; - } - return teleposerID; - } - - @Override - public final void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - if (args.length == 1 && args[0].equals("?") || args[0].equals("help")) { - sender.sendMessage(new TranslationTextComponent(getHelp())); - return; - } - if (!(getName().equals("rmrf") || getName().equals("remove"))) { - this.player = args.length < 2 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[0]); - } - subExecute(server, sender, args); - } - - protected abstract void subExecute(MinecraftServer server, ICommandSender sender, String... args) throws CommandException; - } - - class OutputTeleposerList extends TeleposeHelper { - - @Override - public String getName() { - return "list"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - sendOwnedTeleposerList(sender, player); - } - } - - class TeleportToTeleposer extends TeleposeHelper { - - @Override - public String getName() { - return "teleport"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer teleposerID = getIDFromArgs(sender, args); - if (teleposerID == null) - sendOwnedTeleposerList(sender, null); - else if (!sender.getEntityWorld().isRemote) { - if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.error.outofbounds")); - return; - } - TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! - BlockPos brunhildePos = brunhilde.getPos(); - World brunhildeWorld = brunhilde.getWorld(); - if (player.getEntityWorld().equals(brunhildeWorld)) - new Teleports.TeleportSameDim(brunhildePos, player, player.getUniqueID(), false).teleport(); - else - new Teleports.TeleportToDim(brunhildePos, player, player.getUniqueID(), player.getEntityWorld(), brunhildeWorld.provider.getDimension(), false).teleport(); - } else - return; - - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - } - } - - class TeleportToTeleposerFocus extends TeleposeHelper { - - @Override - public String getName() { - return "teleportfocus"; - } - - @Override - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer teleposerID = getIDFromArgs(sender, args); - if (teleposerID == null) - sendOwnedTeleposerList(sender, null); - else if (!sender.getEntityWorld().isRemote) { - if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds")); - return; - } - TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! - ItemStack stack = brunhilde.getStackInSlot(0); - ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); - BlockPos brunhildeFocusPos = focus.getBlockPos(stack); - World brunhildeFocusWorld = focus.getWorld(stack); - if (player.getEntityWorld().equals(brunhildeFocusWorld)) - new Teleports.TeleportSameDim(brunhildeFocusPos, player, player.getUniqueID(), false).teleport(); - else - new Teleports.TeleportToDim(brunhildeFocusPos, player, player.getUniqueID(), player.getEntityWorld(), brunhildeFocusWorld.provider.getDimension(), false).teleport(); - } else - return; - - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - } - } - - class RemoveTeleposer extends TeleposeHelper { - - @Override - public String getName() { - return "remove"; - } - - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer teleposerID = getIDFromArgs(sender, args); - if (teleposerID == null) - sendOwnedTeleposerList(sender, null); - else if (!sender.getEntityWorld().isRemote) { - if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds")); - return; - } - TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! - BlockPos brunhildePos = brunhilde.getPos(); - World brunhildeWorld = brunhilde.getWorld(); - brunhildeWorld.setBlockToAir(brunhildePos); - cleanUpAndCreateArrayFromTeleposerList(null); - } else - return; - - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - } - } - - class RecursiveRemoveTeleposer extends TeleposeHelper { - - @Override - public String getName() { - return "rmrf"; - } - - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - Integer teleposerID = getIDFromArgs(sender, args); - if (teleposerID == null) - sendOwnedTeleposerList(sender, null); - else if (!sender.getEntityWorld().isRemote) { - if (teleposerID > teleposerArray.length) { - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.outofbounds")); - return; - } - TileTeleposer brunhilde = teleposerArray[teleposerID]; // every teleposer is a brunhilde! - do { - BlockPos brunhildePos = brunhilde.getPos(); - World brunhildeWorld = brunhilde.getWorld(); - ItemStack stack = brunhilde.getStackInSlot(0); - ItemTelepositionFocus focus = (ItemTelepositionFocus) stack.getItem(); - BlockPos brunhildeFocusPos = focus.getBlockPos(stack); - World brunhildeFocusWorld = focus.getWorld(stack); - brunhilde.setInventorySlotContents(0, ItemStack.EMPTY); - brunhildeWorld.setBlockToAir(brunhildePos); - TileEntity testTile = brunhildeFocusWorld.getTileEntity(brunhildeFocusPos); - if (!(testTile instanceof TileTeleposer) || ((TileTeleposer) testTile).getStackInSlot(0).isEmpty()) - break; - for (TileTeleposer i : teleposerArray) { - if (i.getPos().equals(brunhildeFocusPos)) { - brunhilde = i; - break; - } - - } - } while (true); - cleanUpAndCreateArrayFromTeleposerList(null); - } else - return; - - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - } - - } - - class RemoveAllOfPlayer extends TeleposeHelper { - - @Override - public String getName() { - return "removeall"; - } - - public void subExecute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - cleanUpAndCreateArrayFromTeleposerList(player); - - if (!sender.getEntityWorld().isRemote) { - for (TileTeleposer i : teleposerArray) { - i.setInventorySlotContents(0, ItemStack.EMPTY); - i.getWorld().setBlockToAir(i.getPos()); - } - - } - cleanUpAndCreateArrayFromTeleposerList(null); - - sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.success")); - - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java deleted file mode 100644 index c8b7e847..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ /dev/null @@ -1,62 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi; - -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; -import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; -import amerifrance.guideapi.page.PageIRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.List; - -public class BookUtils { - - public static PageAlchemyArray getAlchemyPage(String key) { - ItemStack[] recipe = AlchemyArrayRecipeRegistry.getRecipeForArrayEffect(key); - if (recipe[0] != null) { - ItemStack inputStack = recipe[0]; - ItemStack catalystStack = recipe[1]; - - AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack); - if (renderer instanceof DualAlchemyCircleRenderer) { - List resources = new ArrayList<>(); - resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource); - resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource); - return new PageAlchemyArray(resources, inputStack, catalystStack); - } else { - return new PageAlchemyArray(renderer.arrayResource, inputStack, catalystStack); - } - } - - return null; - } - - public static PageAlchemyArray getAlchemyPage(ItemStack outputStack) { - ItemStack[] recipe = AlchemyArrayRecipeRegistry.getRecipeForOutputStack(outputStack); - if (recipe[0] != null) { - ItemStack inputStack = recipe[0]; - ItemStack catalystStack = recipe[1]; - - AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack); - if (renderer != null) { - if (renderer instanceof DualAlchemyCircleRenderer) { - List resources = new ArrayList<>(); - resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource); - resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource); - return new PageAlchemyArray(resources, inputStack, catalystStack, outputStack); - } else { - return new PageAlchemyArray(renderer.arrayResource, inputStack, catalystStack, outputStack); - } - } - } - - return null; - } - - public static PageIRecipe getPageForRecipe(IRecipe recipe) { - return new PageIRecipe(recipe); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java deleted file mode 100644 index fadb82ea..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.compat.guideapi.book.CategoryAlchemy; -import WayofTime.bloodmagic.compat.guideapi.book.CategoryArchitect; -import WayofTime.bloodmagic.compat.guideapi.book.CategoryDemon; -import WayofTime.bloodmagic.compat.guideapi.book.CategoryRitual; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.GuideBook; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.category.CategoryItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.Color; - -@GuideBook(priority = EventPriority.HIGHEST) -public class GuideBloodMagic implements IGuideBook { - - public static final Book GUIDE_BOOK = new Book(); - - @Nullable - @Override - public Book buildBook() { - GUIDE_BOOK.setTitle("guide.bloodmagic.title"); - GUIDE_BOOK.setDisplayName("guide.bloodmagic.display"); - GUIDE_BOOK.setWelcomeMessage("guide.bloodmagic.welcome"); - GUIDE_BOOK.setAuthor("guide.bloodmagic.author"); - GUIDE_BOOK.setRegistryName(new ResourceLocation(BloodMagic.MODID, "guide")); - GUIDE_BOOK.setColor(Color.RED); - - return GUIDE_BOOK; - } - - @Override - public void handlePost(ItemStack bookStack) { - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.bloodmagic.category.alchemy", new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.bloodmagic.category.architect", new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD))); - GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER))); -// guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner))); - } - - @Nullable - @Override - public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "blockGlass", "feather").setRegistryName("bloodmagic_guide"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java deleted file mode 100644 index f0b66b63..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ /dev/null @@ -1,153 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.book; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.compat.guideapi.BookUtils; -import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.PageHelper; -import amerifrance.guideapi.page.PageText; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -public class CategoryAlchemy -{ - public static Map buildCategory() - { - Map entries = new LinkedHashMap<>(); - String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy."; - - List introPages = new ArrayList<>(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); - - List ashPages = new ArrayList<>(); - - TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); - if (ashRecipe != null) - { - ashPages.add(new PageTartaricForgeRecipe(ashRecipe)); - } - ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); - - List furnacePages = new ArrayList<>(); - - PageAlchemyArray furnaceRecipePage = BookUtils.getAlchemyPage("furnace"); - if (furnaceRecipePage != null) - { - furnacePages.add(furnaceRecipePage); - } - furnacePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "furnace" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "furnace"), new EntryText(furnacePages, TextHelper.localize(keyBase + "furnace"), true)); - - List speedPages = new ArrayList<>(); - - PageAlchemyArray speedRecipePage = BookUtils.getAlchemyPage("movement"); - if (speedRecipePage != null) - { - speedPages.add(speedRecipePage); - } - speedPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "speed" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "speed"), new EntryText(speedPages, TextHelper.localize(keyBase + "speed"), true)); - - List buffPages = new ArrayList<>(); - - buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "buff"), new EntryText(buffPages, TextHelper.localize(keyBase + "buff"), true)); - - List fastMinerPages = new ArrayList<>(); - - PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner"); - if (fastMinerRecipePage != null) { - fastMinerPages.add(fastMinerRecipePage); - } - fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); - - List updraftPages = new ArrayList<>(); - - PageAlchemyArray updraftRecipePage = BookUtils.getAlchemyPage("updraft"); - if (updraftRecipePage != null) - { - updraftPages.add(updraftRecipePage); - } - updraftPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "updraft" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "updraft"), new EntryText(updraftPages, TextHelper.localize(keyBase + "updraft"), true)); - - List turretPages = new ArrayList<>(); - - PageAlchemyArray turretRecipePage = BookUtils.getAlchemyPage("skeletonTurret"); - if (turretRecipePage != null) - { - turretPages.add(turretRecipePage); - } - turretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "turret" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "turret"), new EntryText(turretPages, TextHelper.localize(keyBase + "turret"), true)); - - List bouncePages = new ArrayList<>(); - - PageAlchemyArray bounceRecipePage = BookUtils.getAlchemyPage("bounce"); - if (bounceRecipePage != null) - { - bouncePages.add(bounceRecipePage); - } - bouncePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bounce" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "bounce"), new EntryText(bouncePages, TextHelper.localize(keyBase + "bounce"), true)); - - List teleportPages = new ArrayList<>(); - - PageAlchemyArray teleportRecipePage = BookUtils.getAlchemyPage("teleport"); - if (teleportRecipePage != null) - { - teleportPages.add(teleportRecipePage); - } - teleportPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleport" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "teleport"), new EntryText(teleportPages, TextHelper.localize(keyBase + "teleport"), true)); - - List standardTurretPages = new ArrayList<>(); - - PageAlchemyArray standardTurretRecipePage = BookUtils.getAlchemyPage("turret"); - if (standardTurretRecipePage != null) - { - standardTurretPages.add(standardTurretRecipePage); - } - standardTurretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "standardTurret" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "standardTurret"), new EntryText(standardTurretPages, TextHelper.localize(keyBase + "standardTurret"), true)); - - List laputaPages = new ArrayList<>(); - - PageAlchemyArray laputaRecipePage = BookUtils.getAlchemyPage("laputa"); - if (laputaRecipePage != null) - { - laputaPages.add(laputaRecipePage); - } - laputaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "laputa" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "laputa"), new EntryText(laputaPages, TextHelper.localize(keyBase + "laputa"), true)); - - for (Entry entry : entries.entrySet()) - { - for (IPage page : entry.getValue().pageList) - { - if (page instanceof PageText) - { - ((PageText) page).setUnicodeFlag(true); - } - } - } - - return entries; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java deleted file mode 100644 index 005e7ced..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ /dev/null @@ -1,721 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.book; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.compat.guideapi.BookUtils; -import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; -import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.PageHelper; -import amerifrance.guideapi.page.PageText; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -public class CategoryArchitect -{ - public static Map buildCategory() - { - Map entries = new LinkedHashMap<>(); - String keyBase = "guide." + BloodMagic.MODID + ".entry.architect."; - - List introPages = new ArrayList<>(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); -// introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); - entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); - - List altarPages = new ArrayList<>(); - - IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ALTAR)); - if (altarRecipe != null) - { - altarPages.add(BookUtils.getPageForRecipe(altarRecipe)); - } - - altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.1"), 370)); - - IRecipe daggerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER)); - if (daggerRecipe != null) - { - altarPages.add(BookUtils.getPageForRecipe(daggerRecipe)); - } - - altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "bloodaltar"), new EntryText(altarPages, TextHelper.localize(keyBase + "bloodaltar"), true)); - - List daggerPages = new ArrayList<>(); - - AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE)); - if (daggerOfSacrificeRecipe != null) { - daggerPages.add(new PageAltarRecipe(daggerOfSacrificeRecipe)); - } - - daggerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "dagger" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "dagger"), new EntryText(daggerPages, TextHelper.localize(keyBase + "dagger"), true)); - - List ashPages = new ArrayList<>(); - - TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)); - if (ashRecipe != null) - { - ashPages.add(new PageTartaricForgeRecipe(ashRecipe)); - } - ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true)); - - List divinationPages = new ArrayList<>(); - - PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)); - if (divinationRecipePage != null) - { - divinationPages.add(divinationRecipePage); - } - - divinationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "divination" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "divination"), new EntryText(divinationPages, TextHelper.localize(keyBase + "divination"), true)); - - List soulnetworkPages = new ArrayList<>(); - - soulnetworkPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "soulnetwork" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "soulnetwork"), new EntryText(soulnetworkPages, TextHelper.localize(keyBase + "soulnetwork"), true)); - - List weakorbPages = new ArrayList<>(); - weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370)); - - AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)); - if (weakorbRecipe != null) - { - weakorbPages.add(new PageAltarRecipe(weakorbRecipe)); - } - - weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "weakorb"), new EntryText(weakorbPages, TextHelper.localize(keyBase + "weakorb"), true)); - - List incensePages = new ArrayList<>(); - - IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR)); - if (incenseRecipe != null) - { - incensePages.add(BookUtils.getPageForRecipe(incenseRecipe)); - } - - incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.1"), 370)); - - IRecipe woodPathRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0)); - if (woodPathRecipe != null) - { - incensePages.add(BookUtils.getPageForRecipe(woodPathRecipe)); - } - - incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "incense"), new EntryText(incensePages, TextHelper.localize(keyBase + "incense"), true)); - - List runePages = new ArrayList<>(); - - IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 0)); - if (runeRecipe != null) - { - runePages.add(BookUtils.getPageForRecipe(runeRecipe)); - } - - runePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodrune" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "bloodrune"), new EntryText(runePages, TextHelper.localize(keyBase + "bloodrune"), true)); - - List inspectPages = new ArrayList<>(); - - AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK)); - if (inspectRecipe != null) - { - inspectPages.add(new PageAltarRecipe(inspectRecipe)); - } - - inspectPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "inspectoris" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "inspectoris"), new EntryText(inspectPages, TextHelper.localize(keyBase + "inspectoris"), true)); - - List speedRunePages = new ArrayList<>(); - - IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1)); - if (speedRecipe != null) - { - speedRunePages.add(BookUtils.getPageForRecipe(speedRecipe)); - } - - speedRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSpeed" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeSpeed"), new EntryText(speedRunePages, TextHelper.localize(keyBase + "runeSpeed"), true)); - - List waterPages = new ArrayList<>(); - - TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_WATER.getStack()); - if (waterRecipe != null) - { - waterPages.add(new PageTartaricForgeRecipe(waterRecipe)); - } - - PageAlchemyArray waterRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER)); - if (waterRecipePage != null) - { - waterPages.add(waterRecipePage); - } - - waterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "water" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "water"), new EntryText(waterPages, TextHelper.localize(keyBase + "water"), true)); - - List lavaPages = new ArrayList<>(); - - TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_LAVA.getStack()); - if (lavaRecipe != null) - { - lavaPages.add(new PageTartaricForgeRecipe(lavaRecipe)); - } - - PageAlchemyArray lavaRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA)); - if (lavaRecipePage != null) - { - lavaPages.add(lavaRecipePage); - } - - lavaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lava" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "lava"), new EntryText(lavaPages, TextHelper.localize(keyBase + "lava"), true)); - - List lavaCrystalPages = new ArrayList<>(); - - IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL)); - if (lavaCrystalRecipe != null) - { - lavaCrystalPages.add(BookUtils.getPageForRecipe(lavaCrystalRecipe)); - } - - lavaCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lavaCrystal" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "lavaCrystal"), new EntryText(lavaCrystalPages, TextHelper.localize(keyBase + "lavaCrystal"), true)); - - List apprenticeorbPages = new ArrayList<>(); - - AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE)); - if (apprenticeorbRecipe != null) - { - apprenticeorbPages.add(new PageAltarRecipe(apprenticeorbRecipe)); - } - - apprenticeorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "apprenticeorb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "apprenticeorb"), new EntryText(apprenticeorbPages, TextHelper.localize(keyBase + "apprenticeorb"), true)); - - List runeSacrificePages = new ArrayList<>(); - - IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3)); - if (runeSacrificeRecipe != null) - { - runeSacrificePages.add(BookUtils.getPageForRecipe(runeSacrificeRecipe)); - } - - runeSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSacrifice" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeSacrifice"), new EntryText(runeSacrificePages, TextHelper.localize(keyBase + "runeSacrifice"), true)); - - List runeSelfSacrificePages = new ArrayList<>(); - - IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4)); - if (runeSelfSacrificeRecipe != null) - { - runeSelfSacrificePages.add(BookUtils.getPageForRecipe(runeSelfSacrificeRecipe)); - } - - runeSelfSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSelfSacrifice" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeSelfSacrifice"), new EntryText(runeSelfSacrificePages, TextHelper.localize(keyBase + "runeSelfSacrifice"), true)); - - List holdingPages = new ArrayList<>(); - - TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HOLDING.getStack()); - if (holdingRecipe != null) - { - holdingPages.add(new PageTartaricForgeRecipe(holdingRecipe)); - } - - PageAlchemyArray holdingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING)); - if (holdingRecipePage != null) - { - holdingPages.add(holdingRecipePage); - } - - holdingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "holding" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "holding"), new EntryText(holdingPages, TextHelper.localize(keyBase + "holding"), true)); - - List airPages = new ArrayList<>(); - - TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AIR.getStack()); - if (airRecipe != null) - { - airPages.add(new PageTartaricForgeRecipe(airRecipe)); - } - - PageAlchemyArray airRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR)); - if (airRecipePage != null) - { - airPages.add(airRecipePage); - } - - airPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "air" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "air"), new EntryText(airPages, TextHelper.localize(keyBase + "air"), true)); - - List voidPages = new ArrayList<>(); - - TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_VOID.getStack()); - if (voidRecipe != null) - { - voidPages.add(new PageTartaricForgeRecipe(voidRecipe)); - } - - PageAlchemyArray voidRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID)); - if (voidRecipePage != null) - { - voidPages.add(voidRecipePage); - } - - voidPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "void" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "void"), new EntryText(voidPages, TextHelper.localize(keyBase + "void"), true)); - - List greenGrovePages = new ArrayList<>(); - - TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_GROWTH.getStack()); - if (greenGroveRecipe != null) - { - greenGrovePages.add(new PageTartaricForgeRecipe(greenGroveRecipe)); - } - - PageAlchemyArray greenGroveRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE)); - if (greenGroveRecipePage != null) - { - greenGrovePages.add(greenGroveRecipePage); - } - - greenGrovePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "greenGrove" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "greenGrove"), new EntryText(greenGrovePages, TextHelper.localize(keyBase + "greenGrove"), true)); - - List fastMinerPages = new ArrayList<>(); - - TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_FAST_MINER.getStack()); - if (fastMinerRecipe != null) - { - fastMinerPages.add(new PageTartaricForgeRecipe(fastMinerRecipe)); - } - - PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER)); - if (fastMinerRecipePage != null) - { - fastMinerPages.add(fastMinerRecipePage); - } - - fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true)); - - List seerPages = new ArrayList<>(); - - TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SIGHT.getStack()); - if (seerRecipe != null) - { - seerPages.add(new PageTartaricForgeRecipe(seerRecipe)); - } - - PageAlchemyArray seerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER)); - if (seerRecipePage != null) - { - seerPages.add(seerRecipePage); - } - - seerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "seer" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "seer"), new EntryText(seerPages, TextHelper.localize(keyBase + "seer"), true)); - - List magicianOrbPages = new ArrayList<>(); - - AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN)); - if (magicianOrbRecipe != null) - { - magicianOrbPages.add(new PageAltarRecipe(magicianOrbRecipe)); - } - - List tier3Pages = new ArrayList<>(); - - tier3Pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "tier3" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "tier3"), new EntryText(tier3Pages, TextHelper.localize(keyBase + "tier3"), true)); - - magicianOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magicianOrb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "magicianOrb"), new EntryText(magicianOrbPages, TextHelper.localize(keyBase + "magicianOrb"), true)); - - List capacityPages = new ArrayList<>(); - - IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6)); - if (capacityRecipe != null) - { - capacityPages.add(BookUtils.getPageForRecipe(capacityRecipe)); - } - - capacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "capacity" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "capacity"), new EntryText(capacityPages, TextHelper.localize(keyBase + "capacity"), true)); - - List displacementPages = new ArrayList<>(); - - IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 5)); - if (displacementRecipe != null) - { - displacementPages.add(BookUtils.getPageForRecipe(displacementRecipe)); - } - - displacementPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "displacement" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "displacement"), new EntryText(displacementPages, TextHelper.localize(keyBase + "displacement"), true)); - - List affinityPages = new ArrayList<>(); - - TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AFFINITY.getStack()); - if (affinityRecipe != null) - { - affinityPages.add(new PageTartaricForgeRecipe(affinityRecipe)); - } - - PageAlchemyArray affinityRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY)); - if (affinityRecipePage != null) - { - affinityPages.add(affinityRecipePage); - } - - affinityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "affinity" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "affinity"), new EntryText(affinityPages, TextHelper.localize(keyBase + "affinity"), true)); - - List lampPages = new ArrayList<>(); - - TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack()); - if (lampRecipe != null) - { - lampPages.add(new PageTartaricForgeRecipe(lampRecipe)); - } - - PageAlchemyArray lampRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT)); - if (lampRecipePage != null) - { - lampPages.add(lampRecipePage); - } - - lampPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lamp" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "lamp"), new EntryText(lampPages, TextHelper.localize(keyBase + "lamp"), true)); - - List magnetismPages = new ArrayList<>(); - - TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_MAGNETISM.getStack()); - if (magnetismRecipe != null) - { - magnetismPages.add(new PageTartaricForgeRecipe(magnetismRecipe)); - } - - PageAlchemyArray magnetismRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM)); - if (magnetismRecipePage != null) - { - magnetismPages.add(magnetismRecipePage); - } - - magnetismPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magnetism" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "magnetism"), new EntryText(magnetismPages, TextHelper.localize(keyBase + "magnetism"), true)); - - List peritiaPages = new ArrayList<>(); - - IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME)); - if (peritiaRecipe != null) - { - peritiaPages.add(BookUtils.getPageForRecipe(peritiaRecipe)); - } - - peritiaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "peritia" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "peritia"), new EntryText(peritiaPages, TextHelper.localize(keyBase + "peritia"), true)); - - List livingArmourPages = new ArrayList<>(); - - TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BINDING.getStack()); - if (bindingRecipe != null) - { - livingArmourPages.add(new PageTartaricForgeRecipe(bindingRecipe)); - } - - PageAlchemyArray bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)); - if (bindingRecipePage != null) - { - livingArmourPages.add(bindingRecipePage); - } - - bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)); - if (bindingRecipePage != null) - { - livingArmourPages.add(bindingRecipePage); - } - - bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS)); - if (bindingRecipePage != null) - { - livingArmourPages.add(bindingRecipePage); - } - - bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)); - if (bindingRecipePage != null) - { - livingArmourPages.add(bindingRecipePage); - } - - livingArmourPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "livingArmour" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "livingArmour"), new EntryText(livingArmourPages, TextHelper.localize(keyBase + "livingArmour"), true)); - - List upgradePages = new ArrayList<>(); - - upgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "upgradeTome" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "upgradeTome"), new EntryText(upgradePages, TextHelper.localize(keyBase + "upgradeTome"), true)); - - List downgradePages = new ArrayList<>(); - - downgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "downgrade" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "downgrade"), new EntryText(downgradePages, TextHelper.localize(keyBase + "downgrade"), true)); - - List boundBladePages = new ArrayList<>(); - - PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD)); - if (boundBladePage != null) { - boundBladePages.add(boundBladePage); - } - - boundBladePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundBlade" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "boundBlade"), new EntryText(boundBladePages, TextHelper.localize(keyBase + "boundBlade"), true)); - - List boundToolPages = new ArrayList<>(); - - PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)); - if (boundToolPage != null) { - boundToolPages.add(boundToolPage); - } - - boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)); - if (boundToolPage != null) { - boundToolPages.add(boundToolPage); - } - - boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)); - if (boundToolPage != null) { - boundToolPages.add(boundToolPage); - } - - boundToolPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundTool" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "boundTool"), new EntryText(boundToolPages, TextHelper.localize(keyBase + "boundTool"), true)); - - List weakShardPages = new ArrayList<>(); - - weakShardPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakShard" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "weakShard"), new EntryText(weakShardPages, TextHelper.localize(keyBase + "weakShard"), true)); - - List teleposerPages = new ArrayList<>(); - - AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)); - if (teleposerFocusRecipe != null) - { - teleposerPages.add(new PageAltarRecipe(teleposerFocusRecipe)); - } - - IRecipe teleposerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER)); - if (teleposerRecipe != null) - { - teleposerPages.add(BookUtils.getPageForRecipe(teleposerRecipe)); - } - - teleposerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposer" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "teleposer"), new EntryText(teleposerPages, TextHelper.localize(keyBase + "teleposer"), true)); - - List masterOrbPages = new ArrayList<>(); - - AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER)); - if (magicianOrbRecipe != null) - { - masterOrbPages.add(new PageAltarRecipe(masterOrbRecipe)); - } - - masterOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterOrb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "masterOrb"), new EntryText(masterOrbPages, TextHelper.localize(keyBase + "masterOrb"), true)); - - List orbRunePages = new ArrayList<>(); - - IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8)); - if (orbRuneRecipe != null) - { - orbRunePages.add(BookUtils.getPageForRecipe(orbRuneRecipe)); - } - - orbRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeOrb" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "runeOrb"), new EntryText(orbRunePages, TextHelper.localize(keyBase + "runeOrb"), true)); - - List augmentedCapacityPages = new ArrayList<>(); - - IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7)); - if (orbRuneRecipe != null) - { - augmentedCapacityPages.add(BookUtils.getPageForRecipe(augmentedCapacityRecipe)); - } - - augmentedCapacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "augmentedCapacity" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "augmentedCapacity"), new EntryText(augmentedCapacityPages, TextHelper.localize(keyBase + "augmentedCapacity"), true)); - - List chargingPages = new ArrayList<>(); - - IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10)); - if (orbRuneRecipe != null) - { - chargingPages.add(BookUtils.getPageForRecipe(chargingRecipe)); - } - - chargingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "charging" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "charging"), new EntryText(chargingPages, TextHelper.localize(keyBase + "charging"), true)); - - List accelerationPages = new ArrayList<>(); - - IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9)); - if (orbRuneRecipe != null) - { - accelerationPages.add(BookUtils.getPageForRecipe(accelerationRecipe)); - } - - accelerationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "acceleration" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "acceleration"), new EntryText(accelerationPages, TextHelper.localize(keyBase + "acceleration"), true)); - - List suppressionPages = new ArrayList<>(); - - TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SUPPRESSION.getStack()); - if (suppressionRecipe != null) - { - suppressionPages.add(new PageTartaricForgeRecipe(suppressionRecipe)); - } - - PageAlchemyArray suppressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION)); - if (suppressionRecipePage != null) - { - suppressionPages.add(suppressionRecipePage); - } - - suppressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "suppression" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "suppression"), new EntryText(suppressionPages, TextHelper.localize(keyBase + "suppression"), true)); - - List hastePages = new ArrayList<>(); - - TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HASTE.getStack()); - if (hasteRecipe != null) - { - hastePages.add(new PageTartaricForgeRecipe(hasteRecipe)); - } - - PageAlchemyArray hasteRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE)); - if (hasteRecipePage != null) - { - hastePages.add(hasteRecipePage); - } - - hastePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "haste" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "haste"), new EntryText(hastePages, TextHelper.localize(keyBase + "haste"), true)); - - List severancePages = new ArrayList<>(); - - TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SEVERANCE.getStack()); - if (severanceRecipe != null) - { - severancePages.add(new PageTartaricForgeRecipe(severanceRecipe)); - } - - PageAlchemyArray severanceRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE)); - if (severanceRecipePage != null) - { - severancePages.add(severanceRecipePage); - } - - severancePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "severance" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "severance"), new EntryText(severancePages, TextHelper.localize(keyBase + "severance"), true)); - - List telepositionPages = new ArrayList<>(); - - TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_TELEPOSITION.getStack()); - if (telepositionRecipe != null) - { - telepositionPages.add(new PageTartaricForgeRecipe(telepositionRecipe)); - } - - PageAlchemyArray telepositionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION)); - if (telepositionRecipePage != null) - { - telepositionPages.add(telepositionRecipePage); - } - - telepositionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposition" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "teleposition"), new EntryText(telepositionPages, TextHelper.localize(keyBase + "teleposition"), true)); - - List compressionPages = new ArrayList<>(); - - TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_COMPRESSION.getStack()); - if (compressionRecipe != null) - { - compressionPages.add(new PageTartaricForgeRecipe(compressionRecipe)); - } - - PageAlchemyArray compressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION)); - if (compressionRecipePage != null) - { - compressionPages.add(compressionRecipePage); - } - - compressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "compression" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "compression"), new EntryText(compressionPages, TextHelper.localize(keyBase + "compression"), true)); - - List bridgePages = new ArrayList<>(); - - TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BRIDGE.getStack()); - if (bridgeRecipe != null) - { - bridgePages.add(new PageTartaricForgeRecipe(bridgeRecipe)); - } - - PageAlchemyArray bridgeRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE)); - if (bridgeRecipePage != null) - { - bridgePages.add(bridgeRecipePage); - } - - bridgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bridge" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "bridge"), new EntryText(bridgePages, TextHelper.localize(keyBase + "bridge"), true)); - - List mimicPages = new ArrayList<>(); - - IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 1, 1)); - if (mimicRecipe != null) - { - mimicPages.add(BookUtils.getPageForRecipe(mimicRecipe)); - } - - mimicPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "mimic" + ".info.1"), 370)); - entries.put(new ResourceLocation(keyBase + "mimic"), new EntryText(mimicPages, TextHelper.localize(keyBase + "mimic"), true)); - - for (Entry entry : entries.entrySet()) - { - for (IPage page : entry.getValue().pageList) - { - if (page instanceof PageText) - { - ((PageText) page).setUnicodeFlag(true); - } - } - } - - return entries; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java deleted file mode 100644 index eb26e3a4..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ /dev/null @@ -1,191 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.book; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.compat.guideapi.BookUtils; -import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.PageHelper; -import amerifrance.guideapi.page.PageText; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -public class CategoryDemon { - //TODO: Add Forge recipe pages - public static Map buildCategory() { - Map entries = new LinkedHashMap<>(); - String keyBase = "guide." + BloodMagic.MODID + ".entry.demon."; - - List introPages = new ArrayList<>(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370)); -// introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); - entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true)); - - List snarePages = new ArrayList<>(); - snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.1"), 370)); - - IRecipe snareRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE)); - if (snareRecipe != null) { - snarePages.add(BookUtils.getPageForRecipe(snareRecipe)); - } - - snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "snare"), new EntryText(snarePages, TextHelper.localize(keyBase + "snare"), true)); - - List forgePages = new ArrayList<>(); - forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.1"), 370)); - - IRecipe forgeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE)); - if (forgeRecipe != null) { - forgePages.add(BookUtils.getPageForRecipe(forgeRecipe)); - } - - forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "forge"), new EntryText(forgePages, TextHelper.localize(keyBase + "forge"), true)); - - List pettyPages = new ArrayList<>(); - pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.1"), 370)); - TartaricForgeRecipe pettyRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM)); - if (pettyRecipe != null) { - pettyPages.add(new PageTartaricForgeRecipe(pettyRecipe)); - } - pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "petty"), new EntryText(pettyPages, TextHelper.localize(keyBase + "petty"), true)); - - List swordPages = new ArrayList<>(); - swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.1"), 370)); - TartaricForgeRecipe swordRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD)); - if (swordRecipe != null) { - swordPages.add(new PageTartaricForgeRecipe(swordRecipe)); - } - swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "sword"), new EntryText(swordPages, TextHelper.localize(keyBase + "sword"), true)); - - List lesserPages = new ArrayList<>(); - lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.1"), 370)); - TartaricForgeRecipe lesserRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1)); - if (lesserRecipe != null) { - lesserPages.add(new PageTartaricForgeRecipe(lesserRecipe)); - } - lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "lesser"), new EntryText(lesserPages, TextHelper.localize(keyBase + "lesser"), true)); - - List reactionsPages = new ArrayList<>(); - reactionsPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "reactions" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "reactions"), new EntryText(reactionsPages, TextHelper.localize(keyBase + "reactions"), true)); - - List sentientGemPages = new ArrayList<>(); - sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.1"), 370)); - sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "sentientGem"), new EntryText(sentientGemPages, TextHelper.localize(keyBase + "sentientGem"), true)); - - List routingPages = new ArrayList<>(); - TartaricForgeRecipe nodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - if (nodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(nodeRecipe)); - } - TartaricForgeRecipe inputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE)); - if (inputNodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(inputNodeRecipe)); - } - TartaricForgeRecipe outputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE)); - if (outputNodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(outputNodeRecipe)); - } - TartaricForgeRecipe masterNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE)); - if (masterNodeRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(masterNodeRecipe)); - } - - TartaricForgeRecipe nodeRouterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER)); - if (nodeRouterRecipe != null) { - routingPages.add(new PageTartaricForgeRecipe(nodeRouterRecipe)); - } - - routingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "routing" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "routing"), new EntryText(routingPages, TextHelper.localize(keyBase + "routing"), true)); - - List auraPages = new ArrayList<>(); - - auraPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "aura" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "aura"), new EntryText(auraPages, TextHelper.localize(keyBase + "aura"), true)); - - List typesPages = new ArrayList<>(); - - typesPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "types" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "types"), new EntryText(typesPages, TextHelper.localize(keyBase + "types"), true)); - - List cruciblePages = new ArrayList<>(); - - TartaricForgeRecipe crucibleRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE)); - if (crucibleRecipe != null) { - cruciblePages.add(new PageTartaricForgeRecipe(crucibleRecipe)); - } - - cruciblePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crucible" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "crucible"), new EntryText(cruciblePages, TextHelper.localize(keyBase + "crucible"), true)); - - List crystallizerPages = new ArrayList<>(); - - TartaricForgeRecipe crystallizerRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER)); - if (crystallizerRecipe != null) { - crystallizerPages.add(new PageTartaricForgeRecipe(crystallizerRecipe)); - } - - crystallizerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crystallizer" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "crystallizer"), new EntryText(crystallizerPages, TextHelper.localize(keyBase + "crystallizer"), true)); - - List clusterPages = new ArrayList<>(); - - TartaricForgeRecipe clusterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL)); - if (clusterRecipe != null) { - clusterPages.add(new PageTartaricForgeRecipe(clusterRecipe)); - } - - clusterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "cluster" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "cluster"), new EntryText(clusterPages, TextHelper.localize(keyBase + "cluster"), true)); - - List pylonPages = new ArrayList<>(); - - TartaricForgeRecipe pylonRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON)); - if (pylonRecipe != null) { - pylonPages.add(new PageTartaricForgeRecipe(pylonRecipe)); - } - - pylonPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "pylon" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "pylon"), new EntryText(pylonPages, TextHelper.localize(keyBase + "pylon"), true)); - - List gaugePages = new ArrayList<>(); - - TartaricForgeRecipe gaugeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE)); - if (gaugeRecipe != null) { - gaugePages.add(new PageTartaricForgeRecipe(gaugeRecipe)); - } - - gaugePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "gauge" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "gauge"), new EntryText(gaugePages, TextHelper.localize(keyBase + "gauge"), true)); - - for (Entry entry : entries.entrySet()) { - for (IPage page : entry.getValue().pageList) { - if (page instanceof PageText) { - ((PageText) page).setUnicodeFlag(true); - } - } - } - - return entries; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java deleted file mode 100644 index 35a2adb3..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ /dev/null @@ -1,157 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.book; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.compat.guideapi.BookUtils; -import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; -import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.util.helper.RecipeHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.PageHelper; -import amerifrance.guideapi.page.PageText; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -public class CategoryRitual -{ - static String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual."; - - public static Map buildCategory() - { - Map entries = new LinkedHashMap<>(); - - addRitualPagesToEntries("intro", entries); - addRitualPagesToEntries("basics", entries); - - List ritualStonePages = new ArrayList<>(); - - IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); - if (ritualStoneRecipe != null) - { - ritualStonePages.add(BookUtils.getPageForRecipe(ritualStoneRecipe)); - } - - ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.1"), 370)); - - for (int i = 1; i < 5; i++) - { - EnumRuneType type = EnumRuneType.values()[i]; - AltarRecipe scribeRecipe = RecipeHelper.getAltarRecipeForOutput(type.getStack()); - if (scribeRecipe != null) - { - ritualStonePages.add(new PageAltarRecipe(scribeRecipe)); - } - } - - ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "ritualStone"), new EntryText(ritualStonePages, TextHelper.localize(keyBase + "ritualStone"), true)); - - List masterRitualStonePages = new ArrayList<>(); - - IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 0)); - if (masterRitualStoneRecipe != null) - { - masterRitualStonePages.add(BookUtils.getPageForRecipe(masterRitualStoneRecipe)); - } - - masterRitualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterRitualStone" + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + "masterRitualStone"), new EntryText(masterRitualStonePages, TextHelper.localize(keyBase + "masterRitualStone"), true)); - - List activationCrystalPages = new ArrayList<>(); - - activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.1"), 370)); - - AltarRecipe crystalRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL)); - if (crystalRecipe != null) - { - activationCrystalPages.add(new PageAltarRecipe(crystalRecipe)); - } - - activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "activationCrystal"), new EntryText(activationCrystalPages, TextHelper.localize(keyBase + "activationCrystal"), true)); - - List divinerPages = new ArrayList<>(); - - divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.1"), 370)); - - IRecipe divinerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER)); - if (divinerRecipe != null) - { - divinerPages.add(BookUtils.getPageForRecipe(divinerRecipe)); - } - - divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.2"), 370)); - entries.put(new ResourceLocation(keyBase + "diviner"), new EntryText(divinerPages, TextHelper.localize(keyBase + "diviner"), true)); - - addRitualPagesToEntries("fullSpring", entries); - addRitualPagesToEntries("lava", entries); - addRitualPagesToEntries("greenGrove", entries); - addRitualPagesToEntries("magnetism", entries); - addRitualPagesToEntries("crusher", entries); - addRitualPagesToEntries("highJump", entries); - addRitualPagesToEntries("speed", entries); - addRitualPagesToEntries("wellOfSuffering", entries); - addRitualPagesToEntries("featheredKnife", entries); - addRitualPagesToEntries("regen", entries); - addRitualPagesToEntries("harvest", entries); - addRitualPagesToEntries("interdiction", entries); - addRitualPagesToEntries("containment", entries); - addRitualPagesToEntries("suppression", entries); - addRitualPagesToEntries("expulsion", entries); - addRitualPagesToEntries("zephyr", entries); - addRitualPagesToEntries("laying", entries); - addRitualPagesToEntries("timberman", entries); - addRitualPagesToEntries("meteor", entries); - addRitualPagesToEntries("downgrade", entries); - addRitualPagesToEntries("crystalSplit", entries); - addRitualPagesToEntries("portal", entries); - addRitualPagesToEntries("altarBuilder", entries); - addRitualPagesToEntries("pump", entries); - addRitualPagesToEntries("cobble", entries); - addRitualPagesToEntries("ellipsoid", entries); - addRitualPagesToEntries("crystalHarvest", entries); - addRitualPagesToEntries("forsakenSoul", entries); - addRitualPagesToEntries("animalGrowth", entries); - addRitualPagesToEntries("livingEvolution", entries); - addRitualPagesToEntries("upgradeRemove", entries); - addRitualPagesToEntries("fullStomach", entries); - addRitualPagesToEntries("eternalSoul", entries); - addRitualPagesToEntries("condor", entries); - addRitualPagesToEntries("featheredEarth", entries); - addRitualPagesToEntries("grounding", entries); - addRitualPagesToEntries("veilOfEvil", entries); - addRitualPagesToEntries("wardOfSacrosanctity", entries); - - for (Entry entry : entries.entrySet()) - { - for (IPage page : entry.getValue().pageList) - { - if (page instanceof PageText) - { - ((PageText) page).setUnicodeFlag(true); - } - } - } - - return entries; - } - - public static void addRitualPagesToEntries(String name, Map entries) - { - List pages = new ArrayList<>(); - pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + name + ".info"), 370)); - entries.put(new ResourceLocation(keyBase + name), new EntryText(pages, TextHelper.localize(keyBase + name), true)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java deleted file mode 100644 index 680bffda..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.book; - -import WayofTime.bloodmagic.util.Constants; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import net.minecraft.util.ResourceLocation; - -import java.util.LinkedHashMap; -import java.util.Map; - -public class CategorySpell { - public static Map buildCategory() { - Map entries = new LinkedHashMap<>(); - String keyBase = Constants.Mod.DOMAIN + "spell_"; - - return entries; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java deleted file mode 100644 index 9ce5c229..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java +++ /dev/null @@ -1,52 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.entry; - -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.entry.EntryResourceLocation; -import amerifrance.guideapi.gui.GuiBase; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collections; -import java.util.List; - -public class EntryText extends EntryResourceLocation { - - public EntryText(List pageList, String unlocEntryName, boolean unicode) { - super(pageList, unlocEntryName, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode); - } - - public EntryText(List pageList, String unlocEntryName) { - this(pageList, unlocEntryName, false); - } - - @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - Minecraft.getInstance().getTextureManager().bindTexture(image); - GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F); - - boolean startFlag = fontRendererObj.getUnicodeFlag(); - fontRendererObj.setUnicodeFlag(false); - - // Cutting code ripped from GuiButtonExt#drawButton(...) - int strWidth = fontRendererObj.getStringWidth(getLocalizedName()); - boolean cutString = false; - - if (strWidth > guiBase.xSize - 80 && strWidth > fontRendererObj.getStringWidth("...")) - cutString = true; - - if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, entryWidth, entryHeight) && cutString) { - - guiBase.drawHoveringText(Collections.singletonList(getLocalizedName()), entryX, entryY + 12); - fontRendererObj.setUnicodeFlag(unicode); - } - - fontRendererObj.setUnicodeFlag(startFlag); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java deleted file mode 100644 index b3325e86..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java +++ /dev/null @@ -1,94 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.page; - -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class PageAlchemyArray extends Page { - public static final double scale = 58d / 256d; - public final ItemStack inputStack; - public final ItemStack catalystStack; - public final ItemStack outputStack; - public List arrayResources = new ArrayList<>(); - - public PageAlchemyArray(List arrayResources, ItemStack inputStack, ItemStack catalystStack, ItemStack outputStack) { - this.arrayResources = arrayResources; - this.inputStack = inputStack; - this.catalystStack = catalystStack; - this.outputStack = outputStack; - } - - public PageAlchemyArray(List resources, ItemStack inputStack, ItemStack catalystStack) { - this(resources, inputStack, catalystStack, ItemStack.EMPTY); - } - - public PageAlchemyArray(ResourceLocation resource, ItemStack inputStack, ItemStack catalystStack, ItemStack outputStack) { - this(Collections.singletonList(resource), inputStack, catalystStack, outputStack); - } - - public PageAlchemyArray(ResourceLocation resource, ItemStack inputStack, ItemStack catalystStack) { - this(Collections.singletonList(resource), inputStack, catalystStack); - } - - @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - int x = guiLeft + 65; - int y = guiTop + 30; - - Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/alchemyArrayCrafting.png")); - guiBase.drawTexturedModalRect(x, y, 0, 0, 62, 88 + (outputStack.isEmpty() ? 0 : 26)); - - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.alchemyArray"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - - for (ResourceLocation arrayResource : arrayResources) { - Minecraft.getInstance().getTextureManager().bindTexture(arrayResource); - GlStateManager.pushMatrix(); - GlStateManager.translate(x + 2, y + 28, 0); - GlStateManager.scale(scale, scale, scale); - guiBase.drawTexturedModalRect(0, 0, 0, 0, 256, 256); - GlStateManager.popMatrix(); - } - - int inputX = x + 3; - int inputY = y + 3; - GuiHelper.drawItemStack(inputStack, inputX, inputY); - - int catalystX = x + 43; - int catalystY = y + 3; - GuiHelper.drawItemStack(catalystStack, catalystX, catalystY); - - if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) { - guiBase.renderToolTip(inputStack, mouseX, mouseY); - } - - if (GuiHelper.isMouseBetween(mouseX, mouseY, catalystX, catalystY, 15, 15)) { - guiBase.renderToolTip(catalystStack, mouseX, mouseY); - } - - if (!outputStack.isEmpty()) { - int outputX = x + 43; - int outputY = y + 95; - - GuiHelper.drawItemStack(outputStack, outputX, outputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { - guiBase.renderToolTip(outputStack, mouseX, mouseY); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java deleted file mode 100644 index a2327e95..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.page; - -import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import net.minecraft.block.Blocks; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class PageAltarRecipe extends Page { - - public List input; - public ItemStack output; - public int tier; - public int bloodRequired; - - public PageAltarRecipe(AltarRecipeRegistry.AltarRecipe recipe) { - this.input = ItemStackWrapper.toStackList(recipe.getInput()); - this.output = recipe.getOutput(); - this.tier = recipe.getMinTier().toInt(); - this.bloodRequired = recipe.getSyphon(); - } - - @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); - guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); - - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.bloodAltar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - - int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; - int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 - GuiHelper.drawItemStack(input.get(0), inputX, inputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) { - guiBase.renderToolTip(input.get(0), mouseX, mouseY); - } - - if (output.isEmpty()) { - output = new ItemStack(Blocks.BARRIER); - } - int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; - int outputY = (20) + (guiTop + guiBase.xSize / 5) - 1; // 1 * 20 - GuiHelper.drawItemStack(output, outputX, outputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { - guiBase.renderToolTip(output, outputX, outputY); - } - - if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); - guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0); - } - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.tier", String.valueOf(tier)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.lp", String.valueOf(bloodRequired)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java deleted file mode 100644 index 7b3dad2b..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ /dev/null @@ -1,125 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.page; - -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import net.minecraft.block.Blocks; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.List; -import java.util.Random; - -public class PageTartaricForgeRecipe extends Page { - public List input; - public ItemStack output; - public int tier; - public double minimumWill; - public double drainedWill; - - private int cycleIdx = 0; - private Random rand = new Random(); - - public PageTartaricForgeRecipe(TartaricForgeRecipe recipe) { - this.input = recipe.getInput(); - this.output = recipe.getRecipeOutput(); - this.tier = 0; - this.minimumWill = recipe.getMinimumSouls(); - this.drainedWill = recipe.getSoulsDrained(); - } - - @SuppressWarnings("unchecked") - @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/soulForge.png")); - guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); - - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.soulForge"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - -// int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; -// int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 - - for (int y = 0; y < 2; y++) { - for (int x = 0; x < 2; x++) { - int stackX = (x + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; - int stackY = (y + 1) * 20 + (guiTop + guiBase.ySize / 5) - 1; - Object component = input.size() > y * 2 + x ? input.get(y * 2 + x) : null;//recipe.getInput()[y * 2 + x]; - if (component != null) { - if (component instanceof ItemStack) { - ItemStack input = (ItemStack) component; - if (input.getItemDamage() == OreDictionary.WILDCARD_VALUE) - input.setItemDamage(0); - - GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// tooltips = GuiHelper.getTooltip((ItemStack) component); - guiBase.renderToolTip((ItemStack) component, mouseX, mouseY); - } - } else if (component instanceof Integer) { - List list = OrbRegistry.getOrbsDownToTier((Integer) component); - if (!list.isEmpty()) { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 2), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// tooltips = GuiHelper.getTooltip(stack); - guiBase.renderToolTip(stack, mouseX, mouseY); - } - } - } else { - List list = (List) component; - if (!list.isEmpty()) { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 2), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { -// tooltips = GuiHelper.getTooltip(stack); - guiBase.renderToolTip(stack, mouseX, mouseY); - } - } - } - } - } - } - -// GuiHelper.drawItemStack(input.get(0), inputX, inputY); -// if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) -// { -// guiBase.renderToolTip(input.get(0), mouseX, mouseY); -// } - - if (output == null) { - output = new ItemStack(Blocks.BARRIER); - } - int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; - int outputY = (20) + (guiTop + guiBase.xSize / 5) + 10; // 1 * 20 - GuiHelper.drawItemStack(output, outputX, outputY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { - guiBase.renderToolTip(output, outputX, outputY); - } - - if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); -// guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0); - } - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.minimumWill", String.valueOf(minimumWill)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 - 15, 0); - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.drainedWill", String.valueOf(drainedWill)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); - } - - protected int getRandomizedCycle(int index, int max) { - rand.setSeed(index); - return (index + rand.nextInt(max) + cycleIdx) % max; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index 2384c305..4ddce32c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -1,232 +1,62 @@ -package WayofTime.bloodmagic.compat.jei; +package wayoftime.bloodmagic.compat.jei; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.block.enums.EnumDecorative; -import WayofTime.bloodmagic.client.gui.GuiSoulForge; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; -import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeCategory; -import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeHandler; -import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeMaker; -import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeCategory; -import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeHandler; -import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeMaker; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeJEI; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import mezz.jei.api.*; -import mezz.jei.api.recipe.IRecipeCategoryRegistration; -import mezz.jei.api.recipe.IRecipeWrapper; -import mezz.jei.api.recipe.IVanillaRecipeFactory; -import mezz.jei.api.recipe.VanillaRecipeCategoryUid; +import java.util.Objects; + +import mezz.jei.api.IModPlugin; +import mezz.jei.api.JeiPlugin; +import mezz.jei.api.helpers.IJeiHelpers; +import mezz.jei.api.registration.IRecipeCatalystRegistration; +import mezz.jei.api.registration.IRecipeCategoryRegistration; +import mezz.jei.api.registration.IRecipeRegistration; +import net.minecraft.client.Minecraft; +import net.minecraft.client.world.ClientWorld; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.compat.jei.altar.BloodAltarRecipeCategory; +import wayoftime.bloodmagic.compat.jei.array.AlchemyArrayCraftingCategory; +import wayoftime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; -import javax.annotation.Nonnull; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +@JeiPlugin +public class BloodMagicJEIPlugin implements IModPlugin +{ + public static IJeiHelpers jeiHelper; -@JEIPlugin -public class BloodMagicJEIPlugin implements IModPlugin { - public static IJeiHelpers jeiHelper; + private static final ResourceLocation ID = BloodMagic.rl("jei_plugin"); - @Override - public void register(@Nonnull IModRegistry registry) { - jeiHelper = registry.getJeiHelpers(); + @Override + public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) + { + registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.SOUL_FORGE.get()), TartaricForgeRecipeCategory.UID); + registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), BloodAltarRecipeCategory.UID); + registration.addRecipeCatalyst(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), AlchemyArrayCraftingCategory.UID); + } - registry.addRecipeHandlers( - new BindingRecipeHandler(), - new ArmourDowngradeRecipeHandler() - ); + @Override + public void registerCategories(IRecipeCategoryRegistration registration) + { + jeiHelper = registration.getJeiHelpers(); + registration.addRecipeCategories(new TartaricForgeRecipeCategory(registration.getJeiHelpers().getGuiHelper())); + registration.addRecipeCategories(new BloodAltarRecipeCategory(registration.getJeiHelpers().getGuiHelper())); + registration.addRecipeCategories(new AlchemyArrayCraftingCategory(registration.getJeiHelpers().getGuiHelper())); + } - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(), Constants.Compat.JEI_CATEGORY_ALTAR); - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(), Constants.Compat.JEI_CATEGORY_SOULFORGE); - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArrayRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); - registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyRecipes(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - registry.addRecipes(AlchemyTableRecipeRegistry.getRecipeList(), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + @Override + public void registerRecipes(IRecipeRegistration registration) + { + ClientWorld world = Objects.requireNonNull(Minecraft.getInstance().world); + registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(world), TartaricForgeRecipeCategory.UID); + registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(world), BloodAltarRecipeCategory.UID); + registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArrayRecipes(world), AlchemyArrayCraftingCategory.UID); + } - registry.addRecipes(getAnvilRecipes(), VanillaRecipeCategoryUid.ANVIL); + @Override + public ResourceLocation getPluginUid() + { + return ID; + } - registry.handleRecipes(RecipeBloodAltar.class, AltarRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALTAR); - registry.handleRecipes(RecipeTartaricForge.class, TartaricForgeRecipeJEI::new, Constants.Compat.JEI_CATEGORY_SOULFORGE); - registry.handleRecipes(RecipeAlchemyArray.class, AlchemyArrayCraftingRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); - registry.handleRecipes(RecipeAlchemyTable.class, AlchemyTableRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - registry.handleRecipes(AlchemyTableRecipe.class, AlchemyTableRecipeJEI::new, Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - - registry.addRecipes(BindingRecipeMaker.getRecipes()); - registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes()); - - registry.addIngredientInfo(new ItemStack(RegistrarBloodMagicItems.ALTAR_MAKER), ItemStack.class, "jei.bloodmagic.desc.altarBuilder"); - registry.addIngredientInfo(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL), ItemStack.class, "jei.bloodmagic.desc.demonicWill"); - - for (Map.Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) { - String key = entry.getKey(); - int maxLevel = entry.getValue(); - for (int i = 0; i < maxLevel - 1; i++) { - ItemStack stack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - LivingUpgrades.setKey(stack, key); - LivingUpgrades.setLevel(stack, i); - jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(stack); - } - } - - registry.addRecipeClickArea(GuiSoulForge.class, 115, 15, 16, 88, Constants.Compat.JEI_CATEGORY_SOULFORGE); - - registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), Constants.Compat.JEI_CATEGORY_ALTAR); - registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), Constants.Compat.JEI_CATEGORY_SOULFORGE); - registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); - registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING); - registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); - - if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { - jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal())); - jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal())); - jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal())); - } - } - - @Override - public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { - subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME); - subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.POTION_FLASK); - subtypeRegistry.registerSubtypeInterpreter(RegistrarBloodMagicItems.BLOOD_ORB, stack -> { - if (!(stack.getItem() instanceof IBloodOrb)) - return ISubtypeRegistry.ISubtypeInterpreter.NONE; - - BloodOrb orb = ((IBloodOrb) stack.getItem()).getOrb(stack); - if (orb == null) - return ISubtypeRegistry.ISubtypeInterpreter.NONE; - - return orb.getRegistryName().toString(); - }); - } - - @Override - public void registerCategories(IRecipeCategoryRegistration registry) { - if (jeiHelper == null) - jeiHelper = registry.getJeiHelpers(); - - registry.addRecipeCategories( - new AltarRecipeCategory(), - new BindingRecipeCategory(), - new AlchemyArrayCraftingCategory(), - new TartaricForgeRecipeCategory(), - new AlchemyTableRecipeCategory(), - new ArmourDowngradeRecipeCategory() - ); - } - - public Collection getAnvilRecipes() { - IVanillaRecipeFactory vanillaRecipeFactory = jeiHelper.getVanillaRecipeFactory(); - - - /* Sentient Tool repair recipes */ - - List outputSwords = new LinkedList<>(); - List outputPickaxes = new LinkedList<>(); - List outputAxes = new LinkedList<>(); - List outputBows = new LinkedList<>(); - List outputShovels = new LinkedList<>(); - - List inputRightSentient = new LinkedList<>(); - - List> sentientOutputs = new LinkedList<>(); - - List sentientTools = new LinkedList<>(); - sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE)); - sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE)); - sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW)); - sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL)); - sentientTools.add(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD)); - - for (int i = 4; i > 0; i--) { - for (ItemStack j : sentientTools) { - int maxDmg = j.getMaxDamage(); - j.setItemDamage(maxDmg - (maxDmg / 4) * i); - } - outputAxes.add(sentientTools.get(0).copy()); - outputPickaxes.add(sentientTools.get(1).copy()); - outputBows.add(sentientTools.get(2).copy()); - outputShovels.add(sentientTools.get(3).copy()); - outputSwords.add(sentientTools.get(4).copy()); - - inputRightSentient.add(new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, i)); - } - sentientOutputs.add(outputAxes); - sentientOutputs.add(outputPickaxes); - sentientOutputs.add(outputBows); - sentientOutputs.add(outputShovels); - sentientOutputs.add(outputSwords); - - - Collection collection = new LinkedList<>(); - - for (int i = 0; i < 5; i++) { - ItemStack inputLeft = sentientTools.get(i); - inputLeft.setItemDamage(inputLeft.getMaxDamage()); - collection.add(vanillaRecipeFactory.createAnvilRecipe(inputLeft, inputRightSentient, sentientOutputs.get(i))); - } - - /* Living Armor repair recipes */ - - List outputHelmets = new LinkedList<>(); - List outputChestplates = new LinkedList<>(); - List outputLeggings = new LinkedList<>(); - List outputBoots = new LinkedList<>(); - - List inputRightLiving = new LinkedList<>(); - - List> livingOutputs = new LinkedList<>(); - - List livingTools = new LinkedList<>(); - livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)); - livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)); - livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS)); - livingTools.add(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)); - - for (int i = 4; i > 0; i--) { - for (ItemStack j : livingTools) { - int maxDmg = j.getMaxDamage(); - j.setItemDamage(maxDmg - (maxDmg / 4) * i); - } - outputHelmets.add(livingTools.get(0).copy()); - outputChestplates.add(livingTools.get(1).copy()); - outputLeggings.add(livingTools.get(2).copy()); - outputBoots.add(livingTools.get(3).copy()); - - inputRightLiving.add(new ItemStack(RegistrarBloodMagicItems.COMPONENT, i, 8)); - } - livingOutputs.add(outputHelmets); - livingOutputs.add(outputChestplates); - livingOutputs.add(outputLeggings); - livingOutputs.add(outputBoots); - - for (int i = 0; i < 4; i++) { - ItemStack inputLeft = livingTools.get(i); - inputLeft.setItemDamage(inputLeft.getMaxDamage()); - collection.add(vanillaRecipeFactory.createAnvilRecipe(inputLeft, inputRightLiving, livingOutputs.get(i))); - } - - return collection; - } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java deleted file mode 100644 index b6284e66..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ /dev/null @@ -1,75 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class AlchemyArrayCraftingCategory implements IRecipeCategory { - private static final int INPUT_SLOT = 0; - private static final int CATALYST_SLOT = 1; - private static final int OUTPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); - @Nonnull - private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyArrayCrafting"); - - @Nonnull - @Override - public String getUid() { - return Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY; - } - - @Nonnull - @Override - public String getTitle() { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) { - - } - - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - - @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 29, 3); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); - - if (recipeWrapper instanceof AlchemyArrayCraftingRecipeJEI) { - recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - recipeLayout.getItemStacks().set(CATALYST_SLOT, ingredients.getInputs(ItemStack.class).get(1)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - } - } - - @Override - public String getModName() { - return BloodMagic.NAME; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java deleted file mode 100644 index ce5ec8a6..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import com.google.common.collect.Lists; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - -public class AlchemyArrayCraftingRecipeJEI implements IRecipeWrapper { - @Nonnull - private final List inputs; - @Nullable - private final List catalyst; - @Nonnull - private final ItemStack output; - - public AlchemyArrayCraftingRecipeJEI(RecipeAlchemyArray array) { - this.inputs = NonNullList.from(ItemStack.EMPTY, array.getInput().getMatchingStacks()); - this.catalyst = NonNullList.from(ItemStack.EMPTY, array.getCatalyst().getMatchingStacks()); - this.output = array.getOutput(); - } - - @Override - public void getIngredients(IIngredients ingredients) { - ingredients.setInputLists(ItemStack.class, Lists.newArrayList(inputs, catalyst)); - ingredients.setOutput(ItemStack.class, output); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java deleted file mode 100644 index c15e1db3..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ /dev/null @@ -1,75 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyTable; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.gui.ICraftingGridHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeCategory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; - -public class AlchemyTableRecipeCategory implements IRecipeCategory { - - private static final int OUTPUT_SLOT = 0; - private static final int ORB_SLOT = 1; - private static final int INPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40); - @Nonnull - private final ICraftingGridHelper craftingGridHelper; - - public AlchemyTableRecipeCategory() { - craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); - } - - @Nonnull - @Override - public String getUid() { - return Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE; - } - - @Nonnull - @Override - public String getTitle() { - return TextHelper.localize("jei.bloodmagic.recipe.alchemyTable"); - } - - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } - - @Override - public void setRecipe(IRecipeLayout recipeLayout, AlchemyTableRecipeJEI recipeWrapper, IIngredients ingredients) { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - guiItemStacks.init(OUTPUT_SLOT, false, 91, 13); - guiItemStacks.init(ORB_SLOT, true, 60, 0); - - for (int y = 0; y < 3; ++y) { - for (int x = 0; x < 3; ++x) { - int index = INPUT_SLOT + x + (y * 3); - guiItemStacks.init(index, true, x * 18, y * 18 - 18); - } - } - - guiItemStacks.set(ORB_SLOT, OrbRegistry.getOrbsDownToTier(recipeWrapper.getTier())); - guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - craftingGridHelper.setInputs(guiItemStacks, ingredients.getInputs(ItemStack.class), 3, 2); - } - - @Override - public String getModName() { - return BloodMagic.NAME; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java deleted file mode 100644 index ba639936..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ /dev/null @@ -1,60 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyTable; - -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Lists; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.List; - -public class AlchemyTableRecipeJEI implements IRecipeWrapper { - - private final List input; - private final ItemStack output; - private final int tier; - private final int syphon; - private final int ticks; - - public AlchemyTableRecipeJEI(AlchemyTableRecipe recipe) { - this.input = recipe.getInput(); - this.output = recipe.getRecipeOutput(Lists.newArrayList()); - this.tier = recipe.getTierRequired(); - this.syphon = recipe.getLpDrained(); - this.ticks = recipe.getTicksRequired(); - } - - public AlchemyTableRecipeJEI(RecipeAlchemyTable recipe) { - this.input = recipe.getInput(); - this.output = recipe.getOutput(); - this.tier = recipe.getMinimumTier(); - this.syphon = recipe.getSyphon(); - this.ticks = recipe.getTicks(); - } - - @Override - public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(input); - ingredients.setInputLists(ItemStack.class, expanded); - ingredients.setOutput(ItemStack.class, output); - } - - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - ArrayList ret = new ArrayList<>(); - if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34) { - ret.add(TextHelper.localize("tooltip.bloodmagic.tier", tier)); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", syphon)); - ret.add(TextHelper.localize("jei.bloodmagic.recipe.ticksRequired", ticks)); - } - return ret; - } - - public int getTier() { - return tier; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java deleted file mode 100644 index 10f2f6a2..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ /dev/null @@ -1,68 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class AltarRecipeCategory implements IRecipeCategory { - private static final int INPUT_SLOT = 0; - private static final int OUTPUT_SLOT = 1; - - @Nonnull - private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65); - - @Nonnull - @Override - public String getUid() { - return Constants.Compat.JEI_CATEGORY_ALTAR; - } - - @Nonnull - @Override - public String getTitle() { - return TextHelper.localize("jei.bloodmagic.recipe.altar"); - } - - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) { - - } - - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull AltarRecipeJEI recipeWrapper, @Nonnull IIngredients ingredients) { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); - - recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - } - - @Nonnull - @Override - public String getModName() { - return BloodMagic.NAME; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java deleted file mode 100644 index 281e9b42..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Lists; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -import javax.annotation.Nonnull; -import java.awt.Color; -import java.util.List; - -public class AltarRecipeJEI implements IRecipeWrapper { - @Nonnull - private final List input; - @Nonnull - private final ItemStack output; - - private final String[] infoString; - private final int consumptionRate; - private final int drainRate; - - public AltarRecipeJEI(RecipeBloodAltar recipe) { - this.input = NonNullList.from(ItemStack.EMPTY, recipe.getInput().getMatchingStacks()); - this.output = recipe.getOutput(); - - this.infoString = new String[]{TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())), TextHelper.localize("jei.bloodmagic.recipe.requiredLP", recipe.getSyphon())}; - this.consumptionRate = recipe.getConsumeRate(); - this.drainRate = recipe.getDrainRate(); - } - - @Override - public void getIngredients(@Nonnull IIngredients ingredients) { - ingredients.setInputs(ItemStack.class, input); - ingredients.setOutput(ItemStack.class, output); - } - - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - List tooltip = Lists.newArrayList(); - if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) { - tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.consumptionRate", consumptionRate)); - tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.drainRate", drainRate)); - } - return tooltip; - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - minecraft.fontRenderer.drawString(infoString[0], 90 - minecraft.fontRenderer.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); - minecraft.fontRenderer.drawString(infoString[1], 90 - minecraft.fontRenderer.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java deleted file mode 100644 index b14c69fd..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ /dev/null @@ -1,93 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.armourDowngrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.gui.ICraftingGridHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class ArmourDowngradeRecipeCategory implements IRecipeCategory { - private static final int OUTPUT_SLOT = 0; - private static final int KEY_SLOT = 1; - private static final int INPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40); - @Nonnull - private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.armourDowngrade"); - @Nonnull - private final ICraftingGridHelper craftingGridHelper; - - public ArmourDowngradeRecipeCategory() { - craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); - } - - @Nonnull - @Override - public String getUid() { - return Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE; - } - - @Nonnull - @Override - public String getTitle() { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) { - - } - - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - - @Override - @SuppressWarnings("unchecked") - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, IIngredients ingredients) { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - guiItemStacks.init(OUTPUT_SLOT, false, 91, 13); - guiItemStacks.init(KEY_SLOT, true, 60, 0); - - for (int y = 0; y < 3; ++y) { - for (int x = 0; x < 3; ++x) { - int index = INPUT_SLOT + x + (y * 3); - guiItemStacks.init(index, true, x * 18, y * 18 - 18); - } - } - - if (recipeWrapper instanceof ArmourDowngradeRecipeJEI) { - guiItemStacks.set(KEY_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); - ingredients.getInputs(ItemStack.class).remove(ingredients.getInputs(ItemStack.class).size() - 1); - guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - craftingGridHelper.setInputs(guiItemStacks, ingredients.getInputs(ItemStack.class), 3, 2); - } - } - - @Override - public String getModName() { - return BloodMagic.NAME; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java deleted file mode 100644 index b5c2fd73..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.armourDowngrade; - -import WayofTime.bloodmagic.util.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class ArmourDowngradeRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return ArmourDowngradeRecipeJEI.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(ArmourDowngradeRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ArmourDowngradeRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ArmourDowngradeRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java deleted file mode 100644 index ba22f8c5..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.armourDowngrade; - -import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import com.google.common.collect.Lists; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; - -import java.util.List; - -public class ArmourDowngradeRecipeJEI extends BlankRecipeWrapper { - private LivingArmourDowngradeRecipe recipe; - - public ArmourDowngradeRecipeJEI(LivingArmourDowngradeRecipe recipe) { - this.recipe = recipe; - } - - @Override - public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); - expanded.add(Lists.newArrayList(recipe.getKey())); - ingredients.setInputLists(ItemStack.class, expanded); - ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - LivingUpgrades.setUpgrade(upgradeStack, recipe.getRecipeOutput()); - ingredients.setOutput(ItemStack.class, upgradeStack); - } - - public LivingArmourDowngradeRecipe getRecipe() { - return recipe; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java deleted file mode 100644 index 90ca286d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.armourDowngrade; - -import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class ArmourDowngradeRecipeMaker { - @Nonnull - public static List getRecipes() { - List recipeList = LivingArmourDowngradeRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList<>(); - - for (LivingArmourDowngradeRecipe recipe : recipeList) - recipes.add(new ArmourDowngradeRecipeJEI(recipe)); - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java deleted file mode 100644 index a2493fbd..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ /dev/null @@ -1,75 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class BindingRecipeCategory implements IRecipeCategory { - private static final int INPUT_SLOT = 0; - private static final int CATALYST_SLOT = 1; - private static final int OUTPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); - @Nonnull - private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.binding"); - - @Nonnull - @Override - public String getUid() { - return Constants.Compat.JEI_CATEGORY_BINDING; - } - - @Nonnull - @Override - public String getTitle() { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) { - - } - - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - - @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 29, 3); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); - - if (recipeWrapper instanceof BindingRecipeJEI) { - recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - recipeLayout.getItemStacks().set(CATALYST_SLOT, ingredients.getInputs(ItemStack.class).get(1)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - } - } - - @Override - public String getModName() { - return BloodMagic.NAME; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java deleted file mode 100644 index 3d429211..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import WayofTime.bloodmagic.util.Constants; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class BindingRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return BindingRecipeJEI.class; - } - - @Override - public String getRecipeCategoryUid(@Nonnull BindingRecipeJEI recipe) { - return Constants.Compat.JEI_CATEGORY_BINDING; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull BindingRecipeJEI recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull BindingRecipeJEI recipe) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java deleted file mode 100644 index 8a4adb82..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import com.google.common.collect.Lists; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.List; - -public class BindingRecipeJEI extends BlankRecipeWrapper { - @Nonnull - private final List inputs; - - @Nonnull - private final ItemStack catalyst; - - @Nonnull - private final ItemStack output; - - @SuppressWarnings("unchecked") - public BindingRecipeJEI(@Nonnull List input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output) { - this.inputs = input; - this.catalyst = catalyst; - this.output = output; - } - - @Override - public void getIngredients(IIngredients ingredients) { - - ingredients.setInputLists(ItemStack.class, Lists.newArrayList(inputs, Lists.newArrayList(catalyst))); - ingredients.setOutput(ItemStack.class, output); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java deleted file mode 100644 index d921befc..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import com.google.common.collect.BiMap; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class BindingRecipeMaker { - @Nonnull - public static List getRecipes() { - Map, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> alchemyArrayRecipeMap = AlchemyArrayRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList<>(); - - for (Map.Entry, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> itemStackAlchemyArrayRecipeEntry : alchemyArrayRecipeMap.entrySet()) { - List input = itemStackAlchemyArrayRecipeEntry.getValue().getInput(); - BiMap catalystMap = itemStackAlchemyArrayRecipeEntry.getValue().catalystMap; - - for (Map.Entry entry : catalystMap.entrySet()) { - ItemStack catalyst = entry.getKey().toStack(); - if (AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(input, catalyst) instanceof AlchemyArrayEffectBinding) { - ItemStack output = ((AlchemyArrayEffectBinding) itemStackAlchemyArrayRecipeEntry.getValue().getAlchemyArrayEffectForCatalyst(catalyst)).outputStack; - - BindingRecipeJEI recipe = new BindingRecipeJEI(input, catalyst, output); - recipes.add(recipe); - } - } - } - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index 96b7db2f..44d1fdd3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -1,92 +1,172 @@ -package WayofTime.bloodmagic.compat.jei.forge; +package wayoftime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.gui.ICraftingGridHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; -public class TartaricForgeRecipeCategory implements IRecipeCategory { - private static final int OUTPUT_SLOT = 0; - private static final int GEM_SLOT = 1; - private static final int INPUT_SLOT = 2; +import com.google.common.collect.Lists; - @Nonnull - private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40); - @Nonnull - private final ICraftingGridHelper craftingGridHelper; +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.drawable.IDrawable; +import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.category.IRecipeCategory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.util.ChatUtil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.TextHelper; - public TartaricForgeRecipeCategory() { - craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); - } +public class TartaricForgeRecipeCategory implements IRecipeCategory +{ + private static final int OUTPUT_SLOT = 0; + private static final int GEM_SLOT = 1; + private static final int INPUT_SLOT = 2; + public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_SOULFORGE); - @Nonnull - @Override - public String getUid() { - return Constants.Compat.JEI_CATEGORY_SOULFORGE; - } + @Nonnull + private final IDrawable background; + private final IDrawable icon; +// @Nonnull +// private final ICraftingGridHelper craftingGridHelper; - @Nonnull - @Override - public String getTitle() { - return TextHelper.localize("jei.bloodmagic.recipe.soulForge"); - } + public TartaricForgeRecipeCategory(IGuiHelper guiHelper) + { + icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.SOUL_FORGE.get())); + background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/soulforge.png"), 0, 0, 100, 40); +// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public ResourceLocation getUid() + { + return UID; + } - @Override - public void drawExtras(Minecraft minecraft) { + @Override + public List getTooltipStrings(RecipeTartaricForge recipe, double mouseX, double mouseY) + { + List tooltip = Lists.newArrayList(); + if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34) + { + tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.minimumsouls", ChatUtil.DECIMAL_FORMAT.format(recipe.getMinimumSouls()))); + tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.soulsdrained", ChatUtil.DECIMAL_FORMAT.format(recipe.getSoulDrain()))); + } + return tooltip; + } - } + @Nonnull + @Override + public String getTitle() + { + return TextHelper.localize("jei.bloodmagic.recipe.soulforge"); + } - @Nullable - @Override - public IDrawable getIcon() { - return null; - } + @Nonnull + @Override + public IDrawable getBackground() + { + return background; + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull TartaricForgeRecipeJEI recipeWrapper, @Nonnull IIngredients ingredients) { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + @Nullable + @Override + public IDrawable getIcon() + { + return icon; + } - guiItemStacks.init(OUTPUT_SLOT, false, 73, 13); - guiItemStacks.init(GEM_SLOT, true, 42, 0); + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeTartaricForge recipe, @Nonnull IIngredients ingredients) + { + List validGems = Lists.newArrayList(); + for (DefaultWill will : DefaultWill.values()) + { + if (will.minSouls >= recipe.getMinimumSouls()) + { + validGems.add(will.willStack); + } + } - for (int y = 0; y < 3; ++y) { - for (int x = 0; x < 3; ++x) { - int index = INPUT_SLOT + x + (y * 3); - guiItemStacks.init(index, true, x * 18, y * 18); - } - } + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - List> inputs = ingredients.getInputs(ItemStack.class); + guiItemStacks.init(OUTPUT_SLOT, false, 73, 13); - guiItemStacks.set(GEM_SLOT, ingredients.getInputs(ItemStack.class).get(ingredients.getInputs(ItemStack.class).size() - 1)); - inputs.remove(ingredients.getInputs(ItemStack.class).size() - 1); - guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - guiItemStacks.set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); - craftingGridHelper.setInputs(guiItemStacks, inputs); - } + guiItemStacks.init(GEM_SLOT, true, 42, 0); - @Nonnull - @Override - public String getModName() { - return BloodMagic.NAME; - } + for (int y = 0; y < 2; ++y) + { + for (int x = 0; x < 2; ++x) + { + int index = INPUT_SLOT + x + (y * 2); + guiItemStacks.init(index, true, x * 18, y * 18); + } + } + + guiItemStacks.set(GEM_SLOT, validGems); + guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(VanillaTypes.ITEM).get(0)); + guiItemStacks.set(ingredients); + } + + @Override + public Class getRecipeClass() + { + return RecipeTartaricForge.class; + } + + @Override + public void setIngredients(RecipeTartaricForge recipe, IIngredients ingredients) + { + List validGems = Lists.newArrayList(); + for (DefaultWill will : DefaultWill.values()) + { + if (will.minSouls >= recipe.getMinimumSouls()) + { + validGems.add(will.willStack); + } + } + + ItemStack[] validGemStacks = new ItemStack[validGems.size()]; + for (int i = 0; i < validGemStacks.length; i++) + { + validGemStacks[i] = validGems.get(i); + } + + List ingList = Lists.newArrayList(); + ingList.add(Ingredient.fromStacks(validGemStacks)); + ingList.addAll(recipe.getInput()); + + ingredients.setInputIngredients(ingList); + ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); + } + + public enum DefaultWill + { + SOUL(new ItemStack(BloodMagicItems.MONSTER_SOUL_RAW.get()), 64), + PETTY(new ItemStack(BloodMagicItems.PETTY_GEM.get()), 64), + LESSER(new ItemStack(BloodMagicItems.LESSER_GEM.get()), 256), + COMMON(new ItemStack(BloodMagicItems.COMMON_GEM.get()), 1024); +// GREATER(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 4096), +// GRAND(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 16384); + + public final ItemStack willStack; + public final double minSouls; + + DefaultWill(ItemStack willStack, double minSouls) + { + this.willStack = willStack; + this.minSouls = minSouls; + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java deleted file mode 100644 index 16870613..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ /dev/null @@ -1,66 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Lists; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.List; - -public class TartaricForgeRecipeJEI implements IRecipeWrapper { - private RecipeTartaricForge recipe; - private List validGems = Lists.newArrayList(); - - public TartaricForgeRecipeJEI(RecipeTartaricForge recipe) { - this.recipe = recipe; - - for (DefaultWill will : DefaultWill.values()) - if (will.minSouls >= recipe.getMinimumSouls()) - this.validGems.add(will.willStack); - } - - @Override - public void getIngredients(@Nonnull IIngredients ingredients) { - List> expandedInputs = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput()); - expandedInputs.add(validGems); - ingredients.setInputLists(ItemStack.class, expandedInputs); - ingredients.setOutput(ItemStack.class, recipe.getOutput()); - } - - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - List tooltip = Lists.newArrayList(); - if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34) { - tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.minimumSouls", recipe.getMinimumSouls())); - tooltip.add(TextHelper.localize("jei.bloodmagic.recipe.soulsDrained", recipe.getSoulDrain())); - } - return tooltip; - } - - public RecipeTartaricForge getRecipe() { - return recipe; - } - - public enum DefaultWill { - SOUL(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL, 1, 0), 64), - PETTY(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 0), 64), - LESSER(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 256), - COMMON(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 1024), - GREATER(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 4096), - GRAND(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 16384); - - public final ItemStack willStack; - public final double minSouls; - - DefaultWill(ItemStack willStack, double minSouls) { - this.willStack = willStack; - this.minSouls = minSouls; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java deleted file mode 100644 index 3366cd65..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.compat.waila; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.compat.waila.provider.*; -import WayofTime.bloodmagic.tile.*; -import mcp.mobius.waila.api.IRegistrar; -import mcp.mobius.waila.api.IWailaPlugin; -import mcp.mobius.waila.api.TooltipPosition; -import mcp.mobius.waila.api.WailaPlugin; -import net.minecraft.util.ResourceLocation; - -@WailaPlugin -public class BloodMagicHwylaPlugin implements IWailaPlugin { - - public static final ResourceLocation CONFIG_SHOW_ALTAR_STATS = new ResourceLocation(BloodMagic.MODID, "show_altar_stats"); - - @Override - public void register(IRegistrar registrar) { - registrar.registerComponentProvider(DataProviderBloodAltar.INSTANCE, TooltipPosition.BODY, TileAltar.class); - registrar.registerBlockDataProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); - registrar.addConfig(CONFIG_SHOW_ALTAR_STATS, true); - - registrar.registerBodyProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); - registrar.registerNBTProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true); - - registrar.registerBodyProvider(DataProviderRitualController.INSTANCE, TileMasterRitualStone.class); - registrar.registerNBTProvider(DataProviderRitualController.INSTANCE, TileMasterRitualStone.class); - registrar.registerBodyProvider(DataProviderRitualController.INSTANCE, TileImperfectRitualStone.class); - registrar.registerNBTProvider(DataProviderRitualController.INSTANCE, TileImperfectRitualStone.class); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true); - - registrar.registerBodyProvider(DataProviderBloodTank.INSTANCE, TileBloodTank.class); - registrar.registerNBTProvider(DataProviderBloodTank.INSTANCE, TileBloodTank.class); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_BLOOD_TANK, true); - - registrar.registerStackProvider(DataProviderAlchemyArray.INSTANCE, TileAlchemyArray.class); - registrar.registerBodyProvider(DataProviderAlchemyArray.INSTANCE, TileAlchemyArray.class); - registrar.registerNBTProvider(DataProviderAlchemyArray.INSTANCE, TileAlchemyArray.class); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true); - - registrar.registerStackProvider(DataProviderMimic.INSTANCE, TileMimic.class); - registrar.registerNBTProvider(DataProviderMimic.INSTANCE, TileMimic.class); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java deleted file mode 100644 index 31471c74..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ /dev/null @@ -1,56 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.List; - -public class DataProviderAlchemyArray implements IWailaDataProvider { - - public static final IWailaDataProvider INSTANCE = new DataProviderAlchemyArray(); - - @Nonnull - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextFormatting.WHITE + RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName()); - } - - @Nonnull - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ARRAY)) - return currenttip; - - if (accessor.getNBTData().hasKey("reagent")) - currenttip.add(TextHelper.localize("waila.bloodmagic.array.reagent", accessor.getNBTData().getString("reagent"))); - if (accessor.getNBTData().hasKey("catalyst")) - currenttip.add(TextHelper.localize("waila.bloodmagic.array.catalyst", accessor.getNBTData().getString("catalyst"))); - - return currenttip; - } - - @Nonnull - @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - TileAlchemyArray alchemyArray = (TileAlchemyArray) te; - if (!alchemyArray.getStackInSlot(0).isEmpty()) - tag.putString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); - if (!alchemyArray.getStackInSlot(1).isEmpty()) - tag.putString("catalyst", alchemyArray.getStackInSlot(1).getDisplayName()); - return tag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java deleted file mode 100644 index 95169561..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ /dev/null @@ -1,116 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.compat.waila.BloodMagicHwylaPlugin; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import WayofTime.bloodmagic.tile.TileAltar; -import mcp.mobius.waila.api.IComponentProvider; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import mcp.mobius.waila.api.IServerDataProvider; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; - -import java.util.List; - -/** - * Integrated from WailaPlugins by tterrag1098. Originally implemented - * in ImLookingAtBlood by Pokefenn. - */ -public class DataProviderBloodAltar implements IComponentProvider, IServerDataProvider { - - public static final DataProviderBloodAltar INSTANCE = new DataProviderBloodAltar(); - - @Override - public void appendBody(List tooltip, IDataAccessor accessor, IPluginConfig config) { - if (!config.get(BloodMagicHwylaPlugin.CONFIG_SHOW_ALTAR_STATS)) - return; - - if (accessor.getServerData().contains("altar")) { - CompoundNBT altarData = accessor.getServerData().getCompound("altar"); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInt("tier"))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInt("capacity"))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInt("stored"))); - - if (altarData.contains("charge")) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", altarData.getInt("progress") + "%")); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentCharge", altarData.getInt("charge"))); - } - } - } - - @Override - public void appendServerData(CompoundNBT tag, ServerPlayerEntity player, World world, TileEntity tileEntity) { - TileAltar altar = (TileAltar) tileEntity; - - boolean hasSigil = false; - boolean hasSeer = false; - - switch (ConfigHandler.compat.wailaAltarDisplayMode) { - case ALWAYS: { - hasSigil = hasSeer = true; - break; - } - case SIGIL_HELD: { - hasSeer = holdingSeerSigil(player); - hasSigil = hasSeer || holdingDivinationSigil(player); - break; - } - case SIGIL_CONTAINED: { - hasSeer = hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), player); - hasSigil = hasSeer || hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), player); - break; - } - } - - if (!hasSeer && !hasSigil) - return; - - CompoundNBT altarData = new CompoundNBT(); - altarData.putInt("tier", altar.getTier().toInt()); - altarData.putInt("capacity", altar.getCapacity()); - altarData.putInt("stored", altar.getCurrentBlood()); - if (hasSeer) { - altarData.putInt("progress", (int) (((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100) / altar.getStackInSlot(0).getCount())); - altarData.putInt("charge", altar.getTotalCharge()); - } - - tag.put("altar", altarData); - } - - public static boolean hasStack(ItemStack stack, PlayerEntity player) { - for (ItemStack inventoryStack : player.inventory.mainInventory) - if (inventoryStack != null && inventoryStack.isItemEqual(stack)) - return true; - - return false; - } - - private static boolean holdingSeerSigil(PlayerEntity player) { - if (player.getHeldItemMainhand().getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - return true; - - if (player.getHeldItemOffhand().getItem() == RegistrarBloodMagicItems.SIGIL_SEER) - return true; - - return false; - } - - private static boolean holdingDivinationSigil(PlayerEntity player) { - if (player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination) - return true; - - if (!player.getHeldItemOffhand().isEmpty() && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination) - return true; - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java deleted file mode 100644 index 6083ae52..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ /dev/null @@ -1,51 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.tile.TileBloodTank; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; - -import javax.annotation.Nonnull; -import java.util.List; - -public class DataProviderBloodTank implements IWailaDataProvider { - - public static final IWailaDataProvider INSTANCE = new DataProviderBloodTank(); - - @Nonnull - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_BLOOD_TANK) && !config.getConfig("capability.tankinfo")) - return currenttip; - - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.tier", accessor.getNBTData().getInteger("tier"))); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.capacity", accessor.getNBTData().getInteger("capacity"))); - if (accessor.getNBTData().hasKey("fluid")) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(accessor.getNBTData().getCompoundTag("fluid")); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.type", fluidStack.getLocalizedName())); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.amount", fluidStack.amount, accessor.getNBTData().getInteger("capacity"))); - } - - return currenttip; - } - - @Nonnull - @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - TileBloodTank tank = (TileBloodTank) te; - tag.putInt("tier", tank.getBlockMetadata() + 1); - tag.putInt("capacity", tank.capacity); - if (tank.getTank().getFluid() != null) - tag.put("fluid", tank.getTank().getFluid().writeToNBT(new CompoundNBT())); - return tag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java deleted file mode 100644 index 551fb29f..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ /dev/null @@ -1,57 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import WayofTime.bloodmagic.tile.TileMimic; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -import javax.annotation.Nonnull; - -public class DataProviderMimic implements IWailaDataProvider { - - public static final IWailaDataProvider INSTANCE = new DataProviderMimic(); - - @Nonnull - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getNBTData().hasKey("mimiced")) { - CompoundNBT mimiced = accessor.getNBTData().getCompoundTag("mimiced"); - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(mimiced.getString("id"))); - int meta = mimiced.getInteger("data"); - ItemStack ret = new ItemStack(item, 1, meta); - if (mimiced.hasKey("nbt")) - ret.setTagCompound(mimiced.getCompoundTag("nbt")); - - return ret; - } - - return ItemStack.EMPTY; - } - - @Nonnull - @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - TileMimic mimic = (TileMimic) te; - ItemStack mimiced = mimic.getStackInSlot(0); - if (!mimiced.isEmpty()) { - CompoundNBT item = new CompoundNBT(); - item.setString("id", mimiced.getItem().getRegistryName().toString()); - item.setInteger("data", mimiced.getMetadata()); - CompoundNBT shareTag = mimiced.getItem().getNBTShareTag(mimiced); - if (shareTag != null) - item.setTag("nbt", shareTag); - - tag.put("mimiced", item); - } - return tag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java deleted file mode 100644 index 5d6bad56..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ /dev/null @@ -1,80 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.List; - -public class DataProviderRitualController implements IWailaDataProvider { - - public static final IWailaDataProvider INSTANCE = new DataProviderRitualController(); - - @Nonnull - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_RITUAL)) - return currenttip; - - CompoundNBT tag = accessor.getNBTData(); - if (tag.getBoolean("master")) { - if (tag.hasKey("ritual")) { - currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); - if (tag.hasKey("owner")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", tag.getString("owner"))); - if (!tag.getBoolean("active")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.deactivated")); - if (!tag.getBoolean("enabled")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); - } - } else { - if (tag.hasKey("ritual")) { - currenttip.add(TextHelper.localizeEffect(tag.getString("ritual"))); - if (!tag.getBoolean("enabled")) - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.config.disabled")); - } - } - - return currenttip; - } - - @Nonnull - @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - - if (te instanceof TileMasterRitualStone) { - TileMasterRitualStone mrs = (TileMasterRitualStone) te; - tag.putBoolean("master", true); - if (mrs.getCurrentRitual() != null) { - tag.putString("ritual", mrs.getCurrentRitual().getTranslationKey()); - tag.putBoolean("active", mrs.isActive()); - if (mrs.getOwner() != null) - tag.putString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); - tag.putBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(mrs.getCurrentRitual()), false)); - } - } else { - tag.putBoolean("master", false); - - ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); - if (ritual != null) { - tag.putString("ritual", ritual.getTranslationKey()); - tag.putBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); - } - } - - return tag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java deleted file mode 100644 index 03b9611b..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import org.apache.commons.lang3.text.WordUtils; - -import javax.annotation.Nonnull; -import java.util.List; - -public class DataProviderTeleposer implements IWailaDataProvider { - - public static final IWailaDataProvider INSTANCE = new DataProviderTeleposer(); - - @Nonnull - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_TELEPOSER)) - return currenttip; - - if (accessor.getNBTData().hasKey("focus")) { - CompoundNBT focusData = accessor.getNBTData().getCompoundTag("focus"); - BlockPos boundPos = NBTUtil.getPosFromTag(focusData.getCompoundTag("pos")); - int boundDim = focusData.getInteger("dim"); - String dimName = WordUtils.capitalizeFully(DimensionManager.getProviderType(boundDim).getName().replace("_", " ")); - - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.bound", dimName, boundPos.getX(), boundPos.getY(), boundPos.getZ())); - } - - return currenttip; - } - - @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - TileTeleposer teleposer = (TileTeleposer) te; - ItemStack contained = teleposer.getStackInSlot(0); - if (!contained.isEmpty() && contained.hasTagCompound()) { - ItemTelepositionFocus focus = (ItemTelepositionFocus) contained.getItem(); - CompoundNBT focusData = new CompoundNBT(); - focusData.setTag("pos", NBTUtil.createPosTag(focus.getBlockPos(contained))); - focusData.setInteger("dim", contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); - tag.put("focus", focusData); - } - return tag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java deleted file mode 100644 index e2dc02d1..00000000 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -package WayofTime.bloodmagic.compress; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.Tuple; -import net.minecraft.world.World; - - -public class AdvancedCompressionHandler extends CompressionHandler { - - public ItemStack compressInventory(ItemStack[] inv, World world) { - for (ItemStack invStack : inv) { - if (invStack.isEmpty()) { - continue; - } - - for (int i = 3; i >= 2; i--) { - ItemStack invStackCopy = invStack.copy(); - invStackCopy.setCount(1); - Tuple stackTuple = CompressionRegistry.compressionMap.get(invStackCopy); - ItemStack stack; - if (stackTuple == null) { - StorageBlockCraftingManager.reversibleCheck = invStack; - stack = StorageBlockCraftingManager.getRecipe(invStack, world, i); - if (stack.isEmpty()) - continue; - CompressionRegistry.compressionMap.put(invStackCopy, new Tuple<>(stack, i * i)); - } else { - stack = stackTuple.getFirst(); - if (stackTuple.getSecond() != i * i) - return ItemStack.EMPTY; - } - - if (!stack.isEmpty()) { - - int needed = (i == 2 ? 4 : 9); - int remaining = iterateThroughInventory(invStack, CompressionRegistry.getItemThreshold(invStack, needed), inv, needed, true); - if (remaining <= 0) - return stack; - } - } - } - - return ItemStack.EMPTY; - } - - -} diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java deleted file mode 100644 index 59530a63..00000000 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -package WayofTime.bloodmagic.compress; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class BaseCompressionHandler extends CompressionHandler { - private final ItemStack required; - private final ItemStack result; - private final int leftover; - - public BaseCompressionHandler(ItemStack input, ItemStack output, int remainder) { - super(); - this.required = input; - this.result = output; - this.leftover = remainder; - } - - public ItemStack getResultStack() { - return this.result.copy(); - } - - public ItemStack getRequiredStack() { - return this.required.copy(); - } - - @Override - public ItemStack compressInventory(ItemStack[] inv, World world) { - int remaining = this.getRemainingNeeded(inv); - if (remaining <= 0) { - this.drainInventory(inv); - return this.getResultStack(); - } - - return ItemStack.EMPTY; - } - - public int getRemainingNeeded(ItemStack[] inv) { - int needed = this.required.getCount(); - int kept = this.getLeftover(); - return iterateThroughInventory(this.required, kept, inv, needed, true); - } - - public int drainInventory(ItemStack[] inv) { - int needed = this.required.getCount(); - int kept = this.getLeftover(); - return iterateThroughInventory(this.required, kept, inv, needed, true); - } - - public int getLeftover() { - return this.leftover; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java deleted file mode 100644 index 715a7b19..00000000 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.compress; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.HashSet; -import java.util.Set; - -public abstract class CompressionHandler { - /** - * Called to look at the inventory and syphons the required stack. Returns - * resultant stack if successful, and null if not. - * - * @param inv The inventory iterated through - * @return The result of the compression - */ - public abstract ItemStack compressInventory(ItemStack[] inv, World world); - - public int iterateThroughInventory(ItemStack required, int kept, ItemStack[] inv, int needed, boolean doDrain) { - int oldNeeded = needed; - int i = -1; - Set consumeSet = new HashSet<>(); - - for (ItemStack invStack : inv) { - i++; - - if (invStack.isEmpty()) { - continue; - } - - if (invStack.isItemEqual(required) && (invStack.getTagCompound() == null ? required.getTagCompound() == null : invStack.getTagCompound().equals(required.getTagCompound()))) { - int stackSize = invStack.getCount(); - int used = 0; - if (kept > 0) { - int remainingFromStack = Math.max(stackSize - kept, 0); - used += stackSize - remainingFromStack; - } - - kept -= used; - - if (kept <= 0 && needed > 0) { - int remainingFromStack = Math.max(stackSize - used - needed, 0); - needed -= (stackSize - used - remainingFromStack); - if (needed != 0 && needed < oldNeeded) { - consumeSet.add(i); - } - - if (doDrain && (!(needed < oldNeeded) || needed == 0)) { - invStack.setCount(remainingFromStack + used); - for (Integer j : consumeSet) { - inv[j].setCount(0); - inv[j] = ItemStack.EMPTY; - } - consumeSet.clear(); - if (invStack.isEmpty()) { - inv[i] = ItemStack.EMPTY; - } - } - } - if (needed <= 0) { - return 0; - } - } - } - return needed; - - - } - -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java deleted file mode 100644 index fb1de055..00000000 --- a/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java +++ /dev/null @@ -1,103 +0,0 @@ -package WayofTime.bloodmagic.compress; - -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Tuple; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * A registry aimed to help compress items in an inventory into its compressible - * form. - */ -public class CompressionRegistry { - private static List compressionRegistry = new ArrayList<>(); - public static Map thresholdMap = new HashMap<>(); - static Map> compressionMap = new HashMap<>(); - - public static void registerHandler(CompressionHandler handler) { - compressionRegistry.add(handler); - } - - /** - * Registers an item so that it only compresses while above this threshold - * - * @param stack item/block to be compressed - * @param threshold amount that is to be compressed - */ - public static void registerItemThreshold(ItemStack stack, int threshold) { - thresholdMap.put(stack, threshold); - } - - public static ItemStack compressInventory(ItemStack[] inv, World world) { - for (CompressionHandler handler : compressionRegistry) { - ItemStack stack = handler.compressInventory(inv, world); - if (!stack.isEmpty()) { - return stack; - } - } - - return null; - } - - public static Pair compressInventory(TileEntity tile, World world) { - if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) { - IItemHandler itemHandler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - ItemStack[] inventory = new ItemStack[itemHandler.getSlots()]; //THIS MUST NOT BE EDITED! - ItemStack[] copyInventory = new ItemStack[itemHandler.getSlots()]; - - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - inventory[slot] = itemHandler.extractItem(slot, 64, true); - copyInventory[slot] = inventory[slot].copy(); - } - - for (CompressionHandler handler : compressionRegistry) { - ItemStack stack = handler.compressInventory(copyInventory, world); - if (!stack.isEmpty()) { - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - if (inventory[slot] != null && !ItemStack.areItemStacksEqual(inventory[slot], copyInventory[slot])) { - itemHandler.extractItem(slot, inventory[slot].getCount(), false); - if (copyInventory[slot] != null) { - itemHandler.insertItem(slot, copyInventory[slot], false); - } - } - } - - return Pair.of(Utils.insertStackIntoTile(stack, itemHandler), true); - } - } - } - - return Pair.of(ItemStack.EMPTY, false); - } - - - public static int getItemThreshold(ItemStack stack, int needed) { - Integer threshold = thresholdMap.get(stack); - if (threshold != null) - return threshold; - else - return stack.getMaxStackSize() - needed; - } - - public static int getItemThreshold(ItemStack stack) { - Integer threshold = thresholdMap.get(stack); - if (threshold != null) - return threshold; - else - return stack.getMaxStackSize(); - } - - - public static boolean areItemStacksEqual(ItemStack stack, ItemStack compressedStack) { - return stack.isItemEqual(compressedStack) && (stack.getTagCompound() == null ? !compressedStack.hasTagCompound() : stack.getTagCompound().equals(compressedStack.getTagCompound())); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java deleted file mode 100644 index 4b61f7e0..00000000 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ /dev/null @@ -1,160 +0,0 @@ -package WayofTime.bloodmagic.compress; - -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; - -import java.util.HashSet; -import java.util.Set; - -public class StorageBlockCraftingManager { - private static final StorageBlockCraftingManager instance = new StorageBlockCraftingManager(); - private static CraftingInventory[] inventoryCrafting = { - new CraftingInventory(new Container() { - public boolean canInteractWith(PlayerEntity player) { - return false; - } - }, - 3, 3), - new CraftingInventory(new Container() { - public boolean canInteractWith(PlayerEntity player) { - return false; - } - }, - 2, 2), - new CraftingInventory(new Container() { - public boolean canInteractWith(PlayerEntity player) { - return false; - } - }, - 1, 1) - - }; - static ItemStack reversibleCheck; - private HashSet recipes = new HashSet<>(); // TODO: Clear when recipes are reloaded in 1.14 - private Set blacklist = new HashSet<>(); - - public static boolean isResultStackReversible(ItemStack stack, World world) { - if (stack.isEmpty()) { - return false; - } - - inventoryCrafting[2].setInventorySlotContents(0, stack); - ItemStack returnStack = getNNRecipeOutput(inventoryCrafting[2], world); - - return !returnStack.isEmpty() && CompressionRegistry.areItemStacksEqual(reversibleCheck, returnStack); - } - - public static ItemStack getRecipe(ItemStack stack, World world, int gridSize) { - StorageBlockCraftingManager craftingManagerSB = getInstance(); - if (craftingManagerSB.blacklist.contains(stack)) { - return ItemStack.EMPTY; - } - CraftingInventory inventory = inventoryCrafting[3 - gridSize]; - for (int i = 0; i < inventory.getSizeInventory(); i++) { - inventory.setInventorySlotContents(i, stack); - } - ItemStack notEmptyRecipe = craftingManagerSB.findMatchingRecipe(inventory, world); - if (!notEmptyRecipe.isEmpty()) { - return notEmptyRecipe; - } - ItemStack result = getNNRecipeOutput(inventory, world); - - if (isResultStackReversible(result, world)) { - craftingManagerSB.addRecipe(CraftingManager.findMatchingRecipe(inventory, world)); - return result; - } - craftingManagerSB.blacklist.add(stack); - return ItemStack.EMPTY; - } - - public static ItemStack getNNRecipeOutput(CraftingInventory inventory, World world) { - IRecipe checkForNull = CraftingManager.findMatchingRecipe(inventory, world); - if (checkForNull != null) { - return checkForNull.getRecipeOutput(); - } - return ItemStack.EMPTY; - } - - public static ItemStack get22Recipe(ItemStack stack, World world) { - return getRecipe(stack, world, 2); - } - - public static ItemStack get33Recipe(ItemStack stack, World world) { - return getRecipe(stack, world, 3); - } - - public void addRecipe(IRecipe recipe) { - this.recipes.add(recipe); - } - - //recipes are currently added during runtime, this will only return recipes specifically added in init - //through BaseCompressionHandler - public void addStorageBlockRecipes() { - - //this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); - BMLog.DEBUG.info("Total number of compression recipes: " + this.recipes.size()); - } - - public ItemStack findMatchingRecipe(CraftingInventory craftingInventory, World world) { - return this.findMatchingRecipe(craftingInventory, world, this.recipes); - } - - private ItemStack findMatchingRecipe(CraftingInventory craftingInventory, World world, HashSet list) { - int i = 0; - ItemStack itemstack = ItemStack.EMPTY; - ItemStack itemstack1 = ItemStack.EMPTY; - int j; - - for (j = 0; j < craftingInventory.getSizeInventory(); ++j) { - ItemStack itemstack2 = craftingInventory.getStackInSlot(j); - - if (!itemstack2.isEmpty()) { - if (i == 0) { - itemstack = itemstack2; - } - - if (i == 1) { - itemstack1 = itemstack2; - } - - ++i; - } - } - - if (i == 2 && itemstack.getItem() == itemstack1.getItem() && itemstack.getCount() == 1 && itemstack1.getCount() == 1 && itemstack.getItem().isRepairable()) { - Item item = itemstack.getItem(); - int j1 = item.getMaxDamage(itemstack) - itemstack.getItemDamage(); - int k = item.getMaxDamage(itemstack) - itemstack1.getItemDamage(); - int l = j1 + k + item.getMaxDamage(itemstack) * 5 / 100; - int i1 = item.getMaxDamage(itemstack) - l; - - if (i1 < 0) { - i1 = 0; - } - - return new ItemStack(itemstack.getItem(), 1, i1); - } else { - for (IRecipe iRecipe : list) { - - if (iRecipe.matches(craftingInventory, world)) { - return iRecipe.getCraftingResult(craftingInventory); - } - } - - return ItemStack.EMPTY; - } - } - - public static StorageBlockCraftingManager getInstance() { - return instance; - } - - -} diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java deleted file mode 100644 index b5870b6d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java +++ /dev/null @@ -1,285 +0,0 @@ -package WayofTime.bloodmagic.compress; - -public class StorageBlockCraftingRecipeAssimilator { -// public static final List ignore = new ArrayList(); -// -// public List getPackingRecipes() -// { -// // grab all recipes potentially suitable for packing or unpacking -// -// List packingRecipes = new LinkedList(); -// List unpackingRecipes = new ArrayList(); -// -// for (IRecipe recipe : getCraftingRecipes()) -// { -// if (ignore.contains(recipe.getClass())) -// continue; -// -// ItemStack output = recipe.getRecipeOutput(); -// if (output.isEmpty()) -// continue; -// -// if (output.getCount() == 1) -// { -// PackingRecipe packingRecipe = getPackingRecipe(recipe); -// -// if (packingRecipe != null) -// { -// packingRecipes.add(packingRecipe); -// } -// } else if ((output.getCount() == 4 || output.getCount() == 9) && recipe.canFit(1, 1)) -// { -// unpackingRecipes.add(recipe); -// } -// } -// -// // grab all packing recipes which accept the output of any of the -// // unpacking recipes -// -// Container container = makeDummyContainer(); -// InventoryCrafting inventoryUnpack = new InventoryCrafting(container, 2, 2); -// InventoryCrafting inventory2x2 = new InventoryCrafting(container, 2, 2); -// InventoryCrafting inventory3x3 = new InventoryCrafting(container, 3, 3); -// World world = null; // TODO: use a proper dummy world? -// -// List ret = new ArrayList(); -// -// for (IRecipe recipeUnpack : unpackingRecipes) -// { -// if (ignore.contains(recipeUnpack.getClass())) -// continue; -// -// ItemStack unpacked = recipeUnpack.getRecipeOutput(); -// InventoryCrafting inventory = null; -// -// for (Iterator it = packingRecipes.iterator(); it.hasNext();) -// { -// PackingRecipe recipePack = it.next(); -// -// // check if the packing recipe accepts the unpacking recipe's output -// -// boolean matched = false; -// -// if (recipePack.possibleInputs != null) -// { -// // the recipe could be parsed, use its inputs directly since that's faster verify recipe size -// -// if (recipePack.inputCount != unpacked.getCount()) -// continue; -// -// // check if any of the input options matches the unpacked -// // item stack -// -// for (ItemStack stack : recipePack.possibleInputs) -// { -// if (areInputsIdentical(unpacked, stack)) -// { -// matched = true; -// break; -// } -// } -// } else -// { -// // unknown IRecipe, check through the recipe conventionally verify recipe size for 3x3 to skip anything smaller quickly -// -// if (unpacked.getCount() == 9 && recipePack.recipe.getIngredients().size() < 9) -// continue; -// -// // initialize inventory late, but only once per unpack recipe -// -// if (inventory == null) -// { -// if (unpacked.getCount() == 4) -// { -// inventory = inventory2x2; -// } else -// { -// inventory = inventory3x3; -// } -// -// for (int i = 0; i < unpacked.getCount(); i++) -// { -// inventory.setInventorySlotContents(i, unpacked.copy()); -// } -// } -// -// // check if the packing recipe accepts the unpacked item -// // stack -// -// matched = recipePack.recipe.matches(inventory, world); -// } -// -// if (matched) -// { -// // check if the unpacking recipe accepts the packing -// // recipe's output -// -// ItemStack packOutput = recipePack.recipe.getRecipeOutput(); -// inventoryUnpack.setInventorySlotContents(0, packOutput.copy()); -// -// if (recipeUnpack.matches(inventoryUnpack, world)) -// { -// ret.add(recipePack.recipe); -// it.remove(); -// } -// } -// } -// } -// -// return ret; -// } -// -// @SuppressWarnings("unchecked") -// private List getCraftingRecipes() -// { -// return ForgeRegistries.RECIPES.getValues(); -// } -// -// private Container makeDummyContainer() -// { -// return new Container() -// { -// @Override -// public boolean canInteractWith(EntityPlayer player) -// { -// return true; -// } -// }; -// } -// -// private PackingRecipe getPackingRecipe(IRecipe recipe) -// { -// if (recipe.getIngredients().size() < 4) -// return null; -// -// List inputs = recipe.getIngredients(); -// -// // check if the recipe inputs are size 4 or 9 -// -// int count = 0; -// -// for (Object o : inputs) -// { -// if (o != null) -// count++; -// } -// -// if (count != 4 && count != 9) -// return null; -// -// // grab identical inputs -// -// List identicalInputs = getIdenticalInputs(inputs); -// if (identicalInputs == null) -// return null; -// -// return new PackingRecipe(recipe, identicalInputs, count); -// } -// -// /** -// * Determine the item stacks from the provided inputs which are suitable for -// * every input element. -// * -// * @param inputs -// * List of all inputs, null elements are being ignored. -// * @return List List of all options. -// */ -// @SuppressWarnings("unchecked") -// private List getIdenticalInputs(List inputs) -// { -// List options = null; -// -// for (Ingredient input : inputs) -// { -// if (input == null) -// continue; -// -// List offers; -// -// if (input. instanceof ItemStack) -// { -// offers = Collections.singletonList((ItemStack) input); -// } else if (input instanceof List) -// { -// offers = (List) input; -// -// if (offers.isEmpty()) -// return null; -// } else -// { -// throw new RuntimeException("invalid input: " + input.getClass()); -// } -// -// if (options == null) -// { -// options = new ArrayList(offers); -// continue; -// } -// -// for (Iterator it = options.iterator(); it.hasNext();) -// { -// ItemStack stackReq = it.next(); -// boolean found = false; -// -// for (ItemStack stackCmp : offers) -// { -// if (areInputsIdentical(stackReq, stackCmp)) -// { -// found = true; -// break; -// } -// } -// -// if (!found) -// { -// it.remove(); -// -// if (options.isEmpty()) -// return null; -// } -// } -// } -// -// return options; -// } -// -// private boolean areInputsIdentical(ItemStack a, ItemStack b) -// { -// -// try -// { -// if (a.getItem() != b.getItem()) -// return false; -// -// int dmgA = a.getItemDamage(); -// int dmgB = b.getItemDamage(); -// -// return dmgA == dmgB || dmgA == OreDictionary.WILDCARD_VALUE || dmgB == OreDictionary.WILDCARD_VALUE; -// } catch (NullPointerException e) -// { -// -// BloodMagic.instance.getLogger().error("A mod in this instance has registered an item with a null input. Known problem mods are:"); -// -// // String err = ""; -// // for (String problem : problemMods) -// // err += (err.length() > 0 ? ", " : "") + problem; -// // BloodMagic.instance.getLogger().error(err); -// -// return false; -// } -// } -// -// private static class PackingRecipe -// { -// PackingRecipe(IRecipe recipe, List possibleInputs, int inputCount) -// { -// this.recipe = recipe; -// this.possibleInputs = possibleInputs; -// this.inputCount = inputCount; -// } -// -// final IRecipe recipe; -// final List possibleInputs; -// final int inputCount; -// } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index e5aaa84a..521fba53 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,159 +1,30 @@ -package WayofTime.bloodmagic.core; +package wayoftime.bloodmagic.core; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.entity.mob.*; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.potion.PotionBloodMagic; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.potion.Effect; -import net.minecraft.potion.Effects; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityEntryBuilder; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.RegistryBuilder; +import wayoftime.bloodmagic.BloodMagic; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) -@GameRegistry.ObjectHolder(BloodMagic.MODID) -public class RegistrarBloodMagic { +public class RegistrarBloodMagic +{ + private RegistrarBloodMagic() + { - private static final BloodOrb ORB_DEF = new BloodOrb("", 0, 0, 0); - @GameRegistry.ObjectHolder("weak") - public static final BloodOrb ORB_WEAK = ORB_DEF; - @GameRegistry.ObjectHolder("apprentice") - public static final BloodOrb ORB_APPRENTICE = ORB_DEF; - @GameRegistry.ObjectHolder("magician") - public static final BloodOrb ORB_MAGICIAN = ORB_DEF; - @GameRegistry.ObjectHolder("master") - public static final BloodOrb ORB_MASTER = ORB_DEF; - @GameRegistry.ObjectHolder("archmage") - public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; - @GameRegistry.ObjectHolder("transcendent") - public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; + } - public static final Effect BOOST = Effects.HASTE; - public static final Effect WHIRLWIND = Effects.HASTE; - public static final Effect PLANAR_BINDING = Effects.HASTE; - public static final Effect SOUL_SNARE = Effects.HASTE; - public static final Effect SOUL_FRAY = Effects.HASTE; - public static final Effect FIRE_FUSE = Effects.HASTE; - public static final Effect CONSTRICT = Effects.HASTE; - public static final Effect PLANT_LEECH = Effects.HASTE; - public static final Effect DEAFNESS = Effects.HASTE; - public static final Effect BOUNCE = Effects.HASTE; - public static final Effect CLING = Effects.HASTE; - public static final Effect SACRIFICIAL_LAMB = Effects.HASTE; - public static final Effect FLIGHT = Effects.HASTE; - public static final Effect GROUNDED = Effects.HASTE; - public static final Effect HEAVY_HEART = Effects.HASTE; - public static final Effect SUSPENDED = Effects.HASTE; - public static final Effect FEATHERED = Effects.HASTE; +// public static final BloodOrbDeferredRegister BLOOD_ORBS = new BloodOrbDeferredRegister(BloodMagic.MODID); +// +// public static final BloodOrbRegistryObject ORB_WEAK = BLOOD_ORBS.register("weakbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weakbloodorb"), 0, 5000, 10)); - public static IForgeRegistry BLOOD_ORBS = null; +// public static IForgeRegistry BLOOD_ORBS = new RegistryBuilder().setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")).setIDRange(0, Short.MAX_VALUE).setType(BloodOrb.class).addCallback((IForgeRegistry.AddCallback) ( +// owner, stage, id, obj, +// oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj))).create(); - @SubscribeEvent - public static void registerBloodOrbs(RegistryEvent.Register event) { - ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName(); - event.getRegistry().registerAll( - new BloodOrb("weak", 1, 5000, 2).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), - new BloodOrb("apprentice", 2, 25000, 5).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"), - new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), - new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), - new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage") - ); - if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { - event.getRegistry().register( - new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") - ); - } - } - - @SubscribeEvent - public static void registerPotions(RegistryEvent.Register event) { - event.getRegistry().registerAll( - new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 0).setRegistryName("boost"), - new PotionBloodMagic("Whirlwind", false, 0xFFFFFF, 0, 0).setRegistryName("whirlwind"), - new PotionBloodMagic("Planar Binding", false, 0, 2, 0).setRegistryName("planar_binding"), - new PotionBloodMagic("Soul Snare", false, 0xFFFFFF, 3, 0).setRegistryName("soul_snare"), - new PotionBloodMagic("Soul Fray", true, 0xFFFFFF, 4, 0).setRegistryName("soul_fray"), - new PotionBloodMagic("Fire Fuse", true, 0xFF3333, 5, 0).setRegistryName("fire_fuse"), - new PotionBloodMagic("Constriction", true, 0x000000, 6, 0).setRegistryName("constrict"), - new PotionBloodMagic("Plant Leech", true, 0x000000, 7, 0).setRegistryName("plant_leech"), - new PotionBloodMagic("Deaf", true, 0x000000, 0, 1).setRegistryName("deafness"), - new PotionBloodMagic("Bounce", false, 0x000000, 1, 1).setRegistryName("bounce"), - new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"), - new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb"), - new PotionBloodMagic("Flight", false, 0x000000, 4, 0).setRegistryName("flight"), - new PotionBloodMagic("Grounded", true, 0x000000, 1, 0).setRegistryName("grounded"), - new PotionBloodMagic("Suspended", false, 0x000000, 1, 0).setRegistryName("suspended"), - new PotionBloodMagic("Heavy Heart", true, 0x000000, 1, 0).setRegistryName("heavy_heart"), - new PotionBloodMagic("Feathered", false, 0x000000, 0, 0).setRegistryName("feathered") - ); - } - - @SubscribeEvent - public static void registerEntities(RegistryEvent.Register event) { - int entities = 0; - - event.getRegistry().registerAll( - EntityEntryBuilder.create().id("blood_light", ++entities).entity(EntityBloodLight.class).name("blood_light").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("soul_snare", ++entities).entity(EntitySoulSnare.class).name("soul_snare").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("soul_arrow", ++entities).entity(EntitySentientArrow.class).name("sentient_arrow").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("meteor", ++entities).entity(EntityMeteor.class).name("meteor").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("sentient_specter", ++entities).entity(EntitySentientSpecter.class).name("sentient_specter").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("mimic", ++entities).entity(EntityMimic.class).name("mimic").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("corrupted_zombie", ++entities).entity(EntityCorruptedZombie.class).name("corrupted_zombie").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("corrupted_sheep", ++entities).entity(EntityCorruptedSheep.class).name("corrupted_sheep").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("corrupted_chicken", ++entities).entity(EntityCorruptedChicken.class).name("corrupted_chicken").tracker(16 * 4, 3, true).build(), - EntityEntryBuilder.create().id("corrupted_spider", ++entities).entity(EntityCorruptedSpider.class).name("corrupted_spider").tracker(16 * 4, 3, true).build() - ); - } - - @SubscribeEvent - public static void onRegistryCreation(RegistryEvent.NewRegistry event) { - BLOOD_ORBS = new RegistryBuilder() - .setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")) - .setIDRange(0, Short.MAX_VALUE) - .setType(BloodOrb.class) - .addCallback((IForgeRegistry.AddCallback) (owner, stage, id, obj, oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj))) - .create(); - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) { - for (BloodOrb orb : BLOOD_ORBS) { - ModelResourceLocation modelLocation = orb.getModelLocation(); - if (modelLocation == null) - modelLocation = new ModelResourceLocation(orb.getRegistryName(), "inventory"); - - ModelLoader.registerItemVariants(RegistrarBloodMagicItems.BLOOD_ORB, modelLocation); - } - - ModelLoader.setCustomMeshDefinition(RegistrarBloodMagicItems.BLOOD_ORB, stack -> - { - if (!stack.hasTagCompound()) - return new ModelResourceLocation(ORB_WEAK.getRegistryName(), "inventory"); - - BloodOrb orb = BLOOD_ORBS.getValue(new ResourceLocation(stack.getTagCompound().getString("orb"))); - if (orb == null || orb.getModelLocation() == null) - return new ModelResourceLocation(ORB_WEAK.getRegistryName(), "inventory"); - - return orb.getModelLocation(); - }); - } +// @SubscribeEvent +// public static void onRegistryCreation(RegistryEvent.NewRegistry event) +// { +// System.out.println("Testification3"); +// BLOOD_ORBS = new RegistryBuilder().setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")).setIDRange(0, Short.MAX_VALUE).setType(BloodOrb.class).addCallback((IForgeRegistry.AddCallback) ( +// owner, stage, id, obj, +// oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj))).create(); +// } } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java deleted file mode 100644 index 62815e21..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ /dev/null @@ -1,167 +0,0 @@ -package WayofTime.bloodmagic.core; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.*; -import WayofTime.bloodmagic.block.enums.*; -import WayofTime.bloodmagic.tile.*; -import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; -import com.google.common.collect.Lists; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -@GameRegistry.ObjectHolder(BloodMagic.MODID) -@SuppressWarnings("unused") -public class RegistrarBloodMagicBlocks { - public static final Block ALTAR = Blocks.AIR; - public static final Block BLOOD_RUNE = Blocks.AIR; - public static final Block RITUAL_CONTROLLER = Blocks.AIR; - public static final Block RITUAL_STONE = Blocks.AIR; - public static final Block BLOOD_LIGHT = Blocks.AIR; - public static final Block TELEPOSER = Blocks.AIR; - public static final Block ALCHEMY_ARRAY = Blocks.AIR; - public static final Block SPECTRAL = Blocks.AIR; - public static final Block PHANTOM = Blocks.AIR; - public static final Block SOUL_FORGE = Blocks.AIR; - public static final Block INCENSE_ALTAR = Blocks.AIR; - public static final Block DEMON_CRUCIBLE = Blocks.AIR; - public static final Block DEMON_PYLON = Blocks.AIR; - public static final Block DEMON_CRYSTALLIZER = Blocks.AIR; - public static final Block DEMON_CRYSTAL = Blocks.AIR; - public static final Block ALCHEMY_TABLE = Blocks.AIR; - public static final Block LIFE_ESSENCE = Blocks.AIR; - public static final Block DECORATIVE_BRICK = Blocks.AIR; - public static final Block PATH = Blocks.AIR; - public static final Block MASTER_ROUTING_NODE = Blocks.AIR; - public static final Block INPUT_ROUTING_NODE = Blocks.AIR; - public static final Block OUTPUT_ROUTING_NODE = Blocks.AIR; - public static final Block ITEM_ROUTING_NODE = Blocks.AIR; - public static final Block DIMENSIONAL_PORTAL = Blocks.AIR; - public static final Block BLOOD_TANK = Blocks.AIR; - public static final Block MIMIC = Blocks.AIR; - public static final Block DEMON_BRICK_1 = Blocks.AIR; - public static final Block DEMON_BRICK_2 = Blocks.AIR; - public static final Block DEMON_EXTRAS = Blocks.AIR; - public static final Block DEMON_PILLAR_1 = Blocks.AIR; - public static final Block DEMON_PILLAR_2 = Blocks.AIR; - public static final Block DEMON_PILLAR_CAP_1 = Blocks.AIR; - public static final Block DEMON_PILLAR_CAP_2 = Blocks.AIR; - public static final Block DEMON_PILLAR_CAP_3 = Blocks.AIR; - public static final Block DEMON_LIGHT = Blocks.AIR; - public static final Block DEMON_WALL_1 = Blocks.AIR; - public static final Block DEMON_STAIRS_1 = Blocks.AIR; - public static final Block DEMON_STAIRS_2 = Blocks.AIR; - public static final Block DEMON_STAIRS_3 = Blocks.AIR; - public static final Block INVERSION_PILLAR = Blocks.AIR; - public static final Block INVERSION_PILLAR_END = Blocks.AIR; - - static List blocks; - - @SubscribeEvent - public static void registerBlocks(RegistryEvent.Register event) { - FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence()); - FluidRegistry.addBucketForFluid(BlockLifeEssence.getLifeEssence()); - - blocks = Lists.newArrayList( - new BlockAltar().setRegistryName("altar"), - new BlockBloodRune().setRegistryName("blood_rune"), - new BlockRitualController().setRegistryName("ritual_controller"), - new BlockRitualStone().setRegistryName("ritual_stone"), - new BlockBloodLight().setRegistryName("blood_light"), - new BlockTeleposer().setRegistryName("teleposer"), - new BlockAlchemyArray().setRegistryName("alchemy_array"), - new BlockSpectral().setRegistryName("spectral"), - new BlockPhantom().setRegistryName("phantom"), - new BlockSoulForge().setRegistryName("soul_forge"), - new BlockIncenseAltar().setRegistryName("incense_altar"), - new BlockDemonCrucible().setRegistryName("demon_crucible"), - new BlockDemonPylon().setRegistryName("demon_pylon"), - new BlockDemonCrystallizer().setRegistryName("demon_crystallizer"), - new BlockDemonCrystal().setRegistryName("demon_crystal"), - new BlockAlchemyTable().setRegistryName("alchemy_table"), - new BlockLifeEssence().setRegistryName("life_essence"), - new BlockDecorative().setRegistryName("decorative_brick"), - new BlockPath().setRegistryName("path"), - new BlockMasterRoutingNode().setRegistryName("master_routing_node"), - new BlockInputRoutingNode().setRegistryName("input_routing_node"), - new BlockOutputRoutingNode().setRegistryName("output_routing_node"), - new BlockItemRoutingNode().setRegistryName("item_routing_node"), - new BlockDimensionalPortal().setRegistryName("dimensional_portal"), - new BlockBloodTank().setRegistryName("blood_tank"), - new BlockMimic().setRegistryName("mimic"), - new BlockDemonBase<>("bricks1", EnumDemonBlock1.class).setRegistryName("demon_brick_1"), - new BlockDemonBase<>("bricks2", EnumDemonBlock2.class).setRegistryName("demon_brick_2"), - new BlockDemonBase<>("extras", EnumDemonBlock3.class).setRegistryName("demon_extras"), - new BlockDemonPillarBase<>("pillar1", Material.ROCK, EnumSubWillType.class).setRegistryName("demon_pillar_1"), - new BlockDemonPillarBase<>("pillar2", Material.ROCK, EnumSubWillType.class).setRegistryName("demon_pillar_2"), - new BlockDemonPillarCapBase<>("pillarCap1", Material.ROCK, EnumSubWillType1.class).setRegistryName("demon_pillar_cap_1"), - new BlockDemonPillarCapBase<>("pillarCap2", Material.ROCK, EnumSubWillType2.class).setRegistryName("demon_pillar_cap_2"), - new BlockDemonPillarCapBase<>("pillarCap3", Material.ROCK, EnumSubWillType3.class).setRegistryName("demon_pillar_cap_3"), - new BlockDemonLight().setRegistryName("demon_light"), - new BlockDemonWallBase<>("wall1", Material.ROCK, EnumWillWall.class).setRegistryName("demon_wall_1"), - new BlockDemonStairsBase<>("stairs1", Material.ROCK, EnumSubWillType1.class).setRegistryName("demon_stairs_1"), - new BlockDemonStairsBase<>("stairs2", Material.ROCK, EnumSubWillType2.class).setRegistryName("demon_stairs_2"), - new BlockDemonStairsBase<>("stairs3", Material.ROCK, EnumSubWillType3.class).setRegistryName("demon_stairs_3"), - new BlockInversionPillar().setRegistryName("inversion_pillar"), - new BlockInversionPillarEnd().setRegistryName("inversion_pillar_end") - ); - - event.getRegistry().registerAll(blocks.toArray(new Block[0])); - - registerTileEntities(); - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) { - ModelLoader.setCustomStateMapper(LIFE_ESSENCE, new StateMapperBase() { - @Override - protected ModelResourceLocation getModelResourceLocation(BlockState state) { - return new ModelResourceLocation(state.getBlock().getRegistryName(), "fluid"); - } - }); - } - - private static void registerTileEntities() { - GameRegistry.registerTileEntity(TileAltar.class, BloodMagic.MODID + ":altar"); - GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":imperfect_ritual_stone"); - GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":master_ritual_stone"); - GameRegistry.registerTileEntity(TileAlchemyArray.class, BloodMagic.MODID + ":alchemy_array"); - GameRegistry.registerTileEntity(TileSpectralBlock.class, BloodMagic.MODID + ":spectral_block"); - GameRegistry.registerTileEntity(TilePhantomBlock.class, BloodMagic.MODID + ":phantom_block"); - GameRegistry.registerTileEntity(TileTeleposer.class, BloodMagic.MODID + ":teleposer"); - GameRegistry.registerTileEntity(TileSoulForge.class, BloodMagic.MODID + ":soul_forge"); - GameRegistry.registerTileEntity(TileMasterRoutingNode.class, BloodMagic.MODID + ":master_routing_node"); - GameRegistry.registerTileEntity(TileInputRoutingNode.class, BloodMagic.MODID + ":input_routing_node"); - GameRegistry.registerTileEntity(TileOutputRoutingNode.class, BloodMagic.MODID + ":output_routing_node"); - GameRegistry.registerTileEntity(TileItemRoutingNode.class, BloodMagic.MODID + ":item_routing_node"); - GameRegistry.registerTileEntity(TileIncenseAltar.class, BloodMagic.MODID + ":incense_altar"); - GameRegistry.registerTileEntity(TileDemonCrucible.class, BloodMagic.MODID + ":demon_crucible"); - GameRegistry.registerTileEntity(TileDemonPylon.class, BloodMagic.MODID + ":demon_pylon"); - GameRegistry.registerTileEntity(TileDemonCrystallizer.class, BloodMagic.MODID + ":demon_crystallizer"); - GameRegistry.registerTileEntity(TileDemonCrystal.class, BloodMagic.MODID + ":demon_crystal"); - GameRegistry.registerTileEntity(TileAlchemyTable.class, BloodMagic.MODID + ":alchemy_table"); - GameRegistry.registerTileEntity(TileDimensionalPortal.class, BloodMagic.MODID + ":dimensional_portal"); - GameRegistry.registerTileEntity(TileBloodTank.class, BloodMagic.MODID + ":blood_tank"); - GameRegistry.registerTileEntity(TileMimic.class, BloodMagic.MODID + ":mimic"); - GameRegistry.registerTileEntity(TileInversionPillar.class, BloodMagic.MODID + ":inversion_pillar"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java deleted file mode 100644 index c4421b41..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ /dev/null @@ -1,255 +0,0 @@ -package WayofTime.bloodmagic.core; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.IBMBlock; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.*; -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; -import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; -import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter; -import WayofTime.bloodmagic.item.routing.ItemNodeRouter; -import WayofTime.bloodmagic.item.routing.ItemRouterFilter; -import WayofTime.bloodmagic.item.sigil.*; -import WayofTime.bloodmagic.item.soul.*; -import WayofTime.bloodmagic.item.soulBreath.ItemFlightScroll; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.item.types.ShardType; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.item.Items; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; -import java.util.Set; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -@GameRegistry.ObjectHolder(BloodMagic.MODID) -@SuppressWarnings("unchecked") -public class RegistrarBloodMagicItems { - - public static final Item BLOOD_ORB = Items.AIR; - public static final Item ACTIVATION_CRYSTAL = Items.AIR; - public static final Item SLATE = Items.AIR; - public static final Item INSCRIPTION_TOOL = Items.AIR; - public static final Item SACRIFICIAL_DAGGER = Items.AIR; - public static final Item PACK_SELF_SACRIFICE = Items.AIR; - public static final Item PACK_SACRIFICE = Items.AIR; - public static final Item DAGGER_OF_SACRIFICE = Items.AIR; - public static final Item RITUAL_DIVINER = Items.AIR; - public static final Item RITUAL_DISMANTLER = Items.AIR; - public static final Item RITUAL_READER = Items.AIR; - public static final Item LAVA_CRYSTAL = Items.AIR; - public static final Item BOUND_SWORD = Items.AIR; - public static final Item BOUND_PICKAXE = Items.AIR; - public static final Item BOUND_AXE = Items.AIR; - public static final Item BOUND_SHOVEL = Items.AIR; - public static final Item SIGIL_DIVINATION = Items.AIR; - public static final Item SIGIL_AIR = Items.AIR; - public static final Item SIGIL_WATER = Items.AIR; - public static final Item SIGIL_LAVA = Items.AIR; - public static final Item SIGIL_VOID = Items.AIR; - public static final Item SIGIL_GREEN_GROVE = Items.AIR; - public static final Item SIGIL_BLOOD_LIGHT = Items.AIR; - public static final Item SIGIL_ELEMENTAL_AFFINITY = Items.AIR; - public static final Item SIGIL_HASTE = Items.AIR; - public static final Item SIGIL_MAGNETISM = Items.AIR; - public static final Item SIGIL_SUPPRESSION = Items.AIR; - public static final Item SIGIL_FAST_MINER = Items.AIR; - public static final Item SIGIL_SEER = Items.AIR; - public static final Item SIGIL_ENDER_SEVERANCE = Items.AIR; - public static final Item SIGIL_WHIRLWIND = Items.AIR; - public static final Item SIGIL_PHANTOM_BRIDGE = Items.AIR; - public static final Item SIGIL_COMPRESSION = Items.AIR; - public static final Item SIGIL_HOLDING = Items.AIR; - public static final Item SIGIL_TELEPOSITION = Items.AIR; - public static final Item SIGIL_TRANSPOSITION = Items.AIR; - public static final Item SIGIL_CLAW = Items.AIR; - public static final Item SIGIL_BOUNCE = Items.AIR; - public static final Item SIGIL_FROST = Items.AIR; - public static final Item COMPONENT = Items.AIR; - public static final Item ITEM_DEMON_CRYSTAL = Items.AIR; - public static final Item TELEPOSITION_FOCUS = Items.AIR; - public static final Item EXPERIENCE_TOME = Items.AIR; - public static final Item BLOOD_SHARD = Items.AIR; - public static final Item LIVING_ARMOUR_HELMET = Items.AIR; - public static final Item LIVING_ARMOUR_CHEST = Items.AIR; - public static final Item LIVING_ARMOUR_LEGGINGS = Items.AIR; - public static final Item LIVING_ARMOUR_BOOTS = Items.AIR; - public static final Item SENTIENT_ARMOUR_HELMET = Items.AIR; - public static final Item SENTIENT_ARMOUR_CHEST = Items.AIR; - public static final Item SENTIENT_ARMOUR_LEGGINGS = Items.AIR; - public static final Item SENTIENT_ARMOUR_BOOTS = Items.AIR; - public static final Item ALTAR_MAKER = Items.AIR; - public static final Item UPGRADE_TOME = Items.AIR; - public static final Item UPGRADE_TRAINER = Items.AIR; - public static final Item ARCANE_ASHES = Items.AIR; - public static final Item MONSTER_SOUL = Items.AIR; - public static final Item SOUL_GEM = Items.AIR; - public static final Item SOUL_SNARE = Items.AIR; - public static final Item SENTIENT_SWORD = Items.AIR; - public static final Item SENTIENT_BOW = Items.AIR; - public static final Item SENTIENT_ARMOUR_GEM = Items.AIR; - public static final Item SENTIENT_AXE = Items.AIR; - public static final Item SENTIENT_PICKAXE = Items.AIR; - public static final Item SENTIENT_SHOVEL = Items.AIR; - public static final Item NODE_ROUTER = Items.AIR; - public static final Item BASE_ITEM_FILTER = Items.AIR; - public static final Item BASE_FLUID_FILTER = Items.AIR; - public static final Item CUTTING_FLUID = Items.AIR; - public static final Item SANGUINE_BOOK = Items.AIR; - public static final Item POINTS_UPGRADE = Items.AIR; - public static final Item DEMON_WILL_GAUGE = Items.AIR; - public static final Item POTION_FLASK = Items.AIR; - public static final Item ALCHEMIC_VIAL = Items.AIR; - public static final Item ICARUS_SCROLL = Items.AIR; - - public static Item.ToolMaterial BOUND_TOOL_MATERIAL = EnumHelper.addToolMaterial("bound", 4, 1, 10, 8, 50); - public static Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("demonic", 4, 520, 7, 8, 50); - - public static List items; - - @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) { - items = Lists.newArrayList(); - - RegistrarBloodMagicBlocks.blocks.stream().filter(block -> block instanceof IBMBlock && ((IBMBlock) block).getItem() != null).forEach(block -> - { - IBMBlock bmBlock = (IBMBlock) block; - items.add(bmBlock.getItem().setRegistryName(block.getRegistryName())); - }); - - items.addAll(Lists.newArrayList( - new ItemBloodOrb().setRegistryName("blood_orb"), - new ItemActivationCrystal().setRegistryName("activation_crystal"), - new ItemSlate().setRegistryName("slate"), - new ItemInscriptionTool().setRegistryName("inscription_tool"), - new ItemSacrificialDagger().setRegistryName("sacrificial_dagger"), - new ItemPackSacrifice().setRegistryName("pack_sacrifice"), - new ItemPackSelfSacrifice().setRegistryName("pack_self_sacrifice"), - new ItemDaggerOfSacrifice().setRegistryName("dagger_of_sacrifice"), - new ItemRitualDiviner().setRegistryName("ritual_diviner"), - new ItemRitualDismantler().setRegistryName("ritual_dismantler"), - new ItemRitualReader().setRegistryName("ritual_reader"), - new ItemLavaCrystal().setRegistryName("lava_crystal"), - new ItemBoundSword().setRegistryName("bound_sword"), - new ItemBoundPickaxe().setRegistryName("bound_pickaxe"), - new ItemBoundAxe().setRegistryName("bound_axe"), - new ItemBoundShovel().setRegistryName("bound_shovel"), - new ItemSigilDivination(true).setRegistryName("sigil_divination"), - new ItemSigilAir().setRegistryName("sigil_air"), - new ItemSigilWater().setRegistryName("sigil_water"), - new ItemSigilLava().setRegistryName("sigil_lava"), - new ItemSigilVoid().setRegistryName("sigil_void"), - new ItemSigilGreenGrove().setRegistryName("sigil_green_grove"), - new ItemSigilBloodLight().setRegistryName("sigil_blood_light"), - new ItemSigilElementalAffinity().setRegistryName("sigil_elemental_affinity"), - new ItemSigilMagnetism().setRegistryName("sigil_magnetism"), - new ItemSigilSuppression().setRegistryName("sigil_suppression"), - new ItemSigilHaste().setRegistryName("sigil_haste"), - new ItemSigilFastMiner().setRegistryName("sigil_fast_miner"), - new ItemSigilDivination(false).setRegistryName("sigil_seer"), - new ItemSigilPhantomBridge().setRegistryName("sigil_phantom_bridge"), - new ItemSigilWhirlwind().setRegistryName("sigil_whirlwind"), - new ItemSigilCompression().setRegistryName("sigil_compression"), - new ItemSigilEnderSeverance().setRegistryName("sigil_ender_severance"), - new ItemSigilHolding().setRegistryName("sigil_holding"), - new ItemSigilTeleposition().setRegistryName("sigil_teleposition"), - new ItemSigilTransposition().setRegistryName("sigil_transposition"), - new ItemSigilClaw().setRegistryName("sigil_claw"), - new ItemSigilBounce().setRegistryName("sigil_bounce"), - new ItemSigilFrost().setRegistryName("sigil_frost"), - new ItemEnum.Variant<>(ComponentTypes.class, "baseComponent").setRegistryName("component"), - new ItemDemonCrystal().setRegistryName("item_demon_crystal"), - new ItemTelepositionFocus().setRegistryName("teleposition_focus"), - new ItemExperienceBook().setRegistryName("experience_tome"), - new ItemEnum.Variant<>(ShardType.class, "blood_shard").setRegistryName("blood_shard"), - new ItemLivingArmour(EquipmentSlotType.HEAD).setRegistryName("living_armour_helmet"), - new ItemLivingArmour(EquipmentSlotType.CHEST).setRegistryName("living_armour_chest"), - new ItemLivingArmour(EquipmentSlotType.LEGS).setRegistryName("living_armour_leggings"), - new ItemLivingArmour(EquipmentSlotType.FEET).setRegistryName("living_armour_boots"), - new ItemSentientArmour(EquipmentSlotType.HEAD).setRegistryName("sentient_armour_helmet"), - new ItemSentientArmour(EquipmentSlotType.CHEST).setRegistryName("sentient_armour_chest"), - new ItemSentientArmour(EquipmentSlotType.LEGS).setRegistryName("sentient_armour_leggings"), - new ItemSentientArmour(EquipmentSlotType.FEET).setRegistryName("sentient_armour_boots"), - new ItemAltarMaker().setRegistryName("altar_maker"), - new ItemUpgradeTome().setRegistryName("upgrade_tome"), - new ItemUpgradeTrainer().setRegistryName("upgrade_trainer"), - new ItemArcaneAshes().setRegistryName("arcane_ashes"), - new ItemMonsterSoul().setRegistryName("monster_soul"), - new ItemSoulGem().setRegistryName("soul_gem"), - new ItemSoulSnare().setRegistryName("soul_snare"), - new ItemSentientSword().setRegistryName("sentient_sword"), - new ItemSentientBow().setRegistryName("sentient_bow"), - new ItemSentientArmourGem().setRegistryName("sentient_armour_gem"), - new ItemSentientAxe().setRegistryName("sentient_axe"), - new ItemSentientPickaxe().setRegistryName("sentient_pickaxe"), - new ItemSentientShovel().setRegistryName("sentient_shovel"), - new ItemNodeRouter().setRegistryName("node_router"), - new ItemRouterFilter().setRegistryName("base_item_filter"), - new ItemFluidRouterFilter().setRegistryName("base_fluid_filter"), - new ItemCuttingFluid().setRegistryName("cutting_fluid"), - new ItemSanguineBook().setRegistryName("sanguine_book"), - new ItemLivingArmourPointsUpgrade().setRegistryName("points_upgrade"), - new ItemDemonWillGauge().setRegistryName("demon_will_gauge"), - new ItemPotionFlask().setRegistryName("potion_flask"), - new ItemAlchemicVial().setRegistryName("alchemic_vial"), - new ItemFlightScroll().setRegistryName("icarus_scroll") - )); - - event.getRegistry().registerAll(items.toArray(new Item[0])); - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public static void registerRenders(ModelRegistryEvent event) { - items.stream().filter(i -> i instanceof IVariantProvider).forEach(i -> - { - Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); - ((IVariantProvider) i).gatherVariants(variants); - for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) - ModelLoader.setCustomModelResourceLocation(i, variant.getIntKey(), new ModelResourceLocation(i.getRegistryName(), variant.getValue())); - }); - - items.stream().filter(i -> i instanceof IMeshProvider).forEach(i -> - { - IMeshProvider mesh = (IMeshProvider) i; - ResourceLocation loc = mesh.getCustomLocation(); - if (loc == null) - loc = i.getRegistryName(); - - Set variants = Sets.newHashSet(); - mesh.gatherVariants(variants::add); - for (String variant : variants) - ModelLoader.registerItemVariants(i, new ModelResourceLocation(loc, variant)); - - ModelLoader.setCustomMeshDefinition(i, mesh.getMeshDefinition()); - }); - - RegistrarBloodMagicBlocks.blocks.stream().filter(b -> b instanceof IVariantProvider).forEach(b -> - { - Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); - ((IVariantProvider) b).gatherVariants(variants); - for (Int2ObjectMap.Entry variant : variants.int2ObjectEntrySet()) - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(b), variant.getIntKey(), new ModelResourceLocation(b.getRegistryName(), variant.getValue())); - }); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 1b4cbdd3..e04f63fd 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -1,239 +1,71 @@ -package WayofTime.bloodmagic.core; +package wayoftime.bloodmagic.core; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.item.ItemSlate; -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; -import WayofTime.bloodmagic.item.soul.ItemSoulGem; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.PluginUtil; -import com.google.common.collect.Sets; -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; -import net.minecraft.potion.Potions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.potion.PotionUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.OreIngredient; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import wayoftime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; -import java.util.List; -import java.util.Set; +public class RegistrarBloodMagicRecipes +{ -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class RegistrarBloodMagicRecipes { +// @SubscribeEvent +// public static void registerRecipes(RegistryEvent.Register event) { +// for (int i = 0; i < ItemSoulGem.names.length; i++) { +// for (EnumDemonWillType willType : EnumDemonWillType.values()) { +// ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); +// ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); +// +// ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); +// ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); +// event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); +// } +// } +// +// OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); +// OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); +// OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); +// +// PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); +// +// RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL.setRepairItem(EnumDemonWillType.DEFAULT.getStack()); +// } - @SubscribeEvent - public static void registerRecipes(RegistryEvent.Register event) { - for (int i = 0; i < ItemSoulGem.names.length; i++) { - for (EnumDemonWillType willType : EnumDemonWillType.values()) { - ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); - ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); + public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) + { +// Ingredient d; + // ONE +// registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), AltarTier.ONE.ordinal(), 2000, 2, 1); +// registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), AltarTier.ONE.ordinal(), 1000, 5, 0); +// registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), AltarTier.ONE.ordinal(), 1000, 20, 0); +// +// // TWO +// registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), AltarTier.TWO.ordinal(), 5000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), AltarTier.TWO.ordinal(), 2000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), AltarTier.TWO.ordinal(), 3000, 5, 5); +// +// // THREE +// registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), AltarTier.THREE.ordinal(), 25000, 20, 20); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), AltarTier.THREE.ordinal(), 5000, 15, 10); +// registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), AltarTier.THREE.ordinal(), 10000, 20, 10); +// +// // FOUR +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 40000, 30, 50); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); +// registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); +// registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), AltarTier.FOUR.ordinal(), 10000, 20, 10); +// +// // FIVE +// registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), AltarTier.FIVE.ordinal(), 80000, 50, 100); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); - ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); - ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); - event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); - } - } - - OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); - OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); - OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); - - PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); - - RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL.setRepairItem(EnumDemonWillType.DEFAULT.getStack()); - } - - public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { - // ONE - registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), AltarTier.ONE.ordinal(), 2000, 2, 1); - registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), AltarTier.ONE.ordinal(), 1000, 5, 0); - registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), AltarTier.ONE.ordinal(), 1000, 20, 0); - - // TWO - registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), AltarTier.TWO.ordinal(), 5000, 5, 5); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), AltarTier.TWO.ordinal(), 2000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), AltarTier.TWO.ordinal(), 3000, 5, 5); - - // THREE - registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), AltarTier.THREE.ordinal(), 25000, 20, 20); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), AltarTier.THREE.ordinal(), 5000, 15, 10); - registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); - registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), AltarTier.THREE.ordinal(), 10000, 20, 10); - - // FOUR - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 40000, 30, 50); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); - registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); - registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), AltarTier.FOUR.ordinal(), 10000, 20, 10); - - // FIVE - registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), AltarTier.FIVE.ordinal(), 80000, 50, 100); - registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); - - // SIX - if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); - registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); - } - } - - public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) { - registrar.addAlchemyTable(new ItemStack(Items.STRING, 4), 0, 100, 0, Blocks.WOOL, Items.FLINT); - registrar.addAlchemyTable(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); - registrar.addAlchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); - registrar.addAlchemyTable(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 500, 200, 1, "gunpowder", "gunpowder", "dustCoal"); - registrar.addAlchemyTable(new ItemStack(Items.BREAD), 100, 200, 1, Items.WHEAT, Items.SUGAR); - registrar.addAlchemyTable(new ItemStack(Blocks.GRASS), 200, 200, 1, Blocks.DIRT, new ItemStack(Items.DYE, 1, 15), Items.WHEAT_SEEDS); - registrar.addAlchemyTable(new ItemStack(Items.CLAY_BALL, 4), 50, 100, 2, Items.WATER_BUCKET, "sand"); - registrar.addAlchemyTable(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); - registrar.addAlchemyTable(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); - registrar.addAlchemyTable(ComponentTypes.SULFUR.getStack(8), 0, 100, 0, Items.LAVA_BUCKET); - registrar.addAlchemyTable(ComponentTypes.SALTPETER.getStack(4), 0, 100, 0, ComponentTypes.PLANT_OIL.getStack(), ComponentTypes.PLANT_OIL.getStack(), "dustCoal"); - registrar.addAlchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, "dustSaltpeter", "dustSulfur", new ItemStack(Items.COAL, 1, 1)); - registrar.addAlchemyTable(ComponentTypes.SAND_COAL.getStack(4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT); - registrar.addAlchemyTable(ItemCuttingFluid.FluidType.BASIC.getStack(), 1000, 400, 1, "dustCoal", "gunpowder", Items.REDSTONE, Items.SUGAR, ComponentTypes.PLANT_OIL.getStack(), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.WATER)); - registrar.addAlchemyTable(ComponentTypes.SAND_IRON.getStack(2), 400, 200, 1, "oreIron", ItemCuttingFluid.FluidType.BASIC.getStack()); - registrar.addAlchemyTable(ComponentTypes.SAND_GOLD.getStack(2), 400, 200, 1, "oreGold", ItemCuttingFluid.FluidType.BASIC.getStack()); - registrar.addAlchemyTable(new ItemStack(Items.REDSTONE, 8), 400, 200, 1, "oreRedstone", ItemCuttingFluid.FluidType.BASIC.getStack()); - registrar.addAlchemyTable(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.FluidType.EXPLOSIVE.getStack()); - registrar.addAlchemyTable(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.FluidType.EXPLOSIVE.getStack()); - registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropCarrot", "cropCarrot", "cropCarrot", new ItemStack(Items.DYE, 1, 15)); - registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropPotato", "cropPotato", new ItemStack(Items.DYE, 1, 15)); - registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, "cropWheat", "cropWheat", new ItemStack(Items.DYE, 1, 15)); - registrar.addAlchemyTable(ComponentTypes.PLANT_OIL.getStack(), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); - registrar.addAlchemyTable(ComponentTypes.NEURO_TOXIN.getStack(), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3)); - registrar.addAlchemyTable(ComponentTypes.ANTISEPTIC.getStack(2), 1000, 200, 2, ComponentTypes.PLANT_OIL.getStack(), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM); - registrar.addAlchemyTable(ItemLivingArmourPointsUpgrade.UpgradeType.DRAFT_ANGELUS.getStack(), 20000, 400, 3, ComponentTypes.NEURO_TOXIN.getStack(), ComponentTypes.ANTISEPTIC.getStack(), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR); - registrar.addAlchemyTable(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.WATER), "cropNetherWart", "dustRedstone", "dustGlowstone"); - registrar.addAlchemyTable(ComponentTypes.CATALYST_LENGTH_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis"); - registrar.addAlchemyTable(ComponentTypes.CATALYST_POWER_1.getStack(), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone"); - - Set addedOreRecipeList = Sets.newHashSet("oreIron", "oreGold", "oreCoal", "oreRedstone"); // We already added these above - String[] oreList = OreDictionary.getOreNames().clone(); - for (String ore : oreList) { - if (ore.startsWith("ore") && !addedOreRecipeList.contains(ore)) { - String dustName = ore.replaceFirst("ore", "dust"); - - List discoveredOres = OreDictionary.getOres(ore); - List dustList = OreDictionary.getOres(dustName); - if (dustList != null && !dustList.isEmpty() && discoveredOres != null && !discoveredOres.isEmpty()) { - ItemStack dustStack = dustList.get(0).copy(); - dustStack.setCount(2); - registrar.addAlchemyTable(dustStack, 400, 200, 1, ore, ItemCuttingFluid.FluidType.BASIC.getStack()); - addedOreRecipeList.add(ore); - } - } - } - } - - public static void registerTartaricForgeRecipes(BloodMagicRecipeRegistrar registrar) { - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", ItemSlate.SlateType.IMBUED.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), EnumDemonWillType.DEFAULT.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL); - registrar.addTartaricForge(ComponentTypes.REAGENT_WATER.getStack(), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET)); - registrar.addTartaricForge(ComponentTypes.REAGENT_LAVA.getStack(), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal"); - registrar.addTartaricForge(ComponentTypes.REAGENT_VOID.getStack(), 64, 10, Items.BUCKET, "string", "string", "gunpowder"); - registrar.addTartaricForge(ComponentTypes.REAGENT_GROWTH.getStack(), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR); - registrar.addTartaricForge(ComponentTypes.REAGENT_AIR.getStack(), 128, 20, Items.GHAST_TEAR, "feather", "feather"); - registrar.addTartaricForge(ComponentTypes.REAGENT_SIGHT.getStack(), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone"); - registrar.addTartaricForge(ComponentTypes.REAGENT_HOLDING.getStack(), 64, 20, "chestWood", "leather", "string", "string"); - registrar.addTartaricForge(ComponentTypes.REAGENT_FAST_MINER.getStack(), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER); - registrar.addTartaricForge(ComponentTypes.REAGENT_AFFINITY.getStack(), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentTypes.REAGENT_SUPPRESSION.getStack(), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD); - registrar.addTartaricForge(ComponentTypes.REAGENT_BINDING.getStack(), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER); - registrar.addTartaricForge(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone"); - registrar.addTartaricForge(ComponentTypes.REAGENT_MAGNETISM.getStack(), 600, 10, "string", "ingotGold", "blockIron", "ingotGold"); - registrar.addTartaricForge(ComponentTypes.REAGENT_HASTE.getStack(), 1400, 100, Items.COOKIE, Items.SUGAR, Items.COOKIE, "stone"); - registrar.addTartaricForge(ComponentTypes.REAGENT_BRIDGE.getStack(), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentTypes.REAGENT_SEVERANCE.getStack(), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold"); - registrar.addTartaricForge(ComponentTypes.REAGENT_COMPRESSION.getStack(), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone"); - registrar.addTartaricForge(ComponentTypes.REAGENT_TELEPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold"); - registrar.addTartaricForge(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN); - registrar.addTartaricForge(ComponentTypes.REAGENT_CLAW.getStack(), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.FluidType.BASIC.getStack()); - registrar.addTartaricForge(ComponentTypes.REAGENT_BOUNCE.getStack(), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string"); - registrar.addTartaricForge(ComponentTypes.REAGENT_FROST.getStack(), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone"); - - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN); - - registrar.addTartaricForge(ComponentTypes.FRAME_PART.getStack(), 400, 10, "blockGlass", "stone", ItemSlate.SlateType.BLANK.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", ItemSlate.SlateType.REINFORCED.getStack(), "gemLapis", "gemLapis"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE)); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", ItemSlate.SlateType.IMBUED.getStack()); - - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack(), EnumDemonWillType.DEFAULT.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack(), EnumDemonWillType.CORROSIVE.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack(), EnumDemonWillType.DESTRUCTIVE.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack(), EnumDemonWillType.VENGEFUL.getStack()); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack(), EnumDemonWillType.STEADFAST.getStack()); - - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass"); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL); - registrar.addTartaricForge(new ItemStack(RegistrarBloodMagicItems.RITUAL_DISMANTLER), 500, 100, new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, 2), new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, 2), new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)); - } - - public static void registerAlchemyArrayRecipes(BloodMagicRecipeRegistrar registrar) { - registrar.addAlchemyArray(new ItemStack(Items.REDSTONE), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png")); - - registrar.addAlchemyArray(ComponentTypes.REAGENT_WATER.getStack(), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_LAVA.getStack(), ItemSlate.SlateType.BLANK.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_AIR.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_FAST_MINER.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_VOID.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_GROWTH.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_AFFINITY.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_SIGHT.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_HOLDING.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_MAGNETISM.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_SUPPRESSION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png")); - registrar.addAlchemyArray(ComponentTypes.REAGENT_HASTE.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_BRIDGE.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_COMPRESSION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_SEVERANCE.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_TELEPOSITION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_TRANSPOSITION.getStack(), ItemSlate.SlateType.DEMONIC.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_CLAW.getStack(), ItemSlate.SlateType.IMBUED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_BOUNCE.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), null); - registrar.addAlchemyArray(ComponentTypes.REAGENT_FROST.getStack(), ItemSlate.SlateType.REINFORCED.getStack(), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), null); - - } - - public static void registerSacrificeCraftRecipes(BloodMagicRecipeRegistrar registrar) { - registrar.addSacrificeCraft(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER), 10, Items.REDSTONE); - } +// // SIX +// if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) +// { +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); +// registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); +// } + } } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index 135aaabd..02ad80a4 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -1,58 +1,66 @@ -package WayofTime.bloodmagic.core.data; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.world.storage.WorldSavedData; +package wayoftime.bloodmagic.core.data; import java.util.HashMap; import java.util.Map; import java.util.UUID; -public class BMWorldSavedData extends WorldSavedData { - public static final String ID = "BloodMagic-SoulNetworks"; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraft.world.storage.WorldSavedData; +import wayoftime.bloodmagic.util.helper.PlayerHelper; - private Map soulNetworks = new HashMap<>(); +public class BMWorldSavedData extends WorldSavedData +{ + public static final String ID = "BloodMagic-SoulNetworks"; - public BMWorldSavedData(String id) { - super(id); - } + private Map soulNetworks = new HashMap<>(); - public BMWorldSavedData() { - this(ID); - } + public BMWorldSavedData(String id) + { + super(id); + } - public SoulNetwork getNetwork(PlayerEntity player) { - return getNetwork(PlayerHelper.getUUIDFromPlayer(player)); - } + public BMWorldSavedData() + { + this(ID); + } - public SoulNetwork getNetwork(UUID playerId) { - if (!soulNetworks.containsKey(playerId)) - soulNetworks.put(playerId, SoulNetwork.newEmpty(playerId).setParent(this)); - return soulNetworks.get(playerId); - } + public SoulNetwork getNetwork(PlayerEntity player) + { + return getNetwork(PlayerHelper.getUUIDFromPlayer(player)); + } - @Override - public void read(CompoundNBT tagCompound) { - ListNBT networkData = tagCompound.getList("networkData", 10); + public SoulNetwork getNetwork(UUID playerId) + { + if (!soulNetworks.containsKey(playerId)) + soulNetworks.put(playerId, SoulNetwork.newEmpty(playerId).setParent(this)); + return soulNetworks.get(playerId); + } - for (int i = 0; i < networkData.size(); i++) { - CompoundNBT data = networkData.getCompound(i); - SoulNetwork network = SoulNetwork.fromNBT(data); - network.setParent(this); - soulNetworks.put(network.getPlayerId(), network); - } - } + @Override + public void read(CompoundNBT tagCompound) + { + ListNBT networkData = tagCompound.getList("networkData", 10); - @Override - public CompoundNBT write(CompoundNBT tagCompound) { - ListNBT networkData = new ListNBT(); - for (SoulNetwork soulNetwork : soulNetworks.values()) - networkData.add(soulNetwork.serializeNBT()); + for (int i = 0; i < networkData.size(); i++) + { + CompoundNBT data = networkData.getCompound(i); + SoulNetwork network = SoulNetwork.fromNBT(data); + network.setParent(this); + soulNetworks.put(network.getPlayerId(), network); + } + } - tagCompound.put("networkData", networkData); + @Override + public CompoundNBT write(CompoundNBT tagCompound) + { + ListNBT networkData = new ListNBT(); + for (SoulNetwork soulNetwork : soulNetworks.values()) + networkData.add(soulNetwork.serializeNBT()); - return tagCompound; - } -} + tagCompound.put("networkData", networkData); + + return tagCompound; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index 3c2e9ed1..e6a4bbc8 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -1,4 +1,8 @@ -package WayofTime.bloodmagic.core.data; +package wayoftime.bloodmagic.core.data; + +import java.util.UUID; + +import javax.annotation.Nullable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -6,71 +10,80 @@ import net.minecraft.nbt.INBT; import net.minecraft.nbt.NBTUtil; import net.minecraftforge.common.util.INBTSerializable; -import javax.annotation.Nullable; -import java.util.UUID; +public class Binding implements INBTSerializable +{ + private UUID uuid; + private String name; -public class Binding implements INBTSerializable { + public Binding(UUID uuid, String name) + { + this.uuid = uuid; + this.name = name; + } - private UUID uuid; - private String name; + private Binding() + { + // No-op + } - public Binding(UUID uuid, String name) { - this.uuid = uuid; - this.name = name; - } + @Override + public CompoundNBT serializeNBT() + { + CompoundNBT tag = new CompoundNBT(); +// tag.put("id", NBTUtil.writeUniqueId(uuid)); + tag.put("id", NBTUtil.func_240626_a_(uuid)); + tag.putString("name", name); + return tag; + } - private Binding() { - // No-op - } + @Override + public void deserializeNBT(CompoundNBT nbt) + { + this.uuid = NBTUtil.readUniqueId(nbt.get("id")); + this.name = nbt.getString("name"); + } - @Override - public CompoundNBT serializeNBT() { - CompoundNBT tag = new CompoundNBT(); - tag.put("id", NBTUtil.writeUniqueId(uuid)); - tag.putString("name", name); - return tag; - } + public UUID getOwnerId() + { + return uuid; + } - @Override - public void deserializeNBT(CompoundNBT nbt) { - this.uuid = NBTUtil.readUniqueId(nbt.getCompound("id")); - this.name = nbt.getString("name"); - } + public Binding setOwnerId(UUID uuid) + { + this.uuid = uuid; + return this; + } - public UUID getOwnerId() { - return uuid; - } + public String getOwnerName() + { + return name; + } - public Binding setOwnerId(UUID uuid) { - this.uuid = uuid; - return this; - } + public Binding setOwnerName(String name) + { + this.name = name; + return this; + } - public String getOwnerName() { - return name; - } + @Nullable + public static Binding fromStack(ItemStack stack) + { + if (!stack.hasTag()) // Definitely hasn't been bound yet. + return null; - public Binding setOwnerName(String name) { - this.name = name; - return this; - } + INBT bindingTag = stack.getTag().get("binding"); + if (bindingTag == null || bindingTag.getId() != 10) // Make sure it's both a tag compound and that it has actual + // data. + return null; - @Nullable - public static Binding fromStack(ItemStack stack) { - if (!stack.hasTag()) // Definitely hasn't been bound yet. - return null; + Binding binding = new Binding(); + binding.deserializeNBT((CompoundNBT) bindingTag); + return binding; + } - INBT bindingTag = stack.getTag().get("binding"); - if (bindingTag == null || bindingTag.getId() != 10) // Make sure it's both a tag compound and that it has actual data. - return null; - - Binding binding = new Binding(); - binding.deserializeNBT((CompoundNBT) bindingTag); - return binding; - } - - @Override - public String toString() { - return "Binding{" + "uuid=" + uuid + ", name='" + name + '\'' + '}'; - } -} + @Override + public String toString() + { + return "Binding{" + "uuid=" + uuid + ", name='" + name + '\'' + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index 30ec5dea..aa63bc1e 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,255 +1,293 @@ -package WayofTime.bloodmagic.core.data; +package wayoftime.bloodmagic.core.data; + +import java.util.List; +import java.util.Queue; +import java.util.UUID; + +import javax.annotation.Nullable; -import WayofTime.bloodmagic.event.SoulNetworkEvent; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.BooleanResult; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.PlayerHelper; import com.google.common.collect.EvictingQueue; import com.google.common.collect.ImmutableList; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.INBTSerializable; +import wayoftime.bloodmagic.event.SoulNetworkEvent; +import wayoftime.bloodmagic.util.BMLog; +import wayoftime.bloodmagic.util.BooleanResult; +import wayoftime.bloodmagic.util.DamageSourceBloodMagic; +import wayoftime.bloodmagic.util.helper.PlayerHelper; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Queue; -import java.util.UUID; +public class SoulNetwork implements INBTSerializable +{ -public class SoulNetwork implements INBTSerializable { + private final Queue ticketHistory; + private BMWorldSavedData parent; + private PlayerEntity cachedPlayer; + private UUID playerId; + private int currentEssence; + private int orbTier; - private final Queue ticketHistory; - private BMWorldSavedData parent; - private PlayerEntity cachedPlayer; - private UUID playerId; - private int currentEssence; - private int orbTier; + private SoulNetwork() + { + // No-op - For creation via NBT only + ticketHistory = EvictingQueue.create(16); + } - private SoulNetwork() { - // No-op - For creation via NBT only - ticketHistory = EvictingQueue.create(16); - } + public void clear() + { + ticketHistory.clear(); + } - public void clear() { - ticketHistory.clear(); - } + public int add(SoulTicket ticket, int maximum) + { + SoulNetworkEvent.Fill event = new SoulNetworkEvent.Fill(this, ticket, maximum); + if (MinecraftForge.EVENT_BUS.post(event)) + return 0; - public int add(SoulTicket ticket, int maximum) { - SoulNetworkEvent.Fill event = new SoulNetworkEvent.Fill(this, ticket, maximum); - if (MinecraftForge.EVENT_BUS.post(event)) - return 0; + int currEss = getCurrentEssence(); - int currEss = getCurrentEssence(); + if (currEss >= event.getMaximum()) + return 0; - if (currEss >= event.getMaximum()) - return 0; + int newEss = Math.min(event.getMaximum(), currEss + event.getTicket().getAmount()); + setCurrentEssence(newEss); - int newEss = Math.min(event.getMaximum(), currEss + event.getTicket().getAmount()); - setCurrentEssence(newEss); + if (ticketHistory.contains(ticket)) + ticketHistory.remove(ticket); // "Pops" the existing ticket to the top of the queue - if (ticketHistory.contains(ticket)) - ticketHistory.remove(ticket); // "Pops" the existing ticket to the top of the queue + ticketHistory.add(ticket); - ticketHistory.add(ticket); + return newEss - currEss; + } - return newEss - currEss; - } + /** + * @deprecated For future proofing, use {@link #add(SoulTicket, int)} instead. + */ + @Deprecated + public int add(int toAdd, int maximum) + { + return add(new SoulTicket(toAdd), maximum); + } - /** - * @deprecated For future proofing, use {@link #add(SoulTicket, int)} instead. - */ - @Deprecated - public int add(int toAdd, int maximum) { - return add(new SoulTicket(toAdd), maximum); - } + /** + * @deprecated Use {@link #add(SoulTicket, int)} instead. + */ + @Deprecated + public int addLifeEssence(int toAdd, int maximum) + { + return add(toAdd, maximum); + } - /** - * @deprecated Use {@link #add(SoulTicket, int)} instead. - */ - @Deprecated - public int addLifeEssence(int toAdd, int maximum) { - return add(toAdd, maximum); - } + public int syphon(SoulTicket ticket) + { + return syphon(ticket, false); + } - public int syphon(SoulTicket ticket) { - return syphon(ticket, false); - } + public int syphon(SoulTicket ticket, boolean skipEvent) + { + SoulNetworkEvent.Syphon event = new SoulNetworkEvent.Syphon(this, ticket); + if (!skipEvent && MinecraftForge.EVENT_BUS.post(event)) + return 0; - public int syphon(SoulTicket ticket, boolean skipEvent) { - SoulNetworkEvent.Syphon event = new SoulNetworkEvent.Syphon(this, ticket); - if (!skipEvent && MinecraftForge.EVENT_BUS.post(event)) - return 0; + int syphon = event.getTicket().getAmount(); + if (getCurrentEssence() >= syphon) + { + setCurrentEssence(getCurrentEssence() - syphon); + if (ticketHistory.contains(ticket)) + ticketHistory.remove(ticket); - int syphon = event.getTicket().getAmount(); - if (getCurrentEssence() >= syphon) { - setCurrentEssence(getCurrentEssence() - syphon); - if (ticketHistory.contains(ticket)) - ticketHistory.remove(ticket); + ticketHistory.add(ticket); + return syphon; + } - ticketHistory.add(ticket); - return syphon; - } + return 0; + } - return 0; - } + /** + * @deprecated For future proofing, use {@link #syphon(SoulTicket)} instead. + */ + @Deprecated + public int syphon(int amount) + { + return syphon(new SoulTicket(amount)); + } - /** - * @deprecated For future proofing, use {@link #syphon(SoulTicket)} instead. - */ - @Deprecated - public int syphon(int amount) { - return syphon(new SoulTicket(amount)); - } + public BooleanResult syphonAndDamage(PlayerEntity user, SoulTicket ticket) + { + if (user.getEntityWorld().isRemote) + return BooleanResult.newResult(false, 0); - public BooleanResult syphonAndDamage(PlayerEntity user, SoulTicket ticket) { - if (user.getEntityWorld().isRemote) - return BooleanResult.newResult(false, 0); + SoulNetworkEvent.Syphon.User event = new SoulNetworkEvent.Syphon.User(this, ticket, user); - SoulNetworkEvent.Syphon.User event = new SoulNetworkEvent.Syphon.User(this, ticket, user); + if (MinecraftForge.EVENT_BUS.post(event)) + return BooleanResult.newResult(false, 0); - if (MinecraftForge.EVENT_BUS.post(event)) - return BooleanResult.newResult(false, 0); + int drainAmount = syphon(event.getTicket(), true); - int drainAmount = syphon(event.getTicket(), true); + if (drainAmount <= 0 || event.shouldDamage()) + hurtPlayer(user, event.getTicket().getAmount()); - if (drainAmount <= 0 || event.shouldDamage()) - hurtPlayer(user, event.getTicket().getAmount()); + if (ticketHistory.contains(ticket)) + ticketHistory.remove(ticket); - if (ticketHistory.contains(ticket)) - ticketHistory.remove(ticket); + ticketHistory.add(ticket); - ticketHistory.add(ticket); + return BooleanResult.newResult(true, event.getTicket().getAmount()); + } - return BooleanResult.newResult(true, event.getTicket().getAmount()); - } + /** + * @deprecated Use {@link #syphonAndDamage(PlayerEntity, SoulTicket)} instead. + */ + @Deprecated + public boolean syphonAndDamage(PlayerEntity user, int amount) + { + return syphonAndDamage(user, new SoulTicket(amount)).isSuccess(); + } - /** - * @deprecated Use {@link #syphonAndDamage(PlayerEntity, SoulTicket)} instead. - */ - @Deprecated - public boolean syphonAndDamage(PlayerEntity user, int amount) { - return syphonAndDamage(user, new SoulTicket(amount)).isSuccess(); - } + public void causeNausea() + { + if (getPlayer() != null) + getPlayer().addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); + } - public void causeNausea() { - if (getPlayer() != null) - getPlayer().addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); - } + /** + * @deprecated - Please use {@link #causeNausea()} + */ + @Deprecated + public void causeNauseaToPlayer() + { + causeNausea(); + } - /** - * @deprecated - Please use {@link #causeNausea()} - */ - @Deprecated - public void causeNauseaToPlayer() { - causeNausea(); - } + public void hurtPlayer(PlayerEntity user, float syphon) + { + if (user != null) + { + if (syphon < 100 && syphon > 0) + { + if (!user.isCreative()) + { + user.hurtResistantTime = 0; + user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); + } - public void hurtPlayer(PlayerEntity user, float syphon) { - if (user != null) { - if (syphon < 100 && syphon > 0) { - if (!user.isCreative()) { - user.hurtResistantTime = 0; - user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); - } + } else if (syphon >= 100) + { + if (!user.isCreative()) + { + for (int i = 0; i < ((syphon + 99) / 100); i++) + { + user.hurtResistantTime = 0; + user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); + } + } + } + } + } - } else if (syphon >= 100) { - if (!user.isCreative()) { - for (int i = 0; i < ((syphon + 99) / 100); i++) { - user.hurtResistantTime = 0; - user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); - } - } - } - } - } + private void markDirty() + { + if (getParent() != null) + getParent().markDirty(); + else + BMLog.DEFAULT.error("A SoulNetwork was created, but a parent was not set to allow saving."); + } - private void markDirty() { - if (getParent() != null) - getParent().markDirty(); - else - BMLog.DEFAULT.error("A SoulNetwork was created, but a parent was not set to allow saving."); - } + @Nullable + public PlayerEntity getPlayer() + { + if (cachedPlayer == null) + cachedPlayer = PlayerHelper.getPlayerFromUUID(playerId); - @Nullable - public PlayerEntity getPlayer() { - if (cachedPlayer == null) - cachedPlayer = PlayerHelper.getPlayerFromUUID(playerId); + return cachedPlayer; + } - return cachedPlayer; - } + public BMWorldSavedData getParent() + { + return parent; + } - public BMWorldSavedData getParent() { - return parent; - } + public SoulNetwork setParent(BMWorldSavedData parent) + { + this.parent = parent; + markDirty(); + return this; + } - public SoulNetwork setParent(BMWorldSavedData parent) { - this.parent = parent; - markDirty(); - return this; - } + public PlayerEntity getCachedPlayer() + { + return cachedPlayer; + } - public PlayerEntity getCachedPlayer() { - return cachedPlayer; - } + public UUID getPlayerId() + { + return playerId; + } - public UUID getPlayerId() { - return playerId; - } + public int getCurrentEssence() + { + return currentEssence; + } - public int getCurrentEssence() { - return currentEssence; - } + public SoulNetwork setCurrentEssence(int currentEssence) + { + this.currentEssence = currentEssence; + markDirty(); + return this; + } - public SoulNetwork setCurrentEssence(int currentEssence) { - this.currentEssence = currentEssence; - markDirty(); - return this; - } + public int getOrbTier() + { + return orbTier; + } - public int getOrbTier() { - return orbTier; - } + public SoulNetwork setOrbTier(int orbTier) + { + this.orbTier = orbTier; + markDirty(); + return this; + } - public SoulNetwork setOrbTier(int orbTier) { - this.orbTier = orbTier; - markDirty(); - return this; - } + public List getTicketHistory() + { + return ImmutableList.copyOf(ticketHistory); + } - public List getTicketHistory() { - return ImmutableList.copyOf(ticketHistory); - } + // INBTSerializable - // INBTSerializable + @Override + public CompoundNBT serializeNBT() + { + CompoundNBT tagCompound = new CompoundNBT(); + tagCompound.putString("playerId", getPlayerId().toString()); + tagCompound.putInt("currentEssence", getCurrentEssence()); + tagCompound.putInt("orbTier", getOrbTier()); + return tagCompound; + } - @Override - public CompoundNBT serializeNBT() { - CompoundNBT tagCompound = new CompoundNBT(); - tagCompound.putString("playerId", getPlayerId().toString()); - tagCompound.putInt("currentEssence", getCurrentEssence()); - tagCompound.putInt("orbTier", getOrbTier()); - return tagCompound; - } + @Override + public void deserializeNBT(CompoundNBT nbt) + { + this.playerId = UUID.fromString(nbt.getString("playerId")); + this.currentEssence = nbt.getInt("currentEssence"); + this.orbTier = nbt.getInt("orbTier"); + } - @Override - public void deserializeNBT(CompoundNBT nbt) { - this.playerId = UUID.fromString(nbt.getString("playerId")); - this.currentEssence = nbt.getInt("currentEssence"); - this.orbTier = nbt.getInt("orbTier"); - } + public static SoulNetwork fromNBT(CompoundNBT tagCompound) + { + SoulNetwork soulNetwork = new SoulNetwork(); + soulNetwork.deserializeNBT(tagCompound); + return soulNetwork; + } - public static SoulNetwork fromNBT(CompoundNBT tagCompound) { - SoulNetwork soulNetwork = new SoulNetwork(); - soulNetwork.deserializeNBT(tagCompound); - return soulNetwork; - } - - public static SoulNetwork newEmpty(UUID uuid) { - SoulNetwork network = new SoulNetwork(); - network.playerId = uuid; - return network; - } -} + public static SoulNetwork newEmpty(UUID uuid) + { + SoulNetwork network = new SoulNetwork(); + network.playerId = uuid; + return network; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java index 412048d9..e3cc6325 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.core.data; +package wayoftime.bloodmagic.core.data; import net.minecraft.command.ICommandSource; import net.minecraft.entity.Entity; @@ -8,78 +8,97 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; -public class SoulTicket { +public class SoulTicket +{ - private static final ITextComponent EMPTY = new StringTextComponent(""); + private static final ITextComponent EMPTY = new StringTextComponent(""); - private final ITextComponent description; - private final int amount; + private final ITextComponent description; + private final int amount; - public SoulTicket(ITextComponent description, int amount) { - this.description = description; - this.amount = amount; - } + public SoulTicket(ITextComponent description, int amount) + { + this.description = description; + this.amount = amount; + } - public SoulTicket(int amount) { - this(EMPTY, amount); - } + public SoulTicket(int amount) + { + this(EMPTY, amount); + } - public boolean isSyphon() { - return amount < 0; - } + public boolean isSyphon() + { + return amount < 0; + } - public ITextComponent getDescription() { - return description; - } + public ITextComponent getDescription() + { + return description; + } - public int getAmount() { - return amount; - } + public int getAmount() + { + return amount; + } - /** - * @return A description in the format block|dimensionID|pos - */ - public static SoulTicket block(World world, BlockPos pos, int amount) { - return new SoulTicket(new StringTextComponent("block|" + world.dimension.getDimension() + "|" + pos.toLong()), amount); - } + /** + * @return A description in the format block|dimensionID|pos + */ + public static SoulTicket block(World world, BlockPos pos, int amount) + { + // func_234923_W_() = getDimension + return new SoulTicket(new StringTextComponent("block|" + world.getDimensionKey().getRegistryName() + "|" + + pos.toLong()), amount); + } - /** - * @return A description in the format item|item registry name|dimensionID|entityName|entityPos - */ - public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.dimension.getDimension() + "|" + entity.getCachedUniqueIdString()), amount); - } + /** + * @return A description in the format item|item registry + * name|dimensionID|entityName|entityPos + */ + public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) + { + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + + world.getDimensionKey().getRegistryName() + "|" + entity.getCachedUniqueIdString()), amount); + } - /** - * @return A description in the format item|item registry name|dimensionID|pos - */ - public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.dimension.getDimension() + "|" + pos.toLong()), amount); - } + /** + * @return A description in the format item|item registry name|dimensionID|pos + */ + public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) + { + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + + world.getDimensionKey().getRegistryName() + "|" + pos.toLong()), amount); + } - /** - * @return A description in the format item|item registry name|dimensionID - */ - public static SoulTicket item(ItemStack itemStack, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName()), amount); - } + /** + * @return A description in the format item|item registry name|dimensionID + */ + public static SoulTicket item(ItemStack itemStack, int amount) + { + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName()), amount); + } - public static SoulTicket command(ICommandSource sender, String command, int amount) { - return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.toString()), amount); - } + public static SoulTicket command(ICommandSource sender, String command, int amount) + { + return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.toString()), amount); + } - // TODO maybe make it check the amount?? - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o instanceof SoulTicket) - return ((SoulTicket) o).getDescription().equals(description); + // TODO maybe make it check the amount?? + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (o instanceof SoulTicket) + return ((SoulTicket) o).getDescription().equals(description); - return false; - } + return false; + } - @Override - public int hashCode() { - return description.hashCode(); - } -} + @Override + public int hashCode() + { + return description.hashCode(); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index aab60d48..35962b33 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -1,82 +1,112 @@ -package WayofTime.bloodmagic.core.recipe; +package wayoftime.bloodmagic.core.recipe; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Stream; + +import com.google.gson.JsonObject; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import it.unimi.dsi.fastutil.ints.IntArrayList; -import it.unimi.dsi.fastutil.ints.IntComparators; -import it.unimi.dsi.fastutil.ints.IntList; -import net.minecraft.item.crafting.RecipeItemHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.IIngredientSerializer; +import net.minecraftforge.common.crafting.VanillaIngredientSerializer; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.core.registry.OrbRegistry; +import wayoftime.bloodmagic.orb.BloodOrb; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; +public class IngredientBloodOrb extends Ingredient +{ -public class IngredientBloodOrb extends Ingredient { +// private final BloodOrb orb; +// private NonNullList orbs; +// private IntList itemIds = null; +// private ItemStack[] items; - private final BloodOrb orb; - private NonNullList orbs; - private IntList itemIds = null; - private ItemStack[] items; + public static final ResourceLocation NAME = new ResourceLocation(BloodMagic.MODID, "bloodorb"); - public IngredientBloodOrb(BloodOrb orb) { - super(); + public final int orbTier; - this.orb = orb; + public static IngredientBloodOrb fromTier(int orbTier) + { + return new IngredientBloodOrb(orbTier); + } - List orbGet = OrbRegistry.getOrbsDownToTier(orb.getTier()); - orbs = NonNullList.withSize(orbGet.size(), ItemStack.EMPTY); + public static IngredientBloodOrb fromOrb(BloodOrb orb) + { + return new IngredientBloodOrb(orb.getTier()); + } - for (int i = 0; i < orbGet.size(); i++) - orbs.set(i, orbGet.get(i)); - } + protected IngredientBloodOrb(int orbTier) + { + super(Stream.of(new ItemList(orbTier))); + this.orbTier = orbTier; + } - @Override - @Nonnull - public ItemStack[] getMatchingStacks() { - if (items == null) - items = orbs.toArray(new ItemStack[0]); - return items; - } + public net.minecraftforge.common.crafting.IIngredientSerializer getSerializer() + { + return Serializer.INSTANCE; + } - @Override - @Nonnull - @SideOnly(Side.CLIENT) - public IntList getValidItemStacksPacked() { - if (this.itemIds == null || itemIds.size() != orbs.size()) { - this.itemIds = new IntArrayList(orbs.size()); + private static class ItemList implements IItemList + { + private final int orbTier; - for (ItemStack itemstack : orbs) - this.itemIds.add(RecipeItemHelper.pack(itemstack)); + public ItemList(int orbTier) + { + this.orbTier = orbTier; + } - this.itemIds.sort(IntComparators.NATURAL_COMPARATOR); - } + @Override + public Collection getStacks() + { +// System.out.println("BING BONG"); + List orbGet = OrbRegistry.getOrbsDownToTier(orbTier); +// List orbGet = new ArrayList(); +// orbGet.add(new ItemStack(Items.DIAMOND)); +// orbs = NonNullList.withSize(orbGet.size(), ItemStack.EMPTY); +// +// for (int i = 0; i < orbGet.size(); i++) +// orbs.set(i, orbGet.get(i)); + return orbGet; + } - return this.itemIds; - } + @Override + public JsonObject serialize() + { + JsonObject object = new JsonObject(); + object.addProperty("type", NAME.toString()); + object.addProperty("orb_tier", orbTier); + return object; + } + } - @Override - public boolean apply(@Nullable ItemStack input) { - if (input == null || input.isEmpty()) - return false; + public static class Serializer extends VanillaIngredientSerializer + { + public static final IIngredientSerializer INSTANCE = new Serializer(); - if (!input.hasTagCompound()) - return false; + @Override + public Ingredient parse(JsonObject json) + { + System.out.println("Parsing Blood Orb"); + return new IngredientBloodOrb(JSONUtils.getInt(json, "orb_tier")); + } + } - if (!(input.getItem() instanceof IBloodOrb)) - return false; +// +// @Override +// public boolean test(@Nullable ItemStack input) +// { +// System.out.println("Testing"); +// if (input == null || input.isEmpty()) +// return false; +// +// if (!(input.getItem() instanceof IBloodOrb)) +// return false; +// +// BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); +// return orb != null && orb.getTier() >= this.orbTier; +// } - BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); - return orb != null && orb.getTier() >= this.orb.getTier(); - } - - @Override - protected void invalidate() { - this.itemIds = null; - } } diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java deleted file mode 100644 index 4c6ab978..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.core.recipe; - -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import com.google.gson.JsonObject; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.IIngredientFactory; -import net.minecraftforge.common.crafting.JsonContext; - -import javax.annotation.Nonnull; - -public class IngredientBloodOrbFactory implements IIngredientFactory { - - @Nonnull - @Override - public Ingredient parse(JsonContext context, JsonObject json) { - ResourceLocation orb = new ResourceLocation(JSONUtils.getString(json, "orb")); - return new IngredientBloodOrb(RegistrarBloodMagic.BLOOD_ORBS.getValue(orb)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java deleted file mode 100644 index bc28b170..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java +++ /dev/null @@ -1,350 +0,0 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map.Entry; - -public class AlchemyArrayRecipeRegistry { - public static final AlchemyCircleRenderer DEFAULT_RENDERER = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BaseArray.png")); - - private static BiMap, AlchemyArrayRecipe> recipes = HashBiMap.create(); - private static HashMap effectMap = new HashMap<>(); - - /** - * General case for creating an AlchemyArrayEffect for a given input. - * - * @param input - Input item(s) that is used to change the Alchemy Circle into the - * circle that you are making - * @param catalystStack - Catalyst item that, when right-clicked onto the array, will - * cause an effect - * @param arrayEffect - The effect that will be activated once the array is activated - * @param circleRenderer - Circle rendered when the array is passive - can be substituted - * for a special renderer - */ - public static void registerRecipe(List input, @Nullable ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { - effectMap.put(arrayEffect.getKey(), arrayEffect); - - for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { - AlchemyArrayRecipe arrayRecipe = entry.getValue(); - if (arrayRecipe.doesInputMatchRecipe(input)) { - AlchemyArrayEffect eff = arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack); - if (eff != null) { - return; // Recipe already exists! - } else { - arrayRecipe.catalystMap.put(ItemStackWrapper.getHolder(catalystStack), arrayEffect); - if (circleRenderer != null) { - if (arrayRecipe.defaultCircleRenderer == null) { - arrayRecipe.defaultCircleRenderer = circleRenderer; - } else { - arrayRecipe.circleMap.put(ItemStackWrapper.getHolder(catalystStack), circleRenderer); - } - } - return; - } - } - } - - recipes.put(input, new AlchemyArrayRecipe(input, catalystStack, arrayEffect, circleRenderer == null ? DEFAULT_RENDERER : circleRenderer)); - } - - public static AlchemyArrayEffect getAlchemyArrayEffect(String key) { - return effectMap.get(key); - } - - /** - * @param key - * @return an array of two ItemStacks - first index is the input stack, - * second is the catalyst stack. Returns {null, null} if no recipe - * is valid. - */ - public static ItemStack[] getRecipeForArrayEffect(String key) { - for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { - AlchemyArrayRecipe recipe = entry.getValue(); - if (recipe != null && entry.getKey().size() > 0) { - for (Entry effectEntry : recipe.catalystMap.entrySet()) { - if (effectEntry.getValue() != null && effectEntry.getValue().key.equals(key)) { - return new ItemStack[]{entry.getKey().get(0), effectEntry.getKey().toStack()}; - } - } - } - } - - return new ItemStack[]{null, null}; - } - - /** - * @param stack of the recipe - * @return an array of two ItemStacks - first index is the input stack, - * second is the catalyst stack. Returns {null, null} if no recipe - * is valid. - */ - public static ItemStack[] getRecipeForOutputStack(ItemStack stack) { - for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { - AlchemyArrayRecipe recipe = entry.getValue(); - if (recipe != null && entry.getKey().size() > 0) { - for (Entry effectEntry : recipe.catalystMap.entrySet()) { - if (effectEntry.getValue() instanceof AlchemyArrayEffectCrafting) { - AlchemyArrayEffectCrafting craftingEffect = (AlchemyArrayEffectCrafting) effectEntry.getValue(); - ItemStack resultStack = craftingEffect.outputStack; - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return new ItemStack[]{entry.getKey().get(0), effectEntry.getKey().toStack()}; - } - } - } - } - } - } - - return new ItemStack[]{null, null}; - } - - public static void registerCraftingRecipe(ItemStack input, ItemStack catalystStack, ItemStack outputStack, ResourceLocation arrayResource) { - registerRecipe(input, catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource); - } - - public static void registerCraftingRecipe(List inputStacks, ItemStack catalystStack, ItemStack outputStack, ResourceLocation arrayResource) { - registerRecipe(inputStacks, catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource); - } - - public static void registerCraftingRecipe(String inputOreDict, ItemStack catalystStack, ItemStack outputStack, ResourceLocation arrayResource) { - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource); - } - - public static void registerCraftingRecipe(ItemStack input, ItemStack catalystStack, ItemStack outputStack) { - registerRecipe(input, catalystStack, new AlchemyArrayEffectCrafting(outputStack)); - } - - public static void registerCraftingRecipe(List inputStacks, ItemStack catalystStack, ItemStack outputStack) { - registerRecipe(inputStacks, catalystStack, new AlchemyArrayEffectCrafting(outputStack)); - } - - public static void registerCraftingRecipe(String inputOreDict, ItemStack catalystStack, ItemStack outputStack) { - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack)); - } - - public static void registerRecipe(ItemStack inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { - AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); - registerRecipe(Collections.singletonList(inputStacks), catalystStack, arrayEffect, circleRenderer); - } - - public static void registerRecipe(ItemStack inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { - registerRecipe(Collections.singletonList(inputStacks), catalystStack, arrayEffect, circleRenderer); - } - - public static void registerRecipe(List inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { - AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); - registerRecipe(inputStacks, catalystStack, arrayEffect, circleRenderer); - } - - public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) { - AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource); - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer); - } - - public static void registerRecipe(ItemStack input, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) { - registerRecipe(Collections.singletonList(input), catalystStack, arrayEffect, (AlchemyCircleRenderer) null); - } - - public static void registerRecipe(List inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) { - registerRecipe(inputStacks, catalystStack, arrayEffect, (AlchemyCircleRenderer) null); - } - - public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) { - registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, (AlchemyCircleRenderer) null); - } - - public static void replaceAlchemyCircle(List input, AlchemyCircleRenderer circleRenderer) { - if (circleRenderer == null) - return; - - for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { - AlchemyArrayRecipe arrayRecipe = entry.getValue(); - if (arrayRecipe.doesInputMatchRecipe(input)) - arrayRecipe.defaultCircleRenderer = circleRenderer; - } - } - - public static AlchemyArrayRecipe getRecipeForInput(List input) { - return recipes.get(input); - } - - public static AlchemyArrayEffect getAlchemyArrayEffect(List input, @Nullable ItemStack catalystStack) { - for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { - AlchemyArrayRecipe arrayRecipe = entry.getValue(); - if (input.size() == 1 && arrayRecipe.getInput().size() == 1) { - if (ItemStack.areItemsEqual(input.get(0), arrayRecipe.input.get(0))) { - AlchemyArrayEffect effect = arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack); - if (effect != null) { - return effect.getNewCopy(); - } else { - return null; - } - } - } else { - if (input.equals(arrayRecipe.getInput())) { - AlchemyArrayEffect effect = arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack); - if (effect != null) { - return effect.getNewCopy(); - } else { - return null; - } - } - } - } - - return null; - } - - public static AlchemyArrayEffect getAlchemyArrayEffect(ItemStack input, @Nullable ItemStack catalystStack) { - return getAlchemyArrayEffect(Collections.singletonList(input), catalystStack); - } - - public static AlchemyCircleRenderer getAlchemyCircleRenderer(List input, @Nullable ItemStack catalystStack) { - for (Entry, AlchemyArrayRecipe> entry : recipes.entrySet()) { - AlchemyArrayRecipe arrayRecipe = entry.getValue(); - if (arrayRecipe.doesInputMatchRecipe(input)) { - return arrayRecipe.getAlchemyArrayRendererForCatalyst(catalystStack); - } - } - - return DEFAULT_RENDERER; - } - - public static AlchemyCircleRenderer getAlchemyCircleRenderer(ItemStack itemStack, @Nullable ItemStack catalystStack) { - return getAlchemyCircleRenderer(Collections.singletonList(itemStack), catalystStack); - } - - public static BiMap, AlchemyArrayRecipe> getRecipes() { - return HashBiMap.create(recipes); - } - - public static class AlchemyArrayRecipe { - public final List input; - public final BiMap catalystMap = HashBiMap.create(); - public final BiMap circleMap = HashBiMap.create(); - public AlchemyCircleRenderer defaultCircleRenderer; - - private AlchemyArrayRecipe(List input, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer, boolean useless) { - this.input = input; - - catalystMap.put(ItemStackWrapper.getHolder(catalystStack), arrayEffect); - - this.defaultCircleRenderer = circleRenderer; - } - - public AlchemyArrayRecipe(ItemStack inputStack, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { - this(Collections.singletonList(inputStack), catalystStack, arrayEffect, circleRenderer, false); - } - - public AlchemyArrayRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { - this(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer, false); - } - - public AlchemyArrayRecipe(List inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) { - this(inputStacks, catalystStack, arrayEffect, circleRenderer, false); - } - - /** - * Compares the inputed list of ItemStacks to see if it matches with the - * recipe's list. - * - * @param comparedList - The list to compare with - * @return - True if the ItemStack(s) is a compatible item - */ - public boolean doesInputMatchRecipe(List comparedList) { - return !(comparedList == null || this.input == null) && (this.input.size() == 1 && comparedList.size() == 1 ? this.input.get(0).isItemEqual(comparedList.get(0)) : this.input.equals(comparedList)); - } - - /** - * Gets the actual AlchemyArrayEffect for the given catalyst. - * - * @param comparedStack The catalyst that is being checked - * @return - The effect - */ - public AlchemyArrayEffect getAlchemyArrayEffectForCatalyst(@Nullable ItemStack comparedStack) { - for (Entry entry : catalystMap.entrySet()) { - ItemStack catalystStack = entry.getKey().toStack(); - - if (comparedStack == null && catalystStack == null) - return entry.getValue(); - - if (comparedStack == null || catalystStack == null) - continue; - - if (catalystStack.isItemEqual(comparedStack)) - return entry.getValue(); - } - - return null; - } - - public AlchemyCircleRenderer getAlchemyArrayRendererForCatalyst(@Nullable ItemStack comparedStack) { - for (Entry entry : circleMap.entrySet()) { - ItemStack catalystStack = entry.getKey().toStack(); - - if (comparedStack == null && catalystStack == null) - return entry.getValue(); - - if (comparedStack == null || catalystStack == null) - continue; - - if (catalystStack.isItemEqual(comparedStack)) - return entry.getValue(); - } - - return defaultCircleRenderer; - } - - public AlchemyCircleRenderer getDefaultCircleRenderer() { - return defaultCircleRenderer; - } - - public List getInput() { - return input; - } - - public BiMap getCatalystMap() { - return catalystMap; - } - - public BiMap getCircleMap() { - return circleMap; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof AlchemyArrayRecipe)) return false; - - AlchemyArrayRecipe that = (AlchemyArrayRecipe) o; - - if (defaultCircleRenderer != null ? !defaultCircleRenderer.equals(that.defaultCircleRenderer) : that.defaultCircleRenderer != null) - return false; - if (input != null ? !input.equals(that.input) : that.input != null) return false; - if (catalystMap != null ? !catalystMap.equals(that.catalystMap) : that.catalystMap != null) return false; - return circleMap != null ? circleMap.equals(that.circleMap) : that.circleMap == null; - } - - @Override - public int hashCode() { - int result = defaultCircleRenderer != null ? defaultCircleRenderer.hashCode() : 0; - result = 31 * result + (input != null ? input.hashCode() : 0); - result = 31 * result + (catalystMap != null ? catalystMap.hashCode() : 0); - result = 31 * result + (circleMap != null ? circleMap.hashCode() : 0); - return result; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java deleted file mode 100644 index d27e99c1..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class AlchemyTableRecipeRegistry { - private static List recipeList = new ArrayList<>(); - - public static void registerRecipe(AlchemyTableRecipe recipe) { - recipeList.add(recipe); - } - - public static void registerRecipe(ItemStack outputStack, int lpDrained, int ticksRequired, int tierRequired, Object... objects) { - registerRecipe(new AlchemyTableRecipe(outputStack, lpDrained, ticksRequired, tierRequired, objects)); - } - - public static void removeRecipe(AlchemyTableRecipe recipe) { - recipeList.remove(recipe); - } - - public static AlchemyTableRecipe getMatchingRecipe(List itemList, World world, BlockPos pos) { - for (AlchemyTableRecipe recipe : recipeList) { - if (recipe.matches(itemList, world, pos)) { - return recipe; - } - } - - return null; - } - - public static List getRecipeList() { - return new ArrayList<>(recipeList); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java deleted file mode 100644 index c0c74d3a..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java +++ /dev/null @@ -1,215 +0,0 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.altar.AltarTier; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.builder.ToStringBuilder; - -import java.util.Collections; -import java.util.List; - -public class AltarRecipeRegistry { - private static BiMap, AltarRecipe> recipes = HashBiMap.create(); - - /** - * Registers an {@link AltarRecipe} for the Blood Altar. This can be a - * {@code ItemStack}, {@code List}, or {@code String} - * OreDictionary entry. - *

    - * If the OreDictionary entry does not exist or is empty, it will not be - * registered. - * - * @param altarRecipe - The AltarRecipe to register - */ - public static void registerRecipe(AltarRecipe altarRecipe) { - if (!recipes.containsValue(altarRecipe) && altarRecipe.getInput().size() > 0) - recipes.put(altarRecipe.getInput(), altarRecipe); - else - BMLog.DEFAULT.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); - } - - public static void registerFillRecipe(ItemStack orbStack, AltarTier tier, int maxForOrb, int consumeRate, int drainRate) { - registerRecipe(new AltarRecipe(orbStack, orbStack, tier, maxForOrb, consumeRate, drainRate, true)); - } - - public static void removeRecipe(AltarRecipe altarRecipe) { - recipes.remove(altarRecipe.getInput()); - } - - /** - * Gets the recipe that the provided input is registered to. - * - * @param input - The input ItemStack to get the recipe for - * @return - The recipe that the provided input is registered to. - */ - public static AltarRecipe getRecipeForInput(List input) { - List wrapperList = ItemStackWrapper.toWrapperList(input); - if (recipes.keySet().contains(wrapperList)) - return recipes.get(wrapperList); - - return null; - } - - //TODO: Determine a more time-effective method - public static AltarRecipe getRecipeForInput(ItemStack input) { - for (AltarRecipe recipe : recipes.values()) { - if (recipe.doesRequiredItemMatch(input, recipe.getMinTier())) { - return recipe; - } - } - - return null; - } - - public static AltarRecipe getRecipeForInput(String input) { - return getRecipeForInput(OreDictionary.getOres(input)); - } - - public static BiMap, AltarRecipe> getRecipes() { - return HashBiMap.create(recipes); - } - - public static class AltarRecipe { - private final List input; - private final ItemStack output; - private final AltarTier minTier; - private final int syphon, consumeRate, drainRate; - private final boolean fillable; - - /** - * Allows creation of a recipe for the - * {@link WayofTime.bloodmagic.block.BlockAltar} / - * {@link WayofTime.bloodmagic.tile.TileAltar}. The output ItemStack is - * allowed to be null as some recipes do not contain an output. (Blood - * Orbs) - * - * @param input - The input ItemStack - * @param output - The ItemStack obtained from the recipe - * @param minTier - The minimum tier of Altar required - * @param syphon - The amount of LP to syphon from the Altar - * @param consumeRate - The rate at which LP is consumed during crafting - * @param drainRate - The rate at which LP is drained during crafting - * @param fillable - Whether the input item can be filled with LP. IE: Orbs - */ - public AltarRecipe(List input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { - this.input = ItemStackWrapper.toWrapperList(input); - this.output = output; - this.minTier = minTier; - this.syphon = syphon < 0 ? -syphon : syphon; - this.consumeRate = consumeRate < 0 ? -consumeRate : consumeRate; - this.drainRate = drainRate < 0 ? -drainRate : drainRate; - this.fillable = fillable; - } - - public AltarRecipe(List input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate) { - this(input, output, minTier, syphon, consumeRate, drainRate, false); - } - - public AltarRecipe(ItemStack input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { - this(Collections.singletonList(input), output, minTier, syphon, consumeRate, drainRate, fillable); - } - - public AltarRecipe(ItemStack input, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate) { - this(Collections.singletonList(input), output, minTier, syphon, consumeRate, drainRate, false); - } - - public AltarRecipe(String inputEntry, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) { - this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, fillable); - } - - public AltarRecipe(String inputEntry, ItemStack output, AltarTier minTier, int syphon, int consumeRate, int drainRate) { - this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, false); - } - - public boolean doesRequiredItemMatch(ItemStack comparedStack, AltarTier tierCheck) { - if (comparedStack == null || this.input == null) - return false; - - if (tierCheck.ordinal() < minTier.ordinal()) - return false; - - for (ItemStackWrapper stack : input) { - if (comparedStack.isItemEqual(stack.toStack())) - return true; - - if (comparedStack.getItem() == stack.item && stack.meta == OreDictionary.WILDCARD_VALUE) - return true; - } - - return false; - } - - public List getInput() { - return input; - } - - public ItemStack getOutput() { - return output; - } - - public AltarTier getMinTier() { - return minTier; - } - - public int getSyphon() { - return syphon; - } - - public int getConsumeRate() { - return consumeRate; - } - - public int getDrainRate() { - return drainRate; - } - - public boolean isFillable() { - return fillable; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof AltarRecipe)) return false; - - AltarRecipe that = (AltarRecipe) o; - - if (syphon != that.syphon) return false; - if (consumeRate != that.consumeRate) return false; - if (drainRate != that.drainRate) return false; - if (fillable != that.fillable) return false; - if (input != null ? !input.equals(that.input) : that.input != null) return false; - if (output != null ? !output.equals(that.output) : that.output != null) return false; - return minTier == that.minTier; - } - - @Override - public int hashCode() { - int result = input != null ? input.hashCode() : 0; - result = 31 * result + (output != null ? output.hashCode() : 0); - result = 31 * result + (minTier != null ? minTier.hashCode() : 0); - result = 31 * result + syphon; - result = 31 * result + consumeRate; - result = 31 * result + drainRate; - result = 31 * result + (fillable ? 1 : 0); - return result; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("input", input) - .append("output", output) - .append("minTier", minTier) - .append("syphon", syphon) - .append("consumeRate", consumeRate) - .append("drainRate", drainRate) - .append("fillable", fillable) - .toString(); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java deleted file mode 100644 index 61a28fb5..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java +++ /dev/null @@ -1,60 +0,0 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -public class LivingArmourDowngradeRecipeRegistry { - private static List recipeList = new ArrayList<>(); - private static Map>> dialogueMap = new HashMap<>(); - - public static void registerRecipe(LivingArmourDowngradeRecipe recipe) { - recipeList.add(recipe); - } - - public static void registerDialog(ItemStack keyStack, Map> map) { - dialogueMap.put(keyStack, map); - } - - public static List getDialogForProcessTick(ItemStack keyStack, int tick) { - for (Entry>> entry : dialogueMap.entrySet()) { - ItemStack key = entry.getKey(); - if (OreDictionary.itemMatches(key, keyStack, false)) { - Map> map = entry.getValue(); - if (map.containsKey(tick)) { - return map.get(tick); - } - } - } - - return null; - } - - public static void registerRecipe(LivingArmourUpgrade upgrade, ItemStack keyStack, Object... recipe) { - registerRecipe(new LivingArmourDowngradeRecipe(upgrade, keyStack, recipe)); - } - - public static LivingArmourDowngradeRecipe getMatchingRecipe(ItemStack keyStack, List itemList, World world, BlockPos pos) { - for (LivingArmourDowngradeRecipe recipe : recipeList) { - if (recipe.matches(keyStack, itemList, world, pos)) { - return recipe; - } - } - - return null; - } - - public static List getRecipeList() { - return new ArrayList<>(recipeList); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 189ab880..ee76030b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -1,62 +1,63 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.orb.BloodOrb; -import com.google.common.collect.ArrayListMultimap; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraftforge.fml.common.registry.GameRegistry; +package wayoftime.bloodmagic.core.registry; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.google.common.collect.ArrayListMultimap; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.altar.AltarTier; +import wayoftime.bloodmagic.orb.BloodOrb; + /** * This is only for those who wish to add a basic {@link BloodOrb}. If you need * custom handling, you will need your own item class. */ -@Deprecated -public class OrbRegistry { - @GameRegistry.ObjectHolder("bloodmagic:blood_orb") - private static final Item ORB_ITEM = null; - public static ArrayListMultimap tierMap = ArrayListMultimap.create(); - private static List orbs = new ArrayList<>(); +public class OrbRegistry +{ + public static ArrayListMultimap tierMap = ArrayListMultimap.create(); + private static List orbs = new ArrayList<>(); - public static List getOrbsForTier(int tier) { - if (getTierMap().containsKey(tier)) - return getTierMap().get(tier); + public static List getOrbsForTier(int tier) + { + if (getTierMap().containsKey(tier)) + return getTierMap().get(tier); - return Collections.emptyList(); - } + return Collections.emptyList(); + } - public static List getOrbsUpToTier(int tier) { - List ret = new ArrayList<>(); + public static List getOrbsUpToTier(int tier) + { + List ret = new ArrayList<>(); - for (int i = 1; i <= tier; i++) - ret.addAll(getOrbsForTier(i)); + for (int i = 1; i <= tier; i++) ret.addAll(getOrbsForTier(i)); - return ret; - } + return ret; + } - public static List getOrbsDownToTier(int tier) { - List ret = new ArrayList<>(); + public static List getOrbsDownToTier(int tier) + { + List ret = new ArrayList<>(); - for (int i = AltarTier.MAXTIERS; i >= tier; i--) - ret.addAll(getOrbsForTier(i)); + for (int i = AltarTier.MAXTIERS; i >= tier; i--) ret.addAll(getOrbsForTier(i)); - return ret; - } + return ret; + } - public static ItemStack getOrbStack(BloodOrb orb) { - ItemStack ret = new ItemStack(ORB_ITEM); - CompoundNBT tag = new CompoundNBT(); - tag.putString("orb", orb.getRegistryName().toString()); - ret.setTagCompound(tag); - return ret; - } + public static ItemStack getOrbStack(BloodOrb orb) + { + Item orbItem = ForgeRegistries.ITEMS.getValue(orb.getResourceLocation()); + if (orbItem == null) + return null; - public static ArrayListMultimap getTierMap() { - return ArrayListMultimap.create(tierMap); - } -} + return new ItemStack(orbItem); + } + + public static ArrayListMultimap getTierMap() + { + return ArrayListMultimap.create(tierMap); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java deleted file mode 100644 index 595310ae..00000000 --- a/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.core.registry; - -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class TartaricForgeRecipeRegistry { - private static List recipeList = new ArrayList<>(); - - public static void registerRecipe(TartaricForgeRecipe recipe) { - recipeList.add(recipe); - } - - public static void registerRecipe(ItemStack outputStack, double minimulSouls, double drain, Object... objects) { - registerRecipe(new TartaricForgeRecipe(outputStack, minimulSouls, drain, objects)); - } - - public static void removeRecipe(TartaricForgeRecipe recipe) { - recipeList.remove(recipe); - } - - public static TartaricForgeRecipe getMatchingRecipe(List itemList, World world, BlockPos pos) { - for (TartaricForgeRecipe recipe : recipeList) { - if (recipe.matches(itemList, world, pos)) { - return recipe; - } - } - - return null; - } - - public static List getRecipeList() { - return new ArrayList<>(recipeList); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java b/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java deleted file mode 100644 index f2b3f4c3..00000000 --- a/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.demonAura; - -import org.apache.commons.lang3.builder.ToStringBuilder; - -public class PosXY implements Comparable { - public int x; - public int y; - - public PosXY() { - } - - public PosXY(int x, int y) { - this.x = x; - this.y = y; - } - - @Override - public int compareTo(PosXY c) { - return this.y == c.y ? this.x - c.x : this.y - c.y; - } - - public float getDistanceSquared(int x, int z) { - float f = this.x - x; - float f2 = this.y - z; - return f * f + f2 * f2; - } - - public float getDistanceSquaredToChunkCoordinates(PosXY c) { - return getDistanceSquared(c.x, c.y); - } - - public void setX(int x) { - this.x = x; - } - - public void setY(int y) { - this.y = y; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("x", x) - .append("y", y) - .toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof PosXY)) return false; - - PosXY posXY = (PosXY) o; - - if (x != posXY.x) return false; - return y == posXY.y; - } - - @Override - public int hashCode() { - int result = x; - result = 31 * result + y; - return result; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java deleted file mode 100644 index 658280f0..00000000 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java +++ /dev/null @@ -1,60 +0,0 @@ -package WayofTime.bloodmagic.demonAura; - -import WayofTime.bloodmagic.soul.DemonWillHolder; -import net.minecraft.world.chunk.Chunk; - -import java.lang.ref.WeakReference; - -public class WillChunk { - PosXY loc; - private short base; - private DemonWillHolder currentWill = new DemonWillHolder(); - private WeakReference chunkRef; - - public WillChunk(PosXY loc) { - this.loc = loc; - } - - public WillChunk(Chunk chunk, short base, DemonWillHolder currentWill) { - this.loc = new PosXY(chunk.x, chunk.z); - this.chunkRef = new WeakReference(chunk); - this.base = base; - this.currentWill = currentWill; - } - - public boolean isModified() { - return (this.chunkRef != null) && (this.chunkRef.get() != null) && this.chunkRef.get().needsSaving(false); - } - - public PosXY getLoc() { - return loc; - } - - public void setLoc(PosXY loc) { - this.loc = loc; - } - - public short getBase() { - return base; - } - - public void setBase(short base) { - this.base = base; - } - - public DemonWillHolder getCurrentWill() { - return currentWill; - } - - public void setCurrentWill(DemonWillHolder currentWill) { - this.currentWill = currentWill; - } - - public WeakReference getChunkRef() { - return chunkRef; - } - - public void setChunkRef(WeakReference chunkRef) { - this.chunkRef = chunkRef; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java deleted file mode 100644 index 76bf8a75..00000000 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java +++ /dev/null @@ -1,40 +0,0 @@ -package WayofTime.bloodmagic.demonAura; - -import java.util.concurrent.ConcurrentHashMap; - -public class WillWorld { - int dim; - ConcurrentHashMap willChunks = new ConcurrentHashMap<>(); - -// private static ConcurrentHashMap nodeTickets = new ConcurrentHashMap(); - - public WillWorld(int dim) { - this.dim = dim; - } - - public WillChunk getWillChunkAt(int x, int y) { - return getWillChunkAt(new PosXY(x, y)); - } - - public WillChunk getWillChunkAt(PosXY loc) { - return this.willChunks.get(loc); - } - - public ConcurrentHashMap getWillChunks() { - return willChunks; - } - - public void setWillChunks(ConcurrentHashMap willChunks) { - this.willChunks = willChunks; - } - -// public static ConcurrentHashMap getNodeTickets() -// { -// return nodeTickets; -// } -// -// public static void setNodeTickets(ConcurrentHashMap nodeTickets) -// { -// nodeTickets = nodeTickets; -// } -} diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java deleted file mode 100644 index 06639138..00000000 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ /dev/null @@ -1,178 +0,0 @@ -package WayofTime.bloodmagic.demonAura; - -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; - -import javax.annotation.Nullable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -public class WorldDemonWillHandler { - public static ConcurrentHashMap> dirtyChunks = new ConcurrentHashMap<>(); - static ConcurrentHashMap containedWills = new ConcurrentHashMap<>(); - - @Nullable - public static DemonWillHolder getWillHolder(int dim, int x, int y) { - WillChunk chunk = getWillChunk(dim, x, y); - if (chunk != null) { - return chunk.getCurrentWill(); - } - - return null; - } - - public static DemonWillHolder getWillHolder(World world, BlockPos pos) { - return getWillHolder(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); - } - - public static WillWorld getWillWorld(int dim) { - return containedWills.get(dim); - } - - @Nullable - public static WillChunk getWillChunk(int dim, int x, int y) { - if (!containedWills.containsKey(dim)) { - addWillWorld(dim); - } - - return (containedWills.get(dim)).getWillChunkAt(x, y); - } - - public static void addWillWorld(int dim) { - if (!containedWills.containsKey(dim)) { - containedWills.put(dim, new WillWorld(dim)); - BMLog.DEBUG.info("Creating demon will cache for world {}", dim); - } - } - - public static void removeWillWorld(int dim) { - containedWills.remove(dim); - BMLog.DEBUG.info("Removing demon will cache for world {}", dim); - } - - public static void addWillChunk(int dim, Chunk chunk, short base, DemonWillHolder currentWill) { - WillWorld aw = containedWills.get(dim); - if (aw == null) { - aw = new WillWorld(dim); - } - aw.getWillChunks().put(new PosXY(chunk.x, chunk.z), new WillChunk(chunk, base, currentWill)); - - containedWills.put(dim, aw); - } - - public static void removeWillChunk(int dim, int x, int y) { - WillWorld aw = containedWills.get(dim); - if (aw != null) { - WillChunk chunk = aw.getWillChunks().remove(new PosXY(x, y)); - if (chunk != null) { - markChunkAsDirty(chunk, dim); - } - } - } - - public static EnumDemonWillType getHighestDemonWillType(World world, BlockPos pos) { - double currentMax = 0; - EnumDemonWillType currentHighest = EnumDemonWillType.DEFAULT; - - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - if (currentWill.getWill(type) > currentMax) { - currentMax = currentWill.getWill(type); - currentHighest = type; - } - } - - return currentHighest; - } - - public static double drainWill(World world, BlockPos pos, EnumDemonWillType type, double amount, boolean doDrain) { - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - double drain = Math.min(currentWill.getWill(type), amount); - if (!doDrain) { - return drain; - } - - drain = currentWill.drainWill(type, drain); - markChunkAsDirty(willChunk, world.provider.getDimension()); - - return drain; - } - - public static double fillWillToMaximum(World world, BlockPos pos, EnumDemonWillType type, double amount, double max, boolean doFill) { - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - double fill = Math.min(amount, max - currentWill.getWill(type)); - if (!doFill || fill <= 0) { - return fill > 0 ? fill : 0; - } - - fill = currentWill.addWill(type, amount, max); - markChunkAsDirty(willChunk, world.provider.getDimension()); - - return fill; - } - - public static double fillWill(World world, BlockPos pos, EnumDemonWillType type, double amount, boolean doFill) { - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - if (!doFill) { - return amount; - } - - currentWill.addWill(type, amount); - markChunkAsDirty(willChunk, world.provider.getDimension()); - - return amount; - } - - public static WillChunk getWillChunk(World world, BlockPos pos) { - WillChunk willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); - if (willChunk == null) { - Chunk chunk = world.getChunk(pos); - generateWill(chunk); - - willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); - } - - return willChunk; - } - - public static double getCurrentWill(World world, BlockPos pos, EnumDemonWillType type) { - WillChunk willChunk = getWillChunk(world, pos); - - if (willChunk == null) { - return 0; - } - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - return currentWill.getWill(type); - } - - private static void markChunkAsDirty(WillChunk chunk, int dim) { - if (chunk.isModified()) { - return; - } - PosXY pos = new PosXY(chunk.loc.x, chunk.loc.y); - if (!dirtyChunks.containsKey(dim)) { - dirtyChunks.put(dim, new CopyOnWriteArrayList<>()); - } - CopyOnWriteArrayList dc = dirtyChunks.get(dim); - if (!dc.contains(pos)) { - dc.add(pos); - } - } - - public static void generateWill(Chunk chunk) { - addWillChunk(chunk.getWorld().provider.getDimension(), chunk, (short) 1, new DemonWillHolder()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java deleted file mode 100644 index c776b47a..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackRangedBow.java +++ /dev/null @@ -1,138 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.item.BowItem; -import net.minecraft.util.Hand; - -public class EntityAIAttackRangedBow extends Goal { - private final EntityDemonBase entity; - private final double moveSpeedAmp; - private final float maxAttackDistance; - private int attackCooldown; - private int attackTime = -1; - private int seeTime; - private boolean strafingClockwise; - private boolean strafingBackwards; - private int strafingTime = -1; - - public EntityAIAttackRangedBow(EntityDemonBase entityDemonBase, double speedAmplifier, int delay, float maxDistance) { - this.entity = entityDemonBase; - this.moveSpeedAmp = speedAmplifier; - this.attackCooldown = delay; - this.maxAttackDistance = maxDistance * maxDistance; - this.setMutexBits(3); - } - - public void setAttackCooldown(int p_189428_1_) { - this.attackCooldown = p_189428_1_; - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - return this.entity.getAttackTarget() != null && this.isBowInMainhand(); - } - - protected boolean isBowInMainhand() { - return this.entity.getHeldItemMainhand().getItem() instanceof BowItem; - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - public boolean continueExecuting() { - return (this.shouldExecute() || !this.entity.getNavigator().noPath()) && this.isBowInMainhand(); - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - super.startExecuting(); - } - - /** - * Resets the task - */ - public void resetTask() { - super.startExecuting(); - this.seeTime = 0; - this.attackTime = -1; - this.entity.resetActiveHand(); - } - - /** - * Updates the task - */ - public void updateTask() { - LivingEntity entitylivingbase = this.entity.getAttackTarget(); - - if (entitylivingbase != null) { - double d0 = this.entity.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ); - boolean flag = this.entity.getEntitySenses().canSee(entitylivingbase); - boolean flag1 = this.seeTime > 0; - - if (flag != flag1) { - this.seeTime = 0; - } - - if (flag) { - ++this.seeTime; - } else { - --this.seeTime; - } - - if (d0 <= (double) this.maxAttackDistance && this.seeTime >= 20) { - this.entity.getNavigator().clearPath(); - ++this.strafingTime; - } else { - this.entity.getNavigator().tryMoveToEntityLiving(entitylivingbase, this.moveSpeedAmp); - this.strafingTime = -1; - } - - if (this.strafingTime >= 20) { - if ((double) this.entity.getRNG().nextFloat() < 0.3D) { - this.strafingClockwise = !this.strafingClockwise; - } - - if ((double) this.entity.getRNG().nextFloat() < 0.3D) { - this.strafingBackwards = !this.strafingBackwards; - } - - this.strafingTime = 0; - } - - if (this.strafingTime > -1) { - if (d0 > (double) (this.maxAttackDistance * 0.75F)) { - this.strafingBackwards = false; - } else if (d0 < (double) (this.maxAttackDistance * 0.25F)) { - this.strafingBackwards = true; - } - - this.entity.getMoveHelper().strafe(this.strafingBackwards ? -0.5F : 0.5F, this.strafingClockwise ? 0.5F : -0.5F); - this.entity.faceEntity(entitylivingbase, 30.0F, 30.0F); - } else { - this.entity.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F); - } - - if (this.entity.isHandActive()) { - if (!flag && this.seeTime < -60) { - this.entity.resetActiveHand(); - } else if (flag) { - int i = this.entity.getItemInUseMaxCount(); - - if (i >= 20) { - this.entity.resetActiveHand(); - this.entity.attackEntityWithRangedAttack(entitylivingbase, BowItem.getArrowVelocity(i)); - this.attackTime = this.attackCooldown; - } - } - } else if (--this.attackTime <= 0 && this.seeTime >= -60) { - this.entity.setActiveHand(Hand.MAIN_HAND); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java deleted file mode 100644 index 08ecf2d4..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java +++ /dev/null @@ -1,142 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.pathfinding.Path; -import net.minecraft.util.Hand; -import net.minecraft.world.World; - -public class EntityAIAttackStealthMelee extends Goal { - protected final int attackInterval = 20; - protected EntityCorruptedChicken chicken; - /** - * An amount of decrementing ticks that allows the entity to attack once the - * tick reaches 0. - */ - protected int attackTick; - World worldObj; - /** - * The speed with which the mob will approach the target - */ - double speedTowardsTarget; - /** - * When true, the mob will continue chasing its target, even if it can't - * find a path to them right now. - */ - boolean longMemory; - /** - * The PathEntity of our entity. - */ - Path entityPathEntity; - private int delayCounter; - private double targetX; - private double targetY; - private double targetZ; - private int failedPathFindingPenalty = 0; - private boolean canPenalize = false; - - public EntityAIAttackStealthMelee(EntityCorruptedChicken creature, double speedIn, boolean useLongMemory) { - this.chicken = creature; - this.worldObj = creature.getEntityWorld(); - this.speedTowardsTarget = speedIn; - this.longMemory = useLongMemory; - this.setMutexBits(3); - } - - @Override - public boolean shouldExecute() { - if (chicken.attackStateMachine != 1) { - return false; - } - - LivingEntity entitylivingbase = this.chicken.getAttackTarget(); - - if (entitylivingbase == null) { - return false; - } else if (!entitylivingbase.isEntityAlive()) { - return false; - } else { - if (canPenalize) { - if (--this.delayCounter <= 0) { - this.entityPathEntity = this.chicken.getNavigator().getPathToEntityLiving(entitylivingbase); - this.delayCounter = 4 + this.chicken.getRNG().nextInt(7); - return this.entityPathEntity != null; - } else { - return true; - } - } - this.entityPathEntity = this.chicken.getNavigator().getPathToEntityLiving(entitylivingbase); - return this.entityPathEntity != null; - } - } - - @Override - public boolean shouldContinueExecuting() { - return chicken.attackStateMachine == 1 && super.shouldContinueExecuting(); - } - - @Override - public void resetTask() { - if (chicken.attackStateMachine == 1) { - chicken.attackStateMachine = 0; - } - } - - @Override - public void updateTask() { - LivingEntity entitylivingbase = this.chicken.getAttackTarget(); - this.chicken.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F); - double d0 = this.chicken.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ); - --this.delayCounter; - - if ((this.longMemory || this.chicken.getEntitySenses().canSee(entitylivingbase)) && this.delayCounter <= 0 && (this.targetX == 0.0D && this.targetY == 0.0D && this.targetZ == 0.0D || entitylivingbase.getDistanceSq(this.targetX, this.targetY, this.targetZ) >= 1.0D || this.chicken.getRNG().nextFloat() < 0.05F)) { - this.targetX = entitylivingbase.posX; - this.targetY = entitylivingbase.getEntityBoundingBox().minY; - this.targetZ = entitylivingbase.posZ; - this.delayCounter = 4 + this.chicken.getRNG().nextInt(7); - - if (this.canPenalize) { - this.delayCounter += failedPathFindingPenalty; - if (this.chicken.getNavigator().getPath() != null) { - net.minecraft.pathfinding.PathPoint finalPathPoint = this.chicken.getNavigator().getPath().getFinalPathPoint(); - if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.x, finalPathPoint.y, finalPathPoint.z) < 1) - failedPathFindingPenalty = 0; - else - failedPathFindingPenalty += 10; - } else { - failedPathFindingPenalty += 10; - } - } - - if (d0 > 1024.0D) { - this.delayCounter += 10; - } else if (d0 > 256.0D) { - this.delayCounter += 5; - } - - if (!this.chicken.getNavigator().tryMoveToEntityLiving(entitylivingbase, this.speedTowardsTarget)) { - this.delayCounter += 15; - } - } - - this.attackTick = Math.max(this.attackTick - 1, 0); - this.attackEntity(entitylivingbase, d0); - } - - protected void attackEntity(LivingEntity attacked, double distance) { - double d0 = this.getAttackReachSqr(attacked); - - if (distance <= d0 && this.attackTick <= 0) { - this.attackTick = 20; - this.chicken.swingArm(Hand.MAIN_HAND); - this.chicken.attackEntityAsMob(attacked); - - chicken.attackStateMachine = 2; - } - } - - protected double getAttackReachSqr(LivingEntity attackTarget) { - return (double) (this.chicken.width * 2.0F * this.chicken.width * 2.0F + attackTarget.width); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java deleted file mode 100644 index 0f6d167a..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIEatAndCorruptBlock.java +++ /dev/null @@ -1,99 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; -import WayofTime.bloodmagic.inversion.CorruptionHandler; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EntityAIEatAndCorruptBlock extends Goal { - /** - * The entity owner of this AITask - */ - private final EntityAspectedDemonBase grassEaterEntity; - /** - * The world the grass eater entity is eating from - */ - private final World world; - /** - * Number of ticks since the entity started to eat grass - */ - int eatingGrassTimer; - - public EntityAIEatAndCorruptBlock(EntityAspectedDemonBase entity) { - this.grassEaterEntity = entity; - this.world = entity.getEntityWorld(); - this.setMutexBits(7); - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - if (this.grassEaterEntity.getRNG().nextInt(50) != 0) { - return false; - } else { - BlockPos pos = new BlockPos(this.grassEaterEntity.posX, this.grassEaterEntity.posY, this.grassEaterEntity.posZ).down(); - BlockState offsetState = world.getBlockState(pos); - Block offsetBlock = offsetState.getBlock(); - return CorruptionHandler.isBlockCorruptible(world, grassEaterEntity.getType(), pos, offsetState, offsetBlock); - } - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - this.eatingGrassTimer = 40; - this.world.setEntityState(this.grassEaterEntity, (byte) 10); - this.grassEaterEntity.getNavigator().clearPath(); - } - - /** - * Resets the task - */ - public void resetTask() { - this.eatingGrassTimer = 0; - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - public boolean continueExecuting() { - return this.eatingGrassTimer > 0; - } - - /** - * Number of ticks since the entity started to eat grass - */ - public int getEatingGrassTimer() { - return this.eatingGrassTimer; - } - - /** - * Updates the task - */ - public void updateTask() { - this.eatingGrassTimer = Math.max(0, this.eatingGrassTimer - 1); - - if (this.eatingGrassTimer == 4) { - BlockPos blockpos = new BlockPos(this.grassEaterEntity.posX, this.grassEaterEntity.posY, this.grassEaterEntity.posZ); - - BlockPos offsetPos = blockpos.down(); - BlockState offsetState = world.getBlockState(offsetPos); - Block offsetBlock = offsetState.getBlock(); - - if (CorruptionHandler.isBlockCorruptible(world, grassEaterEntity.getType(), offsetPos, offsetState, offsetBlock)) { -// if (this.world.getGameRules().getBoolean("mobGriefing")) - { - this.world.playEvent(2001, offsetPos, Block.getIdFromBlock(offsetBlock)); - CorruptionHandler.corruptSurroundingBlocks(world, grassEaterEntity.getType(), offsetPos, 2, 0.5, 0.5); - } - - this.grassEaterEntity.eatGrassBonus(); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java deleted file mode 100644 index 6fe42c3b..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java +++ /dev/null @@ -1,125 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.pathfinding.GroundPathNavigator; -import net.minecraft.pathfinding.PathNavigator; -import net.minecraft.pathfinding.PathNodeType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; - -public class EntityAIFollowOwner extends Goal { - World theWorld; - float maxDist; - float minDist; - private EntityDemonBase thePet; - private LivingEntity theOwner; - private double followSpeed; - private PathNavigator petPathfinder; - private int timeToRecalcPath; - private float oldWaterCost; - - public EntityAIFollowOwner(EntityDemonBase thePetIn, double followSpeedIn, float minDistIn, float maxDistIn) { - this.thePet = thePetIn; - this.theWorld = thePetIn.getEntityWorld(); - this.followSpeed = followSpeedIn; - this.petPathfinder = thePetIn.getNavigator(); - this.minDist = minDistIn; - this.maxDist = maxDistIn; - this.setMutexBits(3); - - if (!(thePetIn.getNavigator() instanceof GroundPathNavigator)) { - throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal"); - } - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - LivingEntity entitylivingbase = this.thePet.getOwner(); - - if (entitylivingbase == null) { - return false; - } else if (entitylivingbase instanceof PlayerEntity && ((PlayerEntity) entitylivingbase).isSpectator()) { - return false; - } else if (this.thePet.isStationary()) { - return false; - } else if (this.thePet.getDistanceSq(entitylivingbase) < (double) (this.minDist * this.minDist)) { - return false; - } else { - this.theOwner = entitylivingbase; - return true; - } - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - public boolean continueExecuting() { - return !this.petPathfinder.noPath() && this.thePet.getDistanceSq(this.theOwner) > (double) (this.maxDist * this.maxDist) && !this.thePet.isStationary(); - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - this.timeToRecalcPath = 0; - this.oldWaterCost = this.thePet.getPathPriority(PathNodeType.WATER); - this.thePet.setPathPriority(PathNodeType.WATER, 0.0F); - } - - /** - * Resets the task - */ - public void resetTask() { - this.theOwner = null; - this.petPathfinder.clearPath(); - this.thePet.setPathPriority(PathNodeType.WATER, this.oldWaterCost); - } - - private boolean isEmptyBlock(BlockPos pos) { - BlockState iblockstate = this.theWorld.getBlockState(pos); - Block block = iblockstate.getBlock(); - return block == Blocks.AIR || !iblockstate.isFullCube(); - } - - /** - * Updates the task - */ - public void updateTask() { - this.thePet.getLookHelper().setLookPositionWithEntity(this.theOwner, 10.0F, (float) this.thePet.getVerticalFaceSpeed()); - - if (!this.thePet.isStationary()) { - if (--this.timeToRecalcPath <= 0) { - this.timeToRecalcPath = 10; - - if (!this.petPathfinder.tryMoveToEntityLiving(this.theOwner, this.followSpeed)) { - if (!this.thePet.getLeashed()) { - if (this.thePet.getDistanceSq(this.theOwner) >= 144.0D) { - int i = MathHelper.floor(this.theOwner.posX) - 2; - int j = MathHelper.floor(this.theOwner.posZ) - 2; - int k = MathHelper.floor(this.theOwner.getEntityBoundingBox().minY); - - for (int l = 0; l <= 4; ++l) { - for (int i1 = 0; i1 <= 4; ++i1) { - if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isTopSolid() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1))) { - this.thePet.setLocationAndAngles((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch); - this.petPathfinder.clearPath(); - return; - } - } - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java deleted file mode 100644 index 83092001..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java +++ /dev/null @@ -1,136 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.pathfinding.PathNavigator; -import net.minecraft.pathfinding.GroundPathNavigator; -import net.minecraft.pathfinding.PathNodeType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; - -public class EntityAIGrabEffectsFromOwner extends Goal { - World theWorld; - float minDist; - private EntitySentientSpecter thePet; - private LivingEntity theOwner; - private double followSpeed; - private PathNavigator petPathfinder; - private int timeToRecalcPath; - private float oldWaterCost; - - /** - * In order to steal effects from the owner, the mob has to be close to the - * owner. - */ - public EntityAIGrabEffectsFromOwner(EntitySentientSpecter thePetIn, double followSpeedIn, float minDistIn) { - this.thePet = thePetIn; - this.theWorld = thePetIn.getEntityWorld(); - this.followSpeed = followSpeedIn; - this.petPathfinder = thePetIn.getNavigator(); - this.minDist = minDistIn; - this.setMutexBits(3); - - if (!(thePetIn.getNavigator() instanceof GroundPathNavigator)) { - throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal"); - } - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - LivingEntity entitylivingbase = this.thePet.getOwner(); - - if (entitylivingbase == null) { - return false; - } else if (entitylivingbase instanceof PlayerEntity && ((PlayerEntity) entitylivingbase).isSpectator()) { - return false; - } else if (this.thePet.isStationary()) { - return false; -// } else if (this.thePet.getDistanceSqToEntity(entitylivingbase) < (double) (this.minDist * this.minDist)) -// { -// return false; - } else if (!this.thePet.canStealEffectFromOwner(entitylivingbase)) { - return false; - } else { - this.theOwner = entitylivingbase; - return true; - } - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - public boolean continueExecuting() { - return this.thePet.canStealEffectFromOwner(theOwner);// || !this.petPathfinder.noPath() && this.thePet.getDistanceSqToEntity(this.theOwner) > (double) (this.minDist * this.minDist) && !this.thePet.isStationary(); - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - this.timeToRecalcPath = 0; - this.oldWaterCost = this.thePet.getPathPriority(PathNodeType.WATER); - this.thePet.setPathPriority(PathNodeType.WATER, 0.0F); - } - - /** - * Resets the task - */ - public void resetTask() { - this.theOwner = null; - this.petPathfinder.clearPath(); - this.thePet.setPathPriority(PathNodeType.WATER, this.oldWaterCost); - } - - private boolean isEmptyBlock(BlockPos pos) { - BlockState iblockstate = this.theWorld.getBlockState(pos); - Block block = iblockstate.getBlock(); - return block == Blocks.AIR || !iblockstate.isFullCube(); - } - - /** - * Updates the task - */ - public void updateTask() { - this.thePet.getLookHelper().setLookPositionWithEntity(this.theOwner, 10.0F, (float) this.thePet.getVerticalFaceSpeed()); - - if (this.thePet.getDistanceSq(theOwner) < this.minDist * this.minDist) { - if (this.thePet.stealEffectsFromOwner(theOwner)) { - return; - } - } - - if (!this.thePet.isStationary()) { - if (--this.timeToRecalcPath <= 0) { - this.timeToRecalcPath = 10; - - if (!this.petPathfinder.tryMoveToEntityLiving(this.theOwner, this.followSpeed)) { - if (!this.thePet.getLeashed()) { - if (this.thePet.getDistanceSq(this.theOwner) >= 144.0D) { - int i = MathHelper.floor(this.theOwner.posX) - 2; - int j = MathHelper.floor(this.theOwner.posZ) - 2; - int k = MathHelper.floor(this.theOwner.getEntityBoundingBox().minY); - - for (int l = 0; l <= 4; ++l) { - for (int i1 = 0; i1 <= 4; ++i1) { - if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isTopSolid() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1))) { - this.thePet.setLocationAndAngles((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch); - this.petPathfinder.clearPath(); - return; - } - } - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java deleted file mode 100644 index 44690ec5..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIHurtByTargetIgnoreTamed.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import net.minecraft.entity.CreatureEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.IEntityOwnable; -import net.minecraft.entity.ai.goal.HurtByTargetGoal; - -import java.util.UUID; - -public class EntityAIHurtByTargetIgnoreTamed extends HurtByTargetGoal { - public EntityAIHurtByTargetIgnoreTamed(CreatureEntity creatureIn, boolean entityCallsForHelpIn, Class... targetClassesIn) { - super(creatureIn, true, targetClassesIn); - } - - @Override - public boolean isSuitableTarget(LivingEntity target, boolean includeInvincibles) { - if (this.taskOwner instanceof IEntityOwnable && target instanceof IEntityOwnable) { - UUID thisId = ((IEntityOwnable) this.taskOwner).getOwnerId(); - UUID targetId = ((IEntityOwnable) target).getOwnerId(); - if (thisId != null && targetId != null && thisId.equals(targetId)) { - return false; - } - } - - return super.isSuitableTarget(target, includeInvincibles); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java deleted file mode 100644 index 787dcaec..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIMimicReform.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityMimic; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.util.math.BlockPos; - -public class EntityAIMimicReform extends Goal { - private final EntityMimic theEntity; - - public EntityAIMimicReform(EntityMimic creatureIn) { - this.theEntity = creatureIn; - this.setMutexBits(2); - } - - @Override - public boolean shouldExecute() { - return this.theEntity.ticksExisted > 100 && this.theEntity.hasHome() && this.theEntity.isWithinHomeDistanceCurrentPosition(); - } - - @Override - public void startExecuting() { - BlockPos homePos = this.theEntity.getHomePosition(); - if (theEntity.reformIntoMimicBlock(homePos)) { - this.theEntity.setDead(); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java deleted file mode 100644 index 371c3b4c..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.TargetGoal; - -public class EntityAIOwnerHurtByTarget extends TargetGoal { - EntityDemonBase theDefendingTameable; - LivingEntity theOwnerAttacker; - private int timestamp; - - public EntityAIOwnerHurtByTarget(EntityDemonBase theDefendingTameableIn) { - super(theDefendingTameableIn, false); - this.theDefendingTameable = theDefendingTameableIn; - this.setMutexBits(1); - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - if (!this.theDefendingTameable.isTamed()) { - return false; - } else { - LivingEntity owner = this.theDefendingTameable.getOwner(); - - if (owner == null) { - return false; - } else { - this.theOwnerAttacker = owner.getRevengeTarget(); - int i = owner.getRevengeTimer(); - return i != this.timestamp && this.isSuitableTarget(this.theOwnerAttacker, false) && this.theDefendingTameable.shouldAttackEntity(this.theOwnerAttacker, owner); - } - } - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - this.taskOwner.setAttackTarget(this.theOwnerAttacker); - LivingEntity owner = this.theDefendingTameable.getOwner(); - - if (owner != null) { - this.timestamp = owner.getRevengeTimer(); - } - - super.startExecuting(); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java deleted file mode 100644 index 61433ccd..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.TargetGoal; - -public class EntityAIOwnerHurtTarget extends TargetGoal { - EntityDemonBase theEntityDemonBase; - LivingEntity theTarget; - private int timestamp; - - public EntityAIOwnerHurtTarget(EntityDemonBase theEntityDemonBaseIn) { - super(theEntityDemonBaseIn, false); - this.theEntityDemonBase = theEntityDemonBaseIn; - this.setMutexBits(1); - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - if (!this.theEntityDemonBase.isTamed()) { - return false; - } else { - LivingEntity entitylivingbase = this.theEntityDemonBase.getOwner(); - - if (entitylivingbase == null) { - return false; - } else { - this.theTarget = entitylivingbase.getLastAttackedEntity(); - int i = entitylivingbase.getLastAttackedEntityTime(); - return i != this.timestamp && this.isSuitableTarget(this.theTarget, false) && this.theEntityDemonBase.shouldAttackEntity(this.theTarget, entitylivingbase); - } - } - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - this.taskOwner.setAttackTarget(this.theTarget); - LivingEntity entitylivingbase = this.theEntityDemonBase.getOwner(); - - if (entitylivingbase != null) { - this.timestamp = entitylivingbase.getLastAttackedEntityTime(); - } - - super.startExecuting(); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java deleted file mode 100644 index 77e9f9d9..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java +++ /dev/null @@ -1,154 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.pathfinding.Path; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.World; - -import java.util.List; - -public class EntityAIPickUpAlly extends Goal { - protected final int attackInterval = 20; - protected EntityAspectedDemonBase entity; - /** - * An amount of decrementing ticks that allows the entity to attack once the - * tick reaches 0. - */ - protected int attackTick; - World worldObj; - /** - * The speed with which the mob will approach the target - */ - double speedTowardsTarget; - /** - * When true, the mob will continue chasing its target, even if it can't - * find a path to them right now. - */ - boolean longMemory; - /** - * The PathEntity of our entity. - */ - Path entityPathEntity; - private int delayCounter; - private double targetX; - private double targetY; - private double targetZ; - private int failedPathFindingPenalty = 0; - private boolean canPenalize = false; - - private LivingEntity pickupTarget = null; - - public EntityAIPickUpAlly(EntityAspectedDemonBase creature, double speedIn, boolean useLongMemory) { - this.entity = creature; - this.worldObj = creature.getEntityWorld(); - this.speedTowardsTarget = speedIn; - this.longMemory = useLongMemory; - this.setMutexBits(3); - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - if (this.entity.getRidingEntity() != null) { - return false; - } - - AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5); - List list = this.entity.getEntityWorld().getEntitiesWithinAABB(LivingEntity.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); - for (LivingEntity testEntity : list) { - if (testEntity != this.entity) { - Path path = this.entity.getNavigator().getPathToEntityLiving(testEntity); - if (path != null) { - this.entityPathEntity = path; - this.pickupTarget = testEntity; - return true; - } - } - } - - return false; - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - public boolean continueExecuting() { - return this.entity.getRidingEntity() != null; - } - - /** - * Execute a one shot task or start executing a continuous task - */ - public void startExecuting() { - this.entity.getNavigator().setPath(this.entityPathEntity, this.speedTowardsTarget); - this.delayCounter = 0; - } - - /** - * Resets the task - */ - public void resetTask() { - this.entity.getNavigator().clearPath(); - this.pickupTarget = null; - } - - /** - * Updates the task - */ - public void updateTask() { - LivingEntity entitylivingbase = this.pickupTarget; - this.entity.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F); - double d0 = this.entity.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ); - --this.delayCounter; - - if ((this.longMemory || this.entity.getEntitySenses().canSee(entitylivingbase)) && this.delayCounter <= 0 && (this.targetX == 0.0D && this.targetY == 0.0D && this.targetZ == 0.0D || entitylivingbase.getDistanceSq(this.targetX, this.targetY, this.targetZ) >= 1.0D || this.entity.getRNG().nextFloat() < 0.05F)) { - this.targetX = entitylivingbase.posX; - this.targetY = entitylivingbase.getEntityBoundingBox().minY; - this.targetZ = entitylivingbase.posZ; - this.delayCounter = 4 + this.entity.getRNG().nextInt(7); - - if (this.canPenalize) { - this.delayCounter += failedPathFindingPenalty; - if (this.entity.getNavigator().getPath() != null) { - net.minecraft.pathfinding.PathPoint finalPathPoint = this.entity.getNavigator().getPath().getFinalPathPoint(); - if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.x, finalPathPoint.y, finalPathPoint.z) < 1) - failedPathFindingPenalty = 0; - else - failedPathFindingPenalty += 10; - } else { - failedPathFindingPenalty += 10; - } - } - - if (d0 > 1024.0D) { - this.delayCounter += 10; - } else if (d0 > 256.0D) { - this.delayCounter += 5; - } - - if (!this.entity.getNavigator().tryMoveToEntityLiving(entitylivingbase, this.speedTowardsTarget)) { - this.delayCounter += 15; - } - } - - this.attackTick = Math.max(this.attackTick - 1, 0); - this.pickUpEntity(entitylivingbase, d0); - } - - protected void pickUpEntity(LivingEntity potentialPickup, double distance) { - double d0 = this.getAttackReachSqr(potentialPickup); - - if (distance <= d0 && this.attackTick <= 0 && !potentialPickup.isRiding()) { - BMLog.DEBUG.info("Hai!"); - potentialPickup.startRiding(this.entity, true); - } - } - - protected double getAttackReachSqr(LivingEntity attackTarget) { - return (double) (this.entity.width * 2.0F * this.entity.width * 2.0F + attackTarget.width); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java deleted file mode 100644 index 5f7b7981..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java +++ /dev/null @@ -1,98 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityAspectedDemonBase; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.World; - -import java.util.List; - -public class EntityAIProtectAlly extends Goal { - /** - * The entity owner of this AITask - */ - private final EntityCorruptedSheep entity; - /** - * The world the grass eater entity is eating from - */ - private final World world; - /** - * Number of ticks since the entity started to eat grass - */ - int castTimer; - - public EntityAIProtectAlly(EntityCorruptedSheep entity) { - this.entity = entity; - this.world = entity.getEntityWorld(); - this.setMutexBits(7); - } - - public int getCastTimer() { - return this.castTimer; - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - @Override - public boolean shouldExecute() { - AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5); - List list = world.getEntitiesWithinAABB(LivingEntity.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); - for (LivingEntity testEntity : list) { - if (testEntity != this.entity) { - if (this.entity.canProtectAlly(testEntity)) { - return true; - } - } - } - - return false; - } - - /** - * Execute a one shot task or start executing a continuous task - */ - @Override - public void startExecuting() { - this.castTimer = 100; - this.world.setEntityState(this.entity, (byte) 53); - this.entity.getNavigator().clearPath(); - } - - /** - * Resets the task - */ - @Override - public void resetTask() { - this.castTimer = 0; - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - @Override - public boolean shouldContinueExecuting() { - return castTimer > 0; - } - - /** - * Updates the task - */ - @Override - public void updateTask() { - this.castTimer = Math.max(0, this.castTimer - 1); - if (castTimer == 0) { - AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5); - List list = world.getEntitiesWithinAABB(LivingEntity.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType())); - for (LivingEntity testEntity : list) { - if (testEntity != this.entity) { - if (this.entity.applyProtectionToAlly(testEntity)) { - return; - } - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java deleted file mode 100644 index 76d47389..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java +++ /dev/null @@ -1,135 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityDemonBase; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.ai.RandomPositionGenerator; -import net.minecraft.pathfinding.Path; -import net.minecraft.pathfinding.PathNavigator; -import net.minecraft.util.EntityPredicates; -import net.minecraft.util.math.Vec3d; - -import java.util.List; - -public class EntityAIRetreatToHeal extends Goal { - private final Predicate canBeSeenSelector; - /** - * The entity we are attached to - */ - protected EntityDemonBase theEntity; - protected T closestLivingEntity; - private double farSpeed; - private double nearSpeed; - private double safeHealDistance = 3; - private float avoidDistance; - /** - * The PathEntity of our entity - */ - private Path entityPathEntity; - /** - * The PathNavigate of our entity - */ - private PathNavigator entityPathNavigate; - private Class classToAvoid; - private Predicate avoidTargetSelector; - - public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class classToAvoidIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) { - this(theEntityIn, classToAvoidIn, Predicates.alwaysTrue(), avoidDistanceIn, farSpeedIn, nearSpeedIn); - } - - public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class classToAvoidIn, Predicate avoidTargetSelectorIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) { - this.canBeSeenSelector = p_apply_1_ -> p_apply_1_.isEntityAlive() && EntityAIRetreatToHeal.this.theEntity.getEntitySenses().canSee(p_apply_1_); - this.theEntity = theEntityIn; - this.classToAvoid = classToAvoidIn; - this.avoidTargetSelector = avoidTargetSelectorIn; - this.avoidDistance = avoidDistanceIn; - this.farSpeed = farSpeedIn; - this.nearSpeed = nearSpeedIn; - this.entityPathNavigate = theEntityIn.getNavigator(); - this.setMutexBits(3); - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - @Override - public boolean shouldExecute() { - if (!this.theEntity.shouldEmergencyHeal()) { - return false; - } - - //This part almost doesn't matter - List list = this.theEntity.getEntityWorld().getEntitiesWithinAABB(this.classToAvoid, this.theEntity.getEntityBoundingBox().expand((double) this.avoidDistance, 3.0D, (double) this.avoidDistance), Predicates.and(EntityPredicates.CAN_AI_TARGET, this.canBeSeenSelector, this.avoidTargetSelector)); - - if (list.isEmpty()) { - return true; //No entities nearby, so I can freely heal - } else { - this.closestLivingEntity = list.get(0); - Vec3d vec3d = RandomPositionGenerator.findRandomTargetBlockAwayFrom(this.theEntity, 16, 7, new Vec3d(this.closestLivingEntity.posX, this.closestLivingEntity.posY, this.closestLivingEntity.posZ)); - - if (vec3d == null) { - return false; //Nowhere to run, gotta fight! - } else if (this.closestLivingEntity.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < this.closestLivingEntity.getDistanceSq(this.theEntity)) { - return false; //I'll be headed off if I choose this direction. - } else { - this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.x, vec3d.y, vec3d.z); - return this.entityPathEntity != null; - } - } - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - @Override - public boolean shouldContinueExecuting() { - return this.theEntity.shouldEmergencyHeal();//!this.entityPathNavigate.noPath(); - } - - /** - * Execute a one shot task or start executing a continuous task - */ - @Override - public void startExecuting() { - if (this.entityPathEntity != null) { - this.entityPathNavigate.setPath(this.entityPathEntity, this.farSpeed); - } - } - - /** - * Resets the task - */ - @Override - public void resetTask() { - this.closestLivingEntity = null; - } - - /** - * Updates the task - */ - @Override - public void updateTask() { - if (this.closestLivingEntity != null) { - if (this.theEntity.getDistanceSq(this.closestLivingEntity) < 49.0D) { - this.theEntity.getNavigator().setSpeed(this.nearSpeed); - } else { - this.theEntity.getNavigator().setSpeed(this.farSpeed); - } - - if (this.theEntity.ticksExisted % 20 == 0 && this.theEntity.getDistanceSq(this.closestLivingEntity) >= safeHealDistance * safeHealDistance) { - healEntity(); - return; - } - } - - if (this.theEntity.ticksExisted % 20 == 0) { - healEntity(); - } - } - - public void healEntity() { - this.theEntity.performEmergencyHeal(2); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java deleted file mode 100644 index 43d4e275..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java +++ /dev/null @@ -1,96 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.ai.RandomPositionGenerator; -import net.minecraft.pathfinding.Path; -import net.minecraft.pathfinding.PathNavigator; -import net.minecraft.util.math.Vec3d; - -public class EntityAIStealthRetreat extends Goal { - private final double farSpeed; - private final double nearSpeed; - private final float avoidDistance; - /** - * The PathNavigate of our entity - */ - private final PathNavigator entityPathNavigate; - /** - * The entity we are attached to - */ - protected EntityCorruptedChicken entity; - /** - * The PathEntity of our entity - */ - private Path entityPathEntity; - private int ticksLeft = 0; - - public EntityAIStealthRetreat(EntityCorruptedChicken theEntityIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) { - this.entity = theEntityIn; - this.avoidDistance = avoidDistanceIn; - this.farSpeed = farSpeedIn; - this.nearSpeed = nearSpeedIn; - this.entityPathNavigate = theEntityIn.getNavigator(); - this.setMutexBits(1); - } - - @Override - public boolean shouldExecute() { - if (this.entity.attackStateMachine == 2) { - LivingEntity attacked = this.entity.getAttackTarget(); - if (attacked == null) { - return false; - } - - Vec3d vec3d = RandomPositionGenerator.findRandomTargetBlockAwayFrom(this.entity, 16, 7, new Vec3d(attacked.posX, attacked.posY, attacked.posZ)); - - if (vec3d == null) { - return false; - } else if (attacked.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < attacked.getDistanceSq(this.entity)) { - return false; - } else { - this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.x, vec3d.y, vec3d.z); - return this.entityPathEntity != null; - } - } - - return false; - } - - @Override - public boolean shouldContinueExecuting() { - if (this.entityPathNavigate.noPath()) { - this.entity.attackStateMachine = 0; - return false; - } - - return this.entity.attackStateMachine == 2; - } - - @Override - public void resetTask() { - ticksLeft = 0; - } - - @Override - public void startExecuting() { - ticksLeft = this.entity.getEntityWorld().rand.nextInt(100) + 100; - this.entityPathNavigate.setPath(this.entityPathEntity, this.farSpeed); - } - - @Override - public void updateTask() { - ticksLeft--; - if (ticksLeft <= 0 || this.entity.getAttackTarget() == null) { - this.entity.attackStateMachine = 0; - return; - } - - if (this.entity.getDistanceSq(this.entity.getAttackTarget()) < 49.0D) { - this.entity.getNavigator().setSpeed(this.nearSpeed); - } else { - this.entity.getNavigator().setSpeed(this.farSpeed); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java deleted file mode 100644 index 7e25dd39..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java +++ /dev/null @@ -1,87 +0,0 @@ -package WayofTime.bloodmagic.entity.ai; - -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import net.minecraft.entity.CreatureEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.ai.RandomPositionGenerator; -import net.minecraft.util.math.Vec3d; - -public class EntityAIStealthTowardsTarget extends Goal { - private final EntityCorruptedChicken entity; - private final double speed; - private double xPosition; - private double yPosition; - private double zPosition; - private int ticksLeft = 0; - - public EntityAIStealthTowardsTarget(EntityCorruptedChicken creatureIn, double speedIn) { - this.entity = creatureIn; - this.speed = speedIn; - this.setMutexBits(1); - } - - @Override - public boolean shouldExecute() { - if (this.entity.attackStateMachine != 0 || this.entity.getAttackTarget() == null) { - return false; - } - - LivingEntity target = this.entity.getAttackTarget(); - Vec3d vec3d = null; - if (target instanceof CreatureEntity) { - vec3d = RandomPositionGenerator.findRandomTarget((CreatureEntity) target, 10, 7); - } else { - vec3d = RandomPositionGenerator.findRandomTarget(this.entity, 10, 7); - } - - if (vec3d == null) { - return false; - } else { - ticksLeft = this.entity.getEntityWorld().rand.nextInt(200) + 100; - this.xPosition = vec3d.x; - this.yPosition = vec3d.y; - this.zPosition = vec3d.z; - return true; - } - } - - @Override - public void resetTask() { - ticksLeft = 0; - } - - @Override - public boolean shouldContinueExecuting() { - ticksLeft--; - if (ticksLeft <= 0) { - this.entity.attackStateMachine = 1; - } - - this.entity.cloak(); - - if (this.entity.getNavigator().noPath()) { - LivingEntity target = this.entity.getAttackTarget(); - Vec3d vec3d; - if (target instanceof CreatureEntity) { - vec3d = RandomPositionGenerator.findRandomTarget((CreatureEntity) target, 10, 7); - } else { - vec3d = RandomPositionGenerator.findRandomTarget(this.entity, 10, 7); - } - - if (vec3d != null) { - this.xPosition = vec3d.x; - this.yPosition = vec3d.y; - this.zPosition = vec3d.z; - this.entity.getNavigator().tryMoveToXYZ(this.xPosition, this.yPosition, this.zPosition, this.speed); - } - } - - return this.entity.attackStateMachine == 0; - } - - @Override - public void startExecuting() { - this.entity.getNavigator().tryMoveToXYZ(this.xPosition, this.yPosition, this.zPosition, this.speed); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java deleted file mode 100644 index 4200cf0d..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ /dev/null @@ -1,242 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.gson.Serializers; -import com.google.common.base.Predicate; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; - -import java.util.Locale; - -public abstract class EntityAspectedDemonBase extends EntityDemonBase { - protected static final DataParameter TYPE = EntityDataManager.createKey(EntityAspectedDemonBase.class, Serializers.WILL_TYPE_SERIALIZER); - - public EntityAspectedDemonBase(World worldIn) { - super(worldIn); - } - - @Override - protected void entityInit() { - super.entityInit(); - this.dataManager.register(TYPE, EnumDemonWillType.DEFAULT); - } - - public double getMeleeResist() { - return 0; - } - - public double getProjectileResist() { - return 0; - } - - public double getMagicResist() { - return 0; - } - - public double getBaseHP(EnumDemonWillType type) { - double baseHP = 40; - - switch (type) { - case DEFAULT: - break; - case CORROSIVE: - break; - case DESTRUCTIVE: - break; - case VENGEFUL: - baseHP *= 0.8; - break; - case STEADFAST: - baseHP *= 1.25; - break; - } - - return baseHP; - } - - public double getBaseMeleeDamage(EnumDemonWillType type) { - double baseDamage = 8; - - switch (type) { - case DEFAULT: - break; - case CORROSIVE: - baseDamage *= 0.8; - break; - case DESTRUCTIVE: - baseDamage *= 1.5; - break; - case VENGEFUL: - baseDamage *= 0.8; - break; - case STEADFAST: - baseDamage *= 0.6; - break; - } - - return baseDamage; - } - - public double getBaseSpeed(EnumDemonWillType type) { - double baseSpeed = 0.27; - - switch (type) { - case DEFAULT: - break; - case CORROSIVE: - break; - case DESTRUCTIVE: - break; - case VENGEFUL: - baseSpeed *= 1.3; - break; - case STEADFAST: - break; - } - - return baseSpeed; - } - - public double getBaseSprintModifier(EnumDemonWillType type) { - double baseSprint = 1; - - switch (type) { - case DEFAULT: - break; - case CORROSIVE: - break; - case DESTRUCTIVE: - break; - case VENGEFUL: - baseSprint *= 1.2; - break; - case STEADFAST: - break; - } - - return baseSprint; - } - - public double getBaseKnockbackResist(EnumDemonWillType type) { - double baseKnockback = 0; - - switch (type) { - case DEFAULT: - break; - case CORROSIVE: - break; - case DESTRUCTIVE: - break; - case VENGEFUL: - break; - case STEADFAST: - baseKnockback += 0.35; - break; - } - - return baseKnockback; - } - - public void applyEntityAttributes(EnumDemonWillType type) { - this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(this.getBaseHP(type)); - this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(this.getBaseSpeed(type)); - this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(this.getBaseMeleeDamage(type)); - this.getEntityAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(this.getBaseKnockbackResist(type)); - } - - @Override - public boolean attackEntityFrom(DamageSource source, float amount) { - if (this.isEntityInvulnerable(source)) { - return false; - } else { - float newAmount = amount; - if (source.isProjectile()) { - newAmount *= MathHelper.clamp(1 - getProjectileResist(), 0, 1); - } else { - newAmount *= MathHelper.clamp(1 - getMeleeResist(), 0, 1); - } - - if (source.isMagicDamage()) { - newAmount *= MathHelper.clamp(1 - getMagicResist(), 0, 1); - } - - return super.attackEntityFrom(source, newAmount); - } - } - - public EnumDemonWillType getType() { - return this.dataManager.get(TYPE); - } - - public void setType(EnumDemonWillType type) { - this.dataManager.set(TYPE, type); - this.applyEntityAttributes(type); - this.setCombatTask(); - } - - @Override - public void writeEntityToNBT(CompoundNBT tag) { - super.writeEntityToNBT(tag); - - tag.putString(Constants.NBT.WILL_TYPE, this.getType().toString()); - } - - @Override - public void readEntityFromNBT(CompoundNBT tag) { - super.readEntityFromNBT(tag); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - setType(EnumDemonWillType.DEFAULT); - } else { - setType(EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH))); - } - } - - //Returns true if the inputted mob is on the same team. - public static class WillTypePredicate implements Predicate { - private final EnumDemonWillType type; - - public WillTypePredicate(EnumDemonWillType type) { - this.type = type; - } - - //Returns true if this mob is the same type. - @Override - public boolean apply(LivingEntity input) { - if (input instanceof EntityAspectedDemonBase) { - if (((EntityAspectedDemonBase) input).getType() == type) { - return true; - } - } - - return false; - } - } - - public class TeamAttackPredicate implements Predicate { - private final EntityAspectedDemonBase demon; - - public TeamAttackPredicate(EntityAspectedDemonBase demon) { - this.demon = demon; - } - - //Returns true if this mob can attack the inputted mob. - @Override - public boolean apply(LivingEntity input) { - if (input instanceof EntityAspectedDemonBase) { - if (((EntityAspectedDemonBase) input).getType() == demon.getType()) { - return false; - } - } - - return input != null; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java deleted file mode 100644 index 417d62d5..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ /dev/null @@ -1,202 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.entity.ai.EntityAIAttackStealthMelee; -import WayofTime.bloodmagic.entity.ai.EntityAIStealthRetreat; -import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Items; -import net.minecraft.potion.Effects; -import net.minecraft.util.SoundEvents; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.pathfinding.PathNodeType; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; - -public class EntityCorruptedChicken extends EntityAspectedDemonBase { - private final int attackPriority = 3; - public float wingRotation; - public float destPos; - public float oFlapSpeed; - public float oFlap; - public float wingRotDelta = 1.0F; - /** - * The time until the next egg is spawned. - */ - public int timeUntilNextEgg; - /* - * 0 means the chicken is casting stealth on itself when targeted, running - * to a random location near the target. 1 means the chicken is running - * after the target, attempting to attack it. 2 means it is running away - * from the target for a certain amount of time, before going back into - * state 0. - */ - public int attackStateMachine = 0; - private EntityAIAttackStealthMelee aiAttackOnCollide; - - public EntityCorruptedChicken(World world) { - this(world, EnumDemonWillType.DEFAULT); - } - - public EntityCorruptedChicken(World world, EnumDemonWillType type) { - super(world); - this.setSize(0.4F, 0.7F); - this.timeUntilNextEgg = this.rand.nextInt(600) + 600; - this.setPathPriority(PathNodeType.WATER, 0.0F); - - this.setType(type); - } - - protected void initEntityAI() { - this.tasks.addTask(0, new SwimGoal(this)); -// this.tasks.addTask(1, new EntityAIPanic(this, 1.4D)); - this.tasks.addTask(attackPriority, new EntityAIStealthTowardsTarget(this, 1)); - this.tasks.addTask(attackPriority, new EntityAIStealthRetreat(this, 6.0F, 1.4D, 1.4D)); - this.tasks.addTask(5, new RandomWalkingGoal(this, 1.0D)); - this.tasks.addTask(6, new LookAtGoal(this, PlayerEntity.class, 6.0F)); - this.tasks.addTask(7, new LookRandomlyGoal(this)); - - this.targetTasks.addTask(1, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); - this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); - } - - @Override - public void setCombatTask() { - if (aiAttackOnCollide != null) { - this.tasks.removeTask(aiAttackOnCollide); - } - - aiAttackOnCollide = new EntityAIAttackStealthMelee(this, this.getBaseSprintModifier(getType()), false); - this.tasks.addTask(attackPriority, aiAttackOnCollide); - } - - public void cloak() { - this.addPotionEffect(new EffectInstance(Effects.INVISIBILITY, 50, 0, false, false)); - } - - @Override - public double getBaseHP(EnumDemonWillType type) { - return super.getBaseHP(type) * 0.5; - } - - @Override - public double getBaseMeleeDamage(EnumDemonWillType type) { - return super.getBaseMeleeDamage(type) * 2.5; - } - - @Override - public double getBaseSpeed(EnumDemonWillType type) { - return super.getBaseSpeed(type); - } - - @Override - public double getBaseSprintModifier(EnumDemonWillType type) { - return super.getBaseSprintModifier(type); - } - - @Override - public double getBaseKnockbackResist(EnumDemonWillType type) { - return super.getBaseKnockbackResist(type); - } - - @Override - public float getEyeHeight() { - return this.height; - } - - @Override - public void onLivingUpdate() { - super.onLivingUpdate(); - -// if (!worldObj.isRemote) -// System.out.println("State machine: " + this.attackStateMachine); - - this.oFlap = this.wingRotation; - this.oFlapSpeed = this.destPos; - this.destPos = (float) ((double) this.destPos + (double) (this.onGround ? -1 : 4) * 0.3D); - this.destPos = MathHelper.clamp(this.destPos, 0.0F, 1.0F); - - if (!this.onGround && this.wingRotDelta < 1.0F) { - this.wingRotDelta = 1.0F; - } - - this.wingRotDelta = (float) ((double) this.wingRotDelta * 0.9D); - - if (!this.onGround && this.motionY < 0.0D) { - this.motionY *= 0.6D; - } - - this.wingRotation += this.wingRotDelta * 2.0F; - - if (!this.getEntityWorld().isRemote && !this.isChild() && --this.timeUntilNextEgg <= 0) { - this.playSound(SoundEvents.ENTITY_CHICKEN_EGG, 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); - this.dropItem(Items.EGG, 1); - this.timeUntilNextEgg = this.rand.nextInt(600) + 600; - } - } - - @Override - public void fall(float distance, float damageMultiplier) { - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_CHICKEN_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_CHICKEN_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_CHICKEN_DEATH; - } - - @Override - protected float getSoundPitch() { - return super.getSoundPitch() * 0.5f; - } - - @Override - protected void playStepSound(BlockPos pos, Block blockIn) { - this.playSound(SoundEvents.ENTITY_CHICKEN_STEP, 0.15F, 1.0F); - } - - @Override - public void readEntityFromNBT(CompoundNBT compound) { - super.readEntityFromNBT(compound); - - if (compound.hasKey("EggLayTime")) { - this.timeUntilNextEgg = compound.getInt("EggLayTime"); - } - } - - @Override - public void writeEntityToNBT(CompoundNBT compound) { - super.writeEntityToNBT(compound); - compound.putInt("EggLayTime", this.timeUntilNextEgg); - } - - @Override - public void updatePassenger(Entity passenger) { - super.updatePassenger(passenger); - float f = MathHelper.sin(this.renderYawOffset * 0.017453292F); - float f1 = MathHelper.cos(this.renderYawOffset * 0.017453292F); - float f2 = 0.1F; - float f3 = 0.0F; - passenger.setPosition(this.posX + (double) (0.1F * f), this.posY + (double) (this.height * 0.5F) + passenger.getYOffset() + 0.0D, this.posZ - (double) (0.1F * f1)); - - if (passenger instanceof LivingEntity) { - ((LivingEntity) passenger).renderYawOffset = this.renderYawOffset; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java deleted file mode 100644 index 5e4acc3b..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ /dev/null @@ -1,354 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.entity.ai.EntityAIEatAndCorruptBlock; -import WayofTime.bloodmagic.entity.ai.EntityAIProtectAlly; -import com.google.common.collect.Maps; -import net.minecraft.block.Block; -import net.minecraft.entity.ILivingEntityData; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.DyeColor; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.DifficultyInstance; -import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Random; - -public class EntityCorruptedSheep extends EntityAspectedDemonBase implements IShearable { - private static final DataParameter DYE_COLOR = EntityDataManager.createKey(EntityCorruptedSheep.class, DataSerializers.BYTE); - - private static final Map DYE_TO_RGB = Maps.newEnumMap(DyeColor.class); - public static int maxProtectionCooldown = 90 * 20; //90 second cooldown - - static { - DYE_TO_RGB.put(DyeColor.WHITE, new float[]{1.0F, 1.0F, 1.0F}); - DYE_TO_RGB.put(DyeColor.ORANGE, new float[]{0.85F, 0.5F, 0.2F}); - DYE_TO_RGB.put(DyeColor.MAGENTA, new float[]{0.7F, 0.3F, 0.85F}); - DYE_TO_RGB.put(DyeColor.LIGHT_BLUE, new float[]{0.4F, 0.6F, 0.85F}); - DYE_TO_RGB.put(DyeColor.YELLOW, new float[]{0.9F, 0.9F, 0.2F}); - DYE_TO_RGB.put(DyeColor.LIME, new float[]{0.5F, 0.8F, 0.1F}); - DYE_TO_RGB.put(DyeColor.PINK, new float[]{0.95F, 0.5F, 0.65F}); - DYE_TO_RGB.put(DyeColor.GRAY, new float[]{0.3F, 0.3F, 0.3F}); - DYE_TO_RGB.put(DyeColor.SILVER, new float[]{0.6F, 0.6F, 0.6F}); - DYE_TO_RGB.put(DyeColor.CYAN, new float[]{0.3F, 0.5F, 0.6F}); - DYE_TO_RGB.put(DyeColor.PURPLE, new float[]{0.5F, 0.25F, 0.7F}); - DYE_TO_RGB.put(DyeColor.BLUE, new float[]{0.2F, 0.3F, 0.7F}); - DYE_TO_RGB.put(DyeColor.BROWN, new float[]{0.4F, 0.3F, 0.2F}); - DYE_TO_RGB.put(DyeColor.GREEN, new float[]{0.4F, 0.5F, 0.2F}); - DYE_TO_RGB.put(DyeColor.RED, new float[]{0.6F, 0.2F, 0.2F}); - DYE_TO_RGB.put(DyeColor.BLACK, new float[]{0.1F, 0.1F, 0.1F}); - } - - private final int attackPriority = 3; - public int protectionCooldown = 0; - /** - * Used to control movement as well as wool regrowth. Set to 40 on - * handleHealthUpdate and counts down with each tick. - */ - private int sheepTimer; - private int castTimer = 0; - private EntityAIEatAndCorruptBlock entityAIEatGrass; - private EntityAIProtectAlly entityAIProtectAlly; - private MeleeAttackGoal aiAttackOnCollide; - - public EntityCorruptedSheep(World world) { - this(world, EnumDemonWillType.DEFAULT); - } - - public EntityCorruptedSheep(World world, EnumDemonWillType type) { - super(world); - this.setSize(0.9F, 1.3F); - - this.setType(type); - } - - protected void initEntityAI() { - this.entityAIEatGrass = new EntityAIEatAndCorruptBlock(this); - this.entityAIProtectAlly = new EntityAIProtectAlly(this); - - this.tasks.addTask(0, new SwimGoal(this)); - this.tasks.addTask(2, entityAIProtectAlly); - this.tasks.addTask(5, this.entityAIEatGrass); - this.tasks.addTask(6, new RandomWalkingGoal(this, 1.0D)); - this.tasks.addTask(7, new LookAtGoal(this, PlayerEntity.class, 6.0F)); - this.tasks.addTask(8, new LookRandomlyGoal(this)); - - this.targetTasks.addTask(1, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); - this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); - } - - @Override - public void setCombatTask() { - if (aiAttackOnCollide != null) { - this.tasks.removeTask(aiAttackOnCollide); - } - - aiAttackOnCollide = new MeleeAttackGoal(this, this.getBaseSprintModifier(getType()), false); - this.tasks.addTask(attackPriority, aiAttackOnCollide); - } - - @Override - protected void updateAITasks() { - this.sheepTimer = this.entityAIEatGrass.getEatingGrassTimer(); - this.castTimer = this.entityAIProtectAlly.getCastTimer(); - super.updateAITasks(); - } - - @Override - public void onLivingUpdate() { - if (this.getEntityWorld().isRemote) { - this.sheepTimer = Math.max(0, this.sheepTimer - 1); - this.castTimer = Math.max(0, castTimer - 1); - if (this.castTimer == 70) { - this.playSound(this.getHurtSound(), this.getSoundVolume() * 2, this.getSoundPitch()); - } - } - - this.protectionCooldown = Math.max(0, this.protectionCooldown - 1); - - super.onLivingUpdate(); - } - - public boolean canProtectAlly(LivingEntity entity) { - return this.protectionCooldown <= 0 && entity.getHealth() < entity.getMaxHealth() && !entity.isPotionActive(Effects.RESISTANCE); - } - - public boolean applyProtectionToAlly(LivingEntity entity) { - if (canProtectAlly(entity)) { - entity.addPotionEffect(new EffectInstance(Effects.RESISTANCE, 20 * 20, 3)); - this.protectionCooldown = maxProtectionCooldown; - } - - return false; - } - - @Override - public double getBaseHP(EnumDemonWillType type) { - return super.getBaseHP(type) * 0.75; - } - - @Override - public double getBaseMeleeDamage(EnumDemonWillType type) { - return super.getBaseMeleeDamage(type) * 0.75; - } - - @Override - public double getBaseSpeed(EnumDemonWillType type) { - return super.getBaseSpeed(type); - } - - @Override - public double getBaseSprintModifier(EnumDemonWillType type) { - return super.getBaseSprintModifier(type); - } - - @Override - public double getBaseKnockbackResist(EnumDemonWillType type) { - return super.getBaseKnockbackResist(type) + 0.2; - } - - @Override - public double getMeleeResist() { - return 0.2; - } - - @Override - public double getProjectileResist() { - return 0.6; - } - - @Override - protected void entityInit() { - super.entityInit(); - this.dataManager.register(DYE_COLOR, (byte) 0); - } - - @Override - @SideOnly(Side.CLIENT) - public void handleStatusUpdate(byte id) { - if (id == 10) { - this.sheepTimer = 40; - } else if (id == 53) { - this.castTimer = 100; - } else { - super.handleStatusUpdate(id); - } - } - - @SideOnly(Side.CLIENT) - public float getHeadRotationPointY(float partialTick) { - return this.sheepTimer <= 0 ? 0.0F : (this.sheepTimer >= 4 && this.sheepTimer <= 36 ? 1.0F : (this.sheepTimer < 4 ? ((float) this.sheepTimer - partialTick) / 4.0F : -((float) (this.sheepTimer - 40) - partialTick) / 4.0F)); - } - - @SideOnly(Side.CLIENT) - public float getHeadRotationAngleX(float partialTick) { - if (this.sheepTimer > 4 && this.sheepTimer <= 36) { - float f = ((float) (this.sheepTimer - 4) - partialTick) / 32.0F; - return ((float) Math.PI / 5F) + ((float) Math.PI * 7F / 100F) * MathHelper.sin(f * 28.7F); - } else { - return this.sheepTimer > 0 ? ((float) Math.PI / 5F) : this.rotationPitch * 0.017453292F; - } - } - - @Override - public void writeEntityToNBT(CompoundNBT tag) { - super.writeEntityToNBT(tag); - tag.putBoolean("Sheared", this.getSheared()); - tag.putByte("Color", (byte) this.getFleeceColor().getMetadata()); - tag.putInt("protection", this.protectionCooldown); - } - - @Override - public void readEntityFromNBT(CompoundNBT tag) { - super.readEntityFromNBT(tag); - this.setSheared(tag.getBoolean("Sheared")); - this.setFleeceColor(DyeColor.byMetadata(tag.getByte("Color"))); - this.protectionCooldown = tag.getInt("protection"); - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_SHEEP_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_SHEEP_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_SHEEP_DEATH; - } - - @Override - protected float getSoundPitch() { - return super.getSoundPitch() * 0.5f; - } - - @Override - protected void playStepSound(BlockPos pos, Block blockIn) { - this.playSound(SoundEvents.ENTITY_SHEEP_STEP, 0.15F, 1.0F); - } - - /** - * Gets the wool color of this sheep. - */ - public DyeColor getFleeceColor() { - return DyeColor.byMetadata(this.dataManager.get(DYE_COLOR) & 15); - } - - /** - * Sets the wool color of this sheep - */ - public void setFleeceColor(DyeColor color) { - byte b0 = this.dataManager.get(DYE_COLOR); - this.dataManager.set(DYE_COLOR, (byte) (b0 & 240 | color.getMetadata() & 15)); - } - - /** - * returns true if a sheeps wool has been sheared - */ - public boolean getSheared() { - return (this.dataManager.get(DYE_COLOR) & 16) != 0; - } - - /** - * make a sheep sheared if set to true - */ - public void setSheared(boolean sheared) { - byte b0 = this.dataManager.get(DYE_COLOR); - - if (sheared) { - this.dataManager.set(DYE_COLOR, (byte) (b0 | 16)); - } else { - this.dataManager.set(DYE_COLOR, (byte) (b0 & -17)); - } - } - - /** - * This function applies the benefits of growing back wool and faster - * growing up to the acting entity. (This function is used in the - * AIEatGrass) - */ - @Override - public void eatGrassBonus() { - this.setSheared(false); - - if (this.isChild()) { - this.heal(3); - } - } - - /** - * Called only once on an entity when first time spawned, via egg, mob - * spawner, natural spawning etc, but not called when entity is reloaded - * from nbt. Mainly used for initializing attributes and inventory - */ - @Override - public ILivingEntityData onInitialSpawn(DifficultyInstance difficulty, @Nullable ILivingEntityData livingdata) { - livingdata = super.onInitialSpawn(difficulty, livingdata); - this.setFleeceColor(getRandomSheepColor(this.getEntityWorld().rand)); - return livingdata; - } - - @Override - public float getEyeHeight() { - return 0.95F * this.height; - } - - @Override - public boolean isShearable(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos) { - return !this.getSheared() && !this.isChild(); - } - - @Override - public List onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) { - this.setSheared(true); - int i = 1 + this.rand.nextInt(3); - - List ret = new ArrayList<>(); - for (int j = 0; j < i; ++j) - ret.add(new ItemStack(Item.getItemFromBlock(Blocks.WOOL), 1, this.getFleeceColor().getMetadata())); - - this.playSound(SoundEvents.ENTITY_SHEEP_SHEAR, 1.0F, 1.0F); - return ret; - } - - public int getCastTimer() { - return castTimer; - } - - public static float[] getDyeRgb(DyeColor dyeColor) { - return DYE_TO_RGB.get(dyeColor); - } - - /** - * Chooses a "vanilla" sheep color based on the provided random. - */ - public static DyeColor getRandomSheepColor(Random random) { - int i = random.nextInt(100); - return i < 5 ? DyeColor.BLACK : (i < 10 ? DyeColor.GRAY : (i < 15 ? DyeColor.SILVER : (i < 18 ? DyeColor.BROWN : (random.nextInt(500) == 0 ? DyeColor.PINK : DyeColor.WHITE)))); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java deleted file mode 100644 index 1a35bddd..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ /dev/null @@ -1,202 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.entity.ai.EntityAIPickUpAlly; -import net.minecraft.block.Block; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.EnumCreatureAttribute; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.pathfinding.ClimberPathNavigator; -import net.minecraft.pathfinding.PathNavigator; -import net.minecraft.potion.Effects; -import net.minecraft.util.SoundEvents; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EntityCorruptedSpider extends EntityAspectedDemonBase { - private static final DataParameter CLIMBING = EntityDataManager.createKey(EntityCorruptedSpider.class, DataSerializers.BYTE); - - public EntityCorruptedSpider(World world) { - this(world, EnumDemonWillType.DEFAULT); - } - - public EntityCorruptedSpider(World world, EnumDemonWillType type) { - super(world); - this.setSize(1.4F, 0.9F); - - this.setType(type); - } - - protected void initEntityAI() { - this.tasks.addTask(1, new SwimGoal(this)); - this.tasks.addTask(3, new LeapAtTargetGoal(this, 0.4F)); - this.tasks.addTask(3, new EntityAIPickUpAlly(this, 1, true)); - this.tasks.addTask(4, new EntityCorruptedSpider.AISpiderAttack(this)); - this.tasks.addTask(5, new RandomWalkingGoal(this, 0.8D)); - this.tasks.addTask(6, new LookAtGoal(this, PlayerEntity.class, 8.0F)); - this.tasks.addTask(6, new LookRandomlyGoal(this)); - this.targetTasks.addTask(1, new HurtByTargetGoal(this, false)); - - this.targetTasks.addTask(1, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); - this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this))); - } - - @Override - public double getBaseHP(EnumDemonWillType type) { - return super.getBaseHP(type); - } - - @Override - public double getBaseMeleeDamage(EnumDemonWillType type) { - return super.getBaseMeleeDamage(type); - } - - @Override - public double getBaseSpeed(EnumDemonWillType type) { - return super.getBaseSpeed(type); - } - - @Override - public double getBaseSprintModifier(EnumDemonWillType type) { - return super.getBaseSprintModifier(type); - } - - @Override - public double getBaseKnockbackResist(EnumDemonWillType type) { - return super.getBaseKnockbackResist(type); - } - - @Override - public double getMountedYOffset() { - return (double) (this.height * 0.5F); - } - - @Override - protected PathNavigator createNavigator(World worldIn) { - return new ClimberPathNavigator(this, worldIn); - } - - @Override - protected void entityInit() { - super.entityInit(); - this.dataManager.register(CLIMBING, (byte) 0); - } - - @Override - public void onUpdate() { - super.onUpdate(); - - if (!this.getEntityWorld().isRemote) { - this.setBesideClimbableBlock(this.collidedHorizontally); - } - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_SPIDER_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_SPIDER_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_SPIDER_DEATH; - } - - @Override - protected float getSoundPitch() { - return super.getSoundPitch() * 0.5f; - } - - @Override - protected void playStepSound(BlockPos pos, Block blockIn) { - this.playSound(SoundEvents.ENTITY_SPIDER_STEP, 0.15F, 1.0F); - } - - @Override - public boolean isOnLadder() { - return this.isBesideClimbableBlock(); - } - - @Override - public void setInWeb() { - } - - @Override - public EnumCreatureAttribute getCreatureAttribute() { - return EnumCreatureAttribute.ARTHROPOD; - } - - @Override - public boolean isPotionApplicable(EffectInstance potioneffectIn) { - return potioneffectIn.getPotion() != Effects.POISON && super.isPotionApplicable(potioneffectIn); - } - - public boolean isBesideClimbableBlock() { - return (this.dataManager.get(CLIMBING) & 1) != 0; - } - - public void setBesideClimbableBlock(boolean climbing) { - byte b0 = this.dataManager.get(CLIMBING); - - if (climbing) { - b0 = (byte) (b0 | 1); - } else { - b0 = (byte) (b0 & -2); - } - - this.dataManager.set(CLIMBING, b0); - } - - @Override - public float getEyeHeight() { - return 0.65F; - } - - static class AISpiderAttack extends MeleeAttackGoal { - public AISpiderAttack(EntityCorruptedSpider spider) { - super(spider, 1.0D, true); - } - - /** - * Returns whether an in-progress EntityAIBase should continue executing - */ - public boolean shouldContinueExecuting() { - float f = this.attacker.getBrightness(); - - if (f >= 0.5F && this.attacker.getRNG().nextInt(100) == 0) { - this.attacker.setAttackTarget(null); - return false; - } else { - return super.shouldContinueExecuting(); - } - } - - protected double getAttackReachSqr(LivingEntity attackTarget) { - return (double) (4.0F + attackTarget.width); - } - } - - static class AISpiderTarget extends NearestAttackableTargetGoal { - public AISpiderTarget(EntityCorruptedSpider spider, Class classTarget) { - super(spider, classTarget, true); - } - - /** - * Returns whether the EntityAIBase should begin execution. - */ - public boolean shouldExecute() { - float f = this.taskOwner.getBrightness(); - return !(f >= 0.5F) && super.shouldExecute(); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java deleted file mode 100644 index cae520a3..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java +++ /dev/null @@ -1,185 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.monster.CreeperEntity; -import net.minecraft.entity.monster.GhastEntity; -import net.minecraft.entity.monster.ZombiePigmanEntity; -import net.minecraft.entity.passive.IronGolemEntity; -import net.minecraft.entity.merchant.villager.VillagerEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BowItem; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; - -public class EntityCorruptedZombie extends EntityAspectedDemonBase { - private final EntityAIAttackRangedBow aiArrowAttack = new EntityAIAttackRangedBow(this, 1.0D, 20, 15.0F); - private final MeleeAttackGoal aiAttackOnCollide = new MeleeAttackGoal(this, 1.0D, false); - - private final int attackPriority = 3; - - public EntityCorruptedZombie(World worldIn) { - super(worldIn); - this.setSize(0.6F, 1.95F); -// ((PathNavigateGround) getNavigator()).setCanSwim(false); - this.tasks.addTask(0, new SwimGoal(this)); - this.tasks.addTask(attackPriority, aiAttackOnCollide); - this.tasks.addTask(5, new MoveTowardsRestrictionGoal(this, 1.0D)); - this.tasks.addTask(7, new RandomWalkingGoal(this, 1.0D)); - this.tasks.addTask(8, new LookAtGoal(this, PlayerEntity.class, 8.0F)); - this.tasks.addTask(8, new LookRandomlyGoal(this)); - - this.tasks.addTask(6, new MoveThroughVillageGoal(this, 1.0D, false)); - this.targetTasks.addTask(1, new HurtByTargetGoal(this, true, ZombiePigmanEntity.class)); - this.targetTasks.addTask(2, new NearestAttackableTargetGoal<>(this, PlayerEntity.class, true)); - this.targetTasks.addTask(3, new NearestAttackableTargetGoal<>(this, VillagerEntity.class, false)); - this.targetTasks.addTask(3, new NearestAttackableTargetGoal<>(this, IronGolemEntity.class, true)); - - this.setCombatTask(); -// this.targetTasks.addTask(8, new EntityAINearestAttackableTarget(this, EntityMob.class, 10, true, false, new TargetPredicate(this))); - } - - @Override - protected void applyEntityAttributes() { - super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(35.0D); - getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(40.0D); - getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6.0D); - getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.27D); - this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(2.0D); - } - - @Override - public void setCombatTask() { - if (!this.getEntityWorld().isRemote) { - this.tasks.removeTask(this.aiAttackOnCollide); - this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItemMainhand(); - - if (!itemstack.isEmpty() && itemstack.getItem() instanceof BowItem) { - int i = 20; - - if (this.getEntityWorld().getDifficulty() != Difficulty.HARD) { - i = 40; - } - - this.aiArrowAttack.setAttackCooldown(i); - this.tasks.addTask(attackPriority, this.aiArrowAttack); - } else { - this.tasks.addTask(attackPriority, this.aiAttackOnCollide); - } - } - } - - @Override - public boolean attackEntityFrom(DamageSource source, float amount) { - return !this.isEntityInvulnerable(source) && super.attackEntityFrom(source, amount); - } - - /** - * Redone from EntityMob to prevent despawning on peaceful. - */ - @Override - public boolean attackEntityAsMob(Entity attackedEntity) { - boolean flag = super.attackEntityAsMob(attackedEntity); - - if (flag) { - //EMPTY - - return true; - } else { - return false; - } - } - - /** - * @param toHeal - * @return Amount of Will consumed from the Aura to heal - */ - public double absorbWillFromAuraToHeal(double toHeal) { - if (getEntityWorld().isRemote) { - return 0; - } - - double healthMissing = this.getMaxHealth() - this.getHealth(); - if (healthMissing <= 0) { - return 0; - } - - double will = WorldDemonWillHandler.getCurrentWill(getEntityWorld(), getPosition(), getType()); - - toHeal = Math.min(healthMissing, Math.min(toHeal, will / getWillToHealth())); - if (toHeal > 0) { - this.heal((float) toHeal); - return WorldDemonWillHandler.drainWill(getEntityWorld(), getPosition(), getType(), toHeal * getWillToHealth(), true); - } - - return 0; - } - - public double getWillToHealth() { - return 2; - } - - @Override - protected boolean canDespawn() { - return !this.isTamed() && super.canDespawn(); - } - - public void onUpdate() { - if (!this.getEntityWorld().isRemote && this.ticksExisted % 20 == 0) { - absorbWillFromAuraToHeal(2); - } - - super.onUpdate(); - } - - //TODO: Change to fit the given AI - @Override - public boolean shouldAttackEntity(LivingEntity attacker, LivingEntity owner) { - return !(attacker instanceof CreeperEntity) && !(attacker instanceof GhastEntity) && super.shouldAttackEntity(attacker, owner); - } - - @Override - protected float getSoundPitch() { - return super.getSoundPitch() * 0.5f; - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_ZOMBIE_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_ZOMBIE_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_ZOMBIE_DEATH; - } - - @Override - protected void playStepSound(BlockPos pos, Block block) { - this.playSound(SoundEvents.ENTITY_ZOMBIE_STEP, 0.15F, 1.0F); - } - - /** - * Returns the volume for the sounds this mob makes. - */ - @Override - protected float getSoundVolume() { - return 0.4F; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java deleted file mode 100644 index c43c7b98..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java +++ /dev/null @@ -1,304 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import com.google.common.base.Optional; -import com.google.common.base.Predicate; -import net.minecraft.block.Block; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.*; -import net.minecraft.entity.monster.CreeperEntity; -import net.minecraft.entity.monster.GhastEntity; -import net.minecraft.entity.monster.MonsterEntity; -import net.minecraft.entity.passive.horse.HorseEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.SoundEvents; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.AxeItem; -import net.minecraft.item.ItemStack; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.server.management.PreYggdrasilConverter; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; - -import javax.annotation.Nullable; -import java.util.UUID; - -public class EntityDemonBase extends CreatureEntity implements IEntityOwnable { - protected static final DataParameter TAMED = EntityDataManager.createKey(EntityDemonBase.class, DataSerializers.BYTE); - protected static final DataParameter> OWNER_UNIQUE_ID = EntityDataManager.createKey(EntityDemonBase.class, DataSerializers.OPTIONAL_UNIQUE_ID); - - public EntityDemonBase(World worldIn) { - super(worldIn); - } - - @Override - protected void entityInit() { - super.entityInit(); - this.dataManager.register(TAMED, (byte) 0); - this.dataManager.register(OWNER_UNIQUE_ID, Optional.absent()); - } - - @Override - protected void applyEntityAttributes() { - super.applyEntityAttributes(); - this.getAttributeMap().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE); - } - - public void setCombatTask() { - - } - - @Override - public boolean isPotionApplicable(EffectInstance effect) { - return super.isPotionApplicable(effect); - } - - @Override - public void onLivingUpdate() { - this.updateArmSwingProgress(); - - super.onLivingUpdate(); - } - - @Override - public boolean attackEntityFrom(DamageSource source, float amount) { - return !this.isEntityInvulnerable(source) && super.attackEntityFrom(source, amount); - } - - /** - * Redone from EntityMob to prevent despawning on peaceful. - */ - @Override - public boolean attackEntityAsMob(Entity attackedEntity) { - float f = (float) this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getAttributeValue(); - int i = 0; - - if (attackedEntity instanceof LivingEntity) { - f += EnchantmentHelper.getModifierForCreature(this.getHeldItemMainhand(), ((LivingEntity) attackedEntity).getCreatureAttribute()); - i += EnchantmentHelper.getKnockbackModifier(this); - } - - boolean flag = attackedEntity.attackEntityFrom(DamageSource.causeMobDamage(this), f); - - if (flag) { - if (i > 0) { - ((LivingEntity) attackedEntity).knockBack(this, (float) i * 0.5F, (double) MathHelper.sin(this.rotationYaw * 0.017453292F), (double) (-MathHelper.cos(this.rotationYaw * 0.017453292F))); - this.motionX *= 0.6D; - this.motionZ *= 0.6D; - } - - int j = EnchantmentHelper.getFireAspectModifier(this); - - if (j > 0) { - attackedEntity.setFire(j * 4); - } - - if (attackedEntity instanceof PlayerEntity) { - PlayerEntity entityplayer = (PlayerEntity) attackedEntity; - ItemStack itemstack = this.getHeldItemMainhand(); - ItemStack itemstack1 = entityplayer.isHandActive() ? entityplayer.getActiveItemStack() : ItemStack.EMPTY; - - if (!itemstack.isEmpty() && !itemstack1.isEmpty() && itemstack.getItem() instanceof AxeItem && itemstack1.getItem() == Items.SHIELD) { - float f1 = 0.25F + (float) EnchantmentHelper.getEfficiencyModifier(this) * 0.05F; - - if (this.rand.nextFloat() < f1) { - entityplayer.getCooldownTracker().setCooldown(Items.SHIELD, 100); - this.getEntityWorld().setEntityState(entityplayer, (byte) 30); - } - } - } - - this.applyEnchantments(this, attackedEntity); - } - - return flag; - } - - @Override - public void setItemStackToSlot(EquipmentSlotType slotIn, ItemStack stack) { - super.setItemStackToSlot(slotIn, stack); - - if (!this.getEntityWorld().isRemote && slotIn == EquipmentSlotType.MAINHAND) { - this.setCombatTask(); - } - } - - public boolean isStationary() { - return false; - } - - public boolean absorbExplosion(Explosion explosion) { - return false; - } - - public void performEmergencyHeal(double toHeal) { - this.heal((float) toHeal); - - if (getEntityWorld() instanceof ServerWorld) { - ServerWorld server = (ServerWorld) getEntityWorld(); - server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0); - } - } - - public boolean shouldEmergencyHeal() { - return this.getHealth() < this.getMaxHealth() * 0.5; - } - - @Override - protected boolean canDespawn() { - return !this.isTamed() && super.canDespawn(); - } - - @Override - public void writeEntityToNBT(CompoundNBT tag) { - super.writeEntityToNBT(tag); - - if (this.getOwnerId() == null) { - tag.putString("OwnerUUID", ""); - } else { - tag.putString("OwnerUUID", this.getOwnerId().toString()); - } - - } - - @Override - public void readEntityFromNBT(CompoundNBT tag) { - super.readEntityFromNBT(tag); - - String s; - - if (tag.hasKey("OwnerUUID", 8)) { - s = tag.getString("OwnerUUID"); - } else { - String s1 = tag.getString("Owner"); - s = PreYggdrasilConverter.convertMobOwnerIfNeeded(this.getServer(), s1); - } - - if (!s.isEmpty()) { - try { - this.setOwnerId(UUID.fromString(s)); - this.setTamed(true); - } catch (Throwable var4) { - this.setTamed(false); - } - } - - this.setCombatTask(); - } - - //TODO: Change to fit the given AI - public boolean shouldAttackEntity(LivingEntity attacker, LivingEntity owner) { - if (!(attacker instanceof CreeperEntity) && !(attacker instanceof GhastEntity)) { - if (attacker instanceof IEntityOwnable) { - IEntityOwnable entityOwnable = (IEntityOwnable) attacker; - - if (entityOwnable.getOwner() == owner) { - return false; - } - } - - return !(attacker instanceof PlayerEntity && owner instanceof PlayerEntity && !((PlayerEntity) owner).canAttackPlayer((PlayerEntity) attacker)) && (!(attacker instanceof HorseEntity) || !((HorseEntity) attacker).isTame()); - } else { - return false; - } - } - - public void attackEntityWithRangedAttack(LivingEntity target, float velocity) { - - } - - public boolean isTamed() { - return (this.dataManager.get(TAMED) & 4) != 0; - } - - public void setTamed(boolean tamed) { - byte b0 = this.dataManager.get(TAMED); - - if (tamed) { - this.dataManager.set(TAMED, (byte) (b0 | 4)); - } else { - this.dataManager.set(TAMED, (byte) (b0 & -5)); - } - -// this.setupTamedAI(); - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_COW_AMBIENT; - } - - @Nullable - @Override - protected SoundEvent getHurtSound(DamageSource damageSourceIn) { - return getHurtSound(); - } - - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_COW_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_COW_DEATH; - } - - @Override - protected void playStepSound(BlockPos pos, Block block) { - this.playSound(SoundEvents.ENTITY_COW_STEP, 0.15F, 1.0F); - } - - /** - * Returns the volume for the sounds this mob makes. - */ - @Override - protected float getSoundVolume() { - return 0.4F; - } - - @Override - public UUID getOwnerId() { - return (this.dataManager.get(OWNER_UNIQUE_ID)).orNull(); - } - - public void setOwnerId(UUID uuid) { - this.dataManager.set(OWNER_UNIQUE_ID, Optional.fromNullable(uuid)); - } - - @Override - public LivingEntity getOwner() { - try { - UUID uuid = this.getOwnerId(); - return uuid == null ? null : this.getEntityWorld().getPlayerEntityByUUID(uuid); - } catch (IllegalArgumentException var2) { - return null; - } - } - - public void setOwner(PlayerEntity player) { - setOwnerId(player.getUniqueID()); - } - - public class TargetPredicate implements Predicate { - EntityDemonBase entity; - - public TargetPredicate(EntityDemonBase entity) { - this.entity = entity; - } - - @Override - public boolean apply(MonsterEntity input) { - return entity.shouldAttackEntity(input, this.entity.getOwner()); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java deleted file mode 100644 index 40ca056f..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java +++ /dev/null @@ -1,327 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.block.BlockMimic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.entity.ai.EntityAIMimicReform; -import WayofTime.bloodmagic.tile.TileMimic; -import WayofTime.bloodmagic.util.StateUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.EnumCreatureAttribute; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.passive.IronGolemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.pathfinding.ClimberPathNavigator; -import net.minecraft.pathfinding.PathNavigator; -import net.minecraft.potion.Effects; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; - -public class EntityMimic extends EntityDemonBase { - /** - * Copy of EntitySpider's AI (should be pretty evident...) - */ - private static final DataParameter CLIMBING = EntityDataManager.createKey(EntityMimic.class, DataSerializers.BYTE); - - public boolean dropItemsOnBreak = true; - public CompoundNBT tileTag = new CompoundNBT(); - public int metaOfReplacedBlock = 0; - public BlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); - public int playerCheckRadius = 5; - - public EntityMimic(World worldIn) { - super(worldIn); - this.setSize(0.9F, 0.9F); - - this.tasks.addTask(1, new SwimGoal(this)); - this.tasks.addTask(3, new LeapAtTargetGoal(this, 0.4F)); - this.tasks.addTask(4, new EntityMimic.AISpiderAttack(this)); - this.tasks.addTask(5, new MoveTowardsRestrictionGoal(this, 1)); - this.tasks.addTask(6, new RandomWalkingGoal(this, 0.8D)); - this.tasks.addTask(8, new LookAtGoal(this, PlayerEntity.class, 8.0F)); - this.tasks.addTask(8, new LookRandomlyGoal(this)); - this.tasks.addTask(7, new EntityAIMimicReform(this)); - - this.targetTasks.addTask(1, new HurtByTargetGoal(this, false)); - this.targetTasks.addTask(2, new EntityMimic.AISpiderTarget(this, PlayerEntity.class)); - this.targetTasks.addTask(3, new EntityMimic.AISpiderTarget(this, IronGolemEntity.class)); - } - - @Override - public void writeEntityToNBT(CompoundNBT tag) { - super.writeEntityToNBT(tag); - - tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.put("tileTag", tileTag); - tag.putInt("metaOfReplacedBlock", metaOfReplacedBlock); - tag.putInt("playerCheckRadius", playerCheckRadius); - tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); - } - - @Override - public void readEntityFromNBT(CompoundNBT tag) { - super.readEntityFromNBT(tag); - - dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompound("tileTag"); - metaOfReplacedBlock = tag.getInt("metaOfReplacedBlock"); - playerCheckRadius = tag.getInt("playerCheckRadius"); - stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); - } - - public ItemStack getMimicItemStack() { - return this.getItemStackFromSlot(EquipmentSlotType.CHEST); - } - - public void setMimicItemStack(ItemStack stack) { - this.setItemStackToSlot(EquipmentSlotType.CHEST, stack); - } - - public boolean spawnHeldBlockOnDeath(World world, BlockPos pos) { - return world.isAirBlock(pos) && TileMimic.replaceMimicWithBlockActual(world, pos, getMimicItemStack(), tileTag, stateOfReplacedBlock); - } - - public boolean spawnMimicBlockAtPosition(World world, BlockPos pos) { - if (world.isAirBlock(pos)) { - BlockState mimicState = RegistrarBloodMagicBlocks.MIMIC.getStateFromMeta(BlockMimic.sentientMimicMeta); - world.setBlockState(pos, mimicState, 3); - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMimic) { - TileMimic mimic = (TileMimic) tile; - mimic.setReplacedState(this.stateOfReplacedBlock); - mimic.tileTag = tileTag; - mimic.setInventorySlotContents(0, getMimicItemStack()); - mimic.dropItemsOnBreak = dropItemsOnBreak; - mimic.refreshTileEntity(); - } - - return true; - } - - return false; - } - - public void initializeMimic(ItemStack heldStack, CompoundNBT tileTag, boolean dropItemsOnBreak, BlockState stateOfReplacedBlock, int playerCheckRadius, BlockPos homePosition) { - this.setMimicItemStack(heldStack); - this.tileTag = tileTag; - this.dropItemsOnBreak = dropItemsOnBreak; - this.stateOfReplacedBlock = stateOfReplacedBlock; - this.playerCheckRadius = playerCheckRadius; - this.setHomePosAndDistance(homePosition, 2); //TODO: Save this. - } - - public boolean reformIntoMimicBlock(BlockPos centerPos) { - int horizontalRadius = 1; - int verticalRadius = 1; - - for (int hR = 0; hR <= horizontalRadius; hR++) { - for (int vR = 0; vR <= verticalRadius; vR++) { - for (int i = -hR; i <= hR; i++) { - for (int k = -hR; k <= hR; k++) { - for (int j = -vR; j <= vR; j += 2 * vR + (vR > 0 ? 0 : 1)) { - if (!(Math.abs(i) == hR || Math.abs(k) == hR)) { - continue; - } - - BlockPos newPos = centerPos.add(i, j, k); - if (spawnMimicBlockAtPosition(getEntityWorld(), newPos)) { - return true; - } - } - } - } - } - } - - return false; - } - - @Override - public void onDeath(DamageSource cause) { - super.onDeath(cause); - - if (!getEntityWorld().isRemote) { - BlockPos centerPos = this.getPosition(); - - int horizontalRadius = 1; - int verticalRadius = 1; - - for (int hR = 0; hR <= horizontalRadius; hR++) { - for (int vR = 0; vR <= verticalRadius; vR++) { - for (int i = -hR; i <= hR; i++) { - for (int k = -hR; k <= hR; k++) { - for (int j = -vR; j <= vR; j += 2 * vR + (vR > 0 ? 0 : 1)) { - if (!(Math.abs(i) == hR || Math.abs(k) == hR)) { - continue; - } - - BlockPos newPos = centerPos.add(i, j, k); - if (spawnHeldBlockOnDeath(getEntityWorld(), newPos)) { - return; - } - } - } - } - } - } - } - } - - /** - * Returns the Y offset from the entity's position for any entity riding - * this one. - */ - @Override - public double getMountedYOffset() { - return (double) (this.height * 0.5F); - } - - /** - * Returns new PathNavigateGround instance - */ - @Override - protected PathNavigator createNavigator(World worldIn) { - return new ClimberPathNavigator(this, worldIn); - } - - @Override - protected void entityInit() { - super.entityInit(); - this.dataManager.register(CLIMBING, (byte) 0); -// this.dataManager.register(ITEMSTACK, null); - } - - /** - * Called to update the entity's position/logic. - */ - @Override - public void onUpdate() { - if (!this.getEntityWorld().isRemote && this.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL) { - if (reformIntoMimicBlock(this.getPosition())) { - this.setDead(); - } - } - - super.onUpdate(); - - if (!this.getEntityWorld().isRemote) { - this.setBesideClimbableBlock(this.collidedHorizontally); - } - } - - @Override - protected void applyEntityAttributes() { - super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(16.0D); - this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.3D); - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_SPIDER_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_SPIDER_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_SPIDER_DEATH; - } - - @Override - protected void playStepSound(BlockPos pos, Block blockIn) { - this.playSound(SoundEvents.ENTITY_SPIDER_STEP, 0.15F, 1.0F); - } - - /** - * returns true if this entity is by a ladder, false otherwise - */ - @Override - public boolean isOnLadder() { - return this.isBesideClimbableBlock(); - } - - /** - * Sets the Entity inside a web block. - */ - @Override - public void setInWeb() { - - } - - /** - * Get this Entity's EnumCreatureAttribute - */ - @Override - public EnumCreatureAttribute getCreatureAttribute() { - return EnumCreatureAttribute.ARTHROPOD; - } - - @Override - public boolean isPotionApplicable(EffectInstance potioneffectIn) { - return potioneffectIn.getPotion() != Effects.POISON && super.isPotionApplicable(potioneffectIn); - } - - /** - * Returns true if the WatchableObject (Byte) is 0x01 otherwise returns - * false. The WatchableObject is updated using setBesideClimableBlock. - */ - public boolean isBesideClimbableBlock() { - return (this.dataManager.get(CLIMBING) & 1) != 0; - } - - /** - * Updates the WatchableObject (Byte) created in entityInit(), setting it to - * 0x01 if par1 is true or 0x00 if it is false. - */ - public void setBesideClimbableBlock(boolean climbing) { - byte b0 = this.dataManager.get(CLIMBING); - - if (climbing) { - b0 = (byte) (b0 | 1); - } else { - b0 = (byte) (b0 & -2); - } - - this.dataManager.set(CLIMBING, b0); - } - - public float getEyeHeight() { - return 0.65F; - } - - static class AISpiderAttack extends MeleeAttackGoal { - public AISpiderAttack(EntityMimic spider) { - super(spider, 1.0D, true); - } - - @Override - protected double getAttackReachSqr(LivingEntity attackTarget) { - return (double) (4.0F + attackTarget.width); - } - } - - static class AISpiderTarget extends NearestAttackableTargetGoal { - public AISpiderTarget(EntityMimic spider, Class classTarget) { - super(spider, classTarget, true); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java deleted file mode 100644 index f2b2f999..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ /dev/null @@ -1,483 +0,0 @@ -package WayofTime.bloodmagic.entity.mob; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; -import WayofTime.bloodmagic.entity.ai.EntityAIFollowOwner; -import WayofTime.bloodmagic.entity.ai.*; -import WayofTime.bloodmagic.entity.ai.EntityAIOwnerHurtByTarget; -import WayofTime.bloodmagic.entity.ai.EntityAIOwnerHurtTarget; -import WayofTime.bloodmagic.item.soul.ItemSentientBow; -import net.minecraft.block.Block; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.*; -import net.minecraft.entity.CreatureEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.monster.CreeperEntity; -import net.minecraft.entity.monster.GhastEntity; -import net.minecraft.entity.monster.MonsterEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.*; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.BowItem; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Effect; -import net.minecraft.util.Hand; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.*; -import net.minecraft.world.Difficulty; -import net.minecraft.world.ServerWorld; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -public class EntitySentientSpecter extends EntityDemonBase { - private final EntityAIAttackRangedBow aiArrowAttack = new EntityAIAttackRangedBow(this, 1.0D, 20, 15.0F); - private final MeleeAttackGoal aiAttackOnCollide = new MeleeAttackGoal(this, 1.0D, false); - private final int attackPriority = 3; - protected EnumDemonWillType type = EnumDemonWillType.DESTRUCTIVE; - protected boolean wasGivenSentientArmour = false; - - public EntitySentientSpecter(World worldIn) { - super(worldIn); - this.setSize(0.6F, 1.95F); -// ((PathNavigateGround) getNavigator()).setCanSwim(false); - this.tasks.addTask(0, new SwimGoal(this)); - this.tasks.addTask(2, new EntityAIRetreatToHeal<>(this, CreatureEntity.class, 6.0F, 1.0D, 1.2D)); - this.tasks.addTask(attackPriority, aiAttackOnCollide); - this.tasks.addTask(4, new EntityAIGrabEffectsFromOwner(this, 2.0D, 1.0F)); - this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F)); - this.tasks.addTask(6, new RandomWalkingGoal(this, 1.0D)); - this.tasks.addTask(7, new LookAtGoal(this, PlayerEntity.class, 6.0F)); - this.tasks.addTask(8, new LookRandomlyGoal(this)); - - this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this)); - this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this)); - this.targetTasks.addTask(3, new NearestAttackableTargetGoal<>(this, MonsterEntity.class, true)); - - this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false)); - - this.setCombatTask(); -// this.targetTasks.addTask(8, new EntityAINearestAttackableTarget(this, EntityMob.class, 10, true, false, new TargetPredicate(this))); - } - - @Override - protected void applyEntityAttributes() { - super.applyEntityAttributes(); - getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(40.0D); - getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6.0D); - getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.27D); - } - - @Override - public void setCombatTask() { - if (!this.getEntityWorld().isRemote) { - this.tasks.removeTask(this.aiAttackOnCollide); - this.tasks.removeTask(this.aiArrowAttack); - ItemStack itemstack = this.getHeldItemMainhand(); - - if (!itemstack.isEmpty() && itemstack.getItem() instanceof BowItem) { - int i = 20; - - if (this.getEntityWorld().getDifficulty() != Difficulty.HARD) { - i = 40; - } - - this.aiArrowAttack.setAttackCooldown(i); - this.tasks.addTask(attackPriority, this.aiArrowAttack); - } else { - this.tasks.addTask(attackPriority, this.aiAttackOnCollide); - } - } - } - - @Override - public boolean isPotionApplicable(EffectInstance effect) { - Effect potion = effect.getPotion(); - - //Specter cannot be healed by normal means - return !(potion == Effects.REGENERATION || potion == Effects.INSTANT_HEALTH) && super.isPotionApplicable(effect); - } - - public boolean canStealEffectFromOwner(LivingEntity owner, EffectInstance effect) { - return effect.getPotion().isBadEffect() && this.type == EnumDemonWillType.CORROSIVE; - } - - public boolean canStealEffectFromOwner(LivingEntity owner) { - if (this.type != EnumDemonWillType.CORROSIVE) { - return false; - } - - for (EffectInstance eff : owner.getActivePotionEffects()) { - if (canStealEffectFromOwner(owner, eff)) { - return true; - } - } - - return false; - } - - public boolean stealEffectsFromOwner(LivingEntity owner) { - if (this.type != EnumDemonWillType.CORROSIVE) { - return false; - } - - boolean hasStolenEffect = false; - - List removedEffects = new ArrayList<>(); - - for (EffectInstance eff : owner.getActivePotionEffects()) { - if (canStealEffectFromOwner(owner, eff)) { - removedEffects.add(eff); - hasStolenEffect = true; - } - } - - for (EffectInstance eff : removedEffects) { - owner.removePotionEffect(eff.getPotion()); - this.addPotionEffect(eff); - } - - return hasStolenEffect; - } - - public boolean applyNegativeEffectsToAttacked(LivingEntity attackedEntity, float percentTransmitted) { - boolean hasProvidedEffect = false; - List removedEffects = new ArrayList<>(); - for (EffectInstance eff : this.getActivePotionEffects()) { - if (eff.getPotion().isBadEffect() && attackedEntity.isPotionApplicable(eff)) { - if (!attackedEntity.isPotionActive(eff.getPotion())) { - removedEffects.add(eff); - hasProvidedEffect = true; - } else { - EffectInstance activeEffect = attackedEntity.getActivePotionEffect(eff.getPotion()); - if (activeEffect.getAmplifier() < eff.getAmplifier() || activeEffect.getDuration() < eff.getDuration() * percentTransmitted) { - removedEffects.add(eff); - hasProvidedEffect = true; - } - } - } - } - - for (EffectInstance eff : removedEffects) { - if (!attackedEntity.isPotionActive(eff.getPotion())) { - EffectInstance newEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); - attackedEntity.addPotionEffect(newEffect); - - EffectInstance newSentientEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); - this.removePotionEffect(eff.getPotion()); - this.addPotionEffect(newSentientEffect); - } else { - EffectInstance activeEffect = attackedEntity.getActivePotionEffect(eff.getPotion()); - - EffectInstance newEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), activeEffect.getIsAmbient(), activeEffect.doesShowParticles()); - attackedEntity.addPotionEffect(newEffect); - - EffectInstance newSentientEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); - this.removePotionEffect(eff.getPotion()); - this.addPotionEffect(newSentientEffect); - } - } - - return hasProvidedEffect; - } - - public List getPotionEffectsForArrowRemovingDuration(float percentTransmitted) { - List arrowEffects = new ArrayList<>(); - - if (type != EnumDemonWillType.CORROSIVE) { - return arrowEffects; - } - - List removedEffects = new ArrayList<>(); - for (EffectInstance eff : this.getActivePotionEffects()) { - if (eff.getPotion().isBadEffect()) { - removedEffects.add(eff); - } - } - - for (EffectInstance eff : removedEffects) { - EffectInstance newEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * percentTransmitted), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); - arrowEffects.add(newEffect); - - EffectInstance newSentientEffect = new EffectInstance(eff.getPotion(), (int) (eff.getDuration() * (1 - percentTransmitted)), eff.getAmplifier(), eff.getIsAmbient(), eff.doesShowParticles()); - this.removePotionEffect(eff.getPotion()); - this.addPotionEffect(newSentientEffect); - } - - return arrowEffects; - } - - @Override - public boolean attackEntityFrom(DamageSource source, float amount) { - return !this.isEntityInvulnerable(source) && super.attackEntityFrom(source, amount); - } - - /** - * Redone from EntityMob to prevent despawning on peaceful. - */ - @Override - public boolean attackEntityAsMob(Entity attackedEntity) { - boolean flag = super.attackEntityAsMob(attackedEntity); - - if (flag) { - if (this.type == EnumDemonWillType.CORROSIVE && attackedEntity instanceof LivingEntity) { -// ((EntityLivingBase) attackedEntity).addPotionEffect(new PotionEffect(MobEffects.WITHER, 200)); - applyNegativeEffectsToAttacked((LivingEntity) attackedEntity, 1); - } - - return true; - } else { - return false; - } - } - - @Override - public void onDeath(DamageSource cause) { - super.onDeath(cause); - - if (!getEntityWorld().isRemote && !getHeldItemMainhand().isEmpty()) { - this.entityDropItem(getHeldItemMainhand(), 0); - } - } - - @Override - public boolean isStationary() { - return false; - } - - @Override - public boolean absorbExplosion(Explosion explosion) { - if (this.type == EnumDemonWillType.DESTRUCTIVE) { - this.addPotionEffect(new EffectInstance(Effects.STRENGTH, 600, 1)); - - explosion.doExplosionB(true); - - return true; - } - - return false; - } - - @Override - public boolean processInteract(PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (this.isTamed() && player.equals(this.getOwner()) && hand == Hand.MAIN_HAND) { - if (stack.isEmpty() && player.isSneaking()) //Should return to the entity - { - if (!getEntityWorld().isRemote) { - if (!getHeldItemMainhand().isEmpty()) { - this.entityDropItem(getHeldItemMainhand(), 0); - } - - if (!getHeldItemOffhand().isEmpty()) { - this.entityDropItem(getHeldItemOffhand(), 0); - } - - if (wasGivenSentientArmour) { - this.entityDropItem(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 0); - } - - this.setDead(); - } - } - } - - return super.processInteract(player, hand); - } - - public boolean isEntityInvulnerable(DamageSource source) { - return super.isEntityInvulnerable(source) && (this.type == EnumDemonWillType.DESTRUCTIVE && source.isExplosion()); - } - - @Override - public void performEmergencyHeal(double toHeal) { - this.heal((float) toHeal); - - if (getEntityWorld() instanceof ServerWorld) { - ServerWorld server = (ServerWorld) getEntityWorld(); - server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0); - } - } - - /** - * @param toHeal - * @return Amount of Will consumed from the Aura to heal - */ - public double absorbWillFromAuraToHeal(double toHeal) { - if (getEntityWorld().isRemote) { - return 0; - } - - double healthMissing = this.getMaxHealth() - this.getHealth(); - if (healthMissing <= 0) { - return 0; - } - - double will = WorldDemonWillHandler.getCurrentWill(getEntityWorld(), getPosition(), getType()); - - toHeal = Math.min(healthMissing, Math.min(toHeal, will / getWillToHealth())); - if (toHeal > 0) { - this.heal((float) toHeal); - return WorldDemonWillHandler.drainWill(getEntityWorld(), getPosition(), getType(), toHeal * getWillToHealth(), true); - } - - return 0; - } - - public double getWillToHealth() { - return 2; - } - - @Override - protected boolean canDespawn() { - return !this.isTamed() && super.canDespawn(); - } - - public void onUpdate() { - if (!this.getEntityWorld().isRemote && this.ticksExisted % 20 == 0) { - absorbWillFromAuraToHeal(2); - } - - super.onUpdate(); - } - - @Override - public void writeEntityToNBT(CompoundNBT tag) { - super.writeEntityToNBT(tag); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - - tag.putBoolean("sentientArmour", wasGivenSentientArmour); - } - - @Override - public void readEntityFromNBT(CompoundNBT tag) { - super.readEntityFromNBT(tag); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - type = EnumDemonWillType.DEFAULT; - } else { - type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - wasGivenSentientArmour = tag.getBoolean("sentientArmour"); - - this.setCombatTask(); - } - - //TODO: Change to fit the given AI - @Override - public boolean shouldAttackEntity(LivingEntity attacker, LivingEntity owner) { - if (!(attacker instanceof CreeperEntity) && !(attacker instanceof GhastEntity)) { - return super.shouldAttackEntity(attacker, owner); - } - return false; - } - - @Override - public void attackEntityWithRangedAttack(LivingEntity target, float velocity) { - ItemStack heldStack = this.getItemStackFromSlot(EquipmentSlotType.MAINHAND); - if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW) { - ArrowEntity arrowEntity = ((ItemSentientBow) heldStack.getItem()).getArrowEntity(getEntityWorld(), heldStack, target, this, velocity); - if (arrowEntity != null) { - List effects = getPotionEffectsForArrowRemovingDuration(0.2f); - for (EffectInstance eff : effects) { - arrowEntity.addEffect(eff); - } - - this.playSound(SoundEvents.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F)); - this.getEntityWorld().spawnEntity(arrowEntity); - } - } else { - ArrowEntity entitytippedarrow = new ArrowEntity(this.getEntityWorld(), this); //TODO: Change to an arrow created by the Sentient Bow - double d0 = target.posX - this.posX; - double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entitytippedarrow.posY; - double d2 = target.posZ - this.posZ; - double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); - entitytippedarrow.shoot(d0, d1 + d3 * 0.2, d2, 1.6F, 0); //TODO: Yes, it is an accurate arrow. Don't be hatin' - int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.POWER, this); - int j = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.PUNCH, this); - entitytippedarrow.setDamage((double) (velocity * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.getEntityWorld().getDifficulty().getId() * 0.11F)); - - if (i > 0) { - entitytippedarrow.setDamage(entitytippedarrow.getDamage() + (double) i * 0.5D + 0.5D); - } - - if (j > 0) { - entitytippedarrow.setKnockbackStrength(j); - } - - boolean burning = this.isBurning(); - burning = burning || EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.FLAME, this) > 0; - - if (burning) { - entitytippedarrow.setFire(100); - } - - if (true) //TODO: Add potion effects to the arrows - { - entitytippedarrow.addEffect(new EffectInstance(Effects.SLOWNESS, 600)); - } - - this.playSound(SoundEvents.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F)); - this.getEntityWorld().spawnEntity(entitytippedarrow); - } - } - - @Override - protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_COW_AMBIENT; - } - - @Override - protected SoundEvent getHurtSound() { - return SoundEvents.ENTITY_COW_HURT; - } - - @Override - protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_COW_DEATH; - } - - @Override - protected void playStepSound(BlockPos pos, Block block) { - this.playSound(SoundEvents.ENTITY_COW_STEP, 0.15F, 1.0F); - } - - /** - * Returns the volume for the sounds this mob makes. - */ - @Override - protected float getSoundVolume() { - return 0.4F; - } - - public EnumDemonWillType getType() { - return type; - } - - public void setType(EnumDemonWillType type) { - this.type = type; - } - - public boolean isWasGivenSentientArmour() { - return wasGivenSentientArmour; - } - - public void setWasGivenSentientArmour(boolean wasGivenSentientArmour) { - this.wasGivenSentientArmour = wasGivenSentientArmour; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index bb8b8cab..f5ce9da8 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -1,171 +1,100 @@ -package WayofTime.bloodmagic.entity.projectile; +package wayoftime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import io.netty.buffer.ByteBuf; -import net.minecraft.block.Blocks; -import net.minecraft.entity.Entity; +import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.ThrowableEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; -import net.minecraft.util.Direction; +import net.minecraft.entity.projectile.ProjectileHelper; +import net.minecraft.entity.projectile.ProjectileItemEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.IPacket; +import net.minecraft.particles.IParticleData; +import net.minecraft.particles.ItemParticleData; +import net.minecraft.particles.ParticleTypes; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; -import net.minecraftforge.fml.common.registry.IThrowableEntity; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.network.NetworkHooks; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; -public class EntityBloodLight extends ThrowableEntity implements IThrowableEntity, IEntityAdditionalSpawnData { - public LivingEntity shootingEntity; - protected int ticksInAir = 0; - protected int maxTicksInAir = 600; +public class EntityBloodLight extends ProjectileItemEntity +{ + public EntityBloodLight(EntityType p_i50159_1_, World p_i50159_2_) + { + super(p_i50159_1_, p_i50159_2_); + } - public EntityBloodLight(World world) { - super(world); - this.setSize(0.5F, 0.5F); - } + public EntityBloodLight(World worldIn, LivingEntity throwerIn) + { + super(BloodMagicEntityTypes.BLOOD_LIGHT.getEntityType(), throwerIn, worldIn); + } - public EntityBloodLight(World world, double x, double y, double z) { - super(world); - this.setSize(0.5F, 0.5F); - this.setPosition(x, y, z); - } + public EntityBloodLight(World worldIn, double x, double y, double z) + { + super(BloodMagicEntityTypes.BLOOD_LIGHT.getEntityType(), x, y, z, worldIn); + } - public EntityBloodLight(World world, LivingEntity player) { - super(world, player); - shootingEntity = player; - float par3 = 0.8F; - this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(player.posX, player.posY + player.getEyeHeight(), player.posZ, player.rotationYaw, player.rotationPitch); - posX -= MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - posY -= 0.2D; - posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - this.setPosition(posX, posY, posZ); - motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); - this.shoot(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); - } + protected Item getDefaultItem() + { + return BloodMagicItems.REAGENT_BLOOD_LIGHT.get(); + } - @Override - protected float getGravityVelocity() { - return 0F; - } + @Override + public IPacket createSpawnPacket() + { + return NetworkHooks.getEntitySpawningPacket(this); + } - @Override - public void shoot(double var1, double var3, double var5, float var7, float var8) { - float var9 = MathHelper.sqrt(var1 * var1 + var3 * var3 + var5 * var5); - var1 /= var9; - var3 /= var9; - var5 /= var9; - var1 += rand.nextGaussian() * 0.007499999832361937D * var8; - var3 += rand.nextGaussian() * 0.007499999832361937D * var8; - var5 += rand.nextGaussian() * 0.007499999832361937D * var8; - var1 *= var7; - var3 *= var7; - var5 *= var7; - motionX = var1; - motionY = var3; - motionZ = var5; - float var10 = MathHelper.sqrt(var1 * var1 + var5 * var5); - prevRotationYaw = rotationYaw = (float) (Math.atan2(var1, var5) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(var3, var10) * 180.0D / Math.PI); - } + @Override + public void tick() + { + super.tick(); + RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_); +// boolean flag = false; + if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) + { + BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos().offset(((BlockRayTraceResult) raytraceresult).getFace()); + BlockState blockstate = this.world.getBlockState(blockpos); + if (blockstate.isAir()) + { + this.getEntityWorld().setBlockState(blockpos, BloodMagicBlocks.BLOOD_LIGHT.get().getDefaultState()); + this.setDead(); + } + } + } - @Override - public void onUpdate() { - super.onUpdate(); - if (this.ticksExisted > this.maxTicksInAir) { - setDead(); - } - } + protected float getGravityVelocity() + { + return 0; + } - @Override - protected void onImpact(RayTraceResult mop) { - if (mop.typeOfHit == RayTraceResult.Type.ENTITY && mop.entityHit != null) { - if (mop.entityHit == shootingEntity) { - return; - } + @OnlyIn(Dist.CLIENT) + private IParticleData makeParticle() + { + ItemStack itemstack = this.func_213882_k(); + return (IParticleData) (itemstack.isEmpty() ? ParticleTypes.LAVA + : new ItemParticleData(ParticleTypes.ITEM, itemstack)); + } - this.onImpact(mop.entityHit); - } else if (mop.typeOfHit == RayTraceResult.Type.BLOCK) { - Direction sideHit = mop.sideHit; - BlockPos blockPos = mop.getBlockPos().offset(sideHit); + /** + * Handler for {@link World#setEntityState} + */ + @OnlyIn(Dist.CLIENT) + public void handleStatusUpdate(byte id) + { + if (id == 3) + { + IParticleData iparticledata = this.makeParticle(); - if (getEntityWorld().isAirBlock(blockPos)) { - getEntityWorld().setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); - } - } - - this.setDead(); - } - - protected void onImpact(Entity mop) { - if (mop == shootingEntity && ticksInAir > 3) { - shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1); - this.setDead(); - } else { - if (mop instanceof LivingEntity) { - ((LivingEntity) mop).setRevengeTarget(shootingEntity); - doDamage(1, mop); - } - } - - if (getEntityWorld().isAirBlock(new BlockPos((int) this.posX, (int) this.posY, (int) this.posZ))) { - getEntityWorld().setBlockState(new BlockPos((int) this.posX, (int) this.posY, (int) this.posZ), Blocks.FIRE.getDefaultState()); - } - - // spawnHitParticles("magicCrit", 8); - this.setDead(); - } - - protected void doDamage(int i, Entity mop) { - mop.attackEntityFrom(this.getDamageSource(), i); - } - - public DamageSource getDamageSource() { - return DamageSource.causeMobDamage(shootingEntity); - } - - @Override - public void writeSpawnData(ByteBuf data) { - data.writeByte(this.ticksInAir); - } - - @Override - public void readSpawnData(ByteBuf data) { - this.ticksInAir = data.readByte(); - } - - @Override - public void writeEntityToNBT(CompoundNBT nbt) { - super.writeEntityToNBT(nbt); - nbt.putInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); - nbt.putInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); - } - - @Override - public void readEntityFromNBT(CompoundNBT nbt) { - super.readEntityFromNBT(nbt); - ticksInAir = nbt.getInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR); - maxTicksInAir = nbt.getInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); - } - - @Override - protected boolean canTriggerWalking() { - return false; - } - - @Override - public boolean canBeCollidedWith() { - return false; - } - - @Override - public void setThrower(Entity entity) { - if (entity instanceof LivingEntity) - this.shootingEntity = (LivingEntity) entity; - } -} + for (int i = 0; i < 8; ++i) + { + this.world.addParticle(iparticledata, this.getPosX(), this.getPosY(), this.getPosZ(), 0.0D, 0.0D, 0.0D); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java deleted file mode 100644 index 5a73d56e..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ /dev/null @@ -1,134 +0,0 @@ -package WayofTime.bloodmagic.entity.projectile; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.meteor.MeteorRegistry; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.ThrowableEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.IThrowableEntity; - -public class EntityMeteor extends ThrowableEntity implements IThrowableEntity { - public ItemStack meteorStack = ItemStack.EMPTY; - protected int ticksInAir = 0; - protected int maxTicksInAir = 600; - protected double radiusModifier = 1; - protected double explosionModifier = 1; - protected double fillerChance = 0; - - public EntityMeteor(World world) { - super(world); - } - - public EntityMeteor(World world, double x, double y, double z, double velX, double velY, double velZ, double radiusModifier, double explosionModifier, double fillerChance) { - super(world); - this.setSize(1F, 1F); - this.setPosition(x, y, z); - motionX = velX; - motionY = velY; - motionZ = velZ; - this.radiusModifier = radiusModifier; - this.explosionModifier = explosionModifier; - this.fillerChance = fillerChance; - } - - @Override - protected float getGravityVelocity() { - return 0.03F; - } - - @Override - public void onUpdate() { - super.onUpdate(); - if (this.ticksExisted > this.maxTicksInAir) { - setDead(); - } - } - - @Override - protected void onImpact(RayTraceResult mop) { - if (mop.typeOfHit == RayTraceResult.Type.ENTITY && mop.entityHit != null) { - this.onImpact(mop.entityHit); - } else if (mop.typeOfHit == RayTraceResult.Type.BLOCK) { - generateMeteor(mop.getBlockPos()); - } - - this.setDead(); - } - - protected void onImpact(Entity mop) { - if (mop instanceof LivingEntity) { - doDamage(100, mop); - } - - generateMeteor(mop.getPosition()); - - // spawnHitParticles("magicCrit", 8); - this.setDead(); - } - - protected void doDamage(int i, Entity mop) { - mop.attackEntityFrom(this.getDamageSource(), i); - } - - public void generateMeteor(BlockPos pos) { - MeteorRegistry.generateMeteorForItem(meteorStack, getEntityWorld(), pos, Blocks.STONE.getDefaultState(), radiusModifier, explosionModifier, fillerChance); - } - - public DamageSource getDamageSource() { - return DamageSource.ANVIL; - } - - @Override - public void writeEntityToNBT(CompoundNBT nbt) { - super.writeEntityToNBT(nbt); - nbt.putInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); - nbt.putInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); - nbt.putDouble("radiusModifier", radiusModifier); - nbt.putDouble("explosionModifier", explosionModifier); - nbt.putDouble("fillerChance", fillerChance); - if (!meteorStack.isEmpty()) - meteorStack.writeToNBT(nbt); - else - nbt.putBoolean("noItem", true); - } - - @Override - public void readEntityFromNBT(CompoundNBT nbt) { - super.readEntityFromNBT(nbt); - ticksInAir = nbt.getInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR); - maxTicksInAir = nbt.getInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); - radiusModifier = nbt.getDouble("radiusModifier"); - explosionModifier = nbt.getDouble("explosionModifier"); - fillerChance = nbt.getDouble("fillerChance"); - if (!nbt.hasKey("noItem")) - meteorStack = new ItemStack(nbt); - else - meteorStack = ItemStack.EMPTY; - } - - @Override - protected boolean canTriggerWalking() { - return false; - } - - @Override - public boolean canBeCollidedWith() { - return false; - } - - @Override - public void setThrower(Entity entity) { - - } - - public void setMeteorStack(ItemStack meteorStack) { - this.meteorStack = meteorStack; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java deleted file mode 100644 index baf6538f..00000000 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ /dev/null @@ -1,295 +0,0 @@ -package WayofTime.bloodmagic.entity.projectile; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.AbstractArrowEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.*; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Potion; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; - -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Locale; - -public class EntitySentientArrow extends ArrowEntity { - public Potion potion = Potions.EMPTY; - public double reimbursedAmountOnHit = 0; - public EnumDemonWillType type = EnumDemonWillType.DEFAULT; - public int currentLevel = 0; - public ItemStack itemStack; - public Class specialArrowClass; - public float[] destructiveExplosionRadius = {0.5f, 1, 1.5f, 2, 2.5f, 3, 3.5f}; - public int[] poisonDuration = {50, 100, 150, 80, 120, 160, 200}; - public int[] poisonLevel = {0, 0, 0, 1, 1, 1, 1}; - public int[] levitationDuration = {20, 40, 60, 80, 100, 120, 160}; - public int[] levitationLevel = {0, 0, 0, 1, 1, 1, 2}; - public int[] slownessDuration = {40, 60, 100, 150, 200, 250, 300}; - public int[] slownessLevel = {0, 0, 0, 1, 1, 1, 2}; - public AbstractArrowEntity specialEntity; - public MethodHandle specialHitMH; - public Method specialHit; - - public EntitySentientArrow(World worldIn) { - super(worldIn); - } - - public EntitySentientArrow(World worldIn, double x, double y, double z) { - super(worldIn, x, y, z); - } - - public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel) { - super(worldIn, shooter); - this.reimbursedAmountOnHit = reimburseAmount; - this.type = type; - this.currentLevel = currentLevel; - } - - public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, Potion potion) { - super(worldIn, shooter); - this.reimbursedAmountOnHit = reimburseAmount; - this.type = type; - this.currentLevel = currentLevel; - this.potion = potion; - } - - public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, ItemStack itemStack) { - super(worldIn, shooter); - this.reimbursedAmountOnHit = reimburseAmount; - this.type = type; - this.currentLevel = currentLevel; - this.potion = PotionUtils.getPotionFromItem(itemStack); - } - - public EntitySentientArrow(World worldIn, LivingEntity shooter, EnumDemonWillType type, double reimburseAmount, int currentLevel, AbstractArrowEntity specialArrow) { - super(worldIn, shooter); - this.reimbursedAmountOnHit = reimburseAmount; - this.type = type; - this.currentLevel = currentLevel; - this.specialEntity = specialArrow; - this.specialArrowClass = specialArrow.getClass(); - } - - public void reimbursePlayer(LivingEntity hitEntity, float damage) { - if (this.shootingEntity instanceof PlayerEntity) { - if (hitEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(hitEntity instanceof IMob)) { - return; - } - - PlayerDemonWillHandler.addDemonWill(type, (PlayerEntity) this.shootingEntity, reimbursedAmountOnHit * damage / 20f); - } - } - - @Override - protected void arrowHit(LivingEntity living) { - int amp = -1; - switch (type) { - case CORROSIVE: - if (this.potion != null) - for (EffectInstance i : this.potion.getEffects()) { - if (i.getEffectName().equals("poison")) { - amp = i.getAmplifier(); - continue; - } - living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); - } - living.addPotionEffect(new EffectInstance(Effects.POISON, currentLevel >= 0 ? (amp > -1 && poisonLevel[currentLevel] != amp) ? poisonDuration[currentLevel] / 2 : poisonDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(poisonLevel[currentLevel], amp) + 1 : poisonLevel[currentLevel] : 0)); - break; - case DEFAULT: - if (this.potion != null) - for (EffectInstance i : this.potion.getEffects()) { - living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); - } - break; - case DESTRUCTIVE: - this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); - createPotionFromArrow(living); - break; - case STEADFAST: - if (this.potion != null) - for (EffectInstance i : this.potion.getEffects()) { - if (i.getEffectName().equals("levitation")) { - amp = i.getAmplifier(); - continue; - } - living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); - } - living.addPotionEffect(new EffectInstance(Effects.LEVITATION, currentLevel >= 0 ? (amp > -1 && levitationLevel[currentLevel] != amp) ? levitationDuration[currentLevel] / 2 : levitationDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(levitationLevel[currentLevel], amp) + 1 : levitationLevel[currentLevel] : 0)); - break; - case VENGEFUL: - if (this.potion != null) - for (EffectInstance i : this.potion.getEffects()) { - if (i.getEffectName().equals("slowness")) { - amp = i.getAmplifier(); - continue; - } - living.addPotionEffect(new EffectInstance(i.getPotion(), i.getDuration(), i.getAmplifier())); - } - living.addPotionEffect(new EffectInstance(Effects.SLOWNESS, currentLevel >= 0 ? (amp > -1 && slownessLevel[currentLevel] != amp) ? slownessDuration[currentLevel] / 2 : slownessDuration[currentLevel] : 0, currentLevel >= 0 ? (amp > -1) ? Math.max(slownessLevel[currentLevel], amp) + 1 : slownessLevel[currentLevel] : 0)); - break; - default: - break; - } - if (this.specialArrowClass != null) { - try { - this.specialHit = this.specialArrowClass.getMethod("arrowHit", LivingEntity.class); - this.specialHitMH = MethodHandles.lookup().unreflect(this.specialHit).bindTo(this.specialEntity); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } finally { - try { - if (this.specialHitMH != null) - this.specialHitMH.invoke(living); - } catch (Throwable throwable) { - throwable.printStackTrace(); - } - } - } - } - - @Override - public void onUpdate() { - super.onUpdate(); - if (this.specialArrowClass != null) { - if (!this.world.isRemote) { - this.specialEntity.posX = this.posX; - this.specialEntity.posY = this.posY; - this.specialEntity.posZ = this.posZ; - - this.specialEntity.onUpdate(); - if (this.inGround) { - this.specialEntity.setDead(); - } - } - } - switch (type) { - case DESTRUCTIVE: - if (this.potion != null) { - this.spawnPotionParticles(2); - } - if (!this.world.isRemote && this.inGround) { - this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); - if (this.potion != null && this.specialArrowClass == null) { - createPotionFromArrow(null); - } - this.setDead(); - } - break; - case CORROSIVE: - this.spawnPotionParticles(2); - - break; - case DEFAULT: - if (this.potion != null) { - this.spawnPotionParticles(2); - } - break; - case STEADFAST: - if (this.potion != null) { - this.spawnPotionParticles(2); - } - break; - case VENGEFUL: - if (this.potion != null) { - this.spawnPotionParticles(2); - } - break; - default: - break; - } - - - } - - //TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect. - private void createPotionFromArrow(LivingEntity living) { - if (this.potion != null) { - float radius = currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0; - AxisAlignedBB axisalignedbb = this.getEntityBoundingBox().grow(radius * 2, radius, radius * 2); - List list = this.world.getEntitiesWithinAABB(LivingEntity.class, axisalignedbb); - - if (!list.isEmpty()) { - for (LivingEntity entitylivingbase : list) { - if (entitylivingbase.canBeHitWithPotion()) { - double d0 = this.getDistanceSq(entitylivingbase); - - if (d0 < 16.0D) { - double d1 = 1.0D - Math.sqrt(d0) / 4.0D; - - if (entitylivingbase == living) { - d1 = 1.0D; - } - - for (EffectInstance potioneffect : this.potion.getEffects()) { - Effect potion = potioneffect.getPotion(); - - if (potion.isInstant()) { - potion.affectEntity(this, this.shootingEntity, entitylivingbase, potioneffect.getAmplifier(), d1); - } else { - int i = (int) (d1 * (double) potioneffect.getDuration() + 0.5D); - - if (i > 20) { - entitylivingbase.addPotionEffect(new EffectInstance(potion, i, potioneffect.getAmplifier(), potioneffect.getIsAmbient(), potioneffect.doesShowParticles())); - } - } - } - } - } - } - } - } - } - - @Override - public void writeEntityToNBT(CompoundNBT tag) { - super.writeEntityToNBT(tag); - - tag.putDouble("reimbursement", reimbursedAmountOnHit); - tag.putInt("currentLevel", currentLevel); - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public void readEntityFromNBT(CompoundNBT tag) { - super.readEntityFromNBT(tag); - - reimbursedAmountOnHit = tag.getDouble("reimbursement"); - type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - currentLevel = tag.getInt("currentLevel"); - } - - @Override - protected ItemStack getArrowStack() { - return new ItemStack(Items.ARROW); - } - - public void spawnPotionParticles(int particleCount) { - int i = this.getColor(); - - if (i != -1 && particleCount > 0) { - double d0 = (double) (i >> 16 & 255) / 255.0D; - double d1 = (double) (i >> 8 & 255) / 255.0D; - double d2 = (double) (i >> 0 & 255) / 255.0D; - - for (int j = 0; j < particleCount; ++j) { - this.world.spawnParticle(EnumParticleTypes.SPELL_MOB, this.posX + (this.rand.nextDouble() - 0.5D) * (double) this.width, this.posY + this.rand.nextDouble() * (double) this.height, this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, d0, d1, d2); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java index 5fc9ff13..4510f1ac 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java @@ -1,43 +1,94 @@ -package WayofTime.bloodmagic.entity.projectile; +package wayoftime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.entity.projectile.ProjectileItemEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.IPacket; +import net.minecraft.particles.IParticleData; +import net.minecraft.particles.ItemParticleData; +import net.minecraft.particles.ParticleTypes; import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.network.NetworkHooks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; +import wayoftime.bloodmagic.potion.BloodMagicPotions; -public class EntitySoulSnare extends ThrowableEntity { +public class EntitySoulSnare extends ProjectileItemEntity +{ + public EntitySoulSnare(EntityType p_i50159_1_, World p_i50159_2_) + { + super(p_i50159_1_, p_i50159_2_); + } - public EntitySoulSnare(World worldIn) { - super(worldIn); - } + public EntitySoulSnare(World worldIn, LivingEntity throwerIn) + { + super(BloodMagicEntityTypes.SNARE.getEntityType(), throwerIn, worldIn); + } - public EntitySoulSnare(World worldIn, LivingEntity throwerIn) { - super(worldIn, throwerIn); - } + public EntitySoulSnare(World worldIn, double x, double y, double z) + { + super(BloodMagicEntityTypes.SNARE.getEntityType(), x, y, z, worldIn); + } - public EntitySoulSnare(World worldIn, double x, double y, double z) { - super(worldIn, x, y, z); - } + protected Item getDefaultItem() + { + return BloodMagicItems.SOUL_SNARE.get(); + } - @Override - protected void onImpact(RayTraceResult result) { - if (result.entityHit == this.getThrower() || this.ticksExisted < 2 || getEntityWorld().isRemote) - return; + @Override + public IPacket createSpawnPacket() + { + return NetworkHooks.getEntitySpawningPacket(this); + } - if (result.entityHit instanceof LivingEntity) { - if (result.entityHit.getEntityWorld().rand.nextDouble() < 0.25) - ((LivingEntity) result.entityHit).addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_SNARE, 300, 0)); + /** + * Called when the arrow hits an entity + */ + protected void onEntityHit(EntityRayTraceResult result) + { + if (result.getEntity() == this.func_234616_v_() || this.ticksExisted < 2 || getEntityWorld().isRemote) + return; - result.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), (float) 0); - } + if (result.getEntity() instanceof LivingEntity) + { + ((LivingEntity) result.getEntity()).addPotionEffect(new EffectInstance(BloodMagicPotions.soulSnare, 300, 0)); - for (int j = 0; j < 8; ++j) - this.getEntityWorld().spawnParticle(EnumParticleTypes.SNOWBALL, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); + result.getEntity().attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_234616_v_()), (float) 0); + } - this.setDead(); - } -} \ No newline at end of file + this.setDead(); + } + + @OnlyIn(Dist.CLIENT) + private IParticleData makeParticle() + { + ItemStack itemstack = this.func_213882_k(); + return (IParticleData) (itemstack.isEmpty() ? ParticleTypes.ITEM_SNOWBALL + : new ItemParticleData(ParticleTypes.ITEM, itemstack)); + } + + /** + * Handler for {@link World#setEntityState} + */ + @OnlyIn(Dist.CLIENT) + public void handleStatusUpdate(byte id) + { + if (id == 3) + { + IParticleData iparticledata = this.makeParticle(); + + for (int i = 0; i < 8; ++i) + { + this.world.addParticle(iparticledata, this.getPosX(), this.getPosY(), this.getPosZ(), 0.0D, 0.0D, 0.0D); + } + } + + } +} diff --git a/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java deleted file mode 100644 index 4e4798c7..00000000 --- a/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.event; - -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; - -@Cancelable -public class AddToNetworkEvent extends Event { - public final String ownerNetwork; - public int addedAmount; - public int maximum; - - /** - * This event is called whenever the network is added to. If cancelled, no - * LP will be drained from the source. If result is set to Result.DENY, the - * LP will still be drained but the soul network will not be added to. - * - * @param ownerNetwork Key used for the soul network - * @param addedAmount Amount added - * @param maximum Ceiling that the network can add to - */ - public AddToNetworkEvent(String ownerNetwork, int addedAmount, int maximum) { - this.ownerNetwork = ownerNetwork; - this.addedAmount = addedAmount; - this.maximum = maximum; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java deleted file mode 100644 index 0aca6bcd..00000000 --- a/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.event; - -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.eventhandler.Event; - -/** - * Fired whenever a craft is completed in a BloodAltar. - *

    - * It is not cancelable, however you can modify the output stack. - */ -public class AltarCraftedEvent extends Event { - - private final AltarRecipeRegistry.AltarRecipe altarRecipe; - private final ItemStack output; - - /** - * @param altarRecipe - The recipe that was crafted. - * @param output - The item obtained from the recipe - */ - public AltarCraftedEvent(AltarRecipeRegistry.AltarRecipe altarRecipe, ItemStack output) { - this.altarRecipe = altarRecipe; - this.output = output; - } - - public AltarRecipeRegistry.AltarRecipe getAltarRecipe() { - return altarRecipe; - } - - public ItemStack getOutput() { - return output; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java deleted file mode 100644 index 68a94aa6..00000000 --- a/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.event; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; - -public class BoundToolEvent extends Event { - public PlayerEntity player; - - public BoundToolEvent(PlayerEntity player) { - this.player = player; - } - - /** - * This event is called when a - * {@link WayofTime.bloodmagic.item.ItemBoundTool} is being charged. - *

    - * If canceled, will result in the charging being canceled. - */ - - @Cancelable - public static class Charge extends BoundToolEvent { - public ItemStack result; - - public Charge(PlayerEntity player, ItemStack result) { - super(player); - this.result = result; - } - } - - /** - * This event is called when a - * {@link WayofTime.bloodmagic.item.ItemBoundTool}'s charge is released. - *

    - * If canceled, will result in the charge not being released. - */ - - @Cancelable - public static class Release extends BoundToolEvent { - public final ItemStack boundTool; - public int charge; - - public Release(PlayerEntity player, ItemStack boundTool, int charge) { - super(player); - this.boundTool = boundTool; - this.charge = charge; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java index ec613007..48f9bdcc 100644 --- a/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java @@ -1,35 +1,38 @@ -package WayofTime.bloodmagic.event; +package wayoftime.bloodmagic.event; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; @Cancelable -public class ItemBindEvent extends Event { +public class ItemBindEvent extends Event +{ + private final PlayerEntity player; + private final ItemStack itemStack; - private final PlayerEntity player; - private final ItemStack itemStack; + /** + * This event is called whenever a player attempts to bind a + * {@link wayoftime.bloodmagic.iface.IBindable} item. + * + * @param player The player doing the binding + * @param itemStack The {@link ItemStack} that the player is binding + *

    + * This event is {@link Cancelable}.
    + */ + public ItemBindEvent(PlayerEntity player, ItemStack itemStack) + { + this.player = player; + this.itemStack = itemStack; + } - /** - * This event is called whenever a player attempts to bind a - * {@link WayofTime.bloodmagic.iface.IBindable} item. - * - * @param player The player doing the binding - * @param itemStack The {@link ItemStack} that the player is binding - *

    - * This event is {@link Cancelable}.
    - */ - public ItemBindEvent(PlayerEntity player, ItemStack itemStack) { - this.player = player; - this.itemStack = itemStack; - } + public PlayerEntity getNewOwner() + { + return player; + } - public PlayerEntity getNewOwner() { - return player; - } - - public ItemStack getBindingStack() { - return itemStack; - } -} + public ItemStack getBindingStack() + { + return itemStack; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java deleted file mode 100644 index 2a5d5536..00000000 --- a/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java +++ /dev/null @@ -1,133 +0,0 @@ -package WayofTime.bloodmagic.event; - -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; - -import java.util.UUID; - -public class RitualEvent extends Event { - - private final IMasterRitualStone mrs; - private final UUID ownerId; - private final Ritual ritual; - - private RitualEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) { - this.mrs = mrs; - this.ownerId = ownerId; - this.ritual = ritual; - } - - public IMasterRitualStone getRitualStone() { - return mrs; - } - - public UUID getOwnerId() { - return ownerId; - } - - public Ritual getRitual() { - return ritual; - } - - /** - * This event is called when a ritual is activated. If cancelled, it will - * not activate. - *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} - */ - @Cancelable - public static class RitualActivatedEvent extends RitualEvent { - - private final PlayerEntity player; - private final ItemStack crystalStack; - private final int crystalTier; - - public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, PlayerEntity player, ItemStack activationCrystal, int crystalTier) { - super(mrs, ownerId, ritual); - - this.player = player; - this.crystalStack = activationCrystal; - this.crystalTier = crystalTier; - } - - public PlayerEntity getPlayer() { - return player; - } - - public ItemStack getCrystalStack() { - return crystalStack; - } - - public int getCrystalTier() { - return crystalTier; - } - } - - /** - * This event is called when a Ritual effect is performed. If cancelled, the - * effect will not happen. - *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)} - */ - @Cancelable - public static class RitualRunEvent extends RitualEvent { - - public RitualRunEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) { - super(mrs, ownerId, ritual); - } - } - - /** - * This event is called when a Ritual is stopped by a - * {@link Ritual.BreakType}. - *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)} - */ - public static class RitualStopEvent extends RitualEvent { - - private final Ritual.BreakType method; - - public RitualStopEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, Ritual.BreakType method) { - super(mrs, ownerId, ritual); - - this.method = method; - } - - public Ritual.BreakType getMethod() { - return method; - } - } - - @Cancelable - public static class ImperfectRitualActivatedEvent extends Event { - - private final IImperfectRitualStone ims; - private final PlayerEntity activator; - private final ImperfectRitual imperfectRitual; - - public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, PlayerEntity activator, ImperfectRitual imperfectRitual) { - this.ims = ims; - this.activator = activator; - this.imperfectRitual = imperfectRitual; - } - - public IImperfectRitualStone getRitualStone() { - return ims; - } - - public PlayerEntity getActivator() { - return activator; - } - - public ImperfectRitual getImperfectRitual() { - return imperfectRitual; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java index 0893883f..6fc6bbd4 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java @@ -1,35 +1,37 @@ -package WayofTime.bloodmagic.event; +package wayoftime.bloodmagic.event; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; @Cancelable -public class SacrificeKnifeUsedEvent extends Event { - public final PlayerEntity player; - public final int healthDrained; - public int lpAdded; - public boolean shouldDrainHealth; - public boolean shouldFillAltar; +public class SacrificeKnifeUsedEvent extends Event +{ + public final PlayerEntity player; + public final int healthDrained; + public int lpAdded; + public boolean shouldDrainHealth; + public boolean shouldFillAltar; - /** - * This event is called whenever a player attempts to use a - * {@link WayofTime.bloodmagic.item.ItemSacrificialDagger} to self-sacrifice - * near an altar. - * - * @param player The player doing the sacrificing - * @param shouldDrainHealth Determines whether or not health is lost - * @param shouldFillAltar Determines whether or not an altar should be filled - * @param hp Amount of health lost - * @param lpAdded Amount of LP added to the altar - *

    - * This event is {@link Cancelable}.
    - */ - public SacrificeKnifeUsedEvent(PlayerEntity player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded) { - this.player = player; - this.shouldDrainHealth = shouldDrainHealth; - this.shouldFillAltar = shouldFillAltar; - this.healthDrained = hp; - this.lpAdded = lpAdded; - } -} \ No newline at end of file + /** + * This event is called whenever a player attempts to use a + * {@link WayofTime.bloodmagic.item.ItemSacrificialDagger} to self-sacrifice + * near an altar. + * + * @param player The player doing the sacrificing + * @param shouldDrainHealth Determines whether or not health is lost + * @param shouldFillAltar Determines whether or not an altar should be filled + * @param hp Amount of health lost + * @param lpAdded Amount of LP added to the altar + *

    + * This event is {@link Cancelable}.
    + */ + public SacrificeKnifeUsedEvent(PlayerEntity player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded) + { + this.player = player; + this.shouldDrainHealth = shouldDrainHealth; + this.shouldFillAltar = shouldFillAltar; + this.healthDrained = hp; + this.lpAdded = lpAdded; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index 2f27c0d0..c4079c4d 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -1,99 +1,116 @@ -package WayofTime.bloodmagic.event; +package wayoftime.bloodmagic.event; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.core.data.SoulTicket; -public class SoulNetworkEvent extends Event { +public class SoulNetworkEvent extends Event +{ + private final SoulNetwork network; + private SoulTicket ticket; - private final SoulNetwork network; - private SoulTicket ticket; + public SoulNetworkEvent(SoulNetwork network, SoulTicket ticket) + { + this.network = network; + this.ticket = ticket; + } - public SoulNetworkEvent(SoulNetwork network, SoulTicket ticket) { - this.network = network; - this.ticket = ticket; - } + public SoulNetwork getNetwork() + { + return network; + } - public SoulNetwork getNetwork() { - return network; - } + public SoulTicket getTicket() + { + return ticket; + } - public SoulTicket getTicket() { - return ticket; - } + public void setTicket(SoulTicket ticket) + { + this.ticket = ticket; + } - public void setTicket(SoulTicket ticket) { - this.ticket = ticket; - } + @Cancelable + public static class Syphon extends SoulNetworkEvent + { + private boolean shouldDamage; - @Cancelable - public static class Syphon extends SoulNetworkEvent { + public Syphon(SoulNetwork network, SoulTicket ticket) + { + super(network, ticket); + } - private boolean shouldDamage; + public boolean shouldDamage() + { + return shouldDamage; + } - public Syphon(SoulNetwork network, SoulTicket ticket) { - super(network, ticket); - } + public void setShouldDamage(boolean shouldDamage) + { + this.shouldDamage = shouldDamage; + } - public boolean shouldDamage() { - return shouldDamage; - } + public static class Item extends Syphon + { - public void setShouldDamage(boolean shouldDamage) { - this.shouldDamage = shouldDamage; - } + private final ItemStack stack; - public static class Item extends Syphon { + public Item(SoulNetwork network, SoulTicket ticket, ItemStack stack) + { + super(network, ticket); - private final ItemStack stack; + this.stack = stack; + } - public Item(SoulNetwork network, SoulTicket ticket, ItemStack stack) { - super(network, ticket); + public ItemStack getStack() + { + return stack; + } + } - this.stack = stack; - } + public static class User extends Syphon + { - public ItemStack getStack() { - return stack; - } - } + private final PlayerEntity user; - public static class User extends Syphon { + public User(SoulNetwork network, SoulTicket ticket, PlayerEntity user) + { + super(network, ticket); - private final PlayerEntity user; + this.user = user; + } - public User(SoulNetwork network, SoulTicket ticket, PlayerEntity user) { - super(network, ticket); + public PlayerEntity getUser() + { + return user; + } + } + } - this.user = user; - } + @Cancelable + public static class Fill extends SoulNetworkEvent + { - public PlayerEntity getUser() { - return user; - } - } - } + private int maximum; - @Cancelable - public static class Fill extends SoulNetworkEvent { + public Fill(SoulNetwork network, SoulTicket ticket, int maximum) + { + super(network, ticket); - private int maximum; + this.maximum = maximum; + } - public Fill(SoulNetwork network, SoulTicket ticket, int maximum) { - super(network, ticket); + public int getMaximum() + { + return maximum; + } - this.maximum = maximum; - } - - public int getMaximum() { - return maximum; - } - - public void setMaximum(int maximum) { - this.maximum = maximum; - } - } -} + public void setMaximum(int maximum) + { + this.maximum = maximum; + } + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java deleted file mode 100644 index 527f9e19..00000000 --- a/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java +++ /dev/null @@ -1,78 +0,0 @@ -package WayofTime.bloodmagic.event; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; - -/** - * Fired when a teleposer attempts to transpose two blocks. Use this to perform - * special cleanup or compensation, or cancel it entirely to prevent the - * transposition. - */ -@Cancelable -public class TeleposeEvent extends Event { - public final World initalWorld; - public final BlockPos initialBlockPos; - public final BlockState initialState; - - public final World finalWorld; - public final BlockPos finalBlockPos; - public final BlockState finalState; - - public TeleposeEvent(World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos) { - this.initalWorld = initialWorld; - this.initialBlockPos = initialBlockPos; - this.initialState = initialWorld.getBlockState(initialBlockPos); - - this.finalWorld = finalWorld; - this.finalBlockPos = finalBlockPos; - this.finalState = finalWorld.getBlockState(finalBlockPos); - } - - public TileEntity getInitialTile() { - return initalWorld.getTileEntity(initialBlockPos); - } - - public TileEntity getFinalTile() { - return finalWorld.getTileEntity(finalBlockPos); - } - - /** - * Fired when a Teleposer attempts to move an Entity between locations. Can - * be cancelled to stop transposition. - */ - @Cancelable - public static class Ent extends TeleposeEvent { - public final Entity entity; - - public Ent(Entity entity, World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos) { - super(initialWorld, initialBlockPos, finalWorld, finalBlockPos); - - this.entity = entity; - } - - @Override - public TileEntity getInitialTile() throws IllegalArgumentException { - throw new IllegalArgumentException("Attempted to get a TileEntity from an Entity Telepose Event."); - } - - @Override - public TileEntity getFinalTile() throws IllegalArgumentException { - throw new IllegalArgumentException("Attempted to get a TileEntity from an Entity Telepose Event."); - } - - /** - * Called after the entity has been transposed. - */ - public static class Post extends Ent { - - public Post(Entity entity, World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos) { - super(entity, initialWorld, initialBlockPos, finalWorld, finalBlockPos); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java deleted file mode 100644 index 92508702..00000000 --- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java +++ /dev/null @@ -1,160 +0,0 @@ -package WayofTime.bloodmagic.fakePlayer; - -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.IPacket; -import net.minecraft.network.PacketDirection; -import net.minecraft.network.play.ServerPlayNetHandler; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.client.*; -import net.minecraft.network.play.server.SPlayerPositionLookPacket; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.common.FMLCommonHandler; - -import java.util.Set; - -/** - * All credits for this go to CrazyPants, from EIO - */ -public class FakeNetHandlerPlayServer extends ServerPlayNetHandler { - public FakeNetHandlerPlayServer(ServerPlayerEntity p_i1530_3_) { - super(FMLCommonHandler.instance().getMinecraftServerInstance(), new net.minecraft.network.NetworkManager(PacketDirection.CLIENTBOUND), p_i1530_3_); - } - - @Override - public NetworkManager getNetworkManager() { - return null; - } - - @Override - public void update() { - } - - @Override - public void disconnect(final ITextComponent textComponent) { - } - - @Override - public void processVehicleMove(CMoveVehiclePacket packetIn) { - } - - @Override - public void processConfirmTeleport(CConfirmTeleportPacket packetIn) { - } - - @Override - public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set relativeSet) { - } - - @Override - public void processTryUseItemOnBlock(CPlayerTryUseItemOnBlockPacket packetIn) { - } - - @Override - public void processTryUseItem(CPlayerTryUseItemPacket packetIn) { - } - - @Override - public void processSteerBoat(CSteerBoatPacket packetIn) { - } - - @Override - public void processCustomPayload(CCustomPayloadPacket packetIn) { - } - - @Override - public void processInput(CInputPacket p_147358_1_) { - } - - @Override - public void processPlayer(CPlayerPacket p_147347_1_) { - } - - @Override - public void setPlayerLocation(double p_147364_1_, double p_147364_3_, double p_147364_5_, float p_147364_7_, float p_147364_8_) { - } - - @Override - public void processPlayerDigging(CPlayerDiggingPacket p_147345_1_) { - } - - @Override - public void onDisconnect(ITextComponent p_147231_1_) { - } - - @Override - public void sendPacket(IPacket p_147359_1_) { - } - - @Override - public void processHeldItemChange(CHeldItemChangePacket p_147355_1_) { - } - - @Override - public void processChatMessage(CChatMessagePacket p_147354_1_) { - } - - @Override - public void handleAnimation(CAnimateHandPacket packetIn) { - - } - - @Override - public void processEntityAction(CEntityActionPacket p_147357_1_) { - } - - @Override - public void processUseEntity(CUseEntityPacket p_147340_1_) { - } - - @Override - public void processClientStatus(CClientStatusPacket p_147342_1_) { - } - - @Override - public void processCloseWindow(CCloseWindowPacket p_147356_1_) { - } - - @Override - public void processClickWindow(CClickWindowPacket p_147351_1_) { - } - - @Override - public void processEnchantItem(CEnchantItemPacket p_147338_1_) { - } - - @Override - public void processCreativeInventoryAction(CCreativeInventoryActionPacket p_147344_1_) { - } - - @Override - public void processConfirmTransaction(CConfirmTransactionPacket p_147339_1_) { - } - - @Override - public void processUpdateSign(CUpdateSignPacket p_147343_1_) { - } - - @Override - public void processKeepAlive(CKeepAlivePacket p_147353_1_) { - } - - @Override - public void processPlayerAbilities(CPlayerAbilitiesPacket p_147348_1_) { - } - - @Override - public void processTabComplete(CTabCompletePacket p_147341_1_) { - } - - @Override - public void processClientSettings(CClientSettingsPacket p_147352_1_) { - } - - @Override - public void handleSpectate(CSpectatePacket packetIn) { - } - - @Override - public void handleResourcePackStatus(CResourcePackStatusPacket packetIn) { - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java deleted file mode 100644 index e8436777..00000000 --- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.fakePlayer; - -import com.mojang.authlib.GameProfile; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.fml.common.FMLCommonHandler; - -import javax.annotation.Nullable; - -/** - * All credits for this go to CrazyPants, from EIO - */ -@SuppressWarnings("EntityConstructor") -public class FakePlayerBM extends FakePlayer { - - public FakePlayerBM(ServerWorld world, GameProfile name) { - super(world, name); - } - - public FakePlayerBM(World world, BlockPos pos, GameProfile profile) { - super(FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(world.provider.getDimension()), profile); - posX = pos.getX() + 0.5; - posY = pos.getY() + 0.5; - posZ = pos.getZ() + 0.5; - connection = new FakeNetHandlerPlayServer(this); - } - - @Override - protected void onNewPotionEffect(EffectInstance p_70670_1_) { - } - - @Override - protected void onChangedPotionEffect(EffectInstance effect, boolean p_70695_2_) { - } - - @Override - protected void onFinishedPotionEffect(EffectInstance effect) { - } - - protected void playEquipSound(@Nullable ItemStack stack) { - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/gson/SerializerBase.java b/src/main/java/WayofTime/bloodmagic/gson/SerializerBase.java deleted file mode 100644 index 9b67708b..00000000 --- a/src/main/java/WayofTime/bloodmagic/gson/SerializerBase.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.bloodmagic.gson; - -import com.google.gson.*; - -import java.lang.reflect.Type; - -public abstract class SerializerBase implements JsonDeserializer, JsonSerializer { - @Override - public T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - return context.deserialize(json, getType()); - } - - @Override - public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) { - return context.serialize(src); - } - - public abstract Class getType(); -} diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java deleted file mode 100644 index 543c3e38..00000000 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ /dev/null @@ -1,100 +0,0 @@ -package WayofTime.bloodmagic.gson; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import com.google.gson.*; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.IDataSerializer; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -import java.lang.reflect.Type; - -public class Serializers { - // Data serializers - public static final IDataSerializer WILL_TYPE_SERIALIZER = new IDataSerializer() { - @Override - public void write(PacketBuffer buf, EnumDemonWillType value) { - buf.writeEnumValue(value); - } - - @Override - public EnumDemonWillType read(PacketBuffer buf) { - return buf.readEnumValue(EnumDemonWillType.class); - } - - @Override - public DataParameter createKey(int id) { - return new DataParameter<>(id, this); - } - - @Override - public EnumDemonWillType copyValue(EnumDemonWillType value) { - return EnumDemonWillType.valueOf(value.name()); - } - }; - - // Serializers - public static final SerializerBase FACING_SERIALIZER = new SerializerBase() { - @Override - public Class getType() { - return Direction.class; - } - - @Override - public Direction deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - return Direction.byName(json.getAsString()); - } - }; - public static final SerializerBase RESOURCELOCATION_SERIALIZER = new SerializerBase() { - @Override - public Class getType() { - return ResourceLocation.class; - } - - @Override - public ResourceLocation deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - String domain = json.getAsJsonObject().get("domain").getAsString(); - String path = json.getAsJsonObject().get("path").getAsString(); - return new ResourceLocation(domain, path); - } - - @Override - public JsonElement serialize(ResourceLocation src, Type typeOfSrc, JsonSerializationContext context) { - JsonObject object = new JsonObject(); - object.addProperty("domain", src.getNamespace()); - object.addProperty("path", src.getPath()); - return object; - } - }; - public static final SerializerBase ITEMMETA_SERIALIZER = new SerializerBase() { - @Override - public Class getType() { - return ItemStack.class; - } - - @Override - public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - ResourceLocation registryName = context.deserialize(json.getAsJsonObject().get("registryName").getAsJsonObject(), ResourceLocation.class); - int meta = json.getAsJsonObject().get("meta").getAsInt(); - return new ItemStack(ForgeRegistries.ITEMS.getValue(registryName), 1, meta); - } - - @Override - public JsonElement serialize(ItemStack src, Type typeOfSrc, JsonSerializationContext context) { - JsonObject jsonObject = new JsonObject(); - jsonObject.add("registryName", context.serialize(src.getItem().getRegistryName())); - jsonObject.addProperty("meta", src.getItemDamage()); - return jsonObject; - } - }; - - public static final Gson GSON = new GsonBuilder().serializeNulls().setPrettyPrinting().disableHtmlEscaping().registerTypeAdapter(FACING_SERIALIZER.getType(), FACING_SERIALIZER).registerTypeAdapter(RESOURCELOCATION_SERIALIZER.getType(), RESOURCELOCATION_SERIALIZER).registerTypeAdapter(ITEMMETA_SERIALIZER.getType(), ITEMMETA_SERIALIZER).create(); - - static { - DataSerializers.registerSerializer(WILL_TYPE_SERIALIZER); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java index f5435580..fba799a3 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java @@ -1,26 +1,30 @@ -package WayofTime.bloodmagic.iface; - -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; +package wayoftime.bloodmagic.iface; import javax.annotation.Nonnull; -public interface IActivatable { +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import wayoftime.bloodmagic.util.Constants; - default boolean getActivated(ItemStack stack) { - return !stack.isEmpty() && stack.hasTagCompound() && stack.getTagCompound().getBoolean(Constants.NBT.ACTIVATED); - } +public interface IActivatable +{ - @Nonnull - default ItemStack setActivatedState(ItemStack stack, boolean activated) { - if (!stack.isEmpty()) { - if (!stack.hasTagCompound()) - stack.setTagCompound(new CompoundNBT()); + default boolean getActivated(ItemStack stack) + { + return !stack.isEmpty() && stack.hasTag() && stack.getTag().getBoolean(Constants.NBT.ACTIVATED); + } - stack.getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); - } + @Nonnull + default ItemStack setActivatedState(ItemStack stack, boolean activated) + { + if (!stack.isEmpty()) + { + if (!stack.hasTag()) + stack.setTag(new CompoundNBT()); - return stack; - } -} + stack.getTag().putBoolean(Constants.NBT.ACTIVATED, activated); + } + + return stack; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java deleted file mode 100644 index 4b3321c6..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java +++ /dev/null @@ -1,7 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.util.Direction; - -public interface IAlchemyArray { - Direction getRotation(); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java b/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java index 0e2e5fbe..5fa997cc 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java @@ -1,9 +1,10 @@ -package WayofTime.bloodmagic.iface; +package wayoftime.bloodmagic.iface; /** * Any item that implements this interface will not be pulled into the Altar on * right click. */ -public interface IAltarReader { +public interface IAltarReader +{ -} +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java index 6253c37b..a894faed 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java @@ -1,38 +1,40 @@ -package WayofTime.bloodmagic.iface; - -import WayofTime.bloodmagic.core.data.Binding; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; +package wayoftime.bloodmagic.iface; import javax.annotation.Nullable; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import wayoftime.bloodmagic.core.data.Binding; + /** * Implement this interface on any Item that can be bound to a player. */ -public interface IBindable { +public interface IBindable +{ + /** + * Gets an object that stores who this item is bound to. + *

    + * If the item is not bound, this will be null. + * + * @param stack - The owned ItemStack + * @return - The binding object + */ + @Nullable + default Binding getBinding(ItemStack stack) + { + Binding binding = Binding.fromStack(stack); + return !stack.isEmpty() && binding != null ? binding : null; + } - /** - * Gets an object that stores who this item is bound to. - *

    - * If the item is not bound, this will be null. - * - * @param stack - The owned ItemStack - * @return - The binding object - */ - @Nullable - default Binding getBinding(ItemStack stack) { - Binding binding = Binding.fromStack(stack); - return !stack.isEmpty() && binding != null ? binding : null; - } - - /** - * Called when the player attempts to bind the item. - * - * @param player - The Player attempting to bind the item - * @param stack - The ItemStack to attempt binding - * @return If binding was successful. - */ - default boolean onBind(PlayerEntity player, ItemStack stack) { - return true; - } -} + /** + * Called when the player attempts to bind the item. + * + * @param player - The Player attempting to bind the item + * @param stack - The ItemStack to attempt binding + * @return If binding was successful. + */ + default boolean onBind(PlayerEntity player, ItemStack stack) + { + return true; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java b/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java index 51ae4323..e225b5e2 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBloodRune.java @@ -1,15 +1,14 @@ -package WayofTime.bloodmagic.iface; - - -import WayofTime.bloodmagic.block.enums.BloodRuneType; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; +package wayoftime.bloodmagic.iface; import javax.annotation.Nullable; -public interface IBloodRune { +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import wayoftime.bloodmagic.block.enums.BloodRuneType; - @Nullable - BloodRuneType getBloodRune(IBlockAccess world, BlockPos pos, BlockState state); +public interface IBloodRune +{ + + @Nullable + BloodRuneType getBloodRune(World world, BlockPos pos); } diff --git a/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java b/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java deleted file mode 100644 index 708067ba..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java +++ /dev/null @@ -1,11 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.item.ItemStack; - -/** - * An interface for items that have custom drainage behaviour when used in - * certain alchemy recipes. - */ -public interface ICustomAlchemyConsumable { - ItemStack drainUseOnAlchemyCraft(ItemStack stack); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java deleted file mode 100644 index 2647c6f6..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java +++ /dev/null @@ -1,11 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IDemonWillViewer { - boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player); - - int getDemonWillAuraResolution(World world, ItemStack stack, PlayerEntity player); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java deleted file mode 100644 index 5038d0a0..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java +++ /dev/null @@ -1,32 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.List; - -/** - * Marks blocks as one that is documented. - *

    - * This documentation can be read by an - * {@link WayofTime.bloodmagic.item.ItemSanguineBook} (or child) - */ -public interface IDocumentedBlock { - /** - * Provides the documentation to provide to the player. Usually a - * short'n'sweet description about basic usage. - * - * @param player - The EntityPlayer attempting to view the Documentation. - * @param world - The World interaction is happening in. - * @param pos - The BlockPos being interacted at. - * @param state - The IBlockState of the interacted Block. - * @return - A list of formatted ITextComponent to provide to the player. - * Provide an empty list if there is no available documentation. - */ - @Nonnull - List getDocumentation(PlayerEntity player, World world, BlockPos pos, BlockState state); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java b/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java deleted file mode 100644 index b2daff9c..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java +++ /dev/null @@ -1,14 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.item.ItemStack; - -/** - * Interface used for any item that can store LP in itself - */ -public interface IItemLPContainer { - int getCapacity(); - - void setStoredLP(ItemStack stack, int lp); - - int getStoredLP(ItemStack stack); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java b/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java index cda13f64..9a95f145 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java @@ -1,8 +1,9 @@ -package WayofTime.bloodmagic.iface; +package wayoftime.bloodmagic.iface; -import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.item.ItemStack; +import wayoftime.bloodmagic.will.EnumDemonWillType; -public interface IMultiWillTool { - EnumDemonWillType getCurrentType(ItemStack stack); -} +public interface IMultiWillTool +{ + EnumDemonWillType getCurrentType(ItemStack stack); +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java b/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java deleted file mode 100644 index cc93b3bc..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java +++ /dev/null @@ -1,8 +0,0 @@ -package WayofTime.bloodmagic.iface; - -/** - * Held items that implement this will cause the beams between routing nodes to - * render. - */ -public interface INodeRenderer { -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java b/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java deleted file mode 100644 index 22355522..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java +++ /dev/null @@ -1,11 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.item.ItemStack; - -public interface IPurificationAsh { - double getTotalPurity(ItemStack stack); - - double getMaxPurity(ItemStack stack); - - double getPurityRate(ItemStack stack); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java deleted file mode 100644 index e620478f..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; - -public interface ISentientSwordEffectProvider { - boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, LivingEntity attacker, LivingEntity target); - - boolean providesEffectForWill(EnumDemonWillType type); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java deleted file mode 100644 index a36935e2..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java +++ /dev/null @@ -1,8 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; - -public interface ISentientTool { - boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player); -} diff --git a/src/main/java/WayofTime/bloodmagic/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java index 683fdf3c..7c5d020c 100644 --- a/src/main/java/WayofTime/bloodmagic/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java @@ -1,29 +1,32 @@ -package WayofTime.bloodmagic.iface; +package wayoftime.bloodmagic.iface; + +import javax.annotation.Nonnull; -import WayofTime.bloodmagic.item.sigil.ItemSigil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - -import javax.annotation.Nonnull; +import wayoftime.bloodmagic.common.item.ItemSigil; /** - * Used for all {@link ItemSigil} EXCEPT - * Sigils of Holdings. + * Used for all {@link ItemSigil} EXCEPT Sigils of Holdings. */ -public interface ISigil { +public interface ISigil +{ - default boolean performArrayEffect(World world, BlockPos pos) { - return false; - } + default boolean performArrayEffect(World world, BlockPos pos) + { + return false; + } - default boolean hasArrayEffect() { - return false; - } + default boolean hasArrayEffect() + { + return false; + } - interface Holding { - @Nonnull - ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player); - } -} + interface Holding + { + @Nonnull + ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java deleted file mode 100644 index 6e9197e9..00000000 --- a/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java +++ /dev/null @@ -1,15 +0,0 @@ -package WayofTime.bloodmagic.iface; - -import net.minecraft.item.ItemStack; - -import java.util.List; - -/** - * This interface is used for items intended to train specific upgrades while - * held in the player's inventory. - */ -public interface IUpgradeTrainer { - List getTrainedUpgrades(ItemStack stack); - - boolean setTrainedUpgrades(ItemStack stack, List keys); -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java b/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java deleted file mode 100644 index d2221dbf..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java +++ /dev/null @@ -1,12 +0,0 @@ -package WayofTime.bloodmagic.incense; - -public enum EnumTranquilityType { - PLANT(), - CROP(), - TREE(), - EARTHEN(), - WATER(), - FIRE(), - LAVA(), - ; -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java b/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java deleted file mode 100644 index 77efdb42..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/IIncensePath.java +++ /dev/null @@ -1,14 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public interface IIncensePath { - /** - * Goes from 0 to however far this path block can be from the altar while - * still functioning. 0 represents a block that can work when it is two - * blocks horizontally away from the altar. - */ - int getLevelOfPath(World world, BlockPos pos, BlockState state); -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java deleted file mode 100644 index af9e425c..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/ITranquilityHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public interface ITranquilityHandler { - TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state); -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java deleted file mode 100644 index ebdd88ca..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; - -public class IncenseAltarComponent { - public final BlockPos offsetPos; - public final Block block; - public final BlockState state; - - public IncenseAltarComponent(BlockPos offsetPos, Block block, BlockState state) { - this.offsetPos = offsetPos; - this.block = block; - this.state = state; - } - - public boolean doesBlockMatch(Block block, BlockState state) { - return this.block == block && block.getMetaFromState(state) == this.block.getMetaFromState(this.state); - } - - /** - * Base rotation is north. - */ - public BlockPos getOffset(Direction rotation) { - return new BlockPos(this.getX(rotation), offsetPos.getY(), this.getZ(rotation)); - } - - public int getX(Direction direction) { - switch (direction) { - case EAST: - return -this.offsetPos.getZ(); - case SOUTH: - return -this.offsetPos.getX(); - case WEST: - return this.offsetPos.getZ(); - default: - return this.offsetPos.getX(); - } - } - - public int getZ(Direction direction) { - switch (direction) { - case EAST: - return this.offsetPos.getX(); - case SOUTH: - return -this.offsetPos.getZ(); - case WEST: - return -this.offsetPos.getX(); - default: - return this.offsetPos.getZ(); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java deleted file mode 100644 index ad8a1659..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java +++ /dev/null @@ -1,92 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -public class IncenseAltarHandler { - public static Map> incenseComponentMap = new TreeMap<>(); - //Incense bonus maximum applied for the tier of blocks. - public static double[] incenseBonuses = new double[]{0.2, 0.6, 1.2, 2, 3, 4.5}; - public static double[] tranquilityRequired = new double[]{0, 6, 14.14, 28, 44.09, 83.14}; - public static int[] roadsRequired = new int[]{0, 1, 4, 6, 8, 10, 12}; //TODO: Change for when the roads are fully implemented - - public static void registerIncenseComponent(int altarLevel, IncenseAltarComponent component) { - if (incenseComponentMap.containsKey(altarLevel)) { - incenseComponentMap.get(altarLevel).add(component); - } else { - List list = new ArrayList<>(); - list.add(component); - incenseComponentMap.put(altarLevel, list); - } - } - - public static void registerIncenseComponent(int altarLevel, BlockPos offsetPos, Block block, BlockState state) { - registerIncenseComponent(altarLevel, new IncenseAltarComponent(offsetPos, block, state)); - } - - public static double getMaxIncenseBonusFromComponents(World world, BlockPos pos) { - double accumulatedBonus = 0; - for (int i = 0; i < incenseBonuses.length; i++) { - double previousBonus = (i <= 0 ? 0 : incenseBonuses[i - 1]); - double nextBonus = incenseBonuses[i]; - if (!incenseComponentMap.containsKey(i)) { - accumulatedBonus += (nextBonus - previousBonus); - } else { - boolean hasAllComponentsThisTier = true; - for (IncenseAltarComponent component : incenseComponentMap.get(i)) { - BlockPos offsetPos = pos.add(component.getOffset(Direction.NORTH)); - BlockState state = world.getBlockState(offsetPos); - Block block = state.getBlock(); - if (component.doesBlockMatch(block, state)) { - hasAllComponentsThisTier = false; - } else { - accumulatedBonus += (nextBonus - previousBonus) / incenseComponentMap.get(i).size(); - } - } - - if (!hasAllComponentsThisTier) { - break; - } - } - } - - return accumulatedBonus; - } - - public static double getMaxIncenseBonusFromRoads(int roads) { - double previousBonus = 0; - for (int i = 0; i < incenseBonuses.length; i++) { - if (roads >= roadsRequired[i]) { - previousBonus = incenseBonuses[i]; - } else { - return previousBonus; - } - } - - return previousBonus; - } - - public static double getIncenseBonusFromComponents(World world, BlockPos pos, double tranquility, int roads) { - double maxBonus = Math.min(getMaxIncenseBonusFromComponents(world, pos), getMaxIncenseBonusFromRoads(roads)); - double possibleBonus = 0; - - for (int i = 0; i < incenseBonuses.length; i++) { - if (tranquility >= tranquilityRequired[i]) { - possibleBonus = incenseBonuses[i]; - } else if (i >= 1) { - possibleBonus += (incenseBonuses[i] - possibleBonus) * (tranquility - tranquilityRequired[i - 1]) / (tranquilityRequired[i] - tranquilityRequired[i - 1]); - break; - } - } - - return Math.min(maxBonus, possibleBonus); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java deleted file mode 100644 index 8273d848..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java +++ /dev/null @@ -1,28 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class IncenseTranquilityRegistry { - public static List handlerList = new ArrayList<>(); - - public static void registerTranquilityHandler(ITranquilityHandler handler) { - handlerList.add(handler); - } - - public static TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state) { - for (ITranquilityHandler handler : handlerList) { - TranquilityStack tranq = handler.getTranquilityOfBlock(world, pos, block, state); - if (tranq != null) { - return tranq; - } - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java deleted file mode 100644 index 7dd3de54..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/TranquilityStack.java +++ /dev/null @@ -1,11 +0,0 @@ -package WayofTime.bloodmagic.incense; - -public class TranquilityStack { - public final EnumTranquilityType type; - public double value; - - public TranquilityStack(EnumTranquilityType type, double value) { - this.type = type; - this.value = value; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java deleted file mode 100644 index baad0d7b..00000000 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ /dev/null @@ -1,86 +0,0 @@ -package WayofTime.bloodmagic.inversion; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.HashMap; -import java.util.Map; - -public class CorruptionHandler { - public static Map, Map> corruptBlockMap = new HashMap<>(); - - public static void registerBlockCorruption(EnumDemonWillType type, Block block, int meta, BlockState corruptedState) { - Pair pair = Pair.of(block, meta); - if (corruptBlockMap.containsKey(pair)) { - Map stateMap = corruptBlockMap.get(pair); - stateMap.put(type, corruptedState); - } else { - Map stateMap = new HashMap<>(); - stateMap.put(type, corruptedState); - corruptBlockMap.put(pair, stateMap); - } - } - - public static boolean isBlockCorruptible(World world, EnumDemonWillType type, BlockPos pos, BlockState state, Block block) { - int meta = block.getMetaFromState(state); - Pair pair = Pair.of(block, meta); - if (corruptBlockMap.containsKey(pair)) { - Map stateMap = corruptBlockMap.get(pair); - return stateMap.containsKey(type); - } - - return false; - } - - public static boolean corruptBlock(World world, EnumDemonWillType type, BlockPos pos, BlockState state, Block block) { - int meta = block.getMetaFromState(state); - Pair pair = Pair.of(block, meta); - if (corruptBlockMap.containsKey(pair)) { - Map stateMap = corruptBlockMap.get(pair); - if (stateMap.containsKey(type)) { - return world.setBlockState(pos, stateMap.get(type)); - } - } - - return false; - } - - /** - * @param world - * @param type - * @param centerPos - * @param radius - * @param featheringChance Chance that the block within the featheringDepth is NOT altered. - * @param featheringDepth - * @return - */ - public static boolean corruptSurroundingBlocks(World world, EnumDemonWillType type, BlockPos centerPos, int radius, double featheringChance, double featheringDepth) { - for (int i = -radius; i <= radius; i++) { - for (int j = -radius; j <= radius; j++) { - for (int k = -radius; k <= radius; k++) { - if (i * i + j * j + k * k > (radius + 0.5) * (radius + 0.5)) { - continue; - } - - if (featheringChance > 0 && i * i + j * j + k * k > (radius - featheringDepth + 0.5) * (radius - featheringDepth + 0.5) && world.rand.nextDouble() < featheringChance) { - continue; - } - - if (world.isAirBlock(centerPos)) { - continue; - } - - BlockPos offsetPos = centerPos.add(i, j, k); - BlockState offsetState = world.getBlockState(offsetPos); - Block offsetBlock = offsetState.getBlock(); - corruptBlock(world, type, offsetPos, offsetState, offsetBlock); - } - } - } - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java deleted file mode 100644 index 34a090ef..00000000 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ /dev/null @@ -1,193 +0,0 @@ -package WayofTime.bloodmagic.inversion; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.*; - -public class InversionPillarHandler { - public static final double farthestDistanceSquared = 16 * 16; - public static Map>> pillarMap = new HashMap<>(); - public static Map>>> nearPillarMap = new HashMap<>(); - - public static boolean addPillarToMap(World world, EnumDemonWillType type, BlockPos pos) { - int dim = world.provider.getDimension(); - if (pillarMap.containsKey(dim)) { - Map> willMap = pillarMap.get(dim); - if (willMap.containsKey(type)) { - if (!willMap.get(type).contains(pos)) { - willMap.get(type).add(pos); - onPillarAdded(world, type, pos); - return true; - } else { - return false; - } - } else { - List posList = new ArrayList<>(); - posList.add(pos); - willMap.put(type, posList); - onPillarAdded(world, type, pos); - return true; - } - } else { - Map> willMap = new HashMap<>(); - List posList = new ArrayList<>(); - posList.add(pos); - - willMap.put(type, posList); - pillarMap.put(dim, willMap); - onPillarAdded(world, type, pos); - return true; - } - } - - public static boolean removePillarFromMap(World world, EnumDemonWillType type, BlockPos pos) { - int dim = world.provider.getDimension(); - if (pillarMap.containsKey(dim)) { - Map> willMap = pillarMap.get(dim); - if (willMap.containsKey(type)) { - if (willMap.get(type).contains(pos)) { - onPillarRemoved(world, type, pos); - return willMap.get(type).remove(pos); - } else { - return false; - } - } else { - return false; - } - } else { - return false; - } - } - - //Assume that it has been added already. - private static void onPillarAdded(World world, EnumDemonWillType type, BlockPos pos) { - BMLog.DEBUG.info("Adding..."); - List closePosList = new ArrayList<>(); - - int dim = world.provider.getDimension(); - if (pillarMap.containsKey(dim)) { - Map> willMap = pillarMap.get(dim); - if (willMap.containsKey(type)) { - List otherPosList = willMap.get(type); - - for (BlockPos closePos : otherPosList) { - if (!closePos.equals(pos) && closePos.distanceSq(pos) <= farthestDistanceSquared) { - closePosList.add(closePos); - } - } - - } - } - if (nearPillarMap.containsKey(dim)) { - Map>> willMap = nearPillarMap.get(dim); - if (willMap.containsKey(type)) { - Map> posMap = willMap.get(type); - - for (BlockPos closePos : closePosList) { - List posList = posMap.get(closePos); - if (posList != null && !posList.contains(pos)) { - posList.add(pos); - } else { - posList = new ArrayList<>(); - posList.add(pos); - posMap.put(closePos, posList); - } - } - - posMap.put(pos, closePosList); - } else { - Map> posMap = new HashMap<>(); - - posMap.put(pos, closePosList); - willMap.put(type, posMap); - } - } else { - Map>> willMap = new HashMap<>(); - Map> posMap = new HashMap<>(); - - posMap.put(pos, closePosList); - willMap.put(type, posMap); - nearPillarMap.put(dim, willMap); - } - } - - private static void onPillarRemoved(World world, EnumDemonWillType type, BlockPos pos) { - BMLog.DEBUG.info("Removing..."); - int dim = world.provider.getDimension(); - if (nearPillarMap.containsKey(dim)) { - Map>> willMap = nearPillarMap.get(dim); - if (willMap.containsKey(type)) { - Map> posMap = willMap.get(type); - List posList = posMap.get(pos); - if (posList != null) { - for (BlockPos checkPos : posList) { - List checkPosList = posMap.get(checkPos); - if (checkPosList != null) { - checkPosList.remove(pos); - } - } - - posMap.remove(pos); - } - } - } - } - - //TODO: Change to use the nearPillarMap. - public static List getNearbyPillars(World world, EnumDemonWillType type, BlockPos pos) { - int dim = world.provider.getDimension(); - if (nearPillarMap.containsKey(dim)) { - Map>> willMap = nearPillarMap.get(dim); - if (willMap.containsKey(type)) { - Map> posMap = willMap.get(type); - List posList = posMap.get(pos); - if (posList != null) { - return posList; - } - } - } - - return new ArrayList<>(); - } - - public static List getAllConnectedPillars(World world, EnumDemonWillType type, BlockPos pos) { - List checkedPosList = new ArrayList<>(); - List uncheckedPosList = new ArrayList<>(); //Positions where we did not check their connections. - - uncheckedPosList.add(pos); - - int dim = world.provider.getDimension(); - if (nearPillarMap.containsKey(dim)) { - Map>> willMap = nearPillarMap.get(dim); - if (willMap.containsKey(type)) { - Map> posMap = willMap.get(type); - // This is where the magic happens. - - while (!uncheckedPosList.isEmpty()) { - //Positions that are new this iteration and need to be dumped into uncheckedPosList next iteration. - List newPosList = new ArrayList<>(); - - for (BlockPos checkPos : uncheckedPosList) { - List posList = posMap.get(checkPos); - if (posList != null) { - for (BlockPos testPos : posList) { - //Check if the position has already been checked, is scheduled to be checked, or is already found it needs to be checked. - if (!checkedPosList.contains(testPos) && !uncheckedPosList.contains(testPos) && !newPosList.contains(testPos)) { - newPosList.add(testPos); - } - } - } - } - - checkedPosList.addAll(uncheckedPosList); - uncheckedPosList = newPosList; - } - } - } - - return checkedPosList; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java deleted file mode 100644 index ca52fadd..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Locale; - -public class ItemActivationCrystal extends ItemEnum.Variant implements IBindable { - - public ItemActivationCrystal() { - super(CrystalType.class, "activation_crystal"); - - setMaxStackSize(1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.activation_crystal." + getItemType(stack).getInternalName())); - - if (!stack.hasTagCompound()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); - - super.addInformation(stack, world, tooltip, flag); - } - - public int getCrystalLevel(ItemStack stack) { - return stack.getItemDamage() > 1 ? Integer.MAX_VALUE : stack.getItemDamage() + 1; - } - - public enum CrystalType implements ISubItem { - WEAK, - AWAKENED, - CREATIVE, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, count, ordinal()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java b/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java deleted file mode 100644 index 6c9f5b79..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAlchemicVial.java +++ /dev/null @@ -1,16 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.item.types.AlchemicVialType; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; - -public class ItemAlchemicVial extends ItemEnum.Variant { - public ItemAlchemicVial() { - super(AlchemicVialType.class, "alchemic_vial"); - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - for (AlchemicVialType type : types) - variants.put(type.ordinal(), "type=normal"); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java deleted file mode 100644 index 8ed4f7b7..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ /dev/null @@ -1,140 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.*; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; - -public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantProvider { - private AltarTier tierToBuild = AltarTier.ONE; - - public ItemAltarMaker() { - super(); - setTranslationKey(BloodMagic.MODID + ".altarMaker"); - setCreativeTab(BloodMagic.TAB_BM); - setMaxStackSize(1); - setFull3D(); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentTier", stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote) - return super.onItemRightClick(world, player, hand); - - if (!player.capabilities.isCreativeMode) { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.creativeOnly"), true); - return super.onItemRightClick(world, player, hand); - } - - stack = NBTHelper.checkNBT(stack); - - if (player.isSneaking()) { - if (stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) >= AltarTier.MAXTIERS - 1) - stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, 0); - else - stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); - - setTierToBuild(AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); - return super.onItemRightClick(world, player, hand); - } - - RayTraceResult rayTrace = rayTrace(world, player, false); - if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) - return super.onItemRightClick(world, player, hand); - - BlockState state = world.getBlockState(rayTrace.getBlockPos()); - if (state.getBlock() instanceof BlockAltar) { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.building", NumeralHelper.toRoman(tierToBuild.toInt())), true); - buildAltar(world, rayTrace.getBlockPos()); - - world.notifyBlockUpdate(rayTrace.getBlockPos(), state, state, 3); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=altarmaker"); // FIXME - } - - public void setTierToBuild(AltarTier tierToBuild) { - this.tierToBuild = tierToBuild; - } - - public void buildAltar(World world, BlockPos pos) { - if (world.isRemote) - return; - - if (tierToBuild == AltarTier.ONE) - return; - - for (AltarComponent altarComponent : tierToBuild.getAltarComponents()) { - BlockPos componentPos = pos.add(altarComponent.getOffset()); - if (altarComponent.getComponent() == ComponentType.NOTAIR) { - world.setBlockState(componentPos, Blocks.STONEBRICK.getDefaultState()); - continue; - } - - world.setBlockState(componentPos, BloodMagicAPI.INSTANCE.getComponentStates(altarComponent.getComponent()).get(0)); - } - - ((IBloodAltar) world.getTileEntity(pos)).checkTier(); - } - - public String destroyAltar(PlayerEntity player) { - World world = player.getEntityWorld(); - if (world.isRemote) - return ""; - - RayTraceResult rayTrace = rayTrace(world, player, false); - BlockPos pos = rayTrace.getBlockPos(); - BlockState state = world.getBlockState(pos); - AltarTier altarTier = AltarUtil.getTier(world, pos); - - if (altarTier.equals(AltarTier.ONE)) - return "" + altarTier.toInt(); - else { - for (AltarComponent altarComponent : altarTier.getAltarComponents()) { - BlockPos componentPos = pos.add(altarComponent.getOffset()); - world.setBlockToAir(componentPos); - } - } - - world.notifyBlockUpdate(pos, state, state, 3); - return String.valueOf(altarTier.toInt()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java deleted file mode 100644 index df8f3037..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class ItemArcaneAshes extends Item implements IVariantProvider { - public ItemArcaneAshes() { - setTranslationKey(BloodMagic.MODID + ".arcaneAshes"); - setMaxStackSize(1); - setMaxDamage(19); //Allows for 20 uses - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.arcaneAshes")); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos blockPos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - BlockPos newPos = blockPos.offset(side); - - if (world.isAirBlock(newPos)) { - if (!world.isRemote) { - Direction rotation = Direction.fromAngle(player.getRotationYawHead()); - world.setBlockState(newPos, RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getDefaultState()); - TileEntity tile = world.getTileEntity(newPos); - if (tile instanceof TileAlchemyArray) { - ((TileAlchemyArray) tile).setRotation(rotation); - } - - stack.damageItem(1, player); - } - - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - variants.put(0, "type=arcaneashes"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java deleted file mode 100644 index fb39ec76..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IBindable; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class ItemBindableBase extends Item implements IBindable { - public ItemBindableBase() { - super(); - - setCreativeTab(BloodMagic.TAB_BM); - setMaxStackSize(1); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).getFormattedText()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java deleted file mode 100644 index 7b15599a..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ /dev/null @@ -1,123 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.*; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemGroup; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.*; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; - -public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { - public ItemBloodOrb() { - setTranslationKey(BloodMagic.MODID + ".orb"); - this.setMaxDamage(0); - setHasSubtypes(true); - } - - @Override - public String getTranslationKey(ItemStack stack) { - BloodOrb orb = getOrb(stack); - if (orb == null) - return super.getTranslationKey(stack); - - return super.getTranslationKey(stack) + "." + orb.getName(); - } - - @Override - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (BloodOrb orb : RegistrarBloodMagic.BLOOD_ORBS) { - ItemStack orbStack = new ItemStack(this); - CompoundNBT tag = new CompoundNBT(); - tag.putString("orb", orb.getRegistryName().toString()); - orbStack.setTagCompound(tag); - list.add(orbStack); - } - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - BloodOrb orb = getOrb(stack); - - if (orb == null) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - if (world == null) - return super.onItemRightClick(world, player, hand); - - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - - if (PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - if (!stack.hasTagCompound()) - return super.onItemRightClick(world, player, hand); - - Binding binding = getBinding(stack); - if (binding == null) - return super.onItemRightClick(world, player, hand); - - if (world.isRemote) - return super.onItemRightClick(world, player, hand); - - SoulNetwork ownerNetwork = NetworkHelper.getSoulNetwork(binding); - if (binding.getOwnerId().equals(player.getGameProfile().getId())) - ownerNetwork.setOrbTier(orb.getTier()); - - ownerNetwork.add(SoulTicket.item(stack, world, player, 200), orb.getCapacity()); // Add LP to owner's network - ownerNetwork.hurtPlayer(player, 200); // Hurt whoever is using it - return super.onItemRightClick(world, player, hand); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.desc")); - - BloodOrb orb = getOrb(stack); - if (flag.isAdvanced() && orb != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getNamespace())); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public ItemStack getContainerItem(ItemStack stack) { - return stack.copy(); - } - - @Override - public boolean hasContainerItem(ItemStack stack) { - return true; - } - - // IBloodOrb - - @Nullable - @Override - public BloodOrb getOrb(ItemStack stack) { - if (!stack.hasTagCompound()) - return null; - - ResourceLocation id = new ResourceLocation(stack.getTagCompound().getString("orb")); - return RegistrarBloodMagic.BLOOD_ORBS.getValue(id); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java deleted file mode 100644 index 934a4efd..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ /dev/null @@ -1,112 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Set; -import java.util.function.Consumer; - -public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { - private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.PLANKS, Blocks.BOOKSHELF, Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK, Blocks.LADDER); - - public ItemBoundAxe() { - super("axe", 7, EFFECTIVE_ON); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - return true; - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { - return true; - } - - @Override - protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { - if (world.isRemote) - return; - - int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); - boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; - - int range = charge / 6; //Charge is a max of 30 - want 5 to be the max - - HashMultiset drops = HashMultiset.create(); - - BlockPos playerPos = player.getPosition(); - - for (int i = -range; i <= range; i++) { - for (int j = 0; j <= 2 * range; j++) { - for (int k = -range; k <= range; k++) { - BlockPos blockPos = playerPos.add(i, j, k); - BlockState blockState = world.getBlockState(blockPos); - - if (world.isAirBlock(blockPos)) - continue; - - if (blockState.getMaterial() != Material.WOOD && !EFFECTIVE_ON.contains(blockState.getBlock())) - continue; - - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockState, player); - if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) - continue; - - sharedHarvest(stack, world, player, blockPos, blockState, silkTouch, fortuneLvl); - } - } - } - - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); - world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.1F, false); - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot, ItemStack stack) { - Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 11 : 2, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -3.0, 0)); - } - return multimap; - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_axe"); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("active=true"); - variants.accept("active=false"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java deleted file mode 100644 index 9c648e11..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ /dev/null @@ -1,123 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Set; -import java.util.function.Consumer; - -public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { - private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.STONE_SLAB, Blocks.GOLDEN_RAIL, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, Blocks.LIT_REDSTONE_ORE, Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.RAIL, Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.STONE_SLAB); - - public ItemBoundPickaxe() { - super("pickaxe", 5, EFFECTIVE_ON); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - return true; - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { - return true; - } - - @Override - public boolean canHarvestBlock(BlockState blockIn) { - return blockIn == Blocks.OBSIDIAN ? this.toolMaterial.getHarvestLevel() == 3 - : (blockIn != Blocks.DIAMOND_BLOCK && blockIn != Blocks.DIAMOND_ORE ? (blockIn != Blocks.EMERALD_ORE && blockIn != Blocks.EMERALD_BLOCK ? (blockIn != Blocks.GOLD_BLOCK && blockIn != Blocks.GOLD_ORE ? (blockIn != Blocks.IRON_BLOCK && blockIn != Blocks.IRON_ORE ? (blockIn != Blocks.LAPIS_BLOCK && blockIn != Blocks.LAPIS_ORE ? (blockIn != Blocks.REDSTONE_ORE && blockIn != Blocks.LIT_REDSTONE_ORE ? (blockIn.getMaterial() == Material.ROCK || (blockIn.getMaterial() == Material.IRON || blockIn.getMaterial() == Material.ANVIL)) : this.toolMaterial.getHarvestLevel() >= 2) - : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - if (!getActivated(stack)) - return 1.0F; - - return state.getMaterial() != Material.IRON && state.getMaterial() != Material.ANVIL && state.getMaterial() != Material.ROCK ? super.getDestroySpeed(stack, state) : this.efficiency; - } - - @Override - protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { - if (world.isRemote) - return; - - int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); - boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; - - int range = (charge / 6); //Charge is a max of 30 - want 5 to be the max - - BlockPos playerPos = player.getPosition(); - - for (int i = -range; i <= range; i++) { - for (int j = 0; j <= 2 * range; j++) { - for (int k = -range; k <= range; k++) { - BlockPos blockPos = playerPos.add(i, j, k); - BlockState blockState = world.getBlockState(blockPos); - - if (world.isAirBlock(blockPos)) - continue; - - if (blockState.getMaterial() != Material.ROCK && !EFFECTIVE_ON.contains(blockState.getBlock())) - continue; - - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockState, player); - if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) - continue; - - sharedHarvest(stack, world, player, blockPos, blockState, silkTouch, fortuneLvl); - } - } - } - - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); - world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.5F, false); - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot, ItemStack stack) { - Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 5 : 2, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -2.5, 0)); - } - return multimap; - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_pickaxe"); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("active=true"); - variants.accept("active=false"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java deleted file mode 100644 index 1606f0e5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ /dev/null @@ -1,113 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.ItemStackWrapper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Set; -import java.util.function.Consumer; - -public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { - private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.CLAY, Blocks.DIRT, Blocks.FARMLAND, Blocks.GRASS, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.SNOW, Blocks.SNOW_LAYER, Blocks.SOUL_SAND); - - public ItemBoundShovel() { - super("shovel", 1, EFFECTIVE_ON); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - return true; - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { - return true; - } - - @Override - protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { - if (world.isRemote) - return; - int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); - boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; - - int range = charge / 6; //Charge is a max of 30 - want 5 to be the max - - HashMultiset drops = HashMultiset.create(); - - BlockPos playerPos = player.getPosition(); - - - for (int i = -range; i <= range; i++) { - for (int j = 0; j <= 2 * range; j++) { - for (int k = -range; k <= range; k++) { - BlockPos blockPos = playerPos.add(i, j, k); - BlockState blockState = world.getBlockState(blockPos); - - if (world.isAirBlock(blockPos)) - continue; - - Material material = blockState.getMaterial(); - if (material != Material.GROUND && material != Material.CLAY && material != Material.GRASS && !EFFECTIVE_ON.contains(blockState.getBlock())) - continue; - - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockState, player); - if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) - continue; - - sharedHarvest(stack, world, player, blockPos, blockState, silkTouch, fortuneLvl); - } - } - } - - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, (int) (charge * charge * charge / 2.7))); - world.createExplosion(player, playerPos.getX(), playerPos.getY(), playerPos.getZ(), 0.5F, false); - } - - @Override - public Multimap getItemAttributeModifiers(EquipmentSlotType equipmentSlot) { - Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", 5, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -2.5, 0)); - } - return multimap; - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_shovel"); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("active=true"); - variants.accept("active=false"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java deleted file mode 100644 index d3536283..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ /dev/null @@ -1,135 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.IActivatable; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemGroup; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; -import java.util.function.Consumer; - -public class ItemBoundSword extends SwordItem implements IBindable, IActivatable, IMeshProvider { - public ItemBoundSword() { - super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL); - - setTranslationKey(BloodMagic.MODID + ".bound.sword"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (player.isSneaking()) - setActivatedState(stack, !getActivated(stack)); - -// if (!player.isSneaking() && getActivated(stack)) -// { -// BoundToolEvent.Charge event = new BoundToolEvent.Charge(player, stack); -// if (MinecraftForge.EVENT_BUS.post(event)) -// return new ActionResult(EnumActionResult.FAIL, event.result); -// -// player.setActiveHand(hand); -// return new ActionResult(EnumActionResult.SUCCESS, stack); -// } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { - Binding binding = getBinding(stack); - if (binding == null) { - setActivatedState(stack, false); - return; - } - - if (entity instanceof PlayerEntity && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) - NetworkHelper.getSoulNetwork(binding).syphonAndDamage((PlayerEntity) entity, SoulTicket.item(stack, world, entity, 20)); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - return true; - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, BlockState block, BlockPos pos, LivingEntity entityLiving) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup tab, NonNullList subItems) { - if (!isInCreativeTab(tab)) - return; - - subItems.add(Utils.setUnbreakable(new ItemStack(this))); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - if (TextHelper.canTranslate("tooltip.bloodmagic.bound.sword.desc")) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.bound.sword.desc")); - - tooltip.add(TextHelper.localize("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated"))); - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - if (equipmentSlot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 8 : 2, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4, 0)); - } - return multimap; - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("bound_sword"); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("active=true"); - variants.accept("active=false"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java deleted file mode 100644 index 83bedf2d..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ /dev/null @@ -1,254 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.event.BoundToolEvent; -import WayofTime.bloodmagic.iface.IActivatable; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Multimap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.*; -import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.item.ToolItem; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.ItemHandlerHelper; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class ItemBoundTool extends ToolItem implements IBindable, IActivatable { - public final int chargeTime = 30; - protected final String tooltipBase; - private final String name; - public Map heldDownMap = new HashMap<>(); - public Map heldDownCountMap = new HashMap<>(); - - public ItemBoundTool(String name, float damage, Set effectiveBlocks) { - super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks); - setTranslationKey(BloodMagic.MODID + ".bound." + name); - setCreativeTab(BloodMagic.TAB_BM); - setHarvestLevel(name, 4); - - this.name = name; - this.tooltipBase = "tooltip.bloodmagic.bound." + name + "."; - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - return getActivated(stack) ? toolMaterial.getEfficiency() : 1.0F; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return slotChanged; - } - - @Override - public void getSubItems(ItemGroup tab, NonNullList subItems) { - if (!isInCreativeTab(tab)) - return; - - subItems.add(Utils.setUnbreakable(new ItemStack(this))); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { - Binding binding = getBinding(stack); - if (binding == null) { - setActivatedState(stack, false); - return; - } - - if (entity instanceof PlayerEntity && getActivated(stack) && isSelected && getBeingHeldDown(stack) && stack == ((PlayerEntity) entity).getActiveItemStack()) { - PlayerEntity player = (PlayerEntity) entity; - setHeldDownCount(stack, Math.min(player.getItemInUseCount(), chargeTime)); - } else if (!isSelected) { - setBeingHeldDown(stack, false); - } - - if (entity instanceof PlayerEntity && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) - NetworkHelper.getSoulNetwork(binding).syphonAndDamage((PlayerEntity) entity, SoulTicket.item(stack, world, entity, 20)); - } - - protected int getHeldDownCount(ItemStack stack) { - if (!heldDownCountMap.containsKey(stack)) - return 0; - - return heldDownCountMap.get(stack); - } - - protected void setHeldDownCount(ItemStack stack, int count) { - heldDownCountMap.put(stack, count); - } - - protected boolean getBeingHeldDown(ItemStack stack) { - if (!heldDownMap.containsKey(stack)) - return false; - - return heldDownMap.get(stack); - } - - protected void setBeingHeldDown(ItemStack stack, boolean heldDown) { - heldDownMap.put(stack, heldDown); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (player.isSneaking()) - setActivatedState(stack, !getActivated(stack)); - - if (!player.isSneaking() && getActivated(stack)) { - BoundToolEvent.Charge event = new BoundToolEvent.Charge(player, stack); - if (MinecraftForge.EVENT_BUS.post(event)) - return new ActionResult<>(ActionResultType.FAIL, event.result); - - player.setActiveHand(hand); - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public void onPlayerStoppedUsing(ItemStack stack, World worldIn, LivingEntity entityLiving, int timeLeft) { - if (entityLiving instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entityLiving; - if (!player.isSneaking() && getActivated(stack)) { - int i = this.getMaxItemUseDuration(stack) - timeLeft; - BoundToolEvent.Release event = new BoundToolEvent.Release(player, stack, i); - if (MinecraftForge.EVENT_BUS.post(event)) - return; - - i = event.charge; - - onBoundRelease(stack, worldIn, player, Math.min(i, chargeTime)); - setBeingHeldDown(stack, false); - } - } - } - - protected void onBoundRelease(ItemStack stack, World world, PlayerEntity player, int charge) { - - } - - @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity entityLiving) { - return stack; - } - - @Override - public int getMaxItemUseDuration(ItemStack stack) { - return 72000; - } - - @Override - public UseAction getItemUseAction(ItemStack stack) { - return UseAction.BOW; - } - - @Override - public int getItemEnchantability() { - return 50; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (TextHelper.canTranslate(tooltipBase + "desc")) - tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc")); - - tooltip.add(TextHelper.localize("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated"))); - - if (!stack.hasTagCompound()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public Set getToolClasses(ItemStack stack) { - return ImmutableSet.of(name); - } - - public Multimap getItemAttributeModifiers(EquipmentSlotType equipmentSlot) { - return ArrayListMultimap.create(); // No-op - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return getActivated(stack) && getBeingHeldDown(stack); - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - return ((double) -Math.min(getHeldDownCount(stack), chargeTime) / chargeTime) + 1; - } - - public String getTooltipBase() { - return tooltipBase; - } - - public String getName() { - return name; - } - - public Map getHeldDownMap() { - return heldDownMap; - } - - public Map getHeldDownCountMap() { - return heldDownCountMap; - } - - public int getChargeTime() { - return chargeTime; - } - - protected void sharedHarvest(ItemStack stack, World world, PlayerEntity player, BlockPos blockPos, BlockState blockState, boolean silkTouch, int fortuneLvl) { - - if (blockState.getBlockHardness(world, blockPos) != -1.0F) { - float strengthVsBlock = getDestroySpeed(stack, blockState); - - if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) { - if (!player.isCreative()) - if (silkTouch && blockState.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(Item.getItemFromBlock(blockState.getBlock()))); - else { - NonNullList itemDrops = NonNullList.create(); - blockState.getBlock().getDrops(itemDrops, world, blockPos, world.getBlockState(blockPos), fortuneLvl); - for (ItemStack stacks : itemDrops) - ItemHandlerHelper.giveItemToPlayer(player, stacks); - } - blockState.getBlock().removedByPlayer(world.getBlockState(blockPos), world, blockPos, player, false); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java deleted file mode 100644 index 3d4f6c19..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ /dev/null @@ -1,84 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.util.helper.PurificationHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.SoundCategory; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityRegistry; - -import javax.annotation.Nonnull; - -public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { - public ItemDaggerOfSacrifice() { - super(); - setTranslationKey(BloodMagic.MODID + ".daggerOfSacrifice"); - setCreativeTab(BloodMagic.TAB_BM); - setMaxStackSize(1); - setFull3D(); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - if (attacker instanceof FakePlayer) - return false; - - if (target == null || attacker == null || attacker.getEntityWorld().isRemote || (attacker instanceof PlayerEntity && !(attacker instanceof ServerPlayerEntity))) - return false; - - if (!target.isNonBoss()) - return false; - - if (target instanceof PlayerEntity) - return false; - - if (target.isChild() && !(target instanceof IMob)) - return false; - - if (target.isDead || target.getHealth() < 0.5F) - return false; - - EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass()); - if (entityEntry == null) - return false; - int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(entityEntry.getRegistryName(), 25); - - if (lifeEssenceRatio <= 0) - return false; - - int lifeEssence = (int) (lifeEssenceRatio * target.getHealth()); - if (target instanceof AnimalEntity) { - lifeEssence = (int) (lifeEssence * (1 + PurificationHelper.getCurrentPurity((AnimalEntity) target))); - } - - if (target.isChild()) { - lifeEssence *= 0.5F; - } - - if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) { - target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); - target.setHealth(-1); - target.onDeath(DamageSourceBloodMagic.INSTANCE); - } - - return false; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java deleted file mode 100644 index 4e62706e..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ /dev/null @@ -1,45 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDiscreteDemonWill; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.MathHelper; - -public class ItemDemonCrystal extends ItemEnum.Variant implements IDiscreteDemonWill { - - public ItemDemonCrystal() { - super(EnumDemonWillType.class, "demonCrystal"); - - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public double getWill(ItemStack willStack) { - return getDiscretization(willStack) * willStack.getCount(); - } - - @Override - public double drainWill(ItemStack willStack, double drainAmount) { - double discretization = getDiscretization(willStack); - int drainedNumber = (int) Math.floor(Math.min(willStack.getCount() * discretization, drainAmount) / discretization); - - if (drainedNumber > 0) { - willStack.shrink(drainedNumber); - return drainedNumber * discretization; - } - - return 0; - } - - @Override - public double getDiscretization(ItemStack willStack) { - return 50; - } - - @Override - public EnumDemonWillType getType(ItemStack willStack) { - return EnumDemonWillType.values()[MathHelper.clamp(willStack.getMetadata(), 0, EnumDemonWillType.values().length - 1)]; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java deleted file mode 100644 index e26e7d49..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ /dev/null @@ -1,47 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.iface.IDemonWillViewer; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; - -public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemonWillViewer { - public ItemDemonWillGauge() { - setTranslationKey(BloodMagic.MODID + ".willGauge"); - setMaxStackSize(1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.willGauge")))); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=willgauge"); - } - - @Override - public boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player) { - return true; - } - - @Override - public int getDemonWillAuraResolution(World world, ItemStack stack, PlayerEntity player) { - return 100; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java deleted file mode 100644 index bec6de84..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ /dev/null @@ -1,60 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.types.ISubItem; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class ItemEnum & ISubItem> extends Item { - - protected final T[] types; - - public ItemEnum(Class enumClass, String baseName) { - super(); - - this.types = enumClass.getEnumConstants(); - - setTranslationKey(BloodMagic.MODID + "." + baseName); - setHasSubtypes(types.length > 1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + "." + getItemType(stack).getInternalName(); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup tab, NonNullList subItems) { - if (!isInCreativeTab(tab)) - return; - - for (T type : types) - subItems.add(new ItemStack(this, 1, type.ordinal())); - } - - public T getItemType(ItemStack stack) { - return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length - 1)]; - } - - public static class Variant & ISubItem> extends ItemEnum implements IVariantProvider { - - public Variant(Class enumClass, String baseName) { - super(enumClass, baseName); - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - for (int i = 0; i < types.length; i++) - variants.put(i, "type=" + types[i].getInternalName()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java deleted file mode 100644 index 426c4679..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ /dev/null @@ -1,184 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; - -public class ItemExperienceBook extends Item implements IVariantProvider { - public ItemExperienceBook() { - setTranslationKey(BloodMagic.MODID + ".experienceTome"); - setMaxStackSize(1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.experienceTome")); - - if (!stack.hasTagCompound()) - return; - - double storedExp = getStoredExperience(stack); - - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.experienceTome.exp", (int) storedExp)); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.experienceTome.expLevel", (int) getLevelForExperience(storedExp))); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote) { - if (player.isSneaking()) - absorbOneLevelExpFromPlayer(stack, player); - else - giveOneLevelExpToPlayer(stack, player); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=experiencetome"); - } - - public void giveOneLevelExpToPlayer(ItemStack stack, PlayerEntity player) { - float progress = player.experience; - int expToNext = getExperienceForNextLevel(player.experienceLevel); - - int neededExp = (int) Math.ceil((1 - progress) * expToNext); - float containedExp = (float) getStoredExperience(stack); - - BMLog.DEBUG.info("Needed: " + neededExp + ", contained: " + containedExp + ", exp to next: " + expToNext); - - if (containedExp >= neededExp) { - setStoredExperience(stack, containedExp - neededExp); - addPlayerXP(player, neededExp); - - if (player.experienceLevel % 5 == 0) { - float f = player.experienceLevel > 30 ? 1.0F : (float) player.experienceLevel / 30.0F; - player.getEntityWorld().playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_LEVELUP, player.getSoundCategory(), f * 0.75F, 1.0F); - } - } else { - setStoredExperience(stack, 0); - addPlayerXP(player, (int) containedExp); - } - } - - public void absorbOneLevelExpFromPlayer(ItemStack stack, PlayerEntity player) { - float progress = player.experience; - - if (progress > 0) { - int expDeduction = (int) getExperienceAcquiredToNext(player); - if (expDeduction > 0) { - addPlayerXP(player, -expDeduction); - addExperience(stack, expDeduction); - } - } else if (progress == 0 && player.experienceLevel > 0) { - int expDeduction = getExperienceForNextLevel(player.experienceLevel - 1); - addPlayerXP(player, -expDeduction); - addExperience(stack, expDeduction); - } - } - - // Credits to Ender IO for some of the experience code, although now modified slightly for my convenience. - public static int getPlayerXP(PlayerEntity player) { - return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap())); - } - - public static void addPlayerXP(PlayerEntity player, int amount) { - int experience = Math.max(0, getPlayerXP(player) + amount); - player.experienceTotal = experience; - player.experienceLevel = getLevelForExperience(experience); - int expForLevel = getExperienceForLevel(player.experienceLevel); - player.experience = (float) (experience - expForLevel) / (float) player.xpBarCap(); - } - - public static void setStoredExperience(ItemStack stack, double exp) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("experience", exp); - } - - public static double getStoredExperience(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - return tag.getDouble("experience"); - } - - public static void addExperience(ItemStack stack, double exp) { - setStoredExperience(stack, getStoredExperience(stack) + exp); - } - - public static int getExperienceForNextLevel(int currentLevel) { - if (currentLevel < 16) { - return 2 * currentLevel + 7; - } else if (currentLevel < 31) { - return 5 * currentLevel - 38; - } else { - return 9 * currentLevel - 158; - } - } - - //TODO: Change to calculation form. - public static int getExperienceForLevel(int level) { - if (level >= 21863) { - return Integer.MAX_VALUE; - } - if (level == 0) { - return 0; - } - int res = 0; - for (int i = 0; i < level; i++) { - res += getExperienceForNextLevel(i); - } - return res; - } - - public static double getExperienceAcquiredToNext(PlayerEntity player) { - return player.experience * player.xpBarCap(); - } - - public static int getLevelForExperience(double exp) { - if (exp <= 352) { - return (int) Math.floor(solveParabola(1, 6, -exp)); - } else if (exp <= 1507) { - return (int) Math.floor(solveParabola(2.5, -40.5, 360 - exp)); - } else { - return (int) Math.floor(solveParabola(4.5, -162.5, 2220 - exp)); - } - } - - public static double solveParabola(double a, double b, double c) { - return (-b + Math.sqrt(b * b - 4 * a * c)) / (2 * a); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java deleted file mode 100644 index fda68ca5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ /dev/null @@ -1,108 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.block.BlockRitualStone; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemGroup; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Arrays; -import java.util.List; - -public class ItemInscriptionTool extends ItemEnum.Variant implements IBindable { - - public ItemInscriptionTool() { - super(EnumRuneType.class, "scribe"); - - setMaxStackSize(1); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (EnumRuneType runeType : types) { - if (runeType == EnumRuneType.BLANK || !ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && runeType == EnumRuneType.DAWN) - continue; - - ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); - CompoundNBT tag = new CompoundNBT(); - tag.putInt(Constants.NBT.USES, 10); - stack.setTagCompound(tag); - list.add(stack); - } - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - BlockState state = world.getBlockState(pos); - - if (state.getBlock() instanceof BlockRitualStone && !((BlockRitualStone) state.getBlock()).isRuneType(world, pos, getItemType(stack))) { - stack = NBTHelper.checkNBT(stack); - int uses = stack.getTagCompound().getInteger(Constants.NBT.USES); - - world.setBlockState(pos, state.withProperty(((BlockRitualStone) state.getBlock()).getProperty(), getItemType(stack))); - if (!player.capabilities.isCreativeMode) { - stack.getTagCompound().setInteger(Constants.NBT.USES, --uses); - if (uses <= 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); - } - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return stack.hasTagCompound(); - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - int uses = stack.getTagCompound().getInteger(Constants.NBT.USES); - - return 1.0 - ((double) uses / (double) 10); - } - - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - int uses = stack.getTagCompound().getInteger(Constants.NBT.USES); - - return MathHelper.hsvToRGB(Math.max(0.0F, (float) (uses) / 10) / 3.0F, 1.0F, 1.0F); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc")))); - - if (!stack.hasTagCompound()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java deleted file mode 100644 index 78ad52d6..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ /dev/null @@ -1,109 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.*; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.INBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -// TODO: Make some hook somewhere that attaches the pos to the ticket otherwise the tickets are basically useless lmao -public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvider { - - public ItemLavaCrystal() { - super(); - setTranslationKey(BloodMagic.MODID + ".lavaCrystal"); - } - - @Override - public ItemStack getContainerItem(ItemStack stack) { - Binding binding = getBinding(stack); - if (binding != null) - NetworkHelper.getSoulNetwork(binding.getOwnerId()).syphon(SoulTicket.item(stack, 25)); - - ItemStack returnStack = new ItemStack(this); - returnStack.setTagCompound(stack.getTagCompound()); - return returnStack; - } - - @Override - public boolean hasContainerItem(ItemStack stack) { - return true; - } - - @Override - public int getItemBurnTime(ItemStack stack) { - Binding binding = getBinding(stack); - if (binding == null) - return -1; - - if (NetworkHelper.syphonFromContainer(stack, SoulTicket.item(stack, 25))) - return 200; - else { - PlayerEntity player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); - if (player != null) - player.addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); - } - - return -1; - } - - @Nullable - @Override - public Binding getBinding(ItemStack stack) { - if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags - return null; - - INBT bindingTag = stack.getTagCompound().getTag("binding"); - if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. - return null; - - CompoundNBT nbt = (CompoundNBT) bindingTag; - return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompound("id")), nbt.getString("name")); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World worldIn, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - pos = pos.offset(facing); - ItemStack itemstack = player.getHeldItem(hand); - - if (!player.canPlayerEdit(pos, facing, itemstack)) - return ActionResultType.FAIL; - - if (worldIn.isAirBlock(pos) && NetworkHelper.getSoulNetwork(getBinding(player.getHeldItem(hand))).syphonAndDamage(player, SoulTicket.item(player.getHeldItem(hand), 100)).isSuccess()) { - worldIn.playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - worldIn.setBlockState(pos, Blocks.FIRE.getDefaultState(), 11); - } else - return ActionResultType.FAIL; - - if (player instanceof ServerPlayerEntity) - CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, itemstack); - - return ActionResultType.SUCCESS; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java deleted file mode 100644 index b97c9313..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ /dev/null @@ -1,133 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.UseAction; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionUtils; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; -import java.util.function.Consumer; - -public class ItemPotionFlask extends Item implements IMeshProvider { - public ItemPotionFlask() { - setTranslationKey(BloodMagic.MODID + ".potionFlask"); - setCreativeTab(BloodMagic.TAB_BM); - setMaxStackSize(1); - setMaxDamage(8); - setNoRepair(); - } - - @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity entityLiving) { - PlayerEntity player = entityLiving instanceof PlayerEntity ? (PlayerEntity) entityLiving : null; - - int remainingUses = stack.getMaxDamage() - stack.getItemDamage(); - if (remainingUses <= 0) { - NBTHelper.checkNBT(stack); - stack.getTagCompound().setBoolean("empty", true); - return stack; - } - - if (player == null || !player.capabilities.isCreativeMode) { - stack.setItemDamage(stack.getItemDamage() + 1); - } - - if (!world.isRemote) { - for (EffectInstance potioneffect : PotionUtils.getEffectsFromStack(stack)) { - entityLiving.addPotionEffect(new EffectInstance(potioneffect)); - } - } - - return stack; - } - - @Override - public int getMaxItemUseDuration(ItemStack stack) { - return 32; - } - - @Override - public UseAction getItemUseAction(ItemStack stack) { - return UseAction.DRINK; - } - - @Override - public boolean isDamaged(ItemStack stack) { - return false; - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - int remainingUses = stack.getMaxDamage() - stack.getItemDamage(); - if (remainingUses > 0 || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("empty")) - return ActionResultType.PASS; - - RayTraceResult trace = rayTrace(world, player, true); - - if (trace.typeOfHit == RayTraceResult.Type.BLOCK && world.getBlockState(trace.getBlockPos()).getMaterial() == Material.WATER) { - world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.NEUTRAL, 1.0F, 1.0F); - player.setHeldItem(hand, new ItemStack(this)); - return ActionResultType.SUCCESS; - } - - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - int remainingUses = stack.getMaxDamage() - stack.getItemDamage(); - if (remainingUses <= 0) { - NBTHelper.checkNBT(stack); - stack.getTagCompound().setBoolean("empty", true); - return new ActionResult<>(ActionResultType.PASS, stack); - } - player.setActiveHand(hand); - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - PotionUtils.addPotionTooltip(stack, tooltip, 1.0F); - tooltip.add(""); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.potion.uses", stack.getMaxDamage() - stack.getItemDamage())); - } - - - @SideOnly(Side.CLIENT) - @Override - public ItemMeshDefinition getMeshDefinition() { - return stack -> { - boolean full = true; - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty")) - full = false; - return new ModelResourceLocation(getRegistryName(), "full=" + full); - }; - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("full=true"); - variants.accept("full=false"); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java deleted file mode 100644 index af90c890..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java +++ /dev/null @@ -1,78 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.block.BlockRitualStone; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.RitualHelper; -import com.google.common.collect.Lists; -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; - -import java.util.List; - -public class ItemRitualDismantler extends Item implements IVariantProvider { - public ItemRitualDismantler() { - setTranslationKey(BloodMagic.MODID + ".ritualDismantler"); - setCreativeTab(BloodMagic.TAB_BM); - setMaxStackSize(1); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - Block block = world.getBlockState(pos).getBlock(); - TileEntity tileEntity = world.getTileEntity(pos); - ItemStack stack = player.getHeldItem(hand); - - if (tileEntity instanceof TileMasterRitualStone) { - TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tileEntity; - Direction direction = masterRitualStone.getDirection(); - - String ritualName = RitualHelper.getValidRitual(world, pos); - masterRitualStone.setActive(false); - - if (ritualName.equals("")) { - world.setBlockToAir(pos); - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER)); - NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 100)); - return ActionResultType.SUCCESS; - } - - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualName); - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent component : components) { - BlockPos newPos = pos.add(component.getOffset(direction)); - if (world.getBlockState(newPos).getBlock() instanceof BlockRitualStone) { - world.setBlockToAir(newPos); - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); - } - } - - NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 200)); // smallest Ritual has 4 stones - return ActionResultType.SUCCESS; - - } else if (player.isSneaking() && block instanceof BlockRitualStone) { - block.removedByPlayer(world.getBlockState(pos), world, pos, player, false); - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE)); - NetworkHelper.getSoulNetwork(player).syphon(SoulTicket.item(stack, 50)); - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java deleted file mode 100644 index bb914f7e..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ /dev/null @@ -1,517 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.handler.event.ClientHandler; -import WayofTime.bloodmagic.util.helper.RitualHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; -import com.google.common.collect.Lists; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Item; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Keyboard; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -public class ItemRitualDiviner extends Item implements IVariantProvider { - public static final String tooltipBase = "tooltip.bloodmagic.diviner."; - public static String[] names = {"normal", "dusk", "dawn"}; - - public ItemRitualDiviner() { - setTranslationKey(BloodMagic.MODID + ".ritualDiviner"); - setCreativeTab(BloodMagic.TAB_BM); - setHasSubtypes(true); - setMaxStackSize(1); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[stack.getItemDamage()]; - } - - @Override - public String getHighlightTip(ItemStack stack, String displayName) { - if (Strings.isNullOrEmpty(getCurrentRitual(stack))) - return displayName; - - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(getCurrentRitual(stack)); - if (ritual == null) - return displayName; - - return displayName + ": " + TextHelper.localize(ritual.getTranslationKey()); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (player.isSneaking()) { - if (world.isRemote) { - trySetDisplayedRitual(stack, world, pos); - } - - return ActionResultType.SUCCESS; - } else if (addRuneToRitual(stack, world, pos, player)) { - if (world.isRemote) { - spawnParticles(world, pos.up(), 15); - } - - return ActionResultType.SUCCESS; - // TODO: Have the diviner automagically build the ritual - } - - return ActionResultType.PASS; - } - - /** - * Adds a single rune to the ritual. - * - * @param stack - The Ritual Diviner stack - * @param world - The World - * @param pos - Block Position of the MRS. - * @param player - The Player attempting to place the ritual - * @return - True if a rune was successfully added - */ - public boolean addRuneToRitual(ItemStack stack, World world, BlockPos pos, PlayerEntity player) { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); - if (ritual != null) { - Direction direction = getDirection(stack); - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent component : components) { - if (!canPlaceRitualStone(component.getRuneType(), stack)) { - return false; - } - BlockPos offset = component.getOffset(direction); - BlockPos newPos = pos.add(offset); - BlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - if (RitualHelper.isRune(world, newPos)) { - if (RitualHelper.isRuneType(world, newPos, component.getRuneType())) { - if (world.isRemote) { - undisplayHologram(); - } - } else { - // Replace existing ritual stone - RitualHelper.setRuneType(world, newPos, component.getRuneType()); - return true; - } - } else if (block.isAir(state, world, newPos) || block.isReplaceable(world, newPos)) { - if (!consumeStone(stack, world, player)) { - return false; - } - int meta = component.getRuneType().ordinal(); - BlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); - world.setBlockState(newPos, newState); - return true; - } else { - return false; // TODO: Possibly replace the block with a - // ritual stone - } - } - } - } - - return false; - } - - @SideOnly(Side.CLIENT) - public void trySetDisplayedRitual(ItemStack itemStack, World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(itemStack)); - TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tile; - - if (ritual != null) { - Direction direction = getDirection(itemStack); - ClientHandler.setRitualHolo(masterRitualStone, ritual, direction, true); - } - } - } - - @SideOnly(Side.CLIENT) - public void undisplayHologram() { - ClientHandler.setRitualHoloToNull(); - } - - // TODO: Make this work for any IRitualStone - public boolean consumeStone(ItemStack stack, World world, PlayerEntity player) { - if (player.capabilities.isCreativeMode) { - return true; - } - - NonNullList inventory = player.inventory.mainInventory; - for (ItemStack newStack : inventory) { - if (newStack.isEmpty()) { - - continue; - } - Item item = newStack.getItem(); - if (item instanceof BlockItem) { - Block block = ((BlockItem) item).getBlock(); - if (block == RegistrarBloodMagicBlocks.RITUAL_STONE) { - newStack.shrink(1); - return true; - } - } - } - - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); - if (ritual != null) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual", TextHelper.localize(ritual.getTranslationKey()))); - - boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); - boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); - - if (extraInfo) { - tooltip.add(""); - - for (EnumDemonWillType type : EnumDemonWillType.values()) { - if (TextHelper.canTranslate(ritual.getTranslationKey() + "." + type.getName().toLowerCase() + ".info")) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getTranslationKey() + "." + type.getName().toLowerCase() + ".info")))); - } - } - } else if (sneaking) { - tooltip.add(TextHelper.localize(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).getName()))); - tooltip.add(""); - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - int blankRunes = 0; - int airRunes = 0; - int waterRunes = 0; - int fireRunes = 0; - int earthRunes = 0; - int duskRunes = 0; - int dawnRunes = 0; - int totalRunes = components.size(); - - for (RitualComponent component : components) { - switch (component.getRuneType()) { - case BLANK: - blankRunes++; - break; - case AIR: - airRunes++; - break; - case EARTH: - earthRunes++; - break; - case FIRE: - fireRunes++; - break; - case WATER: - waterRunes++; - break; - case DUSK: - duskRunes++; - break; - case DAWN: - dawnRunes++; - break; - } - } - - if (blankRunes > 0) - tooltip.add(EnumRuneType.BLANK.colorCode + TextHelper.localize(tooltipBase + "blankRune", blankRunes)); - if (waterRunes > 0) - tooltip.add(EnumRuneType.WATER.colorCode + TextHelper.localize(tooltipBase + "waterRune", waterRunes)); - if (airRunes > 0) - tooltip.add(EnumRuneType.AIR.colorCode + TextHelper.localize(tooltipBase + "airRune", airRunes)); - if (fireRunes > 0) - tooltip.add(EnumRuneType.FIRE.colorCode + TextHelper.localize(tooltipBase + "fireRune", fireRunes)); - if (earthRunes > 0) - tooltip.add(EnumRuneType.EARTH.colorCode + TextHelper.localize(tooltipBase + "earthRune", earthRunes)); - if (duskRunes > 0) - tooltip.add(EnumRuneType.DUSK.colorCode + TextHelper.localize(tooltipBase + "duskRune", duskRunes)); - if (dawnRunes > 0) - tooltip.add(EnumRuneType.DAWN.colorCode + TextHelper.localize(tooltipBase + "dawnRune", dawnRunes)); - - tooltip.add(""); - tooltip.add(TextHelper.localize(tooltipBase + "totalRune", totalRunes)); - } else { - tooltip.add(""); - if (TextHelper.canTranslate(ritual.getTranslationKey() + ".info")) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getTranslationKey() + ".info")))); - tooltip.add(""); - } - - tooltip.add(TextHelper.localizeEffect(tooltipBase + "extraInfo")); - tooltip.add(TextHelper.localizeEffect(tooltipBase + "extraExtraInfo")); - } - } - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - RayTraceResult ray = this.rayTrace(world, player, false); - if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return new ActionResult<>(ActionResultType.PASS, stack); - } - - if (player.isSneaking()) { - if (!world.isRemote) { - cycleRitual(stack, player, false); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - return new ActionResult<>(ActionResultType.PASS, stack); - } - - @Override - public boolean onEntitySwing(LivingEntity entityLiving, ItemStack stack) { - if (!entityLiving.world.isRemote && entityLiving instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entityLiving; - - RayTraceResult ray = this.rayTrace(player.getEntityWorld(), player, false); - if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return false; - } - - if (!player.isSwingInProgress) { - if (player.isSneaking()) { - cycleRitual(stack, player, true); - } else { - cycleDirection(stack, player); - } - } - } - - return false; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=basic"); - variants.put(1, "type=dusk"); - variants.put(2, "type=dawn"); - } - - public void cycleDirection(ItemStack stack, PlayerEntity player) { - Direction direction = getDirection(stack); - Direction newDirection; - switch (direction) { - case NORTH: - newDirection = Direction.EAST; - break; - case EAST: - newDirection = Direction.SOUTH; - break; - case SOUTH: - newDirection = Direction.WEST; - break; - case WEST: - newDirection = Direction.NORTH; - break; - default: - newDirection = Direction.NORTH; - } - - setDirection(stack, newDirection); - notifyDirectionChange(newDirection, player); - } - - public void notifyDirectionChange(Direction direction, PlayerEntity player) { - player.sendStatusMessage(new TranslationTextComponent(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.name())), true); - } - - public void setDirection(ItemStack stack, Direction direction) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTagCompound(); - - tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); - } - - public Direction getDirection(ItemStack stack) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - return Direction.NORTH; - } - - CompoundNBT tag = stack.getTagCompound(); - - int dir = tag.getInt(Constants.NBT.DIRECTION); - if (dir == 0) { - return Direction.NORTH; - } - - return Direction.VALUES[tag.getInt(Constants.NBT.DIRECTION)]; - } - - /** - * Cycles the ritual forward or backward - */ - public void cycleRitual(ItemStack stack, PlayerEntity player, boolean reverse) { - String key = getCurrentRitual(stack); - List rituals = BloodMagic.RITUAL_MANAGER.getSortedRituals(); - if (reverse) - Collections.reverse(rituals = Lists.newArrayList(rituals)); - - String firstId = ""; - boolean foundId = false; - boolean foundFirst = false; - - for (Ritual ritual : rituals) { - String id = BloodMagic.RITUAL_MANAGER.getId(ritual); - - if (!BloodMagic.RITUAL_MANAGER.enabled(id, false) || !canDivinerPerformRitual(stack, ritual)) { - continue; - } - - if (!foundFirst) { - firstId = id; - foundFirst = true; - } - - if (foundId) { - setCurrentRitual(stack, id); - notifyRitualChange(id, player); - return; - } else if (id.equals(key)) { - foundId = true; - } - } - - if (foundFirst) { - setCurrentRitual(stack, firstId); - notifyRitualChange(firstId, player); - } - } - - public boolean canDivinerPerformRitual(ItemStack stack, Ritual ritual) { - if (ritual == null) { - return false; - } - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent component : components) { - if (!canPlaceRitualStone(component.getRuneType(), stack)) { - return false; - } - } - - return true; - } - - public void notifyRitualChange(String key, PlayerEntity player) { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); - if (ritual != null) { - player.sendStatusMessage(new TranslationTextComponent(ritual.getTranslationKey()), true); - } - } - - public void setCurrentRitual(ItemStack stack, String key) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString("current_ritual", key); - } - - public String getCurrentRitual(ItemStack stack) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTagCompound(); - return tag.getString("current_ritual"); - } - - public boolean canPlaceRitualStone(EnumRuneType rune, ItemStack stack) { - int meta = stack.getItemDamage(); - switch (rune) { - case BLANK: - case AIR: - case EARTH: - case FIRE: - case WATER: - return true; - case DUSK: - return meta >= 1; - case DAWN: - return meta >= 2; - } - - return false; - } - - public static void spawnParticles(World worldIn, BlockPos pos, int amount) { - BlockState state = worldIn.getBlockState(pos); - Block block = worldIn.getBlockState(pos).getBlock(); - - if (block.isAir(state, worldIn, pos)) { - for (int i = 0; i < amount; ++i) { - double d0 = itemRand.nextGaussian() * 0.02D; - double d1 = itemRand.nextGaussian() * 0.02D; - double d2 = itemRand.nextGaussian() * 0.02D; - worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat(), (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2); - } - } else { - for (int i1 = 0; i1 < amount; ++i1) { - double d0 = itemRand.nextGaussian() * 0.02D; - double d1 = itemRand.nextGaussian() * 0.02D; - double d2 = itemRand.nextGaussian() * 0.02D; - worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat() * 1.0f, (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java deleted file mode 100644 index 9888fad3..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ /dev/null @@ -1,280 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.ritual.EnumRitualReaderState; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Keyboard; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class ItemRitualReader extends Item implements IVariantProvider { - public static final String tooltipBase = "tooltip.bloodmagic.ritualReader."; - - public ItemRitualReader() { - super(); - setTranslationKey(BloodMagic.MODID + ".ritualReader"); - setMaxStackSize(1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag tooltipFlag) { - if (!stack.hasTagCompound()) - return; - - EnumRitualReaderState state = this.getState(stack); - tooltip.add(TextHelper.localizeEffect(tooltipBase + "currentState", TextHelper.localizeEffect(tooltipBase + state.toString().toLowerCase()))); - - tooltip.add(""); - - boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); - - if (sneaking) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(tooltipBase + "desc." + state.toString().toLowerCase())))); - } else { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.extraInfo")); - } - - super.addInformation(stack, world, tooltip, tooltipFlag); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - RayTraceResult ray = this.rayTrace(world, player, false); - if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) { - return new ActionResult<>(ActionResultType.PASS, stack); - } - - if (player.isSneaking()) { - if (!world.isRemote) { - cycleReader(stack, player); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - return new ActionResult<>(ActionResultType.PASS, stack); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote) { - EnumRitualReaderState state = this.getState(stack); - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof IMasterRitualStone) { - IMasterRitualStone master = (IMasterRitualStone) tile; - if (master.getCurrentRitual() == null) - super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - this.setMasterBlockPos(stack, pos); - this.setBlockPos(stack, BlockPos.ORIGIN); - - switch (state) { - case INFORMATION: - master.provideInformationOfRitualToPlayer(player); - - break; - case SET_AREA: - if (player.isSneaking() && player.getHeldItem(Hand.OFF_HAND).getItem() instanceof ItemBloodOrb) { - Ritual ritual = master.getCurrentRitual(); - for (String range : ritual.getListOfRanges()) { - AreaDescriptor aabb = ritual.getBlockRange(range); - master.setBlockRange(range, aabb); - } - break; - } - - String range = this.getCurrentBlockRange(stack); - - if (range == null || range.isEmpty() || player.isSneaking()) { - String newRange = master.getNextBlockRange(range); - range = newRange; - this.setCurrentBlockRange(stack, newRange); - } - - master.provideInformationOfRangeToPlayer(player, range); - break; - case SET_WILL_TYPES: - List typeList = new ArrayList<>(); - NonNullList inv = player.inventory.mainInventory; - for (int i = 0; i < 9; i++) { - ItemStack testStack = inv.get(i); - if (testStack.isEmpty()) { - continue; - } - - if (testStack.getItem() instanceof IDiscreteDemonWill) { - EnumDemonWillType type = ((IDiscreteDemonWill) testStack.getItem()).getType(testStack); - if (!typeList.contains(type)) { - typeList.add(type); - } - } - } - - master.setActiveWillConfig(player, typeList); - master.provideInformationOfWillConfigToPlayer(player, typeList); - break; - } - - return ActionResultType.FAIL; - } else { - if (state == EnumRitualReaderState.SET_AREA) { - BlockPos masterPos = this.getMasterBlockPos(stack); - if (!masterPos.equals(BlockPos.ORIGIN)) { - BlockPos containedPos = getBlockPos(stack); - if (containedPos.equals(BlockPos.ORIGIN)) { - BlockPos pos1 = pos.subtract(masterPos); - this.setBlockPos(stack, pos1); - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.firstBlock"), true); - } else { - tile = world.getTileEntity(masterPos); - if (tile instanceof IMasterRitualStone) { - IMasterRitualStone master = (IMasterRitualStone) tile; - BlockPos pos2 = pos.subtract(masterPos); - String range = this.getCurrentBlockRange(stack); - if (range == null || range.isEmpty()) { - String newRange = master.getNextBlockRange(range); - range = newRange; - this.setCurrentBlockRange(stack, newRange); - } - Ritual ritual = master.getCurrentRitual(); - - int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, null, null); - int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, null, null); - int maxVolume = ritual.getMaxVolumeForRange(range, null, null); - - switch (master.setBlockRangeByBounds(player, range, containedPos, pos2)) { - case SUCCESS: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.success"), true); - break; - case NOT_WITHIN_BOUNDARIES: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVerticalRange, maxHorizontalRange), false); - break; - case VOLUME_TOO_LARGE: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume), false); - break; - default: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"), false); - break; - } - } - this.setBlockPos(stack, BlockPos.ORIGIN); - } - } - } - } - } - - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - } - - public BlockPos getBlockPos(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return new BlockPos(stack.getTagCompound().getInteger(Constants.NBT.X_COORD), stack.getTagCompound().getInteger(Constants.NBT.Y_COORD), stack.getTagCompound().getInteger(Constants.NBT.Z_COORD)); - } - - public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { - stack = NBTHelper.checkNBT(stack); - CompoundNBT itemTag = stack.getTagCompound(); - itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); - itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - return stack; - } - - public BlockPos getMasterBlockPos(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return new BlockPos(stack.getTagCompound().getInteger(Constants.NBT.X_COORD + "master"), stack.getTagCompound().getInteger(Constants.NBT.Y_COORD + "master"), stack.getTagCompound().getInteger(Constants.NBT.Z_COORD + "master")); - } - - public ItemStack setMasterBlockPos(ItemStack stack, BlockPos pos) { - stack = NBTHelper.checkNBT(stack); - CompoundNBT itemTag = stack.getTagCompound(); - itemTag.putInt(Constants.NBT.X_COORD + "master", pos.getX()); - itemTag.putInt(Constants.NBT.Y_COORD + "master", pos.getY()); - itemTag.putInt(Constants.NBT.Z_COORD + "master", pos.getZ()); - return stack; - } - - public String getCurrentBlockRange(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - return tag.getString("range"); - } - - public void setCurrentBlockRange(ItemStack stack, String range) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString("range", range); - } - - public void cycleReader(ItemStack stack, PlayerEntity player) { - EnumRitualReaderState prevState = getState(stack); - int val = prevState.ordinal(); - int nextVal = val + 1 >= EnumRitualReaderState.values().length ? 0 : val + 1; - EnumRitualReaderState nextState = EnumRitualReaderState.values()[nextVal]; - - setState(stack, nextState); - notifyPlayerOfStateChange(nextState, player); - } - - public void notifyPlayerOfStateChange(EnumRitualReaderState state, PlayerEntity player) { - ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + "currentState", new TranslationTextComponent(tooltipBase + state.toString().toLowerCase()))); - } - - public void setState(ItemStack stack, EnumRitualReaderState state) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putInt(Constants.NBT.RITUAL_READER, state.ordinal()); - } - - public EnumRitualReaderState getState(ItemStack stack) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - return EnumRitualReaderState.INFORMATION; - } - - CompoundNBT tag = stack.getTagCompound(); - - return EnumRitualReaderState.values()[tag.getInt(Constants.NBT.RITUAL_READER)]; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java deleted file mode 100644 index 657724c0..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ /dev/null @@ -1,205 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.*; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.UseAction; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.function.Consumer; - -public class ItemSacrificialDagger extends ItemEnum implements IMeshProvider { - - public ItemSacrificialDagger() { - super(DaggerType.class, "sacrificial_dagger"); - - setHasSubtypes(true); - setMaxStackSize(1); - setFull3D(); - } - - @Override - public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { - list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.desc")))); - - if (stack.getItemDamage() == 1) - list.add(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.creative")); - } - - @Override - public void onPlayerStoppedUsing(ItemStack stack, World worldIn, LivingEntity entityLiving, int timeLeft) { - if (entityLiving instanceof PlayerEntity && !entityLiving.getEntityWorld().isRemote) - if (PlayerSacrificeHelper.sacrificePlayerHealth((PlayerEntity) entityLiving)) - IncenseHelper.setHasMaxIncense(stack, (PlayerEntity) entityLiving, false); - } - - @Override - public int getMaxItemUseDuration(ItemStack stack) { - return 72000; - } - - @Override - public UseAction getItemUseAction(ItemStack stack) { - return UseAction.BOW; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - if (this.canUseForSacrifice(stack)) { - player.setActiveHand(hand); - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; - - RayTraceResult rayTrace = rayTrace(world, player, false); - if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); - - if (tile != null && tile instanceof TileAltar && stack.getItemDamage() == 1) - lpAdded = ((TileAltar) tile).getCapacity(); - } - - if (!player.capabilities.isCreativeMode) { - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2, lpAdded); - if (MinecraftForge.EVENT_BUS.post(evt)) - return super.onItemRightClick(world, player, hand); - - if (evt.shouldDrainHealth) { - DamageSourceBloodMagic damageSrc = DamageSourceBloodMagic.INSTANCE; - player.hurtResistantTime = 0; - float playerHealth = player.getHealth(); - if (Math.ceil(player.getHealth() - 2) <= 0) { - player.attackEntityFrom(damageSrc, Float.MAX_VALUE); - } else { - float damageAmount = net.minecraftforge.common.ForgeHooks.onLivingDamage(player, damageSrc, 2.0F); - player.getCombatTracker().trackDamage(damageSrc, playerHealth, damageAmount); - player.setHealth(Math.max(player.getHealth() - 2, 0.001f)); - } - } - - if (!evt.shouldFillAltar) - return super.onItemRightClick(world, player, hand); - - lpAdded = evt.lpAdded; - } - - double posX = player.posX; - double posY = player.posY; - double posZ = player.posZ; - world.playSound(null, posX, posY, posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - - for (int l = 0; l < 8; ++l) - world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), 0, 0, 0); - - if (!world.isRemote && PlayerHelper.isFakePlayer(player) || player.isPotionActive(PlayerSacrificeHelper.soulFrayId)) - return super.onItemRightClick(world, player, hand); - - - PlayerSacrificeHelper.findAndFillAltar(world, player, lpAdded, false); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { - if (!world.isRemote && entity instanceof PlayerEntity) { - boolean prepared = this.isPlayerPreparedForSacrifice(world, (PlayerEntity) entity); - this.setUseForSacrifice(stack, prepared); - if (IncenseHelper.getHasMaxIncense(stack) && !prepared) - IncenseHelper.setHasMaxIncense(stack, (PlayerEntity) entity, false); - if (prepared) { - boolean isMax = IncenseHelper.getMaxIncense((PlayerEntity) entity) == IncenseHelper.getCurrentIncense((PlayerEntity) entity); - IncenseHelper.setHasMaxIncense(stack, (PlayerEntity) entity, isMax); - } - } - } - - public boolean isPlayerPreparedForSacrifice(World world, PlayerEntity player) { - return !world.isRemote && (PlayerSacrificeHelper.getPlayerIncense(player) > 0); - } - - public boolean canUseForSacrifice(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return stack.getTagCompound().getBoolean(Constants.NBT.SACRIFICE); - } - - public void setUseForSacrifice(ItemStack stack, boolean sacrifice) { - stack = NBTHelper.checkNBT(stack); - stack.getTagCompound().setBoolean(Constants.NBT.SACRIFICE, sacrifice); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return stack -> { - String variant = "type=normal"; - if (stack.getItemDamage() != 0) - variant = "type=creative"; - - if (canUseForSacrifice(stack)) - variant = "type=ceremonial"; - - return new ModelResourceLocation(getRegistryName(), variant); - }; - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("type=normal"); - variants.accept("type=creative"); - variants.accept("type=ceremonial"); - } - - @Override - public boolean hasEffect(ItemStack stack) { - return IncenseHelper.getHasMaxIncense(stack) || super.hasEffect(stack); - } - - public enum DaggerType implements ISubItem { - - NORMAL, - CREATIVE, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER, count, ordinal()); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java deleted file mode 100644 index a3088076..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ /dev/null @@ -1,115 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.altar.IAltarManipulator; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.iface.IDocumentedBlock; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; - -public class ItemSanguineBook extends Item implements IVariantProvider, IAltarManipulator { - private AltarTier currentDisplayedTier = AltarTier.ONE; - - public ItemSanguineBook() { - setTranslationKey(BloodMagic.MODID + ".sanguineBook"); - setCreativeTab(BloodMagic.TAB_BM); - setMaxStackSize(1); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - if (world.isRemote) - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - - BlockState hitState = world.getBlockState(pos); - if (player.isSneaking()) { - if (hitState.getBlock() instanceof IDocumentedBlock) { - trySetDisplayedTier(world, pos); - IDocumentedBlock documentedBlock = (IDocumentedBlock) hitState.getBlock(); - List docs = documentedBlock.getDocumentation(player, world, pos, hitState); - if (!docs.isEmpty()) { - ChatUtil.sendNoSpam(player, docs.toArray(new ITextComponent[docs.size()])); - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - } - } - } - - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote) - return super.onItemRightClick(world, player, hand); - - stack = NBTHelper.checkNBT(stack); - - RayTraceResult rayTrace = rayTrace(world, player, false); - if (rayTrace == null || rayTrace.typeOfHit == RayTraceResult.Type.MISS || rayTrace.typeOfHit == RayTraceResult.Type.ENTITY) { - if (stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) >= AltarTier.MAXTIERS - 1) - stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, 0); - else - stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1); - - currentDisplayedTier = AltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]; - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.setTier", NumeralHelper.toRoman(stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)), true); - - return super.onItemRightClick(world, player, hand); - } - - return super.onItemRightClick(world, player, hand); - } - - public boolean trySetDisplayedTier(World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAltar) { - return !((TileAltar) tile).setCurrentTierDisplayed(currentDisplayedTier); - } - - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.book.shifting")); - tooltip.add(TextFormatting.OBFUSCATED + "~ILikeTehNutsAndICannotLie"); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentTier", stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)); - } - - // IVariantProvider - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java deleted file mode 100644 index b2d294b5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -public class ItemSlate extends ItemEnum.Variant { - - public ItemSlate() { - super(SlateType.class, "slate"); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { - list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.slate.desc")))); - } - - public enum SlateType implements ISubItem { - - BLANK, - REINFORCED, - IMBUED, - DEMONIC, - ETHEREAL, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.SLATE, count, ordinal()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java deleted file mode 100644 index 0bf4a0b3..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ /dev/null @@ -1,111 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -public class ItemTelepositionFocus extends ItemEnum.Variant implements IBindable { - - public ItemTelepositionFocus() { - super(FocusType.class, "focus"); - - setMaxStackSize(1); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - if (player.isSneaking()) { - RayTraceResult mop = rayTrace(world, player, false); - - if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { - setBlockPos(player.getHeldItem(hand), world, mop.getBlockPos()); - } - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localize("tooltip.bloodmagic.telepositionFocus." + getItemType(stack).getInternalName())))); - - super.addInformation(stack, world, tooltip, flag); - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); - - if (!stack.hasTagCompound()) - return; - - CompoundNBT tag = stack.getTagCompound(); - BlockPos coords = getBlockPos(stack); - - if (coords != null && tag != null) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", coords.getX(), coords.getY(), coords.getZ())); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", tag.getInt(Constants.NBT.DIMENSION_ID))); - } - } - - public World getWorld(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return DimensionManager.getWorld(stack.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); - } - - public BlockPos getBlockPos(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return new BlockPos(stack.getTagCompound().getInteger(Constants.NBT.X_COORD), stack.getTagCompound().getInteger(Constants.NBT.Y_COORD), stack.getTagCompound().getInteger(Constants.NBT.Z_COORD)); - } - - public ItemStack setBlockPos(ItemStack stack, World world, BlockPos pos) { - stack = NBTHelper.checkNBT(stack); - CompoundNBT itemTag = stack.getTagCompound(); - itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); - itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - itemTag.putInt(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); - return stack; - } - - public enum FocusType implements ISubItem { - - WEAK, - ENHANCED, - REINFORCED, - DEMONIC, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, count, ordinal()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java deleted file mode 100644 index 571b2a86..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ /dev/null @@ -1,112 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemGroup; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Map.Entry; - -public class ItemUpgradeTome extends Item implements IVariantProvider { - public ItemUpgradeTome() { - super(); - - setCreativeTab(BloodMagic.TAB_TOMES); - setTranslationKey(BloodMagic.MODID + ".upgradeTome"); - setHasSubtypes(true); - setMaxStackSize(1); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote) { - return super.onItemRightClick(world, player, hand); - } - - LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); - if (upgrade == null) { - return super.onItemRightClick(world, player, hand); - } - - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - if (chestStack.getItem() instanceof ItemLivingArmour) { - LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour == null) { - return super.onItemRightClick(world, player, hand); - } - - if (armour.upgradeArmour(player, upgrade)) { - ItemLivingArmour.setLivingArmour(chestStack, armour); -// ((ItemLivingArmour) chestStack.getItem()).setLivingArmour(stack, armour, false); - stack.shrink(1); - } - } - return super.onItemRightClick(world, player, hand); - } - - @Override - public String getTranslationKey(ItemStack stack) { - if (!stack.hasTagCompound()) - return super.getTranslationKey(stack); - - LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); - if (upgrade != null && upgrade.isDowngrade()) - return "item." + BloodMagic.MODID + ".downgradeTome"; - - return super.getTranslationKey(stack); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) { - String key = entry.getKey(); - int maxLevel = entry.getValue(); - for (int i = 0; i < maxLevel; i++) { - ItemStack stack = new ItemStack(this); - LivingUpgrades.setKey(stack, key); - LivingUpgrades.setLevel(stack, i); - list.add(stack); - } - } - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=upgradetome"); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); - if (upgrade != null) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getTranslationKey()), upgrade.getUpgradeLevel() + 1)); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java deleted file mode 100644 index aad3bc39..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ /dev/null @@ -1,88 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - -public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVariantProvider { - public ItemUpgradeTrainer() { - super(); - - setCreativeTab(BloodMagic.TAB_TOMES); - setTranslationKey(BloodMagic.MODID + ".upgradeTrainer"); - setHasSubtypes(true); - setMaxStackSize(1); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - list.add(new ItemStack(this)); - for (Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) { - String key = entry.getKey(); - ItemStack stack = new ItemStack(this); - LivingUpgrades.setKey(stack, key); - list.add(stack); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { -// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour")))); - if (!stack.hasTagCompound()) - return; - LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); - if (upgrade != null) { - tooltip.add(TextHelper.localize(upgrade.getTranslationKey())); - } - } - - @Override - public List getTrainedUpgrades(ItemStack stack) { - List keyList = new ArrayList<>(); - String key = LivingUpgrades.getKey(stack); - - if (!key.isEmpty()) { - keyList.add(key); - } - - return keyList; - } - - @Override - public boolean setTrainedUpgrades(ItemStack stack, List keys) { - if (keys.isEmpty()) { - return false; - } - - LivingUpgrades.setKey(stack, keys.get(0)); - return true; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=upgradetrainer"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java deleted file mode 100644 index 4ed016d5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ /dev/null @@ -1,99 +0,0 @@ -package WayofTime.bloodmagic.item.alchemy; - -import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; -import WayofTime.bloodmagic.item.ItemEnum; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Locale; - -public class ItemCuttingFluid extends ItemEnum.Variant implements ICustomAlchemyConsumable { - - public ItemCuttingFluid() { - super(FluidType.class, "cutting_fluid"); - - setMaxStackSize(1); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - int max = getMaxUsesForFluid(stack); - tooltip.add(TextHelper.localize("tooltip.bloodmagic.cuttingFluidRatio", max - getDamageOfFluid(stack), max)); - } - - public int getDamageOfFluid(ItemStack stack) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - return tag.getInt("used"); - } - - public void applyDamageToFluid(ItemStack stack) { - int damage = Math.min(getDamageOfFluid(stack) + 1, getMaxUsesForFluid(stack)); - CompoundNBT tag = stack.getTagCompound(); - - tag.putInt("used", damage); - } - - public int getMaxUsesForFluid(ItemStack stack) { - switch (stack.getMetadata()) { - case 0: - return 16; - case 1: - return 64; - default: - return 1; - } - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - return (double) (getDamageOfFluid(stack)) / (double) (getMaxUsesForFluid(stack)); - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return getDamageOfFluid(stack) > 0; - } - - @Override - public ItemStack drainUseOnAlchemyCraft(ItemStack stack) { - applyDamageToFluid(stack); - if (getDamageOfFluid(stack) >= getMaxUsesForFluid(stack)) { - return ItemStack.EMPTY; - } - - return stack; - } - - public enum FluidType implements ISubItem { - BASIC, - EXPLOSIVE, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.CUTTING_FLUID, count, ordinal()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java deleted file mode 100644 index 134006b5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java +++ /dev/null @@ -1,105 +0,0 @@ -package WayofTime.bloodmagic.item.alchemy; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemEnum; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Iterables; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.UseAction; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -public class ItemLivingArmourPointsUpgrade extends ItemEnum.Variant { - - public ItemLivingArmourPointsUpgrade() { - super(UpgradeType.class, "living_point_upgrade"); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmourPointsUpgrade.desc", 200)))); - } - - @Override - public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) { - playerIn.setActiveHand(hand); - return new ActionResult<>(ActionResultType.SUCCESS, playerIn.getHeldItem(hand)); - } - - @Override - public ItemStack onItemUseFinish(ItemStack stack, World worldIn, LivingEntity entityLiving) { - if (!(entityLiving instanceof PlayerEntity)) - return super.onItemUseFinish(stack, worldIn, entityLiving); - - PlayerEntity player = (PlayerEntity) entityLiving; - - if (!player.capabilities.isCreativeMode) - stack.shrink(1); - - if (!worldIn.isRemote) { - player.addPotionEffect(new EffectInstance(Effects.WITHER, 300, 5)); - player.addPotionEffect(new EffectInstance(Effects.POISON, 300, 5)); - player.addPotionEffect(new EffectInstance(Effects.REGENERATION, 400, 1)); - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - if (armour.maxUpgradePoints < 200) { - armour.maxUpgradePoints = 200; - ((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true); - ItemLivingArmour.setLivingArmour(chestStack, armour); - } - } - } - } - - return stack; - } - - @Override - public int getMaxItemUseDuration(ItemStack stack) { - return 32; - } - - @Override - public UseAction getItemUseAction(ItemStack stack) { - return UseAction.DRINK; - } - - public enum UpgradeType implements ISubItem { - - DRAFT_ANGELUS, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.POINTS_UPGRADE, count, ordinal()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java deleted file mode 100644 index 73edf6c5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ /dev/null @@ -1,505 +0,0 @@ -package WayofTime.bloodmagic.item.armour; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.PlayerFallDistancePacketProcessor; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Keyboard; - -import javax.annotation.Nullable; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; -import java.util.function.Consumer; - -public class ItemLivingArmour extends ArmorItem implements ISpecialArmor, IMeshProvider { - public static final boolean useSpecialArmourCalculation = true; - public static String[] names = {"helmet", "chest", "legs", "boots"}; - //TODO: Save/delete cache periodically. - public static Map armourMap = new HashMap<>(); - private static Field _FLAGS = ReflectionHelper.findField(Entity.class, "FLAGS", "field_184240_ax"); - private static DataParameter FLAGS = null; - - public ItemLivingArmour(EquipmentSlotType armorType) { - super(ArmorItem.ArmorMaterial.IRON, 0, armorType); - setTranslationKey(BloodMagic.MODID + ".livingArmour."); -// setMaxDamage(250); - setMaxDamage((int) (getMaxDamage() * 1.5)); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public void onCreated(ItemStack stack, World world, PlayerEntity player) { - if (stack != null && !world.isRemote && stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - Utils.setUUID(stack); - } - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlotType slot, String type) { - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET || this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS) { - return "bloodmagic:models/armor/livingArmour_layer_1.png"; - } - - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS) { - return "bloodmagic:models/armor/livingArmour_layer_2.png"; - } else { - return null; - } - } - -// public double getRemainderForDamage(double damage, double plating) //TODO: Add plating, which shifts the damage -// { -// if (damage <= 0) -// { -// return 1; -// } -// -// double protectionAmount = 1 - Math.max(3, 15 - damage / 2) / 25; //This puts the base armour protection at vanilla iron level -// -// return 0; -// } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return ItemStack.areItemsEqual(repair, ComponentTypes.REAGENT_BINDING.getStack()); - } - - @Override - public ArmorProperties getProperties(LivingEntity player, ItemStack stack, DamageSource source, double damage, int slot) { - double armourReduction = 0.0; - double damageAmount = 0.25; - - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET) { - damageAmount = 3d / 20d * 0.6; - } else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS) { - damageAmount = 6d / 20d * 0.6; - } else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - damageAmount = 0.64; - } - - double armourPenetrationReduction = 0; - - int maxAbsorption = 100000; - - if (source.equals(DamageSource.DROWN)) { - return new ArmorProperties(-1, 0, 0); - } - - if (source.equals(DamageSource.OUT_OF_WORLD)) { - return new ArmorProperties(-1, 0, 0); - } - - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - armourReduction = 0.24 / 0.64; // This values puts it at iron level - - ItemStack helmet = player.getItemStackFromSlot(EquipmentSlotType.HEAD); - ItemStack leggings = player.getItemStackFromSlot(EquipmentSlotType.LEGS); - ItemStack boots = player.getItemStackFromSlot(EquipmentSlotType.FEET); - - if (helmet.isEmpty() || leggings.isEmpty() || boots.isEmpty()) { - damageAmount *= (armourReduction); - - return new ArmorProperties(-1, damageAmount, maxAbsorption); - } - - if (helmet.getItem() instanceof ItemLivingArmour && leggings.getItem() instanceof ItemLivingArmour && boots.getItem() instanceof ItemLivingArmour) { - double remainder = 1; // Multiply this number by the armour upgrades for protection - - if (hasLivingArmour(stack)) { - LivingArmour armour = getLivingArmour(stack); - if (armour != null && isEnabled(stack)) { - for (Entry entry : armour.upgradeMap.entrySet()) { - LivingArmourUpgrade upgrade = entry.getValue(); - remainder *= (1 - upgrade.getArmourProtection(player, source)); - } - } - } - - armourReduction = armourReduction + (1 - remainder) * (1 - armourReduction); - damageAmount *= (armourReduction); - -// if (source.isUnblockable()) -// { -// return new ArmorProperties(-1, damageAmount * armourPenetrationReduction, maxAbsorption); -// } - - return new ArmorProperties(-1, source.isUnblockable() ? 1 - remainder : damageAmount, maxAbsorption); - } - } else { - if (source.isUnblockable()) { - return new ArmorProperties(-1, damageAmount * armourPenetrationReduction, maxAbsorption); - } - - return new ArmorProperties(-1, damageAmount, maxAbsorption); - } - - return new ArmorProperties(-1, 0, 0); - } - - @Override - public int getArmorDisplay(PlayerEntity player, ItemStack armor, int slot) { - if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET) { - return 3; - } - - if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - return 8; - } - - if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS) { - return 6; - } - - if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS) { - return 3; - } - - return 5; - } - - @Override - public void damageArmor(LivingEntity entity, ItemStack stack, DamageSource source, int damage, int slot) { - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - int preDamage = stack.getItemDamage(); - if (source.isUnblockable()) { - return; - } - - if (damage > this.getMaxDamage(stack) - this.getDamage(stack)) { - //TODO: Syphon a load of LP. - if (entity.getEntityWorld().isRemote && entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - network.syphonAndDamage(player, SoulTicket.item(stack, entity.getEntityWorld(), entity, damage * 100)); - } - - return; - } - - stack.damageItem(damage, entity); - - int receivedDamage = stack.getItemDamage() - preDamage; - if (entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - if (LivingArmour.hasFullSet(player)) { - LivingArmour armour = ItemLivingArmour.getLivingArmour(stack); - if (armour != null) { - StatTrackerRepairing.incrementCounter(armour, receivedDamage); - } - } - } - - } else { - stack.damageItem(damage, entity); - } - - return; // TODO Armour shouldn't get damaged... for now - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - LivingArmour armour = getLivingArmourFromStack(stack); - for (Entry entry : armour.upgradeMap.entrySet()) { - LivingArmourUpgrade upgrade = entry.getValue(); - if (upgrade != null) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_M)) { - StatTracker tracker = null; - for (StatTracker searchTracker : armour.trackerMap.values()) { - if (searchTracker != null && searchTracker.providesUpgrade(upgrade.getUniqueIdentifier())) { - tracker = searchTracker; - break; - } - } - - if (tracker != null) { - double progress = tracker.getProgress(armour, upgrade.getUpgradeLevel()); - tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.progress", TextHelper.localize(upgrade.getTranslationKey()), MathHelper.clamp((int) (progress * 100D), 0, 100))); - } - } else { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getTranslationKey()), upgrade.getUpgradeLevel() + 1)); - } - } - } - - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.upgrade.points", armour.totalUpgradePoints, armour.maxUpgradePoints)); - if (!(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_M))) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.extraExtraInfo")); - } - } - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { - super.onArmorTick(world, player, stack); - - if (world.isRemote && this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - if (player instanceof ClientPlayerEntity) //Sanity check - { - ClientPlayerEntity spPlayer = (ClientPlayerEntity) player; - - if (FLAGS == null) { - try { - FLAGS = (DataParameter) _FLAGS.get(null); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - } - - if (FLAGS != null) { - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.elytra", chestStack); - if (upgrade instanceof LivingArmourUpgradeElytra) { - if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.capabilities.isFlying) { - if (spPlayer.motionY > -0.5D) { - BloodMagicPacketHandler.INSTANCE.sendToServer(new PlayerFallDistancePacketProcessor(1)); - } - - if (!spPlayer.isElytraFlying()) { - byte b0 = player.getDataManager().get(FLAGS); - player.getDataManager().set(FLAGS, (byte) (b0 | 1 << 7)); - } - } else if (spPlayer.isElytraFlying() && !spPlayer.movementInput.jump && !spPlayer.onGround) { - byte b0 = player.getDataManager().get(FLAGS); - player.getDataManager().set(FLAGS, (byte) (b0 & ~(1 << 7))); - } - } - } - } - } - } - - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) { - if (!hasLivingArmour(stack)) { - setLivingArmour(stack, getLivingArmourFromStack(stack)); - } - - LivingArmour armour = getLivingArmour(stack); - if (LivingArmour.hasFullSet(player)) { - this.setIsEnabled(stack, true); - armour.onTick(world, player); - } - - setLivingArmour(stack, armour, false); - } - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { - if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EquipmentSlotType.CHEST) { - LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(stack); - - return armour.getAttributeModifiers(); - } - - return HashMultimap.create(); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[3 - armorType.getIndex()]; - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return stack -> { - if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET) - return new ModelResourceLocation(getCustomLocation(), "armour=head"); - else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST) - return new ModelResourceLocation(getCustomLocation(), "armour=body"); - else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS) - return new ModelResourceLocation(getCustomLocation(), "armour=leg"); - else - return new ModelResourceLocation(getCustomLocation(), "armour=feet"); - }; - } - - @Override - public ResourceLocation getCustomLocation() { - return new ResourceLocation(BloodMagic.MODID, "living_armour"); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("armour=head"); - variants.accept("armour=body"); - variants.accept("armour=leg"); - variants.accept("armour=feet"); - } - - public void setLivingArmour(ItemStack stack, LivingArmour armour, boolean forceWrite) { - CompoundNBT livingTag = new CompoundNBT(); - - if (!forceWrite) { - livingTag = getArmourTag(stack); - armour.writeDirtyToNBT(livingTag); - } else { - armour.writeToNBT(livingTag); - } - - setArmourTag(stack, livingTag); - } - - public void setArmourTag(ItemStack stack, CompoundNBT livingTag) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTagCompound(); - - tag.put(Constants.NBT.LIVING_ARMOUR, livingTag); - } - - public void setIsEnabled(ItemStack stack, boolean bool) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - tag.putBoolean("enabled", bool); - } - - public boolean isEnabled(ItemStack stack) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - return tag.getBoolean("enabled"); - } - - public void setIsElytra(ItemStack stack, boolean bool) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - tag.putBoolean("elytra", bool); - } - - public boolean isElytra(ItemStack stack) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - return tag.getBoolean("elytra"); - } - - @Nullable - public static LivingArmour getLivingArmourFromStack(ItemStack stack) { - CompoundNBT livingTag = getArmourTag(stack); - - LivingArmour livingArmour = new LivingArmour(); - livingArmour.readFromNBT(livingTag); - - return livingArmour; - } - - public static CompoundNBT getArmourTag(ItemStack stack) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTagCompound(); - return tag.getCompound(Constants.NBT.LIVING_ARMOUR); - } - - //TODO: Add the ability to have the armour give an upgrade with a higher level - public static LivingArmourUpgrade getUpgrade(String uniqueIdentifier, ItemStack stack) { - if (!hasLivingArmour(stack)) { - setLivingArmour(stack, getLivingArmourFromStack(stack)); - } - - LivingArmour armour = getLivingArmour(stack); - - for (Entry entry : armour.upgradeMap.entrySet()) { - if (entry.getKey().equals(uniqueIdentifier)) { - return entry.getValue(); - } - } - - return null; - } - - public static LivingArmourUpgrade getUpgradeFromNBT(String uniqueIdentifier, ItemStack stack) { - LivingArmour armour = getLivingArmourFromStack(stack); - - for (Entry entry : armour.upgradeMap.entrySet()) { - if (entry.getKey().equals(uniqueIdentifier)) { - return entry.getValue(); - } - } - - return null; - } - - public static boolean hasLivingArmour(ItemStack stack) { - UUID uuid = Utils.getUUID(stack); - return uuid != null && armourMap.containsKey(uuid); - } - - @Nullable - public static LivingArmour getLivingArmour(ItemStack stack) { - UUID uuid = Utils.getUUID(stack); - - return armourMap.get(uuid); - } - - public static void setLivingArmour(ItemStack stack, LivingArmour armour) { - if (!Utils.hasUUID(stack)) { - Utils.setUUID(stack); - } - - UUID uuid = Utils.getUUID(stack); - - armourMap.put(uuid, armour); - } - - public static boolean hasUpgrade(String id, ItemStack stack) { - if (!hasLivingArmour(stack)) { - setLivingArmour(stack, getLivingArmourFromStack(stack)); - } - - LivingArmour armour = getLivingArmour(stack); - - return armour.upgradeMap.containsKey(id); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java deleted file mode 100644 index 622c5111..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ /dev/null @@ -1,583 +0,0 @@ -package WayofTime.bloodmagic.item.armour; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.DamageSource; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Locale; -import java.util.Map; -import java.util.UUID; -import java.util.function.Consumer; - -public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMeshProvider, IMultiWillTool { - public static String[] names = {"helmet", "chest", "legs", "boots"}; - - public static double[] willBracket = new double[]{30, 200, 600, 1500, 4000, 6000, 8000, 16000}; - public static double[] consumptionPerHit = new double[]{0.1, 0.12, 0.15, 0.2, 0.3, 0.35, 0.4, 0.5}; - public static double[] extraProtectionLevel = new double[]{0, 0.25, 0.5, 0.6, 0.7, 0.75, 0.85, 0.9}; - public static double[] steadfastProtectionLevel = new double[]{0.25, 0.5, 0.6, 0.7, 0.75, 0.85, 0.9, 0.95}; - - //public static double[] healthBonus = new double[] { 3, 6, 9, 12, 15, 20, 25, 30 }; - public static double[] knockbackBonus = new double[]{0.2, 0.4, 0.6, 0.8, 1, 1, 1, 1}; - - public static double[] damageBoost = new double[]{0.03, 0.06, 0.09, 0.12, 0.15, 0.18, 0.22, 0.25}; - public static double[] attackSpeed = new double[]{-0.02, -0.04, -0.06, -0.08, -0.1, -0.12, -0.14, -0.16}; - - public static double[] speedBonus = new double[]{0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4}; - - public ItemSentientArmour(EquipmentSlotType armorType) { - super(ArmorItem.ArmorMaterial.IRON, 0, armorType); - setTranslationKey(BloodMagic.MODID + ".sentientArmour."); - setMaxDamage(250); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlotType slot, String type) { - if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS) { - switch (this.getCurrentType(stack)) { - case DEFAULT: - return "bloodmagic:models/armor/sentientArmour_layer_1.png"; - case CORROSIVE: - return "bloodmagic:models/armor/sentientArmour_corrosive_layer_1.png"; - case VENGEFUL: - return "bloodmagic:models/armor/sentientArmour_vengeful_layer_1.png"; - case DESTRUCTIVE: - return "bloodmagic:models/armor/sentientArmour_destructive_layer_1.png"; - case STEADFAST: - return "bloodmagic:models/armor/sentientArmour_steadfast_layer_1.png"; - } - return "bloodmagic:models/armor/sentientArmour_layer_1.png"; - } - - if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGGINGS) { - switch (this.getCurrentType(stack)) { - case DEFAULT: - return "bloodmagic:models/armor/sentientArmour_layer_2.png"; - case CORROSIVE: - return "bloodmagic:models/armor/sentientArmour_corrosive_layer_2.png"; - case VENGEFUL: - return "bloodmagic:models/armor/sentientArmour_vengeful_layer_2.png"; - case DESTRUCTIVE: - return "bloodmagic:models/armor/sentientArmour_destructive_layer_2.png"; - case STEADFAST: - return "bloodmagic:models/armor/sentientArmour_steadfast_layer_2.png"; - } - return "bloodmagic:models/armor/sentientArmour_layer_1.png"; - } else { - return null; - } - } - - @Override - public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { - if (this.armorType == EquipmentSlotType.CHEST) { - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) { - case CORROSIVE: - if (player.isPotionActive(Effects.POISON)) { - player.removeActivePotionEffect(Effects.POISON); - } - if (player.isPotionActive(Effects.WITHER)) { - player.removeActivePotionEffect(Effects.WITHER); - } - break; - default: - } - } - } - - public void onPlayerAttacked(ItemStack stack, DamageSource source, PlayerEntity attackedPlayer) { - if (source.getTrueSource() instanceof LivingEntity) { - LivingEntity attacker = (LivingEntity) source.getTrueSource(); - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) { - case CORROSIVE: - if (!source.isProjectile()) { - attacker.addPotionEffect(new EffectInstance(Effects.POISON, 100)); //TODO: customize duration - } - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - break; - case VENGEFUL: - break; - } - } - } - - @Override - public ArmorProperties getProperties(LivingEntity player, ItemStack stack, DamageSource source, double damage, int slot) { - double armourReduction = 0.0; - double damageAmount = 0.25; - - if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET) { - damageAmount = 3d / 20d * 0.6; - } else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGGINGS) { - damageAmount = 6d / 20d * 0.6; - } else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST) { - damageAmount = 0.64; - } - - double armourPenetrationReduction = 0; - - int maxAbsorption = 100000; - - if (source.equals(DamageSource.DROWN)) { - return new ArmorProperties(-1, 0, 0); - } - - if (source.equals(DamageSource.OUT_OF_WORLD)) { - return new ArmorProperties(-1, 0, 0); - } - - if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST) { - armourReduction = 0.24 / 0.64; // This values puts it at iron level - - ItemStack helmet = player.getItemStackFromSlot(EquipmentSlotType.HEAD); - ItemStack leggings = player.getItemStackFromSlot(EquipmentSlotType.LEGS); - ItemStack boots = player.getItemStackFromSlot(EquipmentSlotType.FEET); - - if (helmet.isEmpty() || leggings.isEmpty() || boots.isEmpty()) { - damageAmount *= (armourReduction); - - return new ArmorProperties(-1, damageAmount, maxAbsorption); - } - - if (helmet.getItem() instanceof ItemSentientArmour && leggings.getItem() instanceof ItemSentientArmour && boots.getItem() instanceof ItemSentientArmour) { - double remainder = 1; // Multiply this number by the armour upgrades for protection - remainder *= (1 - this.getArmourModifier(stack)); - - armourReduction = armourReduction + (1 - remainder) * (1 - armourReduction); - damageAmount *= (armourReduction); - - if (source.isUnblockable()) { - return new ArmorProperties(-1, damageAmount * armourPenetrationReduction, maxAbsorption); - } - - return new ArmorProperties(-1, damageAmount, maxAbsorption); - } - } else { - if (source.isUnblockable()) { - return new ArmorProperties(-1, damageAmount * armourPenetrationReduction, maxAbsorption); - } - - return new ArmorProperties(-1, damageAmount, maxAbsorption); - } - - return new ArmorProperties(-1, 0, 0); - } - - @Override - public int getArmorDisplay(PlayerEntity player, ItemStack armor, int slot) { - if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET) { - return 3; - } - - if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST) { - return 8; - } - - if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGGINGS) { - return 6; - } - - if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS) { - return 3; - } - - return 5; - } - - @Override - public void damageArmor(LivingEntity entity, ItemStack stack, DamageSource source, int damage, int slot) { - if (entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - - EnumDemonWillType type = getCurrentType(stack); - - double willRequired = this.getCostModifier(stack) * damage; - double willLeft = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (willLeft >= willRequired && canSustainArmour(type, willLeft)) { - this.setAbilitiesOfArmour(type, willLeft - willRequired, stack); - PlayerDemonWillHandler.consumeDemonWill(type, player, willRequired); - } else { - this.revertArmour(player, stack); - } - } - } - - public double getCostModifier(ItemStack stack) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - return tag.getDouble("costModifier"); - } - - public void setCostModifier(ItemStack stack, double modifier) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("costModifier", modifier); - } - - public double getArmourModifier(ItemStack stack) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - return tag.getDouble("armourModifier"); - } - - public void setArmourModifier(ItemStack stack, double modifier) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("armourModifier", modifier); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[3 - armorType.getIndex()]; - } - - public void revertArmour(PlayerEntity player, ItemStack itemStack) { - ItemStack stack = this.getContainedArmourStack(itemStack); - player.setItemStackToSlot(armorType, stack); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return stack -> { - EnumDemonWillType type = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack); - String additional = "_" + type.getName().toLowerCase(); - if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET) - return new ModelResourceLocation(getCustomLocation(), "armour=head" + additional); - else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST) - return new ModelResourceLocation(getCustomLocation(), "armour=body" + additional); - else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGGINGS) - return new ModelResourceLocation(getCustomLocation(), "armour=leg" + additional); - else - return new ModelResourceLocation(getCustomLocation(), "armour=feet" + additional); - }; - } - - @Override - public ResourceLocation getCustomLocation() { - return new ResourceLocation(BloodMagic.MODID, "sentient_armour"); - } - - @Override - public void gatherVariants(Consumer variants) { - for (EnumDemonWillType type : EnumDemonWillType.values()) { - String additional = "_" + type.getName().toLowerCase(); - - variants.accept("armour=head" + additional); - variants.accept("armour=body" + additional); - variants.accept("armour=leg" + additional); - variants.accept("armour=feet" + additional); - } - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.CHEST) { - multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 318145), "Armor modifier", this.getHealthBonus(stack), 0)); - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(new UUID(0, 8145), "Armor modifier", this.getKnockbackResistance(stack), 0)); - multimap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(new UUID(0, 94021), "Armor modifier", this.getSpeedBoost(stack), 2)); - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(new UUID(0, 96721), "Armor modifier", this.getDamageBoost(stack), 2)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(new UUID(0, 73245), "Armor modifier", this.getAttackSpeedBoost(stack), 2)); - } - return multimap; - } - - public void setContainedArmourStack(ItemStack newArmour, ItemStack previousArmour) { - if (newArmour == null || previousArmour == null) { - return; - } - - CompoundNBT tag = new CompoundNBT(); - previousArmour.writeToNBT(tag); - - CompoundNBT omegaTag = newArmour.getTagCompound(); - if (omegaTag == null) { - omegaTag = new CompoundNBT(); - newArmour.setTagCompound(omegaTag); - } - - omegaTag.put("armour", tag); - Map enchantmentMap = EnchantmentHelper.getEnchantments(previousArmour); - EnchantmentHelper.setEnchantments(enchantmentMap, newArmour); - } - - public ItemStack getContainedArmourStack(ItemStack newArmour) { - CompoundNBT omegaTag = newArmour.getTagCompound(); - if (omegaTag == null) { - return null; - } - - CompoundNBT tag = omegaTag.getCompound("armour"); - return new ItemStack(tag); - } - - public ItemStack getSubstituteStack(EnumDemonWillType type, double will, ItemStack previousArmour) { - ItemStack newArmour = new ItemStack(this); - - this.setContainedArmourStack(newArmour, previousArmour); - this.setAbilitiesOfArmour(type, will, newArmour); - - return newArmour; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(EnumDemonWillType type, ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - public void setAbilitiesOfArmour(EnumDemonWillType type, double willValue, ItemStack armourStack) { - int willBracket = getWillBracket(willValue); - if (willBracket >= 0) { - double recurringCost = consumptionPerHit[willBracket]; - - this.setCostModifier(armourStack, recurringCost); - this.setCurrentType(type, armourStack); - - if (this.armorType == EquipmentSlotType.CHEST) { - this.setArmourModifier(armourStack, getArmourModifier(type, willBracket)); - this.setHealthBonus(armourStack, this.getHealthModifier(type, willBracket)); - this.setKnockbackResistance(armourStack, getKnockbackModifier(type, willBracket)); - this.setSpeedBoost(armourStack, getSpeedModifier(type, willBracket)); - this.setDamageBoost(armourStack, getDamageModifier(type, willBracket)); - this.setAttackSpeedBoost(armourStack, getAttackSpeedModifier(type, willBracket)); - } - } - } - - public double getArmourModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - return steadfastProtectionLevel[willBracket]; - default: - return extraProtectionLevel[willBracket]; - } - } - - public double getHealthModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - //return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getKnockbackModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - return knockbackBonus[willBracket]; - default: - return 0; - } - } - - public double getSpeedModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return speedBonus[willBracket]; - default: - return 0; - } - } - - public double getDamageModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case DESTRUCTIVE: - return damageBoost[willBracket]; - default: - return 0; - } - } - - public double getAttackSpeedModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case DESTRUCTIVE: - return attackSpeed[willBracket]; - default: - return 0; - } - } - - public double getHealthBonus(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonus(ItemStack stack, double hp) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getKnockbackResistance(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble("knockback"); - } - - public void setKnockbackResistance(ItemStack stack, double kb) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("knockback", kb); - } - - public double getSpeedBoost(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble("speed"); - } - - public void setSpeedBoost(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("speed", speed); - } - - public double getDamageBoost(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble("damage"); - } - - public void setDamageBoost(ItemStack stack, double damage) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("damage", damage); - } - - public double getAttackSpeedBoost(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble("attackSpeed"); - } - - public void setAttackSpeedBoost(ItemStack stack, double attackSpeed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("attackSpeed", attackSpeed); - } - - public static void revertAllArmour(PlayerEntity player) { - NonNullList armourInventory = player.inventory.armorInventory; - for (ItemStack stack : armourInventory) { - if (stack != null && stack.getItem() instanceof ItemSentientArmour) { - ((ItemSentientArmour) stack.getItem()).revertArmour(player, stack); - } - } - } - - public static boolean convertPlayerArmour(EnumDemonWillType type, double will, PlayerEntity player) { - if (!canSustainArmour(type, will)) { - return false; - } - - ItemStack helmetStack = player.getItemStackFromSlot(EquipmentSlotType.HEAD); - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - ItemStack leggingsStack = player.getItemStackFromSlot(EquipmentSlotType.LEGS); - ItemStack bootsStack = player.getItemStackFromSlot(EquipmentSlotType.FEET); - - { - ItemStack omegaHelmetStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack); - ItemStack omegaChestStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack); - ItemStack omegaLeggingsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGGINGS).getSubstituteStack(type, will, leggingsStack); - ItemStack omegaBootsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack); - - player.setItemStackToSlot(EquipmentSlotType.HEAD, omegaHelmetStack); - player.setItemStackToSlot(EquipmentSlotType.CHEST, omegaChestStack); - player.setItemStackToSlot(EquipmentSlotType.LEGS, omegaLeggingsStack); - player.setItemStackToSlot(EquipmentSlotType.FEET, omegaBootsStack); - - return true; - } - } - - public static boolean canSustainArmour(EnumDemonWillType type, double willValue) { - return getWillBracket(willValue) >= 0; - } - - public static int getWillBracket(double will) { - int bracket = -1; - - for (int i = 0; i < willBracket.length; i++) { - if (will >= willBracket[i]) { - bracket = i; - } - } - - return bracket; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java deleted file mode 100644 index 9715a33d..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java +++ /dev/null @@ -1,67 +0,0 @@ -package WayofTime.bloodmagic.item.block; - -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.tile.TileAlchemyTable; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class ItemBlockAlchemyTable extends BlockItem implements IVariantProvider { - public ItemBlockAlchemyTable(Block block) { - super(block); - } - - @Override - public boolean placeBlockAt(ItemStack stack, PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, BlockState newState) { - float yaw = player.rotationYaw; - Direction direction = Direction.fromAngle(yaw); - - if (direction.getYOffset() != 0) { - return false; - } - - if (!world.isAirBlock(pos.offset(direction))) { - return false; - } - -// newState = block.getDefaultState().withProperty(BlockAlchemyTable.DIRECTION, direction).withProperty(BlockAlchemyTable.INVISIBLE, true); - - if (!world.setBlockState(pos, newState, 3)) { - return false; - } - - if (!world.setBlockState(pos.offset(direction), newState, 3)) { - return false; - } - - BlockState state = world.getBlockState(pos); - if (state.getBlock() == this.block) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyTable) { - ((TileAlchemyTable) tile).setInitialTableParameters(direction, false, pos.offset(direction)); - } - - TileEntity slaveTile = world.getTileEntity(pos.offset(direction)); - if (slaveTile instanceof TileAlchemyTable) { - ((TileAlchemyTable) slaveTile).setInitialTableParameters(direction, true, pos); - } - - setTileEntityNBT(world, player, pos, stack); - this.block.onBlockPlacedBy(world, pos, state, player, stack); - } - - return true; - } - - @Override - public void gatherVariants(Int2ObjectMap variants) { - variants.put(0, "inventory"); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java deleted file mode 100644 index f0e80c1d..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java +++ /dev/null @@ -1,78 +0,0 @@ -package WayofTime.bloodmagic.item.block; - -import WayofTime.bloodmagic.block.BlockBloodTank; -import WayofTime.bloodmagic.tile.TileBloodTank; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.block.Block; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; - -public class ItemBlockBloodTank extends BlockItem { - public ItemBlockBloodTank(Block block) { - super(block); - - setHasSubtypes(true); - } - - @Override - public int getMetadata(int meta) { - return meta; - } - - @Override - public String getItemStackDisplayName(ItemStack stack) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(stack.getTagCompound()); - if (fluidStack != null) { - return super.getItemStackDisplayName(stack) + " " + TextHelper.localizeEffect("tooltip.bloodmagic.tier", stack.getItemDamage() + 1) + " (" + fluidStack.getLocalizedName() + ")"; - } else { - return super.getItemStackDisplayName(stack) + " " + TextHelper.localizeEffect("tooltip.bloodmagic.tier", stack.getItemDamage() + 1); - } - } - - @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.tier", stack.getItemDamage() + 1)); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.capacity", getCapacity(stack))); - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("Fluid")); - if (fluidStack != null) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.type", fluidStack.getLocalizedName())); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.amount", fluidStack.amount, getCapacity(stack))); - } - } - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - public int getCapacity(ItemStack container) { - int meta = MathHelper.clamp(container.getItemDamage(), 0, TileBloodTank.CAPACITIES.length - 1); - return !container.isEmpty() && Block.getBlockFromItem(container.getItem()) instanceof BlockBloodTank ? TileBloodTank.CAPACITIES[meta] * Fluid.BUCKET_VOLUME : 0; - } - - @Override - public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT nbt) { - return new FluidHandlerItemStack(stack, getCapacity(stack)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java deleted file mode 100644 index 7aed772a..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.item.block; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.tile.TileDemonCrystal; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.Locale; - -public class ItemBlockDemonCrystal extends BlockItem { - public ItemBlockDemonCrystal(Block block) { - super(block); - setHasSubtypes(true); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + EnumDemonWillType.values()[stack.getItemDamage()].toString().toLowerCase(Locale.ENGLISH); - } - - @Override - public int getMetadata(int meta) { - return meta; - } - - @Override - public boolean placeBlockAt(ItemStack stack, PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, BlockState newState) { - if (super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState)) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) { - ((TileDemonCrystal) tile).setPlacement(side); - } - - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java deleted file mode 100644 index c3ef8980..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java +++ /dev/null @@ -1,124 +0,0 @@ -package WayofTime.bloodmagic.item.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.ChestTileEntity; -import net.minecraft.util.*; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.tile.TileMimic; -import WayofTime.bloodmagic.block.base.BlockEnum; -import WayofTime.bloodmagic.item.block.base.ItemBlockEnum; - -public class ItemBlockMimic extends ItemBlockEnum { - public ItemBlockMimic(BlockEnum block) { - super(block); - setHasSubtypes(true); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - - //If not sneaking, do normal item use - if (!player.isSneaking()) { - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - } - - //IF sneaking and player has permission, replace the targeted block - if (player.canPlayerEdit(pos, facing, stack)) { - //Store information about the block being replaced and its appropriate itemstack - BlockState replacedBlockstate = world.getBlockState(pos); - Block replacedBlock = replacedBlockstate.getBlock(); - ItemStack replacedStack = replacedBlock.getItem(world, pos, replacedBlockstate); - - //Get the state for the mimic - BlockState mimicBlockstate = this.getBlock().getStateFromMeta(stack.getMetadata()); - - - //Check if the block can be replaced - - if (!canReplaceBlock(world, pos, replacedBlockstate)) { - return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - } - - //Check if the tile entity, if any, can be replaced - TileEntity tileReplaced = world.getTileEntity(pos); - if (!canReplaceTile(tileReplaced)) { - return ActionResultType.FAIL; - } - - //If tile can be replaced, store info about the tile - CompoundNBT tileTag = getTagFromTileEntity(tileReplaced); - if (tileReplaced != null) { - CompoundNBT voidTag = new CompoundNBT(); - voidTag.putInt("x", pos.getX()); - voidTag.putInt("y", pos.getY()); - voidTag.putInt("z", pos.getZ()); - tileReplaced.readFromNBT(voidTag); - } - - //Remove one item from stack - stack.shrink(1); - - - //Replace the block - world.setBlockState(pos, mimicBlockstate, 3); - //Make placing sound - SoundType soundtype = this.block.getSoundType(); - world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); - - //Replace the tile entity - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMimic) { - TileMimic mimic = (TileMimic) tile; - mimic.tileTag = tileTag; - mimic.setReplacedState(replacedBlockstate); - mimic.setInventorySlotContents(0, replacedStack); - mimic.refreshTileEntity(); - - if (player.capabilities.isCreativeMode) { - mimic.dropItemsOnBreak = false; - } - } - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - - } - - public boolean canReplaceTile(TileEntity tile) { - if (tile instanceof ChestTileEntity) { - return true; - } - - return tile == null; - } - - public boolean canReplaceBlock(World world, BlockPos pos, BlockState state) { - return state.getBlockHardness(world, pos) != -1.0F; - } - - public CompoundNBT getTagFromTileEntity(TileEntity tile) { - CompoundNBT tag = new CompoundNBT(); - - if (tile != null) { - return tile.writeToNBT(tag); - } - - return tag; - } - - @Override - public int getMetadata(int meta) { - return meta; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java deleted file mode 100644 index 4739bec2..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.item.block.base; - -import WayofTime.bloodmagic.block.base.BlockEnum; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.MathHelper; - -public class ItemBlockEnum & IStringSerializable> extends BlockItem { - - public ItemBlockEnum(BlockEnum block) { - super(block); - - if (block.getTypes().length > 1) - setHasSubtypes(true); - } - - @SuppressWarnings("unchecked") - @Override - public BlockEnum getBlock() { - return (BlockEnum) super.getBlock(); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return getBlock().getTranslationKey() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName(); - } - - @Override - public int getMetadata(int damage) { - return damage; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java deleted file mode 100644 index 20f656cd..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.item.block.base; - -import WayofTime.bloodmagic.block.base.BlockInteger; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; - -public class ItemBlockInteger extends BlockItem { - - public ItemBlockInteger(BlockInteger block) { - super(block); - - if (block.getMaxMeta() > 1) - setHasSubtypes(true); - } - - @SuppressWarnings("unchecked") - @Override - public BlockInteger getBlock() { - return (BlockInteger) super.getBlock(); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return getBlock().getTranslationKey() + "." + stack.getItemDamage(); - } - - @Override - public int getMetadata(int damage) { - return damage; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java deleted file mode 100644 index 116c1c22..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ /dev/null @@ -1,100 +0,0 @@ -package WayofTime.bloodmagic.item.gear; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.IAltarManipulator; -import WayofTime.bloodmagic.altar.IBloodAltar; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.iface.IItemLPContainer; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.ItemHelper.LPContainer; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.List; - -public class ItemPackSacrifice extends ArmorItem implements IAltarManipulator, IItemLPContainer, IVariantProvider { - public final int CAPACITY = 10000; // Max LP storage - - public ItemPackSacrifice() { - super(ArmorMaterial.CHAIN, 0, EquipmentSlotType.CHEST); - - setTranslationKey(BloodMagic.MODID + ".pack.sacrifice"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - RayTraceResult rayTrace = this.rayTrace(world, player, false); - - if (rayTrace == null) { - return super.onItemRightClick(world, player, hand); - } else { - if (rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) { - TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); - - if (!(tile instanceof IBloodAltar)) - return super.onItemRightClick(world, player, hand); - - LPContainer.tryAndFillAltar((IBloodAltar) tile, stack, world, rayTrace.getBlockPos()); - } - } - - return ActionResult.newResult(ActionResultType.FAIL, stack); - } - - @Override - public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { - if (getStoredLP(stack) > CAPACITY) - setStoredLP(stack, CAPACITY); - } - - @Override - public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - list.add(TextHelper.localize("tooltip.bloodmagic.pack.sacrifice.desc")); - list.add(TextHelper.localize("tooltip.bloodmagic.pack.stored", getStoredLP(stack))); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } - - // IFillable - - @Override - public int getCapacity() { - return this.CAPACITY; - } - - @Override - public int getStoredLP(ItemStack stack) { - return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.STORED_LP) : 0; - } - - @Override - public void setStoredLP(ItemStack stack, int lp) { - if (stack != null) { - NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.STORED_LP, lp); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java deleted file mode 100644 index 4c70b592..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ /dev/null @@ -1,125 +0,0 @@ -package WayofTime.bloodmagic.item.gear; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.IAltarManipulator; -import WayofTime.bloodmagic.altar.IBloodAltar; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.iface.IItemLPContainer; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.ItemHelper.LPContainer; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.List; - -public class ItemPackSelfSacrifice extends ArmorItem implements IAltarManipulator, IItemLPContainer, IVariantProvider { - /** - * How much LP per half heart - */ - public final int CONVERSION = 100; - /** - * Max LP storage - */ - public final int CAPACITY = 10000; - /** - * How often the pack syphons - */ - public final int INTERVAL = 20; - /** - * How much health is required for the pack to syphon (0 - 1) - */ - public final float HEALTHREQ = 0.5f; - - public ItemPackSelfSacrifice() { - super(ArmorMaterial.CHAIN, 0, EquipmentSlotType.CHEST); - - setTranslationKey(BloodMagic.MODID + ".pack.selfSacrifice"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - RayTraceResult position = this.rayTrace(world, player, false); - - if (position == null) { - return super.onItemRightClick(world, player, hand); - } else { - if (position.typeOfHit == RayTraceResult.Type.BLOCK) { - TileEntity tile = world.getTileEntity(position.getBlockPos()); - - if (!(tile instanceof IBloodAltar)) - return super.onItemRightClick(world, player, hand); - - LPContainer.tryAndFillAltar((IBloodAltar) tile, stack, world, position.getBlockPos()); - } - } - - return ActionResult.newResult(ActionResultType.FAIL, stack); - } - - @Override - public void onArmorTick(World world, PlayerEntity player, ItemStack stack) { - if (world.isRemote || player.capabilities.isCreativeMode) - return; - - boolean shouldSyphon = player.getHealth() / player.getMaxHealth() > HEALTHREQ && getStoredLP(stack) < CAPACITY; - - if (shouldSyphon & world.getTotalWorldTime() % INTERVAL == 0) { - NetworkHelper.getSoulNetwork(player).hurtPlayer(player, 1.0F); - LPContainer.addLPToItem(stack, CONVERSION, CAPACITY); - } - - if (getStoredLP(stack) > CAPACITY) - setStoredLP(stack, CAPACITY); - } - - @Override - public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - list.add(TextHelper.localize("tooltip.bloodmagic.pack.selfSacrifice.desc")); - list.add(TextHelper.localize("tooltip.bloodmagic.pack.stored", getStoredLP(stack))); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } - - // IFillable - - @Override - public int getCapacity() { - return this.CAPACITY; - } - - @Override - public int getStoredLP(ItemStack stack) { - return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.STORED_LP) : 0; - } - - @Override - public void setStoredLP(ItemStack stack, int lp) { - if (stack != null) { - NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.STORED_LP, lp); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java deleted file mode 100644 index d4608ab9..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java +++ /dev/null @@ -1,153 +0,0 @@ -package WayofTime.bloodmagic.item.inventory; - -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.FMLCommonHandler; - -public class ContainerHolding extends Container { - public final InventoryHolding inventoryHolding; - private final int PLAYER_INVENTORY_ROWS = 3; - private final int PLAYER_INVENTORY_COLUMNS = 9; - private final PlayerEntity player; - - public ContainerHolding(PlayerEntity player, InventoryHolding inventoryHolding) { - this.player = player; - this.inventoryHolding = inventoryHolding; - int currentSlotHeldIn = player.inventory.currentItem; - - for (int columnIndex = 0; columnIndex < ItemSigilHolding.inventorySize; ++columnIndex) { - this.addSlotToContainer(new SlotHolding(this, inventoryHolding, player, columnIndex, 8 + columnIndex * 36, 17)); - } - - for (int rowIndex = 0; rowIndex < PLAYER_INVENTORY_ROWS; ++rowIndex) { - for (int columnIndex = 0; columnIndex < PLAYER_INVENTORY_COLUMNS; ++columnIndex) { - this.addSlotToContainer(new Slot(player.inventory, columnIndex + rowIndex * 9 + 9, 8 + columnIndex * 18, 41 + rowIndex * 18)); - } - } - - for (int actionBarIndex = 0; actionBarIndex < PLAYER_INVENTORY_COLUMNS; ++actionBarIndex) { - if (actionBarIndex == currentSlotHeldIn) { - this.addSlotToContainer(new SlotDisabled(player.inventory, actionBarIndex, 8 + actionBarIndex * 18, 99)); - } else { - this.addSlotToContainer(new Slot(player.inventory, actionBarIndex, 8 + actionBarIndex * 18, 99)); - } - } - } - - @Override - public boolean canInteractWith(PlayerEntity entityPlayer) { - return true; - } - - @Override - public void onContainerClosed(PlayerEntity entityPlayer) { - super.onContainerClosed(entityPlayer); - - if (!entityPlayer.getEntityWorld().isRemote) { - saveInventory(entityPlayer); - } - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - if (!player.getEntityWorld().isRemote) { - saveInventory(player); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity entityPlayer, int slotIndex) { - ItemStack stack = ItemStack.EMPTY; - Slot slotObject = inventorySlots.get(slotIndex); - int slots = inventorySlots.size(); - - if (slotObject != null && slotObject.getHasStack()) { - ItemStack stackInSlot = slotObject.getStack(); - stack = stackInSlot.copy(); - - if (stack.getItem() instanceof ISigil) { - if (slotIndex < ItemSigilHolding.inventorySize) { - if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, slots, false)) { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(stackInSlot, 0, ItemSigilHolding.inventorySize, false)) { - return ItemStack.EMPTY; - } - } else if (stack.getItem() instanceof ItemSigilHolding) { - if (slotIndex < ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS)) { - if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), inventorySlots.size(), false)) { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false)) { - return ItemStack.EMPTY; - } - } - - if (stackInSlot.isEmpty()) { - slotObject.putStack(ItemStack.EMPTY); - } else { - slotObject.onSlotChanged(); - } - - if (stackInSlot.getCount() == stack.getCount()) { - return ItemStack.EMPTY; - } - - slotObject.onTake(player, stackInSlot); - } - - return stack; - } - - public void saveInventory(PlayerEntity entityPlayer) { - inventoryHolding.onGuiSaved(entityPlayer); - } - - private class SlotHolding extends Slot { - private final PlayerEntity player; - private ContainerHolding containerHolding; - - public SlotHolding(ContainerHolding containerHolding, IInventory inventory, PlayerEntity player, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - this.player = player; - this.containerHolding = containerHolding; - } - - @Override - public void onSlotChanged() { - super.onSlotChanged(); - - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { - containerHolding.saveInventory(player); - } - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return itemStack.getItem() instanceof ISigil && !(itemStack.getItem() instanceof ItemSigilHolding); - } - } - - private class SlotDisabled extends Slot { - public SlotDisabled(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return false; - } - - @Override - public boolean canTakeStack(PlayerEntity player) { - return false; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java deleted file mode 100644 index 56c517c7..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ /dev/null @@ -1,69 +0,0 @@ -package WayofTime.bloodmagic.item.inventory; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -import java.util.UUID; - -public class InventoryHolding extends ItemInventory { - protected ItemStack[] inventory; - - public InventoryHolding(ItemStack itemStack) { - super(itemStack, ItemSigilHolding.inventorySize, "SigilOfHolding"); - } - - public void onGuiSaved(PlayerEntity entityPlayer) { - masterStack = findParentStack(entityPlayer); - - if (!masterStack.isEmpty()) { - save(); - } - } - - public ItemStack findParentStack(PlayerEntity entityPlayer) { - if (Utils.hasUUID(masterStack)) { - UUID parentStackUUID = new UUID(masterStack.getTagCompound().getLong(Constants.NBT.MOST_SIG), masterStack.getTagCompound().getLong(Constants.NBT.LEAST_SIG)); - for (int i = 0; i < entityPlayer.inventory.getSizeInventory(); i++) { - ItemStack itemStack = entityPlayer.inventory.getStackInSlot(i); - - if (!itemStack.isEmpty() && Utils.hasUUID(itemStack)) { - if (itemStack.getTagCompound().getLong(Constants.NBT.MOST_SIG) == parentStackUUID.getMostSignificantBits() && itemStack.getTagCompound().getLong(Constants.NBT.LEAST_SIG) == parentStackUUID.getLeastSignificantBits()) { - return itemStack; - } - } - } - } - - return ItemStack.EMPTY; - } - - public void save() { - CompoundNBT nbtTagCompound = masterStack.getTagCompound(); - - if (nbtTagCompound == null) { - nbtTagCompound = new CompoundNBT(); - - UUID uuid = UUID.randomUUID(); - nbtTagCompound.putLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); - nbtTagCompound.putLong(Constants.NBT.LEAST_SIG, uuid.getLeastSignificantBits()); - } - - writeToNBT(nbtTagCompound); - masterStack.setTagCompound(nbtTagCompound); - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { - return itemStack.getItem() instanceof ISigil && !(itemStack.getItem() instanceof ItemSigilHolding); - } - - @Override - public int getInventoryStackLimit() { - return 1; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java deleted file mode 100644 index 93c07286..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ /dev/null @@ -1,224 +0,0 @@ -package WayofTime.bloodmagic.item.inventory; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; - -public class ItemInventory implements IInventory { - protected int[] syncedSlots = new int[0]; - protected ItemStack masterStack; - private NonNullList inventory; - private int size; - private String name; - - public ItemInventory(ItemStack masterStack, int size, String name) { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - this.size = size; - this.name = name; - this.masterStack = masterStack; - - if (!masterStack.isEmpty()) - this.readFromStack(masterStack); - } - - public void initializeInventory(ItemStack masterStack) { - this.masterStack = masterStack; - this.clear(); - this.readFromStack(masterStack); - } - - private boolean isSyncedSlot(int slot) { - for (int s : this.syncedSlots) { - if (s == slot) { - return true; - } - } - return false; - } - - public void readFromNBT(CompoundNBT tagCompound) { - ListNBT tags = tagCompound.getTagList(Constants.NBT.ITEMS, 10); - inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); - - for (int i = 0; i < tags.tagCount(); i++) { - if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompound(i); - byte j = data.getByte(Constants.NBT.SLOT); - - if (j >= 0 && j < inventory.size()) { - inventory.set(i, new ItemStack(data)); - } - } - } - } - - public void writeToNBT(CompoundNBT tagCompound) { - ListNBT tags = new ListNBT(); - - for (int i = 0; i < inventory.size(); i++) { - if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) { - CompoundNBT data = new CompoundNBT(); - data.setByte(Constants.NBT.SLOT, (byte) i); - inventory.get(i).writeToNBT(data); - tags.appendTag(data); - } - } - - tagCompound.putTag(Constants.NBT.ITEMS, tags); - } - - public void readFromStack(ItemStack masterStack) { - if (masterStack != null) { - NBTHelper.checkNBT(masterStack); - CompoundNBT tag = masterStack.getTagCompound(); - readFromNBT(tag.getCompound(Constants.NBT.ITEM_INVENTORY)); - } - } - - public void writeToStack(ItemStack masterStack) { - if (masterStack != null) { - NBTHelper.checkNBT(masterStack); - CompoundNBT tag = masterStack.getTagCompound(); - CompoundNBT invTag = new CompoundNBT(); - writeToNBT(invTag); - tag.put(Constants.NBT.ITEM_INVENTORY, invTag); - } - } - - @Override - public int getSizeInventory() { - return size; - } - - @Override - public ItemStack getStackInSlot(int index) { - return inventory.get(index); - } - - @Override - public ItemStack decrStackSize(int index, int count) { - if (!inventory.get(index).isEmpty()) { -// if (!worldObj.isRemote) -// worldObj.markBlockForUpdate(this.pos); - - if (inventory.get(index).getCount() <= count) { - ItemStack itemStack = inventory.get(index); - inventory.set(index, ItemStack.EMPTY); - markDirty(); - return itemStack; - } - - ItemStack itemStack = inventory.get(index).splitStack(count); - if (inventory.get(index).isEmpty()) - inventory.set(index, ItemStack.EMPTY); - - markDirty(); - return itemStack; - } - - return null; - } - - @Override - public ItemStack removeStackFromSlot(int slot) { - if (!inventory.get(slot).isEmpty()) { - ItemStack itemStack = inventory.get(slot); - setInventorySlotContents(slot, ItemStack.EMPTY); - return itemStack; - } - return ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.set(slot, stack); - if (stack.getCount() > getInventoryStackLimit()) - stack.setCount(getInventoryStackLimit()); - markDirty(); -// if (!worldObj.isRemote) -// worldObj.markBlockForUpdate(this.pos); - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUsableByPlayer(PlayerEntity player) { - return true; - } - - @Override - public void openInventory(PlayerEntity player) { - - } - - @Override - public void closeInventory(PlayerEntity player) { - - } - - @Override - public boolean isItemValidForSlot(int index, ItemStack stack) { - return true; - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) { - - } - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - this.inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); - } - - @Override - public String getName() { - return name; - } - - @Override - public boolean hasCustomName() { - return false; - } - - @Override - public ITextComponent getDisplayName() { - return new StringTextComponent(getName()); - } - - @Override - public void markDirty() { - if (masterStack != null) { - this.writeToStack(masterStack); - } - } - - @Override - public boolean isEmpty() { - return false; - } - - public boolean canInventoryBeManipulated() { - return masterStack != null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/IFluidFilterProvider.java b/src/main/java/WayofTime/bloodmagic/item/routing/IFluidFilterProvider.java deleted file mode 100644 index 66342e9c..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/routing/IFluidFilterProvider.java +++ /dev/null @@ -1,12 +0,0 @@ -package WayofTime.bloodmagic.item.routing; - -import WayofTime.bloodmagic.routing.IFluidFilter; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.capability.IFluidHandler; - -public interface IFluidFilterProvider extends IRoutingFilterProvider { - IFluidFilter getInputFluidFilter(ItemStack stack, TileEntity tile, IFluidHandler handler); - - IFluidFilter getOutputFluidFilter(ItemStack stack, TileEntity tile, IFluidHandler handler); -} diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java b/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java deleted file mode 100644 index 2f0cfe61..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java +++ /dev/null @@ -1,12 +0,0 @@ -package WayofTime.bloodmagic.item.routing; - -import WayofTime.bloodmagic.routing.IItemFilter; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.items.IItemHandler; - -public interface IItemFilterProvider extends IRoutingFilterProvider { - IItemFilter getInputItemFilter(ItemStack stack, TileEntity tile, IItemHandler handler); - - IItemFilter getOutputItemFilter(ItemStack stack, TileEntity tile, IItemHandler handler); -} diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/IRoutingFilterProvider.java b/src/main/java/WayofTime/bloodmagic/item/routing/IRoutingFilterProvider.java deleted file mode 100644 index 2ae42343..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/routing/IRoutingFilterProvider.java +++ /dev/null @@ -1,14 +0,0 @@ -package WayofTime.bloodmagic.item.routing; - -import net.minecraft.item.ItemStack; - -public interface IRoutingFilterProvider { - /** - * Translates the inputed keyStack into the proper filtered key - * - * @param filterStack - * @param keyStack - * @return A new ItemStack which modifies the keyStack - */ - ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack); -} diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java deleted file mode 100644 index 45a7f63d..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ /dev/null @@ -1,133 +0,0 @@ -package WayofTime.bloodmagic.item.routing; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.inventory.ItemInventory; -import WayofTime.bloodmagic.routing.IFluidFilter; -import WayofTime.bloodmagic.routing.RoutingFluidFilter; -import WayofTime.bloodmagic.util.GhostItemHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, IVariantProvider { - public static String[] names = {"exact"}; - - public ItemFluidRouterFilter() { - super(); - - setTranslationKey(BloodMagic.MODID + ".fluidFilter."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[stack.getItemDamage()]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.fluidFilter." + names[stack.getItemDamage()])); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public IFluidFilter getInputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { - IFluidFilter testFilter; - - switch (filterStack.getMetadata()) { - case 0: - testFilter = new RoutingFluidFilter(); - break; - - default: - testFilter = new RoutingFluidFilter(); - } - - List filteredList = new ArrayList<>(); - ItemInventory inv = new ItemInventory(filterStack, 9, ""); - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - filteredList.add(ghostStack); - } - - testFilter.initializeFilter(filteredList, tile, handler, false); - return testFilter; - } - - @Override - public IFluidFilter getOutputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { - IFluidFilter testFilter; - switch (filterStack.getMetadata()) { - case 0: - testFilter = new RoutingFluidFilter(); - break; - - default: - testFilter = new RoutingFluidFilter(); - } - - List filteredList = new ArrayList<>(); - ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.isEmpty()) { - ghostStack.setCount(Integer.MAX_VALUE); - } - - filteredList.add(ghostStack); - } - - testFilter.initializeFilter(filteredList, tile, handler, true); - return testFilter; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=exact"); - } - - @Override - public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) { - ItemStack copyStack = keyStack.copy(); - GhostItemHelper.setItemGhostAmount(copyStack, 0); - copyStack.setCount(1); - return copyStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java deleted file mode 100644 index 4d475a5f..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ /dev/null @@ -1,195 +0,0 @@ -package WayofTime.bloodmagic.item.routing; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.iface.INodeRenderer; -import WayofTime.bloodmagic.routing.IMasterRoutingNode; -import WayofTime.bloodmagic.routing.IRoutingNode; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.LinkedList; -import java.util.List; - -public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvider { - public ItemNodeRouter() { - setTranslationKey(BloodMagic.MODID + ".nodeRouter"); - setMaxStackSize(1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - CompoundNBT tag = stack.getTagCompound(); - BlockPos coords = getBlockPos(stack); - - if (coords != null && tag != null) { - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", coords.getX(), coords.getY(), coords.getZ())); - } - } - - @Override - public ActionResultType onItemUseFirst(PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (world.isRemote) { - return ActionResultType.PASS; - } - - TileEntity tileHit = world.getTileEntity(pos); - - if (!(tileHit instanceof IRoutingNode)) { - // TODO: Remove contained position? - BlockPos containedPos = getBlockPos(stack); - if (!containedPos.equals(BlockPos.ORIGIN)) { - this.setBlockPos(stack, BlockPos.ORIGIN); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.remove"), true); - return ActionResultType.FAIL; - } - return ActionResultType.FAIL; - } - IRoutingNode node = (IRoutingNode) tileHit; - BlockPos containedPos = getBlockPos(stack); - if (containedPos.equals(BlockPos.ORIGIN)) { - this.setBlockPos(stack, pos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.set"), true); - return ActionResultType.SUCCESS; - } else { - TileEntity pastTile = world.getTileEntity(containedPos); - if (pastTile instanceof IRoutingNode) { - IRoutingNode pastNode = (IRoutingNode) pastTile; - if (pastNode instanceof IMasterRoutingNode) { - IMasterRoutingNode master = (IMasterRoutingNode) pastNode; - - if (!node.isMaster(master)) { - if (node.getMasterPos().equals(BlockPos.ORIGIN)) //If the node is not the master and it is receptive - { - node.connectMasterToRemainingNode(world, new LinkedList<>(), master); - master.addConnection(pos, containedPos); - master.addNodeToList(node); - node.addConnection(containedPos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } - } else { - master.addConnection(pos, containedPos); - node.addConnection(containedPos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } - - } else if (node instanceof IMasterRoutingNode) { - IMasterRoutingNode master = (IMasterRoutingNode) node; - - if (!pastNode.isMaster(master)) { - if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //TODO: This is where the issue is - { - pastNode.connectMasterToRemainingNode(world, new LinkedList<>(), master); - master.addConnection(pos, containedPos); - pastNode.addConnection(pos); - master.addNodeToList(pastNode); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } - } else { - master.addConnection(pos, containedPos); - pastNode.addConnection(pos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } - } else { - //Both nodes are not master nodes, so normal linking - if (pastNode.getMasterPos().equals(node.getMasterPos())) { - if (!pastNode.getMasterPos().equals(BlockPos.ORIGIN)) { - TileEntity testTile = world.getTileEntity(pastNode.getMasterPos()); - if (testTile instanceof IMasterRoutingNode) { - IMasterRoutingNode master = (IMasterRoutingNode) testTile; - master.addConnection(pos, containedPos); - } - } - pastNode.addConnection(pos); - node.addConnection(containedPos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link.master"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } else if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //pastNode is not connected to a master, but node is - { - TileEntity tile = world.getTileEntity(node.getMasterPos()); - if (tile instanceof IMasterRoutingNode) { - IMasterRoutingNode master = (IMasterRoutingNode) tile; - master.addConnection(pos, containedPos); - master.addNodeToList(pastNode); - pastNode.connectMasterToRemainingNode(world, new LinkedList<>(), master); - } - pastNode.addConnection(pos); - node.addConnection(containedPos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } else if (node.getMasterPos().equals(BlockPos.ORIGIN)) //node is not connected to a master, but pastNode is - { - TileEntity tile = world.getTileEntity(pastNode.getMasterPos()); - if (tile instanceof IMasterRoutingNode) { - IMasterRoutingNode master = (IMasterRoutingNode) tile; - master.addConnection(pos, containedPos); - master.addNodeToList(node); - node.connectMasterToRemainingNode(world, new LinkedList<>(), master); - } - pastNode.addConnection(pos); - node.addConnection(containedPos); - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.routing.link"), true); - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } else { - this.setBlockPos(stack, BlockPos.ORIGIN); - return ActionResultType.SUCCESS; - } - } - } - } - - return ActionResultType.FAIL; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } - - public BlockPos getBlockPos(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return new BlockPos(stack.getTagCompound().getInteger(Constants.NBT.X_COORD), stack.getTagCompound().getInteger(Constants.NBT.Y_COORD), stack.getTagCompound().getInteger(Constants.NBT.Z_COORD)); - } - - public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { - NBTHelper.checkNBT(stack); - CompoundNBT itemTag = stack.getTagCompound(); - itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); - itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - return stack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java deleted file mode 100644 index b5f1da4e..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ /dev/null @@ -1,155 +0,0 @@ -package WayofTime.bloodmagic.item.routing; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.item.inventory.ItemInventory; -import WayofTime.bloodmagic.routing.*; -import WayofTime.bloodmagic.util.GhostItemHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandler; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider { - public static String[] names = {"exact", "ignoreNBT", "modItems", "oreDict"}; - - public ItemRouterFilter() { - super(); - - setTranslationKey(BloodMagic.MODID + ".itemFilter."); - setHasSubtypes(true); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[stack.getItemDamage()]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextHelper.localize("tooltip.bloodmagic.itemFilter." + names[stack.getItemDamage()])); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public IItemFilter getInputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) { - IItemFilter testFilter = new TestItemFilter(); - - switch (filterStack.getMetadata()) { - case 0: - testFilter = new TestItemFilter(); - break; - case 1: - testFilter = new IgnoreNBTItemFilter(); - break; - case 2: - testFilter = new ModIdItemFilter(); - break; - case 3: - testFilter = new OreDictItemFilter(); - break; - - default: - testFilter = new DefaultItemFilter(); - } - - List filteredList = new ArrayList<>(); - ItemInventory inv = new ItemInventory(filterStack, 9, ""); - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - - filteredList.add(ghostStack); - } - - testFilter.initializeFilter(filteredList, tile, handler, false); - return testFilter; - } - - @Override - public IItemFilter getOutputItemFilter(ItemStack filterStack, TileEntity tile, IItemHandler handler) { - IItemFilter testFilter; - - switch (filterStack.getMetadata()) { - case 0: - testFilter = new TestItemFilter(); - break; - case 1: - testFilter = new IgnoreNBTItemFilter(); - break; - case 2: - testFilter = new ModIdItemFilter(); - break; - case 3: - testFilter = new OreDictItemFilter(); - break; - - default: - testFilter = new DefaultItemFilter(); - } - - List filteredList = new ArrayList<>(); - ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.isEmpty()) { - ghostStack.setCount(Integer.MAX_VALUE); - } - - filteredList.add(ghostStack); - } - - testFilter.initializeFilter(filteredList, tile, handler, true); - return testFilter; - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=exact"); - variants.put(1, "type=ignorenbt"); - variants.put(2, "type=moditems"); - variants.put(3, "type=oredict"); - } - - @Override - public ItemStack getContainedStackForItem(ItemStack filterStack, ItemStack keyStack) { - ItemStack copyStack = keyStack.copy(); - GhostItemHelper.setItemGhostAmount(copyStack, 0); - copyStack.setCount(1); - return copyStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java deleted file mode 100644 index 496958e1..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigil.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.item.ItemBindableBase; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import net.minecraft.item.ItemStack; - -/** - * Base class for all (static) sigils. - */ -public class ItemSigil extends ItemBindableBase implements ISigil { - private int lpUsed; - - public ItemSigil(int lpUsed) { - super(); - - this.lpUsed = lpUsed; - - setMaxStackSize(1); - } - - public boolean isUnusable(ItemStack stack) { - NBTHelper.checkNBT(stack); - - return stack.getTagCompound().getBoolean(Constants.NBT.UNUSABLE); - } - - public ItemStack setUnusable(ItemStack stack, boolean unusable) { - NBTHelper.checkNBT(stack); - - stack.getTagCompound().setBoolean(Constants.NBT.UNUSABLE, unusable); - return stack; - } - - public int getLpUsed() { - return lpUsed; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java deleted file mode 100644 index e849c0c5..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.Effects; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.*; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; - -public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectProvider { - public ItemSigilAir() { - super("air", 50); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - boolean unusable = isUnusable(stack); - if (world.isRemote && !unusable) { - Vec3d vec = player.getLookVec(); - double wantedVelocity = 1.7; - - // TODO - Revisit after potions - if (player.isPotionActive(RegistrarBloodMagic.BOOST)) { - int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); - wantedVelocity += (1 + amplifier) * (0.35); - } - - player.motionX = vec.x * wantedVelocity; - player.motionY = vec.y * wantedVelocity; - player.motionZ = vec.z * wantedVelocity; - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - } - - if (!world.isRemote) { - if (!player.capabilities.isCreativeMode) - this.setUnusable(stack, !NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()); - - if (!unusable) - player.fallDistance = 0; - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean applyOnHitEffect(EnumDemonWillType type, ItemStack swordStack, ItemStack providerStack, LivingEntity attacker, LivingEntity target) { - target.addPotionEffect(new EffectInstance(Effects.LEVITATION, 200, 0)); - return true; - } - - @Override - public boolean providesEffectForWill(EnumDemonWillType type) { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java deleted file mode 100644 index 26b44789..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ /dev/null @@ -1,53 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.text.WordUtils; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; - -public class ItemSigilBase extends ItemSigil implements IVariantProvider { - - protected final String tooltipBase; - private final String name; - - public ItemSigilBase(String name, int lpUsed) { - super(lpUsed); - - setTranslationKey(BloodMagic.MODID + ".sigil." + name); - - this.name = name; - this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; - } - - public ItemSigilBase(String name) { - this(name, 0); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (TextHelper.canTranslate(tooltipBase + "desc")) - tooltip.addAll(Arrays.asList(WordUtils.wrap(TextHelper.localizeEffect(tooltipBase + "desc"), 30, "/cut", false).split("/cut"))); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=normal"); - } - - public String getName() { - return name; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java deleted file mode 100644 index db5c1c32..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ /dev/null @@ -1,83 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.*; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class ItemSigilBloodLight extends ItemSigilBase { - public ItemSigilBloodLight() { - super("blood_light", 10); - } - - @Override - public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { - if (getCooldownRemainder(stack) > 0) - reduceCooldown(stack); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - RayTraceResult mop = this.rayTrace(world, player, false); - - if (getCooldownRemainder(stack) > 0) - return super.onItemRightClick(world, player, hand); - - if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { - BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); - - if (world.isAirBlock(blockPos)) { - world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); - if (!world.isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); - } - resetCooldown(stack); - player.swingArm(hand); - return super.onItemRightClick(world, player, hand); - } - } else { - if (!world.isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - world.spawnEntity(new EntityBloodLight(world, player)); - network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); - } - resetCooldown(stack); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - public int getCooldownRemainder(ItemStack stack) { - return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING); - } - - public void reduceCooldown(ItemStack stack) { - NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); - } - - public void resetCooldown(ItemStack stack) { - NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java deleted file mode 100644 index 9e6359d9..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.world.World; - -public class ItemSigilBounce extends ItemSigilToggleableBase { - public ItemSigilBounce() { - super("bounce", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.BOUNCE, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java deleted file mode 100644 index d69e9a40..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.world.World; - -public class ItemSigilClaw extends ItemSigilToggleableBase { - public ItemSigilClaw() { - super("claw", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.CLING, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java deleted file mode 100644 index e0cb5d17..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.compress.CompressionRegistry; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemSigilCompression extends ItemSigilToggleableBase { - public ItemSigilCompression() { - super("compression", 200); - } - - // TODO REWRITE all compression stuff if someone has time - // TODO for now, there is a semi-working system in place - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - - if (PlayerHelper.isFakePlayer(player)) - return; - - ItemStack compressedStack = CompressionRegistry.compressInventory(player.inventory.mainInventory.toArray(new ItemStack[player.inventory.mainInventory.size()]), world); - - if (compressedStack != null) { - ItemEntity entityItem = new ItemEntity(world, player.posX, player.posY, player.posZ, compressedStack); - world.spawnEntity(entityItem); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java deleted file mode 100644 index 89f8663c..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ /dev/null @@ -1,49 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IAltarReader; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import com.google.common.collect.Lists; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; - -import java.util.List; - -public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { - - public ItemSigilDivination(boolean simple) { - super(simple ? "divination" : "seer"); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - if (!world.isRemote) { - super.onItemRightClick(world, player, hand); - - Binding binding = getBinding(stack); - if (binding != null) { - int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); - List toSend = Lists.newArrayList(); - if (!binding.getOwnerId().equals(player.getGameProfile().getId())) - toSend.add(new TranslationTextComponent(tooltipBase + "otherNetwork", binding.getOwnerName())); - toSend.add(new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence)); - ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } - } - - return super.onItemRightClick(world, player, hand); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java deleted file mode 100644 index 96061711..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ /dev/null @@ -1,25 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemSigilElementalAffinity extends ItemSigilToggleableBase { - public ItemSigilElementalAffinity() { - super("elemental_affinity", 200); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.fallDistance = 0; - player.extinguish(); - player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 2, 1, true, false)); - player.addPotionEffect(new EffectInstance(Effects.WATER_BREATHING, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java deleted file mode 100644 index 26855657..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ /dev/null @@ -1,30 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.Entity; -import net.minecraft.entity.monster.EndermanEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.world.World; - -import java.util.List; - -public class ItemSigilEnderSeverance extends ItemSigilToggleableBase { - public ItemSigilEnderSeverance() { - super("ender_severance", 200); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - List entityList = world.getEntitiesWithinAABB(Entity.class, new net.minecraft.util.math.AxisAlignedBB(player.posX - 4.5, player.posY - 4.5, player.posZ - 4.5, player.posX + 4.5, player.posY + 4.5, player.posZ + 4.5)); - for (Entity entity : entityList) { - if (entity instanceof EndermanEntity) - ((EndermanEntity) entity).addPotionEffect(new EffectInstance(RegistrarBloodMagic.PLANAR_BINDING, 40, 0)); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java deleted file mode 100644 index bedc2c06..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ /dev/null @@ -1,52 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; - -public class ItemSigilFastMiner extends ItemSigilToggleableBase { - public ItemSigilFastMiner() { - super("fast_miner", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - player.addPotionEffect(new EffectInstance(Effects.HASTE, 2, 1, true, false)); - } - - @Override - public boolean performArrayEffect(World world, BlockPos pos) { - double radius = 10; - int ticks = 600; - int potionPotency = 2; - - AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, bb); - for (PlayerEntity player : playerList) { - if (!player.isPotionActive(Effects.HASTE) || (player.isPotionActive(Effects.HASTE) && player.getActivePotionEffect(Effects.HASTE).getAmplifier() < potionPotency)) { - player.addPotionEffect(new EffectInstance(Effects.HASTE, ticks, potionPotency)); - if (!player.capabilities.isCreativeMode) { - player.hurtResistantTime = 0; - player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); - } - } - } - - return false; - } - - @Override - public boolean hasArrayEffect() { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java deleted file mode 100644 index 67a0d430..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.handler.event.GenericHandler; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemSigilFilledHand extends ItemSigilToggleableBase { - public ItemSigilFilledHand() { - super("hand", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - GenericHandler.filledHandMapMap.get(world).put(player, 4); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java deleted file mode 100644 index f9ef8238..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFluidBase.java +++ /dev/null @@ -1,178 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.ISigilFluidItem; -import WayofTime.bloodmagic.util.SigilFluidWrapper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLiquid; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper; -import net.minecraftforge.fluids.capability.wrappers.BlockWrapper; -import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; - -import javax.annotation.Nullable; - -public abstract class ItemSigilFluidBase extends ItemSigilBase implements ISigilFluidItem { - //Class for sigils that interact with fluids, either creating or deleting them. - //Sigils still have to define their own onRightClick behavior, but the actual fluid-interacting code is largely limited to here. - public final FluidStack sigilFluid; - - public ItemSigilFluidBase(String name, int lpUsed, FluidStack fluid) { - super(name, lpUsed); - sigilFluid = fluid; - } - - public ItemSigilFluidBase(String name, FluidStack fluid) { - super(name); - sigilFluid = fluid; - } - - public ItemSigilFluidBase(String name) { - super(name); - sigilFluid = null; - } - - //The following are handler functions for fluids, all genericized. - //They're all based off of the Forge FluidUtil methods, but directly taking the sigilFluid constant instead of getting an argument. - - /* Gets a fluid handler for the targeted block and siding. - * Works for both tile entity liquid containers and fluid blocks. - * This one is literally identical to the FluidUtil method of the same signature. - */ - @Nullable - protected IFluidHandler getFluidHandler(World world, BlockPos blockPos, @Nullable Direction side) { - BlockState state = world.getBlockState(blockPos); - Block block = state.getBlock(); - TileEntity tile = world.getTileEntity(blockPos); - if (tile != null) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - if (handler != null) - return handler; - } - if (block instanceof IFluidBlock) - return new FluidBlockWrapper((IFluidBlock) block, world, blockPos); - else if (block instanceof BlockLiquid) - return new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); - return null; - } - - /* Tries to insert fluid into a fluid handler. - * If doTransfer is false, only simulate the transfer. If true, actually do so. - * Returns true if the transfer is successful, false otherwise. - */ - protected boolean tryInsertSigilFluid(IFluidHandler destination, boolean doTransfer) { - if (destination == null) - return false; - return destination.fill(sigilFluid, doTransfer) > 0; - } - - /* Tries basically the oppostive of the above, removing fluids instead of adding them - */ - protected boolean tryRemoveFluid(IFluidHandler source, int amount, boolean doTransfer) { - if (source == null) - return false; - return source.drain(amount, doTransfer) != null; - } - - /* Tries to place a fluid block in the world. - * Returns true if successful, otherwise false. - * This is the big troublesome one, oddly enough. - * It's genericized in case anyone wants to create variant sigils with weird fluids. - */ - protected boolean tryPlaceSigilFluid(PlayerEntity player, World world, BlockPos blockPos) { - - //Make sure world coordinants are valid - if (world == null || blockPos == null) { - return false; - } - //Make sure fluid is placeable - Fluid fluid = sigilFluid.getFluid(); - if (!fluid.canBePlacedInWorld()) { - return false; - } - - //Check if the block is an air block or otherwise replaceable - BlockState state = world.getBlockState(blockPos); - Material mat = state.getMaterial(); - boolean isDestSolid = mat.isSolid(); - boolean isDestReplaceable = state.getBlock().isReplaceable(world, blockPos); - if (!world.isAirBlock(blockPos) && isDestSolid && !isDestReplaceable) { - return false; - } - - //If the fluid vaporizes, this exists here in the lava sigil solely so the code is usable for other fluids - if (world.provider.doesWaterVaporize() && fluid.doesVaporize(sigilFluid)) { - fluid.vaporize(player, world, blockPos, sigilFluid); - return true; - } - - //Finally we've done enough checking to make sure everything at the end is safe, let's place some fluid. - IFluidHandler handler; - Block block = fluid.getBlock(); - if (block instanceof IFluidBlock) - handler = new FluidBlockWrapper((IFluidBlock) block, world, blockPos); - else if (block instanceof BlockLiquid) - handler = new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); - else - handler = new BlockWrapper(block, world, blockPos); - return tryInsertSigilFluid(handler, true); - } - - @Override - public FluidStack getFluid(ItemStack sigil) { - return sigilFluid; - } - - @Override - public int getCapacity(ItemStack sigil) { - return 0; - } - - @Override - public FluidStack drain(ItemStack sigil, int maxDrain, boolean doDrain) { - Binding binding = getBinding(sigil); - - if (binding == null) - return null; - - SoulNetwork network = NetworkHelper.getSoulNetwork(binding); - - if (network.getCurrentEssence() < getLpUsed()) { - network.causeNausea(); - return null; - } - - if (doDrain) - network.syphon(SoulTicket.item(sigil, getLpUsed())); - - return sigilFluid; - } - - @Override - public int fill(ItemStack sigil, FluidStack resource, boolean doFill) { - return 0; - } - - @Override - public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT nbt) { - return new SigilFluidWrapper(stack, this); - } - -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java deleted file mode 100644 index 0f4b8118..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.enchantment.FrostWalkerEnchantment; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemSigilFrost extends ItemSigilToggleableBase { - public ItemSigilFrost() { - super("frost", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - FrostWalkerEnchantment.freezeNearby(player, world, player.getPosition(), 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java deleted file mode 100644 index 41faf9ba..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ /dev/null @@ -1,96 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.IGrowable; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.fml.common.eventhandler.Event.Result; - -public class ItemSigilGreenGrove extends ItemSigilToggleableBase { - public ItemSigilGreenGrove() { - super("green_grove", 150); - } - - @Override - public boolean onSigilUse(ItemStack stack, PlayerEntity player, World world, BlockPos blockPos, Direction side, float hitX, float hitY, float hitZ) { - if (PlayerHelper.isFakePlayer(player)) - return false; - - if (NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && applyBonemeal(world, blockPos, player, stack)) { - if (!world.isRemote) { - world.playEvent(2005, blockPos, 0); - } - return true; - } - - return false; - } - - @Override - public void onSigilUpdate(ItemStack stack, World worldIn, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - int range = 3; - int verticalRange = 2; - int posX = (int) Math.round(player.posX - 0.5f); - int posY = (int) player.posY; - int posZ = (int) Math.round(player.posZ - 0.5f); - - for (int ix = posX - range; ix <= posX + range; ix++) { - for (int iz = posZ - range; iz <= posZ + range; iz++) { - for (int iy = posY - verticalRange; iy <= posY + verticalRange; iy++) { - BlockPos blockPos = new BlockPos(ix, iy, iz); - BlockState state = worldIn.getBlockState(blockPos); - - if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { - if (state.getBlock() instanceof IGrowable) { - if (worldIn.rand.nextInt(50) == 0) { - BlockState preBlockState = worldIn.getBlockState(blockPos); - state.getBlock().updateTick(worldIn, blockPos, state, worldIn.rand); - - BlockState newState = worldIn.getBlockState(blockPos); - if (!newState.equals(preBlockState) && !worldIn.isRemote) - worldIn.playEvent(2005, blockPos, 0); - } - } - } - } - } - } - } - - private boolean applyBonemeal(World worldIn, BlockPos target, PlayerEntity player, ItemStack sigilStack) { - BlockState iblockstate = worldIn.getBlockState(target); - - BonemealEvent event = new BonemealEvent(player, worldIn, target, iblockstate, Hand.MAIN_HAND, sigilStack); - if (MinecraftForge.EVENT_BUS.post(event)) - return false; - else if (event.getResult() == Result.ALLOW) - return true; - - if (iblockstate.getBlock() instanceof IGrowable) { - IGrowable igrowable = (IGrowable) iblockstate.getBlock(); - - if (igrowable.canGrow(worldIn, target, iblockstate, worldIn.isRemote)) { - if (!worldIn.isRemote) { - if (igrowable.canUseBonemeal(worldIn, worldIn.rand, target, iblockstate)) - igrowable.grow(worldIn, worldIn.rand, target, iblockstate); - } - return true; - } - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java deleted file mode 100644 index ddd1937e..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.world.World; - -public class ItemSigilHaste extends ItemSigilToggleableBase { - public ItemSigilHaste() { - super("haste", 250); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.BOOST, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java deleted file mode 100644 index 425e9ee6..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ /dev/null @@ -1,303 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.key.IKeybindable; -import WayofTime.bloodmagic.client.key.KeyBindings; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IAltarReader; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; -import java.util.function.Consumer; - -public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAltarReader, ISigil.Holding, IMeshProvider { - public static final int inventorySize = 5; - - public ItemSigilHolding() { - super("holding"); - } - - @Override - public void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat) { - if (stack == player.getHeldItemMainhand() && stack.getItem() instanceof ItemSigilHolding && key.equals(KeyBindings.OPEN_HOLDING)) { - Utils.setUUID(stack); - player.openGui(BloodMagic.instance, Constants.Gui.SIGIL_HOLDING_GUI, player.getEntityWorld(), (int) player.posX, (int) player.posY, (int) player.posZ); - } - } - - @Override - public String getHighlightTip(ItemStack stack, String displayName) { - List inv = getInternalInventory(stack); - int currentSlot = getCurrentItemOrdinal(stack); - ItemStack item = inv.get(currentSlot); - - if (item.isEmpty()) - return displayName; - else - return TextHelper.localizeEffect("item.bloodmagic.sigil.holding.display", displayName, item.getDisplayName()); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.holding.press", KeyBindings.OPEN_HOLDING.getKey().getDisplayName())); - - if (!stack.hasTagCompound()) - return; - - List inv = getInternalInventory(stack); - int currentSlot = getCurrentItemOrdinal(stack); - ItemStack item = inv.get(currentSlot); - - for (int i = 0; i < inventorySize; i++) { - ItemStack invStack = inv.get(i); - if (!invStack.isEmpty()) - if (!item.isEmpty() && invStack == item) - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.holding.sigilInSlot", i + 1, "&o&n" + invStack.getDisplayName())); - else - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.holding.sigilInSlot", i + 1, invStack.getDisplayName())); - } - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return ActionResultType.FAIL; - - int currentSlot = getCurrentItemOrdinal(stack); - List inv = getInternalInventory(stack); - ItemStack itemUsing = inv.get(currentSlot); - - if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) - return ActionResultType.PASS; - - ActionResultType result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); - saveInventory(stack, inv); - - return result; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - int currentSlot = getCurrentItemOrdinal(stack); - List inv = getInternalInventory(stack); - ItemStack itemUsing = inv.get(currentSlot); - - if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) - return ActionResult.newResult(ActionResultType.PASS, stack); - - itemUsing.getItem().onItemRightClick(world, player, hand); - - saveInventory(stack, inv); - - return ActionResult.newResult(ActionResultType.PASS, stack); - } - - @Nonnull - @Override - public ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player) { - return getInternalInventory(holdingStack).get(getCurrentItemOrdinal(holdingStack)); - } - - public void saveInventory(ItemStack itemStack, List inventory) { - CompoundNBT itemTag = itemStack.getTagCompound(); - - if (itemTag == null) - itemStack.setTagCompound(itemTag = new CompoundNBT()); - - CompoundNBT inventoryTag = new CompoundNBT(); - ListNBT itemList = new ListNBT(); - - for (int i = 0; i < inventorySize; i++) { - if (!inventory.get(i).isEmpty()) { - CompoundNBT tag = new CompoundNBT(); - tag.putByte(Constants.NBT.SLOT, (byte) i); - inventory.get(i).writeToNBT(tag); - itemList.appendTag(tag); - } - } - - inventoryTag.put(Constants.NBT.ITEMS, itemList); - itemTag.put(Constants.NBT.ITEM_INVENTORY, inventoryTag); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { - if (stack.hasTagCompound()) - tickInternalInventory(stack, world, entity, itemSlot, isSelected); - } - - public void tickInternalInventory(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) { - for (ItemStack stack : getInternalInventory(itemStack)) { - if (stack.isEmpty() || !(stack.getItem() instanceof IBindable) || !(stack.getItem() instanceof ISigil)) - continue; - - Binding binding = ((IBindable) stack.getItem()).getBinding(stack); - if (binding == null) - continue; - - stack.getItem().onUpdate(stack, world, entity, itemSlot, isSelected); - } - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - // No-op - Just here to stop the super from running since we're using a mesh provider - } - - @Override - public ItemMeshDefinition getMeshDefinition() { - return stack -> { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("color")) - return new ModelResourceLocation(getRegistryName(), "type=color"); - return new ModelResourceLocation(getRegistryName(), "type=normal"); - }; - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("type=normal"); - variants.accept("type=color"); - } - - public static int next(int mode) { - int index = mode + 1; - - if (index >= inventorySize) { - index = 0; - } - - return index; - } - - public static int prev(int mode) { - int index = mode - 1; - - if (index < 0) { - index = inventorySize; - } - - return index; - } - - private static void initModeTag(ItemStack stack) { - if (!stack.hasTagCompound()) { - stack = NBTHelper.checkNBT(stack); - stack.getTagCompound().setInteger(Constants.NBT.CURRENT_SIGIL, inventorySize); - } - } - - public static ItemStack getItemStackInSlot(ItemStack itemStack, int slot) { - if (itemStack.getItem() instanceof ItemSigilHolding) { - List inv = getInternalInventory(itemStack); - if (inv != null) - return inv.get(slot == 5 ? 4 : slot); - else - return ItemStack.EMPTY; - } - - return ItemStack.EMPTY; - } - - public static int getCurrentItemOrdinal(ItemStack stack) { - if (stack.getItem() instanceof ItemSigilHolding) { - initModeTag(stack); - int currentSigil = stack.getTagCompound().getInteger(Constants.NBT.CURRENT_SIGIL); - currentSigil = MathHelper.clamp(currentSigil, 0, inventorySize - 1); - return currentSigil; - } - - return 0; - } - - public static List getInternalInventory(ItemStack stack) { - initModeTag(stack); - CompoundNBT tagCompound = stack.getTagCompound(); - - if (tagCompound == null) { - return NonNullList.withSize(inventorySize, ItemStack.EMPTY); - } - - CompoundNBT inventoryTag = tagCompound.getCompoundTag(Constants.NBT.ITEM_INVENTORY); - ListNBT tagList = inventoryTag.getList(Constants.NBT.ITEMS, 10); - - if (tagList.isEmpty()) { - return NonNullList.withSize(inventorySize, ItemStack.EMPTY); - } - - List inv = NonNullList.withSize(inventorySize, ItemStack.EMPTY); - - for (int i = 0; i < tagList.tagCount(); i++) { - CompoundNBT data = tagList.getCompoundTagAt(i); - byte j = data.getByte(Constants.NBT.SLOT); - - if (j >= 0 && j < inv.size()) { - inv.set(j, new ItemStack(data)); - } - } - - return inv; - } - - public static void cycleToNextSigil(ItemStack itemStack, int mode) { - if (itemStack.getItem() instanceof ItemSigilHolding) { - initModeTag(itemStack); - - int index = mode; - if (mode == 120 || mode == -120) { - int currentIndex = getCurrentItemOrdinal(itemStack); - ItemStack currentItemStack = getItemStackInSlot(itemStack, currentIndex); - if (currentItemStack.isEmpty()) - return; - if (mode < 0) { - index = next(currentIndex); - currentItemStack = getItemStackInSlot(itemStack, index); - - while (currentItemStack.isEmpty()) { - index = next(index); - currentItemStack = getItemStackInSlot(itemStack, index); - } - } else { - index = prev(currentIndex); - currentItemStack = getItemStackInSlot(itemStack, index); - - while (currentItemStack.isEmpty()) { - index = prev(index); - currentItemStack = getItemStackInSlot(itemStack, index); - } - } - } - - itemStack.getTagCompound().setInteger(Constants.NBT.CURRENT_SIGIL, index); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java deleted file mode 100644 index 9d259798..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -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.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; - - -public class ItemSigilLava extends ItemSigilFluidBase { - - public ItemSigilLava() { - super("lava", 1000, new FluidStack(FluidRegistry.LAVA, 1000)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - if (!world.isRemote && !isUnusable(stack)) { - RayTraceResult rayTrace = this.rayTrace(world, player, false); - - if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { - return ActionResult.newResult(ActionResultType.PASS, stack); - } - - BlockPos blockPos = rayTrace.getBlockPos(); - - if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, rayTrace.sideHit, stack)) { - //Case for if block at blockPos is a fluid handler like a tank - //Try to put fluid into tank - IFluidHandler destination = getFluidHandler(world, blockPos, null); - if (destination != null && tryInsertSigilFluid(destination, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - boolean result = tryInsertSigilFluid(destination, true); - if (result) - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - //Do the same as above, but use sidedness to interact with the fluid handler. - IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); - if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - boolean result = tryInsertSigilFluid(destinationSide, true); - if (result) - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - //Case for if block at blockPos is not a tank - //Place fluid in world - if (destination == null && destinationSide == null) { - BlockPos targetPos = blockPos.offset(rayTrace.sideHit); - if (tryPlaceSigilFluid(player, world, targetPos) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - } - } - } - return super.onItemRightClick(world, player, hand); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java deleted file mode 100644 index 6bf62a91..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ /dev/null @@ -1,43 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.item.ExperienceOrbEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.World; - -import java.util.List; - -public class ItemSigilMagnetism extends ItemSigilToggleableBase { - public ItemSigilMagnetism() { - super("magnetism", 50); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - int range = 5; - int verticalRange = 5; - float posX = Math.round(player.posX); - float posY = (float) (player.posY - player.getEyeHeight()); - float posZ = Math.round(player.posZ); - List entities = player.getEntityWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); - List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(ExperienceOrbEntity.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).grow(range, verticalRange, range)); - - for (ItemEntity entity : entities) { - if (entity != null && !world.isRemote && !entity.isDead) { - entity.onCollideWithPlayer(player); - } - } - - for (ExperienceOrbEntity xpOrb : xpOrbs) { - if (xpOrb != null && !world.isRemote) { - xpOrb.onCollideWithPlayer(player); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java deleted file mode 100644 index 5edc3928..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ /dev/null @@ -1,217 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import com.google.common.base.Predicate; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class ItemSigilPhantomBridge extends ItemSigilToggleableBase { - public static final Predicate IS_PHANTOM_ACTIVE = (Entity entity) -> entity instanceof PlayerEntity && isPhantomActive((PlayerEntity) entity); - - public static final String[] CIRCLE7X7 = new String[]{ - " XXX ", - " XXXXX ", - "XXXXXXX", - "XXXXXXX", - "XXXXXXX", - " XXXXX ", - " XXX " - }; - - public static final String[] CIRCLE9X9 = new String[]{ - " XXXXX ", - " XXXXXXX ", - "XXXXXXXXX", - "XXXXXXXXX", - "XXXXXXXXX", - "XXXXXXXXX", - "XXXXXXXXX", - " XXXXXXX ", - " XXXXX " - }; - - //imagine you're looking into positive Z - public static final String[] DIAG = new String[]{ - "XXX ", // ----------------- - "XXXX ", // Template Guide - "XXXXX ", // ----------------- - " XXXXX",// ^ // You stand in the bottom right corner, 1 block right, 1 block below the bottom right X - " XXXX",// | // inverted: flips it so you are in top left corner - " XXX" // Z // XnZ: mirrors the template on the X axis - // <--X - }; - - private Map> prevPositionMap = new HashMap<>(); - - public ItemSigilPhantomBridge() { - super("phantom_bridge", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - if (!prevPositionMap.containsKey(player)) { - prevPositionMap.put(player, Pair.of(player.posX, player.posZ)); - } - - if ((!player.onGround && !player.isRiding()) && !player.isSneaking()) { - prevPositionMap.put(player, Pair.of(player.posX, player.posZ)); - return; - } - - int verticalOffset = -1; - - if (player.isSneaking()) - verticalOffset--; - - Pair prevPosition = prevPositionMap.get(player); - - double playerVelX = player.posX - prevPosition.getLeft(); - double playerVelZ = player.posZ - prevPosition.getRight(); - - double totalVel = Math.sqrt(playerVelX * playerVelX + playerVelZ * playerVelZ); - //Moves more than totalVel^2 blocks in any direction within a tick - if (totalVel > 2) { - //I am SURE you are teleporting! - playerVelX = 0; - playerVelZ = 0; - totalVel = 0; - } - - BlockPos playerPos = player.getPosition(); - int posX = playerPos.getX(); - int posY = playerPos.getY(); - int posZ = playerPos.getZ(); - - //Standing still, sneaking or walking with framerate drops - if (totalVel >= 0 && totalVel < 0.3) { - circleTemplate7x7(posX, posY, posZ, verticalOffset, world); - //anything between the first case and being slightly faster than walking - //walking fairly quickly on X-axis - } else if (playerVelZ > -0.2 && playerVelZ < 0.2) { - if (playerVelX > 0.4) { - if (playerVelX > 1) { - rectangleBridge(posX, posY, posZ, verticalOffset, world, -1, 1, 7, 9); // long bridge - } - rectangleBridge(posX, posY, posZ, verticalOffset, world, -2, 2, 1, 6); // short bridge - } - if (playerVelX < -0.4) { - if (playerVelX < -1) { - rectangleBridge(posX, posY, posZ, verticalOffset, world, 7, 9, -1, 1); - } - rectangleBridge(posX, posY, posZ, verticalOffset, world, -2, 2, -6, -1); - } - //walking fairly quickly on Z-axis - } else if (playerVelX > -0.2 && playerVelX < 0.2) { - if (playerVelZ > 0.4) { - if (playerVelZ > 1) { - rectangleBridge(posX, posY, posZ, verticalOffset, world, 2, 6, -2, 2); - } - rectangleBridge(posX, posY, posZ, verticalOffset, world, 1, 6, -2, 2); - } - if (playerVelZ < -0.4) { - if (playerVelZ < -1) { - rectangleBridge(posX, posY, posZ, verticalOffset, world, -9, -7, -1, 1); - } - rectangleBridge(posX, posY, posZ, verticalOffset, world, -6, -1, -2, 2); - } - } else if (playerVelX > 0.2) { // diagonal movement - if (playerVelZ > 0.2) { - templateReaderCustom(posX, posY, posZ, verticalOffset, world, 1, 1, DIAG, false, false); - } else if (playerVelZ < -0.2) { - templateReaderCustom(posX, posY, posZ, verticalOffset, world, 1, -1, DIAG, false, true); - } - } else if (playerVelX < -0.2) { - if (playerVelZ > 0.2) { - templateReaderCustom(posX, posY, posZ, verticalOffset, world, -1, 1, DIAG, true, true); - } else if (playerVelZ < -0.2) { - templateReaderCustom(posX, posY, posZ, verticalOffset, world, -1, -1, DIAG, true, false); - } - } else { - circleTemplate9x9(posX, posY, posZ, verticalOffset, world); - } - - prevPositionMap.put(player, Pair.of(player.posX, player.posZ)); - } - - private static void circleTemplate9x9(int posX, int posY, int posZ, int verticalOffset, World world) { - int x = -5; - int z = -5; - templateReader(posX, posY, posZ, verticalOffset, world, z, x, CIRCLE9X9); - } - - private static void circleTemplate7x7(int posX, int posY, int posZ, int verticalOffset, World world) { - int x = -4; - int z = -4; - templateReader(posX, posY, posZ, verticalOffset, world, z, x, CIRCLE7X7); - } - - private static void rectangleBridge(int posX, int posY, int posZ, int verticalOffset, World world, int startZ, int endZ, int startX, int endX) { - for (int z = startZ; z <= endZ; z++) { - for (int x = startX; x <= endX; x++) { - BlockPos blockPos = new BlockPos(posX + x, posY + verticalOffset, posZ + z); - - if (world.isAirBlock(blockPos)) - world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState()); - } - } - } - - private static void templateReader(int posX, int posY, int posZ, int verticalOffset, World world, int offsetZ, int offsetX, String[] template) { - templateReaderCustom(posX, posY, posZ, verticalOffset, world, offsetZ, offsetX, template, false, false); - } - - private static void templateReaderCustom(int posX, int posY, int posZ, int verticalOffset, World world, int offsetZ, int offsetX, String[] template, boolean inverted, boolean XnZ) { - int x = 0; - for (String row : template) { - if (inverted) - x--; - else - x++; - int z = 0; - for (char block : row.toCharArray()) { - if (inverted && !XnZ || XnZ && !inverted) - z--; - else - z++; - if (block == 'X') { - BlockPos blockPos = new BlockPos(posX + offsetX + x, posY + verticalOffset, posZ + offsetZ + z); - - if (world.isAirBlock(blockPos)) - world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState()); - } - } - } - } - - public static boolean isPhantomActive(PlayerEntity entity) { - for (int i = 0; i < entity.inventory.getSizeInventory(); i++) { - ItemStack stack = entity.inventory.getStackInSlot(i); - if (stack.getItem() instanceof ItemSigilPhantomBridge) - return NBTHelper.checkNBT(stack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); - if (stack.getItem() instanceof ItemSigilHolding) { - List inv = ItemSigilHolding.getInternalInventory(stack); - for (int j = 0; j < ItemSigilHolding.inventorySize; j++) { - ItemStack invStack = inv.get(j); - if (invStack.getItem() instanceof ItemSigilPhantomBridge) - return NBTHelper.checkNBT(invStack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); - } - } - - } - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java deleted file mode 100644 index 686e57eb..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.tile.TileSpectralBlock; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class ItemSigilSuppression extends ItemSigilToggleableBase { - public ItemSigilSuppression() { - super("suppression", 400); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - int x = (int) player.posX; - int y = (int) player.posY; - int z = (int) player.posZ; - final int radius = 5; - final int refresh = 100; - - for (int i = -radius; i <= radius; i++) { - for (int j = -radius; j <= radius; j++) { - for (int k = -radius; k <= radius; k++) { - if (i * i + j * j + k * k >= (radius + 0.50f) * (radius + 0.50f)) { - continue; - } - - BlockPos blockPos = new BlockPos(x + i, y + j, z + k); - BlockState state = world.getBlockState(blockPos); - - if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) - TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); - else { - TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TileSpectralBlock) - ((TileSpectralBlock) tile).resetDuration(refresh); - } - } - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java deleted file mode 100644 index 3950db3b..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ /dev/null @@ -1,160 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.teleport.Teleports; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.util.INBTSerializable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.UUID; - -public class ItemSigilTeleposition extends ItemSigilBase { - - public ItemSigilTeleposition() { - super("teleposition"); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - - TeleportLocation location = getTeleportLocation(stack); - if (location != null) { - tooltip.add(""); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", location.pos.getX(), location.pos.getY(), location.pos.getZ())); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", location.dim)); - } - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - TeleportLocation location = getTeleportLocation(stack); - Binding binding = getBinding(stack); - if (!world.isRemote && location != null && binding != null) { - World teleportTo = DimensionManager.getWorld(location.dim); - if (teleportTo != null) { - TileEntity tile = teleportTo.getTileEntity(location.pos); - if (tile instanceof TileTeleposer) { - BlockPos blockPos = location.pos.up(); - UUID bindingOwnerID = binding.getOwnerId(); - if (world.provider.getDimension() == location.dim) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, bindingOwnerID, true)); - - } else { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, bindingOwnerID, world, tile.getWorld().provider.getDimension(), true)); - } - } - } - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResultType.FAIL; - - if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) { - if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) { - TeleportLocation teleportLocation = new TeleportLocation(world.provider.getDimension(), pos); - updateLocation(stack, teleportLocation); - return ActionResultType.SUCCESS; - } - } - return ActionResultType.FAIL; - } - - @Nullable - public TeleportLocation getTeleportLocation(ItemStack stack) { - if (!(stack.getItem() instanceof ItemSigilTeleposition)) - return null; - - if (!stack.hasTagCompound()) - return null; - - CompoundNBT locationTag = stack.getSubCompound("tplocation"); - if (locationTag == null) - return null; - - return TeleportLocation.fromTag(locationTag); - } - - public void updateLocation(ItemStack stack, TeleportLocation location) { - CompoundNBT tagCompound; - if (!stack.hasTagCompound()) - stack.setTagCompound(tagCompound = new CompoundNBT()); - else - tagCompound = stack.getTagCompound(); - - tagCompound.putTag("tplocation", location.serializeNBT()); - } - - public static class TeleportLocation implements INBTSerializable { - - private int dim; - private BlockPos pos; - - private TeleportLocation() { - } - - public TeleportLocation(int dim, BlockPos pos) { - this.dim = dim; - this.pos = pos; - } - - public TeleportLocation(int dim, int x, int y, int z) { - this(dim, new BlockPos(x, y, z)); - } - - @Override - public CompoundNBT serializeNBT() { - CompoundNBT tag = new CompoundNBT(); - tag.putInt("dim", dim); - tag.putLong("pos", pos.toLong()); - return tag; - } - - @Override - public void deserializeNBT(CompoundNBT nbt) { - this.dim = nbt.getInt("dim"); - this.pos = BlockPos.fromLong(nbt.getLong("pos")); - } - - public static TeleportLocation fromTag(CompoundNBT tpTag) { - TeleportLocation location = new TeleportLocation(); - location.deserializeNBT(tpTag); - return location; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java deleted file mode 100644 index bb21d6d6..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java +++ /dev/null @@ -1,96 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.iface.IActivatable; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * Base class for all toggleable sigils. - */ -public class ItemSigilToggleable extends ItemSigil implements IActivatable { - - public ItemSigilToggleable(int lpUsed) { - super(lpUsed); - } - - @Override - public boolean getActivated(ItemStack stack) { - return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); - } - - @Override - public ItemStack setActivatedState(ItemStack stack, boolean activated) { - if (!stack.isEmpty()) { - NBTHelper.checkNBT(stack).getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); - return stack; - } - - return stack; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - if (!world.isRemote && !isUnusable(stack)) { - if (player.isSneaking()) - setActivatedState(stack, !getActivated(stack)); - if (getActivated(stack)) - return super.onItemRightClick(world, player, hand); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - - Binding binding = getBinding(stack); - if (binding == null || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while toggling state - return ActionResultType.PASS; - - return onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ) ? ActionResultType.SUCCESS : ActionResultType.FAIL; - } - - public boolean onSigilUse(ItemStack itemStack, PlayerEntity player, World world, BlockPos blockPos, Direction side, float hitX, float hitY, float hitZ) { - return false; - } - - @Override - public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { - if (!worldIn.isRemote && entityIn instanceof ServerPlayerEntity && getActivated(stack)) { - if (entityIn.ticksExisted % 100 == 0) { - if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((PlayerEntity) entityIn, SoulTicket.item(stack, worldIn, entityIn, getLpUsed())).isSuccess()) { - setActivatedState(stack, false); - } - } - - onSigilUpdate(stack, worldIn, (PlayerEntity) entityIn, itemSlot, isSelected); - } - } - - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java deleted file mode 100644 index 190e8b98..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ /dev/null @@ -1,54 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; -import java.util.Locale; -import java.util.function.Consumer; - -public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMeshProvider { - - protected final String tooltipBase; - private final String name; - - public ItemSigilToggleableBase(String name, int lpUsed) { - super(lpUsed); - - setTranslationKey(BloodMagic.MODID + ".sigil." + name); - setCreativeTab(BloodMagic.TAB_BM); - - this.name = name; - this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - if (!stack.hasTagCompound()) - return; - - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated")).getFormattedText()); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("sigil_" + name.toLowerCase(Locale.ROOT)); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("active=false"); - variants.accept("active=true"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java deleted file mode 100644 index fa898cb9..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ /dev/null @@ -1,142 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.MobSpawnerTileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; - -public class ItemSigilTransposition extends ItemSigilBase { - - public ItemSigilTransposition() { - super("transposition", 1000); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - - if (!stack.hasTagCompound()) - return; - CompoundNBT tag = stack.getTagCompound(); - - if (tag.hasKey("stored")) { - tooltip.add(" "); - tooltip.add(tag.getCompound("stored").getString("display")); - } - } - - @SideOnly(Side.CLIENT) - @Override - public String getItemStackDisplayName(ItemStack stack) { - if (!stack.hasTagCompound()) - return super.getItemStackDisplayName(stack); - - CompoundNBT tag = stack.getTagCompound(); - if (tag.hasKey("stored")) - return super.getItemStackDisplayName(stack) + " (" + tag.getCompound("stored").getString("display") + ")"; - - return super.getItemStackDisplayName(stack); - } - - @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos blockPos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResultType.FAIL; - - BlockState state = world.getBlockState(blockPos); - if (!world.isRemote) { - if (BloodMagicAPI.INSTANCE.getBlacklist().getTransposition().contains(state)) - return ActionResultType.FAIL; - - if (player.isSneaking() && stack.hasTagCompound() && !stack.getTagCompound().hasKey("stored")) { - if (state.getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && state.getBlockHardness(world, blockPos) >= 0) { - int cost = getLpUsed(); - - CompoundNBT stored = new CompoundNBT(); - stored.setTag("state", NBTUtil.writeBlockState(new CompoundNBT(), state)); - stored.setString("display", state.getBlock().getPickBlock(state, null, world, blockPos, player).getDisplayName()); - if (state.getBlock().hasTileEntity(state)) { - TileEntity tile = world.getTileEntity(blockPos); - if (tile != null) { - cost *= 5; - stored.setTag("tileData", tile.writeToNBT(new CompoundNBT())); - - if (world.getTileEntity(blockPos) instanceof MobSpawnerTileEntity) - cost *= 6; - } - } - - stack.getTagCompound().setTag("stored", stored); - NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, cost)); - world.removeTileEntity(blockPos); - world.setBlockToAir(blockPos); - return ActionResultType.SUCCESS; - } - } else if (stack.hasTagCompound() && stack.getTagCompound().hasKey("stored")) { - BlockState worldState = world.getBlockState(blockPos); - CompoundNBT storedTag = stack.getTagCompound().getCompoundTag("stored"); - BlockState storedState = NBTUtil.readBlockState(storedTag.getCompound("state")); - CompoundNBT tileData = storedTag.hasKey("tileData") ? storedTag.getCompound("tileData") : null; - - if (!worldState.getBlock().isReplaceable(world, blockPos)) - blockPos = blockPos.offset(side); - - if (!stack.isEmpty() && player.canPlayerEdit(blockPos, side, stack) && world.mayPlace(storedState.getBlock(), blockPos, false, side, player)) { - if (world.setBlockState(blockPos, storedState, 3)) { - storedState.getBlock().onBlockPlacedBy(world, blockPos, storedState, player, ItemStack.EMPTY); - - if (tileData != null) { - tileData.setInteger("x", blockPos.getX()); - tileData.setInteger("y", blockPos.getY()); - tileData.setInteger("z", blockPos.getZ()); - TileEntity worldTile = world.getTileEntity(blockPos); - if (worldTile != null) - worldTile.readFromNBT(tileData); - } - - world.notifyBlockUpdate(blockPos, state, state, 3); - stack.getTagCompound().removeTag("stored"); - return ActionResultType.SUCCESS; - } - } - } - } - return ActionResultType.FAIL; - } - - // We only want to send the display name to the client rather than the bloated tag with tile data and such - @Nullable - @Override - public CompoundNBT getNBTShareTag(ItemStack stack) { - if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("stored")) - return super.getNBTShareTag(stack); - - CompoundNBT shareTag = stack.getTagCompound().copy(); - CompoundNBT storedTag = shareTag.getCompound("stored"); - storedTag.removeTag("state"); - storedTag.removeTag("stored"); - - return shareTag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java deleted file mode 100644 index 809042d1..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ /dev/null @@ -1,97 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -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.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; - -public class ItemSigilVoid extends ItemSigilFluidBase { - public ItemSigilVoid() { - super("void", 50, null); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - if (!world.isRemote && !isUnusable(stack)) { - RayTraceResult rayTrace = this.rayTrace(world, player, true); - - if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { - return ActionResult.newResult(ActionResultType.PASS, stack); - } - - BlockPos blockPos = rayTrace.getBlockPos(); - - if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, rayTrace.sideHit, stack)) { - //Void is simpler than the other fluid sigils, because getFluidHandler grabs fluid blocks just fine - //So extract from fluid tanks with a null side; or drain fluid blocks. - IFluidHandler destination = getFluidHandler(world, blockPos, null); - if (destination != null && tryRemoveFluid(destination, 1000, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - if (tryRemoveFluid(destination, 1000, true)) - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - //Do the same as above, but use sidedness to interact with the fluid handler. - IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); - if (destinationSide != null && tryRemoveFluid(destinationSide, 1000, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - if (tryRemoveFluid(destinationSide, 1000, true)) - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - } - } - return super.onItemRightClick(world, player, hand); - } - - @Override - public FluidStack getFluid(ItemStack sigil) { - return null; - } - - @Override - public int getCapacity(ItemStack sigil) { - return 10000; - } - - @Override - public int fill(ItemStack sigil, FluidStack resource, boolean doFill) { - if (resource == null || resource.amount <= 0) - return 0; - - Binding binding = getBinding(sigil); - - if (binding == null) - return 0; - - int capacity = getCapacity(sigil); - - if (!doFill) - return Math.min(capacity, resource.amount); - - SoulNetwork network = NetworkHelper.getSoulNetwork(binding); - - if (network.getCurrentEssence() < getLpUsed()) { - network.causeNausea(); - return 0; - } - - network.syphon(SoulTicket.item(sigil, getLpUsed())); - return Math.min(capacity, resource.amount); - } -} - diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java deleted file mode 100644 index 9417adc1..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ /dev/null @@ -1,79 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.Blocks; -import net.minecraft.block.CauldronBlock; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -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.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; - -public class ItemSigilWater extends ItemSigilFluidBase { - public ItemSigilWater() { - super("water", 100, new FluidStack(FluidRegistry.WATER, 1000)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.newResult(ActionResultType.FAIL, stack); - - if (!world.isRemote && !isUnusable(stack)) { - RayTraceResult rayTrace = this.rayTrace(world, player, false); - - if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) { - return ActionResult.newResult(ActionResultType.PASS, stack); - } - - BlockPos blockPos = rayTrace.getBlockPos(); - - if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, rayTrace.sideHit, stack)) { - //Case for if block at blockPos is a fluid handler like a tank - //Try to put fluid into tank - IFluidHandler destination = getFluidHandler(world, blockPos, null); - if (destination != null && tryInsertSigilFluid(destination, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - boolean result = tryInsertSigilFluid(destination, true); - if (result) - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - //Do the same as above, but use sidedness to interact with the fluid handler. - IFluidHandler destinationSide = getFluidHandler(world, blockPos, rayTrace.sideHit); - if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - boolean result = tryInsertSigilFluid(destinationSide, true); - if (result) - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - - //Special vanilla cauldron handling, yay. - if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().withProperty(CauldronBlock.LEVEL, 3)); - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - - //Case for if block at blockPos is not a tank - //Place fluid in world - if (destination == null && destinationSide == null) { - BlockPos targetPos = blockPos.offset(rayTrace.sideHit); - if (tryPlaceSigilFluid(player, world, targetPos) && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) { - return ActionResult.newResult(ActionResultType.SUCCESS, stack); - } - } - } - } - - return super.onItemRightClick(world, player, hand); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java deleted file mode 100644 index fffbb349..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.item.sigil; - -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.world.World; - -public class ItemSigilWhirlwind extends ItemSigilToggleableBase { - public ItemSigilWhirlwind() { - super("whirlwind", 250); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - if (PlayerHelper.isFakePlayer(player)) - return; - - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.WHIRLWIND, 2, 0, true, false)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java deleted file mode 100644 index 3445bbe1..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ /dev/null @@ -1,122 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemEnum; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Locale; - -public class ItemMonsterSoul extends ItemEnum.Variant implements IDemonWill { - - public ItemMonsterSoul() { - super(WillType.class, "monster_soul"); - - setMaxStackSize(1); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - tooltip.add(TextHelper.localize("tooltip.bloodmagic.will", getWill(getType(stack), stack))); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public EnumDemonWillType getType(ItemStack stack) { - return EnumDemonWillType.values()[stack.getItemDamage() % 5]; - } - - @Override - public double getWill(EnumDemonWillType type, ItemStack soulStack) { - if (type != this.getType(soulStack)) { - return 0; - } - - NBTHelper.checkNBT(soulStack); - - CompoundNBT tag = soulStack.getTagCompound(); - - return tag.getDouble(Constants.NBT.SOULS); - } - - @Override - public void setWill(EnumDemonWillType type, ItemStack soulStack, double souls) { - NBTHelper.checkNBT(soulStack); - - CompoundNBT tag = soulStack.getTagCompound(); - - soulStack.setItemDamage(type.ordinal()); - - tag.putDouble(Constants.NBT.SOULS, souls); - } - - @Override - public double drainWill(EnumDemonWillType type, ItemStack soulStack, double drainAmount) { - double souls = getWill(type, soulStack); - - double soulsDrained = Math.min(drainAmount, souls); - setWill(type, soulStack, souls - soulsDrained); - - return soulsDrained; - } - - @Override - public ItemStack createWill(int meta, double number) { - ItemStack soulStack = new ItemStack(this, 1, meta % 5); - setWill(getType(soulStack), soulStack, number); - return soulStack; - } - - @Override - public double getWill(ItemStack willStack) { - return this.getWill(EnumDemonWillType.DEFAULT, willStack); - } - - @Override - public void setWill(ItemStack willStack, double will) { - this.setWill(EnumDemonWillType.DEFAULT, willStack, will); - } - - @Override - public double drainWill(ItemStack willStack, double drainAmount) { - return this.drainWill(EnumDemonWillType.DEFAULT, willStack, drainAmount); - } - - public enum WillType implements ISubItem { - - RAW, - CORROSIVE, - DESTRUCTIVE, - VENGEFUL, - STEADFAST, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL, count, ordinal()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java deleted file mode 100644 index 2406975f..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ /dev/null @@ -1,80 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.function.Consumer; - -public class ItemSentientArmourGem extends Item implements IMeshProvider { - public ItemSentientArmourGem() { - super(); - - setCreativeTab(BloodMagic.TAB_BM); - setTranslationKey(BloodMagic.MODID + ".sentientArmourGem"); - setMaxStackSize(1); - } - - public EnumDemonWillType getCurrentType(ItemStack stack) { - return EnumDemonWillType.DEFAULT; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - boolean hasSentientArmour = false; - NonNullList armourInventory = player.inventory.armorInventory; - for (ItemStack armourStack : armourInventory) { - if (armourStack != null && armourStack.getItem() instanceof ItemSentientArmour) { - hasSentientArmour = true; - } - } - - if (hasSentientArmour) { - ItemSentientArmour.revertAllArmour(player); - } else { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, player); - -// PlayerDemonWillHandler.consumeDemonWill(player, willBracket[bracket]); - ItemSentientArmour.convertPlayerArmour(type, will, player); - } - - return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand)); - } - - @SideOnly(Side.CLIENT) - @Override - public ItemMeshDefinition getMeshDefinition() { - return stack -> { - boolean flag = false; - NonNullList armourInventory = Minecraft.getInstance().player.inventory.armorInventory; - for (ItemStack armourStack : armourInventory) { - if (armourStack != null && armourStack.getItem() instanceof ItemSentientArmour) { - flag = true; - } - } - - return new ModelResourceLocation(stack.getItem().getRegistryName(), "type=" + (flag ? "" : "de") + "activated"); - }; - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("type=activated"); - variants.accept("type=deactivated"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java deleted file mode 100644 index 5fcc00bb..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ /dev/null @@ -1,489 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.item.AxeItem; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.*; -import java.util.function.Consumer; - -public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { - public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; - public static double[] defaultDamageAdded = new double[]{1, 2, 3, 3.5, 4}; - public static double[] destructiveDamageAdded = new double[]{2, 3, 4, 5, 6}; - public static double[] vengefulDamageAdded = new double[]{0, 0.5, 1, 1.5, 2}; - public static double[] steadfastDamageAdded = new double[]{0, 0.5, 1, 1.5, 2}; - public static double[] defaultDigSpeedAdded = new double[]{1, 1.5, 2, 3, 4}; - public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75}; - public static double[] soulDrop = new double[]{2, 4, 7, 10, 13}; - public static double[] staticDrop = new double[]{1, 1, 2, 3, 3}; - - public static double[] healthBonus = new double[]{0, 0, 0, 0, 0}; //TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[]{-3, -2.8, -2.7, -2.6, -2.5}; - public static double[] destructiveAttackSpeed = new double[]{-3.1, -3.1, -3.2, -3.3, -3.3}; - - public static int[] absorptionTime = new int[]{200, 300, 400, 500, 600}; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[]{25, 50, 60, 80, 100}; - public static int[] poisonLevel = new int[]{0, 0, 0, 1, 1}; - - public static double[] movementSpeed = new double[]{0.05, 0.1, 0.15, 0.2, 0.25}; - - public final double baseAttackDamage = 8; - public final double baseAttackSpeed = -3; - - public ItemSentientAxe() { - super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL, 8.0F, 3.1F); - setMaxDamage(getMaxDamage() * 2); -// super(ModItems.soulToolMaterial); - - setTranslationKey(BloodMagic.MODID + ".sentientAxe"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - float value = super.getDestroySpeed(stack, state); - if (value > 1) { - return (float) (value + getDigSpeedOfSword(stack)); - } else { - return value; - } - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) { - if (willBracket < 0) { - return 0; - } - - switch (type) { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) { - switch (type) { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isEntityAlive()) { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof PlayerEntity) { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); - if (offStack.getItem() instanceof ISentientSwordEffectProvider) { - ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); - if (provider.providesEffectForWill(type)) { - provider.applyOnHitEffect(type, stack, offStack, attacker, target); - } - } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - recalculatePowers(player.getHeldItem(hand), world, player); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) { - if (soulsRemaining >= soulBracket[i]) { - lvl = i; - } - } - - return lvl; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientAxe.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentType." + getCurrentType(stack).getName().toLowerCase())); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) { - return false; - } else { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionMultiWill("sentient_axe"); - } - - @Override - public void gatherVariants(Consumer variants) { - for (EnumDemonWillType type : EnumDemonWillType.values()) - variants.accept("type=" + type.getName().toLowerCase()); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); - - EnumDemonWillType type = this.getCurrentType(stack); - - for (int i = 0; i <= looting; i++) { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) { - ItemStack soulStack = soul.createWill(type.ordinal(), willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - //TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), 2)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } - - @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { - World world = player.getEntityWorld(); - if (!world.isRemote) { - this.recalculatePowers(droppedStack, world, player); - - EnumDemonWillType type = this.getCurrentType(droppedStack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) { - return false; - } - - PlayerDemonWillHandler.consumeDemonWill(type, player, 100); - - EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); - specterEntity.setPosition(player.posX, player.posY, player.posZ); - world.spawnEntity(specterEntity); - - specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); - - specterEntity.setType(this.getCurrentType(droppedStack)); - specterEntity.setOwner(player); - specterEntity.setTamed(true); - - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java deleted file mode 100644 index d23b0a96..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ /dev/null @@ -1,477 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.AbstractArrowEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.item.*; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.stats.Stats; -import net.minecraft.util.SoundEvents; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.BowItem; -import net.minecraft.item.Items; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Potion; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Locale; - -public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentientTool, IVariantProvider//, IMeshProvider -{ - public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000, 2000, 4000}; - public static double[] defaultDamageAdded = new double[]{0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75}; - public static float[] velocityAdded = new float[]{0.25f, 0.5f, 0.75f, 1, 1.25f, 1.5f, 1.75f}; - public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.5}; //TODO - public static double[] soulDrop = new double[]{2, 4, 7, 10, 13, 16, 24}; - public static double[] staticDrop = new double[]{1, 1, 2, 3, 3, 3, 4}; - public static float soullessShotVelocity = 2.5F; - - public ItemSentientBow() { - - super(); - setTranslationKey(BloodMagic.MODID + ".sentientBow"); - setCreativeTab(BloodMagic.TAB_BM); - this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() { - @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, LivingEntity entityIn) { - if (entityIn == null) { - return 0.0F; - } else { - ItemStack itemstack = entityIn.getActiveItemStack(); - return !itemstack.isEmpty() && itemstack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F; - } - } - }); - this.addPropertyOverride(new ResourceLocation("pulling"), new IItemPropertyGetter() { - @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, LivingEntity entityIn) { - return entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F; - } - }); - this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { - @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, World world, LivingEntity entityIn) { - return ((ItemSentientBow) RegistrarBloodMagicItems.SENTIENT_BOW).getCurrentType(stack).ordinal(); - } - }); - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - recalculatePowers(stack, type, soulsRemaining); - } - - public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) { - this.setCurrentType(stack, will > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(will); -// - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - - setDrainOfActivatedBow(stack, drain); - setStaticDropOfActivatedBow(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedBow(stack, level >= 0 ? soulDrop[level] : 0); -// double drain = level >= 0 ? soulDrainPerSwing[level] : 0; -// double extraDamage = level >= 0 ? damageAdded[level] : 0; -// -// setDrainOfActivatedSword(stack, drain); -// setDamageOfActivatedSword(stack, 7 + extraDamage); -// setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); -// setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - - setVelocityOfArrow(stack, level >= 0 ? 3 + getVelocityModifier(type, level) : soullessShotVelocity); - setDamageAdded(stack, level >= 0 ? getDamageModifier(type, level) : 0); - } - - private int getLevel(double soulsRemaining) { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) { - if (soulsRemaining >= soulBracket[i]) { - lvl = i; - } - } - - return lvl; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public double getDamageModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return 0; - case DEFAULT: - case CORROSIVE: - case DESTRUCTIVE: - case STEADFAST: - return defaultDamageAdded[willBracket]; - } - - return 0; - } - - public float getVelocityModifier(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return velocityAdded[willBracket]; - default: - return 0; - } - } - - public void setDamageAdded(ItemStack stack, double damage) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble("damage", damage); - } - - public double getDamageAdded(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - return tag.getDouble("damage"); - } - - public void setVelocityOfArrow(ItemStack stack, float velocity) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putFloat("velocity", velocity); - } - - public float getVelocityOfArrow(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (tag.hasKey("velocity")) { - return tag.getFloat("velocity"); - } - - return 3; - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - public double getDrainOfActivatedBow(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedBow(ItemStack stack, double drain) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedBow(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedBow(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedBow(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedBow(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - this.recalculatePowers(stack, world, player); - return super.onItemRightClick(world, player, hand); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "inventory"); - } - - public ArrowEntity getArrowEntity(World world, ItemStack stack, LivingEntity target, LivingEntity user, float velocity) { - EnumDemonWillType type = this.getCurrentType(stack); - - double amount = user instanceof PlayerEntity ? (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)) : 0; - - float newArrowVelocity = velocity * getVelocityOfArrow(stack); - double soulsRemaining = user instanceof PlayerEntity ? (PlayerDemonWillHandler.getTotalDemonWill(type, (PlayerEntity) user)) : 0; - EntitySentientArrow entityArrow = new EntitySentientArrow(world, user, type, amount, getLevel(soulsRemaining), (Potion) null); - - double d0 = target.posX - user.posX; - double d1 = target.getEntityBoundingBox().minY + (double) (target.height / 3.0F) - entityArrow.posY; - double d2 = target.posZ - user.posZ; - double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); - entityArrow.shoot(d0, d1 + d3 * 0.05, d2, newArrowVelocity, 0); - - if (newArrowVelocity == 0) { - world.playSound(null, user.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); - return null; - } - - if (velocity == 1.0F) { - entityArrow.setIsCritical(true); - } - - int j = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, stack); - - entityArrow.setDamage(entityArrow.getDamage() + this.getDamageAdded(stack) + (j > 0 ? j * 0.5 + 0.5 : 0)); - - int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - - if (k > 0) { - entityArrow.setKnockbackStrength(k); - } - - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { - entityArrow.setFire(100); - } - - entityArrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; - - return entityArrow; - } - - public EntitySentientArrow getDuplicateArrow(ItemStack bowStack, World world, PlayerEntity player, double reimburseMultiplier) { - - EnumDemonWillType willType = this.getCurrentType(bowStack); - ItemStack arrow = this.getFiredArrow(player); - - ArrowItem itemarrow = ((ArrowItem) (arrow.getItem() instanceof ArrowItem ? arrow.getItem() : Items.ARROW)); - EntitySentientArrow entityArrow; - double reimburseAmount = (this.getDropOfActivatedBow(bowStack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(bowStack)) * reimburseMultiplier; - - if (itemarrow == Items.ARROW) { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); - entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), (Potion) null); - } else if (itemarrow == Items.TIPPED_ARROW) { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); - entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), arrow); - } else if (itemarrow == Items.SPECTRAL_ARROW) { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); - entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), new Potion(new EffectInstance(Effects.GLOWING, 200, 0))); - } else { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player); - entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), itemarrow.createArrow(world, bowStack, player)); - } - - player.addStat(Stats.getObjectUseStats(this)); - return entityArrow; - } - - @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, LivingEntity entityLiving, int timeLeft) { - if (entityLiving instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entityLiving; - boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; - ItemStack itemstack = this.getFiredArrow(player); - - int i = this.getMaxItemUseDuration(stack) - timeLeft; - i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, (PlayerEntity) entityLiving, i, itemstack != null || flag); - if (i < 0) - return; - - if (itemstack != null || flag) { - if (itemstack == null) { - itemstack = new ItemStack(Items.ARROW); - } - - float arrowVelocity = getArrowVelocity(i); - - if ((double) arrowVelocity >= 0.1D) { - boolean flag1 = flag && itemstack.getItem() == Items.ARROW; //Forge: Fix consuming custom arrows. - - if (!world.isRemote) { - this.recalculatePowers(stack, world, player); - EnumDemonWillType type = this.getCurrentType(stack); - - ArrowItem itemarrow = ((ArrowItem) (itemstack.getItem() instanceof ArrowItem ? itemstack.getItem() : Items.ARROW)); - AbstractArrowEntity entityArrow; - double amount = (this.getDropOfActivatedBow(stack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(stack)); - - float newArrowVelocity = arrowVelocity * getVelocityOfArrow(stack); - - if (getLevel(PlayerDemonWillHandler.getTotalDemonWill(type, player)) <= 0) { - entityArrow = itemarrow.createArrow(world, itemstack, entityLiving); - } else if (itemarrow == Items.ARROW) { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), (Potion) null); - } else if (itemarrow == Items.TIPPED_ARROW) { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), itemstack); - } else if (itemarrow == Items.SPECTRAL_ARROW) { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), new Potion(new EffectInstance(Effects.GLOWING, 200, 0))); - } else { - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - entityArrow = new EntitySentientArrow(world, entityLiving, type, amount, getLevel(soulsRemaining), itemarrow.createArrow(world, stack, entityLiving)); - } - - entityArrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, newArrowVelocity, 1.0F); - - if (Float.compare(getVelocityOfArrow(stack), soullessShotVelocity) < Float.MIN_NORMAL) { - world.playSound(null, player.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.NEUTRAL, 0.4F, 1.0F); - } - - if (arrowVelocity == 1.0F) { - entityArrow.setIsCritical(true); - } - - int j = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, stack); - - entityArrow.setDamage(entityArrow.getDamage() + this.getDamageAdded(stack) + (j > 0 ? j * 0.5 + 0.5 : 0)); - - int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - - if (k > 0) { - entityArrow.setKnockbackStrength(k); - } - - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { - entityArrow.setFire(100); - } - - stack.damageItem(1, player); - - if (flag1) { - entityArrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; - } - - world.spawnEntity(entityArrow); - } - - world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + arrowVelocity * 0.5F); - - if (!flag1) { - itemstack.shrink(1); - - if (itemstack.isEmpty()) { - player.inventory.deleteStack(itemstack); - } - } - - player.addStat(Stats.getObjectUseStats(this)); - } - } - } - } - - protected ItemStack getFiredArrow(PlayerEntity player) { - if (this.isArrow(player.getHeldItem(Hand.OFF_HAND))) { - return player.getHeldItem(Hand.OFF_HAND); - } else if (this.isArrow(player.getHeldItem(Hand.MAIN_HAND))) { - return player.getHeldItem(Hand.MAIN_HAND); - } else { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { - ItemStack itemstack = player.inventory.getStackInSlot(i); - - if (this.isArrow(itemstack)) { - return itemstack; - } - } - - return null; - } - } - - @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { - World world = player.getEntityWorld(); - if (!world.isRemote) { - this.recalculatePowers(droppedStack, world, player); - - EnumDemonWillType type = this.getCurrentType(droppedStack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) { - return false; - } - - PlayerDemonWillHandler.consumeDemonWill(type, player, 100); - - EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); - specterEntity.setPosition(player.posX, player.posY, player.posZ); - world.spawnEntity(specterEntity); - - specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); - - specterEntity.setType(this.getCurrentType(droppedStack)); - specterEntity.setOwner(player); - specterEntity.setTamed(true); - - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java deleted file mode 100644 index a1556a5b..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ /dev/null @@ -1,488 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.item.PickaxeItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.*; -import java.util.function.Consumer; - -public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { - public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; - public static double[] defaultDamageAdded = new double[]{1, 2, 3, 3.5, 4}; - public static double[] destructiveDamageAdded = new double[]{2, 3, 4, 5, 6}; - public static double[] vengefulDamageAdded = new double[]{0, 0.5, 1, 1.5, 2}; - public static double[] steadfastDamageAdded = new double[]{0, 0.5, 1, 1.5, 2}; - public static double[] defaultDigSpeedAdded = new double[]{1, 1.5, 2, 3, 4}; - public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75}; - public static double[] soulDrop = new double[]{2, 4, 7, 10, 13}; - public static double[] staticDrop = new double[]{1, 1, 2, 3, 3}; - - public static double[] healthBonus = new double[]{0, 0, 0, 0, 0}; //TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[]{-3, -2.8, -2.7, -2.6, -2.5}; - public static double[] destructiveAttackSpeed = new double[]{-3.1, -3.1, -3.2, -3.3, -3.3}; - - public static int[] absorptionTime = new int[]{200, 300, 400, 500, 600}; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[]{25, 50, 60, 80, 100}; - public static int[] poisonLevel = new int[]{0, 0, 0, 1, 1}; - - public static double[] movementSpeed = new double[]{0.05, 0.1, 0.15, 0.2, 0.25}; - - public final double baseAttackDamage = 3; - public final double baseAttackSpeed = -2.8; - - public ItemSentientPickaxe() { - super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); - setMaxDamage(getMaxDamage() * 2); -// super(ModItems.soulToolMaterial); - - setTranslationKey(BloodMagic.MODID + ".sentientPickaxe"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - float value = super.getDestroySpeed(stack, state); - if (value > 1) { - return (float) (value + getDigSpeedOfSword(stack)); - } else { - return value; - } - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) { - if (willBracket < 0) { - return 0; - } - - switch (type) { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) { - switch (type) { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isEntityAlive()) { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof PlayerEntity) { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); - if (offStack.getItem() instanceof ISentientSwordEffectProvider) { - ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); - if (provider.providesEffectForWill(type)) { - provider.applyOnHitEffect(type, stack, offStack, attacker, target); - } - } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - recalculatePowers(player.getHeldItem(hand), world, player); - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) { - if (soulsRemaining >= soulBracket[i]) { - lvl = i; - } - } - - return lvl; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientPickaxe.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentType." + getCurrentType(stack).getName().toLowerCase())); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) { - return false; - } else { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionMultiWill("sentient_pickaxe"); - } - - @Override - public void gatherVariants(Consumer variants) { - for (EnumDemonWillType type : EnumDemonWillType.values()) - variants.accept("type=" + type.getName().toLowerCase()); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); - - EnumDemonWillType type = this.getCurrentType(stack); - - for (int i = 0; i <= looting; i++) { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) { - ItemStack soulStack = soul.createWill(type.ordinal(), willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - //TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), 2)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } - - @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { - World world = player.getEntityWorld(); - if (!world.isRemote) { - this.recalculatePowers(droppedStack, world, player); - - EnumDemonWillType type = this.getCurrentType(droppedStack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) { - return false; - } - - PlayerDemonWillHandler.consumeDemonWill(type, player, 100); - - EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); - specterEntity.setPosition(player.posX, player.posY, player.posZ); - world.spawnEntity(specterEntity); - - specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); - - specterEntity.setType(this.getCurrentType(droppedStack)); - specterEntity.setOwner(player); - specterEntity.setTamed(true); - - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java deleted file mode 100644 index d04beea9..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ /dev/null @@ -1,489 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ShovelItem; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.*; -import java.util.function.Consumer; - -public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { - public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000}; - public static double[] defaultDamageAdded = new double[]{1, 2, 3, 3.5, 4}; - public static double[] destructiveDamageAdded = new double[]{2, 3, 4, 5, 6}; - public static double[] vengefulDamageAdded = new double[]{0, 0.5, 1, 1.5, 2}; - public static double[] steadfastDamageAdded = new double[]{0, 0.5, 1, 1.5, 2}; - public static double[] defaultDigSpeedAdded = new double[]{1, 1.5, 2, 3, 4}; - public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75}; - public static double[] soulDrop = new double[]{2, 4, 7, 10, 13}; - public static double[] staticDrop = new double[]{1, 1, 2, 3, 3}; - - public static double[] healthBonus = new double[]{0, 0, 0, 0, 0}; //TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[]{-3, -2.8, -2.7, -2.6, -2.5}; - public static double[] destructiveAttackSpeed = new double[]{-3.1, -3.1, -3.2, -3.3, -3.3}; - - public static int[] absorptionTime = new int[]{200, 300, 400, 500, 600}; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[]{25, 50, 60, 80, 100}; - public static int[] poisonLevel = new int[]{0, 0, 0, 1, 1}; - - public static double[] movementSpeed = new double[]{0.05, 0.1, 0.15, 0.2, 0.25}; - - public final double baseAttackDamage = 3; - public final double baseAttackSpeed = -2.8; - - public ItemSentientShovel() { - super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); - setMaxDamage(getMaxDamage() * 2); -// super(ModItems.soulToolMaterial); - - setTranslationKey(BloodMagic.MODID + ".sentientShovel"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - float value = super.getDestroySpeed(stack, state); - if (value > 1) { - return (float) (value + getDigSpeedOfSword(stack)); - } else { - return value; - } - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) { - if (willBracket < 0) { - return 0; - } - - switch (type) { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) { - switch (type) { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isEntityAlive()) { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof PlayerEntity) { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); - if (offStack.getItem() instanceof ISentientSwordEffectProvider) { - ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); - if (provider.providesEffectForWill(type)) { - provider.applyOnHitEffect(type, stack, offStack, attacker, target); - } - } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - recalculatePowers(player.getHeldItem(hand), world, player); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) { - if (soulsRemaining >= soulBracket[i]) { - lvl = i; - } - } - - return lvl; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientShovel.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentType." + getCurrentType(stack).getName().toLowerCase())); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) { - return false; - } else { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionMultiWill("sentient_shovel"); - } - - @Override - public void gatherVariants(Consumer variants) { - for (EnumDemonWillType type : EnumDemonWillType.values()) - variants.accept("type=" + type.getName().toLowerCase()); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); - - EnumDemonWillType type = this.getCurrentType(stack); - - for (int i = 0; i <= looting; i++) { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) { - ItemStack soulStack = soul.createWill(type.ordinal(), willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - //TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), 2)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } - - @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { - World world = player.getEntityWorld(); - if (!world.isRemote) { - this.recalculatePowers(droppedStack, world, player); - - EnumDemonWillType type = this.getCurrentType(droppedStack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) { - return false; - } - - PlayerDemonWillHandler.consumeDemonWill(type, player, 100); - - EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); - specterEntity.setPosition(player.posX, player.posY, player.posZ); - world.spawnEntity(specterEntity); - - specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); - - specterEntity.setType(this.getCurrentType(droppedStack)); - specterEntity.setOwner(player); - specterEntity.setTamed(true); - - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java deleted file mode 100644 index 4953ba3b..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ /dev/null @@ -1,455 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.*; -import java.util.function.Consumer; - -public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMeshProvider, IMultiWillTool, ISentientTool { - public static int[] soulBracket = new int[]{16, 60, 200, 400, 1000, 2000, 4000}; - public static double[] defaultDamageAdded = new double[]{1, 1.5, 2, 2.5, 3, 3.5, 4}; - public static double[] destructiveDamageAdded = new double[]{1.5, 2.25, 3, 3.75, 4.5, 5.25, 6}; - public static double[] vengefulDamageAdded = new double[]{0, 0.5, 1, 1.5, 2, 2.25, 2.5}; - public static double[] steadfastDamageAdded = new double[]{0, 0.5, 1, 1.5, 2, 2.25, 2.5}; - public static double[] soulDrainPerSwing = new double[]{0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.25}; - public static double[] soulDrop = new double[]{2, 4, 7, 10, 13, 15, 18}; - public static double[] staticDrop = new double[]{1, 1, 2, 3, 3, 4, 4}; - - public static double[] healthBonus = new double[]{0, 0, 0, 0, 0, 0, 0}; //TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[]{-2.1, -2, -1.8, -1.7, -1.6, -1.6, -1.5}; - public static double[] destructiveAttackSpeed = new double[]{-2.6, -2.7, -2.8, -2.9, -3, -3, -3}; - - public static int[] absorptionTime = new int[]{200, 300, 400, 500, 600, 700, 800}; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[]{25, 50, 60, 80, 100, 120, 150}; - public static int[] poisonLevel = new int[]{0, 0, 0, 1, 1, 1, 1}; - - public static double[] movementSpeed = new double[]{0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4}; - - public ItemSentientSword() { - super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); - - setTranslationKey(BloodMagic.MODID + ".sentientSword"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair); - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - recalculatePowers(stack, type, soulsRemaining); - } - - public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) { - this.setCurrentType(stack, will > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, will); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, 5 + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : -2.4); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) { - if (willBracket < 0) { - return 0; - } - - switch (type) { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.4; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) { - switch (type) { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) { - switch (type) { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, LivingEntity attacker) { - switch (type) { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isEntityAlive()) { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - if (super.hitEntity(stack, target, attacker)) { - if (attacker instanceof PlayerEntity) { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); - if (offStack.getItem() instanceof ISentientSwordEffectProvider) { - ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); - if (provider.providesEffectForWill(type)) { - provider.applyOnHitEffect(type, stack, offStack, attacker, target); - } - } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - recalculatePowers(player.getHeldItem(hand), world, player); - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) { - if (soulsRemaining >= soulBracket[i]) { - lvl = i; - } - } - - return lvl; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentType." + getCurrentType(stack).getName().toLowerCase())); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) { - return false; - } else { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionMultiWill("sentient_sword"); - } - - @Override - public void gatherVariants(Consumer variants) { - for (EnumDemonWillType type : EnumDemonWillType.values()) - variants.accept("type=" + type.getName().toLowerCase()); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL); - - EnumDemonWillType type = this.getCurrentType(stack); - - for (int i = 0; i <= looting; i++) { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) { - ItemStack soulStack = soul.createWill(type.ordinal(), willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - //TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), 0)); - multimap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), 2)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - @Override - public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { - World world = player.getEntityWorld(); - if (!world.isRemote) { - this.recalculatePowers(droppedStack, world, player); - - EnumDemonWillType type = this.getCurrentType(droppedStack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - if (soulsRemaining < 1024) { - return false; - } - - PlayerDemonWillHandler.consumeDemonWill(type, player, 100); - - EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); - specterEntity.setPosition(player.posX, player.posY, player.posZ); - world.spawnEntity(specterEntity); - - specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); - - specterEntity.setType(this.getCurrentType(droppedStack)); - specterEntity.setOwner(player); - specterEntity.setTamed(true); - - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java deleted file mode 100644 index 9cec0e42..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ /dev/null @@ -1,267 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionWillGem; -import WayofTime.bloodmagic.iface.IMultiWillTool; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillGem; -import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.*; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; -import java.util.Locale; -import java.util.function.Consumer; - -public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, IMultiWillTool { - public static String[] names = {"petty", "lesser", "common", "greater", "grand"}; - - public ItemSoulGem() { - super(); - - setTranslationKey(BloodMagic.MODID + ".soulGem."); - setHasSubtypes(true); - setMaxStackSize(1); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[stack.getItemDamage()]; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - EnumDemonWillType type = this.getCurrentType(stack); - double drain = Math.min(this.getWill(type, stack), this.getMaxWill(type, stack) / 10); - - double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack); - this.drainWill(type, stack, filled, true); - - return new ActionResult<>(ActionResultType.PASS, stack); - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionWillGem("soul_gem"); - } - - @Override - public void gatherVariants(Consumer variants) { - for (EnumDemonWillType type : EnumDemonWillType.values()) { - variants.accept("type=petty_" + type.getName().toLowerCase()); - variants.accept("type=lesser_" + type.getName().toLowerCase()); - variants.accept("type=common_" + type.getName().toLowerCase()); - variants.accept("type=greater_" + type.getName().toLowerCase()); - variants.accept("type=grand_" + type.getName().toLowerCase()); - } - } - - @Override - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) { - ItemStack emptyStack = new ItemStack(this, 1, i); - - list.add(emptyStack); - } - for (EnumDemonWillType type : EnumDemonWillType.values()) { - for (int i = 0; i < names.length; i++) { - ItemStack fullStack = new ItemStack(this, 1, i); - setWill(type, fullStack, getMaxWill(EnumDemonWillType.DEFAULT, fullStack)); - list.add(fullStack); - } - } - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (!stack.hasTagCompound()) - return; - - EnumDemonWillType type = this.getCurrentType(stack); - tooltip.add(TextHelper.localize("tooltip.bloodmagic.soulGem." + names[stack.getItemDamage()])); - tooltip.add(TextHelper.localize("tooltip.bloodmagic.will", getWill(type, stack))); - tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentType." + getCurrentType(stack).getName().toLowerCase())); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - EnumDemonWillType type = this.getCurrentType(stack); - double maxWill = getMaxWill(type, stack); - if (maxWill <= 0) { - return 1; - } - return 1.0 - (getWill(type, stack) / maxWill); - } - - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - EnumDemonWillType type = this.getCurrentType(stack); - double maxWill = getMaxWill(type, stack); - if (maxWill <= 0) { - return 1; - } - - return MathHelper.hsvToRGB(Math.max(0.0F, (float) (getWill(type, stack)) / (float) maxWill) / 3.0F, 1.0F, 1.0F); - } - - @Override - public ItemStack fillDemonWillGem(ItemStack soulGemStack, ItemStack soulStack) { - if (soulStack != null && soulStack.getItem() instanceof IDemonWill) { - EnumDemonWillType thisType = this.getCurrentType(soulGemStack); - if (thisType != ((IDemonWill) soulStack.getItem()).getType(soulStack)) { - return soulStack; - } - IDemonWill soul = (IDemonWill) soulStack.getItem(); - double soulsLeft = getWill(thisType, soulGemStack); - - if (soulsLeft < getMaxWill(thisType, soulGemStack)) { - double newSoulsLeft = Math.min(soulsLeft + soul.getWill(thisType, soulStack), getMaxWill(thisType, soulGemStack)); - soul.drainWill(thisType, soulStack, newSoulsLeft - soulsLeft); - - setWill(thisType, soulGemStack, newSoulsLeft); - if (soul.getWill(thisType, soulStack) <= 0) { - return ItemStack.EMPTY; - } - } - } - - return soulStack; - } - - @Override - public double getWill(EnumDemonWillType type, ItemStack soulGemStack) { - if (!type.equals(getCurrentType(soulGemStack))) { - return 0; - } - - CompoundNBT tag = soulGemStack.getTagCompound(); - - return tag.getDouble(Constants.NBT.SOULS); - } - - @Override - public void setWill(EnumDemonWillType type, ItemStack soulGemStack, double souls) { - setCurrentType(type, soulGemStack); - - CompoundNBT tag = soulGemStack.getTagCompound(); - - tag.putDouble(Constants.NBT.SOULS, souls); - } - - @Override - public double drainWill(EnumDemonWillType type, ItemStack soulGemStack, double drainAmount, boolean doDrain) { - EnumDemonWillType currentType = this.getCurrentType(soulGemStack); - if (currentType != type) { - return 0; - } - double souls = getWill(type, soulGemStack); - - double soulsDrained = Math.min(drainAmount, souls); - - if (doDrain) { - setWill(type, soulGemStack, souls - soulsDrained); - } - - return soulsDrained; - } - - @Override - public int getMaxWill(EnumDemonWillType type, ItemStack soulGemStack) { - EnumDemonWillType currentType = getCurrentType(soulGemStack); - if (!type.equals(currentType) && currentType != EnumDemonWillType.DEFAULT) { - return 0; - } - - switch (soulGemStack.getMetadata()) { - case 0: - return 64; - case 1: - return 256; - case 2: - return 1024; - case 3: - return 4096; - case 4: - return 16384; - } - return 64; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack soulGemStack) { - NBTHelper.checkNBT(soulGemStack); - - CompoundNBT tag = soulGemStack.getTagCompound(); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(EnumDemonWillType type, ItemStack soulGemStack) { - NBTHelper.checkNBT(soulGemStack); - - CompoundNBT tag = soulGemStack.getTagCompound(); - - if (type == EnumDemonWillType.DEFAULT) { - if (tag.hasKey(Constants.NBT.WILL_TYPE)) { - tag.removeTag(Constants.NBT.WILL_TYPE); - } - - return; - } - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill) { - if (!type.equals(getCurrentType(stack)) && this.getWill(getCurrentType(stack), stack) > 0) { - return 0; - } - - double current = this.getWill(type, stack); - double maxWill = this.getMaxWill(type, stack); - - double filled = Math.min(fillAmount, maxWill - current); - - if (doFill) { - this.setWill(type, stack, filled + current); - } - - return filled; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java deleted file mode 100644 index 83ee8e05..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ /dev/null @@ -1,80 +0,0 @@ -package WayofTime.bloodmagic.item.soul; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IVariantProvider; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.util.helper.TextHelper; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemGroup; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.SoundEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; - -public class ItemSoulSnare extends Item implements IVariantProvider { - public static String[] names = {"base"}; - - public ItemSoulSnare() { - super(); - - setTranslationKey(BloodMagic.MODID + ".soulSnare."); - setCreativeTab(BloodMagic.TAB_BM); - setHasSubtypes(true); - setMaxStackSize(16); - } - - @Override - public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) { - ItemStack stack = playerIn.getHeldItem(hand); - if (!playerIn.capabilities.isCreativeMode) { - stack.shrink(1); - } - - worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - if (!worldIn.isRemote) { - EntitySoulSnare snare = new EntitySoulSnare(worldIn, playerIn); - snare.shoot(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); - worldIn.spawnEntity(snare); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - @Override - public String getTranslationKey(ItemStack stack) { - return super.getTranslationKey(stack) + names[stack.getItemDamage()]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(ItemGroup creativeTab, NonNullList list) { - if (!isInCreativeTab(creativeTab)) - return; - - for (int i = 0; i < names.length; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.soulSnare.desc")))); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public void gatherVariants(@Nonnull Int2ObjectMap variants) { - variants.put(0, "type=soulsnare"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java deleted file mode 100644 index 42a33ceb..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ /dev/null @@ -1,274 +0,0 @@ -package WayofTime.bloodmagic.item.soulBreath; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.function.Consumer; - -import javax.annotation.Nullable; -import javax.vecmath.Vector3d; - -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.IMeshProvider; -import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.iface.IActivatable; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NBTHelper; - -public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshProvider, IActivatable { - public static Map> floatMap = new HashMap>(); - public static Map heldEntityMap = new HashMap(); - public static Map heldEntityOffsetMap = new HashMap(); - - //TODO: A lot of this stuff could be moved to a toggle-able variant - public ItemFlightScroll() { - super(); - setTranslationKey(BloodMagic.MODID + ".icarusScroll"); - setCreativeTab(BloodMagic.TAB_BM); - } - - @Override - public boolean getActivated(ItemStack stack) { - return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTagCompound().getBoolean(Constants.NBT.ACTIVATED); - } - - @Override - public ItemStack setActivatedState(ItemStack stack, boolean activated) { - if (!stack.isEmpty()) { - NBTHelper.checkNBT(stack).getTagCompound().setBoolean(Constants.NBT.ACTIVATED, activated); - return stack; - } - - return stack; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); - - if (!world.isRemote) { - if (player.isSneaking()) { - if (!getActivated(stack)) { - double drainNeeded = getBreathCostPerSecond(stack); - if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) { - setActivatedState(stack, true); - } - } else { - setActivatedState(stack, false); - } - } else { - //TODO: Add an effect where it "draws back" like a bow in order to cast Levitation on a mob. - //Only Levitated mobs can be grabbed. - } - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { - if (entity.world.isRemote) { - return false; - } - - //TODO: Do check to see if the entity is levitating - will only "ensnare" a mob that is levitating. - - if (player.isSneaking()) { - //TODO: Release entity completely? - removeEntity(player, entity); - } else { - LivingEntity heldEntity = getHeldEntity(player); - if (heldEntity != null && heldEntity.equals(entity)) { - heldEntityMap.remove(player); - } else { - holdEntity(player, entity); //Hold the entity so you can place it around yourself where needed. - } - } - - return true; - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { - if (!world.isRemote && entity instanceof ServerPlayerEntity && getActivated(stack)) { - if (entity.ticksExisted % 20 == 0) { - double drainNeeded = getBreathCostPerSecond(stack); - if (this.drainBreath(stack, drainNeeded, false) >= drainNeeded) { - this.drainBreath(stack, drainNeeded, true); - } else { - this.setActivatedState(stack, false); - } - } - - onEffectUpdate(stack, world, (PlayerEntity) entity, itemSlot, isSelected); - } - - if (!world.isRemote) { - if (entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - updateHeldEntityPosition(player); - if (floatMap.containsKey(player)) { - Map entityMap = floatMap.get(player); - if (entityMap == null) { - return; - } - - List removalList = new ArrayList(); - - for (Entry entry : entityMap.entrySet()) { - LivingEntity floatingEntity = entry.getKey(); - if (floatingEntity == null || floatingEntity.isDead || floatingEntity.dimension != player.dimension) { - removalList.add(floatingEntity); - } - - followOwner(player, floatingEntity, entry.getValue()); - } - - for (LivingEntity livingEntity : removalList) { - entityMap.remove(livingEntity); - } - - if (entityMap.isEmpty()) { - floatMap.remove(player); - } - - } - } - } - } - - public static boolean updateEntityOffset(PlayerEntity player, LivingEntity living, Vector3d updatedOffset) { - //TODO: Check if this entity is contained in another player's map to prevent weird things. - if (floatMap.containsKey(player)) { - Map entityMap = floatMap.get(player); - entityMap.put(living, updatedOffset); - return true; - } else { - Map entityMap = new HashMap(); - entityMap.put(living, updatedOffset); - floatMap.put(player, entityMap); - return true; - } - } - - @Nullable - public static LivingEntity getHeldEntity(PlayerEntity player) { - if (heldEntityMap.containsKey(player)) { - return heldEntityMap.get(player); - } - - return null; - } - - public static double getHeldEntityOffset(PlayerEntity player) { - if (heldEntityMap.containsKey(player)) { - return heldEntityOffsetMap.get(player); - } - - return 1; - } - - public static void holdEntity(PlayerEntity player, LivingEntity entityLiving) { - float distance = player.getDistance(entityLiving); - Vec3d lookVec = player.getLookVec(); - heldEntityMap.put(player, entityLiving); - heldEntityOffsetMap.put(player, (double) distance); - updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * distance, lookVec.y * distance, lookVec.z * distance)); - } - - public static void updateHeldEntityPosition(PlayerEntity player) { - LivingEntity entityLiving = getHeldEntity(player); - if (entityLiving != null) { - double offset = getHeldEntityOffset(player); - Vec3d lookVec = player.getLookVec(); - updateEntityOffset(player, entityLiving, new Vector3d(lookVec.x * offset, lookVec.y * offset, lookVec.z * offset)); - } - } - - public static void removeEntity(PlayerEntity player, LivingEntity living) { - if (living == null) { - return; - } - - if (floatMap.containsKey(player)) { - Map entityMap = floatMap.get(player); - if (entityMap.containsKey(living)) { - entityMap.remove(living); - } - - if (entityMap.isEmpty()) { - floatMap.remove(player); - } - } - } - - public void followOwner(PlayerEntity owner, LivingEntity livingEntity, Vector3d offset) { - double offsetX = offset.x; - double offsetY = offset.y; - double offsetZ = offset.z; - double ownerSpeed = Math.sqrt(owner.motionX * owner.motionX + owner.motionY * owner.motionY + owner.motionZ * owner.motionZ); -// double ownerSpeed = Math.sqrt((owner.posX - owner.prevPosX) * (owner.posX - owner.prevPosX) + (owner.posY - owner.prevPosY) * (owner.posY - owner.prevPosY) + (owner.posZ - owner.prevPosZ) * (owner.posZ - owner.prevPosZ)); - - double speed = Math.max(ownerSpeed * 20, 2); //May just want to call it a day and set this to "2" - - livingEntity.addPotionEffect(new EffectInstance(Effects.LEVITATION, 20, 0, false, true)); - - double wantedX = owner.posX + offsetX; - double wantedY = owner.posY + offsetY; - double wantedZ = owner.posZ + offsetZ; - - Vector3d vec = new Vector3d(wantedX - livingEntity.posX, wantedY - livingEntity.posY, wantedZ - livingEntity.posZ); - double vecDistance = Math.sqrt(vec.dot(vec)); - speed = Math.min(vecDistance, speed); - - vec.normalize(); - - if (speed <= 0.00001) { - return; - } - - livingEntity.setVelocity(vec.x * speed, vec.y * speed, vec.z * speed); - } - - public void onEffectUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) { - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FLIGHT, 2, 0)); - } - - @Override - public int getMaxBreath(ItemStack stack) { - return 20; - } - - public double getBreathCostPerSecond(ItemStack stack) { - return 0.01; - } - - @Override - @SideOnly(Side.CLIENT) - public ItemMeshDefinition getMeshDefinition() { - return new CustomMeshDefinitionActivatable("icarus_scroll"); - } - - @Override - public void gatherVariants(Consumer variants) { - variants.accept("active=false"); - variants.accept("active=true"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java deleted file mode 100644 index 47743536..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.item.soulBreath; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import WayofTime.bloodmagic.soul.ISoulBreathContainer; -import WayofTime.bloodmagic.util.Constants; - -public abstract class ItemSoulBreathContainer extends Item implements ISoulBreathContainer { - @Override - public double getBreath(ItemStack stack) { - CompoundNBT tag = stack.getTagCompound(); - - return tag.getDouble(Constants.NBT.BREATH); - } - - @Override - public void setBreath(ItemStack stack, double amount) { - CompoundNBT tag = stack.getTagCompound(); - - tag.putDouble(Constants.NBT.BREATH, amount); - } - - @Override - public double drainBreath(ItemStack stack, double drainAmount, boolean doDrain) { - double breath = getBreath(stack); - - double breathDrained = Math.min(drainAmount, breath); - - if (doDrain) { - setBreath(stack, breath - breathDrained); - } - - return breathDrained; - } - - @Override - public double fillBreath(ItemStack stack, double fillAmount, boolean doFill) { - double current = this.getBreath(stack); - double maxBreath = this.getMaxBreath(stack); - - double filled = Math.min(fillAmount, maxBreath - current); - - if (doFill) { - this.setBreath(stack, filled + current); - } - - return filled; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double maxWill = getMaxBreath(stack); - if (maxWill <= 0) { - return 1; - } - return 1.0 - (getBreath(stack) / maxWill); - } - -} diff --git a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java b/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java deleted file mode 100644 index 1539372c..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/types/AlchemicVialType.java +++ /dev/null @@ -1,44 +0,0 @@ -package WayofTime.bloodmagic.item.types; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.Locale; - -public enum AlchemicVialType implements ISubItem { - BASE(0x2e35ff); - - final int potionColour; - - AlchemicVialType(int colour1) { - potionColour = colour1; - } - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.ALCHEMIC_VIAL, count, ordinal()); - } - - public int getColourForLayer(int layer) { - if (layer == 0) { - return potionColour; - } - return -1; - } - - public static int getColourForLayer(int variant, int layer) { - if (variant >= AlchemicVialType.values().length) { - return -1; - } - - return AlchemicVialType.values()[variant].getColourForLayer(layer); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java deleted file mode 100644 index c49aa09b..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.item.types; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.Locale; - -public enum ComponentTypes implements ISubItem { - - REAGENT_WATER, - REAGENT_LAVA, - REAGENT_AIR, - REAGENT_FAST_MINER, - REAGENT_VOID, - REAGENT_GROWTH, - REAGENT_AFFINITY, - REAGENT_SIGHT, - REAGENT_BINDING, - REAGENT_SUPPRESSION, - FRAME_PART, - REAGENT_BLOOD_LIGHT, - REAGENT_MAGNETISM, - REAGENT_HASTE, - REAGENT_COMPRESSION, - REAGENT_BRIDGE, - REAGENT_SEVERANCE, - REAGENT_TELEPOSITION, - REAGENT_TRANSPOSITION, - SAND_IRON, - SAND_GOLD, - SAND_COAL, - PLANT_OIL, - SULFUR, - SALTPETER, - NEURO_TOXIN, - ANTISEPTIC, - REAGENT_HOLDING, - CATALYST_LENGTH_1, - CATALYST_POWER_1, - REAGENT_CLAW, - REAGENT_BOUNCE, - REAGENT_FROST, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack() { - return getStack(1); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal()); - } -} - diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java b/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java deleted file mode 100644 index 27204050..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.bloodmagic.item.types; - -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -public interface ISubItem { - - @Nonnull - String getInternalName(); - - @Nonnull - default ItemStack getStack() { - return getStack(1); - } - - @Nonnull - ItemStack getStack(int count); -} diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java deleted file mode 100644 index d3edd6e3..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.item.types; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import java.util.Locale; - -public enum ShardType implements ISubItem { - - WEAK, - DEMONIC, - ; - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, count, ordinal()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java deleted file mode 100644 index 414a920d..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/ILivingArmour.java +++ /dev/null @@ -1,47 +0,0 @@ -package WayofTime.bloodmagic.livingArmour; - -import com.google.common.collect.Multimap; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -/** - * An interface this is used purely for internal implementation. - * - * @author WayofTime - */ -public interface ILivingArmour { - Multimap getAttributeModifiers(); - - boolean canApplyUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade); - - boolean upgradeArmour(PlayerEntity user, LivingArmourUpgrade upgrade); - - boolean removeUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade); - - void notifyPlayerOfUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade); - - /** - * Ticks the upgrades and stat trackers, passing in the world and player as - * well as the LivingArmour - * - * @param world - The World - * @param player - The player wearing the Armour - */ - void onTick(World world, PlayerEntity player); - - void readFromNBT(CompoundNBT tag); - - void writeToNBT(CompoundNBT tag, boolean forceWrite); - - /** - * Writes the LivingArmour to the NBTTag. This will only write the trackers - * that are dirty. - * - * @param tag - The NBT tag to write to - */ - void writeDirtyToNBT(CompoundNBT tag); - - void writeToNBT(CompoundNBT tag); -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java deleted file mode 100644 index ac8474d6..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ /dev/null @@ -1,334 +0,0 @@ -package WayofTime.bloodmagic.livingArmour; - -import WayofTime.bloodmagic.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; - -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map.Entry; - -public class LivingArmour implements ILivingArmour { - public static String chatBase = "chat.bloodmagic.livingArmour."; - public HashMap trackerMap = new HashMap<>(); - public HashMap upgradeMap = new HashMap<>(); - - public int maxUpgradePoints = 100; - public int totalUpgradePoints = 0; - - public StatTracker getTracker(String key) { - return trackerMap.get(key); - } - - public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - double total = 0; - for (Entry entry : upgradeMap.entrySet()) { - total += entry.getValue().getAdditionalDamageOnHit(damage, wearer, hitEntity, weapon); - } - - return total; - } - - public double getKnockbackOnHit(PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - double total = 0; - for (Entry entry : upgradeMap.entrySet()) { - total += entry.getValue().getKnockbackOnHit(wearer, hitEntity, weapon); - } - - return total; - } - - public void recalculateUpgradePoints() { - totalUpgradePoints = 0; - for (LivingArmourUpgrade upgrade : upgradeMap.values()) { - totalUpgradePoints += upgrade.getCostOfUpgrade(); - } - } - - @Override - public Multimap getAttributeModifiers() { - HashMultimap modifierMap = HashMultimap.create(); - - for (Entry entry : upgradeMap.entrySet()) { - LivingArmourUpgrade upgrade = entry.getValue(); - if (upgrade == null) { - continue; - } - modifierMap.putAll(upgrade.getAttributeModifiers()); - } - - return modifierMap; - } - - @Override - public boolean upgradeArmour(PlayerEntity user, LivingArmourUpgrade upgrade) { - String key = upgrade.getUniqueIdentifier(); - if (upgradeMap.containsKey(key)) { - //Check if this is a higher level than the previous upgrade - int nextLevel = upgrade.getUpgradeLevel(); - int currentLevel = upgradeMap.get(key).getUpgradeLevel(); - - if (nextLevel > currentLevel) { - int upgradePointDifference = upgrade.getCostOfUpgrade() - upgradeMap.get(key).getCostOfUpgrade(); - if (totalUpgradePoints + upgradePointDifference <= maxUpgradePoints) { - upgradeMap.put(key, upgrade); - totalUpgradePoints += upgradePointDifference; - notifyPlayerOfUpgrade(user, upgrade); - for (StatTracker tracker : trackerMap.values()) { - tracker.onArmourUpgradeAdded(upgrade); - } - - return true; - } - } - } else { - int upgradePoints = upgrade.getCostOfUpgrade(); - if (totalUpgradePoints + upgradePoints <= maxUpgradePoints) { - upgradeMap.put(key, upgrade); - totalUpgradePoints += upgradePoints; - notifyPlayerOfUpgrade(user, upgrade); - for (StatTracker tracker : trackerMap.values()) { - tracker.onArmourUpgradeAdded(upgrade); - } - - return true; - } - } - - return false; - } - - @Override - public boolean canApplyUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade) { - String key = upgrade.getUniqueIdentifier(); - if (upgradeMap.containsKey(key)) { - //Check if this is a higher level than the previous upgrade - int nextLevel = upgrade.getUpgradeLevel(); - int currentLevel = upgradeMap.get(key).getUpgradeLevel(); - - if (nextLevel > currentLevel) { - int upgradePointDifference = upgrade.getCostOfUpgrade() - upgradeMap.get(key).getCostOfUpgrade(); - if (totalUpgradePoints + upgradePointDifference <= maxUpgradePoints) { - return true; - } - } - } else { - int upgradePoints = upgrade.getCostOfUpgrade(); - if (totalUpgradePoints + upgradePoints <= maxUpgradePoints) { - return true; - } - } - - return false; - } - - @Override - public void notifyPlayerOfUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade) { - user.sendStatusMessage(new StringTextComponent(TextHelper.localizeEffect(chatBase + "newUpgrade")), true); - } - - /** - * Ticks the upgrades and stat trackers, passing in the world and player as - * well as the LivingArmour - * - * @param world - * @param player - */ - @Override - public void onTick(World world, PlayerEntity player) { - for (Entry entry : upgradeMap.entrySet()) { - LivingArmourUpgrade upgrade = entry.getValue(); - - if (upgrade == null) { - continue; - } - - if (!world.isRemote || upgrade.runOnClient()) { - upgrade.onTick(world, player, this); - } - } - - if (world.isRemote) { - return; - } - - List allowedUpgradesList = new ArrayList<>(); - for (ItemStack stack : player.inventory.mainInventory) { - if (stack != null && stack.getItem() instanceof IUpgradeTrainer) { - List keyList = ((IUpgradeTrainer) stack.getItem()).getTrainedUpgrades(stack); - if (!keyList.isEmpty()) { - allowedUpgradesList.addAll(keyList); - } - } - } - - for (Entry entry : trackerMap.entrySet()) { - StatTracker tracker = entry.getValue(); - - if (tracker == null) { - continue; - } - - if (!allowedUpgradesList.isEmpty()) { - boolean allowed = false; - - for (String key : allowedUpgradesList) { - if (tracker.providesUpgrade(key)) { - allowed = true; - break; - } - } - - if (!allowed) { - tracker.onDeactivatedTick(world, player, this); - continue; - } - } - - if (tracker.onTick(world, player, this)) { - List upgradeList = tracker.getUpgrades(); - - for (LivingArmourUpgrade upgrade : upgradeList) //TODO: make a getNextUpgrade? - { - upgradeArmour(player, upgrade); - } - } - - } - } - - @Override - public void readFromNBT(CompoundNBT tag) { - maxUpgradePoints = Math.max(100, tag.getInt("maxUpgradePoints")); - - ListNBT upgradeTags = tag.getList("upgrades", 10); - if (upgradeTags != null) { - for (int i = 0; i < upgradeTags.tagCount(); i++) { - CompoundNBT upgradeTag = upgradeTags.getCompound(i); - String key = upgradeTag.getString("key"); - int level = upgradeTag.getInt("level"); - CompoundNBT nbtTag = upgradeTag.getCompound("upgrade"); - LivingArmourUpgrade upgrade = LivingArmourHandler.generateUpgradeFromKey(key, level, nbtTag); - if (upgrade != null) { - upgradeMap.put(key, upgrade); - totalUpgradePoints += upgrade.getCostOfUpgrade(); - } - } - } - - for (Class clazz : LivingArmourHandler.trackers) { - try { - Constructor ctor = clazz.getConstructor(); - Object obj = ctor.newInstance(); - if (!(obj instanceof StatTracker)) { - // ????? - } - StatTracker tracker = (StatTracker) obj; - String key = tracker.getUniqueIdentifier(); - CompoundNBT trackerTag = tag.getCompound(key); - if (!trackerTag.isEmpty()) { - tracker.readFromNBT(trackerTag); - } - trackerMap.put(key, tracker); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @Override - public void writeToNBT(CompoundNBT tag, boolean forceWrite) { - tag.putInt("maxUpgradePoints", maxUpgradePoints); - - ListNBT tags = new ListNBT(); - - for (Entry entry : upgradeMap.entrySet()) { - CompoundNBT upgradeTag = new CompoundNBT(); - - LivingArmourUpgrade upgrade = entry.getValue(); - CompoundNBT nbtTag = new CompoundNBT(); - upgrade.writeToNBT(nbtTag); - - upgradeTag.putString("key", upgrade.getUniqueIdentifier()); - upgradeTag.putInt("level", upgrade.getUpgradeLevel()); - upgradeTag.put("upgrade", nbtTag); - - tags.appendTag(upgradeTag); - } - - tag.put("upgrades", tags); - - for (Entry entry : trackerMap.entrySet()) { - StatTracker tracker = entry.getValue(); - - if (tracker == null) { - continue; - } - - String key = tracker.getUniqueIdentifier(); - - if (forceWrite || tracker.isDirty()) { - CompoundNBT trackerTag = new CompoundNBT(); - tracker.writeToNBT(trackerTag); - - tag.put(key, trackerTag); - - tracker.resetDirty(); - } - } - } - - /** - * Writes the LivingArmour to the NBTTag. This will only write the trackers - * that are dirty. - * - * @param tag - */ - @Override - public void writeDirtyToNBT(CompoundNBT tag) { - writeToNBT(tag, false); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - writeToNBT(tag, true); - } - - @Override - public boolean removeUpgrade(PlayerEntity user, LivingArmourUpgrade upgrade) { - String key = upgrade.getUniqueIdentifier(); - if (upgradeMap.containsKey(key)) { - upgradeMap.remove(key); - - return true; - } - - return false; - } - - public static boolean hasFullSet(PlayerEntity player) { - for (EquipmentSlotType slot : EquipmentSlotType.values()) { - if (slot.getSlotType() != EquipmentSlotType.Type.ARMOR) { - continue; - } - ItemStack slotStack = player.getItemStackFromSlot(slot); - if (slotStack.isEmpty() || !(slotStack.getItem() instanceof ItemLivingArmour)) - return false; - } - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java deleted file mode 100644 index 6fbb06ca..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourHandler.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.livingArmour; - -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.nbt.CompoundNBT; - -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class LivingArmourHandler { - public static List> trackers = new ArrayList<>(); - public static HashMap> upgradeMap = new HashMap<>(); - public static HashMap> upgradeConstructorMap = new HashMap<>(); - public static HashMap upgradeMaxLevelMap = new HashMap<>(); - - public static void registerStatTracker(Class tracker) { - trackers.add(tracker); - } - - /** - * Registers a LivingArmourUpgrade using its unique identifier and class. - * This is done to more easily load upgrades - * - * @param upgrade - */ - public static void registerArmourUpgrade(LivingArmourUpgrade upgrade) { - Class clazz = upgrade.getClass(); - upgradeMap.put(upgrade.getUniqueIdentifier(), clazz); - upgradeMaxLevelMap.put(upgrade.getUniqueIdentifier(), upgrade.getMaxTier()); - try { - Constructor ctor = clazz.getConstructor(int.class); - if (ctor == null) { - BMLog.DEFAULT.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); - } else { - upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor); - } - } catch (Exception e) { - e.printStackTrace(); - } - - } - - public static LivingArmourUpgrade generateUpgradeFromKey(String key, int level) { - return generateUpgradeFromKey(key, level, null); - } - - public static LivingArmourUpgrade generateUpgradeFromKey(String key, int level, CompoundNBT tag) { - Constructor ctor = upgradeConstructorMap.get(key); - if (ctor != null) { - try { - LivingArmourUpgrade upgrade = ctor.newInstance(level); - if (upgrade != null && tag != null) { - upgrade.readFromNBT(tag); - } - return upgrade; - } catch (Exception e) { - e.printStackTrace(); - } - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java deleted file mode 100644 index 46a13263..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java +++ /dev/null @@ -1,90 +0,0 @@ -package WayofTime.bloodmagic.livingArmour; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; - -public abstract class LivingArmourUpgrade { - public static String chatBase = "chat.bloodmagic.livingArmour.upgrade."; - public static String tooltipBase = "tooltip.bloodmagic.livingArmour.upgrade."; - - /** - * Upgrade level 0 is the first upgrade. Upgrade goes from 0 to getMaxTier() - * - 1. - */ - protected int level = 0; - - /** - * The LivingArmourUpgrade must have a constructor that has a single integer - * parameter. Upgrades may have other constructors, but must have one of - * these. - * - * @param level The level of the upgrade - */ - public LivingArmourUpgrade(int level) { - this.level = Math.min(level, getMaxTier() - 1); - } - - public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - return 0; - } - - public double getKnockbackOnHit(PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - return 0; - } - - /** - * Percentage of damage blocked. This stacks multiplicities with other - * upgrades. - * - * @return 0 for no damage blocked, 1 for full damage blocked - */ - public double getArmourProtection(LivingEntity wearer, DamageSource source) { - return 0; - } - - public int getUpgradeLevel() { - return this.level; - } - - public abstract String getUniqueIdentifier(); - - public abstract String getTranslationKey(); - - public abstract int getMaxTier(); - - public abstract int getCostOfUpgrade(); - - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - } - - public Multimap getAttributeModifiers() { - return HashMultimap.create(); - } - - public double getMiningSpeedModifier(PlayerEntity player) { - return 1; - } - - public abstract void writeToNBT(CompoundNBT tag); - - public abstract void readFromNBT(CompoundNBT tag); - - public int getRunicShielding() { - return 0; - } - - public boolean runOnClient() { - return false; - } - - public boolean isDowngrade() { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java deleted file mode 100644 index 02f5f971..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java +++ /dev/null @@ -1,66 +0,0 @@ -package WayofTime.bloodmagic.livingArmour; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.List; - -public abstract class StatTracker { - private boolean isDirty = false; - - public abstract String getUniqueIdentifier(); - - /** - * When called the StatTracker should reset all of its data, including - * upgrades. - */ - public abstract void resetTracker(); - - public abstract void readFromNBT(CompoundNBT tag); - - public abstract void writeToNBT(CompoundNBT tag); - - /** - * Called each tick to update the tracker's information. Called in - * LivingArmour - * - * @param world World the player is in - * @param player The player that has the armour equipped - * @param livingArmour The equipped LivingArmour - * @return True if there is a new upgrade unlocked this tick. - */ - public abstract boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour); - - public abstract void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour); - - public abstract List getUpgrades(); - - /** - * Used to obtain the progress from the current level to the next level. - *

    - * 0.0 being 0% - 1.0 being 100%. - * - * @param livingArmour The equipped LivingArmour - * @return the progress from the current level to the next level. - */ - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return 1.0D; - } - - public final boolean isDirty() { - return isDirty; - } - - public final void markDirty() { - this.isDirty = true; - } - - public final void resetDirty() { - this.isDirty = false; - } - - public abstract boolean providesUpgrade(String key); - - public abstract void onArmourUpgradeAdded(LivingArmourUpgrade upgrade); -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java deleted file mode 100644 index 868b5b27..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -20, -35, -50, -75}; - public static final float[] exhaustionAdded = new float[]{0.02f, 0.04f, 0.06f, 0.08f, 0.1f}; - public static final int[] delay = new int[]{600, 600, 600, 500, 400}; - - public int timer = 0; - - public LivingArmourUpgradeBattleHungry(int level) { - super(level); - } - - public void resetTimer() { - this.timer = delay[this.level]; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (timer > 0) { - timer--; - return; - } - - if (player.ticksExisted % 20 == 0) { - player.addExhaustion(exhaustionAdded[this.level]); //TODO: Change exhaustion added per level. - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.battleHunger"; - } - - @Override - public int getMaxTier() { - return 5; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt("timer", timer); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - timer = tag.getInt("timer"); - } - - @Override - public String getTranslationKey() { - return tooltipBase + "battleHunger"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java deleted file mode 100644 index 8a01bc0b..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ /dev/null @@ -1,54 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-150}; - - public LivingArmourUpgradeCrippledArm(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.crippledArm"; - } - - @Override - public int getMaxTier() { - return 1; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - } - - @Override - public void readFromNBT(CompoundNBT tag) { - } - - @Override - public String getTranslationKey() { - return tooltipBase + "crippledArm"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java deleted file mode 100644 index e3b250e3..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ /dev/null @@ -1,65 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.HashMap; - -public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -17, -28, -42, -60, -80, -100, -125, -160, -200}; - public static final double[] digSpeedModifier = new double[]{0.9, 0.8, 0.7, 0.6, 0.55, 0.5, 0.4, 0.35, 0.3, 0.2}; - public static HashMap changeMap = new HashMap<>(); - - public LivingArmourUpgradeDigSlowdown(int level) { - super(level); - } - - @Override - public double getMiningSpeedModifier(PlayerEntity player) { - return digSpeedModifier[this.level]; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.digSlowdown"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "digSlowdown"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java deleted file mode 100644 index 1c8fe54d..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ /dev/null @@ -1,63 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -20, -30, -40, -70, -80, -100, -140, -180, -220}; - public static final double[] chance = new double[]{0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.008, 0.010, 0.012, 0.014}; - - public LivingArmourUpgradeDisoriented(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (world.isRemote && player.ticksExisted % 20 == 0 && world.rand.nextDouble() <= chance[this.level]) { - player.rotationYaw = world.rand.nextFloat() * 360; - player.rotationPitch = world.rand.nextFloat() * 180 - 90; - } - } - - @Override - public boolean runOnClient() { - return true; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.disoriented"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - } - - @Override - public void readFromNBT(CompoundNBT tag) { - } - - @Override - public String getTranslationKey() { - return tooltipBase + "disoriented"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java deleted file mode 100644 index cbccbfde..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ /dev/null @@ -1,74 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; -import org.apache.commons.codec.binary.StringUtils; - -import java.util.UUID; - -public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -17, -28, -42, -60, -80, -100, -125, -160, -200}; - public static final double[] meleeDamage = new double[]{-0.1, -0.2, -0.25, -0.3, -0.35, -0.4, -0.5, -0.6, -0.7, -0.8}; - - public LivingArmourUpgradeMeleeDecrease(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); - - String name = getUniqueIdentifier() + "-DamageModifier1"; - modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "DamageModifier1", meleeDamage[this.level], 1)); - - return modifierMap; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.meleeDecrease"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "meleeDecrease"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java deleted file mode 100644 index edf6dc1c..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ /dev/null @@ -1,54 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-100}; - - public LivingArmourUpgradeQuenched(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.quenched"; - } - - @Override - public int getMaxTier() { - return 1; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - } - - @Override - public void readFromNBT(CompoundNBT tag) { - } - - @Override - public String getTranslationKey() { - return tooltipBase + "quenched"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java deleted file mode 100644 index 3d694dbf..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ /dev/null @@ -1,91 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-50}; - public static final int[] slipperyDuration = new int[]{30 * 20}; - - public LivingArmourUpgradeSlippery(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (world.isRemote && player.onGround) { -// if (player.moveForward == 0) - { - - float f6 = 0.91F; - BlockPos.PooledMutableBlockPos blockpos$pooledmutableblockpos = BlockPos.PooledMutableBlockPos.retain(player.posX, player.getEntityBoundingBox().minY - 1.0D, player.posZ); - - if (player.onGround) { - f6 = world.getBlockState(blockpos$pooledmutableblockpos).getBlock().slipperiness * 0.91F; - } - - player.motionX /= f6 / 0.91; - player.motionZ /= f6 / 0.91; - - float f7 = 0.16277136F / (f6 * f6 * f6); - float f8; - - if (player.onGround) { - f8 = player.getAIMoveSpeed() * f7; - } else { - f8 = player.jumpMovementFactor; - } - - player.moveRelative(-player.moveStrafing, -player.moveForward, f8, 0.02F); - - player.moveRelative(player.moveStrafing, player.moveForward, f8 / 10, 0.02F); - - player.motionX *= 0.90; - player.motionY *= 0.90; - } - } - } - - @Override - public boolean runOnClient() { - return true; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.slippery"; - } - - @Override - public int getMaxTier() { - return 1; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - } - - @Override - public void readFromNBT(CompoundNBT tag) { - } - - @Override - public String getTranslationKey() { - return tooltipBase + "slippery"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java deleted file mode 100644 index ac3fb774..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ /dev/null @@ -1,62 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -17, -28, -42, -60, -80, -100, -125, -160, -200}; - - public static final double[] healModifier = new double[]{0.9, 0.8, 0.7, 0.6, 0.55, 0.5, 0.4, 0.35, 0.3, 0.2}; - - public LivingArmourUpgradeSlowHeal(int level) { - super(level); - } - - public double getHealingModifier() { - return healModifier[this.level]; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.slowHeal"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "slowHeal"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java deleted file mode 100644 index 75d40db8..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ /dev/null @@ -1,72 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; -import org.apache.commons.codec.binary.StringUtils; - -import java.util.UUID; - -public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -17, -23, -35, -48, -60, -80, -110, -160, -200}; - public static final double[] speedModifier = new double[]{-0.1, -0.2, -0.3, -0.4, -0.45, -0.5, -0.55, -0.6, -0.65, -0.7}; - - public LivingArmourUpgradeSlowness(int level) { - super(level); - } - - @Override - public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); - - String name = getUniqueIdentifier() + "-SpeedModifier1"; - modifierMap.put(SharedMonsterAttributes.MOVEMENT_SPEED.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "SpeedModifier1", speedModifier[this.level], 1)); - - return modifierMap; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.slowness"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - } - - @Override - public void readFromNBT(CompoundNBT tag) { - } - - @Override - public String getTranslationKey() { - return tooltipBase + "slowness"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java deleted file mode 100644 index 464c408b..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ /dev/null @@ -1,59 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.downgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { - public static final int[] costs = new int[]{-10, -25, -40, -65, -90}; - public static final float[] inaccuracy = new float[]{0.04f, 0.08f, 0.12f, 0.16f, 0.2f}; - - public LivingArmourUpgradeStormTrooper(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - public float getArrowJiggle(PlayerEntity player) { - return inaccuracy[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.stormTrooper"; - } - - @Override - public int getMaxTier() { - return 5; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - } - - @Override - public void readFromNBT(CompoundNBT tag) { - } - - @Override - public String getTranslationKey() { - return tooltipBase + "stormTrooper"; - } - - @Override - public boolean isDowngrade() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java deleted file mode 100644 index 66aa6b7d..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowProtect; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerArrowProtect extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{30, 200, 400, 800, 1500, 2500, 3500, 5000, 7000, 15000}; - public int totalDamage = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.arrowProtect"; - } - - @Override - public void resetTracker() { - this.totalDamage = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.arrowProtect"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamage += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalDamage >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeArrowProtect(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamage, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.arrowProtect"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeArrowProtect) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamage = Math.max(totalDamage, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java deleted file mode 100644 index fb9c3932..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerArrowShot extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] shotsRequired = new int[]{50, 200, 700, 1500, 3000}; - public int totalShots = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.trickShot"; - } - - @Override - public void resetTracker() { - this.totalShots = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalShots = tag.getInt(BloodMagic.MODID + ".tracker.trickShot"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.trickShot", totalShots); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - int change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalShots += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 5; i++) { - if (totalShots >= shotsRequired[i]) { - upgradeList.add(new LivingArmourUpgradeArrowShot(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalShots, shotsRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.arrowShot"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeArrowShot) { - int level = upgrade.getUpgradeLevel(); - if (level < shotsRequired.length) { - totalShots = Math.max(totalShots, shotsRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java deleted file mode 100644 index 2d5f2e23..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeCriticalStrike; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerCriticalStrike extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800}; - public double totalDamageDealt = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.criticalStrike"; - } - - @Override - public void resetTracker() { - this.totalDamageDealt = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.criticalStrike"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamageDealt += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 5; i++) { - if (totalDamageDealt >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeCriticalStrike(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.criticalStrike"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeCriticalStrike) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java deleted file mode 100644 index fe324590..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerDigging extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] blocksRequired = new int[]{128, 512, 1024, 2048, 8192, 16000, 32000, 50000, 80000, 150000}; - public int totalBlocksDug = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.digging"; - } - - @Override - public void resetTracker() { - this.totalBlocksDug = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalBlocksDug = tag.getInt(BloodMagic.MODID + ".tracker.digging"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.digging", totalBlocksDug); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - int change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalBlocksDug += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalBlocksDug >= blocksRequired[i]) { - upgradeList.add(new LivingArmourUpgradeDigging(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalBlocksDug, blocksRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.digging"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeDigging) { - int level = upgrade.getUpgradeLevel(); - if (level < blocksRequired.length) { - totalBlocksDug = Math.max(totalBlocksDug, blocksRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java deleted file mode 100644 index 6e334002..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerExperience extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] experienceRequired = new int[]{100, 400, 1000, 1600, 3200, 5000, 7000, 9200, 11500, 140000}; - public double totalExperienceGained = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.experienced"; - } - - @Override - public void resetTracker() { - this.totalExperienceGained = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalExperienceGained = tag.getDouble(BloodMagic.MODID + ".tracker.experienced"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalExperienceGained += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalExperienceGained >= experienceRequired[i]) { - upgradeList.add(new LivingArmourUpgradeExperience(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalExperienceGained, experienceRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.experienced"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeExperience) { - int level = upgrade.getUpgradeLevel(); - if (level < experienceRequired.length) { - totalExperienceGained = Math.max(totalExperienceGained, experienceRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, int exp) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + exp : exp); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java deleted file mode 100644 index f40aaad7..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerFallProtect extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{30, 200, 400, 800, 1500}; - public int totalDamage = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.fallProtect"; - } - - @Override - public void resetTracker() { - this.totalDamage = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.fallProtect"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.fallProtect", totalDamage); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamage += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 5; i++) { - if (totalDamage >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeFallProtect(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamage, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.fallProtect"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeFallProtect) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamage = Math.max(totalDamage, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java deleted file mode 100644 index becc5329..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ /dev/null @@ -1,89 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFireResist; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class StatTrackerFireResist extends StatTracker { - public static int[] fireTicksRequired = new int[]{60 * 20, 3 * 60 * 20, 10 * 60 * 20, 20 * 60 * 20, 25 * 60 * 20}; - public int totalFireTicks = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.fire"; - } - - @Override - public void resetTracker() { - this.totalFireTicks = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalFireTicks = tag.getInt(BloodMagic.MODID + ".tracker.fire"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.fire", totalFireTicks); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (player.isBurning()) { - totalFireTicks++; - this.markDirty(); - return true; - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 5; i++) { - if (totalFireTicks >= fireTicksRequired[i]) { - upgradeList.add(new LivingArmourUpgradeFireResist(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalFireTicks, fireTicksRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.fireResist"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeFireResist) { - int level = upgrade.getUpgradeLevel(); - if (level < fireTicksRequired.length) { - totalFireTicks = Math.max(totalFireTicks, fireTicksRequired[level]); - this.markDirty(); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java deleted file mode 100644 index 06a2bd42..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ /dev/null @@ -1,108 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class StatTrackerFood extends StatTracker { - public static Map lastFoodEatenMap = new HashMap<>(); - - public static int[] foodRequired = new int[]{100, 200, 300, 500, 1000}; - - public int foodEaten = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.foodEaten"; - } - - @Override - public void resetTracker() { - this.foodEaten = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - foodEaten = tag.getInt(BloodMagic.MODID + ".tracker.foodEaten"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.foodEaten", foodEaten); - - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (!lastFoodEatenMap.containsKey(player)) { - lastFoodEatenMap.put(player, 20); - return false; - } - - int currentFood = player.getFoodStats().getFoodLevel(); - int prevFood = lastFoodEatenMap.get(player); - lastFoodEatenMap.put(player, currentFood); - - if (currentFood > prevFood) { - foodEaten += (currentFood - prevFood); - - markDirty(); - - return true; - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (lastFoodEatenMap.containsKey(player)) { - lastFoodEatenMap.remove(player); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < foodRequired.length; i++) { - if (foodEaten >= foodRequired[i]) { - upgradeList.add(new LivingArmourUpgradeKnockbackResist(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(foodEaten, foodRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.knockback"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeKnockbackResist) { - int level = upgrade.getUpgradeLevel(); - if (level < foodRequired.length) { - foodEaten = Math.max(foodEaten, foodRequired[level]); - this.markDirty(); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java deleted file mode 100644 index 465d68a2..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerGraveDigger extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500, 140000}; - public double totalDamageDealt = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.graveDigger"; - } - - @Override - public void resetTracker() { - this.totalDamageDealt = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.graveDigger"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamageDealt += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalDamageDealt >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeGraveDigger(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.graveDigger"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeGraveDigger) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java deleted file mode 100644 index 9fb78303..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ /dev/null @@ -1,111 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerGrimReaperSprint extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] deathsRequired = new int[]{6, 10, 15, 25, 50, 70, 90, 120, 150, 200}; //TODO: Modify - public int totalDeaths = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.grimReaper"; - } - - @Override - public void resetTracker() { - this.totalDeaths = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDeaths = tag.getInt(BloodMagic.MODID + ".tracker.grimReaper"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDeaths += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return true; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalDeaths >= deathsRequired[i]) { - upgradeList.add(new LivingArmourUpgradeGrimReaperSprint(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDeaths, deathsRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.grimReaper"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint) { - int level = upgrade.getUpgradeLevel(); - if (level < deathsRequired.length) { - totalDeaths = Math.max(totalDeaths, deathsRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour) { - StatTracker tracker = armour.getTracker(BloodMagic.MODID + ".tracker.grimReaper"); - if (tracker instanceof StatTrackerGrimReaperSprint) { - ((StatTrackerGrimReaperSprint) tracker).totalDeaths++; - BMLog.DEBUG.info(String.valueOf(((StatTrackerGrimReaperSprint) tracker).totalDeaths)); - tracker.markDirty(); - } -// changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java deleted file mode 100644 index 04efda5f..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerHealthboost extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] healthedRequired = new int[]{80, 200, 340, 540, 800, 1600, 2800, 5000, 7600, 10000}; - public double totalHealthGenned = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.health"; - } - - @Override - public void resetTracker() { - this.totalHealthGenned = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.health"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalHealthGenned += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalHealthGenned >= healthedRequired[i]) { - upgradeList.add(new LivingArmourUpgradeHealthboost(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalHealthGenned, healthedRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.health"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeHealthboost) { - int level = upgrade.getUpgradeLevel(); - if (level < healthedRequired.length) { - totalHealthGenned = Math.max(totalHealthGenned, healthedRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double health) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + health : health); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java deleted file mode 100644 index 155c8b70..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ /dev/null @@ -1,106 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerJump extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] jumpsRequired = new int[]{30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000}; //testing - - public int totalJumps = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.jump"; - } - - @Override - public void resetTracker() { - this.totalJumps = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalJumps = tag.getInt(BloodMagic.MODID + ".tracker.jump"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.jump", totalJumps); - - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - int change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalJumps += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalJumps >= jumpsRequired[i]) { - upgradeList.add(new LivingArmourUpgradeJump(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalJumps, jumpsRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.jump"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeJump) { - int level = upgrade.getUpgradeLevel(); - if (level < jumpsRequired.length) { - totalJumps = Math.max(totalJumps, jumpsRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java deleted file mode 100644 index 54aafd31..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerMeleeDamage extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500, 140000}; - public double totalDamageDealt = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.meleeDamage"; - } - - @Override - public void resetTracker() { - this.totalDamageDealt = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.meleeDamage"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamageDealt += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalDamageDealt >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeMeleeDamage(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.meleeDamage"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeMeleeDamage) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java deleted file mode 100644 index ab355dbd..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ /dev/null @@ -1,116 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class StatTrackerMovement extends StatTracker { - public static Map lastPosX = new HashMap<>(); - public static Map lastPosZ = new HashMap<>(); - - public static int[] blocksRequired = new int[]{200, 1000, 2000, 4000, 7000, 15000, 25000, 35000, 50000, 70000}; - - public double totalMovement = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.movement"; - } - - @Override - public void resetTracker() { - this.totalMovement = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.movement"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.movement", totalMovement); - - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (!lastPosX.containsKey(player)) { - lastPosX.put(player, player.posX); - lastPosZ.put(player, player.posZ); - return false; - } - - if (!player.onGround) { - return false; - } - - double distanceTravelled = Math.sqrt(Math.pow(lastPosX.get(player) - player.posX, 2) + Math.pow(lastPosZ.get(player) - player.posZ, 2)); - - if (distanceTravelled > 0.0001 && distanceTravelled < 2) { - totalMovement += distanceTravelled; - - lastPosX.put(player, player.posX); - lastPosZ.put(player, player.posZ); - - markDirty(); - - return true; - } - - lastPosX.put(player, player.posX); - lastPosZ.put(player, player.posZ); - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalMovement >= blocksRequired[i]) { - upgradeList.add(new LivingArmourUpgradeSpeed(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalMovement, blocksRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.movement"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeSpeed) { - int level = upgrade.getUpgradeLevel(); - if (level < blocksRequired.length) { - totalMovement = Math.max(totalMovement, blocksRequired[level]); - this.markDirty(); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java deleted file mode 100644 index 85978584..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ /dev/null @@ -1,124 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeNightSight; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerNightSight extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{0, 200, 800, 1300, 2500, 3800, 5000, 7000, 9200, 11500}; - public static int neededNightVision = 3 * 60 * 20; - public double totalDamageDealt = 0; - public int totalNightVision = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.nightSight"; - } - - @Override - public void resetTracker() { - this.totalDamageDealt = 0; - this.totalNightVision = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.nightSight"); - totalNightVision = tag.getInt(BloodMagic.MODID + ".tracker.nightSightVision"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt); - tag.putInt(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - boolean test = false; - - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamageDealt += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - test = true; - } - } - - if (world.getLight(player.getPosition()) <= 9 && player.isPotionActive(Effects.NIGHT_VISION)) { - totalNightVision++; - test = true; - } - - if (test) { - this.markDirty(); - } - - return test; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - if (totalNightVision < neededNightVision) { - return upgradeList; - } - - for (int i = 0; i < 10; i++) { - if (totalDamageDealt >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeNightSight(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.nightSight"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeNightSight) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]); - totalNightVision = neededNightVision; - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java deleted file mode 100644 index 2cf5da7d..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerPhysicalProtect extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{30, 50, 80, 140, 200, 300, 400, 500, 650, 800}; - public int totalDamage = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.physicalProtect"; - } - - @Override - public void resetTracker() { - this.totalDamage = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.physicalProtect"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamage += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalDamage >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradePhysicalProtect(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamage, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.physicalProtect"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradePhysicalProtect) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamage = Math.max(totalDamage, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java deleted file mode 100644 index 56d4b125..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ /dev/null @@ -1,90 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; - -public class StatTrackerPoison extends StatTracker { - public static int[] poisonTicksRequired = new int[]{60 * 20, 3 * 60 * 20, 10 * 60 * 20, 20 * 60 * 20, 25 * 60 * 20}; - public int totalPoisonTicks = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.poison"; - } - - @Override - public void resetTracker() { - this.totalPoisonTicks = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalPoisonTicks = tag.getInt(BloodMagic.MODID + ".tracker.poison"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (player.isPotionActive(Effects.POISON)) { - totalPoisonTicks++; - this.markDirty(); - return true; - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 5; i++) { - if (totalPoisonTicks >= poisonTicksRequired[i]) { - upgradeList.add(new LivingArmourUpgradePoisonResist(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalPoisonTicks, poisonTicksRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.poisonResist"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradePoisonResist) { - int level = upgrade.getUpgradeLevel(); - if (level < poisonTicksRequired.length) { - totalPoisonTicks = Math.max(totalPoisonTicks, poisonTicksRequired[level]); - this.markDirty(); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java deleted file mode 100644 index 4ab0bb17..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRepairing; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerRepairing extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{500}; - public double totalDamage = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.repair"; - } - - @Override - public void resetTracker() { - this.totalDamage = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getDouble(BloodMagic.MODID + ".tracker.repair"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.repair", totalDamage); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamage += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 1; i++) { - if (totalDamage >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeRepairing(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamage, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.repair"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeRepairing) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamage = Math.max(totalDamage, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, int receivedDamage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + receivedDamage : receivedDamage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java deleted file mode 100644 index 06712f6c..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ /dev/null @@ -1,106 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerSelfSacrifice extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] sacrificesRequired = new int[]{30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000}; //testing - - public int totalSacrifices = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.selfSacrifice"; - } - - @Override - public void resetTracker() { - this.totalSacrifices = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalSacrifices = tag.getInt(BloodMagic.MODID + ".tracker.selfSacrifice"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices); - - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - int change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalSacrifices += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalSacrifices >= sacrificesRequired[i]) { - upgradeList.add(new LivingArmourUpgradeSelfSacrifice(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalSacrifices, sacrificesRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.selfSacrifice"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeSelfSacrifice) { - int level = upgrade.getUpgradeLevel(); - if (level < sacrificesRequired.length) { - totalSacrifices = Math.max(totalSacrifices, sacrificesRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, int hearts) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + hearts : hearts); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java deleted file mode 100644 index 6e738b1a..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerSolarPowered extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] healthedRequired = new int[]{70, 150, 300, 500, 700, 1400, 2400, 4000, 7000, 9000}; - public double totalHealthGenned = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.solarPowered"; - } - - @Override - public void resetTracker() { - this.totalHealthGenned = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.solarPowered"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalHealthGenned += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 10; i++) { - if (totalHealthGenned >= healthedRequired[i]) { - upgradeList.add(new LivingArmourUpgradeSolarPowered(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalHealthGenned, healthedRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.solarPowered"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeSolarPowered) { - int level = upgrade.getUpgradeLevel(); - if (level < healthedRequired.length) { - totalHealthGenned = Math.max(totalHealthGenned, healthedRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double health) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + health : health); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java deleted file mode 100644 index 3ab852ed..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class StatTrackerSprintAttack extends StatTracker { - public static HashMap changeMap = new HashMap<>(); - public static int[] damageRequired = new int[]{200, 800, 1300, 2500, 3800}; - public double totalDamageDealt = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.sprintAttack"; - } - - @Override - public void resetTracker() { - this.totalDamageDealt = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.sprintAttack"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt); - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - double change = Math.abs(changeMap.get(livingArmour)); - if (change > 0) { - totalDamageDealt += Math.abs(changeMap.get(livingArmour)); - - changeMap.put(livingArmour, 0d); - - this.markDirty(); - - return true; - } - } - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour)) { - changeMap.remove(livingArmour); - } - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - for (int i = 0; i < 5; i++) { - if (totalDamageDealt >= damageRequired[i]) { - upgradeList.add(new LivingArmourUpgradeSprintAttack(i)); - } - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel); - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.sprintAttack"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeSprintAttack) { - int level = upgrade.getUpgradeLevel(); - if (level < damageRequired.length) { - totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]); - this.markDirty(); - } - } - } - - public static void incrementCounter(LivingArmour armour, double damage) { - changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java deleted file mode 100644 index 5a55d555..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ /dev/null @@ -1,114 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.tracker; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class StatTrackerStepAssist extends StatTracker { - public static Map lastPosX = new HashMap<>(); - public static Map lastPosZ = new HashMap<>(); - - public static int blocksRequired = 1000; - - public double totalMovement = 0; - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".tracker.stepAssist"; - } - - @Override - public void resetTracker() { - this.totalMovement = 0; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.stepAssist"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement); - - } - - @Override - public boolean onTick(World world, PlayerEntity player, LivingArmour livingArmour) { - if (!lastPosX.containsKey(player)) { - lastPosX.put(player, player.posX); - lastPosZ.put(player, player.posZ); - return false; - } - - if (!player.onGround || player.stepHeight < 1) { - return false; - } - - double distanceTravelled = Math.sqrt(Math.pow(lastPosX.get(player) - player.posX, 2) + Math.pow(lastPosZ.get(player) - player.posZ, 2)); - - if (distanceTravelled > 0.0001 && distanceTravelled < 2) { - double previousMovement = totalMovement; - totalMovement += distanceTravelled; - - lastPosX.put(player, player.posX); - lastPosZ.put(player, player.posZ); - - markDirty(); - - return previousMovement < blocksRequired && totalMovement >= blocksRequired; - } - - lastPosX.put(player, player.posX); - lastPosZ.put(player, player.posZ); - - return false; - } - - @Override - public void onDeactivatedTick(World world, PlayerEntity player, LivingArmour livingArmour) { - - } - - @Override - public List getUpgrades() { - List upgradeList = new ArrayList<>(); - - if (totalMovement >= blocksRequired) { - upgradeList.add(new LivingArmourUpgradeStepAssist(0)); - } - - return upgradeList; - } - - @Override - public double getProgress(LivingArmour livingArmour, int currentLevel) { - if (currentLevel == 1) - return 1.0D; - - return totalMovement / (double) blocksRequired; - } - - @Override - public boolean providesUpgrade(String key) { - return key.equals(BloodMagic.MODID + ".upgrade.stepAssist"); - } - - @Override - public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade) { - if (upgrade instanceof LivingArmourUpgradeStepAssist) { - totalMovement = Math.max(totalMovement, blocksRequired); - this.markDirty(); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java deleted file mode 100644 index 994091cc..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; - -public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade { - public static final int[] costs = new int[]{4, 9, 16, 30, 60, 90, 125, 165, 210, 250}; - public static final double[] protectionLevel = new double[]{0.1, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 0.77, 0.80, 0.83}; - - public LivingArmourUpgradeArrowProtect(int level) { - super(level); - } - - @Override - public double getArmourProtection(LivingEntity wearer, DamageSource source) { - if (source.isProjectile()) { - return protectionLevel[this.level]; - } - - return 0; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.arrowProtect"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "arrowProtect"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java deleted file mode 100644 index ca457179..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ /dev/null @@ -1,56 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { - public static final int[] costs = new int[]{20, 50, 90, 160, 290}; - public static final int[] extraArrow = new int[]{1, 2, 3, 4, 5}; - - public LivingArmourUpgradeArrowShot(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.arrowShot"; - } - - @Override - public int getMaxTier() { - return 5; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public String getTranslationKey() { - return tooltipBase + "arrowShot"; - } - - public int getExtraArrows() { - return extraArrow[this.level]; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java deleted file mode 100644 index 2254a320..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ /dev/null @@ -1,63 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; - -public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 12, 22, 35, 49}; - public static final double[] damageBoost = new double[]{0.1, 0.2, 0.3, 0.4, 0.5}; - - public LivingArmourUpgradeCriticalStrike(int level) { - super(level); - } - - @Override - public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - boolean flag = wearer.fallDistance > 0.0F && !wearer.onGround && !wearer.isOnLadder() && !wearer.isInWater() && !wearer.isPotionActive(Effects.BLINDNESS) && !wearer.isRiding() && !wearer.isSprinting(); - - if (flag) { - return getDamageModifier() * damage; - } - - return 0; - } - - public double getDamageModifier() { - return damageBoost[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.criticalStrike"; - } - - @Override - public int getMaxTier() { - return 5; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "criticalStrike"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java deleted file mode 100644 index 559fc941..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ /dev/null @@ -1,75 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; -import net.minecraft.world.World; - -import java.util.HashMap; - -public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 10, 18, 32, 60, 90, 140, 180, 240, 300}; - public static final int[] digSpeedTime = new int[]{0, 50, 60, 100, 100, 100, 100, 150, 150, 150}; - public static final int[] digSpeedLevel = new int[]{0, 0, 0, 1, 1, 1, 1, 1, 2, 2}; - public static final double[] digSpeedModifier = new double[]{1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 2, 2.2, 2.5}; - public static HashMap changeMap = new HashMap<>(); - - public LivingArmourUpgradeDigging(int level) { - super(level); - } - - @Override - public double getMiningSpeedModifier(PlayerEntity player) { - return digSpeedModifier[this.level]; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (changeMap.containsKey(livingArmour) && changeMap.get(livingArmour)) { - changeMap.put(livingArmour, false); - - if (digSpeedTime[this.level] > 0) { - player.addPotionEffect(new EffectInstance(Effects.SPEED, digSpeedTime[this.level], digSpeedLevel[this.level], false, false)); - } - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.digging"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "digging"; - } - - public static void hasDug(LivingArmour armour) { - changeMap.put(armour, true); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java deleted file mode 100644 index 695df8f6..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ /dev/null @@ -1,51 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeElytra extends LivingArmourUpgrade { - public static final int[] costs = new int[]{20}; - - public LivingArmourUpgradeElytra(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.elytra"; - } - - @Override - public int getMaxTier() { - return 1; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public String getTranslationKey() { - return tooltipBase + "elytra"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java deleted file mode 100644 index 92719265..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ /dev/null @@ -1,48 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.CompoundNBT; - -public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { - public static final int[] costs = new int[]{7, 13, 22, 40, 65, 90, 130, 180, 250, 350}; - public static final double[] experienceModifier = new double[]{0.15, 0.3, 0.45, 0.6, 0.75, 0.9, 1.05, 1.2, 1.35, 1.5}; - - public LivingArmourUpgradeExperience(int level) { - super(level); - } - - public double getExperienceModifier() { - return experienceModifier[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.experienced"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "experienced"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java deleted file mode 100644 index d831435c..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ /dev/null @@ -1,49 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.CompoundNBT; - -public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { - public static final int[] costs = new int[]{2, 5, 9, 15, 25}; - public static final float[] protectionLevel = new float[]{0.2F, 0.4F, 0.6F, 0.8F, 1F}; - - public LivingArmourUpgradeFallProtect(int level) { - super(level); - } - - - public float getDamageMultiplier() { - return 1 - protectionLevel[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.fallProtect"; - } - - @Override - public int getMaxTier() { - return 5; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "fallProtect"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java deleted file mode 100644 index ec34a3cc..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ /dev/null @@ -1,69 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.Effects; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; - -public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { - public static final int[] costs = new int[]{2, 6, 14, 25, 40}; - public static final int[] fireCooldownTime = new int[]{5 * 60 * 20, 5 * 60 * 20, 4 * 60 * 20, 3 * 60 * 20, 2 * 60 * 20}; - public static final int[] fireResistDuration = new int[]{30 * 20, 30 * 20, 40 * 20, 50 * 20, 60 * 20}; - - public int fireCooldown = 0; - - public LivingArmourUpgradeFireResist(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (player.isBurning() && fireCooldown <= 0) { - - player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, fireResistDuration[this.level])); - fireCooldown = fireCooldownTime[this.level]; - - player.sendStatusMessage(new StringTextComponent(TextHelper.localizeEffect(chatBase + "fireRemove")), true); - - } else if (fireCooldown > 0) { - fireCooldown--; - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.fireResist"; - } - - @Override - public int getMaxTier() { - return 5; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(Constants.NBT.UPGRADE_FIRE_TIMER, fireCooldown); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - fireCooldown = tag.getInt(Constants.NBT.UPGRADE_FIRE_TIMER); - } - - @Override - public String getTranslationKey() { - return tooltipBase + "fireResist"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java deleted file mode 100644 index b3b984d2..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ /dev/null @@ -1,61 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ShovelItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 12, 20, 35, 49, 78, 110, 160, 215, 320}; - public static final double[] damageBoost = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - - public LivingArmourUpgradeGraveDigger(int level) { - super(level); - } - - @Override - public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - if (!weapon.isEmpty() && weapon.getItem() instanceof ShovelItem) { - return getDamageModifier(); - } - - return 0; - } - - public double getDamageModifier() { - return damageBoost[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.graveDigger"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "graveDigger"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java deleted file mode 100644 index ffea15d0..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ /dev/null @@ -1,86 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; - -public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { - public static final int[] costs = new int[]{20, 50, 130, 270, 450, 580, 700, 800, 900, 1000}; - public static final int[] rebirthDelay = new int[]{20 * 60 * 60, 20 * 60 * 50, 20 * 60 * 45, 20 * 60 * 40, 20 * 60 * 30, 20 * 60 * 25, 20 * 60 * 15, 20 * 60 * 10, 20 * 60 * 5, 20 * 60}; - public static final int[] strengthDuration = new int[]{0, 0, 100, 100, 200, 200, 200, 300, 300, 400}; - public static final int[] strengthValue = new int[]{0, 0, 0, 0, 0, 1, 1, 2, 2, 3}; - public static final int[] resistanceDuration = new int[]{100, 100, 100, 100, 100, 100, 100, 100, 100, 100}; - public static final int[] resistanceValue = new int[]{0, 0, 0, 0, 0, 1, 1, 2, 2, 3}; - public static final float[] healthOnRevive = new float[]{0.2f, 0.2f, 0.3f, 0.3f, 0.4f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; - - public int deathTimer = 0; - - public LivingArmourUpgradeGrimReaperSprint(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (deathTimer > 0) { - deathTimer--; - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.grimReaper"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void readFromNBT(CompoundNBT tag) { - deathTimer = tag.getInt(BloodMagic.MODID + ".tracker.grimReaper"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.grimReaper", deathTimer); - } - - @Override - public String getTranslationKey() { - return tooltipBase + "grimReaper"; - } - - public void applyEffectOnRebirth(PlayerEntity player) { - player.setHealth(player.getMaxHealth() * healthOnRevive[this.level]); - - int strDur = strengthDuration[this.level]; - if (strDur > 0) { - player.addPotionEffect(new EffectInstance(Effects.STRENGTH, strDur, strengthValue[this.level])); - } - - int resDur = resistanceDuration[this.level]; - if (resDur > 0) { - player.addPotionEffect(new EffectInstance(Effects.RESISTANCE, resDur, resistanceValue[this.level])); - } - - deathTimer = rebirthDelay[this.level]; - player.sendStatusMessage(new StringTextComponent(TextHelper.localizeEffect(chatBase + "grimReaper")), true); - } - - public boolean canSavePlayer(PlayerEntity player) { - return deathTimer <= 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java deleted file mode 100644 index 3a1aaf13..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ /dev/null @@ -1,69 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; -import org.apache.commons.codec.binary.StringUtils; - -import java.util.UUID; - -public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 12, 20, 35, 49, 78, 110, 160, 215, 320}; - public static final int[] healthModifier = new int[]{4, 8, 12, 16, 20, 26, 32, 38, 44, 50}; - - public LivingArmourUpgradeHealthboost(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); - - String name = getUniqueIdentifier() + "-HealthModifier1"; - modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0)); - - return modifierMap; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.health"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "health"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java deleted file mode 100644 index 3fc4e734..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ /dev/null @@ -1,63 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeJump extends LivingArmourUpgrade { - public static final int[] costs = new int[]{3, 6, 11, 23, 37, 50, 70, 100, 140, 200}; - public static final double[] jumpModifier = new double[]{0.10, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5}; - public static final double[] fallModifier = new double[]{0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 0.8, 0.85}; - - public LivingArmourUpgradeJump(int level) { - super(level); - } - - public double getJumpModifier() { - return jumpModifier[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.jump"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (!world.isRemote) { - double motionY = player.motionY; - - if (motionY < 0) { - player.fallDistance = (float) Math.max(0, player.fallDistance + motionY * fallModifier[this.level]); - } - } - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "jump"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java deleted file mode 100644 index 15914a0f..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ /dev/null @@ -1,67 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.nbt.CompoundNBT; -import org.apache.commons.codec.binary.StringUtils; - -import java.util.UUID; - -public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { - public static final int[] costs = new int[]{3, 7, 13, 26, 42}; - public static final double[] kbModifier = new double[]{0.2, 0.4, 0.6, 0.8, 1.0}; - public static final int[] healthModifier = new int[]{0, 0, 0, 4, 10}; - - public LivingArmourUpgradeKnockbackResist(int level) { - super(level); - } - - @Override - public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); - - String name = getUniqueIdentifier() + "-KnockbackModifier1"; - modifierMap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "KnockbackModifier1", kbModifier[this.level], 0)); - - if (healthModifier[this.level] > 0) { - name = getUniqueIdentifier() + "-HealthModifier1"; - modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0)); - } - - return modifierMap; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.knockback"; - } - - @Override - public int getMaxTier() { - return 5; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "knockback"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java deleted file mode 100644 index d08722fd..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ /dev/null @@ -1,69 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; -import org.apache.commons.codec.binary.StringUtils; - -import java.util.UUID; - -public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 12, 20, 35, 49, 78, 110, 160, 215, 320}; - public static final double[] meleeDamage = new double[]{0.5, 1, 1.5, 2, 2.5, 3, 4, 5, 6, 7}; - - public LivingArmourUpgradeMeleeDamage(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - - } - - @Override - public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); - - String name = getUniqueIdentifier() + "-DamageModifier1"; - modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "DamageModifier1", meleeDamage[this.level], 0)); - - return modifierMap; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.meleeDamage"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "meleeDamage"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java deleted file mode 100644 index a33a241a..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ /dev/null @@ -1,72 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 8, 15, 20, 34, 45, 70, 100, 150, 200}; - public static final double[] meleeDamage = new double[]{0, 0.5, 1, 1.5, 2, 2.5, 3, 4, 5, 6}; - - public boolean isActive = false; - - public LivingArmourUpgradeNightSight(int level) { - super(level); - } - - @Override - public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - return isActive ? meleeDamage[this.level] : 0; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (world.getLight(player.getPosition(), false) <= 9) { - isActive = true; - if (player.isPotionActive(Effects.NIGHT_VISION)) - return; - - player.addPotionEffect(new EffectInstance(Effects.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false)); - } else if (isActive) { - isActive = false; - player.removePotionEffect(Effects.NIGHT_VISION); - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.nightSight"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - - } - - @Override - public void readFromNBT(CompoundNBT tag) { - - } - - @Override - public String getTranslationKey() { - return tooltipBase + "nightSight"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java deleted file mode 100644 index 1b69b807..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; - -public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 10, 18, 35, 65, 100, 140, 190, 250, 300}; - public static final double[] protectionLevel = new double[]{0.1, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 0.77, 0.80, 0.83}; - - public LivingArmourUpgradePhysicalProtect(int level) { - super(level); - } - - @Override - public double getArmourProtection(LivingEntity wearer, DamageSource source) { - if (source.getTrueSource() != null && !source.isMagicDamage() && !source.isProjectile()) { - return protectionLevel[this.level]; - } - - return 0; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.physicalProtect"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "physicalProtect"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java deleted file mode 100644 index 87e2d273..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; - -public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { - public static final int[] costs = new int[]{2, 6, 14, 25, 40}; - public static final int[] poisonCooldownTime = new int[]{1200, 800, 600, 300, 100}; - public static final int[] poisonMaxCure = new int[]{0, 1, 2, 2, 3}; - - public int poisonCooldown = 0; - - public LivingArmourUpgradePoisonResist(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (player.isPotionActive(Effects.POISON) && poisonCooldown <= 0) { - EffectInstance eff = player.getActivePotionEffect(Effects.POISON); - if (eff.getAmplifier() <= poisonMaxCure[this.level]) { - player.removePotionEffect(Effects.POISON); - poisonCooldown = poisonCooldownTime[this.level]; - - player.sendStatusMessage(new StringTextComponent(TextHelper.localize(chatBase + "poisonRemove")), true); - } - } else if (poisonCooldown > 0) { - poisonCooldown--; - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.poisonResist"; - } - - @Override - public int getMaxTier() { - return 5; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(Constants.NBT.UPGRADE_POISON_TIMER, poisonCooldown); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - poisonCooldown = tag.getInt(Constants.NBT.UPGRADE_POISON_TIMER); - } - - @Override - public String getTranslationKey() { - return tooltipBase + "poisonResist"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java deleted file mode 100644 index 36b8ad84..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.world.World; - -public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { - public static final int[] costs = new int[]{15}; - public static final int[] repairDelay = new int[]{200}; - - int maxRepair = 1; - - int delay = 0; - - public LivingArmourUpgradeRepairing(int level) { - super(level); - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (delay <= 0) { - delay = repairDelay[this.level]; - - EquipmentSlotType randomSlot = EquipmentSlotType.values()[2 + world.rand.nextInt(4)]; - ItemStack repairStack = player.getItemStackFromSlot(randomSlot); - if (!repairStack.isEmpty()) { - if (repairStack.isItemStackDamageable() && repairStack.isItemDamaged()) { - int toRepair = Math.min(maxRepair, repairStack.getItemDamage()); - if (toRepair > 0) { - repairStack.setItemDamage(repairStack.getItemDamage() - toRepair); - } - } - } - } else { - delay--; - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.repair"; - } - - @Override - public int getMaxTier() { - return 1; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt("repairingDelay", delay); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - delay = tag.getInt("repairingDelay"); - } - - @Override - public String getTranslationKey() { - return tooltipBase + "repair"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java deleted file mode 100644 index 997a72ab..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ /dev/null @@ -1,49 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.CompoundNBT; - -public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { - //TODO: Add extra effects for higher levels - public static final int[] costs = new int[]{7, 13, 22, 40, 65, 90, 130, 180, 250, 350}; - public static final double[] sacrificeModifier = new double[]{0.15, 0.3, 0.45, 0.6, 0.75, 0.9, 1.05, 1.2, 1.35, 1.5}; - - public LivingArmourUpgradeSelfSacrifice(int level) { - super(level); - } - - public double getSacrificeModifier() { - return sacrificeModifier[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.selfSacrifice"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "selfSacrifice"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java deleted file mode 100644 index 81be945d..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ /dev/null @@ -1,79 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; - -public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { - public static final int[] costs = new int[]{5, 12, 20, 35, 49, 78, 110, 160, 215, 320}; - public static final int[] regenCooldown = new int[]{200, 180, 160, 120, 100, 80, 40, 20, 10, 10}; - public static final int[] fireResistCooldown = new int[]{1, 1, 60 * 60, 50 * 60, 40 * 60, 35 * 60, 30 * 60, 25 * 60, 20 * 60, 10 * 60}; - public static final int[] fireResistTime = new int[]{0, 0, 15 * 60, 20 * 60, 30 * 60, 35 * 60, 40 * 60, 50 * 60, 60 * 60, 100 * 60}; - public static final double[] protectionLevel = new double[]{0.02, 0.04, 0.06, 0.08, 0.10, 0.13, 0.16, 0.19, 0.22, 0.25}; - - public int counter = 0; - - public LivingArmourUpgradeSolarPowered(int level) { - super(level); - } - - @Override - public double getArmourProtection(LivingEntity wearer, DamageSource source) { - if (wearer.getEntityWorld().canSeeSky(wearer.getPosition()) && wearer.getEntityWorld().provider.isDaytime()) { - return protectionLevel[this.level]; - } - - return 0; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - counter++; - if (world.canSeeSky(player.getPosition()) && world.provider.isDaytime()) { - if (counter % regenCooldown[this.level] == 0 && player.getHealth() < player.getMaxHealth()) { - player.heal(1); - } - - if (fireResistTime[this.level] != 0 && counter % fireResistCooldown[this.level] == 0) { - player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, fireResistTime[this.level], 0, false, false)); - } - } - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.solarPowered"; - } - - @Override - public int getMaxTier() { - return 10; // Set to here until I can add more upgrades to it. - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(BloodMagic.MODID + ".tracker.solarPowered", counter); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - counter = tag.getInt(BloodMagic.MODID + ".tracker.solarPowered"); - } - - @Override - public String getTranslationKey() { - return tooltipBase + "solarPowered"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java deleted file mode 100644 index 4b595b5b..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ /dev/null @@ -1,87 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.world.World; - -public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { - public static final int[] costs = new int[]{3, 7, 13, 26, 42, 60, 90, 130, 180, 250}; - public static final double[] speedModifier = new double[]{0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5}; - public static final int[] sprintSpeedTime = new int[]{0, 0, 0, 0, 0, 20, 60, 60, 100, 200}; - public static final int[] sprintSpeedLevel = new int[]{0, 0, 0, 0, 0, 0, 0, 1, 1, 2}; - public static final int[] healthModifier = new int[]{0, 0, 0, 0, 0, 0, 0, 4, 10, 20}; - public static final int[] sprintRegenTime = new int[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 25}; - - public LivingArmourUpgradeSpeed(int level) { - super(level); - } - - public double getSpeedModifier() { - return speedModifier[this.level]; - } - - @Override - public void onTick(World world, PlayerEntity player, ILivingArmour livingArmour) { - if (player.isSprinting()) { - if (sprintSpeedTime[this.level] > 0) { - player.addPotionEffect(new EffectInstance(Effects.SPEED, sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); - } - - if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(Effects.REGENERATION)) { - player.addPotionEffect(new EffectInstance(Effects.REGENERATION, sprintRegenTime[this.level], 0, false, false)); - } - } - } - - @Override - public Multimap getAttributeModifiers() { - Multimap modifierMap = HashMultimap.create(); - -// modifierMap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Speed modifier" + 1, speedModifier[this.level], 1)); - -// if (healthModifier[this.level] > 0) { -// String name = getUniqueIdentifier() + "-HealthModifier1"; -// modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(UUID.nameUUIDFromBytes(StringUtils.getBytesUtf8(name)), "HealthModifier1", healthModifier[this.level], 0)); -// } - - return modifierMap; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.movement"; - } - - @Override - public int getMaxTier() { - return 10; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "speed"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java deleted file mode 100644 index 4b9fa00b..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ /dev/null @@ -1,74 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { - public static final int[] costs = new int[]{3, 7, 15, 25, 40}; - public static final double[] damageBoost = new double[]{0.5, 0.75, 1, 1.25, 1.5}; - public static final double[] knockbackModifier = new double[]{1, 2, 3, 4, 5}; - - public LivingArmourUpgradeSprintAttack(int level) { - super(level); - } - - @Override - public double getAdditionalDamageOnHit(double damage, PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - if (wearer.isSprinting()) { - return getDamageModifier(); - } - - return 0; - } - - @Override - public double getKnockbackOnHit(PlayerEntity wearer, LivingEntity hitEntity, ItemStack weapon) { - if (wearer.isSprinting()) { - return getKnockbackModifier(); - } - - return 0; - } - - public double getDamageModifier() { - return damageBoost[this.level]; - } - - public double getKnockbackModifier() { - return knockbackModifier[this.level]; - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.sprintAttack"; - } - - @Override - public int getMaxTier() { - return 5; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "sprintAttack"; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java deleted file mode 100644 index 26cdf8e3..00000000 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import net.minecraft.nbt.CompoundNBT; - -public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { - public static final int[] costs = new int[]{20}; - public static final float[] assist = new float[]{Constants.Misc.ALTERED_STEP_HEIGHT}; - -// public static final double[] speedModifier = new double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.9, 1.1, 1.3, 1.5 }; -// public static final int[] sprintSpeedTime = new int[] { 0, 0, 0, 0, 0, 20, 60, 60, 100, 200 }; -// public static final int[] sprintSpeedLevel = new int[] { 0, 0, 0, 0, 0, 0, 0, 1, 1, 2 }; -// public static final int[] healthModifier = new int[] { 0, 0, 0, 0, 0, 0, 0, 4, 10, 20 }; -// public static final int[] sprintRegenTime = new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 25 }; - - public LivingArmourUpgradeStepAssist(int level) { - super(level); - } - - @Override - public String getUniqueIdentifier() { - return BloodMagic.MODID + ".upgrade.stepAssist"; - } - - @Override - public int getMaxTier() { - return 1; - } - - @Override - public int getCostOfUpgrade() { - return costs[this.level]; - } - - @Override - public void writeToNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public void readFromNBT(CompoundNBT tag) { - // EMPTY - } - - @Override - public String getTranslationKey() { - return tooltipBase + "stepAssist"; - } - - public float getStepAssist() { - return assist[this.level]; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java deleted file mode 100644 index bd5d9158..00000000 --- a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java +++ /dev/null @@ -1,115 +0,0 @@ -package WayofTime.bloodmagic.meteor; - -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; - -public class Meteor { - private static final Random RAND = new Random(); - - private final ItemStack catalystStack; - private final List components; - private final float explosionStrength; - private final int radius; - private final int maxWeight; - public int version; - public int cost = 1000000; - - public Meteor(ItemStack catalystStack, List components, float explosionStrength, int radius) { - this.catalystStack = catalystStack; - this.components = components; - this.explosionStrength = explosionStrength; - this.radius = radius; - - int weight = 0; - for (MeteorComponent component : components) - weight += component.getWeight(); - this.maxWeight = weight; - } - - public void generateMeteor(World world, BlockPos pos, BlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { - world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), (float) (explosionStrength * explosionModifier), true, true); - int radius = (int) Math.ceil(getRadius() * radiusModifier); - double floatingRadius = getRadius() * radiusModifier; - - for (int i = -radius; i <= radius; i++) { - for (int j = -radius; j <= radius; j++) { - for (int k = -radius; k <= radius; k++) { - if (i * i + j * j + k * k > (floatingRadius + 0.5) * (floatingRadius + 0.5)) { - continue; - } - - BlockPos newPos = pos.add(i, j, k); - BlockState state = world.getBlockState(newPos); - - if (world.isAirBlock(newPos) || Utils.isBlockLiquid(state)) { - BlockState placedState = getRandomOreFromComponents(fillerBlock, fillerChance); - if (placedState != null) { - world.setBlockState(newPos, placedState); - } - } - } - } - } - } - - //fillerChance is the chance that the filler block will NOT be placed - public BlockState getRandomOreFromComponents(BlockState fillerBlock, double fillerChance) { - int goal = RAND.nextInt(getMaxWeight()); - - for (MeteorComponent component : getComponents()) { - goal -= component.getWeight(); - if (goal < 0) { - BlockState state = component.getStateFromOre(); - if (state != null) { - return state; - } else { - return RAND.nextDouble() > fillerChance ? fillerBlock : null; - } - } - } - - return RAND.nextDouble() > fillerChance ? fillerBlock : null; - } - - public ItemStack getCatalystStack() { - return catalystStack; - } - - public List getComponents() { - return components; - } - - public float getExplosionStrength() { - return explosionStrength; - } - - public int getRadius() { - return radius; - } - - public int getMaxWeight() { - return maxWeight; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public void setCost(int performCost) { - this.cost = performCost; - } - - public int getCost() { - return cost; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java deleted file mode 100644 index 5e820a31..00000000 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.meteor; - -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.List; - -public class MeteorComponent { - public int weight; - public String oreName; - - public MeteorComponent(int weight, String oreName) { - this.weight = weight; - this.oreName = oreName; - } - - public BlockState getStateFromOre() { - if (oreName.contains(":")) { - String[] stringList = oreName.split(":"); - String domain = stringList[0]; - String block = stringList[1]; - int meta = 0; - if (stringList.length > 2 && Utils.isInteger(stringList[2])) { - meta = Integer.parseInt(stringList[2]); - } - - Block ore = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(domain, block)); - if (ore != Blocks.AIR) { - return ore.getStateFromMeta(meta); - } - } - - List list = OreDictionary.getOres(oreName); - if (list != null && !list.isEmpty()) { - for (ItemStack stack : list) { - if (stack != null && stack.getItem() instanceof BlockItem) { - Block block = ((BlockItem) stack.getItem()).getBlock(); - BlockState state = block.getStateFromMeta(stack.getItemDamage()); - - return state; - } - } - } - - return null; - } - - public int getWeight() { - return weight; - } - - public void setWeight(int weight) { - this.weight = weight; - } - - public String getOreName() { - return oreName; - } - - public void setOreName(String oreName) { - this.oreName = oreName; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java deleted file mode 100644 index 0be375e3..00000000 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ /dev/null @@ -1,165 +0,0 @@ -package WayofTime.bloodmagic.meteor; - -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.gson.Serializers; -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.lang3.tuple.Pair; - -import java.io.*; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class MeteorConfigHandler { - private static final Map DEFAULT_METEORS = Maps.newHashMap(); - - private static File meteorDir; - - public static void init(File meteorDirectory) { - meteorDir = meteorDirectory; - handleMeteors(true); - } - - public static void handleMeteors(boolean checkNewVersion) { - if (meteorDir == null) { - BMLog.DEFAULT.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); - return; - } - - // Clear the meteors so that reloading in-game can be done - MeteorRegistry.meteorMap.clear(); - List> defaultMeteors = getDefaultMeteors(); - - try { - // Create defaults if the folder doesn't exist - if (!meteorDir.exists() && meteorDir.mkdir()) { - for (Pair meteor : defaultMeteors) { - String json = Serializers.GSON.toJson(meteor.getRight()); - FileWriter writer = new FileWriter(new File(meteorDir, meteor.getLeft() + ".json")); - writer.write(json); - writer.close(); - } - } - - // Collect all meteors from the files - File[] meteorFiles = meteorDir.listFiles((FileFilter) FileFilterUtils.suffixFileFilter(".json")); - if (meteorFiles == null) - return; - - List> meteors = Lists.newArrayList(); - - // Filter names so we can compare to defaults - for (File meteorFile : meteorFiles) { - FileReader reader = new FileReader(meteorFile); - Meteor meteor = Serializers.GSON.fromJson(reader, Meteor.class); - meteors.add(Pair.of(FilenameUtils.removeExtension(meteorFile.getName()), meteor)); - reader.close(); - } - - if (checkNewVersion && ConfigHandler.values.shouldResyncMeteors) { - Set discoveredDefaults = Sets.newHashSet(); - - // Check existing defaults for new version - for (Pair meteor : meteors) { - Meteor defaultMeteor = DEFAULT_METEORS.get(meteor.getLeft()); - if (defaultMeteor != null) { - discoveredDefaults.add(meteor.getLeft()); - if (defaultMeteor.version > meteor.getRight().version) { - writeMeteor(meteor.getLeft(), defaultMeteor); - meteors.set(meteors.indexOf(meteor), Pair.of(meteor.getLeft(), defaultMeteor)); - } - } - } - - // Generate new defaults - for (Map.Entry entry : DEFAULT_METEORS.entrySet()) { - if (discoveredDefaults.contains(entry.getKey())) - continue; - - writeMeteor(entry.getKey(), entry.getValue()); - } - } - - // Finally, register all of our meteors - for (Pair meteor : meteors) - MeteorRegistry.registerMeteor(meteor.getRight().getCatalystStack(), meteor.getRight()); - } catch (Exception e) { - e.printStackTrace(); - } - } - - private static List> getDefaultMeteors() { - List> holders = Lists.newArrayList(); - - // Iron - List ironMeteorList = Lists.newArrayList(); - ironMeteorList.add(new MeteorComponent(400, "oreIron")); - ironMeteorList.add(new MeteorComponent(200, "oreCopper")); - ironMeteorList.add(new MeteorComponent(140, "oreTin")); - ironMeteorList.add(new MeteorComponent(70, "oreSilver")); - ironMeteorList.add(new MeteorComponent(80, "oreLead")); - ironMeteorList.add(new MeteorComponent(30, "oreGold")); - ironMeteorList.add(new MeteorComponent(60, "oreLapis")); - ironMeteorList.add(new MeteorComponent(100, "oreRedstone")); - Meteor ironMeteor = new Meteor(new ItemStack(Blocks.IRON_BLOCK), ironMeteorList, 15, 5); - ironMeteor.setVersion(3); - ironMeteor.setCost(1000000); - - // Gold - List goldMeteorList = Lists.newArrayList(); - goldMeteorList.add(new MeteorComponent(200, "oreIron")); - goldMeteorList.add(new MeteorComponent(100, "oreCopper")); - goldMeteorList.add(new MeteorComponent(60, "oreTin")); - goldMeteorList.add(new MeteorComponent(100, "oreGold")); - goldMeteorList.add(new MeteorComponent(120, "oreLapis")); - goldMeteorList.add(new MeteorComponent(30, "oreDiamond")); - goldMeteorList.add(new MeteorComponent(20, "oreEmerald")); - goldMeteorList.add(new MeteorComponent(20, "oreCoal")); - Meteor goldMeteor = new Meteor(new ItemStack(Blocks.GOLD_BLOCK), goldMeteorList, 18, 6); - goldMeteor.setVersion(4); - goldMeteor.setCost(2500000); - - // Diamond - List diamondMeteorList = Lists.newArrayList(); - diamondMeteorList.add(new MeteorComponent(50, "oreIron")); - diamondMeteorList.add(new MeteorComponent(100, "oreGold")); - diamondMeteorList.add(new MeteorComponent(10, "oreLapis")); - diamondMeteorList.add(new MeteorComponent(250, "oreDiamond")); - diamondMeteorList.add(new MeteorComponent(180, "oreEmerald")); - diamondMeteorList.add(new MeteorComponent(50, "oreRedstone")); - diamondMeteorList.add(new MeteorComponent(400, "oreDiamond")); - Meteor diamondMeteor = new Meteor(new ItemStack(Blocks.DIAMOND_BLOCK), diamondMeteorList, 10, 3); - diamondMeteor.setVersion(4); - diamondMeteor.setCost(5000000); - - holders.add(Pair.of("iron", ironMeteor)); - DEFAULT_METEORS.put("iron", ironMeteor); - - holders.add(Pair.of("gold", goldMeteor)); - DEFAULT_METEORS.put("gold", goldMeteor); - - holders.add(Pair.of("diamond", diamondMeteor)); - DEFAULT_METEORS.put("diamond", diamondMeteor); - return holders; - } - - private static void writeMeteor(String name, Meteor meteor) { - try { - String json = Serializers.GSON.toJson(meteor); - File meteorFile = new File(meteorDir, name + ".json"); - new PrintWriter(meteorFile).close(); // Clear the file - FileWriter fileWriter = new FileWriter(meteorFile); - fileWriter.write(json); // Write the new contents - fileWriter.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java deleted file mode 100644 index a74f5c43..00000000 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java +++ /dev/null @@ -1,44 +0,0 @@ -package WayofTime.bloodmagic.meteor; - -import com.google.common.collect.Maps; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; - -public class MeteorRegistry { - - public static Map meteorMap = Maps.newHashMap(); - - public static void registerMeteor(ItemStack stack, Meteor holder) { - if (!stack.isEmpty()) - meteorMap.put(stack, holder); - } - - public static void registerMeteor(ItemStack stack, List componentList, float explosionStrength, int radius) { - Meteor holder = new Meteor(stack, componentList, explosionStrength, radius); - registerMeteor(stack, holder); - } - - @Nullable - public static Meteor getMeteorForItem(ItemStack stack) { - if (stack.isEmpty()) - return null; - - for (Map.Entry entry : meteorMap.entrySet()) - if (ItemStack.areItemsEqual(stack, entry.getKey())) - return entry.getValue(); - - return null; - } - - public static void generateMeteorForItem(ItemStack stack, World world, BlockPos pos, BlockState fillerBlock, double radiusModifier, double explosionModifier, double fillerChance) { - Meteor meteor = getMeteorForItem(stack); - if (meteor != null) - meteor.generateMeteor(world, pos, fillerBlock, radiusModifier, explosionModifier, fillerChance); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java index 06f2c1a0..77fa79df 100644 --- a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java +++ b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java @@ -1,37 +1,47 @@ -package WayofTime.bloodmagic.network; +package wayoftime.bloodmagic.network; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.ChatUtil; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.network.simple.SimpleChannel; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.util.ChatUtil; -public class BloodMagicPacketHandler { - public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(BloodMagic.MODID); +public class BloodMagicPacketHandler extends BasePacketHandler +{ +// public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(new ResourceLocation(BloodMagic.MODID, "main"), () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals); + public static final SimpleChannel INSTANCE = createChannel(new ResourceLocation(BloodMagic.MODID, "main")); - public static void init() { - INSTANCE.registerMessage(ChatUtil.PacketNoSpamChat.Handler.class, ChatUtil.PacketNoSpamChat.class, 0, Side.CLIENT); - INSTANCE.registerMessage(ItemRouterButtonPacketProcessor.class, ItemRouterButtonPacketProcessor.class, 1, Side.SERVER); - INSTANCE.registerMessage(PlayerVelocityPacketProcessor.class, PlayerVelocityPacketProcessor.class, 2, Side.CLIENT); - INSTANCE.registerMessage(PlayerFallDistancePacketProcessor.class, PlayerFallDistancePacketProcessor.class, 3, Side.SERVER); - INSTANCE.registerMessage(SigilHoldingPacketProcessor.class, SigilHoldingPacketProcessor.class, 4, Side.SERVER); - INSTANCE.registerMessage(KeyProcessor.class, KeyProcessor.class, 5, Side.SERVER); - INSTANCE.registerMessage(DemonAuraPacketProcessor.class, DemonAuraPacketProcessor.class, 6, Side.CLIENT); - INSTANCE.registerMessage(ItemRouterAmountPacketProcessor.class, ItemRouterAmountPacketProcessor.class, 7, Side.SERVER); - } + @Override + public void initialize() + { + registerServerToClient(ChatUtil.PacketNoSpamChat.class, ChatUtil.PacketNoSpamChat::encode, ChatUtil.PacketNoSpamChat::decode, ChatUtil.PacketNoSpamChat::handle); +// INSTANCE.registerMessage(id, messageType, encoder, decoder, messageConsumer); +// INSTANCE.registerMessage(ChatUtil.PacketNoSpamChat.Handler.class, ChatUtil.PacketNoSpamChat.class, 0, Side.CLIENT); +// INSTANCE.registerMessage(ItemRouterButtonPacketProcessor.class, ItemRouterButtonPacketProcessor.class, 1, Side.SERVER); +// INSTANCE.registerMessage(PlayerVelocityPacketProcessor.class, PlayerVelocityPacketProcessor.class, 2, Side.CLIENT); +// INSTANCE.registerMessage(PlayerFallDistancePacketProcessor.class, PlayerFallDistancePacketProcessor.class, 3, Side.SERVER); +// INSTANCE.registerMessage(SigilHoldingPacketProcessor.class, SigilHoldingPacketProcessor.class, 4, Side.SERVER); +// INSTANCE.registerMessage(KeyProcessor.class, KeyProcessor.class, 5, Side.SERVER); +// INSTANCE.registerMessage(DemonAuraPacketProcessor.class, DemonAuraPacketProcessor.class, 6, Side.CLIENT); +// INSTANCE.registerMessage(ItemRouterAmountPacketProcessor.class, ItemRouterAmountPacketProcessor.class, 7, Side.SERVER); + } - public static void sendToAllAround(IMessage message, TileEntity te, int range) { - INSTANCE.sendToAllAround(message, new NetworkRegistry.TargetPoint(te.getWorld().provider.getDimension(), te.getPos().getX(), te.getPos().getY(), te.getPos().getZ(), range)); - } + protected SimpleChannel getChannel() + { + return INSTANCE; + } - public static void sendToAllAround(IMessage message, TileEntity te) { - sendToAllAround(message, te, 64); - } - - public static void sendTo(IMessage message, ServerPlayerEntity player) { - INSTANCE.sendTo(message, player); - } -} +// public static void sendToAllAround(IMessage message, TileEntity te, int range) +// { +// INSTANCE.sendToAllAround(message, new NetworkRegistry.TargetPoint(te.getWorld().provider.getDimension(), te.getPos().getX(), te.getPos().getY(), te.getPos().getZ(), range)); +// } +// +// public static void sendToAllAround(IMessage message, TileEntity te) +// { +// sendToAllAround(message, te, 64); +// } +// +// public static void sendTo(IMessage message, EntityPlayerMP player) +// { +// INSTANCE.sendTo(message, player); +// } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java deleted file mode 100644 index 9d0ea6ce..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java +++ /dev/null @@ -1,57 +0,0 @@ -package WayofTime.bloodmagic.network; - -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.proxy.ClientProxy; -import io.netty.buffer.ByteBuf; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class DemonAuraPacketProcessor implements IMessage, IMessageHandler { - public DemonWillHolder currentWill = new DemonWillHolder(); - - public DemonAuraPacketProcessor() { - - } - - public DemonAuraPacketProcessor(DemonWillHolder holder) { - this.currentWill = holder; - } - - @Override - public void fromBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - currentWill.willMap.put(type, buff.readDouble()); - } - } - - @Override - public void toBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - if (currentWill.willMap.containsKey(type)) { - buff.writeDouble(currentWill.willMap.get(type)); - } else { - buff.writeDouble(0); - } - } - } - - @Override - public IMessage onMessage(DemonAuraPacketProcessor message, MessageContext ctx) { - if (ctx.side == Side.CLIENT) { - message.onMessageFromServer(); - } - return null; - } - - @SideOnly(Side.CLIENT) - public void onMessageFromServer() { - ClientProxy.currentAura = currentWill; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java deleted file mode 100644 index de84fd3d..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.network; - -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; -import io.netty.buffer.ByteBuf; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; - -public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandler { - private int ghostItemSlot; - private int amount; - private int dimension; - private BlockPos pos; - - public ItemRouterAmountPacketProcessor() { - - } - - public ItemRouterAmountPacketProcessor(int ghostItemSlot, int amount, BlockPos pos, World world) { - this.ghostItemSlot = ghostItemSlot; - this.amount = amount; - this.pos = pos; - this.dimension = world.provider.getDimension(); - } - - @Override - public void fromBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - dimension = buff.readInt(); - pos = buff.readBlockPos(); - ghostItemSlot = buff.readInt(); - amount = buff.readInt(); - } - - @Override - public void toBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - buff.writeInt(dimension); - buff.writeBlockPos(pos); - buff.writeInt(ghostItemSlot); - buff.writeInt(amount); - } - - @Override - public IMessage onMessage(ItemRouterAmountPacketProcessor message, MessageContext ctx) { - if (ctx.side == Side.SERVER) { - message.onMessageFromClient(); - } - return null; - } - - public void onMessageFromClient() { - World world = DimensionManager.getWorld(dimension); - if (world != null) { - if (!world.isBlockLoaded(pos)) - return; - - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileFilteredRoutingNode) { - ((TileFilteredRoutingNode) tile).setGhostItemAmount(ghostItemSlot, amount); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java deleted file mode 100644 index e8aafad7..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java +++ /dev/null @@ -1,74 +0,0 @@ -package WayofTime.bloodmagic.network; - -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; -import io.netty.buffer.ByteBuf; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; - -public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandler { - private int buttonPress; - private int dimension; - private BlockPos pos; - - public ItemRouterButtonPacketProcessor() { - - } - - public ItemRouterButtonPacketProcessor(int buttonPress, BlockPos pos, World world) { - this.buttonPress = buttonPress; - this.pos = pos; - this.dimension = world.provider.getDimension(); - } - - @Override - public void fromBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - dimension = buff.readInt(); - pos = buff.readBlockPos(); - buttonPress = buff.readInt(); - } - - @Override - public void toBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - buff.writeInt(dimension); - buff.writeBlockPos(pos); - buff.writeInt(buttonPress); - } - - @Override - public IMessage onMessage(ItemRouterButtonPacketProcessor message, MessageContext ctx) { - if (ctx.side == Side.SERVER) { - message.onMessageFromClient(); - } - return null; - } - - public void onMessageFromClient() { - World world = DimensionManager.getWorld(dimension); - if (world != null) { - if (!world.isBlockLoaded(pos)) - return; - - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileFilteredRoutingNode) { - if (buttonPress >= 6) { - if (buttonPress == 6) { - ((TileFilteredRoutingNode) tile).incrementCurrentPriotiryToMaximum(9); - } else if (buttonPress == 7) { - ((TileFilteredRoutingNode) tile).decrementCurrentPriority(); - } - } else { - ((TileFilteredRoutingNode) tile).swapFilters(buttonPress); - } - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java b/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java deleted file mode 100644 index 513e56cc..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java +++ /dev/null @@ -1,52 +0,0 @@ -package WayofTime.bloodmagic.network; - -import WayofTime.bloodmagic.client.key.IKeybindable; -import WayofTime.bloodmagic.client.key.KeyBindings; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -public class KeyProcessor implements IMessage, IMessageHandler { - public int keyId; - public boolean showInChat; - - public KeyProcessor() { - } - - public KeyProcessor(KeyBindings key, boolean showInChat) { - this.keyId = key.ordinal(); - this.showInChat = showInChat; - } - - @Override - public void fromBytes(ByteBuf buf) { - this.keyId = buf.readInt(); - this.showInChat = buf.readBoolean(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(this.keyId); - buf.writeBoolean(this.showInChat); - } - - @Override - public IMessage onMessage(KeyProcessor msg, MessageContext ctx) { - PlayerEntity entityPlayer = ctx.getServerHandler().player; - - if (entityPlayer != null) { - ItemStack heldStack = entityPlayer.getHeldItemMainhand(); - if (heldStack.getItem() instanceof IKeybindable) { - if (msg.keyId < 0 || msg.keyId >= KeyBindings.values().length) { - return null; - } - KeyBindings key = KeyBindings.values()[msg.keyId]; - ((IKeybindable) heldStack.getItem()).onKeyPressed(heldStack, entityPlayer, key, msg.showInChat); - } - } - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java deleted file mode 100644 index 0e29a52e..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java +++ /dev/null @@ -1,45 +0,0 @@ -package WayofTime.bloodmagic.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; - -public class PlayerFallDistancePacketProcessor implements IMessage, IMessageHandler { - private float fallDistance; - - public PlayerFallDistancePacketProcessor() { - - } - - public PlayerFallDistancePacketProcessor(float fallDistance) { - this.fallDistance = fallDistance; - } - - @Override - public void fromBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - fallDistance = buff.readFloat(); - } - - @Override - public void toBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - buff.writeFloat(fallDistance); - } - - @Override - public IMessage onMessage(PlayerFallDistancePacketProcessor message, MessageContext ctx) { - if (ctx.side == Side.SERVER) { - message.onMessageFromClient(ctx.getServerHandler().player); - } - return null; - } - - public void onMessageFromClient(PlayerEntity player) { - player.fallDistance = fallDistance; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java deleted file mode 100644 index 324c4d0f..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java +++ /dev/null @@ -1,59 +0,0 @@ -package WayofTime.bloodmagic.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler { - private double motionX; - private double motionY; - private double motionZ; - - public PlayerVelocityPacketProcessor() { - - } - - public PlayerVelocityPacketProcessor(double motionX, double motionY, double motionZ) { - this.motionX = motionX; - this.motionY = motionY; - this.motionZ = motionZ; - } - - @Override - public void fromBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - motionX = buff.readDouble(); - motionY = buff.readDouble(); - motionZ = buff.readDouble(); - } - - @Override - public void toBytes(ByteBuf buffer) { - PacketBuffer buff = new PacketBuffer(buffer); - buff.writeDouble(motionX); - buff.writeDouble(motionY); - buff.writeDouble(motionZ); - } - - @Override - public IMessage onMessage(PlayerVelocityPacketProcessor message, MessageContext ctx) { - if (ctx.side == Side.CLIENT) { - message.onMessageFromServer(); - } - return null; - } - - @SideOnly(Side.CLIENT) - public void onMessageFromServer() { - PlayerEntity player = Minecraft.getInstance().player; - player.motionX = motionX; - player.motionY = motionY; - player.motionZ = motionZ; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java deleted file mode 100644 index 9cd7631f..00000000 --- a/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java +++ /dev/null @@ -1,48 +0,0 @@ -package WayofTime.bloodmagic.network; - -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -public class SigilHoldingPacketProcessor implements IMessage, IMessageHandler { - private int slot; - private int mode; - - public SigilHoldingPacketProcessor() { - } - - public SigilHoldingPacketProcessor(int slot, int mode) { - this.slot = slot; - this.mode = mode; - } - - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeInt(slot); - buffer.writeInt(mode); - } - - @Override - public void fromBytes(ByteBuf buffer) { - slot = buffer.readInt(); - mode = buffer.readInt(); - } - - @Override - public IMessage onMessage(SigilHoldingPacketProcessor message, MessageContext ctx) { - ItemStack itemStack = ItemStack.EMPTY; - - if (message.slot > -1 && message.slot < 9) { - itemStack = ctx.getServerHandler().player.inventory.getStackInSlot(message.slot); - } - - if (!itemStack.isEmpty()) { - ItemSigilHolding.cycleToNextSigil(itemStack, message.mode); - } - - return null; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java index 5ac147c2..753bd1f6 100644 --- a/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java @@ -1,68 +1,61 @@ -package WayofTime.bloodmagic.orb; +package wayoftime.bloodmagic.orb; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraftforge.registries.IForgeRegistryEntry; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import net.minecraft.util.ResourceLocation; /** - * Base object for all Blood Orbs. Makes Orb creation quite a bit easier. - *

    - * Just create a new BloodOrb instance then register it in {@link net.minecraftforge.event.RegistryEvent.Register} + * Refactoring of the original BloodOrb. BloodOrbs are no longer registered due + * to The Flattening. */ -public class BloodOrb extends IForgeRegistryEntry.Impl { - private final String name; - private final int tier; - private final int capacity; - private final int fillRate; - @Nullable - private ModelResourceLocation modelLocation; +public class BloodOrb extends net.minecraftforge.registries.ForgeRegistryEntry +{ + private final ResourceLocation name; + private final int tier; + private final int capacity; + private final int fillRate; - /** - * A base object for BloodOrbs. A bit cleaner than the old way through - * EnergyItems. - * - * @param name - A name for the Orb. Gets put into an unlocalized name. - * @param tier - The tier of the Orb. - * @param capacity - The max amount of LP the Orb can store. - * @param fillRate - The amount of LP per tick the Altar can fill the network with. - */ - public BloodOrb(String name, int tier, int capacity, int fillRate) { - this.name = name; - this.tier = tier; - this.capacity = capacity; - this.fillRate = fillRate; - } + /** + * A base object for BloodOrbs. A bit cleaner than the old way through + * EnergyItems. + * + * @param name - A name for the Orb. Gets put into an unlocalized name. + * @param tier - The tier of the Orb. + * @param capacity - The max amount of LP the Orb can store. + * @param fillRate - The amount of LP per tick the Altar can fill the network + * with. + */ + public BloodOrb(ResourceLocation name, int tier, int capacity, int fillRate) + { + this.name = name; + this.tier = tier; + this.capacity = capacity; + this.fillRate = fillRate; + } - public String getName() { - return name; - } + public ResourceLocation getResourceLocation() + { + return name; + } - public int getTier() { - return tier; - } + public int getTier() + { + return tier; + } - public int getCapacity() { - return capacity; - } + public int getCapacity() + { + return capacity; + } - public int getFillRate() { - return fillRate; - } + public int getFillRate() + { + return fillRate; + } - @Nullable - public ModelResourceLocation getModelLocation() { - return modelLocation; - } - - public BloodOrb withModel(@Nonnull ModelResourceLocation modelLocation) { - this.modelLocation = modelLocation; - return this; - } - - @Override - public String toString() { - return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + ", owner=" + getRegistryName() + '}'; - } -} + @Override + public String toString() + { +// return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + ", owner=" +// + getRegistryName() + '}'; + return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java index 09848dbb..ae3a637b 100644 --- a/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java @@ -1,10 +1,11 @@ -package WayofTime.bloodmagic.orb; - -import net.minecraft.item.ItemStack; +package wayoftime.bloodmagic.orb; import javax.annotation.Nullable; -public interface IBloodOrb { - @Nullable - BloodOrb getOrb(ItemStack stack); -} +import net.minecraft.item.ItemStack; + +public interface IBloodOrb +{ + @Nullable + BloodOrb getOrb(ItemStack stack); +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java deleted file mode 100644 index be6b60bf..00000000 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ /dev/null @@ -1,137 +0,0 @@ -package WayofTime.bloodmagic.potion; - -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; -import net.minecraft.block.Block; -import net.minecraft.block.IGrowable; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - -public class BMPotionUtils { - public static Random rand = new Random(); - - public static double damageMobAndGrowSurroundingPlants(LivingEntity entity, int horizontalRadius, int verticalRadius, double damageRatio, int maxPlantsGrown) { - World world = entity.getEntityWorld(); - if (world.isRemote) { - return 0; - } - - if (entity.isDead) { - return 0; - } - - double incurredDamage = 0; - - List growList = new ArrayList<>(); - - for (int i = 0; i < maxPlantsGrown; i++) { - BlockPos blockPos = entity.getPosition().add(rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius, rand.nextInt(verticalRadius * 2 + 1) - verticalRadius, rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius); - BlockState state = world.getBlockState(blockPos); - - if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { - if (state.getBlock() instanceof IGrowable) { - growList.add(blockPos); - } - } - } - - for (BlockPos blockPos : growList) { - Block block = world.getBlockState(blockPos).getBlock(); -// if (world.rand.nextInt(50) == 0) - { - BlockState preBlockState = world.getBlockState(blockPos); - for (int n = 0; n < 10; n++) - block.updateTick(world, blockPos, world.getBlockState(blockPos), world.rand); - - BlockState newState = world.getBlockState(blockPos); - if (!newState.equals(preBlockState)) { - world.playEvent(2001, blockPos, Block.getIdFromBlock(newState.getBlock()) + (newState.getBlock().getMetaFromState(newState) << 12)); - incurredDamage += damageRatio; - } - } - } - - if (incurredDamage > 0) { - entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, (float) incurredDamage); - } - - return incurredDamage; - } - - public static double getLengthAugment(ItemStack flaskStack, Effect potion) { - NBTHelper.checkNBT(flaskStack); - CompoundNBT tag = flaskStack.getTagCompound(); - - return tag.getDouble(Constants.NBT.POTION_AUGMENT_LENGHT + potion.getName()); - } - - public static void setLengthAugment(ItemStack flaskStack, Effect potion, double value) { - if (value < 0) { - value = 0; - } - - NBTHelper.checkNBT(flaskStack); - CompoundNBT tag = flaskStack.getTagCompound(); - - tag.putDouble(Constants.NBT.POTION_AUGMENT_LENGHT + potion.getName(), value); - } - - public static int getAugmentedLength(int originalLength, double lengthAugment, double powerAugment) { - return Math.max((int) (originalLength * (Math.pow(8f / 3f, lengthAugment) * Math.pow(0.5, powerAugment))), 1); - } - - /** - * Copied from PotionUtils - * - * @param stack - * @param effects - * @return - */ - public static ItemStack setEffects(ItemStack stack, Collection effects) { - if (effects.isEmpty()) { - return stack; - } else { - CompoundNBT nbttagcompound = stack.hasTagCompound() ? stack.getTagCompound() : new CompoundNBT(); - ListNBT nbttaglist = new ListNBT(); - - for (EffectInstance potioneffect : effects) { - nbttaglist.appendTag(potioneffect.writeCustomPotionEffectToNBT(new CompoundNBT())); - } - - nbttagcompound.putTag("CustomPotionEffects", nbttaglist); - stack.setTagCompound(nbttagcompound); - return stack; - } - } - - public static AlchemyTablePotionAugmentRecipe getLengthAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect, double lengthAugment) { - return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect, lengthAugment, 0); - } - - public static AlchemyTablePotionAugmentRecipe getPowerAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect, int powerAugment) { - return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect, 0, powerAugment); - } - - public static AlchemyTablePotionAugmentRecipe getLengthAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect, double lengthAugment) { - return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItem, baseEffect, lengthAugment, 0); - } - - public static AlchemyTablePotionAugmentRecipe getPowerAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect, int powerAugment) { - return new AlchemyTablePotionAugmentRecipe(lpDrained, ticksRequired, tierRequired, inputItem, baseEffect, 0, powerAugment); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java index cc29bc82..057c44c9 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java @@ -1,56 +1,12 @@ -package WayofTime.bloodmagic.potion; +package wayoftime.bloodmagic.potion; -import WayofTime.bloodmagic.BloodMagic; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.LivingEntity; import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.potion.EffectType; -public class PotionBloodMagic extends Effect { - public static ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "textures/misc/potions.png"); - - public PotionBloodMagic(String name, boolean badEffect, int potionColor, int iconIndexX, int iconIndexY) { - super(badEffect, potionColor); - this.setPotionName(name); - this.setIconIndex(iconIndexX, iconIndexY); - } - - @Override - public boolean shouldRenderInvText(EffectInstance effect) { - return true; - } - - public EffectInstance apply(LivingEntity entity, int duration) { - return apply(entity, duration, 0); - } - - public EffectInstance apply(LivingEntity entity, int duration, int level) { - EffectInstance effect = new EffectInstance(this, duration, level, false, false); - entity.addPotionEffect(effect); - return effect; - } - - public int getLevel(LivingEntity entity) { - EffectInstance effect = entity.getActivePotionEffect(this); - if (effect != null) { - return effect.getAmplifier(); - } - return 0; - } - - @Override - public boolean shouldRender(EffectInstance effect) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getStatusIconIndex() { - Minecraft.getInstance().renderEngine.bindTexture(texture); - - return super.getStatusIconIndex(); - } -} +public class PotionBloodMagic extends Effect +{ + public PotionBloodMagic(EffectType typeIn, int liquidColorIn) + { + super(typeIn, liquidColorIn); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java deleted file mode 100644 index a2ce2462..00000000 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ /dev/null @@ -1,192 +0,0 @@ -package WayofTime.bloodmagic.potion; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; -import com.google.common.collect.Lists; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.AbstractArrowEntity; -import net.minecraft.entity.projectile.ThrowableEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class PotionEventHandlers { - public static Map> flightListMap = new HashMap<>(); - public static Map> noGravityListMap = new HashMap<>(); - - @SubscribeEvent - public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) { - LivingEntity eventEntityLiving = event.getEntityLiving(); - - if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.BOOST)) { - int i = eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); - eventEntityLiving.motionY += (0.1f) * (2 + i); - } - - if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.GROUNDED)) - eventEntityLiving.motionY = 0; - } - - @SubscribeEvent - public static void onLivingFall(LivingFallEvent event) { - LivingEntity eventEntityLiving = event.getEntityLiving(); - - if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.HEAVY_HEART)) { - int i = eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.HEAVY_HEART).getAmplifier() + 1; - event.setDamageMultiplier(event.getDamageMultiplier() + i); - event.setDistance(event.getDistance() + i); - } - } - - @SubscribeEvent - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { - LivingEntity eventEntityLiving = event.getEntityLiving(); - List flightList = flightListMap.getOrDefault(eventEntityLiving.getEntityWorld(), Lists.newArrayList()); - - if (eventEntityLiving instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) eventEntityLiving; - if (!player.world.isRemote) { - if (player.isPotionActive(RegistrarBloodMagic.FLIGHT)) { - if (!player.isSpectator() && !player.capabilities.allowFlying) { - player.capabilities.allowFlying = true; - player.sendPlayerAbilities(); - flightList.add(player); - } - } else { - if (flightList.contains(player)) { - player.capabilities.allowFlying = false; - player.capabilities.isFlying = false; - player.sendPlayerAbilities(); - flightList.remove(player); - } - } - } - } -// if (eventEntityLiving.isPotionActive(ModPotions.boost)) -// { -// int i = eventEntityLiving.getActivePotionEffect(ModPotions.boost).getAmplifier(); -// { -// float percentIncrease = (i + 1) * 0.05f; -// -// if (eventEntityLiving instanceof EntityPlayer) -// { -// EntityPlayer entityPlayer = (EntityPlayer) eventEntityLiving; -// -// if ((entityPlayer.onGround || entityPlayer.capabilities.isFlying) && entityPlayer.moveForward > 0F) -// entityPlayer.moveFlying(0F, 1F, entityPlayer.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease); -// } -// } -// } - List noGravityList = noGravityListMap.getOrDefault(event.getEntityLiving().getEntityWorld(), Lists.newArrayList()); - if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED) && !eventEntityLiving.hasNoGravity()) { - eventEntityLiving.setNoGravity(true); - noGravityList.add(eventEntityLiving); - } else if (noGravityList.contains(eventEntityLiving)) { - eventEntityLiving.setNoGravity(false); - noGravityList.remove(eventEntityLiving); - } - - if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.GROUNDED)) - if (eventEntityLiving instanceof PlayerEntity && ((PlayerEntity) eventEntityLiving).capabilities.isFlying) - eventEntityLiving.motionY -= (0.05D * (double) (eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.GROUNDED).getAmplifier() + 1) - eventEntityLiving.motionY) * 0.2D; - else - eventEntityLiving.motionY -= (0.1D * (double) (eventEntityLiving.getActivePotionEffect(RegistrarBloodMagic.GROUNDED).getAmplifier() + 1) - eventEntityLiving.motionY) * 0.2D; - - if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.WHIRLWIND)) { - int d0 = 3; - AxisAlignedBB axisAlignedBB = new AxisAlignedBB(eventEntityLiving.posX - 0.5, eventEntityLiving.posY - 0.5, eventEntityLiving.posZ - 0.5, eventEntityLiving.posX + 0.5, eventEntityLiving.posY + 0.5, eventEntityLiving.posZ + 0.5).expand(d0, d0, d0); - List entityList = eventEntityLiving.getEntityWorld().getEntitiesWithinAABB(Entity.class, axisAlignedBB); - - for (Entity projectile : entityList) { - if (projectile == null) - continue; - if (!(projectile instanceof IProjectile)) - continue; - - Entity throwingEntity = null; - - if (projectile instanceof AbstractArrowEntity) - throwingEntity = ((AbstractArrowEntity) projectile).shootingEntity; - else if (projectile instanceof ThrowableEntity) - throwingEntity = ((ThrowableEntity) projectile).getThrower(); - - if (throwingEntity != null && throwingEntity.equals(eventEntityLiving)) - continue; - - double delX = projectile.posX - eventEntityLiving.posX; - double delY = projectile.posY - eventEntityLiving.posY; - double delZ = projectile.posZ - eventEntityLiving.posZ; - - double angle = (delX * projectile.motionX + delY * projectile.motionY + delZ * projectile.motionZ) / (Math.sqrt(delX * delX + delY * delY + delZ * delZ) * Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ)); - - angle = Math.acos(angle); - - if (angle < 3 * (Math.PI / 4)) - continue; // angle is < 135 degrees - - if (throwingEntity != null) { - delX = -projectile.posX + throwingEntity.posX; - delY = -projectile.posY + (throwingEntity.posY + throwingEntity.getEyeHeight()); - delZ = -projectile.posZ + throwingEntity.posZ; - } - - double curVel = Math.sqrt(delX * delX + delY * delY + delZ * delZ); - - delX /= curVel; - delY /= curVel; - delZ /= curVel; - double newVel = Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ); - projectile.motionX = newVel * delX; - projectile.motionY = newVel * delY; - projectile.motionZ = newVel * delZ; - } - } - } - - @SubscribeEvent - public static void onPlayerRespawn(PlayerEvent.Clone event) { - if (event.isWasDeath()) - event.getEntityPlayer().addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, 400)); - } - - @SubscribeEvent - public static void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event) { - if (event.player.isPotionActive(RegistrarBloodMagic.SOUL_FRAY)) - event.lpAdded = (int) (event.lpAdded * 0.1D); - } - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onPlayerDamageEvent(LivingAttackEvent event) { - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND) && event.isCancelable() && event.getSource().isProjectile()) - event.setCanceled(true); - } - - @SubscribeEvent - public static void onEndermanTeleportEvent(EnderTeleportEvent event) { - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.PLANAR_BINDING) && event.isCancelable()) { - event.setCanceled(true); - } - } - - @SubscribeEvent - public static void onEntityHurtEvent(LivingDamageEvent event) { - if (event.getSource() == DamageSource.FALL) - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.FEATHERED)) - event.setCanceled(true); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java deleted file mode 100644 index 4cd83fb9..00000000 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ /dev/null @@ -1,145 +0,0 @@ -package WayofTime.bloodmagic.proxy; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.client.helper.ShaderHelper; -import WayofTime.bloodmagic.client.hud.Elements; -import WayofTime.bloodmagic.client.key.KeyBindings; -import WayofTime.bloodmagic.client.render.LayerBloodElytra; -import WayofTime.bloodmagic.client.render.block.*; -import WayofTime.bloodmagic.client.render.entity.*; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.*; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.item.types.AlchemicVialType; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.tile.*; -import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.Constants; - -import com.google.common.collect.ImmutableMap; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.entity.PlayerRenderer; -import net.minecraft.potion.PotionUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.animation.AnimationTESR; -import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.common.animation.Event; -import net.minecraftforge.common.animation.ITimeValue; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; - -import java.awt.Color; -import java.util.Map; - -public class ClientProxy extends CommonProxy { - public static DemonWillHolder currentAura = new DemonWillHolder(); - - @Override - public void preInit() { - super.preInit(); - - OBJLoader.INSTANCE.addDomain(BloodMagic.MODID); - - ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR() { - @Override - public void handleEvents(TileInversionPillar chest, float time, Iterable pastEvents) { - chest.handleEvents(time, pastEvents); - } - }); - - ClientRegistry.bindTileEntitySpecialRenderer(TileAlchemyArray.class, new RenderAlchemyArray()); - ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderAltar()); - ClientRegistry.bindTileEntitySpecialRenderer(TileRoutingNode.class, new RenderItemRoutingNode()); - ClientRegistry.bindTileEntitySpecialRenderer(TileDemonCrucible.class, new RenderDemonCrucible()); - ClientRegistry.bindTileEntitySpecialRenderer(TileMimic.class, new RenderMimic()); - ClientRegistry.bindTileEntitySpecialRenderer(TileBloodTank.class, new RenderBloodTank()); - - // Initialize key-binds during startup so they load correctly - for (KeyBindings key : KeyBindings.values()) - key.getKey(); - } - - @Override - public void registerRenderers() { - RenderingRegistry.registerEntityRenderingHandler(EntitySoulSnare.class, new SoulSnareRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntitySentientArrow.class, new SentientArrowRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new BloodLightRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityMeteor.class, new MeteorRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntitySentientSpecter.class, new SentientSpecterRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityMimic.class, new MimicRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityCorruptedZombie.class, new CorruptedZombieRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityCorruptedSheep.class, new CorruptedSheepRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityCorruptedChicken.class, new CorruptedChickenRenderFactory()); - RenderingRegistry.registerEntityRenderingHandler(EntityCorruptedSpider.class, new CorruptedSpiderRenderFactory()); - - ShaderHelper.init(); - } - - @Override - public void init() { - super.init(); - Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> - { - try { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) - if (tintIndex == 1) - return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); - } catch (NumberFormatException e) { - return -1; - } - return -1; - }, RegistrarBloodMagicItems.SIGIL_HOLDING); - Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> - { - if (tintIndex != 0 && tintIndex != 2) - return -1; - - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty")) - return -1; - - return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack)); - }, RegistrarBloodMagicItems.POTION_FLASK); - Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> - { -// if (tintIndex != 0 && tintIndex != 2) -// return -1; - - int variant = stack.getMetadata(); - - return AlchemicVialType.getColourForLayer(variant, tintIndex); - }, RegistrarBloodMagicItems.ALCHEMIC_VIAL); - - addElytraLayer(); - } - - @Override - public void postInit() { - Elements.registerElements(); - } - - private void addElytraLayer() { - EntityRendererManager renderManager = Minecraft.getInstance().getRenderManager(); - try { - Map skinMap = ObfuscationReflectionHelper.getPrivateValue(EntityRendererManager.class, renderManager, "skinMap", "field_178636_l"); - skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); - skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); - BMLog.DEBUG.info("Elytra layer added"); - } catch (Exception e) { - BMLog.DEBUG.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade: {}", e.getMessage()); - } - } - - @Override - public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) { - return ModelLoaderRegistry.loadASM(location, parameters); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java deleted file mode 100644 index d63dc5a5..00000000 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ /dev/null @@ -1,40 +0,0 @@ -package WayofTime.bloodmagic.proxy; - -import WayofTime.bloodmagic.ritual.CapabilityRuneType; -import WayofTime.bloodmagic.ritual.IRitualStone; -import WayofTime.bloodmagic.teleport.TeleportQueue; -import com.google.common.collect.ImmutableMap; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.animation.ITimeValue; -import net.minecraftforge.common.capabilities.CapabilityManager; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; - -public class CommonProxy { - public void preInit() { - MinecraftForge.EVENT_BUS.register(TeleportQueue.getInstance()); - registerRenderers(); - } - - public void init() { - CapabilityManager.INSTANCE.register(IRitualStone.Tile.class, new CapabilityRuneType.RuneTypeStorage(), new CapabilityRuneType.Factory()); - } - - public void postInit() { - - } - - public void registerRenderers() { - - } - - public Object beamCont(World worldObj, double xi, double yi, double zi, double tx, double ty, double tz, int type, int color, boolean reverse, float endmod, Object input, int impact) { - // TODO Auto-generated method stub - return null; - } - - public IAnimationStateMachine load(ResourceLocation location, ImmutableMap parameters) { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java deleted file mode 100644 index 2a17628f..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java +++ /dev/null @@ -1,151 +0,0 @@ -package WayofTime.bloodmagic.recipe; - -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class LivingArmourDowngradeRecipe { - protected LivingArmourUpgrade upgrade = null; - protected ItemStack keyStack = ItemStack.EMPTY; - protected List input = new ArrayList<>(); - - public LivingArmourDowngradeRecipe(LivingArmourUpgrade upgrade, ItemStack keyStack, Object... recipe) { - this.upgrade = upgrade; - this.keyStack = keyStack; - for (Object in : recipe) { - if (in instanceof ItemStack) { - input.add(((ItemStack) in).copy()); - } else if (in instanceof Item) { - input.add(new ItemStack((Item) in)); - } else if (in instanceof Block) { - input.add(new ItemStack((Block) in)); - } else if (in instanceof String) { - input.add(OreDictionary.getOres((String) in)); - } else { - StringBuilder ret = new StringBuilder("Invalid living armour downgrade recipe: "); - for (Object tmp : recipe) { - ret.append(tmp).append(", "); - } - ret.append(upgrade.toString()); - throw new RuntimeException(ret.toString()); - } - } - } - - /** - * Returns the size of the recipe area - */ - public int getRecipeSize() { - return input.size(); - } - - public LivingArmourUpgrade getRecipeOutput() { - return upgrade; - } - - /** - * Used to check if a recipe matches current crafting inventory. World and - * BlockPos are for future-proofing - */ - @SuppressWarnings("unchecked") - public boolean matches(ItemStack key, List checkedList, World world, BlockPos pos) { - if (!OreDictionary.itemMatches(keyStack, key, false)) { - return false; - } - - ArrayList required = new ArrayList<>(input); - - for (ItemStack slot : checkedList) { - if (slot != null) { - boolean inRecipe = false; - - for (Object aRequired : required) { - boolean match = false; - - Object next = aRequired; - - if (next instanceof ItemStack) { - match = OreDictionary.itemMatches((ItemStack) next, slot, false); - } else if (next instanceof List) { - Iterator itr = ((List) next).iterator(); - while (itr.hasNext() && !match) { - match = OreDictionary.itemMatches(itr.next(), slot, false); - } - } - - if (match) { - inRecipe = true; - required.remove(next); - break; - } - } - - if (!inRecipe) { - return false; - } - } - } - - return required.isEmpty(); - } - - /** - * Returns the input for this recipe, any mod accessing this value should - * never manipulate the values in this array as it will effect the recipe - * itself. - * - * @return The recipes input vales. - */ - public List getInput() { - return ImmutableList.copyOf(input); - } - - public ItemStack getKey() { - return this.keyStack; - } - - public void consumeInventory(IItemHandler inv) { - for (int i = 0; i < inv.getSlots(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - if (stack.getItem().hasContainerItem(stack)) { - inv.extractItem(i, stack.getCount(), false); - inv.insertItem(i, stack.getItem().getContainerItem(stack), false); - } else { - inv.extractItem(i, 1, false); - } - } - } - - protected ItemStack getContainerItem(ItemStack stack) { - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - - ItemStack copyStack = stack.copy(); - - if (copyStack.getItem().hasContainerItem(stack)) { - return copyStack.getItem().getContainerItem(copyStack); - } - - copyStack.shrink(1); - if (copyStack.isEmpty()) { - return ItemStack.EMPTY; - } - - return copyStack; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java deleted file mode 100644 index 21f5936b..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java +++ /dev/null @@ -1,160 +0,0 @@ -package WayofTime.bloodmagic.recipe; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.builder.ToStringBuilder; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class TartaricForgeRecipe { - protected ItemStack output = null; - protected List input = new ArrayList<>(); - protected double minimumSouls; - protected double soulsDrained; - - public TartaricForgeRecipe(Block result, double minSouls, double drain, Object... recipe) { - this(new ItemStack(result), minSouls, drain, recipe); - } - - public TartaricForgeRecipe(Item result, double minSouls, double drain, Object... recipe) { - this(new ItemStack(result), minSouls, drain, recipe); - } - - public TartaricForgeRecipe(ItemStack result, double minSouls, double drain, Object... recipe) { - output = result.copy(); - this.minimumSouls = minSouls; - this.soulsDrained = drain; - for (Object in : recipe) { - if (in instanceof ItemStack) { - input.add(((ItemStack) in).copy()); - } else if (in instanceof Item) { - input.add(new ItemStack((Item) in)); - } else if (in instanceof Block) { - input.add(new ItemStack((Block) in)); - } else if (in instanceof String) { - input.add(OreDictionary.getOres((String) in)); - } else { - StringBuilder ret = new StringBuilder("Invalid soul forge recipe: "); - for (Object tmp : recipe) { - ret.append(tmp).append(", "); - } - ret.append(output); - throw new RuntimeException(ret.toString()); - } - } - } - - /** - * Returns the size of the recipe area - */ - public int getRecipeSize() { - return input.size(); - } - - public ItemStack getRecipeOutput() { - return output.copy(); - } - - /** - * Used to check if a recipe matches current crafting inventory. World and - * BlockPos are for future-proofing - */ - @SuppressWarnings("unchecked") - public boolean matches(List checkedList, World world, BlockPos pos) { - ArrayList required = new ArrayList<>(input); - - for (ItemStack slot : checkedList) { - if (slot != null) { - boolean inRecipe = false; - - for (Object aRequired : required) { - boolean match = false; - - if (aRequired instanceof ItemStack) { - match = OreDictionary.itemMatches((ItemStack) aRequired, slot, false); - } else if (aRequired instanceof List) { - Iterator itr = ((List) aRequired).iterator(); - while (itr.hasNext() && !match) { - match = OreDictionary.itemMatches(itr.next(), slot, false); - } - } - - if (match) { - inRecipe = true; - required.remove(aRequired); - break; - } - } - - if (!inRecipe) { - return false; - } - } - } - - return required.isEmpty(); - } - - /** - * Returns the input for this recipe, any mod accessing this value should - * never manipulate the values in this array as it will effect the recipe - * itself. - * - * @return The recipes input vales. - */ - public List getInput() { - return this.input; - } - - public double getMinimumSouls() { - return minimumSouls; - } - - public double getSoulsDrained() { - return soulsDrained; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("output", output) - .append("input", input) - .append("minimumSouls", minimumSouls) - .append("soulsDrained", soulsDrained) - .append("recipeSize", getRecipeSize()) - .append("recipeOutput", getRecipeOutput()) - .toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof TartaricForgeRecipe)) return false; - - TartaricForgeRecipe that = (TartaricForgeRecipe) o; - - if (Double.compare(that.minimumSouls, minimumSouls) != 0) return false; - if (Double.compare(that.soulsDrained, soulsDrained) != 0) return false; - if (output != null ? !output.equals(that.output) : that.output != null) return false; - return input != null ? input.equals(that.input) : that.input == null; - } - - @Override - public int hashCode() { - int result; - long temp; - result = output != null ? output.hashCode() : 0; - result = 31 * result + (input != null ? input.hashCode() : 0); - temp = Double.doubleToLongBits(minimumSouls); - result = 31 * result + (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(soulsDrained); - result = 31 * result + (int) (temp ^ (temp >>> 32)); - return result; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java deleted file mode 100644 index 9e13b9aa..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableCustomRecipe.java +++ /dev/null @@ -1,44 +0,0 @@ -package WayofTime.bloodmagic.recipe.alchemyTable; - -import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class AlchemyTableCustomRecipe extends AlchemyTableRecipe { - public AlchemyTableCustomRecipe(Block result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe) { - this(new ItemStack(result), lpDrained, ticksRequired, tierRequired, recipe); - } - - public AlchemyTableCustomRecipe(Item result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe) { - this(new ItemStack(result), lpDrained, ticksRequired, tierRequired, recipe); - } - - public AlchemyTableCustomRecipe(ItemStack result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe) { - super(result, lpDrained, ticksRequired, tierRequired, recipe); - } - - @Override - protected ItemStack getContainerItem(ItemStack stack) { - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - - ItemStack copyStack = stack.copy(); - - if (copyStack.getItem() instanceof ICustomAlchemyConsumable) { - return ((ICustomAlchemyConsumable) copyStack.getItem()).drainUseOnAlchemyCraft(copyStack); - } - - if (copyStack.getItem().hasContainerItem(stack)) { - return copyStack.getItem().getContainerItem(copyStack); - } - - copyStack.shrink(1); - if (copyStack.isEmpty()) { - return ItemStack.EMPTY; - } - - return copyStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java deleted file mode 100644 index 0ea30ab0..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ /dev/null @@ -1,116 +0,0 @@ -package WayofTime.bloodmagic.recipe.alchemyTable; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.item.*; -import net.minecraft.item.DyeColor; -import net.minecraft.item.BannerItem; -import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.List; - -public class AlchemyTableDyeableRecipe extends AlchemyTableRecipe { - private ItemStack inputItem; - - public AlchemyTableDyeableRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem) { - super(inputItem, lpDrained, ticksRequired, tierRequired); - - ArrayList validDyes = new ArrayList<>(); - validDyes.add(new ItemStack(Items.NAME_TAG)); - validDyes.add(new ItemStack(Items.DYE, 1, OreDictionary.WILDCARD_VALUE)); - - ArrayList recipe = new ArrayList<>(); - recipe.add(inputItem); - recipe.add(validDyes); - - this.input = recipe; - - this.inputItem = inputItem; - } - - @Override - public ItemStack getRecipeOutput(List inputList) { - int nameTagOrDyeLocation = -1; - int inputItemLocation = -1; - for (int x = 0; x < inputList.size(); x++) { - ItemStack slot = inputList.get(x); - - if (slot != null) { - boolean match = OreDictionary.itemMatches(inputItem, slot, false); - - if (match) { - inputItemLocation = x; - } else { - if (slot.getItem() == Items.NAME_TAG || slot.getItem() == Items.DYE) { - nameTagOrDyeLocation = x; - } - } - } - } - - if (nameTagOrDyeLocation != -1 && inputItemLocation != -1) { - ItemStack tagOrDyeStack = inputList.get(nameTagOrDyeLocation); - ItemStack inputStack = inputList.get(inputItemLocation); - - if (inputStack.isEmpty() || tagOrDyeStack.isEmpty()) { - return output.copy(); - } - - ItemStack outputStack = inputStack.copy(); - - if (tagOrDyeStack.getItem() == Items.NAME_TAG) { - if (!outputStack.hasTagCompound()) { - outputStack.setTagCompound(new CompoundNBT()); - } - - outputStack.getTagCompound().setString(Constants.NBT.COLOR, tagOrDyeStack.getDisplayName()); - - return outputStack; - } else { - DyeColor dyeColor = BannerItem.getBaseColor(tagOrDyeStack); - if (!outputStack.hasTagCompound()) { - outputStack.setTagCompound(new CompoundNBT()); - } - - outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(Utils.DYE_COLOR_VALUES.getOrDefault(dyeColor, 0))); - - return outputStack; - } - } - - return output.copy(); - } - - @Override - public boolean matches(List checkedList, World world, BlockPos pos) { - boolean hasNameTagOrDye = false; - boolean hasInputItem = false; - - for (ItemStack slot : checkedList) { - if (!slot.isEmpty()) { - boolean match = OreDictionary.itemMatches(inputItem, slot, false); - - if (match && hasInputItem) { - return false; - } else if (match) { - hasInputItem = true; - } else { - if (slot.getItem() == Items.NAME_TAG || slot.getItem() == Items.DYE) { - if (hasNameTagOrDye) { - return false; - } else { - hasNameTagOrDye = true; - } - } - } - } - } - - return hasNameTagOrDye && hasInputItem; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java deleted file mode 100644 index 9d6c401d..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java +++ /dev/null @@ -1,97 +0,0 @@ -package WayofTime.bloodmagic.recipe.alchemyTable; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.potion.BMPotionUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.PotionUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe { - protected double lengthAugment = 0; - protected int powerAugment = 0; - protected Effect wantedPotion; - - public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect, double lengthAugment, int powerAugment) { - super(lpDrained, ticksRequired, tierRequired, inputItems, baseEffect); - - ArrayList recipe = new ArrayList<>(); - recipe.addAll(inputItems); - recipe.add(getAugmentedPotionFlask(baseEffect)); - - this.input = recipe; - - this.wantedPotion = baseEffect.getPotion(); - this.lengthAugment = lengthAugment; - this.powerAugment = powerAugment; - } - - public AlchemyTablePotionAugmentRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect, double lengthAugment, int powerAugment) { - this(lpDrained, ticksRequired, tierRequired, Collections.singletonList(inputItem), baseEffect, lengthAugment, powerAugment); - } - - @Override - public boolean isPotionFlaskValidInput(ItemStack stack) { - List effectList = PotionUtils.getEffectsFromStack(stack); - for (EffectInstance eff : effectList) { - if (eff.getPotion() == wantedPotion) { - double currentAugment = BMPotionUtils.getLengthAugment(stack, wantedPotion); - - return currentAugment < lengthAugment || eff.getAmplifier() < powerAugment; - } - } - - return false; - } - - @Override - public ItemStack getModifiedFlaskForInput(ItemStack inputStack) { - if (inputStack.isEmpty()) { - ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - - List effectList = new ArrayList<>(); - int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), lengthAugment, powerAugment - baseEffect.getAmplifier()); - effectList.add(new EffectInstance(wantedPotion, potionLength, powerAugment - baseEffect.getAmplifier())); - - BMPotionUtils.setEffects(outputStack, effectList); - - return outputStack; - } - - ItemStack outputStack = inputStack.copy(); - - List effectList = PotionUtils.getEffectsFromStack(outputStack); - List newEffectList = new ArrayList<>(); - - for (EffectInstance effect : effectList) { - if (effect.getPotion() == wantedPotion) { - double currentLengthAugment = Math.max(lengthAugment, BMPotionUtils.getLengthAugment(outputStack, wantedPotion)); - int currentPowerAugment = Math.max(powerAugment, effect.getAmplifier()); - int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), currentLengthAugment, currentPowerAugment); - newEffectList.add(new EffectInstance(wantedPotion, potionLength, currentPowerAugment)); - BMPotionUtils.setLengthAugment(outputStack, wantedPotion, currentLengthAugment); - } else { - newEffectList.add(effect); - } - } - - BMPotionUtils.setEffects(outputStack, newEffectList); - - return outputStack; - } - - public static ItemStack getAugmentedPotionFlask(EffectInstance baseEffect) { - ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - - List effectList = new ArrayList<>(); - effectList.add(baseEffect); - - BMPotionUtils.setEffects(outputStack, effectList); - - return outputStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java deleted file mode 100644 index 6a7874d9..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ /dev/null @@ -1,139 +0,0 @@ -package WayofTime.bloodmagic.recipe.alchemyTable; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.PotionUtils; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -public class AlchemyTablePotionRecipe extends AlchemyTableRecipe { - public static final ItemStack basePotionFlaskStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE); - public static final int temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember = 3; - protected EffectInstance baseEffect; - protected double baseAddedImpurity = 5; - - public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, List inputItems, EffectInstance baseEffect) { - super(basePotionFlaskStack, lpDrained, ticksRequired, tierRequired); - - ArrayList recipe = new ArrayList<>(); - recipe.addAll(inputItems); - recipe.add(basePotionFlaskStack); - - this.input = recipe; - this.baseEffect = baseEffect; - } - - public AlchemyTablePotionRecipe(int lpDrained, int ticksRequired, int tierRequired, ItemStack inputItem, EffectInstance baseEffect) { - this(lpDrained, ticksRequired, tierRequired, Collections.singletonList(inputItem), baseEffect); - } - - @Override - public ItemStack getRecipeOutput(List inputList) { - int flaskLocation = -1; - for (int x = 0; x < inputList.size(); x++) { - ItemStack slot = inputList.get(x); - - if (slot != null) { - boolean match = slot.getItem() == RegistrarBloodMagicItems.POTION_FLASK; - - if (match) { - flaskLocation = x; - } - } - } - - if (flaskLocation != -1) { - return getModifiedFlaskForInput(inputList.get(flaskLocation)); - } - - return getModifiedFlaskForInput(ItemStack.EMPTY); - } - - @Override - public boolean matches(List checkedList, World world, BlockPos pos) { - ArrayList required = new ArrayList<>(input); - - for (ItemStack slot : checkedList) { - if (slot != null) { - boolean inRecipe = false; - - for (Object aRequired : required) { - boolean match = false; - - Object next = aRequired; - - if (next instanceof ItemStack) { - match = OreDictionary.itemMatches((ItemStack) next, slot, false); - } else if (next instanceof List) { - Iterator itr = ((List) next).iterator(); - while (itr.hasNext() && !match) { - match = OreDictionary.itemMatches(itr.next(), slot, false); - } - } - - if (match) { - if (next instanceof ItemStack && ((ItemStack) next).getItem() == RegistrarBloodMagicItems.POTION_FLASK) { - if (!isPotionFlaskValidInput(slot)) { - break; - } - } - - inRecipe = true; - required.remove(next); - break; - } - } - - if (!inRecipe) { - return false; - } - } - } - - return required.isEmpty(); - } - - public boolean isPotionFlaskValidInput(ItemStack stack) { - List effectList = PotionUtils.getEffectsFromStack(stack); - if (effectList.size() >= temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember) { - return false; - } - - for (EffectInstance eff : effectList) { - if (eff.getPotion() == baseEffect.getPotion()) { - return false; - } - } - - return true; - } - - public ItemStack getModifiedFlaskForInput(ItemStack inputStack) { - if (inputStack.isEmpty()) { - ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK); - - List effectList = new ArrayList<>(); - effectList.add(baseEffect); - - PotionUtils.appendEffects(outputStack, effectList); - - return outputStack; - } - - ItemStack outputStack = inputStack.copy(); - - List effectList = PotionUtils.getEffectsFromStack(outputStack); - effectList.add(baseEffect); - - PotionUtils.appendEffects(outputStack, effectList); - - return outputStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java deleted file mode 100644 index a845963a..00000000 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableRecipe.java +++ /dev/null @@ -1,201 +0,0 @@ -package WayofTime.bloodmagic.recipe.alchemyTable; - -import com.google.common.collect.ImmutableList; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.builder.ToStringBuilder; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class AlchemyTableRecipe { - protected ItemStack output = ItemStack.EMPTY; - protected ArrayList input = new ArrayList<>(); - protected int lpDrained; - protected int ticksRequired; - protected int tierRequired; - - public AlchemyTableRecipe(Block result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe) { - this(new ItemStack(result), lpDrained, ticksRequired, tierRequired, recipe); - } - - public AlchemyTableRecipe(Item result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe) { - this(new ItemStack(result), lpDrained, ticksRequired, tierRequired, recipe); - } - - public AlchemyTableRecipe(ItemStack result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe) { - output = result.copy(); - this.lpDrained = lpDrained; - this.ticksRequired = ticksRequired; - this.tierRequired = tierRequired; - for (Object in : recipe) { - if (in instanceof ItemStack) { - input.add(((ItemStack) in).copy()); - } else if (in instanceof Item) { - input.add(new ItemStack((Item) in)); - } else if (in instanceof Block) { - input.add(new ItemStack((Block) in)); - } else if (in instanceof String) { - input.add(OreDictionary.getOres((String) in)); - } else { - StringBuilder ret = new StringBuilder("Invalid alchemy recipe: "); - for (Object tmp : recipe) { - ret.append(tmp).append(", "); - } - ret.append(output); - throw new RuntimeException(ret.toString()); - } - } - } - - /** - * Returns the size of the recipe area - */ - public int getRecipeSize() { - return input.size(); - } - - /** - * Returns the output of the recipe, sensitive to the input list provided. - * If the input list does not technically match, the recipe should return - * the default output. - * - * @param inputList - * @return - */ - public ItemStack getRecipeOutput(List inputList) { - return output.copy(); - } - - /** - * Used to check if a recipe matches current crafting inventory. World and - * BlockPos are for future-proofing - */ - @SuppressWarnings("unchecked") - public boolean matches(List checkedList, World world, BlockPos pos) { - ArrayList required = new ArrayList<>(input); - - for (ItemStack slot : checkedList) { - if (!slot.isEmpty()) { - boolean inRecipe = false; - - for (Object aRequired : required) { - boolean match = false; - - if (aRequired instanceof ItemStack) { - match = OreDictionary.itemMatches((ItemStack) aRequired, slot, false); - } else if (aRequired instanceof List) { - Iterator itr = ((List) aRequired).iterator(); - while (itr.hasNext() && !match) { - match = OreDictionary.itemMatches(itr.next(), slot, false); - } - } - - if (match) { - inRecipe = true; - required.remove(aRequired); - break; - } - } - - if (!inRecipe) { - return false; - } - } - } - - return required.isEmpty(); - } - - /** - * Returns the input for this recipe, any mod accessing this value should - * never manipulate the values in this array as it will effect the recipe - * itself. - * - * @return The recipes input vales. - */ - public List getInput() { - return ImmutableList.copyOf(input); - } - - public ItemStack[] getRemainingItems(ItemStack[] inventory) { - ItemStack[] ret = inventory.clone(); - for (int i = 0; i < ret.length; i++) { - ret[i] = getContainerItem(inventory[i]); - } - - return ret; - } - - protected ItemStack getContainerItem(ItemStack stack) { - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - - ItemStack copyStack = stack.copy(); - - if (copyStack.getItem().hasContainerItem(stack)) { - return copyStack.getItem().getContainerItem(copyStack); - } - - copyStack.shrink(1); - if (copyStack.isEmpty()) { - return ItemStack.EMPTY; - } - - return copyStack; - } - - public int getLpDrained() { - return lpDrained; - } - - public int getTicksRequired() { - return ticksRequired; - } - - public int getTierRequired() { - return tierRequired; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("output", output) - .append("input", input) - .append("lpDrained", lpDrained) - .append("ticksRequired", ticksRequired) - .append("tierRequired", tierRequired) - .append("recipeSize", getRecipeSize()) - .toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof AlchemyTableRecipe)) return false; - - AlchemyTableRecipe that = (AlchemyTableRecipe) o; - - if (lpDrained != that.lpDrained) return false; - if (ticksRequired != that.ticksRequired) return false; - if (tierRequired != that.tierRequired) return false; - if (output != null ? !output.equals(that.output) : that.output != null) return false; - return input != null ? input.equals(that.input) : that.input == null; - } - - @Override - public int hashCode() { - int result = output != null ? output.hashCode() : 0; - result = 31 * result + (input != null ? input.hashCode() : 0); - result = 31 * result + lpDrained; - result = 31 * result + ticksRequired; - result = 31 * result + tierRequired; - return result; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java deleted file mode 100644 index 931169b8..00000000 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ /dev/null @@ -1,66 +0,0 @@ -package WayofTime.bloodmagic.registry; - -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.downgrade.*; -import WayofTime.bloodmagic.livingArmour.tracker.*; -import WayofTime.bloodmagic.livingArmour.upgrade.*; - -public class ModArmourTrackers { - public static void init() { - LivingArmourHandler.registerStatTracker(StatTrackerMovement.class); - LivingArmourHandler.registerStatTracker(StatTrackerDigging.class); - LivingArmourHandler.registerStatTracker(StatTrackerPoison.class); - LivingArmourHandler.registerStatTracker(StatTrackerSelfSacrifice.class); - LivingArmourHandler.registerStatTracker(StatTrackerFood.class); - LivingArmourHandler.registerStatTracker(StatTrackerPhysicalProtect.class); - LivingArmourHandler.registerStatTracker(StatTrackerHealthboost.class); - LivingArmourHandler.registerStatTracker(StatTrackerMeleeDamage.class); - LivingArmourHandler.registerStatTracker(StatTrackerArrowShot.class); - LivingArmourHandler.registerStatTracker(StatTrackerGrimReaperSprint.class); - LivingArmourHandler.registerStatTracker(StatTrackerSolarPowered.class); - LivingArmourHandler.registerStatTracker(StatTrackerExperience.class); - LivingArmourHandler.registerStatTracker(StatTrackerJump.class); - LivingArmourHandler.registerStatTracker(StatTrackerFallProtect.class); - LivingArmourHandler.registerStatTracker(StatTrackerGraveDigger.class); - LivingArmourHandler.registerStatTracker(StatTrackerStepAssist.class); - LivingArmourHandler.registerStatTracker(StatTrackerSprintAttack.class); - LivingArmourHandler.registerStatTracker(StatTrackerCriticalStrike.class); - LivingArmourHandler.registerStatTracker(StatTrackerFireResist.class); - LivingArmourHandler.registerStatTracker(StatTrackerNightSight.class); - LivingArmourHandler.registerStatTracker(StatTrackerRepairing.class); - - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSpeed(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigging(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradePoisonResist(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSelfSacrifice(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeKnockbackResist(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradePhysicalProtect(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeHealthboost(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeMeleeDamage(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeArrowShot(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeStepAssist(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeGrimReaperSprint(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSolarPowered(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeExperience(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeJump(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeFallProtect(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeGraveDigger(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSprintAttack(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeCriticalStrike(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeElytra(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeFireResist(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeNightSight(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeRepairing(0)); - - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSlowness(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeCrippledArm(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSlippery(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeBattleHungry(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeQuenched(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeMeleeDecrease(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDisoriented(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigSlowdown(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeStormTrooper(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSlowHeal(0)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java deleted file mode 100644 index c18f6f11..00000000 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java +++ /dev/null @@ -1,16 +0,0 @@ -package WayofTime.bloodmagic.registry; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.inversion.CorruptionHandler; -import net.minecraft.block.Blocks; - -public class ModCorruptionBlocks { - public static void init() { - for (EnumDemonWillType type : EnumDemonWillType.values()) { - CorruptionHandler.registerBlockCorruption(type, Blocks.STONE, 0, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal())); - CorruptionHandler.registerBlockCorruption(type, Blocks.GRASS, 0, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal())); - CorruptionHandler.registerBlockCorruption(type, Blocks.DIRT, 0, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal())); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java deleted file mode 100644 index 0d7ee452..00000000 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ /dev/null @@ -1,273 +0,0 @@ -package WayofTime.bloodmagic.registry; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.oredict.OreDictionary; - -import org.apache.commons.lang3.tuple.Pair; - -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectAttractor; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBounce; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectFurnaceFuel; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectLaputa; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMobSacrifice; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSpike; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectTeleport; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft; -import WayofTime.bloodmagic.client.render.alchemyArray.AttractorAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.LowAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.LowStaticAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.MobSacrificeAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.SingleAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.StaticAlchemyCircleRenderer; -import WayofTime.bloodmagic.client.render.alchemyArray.TurretAlchemyCircleRenderer; -import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; -import WayofTime.bloodmagic.compress.BaseCompressionHandler; -import WayofTime.bloodmagic.compress.CompressionRegistry; -import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.iface.ISigil; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDisoriented; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowHeal; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowness; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTrooper; -import WayofTime.bloodmagic.potion.BMPotionUtils; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.Utils; - -import com.google.common.base.Stopwatch; - -public class ModRecipes { - - static ItemStack mundaneLengtheningStack = ComponentTypes.CATALYST_LENGTH_1.getStack(); - static ItemStack mundanePowerStack = ComponentTypes.CATALYST_POWER_1.getStack(); - - public static void init() { - initOreDict(); - addFurnaceRecipes(); - addAltarRecipes(); - addAlchemyArrayRecipes(); - addAlchemyTableRecipes(); - addPotionRecipes(); - addLivingArmourDowngradeRecipes(); - addCompressionHandlers(); - } - - public static void initOreDict() { - OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); - OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); - OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); - OreDictionary.registerOre("dustSulfur", ComponentTypes.SULFUR.getStack()); - OreDictionary.registerOre("dustSaltpeter", ComponentTypes.SALTPETER.getStack()); - } - - public static void addFurnaceRecipes() { - FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_IRON.getStack(), new ItemStack(Items.IRON_INGOT), (float) 0.15); - FurnaceRecipes.instance().addSmeltingRecipe(ComponentTypes.SAND_GOLD.getStack(), new ItemStack(Items.GOLD_INGOT), (float) 0.15); - } - - public static void addAltarRecipes() { - - } - - public static void addAlchemyArrayRecipes() { - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer()); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL)))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGGINGS))); - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_BINDING.getStack(), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS))); - - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer()); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.GLOWSTONE_DUST), new AlchemyArrayEffectUpdraft("updraft"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/UpdraftArray.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.SLIME_BALL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectBounce("bounce"), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BounceArray.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.COAL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectFurnaceFuel("furnace"), new LowAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FurnaceArray.png"))); - - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png"))); - - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turret"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.REDSTONE), new ItemStack(Blocks.LAPIS_BLOCK), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Items.IRON_INGOT), new AlchemyArrayEffectSpike("spike"), new LowStaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/spikearray.png"))); - AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Blocks.REDSTONE_BLOCK), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMobSacrifice("mobSacrifice"), new MobSacrificeAlchemyCircleRenderer()); - - AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"))); - - } - - public static void addCompressionHandlers() { - Stopwatch stopwatch = Stopwatch.createStarted(); - StorageBlockCraftingManager.getInstance().addStorageBlockRecipes(); - - CompressionRegistry.registerHandler(new BaseCompressionHandler(new ItemStack(Items.GLOWSTONE_DUST, 4, 0), new ItemStack(Blocks.GLOWSTONE), 64)); - CompressionRegistry.registerHandler(new BaseCompressionHandler(new ItemStack(Items.SNOWBALL, 4, 0), new ItemStack(Blocks.SNOW), 8)); - CompressionRegistry.registerHandler(new AdvancedCompressionHandler()); - - stopwatch.stop(); - - BMLog.DEBUG.info("Added compression recipes in {}", stopwatch); - } - - public static void addAlchemyTableRecipes() { - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING))); - } - - public static void addPotionRecipes() { - addPotionRecipe(1000, 1, new ItemStack(Items.GHAST_TEAR), new EffectInstance(Effects.REGENERATION, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.GOLDEN_CARROT), new EffectInstance(Effects.NIGHT_VISION, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.MAGMA_CREAM), new EffectInstance(Effects.FIRE_RESISTANCE, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.WATER_BUCKET), new EffectInstance(Effects.WATER_BREATHING, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.SUGAR), new EffectInstance(Effects.SPEED, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.SPECKLED_MELON), new EffectInstance(Effects.INSTANT_HEALTH, 1)); - addPotionRecipe(1000, 1, new ItemStack(Items.SPIDER_EYE), new EffectInstance(Effects.POISON, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.DYE, 1, 0), new EffectInstance(Effects.BLINDNESS, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.FERMENTED_SPIDER_EYE), new EffectInstance(Effects.WEAKNESS, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.BLAZE_POWDER), new EffectInstance(Effects.STRENGTH, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.FEATHER), new EffectInstance(Effects.JUMP_BOOST, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.CLAY_BALL), new EffectInstance(Effects.SLOWNESS, 450)); - addPotionRecipe(1000, 1, new ItemStack(Items.REDSTONE), new EffectInstance(Effects.HASTE, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.GLASS_BOTTLE), new EffectInstance(Effects.INVISIBILITY, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.POISONOUS_POTATO), new EffectInstance(Effects.SATURATION, 1)); - addPotionRecipe(1000, 1, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), new EffectInstance(Effects.HEALTH_BOOST, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Blocks.SLIME_BLOCK), new EffectInstance(RegistrarBloodMagic.BOUNCE, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new EffectInstance(RegistrarBloodMagic.CLING, 2 * 60 * 20)); - addPotionRecipe(1000, 1, new ItemStack(Items.CAKE), new EffectInstance(RegistrarBloodMagic.FLIGHT, 2 * 60 * 20)); - - addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new EffectInstance(RegistrarBloodMagic.DEAFNESS, 450)); - } - - public static void addPotionRecipe(int lpDrained, int tier, ItemStack inputStack, EffectInstance baseEffect) { - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(lpDrained, 100, tier, inputStack, baseEffect)); - - List lengtheningList = new ArrayList<>(); - lengtheningList.add(inputStack); - lengtheningList.add(mundaneLengtheningStack); - AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getLengthAugmentRecipe(lpDrained, 100, tier, lengtheningList, baseEffect, 1)); - - List powerList = new ArrayList<>(); - powerList.add(inputStack); - powerList.add(mundanePowerStack); - AlchemyTableRecipeRegistry.registerRecipe(BMPotionUtils.getPowerAugmentRecipe(lpDrained, 100, tier, powerList, baseEffect, 1)); - } - - public static void addLivingArmourDowngradeRecipes() { - String messageBase = "ritual.bloodmagic.downgradeRitual.dialogue."; - - ItemStack bowStack = new ItemStack(Items.BOW); - ItemStack bottleStack = new ItemStack(Items.POTIONITEM, 1, 0); - ItemStack swordStack = new ItemStack(Items.STONE_SWORD); - ItemStack goldenAppleStack = new ItemStack(Items.GOLDEN_APPLE); - ItemStack fleshStack = new ItemStack(Items.ROTTEN_FLESH); - ItemStack shieldStack = new ItemStack(Items.SHIELD); - ItemStack pickStack = new ItemStack(Items.STONE_PICKAXE); - ItemStack minecartStack = new ItemStack(Items.MINECART); - ItemStack stringStack = new ItemStack(Items.STRING); - - Map> dialogueMap = new HashMap<>(); - dialogueMap.put(bowStack, Pair.of("bow", new int[]{1, 100, 300, 500})); - dialogueMap.put(bottleStack, Pair.of("quenched", new int[]{1, 100, 300, 500})); - dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[]{1, 100, 300, 500, 700})); - dialogueMap.put(goldenAppleStack, Pair.of("slowHeal", new int[]{1, 100, 300, 500, 700})); - - for (Entry> entry : dialogueMap.entrySet()) { - ItemStack keyStack = entry.getKey(); - String str = entry.getValue().getKey(); - Map> textMap = new HashMap<>(); - for (int tick : entry.getValue().getValue()) { - List textList = new ArrayList<>(); - textList.add(new TranslationTextComponent("\u00A74%s", new TranslationTextComponent(messageBase + str + "." + tick))); - textMap.put(tick, textList); - } - - LivingArmourDowngradeRecipeRegistry.registerDialog(keyStack, textMap); - } - - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(0), bowStack, Items.ARROW, "string", "ingotIron", "ingotIron"); - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(1), bowStack, Items.SPECTRAL_ARROW, "ingotGold", "dustRedstone", "dustGlowstone", "gemLapis"); - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(2), bowStack, "gemDiamond", Items.FIRE_CHARGE, Items.BLAZE_ROD, "feather"); - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(3), bowStack, Items.PRISMARINE_SHARD, Items.BLAZE_ROD, "feather", "feather"); - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(4), bowStack, new ItemStack(Items.TIPPED_ARROW, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.TIPPED_ARROW, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.TIPPED_ARROW, 1, OreDictionary.WILDCARD_VALUE)); -// LivingArmourDowngradeRecipeRegistry.registerDialog(bowStack, bowMap); - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeQuenched(0), bottleStack, Items.DRAGON_BREATH); - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeCrippledArm(0), shieldStack, "gemDiamond"); - - for (int i = 0; i < 10; i++) { - addRecipeForTieredDowngrade(new LivingArmourUpgradeMeleeDecrease(i), swordStack, i); - addRecipeForTieredDowngrade(new LivingArmourUpgradeSlowHeal(i), goldenAppleStack, i); - addRecipeForTieredDowngrade(new LivingArmourUpgradeBattleHungry(i), fleshStack, i); - addRecipeForTieredDowngrade(new LivingArmourUpgradeDigSlowdown(i), pickStack, i); - addRecipeForTieredDowngrade(new LivingArmourUpgradeDisoriented(i), minecartStack, i); - addRecipeForTieredDowngrade(new LivingArmourUpgradeSlowness(i), stringStack, i); - } - } - - public static void addRecipeForTieredDowngrade(LivingArmourUpgrade upgrade, ItemStack stack, int tier) { - switch (tier) { - case 0: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); - break; - case 1: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0)); - break; - case 2: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); - break; - case 3: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1)); - break; - case 4: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - break; - case 5: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); - break; - case 6: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); - break; - case 7: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3)); - break; - case 8: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); - break; - case 9: - LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4)); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java deleted file mode 100644 index 548b58b4..00000000 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ /dev/null @@ -1,28 +0,0 @@ -package WayofTime.bloodmagic.registry; - -import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; -import WayofTime.bloodmagic.ritual.crushing.CrushingHandlerCuttingFluid; -import WayofTime.bloodmagic.ritual.crushing.CrushingRegistry; -import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; -import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; -import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; -import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall; -import net.minecraft.block.Blocks; - -public class ModRituals { - // TODO Move elsewhere - public static void initHarvestHandlers() { - HarvestRegistry.registerRangeAmplifier(Blocks.DIAMOND_BLOCK.getDefaultState(), 15); - HarvestRegistry.registerRangeAmplifier(Blocks.GOLD_BLOCK.getDefaultState(), 10); - HarvestRegistry.registerRangeAmplifier(Blocks.IRON_BLOCK.getDefaultState(), 6); - - HarvestRegistry.registerHandler(new HarvestHandlerPlantable()); - HarvestRegistry.registerHandler(new HarvestHandlerTall()); - HarvestRegistry.registerHandler(new HarvestHandlerStem()); - } - - public static void initCuttingFluids() { - CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5)); - CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java deleted file mode 100644 index e8d5b9d3..00000000 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.registry; - -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.incense.TranquilityStack; -import net.minecraft.block.LeavesBlock; -import net.minecraft.block.LogBlock; -import net.minecraft.block.FireBlock; -import net.minecraft.block.GrassBlock; - -public class ModTranquilityHandlers { - - public static void init() { - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof LeavesBlock ? new TranquilityStack(EnumTranquilityType.PLANT, 1.0D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof FireBlock ? new TranquilityStack(EnumTranquilityType.FIRE, 1.0D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof GrassBlock ? new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> block instanceof LogBlock ? new TranquilityStack(EnumTranquilityType.TREE, 1.0D) : null); - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> BloodMagicAPI.INSTANCE.getValueManager().getTranquility().get(state)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java deleted file mode 100644 index a4117e2f..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java +++ /dev/null @@ -1,549 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -public abstract class AreaDescriptor implements Iterator { - public List getContainedPositions(BlockPos pos) { - return new ArrayList<>(); - } - - public AxisAlignedBB getAABB(BlockPos pos) { - return null; - } - - public abstract void resetCache(); - - public abstract boolean isWithinArea(BlockPos pos); - - public abstract void resetIterator(); - - public void readFromNBT(CompoundNBT tag) { - - } - - public void writeToNBT(CompoundNBT tag) { - - } - - public abstract AreaDescriptor copy(); - - public abstract int getVolumeForOffsets(BlockPos offset1, BlockPos offset2); - - public abstract boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit); - - public abstract int getVolume(); - - public abstract int getHeight(); - - public abstract boolean isWithinRange(int verticalLimit, int horizontalLimit); - - /** - * This method changes the area descriptor so that its range matches the two - * blocks that are selected. When implementing this method, assume that - * these positions are the blocks that are clicked by the player. - * - * @param pos1 - * @param pos2 - */ - public abstract void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2); - - public abstract boolean intersects(AreaDescriptor descriptor); - - public abstract AreaDescriptor offset(BlockPos offset); - - public abstract AreaDescriptor rotateDescriptor(PlacementSettings settings); - - public static class Rectangle extends AreaDescriptor { - protected BlockPos minimumOffset; - protected BlockPos maximumOffset; // Non-inclusive maximum offset. - private BlockPos currentPosition; - - private ArrayList blockPosCache; - private BlockPos cachedPosition; - - private boolean cache = true; - - /** - * This constructor takes in the minimum and maximum BlockPos. The - * maximum offset is non-inclusive, meaning if you pass in (0,0,0) and - * (1,1,1), calling getContainedPositions() will only give (0,0,0). - * - * @param minimumOffset - - * @param maximumOffset - - */ - public Rectangle(BlockPos minimumOffset, BlockPos maximumOffset) { - setOffsets(minimumOffset, maximumOffset); - } - - public Rectangle(BlockPos minimumOffset, int sizeX, int sizeY, int sizeZ) { - this(minimumOffset, minimumOffset.add(sizeX, sizeY, sizeZ)); - } - - public Rectangle(BlockPos minimumOffset, int size) { - this(minimumOffset, size, size, size); - } - - public Rectangle(AreaDescriptor.Rectangle rectangle) { - this(rectangle.minimumOffset, rectangle.maximumOffset); - } - - public AreaDescriptor.Rectangle copy() { - return new AreaDescriptor.Rectangle(this); - } - - @Override - public List getContainedPositions(BlockPos pos) { - if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { - ArrayList posList = new ArrayList<>(); - - for (int j = minimumOffset.getY(); j < maximumOffset.getY(); j++) { - for (int i = minimumOffset.getX(); i < maximumOffset.getX(); i++) { - for (int k = minimumOffset.getZ(); k < maximumOffset.getZ(); k++) { - posList.add(pos.add(i, j, k)); - } - } - } - - blockPosCache = posList; - cachedPosition = pos; - } - - return Collections.unmodifiableList(blockPosCache); - } - - @Override - public AxisAlignedBB getAABB(BlockPos pos) { - AxisAlignedBB tempAABB = new AxisAlignedBB(minimumOffset, maximumOffset); - return tempAABB.offset(pos.getX(), pos.getY(), pos.getZ()); - } - - @Override - public int getHeight() { - return this.maximumOffset.getY() - this.minimumOffset.getY(); - } - - public BlockPos getMinimumOffset() { - return minimumOffset; - } - - public BlockPos getMaximumOffset() { - return maximumOffset; - } - - /** - * Sets the offsets of the AreaDescriptor in a safe way that will make - * minimumOffset the lowest corner - * - * @param offset1 - - * @param offset2 - - */ - public void setOffsets(BlockPos offset1, BlockPos offset2) { - this.minimumOffset = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); - this.maximumOffset = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - blockPosCache = new ArrayList<>(); - } - - @Override - public void resetCache() { - this.blockPosCache = new ArrayList<>(); - } - - @Override - public boolean isWithinArea(BlockPos pos) { - int x = pos.getX(); - int y = pos.getY(); - int z = pos.getZ(); - - return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ(); - } - - @Override - public boolean hasNext() { - return currentPosition == null || !(currentPosition.getX() + 1 == maximumOffset.getX() && currentPosition.getY() + 1 == maximumOffset.getY() && currentPosition.getZ() + 1 == maximumOffset.getZ()); - } - - @Override - public BlockPos next() { - if (currentPosition != null) { - int nextX = currentPosition.getX() + 1 >= maximumOffset.getX() ? minimumOffset.getX() : currentPosition.getX() + 1; - int nextZ = nextX != minimumOffset.getX() ? currentPosition.getZ() : (currentPosition.getZ() + 1 >= maximumOffset.getZ() ? minimumOffset.getZ() : currentPosition.getZ() + 1); - int nextY = (nextZ != minimumOffset.getZ() || nextX != minimumOffset.getX()) ? currentPosition.getY() : (currentPosition.getY() + 1); - currentPosition = new BlockPos(nextX, nextY, nextZ); - } else { - currentPosition = minimumOffset; - } - - return currentPosition; - } - - @Override - public void remove() { - - } - - @Override - public void resetIterator() { - currentPosition = null; - } - - @Override - public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) { - setOffsets(pos1, pos2); - maximumOffset = maximumOffset.add(1, 1, 1); - resetIterator(); - resetCache(); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - minimumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "min"), tag.getInt(Constants.NBT.Y_COORD + "min"), tag.getInt(Constants.NBT.Z_COORD + "min")); - maximumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "max"), tag.getInt(Constants.NBT.Y_COORD + "max"), tag.getInt(Constants.NBT.Z_COORD + "max")); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - tag.putInt(Constants.NBT.X_COORD + "min", minimumOffset.getX()); - tag.putInt(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); - tag.putInt(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); - tag.putInt(Constants.NBT.X_COORD + "max", maximumOffset.getX()); - tag.putInt(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); - tag.putInt(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); - } - - @Override - public int getVolumeForOffsets(BlockPos offset1, BlockPos offset2) { - BlockPos minPos = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); - BlockPos maxPos = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - - maxPos = maxPos.add(1, 1, 1); - - return (maxPos.getX() - minPos.getX()) * (maxPos.getY() - minPos.getY()) * (maxPos.getZ() - minPos.getZ()); - } - - @Override - public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) { - BlockPos minPos = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); - BlockPos maxPos = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - - return minPos.getY() >= -verticalLimit && maxPos.getY() <= verticalLimit && minPos.getX() >= -horizontalLimit && maxPos.getX() <= horizontalLimit && minPos.getZ() >= -horizontalLimit && maxPos.getZ() <= horizontalLimit; - } - - @Override - public int getVolume() { - return (maximumOffset.getX() - minimumOffset.getX()) * (maximumOffset.getY() - minimumOffset.getY()) * (maximumOffset.getZ() - minimumOffset.getZ()); - } - - @Override - public boolean isWithinRange(int verticalLimit, int horizontalLimit) { - return minimumOffset.getY() >= -verticalLimit && maximumOffset.getY() <= verticalLimit + 1 && minimumOffset.getX() >= -horizontalLimit && maximumOffset.getX() <= horizontalLimit + 1 && minimumOffset.getZ() >= -horizontalLimit && maximumOffset.getZ() <= horizontalLimit + 1; - } - - @Override - public boolean intersects(AreaDescriptor descriptor) { - if (descriptor instanceof AreaDescriptor.Rectangle) { - AreaDescriptor.Rectangle rectangle = (AreaDescriptor.Rectangle) descriptor; - - return !(minimumOffset.getX() >= rectangle.maximumOffset.getX() || minimumOffset.getY() >= rectangle.maximumOffset.getY() || minimumOffset.getZ() >= rectangle.maximumOffset.getZ() || rectangle.minimumOffset.getX() >= maximumOffset.getX() || rectangle.minimumOffset.getY() >= maximumOffset.getY() || rectangle.minimumOffset.getZ() >= maximumOffset.getZ()); - } - - return false; - } - - @Override - public AreaDescriptor offset(BlockPos offset) { - return new AreaDescriptor.Rectangle(this.minimumOffset.add(offset), this.maximumOffset.add(offset)); - } - - @Override - public AreaDescriptor rotateDescriptor(PlacementSettings settings) { - BlockPos rotatePos1 = Template.transformedBlockPos(settings, minimumOffset); - BlockPos rotatePos2 = Template.transformedBlockPos(settings, maximumOffset.add(-1, -1, -1)); //It works, shut up! - - AreaDescriptor.Rectangle rectangle = new AreaDescriptor.Rectangle(this.minimumOffset, 1); - rectangle.modifyAreaByBlockPositions(rotatePos1, rotatePos2); - - return rectangle; - } - } - - public static class HemiSphere extends AreaDescriptor { - private BlockPos minimumOffset; - private int radius; - - private ArrayList blockPosCache; - private BlockPos cachedPosition; - - private boolean cache = true; - - public HemiSphere(BlockPos minimumOffset, int radius) { - setRadius(minimumOffset, radius); - } - - public HemiSphere(AreaDescriptor.HemiSphere hemiSphere) { - this(hemiSphere.minimumOffset, hemiSphere.radius); - } - - public AreaDescriptor.HemiSphere copy() { - return new AreaDescriptor.HemiSphere(this); - } - - public void setRadius(BlockPos minimumOffset, int radius) { - this.minimumOffset = new BlockPos(Math.min(minimumOffset.getX(), minimumOffset.getX()), Math.min(minimumOffset.getY(), minimumOffset.getY()), Math.min(minimumOffset.getZ(), minimumOffset.getZ())); - this.radius = radius; - blockPosCache = new ArrayList<>(); - } - - - @Override - public int getHeight() { - return this.radius * 2; - } - - - @Override - public List getContainedPositions(BlockPos pos) { - if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { - ArrayList posList = new ArrayList<>(); - - int i = -radius; - int j = minimumOffset.getY(); - int k = -radius; - - //TODO For some reason the bottom of the hemisphere is not going up with the minOffset - - while (i <= radius) { - while (j <= radius) { - while (k <= radius) { - if (i * i + j * j + k * k >= (radius + 0.5F) * (radius + 0.5F)) { - k++; - continue; - } - - posList.add(pos.add(i, j, k)); - k++; - } - - k = -radius; - j++; - } - - j = minimumOffset.getY(); - i++; - } - - blockPosCache = posList; - cachedPosition = pos; - } - - return Collections.unmodifiableList(blockPosCache); - } - - /** - * Since you can't make a box using a sphere, this returns null - */ - @Override - public AxisAlignedBB getAABB(BlockPos pos) { - return null; - } - - @Override - public void resetCache() { - this.blockPosCache = new ArrayList<>(); - } - - @Override - public boolean isWithinArea(BlockPos pos) { - return blockPosCache.contains(pos); - } - - @Override - public boolean hasNext() { - return false; - } - - @Override - public BlockPos next() { - return null; - } - - @Override - public void remove() { - - } - - @Override - public void resetIterator() { - - } - - @Override - public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) { - - } - - @Override - public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) { - return 0; - } - - @Override - public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) { - return false; - } - - @Override - public int getVolume() { - return 0; - } - - @Override - public boolean isWithinRange(int verticalLimit, int horizontalLimit) { - return false; - } - - @Override - public boolean intersects(AreaDescriptor descriptor) { - return false; - } - - @Override - public AreaDescriptor offset(BlockPos offset) { - return new AreaDescriptor.HemiSphere(minimumOffset.add(offset), radius); - } - - @Override - public AreaDescriptor rotateDescriptor(PlacementSettings settings) { - return this; - } - } - - public static class Cross extends AreaDescriptor { - - private ArrayList blockPosCache; - private BlockPos cachedPosition; - - private BlockPos centerPos; - private int size; - - private boolean cache = true; - - public Cross(BlockPos center, int size) { - this.centerPos = center; - this.size = size; - this.blockPosCache = new ArrayList<>(); - } - - public Cross(AreaDescriptor.Cross cross) { - this(cross.centerPos, cross.size); - } - - public AreaDescriptor.Cross copy() { - return new AreaDescriptor.Cross(this); - } - - @Override - public int getHeight() { - return this.size * 2 + 1; - } - - - @Override - public List getContainedPositions(BlockPos pos) { - if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) { - resetCache(); - - blockPosCache.add(centerPos.add(pos)); - for (int i = 1; i <= size; i++) { - blockPosCache.add(centerPos.add(pos).add(i, 0, 0)); - blockPosCache.add(centerPos.add(pos).add(0, 0, i)); - blockPosCache.add(centerPos.add(pos).add(-i, 0, 0)); - blockPosCache.add(centerPos.add(pos).add(0, 0, -i)); - } - } - - cachedPosition = pos; - - return Collections.unmodifiableList(blockPosCache); - } - - @Override - public void resetCache() { - blockPosCache = new ArrayList<>(); - } - - @Override - public boolean isWithinArea(BlockPos pos) { - return blockPosCache.contains(pos); - } - - @Override - public boolean hasNext() { - return false; - } - - @Override - public BlockPos next() { - return null; - } - - @Override - public void remove() { - - } - - @Override - public void resetIterator() { - - } - - @Override - public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) { - - } - - @Override - public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) { - return 0; - } - - @Override - public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) { - return false; - } - - @Override - public int getVolume() { - return 0; - } - - @Override - public boolean isWithinRange(int verticalLimit, int horizontalLimit) { - return false; - } - - @Override - public boolean intersects(AreaDescriptor descriptor) { - return false; - } - - @Override - public AreaDescriptor offset(BlockPos offset) { - return new AreaDescriptor.Cross(centerPos.add(offset), size); - } - - @Override - public AreaDescriptor rotateDescriptor(PlacementSettings settings) { - return this; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java deleted file mode 100644 index 1b47776e..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java +++ /dev/null @@ -1,47 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import net.minecraft.nbt.ByteNBT; -import net.minecraft.nbt.INBT; -import net.minecraft.util.Direction; -import net.minecraftforge.common.capabilities.Capability; - -import java.util.concurrent.Callable; - -public final class CapabilityRuneType { - public static class RuneTypeStorage implements Capability.IStorage { - @Override - public INBT writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) { - return new ByteNBT((byte) instance.getRuneType().ordinal()); - } - - @Override - public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, INBT nbt) { - instance.setRuneType(EnumRuneType.byMetadata(((ByteNBT) nbt).getByte())); - } - } - - public static class RuneTypeWrapper implements IRitualStone.Tile { - private EnumRuneType type = EnumRuneType.BLANK; - - @Override - public boolean isRuneType(EnumRuneType runeType) { - return type == runeType; - } - - @Override - public EnumRuneType getRuneType() { - return type; - } - - public void setRuneType(EnumRuneType runeType) { - type = runeType; - } - } - - public static class Factory implements Callable { - @Override - public IRitualStone.Tile call() throws Exception { - return new RuneTypeWrapper(); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java deleted file mode 100644 index 0f69f17c..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumReaderBoundaries.java +++ /dev/null @@ -1,22 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumReaderBoundaries implements IStringSerializable { - SUCCESS, - VOLUME_TOO_LARGE, - NOT_WITHIN_BOUNDARIES; - - - @Override - public String toString() { - return name().toLowerCase(Locale.ROOT); - } - - @Override - public String getName() { - return toString(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java deleted file mode 100644 index 55694e32..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumRitualReaderState.java +++ /dev/null @@ -1,8 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -public enum EnumRitualReaderState { - SET_AREA, - INFORMATION, - SET_WILL_TYPES, - ; -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java deleted file mode 100644 index 585c1e33..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ISubItem; -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.text.TextFormatting; - -import javax.annotation.Nonnull; -import java.util.Locale; - -public enum EnumRuneType implements IStringSerializable, ISubItem { - - BLANK(TextFormatting.GRAY), - WATER(TextFormatting.AQUA), - FIRE(TextFormatting.RED), - EARTH(TextFormatting.GREEN), - AIR(TextFormatting.WHITE), - DUSK(TextFormatting.DARK_GRAY), - DAWN(TextFormatting.GOLD); - - public final TextFormatting colorCode; - - EnumRuneType(TextFormatting colorCode) { - this.colorCode = colorCode; - } - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } - - @Nonnull - @Override - public String getInternalName() { - return name().toLowerCase(Locale.ROOT); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); - CompoundNBT tag = new CompoundNBT(); - tag.putInt(Constants.NBT.USES, 10); - ret.setTagCompound(tag); - return ret; - } - - public static EnumRuneType byMetadata(int meta) { - if (meta < 0 || meta >= values().length) - meta = 0; - - return values()[meta]; - } - - -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java deleted file mode 100644 index 64e64175..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java +++ /dev/null @@ -1,79 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Map; -import java.util.UUID; - -/** - * This interface is for internal implementation only. - *

    - * It is provided via the API for easy obtaining of basic data. - */ -public interface IMasterRitualStone { - UUID getOwner(); - - SoulNetwork getOwnerNetwork(); - - boolean activateRitual(ItemStack activationCrystal, PlayerEntity activator, Ritual ritual); - - void performRitual(World world, BlockPos pos); - - void stopRitual(Ritual.BreakType breakType); - - int getCooldown(); - - void setCooldown(int cooldown); - - boolean isActive(); - - void setActive(boolean active); - - Direction getDirection(); - - boolean areTanksEmpty(); - - int getRunningTime(); - - World getWorldObj(); - - BlockPos getBlockPos(); - - String getNextBlockRange(String range); - - void provideInformationOfRitualToPlayer(PlayerEntity player); - - void provideInformationOfRangeToPlayer(PlayerEntity player, String range); - - void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList); - - void setActiveWillConfig(PlayerEntity player, List typeList); - - EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2); - - List getActiveWillConfig(); - - default SoulTicket ticket(int amount) { - return SoulTicket.block(getWorldObj(), getBlockPos(), amount); - } - - AreaDescriptor getBlockRange(String range); - - void addBlockRanges(Map blockRanges); - - void addBlockRange(String range, AreaDescriptor defaultRange); - - void setBlockRanges(Map blockRanges); - - void setBlockRange(String range, AreaDescriptor defaultRange); - - Ritual getCurrentRitual(); -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java deleted file mode 100644 index 73c0e471..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/IRitualStone.java +++ /dev/null @@ -1,23 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * This interface is for internal implementation only. - *

    - * It is provided via the API for easy obtaining of basic data. - */ -public interface IRitualStone { - boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType); - - void setRuneType(World world, BlockPos pos, EnumRuneType runeType); - - interface Tile { - boolean isRuneType(EnumRuneType runeType); - - EnumRuneType getRuneType(); - - void setRuneType(EnumRuneType runeType); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java deleted file mode 100644 index f4a1f8d4..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ /dev/null @@ -1,371 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import org.apache.commons.lang3.builder.ToStringBuilder; - -import java.util.*; -import java.util.Map.Entry; -import java.util.function.Consumer; - -/** - * Abstract class for creating new rituals. Register your ritual by annotating it with {@link RitualRegister} - */ -public abstract class Ritual { - - protected final Map modableRangeMap = new HashMap<>(); - protected final Map volumeRangeMap = new HashMap<>(); - protected final Map horizontalRangeMap = new HashMap<>(); - protected final Map verticalRangeMap = new HashMap<>(); - private final String name; - private final int crystalLevel; - private final int activationCost; - private final RitualRenderer renderer; - private final String unlocalizedName; - - public Ritual(String name, int crystalLevel, int activationCost, RitualRenderer renderer, String unlocalizedName) { - this.name = name; - this.crystalLevel = crystalLevel; - this.activationCost = activationCost; - this.renderer = renderer; - this.unlocalizedName = unlocalizedName; - } - - /** - * @param name - The name of the ritual - * @param crystalLevel - Required Activation Crystal tier - * @param activationCost - Base LP cost for activating the ritual - */ - public Ritual(String name, int crystalLevel, int activationCost, String unlocalizedName) { - this(name, crystalLevel, activationCost, null, unlocalizedName); - } - - public void readFromNBT(CompoundNBT tag) { - ListNBT tags = tag.getList("areas", 10); - if (tags.isEmpty()) { - return; - } - - for (int i = 0; i < tags.size(); i++) { - CompoundNBT newTag = tags.getCompound(i); - String rangeKey = newTag.getString("key"); - - CompoundNBT storedTag = newTag.getCompound("area"); - AreaDescriptor desc = this.getBlockRange(rangeKey); - if (desc != null) { - desc.readFromNBT(storedTag); - } - } - } - - public void writeToNBT(CompoundNBT tag) { - ListNBT tags = new ListNBT(); - - for (Entry entry : modableRangeMap.entrySet()) { - CompoundNBT newTag = new CompoundNBT(); - newTag.putString("key", entry.getKey()); - CompoundNBT storedTag = new CompoundNBT(); - - entry.getValue().writeToNBT(storedTag); - - newTag.put("area", storedTag); - - tags.add(newTag); - } - - tag.put("areas", tags); - } - - /** - * Called when the player attempts to activate the ritual. - *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} - * - * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is bound to - * @param player - The activating player - * @param owner - Owner of the crystal activating this ritual, or the current - * owner of the ritual if being reactivated. - * @return - Whether activation was successful - */ - public boolean activateRitual(IMasterRitualStone masterRitualStone, PlayerEntity player, UUID owner) { - return true; - } - - /** - * Called every {@link #getRefreshTime()} ticks while active. - *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)} - * - * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is bound to - */ - public abstract void performRitual(IMasterRitualStone masterRitualStone); - - /** - * Called when the ritual is stopped for a given {@link Ritual.BreakType}. - *

    - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)} - * - * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is bound to - * @param breakType - The type of break that caused the stoppage. - */ - public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType) { - - } - - /** - * Used to set the amount of LP drained every {@link #getRefreshTime()} - * ticks. - * - * @return - The amount of LP drained per refresh - */ - public abstract int getRefreshCost(); - - /** - * Used to set the refresh rate of the ritual. (How often - * {@link #performRitual(IMasterRitualStone)} is called. - * - * @return - How often to perform the effect in ticks. - */ - public int getRefreshTime() { - return 20; - } - - public void addBlockRange(String range, AreaDescriptor defaultRange) { - modableRangeMap.put(range, defaultRange); - } - - /** - * Used to grab the range of a ritual for a given effect. - * - * @param range - Range that needs to be pulled. - * @return - - */ - public AreaDescriptor getBlockRange(String range) { - if (modableRangeMap.containsKey(range)) { - return modableRangeMap.get(range); - } - - return null; - } - - public List getListOfRanges() { - return new ArrayList<>(modableRangeMap.keySet()); - } - - public String getNextBlockRange(String range) { - List rangeList = getListOfRanges(); - - if (rangeList.isEmpty()) { - return ""; - } - - if (!rangeList.contains(range)) { - return rangeList.get(0); - } - - boolean hasMatch = false; - - for (String rangeCheck : rangeList) { - if (hasMatch) { - return rangeCheck; - } else if (rangeCheck.equals(range)) { - hasMatch = true; - } - } - - return rangeList.get(0); - } - - public EnumReaderBoundaries canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) { - List willConfig = master.getActiveWillConfig(); - int maxVolume = getMaxVolumeForRange(range, willConfig, holder); - int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder); - int maxHorizontal = getMaxHorizontalRadiusForRange(range, willConfig, holder); - - return (maxVolume <= 0 || descriptor.getVolumeForOffsets(offset1, offset2) <= maxVolume) ? descriptor.isWithinRange(offset1, offset2, maxVertical, maxHorizontal) ? EnumReaderBoundaries.SUCCESS : EnumReaderBoundaries.NOT_WITHIN_BOUNDARIES : EnumReaderBoundaries.VOLUME_TOO_LARGE; - } - - protected void setMaximumVolumeAndDistanceOfRange(String range, int volume, int horizontalRadius, int verticalRadius) { - volumeRangeMap.put(range, volume); - horizontalRangeMap.put(range, horizontalRadius); - verticalRangeMap.put(range, verticalRadius); - } - - protected boolean checkDescriptorIsWithinRange(AreaDescriptor descriptor, int maxVolume, int maxHorizontal, int maxVertical) { - return descriptor.getVolume() <= maxVolume && descriptor.isWithinRange(maxVertical, maxHorizontal); - } - - public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) { - return volumeRangeMap.get(range); - } - - public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) { - return verticalRangeMap.get(range); - } - - public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) { - return horizontalRangeMap.get(range); - } - - public ITextComponent getErrorForBlockRangeOnFail(PlayerEntity player, String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) { - AreaDescriptor descriptor = this.getBlockRange(range); - if (descriptor == null) { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", "?"); - } - - List willConfig = master.getActiveWillConfig(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(master.getWorldObj(), master.getBlockPos()); - - int maxVolume = this.getMaxVolumeForRange(range, willConfig, holder); - int maxVertical = this.getMaxVerticalRadiusForRange(range, willConfig, holder); - int maxHorizontal = this.getMaxHorizontalRadiusForRange(range, willConfig, holder); - - if (maxVolume > 0 && descriptor.getVolumeForOffsets(offset1, offset2) > maxVolume) { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume); - } else { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVertical, maxHorizontal); - } - } - - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info")}; - } - - public ITextComponent provideInformationOfRangeToPlayer(PlayerEntity player, String range) { - if (getListOfRanges().contains(range)) { - return new TranslationTextComponent(this.getTranslationKey() + "." + range + ".info"); - } else { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"); - } - } - - public abstract void gatherComponents(Consumer components); - - protected final void addRune(Consumer components, int offset1, int y, int offset2, EnumRuneType rune) { - components.accept(new RitualComponent(new BlockPos(offset1, y, offset2), rune)); - } - - protected final void addOffsetRunes(Consumer components, int offset1, int offset2, int y, EnumRuneType rune) { - addRune(components, offset1, y, offset2, rune); - addRune(components, offset2, y, offset1, rune); - addRune(components, offset1, y, -offset2, rune); - addRune(components, -offset2, y, offset1, rune); - addRune(components, -offset1, y, offset2, rune); - addRune(components, offset2, y, -offset1, rune); - addRune(components, -offset1, y, -offset2, rune); - addRune(components, -offset2, y, -offset1, rune); - } - - protected final void addCornerRunes(Consumer components, int offset, int y, EnumRuneType rune) { - addRune(components, offset, y, offset, rune); - addRune(components, offset, y, -offset, rune); - addRune(components, -offset, y, -offset, rune); - addRune(components, -offset, y, offset, rune); - } - - protected final void addParallelRunes(Consumer components, int offset, int y, EnumRuneType rune) { - addRune(components, offset, y, 0, rune); - addRune(components, -offset, y, 0, rune); - addRune(components, 0, y, -offset, rune); - addRune(components, 0, y, offset, rune); - } - - public double getWillRespectingConfig(World world, BlockPos pos, EnumDemonWillType type, List willConfig) { - return willConfig.contains(type) ? WorldDemonWillHandler.getCurrentWill(world, pos, type) : 0; - } - - public abstract Ritual getNewCopy(); - - public String getName() { - return name; - } - - public int getCrystalLevel() { - return crystalLevel; - } - - public int getActivationCost() { - return activationCost; - } - - public RitualRenderer getRenderer() { - return renderer; - } - - public String getTranslationKey() { - return unlocalizedName; - } - - public Map getModableRangeMap() { - return modableRangeMap; - } - - public Map getVolumeRangeMap() { - return volumeRangeMap; - } - - public Map getHorizontalRangeMap() { - return horizontalRangeMap; - } - - public Map getVerticalRangeMap() { - return verticalRangeMap; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("name", name) - .append("crystalLevel", crystalLevel) - .append("activationCost", activationCost) - .append("renderer", renderer) - .append("unlocalizedName", unlocalizedName) - .append("modableRangeMap", modableRangeMap) - .append("volumeRangeMap", volumeRangeMap) - .append("horizontalRangeMap", horizontalRangeMap) - .append("verticalRangeMap", verticalRangeMap) - .append("refreshTime", getRefreshTime()) - .append("listOfRanges", getListOfRanges()) - .toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Ritual)) return false; - - Ritual ritual = (Ritual) o; - - if (crystalLevel != ritual.crystalLevel) return false; - if (activationCost != ritual.activationCost) return false; - if (name != null ? !name.equals(ritual.name) : ritual.name != null) return false; - return unlocalizedName != null ? unlocalizedName.equals(ritual.unlocalizedName) : ritual.unlocalizedName == null; - } - - @Override - public int hashCode() { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + crystalLevel; - result = 31 * result + activationCost; - result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); - return result; - } - - public enum BreakType { - REDSTONE, - BREAK_MRS, - BREAK_STONE, - ACTIVATE, - DEACTIVATE, - EXPLOSION, - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java deleted file mode 100644 index 9af0c1ab..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualComponent.java +++ /dev/null @@ -1,60 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; - -/** - * Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage - * in Ritual creation. - */ -public class RitualComponent { - private final BlockPos offset; - private final EnumRuneType runeType; - - public RitualComponent(BlockPos offset, EnumRuneType runeType) { - this.offset = offset; - this.runeType = runeType; - } - - public int getX(Direction direction) { - switch (direction) { - case EAST: - return -this.getOffset().getZ(); - case SOUTH: - return -this.getOffset().getX(); - case WEST: - return this.getOffset().getZ(); - default: - return this.getOffset().getX(); - } - } - - public int getY() { - return this.getOffset().getY(); - } - - public int getZ(Direction direction) { - switch (direction) { - case EAST: - return this.getOffset().getX(); - case SOUTH: - return -this.getOffset().getZ(); - case WEST: - return -this.getOffset().getX(); - default: - return this.getOffset().getZ(); - } - } - - public BlockPos getOffset(Direction direction) { - return new BlockPos(getX(direction), offset.getY(), getZ(direction)); - } - - public BlockPos getOffset() { - return offset; - } - - public EnumRuneType getRuneType() { - return runeType; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java deleted file mode 100644 index 70e5b951..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualManager.java +++ /dev/null @@ -1,154 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.util.BMLog; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import net.minecraft.block.BlockState; -import net.minecraft.util.DamageSource; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.fml.common.discovery.ASMDataTable; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class RitualManager { - public static final DamageSource RITUAL_DAMAGE = new DamageSource("ritual_damage").setDamageBypassesArmor(); - - private final Map rituals; - private final Map ritualsReverse; - private final List sortedRituals; - private final Map imperfectRituals; - private final Map imperfectRitualsReverse; - private final Configuration config; - - - public RitualManager(Configuration config) { - this.rituals = Maps.newTreeMap(); - this.ritualsReverse = Maps.newHashMap(); - this.sortedRituals = Lists.newArrayList(); - this.imperfectRituals = Maps.newTreeMap(); - this.imperfectRitualsReverse = Maps.newHashMap(); - this.config = config; - } - - public void discover(ASMDataTable dataTable) { - Set data = dataTable.getAll(RitualRegister.class.getName()); - for (ASMDataTable.ASMData found : data) { - try { - Class discoveredClass = Class.forName(found.getClassName()); - if (!Ritual.class.isAssignableFrom(discoveredClass)) - throw new BadRitualException("Annotated class " + found.getClassName() + " does not inherit from " + Ritual.class.getName()); - - Class ritualClass = discoveredClass.asSubclass(Ritual.class); - RitualRegister ritualRegister = ritualClass.getAnnotation(RitualRegister.class); - String id = ritualRegister.value(); - Ritual ritual = ritualRegister.factory().newInstance().apply(ritualClass); - if (ritual == null) { - BMLog.DEFAULT.error("Error creating ritual instance for {}.", id); - continue; - } - - rituals.put(id, ritual); - ritualsReverse.put(ritual, id); - BMLog.DEBUG.info("Registered ritual {}", id); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { - e.printStackTrace(); - } - } - - Set imperfectData = dataTable.getAll(RitualRegister.Imperfect.class.getName()); - for (ASMDataTable.ASMData found : imperfectData) { - try { - Class discoveredClass = Class.forName(found.getClassName()); - if (!ImperfectRitual.class.isAssignableFrom(discoveredClass)) - throw new BadRitualException("Annotated class " + found.getClassName() + " does not inherit from " + ImperfectRitual.class.getName()); - - Class ritualClass = discoveredClass.asSubclass(ImperfectRitual.class); - RitualRegister.Imperfect ritualRegister = ritualClass.getAnnotation(RitualRegister.Imperfect.class); - String id = ritualRegister.value(); - ImperfectRitual ritual = ritualRegister.factory().newInstance().apply(ritualClass); - if (ritual == null) { - BMLog.DEFAULT.error("Error creating imperfect ritual instance for {}.", id); - continue; - } - - imperfectRituals.put(id, ritual); - imperfectRitualsReverse.put(ritual, id); - BMLog.DEBUG.info("Registered imperfect ritual {}", id); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { - e.printStackTrace(); - } - } - - syncConfig(); - - // Sort rituals - sortedRituals.addAll(rituals.values()); - // Oh dear this is probably so slow - sortedRituals.sort((o1, o2) -> { - Set components = Sets.newHashSet(); - o1.gatherComponents(components::add); - int initialSize = components.size(); - components.clear(); - o2.gatherComponents(components::add); - return Integer.compare(initialSize, components.size()); - }); - } - - public Ritual getRitual(String id) { - return rituals.get(id); - } - - public String getId(Ritual ritual) { - return ritualsReverse.get(ritual); - } - - public ImperfectRitual getImperfectRitual(BlockState state) { - for (ImperfectRitual ritual : imperfectRituals.values()) - if (ritual.getBlockRequirement().test(state)) - return ritual; - - return null; - } - - public String getId(ImperfectRitual ritual) { - return imperfectRitualsReverse.get(ritual); - } - - public Collection getRituals() { - return rituals.values(); - } - - public Collection getImperfectRituals() { - return imperfectRituals.values(); - } - - public List getSortedRituals() { - return sortedRituals; - } - - public void syncConfig() { - config.addCustomCategoryComment("rituals", "Toggles for all rituals"); - rituals.forEach((k, v) -> config.getBoolean(k, "rituals", true, "Enable the " + k + " ritual.")); - imperfectRituals.forEach((k, v) -> config.getBoolean(k, "rituals.imperfect", true, "Enable the " + k + " imperfect ritual.")); - config.save(); - } - - public boolean enabled(String id, boolean imperfect) { - return id != null && config.getBoolean(id, "rituals" + (imperfect ? ".imperfect" : ""), true, ""); - } - - public Configuration getConfig() { - return config; - } - - public static class BadRitualException extends RuntimeException { - public BadRitualException(String message) { - super(message); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java deleted file mode 100644 index b077056f..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegister.java +++ /dev/null @@ -1,49 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.function.Function; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface RitualRegister { - - String value(); - - Class, Ritual>> factory() default DefaultRitualFactory.class; - - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.TYPE) - @interface Imperfect { - - String value(); - - Class, ImperfectRitual>> factory() default DefaultImperfectRitualFactory.class; - } - - class DefaultRitualFactory implements Function, Ritual> { - @Override - public Ritual apply(Class aClass) { - try { - return aClass.newInstance(); - } catch (Exception e) { - return null; - } - } - } - - class DefaultImperfectRitualFactory implements Function, ImperfectRitual> { - @Override - public ImperfectRitual apply(Class aClass) { - try { - return aClass.newInstance(); - } catch (Exception e) { - return null; - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java deleted file mode 100644 index 2cd14840..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java +++ /dev/null @@ -1,12 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - -public abstract class RitualRenderer { - public abstract void renderAt(IMasterRitualStone masterRitualStone, double x, double y, double z); - - protected void bindTexture(ResourceLocation resourceLocation) { - Minecraft.getInstance().getTextureManager().bindTexture(resourceLocation); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java deleted file mode 100644 index 6263059c..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingHandlerCuttingFluid.java +++ /dev/null @@ -1,49 +0,0 @@ -package WayofTime.bloodmagic.ritual.crushing; - -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -public class CrushingHandlerCuttingFluid implements ICrushingHandler { - - private int lpDrain; - - private double willDrain; - - private ItemStack cuttingStack; - - public CrushingHandlerCuttingFluid(ItemStack cuttingStack, int lpDrain, double willDrain) { - this.lpDrain = lpDrain; - this.willDrain = willDrain; - this.cuttingStack = cuttingStack; - } - - @Override - @Nonnull - public ItemStack getRecipeOutput(ItemStack inputStack, World world, BlockPos pos) { - List inputList = new ArrayList<>(); - inputList.add(cuttingStack); - inputList.add(inputStack.copy()); - RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(inputList); - - if (recipeAlchemyTable != null) { - return recipeAlchemyTable.getOutput().copy(); - } - - return ItemStack.EMPTY; - } - - public double getWillDrain() { - return willDrain; - } - - public int getLpDrain() { - return lpDrain; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java deleted file mode 100644 index 696663ea..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/crushing/CrushingRegistry.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.ritual.crushing; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; - - -public class CrushingRegistry { - - private static List crushingHandlerList = new ArrayList<>(); - - public static void registerCuttingFluid(ICrushingHandler handler) { - crushingHandlerList.add(handler); - } - - public static List getCrushingHandlerList() { - return crushingHandlerList; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java deleted file mode 100644 index 10d586cb..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/crushing/ICrushingHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package WayofTime.bloodmagic.ritual.crushing; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; - -public interface ICrushingHandler { - @Nonnull - ItemStack getRecipeOutput(ItemStack input, World world, BlockPos pos); - - int getLpDrain(); - - double getWillDrain(); -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java deleted file mode 100644 index ca4ecf43..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ /dev/null @@ -1,120 +0,0 @@ -package WayofTime.bloodmagic.ritual.harvest; - -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.CropsBlock; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - -/** - * Harvest handler for standard plantable crops such as Wheat, Potatoes, and - * Netherwart.
    - * Register a new crop for this handler with {@link HarvestRegistry#registerStandardCrop(Block, int)} - */ -public class HarvestHandlerPlantable implements IHarvestHandler { - - public HarvestHandlerPlantable() { - HarvestRegistry.registerStandardCrop(Blocks.CARROTS, 7); - HarvestRegistry.registerStandardCrop(Blocks.WHEAT, 7); - HarvestRegistry.registerStandardCrop(Blocks.POTATOES, 7); - HarvestRegistry.registerStandardCrop(Blocks.BEETROOTS, 3); - HarvestRegistry.registerStandardCrop(Blocks.NETHER_WART, 3); - - addThirdPartyCrop("actuallyadditions", "blockFlax", 7); - addThirdPartyCrop("actuallyadditions", "blockCanola", 7); - addThirdPartyCrop("actuallyadditions", "blockRice", 7); - - addThirdPartyCrop("extrautils2", "redorchid", 6); - addThirdPartyCrop("extrautils2", "enderlily", 7); - - addThirdPartyCrop("roots", "moonglow", 7); - addThirdPartyCrop("roots", "terra_moss", 7); - addThirdPartyCrop("roots", "pereskia", 7); - addThirdPartyCrop("roots", "wildroot", 7); - addThirdPartyCrop("roots", "aubergine", 7); - addThirdPartyCrop("roots", "spirit_herb", 7); - - addPamCrops(); - } - - @Override - public boolean harvest(World world, BlockPos pos, BlockState state, List drops) { - NonNullList blockDrops = NonNullList.create(); - state.getBlock().getDrops(blockDrops, world, pos, state, 0); - boolean foundSeed = false; - - for (ItemStack stack : blockDrops) { - if (stack.isEmpty()) - continue; - - if (stack.getItem() instanceof IPlantable) { - stack.shrink(1); - foundSeed = true; - break; - } - } - - if (foundSeed) { - world.setBlockState(pos, state.getBlock().getDefaultState()); - world.playEvent(2001, pos, Block.getStateId(state)); - for (ItemStack stack : blockDrops) { - if (stack.isEmpty()) - continue; - - drops.add(stack); - } - - return true; - } - - return false; - } - - @Override - public boolean test(World world, BlockPos pos, BlockState state) { - return HarvestRegistry.getStandardCrops().containsKey(state.getBlock()) && state.getBlock().getMetaFromState(state) == HarvestRegistry.getStandardCrops().get(state.getBlock()); - } - - private static void addThirdPartyCrop(String modid, String regName, int matureMeta) { - if (!Loader.isModLoaded(modid)) - return; - - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(modid, regName)); - if (block != null && block != Blocks.AIR) - HarvestRegistry.registerStandardCrop(block, matureMeta); - } - - private static void addPamCrops() { - if (!Loader.isModLoaded("harvestcraft")) - return; - - try { - Class pamRegistry = Class.forName("com.pam.harvestcraft.blocks.CropRegistry"); - Field names = pamRegistry.getDeclaredField("cropNames"); - Method getCrop = pamRegistry.getMethod("getCrop", String.class); - for (String name : (String[]) names.get(null)) { - CropsBlock crop = (CropsBlock) getCrop.invoke(null, name); - HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); - } - } catch (ClassNotFoundException e) { - BMLog.DEFAULT.error("HarvestCraft integration cancelled; unable to find registry class"); - } catch (NoSuchMethodException | NoSuchFieldException e) { - BMLog.DEFAULT.error("HarvestCraft integration cancelled; unable to find crop name mapper"); - } catch (IllegalAccessException | InvocationTargetException e) { - BMLog.DEFAULT.error("HarvestCraft integration cancelled; crop name lookup broke"); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java deleted file mode 100644 index 582b1dff..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.ritual.harvest; - -import net.minecraft.block.Blocks; -import net.minecraft.block.PumpkinBlock; -import net.minecraft.block.StemBlock; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.Collection; -import java.util.List; - -/** - * Harvest handler for crops with stems such as Pumpkins and Melons. Rotation based crop blocks are a good reason - * to use this (see pumpkins).
    - * Register a new crop for this handler with - * {@link HarvestRegistry#registerStemCrop(BlockState, BlockState)} - */ -public class HarvestHandlerStem implements IHarvestHandler { - - public HarvestHandlerStem() { - for (Direction facing : Direction.HORIZONTALS) - HarvestRegistry.registerStemCrop(Blocks.PUMPKIN.getDefaultState().withProperty(PumpkinBlock.FACING, facing), Blocks.PUMPKIN_STEM.getDefaultState().withProperty(StemBlock.AGE, 7)); - - HarvestRegistry.registerStemCrop(Blocks.MELON_BLOCK.getDefaultState(), Blocks.MELON_STEM.getDefaultState().withProperty(StemBlock.AGE, 7)); - } - - @Override - public boolean harvest(World world, BlockPos pos, BlockState state, List drops) { - Direction cropDir = state.getActualState(world, pos).getValue(StemBlock.FACING); - - if (cropDir != Direction.UP) { - BlockPos cropPos = pos.offset(cropDir); - BlockState probableCrop = world.getBlockState(cropPos); - Collection registeredCrops = HarvestRegistry.getStemCrops().get(state); - - for (BlockState registeredCrop : registeredCrops) { - if (registeredCrop == probableCrop) { - NonNullList blockDrops = NonNullList.create(); - probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0); - drops.addAll(blockDrops); - world.destroyBlock(cropPos, false); - return true; - } - } - } - - return false; - } - - @Override - public boolean test(World world, BlockPos pos, BlockState state) { - return HarvestRegistry.getStemCrops().containsKey(state); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java deleted file mode 100644 index 7f75934d..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.ritual.harvest; - -import net.minecraft.block.CactusBlock; -import net.minecraft.block.SugarCaneBlock; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; - -/** - * Harvest handler for crops that grow vertically such as Sugar Cane and Cactus.
    - * Register a new crop for this handler with - * {@link HarvestRegistry#registerTallCrop(BlockState)} - */ -public class HarvestHandlerTall implements IHarvestHandler { - - public HarvestHandlerTall() { - for (int i = 0; i < 15; i++) { - HarvestRegistry.registerTallCrop(Blocks.REEDS.getDefaultState().withProperty(SugarCaneBlock.AGE, i)); - HarvestRegistry.registerTallCrop(Blocks.CACTUS.getDefaultState().withProperty(CactusBlock.AGE, i)); - } - } - - @Override - public boolean harvest(World world, BlockPos pos, BlockState state, List drops) { - BlockState up = world.getBlockState(pos.up()); - if (up.getBlock() == state.getBlock()) { - NonNullList blockDrops = NonNullList.create(); - up.getBlock().getDrops(blockDrops, world, pos.up(), up, 0); - drops.addAll(blockDrops); - world.destroyBlock(pos.up(), false); - return true; - } - - return false; - } - - @Override - public boolean test(World world, BlockPos pos, BlockState state) { - return HarvestRegistry.getTallCrops().contains(state); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java deleted file mode 100644 index 2338a34a..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java +++ /dev/null @@ -1,105 +0,0 @@ -package WayofTime.bloodmagic.ritual.harvest; - -import com.google.common.collect.*; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.StemBlock; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class HarvestRegistry { - - private static final List HARVEST_HANDLERS = Lists.newArrayList(); - private static final Map STANDARD_CROPS = Maps.newHashMap(); - private static final Set TALL_CROPS = Sets.newHashSet(); - private static final Multimap STEM_CROPS = ArrayListMultimap.create(); - private static final Map AMPLIFIERS = Maps.newHashMap(); - - /** - * Registers a handler for the Harvest Ritual to call. - * - * @param handler - The custom handler to register - */ - public static void registerHandler(IHarvestHandler handler) { - if (!HARVEST_HANDLERS.contains(handler)) - HARVEST_HANDLERS.add(handler); - } - - /** - * Registers a standard crop (IE: Wheat, Carrots, Potatoes, Netherwart, etc) - * for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable} - * handler to handle. - * - * @param crop - The crop block to handle. - * @param matureMeta - The meta value at which the crop is considered mature and ready - * to be harvested. - */ - public static void registerStandardCrop(Block crop, int matureMeta) { - if (!STANDARD_CROPS.containsKey(crop)) - STANDARD_CROPS.put(crop, matureMeta); - } - - /** - * Registers a tall crop (Sugar Cane and Cactus) for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall} handler to - * handle. - * - * @param crop - The crop block to handle. - */ - public static void registerTallCrop(BlockState crop) { - if (!TALL_CROPS.contains(crop)) - TALL_CROPS.add(crop); - } - - /** - * Registers a stem crop (Melon and Pumpkin) for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem} handler to - * handle. - *

    - * Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to - * accept any meta for the crop block. - *

    - * The Stem must be instanceof {@link StemBlock} - * - * @param crop - The crop block to handle. - * @param stem - The stem of the crop - */ - public static void registerStemCrop(BlockState crop, BlockState stem) { - if (!STEM_CROPS.containsKey(crop) && stem.getBlock() instanceof StemBlock) - STEM_CROPS.put(stem, crop); - } - - /** - * Registers a range amplifier for the Harvest Ritual. - * - * @param block - The block for the amplifier. - * @param range - The range the amplifier provides. - */ - public static void registerRangeAmplifier(BlockState block, int range) { - if (!AMPLIFIERS.containsKey(block)) - AMPLIFIERS.put(block, range); - } - - public static List getHarvestHandlers() { - return ImmutableList.copyOf(HARVEST_HANDLERS); - } - - public static Map getStandardCrops() { - return ImmutableMap.copyOf(STANDARD_CROPS); - } - - public static Set getTallCrops() { - return ImmutableSet.copyOf(TALL_CROPS); - } - - public static Multimap getStemCrops() { - return ImmutableMultimap.copyOf(STEM_CROPS); - } - - public static Map getAmplifiers() { - return ImmutableMap.copyOf(AMPLIFIERS); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java deleted file mode 100644 index e2e50824..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/IHarvestHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.ritual.harvest; - -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; - -/** - * Used to define a HarvestHandler for the Harvest Ritual. - */ -public interface IHarvestHandler { - - /** - * Called whenever the Harvest Ritual attempts to harvest a block.
    - * Use this to break the block and plant a new one.
    - * Add the items to be dropped to the drops list.
    - * - * @param world - The world - * @param pos - The position of the {@link BlockState} being checked - * @param state - The {@link BlockState} being checked - * @param drops - The items to be dropped - * @return If the block was successfully harvested. - */ - boolean harvest(World world, BlockPos pos, BlockState state, List drops); - - /** - * Tests to see if the block is valid for harvest. - * - * @param world The world - * @param pos The position in the world of the {@link BlockState} being checked - * @param state The {@link BlockState} being checked - * @return if this block is valid for harvest. - */ - boolean test(World world, BlockPos pos, BlockState state); -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java deleted file mode 100644 index e18477ed..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.bloodmagic.ritual.imperfect; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * This interface is for internal implementation only. - *

    - * It is provided via the API for easy obtaining of basic data. - */ -public interface IImperfectRitualStone { - - boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, PlayerEntity player); - - World getRitualWorld(); - - BlockPos getRitualPos(); -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java deleted file mode 100644 index 5f2169a1..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java +++ /dev/null @@ -1,91 +0,0 @@ -package WayofTime.bloodmagic.ritual.imperfect; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.world.World; - -import java.util.function.Predicate; - -/** - * Abstract class for creating new imperfect rituals. To register, annotate your class with {@link WayofTime.bloodmagic.ritual.RitualRegister.Imperfect} - */ -public abstract class ImperfectRitual { - - private final String name; - private final Predicate blockRequirement; - private final int activationCost; - private final boolean lightShow; - private final String unlocalizedName; - - public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, boolean lightShow, String unlocalizedName) { - this.name = name; - this.blockRequirement = blockRequirement; - this.activationCost = activationCost; - this.lightShow = lightShow; - this.unlocalizedName = unlocalizedName; - } - - /** - * @param name The name of the ritual - * @param blockRequirement The block required above the ImperfectRitualStone - * @param activationCost Base LP cost for activating the ritual - */ - public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, String unlocalizedName) { - this(name, blockRequirement, activationCost, false, unlocalizedName); - } - - /** - * Called when the player activates the ritual - * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, PlayerEntity)} - * - * @param imperfectRitualStone - The {@link IImperfectRitualStone} that the ritual is bound to - * @param player - The player activating the ritual - * @return - Whether activation was successful - */ - public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player); - - public String getName() { - return name; - } - - public Predicate getBlockRequirement() { - return blockRequirement; - } - - public int getActivationCost() { - return activationCost; - } - - public boolean isLightShow() { - return lightShow; - } - - public String getTranslationKey() { - return unlocalizedName; - } - - @Override - public String toString() { - return getName() + "@" + getActivationCost(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ImperfectRitual)) return false; - - ImperfectRitual that = (ImperfectRitual) o; - - if (activationCost != that.activationCost) return false; - if (name != null ? !name.equals(that.name) : that.name != null) return false; - return unlocalizedName != null ? unlocalizedName.equals(that.unlocalizedName) : that.unlocalizedName == null; - } - - @Override - public int hashCode() { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + activationCost; - result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); - return result; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java deleted file mode 100644 index 9b848792..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.ritual.imperfect; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java deleted file mode 100644 index bdcd9fdd..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ /dev/null @@ -1,108 +0,0 @@ -package WayofTime.bloodmagic.ritual.portal; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.teleport.PortalLocation; -import WayofTime.bloodmagic.util.BMLog; -import net.minecraftforge.common.DimensionManager; - -import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; - -public class LocationsHandler implements Serializable { - - public static final long serialVersionUID = 10102001; - private static final String fileName = String.valueOf(DimensionManager.getCurrentSaveRootDirectory()) + "/" + BloodMagic.MODID + "/PortalLocations.dat"; - private static HashMap> portals; - private static LocationsHandler locationsHandler; - - private LocationsHandler() { - portals = new HashMap<>(); - } - - public boolean addLocation(String name, PortalLocation location) { - ArrayList portalLocations = portals.get(name); - if (portalLocations == null) { - portals.put(name, new ArrayList<>()); - updateFile(fileName, portals); - } - if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2) { - BMLog.DEBUG.info("Location {} already exists.", name); - updateFile(fileName, portals); - return false; - } else { - portals.get(name).add(location); - BMLog.DEBUG.info("Adding {}", name); - updateFile(fileName, portals); - return true; - } - } - - public boolean removeLocation(String name, PortalLocation location) { - if (portals.get(name) != null && !portals.get(name).isEmpty()) { - if (portals.get(name).contains(location)) { - portals.get(name).remove(location); - BMLog.DEBUG.info("Removing {}", name); - updateFile(fileName, portals); - return true; - } else { - BMLog.DEBUG.info("No location matching {}", name); - updateFile(fileName, portals); - return false; - } - } - return false; - } - - public ArrayList getLinkedLocations(String name) { - return portals.get(name); - } - - public static LocationsHandler getLocationsHandler() { - if (locationsHandler == null || loadFile() == null) { - locationsHandler = new LocationsHandler(); - return locationsHandler; - } else { - portals = loadFile(); - return locationsHandler; - } - } - - private static HashMap> loadFile() { - HashMap> map; - File file = new File(fileName); - try { - if (!file.exists()) { - if (file.getParentFile().mkdir()) { - if (file.createNewFile()) { - BMLog.DEBUG.info("Creating {} in {}", fileName, DimensionManager.getCurrentSaveRootDirectory()); - } - } else if (file.createNewFile()) { - BMLog.DEBUG.info("Creating {} in {}", fileName, DimensionManager.getCurrentSaveRootDirectory()); - } - } - FileInputStream fileIn = new FileInputStream(file); - ObjectInputStream in = new ObjectInputStream(fileIn); - map = (HashMap>) in.readObject(); - in.close(); - fileIn.close(); - return map; - } catch (IOException e) { - return null; - } catch (ClassNotFoundException e) { - BMLog.DEFAULT.error("{} was not found in {}", file, DimensionManager.getCurrentSaveRootDirectory()); - return null; - } - } - - private static void updateFile(String file, HashMap> object) { - try { - FileOutputStream fos = new FileOutputStream(file); - ObjectOutputStream oos = new ObjectOutputStream(fos); - oos.writeObject(object); - oos.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java deleted file mode 100644 index f28025da..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ /dev/null @@ -1,261 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.BlockStack; -import WayofTime.bloodmagic.altar.AltarComponent; -import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.block.BlockBloodRune; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.function.Consumer; - -@RitualRegister("altar_builder") -public class RitualAltarBuilder extends Ritual { - private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator(); - private boolean cycleDone = false; - - private AltarComponent currentComponent; - private BlockPos currentPos; - - public RitualAltarBuilder() { - super("ritualAltarBuilder", 0, 450, "ritual." + BloodMagic.MODID + ".altarBuilderRitual"); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - TileEntity tileEntity = world.getTileEntity(masterRitualStone.getBlockPos().up()); - BlockPos altarPos = masterRitualStone.getBlockPos().up(2); - - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - if (cycleDone) { - altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator(); - } - - if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) { - world.setBlockState(altarPos, RegistrarBloodMagicBlocks.ALTAR.getDefaultState()); - lightning(world, altarPos); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - } - - if (altarComponentsIterator.hasNext()) { - currentComponent = altarComponentsIterator.next(); - currentPos = altarPos.add(currentComponent.getOffset()); - - if (world.getBlockState(currentPos).getBlock().isReplaceable(world, currentPos)) { - switch (currentComponent.getComponent()) { - case NOTAIR: { - BlockStack blockStack = getMundaneBlock(tileEntity); - if (blockStack != null) { - world.setBlockState(currentPos, blockStack.getState(), 3); - lightning(world, currentPos); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - } - break; - } - case BLOODRUNE: { - BlockStack blockStack = getBloodRune(tileEntity); - if (blockStack != null) { - world.setBlockState(currentPos, blockStack.getState(), 3); - lightning(world, currentPos); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - } - break; - } - default: { - BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(currentComponent.getComponent()), 0); - if (hasItem(tileEntity, Item.getItemFromBlock(blockStack.getBlock()), blockStack.getMeta(), true)) { - world.setBlockState(currentPos, blockStack.getState(), 3); - lightning(world, currentPos); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - } - break; - } - } - } - } else { - cycleDone = true; - } - } - - @Override - public int getRefreshCost() { - return 75; - } - - @Override - public int getRefreshTime() { - return 12; - } - - @Override - public void gatherComponents(Consumer components) { - for (int i = -12; i <= -8; i++) { - addRune(components, i, -6, 13, EnumRuneType.AIR); - addRune(components, i, -6, -13, EnumRuneType.FIRE); - - addRune(components, 13, -6, i, EnumRuneType.EARTH); - addRune(components, -13, -6, i, EnumRuneType.WATER); - - addRune(components, i, 5, 13, EnumRuneType.AIR); - addRune(components, i, 5, -13, EnumRuneType.FIRE); - - addRune(components, 13, 5, i, EnumRuneType.EARTH); - addRune(components, -13, 5, i, EnumRuneType.WATER); - } - - for (int i = 8; i <= 12; i++) { - addRune(components, i, -6, 13, EnumRuneType.AIR); - addRune(components, i, -6, -13, EnumRuneType.FIRE); - - addRune(components, 13, -6, i, EnumRuneType.EARTH); - addRune(components, -13, -6, i, EnumRuneType.WATER); - - addRune(components, i, 5, 13, EnumRuneType.AIR); - addRune(components, i, 5, -13, EnumRuneType.FIRE); - - addRune(components, 13, 5, i, EnumRuneType.EARTH); - addRune(components, -13, 5, i, EnumRuneType.WATER); - } - - for (int i = -6; i <= -4; i++) { - addCornerRunes(components, 13, i, EnumRuneType.DUSK); - } - - for (int i = 3; i <= 5; i++) { - addCornerRunes(components, 13, i, EnumRuneType.DUSK); - } - } - - @Override - public Ritual getNewCopy() { - return new RitualAltarBuilder(); - } - - public void lightning(World world, BlockPos blockPos) { - world.addWeatherEffect(new LightningBoltEntity(world, blockPos.getX(), blockPos.getY(), blockPos.getZ(), true)); - } - - /* - * - * These methods are utilities for this ritual. They support both the old - * forge inventory system, and the new one. - */ - public boolean hasItem(TileEntity tileEntity, Item item, int damage, boolean consumeItem) { - if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); - - if (itemHandler.getSlots() <= 0) { - return false; - } - - for (int i = 0; i < itemHandler.getSlots(); i++) { - if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() == item && itemHandler.getStackInSlot(i).getItemDamage() == damage && !itemHandler.extractItem(i, 1, !consumeItem).isEmpty()) { - return true; - } - } - } else if (tileEntity instanceof IInventory) { - IInventory inv = (IInventory) tileEntity; - for (int i = 0; i < inv.getSizeInventory(); i++) { - if (!inv.getStackInSlot(0).isEmpty() && inv.getStackInSlot(i).getItem() == item && inv.getStackInSlot(i).getItemDamage() == damage) { - if (consumeItem) { - inv.decrStackSize(i, 1); - } - return true; - } - } - } - } - return false; - } - - public BlockStack getBloodRune(TileEntity tileEntity) { - if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); - - if (itemHandler.getSlots() <= 0) { - return null; - } - - for (int i = 0; i < itemHandler.getSlots(); i++) { - if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof BlockItem && Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune && itemHandler.extractItem(i, 1, true) != null) { - BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(ComponentType.BLOODRUNE), itemHandler.getStackInSlot(i).getItemDamage()); - itemHandler.extractItem(i, 1, false); - return blockStack; - } - } - } else if (tileEntity instanceof IInventory) { - IInventory inv = (IInventory) tileEntity; - for (int i = 0; i < inv.getSizeInventory(); i++) { - if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof BlockItem && Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune) { - BlockStack blockStack = new BlockStack(Utils.getBlockForComponent(ComponentType.BLOODRUNE), inv.getStackInSlot(i).getItemDamage()); - inv.decrStackSize(i, 1); - return blockStack; - } - } - } - } - return null; - } - - public BlockStack getMundaneBlock(TileEntity tileEntity) { - if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); - - if (itemHandler.getSlots() <= 0) { - return null; - } - - for (int i = 0; i < itemHandler.getSlots(); i++) { - if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof BlockItem && !(Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune) && !itemHandler.extractItem(i, 1, true).isEmpty()) { - Block block = Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()); - if (block != Blocks.AIR && block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK) { - BlockStack blockStack = new BlockStack(block, itemHandler.getStackInSlot(i).getItemDamage()); - itemHandler.extractItem(i, 1, false); - return blockStack; - } - } - } - } else if (tileEntity instanceof IInventory) { - IInventory inv = (IInventory) tileEntity; - for (int i = 0; i < inv.getSizeInventory(); i++) { - if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof BlockItem && !(Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune)) { - Block block = Block.getBlockFromItem(inv.getStackInSlot(i).getItem()); - if (block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK) { - BlockStack blockStack = new BlockStack(block, inv.getStackInSlot(i).getItemDamage()); - inv.decrStackSize(i, 1); - return blockStack; - } - } - } - } - } - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java deleted file mode 100644 index a6b61133..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ /dev/null @@ -1,220 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("animal_growth") -public class RitualAnimalGrowth extends Ritual { - public static final double rawWillDrain = 0.05; - public static final double vengefulWillDrain = 0.02; - public static final double steadfastWillDrain = 0.1; - public static final double destructiveWillDrain = 1; - - public static final String GROWTH_RANGE = "growing"; - public static final String CHEST_RANGE = "chest"; - public static int defaultRefreshTime = 20; - public int refreshTime = 20; - - public RitualAnimalGrowth() { - super("ritualAnimalGrowth", 0, 10000, "ritual." + BloodMagic.MODID + ".animalGrowthRitual"); - addBlockRange(GROWTH_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 1, -2), 5, 2, 5)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(GROWTH_RANGE, 0, 7, 7); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxGrowths = currentEssence / getRefreshCost(); - int totalGrowths = 0; - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity chest = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - IItemHandler itemHandler = null; - if (chest != null) { - itemHandler = Utils.getInventory(chest, null); - } - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - - double vengefulDrain = 0; - double steadfastDrain = 0; - double destructiveDrain = 0; - - boolean decreaseBreedTimer = vengefulWill >= vengefulWillDrain; - boolean breedAnimals = steadfastWill >= steadfastWillDrain && itemHandler != null; - boolean kamikaze = destructiveWill >= destructiveWillDrain; - - AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROWTH_RANGE); - AxisAlignedBB axis = growingRange.getAABB(masterRitualStone.getBlockPos()); - List animalList = world.getEntitiesWithinAABB(AnimalEntity.class, axis); - - boolean performedEffect = false; - - for (AnimalEntity animal : animalList) { - if (animal.getGrowingAge() < 0) { - animal.addGrowth(5); - totalGrowths++; - performedEffect = true; - } else if (animal.getGrowingAge() > 0) { - if (decreaseBreedTimer) { - if (vengefulWill >= vengefulWillDrain) { - animal.setGrowingAge(Math.max(0, animal.getGrowingAge() - getBreedingDecreaseForWill(vengefulWill))); - vengefulDrain += vengefulWillDrain; - vengefulWill -= vengefulWillDrain; - performedEffect = true; - } else { - decreaseBreedTimer = false; - } - } - } else { - if (kamikaze) { - if (destructiveWill >= destructiveWillDrain) { - if (!animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { - animal.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SACRIFICIAL_LAMB, 1200)); - destructiveDrain += destructiveWillDrain; - destructiveWill -= destructiveWillDrain; - performedEffect = true; - } - } else { - kamikaze = false; - } - } - - if (breedAnimals) { - if (steadfastWill >= steadfastWillDrain) { - if (!animal.isInLove()) { - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - ItemStack foodStack = itemHandler.getStackInSlot(slot); - if (foodStack != null && animal.isBreedingItem(foodStack) && itemHandler.extractItem(slot, 1, true) != null) { - animal.setInLove(null); - itemHandler.extractItem(slot, 1, false); - steadfastDrain += steadfastWillDrain; - steadfastWill -= steadfastWillDrain; - performedEffect = true; - break; - } - } - } - } else { - breedAnimals = false; - } - } - } - - if (totalGrowths >= maxGrowths) { - break; - } - } - - if (performedEffect && consumeRawWill) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWillDrain, true); - } - - if (vengefulDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); - } - - if (steadfastDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrain, true); - } - - if (destructiveDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveDrain, true); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalGrowths * getRefreshCost())); - } - - @Override - public int getRefreshCost() { - return 2; - } - - @Override - public void gatherComponents(Consumer components) { - - addParallelRunes(components, 2, 0, EnumRuneType.DUSK); - addParallelRunes(components, 1, 0, EnumRuneType.WATER); - components.accept(new RitualComponent(new BlockPos(1, 0, 2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(1, 0, -2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-1, 0, 2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-1, 0, -2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(2, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(2, 0, -1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-2, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-2, 0, -1), EnumRuneType.AIR)); - } - - @Override - public Ritual getNewCopy() { - return new RitualAnimalGrowth(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{ - new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") - }; - } - - public int getBreedingDecreaseForWill(double vengefulWill) { - return (int) (10 + vengefulWill / 5); - } - - public int getRefreshTimeForRawWill(double rawWill) { - if (rawWill >= rawWillDrain) { - return (int) Math.max(defaultRefreshTime - rawWill / 10, 1); - } - - return defaultRefreshTime; - } - - @Override - public int getRefreshTime() { - return refreshTime; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java deleted file mode 100644 index 482acf7c..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ /dev/null @@ -1,87 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.ritual.*; -import com.google.common.collect.Iterables; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("armour_evolve") -public class RitualArmourEvolve extends Ritual { - public static final String CHECK_RANGE = "fillRange"; - - public RitualArmourEvolve() { - super("ritualArmourEvolve", 2, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual"); - addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - - if (world.isRemote) { - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); - - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, checkRange.getAABB(pos)); - - for (PlayerEntity player : playerList) { - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - if (armour.maxUpgradePoints < 300) { - armour.maxUpgradePoints = 300; - ((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true); - - masterRitualStone.setActive(false); - - world.spawnEntity(new LightningBoltEntity(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); - } - } - } - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 0, EnumRuneType.FIRE); - addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); - addCornerRunes(components, 1, 1, EnumRuneType.DUSK); - addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - addCornerRunes(components, 1, 3, EnumRuneType.DUSK); - addParallelRunes(components, 1, 4, EnumRuneType.EARTH); - - for (int i = 0; i < 4; i++) { - addCornerRunes(components, 3, i, EnumRuneType.EARTH); - } - } - - @Override - public Ritual getNewCopy() { - return new RitualArmourEvolve(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java deleted file mode 100644 index 2e91a184..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java +++ /dev/null @@ -1,96 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.function.Consumer; - -@RitualRegister("cobblestone") -public class RitualCobblestone extends Ritual { - - public static final String COBBLESTONE_RANGE = "cobblestoneRange"; - - public RitualCobblestone() { - super("ritualCobblestone", 0, 500, "ritual." + BloodMagic.MODID + ".cobblestoneRitual"); - addBlockRange(COBBLESTONE_RANGE, new AreaDescriptor.Cross(new BlockPos(0, 1, 0), 1)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - TileEntity tileEntity = world.getTileEntity(masterRitualStone.getBlockPos().up()); - Block block = Blocks.COBBLESTONE; - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - AreaDescriptor cobblestoneRange = masterRitualStone.getBlockRange(COBBLESTONE_RANGE); - - if (tileEntity != null && tileEntity instanceof TileAlchemyArray) { - TileAlchemyArray alchemyArray = (TileAlchemyArray) tileEntity; - if (!alchemyArray.getStackInSlot(0).isEmpty() && alchemyArray.getStackInSlot(0).getItem() == RegistrarBloodMagicItems.COMPONENT) { - switch (alchemyArray.getStackInSlot(0).getItemDamage()) { - case 0: - block = Blocks.OBSIDIAN; - alchemyArray.decrStackSize(0, 1); - world.setBlockToAir(alchemyArray.getPos()); - break; - case 1: - block = Blocks.NETHERRACK; - alchemyArray.decrStackSize(0, 1); - world.setBlockToAir(alchemyArray.getPos()); - break; - /* - * case 4: block = Blocks.end_stone; - * alchemyArray.decrStackSize(0, 1); - * world.setBlockToAir(alchemyArray.getPos()); break; - */ - default: - break; - } - } - } - - for (BlockPos blockPos : cobblestoneRange.getContainedPositions(masterRitualStone.getBlockPos())) { - if (world.isAirBlock(blockPos)) { - world.setBlockState(blockPos, block.getDefaultState()); - totalEffects++; - } - - if (totalEffects >= maxEffects) { - break; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshCost() { - return 25; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 1, EnumRuneType.FIRE); - addParallelRunes(components, 1, 0, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() { - return new RitualCobblestone(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java deleted file mode 100644 index a126275b..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java +++ /dev/null @@ -1,89 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("condor") -public class RitualCondor extends Ritual { - public static final String FLIGHT_RANGE = "flightRange"; - - public RitualCondor() { - super("ritualCondor", 0, 1000000, "ritual." + BloodMagic.MODID + ".condorRitual"); - addBlockRange(FLIGHT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, 0, -10), new BlockPos(10, 30, 10))); - setMaximumVolumeAndDistanceOfRange(FLIGHT_RANGE, 0, 100, 200); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - AxisAlignedBB aabb = masterRitualStone.getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()); - World world = masterRitualStone.getWorldObj(); - - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - List entityPlayers = world.getEntitiesWithinAABB(PlayerEntity.class, aabb); - int entityCount = entityPlayers.size(); - - if (currentEssence < getRefreshCost() * entityCount) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } else { - entityCount = 0; - for (PlayerEntity player : entityPlayers) { - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FLIGHT, 20, 0)); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * entityCount)); - } - - @Override - public int getRefreshTime() { - return 10; - } - - @Override - public int getRefreshCost() { - return 5; - } - - @Override - public void gatherComponents(Consumer components) { - - addParallelRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 0, EnumRuneType.AIR); - addOffsetRunes(components, 1, 3, 0, EnumRuneType.EARTH); - addParallelRunes(components, 3, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 4, 0, EnumRuneType.WATER); - addParallelRunes(components, 1, 1, EnumRuneType.FIRE); - addParallelRunes(components, 2, 1, EnumRuneType.BLANK); - addParallelRunes(components, 4, 1, EnumRuneType.BLANK); - addParallelRunes(components, 5, 1, EnumRuneType.AIR); - addParallelRunes(components, 5, 0, EnumRuneType.DUSK); - - for (int i = 2; i <= 4; i++) { - addParallelRunes(components, i, 2, EnumRuneType.EARTH); - } - - addOffsetRunes(components, 2, 1, 4, EnumRuneType.FIRE); - addCornerRunes(components, 2, 4, EnumRuneType.AIR); - addCornerRunes(components, 4, 2, EnumRuneType.FIRE); - - for (int i = -1; i <= 1; i++) { - addOffsetRunes(components, 3, i, 4, EnumRuneType.EARTH); - } - } - - @Override - public Ritual getNewCopy() { - return new RitualCondor(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java deleted file mode 100644 index d458bd29..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.function.Consumer; - -@RitualRegister("containment") -public class RitualContainment extends Ritual { - public static final String CONTAINMENT_RANGE = "containmentRange"; - - public RitualContainment() { - super("ritualContainment", 0, 2000, "ritual." + BloodMagic.MODID + ".containmentRitual"); - addBlockRange(CONTAINMENT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 0, -3), 7)); - setMaximumVolumeAndDistanceOfRange(CONTAINMENT_RANGE, 0, 10, 10); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - AreaDescriptor containmentRange = masterRitualStone.getBlockRange(CONTAINMENT_RANGE); - - for (LivingEntity entity : world.getEntitiesWithinAABB(LivingEntity.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity instanceof PlayerEntity && (((PlayerEntity) entity).capabilities.isCreativeMode || ((PlayerEntity) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) - continue; - - double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); - double yDif = entity.posY - (masterRitualStone.getBlockPos().getY() + 2.5); - double zDif = entity.posZ - (masterRitualStone.getBlockPos().getZ() + 0.5); - - entity.motionX = -0.05 * xDif; - entity.motionY = -0.05 * yDif; - entity.motionZ = -0.05 * zDif; - entity.fallDistance = 0; - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 1; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 1, 0, EnumRuneType.EARTH); - addCornerRunes(components, 2, 0, EnumRuneType.EARTH); - addParallelRunes(components, 1, 5, EnumRuneType.EARTH); - addCornerRunes(components, 2, 5, EnumRuneType.EARTH); - } - - @Override - public Ritual getNewCopy() { - return new RitualContainment(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java deleted file mode 100644 index 99cc2548..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ /dev/null @@ -1,282 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.compress.CompressionRegistry; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.ritual.crushing.CrushingRegistry; -import WayofTime.bloodmagic.ritual.crushing.ICrushingHandler; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.util.Utils; -import com.mojang.authlib.GameProfile; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.common.util.FakePlayerFactory; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -@RitualRegister("crushing") -public class RitualCrushing extends Ritual { - public static final String CRUSHING_RANGE = "crushingRange"; - public static final String CHEST_RANGE = "chest"; - - public static double rawWillDrain = 0.05; - public static double steadfastWillDrain = 0.2; - public static double destructiveWillDrain = 0.2; - public static double vengefulWillDrain = 0.2; - - public static Map cuttingFluidLPMap = new HashMap<>(); - public static Map cuttingFluidWillMap = new HashMap<>(); - public static int defaultRefreshTime = 40; - private FakePlayer fakePlayer; - public int refreshTime = 40; - - public RitualCrushing() { - super("ritualCrushing", 0, 5000, "ritual." + BloodMagic.MODID + ".crushingRitual"); - addBlockRange(CRUSHING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, -3, -1), 3)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(CRUSHING_RANGE, 50, 10, 10); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - - if (tile != null && Utils.getNumberOfFreeSlots(tile, Direction.DOWN) < 1) { - return; - } - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - - boolean isSilkTouch = steadfastWill >= steadfastWillDrain; - boolean useCuttingFluid = corrosiveWill > 0; - - int fortune = destructiveWill > 0 ? 3 : 0; - - AreaDescriptor crushingRange = masterRitualStone.getBlockRange(CRUSHING_RANGE); - boolean hasOperated = false; - - double rawDrain = 0; - - for (BlockPos newPos : crushingRange.getContainedPositions(pos)) { - if (world.isAirBlock(newPos)) { - continue; - } - - BlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - if (block.equals(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER) || block.equals(RegistrarBloodMagicBlocks.RITUAL_STONE) || block.getBlockHardness(state, world, newPos) == -1.0F || Utils.isBlockLiquid(state)) { - continue; - } - - boolean isBlockClaimed = false; - if (useCuttingFluid) { - ItemStack checkStack = block.getItem(world, newPos, state); - if (checkStack.isEmpty()) { - continue; - } - - ItemStack copyStack = checkStack.copy(); - - for (ICrushingHandler handler : CrushingRegistry.getCrushingHandlerList()) { - int lpDrain = handler.getLpDrain(); - double willDrain = handler.getWillDrain(); - - if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) { - continue; - } - - ItemStack result = handler.getRecipeOutput(copyStack, world, pos); - - if (result.isEmpty()) { - continue; - } - - if (tile != null) { - result = Utils.insertStackIntoTile(result, tile, Direction.DOWN); - if (!result.isEmpty()) { - Utils.spawnStackAtBlock(world, pos, Direction.UP, result); - } - } else { - Utils.spawnStackAtBlock(world, pos, Direction.UP, result); - } - - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, willDrain, true); - corrosiveWill -= willDrain; - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); - currentEssence -= lpDrain; - - isBlockClaimed = true; - } - - } - - if (!isBlockClaimed && isSilkTouch && block.canSilkHarvest(world, newPos, state, getFakePlayer((ServerWorld) world))) { - ItemStack checkStack = block.getItem(world, newPos, state); - if (checkStack.isEmpty()) { - continue; - } - - ItemStack copyStack = checkStack.copy(); - - if (steadfastWill >= steadfastWillDrain) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastWillDrain, true); - steadfastWill -= steadfastWillDrain; - } else { - continue; - } - - if (tile != null) - copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); - else - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - - if (!copyStack.isEmpty()) { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - } - } else if (!isBlockClaimed) { - if (fortune > 0 && destructiveWill < destructiveWillDrain) { - fortune = 0; - } - - List stackList = block.getDrops(world, newPos, state, fortune); - - for (ItemStack item : stackList) { - ItemStack copyStack = item.copy(); - - if (tile != null) { - copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); - } else { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - continue; - } - if (!copyStack.isEmpty()) { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - } - } - - if (fortune > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveWillDrain, true); - destructiveWill -= destructiveWillDrain; - } - } - - world.destroyBlock(newPos, false); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - hasOperated = true; - - if (consumeRawWill) { - rawDrain += rawWillDrain; - rawWill -= rawWillDrain; - } - - break; - } - - if (hasOperated && tile != null && vengefulWill >= vengefulWillDrain) { - Pair pair = CompressionRegistry.compressInventory(tile, world); - if (pair.getRight()) { - ItemStack returned = pair.getLeft(); - if (returned != null) { - Utils.spawnStackAtBlock(world, pos, Direction.UP, returned); - } - - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulWillDrain, true); - } - } - - if (rawDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrain, true); - } - } - - public int getRefreshTimeForRawWill(double rawWill) { - if (rawWill >= rawWillDrain) { - return Math.max(1, (int) (40 - rawWill / 5)); - } - - return defaultRefreshTime; - } - - @Override - public int getRefreshTime() { - return refreshTime; - } - - @Override - public int getRefreshCost() { - return 7; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 1, 0, EnumRuneType.EARTH); - addParallelRunes(components, 2, 0, EnumRuneType.FIRE); - addCornerRunes(components, 2, 0, EnumRuneType.DUSK); - addParallelRunes(components, 2, 1, EnumRuneType.AIR); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{ - new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") - }; - } - - @Override - public Ritual getNewCopy() { - return new RitualCrushing(); - } - - public static void registerCuttingFluid(ItemStack stack, int lpDrain, double willDrain) { - cuttingFluidLPMap.put(stack, lpDrain); - cuttingFluidWillMap.put(stack, willDrain); - } - - private FakePlayer getFakePlayer(ServerWorld world) { - return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_crushing")) : fakePlayer; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java deleted file mode 100644 index 2e66f058..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ /dev/null @@ -1,87 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.tile.TileDemonCrystal; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.function.Consumer; - -@RitualRegister("crystal_harvest") -public class RitualCrystalHarvest extends Ritual { - public static final String CRYSTAL_RANGE = "crystal"; - - public RitualCrystalHarvest() { - super("ritualCrystalHarvest", 0, 40000, "ritual." + BloodMagic.MODID + ".crystalHarvestRitual"); - addBlockRange(CRYSTAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 2, -3), 7, 5, 7)); - - setMaximumVolumeAndDistanceOfRange(CRYSTAL_RANGE, 250, 5, 7); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = 1; - int totalEffects = 0; - - AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE); - - crystalRange.resetIterator(); - while (crystalRange.hasNext()) { - BlockPos nextPos = crystalRange.next().add(pos); - TileEntity tile = world.getTileEntity(nextPos); - if (tile instanceof TileDemonCrystal) { - TileDemonCrystal demonCrystal = (TileDemonCrystal) tile; - if (demonCrystal.dropSingleCrystal()) { - BlockState state = world.getBlockState(nextPos); - world.notifyBlockUpdate(nextPos, state, state, 3); - totalEffects++; - if (totalEffects >= maxEffects) { - break; - } - } - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 25; - } - - @Override - public int getRefreshCost() { - return 50; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.AIR); - addParallelRunes(components, 1, 1, EnumRuneType.DUSK); - addParallelRunes(components, 1, -1, EnumRuneType.FIRE); - addParallelRunes(components, 2, -1, EnumRuneType.FIRE); - addParallelRunes(components, 3, -1, EnumRuneType.FIRE); - addOffsetRunes(components, 3, 1, -1, EnumRuneType.FIRE); - addCornerRunes(components, 3, -1, EnumRuneType.EARTH); - addCornerRunes(components, 3, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 2, 0, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() { - return new RitualCrystalHarvest(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java deleted file mode 100644 index 7a74317f..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ /dev/null @@ -1,162 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import java.util.function.Consumer; - -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.tile.TileDemonCrystal; - -@RitualRegister("crystal_split") -public class RitualCrystalSplit extends Ritual { - public RitualCrystalSplit() { - super("ritualCrystalSplit", 0, 20000, "ritual." + BloodMagic.MODID + ".crystalSplitRitual"); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - Direction direction = masterRitualStone.getDirection(); - BlockPos rawPos = pos.up(2); - - TileEntity tile = world.getTileEntity(rawPos); - if (!(tile instanceof TileDemonCrystal) || ((TileDemonCrystal) tile).getType() != EnumDemonWillType.DEFAULT) { - return; - } - - BlockState rawState = world.getBlockState(rawPos); - - TileDemonCrystal rawTile = (TileDemonCrystal) tile; - if (rawTile.crystalCount >= 5) { - BlockPos vengefulPos = pos.offset(rotateFacing(Direction.NORTH, direction)).up(); - BlockPos corrosivePos = pos.offset(rotateFacing(Direction.EAST, direction)).up(); - BlockPos steadfastPos = pos.offset(rotateFacing(Direction.SOUTH, direction)).up(); - BlockPos destructivePos = pos.offset(rotateFacing(Direction.WEST, direction)).up(); - - int vengefulCrystals = 0; - int corrosiveCrystals = 0; - int steadfastCrystals = 0; - int destructiveCrystals = 0; - - tile = world.getTileEntity(vengefulPos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.VENGEFUL && ((TileDemonCrystal) tile).crystalCount < 7) { - vengefulCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(vengefulPos)) { - // #donothing, no point setting the crystal to 0 again - } else { - return; - } - - tile = world.getTileEntity(corrosivePos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.CORROSIVE && ((TileDemonCrystal) tile).crystalCount < 7) { - corrosiveCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(corrosivePos)) { - - } else { - return; - } - - tile = world.getTileEntity(steadfastPos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.STEADFAST && ((TileDemonCrystal) tile).crystalCount < 7) { - steadfastCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(steadfastPos)) { - - } else { - return; - } - - tile = world.getTileEntity(destructivePos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getType() == EnumDemonWillType.DESTRUCTIVE && ((TileDemonCrystal) tile).crystalCount < 7) { - destructiveCrystals = ((TileDemonCrystal) tile).crystalCount; - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(destructivePos)) { - - } else { - return; - } - - rawTile.crystalCount -= 4; - - growCrystal(world, vengefulPos, EnumDemonWillType.VENGEFUL, vengefulCrystals); - growCrystal(world, corrosivePos, EnumDemonWillType.CORROSIVE, corrosiveCrystals); - growCrystal(world, steadfastPos, EnumDemonWillType.STEADFAST, steadfastCrystals); - growCrystal(world, destructivePos, EnumDemonWillType.DESTRUCTIVE, destructiveCrystals); - rawTile.markDirty(); - world.notifyBlockUpdate(rawPos, rawState, rawState, 3); - } - } - - public Direction rotateFacing(Direction facing, Direction rotation) { - switch (rotation) { - case EAST: - return facing.rotateY(); - case SOUTH: - return facing.rotateY().rotateY(); - case WEST: - return facing.rotateYCCW(); - case NORTH: - default: - return facing; - } - } - - public void growCrystal(World world, BlockPos pos, EnumDemonWillType type, int currentCrystalCount) { - if (currentCrystalCount <= 0) { - world.setBlockState(pos, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal()), 3); - } else { - TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); - tile.crystalCount++; - tile.markDirty(); - BlockState state = world.getBlockState(pos); - world.notifyBlockUpdate(pos, state, state, 3); - } - } - - @Override - public int getRefreshTime() { - return 20; - } - - @Override - public int getRefreshCost() { - return 1000; - } - - @Override - public void gatherComponents(Consumer components) { - addRune(components, 0, 0, -1, EnumRuneType.FIRE); - addRune(components, 1, 0, 0, EnumRuneType.EARTH); - addRune(components, 0, 0, 1, EnumRuneType.WATER); - addRune(components, -1, 0, 0, EnumRuneType.AIR); - - this.addOffsetRunes(components, 1, 2, -1, EnumRuneType.DUSK); - this.addCornerRunes(components, 1, 0, EnumRuneType.BLANK); - this.addParallelRunes(components, 2, 0, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() { - return new RitualCrystalSplit(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info")}; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java deleted file mode 100644 index 9e6a33bd..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java +++ /dev/null @@ -1,238 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import java.util.function.Consumer; - -@RitualRegister("ellipsoid") -public class RitualEllipsoid extends Ritual { - public static final String SPHEROID_RANGE = "spheroidRange"; - public static final String CHEST_RANGE = "chest"; - - private boolean cached = false; - private BlockPos currentPos; //Offset - - public RitualEllipsoid() { - super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual"); - addBlockRange(SPHEROID_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), new BlockPos(11, 11, 11))); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(SPHEROID_RANGE, 0, 32, 32); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - AreaDescriptor sphereRange = masterRitualStone.getBlockRange(SPHEROID_RANGE); - AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos); - int minX = (int) (masterPos.getX() - sphereBB.minX); - int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1; - int minY = (int) (masterPos.getY() - sphereBB.minY); - int maxY = (int) (sphereBB.maxY - masterPos.getY()) - 1; - int minZ = (int) (masterPos.getZ() - sphereBB.minZ); - int maxZ = (int) (sphereBB.maxZ - masterPos.getZ()) - 1; - - if (tileInventory != null) { - if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { - IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); - - if (itemHandler.getSlots() <= 0) { - return; - } - - int blockSlot = -1; - for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) { - ItemStack stack = itemHandler.extractItem(invSlot, 1, true); - if (stack.isEmpty() || !(stack.getItem() instanceof BlockItem)) - continue; - - blockSlot = invSlot; - break; - } - - if (blockSlot == -1) { - return; - } - - int xR = Math.max(maxX, minX); - int yR = Math.max(maxY, minY); - int zR = Math.max(maxZ, minZ); - - int j = -minX; - int i = -minY; - int k = -minZ; - - if (currentPos != null) { - j = currentPos.getY(); - i = Math.min(xR, Math.max(-minX, currentPos.getX())); - k = Math.min(zR, Math.max(-minZ, currentPos.getZ())); - } - int checks = 0; - int maxChecks = 100; - - while (j <= maxY) { - while (i <= maxX) { - while (k <= maxZ) { - checks++; - if (checks >= maxChecks) { - this.currentPos = new BlockPos(i, j, k); - return; - } - - if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) { - BlockPos newPos = masterPos.add(i, j, k); -// - if (!world.getBlockState(newPos).getBlock().isReplaceable(world, newPos)) { - k++; - continue; - } - - BlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(blockSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(blockSlot).getItemDamage()); - world.setBlockState(newPos, placeState); - - itemHandler.extractItem(blockSlot, 1, false); - tileInventory.markDirty(); - //TODO: - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - k++; - this.currentPos = new BlockPos(i, j, k); - return; - } - k++; - } - i++; - k = -minZ; - } - j++; - i = -minX; - this.currentPos = new BlockPos(i, j, k); - return; - } - - j = -minY; - this.currentPos = new BlockPos(i, j, k); - return; - } - } - } - - public boolean checkIfEllipsoidShell(int xR, int yR, int zR, int xOff, int yOff, int zOff) { - //Checking shell in the x-direction - if (!checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) { - return false; - } - - return !((checkIfEllipsoid(xR, yR, zR, xOff + 1, yOff, zOff) && checkIfEllipsoid(xR, yR, zR, xOff - 1, yOff, zOff)) && (checkIfEllipsoid(xR, yR, zR, xOff, yOff + 1, zOff) && checkIfEllipsoid(xR, yR, zR, xOff, yOff - 1, zOff)) && (checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff + 1) && checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff - 1))); -// if (xOff * xOff + yOff * yOff + zOff * zOff >= (xR - 0.5) * (xR - 0.5) && xOff * xOff + yOff * yOff + zOff * zOff <= (xR + 0.5) * (xR + 0.5)) -// if (checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) -// { -// if (xOff * xOff / ((xR - 0.5) * (xR - 0.5)) + yOff * yOff / ((yR - 0.5) * (yR - 0.5)) >= 1 - zOff * zOff / ((zR + possOffset) * (zR + possOffset))) -// { -// return true; -// } -// -// if (xOff * xOff / ((xR - 0.5) * (xR - 0.5)) + zOff * zOff / ((zR - 0.5) * (zR - 0.5)) >= 1 - yOff * yOff / ((yR + possOffset) * (yR + possOffset))) -// { -// return true; -// } -// -// if (zOff * zOff / ((zR - 0.5) * (zR - 0.5)) + yOff * yOff / ((yR - 0.5) * (yR - 0.5)) >= 1 - xOff * xOff / ((xR + possOffset) * (xR + possOffset))) -// { -// return true; -// } -// } -// return false; - } - - public boolean checkIfEllipsoid(float xR, float yR, float zR, float xOff, float yOff, float zOff) { - float possOffset = 0.5f; - return xOff * xOff / ((xR + possOffset) * (xR + possOffset)) + yOff * yOff / ((yR + possOffset) * (yR + possOffset)) + zOff * zOff / ((zR + possOffset) * (zR + possOffset)) <= 1; - } - - @Override - public int getRefreshCost() { - return 5; - } - - @Override - public int getRefreshTime() { - return 1; - } - -// @Override -// public void readFromNBT(NBTTagCompound tag) -// { -// super.readFromNBT(tag); -// tag -// } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - - addRune(components, 4, 0, 0, EnumRuneType.FIRE); - addRune(components, 5, 0, 0, EnumRuneType.FIRE); - addRune(components, 5, 0, -1, EnumRuneType.FIRE); - addRune(components, 5, 0, -2, EnumRuneType.FIRE); - addRune(components, -4, 0, 0, EnumRuneType.FIRE); - addRune(components, -5, 0, 0, EnumRuneType.FIRE); - addRune(components, -5, 0, 1, EnumRuneType.FIRE); - addRune(components, -5, 0, 2, EnumRuneType.FIRE); - - addRune(components, 0, 0, 4, EnumRuneType.AIR); - addRune(components, 0, 0, 5, EnumRuneType.AIR); - addRune(components, 1, 0, 5, EnumRuneType.AIR); - addRune(components, 2, 0, 5, EnumRuneType.AIR); - addRune(components, 0, 0, -4, EnumRuneType.AIR); - addRune(components, 0, 0, -5, EnumRuneType.AIR); - addRune(components, -1, 0, -5, EnumRuneType.AIR); - addRune(components, -2, 0, -5, EnumRuneType.AIR); - - addRune(components, 3, 0, 1, EnumRuneType.EARTH); - addRune(components, 3, 0, 2, EnumRuneType.EARTH); - addRune(components, 3, 0, 3, EnumRuneType.EARTH); - addRune(components, 2, 0, 3, EnumRuneType.EARTH); - addRune(components, -3, 0, -1, EnumRuneType.EARTH); - addRune(components, -3, 0, -2, EnumRuneType.EARTH); - addRune(components, -3, 0, -3, EnumRuneType.EARTH); - addRune(components, -2, 0, -3, EnumRuneType.EARTH); - - addRune(components, 1, 0, -3, EnumRuneType.WATER); - addRune(components, 2, 0, -3, EnumRuneType.WATER); - addRune(components, 3, 0, -3, EnumRuneType.WATER); - addRune(components, 3, 0, -2, EnumRuneType.WATER); - addRune(components, -1, 0, 3, EnumRuneType.WATER); - addRune(components, -2, 0, 3, EnumRuneType.WATER); - addRune(components, -3, 0, 3, EnumRuneType.WATER); - addRune(components, -3, 0, 2, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() { - return new RitualEllipsoid(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java deleted file mode 100644 index 5c03479f..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java +++ /dev/null @@ -1,139 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; - -import java.util.List; -import java.util.UUID; -import java.util.function.Consumer; - -@RitualRegister("eternal_soul") -public class RitualEternalSoul extends Ritual { - public static final String ALTAR_RANGE = "altar"; - - private BlockPos altarOffsetPos = new BlockPos(0, 0, 0); - - public RitualEternalSoul() { - super("ritualEternalSoul", 2, 2000000, "ritual." + BloodMagic.MODID + ".eternalSoulRitual"); - addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); - - setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - UUID owner = masterRitualStone.getOwner(); - int currentEssence = NetworkHelper.getSoulNetwork(owner).getCurrentEssence(); - World world = masterRitualStone.getWorldObj(); - BlockPos pos = masterRitualStone.getBlockPos(); - BlockPos altarPos = pos.add(altarOffsetPos); - - TileEntity tile = world.getTileEntity(altarPos); - AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); - - if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) { - for (BlockPos newPos : altarRange.getContainedPositions(pos)) { - TileEntity nextTile = world.getTileEntity(newPos); - if (nextTile instanceof TileAltar) { - tile = nextTile; - altarOffsetPos = newPos.subtract(pos); - - altarRange.resetCache(); - break; - } - } - } - - if (!(tile instanceof TileAltar)) { - return; - } - - BloodAltar altar = (BloodAltar) tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); - - int horizontalRange = 15; - int verticalRange = 20; - - List list = world.getEntitiesWithinAABB(PlayerEntity.class, - new AxisAlignedBB(pos.getX() - 0.5f, pos.getY() - 0.5f, pos.getZ() - 0.5f, - pos.getX() + 0.5f, pos.getY() + 0.5f, pos.getZ() + 0.5f) - .expand(horizontalRange, verticalRange, horizontalRange).expand(0, -verticalRange, 0)); - - PlayerEntity entityOwner = PlayerHelper.getPlayerFromUUID(owner); - - int fillAmount = Math.min(currentEssence / 2, altar.fill(new FluidStack(BlockLifeEssence.getLifeEssence(), 10000), false)); - - altar.fill(new FluidStack(BlockLifeEssence.getLifeEssence(), fillAmount), true); - - if (entityOwner != null && list.contains(entityOwner) && entityOwner.getHealth() > 2.0f && fillAmount != 0) - entityOwner.setHealth(2.0f); - - for (PlayerEntity player : list) - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, 100)); - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(fillAmount * 2)); - - } - - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.FIRE); - - for (int i = 0; i < 4; i++) { - addCornerRunes(components, 2, i, EnumRuneType.AIR); - } - - addCornerRunes(components, 4, 1, EnumRuneType.EARTH); - - addOffsetRunes(components, 3, 4, 1, EnumRuneType.EARTH); - - - for (int i = 0; i < 2; i++) { - addCornerRunes(components, 4, i + 2, EnumRuneType.WATER); - } - - addCornerRunes(components, 4, 4, EnumRuneType.DUSK); - - addOffsetRunes(components, 6, 5, 0, EnumRuneType.FIRE); - - - for (int i = 0; i < 2; i++) { - addCornerRunes(components, 6, i, EnumRuneType.FIRE); - } - - for (int i = 0; i < 3; i++) { - addCornerRunes(components, 6, i + 2, EnumRuneType.BLANK); - } - - addCornerRunes(components, 6, 5, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() { - return new RitualEternalSoul(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java deleted file mode 100644 index 0ec231d5..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java +++ /dev/null @@ -1,237 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.Utils; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; -import java.util.Random; -import java.util.UUID; -import java.util.function.Consumer; - -@RitualRegister("expulsion") -public class RitualExpulsion extends Ritual { - public static final String EXPULSION_RANGE = "expulsionRange"; - - public RitualExpulsion() { - super("ritualExpulsion", 0, 10000, "ritual." + BloodMagic.MODID + ".expulsionRitual"); - addBlockRange(EXPULSION_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-12, 0, -12), 25)); - setMaximumVolumeAndDistanceOfRange(EXPULSION_RANGE, 0, 12, 12); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - if (masterRitualStone.getWorldObj().isRemote) - return; - - AreaDescriptor expulsionRange = masterRitualStone.getBlockRange(EXPULSION_RANGE); - - List whitelist = Lists.newArrayList(); - BlockPos masterPos = masterRitualStone.getBlockPos(); - TileEntity tile = world.getTileEntity(masterPos.up()); - - if (tile != null) { - IItemHandler handler = Utils.getInventory(tile, null); - if (handler != null) { - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack itemStack = handler.getStackInSlot(i); - if (!itemStack.isEmpty() && itemStack.getItem() instanceof IBindable) { - Binding binding = ((IBindable) itemStack.getItem()).getBinding(itemStack); - if (binding != null && !whitelist.contains(binding.getOwnerId())) - whitelist.add(binding.getOwnerId()); - } - } - } - } - - final int teleportDistance = 100; - - for (PlayerEntity player : world.getEntitiesWithinAABB(PlayerEntity.class, expulsionRange.getAABB(masterRitualStone.getBlockPos()))) { - if (player.capabilities.isCreativeMode || player.getGameProfile().getId().equals(masterRitualStone.getOwner()) || whitelist.contains(player.getGameProfile().getId())) - continue; - - if (teleportRandomly(player, teleportDistance)) - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * 1000)); - } - - whitelist.clear(); - } - - public boolean teleportRandomly(LivingEntity entityLiving, double distance) { - if (entityLiving instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entityLiving; - if (player.capabilities.isCreativeMode) - return false; - } - - double x = entityLiving.posX; - double y = entityLiving.posY; - double z = entityLiving.posZ; - Random rand = new Random(); - double randX = x + (rand.nextDouble() - 0.5D) * distance; - double randY = y + (rand.nextInt((int) distance) - (distance) / 2); - double randZ = z + (rand.nextDouble() - 0.5D) * distance; - int i = 0; - - while (!teleportTo(entityLiving, randX, randY, randZ, x, y, z) && i < 100) { - randX = x + (rand.nextDouble() - 0.5D) * distance; - randY = y + (rand.nextInt((int) distance) - (distance) / 2); - randZ = z + (rand.nextDouble() - 0.5D) * distance; - i++; - } - - return i >= 100; - } - - public boolean teleportTo(LivingEntity entityLiving, double par1, double par3, double par5, double lastX, double lastY, double lastZ) { - EnderTeleportEvent event = new EnderTeleportEvent(entityLiving, par1, par3, par5, 0); - - if (MinecraftForge.EVENT_BUS.post(event)) { - return false; - } - - moveEntityViaTeleport(entityLiving, event.getTargetX(), event.getTargetY(), event.getTargetZ()); - boolean flag = false; - int i = MathHelper.floor(entityLiving.posX); - int j = MathHelper.floor(entityLiving.posY); - int k = MathHelper.floor(entityLiving.posZ); - int l; - - if (!entityLiving.getEntityWorld().isAirBlock(new BlockPos(i, j, k))) { - boolean flag1 = false; - - while (!flag1 && j > 0) { - BlockState state = entityLiving.getEntityWorld().getBlockState(new BlockPos(i, j - 1, k)); - - if (state.getMaterial().blocksMovement()) { - flag1 = true; - } else { - --entityLiving.posY; - --j; - } - } - - if (flag1) { - moveEntityViaTeleport(entityLiving, entityLiving.posX, entityLiving.posY, entityLiving.posZ); - - if (!entityLiving.collided && !entityLiving.getEntityWorld().containsAnyLiquid(entityLiving.getEntityBoundingBox())) { - flag = true; - } - } - } - - if (!flag) { - moveEntityViaTeleport(entityLiving, lastX, lastY, lastZ); - return false; - } else { - for (l = 0; l < 128; ++l) { - double lengthVal = (double) l / ((double) 128 - 1.0D); - float randF1 = (entityLiving.getEntityWorld().rand.nextFloat() - 0.5F) * 0.2F; - float randF2 = (entityLiving.getEntityWorld().rand.nextFloat() - 0.5F) * 0.2F; - float randF3 = (entityLiving.getEntityWorld().rand.nextFloat() - 0.5F) * 0.2F; - double lengthValX = lastX + (entityLiving.posX - lastX) * lengthVal + (entityLiving.getEntityWorld().rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D; - double lengthValY = lastY + (entityLiving.posY - lastY) * lengthVal + entityLiving.getEntityWorld().rand.nextDouble() * (double) entityLiving.height; - double lengthValZ = lastZ + (entityLiving.posZ - lastZ) * lengthVal + (entityLiving.getEntityWorld().rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D; - entityLiving.getEntityWorld().spawnParticle(EnumParticleTypes.PORTAL, lengthValX, lengthValY, lengthValZ, (double) randF1, (double) randF2, (double) randF3); - } - - return true; - } - } - - public void moveEntityViaTeleport(LivingEntity entityLiving, double x, double y, double z) { - if (entityLiving instanceof ServerPlayerEntity) { - ServerPlayerEntity player = (ServerPlayerEntity) entityLiving; - - EnderTeleportEvent event = new EnderTeleportEvent(player, x, y, z, 5.0F); - - if (!MinecraftForge.EVENT_BUS.post(event)) { - if (entityLiving.isRiding()) - player.mountEntityAndWakeUp(); - - entityLiving.setPositionAndUpdate(event.getTargetX(), event.getTargetY(), event.getTargetZ()); - } - } else if (entityLiving != null) { - entityLiving.setPosition(x, y, z); - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 2; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 2, 0, EnumRuneType.EARTH); - addRune(components, 2, 0, 1, EnumRuneType.EARTH); - addRune(components, 1, 0, 2, EnumRuneType.EARTH); - addRune(components, 2, 0, -1, EnumRuneType.EARTH); - addRune(components, -1, 0, 2, EnumRuneType.EARTH); - addRune(components, -2, 0, 1, EnumRuneType.EARTH); - addRune(components, 1, 0, -2, EnumRuneType.EARTH); - addRune(components, -2, 0, -1, EnumRuneType.EARTH); - addRune(components, -1, 0, -2, EnumRuneType.EARTH); - addRune(components, 4, 0, 2, EnumRuneType.AIR); - addRune(components, 5, 0, 2, EnumRuneType.AIR); - addRune(components, 4, 0, -2, EnumRuneType.AIR); - addRune(components, 5, 0, -2, EnumRuneType.AIR); - addRune(components, -4, 0, 2, EnumRuneType.AIR); - addRune(components, -5, 0, 2, EnumRuneType.AIR); - addRune(components, -4, 0, -2, EnumRuneType.AIR); - addRune(components, -5, 0, -2, EnumRuneType.AIR); - addRune(components, 2, 0, 4, EnumRuneType.AIR); - addRune(components, 2, 0, 5, EnumRuneType.AIR); - addRune(components, -2, 0, 4, EnumRuneType.AIR); - addRune(components, -2, 0, 5, EnumRuneType.AIR); - addRune(components, 2, 0, -4, EnumRuneType.AIR); - addRune(components, 2, 0, -5, EnumRuneType.AIR); - addRune(components, -2, 0, -4, EnumRuneType.AIR); - addRune(components, -2, 0, -5, EnumRuneType.AIR); - addParallelRunes(components, 5, 0, EnumRuneType.DUSK); - addParallelRunes(components, 6, 0, EnumRuneType.EARTH); - addRune(components, -6, 0, 1, EnumRuneType.DUSK); - addRune(components, -6, 0, -1, EnumRuneType.DUSK); - addRune(components, 6, 0, 1, EnumRuneType.DUSK); - addRune(components, 6, 0, -1, EnumRuneType.DUSK); - addRune(components, 1, 0, 6, EnumRuneType.DUSK); - addRune(components, -1, 0, 6, EnumRuneType.DUSK); - addRune(components, 1, 0, -6, EnumRuneType.DUSK); - addRune(components, -1, 0, -6, EnumRuneType.DUSK); - addCornerRunes(components, 4, 0, EnumRuneType.FIRE); - } - - @Override - public Ritual getNewCopy() { - return new RitualExpulsion(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java deleted file mode 100644 index ea4d70e8..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredEarth.java +++ /dev/null @@ -1,93 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("feathered_earth") -public class RitualFeatheredEarth extends Ritual { - public static final String FALL_PROTECTION_RANGE = "fallProtRange"; - - public RitualFeatheredEarth() { - super("ritualFeatheredEarth", 0, 5000, "ritual." + BloodMagic.MODID + ".featheredEarthRitual"); - addBlockRange(FALL_PROTECTION_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-25, 0, -25), new BlockPos(25, 30, 25))); - setMaximumVolumeAndDistanceOfRange(FALL_PROTECTION_RANGE, 0, 200, 200); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - double x = pos.getX(); - double y = pos.getY(); - double z = pos.getZ(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - if (masterRitualStone.getCooldown() > 0) { - world.addWeatherEffect(new LightningBoltEntity(world, x + 4, y + 5, z + 4, false)); - world.addWeatherEffect(new LightningBoltEntity(world, x + 4, y + 5, z - 4, false)); - world.addWeatherEffect(new LightningBoltEntity(world, x - 4, y + 5, z - 4, false)); - world.addWeatherEffect(new LightningBoltEntity(world, x - 4, y + 5, z + 4, false)); - masterRitualStone.setCooldown(0); - } - - AreaDescriptor fallProtRange = masterRitualStone.getBlockRange(FALL_PROTECTION_RANGE); - AxisAlignedBB fallProtBB = fallProtRange.getAABB(masterRitualStone.getBlockPos()); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, fallProtBB); - - for (LivingEntity entity : entities) { - if (totalEffects >= maxEffects) { - break; - } - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FEATHERED, 20, 0)); - totalEffects++; - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 10; - } - - @Override - public int getRefreshCost() { - return 5; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 0, EnumRuneType.AIR); - addOffsetRunes(components, 1, 3, 0, EnumRuneType.EARTH); - addParallelRunes(components, 3, 0, EnumRuneType.EARTH); - addCornerRunes(components, 4, 4, EnumRuneType.FIRE); - addOffsetRunes(components, 4, 5, 5, EnumRuneType.AIR); - addOffsetRunes(components, 3, 4, 5, EnumRuneType.AIR); - } - - - @Override - public Ritual getNewCopy() { - return new RitualFeatheredEarth(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java deleted file mode 100644 index 9fe7fa5a..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ /dev/null @@ -1,220 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.altar.IBloodAltar; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("feathered_knife") -public class RitualFeatheredKnife extends Ritual { - public static final String ALTAR_RANGE = "altar"; - public static final String DAMAGE_RANGE = "damage"; - - public static double rawWillDrain = 0.05; - public static double destructiveWillDrain = 0.05; - public static double corrosiveWillThreshold = 10; - public static double steadfastWillThreshold = 10; - public static double vengefulWillThreshold = 10; - public static int defaultRefreshTime = 20; - public int refreshTime = 20; - public BlockPos altarOffsetPos = new BlockPos(0, 0, 0); //TODO: Save! - - public RitualFeatheredKnife() { - super("ritualFeatheredKnife", 0, 25000, "ritual." + BloodMagic.MODID + ".featheredKnifeRitual"); - addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); - addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -20, -15), 31, 41, 31)); - - setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); - setMaximumVolumeAndDistanceOfRange(DAMAGE_RANGE, 0, 25, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - BlockPos altarPos = pos.add(altarOffsetPos); - - TileEntity tile = world.getTileEntity(altarPos); - - AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); - - if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof IBloodAltar)) { - for (BlockPos newPos : altarRange.getContainedPositions(pos)) { - TileEntity nextTile = world.getTileEntity(newPos); - if (nextTile instanceof IBloodAltar) { - tile = nextTile; - altarOffsetPos = newPos.subtract(pos); - - altarRange.resetCache(); - break; - } - } - } - - boolean useIncense = corrosiveWill >= corrosiveWillThreshold; - - if (tile instanceof IBloodAltar) { - IBloodAltar tileAltar = (IBloodAltar) tile; - - AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); - AxisAlignedBB range = damageRange.getAABB(pos); - - double destructiveDrain = 0; - - List entities = world.getEntitiesWithinAABB(PlayerEntity.class, range); - - for (PlayerEntity player : entities) { - float healthThreshold = steadfastWill >= steadfastWillThreshold ? 0.7f : 0.3f; - - if (vengefulWill >= vengefulWillThreshold && !player.getGameProfile().getId().equals(masterRitualStone.getOwner())) { - healthThreshold = 0.1f; - } - - float health = player.getHealth(); - float maxHealth = player.getMaxHealth(); - - float sacrificedHealth = 1; - double lpModifier = 1; - - if ((health / player.getMaxHealth() > healthThreshold) && (!useIncense || !player.isPotionActive(RegistrarBloodMagic.SOUL_FRAY))) { - if (useIncense) { - double incenseAmount = PlayerSacrificeHelper.getPlayerIncense(player); - - sacrificedHealth = health - maxHealth * healthThreshold; - lpModifier *= PlayerSacrificeHelper.getModifier(incenseAmount); - - PlayerSacrificeHelper.setPlayerIncense(player, 0); - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, PlayerSacrificeHelper.soulFrayDuration)); - } - - if (destructiveWill >= destructiveWillDrain * sacrificedHealth) { - lpModifier *= getLPModifierForWill(destructiveWill); - destructiveWill -= destructiveWillDrain * sacrificedHealth; - destructiveDrain += destructiveWillDrain * sacrificedHealth; - } - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack); - - if (upgrade instanceof LivingArmourUpgradeSelfSacrifice) { - double modifier = ((LivingArmourUpgradeSelfSacrifice) upgrade).getSacrificeModifier(); - - lpModifier *= (1 + modifier); - } - } - } - - player.setHealth(health - sacrificedHealth); - - tileAltar.sacrificialDaggerCall((int) (ConfigHandler.values.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false); - - totalEffects++; - - if (totalEffects >= maxEffects) { - break; - } - - } - } - - if (destructiveDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, destructiveDrain, true); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - if (totalEffects > 0 && consumeRawWill) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWillDrain, true); - } - } - - @Override - public int getRefreshTime() { - return refreshTime; - } - - @Override - public int getRefreshCost() { - return 20; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 1, 0, EnumRuneType.DUSK); - addParallelRunes(components, 2, -1, EnumRuneType.WATER); - addCornerRunes(components, 1, -1, EnumRuneType.AIR); - addOffsetRunes(components, 2, 4, -1, EnumRuneType.FIRE); - addOffsetRunes(components, 2, 4, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); - addCornerRunes(components, 3, 0, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() { - return new RitualFeatheredKnife(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; - } - - public double getLPModifierForWill(double destructiveWill) { - return 1 + destructiveWill * 0.2 / 100; - } - - public int getRefreshTimeForRawWill(double rawWill) { - if (rawWill >= rawWillDrain) { - return 10; - } - - return defaultRefreshTime; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java deleted file mode 100644 index 78a31db5..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java +++ /dev/null @@ -1,110 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.BlockState; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.function.Consumer; - -@RitualRegister("felling") -public class RitualFelling extends Ritual { - public static final String FELLING_RANGE = "fellingRange"; - public static final String CHEST_RANGE = "chest"; - - private ArrayList treePartsCache; - private Iterator blockPosIterator; - - private boolean cached = false; - private BlockPos currentPos; - - public RitualFelling() { - super("ritualFelling", 0, 20000, "ritual." + BloodMagic.MODID + ".fellingRitual"); - addBlockRange(FELLING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -3, -10), new BlockPos(11, 27, 11))); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(FELLING_RANGE, 14000, 15, 30); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - - treePartsCache = new ArrayList<>(); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - if (!cached || treePartsCache.isEmpty()) { - for (BlockPos blockPos : masterRitualStone.getBlockRange(FELLING_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { - if (!treePartsCache.contains(blockPos)) - if (!world.isAirBlock(blockPos) && (world.getBlockState(blockPos).getBlock().isWood(world, blockPos) || world.getBlockState(blockPos).getBlock().isLeaves(world.getBlockState(blockPos), world, blockPos))) { - treePartsCache.add(blockPos); - } - } - - cached = true; - blockPosIterator = treePartsCache.iterator(); - } - - if (blockPosIterator.hasNext() && tileInventory != null) { - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - currentPos = blockPosIterator.next(); - IItemHandler inventory = Utils.getInventory(tileInventory, Direction.DOWN); - placeInInventory(world.getBlockState(currentPos), world, currentPos, inventory); - world.setBlockToAir(currentPos); - blockPosIterator.remove(); - } - } - - @Override - public int getRefreshCost() { - return 10; - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - addCornerRunes(components, 1, 1, EnumRuneType.EARTH); - } - - @Override - public Ritual getNewCopy() { - return new RitualFelling(); - } - - private void placeInInventory(BlockState choppedState, World world, BlockPos choppedPos, @Nullable IItemHandler inventory) { - if (inventory == null) - return; - - for (ItemStack stack : choppedState.getBlock().getDrops(world, choppedPos, world.getBlockState(choppedPos), 0)) { - ItemStack remainder = ItemHandlerHelper.insertItem(inventory, stack, false); - if (!remainder.isEmpty()) - world.spawnEntity(new ItemEntity(world, choppedPos.getX() + 0.4, choppedPos.getY() + 2, choppedPos.getZ() + 0.4, remainder)); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java deleted file mode 100644 index 30dbc856..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ /dev/null @@ -1,198 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.tile.TileDemonCrystal; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityRegistry; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("forsaken_soul") -public class RitualForsakenSoul extends Ritual { - public static final String CRYSTAL_RANGE = "crystal"; - public static final String DAMAGE_RANGE = "damage"; - public static final int MAX_UNIQUENESS = 10; - - public static final int HEALTH_THRESHOLD = 20; - - public double willBuffer = 0; - public double crystalBuffer = 0; - - public List keyList = new ArrayList<>(); - - public RitualForsakenSoul() { - super("ritualForsakenSoul", 0, 40000, "ritual." + BloodMagic.MODID + ".forsakenSoulRitual"); - addBlockRange(CRYSTAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 2, -3), 7, 5, 7)); - addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), 21)); - - setMaximumVolumeAndDistanceOfRange(CRYSTAL_RANGE, 250, 5, 7); - setMaximumVolumeAndDistanceOfRange(DAMAGE_RANGE, 0, 10, 10); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - super.readFromNBT(tag); - - willBuffer = tag.getDouble("willBuffer"); - crystalBuffer = tag.getDouble("crystalBuffer"); - - keyList.clear(); - for (int i = 0; i < MAX_UNIQUENESS; i++) { - String key = "uniq" + i; - if (tag.hasKey(key)) { - keyList.add(tag.getInt(key)); - } - } - } - - @Override - public void writeToNBT(CompoundNBT tag) { - super.writeToNBT(tag); - - tag.putDouble("willBuffer", willBuffer); - tag.putDouble("crystalBuffer", crystalBuffer); - - for (int i = 0; i < Math.min(MAX_UNIQUENESS, keyList.size()); i++) { - String key = "uniq" + i; - tag.putInt(key, keyList.get(i)); - } - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = 100; - int totalEffects = 0; - - List crystalList = new ArrayList<>(); - - AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE); - - crystalRange.resetIterator(); - while (crystalRange.hasNext()) { - BlockPos nextPos = crystalRange.next().add(pos); - TileEntity tile = world.getTileEntity(nextPos); - if (tile instanceof TileDemonCrystal) { - crystalList.add((TileDemonCrystal) tile); - } - } - - AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); - AxisAlignedBB range = damageRange.getAABB(pos); - - List entities = world.getEntitiesWithinAABB(LivingEntity.class, range); - - for (LivingEntity entity : entities) { - EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); - - if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) - continue; - - if (entity.isEntityAlive() && !(entity instanceof PlayerEntity)) { - if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) { - if (!entity.isEntityAlive()) { - int uniqueness = calculateUniqueness(entity); - double modifier = 1; - if (entity instanceof AnimalEntity && !((AnimalEntity) entity).collided) { - modifier = 4; - } - - willBuffer += modifier * getWillForUniqueness(uniqueness) / HEALTH_THRESHOLD * entity.getMaxHealth(); - crystalBuffer += modifier * entity.getMaxHealth() / HEALTH_THRESHOLD; - - totalEffects++; - if (totalEffects >= maxEffects) { - break; - } - } - } - } - } - - if (crystalList.size() > 0 && crystalBuffer > 0) { - double growth = Math.min(crystalBuffer, 1); - double willSyphonAmount = growth * willBuffer / crystalBuffer; - TileDemonCrystal chosenCrystal = crystalList.get(world.rand.nextInt(crystalList.size())); - double percentageGrowth = chosenCrystal.growCrystalWithWillAmount(growth * willBuffer / crystalBuffer, growth); - if (percentageGrowth > 0) { - crystalBuffer -= percentageGrowth; - willBuffer -= percentageGrowth * willSyphonAmount; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - /** - * @param mob - * @return The amount of uniqueness to the last 10 mobs killed - */ - public int calculateUniqueness(LivingEntity mob) { - int key = mob.getClass().hashCode(); - keyList.add(key); - if (keyList.size() > MAX_UNIQUENESS) { - keyList.remove(0); - } - - List uniquenessList = new ArrayList<>(); - for (int value : keyList) { - if (!uniquenessList.contains(value)) { - uniquenessList.add(value); - } - } - - return Math.min(uniquenessList.size(), MAX_UNIQUENESS); - } - - public double getWillForUniqueness(int uniqueness) { - return Math.max(50 - 15 * Math.sqrt(uniqueness), 0); - } - - @Override - public int getRefreshTime() { - return 25; - } - - @Override - public int getRefreshCost() { - return 2; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.AIR); - addParallelRunes(components, 1, -1, EnumRuneType.DUSK); - addParallelRunes(components, 1, 1, EnumRuneType.FIRE); - addParallelRunes(components, 2, 1, EnumRuneType.FIRE); - addParallelRunes(components, 3, 1, EnumRuneType.FIRE); - addOffsetRunes(components, 3, 1, 1, EnumRuneType.FIRE); - addCornerRunes(components, 3, 1, EnumRuneType.EARTH); - addCornerRunes(components, 3, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 2, 0, EnumRuneType.EARTH); - } - - @Override - public Ritual getNewCopy() { - return new RitualForsakenSoul(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java deleted file mode 100644 index 3a193e91..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java +++ /dev/null @@ -1,109 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.FoodStats; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("full_stomach") -public class RitualFullStomach extends Ritual { - public static final String FILL_RANGE = "fillRange"; - public static final String CHEST_RANGE = "chest"; - - public RitualFullStomach() { - super("ritualFullStomach", 0, 100000, "ritual." + BloodMagic.MODID + ".fullStomachRitual"); - addBlockRange(FILL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-25, -25, -25), 51)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(FILL_RANGE, 0, 25, 25); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - BlockPos pos = masterRitualStone.getBlockPos(); - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - if (tile == null || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) - return; - - IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - int lastSlot = 0; - AreaDescriptor fillingRange = masterRitualStone.getBlockRange(FILL_RANGE); - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, fillingRange.getAABB(pos)); - - for (PlayerEntity player : playerList) { - FoodStats foodStats = player.getFoodStats(); - float satLevel = foodStats.getSaturationLevel(); - - for (int i = lastSlot; i < inventory.getSlots(); i++) { - ItemStack stack = inventory.extractItem(i, 1, true); - if (!stack.isEmpty() && stack.getItem() instanceof ItemFood) { - ItemFood foodItem = (ItemFood) stack.getItem(); - - int healAmount = foodItem.getHealAmount(stack); - float saturationAmount = foodItem.getSaturationModifier(stack) * healAmount * 2.0f; - - // Checks to make sure we're being efficient with the food and not wasting high value foods - // If the food provides more than the max saturation, we just accept it no matter what if the player is low - // Pam please stop being weird. Fix your mod. - if (saturationAmount + satLevel <= 20 || satLevel < 5) { - foodStats.addStats(foodItem, stack); - inventory.extractItem(i, 1, false); - totalEffects++; - lastSlot = i; - break; - } - } - } - - if (totalEffects >= maxEffects) { - masterRitualStone.getOwnerNetwork().causeNausea(); - break; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 20; - } - - @Override - public int getRefreshCost() { - return 100; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 3, 0, EnumRuneType.FIRE); - addCornerRunes(components, 1, 0, EnumRuneType.AIR); - addOffsetRunes(components, 1, 2, 0, EnumRuneType.AIR); - addCornerRunes(components, 4, 0, EnumRuneType.WATER); - addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); - } - - @Override - public Ritual getNewCopy() { - return new RitualFullStomach(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java deleted file mode 100644 index f1ff9f71..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ /dev/null @@ -1,277 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.*; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; -import java.util.function.Consumer; - -@RitualRegister("green_grove") -public class RitualGreenGrove extends Ritual { - public static final String GROW_RANGE = "growing"; - public static final String LEECH_RANGE = "leech"; - public static final String HYDRATE_RANGE = "hydrate"; - - public static double corrosiveWillDrain = 0.2; - public static double rawWillDrain = 0.05; - public static double vengefulWillDrain = 0.05; - public static double steadfastWillDrain = 0.05; - public static int defaultRefreshTime = 20; - public static double defaultGrowthChance = 0.3; - public static BlockState farmlandState = Blocks.FARMLAND.getDefaultState().withProperty(FarmlandBlock.MOISTURE, 7); - public int refreshTime = 20; - - public RitualGreenGrove() { - super("ritualGreenGrove", 0, 5000, "ritual." + BloodMagic.MODID + ".greenGroveRitual"); - addBlockRange(GROW_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 2, -1), 3, 1, 3)); - addBlockRange(LEECH_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - addBlockRange(HYDRATE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - setMaximumVolumeAndDistanceOfRange(GROW_RANGE, 81, 4, 4); - setMaximumVolumeAndDistanceOfRange(LEECH_RANGE, 0, 15, 15); - setMaximumVolumeAndDistanceOfRange(HYDRATE_RANGE, 0, 15, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - BlockPos pos = masterRitualStone.getBlockPos(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxGrowths = currentEssence / getRefreshCost(); - int totalGrowths = 0; - - List willConfig = masterRitualStone.getActiveWillConfig(); - - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - double growthChance = getPlantGrowthChanceForWill(vengefulWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - boolean consumeVengefulWill = vengefulWill >= vengefulWillDrain && growthChance != defaultGrowthChance; - - double rawDrain = 0; - double vengefulDrain = 0; - - AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROW_RANGE); - - int maxGrowthVolume = getMaxVolumeForRange(GROW_RANGE, willConfig, holder); - if (!growingRange.isWithinRange(getMaxVerticalRadiusForRange(GROW_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(GROW_RANGE, willConfig, holder)) || (maxGrowthVolume != 0 && growingRange.getVolume() > maxGrowthVolume)) { - return; - } - - for (BlockPos newPos : growingRange.getContainedPositions(pos)) { - BlockState state = world.getBlockState(newPos); - - if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { - boolean flag = state.getBlock() instanceof IGrowable || state.getBlock() instanceof CactusBlock || state.getBlock() instanceof SugarCaneBlock; - if (flag) { - if (world.rand.nextDouble() < growthChance) { - state.getBlock().updateTick(world, newPos, state, new Random()); - BlockState newState = world.getBlockState(newPos); - if (!newState.equals(state)) { - world.playEvent(2005, newPos, 0); - totalGrowths++; - if (consumeRawWill) { - rawWill -= rawWillDrain; - rawDrain += rawWillDrain; - } - - if (consumeVengefulWill) { - vengefulWill -= vengefulWillDrain; - vengefulDrain += vengefulWillDrain; - } - } - } - } - } - - if (totalGrowths >= maxGrowths || (consumeRawWill && rawWill < rawWillDrain) || (consumeVengefulWill && vengefulWill < vengefulWillDrain)) { - break; - } - } - - if (rawDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrain, true); - } - - if (vengefulDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); - } - - AreaDescriptor hydrateRange = masterRitualStone.getBlockRange(HYDRATE_RANGE); - - double steadfastDrain = 0; - if (steadfastWill > steadfastWillDrain) { - AxisAlignedBB aabb = hydrateRange.getAABB(pos); - steadfastDrain += steadfastWillDrain * Utils.plantSeedsInArea(world, aabb, 2, 1); - steadfastWill -= steadfastDrain; - - for (BlockPos newPos : hydrateRange.getContainedPositions(pos)) { - if (steadfastWill < steadfastWillDrain) { - break; - } - - BlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - - boolean hydratedBlock = false; - if (block == Blocks.DIRT || block == Blocks.GRASS) { - world.setBlockState(newPos, farmlandState); - hydratedBlock = true; - } else if (block == Blocks.FARMLAND) { - int meta = block.getMetaFromState(state); - if (meta < 7) { - world.setBlockState(newPos, farmlandState); - hydratedBlock = true; - } - } - - if (hydratedBlock) { - steadfastWill -= steadfastWillDrain; - steadfastDrain += steadfastWillDrain; - } - } - } - - if (steadfastDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrain, true); - } - - double corrosiveDrain = 0; - if (corrosiveWill > corrosiveWillDrain) { - AreaDescriptor leechRange = masterRitualStone.getBlockRange(LEECH_RANGE); - AxisAlignedBB mobArea = leechRange.getAABB(pos); - List entityList = world.getEntitiesWithinAABB(LivingEntity.class, mobArea); - for (LivingEntity entityLiving : entityList) { - if (corrosiveWill < corrosiveWillDrain) { - break; - } - - if (entityLiving instanceof PlayerEntity) { - continue; - } - - if (entityLiving.isPotionActive(RegistrarBloodMagic.PLANT_LEECH) || !entityLiving.isPotionApplicable(new EffectInstance(RegistrarBloodMagic.PLANT_LEECH))) { - continue; - } - - entityLiving.addPotionEffect(new EffectInstance(RegistrarBloodMagic.PLANT_LEECH, 200, 0)); - - corrosiveWill -= corrosiveWillDrain; - corrosiveDrain += corrosiveWillDrain; - } - - if (corrosiveDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrain, true); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalGrowths * getRefreshCost())); - } - - public double getPlantGrowthChanceForWill(double will) { - if (will > 0) { - return 0.3 + will / 200; - } - - return defaultGrowthChance; - } - - public int getRefreshTimeForRawWill(double rawWill) { - if (rawWill > 0) { - return 10; - } - - return defaultRefreshTime; - } - - @Override - public int getRefreshTime() { - return refreshTime; - } - - @Override - public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) { - if (GROW_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) { - return 81 + (int) Math.pow(destructiveWill / 4, 1.5); - } - } - - return volumeRangeMap.get(range); - } - - @Override - public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) { - if (GROW_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) { - return (int) (4 + destructiveWill / 10d); - } - } - - return verticalRangeMap.get(range); - } - - @Override - public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) { - if (GROW_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) { - return (int) (4 + destructiveWill / 10d); - } - } - - return horizontalRangeMap.get(range); - } - - @Override - public int getRefreshCost() { - return 20; //TODO: Need to find a way to balance this - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - addParallelRunes(components, 1, 0, EnumRuneType.WATER); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; - } - - @Override - public Ritual getNewCopy() { - return new RitualGreenGrove(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java deleted file mode 100644 index f3ee4078..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGrounding.java +++ /dev/null @@ -1,199 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.MoverType; -import net.minecraft.entity.boss.dragon.EnderDragonEntity; -import net.minecraft.entity.boss.WitherEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("grounding") -public class RitualGrounding extends Ritual { - - public static final int willRefreshTime = 20; - public static final String GROUNDING_RANGE = "groundingRange"; - public static final double willDrain = 0.5; - - public RitualGrounding() { - super("ritualGrounding", 0, 5000, "ritual." + BloodMagic.MODID + ".groundingRitual"); - addBlockRange(GROUNDING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, 0, -10), 21, 30, 21)); - setMaximumVolumeAndDistanceOfRange(GROUNDING_RANGE, 0, 200, 200); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - /* Default Ritual Stuff */ - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - /* Default will augment stuff */ - List willConfig = masterRitualStone.getActiveWillConfig(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - double rawDrained = 0; - double corrosiveDrained = 0; - double destructiveDrained = 0; - double steadfastDrained = 0; - double vengefulDrained = 0; - - /* Actual ritual stuff begins here */ - AreaDescriptor groundingRange = masterRitualStone.getBlockRange(GROUNDING_RANGE); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, groundingRange.getAABB(pos)); - for (LivingEntity entity : entities) { - if (totalEffects >= maxEffects) { - break; - } - - if (entity instanceof PlayerEntity && ((PlayerEntity) entity).isCreative()) - continue; - - totalEffects++; - - - if (entity instanceof PlayerEntity) { - /* Raw will effect: Affects players */ - if (world.getTotalWorldTime() % 10 == 0) { - if (rawWill >= willDrain) { - - rawDrained += willDrain; - - double[] drainagePlayer = sharedWillEffects(world, entity, corrosiveWill, destructiveWill, vengefulWill, corrosiveDrained, destructiveDrained, vengefulDrained); - - corrosiveDrained += drainagePlayer[0]; - destructiveDrained += drainagePlayer[1]; - vengefulDrained += drainagePlayer[2]; - } - } - } else if (entity.isNonBoss()) { - if (world.getTotalWorldTime() % 10 == 0) { - double[] drainageEntity = sharedWillEffects(world, entity, corrosiveWill, destructiveWill, vengefulWill, corrosiveDrained, destructiveDrained, vengefulDrained); - - corrosiveDrained += drainageEntity[0]; - destructiveDrained += drainageEntity[1]; - vengefulDrained += drainageEntity[2]; - } - } else if (!entity.isNonBoss()) { - /* Steadfast will effect: Affects bosses - (some bosses, like the wither, have a restriction to motion modification, - others, like the Ender Dragon, don't do potions) */ - if (steadfastWill >= willDrain) { - if (entity instanceof WitherEntity || entity instanceof EnderDragonEntity) - entity.move(MoverType.SELF, 0, -0.05, 0); // to work on Wither and EnderDragon without interfering with other mod author's decisions (looking at you, Vazkii) - - steadfastDrained += willDrain / 10f; - - double[] drainagePlayer = sharedWillEffects(world, entity, corrosiveWill, destructiveWill, vengefulWill, corrosiveDrained, destructiveDrained, vengefulDrained); - - corrosiveDrained += drainagePlayer[0]; - destructiveDrained += drainagePlayer[1]; - vengefulDrained += drainagePlayer[2]; - } - } - } - - - if (rawDrained > 0) - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrained, true); - if (corrosiveDrained > 0) - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrained, true); - if (destructiveDrained > 0) - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveDrained, true); - if (steadfastDrained > 0) - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrained, true); - if (vengefulDrained > 0) - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrained, true); - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return Math.max(1, getBlockRange(GROUNDING_RANGE).getVolume() / 10000); - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 2, EnumRuneType.EARTH); - addCornerRunes(components, 3, 3, EnumRuneType.EARTH); - } - - - @Override - public Ritual getNewCopy() { - return new RitualGrounding(); - } - - public double[] sharedWillEffects(World world, LivingEntity entity, double corrosiveWill, double destructiveWill, double vengefulWill, double corrosiveDrained, double destructiveDrained, double vengefulDrained) { - /* Combination of corrosive + vengeful will: Levitation */ - if (corrosiveWill >= willDrain && vengefulWill >= willDrain) { - - entity.addPotionEffect(new EffectInstance(Effects.LEVITATION, 20, 10)); - vengefulDrained += willDrain; - corrosiveDrained += willDrain; - - /* Corrosive will effect: Suspension */ - } else if (corrosiveWill >= willDrain) { - - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SUSPENDED, 20, 0)); - corrosiveDrained += willDrain; - - /* Vengeful will effect: Stronger effect */ - } else if (vengefulWill >= willDrain) { - - vengefulDrained += willDrain; - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.GROUNDED, 40, 20)); - - } else - - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.GROUNDED, 20, 10)); - - /* Destructive will effect: Increased fall damage */ - if (destructiveWill >= willDrain) { - destructiveDrained += willDrain; - - /* Combination of destructive + vengeful will: stronger destructive effect */ - if (vengefulWill >= willDrain + vengefulDrained) { - if (world.getTotalWorldTime() % 100 == 0) { - vengefulDrained += willDrain; - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.HEAVY_HEART, 200, 2)); - } - - } else if (world.getTotalWorldTime() % 50 == 0) - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.HEAVY_HEART, 100, 1)); - } - return new double[]{corrosiveDrained, destructiveDrained, vengefulDrained}; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java deleted file mode 100644 index 73cb2ed2..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java +++ /dev/null @@ -1,122 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.ritual.harvest.HarvestRegistry; -import WayofTime.bloodmagic.ritual.harvest.IHarvestHandler; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockState; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; - -import java.util.List; -import java.util.function.Consumer; - -/** - * This ritual uses registered {@link IHarvestHandler}'s to harvest blocks. - *

    - * To register a new Handler for this ritual use - * {@link HarvestRegistry#registerHandler(IHarvestHandler)} - *

    - * This ritual includes a way to change the range based on what block is above - * the MasterRitualStone. You can use - * {@link HarvestRegistry#registerRangeAmplifier(BlockState, int)} to register a - * new amplifier. - */ -@RitualRegister("harvest") -public class RitualHarvest extends Ritual { - public static final String HARVEST_RANGE = "harvestRange"; - - public RitualHarvest() { - super("ritualHarvest", 0, 20000, "ritual." + BloodMagic.MODID + ".harvestRitual"); - addBlockRange(HARVEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-4, 1, -4), 9, 5, 9)); - setMaximumVolumeAndDistanceOfRange(HARVEST_RANGE, 0, 15, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (masterRitualStone.getOwnerNetwork().getCurrentEssence() < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int harvested = 0; - - AreaDescriptor harvestArea = masterRitualStone.getBlockRange(HARVEST_RANGE); - - harvestArea.resetIterator(); - while (harvestArea.hasNext()) { - BlockPos nextPos = harvestArea.next().add(pos); - if (harvestBlock(world, nextPos, masterRitualStone.getBlockPos())) { - harvested++; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * harvested)); - } - - @Override - public int getRefreshCost() { - return 20; - } - - @Override - public int getRefreshTime() { - return 5; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - addParallelRunes(components, 2, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 1, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 2, 0, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() { - return new RitualHarvest(); - } - - public static boolean harvestBlock(World world, BlockPos cropPos, BlockPos controllerPos) { - BlockState harvestState = world.getBlockState(cropPos); - TileEntity potentialInventory = world.getTileEntity(controllerPos.up()); - IItemHandler itemHandler = null; - if (potentialInventory != null && potentialInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) - itemHandler = potentialInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); - - for (IHarvestHandler handler : HarvestRegistry.getHarvestHandlers()) { - if (handler.test(world, cropPos, harvestState)) { - List drops = Lists.newArrayList(); - if (handler.harvest(world, cropPos, harvestState, drops)) { - for (ItemStack stack : drops) { - if (stack.isEmpty()) - continue; - - // TODO I wrote this, but didn't actually think about whether it should be a thing. Remove the true if we want to keep it - if (itemHandler == null || true) - InventoryHelper.spawnItemStack(world, cropPos.getX(), cropPos.getY(), cropPos.getZ(), stack); - else { - ItemStack remainder = ItemHandlerHelper.insertItemStacked(itemHandler, stack, false); - if (!remainder.isEmpty()) - InventoryHelper.spawnItemStack(world, cropPos.getX(), cropPos.getY(), cropPos.getZ(), remainder); - } - } - return true; - } - } - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java deleted file mode 100644 index 56d3323b..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.function.Consumer; - -@RitualRegister("interdiction") -public class RitualInterdiction extends Ritual { - public static final String INTERDICTION_RANGE = "interdictionRange"; - - public RitualInterdiction() { - super("ritualInterdiction", 0, 1000, "ritual." + BloodMagic.MODID + ".interdictionRitual"); - addBlockRange(INTERDICTION_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 0, -2), 5)); - setMaximumVolumeAndDistanceOfRange(INTERDICTION_RANGE, 0, 10, 10); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - AreaDescriptor interdictionRange = masterRitualStone.getBlockRange(INTERDICTION_RANGE); - - for (LivingEntity entity : world.getEntitiesWithinAABB(LivingEntity.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity instanceof PlayerEntity && (((PlayerEntity) entity).capabilities.isCreativeMode || ((PlayerEntity) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) - continue; - - double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); - double yDif = entity.posY - masterRitualStone.getBlockPos().getY() + 1; - double zDif = entity.posZ - (masterRitualStone.getBlockPos().getZ() + 0.5); - - entity.motionX = 0.1 * xDif; - entity.motionY = 0.1 * yDif; - entity.motionZ = 0.1 * zDif; - entity.fallDistance = 0; - - if (entity instanceof PlayerEntity) { - entity.velocityChanged = true; - } - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 1; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.AIR); - addParallelRunes(components, 1, 0, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() { - return new RitualInterdiction(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java deleted file mode 100644 index bfc32dc2..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java +++ /dev/null @@ -1,85 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("jumping") -public class RitualJumping extends Ritual { - public static final String JUMP_RANGE = "jumpRange"; - public static final String JUMP_POWER = "jumpPower"; - - public RitualJumping() { - super("ritualJump", 0, 5000, "ritual." + BloodMagic.MODID + ".jumpRitual"); - addBlockRange(JUMP_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3, 1, 3)); - setMaximumVolumeAndDistanceOfRange(JUMP_RANGE, 0, 5, 5); - addBlockRange(JUMP_POWER, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 0, 5, 0)); - setMaximumVolumeAndDistanceOfRange(JUMP_POWER, 0, 0, 100); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - AreaDescriptor jumpRange = masterRitualStone.getBlockRange(JUMP_RANGE); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, jumpRange.getAABB(masterRitualStone.getBlockPos())); - for (LivingEntity entity : entities) { - if (totalEffects >= maxEffects) { - break; - } - - double motionY = masterRitualStone.getBlockRange(JUMP_POWER).getHeight() * 0.3; - - entity.fallDistance = 0; - if (entity.isSneaking()) { - continue; - } - - entity.motionY = motionY; - totalEffects++; - - if (entity instanceof PlayerEntity) { - Utils.setPlayerSpeedFromServer((PlayerEntity) entity, entity.motionX, entity.motionY, entity.motionZ); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return getBlockRange(JUMP_POWER).getHeight(); - } - - @Override - public void gatherComponents(Consumer components) { - for (int i = -1; i <= 1; i++) - addCornerRunes(components, 1, i, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() { - return new RitualJumping(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java deleted file mode 100644 index 4c1f8d11..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ /dev/null @@ -1,297 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("lava") -public class RitualLava extends Ritual { - public static final String LAVA_RANGE = "lavaRange"; - public static final String FIRE_FUSE_RANGE = "fireFuse"; - public static final String FIRE_RESIST_RANGE = "fireResist"; - public static final String FIRE_DAMAGE_RANGE = "fireDamage"; - public static final String LAVA_TANK_RANGE = "lavaTank"; - - public static final double vengefulWillDrain = 1; - public static final double steadfastWillDrain = 0.5; - public static final double corrosiveWillDrain = 0.2; - public static final int corrosiveRefreshTime = 20; - public int timer = 0; - - public RitualLava() { - super("ritualLava", 0, 10000, "ritual." + BloodMagic.MODID + ".lavaRitual"); - addBlockRange(LAVA_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - addBlockRange(FIRE_FUSE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, -2, -2), 5)); - addBlockRange(FIRE_RESIST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - addBlockRange(FIRE_DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - addBlockRange(LAVA_TANK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(LAVA_RANGE, 9, 3, 3); - setMaximumVolumeAndDistanceOfRange(FIRE_FUSE_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(FIRE_RESIST_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(FIRE_DAMAGE_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(LAVA_TANK_RANGE, 1, 10, 10); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - timer++; - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - int lpDrain = 0; - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double rawDrained = 0; - - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - AreaDescriptor lavaRange = masterRitualStone.getBlockRange(LAVA_RANGE); - - int maxLavaVolume = getMaxVolumeForRange(LAVA_RANGE, willConfig, holder); - if (!lavaRange.isWithinRange(getMaxVerticalRadiusForRange(LAVA_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(LAVA_RANGE, willConfig, holder)) || (maxLavaVolume != 0 && lavaRange.getVolume() > maxLavaVolume)) { - return; - } - - for (BlockPos newPos : lavaRange.getContainedPositions(pos)) { - BlockState state = world.getBlockState(newPos); - if (world.isAirBlock(newPos) || Utils.isFlowingLiquid(state)) { - int lpCost = getLPCostForRawWill(rawWill); - if (currentEssence < lpCost) { - break; - } - world.setBlockState(newPos, Blocks.FLOWING_LAVA.getDefaultState()); - currentEssence -= lpCost; - lpDrain += lpCost; - if (rawWill > 0) { - double drain = getWillCostForRawWill(rawWill); - rawWill -= drain; - rawDrained += drain; - } - } - } - - if (rawWill > 0) { - AreaDescriptor chestRange = masterRitualStone.getBlockRange(LAVA_TANK_RANGE); - TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - double drain = getWillCostForRawWill(rawWill); - int lpCost = getLPCostForRawWill(rawWill); - - if (rawWill >= drain && currentEssence >= lpCost) { - if (tile != null) { - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); - double filled = handler.fill(new FluidStack(FluidRegistry.LAVA, 1000), true); - - double ratio = filled / 1000; - - rawWill -= drain * ratio; - rawDrained += drain * ratio; - - currentEssence -= Math.ceil(lpCost * ratio); - lpDrain += Math.ceil(lpCost * ratio); - } - } - } - } - - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - - if (vengefulWill >= vengefulWillDrain) { - double vengefulDrained = 0; - AreaDescriptor fuseRange = masterRitualStone.getBlockRange(FIRE_FUSE_RANGE); - - AxisAlignedBB fuseArea = fuseRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, fuseArea); - - for (LivingEntity entity : entities) { - if (vengefulWill < vengefulWillDrain) { - break; - } - - if (entity instanceof PlayerEntity) { - continue; - } - - if (!entity.isPotionActive(RegistrarBloodMagic.FIRE_FUSE)) { - entity.addPotionEffect(new EffectInstance(RegistrarBloodMagic.FIRE_FUSE, 100, 0)); - - vengefulDrained += vengefulWillDrain; - vengefulWill -= vengefulWillDrain; - } - } - - if (vengefulDrained > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrained, true); - } - } - - if (steadfastWill >= steadfastWillDrain) { - double steadfastDrained = 0; - AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_RESIST_RANGE); - - int duration = getFireResistForWill(steadfastWill); - - AxisAlignedBB resistArea = resistRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(PlayerEntity.class, resistArea); - - for (PlayerEntity entity : entities) { - if (steadfastWill < steadfastWillDrain) { - break; - } - if (!entity.isPotionActive(Effects.FIRE_RESISTANCE) || (entity.getActivePotionEffect(Effects.FIRE_RESISTANCE).getDuration() < 2)) { - entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 100, 0)); - - steadfastDrained += steadfastWillDrain; - steadfastWill -= steadfastWillDrain; - } - } - - if (steadfastDrained > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrained, true); - } - } - - if (timer % corrosiveRefreshTime == 0 && corrosiveWill >= corrosiveWillDrain) { - double corrosiveDrained = 0; - AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_DAMAGE_RANGE); - - float damage = getCorrosiveDamageForWill(corrosiveWill); - - AxisAlignedBB damageArea = resistRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, damageArea); - - for (LivingEntity entity : entities) { - if (corrosiveWill < corrosiveWillDrain) { - break; - } - - if (!entity.isDead && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity)) { - if (entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, damage)) { - corrosiveDrained += corrosiveWillDrain; - corrosiveWill -= corrosiveWillDrain; - } - } - } - - if (corrosiveDrained > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrained, true); - } - } - - if (rawDrained > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrained, true); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 500; - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 1, 0, EnumRuneType.FIRE); - } - - @Override - public Ritual getNewCopy() { - return new RitualLava(); - } - - @Override - public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) { - if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) { - return 9 + (int) Math.pow(destructiveWill / 10, 1.5); - } - } - - return volumeRangeMap.get(range); - } - - @Override - public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) { - if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) { - return (int) (3 + destructiveWill / 10d); - } - } - - return verticalRangeMap.get(range); - } - - @Override - public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) { - if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) { - return (int) (3 + destructiveWill / 10d); - } - } - - return horizontalRangeMap.get(range); - } - - public int getFireResistForWill(double steadfastWill) { - return (int) (200 + steadfastWill * 3); - } - - public float getCorrosiveDamageForWill(double corrosiveWill) { - return (float) (1 + corrosiveWill * 0.05); - } - - public int getLPCostForRawWill(double raw) { - return Math.max((int) (500 - raw), 0); - } - - public double getWillCostForRawWill(double raw) { - return Math.min(1, raw / 500); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java deleted file mode 100644 index 4fa5220c..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ /dev/null @@ -1,208 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.item.ItemFrameEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("armour_downgrade") -public class RitualLivingArmourDowngrade extends Ritual { - public static final String DOWNGRADE_RANGE = "containmentRange"; - private int internalTimer = 0; - - public RitualLivingArmourDowngrade() { - super("ritualDowngrade", 2, 10000, "ritual." + BloodMagic.MODID + ".downgradeRitual"); - addBlockRange(DOWNGRADE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 0, -3), 7)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos masterPos = masterRitualStone.getBlockPos(); - - AreaDescriptor downgradeRange = masterRitualStone.getBlockRange(DOWNGRADE_RANGE); - - boolean isActivatorPresent = false; - for (PlayerEntity player : world.getEntitiesWithinAABB(PlayerEntity.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) { - if (player.getGameProfile().getId().equals(masterRitualStone.getOwner())) { - ItemStack keyStack = getStackFromItemFrame(world, masterPos, masterRitualStone.getDirection()); - if (keyStack.isEmpty()) { - return; - } - - List textList = LivingArmourDowngradeRecipeRegistry.getDialogForProcessTick(keyStack, internalTimer); - if (textList != null) { - ChatUtil.sendChat(player, textList.toArray(new ITextComponent[textList.size()])); - } - - internalTimer++; - - if (player.isSneaking()) { - double distance2 = masterPos.offset(Direction.UP).distanceSqToCenter(player.posX, player.posY, player.posZ); - if (distance2 > 1) { - return; - } - - BlockPos chestPos = masterPos.offset(masterRitualStone.getDirection(), 2).offset(Direction.UP); - TileEntity tile = world.getTileEntity(chestPos); - if (tile == null) { - return; - } - IItemHandler inv = Utils.getInventory(tile, null); - if (inv != null) { - List recipeList = new ArrayList<>(); - for (int i = 0; i < inv.getSlots(); i++) { - ItemStack invStack = inv.getStackInSlot(i); - if (!invStack.isEmpty()) { - recipeList.add(invStack); - } - } - - LivingArmourDowngradeRecipe recipe = LivingArmourDowngradeRecipeRegistry.getMatchingRecipe(keyStack, recipeList, world, masterPos); - if (recipe != null) { - LivingArmourUpgrade upgrade = recipe.getRecipeOutput(); - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - if (armour.canApplyUpgrade(player, upgrade)) { - if (armour.upgradeArmour(player, upgrade)) { - ItemLivingArmour.setLivingArmour(chestStack, armour); - - recipe.consumeInventory(inv); - - LightningBoltEntity lightning = new LightningBoltEntity(world, chestPos.getX(), chestPos.getY(), chestPos.getZ(), true); - world.spawnEntity(lightning); - - masterRitualStone.setActive(false); - } - } else { - //TODO: You are not able to receive my blessing... - //TODO: Need to add a timer that will stop it from working. - } - } - } - } - } - } - - return; - } - } - - if (!isActivatorPresent) { - internalTimer = 0; - } - } - - @Override - public void readFromNBT(CompoundNBT tag) { - super.readFromNBT(tag); - - this.internalTimer = tag.getInt("internalTimer"); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - super.writeToNBT(tag); - - tag.putInt("internalTimer", internalTimer); - } - - public ItemStack getStackFromItemFrame(World world, BlockPos masterPos, Direction direction) { - BlockPos offsetPos = new BlockPos(0, 3, 0); - offsetPos = offsetPos.offset(direction, 2); - - AxisAlignedBB bb = new AxisAlignedBB(masterPos.add(offsetPos)); - List frames = world.getEntitiesWithinAABB(ItemFrameEntity.class, bb); - for (ItemFrameEntity frame : frames) { - if (!frame.getDisplayedItem().isEmpty()) { - return frame.getDisplayedItem(); - } - } - - return ItemStack.EMPTY; - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public void gatherComponents(Consumer components) { - addRune(components, 0, 0, -1, EnumRuneType.AIR); - addRune(components, 0, 0, -2, EnumRuneType.DUSK); - addRune(components, 0, 1, -3, EnumRuneType.DUSK); - addRune(components, 0, 2, -3, EnumRuneType.BLANK); - addRune(components, 0, 3, -3, EnumRuneType.BLANK); - addRune(components, 0, 1, -4, EnumRuneType.FIRE); - - for (int i = 1; i <= 3; i++) - addRune(components, 0, 0, i, EnumRuneType.AIR); - - for (int sgn = -1; sgn <= 1; sgn += 2) { - addRune(components, sgn, 0, 4, EnumRuneType.AIR); - addRune(components, sgn * 2, 0, 2, EnumRuneType.AIR); - addRune(components, sgn * 3, 0, 2, EnumRuneType.AIR); - addRune(components, sgn * 3, 0, 3, EnumRuneType.AIR); - addRune(components, sgn, 0, 0, EnumRuneType.EARTH); - addRune(components, sgn, 0, 1, EnumRuneType.EARTH); - addRune(components, sgn * 2, 0, -1, EnumRuneType.FIRE); - addRune(components, sgn * 2, 0, -2, EnumRuneType.FIRE); - addRune(components, sgn * 3, 0, -2, EnumRuneType.FIRE); - addRune(components, sgn * 3, 0, -3, EnumRuneType.FIRE); - addRune(components, sgn * 3, 0, -4, EnumRuneType.FIRE); - addRune(components, sgn, 1, -1, EnumRuneType.AIR); - addRune(components, sgn, 1, -2, EnumRuneType.AIR); - addRune(components, sgn, 1, -4, EnumRuneType.FIRE); - addRune(components, sgn * 2, 1, -4, EnumRuneType.FIRE); - addRune(components, sgn, 0, -3, EnumRuneType.EARTH); - addRune(components, sgn, 0, -4, EnumRuneType.EARTH); - addRune(components, sgn, 0, -5, EnumRuneType.EARTH); - addRune(components, sgn, 1, -5, EnumRuneType.EARTH); - addRune(components, sgn, 2, -5, EnumRuneType.EARTH); - addRune(components, sgn, 3, -5, EnumRuneType.EARTH); - addRune(components, sgn, 3, -4, EnumRuneType.EARTH); - } - } - - @Override - public Ritual getNewCopy() { - return new RitualLivingArmourDowngrade(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java deleted file mode 100644 index 5be8d54a..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java +++ /dev/null @@ -1,164 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.Utils; -import com.mojang.authlib.GameProfile; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.common.util.FakePlayerFactory; - - -import java.util.function.Consumer; - -@RitualRegister("magnetism") -public class RitualMagnetic extends Ritual { - public static final String PLACEMENT_RANGE = "placementRange"; - // public static final String SEARCH_RANGE = "searchRange"; - public BlockPos lastPos; // An offset - private FakePlayer fakePlayer; - - public RitualMagnetic() { - super("ritualMagnetic", 0, 5000, "ritual." + BloodMagic.MODID + ".magneticRitual"); - addBlockRange(PLACEMENT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3)); - setMaximumVolumeAndDistanceOfRange(PLACEMENT_RANGE, 50, 4, 4); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - Vec3d MRSpos = new Vec3d(masterRitualStone.getBlockPos()); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor placementRange = masterRitualStone.getBlockRange(PLACEMENT_RANGE); - - BlockPos replacement = pos; - boolean replace = false; - - for (BlockPos offset : placementRange.getContainedPositions(pos)) { - if (world.isAirBlock(offset)) { - replacement = offset; - replace = true; - break; - } - } - - BlockState downState = world.getBlockState(pos.down()); - int radius = getRadius(downState.getBlock()); - - if (replace) { - int j = -1; - int i = -radius; - int k = -radius; - - if (lastPos != null) { - j = lastPos.getY(); - i = Math.min(radius, Math.max(-radius, lastPos.getX())); - k = Math.min(radius, Math.max(-radius, lastPos.getZ())); - } - - if (j + pos.getY() >= 0) { - while (i <= radius) { - while (k <= radius) { - BlockPos newPos = pos.add(i, j, k); - Vec3d newPosVector = new Vec3d(newPos); - BlockState state = world.getBlockState(newPos); - RayTraceResult fakeRayTrace = world.rayTraceBlocks(MRSpos, newPosVector, false); - ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((ServerWorld) world)); - if (isBlockOre(checkStack)) { - Utils.swapLocations(world, newPos, world, replacement); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - k++; - this.lastPos = new BlockPos(i, j, k); - return; - } else { - k++; - } - } - i++; - k = -radius; - } - j--; - i = -radius; - this.lastPos = new BlockPos(i, j, k); - return; - } - - j = -1; - this.lastPos = new BlockPos(i, j, k); - } - - } - - public int getRadius(Block block) { - if (block == Blocks.IRON_BLOCK) { - return 7; - } - - if (block == Blocks.GOLD_BLOCK) { - return 15; - } - - if (block == Blocks.DIAMOND_BLOCK) { - return 31; - } - - return 3; - } - - @Override - public int getRefreshTime() { - return 40; - } - - @Override - public int getRefreshCost() { - return 50; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - addParallelRunes(components, 2, 1, EnumRuneType.EARTH); - addCornerRunes(components, 2, 1, EnumRuneType.AIR); - addParallelRunes(components, 2, 2, EnumRuneType.FIRE); - } - - @Override - public Ritual getNewCopy() { - return new RitualMagnetic(); - } - - private FakePlayer getFakePlayer(ServerWorld world) { - return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_magnetic")) : fakePlayer; - } - - public static boolean isBlockOre(ItemStack stack) { - if (stack.isEmpty()) - return false; - - for (int id : OreDictionary.getOreIDs(stack)) { - String oreName = OreDictionary.getOreName(id); - if (oreName.contains("ore")) - return true; - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java deleted file mode 100644 index 38919ab6..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java +++ /dev/null @@ -1,155 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import WayofTime.bloodmagic.meteor.Meteor; -import WayofTime.bloodmagic.meteor.MeteorRegistry; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("meteor") -public class RitualMeteor extends Ritual { - public static final String ITEM_RANGE = "itemRange"; - public static final double destructiveWillDrain = 50; - - public RitualMeteor() { - super("ritualMeteor", 2, 0, "ritual." + BloodMagic.MODID + ".meteorRitual"); - - addBlockRange(ITEM_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - setMaximumVolumeAndDistanceOfRange(ITEM_RANGE, 0, 10, 10); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - BlockPos pos = masterRitualStone.getBlockPos(); - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - AreaDescriptor itemDetectionRange = masterRitualStone.getBlockRange(ITEM_RANGE); - List itemList = world.getEntitiesWithinAABB(ItemEntity.class, itemDetectionRange.getAABB(pos)); - - double radiusModifier = getRadiusModifier(rawWill); - double explosionModifier = getExplosionModifier(steadfastWill); - double fillerChance = getFillerChance(corrosiveWill); - - boolean successful = false; - - for (ItemEntity entityItem : itemList) { - ItemStack stack = entityItem.getItem(); - Meteor meteor = MeteorRegistry.getMeteorForItem(stack); - - if (meteor != null) { - SoulNetwork network = masterRitualStone.getOwnerNetwork(); - int cost = meteor.getCost(); - if (currentEssence < cost) { - network.causeNausea(); - break; - } else { - network.syphon(masterRitualStone.ticket(cost)); - EntityMeteor entityMeteor = new EntityMeteor(world, pos.getX(), 260, pos.getZ(), 0, -0.1, 0, radiusModifier, explosionModifier, fillerChance); - entityMeteor.setMeteorStack(stack.copy()); - world.spawnEntity(entityMeteor); - - entityItem.setDead(); - - } - - if (destructiveWill >= destructiveWillDrain && currentEssence >= 1000000000) { - network.syphon(masterRitualStone.ticket(cost / 10)); - } else { - masterRitualStone.setActive(false); - } - successful = true; - break; - } - } - - if (successful) { - if (rawWill > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWill, true); - } - - if (corrosiveWill > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveWill, true); - } - - if (steadfastWill > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastWill, true); - } - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 2, 0, EnumRuneType.FIRE); - addOffsetRunes(components, 3, 1, 0, EnumRuneType.AIR); - addOffsetRunes(components, 4, 2, 0, EnumRuneType.AIR); - addOffsetRunes(components, 5, 3, 0, EnumRuneType.DUSK); - addCornerRunes(components, 4, 0, EnumRuneType.DUSK); - - for (int i = 4; i <= 6; i++) { - addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - } - - addParallelRunes(components, 8, 0, EnumRuneType.EARTH); - addParallelRunes(components, 8, 1, EnumRuneType.EARTH); - addParallelRunes(components, 7, 1, EnumRuneType.EARTH); - addParallelRunes(components, 7, 2, EnumRuneType.EARTH); - addParallelRunes(components, 6, 2, EnumRuneType.FIRE); - addParallelRunes(components, 6, 3, EnumRuneType.WATER); - addParallelRunes(components, 5, 3, EnumRuneType.WATER); - addParallelRunes(components, 5, 4, EnumRuneType.AIR); - - addOffsetRunes(components, 1, 4, 4, EnumRuneType.AIR); - addParallelRunes(components, 4, 4, EnumRuneType.AIR); - - addOffsetRunes(components, 2, 4, 4, EnumRuneType.WATER); - addOffsetRunes(components, 2, 3, 4, EnumRuneType.FIRE); - addCornerRunes(components, 3, 4, EnumRuneType.FIRE); - } - - @Override - public Ritual getNewCopy() { - return new RitualMeteor(); - } - - public double getRadiusModifier(double rawWill) { - return Math.pow(1 + rawWill / 100, 1 / 3); - } - - public double getFillerChance(double corrosiveWill) { - return corrosiveWill / 200; - } - - public double getExplosionModifier(double steadfastWill) { - return Math.max(Math.pow(0.4, steadfastWill / 100), 1); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java deleted file mode 100644 index a5173a28..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java +++ /dev/null @@ -1,104 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import java.util.function.Consumer; - -@RitualRegister("placer") -public class RitualPlacer extends Ritual { - public static final String PLACER_RANGE = "placerRange"; - public static final String CHEST_RANGE = "chest"; - - public RitualPlacer() { - super("ritualPlacer", 0, 5000, "ritual." + BloodMagic.MODID + ".placerRitual"); - addBlockRange(PLACER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 0, -2), 5, 1, 5)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(PLACER_RANGE, 300, 7, 7); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tileEntity = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); - - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - AreaDescriptor areaDescriptor = masterRitualStone.getBlockRange(PLACER_RANGE); - - if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); - - if (itemHandler.getSlots() <= 0) { - return; - } - - posLoop: - for (BlockPos blockPos : areaDescriptor.getContainedPositions(masterRitualStone.getBlockPos())) { - if (!world.getBlockState(blockPos).getBlock().isReplaceable(world, blockPos)) - continue; - - for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) { - ItemStack stack = itemHandler.extractItem(invSlot, 1, true); - if (stack.isEmpty() || !(stack.getItem() instanceof BlockItem)) - continue; - - BlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(invSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(invSlot).getItemDamage()); - world.setBlockState(blockPos, placeState); - itemHandler.extractItem(invSlot, 1, false); - tileEntity.markDirty(); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - break posLoop; // Break instead of return in case we add things later - } - } - } - } - } - - @Override - public int getRefreshCost() { - return 50; - } - - @Override - public void gatherComponents(Consumer components) { - addRune(components, 3, 0, 3, EnumRuneType.EARTH); - addRune(components, 3, 0, -3, EnumRuneType.EARTH); - addRune(components, -3, 0, 3, EnumRuneType.EARTH); - addRune(components, -3, 0, -3, EnumRuneType.EARTH); - - addRune(components, 3, 0, 2, EnumRuneType.WATER); - addRune(components, 3, 0, -2, EnumRuneType.WATER); - addRune(components, 2, 0, 3, EnumRuneType.WATER); - addRune(components, 2, 0, -3, EnumRuneType.WATER); - addRune(components, -2, 0, 3, EnumRuneType.WATER); - addRune(components, -2, 0, -3, EnumRuneType.WATER); - addRune(components, -3, 0, 2, EnumRuneType.WATER); - addRune(components, -3, 0, -2, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() { - return new RitualPlacer(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java deleted file mode 100644 index 1a85c233..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java +++ /dev/null @@ -1,230 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.teleport.PortalLocation; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.ritual.portal.LocationsHandler; -import WayofTime.bloodmagic.tile.TileDimensionalPortal; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -import java.util.UUID; -import java.util.function.Consumer; - -@RitualRegister("portal") -public class RitualPortal extends Ritual { - - public static final String PORTAL_NBT_TAG = "PortalRitualTag"; - public static final String PORTAL_ID_TAG = "PortalRitualID"; - private CompoundNBT portalRitualTag; - - public RitualPortal() { - super("ritualPortal", 0, 50000, "ritual." + BloodMagic.MODID + ".portalRitual"); - portalRitualTag = new CompoundNBT(); - } - - @Override - public boolean activateRitual(IMasterRitualStone masterRitualStone, PlayerEntity player, UUID owner) { - World world = masterRitualStone.getWorldObj(); - int x = masterRitualStone.getBlockPos().getX(); - int y = masterRitualStone.getBlockPos().getY(); - int z = masterRitualStone.getBlockPos().getZ(); - Direction direction = masterRitualStone.getDirection(); - - String name = owner.toString(); - BlockState blockState; - - if (!world.isRemote) { - portalRitualTag.removeTag(PORTAL_ID_TAG); - - if (direction == Direction.NORTH || direction == Direction.SOUTH) { - for (int i = x - 3; i <= x + 3; i++) { - for (int k = z - 2; k <= z + 2; k++) { - if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { - blockState = getBlockState(world, i, y, k); - name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); - } - } - } - for (int j = y + 1; j <= y + 5; j++) { - if (!world.isAirBlock(new BlockPos(x - 3, j, z)) && !(getBlockState(world, x - 3, j, z).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { - blockState = getBlockState(world, x - 3, j, z); - name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); - } - } - for (int j = y + 1; j <= y + 5; j++) { - if (!world.isAirBlock(new BlockPos(x + 3, j, z)) && !(getBlockState(world, x + 3, j, z) == RegistrarBloodMagicBlocks.RITUAL_STONE)) { - blockState = getBlockState(world, x + 3, j, z); - name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); - } - } - } else if (direction == Direction.EAST || direction == Direction.WEST) { - for (int k = z - 3; k <= z + 3; k++) { - for (int i = x - 2; i <= x + 2; i++) { - if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { - blockState = getBlockState(world, i, y, k); - name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); - } - } - } - for (int j = y + 1; j <= y + 5; j++) { - if (!world.isAirBlock(new BlockPos(x, j, z - 3)) && !(getBlockState(world, x, j, z - 3).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { - blockState = getBlockState(world, x, j, z - 3); - name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); - } - } - for (int j = y + 1; j <= y + 5; j++) { - if (!world.isAirBlock(new BlockPos(x, j, z + 3)) && !(getBlockState(world, x, j, z + 3).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE)) { - blockState = getBlockState(world, x, j, z + 3); - name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState))); - } - } - } - - if (LocationsHandler.getLocationsHandler().addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimension()))) { - portalRitualTag.putString(PORTAL_ID_TAG, name); - return true; - } - } - return false; - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - if (world.isRemote) { - return; - } - - int x = masterRitualStone.getBlockPos().getX(); - int y = masterRitualStone.getBlockPos().getY(); - int z = masterRitualStone.getBlockPos().getZ(); - Direction direction = masterRitualStone.getDirection(); - - if (direction == Direction.NORTH || direction == Direction.SOUTH) { - for (int i = x - 1; i <= x + 1; i++) { - for (int j = y + 1; j <= y + 3; j++) { - BlockPos tempPos = new BlockPos(i, j, z); - - if (world.isAirBlock(tempPos)) { - BlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(0); - world.setBlockState(tempPos, blockState, 3); - - if (world.getTileEntity(tempPos) != null && world.getTileEntity(tempPos) instanceof TileDimensionalPortal) { - TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(tempPos); - tile.setMasterStonePos(masterRitualStone.getBlockPos()); - tile.portalID = portalRitualTag.getString(PORTAL_ID_TAG); - } - } - } - } - } else if (direction == Direction.EAST || direction == Direction.WEST) { - for (int k = z - 1; k <= z + 1; k++) { - for (int j = y + 1; j <= y + 3; j++) { - BlockPos tempPos = new BlockPos(x, j, k); - if (world.isAirBlock(tempPos)) { - BlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(1); - world.setBlockState(tempPos, blockState, 3); - - if (world.getTileEntity(tempPos) != null && world.getTileEntity(tempPos) instanceof TileDimensionalPortal) { - TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(tempPos); - tile.setMasterStonePos(masterRitualStone.getBlockPos()); - tile.portalID = portalRitualTag.getString(PORTAL_ID_TAG); - } - } - } - } - } - - } - - @Override - public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType) { - World world = masterRitualStone.getWorldObj(); - int x = masterRitualStone.getBlockPos().getX(); - int y = masterRitualStone.getBlockPos().getY(); - int z = masterRitualStone.getBlockPos().getZ(); - Direction direction = masterRitualStone.getDirection(); - - LocationsHandler.getLocationsHandler().removeLocation(portalRitualTag.getString(PORTAL_ID_TAG), new PortalLocation(x, y + 1, z, world.provider.getDimension())); - - if (direction == Direction.NORTH || direction == Direction.SOUTH) { - for (int i = x - 2; i <= x + 2; i++) { - for (int j = y + 1; j <= y + 3; j++) { - if (getBlockState(world, i, j, z).getBlock() == RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL) { - world.setBlockToAir(new BlockPos(i, j, z)); - } - } - } - } else if (direction == Direction.EAST || direction == Direction.WEST) { - for (int k = z - 2; k <= z + 2; k++) { - for (int j = y + 1; j <= y + 3; j++) { - if (getBlockState(world, x, j, k).getBlock() == RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL) { - world.setBlockToAir(new BlockPos(x, j, k)); - } - } - } - } - - portalRitualTag.removeTag(PORTAL_ID_TAG); - } - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public void gatherComponents(Consumer components) { - addRune(components, 1, 0, 0, EnumRuneType.AIR); - addRune(components, 2, 0, 0, EnumRuneType.WATER); - addRune(components, -1, 0, 0, EnumRuneType.FIRE); - addRune(components, -2, 0, 0, EnumRuneType.EARTH); - addRune(components, 2, 1, 0, EnumRuneType.DUSK); - - addRune(components, 2, 2, 0, EnumRuneType.AIR); - addRune(components, 2, 3, 0, EnumRuneType.WATER); - addRune(components, 2, 4, 0, EnumRuneType.FIRE); - addRune(components, 1, 4, 0, EnumRuneType.EARTH); - addRune(components, 0, 4, 0, EnumRuneType.DUSK); - - addRune(components, -1, 4, 0, EnumRuneType.AIR); - addRune(components, -2, 4, 0, EnumRuneType.WATER); - addRune(components, -2, 3, 0, EnumRuneType.FIRE); - addRune(components, -2, 2, 0, EnumRuneType.EARTH); - addRune(components, -2, 1, 0, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() { - return new RitualPortal(); - } - - @Override - public void readFromNBT(CompoundNBT tag) { - super.readFromNBT(tag); - - portalRitualTag = tag.getCompound(PORTAL_NBT_TAG); - } - - @Override - public void writeToNBT(CompoundNBT tag) { - super.writeToNBT(tag); - - tag.put(PORTAL_NBT_TAG, portalRitualTag); - } - - public BlockState getBlockState(World world, int x, int y, int z) { - return world.getBlockState(new BlockPos(x, y, z)); - } - - public String addStringToEnd(String input, String toAdd) { - return input + toAdd; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java deleted file mode 100644 index c98e359d..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java +++ /dev/null @@ -1,109 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import com.google.common.collect.Lists; -import net.minecraft.block.BlockLiquid; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper; -import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.Iterator; -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("pump") -public class RitualPump extends Ritual { - public static final String PUMP_RANGE = "pumpRange"; - - private List> liquidsCache; - private Iterator> blockPosIterator; - - public RitualPump() { - super("ritualPump", 0, 500, "ritual." + BloodMagic.MODID + ".pumpRitual"); - addBlockRange(PUMP_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-16, -16, -16), new BlockPos(17, 17, 17))); - - setMaximumVolumeAndDistanceOfRange(PUMP_RANGE, 0, 16, 16); - liquidsCache = Lists.newArrayList(); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - TileEntity tileEntity = world.getTileEntity(masterRitualStone.getBlockPos().up()); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - if (tileEntity != null && tileEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, Direction.DOWN)) { - IFluidHandler fluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, Direction.DOWN); - BlockState tankState = world.getBlockState(masterRitualStone.getBlockPos().up()); - int maxDrain = fluidHandler.getTankProperties()[0].getCapacity(); - - if (fluidHandler.getTankProperties()[0].getContents() != null && fluidHandler.getTankProperties()[0].getContents().amount >= maxDrain) - return; - - for (BlockPos pos : masterRitualStone.getBlockRange(PUMP_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { - BlockState state = world.getBlockState(pos); - IFluidHandler blockHandler = null; - if (state.getBlock() instanceof BlockLiquid) - blockHandler = new BlockLiquidWrapper((BlockLiquid) state.getBlock(), world, pos); - else if (state.getBlock() instanceof IFluidHandler) - blockHandler = new FluidBlockWrapper((IFluidBlock) state.getBlock(), world, pos); - - if (blockHandler != null) { - FluidStack blockDrain = blockHandler.drain(maxDrain, false); - if (blockDrain != null && fluidHandler.fill(blockDrain, false) == blockDrain.amount) { - Pair posInfo = Pair.of(pos, blockHandler.drain(maxDrain, false)); - if (!liquidsCache.contains(posInfo)) - liquidsCache.add(posInfo); - } - } - } - - blockPosIterator = liquidsCache.iterator(); - if (blockPosIterator.hasNext()) { - Pair posInfo = blockPosIterator.next(); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - fluidHandler.fill(posInfo.getRight(), true); - world.setBlockState(posInfo.getLeft(), Blocks.STONE.getDefaultState()); - world.notifyBlockUpdate(posInfo.getLeft(), Blocks.STONE.getDefaultState(), Blocks.STONE.getDefaultState(), 3); - world.notifyBlockUpdate(tileEntity.getPos(), tankState, tankState, 3); - blockPosIterator.remove(); - } - } - } - - @Override - public int getRefreshCost() { - return 25; - } - - @Override - public void gatherComponents(Consumer components) { - addRune(components, 1, 0, 1, EnumRuneType.WATER); - addRune(components, 1, 0, -1, EnumRuneType.EARTH); - addRune(components, -1, 0, -1, EnumRuneType.AIR); - addRune(components, -1, 0, 1, EnumRuneType.FIRE); - - addCornerRunes(components, 1, 1, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() { - return new RitualPump(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java deleted file mode 100644 index fcd279d0..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java +++ /dev/null @@ -1,185 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.DamageSourceBloodMagic; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.Collections; -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("regeneration") -public class RitualRegeneration extends Ritual { - public static final String HEAL_RANGE = "heal"; - public static final String VAMPIRE_RANGE = "vampire"; - - public static final int SACRIFICE_AMOUNT = 100; - - public static final double corrosiveWillDrain = 0.04; - - public RitualRegeneration() { - super("ritualRegeneration", 0, 25000, "ritual." + BloodMagic.MODID + ".regenerationRitual"); - addBlockRange(HEAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -15, -15), 31)); - addBlockRange(VAMPIRE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -15, -15), 31)); - - setMaximumVolumeAndDistanceOfRange(HEAL_RANGE, 0, 20, 20); - setMaximumVolumeAndDistanceOfRange(VAMPIRE_RANGE, 0, 20, 20); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - int totalCost = 0; - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - double vengefulDrain = 0; - double steadfastDrain = 0; - double destructiveDrain = 0; - double corrosiveDrain = 0; - - boolean syphonHealth = corrosiveWill >= corrosiveWillDrain; - boolean applyAbsorption = false; - float absorptionRate = 1; - int maxAbsorption = 20; - - AreaDescriptor healArea = masterRitualStone.getBlockRange(HEAL_RANGE); - AxisAlignedBB healRange = healArea.getAABB(pos); - - AreaDescriptor damageArea = masterRitualStone.getBlockRange(VAMPIRE_RANGE); - AxisAlignedBB damageRange = damageArea.getAABB(pos); - - List entities = world.getEntitiesWithinAABB(LivingEntity.class, healRange); - List players = world.getEntitiesWithinAABB(PlayerEntity.class, healRange); - List damagedEntities = world.getEntitiesWithinAABB(LivingEntity.class, damageRange); - - if (syphonHealth) { - for (PlayerEntity player : players) { - if (player.getHealth() <= player.getMaxHealth() - 1) { - float syphonedHealthAmount = getSyphonAmountForWill(corrosiveWill); - Collections.shuffle(damagedEntities); - for (LivingEntity damagedEntity : damagedEntities) { - if (damagedEntity instanceof PlayerEntity) { - continue; - } - - float currentHealth = damagedEntity.getHealth(); - - damagedEntity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); - - float healthDifference = currentHealth - damagedEntity.getHealth(); - if (healthDifference > 0) { - corrosiveDrain += corrosiveWillDrain; - corrosiveWill -= corrosiveWillDrain; - player.heal(healthDifference); - } - - break; - } - } - } - } - - for (LivingEntity entity : entities) { - float health = entity.getHealth(); - if (health <= entity.getMaxHealth() - 1) { - if (entity.isPotionApplicable(new EffectInstance(Effects.REGENERATION))) { - if (entity instanceof PlayerEntity) { - totalCost += getRefreshCost(); - currentEssence -= getRefreshCost(); - } else { - totalCost += getRefreshCost() / 10; - currentEssence -= getRefreshCost() / 10; - } - - entity.addPotionEffect(new EffectInstance(Effects.REGENERATION, 50, 0, false, false)); - - totalEffects++; - - if (totalEffects >= maxEffects) { - break; - } - } - } - if (applyAbsorption && entity instanceof PlayerEntity) { - if (applyAbsorption) { - float added = Utils.addAbsorptionToMaximum(entity, absorptionRate, maxAbsorption, 1000); - } - } - } - - if (corrosiveDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrain, true); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalCost)); - } - - @Override - public int getRefreshTime() { - return 50; - } - - @Override - public int getRefreshCost() { - return SACRIFICE_AMOUNT; - } - - @Override - public void gatherComponents(Consumer components) { - components.accept(new RitualComponent(new BlockPos(4, 0, 0), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(5, 0, -1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(5, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-4, 0, 0), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-5, 0, -1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-5, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(0, 0, 4), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(1, 0, 5), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(-1, 0, 5), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(0, 0, -4), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(1, 0, -5), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(-1, 0, -5), EnumRuneType.FIRE)); - addOffsetRunes(components, 3, 5, 0, EnumRuneType.WATER); - addCornerRunes(components, 3, 0, EnumRuneType.DUSK); - addOffsetRunes(components, 4, 5, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 4, 5, -1, EnumRuneType.EARTH); - addCornerRunes(components, 5, 0, EnumRuneType.EARTH); - } - - @Override - public Ritual getNewCopy() { - return new RitualRegeneration(); - } - - public float getSyphonAmountForWill(double corrosiveWill) { - return 1; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java deleted file mode 100644 index 38ecde78..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ /dev/null @@ -1,184 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("speed") -public class RitualSpeed extends Ritual { - public static final String SPEED_RANGE = "sanicRange"; - - public static final double vengefulWillDrain = 0.05; - public static final double destructiveWillDrain = 0.05; - public static final double rawWillDrain = 0.1; - - public RitualSpeed() { - super("ritualSpeed", 0, 1000, "ritual." + BloodMagic.MODID + ".speedRitual"); - addBlockRange(SPEED_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 1, -2), new BlockPos(2, 5, 2))); - setMaximumVolumeAndDistanceOfRange(SPEED_RANGE, 0, 2, 5); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - AreaDescriptor speedRange = masterRitualStone.getBlockRange(SPEED_RANGE); - - double vengefulDrain = 0; - double destructiveDrain = 0; - double rawDrain = 0; - - if (rawWill < rawWillDrain) { - rawWill = 0; //Simplifies later calculations - } - - for (LivingEntity entity : world.getEntitiesWithinAABB(LivingEntity.class, speedRange.getAABB(masterRitualStone.getBlockPos()))) { - if (entity.isSneaking()) - continue; - - boolean transportChildren = destructiveWill < destructiveWillDrain; - boolean transportAdults = vengefulWill < vengefulWillDrain; - - if ((entity.isChild() && !transportChildren) || (!entity.isChild() && !transportAdults)) { - continue; - } - - if (entity instanceof PlayerEntity && (transportChildren ^ transportAdults)) { - continue; - } - - if (!transportChildren) { - destructiveWill -= destructiveWillDrain; - destructiveDrain += destructiveWillDrain; - } - - if (!transportAdults) { - vengefulWill -= vengefulWillDrain; - vengefulDrain += vengefulWillDrain; - } - - double motionY = getVerticalSpeedForWill(rawWill); - double speed = getHorizontalSpeedForWill(rawWill); - Direction direction = masterRitualStone.getDirection(); - - if (rawWill >= rawWillDrain) { - rawWill -= rawWillDrain; - rawDrain += rawWillDrain; - } - - entity.motionY = motionY; - entity.fallDistance = 0; - - switch (direction) { - case NORTH: - entity.motionX = 0; - entity.motionY = motionY; - entity.motionZ = -speed; - break; - - case SOUTH: - entity.motionX = 0; - entity.motionY = motionY; - entity.motionZ = speed; - break; - - case WEST: - entity.motionX = -speed; - entity.motionY = motionY; - entity.motionZ = 0; - break; - - case EAST: - entity.motionX = speed; - entity.motionY = motionY; - entity.motionZ = 0; - break; - default: - break; - } - - if (entity instanceof PlayerEntity) { - Utils.setPlayerSpeedFromServer((PlayerEntity) entity, entity.motionX, entity.motionY, entity.motionZ); - } - } - - if (rawDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrain, true); - } - - if (vengefulDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); - } - - if (destructiveDrain > 0) { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveDrain, true); - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 5; - } - - @Override - public void gatherComponents(Consumer components) { - addRune(components, 0, 0, -2, EnumRuneType.DUSK); - addRune(components, 1, 0, -1, EnumRuneType.AIR); - addRune(components, -1, 0, -1, EnumRuneType.AIR); - for (int i = 0; i < 3; i++) { - addRune(components, 2, 0, i, EnumRuneType.AIR); - addRune(components, -2, 0, i, EnumRuneType.AIR); - } - } - - @Override - public Ritual getNewCopy() { - return new RitualSpeed(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[]{new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info")}; - } - - public double getVerticalSpeedForWill(double rawWill) { - return 1.2 + rawWill / 200; - } - - public double getHorizontalSpeedForWill(double rawWill) { - return 3 + rawWill / 40; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java deleted file mode 100644 index 157bd08d..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java +++ /dev/null @@ -1,76 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.tile.TileSpectralBlock; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.function.Consumer; - -@RitualRegister("suppression") -public class RitualSuppression extends Ritual { - public static final String SUPPRESSION_RANGE = "suppressionRange"; - - public RitualSuppression() { - super("ritualSuppression", 0, 10000, "ritual." + BloodMagic.MODID + ".suppressionRitual"); - addBlockRange(SUPPRESSION_RANGE, new AreaDescriptor.HemiSphere(new BlockPos(0, 0, 0), 10)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - final int refresh = 100; - AreaDescriptor suppressionRange = masterRitualStone.getBlockRange(SUPPRESSION_RANGE); - - for (BlockPos blockPos : suppressionRange.getContainedPositions(masterRitualStone.getBlockPos())) { - BlockState state = world.getBlockState(blockPos); - - if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) - TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); - else { - TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TileSpectralBlock) - ((TileSpectralBlock) tile).resetDuration(refresh); - } - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 2; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 2, 0, EnumRuneType.WATER); - addRune(components, -2, 0, -1, EnumRuneType.AIR); - addRune(components, -1, 0, -2, EnumRuneType.AIR); - addRune(components, -2, 0, 1, EnumRuneType.AIR); - addRune(components, 1, 0, -2, EnumRuneType.AIR); - addRune(components, 2, 0, 1, EnumRuneType.AIR); - addRune(components, 1, 0, 2, EnumRuneType.AIR); - addRune(components, 2, 0, -1, EnumRuneType.AIR); - addRune(components, -1, 0, 2, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() { - return new RitualSuppression(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java deleted file mode 100644 index e322fec6..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ /dev/null @@ -1,125 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.StatTracker; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; -import com.google.common.collect.Iterables; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.HashMap; -import java.util.List; -import java.util.Map.Entry; -import java.util.function.Consumer; - -@RitualRegister("upgrade_remove") -public class RitualUpgradeRemove extends Ritual { - public static final String CHECK_RANGE = "fillRange"; - - public RitualUpgradeRemove() { - super("ritualUpgradeRemove", 2, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual"); - addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - - if (world.isRemote) { - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); - - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, checkRange.getAABB(pos)); - - for (PlayerEntity player : playerList) { - if (LivingArmour.hasFullSet(player)) { - boolean removedUpgrade = false; - - ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - @SuppressWarnings("unchecked") - HashMap upgradeMap = (HashMap) armour.upgradeMap.clone(); - - for (Entry entry : upgradeMap.entrySet()) { - LivingArmourUpgrade upgrade = entry.getValue(); - String upgradeKey = entry.getKey(); - - ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - LivingUpgrades.setKey(upgradeStack, upgradeKey); - LivingUpgrades.setLevel(upgradeStack, upgrade.getUpgradeLevel()); - - boolean successful = armour.removeUpgrade(player, upgrade); - - if (successful) { - removedUpgrade = true; - world.spawnEntity(new ItemEntity(world, player.posX, player.posY, player.posZ, upgradeStack)); - for (Entry trackerEntry : armour.trackerMap.entrySet()) { - StatTracker tracker = trackerEntry.getValue(); - if (tracker != null) { - if (tracker.providesUpgrade(upgradeKey)) { - tracker.resetTracker(); //Resets the tracker if the upgrade corresponding to it was removed. - } - } - } - } - } - - if (removedUpgrade) { - ((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true); - ItemLivingArmour.setLivingArmour(chestStack, armour); - armour.recalculateUpgradePoints(); - - masterRitualStone.setActive(false); - - world.spawnEntity(new LightningBoltEntity(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); - } - - } - } - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 0, EnumRuneType.FIRE); - addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); - addCornerRunes(components, 1, 1, EnumRuneType.WATER); - addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - addCornerRunes(components, 1, 3, EnumRuneType.WATER); - addParallelRunes(components, 1, 4, EnumRuneType.AIR); - - for (int i = 0; i < 4; i++) { - addCornerRunes(components, 3, i, EnumRuneType.EARTH); - } - } - - @Override - public Ritual getNewCopy() { - return new RitualUpgradeRemove(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java deleted file mode 100644 index df962827..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualVeilOfEvil.java +++ /dev/null @@ -1,102 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.handler.event.GenericHandler; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -@RitualRegister("veil_of_evil") -public class RitualVeilOfEvil extends Ritual { - public static final String VEIL_RANGE = "veilRange"; - - public RitualVeilOfEvil() { - super("ritualVeilOfEvil", 0, 40000, "ritual." + BloodMagic.MODID + ".veilOfEvilRitual"); - addBlockRange(VEIL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-16, 0, -16), 33)); - setMaximumVolumeAndDistanceOfRange(VEIL_RANGE, 0, 256, 256); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - /* Default Ritual Stuff */ - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - // int maxEffects = currentEssence / getRefreshCost(); - // int totalEffects = 0; - - /* Default will augment stuff */ - List willConfig = masterRitualStone.getActiveWillConfig(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - double rawDrained = 0; - double corrosiveDrained = 0; - double destructiveDrained = 0; - double steadfastDrained = 0; - double vengefulDrained = 0; - - /* Actual ritual stuff begins here */ - - if (GenericHandler.forceSpawnMap.containsKey(world)) { - Map forceSpawnMap = GenericHandler.forceSpawnMap.get(world); - if (forceSpawnMap != null) { - forceSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(VEIL_RANGE)); - } else { - forceSpawnMap = new HashMap<>(); - forceSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(VEIL_RANGE)); - GenericHandler.forceSpawnMap.put(world, forceSpawnMap); - } - } else { - HashMap forceSpawnMap = new HashMap<>(); - forceSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(VEIL_RANGE)); - GenericHandler.forceSpawnMap.put(world, forceSpawnMap); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - } - - @Override - public int getRefreshCost() { - return 0; - } - - @Override - public void gatherComponents(Consumer components) { - - addOffsetRunes(components, 1, 0, 2, EnumRuneType.DUSK); - addCornerRunes(components, 3, 0, EnumRuneType.FIRE); - - for (int i = 0; i <= 1; i++) { - addParallelRunes(components, (4 + i), i, EnumRuneType.DUSK); - addOffsetRunes(components, (4 + i), i, -1, EnumRuneType.BLANK); - addOffsetRunes(components, 4, 5, i, EnumRuneType.EARTH); - } - - addCornerRunes(components, 5, 1, EnumRuneType.BLANK); - } - - @Override - public Ritual getNewCopy() { - return new RitualVeilOfEvil(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java deleted file mode 100644 index 8e631f4c..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWardOfSacrosanctity.java +++ /dev/null @@ -1,105 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.util.handler.event.GenericHandler; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -@RitualRegister("ward_of_sacrosanctity") -public class RitualWardOfSacrosanctity extends Ritual { - public static final String SPAWN_WARD = "spawnWard"; - - public RitualWardOfSacrosanctity() { - super("ritualWardOfSacrosanctity", 0, 40000, "ritual." + BloodMagic.MODID + ".wardOfSacrosanctityRitual"); - addBlockRange(SPAWN_WARD, new AreaDescriptor.Rectangle(new BlockPos(-16, -10, -16), 33)); - - setMaximumVolumeAndDistanceOfRange(SPAWN_WARD, 0, 256, 256); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - /* Default Ritual Stuff */ - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - // int maxEffects = currentEssence / getRefreshCost(); - // int totalEffects = 0; - - /* Default will augment stuff */ - List willConfig = masterRitualStone.getActiveWillConfig(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - double rawDrained = 0; - double corrosiveDrained = 0; - double destructiveDrained = 0; - double steadfastDrained = 0; - double vengefulDrained = 0; - - /* Actual ritual stuff begins here */ - - if (GenericHandler.preventSpawnMap.containsKey(world)) { - Map preventSpawnMap = GenericHandler.preventSpawnMap.get(world); - if (preventSpawnMap != null) { - preventSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(SPAWN_WARD)); - } else { - preventSpawnMap = new HashMap<>(); - preventSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(SPAWN_WARD)); - GenericHandler.preventSpawnMap.put(world, preventSpawnMap); - } - } else { - HashMap preventSpawnMap = new HashMap<>(); - preventSpawnMap.put(masterRitualStone, masterRitualStone.getBlockRange(SPAWN_WARD)); - GenericHandler.preventSpawnMap.put(world, preventSpawnMap); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - } - - @Override - public int getRefreshTime() { - return 25; - } - - @Override - public int getRefreshCost() { - return 2; - } - - @Override - public void gatherComponents(Consumer components) { - for (int i = 2; i < 5; i++) { - if (i < 4) { - addParallelRunes(components, 1, 0, EnumRuneType.AIR); - } - addCornerRunes(components, i, 0, EnumRuneType.FIRE); - } - addParallelRunes(components, 5, 0, EnumRuneType.DUSK); - addOffsetRunes(components, 5, 6, 0, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() { - return new RitualWardOfSacrosanctity(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java deleted file mode 100644 index a06bbfcb..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java +++ /dev/null @@ -1,69 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import net.minecraft.block.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.function.Consumer; - -@RitualRegister("water") -public class RitualWater extends Ritual { - public static final String WATER_RANGE = "waterRange"; - - public RitualWater() { - super("ritualWater", 0, 500, "ritual." + BloodMagic.MODID + ".waterRitual"); - addBlockRange(WATER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - setMaximumVolumeAndDistanceOfRange(WATER_RANGE, 9, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - AreaDescriptor waterRange = masterRitualStone.getBlockRange(WATER_RANGE); - - for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos())) { - if (world.isAirBlock(newPos)) { - world.setBlockState(newPos, Blocks.FLOWING_WATER.getDefaultState()); - totalEffects++; - } - - if (totalEffects >= maxEffects) { - break; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 25; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() { - return new RitualWater(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java deleted file mode 100644 index 96637f32..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ /dev/null @@ -1,135 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.tile.TileAltar; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityRegistry; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("well_of_suffering") -public class RitualWellOfSuffering extends Ritual { - public static final String ALTAR_RANGE = "altar"; - public static final String DAMAGE_RANGE = "damage"; - - public static final int SACRIFICE_AMOUNT = 25; - - public BlockPos altarOffsetPos = new BlockPos(0, 0, 0); //TODO: Save! - - public RitualWellOfSuffering() { - super("ritualWellOfSuffering", 0, 40000, "ritual." + BloodMagic.MODID + ".wellOfSufferingRitual"); - addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); - addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), 21)); - - setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); - setMaximumVolumeAndDistanceOfRange(DAMAGE_RANGE, 0, 15, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - BlockPos altarPos = pos.add(altarOffsetPos); - - TileEntity tile = world.getTileEntity(altarPos); - - AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); - - if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) { - for (BlockPos newPos : altarRange.getContainedPositions(pos)) { - TileEntity nextTile = world.getTileEntity(newPos); - if (nextTile instanceof TileAltar) { - tile = nextTile; - altarOffsetPos = newPos.subtract(pos); - - altarRange.resetCache(); - break; - } - } - } - - if (tile instanceof TileAltar) { - TileAltar tileAltar = (TileAltar) tile; - - AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); - AxisAlignedBB range = damageRange.getAABB(pos); - - List entities = world.getEntitiesWithinAABB(LivingEntity.class, range); - - for (LivingEntity entity : entities) { - EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); - - if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) - continue; - - int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(entityEntry.getRegistryName(), SACRIFICE_AMOUNT); - - if (lifeEssenceRatio <= 0) - continue; - - if (entity.isEntityAlive() && !(entity instanceof PlayerEntity)) { - if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) { - if (entity.isChild()) - lifeEssenceRatio *= 0.5F; - - tileAltar.sacrificialDaggerCall(lifeEssenceRatio, true); - - totalEffects++; - - if (totalEffects >= maxEffects) { - break; - } - } - } - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() { - return 25; - } - - @Override - public int getRefreshCost() { - return 2; - } - - @Override - public void gatherComponents(Consumer components) { - addCornerRunes(components, 1, 0, EnumRuneType.FIRE); - addCornerRunes(components, 2, -1, EnumRuneType.FIRE); - addParallelRunes(components, 2, -1, EnumRuneType.EARTH); - addCornerRunes(components, -3, -1, EnumRuneType.DUSK); - addOffsetRunes(components, 2, 4, -1, EnumRuneType.WATER); - addOffsetRunes(components, 1, 4, 0, EnumRuneType.WATER); - addParallelRunes(components, 4, 1, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() { - return new RitualWellOfSuffering(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java deleted file mode 100644 index 5ca867d6..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java +++ /dev/null @@ -1,95 +0,0 @@ -package WayofTime.bloodmagic.ritual.types; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.function.Consumer; - -@RitualRegister("zephyr") -public class RitualZephyr extends Ritual { - public static final String ZEPHYR_RANGE = "zephyrRange"; - public static final String CHEST_RANGE = "chest"; - - public RitualZephyr() { - super("ritualZephyr", 0, 1000, "ritual." + BloodMagic.MODID + ".zephyrRitual"); - addBlockRange(ZEPHYR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(ZEPHYR_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); - if (!masterRitualStone.getWorldObj().isRemote && tileInventory != null) { - if (currentEssence < getRefreshCost()) { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - AreaDescriptor zephyrRange = masterRitualStone.getBlockRange(ZEPHYR_RANGE); - - List itemList = world.getEntitiesWithinAABB(ItemEntity.class, zephyrRange.getAABB(masterRitualStone.getBlockPos())); - int count = 0; - - for (ItemEntity entityItem : itemList) { - if (entityItem.isDead) { - continue; - } - - ItemStack copyStack = entityItem.getItem().copy(); - int originalAmount = copyStack.getCount(); - ItemStack newStack = Utils.insertStackIntoTile(copyStack, tileInventory, Direction.DOWN); - - if (!newStack.isEmpty() && newStack.getCount() < originalAmount) { - count++; - if (newStack.isEmpty()) - entityItem.setDead(); - - entityItem.getItem().setCount(newStack.getCount()); - } - - if (newStack.isEmpty()) { - entityItem.setDead(); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * Math.min(count, 100))); - } - } - - @Override - public int getRefreshTime() { - return 1; - } - - @Override - public int getRefreshCost() { - return 1; - } - - @Override - public void gatherComponents(Consumer components) { - addParallelRunes(components, 2, 0, EnumRuneType.AIR); - addCornerRunes(components, 1, 1, EnumRuneType.AIR); - addParallelRunes(components, 1, -1, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() { - return new RitualZephyr(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java deleted file mode 100644 index 674232c4..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualDay.java +++ /dev/null @@ -1,23 +0,0 @@ -package WayofTime.bloodmagic.ritual.types.imperfect; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; - -//@RitualRegister.Imperfect("day") -public class ImperfectRitualDay extends ImperfectRitual { - public ImperfectRitualDay() { - super("day", s -> s.getBlock() == Blocks.GOLD_BLOCK, 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.day"); - } - - @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { - - if (!imperfectRitualStone.getRitualWorld().isRemote) - imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000); - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java deleted file mode 100644 index 31fa5e29..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualNight.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.ritual.types.imperfect; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.RitualRegister; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; - -@RitualRegister.Imperfect("night") -public class ImperfectRitualNight extends ImperfectRitual { - public ImperfectRitualNight() { - super("night", s -> s.getBlock() == Blocks.LAPIS_BLOCK, 100, true, "ritual." + BloodMagic.MODID + ".imperfect.night"); - } - - @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { - - if (!imperfectRitualStone.getRitualWorld().isRemote) - imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000 + 13800); - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java deleted file mode 100644 index 963a77f2..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualRain.java +++ /dev/null @@ -1,29 +0,0 @@ -package WayofTime.bloodmagic.ritual.types.imperfect; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.RitualRegister; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; - -@RitualRegister.Imperfect("rain") -public class ImperfectRitualRain extends ImperfectRitual { - public ImperfectRitualRain() { - super("rain", s -> s.getBlock() == Blocks.WATER, 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.rain"); - } - - @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { - if (!imperfectRitualStone.getRitualWorld().isRemote) { - imperfectRitualStone.getRitualWorld().getWorldInfo().setRaining(true); - } - - if (imperfectRitualStone.getRitualWorld().isRemote) { - imperfectRitualStone.getRitualWorld().setRainStrength(1.0F); - imperfectRitualStone.getRitualWorld().setThunderStrength(1.0F); - } - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java deleted file mode 100644 index 6ba7d951..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualResistance.java +++ /dev/null @@ -1,25 +0,0 @@ -package WayofTime.bloodmagic.ritual.types.imperfect; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.RitualRegister; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; - -@RitualRegister.Imperfect("resistance") -public class ImperfectRitualResistance extends ImperfectRitual { - public ImperfectRitualResistance() { - super("resistance", s -> s.getBlock() == Blocks.BEDROCK, 5000, "ritual." + BloodMagic.MODID + ".imperfect.resistance"); - } - - @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { - - player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 1200, 1)); - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java deleted file mode 100644 index a0fc85ec..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/imperfect/ImperfectRitualZombie.java +++ /dev/null @@ -1,32 +0,0 @@ -package WayofTime.bloodmagic.ritual.types.imperfect; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ritual.RitualRegister; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import net.minecraft.entity.monster.ZombieEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; - -@RitualRegister.Imperfect("zombie") -public class ImperfectRitualZombie extends ImperfectRitual { - public ImperfectRitualZombie() { - super("zombie", s -> s.getBlock() == Blocks.COAL_BLOCK, 5000, "ritual." + BloodMagic.MODID + ".imperfect.zombie"); - } - - @Override - public boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player) { - ZombieEntity zombie = new ZombieEntity(imperfectRitualStone.getRitualWorld()); - zombie.setPosition(imperfectRitualStone.getRitualPos().getX() + 0.5, imperfectRitualStone.getRitualPos().getY() + 2.1, imperfectRitualStone.getRitualPos().getZ() + 0.5); - zombie.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 2000)); - zombie.addPotionEffect(new EffectInstance(Effects.STRENGTH, 20000, 7)); - zombie.addPotionEffect(new EffectInstance(Effects.RESISTANCE, 20000, 3)); - - if (!imperfectRitualStone.getRitualWorld().isRemote) - imperfectRitualStone.getRitualWorld().spawnEntity(zombie); - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java deleted file mode 100644 index c33f19c9..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java +++ /dev/null @@ -1,117 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; - -/** - * This particular implementation of IItemFilter allows any item to be drained - * from or inputed to the connected inventory. Every stack is accepted here! - * We're basically Olive Gardens. - * - * @author WayofTime - */ -public class DefaultItemFilter implements IItemFilter { - protected TileEntity accessedTile; - protected IItemHandler itemHandler; - - /** - * Initializes the filter so that it knows what it wants to fulfill. - * - * @param filteredList - The list of ItemStacks that the filter is set to. - * @param itemHandler - The inventory that is being accessed. This inventory is either - * being pulled from or pushed to. - * @param isFilterOutput - Tells the filter what actions to expect. If true, it should be - * initialized as an output filter. If false, it should be - * initialized as an input filter. - */ - @Override - public void initializeFilter(List filteredList, TileEntity tile, IItemHandler itemHandler, boolean isFilterOutput) { - this.accessedTile = tile; - this.itemHandler = itemHandler; - } - - /** - * This method is only called when the output inventory this filter is - * managing receives an ItemStack. Should only really be called by the Input - * filter via it's transfer method. - * - * @param inputStack - The stack to transfer - * @return - The remainder of the stack after it has been absorbed into the - * inventory. - */ - @Override - public ItemStack transferStackThroughOutputFilter(ItemStack inputStack) { - int allowedAmount = inputStack.getCount(); //This is done to make the migration to a maximum amount transfered a lot easier - - if (allowedAmount <= 0) { - return inputStack; - } - - ItemStack testStack = inputStack.copy(); - testStack.setCount(allowedAmount); - ItemStack remainderStack = Utils.insertStackIntoTile(testStack, itemHandler); - - int changeAmount = allowedAmount - (remainderStack.isEmpty() ? 0 : remainderStack.getCount()); - testStack = inputStack.copy(); - testStack.shrink(changeAmount); - - World world = accessedTile.getWorld(); - BlockPos pos = accessedTile.getPos(); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 3); - - return testStack; - } - - /** - * This method is only called on an input filter to transfer ItemStacks from - * the input inventory to the output inventory. - */ - @Override - public int transferThroughInputFilter(IItemFilter outputFilter, int maxTransfer) { - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - ItemStack inputStack = itemHandler.getStackInSlot(slot); - if (inputStack.isEmpty() || itemHandler.extractItem(slot, inputStack.getCount(), true).isEmpty())//(accessedInventory instanceof ISidedInventory && !((ISidedInventory) accessedInventory).canExtractItem(slot, inputStack, accessedSide))) - { - continue; - } - - int allowedAmount = Math.min(itemHandler.extractItem(slot, inputStack.getCount(), true).getCount(), maxTransfer); - - ItemStack testStack = inputStack.copy(); - testStack.setCount(allowedAmount); - ItemStack remainderStack = outputFilter.transferStackThroughOutputFilter(testStack); - int changeAmount = allowedAmount - (remainderStack.isEmpty() ? 0 : remainderStack.getCount()); - - if (!remainderStack.isEmpty() && remainderStack.getCount() == allowedAmount) { - //Nothing has changed. Moving on! - continue; - } - - itemHandler.extractItem(slot, changeAmount, false); - - World world = accessedTile.getWorld(); - BlockPos pos = accessedTile.getPos(); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 3); - - return changeAmount; - } - - return 0; - } - - @Override - public boolean doesStackMatchFilter(ItemStack testStack) { - return true; - } - - @Override - public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/IFluidFilter.java deleted file mode 100644 index d4851334..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IFluidFilter.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; - -import java.util.List; - -public interface IFluidFilter extends IRoutingFilter { - void initializeFilter(List filteredList, TileEntity tile, IFluidHandler fluidHandler, boolean isFilterOutput); - - /** - * This method is only called when the output tank this filter is managing - * receives an ItemStack. Should only really be called by the Input filter - * via it's transfer method. - * - * @param fluidStack - The stack to filter - * @return - The remainder of the stack after it has been absorbed into the - * tank. - */ - FluidStack transferStackThroughOutputFilter(FluidStack fluidStack); - - /** - * This method is only called on an input filter to transfer FluidStacks - * from the input tank to the output tank. - */ - int transferThroughInputFilter(IFluidFilter outputFilter, int maxTransfer); - - boolean doesStackMatchFilter(FluidStack testStack); - - boolean doStacksMatch(FluidStack filterStack, FluidStack testStack); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java deleted file mode 100644 index 0c795a44..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IFluidRoutingNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.Direction; - -public interface IFluidRoutingNode extends IRoutingNode { - boolean isTankConnectedToSide(Direction side); - - int getPriority(Direction side); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java deleted file mode 100644 index 697df7dc..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IInputFluidRoutingNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.Direction; - -public interface IInputFluidRoutingNode extends IFluidRoutingNode { - boolean isFluidInput(Direction side); - - IFluidFilter getInputFluidFilterForSide(Direction side); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java deleted file mode 100644 index 1d19cfa8..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.Direction; - -public interface IInputItemRoutingNode extends IItemRoutingNode { - boolean isInput(Direction side); - - IItemFilter getInputFilterForSide(Direction side); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java deleted file mode 100644 index 443b0d69..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java +++ /dev/null @@ -1,32 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; - -public interface IItemFilter extends IRoutingFilter { - void initializeFilter(List filteredList, TileEntity tile, IItemHandler itemHandler, boolean isFilterOutput); - - /** - * This method is only called when the output inventory this filter is - * managing receives an ItemStack. Should only really be called by the Input - * filter via it's transfer method. - * - * @param inputStack - The stack to filter - * @return - The remainder of the stack after it has been absorbed into the - * inventory. - */ - ItemStack transferStackThroughOutputFilter(ItemStack inputStack); - - /** - * This method is only called on an input filter to transfer ItemStacks from - * the input inventory to the output inventory. - */ - int transferThroughInputFilter(IItemFilter outputFilter, int maxTransfer); - - boolean doesStackMatchFilter(ItemStack testStack); - - boolean doStacksMatch(ItemStack filterStack, ItemStack testStack); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java deleted file mode 100644 index 21dee0c6..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IItemRoutingNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.Direction; - -public interface IItemRoutingNode extends IRoutingNode { - boolean isInventoryConnectedToSide(Direction side); - - int getPriority(Direction side); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java deleted file mode 100644 index dba8ba08..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.math.BlockPos; - -import java.util.List; - -public interface IMasterRoutingNode extends IRoutingNode { - boolean isConnected(List path, BlockPos nodePos); - - void addNodeToList(IRoutingNode node); - - void addConnections(BlockPos pos, List connectionList); - - void addConnection(BlockPos pos1, BlockPos pos2); - - void removeConnection(BlockPos pos1, BlockPos pos2); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java deleted file mode 100644 index 5ef76540..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IOutputFluidRoutingNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.Direction; - -public interface IOutputFluidRoutingNode extends IFluidRoutingNode { - boolean isFluidOutput(Direction side); - - IFluidFilter getOutputFluidFilterForSide(Direction side); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java deleted file mode 100644 index 8bf50ec4..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.Direction; - -public interface IOutputItemRoutingNode extends IItemRoutingNode { - boolean isOutput(Direction side); - - IItemFilter getOutputFilterForSide(Direction side); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IRoutingFilter.java b/src/main/java/WayofTime/bloodmagic/routing/IRoutingFilter.java deleted file mode 100644 index d7413770..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IRoutingFilter.java +++ /dev/null @@ -1,5 +0,0 @@ -package WayofTime.bloodmagic.routing; - -public interface IRoutingFilter { - -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java deleted file mode 100644 index 3498c570..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; - -public interface IRoutingNode { - void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master); - - BlockPos getBlockPos(); - - List getConnected(); - - BlockPos getMasterPos(); - - boolean isConnectionEnabled(BlockPos testPos); - - boolean isMaster(IMasterRoutingNode master); - - void addConnection(BlockPos pos1); - - void removeConnection(BlockPos pos1); - - void removeAllConnections(); -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/IgnoreNBTItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/IgnoreNBTItemFilter.java deleted file mode 100644 index b7ef367d..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/IgnoreNBTItemFilter.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.item.ItemStack; - -public class IgnoreNBTItemFilter extends TestItemFilter { - @Override - public boolean doesStackMatchFilter(ItemStack testStack) { - for (ItemStack filterStack : requestList) { - if (doStacksMatch(filterStack, testStack)) { - return true; - } - } - - return false; - } - - @Override - public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - return ItemStack.areItemsEqual(filterStack, testStack); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java deleted file mode 100644 index 36531585..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java +++ /dev/null @@ -1,16 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.item.ItemStack; - -public class ModIdItemFilter extends TestItemFilter { - - @Override - public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - return getModID(filterStack).equalsIgnoreCase(getModID(testStack)); - } - - public String getModID(ItemStack stack) { - String modid = stack.getItem().getCreatorModId(stack); - return modid == null ? "" : modid; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java b/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java deleted file mode 100644 index bd9ff18a..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java +++ /dev/null @@ -1,21 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class NodeHelper { - public static boolean isNodeConnectionEnabled(World world, IRoutingNode node, BlockPos testPos) { - if (!node.isConnectionEnabled(testPos)) { - return false; - } - TileEntity tile = world.getTileEntity(testPos); - if (!(tile instanceof IRoutingNode)) { - return false; - } - - IRoutingNode testNode = (IRoutingNode) tile; - - return testNode.isConnectionEnabled(node.getBlockPos()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java deleted file mode 100644 index aa209492..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/OreDictItemFilter.java +++ /dev/null @@ -1,40 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class OreDictItemFilter extends TestItemFilter { - @Override - public boolean doesStackMatchFilter(ItemStack testStack) { - for (ItemStack filterStack : requestList) { - if (doStacksMatch(filterStack, testStack)) { - return true; - } - } - - return false; - } - - @Override - public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - if (filterStack.isEmpty() || testStack.isEmpty()) - return false; - - int[] filterIds = OreDictionary.getOreIDs(filterStack); - int[] testIds = OreDictionary.getOreIDs(testStack); - - if (filterIds.length <= 0 || testIds.length <= 0) { - return false; - } - - for (int filterId : filterIds) { - for (int testId : testIds) { - if (filterId == testId) { - return true; - } - } - } - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java deleted file mode 100644 index 9f4b47a7..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java +++ /dev/null @@ -1,189 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidTankProperties; - -public class RoutingFluidFilter implements IFluidFilter { - protected List requestList; - protected TileEntity accessedTile; - protected IFluidHandler fluidHandler; - - @Override - public void initializeFilter(List filteredList, TileEntity tile, IFluidHandler fluidHandler, boolean isFilterOutput) { - this.accessedTile = tile; - this.fluidHandler = fluidHandler; - if (isFilterOutput) { - //The requestList contains a list of how much can be extracted. - requestList = new ArrayList<>(); - for (ItemStack filterStack : filteredList) { - FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); - if (fluidFilterStack != null) { - requestList.add(fluidFilterStack); - } - } - - IFluidTankProperties[] properties = fluidHandler.getTankProperties(); - - for (IFluidTankProperties property : properties) { - FluidStack containedStack = property.getContents(); - if (containedStack != null) { - for (FluidStack fluidFilterStack : requestList) { - if (doStacksMatch(fluidFilterStack, containedStack)) { - fluidFilterStack.amount = Math.max(fluidFilterStack.amount - containedStack.amount, 0); - } - } - } - } - } else { - requestList = new ArrayList<>(); - for (ItemStack filterStack : filteredList) { - FluidStack fluidFilterStack = getFluidStackFromItemStack(filterStack); - if (fluidFilterStack != null) { - fluidFilterStack.amount *= -1; - requestList.add(fluidFilterStack); - } - } - - IFluidTankProperties[] properties = fluidHandler.getTankProperties(); - - for (IFluidTankProperties property : properties) { - FluidStack containedStack = property.getContents(); - if (containedStack != null) { - for (FluidStack fluidFilterStack : requestList) { - if (doStacksMatch(fluidFilterStack, containedStack)) { - fluidFilterStack.amount += containedStack.amount; - } - } - } - } - } - } - - /** - * Gives the remainder~ - */ - @Override - public FluidStack transferStackThroughOutputFilter(FluidStack fluidStack) { - int allowedAmount = 0; - for (FluidStack filterStack : requestList) { - if (doStacksMatch(filterStack, fluidStack)) { - allowedAmount = Math.min(filterStack.amount, fluidStack.amount); - break; - } - } - - if (allowedAmount <= 0) { - return fluidStack; - } - - FluidStack copyStack = fluidStack.copy(); - int filledAmount = fluidHandler.fill(fluidStack, true); - copyStack.amount = fluidStack.amount - filledAmount; - - Iterator itr = requestList.iterator(); - while (itr.hasNext()) { - FluidStack filterStack = itr.next(); - if (doStacksMatch(filterStack, copyStack)) { - filterStack.amount -= filledAmount; - if (filterStack.amount <= 0) { - itr.remove(); - } - } - } - - World world = accessedTile.getWorld(); - BlockPos pos = accessedTile.getPos(); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 3); - - return copyStack.amount <= 0 ? null : copyStack; - } - - @Override - public int transferThroughInputFilter(IFluidFilter outputFilter, int maxTransfer) { - for (FluidStack filterFluidStack : requestList) { - int allowedAmount = Math.min(filterFluidStack.amount, maxTransfer); - if (allowedAmount <= 0) { - continue; - } - - FluidStack copyStack = filterFluidStack.copy(); - copyStack.amount = allowedAmount; - FluidStack drainStack = fluidHandler.drain(copyStack, false); - if (drainStack != null) //Can't pull this liquid out for some reason if it fails this check - { - FluidStack remainderStack = outputFilter.transferStackThroughOutputFilter(drainStack); - int drained = remainderStack == null ? copyStack.amount : (copyStack.amount - remainderStack.amount); - - if (drained > 0) { - drainStack.amount = drained; - - fluidHandler.drain(drainStack, true); - maxTransfer -= drained; - } - - Iterator itr = requestList.iterator(); - while (itr.hasNext()) { - FluidStack filterStack = itr.next(); - if (doStacksMatch(filterStack, copyStack)) { - filterStack.amount -= drained; - if (filterStack.amount <= 0) { - itr.remove(); - } - } - } - - World world = accessedTile.getWorld(); - BlockPos pos = accessedTile.getPos(); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 3); - - return maxTransfer; - } - } - - return 0; - } - - @Override - public boolean doesStackMatchFilter(FluidStack testStack) { - for (FluidStack filterStack : requestList) { - if (doStacksMatch(filterStack, testStack)) { - return true; - } - } - - return false; - } - - @Override - public boolean doStacksMatch(FluidStack filterStack, FluidStack testStack) { - return testStack != null && filterStack.getFluid() == testStack.getFluid(); - } - - @Nullable - public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) { - boolean isEmpty = false; - if (inputStack.getCount() == 0) { - isEmpty = true; - inputStack.setCount(1); - } - - FluidStack fluidStack = FluidUtil.getFluidContained(inputStack); - if (fluidStack == null) - return null; - - fluidStack.amount = isEmpty ? 0 : inputStack.getCount(); - return fluidStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java deleted file mode 100644 index 2e45865d..00000000 --- a/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java +++ /dev/null @@ -1,214 +0,0 @@ -package WayofTime.bloodmagic.routing; - -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; - -import java.util.Iterator; -import java.util.List; - -/** - * This particular implementation of IItemFilter checks to make sure that a) as - * an output filter it will fill until the requested amount and b) as an input - * filter it will only syphon until the requested amount. - * - * @author WayofTime - */ -public class TestItemFilter implements IItemFilter { - /* - * This list acts as the way the filter keeps track of its contents. For the - * case of an output filter, it holds a list of ItemStacks that needs to be - * inserted in the inventory to finish its request. For the case of an input - * filter, it keeps track of how many can be removed. - */ - protected List requestList; - protected TileEntity accessedTile; - protected IItemHandler itemHandler; - - /** - * Initializes the filter so that it knows what it wants to fulfill. - * - * @param filteredList - The list of ItemStacks that the filter is set to. - * @param tile - The inventory that is being accessed. This inventory is either - * being pulled from or pushed to. - * @param itemHandler - The item handler - * @param isFilterOutput - Tells the filter what actions to expect. If true, it should be - * initialized as an output filter. If false, it should be - * initialized as an input filter. - */ - @Override - public void initializeFilter(List filteredList, TileEntity tile, IItemHandler itemHandler, boolean isFilterOutput) { - this.accessedTile = tile; - this.itemHandler = itemHandler; - if (isFilterOutput) { - requestList = filteredList; - - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - ItemStack checkedStack = itemHandler.getStackInSlot(slot); - if (checkedStack.isEmpty()) { - continue; - } - - int stackSize = checkedStack.getCount(); - - for (ItemStack filterStack : requestList) { - if (filterStack.getCount() == 0) { - continue; - } - - if (doStacksMatch(filterStack, checkedStack)) { - filterStack.setCount(Math.max(filterStack.getCount() - stackSize, 0)); - } - } - } - } else { - requestList = filteredList; - for (ItemStack filterStack : requestList) { - filterStack.setCount(filterStack.getCount() * -1); //Invert the stack size so that - } - - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - ItemStack checkedStack = itemHandler.getStackInSlot(slot); - if (checkedStack.isEmpty()) { - continue; - } - - int stackSize = checkedStack.getCount(); - - for (ItemStack filterStack : filteredList) { - if (doStacksMatch(filterStack, checkedStack)) { - filterStack.grow(stackSize); - } - } - } - } - - requestList.removeIf(ItemStack::isEmpty); - } - - /** - * This method is only called when the output inventory this filter is - * managing receives an ItemStack. Should only really be called by the Input - * filter via it's transfer method. - * - * @param inputStack - The stack to transfer - * @return - The remainder of the stack after it has been absorbed into the - * inventory. - */ - @Override - public ItemStack transferStackThroughOutputFilter(ItemStack inputStack) { - int allowedAmount = 0; - for (ItemStack filterStack : requestList) { - if (doStacksMatch(filterStack, inputStack)) { - allowedAmount = Math.min(filterStack.getCount(), inputStack.getCount()); - break; - } - } - - if (allowedAmount <= 0) { - return inputStack; - } - - ItemStack testStack = inputStack.copy(); - testStack.setCount(allowedAmount); - ItemStack remainderStack = Utils.insertStackIntoTile(testStack, itemHandler); - - int changeAmount = allowedAmount - (remainderStack.isEmpty() ? 0 : remainderStack.getCount()); - testStack = inputStack.copy(); - testStack.shrink(changeAmount); - - Iterator itr = requestList.iterator(); - while (itr.hasNext()) { - ItemStack filterStack = itr.next(); - if (doStacksMatch(filterStack, inputStack)) { - filterStack.shrink(changeAmount); - if (filterStack.isEmpty()) { - itr.remove(); - } - } - } - - World world = accessedTile.getWorld(); - BlockPos pos = accessedTile.getPos(); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 3); - - return testStack; - } - - /** - * This method is only called on an input filter to transfer ItemStacks from - * the input inventory to the output inventory. - */ - @Override - public int transferThroughInputFilter(IItemFilter outputFilter, int maxTransfer) { - for (int slot = 0; slot < itemHandler.getSlots(); slot++) { - ItemStack inputStack = itemHandler.getStackInSlot(slot); - if (inputStack.isEmpty() || itemHandler.extractItem(slot, inputStack.getCount(), true).isEmpty())//(accessedInventory instanceof ISidedInventory && !((ISidedInventory) accessedInventory).canExtractItem(slot, inputStack, accessedSide))) - { - continue; - } - - int allowedAmount = 0; - for (ItemStack filterStack : requestList) { - if (doStacksMatch(filterStack, inputStack)) { - allowedAmount = Math.min(maxTransfer, Math.min(filterStack.getCount(), itemHandler.extractItem(slot, inputStack.getCount(), true).getCount())); - break; - } - } - - if (allowedAmount <= 0) { - continue; - } - - ItemStack testStack = inputStack.copy(); - testStack.setCount(allowedAmount); - ItemStack remainderStack = outputFilter.transferStackThroughOutputFilter(testStack); - int changeAmount = allowedAmount - (remainderStack.isEmpty() ? 0 : remainderStack.getCount()); - - if (!remainderStack.isEmpty() && remainderStack.getCount() == allowedAmount) { - //Nothing has changed. Moving on! - continue; - } - - itemHandler.extractItem(slot, changeAmount, false); - - Iterator itr = requestList.iterator(); - while (itr.hasNext()) { - ItemStack filterStack = itr.next(); - if (doStacksMatch(filterStack, inputStack)) { - filterStack.shrink(changeAmount); - if (filterStack.isEmpty()) { - itr.remove(); - } - } - } - - World world = accessedTile.getWorld(); - BlockPos pos = accessedTile.getPos(); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 3); - - return changeAmount; - } - - return 0; - } - - @Override - public boolean doesStackMatchFilter(ItemStack testStack) { - for (ItemStack filterStack : requestList) { - if (doStacksMatch(filterStack, testStack)) { - return true; - } - } - - return false; - } - - @Override - public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - return Utils.canCombine(filterStack, testStack); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java deleted file mode 100644 index 884431b0..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java +++ /dev/null @@ -1,81 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import net.minecraft.nbt.CompoundNBT; - -import java.util.HashMap; -import java.util.Map.Entry; - -public class DemonWillHolder { - public HashMap willMap = new HashMap<>(); - - public double addWill(EnumDemonWillType type, double amount, double max) { - double current = 0; - if (willMap.containsKey(type)) { - current = willMap.get(type); - } - - double added = Math.min(max - current, amount); - addWill(type, amount); - - return added; - } - - public void addWill(EnumDemonWillType type, double amount) { - if (willMap.containsKey(type)) { - willMap.put(type, amount + willMap.get(type)); - } else { - willMap.put(type, amount); - } - } - - public double drainWill(EnumDemonWillType type, double amount) { - if (willMap.containsKey(type)) { - double current = willMap.get(type); - double reduced = Math.min(current, amount); - - if (reduced >= current) { - willMap.remove(type); - } else { - willMap.put(type, current - reduced); - } - - return reduced; - } - - return 0; - } - - public double getWill(EnumDemonWillType type) { - if (willMap.containsKey(type)) { - return willMap.get(type); - } - - return 0; - } - - public void readFromNBT(CompoundNBT tag, String key) { - CompoundNBT willTag = tag.getCompound(key); - - willMap.clear(); - - for (EnumDemonWillType type : EnumDemonWillType.values()) { - double amount = willTag.getDouble("EnumWill" + type.getName()); - if (amount > 0) { - willMap.put(type, amount); - } - } - } - - public void writeToNBT(CompoundNBT tag, String key) { - CompoundNBT willTag = new CompoundNBT(); - for (Entry entry : willMap.entrySet()) { - willTag.putDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); - } - - tag.put(key, willTag); - } - - public void clearWill() { - willMap.clear(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java deleted file mode 100644 index 86f5898f..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.types.ISubItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IStringSerializable; - -import javax.annotation.Nonnull; -import java.util.Locale; - -public enum EnumDemonWillType implements IStringSerializable, ISubItem { - DEFAULT("default"), - CORROSIVE("corrosive"), - DESTRUCTIVE("destructive"), - VENGEFUL("vengeful"), - STEADFAST("steadfast"); - - public final String name; - - EnumDemonWillType(String name) { - this.name = name; - } - - @Override - public String toString() { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getName() { - return this.toString(); - } - - - @Nonnull - @Override - public String getInternalName() { - return getName(); - } - - @Nonnull - @Override - public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java deleted file mode 100644 index cb83bc1d..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java +++ /dev/null @@ -1,52 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import net.minecraft.item.ItemStack; - -public interface IDemonWill { - /** - * Obtains the amount of Will an ItemStack contains. - * - * @param willStack - The stack to retrieve the Will from - * @return - The amount of Will an ItemStack contains - */ - double getWill(EnumDemonWillType type, ItemStack willStack); - - @Deprecated - double getWill(ItemStack willStack); - - /** - * Sets the amount of Will in a given ItemStack. - * - * @param willStack - The ItemStack of the Will - * @param will - The amount of will to set the stack to - */ - void setWill(EnumDemonWillType type, ItemStack willStack, double will); - - @Deprecated - void setWill(ItemStack willStack, double will); - - /** - * Drains the demonic will from the willStack. If all of the will is - * drained, the willStack will be removed. - * - * @param willStack - The ItemStack of the will - * @param drainAmount - The amount of Will to drain - * @return The amount of will drained. - */ - double drainWill(EnumDemonWillType type, ItemStack willStack, double drainAmount); - - @Deprecated - double drainWill(ItemStack willStack, double drainAmount); - - /** - * Creates a new ItemStack with the specified number of will. Implementation - * should respect the number requested. - * - * @param meta - The meta of the ItemStack to create - * @param number - The amount of Will to create the Stack with. - * @return - An ItemStack with the set amount of Will - */ - ItemStack createWill(int meta, double number); - - EnumDemonWillType getType(ItemStack stack); -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java deleted file mode 100644 index 0d5027ae..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java +++ /dev/null @@ -1,18 +0,0 @@ -package WayofTime.bloodmagic.soul; - -/** - * Implement this interface on a block that can accept and store Demonic Will. - */ -public interface IDemonWillConduit { - int getWeight(); - - double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill); - - double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain); - - boolean canFill(EnumDemonWillType type); - - boolean canDrain(EnumDemonWillType type); - - double getCurrentWill(EnumDemonWillType type); -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java deleted file mode 100644 index 78c64544..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import net.minecraft.item.ItemStack; - -public interface IDemonWillGem { - /** - * @param willGemStack - The ItemStack for this demon will gem. - * @param willStack - The ItemStack for the will. Item should extend IDemonWill - * @return - The remainder willStack after the will has been absorbed into - * the gem. Return null if there is no will left in the stack. - */ - ItemStack fillDemonWillGem(ItemStack willGemStack, ItemStack willStack); - - /** - * Returns the number of souls that are left in the soul gem. Returns a - * double because souls can be fractionally drained. - */ - double getWill(EnumDemonWillType type, ItemStack willGemStack); - - void setWill(EnumDemonWillType type, ItemStack willGemStack, double amount); - - int getMaxWill(EnumDemonWillType type, ItemStack willGemStack); - - double drainWill(EnumDemonWillType type, ItemStack stack, double drainAmount, boolean doDrain); - - double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill); -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java deleted file mode 100644 index 3a56b4c4..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java +++ /dev/null @@ -1,10 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; - -import java.util.List; - -public interface IDemonWillWeapon { - List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting); -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java b/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java deleted file mode 100644 index 9709817a..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java +++ /dev/null @@ -1,40 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import net.minecraft.item.ItemStack; - -public interface IDiscreteDemonWill { - /** - * Obtains the amount of Will an ItemStack contains. - * - * @param soulStack - The stack to retrieve the Will from - * @return - The amount of Will an ItemStack contains - */ - double getWill(ItemStack soulStack); - - /** - * Drains the demonic will from the willStack. If all of the will is - * drained, the willStack will be removed. Will only drain in discrete - * amounts, determined by getDiscretization. - * - * @param willStack - The ItemStack of the will - * @param drainAmount - The amount of Will to drain - * @return The amount of will drained. - */ - double drainWill(ItemStack willStack, double drainAmount); - - /** - * Gets the discrete number for this demonic will. - * - * @param willStack - The ItemStack of the will - * @return - The discrete number for the given stack. - */ - double getDiscretization(ItemStack willStack); - - /** - * Obtains the type of will this is. - * - * @param willStack - The ItemStack of the will - * @return - The type of will this is. - */ - EnumDemonWillType getType(ItemStack willStack); -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java deleted file mode 100644 index da0f4d07..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/ISoulBreathContainer.java +++ /dev/null @@ -1,15 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import net.minecraft.item.ItemStack; - -public interface ISoulBreathContainer { - double getBreath(ItemStack stack); - - void setBreath(ItemStack stack, double amount); - - int getMaxBreath(ItemStack stack); - - double drainBreath(ItemStack stack, double drainAmount, boolean doDrain); - - double fillBreath(ItemStack stack, double fillAmount, boolean doFill); -} diff --git a/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java deleted file mode 100644 index 51f080d8..00000000 --- a/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java +++ /dev/null @@ -1,176 +0,0 @@ -package WayofTime.bloodmagic.soul; - -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -/** - * This class provides several helper methods in order to handle soul - * consumption and use for a player. This refers to the Soul System, meaning - * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found - * in {@link NetworkHelper} - */ -public class PlayerDemonWillHandler { - /** - * Gets the total amount of Will a player contains in their inventory - * - * @param type - The type of Will to check for - * @param player - The player to check the will of - * @return - The amount of will the player contains - */ - public static double getTotalDemonWill(EnumDemonWillType type, PlayerEntity player) { - NonNullList inventory = player.inventory.mainInventory; - double souls = 0; - - for (ItemStack stack : inventory) { - if (stack.getItem() instanceof IDemonWill && ((IDemonWill) stack.getItem()).getType(stack) == type) { - souls += ((IDemonWill) stack.getItem()).getWill(type, stack); - } else if (stack.getItem() instanceof IDemonWillGem) { - souls += ((IDemonWillGem) stack.getItem()).getWill(type, stack); - } - } - - return souls; - } - - public static EnumDemonWillType getLargestWillType(PlayerEntity player) { - EnumDemonWillType type = EnumDemonWillType.DEFAULT; - double max = getTotalDemonWill(type, player); - - for (EnumDemonWillType testType : EnumDemonWillType.values()) { - double value = getTotalDemonWill(testType, player); - if (value > max) { - type = testType; - } - } - - return type; - } - - /** - * Checks if the player's Tartaric gems are completely full. - * - * @param type - The type of Will to check for - * @param player - The player to check the Will of - * @return - True if all Will containers are full, false if not. - */ - public static boolean isDemonWillFull(EnumDemonWillType type, PlayerEntity player) { - NonNullList inventory = player.inventory.mainInventory; - - boolean hasGem = false; - for (ItemStack stack : inventory) { - if (stack.getItem() instanceof IDemonWillGem) { - hasGem = true; - if (((IDemonWillGem) stack.getItem()).getWill(type, stack) < ((IDemonWillGem) stack.getItem()).getMaxWill(type, stack)) - return false; - } - } - - return hasGem; - } - - /** - * Consumes Will from the inventory of a given player - * - * @param player - The player to consume the will of - * @param amount - The amount of will to consume - * @return - The amount of will consumed. - */ - public static double consumeDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) { - double consumed = 0; - - NonNullList inventory = player.inventory.mainInventory; - - for (int i = 0; i < inventory.size(); i++) { - if (consumed >= amount) - return consumed; - - ItemStack stack = inventory.get(i); - if (stack.getItem() instanceof IDemonWill && ((IDemonWill) stack.getItem()).getType(stack) == type) { - consumed += ((IDemonWill) stack.getItem()).drainWill(type, stack, amount - consumed); - if (((IDemonWill) stack.getItem()).getWill(type, stack) <= 0) - inventory.set(i, ItemStack.EMPTY); - } else if (stack.getItem() instanceof IDemonWillGem) { - consumed += ((IDemonWillGem) stack.getItem()).drainWill(type, stack, amount - consumed, true); - } - } - - return consumed; - } - - /** - * Adds an IDemonWill contained in an ItemStack to one of the Soul Gems in - * the player's inventory. - * - * @param player - The player to add will to - * @param willStack - ItemStack that contains an IDemonWill to be added - * @return - The modified willStack - */ - public static ItemStack addDemonWill(PlayerEntity player, ItemStack willStack) { - if (willStack.isEmpty()) - return ItemStack.EMPTY; - - NonNullList inventory = player.inventory.mainInventory; - - for (ItemStack stack : inventory) { - if (stack.getItem() instanceof IDemonWillGem) { - ItemStack newStack = ((IDemonWillGem) stack.getItem()).fillDemonWillGem(stack, willStack); - if (newStack.isEmpty()) - return ItemStack.EMPTY; - } - } - - return willStack; - } - - /** - * Adds an IDiscreteDemonWill contained in an ItemStack to one of the Soul - * Gems in the player's inventory. - * - * @param type - The type of Will to add - * @param player - The player to check the Will of - * @param amount - The amount of will to add - * @return - The amount of will added - */ - public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) { - NonNullList inventory = player.inventory.mainInventory; - double remaining = amount; - - for (ItemStack stack : inventory) { - if (stack.getItem() instanceof IDemonWillGem) { - remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining, true); - if (remaining <= 0) - break; - } - } - - return amount - remaining; - } - - /** - * Adds an IDiscreteDemonWill contained in an ItemStack to one of the Soul - * Gems in the player's inventory while ignoring a specified stack. - * - * @param type - The type of Will to add - * @param player - The player to check the Will of - * @param amount - The amount of will to add - * @param ignored - A stack to ignore - * @return - The amount of will added - */ - public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount, ItemStack ignored) { - NonNullList inventory = player.inventory.mainInventory; - double remaining = amount; - - for (ItemStack stack : inventory) { - if (!stack.equals(ignored) && stack.getItem() instanceof IDemonWillGem) { - remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining, true); - - if (remaining <= 0) - break; - } - } - - return amount - remaining; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java deleted file mode 100644 index a9897ce0..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java +++ /dev/null @@ -1,56 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.Mirror; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; -import net.minecraft.world.gen.feature.template.TemplateManager; - -import java.util.Random; - -public class BuildTestStructure { - public boolean placeStructureAtPosition(Random rand, Rotation baseRotation, ServerWorld world, BlockPos pos, int iteration) { - if (pos == null) - return false; - - MinecraftServer minecraftserver = world.getMinecraftServer(); - TemplateManager templatemanager = world.getStructureTemplateManager(); - - ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "Corridor1"); - Template template = templatemanager.getTemplate(minecraftserver, resource); - - if (template == null) { - BMLog.DEBUG.warn("Invalid template for location: " + resource); - return false; - } - - PlacementSettings settings = new PlacementSettings(); - settings.setMirror(Mirror.NONE); - - Rotation rot; - - rot = baseRotation; - if (rot == null) - rot = Rotation.NONE; - - settings.setRotation(rot); - settings.setIgnoreEntities(true); - settings.setChunk(null); - settings.setReplacedBlock(null); - settings.setIgnoreStructureBlock(false); - -// settings.func_189946_a(MathHelper.clamp_float(schema.integrity, 0.0F, 1.0F)); - - BlockPos offset = Template.transformedBlockPos(settings, new BlockPos(0, 0, 0)); - BlockPos finalPos = pos.add(offset); - template.addBlocksToWorldChunk(world, finalPos, settings); - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java deleted file mode 100644 index 0575197a..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ /dev/null @@ -1,152 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.util.Direction; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.*; -import java.util.Map.Entry; - -public class Dungeon { - public static boolean placeStructureAtPosition(Random rand, ServerWorld world, BlockPos pos) { - long startTime = System.nanoTime(); - - Map> availableDoorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. - List descriptorList = new ArrayList<>(); - Map> roomMap = new HashMap<>(); // Placement positions in terms of actual positions - - PlacementSettings settings = new PlacementSettings(); - Mirror mir = Mirror.NONE; - - settings.setMirror(mir); - - Rotation rot = Rotation.NONE; - - settings.setRotation(rot); - settings.setIgnoreEntities(true); - settings.setChunk(null); - settings.setReplacedBlock(null); - settings.setIgnoreStructureBlock(false); - - DungeonRoom room = getRandomRoom(rand); - roomMap.put(pos, Pair.of(room, settings.copy())); - descriptorList.addAll(room.getAreaDescriptors(settings, pos)); - for (Direction facing : Direction.VALUES) { - if (availableDoorMap.containsKey(facing)) { - List doorList = availableDoorMap.get(facing); - doorList.addAll(room.getDoorOffsetsForFacing(settings, facing, pos)); - } else { - List doorList = room.getDoorOffsetsForFacing(settings, facing, pos); - availableDoorMap.put(facing, doorList); - } - } - - //Initial AreaDescriptors and door positions are initialized. Time for fun! - for (int i = 0; i < 100; i++) { - List facingList = new ArrayList<>(); - for (Entry> entry : availableDoorMap.entrySet()) { - if (entry.getValue() != null && !entry.getValue().isEmpty()) { - facingList.add(entry.getKey()); - } - } - - Collections.shuffle(facingList); //Shuffle the list so that it is random what is chosen - - Pair removedDoor1 = null; - Pair removedDoor2 = null; - BlockPos roomLocation = null; - - for (Direction doorFacing : facingList) { - Direction oppositeDoorFacing = doorFacing.getOpposite(); - List availableDoorList = availableDoorMap.get(doorFacing); //May need to copy here - Collections.shuffle(availableDoorList); - - settings.setRotation(Rotation.values()[rand.nextInt(Rotation.values().length)]); //Same for the Mirror - DungeonRoom testingRoom = getRandomRoom(rand); - - List otherDoorList = testingRoom.getDoorOffsetsForFacing(settings, oppositeDoorFacing, BlockPos.ORIGIN); - if (otherDoorList != null && !otherDoorList.isEmpty()) { - //See if one of these doors works. - Collections.shuffle(otherDoorList); - BlockPos testDoor = otherDoorList.get(0); - testDoor: - for (BlockPos availableDoor : availableDoorList) { - //TODO: Test if it fits, then add the doors to the list. - roomLocation = availableDoor.subtract(testDoor).add(doorFacing.getDirectionVec()); - - List descriptors = testingRoom.getAreaDescriptors(settings, roomLocation); - for (AreaDescriptor testDesc : descriptors) { - for (AreaDescriptor currentDesc : descriptorList) { - if (testDesc.intersects(currentDesc)) { - break testDoor; - } - } - } - - roomMap.put(roomLocation, Pair.of(testingRoom, settings.copy())); - descriptorList.addAll(descriptors); - removedDoor1 = Pair.of(doorFacing, availableDoor); - removedDoor2 = Pair.of(oppositeDoorFacing, testDoor.add(roomLocation)); - - room = testingRoom; - - } - - break; - } - -// Collections.shuffle(otherDoorList); - } - - if (removedDoor1 != null) { - for (Direction facing : Direction.VALUES) { - if (availableDoorMap.containsKey(facing)) { - List doorList = availableDoorMap.get(facing); - doorList.addAll(room.getDoorOffsetsForFacing(settings, facing, roomLocation)); - } else { - List doorList = room.getDoorOffsetsForFacing(settings, facing, roomLocation); - availableDoorMap.put(facing, doorList); - } - } - - Direction face = removedDoor1.getKey(); - if (availableDoorMap.containsKey(face)) { - availableDoorMap.get(face).remove(removedDoor1.getRight()); - } - } - - if (removedDoor2 != null) { - Direction face = removedDoor2.getKey(); - if (availableDoorMap.containsKey(face)) { - availableDoorMap.get(face).remove(removedDoor2.getRight()); - } - } - } - - long endTime = System.nanoTime(); - - long duration = (endTime - startTime); //divide by 1000000 to get milliseconds. - BMLog.DEBUG.info("Duration: " + duration + "(ns), " + duration / 1000000 + "(ms)"); - - //Building what I've got - for (Entry> entry : roomMap.entrySet()) { - BlockPos placementPos = entry.getKey(); - DungeonRoom placedRoom = entry.getValue().getKey(); - PlacementSettings placementSettings = entry.getValue().getValue(); - - placedRoom.placeStructureAtPosition(rand, placementSettings, world, placementPos); - } - - return false; - } - - public static DungeonRoom getRandomRoom(Random rand) { - return DungeonRoomRegistry.getRandomDungeonRoom(rand); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java deleted file mode 100644 index 76b242bd..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ /dev/null @@ -1,62 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; - -import java.util.*; -import java.util.Map.Entry; - -public class DungeonRoom { - public int dungeonWeight = 1; - public Map structureMap = new HashMap<>(); - - public Map> doorMap = new HashMap<>(); //Map of doors. The EnumFacing indicates what way this door faces. - public List descriptorList = new ArrayList<>(); - - public DungeonRoom(Map structureMap, Map> doorMap, List descriptorList) { - this.structureMap = structureMap; - this.doorMap = doorMap; - this.descriptorList = descriptorList; - } - - public List getAreaDescriptors(PlacementSettings settings, BlockPos offset) { - List newList = new ArrayList<>(); - - for (AreaDescriptor desc : descriptorList) { - newList.add(desc.rotateDescriptor(settings).offset(offset)); - } - - return newList; - } - - public List getDoorOffsetsForFacing(PlacementSettings settings, Direction facing, BlockPos offset) { - List offsetList = new ArrayList<>(); - - Direction originalFacing = DungeonUtil.reverseRotate(settings.getMirror(), settings.getRotation(), facing); - if (doorMap.containsKey(originalFacing)) { - List doorList = doorMap.get(originalFacing); - for (BlockPos doorPos : doorList) { - offsetList.add(Template.transformedBlockPos(settings, doorPos).add(offset)); - } - } - - return offsetList; - } - - public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, ServerWorld world, BlockPos pos) { - for (Entry entry : structureMap.entrySet()) { - ResourceLocation location = new ResourceLocation(entry.getKey()); - DungeonStructure structure = new DungeonStructure(location); - BlockPos offsetPos = Template.transformedBlockPos(settings, entry.getValue()); - - structure.placeStructureAtPosition(rand, settings, world, pos.add(offsetPos)); - } - - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java deleted file mode 100644 index 2b712a20..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java +++ /dev/null @@ -1,75 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.gson.Serializers; -import com.google.common.base.Charsets; -import com.google.common.io.Resources; -import com.google.common.reflect.TypeToken; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.io.IOUtils; - -import java.io.*; -import java.net.URL; -import java.util.List; -import java.util.Random; - -public class DungeonRoomLoader { - public static void saveDungeons() { - for (DungeonRoom room : DungeonRoomRegistry.dungeonWeightMap.keySet()) { - saveSingleDungeon(room); - } - } - - public static void saveSingleDungeon(DungeonRoom room) { - String json = Serializers.GSON.toJson(room); - - Writer writer; - try { - File file = new File("config/BloodMagic/schematics"); - file.mkdirs(); - - writer = new FileWriter("config/BloodMagic/schematics/" + new Random().nextInt() + ".json"); - writer.write(json); - writer.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static void loadDungeons() { - try { - URL schematicURL = DungeonRoomLoader.class.getResource(resLocToResourcePath(new ResourceLocation("bloodmagic:schematics"))); - List schematics = Serializers.GSON.fromJson(Resources.toString(schematicURL, Charsets.UTF_8), new TypeToken>() { - }.getType()); - for (String schematicKey : schematics) { - ResourceLocation schematic = new ResourceLocation(schematicKey); - URL dungeonURL = DungeonRoomLoader.class.getResource(resLocToResourcePath(schematic)); - DungeonRoom dungeonRoom = Serializers.GSON.fromJson(Resources.toString(dungeonURL, Charsets.UTF_8), DungeonRoom.class); - DungeonRoomRegistry.registerDungeonRoom(dungeonRoom, Math.max(1, dungeonRoom.dungeonWeight)); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void test() { - ResourceLocation id = new ResourceLocation(BloodMagic.MODID, "testGson"); - String s = id.getNamespace(); - String s1 = id.getPath(); - InputStream inputstream = null; - - try { - inputstream = DungeonRoomLoader.class.getResourceAsStream("/assets/" + s + "/schematics/" + s1 + ".nbt"); -// this.readTemplateFromStream(s1, inputstream); - return; - } catch (Throwable var10) { - - } finally { - IOUtils.closeQuietly(inputstream); - } - } - - public static String resLocToResourcePath(ResourceLocation resourceLocation) { - return "/assets/" + resourceLocation.getNamespace() + "/schematics/" + resourceLocation.getPath() + ".json"; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java deleted file mode 100644 index 5dd80e81..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomRegistry.java +++ /dev/null @@ -1,28 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - -public class DungeonRoomRegistry { - public static Map dungeonWeightMap = new HashMap<>(); - private static int totalWeight = 0; - - public static void registerDungeonRoom(DungeonRoom room, int weight) { - dungeonWeightMap.put(room, weight); - totalWeight += weight; - } - - public static DungeonRoom getRandomDungeonRoom(Random rand) { - int wantedWeight = rand.nextInt(totalWeight); - for (Entry entry : dungeonWeightMap.entrySet()) { - wantedWeight -= entry.getValue(); - if (wantedWeight < 0) { - return entry.getKey(); - } - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java deleted file mode 100644 index 7f5b8705..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonStructure.java +++ /dev/null @@ -1,47 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import WayofTime.bloodmagic.util.BMLog; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; -import net.minecraft.world.gen.feature.template.TemplateManager; - -import java.util.Random; - -public class DungeonStructure { - public ResourceLocation resource; - - public DungeonStructure(ResourceLocation resource) { - this.resource = resource; - } - - public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, ServerWorld world, BlockPos pos) { - if (pos == null) - return false; - - MinecraftServer minecraftserver = world.getMinecraftServer(); - TemplateManager templatemanager = world.getStructureTemplateManager(); - - Template template = templatemanager.getTemplate(minecraftserver, resource); - - if (template == null) { - BMLog.DEBUG.warn("Invalid template for location: " + resource); - return false; - } - -// settings.func_189946_a(MathHelper.clamp_float(schema.integrity, 0.0F, 1.0F)); - - BlockPos offset = Template.transformedBlockPos(settings, new BlockPos(0, 0, 0)); - BlockPos finalPos = pos.add(offset); - template.addBlocksToWorldChunk(world, finalPos, settings); - - return true; - } - - public DungeonStructure copy() { - return new DungeonStructure(resource); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java deleted file mode 100644 index 68483ead..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonTester.java +++ /dev/null @@ -1,82 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; - -import java.util.Random; - -public class DungeonTester { - public static void testDungeonGeneration(ServerWorld world, BlockPos pos) { - - } - - public static void testDungeonElementWithOutput(ServerWorld world, BlockPos pos) { - Dungeon.placeStructureAtPosition(new Random(), world, pos); -// ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "Corridor1"); -// -// DungeonStructure structure = new DungeonStructure(resource); -// Map structureMap = new HashMap(); -// structureMap.put(structure, new BlockPos(0, 0, 0)); -// -// Map> doorMap = new HashMap>(); -// List descriptorList = new ArrayList(); -// descriptorList.add(new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 5, 3, 7)); -// -// DungeonUtil.addRoom(doorMap, EnumFacing.NORTH, new BlockPos(3, 0, 0)); -// DungeonUtil.addRoom(doorMap, EnumFacing.SOUTH, new BlockPos(3, 0, 6)); -// DungeonUtil.addRoom(doorMap, EnumFacing.WEST, new BlockPos(0, 0, 3)); -// -// DungeonRoom room = new DungeonRoom(structureMap, doorMap, descriptorList); -// -// PlacementSettings settings = new PlacementSettings(); -// -// Mirror mir = Mirror.NONE; -// settings.setMirror(mir); -// -// Rotation rot = Rotation.NONE; -// settings.setRotation(rot); -// -// settings.setIgnoreEntities(true); -// settings.setChunk((ChunkPos) null); -// settings.setReplacedBlock((Block) null); -// settings.setIgnoreStructureBlock(false); -// -// int i = 0; -// -// for (Mirror mirror : Mirror.values()) -// { -// System.out.print("Mirror: " + mirror + '\n'); -// int j = 0; -// for (Rotation rotation : Rotation.values()) -// { -// System.out.print("Rotation: " + rot + '\n'); -// settings.setRotation(rotation); -// settings.setMirror(mirror); -// -// BlockPos offsetPos = pos.add(i * 16, 0, j * 16); -// room.placeStructureAtPosition(new Random(), settings, world, offsetPos); -// -//// List descriptors = structure.getAreaDescriptors(settings, offsetPos); -//// for (AreaDescriptor desc : descriptors) -//// { -//// List posList = desc.getContainedPositions(new BlockPos(0, 0, 0)); -//// for (BlockPos placePos : posList) -//// { -//// world.setBlockState(placePos, Blocks.REDSTONE_BLOCK.getDefaultState()); -//// } -//// } -// -//// for (EnumFacing facing : EnumFacing.HORIZONTALS) -//// { -//// List doorList = structure.getDoorOffsetsForFacing(settings, facing); -//// for (BlockPos doorPos : doorList) -//// { -//// System.out.print("Door at " + doorPos + " facing " + facing + '\n'); -//// } -//// } -// j++; -// } -// i++; -// } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java deleted file mode 100644 index 31cbbb1c..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonUtil.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.structures; - -import net.minecraft.util.Direction; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class DungeonUtil { - public static Direction rotate(Mirror mirror, Rotation rotation, Direction original) { - return rotation.rotate(mirror.mirror(original)); - } - - public static Direction reverseRotate(Mirror mirror, Rotation rotation, Direction original) { - return mirror.mirror(getOppositeRotation(rotation).rotate(original)); - } - - public static Direction getFacingForSettings(PlacementSettings settings, Direction original) { - return rotate(settings.getMirror(), settings.getRotation(), original); - } - - public static Rotation getOppositeRotation(Rotation rotation) { - switch (rotation) { - case CLOCKWISE_90: - return Rotation.COUNTERCLOCKWISE_90; - case COUNTERCLOCKWISE_90: - return Rotation.CLOCKWISE_90; - default: - return rotation; - } - } - - public static void addRoom(Map> doorMap, Direction facing, BlockPos offsetPos) { - if (doorMap.containsKey(facing)) { - doorMap.get(facing).add(offsetPos); - } else { - List doorList = new ArrayList<>(); - doorList.add(offsetPos); - doorMap.put(facing, doorList); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java b/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java deleted file mode 100644 index 469e3abe..00000000 --- a/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.structures; - -public class ModDungeons { - public static void init() { -// ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "HallChest1"); -// -// Map structureMap = new HashMap(); -// structureMap.put(resource.toString(), new BlockPos(0, 0, 0)); -// -// Map> doorMap = new HashMap>(); -// List descriptorList = new ArrayList(); -// descriptorList.add(new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 12, 5, 9)); -// -// DungeonUtil.addRoom(doorMap, EnumFacing.EAST, new BlockPos(11, 0, 4)); -// DungeonUtil.addRoom(doorMap, EnumFacing.WEST, new BlockPos(0, 0, 4)); -// -// DungeonRoom room = new DungeonRoom(structureMap, doorMap, descriptorList); -// DungeonRoomLoader.saveSingleDungeon(room); -// -// DungeonRoomRegistry.registerDungeonRoom(room, 1); -// -// DungeonRoomLoader.saveDungeons(); - - DungeonRoomLoader.loadDungeons(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java b/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java deleted file mode 100644 index 1f9242f4..00000000 --- a/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java +++ /dev/null @@ -1,7 +0,0 @@ -package WayofTime.bloodmagic.teleport; - -public interface ITeleport { - void teleport(); - - int getTeleportCost(); -} diff --git a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java deleted file mode 100644 index 91e41cac..00000000 --- a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java +++ /dev/null @@ -1,90 +0,0 @@ -package WayofTime.bloodmagic.teleport; - -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; - -import java.io.Serializable; - -public class PortalLocation implements Serializable { - private int x; - private int y; - private int z; - private int dimension; - - public PortalLocation(int x, int y, int z, int dimension) { - this.x = x; - this.y = y; - this.z = z; - this.dimension = dimension; - } - - public PortalLocation(BlockPos blockPos, int dimension) { - this(blockPos.getX(), blockPos.getY(), blockPos.getZ(), dimension); - } - - public CompoundNBT writeToNBT(CompoundNBT tag) { - CompoundNBT locationTag = new CompoundNBT(); - - locationTag.putInt(Constants.NBT.X_COORD, x); - locationTag.putInt(Constants.NBT.Y_COORD, y); - locationTag.putInt(Constants.NBT.Z_COORD, z); - locationTag.putInt(Constants.NBT.DIMENSION_ID, dimension); - tag.put(Constants.NBT.PORTAL_LOCATION, locationTag); - - return tag; - } - - public BlockPos getBlockPos() { - return new BlockPos(x, y, z); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - - PortalLocation that = (PortalLocation) o; - - if (x != that.x) - return false; - if (y != that.y) - return false; - return z == that.z; - - } - - @Override - public int hashCode() { - int result = x; - result = 31 * result + y; - result = 31 * result + z; - return result; - } - - public int getX() { - return x; - } - - public int getY() { - return y; - } - - public int getZ() { - return z; - } - - public int getDimension() { - return dimension; - } - - public static PortalLocation readFromNBT(CompoundNBT tag) { - if (tag.hasKey(Constants.NBT.PORTAL_LOCATION)) { - CompoundNBT locationTag = tag.getCompound(Constants.NBT.PORTAL_LOCATION); - return new PortalLocation(locationTag.getInt(Constants.NBT.X_COORD), locationTag.getInt(Constants.NBT.Y_COORD), locationTag.getInt(Constants.NBT.Z_COORD), locationTag.getInt(Constants.NBT.DIMENSION_ID)); - } - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java deleted file mode 100644 index 742b4000..00000000 --- a/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.teleport; - -import net.minecraft.entity.Entity; -import net.minecraft.util.math.BlockPos; - -import java.util.UUID; - -public abstract class Teleport implements ITeleport { - protected int x; - protected int y; - protected int z; - protected Entity entity; - protected UUID networkOwner; - - public Teleport(int x, int y, int z, Entity entity, UUID networkOwner) { - this.x = x; - this.y = y; - this.z = z; - this.entity = entity; - this.networkOwner = networkOwner; - } - - public Teleport(BlockPos blockPos, Entity entity, UUID networkOwner) { - this(blockPos.getX(), blockPos.getY(), blockPos.getZ(), entity, networkOwner); - } - - public int getX() { - return x; - } - - public int getY() { - return y; - } - - public int getZ() { - return z; - } - - public Entity getEntity() { - return entity; - } - - public UUID getNetworkOwner() { - return networkOwner; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Teleport)) return false; - - Teleport teleport = (Teleport) o; - - if (x != teleport.x) return false; - if (y != teleport.y) return false; - if (z != teleport.z) return false; - if (entity != null ? !entity.equals(teleport.entity) : teleport.entity != null) return false; - return networkOwner != null ? networkOwner.equals(teleport.networkOwner) : teleport.networkOwner == null; - } - - @Override - public int hashCode() { - int result = x; - result = 31 * result + y; - result = 31 * result + z; - result = 31 * result + (entity != null ? entity.hashCode() : 0); - result = 31 * result + (networkOwner != null ? networkOwner.hashCode() : 0); - return result; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java deleted file mode 100644 index 1f7463f5..00000000 --- a/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.teleport; - -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; - -import java.util.ArrayList; -import java.util.List; - -public class TeleportQueue { - private static TeleportQueue INSTANCE = new TeleportQueue(); - private static List queue; - - private TeleportQueue() { - queue = new ArrayList<>(); - } - - public void addITeleport(ITeleport iTeleport) { - queue.add(iTeleport); - } - - @SubscribeEvent - public void serverTick(TickEvent.ServerTickEvent event) { - if (event.phase != TickEvent.Phase.END) { - return; - } - - for (ITeleport iTeleport : queue) { - iTeleport.teleport(); - } - - queue.clear(); - } - - public static TeleportQueue getInstance() { - return INSTANCE; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java deleted file mode 100644 index 8ff084ce..00000000 --- a/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java +++ /dev/null @@ -1,32 +0,0 @@ -package WayofTime.bloodmagic.teleport; - -import net.minecraft.entity.Entity; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.Teleporter; -import net.minecraft.world.ServerWorld; - -public class TeleporterBloodMagic extends Teleporter { - public TeleporterBloodMagic(ServerWorld worldServer) { - super(worldServer); - } - - @Override - public boolean makePortal(Entity entity) { - return true; - } - - @Override - public void removeStalePortalLocations(long worldTime) { - - } - - @Override - public boolean placeInExistingPortal(Entity entityIn, float rotationYaw) { - return true; - } - - @Override - public void placeInPortal(Entity entity, float rotationYaw) { - entity.setLocationAndAngles(MathHelper.floor(entity.posX), MathHelper.floor(entity.posY) + 2, MathHelper.floor(entity.posZ), entity.rotationYaw, entity.rotationPitch); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java deleted file mode 100644 index e5ff2b56..00000000 --- a/src/main/java/WayofTime/bloodmagic/teleport/Teleports.java +++ /dev/null @@ -1,248 +0,0 @@ -package WayofTime.bloodmagic.teleport; - -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.event.TeleposeEvent; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.play.server.*; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.SoundEvents; -import net.minecraft.network.play.server.SPlayEntityEffectPacket; -import net.minecraft.network.play.server.SUpdateHealthPacket; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.management.PlayerList; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; -import net.minecraft.world.ServerWorld; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; - -import java.util.UUID; - -public class Teleports { - - public static class TeleportSameDim extends Teleport { - private final boolean teleposer; - - public TeleportSameDim(int x, int y, int z, Entity entity, UUID networkOwner, boolean teleposer) { - this(new BlockPos(x, y, z), entity, networkOwner, teleposer); - } - - public TeleportSameDim(BlockPos blockPos, Entity entity, UUID networkOwner, boolean teleposer) { - super(blockPos, entity, networkOwner); - this.teleposer = teleposer; - } - - @Override - public void teleport() { - if (entity != null) { - BlockPos targetTeleposer = new BlockPos(x, y, z); - if (entity.timeUntilPortal <= 0) { - entity.timeUntilPortal = 10; - if (entity instanceof PlayerEntity) { - - SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); - if (network.getCurrentEssence() < getTeleportCost()) - return; - - if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer))) - return; - - ServerPlayerEntity player = (ServerPlayerEntity) entity; - - network.syphon(ticket(entity.world, player, getTeleportCost())); - - player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); - player.getEntityWorld().updateEntityWithOptionalForce(player, false); - player.connection.sendPacket(new SUpdateHealthPacket(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); - - player.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer)); - } else { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); - if (network.getCurrentEssence() < (getTeleportCost() / 10)) - return; - - if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer))) - return; - - ServerWorld world = (ServerWorld) entity.getEntityWorld(); - - network.syphon(ticket(world, entity, getTeleportCost() / 10)); - - entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - world.resetUpdateEntityTick(); - - entity.getEntityWorld().playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), entity.getEntityWorld(), targetTeleposer)); - } - } else { - entity.timeUntilPortal = 10; - } - } - } - - @Override - public int getTeleportCost() { - return 1000; - } - } - - public static class TeleportToDim extends Teleport { - private World oldWorld; - private int newWorldID; - private boolean teleposer; - - public TeleportToDim(int x, int y, int z, Entity entity, UUID networkOwner, World oldWorld, int newWorld, boolean teleposer) { - this(new BlockPos(x, y, z), entity, networkOwner, oldWorld, newWorld, teleposer); - } - - public TeleportToDim(BlockPos blockPos, Entity entity, UUID networkOwner, World oldWorld, int newWorldID, boolean teleposer) { - super(blockPos, entity, networkOwner); - this.oldWorld = oldWorld; - this.newWorldID = newWorldID; - this.teleposer = teleposer; - } - - @Override - public void teleport() { - if (entity != null) { - if (entity.timeUntilPortal <= 0) { - entity.timeUntilPortal = 10; - MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - ServerWorld oldWorldServer = server.getWorld(entity.dimension); - ServerWorld newWorldServer = server.getWorld(newWorldID); - BlockPos targetTeleposer = new BlockPos(x, y, z); - ChunkPos teleposerChunk = new ChunkPos(targetTeleposer); - ForgeChunkManager.Ticket chunkTicket = ForgeChunkManager.requestTicket("bloodmagic", newWorldServer, ForgeChunkManager.Type.NORMAL); - ForgeChunkManager.forceChunk(chunkTicket, teleposerChunk); - - if (entity instanceof PlayerEntity) { - ServerPlayerEntity player = (ServerPlayerEntity) entity; - - - if (!player.getEntityWorld().isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); - if (network.getCurrentEssence() < getTeleportCost()) { - ForgeChunkManager.releaseTicket(chunkTicket); - return; - } - - if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer))) { - ForgeChunkManager.releaseTicket(chunkTicket); - return; - } - - network.syphon(ticket(oldWorld, player, getTeleportCost())); - - /* begin brandon3055 "BrandonsCore" interdimensional teleportation code */ - - PlayerList playerList = server.getPlayerList(); - - player.dimension = newWorldID; - player.connection.sendPacket(new SRespawnPacket(player.dimension, newWorldServer.getDifficulty(), newWorldServer.getWorldInfo().getTerrainType(), player.interactionManager.getGameType())); - playerList.updatePermissionLevel(player); - oldWorldServer.removeEntityDangerously(player); - player.isDead = false; - - //region Transfer to world - - player.setLocationAndAngles(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); - player.connection.setPlayerLocation(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); - newWorldServer.spawnEntity(player); - newWorldServer.updateEntityWithOptionalForce(player, false); - player.setWorld(newWorldServer); - - //endregion - - playerList.preparePlayer(player, oldWorldServer); - player.connection.setPlayerLocation(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); - player.interactionManager.setWorld(newWorldServer); - player.connection.sendPacket(new SPlayerAbilitiesPacket(player.capabilities)); - - playerList.updateTimeAndWeatherForPlayer(player, newWorldServer); - playerList.syncPlayerInventory(player); - - for (EffectInstance potioneffect : player.getActivePotionEffects()) { - player.connection.sendPacket(new SPlayEntityEffectPacket(player.getEntityId(), potioneffect)); - } - FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, entity.dimension, newWorldID); - player.setLocationAndAngles(x + 0.5, y + 0.5, z + 0.5, player.rotationYaw, player.rotationPitch); - - /* end brandon3055 teleportation code */ - - if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer)); - } - - } else if (!entity.getEntityWorld().isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(networkOwner); - if (network.getCurrentEssence() < (getTeleportCost() / 10)) - return; - - if (teleposer && MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer))) - return; - - network.syphon(ticket(oldWorld, entity, getTeleportCost() / 10)); - - CompoundNBT tag = new CompoundNBT(); - - entity.writeToNBTOptional(tag); - entity.setDead(); - oldWorld.playSound(entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - - Entity teleportedEntity = EntityList.createEntityFromNBT(tag, newWorldServer); - if (teleportedEntity != null) { - teleportedEntity.setLocationAndAngles(x + 0.5, y + 0.5, z + 0.5, entity.rotationYaw, entity.rotationPitch); - teleportedEntity.forceSpawn = true; - newWorldServer.spawnEntity(teleportedEntity); - teleportedEntity.setWorld(newWorldServer); - } - - oldWorldServer.resetUpdateEntityTick(); - newWorldServer.resetUpdateEntityTick(); - if (teleposer) - MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.getEntityWorld(), entity.getPosition(), newWorldServer, targetTeleposer)); - } - newWorldServer.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - - ForgeChunkManager.releaseTicket(chunkTicket); - } else { - entity.timeUntilPortal = 10; - } - } - } - - @Override - public int getTeleportCost() { - return 10000; - } - - public World getOldWorld() { - return oldWorld; - } - - public int getNewWorldID() { - return newWorldID; - } - - public boolean isTeleposer() { - return teleposer; - } - } - - public static SoulTicket ticket(World world, Entity entity, int amount) { - return new SoulTicket(new StringTextComponent("teleport|" + world.provider.getDimension() + "|" + entity.getName() + "|" + entity.getPosition().toLong()), amount); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index b4d528b1..2d97c292 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,175 +1,152 @@ -package WayofTime.bloodmagic.tile; +package wayoftime.bloodmagic.tile; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.iface.IAlchemyArray; -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; +import net.minecraft.block.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.ITickableTileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.registries.ObjectHolder; +import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect; +import wayoftime.bloodmagic.core.registry.AlchemyArrayRegistry; +import wayoftime.bloodmagic.util.Constants; -public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray { - public boolean isActive = false; - public int activeCounter = 0; - public Direction rotation = Direction.HORIZONTALS[0]; - public int rotateCooldown = 0; +public class TileAlchemyArray extends TileInventory implements ITickableTileEntity +{ + @ObjectHolder("bloodmagic:alchemyarray") + public static TileEntityType TYPE; - private String key = "empty"; - public AlchemyArrayEffect arrayEffect; - private boolean doDropIngredients = true; + public boolean isActive = false; + public int activeCounter = 0; + public Direction rotation = Direction.byHorizontalIndex(0); + public int rotateCooldown = 0; - public TileAlchemyArray() { - super(2, "alchemyArray"); - } + private String key = ""; + public AlchemyArrayEffect arrayEffect; + private boolean doDropIngredients = true; - public void onEntityCollidedWithBlock(BlockState state, Entity entity) { - if (arrayEffect != null) { - arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity); - } - } + public TileAlchemyArray(TileEntityType type) + { + super(type, 2, "alchemyarray"); +// this.bloodAltar = new BloodAltar(this); + } - @Override - public void deserialize(CompoundNBT tagCompound) { - super.deserialize(tagCompound); - this.isActive = tagCompound.getBoolean("isActive"); - this.activeCounter = tagCompound.getInt("activeCounter"); - this.key = tagCompound.getString("key"); - if (!tagCompound.hasKey("doDropIngredients")) //Check if the array is old - { - this.doDropIngredients = true; - } else { - this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); - } - this.rotation = Direction.HORIZONTALS[tagCompound.getInt(Constants.NBT.DIRECTION)]; + public TileAlchemyArray() + { + this(TYPE); + } - CompoundNBT arrayTag = tagCompound.getCompoundTag("arrayTag"); - arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); - if (arrayEffect != null) { - arrayEffect.readFromNBT(arrayTag); - } - } + @Override + public void deserialize(CompoundNBT tagCompound) + { + super.deserialize(tagCompound); + this.isActive = tagCompound.getBoolean("isActive"); + this.activeCounter = tagCompound.getInt("activeCounter"); + this.key = tagCompound.getString("stringKey"); + if (!tagCompound.contains("doDropIngredients")) // Check if the array is old + { + this.doDropIngredients = true; + } else + { + this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); + } + this.rotation = Direction.byHorizontalIndex(tagCompound.getInt(Constants.NBT.DIRECTION)); - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - super.serialize(tagCompound); - tagCompound.putBoolean("isActive", isActive); - tagCompound.putInt("activeCounter", activeCounter); - tagCompound.putString("key", "".equals(key) ? "empty" : key); - tagCompound.putBoolean("doDropIngredients", doDropIngredients); - tagCompound.putInt(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); + CompoundNBT arrayTag = tagCompound.getCompound("arrayTag"); +// arrayEffect = AlchemyArrayRegistry.getEffect(world, this.getStackInSlot(0), this.getStackInSlot(1)); + if (arrayEffect != null) + { + arrayEffect.readFromNBT(arrayTag); + } + } - CompoundNBT arrayTag = new CompoundNBT(); - if (arrayEffect != null) { - arrayEffect.writeToNBT(arrayTag); - } - tagCompound.putTag("arrayTag", arrayTag); + @Override + public CompoundNBT serialize(CompoundNBT tagCompound) + { + super.serialize(tagCompound); + tagCompound.putBoolean("isActive", isActive); + tagCompound.putInt("activeCounter", activeCounter); + tagCompound.putString("stringKey", "".equals(key) ? "empty" : key.toString()); + tagCompound.putBoolean("doDropIngredients", doDropIngredients); + tagCompound.putInt(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); - return tagCompound; - } + CompoundNBT arrayTag = new CompoundNBT(); + if (arrayEffect != null) + { + arrayEffect.writeToNBT(arrayTag); + } + tagCompound.put("arrayTag", arrayTag); - @Override - public int getInventoryStackLimit() { - return 1; - } + return tagCompound; + } - //Use this to prevent the Array from dropping items - useful for arrays that need to "consume" ingredients well before the effect. - public void setItemDrop(boolean dropItems) { - this.doDropIngredients = dropItems; - } + @Override + public void tick() + { +// System.out.println("Active counter: " + this.activeCounter); + if (isActive && attemptCraft()) + { + activeCounter++; + } else + { + isActive = false; + doDropIngredients = true; + activeCounter = 0; + arrayEffect = null; + key = "empty"; + } + if (rotateCooldown > 0) + rotateCooldown--; + } - @Override - public void update() { - if (isActive && attemptCraft()) { - activeCounter++; - } else { - isActive = false; - doDropIngredients = true; - activeCounter = 0; - arrayEffect = null; - key = "empty"; - } - if (rotateCooldown > 0) - rotateCooldown--; - } + public boolean attemptCraft() + { + if (arrayEffect != null) + { + isActive = true; - /** - * This occurs when the block is destroyed. - */ - @Override - public void dropItems() { - if (arrayEffect == null || doDropIngredients) { - super.dropItems(); - } - } + } else + { + AlchemyArrayEffect effect = AlchemyArrayRegistry.getEffect(world, this.getStackInSlot(0), this.getStackInSlot(1)); + if (effect == null) + { +// key = effect.i + return false; + } else + { + arrayEffect = effect; + } + } - public boolean attemptCraft() { - AlchemyArrayEffect effect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(this.getStackInSlot(0), this.getStackInSlot(1)); - if (effect != null) { - if (arrayEffect == null) { - arrayEffect = effect; - key = effect.getKey(); - } else { - String effectKey = effect.getKey(); - if (effectKey.equals(key)) { - //Good! Moving on. - } else { - //Something has changed, therefore we have to move our stuffs. - //TODO: Add an AlchemyArrayEffect.onBreak(); ? - arrayEffect = effect; - key = effect.getKey(); - } - } - } else { - RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(getStackInSlot(0), getStackInSlot(1)); - if (recipe == null) - return false; + if (arrayEffect != null) + { + isActive = true; + if (arrayEffect.update(this, this.activeCounter)) + { + this.decrStackSize(0, 1); + this.decrStackSize(1, 1); + this.getWorld().setBlockState(getPos(), Blocks.AIR.getDefaultState()); + } - AlchemyArrayEffect newEffect = new AlchemyArrayEffectCraftingNew(recipe); - if (arrayEffect == null) { - arrayEffect = newEffect; - key = newEffect.key; - } else if (!newEffect.key.equals(key)) { - arrayEffect = newEffect; - key = newEffect.key; - } - } + return true; + } + return false; + } - if (arrayEffect != null) { - isActive = true; +// @Override + public Direction getRotation() + { + return rotation; + } - if (arrayEffect.update(this, this.activeCounter)) { - this.decrStackSize(0, 1); - this.decrStackSize(1, 1); - this.getWorld().setBlockToAir(getPos()); - } + public void setRotation(Direction rotation) + { + this.rotation = rotation; + } - return true; - } - - return false; - } - - @Override - public Direction getRotation() { - return rotation; - } - - public void setRotation(Direction rotation) { - this.rotation = rotation; - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() { - return Block.FULL_BLOCK_AABB.offset(getPos()); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) + { + return slot == 0 || slot == 1; + } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java deleted file mode 100644 index fb5a286c..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ /dev/null @@ -1,432 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; -import WayofTime.bloodmagic.core.data.*; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.block.BlockState; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; -import org.apache.commons.lang3.ArrayUtils; - -import java.util.ArrayList; -import java.util.List; - -public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable { - public static final int orbSlot = 6; - public static final int toolSlot = 7; - public static final int outputSlot = 8; - - public Direction direction = Direction.NORTH; - public boolean isSlave = false; - public int burnTime = 0; - public int ticksRequired = 1; - - public BlockPos connectedPos = BlockPos.ORIGIN; - public boolean[] blockedSlots = new boolean[]{false, false, false, false, false, false}; - - public TileAlchemyTable() { - super(9, "alchemyTable"); - } - - public void setInitialTableParameters(Direction direction, boolean isSlave, BlockPos connectedPos) { - this.isSlave = isSlave; - this.connectedPos = connectedPos; - - if (!isSlave) { - this.direction = direction; - } - } - - public boolean isInvisible() { - return isSlave(); - } - - public boolean isInputSlotAccessible(int slot) { - return !(slot < 6 && slot >= 0) || !blockedSlots[slot]; - } - - public void toggleInputSlotAccessible(int slot) { - if (slot < 6 && slot >= 0) - blockedSlots[slot] = !blockedSlots[slot]; - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - - isSlave = tag.getBoolean("isSlave"); - direction = Direction.byIndex(tag.getInt(Constants.NBT.DIRECTION)); - connectedPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); - - burnTime = tag.getInt("burnTime"); - ticksRequired = tag.getInt("ticksRequired"); - - byte[] array = tag.getByteArray("blockedSlots"); - for (int i = 0; i < array.length; i++) - blockedSlots[i] = array[i] != 0; - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - - tag.putBoolean("isSlave", isSlave); - tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); - tag.putInt(Constants.NBT.X_COORD, connectedPos.getX()); - tag.putInt(Constants.NBT.Y_COORD, connectedPos.getY()); - tag.putInt(Constants.NBT.Z_COORD, connectedPos.getZ()); - - tag.putInt("burnTime", burnTime); - tag.putInt("ticksRequired", ticksRequired); - - byte[] blockedSlotArray = new byte[blockedSlots.length]; - for (int i = 0; i < blockedSlots.length; i++) - blockedSlotArray[i] = (byte) (blockedSlots[i] ? 1 : 0); - - tag.putByteArray("blockedSlots", blockedSlotArray); - return tag; - } - - @SuppressWarnings("unchecked") - @Override - public T getCapability(Capability capability, Direction facing) { - if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - if (this.isSlave()) { - TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { - return (T) tile.getCapability(capability, facing); - } - } else { - return super.getCapability(capability, facing); - } - } - - return super.getCapability(capability, facing); - } - - @Override - public int[] getSlotsForFace(Direction side) { - switch (side) { - case DOWN: - return new int[]{outputSlot}; - case UP: - return new int[]{orbSlot, toolSlot}; - default: - return new int[]{0, 1, 2, 3, 4, 5}; - } - } - - @Override - public boolean canInsertItem(int index, ItemStack stack, Direction direction) { - switch (direction) { - case DOWN: - return index != outputSlot && index != orbSlot && index != toolSlot; - case UP: - if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) { - return true; - } else if (index == toolSlot) { - return false; //TODO: - } else { - return true; - } - default: - if (this.isSlave) { - TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { - return ((TileAlchemyTable) tile).canInsertItem(index, stack, direction); - } - } - return getAccessibleInputSlots(direction).contains(index); - } - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, Direction direction) { - switch (direction) { - case DOWN: - return index == outputSlot; - case UP: - if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) { - return true; - } else if (index == toolSlot) { - return true; //TODO: - } else { - return true; - } - default: - if (this.isSlave) { - TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) { - return ((TileAlchemyTable) tile).canExtractItem(index, stack, direction); - } - } - return getAccessibleInputSlots(direction).contains(index); - } - } - - public List getAccessibleInputSlots(Direction direction) { - List list = new ArrayList<>(); - - for (int i = 0; i < 6; i++) { - if (isInputSlotAccessible(i)) { - list.add(i); - } - } - - return list; - } - - @Override - public void update() { - if (isSlave()) { - return; - } - - List inputList = new ArrayList<>(); - - for (int i = 0; i < 6; i++) { - if (!getStackInSlot(i).isEmpty()) { - inputList.add(getStackInSlot(i)); - } - } - - int tier = getTierOfOrb(); - - // special recipes like dying - AlchemyTableRecipe recipe = AlchemyTableRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos()); - if (recipe != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipe.getTierRequired() && this.getContainedLp() >= recipe.getLpDrained()))) { - if (burnTime == 1) - notifyUpdate(); - - if (canCraft(recipe.getRecipeOutput(inputList))) { - ticksRequired = recipe.getTicksRequired(); - burnTime++; - - if (burnTime == ticksRequired) { - if (!getWorld().isRemote) { - int requiredLp = recipe.getLpDrained(); - if (requiredLp > 0) { - if (!getWorld().isRemote) { - consumeLp(requiredLp); - } - } - - if (!getWorld().isRemote) { - craftItem(inputList, recipe); - } - } - - burnTime = 0; - - BlockState state = getWorld().getBlockState(pos); - getWorld().notifyBlockUpdate(getPos(), state, state, 3); - } else if (burnTime > ticksRequired + 10) { - burnTime = 0; - } - } else { - burnTime = 0; - } - } else { // Simple recipes - RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(inputList); - if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) { - if (burnTime == 1) - notifyUpdate(); - - if (canCraft(recipeAlchemyTable.getOutput())) { - ticksRequired = recipeAlchemyTable.getTicks(); - burnTime++; - if (burnTime >= ticksRequired) { - if (!getWorld().isRemote) { - if (recipeAlchemyTable.getSyphon() > 0) { - if (consumeLp(recipeAlchemyTable.getSyphon()) < recipeAlchemyTable.getSyphon()) { - //There was not enough LP to craft or there was no orb - burnTime = 0; - notifyUpdate(); - return; - } - } - - ItemStack[] inputs = new ItemStack[0]; - for (ItemStack stack : inputList) - ArrayUtils.add(inputs, stack.copy()); - - BloodMagicCraftedEvent.AlchemyTable event = new BloodMagicCraftedEvent.AlchemyTable(recipeAlchemyTable.getOutput().copy(), inputs); - MinecraftForge.EVENT_BUS.post(event); - - ItemStack outputSlotStack = getStackInSlot(outputSlot); - if (outputSlotStack.isEmpty()) - setInventorySlotContents(outputSlot, event.getOutput()); - else - outputSlotStack.grow(event.getOutput().getCount()); - - for (int i = 0; i < 6; i++) { - ItemStack currentStack = getStackInSlot(i); - if (currentStack.getItem().hasContainerItem(currentStack)) - setInventorySlotContents(i, currentStack.getItem().getContainerItem(currentStack)); - else if (currentStack.getItem() instanceof ICustomAlchemyConsumable) - setInventorySlotContents(i, ((ICustomAlchemyConsumable) currentStack.getItem()).drainUseOnAlchemyCraft(currentStack)); - else - currentStack.shrink(1); - } - - burnTime = 0; - notifyUpdate(); - } - } - } - } else { - burnTime = 0; - } - } - } - - public double getProgressForGui() { - return ((double) burnTime) / ticksRequired; - } - - private boolean canCraft(ItemStack output) { - ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (output.isEmpty()) - return false; - if (currentOutputStack.isEmpty()) - return true; - if (!ItemHandlerHelper.canItemStacksStack(output, currentOutputStack)) - return false; - int result = currentOutputStack.getCount() + output.getCount(); - return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); - } - - public int getTierOfOrb() { - ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) { - if (orbStack.getItem() instanceof IBloodOrb) { - BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); - return orb == null ? 0 : orb.getTier(); - } - } - - return 0; - } - - public int getContainedLp() { - ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) { - if (orbStack.getItem() instanceof IBloodOrb) { - Binding binding = ((IBindable) orbStack.getItem()).getBinding(orbStack); - if (binding == null) { - return 0; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(binding); - - return network.getCurrentEssence(); - } - } - - return 0; - } - - public void craftItem(List inputList, AlchemyTableRecipe recipe) { - ItemStack outputStack = recipe.getRecipeOutput(inputList); - if (this.canCraft(outputStack)) { - ItemStack currentOutputStack = getStackInSlot(outputSlot); - - ItemStack[] inputs = new ItemStack[0]; - for (ItemStack stack : inputList) - ArrayUtils.add(inputs, stack.copy()); - - BloodMagicCraftedEvent.AlchemyTable event = new BloodMagicCraftedEvent.AlchemyTable(outputStack.copy(), inputs); - MinecraftForge.EVENT_BUS.post(event); - outputStack = event.getOutput(); - - if (currentOutputStack.isEmpty()) { - setInventorySlotContents(outputSlot, outputStack); - } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) { - currentOutputStack.grow(outputStack.getCount()); - } - - consumeInventory(recipe); - } - } - - public int consumeLp(int requested) { - ItemStack orbStack = getStackInSlot(orbSlot); - - if (!orbStack.isEmpty()) { - if (orbStack.getItem() instanceof IBloodOrb) { - if (NetworkHelper.syphonFromContainer(orbStack, SoulTicket.item(orbStack, world, pos, requested))) { - return requested; - } - } - } - - return 0; - } - - public void consumeInventory(AlchemyTableRecipe recipe) { - ItemStack[] input = new ItemStack[6]; - - for (int i = 0; i < 6; i++) { - input[i] = getStackInSlot(i); - } - - ItemStack[] result = recipe.getRemainingItems(input); - for (int i = 0; i < 6; i++) { - setInventorySlotContents(i, result[i]); - } - } - - public Direction getDirection() { - return direction; - } - - public boolean isSlave() { - return isSlave; - } - - public int getBurnTime() { - return burnTime; - } - - public int getTicksRequired() { - return ticksRequired; - } - - public BlockPos getConnectedPos() { - return connectedPos; - } - - public boolean[] getBlockedSlots() { - return blockedSlots; - } - - public static int getOrbSlot() { - return orbSlot; - } - - public static int getToolSlot() { - return toolSlot; - } - - public static int getOutputSlot() { - return outputSlot; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index eb8eb4be..02786ee6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,190 +1,227 @@ -package WayofTime.bloodmagic.tile; +package wayoftime.bloodmagic.tile; -import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.altar.AltarTier; -import WayofTime.bloodmagic.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.ITickable; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraft.tileentity.ITickableTileEntity; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.registries.ObjectHolder; +import wayoftime.bloodmagic.altar.AltarTier; +import wayoftime.bloodmagic.altar.BloodAltar; +import wayoftime.bloodmagic.altar.IBloodAltar; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +public class TileAltar extends TileInventory implements IBloodAltar, ITickableTileEntity +{ + @ObjectHolder("bloodmagic:altar") + public static TileEntityType TYPE; + private BloodAltar bloodAltar; -public class TileAltar extends TileInventory implements IBloodAltar, ITickable { - private BloodAltar bloodAltar; + public TileAltar(TileEntityType type) + { + super(type, 1, "altar"); + this.bloodAltar = new BloodAltar(this); + } - public TileAltar() { - super(1, "altar"); - this.bloodAltar = new BloodAltar(this); - } + public TileAltar() + { + this(TYPE); + } - @Override - public void deserialize(CompoundNBT tagCompound) { - super.deserialize(tagCompound); + @Override + public void deserialize(CompoundNBT tagCompound) + { + super.deserialize(tagCompound); - CompoundNBT altarTag = tagCompound.getCompoundTag("bloodAltar"); + CompoundNBT altarTag = tagCompound.getCompound("bloodAltar"); - this.bloodAltar.readFromNBT(altarTag); - } + this.bloodAltar.readFromNBT(altarTag); + } - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - super.serialize(tagCompound); + @Override + public CompoundNBT serialize(CompoundNBT tagCompound) + { + super.serialize(tagCompound); - CompoundNBT altarTag = new CompoundNBT(); - this.bloodAltar.writeToNBT(altarTag); + CompoundNBT altarTag = new CompoundNBT(); + this.bloodAltar.writeToNBT(altarTag); - tagCompound.putTag("bloodAltar", altarTag); - return tagCompound; - } + tagCompound.put("bloodAltar", altarTag); + return tagCompound; + } - @Override - public void update() { - bloodAltar.update(); - } + @Override + public void tick() + { + bloodAltar.update(); + } - @Override - public void sacrificialDaggerCall(int amount, boolean isSacrifice) { - bloodAltar.sacrificialDaggerCall(amount, isSacrifice); - } + @Override + public void sacrificialDaggerCall(int amount, boolean isSacrifice) + { + bloodAltar.sacrificialDaggerCall(amount, isSacrifice); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemstack) { - return slot == 0; - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) + { + return slot == 0; + } - @Override - public int getCapacity() { - return bloodAltar.getCapacity(); - } + @Override + public int getCapacity() + { + return bloodAltar.getCapacity(); + } - @Override - public int getCurrentBlood() { - return bloodAltar.getCurrentBlood(); - } + @Override + public int getCurrentBlood() + { + return bloodAltar.getCurrentBlood(); + } - @Override - public AltarTier getTier() { - return bloodAltar.getTier(); - } + @Override + public AltarTier getTier() + { + return bloodAltar.getTier(); + } - @Override - public int getProgress() { - return bloodAltar.getProgress(); - } + @Override + public int getProgress() + { + return bloodAltar.getProgress(); + } - @Override - public float getSacrificeMultiplier() { - return bloodAltar.getSacrificeMultiplier(); - } + @Override + public float getSacrificeMultiplier() + { + return bloodAltar.getSacrificeMultiplier(); + } - @Override - public float getSelfSacrificeMultiplier() { - return bloodAltar.getSelfSacrificeMultiplier(); - } + @Override + public float getSelfSacrificeMultiplier() + { + return bloodAltar.getSelfSacrificeMultiplier(); + } - @Override - public float getOrbMultiplier() { - return bloodAltar.getOrbMultiplier(); - } + @Override + public float getOrbMultiplier() + { + return bloodAltar.getOrbMultiplier(); + } - @Override - public float getDislocationMultiplier() { - return bloodAltar.getDislocationMultiplier(); - } + @Override + public float getDislocationMultiplier() + { + return bloodAltar.getDislocationMultiplier(); + } - @Override - public float getConsumptionMultiplier() { - return bloodAltar.getConsumptionMultiplier(); - } + @Override + public float getConsumptionMultiplier() + { + return bloodAltar.getConsumptionMultiplier(); + } - @Override - public float getConsumptionRate() { - return bloodAltar.getConsumptionRate(); - } + @Override + public float getConsumptionRate() + { + return bloodAltar.getConsumptionRate(); + } - @Override - public int getLiquidRequired() { - return bloodAltar.getLiquidRequired(); - } + @Override + public int getLiquidRequired() + { + return bloodAltar.getLiquidRequired(); + } - @Override - public int getBufferCapacity() { - return bloodAltar.getBufferCapacity(); - } + @Override + public int getBufferCapacity() + { + return bloodAltar.getBufferCapacity(); + } - @Override - public void startCycle() { - bloodAltar.startCycle(); - } + @Override + public void startCycle() + { + bloodAltar.startCycle(); + } - @Override - public void checkTier() { - bloodAltar.checkTier(); - } + @Override + public void checkTier() + { + bloodAltar.checkTier(); + } - @Override - public void requestPauseAfterCrafting(int cooldown) { - bloodAltar.requestPauseAfterCrafting(cooldown); - } + @Override + public void requestPauseAfterCrafting(int cooldown) + { + bloodAltar.requestPauseAfterCrafting(cooldown); + } - @Override - public boolean isActive() { - return bloodAltar.isActive(); - } + @Override + public boolean isActive() + { + return bloodAltar.isActive(); + } - @Override - public int fillMainTank(int amount) { - return bloodAltar.fillMainTank(amount); - } + @Override + public int fillMainTank(int amount) + { + return bloodAltar.fillMainTank(amount); + } - @Override - public void setActive() { - bloodAltar.setActive(); - } + @Override + public void setActive() + { + bloodAltar.setActive(); + } - @Override - public int getChargingRate() { - return bloodAltar.getChargingRate(); - } + @Override + public int getChargingRate() + { + return bloodAltar.getChargingRate(); + } - @Override - public int getTotalCharge() { - return bloodAltar.getTotalCharge(); - } + @Override + public int getTotalCharge() + { + return bloodAltar.getTotalCharge(); + } - @Override - public int getChargingFrequency() { - return bloodAltar.getChargingFrequency(); - } + @Override + public int getChargingFrequency() + { + return bloodAltar.getChargingFrequency(); + } - public AltarTier getCurrentTierDisplayed() { - return bloodAltar.getCurrentTierDisplayed(); - } + public AltarTier getCurrentTierDisplayed() + { + return bloodAltar.getCurrentTierDisplayed(); + } - public boolean setCurrentTierDisplayed(AltarTier altarTier) { - return bloodAltar.setCurrentTierDisplayed(altarTier); - } + public boolean setCurrentTierDisplayed(AltarTier altarTier) + { + return bloodAltar.setCurrentTierDisplayed(altarTier); + } - @Override - public boolean hasCapability(@Nonnull Capability capability, @Nullable Direction facing) { - if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { - return true; - } - - return super.hasCapability(capability, facing); - } - - @SuppressWarnings("unchecked") - @Override - public T getCapability(@Nonnull Capability capability, @Nullable Direction facing) { - if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { - return (T) bloodAltar; - } - - return super.getCapability(capability, facing); - } -} \ No newline at end of file +// @Override +// public boolean hasCapability(@Nonnull Capability capability, @Nullable Direction facing) +// { +// if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) +// { +// return true; +// } +// +// return super.hasCapability(capability, facing); +// } +// +// @SuppressWarnings("unchecked") +// @Override +// public LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction facing) +// { +// if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) +// { +// return (T) bloodAltar; +// } +// +// return super.getCapability(capability, facing); +// } +} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java deleted file mode 100644 index a1ccbbeb..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ /dev/null @@ -1,80 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.tile.base.TileBase; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; - -public class TileBloodTank extends TileBase { - public static final int[] CAPACITIES = {16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65336, 131072, 262144, 524288}; - public int capacity; - protected FluidTank tank; - - public TileBloodTank(int meta) { - capacity = CAPACITIES[meta] * Fluid.BUCKET_VOLUME; - tank = new FluidTank(capacity); - } - - public TileBloodTank() { - capacity = CAPACITIES[0] * Fluid.BUCKET_VOLUME; - tank = new FluidTank(capacity); - } - - @Override - public void deserialize(CompoundNBT tagCompound) { - super.deserialize(tagCompound); - tank.readFromNBT(tagCompound.getCompoundTag(Constants.NBT.TANK)); - capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); - tank.setCapacity(capacity); - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - super.serialize(tagCompound); - if (tank.getFluidAmount() != 0) - tagCompound.putTag(Constants.NBT.TANK, tank.writeToNBT(new CompoundNBT())); - tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); - return tagCompound; - } - - public int getCapacity() { - return capacity; - } - - public FluidTank getTank() { - return tank; - } - - public Fluid getClientRenderFluid() { - if (tank != null && tank.getFluid() != null) - return tank.getFluid().getFluid(); - return null; - } - - public float getRenderHeight() { - if (tank != null && tank.getFluidAmount() > 0) - return (float) tank.getFluidAmount() / (float) getCapacity(); - return 0F; - } - - public int getComparatorOutput() { - return tank.getFluidAmount() > 0 ? (int) (1 + ((double) tank.getFluidAmount() / (double) tank.getCapacity()) * 14) : 0; - } - - @Override - public boolean hasCapability(Capability capability, Direction facing) { - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); - } - - @SuppressWarnings("unchecked") - @Override - public T getCapability(Capability capability, Direction facing) { - if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) - return (T) tank; - return super.getCapability(capability, facing); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java deleted file mode 100644 index 92c8721b..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ /dev/null @@ -1,214 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWillConduit; -import WayofTime.bloodmagic.soul.IDemonWillGem; -import WayofTime.bloodmagic.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.ITickable; - -import java.util.HashMap; -import java.util.Map.Entry; - -public class TileDemonCrucible extends TileInventory implements ITickable, IDemonWillConduit, ISidedInventory { - public final int maxWill = 100; - public final double gemDrainRate = 10; - public HashMap willMap = new HashMap<>(); //TODO: Change to DemonWillHolder - public int internalCounter = 0; - - public TileDemonCrucible() { - super(1, "demonCrucible"); - } - - @Override - public void update() { - if (getWorld().isRemote) { - return; - } - - internalCounter++; - - if (getWorld().isBlockPowered(getPos())) { - //TODO: Fill the contained gem if it is there. - ItemStack stack = this.getStackInSlot(0); - if (stack.getItem() instanceof IDemonWillGem) { - IDemonWillGem gemItem = (IDemonWillGem) stack.getItem(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - if (willMap.containsKey(type)) { - double current = willMap.get(type); - double fillAmount = Math.min(gemDrainRate, current); - if (fillAmount > 0) { - fillAmount = gemItem.fillWill(type, stack, fillAmount, true); - if (willMap.get(type) - fillAmount <= 0) { - willMap.remove(type); - } else { - willMap.put(type, willMap.get(type) - fillAmount); - } - } - } - } - } - } else { - ItemStack stack = this.getStackInSlot(0); - if (!stack.isEmpty()) { - if (stack.getItem() instanceof IDemonWillGem) { - IDemonWillGem gemItem = (IDemonWillGem) stack.getItem(); - for (EnumDemonWillType type : EnumDemonWillType.values()) { - double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double drainAmount = Math.min(maxWill - currentAmount, gemDrainRate); - double filled = WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, drainAmount, maxWill, false); - filled = gemItem.drainWill(type, stack, filled, false); - if (filled > 0) { - filled = gemItem.drainWill(type, stack, filled, true); - WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, filled, maxWill, true); - } - } - } else if (stack.getItem() instanceof IDiscreteDemonWill) //TODO: Limit the speed of this process - { - IDiscreteDemonWill willItem = (IDiscreteDemonWill) stack.getItem(); - EnumDemonWillType type = willItem.getType(stack); - double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double needed = maxWill - currentAmount; - double discreteAmount = willItem.getDiscretization(stack); - if (needed >= discreteAmount) { - double filled = willItem.drainWill(stack, discreteAmount); - if (filled > 0) { - WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, filled, maxWill, true); - if (stack.getCount() <= 0) { - this.setInventorySlotContents(0, ItemStack.EMPTY); - } - } - } - } - } - } - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - - willMap.clear(); - - for (EnumDemonWillType type : EnumDemonWillType.values()) { - double amount = tag.getDouble("EnumWill" + type.getName()); - if (amount > 0) { - willMap.put(type, amount); - } - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - - for (Entry entry : willMap.entrySet()) { - tag.putDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); - } - return tag; - } - - // IDemonWillConduit - - @Override - public int getWeight() { - return 10; - } - - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) { - if (amount <= 0) { - return 0; - } - - if (!canFill(type)) { - return 0; - } - - if (!doFill) { - if (!willMap.containsKey(type)) { - return Math.min(maxWill, amount); - } - - return Math.min(maxWill - willMap.get(type), amount); - } - - if (!willMap.containsKey(type)) { - double max = Math.min(maxWill, amount); - - willMap.put(type, max); - - return max; - } - - double current = willMap.get(type); - double filled = maxWill - current; - - if (amount < filled) { - willMap.put(type, current + amount); - filled = amount; - } else { - willMap.put(type, (double) maxWill); - } - - return filled; - } - - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) { - if (!willMap.containsKey(type)) { - return 0; - } - - double drained = amount; - double current = willMap.get(type); - if (current < drained) { - drained = current; - } - - if (doDrain) { - current -= drained; - if (current <= 0) { - willMap.remove(type); - } else { - willMap.put(type, current); - } - } - - return drained; - } - - @Override - public boolean canFill(EnumDemonWillType type) { - return true; - } - - @Override - public boolean canDrain(EnumDemonWillType type) { - return true; - } - - @Override - public double getCurrentWill(EnumDemonWillType type) { - return willMap.containsKey(type) ? willMap.get(type) : 0; - } - - @Override - public int[] getSlotsForFace(Direction side) { - return new int[]{0}; - } - - @Override - public boolean canInsertItem(int index, ItemStack stack, Direction direction) { - return !stack.isEmpty() && inventory.get(0).isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill); - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, Direction direction) { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java deleted file mode 100644 index 22037b11..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ /dev/null @@ -1,185 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.block.BlockDemonCrystal; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.tile.base.TileTicking; -import net.minecraft.block.BlockState; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.math.MathHelper; - -public class TileDemonCrystal extends TileTicking { - public static final double sameWillConversionRate = 50; - public static final double defaultWillConversionRate = 100; - public static final double timeDelayForWrongWill = 0.6; - public final int maxWill = 100; - public final double drainRate = 1; - public DemonWillHolder holder = new DemonWillHolder(); - public double progressToNextCrystal = 0; - public int internalCounter = 0; - public int crystalCount = 1; - public Direction placement = Direction.UP; //Side that this crystal is placed on. - - public TileDemonCrystal() { - this.crystalCount = 1; - } - - @Override - public void onUpdate() { - if (getWorld().isRemote) { - return; - } - - internalCounter++; - - if (internalCounter % 20 == 0 && crystalCount < 7) { - EnumDemonWillType type = getType(); - - double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - if (type != EnumDemonWillType.DEFAULT) { - if (value >= 0.5) { - double nextProgress = getCrystalGrowthPerSecond(value); - progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; - } else { - value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT); - if (value > 0.5) { - double nextProgress = getCrystalGrowthPerSecond(value) * timeDelayForWrongWill; - progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), EnumDemonWillType.DEFAULT, nextProgress * defaultWillConversionRate, true) / defaultWillConversionRate; - } - } - } else { - if (value > 0.5) { - - double nextProgress = getCrystalGrowthPerSecond(value); - progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; - } - } - - checkAndGrowCrystal(); - } - -// if (getWorld().getWorldTime() % 200 == 0) -// { -// crystalCount = Math.min(crystalCount + 1, 7); -// getWorld().markBlockForUpdate(pos); -// } - } - - /** - * Encourages the crystal to grow by a large percentage by telling it to - * drain will from the aura. - * - * @param willDrain The amount of drain that is needed for the crystal to grow - * successfully for the desired amount. Can be more than the base - * amount. - * @param progressPercentage - * @return percentage actually grown. - */ - public double growCrystalWithWillAmount(double willDrain, double progressPercentage) { - if (crystalCount >= 7) { - return 0; - } - - BlockState state = getWorld().getBlockState(pos); - int meta = this.getBlockType().getMetaFromState(state); - EnumDemonWillType type = EnumDemonWillType.values()[meta]; - - double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double percentDrain = willDrain <= 0 ? 1 : Math.min(1, value / willDrain); - if (percentDrain <= 0) { - return 0; - } - - // Verification that you can actually drain the will from this chunk, for future proofing. - WorldDemonWillHandler.drainWill(getWorld(), pos, type, percentDrain * willDrain, true); - progressToNextCrystal += percentDrain * progressPercentage; - - checkAndGrowCrystal(); - - return percentDrain * progressPercentage; - } - - public EnumDemonWillType getType() { - return EnumDemonWillType.values()[this.getBlockMetadata()]; - } - - public void checkAndGrowCrystal() { - if (progressToNextCrystal >= 1 && internalCounter % 100 == 0) { - progressToNextCrystal--; - crystalCount++; - markDirty(); - notifyUpdate(); - } - } - - public double getMaxWillForCrystal() { - return 50; - } - - public boolean dropSingleCrystal() { - if (!getWorld().isRemote && crystalCount > 1) { - BlockState state = getWorld().getBlockState(pos); - EnumDemonWillType type = state.getValue(BlockDemonCrystal.TYPE); - ItemStack stack = BlockDemonCrystal.getItemStackDropped(type, 1); - if (!stack.isEmpty()) { - crystalCount--; - InventoryHelper.spawnItemStack(getWorld(), pos.getX(), pos.getY(), pos.getZ(), stack); - notifyUpdate(); - return true; - } - } - - return false; - } - - public double getCrystalGrowthPerSecond(double will) { - return 1.0 / 200 * Math.sqrt(will / 200); - } - - public int getCrystalCountForRender() { - return MathHelper.clamp(crystalCount - 1, 0, 6); - } - - @Override - public void deserialize(CompoundNBT tag) { - holder.readFromNBT(tag, "Will"); - crystalCount = tag.getInt("crystalCount"); - placement = Direction.byIndex(tag.getInt("placement")); - progressToNextCrystal = tag.getDouble("progress"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - holder.writeToNBT(tag, "Will"); - tag.putInt("crystalCount", crystalCount); - tag.putInt("placement", placement.getIndex()); - tag.putDouble("progress", progressToNextCrystal); - return tag; - } - - public int getCrystalCount() { - return crystalCount; - } - - public void setCrystalCount(int crystalCount) { - this.crystalCount = crystalCount; - } - - public Direction getPlacement() { - return placement; - } - - public void setPlacement(Direction placement) { - this.placement = placement; - } - - @Override - protected void onDataPacketClientReceived() { - super.onDataPacketClientReceived(); - notifyUpdate(); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java deleted file mode 100644 index 00e80f0b..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ /dev/null @@ -1,133 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWillConduit; -import WayofTime.bloodmagic.tile.base.TileTicking; - -public class TileDemonCrystallizer extends TileTicking implements IDemonWillConduit { - public static final int maxWill = 100; - public static final double drainRate = 1; - public static final double willToFormCrystal = 99; - public static final double totalFormationTime = 1000; - //The whole purpose of this block is to grow a crystal initially. The acceleration and crystal growing is up to the crystal itself afterwards. - public DemonWillHolder holder = new DemonWillHolder(); - public double internalCounter = 0; - - public TileDemonCrystallizer() { - - } - - @Override - public void onUpdate() { - if (getWorld().isRemote) { - return; - } - - BlockPos offsetPos = pos.offset(Direction.UP); - if (getWorld().isAirBlock(offsetPos)) //Room for a crystal to grow - { - EnumDemonWillType highestType = WorldDemonWillHandler.getHighestDemonWillType(getWorld(), pos); - double amount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, highestType); - if (amount >= willToFormCrystal) { - internalCounter += getCrystalFormationRate(amount); - if (internalCounter >= totalFormationTime) { - if (WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, false) >= willToFormCrystal) { - if (formCrystal(highestType, offsetPos)) { - WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, true); - internalCounter = 0; - } - } - } - } - } - } - - public boolean formCrystal(EnumDemonWillType type, BlockPos position) { - getWorld().setBlockState(position, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal())); - TileEntity tile = getWorld().getTileEntity(position); - if (tile instanceof TileDemonCrystal) { - ((TileDemonCrystal) tile).setPlacement(Direction.UP); - return true; - } - - return false; - } - - public double getCrystalFormationRate(double currentWill) { - return 1; - } - - @Override - public void deserialize(CompoundNBT tag) { - holder.readFromNBT(tag, "Will"); - internalCounter = tag.getDouble("internalCounter"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - holder.writeToNBT(tag, "Will"); - tag.putDouble("internalCounter", internalCounter); - return tag; - } - - // IDemonWillConduit - - @Override - public int getWeight() { - return 10; - } - - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) { - if (amount <= 0) { - return 0; - } - - if (!canFill(type)) { - return 0; - } - - if (!doFill) { - return Math.min(maxWill - holder.getWill(type), amount); - } - - return holder.addWill(type, amount, maxWill); - } - - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) { - double drained = amount; - double current = holder.getWill(type); - if (current < drained) { - drained = current; - } - - if (doDrain) { - return holder.drainWill(type, amount); - } - - return drained; - } - - @Override - public boolean canFill(EnumDemonWillType type) { - return true; - } - - @Override - public boolean canDrain(EnumDemonWillType type) { - return true; - } - - @Override - public double getCurrentWill(EnumDemonWillType type) { - return holder.getWill(type); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java deleted file mode 100644 index dc4c7def..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ /dev/null @@ -1,106 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWillConduit; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.tile.base.TileTicking; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; - -public class TileDemonPylon extends TileTicking implements IDemonWillConduit { - public final int maxWill = 100; - public final double drainRate = 1; - public DemonWillHolder holder = new DemonWillHolder(); - - public TileDemonPylon() { - - } - - @Override - public void onUpdate() { - if (getWorld().isRemote) { - return; - } - - for (EnumDemonWillType type : EnumDemonWillType.values()) { - double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - - for (Direction side : Direction.HORIZONTALS) { - BlockPos offsetPos = pos.offset(side, 16); - double sideAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), offsetPos, type); - if (sideAmount > currentAmount) { - double drainAmount = Math.min((sideAmount - currentAmount) / 2, drainRate); - double drain = WorldDemonWillHandler.drainWill(getWorld(), offsetPos, type, drainAmount, true); - WorldDemonWillHandler.fillWill(getWorld(), pos, type, drain, true); - } - } - } - } - - @Override - public void deserialize(CompoundNBT tag) { - holder.readFromNBT(tag, "Will"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - holder.writeToNBT(tag, "Will"); - return tag; - } - - // IDemonWillConduit - - @Override - public int getWeight() { - return 10; - } - - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) { - if (amount <= 0) { - return 0; - } - - if (!canFill(type)) { - return 0; - } - - if (!doFill) { - return Math.min(maxWill - holder.getWill(type), amount); - } - - return holder.addWill(type, amount, maxWill); - } - - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) { - double drained = amount; - double current = holder.getWill(type); - if (current < drained) { - drained = current; - } - - if (doDrain) { - return holder.drainWill(type, amount); - } - - return drained; - } - - @Override - public boolean canFill(EnumDemonWillType type) { - return true; - } - - @Override - public boolean canDrain(EnumDemonWillType type) { - return true; - } - - @Override - public double getCurrentWill(EnumDemonWillType type) { - return holder.getWill(type); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java deleted file mode 100644 index f450095d..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ /dev/null @@ -1,41 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.ritual.types.RitualPortal; -import WayofTime.bloodmagic.tile.base.TileBase; -import com.google.common.base.Strings; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; - -public class TileDimensionalPortal extends TileBase { - public String portalID = ""; - public int masterStoneX; - public int masterStoneY; - public int masterStoneZ; - - public void deserialize(CompoundNBT tagCompound) { - portalID = tagCompound.getString(RitualPortal.PORTAL_ID_TAG); - - masterStoneX = tagCompound.getInt("masterStoneX"); - masterStoneY = tagCompound.getInt("masterStoneY"); - masterStoneZ = tagCompound.getInt("masterStoneZ"); - } - - public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.putString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID); - - tagCompound.putInt("masterStoneX", masterStoneX); - tagCompound.putInt("masterStoneY", masterStoneY); - tagCompound.putInt("masterStoneZ", masterStoneZ); - return tagCompound; - } - - public BlockPos getMasterStonePos() { - return new BlockPos(masterStoneX, masterStoneY, masterStoneZ); - } - - public void setMasterStonePos(BlockPos blockPos) { - this.masterStoneX = blockPos.getX(); - this.masterStoneY = blockPos.getY(); - this.masterStoneZ = blockPos.getZ(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java deleted file mode 100644 index 222dce55..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.tile.base.TileBase; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class TileImperfectRitualStone extends TileBase implements IImperfectRitualStone { - - @Override - public boolean performRitual(World world, BlockPos pos, @Nullable ImperfectRitual imperfectRitual, PlayerEntity player) { - if (imperfectRitual != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(imperfectRitual), true)) { - if (!PlayerHelper.isFakePlayer(player) && !world.isRemote) { - NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.block(getWorld(), getPos(), imperfectRitual.getActivationCost())); - if (imperfectRitual.onActivate(this, player)) { - if (imperfectRitual.isLightShow()) - getWorld().addWeatherEffect(new LightningBoltEntity(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); - return true; - } - } - - return true; - } - - return false; - } - - @Override - public World getRitualWorld() { - return getWorld(); - } - - @Override - public BlockPos getRitualPos() { - return getPos(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java deleted file mode 100644 index 6a417023..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ /dev/null @@ -1,160 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.incense.*; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -public class TileIncenseAltar extends TileInventory implements ITickable { - public static int maxCheckRange = 5; - public AreaDescriptor incenseArea = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); - public Map tranquilityMap = new HashMap<>(); - - public double incenseAddition = 0; //Self-sacrifice is multiplied by 1 plus this value. - public double tranquility = 0; - public int roadDistance = 0; //Number of road blocks laid down - - public TileIncenseAltar() { - super(1, "incenseAltar"); - } - - @Override - public void update() { - AxisAlignedBB aabb = incenseArea.getAABB(getPos()); - List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, aabb); - if (playerList.isEmpty()) { - return; - } - - if (getWorld().getTotalWorldTime() % 100 == 0) { - recheckConstruction(); - } - - boolean hasPerformed = false; - - for (PlayerEntity player : playerList) { - if (PlayerSacrificeHelper.incrementIncense(player, 0, incenseAddition, incenseAddition / 100)) { - hasPerformed = true; - } - } - - if (hasPerformed) { - if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof ServerWorld) { - ServerWorld server = (ServerWorld) getWorld(); - server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); - } - } - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - tranquility = tag.getDouble("tranquility"); - incenseAddition = tag.getDouble("incenseAddition"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - tag.putDouble("tranquility", tranquility); - tag.putDouble("incenseAddition", incenseAddition); - return tag; - } - - public void recheckConstruction() { - //TODO: Check the physical construction of the incense altar to determine the maximum length. - int maxLength = 11; //Max length of the path. The path starts two blocks away from the center block. - int yOffset = 0; - - Map tranquilityMap = new HashMap<>(); - - for (int currentDistance = 2; currentDistance < currentDistance + maxLength; currentDistance++) { - boolean canFormRoad = false; - - for (int i = -maxCheckRange + yOffset; i <= maxCheckRange + yOffset; i++) { - BlockPos verticalPos = pos.add(0, i, 0); - - canFormRoad = true; - level: - for (Direction horizontalFacing : Direction.HORIZONTALS) { - BlockPos facingOffsetPos = verticalPos.offset(horizontalFacing, currentDistance); - for (int j = -1; j <= 1; j++) { - BlockPos offsetPos = facingOffsetPos.offset(horizontalFacing.rotateY(), j); - BlockState state = getWorld().getBlockState(offsetPos); - Block block = state.getBlock(); - if (!(block instanceof IIncensePath && ((IIncensePath) block).getLevelOfPath(getWorld(), offsetPos, state) >= currentDistance - 2)) { - canFormRoad = false; - break level; - } - } - } - - if (canFormRoad) { - yOffset = i; - break; - } - } - - if (canFormRoad) { - for (int i = -currentDistance; i <= currentDistance; i++) { - for (int j = -currentDistance; j <= currentDistance; j++) { - if (Math.abs(i) != currentDistance && Math.abs(j) != currentDistance) { - continue; //TODO: Can make this just set j to currentDistance to speed it up. - } - - for (int y = yOffset; y <= 2 + yOffset; y++) { - BlockPos offsetPos = pos.add(i, y, j); - BlockState state = getWorld().getBlockState(offsetPos); - Block block = state.getBlock(); - TranquilityStack stack = IncenseTranquilityRegistry.getTranquilityOfBlock(getWorld(), offsetPos, block, state); - if (stack != null) { - if (!tranquilityMap.containsKey(stack.type)) { - tranquilityMap.put(stack.type, stack.value); - } else { - tranquilityMap.put(stack.type, tranquilityMap.get(stack.type) + stack.value); - } - } - } - } - } - } else { - roadDistance = currentDistance - 2; - break; - } - } - - this.tranquilityMap = tranquilityMap; - - double totalTranquility = 0; - for (Entry entry : tranquilityMap.entrySet()) { - totalTranquility += entry.getValue(); - } - - if (totalTranquility < 0) { - return; - } - - double appliedTranquility = 0; - for (Entry entry : tranquilityMap.entrySet()) { - appliedTranquility += Math.sqrt(entry.getValue()); - } - - double bonus = IncenseAltarHandler.getIncenseBonusFromComponents(getWorld(), pos, appliedTranquility, roadDistance); - incenseAddition = bonus; - this.tranquility = appliedTranquility; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index dc3ae9da..a737e704 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -1,261 +1,317 @@ -package WayofTime.bloodmagic.tile; +package wayoftime.bloodmagic.tile; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; -import WayofTime.bloodmagic.tile.base.TileBase; -import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryHelper; +import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; +import wayoftime.bloodmagic.tile.base.TileBase; -public class TileInventory extends TileBase implements IInventory { - protected int[] syncedSlots = new int[0]; - protected NonNullList inventory; - IItemHandler handlerDown; - IItemHandler handlerUp; - IItemHandler handlerNorth; - IItemHandler handlerSouth; - IItemHandler handlerWest; - IItemHandler handlerEast; - private int size; +public class TileInventory extends TileBase implements IInventory +{ + protected int[] syncedSlots = new int[0]; + protected NonNullList inventory; + LazyOptional handlerDown; + LazyOptional handlerUp; + LazyOptional handlerNorth; + LazyOptional handlerSouth; + LazyOptional handlerWest; + LazyOptional handlerEast; + private int size; - // IInventory - private String name; + // IInventory + private String name; - public TileInventory(int size, String name) { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - this.size = size; - this.name = name; - initializeItemHandlers(); - } + public TileInventory(TileEntityType type, int size, String name) + { + super(type); + this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); + this.size = size; + this.name = name; + initializeItemHandlers(); + } - protected boolean isSyncedSlot(int slot) { - for (int s : this.syncedSlots) { - if (s == slot) { - return true; - } - } - return false; - } + protected boolean isSyncedSlot(int slot) + { + for (int s : this.syncedSlots) + { + if (s == slot) + { + return true; + } + } + return false; + } - @Override - public void deserialize(CompoundNBT tagCompound) { - super.deserialize(tagCompound); - ListNBT tags = tagCompound.getTagList("Items", 10); - inventory = NonNullList.withSize(size, ItemStack.EMPTY); + @Override + public void deserialize(CompoundNBT tagCompound) + { + super.deserialize(tagCompound); - for (int i = 0; i < tags.tagCount(); i++) { - if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompound(i); - byte j = data.getByte("Slot"); + this.inventory = NonNullList.withSize(this.getSizeInventory(), ItemStack.EMPTY); - if (j >= 0 && j < inventory.size()) { - inventory.set(j, new ItemStack(data)); // No matter how much an i looks like a j, it is not one. They are drastically different characters and cause drastically different things to happen. Apparently I didn't know this at one point. - TehNut - } - } - } - } + ItemStackHelper.loadAllItems(tagCompound, this.inventory); - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - super.serialize(tagCompound); - ListNBT tags = new ListNBT(); +// ListNBT tags = tagCompound.getList("Items", 10); +// inventory = NonNullList.withSize(size, ItemStack.EMPTY); +// +// +// +// for (int i = 0; i < tags.size(); i++) +// { +// if (!isSyncedSlot(i)) +// { +// CompoundNBT data = tags.getCompoundTagAt(i); +// byte j = data.getByte("Slot"); +// +// if (j >= 0 && j < inventory.size()) +// { +// inventory.set(j, new ItemStack(data)); // No matter how much an i looks like a j, it is not one. +// // They are drastically different characters and cause +// // drastically different things to happen. Apparently I +// // didn't know this at one point. - TehNut +// } +// } +// } + } - for (int i = 0; i < inventory.size(); i++) { - if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) { - CompoundNBT data = new CompoundNBT(); - data.setByte("Slot", (byte) i); - inventory.get(i).writeToNBT(data); - tags.appendTag(data); - } - } + @Override + public CompoundNBT serialize(CompoundNBT tagCompound) + { + super.serialize(tagCompound); - tagCompound.putTag("Items", tags); - return tagCompound; - } + ItemStackHelper.saveAllItems(tagCompound, this.inventory); +// NBTTagList tags = new NBTTagList(); +// +// for (int i = 0; i < inventory.size(); i++) +// { +// if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) +// { +// CompoundNBT data = new CompoundNBT(); +// data.putByte("Slot", (byte) i); +// inventory.get(i).write(data); +// tags.appendTag(data); +// } +// } +// +// tagCompound.setTag("Items", tags); + return tagCompound; + } - public void dropItems() { - InventoryHelper.dropInventoryItems(getWorld(), getPos(), this); - } + public void dropItems() + { + InventoryHelper.dropInventoryItems(getWorld(), getPos(), this); + } - @Override - public int getSizeInventory() { - return size; - } + @Override + public int getSizeInventory() + { + return size; + } - @Override - public ItemStack getStackInSlot(int index) { - return inventory.get(index); - } + @Override + public ItemStack getStackInSlot(int index) + { + return inventory.get(index); + } - @Override - public ItemStack decrStackSize(int index, int count) { - if (!getStackInSlot(index).isEmpty()) { - if (!getWorld().isRemote) - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); + @Override + public ItemStack decrStackSize(int index, int count) + { + if (!getStackInSlot(index).isEmpty()) + { + if (!getWorld().isRemote) + getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - if (getStackInSlot(index).getCount() <= count) { - ItemStack itemStack = inventory.get(index); - inventory.set(index, ItemStack.EMPTY); - markDirty(); - return itemStack; - } + if (getStackInSlot(index).getCount() <= count) + { + ItemStack itemStack = inventory.get(index); + inventory.set(index, ItemStack.EMPTY); + markDirty(); + return itemStack; + } - ItemStack itemStack = inventory.get(index).splitStack(count); - markDirty(); - return itemStack; - } + ItemStack itemStack = inventory.get(index).split(count); + markDirty(); + return itemStack; + } - return ItemStack.EMPTY; - } + return ItemStack.EMPTY; + } - @Override - public ItemStack removeStackFromSlot(int slot) { - if (!inventory.get(slot).isEmpty()) { - ItemStack itemStack = inventory.get(slot); - setInventorySlotContents(slot, ItemStack.EMPTY); - return itemStack; - } - return ItemStack.EMPTY; - } + @Override + public ItemStack removeStackFromSlot(int slot) + { + if (!inventory.get(slot).isEmpty()) + { + ItemStack itemStack = inventory.get(slot); + setInventorySlotContents(slot, ItemStack.EMPTY); + return itemStack; + } + return ItemStack.EMPTY; + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.set(slot, stack); - if (!stack.isEmpty() && stack.getCount() > getInventoryStackLimit()) - stack.setCount(getInventoryStackLimit()); - markDirty(); - if (!getWorld().isRemote) - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) + { + inventory.set(slot, stack); + if (!stack.isEmpty() && stack.getCount() > getInventoryStackLimit()) + stack.setCount(getInventoryStackLimit()); + markDirty(); + if (!getWorld().isRemote) + getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); + } - @Override - public int getInventoryStackLimit() { - return 64; - } + @Override + public int getInventoryStackLimit() + { + return 64; + } - @Override - public void openInventory(PlayerEntity player) { + @Override + public void openInventory(PlayerEntity player) + { - } + } - @Override - public void closeInventory(PlayerEntity player) { + @Override + public void closeInventory(PlayerEntity player) + { - } + } - @Override - public boolean isItemValidForSlot(int index, ItemStack stack) { - return true; - } + @Override + public boolean isItemValidForSlot(int index, ItemStack stack) + { + return true; + } - // IWorldNameable + // IWorldNameable - @Override - public int getField(int id) { - return 0; - } +// @Override +// public int getField(int id) +// { +// return 0; +// } +// +// @Override +// public void setField(int id, int value) +// { +// +// } +// +// @Override +// public int getFieldCount() +// { +// return 0; +// } - @Override - public void setField(int id, int value) { + @Override + public void clear() + { + this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); + } - } + @Override + public boolean isEmpty() + { + for (ItemStack stack : inventory) if (!stack.isEmpty()) + return false; - @Override - public int getFieldCount() { - return 0; - } + return true; + } - @Override - public void clear() { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - } + @Override + public boolean isUsableByPlayer(PlayerEntity player) + { + return true; + } - @Override - public boolean isEmpty() { - for (ItemStack stack : inventory) - if (!stack.isEmpty()) - return false; +// @Override +// public String getName() +// { +// return TextHelper.localize("tile.bloodmagic." + name + ".name"); +// } +// +// @Override +// public boolean hasCustomName() +// { +// return true; +// } +// +// @Override +// public ITextComponent getDisplayName() +// { +// return new TextComponentString(getName()); +// } - return true; - } + protected void initializeItemHandlers() + { + if (this instanceof ISidedInventory) + { + handlerDown = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + handlerUp = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + handlerNorth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + handlerSouth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + handlerWest = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + handlerEast = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + } else + { + handlerDown = LazyOptional.of(() -> new InvWrapper(this)); + handlerUp = handlerDown; + handlerNorth = handlerDown; + handlerSouth = handlerDown; + handlerWest = handlerDown; + handlerEast = handlerDown; + } + } - @Override - public boolean isUsableByPlayer(PlayerEntity player) { - return true; - } + @SuppressWarnings("unchecked") + @Override + public LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction facing) + { + if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + { + switch (facing) + { + case DOWN: + return handlerDown.cast(); + case EAST: + return handlerEast.cast(); + case NORTH: + return handlerNorth.cast(); + case SOUTH: + return handlerSouth.cast(); + case UP: + return handlerUp.cast(); + case WEST: + return handlerWest.cast(); + } + } else if (facing == null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + { + return handlerDown.cast(); + } - @Override - public String getName() { - return TextHelper.localize("tile.bloodmagic." + name + ".name"); - } + return super.getCapability(capability, facing); + } - @Override - public boolean hasCustomName() { - return true; - } - - @Override - public ITextComponent getDisplayName() { - return new StringTextComponent(getName()); - } - - protected void initializeItemHandlers() { - if (this instanceof ISidedInventory) { - handlerDown = new SidedInvWrapper((ISidedInventory) this, Direction.DOWN); - handlerUp = new SidedInvWrapper((ISidedInventory) this, Direction.UP); - handlerNorth = new SidedInvWrapper((ISidedInventory) this, Direction.NORTH); - handlerSouth = new SidedInvWrapper((ISidedInventory) this, Direction.SOUTH); - handlerWest = new SidedInvWrapper((ISidedInventory) this, Direction.WEST); - handlerEast = new SidedInvWrapper((ISidedInventory) this, Direction.EAST); - } else { - handlerDown = new InvWrapper(this); - handlerUp = handlerDown; - handlerNorth = handlerDown; - handlerSouth = handlerDown; - handlerWest = handlerDown; - handlerEast = handlerDown; - } - } - - @SuppressWarnings("unchecked") - @Override - public T getCapability(Capability capability, Direction facing) { - if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - switch (facing) { - case DOWN: - return (T) handlerDown; - case EAST: - return (T) handlerEast; - case NORTH: - return (T) handlerNorth; - case SOUTH: - return (T) handlerSouth; - case UP: - return (T) handlerUp; - case WEST: - return (T) handlerWest; - } - } else if (facing == null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - return (T) handlerDown; - } - - return super.getCapability(capability, facing); - } - - @Override - public boolean hasCapability(Capability capability, Direction facing) { - return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); - } -} +// @Override +// public boolean hasCapability(Capability capability, Direction facing) +// { +// return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); +// } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java deleted file mode 100644 index 491a7cb6..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ /dev/null @@ -1,532 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.inversion.InversionPillarHandler; -import WayofTime.bloodmagic.tile.base.TileTicking; -import com.google.common.collect.ImmutableMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import net.minecraftforge.common.animation.Event; -import net.minecraftforge.common.animation.TimeValues.VariableValue; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.model.animation.CapabilityAnimation; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; - -import java.util.Collections; -import java.util.List; -import java.util.Locale; - -public class TileInversionPillar extends TileTicking { - public static final double maxWillForChunk = 1000; - public static double willPerOperation = 0.5; - public static double inversionPerOperation = 4; - public static double addedInversionPerFailedCheck = 1; - public static double inversionToIncreaseRadius = 100; - public static double inversionToAddPillar = 200; - public static double operationThreshold = 20; - public static double inversionToSpreadWill = 200; - public static double willPushRate = 1; - public static double inversionCostPerWillSpread = 4; - public static double minimumWillForChunkWhenSpreading = 100; - private final IAnimationStateMachine asm; - private final VariableValue animationOffset = new VariableValue(0); - private final VariableValue cycleLength = new VariableValue(4); - - public EnumDemonWillType type; - public double currentInversion = 0; - public int consecutiveFailedChecks = 0; //If you fail enough checks, increase the radius. - public int consecutiveFailedAirChecks = 0; - public int currentInfectionRadius = 1; - -// public int dormantCounter = 0; //Time that the pillar will - - public int counter = 0; - - public boolean isRegistered = false; - private float animationOffsetValue = 0; - - public TileInversionPillar() { - this(EnumDemonWillType.DEFAULT); - } - - public TileInversionPillar(EnumDemonWillType type) { - this.type = type; - asm = BloodMagic.proxy.load(new ResourceLocation(BloodMagic.MODID.toLowerCase(), "asms/block/inversion_pillar.json"), ImmutableMap.of("offset", animationOffset, "cycle_length", cycleLength)); - animationOffsetValue = -1; - } - - @Override - public void onUpdate() { - if (animationOffsetValue < 0) { - animationOffsetValue = getWorld().getTotalWorldTime() * getWorld().rand.nextFloat(); - animationOffset.setValue(animationOffsetValue); - } - - if (getWorld().isRemote) { - return; - } - - if (!isRegistered) { - isRegistered = InversionPillarHandler.addPillarToMap(getWorld(), getType(), getPos()); - } - - counter++; - - double currentWill = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - if (counter % 1 == 0) { - List pillarList = getNearbyPillarsExcludingThis(); -// if (type == EnumDemonWillType.VENGEFUL) -// { -// System.out.println(pillarList.size() + " nearby pillars"); -// } - generateWillForNearbyPillars(currentWill, pillarList); - generateInversionForNearbyPillars(currentWill, pillarList); - int pollute = polluteNearbyBlocks(currentWill); - if (pollute == 1) { - currentInversion += addedInversionPerFailedCheck; - consecutiveFailedChecks++; - } else if (pollute == 3) { - currentInversion += addedInversionPerFailedCheck; - consecutiveFailedAirChecks++; - } else if (pollute == 0) { - //We successfully found a block to replace! - consecutiveFailedChecks = 0; - consecutiveFailedAirChecks = 0; - } - - if (consecutiveFailedAirChecks > 100) { - createObstructionsInAir(); - } - - if (currentInversion >= inversionToSpreadWill) { - spreadWillToSurroundingChunks(); - } - - if (consecutiveFailedChecks > 5 * currentInfectionRadius && currentInversion >= inversionToIncreaseRadius) { - currentInfectionRadius++; - consecutiveFailedChecks = 0; - currentInversion -= inversionToIncreaseRadius; - BMLog.DEBUG.info("Increasing radius!"); - } else if (consecutiveFailedAirChecks > 25 * currentInfectionRadius) //Change this to require a number of "creations" with the orbs in the air. - { - currentInfectionRadius++; - consecutiveFailedChecks = 0; - currentInversion -= inversionToIncreaseRadius; - BMLog.DEBUG.info("Increasing radius due to being in the air!"); - } - - if (currentInfectionRadius >= 8 && currentInversion >= inversionToAddPillar) { - //TODO: Improve algorithm - List allConnectedPos = InversionPillarHandler.getAllConnectedPillars(getWorld(), type, pos); - BlockPos candidatePos = findCandidatePositionForPillar(getWorld(), type, pos, allConnectedPos, 5, 10); - if (!candidatePos.equals(BlockPos.ORIGIN)) { - currentInversion = 0; - BlockState pillarState = RegistrarBloodMagicBlocks.INVERSION_PILLAR.getStateFromMeta(type.ordinal()); - BlockState bottomState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2); - BlockState topState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2 + 1); - getWorld().setBlockState(candidatePos, pillarState); - getWorld().setBlockState(candidatePos.down(), bottomState); - getWorld().setBlockState(candidatePos.up(), topState); - } - } - } - } - -// public static int getDormantTimeForConnectedPillarsOnSpawn() -// { -// return 0; -// } - - public void createObstructionsInAir() { - if (currentInversion > 1000) { - Vec3d vec = new Vec3d(getWorld().rand.nextDouble() * 2 - 1, getWorld().rand.nextDouble() * 2 - 1, getWorld().rand.nextDouble() * 2 - 1).normalize().scale(2 * currentInfectionRadius); - - BlockPos centralPos = pos.add(vec.x, vec.y, vec.z); - - getWorld().setBlockState(centralPos, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(0)); - currentInversion -= 1000; - } - } - - public void spreadWillToSurroundingChunks() { - double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - if (currentAmount <= minimumWillForChunkWhenSpreading) { - return; - } - - for (Direction side : Direction.HORIZONTALS) { - BlockPos offsetPos = pos.offset(side, 16); - double sideAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), offsetPos, type); - if (currentAmount > sideAmount) { - double drainAmount = Math.min((currentAmount - sideAmount) / 2, willPushRate); - if (drainAmount < willPushRate / 2) { - continue; - } - - double drain = WorldDemonWillHandler.drainWill(getWorld(), pos, type, drainAmount, true); - drain = WorldDemonWillHandler.fillWillToMaximum(getWorld(), offsetPos, type, drain, maxWillForChunk, true); - - currentInversion -= drain * inversionCostPerWillSpread; - } - } - } - - public void removePillarFromMap() { - if (!getWorld().isRemote) { - InversionPillarHandler.removePillarFromMap(getWorld(), type, pos); - } - } - - public List getNearbyPillarsExcludingThis() { - return InversionPillarHandler.getNearbyPillars(getWorld(), type, pos); - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - - if (!tag.hasKey(Constants.NBT.WILL_TYPE)) { - type = EnumDemonWillType.DEFAULT; - } - - type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - currentInversion = tag.getDouble("currentInversion"); - currentInfectionRadius = tag.getInt("currentInfectionRadius"); - consecutiveFailedChecks = tag.getInt("consecutiveFailedChecks"); - - animationOffsetValue = tag.getFloat("animationOffset"); - animationOffset.setValue(animationOffsetValue); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - tag.putDouble("currentInversion", currentInversion); - tag.putInt("currentInfectionRadius", currentInfectionRadius); - tag.putInt("consecutiveFailedChecks", consecutiveFailedChecks); - tag.putFloat("animationOffset", animationOffsetValue); - - return tag; - } - - public void generateWillForNearbyPillars(double currentWillInChunk, List offsetPositions) { - double totalGeneratedWill = 0; - double willFactor = currentWillInChunk / 1000; - - for (BlockPos offsetPos : offsetPositions) { - double distanceSquared = offsetPos.distanceSq(pos); - - totalGeneratedWill += willFactor * 343 / (343 + Math.pow(distanceSquared, 3 / 2)); - } - - if (totalGeneratedWill > 0) { - WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, totalGeneratedWill, maxWillForChunk, true); - } - } - - public void generateInversionForNearbyPillars(double currentWillInChunk, List offsetPositions) { - double willFactor = currentWillInChunk / 400; - double totalGeneratedInversion = willFactor; - - for (BlockPos offsetPos : offsetPositions) { - double distanceSquared = offsetPos.distanceSq(pos); - - totalGeneratedInversion += 3125 / (3125 + Math.pow(distanceSquared, 5 / 2)); - } - - currentInversion = Math.max(0, currentInversion + totalGeneratedInversion); - } - - /** - * @param currentWillInChunk - * @return 0 if the block is successfully placed, 1 if the block is not - * placed due to the selected place being invalid, 2 if the block is - * not placed due to there not being enough Will or Inversion, 3 if - * the block is not placed due to the selected block being air. - */ - public int polluteNearbyBlocks(double currentWillInChunk) { -// System.out.println("Hai! :D Current Inversion: " + currentInversion + ", Current Will: " + currentWillInChunk); - if (currentWillInChunk < operationThreshold || currentInversion < inversionPerOperation) { - return 2; //Not enough Will or Inversion available - } - - for (int i = 0; i < currentInfectionRadius; i++) { - double xOff = (getWorld().rand.nextBoolean() ? 1 : -1) * (getWorld().rand.nextGaussian() + 1) * (currentInfectionRadius); - double yOff = (getWorld().rand.nextBoolean() ? 1 : -1) * (getWorld().rand.nextGaussian() + 1) * (currentInfectionRadius); - double zOff = (getWorld().rand.nextBoolean() ? 1 : -1) * (getWorld().rand.nextGaussian() + 1) * (currentInfectionRadius); - double r2 = xOff * xOff + yOff * yOff + zOff * zOff; - int maxInfectionRadius2 = (9 * currentInfectionRadius * currentInfectionRadius); - if (r2 > maxInfectionRadius2) { - double factor = Math.sqrt(maxInfectionRadius2 / r2); - xOff *= factor; - yOff *= factor; - zOff *= factor; - } - - BlockPos offsetPos = pos.add(xOff + 0.5, yOff + 0.5, zOff + 0.5); - if (offsetPos.equals(pos)) { - return 1; //Invalid block (itself!) - } - - BlockState state = getWorld().getBlockState(offsetPos); - if (!state.getBlock().isAir(state, getWorld(), offsetPos)) { - //Consume Will and set this block - Block block = state.getBlock(); - if (block == Blocks.DIRT || block == Blocks.STONE || block == Blocks.GRASS) { - if (getWorld().setBlockState(offsetPos, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(0))) { - WorldDemonWillHandler.drainWill(getWorld(), pos, type, willPerOperation, true); - currentInversion -= inversionPerOperation; - - return 0; //Successfully placed - } - } - - return 1; //Invalid block - } - } - - return 3; //The block was air - } - - public void handleEvents(float time, Iterable pastEvents) { - for (Event event : pastEvents) { - BMLog.DEBUG.info("Event: " + event.event() + " " + event.offset() + " " + getPos() + " " + time); - } - } - - @Override - public boolean hasFastRenderer() { - return true; - } - - @Override - public boolean hasCapability(Capability capability, Direction side) { - if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { - return true; - } - return super.hasCapability(capability, side); - } - - @Override - public T getCapability(Capability capability, Direction side) { - if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { - return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); - } - return super.getCapability(capability, side); - } - - public IAnimationStateMachine getAsm() { - return asm; - } - - public float getAnimationOffsetValue() { - return animationOffsetValue; - } - - public void setAnimationOffsetValue(float animationOffsetValue) { - this.animationOffsetValue = animationOffsetValue; - } - - public VariableValue getAnimationOffset() { - return animationOffset; - } - - public VariableValue getCycleLength() { - return cycleLength; - } - - public EnumDemonWillType getType() { - return type; - } - - public void setType(EnumDemonWillType type) { - this.type = type; - } - - public double getCurrentInversion() { - return currentInversion; - } - - public void setCurrentInversion(double currentInversion) { - this.currentInversion = currentInversion; - } - - public int getConsecutiveFailedChecks() { - return consecutiveFailedChecks; - } - - public void setConsecutiveFailedChecks(int consecutiveFailedChecks) { - this.consecutiveFailedChecks = consecutiveFailedChecks; - } - - public int getConsecutiveFailedAirChecks() { - return consecutiveFailedAirChecks; - } - - public void setConsecutiveFailedAirChecks(int consecutiveFailedAirChecks) { - this.consecutiveFailedAirChecks = consecutiveFailedAirChecks; - } - - public int getCurrentInfectionRadius() { - return currentInfectionRadius; - } - - public void setCurrentInfectionRadius(int currentInfectionRadius) { - this.currentInfectionRadius = currentInfectionRadius; - } - - public int getCounter() { - return counter; - } - - public void setCounter(int counter) { - this.counter = counter; - } - - public boolean isRegistered() { - return isRegistered; - } - - public void setRegistered(boolean registered) { - isRegistered = registered; - } - - public static BlockPos findCandidatePositionForPillar(World world, EnumDemonWillType type, BlockPos pos, List posList, double tooCloseDistance, double wantedAverageDistance) { - int maxIterations = 100; - int heightCheckRange = 3; - - for (int i = 0; i < maxIterations; i++) { - Collections.shuffle(posList); - BlockPos pillarPos = posList.get(0); - - Vec3d vec = new Vec3d(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1).normalize().scale(wantedAverageDistance); - - BlockPos centralPos = pillarPos.add(vec.x, vec.y, vec.z); - BlockPos testPos = null; - candidateTest: - for (int h = 0; h <= heightCheckRange; h++) { - for (int sig = -1; sig <= 1; sig += (h > 0 ? 2 : 3)) { - BlockPos candidatePos = centralPos.add(0, sig * h, 0); - if (world.isAirBlock(candidatePos) && world.isAirBlock(candidatePos.up()) && world.isAirBlock(candidatePos.down()) && !world.isAirBlock(candidatePos.down(2))) { - testPos = candidatePos; - break candidateTest; - } - } - } - - if (testPos != null) { - boolean isValid = true; - for (BlockPos pillarTestPos : posList) { - if (pillarTestPos.distanceSq(testPos) <= tooCloseDistance * tooCloseDistance) { - isValid = false; - break; - } - } - - if (isValid) { - return testPos; - } - } - } - - return BlockPos.ORIGIN; - } - - public static double getWillPerOperation() { - return willPerOperation; - } - - public static void setWillPerOperation(double willPerOperation) { - TileInversionPillar.willPerOperation = willPerOperation; - } - - public static double getInversionPerOperation() { - return inversionPerOperation; - } - - public static void setInversionPerOperation(double inversionPerOperation) { - TileInversionPillar.inversionPerOperation = inversionPerOperation; - } - - public static double getAddedInversionPerFailedCheck() { - return addedInversionPerFailedCheck; - } - - public static void setAddedInversionPerFailedCheck(double addedInversionPerFailedCheck) { - TileInversionPillar.addedInversionPerFailedCheck = addedInversionPerFailedCheck; - } - - public static double getInversionToIncreaseRadius() { - return inversionToIncreaseRadius; - } - - public static void setInversionToIncreaseRadius(double inversionToIncreaseRadius) { - TileInversionPillar.inversionToIncreaseRadius = inversionToIncreaseRadius; - } - - public static double getInversionToAddPillar() { - return inversionToAddPillar; - } - - public static void setInversionToAddPillar(double inversionToAddPillar) { - TileInversionPillar.inversionToAddPillar = inversionToAddPillar; - } - - public static double getOperationThreshold() { - return operationThreshold; - } - - public static void setOperationThreshold(double operationThreshold) { - TileInversionPillar.operationThreshold = operationThreshold; - } - - public static double getInversionToSpreadWill() { - return inversionToSpreadWill; - } - - public static void setInversionToSpreadWill(double inversionToSpreadWill) { - TileInversionPillar.inversionToSpreadWill = inversionToSpreadWill; - } - - public static double getWillPushRate() { - return willPushRate; - } - - public static void setWillPushRate(double willPushRate) { - TileInversionPillar.willPushRate = willPushRate; - } - - public static double getInversionCostPerWillSpread() { - return inversionCostPerWillSpread; - } - - public static void setInversionCostPerWillSpread(double inversionCostPerWillSpread) { - TileInversionPillar.inversionCostPerWillSpread = inversionCostPerWillSpread; - } - - public static double getMinimumWillForChunkWhenSpreading() { - return minimumWillForChunkWhenSpreading; - } - - public static void setMinimumWillForChunkWhenSpreading(double minimumWillForChunkWhenSpreading) { - TileInversionPillar.minimumWillForChunkWhenSpreading = minimumWillForChunkWhenSpreading; - } - - public static double getMaxWillForChunk() { - return maxWillForChunk; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java deleted file mode 100644 index ce5a84c0..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ /dev/null @@ -1,459 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.event.RitualEvent; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.item.ItemActivationCrystal; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.ritual.EnumReaderBoundaries; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.tile.base.TileTicking; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.helper.*; -import com.google.common.base.Strings; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - -import javax.annotation.Nullable; -import java.util.*; - -public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone { - protected final Map modableRangeMap = new HashMap<>(); - private UUID owner; - private SoulNetwork cachedNetwork; - private boolean active; - private boolean redstoned; - private int activeTime; - private int cooldown; - private Ritual currentRitual; - private Direction direction = Direction.NORTH; - private boolean inverted; - private List currentActiveWillConfig = new ArrayList<>(); - - @Override - public void onUpdate() { - if (getWorld().isRemote) - return; - - if (isPowered() && isActive()) { - active = false; - redstoned = true; - stopRitual(Ritual.BreakType.REDSTONE); - return; - } - - if (!isActive() && !isPowered() && isRedstoned() && getCurrentRitual() != null) { - active = true; - ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, 1, getCurrentRitual().getCrystalLevel())); - BindableHelper.applyBinding(crystalStack, new Binding(owner, PlayerHelper.getUsernameFromUUID(owner))); - activateRitual(crystalStack, null, getCurrentRitual()); - redstoned = false; - } - - if (getCurrentRitual() != null && isActive()) { - if (activeTime % getCurrentRitual().getRefreshTime() == 0) - performRitual(getWorld(), getPos()); - - activeTime++; - } - } - - @Override - public void deserialize(CompoundNBT tag) { - owner = tag.hasUniqueId("owner") ? tag.getUniqueId("owner") : null; - if (owner != null) - cachedNetwork = NetworkHelper.getSoulNetwork(owner); - currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); - if (currentRitual != null) { - CompoundNBT ritualTag = tag.getCompound(Constants.NBT.CURRENT_RITUAL_TAG); - if (!ritualTag.isEmpty()) { - currentRitual.readFromNBT(ritualTag); - } - } - active = tag.getBoolean(Constants.NBT.IS_RUNNING); - activeTime = tag.getInt(Constants.NBT.RUNTIME); - direction = Direction.VALUES[tag.getInt(Constants.NBT.DIRECTION)]; - redstoned = tag.getBoolean(Constants.NBT.IS_REDSTONED); - - for (EnumDemonWillType type : EnumDemonWillType.values()) { - if (tag.getBoolean("EnumWill" + type)) { - currentActiveWillConfig.add(type); - } - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); - if (owner != null) - tag.putUniqueId("owner", owner); - tag.putString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); - if (currentRitual != null) { - CompoundNBT ritualTag = new CompoundNBT(); - currentRitual.writeToNBT(ritualTag); - tag.put(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); - } - tag.putBoolean(Constants.NBT.IS_RUNNING, isActive()); - tag.putInt(Constants.NBT.RUNTIME, getActiveTime()); - tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); - tag.putBoolean(Constants.NBT.IS_REDSTONED, redstoned); - - for (EnumDemonWillType type : currentActiveWillConfig) { - tag.putBoolean("EnumWill" + type, true); - } - - return tag; - } - - @Override - public boolean activateRitual(ItemStack activationCrystal, @Nullable PlayerEntity activator, Ritual ritual) { - if (PlayerHelper.isFakePlayer(activator)) - return false; - - Binding binding = ((IBindable) activationCrystal.getItem()).getBinding(activationCrystal); - if (binding != null && ritual != null) { - if (activationCrystal.getItem() instanceof ItemActivationCrystal) { - int crystalLevel = ((ItemActivationCrystal) activationCrystal.getItem()).getCrystalLevel(activationCrystal); - if (RitualHelper.canCrystalActivate(ritual, crystalLevel)) { - if (!getWorld().isRemote) { - SoulNetwork network = NetworkHelper.getSoulNetwork(binding); - - if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() && (activator != null && !activator.capabilities.isCreativeMode)) { - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.weak"), true); - return false; - } - - if (currentRitual != null) - currentRitual.stopRitual(this, Ritual.BreakType.ACTIVATE); - - RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, binding.getOwnerId(), ritual, activator, activationCrystal, crystalLevel); - - if (MinecraftForge.EVENT_BUS.post(event)) { - if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.prevent"), true); - return false; - } - - if (ritual.activateRitual(this, activator, binding.getOwnerId())) { - if (!isRedstoned() && (activator != null && !activator.capabilities.isCreativeMode)) - network.syphon(ticket(ritual.getActivationCost())); - - if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.activate"), true); - - this.active = true; - this.owner = binding.getOwnerId(); - this.cachedNetwork = network; - this.currentRitual = ritual; - - if (!checkBlockRanges(ritual.getModableRangeMap())) - addBlockRanges(ritual.getModableRangeMap()); - - notifyUpdate(); - return true; - } - } - - notifyUpdate(); - return true; - } - } - } else { - if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); - } - - return false; - } - - @Override - public void performRitual(World world, BlockPos pos) { - if (!world.isRemote && getCurrentRitual() != null && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(currentRitual), false)) { - if (RitualHelper.checkValidRitual(getWorld(), getPos(), currentRitual, getDirection())) { - Ritual ritual = getCurrentRitual(); - RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), ritual); - - if (MinecraftForge.EVENT_BUS.post(event)) - return; - - if (!checkBlockRanges(getCurrentRitual().getModableRangeMap())) - addBlockRanges(getCurrentRitual().getModableRangeMap()); - - getCurrentRitual().performRitual(this); - } else { - stopRitual(Ritual.BreakType.BREAK_STONE); - } - } - } - - @Override - public void stopRitual(Ritual.BreakType breakType) { - if (!getWorld().isRemote && getCurrentRitual() != null) { - RitualEvent.RitualStopEvent event = new RitualEvent.RitualStopEvent(this, getOwner(), getCurrentRitual(), breakType); - - if (MinecraftForge.EVENT_BUS.post(event)) - return; - - getCurrentRitual().stopRitual(this, breakType); - if (breakType != Ritual.BreakType.REDSTONE) { - this.currentRitual = null; - this.active = false; - this.activeTime = 0; - } - notifyUpdate(); - } - } - - @Override - public int getCooldown() { - return cooldown; - } - - @Override - public void setCooldown(int cooldown) { - this.cooldown = cooldown; - } - - @Override - public Direction getDirection() { - return direction; - } - - public void setDirection(Direction direction) { - this.direction = direction; - } - - @Override - public boolean areTanksEmpty() { - return false; - } - - @Override - public int getRunningTime() { - return activeTime; - } - - @Override - public UUID getOwner() { - return owner; - } - - public void setOwner(UUID owner) { - this.owner = owner; - } - - @Override - public SoulNetwork getOwnerNetwork() { - return cachedNetwork; - } - - @Override - public World getWorld() { - return super.getWorld(); - } - - @Override - public BlockPos getPos() { - return super.getPos(); - } - - @Override - public World getWorldObj() { - return getWorld(); - } - - @Override - public BlockPos getBlockPos() { - return getPos(); - } - - @Override - public String getNextBlockRange(String range) { - if (this.currentRitual != null) { - return this.currentRitual.getNextBlockRange(range); - } - - return ""; - } - - @Override - public void provideInformationOfRitualToPlayer(PlayerEntity player) { - if (this.currentRitual != null) { - ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRitualToPlayer(player)); - } - } - - @Override - public void provideInformationOfRangeToPlayer(PlayerEntity player, String range) { - if (this.currentRitual != null && this.currentRitual.getListOfRanges().contains(range)) { - ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRangeToPlayer(player, range)); - } - } - - @Override - public void setActiveWillConfig(PlayerEntity player, List typeList) { - this.currentActiveWillConfig = typeList; - } - - @Override - public EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2) { - AreaDescriptor descriptor = this.getBlockRange(range); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos()); - - EnumReaderBoundaries modificationType = currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder); - if (modificationType == EnumReaderBoundaries.SUCCESS) - descriptor.modifyAreaByBlockPositions(offset1, offset2); - - return modificationType; - } - - @Override - public List getActiveWillConfig() { - return new ArrayList<>(currentActiveWillConfig); - } - - @Override - public void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList) { - //There is probably an easier way to make expanded chat messages - if (typeList.size() >= 1) { - Object[] translations = new TranslationTextComponent[typeList.size()]; - StringBuilder constructedString = new StringBuilder("%s"); - - for (int i = 1; i < typeList.size(); i++) { - constructedString.append(", %s"); - } - - for (int i = 0; i < typeList.size(); i++) { - translations[i] = new TranslationTextComponent("tooltip.bloodmagic.currentBaseType." + typeList.get(i).name.toLowerCase()); - } - - ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.set", new TranslationTextComponent(constructedString.toString(), translations))); - } else { - ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.void")); - } - } - - public boolean isPowered() { - if (inverted) - return !getWorld().isBlockPowered(getPos()); - - return getWorld().isBlockPowered(getPos()); - } - - public SoulNetwork getCachedNetwork() { - return cachedNetwork; - } - - public void setCachedNetwork(SoulNetwork cachedNetwork) { - this.cachedNetwork = cachedNetwork; - } - - public boolean isActive() { - return active; - } - - @Override - public void setActive(boolean active) { - this.active = active; - } - - public boolean isRedstoned() { - return redstoned; - } - - public void setRedstoned(boolean redstoned) { - this.redstoned = redstoned; - } - - public int getActiveTime() { - return activeTime; - } - - public void setActiveTime(int activeTime) { - this.activeTime = activeTime; - } - - public Ritual getCurrentRitual() { - return currentRitual; - } - - public void setCurrentRitual(Ritual currentRitual) { - this.currentRitual = currentRitual; - } - - public boolean isInverted() { - return inverted; - } - - public void setInverted(boolean inverted) { - this.inverted = inverted; - } - - public List getCurrentActiveWillConfig() { - return currentActiveWillConfig; - } - - public void setCurrentActiveWillConfig(List currentActiveWillConfig) { - this.currentActiveWillConfig = currentActiveWillConfig; - } - - /** - * Used to grab the range of a ritual for a given effect. - * - * @param range - Range that needs to be pulled. - * @return - - */ - public AreaDescriptor getBlockRange(String range) { - if (modableRangeMap.containsKey(range)) { - return modableRangeMap.get(range); - } - - return null; - } - - @Override - public void addBlockRange(String range, AreaDescriptor defaultRange) { - modableRangeMap.putIfAbsent(range, defaultRange.copy()); - } - - @Override - public void addBlockRanges(Map blockRanges) { - for (Map.Entry entry : blockRanges.entrySet()) { - modableRangeMap.putIfAbsent(entry.getKey(), entry.getValue().copy()); - } - } - - @Override - public void setBlockRange(String range, AreaDescriptor defaultRange) { - modableRangeMap.put(range, defaultRange.copy()); - } - - @Override - public void setBlockRanges(Map blockRanges) { - for (Map.Entry entry : blockRanges.entrySet()) { - modableRangeMap.put(entry.getKey(), entry.getValue().copy()); - } - } - - public boolean checkBlockRanges(Map blockRanges) { - for (Map.Entry entry : blockRanges.entrySet()) { - if (modableRangeMap.get(entry.getKey()) == null) - return false; - } - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java deleted file mode 100644 index 6e5fd68a..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ /dev/null @@ -1,369 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.block.BlockMimic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.entity.mob.EntityMimic; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.StateUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.PotionEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.PotionUtils; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.ReflectionHelper; - -import javax.annotation.Nullable; -import java.lang.reflect.Field; -import java.util.List; - -public class TileMimic extends TileInventory implements ITickable { - private static Field _blockMetadata = ReflectionHelper.findField(TileEntity.class, "blockMetadata", "field_145847_g"); - - public boolean dropItemsOnBreak = true; - public CompoundNBT tileTag = new CompoundNBT(); - public TileEntity mimicedTile = null; - BlockState stateOfReplacedBlock = Blocks.AIR.getDefaultState(); - - public int playerCheckRadius = 5; - public int potionSpawnRadius = 5; - public int potionSpawnInterval = 40; - - private int internalCounter = 0; - - public TileMimic() { - super(2, "mimic"); - } - - @Override - public void update() { - if (getWorld().isRemote) { - return; - } - - internalCounter++; - if (internalCounter % potionSpawnInterval == 0 && this.getBlockMetadata() == BlockMimic.sentientMimicMeta) { - ItemStack potionStack = this.getStackInSlot(1); - if (!potionStack.isEmpty()) { - AxisAlignedBB bb = new AxisAlignedBB(this.getPos()).expand(playerCheckRadius, playerCheckRadius, playerCheckRadius); - List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, bb); - - for (PlayerEntity player : playerList) { - if (!player.capabilities.isCreativeMode) { - double posX = this.pos.getX() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius; - double posY = this.pos.getY() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius; - double posZ = this.pos.getZ() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius; - - ItemStack newStack = new ItemStack(potionStack.getItem() == RegistrarBloodMagicItems.POTION_FLASK ? Items.SPLASH_POTION : potionStack.getItem()); - newStack.setTagCompound(potionStack.getTagCompound()); - - PotionEntity potionEntity = new PotionEntity(getWorld(), posX, posY, posZ, newStack); - - getWorld().spawnEntity(potionEntity); - break; - } - } - } - } - - if (this.getBlockMetadata() == BlockMimic.sentientMimicMeta && getWorld().getDifficulty() != Difficulty.PEACEFUL && !(mimicedTile instanceof IInventory)) { - AxisAlignedBB bb = new AxisAlignedBB(this.getPos()).expand(playerCheckRadius, playerCheckRadius, playerCheckRadius); - List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, bb); - - for (PlayerEntity player : playerList) { - if (!player.capabilities.isCreativeMode && Utils.canEntitySeeBlock(getWorld(), player, getPos())) { - spawnMimicEntity(player); - break; - } - } - } - - } - - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, ItemStack heldItem, Direction side) { - if (!heldItem.isEmpty() && player.capabilities.isCreativeMode) { - List list = PotionUtils.getEffectsFromStack(heldItem); - if (!list.isEmpty()) { - if (!world.isRemote) { - setInventorySlotContents(1, heldItem.copy()); - world.notifyBlockUpdate(pos, state, state, 3); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSet")); - } - return true; - } else if (heldItem.getItem() == RegistrarBloodMagicItems.POTION_FLASK) { - //The potion flask is empty, therefore we have to reset the stored potion. - if (!world.isRemote) { - setInventorySlotContents(1, ItemStack.EMPTY); - world.notifyBlockUpdate(pos, state, state, 3); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionRemove")); - } - return true; - } - } - - if (performSpecialAbility(player, side)) { - return true; - } - - if (player.isSneaking()) - return false; - - if (!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == new ItemStack(RegistrarBloodMagicBlocks.MIMIC).getItem()) - return false; - - if (!getStackInSlot(0).isEmpty() && !player.getHeldItem(hand).isEmpty()) - return false; - - if (!dropItemsOnBreak && !player.capabilities.isCreativeMode) - return false; - - Utils.insertItemToTile(this, player, 0); - ItemStack stack = getStackInSlot(0); - if (stateOfReplacedBlock == Blocks.AIR.getDefaultState()) { - if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) { - Block block = ((BlockItem) stack.getItem()).getBlock(); - stateOfReplacedBlock = block.getDefaultState(); - } - } - this.refreshTileEntity(); - - if (player.capabilities.isCreativeMode) { - dropItemsOnBreak = getStackInSlot(0).isEmpty(); - } - - world.notifyBlockUpdate(pos, state, state, 3); - return true; - } - - public boolean performSpecialAbility(PlayerEntity player, Direction sideHit) { - switch (this.getBlockMetadata()) { - case BlockMimic.sentientMimicMeta: - if (player.capabilities.isCreativeMode) { - if (player.isSneaking()) { - playerCheckRadius = Math.max(playerCheckRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); - } else { - playerCheckRadius++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); - } - - return false; - } - - return spawnMimicEntity(player); - default: - if (!player.capabilities.isCreativeMode) { - return false; - } - - if (player.getActiveItemStack().isEmpty() && !getStackInSlot(1).isEmpty()) { - switch (sideHit) { - case EAST: //When the block is clicked on the EAST or WEST side, potionSpawnRadius is edited. - case WEST: - if (player.isSneaking()) { - potionSpawnRadius = Math.max(potionSpawnRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSpawnRadius.down", potionSpawnRadius)); - } else { - potionSpawnRadius++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSpawnRadius.up", potionSpawnRadius)); - } - break; - case NORTH: //When the block is clicked on the NORTH or SOUTH side, detectRadius is edited. - case SOUTH: - if (player.isSneaking()) { - playerCheckRadius = Math.max(playerCheckRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); - } else { - playerCheckRadius++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); - } - break; - case UP: //When the block is clicked on the UP or DOWN side, potionSpawnInterval is edited. - case DOWN: - if (player.isSneaking()) { - potionSpawnInterval = Math.max(potionSpawnInterval - 1, 1); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionInterval.down", potionSpawnInterval)); - } else { - potionSpawnInterval++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionInterval.up", potionSpawnInterval)); - } - break; - default: - break; - - } - - return true; - } - } - return false; - } - - public boolean spawnMimicEntity(PlayerEntity target) { - if (this.getWorld().getDifficulty() == Difficulty.PEACEFUL) { - return false; - } - - if (this.getStackInSlot(0).isEmpty() || getWorld().isRemote) { - return false; - } - - EntityMimic mimicEntity = new EntityMimic(getWorld()); - mimicEntity.setPosition(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); - - mimicEntity.initializeMimic(getStackInSlot(0), tileTag, dropItemsOnBreak, stateOfReplacedBlock, playerCheckRadius, pos); - tileTag = null; - mimicedTile = null; - this.setInventorySlotContents(0, ItemStack.EMPTY); - - getWorld().spawnEntity(mimicEntity); - if (target != null) { - mimicEntity.setAttackTarget(target); - } - - getWorld().setBlockToAir(pos); - - return true; - } - - public void refreshTileEntity() { - if (mimicedTile != null) { - dropMimicedTileInventory(); - } - mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, stateOfReplacedBlock); - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - - dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompound("tileTag"); - stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); - mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, stateOfReplacedBlock); - playerCheckRadius = tag.getInt("playerCheckRadius"); - potionSpawnRadius = tag.getInt("potionSpawnRadius"); - potionSpawnInterval = Math.max(1, tag.getInt("potionSpawnInterval")); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - - tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.put("tileTag", tileTag); - tag.putInt("playerCheckRadius", playerCheckRadius); - tag.putInt("potionSpawnRadius", potionSpawnRadius); - tag.putInt("potionSpawnInterval", potionSpawnInterval); - tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); - - return tag; - } - - @Override - public void dropItems() { - if (dropItemsOnBreak) { - InventoryHelper.dropInventoryItems(getWorld(), getPos(), this); - } - - dropMimicedTileInventory(); - } - - public void dropMimicedTileInventory() { - if (!getWorld().isRemote && mimicedTile instanceof IInventory) { - InventoryHelper.dropInventoryItems(getWorld(), getPos(), (IInventory) mimicedTile); - } - } - - public BlockState getReplacedState() { - return stateOfReplacedBlock; - } - - public void setReplacedState(BlockState state) { - stateOfReplacedBlock = state; - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemstack) { - return slot == 0 && dropItemsOnBreak; - } - - public static void replaceMimicWithBlockActual(TileMimic mimic) { - World world = mimic.getWorld(); - BlockPos pos = mimic.getPos(); - - replaceMimicWithBlockActual(world, pos, mimic.getStackInSlot(0), mimic.tileTag, mimic.stateOfReplacedBlock); - } - - public static boolean replaceMimicWithBlockActual(World world, BlockPos pos, ItemStack stack, CompoundNBT tileTag, BlockState replacementState) { - if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) { - Block block = ((BlockItem) stack.getItem()).getBlock(); - BlockState state = replacementState; - if (world.setBlockState(pos, state, 3)) { - TileEntity tile = world.getTileEntity(pos); - if (tile != null) { - tileTag.putInt("x", pos.getX()); - tileTag.putInt("y", pos.getY()); - tileTag.putInt("z", pos.getZ()); - tile.readFromNBT(tileTag); - } - - return true; - } - } - - return false; - } - - @Nullable - public static TileEntity getTileFromStackWithTag(World world, BlockPos pos, ItemStack stack, @Nullable CompoundNBT tag, BlockState replacementState) { - if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) { - Block block = ((BlockItem) stack.getItem()).getBlock(); - BlockState state = replacementState; - if (block.hasTileEntity(state)) { - TileEntity tile = block.createTileEntity(world, state); - - if (tile == null) - return null; - - if (tag != null) { - CompoundNBT copyTag = tag.copy(); - copyTag.putInt("x", pos.getX()); - copyTag.putInt("y", pos.getY()); - copyTag.putInt("z", pos.getZ()); - tile.readFromNBT(copyTag); - } - - tile.setWorld(world); - - try { - _blockMetadata.setInt(tile, block.getMetaFromState(replacementState)); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - - return tile; - } - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java deleted file mode 100644 index 553fc9bf..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.tile.base.TileTicking; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; - -public class TilePhantomBlock extends TileTicking { - private int ticksRemaining = 10; - - public TilePhantomBlock() { - } - - public TilePhantomBlock(int ticksRemaining) { - this.ticksRemaining = ticksRemaining; - } - - @Override - public void deserialize(CompoundNBT tagCompound) { - this.ticksRemaining = tagCompound.getInt(Constants.NBT.TICKS_REMAINING); - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.putInt(Constants.NBT.TICKS_REMAINING, ticksRemaining); - return tagCompound; - } - - @Override - public void onUpdate() { - if (!world.isRemote) { - PlayerEntity player = world.getClosestPlayer(getPos().getX(), getPos().getY(), getPos().getZ(), 10.0D, ItemSigilPhantomBridge.IS_PHANTOM_ACTIVE); - if (player != null && !player.isSneaking()) - return; - ticksRemaining--; - } - - - if (ticksRemaining <= 0) { - world.setBlockToAir(getPos()); - world.removeTileEntity(getPos()); - } - - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java deleted file mode 100644 index 6710da46..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ /dev/null @@ -1,83 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.iface.IPurificationAsh; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.util.helper.PurificationHelper; -import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ServerWorld; - -import java.util.List; - -public class TilePurificationAltar extends TileInventory implements ITickable { - public AreaDescriptor purityArea = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); - - public double totalPurity = 0; - public double maxPurity = 0; - public double purityRate = 0; - - public TilePurificationAltar() { - super(1, "purificationAltar"); - } - - @Override - public void update() { - if (totalPurity <= 0) { - ItemStack stack = this.getStackInSlot(0); - if (!stack.isEmpty() && stack.getItem() instanceof IPurificationAsh) { - totalPurity = ((IPurificationAsh) stack.getItem()).getTotalPurity(stack); - maxPurity = ((IPurificationAsh) stack.getItem()).getMaxPurity(stack); - purityRate = ((IPurificationAsh) stack.getItem()).getPurityRate(stack); - } - } else { - return; - } - - AxisAlignedBB aabb = purityArea.getAABB(getPos()); - List animalList = getWorld().getEntitiesWithinAABB(AnimalEntity.class, aabb); - if (animalList.isEmpty()) { - return; - } - - boolean hasPerformed = false; - - for (AnimalEntity animal : animalList) { - double added = PurificationHelper.addPurity(animal, Math.min(purityRate, totalPurity), maxPurity); - if (added > 0) { - totalPurity -= purityRate; - hasPerformed = true; - } - } - - if (hasPerformed) { - if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof ServerWorld) { - ServerWorld server = (ServerWorld) getWorld(); - server.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); - } - } - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - totalPurity = tag.getDouble("totalPurity"); - maxPurity = tag.getDouble("maxPurity"); - purityRate = tag.getDouble("purityRate"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - - tag.putDouble("totalPurity", totalPurity); - tag.putDouble("maxPurity", maxPurity); - tag.putDouble("purityRate", purityRate); - - return tag; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 8d1b7807..0dcdcc12 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,284 +1,421 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillConduit; -import WayofTime.bloodmagic.soul.IDemonWillGem; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ITickable; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.items.ItemHandlerHelper; +package wayoftime.bloodmagic.tile; import java.util.ArrayList; import java.util.List; -public class TileSoulForge extends TileInventory implements ITickable, IDemonWillConduit { - public static final int ticksRequired = 100; - public static final double worldWillTransferRate = 1; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.INamedContainerProvider; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.ITickableTileEntity; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.IIntArray; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.registries.ObjectHolder; +import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.will.EnumDemonWillType; +import wayoftime.bloodmagic.will.IDemonWill; +import wayoftime.bloodmagic.will.IDemonWillConduit; +import wayoftime.bloodmagic.will.IDemonWillGem; - public static final int soulSlot = 4; - public static final int outputSlot = 5; +public class TileSoulForge extends TileInventory + implements ITickableTileEntity, INamedContainerProvider, IDemonWillConduit +{ + @ObjectHolder("bloodmagic:soulforge") + public static TileEntityType TYPE; - //Input slots are from 0 to 3. + public static final int ticksRequired = 100; + public static final double worldWillTransferRate = 1; - public int burnTime = 0; + public static final int soulSlot = 4; + public static final int outputSlot = 5; - public TileSoulForge() { - super(6, "soulForge"); - } + // Input slots are from 0 to 3. - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); + public int burnTime = 0; - burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); - } + public TileSoulForge(TileEntityType type) + { + super(type, 6, "soulforge"); + } - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); + public TileSoulForge() + { + this(TYPE); + } - tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); - return tag; - } + @Override + public void deserialize(CompoundNBT tag) + { + super.deserialize(tag); - @Override - public void update() { - if (!getWorld().isRemote) { - for (EnumDemonWillType type : EnumDemonWillType.values()) { - double willInWorld = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double filled = Math.min(willInWorld, worldWillTransferRate); + burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); + } - if (filled > 0) { - filled = this.fillDemonWill(type, filled, false); - filled = WorldDemonWillHandler.drainWill(getWorld(), pos, type, filled, false); + @Override + public CompoundNBT serialize(CompoundNBT tag) + { + super.serialize(tag); - if (filled > 0) { - this.fillDemonWill(type, filled, true); - WorldDemonWillHandler.drainWill(getWorld(), pos, type, filled, true); - } - } - } - } + tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); + return tag; + } - if (!hasSoulGemOrSoul()) { - burnTime = 0; - return; - } + public final IIntArray TileData = new IIntArray() + { + @Override + public int get(int index) + { + switch (index) + { + case 0: + return burnTime; + case 1: + return ticksRequired; + case 2: + return 0; + default: + throw new IllegalArgumentException("Invalid index: " + index); + } + } - double soulsInGem = getWill(EnumDemonWillType.DEFAULT); + @Override + public void set(int index, int value) + { + throw new IllegalStateException("Cannot set values through IIntArray"); + } - List inputList = new ArrayList<>(); + @Override + public int size() + { + return 3; + } + }; - for (int i = 0; i < 4; i++) - if (!getStackInSlot(i).isEmpty()) - inputList.add(getStackInSlot(i)); + @Override + public void tick() + { + if (!hasSoulGemOrSoul()) + { + burnTime = 0; + return; + } - RecipeTartaricForge recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForge(inputList); - if (recipe != null && (soulsInGem >= recipe.getMinimumSouls() || burnTime > 0)) { - if (canCraft(recipe)) { - burnTime++; + double soulsInGem = getWill(EnumDemonWillType.DEFAULT); - if (burnTime == ticksRequired) { - if (!getWorld().isRemote) { - double requiredSouls = recipe.getSoulDrain(); - if (requiredSouls > 0) { - if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) { - consumeSouls(EnumDemonWillType.DEFAULT, requiredSouls); - } - } + List inputList = new ArrayList<>(); - if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) - craftItem(recipe); - } + for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) + inputList.add(getStackInSlot(i)); - burnTime = 0; - } else if (burnTime > ticksRequired + 10) { - burnTime = 0; - } - } else { - burnTime = 0; - } - } else { - burnTime = 0; - } - } + RecipeTartaricForge recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForge(world, inputList); + if (recipe != null && (soulsInGem >= recipe.getMinimumSouls() || burnTime > 0)) + { + if (canCraft(recipe)) + { + burnTime++; - public double getProgressForGui() { - return ((double) burnTime) / ticksRequired; - } + if (burnTime == ticksRequired) + { + if (!getWorld().isRemote) + { + double requiredSouls = recipe.getSoulDrain(); + if (requiredSouls > 0) + { + if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) + { + consumeSouls(EnumDemonWillType.DEFAULT, requiredSouls); + } + } - private boolean canCraft(RecipeTartaricForge recipe) { - if (recipe == null) - return false; + if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) + craftItem(recipe); + } - ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (recipe.getOutput().isEmpty()) - return false; - if (currentOutputStack.isEmpty()) - return true; - if (!currentOutputStack.isItemEqual(recipe.getOutput())) - return false; - int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); - return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); + burnTime = 0; + } else if (burnTime > ticksRequired + 10) + { + burnTime = 0; + } + } else + { + burnTime = 0; + } + } else + { + burnTime = 0; + } + } - } + private boolean canCraft(RecipeTartaricForge recipe) + { + if (recipe == null) + return false; - public void craftItem(RecipeTartaricForge recipe) { - if (this.canCraft(recipe)) { - ItemStack currentOutputStack = getStackInSlot(outputSlot); + ItemStack currentOutputStack = getStackInSlot(outputSlot); + if (recipe.getOutput().isEmpty()) + return false; + if (currentOutputStack.isEmpty()) + return true; + if (!currentOutputStack.isItemEqual(recipe.getOutput())) + return false; + int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); + return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); - List inputList = new ArrayList<>(); - for (int i = 0; i < 4; i++) - if (!getStackInSlot(i).isEmpty()) - inputList.add(getStackInSlot(i).copy()); + } - BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); - MinecraftForge.EVENT_BUS.post(event); + public void craftItem(RecipeTartaricForge recipe) + { + if (this.canCraft(recipe)) + { + ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (currentOutputStack.isEmpty()) { - setInventorySlotContents(outputSlot, event.getOutput()); - } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) { - currentOutputStack.grow(event.getOutput().getCount()); - } + List inputList = new ArrayList<>(); + for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) + inputList.add(getStackInSlot(i).copy()); - consumeInventory(); - } - } + BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); + MinecraftForge.EVENT_BUS.post(event); - public boolean hasSoulGemOrSoul() { - ItemStack soulStack = getStackInSlot(soulSlot); + if (currentOutputStack.isEmpty()) + { + setInventorySlotContents(outputSlot, event.getOutput()); + } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) + { + currentOutputStack.grow(event.getOutput().getCount()); + } - if (!soulStack.isEmpty()) { - if (soulStack.getItem() instanceof IDemonWill || soulStack.getItem() instanceof IDemonWillGem) { - return true; - } - } + consumeInventory(); + } + } - return false; - } + @Override + public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_) + { + assert world != null; + return new ContainerSoulForge(this, TileData, p_createMenu_1_, p_createMenu_2_); + } - public double getWill(EnumDemonWillType type) { - ItemStack soulStack = getStackInSlot(soulSlot); + @Override + public ITextComponent getDisplayName() + { + return new StringTextComponent("Hellfire Forge"); + } - if (soulStack != null) { - if (soulStack.getItem() instanceof IDemonWill && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type) { - IDemonWill soul = (IDemonWill) soulStack.getItem(); - return soul.getWill(type, soulStack); - } + public boolean hasSoulGemOrSoul() + { + ItemStack soulStack = getStackInSlot(soulSlot); - if (soulStack.getItem() instanceof IDemonWillGem) { - IDemonWillGem soul = (IDemonWillGem) soulStack.getItem(); - return soul.getWill(type, soulStack); - } - } + if (!soulStack.isEmpty()) + { + if (soulStack.getItem() instanceof IDemonWill || soulStack.getItem() instanceof IDemonWillGem) + { + return true; + } + } - return 0; - } + return false; + } - public double consumeSouls(EnumDemonWillType type, double requested) { - ItemStack soulStack = getStackInSlot(soulSlot); + public double getProgressForGui() + { + return ((double) burnTime) / ticksRequired; + } - if (soulStack != null) { - if (soulStack.getItem() instanceof IDemonWill && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type) { - IDemonWill soul = (IDemonWill) soulStack.getItem(); - double souls = soul.drainWill(type, soulStack, requested); - if (soul.getWill(type, soulStack) <= 0) { - setInventorySlotContents(soulSlot, ItemStack.EMPTY); - } - return souls; - } +// private boolean canCraft(RecipeTartaricForge recipe) +// { +// if (recipe == null) +// return false; +// +// ItemStack currentOutputStack = getStackInSlot(outputSlot); +// if (recipe.getOutput().isEmpty()) +// return false; +// if (currentOutputStack.isEmpty()) +// return true; +// if (!currentOutputStack.isItemEqual(recipe.getOutput())) +// return false; +// int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); +// return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); +// +// } +// +// public void craftItem(RecipeTartaricForge recipe) +// { +// if (this.canCraft(recipe)) +// { +// ItemStack currentOutputStack = getStackInSlot(outputSlot); +// +// List inputList = new ArrayList<>(); +// for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) +// inputList.add(getStackInSlot(i).copy()); +// +// BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); +// MinecraftForge.EVENT_BUS.post(event); +// +// if (currentOutputStack.isEmpty()) +// { +// setInventorySlotContents(outputSlot, event.getOutput()); +// } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) +// { +// currentOutputStack.grow(event.getOutput().getCount()); +// } +// +// consumeInventory(); +// } +// } - if (soulStack.getItem() instanceof IDemonWillGem) { - IDemonWillGem soul = (IDemonWillGem) soulStack.getItem(); - return soul.drainWill(type, soulStack, requested, true); - } - } + public double getWill(EnumDemonWillType type) + { + ItemStack soulStack = getStackInSlot(soulSlot); - return 0; - } + if (soulStack != null) + { + if (soulStack.getItem() instanceof IDemonWill + && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type) + { + IDemonWill soul = (IDemonWill) soulStack.getItem(); + return soul.getWill(type, soulStack); + } - public void consumeInventory() { - for (int i = 0; i < 4; i++) { - ItemStack inputStack = getStackInSlot(i); - if (!inputStack.isEmpty()) { - if (inputStack.getItem().hasContainerItem(inputStack)) { - setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack)); - continue; - } + if (soulStack.getItem() instanceof IDemonWillGem) + { + IDemonWillGem soul = (IDemonWillGem) soulStack.getItem(); + return soul.getWill(type, soulStack); + } + } - inputStack.shrink(1); - if (inputStack.isEmpty()) { - setInventorySlotContents(i, ItemStack.EMPTY); - } - } - } - } + return 0; + } - @Override - public int getWeight() { - return 50; - } + public double consumeSouls(EnumDemonWillType type, double requested) + { + ItemStack soulStack = getStackInSlot(soulSlot); - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) { - if (amount <= 0) { - return 0; - } + if (soulStack != null) + { + if (soulStack.getItem() instanceof IDemonWill + && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type) + { + IDemonWill soul = (IDemonWill) soulStack.getItem(); + double souls = soul.drainWill(type, soulStack, requested); + if (soul.getWill(type, soulStack) <= 0) + { + setInventorySlotContents(soulSlot, ItemStack.EMPTY); + } + return souls; + } - if (!canFill(type)) { - return 0; - } + if (soulStack.getItem() instanceof IDemonWillGem) + { + IDemonWillGem soul = (IDemonWillGem) soulStack.getItem(); + return soul.drainWill(type, soulStack, requested, true); + } + } - ItemStack stack = this.getStackInSlot(soulSlot); - if (stack.isEmpty() || !(stack.getItem() instanceof IDemonWillGem)) { - return 0; - } + return 0; + } - IDemonWillGem willGem = (IDemonWillGem) stack.getItem(); - return willGem.fillWill(type, stack, amount, doFill); - } + public void consumeInventory() + { + for (int i = 0; i < 4; i++) + { + ItemStack inputStack = getStackInSlot(i); + if (!inputStack.isEmpty()) + { + if (inputStack.getItem().hasContainerItem(inputStack)) + { + setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack)); + continue; + } - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) { - ItemStack stack = this.getStackInSlot(soulSlot); - if (stack.isEmpty() || !(stack.getItem() instanceof IDemonWillGem)) { - return 0; - } + inputStack.shrink(1); + if (inputStack.isEmpty()) + { + setInventorySlotContents(i, ItemStack.EMPTY); + } + } + } + } - IDemonWillGem willGem = (IDemonWillGem) stack.getItem(); + @Override + public int getWeight() + { + return 50; + } - double drained = amount; - double current = willGem.getWill(type, stack); - if (current < drained) { - drained = current; - } + @Override + public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) + { + if (amount <= 0) + { + return 0; + } - if (doDrain) { - drained = willGem.drainWill(type, stack, drained, true); - } + if (!canFill(type)) + { + return 0; + } - return drained; - } + ItemStack stack = this.getStackInSlot(soulSlot); + if (stack.isEmpty() || !(stack.getItem() instanceof IDemonWillGem)) + { + return 0; + } - @Override - public boolean canFill(EnumDemonWillType type) { - return true; - } + IDemonWillGem willGem = (IDemonWillGem) stack.getItem(); + return willGem.fillWill(type, stack, amount, doFill); + } - @Override - public boolean canDrain(EnumDemonWillType type) { - return true; - } + @Override + public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) + { + ItemStack stack = this.getStackInSlot(soulSlot); + if (stack.isEmpty() || !(stack.getItem() instanceof IDemonWillGem)) + { + return 0; + } - @Override - public double getCurrentWill(EnumDemonWillType type) { - return 0; - } + IDemonWillGem willGem = (IDemonWillGem) stack.getItem(); + + double drained = amount; + double current = willGem.getWill(type, stack); + if (current < drained) + { + drained = current; + } + + if (doDrain) + { + drained = willGem.drainWill(type, stack, drained, true); + } + + return drained; + } + + @Override + public boolean canFill(EnumDemonWillType type) + { + return true; + } + + @Override + public boolean canDrain(EnumDemonWillType type) + { + return true; + } + + @Override + public double getCurrentWill(EnumDemonWillType type) + { + return 0; + } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java deleted file mode 100644 index 4d5d1eef..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ /dev/null @@ -1,84 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.tile.base.TileTicking; -import com.google.common.base.Strings; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -public class TileSpectralBlock extends TileTicking { - private int ticksRemaining; - private String containedBlockName; - private int containedBlockMeta; - - public TileSpectralBlock() { - } - - @Override - public void deserialize(CompoundNBT tagCompound) { - ticksRemaining = tagCompound.getInt(Constants.NBT.TICKS_REMAINING); - containedBlockName = tagCompound.getString(Constants.NBT.CONTAINED_BLOCK_NAME); - containedBlockMeta = tagCompound.getInt(Constants.NBT.CONTAINED_BLOCK_META); - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.putInt(Constants.NBT.TICKS_REMAINING, ticksRemaining); - tagCompound.putString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); - tagCompound.putInt(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); - return tagCompound; - } - - @Override - public void onUpdate() { - if (getWorld().isRemote) { - return; - } - - ticksRemaining--; - - if (ticksRemaining <= 0) { - returnContainedBlock(); - } - } - - private void setContainedBlockInfo(BlockState blockState) { - containedBlockName = blockState.getBlock().getRegistryName().toString(); - containedBlockMeta = blockState.getBlock().getMetaFromState(blockState); - } - - private void setDuration(int duration) { - ticksRemaining = duration; - } - - public void resetDuration(int reset) { - if (ticksRemaining < reset) - ticksRemaining = reset; - } - - public void returnContainedBlock() { - Block block = null; - - if (!Strings.isNullOrEmpty(containedBlockName)) - block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(containedBlockName)); - - if (block != null && getWorld().setBlockState(pos, block.getStateFromMeta(containedBlockMeta))) - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - } - - public static void createSpectralBlock(World world, BlockPos blockPos, int duration) { - if (world.isAirBlock(blockPos)) - return; - BlockState cachedState = world.getBlockState(blockPos); - world.setBlockState(blockPos, RegistrarBloodMagicBlocks.SPECTRAL.getDefaultState()); - TileSpectralBlock tile = (TileSpectralBlock) world.getTileEntity(blockPos); - tile.setContainedBlockInfo(cachedState); - tile.setDuration(duration); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java deleted file mode 100644 index a6d19da3..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ /dev/null @@ -1,149 +0,0 @@ -package WayofTime.bloodmagic.tile; - -import WayofTime.bloodmagic.block.BlockTeleposer; -import WayofTime.bloodmagic.command.sub.SubCommandTeleposer; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.event.TeleposeEvent; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.teleport.TeleportQueue; -import WayofTime.bloodmagic.teleport.Teleports; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - -import java.util.List; -import java.util.UUID; - -public class TileTeleposer extends TileInventory implements ITickable { - //TODO FUTURE: Make AreaDescriptor for Teleposer perhaps? - public static final String TELEPOSER_RANGE = "teleposerRange"; - - private int previousInput; - - public TileTeleposer() { - super(1, "teleposer"); - } - - @Override - public void deserialize(CompoundNBT tagCompound) { - super.deserialize(tagCompound); - previousInput = tagCompound.getInt(Constants.NBT.PREVIOUS_INPUT); - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) { - super.serialize(tagCompound); - tagCompound.putInt(Constants.NBT.PREVIOUS_INPUT, previousInput); - return tagCompound; - } - - @Override - public void update() { - if (!getWorld().isRemote && canInitiateTeleport()) { - int currentInput = getWorld().getStrongPower(pos); - - if (previousInput == 0 && currentInput != 0) { - initiateTeleport(); - } - - previousInput = currentInput; - - if (world.getTotalWorldTime() % 100 == 0) { - ItemStack focusStack = getStackInSlot(0); - if (!focusStack.isEmpty()) { - if (((ItemTelepositionFocus) focusStack.getItem()).getBinding(focusStack) != null) - SubCommandTeleposer.teleposerSet.add(this); - else - SubCommandTeleposer.teleposerSet.remove(this); - } else - SubCommandTeleposer.teleposerSet.remove(this); - } - } - } - - public void initiateTeleport() { - if (!getWorld().isRemote && canInitiateTeleport() && getBlockType() instanceof BlockTeleposer) { - ItemStack focusStack = getStackInSlot(0); - ItemTelepositionFocus focus = (ItemTelepositionFocus) focusStack.getItem(); - Binding binding = focus.getBinding(focusStack); - if (binding == null) - return; - BlockPos focusPos = focus.getBlockPos(focusStack); - World focusWorld = focus.getWorld(focusStack); - if (focusWorld == null) - return; - - TileEntity boundTile = focusWorld.getTileEntity(focusPos); - if (boundTile instanceof TileTeleposer && boundTile != this) { - final int focusLevel = (focusStack.getItemDamage() + 1); - final int lpToBeDrained = (int) (0.5F * Math.sqrt((pos.getX() - focusPos.getX()) * (pos.getX() - focusPos.getX()) + (pos.getY() - focusPos.getY() + 1) * (pos.getY() - focusPos.getY() + 1) + (pos.getZ() - focusPos.getZ()) * (pos.getZ() - focusPos.getZ()))); - - if (NetworkHelper.syphonFromContainer(focusStack, SoulTicket.block(world, pos, lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1)))) { - int blocksTransported = 0; - - for (int i = -(focusLevel - 1); i <= (focusLevel - 1); i++) { - for (int j = 0; j <= (focusLevel * 2 - 2); j++) { - for (int k = -(focusLevel - 1); k <= (focusLevel - 1); k++) { - TeleposeEvent event = new TeleposeEvent(getWorld(), pos.add(i, 1 + j, k), focusWorld, focusPos.add(i, 1 + j, k)); - if (!MinecraftForge.EVENT_BUS.post(event) && Utils.swapLocations(event.initalWorld, event.initialBlockPos, event.finalWorld, event.finalBlockPos)) { - blocksTransported++; - } - } - } - } - - NetworkHelper.syphonFromContainer(focusStack, SoulTicket.item(focusStack, world, pos, lpToBeDrained * blocksTransported)); - - List originalWorldEntities; - List focusWorldEntities; - AxisAlignedBB originalArea = new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, Math.min(focusWorld.getHeight(), pos.getY() + 2 * focusLevel), pos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); - originalWorldEntities = getWorld().getEntitiesWithinAABB(Entity.class, originalArea); - AxisAlignedBB focusArea = new AxisAlignedBB(focusPos.getX(), focusPos.getY() + 1, focusPos.getZ(), focusPos.getX() + 1, Math.min(focusWorld.getHeight(), focusPos.getY() + 2 * focusLevel), focusPos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); - focusWorldEntities = focusWorld.getEntitiesWithinAABB(Entity.class, focusArea); - UUID bindingOwnerID = binding.getOwnerId(); - if (focusWorld.equals(getWorld())) { - if (!originalWorldEntities.isEmpty()) { - for (Entity entity : originalWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, true)); - } - } - - if (!focusWorldEntities.isEmpty()) { - for (Entity entity : focusWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, true)); - } - } - - } else { - if (!originalWorldEntities.isEmpty()) { - for (Entity entity : originalWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, getWorld(), focusWorld.provider.getDimension(), true)); - } - } - - if (!focusWorldEntities.isEmpty()) { - for (Entity entity : focusWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, bindingOwnerID, focusWorld, getWorld().provider.getDimension(), true)); - } - } - } - } - } - } - } - - private boolean canInitiateTeleport() { - ItemStack focusStack = getStackInSlot(0); - return !focusStack.isEmpty() && focusStack.getItem() instanceof ItemTelepositionFocus && ((ItemTelepositionFocus) focusStack.getItem()).getBinding(focusStack) != null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java index 257b1487..fe9bf3b4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java @@ -1,120 +1,138 @@ -package WayofTime.bloodmagic.tile.base; +package wayoftime.bloodmagic.tile.base; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; /** * Base tile class. *

    * Handles data syncing and core data writing/reading. */ -public class TileBase extends TileEntity { +public abstract class TileBase extends TileEntity +{ + public TileBase(TileEntityType type) + { + super(type); + } - @Override - public final void deserializeNBT(CompoundNBT nbt) { - super.deserializeNBT(nbt); - deserializeBase(nbt); - deserialize(nbt); - } + /** + * read method + */ + @Override + public final void read(BlockState state, CompoundNBT compound) + { + super.read(state, compound); + deserializeBase(compound); + deserialize(compound); + } - @Override - public final CompoundNBT serializeNBT() { - CompoundNBT tag = super.serializeNBT(); - serializeBase(tag); - return serialize(tag); - } + @Override + public final CompoundNBT write(CompoundNBT compound) + { + super.write(compound); + serializeBase(compound); + return serialize(compound); + } - /** - * Called by {@link #deserializeNBT(CompoundNBT)} - *

    - * Internal data (such as coordinates) are handled for you. Just read the data you need. - * - * @param tagCompound - The tag compound to read from - */ - public void deserialize(CompoundNBT tagCompound) { + /** + * Called by {@link #func_230337_a_(BlockState, CompoundNBT)} + *

    + * Internal data (such as coordinates) are handled for you. Just read the data + * you need. + * + * @param tagCompound - The tag compound to read from + */ + public void deserialize(CompoundNBT tagCompound) + { - } + } - /** - * Package private method for reading base data from the tag compound. - * - * @param tagCompound - The tag compound to read from - * @see TileTicking - */ - void deserializeBase(CompoundNBT tagCompound) { + /** + * Package private method for reading base data from the tag compound. + * + * @param tagCompound - The tag compound to read from + * @see TileTicking + */ + void deserializeBase(CompoundNBT tagCompound) + { - } + } - /** - * Called by {@link #serializeNBT()} - *

    - * Internal data (such as coordinates) are handled for you. Just read the data you need. - * - * @param tagCompound - The tag compound to write to. - * @return the modified tag compound - */ - public CompoundNBT serialize(CompoundNBT tagCompound) { - return tagCompound; - } + /** + * Called by {@link #writeToNBT(CompoundNBT)} + *

    + * Internal data (such as coordinates) are handled for you. Just read the data + * you need. + * + * @param tagCompound - The tag compound to write to. + * @return the modified tag compound + */ + public CompoundNBT serialize(CompoundNBT tagCompound) + { + return tagCompound; + } + /** + * Package private method for writing base data to the tag compound. + * + * @param tagCompound - The tag compound to write to. + * @return the modified tag compound + * @see TileTicking + */ + CompoundNBT serializeBase(CompoundNBT tagCompound) + { + return tagCompound; + } - /** - * Package private method for writing base data to the tag compound. - * - * @param tagCompound - The tag compound to write to. - * @return the modified tag compound - * @see TileTicking - */ - CompoundNBT serializeBase(CompoundNBT tagCompound) { - return tagCompound; - } + public void notifyUpdate() + { + BlockState state = getWorld().getBlockState(getPos()); + getWorld().notifyBlockUpdate(getPos(), state, state, 3); + } - public void notifyUpdate() { - BlockState state = getWorld().getBlockState(getPos()); - getWorld().notifyBlockUpdate(getPos(), state, state, 3); - } +// // Data syncing +// +// @Override +// public boolean shouldRefresh(World world, BlockPos pos, BlockState oldState, BlockState newState) +// { +// return oldState.getBlock() != newState.getBlock(); +// } - // Data syncing + @Override + public final SUpdateTileEntityPacket getUpdatePacket() + { + return new SUpdateTileEntityPacket(getPos(), -999, getUpdateTag()); + } - @Override - public boolean shouldRefresh(World world, BlockPos pos, BlockState oldState, BlockState newState) { - return oldState.getBlock() != newState.getBlock(); - } +// @Override +// public void handleUpdateTag(BlockState state, CompoundNBT tag) +// { +// read(state, tag); +// } - @Override - public final SUpdateTileEntityPacket getUpdatePacket() { - return new SUpdateTileEntityPacket(getPos(), -999, serializeNBT()); - } + @Override + @OnlyIn(Dist.CLIENT) + public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) + { + super.onDataPacket(net, pkt); + handleUpdateTag(getBlockState(), pkt.getNbtCompound()); + } - @Override - @SideOnly(Side.CLIENT) - public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) { - super.onDataPacket(net, pkt); - deserialize(pkt.getNbtCompound()); - onDataPacketClientReceived(); - } + @Override + public final CompoundNBT getUpdateTag() + { + return write(new CompoundNBT()); + } - /** - * Hook for performing client side updates after data packets are received and processed - */ - protected void onDataPacketClientReceived() { - // noop - } - - @Override - public final CompoundNBT getUpdateTag() { - return serializeNBT(); - } - - @Override - public final void handleUpdateTag(CompoundNBT tag) { - deserializeNBT(tag); - } -} + @Override + public final void handleUpdateTag(BlockState state, CompoundNBT tag) + { + read(state, tag); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java deleted file mode 100644 index 85e3154d..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.tile.base; - -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; - -/** - * Base class for tiles that tick. Allows disabling the ticking programmatically. - */ -// TODO - Move implementations that depend on existed ticks to new methods from here. -public abstract class TileTicking extends TileBase implements ITickableTileEntity { - private int ticksExisted; - private boolean shouldTick = true; - - @Override - public final void tick() { - if (shouldTick()) { - ticksExisted++; - onUpdate(); - } - } - - @Override - void deserializeBase(CompoundNBT tagCompound) { - this.ticksExisted = tagCompound.getInt("ticksExisted"); - this.shouldTick = tagCompound.getBoolean("shouldTick"); - } - - @Override - CompoundNBT serializeBase(CompoundNBT tagCompound) { - tagCompound.putInt("ticksExisted", getTicksExisted()); - tagCompound.putBoolean("shouldTick", shouldTick()); - return tagCompound; - } - - /** - * Called every tick that {@link #shouldTick()} is true. - */ - public abstract void onUpdate(); - - public int getTicksExisted() { - return ticksExisted; - } - - public void resetLifetime() { - ticksExisted = 0; - } - - public boolean shouldTick() { - return shouldTick; - } - - public void setShouldTick(boolean shouldTick) { - this.shouldTick = shouldTick; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java deleted file mode 100644 index 5c3f2801..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ /dev/null @@ -1,123 +0,0 @@ -package WayofTime.bloodmagic.tile.container; - -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.tile.TileAlchemyTable; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ClickType; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; - -public class ContainerAlchemyTable extends Container { - private final IInventory tileTable; - - public ContainerAlchemyTable(PlayerInventory inventoryPlayer, IInventory tileTable) { - this.tileTable = tileTable; - this.addSlotToContainer(new Slot(tileTable, 0, 62, 15)); - this.addSlotToContainer(new Slot(tileTable, 1, 80, 51)); - this.addSlotToContainer(new Slot(tileTable, 2, 62, 87)); - this.addSlotToContainer(new Slot(tileTable, 3, 26, 87)); - this.addSlotToContainer(new Slot(tileTable, 4, 8, 51)); - this.addSlotToContainer(new Slot(tileTable, 5, 26, 15)); - this.addSlotToContainer(new Slot(tileTable, TileAlchemyTable.toolSlot, 152, 33)); - this.addSlotToContainer(new SlotOrb(tileTable, TileAlchemyTable.orbSlot, 152, 69)); - this.addSlotToContainer(new SlotOutput(tileTable, TileAlchemyTable.outputSlot, 44, 51)); - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 181)); - } - } - - @Override - public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, PlayerEntity player) { - PlayerInventory inventoryPlayer = player.inventory; - - if (slotId < 6 && slotId >= 0) { - Slot slot = this.getSlot(slotId); - if (!slot.getHasStack() && inventoryPlayer.getItemStack().isEmpty()) { - ((TileAlchemyTable) tileTable).toggleInputSlotAccessible(slotId); - } - } - - return super.slotClick(slotId, dragType, clickTypeIn, player); - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (index == 8) { - if (!this.mergeItemStack(itemstack1, 9, 9 + 36, true)) { - return ItemStack.EMPTY; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (index > 8) { - if (itemstack1.getItem() instanceof IBloodOrb) { - if (!this.mergeItemStack(itemstack1, 7, 8, false)) //TODO: Add alchemy tools to list - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 0, 6, false)) { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 9, 9 + 36, false)) { - return ItemStack.EMPTY; - } - - if (itemstack1.getCount() == 0) { - slot.putStack(ItemStack.EMPTY); - } else { - slot.onSlotChanged(); - } - - if (itemstack1.getCount() == itemstack.getCount()) { - return ItemStack.EMPTY; - } - - slot.onTake(playerIn, itemstack1); - } - - return itemstack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) { - return this.tileTable.isUsableByPlayer(playerIn); - } - - private class SlotOrb extends Slot { - public SlotOrb(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return itemStack.getItem() instanceof IBloodOrb; - } - } - - private class SlotOutput extends Slot { - public SlotOutput(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return false; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java deleted file mode 100644 index d8441416..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java +++ /dev/null @@ -1,235 +0,0 @@ -package WayofTime.bloodmagic.tile.container; - -import WayofTime.bloodmagic.item.inventory.ItemInventory; -import WayofTime.bloodmagic.item.routing.IRoutingFilterProvider; -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; -import WayofTime.bloodmagic.util.GhostItemHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ClickType; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; - -public class ContainerItemRoutingNode extends Container { - private final IInventory tileItemRoutingNode; - private final TileFilteredRoutingNode inventory; - public int lastGhostSlotClicked = -1; - // private final ItemInventory itemInventory; - private int slotsOccupied; - - public ContainerItemRoutingNode(PlayerInventory inventoryPlayer, IInventory tileItemRoutingNode) { - this.tileItemRoutingNode = tileItemRoutingNode; - inventory = (TileFilteredRoutingNode) tileItemRoutingNode; - - this.addSlotToContainer(new SlotItemFilter(this, tileItemRoutingNode, 0, 8, 33)); - ItemInventory itemInventory = inventory.itemInventory; - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 3; j++) { - addSlotToContainer(new SlotGhostItem(itemInventory, j + i * 3, 26 + j * 18, 15 + i * 18)); - } - } - - slotsOccupied = 10; - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 87 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 145)); - } - } - - public void resetItemInventory(ItemStack masterStack) { - inventory.itemInventory.initializeInventory(masterStack); - } - - /** - * Overridden in order to handle ghost item slots. - */ - @Override - public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, PlayerEntity player) { - PlayerInventory inventoryPlayer = player.inventory; -// if (!player.worldObj.isRemote) - { - if (slotId >= 0) { - Slot slot = this.inventorySlots.get(slotId); - - if (slot instanceof SlotGhostItem) //TODO: make the slot clicking work! - { - lastGhostSlotClicked = slot.getSlotIndex(); - - if ((dragType == 0 || dragType == 1)) { - ItemStack slotStack = slot.getStack(); - ItemStack heldStack = inventoryPlayer.getItemStack(); - - if (dragType == 0) //Left mouse click-eth - { - { - if (heldStack.isEmpty() && !slotStack.isEmpty()) { - //I clicked on the slot with an empty hand. Selecting! - } else if (!heldStack.isEmpty() && slotStack.isEmpty()) { - if (!((SlotGhostItem) slot).canBeAccessed()) { - return super.slotClick(slotId, dragType, clickTypeIn, player); - } - - ItemStack copyStack = heldStack.copy(); - GhostItemHelper.setItemGhostAmount(copyStack, 0); - copyStack.setCount(1); - slot.putStack(copyStack); - - ItemStack filterStack = this.inventorySlots.get(0).getStack(); - if (filterStack.getItem() instanceof IRoutingFilterProvider) { - ItemStack filterCopy = ((IRoutingFilterProvider) filterStack.getItem()).getContainedStackForItem(filterStack, heldStack); - slot.putStack(filterCopy); - } - } - } - } else - //Right mouse click-eth away - { - slot.putStack(ItemStack.EMPTY); - } - } - } - } - } - - return super.slotClick(slotId, dragType, clickTypeIn, player); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (index == 0) { - if (!this.mergeItemStack(itemstack1, slotsOccupied, slotsOccupied + 36, true)) { - return null; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (index > 0) { -// return null; - if (itemstack1.getItem() instanceof IRoutingFilterProvider) // Change to check item is a filter - { - if (!this.mergeItemStack(itemstack1, 0, 1, false)) { - return ItemStack.EMPTY; - } - } - } else if (!this.mergeItemStack(itemstack1, slotsOccupied, 36 + slotsOccupied, false)) { - return ItemStack.EMPTY; - } - - if (itemstack1.isEmpty()) { - slot.putStack(ItemStack.EMPTY); - } else { - slot.onSlotChanged(); - } - - if (itemstack1.getCount() == itemstack.getCount()) { - return ItemStack.EMPTY; - } - - slot.onTake(playerIn, itemstack1); - } - - return itemstack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) { - return this.tileItemRoutingNode.isUsableByPlayer(playerIn); - } - - private class SlotItemFilter extends Slot { - public ContainerItemRoutingNode container; - public TileFilteredRoutingNode inventory; - - public SlotItemFilter(ContainerItemRoutingNode container, IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - this.container = container; - this.inventory = (TileFilteredRoutingNode) inventory; - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return itemStack.getItem() instanceof IRoutingFilterProvider; //TODO: Create a new Item that holds the filter. - } - - @Override - public void onSlotChanged() { - super.onSlotChanged(); - container.resetItemInventory(getStack()); - for (int i = 1; i <= 9; i++) { - Slot slot = container.getSlot(i); - slot.onSlotChanged(); - } - } - - @Override - public ItemStack getStack() { - return this.inventory.getStackInSlot(getActiveSlot()); - } - - @Override - public void putStack(@Nullable ItemStack stack) { - this.inventory.setInventorySlotContents(getActiveSlot(), stack); - this.onSlotChanged(); - } - - @Override - public ItemStack decrStackSize(int amount) { - return this.inventory.decrStackSize(getActiveSlot(), amount); - } - - public int getActiveSlot() { - return inventory.currentActiveSlot; - } - } - - private class SlotGhostItem extends Slot { - private ItemInventory itemInv; - - public SlotGhostItem(ItemInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - itemInv = inventory; - } - - @Override - public boolean isItemValid(ItemStack stack) { - return false; - } - - @Override - public boolean canTakeStack(PlayerEntity playerIn) { - return false; - } - -// @Override -// public boolean isHere(IInventory inv, int slotIn) -// { -// return itemInv.canInventoryBeManipulated() && super.isHere(inv, slotIn); -// } - - public boolean canBeAccessed() { - return itemInv.canInventoryBeManipulated(); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java deleted file mode 100644 index 806f657e..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java +++ /dev/null @@ -1,20 +0,0 @@ -package WayofTime.bloodmagic.tile.container; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.IInventory; - -public class ContainerMasterRoutingNode extends Container { - private final IInventory tileMasterRoutingNode; - - public ContainerMasterRoutingNode(PlayerInventory inventoryPlayer, IInventory tileMasterRoutingNode) { - this.tileMasterRoutingNode = tileMasterRoutingNode; - - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) { - return this.tileMasterRoutingNode.isUsableByPlayer(playerIn); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java deleted file mode 100644 index 457cb101..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ /dev/null @@ -1,105 +0,0 @@ -package WayofTime.bloodmagic.tile.container; - -import WayofTime.bloodmagic.soul.IDemonWill; -import WayofTime.bloodmagic.soul.IDemonWillGem; -import WayofTime.bloodmagic.tile.TileSoulForge; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; - -public class ContainerSoulForge extends Container { - private final IInventory tileForge; - - public ContainerSoulForge(PlayerInventory inventoryPlayer, IInventory tileForge) { - this.tileForge = tileForge; - this.addSlotToContainer(new Slot(tileForge, 0, 8, 15)); - this.addSlotToContainer(new Slot(tileForge, 1, 80, 15)); - this.addSlotToContainer(new Slot(tileForge, 2, 8, 87)); - this.addSlotToContainer(new Slot(tileForge, 3, 80, 87)); - this.addSlotToContainer(new SlotSoul(tileForge, TileSoulForge.soulSlot, 152, 51)); - this.addSlotToContainer(new SlotOutput(tileForge, TileSoulForge.outputSlot, 44, 51)); - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 181)); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (index == 5) { - if (!this.mergeItemStack(itemstack1, 6, 6 + 36, true)) { - return ItemStack.EMPTY; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (index > 5) { - if (itemstack1.getItem() instanceof IDemonWill || itemstack1.getItem() instanceof IDemonWillGem) { - if (!this.mergeItemStack(itemstack1, 4, 5, false)) { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 0, 4, false)) { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 6, 42, false)) { - return ItemStack.EMPTY; - } - - if (itemstack1.getCount() == 0) { - slot.putStack(ItemStack.EMPTY); - } else { - slot.onSlotChanged(); - } - - if (itemstack1.getCount() == itemstack.getCount()) { - return ItemStack.EMPTY; - } - - slot.onTake(playerIn, itemstack1); - } - - return itemstack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) { - return this.tileForge.isUsableByPlayer(playerIn); - } - - private class SlotSoul extends Slot { - public SlotSoul(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return itemStack.getItem() instanceof IDemonWillGem || itemStack.getItem() instanceof IDemonWill; - } - } - - private class SlotOutput extends Slot { - public SlotOutput(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return false; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java deleted file mode 100644 index 7852a260..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java +++ /dev/null @@ -1,80 +0,0 @@ -package WayofTime.bloodmagic.tile.container; - -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; - -public class ContainerTeleposer extends Container { - private final IInventory tileTeleposer; - - public ContainerTeleposer(PlayerInventory inventoryPlayer, IInventory tileTeleposer) { - this.tileTeleposer = tileTeleposer; - this.addSlotToContainer(new SlotTeleposer(tileTeleposer, 0, 80, 33)); - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 57 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 115)); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity player, int slot) { - ItemStack stack = ItemStack.EMPTY; - Slot slotObject = inventorySlots.get(slot); - int slots = inventorySlots.size(); - - if (slotObject != null && slotObject.getHasStack()) { - ItemStack stackInSlot = slotObject.getStack(); - stack = stackInSlot.copy(); - - if (stack.getItem() instanceof ItemTelepositionFocus) { - if (slot <= slots) { - if (!this.mergeItemStack(stackInSlot, 0, slots, false)) { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(stackInSlot, slots, 36 + slots, false)) { - return ItemStack.EMPTY; - } - } - - if (stackInSlot.getCount() == 0) { - slotObject.putStack(ItemStack.EMPTY); - } else { - slotObject.onSlotChanged(); - } - - if (stackInSlot.getCount() == stack.getCount()) { - return ItemStack.EMPTY; - } - - slotObject.onTake(player, stackInSlot); - } - - return stack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) { - return this.tileTeleposer.isUsableByPlayer(playerIn); - } - - private class SlotTeleposer extends Slot { - public SlotTeleposer(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return itemStack.getItem() instanceof ItemTelepositionFocus; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java deleted file mode 100644 index b22c997f..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ /dev/null @@ -1,119 +0,0 @@ -package WayofTime.bloodmagic.tile.routing; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.item.inventory.ItemInventory; -import WayofTime.bloodmagic.util.GhostItemHelper; -import net.minecraft.block.BlockState; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.NonNullList; - -public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedInventory { - public int currentActiveSlot = 0; - public int[] priorities = new int[6]; - - public ItemInventory itemInventory = new ItemInventory(ItemStack.EMPTY, 9, ""); - - public TileFilteredRoutingNode(int size, String name) { - super(size, name); - } - - public ItemStack getFilterStack(Direction side) { - int index = side.getIndex(); - - return getStackInSlot(index); - } - - public void setGhostItemAmount(int ghostItemSlot, int amount) { - ItemStack stack = itemInventory.getStackInSlot(ghostItemSlot); - if (!stack.isEmpty()) { - GhostItemHelper.setItemGhostAmount(stack, amount); - } - - this.markDirty(); - } - - @Override - public boolean isInventoryConnectedToSide(Direction side) { - return true; - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - currentActiveSlot = tag.getInt("currentSlot"); - priorities = tag.getIntArray(Constants.NBT.ROUTING_PRIORITY); - if (priorities.length != 6) { - priorities = new int[6]; - } - - if (!tag.getBoolean("updated")) { - ListNBT tags = tag.getList("Items", 10); - inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); - for (int i = 0; i < tags.tagCount(); i++) { - if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompound(i); - byte j = data.getByte("Slot"); - - if (j == 0) { - inventory.set(i, new ItemStack(data)); - } else if (j >= 1 && j < inventory.size() + 1) { - inventory.set(j - 1, new ItemStack(data)); - } - } - } - } - - itemInventory = new ItemInventory(getStackInSlot(currentActiveSlot), 9, ""); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - tag.putInt("currentSlot", currentActiveSlot); - tag.putIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); - tag.putBoolean("updated", true); - return tag; - } - - public void swapFilters(int requestedSlot) { - currentActiveSlot = requestedSlot; - itemInventory.initializeInventory(getStackInSlot(currentActiveSlot)); - this.markDirty(); - } - - @Override - public int[] getSlotsForFace(Direction side) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int index, ItemStack itemStackIn, Direction direction) { - return false; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, Direction direction) { - return false; - } - - @Override - public int getPriority(Direction side) { - return priorities[side.getIndex()]; - } - - public void incrementCurrentPriotiryToMaximum(int max) { - priorities[currentActiveSlot] = Math.min(priorities[currentActiveSlot] + 1, max); - BlockState state = getWorld().getBlockState(pos); - getWorld().notifyBlockUpdate(pos, state, state, 3); - } - - public void decrementCurrentPriority() { - priorities[currentActiveSlot] = Math.max(priorities[currentActiveSlot] - 1, 0); - BlockState state = getWorld().getBlockState(pos); - getWorld().notifyBlockUpdate(pos, state, state, 3); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java deleted file mode 100644 index bdc0c21c..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.tile.routing; - -import WayofTime.bloodmagic.item.routing.IFluidFilterProvider; -import WayofTime.bloodmagic.item.routing.IItemFilterProvider; -import WayofTime.bloodmagic.routing.*; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.IItemHandler; - -public class TileInputRoutingNode extends TileFilteredRoutingNode implements IInputItemRoutingNode, IInputFluidRoutingNode { - public TileInputRoutingNode() { - super(6, "inputNode"); - } - - @Override - public boolean isInput(Direction side) { - return true; - } - - @Override - public IItemFilter getInputFilterForSide(Direction side) { - TileEntity tile = getWorld().getTileEntity(pos.offset(side)); - if (tile != null) { - IItemHandler handler = Utils.getInventory(tile, side.getOpposite()); - if (handler != null) { - ItemStack filterStack = this.getFilterStack(side); - - if (filterStack.isEmpty()) { - IItemFilter filter = new DefaultItemFilter(); - filter.initializeFilter(null, tile, handler, false); - return filter; - } else if (!(filterStack.getItem() instanceof IItemFilterProvider)) { - return null; - } - - IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem(); - return filter.getInputItemFilter(filterStack, tile, handler); - } - } - - return null; - } - - @Override - public boolean isFluidInput(Direction side) { - return true; - } - - @Override - public IFluidFilter getInputFluidFilterForSide(Direction side) { - TileEntity tile = getWorld().getTileEntity(pos.offset(side)); - if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - ItemStack filterStack = this.getFilterStack(side); - if (filterStack == null || !(filterStack.getItem() instanceof IFluidFilterProvider)) { - return null; - } - - return ((IFluidFilterProvider) filterStack.getItem()).getInputFluidFilter(filterStack, tile, handler); - } - - return null; - } - - @Override - public boolean isTankConnectedToSide(Direction side) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileItemRoutingNode.java deleted file mode 100644 index 6c598390..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileItemRoutingNode.java +++ /dev/null @@ -1,7 +0,0 @@ -package WayofTime.bloodmagic.tile.routing; - -public class TileItemRoutingNode extends TileRoutingNode { - public TileItemRoutingNode() { - super(0, "itemNode"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java deleted file mode 100644 index 5391ee41..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ /dev/null @@ -1,405 +0,0 @@ -package WayofTime.bloodmagic.tile.routing; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.routing.*; -import WayofTime.bloodmagic.tile.TileInventory; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.*; -import java.util.Map.Entry; - -public class TileMasterRoutingNode extends TileInventory implements IMasterRoutingNode, ITickable { - public static final int tickRate = 20; - private int currentInput; - // A list of connections - private TreeMap> connectionMap = new TreeMap<>(); - private List generalNodeList = new LinkedList<>(); - private List outputNodeList = new LinkedList<>(); - private List inputNodeList = new LinkedList<>(); - - public TileMasterRoutingNode() { - super(0, "masterRoutingNode"); - } - - @Override - public void update() { - if (!getWorld().isRemote) { -// currentInput = getWorld().isBlockIndirectlyGettingPowered(pos); - currentInput = getWorld().getStrongPower(pos); - -// System.out.println(currentInput); - } - - if (getWorld().isRemote || getWorld().getTotalWorldTime() % tickRate != 0) //Temporary tick rate solver - { - return; - } - - Map> outputMap = new TreeMap<>(); - Map> outputFluidMap = new TreeMap<>(); - - for (BlockPos outputPos : outputNodeList) { - TileEntity outputTile = getWorld().getTileEntity(outputPos); - if (this.isConnected(new LinkedList<>(), outputPos)) { - if (outputTile instanceof IOutputItemRoutingNode) { - IOutputItemRoutingNode outputNode = (IOutputItemRoutingNode) outputTile; - - for (Direction facing : Direction.VALUES) { - if (!outputNode.isInventoryConnectedToSide(facing) || !outputNode.isOutput(facing)) { - continue; - } - - IItemFilter filter = outputNode.getOutputFilterForSide(facing); - if (filter != null) { - int priority = outputNode.getPriority(facing); - if (outputMap.containsKey(priority)) { - outputMap.get(priority).add(filter); - } else { - List filterList = new LinkedList<>(); - filterList.add(filter); - outputMap.put(priority, filterList); - } - } - } - } - - if (outputTile instanceof IOutputFluidRoutingNode) { - IOutputFluidRoutingNode outputNode = (IOutputFluidRoutingNode) outputTile; - - for (Direction facing : Direction.VALUES) { - if (!outputNode.isTankConnectedToSide(facing) || !outputNode.isFluidOutput(facing)) { - continue; - } - - IFluidFilter filter = outputNode.getOutputFluidFilterForSide(facing); - if (filter != null) { - int priority = outputNode.getPriority(facing); - if (outputFluidMap.containsKey(priority)) { - outputFluidMap.get(priority).add(filter); - } else { - List filterList = new LinkedList<>(); - filterList.add(filter); - outputFluidMap.put(priority, filterList); - } - } - } - } - } - } - - Map> inputMap = new TreeMap<>(); - Map> inputFluidMap = new TreeMap<>(); - - for (BlockPos inputPos : inputNodeList) { - TileEntity inputTile = getWorld().getTileEntity(inputPos); - if (this.isConnected(new LinkedList<>(), inputPos)) { - if (inputTile instanceof IInputItemRoutingNode) { - IInputItemRoutingNode inputNode = (IInputItemRoutingNode) inputTile; - - for (Direction facing : Direction.VALUES) { - if (!inputNode.isInventoryConnectedToSide(facing) || !inputNode.isInput(facing)) { - continue; - } - - IItemFilter filter = inputNode.getInputFilterForSide(facing); - if (filter != null) { - int priority = inputNode.getPriority(facing); - if (inputMap.containsKey(priority)) { - inputMap.get(priority).add(filter); - } else { - List filterList = new LinkedList<>(); - filterList.add(filter); - inputMap.put(priority, filterList); - } - } - } - } - - if (inputTile instanceof IInputFluidRoutingNode) { - IInputFluidRoutingNode inputNode = (IInputFluidRoutingNode) inputTile; - - for (Direction facing : Direction.VALUES) { - if (!inputNode.isTankConnectedToSide(facing) || !inputNode.isFluidInput(facing)) { - continue; - } - - IFluidFilter filter = inputNode.getInputFluidFilterForSide(facing); - if (filter != null) { - int priority = inputNode.getPriority(facing); - if (inputFluidMap.containsKey(priority)) { - inputFluidMap.get(priority).add(filter); - } else { - List filterList = new LinkedList<>(); - filterList.add(filter); - inputFluidMap.put(priority, filterList); - } - } - } - } - } - } - - int maxTransfer = this.getMaxTransferForDemonWill(WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT)); - int maxFluidTransfer = 1000; - - for (Entry> outputEntry : outputMap.entrySet()) { - List outputList = outputEntry.getValue(); - for (IItemFilter outputFilter : outputList) { - for (Entry> inputEntry : inputMap.entrySet()) { - List inputList = inputEntry.getValue(); - for (IItemFilter inputFilter : inputList) { - maxTransfer -= inputFilter.transferThroughInputFilter(outputFilter, maxTransfer); - if (maxTransfer <= 0) { - return; - } - } - } - } - } - - for (Entry> outputEntry : outputFluidMap.entrySet()) { - List outputList = outputEntry.getValue(); - for (IFluidFilter outputFilter : outputList) { - for (Entry> inputEntry : inputFluidMap.entrySet()) { - List inputList = inputEntry.getValue(); - for (IFluidFilter inputFilter : inputList) { - maxFluidTransfer -= inputFilter.transferThroughInputFilter(outputFilter, maxFluidTransfer); - if (maxFluidTransfer <= 0) { - return; - } - } - } - } - } - } - - public int getMaxTransferForDemonWill(double will) { - return 64; - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - ListNBT tags = new ListNBT(); - for (BlockPos pos : generalNodeList) { - CompoundNBT posTag = new CompoundNBT(); - posTag.putInt(Constants.NBT.X_COORD, pos.getX()); - posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - tags.appendTag(posTag); - } - tag.put(Constants.NBT.ROUTING_MASTER_GENERAL, tags); - - tags = new ListNBT(); - for (BlockPos pos : inputNodeList) { - CompoundNBT posTag = new CompoundNBT(); - posTag.putInt(Constants.NBT.X_COORD, pos.getX()); - posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - tags.appendTag(posTag); - } - tag.put(Constants.NBT.ROUTING_MASTER_INPUT, tags); - - tags = new ListNBT(); - for (BlockPos pos : outputNodeList) { - CompoundNBT posTag = new CompoundNBT(); - posTag.putInt(Constants.NBT.X_COORD, pos.getX()); - posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - tags.appendTag(posTag); - } - tag.put(Constants.NBT.ROUTING_MASTER_OUTPUT, tags); - return tag; - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - - ListNBT tags = tag.getList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompound(i); - BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); - generalNodeList.add(newPos); - } - - tags = tag.getList(Constants.NBT.ROUTING_MASTER_INPUT, 10); - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompound(i); - BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); - inputNodeList.add(newPos); - } - - tags = tag.getList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompound(i); - BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); - outputNodeList.add(newPos); - } - } - - @Override - public boolean isConnected(List path, BlockPos nodePos) { - //TODO: Figure out how to make it so the path is obtained -// if (!connectionMap.containsKey(nodePos)) -// { -// return false; -// } - TileEntity tile = getWorld().getTileEntity(nodePos); - if (!(tile instanceof IRoutingNode)) { -// connectionMap.remove(nodePos); - return false; - } - - IRoutingNode node = (IRoutingNode) tile; - List connectionList = node.getConnected(); -// List testPath = path.subList(0, path.size()); - path.add(nodePos); - for (BlockPos testPos : connectionList) { - if (path.contains(testPos)) { - continue; - } - - if (testPos.equals(this.getPos()) && node.isConnectionEnabled(testPos)) { -// path.clear(); -// path.addAll(testPath); - return true; - } else if (NodeHelper.isNodeConnectionEnabled(getWorld(), node, testPos)) { - if (isConnected(path, testPos)) { -// path.clear(); -// path.addAll(testPath); - return true; - } - } - } - - return false; - } - - @Override - public boolean isConnectionEnabled(BlockPos testPos) { - return currentInput <= 0; - } - - @Override - public void addNodeToList(IRoutingNode node) { - BlockPos newPos = node.getBlockPos(); - if (!generalNodeList.contains(newPos)) { - generalNodeList.add(newPos); - } - if (node instanceof IInputItemRoutingNode && !inputNodeList.contains(newPos)) { - inputNodeList.add(newPos); - } - if (node instanceof IOutputItemRoutingNode && !outputNodeList.contains(newPos)) { - outputNodeList.add(newPos); - } - } - - @Override - public void addConnections(BlockPos pos, List connectionList) { - for (BlockPos testPos : connectionList) { - addConnection(pos, testPos); - } - } - - @Override - public void addConnection(BlockPos pos1, BlockPos pos2) { - if (connectionMap.containsKey(pos1) && !connectionMap.get(pos1).contains(pos2)) { - connectionMap.get(pos1).add(pos2); - } else { - List list = new LinkedList<>(); - list.add(pos2); - connectionMap.put(pos1, list); - } - - if (connectionMap.containsKey(pos2) && !connectionMap.get(pos2).contains(pos1)) { - connectionMap.get(pos2).add(pos1); - } else { - List list = new LinkedList<>(); - list.add(pos1); - connectionMap.put(pos2, list); - } - } - - @Override - public void removeConnection(BlockPos pos1, BlockPos pos2) { - if (connectionMap.containsKey(pos1)) { - List posList = connectionMap.get(pos1); - posList.remove(pos2); - if (posList.isEmpty()) { - connectionMap.remove(pos1); - } - } - - if (connectionMap.containsKey(pos2)) { - List posList = connectionMap.get(pos2); - posList.remove(pos1); - if (posList.isEmpty()) { - connectionMap.remove(pos2); - } - } - } - - @Override - public void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master) { - return; - } - - @Override - public BlockPos getBlockPos() { - return this.getPos(); - } - - @Override - public List getConnected() { - return new LinkedList<>(); - } - - @Override - public BlockPos getMasterPos() { - return this.getPos(); - } - - @Override - public boolean isMaster(IMasterRoutingNode master) { - return false; - } - - @Override - public void addConnection(BlockPos pos1) { - // Empty - } - - @Override - public void removeConnection(BlockPos pos1) { - generalNodeList.remove(pos1); - inputNodeList.remove(pos1); - outputNodeList.remove(pos1); - } - - @Override - public void removeAllConnections() { - List list = generalNodeList.subList(0, generalNodeList.size()); - Iterator itr = list.iterator(); - while (itr.hasNext()) { - BlockPos testPos = itr.next(); - TileEntity tile = getWorld().getTileEntity(testPos); - if (tile instanceof IRoutingNode) { - ((IRoutingNode) tile).removeConnection(pos); - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(testPos), getWorld().getBlockState(testPos), 3); - } - - itr.remove(); - inputNodeList.remove(testPos); - outputNodeList.remove(testPos); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java deleted file mode 100644 index e52757bd..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java +++ /dev/null @@ -1,73 +0,0 @@ -package WayofTime.bloodmagic.tile.routing; - -import WayofTime.bloodmagic.item.routing.IFluidFilterProvider; -import WayofTime.bloodmagic.item.routing.IItemFilterProvider; -import WayofTime.bloodmagic.routing.*; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.IItemHandler; - -public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IOutputItemRoutingNode, IOutputFluidRoutingNode { - public TileOutputRoutingNode() { - super(6, "outputNode"); - } - - @Override - public boolean isOutput(Direction side) { - return true; - } - - @Override - public IItemFilter getOutputFilterForSide(Direction side) { - TileEntity tile = getWorld().getTileEntity(pos.offset(side)); - if (tile != null) { - IItemHandler handler = Utils.getInventory(tile, side.getOpposite()); - if (handler != null) { - ItemStack filterStack = this.getFilterStack(side); - - if (filterStack.isEmpty()) { - IItemFilter filter = new DefaultItemFilter(); - filter.initializeFilter(null, tile, handler, true); - return filter; - } else if (!(filterStack.getItem() instanceof IItemFilterProvider)) { - return null; - } - - IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem(); - return filter.getOutputItemFilter(filterStack, tile, handler); - } - } - - return null; - } - - @Override - public boolean isFluidOutput(Direction side) { - return true; - } - - @Override - public IFluidFilter getOutputFluidFilterForSide(Direction side) { - TileEntity tile = getWorld().getTileEntity(pos.offset(side)); - if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) { - IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - ItemStack filterStack = this.getFilterStack(side); - if (filterStack == null || !(filterStack.getItem() instanceof IFluidFilterProvider)) { - return null; - } - - return ((IFluidFilterProvider) filterStack.getItem()).getOutputFluidFilter(filterStack, tile, handler); - } - - return null; - } - - @Override - public boolean isTankConnectedToSide(Direction side) { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java deleted file mode 100644 index 3fa08545..00000000 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ /dev/null @@ -1,176 +0,0 @@ -package WayofTime.bloodmagic.tile.routing; - -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.routing.IItemRoutingNode; -import WayofTime.bloodmagic.routing.IMasterRoutingNode; -import WayofTime.bloodmagic.routing.IRoutingNode; -import WayofTime.bloodmagic.tile.TileInventory; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.LinkedList; -import java.util.List; - -public class TileRoutingNode extends TileInventory implements IRoutingNode, IItemRoutingNode, ITickable { - private int currentInput; - private BlockPos masterPos = BlockPos.ORIGIN; - private List connectionList = new LinkedList<>(); - - public TileRoutingNode(int size, String name) { - super(size, name); - } - - @Override - public void update() { - if (!getWorld().isRemote) { - currentInput = getWorld().getRedstonePowerFromNeighbors(pos); -// currentInput = getWorld().getStrongPower(pos); - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) { - super.serialize(tag); - CompoundNBT masterTag = new CompoundNBT(); - masterTag.putInt(Constants.NBT.X_COORD, masterPos.getX()); - masterTag.putInt(Constants.NBT.Y_COORD, masterPos.getY()); - masterTag.putInt(Constants.NBT.Z_COORD, masterPos.getZ()); - tag.put(Constants.NBT.ROUTING_MASTER, masterTag); - - ListNBT tags = new ListNBT(); - for (BlockPos pos : connectionList) { - CompoundNBT posTag = new CompoundNBT(); - posTag.putInt(Constants.NBT.X_COORD, pos.getX()); - posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - tags.add(posTag); - } - tag.put(Constants.NBT.ROUTING_CONNECTION, tags); - return tag; - } - - @Override - public void deserialize(CompoundNBT tag) { - super.deserialize(tag); - connectionList.clear(); - CompoundNBT masterTag = tag.getCompound(Constants.NBT.ROUTING_MASTER); - masterPos = new BlockPos(masterTag.getInt(Constants.NBT.X_COORD), masterTag.getInt(Constants.NBT.Y_COORD), masterTag.getInt(Constants.NBT.Z_COORD)); - - ListNBT tags = tag.getList(Constants.NBT.ROUTING_CONNECTION, 10); - for (int i = 0; i < tags.size(); i++) { - CompoundNBT blockTag = tags.getCompound(i); - BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); - connectionList.add(newPos); - } - } - - @Override - public void removeAllConnections() { - TileEntity testTile = getWorld().getTileEntity(getMasterPos()); - if (testTile instanceof IMasterRoutingNode) { - ((IMasterRoutingNode) testTile).removeConnection(pos); // Remove this node from the master - } - for (BlockPos testPos : connectionList) { - TileEntity tile = getWorld().getTileEntity(testPos); - if (tile instanceof IRoutingNode) { - ((IRoutingNode) tile).removeConnection(pos); - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(testPos), getWorld().getBlockState(testPos), 3); - } - } - - connectionList.clear(); - } - - @Override - public void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master) { - this.masterPos = master.getBlockPos(); - List connectedList = this.getConnected(); - for (BlockPos testPos : connectedList) { - if (alreadyChecked.contains(testPos)) { - continue; - } - alreadyChecked.add(testPos); - TileEntity tile = world.getTileEntity(testPos); - if (!(tile instanceof IRoutingNode)) { - continue; - } - IRoutingNode node = (IRoutingNode) tile; - if (node.getMasterPos().equals(BlockPos.ORIGIN)) //If getMasterPos() returns the origin, the node is not connected to any master. - { - master.addNodeToList(node); - node.connectMasterToRemainingNode(world, alreadyChecked, master); - } - } - - master.addConnections(this.getBlockPos(), connectedList); - } - - @Override - public BlockPos getBlockPos() { - return this.getPos(); - } - - @Override - public List getConnected() { - return connectionList; - } - - @Override - public BlockPos getMasterPos() { - return masterPos; - } - - @Override - public boolean isMaster(IMasterRoutingNode master) { - BlockPos checkPos = master.getBlockPos(); - return checkPos.equals(getMasterPos()); - } - - @Override - public boolean isConnectionEnabled(BlockPos testPos) { - return currentInput <= 0; - } - - @Override - public void addConnection(BlockPos pos1) { - if (!connectionList.contains(pos1)) { - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - connectionList.add(pos1); - } - } - - @Override - public void removeConnection(BlockPos pos1) { - if (connectionList.contains(pos1)) { - connectionList.remove(pos1); - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - } - - if (pos1.equals(masterPos)) { - this.masterPos = BlockPos.ORIGIN; - } - } - - @Override - public boolean isInventoryConnectedToSide(Direction side) { - return false; - } - - @Override - public int getPriority(Direction side) { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public double getMaxRenderDistanceSquared() { - return 10000; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/BMLog.java b/src/main/java/WayofTime/bloodmagic/util/BMLog.java index c6e75232..c3b164a5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/BMLog.java +++ b/src/main/java/WayofTime/bloodmagic/util/BMLog.java @@ -1,63 +1,79 @@ -package WayofTime.bloodmagic.util; +package wayoftime.bloodmagic.util; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; import org.apache.commons.lang3.text.WordUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public enum BMLog { +import wayoftime.bloodmagic.BloodMagic; - DEFAULT(BloodMagic.MODID) { - @Override - boolean enabled() { - return true; - } - }, - DEBUG() { - @Override - boolean enabled() { - return ConfigHandler.general.enableDebugLogging; - } - }, - API() { - @Override - boolean enabled() { - return ConfigHandler.general.enableAPILogging; - } - }, - API_VERBOSE() { - @Override - boolean enabled() { - return ConfigHandler.general.enableVerboseAPILogging; - } - }, - ; +public enum BMLog +{ - private final Logger logger; + DEFAULT(BloodMagic.MODID) + { + @Override + boolean enabled() + { + return true; + } + }, + DEBUG() + { + @Override + boolean enabled() + { + return false; +// return ConfigHandler.general.enableDebugLogging; + } + }, + API() + { + @Override + boolean enabled() + { + return false; +// return ConfigHandler.general.enableAPILogging; + } + }, + API_VERBOSE() + { + @Override + boolean enabled() + { + return false; +// return ConfigHandler.general.enableVerboseAPILogging; + } + },; - BMLog(String logName) { - logger = LogManager.getLogger(logName); - } + private final Logger logger; - BMLog() { - logger = LogManager.getLogger(BloodMagic.MODID + "|" + WordUtils.capitalizeFully(name().replace("_", " "))); - } + BMLog(String logName) + { + logger = LogManager.getLogger(logName); + } - abstract boolean enabled(); + BMLog() + { + logger = LogManager.getLogger(BloodMagic.MODID + "|" + WordUtils.capitalizeFully(name().replace("_", " "))); + } - public void info(String input, Object... args) { - if (enabled()) - logger.info(input, args); - } + abstract boolean enabled(); - public void error(String input, Object... args) { - if (enabled()) - logger.error(input, args); - } + public void info(String input, Object... args) + { + if (enabled()) + logger.info(input, args); + } - public void warn(String input, Object... args) { - if (enabled()) - logger.warn(input, args); - } -} + public void error(String input, Object... args) + { + if (enabled()) + logger.error(input, args); + } + + public void warn(String input, Object... args) + { + if (enabled()) + logger.warn(input, args); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/BlockStack.java b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java deleted file mode 100644 index 426b43fd..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/BlockStack.java +++ /dev/null @@ -1,68 +0,0 @@ -package WayofTime.bloodmagic.util; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -@Deprecated -public class BlockStack { - private final Block block; - private final int meta; - private final BlockState state; - - public BlockStack(Block block, int meta) { - this.block = block; - this.meta = meta; - this.state = block.getStateFromMeta(meta); - } - - public BlockStack(Block block) { - this(block, 0); - } - - public ItemStack getItemStack() { - return new ItemStack(block, 1, meta); - } - - public Block getBlock() { - return block; - } - - public int getMeta() { - return meta; - } - - public BlockState getState() { - return state; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof BlockStack)) return false; - - BlockStack that = (BlockStack) o; - - if (meta != that.meta) return false; - return block != null ? block.equals(that.block) : that.block == null; - } - - @Override - public int hashCode() { - int result = block != null ? block.hashCode() : 0; - result = 31 * result + meta; - return result; - } - - @Override - public String toString() { - return getBlock().getRegistryName() + ":" + getMeta(); - } - - public static BlockStack getStackFromPos(World world, BlockPos pos) { - BlockState state = world.getBlockState(pos); - return new BlockStack(state.getBlock(), state.getBlock().getMetaFromState(state)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java b/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java index c4cb571f..1bba4aa6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java +++ b/src/main/java/WayofTime/bloodmagic/util/BooleanResult.java @@ -1,24 +1,28 @@ -package WayofTime.bloodmagic.util; +package wayoftime.bloodmagic.util; -public class BooleanResult { +public class BooleanResult +{ + private final boolean result; + private final T value; - private final boolean result; - private final T value; + private BooleanResult(boolean result, T value) + { + this.result = result; + this.value = value; + } - private BooleanResult(boolean result, T value) { - this.result = result; - this.value = value; - } + public boolean isSuccess() + { + return result; + } - public boolean isSuccess() { - return result; - } + public T getValue() + { + return value; + } - public T getValue() { - return value; - } - - public static BooleanResult newResult(boolean success, T value) { - return new BooleanResult<>(success, value); - } -} + public static BooleanResult newResult(boolean success, T value) + { + return new BooleanResult<>(success, value); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 8a792f99..1bc22f5b 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -1,227 +1,270 @@ -package WayofTime.bloodmagic.util; +package wayoftime.bloodmagic.util; + +import java.text.DecimalFormat; +import java.util.function.Supplier; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.util.helper.TextHelper; -import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.NewChatGui; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.Util; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.network.NetworkEvent.Context; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.util.helper.TextHelper; -public class ChatUtil { - private static final int DELETION_ID = 2525277; - private static int lastAdded; +public class ChatUtil +{ + private static final int DELETION_ID = 2525277; + private static int lastAdded; + public static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("###,###.##"); - private static void sendNoSpamMessages(ITextComponent[] messages) { - NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI(); - for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) { - chat.deleteChatLine(i); - } - for (int i = 0; i < messages.length; i++) { - chat.printChatMessageWithOptionalDeletion(messages[i], DELETION_ID + i); - } - lastAdded = DELETION_ID + messages.length - 1; - } + private static void sendNoSpamMessages(ITextComponent[] messages) + { + NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI(); +// Minecraft.getMinecraft().ingameGUI.getChatGUI(); +// for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) +// { +// chat. +//// chat.deleteChatLine(i); +// } + for (int i = 0; i < messages.length; i++) + { + chat.printChatMessage(messages[i]); +// chat.printChatMessageWithOptionalDeletion(messages[i], DELETION_ID + i); + } + lastAdded = DELETION_ID + messages.length - 1; + } - /** - * Returns a standard {@link StringTextComponent} for the given - * {@link String} . - * - * @param s The string to wrap. - * @return An {@link ITextComponent} containing the string. - */ - public static ITextComponent wrap(String s) { - return new StringTextComponent(s); - } + /** + * Returns a standard {@link TextComponentString} for the given {@link String} . + * + * @param s The string to wrap. + * @return An {@link ITextComponent} containing the string. + */ + public static ITextComponent wrap(String s) + { + return new StringTextComponent(s); + } - /** - * @see #wrap(String) - */ - public static ITextComponent[] wrap(String... s) { - ITextComponent[] ret = new ITextComponent[s.length]; - for (int i = 0; i < ret.length; i++) { - ret[i] = wrap(s[i]); - } - return ret; - } + /** + * @see #wrap(String) + */ + public static ITextComponent[] wrap(String... s) + { + ITextComponent[] ret = new ITextComponent[s.length]; + for (int i = 0; i < ret.length; i++) + { + ret[i] = wrap(s[i]); + } + return ret; + } - /** - * Returns a translatable chat component for the given string and format - * args. - * - * @param s The string to format - * @param args The args to apply to the format - */ - public static ITextComponent wrapFormatted(String s, Object... args) { - return new TranslationTextComponent(s, args); - } + /** + * Returns a translatable chat component for the given string and format args. + * + * @param s The string to format + * @param args The args to apply to the format + */ + public static ITextComponent wrapFormatted(String s, Object... args) + { + return new TranslationTextComponent(s, args); + } - /** - * Simply sends the passed lines to the player in a chat message. - * - * @param player The player to send the chat to - * @param lines The lines to send - */ - public static void sendChat(PlayerEntity player, String... lines) { - sendChat(player, wrap(lines)); - } + /** + * Simply sends the passed lines to the player in a chat message. + * + * @param player The player to send the chat to + * @param lines The lines to send + */ + public static void sendChat(PlayerEntity player, String... lines) + { + sendChat(player, wrap(lines)); + } - /** - * Localizes the lines before sending them. - * - * @see #sendChat(PlayerEntity, String...) - */ - public static void sendChatUnloc(PlayerEntity player, String... unlocLines) { - sendChat(player, TextHelper.localizeAll(unlocLines)); - } + /** + * Localizes the lines before sending them. + * + * @see #sendChat(EntityPlayer, String...) + */ + public static void sendChatUnloc(PlayerEntity player, String... unlocLines) + { + sendChat(player, TextHelper.localizeAll(unlocLines)); + } - /** - * Sends all passed chat components to the player. - * - * @param player The player to send the chat lines to. - * @param lines The {@link ITextComponent chat components} to send.yes - */ - public static void sendChat(PlayerEntity player, ITextComponent... lines) { - for (ITextComponent c : lines) { - player.sendMessage(c); - } - } + /** + * Sends all passed chat components to the player. + * + * @param player The player to send the chat lines to. + * @param lines The {@link ITextComponent chat components} to send.yes + */ + public static void sendChat(PlayerEntity player, ITextComponent... lines) + { + for (ITextComponent c : lines) + { +// BloodMagic.packetHandler.send + player.sendMessage(c, Util.DUMMY_UUID); +// player.sendMessage(c); + } + } - /** - * Localizes the strings before sending them. - * - * @see #sendNoSpamClient(String...) - */ - public static void sendNoSpamClientUnloc(String... unlocLines) { - sendNoSpamClient(TextHelper.localizeAll(unlocLines)); - } + /** + * Localizes the strings before sending them. + * + * @see #sendNoSpamClient(String...) + */ + public static void sendNoSpamClientUnloc(String... unlocLines) + { + sendNoSpamClient(TextHelper.localizeAll(unlocLines)); + } - /** - * Same as {@link #sendNoSpamClient(ITextComponent...)}, but wraps the - * Strings automatically. - * - * @param lines The chat lines to send - * @see #wrap(String) - */ - public static void sendNoSpamClient(String... lines) { - sendNoSpamClient(wrap(lines)); - } + /** + * Same as {@link #sendNoSpamClient(ITextComponent...)}, but wraps the Strings + * automatically. + * + * @param lines The chat lines to send + * @see #wrap(String) + */ + public static void sendNoSpamClient(String... lines) + { + sendNoSpamClient(wrap(lines)); + } - /** - * Skips the packet sending, unsafe to call on servers. - * - * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) - */ - public static void sendNoSpamClient(ITextComponent... lines) { - sendNoSpamMessages(lines); - } + /** + * Skips the packet sending, unsafe to call on servers. + * + * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) + */ + public static void sendNoSpamClient(ITextComponent... lines) + { + sendNoSpamMessages(lines); + } - /** - * Localizes the strings before sending them. - * - * @see #sendNoSpam(PlayerEntity, String...) - */ - public static void sendNoSpamUnloc(PlayerEntity player, String... unlocLines) { - sendNoSpam(player, TextHelper.localizeAll(unlocLines)); - } + /** + * Localizes the strings before sending them. + * + * @see #sendNoSpam(EntityPlayer, String...) + */ + public static void sendNoSpamUnloc(PlayerEntity player, String... unlocLines) + { + sendNoSpam(player, TextHelper.localizeAll(unlocLines)); + } - /** - * @see #wrap(String) - * @see #sendNoSpam(PlayerEntity, ITextComponent...) - */ - public static void sendNoSpam(PlayerEntity player, String... lines) { - sendNoSpam(player, wrap(lines)); - } + /** + * @see #wrap(String) + * @see #sendNoSpam(EntityPlayer, ITextComponent...) + */ + public static void sendNoSpam(PlayerEntity player, String... lines) + { + sendNoSpam(player, wrap(lines)); + } - /** - * First checks if the player is instanceof {@link ServerPlayerEntity} before - * casting. - * - * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) - */ - public static void sendNoSpam(PlayerEntity player, ITextComponent... lines) { - if (player instanceof ServerPlayerEntity) { - sendNoSpam((ServerPlayerEntity) player, lines); - } - } + /** + * First checks if the player is instanceof {@link ServerPlayerEntity} before + * casting. + * + * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) + */ + public static void sendNoSpam(PlayerEntity player, ITextComponent... lines) + { + if (player instanceof ServerPlayerEntity) + { + sendNoSpam((ServerPlayerEntity) player, lines); + } + } - /** - * Localizes the strings before sending them. - * - * @see #sendNoSpam(ServerPlayerEntity, String...) - */ - public static void sendNoSpamUnloc(ServerPlayerEntity player, String... unlocLines) { - sendNoSpam(player, TextHelper.localizeAll(unlocLines)); - } + /** + * Localizes the strings before sending them. + * + * @see #sendNoSpam(ServerPlayerEntity, String...) + */ + public static void sendNoSpamUnloc(ServerPlayerEntity player, String... unlocLines) + { + sendNoSpam(player, TextHelper.localizeAll(unlocLines)); + } - /** - * @see #wrap(String) - * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) - */ - public static void sendNoSpam(ServerPlayerEntity player, String... lines) { - sendNoSpam(player, wrap(lines)); - } + /** + * @see #wrap(String) + * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) + */ + public static void sendNoSpam(ServerPlayerEntity player, String... lines) + { + sendNoSpam(player, wrap(lines)); + } - /** - * Sends a chat message to the client, deleting past messages also sent via - * this method. - *

    - * Credit to RWTema for the idea - * - * @param player The player to send the chat message to - * @param lines The chat lines to send. - */ - public static void sendNoSpam(ServerPlayerEntity player, ITextComponent... lines) { - if (lines.length > 0) - BloodMagicPacketHandler.INSTANCE.sendTo(new PacketNoSpamChat(lines), player); - } + /** + * Sends a chat message to the client, deleting past messages also sent via this + * method. + *

    + * Credit to RWTema for the idea + * + * @param player The player to send the chat message to + * @param lines The chat lines to send. + */ + public static void sendNoSpam(ServerPlayerEntity player, ITextComponent... lines) + { + if (lines.length > 0) + BloodMagic.packetHandler.sendTo(new PacketNoSpamChat(lines), player); + } - /** - * @author tterrag1098 - *

    - * Ripped from EnderCore (and slightly altered) - */ - public static class PacketNoSpamChat implements IMessage { - private ITextComponent[] chatLines; + /** + * @author tterrag1098 + *

    + * Ripped from EnderCore (and slightly altered) + */ + public static class PacketNoSpamChat + { + private ITextComponent[] chatLines; - public PacketNoSpamChat() { - chatLines = new ITextComponent[0]; - } + public PacketNoSpamChat() + { + chatLines = new ITextComponent[0]; + } - private PacketNoSpamChat(ITextComponent... lines) { - // this is guaranteed to be >1 length by accessing methods - this.chatLines = lines; - } + private PacketNoSpamChat(ITextComponent... lines) + { + // this is guaranteed to be >1 length by accessing methods + this.chatLines = lines; + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(chatLines.length); - for (ITextComponent c : chatLines) { - ByteBufUtils.writeUTF8String(buf, ITextComponent.Serializer.componentToJson(c)); - } - } + public static void encode(PacketNoSpamChat pkt, PacketBuffer buf) + { + buf.writeInt(pkt.chatLines.length); + for (ITextComponent c : pkt.chatLines) + { +// ByteBufUtils.writeUTF8String(buf, ITextComponent.Serializer.componentToJson(c)); + buf.writeString(ITextComponent.Serializer.toJson(c)); + } + } - @Override - public void fromBytes(ByteBuf buf) { - chatLines = new ITextComponent[buf.readInt()]; - for (int i = 0; i < chatLines.length; i++) { - chatLines[i] = ITextComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf)); - } - } + public static PacketNoSpamChat decode(PacketBuffer buf) + { + PacketNoSpamChat pkt = new PacketNoSpamChat(new ITextComponent[buf.readInt()]); + for (int i = 0; i < pkt.chatLines.length; i++) + { +// pkt.chatLines[i] = ITextComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf)); + pkt.chatLines[i] = ITextComponent.Serializer.getComponentFromJsonLenient(buf.readString()); + } + return pkt; + } - public static class Handler implements IMessageHandler { - @Override - public IMessage onMessage(final PacketNoSpamChat message, MessageContext ctx) { - Minecraft.getInstance().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); - return null; - } - } - } -} + public static void handle(PacketNoSpamChat message, Supplier context) + { + context.get().enqueueWork(() -> sendNoSpamMessages(message.chatLines)); + context.get().setPacketHandled(true); + } + +// public static class Handler implements IMessageHandler +// { +// @Override +// public IMessage onMessage(final PacketNoSpamChat message, MessageContext ctx) +// { +// Minecraft.getMinecraft().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); +// return null; +// } +// } + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index 7e5eb83f..7821f745 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -1,170 +1,170 @@ -package WayofTime.bloodmagic.util; +package wayoftime.bloodmagic.util; -import WayofTime.bloodmagic.BloodMagic; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; +import wayoftime.bloodmagic.BloodMagic; -import java.util.Locale; +public class Constants +{ + public static final String SPEED_RUNE = "speed_rune"; -public class Constants { - public static class NBT { - public static final String OWNER_UUID = "ownerUUID"; - public static final String OWNER_NAME = "ownerNAME"; - public static final String USES = "uses"; - public static final String ACTIVATED = "activated"; - public static final String UNUSABLE = "unusable"; - public static final String SACRIFICE = "sacrifice"; - public static final String DIMENSION_ID = "dimensionId"; - public static final String X_COORD = "xCoord"; - public static final String Y_COORD = "yCoord"; - public static final String Z_COORD = "zCoord"; - public static final String PORTAL_LOCATION = "portalLocation"; - public static final String ORB_TIER = "orbTier"; - public static final String CURRENT_ESSENCE = "currentEssence"; - public static final String CURRENT_RITUAL = "currentRitual"; - public static final String CURRENT_RITUAL_TAG = "currentRitualTag"; - public static final String IS_RUNNING = "isRunning"; - public static final String IS_REDSTONED = "isStoned"; - public static final String RUNTIME = "runtime"; - public static final String DIRECTION = "direction"; - public static final String REAGENT_TANKS = "reagentTanks"; - public static final String CURRENT_INCENSE = "BM:CurrentIncense"; - public static final String MAX_INCENSE = "BM:MaxIncenseFromLastAltar"; - public static final String HAS_MAX_INCENSE = "BM:CurrentIsMaxIncense"; - public static final String CURRENT_PURITY = "BM:CurrentPurity"; - public static final String EMPTY = "Empty"; - public static final String OUTPUT_AMOUNT = "outputAmount"; - public static final String INPUT_AMOUNT = "inputAmount"; - public static final String STORED_LP = "storedLP"; - public static final String RITUAL_READER = "ritualReaderState"; - public static final String ITEMS = "Items"; - public static final String SLOT = "Slot"; + public static class NBT + { + public static final String OWNER_UUID = "ownerUUID"; + public static final String OWNER_NAME = "ownerNAME"; + public static final String USES = "uses"; + public static final String ACTIVATED = "activated"; + public static final String UNUSABLE = "unusable"; + public static final String SACRIFICE = "sacrifice"; + public static final String DIMENSION_ID = "dimensionId"; + public static final String X_COORD = "xCoord"; + public static final String Y_COORD = "yCoord"; + public static final String Z_COORD = "zCoord"; + public static final String PORTAL_LOCATION = "portalLocation"; + public static final String ORB_TIER = "orbTier"; + public static final String CURRENT_ESSENCE = "currentEssence"; + public static final String CURRENT_RITUAL = "currentRitual"; + public static final String CURRENT_RITUAL_TAG = "currentRitualTag"; + public static final String IS_RUNNING = "isRunning"; + public static final String IS_REDSTONED = "isStoned"; + public static final String RUNTIME = "runtime"; + public static final String DIRECTION = "direction"; + public static final String REAGENT_TANKS = "reagentTanks"; + public static final String CURRENT_INCENSE = "BM:CurrentIncense"; + public static final String MAX_INCENSE = "BM:MaxIncenseFromLastAltar"; + public static final String HAS_MAX_INCENSE = "BM:CurrentIsMaxIncense"; + public static final String CURRENT_PURITY = "BM:CurrentPurity"; + public static final String EMPTY = "Empty"; + public static final String OUTPUT_AMOUNT = "outputAmount"; + public static final String INPUT_AMOUNT = "inputAmount"; + public static final String STORED_LP = "storedLP"; + public static final String RITUAL_READER = "ritualReaderState"; + public static final String ITEMS = "Items"; + public static final String SLOT = "Slot"; - public static final String ALTAR = "bloodAltar"; - public static final String ALTAR_TIER = "upgradeLevel"; - public static final String ALTAR_ACTIVE = "isActive"; - public static final String ALTAR_LIQUID_REQ = "liquidRequired"; - public static final String ALTAR_FILLABLE = "fillable"; - public static final String ALTAR_UPGRADED = "isUpgraded"; - public static final String ALTAR_CONSUMPTION_RATE = "consumptionRate"; - public static final String ALTAR_DRAIN_RATE = "drainRate"; - public static final String ALTAR_CONSUMPTION_MULTIPLIER = "consumptionMultiplier"; - public static final String ALTAR_EFFICIENCY_MULTIPLIER = "efficiencyMultiplier"; - public static final String ALTAR_SELF_SACRIFICE_MULTIPLIER = "selfSacrificeMultiplier"; - public static final String ALTAR_SACRIFICE_MULTIPLIER = "sacrificeMultiplier"; - public static final String ALTAR_CAPACITY_MULTIPLIER = "capacityMultiplier"; - public static final String ALTAR_ORB_CAPACITY_MULTIPLIER = "orbCapacityMultiplier"; - public static final String ALTAR_DISLOCATION_MULTIPLIER = "dislocationMultiplier"; - public static final String ALTAR_CAPACITY = "capacity"; - public static final String ALTAR_BUFFER_CAPACITY = "bufferCapacity"; - public static final String ALTAR_PROGRESS = "progress"; - public static final String ALTAR_IS_RESULT_BLOCK = "isResultBlock"; - public static final String ALTAR_LOCKDOWN_DURATION = "lockdownDuration"; - public static final String ALTAR_ACCELERATION_UPGRADES = "accelerationUpgrades"; - public static final String ALTAR_DEMON_BLOOD_DURATION = "demonBloodDuration"; - public static final String ALTAR_COOLDOWN_AFTER_CRAFTING = "cooldownAfterCrafting"; - public static final String ALTAR_TOTAL_CHARGE = "totalCharge"; - public static final String ALTAR_MAX_CHARGE = "maxCharge"; - public static final String ALTAR_CHARGE_RATE = "chargeRate"; - public static final String ALTAR_CHARGE_FREQUENCY = "chargeFrequency"; - public static final String ALTAR_CURRENT_TIER_DISPLAYED = "currentTierDisplayed"; + public static final String ALTAR = "bloodAltar"; + public static final String ALTAR_TIER = "upgradeLevel"; + public static final String ALTAR_ACTIVE = "isActive"; + public static final String ALTAR_LIQUID_REQ = "liquidRequired"; + public static final String ALTAR_FILLABLE = "fillable"; + public static final String ALTAR_UPGRADED = "isUpgraded"; + public static final String ALTAR_CONSUMPTION_RATE = "consumptionRate"; + public static final String ALTAR_DRAIN_RATE = "drainRate"; + public static final String ALTAR_CONSUMPTION_MULTIPLIER = "consumptionMultiplier"; + public static final String ALTAR_EFFICIENCY_MULTIPLIER = "efficiencyMultiplier"; + public static final String ALTAR_SELF_SACRIFICE_MULTIPLIER = "selfSacrificeMultiplier"; + public static final String ALTAR_SACRIFICE_MULTIPLIER = "sacrificeMultiplier"; + public static final String ALTAR_CAPACITY_MULTIPLIER = "capacityMultiplier"; + public static final String ALTAR_ORB_CAPACITY_MULTIPLIER = "orbCapacityMultiplier"; + public static final String ALTAR_DISLOCATION_MULTIPLIER = "dislocationMultiplier"; + public static final String ALTAR_CAPACITY = "capacity"; + public static final String ALTAR_BUFFER_CAPACITY = "bufferCapacity"; + public static final String ALTAR_PROGRESS = "progress"; + public static final String ALTAR_IS_RESULT_BLOCK = "isResultBlock"; + public static final String ALTAR_LOCKDOWN_DURATION = "lockdownDuration"; + public static final String ALTAR_ACCELERATION_UPGRADES = "accelerationUpgrades"; + public static final String ALTAR_DEMON_BLOOD_DURATION = "demonBloodDuration"; + public static final String ALTAR_COOLDOWN_AFTER_CRAFTING = "cooldownAfterCrafting"; + public static final String ALTAR_TOTAL_CHARGE = "totalCharge"; + public static final String ALTAR_MAX_CHARGE = "maxCharge"; + public static final String ALTAR_CHARGE_RATE = "chargeRate"; + public static final String ALTAR_CHARGE_FREQUENCY = "chargeFrequency"; + public static final String ALTAR_CURRENT_TIER_DISPLAYED = "currentTierDisplayed"; - public static final String ALTARMAKER_CURRENT_TIER = "currentTier"; + public static final String ALTARMAKER_CURRENT_TIER = "currentTier"; - public static final String PROJECTILE_TICKS_IN_AIR = "projectileTicksInAir"; - public static final String PROJECTILE_MAX_TICKS_IN_AIR = "projectileMaxTicksInAir"; + public static final String PROJECTILE_TICKS_IN_AIR = "projectileTicksInAir"; + public static final String PROJECTILE_MAX_TICKS_IN_AIR = "projectileMaxTicksInAir"; - public static final String TICKS_REMAINING = "ticksRemaining"; - public static final String CONTAINED_BLOCK_NAME = "containedBlockName"; - public static final String CONTAINED_BLOCK_META = "containedBlockMeta"; - public static final String CONTAINED_TILE_ENTITY = "containedTileEntity"; + public static final String TICKS_REMAINING = "ticksRemaining"; + public static final String CONTAINED_BLOCK_NAME = "containedBlockName"; + public static final String CONTAINED_BLOCK_META = "containedBlockMeta"; + public static final String CONTAINED_TILE_ENTITY = "containedTileEntity"; - public static final String PREVIOUS_INPUT = "previousInput"; + public static final String PREVIOUS_INPUT = "previousInput"; - public static final String LIVING_ARMOUR = "livingArmour"; + public static final String LIVING_ARMOUR = "livingArmour"; - public static final String CHARGE_TIME = "chargeTime"; - public static final String HELD_DOWN = "heldDown"; + public static final String CHARGE_TIME = "chargeTime"; + public static final String HELD_DOWN = "heldDown"; - public static final String UPGRADE_POISON_TIMER = "poisonTimer"; - public static final String UPGRADE_FIRE_TIMER = "fireTimer"; + public static final String UPGRADE_POISON_TIMER = "poisonTimer"; + public static final String UPGRADE_FIRE_TIMER = "fireTimer"; - public static final String SOULS = "souls"; - public static final String SOUL_SWORD_DAMAGE = "soulSwordDamage"; - public static final String SOUL_SWORD_ACTIVE_DRAIN = "soulSwordActiveDrain"; - public static final String SOUL_SWORD_DROP = "soulSwordDrop"; - public static final String SOUL_SWORD_STATIC_DROP = "soulSwordStaticDrop"; - public static final String SOUL_SWORD_HEALTH = "soulSwordHealth"; - public static final String SOUL_SWORD_ATTACK_SPEED = "soulSwordAttackSpeed"; - public static final String SOUL_SWORD_SPEED = "soulSwordSpeed"; - public static final String SOUL_SWORD_DIG_SPEED = "soulSwordDigSpeed"; - public static final String WILL_TYPE = "demonWillType"; + public static final String SOULS = "souls"; + public static final String SOUL_SWORD_DAMAGE = "soulSwordDamage"; + public static final String SOUL_SWORD_ACTIVE_DRAIN = "soulSwordActiveDrain"; + public static final String SOUL_SWORD_DROP = "soulSwordDrop"; + public static final String SOUL_SWORD_STATIC_DROP = "soulSwordStaticDrop"; + public static final String SOUL_SWORD_HEALTH = "soulSwordHealth"; + public static final String SOUL_SWORD_ATTACK_SPEED = "soulSwordAttackSpeed"; + public static final String SOUL_SWORD_SPEED = "soulSwordSpeed"; + public static final String SOUL_SWORD_DIG_SPEED = "soulSwordDigSpeed"; + public static final String WILL_TYPE = "demonWillType"; - public static final String SOUL_FORGE_BURN = "burnTime"; - public static final String SOUL_FORGE_CONSUMED = "consumedSouls"; + public static final String SOUL_FORGE_BURN = "burnTime"; + public static final String SOUL_FORGE_CONSUMED = "consumedSouls"; - public static final String ROUTING_MASTER = "master"; - public static final String ROUTING_CONNECTION = "connections"; - public static final String ROUTING_PRIORITY = "prioritiesPeople"; - public static final String ROUTING_MASTER_GENERAL = "generalList"; - public static final String ROUTING_MASTER_INPUT = "inputList"; - public static final String ROUTING_MASTER_OUTPUT = "outputList"; + public static final String ROUTING_MASTER = "master"; + public static final String ROUTING_CONNECTION = "connections"; + public static final String ROUTING_PRIORITY = "prioritiesPeople"; + public static final String ROUTING_MASTER_GENERAL = "generalList"; + public static final String ROUTING_MASTER_INPUT = "inputList"; + public static final String ROUTING_MASTER_OUTPUT = "outputList"; - public static final String GHOST_STACK_SIZE = "stackSize"; + public static final String GHOST_STACK_SIZE = "stackSize"; - public static final String ITEM_INVENTORY = "itemInventory"; + public static final String ITEM_INVENTORY = "itemInventory"; - public static final String BLOCKPOS_CONNECTION = "connections"; + public static final String BLOCKPOS_CONNECTION = "connections"; - public static final String CURRENT_SIGIL = "currentSigil"; - public static final String MOST_SIG = "mostSig"; - public static final String LEAST_SIG = "leastSig"; - public static final String COLOR = "color"; + public static final String CURRENT_SIGIL = "currentSigil"; + public static final String MOST_SIG = "mostSig"; + public static final String LEAST_SIG = "leastSig"; + public static final String COLOR = "color"; - public static final String POTION_AUGMENT_LENGHT = "length:"; - public static final String POTION_AUGMENT_STRENGTH = "strength:"; - public static final String POTION_IMPURITY = "impurity"; + public static final String POTION_AUGMENT_LENGHT = "length:"; + public static final String POTION_AUGMENT_STRENGTH = "strength:"; + public static final String POTION_IMPURITY = "impurity"; - public static final String TANK = "tank"; + public static final String TANK = "tank"; - public static final String BREATH = "breath"; - } + public static final String BREATH = "breath"; + } - public static class Mod { - public static final String DOMAIN = BloodMagic.MODID.toLowerCase(Locale.ENGLISH) + ":"; - } + public static class JSON + { + public static final String INPUT = "input"; + public static final String BASEINPUT = "baseinput"; + public static final String ADDEDINPUT = "addedinput"; + public static final String OUTPUT = "output"; + public static final String ITEM = "item"; + public static final String COUNT = "count"; + public static final String NBT = "nbt"; + public static final String TYPE = "type"; + public static final String TEXTURE = "texture"; + public static final String CONDITIONS = "conditions"; - public static final class Gui { - public static final int TELEPOSER_GUI = 0; - public static final int SOUL_FORGE_GUI = 1; - public static final int ROUTING_NODE_GUI = 2; - public static final int MASTER_ROUTING_NODE_GUI = 3; - public static final int ALCHEMY_TABLE_GUI = 4; - public static final int SIGIL_HOLDING_GUI = 5; - } + public static final String ALTAR_TIER = Constants.NBT.ALTAR_TIER; + public static final String ALTAR_SYPHON = "altarSyphon"; + public static final String ALTAR_CONSUMPTION_RATE = Constants.NBT.ALTAR_CONSUMPTION_RATE; + public static final String ALTAR_DRAIN_RATE = Constants.NBT.ALTAR_DRAIN_RATE; - public static class Compat { - public static final String JEI_CATEGORY_ALTAR = BloodMagic.MODID + ":altar"; - public static final String JEI_CATEGORY_BINDING = BloodMagic.MODID + ":binding"; - public static final String JEI_CATEGORY_ALCHEMYARRAY = BloodMagic.MODID + ":alchemyArray"; - public static final String JEI_CATEGORY_SOULFORGE = BloodMagic.MODID + ":soulForge"; - public static final String JEI_CATEGORY_ALCHEMYTABLE = BloodMagic.MODID + ":salchemyTable"; - public static final String JEI_CATEGORY_ARMOURDOWNGRADE = BloodMagic.MODID + ":armourDowngrade"; + public static final String TARTARIC_DRAIN = "drain"; + public static final String TARTARIC_MINIMUM = "minimumDrain"; + } - public static final String WAILA_CONFIG_ALTAR = BloodMagic.MODID + ".bloodAltar"; - public static final String WAILA_CONFIG_TELEPOSER = BloodMagic.MODID + ".teleposer"; - public static final String WAILA_CONFIG_RITUAL = BloodMagic.MODID + ".ritualController"; - public static final String WAILA_CONFIG_ARRAY = BloodMagic.MODID + ".array"; - public static final String WAILA_CONFIG_BLOOD_TANK = BloodMagic.MODID + ".bloodTank"; + public static class Compat + { + public static final String JEI_CATEGORY_ALTAR = "altar"; + public static final String JEI_CATEGORY_BINDING = "binding"; + public static final String JEI_CATEGORY_ALCHEMYARRAY = "alchemyarray"; + public static final String JEI_CATEGORY_SOULFORGE = "soulforge"; + public static final String JEI_CATEGORY_ALCHEMYTABLE = "alchemytable"; + public static final String JEI_CATEGORY_ARMOURDOWNGRADE = "armourdowngrade"; - public static final Item THAUMCRAFT_GOGGLES = ForgeRegistries.ITEMS.getValue(new ResourceLocation("Thaumcraft", "goggles")); - } - - public static class Misc { - public static final int POTION_ARRAY_SIZE = 256; - public static final float ALTERED_STEP_HEIGHT = 1.00314159f; - public static final int NIGHT_VISION_CONSTANT_BEGIN = 30020; - public static final int NIGHT_VISION_CONSTANT_END = 30000; - } + public static final String WAILA_CONFIG_ALTAR = BloodMagic.MODID + ".bloodaltar"; + public static final String WAILA_CONFIG_TELEPOSER = BloodMagic.MODID + ".teleposer"; + public static final String WAILA_CONFIG_RITUAL = BloodMagic.MODID + ".ritualController"; + public static final String WAILA_CONFIG_ARRAY = BloodMagic.MODID + ".array"; + public static final String WAILA_CONFIG_BLOOD_TANK = BloodMagic.MODID + ".bloodTank"; + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java index 3025075b..82d69ee7 100644 --- a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java @@ -1,24 +1,26 @@ -package WayofTime.bloodmagic.util; +package wayoftime.bloodmagic.util; -import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.LivingEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import wayoftime.bloodmagic.util.helper.TextHelper; -public class DamageSourceBloodMagic extends DamageSource { +public class DamageSourceBloodMagic extends DamageSource +{ + public static final DamageSourceBloodMagic INSTANCE = new DamageSourceBloodMagic(); - public static final DamageSourceBloodMagic INSTANCE = new DamageSourceBloodMagic(); + public DamageSourceBloodMagic() + { + super("bloodMagic"); - public DamageSourceBloodMagic() { - super("bloodMagic"); + setDamageBypassesArmor(); + setDamageIsAbsolute(); + } - setDamageBypassesArmor(); - setDamageIsAbsolute(); - } - - @Override - public ITextComponent getDeathMessage(LivingEntity livingBase) { - return new StringTextComponent(TextHelper.localizeEffect("chat.bloodmagic.damageSource", livingBase.getName())); - } -} + @Override + public ITextComponent getDeathMessage(LivingEntity livingBase) + { + return new StringTextComponent(TextHelper.localizeEffect("chat.bloodmagic.damageSource", livingBase.getName())); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java deleted file mode 100644 index 5621e3f0..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ /dev/null @@ -1,56 +0,0 @@ -package WayofTime.bloodmagic.util; - -import WayofTime.bloodmagic.util.helper.NBTHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -public class GhostItemHelper { - public static void setItemGhostAmount(ItemStack stack, int amount) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - tag.putInt(Constants.NBT.GHOST_STACK_SIZE, amount); - } - - public static int getItemGhostAmount(ItemStack stack) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - return tag.getInt(Constants.NBT.GHOST_STACK_SIZE); - } - - public static boolean hasGhostAmount(ItemStack stack) { - if (!stack.hasTagCompound()) { - return false; - } - - CompoundNBT tag = stack.getTagCompound(); - return tag.hasKey(Constants.NBT.GHOST_STACK_SIZE); - } - - public static void incrementGhostAmout(ItemStack stack, int value) { - int amount = getItemGhostAmount(stack); - amount += value; - setItemGhostAmount(stack, amount); - } - - public static void decrementGhostAmount(ItemStack stack, int value) { - int amount = getItemGhostAmount(stack); - amount -= value; - setItemGhostAmount(stack, amount); - } - - public static ItemStack getStackFromGhost(ItemStack ghostStack) { - ItemStack newStack = ghostStack.copy(); - NBTHelper.checkNBT(newStack); - CompoundNBT tag = newStack.getTagCompound(); - int amount = getItemGhostAmount(ghostStack); - tag.removeTag(Constants.NBT.GHOST_STACK_SIZE); - if (tag.isEmpty()) { - newStack.setTagCompound(null); - } - newStack.setCount(amount); - - return newStack; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java b/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java deleted file mode 100644 index f035728e..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/ISigilFluidItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package WayofTime.bloodmagic.util; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -public interface ISigilFluidItem { - FluidStack getFluid(ItemStack sigil); - - int getCapacity(ItemStack sigil); - - int fill(ItemStack sigil, FluidStack resource, boolean doFill); - - FluidStack drain(ItemStack sigil, int maxDrain, boolean doDrain); -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java deleted file mode 100644 index 771492c2..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java +++ /dev/null @@ -1,113 +0,0 @@ -package WayofTime.bloodmagic.util; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -@Deprecated -public class ItemStackWrapper { - public final Item item; - public final int stackSize; - public final int meta; - public CompoundNBT nbtTag; - - public ItemStackWrapper(Item item, int stackSize, int meta) { - this.item = item; - this.stackSize = stackSize; - this.meta = meta; - } - - public ItemStackWrapper(Item item, int stackSize) { - this(item, stackSize, 0); - } - - public ItemStackWrapper(Item item) { - this(item, 1, 0); - } - - public ItemStackWrapper(Block block, int stackSize, int meta) { - this(Item.getItemFromBlock(block), stackSize, meta); - } - - public ItemStackWrapper(Block block, int stackSize) { - this(block, stackSize, 0); - } - - public ItemStackWrapper(Block block) { - this(block, 1, 0); - } - - public ItemStackWrapper(BlockStack blockStack) { - this(blockStack.getBlock(), 1, blockStack.getMeta()); - } - - public ItemStack toStack() { - return new ItemStack(item, stackSize, meta); - } - - public String getDisplayName() { - return toStack().getDisplayName(); - } - - @Override - public String toString() { - return stackSize + "x" + item.getTranslationKey() + "@" + this.meta; - } - - public ItemStack toStack(int count) { - ItemStack result = new ItemStack(item, count, meta); - result.setTagCompound(nbtTag); - return result; - } - - public Item getItem() { - return item; - } - - public int getStackSize() { - return stackSize; - } - - public int getMeta() { - return meta; - } - - public CompoundNBT getNbtTag() { - return nbtTag; - } - - public void setNbtTag(CompoundNBT nbtTag) { - this.nbtTag = nbtTag; - } - - @Nullable - public static ItemStackWrapper getHolder(ItemStack stack) { - if (stack.isEmpty()) - return null; - - ItemStackWrapper wrapper = new ItemStackWrapper(stack.getItem(), stack.getCount(), stack.getItemDamage()); - wrapper.setNbtTag(stack.getTagCompound()); - return wrapper; - } - - public static List toWrapperList(List itemStackList) { - List wrapperList = new ArrayList<>(); - for (ItemStack stack : itemStackList) - wrapperList.add(ItemStackWrapper.getHolder(stack)); - - return wrapperList; - } - - public static List toStackList(List wrapperList) { - List stackList = new ArrayList<>(); - for (ItemStackWrapper wrapper : wrapperList) - stackList.add(wrapper.toStack()); - - return stackList; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java deleted file mode 100644 index 1297d964..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java +++ /dev/null @@ -1,136 +0,0 @@ -package WayofTime.bloodmagic.util; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicPlugin; -import WayofTime.bloodmagic.api.IBloodMagicAPI; -import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.impl.BloodMagicCorePlugin; -import com.google.common.base.Stopwatch; -import com.google.common.collect.Lists; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fml.common.discovery.ASMDataTable; -import org.apache.commons.lang3.tuple.Pair; - -import javax.annotation.Nonnull; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.List; -import java.util.Set; -import java.util.function.Consumer; - -public class PluginUtil { - - @SuppressWarnings("unchecked") - @Nonnull - public static List> gatherPlugins(ASMDataTable dataTable) { - Stopwatch stopwatch = Stopwatch.createStarted(); - List> discoveredAnnotations = Lists.newArrayList(); - Set discoveredPlugins = dataTable.getAll(BloodMagicPlugin.class.getName()); - - for (ASMDataTable.ASMData data : discoveredPlugins) { - try { - Class asmClass = Class.forName(data.getClassName()); - Class pluginClass = asmClass.asSubclass(IBloodMagicPlugin.class); - - IBloodMagicPlugin instance = pluginClass.newInstance(); - - BMLog.API.info("Discovered plugin at {}", data.getClassName()); - discoveredAnnotations.add(Pair.of(instance, pluginClass.getAnnotation(BloodMagicPlugin.class))); - } catch (Exception e) { - e.printStackTrace(); - } - } - - // Bring core plugin up to top - discoveredAnnotations.sort((o1, o2) -> { - if (o1.getLeft().getClass() == BloodMagicCorePlugin.class) - return -1; - - return o1.getClass().getCanonicalName().compareToIgnoreCase(o2.getClass().getCanonicalName()); - }); - BMLog.API.info("Discovered {} potential plugin(s) in {}", discoveredAnnotations.size(), stopwatch.stop()); - return discoveredAnnotations; - } - - @Nonnull - public static List gatherInjections(ASMDataTable dataTable) { - Stopwatch stopwatch = Stopwatch.createStarted(); - List injectees = Lists.newArrayList(); - Set discoveredInjectees = dataTable.getAll(BloodMagicPlugin.Inject.class.getName()); - - for (ASMDataTable.ASMData data : discoveredInjectees) { - try { - Class asmClass = Class.forName(data.getClassName()); - Field toInject = asmClass.getDeclaredField(data.getObjectName()); - if (toInject.getType() != IBloodMagicAPI.class) { - BMLog.API.error("Mod requested API injection on field {}.{} which is an invalid type.", data.getClassName(), data.getObjectName()); - continue; - } - - BMLog.API.info("Discovered injection request at {}.{}", data.getClassName(), data.getObjectName()); - injectees.add(toInject); - } catch (Exception e) { - e.printStackTrace(); - } - } - - BMLog.API.info("Discovered {} potential API injection(s) in {}", injectees.size(), stopwatch.stop()); - return injectees; - } - - public static void handlePluginStep(RegistrationStep step) { - Stopwatch total = Stopwatch.createStarted(); - int errors = 0; - for (Pair plugin : BloodMagic.PLUGINS) { - Stopwatch per = Stopwatch.createStarted(); - try { - step.getConsumer().accept(plugin); - } catch (Exception e) { - errors++; - BMLog.DEFAULT.error("Error handling plugin step {} at {}: {}: {}", step, plugin.getLeft().getClass(), e.getClass().getSimpleName(), e.getMessage()); - } - BMLog.API.info("Handled plugin step {} at {} in {}", step, plugin.getLeft().getClass(), per.stop()); - } - - BMLog.API.info("Handled {} plugin(s) at step {} with {} errors in {}", BloodMagic.PLUGINS.size() - errors, step, errors, total.stop()); - } - - public static void injectAPIInstances(List injectees) { - Stopwatch total = Stopwatch.createStarted(); - int errors = 0; - - for (Field injectee : injectees) { - Stopwatch per = Stopwatch.createStarted(); - if (!Modifier.isStatic(injectee.getModifiers())) - continue; - - try { - EnumHelper.setFailsafeFieldValue(injectee, null, BloodMagicAPI.INSTANCE); - } catch (Exception e) { - errors++; - BMLog.DEFAULT.error("Error injecting API instance at {}.{}", injectee.getDeclaringClass().getCanonicalName(), injectee.getName()); - } - BMLog.API.info("Injected API instance at {}.{} in {}", injectee.getDeclaringClass().getCanonicalName(), injectee.getName(), per.stop()); - } - - BMLog.API.info("Injected API {} times with {} errors in {}", injectees.size() - errors, errors, total.stop()); - } - - public enum RegistrationStep { - - PLUGIN_REGISTER(p -> p.getLeft().register(BloodMagicAPI.INSTANCE)), - RECIPE_REGISTER(p -> p.getLeft().registerRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar())); - - private final Consumer> consumer; - - RegistrationStep(Consumer> consumer) { - this.consumer = consumer; - } - - @Nonnull - public Consumer> getConsumer() { - return consumer; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java b/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java deleted file mode 100644 index fb2342a5..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/SigilFluidWrapper.java +++ /dev/null @@ -1,81 +0,0 @@ -package WayofTime.bloodmagic.util; - -import WayofTime.bloodmagic.item.sigil.ItemSigilFluidBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.FluidTankProperties; -import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fluids.capability.IFluidTankProperties; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class SigilFluidWrapper implements ICapabilityProvider { - - final ItemStack stack; - final ItemSigilFluidBase sigil; - final boolean canFill; - final boolean canDrain; - - public SigilFluidWrapper(ItemStack stackIn, ItemSigilFluidBase fluidSigil) { - stack = stackIn; - sigil = fluidSigil; - canFill = true; - canDrain = true; - } - - public SigilFluidWrapper(ItemStack stackIn, ItemSigilFluidBase fluidSigil, boolean canFillIn, boolean canDrainIn) { - stack = stackIn; - sigil = fluidSigil; - canFill = canFillIn; - canDrain = canDrainIn; - } - - @Override - public boolean hasCapability(Capability capability, Direction from) { - return capability == CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY; - } - - @Override - public T getCapability(Capability capability, final Direction from) { - if (!hasCapability(capability, from)) { - return null; - } - return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.cast(new IFluidHandlerItem() { - - @Override - public IFluidTankProperties[] getTankProperties() { - return new IFluidTankProperties[]{new FluidTankProperties(sigil.getFluid(stack), sigil.getCapacity(stack), canFill, canDrain)}; - } - - @Override - public int fill(FluidStack resource, boolean doFill) { - return 0; - } - - @Nullable - @Override - public FluidStack drain(FluidStack resource, boolean doDrain) { - return sigil.drain(stack, resource.amount, doDrain); - } - - @Nullable - @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - return sigil.drain(stack, maxDrain, doDrain); - } - - @Nonnull - @Override - public ItemStack getContainer() { - return stack; - } - - }); - } - -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java b/src/main/java/WayofTime/bloodmagic/util/StateUtil.java deleted file mode 100644 index ba653735..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/StateUtil.java +++ /dev/null @@ -1,38 +0,0 @@ -package WayofTime.bloodmagic.util; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -public class StateUtil { - public static BlockState parseState(String state) { - if (state.contains("[")) { - String[] split = state.split("\\["); - split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state - - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); - if (block == Blocks.AIR) - return block.getDefaultState(); - - BlockStateContainer blockState = block.getBlockState(); - BlockState returnState = blockState.getBaseState(); - - // Force our values into the state - String[] stateValues = split[1].split(","); // Splits up each value - for (String value : stateValues) { - String[] valueSplit = value.split("="); - IProperty property = blockState.getProperty(valueSplit[0]); - if (property != null) - returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); - } - - return returnState; - } else { - return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(state)).getDefaultState(); - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index c78454d9..4c78886f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,970 +1,51 @@ -package WayofTime.bloodmagic.util; +package wayoftime.bloodmagic.util; -import WayofTime.bloodmagic.altar.ComponentType; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.iface.IDemonWillViewer; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; -import WayofTime.bloodmagic.tile.TileInventory; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.NetherPortalBlock; -import net.minecraft.block.BlockState; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.*; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; -import net.minecraft.util.*; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.DyeColor; -import net.minecraft.item.ArmorItem; -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.*; -import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.common.ISpecialArmor.ArmorProperties; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; -import net.minecraftforge.items.wrapper.SidedInvWrapper; - -import javax.annotation.Nullable; -import java.lang.reflect.Field; -import java.util.*; - -public class Utils { - - public static final EnumMap DYE_COLOR_VALUES = Maps.newEnumMap(DyeColor.class); - - static { - try { - Field colorValue = ObfuscationReflectionHelper.findField(DyeColor.class, "field_193351_w"); - colorValue.setAccessible(true); - for (DyeColor color : DyeColor.values()) { - DYE_COLOR_VALUES.put(color, (int) colorValue.get(color)); - } - } catch (IllegalAccessException e) { - BMLog.DEFAULT.error("Error grabbing color values: {}", e.getMessage()); - } - } - - public static float addAbsorptionToMaximum(LivingEntity entity, float added, int maximum, int duration) { - float currentAmount = entity.getAbsorptionAmount(); - added = Math.min(maximum - currentAmount, added); - - if (added <= 0) { - return 0; - } - - if (duration > 0) { - int potionLevel = (int) ((currentAmount + added) / 4); - entity.addPotionEffect(new EffectInstance(Effects.ABSORPTION, duration, potionLevel, true, false)); - } - - entity.setAbsorptionAmount(currentAmount + added); - - return added; - } - - public static boolean isImmuneToFireDamage(LivingEntity entity) { - return entity.isImmuneToFire() || entity.isPotionActive(Effects.FIRE_RESISTANCE); - } - - public static boolean isPlayerBesideSolidBlockFace(PlayerEntity player) { - World world = player.getEntityWorld(); - double minimumDistanceFromAxis = 0.7; - BlockPos centralPos = player.getPosition(); - for (Direction facing : Direction.HORIZONTALS) { - BlockPos offsetPos = centralPos.offset(facing); - double distance = Math.min(offsetPos.getX() + 0.5 - player.posX, offsetPos.getZ() + 0.5 - player.posZ); - if (distance > minimumDistanceFromAxis) { - continue; - } - BlockState state = world.getBlockState(offsetPos); - if (state.isSideSolid(world, offsetPos, facing.getOpposite())) { - return true; - } - } - - return false; - } - - public static boolean canPlayerSeeDemonWill(PlayerEntity player) { - IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); - - for (int i = 0; i < inventory.getSlots(); i++) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - if (stack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) stack.getItem()).canSeeDemonWillAura(player.getEntityWorld(), stack, player)) { - return true; - } - } - - return false; - } - - public static boolean canEntitySeeBlock(World world, Entity entity, BlockPos pos) { - Vec3d relativePosition = new Vec3d(entity.posX - pos.getX() - 0.5, entity.posY + (double) entity.getEyeHeight() - pos.getY() - 0.5, entity.posZ - pos.getZ() - 0.5); - Direction dir = Direction.getFacingFromVector((float) relativePosition.x, (float) relativePosition.y, (float) relativePosition.z); - RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getXOffset() * 0.4, pos.getY() + 0.5 + dir.getYOffset() * 0.4, pos.getZ() + 0.5 + dir.getZOffset() * 0.4), false, true, true); - return result == null || pos.equals(result.getBlockPos()); - } - - public static int plantSeedsInArea(World world, AxisAlignedBB aabb, int horizontalRadius, int verticalRadius) { - int placedBlocks = 0; - List itemEntities = world.getEntitiesWithinAABB(ItemEntity.class, aabb); - - for (ItemEntity itemEntity : itemEntities) { - placedBlocks += plantEntityItem(itemEntity, horizontalRadius, verticalRadius); - } - - return placedBlocks; - } - - public static int plantItemStack(World world, BlockPos centralPos, ItemStack stack, int horizontalRadius, int verticalRadius) { - if (stack.isEmpty()) { - return 0; - } - - Item item = stack.getItem(); - if (!(item instanceof IPlantable)) { - return 0; - } - - int planted = 0; - - for (int hR = 0; hR <= horizontalRadius; hR++) { - for (int vR = 0; vR <= verticalRadius; vR++) { - for (int i = -hR; i <= hR; i++) { - for (int k = -hR; k <= hR; k++) { - for (int j = -vR; j <= vR; j += 2 * vR + (vR > 0 ? 0 : 1)) { - if (!(Math.abs(i) == hR || Math.abs(k) == hR)) { - continue; - } - - BlockPos newPos = centralPos.add(i, j, k); - if (world.isAirBlock(newPos)) { - BlockPos offsetPos = newPos.offset(Direction.DOWN); - BlockState state = world.getBlockState(offsetPos); - if (state.getBlock().canSustainPlant(state, world, offsetPos, Direction.UP, (IPlantable) item)) { - BlockState plantState = ((IPlantable) item).getPlant(world, newPos); - world.setBlockState(newPos, plantState, 3); - world.playEvent(2001, newPos, Block.getIdFromBlock(plantState.getBlock()) + (plantState.getBlock().getMetaFromState(plantState) << 12)); - stack.shrink(1); - planted++; - if (stack.isEmpty() || stack.getCount() <= 0) { - return planted; - } - } - } - } - } - } - } - } - - return planted; - } - - public static int plantEntityItem(ItemEntity itemEntity, int horizontalRadius, int verticalRadius) { - if (itemEntity == null || itemEntity.isDead) { - return 0; - } - - World world = itemEntity.getEntityWorld(); - BlockPos pos = itemEntity.getPosition(); - ItemStack stack = itemEntity.getItem(); - - int planted = plantItemStack(world, pos, stack, horizontalRadius, verticalRadius); - - if (stack.isEmpty()) { - itemEntity.setDead(); - } - - return planted; - } - - public static int getDemonWillResolution(PlayerEntity player) { - IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); - - for (int i = 0; i < inventory.getSlots(); i++) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - if (stack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) stack.getItem()).canSeeDemonWillAura(player.getEntityWorld(), stack, player)) { - return ((IDemonWillViewer) stack.getItem()).getDemonWillAuraResolution(player.getEntityWorld(), stack, player); - } - } - - return 1; - } - - public static CompoundNBT getPersistentDataTag(PlayerEntity player) { - CompoundNBT forgeData = player.getEntityData().getCompoundTag(PlayerEntity.PERSISTED_NBT_TAG); - CompoundNBT beaconData = forgeData.getCompoundTag("BloodMagic"); - - //Creates/sets the tags if they don't exist - if (!forgeData.hasKey("BloodMagic")) - forgeData.setTag("BloodMagic", beaconData); - if (!player.getEntityData().hasKey(PlayerEntity.PERSISTED_NBT_TAG)) - player.getEntityData().setTag(PlayerEntity.PERSISTED_NBT_TAG, forgeData); - - return beaconData; - } - - public static void setPlayerSpeedFromServer(PlayerEntity player, double motionX, double motionY, double motionZ) { - if (!player.getEntityWorld().isRemote && player instanceof ServerPlayerEntity) { - BloodMagicPacketHandler.sendTo(new PlayerVelocityPacketProcessor(motionX, motionY, motionZ), (ServerPlayerEntity) player); - } - } - - public static boolean isInteger(String integer) { - try { - Integer.parseInt(integer); - } catch (NumberFormatException | NullPointerException e) { - return false; - } - // only got here if we didn't return false - return true; - } - - public static String toFancyCasing(String input) { - return String.valueOf(input.charAt(0)).toUpperCase(Locale.ENGLISH) + input.substring(1); - } - - public static String prettifyBlockPosString(BlockPos pos) { - return "[" + pos.getX() + ", " + pos.getY() + ", " + pos.getZ() + "]"; - } - - /** - * @param tile - The {@link TileInventory} to input the item to - * @param player - The player to take the item from. - * @return {@code true} if the ItemStack is inserted, {@code false} - * otherwise - * @see #insertItemToTile(TileInventory, PlayerEntity, int) - */ - public static boolean insertItemToTile(TileInventory tile, PlayerEntity player) { - return insertItemToTile(tile, player, 0); - } - - /** - * Used for inserting an ItemStack with a stacksize of 1 to a tile's - * inventory at slot 0 - *

    - * EG: Block Altar - * - * @param tile - The {@link TileInventory} to input the item to - * @param player - The player to take the item from. - * @param slot - The slot to attempt to insert to - * @return {@code true} if the ItemStack is inserted, {@code false} - * otherwise - */ - public static boolean insertItemToTile(TileInventory tile, PlayerEntity player, int slot) { - ItemStack slotStack = tile.getStackInSlot(slot); - if (slotStack.isEmpty() && !player.getHeldItemMainhand().isEmpty()) { - ItemStack input = player.getHeldItemMainhand().copy(); - input.setCount(1); - player.getHeldItemMainhand().shrink(1); - tile.setInventorySlotContents(slot, input); - return true; - } else if (!slotStack.isEmpty() && player.getHeldItemMainhand().isEmpty()) { - ItemHandlerHelper.giveItemToPlayer(player, slotStack); - tile.clear(); - return false; - } - - return false; - } - - public static double calculateStandardProgress(Number currentValue, int[] requiredValues, int currentLevel) { - int nextLevel = currentLevel + 1; - if (nextLevel >= requiredValues.length) - return 1.0D; - - int required = requiredValues[nextLevel]; - return Double.parseDouble("" + currentValue) / (double) required; - } - - @Nullable - public static IItemHandler getInventory(TileEntity tile, @Nullable Direction facing) { - if (facing == null) - facing = Direction.DOWN; - - IItemHandler itemHandler = null; - - if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing)) - itemHandler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing); - else if (tile instanceof ISidedInventory) - itemHandler = ((ISidedInventory) tile).getSlotsForFace(facing).length != 0 ? new SidedInvWrapper((ISidedInventory) tile, facing) : null; - else if (tile instanceof IInventory) - itemHandler = new InvWrapper((IInventory) tile); - - return itemHandler; - } - - public static ItemStack setUnbreakable(ItemStack stack) { - NBTHelper.checkNBT(stack); - stack.getTagCompound().setBoolean("Unbreakable", true); - return stack; - } - - /** - * Gets a default block for each type of {@link ComponentType} - * - * @param component - The Component to provide a block for. - * @return The default Block for the EnumAltarComponent - */ - public static Block getBlockForComponent(ComponentType component) { - switch (component) { - case GLOWSTONE: - return Blocks.GLOWSTONE; - case BLOODSTONE: - return RegistrarBloodMagicBlocks.DECORATIVE_BRICK; - case BEACON: - return Blocks.BEACON; - case BLOODRUNE: - return RegistrarBloodMagicBlocks.BLOOD_RUNE; - case CRYSTAL: - return RegistrarBloodMagicBlocks.BLOOD_RUNE; - case NOTAIR: - return Blocks.STONEBRICK; - default: - return Blocks.AIR; - } - } - - public static float getModifiedDamage(LivingEntity attackedEntity, DamageSource source, float amount) { - if (!attackedEntity.isEntityInvulnerable(source)) { - if (amount <= 0) - return 0; - - amount = applyArmor(attackedEntity, Iterables.toArray(attackedEntity.getEquipmentAndArmor(), ItemStack.class), source, amount); - if (amount <= 0) - return 0; - amount = applyPotionDamageCalculations(attackedEntity, source, amount); - - return amount; - } - - return 0; - } - - public static float applyArmor(LivingEntity entity, ItemStack[] inventory, DamageSource source, double damage) { - damage *= 25; - ArrayList dmgVals = new ArrayList<>(); - for (int x = 0; x < inventory.length; x++) { - ItemStack stack = inventory[x]; - if (stack.isEmpty()) { - continue; - } - ArmorProperties prop = null; - if (stack.getItem() instanceof ISpecialArmor) { - ISpecialArmor armor = (ISpecialArmor) stack.getItem(); - prop = armor.getProperties(entity, stack, source, damage / 25D, x).copy(); - } else if (stack.getItem() instanceof ArmorItem && !source.isUnblockable()) { - ArmorItem armor = (ArmorItem) stack.getItem(); - prop = new ArmorProperties(0, armor.damageReduceAmount / 25D, Integer.MAX_VALUE); - } - if (prop != null) { - prop.Slot = x; - dmgVals.add(prop); - } - } - if (dmgVals.size() > 0) { - ArmorProperties[] props = dmgVals.toArray(new ArmorProperties[dmgVals.size()]); - int level = props[0].Priority; - double ratio = 0; - for (ArmorProperties prop : props) { - if (level != prop.Priority) { - damage -= (damage * ratio); - ratio = 0; - level = prop.Priority; - } - ratio += prop.AbsorbRatio; - - } - damage -= (damage * ratio); - } - - return (float) (damage / 25.0F); - } - - public static float applyPotionDamageCalculations(LivingEntity attackedEntity, DamageSource source, float damage) { - Effect resistance = Effects.RESISTANCE; - - if (source.isDamageAbsolute()) { - return damage; - } else { - if (attackedEntity.isPotionActive(resistance) && source != DamageSource.OUT_OF_WORLD) { - int i = (attackedEntity.getActivePotionEffect(resistance).getAmplifier() + 1) * 5; - int j = 25 - i; - float f = damage * (float) j; - damage = f / 25.0F; - } - - if (damage <= 0.0F) { - return 0.0F; - } else { - int k = EnchantmentHelper.getEnchantmentModifierDamage(attackedEntity.getArmorInventoryList(), source); - - if (k > 20) { - k = 20; - } - - if (k > 0 && k <= 20) { - int l = 25 - k; - float f1 = damage * (float) l; - damage = f1 / 25.0F; - } - - return damage; - } - } - } - - /** - * Used to determine if stack1 can be placed into stack2. If stack2 is is empty - * and stack1 isn't empty, returns true. Ignores stack size - * - * @param stack1 Stack that is placed into a slot - * @param stack2 Slot content that stack1 is placed into - * @return True if they can be combined - * @deprecated use {@link ItemHandlerHelper#canItemStacksStack(ItemStack, ItemStack)} - */ - @Deprecated - public static boolean canCombine(ItemStack stack1, ItemStack stack2) { - return stack1.isEmpty() && !stack2.isEmpty() || ItemHandlerHelper.canItemStacksStack(stack1, stack2); - } - - /** - * @param stack1 Stack that is placed into a slot - * @param stack2 Slot content that stack1 is placed into - * @return Stacks after stacking - */ - public static ItemStack[] combineStacks(ItemStack stack1, ItemStack stack2, int transferMax) { - ItemStack[] returned = new ItemStack[2]; - - if (ItemHandlerHelper.canItemStacksStack(stack1, stack2)) { - int transferedAmount = Math.min(transferMax, stack2.isEmpty() ? stack1.getCount() : Math.min(stack2.getMaxStackSize() - stack2.getCount(), stack1.getCount())); - if (transferedAmount > 0) { - ItemStack copyStack = stack1.splitStack(transferedAmount); - if (stack2.isEmpty()) { - stack2 = copyStack; - } else { - stack2.grow(transferedAmount); - } - } - } - - returned[0] = stack1; - returned[1] = stack2; - - return returned; - } - - /** - * @param stack1 Stack that is placed into a slot - * @param stack2 Slot content that stack1 is placed into - * @return Stacks after stacking - */ - public static ItemStack[] combineStacks(ItemStack stack1, ItemStack stack2) { - ItemStack[] returned = new ItemStack[2]; - - if (ItemHandlerHelper.canItemStacksStack(stack1, stack2)) { - int transferedAmount = stack2.isEmpty() ? stack1.getCount() : Math.min(stack2.getMaxStackSize() - stack2.getCount(), stack1.getCount()); - if (transferedAmount > 0) { - ItemStack copyStack = stack1.splitStack(transferedAmount); - if (stack2.isEmpty()) { - stack2 = copyStack; - } else { - stack2.grow(transferedAmount); - } - } - } - - returned[0] = stack1; - returned[1] = stack2; - - return returned; - } - - public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, Direction dir) { - if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir)) { - IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); - - return insertStackIntoTile(stack, handler); - } else if (tile instanceof IInventory) { - return insertStackIntoInventory(stack, (IInventory) tile, dir); - } - - return stack; - } - - public static int getNumberOfFreeSlots(TileEntity tile, Direction dir) { - int slots = 0; - - if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir)) { - IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); - - for (int i = 0; i < handler.getSlots(); i++) { - if (handler.getStackInSlot(i).isEmpty()) { - slots++; - } - } - } else if (tile instanceof IInventory) { - for (int i = 0; i < ((IInventory) tile).getSizeInventory(); i++) { - if (((IInventory) tile).getStackInSlot(i).isEmpty()) { - slots++; - } - } - } - - return slots; - } - - public static ItemStack insertStackIntoTile(ItemStack stack, IItemHandler handler) { - int numberOfSlots = handler.getSlots(); - - ItemStack copyStack = stack.copy(); - - for (int slot = 0; slot < numberOfSlots; slot++) { - copyStack = handler.insertItem(slot, copyStack, false); - if (copyStack.isEmpty()) { - return ItemStack.EMPTY; - } - } - - return copyStack; - } - - /** - * Inserts the desired stack into the tile up to a limit for the tile. - * Respects capabilities. - * - * @param stack - * @param tile - * @param dir - * @param limit - * @return - */ - public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, Direction dir, int limit) { - if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir)) { - IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); - int numberOfSlots = handler.getSlots(); - - ItemStack copyStack = stack.copy(); - - int numberMatching = 0; - - for (int slot = 0; slot < numberOfSlots; slot++) { - ItemStack invStack = handler.getStackInSlot(slot); - - if (!invStack.isEmpty() && ItemHandlerHelper.canItemStacksStack(stack, invStack)) { - numberMatching += invStack.getCount(); - } - } - - if (numberMatching >= limit) { - return stack; - } - - int newLimit = limit - numberMatching; - - for (int slot = 0; slot < numberOfSlots; slot++) { - ItemStack newCopyStack = copyStack.copy(); - newCopyStack.setCount(Math.min(copyStack.getCount(), newLimit)); - - newCopyStack = handler.insertItem(slot, newCopyStack, false); - - if (newCopyStack.isEmpty()) { - return ItemStack.EMPTY; - } - - newLimit -= (copyStack.getCount() - newCopyStack.getCount()); - - if (newLimit <= 0) { - return ItemStack.EMPTY; //TODO - } - - copyStack.shrink(copyStack.getCount() - newCopyStack.getCount()); - } - - return copyStack; - } else if (tile instanceof IInventory) { - return insertStackIntoInventory(stack, (IInventory) tile, dir, limit); - } - - return stack; - } - - public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, Direction dir) { - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - - boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; - - if (inventory instanceof ISidedInventory) { - int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); - for (int in : array) { - canBeInserted[in] = inventory.isItemValidForSlot(in, stack) && ((ISidedInventory) inventory).canInsertItem(in, stack, dir); - } - } else { - for (int i = 0; i < canBeInserted.length; i++) { - canBeInserted[i] = inventory.isItemValidForSlot(i, stack); - } - } - - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (!canBeInserted[i]) { - continue; - } - - ItemStack[] combinedStacks = combineStacks(stack, inventory.getStackInSlot(i)); - stack = combinedStacks[0]; - inventory.setInventorySlotContents(i, combinedStacks[1]); - - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - } - - return stack; - } - - public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, Direction dir) { - return canInsertStackFullyIntoInventory(stack, inventory, dir, false, 0); - } - - public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, Direction dir, boolean fillToLimit, int limit) { - if (stack.isEmpty()) { - return true; - } - - int itemsLeft = stack.getCount(); - - boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; - - if (inventory instanceof ISidedInventory) { - int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); - for (int in : array) { - canBeInserted[in] = inventory.isItemValidForSlot(in, stack) && ((ISidedInventory) inventory).canInsertItem(in, stack, dir); - } - } else { - for (int i = 0; i < canBeInserted.length; i++) { - canBeInserted[i] = inventory.isItemValidForSlot(i, stack); - } - } - - int numberMatching = 0; - - if (fillToLimit) { - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (!canBeInserted[i]) { - continue; - } - - ItemStack invStack = inventory.getStackInSlot(i); - - if (!invStack.isEmpty() && ItemHandlerHelper.canItemStacksStack(stack, invStack)) { - numberMatching += invStack.getCount(); - } - } - } - - if (fillToLimit && limit < stack.getCount() + numberMatching) { - return false; - } - - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (!canBeInserted[i]) { - continue; - } - - ItemStack invStack = inventory.getStackInSlot(i); - boolean canCombine = canCombine(stack, invStack); - if (canCombine) { - if (invStack.isEmpty()) { - itemsLeft = 0; - } else { - itemsLeft -= (invStack.getMaxStackSize() - invStack.getCount()); - } - } - - if (itemsLeft <= 0) { - return true; - } - } - - return false; - } - - /** - * Inserts the desired stack into the inventory up to a limit for the - * inventory. - * - * @param stack - * @param inventory - * @param dir - * @param limit - * @return - */ - public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, Direction dir, int limit) { - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - - boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; - - if (inventory instanceof ISidedInventory) { - int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); - for (int in : array) { - canBeInserted[in] = ((ISidedInventory) inventory).canInsertItem(in, stack, dir); - } - } else { - for (int i = 0; i < canBeInserted.length; i++) { - canBeInserted[i] = true; - } - } - - int numberMatching = 0; - - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (!canBeInserted[i]) { - continue; - } - - ItemStack invStack = inventory.getStackInSlot(i); - - if (!invStack.isEmpty() && canCombine(stack, invStack)) { - numberMatching += invStack.getCount(); - } - } - - if (numberMatching >= limit) { - return stack; - } - - int newLimit = limit - numberMatching; - - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (!canBeInserted[i]) { - continue; - } - - int prevStackSize = stack.getCount(); - - ItemStack[] combinedStacks = combineStacks(stack, inventory.getStackInSlot(i), newLimit); - stack = combinedStacks[0]; - inventory.setInventorySlotContents(i, combinedStacks[1]); //TODO - - newLimit -= (prevStackSize - stack.getCount()); - - if (newLimit <= 0 || stack.isEmpty()) { - return stack; - } - } - - return stack; - } - - public static boolean isBlockLiquid(BlockState state) { - return (state instanceof IFluidBlock || state.getMaterial().isLiquid()); - } - - public static boolean isFlowingLiquid(BlockState state) { - Block block = state.getBlock(); - return isBlockLiquid(state) && !(state == block.getDefaultState()); - } - - public static boolean spawnStackAtBlock(World world, BlockPos pos, @Nullable Direction pushDirection, ItemStack stack) { - ItemEntity entityItem = new ItemEntity(world); - BlockPos spawnPos = new BlockPos(pos); - double velocity = 0.15D; - if (pushDirection != null) { - spawnPos.offset(pushDirection); - - switch (pushDirection) { - case DOWN: { - entityItem.motionY = -velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() - 1.0D, spawnPos.getZ() + 0.5D); - break; - } - case UP: { - entityItem.motionY = velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 1.0D, spawnPos.getZ() + 0.5D); - break; - } - case NORTH: { - entityItem.motionZ = -velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 0.5D, spawnPos.getZ() - 1.0D); - break; - } - case SOUTH: { - entityItem.motionZ = velocity; - entityItem.setPosition(spawnPos.getX() + 0.5D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 1.0D); - break; - } - case WEST: { - entityItem.motionX = -velocity; - entityItem.setPosition(spawnPos.getX() - 1.0D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 0.5D); - break; - } - case EAST: { - entityItem.motionX = velocity; - entityItem.setPosition(spawnPos.getX() + 1.0D, spawnPos.getY() + 0.5D, spawnPos.getZ() + 0.5D); - break; - } - } - } - - entityItem.setItem(stack); - return world.spawnEntity(entityItem); - } - - public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos) { - return swapLocations(initialWorld, initialPos, finalWorld, finalPos, true); - } - - public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos, boolean playSound) { - TileEntity initialTile = initialWorld.getTileEntity(initialPos); - TileEntity finalTile = finalWorld.getTileEntity(finalPos); - CompoundNBT initialTag = new CompoundNBT(); - CompoundNBT finalTag = new CompoundNBT(); - if (initialTile != null) - initialTile.writeToNBT(initialTag); - if (finalTile != null) - finalTile.writeToNBT(finalTag); - - BlockState initialState = initialWorld.getBlockState(initialPos); - BlockState finalState = finalWorld.getBlockState(finalPos); - - if ((initialState.getBlock().equals(Blocks.AIR) && finalState.getBlock().equals(Blocks.AIR)) || initialState.getBlock() instanceof NetherPortalBlock || finalState.getBlock() instanceof NetherPortalBlock) - return false; - - if (playSound) { - initialWorld.playSound(initialPos.getX(), initialPos.getY(), initialPos.getZ(), SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - finalWorld.playSound(finalPos.getX(), finalPos.getY(), finalPos.getZ(), SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); - } - - //Finally, we get to do something! (CLEARING TILES) - if (finalState.getBlock().hasTileEntity(finalState)) - finalWorld.removeTileEntity(finalPos); - if (initialState.getBlock().hasTileEntity(initialState)) - initialWorld.removeTileEntity(initialPos); - - //TILES CLEARED - BlockState initialBlockState = initialWorld.getBlockState(initialPos); - BlockState finalBlockState = finalWorld.getBlockState(finalPos); - finalWorld.setBlockState(finalPos, initialBlockState, 3); - - if (initialTile != null) { - TileEntity newTileInitial = TileEntity.create(finalWorld, initialTag); - - - finalWorld.setTileEntity(finalPos, newTileInitial); - newTileInitial.setPos(finalPos); - newTileInitial.setWorld(finalWorld); - } - - initialWorld.setBlockState(initialPos, finalBlockState, 3); - - if (finalTile != null) { - TileEntity newTileFinal = TileEntity.create(initialWorld, finalTag); - - initialWorld.setTileEntity(initialPos, newTileFinal); - newTileFinal.setPos(initialPos); - newTileFinal.setWorld(initialWorld); - } - - initialWorld.notifyNeighborsOfStateChange(initialPos, finalState.getBlock(), true); - finalWorld.notifyNeighborsOfStateChange(finalPos, initialState.getBlock(), true); - - return true; - } - - //Shamelessly ripped off of CoFH Lib - public static ItemStack consumeItem(ItemStack stack) { - Item item = stack.getItem(); - boolean largerStack = stack.getCount() > 1; - if (largerStack) { - stack.shrink(1); - } - if (item.hasContainerItem(stack)) { - ItemStack ret = item.getContainerItem(stack); - if (ret.isEmpty()) { - return ItemStack.EMPTY; - } - if (ret.isItemStackDamageable() && ret.getItemDamage() > ret.getMaxDamage()) { - ret = ItemStack.EMPTY; - } - return ret; - } - return largerStack ? stack : ItemStack.EMPTY; - } - - public static boolean hasUUID(ItemStack stack) { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.MOST_SIG) && stack.getTagCompound().hasKey(Constants.NBT.LEAST_SIG); - } - - public static UUID getUUID(ItemStack stack) { - if (!hasUUID(stack)) { - return null; - } - - return new UUID(stack.getTagCompound().getLong(Constants.NBT.MOST_SIG), stack.getTagCompound().getLong(Constants.NBT.LEAST_SIG)); - } - - public static void setUUID(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - - if (!stack.getTagCompound().hasKey(Constants.NBT.MOST_SIG) && !stack.getTagCompound().hasKey(Constants.NBT.LEAST_SIG)) { - UUID itemUUID = UUID.randomUUID(); - stack.getTagCompound().setLong(Constants.NBT.MOST_SIG, itemUUID.getMostSignificantBits()); - stack.getTagCompound().setLong(Constants.NBT.LEAST_SIG, itemUUID.getLeastSignificantBits()); - } - } - - public static RayTraceResult rayTrace(PlayerEntity player, boolean useLiquids) { - float pitch = player.rotationPitch; - float yaw = player.rotationYaw; - Vec3d eyePosition = new Vec3d(player.posX, player.posY + (double) player.getEyeHeight(), player.posZ); - - float f2 = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI); - float f3 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI); - float f4 = -MathHelper.cos(-pitch * 0.017453292F); - float f5 = MathHelper.sin(-pitch * 0.017453292F); - float f6 = f3 * f4; - float f7 = f2 * f4; - - double reachDistance = 5.0D; - if (player instanceof ServerPlayerEntity) - reachDistance = ((ServerPlayerEntity) player).interactionManager.getBlockReachDistance(); - - Vec3d reachPosition = eyePosition.add((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); - return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); - } +import wayoftime.bloodmagic.tile.TileInventory; + +public class Utils +{ + /** + * @param tile - The {@link TileInventory} to input the item to + * @param player - The player to take the item from. + * @return {@code true} if the ItemStack is inserted, {@code false} otherwise + * @see #insertItemToTile(TileInventory, PlayerEntity, int) + */ + public static boolean insertItemToTile(TileInventory tile, PlayerEntity player) + { + return insertItemToTile(tile, player, 0); + } + + /** + * Used for inserting an ItemStack with a stacksize of 1 to a tile's inventory + * at slot 0 + *

    + * EG: Block Altar + * + * @param tile - The {@link TileInventory} to input the item to + * @param player - The player to take the item from. + * @param slot - The slot to attempt to insert to + * @return {@code true} if the ItemStack is inserted, {@code false} otherwise + */ + public static boolean insertItemToTile(TileInventory tile, PlayerEntity player, int slot) + { + ItemStack slotStack = tile.getStackInSlot(slot); + if (slotStack.isEmpty() && !player.getHeldItemMainhand().isEmpty()) + { + ItemStack input = player.getHeldItemMainhand().copy(); + input.setCount(1); + player.getHeldItemMainhand().shrink(1); + tile.setInventorySlotContents(slot, input); + return true; + } else if (!slotStack.isEmpty() && player.getHeldItemMainhand().isEmpty()) + { + ItemHandlerHelper.giveItemToPlayer(player, slotStack); + tile.clear(); + return false; + } + + return false; + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java deleted file mode 100644 index 251a0a1b..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java +++ /dev/null @@ -1,61 +0,0 @@ -package WayofTime.bloodmagic.util.handler; - -import net.minecraftforge.fml.common.event.FMLInterModComms; - -public class IMCHandler { - - public static void handleIMC(FMLInterModComms.IMCEvent event) { - // TODO -// for (FMLInterModComms.IMCMessage message : event.getMessages()) -// { -// if (message.key.equals("teleposerBlacklist") && message.isItemStackMessage()) -// { -// ItemStack stack = message.getItemStackValue(); -// if (stack.getItem() instanceof ItemBlock) -// { -// Block block = Block.getBlockFromItem(stack.getItem()); -// BloodMagicAPI.addToTeleposerBlacklist(block, stack.getItemDamage()); -// } -// } -// -// if (message.key.equals("transpositionBlacklist") && message.isItemStackMessage()) -// { -// ItemStack stack = message.getItemStackValue(); -// if (stack.getItem() instanceof ItemBlock) -// { -// Block block = Block.getBlockFromItem(stack.getItem()); -// BloodMagicAPI.addToTranspositionBlacklist(block, stack.getItemDamage()); -// } -// } -// -// if (message.key.equals("sacrificeValue") && message.isStringMessage()) -// { -// String[] splitInfo = message.getStringValue().split(";"); -// if (splitInfo.length == 2 && Utils.isInteger(splitInfo[1])) -// BloodMagicAPI.setEntitySacrificeValue(splitInfo[0], Integer.parseInt(splitInfo[1])); -// } -// -// if (message.key.equals("greenGroveBlacklist") && message.isStringMessage()) -// { -// String[] splitInfo = message.getStringValue().split(":"); -// if (splitInfo.length == 2) -// { -// Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(splitInfo[0], splitInfo[1])); -// if (block != null) -// BloodMagicAPI.blacklistFromGreenGrove(block); -// } -// } -// -// if (message.key.equals("altarComponent") && message.isStringMessage()) -// { -// String[] splitInfo = message.getStringValue().split(":"); -// if (splitInfo.length == 4) -// { -// Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(splitInfo[0], splitInfo[1])); -// if (block != null) -// BloodMagicAPI.addAltarComponent(block.getStateFromMeta(Integer.parseInt(splitInfo[2])), EnumAltarComponent.valueOf(splitInfo[3])); -// } -// } -// } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java deleted file mode 100644 index 06fd87a4..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ /dev/null @@ -1,398 +0,0 @@ -package WayofTime.bloodmagic.util.handler.event; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.util.BMLog; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; -import WayofTime.bloodmagic.client.key.KeyBindings; -import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.item.ItemRitualDiviner; -import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.SigilHoldingPacketProcessor; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.GhostItemHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Stopwatch; -import com.google.common.collect.Lists; -import com.google.common.collect.SetMultimap; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.client.event.*; -import net.minecraftforge.client.event.sound.PlaySoundEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.InputEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -import java.util.*; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Side.CLIENT) -@SideOnly(Side.CLIENT) -public class ClientHandler { - // Quick toggle for error suppression. Set to false if you wish to hide model errors. - public static final boolean SUPPRESS_ASSET_ERRORS = true; - public static TextureAtlasSprite ritualStoneBlank; - public static TextureAtlasSprite ritualStoneWater; - public static TextureAtlasSprite ritualStoneFire; - public static TextureAtlasSprite ritualStoneEarth; - public static TextureAtlasSprite ritualStoneAir; - public static TextureAtlasSprite ritualStoneDawn; - public static TextureAtlasSprite ritualStoneDusk; - public static TextureAtlasSprite blankBloodRune; - public static TextureAtlasSprite stoneBrick; - public static TextureAtlasSprite glowstone; - public static TextureAtlasSprite bloodStoneBrick; - public static TextureAtlasSprite beacon; - public static TextureAtlasSprite crystalCluster; - public static Minecraft minecraft = Minecraft.getInstance(); - private static TileMasterRitualStone mrsHoloTile; - private static Ritual mrsHoloRitual; - private static Direction mrsHoloDirection; - private static boolean mrsHoloDisplay; - - @SubscribeEvent - public static void onTooltipEvent(ItemTooltipEvent event) { - ItemStack stack = event.getItemStack(); - if (stack.isEmpty()) { - return; - } - - if (GhostItemHelper.hasGhostAmount(stack)) { - int amount = GhostItemHelper.getItemGhostAmount(stack); - if (amount == 0) { - event.getToolTip().add(TextHelper.localize("tooltip.bloodmagic.ghost.everything")); - } else { - event.getToolTip().add(TextHelper.localize("tooltip.bloodmagic.ghost.amount", amount)); - } - } - } - - @SubscribeEvent - public static void onSoundEvent(PlaySoundEvent event) { - PlayerEntity player = Minecraft.getInstance().player; - if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { - event.setResultSound(null); - } - } - - @SubscribeEvent - public static void onTextureStitch(TextureStitchEvent.Pre event) { - final String BLOCKS = "blocks"; - - ritualStoneBlank = forName(event.getMap(), "RitualStone", BLOCKS); - ritualStoneWater = forName(event.getMap(), "WaterRitualStone", BLOCKS); - ritualStoneFire = forName(event.getMap(), "FireRitualStone", BLOCKS); - ritualStoneEarth = forName(event.getMap(), "EarthRitualStone", BLOCKS); - ritualStoneAir = forName(event.getMap(), "AirRitualStone", BLOCKS); - ritualStoneDawn = forName(event.getMap(), "LightRitualStone", BLOCKS); - ritualStoneDusk = forName(event.getMap(), "DuskRitualStone", BLOCKS); - - blankBloodRune = forName(event.getMap(), "BlankRune", BLOCKS); - stoneBrick = event.getMap().registerSprite(new ResourceLocation("minecraft:blocks/stonebrick")); - glowstone = event.getMap().registerSprite(new ResourceLocation("minecraft:blocks/glowstone")); - bloodStoneBrick = forName(event.getMap(), "BloodStoneBrick", BLOCKS); - beacon = event.getMap().registerSprite(new ResourceLocation("minecraft:blocks/beacon")); - crystalCluster = forName(event.getMap(), "ShardCluster", BLOCKS); - } - - @SubscribeEvent - public static void render(RenderWorldLastEvent event) { - ClientPlayerEntity player = minecraft.player; - World world = player.getEntityWorld(); - - if (mrsHoloTile != null) { - if (world.getTileEntity(mrsHoloTile.getPos()) instanceof TileMasterRitualStone) { - if (mrsHoloDisplay) - renderRitualStones(mrsHoloTile, event.getPartialTicks()); - else - ClientHandler.setRitualHoloToNull(); - } else { - ClientHandler.setRitualHoloToNull(); - } - } - - if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.typeOfHit != RayTraceResult.Type.BLOCK) - return; - - TileEntity tileEntity = world.getTileEntity(minecraft.objectMouseOver.getBlockPos()); - - if (tileEntity instanceof TileMasterRitualStone && !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ItemRitualDiviner) - renderRitualStones(player, event.getPartialTicks()); - } - - @SubscribeEvent - public static void onMouseEvent(MouseEvent event) { - ClientPlayerEntity player = Minecraft.getInstance().player; - - if (event.getDwheel() != 0 && player != null && player.isSneaking()) { - ItemStack stack = player.getHeldItemMainhand(); - - if (!stack.isEmpty()) { - Item item = stack.getItem(); - - if (item instanceof ItemSigilHolding) { - cycleSigil(stack, player, event.getDwheel()); - event.setCanceled(true); - } - } - } - } - - @SubscribeEvent - public static void onKey(InputEvent event) { - if (!minecraft.inGameHasFocus) - return; - - for (KeyBindings keyBinding : KeyBindings.values()) - if (keyBinding.getKey().isPressed()) - keyBinding.handleKeybind(); - } - - // Stolen from Chisel - @SubscribeEvent - public static void onModelBake(ModelBakeEvent event) { - if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS) - return; - - Stopwatch stopwatch = Stopwatch.createStarted(); - Map modelErrors = ReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), "loadingExceptions"); - Set missingVariants = ReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), "missingVariants"); - - // Collect all Blood Magic model errors - List errored = new ArrayList<>(); - for (ResourceLocation modelError : modelErrors.keySet()) - if (modelError.getNamespace().equalsIgnoreCase(BloodMagic.MODID)) - errored.add(modelError); - - // Collect all Blood Magic variant errors - List missing = new ArrayList<>(); - for (ModelResourceLocation missingVariant : missingVariants) - if (missingVariant.getNamespace().equalsIgnoreCase(BloodMagic.MODID)) - missing.add(missingVariant); - - // Remove discovered model errors - for (ResourceLocation modelError : errored) - modelErrors.remove(modelError); - - // Remove discovered variant errors - missingVariants.removeAll(missing); - - if (errored.size() > 0) - BMLog.DEBUG.info("Suppressed {} model errors from Blood Magic.", errored.size()); - if (missing.size() > 0) - BMLog.DEBUG.info("Suppressed {} variant errors from Blood Magic.", missing.size()); - BMLog.DEBUG.info("Suppressed discovered model/variant errors in {}", stopwatch.stop()); - } - - // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. - @SubscribeEvent - public static void onTextureStitch(TextureStitchEvent.Post event) { - if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS) - return; - - Stopwatch stopwatch = Stopwatch.createStarted(); - SetMultimap missingTextures = ReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), "missingTextures"); - Set badTextureDomains = ReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), "badTextureDomains"); - - String mc = "minecraft"; - String format = "textures/%s.png"; - Set toRemove = new HashSet<>(); - - // Find our missing textures and mark them for removal. Cannot directly remove as it would cause a CME - if (missingTextures.containsKey(mc)) { - Set missingMCTextures = missingTextures.get(mc); - for (ResourceLocation texture : missingMCTextures) - if (texture.getPath().equalsIgnoreCase(String.format(format, "node")) || texture.getPath().equalsIgnoreCase(String.format(format, "crystal"))) - toRemove.add(texture); - } - - // Remove all our found errors - missingTextures.get(mc).removeAll(toRemove); - - // Make sure to only remove the bad MC domain if no other textures are missing - if (missingTextures.get(mc).isEmpty()) { - missingTextures.keySet().remove(mc); - badTextureDomains.remove(mc); - } - BMLog.DEBUG.info("Suppressed required texture errors in {}", stopwatch.stop()); - } - - private static void renderRitualStones(ClientPlayerEntity player, float partialTicks) { - World world = player.getEntityWorld(); - ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); - Direction direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); - - if (ritual == null) - return; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 0.6125F); - - BlockPos vec3, vX; - vec3 = minecraft.objectMouseOver.getBlockPos(); - double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks; - double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; - double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent ritualComponent : components) { - vX = vec3.add(ritualComponent.getOffset(direction)); - double minX = vX.getX() - posX; - double minY = vX.getY() - posY; - double minZ = vX.getZ() - posZ; - - if (!world.getBlockState(vX).isOpaqueCube()) { - TextureAtlasSprite texture = null; - - switch (ritualComponent.getRuneType()) { - case BLANK: - texture = ritualStoneBlank; - break; - case WATER: - texture = ritualStoneWater; - break; - case FIRE: - texture = ritualStoneFire; - break; - case EARTH: - texture = ritualStoneEarth; - break; - case AIR: - texture = ritualStoneAir; - break; - case DAWN: - texture = ritualStoneDawn; - break; - case DUSK: - texture = ritualStoneDusk; - break; - } - - RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); - } - } - - GlStateManager.popMatrix(); - } - - public static void cycleSigil(ItemStack stack, PlayerEntity player, int dWheel) { - int mode = dWheel; - if (!ConfigHandler.client.sigilHoldingSkipsEmptySlots) { - mode = ItemSigilHolding.getCurrentItemOrdinal(stack); - mode = dWheel < 0 ? ItemSigilHolding.next(mode) : ItemSigilHolding.prev(mode); - } - - ItemSigilHolding.cycleToNextSigil(stack, mode); - BloodMagicPacketHandler.INSTANCE.sendToServer(new SigilHoldingPacketProcessor(player.inventory.currentItem, mode)); - ItemStack newStack = ItemSigilHolding.getItemStackInSlot(stack, ItemSigilHolding.getCurrentItemOrdinal(stack)); - player.sendStatusMessage(newStack.isEmpty() ? new StringTextComponent("") : newStack.getTextComponent(), true); - } - - private static TextureAtlasSprite forName(AtlasTexture textureMap, String name, String dir) { - return textureMap.registerSprite(new ResourceLocation(Constants.Mod.DOMAIN + dir + "/" + name)); - } - - public static void renderRitualStones(TileMasterRitualStone masterRitualStone, float partialTicks) { - ClientPlayerEntity player = minecraft.player; - World world = player.getEntityWorld(); - Direction direction = mrsHoloDirection; - Ritual ritual = mrsHoloRitual; - - if (ritual == null) - return; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 0.5F); - - BlockPos vec3, vX; - vec3 = masterRitualStone.getPos(); - double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks; - double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; - double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent ritualComponent : components) { - vX = vec3.add(ritualComponent.getOffset(direction)); - double minX = vX.getX() - posX; - double minY = vX.getY() - posY; - double minZ = vX.getZ() - posZ; - - if (!world.getBlockState(vX).isOpaqueCube()) { - TextureAtlasSprite texture = null; - - switch (ritualComponent.getRuneType()) { - case BLANK: - texture = ritualStoneBlank; - break; - case WATER: - texture = ritualStoneWater; - break; - case FIRE: - texture = ritualStoneFire; - break; - case EARTH: - texture = ritualStoneEarth; - break; - case AIR: - texture = ritualStoneAir; - break; - case DAWN: - texture = ritualStoneDawn; - break; - case DUSK: - texture = ritualStoneDusk; - break; - } - - RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); - } - } - - GlStateManager.popMatrix(); - } - - public static void setRitualHolo(TileMasterRitualStone masterRitualStone, Ritual ritual, Direction direction, boolean displayed) { - mrsHoloDisplay = displayed; - mrsHoloTile = masterRitualStone; - mrsHoloRitual = ritual; - mrsHoloDirection = direction; - } - - public static void setRitualHoloToNull() { - mrsHoloDisplay = false; - mrsHoloTile = null; - mrsHoloRitual = null; - mrsHoloDirection = Direction.NORTH; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java deleted file mode 100644 index 72f4cec8..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ /dev/null @@ -1,149 +0,0 @@ -package WayofTime.bloodmagic.util.handler.event; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.item.types.ComponentTypes; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.event.AltarCraftedEvent; -import WayofTime.bloodmagic.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.ItemHelper; -import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.item.ItemInscriptionTool; -import net.minecraft.item.*; -import net.minecraft.item.BannerItem; -import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.FurnaceTileEntity; -import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.event.AnvilUpdateEvent; -import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import java.util.ArrayList; -import java.util.List; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class CraftingHandler { - - // Sets the uses of crafted Inscription Tools to 10 - @SubscribeEvent - public static void onAltarCrafted(AltarCraftedEvent event) { - if (event.getOutput() == null) { - return; - } - - if (event.getOutput().getItem() instanceof ItemInscriptionTool) { - NBTHelper.checkNBT(event.getOutput()); - event.getOutput().getTagCompound().setInteger(Constants.NBT.USES, 10); - } - - if (event.getOutput().getItem() == ForgeModContainer.getInstance().universalBucket && event.getAltarRecipe().getSyphon() == 1000) { - CompoundNBT bucketTags = FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)).getTagCompound(); - event.getOutput().setTagCompound(bucketTags); - } - } - - // Handles crafting of: Revealing Upgrade Tome, Elytra Upgrade Tome, Combining Upgrade Tomes, Setting Upgrade for Trainer - @SubscribeEvent - public static void onAnvil(AnvilUpdateEvent event) { - // TODO - Azanor come back :( -// if (ConfigHandler.thaumcraftGogglesUpgrade) { -// if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged()) { -// ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); -// output = NBTHelper.checkNBT(output); -// ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.revealing"); -// ItemHelper.LivingUpgrades.setLevel(output, 1); -// event.setCost(1); -// -// event.setOutput(output); -// -// return; -// } -// } - - if (event.getLeft().getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING) { - if (event.getRight().getItem() == Items.NAME_TAG) { - ItemStack output = event.getLeft().copy(); - if (!output.hasTagCompound()) - output.setTagCompound(new CompoundNBT()); - output.getTagCompound().setString(Constants.NBT.COLOR, event.getRight().getDisplayName()); - event.setCost(1); - - event.setOutput(output); - - return; - } - - if (event.getRight().getItem() == Items.DYE) { - DyeColor dyeColor = BannerItem.getBaseColor(event.getRight()); - ItemStack output = event.getLeft().copy(); - if (!output.hasTagCompound()) - output.setTagCompound(new CompoundNBT()); - output.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(Utils.DYE_COLOR_VALUES.getOrDefault(dyeColor, 0))); - event.setCost(1); - - event.setOutput(output); - - return; - } - } - - if (event.getLeft().getItem() == Items.BOOK && event.getRight().getItem() == Items.ELYTRA && !event.getRight().isItemDamaged()) { - ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); - output = NBTHelper.checkNBT(output); - ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.elytra"); - ItemHelper.LivingUpgrades.setLevel(output, 1); - event.setCost(30); - - event.setOutput(output); - - return; - } - - if (event.getLeft().getItem() == RegistrarBloodMagicItems.UPGRADE_TOME && event.getRight().getItem() == RegistrarBloodMagicItems.UPGRADE_TOME) { - LivingArmourUpgrade leftUpgrade = ItemHelper.LivingUpgrades.getUpgrade(event.getLeft()); - if (leftUpgrade != null && !leftUpgrade.isDowngrade() && ItemHelper.LivingUpgrades.getKey(event.getLeft()).equals(ItemHelper.LivingUpgrades.getKey(event.getRight()))) { - int leftLevel = ItemHelper.LivingUpgrades.getLevel(event.getLeft()); - int rightLevel = ItemHelper.LivingUpgrades.getLevel(event.getRight()); - - if (leftLevel == rightLevel && leftLevel < leftUpgrade.getMaxTier() - 1) { - ItemStack outputStack = event.getLeft().copy(); - ItemHelper.LivingUpgrades.setLevel(outputStack, leftLevel + 1); - event.setCost(leftLevel + 2); - - event.setOutput(outputStack); - - return; - } - } - } - - if (event.getLeft().getItem() instanceof IUpgradeTrainer && event.getRight().getItem() == RegistrarBloodMagicItems.UPGRADE_TOME) { - LivingArmourUpgrade rightUpgrade = ItemHelper.LivingUpgrades.getUpgrade(event.getRight()); - if (rightUpgrade != null) { - String key = ItemHelper.LivingUpgrades.getKey(event.getRight()); - ItemStack outputStack = event.getLeft().copy(); - List keyList = new ArrayList<>(); - keyList.add(key); - if (((IUpgradeTrainer) event.getLeft().getItem()).setTrainedUpgrades(outputStack, keyList)) { - event.setCost(1); - - event.setOutput(outputStack); - } - } - } - } - - @SubscribeEvent - public static void handleFuelLevel(FurnaceFuelBurnTimeEvent event) { - if (ItemStack.areItemsEqual(event.getItemStack(), ComponentTypes.SAND_COAL.getStack())) - event.setBurnTime(FurnaceTileEntity.getItemBurnTime(new ItemStack(Items.COAL))); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 23165c69..78d5db9f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -1,565 +1,73 @@ -package WayofTime.bloodmagic.util.handler.event; +package wayoftime.bloodmagic.util.handler.event; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.event.ItemBindEvent; -import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.event.TeleposeEvent; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.iface.ISentientTool; -import WayofTime.bloodmagic.item.ItemAltarMaker; -import WayofTime.bloodmagic.item.ItemExperienceBook; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.DemonAuraPacketProcessor; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.potion.BMPotionUtils; -import WayofTime.bloodmagic.potion.PotionEventHandlers; -import WayofTime.bloodmagic.ritual.AreaDescriptor; -import WayofTime.bloodmagic.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.ritual.RitualManager; -import WayofTime.bloodmagic.ritual.types.RitualVeilOfEvil; -import WayofTime.bloodmagic.ritual.types.RitualWardOfSacrosanctity; -import WayofTime.bloodmagic.soul.DemonWillHolder; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.BindableHelper; -import WayofTime.bloodmagic.util.helper.ItemHelper; -import WayofTime.bloodmagic.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.helper.PlayerHelper; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.Goal; -import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; -import net.minecraft.entity.ai.goal.TargetGoal; -import net.minecraft.entity.ai.goal.MeleeAttackGoal; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.monster.MonsterEntity; -import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.potion.Effects; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.Hand; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; -import net.minecraftforge.event.world.ExplosionEvent; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.registry.EntityEntry; -import net.minecraftforge.fml.common.registry.EntityRegistry; - -import java.util.*; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class GenericHandler { - public static Map> bounceMapMap = new HashMap<>(); - public static Map> filledHandMapMap = new HashMap<>(); - private static Map> targetTaskMapMap = new HashMap<>(); - private static Map> attackTaskMapMap = new HashMap<>(); - public static Map> preventSpawnMap = new HashMap<>(); - public static Map> forceSpawnMap = new HashMap<>(); - public static Set featherRitualSet; - - @SubscribeEvent - public static void onEntityFall(LivingFallEvent event) { - if (event.getEntityLiving() instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - if (player.isPotionActive(RegistrarBloodMagic.BOUNCE) && !player.isSneaking() && event.getDistance() > 2) { - event.setDamageMultiplier(0); - - if (player.getEntityWorld().isRemote) { - player.motionY *= -0.9; - player.fallDistance = 0; - bounceMapMap.get(player.getEntityWorld()).put(player, player.motionY); - } else { - player.fallDistance = 0; - event.setCanceled(true); - } - } - } - } - - @SubscribeEvent - public static void playerTickPost(TickEvent.PlayerTickEvent event) { - World world = event.player.getEntityWorld(); - Map bounceMap = bounceMapMap.get(world); - if (event.phase == TickEvent.Phase.END && bounceMap.containsKey(event.player)) { - event.player.motionY = bounceMap.remove(event.player); - } - - Map filledHandMap = filledHandMapMap.get(world); - if (event.phase == TickEvent.Phase.END) { - if (filledHandMap.containsKey(event.player)) { - int value = filledHandMap.get(event.player) - 1; - if (value <= 0) { - filledHandMap.remove(event.player); - } else { - filledHandMap.put(event.player, value); - } - } - } - } - - @SubscribeEvent - public static void onPlayerClick(PlayerInteractEvent event) { - if (event.isCancelable() && event.getEntityPlayer().isPotionActive(RegistrarBloodMagic.CONSTRICT)) { - PlayerEntity player = event.getEntityPlayer(); - int level = player.getActivePotionEffect(RegistrarBloodMagic.CONSTRICT).getAmplifier(); - if (event.getHand() == Hand.OFF_HAND || level > 1) { - event.setCanceled(true); - } - } - } - - @SubscribeEvent - public static void onPlayerDropItem(ItemTossEvent event) { - ItemEntity itemEntity = event.getEntityItem(); - if (itemEntity != null) { - ItemStack stack = itemEntity.getItem(); - Item item = stack.getItem(); - if (stack.hasTagCompound() && item instanceof ISentientTool) { - if (((ISentientTool) item).spawnSentientEntityOnDrop(stack, event.getPlayer())) { - event.setCanceled(true); - } - } - } - } - - @SubscribeEvent - public static void onExplosion(ExplosionEvent.Start event) { - World world = event.getWorld(); - Explosion exp = event.getExplosion(); - Vec3d position = exp.getPosition(); - double radius = 3; - - AxisAlignedBB bb = new AxisAlignedBB(position.x - radius, position.y - radius, position.z - radius, position.x + radius, position.y + radius, position.z + radius); - List specterList = world.getEntitiesWithinAABB(EntitySentientSpecter.class, bb); - if (!specterList.isEmpty()) { - for (EntitySentientSpecter specter : specterList) { - if (specter.absorbExplosion(exp)) { - event.setCanceled(true); - return; - } - } - } - } - - @SubscribeEvent - public static void onEntityHurt(LivingHurtEvent event) { - if (event.getEntity().getEntityWorld().isRemote) - return; - - if (event.getSource().getTrueSource() instanceof PlayerEntity && !PlayerHelper.isFakePlayer((PlayerEntity) event.getSource().getTrueSource())) { - PlayerEntity player = (PlayerEntity) event.getSource().getTrueSource(); - - if (!player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty() && player.getItemStackFromSlot(EquipmentSlotType.CHEST).getItem() instanceof ItemPackSacrifice) { - ItemPackSacrifice pack = (ItemPackSacrifice) player.getItemStackFromSlot(EquipmentSlotType.CHEST).getItem(); - - boolean shouldSyphon = pack.getStoredLP(player.getItemStackFromSlot(EquipmentSlotType.CHEST)) < pack.CAPACITY; - float damageDone = event.getEntityLiving().getHealth() < event.getAmount() ? event.getAmount() - event.getEntityLiving().getHealth() : event.getAmount(); - int totalLP = Math.round(damageDone * ConfigHandler.values.coatOfArmsConversion); - - if (shouldSyphon) - ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EquipmentSlotType.CHEST), totalLP, pack.CAPACITY); - } - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.battleHunger", chestStack); - if (upgrade instanceof LivingArmourUpgradeBattleHungry) { - ((LivingArmourUpgradeBattleHungry) upgrade).resetTimer(); - } - } - } - } - } - - // Handles sending the client the Demon Will Aura updates - @SubscribeEvent - public static void onLivingUpdate(LivingUpdateEvent event) { - if (!event.getEntityLiving().getEntityWorld().isRemote) { - LivingEntity entity = event.getEntityLiving(); - if (entity instanceof PlayerEntity && entity.ticksExisted % 50 == 0) //TODO: Change to an incremental counter - { - sendPlayerDemonWillAura((PlayerEntity) entity); - } - - World world = entity.getEntityWorld(); - Map targetTaskMap = targetTaskMapMap.get(world); - Map attackTaskMap = attackTaskMapMap.get(world); - if (event.getEntityLiving() instanceof AnimalEntity) { - AnimalEntity animal = (AnimalEntity) event.getEntityLiving(); - if (animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { - if (!targetTaskMap.containsKey(animal)) { - TargetGoal task = new NearestAttackableTargetGoal<>(animal, MonsterEntity.class, false); - Goal attackTask = new MeleeAttackGoal(animal, 1.0D, false); - animal.targetTasks.addTask(1, task); - animal.tasks.addTask(1, attackTask); - targetTaskMap.put(animal, task); - attackTaskMap.put(animal, attackTask); - } - - if (animal.getAttackTarget() != null && animal.getDistanceSq(animal.getAttackTarget()) < 4) { - animal.getEntityWorld().createExplosion(null, animal.posX, animal.posY + (double) (animal.height / 16.0F), animal.posZ, 2 + animal.getActivePotionEffect(RegistrarBloodMagic.SACRIFICIAL_LAMB).getAmplifier() * 1.5f, false); - targetTaskMap.remove(animal); - attackTaskMap.remove(animal); - } - } else if (targetTaskMap.containsKey(animal)) { - targetTaskMap.remove(animal); - attackTaskMap.remove(animal); - } - } - } - - LivingEntity entity = event.getEntityLiving(); - - if (entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - if (player.isSneaking() && player.isPotionActive(RegistrarBloodMagic.CLING) && Utils.isPlayerBesideSolidBlockFace(player) && !player.onGround) { - if (player.getEntityWorld().isRemote) { - player.motionY = 0; - player.motionX *= 0.8; - player.motionZ *= 0.8; - } else { - player.fallDistance = 0; - } - } - } - - if (entity.isPotionActive(Effects.NIGHT_VISION)) { - int duration = entity.getActivePotionEffect(Effects.NIGHT_VISION).getDuration(); - if (duration == Constants.Misc.NIGHT_VISION_CONSTANT_END) { - entity.removePotionEffect(Effects.NIGHT_VISION); - } - } - - if (entity.isPotionActive(RegistrarBloodMagic.FIRE_FUSE)) { - Random random = entity.getEntityWorld().rand; - entity.getEntityWorld().spawnParticle(EnumParticleTypes.FLAME, entity.posX + random.nextDouble() * 0.3, entity.posY + random.nextDouble() * 0.3, entity.posZ + random.nextDouble() * 0.3, 0, 0.06d, 0); - - int r = entity.getActivePotionEffect(RegistrarBloodMagic.FIRE_FUSE).getAmplifier(); - int radius = r + 1; - - if (entity.getActivePotionEffect(RegistrarBloodMagic.FIRE_FUSE).getDuration() <= 3) { - entity.getEntityWorld().createExplosion(null, entity.posX, entity.posY, entity.posZ, radius, false); - } - } - - if (entity.isPotionActive(RegistrarBloodMagic.PLANT_LEECH)) { - int amplifier = entity.getActivePotionEffect(RegistrarBloodMagic.PLANT_LEECH).getAmplifier(); - int timeRemaining = entity.getActivePotionEffect(RegistrarBloodMagic.PLANT_LEECH).getDuration(); - if (timeRemaining % 10 == 0) { - BMPotionUtils.damageMobAndGrowSurroundingPlants(entity, 2 + amplifier, 1, 0.5 * 3 / (amplifier + 3), 25 * (1 + amplifier)); - } - } - } - - // @SideOnly(Side.SERVER) - public static void sendPlayerDemonWillAura(PlayerEntity player) { - if (player instanceof ServerPlayerEntity) { - BlockPos pos = player.getPosition(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(player.getEntityWorld().provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); - if (holder != null) { - BloodMagicPacketHandler.sendTo(new DemonAuraPacketProcessor(holder), (ServerPlayerEntity) player); - } else { - BloodMagicPacketHandler.sendTo(new DemonAuraPacketProcessor(new DemonWillHolder()), (ServerPlayerEntity) player); - } - } - } - - // Handles destroying altar - @SubscribeEvent - public static void harvestEvent(PlayerEvent.HarvestCheck event) { - BlockState state = event.getTargetBlock(); - Block block = state.getBlock(); - if (block instanceof BlockAltar && event.getEntityPlayer() != null && event.getEntityPlayer() instanceof ServerPlayerEntity && !event.getEntityPlayer().getHeldItemMainhand().isEmpty() && event.getEntityPlayer().getHeldItemMainhand().getItem() instanceof ItemAltarMaker) { - ItemAltarMaker altarMaker = (ItemAltarMaker) event.getEntityPlayer().getHeldItemMainhand().getItem(); - event.getEntityPlayer().sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.altarMaker.destroy", altarMaker.destroyAltar(event.getEntityPlayer())), true); - } - } - - // Handle Teleposer block blacklist - @SubscribeEvent - public static void onTelepose(TeleposeEvent event) { - if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposer().contains(event.initialState) || BloodMagicAPI.INSTANCE.getBlacklist().getTeleposer().contains(event.finalState)) - event.setCanceled(true); - } - - // Handle Teleposer entity blacklist - @SubscribeEvent - public static void onTeleposeEntity(TeleposeEvent.Ent event) { - EntityEntry entry = EntityRegistry.getEntry(event.entity.getClass()); - if (entry != null && BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName())) - event.setCanceled(true); - } - - // Sets teleport cooldown for Teleposed entities to 5 ticks (1/4 second) instead of 150 (7.5 seconds) - @SubscribeEvent - public static void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) { - event.entity.timeUntilPortal = 5; - } - - // Handles binding of IBindable's as well as setting a player's highest orb tier - @SubscribeEvent - public static void onInteract(PlayerInteractEvent.RightClickItem event) { - if (event.getWorld().isRemote) - return; - - PlayerEntity player = event.getEntityPlayer(); - - if (PlayerHelper.isFakePlayer(player)) - return; - - ItemStack held = event.getItemStack(); - if (!held.isEmpty() && held.getItem() instanceof IBindable) { // Make sure it's bindable - IBindable bindable = (IBindable) held.getItem(); - Binding binding = bindable.getBinding(held); - if (binding == null) { // If the binding is null, let's create one - if (bindable.onBind(player, held)) { - ItemBindEvent toPost = new ItemBindEvent(player, held); - if (MinecraftForge.EVENT_BUS.post(toPost)) // Allow cancellation of binding - return; - - BindableHelper.applyBinding(held, player); // Bind item to the player - } - // If the binding exists, we'll check if the player's name has changed since they last used it and update that if so. - } else if (binding.getOwnerId().equals(player.getGameProfile().getId()) && !binding.getOwnerName().equals(player.getGameProfile().getName())) { - binding.setOwnerName(player.getGameProfile().getName()); - BindableHelper.applyBinding(held, binding); - } - } - - if (!held.isEmpty() && held.getItem() instanceof IBloodOrb) { - IBloodOrb bloodOrb = (IBloodOrb) held.getItem(); - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - BloodOrb orb = bloodOrb.getOrb(held); - if (orb == null) - return; - - if (orb.getTier() > network.getOrbTier()) - network.setOrbTier(orb.getTier()); - } - } - - @SubscribeEvent - public static void selfSacrificeEvent(SacrificeKnifeUsedEvent event) { - PlayerEntity player = event.player; - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - StatTrackerSelfSacrifice.incrementCounter(armour, event.healthDrained / 2); - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack); - - if (upgrade instanceof LivingArmourUpgradeSelfSacrifice) { - double modifier = ((LivingArmourUpgradeSelfSacrifice) upgrade).getSacrificeModifier(); - - event.lpAdded = (int) (event.lpAdded * (1 + modifier)); - } - } - } - } - - // Drop Blood Shards - @SubscribeEvent - public static void onLivingDrops(LivingDropsEvent event) { - LivingEntity attackedEntity = event.getEntityLiving(); - DamageSource source = event.getSource(); - Entity entity = source.getTrueSource(); - - if (entity != null && entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - ItemStack heldStack = player.getHeldItemMainhand(); - - if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.BOUND_SWORD && !(attackedEntity instanceof AnimalEntity)) - for (int i = 0; i <= EnchantmentHelper.getLootingModifier(player); i++) - if (attackedEntity.getEntityWorld().rand.nextDouble() < 0.2) - event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0))); - } - } - - @SubscribeEvent - public static void onRitualDeath(LivingDropsEvent event) { - if (!ConfigHandler.values.wellOfSufferingDrops) { - if (event.getSource().equals(RitualManager.RITUAL_DAMAGE)) { - event.getDrops().clear(); - } - } - } - - // Experience Tome - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void onExperiencePickup(PlayerPickupXpEvent event) { - PlayerEntity player = event.getEntityPlayer(); - ItemStack itemstack = EnchantmentHelper.getEnchantedItem(Enchantments.MENDING, player); - - if (!Loader.isModLoaded("unmending")) { - if (!itemstack.isEmpty() && itemstack.isItemDamaged()) { - int i = Math.min(xpToDurability(event.getOrb().xpValue), itemstack.getItemDamage()); - event.getOrb().xpValue -= durabilityToXp(i); - itemstack.setItemDamage(itemstack.getItemDamage() - i); - } - } - - if (!player.getEntityWorld().isRemote) { - for (ItemStack stack : player.inventory.mainInventory) { - if (stack.getItem() instanceof ItemExperienceBook) { - ItemExperienceBook.addExperience(stack, event.getOrb().xpValue); - event.getOrb().xpValue = 0; - break; - } - } - } - } - - private static int xpToDurability(int xp) { - return xp * 2; - } - - private static int durabilityToXp(int durability) { - return durability / 2; - } - - // VeilOfEvil, WardOfSacrosanctity - @SubscribeEvent - public static void onLivingSpawnEvent(LivingSpawnEvent.CheckSpawn event) { - World world = event.getWorld(); - - if (!(event.getEntityLiving() instanceof MonsterEntity)) { - return; - } - - /* WardOfSacrosanctity */ - - if (preventSpawnMap.containsKey(world)) { - Map pMap = preventSpawnMap.get(world); - - if (pMap != null) { - for (Map.Entry entry : pMap.entrySet()) { - IMasterRitualStone masterRitualStone = entry.getKey(); - AreaDescriptor blockRange = entry.getValue(); - - if (masterRitualStone != null && masterRitualStone.isActive() && masterRitualStone.getCurrentRitual() instanceof RitualWardOfSacrosanctity) { - if (blockRange.offset(masterRitualStone.getBlockPos()).isWithinArea(new BlockPos(event.getX(), event.getY(), event.getZ()))) { - switch (event.getResult()) { - case ALLOW: - event.setResult(Result.DEFAULT); - break; - case DEFAULT: - event.setResult(Result.DENY); - break; - default: - break; - } - break; - } - } else { - pMap.remove(masterRitualStone); - } - } - } - } - - /* VeilOfEvil */ - - if (forceSpawnMap.containsKey(world)) { - Map fMap = forceSpawnMap.get(world); - - if (fMap != null) { - for (Map.Entry entry : fMap.entrySet()) { - IMasterRitualStone masterRitualStone = entry.getKey(); - AreaDescriptor blockRange = entry.getValue(); - - if (masterRitualStone != null && masterRitualStone.isActive() && masterRitualStone.getCurrentRitual() instanceof RitualVeilOfEvil) { - if (blockRange.offset(masterRitualStone.getBlockPos()).isWithinArea(new BlockPos(event.getX(), event.getY(), event.getZ()))) { - switch (event.getResult()) { - case DEFAULT: - event.setResult(Result.ALLOW); - break; - case DENY: - event.setResult(Result.DEFAULT); - default: - break; - } - break; - } - } else { - fMap.remove(masterRitualStone); - } - } - } - } - } - - @SubscribeEvent - public static void onWorldLoad(WorldEvent.Load event) { - World world = event.getWorld(); - bounceMapMap.computeIfAbsent(world, k -> new HashMap<>()); - filledHandMapMap.computeIfAbsent(world, k -> new HashMap<>()); - attackTaskMapMap.computeIfAbsent(world, k -> new HashMap<>()); - targetTaskMapMap.computeIfAbsent(world, k -> new HashMap<>()); - forceSpawnMap.computeIfAbsent(world, k -> new HashMap<>()); - preventSpawnMap.computeIfAbsent(world, k -> new HashMap<>()); - PotionEventHandlers.flightListMap.computeIfAbsent(world, k -> new ArrayList<>()); - PotionEventHandlers.noGravityListMap.computeIfAbsent(world, k -> new ArrayList<>()); - } - - @SubscribeEvent - public static void onWorldUnload(WorldEvent.Unload event) { - World world = event.getWorld(); - bounceMapMap.remove(world); - filledHandMapMap.remove(world); - attackTaskMapMap.remove(world); - targetTaskMapMap.remove(world); - PotionEventHandlers.flightListMap.remove(world); - PotionEventHandlers.noGravityListMap.remove(world); - } +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.event.ItemBindEvent; +import wayoftime.bloodmagic.iface.IBindable; +import wayoftime.bloodmagic.orb.BloodOrb; +import wayoftime.bloodmagic.orb.IBloodOrb; +import wayoftime.bloodmagic.util.helper.BindableHelper; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class GenericHandler +{ + // Handles binding of IBindable's as well as setting a player's highest orb tier + @SubscribeEvent + public void onInteract(PlayerInteractEvent.RightClickItem event) + { + if (event.getWorld().isRemote) + return; + + PlayerEntity player = event.getPlayer(); + + if (PlayerHelper.isFakePlayer(player)) + return; + + ItemStack held = event.getItemStack(); + if (!held.isEmpty() && held.getItem() instanceof IBindable) + { // Make sure it's bindable + IBindable bindable = (IBindable) held.getItem(); + Binding binding = bindable.getBinding(held); + if (binding == null) + { // If the binding is null, let's create one + if (bindable.onBind(player, held)) + { + ItemBindEvent toPost = new ItemBindEvent(player, held); + if (MinecraftForge.EVENT_BUS.post(toPost)) // Allow cancellation of binding + return; + + BindableHelper.applyBinding(held, player); // Bind item to the player + } + // If the binding exists, we'll check if the player's name has changed since + // they last used it and update that if so. + } else if (binding.getOwnerId().equals(player.getGameProfile().getId()) + && !binding.getOwnerName().equals(player.getGameProfile().getName())) + { + binding.setOwnerName(player.getGameProfile().getName()); + BindableHelper.applyBinding(held, binding); + } + } + + if (!held.isEmpty() && held.getItem() instanceof IBloodOrb) + { + IBloodOrb bloodOrb = (IBloodOrb) held.getItem(); + SoulNetwork network = NetworkHelper.getSoulNetwork(player); + + BloodOrb orb = bloodOrb.getOrb(held); + if (orb == null) + return; + + if (orb.getTier() > network.getOrbTier()) + network.setOrbTier(orb.getTier()); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java deleted file mode 100644 index 5c65682b..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ /dev/null @@ -1,372 +0,0 @@ -package WayofTime.bloodmagic.util.handler.event; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.soul.ItemSentientBow; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowHeal; -import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTrooper; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerFallProtect; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerGrimReaperSprint; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerJump; -import WayofTime.bloodmagic.livingArmour.upgrade.*; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.AbstractArrowEntity; -import net.minecraft.entity.projectile.ThrowableEntity; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.*; -import net.minecraft.item.ArrowItem; -import net.minecraft.item.SplashPotionItem; -import net.minecraft.item.Items; -import net.minecraft.item.UseAction; -import net.minecraft.util.Hand; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; -import net.minecraftforge.event.entity.ProjectileImpactEvent; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; -import net.minecraftforge.event.entity.living.LivingHealEvent; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class LivingArmourHandler { - - @SubscribeEvent - public static void onEntityHealed(LivingHealEvent event) { - if (event.getEntityLiving() instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) event.getEntity(); - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - double modifier = 1; - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.slowHeal", chestStack); - - if (upgrade instanceof LivingArmourUpgradeSlowHeal) { - modifier *= ((LivingArmourUpgradeSlowHeal) upgrade).getHealingModifier(); - } - - if (modifier != 1) { - event.setAmount((float) (event.getAmount() * modifier)); - } - } - } - } - } - - @SubscribeEvent - public static void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) { - PlayerEntity player = event.getEntityPlayer(); - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - double modifier = 1; - for (LivingArmourUpgrade upgrade : armour.upgradeMap.values()) { - modifier *= upgrade.getMiningSpeedModifier(player); - } - - if (modifier != 1) { - event.setNewSpeed((float) (event.getOriginalSpeed() * modifier)); - } - } - } - } - - // Applies: Storm Trooper - @SubscribeEvent - public static void onEntityJoinedWorld(EntityJoinWorldEvent event) { - Entity owner = null; - if (event.getEntity() instanceof AbstractArrowEntity) { - owner = ((AbstractArrowEntity) event.getEntity()).shootingEntity; - } else if (event.getEntity() instanceof ThrowableEntity) { - owner = ((ThrowableEntity) event.getEntity()).getThrower(); - } - - if (owner instanceof PlayerEntity) { - Entity projectile = event.getEntity(); - PlayerEntity player = (PlayerEntity) owner; - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stormTrooper", chestStack); - - if (upgrade instanceof LivingArmourUpgradeStormTrooper) { - float velocityModifier = (float) (((LivingArmourUpgradeStormTrooper) upgrade).getArrowJiggle(player) * Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ)); - - projectile.motionX += 2 * (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; - projectile.motionY += 2 * (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; - projectile.motionZ += 2 * (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; - } - } - } - } - } - - @SubscribeEvent - public static void onPlayerClick(PlayerInteractEvent event) { - if (event.isCancelable()) { - PlayerEntity player = event.getEntityPlayer(); - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - if (event.getHand() == Hand.OFF_HAND) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.crippledArm", chestStack); - - if (upgrade instanceof LivingArmourUpgradeCrippledArm) { - event.setCanceled(true); - } - } - - if (event.getItemStack().getItemUseAction() == UseAction.DRINK) { - ItemStack drinkStack = event.getItemStack(); - if (!(drinkStack.getItem() instanceof SplashPotionItem)) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack); - - if (upgrade instanceof LivingArmourUpgradeQuenched) { - event.setCanceled(true); - } - } - } - } - } - } - } - - // Applies: Grim Reaper - @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onEntityDeath(LivingDeathEvent event) { - if (event.getEntityLiving() instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - StatTrackerGrimReaperSprint.incrementCounter(armour); - - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.grimReaper", chestStack); - - if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint && ((LivingArmourUpgradeGrimReaperSprint) upgrade).canSavePlayer(player)) { - ((LivingArmourUpgradeGrimReaperSprint) upgrade).applyEffectOnRebirth(player); - event.setCanceled(true); - event.setResult(Event.Result.DENY); - } - - armour.writeDirtyToNBT(ItemLivingArmour.getArmourTag(chestStack)); - } - } - } - } - - // Applies: Jump - @SubscribeEvent - public static void onJumpEvent(LivingEvent.LivingJumpEvent event) { - if (event.getEntityLiving() instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - StatTrackerJump.incrementCounter(armour); - - if (!player.isSneaking()) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.jump", chestStack); - - if (upgrade instanceof LivingArmourUpgradeJump) { - player.motionY += ((LivingArmourUpgradeJump) upgrade).getJumpModifier(); - } - } - } - } - } - } - - // Applies: Step Assist, Speed Boost - @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { - if (event.getEntityLiving() instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - boolean hasAssist = false; - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { - hasAssist = true; - player.stepHeight = Constants.Misc.ALTERED_STEP_HEIGHT; - } else { - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour != null) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stepAssist", chestStack); - - if (upgrade instanceof LivingArmourUpgradeStepAssist) { - if (!player.isSneaking()) { - player.stepHeight = ((LivingArmourUpgradeStepAssist) upgrade).getStepAssist(); - hasAssist = true; - } else { - player.stepHeight = 0.6F; - } - } - } - } - } - - if (!hasAssist && player.stepHeight == Constants.Misc.ALTERED_STEP_HEIGHT) - player.stepHeight = 0.6f; - - float percentIncrease = 0; - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack); - if (armour != null) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.movement", chestStack); - - if (upgrade instanceof LivingArmourUpgradeSpeed) { - percentIncrease += ((LivingArmourUpgradeSpeed) upgrade).getSpeedModifier(); - } - } - } - - if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { - int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); - { - percentIncrease += (i + 1) * 0.5f; - } - } - - if (percentIncrease > 0 && (player.onGround || player.capabilities.isFlying) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0)) { - player.travel(player.moveStrafing * percentIncrease, 0, player.moveForward * percentIncrease); - } - } - } - - // Applies: Arrow Shot - // Tracks: Arrow Shot - @SubscribeEvent - public static void onArrowFire(ArrowLooseEvent event) { - World world = event.getEntityPlayer().getEntityWorld(); - ItemStack stack = event.getBow(); - PlayerEntity player = event.getEntityPlayer(); - boolean sentientShot = false; - - if (world.isRemote) - return; - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - StatTrackerArrowShot.incrementCounter(armour); - - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.arrowShot", chestStack); - if (upgrade instanceof LivingArmourUpgradeArrowShot) { - int charge = event.getCharge(); - float velocity = (float) charge / 20.0F; - velocity = (velocity * velocity + velocity * 2.0F) / 3.0F; - - if ((double) velocity < 0.1D) - return; - - if (velocity > 1.0F) - velocity = 1.0F; - if (event.getBow().getItem() instanceof ItemSentientBow) { - sentientShot = true; - } - int extraArrows = ((LivingArmourUpgradeArrowShot) upgrade).getExtraArrows(); - for (int n = 0; n < extraArrows; n++) { - ItemStack arrowStack = new ItemStack(Items.ARROW); - ArrowItem itemarrow = (ArrowItem) ((stack.getItem() instanceof ArrowItem ? arrowStack.getItem() : Items.ARROW)); - AbstractArrowEntity entityarrow; - if (sentientShot) { // if the arrow was fired from a sentient bow - ItemSentientBow sentientBow = (ItemSentientBow) stack.getItem(); - entityarrow = sentientBow.getDuplicateArrow(stack, world, player, 1 / extraArrows); - } else { - entityarrow = itemarrow.createArrow(world, arrowStack, player); - } - entityarrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, velocity * 3.0F, 1.0F); - entityarrow.addTag("arrow_shot"); - float velocityModifier = 0.6f * velocity; - - entityarrow.motionX += (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; - entityarrow.motionY += (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; - entityarrow.motionZ += (event.getWorld().rand.nextDouble() - 0.5) * velocityModifier; - - if (velocity == 1.0F) - entityarrow.setIsCritical(true); - - int powerLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, stack); - - if (powerLevel > 0) - entityarrow.setDamage(entityarrow.getDamage() + (double) powerLevel * 0.5D + 0.5D); - - int punchLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - - if (punchLevel > 0) - entityarrow.setKnockbackStrength(punchLevel); - - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) - entityarrow.setFire(100); - - entityarrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; - - world.spawnEntity(entityarrow); - } - } - } - } - } - - // Applies: Softfall - @SubscribeEvent - public static void onPlayerFall(LivingFallEvent event) { - if (event.getEntityLiving() instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - - if (LivingArmour.hasFullSet(player)) { - - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - StatTrackerFallProtect.incrementCounter(armour, event.getDamageMultiplier() * (event.getDistance() - 3)); - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.fallProtect", chestStack); - if (upgrade instanceof LivingArmourUpgradeFallProtect) { - LivingArmourUpgradeFallProtect fallUpgrade = (LivingArmourUpgradeFallProtect) upgrade; - event.setDamageMultiplier(event.getDamageMultiplier() * fallUpgrade.getDamageMultiplier()); - } - } - } - } - } - - // Applies: Arrow Shot - @SubscribeEvent - public static void onProjectileImpact(ProjectileImpactEvent.Arrow event) { - if (event.getArrow().removeTag("arrow_shot")) { - Entity entity = event.getRayTraceResult().entityHit; - - if (entity != null) { - entity.hurtResistantTime = 0; - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java deleted file mode 100644 index 163e3ef9..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ /dev/null @@ -1,175 +0,0 @@ -package WayofTime.bloodmagic.util.handler.event; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.armour.ItemSentientArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.tracker.*; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ShovelItem; -import net.minecraft.potion.Effects; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.MathHelper; -import net.minecraftforge.event.entity.living.LivingHealEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.player.AttackEntityEvent; -import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class StatTrackerHandler { - - private static float lastPlayerSwingStrength = 0; - - // Tracks: Digging, DigSlowdown - @SubscribeEvent - public static void blockBreakEvent(BlockEvent.BreakEvent event) { - PlayerEntity player = event.getPlayer(); - if (player != null) { - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - if (chestStack.getItem() instanceof ItemLivingArmour) { - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - - if (armour != null) { - StatTrackerDigging.incrementCounter(armour); - LivingArmourUpgradeDigging.hasDug(armour); - } - } - } - } - } - - // Tracks: Health Boost - @SubscribeEvent - public static void onEntityHealed(LivingHealEvent event) { - LivingEntity healedEntity = event.getEntityLiving(); - if (!(healedEntity instanceof PlayerEntity)) { - return; - } - - PlayerEntity player = (PlayerEntity) healedEntity; - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - StatTrackerHealthboost.incrementCounter(armour, event.getAmount()); - if (player.getEntityWorld().canSeeSky(player.getPosition()) && player.getEntityWorld().provider.isDaytime()) { - StatTrackerSolarPowered.incrementCounter(armour, event.getAmount()); - } - } - } - } - - @SubscribeEvent - public static void onLivingAttack(AttackEntityEvent event) { - lastPlayerSwingStrength = event.getEntityPlayer().getCooledAttackStrength(0); - } - - // Tracks: Fall Protect, Arrow Protect, Physical Protect, Grave Digger, Sprint Attack, Critical Strike, Nocturnal Prowess - @SubscribeEvent - public static void entityHurt(LivingHurtEvent event) { - DamageSource source = event.getSource(); - Entity sourceEntity = event.getSource().getTrueSource(); - LivingEntity attackedEntity = event.getEntityLiving(); - - if (attackedEntity instanceof PlayerEntity) { - PlayerEntity attackedPlayer = (PlayerEntity) attackedEntity; - - // Living Armor Handling - if (LivingArmour.hasFullSet(attackedPlayer)) { - float amount = Math.min(Utils.getModifiedDamage(attackedPlayer, event.getSource(), event.getAmount()), attackedPlayer.getHealth()); - ItemStack chestStack = attackedPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - if (sourceEntity != null && !source.isMagicDamage() && !source.isProjectile()) - StatTrackerPhysicalProtect.incrementCounter(armour, amount); - - if (source.equals(DamageSource.FALL)) - StatTrackerFallProtect.incrementCounter(armour, amount); - - if (source.isProjectile()) - StatTrackerArrowProtect.incrementCounter(armour, amount); - } - } else { - ItemStack chestStack = attackedPlayer.getItemStackFromSlot(EquipmentSlotType.CHEST); - if (chestStack.getItem() instanceof ItemSentientArmour) { - ItemSentientArmour armour = (ItemSentientArmour) chestStack.getItem(); - armour.onPlayerAttacked(chestStack, source, attackedPlayer); - } - } - } - - if (sourceEntity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) sourceEntity; - - // Living Armor Handling - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - ItemStack mainWeapon = player.getItemStackFromSlot(EquipmentSlotType.MAINHAND); - - event.setAmount((float) (event.getAmount() + lastPlayerSwingStrength * armour.getAdditionalDamageOnHit(event.getAmount(), player, attackedEntity, mainWeapon))); - - float amount = Math.min(Utils.getModifiedDamage(attackedEntity, event.getSource(), event.getAmount()), attackedEntity.getHealth()); - - if (!source.isProjectile()) { - StatTrackerMeleeDamage.incrementCounter(armour, amount); - - if (player.getEntityWorld().getLight(player.getPosition()) <= 9) - StatTrackerNightSight.incrementCounter(armour, amount); - - if (mainWeapon.getItem() instanceof ShovelItem) - StatTrackerGraveDigger.incrementCounter(armour, amount); - - if (player.isSprinting()) - StatTrackerSprintAttack.incrementCounter(armour, amount); - - boolean isCritical = lastPlayerSwingStrength > 0.9 && player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Effects.BLINDNESS) && !player.isRiding() && !player.isSprinting(); - if (isCritical) - StatTrackerCriticalStrike.incrementCounter(armour, amount); - - double kb = armour.getKnockbackOnHit(player, attackedEntity, mainWeapon); - if (kb > 0) - attackedEntity.knockBack(player, (float) kb * 0.5F, (double) MathHelper.sin(player.rotationYaw * 0.017453292F), (double) (-MathHelper.cos(player.rotationYaw * 0.017453292F))); - } - } - } - } - } - - // Tracks: Experienced - @SubscribeEvent(priority = EventPriority.LOW) - public static void onExperiencePickup(PlayerPickupXpEvent event) { - PlayerEntity player = event.getEntityPlayer(); - - if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); - if (armour != null) { - LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.experienced", chestStack); - if (upgrade instanceof LivingArmourUpgradeExperience) { - double modifier = ((LivingArmourUpgradeExperience) upgrade).getExperienceModifier(); - double exp = event.getOrb().xpValue * (1 + modifier); - - event.getOrb().xpValue = (int) Math.floor(exp) + (Math.random() < exp % 1 ? 1 : 0); - } - - StatTrackerExperience.incrementCounter(armour, event.getOrb().xpValue); - } - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 0380cf30..6f01c0e6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,166 +1,115 @@ -package WayofTime.bloodmagic.util.handler.event; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.soul.*; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.demonAura.PosXY; -import WayofTime.bloodmagic.demonAura.WillChunk; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.monster.MonsterEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IndirectEntityDamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.Difficulty; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.world.ChunkDataEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; +package wayoftime.bloodmagic.util.handler.event; import java.util.HashMap; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class WillHandler { +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.MobEntity; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.EffectInstance; +import net.minecraft.util.DamageSource; +import net.minecraft.world.Difficulty; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.potion.BloodMagicPotions; +import wayoftime.bloodmagic.will.EnumDemonWillType; +import wayoftime.bloodmagic.will.IDemonWill; +import wayoftime.bloodmagic.will.IDemonWillWeapon; +import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - private static final HashMap SERVER_TICKS = new HashMap<>(); +@Mod.EventBusSubscriber(modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class WillHandler +{ + private static final HashMap SERVER_TICKS = new HashMap<>(); - // Adds Will to player - @SubscribeEvent - public static void onItemPickup(EntityItemPickupEvent event) { - ItemStack stack = event.getItem().getItem(); - if (stack.getItem() instanceof IDemonWill) { - PlayerEntity player = event.getEntityPlayer(); - EnumDemonWillType pickupType = ((IDemonWill) stack.getItem()).getType(stack); - ItemStack remainder = PlayerDemonWillHandler.addDemonWill(player, stack); + // Adds Will to player + @SubscribeEvent + public void onItemPickup(EntityItemPickupEvent event) + { + ItemStack stack = event.getItem().getItem(); + if (stack.getItem() instanceof IDemonWill) + { + PlayerEntity player = event.getPlayer(); + EnumDemonWillType pickupType = ((IDemonWill) stack.getItem()).getType(stack); + ItemStack remainder = PlayerDemonWillHandler.addDemonWill(player, stack); - if (remainder == null || ((IDemonWill) stack.getItem()).getWill(pickupType, stack) < 0.0001 || PlayerDemonWillHandler.isDemonWillFull(pickupType, player)) { - stack.setCount(0); - event.setResult(Event.Result.ALLOW); - } - } - } + if (remainder == null || ((IDemonWill) stack.getItem()).getWill(pickupType, stack) < 0.0001 + || PlayerDemonWillHandler.isDemonWillFull(pickupType, player)) + { + stack.setCount(0); + event.setResult(Event.Result.ALLOW); + } + } + } - @SubscribeEvent - public static void onEntityAttacked(LivingDeathEvent event) { - if (event.getSource() instanceof IndirectEntityDamageSource) { - Entity sourceEntity = event.getSource().getImmediateSource(); +// @SubscribeEvent +// public static void onEntityAttacked(LivingDeathEvent event) +// { +// if (event.getSource() instanceof EntityDamageSourceIndirect) +// { +// Entity sourceEntity = event.getSource().getImmediateSource(); +// +// if (sourceEntity instanceof EntitySentientArrow) +// { +// ((EntitySentientArrow) sourceEntity).reimbursePlayer(event.getEntityLiving(), event.getEntityLiving().getMaxHealth()); +// } +// } +// } - if (sourceEntity instanceof EntitySentientArrow) { - ((EntitySentientArrow) sourceEntity).reimbursePlayer(event.getEntityLiving(), event.getEntityLiving().getMaxHealth()); - } - } - } + // Add/Drop Demon Will for Player + @SubscribeEvent + public void onLivingDrops(LivingDropsEvent event) + { + LivingEntity attackedEntity = event.getEntityLiving(); + DamageSource source = event.getSource(); + Entity entity = source.getTrueSource(); - // Add/Drop Demon Will for Player - @SubscribeEvent - public static void onLivingDrops(LivingDropsEvent event) { - LivingEntity attackedEntity = event.getEntityLiving(); - DamageSource source = event.getSource(); - Entity entity = source.getTrueSource(); + if (attackedEntity.isPotionActive(BloodMagicPotions.soulSnare) && (attackedEntity instanceof MobEntity + || attackedEntity.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL)) + { + EffectInstance eff = attackedEntity.getActivePotionEffect(BloodMagicPotions.soulSnare); + int lvl = eff.getAmplifier(); - if (attackedEntity.isPotionActive(RegistrarBloodMagic.SOUL_SNARE) && (attackedEntity instanceof MonsterEntity || attackedEntity.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL)) { - EffectInstance eff = attackedEntity.getActivePotionEffect(RegistrarBloodMagic.SOUL_SNARE); - int lvl = eff.getAmplifier(); + double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 4 + 1; + ItemStack soulStack = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()).createWill(amountOfSouls); + event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.getPosX(), attackedEntity.getPosY(), attackedEntity.getPosZ(), soulStack)); + } - double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 5; - ItemStack soulStack = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL).createWill(0, amountOfSouls); - event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack)); - } + if (entity != null && entity instanceof PlayerEntity) + { + PlayerEntity player = (PlayerEntity) entity; + ItemStack heldStack = player.getHeldItemMainhand(); + if (heldStack.getItem() instanceof IDemonWillWeapon && !player.getEntityWorld().isRemote) + { + IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem(); + List droppedSouls = demonWillWeapon.getRandomDemonWillDrop(attackedEntity, player, heldStack, event.getLootingLevel()); + if (!droppedSouls.isEmpty()) + { + ItemStack remainder; + for (ItemStack willStack : droppedSouls) + { + remainder = PlayerDemonWillHandler.addDemonWill(player, willStack); - if (entity != null && entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; - ItemStack heldStack = player.getHeldItemMainhand(); - if (heldStack.getItem() instanceof IDemonWillWeapon && !player.getEntityWorld().isRemote) { - IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem(); - List droppedSouls = demonWillWeapon.getRandomDemonWillDrop(attackedEntity, player, heldStack, event.getLootingLevel()); - if (!droppedSouls.isEmpty()) { - ItemStack remainder; - for (ItemStack willStack : droppedSouls) { - remainder = PlayerDemonWillHandler.addDemonWill(player, willStack); - - if (!remainder.isEmpty()) { - EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder); - if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001) { - event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, remainder)); - } - } - } - player.inventoryContainer.detectAndSendChanges(); - } - } - } - } - - @SubscribeEvent - public static void onServerWorldTick(TickEvent.WorldTickEvent event) { - if (event.world.isRemote) - return; - - int dim = event.world.provider.getDimension(); - if (event.phase == TickEvent.Phase.END) { - if (!SERVER_TICKS.containsKey(dim)) - SERVER_TICKS.put(dim, 0); - - int ticks = (SERVER_TICKS.get(dim)); - - if (ticks % 20 == 0) { - CopyOnWriteArrayList dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(dim); - if ((dirtyChunks != null) && (dirtyChunks.size() > 0)) { - for (PosXY pos : dirtyChunks) - event.world.markChunkDirty(new BlockPos(pos.x * 16, 5, pos.y * 16), null); - - dirtyChunks.clear(); - } - } - - SERVER_TICKS.put(dim, ticks + 1); - } - - } - - @SubscribeEvent - public static void chunkSave(ChunkDataEvent.Save event) { - int dim = event.getWorld().provider.getDimension(); - ChunkPos loc = event.getChunk().getPos(); - - CompoundNBT nbt = new CompoundNBT(); - event.getData().setTag("BloodMagic", nbt); - - WillChunk ac = WorldDemonWillHandler.getWillChunk(dim, loc.x, loc.z); - if (ac != null) { - nbt.putShort("base", ac.getBase()); - ac.getCurrentWill().writeToNBT(nbt, "current"); - if (!event.getChunk().isLoaded()) - WorldDemonWillHandler.removeWillChunk(dim, loc.x, loc.z); - } - } - - @SubscribeEvent - public static void chunkLoad(ChunkDataEvent.Load event) { - int dim = event.getWorld().provider.getDimension(); - if (event.getData().getCompoundTag("BloodMagic").hasKey("base")) { - CompoundNBT nbt = event.getData().getCompoundTag("BloodMagic"); - short base = nbt.getShort("base"); - DemonWillHolder current = new DemonWillHolder(); - current.readFromNBT(nbt, "current"); - WorldDemonWillHandler.addWillChunk(dim, event.getChunk(), base, current); - } else { - WorldDemonWillHandler.generateWill(event.getChunk()); - } - } + if (!remainder.isEmpty()) + { + EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder); + if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001) + { + event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.getPosX(), attackedEntity.getPosY(), attackedEntity.getPosZ(), remainder)); + } + } + } + player.container.detectAndSendChanges(); + } + } + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java index 63b7dc3b..061e6c6a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java @@ -1,49 +1,54 @@ -package WayofTime.bloodmagic.util.helper; +package wayoftime.bloodmagic.util.helper; -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.event.ItemBindEvent; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.event.ItemBindEvent; +import wayoftime.bloodmagic.util.Constants; -public class BindableHelper { +public class BindableHelper +{ - public static void applyBinding(ItemStack stack, PlayerEntity player) { - Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); - applyBinding(stack, binding); - } + public static void applyBinding(ItemStack stack, PlayerEntity player) + { + Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); + applyBinding(stack, binding); + } - public static void applyBinding(ItemStack stack, Binding binding) { - if (!stack.hasTagCompound()) - stack.setTagCompound(new CompoundNBT()); + public static void applyBinding(ItemStack stack, Binding binding) + { + if (!stack.hasTag()) + stack.setTag(new CompoundNBT()); - stack.getTagCompound().setTag("binding", binding.serializeNBT()); - } + stack.getTag().put("binding", binding.serializeNBT()); + } - /** - * Sets the Owner Name of the item without checking if it is already bound. - * Also bypasses {@link ItemBindEvent}. - * - * @param stack - The ItemStack to bind - * @param ownerName - The username to bind the ItemStack to - */ - public static void setItemOwnerName(ItemStack stack, String ownerName) { - stack = NBTHelper.checkNBT(stack); + /** + * Sets the Owner Name of the item without checking if it is already bound. Also + * bypasses {@link ItemBindEvent}. + * + * @param stack - The ItemStack to bind + * @param ownerName - The username to bind the ItemStack to + */ + public static void setItemOwnerName(ItemStack stack, String ownerName) + { + stack = NBTHelper.checkNBT(stack); - stack.getTagCompound().setString(Constants.NBT.OWNER_NAME, ownerName); - } + stack.getTag().putString(Constants.NBT.OWNER_NAME, ownerName); + } - /** - * Sets the Owner UUID of the item without checking if it is already bound. - * Also bypasses {@link ItemBindEvent}. - * - * @param stack - The ItemStack to bind - * @param ownerUUID - The UUID to bind the ItemStack to - */ - public static void setItemOwnerUUID(ItemStack stack, String ownerUUID) { - stack = NBTHelper.checkNBT(stack); + /** + * Sets the Owner UUID of the item without checking if it is already bound. Also + * bypasses {@link ItemBindEvent}. + * + * @param stack - The ItemStack to bind + * @param ownerUUID - The UUID to bind the ItemStack to + */ + public static void setItemOwnerUUID(ItemStack stack, String ownerUUID) + { + stack = NBTHelper.checkNBT(stack); - stack.getTagCompound().setString(Constants.NBT.OWNER_UUID, ownerUUID); - } -} + stack.getTag().putString(Constants.NBT.OWNER_UUID, ownerUUID); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java deleted file mode 100644 index 9e5796f5..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -public class IncenseHelper { - - public static double getCurrentIncense(PlayerEntity player) { - CompoundNBT data = player.getEntityData(); - if (data.hasKey(Constants.NBT.CURRENT_INCENSE)) { - return data.getDouble(Constants.NBT.CURRENT_INCENSE); - } - - return 0; - } - - public static void setCurrentIncense(PlayerEntity player, double amount) { - CompoundNBT data = player.getEntityData(); - data.setDouble(Constants.NBT.CURRENT_INCENSE, amount); - } - - public static void setMaxIncense(PlayerEntity player, double amount) { - CompoundNBT data = player.getEntityData(); - data.setDouble(Constants.NBT.MAX_INCENSE, amount); - } - - public static double getMaxIncense(PlayerEntity player) { - CompoundNBT data = player.getEntityData(); - if (data.hasKey(Constants.NBT.MAX_INCENSE)) { - return data.getDouble(Constants.NBT.MAX_INCENSE); - } - return 0; - } - - public static void setHasMaxIncense(ItemStack stack, PlayerEntity player, boolean isMax) { - stack = NBTHelper.checkNBT(stack); - stack.getTagCompound().setBoolean(Constants.NBT.HAS_MAX_INCENSE, isMax); - } - - public static boolean getHasMaxIncense(ItemStack stack) { - stack = NBTHelper.checkNBT(stack); - return stack.getTagCompound().getBoolean(Constants.NBT.HAS_MAX_INCENSE); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java deleted file mode 100644 index a0e53917..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java +++ /dev/null @@ -1,131 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.altar.IBloodAltar; -import WayofTime.bloodmagic.iface.IItemLPContainer; -import WayofTime.bloodmagic.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.item.ItemUpgradeTome; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class ItemHelper { - // IItemLPContainer - public static class LPContainer { - /** - * Attempts to fill an altar with the contained LP - * - * @param altar - The altar in question - * @param itemStack - The {@link IItemLPContainer} ItemStack filling the altar - * @param world - The world - * @param altarPos - The position of the altar - * @return Whether or not the altar was filled (or at least attempted) - */ - public static boolean tryAndFillAltar(IBloodAltar altar, ItemStack itemStack, World world, BlockPos altarPos) { - if (itemStack.getItem() instanceof IItemLPContainer) { - if (!altar.isActive()) { - IItemLPContainer fillable = (IItemLPContainer) itemStack.getItem(); - int amount = fillable.getStoredLP(itemStack); - - if (amount > 0) { - int filledAmount = altar.fillMainTank(amount); - amount -= filledAmount; - fillable.setStoredLP(itemStack, amount); - world.notifyBlockUpdate(altarPos, world.getBlockState(altarPos), world.getBlockState(altarPos), 3); - return true; - } - } - } - - return false; - } - - /** - * Adds the given LP into the {@link IItemLPContainer}'s storage - * - * @param stack - The item in question - * @param toAdd - How much LP should be added to the item - * @param maxCapacity - The item's maximum holding capacity - * @return Whether or not LP was added to the item - */ - public static boolean addLPToItem(ItemStack stack, int toAdd, int maxCapacity) { - if (stack.getItem() instanceof IItemLPContainer) { - IItemLPContainer fillable = (IItemLPContainer) stack.getItem(); - stack = NBTHelper.checkNBT(stack); - - if (toAdd < 0) - toAdd = 0; - - if (toAdd > maxCapacity) - toAdd = maxCapacity; - - fillable.setStoredLP(stack, Math.min(fillable.getStoredLP(stack) + toAdd, maxCapacity)); - return true; - } - - return false; - } - } - - public static class LivingUpgrades { - public static LivingArmourUpgrade getUpgrade(ItemStack stack) { - if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { - String key = getKey(stack); - int level = getLevel(stack); - - return LivingArmourHandler.generateUpgradeFromKey(key, level); - } - - return null; - } - - public static void setUpgrade(ItemStack stack, LivingArmourUpgrade upgrade) { - if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { - setKey(stack, upgrade.getUniqueIdentifier()); - setLevel(stack, upgrade.getUpgradeLevel()); - } - } - - public static void setKey(ItemStack stack, String key) { - if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - tag.putString("key", key); - } - } - - public static String getKey(ItemStack stack) { - if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - return tag.getString("key"); - } - - return ""; - } - - public static void setLevel(ItemStack stack, int level) { - if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - tag.putInt("level", level); - } - } - - public static int getLevel(ItemStack stack) { - if (stack.getItem() instanceof ItemUpgradeTome || stack.getItem() instanceof IUpgradeTrainer) { - NBTHelper.checkNBT(stack); - CompoundNBT tag = stack.getTagCompound(); - - return tag.getInt("level"); - } - - return 0; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java index 691fb556..f7fdaa52 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java @@ -1,13 +1,15 @@ -package WayofTime.bloodmagic.util.helper; +package wayoftime.bloodmagic.util.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -public class NBTHelper { - public static ItemStack checkNBT(ItemStack stack) { - if (stack.getTagCompound() == null) - stack.setTagCompound(new CompoundNBT()); +public class NBTHelper +{ + public static ItemStack checkNBT(ItemStack stack) + { + if (stack.getTag() == null) + stack.setTag(new CompoundNBT()); - return stack; - } -} + return stack; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index b16d47b2..1eca73c4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -1,107 +1,117 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.core.data.Binding; -import WayofTime.bloodmagic.core.data.SoulTicket; -import WayofTime.bloodmagic.event.SoulNetworkEvent; -import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.core.data.BMWorldSavedData; -import WayofTime.bloodmagic.core.data.SoulNetwork; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.MinecraftForge; +package wayoftime.bloodmagic.util.helper; import java.util.UUID; -public class NetworkHelper { - // Get +import javax.annotation.Nullable; - /** - * Gets the SoulNetwork for the player. - * - * @param uuid - The UUID of the SoulNetwork owner - this is UUID.toString(). - * @return - The SoulNetwork for the given name. - */ - public static SoulNetwork getSoulNetwork(String uuid) { - World world = DimensionManager.getWorld(0); - if (world == null || world.getMapStorage() == null) //Hack-ish way to fix the lava crystal. - return new BMWorldSavedData().getNetwork(UUID.fromString(uuid)); +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.storage.DimensionSavedDataManager; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.server.ServerLifecycleHooks; +import wayoftime.bloodmagic.core.data.BMWorldSavedData; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.core.registry.OrbRegistry; +import wayoftime.bloodmagic.event.SoulNetworkEvent; +import wayoftime.bloodmagic.iface.IBindable; +import wayoftime.bloodmagic.orb.BloodOrb; +import wayoftime.bloodmagic.orb.IBloodOrb; - BMWorldSavedData saveData = (BMWorldSavedData) world.getMapStorage().getOrLoadData(BMWorldSavedData.class, BMWorldSavedData.ID); +public class NetworkHelper +{ + @Nullable + private static BMWorldSavedData dataHandler; - if (saveData == null) { - saveData = new BMWorldSavedData(); - world.getMapStorage().setData(BMWorldSavedData.ID, saveData); - } + /** + * Gets the SoulNetwork for the player. + * + * @param uuid - The UUID of the SoulNetwork owner - this is UUID.toString(). + * @return - The SoulNetwork for the given name. + */ + public static SoulNetwork getSoulNetwork(String uuid) + { + if (dataHandler == null) + { + if (ServerLifecycleHooks.getCurrentServer() == null) + return null; - return saveData.getNetwork(UUID.fromString(uuid)); - } + DimensionSavedDataManager savedData = ServerLifecycleHooks.getCurrentServer().func_241755_D_().getSavedData(); + dataHandler = savedData.getOrCreate(() -> new BMWorldSavedData(), BMWorldSavedData.ID); + } - /** - * @param uuid - The Player's Mojang UUID - * @see NetworkHelper#getSoulNetwork(String) - */ - public static SoulNetwork getSoulNetwork(UUID uuid) { - return getSoulNetwork(uuid.toString()); - } + return dataHandler.getNetwork(UUID.fromString(uuid)); + } - /** - * @param player - The Player - * @see NetworkHelper#getSoulNetwork(String) - */ - public static SoulNetwork getSoulNetwork(PlayerEntity player) { - return getSoulNetwork(PlayerHelper.getUUIDFromPlayer(player)); - } + /** + * @param uuid - The Player's Mojang UUID + * @see NetworkHelper#getSoulNetwork(String) + */ + public static SoulNetwork getSoulNetwork(UUID uuid) + { + return getSoulNetwork(uuid.toString()); + } - public static SoulNetwork getSoulNetwork(Binding binding) { - return getSoulNetwork(binding.getOwnerId()); - } + /** + * @param player - The Player + * @see NetworkHelper#getSoulNetwork(String) + */ + public static SoulNetwork getSoulNetwork(PlayerEntity player) + { + return getSoulNetwork(PlayerHelper.getUUIDFromPlayer(player)); + } - /** - * Gets the current orb tier of the SoulNetwork. - * - * @param soulNetwork - SoulNetwork to get the tier of. - * @return - The Orb tier of the given SoulNetwork - */ - public static int getCurrentMaxOrb(SoulNetwork soulNetwork) { - return soulNetwork.getOrbTier(); - } + public static SoulNetwork getSoulNetwork(Binding binding) + { + return getSoulNetwork(binding.getOwnerId()); + } - public static int getMaximumForTier(int tier) { - int ret = 0; + /** + * Gets the current orb tier of the SoulNetwork. + * + * @param soulNetwork - SoulNetwork to get the tier of. + * @return - The Orb tier of the given SoulNetwork + */ + public static int getCurrentMaxOrb(SoulNetwork soulNetwork) + { + return soulNetwork.getOrbTier(); + } - if (tier > OrbRegistry.getTierMap().size() || tier < 0) - return ret; + public static int getMaximumForTier(int tier) + { + int ret = 0; - for (ItemStack orbStack : OrbRegistry.getOrbsForTier(tier)) { - BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); - if (orb.getCapacity() > ret) - ret = orb.getCapacity(); - } + if (tier > OrbRegistry.getTierMap().size() || tier < 0) + return ret; - return ret; - } + for (ItemStack orbStack : OrbRegistry.getOrbsForTier(tier)) + { + BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); + if (orb.getCapacity() > ret) + ret = orb.getCapacity(); + } - // Syphon + return ret; + } - /** - * Syphons from the player and damages them if there was not enough stored - * LP. - *

    - * Handles null-checking the player for you. - * - * @param soulNetwork - SoulNetwork to syphon from - * @param user - User of the item. - * @param toSyphon - Amount of LP to syphon - * @return - Whether the action should be performed. - * @deprecated Use {@link #getSoulNetwork(PlayerEntity)} and {@link SoulNetwork#syphonAndDamage$(PlayerEntity, SoulTicket)} - */ - @Deprecated - public static boolean syphonAndDamage(SoulNetwork soulNetwork, PlayerEntity user, int toSyphon) { + // Syphon + + /** + * Syphons from the player and damages them if there was not enough stored LP. + *

    + * Handles null-checking the player for you. + * + * @param soulNetwork - SoulNetwork to syphon from + * @param user - User of the item. + * @param toSyphon - Amount of LP to syphon + * @return - Whether the action should be performed. + * @deprecated Use {@link #getSoulNetwork(PlayerEntity)} and + * {@link SoulNetwork#syphonAndDamage$(PlayerEntity, SoulTicket)} + */ + @Deprecated + public static boolean syphonAndDamage(SoulNetwork soulNetwork, PlayerEntity user, int toSyphon) + { // if (soulNetwork.getNewOwner() == null) // { @@ -109,59 +119,62 @@ public class NetworkHelper { // return true; // } - return soulNetwork.syphonAndDamage(user, toSyphon); - } + return soulNetwork.syphonAndDamage(user, toSyphon); + } - /** - * Syphons a player from within a container. - * - * @param stack - ItemStack in the Container. - * @param ticket - SoulTicket to syphon - * @return - If the syphon was successful. - */ - public static boolean syphonFromContainer(ItemStack stack, SoulTicket ticket) { - if (!(stack.getItem() instanceof IBindable)) - return false; + /** + * Syphons a player from within a container. + * + * @param stack - ItemStack in the Container. + * @param ticket - SoulTicket to syphon + * @return - If the syphon was successful. + */ + public static boolean syphonFromContainer(ItemStack stack, SoulTicket ticket) + { + if (!(stack.getItem() instanceof IBindable)) + return false; - Binding binding = ((IBindable) stack.getItem()).getBinding(stack); - if (binding == null) - return false; + Binding binding = ((IBindable) stack.getItem()).getBinding(stack); + if (binding == null) + return false; - SoulNetwork network = getSoulNetwork(binding); - SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, ticket, stack); + SoulNetwork network = getSoulNetwork(binding); + SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, ticket, stack); - return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(), true) >= ticket.getAmount(); - } + return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(), true) >= ticket.getAmount(); + } - /** - * Checks if the ItemStack has a user to be syphoned from. - * - * @param stack - ItemStack to check - * @param toSyphon - Amount of LP to syphon - * @return - If syphoning is possible - */ - public static boolean canSyphonFromContainer(ItemStack stack, int toSyphon) { - if (!(stack.getItem() instanceof IBindable)) - return false; + /** + * Checks if the ItemStack has a user to be syphoned from. + * + * @param stack - ItemStack to check + * @param toSyphon - Amount of LP to syphon + * @return - If syphoning is possible + */ + public static boolean canSyphonFromContainer(ItemStack stack, int toSyphon) + { + if (!(stack.getItem() instanceof IBindable)) + return false; - Binding binding = ((IBindable) stack.getItem()).getBinding(stack); - if (binding == null) - return false; + Binding binding = ((IBindable) stack.getItem()).getBinding(stack); + if (binding == null) + return false; - SoulNetwork network = getSoulNetwork(binding); - return network.getCurrentEssence() >= toSyphon; - } + SoulNetwork network = getSoulNetwork(binding); + return network.getCurrentEssence() >= toSyphon; + } - // Set + // Set - /** - * Sets the orb tier of the SoulNetwork to the given orb. Will not set if - * the given tier is lower than the current tier. - * - * @param soulNetwork - SoulNetwork to set the orb tier of - * @param maxOrb - Tier of orb to set to - */ - public static void setMaxOrb(SoulNetwork soulNetwork, int maxOrb) { - soulNetwork.setOrbTier(Math.max(maxOrb, soulNetwork.getOrbTier())); - } -} + /** + * Sets the orb tier of the SoulNetwork to the given orb. Will not set if the + * given tier is lower than the current tier. + * + * @param soulNetwork - SoulNetwork to set the orb tier of + * @param maxOrb - Tier of orb to set to + */ + public static void setMaxOrb(SoulNetwork soulNetwork, int maxOrb) + { + soulNetwork.setOrbTier(Math.max(maxOrb, soulNetwork.getOrbTier())); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java index e98cccfb..f2c5d320 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NumeralHelper.java @@ -1,32 +1,35 @@ -package WayofTime.bloodmagic.util.helper; +package wayoftime.bloodmagic.util.helper; import java.util.TreeMap; -public class NumeralHelper { +public class NumeralHelper +{ - private static final TreeMap romanNumerals = new TreeMap<>(); + private static final TreeMap romanNumerals = new TreeMap(); - static { - romanNumerals.put(1000, "M"); - romanNumerals.put(900, "CM"); - romanNumerals.put(500, "D"); - romanNumerals.put(400, "CD"); - romanNumerals.put(100, "C"); - romanNumerals.put(90, "XC"); - romanNumerals.put(50, "L"); - romanNumerals.put(40, "XL"); - romanNumerals.put(10, "X"); - romanNumerals.put(9, "IX"); - romanNumerals.put(5, "V"); - romanNumerals.put(4, "IV"); - romanNumerals.put(1, "I"); - } + static + { + romanNumerals.put(1000, "M"); + romanNumerals.put(900, "CM"); + romanNumerals.put(500, "D"); + romanNumerals.put(400, "CD"); + romanNumerals.put(100, "C"); + romanNumerals.put(90, "XC"); + romanNumerals.put(50, "L"); + romanNumerals.put(40, "XL"); + romanNumerals.put(10, "X"); + romanNumerals.put(9, "IX"); + romanNumerals.put(5, "V"); + romanNumerals.put(4, "IV"); + romanNumerals.put(1, "I"); + } - public static String toRoman(int arabic) { - int convert = romanNumerals.floorKey(arabic); - if (arabic == convert) - return romanNumerals.get(convert); + public static String toRoman(int arabic) + { + int convert = romanNumerals.floorKey(arabic); + if (arabic == convert) + return romanNumerals.get(convert); - return romanNumerals.get(convert) + toRoman(arabic - convert); - } + return romanNumerals.get(convert) + toRoman(arabic - convert); + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java index 505ffbee..715b0f3a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java @@ -1,49 +1,64 @@ -package WayofTime.bloodmagic.util.helper; - -import com.google.common.collect.Lists; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.common.UsernameCache; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; +package wayoftime.bloodmagic.util.helper; import java.util.ArrayList; import java.util.UUID; -public class PlayerHelper { - /** - * A list of all known fake players that do not extend FakePlayer. - *

    - * Will be added to as needed. - */ - private static final ArrayList knownFakePlayers = Lists.newArrayList(); +import com.google.common.collect.Lists; - public static PlayerEntity getPlayerFromId(UUID uuid) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - return null; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraftforge.common.UsernameCache; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.server.ServerLifecycleHooks; - return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(uuid); - } +public class PlayerHelper +{ + /** + * A list of all known fake players that do not extend FakePlayer. + *

    + * Will be added to as needed. + */ + private static final ArrayList knownFakePlayers = Lists.newArrayList(); - public static PlayerEntity getPlayerFromUUID(UUID uuid) { - return getPlayerFromId(uuid); - } + public static PlayerEntity getPlayerFromId(UUID uuid) + { + // TODO: Need to find a reliable way to get whether the side is Client or Server +// if (FMLCommonHandler.instance().) +// return null; +// +// World w; +// Dist d; +// +// if(ServerLifecycleHooks.getCurrentServer().get) - public static UUID getUUIDFromPlayer(PlayerEntity player) { - return player.getGameProfile().getId(); - } + return ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayerByUUID(uuid); - public static String getUsernameFromUUID(UUID uuid) { - return UsernameCache.getLastKnownUsername(uuid); - } +// return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(uuid); + } - /** - * Checks whether or not the given player is an "actual" player - * - * @param player - The player in question - * @return If the player is fake or not - */ - public static boolean isFakePlayer(PlayerEntity player) { - return player instanceof FakePlayer || (player != null && knownFakePlayers.contains(player.getClass().getCanonicalName())); - } -} + public static PlayerEntity getPlayerFromUUID(UUID uuid) + { + return getPlayerFromId(uuid); + } + + public static UUID getUUIDFromPlayer(PlayerEntity player) + { + return player.getGameProfile().getId(); + } + + public static String getUsernameFromUUID(UUID uuid) + { + return UsernameCache.getLastKnownUsername(uuid); + } + + /** + * Checks whether or not the given player is an "actual" player + * + * @param player - The player in question + * @return If the player is fake or not + */ + public static boolean isFakePlayer(PlayerEntity player) + { + return player instanceof FakePlayer + || (player != null && knownFakePlayers.contains(player.getClass().getCanonicalName())); + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java index da4312d2..54a0c5b2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java @@ -1,142 +1,160 @@ -package WayofTime.bloodmagic.util.helper; +package wayoftime.bloodmagic.util.helper; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.altar.IBloodAltar; -import WayofTime.bloodmagic.core.RegistrarBloodMagic; -import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import wayoftime.bloodmagic.ConfigHandler; +import wayoftime.bloodmagic.altar.IBloodAltar; +import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent; -public class PlayerSacrificeHelper { - public static float scalingOfSacrifice = 1f; - public static int soulFrayDuration = 400; - public static Effect soulFrayId; +public class PlayerSacrificeHelper +{ + public static float scalingOfSacrifice = 1f; + public static int soulFrayDuration = 400; + public static Potion soulFrayId; - public static double getPlayerIncense(PlayerEntity player) { - return IncenseHelper.getCurrentIncense(player); - } + public static double getPlayerIncense(PlayerEntity player) + { + return 0; +// return IncenseHelper.getCurrentIncense(player); + } - public static void setPlayerIncense(PlayerEntity player, double amount) { - IncenseHelper.setCurrentIncense(player, amount); - } + public static void setPlayerIncense(PlayerEntity player, double amount) + { +// IncenseHelper.setCurrentIncense(player, amount); + } - public static boolean incrementIncense(PlayerEntity player, double min, double incenseAddition, double increment) { - double amount = getPlayerIncense(player); - if (amount < min || amount >= incenseAddition) { - return false; - } + public static boolean incrementIncense(PlayerEntity player, double min, double incenseAddition, double increment) + { + return true; +// double amount = getPlayerIncense(player); +// if (amount < min || amount >= incenseAddition) +// { +// return false; +// } +// +// amount = amount + Math.min(increment, incenseAddition - amount); +// setPlayerIncense(player, amount); +// +// if (amount == incenseAddition) +// { +// IncenseHelper.setMaxIncense(player, incenseAddition); +// } +// // System.out.println("Amount of incense: " + amount + ", Increment: " + +// // increment); +// +// return true; + } - amount = amount + Math.min(increment, incenseAddition - amount); - setPlayerIncense(player, amount); + /** + * Sacrifices a player's health while the player is under the influence of + * incense + * + * @param player - The player sacrificing + * @return Whether or not the health sacrificing succeeded + */ + public static boolean sacrificePlayerHealth(PlayerEntity player) + { +// if (player.isPotionActive(soulFrayId)) +// { +// return false; +// } - if (amount == incenseAddition) { - IncenseHelper.setMaxIncense(player, incenseAddition); - } - // System.out.println("Amount of incense: " + amount + ", Increment: " + - // increment); + double amount = getPlayerIncense(player); - return true; - } + if (amount >= 0) + { + float health = player.getHealth(); + float maxHealth = player.getMaxHealth(); - /** - * Sacrifices a player's health while the player is under the influence of - * incense - * - * @param player - The player sacrificing - * @return Whether or not the health sacrificing succeeded - */ - public static boolean sacrificePlayerHealth(PlayerEntity player) { - if (player.isPotionActive(soulFrayId)) { - return false; - } + if (health > maxHealth / 10.0) + { + float sacrificedHealth = health - maxHealth / 10.0f; + int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion + * getModifier(amount)); - double amount = getPlayerIncense(player); + IBloodAltar altar = getAltar(player.getEntityWorld(), player.getPosition()); + if (altar != null) + { + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); + if (MinecraftForge.EVENT_BUS.post(evt)) + return false; - if (amount >= 0) { - float health = player.getHealth(); - float maxHealth = player.getMaxHealth(); + altar.sacrificialDaggerCall(evt.lpAdded, false); + altar.startCycle(); - if (health > maxHealth / 10.0) { - float sacrificedHealth = health - maxHealth / 10.0f; - int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion * getModifier(amount)); + player.setHealth(maxHealth / 10.0f); + setPlayerIncense(player, 0); +// player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); - IBloodAltar altar = getAltar(player.getEntityWorld(), player.getPosition()); - if (altar != null) { - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); - if (MinecraftForge.EVENT_BUS.post(evt)) - return false; + return true; + } + } + } - altar.sacrificialDaggerCall(evt.lpAdded, false); - altar.startCycle(); + return false; + } - player.setHealth(maxHealth / 10.0f); - setPlayerIncense(player, 0); - player.addPotionEffect(new EffectInstance(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); + public static double getModifier(double amount) + { + return 1 + amount * scalingOfSacrifice; + } - return true; - } - } - } + /** + * Finds the nearest {@link IBloodAltar} and attempts to fill it + * + * @param world - The world + * @param sacrificingEntity - The entity having the sacrifice done on (can be + * {@link PlayerEntity} for self-sacrifice) + * @param amount - The amount of which the altar should be filled + * @param isSacrifice - Whether this is a Sacrifice or a Self-Sacrifice + * @return Whether the altar is found and (attempted) filled + */ + public static boolean findAndFillAltar(World world, LivingEntity sacrificingEntity, int amount, boolean isSacrifice) + { + IBloodAltar altarEntity = getAltar(world, sacrificingEntity.getPosition()); - return false; - } + if (altarEntity == null) + return false; - public static double getModifier(double amount) { - return 1 + amount * scalingOfSacrifice; - } + altarEntity.sacrificialDaggerCall(amount, isSacrifice); + altarEntity.startCycle(); - /** - * Finds the nearest {@link IBloodAltar} and attempts to fill it - * - * @param world - The world - * @param sacrificingEntity - The entity having the sacrifice done on (can be - * {@link PlayerEntity} for self-sacrifice) - * @param amount - The amount of which the altar should be filled - * @param isSacrifice - Whether this is a Sacrifice or a Self-Sacrifice - * @return Whether the altar is found and (attempted) filled - */ - public static boolean findAndFillAltar(World world, LivingEntity sacrificingEntity, int amount, boolean isSacrifice) { - IBloodAltar altarEntity = getAltar(world, sacrificingEntity.getPosition()); + return true; + } - if (altarEntity == null) - return false; + /** + * Gets the nearest {@link IBloodAltar} + * + * @param world - The world + * @param blockPos - The position of where the check should be in (in a 2 block + * radius from this) + * @return The nearest altar, if no altar is found, then this will return null + */ + public static IBloodAltar getAltar(World world, BlockPos blockPos) + { + TileEntity tileEntity; - altarEntity.sacrificialDaggerCall(amount, isSacrifice); - altarEntity.startCycle(); + for (int x = -2; x <= 2; x++) + { + for (int y = -2; y <= 1; y++) + { + for (int z = -2; z <= 2; z++) + { + tileEntity = world.getTileEntity(blockPos.add(x, y, z)); - return true; - } + if (tileEntity instanceof IBloodAltar) + { + return (IBloodAltar) tileEntity; + } + } + } + } - /** - * Gets the nearest {@link IBloodAltar} - * - * @param world - The world - * @param blockPos - The position of where the check should be in (in a 2 block - * radius from this) - * @return The nearest altar, if no altar is found, then this will return - * null - */ - public static IBloodAltar getAltar(World world, BlockPos blockPos) { - TileEntity tileEntity; - - for (int x = -2; x <= 2; x++) { - for (int y = -2; y <= 1; y++) { - for (int z = -2; z <= 2; z++) { - tileEntity = world.getTileEntity(blockPos.add(x, y, z)); - - if (tileEntity instanceof IBloodAltar) { - return (IBloodAltar) tileEntity; - } - } - } - } - - return null; - } -} \ No newline at end of file + return null; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java deleted file mode 100644 index 40695916..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java +++ /dev/null @@ -1,33 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.util.Constants; -import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.nbt.CompoundNBT; - -public class PurificationHelper { - public static double getCurrentPurity(AnimalEntity animal) { - CompoundNBT data = animal.getEntityData(); - if (data.hasKey(Constants.NBT.CURRENT_PURITY)) { - return data.getDouble(Constants.NBT.CURRENT_PURITY); - } - - return 0; - } - - public static void setCurrentPurity(AnimalEntity animal, double amount) { - CompoundNBT data = animal.getEntityData(); - data.setDouble(Constants.NBT.CURRENT_PURITY, amount); - } - - public static double addPurity(AnimalEntity animal, double added, double max) { - double currentPurity = getCurrentPurity(animal); - double newAmount = Math.min(max, currentPurity + added); - - if (newAmount < max) { - setCurrentPurity(animal, newAmount); - return newAmount - currentPurity; - } - - return 0; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java deleted file mode 100644 index 97b4853a..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.core.registry.TartaricForgeRecipeRegistry; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - -public class RecipeHelper { - public static IRecipe getRecipeForOutput(ItemStack stack) { - for (IRecipe recipe : ForgeRegistries.RECIPES.getValues()) { - if (recipe != null) { - ItemStack resultStack = recipe.getRecipeOutput(); - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return recipe; - } - } - } - } - - return null; - } - - public static AltarRecipeRegistry.AltarRecipe getAltarRecipeForOutput(ItemStack stack) { - for (AltarRecipeRegistry.AltarRecipe recipe : AltarRecipeRegistry.getRecipes().values()) { - if (recipe != null && !recipe.isFillable()) { - ItemStack resultStack = recipe.getOutput(); - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return recipe; - } - } - } - } - - return null; - } - - public static TartaricForgeRecipe getForgeRecipeForOutput(ItemStack stack) { - for (TartaricForgeRecipe recipe : TartaricForgeRecipeRegistry.getRecipeList()) { - if (recipe != null) { - ItemStack resultStack = recipe.getRecipeOutput(); - if (!resultStack.isEmpty()) { - if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { - return recipe; - } - } - } - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java deleted file mode 100644 index ef5e7bfe..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java +++ /dev/null @@ -1,211 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.ritual.IRitualStone; -import WayofTime.bloodmagic.ritual.Ritual; -import WayofTime.bloodmagic.ritual.RitualComponent; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import com.google.common.collect.Lists; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityInject; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; - -public class RitualHelper { - @CapabilityInject(IRitualStone.Tile.class) - static Capability RUNE_CAPABILITY = null; - - public static boolean canCrystalActivate(Ritual ritual, int crystalLevel) { - return ritual.getCrystalLevel() <= crystalLevel && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false); - } - - /** - * Checks the RitualRegistry to see if the configuration of the ritual - * stones in the world is valid for the given EnumFacing. - * - * @param world - The world - * @param pos - Location of the MasterRitualStone - * @return The ID of the valid ritual - */ - public static String getValidRitual(World world, BlockPos pos) { - for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { - for (Direction direction : Direction.HORIZONTALS) { - if (checkValidRitual(world, pos, ritual, direction)) - return BloodMagic.RITUAL_MANAGER.getId(ritual); - } - } - - return ""; - } - - public static Direction getDirectionOfRitual(World world, BlockPos pos, Ritual ritual) { - for (Direction direction : Direction.HORIZONTALS) { - if (checkValidRitual(world, pos, ritual, direction)) - return direction; - } - - return null; - } - - public static boolean checkValidRitual(World world, BlockPos pos, Ritual ritual, Direction direction) { - if (ritual == null) { - return false; - } - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - for (RitualComponent component : components) { - BlockPos newPos = pos.add(component.getOffset(direction)); - if (!isRuneType(world, newPos, component.getRuneType())) - return false; - } - - return true; - } - - public static boolean isRuneType(World world, BlockPos pos, EnumRuneType type) { - if (world == null) - return false; - Block block = world.getBlockState(pos).getBlock(); - TileEntity tile = world.getTileEntity(pos); - - if (block instanceof IRitualStone) - return ((IRitualStone) block).isRuneType(world, pos, type); - else if (tile instanceof IRitualStone.Tile) - return ((IRitualStone.Tile) tile).isRuneType(type); - else if (tile != null && tile.hasCapability(RUNE_CAPABILITY, null)) - return tile.getCapability(RUNE_CAPABILITY, null).isRuneType(type); - - return false; - } - - public static boolean isRune(World world, BlockPos pos) { - if (world == null) - return false; - Block block = world.getBlockState(pos).getBlock(); - TileEntity tile = world.getTileEntity(pos); - - if (block instanceof IRitualStone) - return true; - else if (tile instanceof IRitualStone.Tile) - return true; - else return tile != null && tile.hasCapability(RUNE_CAPABILITY, null); - - } - - public static void setRuneType(World world, BlockPos pos, EnumRuneType type) { - if (world == null) - return; - BlockState state = world.getBlockState(pos); - TileEntity tile = world.getTileEntity(pos); - - if (state.getBlock() instanceof IRitualStone) - ((IRitualStone) state.getBlock()).setRuneType(world, pos, type); - else if (tile instanceof IRitualStone.Tile) - ((IRitualStone.Tile) tile).setRuneType(type); - else if (tile != null && tile.hasCapability(RUNE_CAPABILITY, null)) { - tile.getCapability(RUNE_CAPABILITY, null).setRuneType(type); - world.notifyBlockUpdate(pos, state, state, 3); - } - } - - public static boolean createRitual(World world, BlockPos pos, Direction direction, Ritual ritual, boolean safe) { - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - if (abortConstruction(world, pos, direction, safe, components)) return false; - - BlockState mrs = RegistrarBloodMagicBlocks.RITUAL_CONTROLLER.getDefaultState(); - world.setBlockState(pos, mrs); - - setRitualStones(direction, world, pos, components); - return true; - } - - public static boolean abortConstruction(World world, BlockPos pos, Direction direction, boolean safe, List components) { - //TODO: can be optimized to check only for the first and last component if every ritual has those at the highest and lowest y-level respectivly. - for (RitualComponent component : components) { - BlockPos offset = component.getOffset(direction); - BlockPos newPos = pos.add(offset); - if (world.isOutsideBuildHeight(newPos) || (safe && !world.isAirBlock(newPos))) - return true; - } - return false; - } - - public static boolean repairRitualFromRuins(TileMasterRitualStone tile, boolean safe) { - Ritual ritual = tile.getCurrentRitual(); - Direction direction; - Pair pair; - if (ritual == null) { - pair = getRitualFromRuins(tile); - ritual = pair.getKey(); - direction = pair.getValue(); - } else - direction = tile.getDirection(); - - World world = tile.getWorld(); - BlockPos pos = tile.getPos(); - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - if (abortConstruction(world, pos, direction, safe, components)) return false; - - setRitualStones(direction, world, pos, components); - return true; - } - - public static void setRitualStones(Direction direction, World world, BlockPos pos, List gatheredComponents) { - for (RitualComponent component : gatheredComponents) { - BlockPos offset = component.getOffset(direction); - BlockPos newPos = pos.add(offset); - int meta = component.getRuneType().ordinal(); - BlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta); - world.setBlockState(newPos, newState); - } - } - - - public static Pair getRitualFromRuins(TileMasterRitualStone tile) { - BlockPos pos = tile.getPos(); - World world = tile.getWorld(); - Ritual possibleRitual = tile.getCurrentRitual(); - Direction possibleDirection = tile.getDirection(); - int highestCount = 0; - - if (possibleRitual == null || possibleDirection == null) - for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) { - for (Direction direction : Direction.HORIZONTALS) { - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - int currentCount = 0; - - for (RitualComponent component : components) { - BlockPos newPos = pos.add(component.getOffset(direction)); - if (isRuneType(world, newPos, component.getRuneType())) - currentCount += 1; - } - if (currentCount > highestCount) { - highestCount = currentCount; - possibleRitual = ritual; - possibleDirection = direction; - } - - } - - } - return Pair.of(possibleRitual, possibleDirection); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java index 8b9c3e35..34d1da08 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java @@ -1,65 +1,77 @@ -package WayofTime.bloodmagic.util.helper; - -import net.minecraft.util.text.translation.I18n; -import org.apache.commons.lang3.text.WordUtils; +package wayoftime.bloodmagic.util.helper; import java.util.ArrayList; import java.util.List; -public class TextHelper { - public static String getFormattedText(String string) { - return string.replaceAll("&", "\u00A7"); - } +import org.apache.commons.lang3.text.WordUtils; - public static String localize(String input, Object... format) { - return I18n.translateToLocalFormatted(input, format); - } +import net.minecraft.client.resources.I18n; - public static String localizeEffect(String input, Object... format) { - return getFormattedText(localize(input, format)); - } +public class TextHelper +{ + public static String getFormattedText(String string) + { + return string.replaceAll("&", "\u00A7"); + } - public static String[] localizeAll(String[] input) { - String[] ret = new String[input.length]; - for (int i = 0; i < input.length; i++) - ret[i] = localize(input[i]); + public static String localize(String input, Object... format) + { + return I18n.format(input, format); + } - return ret; - } + public static String localizeEffect(String input, Object... format) + { + return getFormattedText(localize(input, format)); + } - public static String[] localizeAllEffect(String[] input) { - String[] ret = new String[input.length]; - for (int i = 0; i < input.length; i++) - ret[i] = localizeEffect(input[i]); + public static String[] localizeAll(String[] input) + { + String[] ret = new String[input.length]; + for (int i = 0; i < input.length; i++) + ret[i] = localize(input[i]); - return ret; - } + return ret; + } - public static ArrayList localizeAll(List input) { - ArrayList ret = new ArrayList<>(input.size()); - for (int i = 0; i < input.size(); i++) - ret.add(i, localize(input.get(i))); + public static String[] localizeAllEffect(String[] input) + { + String[] ret = new String[input.length]; + for (int i = 0; i < input.length; i++) + ret[i] = localizeEffect(input[i]); - return ret; - } + return ret; + } - public static ArrayList localizeAllEffect(List input) { - ArrayList ret = new ArrayList<>(input.size()); - for (int i = 0; i < input.size(); i++) - ret.add(i, localizeEffect(input.get(i))); + public static ArrayList localizeAll(List input) + { + ArrayList ret = new ArrayList<>(input.size()); + for (int i = 0; i < input.size(); i++) + ret.add(i, localize(input.get(i))); - return ret; - } + return ret; + } - public static String[] cutLongString(String string, int characters) { - return WordUtils.wrap(string, characters, "/cut", false).split("/cut"); - } + public static ArrayList localizeAllEffect(List input) + { + ArrayList ret = new ArrayList<>(input.size()); + for (int i = 0; i < input.size(); i++) + ret.add(i, localizeEffect(input.get(i))); - public static String[] cutLongString(String string) { - return cutLongString(string, 30); - } + return ret; + } - public static boolean canTranslate(String key) { - return I18n.canTranslate(key); - } -} + public static String[] cutLongString(String string, int characters) + { + return WordUtils.wrap(string, characters, "/cut", false).split("/cut"); + } + + public static String[] cutLongString(String string) + { + return cutLongString(string, 30); + } + + public static boolean canTranslate(String key) + { + return I18n.hasKey(key); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java new file mode 100644 index 00000000..fb347b0e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java @@ -0,0 +1,80 @@ +package wayoftime.bloodmagic.api; + +import javax.annotation.Nonnull; + +import net.minecraft.block.BlockState; + +/** + * The main interface between a plugin and Blood Magic's internals. + * + * This API is intended for compatibility between other mods and Blood + * Magic. More advanced integration is out of the scope of this API and are + * considered "addons". + * + * To get an instance of this without actually creating an + * {@link IBloodMagicPlugin}, use {@link BloodMagicPlugin.Inject}. + */ +public interface IBloodMagicAPI +{ + +// /** +// * Retrieves the instance of the blacklist. +// * +// * @return the active {@link IBloodMagicBlacklist} instance +// */ +// @Nonnull +// IBloodMagicBlacklist getBlacklist(); + + /** + * Retrieves the instance of the recipe registrar. + * + * @return the active {@link IBloodMagicRecipeRegistrar} instance + */ + @Nonnull + IBloodMagicRecipeRegistrar getRecipeRegistrar(); +// +// /** +// * Retrieves the instance of the value manager. +// * +// * @return the active {@link IBloodMagicValueManager} instance +// */ +// @Nonnull +// IBloodMagicValueManager getValueManager(); + + /** + * Registers an {@link IBlockState} as a given component for the Blood Altar. + *

    + * Valid component types: + *

      + *
    • GLOWSTONE
      • + *
    • BLOODSTONE
      • + *
    • BEACON
      • + *
    • BLOODRUNE
      • + *
    • CRYSTAL
      • + *
    • NOTAIR
      • + *
    + * + * @param state The state to register + * @param componentType The type of Blood Altar component to register as. + */ + void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType); + + /** + * Removes an {@link IBlockState} from the component mappings + *

    + * Valid component types: + *

      + *
    • GLOWSTONE
      • + *
    • BLOODSTONE
      • + *
    • BEACON
      • + *
    • BLOODRUNE
      • + *
    • CRYSTAL
      • + *
    • NOTAIR
      • + *
    + * + * @param state The state to unregister + * @param componentType The type of Blood Altar component to unregister from. + */ + void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType); + +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..46b8bd80 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -0,0 +1,100 @@ +package wayoftime.bloodmagic.api; + +/** + * Allows recipe addition and removal. + */ +public interface IBloodMagicRecipeRegistrar +{ + +// /** +// * Adds a new recipe to the Blood Altar. +// * +// * @param input An input {@link Ingredient}. +// * @param output An output {@link ItemStack}. +// * @param minimumTier The minimum Blood Altar tier required for this recipe. +// * @param syphon The amount of Life Essence to syphon from the Blood Altar +// * over the course of the craft. +// * @param consumeRate How quickly the Life Essence is syphoned. +// * @param drainRate How quickly progress is lost if the Blood Altar runs out +// * of Life Essence during the craft. +// */ +// void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, +// @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); +// +// /** +// * Removes a Blood Altar recipe based on an input {@link ItemStack}. +// * +// * @param input The input item to remove the recipe of. +// * @return Whether or not a recipe was removed. +// */ +// boolean removeBloodAltar(@Nonnull ItemStack input); +// +// /** +// * Adds a new recipe to the Alchemy Table. +// * +// * @param output An output {@link ItemStack}. +// * @param syphon The amount of Life Essence to syphon from the Blood Orb's +// * bound network over the course of the craft. +// * @param ticks The amount of ticks it takes to complete the craft. +// * @param minimumTier The minimum Blood Orb tier required for this recipe. +// * @param input An array of {@link Ingredient}s to accept as inputs. +// */ +// void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, +// @Nonnegative int minimumTier, @Nonnull Ingredient... input); +// +// /** +// * Removes an Alchemy Table recipe based on an input {@link ItemStack} array. +// * +// * @param input The input items to remove the recipe of. +// * @return Whether or not a recipe was removed. +// */ +// boolean removeAlchemyTable(@Nonnull ItemStack... input); +// +// /** +// * Adds a new recipe to the Soul/Tartaric Forge. +// * +// * @param output An output {@link ItemStack}. +// * @param minimumSouls The minimum number of souls that must be contained in the +// * Soul Gem. +// * @param soulDrain The number of souls to drain from the Soul Gem. +// * @param input An array of {@link Ingredient}s to accept as inputs. +// */ +// void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, +// @Nonnull Ingredient... input); +// +// /** +// * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} +// * array. +// * +// * @param input The input items to remove the recipe of. +// * @return Whether or not a recipe was removed. +// */ +// boolean removeTartaricForge(@Nonnull ItemStack... input); +// +// /** +// * Adds a new recipe to the Alchemy Array. +// * +// * @param input An input {@link Ingredient}. First item put into the +// * Alchemy Array. +// * @param catalyst A catalyst {@link Ingredient}. Second item put into the +// * Alchemy Array. +// * @param output An output {@link ItemStack}. +// * @param circleTexture The texture to render for the Alchemy Array circle. +// */ +// void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, +// @Nullable ResourceLocation circleTexture); +// +// /** +// * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's +// * catalyst {@link ItemStack}. +// * +// * @param input The input item to remove the recipe of. +// * @param catalyst The catalyst item to remove the recipe of. +// * @return Whether or not a recipe was removed. +// */ +// boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); +// +// void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input); +// +// boolean removeSacrificeCraft(@Nonnull ItemStack... input); +} diff --git a/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java b/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java new file mode 100644 index 00000000..c2840718 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java @@ -0,0 +1,60 @@ +package wayoftime.bloodmagic.api; + +import javax.annotation.Nonnull; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.util.JSONUtils; +import wayoftime.bloodmagic.util.Constants; + +/** + * Copied liberally from Mekanism. Thanks, pupnewfster! + * + */ +public class SerializerHelper +{ + private SerializerHelper() + { + } + + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); + + private static void validateKey(@Nonnull JsonObject json, @Nonnull String key) + { + if (!json.has(key)) + { + throw new JsonSyntaxException("Missing '" + key + "', expected to find an object"); + } + if (!json.get(key).isJsonObject()) + { + throw new JsonSyntaxException("Expected '" + key + "' to be an object"); + } + } + + public static ItemStack getItemStack(@Nonnull JsonObject json, @Nonnull String key) + { + validateKey(json, key); + return ShapedRecipe.deserializeItem(JSONUtils.getJsonObject(json, key)); + } + + public static JsonElement serializeItemStack(@Nonnull ItemStack stack) + { + JsonObject json = new JsonObject(); + json.addProperty(Constants.JSON.ITEM, stack.getItem().getRegistryName().toString()); + if (stack.getCount() > 1) + { + json.addProperty(Constants.JSON.COUNT, stack.getCount()); + } + if (stack.hasTag()) + { + json.addProperty(Constants.JSON.NBT, stack.getTag().toString()); + } + return json; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java new file mode 100644 index 00000000..335abe96 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java @@ -0,0 +1,84 @@ +package wayoftime.bloodmagic.api.event; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.eventbus.api.Event; + +public class BloodMagicCraftedEvent extends Event +{ + + private final boolean modifiable; + private final ItemStack[] inputs; + private ItemStack output; + + public BloodMagicCraftedEvent(ItemStack output, ItemStack[] inputs, boolean modifiable) + { + this.modifiable = modifiable; + this.inputs = inputs; + this.output = output; + } + + public boolean isModifiable() + { + return modifiable; + } + + public ItemStack[] getInputs() + { + return inputs; + } + + public ItemStack getOutput() + { + return output; + } + + public void setOutput(ItemStack output) + { + if (isModifiable()) + this.output = output; + } + + /** + * Fired whenever a craft is completed in a Blood Altar. + * + * It is not cancelable, however you can modify the output stack. + */ + public static class Altar extends BloodMagicCraftedEvent + { + + public Altar(ItemStack output, ItemStack input) + { + super(output, new ItemStack[] + { input }, true); + } + } + + /** + * Fired whenever a craft is completed in a Soul Forge. + * + * It is not cancelable, however you can modify the output stack. + */ + public static class SoulForge extends BloodMagicCraftedEvent + { + + public SoulForge(ItemStack output, ItemStack[] inputs) + { + super(output, inputs, true); + } + } + + /** + * Fired whenever a craft is completed in an Alchemy Table. + * + * It is not cancelable, however you can modify the output stack. + */ + public static class AlchemyTable extends BloodMagicCraftedEvent + { + + public AlchemyTable(ItemStack output, ItemStack[] inputs) + { + super(output, inputs, true); + } + } + +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java new file mode 100644 index 00000000..aae4c134 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java @@ -0,0 +1,69 @@ +package wayoftime.bloodmagic.api.impl.recipe; + +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import wayoftime.bloodmagic.api.inventory.IgnoredIInventory; + +public abstract class BloodMagicRecipe implements IRecipe +{ + private final ResourceLocation id; + + protected BloodMagicRecipe(ResourceLocation id) + { + this.id = id; + } + + /** + * Writes this recipe to a PacketBuffer. + * + * @param buffer The buffer to write to. + */ + public abstract void write(PacketBuffer buffer); + + @Nonnull + @Override + public ResourceLocation getId() + { + return id; + } + + @Override + public boolean matches(@Nonnull IgnoredIInventory inv, @Nonnull World world) + { + return true; + } + + @Override + public boolean isDynamic() + { + // Note: If we make this non dynamic, we can make it show in vanilla's crafting + // book and also then obey the recipe locking. + // For now none of that works/makes sense in our concept so don't lock it + return true; + } + + @Nonnull + @Override + public ItemStack getCraftingResult(@Nonnull IgnoredIInventory inv) + { + return ItemStack.EMPTY; + } + + @Override + public boolean canFit(int width, int height) + { + return true; + } + + @Nonnull + @Override + public ItemStack getRecipeOutput() + { + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/api/inventory/IgnoredIInventory.java b/src/main/java/wayoftime/bloodmagic/api/inventory/IgnoredIInventory.java new file mode 100644 index 00000000..757fa7a5 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/inventory/IgnoredIInventory.java @@ -0,0 +1,67 @@ +package wayoftime.bloodmagic.api.inventory; + +import javax.annotation.Nonnull; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +public final class IgnoredIInventory implements IInventory +{ + public static final IgnoredIInventory INSTANCE = new IgnoredIInventory(); + + private IgnoredIInventory() + { + } + + @Override + public int getSizeInventory() + { + return 0; + } + + @Override + public boolean isEmpty() + { + return true; + } + + @Override + public ItemStack getStackInSlot(int index) + { + return ItemStack.EMPTY; + } + + @Override + public ItemStack decrStackSize(int index, int count) + { + return ItemStack.EMPTY; + } + + @Override + public ItemStack removeStackFromSlot(int index) + { + return ItemStack.EMPTY; + } + + @Override + public void setInventorySlotContents(int index, @Nonnull ItemStack stack) + { + } + + @Override + public void markDirty() + { + } + + @Override + public boolean isUsableByPlayer(@Nonnull PlayerEntity player) + { + return false; + } + + @Override + public void clear() + { + } +} diff --git a/src/main/java/wayoftime/bloodmagic/api/providers/IBaseProvider.java b/src/main/java/wayoftime/bloodmagic/api/providers/IBaseProvider.java new file mode 100644 index 00000000..e59271db --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/providers/IBaseProvider.java @@ -0,0 +1,23 @@ +package wayoftime.bloodmagic.api.providers; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import wayoftime.bloodmagic.api.text.IHasTextComponent; +import wayoftime.bloodmagic.api.text.IHasTranslationKey; + +public interface IBaseProvider extends IHasTextComponent, IHasTranslationKey +{ + ResourceLocation getRegistryName(); + + default String getName() + { + return getRegistryName().getPath(); + } + + @Override + default ITextComponent getTextComponent() + { + return new TranslationTextComponent(getTranslationKey()); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/providers/IEntityTypeProvider.java b/src/main/java/wayoftime/bloodmagic/api/providers/IEntityTypeProvider.java new file mode 100644 index 00000000..db92683c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/providers/IEntityTypeProvider.java @@ -0,0 +1,32 @@ +package wayoftime.bloodmagic.api.providers; + +import javax.annotation.Nonnull; + +import net.minecraft.entity.EntityType; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; + +public interface IEntityTypeProvider extends IBaseProvider +{ + + @Nonnull + EntityType getEntityType(); + + @Override + default ResourceLocation getRegistryName() + { + return getEntityType().getRegistryName(); + } + + @Override + default ITextComponent getTextComponent() + { + return getEntityType().getName(); + } + + @Override + default String getTranslationKey() + { + return getEntityType().getTranslationKey(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/text/IHasTextComponent.java b/src/main/java/wayoftime/bloodmagic/api/text/IHasTextComponent.java new file mode 100644 index 00000000..d0b25951 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/text/IHasTextComponent.java @@ -0,0 +1,8 @@ +package wayoftime.bloodmagic.api.text; + +import net.minecraft.util.text.ITextComponent; + +public interface IHasTextComponent +{ + ITextComponent getTextComponent(); +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/text/IHasTranslationKey.java b/src/main/java/wayoftime/bloodmagic/api/text/IHasTranslationKey.java new file mode 100644 index 00000000..63be3d74 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/text/IHasTranslationKey.java @@ -0,0 +1,6 @@ +package wayoftime.bloodmagic.api.text; + +public interface IHasTranslationKey +{ + String getTranslationKey(); +} diff --git a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java new file mode 100644 index 00000000..8d3b6065 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java @@ -0,0 +1,98 @@ +package wayoftime.bloodmagic.client; + +import net.minecraft.client.gui.ScreenManager; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.IItemPropertyGetter; +import net.minecraft.item.Item; +import net.minecraft.item.ItemModelsProperties; +import net.minecraft.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.client.render.block.RenderAlchemyArray; +import wayoftime.bloodmagic.client.render.block.RenderAltar; +import wayoftime.bloodmagic.client.screens.ScreenSoulForge; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilToggleable; +import wayoftime.bloodmagic.common.item.soul.ItemSentientSword; +import wayoftime.bloodmagic.iface.IMultiWillTool; +import wayoftime.bloodmagic.tile.TileAlchemyArray; +import wayoftime.bloodmagic.tile.TileAltar; + +@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class ClientEvents +{ + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) + { + ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderAltar::new); + ClientRegistry.bindTileEntityRenderer(TileAlchemyArray.TYPE, RenderAlchemyArray::new); +// ClientRegistry.bindTileEntityRenderer(TileSoulForge.TYPE, RenderAlchemyArray::new); + } + + public static void registerContainerScreens() + { + ScreenManager.registerFactory(BloodMagicBlocks.SOUL_FORGE_CONTAINER.get(), ScreenSoulForge::new); + } + + public static void registerItemModelProperties(FMLClientSetupEvent event) + { + registerToggleableProperties(BloodMagicItems.GREEN_GROVE_SIGIL.get()); + registerToggleableProperties(BloodMagicItems.FAST_MINER_SIGIL.get()); + registerToggleableProperties(BloodMagicItems.MAGNETISM_SIGIL.get()); + registerToggleableProperties(BloodMagicItems.ICE_SIGIL.get()); + registerMultiWillTool(BloodMagicItems.SENTIENT_SWORD.get()); + registerMultiWillTool(BloodMagicItems.PETTY_GEM.get()); + registerMultiWillTool(BloodMagicItems.LESSER_GEM.get()); + registerMultiWillTool(BloodMagicItems.COMMON_GEM.get()); + + ItemModelsProperties.registerProperty(BloodMagicItems.SENTIENT_SWORD.get(), BloodMagic.rl("active"), new IItemPropertyGetter() + { + @Override + public float call(ItemStack stack, ClientWorld world, LivingEntity entity) + { + return ((ItemSentientSword) stack.getItem()).getActivated(stack) ? 1 : 0; + } + }); + } + + public static void registerToggleableProperties(Item item) + { + ItemModelsProperties.registerProperty(item, BloodMagic.rl("active"), new IItemPropertyGetter() + { + @Override + public float call(ItemStack stack, ClientWorld world, LivingEntity entity) + { + Item item = stack.getItem(); + if (item instanceof ItemSigilToggleable) + { + return ((ItemSigilToggleable) item).getActivated(stack) ? 1 : 0; + } + return 0; + } + }); + } + + public static void registerMultiWillTool(Item item) + { + ItemModelsProperties.registerProperty(item, BloodMagic.rl("type"), new IItemPropertyGetter() + { + @Override + public float call(ItemStack stack, ClientWorld world, LivingEntity entity) + { + Item item = stack.getItem(); + if (item instanceof IMultiWillTool) + { + return ((IMultiWillTool) item).getCurrentType(stack).ordinal(); + } + return 0; + } + }); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java new file mode 100644 index 00000000..2948f554 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java @@ -0,0 +1,104 @@ +package wayoftime.bloodmagic.client.render; + +import java.util.Arrays; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; + +public class BloodMagicRenderer +{ + public static float getRed(int color) + { + return (color >> 16 & 0xFF) / 255.0F; + } + + public static float getGreen(int color) + { + return (color >> 8 & 0xFF) / 255.0F; + } + + public static float getBlue(int color) + { + return (color & 0xFF) / 255.0F; + } + + public static float getAlpha(int color) + { + return (color >> 24 & 0xFF) / 255.0F; + } + + public static class Model3D + { + public double minX, minY, minZ; + public double maxX, maxY, maxZ; + + public final TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; + + public final boolean[] renderSides = new boolean[] + { true, true, true, true, true, true, false }; + + public double sizeX() + { + return maxX - minX; + } + + public double sizeY() + { + return maxY - minY; + } + + public double sizeZ() + { + return maxZ - minZ; + } + + public void setSideRender(Direction side, boolean value) + { + renderSides[side.ordinal()] = value; + } + + public boolean shouldSideRender(Direction side) + { + return renderSides[side.ordinal()]; + } + + public void setTexture(TextureAtlasSprite tex) + { + Arrays.fill(textures, tex); + } + + public void setTextures(TextureAtlasSprite down, TextureAtlasSprite up, TextureAtlasSprite north, TextureAtlasSprite south, TextureAtlasSprite west, TextureAtlasSprite east) + { + textures[0] = down; + textures[1] = up; + textures[2] = north; + textures[3] = south; + textures[4] = west; + textures[5] = east; + } + } + + public static class Model2D + { + public double minX, minY; + public double maxX, maxY; + + public ResourceLocation resource; + + public double sizeX() + { + return maxX - minX; + } + + public double sizeY() + { + return maxY - minY; + } + + public void setTexture(ResourceLocation resource) + { + this.resource = resource; + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java b/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java new file mode 100644 index 00000000..4049d4cc --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java @@ -0,0 +1,168 @@ +package wayoftime.bloodmagic.client.render; + +import java.util.Arrays; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.math.vector.Matrix3f; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; +import net.minecraft.util.math.vector.Vector3i; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; + +/** + * Adapted from BuildCraft + */ +public class RenderResizableCuboid +{ + public static final RenderResizableCuboid INSTANCE = new RenderResizableCuboid(); + private static final Vector3f VEC_ZERO = new Vector3f(0, 0, 0); + private static final int U_MIN = 0; + private static final int U_MAX = 1; + private static final int V_MIN = 2; + private static final int V_MAX = 3; + + protected EntityRendererManager manager = Minecraft.getInstance().getRenderManager(); + + private static Vector3f withValue(Vector3f vector, Axis axis, float value) + { + if (axis == Axis.X) + { + return new Vector3f(value, vector.getY(), vector.getZ()); + } else if (axis == Axis.Y) + { + return new Vector3f(vector.getX(), value, vector.getZ()); + } else if (axis == Axis.Z) + { + return new Vector3f(vector.getX(), vector.getY(), value); + } + throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + + vector + ")"); + } + + public static double getValue(Vector3d vector, Axis axis) + { + if (axis == Axis.X) + { + return vector.x; + } else if (axis == Axis.Y) + { + return vector.y; + } else if (axis == Axis.Z) + { + return vector.z; + } + throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + + vector + ")"); + } + + public void renderCube(Model3D cube, MatrixStack matrix, IVertexBuilder buffer, int argb, int light, int overlay) + { + float red = BloodMagicRenderer.getRed(argb); + float green = BloodMagicRenderer.getGreen(argb); + float blue = BloodMagicRenderer.getBlue(argb); + float alpha = BloodMagicRenderer.getAlpha(argb); + Vector3d size = new Vector3d(cube.sizeX(), cube.sizeY(), cube.sizeZ()); + matrix.push(); + matrix.translate(cube.minX, cube.minY, cube.minZ); + MatrixStack.Entry lastMatrix = matrix.getLast(); + Matrix4f matrix4f = lastMatrix.getMatrix(); + Matrix3f normal = lastMatrix.getNormal(); + for (Direction face : Direction.values()) + { + if (cube.shouldSideRender(face)) + { + int ordinal = face.ordinal(); + TextureAtlasSprite sprite = cube.textures[ordinal]; + if (sprite != null) + { + Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; + Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; + float other = face.getAxisDirection() == AxisDirection.POSITIVE + ? (float) getValue(size, face.getAxis()) + : 0; + + // Swap the face if this is positive: the renderer returns indexes that ALWAYS + // are for the negative face, so light it properly this way + face = face.getAxisDirection() == AxisDirection.NEGATIVE ? face : face.getOpposite(); + Direction opposite = face.getOpposite(); + + float minU = sprite.getMinU(); + float maxU = sprite.getMaxU(); + // Flip the v + float minV = sprite.getMaxV(); + float maxV = sprite.getMinV(); + double sizeU = getValue(size, u); + double sizeV = getValue(size, v); + // TODO: Look into this more, as it makes tiling of multiple objects not render + // properly if they don't fit the full texture. + // Example: Mechanical pipes rendering water or lava, makes it relatively easy + // to see the texture artifacts + for (int uIndex = 0; uIndex < sizeU; uIndex++) + { + float[] baseUV = new float[] + { minU, maxU, minV, maxV }; + double addU = 1; + // If the size of the texture is greater than the cuboid goes on for then make + // sure the texture positions are lowered + if (uIndex + addU > sizeU) + { + addU = sizeU - uIndex; + baseUV[U_MAX] = baseUV[U_MIN] + (baseUV[U_MAX] - baseUV[U_MIN]) * (float) addU; + } + for (int vIndex = 0; vIndex < sizeV; vIndex++) + { + float[] uv = Arrays.copyOf(baseUV, 4); + double addV = 1; + if (vIndex + addV > sizeV) + { + addV = sizeV - vIndex; + uv[V_MAX] = uv[V_MIN] + (uv[V_MAX] - uv[V_MIN]) * (float) addV; + } + float[] xyz = new float[] + { uIndex, (float) (uIndex + addU), vIndex, (float) (vIndex + addV) }; + + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); + + renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); + } + } + } + } + } + matrix.pop(); + } + + private void renderPoint(Matrix4f matrix4f, Matrix3f normal, IVertexBuilder buffer, Direction face, Axis u, Axis v, + float other, float[] uv, float[] xyz, boolean minU, boolean minV, float red, float green, float blue, + float alpha, int light, int overlay) + { + int U_ARRAY = minU ? U_MIN : U_MAX; + int V_ARRAY = minV ? V_MIN : V_MAX; + Vector3f vertex = withValue(VEC_ZERO, u, xyz[U_ARRAY]); + vertex = withValue(vertex, v, xyz[V_ARRAY]); + vertex = withValue(vertex, face.getAxis(), other); + Vector3i normalForFace = face.getDirectionVec(); + // TODO: Figure out how and why this works, it gives about the same brightness + // as we used to have but I don't understand why/how + float adjustment = 2.5F; + Vector3f norm = new Vector3f(normalForFace.getX() + adjustment, normalForFace.getY() + + adjustment, normalForFace.getZ() + adjustment); + norm.normalize(); + buffer.pos(matrix4f, vertex.getX(), vertex.getY(), vertex.getZ()).color(red, green, blue, alpha).tex(uv[U_ARRAY], uv[V_ARRAY]).overlay(overlay).lightmap(light).normal(normal, norm.getX(), norm.getY(), norm.getZ()).endVertex(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java b/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java new file mode 100644 index 00000000..006b7f4f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java @@ -0,0 +1,167 @@ +package wayoftime.bloodmagic.client.render; + +import java.util.Arrays; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Matrix3f; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; +import net.minecraft.util.math.vector.Vector3i; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; + +public class RenderResizableQuadrilateral +{ + public static final RenderResizableQuadrilateral INSTANCE = new RenderResizableQuadrilateral(); + private static final Vector3f VEC_ZERO = new Vector3f(0, 0, 0); + private static final int U_MIN = 0; + private static final int U_MAX = 1; + private static final int V_MIN = 2; + private static final int V_MAX = 3; + + protected EntityRendererManager manager = Minecraft.getInstance().getRenderManager(); + + private static Vector3f withValue(Vector3f vector, Axis axis, float value) + { + if (axis == Axis.X) + { + return new Vector3f(value, vector.getY(), vector.getZ()); + } else if (axis == Axis.Y) + { + return new Vector3f(vector.getX(), value, vector.getZ()); + } else if (axis == Axis.Z) + { + return new Vector3f(vector.getX(), vector.getY(), value); + } + throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + + vector + ")"); + } + + public static double getValue(Vector3d vector, Axis axis) + { + if (axis == Axis.X) + { + return vector.x; + } else if (axis == Axis.Y) + { + return vector.y; + } else if (axis == Axis.Z) + { + return vector.z; + } + throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + + vector + ")"); + } + + public void renderSquare(Model2D square, MatrixStack matrix, IVertexBuilder buffer, int argb, int light, int overlay) + { + float red = BloodMagicRenderer.getRed(argb); + float green = BloodMagicRenderer.getGreen(argb); + float blue = BloodMagicRenderer.getBlue(argb); + float alpha = BloodMagicRenderer.getAlpha(argb); + Vector3d size = new Vector3d(square.sizeX(), 0, square.sizeY()); + matrix.push(); + matrix.translate(square.minX, 0, square.minY); + MatrixStack.Entry lastMatrix = matrix.getLast(); + Matrix4f matrix4f = lastMatrix.getMatrix(); + Matrix3f normal = lastMatrix.getNormal(); + Direction face = Direction.UP; +// for (Direction face : Direction.values()) + + int ordinal = face.ordinal(); +// TextureAtlasSprite sprite = cube.textures[ordinal]; + ResourceLocation rl = square.resource; + if (rl != null) + { +// Minecraft.getInstance().textureManager.bindTexture(rl); + Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; + Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; + float other = face.getAxisDirection() == AxisDirection.POSITIVE ? (float) getValue(size, face.getAxis()) + : 0; + + // Swap the face if this is positive: the renderer returns indexes that ALWAYS + // are for the negative face, so light it properly this way + face = face.getAxisDirection() == AxisDirection.NEGATIVE ? face : face.getOpposite(); +// Direction opposite = face.getOpposite(); + + float minU = 0; + float maxU = 1; + // Flip the v + float minV = 1; + float maxV = 0; +// float minU = sprite.getMinU(); +// float maxU = sprite.getMaxU(); +// // Flip the v +// float minV = sprite.getMaxV(); +// float maxV = sprite.getMinV(); + double sizeU = getValue(size, u); + double sizeV = getValue(size, v); + // TODO: Look into this more, as it makes tiling of multiple objects not render + // properly if they don't fit the full texture. + // Example: Mechanical pipes rendering water or lava, makes it relatively easy + // to see the texture artifacts + for (int uIndex = 0; uIndex < sizeU; uIndex++) + { + float[] baseUV = new float[] + { minU, maxU, minV, maxV }; + double addU = 1; + // If the size of the texture is greater than the cuboid goes on for then make + // sure the texture positions are lowered + if (uIndex + addU > sizeU) + { +// addU = sizeU - uIndex; + baseUV[U_MAX] = baseUV[U_MIN] + (baseUV[U_MAX] - baseUV[U_MIN]) * (float) addU; + } + for (int vIndex = 0; vIndex < sizeV; vIndex++) + { + float[] uv = Arrays.copyOf(baseUV, 4); + double addV = 1; + if (vIndex + addV > sizeV) + { +// addV = sizeV - vIndex; + uv[V_MAX] = uv[V_MIN] + (uv[V_MAX] - uv[V_MIN]) * (float) addV; + } + float[] xyz = new float[] + { uIndex, (float) (uIndex + addU), vIndex, (float) (vIndex + addV) }; + + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); + renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); + +// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); +// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); +// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); +// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); + } + + } + } + matrix.pop(); + } + + private void renderPoint(Matrix4f matrix4f, Matrix3f normal, IVertexBuilder buffer, Direction face, Axis u, Axis v, float other, float[] uv, float[] xyz, boolean minU, boolean minV, float red, float green, float blue, float alpha, int light, int overlay) + { + int U_ARRAY = minU ? U_MIN : U_MAX; + int V_ARRAY = minV ? V_MIN : V_MAX; + Vector3f vertex = withValue(VEC_ZERO, u, xyz[U_ARRAY]); + vertex = withValue(vertex, v, xyz[V_ARRAY]); + vertex = withValue(vertex, face.getAxis(), other); + Vector3i normalForFace = face.getDirectionVec(); + // TODO: Figure out how and why this works, it gives about the same brightness + // as we used to have but I don't understand why/how + float adjustment = 2.5F; + Vector3f norm = new Vector3f(normalForFace.getX() + adjustment, normalForFace.getY() + + adjustment, normalForFace.getZ() + adjustment); + norm.normalize(); + buffer.pos(matrix4f, vertex.getX(), vertex.getY(), vertex.getZ()).color(red, green, blue, alpha).tex(uv[U_ARRAY], uv[V_ARRAY]).overlay(overlay).lightmap(light).normal(normal, norm.getX(), norm.getY(), norm.getZ()).endVertex(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java new file mode 100644 index 00000000..510e51af --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java @@ -0,0 +1,114 @@ +package wayoftime.bloodmagic.client.render.alchemyarray; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Quaternion; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; +import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class AlchemyArrayRenderer +{ + public final ResourceLocation arrayResource; + + public AlchemyArrayRenderer() + { + this(new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/sightsigil.png")); + } + + public AlchemyArrayRenderer(ResourceLocation arrayResource) + { + this.arrayResource = arrayResource; + } + + public float getRotation(float craftTime) + { + float offset = 2; + if (craftTime >= offset) + { + float modifier = (float) Math.pow(craftTime - offset, 1.5); + return modifier * 1f; + } + return 0; + } + + public float getSecondaryRotation(float craftTime) + { + float offset = 50; + if (craftTime >= offset) + { + float modifier = (float) Math.pow(craftTime - offset, 1.7); + return modifier * 0.5f; + } + return 0; + } + + public float getSizeModifier(float craftTime) + { + if (craftTime >= 150 && craftTime <= 250) + { + return (200 - craftTime) / 50f; + } + return 1.0f; + } + + public float getVerticalOffset(float craftTime) + { + if (craftTime >= 5) + { + if (craftTime <= 40) + { + return (float) (-0.4 + (0.4) * Math.pow((craftTime - 5) / 35f, 3)); + } else + { + return 0; + } + } + return -0.4f; + } + + public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) + { + matrixStack.push(); + + matrixStack.translate(0.5, 0.5, 0.5); + + float rot = getRotation(craftTime); + float secondaryRot = getSecondaryRotation(craftTime); + + float size = 1.0F * getSizeModifier(craftTime); + Direction rotation = tileArray.getRotation(); + + matrixStack.push(); + matrixStack.translate(0, getVerticalOffset(craftTime), 0); + matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); + + matrixStack.push(); + + matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rot, true)); + matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), secondaryRot, true)); + matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); + + IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); + Model2D arrayModel = new BloodMagicRenderer.Model2D(); + arrayModel.minX = -0.5; + arrayModel.maxX = +0.5; + arrayModel.minY = -0.5; + arrayModel.maxY = +0.5; + arrayModel.resource = arrayResource; + + matrixStack.scale(size, size, size); + + RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, combinedLightIn, combinedOverlayIn); + + matrixStack.pop(); + matrixStack.pop(); + matrixStack.pop(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java new file mode 100644 index 00000000..23609445 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java @@ -0,0 +1,24 @@ +package wayoftime.bloodmagic.client.render.entity; + +import com.mojang.blaze3d.matrix.MatrixStack; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.entity.SpriteRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.IRendersAsItem; + +public class BloodLightRenderer extends SpriteRenderer +{ + public BloodLightRenderer(EntityRendererManager renderManagerIn) + { + super(renderManagerIn, Minecraft.getInstance().getItemRenderer()); + } + + @Override + public void render(T entityIn, float entityYaw, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int packedLightIn) + { + super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java new file mode 100644 index 00000000..f2084b34 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java @@ -0,0 +1,24 @@ +package wayoftime.bloodmagic.client.render.entity; + +import com.mojang.blaze3d.matrix.MatrixStack; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.entity.SpriteRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.IRendersAsItem; + +public class SoulSnareRenderer extends SpriteRenderer +{ + public SoulSnareRenderer(EntityRendererManager renderManagerIn) + { + super(renderManagerIn, Minecraft.getInstance().getItemRenderer()); + } + + @Override + public void render(T entityIn, float entityYaw, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int packedLightIn) + { + super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java new file mode 100644 index 00000000..c1d8091a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java @@ -0,0 +1,68 @@ +package wayoftime.bloodmagic.client.screens; + +import com.mojang.blaze3d.matrix.MatrixStack; + +import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import wayoftime.bloodmagic.BloodMagic; + +public abstract class ScreenBase extends ContainerScreen +{ + private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/soulforge.png"); + + protected final T container; + + public ScreenBase(T container, PlayerInventory playerInventory, ITextComponent title) + { + super(container, playerInventory, title); + this.container = container; + } + + public ResourceLocation getBackground() + { + return background; + } + + @Override + public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) + { + this.renderBackground(stack); + super.render(stack, mouseX, mouseY, partialTicks); + + this.renderHoveredTooltip(stack, mouseX, mouseY); // @mcp: func_230459_a_ = renderHoveredToolTip +// if (mouseX > (guiLeft + 7) && mouseX < (guiLeft + 7) + 18 && mouseY > (guiTop + 7) +// && mouseY < (guiTop + 7) + 73) +// this.renderTooltip(stack, LanguageMap.getInstance().func_244260_a(Arrays.asList(new TranslationTextComponent("screen.diregoo.energy", MagicHelpers.withSuffix(this.container.getEnergy()), MagicHelpers.withSuffix(this.container.getMaxPower())))), mouseX, mouseY); + } + + @Override + public void init() + { + super.init(); + } + + @Override + protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) + { +// RenderSystem.color4f(1, 1, 1, 1); +// getMinecraft().getTextureManager().bindTexture(getBackground()); +// this.blit(stack, guiLeft, guiTop, 0, 0, xSize, ySize); + +// int maxEnergy = this.container.getMaxPower(), height = 70; +// if (maxEnergy > 0) +// { +// int remaining = (this.container.getEnergy() * height) / maxEnergy; +// this.blit(stack, guiLeft + 8, guiTop + 78 - remaining, 176, 84 - remaining, 16, remaining + 1); +// } + } + +// + protected static TranslationTextComponent getTrans(String key, Object... args) + { + return new TranslationTextComponent(BloodMagic.MODID + "." + key, args); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java new file mode 100644 index 00000000..4fa2c9ce --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java @@ -0,0 +1,85 @@ +package wayoftime.bloodmagic.client.screens; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.systems.RenderSystem; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.tile.TileSoulForge; +import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; + +public class ScreenSoulForge extends ScreenBase +{ + private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/soulforge.png"); + public IInventory tileSoulForge; + + public ScreenSoulForge(ContainerSoulForge container, PlayerInventory playerInventory, ITextComponent title) + { + super(container, playerInventory, title); + tileSoulForge = container.tileForge; + this.xSize = 176; + this.ySize = 205; + } + + @Override + public ResourceLocation getBackground() + { + return background; + } + +// public + +// public ScreenSoulForge(InventoryPlayer playerInventory, IInventory tileSoulForge) +// { +// super(new ContainerSoulForge(playerInventory, tileSoulForge)); +// this.tileSoulForge = tileSoulForge; +// this.xSize = 176; +// this.ySize = 205; +// } +// +// @Override +// public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) +// { +// this.drawDefaultBackground(); +// super.drawScreen(mouseX, mouseY, partialTicks); +// this.renderHoveredToolTip(mouseX, mouseY); +// } +// + @Override + protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) + { + this.font.func_243248_b(stack, new TranslationTextComponent("tile.bloodmagic.soulforge.name"), 8, 5, 4210752); + this.font.func_243248_b(stack, new TranslationTextComponent("container.inventory"), 8, 111, 4210752); + } + +// + @Override + protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) + { + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + getMinecraft().getTextureManager().bindTexture(background); + int i = (this.width - this.xSize) / 2; + int j = (this.height - this.ySize) / 2; + this.blit(stack, i, j, 0, 0, this.xSize, this.ySize); + + int l = this.getCookProgressScaled(90); + this.blit(stack, i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); + } + +// + public int getCookProgressScaled(int scale) + { + double progress = ((TileSoulForge) tileSoulForge).getProgressForGui(); +// if (tileSoulForge != null) +// { +// System.out.println("Tile is NOT null"); +// } +// double progress = ((float) this.container.data.get(0)) / ((float) this.container.data.get(1)); +// System.out.println(this.container.data.get(0)); + return (int) (progress * scale); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java new file mode 100644 index 00000000..36c6d12e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java @@ -0,0 +1,15 @@ +package wayoftime.bloodmagic.common.alchemyarray; + +import net.minecraft.nbt.CompoundNBT; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public abstract class AlchemyArrayEffect +{ + public abstract AlchemyArrayEffect getNewCopy(); + + public abstract void readFromNBT(CompoundNBT compound); + + public abstract void writeToNBT(CompoundNBT compound); + + public abstract boolean update(TileAlchemyArray array, int activeCounter); +} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java new file mode 100644 index 00000000..eebde533 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java @@ -0,0 +1,69 @@ +package wayoftime.bloodmagic.common.alchemyarray; + +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.math.BlockPos; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect +{ + public final ItemStack outputStack; + public int tickLimit; + + public AlchemyArrayEffectCrafting(ItemStack outputStack) + { + this(outputStack, 200); + } + + public AlchemyArrayEffectCrafting(ItemStack outputStack, int tickLimit) + { + this.outputStack = outputStack; + this.tickLimit = tickLimit; + } + + @Override + public boolean update(TileAlchemyArray tile, int ticksActive) + { + // TODO: Add recipe rechecking to verify nothing screwy is going on. + if (tile.getWorld().isRemote) + { + return false; + } + + if (ticksActive >= tickLimit) + { + BlockPos pos = tile.getPos(); + + ItemStack output = outputStack.copy(); + + ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + + 0.5, output); + + tile.getWorld().addEntity(outputEntity); +// tile.getWorld().spawnEntity(outputEntity); + + return true; + } + + return false; + } + + @Override + public void writeToNBT(CompoundNBT tag) + { + + } + + @Override + public void readFromNBT(CompoundNBT tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectCrafting(outputStack, tickLimit); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java new file mode 100644 index 00000000..f4202567 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java @@ -0,0 +1,112 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +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.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; +import wayoftime.bloodmagic.tile.TileAlchemyArray; +import wayoftime.bloodmagic.util.Utils; + +public class BlockAlchemyArray extends Block +{ + protected static final VoxelShape BODY = Block.makeCuboidShape(1, 0, 1, 15, 1, 15); + + public BlockAlchemyArray() + { + super(Properties.create(Material.WOOL).hardnessAndResistance(1.0F, 0).doesNotBlockMovement()); + } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) + { + return BODY; + } + + @Override + public boolean hasTileEntity(BlockState state) + { + return true; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) + { + return new TileAlchemyArray(); + } + + @Override + public BlockRenderType getRenderType(BlockState state) + { + return BlockRenderType.ENTITYBLOCK_ANIMATED; + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) + { + TileAlchemyArray array = (TileAlchemyArray) world.getTileEntity(pos); + + if (array == null || player.isSneaking()) + return ActionResultType.FAIL; + + ItemStack playerItem = player.getHeldItem(hand); + + if (!playerItem.isEmpty()) + { + if (array.getStackInSlot(0).isEmpty()) + { + Utils.insertItemToTile(array, player, 0); + world.notifyBlockUpdate(pos, state, state, 3); + } else if (!array.getStackInSlot(0).isEmpty()) + { + Utils.insertItemToTile(array, player, 1); + array.attemptCraft(); + world.notifyBlockUpdate(pos, state, state, 3); + } else + { + return ActionResultType.SUCCESS; + } + } + + world.notifyBlockUpdate(pos, state, state, 3); + return ActionResultType.SUCCESS; + } + + @Override + public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) + { + TileAlchemyArray alchemyArray = (TileAlchemyArray) world.getTileEntity(blockPos); + if (alchemyArray != null) + alchemyArray.dropItems(); + + super.onPlayerDestroy(world, blockPos, blockState); + } + + @Override + public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + { + if (!state.isIn(newState.getBlock())) + { + TileEntity tileentity = worldIn.getTileEntity(pos); + if (tileentity instanceof TileAlchemyArray) + { + ((TileAlchemyArray) tileentity).dropItems(); + worldIn.updateComparatorOutputLevel(pos, this); + } + + super.onReplaced(state, worldIn, pos, newState, isMoving); + } + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java new file mode 100644 index 00000000..0332d2ff --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java @@ -0,0 +1,100 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +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.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import wayoftime.bloodmagic.iface.IAltarReader; +import wayoftime.bloodmagic.tile.TileAltar; +import wayoftime.bloodmagic.util.Utils; + +public class BlockAltar extends Block +{ + protected static final VoxelShape BODY = Block.makeCuboidShape(0, 0, 0, 16, 12, 16); + + public BlockAltar() + { + super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); + } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) + { + return BODY; + } + + @Override + public boolean hasTileEntity(BlockState state) + { + return true; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) + { + return new TileAltar(); + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) + { + TileAltar altar = (TileAltar) world.getTileEntity(pos); + + if (altar == null || player.isSneaking()) + return ActionResultType.FAIL; + + ItemStack playerItem = player.getHeldItem(hand); + + if (playerItem.getItem() instanceof IAltarReader)// || playerItem.getItem() instanceof IAltarManipulator) + { + playerItem.getItem().onItemRightClick(world, player, hand); + return ActionResultType.SUCCESS; + } + + if (Utils.insertItemToTile(altar, player)) + altar.startCycle(); + else + altar.setActive(); + + world.notifyBlockUpdate(pos, state, state, 3); + return ActionResultType.SUCCESS; + } + + @Override + public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) + { + TileAltar altar = (TileAltar) world.getTileEntity(blockPos); + if (altar != null) + altar.dropItems(); + + super.onPlayerDestroy(world, blockPos, blockState); + } + + @Override + public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + { + if (!state.isIn(newState.getBlock())) + { + TileEntity tileentity = worldIn.getTileEntity(pos); + if (tileentity instanceof TileAltar) + { + ((TileAltar) tileentity).dropItems(); + worldIn.updateComparatorOutputLevel(pos, this); + } + + super.onReplaced(state, worldIn, pos, newState, isMoving); + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java new file mode 100644 index 00000000..4f3ad3f0 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java @@ -0,0 +1,64 @@ +package wayoftime.bloodmagic.common.block; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.particles.RedstoneParticleData; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public class BlockBloodLight extends Block +{ + protected static final VoxelShape BODY = Block.makeCuboidShape(7, 7, 7, 9, 9, 9); + + public BlockBloodLight() + { + super(Properties.create(Material.WOOL).doesNotBlockMovement().setLightLevel((state) -> { + return 15; + })); + } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) + { + return BODY; + } + + @Override + public BlockRenderType getRenderType(BlockState state) + { + return BlockRenderType.ENTITYBLOCK_ANIMATED; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void animateTick(BlockState stateIn, World world, BlockPos pos, Random rand) + { + ClientPlayerEntity player = Minecraft.getInstance().player; + + if (rand.nextInt(3) != 0) + { + world.addParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5D + + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0); + ItemStack heldItem = player.getHeldItem(Hand.MAIN_HAND); + +// if (heldItem.isEmpty() || heldItem.getItem() != RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT) +// return; +// +// for (int i = 0; i < 8; i++) world.addParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5D +// + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0); + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java new file mode 100644 index 00000000..0d993c0c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java @@ -0,0 +1,45 @@ +package wayoftime.bloodmagic.common.block; + +import java.util.List; + +import javax.annotation.Nullable; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import wayoftime.bloodmagic.block.enums.BloodRuneType; +import wayoftime.bloodmagic.iface.IBloodRune; + +public class BlockBloodRune extends Block implements IBloodRune +{ + private final BloodRuneType type; + + public BlockBloodRune(BloodRuneType type) + { + super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2).sound(SoundType.STONE)); + this.type = type; + } + + @Nullable + @Override + public BloodRuneType getBloodRune(World world, BlockPos pos) + { + return type; + } + + @Override + public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, + ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.decoration.safe")); + super.addInformation(stack, world, tooltip, flag); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java new file mode 100644 index 00000000..27f7b461 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java @@ -0,0 +1,95 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.inventory.container.INamedContainerProvider; +import net.minecraft.tileentity.TileEntity; +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.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.fml.network.NetworkHooks; +import wayoftime.bloodmagic.tile.TileSoulForge; + +public class BlockSoulForge extends Block// implements IBMBlock +{ + protected static final VoxelShape BODY = Block.makeCuboidShape(1, 0, 1, 15, 12, 15); + + public BlockSoulForge() + { + super(Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); + +// setTranslationKey(BloodMagic.MODID + ".soulForge"); +// setHardness(2.0F); +// setResistance(5.0F); +// setSoundType(SoundType.METAL); +// setHarvestLevel("pickaxe", 1); +// setCreativeTab(BloodMagic.TAB_BM); + } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) + { + return BODY; + } + + @Override + public boolean hasTileEntity(BlockState state) + { + return true; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) + { + return new TileSoulForge(); + } + + @Override + public BlockRenderType getRenderType(BlockState state) + { + return BlockRenderType.MODEL; + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) + { + if (world.isRemote) + return ActionResultType.SUCCESS; + + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileSoulForge)) + return ActionResultType.FAIL; + + NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tile, pos); +// player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); + + return ActionResultType.SUCCESS; + } + +// @Override +// public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) +// { +// TileSoulForge tileSoulForge = (TileSoulForge) world.getTileEntity(blockPos); +// if (tileSoulForge != null) +// tileSoulForge.dropItems(); +// +// super.breakBlock(world, blockPos, blockState); +// } + +// +// @Override +// public BlockItem getItem() +// { +// return new BlockItem(this); +// } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java new file mode 100644 index 00000000..955b36b8 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java @@ -0,0 +1,88 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.FlowingFluidBlock; +import net.minecraft.fluid.FlowingFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.item.BucketItem; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.extensions.IForgeContainerType; +import net.minecraftforge.fluids.FluidAttributes; +import net.minecraftforge.fluids.ForgeFlowingFluid; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.block.enums.BloodRuneType; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; + +public class BloodMagicBlocks +{ + public static final ResourceLocation FLUID_STILL = new ResourceLocation("bloodmagic:block/lifeessencestill"); + public static final ResourceLocation FLUID_FLOWING = new ResourceLocation("bloodmagic:block/lifeessenceflowing"); + + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); + public static final DeferredRegister BASICBLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); + public static final DeferredRegister ITEMS = BloodMagicItems.ITEMS; + public static final DeferredRegister FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, BloodMagic.MODID); + public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, BloodMagic.MODID); + +// public static final RegistryObject BLOODSTONE = BASICBLOCKS.register("ruby_block", BloodstoneBlock::new); + public static final RegistryObject SOUL_FORGE = BLOCKS.register("soulforge", BlockSoulForge::new); + public static final RegistryObject ALCHEMY_ARRAY = BLOCKS.register("alchemyarray", BlockAlchemyArray::new); + public static final RegistryObject BLANK_RUNE = BASICBLOCKS.register("blankrune", () -> new BlockBloodRune(BloodRuneType.BLANK)); + public static final RegistryObject SPEED_RUNE = BASICBLOCKS.register("speedrune", () -> new BlockBloodRune(BloodRuneType.SPEED)); + public static final RegistryObject SACRIFICE_RUNE = BASICBLOCKS.register("sacrificerune", () -> new BlockBloodRune(BloodRuneType.SACRIFICE)); + public static final RegistryObject SELF_SACRIFICE_RUNE = BASICBLOCKS.register("selfsacrificerune", () -> new BlockBloodRune(BloodRuneType.SELF_SACRIFICE)); + public static final RegistryObject DISPLACEMENT_RUNE = BASICBLOCKS.register("dislocationrune", () -> new BlockBloodRune(BloodRuneType.DISPLACEMENT)); + public static final RegistryObject CAPACITY_RUNE = BASICBLOCKS.register("altarcapacityrune", () -> new BlockBloodRune(BloodRuneType.CAPACITY)); + public static final RegistryObject AUGMENTED_CAPACITY_RUNE = BASICBLOCKS.register("bettercapacityrune", () -> new BlockBloodRune(BloodRuneType.AUGMENTED_CAPACITY)); + public static final RegistryObject ORB_RUNE = BASICBLOCKS.register("orbcapacityrune", () -> new BlockBloodRune(BloodRuneType.ORB)); + public static final RegistryObject ACCELERATION_RUNE = BASICBLOCKS.register("accelerationrune", () -> new BlockBloodRune(BloodRuneType.ACCELERATION)); + public static final RegistryObject CHARGING_RUNE = BASICBLOCKS.register("chargingrune", () -> new BlockBloodRune(BloodRuneType.CHARGING)); + + public static final RegistryObject BLOOD_ALTAR = BLOCKS.register("altar", () -> new BlockAltar()); + public static final RegistryObject BLOOD_LIGHT = BLOCKS.register("bloodlight", () -> new BlockBloodLight()); + + private static ForgeFlowingFluid.Properties makeProperties() + { + return new ForgeFlowingFluid.Properties(LIFE_ESSENCE_FLUID, LIFE_ESSENCE_FLUID_FLOWING, FluidAttributes.builder(FLUID_STILL, FLUID_FLOWING)).bucket(LIFE_ESSENCE_BUCKET).block(LIFE_ESSENCE_BLOCK); + } + + public static RegistryObject LIFE_ESSENCE_FLUID = FLUIDS.register("life_essence_fluid", () -> new ForgeFlowingFluid.Source(makeProperties())); + public static RegistryObject LIFE_ESSENCE_FLUID_FLOWING = FLUIDS.register("life_essence_fluid_flowing", () -> new ForgeFlowingFluid.Flowing(makeProperties())); + + public static RegistryObject LIFE_ESSENCE_BLOCK = BLOCKS.register("life_essence_block", () -> new FlowingFluidBlock(LIFE_ESSENCE_FLUID, Block.Properties.create(net.minecraft.block.material.Material.WATER).doesNotBlockMovement().hardnessAndResistance(100.0F).noDrops())); + public static RegistryObject LIFE_ESSENCE_BUCKET = ITEMS.register("life_essence_bucket", () -> new BucketItem(LIFE_ESSENCE_FLUID, new Item.Properties().containerItem(Items.BUCKET).maxStackSize(1).group(BloodMagic.TAB))); + + public static final RegistryObject> SOUL_FORGE_CONTAINER = CONTAINERS.register("soul_forge_container", () -> IForgeContainerType.create(ContainerSoulForge::new)); +// public static final RegistryObject BLOOD_STONE = registerNoItem("blood_stone", () -> new BloodstoneBlock()); +// +//// private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) +//// { +//// RegistryObject ret = registerNoItem(name, sup); +//// ITEMS.register(name, itemCreator.apply(ret)); +//// return ret; +//// } +// +// private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) +// { +// RegistryObject ret = registerNoItem(name, sup); +// ITEMS.register(name, itemCreator.apply(ret)); +// return ret; +// } +// +// private static RegistryObject registerNoItem(String name, Supplier sup) +// { +// return BLOCKS.register(name, sup); +// } + +// private static Supplier item(final RegistryObject block, final Supplier> renderMethod) +// { +// return () -> new BlockItem(block.get(), new Item.Properties().group(IronChests.IRONCHESTS_ITEM_GROUP).setISTER(renderMethod)); +// } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java new file mode 100644 index 00000000..ad4a9a4e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java @@ -0,0 +1,13 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BloodstoneBlock extends Block +{ + public BloodstoneBlock() + { + super(Properties.create(Material.ROCK)); + // TODO Auto-generated constructor stub + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java new file mode 100644 index 00000000..60f56a5f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java @@ -0,0 +1,51 @@ +package wayoftime.bloodmagic.common.data; + +import java.util.function.Consumer; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.ShapedRecipeBuilder; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.common.Tags; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.data.recipe.BaseRecipeProvider; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; + +public class GeneratorBaseRecipes extends BaseRecipeProvider +{ + public GeneratorBaseRecipes(DataGenerator gen) + { + super(gen, BloodMagic.MODID); + } + + @Override + protected void registerRecipes(Consumer consumer) + { + addVanillaRecipes(consumer); + addBloodOrbRecipes(consumer); + } + + private void addVanillaRecipes(Consumer consumer) + { + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SACRIFICIAL_DAGGER.get()).key('g', Tags.Items.GLASS).key('G', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).patternLine("ggg").patternLine(" Gg").patternLine("i g").addCriterion("has_glass", hasItem(Items.GLASS)).build(consumer, BloodMagic.rl("sacrificial_dagger")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLOOD_ALTAR.get()).key('a', Tags.Items.STONE).key('b', Items.FURNACE).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicItems.MONSTER_SOUL_RAW.get()).patternLine("a a").patternLine("aba").patternLine("cdc").addCriterion("has_will", hasItem(BloodMagicItems.MONSTER_SOUL_RAW.get())).build(consumer, BloodMagic.rl("blood_altar")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SOUL_FORGE.get()).key('s', Tags.Items.STONE).key('g', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).key('o', Tags.Items.STORAGE_BLOCKS_IRON).patternLine("i i").patternLine("sgs").patternLine("sos").addCriterion("has_gold", hasItem(Items.GOLD_INGOT)).build(consumer, BloodMagic.rl("soul_forge")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SOUL_SNARE.get(), 4).key('r', Tags.Items.DUSTS_REDSTONE).key('s', Tags.Items.STRING).key('i', Tags.Items.INGOTS_IRON).patternLine("sis").patternLine("iri").patternLine("sis").addCriterion("has_redstone", hasItem(Items.REDSTONE)).build(consumer, BloodMagic.rl("soul_snare")); + } + + private void addBloodOrbRecipes(Consumer consumer) + { + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RUNE.get()).key('a', Tags.Items.STONE).key('s', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("aaa").patternLine("sos").patternLine("aaa").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_blank")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('a', Tags.Items.STONE).key('b', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('c', Ingredient.fromItems(Items.SUGAR)).key('d', BloodMagicBlocks.BLANK_RUNE.get()).patternLine("aba").patternLine("cdc").patternLine("aba").addCriterion("has_blank_rune", hasItem(BloodMagicItems.BLANK_RUNE_ITEM.get())).build(consumer, BloodMagic.rl("blood_rune_speed")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SACRIFICE_RUNE.get()).key('a', Tags.Items.STONE).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicBlocks.BLANK_RUNE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_sacrifice")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SELF_SACRIFICE_RUNE.get()).key('a', Tags.Items.STONE).key('b', Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get())).key('c', Ingredient.fromItems(Items.GLOWSTONE_DUST)).key('d', Ingredient.fromItems(BloodMagicItems.BLANK_RUNE_ITEM.get())).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_self_sacrifice")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CAPACITY_RUNE.get()).key('a', Tags.Items.STONE).key('b', Items.BUCKET).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', BloodMagicItems.IMBUED_SLATE.get()).patternLine("aba").patternLine("bcb").patternLine("ada").addCriterion("has_imbued_slate", hasItem(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl("blood_rune_capacity")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ORB_RUNE.get()).key('a', Tags.Items.STONE).key('b', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aba").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_orb")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CHARGING_RUNE.get()).key('R', Tags.Items.DUSTS_REDSTONE).key('r', BloodMagicBlocks.BLANK_RUNE.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).key('G', Tags.Items.DUSTS_GLOWSTONE).patternLine("RsR").patternLine("GrG").patternLine("ReR").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_charging")); +// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', Ingredient.fromItems(Items.DIAMOND)).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_standard")); +// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_orb")); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java new file mode 100644 index 00000000..cbb374ea --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java @@ -0,0 +1,38 @@ +package wayoftime.bloodmagic.common.data; + +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.fml.RegistryObject; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; + +public class GeneratorBlockStates extends BlockStateProvider +{ + public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) + { + super(gen, BloodMagic.MODID, exFileHelper); + } + + @Override + protected void registerStatesAndModels() + { +// buildCubeAll(BloodMagicBlocks.TARTARICFORGE.get()); +// buildCubeAll(BloodMagicBlocks.SPEED_RUNE.get()); + + for (RegistryObject block : BloodMagicBlocks.BASICBLOCKS.getEntries()) + { + buildCubeAll(block.get()); + } + + buildCubeAll(BloodMagicBlocks.BLOOD_LIGHT.get()); + } + + private void buildCubeAll(Block block) + { + getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(cubeAll(block)).build()); + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java new file mode 100644 index 00000000..06c2f49c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java @@ -0,0 +1,105 @@ +package wayoftime.bloodmagic.common.data; + +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.item.Item; +import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.fml.RegistryObject; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +public class GeneratorItemModels extends ItemModelProvider +{ + public GeneratorItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper) + { + super(generator, BloodMagic.MODID, existingFileHelper); + } + + @Override + protected void registerModels() + { +// registerBlockModel(BloodMagicBlocks.TARTARICFORGE.get()); +// registerBlockModel(BloodMagicBlocks.SPEED_RUNE.get()); + + for (RegistryObject item : BloodMagicItems.BASICITEMS.getEntries()) + { + registerBasicItem(item.get()); + } + + for (RegistryObject block : BloodMagicBlocks.BASICBLOCKS.getEntries()) + { + registerBlockModel(block.get()); + } + + registerToggleableItem(BloodMagicItems.GREEN_GROVE_SIGIL.get()); + registerToggleableItem(BloodMagicItems.FAST_MINER_SIGIL.get()); + registerToggleableItem(BloodMagicItems.MAGNETISM_SIGIL.get()); + registerToggleableItem(BloodMagicItems.ICE_SIGIL.get()); + registerDemonWillVariantItem(BloodMagicItems.PETTY_GEM.get()); + registerDemonWillVariantItem(BloodMagicItems.LESSER_GEM.get()); + registerDemonWillVariantItem(BloodMagicItems.COMMON_GEM.get()); + registerDemonSword(BloodMagicItems.SENTIENT_SWORD.get()); + } + + private void registerBlockModel(Block block) + { + String path = block.getRegistryName().getPath(); + getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); + } + + private void registerBasicItem(Item item) + { + String path = item.getRegistryName().getPath(); + singleTexture(path, mcLoc("item/handheld"), "layer0", modLoc("item/" + path)); + } + + private void registerToggleableItem(Item item) + { + String path = item.getRegistryName().getPath(); + ModelFile activatedFile = singleTexture("item/variants/" + path + "_activated", mcLoc("item/handheld"), "layer0", modLoc("item/" + path + "_activated")); + ModelFile deactivatedFile = singleTexture("item/variants/" + path + "_deactivated", mcLoc("item/handheld"), "layer0", modLoc("item/" + path + "_deactivated")); + getBuilder(path).override().predicate(BloodMagic.rl("active"), 0).model(deactivatedFile).end().override().predicate(BloodMagic.rl("active"), 1).model(activatedFile).end(); + } + + private void registerDemonWillVariantItem(Item item) + { + String path = item.getRegistryName().getPath(); + ItemModelBuilder builder = getBuilder(path); + + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + String name = ""; + if (type.ordinal() != 0) + { + name = "_" + type.name().toLowerCase(); + } + ModelFile willFile = singleTexture("item/variants/" + path + name, mcLoc("item/handheld"), "layer0", modLoc("item/" + path + name)); + builder = builder.override().predicate(BloodMagic.rl("type"), type.ordinal()).model(willFile).end(); + } + } + + private void registerDemonSword(Item item) + { + String path = item.getRegistryName().getPath(); + ItemModelBuilder builder = getBuilder(path); + + for (int i = 0; i <= 1; i++) + { + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + String name = i == 0 ? "_deactivated" : "_activated"; + if (type.ordinal() != 0) + { + name = "_" + type.name().toLowerCase() + name; + } + ModelFile willFile = singleTexture("item/variants/" + path + name, mcLoc("item/handheld"), "layer0", modLoc("item/" + path + name)); + builder = builder.override().predicate(BloodMagic.rl("type"), type.ordinal()).predicate(BloodMagic.rl("active"), i).model(willFile).end(); + } + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java new file mode 100644 index 00000000..e72dabd6 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -0,0 +1,161 @@ +package wayoftime.bloodmagic.common.data; + +import net.minecraft.data.DataGenerator; +import net.minecraftforge.common.data.LanguageProvider; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; + +public class GeneratorLanguage extends LanguageProvider +{ + public GeneratorLanguage(DataGenerator gen) + { + super(gen, BloodMagic.MODID, "en_us"); + } + + @Override + protected void addTranslations() + { + // Creative Tab + add("itemGroup.bloodmagic.creativeTab", "Blood Magic"); + + // Tile Entitites + add("tile.bloodmagic.soulforge.name", "Hellfire Forge"); + + // Blood Orb tooltips + add("tooltip.bloodmagic.extraInfo", "&9-Hold shift for more info-"); + add("tooltip.bloodmagic.orb.desc", "Stores raw Life Essence"); + add("tooltip.bloodmagic.orb.owner", "Added by: %s"); + add("tooltip.bloodmagic.currentOwner", "Current owner: %s"); + add("tooltip.bloodmagic.currentTier", "Current tier: %d"); + add("tooltip.bloodmagic.config.disabled", "Currently disabled in the Config"); + add("tooltip.bloodmagic.tier", "Tier %d"); + + // Sigil tooltips + add("tooltip.bloodmagic.sigil.divination.desc", "Peer into the soul"); + add("tooltip.bloodmagic.sigil.divination.otherNetwork", "Peering into the soul of %s"); + add("tooltip.bloodmagic.sigil.divination.currentAltarTier", "Current Tier: %d"); + add("tooltip.bloodmagic.sigil.divination.currentEssence", "Current Essence: %d LP"); + add("tooltip.bloodmagic.sigil.divination.currentAltarCapacity", "Current Capacity: %d LP"); + add("tooltip.bloodmagic.sigil.divination.currentTranquility", "Current Tranquility: %d"); +// add("tooltip.bloodmagic.sigil.divination.currentInversion", "Current Inversion: %d"); + add("tooltip.bloodmagic.sigil.divination.currentBonus", "Current Bonus: +%d%%"); + + add("tooltip.bloodmagic.decoration.safe", "Safe for decoration"); + add("tooltip.bloodmagic.decoration.notSafe", "Dangerous for decoration"); + + // General Tooltips + add("tooltip.bloodmagic.arcaneAshes", "Ashes used to draw an alchemy circle"); + add("tooltip.bloodmagic.will", "Will Quality: %s"); + add("tooltip.bloodmagic.sentientSword.desc", "Uses demon will to unleash its full potential."); + add("tooltip.bloodmagic.sentientAxe.desc", "Uses demon will to unleash its full potential."); + add("tooltip.bloodmagic.sentientPickaxe.desc", "Uses demon will to unleash its full potential."); + add("tooltip.bloodmagic.sentientShovel.desc", "Uses demon will to unleash its full potential."); + add("tooltip.bloodmagic.soulGem.petty", "A gem used to contain a little will"); + add("tooltip.bloodmagic.soulGem.lesser", "A gem used to contain some will"); + add("tooltip.bloodmagic.soulGem.common", "A gem used to contain more will"); + add("tooltip.bloodmagic.soulGem.greater", "A gem used to contain a greater amount of will"); + add("tooltip.bloodmagic.soulGem.grand", "A gem used to contain a large amount of will"); + add("tooltip.bloodmagic.soulSnare.desc", "Throw at a monster and then kill them to obtain their demonic will"); + + add("tooltip.bloodmagic.currentType.default", "Contains: Raw Will"); + add("tooltip.bloodmagic.currentType.corrosive", "Contains: Corrosive Will"); + add("tooltip.bloodmagic.currentType.destructive", "Contains: Destructive Will"); + add("tooltip.bloodmagic.currentType.vengeful", "Contains: Vengeful Will"); + add("tooltip.bloodmagic.currentType.steadfast", "Contains: Steadfast Will"); + + add("tooltip.bloodmagic.currentBaseType.default", "Raw"); + add("tooltip.bloodmagic.currentBaseType.corrosive", "Corrosive"); + add("tooltip.bloodmagic.currentBaseType.destructive", "Destructive"); + add("tooltip.bloodmagic.currentBaseType.vengeful", "Vengeful"); + add("tooltip.bloodmagic.currentBaseType.steadfast", "Steadfast"); + add("tooltip.bloodmagic.sacrificialdagger.desc", "Just a prick of the finger will suffice..."); + add("tooltip.bloodmagic.slate.desc", "Infused stone inside of a Blood Altar"); + + add("tooltip.bloodmagic.sigil.water.desc", "Infinite water, anyone?"); + add("tooltip.bloodmagic.sigil.lava.desc", "HOT! DO NOT EAT"); + add("tooltip.bloodmagic.sigil.void.desc", "Better than a Swiffer®!"); + add("tooltip.bloodmagic.sigil.greengrove.desc", "Environmentally friendly"); + add("tooltip.bloodmagic.sigil.magnetism.desc", "I have a very magnetic personality"); + add("tooltip.bloodmagic.sigil.fastminer.desc", "Keep mining, and mining..."); + add("tooltip.bloodmagic.sigil.air.desc", "I feel lighter already..."); + add("tooltip.bloodmagic.sigil.bloodlight.desc", "I see a light!"); + + add("itemGroup.bloodmagictab", "Blood Magic"); + + // Block names + addBlock(BloodMagicBlocks.BLANK_RUNE, "Blank Rune"); + addBlock(BloodMagicBlocks.SPEED_RUNE, "Speed Rune"); + addBlock(BloodMagicBlocks.SACRIFICE_RUNE, "Rune of Sacrifice"); + addBlock(BloodMagicBlocks.SELF_SACRIFICE_RUNE, "Rune of Self Sacrifice"); + addBlock(BloodMagicBlocks.DISPLACEMENT_RUNE, "DisplacementRune"); + addBlock(BloodMagicBlocks.CAPACITY_RUNE, "Rune of Capacity"); + addBlock(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE, "Rune of Augmented Capacity"); + addBlock(BloodMagicBlocks.ORB_RUNE, "Rune of the Orb"); + addBlock(BloodMagicBlocks.ACCELERATION_RUNE, "Acceleration Rune"); + addBlock(BloodMagicBlocks.CHARGING_RUNE, "Charging Rune"); + addBlock(BloodMagicBlocks.BLOOD_ALTAR, "Blood Altar"); + addBlock(BloodMagicBlocks.SOUL_FORGE, "Hellfire Forge"); + + // Item names + addItem(BloodMagicItems.WEAK_BLOOD_ORB, "Weak Blood Orb"); + addItem(BloodMagicItems.APPRENTICE_BLOOD_ORB, "Apprentice Blood Orb"); + addItem(BloodMagicItems.MAGICIAN_BLOOD_ORB, "Magician Blood Orb"); + addItem(BloodMagicItems.MASTER_BLOOD_ORB, "Master Blood Orb"); + addItem(BloodMagicItems.DIVINATION_SIGIL, "Divination Sigil"); + addItem(BloodMagicItems.WATER_SIGIL, "Water Sigil"); + addItem(BloodMagicItems.LAVA_SIGIL, "Lava Sigil"); + addItem(BloodMagicItems.VOID_SIGIL, "Void Sigil"); + addItem(BloodMagicItems.GREEN_GROVE_SIGIL, "Sigil of the Green Grove"); + addItem(BloodMagicItems.FAST_MINER_SIGIL, "Sigil of the Fast Miner"); + addItem(BloodMagicItems.MAGNETISM_SIGIL, "Sigil of Magnetism"); + addItem(BloodMagicItems.ICE_SIGIL, "Sigil of the Frozen Lake"); + addItem(BloodMagicItems.AIR_SIGIL, "Air Sigil"); + addItem(BloodMagicItems.BLOOD_LIGHT_SIGIL, "Sigil of the Blood Lamp"); + + addItem(BloodMagicBlocks.LIFE_ESSENCE_BUCKET, "Bucket of Life"); + addItem(BloodMagicItems.ARCANE_ASHES, "Arcane Ashes"); + addItem(BloodMagicItems.SLATE, "Blank Slate"); + addItem(BloodMagicItems.REINFORCED_SLATE, "Reinforced Slate"); + addItem(BloodMagicItems.IMBUED_SLATE, "Imbued Slate"); + addItem(BloodMagicItems.DEMONIC_SLATE, "Demonic Slate"); + addItem(BloodMagicItems.ETHEREAL_SLATE, "Ethereal Slate"); + + addItem(BloodMagicItems.DAGGER_OF_SACRIFICE, "Dagger of Sacrifice"); + addItem(BloodMagicItems.SACRIFICIAL_DAGGER, "Sacrificial Knife"); + + addItem(BloodMagicItems.REAGENT_WATER, "Water Reagent"); + addItem(BloodMagicItems.REAGENT_LAVA, "Lava Reagent"); + addItem(BloodMagicItems.REAGENT_FAST_MINER, "Mining Reagent"); + addItem(BloodMagicItems.REAGENT_GROWTH, "Growth Reagent"); + addItem(BloodMagicItems.REAGENT_VOID, "Void Reagent"); + addItem(BloodMagicItems.REAGENT_MAGNETISM, "Magnetism Reagent"); + addItem(BloodMagicItems.REAGENT_AIR, "Air Reagent"); + addItem(BloodMagicItems.REAGENT_BLOOD_LIGHT, "Blood Lamp Reagent"); + + addItem(BloodMagicItems.PETTY_GEM, "Petty Tartaric Gem"); + addItem(BloodMagicItems.LESSER_GEM, "Lesser Tartaric Gem"); + addItem(BloodMagicItems.COMMON_GEM, "Common Tartaric Gem"); + addItem(BloodMagicItems.MONSTER_SOUL_RAW, "Demon Will"); + addItem(BloodMagicItems.MONSTER_SOUL_CORROSIVE, "Demon Will"); + addItem(BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE, "Demon Will"); + addItem(BloodMagicItems.MONSTER_SOUL_STEADFAST, "Demon Will"); + addItem(BloodMagicItems.MONSTER_SOUL_VENGEFUL, "Demon Will"); + addItem(BloodMagicItems.SOUL_SNARE, "Soul Snare"); + addItem(BloodMagicItems.SENTIENT_SWORD, "Sentient Sword"); + +// addItem(BloodMagicItems , ""); + + // JEI + add("jei.bloodmagic.recipe.minimumsouls", "Minimum: %s Will"); + add("jei.bloodmagic.recipe.soulsdrained", "Drained: %s Will"); + add("jei.bloodmagic.recipe.requiredlp", "LP: %d"); + add("jei.bloodmagic.recipe.requiredtier", "Tier: %d"); + add("jei.bloodmagic.recipe.consumptionrate", "Consumption: %s LP/t"); + add("jei.bloodmagic.recipe.drainrate", "Drain: %s LP/t"); + + add("jei.bloodmagic.recipe.altar", "Blood Altar"); + add("jei.bloodmagic.recipe.soulforge", "Hellfire Forge"); + add("jei.bloodmagic.recipe.alchemyarraycrafting", "Alchemy Array"); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java new file mode 100644 index 00000000..5c4092c7 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java @@ -0,0 +1,99 @@ +package wayoftime.bloodmagic.common.data; + +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +import com.google.common.collect.ImmutableList; +import com.mojang.datafixers.util.Pair; + +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.LootTableProvider; +import net.minecraft.data.loot.BlockLootTables; +import net.minecraft.loot.LootParameterSet; +import net.minecraft.loot.LootParameterSets; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.LootTableManager; +import net.minecraft.loot.ValidationTracker; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; + +public class GeneratorLootTable extends LootTableProvider +{ + public GeneratorLootTable(DataGenerator dataGeneratorIn) + { + super(dataGeneratorIn); + } + + @Override + protected List>>, LootParameterSet>> getTables() + { + return ImmutableList.of(Pair.of(Blocks::new, LootParameterSets.BLOCK)); + } + + private static class Blocks extends BlockLootTables + { + @Override + protected void addTables() + { + for (RegistryObject block : BloodMagicBlocks.BASICBLOCKS.getEntries()) + { + this.registerDropSelfLootTable(block.get()); + } + + this.registerDropSelfLootTable(BloodMagicBlocks.BLOOD_ALTAR.get()); + registerNoDropLootTable(BloodMagicBlocks.ALCHEMY_ARRAY.get()); + registerNoDropLootTable(BloodMagicBlocks.BLOOD_LIGHT.get()); + this.registerDropSelfLootTable(BloodMagicBlocks.SOUL_FORGE.get()); + +// LootPool.Builder builder = LootPool.builder().name(ModBlocks.GOO_BLOCK.get().getRegistryName().toString()).rolls(ConstantRange.of(1)).acceptCondition(SurvivesExplosion.builder()).addEntry(ItemLootEntry.builder(ModItems.GOO_RESIDUE.get())); +// this.registerLootTable(ModBlocks.GOO_BLOCK.get(), LootTable.builder().addLootPool(builder)); +// +// LootPool.Builder builder2 = LootPool.builder().name(ModBlocks.GOO_BLOCK_TERRAIN.get().getRegistryName().toString()).rolls(ConstantRange.of(1)).acceptCondition(SurvivesExplosion.builder()).addEntry(ItemLootEntry.builder(ModItems.GOO_RESIDUE.get())); +// this.registerLootTable(ModBlocks.GOO_BLOCK_TERRAIN.get(), LootTable.builder().addLootPool(builder2)); +// +// this.registerDropSelfLootTable(ModBlocks.GOO_BLOCK_POISON.get()); +// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T1.get()); +// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T2.get()); +// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T3.get()); +// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T4.get()); +// this.registerDropSelfLootTable(ModBlocks.TURRET_BLOCK.get()); +// this.registerDropSelfLootTable(ModBlocks.ZAPPER_TURRET_BLOCK.get()); +// this.registerDropSelfLootTable(ModBlocks.ANTI_GOO_BEACON.get()); +// this.registerDropSelfLootTable(ModBlocks.ANTI_GOO_FIELD_GEN.get()); +// this.registerDropSelfLootTable(ModBlocks.GOOLIMINATIONFIELDGEN.get()); +// this.registerDropSelfLootTable(ModBlocks.GOO_DETECTOR.get()); +// this.registerDropping(ModBlocks.GOO_RENDER.get(), ItemStack.EMPTY.getItem()); +// // this.registerDropping(ModBlocks.GOO_RENDER_BURST.get(), +// // ItemStack.EMPTY.getItem()); +// this.registerDropping(ModBlocks.GOO_RENDER_TERRAIN.get(), ItemStack.EMPTY.getItem()); + + } + + private void registerNoDropLootTable(Block block) + { + LootPool.Builder builder = LootPool.builder().name(block.getRegistryName().toString()); + this.registerLootTable(block, LootTable.builder().addLootPool(builder)); + } + + @Override + protected Iterable getKnownBlocks() + { + return ForgeRegistries.BLOCKS.getValues().stream().filter(b -> b.getRegistryName().getNamespace().equals(BloodMagic.MODID)).collect(Collectors.toList()); + } + } + + @Override + protected void validate(Map map, ValidationTracker validationtracker) + { + map.forEach((name, table) -> LootTableManager.validateLootTable(validationtracker, name, table)); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java new file mode 100644 index 00000000..e8e9ead3 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java @@ -0,0 +1,44 @@ +package wayoftime.bloodmagic.common.data.recipe; + +import java.util.Collections; +import java.util.List; +import java.util.function.Consumer; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.RecipeProvider; +import wayoftime.bloodmagic.common.recipe.ISubRecipeProvider; + +public abstract class BaseRecipeProvider extends RecipeProvider +{ + private final String modid; + + public BaseRecipeProvider(DataGenerator gen, String modid) + { + super(gen); + this.modid = modid; + } + + @Override + public String getName() + { + return super.getName() + modid; + } + + @Override + protected void registerRecipes(Consumer consumer) + { + getSubRecipeProviders().forEach(subRecipeProvider -> subRecipeProvider.addRecipes(consumer)); + } + + /** + * Gets all the sub/offloaded recipe providers that this recipe provider has. + * + * @implNote This is only called once per provider so there is no need to bother + * caching the list that this returns + */ + protected List getSubRecipeProviders() + { + return Collections.emptyList(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java new file mode 100644 index 00000000..21098bdf --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java @@ -0,0 +1,145 @@ +package wayoftime.bloodmagic.common.data.recipe; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementRewards; +import net.minecraft.advancements.ICriterionInstance; +import net.minecraft.advancements.IRequirementsStrategy; +import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.conditions.ICondition; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.util.Constants; + +public abstract class BloodMagicRecipeBuilder> +{ + + protected static ResourceLocation bmSerializer(String name) + { + return new ResourceLocation(BloodMagic.MODID, name); + } + + protected final List conditions = new ArrayList<>(); + protected final Advancement.Builder advancementBuilder = Advancement.Builder.builder(); + protected final ResourceLocation serializerName; + + protected BloodMagicRecipeBuilder(ResourceLocation serializerName) + { + this.serializerName = serializerName; + } + + public BUILDER addCriterion(RecipeCriterion criterion) + { + return addCriterion(criterion.name, criterion.criterion); + } + + public BUILDER addCriterion(String name, ICriterionInstance criterion) + { + advancementBuilder.withCriterion(name, criterion); + return (BUILDER) this; + } + + public BUILDER addCondition(ICondition condition) + { + conditions.add(condition); + return (BUILDER) this; + } + + protected boolean hasCriteria() + { + return !advancementBuilder.getCriteria().isEmpty(); + } + + protected abstract RecipeResult getResult(ResourceLocation id); + + protected void validate(ResourceLocation id) + { + } + + public void build(Consumer consumer, ResourceLocation id) + { + validate(id); + if (hasCriteria()) + { + // If there is a way to "unlock" this recipe then add an advancement with the + // criteria + advancementBuilder.withParentId(new ResourceLocation("recipes/root")).withCriterion("has_the_recipe", RecipeUnlockedTrigger.create(id)).withRewards(AdvancementRewards.Builder.recipe(id)).withRequirementsStrategy(IRequirementsStrategy.OR); + } + consumer.accept(getResult(id)); + } + + protected abstract class RecipeResult implements IFinishedRecipe + { + + private final ResourceLocation id; + + public RecipeResult(ResourceLocation id) + { + this.id = id; + } + + @Override + public JsonObject getRecipeJson() + { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty(Constants.JSON.TYPE, serializerName.toString()); + if (!conditions.isEmpty()) + { + JsonArray conditionsArray = new JsonArray(); + for (ICondition condition : conditions) + { + conditionsArray.add(CraftingHelper.serialize(condition)); + } + jsonObject.add(Constants.JSON.CONDITIONS, conditionsArray); + } + this.serialize(jsonObject); + return jsonObject; + } + + @Nonnull + @Override + public IRecipeSerializer getSerializer() + { + // Note: This may be null if something is screwed up but this method isn't + // actually used so it shouldn't matter + // and in fact it will probably be null if only the API is included. But again, + // as we manually just use + // the serializer's name this should not effect us + return ForgeRegistries.RECIPE_SERIALIZERS.getValue(serializerName); + } + + @Nonnull + @Override + public ResourceLocation getID() + { + return this.id; + } + + @Nullable + @Override + public JsonObject getAdvancementJson() + { + return hasCriteria() ? advancementBuilder.serialize() : null; + } + + @Nullable + @Override + public ResourceLocation getAdvancementID() + { + return new ResourceLocation(id.getNamespace(), "recipes/" + id.getPath()); + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java new file mode 100644 index 00000000..9bbf2eed --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java @@ -0,0 +1,25 @@ +package wayoftime.bloodmagic.common.data.recipe; + +import java.util.Arrays; +import java.util.List; + +import net.minecraft.data.DataGenerator; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.recipe.AlchemyArrayRecipeProvider; +import wayoftime.bloodmagic.common.recipe.BloodAltarRecipeProvider; +import wayoftime.bloodmagic.common.recipe.ISubRecipeProvider; +import wayoftime.bloodmagic.common.recipe.TartaricForgeRecipeProvider; + +public class BloodMagicRecipeProvider extends BaseRecipeProvider +{ + public BloodMagicRecipeProvider(DataGenerator gen) + { + super(gen, BloodMagic.MODID); + } + + @Override + protected List getSubRecipeProviders() + { + return Arrays.asList(new BloodAltarRecipeProvider(), new AlchemyArrayRecipeProvider(), new TartaricForgeRecipeProvider()); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java new file mode 100644 index 00000000..4418c70a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java @@ -0,0 +1,20 @@ +package wayoftime.bloodmagic.common.data.recipe; + +import net.minecraft.advancements.ICriterionInstance; + +public class RecipeCriterion +{ + public final String name; + public final ICriterionInstance criterion; + + private RecipeCriterion(String name, ICriterionInstance criterion) + { + this.name = name; + this.criterion = criterion; + } + + public static RecipeCriterion of(String name, ICriterionInstance criterion) + { + return new RecipeCriterion(name, criterion); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java new file mode 100644 index 00000000..dd6fcdcf --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java @@ -0,0 +1,58 @@ +package wayoftime.bloodmagic.common.data.recipe.builder; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; +import wayoftime.bloodmagic.util.Constants; + +public class AlchemyArrayRecipeBuilder extends BloodMagicRecipeBuilder +{ + private final ResourceLocation texture; + private final Ingredient baseInput; + private final Ingredient addedInput; + private final ItemStack output; + + protected AlchemyArrayRecipeBuilder(ResourceLocation texture, Ingredient baseInput, Ingredient addedInput, ItemStack output) + { + super(bmSerializer("array")); + this.texture = texture; + this.baseInput = baseInput; + this.addedInput = addedInput; + this.output = output; + } + + public static AlchemyArrayRecipeBuilder array(ResourceLocation texture, Ingredient baseInput, Ingredient addedInput, ItemStack output) + { + return new AlchemyArrayRecipeBuilder(texture, baseInput, addedInput, output); + } + + @Override + protected AlchemyArrayRecipeResult getResult(ResourceLocation id) + { + return new AlchemyArrayRecipeResult(id); + } + + public class AlchemyArrayRecipeResult extends RecipeResult + { + protected AlchemyArrayRecipeResult(ResourceLocation id) + { + super(id); + } + + @Override + public void serialize(@Nonnull JsonObject json) + { + json.addProperty(Constants.JSON.TEXTURE, texture.toString()); +// JSONUtils.getString(json, ); + json.add(Constants.JSON.BASEINPUT, baseInput.serialize()); + json.add(Constants.JSON.ADDEDINPUT, addedInput.serialize()); + json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java new file mode 100644 index 00000000..1b6ef6eb --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java @@ -0,0 +1,63 @@ +package wayoftime.bloodmagic.common.data.recipe.builder; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; +import wayoftime.bloodmagic.util.Constants; + +public class BloodAltarRecipeBuilder extends BloodMagicRecipeBuilder +{ + private final Ingredient input; + private final ItemStack output; + private final int minimumTier; + private final int syphon; + private final int consumeRate; + private final int drainRate; + + protected BloodAltarRecipeBuilder(Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate) + { + super(bmSerializer("altar")); + this.input = input; + this.output = output; + this.minimumTier = minimumTier; + this.syphon = syphon; + this.consumeRate = consumeRate; + this.drainRate = drainRate; + } + + public static BloodAltarRecipeBuilder altar(Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate) + { + return new BloodAltarRecipeBuilder(input, output, minimumTier, syphon, consumeRate, drainRate); + } + + @Override + protected BloodAltarRecipeResult getResult(ResourceLocation id) + { + return new BloodAltarRecipeResult(id); + } + + public class BloodAltarRecipeResult extends RecipeResult + { + protected BloodAltarRecipeResult(ResourceLocation id) + { + super(id); + } + + @Override + public void serialize(@Nonnull JsonObject json) + { + json.add(Constants.JSON.INPUT, input.serialize()); + json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); + json.addProperty(Constants.JSON.ALTAR_TIER, minimumTier); + json.addProperty(Constants.JSON.ALTAR_SYPHON, syphon); + json.addProperty(Constants.JSON.ALTAR_CONSUMPTION_RATE, consumeRate); + json.addProperty(Constants.JSON.ALTAR_DRAIN_RATE, drainRate); + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java new file mode 100644 index 00000000..25c88c51 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java @@ -0,0 +1,75 @@ +package wayoftime.bloodmagic.common.data.recipe.builder; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; +import wayoftime.bloodmagic.util.Constants; + +public class TartaricForgeRecipeBuilder extends BloodMagicRecipeBuilder +{ + private final List input; + private final ItemStack output; + private final double minimumSouls; + private final double soulDrain; + + protected TartaricForgeRecipeBuilder(List input, ItemStack output, double minimumSouls, double soulDrain) + { + super(bmSerializer("soulforge")); + this.input = input; + this.output = output; + this.minimumSouls = minimumSouls; + this.soulDrain = soulDrain; + } + + public static TartaricForgeRecipeBuilder tartaricForge(List input, ItemStack output, double minimumSouls, double soulDrain) + { + return new TartaricForgeRecipeBuilder(input, output, minimumSouls, soulDrain); + } + + public static TartaricForgeRecipeBuilder tartaricForge(ItemStack output, double minimumSouls, double soulDrain, Ingredient... inputArray) + { + List inputList = new ArrayList(); + for (int i = 0; i < inputArray.length; i++) + { + inputList.add(inputArray[i]); + } + return new TartaricForgeRecipeBuilder(inputList, output, minimumSouls, soulDrain); + } + + @Override + protected TartaricForgeRecipeResult getResult(ResourceLocation id) + { + return new TartaricForgeRecipeResult(id); + } + + public class TartaricForgeRecipeResult extends RecipeResult + { + protected TartaricForgeRecipeResult(ResourceLocation id) + { + super(id); + } + + @Override + public void serialize(@Nonnull JsonObject json) + { + for (int i = 0; i < Math.min(input.size(), 4); i++) + { + json.add(Constants.JSON.INPUT + i, input.get(i).serialize()); + } + + json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); + json.addProperty(Constants.JSON.TARTARIC_MINIMUM, (float) minimumSouls); + json.addProperty(Constants.JSON.TARTARIC_DRAIN, (float) soulDrain); + + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java new file mode 100644 index 00000000..69855511 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -0,0 +1,113 @@ +package wayoftime.bloodmagic.common.item; + +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilAir; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilBloodLight; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilDivination; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilFastMiner; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilFrost; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilGreenGrove; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilLava; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilMagnetism; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilVoid; +import wayoftime.bloodmagic.common.item.sigil.ItemSigilWater; +import wayoftime.bloodmagic.common.item.soul.ItemMonsterSoul; +import wayoftime.bloodmagic.common.item.soul.ItemSentientSword; +import wayoftime.bloodmagic.common.item.soul.ItemSoulGem; +import wayoftime.bloodmagic.common.item.soul.ItemSoulSnare; +import wayoftime.bloodmagic.common.registration.impl.BloodOrbDeferredRegister; +import wayoftime.bloodmagic.common.registration.impl.BloodOrbRegistryObject; +import wayoftime.bloodmagic.orb.BloodOrb; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +public class BloodMagicItems +{ +// public static Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("demonic", 4, 520, 7, 8, 50); +// public static final BloodOrb WEAK_ORB_INSTANCE = new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weakbloodorb"), 0, 5000, 10); + public static final BloodOrbDeferredRegister BLOOD_ORBS = new BloodOrbDeferredRegister(BloodMagic.MODID); + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, BloodMagic.MODID); + public static final DeferredRegister BASICITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, BloodMagic.MODID); + + public static final BloodOrbRegistryObject ORB_WEAK = BLOOD_ORBS.register("weakbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weakbloodorb"), 1, 5000, 2)); + public static final BloodOrbRegistryObject ORB_APPRENTICE = BLOOD_ORBS.register("apprenticebloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "apprenticebloodorb"), 2, 25000, 5)); + public static final BloodOrbRegistryObject ORB_MAGICIAN = BLOOD_ORBS.register("magicianbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "magicianbloodorb"), 3, 150000, 15)); + public static final BloodOrbRegistryObject ORB_MASTER = BLOOD_ORBS.register("masterbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "masterbloodorb"), 4, 1000000, 25)); + public static final BloodOrbRegistryObject ORB_ARCHMAGE = BLOOD_ORBS.register("archmagebloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "archmagebloodorb"), 5, 10000000, 50)); +// public static final DeferredRegister BLOOD_ORBS = DeferredRegister.create(RegistrarBloodMagic.BLOOD_ORBS, BloodMagic.MODID); + +// public static final RegistryObject BLOODSTONE_ITEM = ITEMS.register("ruby_block", () -> new BlockItem(BloodMagicBlocks.BLOODSTONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject SOUL_FORGE_ITEM = ITEMS.register("soulforge", () -> new BlockItem(BloodMagicBlocks.SOUL_FORGE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject BLANK_RUNE_ITEM = ITEMS.register("blankrune", () -> new BlockItem(BloodMagicBlocks.BLANK_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject SPEED_RUNE_ITEM = ITEMS.register("speedrune", () -> new BlockItem(BloodMagicBlocks.SPEED_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject SACRIFICE_RUNE_ITEM = ITEMS.register("sacrificerune", () -> new BlockItem(BloodMagicBlocks.SACRIFICE_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject SELF_SACRIFICE_RUNE_ITEM = ITEMS.register("selfsacrificerune", () -> new BlockItem(BloodMagicBlocks.SELF_SACRIFICE_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DISPLACEMENT_RUNE_ITEM = ITEMS.register("dislocationrune", () -> new BlockItem(BloodMagicBlocks.DISPLACEMENT_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject CAPACITY_RUNE_ITEM = ITEMS.register("altarcapacityrune", () -> new BlockItem(BloodMagicBlocks.CAPACITY_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject AUGMENTED_CAPACITY_RUNE_ITEM = ITEMS.register("bettercapacityrune", () -> new BlockItem(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject ORB_RUNE_ITEM = ITEMS.register("orbcapacityrune", () -> new BlockItem(BloodMagicBlocks.ORB_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject ACCELERATION_RUNE_ITEM = ITEMS.register("accelerationrune", () -> new BlockItem(BloodMagicBlocks.ACCELERATION_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject CHARGING_RUNE_ITEM = ITEMS.register("chargingrune", () -> new BlockItem(BloodMagicBlocks.CHARGING_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + + public static final RegistryObject BLOOD_ALTAR_ITEM = ITEMS.register("altar", () -> new BlockItem(BloodMagicBlocks.BLOOD_ALTAR.get(), new Item.Properties().group(BloodMagic.TAB))); + + // TODO: Need to rework the above instantiations for the ItemBlocks so that it's + // done with the Blocks. + +// public static final RegistryObject WEAK_BLOOD_ORB = BASICITEMS.register("weakbloodorb", ItemBloodOrb::new); +// public static final RegistryObject WEAK_BLOOD_ORB = BASICITEMS.register("weakbloodorb", () -> new ItemBloodOrb(WEAK_ORB_INSTANCE)); + public static final RegistryObject WEAK_BLOOD_ORB = BASICITEMS.register("weakbloodorb", () -> new ItemBloodOrb(ORB_WEAK)); + public static final RegistryObject APPRENTICE_BLOOD_ORB = BASICITEMS.register("apprenticebloodorb", () -> new ItemBloodOrb(ORB_APPRENTICE)); + public static final RegistryObject MAGICIAN_BLOOD_ORB = BASICITEMS.register("magicianbloodorb", () -> new ItemBloodOrb(ORB_MAGICIAN)); + public static final RegistryObject MASTER_BLOOD_ORB = BASICITEMS.register("masterbloodorb", () -> new ItemBloodOrb(ORB_MASTER)); + + public static final RegistryObject DIVINATION_SIGIL = BASICITEMS.register("divinationsigil", () -> new ItemSigilDivination(true)); + public static final RegistryObject SACRIFICIAL_DAGGER = BASICITEMS.register("sacrificialdagger", () -> new ItemSacrificialDagger()); + public static final RegistryObject SLATE = BASICITEMS.register("blankslate", () -> new ItemBase()); + public static final RegistryObject REINFORCED_SLATE = BASICITEMS.register("reinforcedslate", () -> new ItemBase()); + public static final RegistryObject IMBUED_SLATE = BASICITEMS.register("infusedslate", () -> new ItemBase()); + public static final RegistryObject DEMONIC_SLATE = BASICITEMS.register("demonslate", () -> new ItemBase()); + public static final RegistryObject ETHEREAL_SLATE = BASICITEMS.register("etherealslate", () -> new ItemBase()); + public static final RegistryObject WATER_SIGIL = BASICITEMS.register("watersigil", () -> new ItemSigilWater()); + public static final RegistryObject VOID_SIGIL = BASICITEMS.register("voidsigil", () -> new ItemSigilVoid()); + public static final RegistryObject LAVA_SIGIL = BASICITEMS.register("lavasigil", () -> new ItemSigilLava()); + public static final RegistryObject GREEN_GROVE_SIGIL = ITEMS.register("growthsigil", () -> new ItemSigilGreenGrove()); + public static final RegistryObject FAST_MINER_SIGIL = ITEMS.register("miningsigil", () -> new ItemSigilFastMiner()); + public static final RegistryObject MAGNETISM_SIGIL = ITEMS.register("sigilofmagnetism", () -> new ItemSigilMagnetism()); + public static final RegistryObject ICE_SIGIL = ITEMS.register("icesigil", () -> new ItemSigilFrost()); + public static final RegistryObject AIR_SIGIL = BASICITEMS.register("airsigil", ItemSigilAir::new); + public static final RegistryObject BLOOD_LIGHT_SIGIL = BASICITEMS.register("bloodlightsigil", ItemSigilBloodLight::new); + + public static final RegistryObject ARCANE_ASHES = BASICITEMS.register("arcaneashes", () -> new ItemArcaneAshes()); + public static final RegistryObject DAGGER_OF_SACRIFICE = BASICITEMS.register("daggerofsacrifice", () -> new ItemDaggerOfSacrifice()); + + // Reagents used to make the Sigils + public static final RegistryObject REAGENT_WATER = BASICITEMS.register("reagentwater", () -> new ItemBase()); + public static final RegistryObject REAGENT_LAVA = BASICITEMS.register("reagentlava", () -> new ItemBase()); + public static final RegistryObject REAGENT_VOID = BASICITEMS.register("reagentvoid", () -> new ItemBase()); + public static final RegistryObject REAGENT_GROWTH = BASICITEMS.register("reagentgrowth", () -> new ItemBase()); + public static final RegistryObject REAGENT_FAST_MINER = BASICITEMS.register("reagentfastminer", () -> new ItemBase()); + public static final RegistryObject REAGENT_MAGNETISM = BASICITEMS.register("reagentmagnetism", () -> new ItemBase()); + public static final RegistryObject REAGENT_AIR = BASICITEMS.register("reagentair", () -> new ItemBase()); + public static final RegistryObject REAGENT_BLOOD_LIGHT = BASICITEMS.register("reagentbloodlight", () -> new ItemBase()); + + // Tartaric Gems + public static final RegistryObject PETTY_GEM = ITEMS.register("soulgempetty", () -> new ItemSoulGem("petty", 64)); + public static final RegistryObject LESSER_GEM = ITEMS.register("soulgemlesser", () -> new ItemSoulGem("lesser", 256)); + public static final RegistryObject COMMON_GEM = ITEMS.register("soulgemcommon", () -> new ItemSoulGem("common", 1024)); + + public static final RegistryObject MONSTER_SOUL_RAW = BASICITEMS.register("basemonstersoul", () -> new ItemMonsterSoul(EnumDemonWillType.DEFAULT)); + public static final RegistryObject MONSTER_SOUL_CORROSIVE = BASICITEMS.register("basemonstersoul_corrosive", () -> new ItemMonsterSoul(EnumDemonWillType.CORROSIVE)); + public static final RegistryObject MONSTER_SOUL_DESTRUCTIVE = BASICITEMS.register("basemonstersoul_destructive", () -> new ItemMonsterSoul(EnumDemonWillType.DESTRUCTIVE)); + public static final RegistryObject MONSTER_SOUL_STEADFAST = BASICITEMS.register("basemonstersoul_steadfast", () -> new ItemMonsterSoul(EnumDemonWillType.STEADFAST)); + public static final RegistryObject MONSTER_SOUL_VENGEFUL = BASICITEMS.register("basemonstersoul_vengeful", () -> new ItemMonsterSoul(EnumDemonWillType.VENGEFUL)); + + public static final RegistryObject SOUL_SNARE = BASICITEMS.register("soulsnare", ItemSoulSnare::new); + public static final RegistryObject SENTIENT_SWORD = ITEMS.register("soulsword", () -> new ItemSentientSword()); +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java new file mode 100644 index 00000000..dd4cde28 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java @@ -0,0 +1,98 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class ItemArcaneAshes extends Item +{ + public ItemArcaneAshes() + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB).maxDamage(20)); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arcaneAshes")); + } + + @Override + public ActionResultType onItemUse(ItemUseContext context) + { + ItemStack stack = context.getItem(); + BlockPos newPos = context.getPos().offset(context.getFace()); + World world = context.getWorld(); + PlayerEntity player = context.getPlayer(); + + if (world.isAirBlock(newPos)) + { + if (!world.isRemote) + { + Direction rotation = Direction.fromAngle(player.getRotationYawHead()); + world.setBlockState(newPos, BloodMagicBlocks.ALCHEMY_ARRAY.get().getDefaultState()); + TileEntity tile = world.getTileEntity(newPos); + if (tile instanceof TileAlchemyArray) + { + ((TileAlchemyArray) tile).setRotation(rotation); + } + +// PickaxeItem d; + stack.damageItem(1, player, (entity) -> { + entity.sendBreakAnimation(EquipmentSlotType.MAINHAND); + }); + + } + + return ActionResultType.SUCCESS; + } + + return ActionResultType.FAIL; + } + +// @Override +// public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos blockPos, Hand hand, Direction side, float hitX, float hitY, float hitZ) +// { +// ItemStack stack = player.getHeldItem(hand); +// BlockPos newPos = blockPos.offset(side); +// +// if (world.isAirBlock(newPos)) +// { +// if (!world.isRemote) +// { +// Direction rotation = Direction.fromAngle(player.getRotationYawHead()); +// world.setBlockState(newPos, RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getDefaultState()); +// TileEntity tile = world.getTileEntity(newPos); +// if (tile instanceof TileAlchemyArray) +// { +// ((TileAlchemyArray) tile).setRotation(rotation); +// } +// +// stack.damageItem(1, player); +// } +// +// return ActionResultType.SUCCESS; +// } +// +// return ActionResultType.FAIL; +// } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java new file mode 100644 index 00000000..d6aecf25 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java @@ -0,0 +1,38 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; + +public class ItemBase extends Item +{ + private final String desc; + + public ItemBase() + { + this(""); + } + + public ItemBase(String desc) + { + super(new Item.Properties().maxStackSize(64).group(BloodMagic.TAB)); + this.desc = desc; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!desc.isEmpty()) + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + desc)); + + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java new file mode 100644 index 00000000..0b37cf63 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java @@ -0,0 +1,35 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.iface.IBindable; + +public class ItemBindableBase extends Item implements IBindable +{ + public ItemBindableBase() + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!stack.hasTag()) + return; + + Binding binding = getBinding(stack); + if (binding != null) + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java new file mode 100644 index 00000000..080417c2 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java @@ -0,0 +1,106 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.extensions.IForgeItem; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.orb.BloodOrb; +import wayoftime.bloodmagic.orb.IBloodOrb; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IForgeItem +{ + private final Supplier sup; + + public ItemBloodOrb(Supplier sup) + { + this.sup = sup; + } + + @Override + public BloodOrb getOrb(ItemStack stack) + { + return sup.get(); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + BloodOrb orb = getOrb(stack); + + if (orb == null) + return ActionResult.resultFail(stack); + + if (world == null) + return super.onItemRightClick(world, player, hand); + + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + + if (PlayerHelper.isFakePlayer(player)) + return super.onItemRightClick(world, player, hand); + + if (!stack.hasTag()) + return super.onItemRightClick(world, player, hand); + + Binding binding = getBinding(stack); + if (binding == null) + return super.onItemRightClick(world, player, hand); + + if (world.isRemote) + return super.onItemRightClick(world, player, hand); + + SoulNetwork ownerNetwork = NetworkHelper.getSoulNetwork(binding); + if (binding.getOwnerId().equals(player.getGameProfile().getId())) + ownerNetwork.setOrbTier(orb.getTier()); + + ownerNetwork.add(SoulTicket.item(stack, world, player, 200), orb.getCapacity()); // Add LP to owner's network + ownerNetwork.hurtPlayer(player, 200); // Hurt whoever is using it + return super.onItemRightClick(world, player, hand); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.desc")); + + BloodOrb orb = getOrb(stack); + if (flag.isAdvanced() && orb != null) + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.owner", stack.getItem().getRegistryName())); + + super.addInformation(stack, world, tooltip, flag); + } + +// + @Override + public ItemStack getContainerItem(ItemStack stack) + { + return stack.copy(); + } + + @Override + public boolean hasContainerItem(ItemStack stack) + { + return true; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java new file mode 100644 index 00000000..f1ba5d85 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java @@ -0,0 +1,75 @@ +package wayoftime.bloodmagic.common.item; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.monster.IMob; +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.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraftforge.common.util.FakePlayer; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.util.DamageSourceBloodMagic; +import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; + +public class ItemDaggerOfSacrifice extends Item +{ + public ItemDaggerOfSacrifice() + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + } + + @Override + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) + { + if (attacker instanceof FakePlayer) + return false; + + if (target == null || attacker == null || attacker.getEntityWorld().isRemote + || (attacker instanceof PlayerEntity && !(attacker instanceof ServerPlayerEntity))) + return false; + + if (!target.isNonBoss()) + return false; + + if (target instanceof PlayerEntity) + return false; + + if (target.isChild() && !(target instanceof IMob)) + return false; + + if (!target.isAlive() || target.getHealth() < 0.5F) + return false; + +// EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass()); +// if (entityEntry == null) +// return false; +// int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(entityEntry.getRegistryName(), 25); + int lifeEssenceRatio = 25; + + if (lifeEssenceRatio <= 0) + return false; + + int lifeEssence = (int) (lifeEssenceRatio * target.getHealth()); +// if (target instanceof AnimalEntity) +// { +// lifeEssence = (int) (lifeEssence * (1 + PurificationHelper.getCurrentPurity((AnimalEntity) target))); +// } + + if (target.isChild()) + { + lifeEssence *= 0.5F; + } + + if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) + { + target.getEntityWorld().playSound(null, target.getPosX(), target.getPosY(), target.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); + target.setHealth(-1); + target.onDeath(DamageSourceBloodMagic.INSTANCE); + } + + return false; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java new file mode 100644 index 00000000..5f807d6e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java @@ -0,0 +1,204 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.UseAction; +import net.minecraft.particles.RedstoneParticleData; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.ConfigHandler; +import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.DamageSourceBloodMagic; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; +import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; + +public class ItemSacrificialDagger extends Item +{ + + public ItemSacrificialDagger() + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { +// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.desc")))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sacrificialdagger.desc")); + +// if (stack.getItemDamage() == 1) +// list.add(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.creative")); + } + + @Override + public void onPlayerStoppedUsing(ItemStack stack, World worldIn, LivingEntity entityLiving, int timeLeft) + { + if (entityLiving instanceof PlayerEntity && !entityLiving.getEntityWorld().isRemote) + PlayerSacrificeHelper.sacrificePlayerHealth((PlayerEntity) entityLiving); + } + + @Override + public int getUseDuration(ItemStack stack) + { + return 72000; + } + + @Override + public UseAction getUseAction(ItemStack stack) + { + return UseAction.BOW; + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (PlayerHelper.isFakePlayer(player)) + return super.onItemRightClick(world, player, hand); + + if (this.canUseForSacrifice(stack)) + { + player.setActiveHand(hand); + return ActionResult.resultSuccess(stack); + } + + int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; + +// RayTraceResult rayTrace = rayTrace(world, player, false); +// if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) +// { +// TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); +// +// if (tile != null && tile instanceof TileAltar && stack.getItemDamage() == 1) +// lpAdded = ((TileAltar) tile).getCapacity(); +// } + + if (!player.abilities.isCreativeMode) + { + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2, lpAdded); + if (MinecraftForge.EVENT_BUS.post(evt)) + return super.onItemRightClick(world, player, hand); + + if (evt.shouldDrainHealth) + { + player.hurtResistantTime = 0; + player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F); + player.setHealth(Math.max(player.getHealth() - 1.998F, 0.0001f)); + if (player.getHealth() <= 0.001f) + { + player.onDeath(DamageSourceBloodMagic.INSTANCE); + player.setHealth(0); + } +// player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F); + } + + if (!evt.shouldFillAltar) + return super.onItemRightClick(world, player, hand); + + lpAdded = evt.lpAdded; + } + + double posX = player.getPosX(); + double posY = player.getPosY(); + double posZ = player.getPosZ(); + world.playSound(null, posX, posY, posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + + for (int l = 0; l < 8; ++l) world.addParticle(RedstoneParticleData.REDSTONE_DUST, posX + Math.random() + - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), 0, 0, 0); + + if (!world.isRemote && PlayerHelper.isFakePlayer(player)) + return super.onItemRightClick(world, player, hand); + + // TODO - Check if SoulFray is active + PlayerSacrificeHelper.findAndFillAltar(world, player, lpAdded, false); + + return super.onItemRightClick(world, player, hand); + } + + @Override + public void inventoryTick(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) + { + if (!world.isRemote && entity instanceof PlayerEntity) + this.setUseForSacrifice(stack, this.isPlayerPreparedForSacrifice(world, (PlayerEntity) entity)); + } + + public boolean isPlayerPreparedForSacrifice(World world, PlayerEntity player) + { + return !world.isRemote && (PlayerSacrificeHelper.getPlayerIncense(player) > 0); + } + + public boolean canUseForSacrifice(ItemStack stack) + { + stack = NBTHelper.checkNBT(stack); + return stack.getTag().getBoolean(Constants.NBT.SACRIFICE); + } + + public void setUseForSacrifice(ItemStack stack, boolean sacrifice) + { + stack = NBTHelper.checkNBT(stack); + stack.getTag().putBoolean(Constants.NBT.SACRIFICE, sacrifice); + } + +// @Override +// @SideOnly(Side.CLIENT) +// public ItemMeshDefinition getMeshDefinition() +// { +// return stack -> { +// String variant = "type=normal"; +// if (stack.getItemDamage() != 0) +// variant = "type=creative"; +// +// if (canUseForSacrifice(stack)) +// variant = "type=ceremonial"; +// +// return new ModelResourceLocation(getRegistryName(), variant); +// }; +// } +// +// @Override +// public void gatherVariants(Consumer variants) +// { +// variants.accept("type=normal"); +// variants.accept("type=creative"); +// variants.accept("type=ceremonial"); +// } +// +// public enum DaggerType implements ISubItem +// { +// +// NORMAL, CREATIVE,; +// +// @Nonnull +// @Override +// public String getInternalName() +// { +// return name().toLowerCase(Locale.ROOT); +// } +// +// @Nonnull +// @Override +// public ItemStack getStack(int count) +// { +// return new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER, count, ordinal()); +// } +// } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java new file mode 100644 index 00000000..89dfef5d --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java @@ -0,0 +1,64 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.iface.IBindable; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NBTHelper; + +/** + * Base class for all (static) sigils. + */ +public class ItemSigil extends Item implements IBindable, ISigil +{ + private int lpUsed; + + public ItemSigil(Properties prop, int lpUsed) + { + super(prop); + + this.lpUsed = lpUsed; + } + + public boolean isUnusable(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + return stack.getTag().getBoolean(Constants.NBT.UNUSABLE); + } + + public ItemStack setUnusable(ItemStack stack, boolean unusable) + { + NBTHelper.checkNBT(stack); + + stack.getTag().putBoolean(Constants.NBT.UNUSABLE, unusable); + return stack; + } + + public int getLpUsed() + { + return lpUsed; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!stack.hasTag()) + return; + + Binding binding = getBinding(stack); + if (binding != null) + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java new file mode 100644 index 00000000..b7f12ffd --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java @@ -0,0 +1,62 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.World; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilAir extends ItemSigilBase +{ + public ItemSigilAir() + { + super("air", 50); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + boolean unusable = isUnusable(stack); + if (world.isRemote && !unusable) + { + Vector3d vec = player.getLookVec(); + double wantedVelocity = 1.7; + + // TODO - Revisit after potions +// if (player.isPotionActive(RegistrarBloodMagic.BOOST)) +// { +// int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); +// wantedVelocity += (1 + amplifier) * (0.35); +// } + + player.setMotion(vec.x * wantedVelocity, vec.y * wantedVelocity, vec.z * wantedVelocity); + + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + } + + if (!world.isRemote) + { + if (!player.isCreative()) + this.setUnusable(stack, !NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()); + + if (!unusable) + player.fallDistance = 0; + } + + return super.onItemRightClick(world, player, hand); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java new file mode 100644 index 00000000..11c77760 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java @@ -0,0 +1,51 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.item.ItemSigil; + +public class ItemSigilBase extends ItemSigil +{ + protected final String tooltipBase; +// private final String name; + + public ItemSigilBase(String name, int lpUsed) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB), lpUsed); +// super(lpUsed); + +// this.name = name; + this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; + } + + public ItemSigilBase(String name) + { + this(name, 0); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent(tooltipBase + "desc")); +// if (TextHelper.canTranslate(tooltipBase + "desc")) +// tooltip.addAll(Arrays.asList(WordUtils.wrap(TextHelper.localizeEffect(tooltipBase +// + "desc"), 30, "/cut", false).split("/cut"))); + + super.addInformation(stack, world, tooltip, flag); + } + +// public String getName() +// { +// return name; +// } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java new file mode 100644 index 00000000..f2332c44 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java @@ -0,0 +1,104 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.entity.projectile.EntityBloodLight; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilBloodLight extends ItemSigilBase +{ + public ItemSigilBloodLight() + { + super("bloodlight", 10); + } + + @Override + public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) + { + if (getCooldownRemainder(stack) > 0) + reduceCooldown(stack); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + RayTraceResult mop = rayTrace(world, player, RayTraceContext.FluidMode.NONE); + + if (getCooldownRemainder(stack) > 0) + return super.onItemRightClick(world, player, hand); + + if (mop != null && mop.getType() == RayTraceResult.Type.BLOCK) + { + BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) mop; + BlockPos blockPos = blockRayTrace.getPos().offset(blockRayTrace.getFace()); + + if (world.isAirBlock(blockPos)) + { + world.setBlockState(blockPos, BloodMagicBlocks.BLOOD_LIGHT.get().getDefaultState()); + if (!world.isRemote) + { + SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); + network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); + } + resetCooldown(stack); + player.swingArm(hand); + return super.onItemRightClick(world, player, hand); + } + } else + { + if (!world.isRemote) + { + SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); + EntityBloodLight light = new EntityBloodLight(world, player); + light.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); + world.addEntity(light); + network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); + } + resetCooldown(stack); + } + + return super.onItemRightClick(world, player, hand); + } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + { + return oldStack.getItem() != newStack.getItem(); + } + + public int getCooldownRemainder(ItemStack stack) + { + return NBTHelper.checkNBT(stack).getTag().getInt(Constants.NBT.TICKS_REMAINING); + } + + public void reduceCooldown(ItemStack stack) + { + NBTHelper.checkNBT(stack).getTag().putInt(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); + } + + public void resetCooldown(ItemStack stack) + { + NBTHelper.checkNBT(stack).getTag().putInt(Constants.NBT.TICKS_REMAINING, 10); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java new file mode 100644 index 00000000..90e242a5 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java @@ -0,0 +1,114 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceContext.FluidMode; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import wayoftime.bloodmagic.altar.IBloodAltar; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.iface.IAltarReader; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.ChatUtil; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.NumeralHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilDivination extends ItemSigilBase implements IAltarReader +{ + + public ItemSigilDivination(boolean simple) + { + super(simple ? "divination" : "seer"); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + if (!world.isRemote) + { + RayTraceResult position = Item.rayTrace(world, player, FluidMode.NONE); + + if (position == null || position.getType() == RayTraceResult.Type.MISS) + { + super.onItemRightClick(world, player, hand); + + Binding binding = getBinding(stack); + if (binding != null) + { + int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); + List toSend = Lists.newArrayList(); + if (!binding.getOwnerId().equals(player.getGameProfile().getId())) + toSend.add(new TranslationTextComponent(tooltipBase + "otherNetwork", binding.getOwnerName())); + toSend.add(new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence)); + ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); + } + } else + { + if (position.getType() == RayTraceResult.Type.BLOCK) + { + TileEntity tile = world.getTileEntity(new BlockPos(position.getHitVec())); + + if (tile != null && tile instanceof IBloodAltar) + { + IBloodAltar altar = (IBloodAltar) tile; + int tier = altar.getTier().ordinal() + 1; + int currentEssence = altar.getCurrentBlood(); + int capacity = altar.getCapacity(); + altar.checkTier(); + ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + + "currentAltarTier", NumeralHelper.toRoman(tier)), new TranslationTextComponent(tooltipBase + + "currentEssence", currentEssence), new TranslationTextComponent(tooltipBase + + "currentAltarCapacity", capacity)); + } +// else if (tile != null && tile instanceof TileIncenseAltar) +// { +// TileIncenseAltar altar = (TileIncenseAltar) tile; +// altar.recheckConstruction(); +// double tranquility = altar.tranquility; +// ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentTranquility", (int) ((100D * (int) (100 * tranquility)) / 100d)), new TextComponentTranslation(tooltipBase + "currentBonus", (int) (100 * altar.incenseAddition))); +// } else if (tile != null && tile instanceof TileInversionPillar) +// { +// TileInversionPillar pillar = (TileInversionPillar) tile; +// double inversion = pillar.getCurrentInversion(); +// ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentInversion", ((int) (10 * inversion)) / 10d)); +// } + else + { + Binding binding = getBinding(stack); + if (binding != null) + { + int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); + List toSend = Lists.newArrayList(); + if (!binding.getOwnerId().equals(player.getGameProfile().getId())) + toSend.add(new TranslationTextComponent(tooltipBase + + "otherNetwork", binding.getOwnerName())); + toSend.add(new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence)); + ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); + } + } + } + } + + } + + return super.onItemRightClick(world, player, hand); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java new file mode 100644 index 00000000..5caaab09 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java @@ -0,0 +1,61 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import java.util.List; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import wayoftime.bloodmagic.util.DamageSourceBloodMagic; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilFastMiner extends ItemSigilToggleableBase +{ + public ItemSigilFastMiner() + { + super("fast_miner", 100); + } + + @Override + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) + { + if (PlayerHelper.isFakePlayer(player)) + return; + player.addPotionEffect(new EffectInstance(Effects.HASTE, 2, 0, true, false)); + } + + @Override + public boolean performArrayEffect(World world, BlockPos pos) + { + double radius = 10; + int ticks = 600; + int potionPotency = 2; + + AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); + List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, bb); + for (PlayerEntity player : playerList) + { + if (!player.isPotionActive(Effects.HASTE) || (player.isPotionActive(Effects.HASTE) + && player.getActivePotionEffect(Effects.HASTE).getAmplifier() < potionPotency)) + { + player.addPotionEffect(new EffectInstance(Effects.HASTE, ticks, potionPotency)); + if (!player.isCreative()) + { + player.hurtResistantTime = 0; + player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); + } + } + } + + return false; + } + + @Override + public boolean hasArrayEffect() + { + return true; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java new file mode 100644 index 00000000..53224f84 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java @@ -0,0 +1,152 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import javax.annotation.Nullable; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BucketItem; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; +import net.minecraftforge.fluids.capability.wrappers.BlockWrapper; + +public abstract class ItemSigilFluidBase extends ItemSigilBase +{ + // Class for sigils that interact with fluids, either creating or deleting them. + // Sigils still have to define their own onRightClick behavior, but the actual + // fluid-interacting code is largely limited to here. + public final FluidStack sigilFluid; + + public ItemSigilFluidBase(String name, int lpUsed, FluidStack fluid) + { + super(name, lpUsed); + sigilFluid = fluid; + } + + public ItemSigilFluidBase(String name, FluidStack fluid) + { + super(name); + sigilFluid = fluid; + } + + public ItemSigilFluidBase(String name) + { + super(name); + sigilFluid = null; + } + + // The following are handler functions for fluids, all genericized. + // They're all based off of the Forge FluidUtil methods, but directly taking the + // sigilFluid constant instead of getting an argument. + + /* + * Gets a fluid handler for the targeted block and siding. Works for both tile + * entity liquid containers and fluid blocks. This one is literally identical to + * the FluidUtil method of the same signature. + */ + @Nullable + protected IFluidHandler getFluidHandler(World world, BlockPos blockPos, @Nullable Direction side) + { + BlockState state = world.getBlockState(blockPos); + Block block = state.getBlock(); + BucketItem b; + System.out.println(block); + IFluidHandler targetFluidHandler = FluidUtil.getFluidHandler(world, blockPos, side).orElse(null); + System.out.println(targetFluidHandler); + + if (targetFluidHandler == null) + + { + + } + return targetFluidHandler; +// if (block instanceof IFluidBlock) +// return new FluidBlockWrapper((IFluidBlock) block, world, blockPos); +// else if (block instanceof BlockLiquid) +// return new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); +// return null; + } + + /* + * Tries to insert fluid into a fluid handler. If doTransfer is false, only + * simulate the transfer. If true, actually do so. Returns true if the transfer + * is successful, false otherwise. + */ + protected boolean tryInsertSigilFluid(IFluidHandler destination, boolean doTransfer) + { + if (destination == null) + return false; + return destination.fill(sigilFluid, doTransfer ? FluidAction.EXECUTE : FluidAction.SIMULATE) > 0; + } + + /* + * Tries basically the oppostive of the above, removing fluids instead of adding + * them + */ + protected boolean tryRemoveFluid(IFluidHandler source, int amount, boolean doTransfer) + { + if (source == null) + return false; + return source.drain(amount, doTransfer ? FluidAction.EXECUTE : FluidAction.SIMULATE) != null; + } + + /* + * Tries to place a fluid block in the world. Returns true if successful, + * otherwise false. This is the big troublesome one, oddly enough. It's + * genericized in case anyone wants to create variant sigils with weird fluids. + */ + protected boolean tryPlaceSigilFluid(PlayerEntity player, World world, BlockPos blockPos) + { + BlockState state = sigilFluid.getFluid().getAttributes().getBlock(world, blockPos, sigilFluid.getFluid().getDefaultState()); + BlockWrapper wrapper = new BlockWrapper(state, world, blockPos); + return wrapper.fill(sigilFluid, FluidAction.EXECUTE) > 0; +// // Make sure world coordinants are valid +// if (world == null || blockPos == null) +// { +// return false; +// } +// // Make sure fluid is placeable +// Fluid fluid = sigilFluid.getFluid(); +// if (!fluid.getAttributes().canBePlacedInWorld(world, blockPos, sigilFluid)) +// { +// return false; +// } +// +// // Check if the block is an air block or otherwise replaceable +// BlockState state = world.getBlockState(blockPos); +// Material mat = state.getMaterial(); +// boolean isDestSolid = mat.isSolid(); +// boolean isDestReplaceable = state.getBlock().isReplaceable(state, fluid); +// if (!world.isAirBlock(blockPos) && isDestSolid && !isDestReplaceable) +// { +// return false; +// } +// +//// // If the fluid vaporizes, this exists here in the lava sigil solely so the code +//// // is usable for other fluids +//// if (world.provider.doesWaterVaporize() && fluid.doesVaporize(sigilFluid)) +//// { +//// fluid.vaporize(player, world, blockPos, sigilFluid); +//// return true; +//// } +// +// // Finally we've done enough checking to make sure everything at the end is +// // safe, let's place some fluid. +// IFluidHandler handler; +// Block block = fluid.getAttributes().getStateForPlacement(world, blockPos, sigilFluid).getBlockState().getBlock(); +// if (block instanceof IFluidBlock) +// { +// handler = new FluidBlockWrapper((IFluidBlock) block, world, blockPos); +// } else if (block instanceof BlockLiquid) +// handler = new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); +// else +// handler = new BlockWrapper(block, world, blockPos); +// return tryInsertSigilFluid(handler, true); +//// return false; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java new file mode 100644 index 00000000..622a25ed --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java @@ -0,0 +1,24 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.enchantment.FrostWalkerEnchantment; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilFrost extends ItemSigilToggleableBase +{ + public ItemSigilFrost() + { + super("frost", 100); + } + + @Override + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) + { + if (PlayerHelper.isFakePlayer(player)) + return; + + FrostWalkerEnchantment.freezeNearby(player, world, player.getPosition(), 1); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java new file mode 100644 index 00000000..820e0063 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java @@ -0,0 +1,114 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.block.BlockState; +import net.minecraft.block.IGrowable; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilGreenGrove extends ItemSigilToggleableBase +{ + public ItemSigilGreenGrove() + { + super("green_grove", 150); + } + + @Override + public boolean onSigilUse(ItemStack stack, PlayerEntity player, World world, BlockPos blockPos, Direction side, Vector3d vec) + { + if (PlayerHelper.isFakePlayer(player)) + return false; + + if (NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() + && applyBonemeal(stack, world, blockPos, player)) + { + if (!world.isRemote) + { + world.playEvent(2005, blockPos, 0); + } + return true; + } + + return false; + } + + @Override + public void onSigilUpdate(ItemStack stack, World worldIn, PlayerEntity player, int itemSlot, boolean isSelected) + { + if (PlayerHelper.isFakePlayer(player)) + return; + + int range = 3; + int verticalRange = 2; + int posX = (int) Math.round(player.getPosX() - 0.5f); + int posY = (int) player.getPosY(); + int posZ = (int) Math.round(player.getPosZ() - 0.5f); + if (worldIn instanceof ServerWorld) + { + ServerWorld serverWorld = (ServerWorld) worldIn; + for (int ix = posX - range; ix <= posX + range; ix++) + { + for (int iz = posZ - range; iz <= posZ + range; iz++) + { + for (int iy = posY - verticalRange; iy <= posY + verticalRange; iy++) + { + BlockPos blockPos = new BlockPos(ix, iy, iz); + BlockState state = worldIn.getBlockState(blockPos); + +// if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) + { + if (state.getBlock() instanceof IGrowable) + { + if (worldIn.rand.nextInt(50) == 0) + { + BlockState preBlockState = worldIn.getBlockState(blockPos); + ((IGrowable) state.getBlock()).grow(serverWorld, worldIn.rand, blockPos, state); + + BlockState newState = worldIn.getBlockState(blockPos); + if (!newState.equals(preBlockState) && !worldIn.isRemote) + worldIn.playEvent(2005, blockPos, 0); + } + } + } + } + } + } + } + + } + + private static boolean applyBonemeal(ItemStack stack, World worldIn, BlockPos pos, PlayerEntity player) + { + BlockState blockstate = worldIn.getBlockState(pos); + int hook = net.minecraftforge.event.ForgeEventFactory.onApplyBonemeal(player, worldIn, pos, blockstate, stack); + if (hook != 0) + return hook > 0; + if (blockstate.getBlock() instanceof IGrowable) + { + IGrowable igrowable = (IGrowable) blockstate.getBlock(); + if (igrowable.canGrow(worldIn, pos, blockstate, worldIn.isRemote)) + { + if (worldIn instanceof ServerWorld) + { + if (igrowable.canUseBonemeal(worldIn, worldIn.rand, pos, blockstate)) + { + igrowable.grow((ServerWorld) worldIn, worldIn.rand, pos, blockstate); + } + + } + + return true; + } + } + + return false; + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java new file mode 100644 index 00000000..7fd76930 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java @@ -0,0 +1,90 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilLava extends ItemSigilFluidBase +{ + public ItemSigilLava() + { + super("lava", 1000, new FluidStack(Fluids.LAVA, 10000)); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + if (!world.isRemote && !isUnusable(stack)) + { + RayTraceResult rayTrace = rayTrace(world, player, RayTraceContext.FluidMode.NONE); + + if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) + { + return ActionResult.resultFail(stack); + } + + BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) rayTrace; + BlockPos blockPos = blockRayTrace.getPos(); + Direction sideHit = blockRayTrace.getFace(); + BlockPos blockpos1 = blockPos.offset(sideHit); + + if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockpos1, sideHit, stack)) + { + + // Case for if block at blockPos is a fluid handler like a tank + // Try to put fluid into tank + IFluidHandler destination = getFluidHandler(world, blockPos, null); + if (destination != null && tryInsertSigilFluid(destination, false) + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + boolean result = tryInsertSigilFluid(destination, true); + if (result) + return ActionResult.resultSuccess(stack); + } + // Do the same as above, but use sidedness to interact with the fluid handler. + IFluidHandler destinationSide = getFluidHandler(world, blockPos, sideHit); + if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + boolean result = tryInsertSigilFluid(destinationSide, true); + if (result) + return ActionResult.resultSuccess(stack); + } + + // Case for if block at blockPos is not a tank + // Place fluid in world + if (destination == null && destinationSide == null) + { + BlockPos targetPos = blockPos.offset(sideHit); + if (tryPlaceSigilFluid(player, world, targetPos) + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + return ActionResult.resultSuccess(stack); + } + } + } + } + + return super.onItemRightClick(world, player, hand); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java new file mode 100644 index 00000000..b4cbea14 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java @@ -0,0 +1,54 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import java.util.List; + +import net.minecraft.entity.item.ExperienceOrbEntity; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.World; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilMagnetism extends ItemSigilToggleableBase +{ + public ItemSigilMagnetism() + { + super("magnetism", 50); + } + + @Override + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) + { + if (PlayerHelper.isFakePlayer(player)) + return; + + int range = 5; + int verticalRange = 5; + float posX = Math.round(player.getPosX()); + float posY = (float) (player.getPosY() - player.getEyeHeight()); + float posZ = Math.round(player.getPosZ()); + List entities = player.getEntityWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(posX + - 0.5f, posY - 0.5f, posZ + - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(ExperienceOrbEntity.class, new AxisAlignedBB(posX + - 0.5f, posY - 0.5f, posZ + - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + + for (ItemEntity entity : entities) + { + if (entity != null && !world.isRemote && entity.isAlive()) + { + entity.onCollideWithPlayer(player); + } + } + + for (ExperienceOrbEntity xpOrb : xpOrbs) + { + if (xpOrb != null && !world.isRemote) + { + xpOrb.onCollideWithPlayer(player); + } + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java new file mode 100644 index 00000000..10f44429 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java @@ -0,0 +1,119 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.World; +import wayoftime.bloodmagic.common.item.ItemSigil; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.iface.IActivatable; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +/** + * Base class for all toggleable sigils. + */ +public class ItemSigilToggleable extends ItemSigil implements IActivatable +{ + + public ItemSigilToggleable(Properties property, int lpUsed) + { + super(property, lpUsed); + } + + @Override + public boolean getActivated(ItemStack stack) + { + return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTag().getBoolean(Constants.NBT.ACTIVATED); + } + + @Override + public ItemStack setActivatedState(ItemStack stack, boolean activated) + { + if (!stack.isEmpty()) + { + NBTHelper.checkNBT(stack).getTag().putBoolean(Constants.NBT.ACTIVATED, activated); + return stack; + } + + return stack; + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + if (!world.isRemote && !isUnusable(stack)) + { + if (player.isSneaking()) + setActivatedState(stack, !getActivated(stack)); + if (getActivated(stack)) + return super.onItemRightClick(world, player, hand); + } + + return super.onItemRightClick(world, player, hand); + } + + @Override + public ActionResultType onItemUse(ItemUseContext context) + { + World world = context.getWorld(); + BlockPos blockpos = context.getPos(); + + PlayerEntity player = context.getPlayer(); + ItemStack stack = context.getItem(); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + + Binding binding = getBinding(stack); + if (binding == null || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while + // toggling state + return ActionResultType.PASS; + + return onSigilUse(stack, player, world, blockpos, context.getFace(), context.getHitVec()) + ? ActionResultType.SUCCESS + : ActionResultType.FAIL; + } + + public boolean onSigilUse(ItemStack itemStack, PlayerEntity player, World world, BlockPos blockPos, Direction side, Vector3d hitVec) + { + return false; + } + + @Override + public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) + { + if (!worldIn.isRemote && entityIn instanceof PlayerEntity && getActivated(stack)) + { + if (entityIn.ticksExisted % 100 == 0) + { + if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((PlayerEntity) entityIn, SoulTicket.item(stack, worldIn, entityIn, getLpUsed())).isSuccess()) + { + setActivatedState(stack, false); + } + } + + onSigilUpdate(stack, worldIn, (PlayerEntity) entityIn, itemSlot, isSelected); + } + } + + public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) + { + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java new file mode 100644 index 00000000..bc1c5c1f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java @@ -0,0 +1,54 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; + +public class ItemSigilToggleableBase extends ItemSigilToggleable// implements IMeshProvider +{ + protected final String tooltipBase; + private final String name; + + public ItemSigilToggleableBase(String name, int lpUsed) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB), lpUsed); + + this.name = name; + this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; + + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + super.addInformation(stack, world, tooltip, flag); + if (!stack.hasTag()) + return; + + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + (getActivated(stack) ? "activated" + : "deactivated"))); + } + +// @Override +// @SideOnly(Side.CLIENT) +// public ItemMeshDefinition getMeshDefinition() +// { +// return new CustomMeshDefinitionActivatable("sigil_" + name.toLowerCase(Locale.ROOT)); +// } +// +// @Override +// public void gatherVariants(Consumer variants) +// { +// variants.accept("active=false"); +// variants.accept("active=true"); +// } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java new file mode 100644 index 00000000..a9071c53 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java @@ -0,0 +1,85 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.block.BlockState; +import net.minecraft.block.IBucketPickupHandler; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilVoid extends ItemSigilFluidBase +{ + public ItemSigilVoid() + { + super("void", 50, new FluidStack(Fluids.EMPTY, 1000)); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + if (!world.isRemote && !isUnusable(stack)) + { + RayTraceResult rayTrace = rayTrace(world, player, RayTraceContext.FluidMode.SOURCE_ONLY); + + if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) + { + return ActionResult.resultFail(stack); + } + + BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) rayTrace; + BlockPos blockPos = blockRayTrace.getPos(); + Direction sideHit = blockRayTrace.getFace(); + + if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, sideHit, stack)) + { + BlockState blockState = world.getBlockState(blockPos); + if (blockState.getBlock() instanceof IBucketPickupHandler) + { + if (NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + ((IBucketPickupHandler) blockState.getBlock()).pickupFluid(world, blockPos, blockState); + return ActionResult.resultSuccess(stack); + } + } + // Void is simpler than the other fluid sigils, because getFluidHandler grabs + // fluid blocks just fine + // So extract from fluid tanks with a null side; or drain fluid blocks. +// IFluidHandler destination = getFluidHandler(world, blockPos, sideHit); +// if (destination != null && tryRemoveFluid(destination, 1000, false) +// && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) +// { +// if (tryRemoveFluid(destination, 1000, true)) +// return ActionResult.resultSuccess(stack); +// } +// // Do the same as above, but use sidedness to interact with the fluid handler. +// IFluidHandler destinationSide = getFluidHandler(world, blockPos, sideHit); +// if (destinationSide != null && tryRemoveFluid(destinationSide, 1000, false) +// && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) +// { +// if (tryRemoveFluid(destinationSide, 1000, true)) +// return ActionResult.resultSuccess(stack); +// } + } + } + + return super.onItemRightClick(world, player, hand); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java new file mode 100644 index 00000000..e5682d3d --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java @@ -0,0 +1,100 @@ +package wayoftime.bloodmagic.common.item.sigil; + +import net.minecraft.block.Blocks; +import net.minecraft.block.CauldronBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.iface.ISigil; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +public class ItemSigilWater extends ItemSigilFluidBase +{ + public ItemSigilWater() + { + super("water", 100, new FluidStack(Fluids.WATER, 10000)); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + if (stack.getItem() instanceof ISigil.Holding) + stack = ((Holding) stack.getItem()).getHeldItem(stack, player); + if (PlayerHelper.isFakePlayer(player)) + return ActionResult.resultFail(stack); + + if (!world.isRemote && !isUnusable(stack)) + { + RayTraceResult rayTrace = rayTrace(world, player, RayTraceContext.FluidMode.NONE); + + if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) + { + return ActionResult.resultFail(stack); + } + + BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) rayTrace; + BlockPos blockPos = blockRayTrace.getPos(); + Direction sideHit = blockRayTrace.getFace(); + BlockPos blockpos1 = blockPos.offset(sideHit); + + if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockpos1, sideHit, stack)) + { + + // Case for if block at blockPos is a fluid handler like a tank + // Try to put fluid into tank + IFluidHandler destination = getFluidHandler(world, blockPos, null); + if (destination != null && tryInsertSigilFluid(destination, false) + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + boolean result = tryInsertSigilFluid(destination, true); + if (result) + return ActionResult.resultSuccess(stack); + } + // Do the same as above, but use sidedness to interact with the fluid handler. + IFluidHandler destinationSide = getFluidHandler(world, blockPos, sideHit); + if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + boolean result = tryInsertSigilFluid(destinationSide, true); + if (result) + return ActionResult.resultSuccess(stack); + } + + // Special vanilla cauldron handling, yay. + if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().with(CauldronBlock.LEVEL, 3)); + return ActionResult.resultSuccess(stack); + } + + // Case for if block at blockPos is not a tank + // Place fluid in world + if (destination == null && destinationSide == null) + { + BlockPos targetPos = blockPos.offset(sideHit); + if (tryPlaceSigilFluid(player, world, targetPos) + && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) + { + return ActionResult.resultSuccess(stack); + } + } + } + } + + return super.onItemRightClick(world, player, hand); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java new file mode 100644 index 00000000..8558b314 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java @@ -0,0 +1,128 @@ +package wayoftime.bloodmagic.common.item.soul; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.util.ChatUtil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.will.EnumDemonWillType; +import wayoftime.bloodmagic.will.IDemonWill; + +public class ItemMonsterSoul extends Item implements IDemonWill +{ + private final EnumDemonWillType type; + + public ItemMonsterSoul(EnumDemonWillType type) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + this.type = type; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!stack.hasTag()) + return; + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(getType(stack), stack)))); + + super.addInformation(stack, world, tooltip, flag); + } + + @Override + public EnumDemonWillType getType(ItemStack stack) + { + return type; + } + + @Override + public double getWill(EnumDemonWillType type, ItemStack soulStack) + { + if (type != this.getType(soulStack)) + { + return 0; + } + + NBTHelper.checkNBT(soulStack); + + CompoundNBT tag = soulStack.getTag(); + + return tag.getDouble(Constants.NBT.SOULS); + } + + @Override + public void fillItemGroup(ItemGroup group, NonNullList items) + { + if (this.isInGroup(group)) + { + ItemStack stack = new ItemStack(this); + this.setWill(type, stack, 5); + items.add(stack); + } + } + + @Override + public boolean setWill(EnumDemonWillType type, ItemStack soulStack, double souls) + { + if (type != this.getType(soulStack)) + { + return false; + } + + NBTHelper.checkNBT(soulStack); + CompoundNBT tag = soulStack.getTag(); + tag.putDouble(Constants.NBT.SOULS, souls); + + return true; + } + + @Override + public double drainWill(EnumDemonWillType type, ItemStack soulStack, double drainAmount) + { + double souls = getWill(type, soulStack); + + double soulsDrained = Math.min(drainAmount, souls); + setWill(type, soulStack, souls - soulsDrained); + + return soulsDrained; + } + + @Override + public ItemStack createWill(double number) + { + ItemStack soulStack = new ItemStack(this); + setWill(getType(soulStack), soulStack, number); + return soulStack; + } + +// @Override +// public double getWill(ItemStack willStack) +// { +// return this.getWill(EnumDemonWillType.DEFAULT, willStack); +// } +// +// @Override +// public void setWill(ItemStack willStack, double will) +// { +// this.setWill(EnumDemonWillType.DEFAULT, willStack, will); +// } +// +// @Override +// public double drainWill(ItemStack willStack, double drainAmount) +// { +// return this.drainWill(EnumDemonWillType.DEFAULT, willStack, drainAmount); +// } + +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java new file mode 100644 index 00000000..8e59bcd2 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java @@ -0,0 +1,503 @@ +package wayoftime.bloodmagic.common.item.soul; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.UUID; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.attributes.Attribute; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.monster.SlimeEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.Difficulty; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.iface.IMultiWillTool; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.will.EnumDemonWillType; +import wayoftime.bloodmagic.will.IDemonWill; +import wayoftime.bloodmagic.will.IDemonWillWeapon; +import wayoftime.bloodmagic.will.PlayerDemonWillHandler; + +public class ItemSentientSword extends Item implements IDemonWillWeapon, IMultiWillTool +{ + public static int[] soulBracket = new int[] + { 16, 60, 200, 400, 1000, 2000, 4000 }; + public static double[] defaultDamageAdded = new double[] + { 1, 1.5, 2, 2.5, 3, 3.5, 4 }; + public static double[] destructiveDamageAdded = new double[] + { 1.5, 2.25, 3, 3.75, 4.5, 5.25, 6 }; + public static double[] vengefulDamageAdded = new double[] + { 0, 0.5, 1, 1.5, 2, 2.25, 2.5 }; + public static double[] steadfastDamageAdded = new double[] + { 0, 0.5, 1, 1.5, 2, 2.25, 2.5 }; + public static double[] soulDrainPerSwing = new double[] + { 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.25 }; + public static double[] soulDrop = new double[] + { 2, 4, 7, 10, 13, 15, 18 }; + public static double[] staticDrop = new double[] + { 1, 1, 2, 3, 3, 4, 4 }; + + public static double[] healthBonus = new double[] + { 0, 0, 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later + public static double[] vengefulAttackSpeed = new double[] + { -2.1, -2, -1.8, -1.7, -1.6, -1.6, -1.5 }; + public static double[] destructiveAttackSpeed = new double[] + { -2.6, -2.7, -2.8, -2.9, -3, -3, -3 }; + + public static int[] absorptionTime = new int[] + { 200, 300, 400, 500, 600, 700, 800 }; + + public static double maxAbsorptionHearts = 10; + + public static int[] poisonTime = new int[] + { 25, 50, 60, 80, 100, 120, 150 }; + public static int[] poisonLevel = new int[] + { 0, 0, 0, 1, 1, 1, 1 }; + + public static double[] movementSpeed = new double[] + { 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4 }; + + public ItemSentientSword() + { +// super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); + super(new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); + } + +// @Override +// public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) +// { +// return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() +// || super.getIsRepairable(toRepair, repair); +// } + + public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) + { + EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + recalculatePowers(stack, type, soulsRemaining); + } + + public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) + { + this.setCurrentType(stack, will > 0 ? type : EnumDemonWillType.DEFAULT); + int level = getLevel(stack, will); + + double drain = level >= 0 ? soulDrainPerSwing[level] : 0; + double extraDamage = getExtraDamage(type, level); + + setActivatedState(stack, will > 16); + + setDrainOfActivatedSword(stack, drain); + setDamageOfActivatedSword(stack, 5 + extraDamage); + setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); + setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); + setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : -2.4); + setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); + setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); + } + + public boolean getActivated(ItemStack stack) + { + return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTag().getBoolean(Constants.NBT.ACTIVATED); + } + + public ItemStack setActivatedState(ItemStack stack, boolean activated) + { + if (!stack.isEmpty()) + { + NBTHelper.checkNBT(stack).getTag().putBoolean(Constants.NBT.ACTIVATED, activated); + return stack; + } + + return stack; + } + + public double getExtraDamage(EnumDemonWillType type, int willBracket) + { + if (willBracket < 0) + { + return 0; + } + + switch (type) + { + case CORROSIVE: + case DEFAULT: + return defaultDamageAdded[willBracket]; + case DESTRUCTIVE: + return destructiveDamageAdded[willBracket]; + case VENGEFUL: + return vengefulDamageAdded[willBracket]; + case STEADFAST: + return steadfastDamageAdded[willBracket]; + } + + return 0; + } + + public double getAttackSpeed(EnumDemonWillType type, int willBracket) + { + switch (type) + { + case VENGEFUL: + return vengefulAttackSpeed[willBracket]; + case DESTRUCTIVE: + return destructiveAttackSpeed[willBracket]; + default: + return -2.4; + } + } + + public double getHealthBonus(EnumDemonWillType type, int willBracket) + { + switch (type) + { + case STEADFAST: + return healthBonus[willBracket]; + default: + return 0; + } + } + + public double getMovementSpeed(EnumDemonWillType type, int willBracket) + { + switch (type) + { + case VENGEFUL: + return movementSpeed[willBracket]; + default: + return 0; + } + } + + public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, LivingEntity attacker) + { +// switch (type) +// { +// case CORROSIVE: +// target.addPotionEffect(new PotionEffect(MobEffects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); +// break; +// case DEFAULT: +// break; +// case DESTRUCTIVE: +// break; +// case STEADFAST: +// if (!target.isEntityAlive()) +// { +// float absorption = attacker.getAbsorptionAmount(); +// attacker.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, absorptionTime[willBracket], 127)); +// attacker.setAbsorptionAmount((float) Math.min(absorption +// + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); +// } +// break; +// case VENGEFUL: +// break; +// } + } + + @Override + public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) + { + if (super.hitEntity(stack, target, attacker)) + { + if (attacker instanceof PlayerEntity) + { + PlayerEntity attackerPlayer = (PlayerEntity) attacker; + this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); + EnumDemonWillType type = this.getCurrentType(stack); + double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); + int willBracket = this.getLevel(stack, will); + + applyEffectToEntity(type, willBracket, target, attackerPlayer); + +// ItemStack offStack = attackerPlayer.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); +// if (offStack.getItem() instanceof ISentientSwordEffectProvider) +// { +// ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); +// if (provider.providesEffectForWill(type)) +// { +// provider.applyOnHitEffect(type, stack, offStack, attacker, target); +// } +// } + } + + return true; + } + + return false; + } + + @Override + public EnumDemonWillType getCurrentType(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + if (!tag.contains(Constants.NBT.WILL_TYPE)) + { + return EnumDemonWillType.DEFAULT; + } + + return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); + } + + public void setCurrentType(ItemStack stack, EnumDemonWillType type) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + recalculatePowers(player.getHeldItem(hand), world, player); + return super.onItemRightClick(world, player, hand); + } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + { + return oldStack.getItem() != newStack.getItem(); + } + + private int getLevel(ItemStack stack, double soulsRemaining) + { + int lvl = -1; + for (int i = 0; i < soulBracket.length; i++) + { + if (soulsRemaining >= soulBracket[i]) + { + lvl = i; + } + } + + return lvl; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!stack.hasTag()) + return; + +// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientSword.desc")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + } + + @Override + public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) + { + recalculatePowers(stack, player.getEntityWorld(), player); + + double drain = this.getDrainOfActivatedSword(stack); + if (drain > 0) + { + EnumDemonWillType type = getCurrentType(stack); + double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); + + if (drain > soulsRemaining) + { + return false; + } else + { + PlayerDemonWillHandler.consumeDemonWill(type, player, drain); + } + } + + return super.onLeftClickEntity(stack, player, entity); + } + + @Override + public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) + { + List soulList = new ArrayList<>(); + + if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) + { + return soulList; + } + + double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; + + IDemonWill soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()); + + EnumDemonWillType type = this.getCurrentType(stack); + + for (int i = 0; i <= looting; i++) + { + if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) + { + ItemStack soulStack = soul.createWill(willModifier + * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + + this.getStaticDropOfActivatedSword(stack)) + * killedEntity.getMaxHealth() / 20d); + soulList.add(soulStack); + } + } + + return soulList; + } + + // TODO: Change attack speed. + @Override + public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) + { + Multimap multimap = HashMultimap.create(); + if (slot == EquipmentSlotType.MAINHAND) + { + multimap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), AttributeModifier.Operation.ADDITION)); + multimap.put(Attributes.ATTACK_SPEED, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); + multimap.put(Attributes.MAX_HEALTH, new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), AttributeModifier.Operation.ADDITION)); + multimap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); + } + + return multimap; + } + + public double getDamageOfActivatedSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); + } + + public void setDamageOfActivatedSword(ItemStack stack, double damage) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + } + + public double getDrainOfActivatedSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); + } + + public void setDrainOfActivatedSword(ItemStack stack, double drain) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + } + + public double getStaticDropOfActivatedSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); + } + + public void setStaticDropOfActivatedSword(ItemStack stack, double drop) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + } + + public double getDropOfActivatedSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); + } + + public void setDropOfActivatedSword(ItemStack stack, double drop) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + } + + public double getHealthBonusOfSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); + } + + public void setHealthBonusOfSword(ItemStack stack, double hp) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + } + + public double getAttackSpeedOfSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); + } + + public void setAttackSpeedOfSword(ItemStack stack, double speed) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + } + + public double getSpeedOfSword(ItemStack stack) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); + } + + public void setSpeedOfSword(ItemStack stack, double speed) + { + NBTHelper.checkNBT(stack); + + CompoundNBT tag = stack.getTag(); + + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java new file mode 100644 index 00000000..9206dd15 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java @@ -0,0 +1,260 @@ +package wayoftime.bloodmagic.common.item.soul; + +import java.util.List; +import java.util.Locale; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.iface.IMultiWillTool; +import wayoftime.bloodmagic.util.ChatUtil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.will.EnumDemonWillType; +import wayoftime.bloodmagic.will.IDemonWill; +import wayoftime.bloodmagic.will.IDemonWillGem; +import wayoftime.bloodmagic.will.PlayerDemonWillHandler; + +public class ItemSoulGem extends Item implements IDemonWillGem, IMultiWillTool +{ + private final int maxWill; + private final String name; + + public ItemSoulGem(String name, int maxWill) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + this.name = name; + this.maxWill = maxWill; + } + + @Override + public void fillItemGroup(ItemGroup group, NonNullList items) + { + if (this.isInGroup(group)) + { + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + ItemStack stack = new ItemStack(this); + this.setCurrentType(type, stack); + this.setWill(type, stack, maxWill); + items.add(stack); + } + } + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + EnumDemonWillType type = this.getCurrentType(stack); + double drain = Math.min(this.getWill(type, stack), this.getMaxWill(type, stack) / 10); + + double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack); + this.drainWill(type, stack, filled, true); + + return new ActionResult<>(ActionResultType.PASS, stack); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!stack.hasTag()) + return; + + Items d; + + EnumDemonWillType type = this.getCurrentType(stack); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulGem." + name)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(type, stack)))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + + super.addInformation(stack, world, tooltip, flag); + } + + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + EnumDemonWillType type = this.getCurrentType(stack); + double maxWill = getMaxWill(type, stack); + if (maxWill <= 0) + { + return 1; + } + return 1.0 - (getWill(type, stack) / maxWill); + } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + EnumDemonWillType type = this.getCurrentType(stack); + double maxWill = getMaxWill(type, stack); + if (maxWill <= 0) + { + return 1; + } + + return MathHelper.hsvToRGB(Math.max(0.0F, (float) (getWill(type, stack)) / (float) maxWill) / 3.0F, 1.0F, 1.0F); + } + + @Override + public ItemStack fillDemonWillGem(ItemStack soulGemStack, ItemStack soulStack) + { + if (soulStack != null && soulStack.getItem() instanceof IDemonWill) + { + EnumDemonWillType thisType = this.getCurrentType(soulGemStack); + if (thisType != ((IDemonWill) soulStack.getItem()).getType(soulStack)) + { + return soulStack; + } + IDemonWill soul = (IDemonWill) soulStack.getItem(); + double soulsLeft = getWill(thisType, soulGemStack); + + if (soulsLeft < getMaxWill(thisType, soulGemStack)) + { + double newSoulsLeft = Math.min(soulsLeft + + soul.getWill(thisType, soulStack), getMaxWill(thisType, soulGemStack)); + soul.drainWill(thisType, soulStack, newSoulsLeft - soulsLeft); + + setWill(thisType, soulGemStack, newSoulsLeft); + if (soul.getWill(thisType, soulStack) <= 0) + { + return ItemStack.EMPTY; + } + } + } + + return soulStack; + } + + @Override + public double getWill(EnumDemonWillType type, ItemStack soulGemStack) + { + if (!type.equals(getCurrentType(soulGemStack))) + { + return 0; + } + + CompoundNBT tag = soulGemStack.getTag(); + + return tag.getDouble(Constants.NBT.SOULS); + } + + @Override + public void setWill(EnumDemonWillType type, ItemStack soulGemStack, double souls) + { + setCurrentType(type, soulGemStack); + + CompoundNBT tag = soulGemStack.getTag(); + + tag.putDouble(Constants.NBT.SOULS, souls); + } + + @Override + public double drainWill(EnumDemonWillType type, ItemStack soulGemStack, double drainAmount, boolean doDrain) + { + EnumDemonWillType currentType = this.getCurrentType(soulGemStack); + if (currentType != type) + { + return 0; + } + double souls = getWill(type, soulGemStack); + + double soulsDrained = Math.min(drainAmount, souls); + + if (doDrain) + { + setWill(type, soulGemStack, souls - soulsDrained); + } + + return soulsDrained; + } + + @Override + public int getMaxWill(EnumDemonWillType type, ItemStack soulGemStack) + { + EnumDemonWillType currentType = getCurrentType(soulGemStack); + if (!type.equals(currentType) && currentType != EnumDemonWillType.DEFAULT) + { + return 0; + } + + return maxWill; + } + + @Override + public EnumDemonWillType getCurrentType(ItemStack soulGemStack) + { + NBTHelper.checkNBT(soulGemStack); + + CompoundNBT tag = soulGemStack.getTag(); + + if (!tag.contains(Constants.NBT.WILL_TYPE)) + { + return EnumDemonWillType.DEFAULT; + } + + return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); + } + + public void setCurrentType(EnumDemonWillType type, ItemStack soulGemStack) + { + NBTHelper.checkNBT(soulGemStack); + + CompoundNBT tag = soulGemStack.getTag(); + + if (type == EnumDemonWillType.DEFAULT) + { + if (tag.contains(Constants.NBT.WILL_TYPE)) + { + tag.remove(Constants.NBT.WILL_TYPE); + } + + return; + } + + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); + } + + @Override + public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill) + { + if (!type.equals(getCurrentType(stack)) && this.getWill(getCurrentType(stack), stack) > 0) + { + return 0; + } + + double current = this.getWill(type, stack); + double maxWill = this.getMaxWill(type, stack); + + double filled = Math.min(fillAmount, maxWill - current); + + if (doFill) + { + this.setWill(type, stack, filled + current); + } + + return filled; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java new file mode 100644 index 00000000..c69305d5 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java @@ -0,0 +1,76 @@ +package wayoftime.bloodmagic.common.item.soul; + +import java.util.List; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.SnowballItem; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.entity.projectile.EntitySoulSnare; + +public class ItemSoulSnare extends Item +{ + public static String[] names = + { "base" }; + + public ItemSoulSnare() + { + super(new Item.Properties().maxStackSize(16).group(BloodMagic.TAB)); + +// setTranslationKey(BloodMagic.MODID + ".soulSnare."); +// setCreativeTab(BloodMagic.TAB_BM); +// setHasSubtypes(true); +// setMaxStackSize(16); + } + + @Override + public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) + { + ItemStack stack = playerIn.getHeldItem(hand); + if (!playerIn.isCreative()) + { + stack.shrink(1); + } + + SnowballItem d; + + worldIn.playSound((PlayerEntity) null, playerIn.getPosX(), playerIn.getPosY(), playerIn.getPosZ(), SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F + / (random.nextFloat() * 0.4F + 0.8F)); + + if (!worldIn.isRemote) + { + System.out.println("Attempting to spawn"); + EntitySoulSnare snare = new EntitySoulSnare(worldIn, playerIn); + snare.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); + worldIn.addEntity(snare); +// +// SnowballEntity snowballentity = new SnowballEntity(worldIn, playerIn); +// snowballentity.setItem(itemstack); +// snowballentity.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); +// worldIn.addEntity(snowballentity); + } + + return new ActionResult<>(ActionResultType.SUCCESS, stack); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulSnare.desc")); + + super.addInformation(stack, world, tooltip, flag); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java new file mode 100644 index 00000000..dfe9c6ec --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java @@ -0,0 +1,38 @@ +package wayoftime.bloodmagic.common.recipe; + +import java.util.function.Consumer; + +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.data.recipe.builder.AlchemyArrayRecipeBuilder; +import wayoftime.bloodmagic.common.item.BloodMagicItems; + +public class AlchemyArrayRecipeProvider implements ISubRecipeProvider +{ + + @Override + public void addRecipes(Consumer consumer) + { + String basePath = "array/"; +// AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/airsigil.png"), Ingredient.fromItems(Items.STONE), Ingredient.fromItems(Items.STONE), new ItemStack(Items.DIAMOND)).build(consumer, BloodMagic.rl(basePath +// + "airsigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/divinationsigil.png"), Ingredient.fromItems(Items.REDSTONE), Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "divinationsigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/watersigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_WATER.get()), Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.WATER_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "watersigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/lavasigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_LAVA.get()), Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.LAVA_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "lavasigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/voidsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_VOID.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.VOID_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "voidsigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/growthsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_GROWTH.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.GREEN_GROVE_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "growthsigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.FAST_MINER_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "fastminersigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/magnetismsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_MAGNETISM.get()), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.MAGNETISM_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "magnetismsigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/lightsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.BLOOD_LIGHT_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "bloodlightsigil")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/airsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_AIR.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.AIR_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "airsigil")); +// AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.FAST_MINER_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "frostsigil")); +// BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get()), AltarTier.ONE.ordinal(), 2000, 2, 1).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath +// + "weakbloodorb")); +// BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STONE), new ItemStack(BloodMagicItems.SLATE.get()), AltarTier.ONE.ordinal(), 1000, 5, 5).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath +// + "slate")); + + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java new file mode 100644 index 00000000..671843fa --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java @@ -0,0 +1,72 @@ +package wayoftime.bloodmagic.common.recipe; + +import java.util.function.Consumer; + +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.altar.AltarTier; +import wayoftime.bloodmagic.common.data.recipe.builder.BloodAltarRecipeBuilder; +import wayoftime.bloodmagic.common.item.BloodMagicItems; + +public class BloodAltarRecipeProvider implements ISubRecipeProvider +{ + + @Override + public void addRecipes(Consumer consumer) + { + String basePath = "altar/"; + + // ONE + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get()), AltarTier.ONE.ordinal(), 2000, 2, 1).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath + "weakbloodorb")); + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STONE), new ItemStack(BloodMagicItems.SLATE.get()), AltarTier.ONE.ordinal(), 1000, 5, 5).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath + "slate")); + + // TWO + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.REINFORCED_SLATE.get()), AltarTier.THREE.ordinal(), 2000, 5, 5).build(consumer, BloodMagic.rl(basePath + "reinforcedslate")); + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), new ItemStack(BloodMagicItems.APPRENTICE_BLOOD_ORB.get()), AltarTier.TWO.ordinal(), 5000, 5, 5).build(consumer, BloodMagic.rl(basePath + "apprenticebloodorb")); + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.IRON_SWORD), new ItemStack(BloodMagicItems.DAGGER_OF_SACRIFICE.get()), AltarTier.TWO.ordinal(), 3000, 5, 5).build(consumer, BloodMagic.rl(basePath + "daggerofsacrifice")); + + // THREE + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.IMBUED_SLATE.get()), AltarTier.THREE.ordinal(), 5000, 15, 10).build(consumer, BloodMagic.rl(basePath + "imbuedslate")); + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_GOLD), new ItemStack(BloodMagicItems.MAGICIAN_BLOOD_ORB.get()), AltarTier.THREE.ordinal(), 25000, 20, 20).build(consumer, BloodMagic.rl(basePath + "magicianbloodorb")); + + // FOUR + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.DEMONIC_SLATE.get()), AltarTier.FOUR.ordinal(), 15000, 20, 20).build(consumer, BloodMagic.rl(basePath + "demonicslate")); + +// BloodAltarRecipeBuilder.altar(input, output, minimumTier, syphon, consumeRate, drainRate).build(consumer, BloodMagic.rl(basePath + "")); + +// registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), AltarTier.ONE.ordinal(), 1000, 5, 0); +// registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), AltarTier.ONE.ordinal(), 1000, 20, 0); +// +// // TWO +// registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), AltarTier.TWO.ordinal(), 5000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), AltarTier.TWO.ordinal(), 2000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), AltarTier.TWO.ordinal(), 3000, 5, 5); +// +// // THREE +// registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), AltarTier.THREE.ordinal(), 25000, 20, 20); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), AltarTier.THREE.ordinal(), 5000, 15, 10); +// registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); +// registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), AltarTier.THREE.ordinal(), 10000, 20, 10); +// +// // FOUR +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 40000, 30, 50); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); +// registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); +// registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), AltarTier.FOUR.ordinal(), 10000, 20, 10); +// +// // FIVE +// registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), AltarTier.FIVE.ordinal(), 80000, 50, 100); +// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java new file mode 100644 index 00000000..e8a99239 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java @@ -0,0 +1,13 @@ +package wayoftime.bloodmagic.common.recipe; + +import net.minecraft.item.crafting.IRecipeType; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; + +public class BloodMagicRecipeType +{ + public static final IRecipeType ALTAR = IRecipeType.register("altar"); + public static final IRecipeType ARRAY = IRecipeType.register("array"); + public static final IRecipeType TARTARICFORGE = IRecipeType.register("soulforge"); +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java new file mode 100644 index 00000000..d7aa8f7c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java @@ -0,0 +1,14 @@ +package wayoftime.bloodmagic.common.recipe; + +import java.util.function.Consumer; + +import net.minecraft.data.IFinishedRecipe; + +/** + * Interface for helping split the recipe provider over multiple classes to make + * it a bit easier to interact with + */ +public interface ISubRecipeProvider +{ + void addRecipes(Consumer consumer); +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java new file mode 100644 index 00000000..43344e81 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java @@ -0,0 +1,36 @@ +package wayoftime.bloodmagic.common.recipe; + +import java.util.function.Consumer; + +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.ItemTags; +import net.minecraftforge.common.Tags; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.data.recipe.builder.TartaricForgeRecipeBuilder; +import wayoftime.bloodmagic.common.item.BloodMagicItems; + +public class TartaricForgeRecipeProvider implements ISubRecipeProvider +{ + + @Override + public void addRecipes(Consumer consumer) + { + String basePath = "soulforge/"; + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.PETTY_GEM.get()), 1, 1, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromTag(Tags.Items.GEMS_LAPIS)).build(consumer, BloodMagic.rl(basePath + "pettytartaricgem")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.LESSER_GEM.get()), 60, 20, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_LAPIS)).build(consumer, BloodMagic.rl(basePath + "lessertartaricgem")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.COMMON_GEM.get()), 240, 50, Ingredient.fromItems(BloodMagicItems.LESSER_GEM.get()), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_GOLD), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl(basePath + "commontartaricgem")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SWORD.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_SWORD)).build(consumer, BloodMagic.rl(basePath + "sentientsword")); + + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), 0, 0, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DYES_WHITE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "arcaneashes")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 10, 3, Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.WATER_BUCKET), Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 32, 10, Ingredient.fromItems(Items.LAVA_BUCKET), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_VOID.get()), 64, 10, Ingredient.fromItems(Items.BUCKET), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_void")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_GROWTH.get()), 128, 20, Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromItems(Items.SUGAR_CANE), Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "reagent_growth")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_MAGNETISM.get()), 600, 10, Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_IRON)).build(consumer, BloodMagic.rl(basePath + "reagent_magnetism")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 128, 20, Ingredient.fromItems(Items.IRON_PICKAXE), Ingredient.fromItems(Items.IRON_AXE), Ingredient.fromItems(Items.IRON_SHOVEL), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer")); + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java new file mode 100644 index 00000000..6a37051f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java @@ -0,0 +1,89 @@ +package wayoftime.bloodmagic.common.recipe.serializer; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistryEntry; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.util.Constants; + +public class AlchemyArrayRecipeSerializer + extends ForgeRegistryEntry> implements IRecipeSerializer +{ + private final IFactory factory; + + public AlchemyArrayRecipeSerializer(IFactory factory) + { + this.factory = factory; + } + + @Nonnull + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) + { + JsonElement input1 = JSONUtils.isJsonArray(json, Constants.JSON.BASEINPUT) + ? JSONUtils.getJsonArray(json, Constants.JSON.BASEINPUT) + : JSONUtils.getJsonObject(json, Constants.JSON.BASEINPUT); + + JsonElement input2 = JSONUtils.isJsonArray(json, Constants.JSON.ADDEDINPUT) + ? JSONUtils.getJsonArray(json, Constants.JSON.ADDEDINPUT) + : JSONUtils.getJsonObject(json, Constants.JSON.ADDEDINPUT); + + Ingredient baseInput = Ingredient.deserialize(input1); + Ingredient addedInput = Ingredient.deserialize(input2); + ResourceLocation texture = null; + if (json.has(Constants.JSON.TEXTURE)) + texture = new ResourceLocation(JSONUtils.getString(json, Constants.JSON.TEXTURE)); + ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); + + return this.factory.create(recipeId, texture, baseInput, addedInput, output); + } + + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) + { + try + { + ResourceLocation texture = null; + if (buffer.readBoolean()) + texture = buffer.readResourceLocation(); + Ingredient baseInput = Ingredient.read(buffer); + Ingredient addedInput = Ingredient.read(buffer); + ItemStack output = buffer.readItemStack(); + + return this.factory.create(recipeId, texture, baseInput, addedInput, output); + } catch (Exception e) + { +// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); + throw e; + } + } + + @Override + public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) + { + try + { + recipe.write(buffer); + } catch (Exception e) + { +// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); + throw e; + } + } + + @FunctionalInterface + public interface IFactory + { + RECIPE create(ResourceLocation id, ResourceLocation texture, Ingredient baseInput, Ingredient addedInput, ItemStack output); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java new file mode 100644 index 00000000..66852235 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java @@ -0,0 +1,85 @@ +package wayoftime.bloodmagic.common.recipe.serializer; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistryEntry; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.util.Constants; + +public class BloodAltarRecipeSerializer + extends ForgeRegistryEntry> implements IRecipeSerializer +{ + private final IFactory factory; + + public BloodAltarRecipeSerializer(IFactory factory) + { + this.factory = factory; + } + + @Nonnull + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) + { + JsonElement input = JSONUtils.isJsonArray(json, Constants.JSON.INPUT) + ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT) + : JSONUtils.getJsonObject(json, Constants.JSON.INPUT); + + Ingredient inputIng = Ingredient.deserialize(input); + ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); + int minimumTier = JSONUtils.getInt(json, Constants.JSON.ALTAR_TIER); + int syphon = JSONUtils.getInt(json, Constants.JSON.ALTAR_SYPHON); + int consumeRate = JSONUtils.getInt(json, Constants.JSON.ALTAR_CONSUMPTION_RATE); + int drainRate = JSONUtils.getInt(json, Constants.JSON.ALTAR_DRAIN_RATE); + + return this.factory.create(recipeId, inputIng, output, minimumTier, syphon, consumeRate, drainRate); + } + + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) + { + try + { + Ingredient input = Ingredient.read(buffer); + ItemStack output = buffer.readItemStack(); + int minimumTier = buffer.readInt(); + int syphon = buffer.readInt(); + int consumeRate = buffer.readInt(); + int drainRate = buffer.readInt(); + + return this.factory.create(recipeId, input, output, minimumTier, syphon, consumeRate, drainRate); + } catch (Exception e) + { +// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); + throw e; + } + } + + @Override + public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) + { + try + { + recipe.write(buffer); + } catch (Exception e) + { +// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); + throw e; + } + } + + @FunctionalInterface + public interface IFactory + { + RECIPE create(ResourceLocation id, Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java new file mode 100644 index 00000000..bf8d009e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java @@ -0,0 +1,100 @@ +package wayoftime.bloodmagic.common.recipe.serializer; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistryEntry; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.util.Constants; + +public class TartaricForgeRecipeSerializer + extends ForgeRegistryEntry> implements IRecipeSerializer +{ + + private final IFactory factory; + + public TartaricForgeRecipeSerializer(IFactory factory) + { + this.factory = factory; + } + + @Nonnull + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) + { + List inputList = new ArrayList(); + for (int i = 0; i < 4; i++) + { + if (json.has(Constants.JSON.INPUT + i)) + { + JsonElement input = JSONUtils.isJsonArray(json, Constants.JSON.INPUT + i) + ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT + i) + : JSONUtils.getJsonObject(json, Constants.JSON.INPUT + i); + inputList.add(Ingredient.deserialize(input)); + } + } + + ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); + + float minimumSouls = JSONUtils.getFloat(json, Constants.JSON.TARTARIC_MINIMUM); + float soulDrain = JSONUtils.getFloat(json, Constants.JSON.TARTARIC_DRAIN); + + return this.factory.create(recipeId, inputList, output, minimumSouls, soulDrain); + } + + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) + { + try + { + int size = buffer.readInt(); + List input = new ArrayList(size); + + for (int i = 0; i < size; i++) + { + input.add(i, Ingredient.read(buffer)); + } + + ItemStack output = buffer.readItemStack(); + double minimumSouls = buffer.readDouble(); + double soulDrain = buffer.readDouble(); + + return this.factory.create(recipeId, input, output, minimumSouls, soulDrain); + } catch (Exception e) + { +// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); + throw e; + } + } + + @Override + public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) + { + try + { + recipe.write(buffer); + } catch (Exception e) + { +// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); + throw e; + } + } + + @FunctionalInterface + public interface IFactory + { + RECIPE create(ResourceLocation id, List input, ItemStack output, double minimumSouls, double soulDrain); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java b/src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java new file mode 100644 index 00000000..a75d9fe8 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java @@ -0,0 +1,11 @@ +package wayoftime.bloodmagic.common.registration; + +public interface INamedEntry +{ + + /** + * Used for retrieving the path/name of a registry object before the registry + * object has been fully initialized + */ + String getInternalRegistryName(); +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java new file mode 100644 index 00000000..f6a707df --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java @@ -0,0 +1,49 @@ +package wayoftime.bloodmagic.common.registration; + +import java.util.function.Function; +import java.util.function.Supplier; + +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.IForgeRegistryEntry; +import net.minecraftforge.registries.RegistryBuilder; + +public class WrappedDeferredRegister> +{ + protected final DeferredRegister internal; + + protected WrappedDeferredRegister(String modid, IForgeRegistry registry) + { + internal = DeferredRegister.create(registry, modid); + } + + /** + * @apiNote For use with custom registries + */ + protected WrappedDeferredRegister(String modid, Class base) + { + internal = DeferredRegister.create(base, modid); + } + + protected > W register(String name, Supplier sup, + Function, W> objectWrapper) + { + return objectWrapper.apply(internal.register(name, sup)); + } + + /** + * Only call this from mekanism and for custom registries + */ + public void createAndRegister(IEventBus bus, String name) + { + internal.makeRegistry(name, RegistryBuilder::new); + register(bus); + } + + public void register(IEventBus bus) + { + internal.register(bus); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java new file mode 100644 index 00000000..7d37f782 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java @@ -0,0 +1,32 @@ +package wayoftime.bloodmagic.common.registration; + +import java.util.function.Supplier; + +import javax.annotation.Nonnull; + +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.IForgeRegistryEntry; + +public class WrappedRegistryObject> implements Supplier, INamedEntry +{ + + protected RegistryObject registryObject; + + protected WrappedRegistryObject(RegistryObject registryObject) + { + this.registryObject = registryObject; + } + + @Nonnull + @Override + public T get() + { + return registryObject.get(); + } + + @Override + public String getInternalRegistryName() + { + return registryObject.getId().getPath(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java new file mode 100644 index 00000000..cc54ca3b --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java @@ -0,0 +1,26 @@ +package wayoftime.bloodmagic.common.registration.impl; + +import java.util.function.Supplier; + +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; +import wayoftime.bloodmagic.orb.BloodOrb; + +public class BloodOrbDeferredRegister extends WrappedDeferredRegister +{ + public BloodOrbDeferredRegister(String modid) + { + super(modid, BloodOrb.class); + } + + public BloodOrbRegistryObject register(String name, ResourceLocation rl, int tier, int capacity, + int fillRate) + { + return register(name, () -> new BloodOrb(rl, tier, capacity, fillRate)); + } + + public BloodOrbRegistryObject register(String name, Supplier sup) + { + return register(name, sup, BloodOrbRegistryObject::new); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java new file mode 100644 index 00000000..f97d2347 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java @@ -0,0 +1,13 @@ +package wayoftime.bloodmagic.common.registration.impl; + +import net.minecraftforge.fml.RegistryObject; +import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; +import wayoftime.bloodmagic.orb.BloodOrb; + +public class BloodOrbRegistryObject extends WrappedRegistryObject +{ + public BloodOrbRegistryObject(RegistryObject registryObject) + { + super(registryObject); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java new file mode 100644 index 00000000..0176e647 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java @@ -0,0 +1,20 @@ +package wayoftime.bloodmagic.common.registration.impl; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; + +public class EntityTypeDeferredRegister extends WrappedDeferredRegister> +{ + + public EntityTypeDeferredRegister(String modid) + { + super(modid, ForgeRegistries.ENTITIES); + } + + public EntityTypeRegistryObject register(String name, EntityType.Builder builder) + { + return register(name, () -> builder.build(name), EntityTypeRegistryObject::new); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java new file mode 100644 index 00000000..13b1aa1c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java @@ -0,0 +1,26 @@ +package wayoftime.bloodmagic.common.registration.impl; + +import javax.annotation.Nonnull; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraftforge.fml.RegistryObject; +import wayoftime.bloodmagic.api.providers.IEntityTypeProvider; +import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; + +public class EntityTypeRegistryObject extends WrappedRegistryObject> + implements IEntityTypeProvider +{ + + public EntityTypeRegistryObject(RegistryObject> registryObject) + { + super(registryObject); + } + + @Nonnull + @Override + public EntityType getEntityType() + { + return get(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java new file mode 100644 index 00000000..10c94aba --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java @@ -0,0 +1,23 @@ +package wayoftime.bloodmagic.common.registration.impl; + +import java.util.function.Supplier; + +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraftforge.registries.ForgeRegistries; +import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; + +public class IRecipeSerializerDeferredRegister extends WrappedDeferredRegister> +{ + + public IRecipeSerializerDeferredRegister(String modid) + { + super(modid, ForgeRegistries.RECIPE_SERIALIZERS); + } + + public > IRecipeSerializerRegistryObject register(String name, + Supplier> sup) + { + return register(name, sup, IRecipeSerializerRegistryObject::new); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java new file mode 100644 index 00000000..70d3d56c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java @@ -0,0 +1,24 @@ +package wayoftime.bloodmagic.common.registration.impl; + +import javax.annotation.Nonnull; + +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraftforge.fml.RegistryObject; +import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; + +public class IRecipeSerializerRegistryObject> + extends WrappedRegistryObject> +{ + + public IRecipeSerializerRegistryObject(RegistryObject> registryObject) + { + super(registryObject); + } + + @Nonnull + public IRecipeSerializer getRecipeSerializer() + { + return get(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java new file mode 100644 index 00000000..c5f775f0 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java @@ -0,0 +1,22 @@ +package wayoftime.bloodmagic.common.registries; + +import net.minecraft.entity.EntityClassification; +import net.minecraft.entity.EntityType; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.registration.impl.EntityTypeDeferredRegister; +import wayoftime.bloodmagic.common.registration.impl.EntityTypeRegistryObject; +import wayoftime.bloodmagic.entity.projectile.EntityBloodLight; +import wayoftime.bloodmagic.entity.projectile.EntitySoulSnare; + +public class BloodMagicEntityTypes +{ + private BloodMagicEntityTypes() + { + + } + + public static final EntityTypeDeferredRegister ENTITY_TYPES = new EntityTypeDeferredRegister(BloodMagic.MODID); + + public static final EntityTypeRegistryObject SNARE = ENTITY_TYPES.register("soulsnare", EntityType.Builder.create(EntitySoulSnare::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).size(0.25f, 0.25f)); + public static final EntityTypeRegistryObject BLOOD_LIGHT = ENTITY_TYPES.register("bloodlight", EntityType.Builder.create(EntityBloodLight::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).size(0.25f, 0.25f)); +} diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java new file mode 100644 index 00000000..53f454d7 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java @@ -0,0 +1,33 @@ +package wayoftime.bloodmagic.common.registries; + +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.common.recipe.serializer.AlchemyArrayRecipeSerializer; +import wayoftime.bloodmagic.common.recipe.serializer.BloodAltarRecipeSerializer; +import wayoftime.bloodmagic.common.recipe.serializer.TartaricForgeRecipeSerializer; +import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerDeferredRegister; +import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerRegistryObject; +import wayoftime.bloodmagic.recipe.IRecipeAlchemyArray; +import wayoftime.bloodmagic.recipe.IRecipeBloodAltar; +import wayoftime.bloodmagic.recipe.IRecipeTartaricForge; + +public class BloodMagicRecipeSerializers +{ + private BloodMagicRecipeSerializers() + { + + } + + public static final IRecipeSerializerDeferredRegister RECIPE_SERIALIZERS = new IRecipeSerializerDeferredRegister(BloodMagic.MODID); + + public static final IRecipeSerializerRegistryObject ALTAR = RECIPE_SERIALIZERS.register("altar", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new)); + public static final IRecipeSerializerRegistryObject ARRAY = RECIPE_SERIALIZERS.register("array", () -> new AlchemyArrayRecipeSerializer<>(IRecipeAlchemyArray::new)); + public static final IRecipeSerializerRegistryObject TARTARIC = RECIPE_SERIALIZERS.register("soulforge", () -> new TartaricForgeRecipeSerializer<>(IRecipeTartaricForge::new)); + +// public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, BloodMagic.MODID); + +// public static final DeferredObject REC = RECIPE_SERIALIZERS.register("test", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new)); +// public static final IRecipeSerializerDeferredRegister RECIPE_SERIALIZERS = new IRecipeSerializerDeferredRegister(BloodMagic.MODID); +} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java new file mode 100644 index 00000000..51cbc160 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java @@ -0,0 +1,130 @@ +package wayoftime.bloodmagic.compat.jei.altar; + +import java.awt.Color; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import com.google.common.collect.Lists; +import com.mojang.blaze3d.matrix.MatrixStack; + +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.drawable.IDrawable; +import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.category.IRecipeCategory; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.util.ChatUtil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.NumeralHelper; +import wayoftime.bloodmagic.util.helper.TextHelper; + +public class BloodAltarRecipeCategory implements IRecipeCategory +{ + private static final int INPUT_SLOT = 1; + private static final int OUTPUT_SLOT = 0; + public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ALTAR); + + @Nonnull + private final IDrawable background; + private final IDrawable icon; +// @Nonnull +// private final ICraftingGridHelper craftingGridHelper; + + public BloodAltarRecipeCategory(IGuiHelper guiHelper) + { + icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get())); + background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/altar.png"), 3, 4, 155, 65); +// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); + } + + @Nonnull + @Override + public ResourceLocation getUid() + { + return UID; + } + + @Override + public List getTooltipStrings(RecipeBloodAltar recipe, double mouseX, double mouseY) + { + List tooltip = Lists.newArrayList(); + + if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) + { + tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.consumptionrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getConsumeRate()))); + tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.drainrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getDrainRate()))); + } + + return tooltip; + } + + @Nonnull + @Override + public String getTitle() + { + return TextHelper.localize("jei.bloodmagic.recipe.altar"); + } + + @Nonnull + @Override + public IDrawable getBackground() + { + return background; + } + + @Nullable + @Override + public IDrawable getIcon() + { + return icon; + } + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeBloodAltar recipe, @Nonnull IIngredients ingredients) + { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + + guiItemStacks.init(OUTPUT_SLOT, false, 125, 30); + guiItemStacks.init(INPUT_SLOT, true, 31, 0); + + guiItemStacks.set(ingredients); + } + + @Override + public Class getRecipeClass() + { + return RecipeBloodAltar.class; + } + + @Override + public void setIngredients(RecipeBloodAltar recipe, IIngredients ingredients) + { + ingredients.setInputIngredients(recipe.getIngredients()); + ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); + } + + @Override + public void draw(RecipeBloodAltar recipe, MatrixStack matrixStack, double mouseX, double mouseY) + { + Minecraft mc = Minecraft.getInstance(); + String[] infoString = new String[] + { TextHelper.localize("jei.bloodmagic.recipe.requiredtier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())), + TextHelper.localize("jei.bloodmagic.recipe.requiredlp", recipe.getSyphon()) }; + mc.fontRenderer.drawString(matrixStack, infoString[0], 90 + - mc.fontRenderer.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); + mc.fontRenderer.drawString(matrixStack, infoString[1], 90 + - mc.fontRenderer.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); + } + +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java new file mode 100644 index 00000000..2c8b7332 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java @@ -0,0 +1,93 @@ +package wayoftime.bloodmagic.compat.jei.array; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.drawable.IDrawable; +import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.category.IRecipeCategory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.TextHelper; + +public class AlchemyArrayCraftingCategory implements IRecipeCategory +{ + private static final int OUTPUT_SLOT = 0; + private static final int INPUT_SLOT = 1; + private static final int CATALYST_SLOT = 2; + public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); + + @Nonnull + private final IDrawable background; + private final IDrawable icon; +// @Nonnull +// private final ICraftingGridHelper craftingGridHelper; + + public AlchemyArrayCraftingCategory(IGuiHelper guiHelper) + { + icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicItems.ARCANE_ASHES.get())); + background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/binding.png"), 0, 0, 100, 30); +// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); + } + + @Nonnull + @Override + public ResourceLocation getUid() + { + return UID; + } + + @Nonnull + @Override + public String getTitle() + { + return TextHelper.localize("jei.bloodmagic.recipe.alchemyarraycrafting"); + } + + @Nonnull + @Override + public IDrawable getBackground() + { + return background; + } + + @Nullable + @Override + public IDrawable getIcon() + { + return icon; + } + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeAlchemyArray recipe, @Nonnull IIngredients ingredients) + { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + + recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); + recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); + recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 29, 3); + + guiItemStacks.set(ingredients); + } + + @Override + public Class getRecipeClass() + { + return RecipeAlchemyArray.class; + } + + @Override + public void setIngredients(RecipeAlchemyArray recipe, IIngredients ingredients) + { + ingredients.setInputIngredients(recipe.getIngredients()); + ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java new file mode 100644 index 00000000..e1af6cee --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java @@ -0,0 +1,53 @@ +package wayoftime.bloodmagic.core.registry; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect; +import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting; + +public class AlchemyArrayRegistry +{ + public static Map effectMap = new HashMap(); + + public static boolean registerEffect(ResourceLocation rl, AlchemyArrayEffect effect) + { + boolean hadKey = effectMap.containsKey(rl); + + effectMap.put(rl, effect); + + return hadKey; + } + + public static AlchemyArrayEffect getEffect(World world, ResourceLocation rl, RecipeAlchemyArray recipe) + { + if (effectMap.containsKey(rl)) + { + return effectMap.get(rl).getNewCopy(); + } + + if (!recipe.getOutput().isEmpty()) + { + // Return a new instance of AlchemyEffectCrafting + return new AlchemyArrayEffectCrafting(recipe.getOutput()); + } + + return null; + } + + public static AlchemyArrayEffect getEffect(World world, ItemStack input, ItemStack catalyst) + { + Pair array = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(world, input, catalyst); + if (array == null || array.getRight() == null || !array.getLeft()) + return null; + + return getEffect(world, array.getRight().getId(), array.getRight()); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java new file mode 100644 index 00000000..e346f33f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java @@ -0,0 +1,67 @@ +package wayoftime.bloodmagic.core.registry; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer; + +public class AlchemyArrayRendererRegistry +{ + @OnlyIn(Dist.CLIENT) + public static final AlchemyArrayRenderer DEFAULT_RENDERER = new AlchemyArrayRenderer(new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/basearray.png")); + + @OnlyIn(Dist.CLIENT) + public static Map rendererMap = new HashMap(); + + /** + * + * @param rl + * @param renderer + * @return True if there was already a renderer registered for this rl. + */ + @OnlyIn(Dist.CLIENT) + public static boolean registerRenderer(ResourceLocation rl, AlchemyArrayRenderer renderer) + { + boolean hadKey = rendererMap.containsKey(rl); + + rendererMap.put(rl, renderer); + + return hadKey; + } + + @OnlyIn(Dist.CLIENT) + public static AlchemyArrayRenderer getRenderer(World world, ResourceLocation rl, RecipeAlchemyArray recipe) + { + if (rendererMap.containsKey(rl)) + { + return rendererMap.get(rl); + } + + ResourceLocation texture = recipe.getTexture(); + if (texture != null) + return new AlchemyArrayRenderer(texture); + + return null; + } + + @OnlyIn(Dist.CLIENT) + public static AlchemyArrayRenderer getRenderer(World world, ItemStack input, ItemStack catalyst) + { + Pair array = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(world, input, catalyst); + if (array == null || array.getRight() == null) + { + return null; + } + + return getRenderer(world, array.getRight().getId(), array.getRight()); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java b/src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java new file mode 100644 index 00000000..9ae8814d --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java @@ -0,0 +1,30 @@ +package wayoftime.bloodmagic.entity; + +import net.minecraft.entity.EntityType; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import wayoftime.bloodmagic.BloodMagic; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class BloodMagicEntities +{ + private BloodMagicEntities() + { + } + + @SubscribeEvent + public static void registerEntities(RegistryEvent.Register> event) + { +// System.out.println("Ow O"); +// event.getRegistry().register(EntityType.Builder.create(EntitySoulSnare::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).setShouldReceiveVelocityUpdates(false).setCustomClientFactory(((spawnEntity, world) -> new EntitySoulSnare(EntitySoulSnare.TYPE, world))).build("").setRegistryName(BloodMagic.rl("entitysoulsnare"))); + } + + @SubscribeEvent + public static void registerModels(ModelRegistryEvent evt) + { +// System.out.println("O wO"); +// RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.SNARE.getEntityType(), SoulSnareRenderer::new); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java b/src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java new file mode 100644 index 00000000..74d39066 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java @@ -0,0 +1,151 @@ +package wayoftime.bloodmagic.network; + +import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.function.Supplier; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.RegistryKey; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; +import net.minecraftforge.fml.network.NetworkDirection; +import net.minecraftforge.fml.network.NetworkEvent.Context; +import net.minecraftforge.fml.network.NetworkRegistry; +import net.minecraftforge.fml.network.PacketDistributor; +import net.minecraftforge.fml.network.simple.SimpleChannel; + +/** + * Copied liberally from Mekanism. Many thanks to pupnewfster! + * + */ +public abstract class BasePacketHandler +{ + + protected static SimpleChannel createChannel(ResourceLocation name) + { + return NetworkRegistry.ChannelBuilder.named(name).clientAcceptedVersions(getProtocolVersion()::equals).serverAcceptedVersions(getProtocolVersion()::equals).networkProtocolVersion(BasePacketHandler::getProtocolVersion).simpleChannel(); + } + + private static String getProtocolVersion() + { + return "1"; + } + + /** + * Helper for reading strings to make sure we don't accidentally call + * PacketBuffer#readString on the server + */ + public static String readString(PacketBuffer buffer) + { + return buffer.readString(Short.MAX_VALUE); + } + +// public static void log(String log) +// { +// // TODO: Add more logging for packets using this +// if (MekanismConfig.general.logPackets.get()) +// { +// Mekanism.logger.info(log); +// } +// } +// + public static PlayerEntity getPlayer(Supplier context) + { + return context.get().getSender(); + } + + private int index = 0; + + protected abstract SimpleChannel getChannel(); + + public abstract void initialize(); + + protected void registerClientToServer(Class type, BiConsumer encoder, + Function decoder, BiConsumer> consumer) + { + getChannel().registerMessage(index++, type, encoder, decoder, consumer, Optional.of(NetworkDirection.PLAY_TO_SERVER)); + } + + protected void registerServerToClient(Class type, BiConsumer encoder, + Function decoder, BiConsumer> consumer) + { + getChannel().registerMessage(index++, type, encoder, decoder, consumer, Optional.of(NetworkDirection.PLAY_TO_CLIENT)); + } + + /** + * Send this message to the specified player. + * + * @param message - the message to send + * @param player - the player to send it to + */ + public void sendTo(MSG message, ServerPlayerEntity player) + { + getChannel().sendTo(message, player.connection.getNetworkManager(), NetworkDirection.PLAY_TO_CLIENT); + } + + /** + * Send this message to everyone connected to the server. + * + * @param message - message to send + */ + public void sendToAll(MSG message) + { + getChannel().send(PacketDistributor.ALL.noArg(), message); + } + + /** + * Send this message to everyone within the supplied dimension. + * + * @param message - the message to send + * @param dimension - the dimension to target + */ + public void sendToDimension(MSG message, RegistryKey dimension) + { + getChannel().send(PacketDistributor.DIMENSION.with(() -> dimension), message); + } + + /** + * Send this message to the server. + * + * @param message - the message to send + */ + public void sendToServer(MSG message) + { + getChannel().sendToServer(message); + } + + public void sendToAllTracking(MSG message, Entity entity) + { + getChannel().send(PacketDistributor.TRACKING_ENTITY.with(() -> entity), message); + } + + public void sendToAllTracking(MSG message, TileEntity tile) + { + sendToAllTracking(message, tile.getWorld(), tile.getPos()); + } + + public void sendToAllTracking(MSG message, World world, BlockPos pos) + { + if (world instanceof ServerWorld) + { + // If we have a ServerWorld just directly figure out the ChunkPos so as to not + // require looking up the chunk + // This provides a decent performance boost over using the packet distributor + ((ServerWorld) world).getChunkProvider().chunkManager.getTrackingPlayers(new ChunkPos(pos), false).forEach(p -> sendTo(message, p)); + } else + { + // Otherwise fallback to entities tracking the chunk if some mod did something + // odd and our world is not a ServerWorld + getChannel().send(PacketDistributor.TRACKING_CHUNK.with(() -> world.getChunk(pos.getX() >> 4, pos.getZ() >> 4)), message); + } + } + +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java new file mode 100644 index 00000000..8e4cd60a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java @@ -0,0 +1,16 @@ +package wayoftime.bloodmagic.potion; + +import net.minecraft.potion.Effect; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.registries.IForgeRegistry; + +public class BloodMagicPotions +{ + public static final Effect soulSnare = new PotionSoulSnare(); + + public static void registerPotions(RegistryEvent.Register evt) + { + IForgeRegistry reg = evt.getRegistry(); + reg.register(soulSnare.setRegistryName("soulsnare")); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java b/src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java new file mode 100644 index 00000000..34e0cc68 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java @@ -0,0 +1,11 @@ +package wayoftime.bloodmagic.potion; + +import net.minecraft.potion.EffectType; + +public class PotionSoulSnare extends PotionBloodMagic +{ + public PotionSoulSnare() + { + super(EffectType.NEUTRAL, 0xFFFFFF); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java new file mode 100644 index 00000000..414c3647 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java @@ -0,0 +1,31 @@ +package wayoftime.bloodmagic.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; +import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; + +public class IRecipeAlchemyArray extends RecipeAlchemyArray +{ + public IRecipeAlchemyArray(ResourceLocation id, ResourceLocation texture, Ingredient baseIngredient, Ingredient addedIngredient, ItemStack result) + { + super(id, texture, baseIngredient, addedIngredient, result); + } + + @Override + public IRecipeSerializer getSerializer() + { + return BloodMagicRecipeSerializers.ARRAY.getRecipeSerializer(); + } + + @Override + public IRecipeType getType() + { + return BloodMagicRecipeType.ARRAY; + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java new file mode 100644 index 00000000..ae6a87bf --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java @@ -0,0 +1,30 @@ +package wayoftime.bloodmagic.recipe; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; +import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; + +public class IRecipeBloodAltar extends RecipeBloodAltar +{ + public IRecipeBloodAltar(ResourceLocation id, Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate) + { + super(id, input, output, minimumTier, syphon, consumeRate, drainRate); + } + + @Override + public IRecipeSerializer getSerializer() + { + return BloodMagicRecipeSerializers.ALTAR.getRecipeSerializer(); + } + + @Override + public IRecipeType getType() + { + return BloodMagicRecipeType.ALTAR; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java new file mode 100644 index 00000000..71ce5276 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java @@ -0,0 +1,35 @@ +package wayoftime.bloodmagic.recipe; + +import java.util.List; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; +import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; + +public class IRecipeTartaricForge extends RecipeTartaricForge +{ + public IRecipeTartaricForge(ResourceLocation id, @Nonnull List input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) + { + super(id, input, output, minimumSouls, soulDrain); + } + + @Override + public IRecipeSerializer getSerializer() + { + return BloodMagicRecipeSerializers.TARTARIC.getRecipeSerializer(); + } + + @Override + public IRecipeType getType() + { + return BloodMagicRecipeType.TARTARICFORGE; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java b/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java new file mode 100644 index 00000000..cb242cbc --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java @@ -0,0 +1,154 @@ +package wayoftime.bloodmagic.tile.contailer; + +import javax.annotation.Nullable; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.IIntArray; +import net.minecraft.util.IntArray; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.tile.TileSoulForge; +import wayoftime.bloodmagic.will.IDemonWill; +import wayoftime.bloodmagic.will.IDemonWillGem; + +public class ContainerSoulForge extends Container +{ + public final IInventory tileForge; + public final IIntArray data; + +// public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileForge) +// { +// this.tileForge = tileForge; +// +// } + + public ContainerSoulForge(int windowId, PlayerInventory playerInventory, PacketBuffer extraData) + { + this((TileSoulForge) playerInventory.player.world.getTileEntity(extraData.readBlockPos()), new IntArray(5), windowId, playerInventory); + } + + public ContainerSoulForge(@Nullable TileSoulForge tile, IIntArray data, int windowId, PlayerInventory playerInventory) + { + super(BloodMagicBlocks.SOUL_FORGE_CONTAINER.get(), windowId); + this.tileForge = tile; + this.setup(playerInventory, tile); + this.data = data; + } + + public void setup(PlayerInventory inventory, IInventory tileForge) + { + this.addSlot(new Slot(tileForge, 0, 8, 15)); + this.addSlot(new Slot(tileForge, 1, 80, 15)); + this.addSlot(new Slot(tileForge, 2, 8, 87)); + this.addSlot(new Slot(tileForge, 3, 80, 87)); + this.addSlot(new SlotSoul(tileForge, TileSoulForge.soulSlot, 152, 51)); + this.addSlot(new SlotOutput(tileForge, TileSoulForge.outputSlot, 44, 51)); + + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 9; j++) + { + addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); + } + } + + for (int i = 0; i < 9; i++) + { + addSlot(new Slot(inventory, i, 8 + i * 18, 181)); + } + } + + @Override + public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) + { + ItemStack itemstack = ItemStack.EMPTY; + Slot slot = this.inventorySlots.get(index); + + if (slot != null && slot.getHasStack()) + { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + + if (index == 5) + { + if (!this.mergeItemStack(itemstack1, 6, 6 + 36, true)) + { + return ItemStack.EMPTY; + } + + slot.onSlotChange(itemstack1, itemstack); + } else if (index > 5) + { + if (itemstack1.getItem() instanceof IDemonWill || itemstack1.getItem() instanceof IDemonWillGem) + { + if (!this.mergeItemStack(itemstack1, 4, 5, false)) + { + return ItemStack.EMPTY; + } + } else if (!this.mergeItemStack(itemstack1, 0, 4, false)) + { + return ItemStack.EMPTY; + } + } else if (!this.mergeItemStack(itemstack1, 6, 42, false)) + { + return ItemStack.EMPTY; + } + + if (itemstack1.getCount() == 0) + { + slot.putStack(ItemStack.EMPTY); + } else + { + slot.onSlotChanged(); + } + + if (itemstack1.getCount() == itemstack.getCount()) + { + return ItemStack.EMPTY; + } + + slot.onTake(playerIn, itemstack1); + } + + return itemstack; + } + + @Override + public boolean canInteractWith(PlayerEntity playerIn) + { + return this.tileForge.isUsableByPlayer(playerIn); + } + + private class SlotSoul extends Slot + { + public SlotSoul(IInventory inventory, int slotIndex, int x, int y) + { + super(inventory, slotIndex, x, y); + } + + @Override + public boolean isItemValid(ItemStack itemStack) + { + return itemStack.getItem() instanceof IDemonWillGem || itemStack.getItem() instanceof IDemonWill; + } + } + + private class SlotOutput extends Slot + { + public SlotOutput(IInventory inventory, int slotIndex, int x, int y) + { + super(inventory, slotIndex, x, y); + } + + @Override + public boolean isItemValid(ItemStack stack) + { + return false; + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java b/src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java new file mode 100644 index 00000000..21997641 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java @@ -0,0 +1,99 @@ +package wayoftime.bloodmagic.will; + +import java.util.HashMap; +import java.util.Map.Entry; + +import net.minecraft.nbt.CompoundNBT; + +public class DemonWillHolder +{ + public HashMap willMap = new HashMap<>(); + + public double addWill(EnumDemonWillType type, double amount, double max) + { + double current = 0; + if (willMap.containsKey(type)) + { + current = willMap.get(type); + } + + double added = Math.min(max - current, amount); + addWill(type, amount); + + return added; + } + + public void addWill(EnumDemonWillType type, double amount) + { + if (willMap.containsKey(type)) + { + willMap.put(type, amount + willMap.get(type)); + } else + { + willMap.put(type, amount); + } + } + + public double drainWill(EnumDemonWillType type, double amount) + { + if (willMap.containsKey(type)) + { + double current = willMap.get(type); + double reduced = Math.min(current, amount); + + if (reduced >= current) + { + willMap.remove(type); + } else + { + willMap.put(type, current - reduced); + } + + return reduced; + } + + return 0; + } + + public double getWill(EnumDemonWillType type) + { + if (willMap.containsKey(type)) + { + return willMap.get(type); + } + + return 0; + } + + public void readFromNBT(CompoundNBT tag, String key) + { + CompoundNBT willTag = tag.getCompound(key); + + willMap.clear(); + + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + double amount = willTag.getDouble("EnumWill" + type.name()); + if (amount > 0) + { + willMap.put(type, amount); + } + } + } + + public void writeToNBT(CompoundNBT tag, String key) + { + CompoundNBT willTag = new CompoundNBT(); + for (Entry entry : willMap.entrySet()) + { + willTag.putDouble("EnumWill" + entry.getKey().name(), entry.getValue()); + } + + tag.put(key, willTag); + } + + public void clearWill() + { + willMap.clear(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/will/EnumDemonWillType.java b/src/main/java/wayoftime/bloodmagic/will/EnumDemonWillType.java new file mode 100644 index 00000000..3bd96e39 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/EnumDemonWillType.java @@ -0,0 +1,33 @@ +package wayoftime.bloodmagic.will; + +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; + +public enum EnumDemonWillType implements IStringSerializable +{ + DEFAULT("default"), + CORROSIVE("corrosive"), + DESTRUCTIVE("destructive"), + VENGEFUL("vengeful"), + STEADFAST("steadfast"); + + public final String name; + + EnumDemonWillType(String name) + { + this.name = name; + } + + @Override + public String toString() + { + return name().toLowerCase(Locale.ENGLISH); + } + + @Override + public String getString() + { + return this.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/will/IDemonWill.java b/src/main/java/wayoftime/bloodmagic/will/IDemonWill.java new file mode 100644 index 00000000..3234d1fd --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/IDemonWill.java @@ -0,0 +1,45 @@ +package wayoftime.bloodmagic.will; + +import net.minecraft.item.ItemStack; + +public interface IDemonWill +{ + /** + * Obtains the amount of Will an ItemStack contains. + * + * @param willStack - The stack to retrieve the Will from + * @return - The amount of Will an ItemStack contains + */ + double getWill(EnumDemonWillType type, ItemStack willStack); + + /** + * Sets the amount of Will in a given ItemStack. + * + * @param willStack - The ItemStack of the Will + * @param will - The amount of will to set the stack to + * @return True if successfully set. + */ + boolean setWill(EnumDemonWillType type, ItemStack willStack, double will); + + /** + * Drains the demonic will from the willStack. If all of the will is drained, + * the willStack will be removed. + * + * @param willStack - The ItemStack of the will + * @param drainAmount - The amount of Will to drain + * @return The amount of will drained. + */ + double drainWill(EnumDemonWillType type, ItemStack willStack, double drainAmount); + + /** + * Creates a new ItemStack with the specified number of will. Implementation + * should respect the number requested. + * + * @param meta - The meta of the ItemStack to create + * @param number - The amount of Will to create the Stack with. + * @return - An ItemStack with the set amount of Will + */ + ItemStack createWill(double number); + + EnumDemonWillType getType(ItemStack stack); +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/will/IDemonWillConduit.java b/src/main/java/wayoftime/bloodmagic/will/IDemonWillConduit.java new file mode 100644 index 00000000..61fa7138 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/IDemonWillConduit.java @@ -0,0 +1,19 @@ +package wayoftime.bloodmagic.will; + +/** + * Implement this interface on a block that can accept and store Demonic Will. + */ +public interface IDemonWillConduit +{ + int getWeight(); + + double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill); + + double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain); + + boolean canFill(EnumDemonWillType type); + + boolean canDrain(EnumDemonWillType type); + + double getCurrentWill(EnumDemonWillType type); +} diff --git a/src/main/java/wayoftime/bloodmagic/will/IDemonWillGem.java b/src/main/java/wayoftime/bloodmagic/will/IDemonWillGem.java new file mode 100644 index 00000000..e1f9a799 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/IDemonWillGem.java @@ -0,0 +1,29 @@ +package wayoftime.bloodmagic.will; + +import net.minecraft.item.ItemStack; + +public interface IDemonWillGem +{ + /** + * @param willGemStack - The ItemStack for this demon will gem. + * @param willStack - The ItemStack for the will. Item should extend + * IDemonWill + * @return - The remainder willStack after the will has been absorbed into the + * gem. Return null if there is no will left in the stack. + */ + ItemStack fillDemonWillGem(ItemStack willGemStack, ItemStack willStack); + + /** + * Returns the number of souls that are left in the soul gem. Returns a double + * because souls can be fractionally drained. + */ + double getWill(EnumDemonWillType type, ItemStack willGemStack); + + void setWill(EnumDemonWillType type, ItemStack willGemStack, double amount); + + int getMaxWill(EnumDemonWillType type, ItemStack willGemStack); + + double drainWill(EnumDemonWillType type, ItemStack stack, double drainAmount, boolean doDrain); + + double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill); +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/will/IDemonWillWeapon.java b/src/main/java/wayoftime/bloodmagic/will/IDemonWillWeapon.java new file mode 100644 index 00000000..e74f7ac5 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/IDemonWillWeapon.java @@ -0,0 +1,11 @@ +package wayoftime.bloodmagic.will; + +import java.util.List; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; + +public interface IDemonWillWeapon +{ + List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting); +} diff --git a/src/main/java/wayoftime/bloodmagic/will/IDiscreteDemonWill.java b/src/main/java/wayoftime/bloodmagic/will/IDiscreteDemonWill.java new file mode 100644 index 00000000..9388ce13 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/IDiscreteDemonWill.java @@ -0,0 +1,41 @@ +package wayoftime.bloodmagic.will; + +import net.minecraft.item.ItemStack; + +public interface IDiscreteDemonWill +{ + /** + * Obtains the amount of Will an ItemStack contains. + * + * @param soulStack - The stack to retrieve the Will from + * @return - The amount of Will an ItemStack contains + */ + double getWill(ItemStack soulStack); + + /** + * Drains the demonic will from the willStack. If all of the will is drained, + * the willStack will be removed. Will only drain in discrete amounts, + * determined by getDiscretization. + * + * @param willStack - The ItemStack of the will + * @param drainAmount - The amount of Will to drain + * @return The amount of will drained. + */ + double drainWill(ItemStack willStack, double drainAmount); + + /** + * Gets the discrete number for this demonic will. + * + * @param willStack - The ItemStack of the will + * @return - The discrete number for the given stack. + */ + double getDiscretization(ItemStack willStack); + + /** + * Obtains the type of will this is. + * + * @param willStack - The ItemStack of the will + * @return - The type of will this is. + */ + EnumDemonWillType getType(ItemStack willStack); +} diff --git a/src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java b/src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java new file mode 100644 index 00000000..1576c5e2 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java @@ -0,0 +1,200 @@ +package wayoftime.bloodmagic.will; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import wayoftime.bloodmagic.util.helper.NetworkHelper; + +/** + * This class provides several helper methods in order to handle soul + * consumption and use for a player. This refers to the Soul System, meaning + * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found + * in {@link NetworkHelper} + */ +public class PlayerDemonWillHandler +{ + /** + * Gets the total amount of Will a player contains in their inventory + * + * @param type - The type of Will to check for + * @param player - The player to check the will of + * @return - The amount of will the player contains + */ + public static double getTotalDemonWill(EnumDemonWillType type, PlayerEntity player) + { + NonNullList inventory = player.inventory.mainInventory; + double souls = 0; + + for (ItemStack stack : inventory) + { + if (stack.getItem() instanceof IDemonWill && ((IDemonWill) stack.getItem()).getType(stack) == type) + { + souls += ((IDemonWill) stack.getItem()).getWill(type, stack); + } else if (stack.getItem() instanceof IDemonWillGem) + { + souls += ((IDemonWillGem) stack.getItem()).getWill(type, stack); + } + } + + return souls; + } + + public static EnumDemonWillType getLargestWillType(PlayerEntity player) + { + EnumDemonWillType type = EnumDemonWillType.DEFAULT; + double max = getTotalDemonWill(type, player); + + for (EnumDemonWillType testType : EnumDemonWillType.values()) + { + double value = getTotalDemonWill(testType, player); + if (value > max) + { + type = testType; + } + } + + return type; + } + + /** + * Checks if the player's Tartaric gems are completely full. + * + * @param type - The type of Will to check for + * @param player - The player to check the Will of + * @return - True if all Will containers are full, false if not. + */ + public static boolean isDemonWillFull(EnumDemonWillType type, PlayerEntity player) + { + NonNullList inventory = player.inventory.mainInventory; + + boolean hasGem = false; + for (ItemStack stack : inventory) + { + if (stack.getItem() instanceof IDemonWillGem) + { + hasGem = true; + if (((IDemonWillGem) stack.getItem()).getWill(type, stack) < ((IDemonWillGem) stack.getItem()).getMaxWill(type, stack)) + return false; + } + } + + return hasGem; + } + + /** + * Consumes Will from the inventory of a given player + * + * @param player - The player to consume the will of + * @param amount - The amount of will to consume + * @return - The amount of will consumed. + */ + public static double consumeDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) + { + double consumed = 0; + + NonNullList inventory = player.inventory.mainInventory; + + for (int i = 0; i < inventory.size(); i++) + { + if (consumed >= amount) + return consumed; + + ItemStack stack = inventory.get(i); + if (stack.getItem() instanceof IDemonWill && ((IDemonWill) stack.getItem()).getType(stack) == type) + { + consumed += ((IDemonWill) stack.getItem()).drainWill(type, stack, amount - consumed); + if (((IDemonWill) stack.getItem()).getWill(type, stack) <= 0) + inventory.set(i, ItemStack.EMPTY); + } else if (stack.getItem() instanceof IDemonWillGem) + { + consumed += ((IDemonWillGem) stack.getItem()).drainWill(type, stack, amount - consumed, true); + } + } + + return consumed; + } + + /** + * Adds an IDemonWill contained in an ItemStack to one of the Soul Gems in the + * player's inventory. + * + * @param player - The player to add will to + * @param willStack - ItemStack that contains an IDemonWill to be added + * @return - The modified willStack + */ + public static ItemStack addDemonWill(PlayerEntity player, ItemStack willStack) + { + if (willStack.isEmpty()) + return ItemStack.EMPTY; + + NonNullList inventory = player.inventory.mainInventory; + + for (ItemStack stack : inventory) + { + if (stack.getItem() instanceof IDemonWillGem) + { + ItemStack newStack = ((IDemonWillGem) stack.getItem()).fillDemonWillGem(stack, willStack); + if (newStack.isEmpty()) + return ItemStack.EMPTY; + } + } + + return willStack; + } + + /** + * Adds an IDiscreteDemonWill contained in an ItemStack to one of the Soul Gems + * in the player's inventory. + * + * @param type - The type of Will to add + * @param player - The player to check the Will of + * @param amount - The amount of will to add + * @return - The amount of will added + */ + public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) + { + NonNullList inventory = player.inventory.mainInventory; + double remaining = amount; + + for (ItemStack stack : inventory) + { + if (stack.getItem() instanceof IDemonWillGem) + { + remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining, true); + if (remaining <= 0) + break; + } + } + + return amount - remaining; + } + + /** + * Adds an IDiscreteDemonWill contained in an ItemStack to one of the Soul Gems + * in the player's inventory while ignoring a specified stack. + * + * @param type - The type of Will to add + * @param player - The player to check the Will of + * @param amount - The amount of will to add + * @param ignored - A stack to ignore + * @return - The amount of will added + */ + public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount, ItemStack ignored) + { + NonNullList inventory = player.inventory.mainInventory; + double remaining = amount; + + for (ItemStack stack : inventory) + { + if (!stack.equals(ignored) && stack.getItem() instanceof IDemonWillGem) + { + remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining, true); + + if (remaining <= 0) + break; + } + } + + return amount - remaining; + } +} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 00000000..fab0e4b1 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,59 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="[34,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="All rights reserved" +# A URL to refer people to when problems occur with this mod +issueTrackerURL="http://my.issue.tracker/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="bloodmagic" #mandatory +# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it +version="${file.jarVersion}" #mandatory + # A display name for the mod +displayName="Blood Magic" #mandatory +# A URL to query for updates for this mod. See the JSON update specification +updateJSONURL="http://myurl.me/" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +displayURL="http://example.com/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +credits="Thanks for this example mod goes to Java" #optional +# A text field displayed in the mod UI +authors="WayofTime" #optional +# The description text for the mod (multi line!) (#mandatory) +description=''' +This is a long form description of the mod. You can write whatever you want here + +Have some lorem ipsum. + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. +''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.examplemod]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="[34,)" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory + ordering="NONE" + # Side this dependency is applied on - BOTH, CLIENT or SERVER + side="BOTH" +# Here's another dependency +[[dependencies.examplemod]] + modId="minecraft" + mandatory=true + versionRange="[1.16.3]" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/assets/bloodmagic/armatures/block/pillar_mid.json b/src/main/resources/assets/bloodmagic/armatures/block/pillar_mid.json deleted file mode 100644 index 16d07d04..00000000 --- a/src/main/resources/assets/bloodmagic/armatures/block/pillar_mid.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "joints": { - "ring": { "0": [ 1.0 ], "1": [ 1.0 ], "2": [ 1.0 ], "3": [ 1.0 ], "4": [ 1.0 ], "5": [ 1.0 ], "6": [ 1.0 ], "7": [ 1.0 ], "8": [ 1.0 ], "9": [ 1.0 ], "10": [ 1.0 ], "11": [ 1.0 ], "12": [ 1.0 ], "13": [ 1.0 ], "14": [ 1.0 ], "15": [ 1.0 ], "16": [ 1.0 ], "17": [ 1.0 ], "18": [ 1.0 ], "19": [ 1.0 ], "20": [ 1.0 ], "21": [ 1.0 ], "22": [ 1.0 ] } - }, - "clips": { - "default": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "moving": { - "loop": true, - "joint_clips": { - "ring": [ - { - "variable": "offset_y", - "type": "uniform", - "interpolation": "linear", - "samples": [ -0.0625, -0.0442, 0, 0.0442, 0.0625, 0.0442, 0, -0.0442 ] - }, - { - "variable": "axis_y", - "type": "uniform", - "interpolation": "nearest", - "samples": [ 1 ] - }, - { - "variable": "angle", - "type": "uniform", - "interpolation": "linear", - "samples": [ - 0, 120, 240 - ] - } - ] - }, - "events": { - - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/asms/block/inversion_pillar.json b/src/main/resources/assets/bloodmagic/asms/block/inversion_pillar.json deleted file mode 100644 index 2ebde5e6..00000000 --- a/src/main/resources/assets/bloodmagic/asms/block/inversion_pillar.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parameters": { - "clip_time": [ "-/", "#offset", "#cycle_length" ] - }, - "clips": { - "moving": [ "apply", "bloodmagic:block/pillar_mid@moving", "#clip_time" ] - }, - "states": [ - "moving" - ], - "transitions": {}, - "start_state": "moving" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json b/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json deleted file mode 100644 index b5535ec3..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "weak": { - "textures": { - "layer0": "bloodmagic:items/activationCrystalWeak" - } - }, - "awakened": { - "textures": { - "layer0": "bloodmagic:items/activationCrystalAwakened" - } - }, - "creative": { - "textures": { - "layer0": "bloodmagic:items/activationCrystalCreative" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json b/src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json deleted file mode 100644 index 74f8af30..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/alchemic_vial.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/Alchemic_Liquid", - "layer1": "bloodmagic:items/Alchemic_Vial", - "layer2": "bloodmagic:items/Alchemic_Ribbon" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json b/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json index 03ba5c90..38eed1f0 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json +++ b/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json @@ -1,10 +1,7 @@ { "variants": { - "normal": { - "model": "bloodmagic:BlockAlchemyArray", - "textures": { - "all": "bloodmagic:models/AlchemyArrays/StupidArray" - } + "": { + "model": "bloodmagic:block/blockalchemyarray" } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/alchemy_table.json b/src/main/resources/assets/bloodmagic/blockstates/alchemy_table.json deleted file mode 100644 index d1d44534..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/alchemy_table.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:ModelAlchemyTable.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block", - "uvlock": true - }, - "variants": { - "direction": { - "down": { - }, - "up": { - }, - "north": { - "transform": { - "rotation": {"y": -90} - } - }, - "south": { - "transform": { - "rotation": {"y": 90} - } - }, - "east": { - "transform": { - "rotation": {"y": 180} - } - }, - "west": { - - } - }, - "invisible": { - "true": { - "model": "cube_all", - "textures": { - "all": "bloodmagic:blocks/empty" - } - }, - "false": { - - } - }, - "inventory": [{ - - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/altar.json b/src/main/resources/assets/bloodmagic/blockstates/altar.json index 7fa4988e..256d4acd 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/altar.json +++ b/src/main/resources/assets/bloodmagic/blockstates/altar.json @@ -1,22 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:BlockAltar.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, "variants": { - "normal": [{ - } - ], - "powered=true": [ - { - } - ], - "powered=false": [ - { - - }] + "": { + "model": "bloodmagic:block/bloodaltar" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/altar_maker.json b/src/main/resources/assets/bloodmagic/blockstates/altar_maker.json deleted file mode 100644 index d9853286..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/altar_maker.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "altarmaker": { - "textures": { - "layer0": "bloodmagic:items/AltarMaker" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/arcane_ashes.json b/src/main/resources/assets/bloodmagic/blockstates/arcane_ashes.json deleted file mode 100644 index df9edd3c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/arcane_ashes.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "arcaneashes": { - "textures": { - "layer0": "bloodmagic:items/ArcaneAshes" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/base_fluid_filter.json b/src/main/resources/assets/bloodmagic/blockstates/base_fluid_filter.json deleted file mode 100644 index 430e8f47..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/base_fluid_filter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "exact": { - "textures": { - "layer0": "bloodmagic:items/FluidRouterFilterExact" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/base_item_filter.json b/src/main/resources/assets/bloodmagic/blockstates/base_item_filter.json deleted file mode 100644 index afe3e19d..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/base_item_filter.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "exact": { - "textures": { - "layer0": "bloodmagic:items/ItemRouterFilterExact" - } - }, - "ignorenbt": { - "textures": { - "layer0": "bloodmagic:items/ItemRouterFilterIgnoreNBT" - } - }, - "moditems": { - "textures": { - "layer0": "bloodmagic:items/ItemRouterFilterModItems" - } - }, - "oredict": { - "textures": { - "layer0": "bloodmagic:items/ItemRouterFilterOreDict" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_light.json b/src/main/resources/assets/bloodmagic/blockstates/blood_light.json deleted file mode 100644 index c67139da..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/blood_light.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "normal": { - "model": "bloodmagic:BlockBloodLight", - "textures": { - "all": "bloodmagic:blocks/BlockBloodLight" - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_orb.json b/src/main/resources/assets/bloodmagic/blockstates/blood_orb.json deleted file mode 100644 index a5c42df5..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/blood_orb.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "weak": { - "textures": { - "layer0": "bloodmagic:items/weakbloodorb" - } - }, - "apprentice": { - "textures": { - "layer0": "bloodmagic:items/apprenticebloodorb" - } - }, - "magician": { - "textures": { - "layer0": "bloodmagic:items/magicianbloodorb" - } - }, - "master": { - "textures": { - "layer0": "bloodmagic:items/masterbloodorb" - } - }, - "archmage": { - "textures": { - "layer0": "bloodmagic:items/archmagebloodorb" - } - }, - "transcendent": { - "textures": { - "layer0": "bloodmagic:items/transcendentbloodorb" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json deleted file mode 100644 index 80973833..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "blank": { - "textures": { - "all": "bloodmagic:blocks/BlankRune" - } - }, - "speed": { - "textures": { - "all": "bloodmagic:blocks/SpeedRune" - } - }, - "efficiency": { - "textures": { - "all": "bloodmagic:blocks/EfficiencyRune" - } - }, - "sacrifice": { - "textures": { - "all": "bloodmagic:blocks/RuneOfSacrifice" - } - }, - "self_sacrifice": { - "textures": { - "all": "bloodmagic:blocks/RuneOfSelfSacrifice" - } - }, - "displacement": { - "textures": { - "all": "bloodmagic:blocks/DislocationRune" - } - }, - "capacity": { - "textures": { - "all": "bloodmagic:blocks/AltarCapacityRune" - } - }, - "augmented_capacity": { - "textures": { - "all": "bloodmagic:blocks/BetterCapacityRune" - } - }, - "orb": { - "textures": { - "all": "bloodmagic:blocks/OrbCapacityRune" - } - }, - "acceleration": { - "textures": { - "all": "bloodmagic:blocks/AccelerationRune" - } - }, - "charging": { - "textures": { - "all": "bloodmagic:blocks/ChargingRune" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_shard.json b/src/main/resources/assets/bloodmagic/blockstates/blood_shard.json deleted file mode 100644 index 4cf72004..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/blood_shard.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "weak": { - "textures": { - "layer0": "bloodmagic:items/WeakBloodShard" - } - }, - "demonic": { - "textures": { - "layer0": "bloodmagic:items/DemonBloodShard" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_tank.json b/src/main/resources/assets/bloodmagic/blockstates/blood_tank.json deleted file mode 100644 index d71d03f6..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/blood_tank.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { "all": "bloodmagic:blocks/BloodTank" }, - "model": "bloodmagic:BlockBloodTank", - "uvlock": true - }, - "variants": { - "tier": { - "0": {}, - "1": {}, - "2": {}, - "3": {}, - "4": {}, - "5": {}, - "6": {}, - "7": {}, - "8": {}, - "9": {}, - "10": {}, - "11": {}, - "12": {}, - "13": {}, - "14": {}, - "15": {} - }, - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/bound_axe.json b/src/main/resources/assets/bloodmagic/blockstates/bound_axe.json deleted file mode 100644 index dc27b28a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/bound_axe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "active": { - "true": { - "textures": { - "layer0": "bloodmagic:items/BoundAxe_activated" - } - }, - "false": { - "textures": { - "layer0": "bloodmagic:items/Item_deactivated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/bound_pickaxe.json b/src/main/resources/assets/bloodmagic/blockstates/bound_pickaxe.json deleted file mode 100644 index 6acaacca..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/bound_pickaxe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "active": { - "true": { - "textures": { - "layer0": "bloodmagic:items/BoundPickaxe_activated" - } - }, - "false": { - "textures": { - "layer0": "bloodmagic:items/Item_deactivated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/bound_shovel.json b/src/main/resources/assets/bloodmagic/blockstates/bound_shovel.json deleted file mode 100644 index adba2311..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/bound_shovel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "active": { - "true": { - "textures": { - "layer0": "bloodmagic:items/BoundShovel_activated" - } - }, - "false": { - "textures": { - "layer0": "bloodmagic:items/Item_deactivated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/bound_sword.json b/src/main/resources/assets/bloodmagic/blockstates/bound_sword.json deleted file mode 100644 index ae592f33..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/bound_sword.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "active": { - "true": { - "textures": { - "layer0": "bloodmagic:items/BoundSword_activated" - } - }, - "false": { - "textures": { - "layer0": "bloodmagic:items/Item_deactivated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/component.json b/src/main/resources/assets/bloodmagic/blockstates/component.json deleted file mode 100644 index 898f699e..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/component.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "frame_part": { - "textures": { - "layer0": "bloodmagic:items/ComponentFrameParts" - } - }, - "sand_iron": { - "textures": { - "layer0": "bloodmagic:items/IronSand" - } - }, - "sand_gold": { - "textures": { - "layer0": "bloodmagic:items/GoldSand" - } - }, - "sand_coal": { - "textures": { - "layer0": "bloodmagic:items/CoalSand" - } - }, - "plant_oil": { - "textures": { - "layer0": "bloodmagic:items/PlantOil" - } - }, - "sulfur": { - "textures": { - "layer0": "bloodmagic:items/Sulfur" - } - }, - "saltpeter": { - "textures": { - "layer0": "bloodmagic:items/Saltpeter" - } - }, - "neuro_toxin": { - "textures": { - "layer0": "bloodmagic:items/NeuroToxin" - } - }, - "antiseptic": { - "textures": { - "layer0": "bloodmagic:items/Antiseptic" - } - }, - "catalyst_length_1": { - "textures": { - "layer0": "bloodmagic:items/MundaneLengtheningCatalyst" - } - }, - "catalyst_power_1": { - "textures": { - "layer0": "bloodmagic:items/MundanePowerCatalyst" - } - }, - "reagent_water": { - "textures": { - "layer0": "bloodmagic:items/ReagentWater" - } - }, - "reagent_lava": { - "textures": { - "layer0": "bloodmagic:items/ReagentLava" - } - }, - "reagent_air": { - "textures": { - "layer0": "bloodmagic:items/ReagentAir" - } - }, - "reagent_fast_miner": { - "textures": { - "layer0": "bloodmagic:items/ReagentFastMiner" - } - }, - "reagent_void": { - "textures": { - "layer0": "bloodmagic:items/ReagentVoid" - } - }, - "reagent_growth": { - "textures": { - "layer0": "bloodmagic:items/ReagentGrowth" - } - }, - "reagent_affinity": { - "textures": { - "layer0": "bloodmagic:items/ReagentAffinity" - } - }, - "reagent_sight": { - "textures": { - "layer0": "bloodmagic:items/ReagentSight" - } - }, - "reagent_binding": { - "textures": { - "layer0": "bloodmagic:items/ReagentBinding" - } - }, - "reagent_suppression": { - "textures": { - "layer0": "bloodmagic:items/ReagentSuppression" - } - }, - "reagent_blood_light": { - "textures": { - "layer0": "bloodmagic:items/ReagentBloodLight" - } - }, - "reagent_magnetism": { - "textures": { - "layer0": "bloodmagic:items/ReagentMagnetism" - } - }, - "reagent_haste": { - "textures": { - "layer0": "bloodmagic:items/ReagentHaste" - } - }, - "reagent_compression": { - "textures": { - "layer0": "bloodmagic:items/ReagentCompression" - } - }, - "reagent_bridge": { - "textures": { - "layer0": "bloodmagic:items/ReagentBridge" - } - }, - "reagent_severance": { - "textures": { - "layer0": "bloodmagic:items/ReagentSeverance" - } - }, - "reagent_teleposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTeleposition" - } - }, - "reagent_transposition": { - "textures": { - "layer0": "bloodmagic:items/ReagentTransposition" - } - }, - "reagent_holding": { - "textures": { - "layer0": "bloodmagic:items/ReagentHolding" - } - }, - "reagent_claw": { - "textures": { - "layer0": "bloodmagic:items/ReagentClaw" - } - }, - "reagent_bounce": { - "textures": { - "layer0": "bloodmagic:items/ReagentBounce" - } - }, - "reagent_frost": { - "textures": { - "layer0": "bloodmagic:items/ReagentFrost" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json b/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json deleted file mode 100644 index 0d733140..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "basic": { - "textures": { - "layer0": "bloodmagic:items/BasicCuttingFluid" - } - }, - "explosive": { - "textures": { - "layer0": "bloodmagic:items/ExplosivePowder" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/dagger_of_sacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/dagger_of_sacrifice.json deleted file mode 100644 index 5cae9434..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/dagger_of_sacrifice.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/DaggerOfSacrifice" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json b/src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json deleted file mode 100644 index 00970ac6..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "bloodstone_tile": { - "textures": { - "all": "bloodmagic:blocks/LargeBloodStoneBrick" - } - }, - "bloodstone_brick": { - "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" - } - }, - "crystal_tile": { - "textures": { - "all": "bloodmagic:blocks/shardcluster" - } - }, - "crystal_brick": { - "textures": { - "all": "bloodmagic:blocks/shardclusterbrick" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_1.json deleted file mode 100644 index bff693ef..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_1.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type=brick1_raw": [ - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3"}} - ], - "type=brick1_corrosive": [ - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_c"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_c"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_c"}} - ], - "type=brick1_destructive": [ - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_d"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_d"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_d"}} - ], - "type=brick1_vengeful": [ - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_v"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_v"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_v"}} - ], - "type=brick1_steadfast": [ - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_s"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_s"}}, - {"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_s"}} - ] - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_2.json deleted file mode 100644 index deef552c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_2.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "smallbrick_raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick" - } - }, - "smallbrick_corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_c" - } - }, - "smallbrick_destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_d" - } - }, - "smallbrick_vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_v" - } - }, - "smallbrick_steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_s" - } - }, - "tile_raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tile" - } - }, - "tile_corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tile_c" - } - }, - "tile_destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tile_d" - } - }, - "tile_vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tile_v" - } - }, - "tile_steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tile_s" - } - }, - "tilespecial_raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial" - } - }, - "tilespecial_corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_c" - } - }, - "tilespecial_destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_d" - } - }, - "tilespecial_vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_v" - } - }, - "tilespecial_steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_s" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_crucible.json b/src/main/resources/assets/bloodmagic/blockstates/demon_crucible.json deleted file mode 100644 index 6a1615be..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_crucible.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:BlockDemonCrucible.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, - "variants": { - "normal": [{ - - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_crystal.json b/src/main/resources/assets/bloodmagic/blockstates/demon_crystal.json deleted file mode 100644 index 792e272f..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_crystal.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { "#crystal" : "bloodmagic:models/DefaultCrystal" }, - "model": "bloodmagic:crystal/Crystal1.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, - "variants": { - "attached": { - "down": { - "transform": { - "rotation": {"x": 180} - } - }, - "up": { - }, - "north": { - "transform": { - "rotation": {"x": -90} - } - }, - "south": { - "transform": { - "rotation": {"x": 90} - } - }, - "east": { - "transform": { - "rotation": {"z": -90} - } - }, - "west": { - "transform": { - "rotation": {"z": 90} - } - } - }, - "type": { - "default": { - "textures": { - "#crystal" : "bloodmagic:models/DefaultCrystal" - } - }, - "corrosive": { - "textures": { - "#crystal" : "bloodmagic:models/CorrosiveCrystal" - } - }, - "destructive": { - "textures": { - "#crystal" : "bloodmagic:models/DestructiveCrystal" - } - }, - "vengeful": { - "textures": { - "#crystal" : "bloodmagic:models/VengefulCrystal" - } - }, - "steadfast": { - "textures": { - "#crystal" : "bloodmagic:models/SteadfastCrystal" - } - } - }, - "age": { - "0": { - - }, - "1": { - "submodel": "bloodmagic:crystal/Crystal2.obj" - }, - "2": { - "submodel": { - "crystal2": {"model": "bloodmagic:crystal/Crystal2.obj"}, - "crystal3": {"model": "bloodmagic:crystal/Crystal3.obj"} - } - }, - "3": { - "submodel": { - "crystal2": {"model": "bloodmagic:crystal/Crystal2.obj"}, - "crystal3": {"model": "bloodmagic:crystal/Crystal3.obj"}, - "crystal4": {"model": "bloodmagic:crystal/Crystal4.obj"} - } - }, - "4": { - "submodel": { - "crystal2": {"model": "bloodmagic:crystal/Crystal2.obj"}, - "crystal3": {"model": "bloodmagic:crystal/Crystal3.obj"}, - "crystal4": {"model": "bloodmagic:crystal/Crystal4.obj"}, - "crystal5": {"model": "bloodmagic:crystal/Crystal5.obj"} - } - }, - "5": { - "submodel": { - "crystal2": {"model": "bloodmagic:crystal/Crystal2.obj"}, - "crystal3": {"model": "bloodmagic:crystal/Crystal3.obj"}, - "crystal4": {"model": "bloodmagic:crystal/Crystal4.obj"}, - "crystal5": {"model": "bloodmagic:crystal/Crystal5.obj"}, - "crystal6": {"model": "bloodmagic:crystal/Crystal6.obj"} - } - }, - "6": { - "submodel": { - "crystal2": {"model": "bloodmagic:crystal/Crystal2.obj"}, - "crystal3": {"model": "bloodmagic:crystal/Crystal3.obj"}, - "crystal4": {"model": "bloodmagic:crystal/Crystal4.obj"}, - "crystal5": {"model": "bloodmagic:crystal/Crystal5.obj"}, - "crystal6": {"model": "bloodmagic:crystal/Crystal6.obj"}, - "crystal7": {"model": "bloodmagic:crystal/Crystal7.obj"} - } - } - }, - "inventory": [{ - "variants": { - "type": { - "default": { - "textures": { - "#crystal" : "bloodmagic:models/DefaultCrystal" - } - }, - "corrosive": { - "textures": { - "#crystal" : "bloodmagic:models/CorrosiveCrystal" - } - }, - "destructive": { - "textures": { - "#crystal" : "bloodmagic:models/DestructiveCrystal" - } - }, - "vengeful": { - "textures": { - "#crystal" : "bloodmagic:models/VengefulCrystal" - } - }, - "steadfast": { - "textures": { - "#crystal" : "bloodmagic:models/SteadfastCrystal" - } - } - } - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_crystallizer.json b/src/main/resources/assets/bloodmagic/blockstates/demon_crystallizer.json deleted file mode 100644 index ef8d9802..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_crystallizer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:BlockDemonCrystallizer.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, - "variants": { - "normal": [{ - - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_extras.json b/src/main/resources/assets/bloodmagic/blockstates/demon_extras.json deleted file mode 100644 index 4854590c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_extras.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "stone_raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_stone" - } - }, - "stone_corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_stone_c" - } - }, - "stone_destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_stone_d" - } - }, - "stone_vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_stone_v" - } - }, - "stone_steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_stone_s" - } - }, - "polished_raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_polished" - } - }, - "polished_corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_polished_c" - } - }, - "polished_destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_polished_d" - } - }, - "polished_vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_polished_v" - } - }, - "polished_steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_polished_s" - } - }, - "metal_raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_metal" - } - }, - "metal_corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_metal_c" - } - }, - "metal_destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_metal_d" - } - }, - "metal_vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_metal_v" - } - }, - "metal_steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_metal_s" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_light.json b/src/main/resources/assets/bloodmagic/blockstates/demon_light.json deleted file mode 100644 index 171bdd39..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_light.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "raw": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_eye" - } - }, - "corrosive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_eye_c" - } - }, - "destructive": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_eye_d" - } - }, - "vengeful": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_eye_v" - } - }, - "steadfast": { - "textures": { - "all": "bloodmagic:blocks/dungeon/dungeon_eye_s" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_1.json deleted file mode 100644 index c32dd8ac..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_1.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube", - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart", - "side": "bloodmagic:blocks/dungeon/dungeon_pillar", - "particle": "#end" - } - }, - "variants": { - "axis": { - "x": { - "model": "bloodmagic:BlockPillarX" - }, - "y": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end" - } - }, - "z": { - "model": "bloodmagic:BlockPillarZ" - } - }, - "type": { - "raw": { - - }, - "corrosive": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", - "side": "bloodmagic:blocks/dungeon/dungeon_pillar_c" - } - }, - "destructive": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d", - "side": "bloodmagic:blocks/dungeon/dungeon_pillar_d" - } - }, - "vengeful": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v", - "side": "bloodmagic:blocks/dungeon/dungeon_pillar_v" - } - }, - "steadfast": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s", - "side": "bloodmagic:blocks/dungeon/dungeon_pillar_s" - } - } - }, - "inventory": [{ }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_2.json deleted file mode 100644 index 9285da20..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_2.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube", - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart", - "side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial", - "particle": "#end" - } - }, - "variants": { - "axis": { - "x": { - "model": "bloodmagic:BlockPillarX" - }, - "y": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end" - } - }, - "z": { - "model": "bloodmagic:BlockPillarZ" - } - }, - "type": { - "raw": { - - }, - "corrosive": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", - "side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_c" - } - }, - "destructive": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d", - "side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_d" - } - }, - "vengeful": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v", - "side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_v" - } - }, - "steadfast": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s", - "side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_s" - } - } - }, - "inventory": [{ }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_1.json deleted file mode 100644 index 01b3ebae..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_1.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube", - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart", - "sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom", - "sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop", - "particle": "#end" - } - }, - "variants": { - "facing": { - "down": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end", - "side": "#sideBottom" - } - }, - "up": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end", - "side": "#sideTop" - } - }, - "north": { - "model": "bloodmagic:BlockPillarCapNorth" - }, - "south": { - "model": "bloodmagic:BlockPillarCapSouth" - }, - "west": { - "model": "bloodmagic:BlockPillarCapWest" - }, - "east": { - "model": "bloodmagic:BlockPillarCapEast" - } - }, - "type": { - "raw": { - - }, - "corrosive": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", - "sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_c", - "sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_c" - } - } - }, - "inventory": [{ }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_2.json deleted file mode 100644 index 68d4de9a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_2.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube", - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d", - "sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_d", - "sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_d", - "particle": "#end" - } - }, - "variants": { - "facing": { - "down": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end", - "side": "#sideBottom" - } - }, - "up": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end", - "side": "#sideTop" - } - }, - "north": { - "model": "bloodmagic:BlockPillarCapNorth" - }, - "south": { - "model": "bloodmagic:BlockPillarCapSouth" - }, - "west": { - "model": "bloodmagic:BlockPillarCapWest" - }, - "east": { - "model": "bloodmagic:BlockPillarCapEast" - } - }, - "type": { - "destructive": { - - }, - "vengeful": { - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v", - "sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_v", - "sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_v" - } - } - }, - "inventory": [{ }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_3.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_3.json deleted file mode 100644 index e373b095..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_3.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube", - "textures": { - "end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s", - "sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_s", - "sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_s", - "particle": "#end" - } - }, - "variants": { - "facing": { - "down": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end", - "side": "#sideBottom" - } - }, - "up": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "#end", - "bottom": "#end", - "side": "#sideTop" - } - }, - "north": { - "model": "bloodmagic:BlockPillarCapNorth" - }, - "south": { - "model": "bloodmagic:BlockPillarCapSouth" - }, - "west": { - "model": "bloodmagic:BlockPillarCapWest" - }, - "east": { - "model": "bloodmagic:BlockPillarCapEast" - } - }, - "type": { - "steadfast": { - - } - }, - "inventory": [{ }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_pylon.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pylon.json deleted file mode 100644 index 4a2b009e..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_pylon.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:BlockDemonPylon.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, - "variants": { - "normal": [{ - - }] - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_1.json deleted file mode 100644 index 8bb70c0c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_1.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "texture1": "bloodmagic:blocks/dungeon/dungeon_pillarheart", - "texture2": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", - "all": "#texture1", - "bottom": "#all", - "top": "#all", - "side": "#all", - "particle": "#all" - }, - "model": "minecraft:stairs", - "transform" : "forge:default-block" - }, - "variants": { - "facing=east,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight,type=raw": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight,type=raw": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left,type=raw": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left,type=raw": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - - "facing=east,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=straight,type=corrosive": { "model": "minecraft:stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=straight,type=corrosive": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=outer_right,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=outer_left,type=corrosive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=inner_right,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=inner_left,type=corrosive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_2.json deleted file mode 100644 index e3376cc8..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_2.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "texture1": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d", - "texture2": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v", - "all": "#texture1", - "bottom": "#all", - "top": "#all", - "side": "#all", - "particle": "#all" - }, - "model": "minecraft:stairs", - "transform" : "forge:default-block" - }, - "variants": { - "facing=east,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight,type=destructive": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight,type=destructive": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left,type=destructive": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left,type=destructive": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - - "facing=east,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=straight,type=vengeful": { "model": "minecraft:stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "textures": {"all": "#texture2"} }, - "facing=north,half=bottom,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=straight,type=vengeful": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=outer_right,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=outer_left,type=vengeful": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=inner_right,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=east,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=west,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=south,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true, "textures": {"all": "#texture2"} }, - "facing=north,half=top,shape=inner_left,type=vengeful": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true, "textures": {"all": "#texture2"} }, - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_3.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_3.json deleted file mode 100644 index 51640cbd..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_3.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "texture1": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s", - "texture2": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c", - "all": "#texture1", - "bottom": "#all", - "top": "#all", - "side": "#all", - "particle": "#all" - }, - "model": "minecraft:stairs", - "transform" : "forge:default-block" - }, - "variants": { - "facing=east,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight,type=steadfast": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight,type=steadfast": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left,type=steadfast": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left,type=steadfast": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_wall_1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_wall_1.json deleted file mode 100644 index b7782a56..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_wall_1.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart", - "particle": "#wall" - }, - "model": "bloodmagic:BlockBlank", - "transform" : "forge:default-block" - }, - "variants": { - "up": { - "true": {"submodel": "minecraft:wall_post"}, - "false": {} - }, - "north": { - "true": {"submodel": "minecraft:wall_side", "uvlock": true}, - "false": {} - }, - "south": { - "true": {"submodel": "minecraft:wall_side", "uvlock": true, "y": 180}, - "false": {} - }, - "east": { - "true": {"submodel": "minecraft:wall_side", "uvlock": true, "y": 90}, - "false": {} - }, - "west": { - "true": {"submodel": "minecraft:wall_side", "uvlock": true, "y": 270}, - "false": {} - }, - "type": { - "brick_raw": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_brick3" - } - }, - "brick_corrosive": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_c" - } - }, - "brick_destructive": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_d" - } - }, - "brick_vengeful": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_v" - } - }, - "brick_steadfast": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_brick3_s" - } - }, - "smallbrick_raw": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick" - } - }, - "smallbrick_corrosive": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_c" - } - }, - "smallbrick_destructive": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_d" - } - }, - "smallbrick_vengeful": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_v" - } - }, - "smallbrick_steadfast": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_smallbrick_s" - } - }, - "large_raw": { - - }, - "large_corrosive": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c" - } - }, - "large_destructive": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d" - } - }, - "large_vengeful": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v" - } - }, - "large_steadfast": { - "textures": { - "wall": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s" - } - } - }, - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_will_gauge.json b/src/main/resources/assets/bloodmagic/blockstates/demon_will_gauge.json deleted file mode 100644 index 33dc70e5..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demon_will_gauge.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "willgauge": { - "textures": { - "layer0": "bloodmagic:items/DemonWillGauge" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/dimensional_portal.json b/src/main/resources/assets/bloodmagic/blockstates/dimensional_portal.json deleted file mode 100644 index a1ec1631..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/dimensional_portal.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": {}, - "uvlock": true - }, - "variants": { - "meta": { - "0": {"model": "bloodmagic:BlockDimensionalPortalNS"}, - "1": {"model": "bloodmagic:BlockDimensionalPortalEW"}, - "2": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/experience_tome.json b/src/main/resources/assets/bloodmagic/blockstates/experience_tome.json deleted file mode 100644 index 0441a8e1..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/experience_tome.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "experiencetome": { - "textures": { - "layer0": "bloodmagic:items/ExperienceBook" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json b/src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json deleted file mode 100644 index 748b4003..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/icarus_scroll.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/icarusscroll_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/icarusscroll_activated" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/incense_altar.json b/src/main/resources/assets/bloodmagic/blockstates/incense_altar.json deleted file mode 100644 index f5c0414e..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/incense_altar.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:BlockIncenseAltar.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, - "variants": { - "normal": [{ - - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/input_routing_node.json b/src/main/resources/assets/bloodmagic/blockstates/input_routing_node.json deleted file mode 100644 index 01f96406..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/input_routing_node.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { "#node" : "bloodmagic:models/ModelInputRoutingNode" }, - "model": "bloodmagic:routing/ModelRoutingNodeCore.obj", - "transform" : "forge:default-block", - "custom": { "flip-v": true }, - "uvlock": true - }, - "variants": { - "north": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"x": 90} - } - }, - "false": {} - }, - "south": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"x": -90} - } - }, - "false": {} - }, - "east": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": 90} - } - }, - "false": {} - }, - "west": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -90} - } - }, - "false": {} - }, - "down": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj" - }, - "false": {} - }, - "up": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -180} - } - }, - "false": {} - }, - "inventory": [{ - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj" - }] - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json b/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json deleted file mode 100644 index 2a14cf73..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "blank": { }, - "water": { - "textures": { - "layer0": "bloodmagic:items/WaterScribeTool" - } - }, - "fire": { - "textures": { - "layer0": "bloodmagic:items/FireScribeTool" - } - }, - "earth": { - "textures": { - "layer0": "bloodmagic:items/EarthScribeTool" - } - }, - "air": { - "textures": { - "layer0": "bloodmagic:items/AirScribeTool" - } - }, - "dusk": { - "textures": { - "layer0": "bloodmagic:items/DuskScribeTool" - } - }, - "dawn": { - "textures": { - "layer0": "bloodmagic:items/DawnScribeTool" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar.json b/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar.json deleted file mode 100644 index fdf9e93d..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "texture": "bloodmagic:models/pillar_mid", - "particle": "#texture" - }, - "transform" : "forge:default-block", - "model": "bloodmagic:pillar_mid" - }, - "variants": { - "type": { - "raw": { - "textures": { - - } - }, - "corrosive": { - "textures": { - "texture": "bloodmagic:models/pillar_mid_c" - } - }, - "vengeful": { - "textures": { - "texture": "bloodmagic:models/pillar_mid_v" - } - }, - "destructive": { - "textures": { - "texture": "bloodmagic:models/pillar_mid_d" - } - }, - "steadfast": { - "textures": { - "texture": "bloodmagic:models/pillar_mid_s" - } - } - }, - "static": { - "true": { - "model": "builtin/generated" - }, - "false": { - "model": "bloodmagic:pillar_mid" - } - }, - "inventory": [{}] - } -} - - diff --git a/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar_end.json b/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar_end.json deleted file mode 100644 index 295c172a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar_end.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "texture": "bloodmagic:models/pillar_base", - "particle": "#texture" - }, - "transform" : "forge:default-block", - "model": "bloodmagic:pillar_bottom" - }, - "variants": { - "type": { - "raw_bottom": { - "textures": { - - } - }, - "raw_top": { - "textures": { - - }, - "model": "bloodmagic:pillar_top" - }, - "corrosive_bottom": { - "textures": { - "texture": "bloodmagic:models/pillar_base_c" - } - }, - "corrosive_top": { - "textures": { - "texture": "bloodmagic:models/pillar_base_c" - }, - "model": "bloodmagic:pillar_top" - }, - "destructive_bottom": { - "textures": { - "texture": "bloodmagic:models/pillar_base_d" - } - }, - "destructive_top": { - "textures": { - "texture": "bloodmagic:models/pillar_base_d" - }, - "model": "bloodmagic:pillar_top" - }, - "vengeful_bottom": { - "textures": { - "texture": "bloodmagic:models/pillar_base_v" - } - }, - "vengeful_top": { - "textures": { - "texture": "bloodmagic:models/pillar_base_v" - }, - "model": "bloodmagic:pillar_top" - }, - "steadfast_bottom": { - "textures": { - "texture": "bloodmagic:models/pillar_base_s" - } - }, - "steadfast_top": { - "textures": { - "texture": "bloodmagic:models/pillar_base_s" - }, - "model": "bloodmagic:pillar_top" - } - } - } -} - - diff --git a/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json b/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json deleted file mode 100644 index cfa5e17c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "default": { - "textures": { - "layer0": "bloodmagic:items/DefaultCrystal" - } - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/CorrosiveCrystal" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/VengefulCrystal" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/DestructiveCrystal" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/SteadfastCrystal" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/item_routing_node.json b/src/main/resources/assets/bloodmagic/blockstates/item_routing_node.json deleted file mode 100644 index 9342eeea..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/item_routing_node.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { "#node" : "bloodmagic:models/modelroutingnode" }, - "model": "bloodmagic:routing/ModelRoutingNodeCore.obj", - "transform" : "forge:default-block", - "custom": { "flip-v": true }, - "uvlock": true - }, - "variants": { - "north": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"x": 90} - } - }, - "false": {} - }, - "south": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"x": -90} - } - }, - "false": {} - }, - "east": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": 90} - } - }, - "false": {} - }, - "west": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -90} - } - }, - "false": {} - }, - "down": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj" - }, - "false": {} - }, - "up": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -180} - } - }, - "false": {} - }, - "inventory": [{ - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj" - }] - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/lava_crystal.json b/src/main/resources/assets/bloodmagic/blockstates/lava_crystal.json deleted file mode 100644 index 12890a4d..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/lava_crystal.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/LavaCrystal" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/life_essence.json b/src/main/resources/assets/bloodmagic/blockstates/life_essence.json deleted file mode 100644 index 8d673ba3..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/life_essence.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "lifeessence" } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/living_armour.json b/src/main/resources/assets/bloodmagic/blockstates/living_armour.json deleted file mode 100644 index a20acc7a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/living_armour.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "armour": { - "head": { - "textures": { - "layer0": "bloodmagic:items/LivingHelmet" - } - }, - "body": { - "textures": { - "layer0": "bloodmagic:items/LivingPlate" - } - }, - "leg": { - "textures": { - "layer0": "bloodmagic:items/LivingLeggings" - } - }, - "feet": { - "textures": { - "layer0": "bloodmagic:items/LivingBoots" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/master_routing_node.json b/src/main/resources/assets/bloodmagic/blockstates/master_routing_node.json deleted file mode 100644 index a10dc2f5..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/master_routing_node.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "bloodmagic:routing/ModelMasterRoutingNodeCore.obj", - "transform" : "forge:default-block", - "custom": { "flip-v": true }, - "uvlock": true - }, - "variants": { - "north": { - "true": { - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj", - "transform": { - "rotation": {"x": 90} - } - }, - "false": {} - }, - "south": { - "true": { - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj", - "transform": { - "rotation": {"x": -90} - } - }, - "false": {} - }, - "east": { - "true": { - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj", - "transform": { - "rotation": {"z": 90} - } - }, - "false": {} - }, - "west": { - "true": { - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -90} - } - }, - "false": {} - }, - "down": { - "true": { - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj" - }, - "false": {} - }, - "up": { - "true": { - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -180} - } - }, - "false": {} - }, - "inventory": [{ - "submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj" - }] - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/mimic.json b/src/main/resources/assets/bloodmagic/blockstates/mimic.json deleted file mode 100644 index ae9c2042..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/mimic.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "nohitbox": { - "textures": { - "all": "bloodmagic:blocks/EtherealOpaqueMimic" - } - }, - "solidopaque": { - "textures": { - "all": "bloodmagic:blocks/SolidOpaqueMimic" - } - }, - "solidclear": { - "textures": { - "all": "bloodmagic:blocks/SolidClearMimic" - } - }, - "solidlight": { - "textures": { - "all": "bloodmagic:blocks/SolidLightMimic" - } - }, - "sentient": { - "textures": { - "all": "bloodmagic:blocks/SentientMimic" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json b/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json deleted file mode 100644 index 3212e25c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "raw": { - "textures": { - "layer0": "bloodmagic:items/BaseMonsterSoul" - } - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/BaseMonsterSoul_corrosive" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/BaseMonsterSoul_destructive" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/BaseMonsterSoul_vengeful" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/BaseMonsterSoul_steadfast" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/node_router.json b/src/main/resources/assets/bloodmagic/blockstates/node_router.json deleted file mode 100644 index c9a0de99..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/node_router.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/NodeRouter" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/output_routing_node.json b/src/main/resources/assets/bloodmagic/blockstates/output_routing_node.json deleted file mode 100644 index 11d0d9cf..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/output_routing_node.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { "#node" : "bloodmagic:models/ModelOutputRoutingNode" }, - "model": "bloodmagic:routing/ModelRoutingNodeCore.obj", - "transform" : "forge:default-block", - "custom": { "flip-v": true }, - "uvlock": true - }, - "variants": { - "north": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"x": 90} - } - }, - "false": {} - }, - "south": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"x": -90} - } - }, - "false": {} - }, - "east": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": 90} - } - }, - "false": {} - }, - "west": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -90} - } - }, - "false": {} - }, - "down": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj" - }, - "false": {} - }, - "up": { - "true": { - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj", - "transform": { - "rotation": {"z": -180} - } - }, - "false": {} - }, - "inventory": [{ - "submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj" - }] - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/pack_sacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/pack_sacrifice.json deleted file mode 100644 index 024dc061..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/pack_sacrifice.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/BloodPack" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/pack_self_sacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/pack_self_sacrifice.json deleted file mode 100644 index 024dc061..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/pack_self_sacrifice.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/BloodPack" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/path.json b/src/main/resources/assets/bloodmagic/blockstates/path.json deleted file mode 100644 index 4ebe7070..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/path.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "wood": { - "textures": { - "all": "bloodmagic:blocks/WoodBrickPath" - } - }, - "woodtile": { - "textures": { - "all": "bloodmagic:blocks/WoodTilePath" - } - }, - "stone": { - "textures": { - "all": "bloodmagic:blocks/StoneBrickPath" - } - }, - "stonetile": { - "textures": { - "all": "bloodmagic:blocks/StoneTilePath" - } - }, - "wornstone": { - "textures": { - "all": "bloodmagic:blocks/WornStoneBrickPath" - } - }, - "wornstonetile": { - "textures": { - "all": "bloodmagic:blocks/WornStoneTilePath" - } - }, - "obsidian": { - "textures": { - "all": "bloodmagic:blocks/ObsidianBrickPath" - } - }, - "obsidiantile": { - "textures": { - "all": "bloodmagic:blocks/ObsidianTilePath" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/phantom.json b/src/main/resources/assets/bloodmagic/blockstates/phantom.json deleted file mode 100644 index 7f83de76..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/phantom.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "bloodmagic:BlockPhantom" } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json b/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json deleted file mode 100644 index 61e07141..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/points_upgrade.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "draft_angelus": { - "textures": { - "layer0": "bloodmagic:items/Coagulant" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/potion_flask.json b/src/main/resources/assets/bloodmagic/blockstates/potion_flask.json deleted file mode 100644 index 3102ac66..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/potion_flask.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "full": { - "true": { - "textures": { - "layer0": "bloodmagic:items/PotionFlask_underlay", - "layer1": "bloodmagic:items/PotionFlask_outline", - "layer2": "bloodmagic:items/PotionFlask_overlay" - } - }, - "false": { - "textures": { - "layer0": "bloodmagic:items/PotionFlask_outline" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/ritual_controller.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_controller.json deleted file mode 100644 index 1b8b489e..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/ritual_controller.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "master": { - "textures": { - "all": "bloodmagic:blocks/MasterRitualStone" - } - }, - "imperfect": { - "textures": { - "all": "bloodmagic:blocks/ImperfectRitualStone" - } - }, - "inverted": { - "textures": { - "all": "bloodmagic:blocks/MasterRitualStone_Inverted" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/ritual_diviner.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_diviner.json deleted file mode 100644 index e60702e6..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/ritual_diviner.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "basic": { - "textures": { - "layer0": "bloodmagic:items/RitualDiviner" - } - }, - "dusk": { - "textures": { - "layer0": "bloodmagic:items/RitualDiviner" - } - }, - "dawn": { - "textures": { - "layer0": "bloodmagic:items/RitualDiviner" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/ritual_reader.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_reader.json deleted file mode 100644 index 6178c0a9..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/ritual_reader.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/RitualTinkerer" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/ritual_stone.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_stone.json deleted file mode 100644 index 9eead647..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/ritual_stone.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "blank": { - "textures": { - "all": "bloodmagic:blocks/RitualStone" - } - }, - "water": { - "textures": { - "all": "bloodmagic:blocks/WaterRitualStone" - } - }, - "fire": { - "textures": { - "all": "bloodmagic:blocks/FireRitualStone" - } - }, - "earth": { - "textures": { - "all": "bloodmagic:blocks/EarthRitualStone" - } - }, - "air": { - "textures": { - "all": "bloodmagic:blocks/AirRitualStone" - } - }, - "dusk": { - "textures": { - "all": "bloodmagic:blocks/DuskRitualStone" - } - }, - "dawn": { - "textures": { - "all": "bloodmagic:blocks/LightRitualStone" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/sacrificial_dagger.json b/src/main/resources/assets/bloodmagic/blockstates/sacrificial_dagger.json deleted file mode 100644 index da29bad3..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sacrificial_dagger.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/SacrificialDagger" - } - }, - "creative": { - "textures": { - "layer0": "bloodmagic:items/SacrificialDagger" - } - }, - "ceremonial": { - "textures": { - "layer0": "bloodmagic:items/CeremonialDagger" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sanguine_book.json b/src/main/resources/assets/bloodmagic/blockstates/sanguine_book.json deleted file mode 100644 index 3d241ffb..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sanguine_book.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/SanguineBook" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_armour.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_armour.json deleted file mode 100644 index 92324fbe..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_armour.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "armour": { - "head_default": { - "textures": { - "layer0": "bloodmagic:items/SentientHelmet" - } - }, - "body_default": { - "textures": { - "layer0": "bloodmagic:items/SentientPlate" - } - }, - "leg_default": { - "textures": { - "layer0": "bloodmagic:items/SentientLeggings" - } - }, - "feet_default": { - "textures": { - "layer0": "bloodmagic:items/SentientBoots" - } - }, - "head_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SentientHelmet_corrosive" - } - }, - "body_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SentientPlate_corrosive" - } - }, - "leg_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SentientLeggings_corrosive" - } - }, - "feet_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SentientBoots_corrosive" - } - }, - "head_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SentientHelmet_vengeful" - } - }, - "body_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SentientPlate_vengeful" - } - }, - "leg_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SentientLeggings_vengeful" - } - }, - "feet_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SentientBoots_vengeful" - } - }, - "head_destructive": { - "textures": { - "layer0": "bloodmagic:items/SentientHelmet_destructive" - } - }, - "body_destructive": { - "textures": { - "layer0": "bloodmagic:items/SentientPlate_destructive" - } - }, - "leg_destructive": { - "textures": { - "layer0": "bloodmagic:items/SentientLeggings_destructive" - } - }, - "feet_destructive": { - "textures": { - "layer0": "bloodmagic:items/SentientBoots_destructive" - } - }, - "head_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SentientHelmet_steadfast" - } - }, - "body_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SentientPlate_steadfast" - } - }, - "leg_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SentientLeggings_steadfast" - } - }, - "feet_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SentientBoots_steadfast" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_armour_gem.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_armour_gem.json deleted file mode 100644 index 4a0cabfb..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_armour_gem.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "activated": { - "textures": { - "layer0": "bloodmagic:items/SentientArmourGem_activated" - } - }, - "deactivated": { - "textures": { - "layer0": "bloodmagic:items/SentientArmourGem_deactivated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_axe.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_axe.json deleted file mode 100644 index f93f679a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_axe.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "type": { - "default": { - "textures": { - "layer0": "bloodmagic:items/SoulAxe" - } - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulAxe_corrosive" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulAxe_destructive" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulAxe_vengeful" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulAxe_steadfast" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_bow.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_bow.json deleted file mode 100644 index 4ae06da9..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_bow.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "type": { - "default": { - "model": "bloodmagic:item/ItemSentientBow" - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/SentientBow_corrosive" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/SentientBow_destructive" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/SentientBow_vengeful" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/SentientBow_steadfast" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_pickaxe.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_pickaxe.json deleted file mode 100644 index fdf1b224..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_pickaxe.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "type": { - "default": { - "textures": { - "layer0": "bloodmagic:items/SoulPickaxe" - } - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulPickaxe_corrosive" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulPickaxe_destructive" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulPickaxe_vengeful" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulPickaxe_steadfast" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_shovel.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_shovel.json deleted file mode 100644 index fe56d96d..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_shovel.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "type": { - "default": { - "textures": { - "layer0": "bloodmagic:items/SoulShovel" - } - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulShovel_corrosive" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulShovel_destructive" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulShovel_vengeful" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulShovel_steadfast" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sentient_sword.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_sword.json deleted file mode 100644 index 31620620..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sentient_sword.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-tool" - }, - "variants": { - "type": { - "default": { - "textures": { - "layer0": "bloodmagic:items/SoulSword_activated" - } - }, - "corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulSword_corrosive_activated" - } - }, - "destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulSword_destructive_activated" - } - }, - "vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulSword_vengeful_activated" - } - }, - "steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulSword_steadfast_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json deleted file mode 100644 index 32f44849..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/AirSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json deleted file mode 100644 index dc5b4f19..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/BloodLightSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_bounce.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_bounce.json deleted file mode 100644 index d4fdbefe..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_bounce.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/BounceSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/BounceSigil_activated" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_claw.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_claw.json deleted file mode 100644 index 54f6aa1b..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_claw.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/ClawSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/ClawSigil_activated" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_compression.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_compression.json deleted file mode 100644 index ad29944e..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_compression.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/CompressionSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/CompressionSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json deleted file mode 100644 index 184354d6..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/DivinationSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_elemental_affinity.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_elemental_affinity.json deleted file mode 100644 index 313bbfe2..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_elemental_affinity.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/ElementalSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/ElementalSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_ender_severance.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_ender_severance.json deleted file mode 100644 index 9c73f810..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_ender_severance.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/SigilOfSeverance_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/SigilOfSeverance_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_fast_miner.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_fast_miner.json deleted file mode 100644 index 2c22c801..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_fast_miner.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/MiningSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/MiningSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_frost.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_frost.json deleted file mode 100644 index b7dcb443..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_frost.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/IceSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/IceSigil_activated" - } - } - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_green_grove.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_green_grove.json deleted file mode 100644 index b1bfb321..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_green_grove.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/GrowthSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/GrowthSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_haste.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_haste.json deleted file mode 100644 index 39b9302a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_haste.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/HasteSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/HasteSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_holding.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_holding.json deleted file mode 100644 index cfe4b8ec..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_holding.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/SigilOfHolding" - } - }, - "color": { - "textures": { - "layer0": "bloodmagic:items/SigilOfHolding", - "layer1": "bloodmagic:items/SigilOverlay" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json deleted file mode 100644 index fde7dbbc..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/LavaSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_magnetism.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_magnetism.json deleted file mode 100644 index 8a3a3967..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_magnetism.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/SigilOfMagnetism_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/SigilOfMagnetism_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_phantom_bridge.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_phantom_bridge.json deleted file mode 100644 index e37bf040..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_phantom_bridge.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/BridgeSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/BridgeSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_seer.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_seer.json deleted file mode 100644 index 26097e59..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_seer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/SeerSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_suppression.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_suppression.json deleted file mode 100644 index b48d90eb..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_suppression.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/SigilOfSuppression_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/SigilOfSuppression_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json deleted file mode 100644 index 84d1fe93..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/TelepositionSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json deleted file mode 100644 index bb09cc7d..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/TranspositionSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_void.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_void.json deleted file mode 100644 index 4bc0194f..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_void.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/VoidSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json deleted file mode 100644 index 9f76d28b..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "normal": { - "textures": { - "layer0": "bloodmagic:items/WaterSigil" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/sigil_whirlwind.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_whirlwind.json deleted file mode 100644 index 6c9faba0..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/sigil_whirlwind.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "active": { - "false": { - "textures": { - "layer0": "bloodmagic:items/WindSigil_deactivated" - } - }, - "true": { - "textures": { - "layer0": "bloodmagic:items/WindSigil_activated" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/slate.json b/src/main/resources/assets/bloodmagic/blockstates/slate.json deleted file mode 100644 index 7f6f59af..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/slate.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "blank": { - "textures": { - "layer0": "bloodmagic:items/BlankSlate" - } - }, - "reinforced": { - "textures": { - "layer0": "bloodmagic:items/ReinforcedSlate" - } - }, - "imbued": { - "textures": { - "layer0": "bloodmagic:items/InfusedSlate" - } - }, - "demonic": { - "textures": { - "layer0": "bloodmagic:items/DemonSlate" - } - }, - "ethereal": { - "textures": { - "layer0": "bloodmagic:items/EtherealSlate" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/soul_forge.json b/src/main/resources/assets/bloodmagic/blockstates/soul_forge.json deleted file mode 100644 index 5abbb4e2..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/soul_forge.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "bloodmagic:BlockHellfireForge.obj", - "custom": { "flip-v": true }, - "transform" : "forge:default-block" - }, - "variants": { - "normal": [{ - - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/soul_gem.json b/src/main/resources/assets/bloodmagic/blockstates/soul_gem.json deleted file mode 100644 index 33d9b6e0..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/soul_gem.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "petty_default": { - "textures": { - "layer0": "bloodmagic:items/SoulGemPetty" - } - }, - "lesser_default": { - "textures": { - "layer0": "bloodmagic:items/SoulGemLesser" - } - }, - "common_default": { - "textures": { - "layer0": "bloodmagic:items/SoulGemCommon" - } - }, - "greater_default": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGreater" - } - }, - "grand_default": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGrand" - } - }, - "petty_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemPetty_corrosive" - } - }, - "lesser_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemLesser_corrosive" - } - }, - "common_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemCommon_corrosive" - } - }, - "greater_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGreater_corrosive" - } - }, - "grand_corrosive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGrand_corrosive" - } - }, - "petty_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulGemPetty_vengeful" - } - }, - "lesser_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulGemLesser_vengeful" - } - }, - "common_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulGemCommon_vengeful" - } - }, - "greater_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGreater_vengeful" - } - }, - "grand_vengeful": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGrand_vengeful" - } - }, - "petty_destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemPetty_destructive" - } - }, - "lesser_destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemLesser_destructive" - } - }, - "common_destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemCommon_destructive" - } - }, - "greater_destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGreater_destructive" - } - }, - "grand_destructive": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGrand_destructive" - } - }, - "petty_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulGemPetty_steadfast" - } - }, - "lesser_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulGemLesser_steadfast" - } - }, - "common_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulGemCommon_steadfast" - } - }, - "greater_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGreater_steadfast" - } - }, - "grand_steadfast": { - "textures": { - "layer0": "bloodmagic:items/SoulGemGrand_steadfast" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/soul_snare.json b/src/main/resources/assets/bloodmagic/blockstates/soul_snare.json deleted file mode 100644 index e643b138..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/soul_snare.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "soulsnare": { - "textures": { - "layer0": "bloodmagic:items/SoulSnare" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/soulforge.json b/src/main/resources/assets/bloodmagic/blockstates/soulforge.json new file mode 100644 index 00000000..12e4803a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/soulforge.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/soulforge" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/spectral.json b/src/main/resources/assets/bloodmagic/blockstates/spectral.json deleted file mode 100644 index 1d43fa6a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/spectral.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "normal": { - "model": "bloodmagic:BlockSpectral", - "textures": { - "all": "bloodmagic:blocks/SpectralBlock" - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/teleposer.json b/src/main/resources/assets/bloodmagic/blockstates/teleposer.json deleted file mode 100644 index 2a92da6c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/teleposer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "orientable" - }, - "variants": { - "normal": [{ - "textures": { - "top": "bloodmagic:blocks/Teleposer_Top", - "side": "bloodmagic:blocks/Teleposer_Side", - "front": "bloodmagic:blocks/Teleposer_Side", - "bottom": "bloodmagic:blocks/Teleposer_Side" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/teleposition_focus.json b/src/main/resources/assets/bloodmagic/blockstates/teleposition_focus.json deleted file mode 100644 index 34f21365..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/teleposition_focus.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "weak": { - "textures": { - "layer0": "bloodmagic:items/TeleposerFocus" - } - }, - "enhanced": { - "textures": { - "layer0": "bloodmagic:items/EnhancedTeleposerFocus" - } - }, - "reinforced": { - "textures": { - "layer0": "bloodmagic:items/ReinforcedTeleposerFocus" - } - }, - "demonic": { - "textures": { - "layer0": "bloodmagic:items/DemonicTeleposerFocus" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/test_spell_block.json b/src/main/resources/assets/bloodmagic/blockstates/test_spell_block.json deleted file mode 100644 index 8bdc9a94..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/test_spell_block.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "bloodmagic:sub/BlockSpellModifierCore", - "textures": { - "model": "bloodmagic:models/SpellModifierDefault" - }, - - "uvlock": false - }, - "variants": { - "input": { - "up": {"submodel": "bloodmagic:sub/BlockSpellModifierInput", "x": 90}, - "down": {"submodel": "bloodmagic:sub/BlockSpellModifierInput", "x": -90}, - "east": {"submodel": "bloodmagic:sub/BlockSpellModifierInput", "y": -90}, - "west": {"submodel": "bloodmagic:sub/BlockSpellModifierInput", "y": 90}, - "north": {"submodel": "bloodmagic:sub/BlockSpellModifierInput", "y": 180}, - "south": {"submodel": "bloodmagic:sub/BlockSpellModifierInput"} - }, - "output": { - "up": {"submodel": "bloodmagic:sub/BlockSpellModifierOutput", "transform": {"rotation": {"z": 90}} }, - "down": {"submodel": "bloodmagic:sub/BlockSpellModifierOutput", "transform": {"rotation": {"z": -90}} }, - "west": {"submodel": "bloodmagic:sub/BlockSpellModifierOutput", "y": 180}, - "east": {"submodel": "bloodmagic:sub/BlockSpellModifierOutput"}, - "north": {"submodel": "bloodmagic:sub/BlockSpellModifierOutput", "y": -90}, - "south": {"submodel": "bloodmagic:sub/BlockSpellModifierOutput", "y": 90} - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/upgrade_tome.json b/src/main/resources/assets/bloodmagic/blockstates/upgrade_tome.json deleted file mode 100644 index 1562c045..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/upgrade_tome.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "upgradetome": { - "textures": { - "layer0": "bloodmagic:items/UpgradeTome" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/upgrade_trainer.json b/src/main/resources/assets/bloodmagic/blockstates/upgrade_trainer.json deleted file mode 100644 index 37735a28..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/upgrade_trainer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "upgradetrainer": { - "textures": { - "layer0": "bloodmagic:items/UpgradeTrainer" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/books/architect.xml b/src/main/resources/assets/bloodmagic/books/architect.xml deleted file mode 100644 index d8bfebc9..00000000 --- a/src/main/resources/assets/bloodmagic/books/architect.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - The Architect - -My name is Tiberius. I was a kid when the demons came for my village during The Wars. They ransacked the houses and turned the shacks into splinters, wielding fire and water to blast the land asunder. I woke up to some travelling merchants that were passing by, equipping the warriors who were futily trying to drive off the demons that still clawed the village. - -I was brought to a village nearby, where a magician named Magus helped tend to my wounds. The magic that he used was something that I had never seen before – it wasn’t Thaumaturgy, nor Alchemy, and it was definitely not Botany. He winked at me once he saw that my eyes were open, holding his finger to his lips. - - - - - Fast-forward several years, and I have learned almost everything from Master Magus, being his third student ever to master his arts. Against his wishes, I have recorded my research and put several wards and spells on this book. So welcome, apprentice. I am known as The Architect, and I am a Blood Mage. - -It took several years of pestering before I managed to convince Magus to teach me. He kept on telling me that, “Magic that uses the life essence of living beings requires patience and preparation in order to master it. One false move, go a little past your natural endurance, and you may find yourself taking a nice vacation in Tartarus.†The thing was, I wanted to go there – I had some unfinished business with the demons. - - - - - The process that Magus originally constructed required powerful artifacts that he constructed himself, but were rather lacking where teaching was concerned. After studying a bit of alchemy and the process of “Equivalent Exchange,†I managed to construct myself an altar that would transmute items inside of its basin into new powerful forms. The only issue was that it needed a worthy catalyst, and so with a prick of the finger I set the Blood Altar alight! - - - - - The Blood Altar - -To start any form of transmutation involving blood, you would need to construct a blood altar and a sacrificial knife, as well as have a solitary diamond in your possession. After placing the blood altar down, Magus advised me to be careful as I filled it slowly with my blood, and said that I would need to be really close to the altar (about a metre) for the knife to work. With about 2 buckets of blood in the altar, which Master Magus reminds me is about 10 hearts worth, I placed the diamond inside of the altar by activating it with the diamond in hand. - -The blood dissipated in a cloud of red swirls as I waited for the atoms of the diamond to shift and reform. There were a few - - - - - moments where the particles turned gray, which meant that the altar was empty and I had to hurry to fill it. After the diamond burst in a shower of red particles, what finally sat in the altar was a Weak Blood Orb. - - - - - - Blood Altar - - bloodAltar - three - - - - - Sacrificial Knife - - sacrificialKnife - three - - - - - The Soul Network - -One thing that I initially didn’t understand was the overarching connection between the blood orb and myself. When I initially met Magus, I could see many sparkling strands branching off of him, flowing throughout his house and linking with intricate stones and runic drawings. I asked Magus about the strands, but he had no clue what I was talking about. It took three years of thorough research to finally find the answer, and when I brought my notes to him he was really impressed with what I have found. - -When you send power into the orb, the energy is transmitted from the strand connecting the orb and into the very soul of the person the orb is bound to. Similarly, and Magus - - - - - - managed to show this effect with several of his rituals, when you use something that drains energy it will drain the energy directly from the soul. The thing is that if you use an item whose owner has no energy left, the item will instead grab the requisite energy from the user of the item. Directly. From his or her life force. As such, the unit of measurement is called “Life Points,†or LP. I experimented with this, and one heart equals 200 LP. - -I have christened this system to be the “Soul Network,†and is used in all branches of Blood Magic indirectly. - - - - - - Sigils - -Magus is a master at rituals. His power in the intricate layering of stones and inks is unmatched. The problem is that these rituals are rather… static in nature. Sure, being able to summon a meteor is all fine and dandy, but won’t exactly protect you when you are on fire. To this end, I decided to link my soul network to powerful items that I have created. To start, I decided to transmute a piece of smooth stone in the Blood Altar with just 1kLP to create a blank slate. - -The first thing I did was to arrange the blank slate with some reflective glass and my weak blood orb. Pouring my power into the configuration created a Divination Sigil, which I could link to my network and see - - - - - - how much power that my soul network holds. What is more, holding the sigil to the Blood Altar flooded my mind with information, giving me the knowledge about its current tier, capacity, and even how much it was holding. - - Happy with the sigil, I brought a fresh unbound one to Master Magus for him to use. When I took the divination sigil back in my hands and tried to use it to view his network, for some reason I could not gleam any information from him. I don’t really see why this is, considering that I used this same method for other people and I saw that they had no power at all, but to gleam actually … nothing from Magus is strange. - - - - - Divination Sigil - - divinationSigil - three - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/bg_BG.lang b/src/main/resources/assets/bloodmagic/lang/bg_BG.lang deleted file mode 100644 index 7e518dd4..00000000 --- a/src/main/resources/assets/bloodmagic/lang/bg_BG.lang +++ /dev/null @@ -1,85 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=МагиÑта на Кръвта -itemGroup.bloodmagic.creativeTabTome=МагиÑта на Кръвта Ъпгрейд Томове - -#Items -item.bloodmagic.activationCrystal.weak.name=Слаб КриÑтален Ðктиватор -item.bloodmagic.activationCrystal.awakened.name=Буднат КриÑтален Ðктиватор -item.bloodmagic.activationCrystal.creative.name=Креативен КриÑтален Ðктиватор - -item.bloodmagic.sacrificialDagger.normal.name=Жертвоприношителен Ðож -item.bloodmagic.sacrificialDagger.creative.name=Креативен Жертвоприношителен Ðож -item.bloodmagic.pack.selfSacrifice.name=Кървав Пакет -item.bloodmagic.pack.sacrifice.name=ГЕРБ -item.bloodmagic.daggerOfSacrifice.name=Ðож на Жертвоприношението - -item.bloodmagic.lavaCrystal.name=Лава КриÑтал - -item.bloodmagic.bound.sword.name=Обвързано ОÑтрие -item.bloodmagic.bound.pickaxe.name=Обвързана Кирка -item.bloodmagic.bound.axe.name=Обвързана Брадва -item.bloodmagic.bound.shovel.name=Обвързана Лопата - -item.bloodmagic.bucket.lifeEssence.name=Кофата на Живота - -item.bloodmagic.orb.weak.name=Слаб Кръвен Орб -item.bloodmagic.orb.apprentice.name=Apprentice Кръвен Орб -item.bloodmagic.orb.magician.name=Магичен Кръвен Орб -item.bloodmagic.orb.master.name=МаÑтер Кръвен Орб -item.bloodmagic.orb.archmage.name=Превъзходен Кръвен Орб -item.bloodmagic.orb.transcendent.name=Съвършен Кръвен Орб - -item.bloodmagic.bloodShard.weak.name=Слабо Кръвно Парче -item.bloodmagic.bloodShard.demon.name=Демонично Кръвно Парче - -item.bloodmagic.baseComponent.reagentWater.name=Ваден Реагент -item.bloodmagic.baseComponent.reagentLava.name=Лава Реагент -item.bloodmagic.baseComponent.reagentAir.name=Въздушен Реагент -item.bloodmagic.baseComponent.reagentFastMiner.name=Минен Реагент -item.bloodmagic.baseComponent.reagentVoid.name=Void Реагент -item.bloodmagic.baseComponent.reagentGrowth.name=РаÑтежен Реагент -item.bloodmagic.baseComponent.reagentAffinity.name=Елеменарно Ðфинитен Реагент -item.bloodmagic.baseComponent.reagentSight.name=Зрителен Реагент -item.bloodmagic.baseComponent.reagentBinding.name=Обвързващ Реагент -item.bloodmagic.baseComponent.reagentSuppression.name=ПотиÑкащ Реагент -item.bloodmagic.baseComponent.frameParts.name=ЧаÑти на Рамка -item.bloodmagic.baseComponent.reagentBloodLight.name=Светлинно Кръвен Реагент -item.bloodmagic.baseComponent.reagentMagnetism.name=Магнетичен Реагент -item.bloodmagic.baseComponent.reagentHaste.name=Бързинен Реагент -item.bloodmagic.baseComponent.reagentBridge.name=Фантомен МоÑÑ‚ Реагент -item.bloodmagic.baseComponent.reagentCompression.name=КомпреÑиращ Реагент -item.bloodmagic.baseComponent.reagentSeverance.name=СкъÑÑващ Реагент - -item.bloodmagic.baseComponent.reagentTeleposition.name=ПозициÑпроменÑщ Реагент -item.bloodmagic.baseComponent.reagentTransposition.name=ТранÑпонираЩ Реагент - -item.bloodmagic.baseComponent.ironSand.name=Железен ПÑÑък -item.bloodmagic.baseComponent.goldSand.name=Златен ПÑÑък -item.bloodmagic.baseComponent.coalSand.name=Въглищен ПÑÑък - -item.bloodmagic.demonCrystal.crystalDefault.name=КриÑтал на Демонична Ð’Ð¾Ð»Ñ -item.bloodmagic.demonCrystal.crystalCorrosive.name=КриÑтал на Корозивна Ð’Ð¾Ð»Ñ -item.bloodmagic.demonCrystal.crystalDestructive.name=КриÑтал на Разрушителна Ð’Ð¾Ð»Ñ -item.bloodmagic.demonCrystal.crystalVengeful.name=КриÑтал на ОтмъÑтителна Ð’Ð¾Ð»Ñ -item.bloodmagic.demonCrystal.crystalSteadfast.name=КриÑтал на Твърда Ð’Ð¾Ð»Ñ - -item.bloodmagic.monsterSoul.base.name=ДÑволÑка Ð’Ð¾Ð»Ñ - -item.bloodmagic.livingArmour.helmet.name=Живата КаÑка -item.bloodmagic.livingArmour.chest.name=ЖивÑÑ‰Ð¸Ñ Ðагръдник -item.bloodmagic.livingArmour.legs.name=Живите Гамаши -item.bloodmagic.livingArmour.boots.name=Живите Ботуши -item.bloodmagic.sentientArmour.helmet.name=ЧувÑтвителна КаÑка -item.bloodmagic.sentientArmour.chest.name=ЧувÑтвителен Ðагръдник -item.bloodmagic.sentientArmour.legs.name=ЧувÑтвителни Гамаши -item.bloodmagic.sentientArmour.boots.name=ЧувÑтвителни Ботуши - -item.bloodmagic.altarMaker.name=Създател на алтари - -item.bloodmagic.sentientSword.name=ЧувÑтвителен Меч -item.bloodmagic.sentientBow.name=ЧувÑтвителен Лък -item.bloodmagic.sentientArmourGem.name=Ñкъпоценен камък на ЧувÑтвителната Ð‘Ñ€Ð¾Ð½Ñ - -# JustEnoughItems -jei.bloodmagic.recipe.altar=Ðлтар на Кръвта -jei.bloodmagic.recipe.ticksRequired=Време: %,d Ticks diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang deleted file mode 100644 index c6627a6c..00000000 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ /dev/null @@ -1,908 +0,0 @@ -# Creative Tab -itemGroup.bloodmagic.creativeTabTome=Blood Magic - Upgrades - -# Items - -item.bloodmagic.pack.selfSacrifice.name=Blutweste -item.bloodmagic.pack.sacrifice.name=Vampirische Weste -item.bloodmagic.daggerOfSacrifice.name=Opfermesser - -item.bloodmagic.lavaCrystal.name=Lavakristall - -item.bloodmagic.activation_crystal.awakened.name=Erweckter Aktivierungskristall -item.bloodmagic.activation_crystal.creative.name=Kreativer Aktivierungskristall -item.bloodmagic.activation_crystal.weak.name=Schwacher Aktivierungskristall - -item.bloodmagic.bound.sword.name=Gebundene Klinge -item.bloodmagic.bound.pickaxe.name=Gebundene Spitzhacke -item.bloodmagic.bound.axe.name=Gebundene Axt -item.bloodmagic.bound.shovel.name=Gebundene Schaufel - -item.bloodmagic.bucket.lifeEssence.name=Eimer mit Lebensessenz - -item.bloodmagic.scribe.water.name=Elementar-Gravurwerkzeug: Wasser -item.bloodmagic.scribe.fire.name=Elementar-Gravurwerkzeug: Feuer -item.bloodmagic.scribe.earth.name=Elementar-Gravurwerkzeug: Erde -item.bloodmagic.scribe.air.name=Elementar-Gravurwerkzeug: Luft -item.bloodmagic.scribe.dusk.name=Elementar-Gravurwerkzeug: Abenddämmerung -item.bloodmagic.scribe.dawn.name=Elementar-Gravurwerkzeug: Morgendämmerung - -item.bloodmagic.focus.weak.name=Telepositionsfokus -item.bloodmagic.focus.enhanced.name=Verbesserter Telepositionsfokus -item.bloodmagic.focus.reinforced.name=Verstärkter Telepositionsfokus -item.bloodmagic.focus.demonic.name=Dämonischer Telepositionsfokus - -item.bloodmagic.slate.blank.name=Leere Schiefertafel -item.bloodmagic.slate.reinforced.name=Verstärkte Tafel -item.bloodmagic.slate.imbued.name=Erfüllte Tafel -item.bloodmagic.slate.demonic.name=Dämonische Tafel -item.bloodmagic.slate.ethereal.name=Ätherische Tafel - -item.bloodmagic.orb.weak.name=Schwache Blutkugel -item.bloodmagic.orb.apprentice.name=Blutkugel des Lehrlings -item.bloodmagic.orb.magician.name=Blutkugel des Magiers -item.bloodmagic.orb.master.name=Blutkugel des Meisters -item.bloodmagic.orb.archmage.name=Blutkugel des Erzmagiers -item.bloodmagic.orb.transcendent.name=Transzendenter Blutkugel - -item.bloodmagic.reagent.incendium.name=Incendium -item.bloodmagic.reagent.magicales.name=Magicales -item.bloodmagic.reagent.sanctus.name=Sanctus -item.bloodmagic.reagent.aether.name=Aether -item.bloodmagic.reagent.crepitous.name=Crepitous -item.bloodmagic.reagent.crystallos.name=Crystallos -item.bloodmagic.reagent.terrae.name=Terrae -item.bloodmagic.reagent.aquasalus.name=Aquasalus -item.bloodmagic.reagent.tennebrae.name=Tennebrae -item.bloodmagic.reagent.offensa.name=Offensa -item.bloodmagic.reagent.praesidium.name=Praesidium -item.bloodmagic.reagent.orbisterrae.name=Orbis Terrae -item.bloodmagic.reagent.virtus.name=Virtus -item.bloodmagic.reagent.reductus.name=Reductus -item.bloodmagic.reagent.potentia.name=Potentia - -item.bloodmagic.blood_shard.demonic.name=Dämonische Blutscherbe -item.bloodmagic.blood_shard.weak.name=Schwache Blutscherbe -item.bloodmagic.sacrificial_dagger.creative.name=Kreativer Opferdolch -item.bloodmagic.sacrificial_dagger.normal.name=Opferdolch - -item.bloodmagic.baseComponent.reagent_affinity.name=Reagenz der elementaren Verbundenheit -item.bloodmagic.baseComponent.reagent_air.name=Luftreagenz -item.bloodmagic.baseComponent.reagent_binding.name=Bindendes Reagenz -item.bloodmagic.baseComponent.reagent_fast_miner.name=Reagenz der Eile -item.bloodmagic.baseComponent.reagent_growth.name=Wachstumsreagenz -item.bloodmagic.baseComponent.reagent_lava.name=Lavareagenz -item.bloodmagic.baseComponent.reagent_sight.name=Sichtreagenz -item.bloodmagic.baseComponent.reagent_suppression.name=Verdrängendes Reagenz -item.bloodmagic.baseComponent.reagent_void.name=Reagenz der Leere -item.bloodmagic.baseComponent.reagent_water.name=Wasserreagenz -item.bloodmagic.baseComponent.reagent_blood_light.name=Blutlampenreagenz -item.bloodmagic.baseComponent.reagent_magnetism.name=Magnetismusreagenz -item.bloodmagic.baseComponent.reagent_haste.name=Reagenz der Hast -item.bloodmagic.baseComponent.reagent_bridge.name=Reagenz der Phantombrücke -item.bloodmagic.baseComponent.reagent_compression.name=Kompressionsreagenz -item.bloodmagic.baseComponent.reagent_severance.name=Trennungsreagenz -item.bloodmagic.baseComponent.reagent_holding.name=Aufbewahrungsreagenz -item.bloodmagic.baseComponent.reagent_claw.name=Klauenreagenz -item.bloodmagic.baseComponent.reagent_bounce.name=Elastizitätsreagenz -item.bloodmagic.baseComponent.reagent_frost.name=Frostreagenz -item.bloodmagic.baseComponent.reagent_teleposition.name=Telepositionsreagenz -item.bloodmagic.baseComponent.reagent_transposition.name=Transpositionsreagenz - -item.bloodmagic.baseComponent.frame_part.name=Rahmenteile -item.bloodmagic.baseComponent.sand_iron.name=Eisensand -item.bloodmagic.baseComponent.sand_gold.name=Goldsand -item.bloodmagic.baseComponent.sand_coal.name=Kohlesand -item.bloodmagic.baseComponent.plant_oil.name=Pflanzenöl -item.bloodmagic.baseComponent.sulfur.name=Schwefel -item.bloodmagic.baseComponent.saltpeter.name=Saltpeter -item.bloodmagic.baseComponent.neuro_toxin.name=Nervengift -item.bloodmagic.baseComponent.antiseptic.name=Antiseptikum -item.bloodmagic.baseComponent.catalyst_length_1.name=Einfacher Verlängerungskatalysator -item.bloodmagic.baseComponent.catalyst_power_1.name=Einfacher Machtkatalysator - -item.bloodmagic.cutting_fluid.basic.name=Einfache Schneidelösung -item.bloodmagic.cutting_fluid.explosive.name=Explosives Pulver - -item.bloodmagic.demonCrystal.default.name=Kristall dämonischer Willenskraft -item.bloodmagic.demonCrystal.corrosive.name=Kristall korrosiver dämonischer Willenskraft -item.bloodmagic.demonCrystal.destructive.name=Kristall zerstörender dämonischer Willenskraft -item.bloodmagic.demonCrystal.vengeful.name=Kristall rachsüchtiger dämonischer Willenskraft -item.bloodmagic.demonCrystal.steadfast.name=Kristall standhafter dämonischer Willenskraft - -item.bloodmagic.monster_soul.raw.name=Dämonische Willenskraft -item.bloodmagic.monster_soul.corrosive.name=Korrosive dämonische Willenskraft -item.bloodmagic.monster_soul.destructive.name=Zerstörerische dämonische Willenskraft -item.bloodmagic.monster_soul.vengeful.name=Rachsüchtige dämonische Willenskraft -item.bloodmagic.monster_soul.steadfast.name=Standhafte dämonische Willenskraft - -item.bloodmagic.sigil.air.name=Luftsiegel -item.bloodmagic.sigil.compression.name=Siegel der Kompression -item.bloodmagic.sigil.divination.name=Siegel der Weissagung -item.bloodmagic.sigil.water.name=Wassersiegel -item.bloodmagic.sigil.lava.name=Lavasiegel -item.bloodmagic.sigil.void.name=Siegel der Leere -item.bloodmagic.sigil.haste.name=Siegel der Hast -item.bloodmagic.sigil.suppression.name=Siegel der Verdrängung -item.bloodmagic.sigil.magnetism.name=Siegel des Magnetismus -item.bloodmagic.sigil.seer.name=Siegel des Sehers -item.bloodmagic.sigil.whirlwind.name=Siegel des Wirbelwindes -item.bloodmagic.sigil.holding.name=Siegel der Aufbewahrung -item.bloodmagic.sigil.holding.display=&r%s: &o&n%s -item.bloodmagic.sigil.teleposition.name=Telepositionssiegel -item.bloodmagic.sigil.transposition.name=Transpositionssiegel -item.bloodmagic.sigil.claw.name=Siegel der Klaue -item.bloodmagic.sigil.bounce.name=Siegel der Elastizität -item.bloodmagic.sigil.frost.name=Siegel des Winteratems -item.bloodmagic.sigil.blood_light.name=Siegel der Blutlampe -item.bloodmagic.sigil.elemental_affinity.name=Siegel der elementaren Verbundenheit -item.bloodmagic.sigil.ender_severance.name=Siegel des Endertrennens -item.bloodmagic.sigil.fast_miner.name=Siegel des Eile -item.bloodmagic.sigil.green_grove.name=Siegel des grünen Hains -item.bloodmagic.sigil.phantom_bridge.name=Siegel der Phantombrücke - -item.bloodmagic.livingArmour.helmet.name=Lebender Helm -item.bloodmagic.livingArmour.chest.name=Lebender Brustpanzer -item.bloodmagic.livingArmour.legs.name=Lebender Beinschutz -item.bloodmagic.livingArmour.boots.name=Lebende Schuhe -item.bloodmagic.sentientArmour.helmet.name=Empfindsamer Helm -item.bloodmagic.sentientArmour.chest.name=Empfindsamer Brustpanzer -item.bloodmagic.sentientArmour.legs.name=Empfindsamer Beinschutz -item.bloodmagic.sentientArmour.boots.name=Empfindsame Schuhe - -item.bloodmagic.altarMaker.name=Altarersteller - -item.bloodmagic.ritualDismantler.name=Ritual Dismantler -item.bloodmagic.ritualDivinernormal.name=Ritualrute -item.bloodmagic.ritualDivinerdusk.name=Ritualrute [Abenddämmerung] -item.bloodmagic.ritualDivinerdawn.name=Ritualrute [Morgendämmerung] -item.bloodmagic.ritualReader.name=Ritual-Tüftler - -item.bloodmagic.arcaneAshes.name=Arkane Asche -item.bloodmagic.upgradeTome.name=These zur Verbesserung lebender Rüstung -item.bloodmagic.downgradeTome.name=These zur Schwächung lebender Rüstung -item.bloodmagic.upgradeTrainer.name=Trainingsband für Lebende Rüstung - -item.bloodmagic.sentientSword.name=Empfindsames Schwert -item.bloodmagic.soulGem.petty.name=Winziges Juwel des Tartaros -item.bloodmagic.soulGem.lesser.name=Niederes Juwel des Tartaros -item.bloodmagic.soulGem.common.name=Gewöhnliches Juwel des Tartaros -item.bloodmagic.soulGem.greater.name=Größeres Juwel des Tartaros -item.bloodmagic.soulGem.grand.name=Großartiges Juwel des Tartaros -item.bloodmagic.soulSnare.base.name=Rudimentäre Schlinge -item.bloodmagic.sentientBow.name=Empfindsamer Bogen -item.bloodmagic.sentientArmourGem.name=Juwel der Empfindsamen Rüstung -item.bloodmagic.sentientAxe.name=Empfindsame Axt -item.bloodmagic.sentientPickaxe.name=Empfindsame Spitzhacke -item.bloodmagic.sentientShovel.name=Empfindsame Schaufel - -item.bloodmagic.nodeRouter.name=Netzknoten-Router -item.bloodmagic.itemFilter.exact.name=Präziser Gegenstandsfilter -item.bloodmagic.itemFilter.ignoreNBT.name=Ignoriere NBT Gegenstandsfilter -item.bloodmagic.itemFilter.modItems.name=Mod Gegenstandsfilter -item.bloodmagic.itemFilter.oreDict.name=Ore Dictionary Gegenstandsfilter -item.bloodmagic.fluidFilter.exact.name=Flüssigeitsfilter - -item.bloodmagic.experienceTome.name=Peritia-Foliant -item.bloodmagic.sanguineBook.name=Inspectoris Scandalum - -item.bloodmagic.living_point_upgrade.draft_angelus.name=Trank der Engelsmacht - -item.bloodmagic.willGauge.name=Dämonischer Auramesser -item.bloodmagic.potionFlask.name=Trankflasche - -item.bloodmagic.icarusScroll.name=Ikarusrolle - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=Lebensessenz - -tile.bloodmagic.bloodstone_brick.name=Blutsteinziegel -tile.bloodmagic.bloodstone_tile.name=Großer Blutsteinziegel - -tile.bloodmagic.crystal_brick.name=Kristallklumpenziegel -tile.bloodmagic.crystal_tile.name=Kristallklumpen - -tile.bloodmagic.phantom.name=Phantomblock - -tile.bloodmagic.stone.ritual.master.name=Meisterritualstein -tile.bloodmagic.stone.ritual.imperfect.name=Imperfekter Ritualstein -tile.bloodmagic.stone.ritual.inverted.name=Umgekehrter Meisterritualstein - -tile.bloodmagic.altar.name=Blutaltar -tile.bloodmagic.alchemyArray.name=Alchemische Anordnung - -tile.bloodmagic.rune.blank.name=Leere Rune -tile.bloodmagic.rune.speed.name=Geschwindigkeitsrune -tile.bloodmagic.rune.efficiency.name=Effizienzrune -tile.bloodmagic.rune.sacrifice.name=Rune der Opferung -tile.bloodmagic.rune.displacement.name=Rune der Verlagerung -tile.bloodmagic.rune.capacity.name=Kapazitätsrune -tile.bloodmagic.rune.orb.name=Rune der Blutkugel -tile.bloodmagic.rune.acceleration.name=Beschleunigungsrune -tile.bloodmagic.rune.charging.name=Aufladungsrune -tile.bloodmagic.rune.augmented_capacity.name=Rune der erweiterten Kapazität -tile.bloodmagic.rune.self_sacrifice.name=Rune der Selbstopferung - -tile.bloodmagic.ritualStone.blank.name=Ritualstein -tile.bloodmagic.ritualStone.water.name=Wasserritualstein -tile.bloodmagic.ritualStone.fire.name=Feuerritualstein -tile.bloodmagic.ritualStone.earth.name=Erdritualstein -tile.bloodmagic.ritualStone.air.name=Luftritualstein -tile.bloodmagic.ritualStone.dusk.name=Abenddämmerungsritualstein -tile.bloodmagic.ritualStone.dawn.name=Morgendämmerungsritualstein - -tile.bloodmagic.bloodLight.name=Blutlampe -tile.bloodmagic.spectralBlock.name=Spektralblock -tile.bloodmagic.incenseAltar.name=Räucheraltar - -tile.bloodmagic.teleposer.name=Teleposer -tile.bloodmagic.soulForge.name=Höllenfeuerschmiede -tile.bloodmagic.alchemyTable.name=Alchemietisch -tile.bloodmagic.demonCrucible.name=Dämonenschmelztiegel -tile.bloodmagic.demonPylon.name=Dämonenpylon -tile.bloodmagic.demonCrystallizer.name=Dämonenkristallisierer - -tile.bloodmagic.masterRouting.name=Haupt-Verteilerknoten -tile.bloodmagic.outputRouting.name=Ausgehender Verteilerknoten -tile.bloodmagic.inputRouting.name=Eingehender Verteilerknoten -tile.bloodmagic.itemRouting.name=Verteilerknoten - -tile.bloodmagic.path.wood.name=Hölzerner Pfad -tile.bloodmagic.path.woodtile.name=Gekachelter Holzpfad -tile.bloodmagic.path.stone.name=Steinziegelpfad -tile.bloodmagic.path.stonetile.name=Gekachelter Steinpfad -tile.bloodmagic.path.wornstone.name=Verwitterter Steinziegelpfad -tile.bloodmagic.path.wornstonetile.name=Gekachelter verwitterter Steinpfad -tile.bloodmagic.path.obsidian.name=Obsidianziegelpfad -tile.bloodmagic.path.obsidiantile.name=Gekachelter Obsidianpfad - -tile.bloodmagic.dimensionalPortal.name=Dimensionsportal -tile.bloodmagic.bloodTank.name=Bluttank - -tile.bloodmagic.demonCrystal.default.name=Kristallgruppe dämonischen Willens -tile.bloodmagic.demonCrystal.corrosive.name=Kristallgruppe korrosiven dämonischen Willens -tile.bloodmagic.demonCrystal.destructive.name=Kristallgruppe zerstörerischen dämonischen Willens -tile.bloodmagic.demonCrystal.vengeful.name=Kristallgruppe rachsüchtigen dämonischen Willens -tile.bloodmagic.demonCrystal.steadfast.name=Kristallgruppe standhaften dämonischen Willens - -tile.bloodmagic.mimic.nohitbox.name=Ätherischer opaker Mimikblock -tile.bloodmagic.mimic.solidopaque.name=Opaker Mimikblock -tile.bloodmagic.mimic.solidclear.name=Klarer Mimikblock -tile.bloodmagic.mimic.solidlight.name=Leuchtender Mimikblock -tile.bloodmagic.mimic.sentient.name=Empfindsamer Mimikblock - -tile.bloodmagic.bricks1.brick1_raw.name=Rohe Steinziegel -tile.bloodmagic.bricks1.brick1_corrosive.name=Korrosive Steinziegel -tile.bloodmagic.bricks1.brick1_destructive.name=Zerstörerische Steinziegel -tile.bloodmagic.bricks1.brick1_vengeful.name=Rachsüchtige Steinziegel -tile.bloodmagic.bricks1.brick1_steadfast.name=Standhafte Steinziegel - -tile.bloodmagic.bricks2.smallbrick_raw.name=Kleine rohe Steinziegel -tile.bloodmagic.bricks2.smallbrick_corrosive.name=Kleine korrosive Steinziegel -tile.bloodmagic.bricks2.smallbrick_destructive.name=Kleine zerstörerische Steinziegel -tile.bloodmagic.bricks2.smallbrick_vengeful.name=Kleine rachsüchtige Steinziegel -tile.bloodmagic.bricks2.smallbrick_steadfast.name=Kleine standhafte Steinziegel -tile.bloodmagic.bricks2.tile_raw.name=Rohe Steinkacheln -tile.bloodmagic.bricks2.tile_corrosive.name=Korrosive Steinkacheln -tile.bloodmagic.bricks2.tile_destructive.name=Zerstörerische Steinkacheln -tile.bloodmagic.bricks2.tile_vengeful.name=Rachsüchtige Steinkacheln -tile.bloodmagic.bricks2.tile_steadfast.name=Standhafte Steinkacheln -tile.bloodmagic.bricks2.tilespecial_raw.name=Betonte rohe Steinkacheln -tile.bloodmagic.bricks2.tilespecial_corrosive.name=Betonte korrosive Steinkacheln -tile.bloodmagic.bricks2.tilespecial_destructive.name=Betonte zerstörerische Steinkacheln -tile.bloodmagic.bricks2.tilespecial_vengeful.name=Betonte rachsüchtige Steinkacheln -tile.bloodmagic.bricks2.tilespecial_steadfast.name=Betonte standhafte Steinkacheln - -tile.bloodmagic.inversionpillar.raw.name=Rohe Inversionssäule -tile.bloodmagic.inversionpillar.corrosive.name=Korrosive Inversionssäule -tile.bloodmagic.inversionpillar.destructive.name=Zerstörerische Inversionssäule -tile.bloodmagic.inversionpillar.vengeful.name=Rachsüchtige Inversionssäule -tile.bloodmagic.inversionpillar.steadfast.name=Standhafte Inversionssäule - -tile.bloodmagic.inversionpillarend.raw_bottom.name=Basis der rohen Inversionssäule -tile.bloodmagic.inversionpillarend.corrosive_bottom.name=Basis der korrosiven Inversionssäule -tile.bloodmagic.inversionpillarend.destructive_bottom.name=Basis der zerstörerischen Inversionssäule -tile.bloodmagic.inversionpillarend.vengeful_bottom.name=Basis der rachsüchtigen Inversionssäule -tile.bloodmagic.inversionpillarend.steadfast_bottom.name=Basis der standhaften Inversionssäule -tile.bloodmagic.inversionpillarend.raw_top.name=Kapitell der rohen Inversionssäule -tile.bloodmagic.inversionpillarend.corrosive_top.name=Kapitell der korrosiven Inversionssäule -tile.bloodmagic.inversionpillarend.destructive_top.name=Kapitell der zerstörerischen Inversionssäule -tile.bloodmagic.inversionpillarend.vengeful_top.name=Kapitell der rachsüchtigen Inversionssäule -tile.bloodmagic.inversionpillarend.steadfast_top.name=Kapitell der standhaften Inversionssäule - -tile.bloodmagic.demonlight.raw.name=Rohes Dämonenauge -tile.bloodmagic.demonlight.corrosive.name=Korrosives Dämonenauge -tile.bloodmagic.demonlight.destructive.name=Zerstörerisches Dämonenauge -tile.bloodmagic.demonlight.vengeful.name=Rachsüchtiges Dämonenauge -tile.bloodmagic.demonlight.steadfast.name=Standhaftes Dämonenauge - -tile.bloodmagic.extras.stone_raw.name=Roher Stein -tile.bloodmagic.extras.stone_corrosive.name=Korrosiver Stein -tile.bloodmagic.extras.stone_destructive.name=Zerstörerischer Stein -tile.bloodmagic.extras.stone_vengeful.name=Rachsüchtiger Stein -tile.bloodmagic.extras.stone_steadfast.name=Standhafter Stein - -tile.bloodmagic.extras.polished_raw.name=Polierter roher Stein -tile.bloodmagic.extras.polished_corrosive.name=Polierter korrosiver Stein -tile.bloodmagic.extras.polished_destructive.name=Polierter zerstörerischer Stein -tile.bloodmagic.extras.polished_vengeful.name=Polierter rachsüchtiger Stein -tile.bloodmagic.extras.polished_steadfast.name=Polierter standhafter Stein - -tile.bloodmagic.extras.metal_raw.name=Rohe Dämonenlegierung -tile.bloodmagic.extras.metal_corrosive.name=Korrosive Dämonenlegierung -tile.bloodmagic.extras.metal_destructive.name=Zerstörerische Dämonenlegierung -tile.bloodmagic.extras.metal_vengeful.name=Rachsüchtige Dämonenlegierung -tile.bloodmagic.extras.metal_steadfast.name=Standhafte Dämonenlegierung - -tile.bloodmagic.pillar1.raw.name=Rohe Steinsäule -tile.bloodmagic.pillar1.corrosive.name=Korrosive Steinsäule -tile.bloodmagic.pillar1.destructive.name=Zerstörerische Steinsäule -tile.bloodmagic.pillar1.vengeful.name=Rachsüchtige Steinsäule -tile.bloodmagic.pillar1.steadfast.name=Standhafte Steinsäule - -tile.bloodmagic.pillar2.raw.name=Betonte rohe Steinsäule -tile.bloodmagic.pillar2.corrosive.name=Betonte korrosive Steinsäule -tile.bloodmagic.pillar2.destructive.name=Betonte zerstörerische Steinsäule -tile.bloodmagic.pillar2.vengeful.name=Betonte rachsüchtige Steinsäule -tile.bloodmagic.pillar2.steadfast.name=Betonte standhafte Steinsäule - -tile.bloodmagic.pillarCap1.raw.name=Kapitell der rohen Steinsäule -tile.bloodmagic.pillarCap1.corrosive.name=Kapitell der korrosiven Steinsäule -tile.bloodmagic.pillarCap2.destructive.name=Kapitell der zerstörerischen Steinsäule -tile.bloodmagic.pillarCap2.vengeful.name=Kapitell der rachsüchtigen Steinsäule -tile.bloodmagic.pillarCap3.steadfast.name=Kapitell der standhaften Steinsäule - -tile.bloodmagic.wall1.brick_raw.name=Rohe Steinziegelmauer -tile.bloodmagic.wall1.brick_corrosive.name=Korrosive Steinziegelmauer -tile.bloodmagic.wall1.brick_destructive.name=Zerstörerische Steinziegelmauer -tile.bloodmagic.wall1.brick_vengeful.name=Rachsüchtige Steinziegelmauer -tile.bloodmagic.wall1.brick_steadfast.name=Standhafte Steinziegelmauer -tile.bloodmagic.wall1.smallbrick_raw.name=Rohe Steinmauer mit kleinen Ziegeln -tile.bloodmagic.wall1.smallbrick_corrosive.name=Korrosive Steinmauer mit kleinen Ziegeln -tile.bloodmagic.wall1.smallbrick_destructive.name=Zerstörerische Steinmauer mit kleinen Ziegeln -tile.bloodmagic.wall1.smallbrick_vengeful.name=Rachsüchtige Steinmauer mit kleinen Ziegeln -tile.bloodmagic.wall1.smallbrick_steadfast.name=Standhafte Steinmauer mit kleinen Ziegeln -tile.bloodmagic.wall1.large_raw.name=Rohe Steinmauer -tile.bloodmagic.wall1.large_corrosive.name=Korrosive Steinmauer -tile.bloodmagic.wall1.large_destructive.name=Zerstörerische Steinmauer -tile.bloodmagic.wall1.large_vengeful.name=Rachsüchtige Steinmauer -tile.bloodmagic.wall1.large_steadfast.name=Standhafte Steinmauer - -tile.bloodmagic.stairs1.raw.name=Rohe Steintreppe -tile.bloodmagic.stairs1.corrosive.name=Korrosive Steintreppe -tile.bloodmagic.stairs2.destructive.name=Zerstörerische Steintreppe -tile.bloodmagic.stairs2.vengeful.name=Rachsüchtige Steintreppe -tile.bloodmagic.stairs3.steadfast.name=Standhafte Steintreppe - -# Fluids -fluid.lifeEssence=Lebensessenz - -# HUD -hud.bloodmagic.inactive=Inactive - -# Tooltips -tooltip.bloodmagic.extraInfo=&9-Halte Shift für mehr Info- - -tooltip.bloodmagic.orb.desc=Speichert Lebensessenz -tooltip.bloodmagic.orb.owner=Hinzugefügt durch: %s -tooltip.bloodmagic.currentOwner=Eigentümer: %s -tooltip.bloodmagic.currentTier=Momentane Ausbaustufe: %d -tooltip.bloodmagic.config.disabled=Zurzeit durch Konfiguration deaktiviert -tooltip.bloodmagic.tier=Ausbaustufe %d - -tooltip.bloodmagic.activated=Aktiviert -tooltip.bloodmagic.deactivated=Deaktiviert - -tooltip.bloodmagic.activation_crystal.awakened=Aktiviert mächtigere Rituale -tooltip.bloodmagic.activation_crystal.creative=Kreativmodus: Aktiviert jedes Ritual -tooltip.bloodmagic.activation_crystal.weak=Aktiviert niedrig-levelige Rituale - -tooltip.bloodmagic.sigil.air.desc=&oIch fühl mich schon leichter... -tooltip.bloodmagic.sigil.compression.desc=&oDiamanthände -tooltip.bloodmagic.sigil.divination.desc=&oSpähe in die Seele -tooltip.bloodmagic.sigil.divination.otherNetwork=Peering into the soul of %s -tooltip.bloodmagic.sigil.divination.currentAltarTier=Ausbaustufe: %d -tooltip.bloodmagic.sigil.divination.currentEssence=Gespeicherte Lebensessenz: %d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=Maximale Kapazität: %d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=Momentane Gelassenheit: %d -tooltip.bloodmagic.sigil.divination.currentInversion=Momentane Inversion: %d -tooltip.bloodmagic.sigil.divination.currentBonus=Momentaner Bonus: +%d%% -tooltip.bloodmagic.sigil.water.desc=&oHat jemand nach unendlichem Wasser gefragt? -tooltip.bloodmagic.sigil.lava.desc=&oHEISS! NICHT ESSEN! -tooltip.bloodmagic.sigil.void.desc=&oBesser als Swiffer®! -tooltip.bloodmagic.sigil.magnetism.desc=&oIch habe eine anziehende Persönlichkeit -tooltip.bloodmagic.sigil.suppression.desc=&oBesser als Telekinese -tooltip.bloodmagic.sigil.haste.desc=&o42 Dosen Koffein später... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oAchtung! Fallende Feuerfische -tooltip.bloodmagic.sigil.seer.desc=&oWenn allsehend nicht genug ist -tooltip.bloodmagic.sigil.seer.currentAltarProgress=Fortschritt: %d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=Fortschritt: %s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=Verbrauch: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=Ausbaustufe: %d -tooltip.bloodmagic.sigil.seer.currentEssence=Gespeicherte Lebensessenz: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=Maximale Kapazität: %d LP -tooltip.bloodmagic.sigil.seer.currentCharge=Ladung: %d -tooltip.bloodmagic.sigil.seer.currentTranquility=Momentane Gelassenheit: %d -tooltip.bloodmagic.sigil.seer.currentBonus=Momentaner Bonus: +%d%% -tooltip.bloodmagic.sigil.whirlwind.desc=&oBesser keinen Rock tragen -tooltip.bloodmagic.sigil.teleposition.desc=Das ist beinahe ein bewegender Moment. -tooltip.bloodmagic.sigil.transposition.desc=Spüre die Stärke der Macht, mein junger Schüler. -tooltip.bloodmagic.sigil.holding.press=Drücke &o%s&r&7 zum ändern -tooltip.bloodmagic.sigil.holding.desc=Gesiegelte Siegel -tooltip.bloodmagic.sigil.holding.sigilInSlot=Platz %d: %s -tooltip.bloodmagic.sigil.blood_light.desc=&oIch sehe ein Licht! -tooltip.bloodmagic.sigil.ender_severance.desc=&oBringt Endermen in Notlage -tooltip.bloodmagic.sigil.fast_miner.desc=&oHacke wie ein Weltmeister -tooltip.bloodmagic.sigil.green_grove.desc=&oUmweltverträglich -tooltip.bloodmagic.sigil.phantom_bridge.desc=&oLaufen auf dünner Luft... - -tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Erhöht die maximalen Punkte der Lebenden Rüstung auf %d. - -tooltip.bloodmagic.bound.sword.desc=&oSchlachten der Schwachen -tooltip.bloodmagic.bound.pickaxe.desc=&oSteinzerstörung ohne Erbarmen -tooltip.bloodmagic.bound.axe.desc=&oDämonischer Kahlschlag -tooltip.bloodmagic.bound.shovel.desc=&oSchrubbt den Dreck vom Boden - -tooltip.bloodmagic.sacrificialDagger.desc=Schon ein Stich in den Finger genügt -tooltip.bloodmagic.sacrificialDagger.creative=Rechtsklicke einen Altar während du kriechst, um diesen zu füllen -tooltip.bloodmagic.slate.desc=Stein getränkt im Blutaltar -tooltip.bloodmagic.inscriber.desc=Die Zeichen sind an der Wand... - -tooltip.bloodmagic.pack.selfSacrifice.desc=Es scheuert richtig... -tooltip.bloodmagic.pack.sacrifice.desc=Beschreibung -tooltip.bloodmagic.pack.stored=Enthält: %d LP - - -tooltip.bloodmagic.diviner.currentRitual=Ritual: -tooltip.bloodmagic.diviner.blankRune=Leere Runen: %d -tooltip.bloodmagic.diviner.waterRune=Wasserrunen: %d -tooltip.bloodmagic.diviner.airRune=Luftrunen: %d -tooltip.bloodmagic.diviner.fireRune=Feuerrunen: %d -tooltip.bloodmagic.diviner.earthRune=Erdrunen: %d -tooltip.bloodmagic.diviner.duskRune=Runen der Abenddämmerung: %d -tooltip.bloodmagic.diviner.dawnRune=Runen der Morgendämmerung: %d -tooltip.bloodmagic.diviner.totalRune=Runen insgesamt: %d -tooltip.bloodmagic.diviner.extraInfo=Halte Shift für extra Info -tooltip.bloodmagic.diviner.extraExtraInfo=&9-Halte Shift + M für Augmentationsinfo- -tooltip.bloodmagic.diviner.currentDirection=Richtung: %s - -tooltip.bloodmagic.ritualReader.currentState=Modus: %s -tooltip.bloodmagic.ritualReader.set_area=Definiere Gebiet -tooltip.bloodmagic.ritualReader.information=Information -tooltip.bloodmagic.ritualReader.set_will_types=Setze verbrauchten Willen -tooltip.bloodmagic.ritualReader.desc.set_area=Rechtsklick auf einen aktiven Meisterritualstein, um auszuwählen, welches Gebiet vom Ritual modifiziert werden soll. Dann klicke auf zwei gegenüberliegende Ecken, um das neue Gebiet zu definieren. -tooltip.bloodmagic.ritualReader.desc.information=Rechtsklick auf einen aktiven Meisterritualstein, um Informationen über das Ritual anzuzeigen. -tooltip.bloodmagic.ritualReader.desc.set_will_types=Setze durch einen Rechtsklick auf den MRS mit den jeweiligen Kristallen die Aspekte dämonischen Willens, die das Ritual über die Aura aufnimmt. - -tooltip.bloodmagic.arcaneAshes=Asche gebraucht für einen alchemischen Kreis - -tooltip.bloodmagic.telepositionFocus.coords=Koordinaten: (%d, %d, %d) -tooltip.bloodmagic.telepositionFocus.dimension=Dimensions-ID: %d -tooltip.bloodmagic.telepositionFocus.bound=Bound: %s at %d, %d, %d -tooltip.bloodmagic.telepositionFocus.weak=Benutzt, um Blöcke zu teleportieren -tooltip.bloodmagic.telepositionFocus.enhanced=Benutzt, um Blöcke zu teleportieren -tooltip.bloodmagic.telepositionFocus.reinforced=Benutzt, um Blöcke zu teleportieren -tooltip.bloodmagic.telepositionFocus.demonic=Benutzt, um Blöcke zu teleportieren - -tooltip.bloodmagic.livingArmour.upgrade.speed=Schnelle Füße -tooltip.bloodmagic.livingArmour.upgrade.digging=Zwergenhafte Stärke -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=Giftresistenz -tooltip.bloodmagic.livingArmour.upgrade.fireResist=Gabe des Feuers -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Zähe Handballen -tooltip.bloodmagic.livingArmour.upgrade.knockback=Body Builder -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=Zähe Haut -tooltip.bloodmagic.livingArmour.upgrade.health=Gesund -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Heftiger Schlag -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Trickschuss -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Stufenhilfe -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Sprint des Sensenmanns -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Solarbetrieben -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=Runenschild -tooltip.bloodmagic.livingArmour.upgrade.revealing=Aufdeckend -tooltip.bloodmagic.livingArmour.upgrade.experienced=Erfahren -tooltip.bloodmagic.livingArmour.upgrade.jump=Starke Beine -tooltip.bloodmagic.livingArmour.upgrade.fallProtect=Weicher Fall -tooltip.bloodmagic.livingArmour.upgrade.graveDigger=Totengräber -tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=Sturmangriff -tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=Gezielter Angriff -tooltip.bloodmagic.livingArmour.upgrade.elytra=Elytra -tooltip.bloodmagic.livingArmour.upgrade.nightSight=Nachtwandler -tooltip.bloodmagic.livingArmour.upgrade.repair=Reparierend - - -tooltip.bloodmagic.livingArmour.upgrade.slowness=Humpelnd -tooltip.bloodmagic.livingArmour.upgrade.crippledArm=Verkümmerter Arm -tooltip.bloodmagic.livingArmour.upgrade.slippery=Schlittern -tooltip.bloodmagic.livingArmour.upgrade.battleHunger=Bluthunger -tooltip.bloodmagic.livingArmour.upgrade.quenched=Löschend -tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=Stumpfe Klinge -tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=Schwache Spitzhacke -tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=Sturmtruppe -tooltip.bloodmagic.livingArmour.upgrade.slowHeal=Verseucht -tooltip.bloodmagic.livingArmour.upgrade.disoriented=Disorientiert - -tooltip.bloodmagic.livingArmour.upgrade.level=%s (Level %d) -tooltip.bloodmagic.livingArmour.upgrade.progress=%s (%d/100) -tooltip.bloodmagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s - -tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Halte Shift + M für Fortschrittsinfo- - -tooltip.bloodmagic.will=Willensqualität: %1$,.2f -tooltip.bloodmagic.sentientSword.desc=Benutzt Dämonenwille um volles Potential freizusetzen -tooltip.bloodmagic.sentientAxe.desc=Benutzt Dämonenwille um volles Potential freizusetzen -tooltip.bloodmagic.sentientPickaxe.desc=Benutzt Dämonenwille um volles Potential freizusetzen -tooltip.bloodmagic.sentientShovel.desc=Benutzt Dämonenwille um volles Potential freizusetzen -tooltip.bloodmagic.soulGem.petty=Ein Juwel, das eine winzige Menge an Willen aufnehmen kann -tooltip.bloodmagic.soulGem.lesser=Ein Juwel, das ein wenig Willen festhalten kann -tooltip.bloodmagic.soulGem.common=Ein Juwel, das eine ordentliche Menge an Willen aufnehmen kann -tooltip.bloodmagic.soulGem.greater=Ein Juwel, das eine größere Menge an Willen aufnehmen kann -tooltip.bloodmagic.soulGem.grand=Ein Juwel, das eine große Menge an Willen aufnehmen kann -tooltip.bloodmagic.soulSnare.desc=Werfe nach einem Monster und töte es anschließend, um seinen Dämonischen Willen zu erhalten - -tooltip.bloodmagic.itemFilter.exact=Stellt sicher, dass die Gegenstände genau übereinstimmen -tooltip.bloodmagic.itemFilter.ignoreNBT=Ignoriert NBT des Filters -tooltip.bloodmagic.itemFilter.modItems=Erlaubt alle Gegenstände der gleichen Mod -tooltip.bloodmagic.itemFilter.oreDict=Filtert durch das Ore Dictionary - -tooltip.bloodmagic.fluidFilter.exact=Filtert Flüssigkeitseingang/-ausgang - -tooltip.bloodmagic.fluid.type=Enthaltene Flüssigkeit: %s -tooltip.bloodmagic.fluid.amount=Menge: %d / %d mB -tooltip.bloodmagic.fluid.capacity=Kapazität: %d mB - -tooltip.bloodmagic.ghost.everything=Alles -tooltip.bloodmagic.ghost.amount=Geistergegenstandsanzahl: %d - -tooltip.bloodmagic.currentType.default=Enthält: Roher Wille -tooltip.bloodmagic.currentType.corrosive=Enthält: Korrosiver Wille -tooltip.bloodmagic.currentType.destructive=Enthält: Zerstörerischer Wille -tooltip.bloodmagic.currentType.vengeful=Enthält: Rachsüchtiger Wille -tooltip.bloodmagic.currentType.steadfast=Enthält: Standhafter Wille - -tooltip.bloodmagic.currentBaseType.default=Roh -tooltip.bloodmagic.currentBaseType.corrosive=Korrosiv -tooltip.bloodmagic.currentBaseType.destructive=Zerstörerisch -tooltip.bloodmagic.currentBaseType.vengeful=Rachsüchtig -tooltip.bloodmagic.currentBaseType.steadfast=Standhaft - -tooltip.bloodmagic.experienceTome=Ein Buch, um Erfahrung zu sammeln -tooltip.bloodmagic.experienceTome.exp=Exp: %0.3f -tooltip.bloodmagic.experienceTome.expLevel=Level: %d - -tooltip.bloodmagic.decoration.safe=Sicher als Dekoration -tooltip.bloodmagic.decoration.notSafe=Gefährlich als Dekoration - -tooltip.bloodmagic.cuttingFluidRatio=%d/%d Nutzungen verbleibend - -tooltip.bloodmagic.potion.uses=%d Nutzungen verbleibend - -tooltip.bloodmagic.book.shifting=Diese Symbole scheinen sich zu... &overändern... - -tooltip.bloodmagic.willGauge=Ein merkwürdiges Gerät, das dämonischen Willen in der Aura messen kann. - -# Ritual -ritual.bloodmagic.blockRange.tooBig=Das Gebiet ist zu groß! Darf höchstens %s Blöcke groß sein. -ritual.bloodmagic.blockRange.tooFar=Das Gebiet ist zu weit! Muss in einer vertikalen Reichweite von %s Blöcken und einer horizontalen Reichweite von %s Blöcken sein. -ritual.bloodmagic.blockRange.inactive=Das Ritual ist inaktiv, das Gebiet kann nicht verändert werden. -ritual.bloodmagic.blockRange.noRange=Das Gebiet wurde nicht richtig ausgewählt. -ritual.bloodmagic.blockRange.firstBlock=Erster Block des neuen Gebietes gesetzt. -ritual.bloodmagic.blockRange.success=Neues Gebiet erfolgreich gesetzt! -ritual.bloodmagic.willConfig.set=Das Ritual wird den folgenden Typ dämonischen Willens nutzen: %s -ritual.bloodmagic.willConfig.void=Das Ritual nutzt keinen Willen mehr. - -ritual.bloodmagic.testRitual=Testritual -ritual.bloodmagic.waterRitual=Ritual der vollen Quelle -ritual.bloodmagic.lavaRitual=Serenade des Nethers -ritual.bloodmagic.greenGroveRitual=Ritual des grünen Hains -ritual.bloodmagic.jumpRitual=Ritual des hohen Sprungs -ritual.bloodmagic.wellOfSufferingRitual=Quelle des Leidens -ritual.bloodmagic.featheredKnifeRitual=Ritual der federnden Klinge -ritual.bloodmagic.regenerationRitual=Ritual der Regeneration -ritual.bloodmagic.harvestRitual=Ritual der Mondernte -ritual.bloodmagic.magneticRitual=Ritual des Magnetismus -ritual.bloodmagic.crushingRitual=Ritual des Brechers -ritual.bloodmagic.fullStomachRitual=Ritual des gefüllten Magens -ritual.bloodmagic.interdictionRitual=Ritual der Verbietung -ritual.bloodmagic.containmentRitual=Ritual der Eindämmung -ritual.bloodmagic.speedRitual=Ritual der Geschwindigkeit -ritual.bloodmagic.suppressionRitual=Ritual der Verdrängung -ritual.bloodmagic.expulsionRitual=Aura der Vertreibung -ritual.bloodmagic.zephyrRitual=Ruf des Zephyrs -ritual.bloodmagic.upgradeRemoveRitual=Klang der reinigenden Seele -ritual.bloodmagic.armourEvolveRitual=Ritual der lebenden Evolution -ritual.bloodmagic.animalGrowthRitual=Ritual des Hirten -ritual.bloodmagic.forsakenSoulRitual=Versammlung der verlassenen Seelen -ritual.bloodmagic.crystalHarvestRitual=Riss des gebrochenen Kristalls -ritual.bloodmagic.meteorRitual=Zeichen des fallenden Turms -ritual.bloodmagic.ellipseRitual=Fokus der Ellipse -ritual.bloodmagic.cobblestoneRitual=Ritual des gefrorenen Vulkans -ritual.bloodmagic.placerRitual=Füllung der Grube -ritual.bloodmagic.fellingRitual=Kahlschlag des Holzfällers -ritual.bloodmagic.pumpRitual=Hymne der Absaugung -ritual.bloodmagic.altarBuilderRitual=Die Zusammensetzung des hohen Altares -ritual.bloodmagic.portalRitual=Das Tor der Faltung -ritual.bloodmagic.downgradeRitual=Sühne der belasteten Seele -ritual.bloodmagic.crystalSplitRitual=Resonanz des facettierten Kristalls -ritual.bloodmagic.condorRitual=Reverence of the Condor -ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul -ritual.bloodmagic.groundingRitual=Ritual of Grounding -ritual.bloodmagic.featheredEarthRitual=Ritual of the Feathered Earth -ritual.bloodmagic.veilOfEvilRitual=Veil of Evil -ritual.bloodmagic.wardOfSacrosanctityRitual=Ward of Sacrosanctity - -ritual.bloodmagic.waterRitual.info=Generiert eine Wasserquelle auf dem Meisterritualstein. -ritual.bloodmagic.lavaRitual.info=Generiert eine Lavaquelle auf dem Meisterritualstein. -ritual.bloodmagic.lavaRitual.default.info=(Roh) Verringert die LP-Kosten der Lava und erlaubt die Platzierung in einem Tank. -ritual.bloodmagic.lavaRitual.corrosive.info=(Korrosiv) Objekte in Reichweite, die immun gegen Feuer sind nehmen hohen Schaden. -ritual.bloodmagic.lavaRitual.destructive.info=(Zerstörerisch) Lava Platzierungsweite ist basierend auf der Menge an Wille erhöht. -ritual.bloodmagic.lavaRitual.vengeful.info=(Rachsüchtig) Objekte in Reichweite werden mit dem Effekt Fire Fuse betroffen. -ritual.bloodmagic.lavaRitual.steadfast.info=(Standhaft) Spieler in einer gesetzten Reichweite bekommen Feuerresistenz. - -ritual.bloodmagic.greenGroveRitual.info=Beschleunigt das Pflanzenwachstum. -ritual.bloodmagic.jumpRitual.info=Objekte in Reichweite werden in die Luft gestoßen. -ritual.bloodmagic.wellOfSufferingRitual.info=Fügt Monstern im Gebiet Schaden zu und füllt damit LP in den Blutaltar. -ritual.bloodmagic.featheredKnifeRitual.info=Entzieht Spielern in Reichweite Leben und führt dem Blutaltar LP zu. -ritual.bloodmagic.regenerationRitual.info=Gibt allen Objekten in Reichweite den Regenerations-Effekt, wenn ihnen Leben fehlt. -ritual.bloodmagic.regenerationRitual.default.info=(Roh) -ritual.bloodmagic.regenerationRitual.corrosive.info=(Korrosiv) Stiehlt Leben von Monstern in Reichweite des Vampirismus-Effekts und führt es Spielern direkt zu. -ritual.bloodmagic.regenerationRitual.destructive.info=(Zerstörerisch) -ritual.bloodmagic.regenerationRitual.vengeful.info=(Rachsüchtig) -ritual.bloodmagic.regenerationRitual.steadfast.info=(Standhaft) -ritual.bloodmagic.harvestRitual.info=Erntet Pflanzen in Reichweite und lässt die Erträge auf den Boden fallen. -ritual.bloodmagic.magneticRitual.info=Zieht Erze aus dem Boden un platziert sie in Reichweite des Rituals. -ritual.bloodmagic.crushingRitual.info=Bricht Blöcke in Reichweite und platziert die Gegenstände in einer verbundenen Truhe. -ritual.bloodmagic.crushingRitual.destructive.info=(Zerstörerisch) Die Blöcke werden mit großer Kraft zerstört: Alle Blöcke sind mit Glück III betroffen. -ritual.bloodmagic.crushingRitual.steadfast.info=(Standhaft) Alle zerstörten Blöcke sind mit Behutsamkeit betroffen. Ãœberschreibt Glück falls anwendbar. -ritual.bloodmagic.crushingRitual.corrosive.info=(Korrosiv) Alle Blöcke werden mit einer Art Schneidelösung betroffen. Ãœberschreibt Behutsamkeit falls anwendbar. -ritual.bloodmagic.crushingRitual.vengeful.info=(Rachsüchtig) Komprimiert das Inventar bei einer erfolgreichen Operation. Momentan nur eine Kompression per Operation. -ritual.bloodmagic.crushingRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen. -ritual.bloodmagic.greenGroveRitual.corrosive.info=(Korrosiv) Objekte in Reichweite werden von Pflanzen attackiert, wodurch ihr Leben entzogen wird. -ritual.bloodmagic.greenGroveRitual.default.info=(Roh) Erhöht die Geschwindigkeit aller Operationen des Rituals basierend auf dem vorhandenen Willen in der Aura. -ritual.bloodmagic.greenGroveRitual.vengeful.info=(Rachsüchtig) Erhöht die Chance, dass ein Wachstumstick erfolgreich ist. -ritual.bloodmagic.greenGroveRitual.steadfast.info=(Standhaft) Samen werden neu gepflanzt und Blöcke in Reichweite werden bewässert. -ritual.bloodmagic.greenGroveRitual.destructive.info=(Zerstörerisch) Wachstumsreichweite wird basierend auf vorhandenen Willen erhöht. -ritual.bloodmagic.featheredKnifeRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen. -ritual.bloodmagic.featheredKnifeRitual.destructive.info=(Zerstörerisch) Erhöht den Ertrag des Rituals basierend auf dem vorhandenen Willen. -ritual.bloodmagic.featheredKnifeRitual.vengeful.info=(Rachsüchtig) Setzt die Mindestlebenspunkte für die Opferung auf 10%%. Wird von Standhaft für den Besitzer überschrieben, wenne es aktiv ist. -ritual.bloodmagic.featheredKnifeRitual.corrosive.info=(Korrosiv) Nutzt den Bonus des Räucheraltars, um den Ertrag der Opferung zu erhöhen. -ritual.bloodmagic.featheredKnifeRitual.steadfast.info=(Standhaft) Erhöht die Mindestlebenspunkte für die Opferung von 30%% to 70%%. -ritual.bloodmagic.speedRitual.default.info=(Roh) Erhöht die Geschwindigkeit basierend auf vorhandenen Willen. -ritual.bloodmagic.speedRitual.vengeful.info=(Rachsüchtig) Verhindert, dass erwachsene Mobs und Spieler transportiert werden. Spieler werden transportiert, wenn es mit Zerstörerisch kombiniert wird. -ritual.bloodmagic.speedRitual.destructive.info=(Zerstörerisch) Verhindert, dass Kindmobs und Spieler transportiert werden. Spieler werden transportiert, wenn es mit Rachsüchtig kombiniert wird. -ritual.bloodmagic.animalGrowthRitual.vengeful.info=(Rachsüchtig) Verringert die Zeit zwischen Deckungen. -ritual.bloodmagic.animalGrowthRitual.steadfast.info=(Standhaft) Züchtet Erwachsene im Gebiet automatisch mit Gegenständen aus einer verbundenen Truhe. -ritual.bloodmagic.animalGrowthRitual.default.info=(Roh) Erhöht die Geschwindigkeit des Rituals basierend auf dem vorhandenen Willen in der Aura. -ritual.bloodmagic.animalGrowthRitual.destructive.info=(Zerstörerisch) Lässt Erwachsene, die sich länger nicht mehr gedeckt haben, auf Monster zulaufen und explodieren. -ritual.bloodmagic.animalGrowthRitual.corrosive.info=(Korrosiv) Nicht implementiert. -ritual.bloodmagic.groundingRitual.info=Forces entities on the ground and prevents jumping. -ritual.bloodmagic.groundingRitual.default.info=(Raw) Affects players. -ritual.bloodmagic.groundingRitual.corrosive.info=(Corrosive) Disables gravity (+Vengeful) Applies Levitation. -ritual.bloodmagic.groundingRitual.destructive.info=(Destructive) Applies Heavy Heart (increases fall damage) (+Vengeful) Stronger effect. -ritual.bloodmagic.groundingRitual.steadfast.info=(Steadfast) Affects Bosses. Doesn't affect bosses that are immune against motion change or immune against potions (except Wither and Ender Dragon). -ritual.bloodmagic.groundingRitual.vengeful.info=(Vengeful) Makes effects stronger. (+Corrosive) Applies Levitation. (+Destructive) Higher Heavy Heart amplifier. -ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. -ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. - -ritual.bloodmagic.crystalSplitRitual.info=Spaltet eine ausgewachsene rohe Kristallgruppe in die Aspekte auf. -ritual.bloodmagic.fullStomachRitual.info=Entfernt Essen aus der verbundenen Truhe, um die Sättigung des Spielers zu füllen. -ritual.bloodmagic.interdictionRitual.info=Stößt alle Mobs im Gebiet weg vom Meisterritualstein. -ritual.bloodmagic.containmentRitual.info=Zieht alle Mobs im Gebiet zum Meisterritualstein. -ritual.bloodmagic.speedRitual.info=Stößt Spieler im Gebiet in Richtung des Rituals -ritual.bloodmagic.suppressionRitual.info=Verdrängt Flüssigkeiten im Ritualbereich - das Deaktivieren des Rituals bringt die Flüssigkeiten wieder zurück. -ritual.bloodmagic.expulsionRitual.info=Teleportiert Spieler, die weder Besitzer des Rituals sind, noch eine gebundene Blutkugel in einer verbundenen Truhe haben, weg vom Ritual. -ritual.bloodmagic.zephyrRitual.info=Nimmt in der nähe befindliche Gegenstände auf und platziert sie in der verbundenen Truhe. -ritual.bloodmagic.upgradeRemoveRitual.info=Entfernt alle Eigenschaften von der Lebenden Rüstung und gibt die dazugehörigen Thesen. Diese können benutzt werden, um sie wieder der Lebenden Rüstung hinzuzufügen. -ritual.bloodmagic.armourEvolveRitual.info=Erhöht das Maximum verfügbarer Upgrade-Punkte der Lebenden Rüstung auf 300. -ritual.bloodmagic.animalGrowthRitual.info=Erhöht die Wachstumsgeschwindigkeit nahegelegener Tiere, die noch nicht erwachsen sind. -ritual.bloodmagic.forsakenSoulRitual.info=Fügt Mobs im Gebiet Schaden zu. Wenn ein Mob stirbt, wird ein Kristall in der Kristlalreichweite wachsen. -ritual.bloodmagic.crystalHarvestRitual.info=Zerstört Kristalle dämonischen Willes in Reichweite. Die Erträge werden auf den Kristallen fallen gelassen. -ritual.bloodmagic.placerRitual.info=Nimmt sich Blöcke aus dem verbundenen Inventar und platziert sie in der Welt. -ritual.bloodmagic.fellingRitual.info=Zerstört alle Bäume (ihr Holz und Blätter) in einem Gebiet und platziert die Erträge in einem verbundenen Inventar. -ritual.bloodmagic.pumpRitual.info=Sucht im definierten Gebiet nach Flüssigkeiten. Entfernt und platziert die Flüssigkeiten nur in einem verbundenen Tank, wenn dieser bereits mindestens mit einem Eimer der Flüssigkeit gefüllt ist. -ritual.bloodmagic.altarBuilderRitual.info=Baut einen Altar aus den Materialien im verbundenen Altar. -ritual.bloodmagic.portalRitual.info=Erstellt ein Portalnetzwerk basierend auf dem aktivierenden Spieler und Blöcke, die sich in direkter Umgebung des Rituals befinden. Blöcke können nach aktivierung des Portals verändert werden, ohne das Netzwerk zu ändern und portale mit dem gleichen "Schlüssel" verbinden sich miteinander. -ritual.bloodmagic.meteorRitual.info=Konsumiert einen Gegenstand in Reichweite um einen Meteor voller Ressourcen vom Himmel zu beschwören, welcher direkt auf das Ritual fällt. - -ritual.bloodmagic.waterRitual.waterRange.info=(Wasser) Das Gebiet, in dem das Ritual Wasser-Quellblöcke platzieren wird. -ritual.bloodmagic.waterRitual.waterTank.info=(Roh) Der von dem Ritual mit Wasser zu befüllende Tank. -ritual.bloodmagic.lavaRitual.lavaRange.info=(Lava) Das Gebiet, in dem das Ritual Lava-Quellblöcke platzieren wird -ritual.bloodmagic.lavaRitual.lavaTank.info=(Roh) Der von dem Ritual mit Lava zu befüllende Tank. -ritual.bloodmagic.lavaRitual.fireFuse.info=(Rachsüchtig) Objekte in diesem Gebiet erhalten den "Fire Fuse"-Effekt. -ritual.bloodmagic.lavaRitual.fireResist.info=(Standhaft) Spieler in diesem Gebiet erhalten Feuerresistenz. -ritual.bloodmagic.lavaRitual.fireDamage.info=(Korrosiv) Objekte in diesem Gebiet, die immun gegen Feuerschaden sind, nehmen Schaden proportional zum vorhandenem Willen. -ritual.bloodmagic.greenGroveRitual.growing.info=(Wachstum) Das Gebiet, in dem das Ritual Pflanzen wachsen lässt. -ritual.bloodmagic.greenGroveRitual.leech.info=(Korrosiv) Objekte in diesem Gebiet wird Leben entzogen, um die Pflanzen wachsen zu lassen. -ritual.bloodmagic.greenGroveRitual.hydrate.info=(Standhaft) Blöcke in diesem gebiet werden zu Farmland bewässert und Samen in diesem Gebiet werden in der Nähe gepflanzt. -ritual.bloodmagic.jumpRitual.jumpRange.info=(Springen) Objekte in diesem Gebiet werden in die Luft gestoßen. -ritual.bloodmagic.wellOfSufferingRitual.altar.info=(Altar) In diesem Gebiet sucht das Ritual nach dem Blutaltar. Eine Veränderung wird das Gebiet entweder vergrößern oder verringern. -ritual.bloodmagic.wellOfSufferingRitual.damage.info=(Schaden) Dieses Gebiet definiert, wo Mobs schaden nehmen. Alle Mobs in diesem gebiet (außer dem Spieler) werden Schaden über Zeit nehmen. -ritual.bloodmagic.featheredKnifeRitual.altar.info=(Altar) In diesem Gebiet sucht das Ritual nach dem Blutaltar. Eine Veränderung wird das Gebiet entweder vergrößern oder verringern. -ritual.bloodmagic.featheredKnifeRitual.damage.info=(Schaden) In diesem Gebiet wird den Spielern Schaden durch das Ritual zugefügt. Spieler innerhalb des Gebietes nehmen Schaden über Zeit bis zum gesetzten Limit. -ritual.bloodmagic.regenerationRitual.heal.info=(Heilung) Objekte innerhalb dieses Gebietes bekommen einen Regenerationseffekt. -ritual.bloodmagic.regenerationRitual.vampire.info=(Vampirismus) Mobs innerhalb des Gebiets wird Leben entzogen um den Spieler im Heilgebiet zu heilen. -ritual.bloodmagic.harvestRitual.harvestRange.info=(Ernte) Pflanzen in diesem Gebiet werden geerntet. -ritual.bloodmagic.magneticRitual.placementRange.info=(Platzierung) Das Gebiet, in das das Ritual die gesammelten Erze platziert. -ritual.bloodmagic.crushingRitual.crushingRange.info=(Brecher) Die Blöcke, die von dem Ritual zerstört werden. -ritual.bloodmagic.crushingRitual.chest.info=(Truhe) Die Position der Truhe, in die die zerstörten Blöcke platziert werden. -ritual.bloodmagic.fullStomachRitual.fillRange.info=(Fütterung) Das Gebiet, in dem das Ritual nach Spielern sucht, die gefüttert werden. -ritual.bloodmagic.fullStomachRitual.chest.info=(Truhe) Die Position des Inventars, aus dem das Ritual Essen nimmt, um Spieler in Reichweite zu füttern. -ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Stoßen) Das Gebiet, in dem Mobs weggestoßen werden. Alle Mobs werden vom Meisterritualstein weggestoßen, egal wo sich das Gebiet befindet. -ritual.bloodmagic.containmentRitual.containmentRange.info=(Eindämmung) Das Gebiet, in dem Mobs herangezogen werden. Alle Mobs werden vom Meisterritualstein weggestoßen, egal wo sich das Gebiet befindet. -ritual.bloodmagic.speedRitual.sanicRange.info=(Geschwindigkeit) Alle Objekte in diesem Gebiet werden in die Richtung des Pfeils, der vom Ritual geformt wurde, katapultiert. -ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Verdrängung) Alle Flüssigkeiten im Gebiet werden verdrängt. -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Vertreibung) Das Gebiet, in dem Spieler, die nicht Besitzer sind und keine Blutkugel in der Truhe haben, wegteleportiert werden. -ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Saugen) Gegenstände in diesem Gebiet werden in die verbundene Truhe gesaugt. -ritual.bloodmagic.zephyrRitual.chest.info=(Truhe) Die Position der Truhe, in die aufgenommene Gegenstände platziert werden. -ritual.bloodmagic.animalGrowthRitual.growing.info=(Wachstum) Tiere in diesem Gebiet werden wesentlich schneller wachsen. -ritual.bloodmagic.animalGrowthRitual.chest.info=(Truhe) Truhe mit Gegenständen, die für das Züchten verwendet werden, falls das Ritual dementsprechend verbessert wurde. -ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Kristall) Dämonenkristalle in diesem Gebiet wachsen schneller wenn ein Mob vom Ritual getötet wurde. -ritual.bloodmagic.forsakenSoulRitual.damage.info=(Schaden) Mobs in diesem Gebiet nehmen langsam schaden und lassen einen Kristall wachsen, wenn sie durch das Ritual sterben. -ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Kristall) Von allen Dämonenkristallgruppen wird ein Kristall abgebrochen, der Gegenstand wird in der Welt fallengelassen. Sollte in der Gruppe nur noch ein Kristall sein, wird dieser nicht abgebrochen. - -ritual.bloodmagic.ellipseRitual.info=Erzeugt eine hohle Spähre um das Ritual mit den Blöcken in der verbundenen Truhe. -ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Platzierung) Das Gebiet, in dem Blöcke platziert werden. Die Sphäre ist auf das Ritual zentriert - falls eine Seite kürzer als die andere ist, wird die Sphäre an der kürzeren Seite abgeschnitten. -ritual.bloodmagic.ellipseRitual.chest.info=(Truhe) Die Position des Inventars, von dem sich das Ritual die zu platzierenden Blöcke holt. - -ritual.bloodmagic.placerRitual.placerRange.info=(Platzierung) Das Gebiet, in das das Ritual die Blöcke platziert. -ritual.bloodmagic.placerRitual.chest.info=(Truhe) Die Position des Inventars, von dem sich das Ritual die zu platzierenden Blöcke holt. -ritual.bloodmagic.fellingRitual.fellingRange.info=(Fällung) Das Gebiet, in dem das Ritual nach Baumstämmen und Blättern sucht, um sie zu Fällen. -ritual.bloodmagic.fellingRitual.chest.info=(Truhe) Die Position des Inventars, in das die Gegenstände gesetzt werden, die vom Ritual gesammelt wurden. -ritual.bloodmagic.pumpRitual.pumpRange.info=(Pumpe) Das Gebiet, in dem das Ritual nach aufnehmbaren Flüssigkeiten sucht. - -ritual.bloodmagic.downgradeRitual.dialogue.bow.1=Also, Sterblicher... Du verlangst nach mehr Macht...? -ritual.bloodmagic.downgradeRitual.dialogue.bow.100=Natürlich wirst du wissen, dass alles einen Preis hat... Ich kann dir nicht einfach mehr Macht geben, ohne dass du etwas dafür zahlen musst... -ritual.bloodmagic.downgradeRitual.dialogue.bow.300=Wenn du mir ein Opfer darbringst, wirst du deine Wahrnehmung aufgeben, deine Pfeile werden auf große Distanz nicht mehr treffen. Die Kunst des Bogens wird dir nicht länger von Nutzen sein. -ritual.bloodmagic.downgradeRitual.dialogue.bow.500=Dafür werde ich das Potential deiner Rüstung noch weiter vergrößern, ihr Nutzen und Macht könnte noch weiter wachsen... Alles was du tun musst ist knien... und mir das richtige Opfer darbringen... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.1=Sei gegrüßt, Sterblicher. Ich sehe, dass du mehr Macht erlangen möchtest... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.100=Du musst dir im klaren sein, dass wenn das Glas voll ist, es geleert werden muss bevor es wieder befüllt werden kann. -ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=Somit schlage ich dir einen Handel vor: gebe die Fähigkeit zu trinken auf und ich werde dein Potential stark erhöhen. Ob du glaubst, dass der Handel gerecht ist, ist eine ganz andere Frage... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.500=Nun knie, Sterblicher, und trinke von dem Kelch, den ich dir anbiete, da es dein letzter Schluck sein soll. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=Hmmm... was ist es, wochnach es dich wirklich lüstet...? -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.100=Falls es Stärke jenseits der sterblichen Wesen ist, dann kann ich es dir nicht geben - allerdings hätte ich einen anderen Handel für dich... -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.300=Ich kann die Fähigkeiten deiner Rüstung erweitern, sodass du neue Höhen erreichen sollst. Allerdings benötige ich auch etwas von dir: deine Kraft im Nahkampf. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.500=Falls du zustimmst, wirst du deine Waffen nicht mehr mit solch einer Zuversicht schwingen können und nur einen Bruchteil deines vorherigen Schadens anrichten. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.700=Also, die Wahl liegt bei dir: wirst du vor diesem Altar knien, oder wirst du weiterhin dein Schwert erheben? -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.1=Vorsicht, Sterblicher, denn du wandelst auf dünnem Eis. -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Anders als meine Brüder biete ich dir einen der aussichtslosesten Handel an, die sich jemand, der sich mit der Magie des eigenen Blutes brüstet, vorstellen kann. -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Auch wenn deine Wunden noch heilen mögen, werden sie es doch nur langsam, fall du mein "Angebot" akzeptieren solltest und die Wunden der Schlacht werden dir noch mehr schmerzen. -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=Also überlege gut, bevor du einen Handel eingehst, den du bereuen wirst. Denn auch wenn dein Glas leer sein sollte, wird es nahezu unmöglich sein, es wieder zu füllen... - -ritual.bloodmagic.featheredEarthRitual.info=Prevents falldamage in an area. - -# Chat -chat.bloodmagic.altarMaker.setTier=Setze Ausbaustufe auf: %d -chat.bloodmagic.altarMaker.building=Baue Stufe %d-Altar -chat.bloodmagic.altarMaker.destroy=Stufe %d-Altar zerstört -chat.bloodmagic.altarMaker.creativeOnly=Diese Item ist nur im Kreativmodus erhältlich. - -chat.bloodmagic.damageSource=%ss Seele ist zu schwach geworden. - -chat.bloodmagic.ritual.weak=Du spürst einen Drang, bist aber zu schwach für ein Ritual. -chat.bloodmagic.ritual.prevent=Das Ritual versucht, dir zu widerstehen. -chat.bloodmagic.ritual.activate=Ein Energiestrom fließt durch das Ritual. -chat.bloodmagic.ritual.notValid=Du fühlst, dass die Runen nicht richtig eingerichtet sind... - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=Du fühlst dich schon wieder besser! -chat.bloodmagic.livingArmour.upgrade.fireRemove=&6Ein kühles Gefühl kommt hervor, mit dem das Brennen nachlässt. -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6Eine schattenhafte Macht zieht dich vom Rande des Todes zurück! -chat.bloodmagic.livingArmour.newUpgrade=&4Upgrade erworben! - -chat.bloodmagic.routing.remove=Entferne gespeicherte Position -chat.bloodmagic.routing.set=Setze Knotenposition -chat.bloodmagic.routing.link.master=Knoten mit Hauptknoten verbunden! -chat.bloodmagic.routing.link=Knoten miteinander verbunden. - -chat.bloodmagic.altar.comp.glowstone=ein Glowstone-Block -chat.bloodmagic.altar.comp.bloodstone=ein großer Blutsteinziegel -chat.bloodmagic.altar.comp.beacon=ein Leuchtfeuer -chat.bloodmagic.altar.comp.bloodrune=eine Blutrune -chat.bloodmagic.altar.comp.crystal=ein Block, noch nicht implementiert -chat.bloodmagic.altar.comp.notair=ein fester Block - -chat.bloodmagic.altar.nextTier=Für die nächste Ausbaustufe des Altars fehlt %s an %s. - -chat.bloodmagic.mimic.potionSet=Trankfalle wurde gesetzt. -chat.bloodmagic.mimic.potionRemove=Trankfalle wurde deaktiviert. -chat.bloodmagic.mimic.potionInterval.up=Trankintervall wurde erhöht auf: %d Ticks. -chat.bloodmagic.mimic.potionInterval.down=Trankintervall wurde verringert auf: %d Ticks. -chat.bloodmagic.mimic.detectRadius.up=Spieler-Erfassungsradius wurde erhöht auf: %d Blöcke. -chat.bloodmagic.mimic.detectRadius.down=Spieler-Erfassungsradius wurde verringert auf: %d Blöcke. -chat.bloodmagic.mimic.potionSpawnRadius.up=Trankerzeugungsradius wurde erhöht auf: %d Blöcke. -chat.bloodmagic.mimic.potionSpawnRadius.down=Trankerzeugungsradis wurde verringert auf: %d Blöcke. - -death.attack.ritual_damage=%1$s wurde für ein Ritual geopfert. -death.attack.ritual_damage.player=%2$s hat %1$s für ein Ritual geopfert. - -# entity -entity.bloodmagic.SentientSpecter.name=Empfindsamer Geist -entity.bloodmagic.Mimic.name=Mimik - -# Commands -commands.bloodmagic.error.arg.invalid=Ungültige Argumente -commands.bloodmagic.error.arg.missing=Nicht genug Argumente -commands.bloodmagic.error.arg.player.missing=Du musst einen Spieler für diese Aktion bestimmen. -commands.bloodmagic.error.negative=Amount must be a positive Integer. -commands.bloodmagic.error.outofbounds=Given integer is too large (must be within list ID boundaries). - -commands.bloodmagic.success=Erfolgreich ausgeführt - -commands.bloodmagic.format.help=%s - %s -commands.bloodmagic.format.error=%s - %s - -commands.bloodmagic.help.usage=/bloodmagic help -commands.bloodmagic.help.help=Zeigt hilfe für den Befehl "/bloodmagic" an. - -commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] Spieler [amount] -commands.bloodmagic.network.help=LP Netzwerk Befehle - -commands.bloodmagic.network.syphon.help=Zieht den gegebenen Wert an LP vom LP-Netzwerk des gegebenen Spielers ab. -commands.bloodmagic.network.syphon.success=Erfolgreich %d LP von %s abgezogen. -commands.bloodmagic.network.add.help=Fügt den gegebenen Wert an LP dem LP-Netzwerk des gegebenen Spielers zu. Folgt normalen LP Regeln. -commands.bloodmagic.network.add.success=Erfolgreich %d LP zu %ss LP-Netzwerk hinzugefügt. -commands.bloodmagic.network.set.help=Setzt die LP des gegebenen Spielers auf einen bestimmten Wert. -commands.bloodmagic.network.set.success=Erfolgreich %ss LP-Netzwerk auf %d LP gesetzt. -commands.bloodmagic.network.get.help=Zeigt an, wie viel LP ein Spieler in seinem Netzwerk hat. -commands.bloodmagic.network.fill.help=Füllt das LP-Netzwerk des Spielers auf %d. -commands.bloodmagic.network.fill.success=%ss LP-Netzwerk erfolgreich befüllt. -commands.bloodmagic.network.cap.help=Füllt das LP-Netzwerk des Spielers bis zu dem Maximum, das dessen höchstes Blutkugel speichern kann. -commands.bloodmagic.network.cap.success=%ss LP-Netzwerk erfolgreich gefüllt. - -commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [Spieler] -commands.bloodmagic.bind.help=Versucht, den gehaltenen Gegenstand zu binden bzw. die Bindung zu entfernen. -commands.bloodmagic.bind.success=Gegenstand erfolgreich gebunden! -commands.bloodmagic.bind.remove.success=Bindung erfolgreich entfernt -commands.bloodmagic.bind.error.ownerEqualsTarget=Es hat sich nichts geändert: Ziel und Besitzer sind identsich. -commands.bloodmagic.bind.error.notBound=Bindung kann nicht gelöscht werden: Nicht gebunden. -commands.bloodmagic.bind.error.notBindable=Kann nicht gebunden werden: Gegenstand nicht bindbar. - -commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] Spieler [tier] -commands.bloodmagic.orb.help=Setzt oder zeigt die Blutkugel-Ausbaustufe des Spielers. - -# GUI -tile.bloodmagic.inputNode.name=Eingangsknoten -tile.bloodmagic.outputNode.name=Ausgangsknoten - -# Keybinds -bloodmagic.keybind.open_holding=Öffne Siegel der Aufbewahrung -bloodmagic.keybind.cycle_holding_pos=Siegelrotation (+) -bloodmagic.keybind.cycle_holding_neg=Siegelrotation (-) - -# JustEnoughItems -jei.bloodmagic.recipe.altar=Blutaltar -jei.bloodmagic.recipe.binding=Alchemische Anordnung (Bindung) -jei.bloodmagic.recipe.alchemyArrayCrafting=Alchemische Anordnung -jei.bloodmagic.recipe.soulForge=Höllenfeuerschmiede -jei.bloodmagic.recipe.alchemyTable=Alchemietisch -jei.bloodmagic.recipe.armourDowngrade=Sühne (Ritual) -jei.bloodmagic.recipe.requiredLP=LP: %d -jei.bloodmagic.recipe.requiredTier=Ausbaustufe: %d -jei.bloodmagic.recipe.consumptionRate=Verbrauch: %d LP/t -jei.bloodmagic.recipe.drainRate=Ablauf: %d LP/t -jei.bloodmagic.recipe.minimumSouls=Minimum: %1$..2f Wille -jei.bloodmagic.recipe.soulsDrained=Verbraucht: %1$..2f Wille -jei.bloodmagic.recipe.lpDrained=Verbraucht: %.d LP -jei.bloodmagic.recipe.ticksRequired=Zeit: %.d Ticks - -jei.bloodmagic.desc.altarBuilder=Ein Gegenstand zum Testen. Nur im Kreativmodus erhältlich.\n\nShift+Rechtsklick um die Ausbaustufe zu ändern. Rechtsklicke auf einen Altar, um den Bau zu starten.\n\nZerstöre einen Altar mit ihm in der Hand, um alles abzubauen. -jei.bloodmagic.desc.demonicWill=Prägung eines dämonischen Wesens gebunden an eine Kreatur.\n\nKann durch das Töten eines Monsters mit einer empfindsamen Waffe, oder das Werfen einer Falle und Umbringen während as weiße Partikel aussendet, gesammelt werden. - -# WAILA -waila.bloodmagic.sneak=&oSchleiche für Info -waila.bloodmagic.array.reagent=Reagenz: %s -waila.bloodmagic.array.catalyst=Katalysator: %s -option.bloodmagic.bypassSneak=Umgehe Schleichen -option.bloodmagic.bloodAltar=Blutaltar -option.bloodmagic.ritualController=Ritualsteine -option.bloodmagic.teleposer=Teleposer -option.bloodmagic.array=Alchemische Anordnung - -# Thaumcraft -tc.research_category.BLOODMAGIC=Sanguine Arcana - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=Blood Magic -bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana -bloodmagic.research_page.BLOODMAGIC.1=Das Reich der Blutmagier schien immer schon eine etaws einsamere und... "individuelle" Kunst zu sein... Blutmagier waren immer schon sehr zurückgezogen und manchmal auch etwas verrückt zu sein. Allerdings haben die Mächte der Selbstopferung Nutzen jenseits der Sicht eines normalen Blutmagiers. Tatsächlich ist es ziemlich offensichtlich, dass es schließlich doch einen Nutzen in Thaumaturgie hat! - -# Buttons -button.bloodmagic.tooltip.fill=Fülle Netzwerk diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang deleted file mode 100644 index 0d4c026d..00000000 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ /dev/null @@ -1,954 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=Blood Magic -itemGroup.bloodmagic.creativeTabTome=Blood Magic | Tomes - -#Items -item.bloodmagic.activation_crystal.weak.name=Weak Activation Crystal -item.bloodmagic.activation_crystal.awakened.name=Awakened Activation Crystal -item.bloodmagic.activation_crystal.creative.name=Creative Activation Crystal - -item.bloodmagic.sacrificial_dagger.normal.name=Sacrificial Dagger -item.bloodmagic.sacrificial_dagger.creative.name=Creative Sacrificial Dagger -item.bloodmagic.pack.selfSacrifice.name=Blood Letter's Pack -item.bloodmagic.pack.sacrifice.name=Coat of Arms -item.bloodmagic.daggerOfSacrifice.name=Dagger of Sacrifice - -item.bloodmagic.lavaCrystal.name=Lava Crystal - -item.bloodmagic.bound.sword.name=Bound Blade -item.bloodmagic.bound.pickaxe.name=Bound Pickaxe -item.bloodmagic.bound.axe.name=Bound Axe -item.bloodmagic.bound.shovel.name=Bound Shovel - -item.bloodmagic.bucket.lifeEssence.name=Bucket of Life - -item.bloodmagic.scribe.water.name=Elemental Inscription Tool: Water -item.bloodmagic.scribe.fire.name=Elemental Inscription Tool: Fire -item.bloodmagic.scribe.earth.name=Elemental Inscription Tool: Earth -item.bloodmagic.scribe.air.name=Elemental Inscription Tool: Air -item.bloodmagic.scribe.dusk.name=Elemental Inscription Tool: Dusk -item.bloodmagic.scribe.dawn.name=Elemental Inscription Tool: Dawn - -item.bloodmagic.focus.weak.name=Teleposition Focus -item.bloodmagic.focus.enhanced.name=Enhanced Teleposition Focus -item.bloodmagic.focus.reinforced.name=Reinforced Teleposition Focus -item.bloodmagic.focus.demonic.name=Demonic Teleposition Focus - -item.bloodmagic.slate.blank.name=Blank Slate -item.bloodmagic.slate.reinforced.name=Reinforced Slate -item.bloodmagic.slate.imbued.name=Imbued Slate -item.bloodmagic.slate.demonic.name=Demonic Slate -item.bloodmagic.slate.ethereal.name=Ethereal Slate - -item.bloodmagic.orb.weak.name=Weak Blood Orb -item.bloodmagic.orb.apprentice.name=Apprentice Blood Orb -item.bloodmagic.orb.magician.name=Magician Blood Orb -item.bloodmagic.orb.master.name=Master Blood Orb -item.bloodmagic.orb.archmage.name=Archmage Blood Orb -item.bloodmagic.orb.transcendent.name=Transcendent Blood Orb - -item.bloodmagic.reagent.incendium.name=Incendium -item.bloodmagic.reagent.magicales.name=Magicales -item.bloodmagic.reagent.sanctus.name=Sanctus -item.bloodmagic.reagent.aether.name=Aether -item.bloodmagic.reagent.crepitous.name=Crepitous -item.bloodmagic.reagent.crystallos.name=Crystallos -item.bloodmagic.reagent.terrae.name=Terrae -item.bloodmagic.reagent.aquasalus.name=Aquasalus -item.bloodmagic.reagent.tennebrae.name=Tennebrae -item.bloodmagic.reagent.offensa.name=Offensa -item.bloodmagic.reagent.praesidium.name=Praesidium -item.bloodmagic.reagent.orbisterrae.name=Orbis Terrae -item.bloodmagic.reagent.virtus.name=Virtus -item.bloodmagic.reagent.reductus.name=Reductus -item.bloodmagic.reagent.potentia.name=Potentia - -item.bloodmagic.blood_shard.weak.name=Weak Blood Shard -item.bloodmagic.blood_shard.demonic.name=Demon Blood Shard - -item.bloodmagic.baseComponent.reagent_water.name=Water Reagent -item.bloodmagic.baseComponent.reagent_lava.name=Lava Reagent -item.bloodmagic.baseComponent.reagent_air.name=Air Reagent -item.bloodmagic.baseComponent.reagent_fast_miner.name=Mining Reagent -item.bloodmagic.baseComponent.reagent_void.name=Void Reagent -item.bloodmagic.baseComponent.reagent_growth.name=Growth Reagent -item.bloodmagic.baseComponent.reagent_affinity.name=Elemental Affinity Reagent -item.bloodmagic.baseComponent.reagent_sight.name=Sight Reagent -item.bloodmagic.baseComponent.reagent_binding.name=Binding Reagent -item.bloodmagic.baseComponent.reagent_suppression.name=Suppression Reagent -item.bloodmagic.baseComponent.reagent_blood_light.name=Blood Lamp Reagent -item.bloodmagic.baseComponent.reagent_magnetism.name=Magnetism Reagent -item.bloodmagic.baseComponent.reagent_haste.name=Haste Reagent -item.bloodmagic.baseComponent.reagent_bridge.name=Phantom Bridge Reagent -item.bloodmagic.baseComponent.reagent_compression.name=Compression Reagent -item.bloodmagic.baseComponent.reagent_severance.name=Severance Reagent -item.bloodmagic.baseComponent.reagent_holding.name=Holding Reagent -item.bloodmagic.baseComponent.reagent_claw.name=Claw Reagent -item.bloodmagic.baseComponent.reagent_bounce.name=Elasticity Reagent -item.bloodmagic.baseComponent.reagent_frost.name=Frost Reagent -item.bloodmagic.baseComponent.reagent_teleposition.name=Teleposition Reagent -item.bloodmagic.baseComponent.reagent_transposition.name=Transposition Reagent - -item.bloodmagic.baseComponent.frame_part.name=Frame Parts -item.bloodmagic.baseComponent.sand_iron.name=Iron Sand -item.bloodmagic.baseComponent.sand_gold.name=Gold Sand -item.bloodmagic.baseComponent.sand_coal.name=Coal Sand -item.bloodmagic.baseComponent.plant_oil.name=Plant Oil -item.bloodmagic.baseComponent.sulfur.name=Sulfur -item.bloodmagic.baseComponent.saltpeter.name=Saltpeter -item.bloodmagic.baseComponent.neuro_toxin.name=Neuro Toxin -item.bloodmagic.baseComponent.antiseptic.name=Antiseptic -item.bloodmagic.baseComponent.catalyst_length_1.name=Simple Lengthening Catalyst -item.bloodmagic.baseComponent.catalyst_power_1.name=Simple Power Catalyst - -item.bloodmagic.cutting_fluid.basic.name=Basic Cutting Fluid -item.bloodmagic.cutting_fluid.explosive.name=Explosive Powder - -item.bloodmagic.demonCrystal.default.name=Demon Will Crystal -item.bloodmagic.demonCrystal.corrosive.name=Corrosive Will Crystal -item.bloodmagic.demonCrystal.destructive.name=Destructive Will Crystal -item.bloodmagic.demonCrystal.vengeful.name=Vengeful Will Crystal -item.bloodmagic.demonCrystal.steadfast.name=Steadfast Will Crystal - -item.bloodmagic.monster_soul.raw.name=Demonic Will -item.bloodmagic.monster_soul.corrosive.name=Corrosive Demonic Will -item.bloodmagic.monster_soul.destructive.name=Destructive Demonic Will -item.bloodmagic.monster_soul.vengeful.name=Vengeful Demonic Will -item.bloodmagic.monster_soul.steadfast.name=Steadfast Demonic Will - -item.bloodmagic.sigil.air.name=Air Sigil -item.bloodmagic.sigil.blood_light.name=Sigil of the Blood Lamp -item.bloodmagic.sigil.compression.name=Sigil of Compression -item.bloodmagic.sigil.divination.name=Divination Sigil -item.bloodmagic.sigil.water.name=Water Sigil -item.bloodmagic.sigil.lava.name=Lava Sigil -item.bloodmagic.sigil.void.name=Void Sigil -item.bloodmagic.sigil.green_grove.name=Sigil of the Green Grove -item.bloodmagic.sigil.elemental_affinity.name=Sigil of Elemental Affinity -item.bloodmagic.sigil.haste.name=Sigil of Haste -item.bloodmagic.sigil.suppression.name=Sigil of Suppression -item.bloodmagic.sigil.magnetism.name=Sigil of Magnetism -item.bloodmagic.sigil.fast_miner.name=Sigil of the Fast Miner -item.bloodmagic.sigil.seer.name=Seer's Sigil -item.bloodmagic.sigil.phantom_bridge.name=Sigil of the Phantom Bridge -item.bloodmagic.sigil.whirlwind.name=Sigil of the Whirlwind -item.bloodmagic.sigil.ender_severance.name=Sigil of Ender Severance -item.bloodmagic.sigil.holding.name=Sigil of Holding -item.bloodmagic.sigil.holding.display=&r%s: &o&n%s -item.bloodmagic.sigil.teleposition.name=Teleposition Sigil -item.bloodmagic.sigil.transposition.name=Transposition Sigil -item.bloodmagic.sigil.claw.name=Sigil of the Claw -item.bloodmagic.sigil.bounce.name=Sigil of Elasticity -item.bloodmagic.sigil.frost.name=Sigil of Winter's Breath - -item.bloodmagic.livingArmour.helmet.name=Living Helmet -item.bloodmagic.livingArmour.chest.name=Living Chestplate -item.bloodmagic.livingArmour.legs.name=Living Leggings -item.bloodmagic.livingArmour.boots.name=Living Boots -item.bloodmagic.sentientArmour.helmet.name=Sentient Helmet -item.bloodmagic.sentientArmour.chest.name=Sentient Chestplate -item.bloodmagic.sentientArmour.legs.name=Sentient Leggings -item.bloodmagic.sentientArmour.boots.name=Sentient Boots - -item.bloodmagic.altarMaker.name=Altar Maker - -item.bloodmagic.ritualDismantler.name=Ritual Dismantler -item.bloodmagic.ritualDivinernormal.name=Ritual Diviner -item.bloodmagic.ritualDivinerdusk.name=Ritual Diviner [Dusk] -item.bloodmagic.ritualDivinerdawn.name=Ritual Diviner [Dawn] -item.bloodmagic.ritualReader.name=Ritual Tinkerer - -item.bloodmagic.arcaneAshes.name=Arcane Ashes -item.bloodmagic.upgradeTome.name=Living Armour Upgrade Tome -item.bloodmagic.downgradeTome.name=Living Armour Downgrade Tome -item.bloodmagic.upgradeTrainer.name=Living Armour Training Bracelet - -item.bloodmagic.sentientSword.name=Sentient Sword -item.bloodmagic.soulGem.petty.name=Petty Tartaric Gem -item.bloodmagic.soulGem.lesser.name=Lesser Tartaric Gem -item.bloodmagic.soulGem.common.name=Common Tartaric Gem -item.bloodmagic.soulGem.greater.name=Greater Tartaric Gem -item.bloodmagic.soulGem.grand.name=Grand Tartaric Gem -item.bloodmagic.soulSnare.base.name=Rudimentary Snare -item.bloodmagic.sentientBow.name=Sentient Bow -item.bloodmagic.sentientArmourGem.name=Sentient Armour Gem -item.bloodmagic.sentientAxe.name=Sentient Axe -item.bloodmagic.sentientPickaxe.name=Sentient Pickaxe -item.bloodmagic.sentientShovel.name=Sentient Shovel - -item.bloodmagic.nodeRouter.name=Node Router -item.bloodmagic.itemFilter.exact.name=Precise Item Filter -item.bloodmagic.itemFilter.ignoreNBT.name=NBT Item Filter -item.bloodmagic.itemFilter.modItems.name=Mod Item Filter -item.bloodmagic.itemFilter.oreDict.name=Ore Dictionary Item Filter -item.bloodmagic.fluidFilter.exact.name=Fluid Filter - -item.bloodmagic.experienceTome.name=Tome of Peritia -item.bloodmagic.sanguineBook.name=Inspectoris Scandalum - -item.bloodmagic.living_point_upgrade.draft_angelus.name=Draft of Angelus - -item.bloodmagic.willGauge.name=Demon Will Aura Gauge -item.bloodmagic.potionFlask.name=Potion Flask - -item.bloodmagic.icarusScroll.name=Scroll of Icarus - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=Life Essence - -tile.bloodmagic.stone.ritual.master.name=Master Ritual Stone -tile.bloodmagic.stone.ritual.imperfect.name=Imperfect Ritual Stone -tile.bloodmagic.stone.ritual.inverted.name=Inverted Master Ritual Stone - -tile.bloodmagic.altar.name=Blood Altar -tile.bloodmagic.alchemyArray.name=Alchemy Array - -tile.bloodmagic.rune.blank.name=Blank Rune -tile.bloodmagic.rune.speed.name=Speed Rune -tile.bloodmagic.rune.efficiency.name=Efficiency Rune -tile.bloodmagic.rune.sacrifice.name=Rune of Sacrifice -tile.bloodmagic.rune.self_sacrifice.name=Rune of Self Sacrifice -tile.bloodmagic.rune.displacement.name=Displacement Rune -tile.bloodmagic.rune.capacity.name=Rune of Capacity -tile.bloodmagic.rune.augmented_capacity.name=Rune of Augmented Capacity -tile.bloodmagic.rune.orb.name=Rune of the Orb -tile.bloodmagic.rune.acceleration.name=Acceleration Rune -tile.bloodmagic.rune.charging.name=Charging Rune - -tile.bloodmagic.ritualStone.blank.name=Ritual Stone -tile.bloodmagic.ritualStone.water.name=Ritual Stone of Water -tile.bloodmagic.ritualStone.fire.name=Ritual Stone of Fire -tile.bloodmagic.ritualStone.earth.name=Ritual Stone of Earth -tile.bloodmagic.ritualStone.air.name=Ritual Stone of Air -tile.bloodmagic.ritualStone.dusk.name=Ritual Stone of Dusk -tile.bloodmagic.ritualStone.dawn.name=Ritual Stone of Dawn - -tile.bloodmagic.bloodstone_tile.name=Large Bloodstone Tile -tile.bloodmagic.bloodstone_brick.name=Bloodstone Brick -tile.bloodmagic.crystal_tile.name=Crystal Cluster -tile.bloodmagic.crystal_brick.name=Crystal Cluster Brick -tile.bloodmagic.bloodLight.name=Blood Light -tile.bloodmagic.spectralBlock.name=Spectral Block -tile.bloodmagic.phantom.name=Phantom Block -tile.bloodmagic.incenseAltar.name=Incense Altar - -tile.bloodmagic.teleposer.name=Teleposer -tile.bloodmagic.soulForge.name=Hellfire Forge -tile.bloodmagic.alchemyTable.name=Alchemy Table -tile.bloodmagic.demonCrucible.name=Demon Crucible -tile.bloodmagic.demonPylon.name=Demon Pylon -tile.bloodmagic.demonCrystallizer.name=Demon Crystallizer - -tile.bloodmagic.masterRouting.name=Master Routing Node -tile.bloodmagic.outputRouting.name=Output Routing Node -tile.bloodmagic.inputRouting.name=Input Routing Node -tile.bloodmagic.itemRouting.name=Routing Node - -tile.bloodmagic.path.wood.name=Wooden Path -tile.bloodmagic.path.woodtile.name=Tiled Wooden Path -tile.bloodmagic.path.stone.name=Stone Brick Path -tile.bloodmagic.path.stonetile.name=Tiled Stone Path -tile.bloodmagic.path.wornstone.name=Worn Stone Brick Path -tile.bloodmagic.path.wornstonetile.name=Tiled Worn Stone Path -tile.bloodmagic.path.obsidian.name=Obsidian Brick Path -tile.bloodmagic.path.obsidiantile.name=Tiled Obsidian Path - -tile.bloodmagic.dimensionalPortal.name=Dimensional Portal -tile.bloodmagic.bloodTank.name=Blood Tank - -tile.bloodmagic.demonCrystal.default.name=Demon Will Crystal Cluster -tile.bloodmagic.demonCrystal.corrosive.name=Corrosive Will Crystal Cluster -tile.bloodmagic.demonCrystal.destructive.name=Destructive Will Crystal Cluster -tile.bloodmagic.demonCrystal.vengeful.name=Vengeful Will Crystal Cluster -tile.bloodmagic.demonCrystal.steadfast.name=Steadfast Will Crystal Cluster - -tile.bloodmagic.mimic.nohitbox.name=Ethereal Opaque Mimic Block -tile.bloodmagic.mimic.solidopaque.name=Opaque Mimic Block -tile.bloodmagic.mimic.solidclear.name=Clear Mimic Block -tile.bloodmagic.mimic.solidlight.name=Lighted Mimic Block -tile.bloodmagic.mimic.sentient.name=Sentient Mimic Block - -tile.bloodmagic.bricks1.brick1_raw.name=Raw Stone Bricks -tile.bloodmagic.bricks1.brick1_corrosive.name=Corrosive Stone Bricks -tile.bloodmagic.bricks1.brick1_destructive.name=Destructive Stone Bricks -tile.bloodmagic.bricks1.brick1_vengeful.name=Vengeful Stone Bricks -tile.bloodmagic.bricks1.brick1_steadfast.name=Steadfast Stone Bricks - -tile.bloodmagic.bricks2.smallbrick_raw.name=Small Raw Stone Bricks -tile.bloodmagic.bricks2.smallbrick_corrosive.name=Small Corrosive Stone Bricks -tile.bloodmagic.bricks2.smallbrick_destructive.name=Small Destructive Stone Bricks -tile.bloodmagic.bricks2.smallbrick_vengeful.name=Small Vengeful Stone Bricks -tile.bloodmagic.bricks2.smallbrick_steadfast.name=Small Steadfast Stone Bricks -tile.bloodmagic.bricks2.tile_raw.name=Raw Stone Tiles -tile.bloodmagic.bricks2.tile_corrosive.name=Corrosive Stone Tiles -tile.bloodmagic.bricks2.tile_destructive.name=Destructive Stone Tiles -tile.bloodmagic.bricks2.tile_vengeful.name=Vengeful Stone Tiles -tile.bloodmagic.bricks2.tile_steadfast.name=Steadfast Stone Tiles -tile.bloodmagic.bricks2.tilespecial_raw.name=Accented Raw Stone Tiles -tile.bloodmagic.bricks2.tilespecial_corrosive.name=Accented Corrosive Stone Tiles -tile.bloodmagic.bricks2.tilespecial_destructive.name=Accented Destructive Stone Tiles -tile.bloodmagic.bricks2.tilespecial_vengeful.name=Accented Vengeful Stone Tiles -tile.bloodmagic.bricks2.tilespecial_steadfast.name=Accented Steadfast Stone Tiles - -tile.bloodmagic.inversionpillar.raw.name=Raw Inversion Pillar -tile.bloodmagic.inversionpillar.corrosive.name=Corrosive Inversion Pillar -tile.bloodmagic.inversionpillar.destructive.name=Destructive Inversion Pillar -tile.bloodmagic.inversionpillar.vengeful.name=Vengeful Inversion Pillar -tile.bloodmagic.inversionpillar.steadfast.name=Steadfast Inversion Pillar - -tile.bloodmagic.inversionpillarend.raw_bottom.name=Raw Inversion Pillar Base -tile.bloodmagic.inversionpillarend.corrosive_bottom.name=Corrosive Inversion Pillar Base -tile.bloodmagic.inversionpillarend.destructive_bottom.name=Destructive Inversion Pillar Base -tile.bloodmagic.inversionpillarend.vengeful_bottom.name=Vengeful Inversion Pillar Base -tile.bloodmagic.inversionpillarend.steadfast_bottom.name=Steadfast Inversion Pillar Base -tile.bloodmagic.inversionpillarend.raw_top.name=Raw Inversion Pillar Cap -tile.bloodmagic.inversionpillarend.corrosive_top.name=Corrosive Inversion Pillar Cap -tile.bloodmagic.inversionpillarend.destructive_top.name=Destructive Inversion Pillar Cap -tile.bloodmagic.inversionpillarend.vengeful_top.name=Vengeful Inversion Pillar Cap -tile.bloodmagic.inversionpillarend.steadfast_top.name=Steadfast Inversion Pillar Cap - -tile.bloodmagic.demonlight.raw.name=Raw Demon Eye -tile.bloodmagic.demonlight.corrosive.name=Corrosive Demon Eye -tile.bloodmagic.demonlight.destructive.name=Destructive Demon Eye -tile.bloodmagic.demonlight.vengeful.name=Vengeful Demon Eye -tile.bloodmagic.demonlight.steadfast.name=Steadfast Demon Eye - -tile.bloodmagic.extras.stone_raw.name=Raw Stone -tile.bloodmagic.extras.stone_corrosive.name=Corrosive Stone -tile.bloodmagic.extras.stone_destructive.name=Destructive Stone -tile.bloodmagic.extras.stone_vengeful.name=Vengeful Stone -tile.bloodmagic.extras.stone_steadfast.name=Steadfast Stone - -tile.bloodmagic.extras.polished_raw.name=Polished Raw Stone -tile.bloodmagic.extras.polished_corrosive.name=Polished Corrosive Stone -tile.bloodmagic.extras.polished_destructive.name=Polished Destructive Stone -tile.bloodmagic.extras.polished_vengeful.name=Polished Vengeful Stone -tile.bloodmagic.extras.polished_steadfast.name=Polished Steadfast Stone - -tile.bloodmagic.extras.metal_raw.name=Raw Demon Alloy -tile.bloodmagic.extras.metal_corrosive.name=Corrosive Demon Alloy -tile.bloodmagic.extras.metal_destructive.name=Destructive Demon Alloy -tile.bloodmagic.extras.metal_vengeful.name=Vengeful Demon Alloy -tile.bloodmagic.extras.metal_steadfast.name=Steadfast Demon Alloy - -tile.bloodmagic.pillar1.raw.name=Raw Stone Pillar -tile.bloodmagic.pillar1.corrosive.name=Corrosive Stone Pillar -tile.bloodmagic.pillar1.destructive.name=Destructive Stone Pillar -tile.bloodmagic.pillar1.vengeful.name=Vengeful Stone Pillar -tile.bloodmagic.pillar1.steadfast.name=Steadfast Stone Pillar - -tile.bloodmagic.pillar2.raw.name=Accented Raw Stone Pillar -tile.bloodmagic.pillar2.corrosive.name=Accented Corrosive Stone Pillar -tile.bloodmagic.pillar2.destructive.name=Accented Destructive Stone Pillar -tile.bloodmagic.pillar2.vengeful.name=Accented Vengeful Stone Pillar -tile.bloodmagic.pillar2.steadfast.name=Accented Steadfast Stone Pillar - -tile.bloodmagic.pillarCap1.raw.name=Raw Stone Pillar Cap -tile.bloodmagic.pillarCap1.corrosive.name=Corrosive Stone Pillar Cap -tile.bloodmagic.pillarCap2.destructive.name=Destructive Stone Pillar Cap -tile.bloodmagic.pillarCap2.vengeful.name=Vengeful Stone Pillar Cap -tile.bloodmagic.pillarCap3.steadfast.name=Steadfast Stone Pillar Cap - -tile.bloodmagic.wall1.brick_raw.name=Raw Stone Brick Wall -tile.bloodmagic.wall1.brick_corrosive.name=Corrosive Stone Brick Wall -tile.bloodmagic.wall1.brick_destructive.name=Destructive Stone Brick Wall -tile.bloodmagic.wall1.brick_vengeful.name=Vengeful Stone Brick Wall -tile.bloodmagic.wall1.brick_steadfast.name=Steadfast Stone Brick Wall -tile.bloodmagic.wall1.smallbrick_raw.name=Raw Small Stone Brick Wall -tile.bloodmagic.wall1.smallbrick_corrosive.name=Corrosive Small Stone Brick Wall -tile.bloodmagic.wall1.smallbrick_destructive.name=Destructive Small Stone Brick Wall -tile.bloodmagic.wall1.smallbrick_vengeful.name=Vengeful Small Stone Brick Wall -tile.bloodmagic.wall1.smallbrick_steadfast.name=Steadfast Small Stone Brick Wall -tile.bloodmagic.wall1.large_raw.name=Raw Stone Wall -tile.bloodmagic.wall1.large_corrosive.name=Corrosive Stone Wall -tile.bloodmagic.wall1.large_destructive.name=Destructive Stone Wall -tile.bloodmagic.wall1.large_vengeful.name=Vengeful Stone Wall -tile.bloodmagic.wall1.large_steadfast.name=Steadfast Stone Wall - -tile.bloodmagic.stairs1.raw.name=Raw Stone Stairs -tile.bloodmagic.stairs1.corrosive.name=Corrosive Stone Stairs -tile.bloodmagic.stairs2.destructive.name=Destructive Stone Stairs -tile.bloodmagic.stairs2.vengeful.name=Vengeful Stone Stairs -tile.bloodmagic.stairs3.steadfast.name=Steadfast Stone Stairs - -# Fluids -fluid.lifeEssence=Life Essence - -# HUD -hud.bloodmagic.inactive=Inactive - -# Tooltips -tooltip.bloodmagic.extraInfo=&9-Hold shift for more info- - -tooltip.bloodmagic.orb.desc=Stores raw Life Essence -tooltip.bloodmagic.orb.owner=Added by: %s -tooltip.bloodmagic.currentOwner=Current owner: %s -tooltip.bloodmagic.currentTier=Current tier: %d -tooltip.bloodmagic.config.disabled=Currently disabled in the Config -tooltip.bloodmagic.tier=Tier %d - -tooltip.bloodmagic.activated=Activated -tooltip.bloodmagic.deactivated=Deactivated - -tooltip.bloodmagic.sigil.air.desc=&oI feel lighter already... -tooltip.bloodmagic.sigil.blood_light.desc=&oI see a light! -tooltip.bloodmagic.sigil.compression.desc=&oHands of diamonds -tooltip.bloodmagic.sigil.divination.desc=&oPeer into the soul -tooltip.bloodmagic.sigil.divination.otherNetwork=Peering into the soul of %s -tooltip.bloodmagic.sigil.divination.currentAltarTier=Current Tier: %d -tooltip.bloodmagic.sigil.divination.currentEssence=Current Essence: %d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=Current Capacity: %d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=Current Tranquility: %d -tooltip.bloodmagic.sigil.divination.currentInversion=Current Inversion: %d -tooltip.bloodmagic.sigil.divination.currentBonus=Current Bonus: +%d%% -tooltip.bloodmagic.sigil.water.desc=&oInfinite water, anyone? -tooltip.bloodmagic.sigil.lava.desc=&oHOT! DO NOT EAT -tooltip.bloodmagic.sigil.void.desc=&oBetter than a Swiffer®! -tooltip.bloodmagic.sigil.green_grove.desc=&oEnvironmentally friendly -tooltip.bloodmagic.sigil.magnetism.desc=&oI have a very magnetic personality -tooltip.bloodmagic.sigil.suppression.desc=&oBetter than telekinesis... -tooltip.bloodmagic.sigil.haste.desc=&o42 doses of caffeine later... -tooltip.bloodmagic.sigil.fast_miner.desc=&oKeep mining, and mining... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oFalling fire fishes! -tooltip.bloodmagic.sigil.seer.desc=&oWhen seeing all is not enough -tooltip.bloodmagic.sigil.seer.currentAltarProgress=Current Progress: %d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=Current Progress: %s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=Consumption Rate: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=Current Tier: %d -tooltip.bloodmagic.sigil.seer.currentEssence=Current Essence: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=Current Capacity: %d LP -tooltip.bloodmagic.sigil.seer.currentCharge=Current Charge: %d -tooltip.bloodmagic.sigil.seer.currentTranquility=Current Tranquility: %d -tooltip.bloodmagic.sigil.seer.currentBonus=Current Bonus: +%d%% -tooltip.bloodmagic.sigil.phantom_bridge.desc=&oWalking on thin air... -tooltip.bloodmagic.sigil.whirlwind.desc=&oBest not to wear a skirt -tooltip.bloodmagic.sigil.ender_severance.desc=&oPutting Endermen in Dire situations! -tooltip.bloodmagic.sigil.teleposition.desc=I am very close to being moved by this. -tooltip.bloodmagic.sigil.transposition.desc=Feel the power of the Force, my young apprentice. -tooltip.bloodmagic.sigil.holding.press=Press &o%s&r&7 to modify -tooltip.bloodmagic.sigil.holding.desc=Sigil-ception -tooltip.bloodmagic.sigil.holding.sigilInSlot=Slot %d: %s - -tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Increases the max points of Living Armour to %d. - -tooltip.bloodmagic.bound.sword.desc=&oCulling the weak -tooltip.bloodmagic.bound.pickaxe.desc=&oDestroying stone without mercy -tooltip.bloodmagic.bound.axe.desc=&oDemonic deforestation -tooltip.bloodmagic.bound.shovel.desc=&oScrubs floors clean of dirt - -tooltip.bloodmagic.sacrificialDagger.desc=Just a prick of the finger will suffice... -tooltip.bloodmagic.sacrificialDagger.creative=Right click an altar while sneaking to fill it -tooltip.bloodmagic.slate.desc=Infused stone inside of a Blood Altar -tooltip.bloodmagic.inscriber.desc=The writing is on the wall... - -tooltip.bloodmagic.pack.selfSacrifice.desc=This pack really chafes... -tooltip.bloodmagic.pack.sacrifice.desc=Description -tooltip.bloodmagic.pack.stored=Stored: %d LP - -tooltip.bloodmagic.activation_crystal.weak=Activates low-level rituals -tooltip.bloodmagic.activation_crystal.awakened=Activates more powerful rituals -tooltip.bloodmagic.activation_crystal.creative=Creative Only - Activates any ritual - -tooltip.bloodmagic.diviner.currentRitual=Current Ritual: %s -tooltip.bloodmagic.diviner.blankRune=Blank Runes: %d -tooltip.bloodmagic.diviner.waterRune=Water Runes: %d -tooltip.bloodmagic.diviner.airRune=Air Runes: %d -tooltip.bloodmagic.diviner.fireRune=Fire Runes: %d -tooltip.bloodmagic.diviner.earthRune=Earth Runes: %d -tooltip.bloodmagic.diviner.duskRune=Dusk Runes: %d -tooltip.bloodmagic.diviner.dawnRune=Dawn Runes: %d -tooltip.bloodmagic.diviner.totalRune=Total Runes: %d -tooltip.bloodmagic.diviner.extraInfo=&9-Hold shift for rune info- -tooltip.bloodmagic.diviner.extraExtraInfo=&9-Hold shift + M for augmentation info- -tooltip.bloodmagic.diviner.currentDirection=Current Direction: %s - -tooltip.bloodmagic.ritualReader.currentState=Current mode: %s -tooltip.bloodmagic.ritualReader.set_area=Define Area -tooltip.bloodmagic.ritualReader.information=Information -tooltip.bloodmagic.ritualReader.set_will_types=Set Will Consumed -tooltip.bloodmagic.ritualReader.desc.set_area=Right click on an active Master Ritual stone to cycle what area of the ritual you want to modify. Then click on the two corners of the new range you want to set the range. -tooltip.bloodmagic.ritualReader.desc.information=Right click on an active Master Ritual Stone to gather basic information about the ritual. -tooltip.bloodmagic.ritualReader.desc.set_will_types=Set the types of demon will that the ritual will consume from the aura by right clicking on the MRS with the same types of crystals on your hotbar. - -tooltip.bloodmagic.arcaneAshes=Ashes used to draw an alchemy circle - -tooltip.bloodmagic.telepositionFocus.coords=Current coordinates: (%d, %d, %d) -tooltip.bloodmagic.telepositionFocus.dimension=Dimension ID: %d -tooltip.bloodmagic.telepositionFocus.bound=Bound: %s at %d, %d, %d -tooltip.bloodmagic.telepositionFocus.weak=Used to move blocks in the world -tooltip.bloodmagic.telepositionFocus.enhanced=Used to move blocks in the world -tooltip.bloodmagic.telepositionFocus.reinforced=Used to move blocks in the world -tooltip.bloodmagic.telepositionFocus.demonic=Used to move blocks in the world - -tooltip.bloodmagic.livingArmour.upgrade.speed=Quick Feet -tooltip.bloodmagic.livingArmour.upgrade.digging=Dwarven Might -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=Poison Resistance -tooltip.bloodmagic.livingArmour.upgrade.fireResist=Gift of Ignis -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Tough Palms -tooltip.bloodmagic.livingArmour.upgrade.knockback=Body Builder -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=Tough Skin -tooltip.bloodmagic.livingArmour.upgrade.health=Healthy -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Fierce Strike -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Trick Shot -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Step Assist -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Grim Reaper's Sprint -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Solar Powered -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=Runic Shielding -tooltip.bloodmagic.livingArmour.upgrade.revealing=Revealing -tooltip.bloodmagic.livingArmour.upgrade.experienced=Experienced -tooltip.bloodmagic.livingArmour.upgrade.jump=Strong Legs -tooltip.bloodmagic.livingArmour.upgrade.fallProtect=Soft Fall -tooltip.bloodmagic.livingArmour.upgrade.graveDigger=Grave Digger -tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=Charging Strike -tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=True Strike -tooltip.bloodmagic.livingArmour.upgrade.elytra=Elytra -tooltip.bloodmagic.livingArmour.upgrade.nightSight=Nocturnal Prowess -tooltip.bloodmagic.livingArmour.upgrade.repair=Repairing - - -tooltip.bloodmagic.livingArmour.upgrade.slowness=Limp Leg -tooltip.bloodmagic.livingArmour.upgrade.crippledArm=Crippled Arm -tooltip.bloodmagic.livingArmour.upgrade.slippery=Loose Traction -tooltip.bloodmagic.livingArmour.upgrade.battleHunger=Battle Hungry -tooltip.bloodmagic.livingArmour.upgrade.quenched=Quenched -tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=Dulled Blade -tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=Weakened Pick -tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=Storm Trooper -tooltip.bloodmagic.livingArmour.upgrade.slowHeal=Diseased -tooltip.bloodmagic.livingArmour.upgrade.disoriented=Disoriented - -tooltip.bloodmagic.livingArmour.upgrade.level=%s (Level %d) -tooltip.bloodmagic.livingArmour.upgrade.progress=%s (%d/100) -tooltip.bloodmagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s - -tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Hold shift + M for progress info- - -tooltip.bloodmagic.will=Will Quality: %1$,.2f -tooltip.bloodmagic.sentientSword.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.sentientAxe.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.sentientPickaxe.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.sentientShovel.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.soulGem.petty=A gem used to contain a little will -tooltip.bloodmagic.soulGem.lesser=A gem used to contain some will -tooltip.bloodmagic.soulGem.common=A gem used to contain more will -tooltip.bloodmagic.soulGem.greater=A gem used to contain a greater amount of will -tooltip.bloodmagic.soulGem.grand=A gem used to contain a large amount of will -tooltip.bloodmagic.soulSnare.desc=Throw at a monster and then kill them to obtain their demonic will - -tooltip.bloodmagic.itemFilter.exact=Will make sure the items match precisely -tooltip.bloodmagic.itemFilter.ignoreNBT=Ignores the NBT of the filter -tooltip.bloodmagic.itemFilter.modItems=Matches all items from the same mod -tooltip.bloodmagic.itemFilter.oreDict=Used to filter through the Ore Dictionary - -tooltip.bloodmagic.fluidFilter.exact=Filters the fluid input/output - -tooltip.bloodmagic.fluid.type=Fluid Contained: %s -tooltip.bloodmagic.fluid.amount=Amount: %d / %d mB -tooltip.bloodmagic.fluid.capacity=Capacity: %d mB - -tooltip.bloodmagic.ghost.everything=Everything -tooltip.bloodmagic.ghost.amount=Ghost item amount: %d - -tooltip.bloodmagic.currentType.default=Contains: Raw Will -tooltip.bloodmagic.currentType.corrosive=Contains: Corrosive Will -tooltip.bloodmagic.currentType.destructive=Contains: Destructive Will -tooltip.bloodmagic.currentType.vengeful=Contains: Vengeful Will -tooltip.bloodmagic.currentType.steadfast=Contains: Steadfast Will - -tooltip.bloodmagic.currentBaseType.default=Raw -tooltip.bloodmagic.currentBaseType.corrosive=Corrosive -tooltip.bloodmagic.currentBaseType.destructive=Destructive -tooltip.bloodmagic.currentBaseType.vengeful=Vengeful -tooltip.bloodmagic.currentBaseType.steadfast=Steadfast - -tooltip.bloodmagic.experienceTome=A book used to store experience -tooltip.bloodmagic.experienceTome.exp=Exp: %0.3f -tooltip.bloodmagic.experienceTome.expLevel=Level: %d - -tooltip.bloodmagic.decoration.safe=Safe for decoration -tooltip.bloodmagic.decoration.notSafe=Dangerous for decoration - -tooltip.bloodmagic.cuttingFluidRatio=%d/%d uses remaining - -tooltip.bloodmagic.potion.uses=%d uses remaining - -tooltip.bloodmagic.book.shifting=These symbols seem to be... &oshifting... - -tooltip.bloodmagic.willGauge=A strange device that can measure the Demon Will in the Aura. - -# Ritual -ritual.bloodmagic.blockRange.tooBig=The block range given is too big! Needs to be at most %s blocks. -ritual.bloodmagic.blockRange.tooFar=The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks. -ritual.bloodmagic.blockRange.inactive=The ritual stone is currently inactive, and cannot have its range modified. -ritual.bloodmagic.blockRange.noRange=The range was not properly chosen. -ritual.bloodmagic.blockRange.firstBlock=First block for new range stored. -ritual.bloodmagic.blockRange.success=New range successfully set! -ritual.bloodmagic.willConfig.set=The ritual will use these Demon Will types: %s -ritual.bloodmagic.willConfig.void=The ritual no longer uses Demon Will - -ritual.bloodmagic.testRitual=Test Ritual -ritual.bloodmagic.waterRitual=Ritual of the Full Spring -ritual.bloodmagic.lavaRitual=Serenade of the Nether -ritual.bloodmagic.greenGroveRitual=Ritual of the Green Grove -ritual.bloodmagic.jumpRitual=Ritual of the High Jump -ritual.bloodmagic.wellOfSufferingRitual=Well of Suffering -ritual.bloodmagic.featheredKnifeRitual=Ritual of the Feathered Knife -ritual.bloodmagic.regenerationRitual=Ritual of Regeneration -ritual.bloodmagic.harvestRitual=Reap of the Harvest Moon -ritual.bloodmagic.magneticRitual=Ritual of Magnetism -ritual.bloodmagic.crushingRitual=Ritual of the Crusher -ritual.bloodmagic.fullStomachRitual=Ritual of the Satiated Stomach -ritual.bloodmagic.interdictionRitual=Ritual of Interdiction -ritual.bloodmagic.containmentRitual=Ritual of Containment -ritual.bloodmagic.speedRitual=Ritual of Speed -ritual.bloodmagic.suppressionRitual=Ritual of Suppression -ritual.bloodmagic.expulsionRitual=Aura of Expulsion -ritual.bloodmagic.zephyrRitual=Call of the Zephyr -ritual.bloodmagic.upgradeRemoveRitual=Sound of the Cleansing Soul -ritual.bloodmagic.armourEvolveRitual=Ritual of Living Evolution -ritual.bloodmagic.animalGrowthRitual=Ritual of the Shepherd -ritual.bloodmagic.forsakenSoulRitual=Gathering of the Forsaken Souls -ritual.bloodmagic.crystalHarvestRitual=Crack of the Fractured Crystal -ritual.bloodmagic.meteorRitual=Mark of the Falling Tower -ritual.bloodmagic.ellipseRitual=Focus of the Ellipsoid -ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius -ritual.bloodmagic.placerRitual=Laying of the Filler -ritual.bloodmagic.fellingRitual=Crash of the Timberman -ritual.bloodmagic.pumpRitual=Hymn of Syphoning -ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar -ritual.bloodmagic.portalRitual=The Gate of the Fold -ritual.bloodmagic.downgradeRitual=Penance of the Leadened Soul -ritual.bloodmagic.crystalSplitRitual=Resonance of the Faceted Crystal -ritual.bloodmagic.condorRitual=Reverence of the Condor -ritual.bloodmagic.eternalSoulRitual=Cry of the Eternal Soul -ritual.bloodmagic.groundingRitual=Ritual of Grounding -ritual.bloodmagic.featheredEarthRitual=Ritual of the Feathered Earth -ritual.bloodmagic.veilOfEvilRitual=Veil of Evil -ritual.bloodmagic.wardOfSacrosanctityRitual=Ward of Sacrosanctity - -ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. -ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. -ritual.bloodmagic.lavaRitual.default.info=(Raw) Decreases the LP cost of placing lava and allows lava to be placed insided of a linked container. -ritual.bloodmagic.lavaRitual.corrosive.info=(Corrosive) Entities within range that are immune to fire are damaged severely. -ritual.bloodmagic.lavaRitual.destructive.info=(Destructive) Lava placement range is increased based on total Will. -ritual.bloodmagic.lavaRitual.vengeful.info=(Vengeful) Entities within range have Fire Fuse applied to them. -ritual.bloodmagic.lavaRitual.steadfast.info=(Steadfast) Players within a designated range have Fire Resistance applied to them. - -ritual.bloodmagic.greenGroveRitual.info=Grows crops within its area. -ritual.bloodmagic.jumpRitual.info=Causes entities to leap up into the air. -ritual.bloodmagic.wellOfSufferingRitual.info=Attacks mobs within its damage zone and puts the LP into a nearby blood altar. -ritual.bloodmagic.featheredKnifeRitual.info=Drains health from players in its area and puts the LP into a nearby blood altar. -ritual.bloodmagic.regenerationRitual.info=Casts regeneration on entities within its range if they are missing health. -ritual.bloodmagic.regenerationRitual.default.info=(Raw) -ritual.bloodmagic.regenerationRitual.corrosive.info=(Corrosive) Steals health from non-players inside of its Vampirism range and directly heals players. -ritual.bloodmagic.regenerationRitual.destructive.info=(Destructive) -ritual.bloodmagic.regenerationRitual.vengeful.info=(Vengeful) -ritual.bloodmagic.regenerationRitual.steadfast.info=(Steadfast) -ritual.bloodmagic.harvestRitual.info=Harvests plants within its range, dropping the results on the ground. -ritual.bloodmagic.magneticRitual.info=Pulls up ores from the ground and puts them into its placement range. -ritual.bloodmagic.crushingRitual.info=Breaks blocks within its crushing range and places the items into the linked chest. -ritual.bloodmagic.crushingRitual.destructive.info=(Destructive) Blocks are broken down forcefully: all blocks broken are affected by Fortune III. -ritual.bloodmagic.crushingRitual.steadfast.info=(Steadfast) Causes all blocks that are broken to be picked up with silk touch. Overrides Fortune where applicable. -ritual.bloodmagic.crushingRitual.corrosive.info=(Corrosive) All blocks are broken to be processed with a form of cutting fluid. Overrides Silk Touch where applicable. -ritual.bloodmagic.crushingRitual.vengeful.info=(Vengeful) Compresses the inventory on successful operation. Currently only does one compression per operation. -ritual.bloodmagic.crushingRitual.default.info=(Raw) Increases the speed of the ritual based on total Will. -ritual.bloodmagic.greenGroveRitual.corrosive.info=(Corrosive) Entities within range are attacked by nearby plants, leeching away their life. -ritual.bloodmagic.greenGroveRitual.default.info=(Raw) Increases the speed of all of the ritual operations depending on the total Will in the Aura. -ritual.bloodmagic.greenGroveRitual.vengeful.info=(Vengeful) Increases the rate that a growth tick is successful. -ritual.bloodmagic.greenGroveRitual.steadfast.info=(Steadfast) Seeds are replanted and blocks are hydrated within the Hydration range. -ritual.bloodmagic.greenGroveRitual.destructive.info=(Destructive) Growing range is increased based on total Will. -ritual.bloodmagic.featheredKnifeRitual.default.info=(Raw) Increases the speed of the ritual based on the total Will in the Aura. -ritual.bloodmagic.featheredKnifeRitual.destructive.info=(Destructive) Increases the yield of the ritual based on total Will. -ritual.bloodmagic.featheredKnifeRitual.vengeful.info=(Vengeful) Sets the minimum health for sacrificing to 10%%. Overridden by Steadfast for the Owner if active. -ritual.bloodmagic.featheredKnifeRitual.corrosive.info=(Corrosive) Uses the player's Incense to increase the yield. -ritual.bloodmagic.featheredKnifeRitual.steadfast.info=(Steadfast) Sets the minimum health for sacrificing from 30%% to 70%%. -ritual.bloodmagic.speedRitual.default.info=(Raw) Increases the velocity caused by the ritual based on total Will. -ritual.bloodmagic.speedRitual.vengeful.info=(Vengeful) Prevents adult mobs and players from being transported. Players are transported if paired with Destructive. -ritual.bloodmagic.speedRitual.destructive.info=(Destructive) Prevents child mobs and players from being transported. Players are transported if paired with Vengeful. -ritual.bloodmagic.animalGrowthRitual.vengeful.info=(Vengeful) Decreases the time it takes for adults to breed again. -ritual.bloodmagic.animalGrowthRitual.steadfast.info=(Steadfast) Automatically breeds adults within its area using items in the connected chest. -ritual.bloodmagic.animalGrowthRitual.default.info=(Raw) Increases the speed of the ritual based on the total Will in the Aura. -ritual.bloodmagic.animalGrowthRitual.destructive.info=(Destructive) Causes adults that have not bred lately to run at mobs and explode. -ritual.bloodmagic.animalGrowthRitual.corrosive.info=(Corrosive) Unimplemented. -ritual.bloodmagic.groundingRitual.info=Forces entities on the ground and prevents jumping. -ritual.bloodmagic.groundingRitual.default.info=(Raw) Affects players. -ritual.bloodmagic.groundingRitual.corrosive.info=(Corrosive) Disables gravity (+Vengeful) Applies Levitation. -ritual.bloodmagic.groundingRitual.destructive.info=(Destructive) Applies Heavy Heart (increases fall damage) (+Vengeful) Stronger effect. -ritual.bloodmagic.groundingRitual.steadfast.info=(Steadfast) Affects Bosses. Doesn't affect bosses that are immune against motion change or immune against potions (except Wither and Ender Dragon). -ritual.bloodmagic.groundingRitual.vengeful.info=(Vengeful) Makes effects stronger. (+Corrosive) Applies Levitation. (+Destructive) Higher Heavy Heart amplifier. -ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. -ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. - -ritual.bloodmagic.crystalSplitRitual.info=Splits apart a well-grown Raw crystal cluster into seperal aspected crystal clusters. -ritual.bloodmagic.fullStomachRitual.info=Takes food from the linked chest and fills the player's saturation with it. -ritual.bloodmagic.interdictionRitual.info=Pushes all mobs within its area away from the master ritual stone. -ritual.bloodmagic.containmentRitual.info=Pulls all mobs within its area towards the master ritual stone. -ritual.bloodmagic.speedRitual.info=Launches players within its range in the direction of the ritual. -ritual.bloodmagic.suppressionRitual.info=Suppresses fluids within its range - deactivating the ritual returns the fluids back to the world. -ritual.bloodmagic.expulsionRitual.info=Expels players from its range that are neither the owner nor have a bound blood orb in the chest on top of the master ritual stone. -ritual.bloodmagic.zephyrRitual.info=Picks up items within its range and places them into the linked chest. -ritual.bloodmagic.upgradeRemoveRitual.info=Removes all upgrades (and downgrades) from your Living Armor and gives you the corresponding Upgrade (and Downgrade) Tomes. These Tomes can be used to be applied to your Living Armor again. -ritual.bloodmagic.armourEvolveRitual.info=Increases the amount of maximum Upgrade Points on your Living Armor to 300. -ritual.bloodmagic.animalGrowthRitual.info=Increases the maturity rate of baby animals within its range. -ritual.bloodmagic.forsakenSoulRitual.info=Damages mobs within its damage range and when the mob dies a demon crystal within its crystal range will be grown. -ritual.bloodmagic.crystalHarvestRitual.info=Breaks Demon Will crystal clusters within its range, dropping the results on top of the crystals. -ritual.bloodmagic.placerRitual.info=Grabs blocks that are inside of the connected inventory and places them into the world. -ritual.bloodmagic.fellingRitual.info=A standard tree-cutting machine, this ritual will cut down all trees and leaves within its area and collect the drops. -ritual.bloodmagic.pumpRitual.info=Looks around the world and grabs fluids from the defined area. Will only remove and put the fluid into the connected tank if the tank has at least a bucket's worth of the same fluid. -ritual.bloodmagic.altarBuilderRitual.info=Builds an altar out of the components inside of the connected inventory. -ritual.bloodmagic.portalRitual.info=Creates a portal network based on the activator and the immediately surrounding blocks. Blocks can be changed after activation without changing the network of portals, and portals with the same "key" will link together. -ritual.bloodmagic.meteorRitual.info=Consumes an item inside of its item range to summon a meteor full of resources from the sky, aimed directly at the ritual. - -ritual.bloodmagic.waterRitual.waterRange.info=(Water) The area that the ritual will place water source blocks. -ritual.bloodmagic.waterRitual.waterTank.info=(Raw) The tank that the ritual will place water into. -ritual.bloodmagic.lavaRitual.lavaRange.info=(Lava) The area that the ritual will place lava source blocks. -ritual.bloodmagic.lavaRitual.lavaTank.info=(Raw) The tank that the ritual will place lava into. -ritual.bloodmagic.lavaRitual.fireFuse.info=(Vengeful) Entities in this range are afflicted by Fire Fuse. -ritual.bloodmagic.lavaRitual.fireResist.info=(Steadfast) Players in this range have Fire Resist applied. -ritual.bloodmagic.lavaRitual.fireDamage.info=(Corrosive) Entities within this range that are immune to fire damage are hurt proportional to the Will. -ritual.bloodmagic.greenGroveRitual.growing.info=(Growth) The area that the ritual will grow plants in. -ritual.bloodmagic.greenGroveRitual.leech.info=(Corrosive) Entities in this area have their life drained to grow nearby crops. -ritual.bloodmagic.greenGroveRitual.hydrate.info=(Steadfast) Blocks within this range are rehydrated into farmland, and seeds within the area are planted nearby. -ritual.bloodmagic.jumpRitual.jumpRange.info=(Jumping) Entities in this range will be launched in the air. -ritual.bloodmagic.wellOfSufferingRitual.altar.info=(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region. -ritual.bloodmagic.wellOfSufferingRitual.damage.info=(Damage) This defines where the ritual will damage a mob. All mobs inside of this range (except for players) will receive damage over time. -ritual.bloodmagic.featheredKnifeRitual.altar.info=(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region. -ritual.bloodmagic.featheredKnifeRitual.damage.info=(Damage) This defines where the ritual will damage a player. Players inside of this range will receive damage over time up to the specified limit. -ritual.bloodmagic.regenerationRitual.heal.info=(Healing) Entities within this range will receive a regeneration buff. -ritual.bloodmagic.regenerationRitual.vampire.info=(Vampirism) Mobs within this range have their health syphoned to heal players in the Healing range. -ritual.bloodmagic.harvestRitual.harvestRange.info=(Harvesting) Plants within this range will be harvested. -ritual.bloodmagic.magneticRitual.placementRange.info=(Placement) The range that the ritual will place the grabbed ores into. -ritual.bloodmagic.crushingRitual.crushingRange.info=(Crushing) The blocks that the ritual will break. -ritual.bloodmagic.crushingRitual.chest.info=(Chest) The location of the inventory that the ritual will place the broken blocks into. -ritual.bloodmagic.fullStomachRitual.fillRange.info=(Feeding) The range that the ritual will look at to feed players. -ritual.bloodmagic.fullStomachRitual.chest.info=(Chest) The location of the inventory that the ritual will grab food from to feed players in range. -ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Push) The area of the ritual where mobs will be pushed. All mobs are pushed away from the master ritual stone, regardless of where this area is. -ritual.bloodmagic.containmentRitual.containmentRange.info=(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is. -ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. -ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Suppress) All liquids within the range are suppressed. -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) The area from which players that are not owner or have an orb in the chest will be teleported away from. -ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Suction) Items within this range will be sucked into the linked chest. -ritual.bloodmagic.zephyrRitual.chest.info=(Chest) The location of the inventory that the ritual will place the picked up items into. -ritual.bloodmagic.animalGrowthRitual.growing.info=(Growth) Animals within this range will grow much faster. -ritual.bloodmagic.animalGrowthRitual.chest.info=(Chest) Chest for breeding items if properly augmented. -ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in this range receive an increase in growth speed when a mob is killed by the ritual. -ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. -ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. - -ritual.bloodmagic.ellipseRitual.info=Creates a hollow spheroid around the ritual using the blocks in the attached chest. -ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated. -ritual.bloodmagic.ellipseRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. - -ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. -ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. -ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down. -ritual.bloodmagic.fellingRitual.chest.info=(Chest) The location of the inventory that the ritual will place the results into. -ritual.bloodmagic.pumpRitual.pumpRange.info=(Pump) The region that the ritual will look for fluids to grab from the world. - -ritual.bloodmagic.downgradeRitual.dialogue.bow.1=So, mortal, you want to gain more power...? -ritual.bloodmagic.downgradeRitual.dialogue.bow.100=Of course you must know that everything has a cost... I cannot simply grant you more power without you paying something in return... -ritual.bloodmagic.downgradeRitual.dialogue.bow.300=If you lay an offering before me, you will forsake your perception, preventing you from using long-ranged projectiles with any form of accuracy. Arrows will no longer be your key to victory. -ritual.bloodmagic.downgradeRitual.dialogue.bow.500=But in return, I will unlock your armour so that it may grow even further... All you have to do is kneel before this altar with the correct offering... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.1=Fufufu... Greetings. I see that you wish to become more powerful. -ritual.bloodmagic.downgradeRitual.dialogue.quenched.100=You must be fully aware that when one's cup becomes full, it invariably has to empty once more to be filled again. -ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=As such, I offer you a deal: by forsaking one's ability to drink, I shall grant you a vast increase to your potential. Whether this is a deal you think is worth taking is another matter entirely... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.500=So kneel, mortal, and drink from this cup that I offer to you, for it may be your last drink. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=Hmmm... What is it that you truly desire? -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.100=If it is strength beyond mortal men, then I cannot provide that - instead, I can offer you a different deal... -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.300=I can expand the capabilities of your armour, allowing you to achieve greater heights. However, I will need something from you in return: your strength in physical combat. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.500=By agreeing to this, you will no longer be able to swing a weapon with as much certainty, only able to do a fraction of the damage you could before. -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.700=So, the choice is yours: will you kneel at this altar, or will you still take up your sword? -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.1=Beware, mortal, for you are on shaky ground. -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=Unlike my comrades, I offer one of the most grim deals that you could possibly hope for as a magician that deals in your own health. -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=Although your wounds may heal, they will do so slowly if you accept my "offering," and the stings of battle will plague you even more. -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=So think carefully before you rush into something that you may regret, since even though your cup may be empty it will be almost impossible to fill once more... - -ritual.bloodmagic.featheredEarthRitual.info=Prevents falldamage in an area. -ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual. -ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost. - -# Chat -chat.bloodmagic.altarMaker.setTier=Set Tier to: %d -chat.bloodmagic.altarMaker.building=Building a Tier %d Altar -chat.bloodmagic.altarMaker.destroy=Destroyed a Tier %d Altar -chat.bloodmagic.altarMaker.creativeOnly=This is a creative only item. - -chat.bloodmagic.damageSource=%s's soul became too weak - -chat.bloodmagic.ritual.weak=You feel a push, but are too weak to perform this ritual. -chat.bloodmagic.ritual.prevent=The ritual is actively resisting you! -chat.bloodmagic.ritual.activate=A rush of energy flows through the ritual! -chat.bloodmagic.ritual.notValid=You feel that these runes are not configured correctly... - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=You are starting to feel better already! -chat.bloodmagic.livingArmour.upgrade.fireRemove=&6A cool feeling envelopes you as the burning subsides. -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6A shadowy force pulls you from the brink of death! -chat.bloodmagic.livingArmour.newUpgrade=&4Upgrade acquired! - -chat.bloodmagic.routing.remove=Removing contained location -chat.bloodmagic.routing.set=Setting node location -chat.bloodmagic.routing.link.master=Linked node to master! -chat.bloodmagic.routing.link=Linked nodes together - -chat.bloodmagic.altar.comp.glowstone=a block of glowstone -chat.bloodmagic.altar.comp.bloodstone=a large bloodstone brick -chat.bloodmagic.altar.comp.beacon=a beacon -chat.bloodmagic.altar.comp.bloodrune=a blood rune -chat.bloodmagic.altar.comp.crystal=an unimplemented item -chat.bloodmagic.altar.comp.notair=a solid block - -chat.bloodmagic.altar.nextTier=The next tier of blood altar is missing %s at %s. - -chat.bloodmagic.mimic.potionSet=Potion trap has been set. -chat.bloodmagic.mimic.potionRemove=Potion trap has been disabled. -chat.bloodmagic.mimic.potionInterval.up=Potion Interval has been increased to: %d ticks. -chat.bloodmagic.mimic.potionInterval.down=Potion Interval has been decreased to: %d ticks. -chat.bloodmagic.mimic.detectRadius.up=Player detection radius has been increased to: %d blocks. -chat.bloodmagic.mimic.detectRadius.down=Player detection radius has been decreased to: %d blocks. -chat.bloodmagic.mimic.potionSpawnRadius.up=Potion spawning radius has been increased to: %d blocks. -chat.bloodmagic.mimic.potionSpawnRadius.down=Potion spawning radius has been decreased to: %d blocks. - -death.attack.ritual_damage=%1$s has been sacrificed for a ritual. -death.attack.ritual_damage.player=%2$s has sacrificed %1$s for a ritual. - -# entity -entity.bloodmagic.SentientSpecter.name=Sentient Specter -entity.bloodmagic.Mimic.name=Mimic - -# Commands -commands.bloodmagic.error.arg.invalid=Invalid arguments -commands.bloodmagic.error.arg.missing=Not enough arguments -commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on. -commands.bloodmagic.error.negative=Amount must be a positive Integer. -commands.bloodmagic.error.outofbounds=Given integer is too large (must be within list ID boundaries). - -commands.bloodmagic.success=Executed successfully - -commands.bloodmagic.format.help=%s - %s -commands.bloodmagic.format.error=%s - %s - -commands.bloodmagic.help.usage=/bloodmagic help -commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic" command. - -commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] -commands.bloodmagic.network.help=LP network utilities - -commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network. -commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s. -commands.bloodmagic.network.syphon.usage=/bloodmagic network syphon [player] [amount] -commands.bloodmagic.network.syphon.amountTooHigh=Cannot syphon more LP than available. -commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. -commands.bloodmagic.network.add.usage=/bloodmagic network add [player] [amount] -commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network. -commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount. -commands.bloodmagic.network.set.usage=/bloodmagic network set [player] [amount] -commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP. -commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network. -commands.bloodmagic.network.get.usage=/bloodmagic network get [player] -commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d. -commands.bloodmagic.network.fill.usage=/bloodmagic network fill [player] -commands.bloodmagic.network.fill.success=Successfully filled %s's LP network. -commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. -commands.bloodmagic.network.cap.usage=/bloodmagic network cap [player] -commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network. -commands.bloodmagic.network.tickethistory.help=Shows the soul ticket history containing information about LP consumers for the player -commands.bloodmagic.network.tickethistory.usage=/bloodmagic network tickethistory [player] - -commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] ("?" or "help" for help) -commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item. -commands.bloodmagic.bind.success=Successfully bound to %d. -commands.bloodmagic.bind.remove.success=Unbinding successful -commands.bloodmagic.bind.error.ownerEqualsTarget=Nothing changed: Target and current owner are equal. -commands.bloodmagic.bind.error.notBound=Cannot unbind: Item not bound. -commands.bloodmagic.bind.error.notBindable=Cannot bind: Item not bindable. - -commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] ("?" or "help" for help) -commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier. -commands.bloodmagic.orb.get.help=Used to get the Player's max Blood Orb tier. -commands.bloodmagic.orb.get.usage=/bloodmagic orb get [player|?|help] -commands.bloodmagic.orb.set.help=Used to set the Player's max Blood Orb tier. -commands.bloodmagic.orb.set.usage=/bloodmagic orb set [player|?|help] -commands.bloodmagic.orb.currenttier=Current Orb tier is %d. -commands.bloodmagic.orb.error.tierTooHigh=Orb tier cannot be higher than %d. - -commands.bloodmagic.ritual.create.help=Creates the specified ritual with the MRS at your feet, ignores other blocks by default. (Optional parameters: ([ (safe|true|false)] | [safe|true|false])) -commands.bloodmagic.ritual.repair.help=Repairs the ritual with the closest match to the remaining ritual stones, ignores other blocks by default. (Optional parameters: ([ (safe|true|false)] | [safe|true|false])) - -commands.bloodmagic.ritual.create.noRitual=You must select a ritual. (Tab-completions are available!) -commands.bloodmagic.ritaul.create.error.unsafe=Created or repaired ritual cannot be placed safely. -commands.bloodmagic.ritual.create.error.outOfWorldBoundaries=Created or repaired ritual would be out of world boundaries. -commands.bloodmagic.ritual.error.noMRS=You need to stand on a Master Ritual Stone to execute the command! - -commands.bloodmagic.teleposer.usage=Teleposer Utilities ("?" or "help" for help) -commands.bloodmagic.teleposer.list.help=Returns a list of all valid teleposers, optionally possessed by [player]. -commands.bloodmagic.teleposer.list.usage=/bloodmagic teleposer list [player|?|help] -commands.bloodmagic.teleposer.teleport.help=Teleports to the location of the specified teleposer. -commands.bloodmagic.teleposer.teleport.usage=/bloodmagic teleposer teleport [ID|?|help] -commands.bloodmagic.teleposer.teleportfocus.help=Teleports to the location stored in the specified teleposer's focus. -commands.bloodmagic.teleposer.teleportfocus.usage=/bloodmagic teleposer teleportfocus [ID|?|help] -commands.bloodmagic.teleposer.rmrf.help=Follows teleposer foci and removes all teleposers along the path, starting with the specified teleposer. -commands.bloodmagic.teleposer.rmrf.usage=/bloodmagic teleposer rmrf [ID|?|help] -commands.bloodmagic.teleposer.remove.help=Removes the specified teleposer. -commands.bloodmagic.teleposer.remove.usage=/bloodmagic teleposer remove [ID|?|help] -commands.bloodmagic.teleposer.removeall.help=Removes all teleposers or all teleposers containing a focus bound to [player], if specified. -commands.bloodmagic.teleposer.removeall.usage=/bloodmagic teleposer removeall [player|?|help] - -#Used by commands.bloodmagic.teleposer.list for the dump sent to the player -commands.bloodmagic.teleposer.anddimension=: Teleposer: DimID: -commands.bloodmagic.teleposer.focusanddim=Focus: DimID: -commands.bloodmagic.teleposer.owner=Owner: - - -# GUI -tile.bloodmagic.inputNode.name=Input Node -tile.bloodmagic.outputNode.name=Output Node -gui.bloodmagic.save=Save -gui.bloodmagic.cancel=Cancel -gui.bloodmagic.default=Default -gui.bloodmagic.toggle=Toggle -config.bloodmagic.edit_hud=Edit HUD Elements - -# Keybinds -bloodmagic.keybind.open_holding=Open Sigil of Holding -bloodmagic.keybind.cycle_holding_pos=Cycle Sigil (+) -bloodmagic.keybind.cycle_holding_neg=Cycle Sigil (-) - -# JustEnoughItems -jei.bloodmagic.recipe.altar=Blood Altar -jei.bloodmagic.recipe.binding=Alchemy Array (Binding) -jei.bloodmagic.recipe.alchemyArrayCrafting=Alchemy Array -jei.bloodmagic.recipe.soulForge=Hellfire Forge -jei.bloodmagic.recipe.alchemyTable=Alchemy Table -jei.bloodmagic.recipe.armourDowngrade=Penance (Ritual) -jei.bloodmagic.recipe.requiredLP=LP: %d -jei.bloodmagic.recipe.requiredTier=Tier: %d -jei.bloodmagic.recipe.consumptionRate=Consumption: %d LP/t -jei.bloodmagic.recipe.drainRate=Drain: %d LP/t -jei.bloodmagic.recipe.minimumSouls=Minimum: %1$,.2f Will -jei.bloodmagic.recipe.soulsDrained=Drained: %1$,.2f Will -jei.bloodmagic.recipe.lpDrained=Drained: %,d LP -jei.bloodmagic.recipe.ticksRequired=Time: %,d Ticks - -jei.bloodmagic.desc.altarBuilder=A creative-only item for use in debugging and testing.\n\nShift + Right click to change the tier to build. Right click an Altar to initiate the build.\n\nBreak an Altar while holding to dismantle it. -jei.bloodmagic.desc.demonicWill=An imprint of a demonic entity attached to a creature.\n\nCan be obtained by killing a mob with a sentient weapon or by throwing a snare at a mob and killing it while it has white particles. - -# WAILA -waila.bloodmagic.sneak=&oSneak for Information -waila.bloodmagic.array.reagent=Reagent: %s -waila.bloodmagic.array.catalyst=Catalyst: %s -option.bloodmagic.bypassSneak=Bypass Sneak -option.bloodmagic.bloodAltar=Blood Altar -option.bloodmagic.ritualController=Ritual Stones -option.bloodmagic.teleposer=Teleposer -option.bloodmagic.array=Alchemy Array - -# Thaumcraft -tc.research_category.BLOODMAGIC=Sanguine Arcana - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=Blood Magic -bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana -bloodmagic.research_page.BLOODMAGIC.1=The realm of the Blood Magics has always appeared to be a more solitary and "individual" art with blood mages being notoriously reclusive and a bit insane at times. However, the powers of self-sacrifice and life essence have uses even beyond a normal blood mage's sight, in fact, it is quite apparent that it may have some uses in thaumaturgy after all! - -# Buttons -button.bloodmagic.tooltip.fill=Fill network diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang_old b/src/main/resources/assets/bloodmagic/lang/en_US.lang_old deleted file mode 100644 index 2d74a6ce..00000000 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang_old +++ /dev/null @@ -1,542 +0,0 @@ -#Items -item.AlchemicalWizardry.bindable.activationCrystal.weak.name=Weak Activation Crystal -item.AlchemicalWizardry.bindable.activationCrystal.awakened.name=Awakened Activation Crystal -item.AlchemicalWizardry.bindable.activationCrystal.creative.name=Creative Activation Crystal - -item.AlchemicalWizardry.dagger.name=Sacrificial Dagger -item.AlchemicalWizardry.dagger.creative.name=Creative Sacrificial Dagger - -item.AlchemicalWizardry.scribe.water.name=Water Scribing Tools -item.AlchemicalWizardry.scribe.fire.name=Fire Scribing Tools -item.AlchemicalWizardry.scribe.earth.name=Earth Scribing Tools -item.AlchemicalWizardry.scribe.air.name=Air Scribing Tools -item.AlchemicalWizardry.scribe.dusk.name=Dusk Scribing Tools -item.AlchemicalWizardry.scribe.dawn.name=Dawn Scribing Tools - -item.AlchemicalWizardry.slate.blank.name=Blank Slate -item.AlchemicalWizardry.slate.reinforced.name=Reinforced Slate -item.AlchemicalWizardry.slate.imbued.name=Imbued Slate -item.AlchemicalWizardry.slate.demonic.name=Demonic Slate - -item.AlchemicalWizardry.focus.weak.name=Teleposition Focus -item.AlchemicalWizardry.focus.enhanced.name=Enhanced Teleposition Focus -item.AlchemicalWizardry.focus.reinforced.name=Reinforced Teleposition Focus -item.AlchemicalWizardry.focus.demonic.name=Demonic Teleposition Focus - -item.AlchemicalWizardry.orb.weak.name=Weak Blood Orb -item.AlchemicalWizardry.orb.apprentice.name=Apprentice Blood Orb -item.AlchemicalWizardry.orb.magician.name=Magician Blood Orb -item.AlchemicalWizardry.orb.master.name=Master Blood Orb -item.AlchemicalWizardry.orb.archmage.name=Archmage Blood Orb -item.AlchemicalWizardry.orb.transcendent.name=Transcendent Blood Orb - -item.AlchemicalWizardry.reagent.incendium.name=Incendium -item.AlchemicalWizardry.reagent.magicales.name=Magicales -item.AlchemicalWizardry.reagent.sanctus.name=Sanctus -item.AlchemicalWizardry.reagent.aether.name=Aether -item.AlchemicalWizardry.reagent.crepitous.name=Crepitous -item.AlchemicalWizardry.reagent.crystallos.name=Crystallos -item.AlchemicalWizardry.reagent.terrae.name=Terrae -item.AlchemicalWizardry.reagent.aquasalus.name=Aquasalus -item.AlchemicalWizardry.reagent.tennebrae.name=Tennebrae -item.AlchemicalWizardry.reagent.offensa.name=Offensa -item.AlchemicalWizardry.reagent.praesidium.name=Praesidium -item.AlchemicalWizardry.reagent.orbisterrae.name=Orbis Terrae -item.AlchemicalWizardry.reagent.virtus.name=Virtus -item.AlchemicalWizardry.reagent.reductus.name=Reductus -item.AlchemicalWizardry.reagent.potentia.name=Potentia - -item.AlchemicalWizardry.sigil.air.name=Air Sigil -item.AlchemicalWizardry.sigil.bloodLight.name=Sigil of the Blood Lamp -item.AlchemicalWizardry.sigil.compression.name=Sigil of Compression -item.AlchemicalWizardry.sigil.divination.name=Divination Sigil - -# Tooltips -tooltip.sigil.air.desc=I feel lighter already... -tooltip.sigil.bloodLight.desc=I see a light! -tooltip.sigil.compression.desc=Hands of Diamonds -tooltip.sigil.divination.desc=Peer into the soul - -#Block Localization -tile.altar.name=Blood Altar -tile.blood_rune.blank.name=Blood Rune -tile.blood_rune.fill.name=Rune of Augmented Capacity -tile.blood_rune.empty.name=Rune of Dislocation -tile.blood_rune.orb.name=Rune of the Orb -tile.blood_rune.betterCapacity.name=Rune of Superior Capacity -tile.blood_rune.acceleration.name=Rune of Acceleration -tile.speed_rune.name=Speed Rune -tile.efficiency_rune.name=Efficiency Rune -tile.sacrifice_rune.name=Rune of Sacrifice -tile.self_sacrifice_rune.name=Rune of Self-Sacrifice -tile.ritual_stone.name=Ritual Stone -tile.master_ritual_stone.name=Master Ritual Stone -tile.filled_socket.name=Filled Socket -tile.imperfect_ritual_stone.name=Imperfect Ritual Stone -tile.soul_armour_forge.name=Soul Armour Forge -tile.empty_socket.name=Empty Socket -tile.bloodstone_brick.name=Bloodstone Brick -tile.large_bloodstone_brick.name=Large Bloodstone Brick -tile.chemistry_set.name=Alchemical Chemistry Set -tile.spell_table.name=Spell Table -tile.pedestal.name=Arcane Pedestal -tile.plinth.name=Arcane Plinth -tile.teleposer.name=Teleposer -tile.spell_conduit.name=Spell Conduit -tile.spell_paradigm.projectile.name=Particle Generator -tile.spell_paradigm.self.name=Self Augmentator -tile.spell_paradigm.melee.name=Melee Aggregator -tile.spell_paradigm.tool.name=Tool Forger -tile.spell_enhancement.power1.name=Unstable Spell Empowerer -tile.spell_enhancement.power2.name=Standard Spell Empowerer -tile.spell_enhancement.power3.name=Reinforced Spell Empowerer -tile.spell_enhancement.power4.name=Imbued Spell Empowerer -tile.spell_enhancement.power5.name=Demonic Spell Empowerer -tile.spell_enhancement.cost1.name=Unstable Spell Dampener -tile.spell_enhancement.cost2.name=Standard Spell Dampener -tile.spell_enhancement.cost3.name=Reinforced Spell Dampener -tile.spell_enhancement.cost4.name=Imbued Spell Dampener -tile.spell_enhancement.cost5.name=Demonic Spell Dampener -tile.spell_enhancement.potency1.name=Unstable Spell Augmentor -tile.spell_enhancement.potency2.name=Standard Spell Augmentor -tile.spell_enhancement.potency3.name=Reinforced Spell Augmentor -tile.spell_enhancement.potency4.name=Imbued Spell Augmentor -tile.spell_enhancement.potency5.name=Demonic Spell Augmentor -tile.spell_modifier.default.name=Default Spell Modifier -tile.spell_modifier.offensive.name=Offensive Spell Modifier -tile.spell_modifier.defensive.name=Defensive Spell Modifier -tile.spell_modifier.environmental.name=Environmental Spell Modifier -tile.spell_effect.fire.name=Crucible of Fire -tile.spell_effect.ice.name=Ice Maker -tile.spell_effect.wind.name=Wind Generator -tile.spell_effect.earth.name=Earth Former -tile.alchemical_calcinator.name=Alchemical Calcinator -tile.crystal_belljar.name=Crystal Belljar -tile.reagent_conduit.name=Alchemy Relay -tile.life_essence.name=Life Essence -tile.crystal_block.fullCrystal.name=Crystal Cluster -tile.crystal_block.crystalBrick.name=Crystal Cluster Brick -tile.demon_portal.name=Demon Portal -tile.demon_chest.name=Demon's Chest -tile.enchantment_glyph.enchantability.name=Glyph of the Adept Enchanter -tile.enchantment_glyph.enchantmentLevel.name=Glyph of Arcane Potential -tile.stability_glyph.stability1.name=Glyph of Rigid Stability -tile.schematic_saver.name=Schematic Saver -tile.mimic_block.name=Mimic Block -tile.spectral_container.name=Spectral Container -tile.blood_light.name=Blood Light -tile.spectral_block.name=Spectral Block -tile.incense_crucible.name=Incense Crucible - -#Item Localization -item.weak_blood_orb.name=Weak Blood Orb -item.apprentice_blood_orb.name=Apprentice Blood Orb -item.magician_blood_orb.name=Magician's Blood Orb -item.master_blood_orb.name=Master Blood Orb -item.archmage_blood_orb.name=Archmage's Blood Orb -item.energy_blast.name=Energy Blaster -item.energy_sword.name=Bound Blade -item.lava_crystal.name=Lava Crystal -item.water_sigil.name=Water Sigil -item.lava_sigil.name=Lava Sigil -item.void_sigil.name=Void Sigil -item.blank_slate.name=Blank Slate -item.reinforced_slate.name=Reinforced Slate -item.sacrificial_dagger.name=Sacrificial Knife -item.dagger_of_sacrifice.name=Dagger of Sacrifice -item.air_sigil.name=Air Sigil -item.sigil_of_the_fast_miner.name=Sigil of the Fast Miner -item.sigil_of_elemental_affinity.name=Sigil of Elemental Affinity -item.sigil_of_haste.name=Sigil of Haste -item.sigil_of_holding.name=Sigil of Holding -item.divination_sigil.name=Divination Sigil -item.water_scribe_tool.name=Elemental Inscription Tool: Water -item.fire_scribe_tool.name=Elemental Inscription Tool: Fire -item.earth_scribe_tool.name=Elemental Inscription Tool: Earth -item.air_scribe_tool.name=Elemental Inscription Tool: Air -item.dusk_scribe_tool.name=Elemental Inscription Tool: Dusk -item.activation_crystal_weak.name=Weak Activation Crystal -item.activation_crystal_awakened.name=Awakened Activation Crystal -item.activation_crystal_creative.name=Creative Activation Crystal -item.bound_pickaxe.name=Bound Pickaxe -item.bound_axe.name=Bound Axe -item.bound_shovel.name=Bound Shovel -item.bound_helmet.name=Bound Helmet -item.bound_chestplate.name=Bound Chestplate -item.bound_leggings.name=Bound Leggings -item.bound_boots.name=Bound Boots -item.weak_blood_shard.name=Weak Blood Shard -item.growth_sigil.name=Sigil of the Green Grove -item.blank_spell.name=Unbound Crystal -item.alchemy_flask.name=Potion Flask -item.standard_binding_agent.name=Standard Binding Agent -item.mundane_power_catalyst.name=Mundane Power Catalyst -item.average_power_catalyst.name=Average Power Catalyst -item.greater_power_catalyst.name=Greater Power Catalyst -item.mundane_lengthening_catalyst.name=Mundane Lengthening Catalyst -item.average_lengthening_catalyst.name=Average Lengthening Catalyst -item.greater_lengthening_catalyst.name=Greater Lengthening Catalyst -item.incendium.name=Incendium -item.magicales.name=Magicales -item.sanctus.name=Sanctus -item.aether.name=Aether -item.simple_catalyst.name=Simple Catalyst -item.crepitous.name=Crepitous -item.crystallos.name=Crystallos -item.terrae.name=Terrae -item.aquasalus.name=Aquasalus -item.tennebrae.name=Tenebrae -item.demon_blood_shard.name=Demon Blood Shard -item.sigil_of_wind.name=Sigil of the Whirlwind -item.teleposition_focus.name=Teleposition Focus -item.enhanced_teleposition_focus.name=Enhanced Teleposition Focus -item.reinforced_teleposition_focus.name=Reinforced Teleposition Focus -item.demonic_teleposition_focus.name=Demonic Teleposition Focus -item.imbued_slate.name=Imbued Slate -item.demonic_slate.name=Demonic Slate -item.sigil_of_the_bridge.name=Sigil of the Phantom Bridge -item.armour_inhibitor.name=Armour Inhibitor -item.creative_orb.name=Orb of Testing -item.weak_filling_agent.name=Weak Filling Agent -item.standard_filling_agent.name=Standard Filling Agent -item.enhanced_filling_agent.name=Enhanced Filling Agent -item.weak_binding_agent.name=Weak Binding Agent -item.ritual_diviner.name=Ritual Diviner -item.ritual_dismantler.name=Ritual Dismantler -item.sigil_of_magnetism.name=Sigil of Magnetism -item.key_of_binding.name=Key of Binding -item.energy_bazooka.name=Energy Bazooka -item.blood_light_sigil.name=Sigil of the Blood Lamp -item.complex_spell_crystal.name=Complex Spell Crystal -item.sigil_of_supression.name=Sigil of Supression -item.sigil_of_ender_severance.name=Sigil of Ender Severance -item.bucket_life.name=Bucket of Life -item.base_items.quartz_rod.name=Quartz Rod -item.base_items.empty_core.name=Empty Core -item.base_items.magicales_cable.name=Magicales Cable -item.base_items.wood_brace.name=Wooden Brace -item.base_items.stone_brace.name=Stone Brace -item.base_items.projectile_core.name=Projectile Core -item.base_items.self_core.name=Self Core -item.base_items.melee_core.name=Melee Core -item.base_items.tool_core.name=Tool Core -item.base_items.paradigm_back_plate.name=Paradigm Plate -item.base_items.output_cable.name=Output Spell Cable -item.base_items.input_cable.name=Input Spell Cable -item.base_items.flame_core.name=Fire Core -item.base_items.icy_core.name=Icy Core -item.base_items.gust_core.name=Gusty Core -item.base_items.earthen_core.name=Earthen Core -item.base_items.cracked_runic_plate.name=Cracked Runic Plate -item.base_items.runic_plate.name=Runic Plate -item.base_items.scribed_runic_plate.name=Imbued Runic Plate -item.base_items.default_core.name=Unattuned Core -item.base_items.offensive_core.name=Offensive Core -item.base_items.defensive_core.name=Defensive Core -item.base_items.environmental_core.name=Environmental Core -item.base_items.power_core.name=Power Core -item.base_items.cost_core.name=Reduction Core -item.base_items.potency_core.name=Potency Core -item.base_items.obsidian_brace.name=Obsidian Brace -item.base_items.ethereal_slate.name=Ethereal Slate -item.base_items.life_shard.name=Life Shard -item.base_items.soul_shard.name=Soul Shard -item.base_items.life_brace.name=Living Brace -item.base_items.soul_runic_plate.name=Soul Runic Plate -item.base_items.ender_shard.name=Ender Shard -item.base_alchemy_items.offensa.name=Offensa -item.base_alchemy_items.praesidium.name=Praesidium -item.base_alchemy_items.orbis_terrae.name=Orbis Terrae -item.base_alchemy_items.strengthened_catalyst.name=Strengthened Catalyst -item.base_alchemy_items.concentrated_catalyst.name=Concentrated Catalyst -item.base_alchemy_items.fractured_bone.name=Fractured Bone -item.base_alchemy_items.virtus.name=Virtus -item.base_alchemy_items.reductus.name=Reductus -item.base_alchemy_items.potentia.name=Potentia -item.sanguine_helmet.name=Sanguine Helmet -item.seer_sigil.name=Sigil of Sight -item.fluid_sigil.name=Sigil of Fluidity -item.multi_tool.name=Dynamic Mace -item.combinational_catalyst.name=Combinational Catalyst -item.sanguine_robe.name=Sanguine Robes -item.sanguine_pants.name=Sanguine Leggings -item.sanguine_boots.name=Sanguine Boots -item.alchemical_router.name=Alchemic Router -item.alchemical_segmenter.name=Alchemic Segmenter -item.alchemical_cleanser.name=Alchemic Cleanser -item.demon_crystal.name=Demon Crystal -item.creative_dagger.name=Creative Sacrificial Knife -item.blood_pack.name=Blood Letter's Pack -item.harvest_sigil.name=Harvest Goddess Sigil -item.compression_sigil.name=Sigil of Compression -item.assassin_sigil.name=Sigil of the Assassin -item.transcendent_blood_orb.name=Transcendent Blood Orb -item.mail_catalogue.name=Mail Order Catalogue -item.input_routing_focus.name=Input Routing Focus -item.output_routing_focus.default.name=Default Output Routing Focus -item.output_routing_focus.modItem.name=Output Routing Focus (ModItem) -item.output_routing_focus.ignMeta.name=Output Routing Focus (Ignore Meta) -item.output_routing_focus.matchNBT.name=Output Routing Focus (MatchNBT) -item.output_routing_focus.global.name=Output Routing Focus (Global) -item.dawn_scribe_tool.name=Elemental Inscription Tool: Dawn -item.bound_helmet_earth.name=Earth Omega Helmet -item.bound_chestplate_earth.name=Earth Omega Chestplate -item.bound_leggings_earth.name=Earth Omega Leggings -item.bound_boots_earth.name=Earth Omega Boots -item.bound_helmet_wind.name=Wind Omega Helmet -item.bound_chestplate_wind.name=Wind Omega Chestplate -item.bound_leggings_wind.name=Wind Omega Leggings -item.bound_boots_wind.name=Wind Omega Boots -item.bound_helmet_fire.name=Fire Omega Helmet -item.bound_chestplate_fire.name=Fire Omega Chestplate -item.bound_leggings_fire.name=Fire Omega Leggings -item.bound_boots_fire.name=Fire Omega Boots -item.bound_helmet_water.name=Water Omega Helmet -item.bound_chestplate_water.name=Water Omega Chestplate -item.bound_leggings_water.name=Water Omega Leggings -item.bound_boots_water.name=Water Omega Boots - -item.incense.wood_ash.name=Wood Ash -item.incense.byrrus.name=Byrrus -item.incense.livens.name=Livens -item.incense.viridis.name=Viridis -item.incense.purpura.name=Purpura - -#Creative Tab -itemGroup.tabBloodMagic=Blood Magic - -#Extra Strings -bm.string.consume=Usage -bm.string.drain=Drain -bm.string.tier=Tier -bm.string.crafting.orb.shaped=Shaped Orb Crafting -bm.string.crafting.orb.shapeless=Shapeless Orb Crafting -text.recipe.altar=Blood Altar -text.recipe.altar.tier=Tier: %s -text.recipe.altar.bloodRequired=LP: %s -text.recipe.shapedOrb=Shaped Orb Recipe - -#Entities -entity.AWWayofTime.EarthElemental.name=Earth Elemental -entity.AWWayofTime.FireElemental.name=Fire Elemental -entity.AWWayofTime.HolyElemental.name=Holy Elemental -entity.AWWayofTime.ShadeElemental.name=Shade Elemental -entity.AWWayofTime.WaterElemental.name=Water Elemental -entity.AWWayofTime.AirElemental.name=Air Elemental -entity.AWWayofTime.Shade.name=Shade -entity.AWWayofTime.BoulderFist.name=Boulder Fist -entity.AWWayofTime.IceDemon.name=Ice Demon -entity.AWWayofTime.SmallEarthGolem.name=Small Earth Golem -entity.AWWayofTime.WingedFireDemon.name=Winged Fire Demon -entity.AWWayofTime.BileDemon.name=Bile Demon -entity.AWWayofTime.LowerGuardian.name=Lower Guardian -entity.AWWayofTime.FallenAngel.name=Fallen Angel -entity.AWWayofTime.MinorDemonGruntGuardian.name=Demon Grunt Guardian -entity.AWWayofTime.MinorDemonGruntGuardianWind.name=Wind Demon Grunt Guardian -entity.AWWayofTime.MinorDemonGruntGuardianFire.name=Fire Demon Grunt Guardian -entity.AWWayofTime.MinorDemonGruntGuardianIce.name=Ice Demon Grunt Guardian -entity.AWWayofTime.MinorDemonGruntGuardianEarth.name=Earth Demon Grunt Guardian -entity.AWWayofTime.MinorDemonGruntWind.name=Wind Demon Grunt -entity.AWWayofTime.MinorDemonGruntFire.name=Fire Demon Grunt -entity.AWWayofTime.MinorDemonGruntIce.name=Ice Demon Grunt -entity.AWWayofTime.MinorDemonGruntEarth.name=Earth Demon Grunt -entity.AWWayofTime.MinorDemonGrunt.name=Demon Grunt - -#Commands -commands.soulnetwork.usage=/soulnetwork -commands.bind.usage=/bind -commands.bind.success=Item successfully bound! -commands.bind.failed.noPlayer=There is no player specified -commands.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it -commands.bind.failed.notBindable=Item cannot be bound -commands.unbind.usage=/unbind -commands.unbind.success=Item successfully unbound! -commands.unbind.failed.notBindable=Item cannot be unbound -commands.soulnetwork.usage=/soulnetwork [amount] -commands.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! -commands.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! -commands.soulnetwork.fill.success=Successfully filled %s's Soul Network! -commands.soulnetwork.empty.success=Successfully emptied %s's Soul Network! -commands.soulnetwork.get.success=There is %dLP in %s's Soul Network! -commands.soulnetwork.noPlayer=There is no player specified -commands.soulnetwork.noCommand=There is no command specified -commands.soulnetwork.notACommand=That is not a valid command -commands.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! -commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) - -#Tooltips -tooltip.activationcrystal.weak=Activates low-level rituals -tooltip.activationcrystal.awakened=Activates more powerful rituals -tooltip.activationcrystal.creative=Creative Only - activates any ritual -tooltip.airsigil.desc=I feel lighter already... -tooltip.alchemy.coords=Coords: %d, %d, %d -tooltip.alchemy.damage=Damage: -tooltip.alchemy.dimension=Bound Dimension: %d -tooltip.alchemy.direction=Direction: -tooltip.alchemy.forrecipe=for Recipe -tooltip.alchemy.press=Press -tooltip.alchemy.recipe=&9Recipe: -tooltip.alchemy.ritualid=RitualID: -tooltip.alchemy.shift=shift -tooltip.alchemy.pressShift=-Press &l&9shift &7for Recipe- -tooltip.alchemy.usedinalchemy=Used in Alchemy -tooltip.alchemyflask.caution=CAUTION: Contents are throwable -tooltip.alchemyflask.swigsleft=Swigs Left: -tooltip.armorinhibitor.desc1=Used to suppress a soul's -tooltip.armorinhibitor.desc2=unnatural abilities. -tooltip.attunedcrystal.desc1=A tool to tune alchemy -tooltip.attunedcrystal.desc2=reagent transmission -tooltip.blankspell.desc=Crystal of infinite possibilities. -tooltip.bloodframe.desc=Stirs bees into a frenzy. -tooltip.bloodletterpack.desc=This pack really chaffes... -tooltip.bloodlightsigil.desc=I see a light! -tooltip.boundarmor.devprotect=Devilish Protection -tooltip.boundaxe.desc=Axe me about my puns! -tooltip.boundpickaxe.desc1=The Souls of the Damned -tooltip.boundpickaxe.desc2=do not like stone... -tooltip.boundshovel.desc=No, not that type of spade. -tooltip.caution.desc1=Caution: may cause -tooltip.caution.desc2=a bad day... -tooltip.cheatyitem.desc1=Right-click to fill network, -tooltip.cheatyitem.desc2=shift-right to empty. -tooltip.complexspellcrystal.desc=Crystal of unimaginable power -tooltip.crystalbelljar.contents=Current Contents: -tooltip.crystalbelljar.empty=- Empty -tooltip.telepositionfocus.demonic.desc1=A stronger version of the focus, -tooltip.telepositionfocus.demonic.desc2=using a demonic shard -tooltip.demonplacer.desc=Used to spawn demons. -tooltip.destclearer.desc1=Used to clear the destination -tooltip.destclearer.desc2=list for an alchemy container -tooltip.diablokey.desc=Binds other items to the owner's network -tooltip.divinationsigil.desc1=Peer into the soul to -tooltip.divinationsigil.desc2=get the current essence -tooltip.energybazooka.desc=Boom. -tooltip.energybattery.desc=Stores raw Life Essence -tooltip.energyblast.desc1=Used to fire devastating -tooltip.energyblast.desc2=projectiles. -tooltip.telepositionfocus.enhanced.desc1=A focus further enhanced in an altar -tooltip.fluidsigil.beastmode=Beast Mode -tooltip.fluidsigil.desc=A sigil with a lovely affinity for fluids -tooltip.fluidsigil.draintankmode=Drain Tank Mode -tooltip.fluidsigil.filltankmode=Fill Tank Mode -tooltip.fluidsigil.fluidplacementmode=Fluid Placement Mode -tooltip.fluidsigil.forcesyphonmode=Force-syphon Mode -tooltip.fluidsigil.syphoningmode=Syphoning Mode -tooltip.harvestsigil.desc=You sow what you reap -tooltip.infusedstone.desc1=Infused stone inside of -tooltip.infusedstone.desc2=a blood altar -tooltip.item.iteminslot=Item in slot -tooltip.item.currentitem=Current Item: -tooltip.lavacrystal.desc1=Store life to smelt -tooltip.lavacrystal.desc2=stuff in the furnace. -tooltip.lavasigil.desc1=Contact with liquid is -tooltip.lavasigil.desc2=highly unrecommended. -tooltip.lp.storedlp=Stored LP: -tooltip.mode.creative=Creative Only -tooltip.owner.currentowner=Current Owner: %s -tooltip.owner.demonsowner=Demon's Owner: -tooltip.packratsigil.desc=Hands of Diamonds -tooltip.reagent.selectedreagent=Currently selected reagent: -tooltip.telepositionfocus.reinforced.desc1=A stronger version of the focus, -tooltip.telepositionfocus.reinforced.desc2=using a weak shard -tooltip.ritualdiviner.airstones=Air Stones: -tooltip.ritualdiviner.blankstones=Blank Stones: -tooltip.ritualdiviner.cannotplace=Can not place Dusk runes -tooltip.ritualdiviner.canplace=Can place Dusk runes -tooltip.ritualdiviner.canplacedawn=Can place Dusk and Dawn runes -tooltip.ritualdiviner.desc=Used to explore new types of rituals -tooltip.ritualdiviner.duskstones=Dusk Stones: -tooltip.ritualdiviner.earthstones=Earth Stones: -tooltip.ritualdiviner.firestones=Fire Stones: -tooltip.ritualdiviner.moreinfo=Press shift for extended information -tooltip.ritualdiviner.ritualtunedto=Ritual tuned to face: -tooltip.ritualdiviner.waterstones=Water Stones: -tooltip.ritualdiviner.dawnstones=Dawn Stones: -tooltip.ritualdiviner.totalStones=Total Stones: -tooltip.dismatler.desc=You could turn this upside down? -tooltip.sacrificialdagger.desc1=A slight draining feeling tickles your fingers -tooltip.sacrificialdagger.desc2=Just a prick of the -tooltip.sacrificialdagger.desc3=finger will suffice... -tooltip.sanguinearmor.desc1=A pair of goggles imbued with power -tooltip.sanguinearmor.desc2=Robes imbued with forbidden power -tooltip.sanguinearmor.visdisc=Vis discount: -tooltip._scribe_tool.desc=The writing is on the wall... -tooltip.seersigil.desc=When seeing all is not enough -tooltip.sigil_ofelementalaffinity.desc1=Perfect for a fire-breathing fish -tooltip.sigil_ofelementalaffinity.desc2=who is afraid of heights! -tooltip.sigil_ofenderseverance.desc=Put those endermen in a Dire situation! -tooltip.sigil_ofgrowth.desc1=Who needs a green thumb when -tooltip.sigil_ofgrowth.desc2=you have a green slate? -tooltip.sigil_ofhaste.desc=One dose of caffeine later... -tooltip.sigil_ofholding.desc=Used to hold several Sigils! -tooltip.sigil_ofmagnetism.desc=I have a very magnetic personality! -tooltip.sigil_ofsupression.desc=Better than telekinesis -tooltip.sigil_oftheassassin.desc=Time to stay stealthy... -tooltip.sigil_ofthebridge.desc1=Activate to create a bridge -tooltip.sigil_ofthebridge.desc2=beneath your feet. -tooltip.sigil_ofthefastminer.desc=Keep going and going and going... -tooltip.sigil_ofwind.desc=Best not to wear a skirt. -tooltip.sigil.state.activated=Activated -tooltip.sigil.state.deactivated=Deactivated -tooltip.tanksegmenter.desc1=Used to designate which -tooltip.tanksegmenter.desc2=reagents can go into a container -tooltip.telepositionfocus.weak.desc1=An Enderpearl imbued with blood -tooltip.voidsigil.desc=Better than a Swiffer! -tooltip.watersigil.desc=Infinite water, anyone? -tooltip.routingFocus.limit=Limit: -tooltip.routingFocus.desc=A focus used to route items -tooltip.alchemy.usedinincense=Purifying incense used in a crucible - -#Messages -message.altar.capacity=Capacity: %s LP -message.altar.consumptionrate=Consumption Rate: -message.altar.currentessence=Altar's Current Essence: %s LP -message.altar.currenttier=Altar's Current Tier: %s -message.altar.progress=Altar's Progress: -message.altar.inputtank= Input Tank: %s LP -message.altar.outputtank= Output Tank: %s LP -message.altar.hunger=[BM] Your high regeneration rate has caused you to become hungry... -message.attunedcrystal.clearing=Clearing saved container... -message.attunedcrystal.error.cannotfind=Can no longer find linked container. -message.attunedcrystal.error.noconnections=Linked container has no connections remaining! -message.attunedcrystal.error.toofar=Linked container is either too far or is in a different dimension. -message.attunedcrystal.linked=Container is now linked. Transmitting: -message.attunedcrystal.linking=Linking to selected container. -message.attunedcrystal.setto=Attuned Crystal now set to: -message.demon.shallfollow=I shall follow and protect you! -message.demon.willstay=I will stay here for now, Master. -message.destinationclearer.cleared=Destination list now cleared. -message.divinationsigil.amount=Amount: -message.divinationsigil.currentessence=Current Essence: %d LP -message.divinationsigil.reagent=Reagent: %s, Amount: %d -message.masterstone.crystalvibrates=Your crystal vibrates pathetically. -message.masterstone.energyflows=A rush of energy flows through the ritual! -message.masterstone.nothinghappened=Nothing appears to have happened... -message.masterstone.ritualresistyou=The ritual appears to actively resist you! -message.masterstone.somethingstoppedyou=Something stopped you in your tracks... -message.masterstone.youfeelapull=You feel a pull, but you are too weak to push any further. -message.ritual.currentritual=Current Ritual: -message.ritual.side.east=EAST -message.ritual.side.north=NORTH -message.ritual.side.south=SOUTH -message.ritual.side.west=WEST -message.ritualdemonportal.missingjar=A jar on one of the pillars appears to be missing... -message.tanksegmenter.nowhas=Tank now has -message.tanksegmenter.setto=Tank Segmenter now set to: -message.tanksegmenter.tankssetto=tank(s) set to: -message.routerfocus.limit=Focus' Item Limit set to: - -#Achievements -achievement.alchemicalwizardry:firstPrick=Your First Prick! -achievement.alchemicalwizardry:firstPrick.desc=The first drop of life into the Altar... -achievement.alchemicalwizardry:weakOrb=Faintly Glowing Red... -achievement.alchemicalwizardry:weakOrb.desc=This orb will suffice...for now... - -#G-API Downloading -bm.versioning.getGAPI=["[BM] You don't have Guide-API installed! Install it to get it to unlock the book! [",{"text":"Download","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to auto-magically download the latest version","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodmagic-download-g-api"}},"]"] -bm.versioning.startingDownload=[{"text":"Starting download of %s Please do not remove your hard disk.", "color":"orange"}] -bm.versioning.doneDownloading=Finished downloading %s Reload your game to update. -bm.versioning.error=An error has occurred while downloading the mod! -bm.versioning.downloadedAlready=You have the latest version already, reload your game to update! -bm.versioning.downloadingAlready=It's downloading! Be patient! -bm.versioning.disabled=This feature is disabled. diff --git a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang deleted file mode 100644 index 3493e25d..00000000 --- a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang +++ /dev/null @@ -1,649 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=Blood Magic -itemGroup.bloodmagic.creativeTabTome=Blood Magic Tômes d'Améliorations - -#Items -item.bloodmagic.activationCrystal.weak.name=Cristal d'Activation Affaibli -item.bloodmagic.activationCrystal.awakened.name=Cristal d'Activation Éveillé -item.bloodmagic.activationCrystal.creative.name=Cristal d'Activation Créatif - -item.bloodmagic.sacrificialDagger.normal.name=Dague Sacrificielle -item.bloodmagic.sacrificialDagger.creative.name=Dague Sacrificielle Créative -item.bloodmagic.pack.selfSacrifice.name=Sac à dos Sanguin -item.bloodmagic.pack.sacrifice.name=Manteau des Bras -item.bloodmagic.daggerOfSacrifice.name=Dague des Sacrifices - -item.bloodmagic.lavaCrystal.name=Cristal de Lave - -item.bloodmagic.bound.sword.name=Lame Sacrificielle -item.bloodmagic.bound.pickaxe.name=Pioche Sacrificielle -item.bloodmagic.bound.axe.name=Hache Sacrificielle -item.bloodmagic.bound.shovel.name=Pelle Sacrificielle - -item.bloodmagic.bucket.lifeEssence.name=Seau de Vie - -item.bloodmagic.scribe.water.name=Craie d’Inscription Elémentaire: Eau -item.bloodmagic.scribe.fire.name=Craie d’Inscription Elémentaire: Feu -item.bloodmagic.scribe.earth.name=Craie d’Inscription Elémentaire: Terre -item.bloodmagic.scribe.air.name=Craie d’Inscription Elémentaire: Air -item.bloodmagic.scribe.dusk.name=Craie d’Inscription Elémentaire: Crépuscule -item.bloodmagic.scribe.dawn.name=Craie d’Inscription Elémentaire: Aube - -item.bloodmagic.focus.weak.name=Focus de Téléposition -item.bloodmagic.focus.enhanced.name=Focus de Téléposition Amélioré -item.bloodmagic.focus.reinforced.name=Focus de Téléposition Renforcé -item.bloodmagic.focus.demonic.name=Focus de Téléposition Diabolique - -item.bloodmagic.slate.blank.name=Tablette Vierge -item.bloodmagic.slate.reinforced.name=Tablette Renforcée -item.bloodmagic.slate.imbued.name=Tablette Imprégnée -item.bloodmagic.slate.demonic.name=Tablette Diabolique -item.bloodmagic.slate.ethereal.name=Tablette Éthérée - -item.bloodmagic.orb.weak.name=Orbe Sanguinaire Affaiblie -item.bloodmagic.orb.apprentice.name=Orbe Sanguinaire de l’Apprenti -item.bloodmagic.orb.magician.name=Orbe Sanguinaire du Magicien -item.bloodmagic.orb.master.name=Orbe Sanguinaire du Maître -item.bloodmagic.orb.archmage.name=Orbe Sanguinaire de l'Enchanteur -item.bloodmagic.orb.transcendent.name=Orb Sanguinaire Transcendante - -item.bloodmagic.reagent.incendium.name=Incendium -item.bloodmagic.reagent.magicales.name=Magicales -item.bloodmagic.reagent.sanctus.name=Sanctus -item.bloodmagic.reagent.aether.name=Aether -item.bloodmagic.reagent.crepitous.name=Crepitous -item.bloodmagic.reagent.crystallos.name=Crystallos -item.bloodmagic.reagent.terrae.name=Terrae -item.bloodmagic.reagent.aquasalus.name=Aquasalus -item.bloodmagic.reagent.tennebrae.name=Tennebrae -item.bloodmagic.reagent.offensa.name=Offensa -item.bloodmagic.reagent.praesidium.name=Praesidium -item.bloodmagic.reagent.orbisterrae.name=Orbis Terrae -item.bloodmagic.reagent.virtus.name=Virtus -item.bloodmagic.reagent.reductus.name=Reductus -item.bloodmagic.reagent.potentia.name=Potentia - -item.bloodmagic.bloodShard.weak.name=Tesson Sanguin Faible -item.bloodmagic.bloodShard.demon.name=Tesson Sanguin Diabolique - -item.bloodmagic.baseComponent.reagentWater.name=Réactif d'Eau -item.bloodmagic.baseComponent.reagentLava.name=Réactif de Lave -item.bloodmagic.baseComponent.reagentAir.name=Réactif d'Air -item.bloodmagic.baseComponent.reagentFastMiner.name=Réactif Minier -item.bloodmagic.baseComponent.reagentVoid.name=Réactif du Vide -item.bloodmagic.baseComponent.reagentGrowth.name=Réactif de Forestation -item.bloodmagic.baseComponent.reagentAffinity.name=Réactif d'Affinitée Élémentaire -item.bloodmagic.baseComponent.reagentSight.name=Réactif de Vue -item.bloodmagic.baseComponent.reagentBinding.name=Réactif de Sacrifice -item.bloodmagic.baseComponent.reagentSuppression.name=Réactif de Suppression -item.bloodmagic.baseComponent.frameParts.name=Parties des cadres -item.bloodmagic.baseComponent.reagentBloodLight.name=Réactif de Lampe Sanguine -item.bloodmagic.baseComponent.reagentMagnetism.name=Réactif de Magnétisme -item.bloodmagic.baseComponent.reagentHaste.name=Réactif de Célérité -item.bloodmagic.baseComponent.reagentBridge.name=Réactif du Pont Fantôme -item.bloodmagic.baseComponent.reagentCompression.name=Réactif de Compression -item.bloodmagic.baseComponent.reagentSeverance.name=Réactif de Sévérance -item.bloodmagic.baseComponent.reagentHolding.name=Réactif de Possession - -item.bloodmagic.baseComponent.reagentTeleposition.name=Réactif de Téléposition -item.bloodmagic.baseComponent.reagentTransposition.name=Réactif de Transposition - -item.bloodmagic.baseComponent.ironSand.name=Sable de Fer -item.bloodmagic.baseComponent.goldSand.name=Sable d'Or -item.bloodmagic.baseComponent.coalSand.name=Sable de Charbon -item.bloodmagic.baseComponent.plantOil.name=Huile de Plante -item.bloodmagic.baseComponent.sulfur.name=Soufre -item.bloodmagic.baseComponent.saltpeter.name=Salpêtre -item.bloodmagic.baseComponent.neurotoxin.name=Neurotoxine -item.bloodmagic.baseComponent.antiseptic.name=Antiseptique - -item.bloodmagic.cuttingFluid.basicCuttingFluid.name=Fluide Coupant de Base -item.bloodmagic.cuttingFluid.explosive.name=Poudre Explosive - -item.bloodmagic.demonCrystal.crystalDefault.name=Cristal d'une Volonté Diabolique -item.bloodmagic.demonCrystal.crystalCorrosive.name=Cristal d'une Volonté Corrosive -item.bloodmagic.demonCrystal.crystalDestructive.name=Cristal d'une Volonté Destructive -item.bloodmagic.demonCrystal.crystalVengeful.name=Cristal d'une Volonté Vengeresse -item.bloodmagic.demonCrystal.crystalSteadfast.name=Cristal d'une Volonté Inébranlable - -item.bloodmagic.monsterSoul.base.name=Volonté Diabolique - -item.bloodmagic.sigil.air.name=Emblème d'Air -item.bloodmagic.sigil.bloodLight.name=Emblème de la Lampe Sanguine -item.bloodmagic.sigil.compression.name=Emblème de Compression -item.bloodmagic.sigil.divination.name=Emblème des Pythies -item.bloodmagic.sigil.water.name=Emblème d'Eau -item.bloodmagic.sigil.lava.name=Emblème de Lave -item.bloodmagic.sigil.void.name=Emblème du Vide -item.bloodmagic.sigil.greenGrove.name=Emblème de la forestation -item.bloodmagic.sigil.elementalAffinity.name=Emblème de l'Affinité Élémentaire -item.bloodmagic.sigil.haste.name=Emblème de Célérité -item.bloodmagic.sigil.suppression.name=Emblème de Délétion -item.bloodmagic.sigil.magnetism.name=Emblème de Magnétisme -item.bloodmagic.sigil.fastMiner.name=Emblème du Mineur Rapide -item.bloodmagic.sigil.seer.name=Emblème du Voyant -item.bloodmagic.sigil.phantomBridge.name=Emblème du Pont du Fantôme -item.bloodmagic.sigil.whirlwind.name=Emblème de la Tempête -item.bloodmagic.sigil.enderSeverance.name=Emblème de Sévérance de l'Ender -item.bloodmagic.sigil.holding.name=Emblème de Possession -item.bloodmagic.sigil.holding.display=&r%s: &o&n%s -item.bloodmagic.sigil.teleposition.name=Emblème de Téléposition -item.bloodmagic.sigil.transposition.name=Emblème de Transposition - -item.bloodmagic.livingArmour.helmet.name=Casque Vivant -item.bloodmagic.livingArmour.chest.name=Plastron Vivant -item.bloodmagic.livingArmour.legs.name=Jambières Vivantes -item.bloodmagic.livingArmour.boots.name=Bottes Vivantes -item.bloodmagic.sentientArmour.helmet.name=Casque Sentient -item.bloodmagic.sentientArmour.chest.name=Plastron Sentient -item.bloodmagic.sentientArmour.legs.name=Jambières Sentientes -item.bloodmagic.sentientArmour.boots.name=Bottes Sentientes - -item.bloodmagic.altarMaker.name=Créateur d'Autels - -item.bloodmagic.ritualDivinernormal.name=Devineur de Rituels -item.bloodmagic.ritualDivinerdusk.name=Devineur de Rituels [Crépuscule] -item.bloodmagic.ritualDivinerdawn.name=Devineur de Rituels [Aube] -item.bloodmagic.ritualReader.name=Bricoleur de Rituels - -item.bloodmagic.arcaneAshes.name=Cendres Ésotériques -item.bloodmagic.upgradeTome.name=Tablette d'Amélioration d'Armure Vivante -item.bloodmagic.upgradeTrainer.name=Bracelet d'Entrainement d'Armure Vivante - -item.bloodmagic.sentientSword.name=Épée Sentiente -item.bloodmagic.soulGem.petty.name=Faible Gemme Tartrique -item.bloodmagic.soulGem.lesser.name=Simple Gemme Tartrique -item.bloodmagic.soulGem.common.name=Gemme Tartrique Commune -item.bloodmagic.soulGem.greater.name=Gemme Tartrique Complexe -item.bloodmagic.soulGem.grand.name=Gemme Tartrique Puissante -item.bloodmagic.soulSnare.base.name=Piège Rudimentaire -item.bloodmagic.sentientBow.name=Arc Sentient -item.bloodmagic.sentientArmourGem.name=Gemme d'Armure Sentiente -item.bloodmagic.sentientAxe.name=Hâche Sentiente -item.bloodmagic.sentientPickaxe.name=Pioche Sentiente -item.bloodmagic.sentientShovel.name=Pelle Sentiente - -item.bloodmagic.nodeRouter.name=Routeur de Jonction -item.bloodmagic.itemFilter.exact.name=Filtre d'Objets Précis -item.bloodmagic.itemFilter.ignoreNBT.name=Filtre d'Objets par NBT -item.bloodmagic.itemFilter.modItems.name=Filtre d'Objets par Mod -item.bloodmagic.itemFilter.oreDict.name=Filtre d'Objets par le Catalogue de Minerai - -item.bloodmagic.experienceTome.name=Tôme de Peritia -item.bloodmagic.sanguineBook.name=Livre Sanguin - -item.bloodmagic.livingPointUpgrade.draftAngelus.name=Draft d'Angelus - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=Essence de Vie - -tile.bloodmagic.stone.ritual.master.name=Pierre Rituelle Maîtresse -tile.bloodmagic.stone.ritual.imperfect.name=Pierre Rituelle Imparfaite - -tile.bloodmagic.altar.name=Autel de Sang -tile.bloodmagic.alchemyArray.name=Étalage d'Alchimie - -tile.bloodmagic.rune.blank.name=Rune de Sang -tile.bloodmagic.rune.speed.name=Rune de Vitesse -tile.bloodmagic.rune.efficiency.name=Rune d'Efficacité -tile.bloodmagic.rune.sacrifice.name=Rune de Sacrifice -tile.bloodmagic.rune.selfsacrifice.name=Rune de l'Autosacrifice -tile.bloodmagic.rune.displacement.name=Rune de Dislocation -tile.bloodmagic.rune.capacity.name=Rune de Capacité -tile.bloodmagic.rune.augcapacity.name=Rune de Capacité Supérieure -tile.bloodmagic.rune.orb.name=Rune de l'Orbe -tile.bloodmagic.rune.acceleration.name=Rune d'Accélération -tile.bloodmagic.rune.charging.name=Rune de Chargement - - -tile.bloodmagic.ritualStone.blank.name=Pierre Rituelle -tile.bloodmagic.ritualStone.water.name=Pierre Rituelle d'Eau -tile.bloodmagic.ritualStone.fire.name=Pierre Rituelle du Feu -tile.bloodmagic.ritualStone.earth.name=Pierre Rituelle de la Terre -tile.bloodmagic.ritualStone.air.name=Pierre Rituelle de l'Air -tile.bloodmagic.ritualStone.dusk.name=Pierre Rituelle du Crépuscule -tile.bloodmagic.ritualStone.dawn.name=Pierre Rituelle de l'Aube - -tile.bloodmagic.bloodstonebrick.large.name=Brique Large de Roche-Sang -tile.bloodmagic.bloodstonebrick.brick.name=Brique de Roche-Sang -tile.bloodmagic.crystal.large.name=Groupe de Cristaux -tile.bloodmagic.crystal.brick.name=Bloc de Crystal -tile.bloodmagic.bloodLight.name=Lumière Sanguine -tile.bloodmagic.spectralBlock.name=Bloc Spectral -tile.bloodmagic.phantom.name=Bloc Fantôme -tile.bloodmagic.incenseAltar.name=Autel Encens - -tile.bloodmagic.teleposer.name=Téléposeur -tile.bloodmagic.soulForge.name=Hellfire Forge -tile.bloodmagic.alchemyTable.name=Table d'Alchimie -tile.bloodmagic.demonCrucible.name=Creuset Diabolique -tile.bloodmagic.demonPylon.name=Pylône Diabolique -tile.bloodmagic.demonCrystallizer.name=Crystaliseur Diabolique - -tile.bloodmagic.masterRouting.name=NÅ“ud de Routage Maître -tile.bloodmagic.outputRouting.name=NÅ“ud de Routage de Sortie -tile.bloodmagic.inputRouting.name=NÅ“ud de Routage d'Entré -tile.bloodmagic.itemRouting.name=NÅ“ud de Routage - -tile.bloodmagic.path.wood.name=Chemin en Bois -tile.bloodmagic.path.woodtile.name=Chemin en Bois Carrelé -tile.bloodmagic.path.stone.name=Chemin en Pierre -tile.bloodmagic.path.stonetile.name=Chemin en Pierre Carrelée -tile.bloodmagic.path.wornstone.name=Chemin en Pierre Usé -tile.bloodmagic.path.wornstonetile.name=Chemin en Pierre Usé Carrelée -tile.bloodmagic.path.obsidian.name=Chemin en Obsidienne -tile.bloodmagic.path.obsidiantile.name=Chemin en Obsidienne Carrelée - -tile.bloodmagic.dimensionalPortal.name=Portail Dimensionnel -tile.bloodmagic.bloodTank.name=Réservoir de Sang - -tile.bloodmagic.demonCrystal.default.name=Groupe de Cristaux d'une Volonté Diabolique -tile.bloodmagic.demonCrystal.corrosive.name=Groupe de Cristaux d'une Volonté Corrosive -tile.bloodmagic.demonCrystal.destructive.name=Groupe de Cristaux d'une Volonté Destructive -tile.bloodmagic.demonCrystal.vengeful.name=Groupe de Cristaux d'une Volonté Vengeresse -tile.bloodmagic.demonCrystal.steadfast.name=Groupe de Cristaux d'une Volonté Inébranlable - -# Fluids -fluid.lifeEssence=Essence de Vie - -#Tooltips -tooltip.bloodmagic.extraInfo=&9-Tenir shift pour plus d'info- - -tooltip.bloodmagic.orb.desc=Stock d'essence de vie crue -tooltip.bloodmagic.orb.owner=Added by: %s -tooltip.bloodmagic.currentOwner=Propriétaire actuel: %s -tooltip.bloodmagic.currentTier=Niveau actuel: %d -tooltip.bloodmagic.config.disabled=Désactivée dans cet insant dans le ficher de Config - -tooltip.bloodmagic.activated=Activé -tooltip.bloodmagic.deactivated=Désactivé - -tooltip.bloodmagic.sigil.air.desc=&oJe me sens plus léger déjà... -tooltip.bloodmagic.sigil.bloodLight.desc=&oJe vois une lumière! -tooltip.bloodmagic.sigil.compression.desc=&oMains en Diamants -tooltip.bloodmagic.sigil.divination.desc=&oDévisager l'âme -tooltip.bloodmagic.sigil.divination.otherNetwork=Dévisager l'âme de %s -tooltip.bloodmagic.sigil.divination.currentAltarTier=Niveau Actuel: %d -tooltip.bloodmagic.sigil.divination.currentEssence=Essence Actuel: %d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=Capacité Actuelle: %d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=Tranquillité Actuelle: %d -tooltip.bloodmagic.sigil.divination.currentBonus=Bonus Actuel: +%d%% -tooltip.bloodmagic.sigil.water.desc=&oUne infinité d'eau, personne? -tooltip.bloodmagic.sigil.lava.desc=&oCHAUD! NE LE MANGEZ PAS -tooltip.bloodmagic.sigil.void.desc=&oMieux que Swiffer®! -tooltip.bloodmagic.sigil.greenGrove.desc=&oÉcologique -tooltip.bloodmagic.sigil.magnetism.desc=&oJ'ai une personnalité très attirante -tooltip.bloodmagic.sigil.suppression.desc=&oMieux que la télékinésie... -tooltip.bloodmagic.sigil.haste.desc=&o42 doses de caféine plus tard... -tooltip.bloodmagic.sigil.fastMiner.desc=&oContinue à miner, à miner... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oDes poissons enflamées qui tombent! -tooltip.bloodmagic.sigil.seer.desc=&oQuand voir tout n'est pas suffisant -tooltip.bloodmagic.sigil.seer.currentAltarProgress=Progrès Actuel: %d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=Progrès Actuel: %s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=Vitesse de consomation: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=Niveau Actuel: %d -tooltip.bloodmagic.sigil.seer.currentEssence=Essence Actuelle: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=Capacité Actuelle: %d LP -tooltip.bloodmagic.sigil.seer.currentCharge=Charge Actuelle: %d -tooltip.bloodmagic.sigil.seer.currentTranquility=Tranquillité Actuelle: %d -tooltip.bloodmagic.sigil.seer.currentBonus=Bonus Actuel: +%d%% -tooltip.bloodmagic.sigil.phantomBridge.desc=&oMarcher sur de l'air fin... -tooltip.bloodmagic.sigil.whirlwind.desc=&oMieux de ne pas porter une jupe -tooltip.bloodmagic.sigil.enderSeverance.desc=&oMettre les Endermen dans des situations terribles! -tooltip.bloodmagic.sigil.teleposition.desc=Je suis très proche d'ètre transporté comme ça. -tooltip.bloodmagic.sigil.transposition.desc=Sens le pouvoir de la force, mon jeune apprenti. -tooltip.bloodmagic.sigil.holding.desc=Sigil-ception -tooltip.bloodmagic.sigil.holding.sigilInSlot=Slot %d: %s - -tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Augmente le maxium de points de l'Armure Vivante à %d. - -tooltip.bloodmagic.bound.sword.desc=&oBattre le faible -tooltip.bloodmagic.bound.pickaxe.desc=&oDétruir les pierres sans pitié -tooltip.bloodmagic.bound.axe.desc=&oDéforestation diabolique -tooltip.bloodmagic.bound.shovel.desc=&oEffacer la terre du sol - -tooltip.bloodmagic.sacrificialDagger.desc=Juste une pîqure du doigt va suffir... -tooltip.bloodmagic.sacrificialDagger.creative=Faites un clic-droit sur un autel en appuyant sur le bouton 'sneak' pour le remplir -tooltip.bloodmagic.slate.desc=Pierre infusée dans un Autel de Sang -tooltip.bloodmagic.inscriber.desc=L'écriture est sur le mur... - -tooltip.bloodmagic.pack.selfSacrifice.desc=Ce sac à dos me frictionne vraiment... -tooltip.bloodmagic.pack.sacrifice.desc=Description -tooltip.bloodmagic.pack.stored=Stored: %d LP - -tooltip.bloodmagic.activationCrystal.weak=Actionne les rituels d'un Bas Niveau -tooltip.bloodmagic.activationCrystal.awakened=Actionne des rituels plus puissants -tooltip.bloodmagic.activationCrystal.creative=Creative Seulement - Actionne tout les rituels - -tooltip.bloodmagic.diviner.currentRitual=Rituel Courant: -tooltip.bloodmagic.diviner.blankRune=Runes Vierge: %d -tooltip.bloodmagic.diviner.waterRune=Runes d'Eau: %d -tooltip.bloodmagic.diviner.airRune=Runes d'Air: %d -tooltip.bloodmagic.diviner.fireRune=Runes de Feu: %d -tooltip.bloodmagic.diviner.earthRune=Runes de Terre: %d -tooltip.bloodmagic.diviner.duskRune=Runes de Cépuscule: %d -tooltip.bloodmagic.diviner.dawnRune=Runes d'Aube: %d -tooltip.bloodmagic.diviner.totalRune=Runes Totales: %d -tooltip.bloodmagic.diviner.extraInfo=Appuyer sur shift pour encore plus d'info -tooltip.bloodmagic.diviner.currentDirection=Directon Courante: %s - -tooltip.bloodmagic.ritualReader.currentState=Mode Courant: %s -tooltip.bloodmagic.ritualReader.set_area=Endroit Déterminé -tooltip.bloodmagic.ritualReader.information=Information -tooltip.bloodmagic.ritualReader.set_will_types=Choisir la volonté consommée -tooltip.bloodmagic.ritualReader.desc.set_area=Clic-droit sur une Pierre Rituelle Maîtresse pour cycler l'endroit de la rituelle que vous vouleiz modifier. Ensuite, cliquez les deux coins du nouveaux endroit que vous vouliez. -tooltip.bloodmagic.ritualReader.desc.information=Clic-droit sur une Pierre Rituelle Maîtresse pour receuillir des informations basics sur le rituel. -tooltip.bloodmagic.ritualReader.desc.set_will_types=Donnez les types de volonté diabolique que le rituel va consommer de l'aura par un Clic-Droit sur la PRM avec le même type de crystal dans votre bar chaude. - -tooltip.bloodmagic.arcaneAshes=Cendres sont utilisées pour dessiner un cercle d'alchimie - -tooltip.bloodmagic.telepositionFocus.coords=Coodornées courantes: (%d, %d, %d) -tooltip.bloodmagic.telepositionFocus.dimension=Dimension ID: %d -tooltip.bloodmagic.telepositionFocus.weak=Utilisé pour déplacer les blocs dans le monde -tooltip.bloodmagic.telepositionFocus.enhanced=Utilisé pour déplacer les blocs dans le monde -tooltip.bloodmagic.telepositionFocus.reinforced=Utilisé pour déplacer les blocs dans le monde -tooltip.bloodmagic.telepositionFocus.demonic=Utilisé pour déplacer les blocs dans le monde - -tooltip.bloodmagic.livingArmour.upgrade.speed=Pieds Rapides -tooltip.bloodmagic.livingArmour.upgrade.digging=Puissance des Nains -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=Résistance au Poison -tooltip.bloodmagic.livingArmour.upgrade.fireResist=Cadeau d'Ignis -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Paumes Dures -tooltip.bloodmagic.livingArmour.upgrade.knockback=Culturiste -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=Peau Dure -tooltip.bloodmagic.livingArmour.upgrade.health=Sain -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Coup Féroce -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Tir Acrobatique -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Marche Assistée -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Sprint de la Faucheuse -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Solar Powered -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=Runic Shielding -tooltip.bloodmagic.livingArmour.upgrade.revealing=Revealing -tooltip.bloodmagic.livingArmour.upgrade.experienced=Experienced -tooltip.bloodmagic.livingArmour.upgrade.jump=Strong Legs -tooltip.bloodmagic.livingArmour.upgrade.fallProtect=Soft Fall -tooltip.bloodmagic.livingArmour.upgrade.graveDigger=Grave Digger -tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=Charging Strike -tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=True Strike -tooltip.bloodmagic.livingArmour.upgrade.elytra=Elytra -tooltip.bloodmagic.livingArmour.upgrade.slowness=Limp Leg -tooltip.bloodmagic.livingArmour.upgrade.crippledArm=Crippled Arm -tooltip.bloodmagic.livingArmour.upgrade.level=%s (Level %d) -tooltip.bloodmagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s - -tooltip.bloodmagic.will=Will Quality: %1$,.2f -tooltip.bloodmagic.sentientSword.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.sentientAxe.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.sentientPickaxe.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.sentientShovel.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.soulGem.petty=A gem used to contain a little will -tooltip.bloodmagic.soulGem.lesser=A gem used to contain some will -tooltip.bloodmagic.soulGem.common=A gem used to contain more will -tooltip.bloodmagic.soulGem.greater=A gem used to contain a greater amount of will -tooltip.bloodmagic.soulGem.grand=A gem used to contain a large amount of will -tooltip.bloodmagic.soulSnare.desc=Throw at a monster and then kill them to obtain their demonic will - -tooltip.bloodmagic.itemFilter.exact=S'assure que les objets se ressemblent exactement -tooltip.bloodmagic.itemFilter.ignoreNBT=Ignore le NBT du filtre -tooltip.bloodmagic.itemFilter.modItems=Assortis les objets du même mod -tooltip.bloodmagic.itemFilter.oreDict=Used to filter through the Ore Dictionary - -tooltip.bloodmagic.fluid.type=Fluid Contained -tooltip.bloodmagic.fluid.amount=Amount -tooltip.bloodmagic.fluid.capacity=Capacity - -tooltip.bloodmagic.ghost.everything=Everything -tooltip.bloodmagic.ghost.amount=Ghost item amount: %d - -tooltip.bloodmagic.currentType.default=Contient: Volonté Crue -tooltip.bloodmagic.currentType.corrosive=Contient: Volonté Corrosive -tooltip.bloodmagic.currentType.destructive=Contient: Volonté Destructive -tooltip.bloodmagic.currentType.vengeful=Contient: Volonté Vengeresse -tooltip.bloodmagic.currentType.steadfast=Contient: Volonté Inébranlable - -tooltip.bloodmagic.experienceTome=A book used to store experience -tooltip.bloodmagic.experienceTome.exp=Exp: %0.3f -tooltip.bloodmagic.experienceTome.expLevel=Level: %d - -tooltip.bloodmagic.decoration.safe=Safe for decoration -tooltip.bloodmagic.decoration.notSafe=Dangerous for decoration - -tooltip.bloodmagic.cuttingFluidRatio=%d/%d uses remaining - -tooltip.bloodmagic.book.shifting=These symbols seem to be... &oshifting... - -# Ritual -ritual.bloodmagic.blockRange.tooBig=The block range given is too big! Needs to be at most %s blocks. -ritual.bloodmagic.blockRange.tooFar=The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks. -ritual.bloodmagic.blockRange.inactive=The ritual stone is currently inactive, and cannot have its range modified. -ritual.bloodmagic.blockRange.noRange=The range was not properly chosen. -ritual.bloodmagic.blockRange.firstBlock=First block for new range stored. -ritual.bloodmagic.blockRange.success=New range successfully set! - -ritual.bloodmagic.testRitual=Test Ritual -ritual.bloodmagic.waterRitual=Ritual of the Full Spring -ritual.bloodmagic.lavaRitual=Serenade of the Nether -ritual.bloodmagic.greenGroveRitual=Ritual of the Green Grove -ritual.bloodmagic.jumpRitual=Ritual of the High Jump -ritual.bloodmagic.wellOfSufferingRitual=Well of Suffering -ritual.bloodmagic.featheredKnifeRitual=Ritual of the Feathered Knife -ritual.bloodmagic.regenerationRitual=Ritual of Regeneration -ritual.bloodmagic.harvestRitual=Reap of the Harvest Moon -ritual.bloodmagic.magneticRitual=Ritual of Magnetism -ritual.bloodmagic.crushingRitual=Ritual of the Crusher -ritual.bloodmagic.fullStomachRitual=Ritual of the Satiated Stomach -ritual.bloodmagic.interdictionRitual=Ritual of Interdiction -ritual.bloodmagic.containmentRitual=Ritual of Containment -ritual.bloodmagic.speedRitual=Ritual of Speed -ritual.bloodmagic.suppressionRitual=Ritual of Suppression -ritual.bloodmagic.expulsionRitual=Aura of Expulsion -ritual.bloodmagic.zephyrRitual=Call of the Zephyr -ritual.bloodmagic.upgradeRemoveRitual=Sound of the Cleansing Soul -ritual.bloodmagic.armourEvolveRitual=Ritual of Living Evolution -ritual.bloodmagic.animalGrowthRitual=Ritual of the Shepherd -ritual.bloodmagic.forsakenSoulRitual=Gathering of the Forsaken Souls -ritual.bloodmagic.crystalHarvestRitual=Crack of the Fractured Crystal - -ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius -ritual.bloodmagic.placerRitual=Laying of the Filler -ritual.bloodmagic.fellingRitual=Crash of the Timberman -ritual.bloodmagic.pumpRitual=Hymn of Siphoning -ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar -ritual.bloodmagic.portalRitual=The Gate of the Fold - - -ritual.bloodmagic.waterRitual.info=Generates a source of water from the master ritual stone. -ritual.bloodmagic.lavaRitual.info=Generates a source of lava from the master ritual stone. -ritual.bloodmagic.greenGroveRitual.info=Grows crops within its area. -ritual.bloodmagic.jumpRitual.info=Causes entities to leap up into the air. -ritual.bloodmagic.wellOfSufferingRitual.info=Attacks mobs within its damage zone and puts the LP into a nearby blood altar. -ritual.bloodmagic.featheredKnifeRitual.info=Drains health from players in its area and puts the LP into a nearby blood altar. -ritual.bloodmagic.regenerationRitual.info=Casts regeneration on entities within its range if they are missing health. -ritual.bloodmagic.harvestRitual.info=Harvests plants within its range, dropping the results on the ground. -ritual.bloodmagic.magneticRitual.info=Pulls up ores from the ground and puts them into its placement range. -ritual.bloodmagic.crushingRitual.info=Breaks blocks within its crushing range and places the items into the linked chest. -ritual.bloodmagic.fullStomachRitual.info=Takes food from the linked chest and fills the player's saturation with it. -ritual.bloodmagic.interdictionRitual.info=Pushes all mobs within its area away from the master ritual stone. -ritual.bloodmagic.containmentRitual.info=Pulls all mobs within its area towards the master ritual stone. -ritual.bloodmagic.speedRitual.info=Launches players within its range in the direction of the ritual. -ritual.bloodmagic.suppressionRitual.info=Suppresses fluids within its range - deactivating the ritual returns the fluids back to the world. -ritual.bloodmagic.expulsionRitual.info=Expels players from its range that are neither the owner nor have a bound blood orb in the chest on top of the master ritual stone. -ritual.bloodmagic.zephyrRitual.info=Picks up items within its range and places them into the linked chest. -ritual.bloodmagic.upgradeRemoveRitual.info=Undocumented. -ritual.bloodmagic.armourEvolveRitual.info=Undocumented. -ritual.bloodmagic.animalGrowthRitual.info=Increases the maturity rate of baby animals within its range. -ritual.bloodmagic.forsakenSoulRitual.info=Damages mobs within its damage range and when the mob dies a demon crystal within its crystal range will be grown. -ritual.bloodmagic.crystalHarvestRitual.info=Breaks Demon Will crystal clusters within its range, dropping the results on top of the crystals. - -ritual.bloodmagic.placerRitual.info=Grabs blocks that are inside of the connected inventory and places them into the world. -ritual.bloodmagic.fellingRitual.info=A standard tree-cutting machine, this ritual will cut down all trees and leaves within its area and collect the drops. -ritual.bloodmagic.pumpRitual.info=Looks around the world and grabs fluids from the defined area. Will only remove and put the fluid into the connected tank if the tank has at least a bucket's worth of the same fluid. -ritual.bloodmagic.altarBuilderRitual.info=Builds an altar out of the components inside of the connected inventory. -ritual.bloodmagic.portalRitual.info=Creates a portal network based on the activator and the immediately surrounding blocks. Blocks can be changed after activation without changing the network of portals, and portals with the same "key" will link together. - -ritual.bloodmagic.waterRitual.waterRange.info=(Water) The area that the ritual will place water source blocks. -ritual.bloodmagic.lavaRitual.lavaRange.info=(Lava) The area that the ritual will place lava source blocks. -ritual.bloodmagic.greenGroveRitual.growing.info=(Growth) The area that the ritual will grow plants in. -ritual.bloodmagic.jumpRitual.jumpRange.info=(Jumping) Entities in this range will be launched in the air. -ritual.bloodmagic.wellOfSufferingRitual.altar.info=(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region. -ritual.bloodmagic.wellOfSufferingRitual.damage.info=(Damage) This defines where the ritual will damage a mob. All mobs inside of this range (except for players) will receive damage over time. -ritual.bloodmagic.featheredKnifeRitual.altar.info=(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region. -ritual.bloodmagic.featheredKnifeRitual.damage.info=(Damage) This defines where the ritual will damage a player. Players inside of this range will receive damage over time up to the specified limit. -ritual.bloodmagic.regenerationRitual.heal.info=(Healing) Mobs within this range will receive a regeneration buff. -ritual.bloodmagic.harvestRitual.harvestRange.info=(Harvesting) Plants within this range will be harvested. -ritual.bloodmagic.magneticRitual.placementRange.info=(Placement) The range that the ritual will place the grabbed ores into. -ritual.bloodmagic.crushingRitual.crushingRange.info=(Crushing) The blocks that the ritual will break. -ritual.bloodmagic.crushingRitual.chest.info=(Chest) The location of the inventory that the ritual will place the broken blocks into. -ritual.bloodmagic.fullStomachRitual.fillRange.info=(Feeding) The range that the ritual will look at to feed players. -ritual.bloodmagic.fullStomachRitual.chest.info=(Chest) The location of the inventory that the ritual will grab food from to feed players in range. -ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Push) The area of the ritual where mobs will be pushed. All mobs are pushed away from the master ritual stone, regardless of where this area is. -ritual.bloodmagic.containmentRitual.containmentRange.info=(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is. -ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. -ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Suppress) All liquids within the range are suppressed. -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) -ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Suction) Items within this range will be sucked into the linked chest. -ritual.bloodmagic.zephyrRitual.chest.info=(Chest) The location of the inventory that the ritual will place the picked up items into. -ritual.bloodmagic.animalGrowthRitual.growing.info=(Growth) Animals within this range will grow much faster. -ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in this range receive an increase in growth speed when a mob is killed by the ritual. -ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. -ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. - -ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. -ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. -ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down. -ritual.bloodmagic.fellingRitual.chest.info=(Chest) The location of the inventory that the ritual will place the results into. -ritual.bloodmagic.pumpRitual.pumpRange.info=(Pump) The region that the ritual will look for fluids to grab from the world. - -# Chat -chat.bloodmagic.altarMaker.setTier=Set Tier to: %d -chat.bloodmagic.altarMaker.building=Building a Tier %d Altar -chat.bloodmagic.altarMaker.destroy=Destroyed a Tier %d Altar -chat.bloodmagic.altarMaker.creativeOnly=This is a creative only item. - -chat.bloodmagic.damageSource=%s's soul became too weak - -chat.bloodmagic.ritual.weak=You feel a push, but are too weak to perform this ritual. -chat.bloodmagic.ritual.prevent=The ritual is actively resisting you! -chat.bloodmagic.ritual.activate=A rush of energy flows through the ritual! -chat.bloodmagic.ritual.notValid=You feel that these runes are not configured correctly... - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=You are starting to feel better already! -chat.bloodmagic.livingArmour.upgrade.fireRemove=&6A cool feeling envelopes you as the burning subsides. -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6A shadowy force pulls you from the brink of death! -chat.bloodmagic.livingArmour.newUpgrade=&4Upgrade acquired! - -chat.bloodmagic.routing.remove=Removing contained location -chat.bloodmagic.routing.set=Setting node location -chat.bloodmagic.routing.link.master=Linked node to master! -chat.bloodmagic.routing.link=Linked nodes together - -chat.bloodmagic.altar.comp.glowstone=a block of glowstone -chat.bloodmagic.altar.comp.bloodstone=a large bloodstone brick -chat.bloodmagic.altar.comp.beacon=a beacon -chat.bloodmagic.altar.comp.bloodrune=a blood rune -chat.bloodmagic.altar.comp.crystal=an unimplemented item -chat.bloodmagic.altar.comp.notair=a solid block - -chat.bloodmagic.altar.nextTier=The next tier of blood altar is missing %s at %s. - -# sekrit - -secret.bloodmagic.bread.bloody=&r&cBloody Bread -secret.bloodmagic.bread.bloody.desc=Only for &odire &r&7emergencies. - -# Commands -commands.bloodmagic.error.arg.invalid=Invalid arguments -commands.bloodmagic.error.arg.missing=Not enough arguments -commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on. -commands.bloodmagic.error.404=Command not found! -commands.bloodmagic.error.unknown=Unknown command! -commands.bloodmagic.error.perm=You do not have permission to use this command. - -commands.bloodmagic.success=Executed successfully - -commands.bloodmagic.format.help=%s - %s -commands.bloodmagic.format.error=%s - %s - -commands.bloodmagic.help.usage=/bloodmagic help -commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic" command. - -commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] -commands.bloodmagic.network.help=LP network utilities -commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network. -commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s. -commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. -commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network. -commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount. -commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP. -commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network. -commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d. -commands.bloodmagic.network.fill.success=Successfully filled %s's LP network. -commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. -commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network. - -commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] -commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item. -commands.bloodmagic.bind.success=Binding successful -commands.bloodmagic.bind.remove.success=Unbinding successful - -commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] -commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier. - -commands.bloodmagic.bind.usage=/bind -commands.bloodmagic.bind.success=Item successfully bound! -commands.bloodmagic.bind.failed.noPlayer=There is no player specified -commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it -commands.bloodmagic.bind.failed.notBindable=Item cannot be bound -commands.bloodmagic.unbind.usage=/unbind -commands.bloodmagic.unbind.success=Item successfully unbound! -commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound -commands.bloodmagic.soulnetwork.usage=/soulnetwork [amount] -commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! -commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! -commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network! -commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network! -commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network! -commands.bloodmagic.soulnetwork.noPlayer=There is no player specified -commands.bloodmagic.soulnetwork.noCommand=There is no command specified -commands.bloodmagic.soulnetwork.notACommand=That is not a valid command -commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! -commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) - -# Keybinds -bloodmagic.keybind.openSigilHolding=Open Sigil of Holding - -# JustEnoughItems -jei.bloodmagic.recipe.altar=Blood Altar -jei.bloodmagic.recipe.binding=Alchemy Array (Binding) -jei.bloodmagic.recipe.alchemyArrayCrafting=Alchemy Array -jei.bloodmagic.recipe.soulForge=Hellfire Forge -jei.bloodmagic.recipe.alchemyTable=Alchemy Table -jei.bloodmagic.recipe.requiredLP=LP: %d -jei.bloodmagic.recipe.requiredTier=Tier: %d -jei.bloodmagic.recipe.consumptionRate=Consumption: %d LP/t -jei.bloodmagic.recipe.drainRate=Drain: %d LP/t -jei.bloodmagic.recipe.minimumSouls=Minimum: %1$,.2f Will -jei.bloodmagic.recipe.soulsDrained=Drained: %1$,.2f Will -jei.bloodmagic.recipe.lpDrained=Drained: %,d LP -jei.bloodmagic.recipe.ticksRequired=Time: %,d Ticks - -jei.bloodmagic.desc.altarBuilder=A creative-only item for use in debugging and testing.\n\nShift + Right click to change the tier to build. Right click an Altar to initiate the build.\n\nBreak an Altar while holding to dismantle it. -jei.bloodmagic.desc.demonicWill=An imprint of a demonic entity attached to a creature.\n\nCan be obtained by killing a mob with a sentient weapon or by throwing a snare at a mob and killing it while it has white particles. - -# WAILA -waila.bloodmagic.sneak=&oSneak for Information -waila.bloodmagic.array.reagent=Reagent: %s -waila.bloodmagic.array.catalyst=Catalyst: %s -option.bloodmagic.bypassSneak=Bypass Sneak -option.bloodmagic.bloodAltar=Blood Altar -option.bloodmagic.ritualController=Ritual Stones -option.bloodmagic.teleposer=Teleposer -option.bloodmagic.array=Alchemy Array - -# Thaumcraft -tc.research_category.BLOODMAGIC=Sanguine Arcana - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=Blood Magic -bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana -bloodmagic.research_page.BLOODMAGIC.1=The realm of the Blood Magics has always appeared to be a more solitary and "individual" art with blood mages being notoriously reclusive and a bit insane at times. However, the powers of self-sacrifice and life essence have uses even beyond a normal blood mage's sight, in fact, it is quite apparent that it may have some uses in thaumaturgy after all! diff --git a/src/main/resources/assets/bloodmagic/lang/it_IT.lang b/src/main/resources/assets/bloodmagic/lang/it_IT.lang deleted file mode 100644 index 265b4275..00000000 --- a/src/main/resources/assets/bloodmagic/lang/it_IT.lang +++ /dev/null @@ -1,181 +0,0 @@ -#Block Localization -tile.bloodAltar.name=Altare del Sangue -tile.bloodRune.blank.name=Runa del Sangue -tile.bloodRune.fill.name=Runa di Capacità Aumentata -tile.bloodRune.empty.name=Runa di Dislocazione -tile.bloodRune.test.name=Runa del Globo -tile.speedRune.name=Runa di Velocità -tile.efficiencyRune.name=Runa di Efficienza -tile.runeOfSacrifice.name=Runa del Sacrificio -tile.runeOfSelfSacrifice.name=Runa di Auto-Sacrificio -tile.ritualStone.name=Pietra del Rituale -tile.blockMasterStone.name=Pietra Maestra del Rituale -tile.bloodSocket.name=Cavità Piena -tile.imperfectRitualStone.name=Pietra del Rituale Imperfetta -tile.armourForge.name=Forgia delle Armature dell'Anima -tile.emptySocket.name=Cavità Vuota -tile.bloodStoneBrick.name=Mattone di Pietra del Sangue -tile.largeBloodStoneBrick.name=Gran Mattone di Pietra del Sangue -tile.blockWritingTable.name=Set da Alchimista -tile.blockHomHeart.name=Tavolo della Magia -tile.bloodPedestal.name=Piedistallo Arcano -tile.bloodPlinth.name=Basamento Arcano -tile.bloodTeleposer.name=Teleposer -tile.blockConduit.name=Condotto di Magia -tile.blockSpellParadigm.projectile.name=Generatore di Particelle -tile.blockSpellParadigm.self.name=Auto-Miglioratore -tile.blockSpellParadigm.melee.name=Aggregatore di Mischia -tile.blockSpellEnhancement.power1.name=Potenziatore Instabile di Magia -tile.blockSpellEnhancement.power2.name=Potenziatore Standard di Magia -tile.blockSpellEnhancement.power3.name=Potenziatore Rinforzato di Magia -tile.blockSpellEnhancement.power4.name=Potenziatore Invaso di Magia -tile.blockSpellEnhancement.power5.name=Potenziatore Demoniaco di Magia -tile.blockSpellEnhancement.cost1.name=Smorzatore Instabile di Magia -tile.blockSpellEnhancement.cost2.name=Smorzatore Standard di Magia -tile.blockSpellEnhancement.cost3.name=Smorzatore Rinforzato di Magia -tile.blockSpellEnhancement.cost4.name=Smorzatore Invaso di Magia -tile.blockSpellEnhancement.cost5.name=Smorzatore Demoniaco di Magia -tile.blockSpellEnhancement.potency1.name=Miglioratore Instabile di Magia -tile.blockSpellEnhancement.potency2.name=Miglioratore Standard di Magia -tile.blockSpellEnhancement.potency3.name=Miglioratore Rinforzato di Magia -tile.blockSpellEnhancement.potency4.name=Miglioratore Invaso di Magia -tile.blockSpellEnhancement.potency5.name=Miglioratore Demoniaco di Magia -tile.blockSpellModifier.default.name=Modificatore di Magia -tile.blockSpellModifier.offensive.name=Modificatore di Magia Offensiva -tile.blockSpellModifier.defensive.name=Modificatore di Magia Difensiva -tile.blockSpellModifier.environmental.name=Modificatore di Magia Ambientale -tile.blockSpellEffect.fire.name=Crogiolo del Fuoco -tile.blockSpellEffect.ice.name=Creatore di Ghiaccio -tile.blockSpellEffect.wind.name=Generatore del Vento -tile.blockSpellEffect.earth.name=Formatore della Terra - -#Item Localization -item.weakBloodOrb.name=Globo di Sangue Debole -item.apprenticeBloodOrb.name=Globo di Sangue dell'Apprendista -item.magicianBloodOrb.name=Globo di Sangue del Mago -item.masterBloodOrb.name=Globo di Sangue del Maestro -item.archmageBloodOrb.name=Globo di Sangue dell'Arcimago -item.energyBlast.name=Blaster Energetico -item.energySword.name=Lama Legata -item.lavaCrystal.name=Cristallo Lavico -item.waterSigil.name=Sigillo dell'Acqua -item.lavaSigil.name=Sigillo di Lava -item.voidSigil.name=Sigillo del Vuoto -item.blankSlate.name=Ardesia Bianca -item.reinforcedSlate.name=Ardesia Rinforzata -item.sacrificialDagger.name=Pugnale Sacrificale -item.daggerOfSacrifice.name=Daga Sacrificale -item.airSigil.name=Sigillo dell'Aria -item.sigilOfTheFastMiner.name=Sigillo del Rapido Minatore -item.sigilOfElementalAffinity.name=Sigillo di Affinità Elementale -item.sigilOfHaste.name=Sigillo di Rapidità -item.sigilOfHolding.name=Sigillo della Tenacia Egoista -item.divinationSigil.name=Sigillo di Divinatione -item.waterScribeTool.name=Utensile d'Iscrizione Elementale: Acqua -item.fireScribeTool.name=Utensile d'Iscrizione Elementale: Fuoco -item.earthScribeTool.name=Utensile d'Iscrizione Elementale: Terra -item.airScribeTool.name=Utensile d'Iscrizione Elementale: Aria -item.duskScribeTool.name=Utensile d'Iscrizione Elementale: Crepuscolo -item.activationCrystalWeak.name=Cristallo d'Attivazione Debole -item.activationCrystalAwakened.name=Cristallo d'Attivazione Risvegliato -item.boundPickaxe.name=Piccone Vincolato -item.boundAxe.name=Ascia Vincolata -item.boundShovel.name=Vanga Vincolata -item.boundHelmet.name=Elmo Vincolato -item.boundPlate.name=Piastra Vincolata -item.boundLeggings.name=Gambali Vincolati -item.boundBoots.name=Stivali Vincolati -item.weakBloodShard.name=Scheggia di Sangue Debole -item.growthSigil.name=Sigillo del Verde Bosco -item.blankSpell.name=Cristallo non Vincolato -item.alchemyFlask.name=Boccetta per Pozione -item.standardBindingAgent.name=Agente Vincolante Standard -item.mundanePowerCatalyst.name=Catalizzatore Comune di Potere -item.averagePowerCatalyst.name=Catalizzatore Medio di Potere -item.greaterPowerCatalyst.name=Catalizzatore Maggiore di Potere -item.mundaneLengtheningCatalyst.name=Catalizzatore Procastinante Comune -item.averageLengtheningCatalyst.name=Catalizzatore Procastinante Medio -item.greaterLengtheningCatalyst.name=Catalizzatore Procastinante Maggiore -item.incendium.name=Incendium -item.magicales.name=Magicales -item.sanctus.name=Sanctus -item.aether.name=Etere -item.simpleCatalyst.name=Catalizzatore Semplice -item.crepitous.name=Crepitous -item.crystallos.name=Crystallos -item.terrae.name=Terrae -item.aquasalus.name=Aquasalus -item.tennebrae.name=Tenebrae -item.demonBloodShard.name=Scheggia di Sangue di Demone -item.sigilOfWind.name=Sigillo del Vortice -item.telepositionFocus.name=Focus di Teleposizione -item.enhancedTelepositionFocus.name=Focus Migliorato di Teleposizione -item.reinforcedTelepositionFocus.name=Focus Rinforzato di Teleposizione -item.demonicTelepositionFocus.name=Focus Demoniaco di Teleposizione -item.imbuedSlate.name=Piastra Invasa -item.demonicSlate.name=Piastra Demoniaca -item.sigilOfTheBridge.name=Sigillo del POnte Spettrale -item.armourInhibitor.name=Inibitore di Armatura -item.cheatyItem.name=Globo di Prova -item.weakFillingAgent.name=Agente Riempiente Debole -item.standardFillingAgent.name=Agente Riempiente Standard -item.enhancedFillingAgent.name=Agente Riempiente Potenziato -item.weakBindingAgent.name=Agente Vincolante Debole -item.ritualDiviner.name=Divinatore del Rituale -item.sigilOfMagnetism.name=Sigillo del Magnetismo -item.itemDiabloKey.name=Chiave del Vincolo -item.energyBazooka.name=Cannone Energetico -item.bloodLightSigil.name=Sigillo della Torcia di Sangue -item.itemComplexSpellCrystal.name=Cristallo Magico Complesso -item.itemSigilOfSupression.name=Sigillo di Soppressione -item.itemSigilOfEnderSeverance.name=Sigillo di Disgiunzione Ender -item.bucketLive.name=Secchio di Vita -item.bloodMagicBaseItem.QuartzRod.name=Verga di Quarzo -item.bloodMagicBaseItem.EmptyCore.name=Nucleo Vuoto -item.bloodMagicBaseItem.MagicalesCable.name=Connessione Magicales -item.bloodMagicBaseItem.WoodBrace.name=Pilastro di Legno -item.bloodMagicBaseItem.StoneBrace.name=Pilastro di Pietra -item.bloodMagicBaseItem.ProjectileCore.name=Nucleo Proiettile -item.bloodMagicBaseItem.SelfCore.name=Auto-Nucleo -item.bloodMagicBaseItem.MeleeCore.name=Nucleo di Mischia -item.bloodMagicBaseItem.ParadigmBackPlate.name=Piastra Modello -item.bloodMagicBaseItem.OutputCable.name=Connessione in Uscita di Magia -item.bloodMagicBaseItem.InputCable.name=Connessione in Entrata di Magia -item.bloodMagicBaseItem.FlameCore.name=Nucleo Infuocato -item.bloodMagicBaseItem.IcyCore.name=Nucleo Ghiacciato -item.bloodMagicBaseItem.GustCore.name=Nucleo Ventoso -item.bloodMagicBaseItem.EarthenCore.name=Nucleo Terroso -item.bloodMagicBaseItem.CrackedRunicPlate.name=Piastra Runica Incrinata -item.bloodMagicBaseItem.RunicPlate.name=Piastra Runica -item.bloodMagicBaseItem.ScribedRunicPlate.name=Piastra Runica Invasa -item.bloodMagicBaseItem.DefaultCore.name=Nucleo Disarmonico -item.bloodMagicBaseItem.OffensiveCore.name=Nucleo Offensivo -item.bloodMagicBaseItem.DefensiveCore.name=Nucleo Difensivo -item.bloodMagicBaseItem.EnvironmentalCore.name=Nucleo Ambientale -item.bloodMagicBaseItem.PowerCore.name=Nucleo di Forza -item.bloodMagicBaseItem.CostCore.name=Nucleo di Riduzione -item.bloodMagicBaseItem.PotencyCore.name=Nucleo di Potenza -item.bloodMagicBaseItem.ObsidianBrace.name=Pilastro di Ossidiana -item.bloodMagicAlchemyItem.Offensa.name=Offensa -item.bloodMagicAlchemyItem.Praesidium.name=Praesidium -item.bloodMagicAlchemyItem.OrbisTerrae.name=Orbis Terrae -item.bloodMagicAlchemyItem.StrengthenedCatalyst.name=Catalizzatore Rafforzato -item.bloodMagicAlchemyItem.ConcentratedCatalyst.name=Catalizzatore Concentrato -item.bloodMagicAlchemyItem.FracturedBone.name=Osso Fratturato -item.bloodMagicAlchemyItem.Virtus.name=Virtus -item.bloodMagicAlchemyItem.Reductus.name=Reductus -item.bloodMagicAlchemyItem.Potentia.name=Potentia -item.sanguineHelmet.name=Elmo Sanguigno -item.itemSeerSigil.name=Sigillo della Veduta -item.itemFluidSigil.name= - - -#Creative Tab -itemGroup.tabBloodMagic=Magia del Sangue - -#Extra Strings -bm.string.consume=Utilizzo -bm.string.drain=Drenaggio -bm.string.tier=Livello -bm.string.crafting.orb.shaped=Creazione di un Glodo Formato -bm.string.crafting.orb.shapeless=Creazione di un Globo Informe \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang deleted file mode 100644 index 5cffaa40..00000000 --- a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang +++ /dev/null @@ -1,892 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=Blood Magic -itemGroup.bloodmagic.creativeTabTome=Blood Magic ¦ 書物 - -#Items -item.bloodmagic.activationCrystal.weak.name=å¼±ã„起動クリスタル -item.bloodmagic.activationCrystal.awakened.name=覚醒ã—ãŸèµ·å‹•ã‚¯ãƒªã‚¹ã‚¿ãƒ« -item.bloodmagic.activationCrystal.creative.name=クリエイティブ用ã®èµ·å‹•ã‚¯ãƒªã‚¹ã‚¿ãƒ« - -item.bloodmagic.sacrificialDagger.normal.name=生贄ã®ãƒ€ã‚¬ãƒ¼ -item.bloodmagic.sacrificialDagger.creative.name=生贄ã®ãƒ€ã‚¬ãƒ¼(クリエイティブ) -item.bloodmagic.pack.selfSacrifice.name=瀉血者ã®ãƒ‘ック -item.bloodmagic.pack.sacrifice.name=武装コート -item.bloodmagic.daggerOfSacrifice.name=サクリファイスダガー - -item.bloodmagic.lavaCrystal.name=溶岩ã®ã‚¯ãƒªã‚¹ã‚¿ãƒ« - -item.bloodmagic.bound.sword.name=çµåˆã—ãŸå‰£ -item.bloodmagic.bound.pickaxe.name=çµåˆã—ãŸãƒ„ルãƒã‚· -item.bloodmagic.bound.axe.name=çµåˆã—ãŸæ–§ -item.bloodmagic.bound.shovel.name=çµåˆã—ãŸã‚·ãƒ£ãƒ™ãƒ« - -item.bloodmagic.bucket.lifeEssence.name=ライフエッセンス入りãƒã‚±ãƒ„ - -item.bloodmagic.scribe.water.name=属性筆記具：水 -item.bloodmagic.scribe.fire.name=å±žæ€§ç­†è¨˜å…·ï¼šç« -item.bloodmagic.scribe.earth.name=属性筆記具：土 -item.bloodmagic.scribe.air.name=属性筆記具：風 -item.bloodmagic.scribe.dusk.name=å±žæ€§ç­†è¨˜å…·ï¼šé»„æ˜ -item.bloodmagic.scribe.dawn.name=å±žæ€§ç­†è¨˜å…·ï¼šæš - -item.bloodmagic.focus.weak.name=テレãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ã‚«ã‚¹ -item.bloodmagic.focus.enhanced.name=強化テレãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ã‚«ã‚¹ -item.bloodmagic.focus.reinforced.name=増強テレãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ã‚«ã‚¹ -item.bloodmagic.focus.demonic.name=悪魔テレãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ã‚«ã‚¹ - -item.bloodmagic.slate.blank.name=空ã®çŸ³ç‰ˆ -item.bloodmagic.slate.reinforced.name=強化ã•ã‚ŒãŸçŸ³ç‰ˆ -item.bloodmagic.slate.imbued.name=染ã¿ã“ã‚“ã çŸ³ç‰ˆ -item.bloodmagic.slate.demonic.name=悪魔ã®çŸ³ç‰ˆ -item.bloodmagic.slate.ethereal.name=エーテルã®çŸ³ç‰ˆ - -item.bloodmagic.orb.weak.name=å¼±ã„ブラッドオーブ -item.bloodmagic.orb.apprentice.name=見習ã„ã®ãƒ–ラッドオーブ -item.bloodmagic.orb.magician.name=魔術師ã®ãƒ–ラッドオーブ -item.bloodmagic.orb.master.name=熟練者ã®ãƒ–ラッドオーブ -item.bloodmagic.orb.archmage.name=大魔術師ã®ãƒ–ラッドオーブ -item.bloodmagic.orb.transcendent.name=超越ã®ãƒ–ラッドオーブ - -item.bloodmagic.reagent.incendium.name=インセンディウム -item.bloodmagic.reagent.magicales.name=マギカリス -item.bloodmagic.reagent.sanctus.name=サンクトゥス -item.bloodmagic.reagent.aether.name=エーサー -item.bloodmagic.reagent.crepitous.name=クレピタス -item.bloodmagic.reagent.crystallos.name=クリスタロス -item.bloodmagic.reagent.terrae.name=テラエ -item.bloodmagic.reagent.aquasalus.name=アクアサルス -item.bloodmagic.reagent.tennebrae.name=テãƒãƒ–レ -item.bloodmagic.reagent.offensa.name=オフェンサ -item.bloodmagic.reagent.praesidium.name=プレジディウム -item.bloodmagic.reagent.orbisterrae.name=オービス・テラエ -item.bloodmagic.reagent.virtus.name=ヴィルトゥス -item.bloodmagic.reagent.reductus.name=レドクトゥス -item.bloodmagic.reagent.potentia.name=ãƒãƒ†ãƒ³ã‚·ã‚¢ - -item.bloodmagic.bloodShard.weak.name=å¼±ã„è¡€ã®çµæ™¶ç‰‡ -item.bloodmagic.bloodShard.demon.name=悪魔ã®è¡€ã®çµæ™¶ç‰‡ - -item.bloodmagic.baseComponent.reagentWater.name=æ°´ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentLava.name=溶岩ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentAir.name=風ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentFastMiner.name=鉱夫ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentVoid.name=虚無ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentGrowth.name=緑化ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentAffinity.name=精霊ã®åŠ è­·ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentSight.name=識別ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentBinding.name=çµåˆã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentSuppression.name=除去ã®è©¦è–¬ -item.bloodmagic.baseComponent.frameParts.name=フレームパーツ -item.bloodmagic.baseComponent.reagentBloodLight.name=è¡€ã®ãƒ©ãƒ³ãƒ—ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentMagnetism.name=ç£åŠ›ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentHaste.name=迅速ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentBridge.name=幻影橋ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentCompression.name=圧縮ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentSeverance.name=断絶ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentHolding.name=貯蔵ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentClaw.name=鉤爪ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentBounce.name=弾性ã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentFrost.name=寒気ã®è©¦è–¬ - -item.bloodmagic.baseComponent.reagentTeleposition.name=テレãƒãƒ¼ãƒˆã®è©¦è–¬ -item.bloodmagic.baseComponent.reagentTransposition.name=転ä½ã®è©¦è–¬ - -item.bloodmagic.baseComponent.ironSand.name=鉄ã®ç ‚ -item.bloodmagic.baseComponent.goldSand.name=金ã®ç ‚ -item.bloodmagic.baseComponent.coalSand.name=石炭ã®ç ‚ -item.bloodmagic.baseComponent.plantOil.name=æ¤ç‰©æ²¹ -item.bloodmagic.baseComponent.sulfur.name=硫黄 -item.bloodmagic.baseComponent.saltpeter.name=ç¡çŸ³ -item.bloodmagic.baseComponent.neurotoxin.name=神経毒 -item.bloodmagic.baseComponent.antiseptic.name=防è…剤 - -item.bloodmagic.cuttingFluid.basicCuttingFluid.name=基礎切削液 -item.bloodmagic.cuttingFluid.explosive.name=爆薬 - -item.bloodmagic.baseComponent.mundaneLength.name=ç°¡ç´ ãªå»¶é•·è§¦åª’ -item.bloodmagic.baseComponent.mundanePower.name=ç°¡ç´ ãªå¼·åŒ–触媒 - - -item.bloodmagic.demonCrystal.crystalDefault.name=デーモンウィルçµæ™¶ -item.bloodmagic.demonCrystal.crystalCorrosive.name=è…食性ウィルçµæ™¶ -item.bloodmagic.demonCrystal.crystalDestructive.name=破壊性ウィルçµæ™¶ -item.bloodmagic.demonCrystal.crystalVengeful.name=報復性ウィルçµæ™¶ -item.bloodmagic.demonCrystal.crystalSteadfast.name=ä¸æ´»æ€§ã‚¦ã‚£ãƒ«çµæ™¶ - -item.bloodmagic.monsterSoul.base.name=デーモニックウィル -item.bloodmagic.monsterSoul.corrosive.name=è…食性デーモニックウィル -item.bloodmagic.monsterSoul.destructive.name=破壊性デーモニックウィル -item.bloodmagic.monsterSoul.vengeful.name=報復性デーモニックウィル -item.bloodmagic.monsterSoul.steadfast.name=ä¸æ´»æ€§ãƒ‡ãƒ¼ãƒ¢ãƒ‹ãƒƒã‚¯ã‚¦ã‚£ãƒ« - -item.bloodmagic.sigil.air.name=風ã®å°ç«  -item.bloodmagic.sigil.bloodLight.name=è¡€ã®ãƒ©ãƒ³ãƒ—ã®å°ç«  -item.bloodmagic.sigil.compression.name=圧縮ã®å°ç«  -item.bloodmagic.sigil.divination.name=神託ã®å°ç«  -item.bloodmagic.sigil.water.name=æ°´ã®å°ç«  -item.bloodmagic.sigil.lava.name=溶岩ã®å°ç«  -item.bloodmagic.sigil.void.name=虚無ã®å°ç«  -item.bloodmagic.sigil.greenGrove.name=緑化ã®å°ç«  -item.bloodmagic.sigil.elementalAffinity.name=精霊ã®åŠ è­·ã®å°ç«  -item.bloodmagic.sigil.haste.name=迅速ã®å°ç«  -item.bloodmagic.sigil.suppression.name=除去ã®å°ç«  -item.bloodmagic.sigil.magnetism.name=ç£åŠ›ã®å°ç«  -item.bloodmagic.sigil.fastMiner.name=鉱夫ã®å°ç«  -item.bloodmagic.sigil.seer.name=識別ã®å°ç«  -item.bloodmagic.sigil.phantomBridge.name=幻影橋ã®å°ç«  -item.bloodmagic.sigil.whirlwind.name=旋風ã®å°ç«  -item.bloodmagic.sigil.enderSeverance.name=エンダー断絶ã®å°ç«  -item.bloodmagic.sigil.holding.name=貯蔵ã®å°ç«  -item.bloodmagic.sigil.holding.display=&r%s： &o&n%s -item.bloodmagic.sigil.teleposition.name=テレãƒãƒ¼ãƒˆã®å°ç«  -item.bloodmagic.sigil.transposition.name=転ä½ã®å°ç«  -item.bloodmagic.sigil.claw.name=鉤爪ã®å°ç«  -item.bloodmagic.sigil.bounce.name=弾性ã®å°ç«  -item.bloodmagic.sigil.frost.name=冬ã®æ¯å¹ã®å°ç«  - -item.bloodmagic.livingArmour.helmet.name=生体ã®ãƒ˜ãƒ«ãƒ¡ãƒƒãƒˆ -item.bloodmagic.livingArmour.chest.name=生体ã®ãƒã‚§ã‚¹ãƒˆãƒ—レート -item.bloodmagic.livingArmour.legs.name=生体ã®ãƒ¬ã‚®ãƒ³ã‚¹ -item.bloodmagic.livingArmour.boots.name=生体ã®ãƒ–ーツ -item.bloodmagic.sentientArmour.helmet.name=ç†åŠ›ã®ãƒ˜ãƒ«ãƒ¡ãƒƒãƒˆ -item.bloodmagic.sentientArmour.chest.name=ç†åŠ›ã®ãƒã‚§ã‚¹ãƒˆãƒ—レート -item.bloodmagic.sentientArmour.legs.name=ç†åŠ›ã®ãƒ¬ã‚®ãƒ³ã‚¹ -item.bloodmagic.sentientArmour.boots.name=ç†åŠ›ã®ãƒ–ーツ - -item.bloodmagic.altarMaker.name=祭壇メーカー - -item.bloodmagic.ritualDivinernormal.name=å„€å¼ã®å ã„棒 -item.bloodmagic.ritualDivinerdusk.name=å„€å¼ã®å ã„棒 [黄æ˜] -item.bloodmagic.ritualDivinerdawn.name=å„€å¼ã®å ã„棒 [æš] -item.bloodmagic.ritualReader.name=å„€å¼ã®èª¿æ•´å™¨ - -item.bloodmagic.arcaneAshes.name=秘儀ã®ç° -item.bloodmagic.upgradeTome.name=生体アーマー強化ã®æ›¸ -item.bloodmagic.downgradeTome.name=生体アーマー弱化ã®æ›¸ -item.bloodmagic.upgradeTrainer.name=生体アーマー養æˆãƒ–レスレット - -item.bloodmagic.sentientSword.name=ç†åŠ›ã®å‰£ -item.bloodmagic.soulGem.petty.name=微細ãªã‚¿ãƒ«ã‚¿ãƒªãƒƒã‚¯ã‚¸ã‚§ãƒ  -item.bloodmagic.soulGem.lesser.name=å°ã•ãªã‚¿ãƒ«ã‚¿ãƒªãƒƒã‚¯ã‚¸ã‚§ãƒ  -item.bloodmagic.soulGem.common.name=普通ã®ã‚¿ãƒ«ã‚¿ãƒªãƒƒã‚¯ã‚¸ã‚§ãƒ  -item.bloodmagic.soulGem.greater.name=大ããªã‚¿ãƒ«ã‚¿ãƒªãƒƒã‚¯ã‚¸ã‚§ãƒ  -item.bloodmagic.soulGem.grand.name=巨大ãªã‚¿ãƒ«ã‚¿ãƒªãƒƒã‚¯ã‚¸ã‚§ãƒ  -item.bloodmagic.soulSnare.base.name=ç°¡ç´ ãªæŠ•ã’ç½  -item.bloodmagic.sentientBow.name=ç†åŠ›ã®å¼“ -item.bloodmagic.sentientArmourGem.name=ç†åŠ›ã®ã‚¢ãƒ¼ãƒžãƒ¼ã‚¸ã‚§ãƒ  -item.bloodmagic.sentientAxe.name=ç†åŠ›ã®æ–§ -item.bloodmagic.sentientPickaxe.name=ç†åŠ›ã®ãƒ„ルãƒã‚· -item.bloodmagic.sentientShovel.name=ç†åŠ›ã®ã‚·ãƒ£ãƒ™ãƒ« - -item.bloodmagic.nodeRouter.name=ノード設定器 -item.bloodmagic.itemFilter.exact.name=精密アイテムフィルタ -item.bloodmagic.itemFilter.ignoreNBT.name=NBTタグフィルタ -item.bloodmagic.itemFilter.modItems.name=MODアイテムフィルタ -item.bloodmagic.itemFilter.oreDict.name=鉱石辞書フィルタ -item.bloodmagic.fluidFilter.exact.name=液体フィルタ - -item.bloodmagic.experienceTome.name=ペリティアã®æ›¸ -item.bloodmagic.sanguineBook.name=インスペクトリス・スカンダルム - -item.bloodmagic.livingPointUpgrade.draftAngelus.name=アンジェラスã®ä¸€é£²ã¿ - -item.bloodmagic.willGauge.name=デーモンウィルオーラ計測器 -item.bloodmagic.potionFlask.name=フラスコ入りãƒãƒ¼ã‚·ãƒ§ãƒ³ - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=ライフエッセンス - -tile.bloodmagic.stone.ritual.master.name=マスター儀å¼çŸ³ -tile.bloodmagic.stone.ritual.imperfect.name=簡易儀å¼çŸ³ -tile.bloodmagic.stone.ritual.inverted.name=å転マスター儀å¼çŸ³ - -tile.bloodmagic.altar.name=è¡€ã®ç¥­å£‡ -tile.bloodmagic.alchemyArray.name=錬金術魔法陣 - -tile.bloodmagic.rune.blank.name=空ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.speed.name=速度ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.efficiency.name=効率ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.sacrifice.name=生贄ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.selfsacrifice.name=自己犠牲ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.displacement.name=転移ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.capacity.name=容é‡å¢—加ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.augcapacity.name=容é‡å€åŠ ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.orb.name=オーブã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.acceleration.name=加速ã®ãƒ«ãƒ¼ãƒ³ -tile.bloodmagic.rune.charging.name=è“„ç©ã®ãƒ«ãƒ¼ãƒ³ - - -tile.bloodmagic.ritualStone.blank.name=å„€å¼çŸ³ -tile.bloodmagic.ritualStone.water.name=æ°´ã®å„€å¼çŸ³ -tile.bloodmagic.ritualStone.fire.name=ç«ã®å„€å¼çŸ³ -tile.bloodmagic.ritualStone.earth.name=土ã®å„€å¼çŸ³ -tile.bloodmagic.ritualStone.air.name=風ã®å„€å¼çŸ³ -tile.bloodmagic.ritualStone.dusk.name=黄æ˜ã®å„€å¼çŸ³ -tile.bloodmagic.ritualStone.dawn.name=æšã®å„€å¼çŸ³ - -tile.bloodmagic.bloodstonebrick.large.name=大ããªãƒ–ラッドストーンレンガ -tile.bloodmagic.bloodstonebrick.brick.name=ブラッドストーンレンガ -tile.bloodmagic.crystal.large.name=クリスタルクラスター -tile.bloodmagic.crystal.brick.name=クリスタルクラスターレンガ -tile.bloodmagic.bloodLight.name=è¡€ã®ç¯ç« -tile.bloodmagic.spectralBlock.name=亡霊ブロック -tile.bloodmagic.phantom.name=幻影ブロック -tile.bloodmagic.incenseAltar.name=香ã®ç¥­å£‡ - -tile.bloodmagic.teleposer.name=テレãƒãƒ¼ã‚¶ãƒ¼ -tile.bloodmagic.soulForge.name=業ç«ã®ã‹ã¾ã© -tile.bloodmagic.alchemyTable.name=錬金術テーブル -tile.bloodmagic.demonCrucible.name=悪魔ã®ã‚‹ã¤ã¼ -tile.bloodmagic.demonPylon.name=悪魔ã®å¡” -tile.bloodmagic.demonCrystallizer.name=悪魔ã®æ™¶æžè£…ç½® - -tile.bloodmagic.masterRouting.name=マスター中継ノード -tile.bloodmagic.outputRouting.name=出力中継ノード -tile.bloodmagic.inputRouting.name=入力中継ノード -tile.bloodmagic.itemRouting.name=中継ノード - -tile.bloodmagic.path.wood.name=木ã®çµŒè·¯ -tile.bloodmagic.path.woodtile.name=タイル状ã®æœ¨ã®çµŒè·¯ -tile.bloodmagic.path.stone.name=石レンガã®çµŒè·¯ -tile.bloodmagic.path.stonetile.name=タイル状ã®çŸ³ã®çµŒè·¯ -tile.bloodmagic.path.wornstone.name=摩耗ã—ãŸçŸ³ã®çµŒè·¯ -tile.bloodmagic.path.wornstonetile.name=タイル状ã®æ‘©è€—ã—ãŸçŸ³ã®çµŒè·¯ -tile.bloodmagic.path.obsidian.name=黒曜石レンガã®çµŒè·¯ -tile.bloodmagic.path.obsidiantile.name=タイル状ã®é»’曜石ã®çµŒè·¯ - -tile.bloodmagic.dimensionalPortal.name=ワープãƒãƒ¼ã‚¿ãƒ« -tile.bloodmagic.bloodTank.name=血液タンク - -tile.bloodmagic.demonCrystal.default.name=デーモンウィルçµæ™¶æ ª -tile.bloodmagic.demonCrystal.corrosive.name=è…食性ウィルçµæ™¶æ ª -tile.bloodmagic.demonCrystal.destructive.name=破壊性ウィルçµæ™¶æ ª -tile.bloodmagic.demonCrystal.vengeful.name=報復性ウィルçµæ™¶æ ª -tile.bloodmagic.demonCrystal.steadfast.name=ä¸æ´»æ€§ã‚¦ã‚£ãƒ«çµæ™¶æ ª - -tile.bloodmagic.mimic.nohitbox.name=希薄ã§ä¸é€éŽãªå½è£…ブロック -tile.bloodmagic.mimic.solidopaque.name=ä¸é€éŽãªå½è£…ブロック -tile.bloodmagic.mimic.solidclear.name=é€éŽãªå½è£…ブロック -tile.bloodmagic.mimic.solidlight.name=発光ã™ã‚‹å½è£…ブロック -tile.bloodmagic.mimic.sentient.name=ç†åŠ›ã®å½è£…ブロック - -tile.bloodmagic.bricks1.brick1_raw.name=é•·ã„原生ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks1.brick1_corrosive.name=é•·ã„è…食性ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks1.brick1_destructive.name=é•·ã„破壊性ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks1.brick1_vengeful.name=é•·ã„報復性ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks1.brick1_steadfast.name=é•·ã„ä¸æ´»æ€§ã®çŸ³ãƒ¬ãƒ³ã‚¬ - -tile.bloodmagic.bricks2.smallbrick_raw.name=å°ã•ãªåŽŸç”Ÿã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks2.smallbrick_corrosive.name=å°ã•ãªè…食性ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks2.smallbrick_destructive.name=å°ã•ãªç ´å£Šæ€§ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks2.smallbrick_vengeful.name=å°ã•ãªå ±å¾©æ€§ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks2.smallbrick_steadfast.name=å°ã•ãªä¸æ´»æ€§ã®çŸ³ãƒ¬ãƒ³ã‚¬ -tile.bloodmagic.bricks2.tile_raw.name=原生ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tile_corrosive.name=è…食性ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tile_destructive.name=破壊性ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tile_vengeful.name=報復性ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tile_steadfast.name=ä¸æ´»æ€§ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tilespecial_raw.name=装飾ã•ã‚ŒãŸåŽŸç”Ÿã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tilespecial_corrosive.name=装飾ã•ã‚ŒãŸè…食性ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tilespecial_destructive.name=装飾ã•ã‚ŒãŸç ´å£Šæ€§ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tilespecial_vengeful.name=装飾ã•ã‚ŒãŸå ±å¾©æ€§ã®çŸ³ã‚¿ã‚¤ãƒ« -tile.bloodmagic.bricks2.tilespecial_steadfast.name=装飾ã•ã‚ŒãŸä¸æ´»æ€§ã®çŸ³ã‚¿ã‚¤ãƒ« - -tile.bloodmagic.inversionpillar.raw.name=原生ã®å転柱 -tile.bloodmagic.inversionpillar.corrosive.name=è…食性ã®å転柱 -tile.bloodmagic.inversionpillar.destructive.name=破壊性ã®å転柱 -tile.bloodmagic.inversionpillar.vengeful.name=報復性ã®å転柱 -tile.bloodmagic.inversionpillar.steadfast.name=ä¸æ´»æ€§ã®å転柱 - -tile.bloodmagic.inversionpillarend.raw_bottom.name=原生ã®å転柱ã®å°åº§ -tile.bloodmagic.inversionpillarend.corrosive_bottom.name=è…食性ã®å転柱ã®å°åº§ -tile.bloodmagic.inversionpillarend.destructive_bottom.name=破壊性ã®å転柱ã®å°åº§ -tile.bloodmagic.inversionpillarend.vengeful_bottom.name=報復性ã®å転柱ã®å°åº§ -tile.bloodmagic.inversionpillarend.steadfast_bottom.name=ä¸æ´»æ€§ã®å転柱ã®å°åº§ -tile.bloodmagic.inversionpillarend.raw_top.name=原生ã®å転柱ã®æŸ±é ­ -tile.bloodmagic.inversionpillarend.corrosive_top.name=è…食性ã®å転柱ã®æŸ±é ­ -tile.bloodmagic.inversionpillarend.destructive_top.name=破壊性ã®å転柱ã®æŸ±é ­ -tile.bloodmagic.inversionpillarend.vengeful_top.name=報復性ã®å転柱ã®æŸ±é ­ -tile.bloodmagic.inversionpillarend.steadfast_top.name=ä¸æ´»æ€§ã®å転柱ã®æŸ±é ­ - -tile.bloodmagic.demonlight.raw.name=原生デーモンアイ -tile.bloodmagic.demonlight.corrosive.name=è…食性デーモンアイ -tile.bloodmagic.demonlight.destructive.name=破壊性デーモンアイ -tile.bloodmagic.demonlight.vengeful.name=報復性デーモンアイ -tile.bloodmagic.demonlight.steadfast.name=ä¸æ´»æ€§ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¢ã‚¤ - -tile.bloodmagic.extras.stone_raw.name=原生ã®çŸ³ -tile.bloodmagic.extras.stone_corrosive.name=è…食性ã®çŸ³ -tile.bloodmagic.extras.stone_destructive.name=破壊性ã®çŸ³ -tile.bloodmagic.extras.stone_vengeful.name=報復性ã®çŸ³ -tile.bloodmagic.extras.stone_steadfast.name=ä¸æ´»æ€§ã®çŸ³ - -tile.bloodmagic.extras.polished_raw.name=磨ã‹ã‚ŒãŸåŽŸç”Ÿã®çŸ³ -tile.bloodmagic.extras.polished_corrosive.name=磨ã‹ã‚ŒãŸè…食性ã®çŸ³ -tile.bloodmagic.extras.polished_destructive.name=磨ã‹ã‚ŒãŸç ´å£Šæ€§ã®çŸ³ -tile.bloodmagic.extras.polished_vengeful.name=磨ã‹ã‚ŒãŸå ±å¾©æ€§ã®çŸ³ -tile.bloodmagic.extras.polished_steadfast.name=磨ã‹ã‚ŒãŸä¸æ´»æ€§ã®çŸ³ - -tile.bloodmagic.extras.metal_raw.name=原生デーモンåˆé‡‘ -tile.bloodmagic.extras.metal_corrosive.name=報復性デーモンåˆé‡‘ -tile.bloodmagic.extras.metal_destructive.name=破壊性デーモンåˆé‡‘ -tile.bloodmagic.extras.metal_vengeful.name=報復性デーモンåˆé‡‘ -tile.bloodmagic.extras.metal_steadfast.name=ä¸æ´»æ€§ãƒ‡ãƒ¼ãƒ¢ãƒ³åˆé‡‘ - -tile.bloodmagic.pillar1.raw.name=原生ã®çŸ³æŸ± -tile.bloodmagic.pillar1.corrosive.name=è…食性ã®çŸ³æŸ± -tile.bloodmagic.pillar1.destructive.name=破壊性ã®çŸ³æŸ± -tile.bloodmagic.pillar1.vengeful.name=報復性ã®çŸ³æŸ± -tile.bloodmagic.pillar1.steadfast.name=ä¸æ´»æ€§ã®çŸ³æŸ± - -tile.bloodmagic.pillar2.raw.name=装飾ã•ã‚ŒãŸåŽŸç”Ÿã®çŸ³æŸ± -tile.bloodmagic.pillar2.corrosive.name=装飾ã•ã‚ŒãŸè…食性ã®çŸ³æŸ± -tile.bloodmagic.pillar2.destructive.name=装飾ã•ã‚ŒãŸç ´å£Šæ€§ã®çŸ³æŸ± -tile.bloodmagic.pillar2.vengeful.name=装飾ã•ã‚ŒãŸå ±å¾©æ€§ã®çŸ³æŸ± -tile.bloodmagic.pillar2.steadfast.name=装飾ã•ã‚ŒãŸä¸æ´»æ€§ã®çŸ³æŸ± - -tile.bloodmagic.pillarCap1.raw.name=原生ã®çŸ³æŸ±ã®æŸ±é ­ -tile.bloodmagic.pillarCap1.corrosive.name=è…食性ã®çŸ³æŸ±ã®æŸ±é ­ -tile.bloodmagic.pillarCap2.destructive.name=破壊性ã®çŸ³æŸ±ã®æŸ±é ­ -tile.bloodmagic.pillarCap2.vengeful.name=報復性ã®çŸ³æŸ±ã®æŸ±é ­ -tile.bloodmagic.pillarCap3.steadfast.name=ä¸æ´»æ€§ã®çŸ³æŸ±ã®æŸ±é ­ - -tile.bloodmagic.wall1.brick_raw.name=原生ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å£ -tile.bloodmagic.wall1.brick_corrosive.name=è…食性ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å£ -tile.bloodmagic.wall1.brick_destructive.name=破壊性ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å£ -tile.bloodmagic.wall1.brick_vengeful.name=報復性ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å£ -tile.bloodmagic.wall1.brick_steadfast.name=ä¸æ´»æ€§ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å£ -tile.bloodmagic.wall1.smallbrick_raw.name=原生ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å°ã•ãªå£ -tile.bloodmagic.wall1.smallbrick_corrosive.name=è…食性ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å°ã•ãªå£ -tile.bloodmagic.wall1.smallbrick_destructive.name=破壊性ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å°ã•ãªå£ -tile.bloodmagic.wall1.smallbrick_vengeful.name=報復性ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å°ã•ãªå£ -tile.bloodmagic.wall1.smallbrick_steadfast.name=ä¸æ´»æ€§ã®çŸ³ãƒ¬ãƒ³ã‚¬ã®å°ã•ãªå£ -tile.bloodmagic.wall1.large_raw.name=原生ã®çŸ³ã®å£ -tile.bloodmagic.wall1.large_corrosive.name=è…食性ã®çŸ³ã®å£ -tile.bloodmagic.wall1.large_destructive.name=破壊性ã®çŸ³ã®å£ -tile.bloodmagic.wall1.large_vengeful.name=報復性ã®çŸ³ã®å£ -tile.bloodmagic.wall1.large_steadfast.name=ä¸æ´»æ€§ã®çŸ³ã®å£ - -tile.bloodmagic.stairs1.raw.name=原生ã®çŸ³ã®éšŽæ®µ -tile.bloodmagic.stairs1.corrosive.name=è…食性ã®çŸ³ã®éšŽæ®µ -tile.bloodmagic.stairs2.destructive.name=破壊性ã®çŸ³ã®éšŽæ®µ -tile.bloodmagic.stairs2.vengeful.name=報復性ã®çŸ³ã®éšŽæ®µ -tile.bloodmagic.stairs3.steadfast.name=ä¸æ´»æ€§ã®çŸ³ã®éšŽæ®µ - -# Fluids -fluid.lifeEssence=ライフエッセンス - -# Tooltips -tooltip.bloodmagic.extraInfo=&9-Siftキーã§è©³ç´°è¡¨ç¤º- - -tooltip.bloodmagic.orb.desc=加工å‰ã®ãƒ©ã‚¤ãƒ•ã‚¨ãƒƒã‚»ãƒ³ã‚¹ã§æº€ã¡ã¦ã„ã‚‹ -tooltip.bloodmagic.orb.owner=以下ã«ã‚ˆã‚‹è¿½åŠ è¦ç´ ï¼š %s -tooltip.bloodmagic.currentOwner=ç¾åœ¨ã®æ‰€æœ‰è€…： %s -tooltip.bloodmagic.currentTier=祭壇ã®ã‚°ãƒ¬ãƒ¼ãƒ‰ï¼š %d -tooltip.bloodmagic.config.disabled=ç¾åœ¨configã«ã‚ˆã‚Šç„¡åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ -tooltip.bloodmagic.tier=グレード%d - -tooltip.bloodmagic.activated=アクティブ -tooltip.bloodmagic.deactivated=éžã‚¢ã‚¯ãƒ†ã‚£ãƒ– - -tooltip.bloodmagic.sigil.air.desc=&o体ãŒè»½ãæ„Ÿã˜ã‚‹... -tooltip.bloodmagic.sigil.bloodLight.desc=&o明ã‹ã‚Šã ï¼ -tooltip.bloodmagic.sigil.compression.desc=&oダイヤモンドã®æ‰‹ -tooltip.bloodmagic.sigil.divination.desc=&o魂を覗ã込む -tooltip.bloodmagic.sigil.divination.otherNetwork=%sã®é­‚ã¨ç›¸äº’リンク中 -tooltip.bloodmagic.sigil.divination.currentAltarTier=祭壇ã®ã‚°ãƒ¬ãƒ¼ãƒ‰ï¼š %d -tooltip.bloodmagic.sigil.divination.currentEssence=貯蔵é‡ï¼š %d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=最大容é‡ï¼š %d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=ç¾åœ¨ã®éŽ®é™åŠ¹æžœï¼š %d -tooltip.bloodmagic.sigil.divination.currentInversion=ç¾åœ¨ã®å転度： %d -tooltip.bloodmagic.sigil.divination.currentBonus=çµåˆåº¦ï¼š +%d%% -tooltip.bloodmagic.sigil.water.desc=&oç„¡é™ã®æ°´ã¯ã„ã‹ãŒï¼Ÿ -tooltip.bloodmagic.sigil.lava.desc=&o高温注æ„ï¼é£Ÿã¹ã‚‰ã‚Œã¾ã›ã‚“ -tooltip.bloodmagic.sigil.void.desc=&oクイックルワイパー(R)より素晴らã—ã„ï¼ -tooltip.bloodmagic.sigil.greenGrove.desc=&o環境ã«ã‚„ã•ã—ã„ -tooltip.bloodmagic.sigil.magnetism.desc=&oç§ã¯å¼•ã付ã‘る性格ã§ã™ -tooltip.bloodmagic.sigil.suppression.desc=&o素晴らã—ã„念動力ã ... -tooltip.bloodmagic.sigil.haste.desc=&oコーヒー４２æ¯é£²ã‚“ã ã‚ã¨... -tooltip.bloodmagic.sigil.fastMiner.desc=&o掘ã£ã¦ã€æŽ˜ã£ã¦ã€ã¾ãŸæŽ˜ã£ã¦... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oファイアフィッシュã«ãªã‚‹ï¼ -tooltip.bloodmagic.sigil.seer.desc=&oã™ã¹ã¦ã‚’見通ã›ã¦ã‚‚ã¾ã ç‰©è¶³ã‚Šãªã„ -tooltip.bloodmagic.sigil.seer.currentAltarProgress=進æ—状æ³ï¼š %d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=進æ—状æ³ï¼š %s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=消費率： %d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=祭壇ã®ã‚°ãƒ¬ãƒ¼ãƒ‰ï¼š %d -tooltip.bloodmagic.sigil.seer.currentEssence=貯蔵é‡ï¼š %d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=最大容é‡ï¼š %d LP -tooltip.bloodmagic.sigil.seer.currentCharge=ç¾åœ¨ã®ãƒãƒ£ãƒ¼ã‚¸ï¼š %d -tooltip.bloodmagic.sigil.seer.currentTranquility=ç¾åœ¨ã®éŽ®é™åŠ¹æžœï¼š %d -tooltip.bloodmagic.sigil.seer.currentBonus=çµåˆåº¦ï¼š +%d%% -tooltip.bloodmagic.sigil.phantomBridge.desc=&o空を歩ã“ã†... -tooltip.bloodmagic.sigil.whirlwind.desc=&oスカートã¯å±¥ã‹ãªã„ã»ã†ãŒã„ã„よã†ã  -tooltip.bloodmagic.sigil.enderSeverance.desc=&oエンダーマンã¯æ‚²æƒ¨ãªäº‹ã«ãªã‚‹ï¼ -tooltip.bloodmagic.sigil.teleposition.desc=ã‚ãšã‹ãªè·é›¢ãªã‚‰ç§»å‹•ã§ããã†ã ã€‚ -tooltip.bloodmagic.sigil.transposition.desc=フォースã®åŠ›ã‚’æ„Ÿã˜ã‚‹ã®ã ã€è‹¥ã弟å­ã‚ˆã€‚ -tooltip.bloodmagic.sigil.holding.press=&o%s&r&7を押ã™ã“ã¨ã§å¤‰æ›´ -tooltip.bloodmagic.sigil.holding.desc=多é‡åŒ–å°ç«  -tooltip.bloodmagic.sigil.holding.sigilInSlot=スロット %d： %s - -tooltip.bloodmagic.livingArmourPointsUpgrade.desc=生体アーマーã®å¼·åŒ–ãƒã‚¤ãƒ³ãƒˆã®æœ€å¤§å€¤ã‚’%dã«å¢—加ã•ã›ã‚‹ã€‚ - -tooltip.bloodmagic.bound.sword.desc=&o弱者ã®æ·˜æ±° -tooltip.bloodmagic.bound.pickaxe.desc=&o石ã¸ã®ç„¡æ…ˆæ‚²ãªç ´å£Š -tooltip.bloodmagic.bound.axe.desc=&o悪魔ã®ä¼æŽ¡æ©Ÿ -tooltip.bloodmagic.bound.shovel.desc=&o土を掃除ã—ã¦ç¶ºéº—ã« - -tooltip.bloodmagic.sacrificialDagger.desc=指を刺ã™ã«ã¯å分ãªåˆ‡ã‚Œå‘³ã®ã‚ˆã†ã ... -tooltip.bloodmagic.sacrificialDagger.creative=スニーク状態ã§è¡€ã®ç¥­å£‡ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã‚’ã™ã‚‹ã“ã¨ã§æº€ã‚¿ãƒ³ã«ãªã‚‹ -tooltip.bloodmagic.slate.desc=è¡€ã®ç¥­å£‡ã§æ³¨å…¥ã•ã‚ŒãŸçŸ³ -tooltip.bloodmagic.inscriber.desc=å£ã«æãã®ã«ä½¿ã†ã‚ˆã†ã ... - -tooltip.bloodmagic.pack.selfSacrifice.desc=ã“ã®ãƒ‘ックã¯æœ¬å½“ã«ãƒã‚¯ãƒã‚¯ã™ã‚‹... -tooltip.bloodmagic.pack.sacrifice.desc=Description -tooltip.bloodmagic.pack.stored=貯蔵é‡ï¼š %d LP - -tooltip.bloodmagic.activationCrystal.weak=低レベルã®å„€å¼ã‚’èµ·å‹•ã•ã›ã‚‹ -tooltip.bloodmagic.activationCrystal.awakened=より強力ãªå„€å¼ã‚’èµ·å‹•ã•ã›ã‚‹ -tooltip.bloodmagic.activationCrystal.creative=クリエイティブ専用 - å…¨ã¦ã®å„€å¼ã‚’èµ·å‹• - -tooltip.bloodmagic.diviner.currentRitual=é¸æŠžä¸­ã®å„€å¼ï¼š -tooltip.bloodmagic.diviner.blankRune=å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.waterRune=æ°´ã®å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.airRune=風ã®å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.fireRune=ç«ã®å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.earthRune=土ã®å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.duskRune=黄æ˜ã®å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.dawnRune=æšã®å„€å¼çŸ³ï¼š %d個 -tooltip.bloodmagic.diviner.totalRune=å„€å¼çŸ³ã®åˆè¨ˆï¼š %d個 -tooltip.bloodmagic.diviner.extraInfo=&9-Shiftキーã§ãƒ«ãƒ¼ãƒ³ã®è©³ç´°è¡¨ç¤º- -tooltip.bloodmagic.diviner.extraExtraInfo=&9-Shift + Mキーã§æ©Ÿèƒ½æ‹¡å¼µã®è©³ç´°è¡¨ç¤º- -tooltip.bloodmagic.diviner.currentDirection=ç¾åœ¨ã®æ–¹è§’： %s - -tooltip.bloodmagic.ritualReader.currentState=ç¾åœ¨ã®ãƒ¢ãƒ¼ãƒ‰ï¼š %s -tooltip.bloodmagic.ritualReader.set_area=設定エリア -tooltip.bloodmagic.ritualReader.information=基本情報 -tooltip.bloodmagic.ritualReader.set_will_types=消費ウィルã®è¨­å®š -tooltip.bloodmagic.ritualReader.desc.set_area=起動中ã®ãƒžã‚¹ã‚¿ãƒ¼å„€å¼çŸ³ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã“ã¨ã§ã€å„€å¼ã®åŠ¹æžœç¯„囲を変更ã§ãã¾ã™ã€‚最åˆã«ãƒžã‚¹ã‚¿ãƒ¼å„€å¼çŸ³ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã€æ¬¡ã«æ–°ã—ã設定ã—ãŸã„効果範囲㮠両端2箇所を順番ã«ã‚¯ãƒªãƒƒã‚¯ã—ã¾ã™ã€‚ -tooltip.bloodmagic.ritualReader.desc.information=起動中ã®ãƒžã‚¹ã‚¿ãƒ¼å„€å¼çŸ³ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã“ã¨ã§ã€åŸºæœ¬æƒ…報を読ã¿å–ã‚Šã¾ã™ã€‚ -tooltip.bloodmagic.ritualReader.desc.set_will_types=ホットãƒãƒ¼ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«çµæ™¶ã‚’入れãŸçŠ¶æ…‹ã§ãƒžã‚¹ã‚¿ãƒ¼å„€å¼çŸ³ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã¨ã€ãã®ã‚¦ã‚£ãƒ«ã‚’消費ã™ã‚‹ã‚ˆã†ã«è¨­å®šã•ã‚Œã¾ã™ã€‚ - -tooltip.bloodmagic.arcaneAshes=錬金術魔法陣をæãã®ã«ç”¨ã„ã‚‹ç° - -tooltip.bloodmagic.telepositionFocus.coords=ç¾åœ¨ã®è¨­å®šåº§æ¨™ï¼š (%d, %d, %d) -tooltip.bloodmagic.telepositionFocus.dimension=ディメンションID： %d -tooltip.bloodmagic.telepositionFocus.weak=ワールド内ã®ãƒ–ロックã®è»¢é€ã«ç”¨ã„ã‚‹ -tooltip.bloodmagic.telepositionFocus.enhanced=ワールド内ã®ãƒ–ロックã®è»¢é€ã«ç”¨ã„ã‚‹ -tooltip.bloodmagic.telepositionFocus.reinforced=ワールド内ã®ãƒ–ロックã®è»¢é€ã«ç”¨ã„ã‚‹ -tooltip.bloodmagic.telepositionFocus.demonic=ワールド内ã®ãƒ–ロックã®è»¢é€ã«ç”¨ã„ã‚‹ - -tooltip.bloodmagic.livingArmour.upgrade.speed=迅速 -tooltip.bloodmagic.livingArmour.upgrade.digging=ドワーフã®åŠ› -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=毒抵抗 -tooltip.bloodmagic.livingArmour.upgrade.fireResist=イグニスã®æ©æµ -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=頑丈ãªæŒ‡ -tooltip.bloodmagic.livingArmour.upgrade.knockback=ボディービルダー -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=強固ãªèº«ä½“ -tooltip.bloodmagic.livingArmour.upgrade.health=生命力 -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=å¼·æ’ƒ -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=トリックショット -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=歩行補助 -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=死神ã®ç–¾èµ° -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=太陽ã®æ©æµ -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=ルーンã®åŠ è­· -tooltip.bloodmagic.livingArmour.upgrade.revealing=洞察 -tooltip.bloodmagic.livingArmour.upgrade.experienced=経験 -tooltip.bloodmagic.livingArmour.upgrade.jump=è·³èº -tooltip.bloodmagic.livingArmour.upgrade.fallProtect=軟ç€é™¸ -tooltip.bloodmagic.livingArmour.upgrade.graveDigger=グレイヴディガー -tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=ãƒãƒ£ãƒ¼ã‚¸ã‚¹ãƒˆãƒ©ã‚¤ã‚¯ -tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=トゥルーストライク -tooltip.bloodmagic.livingArmour.upgrade.elytra=エリトラ -tooltip.bloodmagic.livingArmour.upgrade.nightSight=夜間技能 -tooltip.bloodmagic.livingArmour.upgrade.repair=補修 - - -tooltip.bloodmagic.livingArmour.upgrade.slowness=引ããšã‚‹è¶³ -tooltip.bloodmagic.livingArmour.upgrade.crippledArm=ä¸è‡ªç”±ãªè…• -tooltip.bloodmagic.livingArmour.upgrade.slippery=摩擦力低下 -tooltip.bloodmagic.livingArmour.upgrade.battleHunger=飢餓ã®æˆ¦ã„ -tooltip.bloodmagic.livingArmour.upgrade.quenched=抑制 -tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=éˆã„刃 -tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=朽ã¡ãŸãƒ„ルãƒã‚· -tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=çªæ’ƒå…µ -tooltip.bloodmagic.livingArmour.upgrade.slowHeal=ç—…å¼± -tooltip.bloodmagic.livingArmour.upgrade.disoriented=æ–¹å‘感覚障害 - -tooltip.bloodmagic.livingArmour.upgrade.level=%s (Lv %d) -tooltip.bloodmagic.livingArmour.upgrade.progress=%s (%d/100) -tooltip.bloodmagic.livingArmour.upgrade.points=&6強化ãƒã‚¤ãƒ³ãƒˆï¼š %s / %s - -tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Shift + Mã§é€²æ—情報- - -tooltip.bloodmagic.will=ウィルå«æœ‰é‡ï¼š %1$,.2f -tooltip.bloodmagic.sentientSword.desc=デーモンウィルを使用ã™ã‚‹ã“ã¨ã§æ½œåœ¨èƒ½åŠ›ãŒé–‹æ”¾ã•ã‚Œã¾ã™ -tooltip.bloodmagic.sentientAxe.desc=デーモンウィルを使用ã™ã‚‹ã“ã¨ã§æ½œåœ¨èƒ½åŠ›ãŒé–‹æ”¾ã•ã‚Œã¾ã™ -tooltip.bloodmagic.sentientPickaxe.desc=デーモンウィルを使用ã™ã‚‹ã“ã¨ã§æ½œåœ¨èƒ½åŠ›ãŒé–‹æ”¾ã•ã‚Œã¾ã™ -tooltip.bloodmagic.sentientShovel.desc=デーモンウィルを使用ã™ã‚‹ã“ã¨ã§æ½œåœ¨èƒ½åŠ›ãŒé–‹æ”¾ã•ã‚Œã¾ã™ -tooltip.bloodmagic.soulGem.petty=ã“ã®å®çŸ³ã¯å¾®é‡ã®ã‚¦ã‚£ãƒ«ã‚’貯蔵ã§ãã¾ã™ -tooltip.bloodmagic.soulGem.lesser=ã“ã®å®çŸ³ã¯å°‘é‡ã®ã‚¦ã‚£ãƒ«ã‚’貯蔵ã§ãã¾ã™ -tooltip.bloodmagic.soulGem.common=ã“ã®å®çŸ³ã¯ãã“ãã“ã®ã‚¦ã‚£ãƒ«ã‚’貯蔵ã§ãã¾ã™ -tooltip.bloodmagic.soulGem.greater=ã“ã®å®çŸ³ã¯å¤§é‡ã®ã‚¦ã‚£ãƒ«ã‚’貯蔵ã§ãã¾ã™ -tooltip.bloodmagic.soulGem.grand=ã“ã®å®çŸ³ã¯èŽ«å¤§ãªã‚¦ã‚£ãƒ«ã‚’貯蔵ã§ãã¾ã™ -tooltip.bloodmagic.soulSnare.desc=モンスターã«æŠ•ã’ã¤ã‘ã¦ã‹ã‚‰å€’ã™ã“ã¨ã§ãƒ‡ãƒ¼ãƒ¢ãƒ‹ãƒƒã‚¯ã‚¦ã‚£ãƒ«ã‚’入手ã§ãã¾ã™ - -tooltip.bloodmagic.itemFilter.exact=アイテムãŒæ­£ç¢ºã«ä¸€è‡´ã™ã‚‹å ´åˆã«ãƒ•ã‚£ãƒ«ã‚¿ã—ã¾ã™ -tooltip.bloodmagic.itemFilter.ignoreNBT=NBTã‚¿ã‚°ã§ãƒ•ã‚£ãƒ«ã‚¿ã—ã¾ã™ -tooltip.bloodmagic.itemFilter.modItems=特定MODã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’フィルタã—ã¾ã™ -tooltip.bloodmagic.itemFilter.oreDict=鉱石辞書を用ã„ã¦ãƒ•ã‚£ãƒ«ã‚¿ã—ã¾ã™ - -tooltip.bloodmagic.itemFilter.exact=液体ã®å…¥å‡ºåŠ›ã‚’フィルタã—ã¾ã™ - -tooltip.bloodmagic.fluid.type=液体内容物： %s -tooltip.bloodmagic.fluid.amount=内容é‡ï¼š %d / %d mB -tooltip.bloodmagic.fluid.capacity=最大容é‡ï¼š %d mB - -tooltip.bloodmagic.ghost.everything=全㦠-tooltip.bloodmagic.ghost.amount=幻影アイテムã®å€‹æ•°ï¼š %d個 - -tooltip.bloodmagic.currentType.default=内容物： 原生ウィル -tooltip.bloodmagic.currentType.corrosive=内容物： è…食性ウィル -tooltip.bloodmagic.currentType.destructive=内容物： 破壊性ウィル -tooltip.bloodmagic.currentType.vengeful=内容物： 報復性ウィル -tooltip.bloodmagic.currentType.steadfast=内容物： ä¸æ´»æ€§ã‚¦ã‚£ãƒ« - -tooltip.bloodmagic.currentBaseType.default=原生 -tooltip.bloodmagic.currentBaseType.corrosive=è…食性 -tooltip.bloodmagic.currentBaseType.destructive=破壊性 -tooltip.bloodmagic.currentBaseType.vengeful=報復性 -tooltip.bloodmagic.currentBaseType.steadfast=ä¸æ´»æ€§ - -tooltip.bloodmagic.experienceTome=経験値を貯蔵ã™ã‚‹ãŸã‚ã«ç”¨ã„る本 -tooltip.bloodmagic.experienceTome.exp=Exp: %0.3f -tooltip.bloodmagic.experienceTome.expLevel=レベル： %d - -tooltip.bloodmagic.decoration.safe=安全ãªè£…飾 -tooltip.bloodmagic.decoration.notSafe=å±é™ºãªè£…飾 - -tooltip.bloodmagic.cuttingFluidRatio=%d/%d 回使用å¯èƒ½ - -tooltip.bloodmagic.potion.uses=%d 回使用å¯èƒ½ - -tooltip.bloodmagic.book.shifting=紋様ãŒ... &oShiftã—ã¦... - -tooltip.bloodmagic.willGauge=大気中ã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«ã‚’測定ã™ã‚‹ãŸã‚ã®å¥‡å¦™ãªè£…置。 - -# Ritual -ritual.bloodmagic.blockRange.tooBig=指定ã•ã‚ŒãŸãƒ–ロック範囲ãŒåºƒã™ãŽã¾ã™ï¼æœ€å¤§%sブロックã®ç¯„囲内ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -ritual.bloodmagic.blockRange.tooFar=指定ã•ã‚ŒãŸãƒ–ロック範囲ãŒé ã™ãŽã¾ã™ï¼åž‚ç›´æ–¹å‘ã«%sブロックã€æ°´å¹³æ–¹å‘ã«%sブロックã®ç¯„囲内ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -ritual.bloodmagic.blockRange.inactive=å„€å¼çŸ³ã¯åœæ­¢ä¸­ã§ã‚ã‚Šã€ç¯„囲ã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“。 -ritual.bloodmagic.blockRange.noRange=ブロック範囲ã¯é©åˆ‡ã«è¨­å®šã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚ -ritual.bloodmagic.blockRange.firstBlock=効果範囲ã®é–‹å§‹ãƒ–ロックを設定ã—ã¾ã—ãŸã€‚ -ritual.bloodmagic.blockRange.success=正常ã«æ–°ã—ã„効果範囲ãŒè¨­å®šã•ã‚Œã¾ã—ãŸï¼ -ritual.bloodmagic.willConfig.set=ã“ã®å„€å¼ã«ä»¥ä¸‹ã®ç¨®é¡žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«ã‚’使用: %s -ritual.bloodmagic.willConfig.void=ã“ã®å„€å¼ã¯ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«ã‚’使用ã—ã¾ã›ã‚“ - -ritual.bloodmagic.testRitual=è©¦é¨“ç”¨å„€å¼ -ritual.bloodmagic.waterRitual=湧水ã®å„€å¼ -ritual.bloodmagic.lavaRitual=ãƒã‚¶ãƒ¼ã®å°å¤œæ›² -ritual.bloodmagic.greenGroveRitual=緑化ã®å„€å¼ -ritual.bloodmagic.jumpRitual=è·³èºã®å„€å¼ -ritual.bloodmagic.wellOfSufferingRitual=苦痛ã®äº•æˆ¸ -ritual.bloodmagic.featheredKnifeRitual=フェザーナイフã®å„€å¼ -ritual.bloodmagic.regenerationRitual=å†ç”Ÿã®å„€å¼ -ritual.bloodmagic.harvestRitual=åŽç©«æœˆã®å„€å¼ -ritual.bloodmagic.magneticRitual=ç£åŠ›ã®å„€å¼ -ritual.bloodmagic.crushingRitual=粉砕者ã®å„€å¼ -ritual.bloodmagic.fullStomachRitual=飽食ã®å„€å¼ -ritual.bloodmagic.interdictionRitual=排除ã®å„€å¼ -ritual.bloodmagic.containmentRitual=幽閉ã®å„€å¼ -ritual.bloodmagic.speedRitual=風ã®å„€å¼ -ritual.bloodmagic.suppressionRitual=除去ã®å„€å¼ -ritual.bloodmagic.expulsionRitual=追放ã®ã‚ªãƒ¼ãƒ© -ritual.bloodmagic.zephyrRitual=ゼファーã®å‘¼ã³å£° -ritual.bloodmagic.upgradeRemoveRitual=浄霊ã®èª¿ã¹ -ritual.bloodmagic.armourEvolveRitual=生体進化ã®å„€å¼ -ritual.bloodmagic.animalGrowthRitual=牧羊ã®å„€å¼ -ritual.bloodmagic.forsakenSoulRitual=見放ã•ã‚ŒãŸé­‚ã®è’集 -ritual.bloodmagic.crystalHarvestRitual=欠ã‘ãŸçµæ™¶ã®ç²‰ç • -ritual.bloodmagic.meteorRitual=崩壊ã™ã‚‹å¡”ã®å° - -ritual.bloodmagic.cobblestoneRitual=ル・ヴォルカノス・フィギュス -ritual.bloodmagic.placerRitual=設置充填ã®å„€å¼ -ritual.bloodmagic.fellingRitual=木ã“ã‚Šã®ç²‰ç • -ritual.bloodmagic.pumpRitual=サイフォンã®è®ƒæ­Œ -ritual.bloodmagic.altarBuilderRitual=高ä½ç¥­å£‡æ§‹ç¯‰å„€å¼ -ritual.bloodmagic.portalRitual=組ã¿è¾¼ã¿ã‚²ãƒ¼ãƒˆ -ritual.bloodmagic.downgradeRitual=é‡ãé­‚ã®æ‡ºæ‚” - -ritual.bloodmagic.waterRitual.info=マスター儀å¼çŸ³ã‹ã‚‰æ°´æºã‚’生æˆã—ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.info=マスター儀å¼çŸ³ã‹ã‚‰æº¶å²©æºã‚’生æˆã—ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.default.info=(原生) 溶岩ã®ç”ŸæˆLPコストを下ã’ã€ãƒªãƒ³ã‚¯ã•ã›ãŸå®¹å™¨ã«æº¶å²©ã‚’注ãŽè¾¼ã¿ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.corrosive.info=(è…食性) 範囲内ã«ã„る生物ã®ã†ã¡ã€ç«ç‚Žè€æ€§ã‚’æŒã¤ã‚‚ã®ã«æ·±åˆ»ãªãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’与ãˆã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.destructive.info=(破壊性) ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦æº¶å²©ã®è¨­ç½®ç¯„囲ãŒæ‹¡å¤§ã—ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.vengeful.info=(報復性) 範囲内ã®ç”Ÿç‰©ã«å¯¾ã—ã¦ç«ç‚Žã¸ã®æŠµæŠ—を付与ã—ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.steadfast.info=(ä¸æ´»æ€§) 指定ã—ãŸç¯„囲内ã«ã„るプレイヤーã«å¯¾ã—ã¦ç«ç‚Žè€æ€§ã‚’付与ã—ã¾ã™ã€‚ - -ritual.bloodmagic.greenGroveRitual.info=エリア内ã®ä½œç‰©ã‚’æˆé•·ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.jumpRitual.info=空中ã«ã¯ã­é£›ã¶åŠ¹æžœã‚’付与ã—ã¾ã™ã€‚ -ritual.bloodmagic.wellOfSufferingRitual.info=生物ã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’与ãˆã‚‹ã‚¨ãƒªã‚¢ã‚’生æˆã—ã€ä»˜è¿‘ã®è¡€ã®ç¥­å£‡ã«LPを供給ã—ã¾ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.info=プレイヤーã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’与ãˆã‚‹ã‚¨ãƒªã‚¢ã‚’生æˆã—ã€ä»˜è¿‘後ã®ç¥­å£‡ã«LPを供給ã—ã¾ã™ã€‚ -ritual.bloodmagic.regenerationRitual.info=エリア内ã«HPãŒæ¸›å°‘ã—ã¦ã„る生物ãŒã„ãŸå ´åˆã€å†ç”Ÿèƒ½åŠ›ã‚’付与ã—ã¾ã™ã€‚ -ritual.bloodmagic.regenerationRitual.default.info=(原生) -ritual.bloodmagic.regenerationRitual.corrosive.info=(è…食性) 範囲内ã«ã„るプレイヤー以外ã®ç”Ÿç‰©ã‹ã‚‰ç”Ÿå‘½åŠ›ã‚’奪ã„ã€ãƒ—レイヤーを治癒ã—ã¾ã™ã€‚ -ritual.bloodmagic.regenerationRitual.destructive.info=(破壊性) -ritual.bloodmagic.regenerationRitual.vengeful.info=(報復性) -ritual.bloodmagic.regenerationRitual.steadfast.info=(ä¸æ´»æ€§) -ritual.bloodmagic.harvestRitual.info=エリア内ã®ä½œç‰©ã‚’刈りå–ã‚Šã€ç¨®ãªã©ã®åŽç©«ç‰©ãŒã‚ã£ãŸå ´åˆã¯æ¤ãˆç›´ã—ã¾ã™ã€‚ -ritual.bloodmagic.magneticRitual.info=地中ã‹ã‚‰é‰±çŸ³ã‚’掘り起ã“ã—ã€æŒ‡å®šã‚¨ãƒªã‚¢ã«ä¸¦ã¹ã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.info=指定エリアã®ãƒ–ロックを破壊ã—ã€åŽé›†ç‰©ã‚’リンクã—ã¦ã„ã‚‹ãƒã‚§ã‚¹ãƒˆã«æ ¼ç´ã—ã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.destructive.info=(破壊性) ブロックを強制的ã«ç ´å£Šã—ã¾ã™ï¼šç ´å£Šã—ãŸå…¨ã¦ã®ãƒ–ロックã¯å¹¸é‹IIIã®åŠ¹æžœãŒé©ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.steadfast.info=(ä¸æ´»æ€§) å…¨ã¦ã®ãƒ–ロックã¯ã‚·ãƒ«ã‚¯ã‚¿ãƒƒãƒã«ã‚ˆã£ã¦ç ´å£Šã•ã‚Œã¾ã™ã€‚幸é‹ã®åŠ¹æžœã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.corrosive.info=(è…食性) å…¨ã¦ã®ãƒ–ロックã¯åˆ‡å‰Šæ¶²ã§ç ´å£Šã•ã‚Œã¾ã™ã€‚シルクタッãƒã®åŠ¹æžœã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.vengeful.info=(報復性) å¯èƒ½ã§ã‚ã‚Œã°ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã®åœ§ç¸®ã‚’試ã¿ã¾ã™ã€‚1回ã®å‹•ä½œã§ä¸€åº¦ã®åœ§ç¸®ã—ã‹è¡Œã‚ã‚Œã¾ã›ã‚“。 -ritual.bloodmagic.crushingRitual.default.info=(原生) ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦ã€å„€å¼ã®é€Ÿåº¦ãŒå‘上ã—ã¾ã™ã€‚ -ritual.bloodmagic.greenGroveRitual.corrosive.info=(è…食性) 作物ã®å‘¨å›²ã«ã„る生物ã¯æ”»æ’ƒã‚’å—ã‘ã€ç”Ÿå‘½åŠ›ãŒä½œç‰©ã«å¸åŽã•ã‚Œã‚‹ã€‚ -ritual.bloodmagic.greenGroveRitual.default.info=(原生) オーラ中ã®ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦å…¨ã¦ã®å„€å¼ã®ä½œå‹•é€Ÿåº¦ãŒå‘上ã—ã¾ã™ã€‚ -ritual.bloodmagic.greenGroveRitual.vengeful.info=(報復性) Tick当ãŸã‚Šã®æˆé•·ã®æˆåŠŸçŽ‡ãŒå¢—加ã—ã¾ã™ã€‚ -ritual.bloodmagic.greenGroveRitual.steadfast.info=(ä¸æ´»æ€§) 種をæ¤ãˆç›´ã—ã€æ½…水範囲ã«ã‚るブロックを湿らã›ã‚‹ã€‚ -ritual.bloodmagic.greenGroveRitual.destructive.info=(破壊性) ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦ã€æˆé•·ã•ã›ã‚‹ç¯„囲ãŒæ‹¡å¤§ã—ã¾ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.default.info=(原生) オーラ中ã®ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦ã€å„€å¼ã®é€Ÿåº¦ãŒå‘上ã—ã¾ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.destructive.info=(破壊性) オーラ中ã®ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦ã€å„€å¼ã«ã‚ˆã‚‹åŽé›†é‡ã‚’増やã—ã¾ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.vengeful.info=(報復性) 犠牲ã«ã™ã‚‹HPã®æœ€ä½Žå€¤ã‚’10%%ã¾ã§ã«ã—ã¾ã™ã€‚所有者ãŒä¸æ´»æ€§ãŒæœ‰åŠ¹ã«ã—ã¦ã„ã‚‹ã¨ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.corrosive.info=(è…食性) ãŠé¦™ã«ã‚ˆã‚‹åŠ¹æžœå¢—大を有効ã«ã—ã¾ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.steadfast.info=(ä¸æ´»æ€§) 犠牲ã«ã™ã‚‹HPã®æœ€ä½Žå€¤ã‚’30%%ã‹ã‚‰70%%ã«ã—ã¾ã™ã€‚ -ritual.bloodmagic.speedRitual.default.info=(原生) オーラ中ã®ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦ã€å°„出速度ãŒä¸Šæ˜‡ã—ã¾ã™ã€‚ -ritual.bloodmagic.speedRitual.vengeful.info=(報復性) 大人ã®ç”Ÿç‰©ã‚„プレイヤーを移動ã•ã›ã¾ã™ã€‚破壊性も利用ã—ã¦ã„ãŸå ´åˆã¯ãƒ—レイヤーを移動ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.speedRitual.destructive.info=(破壊性) å­ä¾›ã®ç”Ÿç‰©ã‚„プレイヤーを移動ã•ã›ã¾ã™ã€‚報復性も利用ã—ã¦ã„ãŸå ´åˆã¯ãƒ—レイヤーを移動ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.animalGrowthRitual.vengeful.info=(報復性) 大人ãŒå†ã³ç¹æ®–ã™ã‚‹ã¾ã§ã®æ™‚間を短縮ã™ã¾ã™ã€‚ -ritual.bloodmagic.animalGrowthRitual.steadfast.info=(ä¸æ´»æ€§) 関連付ã‘られãŸãƒã‚§ã‚¹ãƒˆå†…ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’用ã„ã¦ã€ã‚¨ãƒªã‚¢å†…ã®å¤§äººã‚’自動的ã«ç¹æ®–ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.animalGrowthRitual.default.info=(原生) オーラ中ã®ç·ã‚¦ã‚£ãƒ«é‡ã«å¿œã˜ã¦ã€å„€å¼ã®é€Ÿåº¦ãŒå‘上ã—ã¾ã™ã€‚ -ritual.bloodmagic.animalGrowthRitual.destructive.info=(破壊性) é•·ã„é–“ç¹æ®–ã‚’è¡Œã£ã¦ã„ãªã„大人ã¯ã€MOBã«å‘ã‹ã£ã¦ã„ã爆発ã™ã‚‹ã€‚ -ritual.bloodmagic.animalGrowthRitual.corrosive.info=(è…食性) Unimplemented. - -ritual.bloodmagic.fullStomachRitual.info=リンクã—ã¦ã„ã‚‹ãƒã‚§ã‚¹ãƒˆå†…ã«ã‚る食料をã€æº€è…¹ã§ãªã„プレイヤーã«è‡ªå‹•çš„ã«ä¾›çµ¦ã—ã¾ã™ã€‚ -ritual.bloodmagic.interdictionRitual.info=マスター儀å¼çŸ³ã®ä¸€å®šã‚¨ãƒªã‚¢å†…ã®ç”Ÿç‰©ã‚’排除ã—ã¦ä¾µå…¥ã§ããªã„よã†ã«ã—ã¾ã™ã€‚ -ritual.bloodmagic.containmentRitual.info=エリア内ã®ç”Ÿç‰©ã‚’スター儀å¼çŸ³ã®å‘¨å›²ã«å¼•ã寄ã›ã¾ã™ã€‚ -ritual.bloodmagic.speedRitual.info=矢å°çŠ¶ã®å„€å¼çŸ³ã®æ–¹å‘ã¸ã€ãƒ—レイヤーを射出ã—ã¾ã™ã€‚ -ritual.bloodmagic.suppressionRitual.info=ã‚らゆるæµä½“元を除去ã—ã¾ã™ - å„€å¼ã®å‹•ä½œã‚’åœæ­¢ã™ã‚‹ã¨æ¶²ä½“ã¯æˆ»ã£ã¦ãる。 -ritual.bloodmagic.expulsionRitual.info=å„€å¼ã®è¨­ç½®è€…ã‹ã€ãƒžã‚¹ã‚¿ãƒ¼å„€å¼çŸ³ã®ä¸Šã®ãƒã‚§ã‚¹ãƒˆã«å¥‘約済ã¿ãƒ–ラッドオーブã®ã‚’入れãŸãƒ—レイヤー以外を所定エリアã‹ã‚‰æŽ’除ã—ã¾ã™ã€‚ -ritual.bloodmagic.zephyrRitual.info=エリア内ã®ãƒ‰ãƒ­ãƒƒãƒ—アイテムをåŽé›†ã—ã€ãƒªãƒ³ã‚¯ã•ã‚ŒãŸãƒã‚§ã‚¹ãƒˆã«åŽç´ã—ã¾ã™ã€‚ -ritual.bloodmagic.upgradeRemoveRitual.info=Undocumented. -ritual.bloodmagic.armourEvolveRitual.info=Undocumented. -ritual.bloodmagic.animalGrowthRitual.info=エリア内ã«ã„ã‚‹å­ä¾›ç”Ÿç‰©ã®æˆé•·é€Ÿåº¦ã‚’æ—©ã‚ã¾ã™ã€‚ -ritual.bloodmagic.forsakenSoulRitual.info=エリア内ã®ç”Ÿç‰©ã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’与ãˆã€ç”Ÿç‰©ãŒæ­»ã‚“ã æ™‚ã«ã‚¦ã‚£ãƒ«ã‚’回åŽã—ã¦ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«çµæ™¶ã‚’æˆé•·ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.crystalHarvestRitual.info=範囲内ã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«çµæ™¶æ ªã‚’破壊ã—ã¦ã‚¦ã‚£ãƒ«çµæ™¶ã«ã—ã¦ãƒ‰ãƒ­ãƒƒãƒ—ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.placerRitual.info=リンクã—ã¦ã„ã‚‹ãƒã‚§ã‚¹ã®ä¸­ã‹ã‚‰ãƒ–ロックã¨ã—ã¦è¨­ç½®å¯èƒ½ãªã‚‚ã®ã‚’å–り出ã—ã€éš™é–“ãªã設置ã—ã¾ã™ã€‚ -ritual.bloodmagic.fellingRitual.info=ã“ã®å„€å¼ã¯æ¨™æº–çš„ãªæœ¨æä¼æŽ¡è£…ç½®ã¨ã—ã¦å‹•ä½œã—ã€ã‚¨ãƒªã‚¢å†…ã®ã™ã¹ã¦ã®åŽŸæœ¨åŠã³è‘‰ã‚’ä¼æŽ¡ãŠã‚ˆã³æŽ¡å–ã—ã¾ã™ã€‚ -ritual.bloodmagic.pumpRitual.info=設定エリアã‹ã‚‰æµä½“ã‚’å¸ã„出ã—ã€1ãƒã‚±ãƒ„分以上ã®å®¹é‡ãŒã‚ã‚‹æµä½“タンクã¸ã¨ä¾›çµ¦ã—ã¾ã™ã€‚ -ritual.bloodmagic.altarBuilderRitual.info=マスター儀å¼çŸ³ã¨ãƒªãƒ³ã‚¯ã—ã¦ã„ã‚‹ãƒã‚§ã‚¹ãƒˆã®ä¸­èº«ã‚’使用ã—ã¦è¡€ã®ç¥­å£‡ã‚’構築ã—ã¾ã™ã€‚ -ritual.bloodmagic.portalRitual.info=作æˆã—èµ·å‹•ã•ã›ã‚‹ã¨åŒæ™‚ã«å‘¨å›²ã®ãƒ–ロックæ質を固有ã®â€ã‚­ãƒ¼â€ã¨ã™ã‚‹ãƒãƒ¼ã‚¿ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’構築ã—ã¾ã™ã€‚周囲ブロックã®å¤‰æ›´ã¯èµ·å‹•å¾Œã§ã‚‚å¯èƒ½ã§ã‚ã‚Šã€ãƒãƒ¼ã‚¿ãƒ«ã¯åŒã˜ã‚­ãƒ¼åŒå£«ã‚’リンクã—ã¾ã™ã€‚ -ritual.bloodmagic.meteorRitual.info=範囲内ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’消費ã—ã€ç©ºã‹ã‚‰è³‡æºã«å¯Œã‚“ã éš•çŸ³ã‚’å„€å¼ã«ç›´æ’ƒã•ã›ã‚‹ã‚ˆã†ã«å¬å–šã—ã¾ã™ã€‚ - -ritual.bloodmagic.waterRitual.waterRange.info=(æ°´) 設定ã—ãŸã‚¨ãƒªã‚¢ã«æ°´æºã‚’生æˆã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.lavaRange.info=(溶岩) 設定ã—ãŸã‚¨ãƒªã‚¢ã«æº¶å²©æºã‚’生æˆã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.lavaTank.info=(原生) å„€å¼ã«ã‚ˆã£ã¦ç”Ÿæˆã—ãŸæº¶å²©ã‚’入れるタンク。 -ritual.bloodmagic.lavaRitual.fireFuse.info=(報復性) 範囲内ã®ã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£ã¯ç‚Žã«ã‚ˆã£ã¦è‹¦ã—ã‚られã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.fireResist.info=(ä¸æ´»æ€§) 範囲内ã®ãƒ—レイヤーã¯ç«ç‚Žè€æ€§ã®åŠ¹æžœã‚’与ãˆã¾ã™ã€‚ -ritual.bloodmagic.lavaRitual.fireDamage.info=(è…食性) 範囲内ã«ã„ã‚‹ç«ç‚Žè€æ€§ã‚’æŒã¤ç”Ÿç‰©ã¯ã‚¦ã‚£ãƒ«é‡ã«æ¯”例ã—ãŸãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’å—ã‘ã¾ã™ã€‚ -ritual.bloodmagic.greenGroveRitual.growing.info=(æˆé•·) 設定ã—ãŸã‚¨ãƒªã‚¢å†…ã®æ¤ç‰©ã®æˆé•·ã‚’促進ã•ã›ã¾ã™ã€‚ -ritual.bloodmagic.greenGroveRitual.leech.info=(è…食性) 作物ã®æˆé•·ã®ãŸã‚ã«å‘¨è¾ºã®ç”Ÿç‰©ã¯ç”Ÿå‘½åŠ›ã‚’å¸åŽã•ã‚Œã‚‹ã€‚ -ritual.bloodmagic.greenGroveRitual.hydrate.info=(ä¸æ´»æ€§) 範囲内ã®è€•ã—ãŸãƒ–ロックを湿らã›ã€ã‚¨ãƒªã‚¢å‘¨è¾ºã«ã‚る種å­ã‚’æ¤ãˆä»˜ã‘る。 -ritual.bloodmagic.jumpRitual.jumpRange.info=(è·³èº) 設定ã—ãŸã‚¨ãƒªã‚¢å†…ã«å±…る生物を空中ã«é£›ã³ä¸ŠãŒã‚‰ã›ã¾ã™ã€‚ -ritual.bloodmagic.wellOfSufferingRitual.altar.info=(祭壇) å„€å¼ãŒè¡€ã®ç¥­å£‡ã‚’検索ã™ã‚‹ã‚¨ãƒªã‚¢ã‚’指定ã—ã¾ã™ã€‚変更ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šæ¤œç´¢ã‚¨ãƒªã‚¢ã‚’拡大ã—ãŸã‚Šç‰¹å®šã®é ˜åŸŸã«åˆ¶é™ã—ãŸã‚Šã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚ -ritual.bloodmagic.wellOfSufferingRitual.damage.info=(ダメージ) å„€å¼ã«ã‚ˆã£ã¦ç”Ÿç‰©ãŒç¶™ç¶šãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’å—ã‘るエリアを設定ã—ã¾ã™ã€‚ã“ã®ç¯„囲内ã«å±…ã‚‹ã™ã¹ã¦ã®ç”Ÿç‰©ã¯å¾ã€…ã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’å—ã‘続ã‘ã‚‹(プレイヤーを除ã)。 -ritual.bloodmagic.featheredKnifeRitual.altar.info=(祭壇）儀å¼ãŒè¡€ã®ç¥­å£‡ã‚’検索ã™ã‚‹ã‚¨ãƒªã‚¢ã‚’指定ã—ã¾ã™ã€‚変更ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šæ¤œç´¢ã‚¨ãƒªã‚¢ã‚’拡大ã—ãŸã‚Šç‰¹å®šã®é ˜åŸŸã«åˆ¶é™ã—ãŸã‚Šã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚ -ritual.bloodmagic.featheredKnifeRitual.damage.info=(ダメージ) å„€å¼ã«ã‚ˆã£ã¦ãƒ—レイヤーãŒç¶™ç¶šãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’å—ã‘るエリアを設定ã—ã¾ã™ã€‚ã“ã®ç¯„囲内ã«å±…るプレイヤーã¯æ­»ã¬ä¸€æ­©æ‰‹å‰ã¾ã§å¾ã€…ã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’å—ã‘続ã‘る。 -ritual.bloodmagic.regenerationRitual.heal.info=(回復) 範囲内ã«å±…る生物ã¯å†ç”Ÿèƒ½åŠ›ã®åŠ¹æžœã‚’与ãˆã¾ã™ã€‚ -ritual.bloodmagic.regenerationRitual.vampire.info=(å¸è¡€ä¸»ç¾©) 範囲内ã«ã„る生物ã¯ãƒ—レイヤーã®å›žå¾©ã®ãŸã‚ã«ç”Ÿå‘½åŠ›ãŒå‰Šã‚‰ã‚Œã¦ã„ãã¾ã™ã€‚ -ritual.bloodmagic.harvestRitual.harvestRange.info=(åŽç©«) 範囲内ã®æ¤ç‰©ã‚’åŽç©«ã—ã¾ã™ã€‚ -ritual.bloodmagic.magneticRitual.placementRange.info=(é…ç½®) å„€å¼ã¯ã“ã®ã‚¨ãƒªã‚¢ã«æ‰‹ã«å…¥ã‚ŒãŸé‰±çŸ³ã‚’é…ç½®ã—ã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.crushingRange.info=(粉砕) å„€å¼ã¯ã“ã®ã‚¨ãƒªã‚¢å†…ã®ãƒ–ロックを破壊ã—ã¦å…¥æ‰‹ã—ã¾ã™ã€‚ -ritual.bloodmagic.crushingRitual.chest.info=(ãƒã‚§ã‚¹ãƒˆ) å„€å¼ãŒç ´å£Šã—ãŸãƒ–ロックを格ç´ã™ã‚‹ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã®å ´æ‰€ã€‚ -ritual.bloodmagic.fullStomachRitual.fillRange.info=(補給) å„€å¼ãŒãƒ—レイヤーã«é£Ÿæ–™ã‚’供給ã™ã‚‹ç¯„囲。 -ritual.bloodmagic.fullStomachRitual.chest.info=(ãƒã‚§ã‚¹ãƒˆ) å„€å¼ãŒãƒ—レイヤーã«ä¾›çµ¦ã™ã‚‹ãŸã‚ã®é£Ÿæ–™ã‚’å–り出ã™ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã®å ´æ‰€ã€‚ -ritual.bloodmagic.interdictionRitual.interdictionRange.info=(排除) å„€å¼ã«ã‚ˆã£ã¦ç”Ÿç‰©ãŒå¼¾ã飛ã°ã•ã‚Œã‚‹ç¯„囲。ã™ã¹ã¦ã®ç”Ÿç‰©ã¯ã“ã®è¨­å®šã‚¨ãƒªã‚¢ã«é–¢ä¿‚ãªãマスター儀å¼çŸ³ã‹ã‚‰å¼¾ã飛ã°ã•ã‚Œã‚‹ã€‚ -ritual.bloodmagic.containmentRitual.containmentRange.info=(幽閉) å„€å¼ã«ã‚ˆã£ã¦ç”Ÿç‰©ãŒå¼•ã寄ã›ã‚‰ã‚Œã‚‹ç¯„囲。ã™ã¹ã¦ã®ç”Ÿç‰©ã¯ã“ã®è¨­å®šã‚¨ãƒªã‚¢ã«é–¢ä¿‚ãªãマスター儀å¼çŸ³ã®æ–¹ã¸ã¨å¼•ã寄ã›ã‚‰ã‚Œã‚‹ã€‚ -ritual.bloodmagic.speedRitual.sanicRange.info=(加速) 設定ã—ãŸã‚¨ãƒªã‚¢å†…ã®ã™ã¹ã¦ã®ç”Ÿç‰©ãŒçŸ¢å°ã®æ–¹å‘ã¸ã¨å°„出ã•ã‚Œã¾ã™ã€‚ -ritual.bloodmagic.suppressionRitual.suppressionRange.info=(除去) 範囲内ã®ã™ã¹ã¦ã®æ¶²ä½“ãŒæŠ¼ã—ã®ã‘られã¾ã™ã€‚ -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(追放) -ritual.bloodmagic.zephyrRitual.zephyrRange.info=(å¸å¼•) 設定範囲内ã®ã‚¢ã‚¤ãƒ†ãƒ ãŒåŽé›†ã•ã‚Œã€ãƒªãƒ³ã‚¯ã•ã‚Œã¦ã„ã‚‹ãƒã‚§ã‚¹ãƒˆã«åŽç´ã•ã‚Œã¾ã™ã€‚ -ritual.bloodmagic.zephyrRitual.chest.info=(ãƒã‚§ã‚¹ãƒˆ) å„€å¼ãŒåŽé›†ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’åŽç´ã™ã‚‹ãŸã‚ã®ãƒã‚§ã‚¹ãƒˆã®å ´æ‰€ã€‚ -ritual.bloodmagic.animalGrowthRitual.growing.info=(æˆé•·) 範囲内ã®å‹•ç‰©ãŒã¨ã¦ã‚‚æ—©ãæˆé•·ã—ã¾ã™ã€‚ -ritual.bloodmagic.animalGrowthRitual.chest.info=(ãƒã‚§ã‚¹ãƒˆ) ç¹æ®–ã•ã›ã‚‹ãŸã‚ã®é©åˆ‡ãªé¤Œã‚’入れãŸãƒã‚§ã‚¹ãƒˆã®å ´æ‰€ã€‚ -ritual.bloodmagic.forsakenSoulRitual.crystal.info=(çµæ™¶) å„€å¼ã«ã‚ˆã£ã¦ç”Ÿç‰©ãŒæ­»äº¡ã—ãŸéš›ã«ã€ã“ã®ç¯„囲内ã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«çµæ™¶ã®æˆé•·ãŒä¿ƒé€²ã—ã¾ã™ã€‚ -ritual.bloodmagic.forsakenSoulRitual.damage.info=(ダメージ) ã“ã®ç¯„囲内ã®ç”Ÿç‰©ã¯å¾ã€…ã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’å—ã‘ã€æ­»äº¡ã—ãŸéš›ã®ã‚¦ã‚£ãƒ«ãŒã‚¯ãƒªã‚¹ã‚¿ãƒ«ã®æˆé•·ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ -ritual.bloodmagic.crystalHarvestRitual.crystal.info=(çµæ™¶) æžå‡ºã—ãŸå…¨ã¦ã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚¦ã‚£ãƒ«çµæ™¶æ ªã‚’破壊ã—ã¦å˜çµæ™¶ã®çµæ™¶ã«ã—ã¾ã™ã€‚çµæ™¶æ ªãŒ1ã¤ã ã‘ã«ãªã£ãŸå ´åˆã¯ç ´å£Šã—ãªã„。 - -ritual.bloodmagic.placerRitual.placerRange.info=(場所) å„€å¼ãŒè¨­å®šç¯„囲ã«ãƒ–ロックを設置ã—ã¾ã™ã€‚ -ritual.bloodmagic.placerRitual.chest.info=(ãƒã‚§ã‚¹ãƒˆ) å„€å¼ãŒãƒ–ロックを設置ã™ã‚‹ãŸã‚ã«ã€ãƒ–ロックをå–り出ã™ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã®å ´æ‰€ã€‚ -ritual.bloodmagic.fellingRitual.fellingRange.info=(ä¼æŽ¡) å„€å¼ãŒä¼æŽ¡ã™ã‚‹ãŸã‚ã®åŽŸæœ¨ã‚„葉を探ã™ç¯„囲。 -ritual.bloodmagic.fellingRitual.chest.info=(ãƒã‚§ã‚¹ãƒˆ) å„€å¼ãŒè’集物を格ç´ã™ã‚‹ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã®å ´æ‰€ã€‚ -ritual.bloodmagic.pumpRitual.pumpRange.info=(ãƒãƒ³ãƒ—) å„€å¼ãŒæŽ¡å–ã™ã‚‹ãŸã‚ã®æ¶²ä½“を探ã™ç¯„囲。 - -ritual.bloodmagic.downgradeRitual.dialogue.bow.1=ã•ã¦äººé–“よã€æ›´ãªã‚‹åŠ›ãŒæ¬²ã—ã„ã‹...？ -ritual.bloodmagic.downgradeRitual.dialogue.bow.100=ã‚‚ã¡ã‚ん知ã£ã¦ã„ã‚‹ã ã‚ã†ãŒã€ä½•äº‹ã«ã‚‚対価ãŒå¿…è¦ã§ã‚ã‚‹... 何らã‹ã®ä»£å„Ÿã‚’支払ã†ã“ã¨ãªãã€ç§ã¯ãŠå‰ã«æ›´ãªã‚‹åŠ›ã‚’与ãˆã‚‹è¨³ã«ã¯ã„ã‹ãªã„ã®ã ... -ritual.bloodmagic.downgradeRitual.dialogue.bow.300=ç§ã®å‰ã«ä¾›ç‰©ã‚’å·®ã—出ã™ã“ã¨ã§ãŠå‰ã¯æ„Ÿè¦šã‚’失ã„ã€é•·è·é›¢ã®æŠ•æ“²ç‰©ã‚’命中ã•ã›ã‚‹ã“ã¨ãŒã§ããªããªã‚‹ã ã‚ã†ã€‚弓矢ãŒå‹åˆ©ã®éµãŸã‚Šå¾—ã‚‹ã“ã¨ã¯ã€ã‚‚ã¯ã‚„ãªã„ã®ã ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.bow.500=ã ãŒãã®è¦‹è¿”ã‚Šã¨ã—ã¦ã€ç§ã¯ã•ã‚‰ãªã‚‹æˆé•·ã‚’ã‚‚ãŸã‚‰ã™ãŸã‚ã«ãŠå‰ã®éŽ§ã‚’解放ã—よã†... ãŠå‰ãŒã™ã¹ã事ã¯ä¾›ç‰©ã‚’æ§ã’ã€ã“ã®ç¥­å£‡ã«è·ªãã“ã¨ã ... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.1=フフフ... ã”ãã’んよã†ã€‚ より強力ãªåŠ›ã‚’欲ã—ã¦ã„るよã†ã ãªã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.quenched.100=ã„ã£ã±ã„ã«ãªã£ãŸæ¯ã‚’å†ã³æ³¨ãŽç›´ã™ã«ã¯ã€å¿…ãšä¸€åº¦ç©ºã«ã™ã‚‹å¿…è¦ãŒã‚る。ã“ã‚Œã¯ãŠå‰ã«ã‚‚å分ç†è§£ã§ãã‚‹ã ã‚ã†ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=次ã®ã‚ˆã†ãªå–引をæŒã¡ã‹ã‘よã†ï¼šé£²ã‚€ã“ã¨ã«ã‚ˆã‚ŠæŠ€èƒ½ã‚’ã²ã¨ã¤å¤±ã„ã€ç§ã¯ãŠå‰ã«èŽ«å¤§ãªæ½œåœ¨èƒ½åŠ›ã‚’与ãˆã‚ˆã†ã€‚ã—ã‹ã—ãªãŒã‚‰ã€ã“ã®å–引ãŒãŠå‰ã«ã¨ã£ã¦ä¾¡å€¤ã‚ã‚‹ã‚‚ã®ã§ã‚ã‚‹ã‹ã©ã†ã‹ã¯å®Œå…¨ã«åˆ¥ã®å•é¡Œã ... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.500=ã•ã‚è·ªã‘ã€äººé–“よ。ãã—ã¦ç§ãŒæŽˆã‘ãŸæ¯ã‚’飲ã¿å¹²ã™ãŒã„ã„。ãŠãらããã‚Œã¯ãŠå‰ã«ã¨ã£ã¦ã®æœ€å¾Œã®ä¸€æ¯ã¨ãªã‚ã†ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=ãµã†ã‚€... ãŠå‰ã®æœ¬å½“ã®æœ›ã¿ã¯ä½•ãªã®ã ï¼Ÿ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.100=ã‚‚ã—死を超越ã—ãŸäººé–“ãªã‚‰ã°ã€ç§ã¯ãŠå‰ã¨å–引をã™ã‚‹ã“ã¨ã¯ã§ããªã„─ ãã®ä»£ã‚ã‚Šã«åˆ¥ã®å–引をæ示ã™ã‚‹ã“ã¨ã¯ã§ãã‚‹... -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.300=ãŸã ã—ã€ç§ã¯ãŠå‰ã«ä½•ã‹ã—らã®ä»£å„Ÿã‚’è¦æ±‚ã—よã†ï¼šãŠå‰ã®ç‰©ç†çš„ãªæˆ¦é—˜èƒ½åŠ›ã ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.500=ã“ã‚Œã«å¥‘ç´„ã™ã‚‹ã“ã¨ã§ã€ã‚‚ã¯ã‚„ãŠå‰ã¯ç¢ºå®Ÿã«æ­¦å™¨ã‚’振るãˆãªããªã‚Šã€ä»¥å‰ã«æŒ¯ã‚‹ãˆã¦ã„ãŸãƒ€ãƒ¡ãƒ¼ã‚¸ã®ã»ã‚“ã®åƒ…ã‹ã—ã‹ä¸Žãˆã‚‹ã“ã¨ãŒã§ããªããªã‚‹ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.700=ã•ã‚ã€ãŠå‰ã®é¸æŠžæ¬¡ç¬¬ã ï¼šç¥­å£‡ã«è·ªãã‹ã€å·±ã®å‰£ã‚’執り続ã‘ã‚‹ã®ã‹ï¼Ÿ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.1=用心ã—ãŸã¾ãˆã€äººé–“よ。ãŠå‰ã®åœ°ç›¤ã¯å´©ã‚Œè¡Œãã“ã¨ã«ãªã‚‹ã ã‚ã†ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=ç§ã¯æˆ‘ãŒåŒè¼©ãŸã¡ã¨ã¯ç•°ãªã‚‹ã€‚ãŠå‰ã®ç”Ÿå‘½ã‚’扱ã†é­”術師ã¨ã—ã¦ã€ãŠå‰ã®æœ›ã¿ã‚’å¶ãˆã‚‹ãŸã‚ã®æã‚ã—ã„契約をæä¾›ã—よã†ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=ãŠå‰ã®æ€ªæˆ‘ã¯ã„ãšã‚Œç™’ãˆã‚‹ã“ã¨ã ã‚ã†ã€‚ã—ã‹ã—ç§ã®â€åŠ è­·â€ã‚’å—ã‘ã—者ã¯ãã‚ŒãŒé…·ãゆã£ãŸã‚Šã¨ã—ãŸã‚‚ã®ã«ãªã‚‹ã€‚戦場ã§å‚·ã‚’è² ãˆã°ãŠå‰ã‚’ã•ã‚‰ã«æ‚©ã¾ã›ã‚‹ã“ã¨ã ã‚ã†ã€‚ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=挑むå‰ã«ã‚ˆãよã考ãˆãŸã¾ãˆã€‚ã²ã¨ãŸã³ç©ºã«ã—ã¦ã—ã¾ã£ãŸæ¯ã‚’ã€å†ã³æº€ãŸã™ã“ã¨ã¯ä¸å¯èƒ½ãªã®ã ã‹ã‚‰... - -# Chat -chat.bloodmagic.altarMaker.setTier=グレードを設定： %d -chat.bloodmagic.altarMaker.building=グレード %dã®ç¥­å£‡ã‚’ä½œæˆ -chat.bloodmagic.altarMaker.destroy=グレード %dã®ç¥­å£‡ã‚’破壊 -chat.bloodmagic.altarMaker.creativeOnly=ã“ã‚Œã¯ã‚¯ãƒªã‚¨ã‚¤ãƒ†ã‚£ãƒ–モード専用アイテムã§ã™ã€‚ - -chat.bloodmagic.damageSource=%sã®é­‚ã¯éžå¸¸ã«å¼±ããªã£ã¦ã„ã¾ã™ - -chat.bloodmagic.ritual.weak=エãƒãƒ«ã‚®ãƒ¼ã®æµã‚ŒãŒæ„Ÿã˜ã‚‰ã‚Œã‚‹ãŒã€å„€å¼ã®èµ·å‹•ã«ã¯ä½•ã‹ãŒè¶³ã‚Šãªã„よã†ã ã€‚ -chat.bloodmagic.ritual.prevent=å„€å¼ãŒã‚ãªãŸã«æ¿€ã—ã抵抗ã—ã¦ã„ã‚‹ï¼ -chat.bloodmagic.ritual.activate=エãƒãƒ«ã‚®ãƒ¼ã®å¥”æµãŒå„€å¼ã«æµã‚Œè¾¼ã‚€ï¼ -chat.bloodmagic.ritual.notValid=ã‚ãªãŸã¯ãƒ«ãƒ¼ãƒ³ã®é…ç½®ãŒæ­£ã—ããªã„よã†ã«æ„Ÿã˜ãŸ... - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=ã‚ãªãŸã¯è‰¯ã„効果を感ã˜ãŸï¼ -chat.bloodmagic.livingArmour.upgrade.fireRemove=&6清涼感ãŒã‚ãªãŸã‚’包ã¿è¾¼ã¿ã€ç‚Žä¸ŠãŒåŽã¾ã£ãŸã€‚ -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6é—‡ã®åŠ›ãŒã‚ãªãŸã‚’æ­»ã®æ·µã‹ã‚‰å¼•ã寄ã›ã‚‹ï¼ -chat.bloodmagic.livingArmour.newUpgrade=&4強化ãƒã‚¤ãƒ³ãƒˆã‚’å–å¾—ã—ã¾ã—ãŸï¼ - -chat.bloodmagic.routing.remove=記録ã•ã‚ŒãŸåº§æ¨™æƒ…報を消去ã—ã¾ã—㟠-chat.bloodmagic.routing.set=ノードã®åº§æ¨™ã‚’設定ã—ã¾ã—㟠-chat.bloodmagic.routing.link.master=マスターã®ãƒŽãƒ¼ãƒ‰ã¨ãƒªãƒ³ã‚¯ã•ã›ã¾ã—ãŸï¼ -chat.bloodmagic.routing.link=ノードをãŠäº’ã„ã«ãƒªãƒ³ã‚¯ã•ã›ã¾ã—㟠- -chat.bloodmagic.altar.comp.glowstone=グロウストーンã®ãƒ–ロック -chat.bloodmagic.altar.comp.bloodstone=大ããªãƒ–ラッドストーンレンガ -chat.bloodmagic.altar.comp.beacon=ビーコン -chat.bloodmagic.altar.comp.bloodrune=è¡€ã®ãƒ«ãƒ¼ãƒ³ -chat.bloodmagic.altar.comp.crystal=未実装ã®ã‚¢ã‚¤ãƒ†ãƒ  -chat.bloodmagic.altar.comp.notair=固体ブロック - -chat.bloodmagic.altar.nextTier=次ã®ã‚°ãƒ¬ãƒ¼ãƒ‰ã®è¡€ã®ç¥­å£‡ã«ã™ã‚‹ã«ã¯%sãŒ%sã®å ´æ‰€ã«ä¸è¶³ã—ã¦ã„ã¾ã™ã€‚ - -chat.bloodmagic.mimic.potionSet=ãƒãƒ¼ã‚·ãƒ§ãƒ³ã‚’設置ã—ã¾ã—ãŸã€‚ -chat.bloodmagic.mimic.potionRemove=ãƒãƒ¼ã‚·ãƒ§ãƒ³ã‚’無効化ã—ã¾ã—ãŸã€‚ -chat.bloodmagic.mimic.potionInterval.up=ãƒãƒ¼ã‚·ãƒ§ãƒ³ç”Ÿæˆã®æ™‚間間隔を以下ã«å¢—加ã—ã¾ã—ãŸ: %d tick -chat.bloodmagic.mimic.potionInterval.down=ãƒãƒ¼ã‚·ãƒ§ãƒ³ç”Ÿæˆã®æ™‚間間隔を以下ã«æ¸›å°‘ã—ã¾ã—ãŸ: %d tick -chat.bloodmagic.mimic.detectRadius.up=プレイヤーã®æ¤œçŸ¥ç¯„囲を以下ã«æ‹¡å¤§ã—ã¾ã—ãŸ: %d ブロック -chat.bloodmagic.mimic.detectRadius.down=プレイヤーã®æ¤œçŸ¥ç¯„囲を以下ã«ç¸®å°ã—ã¾ã—ãŸ: %d ブロック -chat.bloodmagic.mimic.potionSpawnRadius.up=ãƒãƒ¼ã‚·ãƒ§ãƒ³ç”Ÿæˆã®åŠ¹æžœç¯„囲を以下ã«æ‹¡å¤§ã—ã¾ã—ãŸ: %d ブロック -chat.bloodmagic.mimic.potionSpawnRadius.down=ãƒãƒ¼ã‚·ãƒ§ãƒ³ç”Ÿæˆã®åŠ¹æžœç¯„囲を以下ã«æ¸›å°‘ã—ã¾ã—ãŸ: %d ブロック - -# entity -entity.bloodmagic.SentientSpecter.name=ç†åŠ›ã®éœŠé­‚ -entity.bloodmagic.Mimic.name=ミミック - -# Commands -commands.bloodmagic.error.arg.invalid=無効ãªå¼•æ•°ã§ã™ -commands.bloodmagic.error.arg.missing=引数ãŒè¶³ã‚Šã¾ã›ã‚“ -commands.bloodmagic.error.arg.player.missing=ã‚ãªãŸã¯å®Ÿè¡Œã™ã‚‹å¯¾è±¡ãƒ—レイヤーを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -commands.bloodmagic.error.404=コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼ -commands.bloodmagic.error.unknown=未知ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã™ï¼ -commands.bloodmagic.error.perm=ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 - -commands.bloodmagic.success=正常ã«å®Ÿè¡Œã•ã‚Œã¾ã—㟠- -commands.bloodmagic.format.help=%s - %s -commands.bloodmagic.format.error=%s - %s - -commands.bloodmagic.help.usage=/bloodmagic help -commands.bloodmagic.help.help="/bloodmagic" コマンドã§ãƒ˜ãƒ«ãƒ—情報ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ - -commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] <プレイヤー> [é‡] -commands.bloodmagic.network.help=LP ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£ -commands.bloodmagic.network.syphon.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰LPを削減ã—ã¾ã™ -commands.bloodmagic.network.syphon.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’削減ã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.bloodmagic.network.add.help=指定ã•ã‚ŒãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®LPã‚’ã€LP増加ルールã®ç¯„囲内ã§å¢—加ã•ã›ã¾ã™ã€‚ -commands.bloodmagic.network.add.success=%d LPã ã‘ã€%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’増加ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.bloodmagic.network.set.help=指定ã—ãŸãƒ—レイヤーã®LPを設定ã—ã¾ã™ã€‚ -commands.bloodmagic.network.set.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’%d LPã«è¨­å®šã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.bloodmagic.network.get.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®LPé‡ã‚’è¿”ã—ã¾ã™ã€‚ -commands.bloodmagic.network.fill.help=指定ã—ãŸãƒ—レイヤーã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’%d LPã¾ã§æº€ãŸã—ã¾ã™ã€‚ -commands.bloodmagic.network.fill.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’最大ã¾ã§ä»˜ä¸Žã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ -commands.bloodmagic.network.cap.help=プレイヤーãŒå…¥æ‰‹ã§ãる最高ä½ã®ãƒ–ラッドオーブã§è²¯è”µå¯èƒ½ãªæœ€å¤§å€¤ã®LPを付与ã—ã¾ã™ã€‚ -commands.bloodmagic.network.cap.success=%sã®LPãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®é™ç•Œå€¤ã¾ã§LPを付与ã™ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸã€‚ - -commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [プレイヤー] -commands.bloodmagic.bind.help=手ã«æ‰€æŒã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’çµåˆï¼åˆ†é›¢ã—ã¾ã™ã€‚ -commands.bloodmagic.bind.success=çµåˆã«æˆåŠŸã—ã¾ã—㟠-commands.bloodmagic.bind.remove.success=分離ã«æˆåŠŸã—ã¾ã—㟠- -commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] <プレイヤー> [グレード] -commands.bloodmagic.orb.help=対象プレイヤーã®ãƒ–ラッドオーブã®ã‚°ãƒ¬ãƒ¼ãƒ‰ã®æœ€å¤§å€¤ã‚’設定ã€å–å¾—ã™ã‚‹ãŸã‚ã«ä½¿ã„ã¾ã™ã€‚ - -commands.bloodmagic.bind.usage=/bind <プレイヤー> -commands.bloodmagic.bind.success=アイテムã®ç™»éŒ²ãŒæˆåŠŸã—ã¾ã—ãŸï¼ -commands.bloodmagic.bind.failed.noPlayer=指定ã•ã‚ŒãŸãƒ—レイヤーã¯å­˜åœ¨ã—ã¾ã›ã‚“ -commands.bloodmagic.bind.failed.alreadyBound=アイテムã¯æ—¢ã«ç™»éŒ²æ¸ˆã¿ã§ã™ï¼› /unbind コマンドã§ç™»éŒ²è§£é™¤ã—ã¦ãã ã•ã„ -commands.bloodmagic.bind.failed.notBindable=アイテムã®ç™»éŒ²ãŒå‡ºæ¥ã¾ã›ã‚“ã§ã—㟠-commands.bloodmagic.unbind.usage=/unbind -commands.bloodmagic.unbind.success=アイテムã®ç™»éŒ²è§£é™¤ãŒæˆåŠŸã—ã¾ã—ãŸï¼ -commands.bloodmagic.unbind.failed.notBindable=アイテムã®ç™»éŒ²è§£é™¤ãŒå‡ºæ¥ã¾ã›ã‚“ã§ã—㟠-commands.bloodmagic.soulnetwork.usage=/soulnetwork <プレイヤー> [é‡] -commands.bloodmagic.soulnetwork.add.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’増加ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸï¼ -commands.bloodmagic.soulnetwork.subtract.success=%d LPã ã‘ã€%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’減少ã•ã›ã‚‹ã“ã¨ã«æˆåŠŸã—ã¾ã—ãŸï¼ -commands.bloodmagic.soulnetwork.fill.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’満ãŸã—ã¾ã—ãŸï¼ -commands.bloodmagic.soulnetwork.empty.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’空ã«ã—ã¾ã—ãŸï¼ -commands.bloodmagic.soulnetwork.get.success=%dã ã‘%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã¯LPãŒã‚ã‚Šã¾ã™ï¼ -commands.bloodmagic.soulnetwork.noPlayer=指定ã•ã‚ŒãŸãƒ—レイヤーã¯å­˜åœ¨ã—ã¾ã›ã‚“ -commands.bloodmagic.soulnetwork.noCommand=指定ã•ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“ -commands.bloodmagic.soulnetwork.notACommand=有効ãªã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“ -commands.bloodmagic.soulnetwork.fillMax.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã‚ªãƒ¼ãƒ–ã®æœ€å¤§å€¤ã¾ã§LPを供給ã—ã¾ã—ãŸï¼ -commands.bloodmagic.soulnetwork.create.success=正常ã«%sã®ã‚½ã‚¦ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’構築ã—ã¾ã—ãŸ(オーブã®ã‚°ãƒ¬ãƒ¼ãƒ‰ï¼š %d) - -# GUI -tile.bloodmagic.inputNode.name=入力ノード -tile.bloodmagic.outputNode.name=出力ノード - -# Keybinds -bloodmagic.keybind.open_holding=貯蔵ã®å°ç« ã‚’é–‹ã -bloodmagic.keybind.cycle_holding_pos=å°ç« ã‚’é †ã«å›žã™ (+) -bloodmagic.keybind.cycle_holding_neg=å°ç« ã‚’逆ã«å›žã™ (-) - -# JustEnoughItems -jei.bloodmagic.recipe.altar=è¡€ã®ç¥­å£‡ -jei.bloodmagic.recipe.binding=錬金術魔法陣(çµåˆ) -jei.bloodmagic.recipe.alchemyArrayCrafting=錬金術魔法陣 -jei.bloodmagic.recipe.soulForge=業ç«ã®ã‹ã¾ã© -jei.bloodmagic.recipe.alchemyTable=錬金術テーブル -jei.bloodmagic.recipe.armourDowngrade=懺悔 (å„€å¼) -jei.bloodmagic.recipe.requiredLP=LP： %d -jei.bloodmagic.recipe.requiredTier=ｸﾞﾚｰﾄﾞ: %d -jei.bloodmagic.recipe.consumptionRate=消費率： %d LP/t -jei.bloodmagic.recipe.drainRate=消費率： %d LP/t -jei.bloodmagic.recipe.minimumSouls=最å°ï¼š %1$,.2fウィル -jei.bloodmagic.recipe.soulsDrained=消費： %1$,.2fウィル -jei.bloodmagic.recipe.lpDrained=消費： %,d LP -jei.bloodmagic.recipe.ticksRequired=時間: %,d Ticks - -jei.bloodmagic.desc.altarBuilder=デãƒãƒƒã‚°ã‚„テストã«åˆ©ç”¨ã™ã‚‹ã‚¯ãƒªã‚¨ã‚¤ãƒ†ã‚£ãƒ–モード専用アイテム。\n\nShift＋å³ã‚¯ãƒªãƒƒã‚¯ã§ä½œæˆã™ã‚‹ã‚°ãƒ¬ãƒ¼ãƒ‰ã®å¤‰æ›´ã‚’è¡Œã„ã€å³ã‚¯ãƒªãƒƒã‚¯ã§ç¥­å£‡ã‚’構築。\n\nè¡€ã®ç¥­å£‡ã‚’左クリックã§å„€å¼çŸ³ã”ã¨ç ´å£Šã•ã‚Œã¾ã™ã€‚ -jei.bloodmagic.desc.demonicWill=生物ãŒå†…包ã™ã‚‹æ‚ªé­”ã®å› å­ã€‚\n\nMobã‚’ç†åŠ›ã®å‰£ã«ã‚ˆã£ã¦æ®ºå®³ã™ã‚‹ã€ã¾ãŸã¯ç°¡ç´ ãªæŠ•ã’罠を投ã’ã€ç™½ã„パーティクルãŒç™ºç”Ÿã—ã¦ã„ã‚‹é–“ã«æ®ºå®³ã™ã‚‹ã“ã¨ã§å…¥æ‰‹ãŒã§ãる。 - -# WAILA -waila.bloodmagic.sneak=&oスニークã§è©³ç´°æƒ…å ± -waila.bloodmagic.array.reagent=試薬： %s -waila.bloodmagic.array.catalyst=触媒： %s -option.bloodmagic.bypassSneak=スニークã§å›žé¿ -option.bloodmagic.bloodAltar=è¡€ã®ç¥­å£‡ -option.bloodmagic.ritualController=å„€å¼çŸ³ -option.bloodmagic.teleposer=テレãƒãƒ¼ã‚¶ãƒ¼ -option.bloodmagic.array=錬金術魔法陣 - -# Thaumcraft -tc.research_category.BLOODMAGIC=血紅ã®ç§˜å„€ - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=Blood Magic -bloodmagic.research_text.BLOODMAGIC=血紅ã®ç§˜å„€ -bloodmagic.research_page.BLOODMAGIC.1=Blood Magic ã®é ˜åŸŸã¯å¸¸ã«å­¤ç‹¬ã§ã‚り〠â€å€‹äººã®â€ 技能ã¯ä¸–é–“ã‹ã‚‰ç–Žã¾ã‚Œã€æ™‚ã«ã¯å¿ƒã‚’ç—…ã‚“ã§ã—ã¾ã†ã“ã¨ã‚‚ã‚ã‚‹ã‹ã‚‚知れãªã„。ã—ã‹ã—ã€è‡ªå·±çŠ ç‰²ã¨ãƒ©ã‚¤ãƒ•ã‚¨ãƒƒã‚»ãƒ³ã‚¹ã®åŠ›ã¯ä¸€èˆ¬ã®è¡€ã®é­”術師を超ãˆãŸé ˜åŸŸã«åˆ°é”ã—ã€ãã‚Œã©ã“ã‚ã‹äººçŸ¥ã‚’超ãˆãŸèƒ½åŠ›ã‚’身ã«ã¤ã‚‰ã‚Œã‚‹ã ã‚ã†ã“ã¨ã¯å®Œå…¨ã«æ˜Žç™½ã§ã‚ã‚ã†ï¼ - -# Buttons -button.bloodmagic.tooltip.fill=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«å……å¡« \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/ko_KR.lang b/src/main/resources/assets/bloodmagic/lang/ko_KR.lang deleted file mode 100644 index 5787e851..00000000 --- a/src/main/resources/assets/bloodmagic/lang/ko_KR.lang +++ /dev/null @@ -1,194 +0,0 @@ -#Block Localization -tile.bloodAltar.name=í”¼ì˜ ì œë‹¨ -tile.bloodRune.blank.name=í”¼ì˜ ë£¬ -tile.bloodRune.fill.name=저장량ì¦ê°€ì˜ 룬 -tile.bloodRune.empty.name=í¡ìˆ˜ì˜ 룬 -tile.bloodRune.orb.name=ë³´ì£¼ì˜ ë£¬ -tile.bloodRune.betterCapacity.name=Rune of Superior Capacity -tile.speedRune.name=ì†ë„ì˜ ë£¬ -tile.efficiencyRune.name=íš¨ìœ¨ì˜ ë£¬ -tile.runeOfSacrifice.name=í¬ìƒì˜ 룬 -tile.runeOfSelfSacrifice.name=ìžê¸°í¬ìƒì˜ 룬 -tile.ritualStone.name=ì˜ì‹ì˜ ëŒ -tile.blockMasterStone.name=ì˜ì‹ì˜ëŒ 제어 -tile.bloodSocket.name=Filled Socket -tile.imperfectRitualStone.name=Imperfect Ritual Stone -tile.armourForge.name=Soul Armour Forge -tile.emptySocket.name=빈 소켓 -tile.bloodStoneBrick.name=Bloodstone Brick -tile.largeBloodStoneBrick.name=í° ì„ í˜ˆì„ìž¬ë²½ëŒ -tile.blockWritingTable.name=Alchemic Chemistry Set -tile.blockHomHeart.name=Spell Table -tile.bloodPedestal.name=Arcane Pedestal -tile.bloodPlinth.name=Arcane Plinth -tile.bloodTeleposer.name=Teleposer -tile.blockConduit.name=Spell Conduit -tile.blockSpellParadigm.projectile.name=Particle Generator -tile.blockSpellParadigm.self.name=Self Augmentator -tile.blockSpellParadigm.melee.name=Melee Aggregator -tile.blockSpellParadigm.tool.name=Tool Forger -tile.blockSpellEnhancement.power1.name=Unstable Spell Empowerer -tile.blockSpellEnhancement.power2.name=Standard Spell Empowerer -tile.blockSpellEnhancement.power3.name=Reinforced Spell Empowerer -tile.blockSpellEnhancement.power4.name=Imbued Spell Empowerer -tile.blockSpellEnhancement.power5.name=Demonic Spell Empowerer -tile.blockSpellEnhancement.cost1.name=Unstable Spell Dampener -tile.blockSpellEnhancement.cost2.name=Standard Spell Dampener -tile.blockSpellEnhancement.cost3.name=Reinforced Spell Dampener -tile.blockSpellEnhancement.cost4.name=Imbued Spell Dampener -tile.blockSpellEnhancement.cost5.name=Demonic Spell Dampener -tile.blockSpellEnhancement.potency1.name=Unstable Spell Augmentor -tile.blockSpellEnhancement.potency2.name=Standard Spell Augmentor -tile.blockSpellEnhancement.potency3.name=Reinforced Spell Augmentor -tile.blockSpellEnhancement.potency4.name=Imbued Spell Augmentor -tile.blockSpellEnhancement.potency5.name=Demonic Spell Augmentor -tile.blockSpellModifier.default.name=Default Spell Modifier -tile.blockSpellModifier.offensive.name=Offensive Spell Modifier -tile.blockSpellModifier.defensive.name=Defensive Spell Modifier -tile.blockSpellModifier.environmental.name=Environmental Spell Modifier -tile.blockSpellEffect.fire.name=Crucible of Fire -tile.blockSpellEffect.ice.name=Ice Maker -tile.blockSpellEffect.wind.name=Wind Generator -tile.blockSpellEffect.earth.name=Earth Former -tile.alchemicCalcinator.name=Alchemic Calcinator -tile.crystalBelljar.name=Crystal Belljar -tile.blockReagentConduit.name=Alchemy Relay - -#Item Localization -item.weakBloodOrb.name=약한 ì„ í˜ˆì˜ ë³´ì£¼ -item.apprenticeBloodOrb.name=견습 ì„ í˜ˆì˜ ë³´ì£¼ -item.magicianBloodOrb.name=ë§ˆë²•ì‚¬ì˜ ì„ í˜ˆë³´ì£¼ -item.masterBloodOrb.name=마스터 ì„ í˜ˆì˜ ë³´ì£¼ -item.archmageBloodOrb.name=ì•„í¬ë©”ì´ì§€ì˜ 선혈보주 -item.energyBlast.name=Energy Blaster -item.energySword.name=Bound Blade -item.lavaCrystal.name=용암수정 -item.waterSigil.name=ë¬¼ì˜ ë¶€ì  -item.lavaSigil.name=ìš©ì•”ì˜ ë¶€ì  -item.voidSigil.name=ê³µí—ˆì˜ ë¶€ì  -item.blankSlate.name=빈 íŒ -item.reinforcedSlate.name=ë³´ê°•ëœ íŒ -item.sacrificialDagger.name=í¬ìƒì˜ ê²€ -item.daggerOfSacrifice.name=í¬ìƒì˜ 단검 -item.airSigil.name=ë°”ëžŒì˜ ë¶€ì  -item.sigilOfTheFastMiner.name=쾌ì†ì˜ê´‘부 ë¶€ì  -item.sigilOfElementalAffinity.name=ì›ì†Œì¹œí™”ì˜ ë¶€ì  -item.sigilOfHaste.name=Sigil of Haste -item.sigilOfHolding.name=ë³´ê´€ì˜ ë¶€ì  -item.divinationSigil.name=ì ìˆ ì˜ 시질 -item.waterScribeTool.name=Elemental Inscription Tool: Water -item.fireScribeTool.name=Elemental Inscription Tool: Fire -item.earthScribeTool.name=Elemental Inscription Tool: Earth -item.airScribeTool.name=Elemental Inscription Tool: Air -item.duskScribeTool.name=Elemental Inscription Tool: Dusk -item.activationCrystalWeak.name=Weak Activation Crystal -item.activationCrystalAwakened.name=Awakened Activation Crystal -item.boundPickaxe.name=Bound Pickaxe -item.boundAxe.name=Bound Axe -item.boundShovel.name=Bound Shovel -item.boundHelmet.name=Bound Helmet -item.boundPlate.name=Bound Plate -item.boundLeggings.name=Bound Leggings -item.boundBoots.name=Bound Boots -item.weakBloodShard.name=Weak Blood Shard -item.growthSigil.name=ìˆ˜í’€ì˜ ë¶€ì  -item.blankSpell.name=Unbound Crystal -item.alchemyFlask.name=Potion Flask -item.standardBindingAgent.name=Standard Binding Agent -item.mundanePowerCatalyst.name=Mundane Power Catalyst -item.averagePowerCatalyst.name=Average Power Catalyst -item.greaterPowerCatalyst.name=Greater Power Catalyst -item.mundaneLengtheningCatalyst.name=Mundane Lengthening Catalyst -item.averageLengtheningCatalyst.name=Average Lengthening Catalyst -item.greaterLengtheningCatalyst.name=Greater Lengthening Catalyst -item.incendium.name=Incendium -item.magicales.name=Magicales -item.sanctus.name=Sanctus -item.aether.name=Aether -item.simpleCatalyst.name=Simple Catalyst -item.crepitous.name=Crepitous -item.crystallos.name=Crystallos -item.terrae.name=Terrae -item.aquasalus.name=Aquasalus -item.tennebrae.name=Tenebrae -item.demonBloodShard.name=Demon Blood Shard -item.sigilOfWind.name=Sigil of the Whirlwind -item.telepositionFocus.name=Teleposition Focus -item.enhancedTelepositionFocus.name=Enhanced Teleposition Focus -item.reinforcedTelepositionFocus.name=Reinforced Teleposition Focus -item.demonicTelepositionFocus.name=Demonic Teleposition Focus -item.imbuedSlate.name=Imbued Slate -item.demonicSlate.name=Demonic Slate -item.sigilOfTheBridge.name=ì˜ê°ì˜ ë¶€ì  -item.armourInhibitor.name=Armour Inhibitor -item.cheatyItem.name=Orb of Testing -item.weakFillingAgent.name=Weak Filling Agent -item.standardFillingAgent.name=Standard Filling Agent -item.enhancedFillingAgent.name=Enhanced Filling Agent -item.weakBindingAgent.name=Weak Binding Agent -item.ritualDiviner.name=Ritual Diviner -item.sigilOfMagnetism.name=ìžê¸°ë ¥ ë¶€ì  -item.itemDiabloKey.name=Key of Binding -item.energyBazooka.name=Energy Bazooka -item.bloodLightSigil.name=ì„ í˜ˆì˜ ëž¨í”„ ë¶€ì  -item.itemComplexSpellCrystal.name=Complex Spell Crystal -item.itemSigilOfSupression.name=Sigil of Supression -item.itemSigilOfEnderSeverance.name=Sigil of Ender Severance -item.bucketLife.name=Bucket of Life -item.bloodMagicBaseItem.QuartzRod.name=Quartz Rod -item.bloodMagicBaseItem.EmptyCore.name=Empty Core -item.bloodMagicBaseItem.MagicalesCable.name=Magicales Cable -item.bloodMagicBaseItem.WoodBrace.name=Wooden Brace -item.bloodMagicBaseItem.StoneBrace.name=Stone Brace -item.bloodMagicBaseItem.ProjectileCore.name=Projectile Core -item.bloodMagicBaseItem.SelfCore.name=Self Core -item.bloodMagicBaseItem.MeleeCore.name=Melee Core -item.bloodMagicBaseItem.ToolCore.name=Tool Core -item.bloodMagicBaseItem.ParadigmBackPlate.name=Paradigm Plate -item.bloodMagicBaseItem.OutputCable.name=Output Spell Cable -item.bloodMagicBaseItem.InputCable.name=Input Spell Cable -item.bloodMagicBaseItem.FlameCore.name=Fire Core -item.bloodMagicBaseItem.IcyCore.name=Icy Core -item.bloodMagicBaseItem.GustCore.name=Gusty Core -item.bloodMagicBaseItem.EarthenCore.name=Earthen Core -item.bloodMagicBaseItem.CrackedRunicPlate.name=Cracked Runic Plate -item.bloodMagicBaseItem.RunicPlate.name=Runic Plate -item.bloodMagicBaseItem.ScribedRunicPlate.name=Imbued Runic Plate -item.bloodMagicBaseItem.DefaultCore.name=Unattuned Core -item.bloodMagicBaseItem.OffensiveCore.name=Offensive Core -item.bloodMagicBaseItem.DefensiveCore.name=Defensive Core -item.bloodMagicBaseItem.EnvironmentalCore.name=Environmental Core -item.bloodMagicBaseItem.PowerCore.name=Power Core -item.bloodMagicBaseItem.CostCore.name=Reduction Core -item.bloodMagicBaseItem.PotencyCore.name=Potency Core -item.bloodMagicBaseItem.ObsidianBrace.name=Obsidian Brace -item.bloodMagicAlchemyItem.Offensa.name=Offensa -item.bloodMagicAlchemyItem.Praesidium.name=Praesidium -item.bloodMagicAlchemyItem.OrbisTerrae.name=Orbis Terrae -item.bloodMagicAlchemyItem.StrengthenedCatalyst.name=Strengthened Catalyst -item.bloodMagicAlchemyItem.ConcentratedCatalyst.name=Concentrated Catalyst -item.bloodMagicAlchemyItem.FracturedBone.name=Fractured Bone -item.bloodMagicAlchemyItem.Virtus.name=Virtus -item.bloodMagicAlchemyItem.Reductus.name=Reductus -item.bloodMagicAlchemyItem.Potentia.name=Potentia -item.sanguineHelmet.name=Sanguine Helmet -item.itemSeerSigil.name=Sigil of Sight -#item.itemFluidSigil.name= -item.multiTool.name=Dynamic Mace -item.itemCombinationalCatalyst.name=Combinational Catalyst -item.sanguineRobe.name=Sanguine Robes -item.sanguinePants.name=Sanguine Leggings -item.sanguineBoots.name=Sanguine Boots -item.itemAttunedCrystal.name=Alchemic Router -item.itemTankSegmenter.name=Alchemic Segmenter -item.destinationClearer.name=Alchemic Cleanser - -#Creative Tab -itemGroup.tabbloodmagic=선혈ì˜ë§ˆìˆ [Blood Magic] - -#Extra Strings -bm.string.consume=사용량 -bm.string.drain=í¡ìˆ˜ëŸ‰ -bm.string.tier=í‹°ì–´ -bm.string.crafting.orb.shaped=ë¸”ëŸ¬ë“œë§¤ì§ ì˜¤ë¸Œ 조합법 -bm.string.crafting.orb.shapeless=ë¸”ëŸ¬ë“œë§¤ì§ ì˜¤ë¸Œ 조합법 diff --git a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang deleted file mode 100644 index a91e66e9..00000000 --- a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang +++ /dev/null @@ -1,572 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=Blood Magic -itemGroup.bloodmagic.creativeTabTome=Blood Magic Upgrade Tomes - -#Items -item.bloodmagic.activation_crystal.weak.name=Слабый криÑталл активации -item.bloodmagic.activation_crystal.awakened.name=Пробуждённый криÑталл активации -item.bloodmagic.activation_crystal.creative.name=ТворчеÑкий криÑталл активации - -item.bloodmagic.sacrificial_dagger.normal.name=Жертвенный кинжал -item.bloodmagic.sacrificial_dagger.creative.name=ТворчеÑкий жертвенный кинжал -item.bloodmagic.pack.selfSacrifice.name=Blood Letter's Pack -item.bloodmagic.pack.sacrifice.name=Coat of Arms -item.bloodmagic.daggerOfSacrifice.name=Кинжал Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ - -item.bloodmagic.lavaCrystal.name=Лавовый криÑталл - -item.bloodmagic.bound.sword.name=СвÑзанный клинок -item.bloodmagic.bound.pickaxe.name=СвÑÐ·Ð°Ð½Ð½Ð°Ñ ÐºÐ¸Ñ€ÐºÐ° -item.bloodmagic.bound.axe.name=СвÑзанный топор -item.bloodmagic.bound.shovel.name=СвÑÐ·Ð°Ð½Ð½Ð°Ñ Ð»Ð¾Ð¿Ð°Ñ‚Ð° - -item.bloodmagic.bucket.lifeEssence.name=Ведро жизни - -item.bloodmagic.scribe.water.name=ИнÑтрумент Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ñлемента: Вода -item.bloodmagic.scribe.fire.name=ИнÑтрумент Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ñлемента: Огонь -item.bloodmagic.scribe.earth.name=ИнÑтрумент Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ñлемента: Ð—ÐµÐ¼Ð»Ñ -item.bloodmagic.scribe.air.name=ИнÑтрумент Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ñлемента: Воздух -item.bloodmagic.scribe.dusk.name=ИнÑтрумент Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ñлемента: Сумерки -item.bloodmagic.scribe.dawn.name=ИнÑтрумент Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ñлемента: РаÑÑвет - -item.bloodmagic.focus.weak.name=Ð¤Ð¾ÐºÑƒÑ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ -item.bloodmagic.focus.enhanced.name=Улучшенный Ñ„Ð¾ÐºÑƒÑ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ -item.bloodmagic.focus.reinforced.name=УÑиленный Ñ„Ð¾ÐºÑƒÑ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ -item.bloodmagic.focus.demonic.name=ДемоничеÑкий Ñ„Ð¾ÐºÑƒÑ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ - -item.bloodmagic.slate.blank.name=ЧиÑÑ‚Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ° -item.bloodmagic.slate.reinforced.name=Ð£ÐºÑ€ÐµÐ¿Ð»Ñ‘Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ° -item.bloodmagic.slate.imbued.name=ÐŸÑ€Ð¾Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ° -item.bloodmagic.slate.demonic.name=ДемоничеÑÐºÐ°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ° -item.bloodmagic.slate.ethereal.name=Ð­Ñ„Ð¸Ñ€Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ° - -item.bloodmagic.orb.weak.name=Слабый кровавый шар -item.bloodmagic.orb.apprentice.name=Кровавый шар ученика -item.bloodmagic.orb.magician.name=Кровавый шар мага -item.bloodmagic.orb.master.name=Кровавый шар маÑтера -item.bloodmagic.orb.archmage.name=Кровавый шар архимага -item.bloodmagic.orb.transcendent.name=Ðеобыкновенный кровавый шар - -item.bloodmagic.reagent.incendium.name=Incendium -item.bloodmagic.reagent.magicales.name=Magicales -item.bloodmagic.reagent.sanctus.name=Sanctus -item.bloodmagic.reagent.aether.name=Aether -item.bloodmagic.reagent.crepitous.name=Crepitous -item.bloodmagic.reagent.crystallos.name=Crystallos -item.bloodmagic.reagent.terrae.name=Terrae -item.bloodmagic.reagent.aquasalus.name=Aquasalus -item.bloodmagic.reagent.tennebrae.name=Tennebrae -item.bloodmagic.reagent.offensa.name=Offensa -item.bloodmagic.reagent.praesidium.name=Praesidium -item.bloodmagic.reagent.orbisterrae.name=Orbis Terrae -item.bloodmagic.reagent.virtus.name=Virtus -item.bloodmagic.reagent.reductus.name=Reductus -item.bloodmagic.reagent.potentia.name=Potentia - -item.bloodmagic.blood_shard.weak.name=Слабый кровавый оÑколок -item.bloodmagic.blood_shard.demonic.name=ДемоничеÑкий кровавый оÑколок - -item.bloodmagic.baseComponent.reagent_water.name=Реагент воды -item.bloodmagic.baseComponent.reagent_lava.name=Реагент лавы -item.bloodmagic.baseComponent.reagent_air.name=Реагент воздуха -item.bloodmagic.baseComponent.reagent_fast_miner.name=Реагент добычи -item.bloodmagic.baseComponent.reagent_void.name=Реагент пуÑтоты -item.bloodmagic.baseComponent.reagent_growth.name=Реагент роÑта -item.bloodmagic.baseComponent.reagent_affinity.name=Реагент Ñтихийного родÑтва -item.bloodmagic.baseComponent.reagent_sight.name=Реагент взглÑда -item.bloodmagic.baseComponent.reagent_binding.name=Реагент ÑвÑзи -item.bloodmagic.baseComponent.reagent_suppression.name=Реагент Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -item.bloodmagic.baseComponent.reagent_blood_light.name=Реагент Ñвета -item.bloodmagic.baseComponent.reagent_magnetism.name=Реагент притÑÐ¶ÐµÐ½Ð¸Ñ -item.bloodmagic.baseComponent.reagent_haste.name=Реагент ÑкороÑти -item.bloodmagic.baseComponent.reagent_bridge.name=Реагент моÑта -item.bloodmagic.baseComponent.reagent_compression.name=Реагент ÑÐ¶Ð°Ñ‚Ð¸Ñ -item.bloodmagic.baseComponent.reagent_severance.name=Реагент разрыва -item.bloodmagic.baseComponent.reagent_holding.name=Реагент ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ -item.bloodmagic.baseComponent.reagent_claw.name=Реагент крюка -item.bloodmagic.baseComponent.reagent_bounce.name=Реагент ÑлаÑтичноÑти -item.bloodmagic.baseComponent.reagent_frost.name=Реагент заморозки -item.bloodmagic.baseComponent.reagent_teleposition.name=Реагент телепозиции -item.bloodmagic.baseComponent.reagent_transposition.name=Реагент транÑпозиции - -item.bloodmagic.baseComponent.frame_part.name=ЧаÑти каркаÑа -item.bloodmagic.baseComponent.sand_iron.name=Железный пеÑок -item.bloodmagic.baseComponent.sand_gold.name=Золотой пеÑок -item.bloodmagic.baseComponent.sand_coal.name=Угольный пеÑок -item.bloodmagic.baseComponent.plant_oil.name=РаÑтительное маÑло -item.bloodmagic.baseComponent.sulfur.name=Сера -item.bloodmagic.baseComponent.saltpeter.name=Селитра -item.bloodmagic.baseComponent.neuro_toxin.name=ÐейротокÑин -item.bloodmagic.baseComponent.antiseptic.name=ÐнтиÑептик -item.bloodmagic.baseComponent.catalyst_length_1.name=Слабый удлинÑющий катализатор -item.bloodmagic.baseComponent.catalyst_power_1.name=Слабый уÑиливающий катализатор - -item.bloodmagic.cutting_fluid.basic.name=Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ñ€ÐµÐ¶ÑƒÑ‰Ð°Ñ Ð¶Ð¸Ð´ÐºÐ¾ÑÑ‚ÑŒ -item.bloodmagic.cutting_fluid.explosive.name=Взрывчатый порошок - -item.bloodmagic.demonCrystal.default.name=КриÑталл демоничеÑкой Ñнергии -item.bloodmagic.demonCrystal.corrosive.name=КриÑталл коррозионной Ñнергии -item.bloodmagic.demonCrystal.destructive.name=КриÑталл разрушающей Ñнергии -item.bloodmagic.demonCrystal.vengeful.name=КриÑталл мÑтительной Ñнергии -item.bloodmagic.demonCrystal.steadfast.name=КриÑталл уÑтойчивой Ñнергии - -item.bloodmagic.monster_soul.raw.name=ДемоничеÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ -item.bloodmagic.monster_soul.corrosive.name=ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¾Ð½Ð½Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ -item.bloodmagic.monster_soul.destructive.name=Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ -item.bloodmagic.monster_soul.vengeful.name=ÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ -item.bloodmagic.monster_soul.steadfast.name=УÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð°Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ - -item.bloodmagic.sigil.air.name=Сигил воздуха -item.bloodmagic.sigil.blood_light.name=Сигил кровавого Ñветильника -item.bloodmagic.sigil.compression.name=Сигил ÑÐ¶Ð°Ñ‚Ð¸Ñ -item.bloodmagic.sigil.divination.name=Сигил предÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ -item.bloodmagic.sigil.water.name=Сигил воды -item.bloodmagic.sigil.lava.name=Сигил лавы -item.bloodmagic.sigil.void.name=Сигил пуÑтоты -item.bloodmagic.sigil.green_grove.name=Сигил зеленой рощи -item.bloodmagic.sigil.elemental_affinity.name=Сигил Ñтихийного родÑтва -item.bloodmagic.sigil.haste.name=Сигил ÑкороÑти -item.bloodmagic.sigil.suppression.name=Сигил Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -item.bloodmagic.sigil.magnetism.name=Сигил притÑÐ¶ÐµÐ½Ð¸Ñ -item.bloodmagic.sigil.fast_miner.name=Сигил быÑтрого ÐºÐ¾Ð¿Ð°Ñ‚ÐµÐ»Ñ -item.bloodmagic.sigil.seer.name=Сигил Ð·Ñ€ÐµÐ½Ð¸Ñ -item.bloodmagic.sigil.phantom_bridge.name=Сигил призрачного моÑта -item.bloodmagic.sigil.whirlwind.name=Сигил Ð²Ð¸Ñ…Ñ€Ñ -item.bloodmagic.sigil.ender_severance.name=Сигил разрыва ÐšÑ€Ð°Ñ -item.bloodmagic.sigil.holding.name=Сигил ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ -item.bloodmagic.sigil.holding.display=&r%s: &o&n%s -item.bloodmagic.sigil.claw.name=Сигил ÐºÐ¾Ð³Ñ‚Ñ -item.bloodmagic.sigil.bounce.name=Сигил ÑлаÑтичноÑти -item.bloodmagic.sigil.frost.name=Сигил зимнего Ð´Ñ‹Ñ…Ð°Ð½Ð¸Ñ -item.bloodmagic.sigil.teleposition.name=Сигил телепозиции -item.bloodmagic.sigil.transposition.name=Сигил транÑпозиции - -item.bloodmagic.livingArmour.helmet.name=Живой шлем -item.bloodmagic.livingArmour.chest.name=Ð–Ð¸Ð²Ð°Ñ ÐºÐ¸Ñ€Ð°Ñа -item.bloodmagic.livingArmour.legs.name=Живые поножи -item.bloodmagic.livingArmour.boots.name=Живые ботинки -item.bloodmagic.sentientArmour.helmet.name=Разумный шлем -item.bloodmagic.sentientArmour.chest.name=Ð Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ ÐºÐ¸Ñ€Ð°Ñа -item.bloodmagic.sentientArmour.legs.name=Разумные поножи -item.bloodmagic.sentientArmour.boots.name=Разумные ботинки - -item.bloodmagic.altarMaker.name=Создатель Ð°Ð»Ñ‚Ð°Ñ€Ñ -item.bloodmagic.alchemic_vial.base.name=ÐлхимичеÑÐºÐ°Ñ Ð¿Ñ€Ð¾Ð±Ð¸Ñ€ÐºÐ° - -item.bloodmagic.ritualDivinernormal.name=ПредÑказатель ритуала -item.bloodmagic.ritualDivinerdusk.name=ПредÑказатель ритуала [Сумерки] -item.bloodmagic.ritualDivinerdawn.name=ПредÑказатель ритуала [РаÑÑвет] -item.bloodmagic.ritualReader.name=Редактор ритуала - -item.bloodmagic.arcaneAshes.name=Волшебный пепел -item.bloodmagic.upgradeTome.name=Living Armour Upgrade Tome -item.bloodmagic.upgradeTrainer.name=Living Armour Training Bracelet - -item.bloodmagic.sentientSword.name=Разумный меч -item.bloodmagic.soulGem.petty.name=Маленький адÑкий камень -item.bloodmagic.soulGem.lesser.name=Ðебольшой адÑкий камень -item.bloodmagic.soulGem.common.name=Обычный адÑкий камень -item.bloodmagic.soulGem.greater.name=Большой адÑкий камень -item.bloodmagic.soulGem.grand.name=Великий адÑкий камень -item.bloodmagic.soulSnare.base.name=ПроÑÑ‚Ð°Ñ Ð»Ð¾Ð²ÑƒÑˆÐºÐ° -item.bloodmagic.sentientBow.name=Разумный лук -item.bloodmagic.sentientArmourGem.name=Разумный камень -item.bloodmagic.sentientAxe.name=Разумный топор -item.bloodmagic.sentientPickaxe.name=Ð Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ ÐºÐ¸Ñ€ÐºÐ° -item.bloodmagic.sentientShovel.name=Ð Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ Ð»Ð¾Ð¿Ð°Ñ‚Ð° - -item.bloodmagic.nodeRouter.name=Node Router -item.bloodmagic.itemFilter.exact.name=Точный фильтр предметов -item.bloodmagic.itemFilter.ignoreNBT.name=NBT фильтр предметов -item.bloodmagic.itemFilter.modItems.name=Mod фильтр предметов -item.bloodmagic.itemFilter.oreDict.name=OreDict фильтр предметов -item.bloodmagic.fluidFilter.exact.name=Фильтр жидкоÑтей - -item.bloodmagic.experienceTome.name=Том иÑÑледований -item.bloodmagic.sanguineBook.name=ИнÑпектор блоков - -item.bloodmagic.living_point_upgrade.draft_angelus.name=Призыв Ðнгела - -item.bloodmagic.willGauge.name=Измеритель ауры демоничеÑкой Ñнергии -item.bloodmagic.potionFlask.name=ФлÑжка Ð´Ð»Ñ Ð·ÐµÐ»Ð¸Ð¹ - -item.bloodmagic.icarusScroll.name=Свиток ИкаруÑа - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=Ð–Ð¸Ð·Ð½ÐµÐ½Ð½Ð°Ñ ÑÑÑÐµÐ½Ñ†Ð¸Ñ - -tile.bloodmagic.stone.ritual.master.name=Главный ритуальный камень -tile.bloodmagic.stone.ritual.imperfect.name=Ðеполноценный ритуальный камень -tile.bloodmagic.stone.ritual.inverted.name=Инвертированный ритуальный камень - -tile.bloodmagic.altar.name=Кровавый алтарь -tile.bloodmagic.alchemyArray.name=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° - -tile.bloodmagic.rune.blank.name=ЧиÑÑ‚Ð°Ñ Ñ€ÑƒÐ½Ð° -tile.bloodmagic.rune.speed.name=Руна ÑкороÑти -tile.bloodmagic.rune.efficiency.name=Руна ÑффективноÑти -tile.bloodmagic.rune.sacrifice.name=Руна Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ -tile.bloodmagic.rune.self_sacrifice.name=Руна ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ -tile.bloodmagic.rune.displacement.name=Руна Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ -tile.bloodmagic.rune.capacity.name=Руна ёмкоÑти -tile.bloodmagic.rune.augmented_capacity.name=Руна дополнительной ёмкоÑти -tile.bloodmagic.rune.orb.name=Руна шара -tile.bloodmagic.rune.acceleration.name=Руна уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ -tile.bloodmagic.rune.charging.name=Руна зарÑда - -tile.bloodmagic.ritualStone.blank.name=Ритуальный камень -tile.bloodmagic.ritualStone.water.name=Ритуальный камень воды -tile.bloodmagic.ritualStone.fire.name=Ритуальный камень Ð¾Ð³Ð½Ñ -tile.bloodmagic.ritualStone.earth.name=Ритуальный камень земли -tile.bloodmagic.ritualStone.air.name=Ритуальный камень воздуха -tile.bloodmagic.ritualStone.dusk.name=Ритуальный камень Ñумерек -tile.bloodmagic.ritualStone.dawn.name=Ритуальный камень раÑÑвета - -tile.bloodmagic.bloodstone_tile.name=Большой кровавый кирпич -tile.bloodmagic.bloodstone_brick.name=Кровавый кирпич -tile.bloodmagic.crystal_tile.name=Большой криÑтальный кирпич -tile.bloodmagic.crystal_brick.name=КриÑтальный кирпич -tile.bloodmagic.bloodLight.name=Кровавый Ñвет -tile.bloodmagic.spectralBlock.name=Иллюзорный блок -tile.bloodmagic.phantom.name=Призрачный блок -tile.bloodmagic.incenseAltar.name=Жертвенник Ð´Ð»Ñ ÐºÑƒÑ€ÐµÐ½Ð¸Ð¹ - -tile.bloodmagic.teleposer.name=Телепозер -tile.bloodmagic.soulForge.name=ÐдÑÐºÐ°Ñ ÐºÑƒÐ·Ð½Ð¸Ñ†Ð° -tile.bloodmagic.alchemyTable.name=Стол алхимии -tile.bloodmagic.demonCrucible.name=ДемоничеÑкий тигель -tile.bloodmagic.demonPylon.name=ДемоничеÑкий пилон -tile.bloodmagic.demonCrystallizer.name=ДемоничеÑкий криÑталлизатор - -tile.bloodmagic.masterRouting.name=Master Routing Node -tile.bloodmagic.outputRouting.name=Output Routing Node -tile.bloodmagic.inputRouting.name=Input Routing Node -tile.bloodmagic.itemRouting.name=Routing Node - -tile.bloodmagic.path.wood.name=ДеревÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.woodtile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ Ð´ÐµÑ€ÐµÐ²ÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.stone.name=ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.stonetile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.wornstone.name=Ð¡Ñ‚Ð°Ñ€Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.wornstonetile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ ÑÑ‚Ð°Ñ€Ð°Ñ ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.obsidian.name=ОбÑÐ¸Ð´Ð¸Ð°Ð½Ð¾Ð²Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° -tile.bloodmagic.path.obsidiantile.name=Ð£Ð·Ð¾Ñ€Ð½Ð°Ñ Ð¾Ð±ÑÐ¸Ð´Ð¸Ð°Ð½Ð¾Ð²Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° - -tile.bloodmagic.dimensionalPortal.name=ПроÑтранÑтвенный портал -tile.bloodmagic.bloodTank.name=Резервуар крови - -tile.bloodmagic.demonCrystal.default.name=КриÑтальный клаÑтер демоничеÑкой Ñнергии -tile.bloodmagic.demonCrystal.corrosive.name=КриÑтальный клаÑтер коррозионной Ñнергии -tile.bloodmagic.demonCrystal.destructive.name=КриÑтальный клаÑтер разрушительной Ñнергии -tile.bloodmagic.demonCrystal.vengeful.name=КриÑтальный клаÑтер мÑтительной Ñнергии -tile.bloodmagic.demonCrystal.steadfast.name=КриÑтальный клаÑтер уÑтойчивой Ñнергии - -tile.bloodmagic.mimic.nohitbox.name=Эфирный непрозрачный поддельный блок -tile.bloodmagic.mimic.solidopaque.name=Ðепрозрачный поддельный блок -tile.bloodmagic.mimic.solidclear.name=ЧиÑтый поддельный блок -tile.bloodmagic.mimic.solidlight.name=СветÑщийÑÑ Ð¿Ð¾Ð´Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ блок -tile.bloodmagic.mimic.sentient.name=Разумный поддельный блок - -tile.bloodmagic.bricks1.brick1_raw.name=Сырые каменные кирпичи -tile.bloodmagic.bricks1.brick1_corrosive.name=Коррозионные каменные кирпичи -tile.bloodmagic.bricks1.brick1_destructive.name=Разрушительные каменные кирпичи -tile.bloodmagic.bricks1.brick1_vengeful.name=ÐœÑтительные каменные кирпичи -tile.bloodmagic.bricks1.brick1_steadfast.name=УÑтойчивые каменные кирпичи - -# Fluids -fluid.lifeEssence=Ð–Ð¸Ð·Ð½ÐµÐ½Ð½Ð°Ñ ÑÑÑÐµÐ½Ñ†Ð¸Ñ - -# HUD -hud.bloodmagic.inactive=Ðеактивный - -# Tooltips -tooltip.bloodmagic.orb.desc=Хранит жизненную ÑÑÑенцию -tooltip.bloodmagic.orb.owner=Создан: %s -tooltip.bloodmagic.currentOwner=Владелец: %s -tooltip.bloodmagic.currentTier=Уровень: %d -tooltip.bloodmagic.config.disabled=Отключено в наÑтройках -tooltip.bloodmagic.tier=Уровень %d - -tooltip.bloodmagic.activated=Ðктивирован -tooltip.bloodmagic.deactivated=Деактивирован - -tooltip.bloodmagic.sigil.air.desc=&oОщущаетÑÑ Ð»ÐµÐ³ÐºÐ¾ÑÑ‚ÑŒ... -tooltip.bloodmagic.sigil.blood_light.desc=&oЯ вижу Ñвет! -tooltip.bloodmagic.sigil.compression.desc=&oКучи алмазов -tooltip.bloodmagic.sigil.divination.desc=&oВзглÑд в душу -tooltip.bloodmagic.sigil.divination.otherNetwork=ЗаглÑнем в душу %s -tooltip.bloodmagic.sigil.divination.currentAltarTier=Уровень: %d -tooltip.bloodmagic.sigil.divination.currentEssence=ЭÑÑенции: %d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=ÐмкоÑÑ‚ÑŒ: %d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=СпокойÑтвие: %d -tooltip.bloodmagic.sigil.divination.currentInversion=ИнверÑиÑ: %d -tooltip.bloodmagic.sigil.divination.currentBonus=БонуÑ: +%d%% -tooltip.bloodmagic.sigil.water.desc=&oÐужна вода? -tooltip.bloodmagic.sigil.lava.desc=&oГОРЯЧЕЕ! ÐЕ ЕСТЬ! -tooltip.bloodmagic.sigil.void.desc=&oЛучше чем Swiffer! -tooltip.bloodmagic.sigil.green_grove.desc=&oЭкологичеÑки чиÑтый -tooltip.bloodmagic.sigil.magnetism.desc=&oЯ очень притÑÐ³Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚ÑŒ! -tooltip.bloodmagic.sigil.suppression.desc=&oЛучше, чем телекинез... -tooltip.bloodmagic.sigil.haste.desc=&oПоÑле 42 чашек кофе... -tooltip.bloodmagic.sigil.fast_miner.desc=&oÐ’Ñе глубже и глубже... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oÐŸÐ°Ð´Ð°ÑŽÑ‰Ð°Ñ Ð¾Ð³Ð½ÐµÐ½Ð½Ð°Ñ Ñ€Ñ‹Ð±Ð°! -tooltip.bloodmagic.sigil.seer.desc=&oКогда проÑто видеть недоÑтаточно -tooltip.bloodmagic.sigil.seer.currentAltarProgress=ПрогреÑÑ: %d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=ПрогреÑÑ: %s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=РаÑход: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=Уровень: %d -tooltip.bloodmagic.sigil.seer.currentEssence=ЭÑÑенции: %d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=ÐмкоÑÑ‚ÑŒ: %d LP -tooltip.bloodmagic.sigil.seer.currentCharge=ЗарÑд: %d -tooltip.bloodmagic.sigil.seer.currentTranquility=СпокойÑтвие: %d -tooltip.bloodmagic.sigil.seer.currentBonus=БонуÑ: +%d%% -tooltip.bloodmagic.sigil.phantomBridge.desc=&oПрогулки в воздухе... -tooltip.bloodmagic.sigil.whirlwind.desc=&oЛучше не надевать юбку -tooltip.bloodmagic.sigil.enderSeverance.desc=&oÐеприÑтноÑти Ð´Ð»Ñ Ñтранников КраÑ! -tooltip.bloodmagic.sigil.teleposition.desc=Я очень близок к возможноÑти перемещениÑ. -tooltip.bloodmagic.sigil.transposition.desc=Ощути Ñилу, мой юный ученик. -tooltip.bloodmagic.sigil.holding.press=Ðажмите &o%s&r&7 Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ -tooltip.bloodmagic.sigil.holding.desc=Может хранить Ñигилы. -tooltip.bloodmagic.sigil.holding.sigilInSlot=Слот %d: %s - -tooltip.bloodmagic.livingArmourPointsUpgrade.desc=Увеличивает макÑимальное количеÑтво очков Живой Брони до %d. - -tooltip.bloodmagic.bound.sword.desc=&oОтбраковка Ñлабаков -tooltip.bloodmagic.bound.pickaxe.desc=&oБезжалоÑтное уничтожение ÐºÐ°Ð¼Ð½Ñ -tooltip.bloodmagic.bound.axe.desc=&oДемоничеÑÐºÐ°Ñ Ð²Ñ‹Ñ€ÑƒÐ±ÐºÐ° -tooltip.bloodmagic.bound.shovel.desc=&oОчиÑтим пол от грÑзи - -tooltip.bloodmagic.sacrificialDagger.desc=Ðебольшой надрез на пальце... -tooltip.bloodmagic.slate.desc=Камень, наполненный в кровавом алтаре -tooltip.bloodmagic.inscriber.desc=ÐадпиÑи на Ñтене... - -tooltip.bloodmagic.pack.selfSacrifice.desc=Это реально раздражает... -tooltip.bloodmagic.pack.sacrifice.desc=Description -tooltip.bloodmagic.pack.stored=Ðакоплено: %d LP - -tooltip.bloodmagic.activation_crystal.weak=Ðктивирует проÑтые ритуалы -tooltip.bloodmagic.activation_crystal.awakened=Ðктивирует Ñложные ритуалы -tooltip.bloodmagic.activation_crystal.creative=Только Ð´Ð»Ñ Ñ‚Ð²Ð¾Ñ€Ñ‡ÐµÑкого режима. Ðктивирует любые ритуалы - -tooltip.bloodmagic.diviner.currentRitual=Выбранный ритуал: %s -tooltip.bloodmagic.diviner.blankRune=ЧиÑтые руны: %d -tooltip.bloodmagic.diviner.waterRune=Руны воды: %d -tooltip.bloodmagic.diviner.airRune=Руны воздуха: %d -tooltip.bloodmagic.diviner.fireRune=Руны огнÑ: %d -tooltip.bloodmagic.diviner.earthRune=Руны земли: %d -tooltip.bloodmagic.diviner.duskRune=Руны Ñумерек: %d -tooltip.bloodmagic.diviner.dawnRune=Руны раÑÑвета: %d -tooltip.bloodmagic.diviner.totalRune=Ð’Ñего рун: %d -tooltip.bloodmagic.diviner.extraInfo=&9-Удерживайте Shift Ð´Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ о рунах- -tooltip.bloodmagic.diviner.extraExtraInfo=&9-Удерживайте Shift+M Ð´Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ о ритуале- -tooltip.bloodmagic.diviner.currentDirection=Ðаправление: %s - -tooltip.bloodmagic.arcaneAshes=Пепел Ð´Ð»Ñ Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸Ñ‡ÐµÑких знаков - -tooltip.bloodmagic.telepositionFocus.coords=Координаты: (%d, %d, %d) -tooltip.bloodmagic.telepositionFocus.dimension=ID ИзмерениÑ: %d -tooltip.bloodmagic.telepositionFocus.bound=Владелец: %s. Координаты: %d, %d, %d -tooltip.bloodmagic.telepositionFocus.weak=Может перемещать блоки -tooltip.bloodmagic.telepositionFocus.enhanced=Может перемещать блоки -tooltip.bloodmagic.telepositionFocus.reinforced=Может перемещать блоки -tooltip.bloodmagic.telepositionFocus.demonic=Может перемещать блоки - -tooltip.bloodmagic.livingArmour.upgrade.speed=БыÑтрые ноги -tooltip.bloodmagic.livingArmour.upgrade.digging=Сила гномов -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=СтойкоÑÑ‚ÑŒ к Ñдам -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Твердые ладони -tooltip.bloodmagic.livingArmour.upgrade.knockback=КультуриÑÑ‚ -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=ТолÑÑ‚Ð°Ñ ÐºÐ¾Ð¶Ð° -tooltip.bloodmagic.livingArmour.upgrade.health=Здоровый -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Свирепый удар -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Меткий Ñтрелок -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Ð’Ñ‹Ñокий шаг -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Избежал Ñмерти -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Ð¡Ð¾Ð»Ð½ÐµÑ‡Ð½Ð°Ñ ÑÐ½ÐµÑ€Ð³Ð¸Ñ -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=РуничеÑкий щит -tooltip.bloodmagic.livingArmour.upgrade.revealing=Обнаружение -tooltip.bloodmagic.livingArmour.upgrade.experienced=Опытный -tooltip.bloodmagic.livingArmour.upgrade.jump=Сильные ноги -tooltip.bloodmagic.livingArmour.upgrade.fallProtect=ÐœÑгкое падение -tooltip.bloodmagic.livingArmour.upgrade.graveDigger=Копатель могил -tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=ЗарÑженный удар -tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=Сильный удар -tooltip.bloodmagic.livingArmour.upgrade.elytra=Элитра -tooltip.bloodmagic.livingArmour.upgrade.nightSight=ÐÐ¾Ñ‡Ð½Ð°Ñ Ð´Ð¾Ð±Ð»ÐµÑÑ‚ÑŒ -tooltip.bloodmagic.livingArmour.upgrade.repair=ВоÑÑтанавливающий - -tooltip.bloodmagic.livingArmour.upgrade.slowness=Слабые ноги -tooltip.bloodmagic.livingArmour.upgrade.crippledArm=Ð¡Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ€ÑƒÐºÐ° -tooltip.bloodmagic.livingArmour.upgrade.slippery=Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ñ‚Ñга -tooltip.bloodmagic.livingArmour.upgrade.battleHunger=Боевой голод -tooltip.bloodmagic.livingArmour.upgrade.quenched=Охлаждение -tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=Тупой меч -tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=Ð¡Ð»Ð°Ð±Ð°Ñ ÐºÐ¸Ñ€ÐºÐ° -tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=Штурмовик -tooltip.bloodmagic.livingArmour.upgrade.slowHeal=Больной -tooltip.bloodmagic.livingArmour.upgrade.disoriented=Дезориентированный - -tooltip.bloodmagic.livingArmour.upgrade.level=%s (Уровень %d) -tooltip.bloodmagic.livingArmour.upgrade.progress=%s (%d/100) -tooltip.bloodmagic.livingArmour.upgrade.points=&6Очки улучшениÑ: %s / %s - -tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-Удерживайте Shift+M Ð´Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ об уровне- - -tooltip.bloodmagic.will=Энергии: %1$,.2f -tooltip.bloodmagic.sentientSword.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. -tooltip.bloodmagic.sentientAxe.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. -tooltip.bloodmagic.sentientPickaxe.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. -tooltip.bloodmagic.sentientShovel.desc=ИÑпользует демоничеÑкую Ñнергию Ð´Ð»Ñ Ð¼Ð°ÐºÑимальной ÑффективноÑти. -tooltip.bloodmagic.soulGem.petty=Этот камень может хранить очень мало Ñнергии -tooltip.bloodmagic.soulGem.lesser=Этот камень может хранить немного Ñнергии -tooltip.bloodmagic.soulGem.common=Этот камень может хранить Ñреднее количеÑтво Ñнергии -tooltip.bloodmagic.soulGem.greater=Этот камень может хранить много Ñнергии -tooltip.bloodmagic.soulGem.grand=Этот камень может хранить очень много Ñнергии -tooltip.bloodmagic.soulSnare.desc=БроÑьте в ÑущеÑтво и затем убейте, что бы получить демоничеÑкую Ñнергию - -tooltip.bloodmagic.itemFilter.exact=Требует точного ÑоответÑÑ‚Ð²Ð¸Ñ -tooltip.bloodmagic.itemFilter.ignoreNBT=ПозволÑет игнорировать NBT -tooltip.bloodmagic.itemFilter.modItems=ПозволÑет отобрать предметы из одного мода -tooltip.bloodmagic.itemFilter.oreDict=Фильтр иÑпользующий Ore Dictionary - -tooltip.bloodmagic.fluid.type=ЖидкоÑÑ‚ÑŒ: %s -tooltip.bloodmagic.fluid.amount=Кол-во: %d / %d мВ -tooltip.bloodmagic.fluid.capacity=ÐмкоÑÑ‚ÑŒ: %d мВ - -tooltip.bloodmagic.ghost.everything=Ð’Ñе -tooltip.bloodmagic.ghost.amount=КоличеÑтво призрачных предметов: %d - -tooltip.bloodmagic.currentType.default=Содержит Ñырую Ñнергию -tooltip.bloodmagic.currentType.corrosive=Содержит коррозионную Ñнергию -tooltip.bloodmagic.currentType.destructive=Содержит разрушающую Ñнергию -tooltip.bloodmagic.currentType.vengeful=Содержит мÑтительную Ñнергию -tooltip.bloodmagic.currentType.steadfast=Содержит уÑтойчивую Ñнергию - -tooltip.bloodmagic.currentBaseType.default=Ð¡Ñ‹Ñ€Ð°Ñ -tooltip.bloodmagic.currentBaseType.corrosive=ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¾Ð½Ð½Ð°Ñ -tooltip.bloodmagic.currentBaseType.destructive=Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ -tooltip.bloodmagic.currentBaseType.vengeful=ÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ -tooltip.bloodmagic.currentBaseType.steadfast=УÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð°Ñ - -tooltip.bloodmagic.experienceTome=Книга Ð´Ð»Ñ Ñбора опыта -tooltip.bloodmagic.experienceTome.exp=Опыт: %0.3f -tooltip.bloodmagic.experienceTome.expLevel=Уровень: %d - -tooltip.bloodmagic.decoration.safe=БезопаÑно Ð´Ð»Ñ ÑƒÐºÑ€Ð°ÑˆÐµÐ½Ð¸Ñ -tooltip.bloodmagic.decoration.notSafe=ОпаÑно Ð´Ð»Ñ ÑƒÐºÑ€Ð°ÑˆÐµÐ½Ð¸Ñ - -tooltip.bloodmagic.cuttingFluidRatio=%d/%d иÑпользований оÑталоÑÑŒ - -tooltip.bloodmagic.potion.uses=%d иÑпользований оÑталоÑÑŒ - -# Ritual -ritual.bloodmagic.testRitual=ТеÑтовый ритуал -ritual.bloodmagic.waterRitual=Ритуал вызова родника -ritual.bloodmagic.lavaRitual=ÐдÑÐºÐ°Ñ Ñеренада -ritual.bloodmagic.greenGroveRitual=Ритуал зеленой рощи -ritual.bloodmagic.jumpRitual=Ритуал выÑокого прыжка -ritual.bloodmagic.wellOfSufferingRitual=Колодец Страданий -ritual.bloodmagic.featheredKnifeRitual=Ритуал быÑтрого кинжала -ritual.bloodmagic.regenerationRitual=Ритуал регенерации -ritual.bloodmagic.harvestRitual=Ритуал жнеца -ritual.bloodmagic.magneticRitual=Ритуал магнетизма -ritual.bloodmagic.crushingRitual=Ритуал Ð´Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¸Ñ -ritual.bloodmagic.fullStomachRitual=Ритуал ÑытоÑти -ritual.bloodmagic.interdictionRitual=Ритуал запрета -ritual.bloodmagic.containmentRitual=Ритуал ÑÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ -ritual.bloodmagic.speedRitual=Ритуал ÑкороÑти -ritual.bloodmagic.suppressionRitual=Ритуал Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -ritual.bloodmagic.expulsionRitual=Ðура Ð¸Ð·Ð³Ð½Ð°Ð½Ð¸Ñ -ritual.bloodmagic.zephyrRitual=Зов Зефира -ritual.bloodmagic.upgradeRemoveRitual=Звук Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð¸Ñ Ð´ÑƒÑˆ -ritual.bloodmagic.armourEvolveRitual=Ритуал Ñволюции -ritual.bloodmagic.animalGrowthRitual=Ритуал Шеперда -ritual.bloodmagic.forsakenSoulRitual=Сбор покинутых душ -ritual.bloodmagic.crystalHarvestRitual=Трещина разрушенного криÑталла -ritual.bloodmagic.meteorRitual=Ритуал падающей башни -ritual.bloodmagic.ellipseRitual=Ð¤Ð¾ÐºÑƒÑ ÑллипÑоида -ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius -ritual.bloodmagic.placerRitual=Ðаполнитель -ritual.bloodmagic.fellingRitual=ДровоÑек -ritual.bloodmagic.pumpRitual=Гимн откачки -ritual.bloodmagic.altarBuilderRitual=Строитель Ð°Ð»Ñ‚Ð°Ñ€Ñ -ritual.bloodmagic.portalRitual=Ритуал врат - -ritual.bloodmagic.waterRitual.info=Создаёт иÑточник воды на главном ритуальном камне -ritual.bloodmagic.lavaRitual.info=Создаёт иÑточник лавы на главном ритуальном камне -ritual.bloodmagic.lavaRitual.default.info=(СыраÑ) Уменьшает затраты LP на Ñоздание лавы и позволÑет помещать лаву внутрь привÑзанного контейнера -ritual.bloodmagic.lavaRitual.corrosive.info=(КоррозионнаÑ) Повреждает ÑущноÑтей (ÐаходÑщихÑÑ Ð² зоне дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°), которые невоÑприимчивы к огню. -ritual.bloodmagic.lavaRitual.destructive.info=(РазрушительнаÑ) Ð Ð°Ð´Ð¸ÑƒÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð»Ð°Ð²Ñ‹ увеличиваетÑÑ Ð² завиÑимоÑти от общей Ñнергии. -ritual.bloodmagic.lavaRitual.vengeful.info=(ÐœÑтительнаÑ) Защищает ÑущноÑтей (ÐаходÑщихÑÑ Ð² зоне дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°) от огнÑ. -ritual.bloodmagic.lavaRitual.steadfast.info=(УÑтойчиваÑ) Защищает игроков в пределах заданного диапазона от огнÑ. - -# Chat -chat.bloodmagic.altarMaker.setTier=УÑтановить уровень: %d -chat.bloodmagic.altarMaker.building=СтроитÑÑ Ð°Ð»Ñ‚Ð°Ñ€ÑŒ %d ÑƒÑ€Ð¾Ð²Ð½Ñ -chat.bloodmagic.altarMaker.destroy=Разобран алтарь %d ÑƒÑ€Ð¾Ð²Ð½Ñ -chat.bloodmagic.altarMaker.creativeOnly=Предмет только Ð´Ð»Ñ ÐºÑ€ÐµÐ°Ñ‚Ð¸Ð²Ð°. - -chat.bloodmagic.damageSource=Душа %s Ñлишком оÑлабла - -chat.bloodmagic.ritual.weak=Ð’Ñ‹ Ñлишком Ñлабы, чтобы активировать ритуал. -chat.bloodmagic.ritual.prevent=Ритуал ÑопротивлÑетÑÑ Ð’Ð°Ð¼! -chat.bloodmagic.ritual.activate=Потоки Ñнергии текут через ритуал! -chat.bloodmagic.ritual.notValid=Ð’Ñ‹ чувÑтвуете, что руны ÑтоÑÑ‚ неправильно... - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=You are starting to feel better already! -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6Темные Ñилы ÑпаÑли Ð²Ð°Ñ Ð·Ð° Ñекунду до Ñмерти! -chat.bloodmagic.livingArmour.newUpgrade=&4Получено улучшение! - -# Commands -commands.bloodmagic.error.arg.invalid=Ðеправильные аргументы -commands.bloodmagic.error.arg.missing=Мало аргументов -commands.bloodmagic.error.arg.player.missing=Ð’Ñ‹ должны указать никнейм игрока -commands.bloodmagic.error.404=Команда не найдена! -commands.bloodmagic.error.unknown=ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°! -commands.bloodmagic.error.perm=У Ð’Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточно прав Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды. - -commands.bloodmagic.success=Выполнено уÑпешно - -commands.bloodmagic.format.help=%s - %s -commands.bloodmagic.format.error=%s - %s - -commands.bloodmagic.help.usage=/bloodmagic help -commands.bloodmagic.help.help=Отображает информацию о команде "/bloodmagic". - -# JustEnoughItems -jei.bloodmagic.recipe.altar=Кровавый алтарь -jei.bloodmagic.recipe.binding=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° (СвÑзывание) -jei.bloodmagic.recipe.alchemyArrayCrafting=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° -jei.bloodmagic.recipe.soulForge=ÐдÑÐºÐ°Ñ ÐºÑƒÐ·Ð½Ð¸Ñ†Ð° -jei.bloodmagic.recipe.alchemyTable=Стол алхимии -jei.bloodmagic.recipe.requiredLP=LP: %d -jei.bloodmagic.recipe.requiredTier=Уровень: %d -jei.bloodmagic.recipe.consumptionRate=РаÑход: %d LP/t -jei.bloodmagic.recipe.drainRate=Потери: %d LP/t -jei.bloodmagic.recipe.minimumSouls=Минимум: %1$,.2f Ñнергии -jei.bloodmagic.recipe.soulsDrained=Затраты: %1$,.2f Ñнергии - -jei.bloodmagic.desc.altarBuilder=Креативный предмет, который иÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ и теÑтированиÑ.\n\nShift+ПКМ Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° ÑƒÑ€Ð¾Ð²Ð½Ñ Ð°Ð»Ñ‚Ð°Ñ€Ñ. ПКМ по алтарю Ð´Ð»Ñ Ð¿Ð¾Ñтройки.\n\nЛКМ по алтарю чтобы разобрать алтарь. -jei.bloodmagic.desc.demonicWill=An imprint of a demonic entity attached to a creature.\n\nCan be obtained by killing a mob with a sentient weapon or by throwing a snare at a mob and killing it while it has white particles. - -# WAILA -waila.bloodmagic.sneak=&oShift Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ информации -waila.bloodmagic.array.reagent=Реагент: %s -waila.bloodmagic.array.catalyst=Катализатор: %s -option.bloodmagic.bypassSneak=ÐŸÐ¾Ð»Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð±ÐµÐ· Shift -option.bloodmagic.bloodAltar=Кровавый алтарь -option.bloodmagic.bloodTank=Резервуар крови -option.bloodmagic.ritualController=Ритуальные камни -option.bloodmagic.teleposer=Телепозер -option.bloodmagic.array=ÐлхимичеÑÐºÐ°Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ð° - -# Thaumcraft -tc.research_category.BLOODMAGIC=Sanguine Arcana - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=Blood Magic -bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana -bloodmagic.research_page.BLOODMAGIC.1=The realm of the Blood Magics has always appeared to be a more solitary and "individual" art with blood mages being notoriously reclusive and a bit insane at times. However, the powers of self-sacrifice and life essence have uses even beyond a normal blood mage's sight, in fact, it is quite apparent that it may have some uses in thaumaturgy after all! - -# Buttons -button.bloodmagic.tooltip.fill=Заполнить Ñеть diff --git a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang deleted file mode 100644 index d27f9496..00000000 --- a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang +++ /dev/null @@ -1,890 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=血魔法 -itemGroup.bloodmagic.creativeTabTome=血魔法|手册 - -#Items -item.bloodmagic.activation_crystal.weak.name=[虚弱]激活水晶 -item.bloodmagic.activation_crystal.awakened.name=[觉醒]激活水晶 -item.bloodmagic.activation_crystal.creative.name=[创造]激活水晶 - -item.bloodmagic.sacrificial_dagger.normal.name=牺牲匕首 -item.bloodmagic.sacrificial_dagger.creative.name=[创造]牺牲匕首 -item.bloodmagic.pack.selfSacrifice.name=血液背包 -item.bloodmagic.pack.sacrifice.name=斗士铠衣 -item.bloodmagic.daggerOfSacrifice.name=献祭刀 - -item.bloodmagic.lavaCrystal.name=熔岩晶体 - -item.bloodmagic.bound.sword.name=æŸç¼šä¹‹å‰‘ -item.bloodmagic.bound.pickaxe.name=æŸç¼šä¹‹é• -item.bloodmagic.bound.axe.name=æŸç¼šä¹‹æ–§ -item.bloodmagic.bound.shovel.name=æŸç¼šä¹‹é”¹ - -item.bloodmagic.bucket.lifeEssence.name=生命æºè´¨æ¡¶ - -item.bloodmagic.scribe.water.name=元素铭文工具：水 -item.bloodmagic.scribe.fire.name=å…ƒç´ é“­æ–‡å·¥å…·ï¼šç« -item.bloodmagic.scribe.earth.name=元素铭文工具：土 -item.bloodmagic.scribe.air.name=元素铭文工具：风 -item.bloodmagic.scribe.dusk.name=元素铭文工具：薄暮 -item.bloodmagic.scribe.dawn.name=元素铭文工具：破晓 - -item.bloodmagic.focus.weak.name=ä¼ é€æ ¸å¿ƒ -item.bloodmagic.focus.enhanced.name=[加强]ä¼ é€æ ¸å¿ƒ -item.bloodmagic.focus.reinforced.name=[强化]ä¼ é€æ ¸å¿ƒ -item.bloodmagic.focus.demonic.name=[æ¶é­”]ä¼ é€æ ¸å¿ƒ - -item.bloodmagic.slate.blank.name=ç©ºç™½çŸ³æ¿ -item.bloodmagic.slate.reinforced.name=å¼ºåŒ–çŸ³æ¿ -item.bloodmagic.slate.imbued.name=çŒè¾“çŸ³æ¿ -item.bloodmagic.slate.demonic.name=æ¶é­”çŸ³æ¿ -item.bloodmagic.slate.ethereal.name=æ‚¬å¹½çŸ³æ¿ - -item.bloodmagic.orb.weak.name=[虚弱]气血å®ç  -item.bloodmagic.orb.apprentice.name=[学徒]气血å®ç  -item.bloodmagic.orb.magician.name=[法师]气血å®ç  -item.bloodmagic.orb.master.name=[导师]气血å®ç  -item.bloodmagic.orb.archmage.name=[贤者]气血å®ç  -item.bloodmagic.orb.transcendent.name=[å“越]气血å®ç  - -item.bloodmagic.reagent.incendium.name=烈焰元素 -item.bloodmagic.reagent.magicales.name=魔法元素 -item.bloodmagic.reagent.sanctus.name=神圣元素 -item.bloodmagic.reagent.aether.name=以太元素 -item.bloodmagic.reagent.crepitous.name=爆破元素 -item.bloodmagic.reagent.crystallos.name=冰晶元素 -item.bloodmagic.reagent.terrae.name=大地元素 -item.bloodmagic.reagent.aquasalus.name=液之元素 -item.bloodmagic.reagent.tennebrae.name=暗黑元素 -item.bloodmagic.reagent.offensa.name=攻势元素 -item.bloodmagic.reagent.praesidium.name=守护元素 -item.bloodmagic.reagent.orbisterrae.name=奥土元素 -item.bloodmagic.reagent.virtus.name=力é‡å…ƒç´  -item.bloodmagic.reagent.reductus.name=代价元素 -item.bloodmagic.reagent.potentia.name=效能元素 - -item.bloodmagic.blood_shard.weak.name=[虚弱]气血碎片 -item.bloodmagic.blood_shard.demonic.name=[æ¶é­”]气血碎片 - -item.bloodmagic.baseComponent.reagent_water.name=水之试剂 -item.bloodmagic.baseComponent.reagent_lava.name=熔岩试剂 -item.bloodmagic.baseComponent.reagent_air.name=风之试剂 -item.bloodmagic.baseComponent.reagent_fast_miner.name=采掘试剂 -item.bloodmagic.baseComponent.reagent_void.name=虚空试剂 -item.bloodmagic.baseComponent.reagent_growth.name=促生试剂 -item.bloodmagic.baseComponent.reagent_affinity.name=元素试剂 -item.bloodmagic.baseComponent.reagent_sight.name=è§è§£è¯•å‰‚ -item.bloodmagic.baseComponent.reagent_binding.name=æŸç¼šè¯•å‰‚ -item.bloodmagic.baseComponent.reagent_suppression.name=抑液试剂 -item.bloodmagic.baseComponent.reagent_bloodlight.name=血光试剂 -item.bloodmagic.baseComponent.reagent_magnetism.name=ç£å¼•è¯•å‰‚ -item.bloodmagic.baseComponent.reagent_haste.name=急速试剂 -item.bloodmagic.baseComponent.reagent_bridge.name=影桥试剂 -item.bloodmagic.baseComponent.reagent_compression.name=压挤试剂 -item.bloodmagic.baseComponent.reagent_severance.name=éš”ç»è¯•å‰‚ -item.bloodmagic.baseComponent.reagent_holding.name=集æŒè¯•å‰‚ -item.bloodmagic.baseComponent.reagent_claw.name=爪之试剂 -item.bloodmagic.baseComponent.reagent_bounce.name=弹性试剂 -item.bloodmagic.baseComponent.reagent_frost.name=霜之试剂 -item.bloodmagic.baseComponent.reagent_teleposition.name=ä¼ é€è¯•å‰‚ -item.bloodmagic.baseComponent.reagent_transposition.name=移ä½è¯•å‰‚ - -item.bloodmagic.baseComponent.frame_part.name=框架零件 -item.bloodmagic.baseComponent.sand_iron.name=é“矿砂 -item.bloodmagic.baseComponent.sand_gold.name=金矿砂 -item.bloodmagic.baseComponent.sand_coal.name=煤矿砂 -item.bloodmagic.baseComponent.plant_oil.name=æ¤ç‰©æ²¹ -item.bloodmagic.baseComponent.sulfur.name=硫磺 -item.bloodmagic.baseComponent.saltpeter.name=ç¡çŸ³ -item.bloodmagic.baseComponent.neuro_toxin.name=神ç»æ¯’ç´  -item.bloodmagic.baseComponent.antiseptic.name=防è…剂 -item.bloodmagic.baseComponent.catalyst_length_1.name=简å•çš„延时催化剂 -item.bloodmagic.baseComponent.catalyst_power_1.name=简å•çš„功效催化剂 - -item.bloodmagic.cutting_fluid.basic.name=基础切削油 -item.bloodmagic.cutting_fluid.explosive.name=爆炸ç«è¯ - -item.bloodmagic.demonCrystal.default.name=æ¶é­”æ„志晶体 -item.bloodmagic.demonCrystal.corrosive.name=è…蚀æ„志晶体 -item.bloodmagic.demonCrystal.destructive.name=ç ´åæ„志晶体 -item.bloodmagic.demonCrystal.vengeful.name=å¤ä»‡æ„志晶体 -item.bloodmagic.demonCrystal.steadfast.name=åšæ¯…æ„志晶体 - -item.bloodmagic.monster_soul.raw.name=[原生]æ¶é­”æ„å¿— -item.bloodmagic.monster_soul.corrosive.name=[è…蚀]æ¶é­”æ„å¿— -item.bloodmagic.monster_soul.destructive.name=[ç ´å]æ¶é­”æ„å¿— -item.bloodmagic.monster_soul.vengeful.name=[å¤ä»‡]æ¶é­”æ„å¿— -item.bloodmagic.monster_soul.steadfast.name=[åšæ¯…]æ¶é­”æ„å¿— - -item.bloodmagic.sigil.air.name=风之å°è®° -item.bloodmagic.sigil.blood_light.name=血光å°è®° -item.bloodmagic.sigil.compression.name=压挤å°è®° -item.bloodmagic.sigil.divination.name=å åœå°è®° -item.bloodmagic.sigil.water.name=水之å°è®° -item.bloodmagic.sigil.lava.name=熔岩å°è®° -item.bloodmagic.sigil.void.name=虚空å°è®° -item.bloodmagic.sigil.green_grove.name=绿丛å°è®° -item.bloodmagic.sigil.elemental_affinity.name=元素å°è®° -item.bloodmagic.sigil.haste.name=急速å°è®° -item.bloodmagic.sigil.suppression.name=抑液å°è®° -item.bloodmagic.sigil.magnetism.name=ç£å¼•å°è®° -item.bloodmagic.sigil.fast_miner.name=速掘å°è®° -item.bloodmagic.sigil.seer.name=è§è§£å°è®° -item.bloodmagic.sigil.phantom_bridge.name=影桥å°è®° -item.bloodmagic.sigil.whirlwind.name=旋风å°è®° -item.bloodmagic.sigil.ender_severance.name=ç»å½±å°è®° -item.bloodmagic.sigil.holding.name=集æŒå°è®° -item.bloodmagic.sigil.holding.display=&r%s：&o&n%s -item.bloodmagic.sigil.teleposition.name=ä¼ é€å°è®° -item.bloodmagic.sigil.transposition.name=移ä½å°è®° -item.bloodmagic.sigil.claw.name=爪之å°è®° -item.bloodmagic.sigil.bounce.name=弹性å°è®° -item.bloodmagic.sigil.frost.name=冰霜å°è®° - -item.bloodmagic.livingArmour.helmet.name=æŸçµå¤´ç›” -item.bloodmagic.livingArmour.chest.name=æŸçµèƒ¸ç”² -item.bloodmagic.livingArmour.legs.name=æŸçµæŠ¤è…¿ -item.bloodmagic.livingArmour.boots.name=æŸçµé´å­ -item.bloodmagic.sentientArmour.helmet.name=感知头盔 -item.bloodmagic.sentientArmour.chest.name=感知胸甲 -item.bloodmagic.sentientArmour.legs.name=感知护腿 -item.bloodmagic.sentientArmour.boots.name=感知é´å­ - -item.bloodmagic.altarMaker.name=祭å›æ­å»ºå·¥å…· - -item.bloodmagic.ritualDivinernormal.name=仪å¼æŽ¨æµ‹ä»— -item.bloodmagic.ritualDivinerdusk.name=仪å¼æŽ¨æµ‹ä»— [è–„æš®] -item.bloodmagic.ritualDivinerdawn.name=仪å¼æŽ¨æµ‹ä»— [破晓] -item.bloodmagic.ritualReader.name=仪å¼è°ƒæ•´é’³ - -item.bloodmagic.arcaneAshes.name=å¥¥æœ¯ç²‰ç° -item.bloodmagic.upgradeTome.name=æŸçµç›”甲强化手册 -item.bloodmagic.downgradeTome.name=æŸçµç›”甲é™çº§æ‰‹å†Œ -item.bloodmagic.upgradeTrainer.name=æŸçµç›”甲训练手镯 - -item.bloodmagic.sentientSword.name=感知之剑 -item.bloodmagic.soulGem.petty.name=[å¾®å°]地狱魂石 -item.bloodmagic.soulGem.lesser.name=[细å—]地狱魂石 -item.bloodmagic.soulGem.common.name=[普通]地狱魂石 -item.bloodmagic.soulGem.greater.name=[较大]地狱魂石 -item.bloodmagic.soulGem.grand.name=[精制]地狱魂石 -item.bloodmagic.soulSnare.base.name=原始投网 -item.bloodmagic.sentientBow.name=感知之弓 -item.bloodmagic.sentientArmourGem.name=感知盔甲å®çŸ³ -item.bloodmagic.sentientAxe.name=感知之斧 -item.bloodmagic.sentientPickaxe.name=æ„ŸçŸ¥ä¹‹é• -item.bloodmagic.sentientShovel.name=感知之锹 - -item.bloodmagic.nodeRouter.name=节点连接工具 -item.bloodmagic.itemFilter.exact.name=精确物å“筛选器 -item.bloodmagic.itemFilter.ignoreNBT.name=NBT物å“筛选器 -item.bloodmagic.itemFilter.modItems.name=Mod物å“筛选器 -item.bloodmagic.itemFilter.oreDict.name=矿物物å“筛选器 -item.bloodmagic.fluidFilter.exact.name=精确液体筛选器 - -item.bloodmagic.experienceTome.name=ç»éªŒæ‰‹å†Œ -item.bloodmagic.sanguineBook.name=指示之书 - -item.bloodmagic.living_point_upgrade.draft_angelus.name=祷告之始 - -item.bloodmagic.willGauge.name=çµåŸŸæµ‹é‡ä»ª -item.bloodmagic.potionFlask.name=è¯å‰‚瓶 - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=生命æºè´¨ - -tile.bloodmagic.stone.ritual.master.name=主仪å¼çŸ³ -tile.bloodmagic.stone.ritual.imperfect.name=ä¸å®Œå–„的仪å¼çŸ³ -tile.bloodmagic.stone.ritual.inverted.name=å转的主仪å¼çŸ³ - -tile.bloodmagic.altar.name=è¡€ä¹‹ç¥­å› -tile.bloodmagic.alchemyArray.name=炼金矩阵 - -tile.bloodmagic.rune.blank.name=空白符文 -tile.bloodmagic.rune.speed.name=速度符文 -tile.bloodmagic.rune.efficiency.name=效率符文 -tile.bloodmagic.rune.sacrifice.name=献祭符文 -tile.bloodmagic.rune.self_sacrifice.name=牺牲符文 -tile.bloodmagic.rune.displacement.name=转ä½ç¬¦æ–‡ -tile.bloodmagic.rune.capacity.name=增容符文 -tile.bloodmagic.rune.augmented_capacity.name=超容符文 -tile.bloodmagic.rune.orb.name=å®ç ç¬¦æ–‡ -tile.bloodmagic.rune.acceleration.name=促进符文 -tile.bloodmagic.rune.charging.name=充能符文 - - -tile.bloodmagic.ritualStone.blank.name=仪å¼çŸ³ -tile.bloodmagic.ritualStone.water.name=水之仪å¼çŸ³ -tile.bloodmagic.ritualStone.fire.name=ç«ä¹‹ä»ªå¼çŸ³ -tile.bloodmagic.ritualStone.earth.name=土之仪å¼çŸ³ -tile.bloodmagic.ritualStone.air.name=风之仪å¼çŸ³ -tile.bloodmagic.ritualStone.dusk.name=薄暮仪å¼çŸ³ -tile.bloodmagic.ritualStone.dawn.name=破晓仪å¼çŸ³ - -tile.bloodmagic.bloodstone_tile.name=大血石砖 -tile.bloodmagic.bloodstone_brick.name=血石砖 -tile.bloodmagic.crystal_tile.name=æ™¶ç°‡å— -tile.bloodmagic.crystal_brick.name=晶簇砖 -tile.bloodmagic.bloodLight.name=è¡€ä¹‹å…‰æº -tile.bloodmagic.spectralBlock.name=å¹½çµæ–¹å— -tile.bloodmagic.phantom.name=å½±æ¡¥æ–¹å— -tile.bloodmagic.incenseAltar.name=ç†é¦™ç¥­å› - -tile.bloodmagic.teleposer.name=ä¼ é€å™¨ -tile.bloodmagic.soulForge.name=狱ç«ç†”炉 -tile.bloodmagic.alchemyTable.name=炼金术桌 -tile.bloodmagic.demonCrucible.name=æ¶é­”å©åŸš -tile.bloodmagic.demonPylon.name=æ¶é­”导能塔 -tile.bloodmagic.demonCrystallizer.name=æ¶é­”ç»“æ™¶å› - -tile.bloodmagic.masterRouting.name=主控路由节点 -tile.bloodmagic.outputRouting.name=输出路由节点 -tile.bloodmagic.inputRouting.name=输入路由节点 -tile.bloodmagic.itemRouting.name=路由节点 - -tile.bloodmagic.path.wood.name=æœ¨åˆ¶è·¯é¢ -tile.bloodmagic.path.woodtile.name=æœ¨ç“¦è·¯é¢ -tile.bloodmagic.path.stone.name=çŸ³ç –è·¯é¢ -tile.bloodmagic.path.stonetile.name=çŸ³ç“¦è·¯é¢ -tile.bloodmagic.path.wornstone.name=ç¢ŽçŸ³ç –è·¯é¢ -tile.bloodmagic.path.wornstonetile.name=ç¢ŽçŸ³è·¯é¢ -tile.bloodmagic.path.obsidian.name=é»‘æ›œçŸ³ç –è·¯é¢ -tile.bloodmagic.path.obsidiantile.name=é»‘æ›œçŸ³ç“¦è·¯é¢ - -tile.bloodmagic.dimensionalPortal.name=空间传é€é—¨ -tile.bloodmagic.bloodTank.name=è¡€æ³•å¸ˆçš„å‚¨ç½ - -tile.bloodmagic.demonCrystal.default.name=[原生]æ„志晶簇 -tile.bloodmagic.demonCrystal.corrosive.name=[è…蚀]æ„志晶簇 -tile.bloodmagic.demonCrystal.destructive.name=[ç ´å]æ„志晶簇 -tile.bloodmagic.demonCrystal.vengeful.name=[å¤ä»‡]æ„志晶簇 -tile.bloodmagic.demonCrystal.steadfast.name=[åšæ¯…]æ„志晶簇 - -tile.bloodmagic.mimic.nohitbox.name=[悬幽]æ‹Ÿæ€æ–¹å— -tile.bloodmagic.mimic.solidopaque.name=æ‹Ÿæ€æ–¹å— -tile.bloodmagic.mimic.solidclear.name=[清é€]æ‹Ÿæ€æ–¹å— -tile.bloodmagic.mimic.solidlight.name=[光亮]æ‹Ÿæ€æ–¹å— -tile.bloodmagic.mimic.sentient.name=[感知]æ‹Ÿæ€æ–¹å— - -tile.bloodmagic.bricks1.brick1_raw.name=原生石砖 -tile.bloodmagic.bricks1.brick1_corrosive.name=è…蚀石砖 -tile.bloodmagic.bricks1.brick1_destructive.name=ç ´å石砖 -tile.bloodmagic.bricks1.brick1_vengeful.name=å¤ä»‡çŸ³ç – -tile.bloodmagic.bricks1.brick1_steadfast.name=åšæ¯…石砖 - -tile.bloodmagic.bricks2.smallbrick_raw.name=å°åŽŸç”ŸçŸ³ç – -tile.bloodmagic.bricks2.smallbrick_corrosive.name=å°è…蚀石砖 -tile.bloodmagic.bricks2.smallbrick_destructive.name=å°ç ´å石砖 -tile.bloodmagic.bricks2.smallbrick_vengeful.name=å°å¤ä»‡çŸ³ç – -tile.bloodmagic.bricks2.smallbrick_steadfast.name=å°åšæ¯…石砖 -tile.bloodmagic.bricks2.tile_raw.name=原生石瓦 -tile.bloodmagic.bricks2.tile_corrosive.name=è…蚀石瓦 -tile.bloodmagic.bricks2.tile_destructive.name=ç ´å石瓦 -tile.bloodmagic.bricks2.tile_vengeful.name=å¤ä»‡çŸ³ç“¦ -tile.bloodmagic.bricks2.tile_steadfast.name=åšæ¯…石瓦 -tile.bloodmagic.bricks2.tilespecial_raw.name=二é‡åŽŸç”ŸçŸ³ç“¦ -tile.bloodmagic.bricks2.tilespecial_corrosive.name=二é‡è…蚀石瓦 -tile.bloodmagic.bricks2.tilespecial_destructive.name=二é‡ç ´å石瓦 -tile.bloodmagic.bricks2.tilespecial_vengeful.name=二é‡å¤ä»‡çŸ³ç“¦ -tile.bloodmagic.bricks2.tilespecial_steadfast.name=二é‡åšæ¯…石瓦 - -tile.bloodmagic.inversionpillar.raw.name=[原生]å转柱 -tile.bloodmagic.inversionpillar.corrosive.name=[è…蚀]å转柱 -tile.bloodmagic.inversionpillar.destructive.name=[ç ´å]å转柱 -tile.bloodmagic.inversionpillar.vengeful.name=[å¤ä»‡]å转柱 -tile.bloodmagic.inversionpillar.steadfast.name=[åšæ¯…]å转柱 - -tile.bloodmagic.inversionpillarend.raw_bottom.name=[原生]å转柱基 -tile.bloodmagic.inversionpillarend.corrosive_bottom.name=[è…蚀]å转柱基 -tile.bloodmagic.inversionpillarend.destructive_bottom.name=[ç ´å]å转柱基 -tile.bloodmagic.inversionpillarend.vengeful_bottom.name=[å¤ä»‡]å转柱基 -tile.bloodmagic.inversionpillarend.steadfast_bottom.name=[åšæ¯…]å转柱基 -tile.bloodmagic.inversionpillarend.raw_top.name=[原生]å转柱顶盖 -tile.bloodmagic.inversionpillarend.corrosive_top.name=[è…蚀]å转柱顶盖 -tile.bloodmagic.inversionpillarend.destructive_top.name=[ç ´å]å转柱顶盖 -tile.bloodmagic.inversionpillarend.vengeful_top.name=[å¤ä»‡]å转柱顶盖 -tile.bloodmagic.inversionpillarend.steadfast_top.name=[åšæ¯…]å转柱顶盖 - -tile.bloodmagic.demonlight.raw.name=[原生]æ„志之瞳 -tile.bloodmagic.demonlight.corrosive.name=[è…蚀]æ„志之瞳 -tile.bloodmagic.demonlight.destructive.name=[ç ´å]æ„志之瞳 -tile.bloodmagic.demonlight.vengeful.name=[å¤ä»‡]æ„志之瞳 -tile.bloodmagic.demonlight.steadfast.name=[åšæ¯…]æ„志之瞳 - -tile.bloodmagic.extras.stone_raw.name=原生石头 -tile.bloodmagic.extras.stone_corrosive.name=è…蚀石头 -tile.bloodmagic.extras.stone_destructive.name=ç ´å石头 -tile.bloodmagic.extras.stone_vengeful.name=å¤ä»‡çŸ³å¤´ -tile.bloodmagic.extras.stone_steadfast.name=åšæ¯…石头 - -tile.bloodmagic.extras.polished_raw.name=磨制原生石 -tile.bloodmagic.extras.polished_corrosive.name=磨制è…蚀石 -tile.bloodmagic.extras.polished_destructive.name=磨制破å石 -tile.bloodmagic.extras.polished_vengeful.name=磨制å¤ä»‡çŸ³ -tile.bloodmagic.extras.polished_steadfast.name=磨制åšæ¯…石 - -tile.bloodmagic.extras.metal_raw.name=原生æ„å¿—åˆé‡‘ -tile.bloodmagic.extras.metal_corrosive.name=è…蚀æ„å¿—åˆé‡‘ -tile.bloodmagic.extras.metal_destructive.name=ç ´åæ„å¿—åˆé‡‘ -tile.bloodmagic.extras.metal_vengeful.name=å¤ä»‡æ„å¿—åˆé‡‘ -tile.bloodmagic.extras.metal_steadfast.name=åšæ¯…æ„å¿—åˆé‡‘ - -tile.bloodmagic.pillar1.raw.name=原生石柱 -tile.bloodmagic.pillar1.corrosive.name=è…蚀石柱 -tile.bloodmagic.pillar1.destructive.name=ç ´å石柱 -tile.bloodmagic.pillar1.vengeful.name=å¤ä»‡çŸ³æŸ± -tile.bloodmagic.pillar1.steadfast.name=åšæ¯…石柱 - -tile.bloodmagic.pillar2.raw.name=二é‡åŽŸç”ŸçŸ³æŸ± -tile.bloodmagic.pillar2.corrosive.name=二é‡è…蚀石柱 -tile.bloodmagic.pillar2.destructive.name=二é‡ç ´å石柱 -tile.bloodmagic.pillar2.vengeful.name=二é‡å¤ä»‡çŸ³æŸ± -tile.bloodmagic.pillar2.steadfast.name=二é‡åšæ¯…石柱 - -tile.bloodmagic.pillarCap1.raw.name=原生顶柱 -tile.bloodmagic.pillarCap1.corrosive.name=è…蚀顶柱 -tile.bloodmagic.pillarCap2.destructive.name=ç ´å顶柱 -tile.bloodmagic.pillarCap2.vengeful.name=å¤ä»‡é¡¶æŸ± -tile.bloodmagic.pillarCap3.steadfast.name=åšæ¯…顶柱 - -tile.bloodmagic.wall1.brick_raw.name=原生石砖墙 -tile.bloodmagic.wall1.brick_corrosive.name=è…蚀石砖墙 -tile.bloodmagic.wall1.brick_destructive.name=ç ´å石砖墙 -tile.bloodmagic.wall1.brick_vengeful.name=å¤ä»‡çŸ³ç –墙 -tile.bloodmagic.wall1.brick_steadfast.name=åšæ¯…石砖墙 -tile.bloodmagic.wall1.smallbrick_raw.name=å°åŽŸç”ŸçŸ³ç –墙 -tile.bloodmagic.wall1.smallbrick_corrosive.name=å°è…蚀石砖墙 -tile.bloodmagic.wall1.smallbrick_destructive.name=å°ç ´å石砖墙 -tile.bloodmagic.wall1.smallbrick_vengeful.name=å°å¤ä»‡çŸ³ç –墙 -tile.bloodmagic.wall1.smallbrick_steadfast.name=å°åšæ¯…石砖墙 -tile.bloodmagic.wall1.large_raw.name=原生石墙 -tile.bloodmagic.wall1.large_corrosive.name=è…蚀石墙 -tile.bloodmagic.wall1.large_destructive.name=ç ´å石墙 -tile.bloodmagic.wall1.large_vengeful.name=å¤ä»‡çŸ³å¢™ -tile.bloodmagic.wall1.large_steadfast.name=åšæ¯…石墙 - -tile.bloodmagic.stairs1.raw.name=原生石楼梯 -tile.bloodmagic.stairs1.corrosive.name=è…蚀石楼梯 -tile.bloodmagic.stairs2.destructive.name=ç ´å石楼梯 -tile.bloodmagic.stairs2.vengeful.name=å¤ä»‡çŸ³æ¥¼æ¢¯ -tile.bloodmagic.stairs3.steadfast.name=åšæ¯…石楼梯 - -# Fluids -fluid.lifeEssence=生命æºè´¨ - -# Tooltips -tooltip.bloodmagic.extraInfo=&9-æŒ‰ä½ Shift 了解更多信æ¯- - -tooltip.bloodmagic.orb.desc=储存原生的生命æºè´¨ -tooltip.bloodmagic.orb.owner=æ¥æºï¼š%s -tooltip.bloodmagic.currentOwner=当å‰æ‰€æœ‰è€…：%s -tooltip.bloodmagic.currentTier=当å‰å±‚级：%d -tooltip.bloodmagic.config.disabled=于é…置信æ¯ä¸­ç¦ç”¨ -tooltip.bloodmagic.tier=层级 %d - -tooltip.bloodmagic.activated=激活 -tooltip.bloodmagic.deactivated=åœç”¨ - -tooltip.bloodmagic.sigil.air.desc=&o我感到轻æ¾å¤šäº†... -tooltip.bloodmagic.sigil.blood_light.desc=&o我看è§äº†ä¸€æŸå…‰æ˜Ž! -tooltip.bloodmagic.sigil.compression.desc=&o钻石之手 -tooltip.bloodmagic.sigil.divination.desc=&o窥视çµé­‚ -tooltip.bloodmagic.sigil.divination.otherNetwork=窥视 %s çš„çµé­‚ -tooltip.bloodmagic.sigil.divination.currentAltarTier=当å‰å±‚级：%d -tooltip.bloodmagic.sigil.divination.currentEssence=当å‰æºè´¨ï¼š%d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=当å‰å®¹é‡ï¼š%d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=当å‰é™è°§ï¼š%d -tooltip.bloodmagic.sigil.divination.currentInversion=当å‰å转：%d -tooltip.bloodmagic.sigil.divination.currentBonus=当å‰æ•ˆç›Šï¼š+%d%% -tooltip.bloodmagic.sigil.water.desc=&oæ— é™æ°´æº? -tooltip.bloodmagic.sigil.lava.desc=&o噢好烫! ä¸è¦åƒ -tooltip.bloodmagic.sigil.void.desc=&o胜过速易æ´Â®! -tooltip.bloodmagic.sigil.green_grove.desc=&o绿色环ä¿æ— æ±¡æŸ“ -tooltip.bloodmagic.sigil.magnetism.desc=&o我现在éžå¸¸å…·æœ‰å¸å¼•åŠ› -tooltip.bloodmagic.sigil.suppression.desc=&o比念力移动更好... -tooltip.bloodmagic.sigil.haste.desc=&o42继咖啡因åŽ... -tooltip.bloodmagic.sigil.fast_miner.desc=&o继续挖, 继续挖... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oè½å…¥ç„°ä¸­çš„鱼儿! -tooltip.bloodmagic.sigil.seer.desc=&o当看到的一切还ä¸è¶³å¤Ÿ -tooltip.bloodmagic.sigil.seer.currentAltarProgress=当å‰è¿›åº¦ï¼š%d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=当å‰è¿›åº¦ï¼š%s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=消耗率：%d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=当å‰å±‚级：%d -tooltip.bloodmagic.sigil.seer.currentEssence=当å‰æºè´¨ï¼š%d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=当å‰å®¹é‡ï¼š%d LP -tooltip.bloodmagic.sigil.seer.currentCharge=当å‰å‚¨èƒ½ï¼š%d -tooltip.bloodmagic.sigil.seer.currentTranquility=当å‰é™è°§ï¼š%d -tooltip.bloodmagic.sigil.seer.currentBonus=当å‰æ•ˆç›Šï¼š+%d%% -tooltip.bloodmagic.sigil.phantom_bridge.desc=&o御气于é’空之上... -tooltip.bloodmagic.sigil.whirlwind.desc=&o最好ä¸è¦ç©¿è£™å­ -tooltip.bloodmagic.sigil.ender_severance.desc=&o使末影人é‡ä¸Šä¸€ä¸ªä¸¥å³»å½¢åŠ¿ï¼ -tooltip.bloodmagic.sigil.teleposition.desc=éšæ—¶å¯ä»¥è„±ç¦»è¿™é‡Œã€‚ -tooltip.bloodmagic.sigil.transposition.desc=æ„Ÿå—原力的力é‡ï¼Œæˆ‘年轻的学徒。 -tooltip.bloodmagic.sigil.holding.press=按下&o%s&r&7修改 -tooltip.bloodmagic.sigil.holding.desc=å°è®°æŽŒæŽ§ -tooltip.bloodmagic.sigil.holding.sigilInSlot=å°è®° %d：%s - -tooltip.bloodmagic.livingArmourPointsUpgrade.desc=æå‡æ„ŸçŸ¥ç›”甲的最大点数至 %d。 - -tooltip.bloodmagic.bound.sword.desc=&oå± æ€å¹¼å¼±ä¹‹ç”Ÿçµ -tooltip.bloodmagic.bound.pickaxe.desc=&o无情地凿通大地 -tooltip.bloodmagic.bound.axe.desc=&oæ¶é­”般的滥ç æ»¥ä¼ -tooltip.bloodmagic.bound.shovel.desc=&o洗扫大地除去尘土 - -tooltip.bloodmagic.sacrificialDagger.desc=åªè¦è½»è½»åˆ’过手指... -tooltip.bloodmagic.sacrificialDagger.creative=对ç€ç¥­å›æ½œè¡Œå³å‡»å¡«æ»¡ -tooltip.bloodmagic.slate.desc=在祭å›ä¸­å°†çŸ³å¤´è½¬åŒ– -tooltip.bloodmagic.inscriber.desc=在墙é¢ä¸Šçš„文字... - -tooltip.bloodmagic.pack.selfSacrifice.desc=相当ä¸èˆ’适的背包... -tooltip.bloodmagic.pack.sacrifice.desc=æè¿° -tooltip.bloodmagic.pack.stored=储存：%d LP - -tooltip.bloodmagic.activation_crystal.weak=æ¿€æ´»ä½Žç­‰ä»ªå¼ -tooltip.bloodmagic.activation_crystal.awakened=æ¿€æ´»æ›´å¼ºå¤§çš„ä»ªå¼ -tooltip.bloodmagic.activation_crystal.creative=åˆ›é€ æ¨¡å¼ - æ¿€æ´»ä»»ä½•ä»ªå¼ - -tooltip.bloodmagic.diviner.currentRitual=当å‰ä»ªå¼: -tooltip.bloodmagic.diviner.blankRune=空白仪å¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.waterRune=水之仪å¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.airRune=风之仪å¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.fireRune=ç«ä¹‹ä»ªå¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.earthRune=土之仪å¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.duskRune=薄暮仪å¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.dawnRune=破晓仪å¼çŸ³ï¼š%d -tooltip.bloodmagic.diviner.totalRune=仪å¼çŸ³æ€»æ•°ï¼š%d -tooltip.bloodmagic.diviner.extraInfo=&9-按 Shift 了解详细信æ¯- -tooltip.bloodmagic.diviner.extraExtraInfo=&9-æŒ‰ä½ Shift + M 展开更多信æ¯- -tooltip.bloodmagic.diviner.currentDirection=当å‰æœå‘：%s - -tooltip.bloodmagic.ritualReader.currentState=当å‰æ¨¡å¼ï¼š%s -tooltip.bloodmagic.ritualReader.set_area=定义区域 -tooltip.bloodmagic.ritualReader.information=ä¿¡æ¯ -tooltip.bloodmagic.ritualReader.set_will_types=设置æ„志消耗 -tooltip.bloodmagic.ritualReader.desc.set_area=å³å‡»å·²æ¿€æ´»ä»ªå¼çš„主仪å¼çŸ³ï¼Œé€‰è‡³ä½ æƒ³æ›´æ”¹çš„区域，éšåŽåˆ†åˆ«å³å‡»æ–°åŒºåŸŸè§’è½çš„两个方å—。 -tooltip.bloodmagic.ritualReader.desc.information=å³å‡»å·²æ¿€æ´»ä»ªå¼çš„主仪å¼çŸ³äº†è§£ä»ªå¼çš„基本信æ¯ã€‚ -tooltip.bloodmagic.ritualReader.desc.set_will_types=设置仪å¼å°†æ¶ˆè€—çš„æ¶é­”æ„志类型, 工具æ ä¸­å­˜æ”¾è¯¥ç±»æ™¶ä½“å³å‡»ä¸»ä»ªå¼çŸ³. - -tooltip.bloodmagic.arcaneAshes=ç”¨äºŽç»˜åˆ¶ç‚¼é‡‘çŸ©é˜µçš„ç²‰ç° - -tooltip.bloodmagic.telepositionFocus.coords=当å‰å标：(%d, %d, %d) -tooltip.bloodmagic.telepositionFocus.dimension=世界ID：%d -tooltip.bloodmagic.telepositionFocus.bound=绑定：%s 于 %d, %d, %d -tooltip.bloodmagic.telepositionFocus.weak=用于在世界中转移区域 -tooltip.bloodmagic.telepositionFocus.enhanced=用于在世界中转移区域 -tooltip.bloodmagic.telepositionFocus.reinforced=用于在世界中转移区域 -tooltip.bloodmagic.telepositionFocus.demonic=用于在世界中转移区域 - -tooltip.bloodmagic.livingArmour.upgrade.speed=è¿…æ·åŒè¶³ -tooltip.bloodmagic.livingArmour.upgrade.digging=çŸ®äººåŠ›é‡ -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=抗毒体质 -tooltip.bloodmagic.livingArmour.upgrade.fireResist=ç„°ç«ä¹‹ç¤¼ -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=结实手心 -tooltip.bloodmagic.livingArmour.upgrade.knockback=强劲身躯 -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=åšéŸ§çš®è‚¤ -tooltip.bloodmagic.livingArmour.upgrade.health=å¥å£®ä½“è´¨ -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=猛烈击打 -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=å°„å‡»è¯€çª -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=æ­¥ä¼è¡¥åŠ© -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=死神竞跑 -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=é˜³å…‰èƒ½é‡ -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=å¤ç¢‘守护 -tooltip.bloodmagic.livingArmour.upgrade.revealing=æ­ç¤º -tooltip.bloodmagic.livingArmour.upgrade.experienced=熟练 -tooltip.bloodmagic.livingArmour.upgrade.jump=壮实åŒè…¿ -tooltip.bloodmagic.livingArmour.upgrade.fallProtect=柔和è½å¶ -tooltip.bloodmagic.livingArmour.upgrade.graveDigger=掘墓者 -tooltip.bloodmagic.livingArmour.upgrade.sprintAttack=冲撞击打 -tooltip.bloodmagic.livingArmour.upgrade.criticalStrike=精准击打 -tooltip.bloodmagic.livingArmour.upgrade.elytra=鞘翅 -tooltip.bloodmagic.livingArmour.upgrade.nightSight=夜行猛技 -tooltip.bloodmagic.livingArmour.upgrade.repair=ä¿®å¤ - - -tooltip.bloodmagic.livingArmour.upgrade.slowness=疲瘸之腿 -tooltip.bloodmagic.livingArmour.upgrade.crippledArm=残废手臂 -tooltip.bloodmagic.livingArmour.upgrade.slippery=如履寒冰 -tooltip.bloodmagic.livingArmour.upgrade.battleHunger=饿æ®é野 -tooltip.bloodmagic.livingArmour.upgrade.quenched=æ·¬ç« -tooltip.bloodmagic.livingArmour.upgrade.meleeDecrease=é’拙之刃 -tooltip.bloodmagic.livingArmour.upgrade.digSlowdown=弱化挖掘 -tooltip.bloodmagic.livingArmour.upgrade.stormTrooper=风暴骑兵 -tooltip.bloodmagic.livingArmour.upgrade.slowHeal=愈åˆå»¶ç¼“ -tooltip.bloodmagic.livingArmour.upgrade.disoriented=平衡失调 - -tooltip.bloodmagic.livingArmour.upgrade.level=%s（等级 %d） -tooltip.bloodmagic.livingArmour.upgrade.progress=%s（%d/100） -tooltip.bloodmagic.livingArmour.upgrade.points=&6强化点数：%s / %s - -tooltip.bloodmagic.livingArmour.extraExtraInfo=&9-æŒ‰ä½ Shift + M 查看进展信æ¯- - -tooltip.bloodmagic.will=æ„å¿—è´¨é‡ï¼š%1$,.2f -tooltip.bloodmagic.sentientSword.desc=以æ¶é­”æ„志唤起其最大潜能。 -tooltip.bloodmagic.sentientAxe.desc=以æ¶é­”æ„志唤起其最大潜能。 -tooltip.bloodmagic.sentientPickaxe.desc=以æ¶é­”æ„志唤起其最大潜能。 -tooltip.bloodmagic.sentientShovel.desc=以æ¶é­”æ„志唤起其最大潜能。 -tooltip.bloodmagic.soulGem.petty=用于存储微é‡æ„å¿—çš„å®çŸ³ -tooltip.bloodmagic.soulGem.lesser=用于存储少é‡æ„å¿—çš„å®çŸ³ -tooltip.bloodmagic.soulGem.common=用于存储更多æ„å¿—çš„å®çŸ³ -tooltip.bloodmagic.soulGem.greater=用于存储大é‡æ„å¿—çš„å®çŸ³ -tooltip.bloodmagic.soulGem.grand=用于存储æžå¤§æ•°é¢æ„å¿—çš„å®çŸ³ -tooltip.bloodmagic.soulSnare.desc=投掷å‘怪物并消ç­å®ƒä»¬æ¥èŽ·å–附于其身的æ¶é­”æ„å¿— - -tooltip.bloodmagic.itemFilter.exact=精确匹é…ç‰©å“ -tooltip.bloodmagic.itemFilter.ignoreNBT=忽视筛选的NBT -tooltip.bloodmagic.itemFilter.modItems=åŒMod的物å“å…¨éƒ¨åŒ¹é… -tooltip.bloodmagic.itemFilter.oreDict=按矿物辞典筛选 - -tooltip.bloodmagic.itemFilter.exact=精确匹é…液体 - -tooltip.bloodmagic.fluid.type=所å«æ¶²ä½“：%s -tooltip.bloodmagic.fluid.amount=æ•°é‡ï¼š%d / %d mB -tooltip.bloodmagic.fluid.capacity=容é‡ï¼š%d mB - -tooltip.bloodmagic.ghost.everything=ä»»ä½•ç‰©å“ -tooltip.bloodmagic.ghost.amount=å¹½çµç‰©å“æ•°é‡ï¼š%d - -tooltip.bloodmagic.currentType.default=è•´å«ï¼šåŽŸç”Ÿæ„å¿— -tooltip.bloodmagic.currentType.corrosive=è•´å«ï¼šè…蚀æ„å¿— -tooltip.bloodmagic.currentType.destructive=è•´å«ï¼šç ´åæ„å¿— -tooltip.bloodmagic.currentType.vengeful=è•´å«ï¼šå¤ä»‡æ„å¿— -tooltip.bloodmagic.currentType.steadfast=è•´å«ï¼šåšæ¯…æ„å¿— - -tooltip.bloodmagic.currentBaseType.default=原生 -tooltip.bloodmagic.currentBaseType.corrosive=è…蚀 -tooltip.bloodmagic.currentBaseType.destructive=ç ´å -tooltip.bloodmagic.currentBaseType.vengeful=å¤ä»‡ -tooltip.bloodmagic.currentBaseType.steadfast=åšæ¯… - -tooltip.bloodmagic.experienceTome=用于储存ç»éªŒçš„书 -tooltip.bloodmagic.experienceTome.exp=ç»éªŒå€¼ï¼š%0.3f -tooltip.bloodmagic.experienceTome.expLevel=等级：%d - -tooltip.bloodmagic.decoration.safe=安全装潢 -tooltip.bloodmagic.decoration.notSafe=å±é™©è£…æ½¢ - -tooltip.bloodmagic.cuttingFluidRatio=%d/%d 所剩å¯ç”¨ - -tooltip.bloodmagic.potion.uses=剩余使用次数：%d - -tooltip.bloodmagic.book.shifting=这些符å·ä¼¼ä¹Ž... &o在å˜æ¢ç€... - -tooltip.bloodmagic.willGauge=一个奇怪的装置，å¯ä»¥æµ‹é‡æ¶é­”çµåŸŸä¸­çš„æ¶é­”æ„志。 - -# Ritual -ritual.bloodmagic.blockRange.tooBig=æ供的方å—范围过大ï¼æœ€å¤šä¸è¶…过 %s 个方å—。 -ritual.bloodmagic.blockRange.tooFar=æ供的方å—范围太远ï¼éœ€è¦åœ¨åž‚ç›´è·ç¦» %s , æ°´å¹³è·ç¦» %s 之内。 -ritual.bloodmagic.blockRange.inactive=该仪å¼çŸ³ç›®å‰æ— æ´»åŠ¨ï¼Œæ²¡æœ‰å¯ä¿®æ”¹çš„范围。 -ritual.bloodmagic.blockRange.noRange=范围选择ä¸æ°å½“。 -ritual.bloodmagic.blockRange.firstBlock=记录新范围的第一个方å—。 -ritual.bloodmagic.blockRange.success=新范围设置æˆåŠŸï¼ -ritual.bloodmagic.willConfig.set=该仪å¼å°†ä½¿ç”¨è¿™ç±»æ¶é­”æ„志类型：%s -ritual.bloodmagic.willConfig.void=该仪å¼ä¸å†ä¼šä½¿ç”¨æ¶é­”æ„å¿— - -ritual.bloodmagic.testRitual=æµ‹è¯•ä»ªå¼ -ritual.bloodmagic.waterRitual=æ¶Œæ³‰ä»ªå¼ -ritual.bloodmagic.lavaRitual=下界夜曲 -ritual.bloodmagic.greenGroveRitual=ç»¿ä¸›ä»ªå¼ -ritual.bloodmagic.jumpRitual=é«˜è·³ä»ªå¼ -ritual.bloodmagic.wellOfSufferingRitual=苦难之井 -ritual.bloodmagic.featheredKnifeRitual=ç¾½åˆ€ä»ªå¼ -ritual.bloodmagic.regenerationRitual=é‡ç”Ÿä»ªå¼ -ritual.bloodmagic.harvestRitual=丰收之月 -ritual.bloodmagic.magneticRitual=ç£å¼•ä»ªå¼ -ritual.bloodmagic.crushingRitual=æŒ–æŽ˜ä»ªå¼ -ritual.bloodmagic.fullStomachRitual=盛宴之歌 -ritual.bloodmagic.interdictionRitual=åˆ¶æ­¢ä»ªå¼ -ritual.bloodmagic.containmentRitual=ç‰µåˆ¶ä»ªå¼ -ritual.bloodmagic.speedRitual=é€Ÿç§»ä»ªå¼ -ritual.bloodmagic.suppressionRitual=æŠ‘æ¶²ä»ªå¼ -ritual.bloodmagic.expulsionRitual=驱é€æ°›åœº -ritual.bloodmagic.zephyrRitual=和风之唤 -ritual.bloodmagic.upgradeRemoveRitual=净çµä¹‹éŸ³ -ritual.bloodmagic.armourEvolveRitual=æŸçµè¿›åŒ– -ritual.bloodmagic.animalGrowthRitual=ç‰§å…»ä»ªå¼ -ritual.bloodmagic.forsakenSoulRitual=孤魂集会 -ritual.bloodmagic.crystalHarvestRitual=碎晶裂纹 -ritual.bloodmagic.meteorRitual=å æ˜Ÿæ ‡ä½ - -ritual.bloodmagic.cobblestoneRitual=æžå¯’ç«å±± -ritual.bloodmagic.placerRitual=é“ºè®¾ä»ªå¼ -ritual.bloodmagic.fellingRitual=ä¼æž—ä»ªå¼ -ritual.bloodmagic.pumpRitual=虹å¸åœ£æ›² -ritual.bloodmagic.altarBuilderRitual=祭å›é›†ç»“å· -ritual.bloodmagic.portalRitual=折域之门 -ritual.bloodmagic.downgradeRitual=沉é‡çµé­‚çš„å¿æ‚” - -ritual.bloodmagic.waterRitual.info=通过主仪å¼çŸ³ç”Ÿæˆä¸€ä¸ªæ°´æºæ–¹å— -ritual.bloodmagic.lavaRitual.info=通过主仪å¼çŸ³ç”Ÿæˆä¸€ä¸ªå²©æµ†æºæ–¹å— -ritual.bloodmagic.lavaRitual.default.info=[原生]é™ä½Žç”Ÿæˆå²©æµ†çš„LP消耗，并将岩浆导入连接的容器内 -ritual.bloodmagic.lavaRitual.corrosive.info=[è…蚀]范围内å…ç–«ç«ç„°ä¼¤å®³çš„实体将å—到伤害 -ritual.bloodmagic.lavaRitual.destructive.info=[ç ´å]岩浆的放置范围根æ®æ„志的总é‡å¢žåŠ  -ritual.bloodmagic.lavaRitual.vengeful.info=[å¤ä»‡]给予范围内实体缓燃引线效果（上天） -ritual.bloodmagic.lavaRitual.steadfast.info=[åšæ¯…]给予范围内的玩家防ç«æ•ˆæžœ - -ritual.bloodmagic.greenGroveRitual.info=在其范围内ç§æ¤å†œä½œç‰© -ritual.bloodmagic.jumpRitual.info=使实体跃å‘高空 -ritual.bloodmagic.wellOfSufferingRitual.info=攻击其伤害范围内的生物，并将所获LPå‚¨å…¥é‚»è¿‘çš„è¡€ä¹‹ç¥­å› -ritual.bloodmagic.featheredKnifeRitual.info=扣除其范围内的玩家生命值，并将所获LPå‚¨å…¥é‚»è¿‘çš„è¡€ä¹‹ç¥­å› -ritual.bloodmagic.regenerationRitual.info=治疗其范围内失去生命值的实体 -ritual.bloodmagic.regenerationRitual.default.info=[原生] -ritual.bloodmagic.regenerationRitual.corrosive.info=[è…蚀]从éžçŽ©å®¶çš„实体身上汲å–鲜血以治疗玩家 -ritual.bloodmagic.regenerationRitual.destructive.info=[ç ´å] -ritual.bloodmagic.regenerationRitual.vengeful.info=[å¤ä»‡] -ritual.bloodmagic.regenerationRitual.steadfast.info=[åšæ¯…] -ritual.bloodmagic.harvestRitual.info=收割其范围内的æ¤ç‰©ï¼Œäº§ç‰©æŽ‰è½äºŽåœ°ä¸Š -ritual.bloodmagic.magneticRitual.info=将地底的矿石传é€è‡³å…¶æ”¾ç½®åŒºåŸŸ -ritual.bloodmagic.crushingRitual.info=ç ´å其挖掘范围内的方å—，并将掉è½ç‰©æ”¾ç½®äºŽæ‰€è¿žæŽ¥çš„ç®±å­ -ritual.bloodmagic.crushingRitual.destructive.info=[ç ´å]强力的破åæ–¹å—：所有方å—ç ´åå— æ—¶è¿III å½±å“ -ritual.bloodmagic.crushingRitual.steadfast.info=[åšæ¯…]以 精准采集 获å–被破åæ–¹å—ã€‚é€‚ç”¨æƒ…å†µä¸‹è¦†ç›–æ—¶è¿ -ritual.bloodmagic.crushingRitual.corrosive.info=[è…蚀]所有被破åæ–¹å—将以基础切削油的形å¼å¤„ç†ã€‚适用情况下覆盖精准采集 -ritual.bloodmagic.crushingRitual.vengeful.info=[å¤ä»‡]压缩库存内的物å“（如将煤炭压缩æˆç…¤ç‚­å—），目å‰æ¯æ¬¡æ“作仅执行一次压缩 -ritual.bloodmagic.crushingRitual.default.info=[原生]æ ¹æ®æ„志总é‡å¢žåŠ ä»ªå¼çš„è¿è¡Œé€Ÿåº¦ -ritual.bloodmagic.greenGroveRitual.corrosive.info=[è…蚀]范围内的实体将被附近的æ¤ç‰©æ”»å‡», 蚕食掉他们的生命 -ritual.bloodmagic.greenGroveRitual.default.info=[原生]æ ¹æ®çµåŸŸå†…æ„志的总é‡åŠ å¿«æ‰€æœ‰çš„仪å¼è¿ä½œé€Ÿåº¦ -ritual.bloodmagic.greenGroveRitual.vengeful.info=[å¤ä»‡]增加生长刻æˆåŠŸçš„速率 -ritual.bloodmagic.greenGroveRitual.steadfast.info=[åšæ¯…]在水åˆèŒƒå›´å†…, ç§å­ä¼šè¢«å†æ¬¡ç§æ¤ä¸”æ–¹å—会被润湿 -ritual.bloodmagic.greenGroveRitual.destructive.info=[ç ´å] 促进作物生长的范围根æ®æ„志的总é‡å¢žåŠ  -ritual.bloodmagic.featheredKnifeRitual.default.info=[原生] æ ¹æ®çµåŸŸå†…æ„志的总é‡å¢žåŠ ä»ªå¼çš„è¿è¡Œé€Ÿåº¦ -ritual.bloodmagic.featheredKnifeRitual.destructive.info=[ç ´å] æ ¹æ®æ„志总é‡å¢žåŠ ä»ªå¼çš„产出的LP -ritual.bloodmagic.featheredKnifeRitual.vengeful.info=[å¤ä»‡] 将牺牲的最å°ç”Ÿå‘½å€¼è®¾ä¸º10%%.覆盖[åšæ¯…]的效果 -ritual.bloodmagic.featheredKnifeRitual.corrosive.info=[è…蚀] 使用玩家的“ç†é¦™â€æ¥æ高收益 -ritual.bloodmagic.featheredKnifeRitual.steadfast.info=[åšæ¯…] 将牺牲的最å°ç”Ÿå‘½å€¼è®¾ä¸º30%%到70%% -ritual.bloodmagic.speedRitual.default.info=[原生] æ ¹æ®æ„志总é‡å¢žåŠ ä»ªå¼äº§ç”Ÿçš„移动速度 -ritual.bloodmagic.speedRitual.vengeful.info=[å¤ä»‡] 防止玩家与æˆå¹´åŠ¨ç‰©è¢«è¿è¾“，如果与[ç ´å]é…åˆï¼Œåˆ™è¿è¾“玩家 -ritual.bloodmagic.speedRitual.destructive.info=[ç ´å] 防止玩家与幼年动物被è¿è¾“，如果与[å¤ä»‡]é…åˆï¼Œåˆ™è¿è¾“玩家 -ritual.bloodmagic.animalGrowthRitual.vengeful.info=[å¤ä»‡] å‡å°‘æˆå¹´åŠ¨ç‰©ç¹æ®–的间隔时间 -ritual.bloodmagic.animalGrowthRitual.steadfast.info=[åšæ¯…] 使用箱å­å†…的物å“饲养区域内的动物 -ritual.bloodmagic.animalGrowthRitual.default.info=[原生] æ ¹æ®çµåŸŸå†…æ„志的总é‡å¢žåŠ ä»ªå¼çš„è¿è¡Œé€Ÿåº¦ -ritual.bloodmagic.animalGrowthRitual.destructive.info=[ç ´å]让最近没有ç¹æ®–åŽä»£çš„æˆå¹´åŠ¨ç‰©å†²å‘怪物自爆 -ritual.bloodmagic.animalGrowthRitual.corrosive.info=[è…蚀] 暂无特殊效果 - -ritual.bloodmagic.fullStomachRitual.info=从连接的箱å­ä¸­èŽ·å–食物，æ¥è¡¥å……玩家的饥饿值。 -ritual.bloodmagic.interdictionRitual.info=使其范围内的所有生物推离于主仪å¼çŸ³ã€‚ -ritual.bloodmagic.containmentRitual.info=使其范围内的所有生物牵引å‘主仪å¼çŸ³ã€‚ -ritual.bloodmagic.speedRitual.info=将其范围内的玩家以仪å¼æ–¹å‘抛射出去。 -ritual.bloodmagic.suppressionRitual.info=抑制其范围内的液体；åœç”¨ä»ªå¼æ—¶æ¢å¤ã€‚ -ritual.bloodmagic.expulsionRitual.info=驱é€å…¶èŒƒå›´å†…，éžæ¿€æ´»è€…或主仪å¼çŸ³ä¸Šæ–¹ç®±å­ä¸­æ— ç»‘定血å®ç çš„玩家，离开该区域。 -ritual.bloodmagic.zephyrRitual.info=拾å–其范围内的掉è½ç‰©ï¼Œå¹¶æ”¾å…¥æ‰€è¿žæŽ¥çš„ç®±å­ã€‚ -ritual.bloodmagic.upgradeRemoveRitual.info=没有记载。 -ritual.bloodmagic.armourEvolveRitual.info=没有记载。 -ritual.bloodmagic.animalGrowthRitual.info=加快其范围内的幼年动物的生长速度。 -ritual.bloodmagic.forsakenSoulRitual.info=对其伤害范围内的生物造æˆä¼¤å®³ï¼Œå½“生物死亡时，其晶体范围内的æ¶é­”晶簇将生长。 -ritual.bloodmagic.crystalHarvestRitual.info=ç ´å范围内的æ¶é­”æ„志晶簇，掉è½ç‰©ä¸¢äºŽæ™¶ç°‡é¡¶éƒ¨ã€‚ -ritual.bloodmagic.placerRitual.info=å–出所连接的容器中的方å—，并放置于世界中。 -ritual.bloodmagic.fellingRitual.info=一个ä¼æœ¨è®¾æ–½ï¼Œè¯¥ä»ªå¼å°†ç ä¼å…¶èŒƒå›´å†…所有树与å¶å­ï¼Œå¹¶æ”¶é›†æŽ‰è½ç‰©ã€‚ -ritual.bloodmagic.pumpRitual.info=从规定范围获å–液体。åªæœ‰å½“所连接的液体容器至少有一桶é‡çš„相åŒæ¶²ä½“时，移入液体。 -ritual.bloodmagic.altarBuilderRitual.info=将所连接的容器中的祭å›éƒ¨ä»¶æ­å»ºå‡ºæ¥ã€‚ -ritual.bloodmagic.portalRitual.info=创建一个传é€é—¨ç½‘络，以激活者åŠç›´æŽ¥æŽ¥è§¦æ–¹å—为基础，两者相åŒçš„两个传é€é—¨è¾¾æˆè¿žæŽ¥ã€‚激活åŽæœªä¿®æ”¹ä¼ é€ç½‘络的情况下方å—å¯ä»¥å˜æ›´ã€‚ -ritual.bloodmagic.meteorRitual.info=消耗其物å“范围内的一个物å“，从天空中å¬å”¤ä¸€ä¸ªå……满资æºçš„æµæ˜Ÿï¼Œç›´æŽ¥å å‘仪å¼ã€‚ - -ritual.bloodmagic.waterRitual.waterRange.info=(æ°´æº) 仪å¼æ”¾ç½®æ°´æºæ–¹å—的区域。 -ritual.bloodmagic.lavaRitual.lavaRange.info=(岩浆) 仪å¼æ”¾ç½®å²©æµ†æ–¹å—的区域。 -ritual.bloodmagic.lavaRitual.lavaTank.info=[原生] 仪å¼å°†å²©æµ†å¯¼å…¥å…¶ä¸­çš„å‚¨ç½ -ritual.bloodmagic.lavaRitual.fireFuse.info=[å¤ä»‡] 在这个区域内的实体将é­å—缓燃引线效果 -ritual.bloodmagic.lavaRitual.fireResist.info=[åšæ¯…] 玩家在此区域内å¯èŽ·å¾—防ç«buff -ritual.bloodmagic.lavaRitual.fireDamage.info=[è…蚀] 该区域内å…ç–«ç«ç„°ä¼¤å®³çš„实体将å—到伤害，伤害é‡ä¸Žæ„å¿—çš„é‡ç›¸å…³ -ritual.bloodmagic.greenGroveRitual.growing.info=(生长) 仪å¼åŠ å¿«æ¤ç‰©ç”Ÿé•¿çš„区域。 -ritual.bloodmagic.greenGroveRitual.leech.info=[è…蚀] 区域内实体的生命将æµå¤±äºŽæ»‹å…»é™„近的农作物。 -ritual.bloodmagic.greenGroveRitual.hydrate.info=[åšæ¯…] 区域内的方å—将被润湿为耕地，且区域内的ç§å­å°†è¢«å°±è¿‘ç§æ¤ã€‚ -ritual.bloodmagic.jumpRitual.jumpRange.info=(跳跃) 在这个区域内的实体将跃å‘高空。 -ritual.bloodmagic.wellOfSufferingRitual.altar.info=(祭å›) 规定仪å¼æ£€æµ‹è¡€ä¹‹ç¥­å›çš„区域。该项修改为添加或撤销一个å标。 -ritual.bloodmagic.wellOfSufferingRitual.damage.info=(伤害) 规定仪å¼ä¼¤å®³ç”Ÿç‰©çš„区域。该区域内所有生物(除了玩家)å°†æŒç»­å—到伤害。 -ritual.bloodmagic.featheredKnifeRitual.altar.info=(祭å›) 规定仪å¼æ£€æµ‹è¡€ä¹‹ç¥­å›çš„区域。该项修改为添加或撤销一个å标。 -ritual.bloodmagic.featheredKnifeRitual.damage.info=(伤害) 规定仪å¼ä¼¤å®³çŽ©å®¶çš„区域。该区域内的玩家将æŒç»­å—到伤害直至设定的生命值下é™ã€‚ -ritual.bloodmagic.regenerationRitual.heal.info=(治愈) 该区域内的生物将获得生命æ¢å¤buff。 -ritual.bloodmagic.regenerationRitual.vampire.info=(血蛭) æ±²å–区域内怪物的生命æ¥æ²»æ„ˆçŽ©å®¶ -ritual.bloodmagic.harvestRitual.harvestRange.info=(收割) 该区域内的æ¤ç‰©å°†è¢«æ”¶å‰²ã€‚ -ritual.bloodmagic.magneticRitual.placementRange.info=(放置) 仪å¼å°†æŠŠèŽ·å–的矿石放置于该区域内。 -ritual.bloodmagic.crushingRitual.crushingRange.info=(挖掘) 该区域的方å—将被破å。 -ritual.bloodmagic.crushingRitual.chest.info=(ç®±å­) ç®±å­ä½ç½®ï¼Œä»ªå¼å°†æŠŠç ´åçš„æ–¹å—放入其中。 -ritual.bloodmagic.fullStomachRitual.fillRange.info=(喂食) 仪å¼å°†ä¼šå–‚食该区域内的玩家。 -ritual.bloodmagic.fullStomachRitual.chest.info=(ç®±å­) ç®±å­ä½ç½®, 仪å¼å°†æå–其中的食物æ¥å–‚食区域内的玩家。 -ritual.bloodmagic.interdictionRitual.interdictionRange.info=(推离) 仪å¼æŽ¨ç¦»ç”Ÿç‰©çš„区域。无论该区域ä½äºŽä½•å¤„，所有生物将被推离于主仪å¼çŸ³ã€‚ -ritual.bloodmagic.containmentRitual.containmentRange.info=(牵引) 仪å¼ç‰µå¼•ç”Ÿç‰©çš„区域。无论该区域ä½äºŽä½•å¤„，所有生物将被牵引å‘主仪å¼çŸ³ã€‚ -ritual.bloodmagic.speedRitual.sanicRange.info=(速度) 所有ä½äºŽè¯¥åŒºåŸŸå†…的实体，将被抛射å‘仪å¼æ‘†ç›¸æˆçš„箭头方å‘。 -ritual.bloodmagic.suppressionRitual.suppressionRange.info=(抑液) 该区域内所有液体将被仪å¼æŠ‘制。 -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(驱é€) -ritual.bloodmagic.zephyrRitual.zephyrRange.info=(拾å–) 该区域内的物å“将被拾å–储入所连接箱å­ã€‚ -ritual.bloodmagic.zephyrRitual.chest.info=(ç®±å­) ç®±å­ä½ç½®, 仪å¼å°†æŠŠæ‹¾å–的物å“放入其中。 -ritual.bloodmagic.animalGrowthRitual.growing.info=(æˆé•¿) 该区域内的动物将æˆé•¿å¾—更快。 -ritual.bloodmagic.animalGrowthRitual.chest.info=(ç®±å­) 用于存放喂养动物物å“çš„ç®±å­ -ritual.bloodmagic.forsakenSoulRitual.crystal.info=(晶体) 当有生物因仪å¼æ­»äº¡æ—¶ï¼Œè¯¥åŒºåŸŸå†…的晶簇生长速度将加快。 -ritual.bloodmagic.forsakenSoulRitual.damage.info=(伤害) 该区域内的生物将缓慢的收到伤害，当死亡时晶簇将生长。 -ritual.bloodmagic.crystalHarvestRitual.crystal.info=(晶体) 晶簇将被破åæˆä»…ç•™å•æ™¶çš„晶簇，被破å的晶体将掉è½äºŽä¸–界。 - -ritual.bloodmagic.placerRitual.placerRange.info=(放置) 仪å¼å°†æ”¾ç½®æ–¹å—的区域。 -ritual.bloodmagic.placerRitual.chest.info=(ç®±å­) ç®±å­ä½ç½®, 仪å¼å°†æå–其中的方å—放置于世界中。 -ritual.bloodmagic.fellingRitual.fellingRange.info=(ç ä¼) 仪å¼å°†æœå¯»åŽŸæœ¨å’Œæ ‘å¶å¹¶è¿›è¡Œç ä¼çš„区域。 -ritual.bloodmagic.fellingRitual.chest.info=(ç®±å­) ç®±å­ä½ç½®, 仪å¼å°†æŠŠæŽ‰è½ç‰©æ”¾å…¥å…¶ä¸­ã€‚ -ritual.bloodmagic.pumpRitual.pumpRange.info=(引水) 仪å¼äºŽä¸–界中获å–液体的区域。 - -ritual.bloodmagic.downgradeRitual.dialogue.bow.1=那么，少年，你渴望力é‡ä¹ˆ...？ -ritual.bloodmagic.downgradeRitual.dialogue.bow.100=当然了，没有ä¸éœ€è¦ä»£ä»·çš„交易...我也ä¸ä¼šè½»æ˜“地给予你力é‡ï¼Œè€Œä¸æ±‚任何回报 -ritual.bloodmagic.downgradeRitual.dialogue.bow.300=那么就献祭自身，抛弃自我，放弃那百步穿æ¨çš„精准。记ä½ï¼Œç®­çŸ¢å°†ä¸å†æ˜¯ä½ èŽ·èƒœçš„å‡­ä¾ -ritual.bloodmagic.downgradeRitual.dialogue.bow.500=我会帮你解开盔甲的å°å°ä»¥ä½œå›žæŠ¥ï¼Œè¿™æ ·å®ƒä»¬å°±èƒ½è¿›ä¸€æ­¥åœ°å¼ºåŒ–下去...而你所è¦åšçš„就是在这仪å¼å‰å©æ‹œ -ritual.bloodmagic.downgradeRitual.dialogue.quenched.1=嚯嚯嚯...你好，凡人，从你眼神中我看到了渴望，对力é‡çš„渴望 -ritual.bloodmagic.downgradeRitual.dialogue.quenched.100=谨记ï¼å½“æ¯å­è£…满时，想è¦è£…下更多就必须先将她倒空 -ritual.bloodmagic.downgradeRitual.dialogue.quenched.300=那么，我们åšä¸ªäº¤æ˜“å§ï¼šå¿˜å´é‚£æœåº·çš„美味，我将给予你å˜å¾—更有潜力的机会。相信我，你完全ä¸éœ€è¦è€ƒè™‘这么åšæ˜¯å¦å€¼å¾—... -ritual.bloodmagic.downgradeRitual.dialogue.quenched.500=跪下å§ï¼å‡¡äººã€‚饮下这æ¯é…’。这或许会是你此生最åŽä¸€æ¬¡ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.1=å—¯...你究竟想è¦å¾—到什么？ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.100=想è¦è¶…脱凡人的力é‡ï¼Ÿæˆ‘无法满足你的è¦æ±‚——ä¸è¿‡ï¼Œæˆ‘这里有å¦å¤–一项交易... -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.300=我å¯ä»¥å¸®ä½ æ”¹è‰¯ä½ çš„盔甲，使它å¯ä»¥èŽ·å¾—更多的强化机会。但是，作为交æ¢ï¼Œä½ å°†å¤±åŽ»è‡ªèº«æˆ˜æ–—的能力 -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.500=如果愿æ„，就别å†æŒ¥åŠ¨æ‰‹ä¸­çš„剑刃，它将永远失去昨日的è£è€€ -ritual.bloodmagic.downgradeRitual.dialogue.dulledBlade.700=那么，你的选择是什么，是跪在仪å¼å‰ï¼Œè¿˜æ˜¯ç»§ç»­æŒ¥åŠ¨æ‰‹ä¸­çš„剑刃？ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.1=å½“å¿ƒä½ è„šä¸‹çš„å¤§åœ°ï¼Œå‡¡äººï¼ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.100=和我的伙伴ä¸åŒï¼Œæˆ‘åªæœ‰æ®‹é…·çš„交易。如果你想æˆä¸ºé­”法师，那么就用你的身体æ¥äº¤æ¢ -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.300=伤å£æ€»ä¼šæ„ˆåˆã€‚如果答应了我的æ¡ä»¶ï¼Œé‚£ä¹ˆä½ èº«ä¸Šçš„伤å£å°†æ›´éš¾æ„ˆåˆï¼Œç›´åˆ°æˆ˜æ–—的烙å°æˆ–作无形的瘟疫 -ritual.bloodmagic.downgradeRitual.dialogue.slowHeal.500=好了，赶紧考虑å§ã€‚你或许会åŽæ‚”，因为哪怕你的æ¯å­ç©ºäº†ï¼Œå®ƒä¹Ÿå¾ˆéš¾åœ¨è¢«å¡«æ»¡... - -# Chat -chat.bloodmagic.altarMaker.setTier=层级设置：%d -chat.bloodmagic.altarMaker.building=铺设一个 %d å±‚ç¥­å› -chat.bloodmagic.altarMaker.destroy=消除一个 %d å±‚ç¥­å› -chat.bloodmagic.altarMaker.creativeOnly=该物å“ä»…é™åˆ›é€ æ¨¡å¼ã€‚ - -chat.bloodmagic.damageSource=%s çš„çµé­‚开始å˜å¾—虚弱 - -chat.bloodmagic.ritual.weak=你感到有股拉力, 但没有足够的力é‡æ¥å®Œæˆè¿™ä¸ªä»ªå¼. -chat.bloodmagic.ritual.prevent=仪å¼åœ¨ç§¯æžçš„抵抗你! -chat.bloodmagic.ritual.activate=一股能é‡æµç»è¿™ä¸ªä»ªå¼! -chat.bloodmagic.ritual.notValid=这些仪å¼çŸ³ä¼¼ä¹Žæœ‰äº›æ‘†æ”¾ä¸å¾—当... - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=你感到已ç»å¥½å¤šäº†ï¼ -chat.bloodmagic.livingArmour.upgrade.fireRemove=&6ç«ç„°æŠµæŠ—éšä¸€è‚¡æ¸…凉感附ç€äºŽä½ ã€‚ -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6朦胧中一股能é‡ä½¿ä½ è„±ç¦»æ­»äº¡è¾¹ç¼˜ï¼ -chat.bloodmagic.livingArmour.newUpgrade=&4强化完æˆï¼ - -chat.bloodmagic.routing.remove=移出记录ä½ç½® -chat.bloodmagic.routing.set=设置节点ä½ç½® -chat.bloodmagic.routing.link.master=è¿žæŽ¥åˆ°ä¸»èŠ‚ç‚¹ï¼ -chat.bloodmagic.routing.link=èŠ‚ç‚¹è¿žæŽ¥å®Œæˆ - -chat.bloodmagic.altar.comp.glowstone=一个è¤çŸ³å— -chat.bloodmagic.altar.comp.bloodstone=一个大血石砖 -chat.bloodmagic.altar.comp.beacon=一个信标 -chat.bloodmagic.altar.comp.bloodrune=一个气血符文 -chat.bloodmagic.altar.comp.crystal=ä¸€ä¸ªæ— æ•ˆç‰©å“ -chat.bloodmagic.altar.comp.notair=ä¸€ä¸ªå®žå¿ƒæ–¹å— - -chat.bloodmagic.altar.nextTier=下一层级的血之祭å›ç¼ºå¤±%s，对应å标为 %s 。 - -chat.bloodmagic.mimic.potionSet=è¯å‰‚陷阱已设置. -chat.bloodmagic.mimic.potionRemove=è¯å‰‚陷阱已移除. -chat.bloodmagic.mimic.potionInterval.up=è¯å‰‚时间间隔已增加至：%d 刻。 -chat.bloodmagic.mimic.potionInterval.down=è¯å‰‚时间间隔已å‡å°‘至：%d 刻。 -chat.bloodmagic.mimic.detectRadius.up=玩家检测åŠå¾„已增加至：%d 格方å—。 -chat.bloodmagic.mimic.detectRadius.down=玩家检测åŠå¾„å·²å‡å°‘至：%d 格方å—。 -chat.bloodmagic.mimic.potionSpawnRadius.up=è¯å‰‚生æˆåŠå¾„已增加至：%d 格方å—。 -chat.bloodmagic.mimic.potionSpawnRadius.down=è¯å‰‚生æˆåŠå¾„å·²å‡å°‘至：%d 格方å—。 - -# entity -entity.bloodmagic.SentientSpecter.name=æ„ŸçŸ¥ä¹‹çµ -entity.bloodmagic.Mimic.name=æ‹Ÿæ€ - -# Commands -commands.bloodmagic.error.arg.invalid=无效å‚æ•° -commands.bloodmagic.error.arg.missing=å‚æ•°ä¸è¶³ -commands.bloodmagic.error.arg.player.missing=你必须指定一个玩家æ¥æ‰§è¡Œè¯¥å‘½ä»¤ã€‚ -commands.bloodmagic.error.404=å‘½ä»¤æœªæ‰¾åˆ°ï¼ -commands.bloodmagic.error.unknown=æœªçŸ¥çš„å‘½ä»¤ï¼ -commands.bloodmagic.error.perm=你没有使用该命令的æƒé™ã€‚ - -commands.bloodmagic.success=æˆåŠŸæ‰§è¡Œ - -commands.bloodmagic.format.help=%s - %s -commands.bloodmagic.format.error=%s - %s - -commands.bloodmagic.help.usage=/bloodmagic help -commands.bloodmagic.help.help=使用"/bloodmagic help"命令显示指令列表。 - -commands.bloodmagic.network.usage=/bloodmagic network [å¸å–(syphon)|添加(add)|查看(get)|å¡«å……(fill)|填满(cap)] <玩家> [æ•°é‡] -commands.bloodmagic.network.help=çµé­‚网络实用工具 -commands.bloodmagic.network.syphon.help=从指定玩家的çµé­‚网络中移出指定的LP值。 -commands.bloodmagic.network.syphon.success=æˆåŠŸä»Ž %s å¸å–出 %dLP。 -commands.bloodmagic.network.add.help=添加指定的LP值到指定玩家的çµé­‚网络中。æœä»Žæ ‡å‡†çš„LP增加规则。 -commands.bloodmagic.network.add.success=æˆåŠŸæ·»åŠ  %dLP 到 %s çš„çµé­‚网络。 -commands.bloodmagic.network.set.help=将指定玩家的LP设置为所给数值。 -commands.bloodmagic.network.set.success=æˆåŠŸå°† %s çµé­‚网络中的LP设置为 %d。 -commands.bloodmagic.network.get.help=返还指定玩家çµé­‚网络中的LP值。 -commands.bloodmagic.network.fill.help=将指定玩家的LP填充为 %d。 -commands.bloodmagic.network.fill.success=æˆåŠŸå¡«å…… %s çš„çµé­‚网络。 -commands.bloodmagic.network.cap.help=填充指定玩家的çµé­‚网络至其所æŒæœ‰çš„最高阶气血å®ç å®¹é‡çš„最大值。 -commands.bloodmagic.network.cap.success=æˆåŠŸå¡«æ»¡ %s çš„çµé­‚网络。 - -commands.bloodmagic.bind.usage=/bind <玩家> -commands.bloodmagic.bind.help=用于设置/解除对手æŒç‰©å“的绑定情况。 -commands.bloodmagic.bind.success=物å“æˆåŠŸç»‘å®šï¼ -commands.bloodmagic.bind.remove.success=解除绑定æˆåŠŸ - -commands.bloodmagic.orb.usage=/bloodmagic orb [设置(set)|查看(get)] <玩家> [等级] -commands.bloodmagic.orb.help=用于设置或查看玩家的最高血å®ç ç­‰çº§. - -commands.bloodmagic.bind.usage=/bind <玩家> -commands.bloodmagic.bind.success=物å“æˆåŠŸç»‘å®šï¼ -commands.bloodmagic.bind.failed.noPlayer=没有指定玩家 -commands.bloodmagic.bind.failed.alreadyBound=物å“å·²ç»è¢«ç»‘定；使用 /unbind æ¥è§£é™¤ç»‘定 -commands.bloodmagic.bind.failed.notBindable=物å“无法被绑定 -commands.bloodmagic.unbind.usage=/unbind -commands.bloodmagic.unbind.success=物å“æˆåŠŸè§£é™¤ç»‘å®šï¼ -commands.bloodmagic.unbind.failed.notBindable=物å“无法解除绑定 -commands.bloodmagic.soulnetwork.usage=/soulnetwork <玩家> <添加(add)|å‡åŽ»(subtract)|填满(fill)|清空(empty)|查看(get)> [æ•°é‡] -commands.bloodmagic.soulnetwork.add.success=æˆåŠŸæ·»åŠ  %dLP 到 %s çš„çµé­‚ç½‘ç»œï¼ -commands.bloodmagic.soulnetwork.subtract.success=æˆåŠŸä»Ž %s çš„çµé­‚网络中å‡åŽ» %dLPï¼ -commands.bloodmagic.soulnetwork.fill.success=æˆåŠŸå¡«æ»¡ %s çš„çµé­‚ç½‘ç»œï¼ -commands.bloodmagic.soulnetwork.empty.success=æˆåŠŸæ¸…空 %s çš„çµé­‚ç½‘ç»œï¼ -commands.bloodmagic.soulnetwork.get.success=%s çš„çµé­‚网络中有 %dLPï¼ -commands.bloodmagic.soulnetwork.noPlayer=没有指定玩家 -commands.bloodmagic.soulnetwork.noCommand=è¿™ä¸ç¬¦å‘½ä»¤è§„定 -commands.bloodmagic.soulnetwork.notACommand=è¿™ä¸æ˜¯æœ‰æ•ˆçš„命令 -commands.bloodmagic.soulnetwork.fillMax.success=æˆåŠŸå°† %s çš„çµé­‚网络填满至其å®ç çš„æœ€å¤§å€¼ï¼ -commands.bloodmagic.soulnetwork.create.success=创建 %s çš„çµé­‚网络æˆåŠŸï¼ˆå®ç ç­‰çº§ï¼š%d） - -# GUI -tile.bloodmagic.inputNode.name=输入节点 -tile.bloodmagic.outputNode.name=输出节点 - -# Keybinds -bloodmagic.keybind.open_holding=打开集æŒå°è®° -bloodmagic.keybind.cycle_holding_pos=循环选择å°è®° (+) -bloodmagic.keybind.cycle_holding_neg=循环选择å°è®° (-) - -# JustEnoughItems -jei.bloodmagic.recipe.altar=è¡€ä¹‹ç¥­å› -jei.bloodmagic.recipe.binding=炼金矩阵 (绑定) -jei.bloodmagic.recipe.alchemyArrayCrafting=炼金矩阵 -jei.bloodmagic.recipe.soulForge=狱ç«ç†”炉 -jei.bloodmagic.recipe.alchemyTable=炼金术桌 -jei.bloodmagic.recipe.armourDowngrade=ç¥­å“ (仪å¼ï¼šæ²‰é‡çµé­‚çš„å¿æ‚”) -jei.bloodmagic.recipe.requiredLP=LP: %d -jei.bloodmagic.recipe.requiredTier=层级：%d -jei.bloodmagic.recipe.consumptionRate=消耗率：%d LP/t -jei.bloodmagic.recipe.drainRate=消耗率：%d LP/t -jei.bloodmagic.recipe.minimumSouls=最å°å€¼ï¼š%1$,.2f Will -jei.bloodmagic.recipe.soulsDrained=消耗：%1$,.2f Will -jei.bloodmagic.recipe.lpDrained=消耗：%,d LP -jei.bloodmagic.recipe.ticksRequired=时间：%,d 刻 - -jei.bloodmagic.desc.altarBuilder=该物å“ä»…é™åˆ›é€ æ¨¡å¼ï¼Œç”¨äºŽè°ƒè¯•æµ‹è¯•.\n\nShift + å³é”® 改å˜å±‚级。å³é”®ç¥­å›å¼€å§‹æ­å»ºã€‚\n\n手æŒç ´å祭å›æ—¶å°†å…¨éƒ¨ç§»é™¤ã€‚ -jei.bloodmagic.desc.demonicWill=附身于生物的æ¶é­”æ„志之体现.\n\nå¯ä»¥é€šè¿‡ç”¨æ„ŸçŸ¥æ­¦å™¨æ€æ­»ç”Ÿç‰©æŽ‰è½ï¼Œæˆ–是对ç€ç”Ÿç‰©æŠ›æŽ·åŽŸå§‹æŠ•ç½‘。当它出现白色颗粒时æ€äº†å®ƒã€‚ - -# WAILA -waila.bloodmagic.sneak=&oæ½œè¡ŒæŸ¥çœ‹ä¿¡æ¯ -waila.bloodmagic.array.reagent=试剂：%s -waila.bloodmagic.array.catalyst=石æ¿ï¼š%s -option.bloodmagic.bypassSneak=潜行 -option.bloodmagic.bloodAltar=è¡€ä¹‹ç¥­å› -option.bloodmagic.ritualController=仪å¼çŸ³ -option.bloodmagic.teleposer=ä¼ é€å™¨ -option.bloodmagic.array=炼金矩阵 - -# Thaumcraft -tc.research_category.BLOODMAGIC=血红奥术 - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=血魔法 -bloodmagic.research_text.BLOODMAGIC=血红奥术 -bloodmagic.research_page.BLOODMAGIC.1=血魔法的领域总是似乎有些孤立且åƒæ˜¯â€œä¸ªäººâ€è‰ºæœ¯ï¼ŒåŒä¼—所周知的喜爱éšå±…有时还有点疯癫的血魔法师。然而，自我牺牲与生命æºè´¨çš„力é‡ç”šè‡³æ‹¥æœ‰è¶…出一般血魔法师所è§çš„用途，事实上，这ç§åŠ›é‡æ˜¾ç„¶ç»ˆç©¶èƒ½åº”用于神秘学。 - -# Buttons -button.bloodmagic.tooltip.fill=填充网络 diff --git a/src/main/resources/assets/bloodmagic/lang/zh_TW.lang b/src/main/resources/assets/bloodmagic/lang/zh_TW.lang deleted file mode 100644 index bdabcb85..00000000 --- a/src/main/resources/assets/bloodmagic/lang/zh_TW.lang +++ /dev/null @@ -1,404 +0,0 @@ -#Creative Tab -itemGroup.bloodmagic.creativeTab=血魔法 -itemGroup.bloodmagic.creativeTabTome=血魔法強化經文 - -#Items -item.bloodmagic.activationCrystal.weak.name=[虛弱]激活水晶 -item.bloodmagic.activationCrystal.awakened.name=[覺醒]激活水晶 -item.bloodmagic.activationCrystal.creative.name=[創造模å¼]激活水晶 - -item.bloodmagic.sacrificialDagger.normal.name=犧牲匕首 -item.bloodmagic.sacrificialDagger.creative.name=創造模å¼çŠ§ç‰²åŒ•é¦– -item.bloodmagic.pack.selfSacrifice.name=血文背包 -item.bloodmagic.pack.sacrifice.name=紋章血甲 -item.bloodmagic.daggerOfSacrifice.name=ç»ç¥­åˆ€ - -item.bloodmagic.lavaCrystal.name=熔岩晶體 - -item.bloodmagic.bound.sword.name=ç´„æŸä¹‹åŠ -item.bloodmagic.bound.pickaxe.name=ç´„æŸä¹‹éŽ¬ -item.bloodmagic.bound.axe.name=ç´„æŸä¹‹æ–§ -item.bloodmagic.bound.shovel.name=ç´„æŸä¹‹é¬ - -item.bloodmagic.bucket.lifeEssence.name=生命之桶 - -item.bloodmagic.scribe.water.name=元素銘文：水 -item.bloodmagic.scribe.fire.name=å…ƒç´ éŠ˜æ–‡ï¼šç« -item.bloodmagic.scribe.earth.name=元素銘文：地 -item.bloodmagic.scribe.air.name=元素銘文：風 -item.bloodmagic.scribe.dusk.name=å…ƒç´ éŠ˜æ–‡ï¼šé»ƒæ˜ -item.bloodmagic.scribe.dawn.name=元素銘文：黎明 - -item.bloodmagic.focus.weak.name=傳é€æ–¹ä½æ ¸å¿ƒ -item.bloodmagic.focus.enhanced.name=強化傳é€æ–¹ä½æ ¸å¿ƒ -item.bloodmagic.focus.reinforced.name=力之傳é€æ–¹ä½æ ¸å¿ƒ -item.bloodmagic.focus.demonic.name=惡魔傳é€æ–¹ä½æ ¸å¿ƒ - -item.bloodmagic.slate.blank.name=ç©ºç™½çŸ³æ¿ -item.bloodmagic.slate.reinforced.name=åŠ›ä¹‹çŸ³æ¿ -item.bloodmagic.slate.imbued.name=çŒè¼¸çŸ³æ¿ -item.bloodmagic.slate.demonic.name=æƒ¡é­”çŸ³æ¿ -item.bloodmagic.slate.ethereal.name=çŽ„å¹½çŸ³æ¿ - -item.bloodmagic.orb.weak.name=è™›å¼±æ°£è¡€å¯¶ç  -item.bloodmagic.orb.apprentice.name=å­¸å¾’æ°£è¡€å¯¶ç  -item.bloodmagic.orb.magician.name=é­”æ³•ä½¿æ°£è¡€å¯¶ç  -item.bloodmagic.orb.master.name=é­”å°Žå¸«æ°£è¡€å¯¶ç  -item.bloodmagic.orb.archmage.name=å¤§è³¢è€…æ°£è¡€å¯¶ç  -item.bloodmagic.orb.transcendent.name=è¶…è¶Šè€…æ°£è¡€å¯¶ç  - -item.bloodmagic.reagent.incendium.name=ç«ç„°ç²‰æœ« -item.bloodmagic.reagent.magicales.name=魔法粉末 -item.bloodmagic.reagent.sanctus.name=神è–粉末 -item.bloodmagic.reagent.aether.name=以太元素 -item.bloodmagic.reagent.crepitous.name=爆破粉末 -item.bloodmagic.reagent.crystallos.name=冰晶粉末 -item.bloodmagic.reagent.terrae.name=泥土粉末 -item.bloodmagic.reagent.aquasalus.name=液之粉末 -item.bloodmagic.reagent.tennebrae.name=暗黑粉末 -item.bloodmagic.reagent.offensa.name=攻勢粉末 -item.bloodmagic.reagent.praesidium.name=防守粉末 -item.bloodmagic.reagent.orbisterrae.name=環境粉末 -item.bloodmagic.reagent.virtus.name=力é‡ç²‰æœ« -item.bloodmagic.reagent.reductus.name=代價粉末 -item.bloodmagic.reagent.potentia.name=效能粉末 - -item.bloodmagic.bloodShard.weak.name=虛弱氣血碎片 -item.bloodmagic.bloodShard.demon.name=惡魔氣血碎片 - -item.bloodmagic.baseComponent.reagentWater.name=水之試劑 -item.bloodmagic.baseComponent.reagentLava.name=熔岩試劑 -item.bloodmagic.baseComponent.reagentAir.name=空之試劑 -item.bloodmagic.baseComponent.reagentFastMiner.name=礦之試劑 -item.bloodmagic.baseComponent.reagentVoid.name=虛空試劑 -item.bloodmagic.baseComponent.reagentGrowth.name=æˆé•·è©¦åŠ‘ -item.bloodmagic.baseComponent.reagentAffinity.name=元素親和力試劑 -item.bloodmagic.baseComponent.reagentSight.name=視之試劑 -item.bloodmagic.baseComponent.reagentBinding.name=ç´„æŸè©¦åŠ‘ -item.bloodmagic.baseComponent.reagentSuppression.name=抑制試劑 -item.bloodmagic.baseComponent.frameParts.name=框架部件 -item.bloodmagic.baseComponent.reagentBloodLight.name=血光試劑 -item.bloodmagic.baseComponent.reagentMagnetism.name=ç£å¼•è©¦åŠ‘ -item.bloodmagic.baseComponent.reagentHaste.name=急速試劑 -item.bloodmagic.baseComponent.reagentBridge.name=影橋試劑 -item.bloodmagic.baseComponent.reagentCompression.name=壓縮試劑 -item.bloodmagic.baseComponent.reagentSeverance.name=驅散試劑 - -item.bloodmagic.baseComponent.reagentTeleposition.name=轉é€è©¦åŠ‘ -item.bloodmagic.baseComponent.reagentTransposition.name=移ä½è©¦åŠ‘ - -item.bloodmagic.monsterSoul.base.name=惡魔慾望 - -item.bloodmagic.sigil.air.name=空氣å°è¨˜ -item.bloodmagic.sigil.bloodLight.name=血光å°è¨˜ -item.bloodmagic.sigil.compression.name=壓縮å°è¨˜ -item.bloodmagic.sigil.divination.name=å åœå°è¨˜ -item.bloodmagic.sigil.water.name=水之å°è¨˜ -item.bloodmagic.sigil.lava.name=熔岩å°è¨˜ -item.bloodmagic.sigil.void.name=虛空å°è¨˜ -item.bloodmagic.sigil.greenGrove.name=綠å¢å°è¨˜ -item.bloodmagic.sigil.elementalAffinity.name=元素å°è¨˜ -item.bloodmagic.sigil.haste.name=急速å°è¨˜ -item.bloodmagic.sigil.suppression.name=抑制å°è¨˜ -item.bloodmagic.sigil.magnetism.name=ç£å¼•å°è¨˜ -item.bloodmagic.sigil.fastMiner.name=速掘å°è¨˜ -item.bloodmagic.sigil.seer.name=æœç´¢å°è¨˜ -item.bloodmagic.sigil.phantomBridge.name=影橋å°è¨˜ -item.bloodmagic.sigil.whirlwind.name=旋風å°è¨˜ -item.bloodmagic.sigil.enderSeverance.name=終末å°è¨˜ - -item.bloodmagic.sigil.teleposition.name=轉é€å°è¨˜ -item.bloodmagic.sigil.transposition.name=移ä½å°è¨˜ - -item.bloodmagic.livingArmour.helmet.name=生命頭盔 -item.bloodmagic.livingArmour.chest.name=生命胸甲 -item.bloodmagic.livingArmour.legs.name=生命護腿 -item.bloodmagic.livingArmour.boots.name=ç”Ÿå‘½é•·é´ -item.bloodmagic.sentientArmour.helmet.name=感知頭盔 -item.bloodmagic.sentientArmour.chest.name=感知胸甲 -item.bloodmagic.sentientArmour.legs.name=感知護腿 -item.bloodmagic.sentientArmour.boots.name=æ„ŸçŸ¥é•·é´ - -item.bloodmagic.altarMaker.name=祭壇產生器 - -item.bloodmagic.ritualDivinernormal.name=å„€å¼å æ– -item.bloodmagic.ritualDivinerdusk.name=å„€å¼å æ–[黃æ˜] -item.bloodmagic.ritualDivinerdawn.name=å„€å¼å æ–[黎明] - -item.bloodmagic.arcaneAshes.name=奧法ç°ç‡¼ -item.bloodmagic.upgradeTome.name=生命護甲å‡ç´šç¶“æ–‡ -item.bloodmagic.upgradeTrainer.name=生命護甲培養環 - -item.bloodmagic.sentientSword.name=æ„ŸçŸ¥åŠ -item.bloodmagic.soulGem.petty.name=貧脊酒石晶 -item.bloodmagic.soulGem.lesser.name=次級酒石晶 -item.bloodmagic.soulGem.common.name=普通酒石晶 -item.bloodmagic.soulGem.greater.name=上等酒石晶 -item.bloodmagic.soulGem.grand.name=稀世酒石晶 -item.bloodmagic.soulSnare.base.name=簡易套索 -item.bloodmagic.sentientBow.name=感知弓 -item.bloodmagic.sentientArmourGem.name=感知護甲寶石 - -item.bloodmagic.nodeRouter.name=節點路由 -item.bloodmagic.itemFilter.exact.name=精確物å“篩é¸å™¨ -item.bloodmagic.itemFilter.ignoreNBT.name=NBT物å“篩é¸å™¨ -item.bloodmagic.itemFilter.modItems.name=模組物å“篩é¸å™¨ -item.bloodmagic.itemFilter.oreDict.name=礦物辭典物å“篩é¸å™¨ - -# Blocks -tile.bloodmagic.fluid.lifeEssence.name=ç”Ÿå‘½ç²¾è¯ - -tile.bloodmagic.stone.ritual.master.name=魔導師儀å¼çŸ³ -tile.bloodmagic.stone.ritual.imperfect.name=次級儀å¼çŸ³ - -tile.bloodmagic.altar.name=血祭壇 -tile.bloodmagic.alchemyArray.name=煉金矩陣 - -tile.bloodmagic.rune.blank.name=空白符文石 -tile.bloodmagic.rune.speed.name=速度符文石 -tile.bloodmagic.rune.efficiency.name=效益符文石 -tile.bloodmagic.rune.sacrifice.name=犧牲符文石 -tile.bloodmagic.rune.selfSacrifice.name=ç»ç¥­ç¬¦æ–‡çŸ³ -tile.bloodmagic.rune.displacement.name=移ä½ç¬¦æ–‡çŸ³ -tile.bloodmagic.rune.capacity.name=容ç´ç¬¦æ–‡çŸ³ -tile.bloodmagic.rune.augCapacity.name=增容符文石 -tile.bloodmagic.rune.orb.name=ç ä¹‹ç¬¦æ–‡çŸ³ -tile.bloodmagic.rune.acceleration.name=促進符文石 -tile.bloodmagic.rune.charging.name=充能符文石 - - -tile.bloodmagic.ritualStone.blank.name=å„€å¼çŸ³ -tile.bloodmagic.ritualStone.water.name=水之儀å¼çŸ³ -tile.bloodmagic.ritualStone.fire.name=ç«ä¹‹å„€å¼çŸ³ -tile.bloodmagic.ritualStone.earth.name=地之儀å¼çŸ³ -tile.bloodmagic.ritualStone.air.name=風之儀å¼çŸ³ -tile.bloodmagic.ritualStone.dusk.name=黃æ˜å„€å¼çŸ³ -tile.bloodmagic.ritualStone.dawn.name=黎明之儀å¼çŸ³ - -tile.bloodmagic.bloodstonebrick.large.name=大血石磚 -tile.bloodmagic.bloodstonebrick.brick.name=血石磚 -tile.bloodmagic.crystal.large.name=晶簇方塊 -tile.bloodmagic.crystal.brick.name=晶簇磚 -tile.bloodmagic.bloodLight.name=血光 -tile.bloodmagic.spectralBlock.name=波譜方塊 -tile.bloodmagic.phantom.name=幻象方塊 -tile.bloodmagic.incenseAltar.name=香壇 - -tile.bloodmagic.teleposer.name=轉é€å™¨ -tile.bloodmagic.soulForge.name=ç„ç‚Žèžçˆ -tile.bloodmagic.demonCrucible.name=惡魔å©å  - -tile.bloodmagic.masterRouting.name=魔導師路由節點 -tile.bloodmagic.outputRouting.name=輸出路由節點 -tile.bloodmagic.inputRouting.name=輸入路由節點 -tile.bloodmagic.itemRouting.name=路由節點 - -tile.bloodmagic.path.wood.name=木æ通路 -tile.bloodmagic.path.woodTile.name=平滑木通路 -tile.bloodmagic.path.stone.name=石磚通路 -tile.bloodmagic.path.stoneTile.name=平滑石通路 -tile.bloodmagic.path.wornstone.name=裂石磚通路 -tile.bloodmagic.path.wornstoneTile.name=平滑裂石通路 -tile.bloodmagic.path.obsidian.name=黑曜石通路 -tile.bloodmagic.path.obsidianTile.name=平滑黑曜石通路 - -tile.bloodmagic.dimensionalPortal.name=維度傳é€é–€ -tile.bloodmagic.bloodTank.name=血槽 - -# 工具æ示 -tooltip.bloodmagic.orb.desc=å„²å­˜ç”Ÿå‘½ç²¾è¯ -tooltip.bloodmagic.orb.owner=Added by: %s -tooltip.bloodmagic.currentOwner=Current owner: %s -tooltip.bloodmagic.currentTier=Current tier: %d -tooltip.bloodmagic.config.disabled=Currently disabled in the Config - -tooltip.bloodmagic.activated=啟用 -tooltip.bloodmagic.deactivated=未啟用 - -tooltip.bloodmagic.sigil.air.desc=&oI feel lighter already... -tooltip.bloodmagic.sigil.bloodLight.desc=&oI see a light! -tooltip.bloodmagic.sigil.compression.desc=&oHands of diamonds -tooltip.bloodmagic.sigil.divination.desc=&oPeer into the soul -tooltip.bloodmagic.sigil.divination.otherNetwork=Peering into the soul of %s -tooltip.bloodmagic.sigil.divination.currentAltarTier=Current Tier: %d -tooltip.bloodmagic.sigil.divination.currentEssence=Current Essence: %,d LP -tooltip.bloodmagic.sigil.divination.currentAltarCapacity=Current Capacity: %,d LP -tooltip.bloodmagic.sigil.divination.currentTranquility=Current Tranquility: %,d -tooltip.bloodmagic.sigil.divination.currentBonus=Current Bonus: +%,d%% -tooltip.bloodmagic.sigil.water.desc=&oInfinite water, anyone? -tooltip.bloodmagic.sigil.lava.desc=&oHOT! DO NOT EAT -tooltip.bloodmagic.sigil.void.desc=&oBetter than a Swiffer®! -tooltip.bloodmagic.sigil.greenGrove.desc=&oEnvironmentally friendly -tooltip.bloodmagic.sigil.magnetism.desc=&oI have a very magnetic personality -tooltip.bloodmagic.sigil.suppression.desc=&oBetter than telekinesis... -tooltip.bloodmagic.sigil.haste.desc=&o42 doses of caffeine later... -tooltip.bloodmagic.sigil.fastMiner.desc=&oKeep mining, and mining... -tooltip.bloodmagic.sigil.elementalAffinity.desc=&oFalling fire fishes! -tooltip.bloodmagic.sigil.seer.desc=&oWhen seeing all is not enough -tooltip.bloodmagic.sigil.seer.currentAltarProgress=Current Progress: %,d LP/ %s LP -tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent=Current Progress: %s -tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate=Consumption Rate: %,d LP -tooltip.bloodmagic.sigil.seer.currentAltarTier=Current Tier: %d -tooltip.bloodmagic.sigil.seer.currentEssence=Current Essence: %,d LP -tooltip.bloodmagic.sigil.seer.currentAltarCapacity=Current Capacity: %,d LP -tooltip.bloodmagic.sigil.seer.currentCharge=Current Charge: %,d -tooltip.bloodmagic.sigil.seer.currentTranquility=Current Tranquility: %,d -tooltip.bloodmagic.sigil.seer.currentBonus=Current Bonus: +%,d%% -tooltip.bloodmagic.sigil.phantomBridge.desc=&oWalking on thin air... -tooltip.bloodmagic.sigil.whirlwind.desc=&oBest not to wear a skirt -tooltip.bloodmagic.sigil.enderSeverance.desc=&oPutting Endermen in Dire situations! - -tooltip.bloodmagic.sigil.teleposition.desc=I am very close to being moved by this. -tooltip.bloodmagic.sigil.transposition.desc=Feel the power of the Force, my young apprentice. - -tooltip.bloodmagic.bound.sword.desc=&oCulling the weak -tooltip.bloodmagic.bound.pickaxe.desc=&oDestroying stone without mercy -tooltip.bloodmagic.bound.axe.desc=&oDemonic deforestation -tooltip.bloodmagic.bound.shovel.desc=&oScrubs floors clean of dirt - -tooltip.bloodmagic.sacrificialDagger.desc=Just a prick of the finger will suffice... -tooltip.bloodmagic.slate.desc=Infused stone inside of a Blood Altar -tooltip.bloodmagic.inscriber.desc=The writing is on the wall... - -tooltip.bloodmagic.pack.selfSacrifice.desc=這背包戴起來好痛… -tooltip.bloodmagic.pack.sacrifice.desc=Description -tooltip.bloodmagic.pack.stored=Stored: %,d LP - -tooltip.bloodmagic.activationCrystal.weak=å±…å‹•ä½ŽéšŽå„€å¼ -tooltip.bloodmagic.activationCrystal.awakened=é©…å‹•æ›´å¼·å¤§çš„å„€å¼ -tooltip.bloodmagic.activationCrystal.creative=Creative Only - Activates any ritual - -tooltip.bloodmagic.diviner.currentRitual=Current Ritual: -tooltip.bloodmagic.diviner.blankRune=Blank Runes: %d -tooltip.bloodmagic.diviner.waterRune=Water Runes: %d -tooltip.bloodmagic.diviner.airRune=Air Runes: %d -tooltip.bloodmagic.diviner.fireRune=Fire Runes: %d -tooltip.bloodmagic.diviner.earthRune=Earth Runes: %d -tooltip.bloodmagic.diviner.duskRune=Dusk Runes: %d -tooltip.bloodmagic.diviner.dawnRune=Dawn Runes: %d -tooltip.bloodmagic.diviner.totalRune=Total Runes: %d -tooltip.bloodmagic.diviner.extraInfo=按shift顯示é¡å¤–資訊 -tooltip.bloodmagic.diviner.currentDirection=Current Direction: %s - -tooltip.bloodmagic.arcaneAshes=ç‘一個圈以用於煉金術 - -tooltip.bloodmagic.telepositionFocus.coords=Current coordinates: (%,d, %,d, %,d) -tooltip.bloodmagic.telepositionFocus.dimension=Dimension ID: %d -tooltip.bloodmagic.telepositionFocus.weak=Used to move blocks in the world -tooltip.bloodmagic.telepositionFocus.enhanced=Used to move blocks in the world -tooltip.bloodmagic.telepositionFocus.reinforced=Used to move blocks in the world -tooltip.bloodmagic.telepositionFocus.demonic=Used to move blocks in the world - -tooltip.bloodmagic.livingArmour.upgrade.speed=Quick Feet -tooltip.bloodmagic.livingArmour.upgrade.digging=Dwarven Might -tooltip.bloodmagic.livingArmour.upgrade.poisonResist=Poison Resistance -tooltip.bloodmagic.livingArmour.upgrade.selfSacrifice=Tough Palms -tooltip.bloodmagic.livingArmour.upgrade.knockback=Body Builder -tooltip.bloodmagic.livingArmour.upgrade.physicalProtect=Tough Skin -tooltip.bloodmagic.livingArmour.upgrade.health=Healthy -tooltip.bloodmagic.livingArmour.upgrade.meleeDamage=Fierce Strike -tooltip.bloodmagic.livingArmour.upgrade.arrowShot=Trick Shot -tooltip.bloodmagic.livingArmour.upgrade.stepAssist=Step Assist -tooltip.bloodmagic.livingArmour.upgrade.grimReaper=Grim Reaper's Sprint -tooltip.bloodmagic.livingArmour.upgrade.solarPowered=Solar Powered -tooltip.bloodmagic.livingArmour.upgrade.thaumRunicShielding=Runic Shielding -tooltip.bloodmagic.livingArmour.upgrade.revealing=Revealing -tooltip.bloodmagic.livingArmour.upgrade.level=%s (Level %d) -tooltip.bloodmagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s - -tooltip.bloodmagic.will=Will Quality: %1$,.2f -tooltip.bloodmagic.sentientSword.desc=Uses demon will to unleash its full potential. -tooltip.bloodmagic.soulGem.petty=A gem used to contain a little will -tooltip.bloodmagic.soulGem.lesser=A gem used to contain some will -tooltip.bloodmagic.soulGem.common=A gem used to contain more will -tooltip.bloodmagic.soulGem.greater=A gem used to contain a greater amount of will -tooltip.bloodmagic.soulGem.grand=A gem used to contain a large amount of will -tooltip.bloodmagic.soulSnare.desc=Throw at a monster and then kill them to obtain their demonic will - -tooltip.bloodmagic.itemFilter.exact=Will make sure the items match precisely -tooltip.bloodmagic.itemFilter.ignoreNBT=Ignores the NBT of the filter -tooltip.bloodmagic.itemFilter.modItems=Matches all items from the same mod -tooltip.bloodmagic.itemFilter.oreDict=Used to filter through the Ore Dictionary - -tooltip.bloodmagic.fluid.type=Fluid Contained -tooltip.bloodmagic.fluid.amount=Amount -tooltip.bloodmagic.fluid.capacity=Capacity - -# å„€å¼ -ritual.bloodmagic.testRitual=Test Ritual -ritual.bloodmagic.waterRitual=Ritual of the Full Spring -ritual.bloodmagic.lavaRitual=Serenade of the Nether -ritual.bloodmagic.greenGroveRitual=Ritual of the Green Grove -ritual.bloodmagic.jumpRitual=Ritual of the High Jump -ritual.bloodmagic.wellOfSufferingRitual=Well of Suffering -ritual.bloodmagic.featheredKnifeRitual=Ritual of the Feathered Knife -ritual.bloodmagic.regenerationRitual=Ritual of Regeneration -ritual.bloodmagic.harvestRitual=Reap of the Harvest Moon -ritual.bloodmagic.magneticRitual=Ritual of Magnetism -ritual.bloodmagic.crushingRitual=Ritual of the Crusher -ritual.bloodmagic.fullStomachRitual=Ritual of the Satiated Stomach -ritual.bloodmagic.interdictionRitual=Ritual of Interdiction -ritual.bloodmagic.containmentRitual=Ritual of Containment -ritual.bloodmagic.speedRitual=Ritual of Speed -ritual.bloodmagic.suppressionRitual=Ritual of Suppression -ritual.bloodmagic.expulsionRitual=Aura of Expulsion -ritual.bloodmagic.zephyrRitual=Call of the Zephyr -ritual.bloodmagic.upgradeRemoveRitual=Sound of the Cleansing Soul -ritual.bloodmagic.armourEvolveRitual=Ritual of Living Evolution - -ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius -ritual.bloodmagic.placerRitual=The Filler -ritual.bloodmagic.fellingRitual=The Timberman -ritual.bloodmagic.pumpRitual=Hymn of Siphoning -ritual.bloodmagic.altarBuilderRitual=The Assembly of the High Altar -ritual.bloodmagic.portalRitual=The Gate of the Fold - -# Chat -chat.bloodmagic.altarMaker.setTier=Set Tier to: %d -chat.bloodmagic.altarMaker.building=Building a Tier %d Altar -chat.bloodmagic.altarMaker.destroy=Destroyed a Tier %d Altar -chat.bloodmagic.altarMaker.creativeOnly=This is a creative only item. - -chat.bloodmagic.damageSource=%sçš„éˆé­‚變得éŽæ–¼è™›å¼± - -chat.bloodmagic.ritual.weak=你感到一股力é‡ï¼Œä½†æ˜¯éŽæ–¼å¾®å¼±ï¼Œä¸è¶³ä»¥é©…å‹•å„€å¼ã€‚ -chat.bloodmagic.ritual.prevent=ä½ å—到儀å¼åŠ‡çƒˆçš„æŠ—æ‹’ï¼ -chat.bloodmagic.ritual.activate=能é‡å¿«é€Ÿçš„在儀å¼ä¸­æµç«„ï¼ -chat.bloodmagic.ritual.notValid=你感覺這些符文的é…置似乎ä¸å¤§æ­£ç¢º… - -chat.bloodmagic.livingArmour.upgrade.poisonRemove=ä½ çš„ç‹€æ…‹å·²å¥½è½‰ï¼ -chat.bloodmagic.livingArmour.upgrade.grimReaper=&6一股陰暗的力é‡å°‡ä½ å¾žæ­»äº¡é‚Šç·£æ‹‰å›žï¼ -chat.bloodmagic.livingArmour.newUpgrade=&4å–å¾—å‡ç´šï¼ - -# JustEnoughItems -jei.bloodmagic.recipe.altar=血祭壇 -jei.bloodmagic.recipe.binding=Alchemy Array (Binding) -jei.bloodmagic.recipe.alchemyArrayCrafting=煉金矩陣 -jei.bloodmagic.recipe.soulForge=ç„ç‚Žèžçˆ -jei.bloodmagic.recipe.requiredLP=LP: %,d -jei.bloodmagic.recipe.requiredTier=Tier: %d -jei.bloodmagic.recipe.consumptionRate=Consumption: %,d LP/t -jei.bloodmagic.recipe.drainRate=Drain: %,d LP/t -jei.bloodmagic.recipe.minimumSouls=Minimum: %1$,.2f Will -jei.bloodmagic.recipe.soulsDrained=Drained: %1$,.2f Will - -jei.bloodmagic.desc.altarBuilder=A creative-only item for use in debugging and testing.\n\nShift + Right click to change the tier to build. Right click an Altar to initiate the build.\n\nBreak an Altar while holding to dismantle it. -jei.bloodmagic.desc.demonicWill=惡魔憑ä¾åœ¨ç”Ÿç‰©èº«ä¸Šè€Œç”¢ç”Ÿçš„å°è¨˜ã€‚\n\né€éŽæŒæ„ŸçŸ¥æ­¦å™¨æ®ºæ­»æ•µäººç²å¾—。或以簡易套索擲å‘敵人，使其顯ç¾å‡ºç™½å…‰å¾Œæ®ºæ­»ä»¥å–得。 - -# WAILA -waila.bloodmagic.sneak=&o潛行展開詳細資訊 -waila.bloodmagic.array.reagent=Reagent: %s -waila.bloodmagic.array.catalyst=Catalyst: %s -option.bloodmagic.bypassSneak=Bypass Sneak -option.bloodmagic.bloodAltar=血祭壇 -option.bloodmagic.ritualController=å„€å¼çŸ³ -option.bloodmagic.teleposer=轉é€å™¨ -option.bloodmagic.array=煉金矩陣 - -# Thaumcraft -tc.research_category.BLOODMAGIC=血儀術 - -# Thaumcraft Research -bloodmagic.research_name.BLOODMAGIC=血魔法 -bloodmagic.research_text.BLOODMAGIC=血儀術 -bloodmagic.research_page.BLOODMAGIC.1=血魔法的領域一直令人感到孤僻， 而血術師的"ç¨é–€"祕法更是出å的悖離人群，常使人感到瘋狂。 然而自我犧牲與生命精è¯çš„力é‡ç”šè‡³èƒ½æ“有平凡血術師所難以估計的強大力é‡ï¼Œ 顯然秘術使å¯ä»¥æŠŠå®ƒä½œç‚ºæŸäº›ç”¨é€”ï¼ diff --git a/src/main/resources/assets/bloodmagic/loot_tables/bm_loot_table.json b/src/main/resources/assets/bloodmagic/loot_tables/bm_loot_table.json deleted file mode 100644 index ef383f71..00000000 --- a/src/main/resources/assets/bloodmagic/loot_tables/bm_loot_table.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "pools": [ - { - "name": "Testing", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "minecraft:stone", - "weight": 3, - "functions": [ - { - "function": "set_data", - "data": 0 - }, - { - "function": "set_count", - "count": 1 - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockaltar.obj b/src/main/resources/assets/bloodmagic/models/block/blockaltar.obj index 55f9cc3d..0d33a216 100644 --- a/src/main/resources/assets/bloodmagic/models/block/blockaltar.obj +++ b/src/main/resources/assets/bloodmagic/models/block/blockaltar.obj @@ -1,6 +1,6 @@ # Blender v2.76 (sub 0) OBJ File: '' # www.blender.org -mtllib BlockAltar.mtl +mtllib blockaltar.mtl o Shape1 v 0.000000 0.500000 1.000000 v 0.000000 -0.000000 1.000000 diff --git a/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj b/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj index 1a818a41..595aa694 100644 --- a/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj +++ b/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj @@ -1,6 +1,6 @@ # Blender v2.76 (sub 0) OBJ File: '' # www.blender.org -mtllib BlockHellfireForge.mtl +mtllib blockhellfireforge.mtl o BlockHellfireForge_(5) v 0.062500 0.125000 0.937500 v 0.062500 -0.000000 0.937500 diff --git a/src/main/resources/assets/bloodmagic/models/block/bloodaltar.json b/src/main/resources/assets/bloodmagic/models/block/bloodaltar.json new file mode 100644 index 00000000..8f1f343e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/bloodaltar.json @@ -0,0 +1,10 @@ +{ + "parent": "block/block", + "loader": "forge:obj", + "flip-v": true, + "model": "bloodmagic:models/block/blockaltar.obj", + "textures": { + "default": "bloodmagic:models/altar", + "particle": "#default" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/soulforge.json b/src/main/resources/assets/bloodmagic/models/block/soulforge.json new file mode 100644 index 00000000..6aa32fd9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/soulforge.json @@ -0,0 +1,10 @@ +{ + "parent": "block/block", + "loader": "forge:obj", + "flip-v": true, + "model": "bloodmagic:models/block/blockhellfireforge.obj", + "textures": { + "default": "bloodmagic:models/hellfireforge", + "particle": "#default" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/altar.json b/src/main/resources/assets/bloodmagic/models/item/altar.json new file mode 100644 index 00000000..945aff81 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/altar.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/bloodaltar" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json b/src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json new file mode 100644 index 00000000..7988cf44 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json @@ -0,0 +1,5 @@ +{ + "parent": "forge:item/bucket_drip", + "loader": "forge:bucket", + "fluid": "bloodmagic:test_fluid" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soulforge.json b/src/main/resources/assets/bloodmagic/models/item/soulforge.json new file mode 100644 index 00000000..3b715b5e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soulforge.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/soulforge" +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/_constants.json b/src/main/resources/assets/bloodmagic/recipes/_constants.json deleted file mode 100644 index 4685f9ef..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/_constants.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockGlass" - }, - "name": "BLOCKGLASS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockIron" - }, - "name": "BLOCKIRON" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "cobblestone" - }, - "name": "COBBLESTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - }, - "name": "DUSTGLOWSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "name": "DUSTREDSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "name": "DYEGREEN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "name": "DYEPURPLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - }, - "name": "DYEYELLOW" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "gemDiamond" - }, - "name": "GEMDIAMOND" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "glowstone" - }, - "name": "GLOWSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotGold" - }, - "name": "INGOTGOLD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "name": "INGOTIRON" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "nuggetGold" - }, - "name": "NUGGETGOLD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plankWood" - }, - "name": "PLANKWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickWood" - }, - "name": "STICKWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stone" - }, - "name": "STONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "string" - }, - "name": "STRING" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "torch" - }, - "name": "TORCH" - } -] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/_factories.json b/src/main/resources/assets/bloodmagic/recipes/_factories.json deleted file mode 100644 index 70d84b40..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/_factories.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ingredients": { - "orb": "WayofTime.bloodmagic.core.recipe.IngredientBloodOrbFactory" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json b/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json deleted file mode 100644 index 3f376baa..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/activation_crystal.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "bloodmagic:activation_crystal", - "data": 1 - }, - "ingredients": [ - { - "item": "minecraft:nether_star" - }, - { - "type": "bloodmagic:orb", - "orb": "bloodmagic:archmage" - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json b/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json deleted file mode 100644 index ab2cc8c2..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/alchemy_table.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "result": { - "item": "bloodmagic:alchemy_table" - }, - "pattern": [ - "sss", - "wbw", - "gog" - ], - "type": "forge:ore_shaped", - "key": { - "b": { - "item": "minecraft:blaze_rod" - }, - "s": { - "item": "#STONE" - }, - "w": { - "item": "#PLANKWOOD" - }, - "g": { - "item": "#INGOTGOLD" - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:weak" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json b/src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json deleted file mode 100644 index 29d26032..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/base_fluid_filter_0.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:base_fluid_filter", - "data": 0 - }, - "pattern": [ - "sgs", - "gfg", - "sgs" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STICKWOOD" - }, - "f": { - "item": "bloodmagic:component", - "data": 10 - }, - "g": { - "item": "minecraft:bucket" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json deleted file mode 100644 index 1655e10c..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_0.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:base_item_filter", - "data": 0 - }, - "pattern": [ - "sgs", - "gfg", - "sgs" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STICKWOOD" - }, - "f": { - "item": "bloodmagic:component", - "data": 10 - }, - "g": { - "item": "#BLOCKGLASS" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json deleted file mode 100644 index 6f529b90..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:base_item_filter", - "data": 1 - }, - "pattern": [ - "sgs", - "gfg", - "sgs" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STICKWOOD" - }, - "f": { - "item": "bloodmagic:component", - "data": 10 - }, - "g": { - "item": "#DYEYELLOW" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json deleted file mode 100644 index 8f82c2f4..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_2.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:base_item_filter", - "data": 2 - }, - "pattern": [ - "sgs", - "gfg", - "sgs" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STICKWOOD" - }, - "f": { - "item": "bloodmagic:component", - "data": 10 - }, - "g": { - "item": "#DYEGREEN" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json b/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json deleted file mode 100644 index a7459853..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/base_item_filter_3.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:base_item_filter", - "data": 3 - }, - "pattern": [ - "sgs", - "gfg", - "sgs" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STICKWOOD" - }, - "f": { - "item": "bloodmagic:component", - "data": 10 - }, - "g": { - "item": "#DYEPURPLE" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json deleted file mode 100644 index 885311d0..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_acceleration.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 9 - }, - "pattern": [ - "aba", - "cdc", - "aea" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "minecraft:bucket" - }, - "b": { - "item": "bloodmagic:slate", - "data": 3 - }, - "c": { - "item": "#INGOTGOLD" - }, - "d": { - "item": "bloodmagic:blood_rune", - "data": 1 - }, - "e": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json deleted file mode 100644 index 2c63c590..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_augcapacity.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 7 - }, - "pattern": [ - "aba", - "cdc", - "aea" - ], - "type": "minecraft:crafting_shaped", - "key": { - "a": { - "item": "minecraft:obsidian" - }, - "b": { - "item": "bloodmagic:slate", - "data": 3 - }, - "c": { - "item": "minecraft:bucket" - }, - "d": { - "item": "bloodmagic:blood_rune", - "data": 6 - }, - "e": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json deleted file mode 100644 index 1a354301..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_blank.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "pattern": [ - "aaa", - "bcb", - "aaa" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "item": "bloodmagic:slate", - "data": 0 - }, - "c": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:weak" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json deleted file mode 100644 index e3b8a876..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_capacity.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 6 - }, - "pattern": [ - "aba", - "bcb", - "ada" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "item": "minecraft:bucket" - }, - "c": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "d": { - "item": "bloodmagic:slate", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json deleted file mode 100644 index 7ebc7383..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_charging.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 10 - }, - "pattern": [ - "RsR", - "GrG", - "ReR" - ], - "type": "forge:ore_shaped", - "key": { - "R": { - "item": "#DUSTREDSTONE" - }, - "r": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "s": { - "item": "bloodmagic:slate", - "data": 3 - }, - "e": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - }, - "G": { - "item": "#GLOWSTONE" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json deleted file mode 100644 index 54b8c8c4..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_displacement.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 5 - }, - "pattern": [ - "aba", - "bcb", - "ada" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "item": "minecraft:water_bucket" - }, - "c": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "d": { - "item": "bloodmagic:slate", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json deleted file mode 100644 index 9f76c1a9..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_orb.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 8 - }, - "pattern": [ - "aba", - "cdc", - "aba" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:weak" - }, - "c": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "d": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json deleted file mode 100644 index 70e2c399..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_sacrifice.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 3 - }, - "pattern": [ - "aba", - "cdc", - "aea" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "item": "bloodmagic:slate", - "data": 1 - }, - "c": { - "item": "#INGOTGOLD" - }, - "d": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "e": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:apprentice" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json deleted file mode 100644 index af7f3bc3..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_selfsacrifice.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 4 - }, - "pattern": [ - "aba", - "cdc", - "aea" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "item": "bloodmagic:slate", - "data": 1 - }, - "c": { - "item": "#DUSTGLOWSTONE" - }, - "d": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "e": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:apprentice" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json b/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json deleted file mode 100644 index b161a4af..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_rune/blood_rune_speed.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_rune", - "data": 1 - }, - "pattern": [ - "aba", - "cdc", - "aba" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#STONE" - }, - "b": { - "item": "bloodmagic:slate", - "data": 0 - }, - "c": { - "item": "minecraft:sugar" - }, - "d": { - "item": "bloodmagic:blood_rune", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json deleted file mode 100644 index 756d43af..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_0.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 0 - }, - "pattern": [ - "RBR", - "G G", - "RRR" - ], - "type": "forge:ore_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "G": { - "item": "#BLOCKGLASS" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json deleted file mode 100644 index 5167464b..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_1.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 1 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json deleted file mode 100644 index fdf4337f..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_10.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 10 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 9 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json deleted file mode 100644 index 1aee0e5e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_11.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 11 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 10 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json deleted file mode 100644 index ac198a0d..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_12.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 12 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 11 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json deleted file mode 100644 index 7d3511fc..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_13.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 13 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 12 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json deleted file mode 100644 index 057ef84b..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_14.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 14 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 13 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json deleted file mode 100644 index 9c12b336..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_15.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 15 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 14 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json deleted file mode 100644 index 46e11986..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_2.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 2 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json deleted file mode 100644 index 62d52c96..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_3.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 3 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json deleted file mode 100644 index 88b6b83e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_4.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 4 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json deleted file mode 100644 index 8d6db55e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_5.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 5 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json deleted file mode 100644 index 9304a747..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_6.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 6 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 5 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json deleted file mode 100644 index 7decd313..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_7.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 7 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 6 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json deleted file mode 100644 index 8181bfae..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 8 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json b/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json deleted file mode 100644 index e1237382..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/blood_tank/blood_tank_9.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:blood_tank", - "data": 9 - }, - "pattern": [ - "RBR", - "T T", - "RRR" - ], - "type": "minecraft:crafting_shaped", - "key": { - "R": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "B": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "T": { - "item": "bloodmagic:blood_tank", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json deleted file mode 100644 index 636c8710..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_brick.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:decorative_brick", - "data": 1, - "count": 4 - }, - "pattern": [ - "aa", - "aa" - ], - "type": "minecraft:crafting_shaped", - "key": { - "a": { - "item": "bloodmagic:decorative_brick", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json b/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json deleted file mode 100644 index 9dc01b3e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/decorative_brick_bloodstone_tile.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "bloodmagic:decorative_brick", - "data": 0, - "count": 16 - }, - "ingredients": [ - { - "item": "#STONE" - }, - { - "item": "bloodmagic:blood_shard", - "data": 0 - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json deleted file mode 100644 index 90d39443..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_1", - "data": 1, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 6 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json deleted file mode 100644 index 31546399..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_1", - "data": 2, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json deleted file mode 100644 index e226f9a7..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_1", - "data": 0, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 5 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json deleted file mode 100644 index 18f5ad91..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_1", - "data": 4, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 9 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json deleted file mode 100644 index 8fa984f8..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_1", - "data": 3, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json deleted file mode 100644 index b67262f1..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 1, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json deleted file mode 100644 index aff6baa3..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 2, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json deleted file mode 100644 index 951faf2e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 0, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json deleted file mode 100644 index 3d1cc8d7..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 4, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json deleted file mode 100644 index 405fe6f5..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_smallbrick_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 3, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json deleted file mode 100644 index cc134c02..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_corrosive.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 6, - "count": 9 - }, - "pattern": [ - "scs", - "ccc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 1 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json deleted file mode 100644 index 305ed3a7..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_destructive.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 7, - "count": 9 - }, - "pattern": [ - "scs", - "ccc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 2 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json deleted file mode 100644 index a9aa5a77..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_raw.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 5, - "count": 9 - }, - "pattern": [ - "scs", - "ccc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 0 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json deleted file mode 100644 index 718356e2..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_steadfast.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 9, - "count": 9 - }, - "pattern": [ - "scs", - "ccc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 4 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json deleted file mode 100644 index caa3ad55..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tile_vengeful.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 8, - "count": 9 - }, - "pattern": [ - "scs", - "ccc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 3 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json deleted file mode 100644 index 46cc1293..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_corrosive.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 11, - "count": 9 - }, - "pattern": [ - "scs", - "coc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 1 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 1 - }, - "o": { - "item": "bloodmagic:item_demon_crystal", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json deleted file mode 100644 index 17bc0d0e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_destructive.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 12, - "count": 9 - }, - "pattern": [ - "scs", - "coc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 2 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 2 - }, - "o": { - "item": "bloodmagic:item_demon_crystal", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json deleted file mode 100644 index 0e6832a4..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_raw.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 10, - "count": 9 - }, - "pattern": [ - "scs", - "coc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 0 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 0 - }, - "o": { - "item": "bloodmagic:item_demon_crystal", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json deleted file mode 100644 index d221cbe8..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_steadfast.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 14, - "count": 9 - }, - "pattern": [ - "scs", - "coc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 4 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 4 - }, - "o": { - "item": "bloodmagic:item_demon_crystal", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json deleted file mode 100644 index 32fbbeec..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_2_tilespecial_vengeful.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_brick_2", - "data": 13, - "count": 9 - }, - "pattern": [ - "scs", - "coc", - "scs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 3 - }, - "c": { - "item": "bloodmagic:demon_brick_1", - "data": 3 - }, - "o": { - "item": "bloodmagic:item_demon_crystal", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json deleted file mode 100644 index a66bd811..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 6, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json deleted file mode 100644 index 5df3b1d9..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 7, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json deleted file mode 100644 index 49240f26..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 5, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json deleted file mode 100644 index 73845172..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 9, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json deleted file mode 100644 index 6c4cd7c5..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 8, - "count": 4 - }, - "pattern": [ - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json deleted file mode 100644 index 28bf109a..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_corrosive.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 1, - "count": 16 - }, - "ingredients": [ - { - "item": "bloodmagic:item_demon_crystal", - "data": 1 - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json deleted file mode 100644 index b190c56f..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_destructive.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 2, - "count": 16 - }, - "ingredients": [ - { - "item": "bloodmagic:item_demon_crystal", - "data": 2 - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json deleted file mode 100644 index aeb276b6..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_raw.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 0, - "count": 16 - }, - "ingredients": [ - { - "item": "bloodmagic:item_demon_crystal", - "data": 0 - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json deleted file mode 100644 index a03834f8..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_steadfast.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 4, - "count": 16 - }, - "ingredients": [ - { - "item": "bloodmagic:item_demon_crystal", - "data": 4 - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json deleted file mode 100644 index 86e63596..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_stone_vengeful.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_extras", - "data": 3, - "count": 16 - }, - "ingredients": [ - { - "item": "bloodmagic:item_demon_crystal", - "data": 3 - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json deleted file mode 100644 index 6396fc8f..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_corrosive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_light", - "data": 1, - "count": 5 - }, - "pattern": [ - "sgs", - "ggg", - "sgs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 6 - }, - "g": { - "item": "minecraft:glowstone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json deleted file mode 100644 index d7d99aa5..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_destructive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_light", - "data": 2, - "count": 5 - }, - "pattern": [ - "sgs", - "ggg", - "sgs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 7 - }, - "g": { - "item": "minecraft:glowstone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json deleted file mode 100644 index 8817d3ad..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_raw.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_light", - "data": 0, - "count": 5 - }, - "pattern": [ - "sgs", - "ggg", - "sgs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 5 - }, - "g": { - "item": "minecraft:glowstone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json deleted file mode 100644 index cf27ceb3..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_steadfast.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_light", - "data": 4, - "count": 5 - }, - "pattern": [ - "sgs", - "ggg", - "sgs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 9 - }, - "g": { - "item": "minecraft:glowstone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json deleted file mode 100644 index dfcf5d75..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_light_vengeful.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_light", - "data": 3, - "count": 5 - }, - "pattern": [ - "sgs", - "ggg", - "sgs" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 8 - }, - "g": { - "item": "minecraft:glowstone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json deleted file mode 100644 index 4448dbfe..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_corrosive.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_1", - "data": 1, - "count": 6 - }, - "pattern": [ - "ss", - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 6 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json deleted file mode 100644 index c7ae8aed..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_destructive.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_1", - "data": 2, - "count": 6 - }, - "pattern": [ - "ss", - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json deleted file mode 100644 index afee6a8d..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_raw.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_1", - "data": 0, - "count": 6 - }, - "pattern": [ - "ss", - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 5 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json deleted file mode 100644 index fbf5d7e0..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_steadfast.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_1", - "data": 4, - "count": 6 - }, - "pattern": [ - "ss", - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 9 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json deleted file mode 100644 index f9f079d6..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_1_vengeful.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_1", - "data": 3, - "count": 6 - }, - "pattern": [ - "ss", - "ss", - "ss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json deleted file mode 100644 index e74a80a8..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_corrosive.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_2", - "data": 1, - "count": 8 - }, - "pattern": [ - "ppp", - "pcp", - "ppp" - ], - "type": "minecraft:crafting_shaped", - "key": { - "p": { - "item": "bloodmagic:demon_pillar_1", - "data": 1 - }, - "c": { - "item": "bloodmagic:item_demon_crystal", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json deleted file mode 100644 index 8869bc5f..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_destructive.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_2", - "data": 2, - "count": 8 - }, - "pattern": [ - "ppp", - "pcp", - "ppp" - ], - "type": "minecraft:crafting_shaped", - "key": { - "p": { - "item": "bloodmagic:demon_pillar_1", - "data": 2 - }, - "c": { - "item": "bloodmagic:item_demon_crystal", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json deleted file mode 100644 index cdc818ac..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_raw.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_2", - "data": 0, - "count": 8 - }, - "pattern": [ - "ppp", - "pcp", - "ppp" - ], - "type": "minecraft:crafting_shaped", - "key": { - "p": { - "item": "bloodmagic:demon_pillar_1", - "data": 0 - }, - "c": { - "item": "bloodmagic:item_demon_crystal", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json deleted file mode 100644 index fab79b32..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_steadfast.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_2", - "data": 4, - "count": 8 - }, - "pattern": [ - "ppp", - "pcp", - "ppp" - ], - "type": "minecraft:crafting_shaped", - "key": { - "p": { - "item": "bloodmagic:demon_pillar_1", - "data": 4 - }, - "c": { - "item": "bloodmagic:item_demon_crystal", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json deleted file mode 100644 index 2b65e834..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_2_vengeful.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_2", - "data": 3, - "count": 8 - }, - "pattern": [ - "ppp", - "pcp", - "ppp" - ], - "type": "minecraft:crafting_shaped", - "key": { - "p": { - "item": "bloodmagic:demon_pillar_1", - "data": 3 - }, - "c": { - "item": "bloodmagic:item_demon_crystal", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json deleted file mode 100644 index 7f711d0c..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_cap_1", - "data": 1, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_pillar_1", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json deleted file mode 100644 index ba1305d5..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_1_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_cap_1", - "data": 0, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_pillar_1", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json deleted file mode 100644 index 4b1f890a..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_cap_2", - "data": 0, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_pillar_1", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json deleted file mode 100644 index 7a19d3cf..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_2_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_cap_2", - "data": 1, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_pillar_1", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json deleted file mode 100644 index a0f4f58e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_pillar_cap_3_steadfast.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_pillar_cap_3", - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_pillar_1", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json deleted file mode 100644 index 0d2824b6..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_corrosive.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_stairs_1", - "data": 1, - "count": 8 - }, - "pattern": [ - "s ", - "ss ", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 6 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json deleted file mode 100644 index 3e4ff319..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_1_raw.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_stairs_1", - "data": 0, - "count": 8 - }, - "pattern": [ - "s ", - "ss ", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 5 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json deleted file mode 100644 index 6d6a96f5..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_destructive.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_stairs_2", - "data": 0, - "count": 8 - }, - "pattern": [ - "s ", - "ss ", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json deleted file mode 100644 index 77527b86..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_2_vengeful.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_stairs_2", - "data": 1, - "count": 8 - }, - "pattern": [ - "s ", - "ss ", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json deleted file mode 100644 index 9fcdcbf9..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_stairs_3_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_stairs_3", - "count": 8 - }, - "pattern": [ - "s ", - "ss ", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 9 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json deleted file mode 100644 index 7b48b030..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 1, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json deleted file mode 100644 index e1b23e21..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 2, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json deleted file mode 100644 index 25b47dec..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 0, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json deleted file mode 100644 index e7967dfa..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 4, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json deleted file mode 100644 index 98d5ec24..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_brick_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 3, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_1", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json deleted file mode 100644 index 62ea247b..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 11, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 6 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json deleted file mode 100644 index e00e4198..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 12, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json deleted file mode 100644 index 791bdb5c..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 10, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 5 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json deleted file mode 100644 index 16a07805..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 14, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 9 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json deleted file mode 100644 index 33031c4d..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_large_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 13, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_extras", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json deleted file mode 100644 index 32bc21f7..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_corrosive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 6, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_2", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json deleted file mode 100644 index 2f4fbf18..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_destructive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 7, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_2", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json deleted file mode 100644 index 8c42b8c9..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_raw.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 5, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_2", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json deleted file mode 100644 index b94df87c..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_steadfast.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 9, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_2", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json deleted file mode 100644 index 15ecb860..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_wall_1_smallbrick_vengeful.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "bloodmagic:demon_wall_1", - "data": 8, - "count": 6 - }, - "pattern": [ - "sss", - "sss" - ], - "type": "minecraft:crafting_shaped", - "key": { - "s": { - "item": "bloodmagic:demon_brick_2", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/experience_tome.json b/src/main/resources/assets/bloodmagic/recipes/experience_tome.json deleted file mode 100644 index 12dbe103..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/experience_tome.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "result": { - "item": "bloodmagic:experience_tome" - }, - "pattern": [ - "ses", - "lbl", - "gog" - ], - "type": "forge:ore_shaped", - "key": { - "b": { - "item": "minecraft:enchanted_book" - }, - "s": { - "item": "#STRING" - }, - "e": { - "item": "minecraft:lapis_block" - }, - "g": { - "item": "#INGOTGOLD" - }, - "l": { - "item": "bloodmagic:slate", - "data": 2 - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/incense_altar.json b/src/main/resources/assets/bloodmagic/recipes/incense_altar.json deleted file mode 100644 index 4748c205..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/incense_altar.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:incense_altar" - }, - "pattern": [ - "s s", - "shs", - "coc" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STONE" - }, - "c": { - "item": "#COBBLESTONE" - }, - "h": { - "item": "minecraft:coal", - "data": 1 - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:weak" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json b/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json deleted file mode 100644 index e0311e8f..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/lava_crystal.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "result": { - "item": "bloodmagic:lava_crystal" - }, - "pattern": [ - "aba", - "bcb", - "ded" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#BLOCKGLASS" - }, - "b": { - "item": "minecraft:lava_bucket" - }, - "c": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:weak" - }, - "d": { - "item": "minecraft:obsidian" - }, - "e": { - "item": "#GEMDIAMOND" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json b/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json deleted file mode 100644 index 361f9ed3..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/mimic_nohitbox.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:mimic", - "data": 0, - "count": 4 - }, - "pattern": [ - "b b", - " r ", - "bob" - ], - "type": "minecraft:crafting_shaped", - "key": { - "b": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "r": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json deleted file mode 100644 index a14fa6e0..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/mimic_solidclear.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "result": { - "item": "bloodmagic:mimic", - "data": 2, - "count": 4 - }, - "pattern": [ - "bsb", - "srs", - "bob" - ], - "type": "forge:ore_shaped", - "key": { - "b": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "r": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "s": { - "item": "#BLOCKGLASS" - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json deleted file mode 100644 index 7db4b442..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/mimic_solidlight.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "result": { - "item": "bloodmagic:mimic", - "data": 3, - "count": 2 - }, - "pattern": [ - "bnb", - "trt", - "bob" - ], - "type": "forge:ore_shaped", - "key": { - "b": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "r": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "t": { - "item": "#TORCH" - }, - "n": { - "item": "#GLOWSTONE" - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json b/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json deleted file mode 100644 index 4c281089..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/mimic_solidopaque.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "result": { - "item": "bloodmagic:mimic", - "data": 1, - "count": 4 - }, - "pattern": [ - "bsb", - "srs", - "bob" - ], - "type": "forge:ore_shaped", - "key": { - "b": { - "item": "bloodmagic:decorative_brick", - "data": 0 - }, - "r": { - "item": "bloodmagic:blood_rune", - "data": 0 - }, - "s": { - "item": "#STONE" - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json deleted file mode 100644 index e82cd67e..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/pack_sacrifice.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "result": { - "item": "bloodmagic:pack_sacrifice" - }, - "pattern": [ - "aba", - "cdc", - "aea" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#BLOCKGLASS" - }, - "b": { - "item": "minecraft:bucket" - }, - "c": { - "item": "#INGOTIRON" - }, - "d": { - "item": "minecraft:leather_chestplate" - }, - "e": { - "item": "bloodmagic:slate", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json b/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json deleted file mode 100644 index 138ba293..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/pack_self_sacrifice.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "result": { - "item": "bloodmagic:pack_self_sacrifice" - }, - "pattern": [ - "aba", - "cdc", - "aea" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#BLOCKGLASS" - }, - "b": { - "item": "minecraft:bucket" - }, - "c": { - "item": "minecraft:flint" - }, - "d": { - "item": "minecraft:leather_chestplate" - }, - "e": { - "item": "bloodmagic:slate", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json deleted file mode 100644 index 2898208a..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidian.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 6, - "count": 4 - }, - "ingredients": [ - { - "item": "minecraft:obsidian" - }, - { - "item": "minecraft:obsidian" - }, - { - "item": "minecraft:obsidian" - }, - { - "item": "minecraft:obsidian" - }, - { - "type": "bloodmagic:orb", - "orb": "bloodmagic:archmage" - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json deleted file mode 100644 index e235db72..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_obsidiantile.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 7, - "count": 4 - }, - "ingredients": [ - { - "item": "bloodmagic:path", - "data": 6 - }, - { - "item": "bloodmagic:path", - "data": 6 - }, - { - "item": "bloodmagic:path", - "data": 6 - }, - { - "item": "bloodmagic:path", - "data": 6 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json b/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json deleted file mode 100644 index 0503ed1c..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_stone.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 2, - "count": 4 - }, - "ingredients": [ - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "item": "#STONE" - }, - { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json deleted file mode 100644 index 5cf9c223..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_stonetile.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 3, - "count": 4 - }, - "ingredients": [ - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "item": "bloodmagic:path", - "data": 2 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json deleted file mode 100644 index fcb33fd3..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_wood.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 0, - "count": 4 - }, - "ingredients": [ - { - "item": "#PLANKWOOD" - }, - { - "item": "#PLANKWOOD" - }, - { - "item": "#PLANKWOOD" - }, - { - "item": "#PLANKWOOD" - }, - { - "type": "bloodmagic:orb", - "orb": "bloodmagic:apprentice" - } - ], - "type": "forge:ore_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json deleted file mode 100644 index 90b26af1..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_woodtile.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 1, - "count": 4 - }, - "ingredients": [ - { - "item": "bloodmagic:path", - "data": 0 - }, - { - "item": "bloodmagic:path", - "data": 0 - }, - { - "item": "bloodmagic:path", - "data": 0 - }, - { - "item": "bloodmagic:path", - "data": 0 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json deleted file mode 100644 index 86e114b7..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 4, - "count": 4 - }, - "ingredients": [ - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "item": "bloodmagic:path", - "data": 2 - }, - { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json b/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json deleted file mode 100644 index 2b66ed18..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/path/path_wornstonetile.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:path", - "data": 5, - "count": 4 - }, - "ingredients": [ - { - "item": "bloodmagic:path", - "data": 4 - }, - { - "item": "bloodmagic:path", - "data": 4 - }, - { - "item": "bloodmagic:path", - "data": 4 - }, - { - "item": "bloodmagic:path", - "data": 4 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json deleted file mode 100644 index 17bfdac9..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_imperfect.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_controller", - "data": 1 - }, - "pattern": [ - "aba", - "bcb", - "aba" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "minecraft:obsidian" - }, - "b": { - "item": "#STONE" - }, - "c": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:weak" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json deleted file mode 100644 index d712efbe..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_inverted.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_controller", - "data": 2 - }, - "ingredients": [ - { - "item": "bloodmagic:ritual_controller", - "data": 0 - }, - { - "item": "minecraft:redstone_torch" - }, - { - "item": "bloodmagic:slate", - "data": 0 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json deleted file mode 100644 index 74e1458c..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_controller", - "data": 0 - }, - "pattern": [ - "aba", - "bcb", - "aba" - ], - "type": "minecraft:crafting_shaped", - "key": { - "a": { - "item": "minecraft:obsidian" - }, - "b": { - "item": "bloodmagic:ritual_stone", - "data": 0 - }, - "c": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:magician" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json b/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json deleted file mode 100644 index 5b55815a..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_controller_master_alt.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_controller", - "data": 0 - }, - "ingredients": [ - { - "item": "bloodmagic:ritual_controller", - "data": 2 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json deleted file mode 100644 index 9b48c652..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_0.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_diviner", - "data": 0 - }, - "pattern": [ - "dfd", - "ase", - "dwd" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "bloodmagic:inscription_tool", - "data": 4 - }, - "s": { - "item": "#STICKWOOD" - }, - "d": { - "item": "#GEMDIAMOND" - }, - "e": { - "item": "bloodmagic:inscription_tool", - "data": 3 - }, - "f": { - "item": "bloodmagic:inscription_tool", - "data": 2 - }, - "w": { - "item": "bloodmagic:inscription_tool", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json b/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json deleted file mode 100644 index ca45383a..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_diviner_1.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_diviner", - "data": 1 - }, - "pattern": [ - " S ", - "tdt", - " S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "S": { - "item": "bloodmagic:slate", - "data": 3 - }, - "t": { - "item": "bloodmagic:inscription_tool", - "data": 5 - }, - "d": { - "item": "bloodmagic:ritual_diviner", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json b/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json deleted file mode 100644 index cbf3f52a..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_reader.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_reader" - }, - "pattern": [ - "gog", - "isi", - " s " - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "bloodmagic:slate", - "data": 3 - }, - "g": { - "item": "#BLOCKGLASS" - }, - "i": { - "item": "#INGOTGOLD" - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json deleted file mode 100644 index 7e321bb2..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_blank.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_stone", - "data": 0, - "count": 4 - }, - "pattern": [ - "aba", - "bcb", - "aba" - ], - "type": "minecraft:crafting_shaped", - "key": { - "a": { - "item": "minecraft:obsidian" - }, - "b": { - "item": "bloodmagic:slate", - "data": 1 - }, - "c": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:apprentice" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json b/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json deleted file mode 100644 index 439ad7d2..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/ritual_stone_reset.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "result": { - "item": "bloodmagic:ritual_stone", - "data": 0 - }, - "ingredients": [ - { - "item": "bloodmagic:ritual_stone", - "data": 32767 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json b/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json deleted file mode 100644 index f622ef14..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/sacrificial_dagger.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:sacrificial_dagger", - "data": 0 - }, - "pattern": [ - "aaa", - " ba", - "c a" - ], - "type": "forge:ore_shaped", - "key": { - "a": { - "item": "#BLOCKGLASS" - }, - "b": { - "item": "#INGOTGOLD" - }, - "c": { - "item": "#INGOTIRON" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/soul_forge.json b/src/main/resources/assets/bloodmagic/recipes/soul_forge.json deleted file mode 100644 index 7dfd9961..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/soul_forge.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "bloodmagic:soul_forge" - }, - "pattern": [ - "i i", - "sgs", - "sos" - ], - "type": "forge:ore_shaped", - "key": { - "s": { - "item": "#STONE" - }, - "g": { - "item": "#INGOTGOLD" - }, - "i": { - "item": "#INGOTIRON" - }, - "o": { - "item": "#BLOCKIRON" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/soul_snare.json b/src/main/resources/assets/bloodmagic/recipes/soul_snare.json deleted file mode 100644 index 20a518c5..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/soul_snare.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "bloodmagic:soul_snare", - "data": 0, - "count": 4 - }, - "pattern": [ - "sis", - "iri", - "sis" - ], - "type": "forge:ore_shaped", - "key": { - "r": { - "item": "#DUSTREDSTONE" - }, - "s": { - "item": "#STRING" - }, - "i": { - "item": "#INGOTIRON" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposer.json b/src/main/resources/assets/bloodmagic/recipes/teleposer.json deleted file mode 100644 index 388d0153..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/teleposer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "result": { - "item": "bloodmagic:teleposer" - }, - "pattern": [ - "ggg", - "efe", - "ggg" - ], - "type": "forge:ore_shaped", - "key": { - "e": { - "item": "minecraft:ender_pearl" - }, - "f": { - "item": "bloodmagic:teleposition_focus", - "data": 0 - }, - "g": { - "item": "#INGOTGOLD" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json deleted file mode 100644 index 16212c4f..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "bloodmagic:teleposition_focus", - "data": 2 - }, - "ingredients": [ - { - "item": "bloodmagic:teleposition_focus", - "data": 1 - }, - { - "item": "bloodmagic:blood_shard", - "data": 0 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json b/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json deleted file mode 100644 index 9be6ba08..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/teleposition_focus_3.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "bloodmagic:teleposition_focus", - "data": 3 - }, - "ingredients": [ - { - "item": "bloodmagic:teleposition_focus", - "data": 2 - }, - { - "item": "bloodmagic:blood_shard", - "data": 1 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json b/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json deleted file mode 100644 index d540e3e4..00000000 --- a/src/main/resources/assets/bloodmagic/recipes/upgrade_trainer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "result": { - "item": "bloodmagic:upgrade_trainer", - "data": 0 - }, - "pattern": [ - "ngn", - "ioi", - "ngn" - ], - "type": "forge:ore_shaped", - "key": { - "g": { - "item": "#INGOTGOLD" - }, - "i": { - "item": "#INGOTIRON" - }, - "n": { - "item": "#NUGGETGOLD" - }, - "o": { - "type": "bloodmagic:orb", - "orb": "bloodmagic:master" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/corridor1.json b/src/main/resources/assets/bloodmagic/schematics/corridor1.json deleted file mode 100644 index 7e60e3f4..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/corridor1.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "dungeonWeight": 4, - "structureMap": { - "bloodmagic:Corridor1": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "west": [ - { - "x": 0, - "y": 0, - "z": 3 - } - ], - "south": [ - { - "x": 3, - "y": 0, - "z": 6 - } - ], - "north": [ - { - "x": 3, - "y": 0, - "z": 0 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 5, - "y": 3, - "z": 7 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/hallchest1.json b/src/main/resources/assets/bloodmagic/schematics/hallchest1.json deleted file mode 100644 index 43d78664..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/hallchest1.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "structureMap": { - "bloodmagic:HallChest1": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "west": [ - { - "x": 0, - "y": 0, - "z": 4 - } - ], - "east": [ - { - "x": 11, - "y": 0, - "z": 4 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 12, - "y": 5, - "z": 9 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/rawbuilding1.json b/src/main/resources/assets/bloodmagic/schematics/rawbuilding1.json deleted file mode 100644 index 007753c7..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/rawbuilding1.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "dungeonWeight": 4, - "structureMap": { - "bloodmagic:Building1": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "south": [ - { - "x": 7, - "y": 0, - "z": 14 - }, - { - "x": 4, - "y": 8, - "z": 14 - } - ], - "north": [ - { - "x": 4, - "y": 8, - "z": 0 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 15, - "y": 13, - "z": 15 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/schematics.json b/src/main/resources/assets/bloodmagic/schematics/schematics.json deleted file mode 100644 index 2f91ff04..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/schematics.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "bloodmagic:corridor1", - "bloodmagic:hallchest1", - "bloodmagic:rawbuilding1" -] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag b/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag deleted file mode 100644 index e3b2e255..00000000 --- a/src/main/resources/assets/bloodmagic/shaders/beam-broken.frag +++ /dev/null @@ -1,10 +0,0 @@ - uniform sampler2D bgl_RenderedTexture; - uniform int time; - - void main() { - vec2 texcoord = vec2(gl_TexCoord[0]); - vec4 color = texture2D(bgl_RenderedTexture, texcoord); - float r = sin(texcoord.x * 6.0 - 1.5 + sin(texcoord.y - float(time) / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; - - gl_FragColor = vec4(min(1 - r, color.r * gl_Color.r), min(1 - r, color.g * gl_Color.g), color.b * gl_Color.b, color.a * gl_Color.a); - } diff --git a/src/main/resources/assets/bloodmagic/shaders/beam.frag b/src/main/resources/assets/bloodmagic/shaders/beam.frag deleted file mode 100644 index 2ccc5dcd..00000000 --- a/src/main/resources/assets/bloodmagic/shaders/beam.frag +++ /dev/null @@ -1,12 +0,0 @@ - uniform sampler2D bgl_RenderedTexture; - uniform int time; - - void main() { - vec2 texcoord = vec2(gl_TexCoord[0]); - vec4 color = texture2D(bgl_RenderedTexture, texcoord); - - float gs = (color.r + color.g + color.b) / 3.0; - float r = sin(texcoord.x * 6.0 - 1.5 + sin(texcoord.y - float(time) / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2; - - gl_FragColor = vec4(gs, gs, max(gs, r), gl_Color.a); - } diff --git a/src/main/resources/assets/bloodmagic/structures/building1.nbt b/src/main/resources/assets/bloodmagic/structures/building1.nbt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/resources/assets/bloodmagic/structures/corridor1.nbt b/src/main/resources/assets/bloodmagic/structures/corridor1.nbt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/resources/assets/bloodmagic/structures/hallchest1.nbt b/src/main/resources/assets/bloodmagic/structures/hallchest1.nbt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/accelerationrune.png b/src/main/resources/assets/bloodmagic/textures/block/accelerationrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/accelerationrune.png rename to src/main/resources/assets/bloodmagic/textures/block/accelerationrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/airritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/airritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/airritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/airritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/altarcapacityrune.png b/src/main/resources/assets/bloodmagic/textures/block/altarcapacityrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/altarcapacityrune.png rename to src/main/resources/assets/bloodmagic/textures/block/altarcapacityrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/bettercapacityrune.png b/src/main/resources/assets/bloodmagic/textures/block/bettercapacityrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/bettercapacityrune.png rename to src/main/resources/assets/bloodmagic/textures/block/bettercapacityrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/blankrune.png b/src/main/resources/assets/bloodmagic/textures/block/blankrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/blankrune.png rename to src/main/resources/assets/bloodmagic/textures/block/blankrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/largebloodstonebrick.png b/src/main/resources/assets/bloodmagic/textures/block/bloodlight.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/largebloodstonebrick.png rename to src/main/resources/assets/bloodmagic/textures/block/bloodlight.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/bloodsocket.png b/src/main/resources/assets/bloodmagic/textures/block/bloodsocket.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/bloodsocket.png rename to src/main/resources/assets/bloodmagic/textures/block/bloodsocket.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/bloodstonebrick.png b/src/main/resources/assets/bloodmagic/textures/block/bloodstonebrick.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/bloodstonebrick.png rename to src/main/resources/assets/bloodmagic/textures/block/bloodstonebrick.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/bloodtank.png b/src/main/resources/assets/bloodmagic/textures/block/bloodtank.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/bloodtank.png rename to src/main/resources/assets/bloodmagic/textures/block/bloodtank.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/chargingrune.png b/src/main/resources/assets/bloodmagic/textures/block/chargingrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/chargingrune.png rename to src/main/resources/assets/bloodmagic/textures/block/chargingrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dislocationrune.png b/src/main/resources/assets/bloodmagic/textures/block/dislocationrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dislocationrune.png rename to src/main/resources/assets/bloodmagic/textures/block/dislocationrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick1_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick2_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_brick3_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_eye_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_metal_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillar_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarbottom_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarheart_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillarspecial_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_pillartop_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_polished_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_smallbrick_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_stone_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tile_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_c.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_c.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_c.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_c.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_d.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_d.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_d.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_d.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_s.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_s.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_s.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_s.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_v.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_v.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/dungeon/dungeon_tilespecial_v.png rename to src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_v.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/duskritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/duskritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/duskritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/duskritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/earthritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/earthritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/earthritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/earthritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/efficiencyrune.png b/src/main/resources/assets/bloodmagic/textures/block/efficiencyrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/efficiencyrune.png rename to src/main/resources/assets/bloodmagic/textures/block/efficiencyrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/empty.png b/src/main/resources/assets/bloodmagic/textures/block/empty.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/empty.png rename to src/main/resources/assets/bloodmagic/textures/block/empty.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/emptysocket.png b/src/main/resources/assets/bloodmagic/textures/block/emptysocket.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/emptysocket.png rename to src/main/resources/assets/bloodmagic/textures/block/emptysocket.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/etherealopaquemimic.png b/src/main/resources/assets/bloodmagic/textures/block/etherealopaquemimic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/etherealopaquemimic.png rename to src/main/resources/assets/bloodmagic/textures/block/etherealopaquemimic.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/fireritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/fireritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/fireritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/fireritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/imperfectritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/imperfectritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/imperfectritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/imperfectritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/largebloodstonebrick.png b/src/main/resources/assets/bloodmagic/textures/block/largebloodstonebrick.png new file mode 100644 index 0000000000000000000000000000000000000000..4935a71f7a3de42d611fa81e58785ed83dae8781 GIT binary patch literal 598 zcmV-c0;&CpP)WFU8GbZ8()Nlj2>E@cM*00Fv5L_t(2&jrCjj$=g- z1ki}ctZ%zVFmn4XFcx`{v-cGq&bWS9 z)%#IQ$035u@8uG|)%>szVF3f4nM>OJmXwzWnD2voPo-dH1ygaM z3y83L6zXo21AaW}vdF;;$iiDPui%V76+zJsHl(%U)4q8C!Lw$N>8a-+Ppj8D0?U}1 zNA&_bwW=#)*;CZX=9G0Zp3+h`L- zgdE^tBGkZzu1L?$e@}~S(xHFOazNnw9urO9z<27#UXAI~!~Fez@5o2@)Q-qM+6bC_ k8Bx;&rwAMXz%LR11Mj3y9<}`@=l}o!07*qoM6N<$f*OSd$^ZZW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/lifeessenceflowing.png b/src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/lifeessenceflowing.png rename to src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/lifeessenceflowing.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/lifeessenceflowing.png.mcmeta rename to src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png.mcmeta diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/lifeessencestill.png b/src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/lifeessencestill.png rename to src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/lifeessencestill.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png.mcmeta similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/lifeessencestill.png.mcmeta rename to src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png.mcmeta diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/lightritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/lightritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/lightritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/lightritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/masterritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/masterritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/masterritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/masterritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/masterritualstone_inverted.png b/src/main/resources/assets/bloodmagic/textures/block/masterritualstone_inverted.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/masterritualstone_inverted.png rename to src/main/resources/assets/bloodmagic/textures/block/masterritualstone_inverted.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/obsidianbrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/obsidianbrickpath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/obsidianbrickpath.png rename to src/main/resources/assets/bloodmagic/textures/block/obsidianbrickpath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/obsidiantilepath.png b/src/main/resources/assets/bloodmagic/textures/block/obsidiantilepath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/obsidiantilepath.png rename to src/main/resources/assets/bloodmagic/textures/block/obsidiantilepath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/orbcapacityrune.png b/src/main/resources/assets/bloodmagic/textures/block/orbcapacityrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/orbcapacityrune.png rename to src/main/resources/assets/bloodmagic/textures/block/orbcapacityrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/phantomblock.png b/src/main/resources/assets/bloodmagic/textures/block/phantomblock.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/phantomblock.png rename to src/main/resources/assets/bloodmagic/textures/block/phantomblock.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/ritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/ritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/ritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/ritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/runeofsacrifice.png b/src/main/resources/assets/bloodmagic/textures/block/sacrificerune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/runeofsacrifice.png rename to src/main/resources/assets/bloodmagic/textures/block/sacrificerune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/runeofselfsacrifice.png b/src/main/resources/assets/bloodmagic/textures/block/selfsacrificerune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/runeofselfsacrifice.png rename to src/main/resources/assets/bloodmagic/textures/block/selfsacrificerune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/sentientmimic.png b/src/main/resources/assets/bloodmagic/textures/block/sentientmimic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/sentientmimic.png rename to src/main/resources/assets/bloodmagic/textures/block/sentientmimic.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/shardcluster.png b/src/main/resources/assets/bloodmagic/textures/block/shardcluster.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/shardcluster.png rename to src/main/resources/assets/bloodmagic/textures/block/shardcluster.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/shardclusterbrick.png b/src/main/resources/assets/bloodmagic/textures/block/shardclusterbrick.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/shardclusterbrick.png rename to src/main/resources/assets/bloodmagic/textures/block/shardclusterbrick.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/simpletranscircle.png b/src/main/resources/assets/bloodmagic/textures/block/simpletranscircle.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/simpletranscircle.png rename to src/main/resources/assets/bloodmagic/textures/block/simpletranscircle.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/solidclearmimic.png b/src/main/resources/assets/bloodmagic/textures/block/solidclearmimic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/solidclearmimic.png rename to src/main/resources/assets/bloodmagic/textures/block/solidclearmimic.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/solidlightmimic.png b/src/main/resources/assets/bloodmagic/textures/block/solidlightmimic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/solidlightmimic.png rename to src/main/resources/assets/bloodmagic/textures/block/solidlightmimic.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/solidopaquemimic.png b/src/main/resources/assets/bloodmagic/textures/block/solidopaquemimic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/solidopaquemimic.png rename to src/main/resources/assets/bloodmagic/textures/block/solidopaquemimic.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/soul_forge.png b/src/main/resources/assets/bloodmagic/textures/block/soul_forge.png new file mode 100644 index 0000000000000000000000000000000000000000..1001bb27463956baead83f2e067d2348b998d009 GIT binary patch literal 1502 zcmbVMeQeZZ94;He1SS(PIRQiIz-&mb?e%VJ%MNn%?zWq|ZHyT^C(Da5W(nPZ;T(w)_!xE4UpWBI;U#x;CFgAjt03Re#o}{x; z0oVablehy726!$=QVuGc3?z6SgeOTCi+fowPC2p(!eggRj0^X8y(H-+JfuB=^~t)y z$vjACi>CG%*7Hy-!)kyt6s=TIsuNvM98wHL4=F0lvT(+7Q5KY1Ju_aRdjY$FCawm8 zS5qW-G{ubg0Qn#t$O3jU8|8Rg5Vbq(9LmvV%>yKnMFYyl2LM3E@WTI19cDU(#rxzx zeUo@)He-Bye+taQ{W$`%IXs#Gu8NjLZvze|4M_VCT=*UapVj|45y?we6Ljm*hW>Ouifs!Pb?|i4KJC$!IOl^SGz2h1^?a3N$jIWDc5a21;M_pui- zDt#XJXyKe>`_?7>)1FN0smmC@PRYC=AHE)YGlgpUsCyiFr7U-;V6Ow~XU>N%mlyrM zDLG}{bI0$*qV(HE2SaU*Llw6!_D+oM1bc4cS%;{m*}r7&|LtbqN;AX_Ke5kr3{)R$ zovFXWsvDQ9N6KGquf8zMzR=&Zw!&3pnfADLzO&8VedGAJRVg0WpHal+__xz5K0CN* z@fy}Ld<|~P&G!zsX1E&m_E6E0$k2{cgA1SCaCb5eb+wc~G0T(mVf>Hl^Ax%dELqj? E587xe-v9sr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/soulforge.png b/src/main/resources/assets/bloodmagic/textures/block/soulforge.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/soulforge.png rename to src/main/resources/assets/bloodmagic/textures/block/soulforge.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/spectralblock.png b/src/main/resources/assets/bloodmagic/textures/block/spectralblock.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/spectralblock.png rename to src/main/resources/assets/bloodmagic/textures/block/spectralblock.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/speedrune.png b/src/main/resources/assets/bloodmagic/textures/block/speedrune.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/speedrune.png rename to src/main/resources/assets/bloodmagic/textures/block/speedrune.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/stonebrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/stonebrickpath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/stonebrickpath.png rename to src/main/resources/assets/bloodmagic/textures/block/stonebrickpath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/stonetilepath.png b/src/main/resources/assets/bloodmagic/textures/block/stonetilepath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/stonetilepath.png rename to src/main/resources/assets/bloodmagic/textures/block/stonetilepath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/teleposer_side.png b/src/main/resources/assets/bloodmagic/textures/block/teleposer_side.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/teleposer_side.png rename to src/main/resources/assets/bloodmagic/textures/block/teleposer_side.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/teleposer_top.png b/src/main/resources/assets/bloodmagic/textures/block/teleposer_top.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/teleposer_top.png rename to src/main/resources/assets/bloodmagic/textures/block/teleposer_top.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/waterritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/waterritualstone.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/waterritualstone.png rename to src/main/resources/assets/bloodmagic/textures/block/waterritualstone.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/woodbrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/woodbrickpath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/woodbrickpath.png rename to src/main/resources/assets/bloodmagic/textures/block/woodbrickpath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/woodtilepath.png b/src/main/resources/assets/bloodmagic/textures/block/woodtilepath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/woodtilepath.png rename to src/main/resources/assets/bloodmagic/textures/block/woodtilepath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/wornstonebrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/wornstonebrickpath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/wornstonebrickpath.png rename to src/main/resources/assets/bloodmagic/textures/block/wornstonebrickpath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/wornstonetilepath.png b/src/main/resources/assets/bloodmagic/textures/block/wornstonetilepath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/wornstonetilepath.png rename to src/main/resources/assets/bloodmagic/textures/block/wornstonetilepath.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/activationcrystalawakened.png b/src/main/resources/assets/bloodmagic/textures/item/activationcrystalawakened.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/activationcrystalawakened.png rename to src/main/resources/assets/bloodmagic/textures/item/activationcrystalawakened.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/activationcrystalcreative.png b/src/main/resources/assets/bloodmagic/textures/item/activationcrystalcreative.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/activationcrystalcreative.png rename to src/main/resources/assets/bloodmagic/textures/item/activationcrystalcreative.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/activationcrystalweak.png b/src/main/resources/assets/bloodmagic/textures/item/activationcrystalweak.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/activationcrystalweak.png rename to src/main/resources/assets/bloodmagic/textures/item/activationcrystalweak.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/airscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/airscribetool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/airscribetool.png rename to src/main/resources/assets/bloodmagic/textures/item/airscribetool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/airsigil.png b/src/main/resources/assets/bloodmagic/textures/item/airsigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/airsigil.png rename to src/main/resources/assets/bloodmagic/textures/item/airsigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/alchemic_liquid.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_liquid.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/alchemic_liquid.png rename to src/main/resources/assets/bloodmagic/textures/item/alchemic_liquid.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/alchemic_ribbon.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/alchemic_ribbon.png rename to src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/alchemic_vial.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/alchemic_vial.png rename to src/main/resources/assets/bloodmagic/textures/item/alchemic_vial.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/altarmaker.png b/src/main/resources/assets/bloodmagic/textures/item/altarmaker.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/altarmaker.png rename to src/main/resources/assets/bloodmagic/textures/item/altarmaker.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ampouleempty.png b/src/main/resources/assets/bloodmagic/textures/item/ampouleempty.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ampouleempty.png rename to src/main/resources/assets/bloodmagic/textures/item/ampouleempty.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ampoulefull.png b/src/main/resources/assets/bloodmagic/textures/item/ampoulefull.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ampoulefull.png rename to src/main/resources/assets/bloodmagic/textures/item/ampoulefull.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/antiseptic.png b/src/main/resources/assets/bloodmagic/textures/item/antiseptic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/antiseptic.png rename to src/main/resources/assets/bloodmagic/textures/item/antiseptic.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/apprenticebloodorb.png b/src/main/resources/assets/bloodmagic/textures/item/apprenticebloodorb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/apprenticebloodorb.png rename to src/main/resources/assets/bloodmagic/textures/item/apprenticebloodorb.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/arcaneashes.png b/src/main/resources/assets/bloodmagic/textures/item/arcaneashes.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/arcaneashes.png rename to src/main/resources/assets/bloodmagic/textures/item/arcaneashes.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/archmagebloodorb.png b/src/main/resources/assets/bloodmagic/textures/item/archmagebloodorb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/archmagebloodorb.png rename to src/main/resources/assets/bloodmagic/textures/item/archmagebloodorb.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/basemonstersoul.png b/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/basemonstersoul.png rename to src/main/resources/assets/bloodmagic/textures/item/basemonstersoul.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/basemonstersoul_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/basiccuttingfluid.png b/src/main/resources/assets/bloodmagic/textures/item/basiccuttingfluid.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/basiccuttingfluid.png rename to src/main/resources/assets/bloodmagic/textures/item/basiccuttingfluid.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/blackpudding.png b/src/main/resources/assets/bloodmagic/textures/item/blackpudding.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/blackpudding.png rename to src/main/resources/assets/bloodmagic/textures/item/blackpudding.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/blanksigil.png b/src/main/resources/assets/bloodmagic/textures/item/blanksigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/blanksigil.png rename to src/main/resources/assets/bloodmagic/textures/item/blanksigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/blankslate.png b/src/main/resources/assets/bloodmagic/textures/item/blankslate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/blankslate.png rename to src/main/resources/assets/bloodmagic/textures/item/blankslate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/bloodlightsigil.png b/src/main/resources/assets/bloodmagic/textures/item/bloodlightsigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/bloodlightsigil.png rename to src/main/resources/assets/bloodmagic/textures/item/bloodlightsigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/bloodpack.png b/src/main/resources/assets/bloodmagic/textures/item/bloodpack.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/bloodpack.png rename to src/main/resources/assets/bloodmagic/textures/item/bloodpack.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/bouncesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/bouncesigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/bouncesigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/bouncesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/bouncesigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/bouncesigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/boundaxe_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundaxe_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/boundaxe_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/boundaxe_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/boundpickaxe_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundpickaxe_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/boundpickaxe_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/boundpickaxe_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/boundshovel_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundshovel_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/boundshovel_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/boundshovel_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/boundsword_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundsword_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/boundsword_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/boundsword_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/boundtool.png b/src/main/resources/assets/bloodmagic/textures/item/boundtool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/boundtool.png rename to src/main/resources/assets/bloodmagic/textures/item/boundtool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/bridgesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/bridgesigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/bridgesigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/bridgesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/bridgesigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/bridgesigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ceremonialdagger.png b/src/main/resources/assets/bloodmagic/textures/item/ceremonialdagger.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ceremonialdagger.png rename to src/main/resources/assets/bloodmagic/textures/item/ceremonialdagger.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/clawsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/clawsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/clawsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/clawsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/clawsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/clawsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/clawsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/clawsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/coagulant.png b/src/main/resources/assets/bloodmagic/textures/item/coagulant.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/coagulant.png rename to src/main/resources/assets/bloodmagic/textures/item/coagulant.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/coalsand.png b/src/main/resources/assets/bloodmagic/textures/item/coalsand.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/coalsand.png rename to src/main/resources/assets/bloodmagic/textures/item/coalsand.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/componentframeparts.png b/src/main/resources/assets/bloodmagic/textures/item/componentframeparts.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/componentframeparts.png rename to src/main/resources/assets/bloodmagic/textures/item/componentframeparts.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/compressionsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/compressionsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/compressionsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/compressionsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/compressionsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/compressionsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/corrosivecrystal.png b/src/main/resources/assets/bloodmagic/textures/item/corrosivecrystal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/corrosivecrystal.png rename to src/main/resources/assets/bloodmagic/textures/item/corrosivecrystal.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/crucibleupgrade.png b/src/main/resources/assets/bloodmagic/textures/item/crucibleupgrade.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/crucibleupgrade.png rename to src/main/resources/assets/bloodmagic/textures/item/crucibleupgrade.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/daggerofsacrifice.png b/src/main/resources/assets/bloodmagic/textures/item/daggerofsacrifice.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/daggerofsacrifice.png rename to src/main/resources/assets/bloodmagic/textures/item/daggerofsacrifice.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/dawnscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/dawnscribetool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/dawnscribetool.png rename to src/main/resources/assets/bloodmagic/textures/item/dawnscribetool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/defaultcrystal.png b/src/main/resources/assets/bloodmagic/textures/item/defaultcrystal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/defaultcrystal.png rename to src/main/resources/assets/bloodmagic/textures/item/defaultcrystal.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/demonbloodshard.png b/src/main/resources/assets/bloodmagic/textures/item/demonbloodshard.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/demonbloodshard.png rename to src/main/resources/assets/bloodmagic/textures/item/demonbloodshard.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/demonicteleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/demonicteleposerfocus.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/demonicteleposerfocus.png rename to src/main/resources/assets/bloodmagic/textures/item/demonicteleposerfocus.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/demonslate.png b/src/main/resources/assets/bloodmagic/textures/item/demonslate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/demonslate.png rename to src/main/resources/assets/bloodmagic/textures/item/demonslate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/demonwillgauge.png b/src/main/resources/assets/bloodmagic/textures/item/demonwillgauge.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/demonwillgauge.png rename to src/main/resources/assets/bloodmagic/textures/item/demonwillgauge.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/destructivecrystal.png b/src/main/resources/assets/bloodmagic/textures/item/destructivecrystal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/destructivecrystal.png rename to src/main/resources/assets/bloodmagic/textures/item/destructivecrystal.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/divinationsigil.png b/src/main/resources/assets/bloodmagic/textures/item/divinationsigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/divinationsigil.png rename to src/main/resources/assets/bloodmagic/textures/item/divinationsigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/duskscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/duskscribetool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/duskscribetool.png rename to src/main/resources/assets/bloodmagic/textures/item/duskscribetool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/earthscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/earthscribetool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/earthscribetool.png rename to src/main/resources/assets/bloodmagic/textures/item/earthscribetool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/elementalsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/elementalsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/elementalsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/elementalsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/elementalsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/elementalsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/enhancedteleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/enhancedteleposerfocus.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/enhancedteleposerfocus.png rename to src/main/resources/assets/bloodmagic/textures/item/enhancedteleposerfocus.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/etherealslate.png b/src/main/resources/assets/bloodmagic/textures/item/etherealslate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/etherealslate.png rename to src/main/resources/assets/bloodmagic/textures/item/etherealslate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/experiencebook.png b/src/main/resources/assets/bloodmagic/textures/item/experiencebook.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/experiencebook.png rename to src/main/resources/assets/bloodmagic/textures/item/experiencebook.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/explosivepowder.png b/src/main/resources/assets/bloodmagic/textures/item/explosivepowder.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/explosivepowder.png rename to src/main/resources/assets/bloodmagic/textures/item/explosivepowder.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/firescribetool.png b/src/main/resources/assets/bloodmagic/textures/item/firescribetool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/firescribetool.png rename to src/main/resources/assets/bloodmagic/textures/item/firescribetool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/fluidrouterfilterexact.png b/src/main/resources/assets/bloodmagic/textures/item/fluidrouterfilterexact.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/fluidrouterfilterexact.png rename to src/main/resources/assets/bloodmagic/textures/item/fluidrouterfilterexact.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/goldsand.png b/src/main/resources/assets/bloodmagic/textures/item/goldsand.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/goldsand.png rename to src/main/resources/assets/bloodmagic/textures/item/goldsand.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/growthsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/growthsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/growthsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/growthsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/growthsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/growthsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/growthsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/growthsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/harvestgoddesssigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/harvestgoddesssigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/harvestgoddesssigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/harvestgoddesssigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/hastesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/hastesigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/hastesigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/hastesigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/hastesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/hastesigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/hastesigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/hastesigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/icarusscroll_activated.png b/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/icarusscroll_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/icarusscroll_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/icarusscroll_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/icarusscroll_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/icarusscroll_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/icesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/icesigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/icesigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/icesigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/icesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/icesigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/icesigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/icesigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/information.png b/src/main/resources/assets/bloodmagic/textures/item/information.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/information.png rename to src/main/resources/assets/bloodmagic/textures/item/information.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/infusedslate.png b/src/main/resources/assets/bloodmagic/textures/item/infusedslate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/infusedslate.png rename to src/main/resources/assets/bloodmagic/textures/item/infusedslate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/inputroutingfocus.png b/src/main/resources/assets/bloodmagic/textures/item/inputroutingfocus.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/inputroutingfocus.png rename to src/main/resources/assets/bloodmagic/textures/item/inputroutingfocus.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ironsand.png b/src/main/resources/assets/bloodmagic/textures/item/ironsand.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ironsand.png rename to src/main/resources/assets/bloodmagic/textures/item/ironsand.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/item_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/item_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/item_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/item_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/itemrouterfilterexact.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterexact.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/itemrouterfilterexact.png rename to src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterexact.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/itemrouterfilterignorenbt.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterignorenbt.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/itemrouterfilterignorenbt.png rename to src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterignorenbt.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/itemrouterfiltermoditems.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfiltermoditems.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/itemrouterfiltermoditems.png rename to src/main/resources/assets/bloodmagic/textures/item/itemrouterfiltermoditems.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/itemrouterfilteroredict.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilteroredict.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/itemrouterfilteroredict.png rename to src/main/resources/assets/bloodmagic/textures/item/itemrouterfilteroredict.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/lavacrystal.png b/src/main/resources/assets/bloodmagic/textures/item/lavacrystal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/lavacrystal.png rename to src/main/resources/assets/bloodmagic/textures/item/lavacrystal.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/lavasigil.png b/src/main/resources/assets/bloodmagic/textures/item/lavasigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/lavasigil.png rename to src/main/resources/assets/bloodmagic/textures/item/lavasigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/lifebucket.png b/src/main/resources/assets/bloodmagic/textures/item/lifebucket.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/lifebucket.png rename to src/main/resources/assets/bloodmagic/textures/item/lifebucket.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/livingboots.png b/src/main/resources/assets/bloodmagic/textures/item/livingboots.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/livingboots.png rename to src/main/resources/assets/bloodmagic/textures/item/livingboots.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/livinghelmet.png b/src/main/resources/assets/bloodmagic/textures/item/livinghelmet.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/livinghelmet.png rename to src/main/resources/assets/bloodmagic/textures/item/livinghelmet.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/livingleggings.png b/src/main/resources/assets/bloodmagic/textures/item/livingleggings.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/livingleggings.png rename to src/main/resources/assets/bloodmagic/textures/item/livingleggings.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/livingplate.png b/src/main/resources/assets/bloodmagic/textures/item/livingplate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/livingplate.png rename to src/main/resources/assets/bloodmagic/textures/item/livingplate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/magicianbloodorb.png b/src/main/resources/assets/bloodmagic/textures/item/magicianbloodorb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/magicianbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/item/magicianbloodorb.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/mailorder.png b/src/main/resources/assets/bloodmagic/textures/item/mailorder.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/mailorder.png rename to src/main/resources/assets/bloodmagic/textures/item/mailorder.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/masterbloodorb.png b/src/main/resources/assets/bloodmagic/textures/item/masterbloodorb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/masterbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/item/masterbloodorb.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/miningsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/miningsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/miningsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/miningsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/miningsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/miningsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/miningsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/miningsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/mundanelengtheningcatalyst.png b/src/main/resources/assets/bloodmagic/textures/item/mundanelengtheningcatalyst.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/mundanelengtheningcatalyst.png rename to src/main/resources/assets/bloodmagic/textures/item/mundanelengtheningcatalyst.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/mundanepowercatalyst.png b/src/main/resources/assets/bloodmagic/textures/item/mundanepowercatalyst.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/mundanepowercatalyst.png rename to src/main/resources/assets/bloodmagic/textures/item/mundanepowercatalyst.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/neurotoxin.png b/src/main/resources/assets/bloodmagic/textures/item/neurotoxin.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/neurotoxin.png rename to src/main/resources/assets/bloodmagic/textures/item/neurotoxin.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/noderouter.png b/src/main/resources/assets/bloodmagic/textures/item/noderouter.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/noderouter.png rename to src/main/resources/assets/bloodmagic/textures/item/noderouter.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/plantfibres.png b/src/main/resources/assets/bloodmagic/textures/item/plantfibres.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/plantfibres.png rename to src/main/resources/assets/bloodmagic/textures/item/plantfibres.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/plantoil.png b/src/main/resources/assets/bloodmagic/textures/item/plantoil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/plantoil.png rename to src/main/resources/assets/bloodmagic/textures/item/plantoil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/potionflask_outline.png b/src/main/resources/assets/bloodmagic/textures/item/potionflask_outline.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/potionflask_outline.png rename to src/main/resources/assets/bloodmagic/textures/item/potionflask_outline.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/potionflask_overlay.png b/src/main/resources/assets/bloodmagic/textures/item/potionflask_overlay.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/potionflask_overlay.png rename to src/main/resources/assets/bloodmagic/textures/item/potionflask_overlay.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/potionflask_underlay.png b/src/main/resources/assets/bloodmagic/textures/item/potionflask_underlay.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/potionflask_underlay.png rename to src/main/resources/assets/bloodmagic/textures/item/potionflask_underlay.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentaffinity.png b/src/main/resources/assets/bloodmagic/textures/item/reagentaffinity.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentaffinity.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentaffinity.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentair.png b/src/main/resources/assets/bloodmagic/textures/item/reagentair.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentair.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentair.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentbinding.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbinding.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentbinding.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentbinding.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentbloodlight.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbloodlight.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentbloodlight.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentbloodlight.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentbounce.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbounce.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentbounce.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentbounce.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentbridge.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbridge.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentbridge.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentbridge.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentclaw.png b/src/main/resources/assets/bloodmagic/textures/item/reagentclaw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentclaw.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentclaw.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentcompression.png b/src/main/resources/assets/bloodmagic/textures/item/reagentcompression.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentcompression.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentcompression.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentfastminer.png b/src/main/resources/assets/bloodmagic/textures/item/reagentfastminer.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentfastminer.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentfastminer.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentfrost.png b/src/main/resources/assets/bloodmagic/textures/item/reagentfrost.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentfrost.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentfrost.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentgrowth.png b/src/main/resources/assets/bloodmagic/textures/item/reagentgrowth.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentgrowth.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentgrowth.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagenthaste.png b/src/main/resources/assets/bloodmagic/textures/item/reagenthaste.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagenthaste.png rename to src/main/resources/assets/bloodmagic/textures/item/reagenthaste.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentholding.png b/src/main/resources/assets/bloodmagic/textures/item/reagentholding.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentholding.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentholding.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentlava.png b/src/main/resources/assets/bloodmagic/textures/item/reagentlava.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentlava.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentlava.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentmagnetism.png b/src/main/resources/assets/bloodmagic/textures/item/reagentmagnetism.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentmagnetism.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentmagnetism.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentseverance.png b/src/main/resources/assets/bloodmagic/textures/item/reagentseverance.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentseverance.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentseverance.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentsight.png b/src/main/resources/assets/bloodmagic/textures/item/reagentsight.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentsight.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentsight.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentsuppression.png b/src/main/resources/assets/bloodmagic/textures/item/reagentsuppression.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentsuppression.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentsuppression.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentteleposition.png b/src/main/resources/assets/bloodmagic/textures/item/reagentteleposition.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentteleposition.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentteleposition.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagenttransposition.png b/src/main/resources/assets/bloodmagic/textures/item/reagenttransposition.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagenttransposition.png rename to src/main/resources/assets/bloodmagic/textures/item/reagenttransposition.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentvoid.png b/src/main/resources/assets/bloodmagic/textures/item/reagentvoid.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentvoid.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentvoid.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentwater.png b/src/main/resources/assets/bloodmagic/textures/item/reagentwater.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentwater.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentwater.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reagentwind.png b/src/main/resources/assets/bloodmagic/textures/item/reagentwind.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reagentwind.png rename to src/main/resources/assets/bloodmagic/textures/item/reagentwind.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reinforcedslate.png b/src/main/resources/assets/bloodmagic/textures/item/reinforcedslate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reinforcedslate.png rename to src/main/resources/assets/bloodmagic/textures/item/reinforcedslate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/reinforcedteleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/reinforcedteleposerfocus.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/reinforcedteleposerfocus.png rename to src/main/resources/assets/bloodmagic/textures/item/reinforcedteleposerfocus.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ritual_dismantler.png b/src/main/resources/assets/bloodmagic/textures/item/ritual_dismantler.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ritual_dismantler.png rename to src/main/resources/assets/bloodmagic/textures/item/ritual_dismantler.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ritualdiviner.png b/src/main/resources/assets/bloodmagic/textures/item/ritualdiviner.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ritualdiviner.png rename to src/main/resources/assets/bloodmagic/textures/item/ritualdiviner.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/ritualtinkerer.png b/src/main/resources/assets/bloodmagic/textures/item/ritualtinkerer.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/ritualtinkerer.png rename to src/main/resources/assets/bloodmagic/textures/item/ritualtinkerer.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sacrificeplate.png b/src/main/resources/assets/bloodmagic/textures/item/sacrificeplate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sacrificeplate.png rename to src/main/resources/assets/bloodmagic/textures/item/sacrificeplate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sacrificialdagger.png b/src/main/resources/assets/bloodmagic/textures/item/sacrificialdagger.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sacrificialdagger.png rename to src/main/resources/assets/bloodmagic/textures/item/sacrificialdagger.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/saltpeter.png b/src/main/resources/assets/bloodmagic/textures/item/saltpeter.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/saltpeter.png rename to src/main/resources/assets/bloodmagic/textures/item/saltpeter.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sanguinebook.png b/src/main/resources/assets/bloodmagic/textures/item/sanguinebook.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sanguinebook.png rename to src/main/resources/assets/bloodmagic/textures/item/sanguinebook.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/seersigil.png b/src/main/resources/assets/bloodmagic/textures/item/seersigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/seersigil.png rename to src/main/resources/assets/bloodmagic/textures/item/seersigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/selfsacrificeplate.png b/src/main/resources/assets/bloodmagic/textures/item/selfsacrificeplate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/selfsacrificeplate.png rename to src/main/resources/assets/bloodmagic/textures/item/selfsacrificeplate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_corrosive_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_corrosive_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_corrosive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_corrosive_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_destructive_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_destructive_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_destructive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_destructive_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_steadfast_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_steadfast_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_steadfast_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_steadfast_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_vengeful_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_vengeful_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_vengeful_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarmourgem_vengeful_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientarrow.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarrow.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientarrow.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientarrow.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientboots.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientboots.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientboots.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientboots_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientboots_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientboots_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientboots_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientboots_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientboots_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientboots_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientboots_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientboots_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientboots_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientboots_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientboots_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_0.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive_pulling_0.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_0.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive_pulling_1.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_1.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_corrosive_pulling_2.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_2.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_0.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive_pulling_0.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_0.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive_pulling_1.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_1.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_destructive_pulling_2.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_2.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_0.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_pulling_0.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_0.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_pulling_1.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_1.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_pulling_2.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_2.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_0.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast_pulling_0.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_0.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast_pulling_1.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_1.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_steadfast_pulling_2.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_2.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_0.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful_pulling_0.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_0.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful_pulling_1.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_1.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientbow_vengeful_pulling_2.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_2.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentienthelmet.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentienthelmet.png rename to src/main/resources/assets/bloodmagic/textures/item/sentienthelmet.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentienthelmet_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientleggings.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientleggings.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientleggings.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientleggings_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientleggings_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientleggings_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientleggings_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientleggings_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientleggings_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientleggings_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientleggings_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientleggings_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientleggings_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientleggings_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientleggings_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientplate.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientplate.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientplate.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientplate_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientplate_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientplate_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientplate_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientplate_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientplate_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientplate_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientplate_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientplate_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sentientplate_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sentientplate_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/sentientplate_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/set_area.png b/src/main/resources/assets/bloodmagic/textures/item/set_area.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/set_area.png rename to src/main/resources/assets/bloodmagic/textures/item/set_area.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/set_will_types.png b/src/main/resources/assets/bloodmagic/textures/item/set_will_types.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/set_will_types.png rename to src/main/resources/assets/bloodmagic/textures/item/set_will_types.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sheatheditem.png b/src/main/resources/assets/bloodmagic/textures/item/sheatheditem.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sheatheditem.png rename to src/main/resources/assets/bloodmagic/textures/item/sheatheditem.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofholding.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofholding.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofholding.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofholding.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofmagnetism_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofmagnetism_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofmagnetism_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofmagnetism_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofseverance_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofseverance_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofseverance_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofseverance_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofsuppression_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofsuppression_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigilofsuppression_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigilofsuppression_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sigiloverlay.png b/src/main/resources/assets/bloodmagic/textures/item/sigiloverlay.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sigiloverlay.png rename to src/main/resources/assets/bloodmagic/textures/item/sigiloverlay.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulaxe.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulaxe.png rename to src/main/resources/assets/bloodmagic/textures/item/soulaxe.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulaxe_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulaxe_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulaxe_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulaxe_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulaxe_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulaxe_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulaxe_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulaxe_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulaxe_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulaxe_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulaxe_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulaxe_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemcommon.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemcommon.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemcommon.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemcommon_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgrand.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgrand.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgrand.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgrand_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgreater.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgreater.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgreater.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemgreater_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemlesser.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemlesser.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemlesser.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgemlesser_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgempetty.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgempetty.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgempetty.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgempetty_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgempetty_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgempetty_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgempetty_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgempetty_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgempetty_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgempetty_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgempetty_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgempetty_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulgempetty_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulgempetty_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulgempetty_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulpickaxe.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulpickaxe.png rename to src/main/resources/assets/bloodmagic/textures/item/soulpickaxe.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulpickaxe_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulshovel.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulshovel.png rename to src/main/resources/assets/bloodmagic/textures/item/soulshovel.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulshovel_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulshovel_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulshovel_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulshovel_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulshovel_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulshovel_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulshovel_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulshovel_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulshovel_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulshovel_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulshovel_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulshovel_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsnare.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsnare.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsnare.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsnare_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsnare_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsnare_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsnare_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsnare_destructive.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsnare_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsnare_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsnare_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsnare_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsnare_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsnare_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsnare_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_activated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_corrosive_activated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_corrosive_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_corrosive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_corrosive_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_destructive_activated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_destructive_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_destructive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_destructive_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_steadfast_activated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_steadfast_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_steadfast_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_steadfast_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_vengeful_activated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_vengeful_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/soulsword_vengeful_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/soulsword_vengeful_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/steadfastcrystal.png b/src/main/resources/assets/bloodmagic/textures/item/steadfastcrystal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/steadfastcrystal.png rename to src/main/resources/assets/bloodmagic/textures/item/steadfastcrystal.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/sulfur.png b/src/main/resources/assets/bloodmagic/textures/item/sulfur.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/sulfur.png rename to src/main/resources/assets/bloodmagic/textures/item/sulfur.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/teleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/teleposerfocus.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/teleposerfocus.png rename to src/main/resources/assets/bloodmagic/textures/item/teleposerfocus.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/telepositionsigil.png b/src/main/resources/assets/bloodmagic/textures/item/telepositionsigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/telepositionsigil.png rename to src/main/resources/assets/bloodmagic/textures/item/telepositionsigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/transcendentbloodorb.png b/src/main/resources/assets/bloodmagic/textures/item/transcendentbloodorb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/transcendentbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/item/transcendentbloodorb.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/transpositionsigil.png b/src/main/resources/assets/bloodmagic/textures/item/transpositionsigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/transpositionsigil.png rename to src/main/resources/assets/bloodmagic/textures/item/transpositionsigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/upgradetome.png b/src/main/resources/assets/bloodmagic/textures/item/upgradetome.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/upgradetome.png rename to src/main/resources/assets/bloodmagic/textures/item/upgradetome.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/upgradetrainer.png b/src/main/resources/assets/bloodmagic/textures/item/upgradetrainer.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/upgradetrainer.png rename to src/main/resources/assets/bloodmagic/textures/item/upgradetrainer.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/vengefulcrystal.png b/src/main/resources/assets/bloodmagic/textures/item/vengefulcrystal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/vengefulcrystal.png rename to src/main/resources/assets/bloodmagic/textures/item/vengefulcrystal.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/voidsigil.png b/src/main/resources/assets/bloodmagic/textures/item/voidsigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/voidsigil.png rename to src/main/resources/assets/bloodmagic/textures/item/voidsigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/warriorsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/warriorsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/warriorsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/warriorsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/warriorsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/warriorsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/waterscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/waterscribetool.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/waterscribetool.png rename to src/main/resources/assets/bloodmagic/textures/item/waterscribetool.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/watersigil.png b/src/main/resources/assets/bloodmagic/textures/item/watersigil.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/watersigil.png rename to src/main/resources/assets/bloodmagic/textures/item/watersigil.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/weakbloodorb.png b/src/main/resources/assets/bloodmagic/textures/item/weakbloodorb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/weakbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/item/weakbloodorb.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/weakbloodshard.png b/src/main/resources/assets/bloodmagic/textures/item/weakbloodshard.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/weakbloodshard.png rename to src/main/resources/assets/bloodmagic/textures/item/weakbloodshard.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/windsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/windsigil_activated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/windsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/item/windsigil_activated.png diff --git a/src/main/resources/assets/bloodmagic/textures/items/windsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/windsigil_deactivated.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/windsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/item/windsigil_deactivated.png diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/basearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/basearray.png index cacd90470cd7d605931c0b2a6e6ecd15f0049286..1d3709bead01e5b15cf54428d95ddb7c6e5054ca 100644 GIT binary patch literal 35529 zcmV(#K;*xPP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3^wlH|D6W&d*(-x3Ib7`Pk^q*?Evm*3~WJ+iV& zRg$c`m8yuyNOw92yy4zA@p%6C|9X%A`Jev@`K;%0<=VmMS&N_XE?}bwQuIT#weSTL|?pFVFYioW#`TG8<{qf(GYAm^g zdhzv&XRYPt=N8YavY*R^rux~MYdm;i zNSVK6{>iW9v;7<;OW?xy=fdyzR^80s_vZIg``iEhH@Ec_lPw0vZ}JiTPCkD9^cV4{ z{rmg$`TZXkD!;z}=~#b$kNE!i_vzQi#6PX5{qf21_Z8)q?myl0Z>RdctG(~DUwmBs zD%^AV-qg>n?4NkyaJTl`3V$m9Wqz*v&&{89_H%O5>o_MGHTcUNB4_!AE3DAN8=n1r zhRG7I_{7Th7-vlTca5{S<4m6U<)0(Gv8Fq%)Hwc$tR#LNf2}3#&%O7@&Crnh6?kO~ zTr4P8KYxzj|MLIx=U*=LzUoW}XZy8RtSc(fEW?xYE3e`}!u#D*PW0GY9DZ%|@Bi~) z6DOGWHaBjtpW}0hk;5Odl{{y)KlA50KROob`d)x7;8fY0VVHSE{M96!ItdU6nGW2zj@ojQkgT^aGIS38iQ zo>RVZ&L!8}@|}B0MGY&Z7R_+4sa`eLQfqDXuDzvpwcJXpt+l)LJKpKQOy?VYyxV=> zz4M`+D|g=Ac}4Fdjx?^3M;UdragRO`pLxwZ%dE4_d-fGqIu?q&%Briad-W$gh|+UC z`6*9*+H*hsMbzH(UT=QOTi^EHZ~t{_-&6hbsr~ij{{5+i@2SOoQ0d@H{dH>my4Igd z1kFkI%s8=l1x~zr0tj^U%+40BD|&JRtvT>JXhn{!GJ7~Hcw(I3^@Nz;@aydUIJv() zx8rL6SLYW0dUA(H_y6PM4v+3HC-<-C_BW@tbOv*u*w(^hZ|a#)KVI;(9$VLq{`2=S z?)Pl(bOZC-#soc}O2^GQ__R91J4#;fY<&()SC8*vMd!=WO>T(GJfZi(EvC`OJG%Fp zM!7pnkJmBTvmP*k&zhySle3s-e|vmZdcyhg8;lye_4I&;T>0juSAOsDuE^nrt4vPq zIYQ(($2}h|&L^-Z^NEPY^R{O_0pVSl?PX=0Pi<5Ct53P|$gF`6kK08Y_q?B{d#Sf$ z)o)IZ4a@JWwRet@1MX!-9B!$To4#{NYw-R%&j-tXzqO7xwWB|?UeCMk{^oX9JuE;T_t;i$D-GUPCn8Ydi0y>HdSMZ}HwU)Wg0piWHEg-YSNQFx9K!D@Wa`Cg0j zt%$|*;*MHc-U9j>UR3(U=3I3=q2zuex$!NtJXgmYT@~d;PeOJw3l7~6YfUip-_^)yp& zxv;J|F1FPp3=2D#7pLXM&a>wJo)c|hS?gkPWw41{CiR1Bw8*Dr1Z%C)T1K3?@5Qm# zH{G*_w=e$Q2l`mwu%25}m3q9#XeEXFO>sU)&UdOc+=yKoNH&ifz+4L@Djs92gD_qgVLR!q~=*P9VTj5JbvvNLEkP&GWfx$!T$3E3$0F3n2%Pt#UuBV-OMwb`4xM_fy_i zhz_0_p>tZ?OyjN3g;`msd8wUS@U*bkjXSOrJvnc_RfHnMHIM5p*y71urC1-8fwSzG z=^CH$R%Kw~vBIM|mVY+G$G^4D`#a_ldEKV+LcH)I1>@Xsw$Bw);j{UWbc`4p<`D%$ zX7BXOGq9=sy$~=&2+o16U`Y$Rmca`cp9=72j~aTzzo6XreZB|oy1Etkz%|CR*qrpF z`rO?7J5uVJZH(?(ZC<^g6*$CG;Dxv^BqVVqcH+PSJc!J578O^2r=5P24*R~Udh6~6 zgyez)_EbmD=j6Zvw!q^zE$qPa9M9Dd$jtUP&bBmU2qb`H*KPJ$UtE~fR}d4h5^oxq z<~2Ewip%5--*{mtQ4vL~Bcguh!)Xm%V137mb3U2nWA(es=YunR3|h;p-h$ZDTIOj!iRx(4-^L(1j}Fv5FGEHcR!#wvsW8)3aJ?NM0lhW74d z7r623MUbz(>J#@i3f2r0@oUjh;dt-s`7S!vyUfE?4_AH0G*$+KO_%#(z%JAju!o^9 zNXAu=+_x_7J3vFh#0ahE4CjM@AV)p0&rS8XU$6oUx8UBxBi^V(i}Zpv*%`j4_}!Uw zvol;fKJFl(_`ruZ;S-!{;#^SBT)EnLV~BC01wSl{!MvR5K||trfTJ8)s}lr(Vum_! zz6T$Xap4Ou2(043hh_vLI^s4w6U9RpP~XW-AXqq798F$N+PLHis5#K+0PS59nd}u>!!9oVl zahxEyI&wbyWQ}Rgr4Q6CKM$yf^L;s^JVgMSLeMb><1T6nuW{qo#)vaM`N9@rUmE}6 ztl8kQ6i&PfAQx|fb)B^joa-9_e#j+SgGD(f-Ud{ACVj$NAcMS}9l=1Q7xedaB_QP# zbR}=pm0TEWcpuOYcaGv!Y_Tlp1Ri6)5VeODExe&1ECJ%c%-D2npA@D8tD#9)qzM!U z&th6|VE_bPwvV6#MnQ6W{jh@IX@vjqJ@wQUCLWvw5aI-}068D>$PqACTx$qekbE{L zBLDym2q~(NxldS7Y?!_iHwoC_v#(sb5ai;}Yd0(!&W_^2q6uyEzz-@EA!bb|J zFmNDMF*+L0seytT<`M@4vl<&ZO_|(+5BD2wb*%w^50&8bkr9Y*;(}}g?&%f%&dQ1~ zB>`xI8sJtiRoDo$1`R(E zTls!_-jPAo&&upCHs``>@eeCO#_qs{;0DLQfJCk{rJyjw!I8Y7;BT=07=;L5#(UHP z#%b`Af-Ay@zH(KFCWs7#4m`xK-GWT^3ABpr&jfHS$Ub`tt;Q%zsvk7II~RW?nc~S<{)$lF?}t2J3Kc z#{$>p%y&5A#l*10)cT-nm>xMP@duaDmu7MOh{S@x2aL zj_2n95@38icxha3q(Zl91NsLjcZWux3*$b8M`;D5NtgBFu+RuhGe9-6Nu21x zVFGGU)yTc0QJ9ZrK4g0LPs0`rZNSXKP+|jX!y#U5c^6~j!Qh3+$v6Np4-icthgr}o z;TRCi8>|LR@frpv5zA*K1aH6x1Cj>WeI}+Iv-C#9=eU6gt`)jUT@N+ZXC?ZU>=Gm|FJ`gn!-c!#3Q*FQ=Xggx^iNj!MW7U%inT$+Sqd%xNj1z|^ z=8XxFMMw^#Jlk4LQ+g*Lge$}hI`%f(#qRFC0c)PfM=tn@H{g5EQ7-IW)v9u?2N$W| zYhcPcRQ5rDagjHq7Fvt9<6ej7WfB}W|*rO;jEL>)6eIAl-po2=2>0|>j z0#kqz8vJ_PzPzC!GIQx&`oT{20)H7z|2EEu0RfWs3(4Br9aL-3PARYn95|8*EPe2) zDXxiCLpZtTV*vwhGy#ps1~+gTDkUljV8d@=MIJB%x*H%M!C)vV5FgBgsa?K2+*4a1 zw$;>4ph^83mApkrtOKjwOfd9I*NjSl76SemS-?tTVvhF`21rubQLW96iLnMGcU%${ z+{xV`?JHxOlSLC)a1Og;+%POqOw9Imbg%_>7JP-bN{GuPSAzj#o(;NP5IQh{*$T0y*HXuNe(e1X;Bq2b8{ zjrWBn0kl@Ex#^?A$kyPRPIlx$_dal?t3CM1ai9Q5wwQ;N z@rrQbHtSiCKtRDPTAX?Y#hF_$M9lSB%*iE}C>&b~BJ4*8+a?SdZY%?LQw-pa46KVB zaTI>zZ!dHa{{|~HTv=vRk1hkZ@$H*%jH8YYN>1Bl;|DrC3*L%Q!)q{rFW`P+COJv= z22vDJDI6_`Bc~HSj4DCi>o|fgH;wOFk>rVNJojs^=wk{`5kChb`iDTv*Brpxuy9Q?lMS=ft*G6bj*|%`}XkP_HuqQ5x>lULC-rs}C=E$c> z>~R7jJDz(aQ#VM-3a%YXbQy5O)?{plyi3{ct&)-lDTEPoj(W$igvn^y4aYQJq6*yaW1@nK=aQjC-CV+Hi1FM=XRHtO zlaq#$ilKLtg$prjBZF~H*^f`I_7Q_Fue|Py(s4U znyI>tgrb@+yK%=Sf__X|UDRl! z2k8~k9iUa9HSkbA3v4!j0Hb_XR0}RZ%8A0EDlhgX;oneTKG4AL2Ck1-6CFC>UqVeR z3?L~2dU0?sWI?YXRa{%J++zqAlcCbmZ-fJ0 zfbYY7`s3NI)E|kjggT!c$RZ~@P@+^(z@f3g6$5$Gvi4?3J~vNj)(@CoN*g%fPb zFooaro_4?!-_&JC_j<#G$hIrPCRr-fi|b)%-q_H;yG1qS75csnE^-E}QOi4enlafw zRPMiFa_ur6hAGR2>e=COUH7Q?#ut;wjwTrc%5-DKQ@Io8J9a1sApN7_1S%t6F*#hX5u>q%eBLib5PLTorxJ@{a}Hxee7mdEp&qKLANZ&j+sE zWfoD#^S~FvScu=|pa`>i7?+iT8Y;AWVZTjq7s(Hzedt6@ktGv&CRiY5HGk0BFd_*D z5cEVNeUK^^$O>9ZqC|-N?CIWgolnObK%LXln$PmJ;Sr0g4cBYkX0*pN5Nip9HeBf0 zETVZqV3uheEV{S@?DhJ|dvfux?*|!p00hlgHZnRu2a8SL1mxvFIxhH{c>k7;$gP#a zS3JJ?Yg2aCn6QmtZnke?Wm1Y6BaJYJ>uP50#hn-IXY;_XOb>7^%Bs4;t)@4!wcLW0i)q)wp_xRpt<6TUkNsA%ff@~Xft_{F@ zEkk})NVzSMMHQH1Ltps2&<;5fD?ne+4)JyCZHG<_W12Es+qVp@@te!dyU&Fyf0N;* zJI|1z*|6+nh^jo-x#7K$Cd0MwR3zd42q1Tj1K-o|}s@39cZ5OF76{;7q=9we-B6eYj4 z3|+CD&D7j|&u*=(B`eK1bVuzEJY_X9o8H%0*Zaz|-VJr2DVP%WhTTGQqP!Tr8Rg`V zjWewd1G#$93am7eb4>c;KU_ zd?Voo8r?14eoc$h8Y|;>z{?wb0Y2>eei7Vi78wwsorVtL{vZt)(B~|2v$jrGft$QM zSL>J&X_Xra-@(9B4IXC!ieQC~7}yhN6C82h*dKe3FWkG2IoSIzKw1{K2w2gmZ5>&cBi-VocU7Q)N3NSRpDlIR<Y9fXZs$>6Pxk7E)qiN7!QHm)H9ucBO0lzm)(OIm z+rU@_Z3yro0xK;MgUVFPSZbEG9T>Es&rFuzbleH#UH^v=VO%eE8Bl{8!kfEn%%DVX zC#3%P{xlHV4UWShHk=E70jFSO?!>0St{{65ZxgA8OUxAlzAYRwV+4yS9Gcz;dT>Nl zY~UHt&g-t2N)7XM&jgq@n90sb@Nk!wTX0kZ9!v}3aFT{EKlv+RU7em}9*P~GW^^%1-<&D}I4!G0pAJ4RY%cZe z-~@z=7nKhFUq)uI*{DduRc?z9z$=(&z!nHM=jYw1huNM%5t7bbY@Ov0sO%* z$#h}&Kx6KYA%>|-tsQZ)RHAI-a%zRsZ8D^mU6Wb?hR0=WuCHwM&PG_4S^luTpz9mh z73c_(WBCjw;kL?x_Vq9WTAW@#z^b-EXipwmWmmlpC@(a*+@9JZ1X4qJFo~@kV z9W=vGgTDD$^T@D%EJebZn1zaW1}%UZ;%CR;4f;Jx<2ZacHIxgw*Dp2_ws5X~S9Uk0 z1JHtwV(TDs`2}ZGAS{?iT#5gkCWJLhk8s_ZpxZQk0j$6<#7Yt?;NDRq+xVIUzaNll z`xJtL9O0iQ5Y3dxJ1ni^u(qQO_+yw1Z?gCSZ?d=kcp_vQj0iQEmNVh`L%*yU!}~x^ z%6yU8X)FWRY`{7Jw{g_S5=Xt;NFELqfwZi&q5TN6g^ufnoHf|$O7#I51O8;R!fyjFq$PpywBG|l}53c=Y>!Jw?O0pBE!wy zFKkhMAh^c1X&>1~3>m2Vy$)pDni>d?!8;I}@3T4-)4xsz(klk#2FVau;{* z>N0}2kjpz527wz`C66M@Rz|}JaGY>ssObIv$G8lqEysZ;VnZwd4|YI2J6XYTSU(vK zcK+U>t8PGU8tfR@892lB3HrLaV6ZoTj3+_~V6MpSkJ;xr(N z0SiVWdkrC4_HbM2m@pxHLdOtmg6hFdG~$DAKrLdi*`YXp(B8GZ>^d-z`$aA&`H!HY6*WJ z4MaK|yMo&EAeKED0n$#v>P%Pf4ucu2dN7YMywM^2>KPrpx`6{o@Cnm;54;q#HCTu~ zjT`RJBHLv7`r9m%O@{t1b3ThBvW8!F@)*$o`-f(Y!ucLZ1WIe_veg{CVTf$Rd#AZ% zHgRJB+k4WMcd@)pICU3?!-TRWCm=RliMRmwu?9F7i2Pc!2h#E_=1B1eX1lPta8Ijx zE&0yB#WbOd^*Lau4c};)ff^o=7ERLdoDEEdZ_Q4OXW=u`%`PA=)s~ZFoF9yG;yVtN z@0~l{fQuQ{!-sR+EuL6>#5+x>2d2fs^mpKcb|AcO3S^MEtb)UvuMsV*nP0Gf?A(Q| z5AZpg?qD#}WECu|+F6l=oln&!EGRHYr4AIK87jkL{MwGwb(kdwD*Qk=q)q822r+v{N_v$Xw2{ z-DDU=ldhYz3hj6d#C2oE-qi|Lpci@uyw!CZsd;qHPy;i$Ti&?#;*6fhw{Zsmwxkc-P&tj4p{Ko znw_ITD7vM%C%4AFEF&*CMNA`J2|w8_Kx}N>2^$ymBIm#syK+GPtJQC(&+etP)2DDD z1U99xW6;5P2m}n}dT}ZnAvH4)70=(TXe^U9M&yA$k$)pJ3ZJHQ&YF!SXG1=j=FjgEbwm1QJ9$ zuNN#7-Z7fi`nWZ-U=a8UG6+n!L=X%I;^r4Nv7y}RveY2=?5A4{{s>~u58E;Ca>W18 z8~Dw}Bml!@$mU+QeOQ2;6K(*na|uE~Y;oXY55$(ZX4^Ex?Hf=Q%76j%yi$OWk69gzi|oP+jYJ z@91#^%klGL-@er(7CE4OxZY+e`L^)a`r`NkI^k&zUlBM=5F7V&<||&@#JT&7o&odQ zVi1)-SO|Lt90}Eyr;g=`VmTi`y!FoquK}rb9RP-a-7;Tx8Py5g066gOc%L`z zg|KUAnTOMh+<>W0 zUSK6eVn=iWcvtKBH=7i=7{9p+yLAhuA~UPG6b+Tu^a zjM$O-Y4m+9Ud2|zwBe620OHwr1S}&LuieaM@17C*S^A#JaPJ0_V#h2}p92)qE+V5f z(6(3V3CgsP2?XiLgl? z+1Az9wj@s3bjHm`BiWW)f>=J0AyFu1dTY0o#zgn9`!aj>9})o;=5|y3Q4x?6%U17+MDo9l$v>e{IM4v`HPewkvC{^Ek6EZdstV>(iz) zKJ-nN%)w`+Vgm^xmwk~_#aCaHN@ET6V z9W6lOtn5hG(MlM9HKmc#jxghat>T$^*s@{3yxe_W7vMG;=>q;=!_v;<9uF?G?<^(? zXhBoDEYV#+eYO%_gh9Yz;90@cm{J=RA{M>ymI%^FW_rW1tY9$cVbm!bjKQ<=8>G=f zKP-Y}T0;qZvdPeLvsx~PhntUy^)72q$Gz(tt}Q<7z9RQ-k&7>9+4%7hoe%5p&YeYG zP~#T%Scn}V#Uqzm4)Z4XkLU3podKXPLPs9Cm|}IlzI~H1wef1R!{l#0U2D70%62&1 zQD;}wz681cnAFDdN(MCoiNN*II5iGR#0$oV)7HuNYf+y)PT<)kdKM+d-QbK#o!UUI zQ=*y5*RX`aRO|)V%Vx9>XidS=9Y8BG7dB`;*!nMOb&3XC+|wT@Sq`7e2PI>!4Q_u> z^2zVpZYZB~h?1>iOJfJI=CQtv+8iIL_Yfe31TrmyO-Xco+>ducN~&Uw-RI_X-{H%FLV=kZA&mlPI`J=hC1eJUs<n3C6*v_)pI~a% z;#oZjluq&7v8)|H10-PKWGQ1DeHz#qI91>|w6Y_BWQuj~o7oqqW()|9I%fpb))BTrrZp7va*Tj% zw6jg=(NZbGa+F3uBM_ot(-1oTZbt`bEyM8zdYi)M0z*dYVCeIJy#!4}aVEpGg#I)# z#6LfpYLxf>m9)o^m0?NhPTJQP%v|pw79|{?toijisci?b{yVPDb-B#OAo?=J5&u^Xr z6Jh_RMV`mdOwaNwJ%abi(2QN}=roJ?nO>ImG$RWjPJobb(Na$cyip+YHS7_(d;R2V zuGhqOW0Q8i#(5d}WE6A8PO#J+Q#yF5E$ef(1>8{74n4uQri8Z8glGFmNkec^q}{wjw-vD=BwHdXM}J%0$I zX-p%@Q_w~3_WIOjSTPi!*g*DAV&42aAM%N8EKU%_w(+&y7*@~Of3W8cU0|$@h`NbX z7gYDZTsiGafp;t&wJwGaxRfKMG)DVelM_llDevsaJj0DUw*99C@iBk5AnUV#mgCOc z`}4jF+FfY2FK^^+76e7c)E0wM)e^!k>Y4+)3x)(sVm@E&N3CF)6Xt#6T|tvWTQv937u6Xb!O3lyo3!<1uE(zE0%RdM`kJIg+DxuolSc zYvLY2Wtr*xG*4ci(#MNE70KV1m1hW0!jp_SuouYuX=WSkw~Y|4c%Q|V0|l|!@@xD7 z<8Rkbu~I{g)Bf8*b@TFt$!o5xcBf$+m}6&VU(s}$;`C;4R3$prD`Q4VQeXIO#!^*qL?~!ddh0&N1eqxMIWuYyD z$0Lsalor}?i?{id7Ft#MEiD}0t3wojN*e9A180^`Nh3!Dd_2B2jp=fbP}(JprVSOn|pxqE&i4qK@z4E@h zvhV1c{j#6NV5s%7S{tswy*#`4HUi^c%cVe)o#Tf$c+(E`$|hezymyqVCQD+_7o*2| zQOv*5PMuQ%oTc4V9h};7E_+&=N#R;Agx9fImf4&ORYi`n8*TBQJ#(iz`0U#BX}|l6 zDVd*oUSx#bM$&dUZ+uHbsXyhsmu2zCr=FJ;8@rtMF33HtFmUv zWF70cJg)og*Usowqb&fAtKjTWy_=?AS2|3O{dT22{^IYiBm?;ETAwTZrxkIp*!&0XvCF@% z8S3r)RY+y#CZGU@<&%E~7i1Xd`15o6kdb4Wdr}lcf2E0^Whf~2MV%DwKo-8W4 zqZfZgXR!fInoWTs#j(99hsAdt<82Z&eu^(aBWw5hoB+PLe|j|zm(|z&6~Walr}wYd zInSRf>A)+V_Isu8b+&*1<2t(^WY;iN*X0&w^Mx%=dw5N}Ln|<~&tVZMhD)$`+rtaL zTma(^nsj5@F7nLo>J>LQleQrjjx7jqI1b3VyK*>A3TOx;7^aGMPGC3ibI9HZi1Aqt z=fDVEYr$ImAJ^D$4iN!0%6g9TimYT0WG%*?xaPl=X7jDq!<6%Pxn{Hf=FtDWH2;33 zUvj-$s{Sh1>Hph`HV4H#S>_nO7T70+IqmnOzu%L zn^gCh(%}e^ce=YsBlxYTDS%XbBWtUV3D?`!>@tixW{i?ki0*RW)_`kH#YujB4S=#< z3wqISyOV8E>cVdb0RHxkGCyGBaqE2NJ=zsbe6$RVU|AZ%W-~wyJ2>qK zgqQ)Or`-V6F*X?%=5R;nkWLU=XiZ50BY@AcWvmjs_BcIB3li|)fWka?Tq13Bwb-My z2eZ8IWn)5^M~Cz{QPida@qvvg*U~x9^yg7LIKDm5Z}&sN+Q3;5@34oYmGhX+g>-H* zxMnqv*49$Xk=Uzk%;pCk=cOA>)*(*EuK-q1plC|B1lSSm_q@+k=CJv%@0k94jl5X? zhE8D-gueh37TUa3yY1Qpcp2qd(!8Z8SjX0k zjn{PuU6U!r4VxWPokh$}WdhLz&cOMCh!n63z-9|wnFdL0asW2Kb8YiYxFd^G&ON5% zC$*Ec1i`f))Cj%oX#XoAD>gh#3H!Ys@Q{*6#-7CnmcMPT@;B|W}|ut_}byf zTqVNXlf*XZFL&3kS$jK|fyuU!9lghAI;9CdGEb1)(s}=r~8^7!!VA&RlgRK zum>ydCjQACf~C*r({S;Wo}<}r^kjk{cZNiF*N%8~j>ypk?FBts!?xDi138`VmqmaD zRBCa!co=em0pBI+mrN_#bcm@t?x(@bYUnnSw0mUq=h@>}8s_!|oMSLvt5sk#w(Qx$ zd|IHuJr+kHF6Wl6!i7p#DMa@nG(2-Z^(Ee6=;$PUKT*!3Pbe|65wJ zh1?+AbaGb19yx6d&gQ2}H4I2%I`I`8k%J!ipkT3uqohwK=^ER({}_*9I~KceoQn2m zK1RVy>dGG!ra35mkH@$^Qv)B1y)k4C|9R5Sj1B|B{anbKb!@n~kueSq>45V%qr*mD zXLRgA{AhZsAM+NvvzW@B3mChzEiSedrH+Sp&T)4K3gSM-9c@c-V(BO3lRj2%SL#|! z+HYN=I+M6!w6SBy2M?iJ-DVC!+k;D^?ZsfnXocp_#FS+A2WRyem;(F5N{sKol;?rh z9(!WSnfACf7-yAVeEL%C41Uaq*0jUX3!4CTbWGSXvXAenqTaFV2(23_O7ISGv&|+n z>iNn0TKlq+ko_GTBMwhPndTl?cVaA|mOxp%1`Le*Y88}IL6OVp~ES8oKGsPe5VRsHYqzU zZ%-9+K2&}8OrdKJomC}rgw(E(UlC|n4nL$Hb zwqSydyPbPr19FX>iQpL9fgFHS9Vj26DR1e?X)b1h7kg({%dSM-9lrXG8~EX*&Ssb# zs_($dkE1#& z4uphhxUupH_=WU2NIYvhuCW`UZyy%%nUf&^Ud}@Ji6__)y}Em36ZBd36fGxZwH*=O zW;>XSJ-<`5oXl&k3)s2`yzHT_@%{|o=!ag{nUm&B#(Yg5V6XaREERPcm=O$|e$0oi ztjM0;8AvgTvr^OjP5mlIX?HyGS<@1oYJU(e5TCW$Q*8TYYZFLGug?0<HnaMd8xRgdRoc$^-f6cf zoU0+fc6sB2m;cCrdhUWRTinyGb4Bu389$yI!hSfiog>(03@;e%@%AAGVnB0l;y0Q7 z*Rj=40RgVEwe8xR!qay1@|$#Rj$(0UqR~D~xHbGv;1PY{N!6V_gGWa?obW7~`j+tP zNR=b-A$Fg)A@ABl{K;UK&f$y(b_4)|6z#AD`jBl)9;M#U(y{9Ks|WF8j|{fk{O~XsuV^1aJF)9cpg+XW+7J!2Af(>4Ojyq-!WhPCsUwZQ3vB zx3dczsHS4u9%z?=(}vThZ1vbW_|YNDL+VF|*a)=pW`7zgB>Z)rV+4YCC)|XO3XKg_ zKWeOnOb!o4Ad<~JC0Y<{CouT>c0747FlkBa73^9ziJ2U{(PWqH{EVQ?hnetx#qSKt zZfW89nL*i|5)kaQ&B>XP_K{}i!~D=qZvQjv(ndlqv};y>O4C0hSch{evfcAgeo=#Jf0zKB>Y=XI&j9Ev_n{Bm1E8CuHXQ&BHvYKpW+k}cj`er*pO1e# z0Q&j@x7*64J*eHK4Q-J*FPsHf!Kc9tC`7VPz=7ApxhNc(wG#&aY^4OxfKq~uqje7l zyqm}+%hbQAyK^@VhXZnJpIfpE4u|q-zH`=s(f@UKdp~?;1S@KgcZc1Tt04-=T4`qMG)m?1D4yX zn6?%xx^Np~%Fhd>JN8p*0OUUKMXTpUjXc0W@dbrxxvk_z{^s+dlzR6q!BS-zS0r5x%qix!DoVJ=-7GcZ~Z}WV54aUB;e1 z0au_l;-w+jk1J!1*R(!jk4Ih{nO%<7!ke1w@8JUhaHxGJpswLylzX>v``DW5ln+)1 z%-NYOh+1RS__6qXhtENZ){!2cx8QRM4EOUEAY0hMRNnNM0LjI9_W6xYus|=8Oq*?9 z`*A{OIVybEbb?9WlV^>pI?(Ld&-93E-wH08H=F%yuTQBk|IEof*-livHB=Scx(;@H z*C|+gjiEGG>a1VU0irr0x;?D3v&RQ^i$ehR8vD`B&PHT+Pgt~hf0sIc6WIN76iU?ZZMmyDGs6o}rgq_u zs#)Ze;$a8UbD^N7CvMrd&5HNqh|15Sp~4;(VoT%w89d>`yNsvXHOJv+(86_cp`_%& z=z)39+>^9E6;ny0p7-->BH!+XGygol=IVBK-uwAA1_%X+$L_Jae7uvbq{h0g{d6Zg zQTpuzm0BHKC0{M=l=u$^{&aTYV%L2T%-|KQJL@kG_~{$H{<~CLd*wY@b$x*brl9 zzfFricm(ILPUnw!3>*221?xVCGC${FkRL|0j{%;zyV@-(c3{c)9(@Lybv?Y}P@@lX zxdFCb&LS@ud9!rRqpy2Xp@j>@K1qX9d(2^|Kh4(mrhovr>3QwFcUV-*wl6xH93)9p zQj1Cu$vGn+f~2uWsf$kFB}VT|)-k{wD#nLT`hDT;M&wXKePG0{!L&N-iN*njggjn_O$>}AdP#f>m zL$`D6H)9aeQC_bXp56SSE?H%_khB|oIhTc_VZLD+&nR*)YUxwEQ&KxAv7~_c48L0g zg?ZsfqbqIEi}dpv6t}2#G9F!8{Z#KAQglD3Xh&+FSpFtTtld4~vXVIk$JYjXT~@hu5{k0{hyPX0j9fn$JQiF)kt;FQJDf4u=+01j|@? z&rtr%!yZdGYckln_nT{aaIB@3ozTUgO63q@AS{i>{Cw zubQ*Gm93r9Lsu)Uhw9oE5A7|)ELmivi6p(mK?f)+v>DP1<>2Th?j^-?)~`7D8*b)d zL7tJI?WI`s)HIRuPOer+L2f~AUap&7b{_mJ(nLr}S4(U0y9$bbbpbv}vDl)~&f+{g zo}QlEo&wxXt~NY;Vq#)Ey!<@;{9J&7%gx&nZRW-0=yn25$p>KNpYrOyR4mWM^cn+SsR&Gx2t`=4| zJ**tjm;XMfvxB?a-^X-!vx1w>_;#?g<^fEdjr{j}ZYis2{_`GKj5c;C=d(Lt>c3N3 zTKtpF+1=IQjKT3{OnIFF)<+#F)>~)L2C6X4?KGZ*6$Gy{BzikS;>nTeV6 z3yBKxSy=E2o^=JUgZK?iWhoYZZr*>jXgZjot({y^V0+m)S~_{U{p*sp9m+}zZ3c^t zPnefqNPu5Jl$TdXRE$^jUqtt;T-|`0!@ctHa`W?_U9q$fR|I{U0d=!Onb}zJI6K;$ zU4R!x983p@)(qYqpy#u8FdK1sS1U8LldHCqlY-tG$M+hWP_43-o{A z&woYy&z|lAYv+b`^;Z5rOzQtdC;3NVmB77DuHJteU(3qn&!;~o$-(YSR7m8R84x$K z_#=KdGY>1vvn2p>{By~|*38ic6gji}wb}mBZueg(GC!}drL~BFFqeR^xiwH^D-kYH z5n(}~$U;`;Lgwazf|f%6-n*NVHQLk6)#`=~&;hW{U~`?VGm`x;{p0v|dQV#`Sh;xl z!Da#f@oV!5i3mE$`&)4R*0DTEo-vza9R+ApFyVs-1ErB=E|Hao|+V_8P1km+=2KgV!_dnwLkGTFv68Ikx z|3|z2Bd-6E1pY_F|Ix1h-^4}qFPGcO5#T;g;807d_`L_tIG(x6Ed}Tl{+Cvj83S4f zot5<6Ac&X}{vQD)B+-FJe6+IKP5c?6bCg2Rv2e&I&~yQPQx7fggo3>&=r6R6^t40U zB4KE+`81!VPV&p_OC<+oXQ*U@6O4mAg|l9- zBN~6^@GzcaG?Ju(1KsP}A2QZh$YrLFZxB`Zc1Ta@^^}rQX@)!({je5ucU^dHfP2C9 zB?py@OSu<1Cr4?shI=f-1cP=9NNdJ*SX2a-e1C2prP}0qO06z!A^^Al#S3$Bj}L*V z)O&5^eGTa+a}i4x5Q<-Me}M~uM_wZ9w2+V{xJ@}_3c`Q~Un=cT;X+gpbj2r)9ZCZP zgV;9_n1&fMEQ~+vk%G3m7Ymb&-QnYE>UEu|6Mt`4?i($WLteL} zS)u6a6J=Wzsu60$)XJ?t&#Al_X z*#ESo-*_`w%x#WLd`Rx9Kf>8Ch8I!Lrt5Swm2ll_Q-#>o546Fg{rZ{U5za)3* z$CAr9{F1f&dhw#bvG1c+1`{l)bYkeONma$AAK5a?tnr}BG=bnSXrSSVxb~>hl1 zM-ek`bD%+mG2J^QB_%OPCHteMw6AxkdHQgN0pwK8|6<EPnShX^QGW&{}-8GTtKn$7u|QH&vtPu)hw#>Uz^$o(PA z8d8#}LqkWWk4@d*)7^bLvqNN^03slfo955R$dF6S|M;=edbh7nXOd1)Q8CVEijwL{ zZ@;O5%K6OwszlB*l!gIvooG>>9%&w36xZE0Ps+*3SzqyR>sQp0h4OZCdwY8>Z?bX8 zAeGZH9z>V4H+Wk+sI9GSyj7SitI6$PYat?@&-?;JPF(O|T&9~|(4haF`s+x0?AU!A+*&)mWCfGjg@$6(m&^0gQ zq!#%^|3DHJ^kJy5#HE#-eqw1L0et#V$VW&rJb5~xN9je6d`wuKOr{!zasY-vcP=c1 zr)j@aWSqA-`y-Ltnt+1}0wN{U<$e-Mt;L3&uh5=at83z`^J;N-%zK`3c5Zc|E`X!? z(PVv~R&c-L;!%!fOGTb8R1l)MPN(7Iu&{MmN9%Yr*2GUgJ-dp>uw2uwOv*Bja|+Mk zfz~fGtO{(N;YG%!S;uC>dm8aaC&!1od8wyI^W*#8>{J_72a7qkyJmm>e7)Vqng9Hw z*mN?<;Cz&5eRy^q7Zl9t_@pyMCxkwjC6)_yXJdE&QT3ZQZ~X80GKDkCoJjR_kugdB zs!X=pxpehj$jEt9eCWd`HIs#5yCs{h6n&Y!IO0GGywRO|MdW8S= zN{{gfzpcwPt(y_*2nk45bFkp9oBb=Nej6HU>ME|=C(@}Ji8D3BB}Z#PGFyxi9?LfT zT@;-64?VFpA7ZH9)L){vS-Bd60%k67+-Lq9g|~s7>d^f&?F;)l<`cs%1xA312<&Y6mHPa zzpoV5n$z1^>L1+g7FBx64PnW*^#vr?bM{V02Gpgk4W&qWo2#CCTlrJF)Wuh42GbQ+ zI@HUrS!`FYE8wflu3!aIx0%M7$(QZykKI6VsWR7F#DKN?=B3kvooLex$c z2Gf+@b|=ZyNIe<&vG*YtJVf=Io61o}u`Od0alFa_$B4uz7K?o0}8R(a}jIr?kZ_ z#1`de$)w6suK-KAd!A2X;n%NU0_iGG=x#{VIpecpw#!tIDs}w@!z@CgX-|D7(0oCeL@L0tsB~cl#0@L}V1Ybo(MQ&Ki zd!s?_RyWNH$R|CI1)r_6rTb#?R+rE(w9|b03fUor?ynr8ZoKDi)`s!(ESi=0i%m_> zx}~wPv2oNB&XJN@TNV zv*~7>I_IqTRO#B(dU-cqCpZ)pG^~q@iw&s;`I#aNY)LOZorBcb3-{vYm`6uPXQ z-8KRoYYObQ=H}-EOOun6OS-STfCLGhg`YMGgfob_LWy3}u|Z_aV-afXSlz6(t>ly% z1c7pLpSQNQkdneZ!^51#F6>mFx;X?aXp^z*7|tR1V&1=hznP@H`%{CSp5DHI)7&>1eQ9u>mzW@>)|dt&!SJ+leVDO`@a% z0s@zh_Ur4hawO=@@Ac`pvi7&DLywv-p~n@?+sB!1-@ZN8c+d5~)x~A~My`e9NCpbi zJ8%Wd>scH?Iq6l7qm_Z3hEo6!)r$>`jaieP>xa;!&NTOq!@Gxuu60Nj>YYohP|c?0 z@jc$|7by%Me25u)yb>-~Ab&0K407o;8+}WWI=uCW&WQKUFap0&s%8E8=mjPwnjsVl zMKbK&Ff^3ltj;9;s3j?lf(l_bA=0XJO8S3|qk$sTr53Ah3Tcl&@1g zF#VL079%Ru%IsRoW6-`)mv<2z$O0*yh!$~$Mnn*=v`q4Q!)$yT+}jg%dseN9L$H=O z(PDQ&F1>dxUYwQfc%_K1)N)LP62Vxc$?9$a}X=n;^-dyMA zCYnb-c<@5(W-L3_ql6N~;*X&^JAbj|Fr#=~Uinm22a*nf&P&QCksWh$@4Lsq5mYPs zBIW_9R;QR~hS;^-q~0o44}+_!ag`3^1uLuEu*w$X#UE(GsMEch)5wibU1=leI%;fS zKrg_3D-Fh-w&4JG@;!C5OVn_dj+R-Lb8^b>E=|`YIDDYUP6eLFqoG0O7Up*c=htsE z4%u7#-LFAptIgsMU1nOMup21Ft?xV5O)8xrO=0vo4vsvBTn;xkw|cSE)Kr^qJpvvG zr4#K0Rv3WN2rG)5=U`{|qFhR|1Hz)~PZyhX*0Y`d_>p@#R}2`1`U4!S=k* zA3sK8fgKg#Oj#1wKofh+3NSmh$@ggNFkb z`GW!Rci@g){9wSuvOm4oL=mj;w3HMF%PiMI__3_)0OiGCh37YmBUvDe>9uRUJv}{a zpWLt0d>xzE1Ykn%I%{b2&d!c;ZUF0D98+6{n*yg<+1Up;OPH?tO&wib|J#OdLVk%W zzW?6$yr<_*dLBUOg(AzQ?(RCjI4@tmyhk+j0YxzpJF5J>l7LVn-kN_sY0uM>v_NEn z$M$XO{sOLdwgi4FvqEleF2VdnPsS}e{73P7O&c5hpCR>JX@PF(3%cKnamAAq1}{Ew zfKNw8VSEXT-K~XQW(&rxyJd!f@?L@-N%dlPlNYO9XWIyVJ|6uA&f83ToKDNSAU@?2 zB3JlOKB&Az`=;juuXVmjP4!dvZuJ+?xnN56IT<#Mlp|5W=Oc7gRDjH zw`AzNc}bwNXw$(#Ww-ycXU}*^EpJ{MSDv*uEmizZ6K8>_EhV#*S5xauEtDv~Fh2h+ z`H=GG4PEy(E7el@Y3usrt4tBZD8Gg8?`q5$TLRl-c}ytx?@2PTz3;h46PSAvZ_88R zv-`1oZqk|Va{!lvlM}J;^0#D(J-UN7ZYal}Rln3*)MI&|tAKRi#+^Go!wn+hDt>8q z+iYFqO>N@i<0*!Y7J4%W7#(H@i)`df6653R`n&IYAU^z#GZfiB+UzoE{Ed_!VHQXK zx|$m>7R{!2ERe-rSW9UfNz^?Sq%UHbWRFI=H0Kd1FN%kk(^(i6QNjB3l8wf<{s;QdeXmk?ZH+&7Uls7gSoS_rtR+bwz~t_-Gb_B z?ya7>x*LzE!d^e@@Dt&A*j2Z8>=)0Td*kI0Q;^!wFn1)ZT zaZpfIwc@is8(Z|^vIpYIIKp)Ml2SErQ3ON~JOr}+2Q@TQcRtM{ftJO^-{nVUJ! z-8+>a#0&WO7#n|0l7s*+pju?iE1<8Y%uQC3;~O}ZeDiBg9;&-Ea6`D5t=81r+C_`; z0?6CcD`}n#S@&>0l!|^^#9HV%;+B_}myj+hDcKh0U*oc{u#o%A!^7jV$O#Tfqu}Wa z7ca6bC_QmlFaGq2Wor_E%W2>D)z#IaJ**MTGNpa2GYr8V5PIaqGyA@kP{kpG7m9gK zg{vm2(_}5tDY$w1-W$T@QhYHs0a2V^JqpETWu9#L=BlXyzyVDsQM`3a%EXLy1#je% z`HWnt*F}2z_LgR~iMh^1`rz|Jqob(P7s4cAbFZTi2K3iLMa~DWY1h?g85tdC<@!a7 zzE-;O#7pUg!}`m%)ST>W=}T;)A~G{f+_!@ZQ$$^+VuQyEi;FECT!S0Ua_^)Ddj%;I*kDLH)iQaAkMUHQp zYotn#x{Oj&Q!~e>Em1*q(p;*J#7O|o4n1;li7J)pW=VPd`t?)klbKe^72n08F6m7+ z<4u4}?E6)jhUjZ3X+O=!Ufh{Tb!alb{h1u)Z(4s8KSWbrSZLNCDM^U#~Od#oFe zJ=iU70B*kYr3suCUAmFVpFyb|$1{g@K~d4TJLi7M!eBkP)gOROm6d1bO8K=fWYSIx zEu^>^8I9fO8%`I zrCty0>?+td_Pr!O8YQu%rZ23n?k-voaECPLYw_{ppX*el#1h7N z;55v8q{ceR##88<{xZsa{0R^lc;Ko?6$35G{~?Q(BsC39^*bMf31Bfi4Rvj7=0y|o zO_<)bxe_D~W6jUaJ>5x3P0d^(3w@pmz_Qu7j&I){OuF$)Z$}W4|8j*Izh@x@t)?Ks$; zjQuWKzj~M>GtUj+n%XyBK#RXhX&c+#-flDw4=I&#Qwq-nPbjdH6cQ9n>YkM~{e%LL z=@c`xM_%Ot#E>$dt^9vFg~)pKK#EG#)2jkGImMga)d7QB#hPH~vI zg-#>OIC6Wt-(>t{k00PoqG`WR*CaU|;?u3ipFe*-E!XhUvZDxICRN>6TXZngs*aga1M zHwW@<9qqeuJo2!&S4oshz>?i;$hJTrE4eQ;p%;H-jRWa7#JE-J+_|$J6+4}sm9_6S zON!3I5Xlf>MjRm)rp%VQ&*KcOr(P*X)X)M0>cCfX{ zwvDA%3Z;+BIY`oYuXo~tP|g$?GfQIuDs7PLR-8oUN_c(FdS+3KmH z)<0}JBXEt?D(X^Q>qFb%QW?!E)0eZFD1ZN&(y|`av7Q|piAW=vAFI3Vrnyo)#!p;^ zeDiv2f9!r&;n}w;DCyq`Q((F0=U45qN%F8cCUpIk=rg_RbM0MSyGx?u*XD~In&Rf4 z7HZ38TCRa0tN)QFpzZ2hl>FlpNR=oX7#Qf9Z)g-#U~<>5m|I$2$rva~1Tj~}aW}A1 zry0GEmdeSsAJEsY@GTDD%{6Yf9{sutw1e$*eWPb6c)SeQqj=tN28T>YlZa<1&eGSL z5apj{F1hkdm#6=>pI{*eE;BBs2^aHGec75mrX!yR=%98;CffOMd#Kfj0NBYs@z*UV zI%T^N$?cT3QrNSoDn^`j@=hKOZaY3muv`6xEW2Qe9Az8~!x07QUAzQbOq9Q@q?po% z!JaWMC~wKhH~HdKs54hak&q;@%#b0|%QLq9RS@+`vnR^rsEiV&3M8)#jAh&rV{{ul%J|-WvIF}eEVlpl zF!KjGjf(CcKhVZhAr-94!NI|dsh%fC`xaEtgITd_m%qlG5-&?O4#S?j9Xr+89wq}W zetq2X!b0Kl^Q#xk6D6mX>BO+p_%hX#4wQAsg~_i}C2*VmU>mSozIT|;b7x2lbD z0>4LKw2L6}gV>5+ct!UDaYZ&*8j&gXIu4x4k){yT(QAw1Q4T{GkQAfi9C-WtP}GW6-qo2kq3W6}f#;AJCO(F)@H zydJc)w0WcGm}J2X<9j9z3Rx=yJ+|l|UlJ!fb)AdLm#0rI4erGH zZay5SJ|7r4Baa5*pJ|>GuKlE1Vywrq1MPgU*=hd%K0iOg8<*qP(vr#r4P$ZwoTpWv zdG77sieNgvG1Ud^=JTsWkW`o~A~L1(k#uT4i1uq(*63Xa78)aWasgxs?t1~x=2c!E zmwE6=5QQphMHoll<(pjXpRxgXT6fKjV3L|DIIq;%7(#16>5F!7=+GL?`uOogFj-{S z`&iV82y$xvr7=(JaSYXr^8`>>GNtA!uuyQy$oTh<>l+ws`ko$+@3!;TOgazjg7`CU zCXz8-v*jT`w(ojU0OGShJvo*h+&0)@k?k9a{YJNmPC*VN&y*zwuZi!omEB90^xiOu z7mJJn!eU&X*>2C;c`*v$3~SiP^fFDr!gNgX?Ck8z(#?nTF=fY(AGG|W5fv7GCLDd5 zw2#HAwx4ANYu)?BY=r7YX&zji-9*uH8Vf`tibu6S2*ssXlfxGL)L z^=LgDEvS|hczM_L=S5u3rE5O-#J(3#7 zwPAXnxufBOvLqAj(Bk)ZD*nFf62`@RJv;c7Q#U17-Uk9_v6}Te#!FJYgCoHPmcq^q z2)fHj1b#K+q(rzF6hLSd7InXV;K)^P;?>TK4~~t|Jg7^S@O&;s1Z@*TBf`EuXTki| znk8#`N?@xc9GkSna}GdKp{z&U^%5f4{YQluy!)OU28<5S{(3v~x}$($bbIV`{Ya@+Y$n4P=3d)Fud#OQoEg`exa)JU^bnD&I3> z*rEk(Pt*qzzp5B&$r5G-n0L$4TvzhyD!1jv;YpMuSQ$+34mM|@{{ep}zfC-?(sn!Jpw}ve7{bxX*Yv(t`4&%BEhu~=! z@T7p)p6AgDymQ?cHCQ8vGeNSud)i#6K8)7aa`58-0Mg9|no%LBAk}Ab z>JR2~q>Jp}N!C_--Iktqg8|WyPzrjioC5qBBpoP_zM*Y=A-wc1#Csu{PgIn>xEaJN zW{ZzkPJE%5n0CjS!$F(W{bawlYoJ|I1rHyeYwkG~rd6}$M)KZA)qijZ&Q~LUW!i(= z2w4P@52WyHLxO_|o0p>;Vby_l8nn(llo|mEi6uQrHC0stp{sP~E?)Rb1@iZI?;0DQ zq|=rvW&R}#4w{gPZ1*hm>`ZG6vnELS^IkX~`Ka;)7fvU-9(?w+|7%JQ?CqCsAC=*g zF^Mv1h&YbuQP_nf8{xy9QbGFP2M5KtKi#-aQ}iV+qyg3mXgP!}AI*j=vv4BTapjR#h?w$HI3WQZ3$#v+Uois(fgbIXNNfc+XzFM&sh z<`WiX{c-{zsml9((`_nQh~2=MY^&Lc2OaMI?j&J0x}w_e{0=_qRs z008V71K5zxh5`z;a!G3=-Ngp7EH{lI0w#_7OB28{tXBx2FK zNKDC(u!XpOk~ha6T1#@)8;ExRHpVXF4!jU|jcjh*s7q8LgS^zt%q9)qFY@AI-qPj; z^n%O}VLr;wFQrcgQu=yy^hGnr+Qz1&``YxkhC7f~d(`Dyq|R$(khVrNoTkx0q)m|G z;$l3XkKtJBzwYbpl?O!z-{CyXkL!$M1P?5Mty_BrXJ}ZHa&aLLPzJ#d`#)!qYxzew zJ#z&QvV51GKKWERK^0N^cHp*2>KZEXCzuyt9UStYKI0kiHaT+4D(B=*jhPcR$gcYD z6kfL|UP|y9lY!DKW-ds$xifvdMwT_U2)w~CkYm4KZEgKj#zargluhehTTl?9;tX6D zA0sfo_cMS)i1gNcynY8N2XWj|5Puu3ya^a@a{*;2>F-faPMq)TU_pg{2M%E9OMosm z@F6SZZI&VsZ#rNF`i04$&94kNOTj1+Kp)yb;PCWAjo8y%o6K^BE-FTCZbc11Wd+)-6J@ zp`pmzy}-zSQ_ozcj*QxsVVHySEx@0ERJ*Rip_Z(;)6jAfbvBFuh__98^m9u|vOboKau+odOZi%!>zQ(qT2YA0Hx+i56iX z;nLh+PUea|jv;Tn3Nq zS+%=M=q;saWE?^WnX-MV#!F5L;$vVofKy~wAV~Gy+qW}DuLKieG;{eqsPCE92g|rk z1~nCxm$Uz9$;#sB68!!$XPRi1Fl=A%1V)NV23Ys;J;7 zZV$jG<0XY^nG)h|%X7pTa%+~8L|%YXE8sYRTGZeSd5Bu)s83O{ZK}F9+IYz*h znwr}D&4ddP&F{J$iJ;JEnyRX*`c<+(x!e;3be9|iRfYz8d#4jTqL+AITn10s-dppN zV}N8k;Qi5(J>E1g-j^CW(?mB95}o4`5)$o;%#bM=?08%hmyua5f7TW$|F-k1w&G_k zIJbg-3PDLd@DKBd=pSoAN@7i*xaa5_2quAIFN`2?&1fFji86R-tF*e%v2otNf1kU} z`3W^7i+{IDHm?FCG8t|mBKzo)FWO|UX6NNeDX?QhmWpu5>w;hs7KX@97Y`5b>3C6L zVIANEsRF_~Pltxa$DKZxCd3UN4W2XYClg$&f+Sa&p;{v;PnBl(Zzyk3ZASp#31#eE zU87rYp_V8h`^heV{87Cw;w6$pPu9#sJ;I7$I|xn`=u6KQ930ecyU;doa&B7#(onh-+wFF?$(H}gU)-a<;p z`)AqqYzW%93r9i|@2exyoDmZZg8AB-lC_uL1FGSOStPbmxdlyv@z)zhByyNVYkyAa&^C=}rp-{x<}PwJN5nwHoWPW!{UX#RMdPJZ0{{37RFmq5#4KZ?Rq{7Yr(`DL7 z6O?LhcBlYIqxi4FAo=PH1kFrr%(nL{+-Hnv=8AEp2`J7=s03M*HP1hX2Gk0oVKfhR z01m$X?p|N^>^(-3gvId)Mu{B(ITA>g`vriW-|qDfo`|H~RrX8*2)N$g=U|HiSZzqz zduKUb^Rtb$^>s!!osWAf7nf5^t|&LlazD!e229ow-R)K8`XGfdKC`v)pklIu=NJEmJ@3Nc);`YJcPLqyZkLpUI4kok03mG(o4J(dgx3F}CTh=%!^ddFG`;YzWgjeCn-Q za}k#qg3?Cs(n1T`TB_&3&x{|4^#msqS$IM)CX`^q2R9oW+e8zizplPouc}^+w!1su z0rs&UF6P?4QamFx=!A_EaO2(<1WkCWuesJGISnbqf<&9wMD62T)?gz@;JISP&uZU8 z-lzY_pscqqnzVp4$Rjv0H?doD>dQt`?80K{1IY_sEcq08K_~z$NW}H-7r=j?l391y z_~r}JOrCE!c_b9D%UyHOmw%$N(FNi-P9R6)r!!_t@Qv~uUY>);3)!}c zt*Z4V`Ub9?Q-51802enlHWb9nxB6>Nw*6nBzNq`w+%baQ%&dYmC@A|l4e5TYVC;YF ze*PJ2eulfv*$>hN<0OCT~-ziMo3T*`levka@l%+}Vn`Ab=8 z=~&Y>*Ip3*d?jiF&}IW?h2n>CcyszQ)6*AOUdZpYSo`b}W$fs(EEGPoI>(48NR;7S z?VxRuSzTE4sPw+kKk^Ga{`kUuED+ELOqCHAzdcj?@htVSN@Pkcrks)p6hT4{*TcfW z;d(|=`f&X~$zn%NUO1?I(GWORcf^%tiBfv%t*dJDMYM-xV=mTVt2#S-k&@BvjVt9# zVo;N`XSA}iQbh$tlCr5M?O9EI;o;)q+l{6;hv(T~4MR`8KrAF<)o(bxa_k4>Wy!$v z8L~T1fKxxX<8v1WB7BBL(xGR_y1G#XFy&MIW6p;?S=E`v#amLWM6T;>rE#;54Fnr3 zKVCGtcWc2LY1ry%pTjy7{?MExTI6Y!ql`@ z;1>8fZZ1tG+r!KI!<`corix;Ljg~Zu&aT970oMF5n%bTRDLwW1wqZwT!{3qQ$+iW4 zEekFZiWb}D^OjEK0Y*e7A3k!hpk<8K{FuBh9xg`f;RuK$-P!V9_e#3?w&ODd*8_9` zU-I>`I{p=88iXx|7GIe53o z@n1l0$8;g4PMR|NtJ_s)7_~amk`_rtM0i@7nHhuy=|z2-#sWSO3{sC$G}$c&g&bLh z@UcN5U2@rB1M5x55^MMEXg~2c!$`J~@59>T{h;DPK4r~|7TGrr$Mt+xBClWzOlVhb zcDvv3Tf1#ffAOOFKzw2gnXrzsuWx;s=zUP{@Va9f?>v>J>0@#6&j5=Yje!~?mD!_- zSgYt=h7S`I!Rj()gW)cp#h4U&4I zIXF1HbzgH)JL1+lo?vbku>H!&$!fY|X!wXX(GX8xbq~hB;{g9!P3BH)zj#$D>yx$; zVTepj8LRd+5Pc02G%AgT6S1hNqT^vN$=}0ePN^n4E^eoH{ma2491UIG*MAX<)lmWF zZu2MkHab*TWQ0lL?u#<#PgAv);(?Lz9LNQ6!0|$&mb3~u&F|lV z37|H8pPQGbe=RIoU-!1E1{Dz820WY||rd=y4j)$mWToq%-T2nXbiDMo5D}y~zmbrX8bc89tF+ZKM|! zrO2*v(U>i}_1KrN`$rk>Mybr!ecjG`A1A(h2l8ybNc1r`U8E5$lkM1aqAb3DQ|8-O zgjDtyQ7T(W)>7Q>fW3bA^!F@&ql~IM*`dkM)9-J^-mgT=5vLb`w($Vc7v= zkuf?Ex4F>$#>|R9AYb>%j}k5bv9@$?G5&mm;mbStv7m{h{!pF6o?O~ucW5!2pK-D{ z(R{xcv3P}jgp`+-arjR!y~~i&Y~(dnCJDszY|>4TFlaRq>FjF_+H^Mdz>;M`!@Q9l z|8TE+N9-4q9Fq)1QW*V??}cZlX5rqey8`m?iAWEu4*8%`S=cDPx99Wv^`WxFwVTD3 z=2{sLgiY!D#q1pMZ#gD5L4A3jradqfoZPQUyJ5aG!Zoo`WQfJRQYlA#@N+q+$Hm7{ zN6IH4S0K`JO^sgyF-KJJfb4GFuF}a2E?8SP4-c$b674@Ci}+cDowoI~h!Xmg-X`S^ z4?lzD0lhTlJ8P0NK*HuJT1IIV5-)wEr;ic&5ZD0^5&tf%(*CXT=5LYCR`)!p$i*<* z(EV8VJ(tJONyq)|rH>J;`}uc*AonWj$h_W9lxZ~lf0pzwjYE(yb>#QE-2&ob&a=VC zBtw8JT+2UPX>6Res9_~hCtYlD?Mg0{5jZc?3X}}18K%VkA^Yr)tZapBDX1#To_Di; zU^a#a2*OL7e^~oExhs@y(M3hpsm9%nIHgo(iixow+Yv!GMKE%{n~di#4cK3X=$Lu4 z#mV2Km34_rX%rt*%-f1cKux-V*&jpQ1_@0?WTi(OzyfN7DJY$77L0u1ZC;$R->qN) zB{TY#p#sXZI(6tX;$T7%7FO*Y6H3EUohk9~7|`f@r9 zu>y$oZp( z%H>QtF$NGfZlXGMHX~bm)<7~_A}sbV1`E+=8a9!un0KGR)N|g3#{kG2}c6) z5f>?e^({&n9(6HyPx;KIQ031Jk{~~fB1e4=fSfPef?qY6xU0EXPG7qZ?JH%%yKi6j zxUzUB>gdLytVoq_<0nGNHYN{ycyEi!a*`O8n`33)A9T1eyLx1J#c{oNCkT{4TSrF_ zGJMEB^7DUB>Zt$vT}D7nIje-idZP^zXK)?lp~r`vYK~D8r&V0ttGn}n%_&#~AyIJ_ zyK)V4tw$Ht1o24`l?4aew^c1mf{hTJzI7eSj>M`@OJ!D%G@7yfV3P>Vd*%(?xc>d} zeo9Rj&|1Hc9e|*h@z^WrBg$;yEIc`qzLtDB3iRehzB|0ltMnrz|(uNiD2s55AX0pnCq*d$;E+-E`N1+j2hS z`i<;ca&Go1g^23#JPrtRn=z3y>0B7O;L$}ca4%Nu#5*K%68iuIt#SBosNRwNgfEEA z4iVTsNqB>?jNsuH0fS*EC#dkQJbV;Z0rQ+}nkkBGomS}pERyfZ7Gg}uPh}C1H7ov8 z2or}-1io(qVd&s@B!n5j1Mk-%j2`?h2|nWzLEYL)njl;>_ux>B;~p`%UW`ckobcOUhfg2v&UXEF+DP4hA_-|XjDhOVP+?0(y5QLZ#{U3v*q@IEw5_qa;C=iTcFy!Y2NqnEG z!H<|6^o%^^U7ek6Ts+}h1d(^Qx#4MJ&En(WY0sjhqM>aqXhVP?EQrdLOM1757Sen@ z_4OaW+ax|qq(T^nN8~|s*=&WvijYM)`x5cv^2Tr9%3phP54&?$J-><*{Jf2&6pwL; zPBlqTfL|?1UQ*!gwJSW-xWb`Hmf4-cW%zEk)A9T1Gq(qL0e~dhiwB3IZ zS`pbY?j}TpocYLFhQT50QK3PU;W&s^@X`D6eB*Hu3b?a@M^s20f{@MMeT8805Ud3$ z2R<@|okoy7wy{H;??t&0BR6T*V(7<0K0dz`@~W&%&u@LUHzQrvYc}Ck zW~Pe1KJ_XBcZM|$6!Q5~Zw>#*L~_8!R_(VQub*dNtV63ufV@VKDu0uCj+Ph(uEVVs z*>i8ELr7)F!W&r)O}!Ew+m<%Jgc4Eydg@wpLoMZ`SIGCr^C&g*45f{2rq*4 zjm(&2ZU!9eZKu?mU$Or4^P?;QoVc=5%J{?W;;Bv&I*}_=?N9A~Flk0iKWas^F^JID z#dgQ4@`MDcKesPXP*T36=i}v#Pfca~v+cidFgoL@dg;<#Ya5%K!0h+$jla88=ouK4 z)EJq=I@f)W=FXd6SvRT;thQaICI9^8i!Oc;Ir*FZyj|ouJZIwym$Y?nS=MU=diZr+ zGPIW(1nQdw{Zh|4#21qM@Lz3TJve~-&)lvGtTj)TxWzX2a6Q6E`5iv;SfGBWV2z%f zoK@OqF#)co*GNt6zO}XWr@OcW9ouy5iqUaDe_BSy#u~&>Q&D~5OuEh%Sex$EDuvIt zbwUprcY9s$o@*eukp7@*u~JQR>wd(|@9+M6Kv(7PV86tn`%HWB*Oy9P(tLh6NLL@b zqjBpF(okNWgJ1`JbmpI5*;$)m&&NX~;_ zQqq`4@Onf;$h%{b=Lq!>>UvS4KCG}^@-+|?{?MTg$ zOuBmYYRQepV^qvxxrkg{fOv2OW;m;BZhNwo?@dqdXx^Kep@q(%g}42lvWHQ8g%%`5 zCqu>Mp8rzG5$%yk)8ygjPl%2_(QBlu`{-46_LmI#@XGb`aI!O}A1GN`S?OCrpo%#5 zaR2eERzJ3Zb0*XTv51K0;5_IMbsjp`K6aL^#AT$?1r5Rw0@Bu<^*ON?5mC{}2SI!6 zl;q7`9R--*eSWWSka>$XB}>Z}2}wz6@M7ELT{ZHpr-v%8mYRWqkCT&A#PhdyuaSmE z%)9G?IRynaIz?R1;aywO<-`rfUTHR89v^Kn-_}DWvWM9 zx_LJW4R-lOZNja)tfHd2-b+6OG_!TZHYStITbm*&LrO~be%?RJasIra*wnfor?j-m z#^T7AUltw~=sHH|EqGDK`veI*9G&ae z`Pr3X^^cVv@{1PpOWCBdit# z;SvM1*U?8zx2JH$pzu1~+Su8ZPFmuEYj0IO_{GHZ7i$j#&+sbawbn>*6Ux5f;YIL* zys4VGAod`7U->Nk$SvOA-Bh!+%_=J^3;lKN#mkqO@7@_HMxV-{&wKNRHt7pz%L8V+ zZ$+lC&ITjvr4yt~e1?TRCm^AEOtldiLuflVI6QpsG3^+;KGUrPSMfPC`4yX-7$R|^ z{w^B{C7qGtgVP0fb`BnC$q)^D1?XAf8hCH@2tKMS}(;EZxRwkjcQ-{bRPXJvkz`eqL!Wo_=;mGb$>o z!P{9uL1E>)N2f!qM#?#rEX}l5Ja-c$`h!`hJoYi^!H5?(*=b8lOGvuPs;W_r`Gtj= zI=Z@(1>>~n*KRCbk4}wo!Iy0oJ*UpqKYNAsYP}A%Z}0-yyvlK-+TZDT$fvQp zSgp%-m5S3Gh+JQ6p)>7?uNWsL(?i1Nl`AF8QLKYBSj8NEFb<2^c3xazvb@jTBXL{npmnB1x6JMKRIfdWtcllx!J z)?VM-JXlGpePS@``r%L5;%4Q1$rp7=!-12PW$|vu>c*;iw3C**tnAfZU-VmxTdLXB zEGaG3x60N^e++2>%D7PG52!+dcQzLjpIy9@+l+22NQw)3HjSTFBbYLjL>mMU+@x&b z^16iE^7?`cs)K9K?ks*qqiB13JL@F8Qd3ix+?r5qFTVOx@$-n!D3i!VhJcgF7#AWV zH_aR*&Ze}R^g-e7#sZ&>jg5OfKJDw~+}vCa0RauoG%1@|$(i1~q=d(hTLBa3SwYOA zp}W4mUY;7XM+JL6npaNxt@gqS?#G`W?~6eq{v=O&(Rv3`llyEBkMGuaxLC{1=F-{w zv}eWF7>i$?^cO=xLjCA+Rkg*eIGhIJj6+03M{EN&H3|;+C-~Xf*sNP(nM7Q^OY|B! zIpsltR53QDbHcC1*Fy%Xy=^N(YJy9@ke0iwuCBsKk214ePFnovQvbdtZ2b82bmp}& z#(CejPWsRDq%xx{S<<7PJaDkYV+&IC@4%(J!pbPGd$RKO zxUW1FXZW`!huvm`;i`@k6MtOr&TFP;VBmyn4cz;qq}DMR$14Bo)vGH%fBw|7f>aGp zEwi8?#w*M`gsffwd2}jrMD?Jan>=iH#)FNmJ6o$CeIQPK`NcP3TTA+H73G^&8F;iU zcz-E#=x#7;C0QFPGRdiuuE1kCv8sSy$5_ui@+63$@4t4Bk&R8}yAc-$7nkxi#+Ih0 zh?a?mfGT>8Oij~XWo4;qXqcV_v@-ccp!j7bFN+=y`Z#1gn_a8}AOb!YnpVA1dT=_o*m=18vrUqzEpzsS z+o$RDAVEqlO}!Z3YBRcveq~hD)Wt4;0_5=P0;^1k_Gz&F z47y{MHuIWcyDd(H6kMY&+9|By+j*f8hlg!T3jIV8`7P%B4{j*#eT>5;HuvX;-hS~e zzpAax613Buey$};J(=zNcefBu+^1={rz`MINN_>02iFq$?AfwPNnMM&f8VAlf;_i) zXUFf>`|Iv|TenPxl-=D+5)u+ip2ueGUaXg%d{_TeN|$mKCBBMO$+cneJe3Bv7hemUzL~BOnhY# z7QTwYX?PLyULL!2>j-sN-;oV=&7gp%q2PEe+-8!CNoH#-a zGBSwYeA1RC-JeobgbaivdN-o6O139Jzg5sybfXb1I&f;oe6+B}&~uu-p~aOV0N4SW zmXn=bUaYUDhht`D#{G8}>mKnzm?}bz&~R#gmOytOVAj3WyK;Dks}t*fHhuZVDOSbB z#UOJ& zt8w6A#G9cHW6;4fZENc`T5vJA$6iD5NS}e$M)TQ)NLH`AG66fv(DZO{apg6~GD@<+ zzWCPFh1F`19e?y1DH?F&&#786$Xex#U5)%_o=^`pBD&!AZ*oB3KbBkZRVEg>}GkJPv z_+d$g^KiW#0kI2)Y)^VGK=@gZ`%?9$vkrt|1^+d-doEzRJ62`nwu4=sPUjype^+=($o3$ zd4+{EP({7GytrGlHZ&pAU<*XdQ!o8CuJp`7o0??VAenmEh;!oNt$W+6P(at`xYQo= zUsAyoneMStLl(S;V`)eueb+n&02P3k$mnRjn1z92d3O(wTl}nqj^+XDiP!yRGINW| z%f;Vs{k)&~>J^^CU=KmpX=Qxu$Cdj_O3S2-fDzzvtLM?z%bs)cn`%o=sf>+|PT1S? zPoQFXDn7v;>Z`3ydsEf^Y4LSpB7wlWiB4~-4Gith)@-p!9WVZ{_D!vF^;WxB|8w@I zyZHX6ow1lNdu{Jl?fRJ|Uc7km>h){o>w-y+^F2Ab@sA&$(bw1K<_$eTe@gQhFuQ?7m<;lYjPxw)zaZ_ElL zAH#t}ZQJBjFy+2{qa;Oh1<0^ItUlghM^|l75E}dt>93o4d3iY?323Iv#Jp&b>wI?6 z28seuA8x$^k(69blkT6jWcNc~yv7?NMfVQTL7LsiDC&O|OuR!O_nkEd-{pD&SbhLU zd3a7CTrfs&*E;3T2Di8dt}?veTlpf^Vs?8RA3DM- zD#va>sxI+ewQVmp-=8&f@76e<@rq@eP&BdaJ@xYp%Hl0nxnSA)+ETZ7ZT@aXl!um^ zPr9gY(<1fE9VowZbPrJc@q%#Cs%Tu}|9)y)s$U&DTHNt1>hj%#EfNR@E zOnS3nR2%;}j@&ZWmQQkTo}tsRL(xP`aP2JzXXnJhQah(u;Cj>y3a;IYe~st4bH{l9 z0>X75nRY*dd!ji;cQ3FuOJ+3aFu>EAVjBR)x#=!w;ox87mA06raP#*Bv9Y!{=l8~w zq$b2l`>_4u6XElWXQkvrM`(Ez3E0>wM!cV*VedPelTCPVrr~b}M^gMo1K#`fK9j3D zw2!R)i$6~Fs8S<&Bb!`X;bHIIN$>~=B-V!z6xvkasMK41_0Mt|M=hwi-cX+ z&$i)33@RVUFOxFy@bLWnbDQJL8AUOm)i@xrL0hVwKy*tgO$Pvrv9WP(F|;*M-*k+P zBVR1*K8|JwvcqWR$BBB`vV8MeGn69vH91MXrxD#h*BgLn12va#QbEFbm5603LgSiV zr~$(-S`mkD9Ht{R+fz?}e_~tdGjVn3C>~uhJfoQ!5xZ>iIGW2cTwE?M;pV`0_`5ag ze`Ig86Yx*{Lt_53yU%_6(B}O+cQaXKx?>Z??9eYKp^HBF?iPFf=;is*T5}Y>Ns9Ze z*}q@ykiM#OzIbi{DGegkHAM2`GRgPkwbEq*&?FZB=#jpaQY_=cva)jy_V#jDY1sam zwt-boF33g54b1Hgjz7UWtSfRGzkEbnSk&VL*W$yQ|;5(xX@yAl|m+0ZS-TC zKB8-YP-6K_a52N%(BmR>uEUI*e=6LG0=(HMmy%eeXEaR zoY9&9?&G7j49w0m1eoHYv76#I2cFaIQ7b(B@ZkbvO;`pIk12JH;rmfh@h2I?pT82? zGGkwQzA$#jVSD1FUU?kfn-4mMoo{M(c%@1rKWq#+RnCn8bt9*=B{f`jEM=AkOYPl0 zzthc+K^Z?>RR?7~AactfyE3{j|~|dqB=P&hA`HC#r#8=OPd^e}Mbn z?2VAy5snIdar4SQBQJ&VU4GhdesfG6GM2<|Qm&3hU)$6355`>OQ&LhqM+u)KBya%4 zQc$@ubV-*d6UQPa|Na=W%s;?H@^Gt(=W8En&6QnT3LV?#)>XZ|%jZX`XcfkZ1x)ZG zidutNw?b$b&bt72G3`i%yNkzO-KPch7k+dFGG^r-Q`=7y``WP`0iJ&Ipz6Y!^R7Rl zW62b*BnX(4|1NwqS6D^DG)^lp*MBmA7&{{CnFt&m4?xd{>`J-K^z`&-t_CvkD%GdD zySSMUe?KQC^sOc*C*8j)(5g5&@kKS9zs4&Q=|&ib?{f9OXd9K~@N`LF7xVv{wn?C} zkf5@U^A&Q$uWK8mu9y7)h)B)YIC*Vx#6+w-=rHheTN^aIG*tMqluS$lC)%baMjC70D#vyTH<8U@G(-}YuBz>L(i3B6|l4RFp4%;dub~)KVnk+)Z z_){N{<{3AK%QbXI|Ke_F{4RI!K&pv?1ae(IJ?KDEs=?=8hl1iWdq{sJ8!*^GU1dp*2~iPxkW@qqHqZETW&FA zK@|;+#FP|zD*Wk8^V&ci1A{Y=O>>I@{GibN`}gP<%P+HPy?GJV)Z2uofu}lR8X%B3 zx8%cf3JV{jL}4sIjZe6w7qIcm@AZ&RdjtCncUk4blvPwBn?8QbX})m!0n|n{6BCB0 zU|_N6c<$Z1_tU#d-zp|121N<72V3k>4e2R6LmK)Ri-t@0#hm)=(IyQl5#?S+ciG#w zGmC2zKYv=cr-*U$v<3c%&__gfd^NS*XGhCKpk{nr+H{)TtKR$}ucTb@%Qa~C>D185 z?tW`#l37&jazR$CUD!MPu7~QeBeJhs4avz%tXfFu&by=@rIC`7l2`fpCloFvsi>); z3weaC0`}MY(L*mPO_*yibhEXIeCF4bcslG_Yl=Sk3){aQL17UGT5;vqBQ3|+7-m^B zm)d>r1S*dFjUiKZGoJxI#P<9CYX0GJcb?%{w02zzIhNBL%PcF1$`5mMSE)RoLYJTl zp?KY`9zVA@HzytmwNp3J@dTO|50p(@+SLs_$&7LLSw(s`6QS4BR?Iq5M@cA-}cX ztfK*&Y4A+)ngJ~d(9zN9T)let#d1|v)GczwbZu;@@qZ);_AU83&@O-p&z9^fwbKF- zf=LxexA}5oxhmlT(3GU4_evpf@1TfJIWSPBo;g@kLE#>#3RgXD_PoC8zB%Ial0!&? zpV${4dxE4Ar@+X9%Kp+vW|PU3lg1d9xQ0P~vkym$a$&7Y9xsTHE?YA#9$hGp{Gh{w zlG}eQ6Y#Pk9K!OExcBvE$8Y6ZoV$HOEO796@!5vO<3;Y?cGN5XA(NDr!{a74cfI<} z^z;&bO;5k%@OR06Bgt43?M*mzaDoris<(wdpp~}q3=P#c^PQv~S@-SLH_Tw)E6uR7 z_yhoNJqHqZh?2GSD=HcqAU+LZ#Kgr_uU$*o+nRX5eY~OhA6cZ63ga(N`nHqvvrZ&f zKEL>1vk74cH!VgUl)@$lj-V5=xX16i;CegqVJsV>_R>bA>2lxXY zo-LndS`R*!6V!Pr%&O&-dbrk`f=# zm)$+Pfa?A{{@hOZ^htS2pw05!9aT+D1K4F^{mZb)5`O=-H|gw$ zMsj%O73}fnQmj*+*OZaV0oDCxcM4`b-n^fpAC_L-UY(ws4d_Ufyip}M^<}`aY&%)n zr*Ki~*?HGz&eIN{Aw`WYxn@5AnJw{&JdQ@FrmCk$C9U2> zwE>h_CI~Q2g_FQ}@!}pkQ8dXI@aH4#g6E%wicwyY@Q`;_AMvp2^WWniKFokD_jY%0 zcd2%?oWvhirP8lx9Tj zxhYx9wb!qPLssY%u=1H}cs~X*J1CoXabP)jp?0ATpRr#Y7hp*w}idim2$B4J^;!fE!x z_bO+Ka~_dj=XpT=(NC0U+*lY6(K!%*p`I>dYSZsh@f5G_RKMB=b;sP>JCWOuOT+WiCKw8gw%UaVgFyt{_ zxUH=_-P_x%YH7(9-b$uBtP6S;AjFsNoB8+N5|HQLT|e#O z=68<=3;Q216I_FjuNL+SW_Ngac<5{4NjJj2Z0B)rir-l4kY2Jc^sOCz1C-RYN}N)= z&eNGd*KYYunDRx5x4s=>MHH@F;Rao|r^g3GT@m+R$~ea?Rqg;otPjZKT>nAEXkgxz zD_4vzFJ0@6b$eFNB1p%9VcF6Rt^p|K=~d%0BBk0Kk-6Xi*`#vr5YAY3CAbzu2=CE3 zP}VmQ2XPrb>;?JKy zS$&%*q1CHP3KtvGd4BQjkXpU%JI%cEi~{3QMZ;;I(SY+iiZ_L8(M2d^$~UVXD)Wnt zjJ!(1B-OLH`vF?yn|sR0!2WQ6k`&;v$+em8l%0dcs-*_+!$;+^LpY6B&z$Av?kc+n zIg<}kQU;F~WC7BOT|pqeTY)cJ-fxc0=I)E=cYJ&2n``y@<3*z1kTTpKoGMPdh{{|2 zhaaHz%IbCn4LfmXXUBWgYGLSYSf%36gmy}#w3?-XH~U+*dh(0Br2>-*cU4BB`xkrr z`oemjnFZ~8nN~fy;9HX8wF_&+6R^7>_T7sjuOSW*+TJ*+4Xot$!S0fn*GNwfB;i+a z7OdrE*+AfD=H#e!i`N_;>=v!J`xpRS@@;5nXmQ7`Bh}%P)1-joi8JzL6&v z^ciS-9wPSg@@#58gWp3fARnk_be|vfFNJO{DTxo*=&))t@qBT0q^*3nqJi}-C~ujS zmDhCp!%3KqZ+p}`?8-;mYC&wag8xIz`4^y19SRDH69t_?`~5-srkem0PX@F%<&&L3 z)GGsqdrse(7dAB=1)Ifh${Pm?38VXqK9%06#NRmkb=-|x+I!yKryAv(AR8znZMp?T zfjAaZW3GKnc~JC5XwL;ddcHs^oO00t|C?x8c{wjovSB^r0Lx5z*Hb3bjv3_OgoLcBHVbz8glHU4zwHRoU>oOY7(m01KKA~>bq0(m6Ty*L>b}E&~E69 z2M{_pyPXk!`o*vN7FyGBrOes8YM>|B5T-#)6pncH_V@GAUU$O~VI|)@nvWFEs#8Y8 z3B(io*==ZGPz)xyb`O0oXnMQ^B#d2U8I_flMFc}=IJ|#9C=_`yeBfjXB2>TOWOZj_ z(9Ub!ALW3~;@z3W?oFMq{rdJL(DG;UEBzpe44HO9_m~KN5DH|~j4PSaS$!nwU$j&U zN=r#!fH#I7F;iune=$?xlPS&7bT7C3YrOkCT9|yE`2EPSetB-_3IA-7{jPkQqn4uj zYuVlTQt$p^r~bmC>gK1z2&PK2^-P(tajCV+Ftg>9AUXSpPIsk-`$uX+Bg-Gor#nAA zv9~Ij%HSM2AQR<^R+Q8meyK!?_U@0XV{BKW#EB4R^*$$)7Yn4t4Fc@!WxWUEq(Ryv zeN~YDRFL^6h}&Vh_!-d)??TIEn~sMoHtt�MC;NdgRFH$Oqrj$*Ga%r`MqHi_T(+u{=7D_-zHl$+vMjK>I|XG^1fS@QusS`_sww-48y#_I0o z9v_XO=Hr(fLp^1ZyhhM?& zE&9}U_by~Vnf#po z^uQez0Ah7F*avjUP-oFPO^qmU1j>>3?-LJ<`a#Lj5BE#c%r2lr?w`R}E0+m-T{p-# z%E%jbTO@<0Fz=@307jY0jSBzm73^LNN(Sb39<09!a=yQP1|ug~COm_x?%?EjmD9ge zduTTE^(8@gIoUi<1Sma;=uf(jJxxggaVEhfAP{7U5|8N)@AN9?Ve#R%^F&B%MvRKm zQSPb+ks!HT0PoK6yXwgz3jHJ%E+az)oiz*P!$SejMwdvhC1HrbuC;lnQNsQVbr@-a zZAQb}o^XTevhQ3$#X0A%OPhQU<@4X{fP>WC9uH?83iy$JxMye5UP@=FY(xPtaKqUu zDk4Jr`0?ZCy!?P)oopaJ`|Gqo@Wp%Ds5K&0Cg584ncCgOD#7YZSLmU`N}PWxD;JVy zb~Sstp#6cTSEb*&qoxC_=_$1TtMvATb@Ul}44`%>Krt||MqoM_4}srbJIn;WsujwT z*t#)z*ZK%Tx;DZGB*&v4JTL_PPU6Be9Owe@qdWDN=xXc7xyB<{3q5Z{FNspV-EgT5V1w@%a zcbfDw7$9;P8|iBHH--gA>|QO9W(Wwmz346X2?Jum=GUi()BDkoF3NYSqoR&;N=Xg% zt=@cjTS@T>!=rK(V^wm+KR-pHScmb}1C;0E9BGY)f4 zWtSC3X^P)QGfL|8hHZjI8M@#HHl!>dP92BlAx)i2p8y-6UT>#a z;PzzOS%?HI)6f&ZjAB~tqfojl{jQf-6J-~XU%B$Rv(vSLM(f#yoD-*nSZ?;0dd}#W zR;3ABDORP&fT4_pQKDe#*Nl*>Lw`_2NG3 znbz;l>cGpR%16-Ypr4Ukp6jWNi{VqOS&BDrvquc*5wDuNs6xm*t%yMda3J4U1g0g#)+{B~J_ zBO<;*rt2Nv?ikROXo8|RT;bYZHZD4C(^qIZym-h!Pv77-7mQa|hwh+-ugz<7=7-m| zp$`;WpZ*JC!-~7U8$Tvr9YA&|kOx)8%d*`}JD~-m2DR7W%W%1~ZpzcA!~3J)vq)Cj zZI(%pV|espSNW>K)dVm?g)d0GeEBjFOh+C@M8ahsU=JBzmR z=+DCkWJ5SrKD#%8nyuUjn20$q;@TuDh0OD#I&|Tp3*0o+i>4;$yXSx0epwhGd$_mS zMpsb>1%Vg*T74G<_C9l^hprDnMzkkB5uG}+vHNB58JHHQV(_qdbuMTV0$zogS&gNO z7|7!hzC$<@6BAzP^Eup6E2zoIjsx*T1~dY9hex03`ixf|Y7H}AHnAA9{v6Lay*>d1 zi%rLT710??(bJ};CT>}PjlR?88J*SPXl3}v3aN`SGR8l6A2gE6a)WZ%#z2HHA>MHc z_i4O-v$AFc9z&diA`&^iyAu0DL=5lmgC)V##QdEbtA}l;1gtg}orrY=>W9$?NPPS_ z>}^bB#nF)!fpFC~J%=_QB|b}L8pEj9R^;}w#b3A9x`LWhX6JJA3XhvGP&x;}Gpm;l z(Y}5?AKZhJsEy_AA#{4llI)o0xOKVz=Ducu`yzJw`yF>5^5|xzt|p%jg8M%gfCWK8 zuzF2rs@=?P93B=6IXQVN5VHk2*^rw+N4ZxJ6Im`BT3%N-xD93yJy&FJvJ(uNJOu>> zDK%rvhg(WU=DQj=ayW7Xa%8_^r5C$;6Z`re0i?Rnf1ghoph6EEkxIy2up3>2$c%#gQtp0C^9ORmn%-PrJ{B zT)^+5UukA={XP4;1l+GzzH ztfuQT9RnQC`d$MfXXiHjr9iZXNtZiXUKTiY&~{SL)r;Tfpaz^AymW&Cyy0h>u;DQ{ zBR?r$A03KAXyX^`3Q#d}N9_D}7b;Bs;jD5wOjXuuwMZ)LWb9|5Csz~|d7;tl?PiT zkfzH0>EDA6_tA%-9(MH=aNVlT&IMV5fm`DQoM+CQx%t<9kIg#(^Rf__1==$T+P2pJ zP7fhjTHun^kB^T>W9-QZ_D{N67c=wj!$tq+ypz9vam%E?8R^^uluJ0YzPC|P+q=$p zxGH-ne{{8>Ccri8WzTgkLy`)Iq);x4-e>@L<`$Y^8wC5s^`W(-+_`)0i10Bmpg}R% zBXZ4cAlSsb#-MbhrluDCJ2Fu5%4Px>Ea$E_b|5t5<~GvFZ2zJ>3K90}?vQJ4N`+=wdt+Zde z)6A?|G`d>KNF^((zwRHT`O@Al8hQeGJ#K73_xb7BUb-W8Z5@@Wjsk)(@dTrUwpZoB z2_Vwa{Ah0r4Ilk_-H#T?%&ePARZ1p9ZVzYJXME6%r47 zT?B4Ecg`0ufZK0E3YI&qot>n^>(_(!*DC|+JGp;h!$v<1013q|{a>F5TOB?8Xp4*#!6z7X%OTie?50%?~bV-MZyh~J0=`Xq_!B!8h)*nYrUuKhZ#w~-BiVBgg8z75wj`m(l9;FW<|4q1 zQG%2NCaTr-Kb4<8hZC0*|kWqjI5GZiqE5jV~f$sR$-8~6jvGRfar|)sd>UG3r zAT#%(7RgfEcD5~CIc4xCi#YZ1w-*D*Gp_O$P!&;g?;dmyCRaVJSX(2f0#fA9&0VqD z3E;&ve5o$Q6@8Xo`tWl1-A{nZCJBe_jHFeb#C3$6q|)DUA|fKCS!t zx}qvr6dmV3J!D6g=O zy&6Bri`aJhwOz;jlfbX`-4GXXBKzl&j@QVk`5pKx?teU2L5L6)nA*Uod9DTg>62hF zR8UdWa0$)E&?|!d^2Kgixyy*^9Cpd6bm8Sv~R#4@X(zLxCS2N_-D^L?jR@J0?IJ- zSa3+8vf%zlL z!IFiojtO%_q@E2+FU7G~pXW+lTN*V-hZUep&Mk&E6t(FAbvkhgsq0yT4ju+H_)zc^ zlO}QNGVqdnP;;_?S2V+)CbM{ARBU7>Dzo z=v}gF7EH!T41SA$gwRo4ykVcD%T-j77MBdqwVS+-xs~2k;r(Xxcj5j|j&(thH^vzqhb1x5 zH8kV`_fsDu19T=(Z%H}tRpD5KMSrsIPl}IcL+6hyE%mG*BB6k@%cMV`CPd1c|1+-E z43HWv6gD=T)L545>EM-`-fhSTe6xxUA)z9!nb~QG3%M)sn zJ!?6eZ?9A;`5u5r-6z^_Sa885)biuaGUG-D99V0oFU2 zLeC1~E=j7mXAmHcOq!KmbLc&rjsYc80<>9sF;v;@3FgCy_{vBD zKICp?$A4f(`^P!&DiA&*^^YN4_%P@Oj*%;2Buu&Vc{w@cP%=UL%!;JbL-?CYY`z>F z|AX%;di;^+fFCwvuux!1fLBWB8F_VCg8QojSa$RvC7zSL1FHo?Ph%{k!7R$>KmJX{ ztiAnPFYP>B+VOgkU-$|2(QhZiFb~+rPK4cO0iZ_r_q18SB2>wynZrVJb|N{u$(^}3 z{rhdeuvitr{>3~-O-nl?pp?bpJ?HDCp83UEXTf+y=*wNAhe0wCFHkRfEMpG6lf69| z+z9}>$z}>f4nb)ZwE6=;aLoVk;W{d%L%|Wdk}9Nj;XYx@y_Do+QM;ph1(qQ+UW4nv z0EITYDONc-Iqrx1n@ z5^thUU%a+SH4CPt2397#OL1hMQQy+=y~Ib48t-mccw>xsFuy-}NimYxK;KXq@EV*- zr#RsuL~#5)a3-_8+9}Hw=A~WfPh3Zm`A}3nO-diEjjts)V8Be}>Q(Z$k_eXUDi|y~ zFK(tz4ZKo$WDOH(-|Vxo+)1Abobr>CT3hx`NxUC#M_VgitHG0&gYzNB7c8 z2R@`e_D%V11`8#aoc{ek{v{03plo9DbWsy*Kbm03wHg{@F5!@m9)3Yq{wM)PmbJl7 zJJksU&YjdI1u{J0h`j~ZpzgI^Kx*&7Z!Njc{K*INMC|FTy(DUZ^qwC;1v1@z_5aLC z&74QD80G)#UJ6a$uVo^6bih77>8gvQ*7D=;B|nwe6pAX<_D zURO6>>gC5{+wg|+ki{#fR458oPe_tBUC%G&7Q-*0kp&GNKM7JNhZ3{^DSibL3xfYd zUta~>F6YjjGdg2{|5J*6zD!Q)MG+*_BL^t>m4apAIwf!Y3`JXVkDGABETRL}n8>@Y z5l;>);qCxxfxjo-fCCNB!~lSWmgp1k&0K?ngO`Rm=vg)KXQkMqSMEh?{#9@4>R?<3 zCZ$E!eF$yxql<=dW>j}#@6o{2ya4*S08?wg=AhF|v0iYvRA|)>6Kg?I$r{-YKX+Oc z>w@v*@DQGG#sU&jgHofXr)Ob|AZIMLmd8q)k|%Un-iSRXl2fX|4vGj!|DeS| zig0XKS2JSM$raP$EaWW+V0`}ZVPiaEBo=~)ApRA}gtu|JdJUJtQec=kWsm?Vl0*mT zdEyf-^muUskFlhhXT1d0MD@mvjCUi8*fZh?Vo^9!3kFn}{&8?}Dg`m@iwOd^v!n-w zA8`V!oy}00L;2p~r5xnc`{P~z9x@B<;E93{Z@^CSB5Z8`*;(a-`@Kg(DaERJ0=&{cv|b5Jt?-=_6$14}r;1MSa~xgisSI zmm&#v7YDXa6tRHG-m+C$s&BC!@bNTQ`F&WhNsR78(*8PR1Mx+rD%7Bo-{dz*d zC=`5&Dqdbxz5?EZ{aiWLl#JY;ZrS8t}GE0oEOw@VLAP$CHT4hIXMV{rr1 zw6y#-?5E$uWi^2HU;rO#-z8x7$GV&lWDeZAQ6;&0`+};qHAiLfUC-tqE-o%Un2SuA zfC{7wN1~Q)QZ(T}j;M}duu9IXuwBjiv7~|79TZTdoMiDYE%OGg9k2;?<9T zQ<$|6ohXNC#Db9zV9DSA-E0Ad=QeMTp1!^;81R425PT@PzmCpN@2);Q?|KG9xQXYb z^shOy+I46G=@$LSty*EKc+lmClcQq-u%w<=WGJ#kO+xKo!6bCoMH!L$^#-h(R_*DV z+y1QpSokSP8y_Q~>=Q6G+Y0s{u|rKIZvqYsAtns(WU)6`%{ftT(4;i#4WbTjywN*S z>qUu0m6y#WbhODfl{=IICR*t^2xWF6xt?|H@5ARrB;(bon_mzYH;}x&{CsNK(9n=C zGBVPZzn6tkL|)=mBwoENnA^}2kWy=IY@E~7+-^s+v^i5#q{i4OX3PU&yoN`a|MmnrYpMmkf^)$;IvcK^co}UkK#S?d@-`oe(~(W+1=H#>SSA zChg-GXz;gphi~154UdIFh(ahhh-}Zz(J}Yiw{I`D-;W0F7Eq9r-$)#(y+w)b;Qdut zwfJp675wDJ3*#pVIqhBQ-H5~RSd;^Aqc)!O0KmJ~c)Xt+;@JTNaR+qU-YEeNoo`h> zu6#1}MB`-i;X;z3D$At7hYP?|xUc=b+TQslH&+LUqJnQKwg;cDm)gcGE`e8cB+E3E z(Al1FN3mhTXX*X)>5V|n72PRcj>35}E+k%rh7;r{vC4E<{MVAiRA0qZVtuvmy zumh^6I>p7rz~IdDxLuVThl+>>{>a(y-TYfP-}b3JJh+2esBB|Nr=I*O4YETuciAd5 zlksbYQixR;kp&02*}!m6Wl#`gPTP_Fr(Bq=%m%Q{B+Sk_wx>&a{*I%drL}vyLe;=3 zMqz3j7WC1^ufiACySlm!BJD*u0uZ5)5X=WC@Zm2 zHM+04DFrha*3Bce?L+Q`(6@aa- z3d097!b6$H|83HH-9XPoFJ*>$K@7AF}=!p94Fa1<~IGH^CaK}ZZikd4M7B19j)u-Mc> zKNJUMCyb|m0~@itIeT?RSp`cO{@C5^xFm}^r!1@q1?+gjOy1%4D2T(SZ;xSUBJhi!YKfZ=OB-{HV#aOG zf8ZyopC0UVU2W#3p}dT6U@k9viC1pAcHm(-kmBHhw*qnHvM_y>j)%RcKp|)H{3L1p zEyDP*2M^9*Soqk9o(pu@I=hwalkXMGrfXaD9*&aA0aD*<0mdk;B6{>B;e{nf!v^cNe zY}s-8``YM}w)3xad^+-nz;>s@+jXzB^4hbWn7||6Bzk#Cw9MvE;8a z2_Aq4W};+^jh+0tfVTZ^qrsmq90(!Yw&Ky1a34IuLqZxq2}vErQMl>Pa215?sh~_e zvRjVsK!Kk@4!EI$<#9$CriIeZq906!F5u;&R~=Gj@6{cf-?h^>xTIBO&b59&E>b7( z)zMjgELVKTkuyq=;QZ?-Y2$WqSQ;*pR$DZ>ZWwMEQXruU^m=ypzS5VXN4rT>s|w}8 z=$4td6EWCihU?Sg5f=WTIBAh+$qz?wI=gjs2w}x55I1moNZd2rWY2Ko0+TcR^4Ti_ zh8Uv>+rT^K&-Yjh0x>sI(}XXAo&$dLH(VGxb;`EF;1I5;^~V1OK|5Wr%PI#J>SwG~Z$&Ej7*Qg{kvrgD+TqN8G6Bs*=>gS~&CA%hQTy2~A9IX9*?h8_-yZk{4x zP->#LJUQM1pLB*>@}9Cqve>|gZ%Y6^7UqfD^6w{N^(l4c4-rJs#wYthVRFzEv#bIR z66R@r%E&$hBV`x+RZ7JB-D1&50$_3GRD$zWMs>KnBkM$te53<CAh%hinvriUopI zIS?&|hRqHW8EzO&U|=}M%&;L=fsrBFQfLk*!#6IVvB{1z8E&Wp<@(qdHn;=jWcV2p z>VYo$R^Viz#E`=Wv~GEe6XOO$pxkaNO&QSy{~N*}_1sIDzBT^^I{3i}h7ICxSb=US z>*IaSc7tsj$myG%H#X=da05*$E3LC|NVv-k)Wj$Fl8PDnrA{h9Te9LSalg{Ri&UlRwKa^r5`<28}q zYgBUeL5~;sN9K_uD_(7!b8cq=NqcFpaVxaj9Ow5c;mLM|~3IrTx7=whGxEtFl z89+iDHx&#PMuWwsxiU%p0xmmXP*7xGvIE-3;K?ZPh7ss{4=&(octCGB1TnBwgVau9 zp2XZ_15$EB)luO9$X^YvlUSRqKtc=*Gdh4LgE62V&&L4t4G<*w{gd}7>t_A>?Y=#T N@9FC2vd$@?2>{9{pB4ZB diff --git a/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang b/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang deleted file mode 100644 index 21cf0a86..00000000 --- a/src/main/resources/assets/bloodmagicguide/lang/de_DE.lang +++ /dev/null @@ -1,288 +0,0 @@ -# Book Information -guide.bloodmagic.title=Sanguine Scientiem -guide.bloodmagic.display=Sanguine Scientiem -guide.bloodmagic.author=Blood Magic -guide.bloodmagic.welcome=Blood Magic - -# Page Information -guide.bloodmagic.page.bloodAltar=Blutaltar Rezept -guide.bloodmagic.page.soulForge=Höllenfeuerschmiede Rezept -guide.bloodmagic.page.tier=Ausbaustufe: %d -guide.bloodmagic.page.lp=LP: %d -guide.bloodmagic.page.minimumWill=Minimaler Wille: %f -guide.bloodmagic.page.drainedWill=Verbrauchter Wille: %f -guide.bloodmagic.shapelessOrb=Formloses Blutkugel-Rezept -guide.bloodmagic.shapedOrb=Striktes Orb-Rezept -guide.bloodmagic.page.alchemyArray=Alchemische Anordnung - - -# Categories -guide.bloodmagic.category.architect=Der Architekt -guide.bloodmagic.category.ritual=Der Ritualmeister -guide.bloodmagic.category.demon=Das Dämonenkind -guide.bloodmagic.category.spell=Der Kriegsmagier -guide.bloodmagic.category.alchemy=Der Alchemist - -# Ritual Master Entries -guide.bloodmagic.entry.ritual.intro=Einführung -guide.bloodmagic.entry.ritual.basics=Grundlagen der Ritualmagie -guide.bloodmagic.entry.ritual.ritualStone=Ritualsteine -guide.bloodmagic.entry.ritual.masterRitualStone=Haupt-Ritualstein -guide.bloodmagic.entry.ritual.activationCrystal=Aktivierungskristalle -guide.bloodmagic.entry.ritual.diviner=Die Ritualrute -guide.bloodmagic.entry.ritual.fullSpring=Ritual der vollen Quelle -guide.bloodmagic.entry.ritual.lava=Gesang des Nethers -guide.bloodmagic.entry.ritual.greenGrove=Ritual des grünen Hains -guide.bloodmagic.entry.ritual.magnetism=Ritual des Magnetismus -guide.bloodmagic.entry.ritual.crusher=Ritual des Brechers -guide.bloodmagic.entry.ritual.highJump=Ritual des hohen Sprungs -guide.bloodmagic.entry.ritual.speed=Ritual der Geschwindigkeit -guide.bloodmagic.entry.ritual.wellOfSuffering=Quelle des Leidens -guide.bloodmagic.entry.ritual.featheredKnife=Ritual der gefederten Klinge -guide.bloodmagic.entry.ritual.regen=Ritual der Regeneration -guide.bloodmagic.entry.ritual.harvest=Ritual der Mondernte -guide.bloodmagic.entry.ritual.interdiction=Ritual der Verbietung -guide.bloodmagic.entry.ritual.containment=Ritual der Eindämmung -guide.bloodmagic.entry.ritual.suppression=Kuppel der Unterdrückung -guide.bloodmagic.entry.ritual.expulsion=Aura der Vertreibung -guide.bloodmagic.entry.ritual.zephyr=Ruf des Zephyrs -guide.bloodmagic.entry.ritual.laying=Füllung der Grube -guide.bloodmagic.entry.ritual.timberman=Kahlschlag des Holzfällers -guide.bloodmagic.entry.ritual.meteor=Zeichen des fallenden Turms -guide.bloodmagic.entry.ritual.downgrade=Sühne der belasteten Seele -guide.bloodmagic.entry.ritual.crystalSplit=Resonanz des facettierten Kristalls -guide.bloodmagic.entry.ritual.portal=Das Tor der Faltung (Englisch) -guide.bloodmagic.entry.ritual.altarBuilder=Die Zusammensetzung des hohen Altars (Englisch) -guide.bloodmagic.entry.ritual.pump=Die Hymne des Siphonierens (Englisch) -guide.bloodmagic.entry.ritual.cobble=Der gefrorene Vulkan (Englisch) -guide.bloodmagic.entry.ritual.ellipsoid=Fokus des Ellipsoids (Englisch) -guide.bloodmagic.entry.ritual.crystalHarvest=Bruch des frakturierten Kristalls (Englisch) -guide.bloodmagic.entry.ritual.forsakenSoul=Versammlung der verlassenen Seelen (Englisch) -guide.bloodmagic.entry.ritual.animalGrowth=Ritual des Schäfers (Englisch) -guide.bloodmagic.entry.ritual.livingEvolution=Ritual der lebenden Evolution (Englisch) -guide.bloodmagic.entry.ritual.upgradeRemove=Ritual der reinigenden Seele (Englisch) -guide.bloodmagic.entry.ritual.fullStomach=Ritual des gesättigten Magens (Englisch) -guide.bloodmagic.entry.ritual.eternalSoul=Ritual der ewigen Seele (Englisch) -guide.bloodmagic.entry.ritual.condor=Anbetung des Condors (Englisch) -guide.bloodmagic.entry.ritual.featheredEarth=Ritual der gefederten Erde (Englisch) -guide.bloodmagic.entry.ritual.grounding=Ritual der Erdung (Englisch) -guide.bloodmagic.entry.ritual.veilOfEvil=Schleier des Bösen (Englisch) -guide.bloodmagic.entry.ritual.wardOfSacrosanctity=Schutz der Unantastbarkeit (Englisch) - -# Ritual Master Entry Text -guide.bloodmagic.entry.ritual.intro.info=Guten Abend. Mein Name ist Magus Arcana. Ich habe über die Jahre viele Gestalten angenommen: ein Dieb und ein Wächter, ein Zauberer und ein Krieger, ein umherwandernder Nomade und sogar ein Politiker. Der Titel, den ich dieser Tage trage ist einer, der sich dem Verständnis der meisten Leute entzieht, bei dessen bloßer Erwähnung Bilder von Brutalität hervorkommen, welche in manchen Fällen wohl verdient, in vielen anderen jedoch schlicht fehlgeleitet sind. Natürlich rede ich davon, ein Blutmagier zu sein, doch meine Freunde nennen mich einfach Magus, während meine Feine mich als den Ritualmeister bezeichnen.\n\tMeine Schüler bedrängen mich nun schon seit Monaten, versuchen mich zu überzeugen, dass ich all meine Abenteuer niederschreibe, in die ich verwickelt war, um sie unter den aufstrebenden Magiern zu verteilen. Ich hatte mich geweigert, aber Tiberius hat es am besten in Worte gefasst: "Auch wenn du selbst nicht den Wert darin sehen kannst, ist es für spätere Generationen doch unbezahlbar, die Feinheiten eines Handwerks von jemanden zu hören, der dieses gemeistert hat. Es spielt keine Rolle wie genau es jemand anderes wiedergibt, wenn man nicht absolutes Vertrauen in die Quelle hat, könnte der Goldsand auch nichts weiter als Schwefel sein." Man konnte sehen, dass er sich zu der Zeit ein wenig mit Alchemie beschäftigt hat, aber da er seit langer Zeit mein erster Student war, tendiere ich dazu, seine Meinung zu respektieren.\n\tNun denn, angehender Blutmagier, der du das Arkane studierst, dass viele noch nicht vollständig begreifen, leihe mir deine Aufmerksamkeit für diese Worte, die es wert sind, befolgt zu werden: das Gebiet, dass du studierst hat viele Aspekte und ohne wohl überlegte Planung wirst du deine Werkzeuge als unzureichend empfinden. Deswegen solltest du sicher stellen, dass du dieses Buch oft zu rate ziehst - Ich habe einen Folianten mit vielen Verzauberungen versehen, sodass es, wann auch immer ich etwas in meiner Meister-Kopie schreiben sollte, sich die Worte für dich verändern werden.\n\tNun lehne dich zurück, entspanne dich und genieße die Lehren eines sehr alten Mannes. Du mögest mehr lernen, als du erhofft hast. -guide.bloodmagic.entry.ritual.basics.info=Moderne Rituale sind sehr verschieden von denen, die vor Jahrtausenden durchgeführt wurden. Es gab eine Zeit, in der die Leute Arkane Konstrukte aus Staub in den Boden zeichnen und so lange darum tanzen würden, bis sie bekommen haben, was sie wollten. Ich Erinnere mich sogar an eine Kräuterhexe, die Energie aus ihrem Garten gezogen hat. Ich habe sie ausgelacht, bis sie ihre Eule auf mich hetzte. \n\tDie Rituale, die Blutmagier nutzen benötigen die genaue Anordnung von gezeichneten Steinen, um vom Magier hineingepumpte Energie zu fokussieren und transformieren. Eines Tages wühlte mein Lehrling Tiberius durch meine alten Artefakte, die ich über die Jahre beschafft hatte und seitdem im Kleiderschrank seines nun neuen Zimmers lagen. Dort war eine Phiole flüssigem Etheriums, die ich seit Jahren nicht angefasst habe (Ich wollte darauf zurückkommen, allerdings hatte ich leider keine Zeit), sowie eine Kristallkugel, welche scheinbar immer "Dienstag" sagt, wenn man durch sie blickt. Als eine der Kisten mit der Aufschrift "Runenstaub" umgestoßen wurde, ist ein kleiner roter Edelstein herausgefallen und gegen Tiberius Fuß gestoßen. Sofort strahlte der Stein in einem grellen, rubinroten Licht das mit dem Staub in der Truhe, die er trug, reagierte.\n\tSelbstverständlich verursachte das eine Explosion. Die unfokussierte Energie, die Tiberius unvermeidbar durch den Edelstein freigesetzt hat, sprühte Funken auf den runischen Staub und die Steine um ihn herum und ohne eine Möglichkeit, die Energie einzudämmen, hat sie sich einfach ausgedehnt. Nach ein paar Tagen auf der Krankenstation begannen Tiberius und ich zu arbeiten. Durch eine Mischung aus mehreren schlaflosen Nächten und einer kräftigen Portion Koffein (ich muss mich wirklich bei Herr Spieler für die Kaffeeversorgung bedanken, ich begrüße Ihre Bemühungen für ein wacheres Morgen! Durch unser Experimentieren lernten wir, dass wir vier verschiedene Dinge brauchten: Wir brauchten einen Haufen Ritualsteine, die in einem bestimmten Muster um einen Bereich gelegt wurden, ein paar verschiedene Tinten, die auf die Ritualsteine aufgetragen wurden, um das Muster weiter zu spezifizieren, einen zentralen Ritualstein, der als zentraler Kraftkanal fungiert, und einen Kristall, der das Ritual aktiviert. Ich denke, es ist das Beste, wenn wir nacheinander darüber reden. -guide.bloodmagic.entry.ritual.ritualStone.info.1=Der Ritualstein dient als einfaches Behältnis für magische Energie, formt sie und leitet sie je nach Konfiguration des Steins weiter. Wenn du anfängst, gibt es fünf verschiedene Steine, zu denen du Zugang hast: Leer (der Grundstein ohne Markierungen), Wasser, Feuer, Luft und Erde. Jedes einzelne Ritual wird eine Reihe davon haben, und je nachdem, wie sie um den Meisterritualstein herum angeordnet sind, wird die Gesamtwirkung unterschiedlich sein. -guide.bloodmagic.entry.ritual.ritualStone.info.2=Um die richtigen Symbole auf die Ritualsteine zu schreiben, benötigst du einen Satz Beschriftungswerkzeuge. Seitdem habe ich eine Methode entwickelt, mit der man die richtigen Farben leichter auf die Ritualsteine auftragen und sie in die richtige Konfiguration bringen kann, aber wenn man dies manuell tun möchte, kann man diese Werkzeuge benutzen. Wenn du einen Ritualstein mit einem der Beschriftungswerkzeuge in der Hand aktivierst (Rechtsklick auf den Stein), tragst du etwas Tinte auf den Stein auf und änderst ihn in den gleichen Typ wie das Werkzeug. In den frühen Stufen habst du nur Zugang zu den vier Grundfarben, aber wenn Sie stärker werden, stehen dir mehr Werkzeuge zur Verfügung. -guide.bloodmagic.entry.ritual.masterRitualStone.info=Wie bei den meisten Arten der Magie wird die Wirkung des Rituals ohne eine leitende Kraft entweder unkontrollierbar werden oder einfach nicht funktionieren. Um die Rituale zu kontrollieren, ist also ein Haupt-Ritualstein erforderlich (ich kürze dies in meinen Notizen normalerweise mit "HRS" ab, aber es in der Öffentlichkeit zu sagen, ist etwas unangenehm. "Ich brauche mehr HRS bitte!"). Der HRS nimmt die Macht aus dem LP-Netzwerk des Besitzers auf und treibt sie durch die Ritualsteine und führt so das Ritual durch. Das LP-Netzwerk an einen großen Stein zu binden, den wir nicht in unseren Händen halten, erwies sich als etwas knifflig. Ich habe es einmal geschafft, indem ich auf den Stein in der Lotusstellung meditierte, meine Kraft durch den Stein konzentrierte und versuchte, die Ranken meines Netzwerks mit dem Inneren des Rituals zu verbinden. Obwohl ich es für ein paar Minuten zum Laufen gebracht habe, war alles, was mir wirklich zugesprochen wurde, eine nasse Hose, da sich Wasser auf den Ritualsteinen verdichtete. Ich habe gelernt, über keines meiner Experimente mehr zu meditieren. -guide.bloodmagic.entry.ritual.activationCrystal.info.1=Anstatt eine Stunde lang zu warten, um das Ritual durch meditieren zu aktivieren, nahmen wir den roten Edelstein, der ursprünglich aus der Schachtel fiel, und begannen ihn zu analysieren. Tiberius war sich sicher, dass er die Fähigkeit hatte, "Verbindungen zwischen dem körperlichen Bereich unserer Realität und der unkörperlichen Essenz, die das manifestierte LP-Netzwerk ist, herzustellen". Manchmal frage ich mich, ob es eine gute Idee war, ihn zu meinem Lehrling zu machen, aber in Zeiten wie diesen sehe ich sein Talent für die arkaneren Aspekte der Magie. Oh, ich sollte wohl schreiben, was er auf Deutsch meinte: Indem wir diesen Kristall benutzen, könnten wir unsere LP-Netzwerke mit dem Haupt-Ritualstein verbinden, um ihn mit Energie zu versorgen. -guide.bloodmagic.entry.ritual.activationCrystal.info.2=So hatten wir einen schwachen Aktivierungskristall und ein Mittel, um seine Struktur wiederherzustellen. Der Hauptbestandteil des Kristalls ist ein weiterer Kristall, der mit meinem LP-Netzwerk verbunden werden kann: ein Lavakristall. Dann kann der Blutaltar, indem er schnell einige Anweisungen auf die Oberfläche des Kristalls schreibt, den Rest der Arbeit erledigen, um ihn in einen Aktivierungskristall umzuwandeln. Natürlich muss dieser Kristall an das LP-Netzwerk des Benutzers gebunden sein, um zu funktionieren. Wenn die Steine des Rituals richtig um den HRS gelegt sind, sollte der Benutzer den Aktivierungskristall an den HRS berühren und genügend Energie ausstoßen, um das betreffende Ritual zu starten. Wenn du genug LP in deinem LP-Netzwerk hast, wird das Ritual aktiviert. Falls du nicht genug LP hast, oder die Steine nicht richtig ausgelegt sind, wird das Ritual einfach nicht aktiviert und es entstehen keine LP-Kosten. -guide.bloodmagic.entry.ritual.diviner.info.1=Nachdem ich die Größe und Auslegung vieler Rituale erkannt hatte, fand ich es etwas lästig, ständig meine Notizen zu konsultieren, um die Rituale aufzubauen. Deshalb habe ich daran gearbeitet, einen Apparat zu entwickeln, der es jedem erlaubt, die Steine durch einfache Gesten und Bewegungen einfach in die richtige Position zu bringen. Ich habe diesen Eintrag chronologisch weiter oben auf der Liste platziert, weil es für die Leute am besten ist, von diesem Gegenstand zu lernen, bevor sie mit der eigentlichen Konstruktion von Ritualen beginnen. Sonst finden sie vielleicht heraus, dass sie nicht alles haben, was sie brauchen, oder sie beschwören einen Meteoriten aus der Hölle statt einer frischen Flasche Quellwasser. -guide.bloodmagic.entry.ritual.diviner.info.2=Die Ritualrute ist im Wesentlichen eine Enzyklopädie für Rituale. Indem du durch die Rute blätterst (Shift-Linksklick und Shift-Rechtsklick), kannst du ein anderes Ritual aus seinem Wissensspeicher auswählen. Der Blick in die Ritualrute sagt dir auch einige einfache Informationen über das Ritual. Wenn du Ritualsteine bei dir trägst und den HRS mit der Ritualrute berührst (Rechtsklick), kannst du einen Stein für das Ritual platzieren, das du bauen willst. Wenn du das oft genug machst, wirst du ein vollendetes Ritual haben! -guide.bloodmagic.entry.ritual.fullSpring.info=Vor ein paar Jahren kam ein reisender Händler in das Dorf in der Nähe meines Hauses und verkaufte seine Waren an alle, die bereit waren, sich von ihrer Münze zu trennen. Zu dieser Zeit gab es eine Dürre und die Ernten starben, so dass der Händler einen silbernen Talisman mit einem blauen Edelstein in seinem Inneren hervorbrachte. "Das, meine Freunde", sagte er mit großem Eifer, "wird dafür sorgen, dass eure Flüsse nicht austrocknen! Mit Hilfe der Alchemie kann ich Wasser aus der Luft hervorbringen!" \n\tUnglücklicherweise für das Dorf schien es, dass der Edelstein ein einfaches Stück Saphir war, und bevor jemand merkte, dass sie ausgetrickst wurden, war er schon einige Meilen entfernt. Ich neige dazu, nicht in die Angelegenheiten des Dorfes einzugreifen, weil sie meine Magie nicht mögen, aber in diesem Fall habe ich eine Ausnahme gemacht. Nach einem netten Gespräch mit dem "Alchemisten" habe ich einige Stunden in der Nähe der Bewässerungskanäle meditiert. Durch die Kondensation des Wasserdampfes in der Luft gelang es mir, genügend Wasser zu erzeugen, um die Pflanzen bis zum nächsten Niederschlag zu bewässern. Das war nicht gerade eine effiziente Methode, und ich war für die nächsten Tage erschöpft, und ich benutzte etwas von dem Wasser aus dem Kanal, um mich zu rehydrieren. Durch die Zufuhr einer kleinen Energiemenge in das Ritual kondensiert es die Feuchtigkeit in der Luft um es herum, um eine Wasserquelle auf dem Haupt-Ritualstein zu erzeugen. Die Kosten für die Aktivierung des Rituals sind ziemlich gering, und der Unterhaltsaufwand ist umso geringer. Die Reichweite des Wassers kann durch den Einsatz des Ritual-Tüftlers erweitert und sogar an einem anderen Ort platziert werden, so dass man sich keine Gedanken darüber machen muss, wo ein Ritual platziert wird, wenn man sich um Ästhetik sorgt. Die Wunder der Magie! -guide.bloodmagic.entry.ritual.lava.info=Lava, vielleicht eine der rudimentärsten Energiequellen. Ich neige dazu, es nicht viel in meiner eigenen Forschung zu benutzen, weil es ein wenig schwierig sein kann, damit zu arbeiten - es ist nicht so, als ob man einen einfachen Eisenkübel benutzen könnte, um etwas aufzuheben! Einer der hiesigen Tüftler kam eines Tages bei mir vorbei und fragte mich, ob es irgendwelche Quellen in der Nähe gäbe, da er vor kurzem neue Ausrüstung gekauft hatte, für deren Betrieb Lava benötigt wird. Ich sagte, dass es einige gab, doch die meisten von ihnen waren bereits im Besitz, aber ich entschied mich, zu ihm zu kommen, um mir das Gerät anzusehen. \n\tEs war eine mindestens 5 Meter hohe und ebenso breite Schmelzanlage, die an mehrere Tanks angeschlossen war, die leer und karg standen. Obwohl ich mir nicht ganz sicher war, wie es funktioniert, konnte ich sagen, dass die rohe Hitze der Lava perfekt dafür sein würde - Elektrizität würde gut funktionieren, wenn sie richtig modifiziert würde, aber ich konnte erkennen, dass dies nicht von Immersive Industries war. \n\tNach einem kleinen Gespräch mit dem Tüftler wechselte das Geld den Besitzer und ich bat ihn, zurückzutreten, während ich meine Ritualsteine vorbereitete. Um das zu verwirklichen, was ich mir wünschte, nahm ich vier Feuersteine und legte sie in einem Kreuz um den Haupt-Ritualstein und schob sie dann mit meinem Aktivierungskristall fest, während ich mir den Vorgang in meinem Kopf vorstellte. In der Theorie sollte es einfach sein: Man nimmt einige Steine aus der Tiefe der Erde und komprimiert sie mit etwas Energie, wodurch sie unter dem starken Druck geschmolzen werden. Diese Lava könnte man aus dem Ritualstein herausholen und den Vorgang wiederholen. Für mein damaliges einfaches Netzwerk waren die Aktivierungskosten wegen des erforderlichen Anfangsdrucks ziemlich hoch, und der Abfluss für jede Lavaquelle war nicht etwas, auf das ich vorbereitet war. (20000 LP zu aktivieren, 500 LP pro Quellblock)\n\tIch taumelte mit einem Grinsen im Gesicht aus dem Gebäude: Die Tanks waren voller Lava, genug, um den Tüftler für ein paar Wochen im Geschäft zu halten, bis er sich eine dauerhaftere Lavaquelle beschaffen konnte. Ich habe allerdings dafür gesorgt, dass ich meine Ritualsteine wieder aufnehme, nachdem ich fertig war. \n\n------------------\n\tWenn keine Änderungen am Ritual vorgenommen werden, wird es versuchen, eine Quelle von Lava auf dem Block direkt über sich selbst zu platzieren, zu einem Preis von 500 LP pro Tick, wenn es Platz gibt, und Flüssigkeiten verdrängen, wenn sie fließen. Dieser Platzierungsbereich kann standardmäßig auf maximal 9 Blöcke in einem maximalen Abstand von 3 vom Ritual erweitert werden. Durch die Erweiterung des Rituals mit Rohem Willen werden die LP-Kosten im Verhältnis zu dem Willen, der sich in der Aura befindet, verringert, wobei der Verbrauch des Willens proportional zur Menge an LP ist, die eingespart wird. Die Verwendung dieses Willens kann außerdem die Fähigkeit verleihen, Lava direkt in das Innere eines Blocks zu bringen, wie zum Beispiel ein Tank, mit einer Rate, die mit normalen rituellen Operationen vergleichbar ist.\n\tKorrosiver Wille bewirkt, dass das Ritual Feuerimmunität umkehrt und alle Entitäten, die innerhalb eines bestimmten Bereichs gegen Feuer immun sind, gemäß der Menge an Willen in der Aura schwer beschädigt werden. Wenn Rachsüchtiger Wille auf das Ritual angewendet wird, wird ein flüchtiges Gas freigesetzt und bewirkt, dass alle Nicht-Spieler-Einheiten innerhalb seines spezifizierten Bereichs von Fire Fuse beeinflusst werden. Wenn der Timer des Schwächungszaubers auf 0 geht, wird das Wesen explodieren und sie mit explosiver Kraft in die Luft treiben. Zerstörerischer Wille erhöht die maximale Reichweite und Volumen, die das Ritual beeinflussen kann. Je mehr Wille Sie haben, desto mehr Lavablöcke können durch ein einziges Ritual gesetzt werden. Glücklicherweise entzieht das Ritual keinen Zerstörerischen Willen, aber wenn dein Wille fällt und die maximale Reichweite des Rituals geringer ist als die, auf die du es eingestellt hast, wird das Ritual überhaupt nicht funktionieren, bis es repariert ist. Letztlich gewährt Standhafter Wille allen Spielern innerhalb seiner Reichweite einen Feuerwiderstandsbuff, dessen Zeit und Willenskosten durch die Menge des Willens in der Aura beeinflusst werden. Vorsicht ist geboten, denn wenn du von Feuerresistenz betroffen bist, kannst du durch die korrosive Wirkung des Rituals beschädigt werden. -guide.bloodmagic.entry.ritual.greenGrove.info=Letzte Woche begann ich, Tiberius seine interdisziplinäre Magie beizubringen. Jeder Lehrling, den ich hatte, musste beim Erlernen der Blutmagie eine andere Form der Magie erlernen. Es spielt keine Rolle, welche sie wählen, solange sie nicht irgendeine Form von endlicher Ressource verbrauchen - ich habe eine Form der Magie des Ars-Clans aus dem fernen Osten verwendet, aber da die Quelle des Etheriums der Welt knapp wurde, ist sie längst ausgestorben. \n\tTiberius hat beschlossen, Thaumaturgie zu lernen, die die Magie der Welt benutzt, um deine Magie auszuführen. Dies ist ein gutes Gegengewicht zur Blutmagie, die die Magie des Lebens nutzt. Als solche verwenden diese Magien verschiedene Mittel, um die gleichen Aufgaben zu erfüllen. Um das zu demonstrieren, habe ich beschlossen, die Unterschiede zu Tiberius hervorzuheben, wenn es um das Wachstum der Pflanzen geht.\n\t Thaumaturgie benutzt einen Wachstumskatalysator, der von der Essentia Herba angetrieben wird," sage ich, während ich auf das Essentia Flussdiagramm zeige, das an der Klassenzimmerwand befestigt war. Sicher, Tiberius saß dort am einzigen Schreibtisch, aber manchmal muss ein Mann etwas Spaß haben. "Ein kleines Rinnsal von Aura und dieser Essenz stimuliert den photosynthetischen Prozess der Pflanze und ermutigt sie, durch mehr Sonnenenergie zu wachsen. Dieser Prozess erfordert, dass der Boden gut gedüngt ist, sonst kann die Ernte einfach verwelken und absterben.\n\tIch nehme nun vier Erd- und Wasserritualsteine und lege sie in einen Kreis um einen Haupt-Ritualstein. "Umgekehrt verwendet die Blutmagie einen anderen Prozess." Während ich spreche, aktiviere ich das Ritual und bedecke es mit einfachem Schmutz. "Indem man seine Lebenskraft oder die der Tiere nutzt, kann man die Pflanzen so düngen, dass sie nicht so viel Dünger benötigen. Im Wesentlichen ernährt es die Pflanzen, so dass sie immer eine hohe Konzentration an Nährstoffen haben."\n\tIch werfe ein paar Samen auf den Schmutz und bedecke sie leicht, entkorke und leere eine Ampulle mit Wasser aus meinem Gewand. "Dieser Prozess benötigt kein zusätzliches Sonnenlicht, da er eine andere Energiequelle nutzt. Obwohl es viel besser funktioniert, wenn es etwas Licht gibt - die Pflanze ist nicht gerade an diese Art von Bedingungen gewöhnt!"\n\tEin paar Triebe haben bereits ihre Blätter aus der Erde geschossen, während ich erklärt habe, scheinbar als Antwort winkend. Ich spürte die milde Belastung meines Körpers, als jedes neue Blatt sprießte, jedes Mal geringfügig, aber als es sich ansammelte, begann es sich zu sammeln. Als ich den Kurs beendet hatte, räumte ich den Dreck vom Experiment auf und beschloss, einen schönen Spaziergang ins Dorf zu machen: Ich hatte einen Scheffel Weizen, der verkauft werden musste. \n\t----------\n\tDas Ritual des Grünen Hains, wie der Name schon sagt, beschleunigt das Wachstum von Pflanzen, die in der Umgebung sind. Indem es das Blut des Spielers als reiches Düngemittel verwendet, wird es versuchen, alles zu züchten, was es als eine Pflanze betrachtet, wie Weizen und Karotten, und alles, was in seinem Bereich wächst, in regelmäßigen Abständen. Durch Standardoperationen wird das Ritual den 3x3-Bereich zwei Blöcke über sich selbst betrachten und versuchen, jeden Block mit einer Erfolgsrate von 30% pro Sekunde zu vergrößern. Wenn mit dem Ritual-Tüftler manipuliert, kann das Ritual maximal 81 Pflanzen gleichzeitig in einem Radius von 5 Blöcken um den HRS herum bearbeiten. Als weitere Anmerkung:\n\tWenn Dämonischer Wille ergänzt wird, gibt es mehrere Effekte, die erzielt werden können. Wenn Roher Wille verwendet wird, wird das Ritual alle Operationen mit einer beschleunigten Rate durchführen, wobei 0,05 Wille pro erfolgreichem Wachstum verbraucht wird und die Geschwindigkeit im Verhältnis dazu, wie viel Wille in der Aura ist, erhöht wird. \n\tWenn es mit Rachsüchtigem Willen angereichert wird, wird das Ritual 0,05 Wille pro erfolgreichem Wachstum verbrauchen und die Chance erhöhen, dass ein bestimmter operativer Tick auf der Pflanze erfolgreich sein wird. Standardmäßig ohne Willen ist es 30%%, wenn aber zum Beispiel 100 Rachsüchtiger Wille zur Verfügung steht, erhöht sich die Rate auf 80%%.\n\tZerstörerischer Wille erhöht die effektive maximale Reichweite des Rituals, was bedeutet, je mehr Wille du hast, desto mehr Ernten/Pflanzen kann ein einzelnes Ritual verarbeiten. Glücklicherweise entleert das Ritual keinen Zerstörerischen Willen, aber wenn dein Wille fällt und die maximale Reichweite des Rituals geringer ist als die, auf die du es eingestellt hast, wird das Ritual überhaupt nicht funktionieren, bis es wiederhergestellt ist.\n\tStandhafter Wille gewährt die Fähigkeit, einen Bereich um das Ritual herum festzulegen, der automatisch gepflügt und bewässert wird. Zusätzlich wird jedes Saatgut, das sich in diesem Bereich befindet, wenn möglich auf einem nahegelegenen Block gepflanzt. Das kostet eine kleine Menge von Standhaftem Willen, und seine Auswirkungen skalieren nicht mit Willen in der Aura.\n\tWenn korrosiver Wille im Ritual verwendet wird, kann sich die grundlegende Natur des Rituals verschieben. Wenn der neue Bereich richtig eingestellt ist, werden alle Mobs, die in den Einflussbereich des Rituals eintreten, mit dem "Blutegel"-Effekt versehen. Alle paar Ticks werden die Pflanzen in der Nähe der Mobs beschädigt und der Mob wird proportional beschädigt. Direktes Düngen mit Mobs kann sich als vorteilhaft erweisen! Alle 10 Sekunden, die der Schwächungszauber pro Mob angewendet wird, wird 0.2 korrosiver Wille verbraucht. -guide.bloodmagic.entry.ritual.magnetism.info=Das Ritual des Magnetismus ist das Brot und die Butter eines jeden, der Steinbrüche schätzt. Das Ritual erzeugt ein sich drehendes Magnetfeld, das die reichen Erze aus dem Boden unter ihm herauszieht und den Inhalt in seinem Bereich platziert. Dadurch wird kein Gestein verdrängt, so dass keine klaffenden Löcher im Land entstehen - vorausgesetzt, das Land besteht nicht nur aus Erz. Das Ritual funktioniert einmal alle 40 Ticks und kostet 50 LP pro erfolgreicher Operation. Der Standardradius dieses Rituals ist 3 Blöcke in jeder Kardinalrichtung, was eine Fläche von 7x7 Blöcken ergibt, die auf dem HRS zentriert ist. Da das Ritual derzeit keine Willensvergrößerungen hat, können Sie den Wirkungsradius für das Ritual nur erhöhen, indem Sie einen wertvollen Block direkt unter das MRS legen. Wird ein Eisenblock verwendet, wird der Radius 7. Wenn ein Goldblock verwendet wird, wird der Radius 15. Wenn schließlich ein Diamantblock verwendet wird, dehnt sich der Radius auf 31 aus, was bedeutet, dass alle Erze unterhalb des Rituals in einem 63x63 Bereich langsam in sein 3x3x3 Volumen über dem HRS gezogen werden. -guide.bloodmagic.entry.ritual.crusher.info=Das Ritual des Brechers ist ziemlich einfach. Das Ritual muss mit einer Art Inventar verbunden sein, das unverändert auf dem HRS sitzt. Während des Betriebs blickt das Ritual innerhalb seines Brechbereichs (standardmäßig der 3x3x3 Bereich unterhalb des Rituals) und bricht einen Block nach dem anderen alle 2 Sekunden zum Preis von 7 LP pro erfolgreicher Operation. Die zerbrochenen Blöcke werden dann in das verknüpfte Inventar übertragen - wenn es keinen Platz für die Gegenstände gibt, werden sie stattdessen auf die Truhe gespuckt.\n\tWenn es mit Rohem Willen versorgt ist, wird das Ritual schneller funktionieren, basierend auf der Gesamtmenge des Willens in der Aura. Während es beschleunigt wird, verbraucht es 0,05 Rohen Willen pro erfolgreicher Operation.\n\tZerstörerischer Wille bewirkt, dass Glück auf Blöcke angewendet wird, die durch das Ritual gebrochen werden. Derzeit variiert die Glücksstufe nicht und ist stattdessen Stufe 3, unabhängig von der Höhe des Willens. Das wird 0,2 Wille pro erfolgreicher Operation verbrauchen, unabhängig davon, ob es nützlich war oder nicht.\n\tStandhafter Wille wird stattdessen dazu führen, dass Blöcke mit dem Behutsamkeits-Effekt gebrochen werden. Das kostet 0,02 Will pro Operation und überschreibt den Effekt des Zerstörerischen Willens, wo immer es möglich ist.\n\tKorrosiver Wille bearbeitet Blöcke, die durch das Ritual gebrochen werden, mit irgendeiner Form von Schneidflüssigkeit. Das bedeutet, dass zum Beispiel, wenn es sich um einen Block Eisenerz handelt, das Ergebnis zwei Stücke Eisensand sind. Die aktuellen "Schneidflüssigkeiten", die das Ritual verwendet: Einfache Schneidelösung und Explosives Pulver. Das Ritual verbraucht eine andere Menge des Willens, basierend auf dem, was verwendet wurde, und wird den Willen nur verbrauchen, wenn der Effekt zutrifft. Dies überschreibt Behutsamkeit, wo es möglich ist. \n\tRachsüchtiger Wille bewirkt, dass bei einer erfolgreichen Operation der Inhalt des Inventars ähnlich dem Siegel der Kompression komprimiert wird: Wenn sich 65 Redstone-Staub in der Truhe befindet, wird ein Block von Redstone hergestellt und 56 Staub verbleiben. Der Wille wird nur verbraucht, wenn die Operation erfolgreich ist, und es kostet 0,2 Wille. -guide.bloodmagic.entry.ritual.highJump.info=Dieses Ritual nutzt einen gewaltigen Luftstoß, um all jene, die darauf laufen, in den Himmel zu katapultieren. Und wenn der Benutzer im Wirkungsbereich des Rituals landet, erleidet er keinen Fallschaden. Spieler, die sich in dieses Ritual einschleichen, sind nicht davon betroffen. Das Ritual kostet 5 LP pro Entität pro Tick erfolgreicher Operation, also wird es nichts kosten, wenn es keine Leute in die Luft wirft. -guide.bloodmagic.entry.ritual.speed.info=Wie der Name schon sagt, wird das Ritual der Geschwindigkeit für den Transport verschiedener Arten verwendet. Das Ritual kann in die Richtung einer der Himmelsrichtungen gelegt werden, und alle Entitäten innerhalb seiner Reichweite werden in die Richtung gestartet, in die das Ritual zeigt. Wenn man ein Ritual betrachtet, ist diese Richtung der Ort, an dem sich der Ritualstein der Abenddämmerung befindet. Standardmäßig hat das Ritual einen Radius von 2 Blöcken vom HRS, der jedoch bei Verwendung eines Ritual-Tüftlers erweitert oder verkleinert werden kann. Wenn das Ritual mit Rohem Willen getankt wird, wird die Geschwindigkeit des Rituals wesentlich erhöht, basierend auf dem Willen, der in der Aura ist. Zum Beispiel wird die Geschwindigkeit verdoppelt, wenn sich 100 Wille in der Aura befinden. Für jede erfolgreiche Operation wird 0,1 Wille verbraucht.\n\tRachsüchtiger Wille verhindert, dass das Ritual erwachsene Mobs bewegt, und Zerstörerischer Wille verhindert, dass das Ritual Kindermobs bewegt. Wenn einer von beiden verwendet wird, werden die Spieler auch daran gehindert, das Ritual anzuwenden. Wenn beide verwendet werden, ist der Effekt jedoch, dass nur Spieler das Ritual benutzen dürfen und Mobs nicht. Diese Augmentationen können effektiv zum Sortieren von Tierfarmen oder sogar zur Beseitigung der lästigen Kinderzombies in Ihrem Opferstall verwendet werden. Das Ritual wird 0,05 Wille für jeden Typ verbrauchen, der bei erfolgreicher Operation wirksam ist, also wenn ein Kind den rituellen Raum betritt, wenn Sie den Zerstörerischen Willen verwenden, wird es weder Wille noch LP kosten. -guide.bloodmagic.entry.ritual.wellOfSuffering.info=Für diejenigen unter euch, die es vorziehen, Mobs anstatt der eigenen Gesundheit zu benutzen, beschädigt die Quelle des Leidens alle lebenden Nichtspieler in einem Radius von 10 Blöcken und platziert die Gesundheit als LP in einen verbundenen Altar. Das Ritual sucht nach einem Blutaltar in seiner Reichweite, wobei 5 Blöcke horizontal und 10 Blöcke vertikal geprüft werden. Wenn es einen Altar findet, wird es seinen Standort intern speichern - wenn kein Altar in der Nähe ist, wird das Ritual nicht funktionieren. Das Ritual wird jeder Entität 1 HP Schaden und dem Altar 25 LP zufügen (100 für friedliche Tiere), was mit Opfer-Runen verstärkt werden kann. -guide.bloodmagic.entry.ritual.featheredKnife.info=Das Ritual der Federnden Klinge zapft den Körper des Benutzers an und lässt seine Lebenskraft abfließen, um einen Blutaltar in der Nähe zu füllen. Das Ritual sucht nach einem Blutaltar in seiner Reichweite, wobei 5 Blöcke horizontal und 10 Blöcke vertikal geprüft werden. Wenn es einen Altar findet, wird es seinen Standort intern speichern - wenn es keinen Altar in der Nähe gibt, wird das Ritual nicht funktionieren. Wenn ein Spieler dann in den Schadensbereich des Rituals eintritt, der standardmäßig einen Radius von 15 Blöcken horizontal und 20 Blöcken vertikal hat, wird das Ritual den Spieler für 1HP schädigen und dann diese Gesundheit direkt in den angeschlossenen Altar legen (unter Berücksichtigung von Blut-Runen). Es gibt einige Sicherheitsmechanismen auf dem Ritual, die dazu führen, sodass es bei einem Spieler mit weniger als 30%% seiner maximalen Gesundheit nicht funktioniert. Ohne Verstärkungen führt das Ritual jede Sekunde eine Operation durch.\n\t Es gibt ein paar nützliche Ergänzungen, die benutzt werden können, indem Dämonischer Wille verwendet wird. Wenn Roher Wille von dem Ritual verzehrt wird, wird das Ritual versuchen, Spieler innerhalb seiner Reichweite schneller zu schädigen, indem es zweimal pro Sekunde arbeitet. Das Ritual wird 0,05 Rohen Willen pro erfolgreicher Operation verbrauchen.\n\tWenn mehr als 10 Standhafter Wille in der Aura ist, so erhöht das Ritual seine Sicherheitsschwelle und funktioniert stattdessen nicht bei Spielern mit weniger als 70% Gesundheit. Dies verbraucht keinen Willen.\n\tWenn mehr als 10 Rachsüchtiger Wille in der Aura ist, wird das Ritual einige seiner Sicherheitseinschränkungen aufheben, was dazu führt, dass es bei Spielern funktioniert, bis sie nur noch 10%% ihrer maximalen Gesundheit haben. Wenn das Ritual auch Standhaften Willen hat, wird die Schwelle immer noch 70%% für den Besitzer des Rituals sein, nicht jedoch für andere Spieler. Diese Funktion verbraucht derzeit keinen Willen.\n\tWenn Zerstörerischer Wille auf das Ritual angewendet wird, wird das Ritual mit seiner HP-zu-LP-Umwandlung viel effizienter. Die Menge an LP, die dem Altar pro Lebenspunkt hinzugefügt wird, erhöht sich auf der Grundlage des Willens in der Aura, bis zu einem Maximum von +20%% für 100 Zerstörerischen Willen. Dieser Effekt stapelt sich multiplikativ mit Runen, Upgrades der Lebenden Rüstung und dem Bonus des Räucheraltars. Das verbraucht 0,05 Zerstörerischen Willen pro geopferter HP.\n\tWo wir bei Weihrauch sind: Wenn korrosiver Wille im Ritual verwendet wird, wird das Ritual die Wirkung des Räucheraltars auf dich respektieren. Wenn du nicht vom Soul Fray Debuff betroffen bist und du von einem Räucheraltar bevollmächtigt bist, wird das Ritual deine HP bis zur eingestellten Schwelle verbrauchen und die gesamte resultierende LP in den Altar pumpen. Es wird auch den Effekt des Weihrauchs von dir nehmen und dich mit Soul Fray belegen. Dieser Effekt stapelt sich mit dem des Zerstörerischen Willens. -guide.bloodmagic.entry.ritual.regen.info=Das Ritual der Regeneration ist wohl eines der besten Rituale für jeden potentiellen Blutmagier, der seine eigene Lebenskraft nutzen möchte, um seine Magie zu speisen, und wirft einen Schleier von Energie um sich herum, um Entitäten zu heilen, die sich in dessen Reichweite befinden. Alle 2,5 Sekunden wirft das Ritual Regeneration I auf lebende Wesen in seinem 15-Block-Radius und kostet 100 LP pro Spieler und 10 LP pro andere lebende Wesen für 2,5 Sekunden Regeneration.\n\tWenn korrosiver Wille benutzt wird, um das Ritual zu verstärken, wird ein zweiter, "vampirischer" Bereich verfügbar sein. Alle Nicht-Spieler-Einheiten in diesem Bereich werden zufällig beschädigt, um Spieler innerhalb des regulären Heilungsbereichs direkt zu heilen. Dies kostet 0,04 Wille zur Nutzung und überträgt 1HP pro operativem Tick. -guide.bloodmagic.entry.ritual.harvest.info=Dieses Ritual sucht jeden erntbaren Pflanzenblock innerhalb seiner Reichweite (Standard ist der 9x9x5 große Bereich über dem HRS) und versucht, ihn zu ernten, indem es alle Samen neu pflanzt, wenn die Pflanze Samen fallen lassen kann. Alle Gegenstände der Pflanze erscheinen dort, wo die Pflanze geerntet wurde. Das Ritual wird versuchen, Pflanzen einmal alle 5 Ticks zu ernten und wird 20 LP pro erfolgreicher Operation kosten.\n\tPflanzen, die geerntet werden können, sind unter anderem: Kürbisse, Weizen, Karotten, Kartoffeln, Netherwarzen, Kakteen, Zuckerrohr. Denke daran, dass das Ritual keine Annahmen über die Sache macht, die es erntet - Falls Pflanzen durch Mods hinzugefügt wurden, müssen diese einen harvesting handler mit der Mod registriert haben. -guide.bloodmagic.entry.ritual.interdiction.info=Basierend auf einem alten alchemistischen Mythos versucht das Ritual der Verbietung, alle Nicht-Spieler-Mobs gewaltsam aus dem Zentrum des Rituals zu entfernen. Standardmäßig werden alle Mobs, die sich innerhalb von zwei Blöcken des HRS befinden, durch Einstellen ihrer Geschwindigkeit vom HRS weggeschoben. Es ist zu beachten, dass Mobs in diesem Bereich nicht von Sturzschäden betroffen sind, aber dieses Sicherheitsnetz verschwindet, sobald sie weggeschoben werden. -guide.bloodmagic.entry.ritual.containment.info=Das Gegenteil von Verbietung, das Ritual der Eindämmung, versucht, Mobs in seinem Wirkungsbereich in den Raum über dem HRS zu ziehen und sie in der Luft aufzuhängen, wo sie sich nicht bewegen können. Der Standardbereich des Rituals ist ein horizontaler Radius von 3 Blöcken von der Unterseite des Hauptsteins bis zur Oberseite der obersten Runen, obwohl dieser Bereich natürlich geändert werden kann.\n\tDas Ritual kostet 1LP pro Mob, das jeden Tick gezogen wird. -guide.bloodmagic.entry.ritual.suppression.info=Die Kuppel der Verdrängung "verdrängt" alle Flüssigkeiten in einem bestimmten Radius, wodurch Flüssigkeiten in einer Halbkugel mit einem Radius von 10 Blöcken vorübergehend durch Luft ersetzt werden können. Wenn das Ritual abgeschaltet wird, kehrt diese Flüssigkeit in den Zustand zurück, in dem sie vorher war. Dies kostet 2LP pro Tick. -guide.bloodmagic.entry.ritual.expulsion.info=Wenn du auf einem Server spielst, kannst du mit einer Situation konfrontiert werden, in der du unerwünschte Spielerbesuche bekommst. Manchmal sind Kraftfelder und riesige blutige Rotoren nicht genug Abschreckung und sie schaffen es immer noch, in deine Basis zu gelangen. Wenn ein Spieler, der nicht der Besitzer ist, den Bereich des Rituals betritt (Standard 12 Blöcke Radius), teleportiert das Ritual den Spieler zufällig innerhalb eines Radius von 100 Blöcken. Wenn es allerdings eine Truhe auf dem HRS mit einem gebundenen Gegenstand des Spielers gibt, wird dieser Spieler von der Teleportation ausgenommen und es verhält sich effektiv wie eine weiße Liste.\n\tDas Ritual kostet 2000LP für jede erfolgrreiche Teleportation. -guide.bloodmagic.entry.ritual.zephyr.info=Nach dem Vorbild eines alten Schwerts aus Legenden nutzt der Ruf des Zephyr die Kraft des Windes, um die Gegenstände, die sich um ihn herum befinden, zu sammeln und sie in die verbundene Truhe zu legen (Standard ist direkt über dem HRS). Dies geschieht sofort, was bedeutet, dass die Gegenstände direkt in das Inventar teleportiert werden - kein Grund zur Sorge um seltsame Sog-Effekte!\n\tDer standardmäßige Gegenstandsradius ist 5 Blöcke um den HRS. -guide.bloodmagic.entry.ritual.laying.info=Wie viele wissen, kann das Platzieren von Blöcken bei verschiedenen Automatisierungsaufgaben wichtig sein. Dieses Ritual nimmt die Gegenstände/Blöcke aus der verbundenen Truhe (standardmäßig auf der Oberseite des HRS) und platziert die Blöcke innerhalb des Rituals, das einen Radius von 2 auf der gleichen Ebene wie das MRS hat. Dies kann nützlich sein, wenn Sie versuchen, Setzlinge für eine Baumfarm auszulegen oder wenn es andere Blöcke gibt, die platziert werden müssen. Das Ritual verbraucht 50 LP pro erfolgreicher Operation. -guide.bloodmagic.entry.ritual.timberman.info=Hast du genug Holz? Dieses Ritual hält dich bedeckt. Der Kahlschlag des Holzfällers hält eine spektrale Entität fest, die die LP des Besitzers benutzt, um die Blätter und Stämme aller Bäume in ihrem Bereich zu sammeln und die Erträge in die verbundene Truhe zu platzieren. Es wird versucht, alle "Bäume" in einem horizontalen Radius von 10 Blöcken und bis zu 30 Blöcken über dem HRS (standardmäßig) zu finden und 10LP pro gefälltem Block zu verwenden. -guide.bloodmagic.entry.ritual.meteor.info=In jeder Hinsicht ist dies eines der mächtigsten Rituale im Spiel. Die Aktivierung kostet eine Million LP und kann nur einmal verwendet werden, bevor sie wieder aktiviert werden muss. Das Ritual, sobald bestimmte Opfer gebracht werden, zieht einen Meteor aus dem Weltraum und lässt ihn zu Boden stürzen, was zu einer großen Explosion führt, sobald er auf etwas Festes trifft. Weil diese Meteore nicht aus der Ãœberwelt sind, können sie eine reiche Erzdichte enthalten, die es sonst nirgendwo gibt. Dies ist durch das Modpack oder den Benutzer konfigurierbar. -guide.bloodmagic.entry.ritual.downgrade.info=Um mehr Macht zu erlangen, muss man manchmal etwas dafür opfern. Die Buße der belasteten Seele tut genau das - indem man einem unsichtbaren Wesen ein paar Gegenstände opfert, kann die Wirksamkeit eines Aspekts der Lebenden Rüstung verringert und eine Erhöhung der Anzahl der Upgrade-Punkte als Ausgleich erhalten werden. Wenn das das Ritual konstruiert wird, muss eine Gegenstandsrahmen an den obersten leeren Ritualstein gehängt werden, der dem Haupt-Ritualstein zugewandt ist, und eine Art Inventar (siehe: Truhe) auf dem Ritualstein der Abenddämmerung platziert werden. Um eine Herabstufung der lebenden Rüstung zu erhalten, muss zunächst der Schlüsselgegenstand in den Gegenstandsrahmen und die Verbrauchsmaterialien in die Truhe gelegt werden. Sobald das Ritual aktiviert ist, kannst du jederzeit auf dem Haupt-ritualstein schleichen und die Herabstufung erwerben.\n\tIm Falle der Herabstufung der abgeschreckten lebenden Rüstung ist ihr Kernstück eine Wasserflasche (im Gegenstandsrahmen platziert) und das Rezept ist Drachenatem (in der Truhe platziert). Um das Rezept für die Herabstufungen zu sehen, kannst du sie in JEI nachschlagen - überprüfe die Verwendung des Haupt-Ritualsteins und du wirst die Rezepte für Sühne (Ritual) sehen. Das Rezept für die maximale Herabstufung kann auch einfach in JEI überprüft und dann die Verwendung des Schlüsselgegenstands überprüfen - dieser ist immer der gleiche für die spezifische Herabstufung. -guide.bloodmagic.entry.ritual.crystalSplit.info=Sobald sich der Dämonische Wille herauskristallisiert hat, gibt es keine Möglichkeit, ihn in seine vielen Aspekte aufzuteilen - so habe ich bisher gedacht. Die "Resonanz des facettierten Kristalls" arbeitet, indem sie die vielen Aspekte innerhalb einer aspektlosen (oder rohen) Kristallgruppe unter Verwendung der verschiedenen elementaren Ritualsteine trennt. Um das Ritual nutzen zu können, muss eine aspektlose Kristallgruppe zwei Blöcke über dem Haupt-Ritualstein platziert werden. Mit anderen Worten: Es kann ein Kristallisierer auf dem HRS und eine Kristallgruppe darauf platziert werden und es sollte gut funktionieren. Als nächstes müssen Sie sicherstellen, dass es keine Blöcke direkt über den vier elementaren Ritualsteinen gibt, und dann warten, bis die Kristallgruppe wächst.\n\tNachdem insgesamt fünf oder mehr Spitzen gewachsen sind, wird das Ritual diese Spitzen abspalten und jeweils eine Spitze aus Korrosivem, Standhaftem, Rachsüchtigem und Zerstörerischem Willen auf den elementaren Ritualsteinen erschaffen. Wenn die aspektlose Kristallgruppe weiter wachsen darf und diese neuen Kristalle intakt bleiben, wird der Prozess wiederholt und es werden weitere Türme hinzugefügt.\n\tDer Mechanismus für diesen Prozess ist ganz einfach. Wenn der Rohe Kristall dämonischen Willens mindestens fünf Spitzen hat, bricht das Ritual vier dieser Spitzen ab und verwandelt den Willen in seine unkörperlichere Form. Dieser Wille wird dann in den letzten Turm des Clusters geworfen, was die verschiedenen Aspekte des Willens in lokalisierte Klumpen des jeweiligen Aspekts zwingt. Dieser Wille wird dann in den rituellen Steinen gesammelt, die als Grundlage dienen, auf der die neuen, aspektierten Kristallgruppen wachsen können. - -# Architect Entries -guide.bloodmagic.entry.architect.intro=Vorwort -guide.bloodmagic.entry.architect.bloodaltar=Der Blutaltar -guide.bloodmagic.entry.architect.ash=Arkane Asche -guide.bloodmagic.entry.architect.divination=Wahrheitssiegel -guide.bloodmagic.entry.architect.soulnetwork=Seelennetzwerk -guide.bloodmagic.entry.architect.weakorb=Schwache Blutkugel -guide.bloodmagic.entry.architect.incense=Räucheraltar -guide.bloodmagic.entry.architect.bloodrune=Altaraufrüstung -guide.bloodmagic.entry.architect.inspectoris=Inspectoris Scandalum (Blockleser) -guide.bloodmagic.entry.architect.runeSpeed=Geschwindigkeitsrune -guide.bloodmagic.entry.architect.water=Wassersiegel -guide.bloodmagic.entry.architect.lava=Lavasiegel -guide.bloodmagic.entry.architect.lavaCrystal=Lavakristall -guide.bloodmagic.entry.architect.apprenticeorb=Blutkugel des Lehrlings -guide.bloodmagic.entry.architect.dagger=Opferdolch -guide.bloodmagic.entry.architect.runeSacrifice=Rune der Opferung -guide.bloodmagic.entry.architect.runeSelfSacrifice=Rune der Selbstopferung -guide.bloodmagic.entry.architect.holding=Siegel der Aufbewahrung -guide.bloodmagic.entry.architect.air=Luftsiegel -guide.bloodmagic.entry.architect.void=Siegel der Leere -guide.bloodmagic.entry.architect.greenGrove=Siegel des grünen Hains -guide.bloodmagic.entry.architect.fastMiner=Siegel der Eile -guide.bloodmagic.entry.architect.seer=Siegel des Sehers -guide.bloodmagic.entry.architect.magicianOrb=Blutkugel des Magiers -guide.bloodmagic.entry.architect.capacity=Rune der Kapazität -guide.bloodmagic.entry.architect.displacement=Rune der Verlagerung -guide.bloodmagic.entry.architect.affinity=Siegel der Elementaren Affinität -guide.bloodmagic.entry.architect.lamp=Siegel der Blutlampe -guide.bloodmagic.entry.architect.magnetism=Siegel des Magnetismus -guide.bloodmagic.entry.architect.peritia=Peritia-Foliant -guide.bloodmagic.entry.architect.livingArmour=Lebende Rüstung -guide.bloodmagic.entry.architect.upgradeTome=Thesen zur Verbesserung lebender Rüstung -guide.bloodmagic.entry.architect.teleposer=Teleposer -guide.bloodmagic.entry.architect.boundBlade=Gebundene Klinge -guide.bloodmagic.entry.architect.boundTool=Gebundene Werkzeuge -guide.bloodmagic.entry.architect.weakShard=Schwache Blutscherbe -guide.bloodmagic.entry.architect.masterOrb=Blutkugel des Meisters -guide.bloodmagic.entry.architect.runeOrb=Orbrune -guide.bloodmagic.entry.architect.suppression=Siegel der Verdrängung -guide.bloodmagic.entry.architect.haste=Siegel der Hast -guide.bloodmagic.entry.architect.severance=Siegel des Endertrennens -guide.bloodmagic.entry.architect.teleposition=Telepositionssiegel -guide.bloodmagic.entry.architect.compression=Siegel der Kompression -guide.bloodmagic.entry.architect.bridge=Siegel der Phantombrücke -guide.bloodmagic.entry.architect.mimic=Mimikblöcke -guide.bloodmagic.entry.architect.downgrade=Thesen zur Schwächung lebender Rüstung - -guide.bloodmagic.entry.architect.augmentedCapacity=Rune der erweiterten Kapazität -guide.bloodmagic.entry.architect.charging=Aufladungsrune -guide.bloodmagic.entry.architect.acceleration=Beschleunigungsrune - -# //--// needs a better string. Literal translation loses its rhyme and just sounds silly. This one is simply "An Altar from the depths" -guide.bloodmagic.entry.architect.tier3=Ein Altar aus den Tiefen (Stufe 3) - -# Architect Entry Texts -guide.bloodmagic.entry.architect.intro.info=Hallo, alle zusammen. Mein Name ist Tiberius. Wahrscheinlich kannst du an diesem Eintrag erkennen, dass das Buch nicht ganz vollständig ist, und du hast Recht. Durch die Updates 1.7.10 -> 1.8.9 und 1.9.4 (und höher) hat sich sehr viel geändert. Deshalb mussten die Bücher neu geschrieben werden. Da der ultimative Plan für diese Dokumente ist, jedes Buch in Form eines Forschungsjournals / tatsächlichen Buches zu haben, wird es eine Weile dauern, bis diese Dokumente ausgearbeitet sind. Daher werde ich dieses Buch regelmäßig aktualisieren, um die notwendigen Lücken zu schließen. Es wird als geschmackloser Müll anfangen (Ja.... nicht die appetitlichste Illustration für Dokumente, aber was auch immer!), aber langsam wird es in eine Geschichte über einen Haufen Blutmagier auf einer Entdeckungsreise verwandelt werden.\n\tAber genug davon, ich muss in den Charakter kommen. Mein Name ist Tiberius, und ich bin ein Blutmagier, auch bekannt als der Architekt. Dieses Buch enthält alle meine Forschungen über das ätherische Phänomen "Seelennetzwerk" sowie die physikalischen Eigenschaften einiger der wichtigsten Geräte, an die jeder Blutmagier im Training gewöhnt sein sollte. Von der Kunst, die Struktur eines mächtigen Blutaltars zu entwerfen, über die Feinheiten, Lebenskraft zu opfern, um die Macht eines Magiers zu erhöhen, bis hin zu den Kräften, die durch arkane Glyphen und Siegel gewonnen wurden, habe ich neue Wege entdeckt, überarbeitet und erschaffen, um sich selbst zu neuen Höhen zu trainieren.\n\tAlso trete ein, Blutmagier, denn ein neues Universum erwartet dich...\n\t Ja, Magus sagt, dass ich ein wenig grandios werden kann, aber was kannst man da schon machen? -guide.bloodmagic.entry.architect.bloodaltar.info.1=Der Blutaltar ist eines der zentralsten Geräte in der Mod. Es gibt zwei Hauptanwendungen für den Altar: entweder um bestimmte Gegenstände herzustellen, die für den Fortschritt durch die Mod notwendig sind, oder um die Blutkugel aufzufüllen. Bei beiden Aktionen muss der Spieler das Becken mit Lebensessenz füllen, die aus zwei verschiedenen Quellen gewonnen werden kann: Monstern und friedlichen Kreaturen und der eigenen Gesundheit des Spielers. -guide.bloodmagic.entry.architect.bloodaltar.info.2=Um deine eigene Lebensessenz in das Becken zu bringen, musst du dir einen Opferdolch basteln und es mit der rechten Maustaste neben dem Altar klicken. Dies nimmt ein Herz der Gesundheit und fügt einem nicht aufgerüsteten Altar insgesamt 200 LP hinzu. "LP" steht für "Life Points" oder Lebenspunkte, das ist ein Maß dafür, wie viel Lebenskraft für eine Operation verwendet wird - nein, es ist nicht wie YuGi-Oh. Der Blutaltar hat eine Kapazität von 10.000 LP. Wenn du dann mit der rechten Maustaste auf den Altar klickst, kannst du einen Gegenstand in das Becken legen, und wenn es sich um einen gültigen Gegenstand handelt, wird der Altar den Herstellungsprozess starten.\n\tDer Altar fertigt einen Gegenstand, indem er die LP im Becken verbraucht, wenn der Altar eine ausreichend hohe Ausbaustufe besitzt. Wenn genügend LP vorhanden sind, wird der Altar mit jedem Tick ein wenig LP aus dem Becken ablassen und den Fortschritt der Herstellung erhöhen, indem er rote Partikel aussendet. Wenn sich keine LP mehr im Becken befindet, gibt der Altar graue Partikel ab und der Herstellungsprozess verliert an Fortschritt, was überhaupt nicht gut ist! Schließlich, wenn der Altar eine Blutkugel füllt, wird der Altar violette Partikel emittieren, um anzuzeigen, dass er LP aus dem Becken absaugt.\n\tTatsächlich gibt es insgesamt drei Tanks im Blutaltar: den Haupttank, der eine Standardkapazität von 10 kLP hat, wie zuvor angegeben, sowie einen Eingangstank und einen Ausgangstank, die beide 10% der Gesamtkapazität des Haupttanks haben. Standardmäßig alle 20 Ticks werden die LP im Eingangstank mit 20LP/s in den Haupttank und die LP im Haupttank mit 20LP/s in den Ausgangstank übertragen. Wie der Name schon sagt, nimmt der Eingangstank die LP auf, die in den Altar gepumpt wird und als Puffer dient, um die Ãœbertragungsgeschwindigkeit von außen zu begrenzen, und der Ausgangstank kann mit Hilfe von Rohren aus dem Altar gezogen werden. -guide.bloodmagic.entry.architect.ash.info=Obwohl nicht unbedingt Teil des Gesamtthemas dieses Buches, ist Arcane Ash notwendig, um durch die Mod zu kommen und einige der leistungsfähigeren Geräte zu bekommen. Diese Asche wird mit der Höllenfeuer-Schmiede und Dämonischen Willen hergestellt, wenn du also neu in diesem Konzept bist, konsultiere bitte das "Dämonenkind". Im Wesentlichen ist dies eine Möglichkeit, Gegenstände aus zwei getrennten Gegenständen herzustellen: einem Reagenz, das als Katalysator dient, und einem sekundären Gegenstand.\n\tDie Asche hat insgesamt zwanzig Verwendungen, bevor du eine weitere herstellen musst. Wenn du mit der rechten Maustaste auf den Boden (oder eine Wand, obwohl sie nur eine Richtung darstellt) klickst, zeichnest du einen einfachen Kreis aus Asche ein. Wenn du die Asche erneut mit einem Gegenstand anklickst, wird dieser "in die Asche gelegt" - vorausgesetzt, dieser Gegenstand ist ein gültiger Katalysator, ändert der Kreis seine Form, um anzuzeigen, dass er für den nächsten Gegenstand bereit ist. Wenn sie sich nicht ändert, dann hast du etwas falsch gemacht.\n\t Sobald sie sich verändert hat, kannst du das zweite Element hinein legen. Wenn dieses Element mit dem ersten Element übereinstimmt, beginnt sich der Kreis zu drehen und führt je nach dem Rezept, an dem er arbeitet, verschiedene Aktionen aus. Nach einer Weile, wenn es richtig ausgeführt wird, wird ein Gegenstand herauskommen. Alle Rezepte für das Arkane Asche-Handwerk (ich nenne es Herstellung mit der Alchemischen Anordung) können in JEI gefunden werden, indem man die Verwendungen für Arkane Asche überprüft - der erste Gegenstand ist der Katalysator, und der zweite Gegenstand ist der sekundäre Gegenstand. -guide.bloodmagic.entry.architect.divination.info=Das Siegel der Weissagung ist eines der nützlichsten Werkzeuge in der Mod, das dir viele Werte vermitteln kann, die dein Leben einfacher machen. Dieses Siegel wird aus einem Stück Redstone und eine leeren Tafel (hergestellt im Blutaltar) mit einer Alchemischen Anordnung hergestellt.\n\tWenn du mit dem Siegel in der Hand auf einen Blutaltar rechts klickst, kannst du die aktuelle Stufe, die Menge der LP im Hauptbecken sowie die maximale Kapazität des Blutaltars sehen. Wenn du erneut mit dem Siegel auf den Altar klickst, wird der vorherige Text des Siegels überschrieben, was bedeutet, dass es keinen Spam in deinem Chat geben wird. Wenn du mit dem Siegel mit der rechten Maustaste in die Luft klickst, wird dir das Siegel die aktuelle Menge an LP in deinem LP-Netzwerk anzeigen. Obwohl dies zunächst eher alltäglich ist, wird diese Funktion allein es sehr wahrscheinlich machen, dass du dieses Siegel immer bei dir behalten wollen wirst. -guide.bloodmagic.entry.architect.soulnetwork.info=Das Seelennetzwerk (allgemein als LP-Netzwerk abgekürzt) ist der Begriff für die Verbindungen zwischen dem Spieler und allen Gegenständen und Strukturen, mit denen er seine Seele verbunden hat. Wenn ein Blutmagier mächtiger wird, nimmt die Kraft seiner Seele zu und verdickt diese Bindungen. Diese Verbindungen sind ätherische Stränge der Seele, und nur die mächtigsten der Blutmagier sind in der Lage, diese in ihrer physischen Form zu sehen. Bis jetzt hat noch kein Magier diese Fähigkeit erreicht.... \n\tIm Spiel ist das Seelen-Netzwerk direkt an den Spieler gebunden. Die Daten werden innerhalb der Welt gespeichert, und jeder Spieler hat nur ein einziges Netzwerk - die in das Netzwerk eingesetzten LP werden nicht in einem Element gespeichert, sondern in einem einzigen Pool platziert und gezogen.\n\tUm Dinge an dein Netzwerk zu binden, ist der gängigste Weg, einfach mit der rechten Maustaste auf ein Element zu klicken, das ein Netzwerk verwendet, um sich selbst zu aktivieren. Sobald der Gegenstand gebunden ist, zeigt er an, dass er sich im Besitz von Ihnen befindet und nie mehr losgebunden werden kann (mit der aktuellen Technologie). Wenn dieser Gegenstand verwendet wird und ihm LP-Kosten zugeschrieben werden, werden die LP aus dem Netz des Eigentümers genommen. Wenn nicht genügend LP in diesem Netzwerk vorhanden ist, wird die fehlende LP direkt der Gesundheit des Benutzers (nicht dem des Besitzers) entnommen. Man sollte die Verwendung solcher Gegenstände mit Vorsicht genießen, wenn nur eine geringe Menge an LP vorhanden ist - es könnte tödlich enden. -guide.bloodmagic.entry.architect.weakorb.info.1=Was nützt ein Magier ohne Machtquelle? Eine Blutkugel ist ein Gerät, das physische LP verbraucht und in das LP-Netzwerk des Besitzers überträgt. Obwohl es sich selbst nicht um eine Batterie handelt, dient es als Leitung, um die Energiereserven des Blutmagiers aufzufüllen. -guide.bloodmagic.entry.architect.weakorb.info.2=Die Schwache Blutkugel ist die erste solche Kugel, die du machen kannst. Indem du einen Diamanten in einen Blutaltar mit 2 kLP einsetzt, kannst du diese Kugel erschaffen. Wenn die Kugel gebunden und in einen Altar gelegt wird, in dem sich eine LP befindet, wird sie aus dem Becken gesaugt und die LP direkt in das Netzwerk übertragen. Jede Kugel hat eine maximale Kapazität, die nur durch fortgeschrittene Runen auf dem Altar erweitert werden kann. Für die Schwache Blutkugel beträgt diese maximale Kapazität 5 kLP.\n\tBlutkugeln können auch direkt vom Spieler gefüllt werden, indem man einfach mit der rechten Maustaste darauf klickt - das überträgt ein Herz der Gesundheit in die Kugel und gibt dir 200LP. Das kann nicht über die maximale Kapazität der Kugel hinausgehen. Eine Blutkugel kann nur durch ihre Altarebene oder höher gefüllt werden; das bedeutet, dass, wenn du eine T3-Kugel hast, sie in einen Altar gefüllt werden muss, der größer oder gleich T3 ist. Ein einfacher T1-Altar würde in dieser Situation nicht ausreichen. -guide.bloodmagic.entry.architect.incense.info.1=Man wird schnell feststellen, dass die Geschwindigkeit der LP-Generierung zunehmend belastend werden kann. Sicher, indem du dem Blutaltar spezielle Runen hinzufügst, kannst du den Ertrag der Selbstopferung erhöhen, aber das kann trotzdem ein langsamer Prozess sein. Wenn es nur einen Weg gäbe, um die Menge an LP, die du von dir selbst bekommen kannst, weiter zu erhöhen?\n\tHier kommt der Räucheraltar ins Spiel. Der Räucheraltar fungiert als zentraler Punkt für eine ruhige Gegend und beruhigt die Seele selbst mit den sanften Wellen, die aus dem Becken kommen. Du hast zwar keine Ahnung, woher dieser Geruch kommt, aber wass kann schon schief gehen?\n\tDas Ziel dieses Blocks ist es, einen Bereich der Ruhe zu schaffen, um zu erhöhen, wie viel LP du von einem Herz deiner Gesundheit bekommst.Wenn du in der Nähe des Blocks (etwa fünf Blöcke) bist, werden Feuerpartikel ausgesendet, um zu zeigen, dass er funktioniert - wenn du von dieser Ruhe betroffen bist, wird sich dein Opferdolch verwandeln, um anzuzeigen, dass du eine erhöhte Ausbeute am Blutaltar hast. Dieser Vorgang dauert etwa 5 Sekunden, und du erkennst, dass du fertig bist, daran dass die Feuerpartikel nicht mehr auftreten. Bei deiner nächsten Opferung am Blutaltar wirst du 90%% deiner maximalen Gesundheit auf einmal opfern und LP in den Altar pumpen, proportional zur Menge der geopferten Gesundheit, multipliziert mit einem Bonus, der davon abhängt, wie ruhig die Umgebung ist: dieser Bonus ist standardmäßig +20%%.\n\tAls Nebenbemerkung kann das Siegel der Weissagung auf dem Räucheraltar verwendet werden, um die Menge der Ruhe sowie die Menge eines Bonus zu bestimmen, die der aktuelle Altar gibt. -guide.bloodmagic.entry.architect.incense.info.2=Natürlich sind nur 20%% schön und gut, aber es kann durch die Erweiterung des Einflussbereichs des Räucheraltars noch erhöht werden. Wenn man eine Reihe von drei Holzpfadblöcken zwei Blöcke vom Räucheraltar entfernt in jede der Himmelsrichtungen platziert (wobei darauf zu achten ist, dass sich alle Pfadblöcke auf der gleichen y-Ebene befinden, bis zu fünf Blöcke nach oben oder unten vom Räucheraltar), kann man einen Bereich definieren. Jeder Block, der sich in diesem Bereich befindet (ein Block, der horizontal den gleichen Abstand zum Räucheraltar hat, wie die Pfadblöcke horizontal und auf der gleichen Ebene oder bis zu zwei Blöcke höher von den Pfadblöcken), kann zur Ruhe des Räucheraltars beitragen. Eine weitere Zeile mit Pfadblöcken kann nach der gleichen Regel hinter dieser ersten Zeile eingefügt werden: Die neue Zeile muss sich alle auf der gleichen y-Ebene befinden, und die gesamte Zeile muss innerhalb von 5 Blöcken vertikal von der vorherigen Zeile mit Pfadblöcken liegen. Das bedeutet, dass Grundrisse wie Pyramiden, umgekehrte Pyramiden oder fortgeschrittenere Treppenstrukturen möglich sind.\n\tAlle Pfadblöcke haben einen maximalen Abstand zum Räucheraltar, um wirksam zu sein. Die Holzpfadblöcke können bis zu drei Reihen vom Räucheraltar aus arbeiten. Steinpfade arbeiten bis zu fünf, abgenutzte Steinpfade sieben und Obsidianpfade neun Blöcke vom Ursprung entfernt. An einem bestimmten Punkt musst du also bessere Pfadblöcke verwenden, um deinen Ruhebereich zu erweitern, aber du kannst höhere Pfadblöcke anstelle von niedrigeren Pfadblöcken verwenden, nur nicht umgekehrt. Nur bestimmte Blöcke können die Ruhe eines Gebietes beeinflussen, und es gibt verschiedene Arten von Ruheblöcken. Wenn du eine Nutzpflanze wie z.B. Kartoffeln in das Gebiet legst, erzeugst du ein wenig Ruhe (mit der Kategorie Nutzpflanzen). Wenn du jedoch wieder eine andere Ernte wie Kartoffeln oder sogar Karotten hinzufügst, wirst du weniger Ruhe bekommen. Wenn du etwas aus einer anderen Ruhekategorie hinzufügst, bekommst du den vollen Effekt. Aber das Hinzufügen von mehr Material mit der gleichen Kategorie hat eine abnehmende Wirkung. Deshalb ist es am besten, so viele verschiedene Arten von Ruhe wie möglich zu verwenden, um aus einem bestimmten Gebiet die größtmögliche Ruhe herauszuholen: Pflanzen, Baumstämme, Blätter, Lava, Netherrack, Ackerland, Wasser, Lebensessenz und andere sortierte Dinge. -guide.bloodmagic.entry.architect.bloodrune.info.1=Während du dich durch die Mod arbeitest, wirst du langsam lernen, dass der schlichte Blutaltar vor dir nicht stark genug ist, um deine wahren Ambitionen zu erfüllen. Indem man spezielle Blöcke, die als Blutrunen bekannt sind, um den Altar legt, kann man die Stärke des Altars beträchtlich erhöhen, indem man höhere Stufen von Rezepten freischaltet und gleichzeitig die Fähigkeiten des Altars selbst erhöht.\n\tUm den Altar auf seine zweite Stufe aufzurüsten, muss man 8 Blutrunen um den Altar und eine Stufe tiefer legen. Wenn du über die genaue Konfiguration verwirrt bist, kann dir der Gegenstand "Inspectoris Scandalum" die genaue Platzierung der Blöcke, die für die nächste Ebene benötigt werden, zeigen. Jede der Runen in einem Blutaltar kann gegen jede Upgrade-Rune getauscht werden (die einzige Ausnahme ist, dass man die Eck-Runen auf Stufe 2 nicht als Upgrade-Runen verwenden kann - ab T3 kann man diese verwenden). Es gibt Runen, die die Geschwindigkeit des Herstellens, die Kapazität des Altars sowie die Effizienz des Opferns am Altar beeinflussen. Diese Runen sind in ihren jeweiligen Einträgen zu finden. -guide.bloodmagic.entry.architect.inspectoris.info.1=Wörtlich "Blockleser" in Latein, soll dieser Gegenstand mehr Informationen über die komplexeren Blöcke in der Mod geben, wenn die Blöcke in der Welt sind. Derzeit ist die einzige Implementierung für diesen Gegenstand der Blutaltar, und durch einfaches Klicken mit der rechten Maustaste auf einen Blutaltar in der Welt wird er dir zeigen, welche Blöcke in der Welt für die nächste Altarebene erforderlich sind. Wenn du dann mit der rechten Maustaste auf den Altar klickst, zeigt der Altar Geisterblöcke in der Welt an, die genau zeigen, wo die Blutrunen und die Säulen benötigt werden, um diese Ebene zu erreichen. Wenn man die angezeigte Schicht auf 1 setzt, wird das Hologramm entfernt. -guide.bloodmagic.entry.architect.runeSpeed.info.1=Die Geschwindigkeitsrune übt einen Druck auf das Becken des Altars aus und zwingt den Umwandlungsprozess, so dass das Herstellen viel schneller geht. Jede Geschwindigkeitsrune erhöht den Verbrauch des Altars um +20% pro Rune, wodurch die Geschwindigkeit des Altars effektiv erhöht wird. Dies beeinflusst auch die Geschwindigkeit, mit der die Blutkugeln vom Altar gefüllt werden. -guide.bloodmagic.entry.architect.water.info.1=Das Wassersiegel ist, wie der Name schon sagt, in der Lage, Feuchtigkeit aus der Luft zu sammeln, um an der Kontaktstelle am Boden eine Wasserquelle zu schaffen. Außerdem kann man durch Anklicken einer Maschine, die eine Flüssigkeit aufnimmt, bis zu 1000mB Wasser in die Maschine einfüllen, und das zu den gleichen Kosten, als ob man sie auf den Boden stellen würde. In jeder Hinsicht wirkt es wie ein unendlicher Eimer Wasser - es funktioniert jedoch nicht, wenn man es in eine Maschine legt. 50LP pro Anwendung. -guide.bloodmagic.entry.architect.lava.info.1=Das Yang zum Yin des Wassersiegels, dieses Siegel erwärmt den Fels in der Umgebung und sammelt ihn an einer Stelle und bildet eine Quelle der Lava, wo das Siegel Kontakt aufnimmt. Ein ähnlicher Prozess findet statt, wenn man mit einer Flüssigkeit aufnehmenden Maschine interagiert und bis zu 1000mB Lava im Inneren der Maschine für die gleichen Kosten erzeugt. Aus irgendeinem Grund verbrennt die Hand nicht, wenn man es benutzt, aber es bedeutet nicht, dass es eine kluge Wahl ist, darin zu baden! 1000LP pro Anwendung. -guide.bloodmagic.entry.architect.lavaCrystal.info.1=Der Lavakristall ist ein Stein, in dessen Mitte sich ein Stück Lava befindet, das seine Wärme nicht verliert. Wenn es als Brennstoffquelle in einem Ofen platziert wird, "brennt" es für eine Menge, die ausreicht, um einen einzelnen Gegenstand in einem Standard-Ofen zum Preis von 50 LP aus dem Netz des Eigentümers zu kochen. Wenn das Netzwerk nicht genügend Energie hat (oder wenn es keinen Besitzer gibt), wird der Kristall einfach nicht brennen und dem Besitzer aufgrund der Belastung Ãœbelkeit zufügen.\n\tDieser Kristall wird für jede Festbrennstoffverbrennungsmaschine funktionieren, die jeden Brennstoff akzeptiert. -guide.bloodmagic.entry.architect.apprenticeorb.info.1=Während du die verschiedenen Geräte benutzt, wirst du schnell feststellen, dass deine maximale Kapazität von 5kLP in deinem LP-Netzwerk schnell erschöpft sein wird. Hier wirst du anfangen, nach einem stärkeren Orb für dein Netzwerk zu suchen.\n\tDie Blutkugel des Lehrlings benötigt einen Stufe-2-Altar und hat eine maximale Kapazität von 25kLP. Es erlaubt außerdem, mächtigere Gegenstände und Runen zu erstellen. -guide.bloodmagic.entry.architect.dagger.info.1=Nach einer Weile der Stärkung durch Selbstopferung, kannst du versuchen, das Blut der Mobs zu opfern. Das Opfermesser, wenn es auf einen Nicht-Boss und Nicht-Spieler neben einem Blutaltar angewendet wird, tötet das Wesen mit einem Schlag und pumpt das ganze Blut in den Altar, wobei es je nach Qualität des Mobs in eine Lebenselixier umgewandelt wird. Normalerweise neigen feindliche Mobs dazu, viel mehr LP zu geben als friedliche Mobs. -guide.bloodmagic.entry.architect.runeSacrifice.info.1=Die Rune der Opferung, wie der Name schon sagt, erhöht den Ertrag aller Aktivitäten, die die Gesundheit der Mobs als Gegenleistung für LP opfern. Jede Rune bietet eine +10%%ige Ertragssteigerung, additiv. -guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=Ähnlich wie bei der Rune der Opferung erhöht die Rune der Selbstopferung den Ertrag der vom Spieler bereitgestellten LP. Jede Rune bietet eine +10%%ige Ertragssteigerung, additiv. -guide.bloodmagic.entry.architect.holding.info.1=Wie du feststellen wirst, gibt es eine Menge nützlicher Zeichen, die verfügbar sind - einige sind umschaltbar, andere aktiv. Dadurch wird das Inventar schnell verstopft. Dieses Siegel kann bis zu fünf weitere Siegel (nein, es kann keine anderen Siegel der Aufbewahrung halten) in seinem internen Inventar halten. Durch Drücken der "Aufbewahrungstaste", Standard 'H', kann die Benutzeroberfläche des Siegels geöffnet werden, um die gehaltenen Siegel neu anzuordnen. Wenn man das Scrollrad verschiebt und benutzt, während es ausgerüstet ist, fährt man durch die enthaltenen Siegel. Sobald du auf dem Siegel landest, das du benutzen willst, kannst du das Siegel so benutzen, als ob es das ausgewählte wäre! Natürlich kannst du mehrere Siegel der Aufbewahrung haben, jedes mit seinem eigenen Inventar. Um festzustellen, welches auf einen Blick welches ist, kann das Siegel mit Hilfe des Alchemietisches eingefärbt werden. Um dies zu tun, wird das Siegel entweder mit einem Farbstoff oder mit einem Namensschild in der gewünschten Farbe im Format 0xZZZZZZ für den Namen im Alchemietisch platziert. -guide.bloodmagic.entry.architect.air.info.1=Das Luftsiegel nutzt eine rudimentäre Form der Spaltung, um durch die Spuren von Wasserdampf in der Luft einen gleichmäßigen Luftstrom hinter dem Benutzer zu erzeugen und ihn nach vorne zu treiben. Im Wesentlichen kann man mit diesem Siegel eine beträchtliche Strecke vorwärts starten. Es ist zu beachten, dass das Siegel die Fallhöhe des Benutzers nur dann aufhebt, wenn es benutzt wird, d.h. dass man die Landung in Bodennähe halten will! -guide.bloodmagic.entry.architect.void.info.1=Wie der Name schon sagt, erzeugt das Siegel der Leere an der Kontaktstelle ein Vakuum, das die Flüssigkeitsquelle, an der es verwendet wird, aufsaugt und die Quelle vollständig zerstört. Dies ist wahrscheinlich am besten in Verbindung mit dem Wassersiegel oder dem Lavasiegel zu verwenden. -guide.bloodmagic.entry.architect.greenGrove.info.1=Durch die Verwendung von Blut als einfacher Wachstumskatalysator wird das Siegel des Grünen Hains die Wachstumsgeschwindigkeit von Pflanzen in der näheren Umgebung erhöhen, während es aktiviert ist. Um das Siegel zu aktivieren, klickt man mit der rechten Maustaste darauf, um zwischen aktiviert und deaktiviert zu wechseln (leicht erkennbar am Tooltip oder an den leuchtenden Symbolen auf dem Siegel). Man beachte, dass das Siegel alle paar Sekunden ein wenig LP vom Benutzer absaugen wird, um das beschleunigte Wachstum zu fördern. Es kann auch für den Anbau von hohem Gras oder anderen Nutzpflanzen verwendet werden, genauso wie Knochenmehl. -guide.bloodmagic.entry.architect.fastMiner.info.1=Wie jeder gute Blutmagier wissen sollte, hat Blut einen hohen Anteil an Eisen in sich. Wenn man geschickt genug ist, kann man Blut manipulieren, während es noch im Körper ist - es sollte jedoch beachtet werden, dass nur die fortgeschrittensten Blutmagier das Blut derjenigen verdrehen können, die nicht willens sind.\n\tIm Prinzip verwendet man es, um die Funktionen des eigenen Körpers zu beschleunigen. Durch die Magnetisierung des Eisens im Blut des Benutzers erhöht das Siegel der Eile die Geschwindigkeit des Abbaus drastisch, indem es Eile II anwendet, während es aktiviert ist. Dieser Magnetismus ist zu schwach, um Dinge außerhalb des eigenen Körpers zu beeinflussen, aber er reicht aus, um Obsidian mit beachtlicher Geschwindigkeit abzubauen. -guide.bloodmagic.entry.architect.seer.info.1=Wenn man am Blutaltar herumbastelt, kann man sich manchmal in den verborgenen Feinheiten seines Wirkens verlieren, die das Siegel der Weissagung nicht zu erahnen scheint. Hier kommt das Siegel des Sehers ins Spiel. Im Wesentlichen ein Upgrade zum Wahrsager-Siegel, bietet dieses Siegel zusätzliche Informationen über verschiedene Eigenschaften des Altars. Diese reichen von der Geschwindigkeit des Altars über die aktuelle LP bis hin zum aktuellen Fortschritt des gefertigten Gegenstandes. Es gibt auch Informationen über das LP-Netzwerk des Spielers. -guide.bloodmagic.entry.architect.magicianOrb.info.1=Eine neue Stufe, eine neues Blutkugel. Dieses Mal musst du, um im Mod weiter zu kommen, die Blutkugel des Magiers selbst herstellen. Im Standardrezept kann man sehen, dass es 25kLP braucht, um es zu fertigen, aber die maximale Kapazität des Blutaltars ist 10kLP. Das bedeutet, dass du für eine erfolgreiche Herstellung LP in den Altar einfügen musst, während er gerade das Orb herstellt. Bereite dich darauf vor, denn es kann eine schwierige Aufgabe sein, wenn du nicht alles hast, was du brauchst! -guide.bloodmagic.entry.architect.capacity.info.1=Man ist sich nicht ganz sicher, wie es funktioniert, aber die Rune der Kapazität erhöht die Kapazität des Blutaltars zusätzlich um 2 kLP. Vielleicht gibt es eine Art Resonanzeffekt, der das Volumen der LP verringert, so dass man mehr in das statische Becken packen kann? Es gibt dir eine Idee, wie du es weiter verbessern kannst, aber....\n\tEs sollte wiederholt werden, dass die Größe der Eingangs- und Ausgangspuffer 10% der maximalen Kapazität des Haupttanks beträgt, also werden diese Runen auch die Pufferkapazitäten erhöhen. -guide.bloodmagic.entry.architect.displacement.info.1=Standardmäßig ist die Ãœbertragung von LP zwischen Puffer- und Haupttank auf 20LP/s begrenzt. Für Systeme, die LP entfernen und dem Altar wieder hinzufügen wollen, ist diese Geschwindigkeit ein träges Kriechen. Da kommt diese Rune ins Spiel. Die Rune der Verlagerung erhöht die Menge an LP, die pro Operation übertragen wird. Jede Rune multipliziert die Transferrate mit 1,2x und stapelt multiplikativ. Eine Rune wäre also 24LP pro Operation, zwei Runen wären 28,8LP pro Operation und drei Runen 34,56LP. Wenn du 20 Runen auf einem Altar hast, überträgt dieser bis zu 767 LP pro Operation - das würde einen vollen Altar in nur 13 Sekunden leeren. -guide.bloodmagic.entry.architect.affinity.info.1=Auf den ersten Blick gewährt das Siegel der Elementaffinität einfach Immunität gegen Feuer, Ertrinken und Schäden aus der Höhe, wenn es aktiviert ist. Die Bedienung ist jedoch viel nuancierter. Dieses Siegel erzeugt eine dünne Luftbarriere um den Benutzer herum, indem es den Schweiß (und bei Bedarf Blut) des Benutzers verwendet und den Körper von den harten Elementen fernhält. Diese Luftbarriere wirkt als Puffer zwischen der Haut und dem Feuer oder der Lava und zirkuliert bei Bedarf, um eine Ãœberhitzung zu verhindern. Es füllt auch die Lunge unter Wasser, um den Druck des Körpers und des umgebenden Wassers auszugleichen. Bei einem Sturz aus großer Höhe verschiebt sich die Luft schließlich unter die Füße und dämpft den Sturz. -guide.bloodmagic.entry.architect.lamp.info.1=Es gibt eine ganze Reihe von "Unreinheiten" im Körper und im Blut eines Menschen. Indem du einige Edelgase erntest und sie mit einer Wärmequelle umhüllst, kannst du eine Lichtkugel erzeugen, die über eine große Entfernung geschleudert werden kann und an der Oberfläche haften bleibt, auf die sie auftrifft.\n\tDas Siegel der Blutlampe hat zwei Verwendungszwecke: du kannst entweder direkt auf einen Block klicken und eine Lichtquelle platzieren oder ein Projektil abfeuern, das eine Lichtquelle an der Kontaktstelle erzeugen wird. Diese Lichtquellen können wie Fackeln in einem Schlag zerbrochen werden. -guide.bloodmagic.entry.architect.magnetism.info.1=Dieses Siegel magnetisiert das Eisen im Blutkreislauf des Benutzers, um kleine Gegenstände in Richtung des Siegels zu ziehen, was eine schnelle und schmerzfreie Aufnahme ermöglicht. Im Wesentlichen wirkt dies wie ein Gegenstandsmagnet, aber anstatt Gegenstände in Richtung des Spielers zu "saugen", veranlasst es den Spieler, den Gegenstand aus der Ferne aufzunehmen, so dass Gegenstände nicht überall herumfliegen müssen. Zum Glück ist der Magnetismus so abgestimmt, dass er keine lebenden Objekte anzieht, so dass man keine Creeper findet, die einen plötzlich mit Mach 3 umarmen wollen. - -guide.bloodmagic.entry.architect.peritia.info.1=Bestimmte Aktionen in der Welt beeindrucken den Menschen: Das Töten von Monstern, Bergbauelementen und das Schmelzen von Barren oder Nahrungsmitteln kann zu Erfahrungen führen, die sich über einen längeren Zeitraum angesammelt haben. Durch einige arkane Mechanismen, einige Strukturen und Geräte können dir diese Erfahrungen tatsächlich entzogen werden, um ihre eigenen Prozesse zu fördern. Es kann daher nützlich sein, diese Erfahrungen in irgendeinem Medium zu speichern. Obwohl einige Behälter Erfahrung als physische Substanz speichern, erlaubt der Peritia-Foliant der Person, ihre Erfahrungen in das Buch zu schreiben - indem er in den Band schreibt, werden die Seiten mit deinen Gedanken und vergangenen Handlungen durchdrungen und sie für den späteren Gebrauch gespeichert. Wenn du dann diese Erfahrungen zurückgewinnen möchtest, kannst du deine Hand auf die Seite halten und sie zurücksaugen; dies wird die Schrift von der Seite entfernen und diese Aktionen zurück in dein Gedächtnis übertragen.\n\tNun für den tatsächlichen Gebrauch; indem du auf den Wälzer in deiner Hand klickst, kannst du einen Erfahrungslevel im Buch speichern (oder auf den Anfang des Levels, wenn du Teilerfahrung hast). Mit einem Rechtsklick auf den Wälzer kannst du das nächste Level erreichen, wenn genügend Erfahrung im Buch gespeichert ist. Die Gesamterfahrung sowie die entsprechende gespeicherte Stufe wird im Tooltip des Folianten angezeigt. -guide.bloodmagic.entry.architect.livingArmour.info.1=Jeder Person in Minecraft, besonders in den neueren Versionen der Welt, wird bewusst, dass eine gute Rüstung einen Unterschied zwischen Leben und Tod bedeutet. Normalerweise wählt man bei der Auswahl einer Rüstung einen statischen Satz von Vorteilen - bietet diese Rüstung mehr Schutz? Bekomme ich die Fähigkeit, zu fliegen, wenn ich das trage? Kann ich wirklich hoch springen oder mich schnell bewegen? Das sind alles gültige Optionen für eine Rüstung, aber man kann nie ein Set bekommen, das genau auf seine Bedürfnisse zugeschnitten ist. Zumindest das dachten die Leute. Ein Set Lebendiger Rüstung ist eine konstruierte Lebensform, die mit einer einfachen Eisenrüstung integriert ist. Wenn es getragen wird, geht es eine symbiotische Beziehung mit dem Benutzer ein - wenn man sich bewegt, bewegt es sich. Wenn man angreift, greift es an. Wenn man isst, spürt es das und kompensiert es. Und genau wie ein normaler menschlicher Körper beginnt es zu wachsen und zu stärken, je nachdem, was man tut, indem man es durch seine Handlungen trainiert.\n\tLass mich ein Beispiel nennen: Wenn du eine neue Rüstung ausrüstest und viel herumläufst, wirst du feststellen, dass du ein Upgrade auf der Brustplatte namens "Schnelle Füße" erhältst - dieses Upgrade bietet eine stufenweise Erhöhung deiner Geschwindigkeit, während die folgenden Stufen einen größeren Schub bringen. Du wirst auch feststellen, dass die "Upgrade-Punkte" jetzt "3/100" lauten - jedes Upgrade erfordert eine Anzahl von Upgrade-Punkten, und die Brustplatte hat eine maximale Anzahl von Punkten, die sie halten kann. Wenn ein Upgrade, das du erhalten kannst, nicht mit der Anzahl der kostenlosen Upgrade-Punkte erhältlich ist, die du hast, kann es nicht erworben werden. Behalte im Hinterkopf, dass die Lebende Rüstung nur trainiert wird, wenn du eine vollständige Rüstung anhast, und die Effekte der Rüstung nur wirksam werden, wenn eine vollständige Rüstung verwendet wird.\n\tDie maximale Anzahl von Aufrüstungspunkten kann auf verschiedene Weisen verändert werden. Eine von ihnen ist es, alchemistische Zubereitungen zu kreieren, die die Bindungen zwischen dem Benutzer und der Lebenden Rüstung stärken und die Anzahl der Punkte, die man auf einer bestimmten Ausrüstung haben kann, enorm erhöhen. Ein Beispiel ist der "Trank der Engelsmacht", der die maximale Punktzahl auf 200 erhöht. Informationen über diese Gebräue und wie man sie herstellt, können in "Der Alchemist" gefunden werden. -guide.bloodmagic.entry.architect.upgradeTome.info.1=Manchmal ist man mit den Aufrüstungen, die man für die Lebende Rüstung erhalten hat, nicht zufrieden. Mit dem Ritual "Klang der reinigenden Seele" (weitere Informationen unter "Der Ritualmeister") können alle Aufrüstungen von der Rüstung entfernt und in Form von "Thesen der Lebenden Rüstung" erhalten werden. Klicke mit der rechten Maustaste darauf, während du einen kompletten Satz Lebende Rüstung trägst (und Platz für die Aufrüstung hast), um die Eigenschaft zu deiner Rüstung hinzuzufügen. Diese Thesen können auch in einem Amboss kombiniert werden - wenn man zwei der exakt gleichen Thesen (gleiches Upgrade, gleiche Stufe) in einem Amboss kombiniert, kann man eine einzelne These erhalten, die eine Stufe höher ist. Wenn du also Schnelle Füße II mit einem anderen Schnelle Füße II kombinierst, erhälst du Schnelle Füße III. Diese These kann dann in gleicher Weise auf die Rüstung aufgebracht werden. -guide.bloodmagic.entry.architect.teleposer.info.1=Der Teleposer ist ein Gerät, das nicht nur Objekte, sondern auch Entitäten teleportiert. Um einen Teleposer einzurichten, benötigst du mindestens zwei Teleposer und einen Telepositionsfokus. Einer der Teleposer fungiert als das Ziel und der andere als der Anfang. Um das einzurichten, musst du zuerst den Fokus an dich binden, indem du mit der rechten Maustaste darauf klickst. Dann klickst du mit der rechten Maustaste auf den Ziel-Teleposer, um seine Position (und Dimension) zu speichern, und fügst dann den Fokus in den beginnenden Teleposer ein, indem du mit der rechten Maustaste auf den Teleposer ohne Fokus in deiner Hand klickst und den Fokus in das GUI platzierst.\n\tMit einem starken Redstonesignal kann ein Teleposer aktiviert werden, wodurch die Teleposer alle Entitäten und Blöcke tauschen, vorausgesetzt, dass ein Teleposer an der Zielposition existiert.\n\tDu kannst entweder einen Teleposer haben, der einen Fokus hat, beide Teleposer haben Fokusse, die miteinander verbunden sind, oder du kannst einen Teleposer haben, der mit einem anderen Teleposer verbunden ist, der nicht mit ersteren verbunden ist, also abhängig davon, wie du sie einrichtest, kannst du sehr komplizierte Systeme haben.\n\tBeachte, dass der Teleposer derzeit nur die Blöcke und Entitäten vertauscht, die sich direkt über dem Block befinden, und die Größe hängt vom Fokus ab - der T1-Fokus vertauscht nur den Block über dem Teleposer, der T2-Fokus vertauscht einen 3x3x3-Bereich über dem Teleposer usw. -guide.bloodmagic.entry.architect.boundBlade.info.1=The Bound Blade is an artifact from the past, a blade that is created by binding an entity to a sword in the same process that creates the Living Armour. It should be noted that this, as well as the Bound Tools, will change in later versions of the mod.\n\tThe sword has an active and inactive mode, which can be toggled by shift-right clicking. The sword does not deal any damage at all when inactive, but while active there will be a small LP drain over time. Likewise, when you damage a mob you will drain LP from your network. Sure, you have a lot of damage, but it may kill you!\n\tWhen a monster is killed, the monster has a chance to drop a Weak Blood Shard. These shards are used in order to upgrade your Blood Altar to a T4 altar. -guide.bloodmagic.entry.architect.boundTool.info.1=Ähnlich wie bei der Gebundenen Klinge werden diese gebundenen Werkzeuge (Spitzhacke, Axt und Schaufel) irgendwann modifiziert, um besser in die Mod zu passen. Wie bei der Klinge haben die Werkzeuge einen aktiven und einen inaktiven Modus, zwischen denen man durch Klicken mit der rechten Maustaste umschalten kann.\n\tEtwas, das diese Werkzeuge haben, ist etwas, das man "Beast Mode" nennt. Wenn du die rechte Maustaste gedrückt hältst, kannst du das Werkzeug aufladen und einen mächtigen Spalt freisetzen, der sofort die Blöcke zerbricht, die von dem gegebenen Werkzeug gebrochen werden können - wenn es vollständig aufgeladen ist, ist das ein 11x11x11 Würfel über dir zu einem Preis von 10kLP. Sei vorsichtig mit diesem mächtigen Werkzeug, da es dein letztes sein kann! -guide.bloodmagic.entry.architect.weakShard.info.1=Alles, was Leben hat, kann die ätherischen Verbindungen haben, die als das Seelen-Netzwerk bekannt sind. Wie aus euren Erfahrungen hervorgeht, können auch nicht-lebende Dinge ein Seelen-Netzwerk haben, wie Siegel und Rituale; aber diese Verbindungen sind die stärksten in den Geschöpfen und natürlich den Menschen. Wenn du ein Monster mit einer Gebundenen Klinge angreifst, wird ihr Seelen-Netzwerk vorübergehend hart und ein Stück davon wird nach dem Tod bleiben. Dieses Stück hat die Form eines Schwachen Blutsplitters, so benannt nach der Tatsache, dass sein rötlicher Farbton der Farbe der Schwachen Blutkugel entspricht. An diesem Punkt ist es nicht klar, ob es stärkere Formen von Blutsplittern gibt, aber man kann sagen, dass dies sehr hilfreich wäre, um die Macht des eigenen Seelen-Netzwerks zu erhöhen. -guide.bloodmagic.entry.architect.masterOrb.info.1=Eine der Anwendungen für diese erhöhte Affinität zum Seelennetzwerk ist die Verwendung des Schwachen Blutsplitters in einer neuen Blutkugel: der Blutkugel des Meisters. Diese Kugel hat eine maximale Kapazität von 1 Million LP und ermöglicht so dem Besitzer den Zugriff auf mächtigere Gegenstände und Rituale. Vielleicht sind Meteore doch in Reichweite... -guide.bloodmagic.entry.architect.runeOrb.info.1=Diese Rune kann zunächst als etwas nutzlos angesehen werden. Durch die Verdickung der Verbindungen zwischen der Blutkugel im Altar und dem Seelennetzwerk erhöht die Rune der Kugel die maximale Kapazität einer Blutkugel, die von einem Blutaltar gefüllt wird, um +2%% pro Rune. Für so etwas wie die Schwache Blutkugel ist das nur eine Kapazität von +100LP, für die Blutkugel des Meisters ist das jedoch eine bemerkenswerte Kapazität von +20kLP pro Rune. Wenn du eine hochrangige Blutkugel und Platz für ein paar zusätzliche Runen auf deinem Altar hast, kann das etwas sein, das dein Netzwerk abrunden wird. -guide.bloodmagic.entry.architect.suppression.info.1=Das Siegel der Verdrängung verwendet die Technologie, die in einem Teleposer verwendet wird, um Flüssigkeiten, die sich in seiner Nähe befinden, vorübergehend zu verdrängen. Dazu werden die Flüssigkeiten in einer Kugel um den Benutzer herum in eine verstecktes Taschendimension teleposiert und die Flüssigkeit durch Luft ersetzt. Da das Feld des Teleposers überladen wird, ist die Teleposition vorübergehend - wenn der Benutzer den Bereich, in dem die Flüssigkeit entfernt wurde, verlässt oder das Siegel deaktiviert, springt die Flüssigkeit an die Stelle zurück, an der sie vorher war, als ob nichts geschehen wäre, vorausgesetzt, es gibt dort keine neu platzierten Blöcke. Dies ermöglicht einen ausgefallenen Transport zu Fuß, unter Wasser zu gehen, anstatt durch das Wasser zu schwimmen oder sogar die roten Seen des Nethers zu teilen. -guide.bloodmagic.entry.architect.haste.info.1=Zucker und Koffein sind interessante Chemikalien, die der menschliche Körper verarbeiten kann. Das eine dient als Energiereservoir, das schnell verbrannt wird, während der andere die Wachsamkeit erhöht und den Zugang zu Energie auf andere Weise ermöglicht. Indem diese chemischen Prozesse nachgeahmt werden, um mehr chemische Energie freizusetzen, ermöglicht das Siegel der Hast dem Benutzer, seine Bewegungsfähigkeit zu erhöhen. \n\tWährend es aktiviert ist, kann der Benutzer viel schneller laufen und deutlich höher springen. Darüber hinaus bietet das Siegel auch "Step Assist", das es dem Benutzer ermöglicht, einen Block hohe Grate zu überwinden, ohne zu springen. Es ist wie ein automatisches Springen, nur weniger schlecht. -guide.bloodmagic.entry.architect.severance.info.1=Teleportation ist eine dieser seltsamen Mächte, die die Menschen nicht vollständig erklären können. In den meisten Fällen kann die Teleportation als eine temporäre Verwerfung in der Raumzeit beschrieben werden, die zwei Orte im Raum miteinander verbindet, so dass das betreffende Objekt einfach auf die andere Seite "treten" kann. Das Siegel der Endertrennung versucht, diese Verzerrung zu stoppen, die die Teleportation erfordert, und verhindert, dass Kreaturen sich teleportieren, wenn sie in der Nähe des Benutzers sind. Dies stoppt nicht einige der größeren Teleportationsmittel wie Portale, aber es wird Endermen daran hindern, ihre Kräfte zu nutzen, sich in der Nähe des Nutzers zu teleportieren. -guide.bloodmagic.entry.architect.teleposition.info.1=Das Telepositionssiegel hat einen Teleposer und Fokus in seiner Struktur. Wenn du mit der rechten Maustaste auf einen Teleposer mit diesem Siegel klickst, kannst du die Koordinaten und Abmessungen an das Siegel binden. Wenn du nun mit der rechten Maustaste auf das Siegel klickst, wird es dich direkt zum Teleposer teleportieren (falls dieser vorhanden ist). Leider scheint es nicht möglich zu sein, eine Rückfahrt zu machen.... -guide.bloodmagic.entry.architect.compression.info.1=Ein Bergarbeiter wird schnell feststellen, dass sein Inventar während einer langen Expedition mit Redstone Staub, Lapis und anderen Materialien gefüllt wird. Die meisten von ihnen haben Rezepte, die sie zu Speicherblöcken wie Redstone-Blöcken und Diamantblöcken komprimieren, aber sie benötigen normalerweise eine Werkbank, um sie zu kombinieren. Dieses Siegel faltet ein kleines Kompressionsfeld im Inventar des Benutzers, wenn es aktiviert wird, und komprimiert Gegenstände auf die niedrigste Anzahl von Slots, die für das Inventar benötigt werden. Das heißt, wenn du 63 Redstone Staub hast, wird es nichts bewirken. Wenn du jedoch 64 Staub hast, werden 9 von ihnen zu einem Block aus Redstone komprimiert. Das ist zwar technisch nicht die ideale Situation, wenn du genau einen Stapel Redstone-Staub hast, aber es garantiert, dass du nicht durch volle Taschen im Staub zurückbleiben. Wenn andere Mods vorhanden sind, funktioniert dies auch für andere Rezepte. -guide.bloodmagic.entry.architect.bridge.info.1=Wenn aktiviert und während der Benutzer auf festem Boden steht, verfestigt das Siegel der Phantombrücke die Luft unter dem Benutzer, so dass er sie betreten kann, wodurch im Wesentlichen eine Phantombrücke entsteht. Wenn du in der Luft kriechst, bildet sich die Brücke direkt unter dir, so dass du dich in der Luft fangen kannst, falls du fällst. Obwohl eine gewisse Kalibrierung notwendig ist, um es sowohl für die vertikale als auch für die horizontale Bewegung bei schnellen Bewegungen effektiver zu machen (da die Entstehung der Brücke verzögert wird), ist es ein ausgefallener Weg, um effektiv zu verschiedenen Bereichen zu fliegen. -guide.bloodmagic.entry.architect.mimic.info.1=Mimics sind arkane Konstrukte, die dazu bestimmt sind, das nachzuahmen, worauf sie eingestellt sind. Wenn die Mimik mit irgendeiner Form von Block in Kontakt kommt, verschieben ihre Moleküle ihre Orientierung, um die Form, das Aussehen und das Gefühl des Blocks anzunehmen. Allerdings werden nicht alle Eigenschaften kopiert: Ein normaler Mimikblock, der mit Glowstone in Berührung kommt, gibt beispielsweise kein Licht ab.\n\tBei normalem Gebrauch gibt es zwei Möglichkeiten, einen Mimikblock zu benutzen. Der erste ist, den Mimikblock zu platzieren und dann mit der rechten Maustaste mit dem Block, der kopiert werden soll, auf die Mimik zu klicken. Dadurch wird der Block innerhalb der Mimik platziert und die Mimik nimmt die "Standard"-form des Blocks an. Wenn also ein Mimikblock mit einer Treppe angeklickt wird, wird sich die Mimik immer auf die gleiche Weise orientieren.\n\tDie zweite Methode ist, den Mimikblock in der Hand zu halten und auf den zu ersetzenden Block zu klicken. Dadurch wird der Block durch die Mimik ersetzt und die Mimik hat genau die gleiche Ausrichtung wie der ersetzte Block. Das kann man bei Treppen und Truhen sehen, aber auch bei anderen orientierungsabhängigen Blöcken wie z.B. Holzstämmen.\n\tEs gibt einige verschiedene Varianten der Mimikblöcke. Der Opake Mimikblock ist die Standardmimik, das die Form und die allgemeinen Eigenschaften von Blöcken annehmen kann - Licht kann sich jedoch nicht durch diese hindurchbewegen, daher sollte man mit Glas vorsichtig sein. Der ätherische opake Mimikblock kann ohne Probleme durchlaufen werden, da dieser keine Hitbox hat, die perfekt für versteckte Türen ist. Klare Mimikblöcke funktionieren genauso wie ihre undurchsichtigen Varianten, lassen aber Licht durch sie hindurch, auch wenn es völlig fest erscheint. Schließlich ist der Leuchtende Mimikblock undurchsichtig und fest, aber egal, was sich darin befindet, er strahlt ein starkes Licht aus. Keine dunklen Bereiche mehr in deiner Basis ohne Fackel-Spam! Es gibt eine spezielle Variante der Mimik, vor der du dich in Acht nehmen solltest: der Empfindsame Mimikblock. Wenn ein Spieler zu nahe an einen von diesen in der Welt kommt, wird dieser aufstehen und mit einem hohen Grad an Grausamkeit angreifen. Diese sind in verschiedenen Bereichen vorzufinden, aber sie sind besonders von Verliesen angetan. Wenn man eine Truhe nachahmt, sollte man jedoch vorsichtig sein: Sie beißen....\n\t***Nur Kreativmodus***\n\tEs gibt einige interessante Funktionen, die du jedem Mimikblock hinzufügen kannst, wenn du dich im Kreativmodus befindest. Wenn du mit der rechten Maustaste auf eine platzierte Mimik mit einem Trank oder einer Trankflasche klickst, kannst du die Mimik so einstellen, dass sie Tränke um sie herum erzeugt, wenn ein Spieler in der Nähe ist. Wenn es eine normale Mimik ist und du auf die Ost- oder Westseite klickst, kannst du den Radius, in dem der Trank entsteht, vergrößern oder verkleinern. Wenn du auf die Nord- oder Südseite klickst, kannst du den Radius vergrößern oder verkleinern, den die Mimik vor dem Erstellen der Tränke nach Spielern um sie herum sucht. Wenn es sich um einen empfindsamen Mimikblock handelt, kannst du überall auf den Mimikblock klicken, um den Erkennungsradius für Spieler zu vergrößern oder zu verkleinern - wenn sich ein Spieler in diesem Bereich befindet und den Block sehen kann, wird die Mimik erstellt und den Spieler anfallen.\n\tEine weitere Sache ist, dass, wenn der Block auf die Mimik gesetzt wird, während der platzierende Spieler im Kreativmodus ist, wird der Block, der nachgeahmt wird, NICHT fallen gelassen, wenn die Mimik zerstört wird.\n\tZu guter Letzt wird die Mimik, falls sie auf irgendeinem Inventar oder eine Kiste gesetzt wird, diese Kiste bzw. das Inventar samt Inhalt fallen lassen, sobald sie besiegt wurde - eine reguläre Mimik wird stattdessen den Inhalt auf dem Boden verteilen, falls sie zerstört werden sollte. -guide.bloodmagic.entry.architect.downgrade.info=Bitte lese den Eintrag "Sühne der belasteten Seele" in "Der Ritualmeister" für eine detaillierte Erklärung darüber, was diese sind und wie man sie erhält. - -guide.bloodmagic.entry.architect.augmentedCapacity.info=Die Rune der erweiterten Kapazität funktioniert ähnlich wie die Rune der Kapazität in dem Sinne, dass sie die Kapazität des Blutaltars erhöht. Allerdings werden mehrere Runen auf dem gleichen Altar miteinander in Resonanz treten, was die Kapazität exponentiell erhöht, je mehr es gibt. Eine Rune allein wird die Kapazität des Altars um +10%% erhöhen, aber das funktioniert multiplikativ mit anderen Runen mit erhöhter Kapazität: Wenn es zwei Runen gibt, ist es eine Zunahme um +21%%, drei Runen um +33,1%%, usw.\n\tUnglücklicherweise ist dieser multiplikative Effekt nicht mit der Rune der Kapazität stapelbar, was bedeutet, dass man immer noch nur den Bonus von +2kLP pro Rune erhält. -guide.bloodmagic.entry.architect.charging.info=Die Aufladungsrune ist eine jener Schönheiten, die den Betrieb des Blutaltars vollständig in etwas verwandeln wird, das als nützlicher für die Herstellung aus einem Guss angesehen werden kann. Durch das langsame Absaugen der LP vom Blutaltar beginnt die Aufladungsrune mit der Speicherung von "Aufladung", einem internen Wert des Blutaltars, der mit dem Siegel des Sehers sichtbar ist. Wenn der Blutaltar genügend Ladung hat, wenn er etwas zum Herstellen bekommt, wird er die erforderliche Ladung sofort verwenden und den Gegenstand sofort herstellen. Wenn nicht genügend Ladung vorhanden ist, wird die Ladung verwendet, um den Fortschritt des Gegenstands in einem Verhältnis von 1:1 Ladung:LP zu erhöhen. Die maximale Ladungsmenge, die im Blutaltar gespeichert werden kann, ist eine Funktion der Anzahl der Ladungsrunen, die er mit der aktuellen Kapazität des Altars multipliziert hat (die Kapazität des Altars tritt nur in Kraft, wenn sie größer als 20k ist). Die Rate, die er auflädt, hängt auch direkt von der Geschwindigkeit des Altars ab, mal der Anzahl der Aufladungsrunen, die er hat, und er wird LP alle 20 Ticks (eine Sekunde) in Charge umwandeln. Wenn ihr also einen Blut-Altar mit dieser Rune entwerfen wollt, dann müsst ihr alle synergistischen Beziehungen, die sie hat, sorgfältig abwägen. -guide.bloodmagic.entry.architect.acceleration.info=Im Gegensatz zu den meisten Runen funktioniert die Beschleunigungsrune nur dann am besten, wenn sie mit anderen Runen gepaart wird, und ihre Wirkung nimmt nur begrenzt zu. Was diese Rune tut, ist, dass sie die Anzahl der Verarbeitungs-Ticks erhöht, die in einem bestimmten Zeitraum auftreten können, insbesondere wenn es um die Rune der Verlagerung und die Aufladungsrune geht. Für jede hinzugefügte Rune verringert sich die Anzahl der Ticks vor dem nächsten Verarbeitungs-Tick um eins. Zum Beispiel verdrängt die Rune der Verdrängung standardmäßig Flüssigkeiten mit einer Geschwindigkeit von einer Operation pro 20 Ticks - bei 10 Beschleunigungsrunen würde dies mit einer Geschwindigkeit von einer Operation pro 10 Ticks geschehen.\n\tDie maximale Anzahl der Beschleunigungsrunen, die derzeit von Bedeutung sind, ist natürlich 19 - wenn du so viele hast, werden die Rune der Verdrängung und die Aufladungsrune beide ihre Effekte jeden Tick aktivieren. Noice! - -guide.bloodmagic.entry.architect.tier3.info=Es ist bekannt, dass ein Altar der Stufe 3 erfordert, dass man vier Säulen mit Glowstoneblöcken aus dem Nether bedeckt. Was nicht durchweg verstanden wird, ist, dass man stattdessen Seelaternen verwenden kann. Wenn du dich also sehr weit weg vom Nether befindest, aber Zugang zu den Ozean-Tempeln hast, kannst du andere Wege nutzen, um dich in der Blutmagie weiterzuentwickeln. - -# Demon Kin Entries -guide.bloodmagic.entry.demon.intro=Bella Highborn -guide.bloodmagic.entry.demon.snare=Dämonischer Wille und Fallen -guide.bloodmagic.entry.demon.forge=Höllenfeuerschmiede -guide.bloodmagic.entry.demon.petty=Winziges Juwel des Tartaros -guide.bloodmagic.entry.demon.sword=Empfindsames Schwert -guide.bloodmagic.entry.demon.lesser=Kleines Juwel des Tartaros -guide.bloodmagic.entry.demon.reactions=Unerwartete Reaktionen -guide.bloodmagic.entry.demon.sentientGem=Empfindsame Rüstung -guide.bloodmagic.entry.demon.routing=Gegenstands-Routing -guide.bloodmagic.entry.demon.aura=Dämonische Willensaura -guide.bloodmagic.entry.demon.types=Verschiedene Typen von Wille -guide.bloodmagic.entry.demon.crucible=Dämonenschmelztiegel -guide.bloodmagic.entry.demon.crystallizer=Dämonenkristallisierer -guide.bloodmagic.entry.demon.cluster=Dämonische Kristallgruppen -guide.bloodmagic.entry.demon.pylon=Dämonenpylon -guide.bloodmagic.entry.demon.gauge=Dämonischer Auramesser - -# Demon Kin Entry Texts -guide.bloodmagic.entry.demon.intro.info=Mein Name ist Bella Highborn, und ich bin bekannt als das Dämonenkind. Vor einigen Monaten wurde mein Dorf von einer Welle von Dämonen angegriffen, die alle anderen Menschen töteten und dabei jedes einzelne Gebäude zerstörten. Ich erinnere mich nicht viel von dem Angriff, außer den Schmerzensschreien, da jede Person, die ich kannte, diese Welt für eine glücklichere verließ. Glücklicherweise hörten mich die Dämonen nicht, als ich mich unter die Obstkörbe im Keller der Kirche von Intactilis kauerte und verzweifelt versuchte, meine Schreie davon abzuhalten, sich dem Chor anderer Stimmen anzuschließen. Es gab einen schrecklichen Moment, als ich versehentlich den Räucheraltar der Kirche niedergerissen habe und ein Dämon in das Heiligtum kam, unbeirrt von dem, was wir für einen heiligen Ort hielten. Es war ein riesiges vierbeiniges Monster, mit geschwungenen Stoßzähnen, die an einem hervorstehenden Mund vorbei hingen, wobei der Speichel auf gezackte Schwerter tropfte, die seine Krallen ersetzten. Es hat sich im Raum umgesehen und ich schwöre, dass wir uns für eine Sekunde gegenseitig in die Augen gesehen haben, aber dann ist es einfach weggegangen, als ob es nichts gehört oder gesehen hätte. Alles danach war verschwommen. Es war ein ganzer Tag, bevor jemand kam, um zu sehen, was passiert ist. Eine Handelskarawane sah den Rauch in der Ferne und beschloss, den langen Weg an den Dämonen vorbei zu gehen. Viele der Händler wollten mich nicht einmal anschauen, weil sie befürchteten, dass es ein schlechtes Omen war, weil ich es allein schaffte, unbeschadet zu überleben. Aber zwei Brüder beschlossen, Mitleid mit mir zu haben und den Rest der Karawane davon zu überzeugen, mich mitfahren zu lassen. Ich musste den Zauberstab und das Medaillon der Priesterin verkaufen, aber ich schaffte es, einen sicheren Weg in ein Dorf zu finden, das weit genug vom Pfad der Zerstörung der Dämonen entfernt war. -guide.bloodmagic.entry.demon.snare.info.1=Magus sagte mir eines Tages, dass jedes Lebewesen eine Seele hat: Menschen, Hühner, Schafe und sogar Creeper haben diese Lebenskraft, die dem Körper den Willen zum Leben geben würde. Es scheint, dass Magus in seiner Zeit viele Experimente gemacht hat und sogar von einem mächtigen Magier gehört hat, der diese Seelen in leere Gefäße wie Zombies verwandeln könnte. Aber das ließ mich fragen: Wenn Zombies und Skelette keine Seelen hatten, warum hatten sie dann den Willen zu leben? Was animierte sie, damit sie versuchen würden, jedes Lebewesen zu jagen und zu töten?\n\tEs kam alles zu Dämonischen Willen zurück, jedes einzelne Mal. Alles "Lebende" musste einen Willen haben, um zu überleben, aber es bedeutete nicht, dass es ihr eigener sein musste. Als ich das zu Magus brachte, dachte er ein wenig darüber nach, brachte dann eine Tafel und Kreide heraus (von wo, wer weiß) und begann, einige Notizen über andere Formen der Magie zu zeichnen. "In der Thaumaturgie", sagte er, während er die Form eines Strohmannes skizzierte, "sind Golems animierte Wesen, die beauftragt sind, viele alltägliche Operationen durchzuführen. Sie leben, atmen und können sogar sterben, wenn sie bei ihren Herren in Ungnade fallen. In der gegenwärtigen Iteration der Thaumaturgie, und ja, es gab im Laufe der Jahrhunderte mehrere Versionen dieser Kunst, würde der Magier dessen Willen in die unbelebte Schöpfung einfließen lassen und sie zum Leben erwecken.\n\t "Dies, Bella, ist wie Golems arbeiten: durch eine Einprägung von Willen."\n\tAlso wenn ein Golem durch die Einprägung des Willens einer anderen Entität in dessen leere Hülle leben kann, vielleicht bringt eine andere Entität die Körper der Toten als Skelette und Zombies zurück ins Leben. An diesem Punkt zitterte ich und erinnerte mich kurz daran, was in meinem alten Dorf geschah. Nur ein Dämon kann etwas so Grausames tun. Aber um diese Hypothese zu testen, brauchte ich mehr Beweise. -guide.bloodmagic.entry.demon.snare.info.2=Mit etwas Anleitung von Magus und Tiberius, als er mir eine Hand von seiner eigenen Arbeit geben konnte, machte ich mir eine rudimentäre Schlinge aus Eisen, Schnur und ein wenig Redstone. Tiberius, der die Thaumaturgie als disziplinübergreifende Magie seiner Wahl vertieft studierte, sagte, dass die Falle in der Lage sein sollte, den Willen einer Entität zu stören, die ein animiertes Objekt kontrolliert. "Ich habe damit herumgealbert, als ich mit Golems spielte", sagte er lächelnd. Wir alle wussten, wie gut das ausgegangen ist. "Redstone schien die Verbindung zwischen meinen Golems und meinem Willen, sie zu bewegen, zu stören. Theoretisch, wenn etwas die Zombies oder Skelette kontrolliert, solltest du in der Lage sein, den Willen abzuschneiden."\n\tEr sagte, dass alles, was ich tun musste, war, es zu werfen - wenn es funktionierte, sollte etwas weißer Staub für eine gewisse Zeit aus dem Wesen strömen. "Also musst du es töten, wenn das passiert, damit wirklich etwas passiert. Aber die Schlinge könnte nur zu 25%% der Zeit funktionieren, also sei ein wenig großzügig mit ihnen!", nachdem ich sechzehn von ihnen hergestellt hatte, ging ich während der Nacht mit meinem Schwert aus. Es war ziemlich heikel: Ich musste mehrere Zombies ausfindig machen, mich ducken und ihnen ausweichen, während ich ein paar Fallen auf sie warf. Sobald die weißen Partikel von ihnen abgelöst wurden, tötete ich sie schnell und nahm die Ãœberreste ihrer Körper auf. Eine kleine Menge einer blauen viskosen Flüssigkeit schien in dem körnigen Staub zu liegen, der mir zu mir rufen zu schien. Ich hob es auf, und es schien, als käme eine jenseitige "Präsenz" aus der Flüssigkeit. Als ich die Proben schnell verstaute, entschied ich mich, sie tiefer zu betrachten, als ich nach Hause kam. Es schien, dass die Größe und Form jedes "Dämonischen Willens" variierte, als ob die Qualität des Willens von der Quelle abhängt. Mit einer völlig willkürlichen Maßeinheit scheint der Wille, den ich von den Fallen bekommen habe, zwischen null und fünf "Willensqualität" zu liegen. Ich bin mir noch nicht sicher, wofür ich diese Substanz verwenden kann, aber sie ist trotzdem sehr faszinierend. Ich kann nicht sagen, ob dies der Abdruck des Willens eines Dämons ist, oder nur ein zufälliger Kristall, der in ihren Körpern gefunden wurde. Mehr Forschung ist notwendig. -guide.bloodmagic.entry.demon.forge.info.1=Ich habe mehrere Wochen damit verbracht, den Nutzen und die Eigenschaften des dämonischen Willens zu erforschen. In den letzten Tagen gab es einige Erfolge, aber nur selten. Tiberius fragte mich neulich, ob er eine Probe des dämonischen Willens für ein paar seiner anderen Experimente nehmen könnte: Er erwähnte, dass es das sein könnte, was er brauchte, um einen neuen Blutaltar zu bauen, um das ramponierte Becken zu ersetzen, das wir in Magus' Keller benutzten, da der Versuch, dieses alte Ding mit nur Stein zu replizieren, nie den richtigen Behälter für unsere Blutmagie zu schaffen schien.... Mit anderen Worten, er denkt, es könnte helfen. Es war keine komplette Verschwendung. Ich habe verschiedene Alchemie-Lehrbücher zu "Äquivalente Umwandlung" und den vielen verschiedenen Möglichkeiten, Materie zu manipulieren, konsultiert. Ich sprach auch mit ein paar Alchemisten, die vorbeikamen, und sie gaben mir ein paar Tipps, wie man Materie und Energie dekonstruieren kann, um sie genauer zu studieren. (Als Nebenbemerkung muss ich sagen, dass ich die dunkelviolette Rüstung liebte, die ein Alchemist trug - schon beim Betrachten fühlte ich mich, als würde ich von einem dichten Gegenstand angezogen. Von Tiberius mal ganz abgesehen!) Durch die Verwendung dieser einfachen Anordnungen mit den kleinen Proben, die ich hatte, konnte ich sehen, dass es Möglichkeiten gab, die Energiequelle im Inneren des dämonischen Willens anzuzapfen. Ich brauchte nur die richtige Konfiguration. -guide.bloodmagic.entry.demon.forge.info.2=Gerade heute habe ich es geschafft, eine Struktur zu entwickeln, von der ich glaubte, dass sie Elemente mit diesem rohen Willen zusammenfügen würde. Als "Höllenfeuerschmiede" bezeichnet, verwendet die Struktur eine einfache, in das Glas geschnitzte Alchemische Anordnung, um bis zu vier Gegenstände miteinander zu verschmelzen und sie mit dämonischem Willen zu injizieren. Das Stück dämonischen Willens wird auf der rechten Seite platziert und die vier Zutaten werden um den Kreis gelegt. Es scheint, dass es viele verschiedene "Rezepte" in dieser Schmiede gibt, aber es gibt einige Bedingungen für diese. Für den Anfang gibt es ein Minimum an dämonischen Willen, der in der Probe sein muss, damit sich die Gegenstände verbinden können - wenn es nicht genug Willen in der Struktur gibt, scheint nichts zu passieren. Zunächst scheint es, dass, obgleich es eine minimale Menge des Willens benötigt, die meisten Rezepte nicht den gesamten Willen der Probe verwenden. Einige Rezepte benötigen eine große Menge an dämonischem Willen, um den Prozess zu starten, aber nur ein wenig wird in der Herstellung verwendet, wenn überhaupt. Einige Rezepte scheinen in großen Mengen sehr einfach zu erstellen zu sein, aber andere... nicht so sehr. -guide.bloodmagic.entry.demon.petty.info.1=Ich ging auf eines meiner nun allnächtlichen Abenteuer, um etwas dämonischen Willen zu sammeln, als ich anfing, eines der größten Probleme mit der Sammelmethode zu erkennen: meine Tasche wurde immer voller von all den Proben! Aus irgendeinem Grund, vielleicht weil die ultimative Quelle des dämonischen Willens für jede Probe anders ist, würde der Wille nicht in eine überschaubare Form komprimiert. Zumindest die physische Manifestation des Willens. Also ging ich zur Arbeit mit der Höllenfeuerschmiede, die sich in meiner Ecke des Hauses befand, schob einige von Tiberius' weniger unangenehmen Experimenten beiseite und besorgte einige Rohstoffe für mein eigenes Studium. Eines Tages werde ich Tiberius eine eigene Schmiede machen, da ich es satt habe, den ganzen Staub, der meinen Arbeitsplatz bedeckt, von seinen "arkanen Experimenten" loszuwerden. Es ist mir egal, dass du "versuchst, die Kluft zwischen den ätherischen Strängen des Seelen-Netzwerks und der physischen Konstruktion der Schiefertafeln zu überbrücken", hol deine verdammte Asche aus meinen Sachen! -guide.bloodmagic.entry.demon.petty.info.2=Wie auch immer, es dauerte eine Weile, um Materialien zu finden, die am ehesten mit dem dämonischen Willen in Resonanz kamen, um ihn besser zu speichern. Lapis scheint der am leichtesten verfügbare Leiter dieser Energie zu sein, der als Weg für den zu kanalisierenden Willen dient. Nachdem ich etwas Redstone als Abschirmung gegen elektrische Felder in der Luft hinzugefügt hatte (zwei Energien zusammengenommen scheinen katastrophale Auswirkungen zu haben, zumindest sagte Magus das), Gold als Dämpfungsmittel und Glas als einfaches Gehäuse, gelang es mir, einen sehr einfaches "Juwel des Tartaros" zu schaffen. Das heißt "ein Juwel aus der Unterwelt, Tartaros." Nach weiteren Tests fand ich heraus, dass dieses Juwel bis zu einer Willensqualität von 64 halten könnte. Als ich danach versuchte, den dämonischen Willen aufzuheben, schien dieser direkt in den Edelstein zu gehen, wenn er nicht voll war - danach schien der Wille einfach... zu verschwinden. Praktisch für meinen Rucksack, aber sonst ein Rätsel. Ich erfuhr auch, dass, wenn ich den Edelstein in meiner Hand halte und mich konzentriere (Rechtsklick), ungefähr 10% der maximalen Kapazität des Edelsteins in andere Edelsteine fließen würde, die ich auf meiner Person hatte. Ich denke, diese letzte Eigenschaft ist sehr hilfreich, besonders wenn wir andere, mächtigere Juwele entdecken sollten. -guide.bloodmagic.entry.demon.sword.info.1=Meine Fallen haben sich wieder verheddert.\n\tEs scheint keine Rolle zu spielen, wie sehr ich versuche, das Design zu verbessern, die rudimentäre Schlinge scheint nie perfekt zu funktionieren. Es verheddert sich nur die meiste Zeit, und wenn ich es endlich schaffe, einen Zombie damit zu treffen, ist es wahrscheinlicher, dass es nicht funktioniert als dass es tut, was es soll. Um mich davon abzuhalten, mir selbst die Haare auszureißen, ging ich wieder zur Schmiede und machte mich sofort an die Arbeit.\n\tNun, nicht sofort, schließlich musste ich zuerst noch die Asche entfernen. -guide.bloodmagic.entry.demon.sword.info.2=Ich fusionierte die Fähigkeit des Winzigen Juwels des Tartaros, dämonischen Willen zu halten mit einem eisernen Schwert und schuf eine Klinge, die.... sehr stumpf war und kaum mehr Schaden anrichtete als meine Faust. Ich war eigentlich sehr enttäuscht über das Ergebnis, denn es dauerte eine lange Zeit, mit der Schmiede herumzuexperimentieren, sodass sie durch die Belastung, ein Winziges Tatarisches Juwel als Energiequelle zu nutzen, nicht überhitzte.\n\tDoch sobald ich mein Tartarisches Juwel aufhob, begann das Schwert mit einer neuen Energie zu leuchten. Es scheint, dass je höher die Menge des dämonischen Willens, die ich an meiner Person habe, desto mehr Schaden ich mit dem Schwert anzurichten scheine und desto mehr Dämonischer Wille kann von den Kreaturen absorbiert werden. Wann immer du kein Juwel hast, ist die Quantität des Willens sehr.... gering.\n\tNach einem kleinen Test kam ich zu einer anderen Erkenntnis: Je nachdem, was ich töte, bekomme ich unterschiedliche Mengen von Willen. Es scheint proportional zur Menge der maximalen Gesundheit, die das Monster hat - eine Spinne, da sie eine maximale Gesundheit von 8 Herzen hat, gibt 80%% des Willens eines Zombie, der 10 Herzen hat. Das liegt wahrscheinlich daran, dass diese Monster mehr Willen benötigen, um zu animieren. Ich sollte das für spätere Erkenntnisse beachten. -guide.bloodmagic.entry.demon.lesser.info.1=Ich habe mich heute mit Tiberius unterhalten und einige seiner Projekte besprochen. Ich muss sagen, wenn wir über seine Forschung sprechen, scheint es, dass er immer weiter und weiter und weiter geht! Wie auch immer, eine der jüngsten Erfindungen, über die er sprechen wollte, waren seine Siegel: Bis jetzt ist es ihm gelungen, ein Wassersiegel und ein Lavasiegel zu erschaffen, wobei er die Höllenfeuerschmiede benutzte, die ich schließlich für ihn konstruiert habe, um sie zu erschaffen. Ich war mir nicht ganz sicher, wie er sie tatsächlich hergestellt hat - ich wusste, dass er experimentierte, indem er einige Zutaten nahm und sie in der Schmiede mit dem Tartarischen Juwel als Katalysator kombinierte, aber ich habe ihn noch nicht aktiv experimentieren sehen. Nun, ich habe endlich einen Einblick bekommen, wofür er diese verdammte Asche benutzt.\n\tMal sehen, ob ich genau nachahmen kann, was er gesagt hat. Ahem. "Durch die Verwendung des Dämonenwillens, der in diesen Edelsteinen enthalten ist, um die Inhaltsstoffe umzuwandeln, entsteht eine Reaktion zwischen Dingen, die normalerweise nichts tun, wenn sie kombiniert werden. Indem ich diese erzwungene Synergie nutze, bin ich in der Lage, mehrere arkane Symbole in Muster einzuschreiben, die die Energie zu lenken, die ich selbst hinzufüge, um die gewünschte Aufgabe zu erfüllen." Obgleich es niedergeschrieben nicht sehr anschaulich ist, stell dir sich vor, wie ich das sage, während ich eine Brille den Nasenrücken hochschiebe. Ich bin mir nicht sicher, ob er normalerweise so ist, aber ich schwöre, er wird komplett... wissenschaftlich, wenn er mir die Dinge erklärt. Nach der zugegebenermaßen auffälligen Demonstration kam er dann zum Kern der Diskussion. "Wenn ich versuche, diesen Prozess mit einigen fortschrittlicheren Materialien zu replizieren, scheint es, dass die Reagenzien... explodieren, wenn sie der Alchemischen Anordnung hinzugefügt werden. Sie scheinen sehr instabil zu sein. Ich denken, dass die Zutaten nicht richtig miteinander verschmolzen werden - vielleicht ist nicht genug Energie in der Schmiede, um sie richtig zu verschmelzen."\n\tNachdem ich ein paar Minuten darüber nachgedacht habe, machte ich an die Arbeit - wie ich in einem früheren Eintrag erwähnt habe, dachte ich, dass ein stärkeres Juwel erforderlich wäre, aber ich habe immer noch nicht genau herausgefunden, wie ich das auf elegante Weise machen könnte. Also beschloss ich, dass ein brachialer Ansatz dafür ausreichen würde! -guide.bloodmagic.entry.demon.lesser.info.2=Ich nahm einen Block Lapis, einen Block Redstone und einen Diamanten sowie einen leeres winziges Tartarisches Juwel, das ich herumliegen hatte - Teil eines vergangenen Experiments, das.... nicht gerade gut lief. Alles, was ich dazu sagen kann, ist, dass ich überrascht bin, dass Magus Löcher in einer festen Betonwand einfach verschwinden lassen kann. Dann kombinierte ich diese vier Gegenstände in der Höllenfeuerschmiede mit einem gefüllten winzigen Juwel, um als Energiequelle zu dienen - ein Minimum von 60 Wille scheint erforderlich zu sein. Nach ein wenig Mühe, eine optimale Anordnung zu finden, setzte ich sie dann zusammen und beobachtete, wie das leere Tartarische Juwel innerhalb der Schmiede zu wachsen begann.\n\tNur nebenbei, ich versuchte, einen Block Gold statt einen Diamanten zu nutzen, um das Juwel wachsen zu lassen, jedoch scheint es, dass eine weitere Kristallstruktur vorteilhafter ist.\n\tDieses neue, "Geringe Juwel des Tataros" scheint eine wesentlich höhere Kapazität zu besitzen, indem es fähig ist, bis zu 256 Rohen Willen halten zu können. Hoffentlich ist das genug, um Tiberius' Bedarf an großen Mengen an Willen für eine Weile zu stillen. Aber leider scheint es, dass ich dieses Juwel auffüllen muss. Eine weitere lange Nacht liegt vor mir! -guide.bloodmagic.entry.demon.reactions.info=Ich bin heute in einem Krankenbett aufgewacht und habe Schmerzen. Ich öffnete die Augen und sah das dumpfe Magenta, das die Decke des "Mächtige Flüche"-Flügels des Krankenhauses in Veteres bildete, der unserem Dorf am nächsten gelgenen Stadt. Ich war nicht gerade beunruhigt über diese Information: es hat mich so verwirrt, dass ich irgendwie hier gelandet bin, während ich scheinbar nur mit Kratzern und blauen Flecken bedeckt war, plus einem einfachen Gips auf meinem linken Bein. Jemand muss einen "Ossa Fracta"-Fluch auf mich geworfen haben oder so, denn es könnte nur ein einfacher gebrochener Knochen sein! Als Magus mit einer der Schwestern mit einem ernsten Gesicht reinkam, wusste ich, dass es etwas drastischeres war. Anscheinend habe ich einen kleinen Rückschlag mit einem meiner Experimente mit dem neuen Geringen Tatarischen Juwel erlitten und eine kleine, aber kräftige Explosion ausgelöst. So viel konnte ich leicht verstehen, aber das war es nicht: Die Mischung aus Obsidian, Eisen und Diamant, die ich benutzte, beschichtete meinen linken Unterschenkel und bildete eine starre Schale, die nicht entfernt werden konnte. Der Gips, den ich auf meinem Bein hatte, war eigentlich kein Gips, sondern eine Art Runenmatrix, die die hellblaue Schale bedeckte. Ich fragte, was Magus dachte, obwohl ich mir ziemlich sicher war, was passiert war. "Ich glaube", sagte er und blickte auf die Krankenschwester, die ihm aufmerksam zuhörte, bevor sie mich ansah, "dass es einfach eine Art Rückstand ist, der auf Diamanten basiert, was der Hauptgrund dafür ist, dass wir ihn nicht entfernen können. Es ist auch mit etwas... jenseitiger Energie verwebt, was der Hauptgrund dafür ist, dass du hier bist, anstatt in einem Bett in der örtlichen Klinik - das Konglomerat ist seit dem Eldritch-Vorfall ziemlich streng in Bezug auf unbekannte Energie, die direkt mit Menschen in Verbindung ist, also mussten wir sicherstellen, dass es keine Probleme gab. "Ich sehe..." Normalerweise kümmert sich Magus nicht viel um Formalitäten wie z.B. sicherzustellen, dass das Konglomerat über unbekannte Energien informiert ist - ich experimentiere schon eine ganze Weile mit Dämonischen Willen, und es ist nicht so, dass das Konglomerat an unsere Tür klopft, um diese Magie registrieren zu lassen. Ich werde hier nicht viel ins Detail gehen, da ich nicht sehr versiert in der Politik bin, aber ich weiß, dass Magus nur sparsam daran teilnimmt. Das bedeutete, dass die Macht dieses Willens Magus sehr beunruhigte, vielleicht durch einige seiner vergangenen Erfahrungen...?\n\t "Ah gut, genug davon im Moment", sagte Magus und krempelte die Ärmel seiner Roben hoch. "Ich habe versucht, die Schale zu brechen, als ich sie zum ersten Mal sah, offensichtlich nachdem ich überprüft hatte, was sie war. Letztes Mal hatte es keine Wirkung, aber jetzt..." Es gab eine glühende Hitze auf meinem linken Bein, begleitet von einem blendenden roten Licht, als Magus seine Hände auf die blaue Schale schröpfte. Nach einem Moment, der sich wie eine Ewigkeit anfühlte, aber nur ein paar Sekunden gedauert haben muss, begann die Schale zu reißen und zu brechen und zerfiel. Ehrlich gesagt, es war irgendwie enttäuschend. versuchte ich aufzustehen, aber Magus schob mich mit einem kleinen Stoß zurück ins Bett. "Bella, du musst bleiben und dich ausruhen. Du kannst später mit deiner Forschung an den Juwelen fortfahren." Ich war zunächst verärgert, aber das ging schnell vorbei, da ich viel Zeit zum Nachdenken hatte. Der einzige Grund, warum Magus nicht in der Lage war, genau das Gleiche vorher zu tun, war wahrscheinlich, dass ich nach der Explosion immer noch mein Tartarisches Juwel bei mir hatte. Was auch immer mit meinem Bein geschah, musste direkt an den Dämonischen Willen gebunden sein, und sobald mein Juwel genommen wurde, konnte die Schale entfernt werden. Es brachte mich zum Nachdenken... -guide.bloodmagic.entry.demon.sentientGem.info.1=Nach ein paar Tagen "dringend nötiger Bettruhe", die von Magus vorgeschrieben und durchgesetzt wurde, beschloss ich, ein wenig zu recherchieren, vor allem über die empfindsame Ausrüstung, die ich bisher gemacht habe. Es gibt einfach so viel, dass ich nicht über das empfindsame Schwert und den Dämonenwillen im Allgemeinen Bescheid weiß. Sicher, wir wissen etwas von der Theorie, aber wenn man bedenkt, dass Magus und ich diejenigen waren, die die Theorie entwickelt haben, ist es schwer zu sagen, was genau sie ist. Magus sagte mir, dass er immer, wenn er einen Lehrling nimmt, darauf besteht, dass sie neben der Forschung, die er betreibt, eine andere Form der Magie lernen müssen. Tiberius bot mir an, Botanik zu lernen, aber ich spottete über die Idee - ein paar Blumen werden mir nicht viel helfen, wenn ich gegen Dämonen kämpfen muss! -guide.bloodmagic.entry.demon.sentientGem.info.2=Das Juwel der Empfindsamen Rüstung ist ein umschaltbarer Gegenstand, mit dem du deine empfindsame Rüstung an- und ablegen kannst. Wenn du mit der rechten Maustaste auf das Juwel klickst, während du mindestens 16 Dämonenwille in deinem Inventar hast, wird deine Rüstung durch einen Satz empfindsame Rüstung ersetzt, die alle Verzauberungen der ersetzten Rüstung kopiert - wenn du das Juwel wieder deaktivierst, erhältst du deine ursprüngliche Rüstung zurück. Das funktioniert auch, wenn du überhaupt keine Rüstung anhast. Die empfindsame Rüstung wirkt anfangs wie eine einfache eiserne Rüstung, die keine zusätzlichen Fähigkeiten außer Schutz bietet. Ähnlich wie andere empfindsame Werkzeuge bietet die Rüstung jedoch mehr Schutz, wenn du mehr Dämonenwille in deinem Besitz hast. Dies macht den Schutz wirklich mächtig, wenn man eine große Menge an Dämonenwille angesammelt hat. Der Nachteil dabei ist, dass jeder Treffer, den du nimmst, ein kleines Stück Dämonenwille aus deinen tatarischen Juwelen extrahiert, und wenn du zu niedrig wirst, wird deine Rüstung wieder in ihre ursprüngliche Form zurückkehren. Könnte unangenehm werden! -guide.bloodmagic.entry.demon.routing.info=Der Gegenstandstransport in der Blutmagie kommt von der Verbindung von Strängen des Dämonischen Willens zwischen Verteilerknoten, die als Leitungen dienen, um Gegenstände von einem Inventar in ein anderes zu transferieren. Lassen Sie uns zunächst erklären, wie jedes einzelne Element funktioniert: Jedes Verteilersystem benötigt einen Haupt-Verteilerknoten, der als Gehirn des Systems fungiert. Ein Eingangsknoten gibt Elemente in das System ein, und ein Ausgangsknoten gibt Elemente aus Ihrem System aus, und ein normaler Verteilerknoten hat keine spezielle Funktion.\n\tUm ein Netzwerk zu erstellen, musst du Knoten durch Shift-Klicken mit dem Knoten-Router miteinander verbinden. Solange ein Knoten irgendeinen Weg zu einem anderen Knoten verfolgen kann (und wenn er mit einem Haupt-Verteilerknoten verbunden ist), können sie miteinander kommunizieren.\n\tAllgemein kann gesagt werden, dass Gegenstände aus einem Inventar neben einem Eingangsknoten gezogen und in ein Inventar neben einem Ausgangsknoten gelegt werden. Um festzulegen, was wohin geht, sollte ein Filter verwendet werden. Durch Klicken auf eine der Schaltflächen in der Schnittstelle des Knotens kann ausgewählt werden, was in der angegebenen Richtung in das Inventar gelangt (N steht für Norden usw.). Wenn ein Gegenstandsfilter in den linken Schlitz des Knotens gesetzt wird, kann die Anzahl und Art der Elemente angeben werden, mit denen der Knoten auf Grundlage des Filters interagieren kann. Wenn ein Filter auf einen Eingabefilter gesetzt wird, können nur solche Gegenstände aus dem Bestand gezogen (es wird mindestens der angegebene Betrag zurückbehalten, wenn eine Menge angegeben ist). Wenn ein Filter auf einen Ausgabefilter gesetzt wird, kann nur diese Art von Gegenständen in das Inventar gelegt werden, bis zu einem Maximum der angegebenen Menge.\n\tEs gibt vier verschiedene Filterarten:\n\tPräzise - Der Gegenstand muss genau übereinstimmen, einschließlich NBT und Metadaten\n\tMod - Der Gegenstand passt, wenn er von einem der gefilterten Mods stammt.\n\tIgnoriere NBT - Der Gegenstandsfilter berücksichtigt keine NBT-Daten\n\tOre Dictionary - Jeder Gegenstand, der mit einer Ore Dictionary-Referenz der Filter übereinstimmt, ist erlaubt.\n\tDu solltest zwei Nummern sehen, wenn du den Filter in einen Knoten einsetzt: Die Menge und die Priorität. Wenn du auf einen der Gegenstände im Filter klickst, erscheint der Name des ausgewählten Gegenstands und darunter dessen Anzahl. Durch Setzen dieser Nummer kann dem Filter mitgeteilt werden, wie viele dieser Gegenstände im angeschlossenen Inventar auf Lager gehalten werden (entweder bis zu diesem Betrag, wenn es sich um einen Ausgabeknoten handelt, oder um den Betrag, der im Inventar verbleibt, wenn es sich um einen Eingabeknoten handelt). Wenn der Betrag des Filters auf 0 gesetzt ist, wird jede Menge für diesen bestimmten Filter erlaubt. Eingabeknoten ziehen so viel wie möglich aus dem Inventar, und Ausgabeknoten entziehen so viel wie möglich.\n\tDie zweite Zahl ist die Priorität des Knotens, geändert durch die Pfeiltasten daneben. Diese Nummer ist für jede Seite des Knotens unterschiedlich. Der Knoten, der die NIEDRIGSTE NUMMER im Netzwerk hat, wird zuerst verwendet. -guide.bloodmagic.entry.demon.aura.info=Wenn ein Wesen normal getötet wird, verdunstet es mit der Zeit und kehrt zu dessen Schöpfer zurück. Wenn es mit einer Schlinge gefangen wird, wird es aus dem Ätherischen in diese Ebene gezogen und steckt irgendwie fest. Wir haben dessen Programmierung im Grunde gebrochen, und es hat alle Aktionen eingefroren. Wenn wir es verbrennen, kehrt es in einen ätherischen Zustand zurück und kann den normalen Betrieb wieder aufnehmen. Wenn dieser Wille in die Luft gespritzt wird, können wir ihn auf verschiedene Weise nutzen. Einige von ihnen sind einfacher Natur, während andere ziemlich mächtig sind. Jedes Stück hat seinen eigenen gespeicherten Willen, wobei jede Art von Willen einzeln gespeichert ist (mehr dazu in einem anderen Abschnitt). Dieser Wille kann von anderen Blöcken und Gegenständen aufgerufen und manipuliert werden. -guide.bloodmagic.entry.demon.types.info=Bis jetzt ist die einzige Art von Dämonenwille, die wir besprochen haben, der rohe Wille. Wie der Name schon sagt, ist es die roheste und unverfälschteste Form des Willens, die es gibt, aber das bedeutet nicht, dass es rein ist. Tatsächlich nimmt Dämonischer Wille viele verschiedene Formen an: Roh ist der Typ, mit dem wir es normalerweise zu tun haben, aber es gibt auch korrosiv, zerstörerisch, rachsüchtig und standhaft. Der rohe Wille besteht aus einer Mischung aller vier dieser Typen und vielleicht mit anderen, noch unentdeckten Typen, aber wenn man sie einmal in diese verschiedenen Willenstypen aufgeteilt hat, scheint es unmöglich, sie zu rekombinieren.\n\tEs ist noch nicht klar, ob diese verschiedenen Typen von Willen aus verschiedenen Quellen stammen, aber wir kennen den Prozess der Erzeugung dieser verschiedenen Typen von Willen. Das Ritual "Resonanz des facettierten Kristalls" kann einen rohen Willenskristall in seine reinen Teile zerlegen, mehr dazu im entsprechenden Eintrag in "Der Ritualmeister". Ein Gerät, um rohe Willenskristalle zu erhalten, ist der Dämonenkristallisierer, dessen Eintrag weiter unten zu finden ist. Es mag mehr Arten von Willen geben, aber sie sind entweder nicht rein genug oder können einfach nicht in dieser Form erschaffen werden.\n\tKorrosiv repräsentiert den Wunsch, alle Dinge um sich herum zu zerstören, entweder mit Säure oder durch zermalmende Kraft. Wer diesen Willen beherrscht, kann lähmende Status-Effekte ausüben und ist immun gegen schreckliche Gifte.\n\tRachsüchtig kann als das Verlangen angsehen werden, ein Ziel ohne Ermüdung zu jagen. Normalerweise kann dies entweder als eine erhöhte Geschwindigkeit des Körpers gesehen werden, die Beute zu suchen, oder um sicherzustellen, dass ein Ziel nicht in der Lage ist, zu entkommen, während es ständig angegriffen wird.\n\tZerstörerisch, wie du wahrscheinlich ahnst, ist pure Kraft. Wenn dieser Wille richtig eingesetzt wird, können Angriffsstärke und allgemeine körperliche Fähigkeiten gewonnen werden. Es kann auch verwendet werden, um Dinge zu zerquetschen und zu zerschlagen, wenn es in anderen Anwendungen verwendet wird.\n\tStandhaft ist das Verlangen, sich von Schaden zu schützen. In den meisten Fällen sind die Herren dieses Willens das defensive Bollwerk der Gruppe, das in der Lage ist, mächtigen Angriffen standzuhalten und sie nicht einmal zu spüren. Wenn du am Leben bleiben musst, durch Rüstung oder durch Rituale, ist dies eine Wahl, die in Betracht gezogen werden sollte. -guide.bloodmagic.entry.demon.crucible.info=Der Dämonenschmelztiegel ist ein Gerät, das in der Lage ist, den Dämonenwille in einem tartarischen Juwel und anderen Gegenständen zu verbrennen, um ihn in die Aura des Chunks, in dem er sich befindet, zu injizieren. Es gibt verschiedene Möglichkeiten, den Tiegel zu benutzen: Eine der einfachsten Möglichkeiten ist es, ein tartarisches Juwel in den Tiegel zu legen, indem man mit der rechten Maustaste darauf klickt und ein solches Juwel in der Hand hält. Der Tiegel entleert dann den Willen aus dem Juwel, bis entweder die Aura mit dieser Art von Willen gesättigt ist (standardmäßig maximal 100) oder bis das Juwel leer ist.\n\tEin anderer Modus ist, das enthaltene Juwel zu benutzen, um den Willen aus der Aura zu ziehen - dies geschieht, indem man ein starkes Redstonesignal an den Tiegel anlegt und dann wird das enthaltene Juwel versuchen, so viel Willen wie möglich zu entziehen.\n\tZu guter Letzt kann ein einzelnes Stück dämonischen Willens verbrannt werden, solange die Aura genügent Platz bietet. Ein Beispiel dafür ist ein Willenskristall, der einen Wert von 50 hat. -guide.bloodmagic.entry.demon.crystallizer.info=Wie zuvor besprochen, ist die Dämonen-Aura die ätherische Manifestation des Dämonenwillens, und die Substanz, die man erhält, wenn man einen Mob tötet, ist dessen physische Manifestation. Der Dämonenkristallisierer fungiert als Ankerpunkt für den Dämonenwillen in der Aura, sodass sich dieser daran physisch manifestieren kann und verwandelt den ätherischen Willen wieder in eine physische Form als Kristalle.\n\tSicher wundert es dich, warum man den Willen nicht einfach aus einem tartarischen Juwel in einen Kristall formen kann. Denn indem wir den Willen in seine ätherische Form transformieren, reinigen wir ihn und erlauben dem Willen, seinen normalen Betrieb wieder aufzunehmen - denke daran, dass wir die Programmierung des Willens einfrieren, wenn wir ein Monster mit Dämonenwillen töten, so dass es nicht tun kann, wozu es ausgesandt wurde. Durch die Umwandlung in die ätherische Form in der Aura wird der Wille aktiver, und das ist der Wille, der vom Kristallisierer ergriffen wird. Schaut es einfach nicht komisch an.\n\tDamit der Dämonenkristallisierer funktioniert, muss er in einem Chunk mit einem hohen Anteil an Dämonen-Willen (80) eines bestimmten Typs stehen. Nach einer gewissen Zeit wird er den Willen der Aura verbrauchen, um eine Gruppe Dämonenkristalle mit einem einzigen Turm zu erschaffen. Es gibt zwei Möglichkeiten, wie der Kristallisierer wirken kann: Er kann einen Kristall aus einem bestimmten Willenstyp (korrosiv, zerstörerisch, rachsüchtig und unerschütterlich) bilden, wenn es genug Willen dieses bestimmten Typs gibt, oder er wird den rohen Willen aus der Aura nehmen, um einen Kristall zu erschaffen. In früheren Inkarnationen des Geräts war es möglich, rohen Willen aus der Aura in andersartige Kristalle zu verwandeln. Das ist jedoch nicht mehr der Fall: Ihr könnt immer noch neue Türme eines bestimmten, angestrebten Willens erschaffen, wenn es genug davon in der Aura gibt, aber ihr müsst andere Mittel suchen, um die vielen Aspekte vom rohen Willen zu trennen. Siehe den Eintrag "Resonanz des facettierten Kristalls" in "Der Ritualmeister" für weitere Details. -guide.bloodmagic.entry.demon.cluster.info=Der Dämonen-Kristallhaufen kann entweder von einem Dämonen-Kristallisator oder in der Höllenfeuer-Schmiede mit Dämonen-Will-Kristallen erschaffen werden. Handwerkliche Cluster können auf jeder festen Oberfläche, wie z.B. dem Boden, den Wänden und den Decken platziert werden. Es gibt maximal sieben Türme auf dem Kristall, wenn er ausgewachsen ist, und wenn er mit einer Spitzhacke gebrochen wird, wird er die Türme als Dämonen-Will-Kristalle fallen lassen. Wenn du jedoch mit der rechten Maustaste auf den Cluster klickst, wenn du ein Tartarisches Juwel mit mehr als 1024 rohem Willen in ihm hast, kannst du einen einzelnen Turm aus dem Cluster abbrechen, ohne den Cluster selbst zu brechen; dies wird niemals den Hauptturm aus dem Cluster brechen.\n\tWenn der Cluster zu seinen eigenen Geräten zurückkehrt, wird er einen Willen des gleichen Typs aus der Aura absaugen, um sich langsam zu entwickeln. Es gibt zwei Rituale, die benutzt werden, um diese Kristalle zu züchten und zu ernten: die "Versammlung der Verlassenen Seelen" und der "Riss des gebrochenen Kristalls ". Um herauszufinden, wie man sie benutzt, finde diese in "Der Ritualmeister". -guide.bloodmagic.entry.demon.pylon.info=Wie ihr vielleicht wisst, bleibt die Dämonen-Aura in ihrem eigenen Chunk, wenn es keine äußeren Einflüsse gibt. Nun, das ist einer dieser Einflüsse. Der Dämonenpylon fungiert als Leuchtfeuer für den Willen in der Aura und zieht den Willen aus den benachbarten Chunks (die Chunks, die in den vier Himmelsrichtungen direkt daneben liegen, nicht diagonal) in seinen Chunk. Der Pylon wird versuchen, den Willen in seinem Chunk mit seinem Nachbarn auszugleichen, so dass der Chunk des Pylons für jeden Willenstyp so viel Willen hat wie sein höchster Nachbar. Dieser Prozess geschieht jedoch nur in eine Richtung: Wenn der benachbarte Teil weniger Wille hat als der Teil des Pylons, wird der Wille nicht auf die Nachbarn übertragen. -guide.bloodmagic.entry.demon.gauge.info=Um zu sagen, wie viel Wille du in einem bestimmten Chunk hast, brauchst du einen Dämonischen Auramesser. Wenn sich dieser in deinem Inventar befindet, zeigt die Anzeige den Willen in dem Chunk an, welcher auf fünf Balken oben links auf dem Bildschirm abgebildet wird. Wie viel es genau ist, kann an der Verschiebung erkannt werden; rechts neben den Balken erscheinen Zahlen, die den Betrag auf die nächste ganze Zahl gerundet darstellen. - - - -# Alchemy Entries -guide.bloodmagic.entry.alchemy.intro=Einführung -guide.bloodmagic.entry.alchemy.ash=Arkane Asche -guide.bloodmagic.entry.alchemy.speed=Bewegungs-Anordnung -guide.bloodmagic.entry.alchemy.updraft=Aufwind-Anordnung -guide.bloodmagic.entry.alchemy.bounce=Abprall-Anordnung -guide.bloodmagic.entry.alchemy.turret=Skelettgeschütz-Anordnung -guide.bloodmagic.entry.alchemy.buff=Effekt-Anordnungen -guide.bloodmagic.entry.alchemy.fastMiner=Anordnung der Eile -guide.bloodmagic.entry.alchemy.furnace=Anordnung des Brennenden Ofens -guide.bloodmagic.entry.alchemy.teleport=Teleportations-Anordnung -guide.bloodmagic.entry.alchemy.standardTurret=Geschütz-Anordnung -guide.bloodmagic.entry.alchemy.laputa=Splitter von Laputa - - -# Alchemy Entry Texts -guide.bloodmagic.entry.alchemy.intro.info=Mein Name ist Vlad Highborn, und ich bin ein Blutmagier. Ich habe die komplizierte Funktionsweise der Alchemie und den Prozess des "Äquivalenten Austausches" studiert, der alle Aspekte der Magie regelt. Grundsätzlich kann man nichts aus dem Nichts erschaffen, obwohl viele es bei der Suche nach einem bestimmten Stein versucht haben. Das ist offensichtlich nicht gut ausgegangen, denn auch heute werden viele Leute durch eine Fälschung getäuscht. Natürlich reicht es nicht aus zu sagen, dass ich Alchemist bin, denn eines der wichtigsten Dinge, die ich tue, ist das Studium der Blutmagie mit dem Ritualmeister und dem Architekten, die beide diese Titel durch ihre eigenen Verdienste erworben haben. Magus und Tiberius waren im Laufe der Jahre damit beschäftigt, ihre eigenen Werke aufzunehmen, obwohl ich nicht glaube, dass Magus alles in einem Buch niedergeschrieben hat - ich habe noch keinen wirklichen Beweis gefunden. Von den Anwendungen der Arkanen Asche bis hin zu den komplizierten Funktionen des Alchemietisches findest du alles, was du über einige der komplexeren Elemente der Welt wissen musst. Nicht alles, was du wissen musst, ist in diesem Buch - für ein vollständiges Verständnis über Blutmagie musst du die anderen Einträge in diesem ganzen Band lesen. Du wirst keine Lügen zwischen diesen Seiten finden. -guide.bloodmagic.entry.alchemy.ash.info=Arkane Asche ist notwendig, um Alchemische Anordnungen zu erzeugen, mächtige Kreise, die verschiedene Effekte erzeugen können. Diese Asche wird mit der Höllenfeuerschmiede und Dämonenwilen hergestellt, wenn dir dieses Konzept also neu ist, konsultiere bitte das "Dämonenkind". Die Asche hat insgesamt zwanzig Verwendungen, bevor du eine weitere herstellen musst. Wenn du mit der rechten Maustaste auf den Boden (oder eine Wand, obwohl sie nur eine Richtung darstellt) klickst, schreibst du einen einfachen Kreis aus Asche ein. Wenn du die Asche erneut mit einem Gegenstand anklickst, wird dieser "in die Asche gelegt" - vorausgesetzt, dass dieser Gegenstand gültig ist, ändert sich die Form des Kreises, um anzuzeigen, dass er für den nächsten Gegenstand bereit ist. Wenn es sich nicht ändert, dann hast du etwas falsch gemacht. Sobald es sich verändert hat, kannst du den zweiten Gegenstand hineinlegen. Wenn dieser Gegenstand mit dem ersten übereinstimmt, beginnt sich der Kreis zu drehen und führt je nach dem Rezept, an dem er arbeitet, verschiedene Aktionen aus. Jeder Effekt, der nicht der Herstellung eines neuen Gegenstands dient, der mit diesen Arrays durchgeführt werden kann, kann in diesem Buch gefunden werden, und selbst wenn sich das Rezept durch Dritte ändert, wird es hier aktualisiert angezeigt. Die angezeigten Artikel sind die Reihenfolge, in der sie platziert werden müssen. -guide.bloodmagic.entry.alchemy.speed.info=Die Bewegungs-Anordnung erzeugt in dessen Zentrum einen kleinen Luftwirbel und nutzt eine kleine Menge an Energie, um diesen aufzuheizen. Danach, wenn ein Tier oder eine andere Art von Wesen in seinen Wirkungsbereich kommt, wird es in der Richtung, in die es durch die Kraft der Luft gebracht wurde, nach vorne geschleudert. Außerdem beseitigt das Array bei einem Sturz aus großer Höhe den Sturzschaden, der entstanden wäre. Sei einfach auf eine leichte Bewegung vorbereitet. Die Bewegungsrichtung ist in Richtung des Pfeils auf der Anordnung. Es sollte auch beachtet werden, dass du eine viel größere Distanz gewinnen wirst, wenn du auf das Array fällst oder springst, als wenn du einfach in sein Gebiet gehst. Das hat mit den Turbulenzen deiner Bewegungen zu tun, die eine viel größere Reaktion hervorrufen. -guide.bloodmagic.entry.alchemy.updraft.info=Mit den gleichen Prinzipien wie das Movement Array, lässt diese Anordnung eine Entität, die darauf trifft, in die Luft steigen. Natürlich muss jeder Benutzer vorsichtig sein, denn der Weg nach unten kann etwas beschwerlich sein! -guide.bloodmagic.entry.alchemy.bounce.info=Durch die Verwendung einer Wärmequelle in der Nähe des Zentrums, die nach unten gedrückt wird, versucht diese Anordnung, den Untergrund zu erweichen. Danach wandelt es Kohlenstoff und Wasserstoff in ein gummiartiges Material im Inneren der Erde um. Diese Kombination führt dazu, dass jede Entität, auf der Oberfläche aufprallt und der Sturzschaden beseitigt wird, der sonst entstehen würde. Dieses Aufprallen kann durch einfaches Schleichen gestoppt werden und dämpft dennoch den Sturz. -guide.bloodmagic.entry.alchemy.turret.info=Durch die Verwendung des Dämonenwillens, der immer noch ein Mob kontrolliert, kannst du den Verstand eines Skeletts übernehmen, um es dazu zu bringen, deine Befehle auszuführen. Wenn sich ein Skelett innerhalb des Bereichs dieser Anordnung befindet, wird es als Wachposten fungieren und feindliche Monster in der Nähe angreifen. Leider ist dieser Anordnung immer noch sehr experimentell, so dass es möglicherweise nicht sehr gut oder konsequent funktioniert. -guide.bloodmagic.entry.alchemy.buff.info=Durch rigorose Studien erkennt man, dass Alchemische Anordnungen ein breites Anwendungsspektrum haben. Bis jetzt ist es dir gelungen, mächtige Gegenstände durch Herstellung mit Alchemischen Anordnungen zu erschaffen, sowie ein paar Anordnungen, die funktionelle Vorteile wie schnelle Bewegung und schwache Formen der Teleportation bieten. Eine der Anwendungen, die du bisher noch nicht genutzt hast, ist die Bereitstellung mächtiger Stärkungszauber durch ein aktives Array.\n\t "Sträkungsanordnungen" sind die allgemeine Bezeichnung für Alchemische Anordnungen, die den Spielern in ihrem Wirkungsbereich einige Stärkungszauber bieten. Diese Wirkungsbereiche haben tendenziell einen sehr großen Radius, der nicht manipulierbar ist (im Gegensatz zu Ritualen). Da Alchemische Anordnungen jedoch kein Konzept eines Seelen-Netzwerks haben, müssen sie ihre Wirkung auf andere Weise entfalten: hauptsächlich durch direkte Blutopfer. Vereinfacht ausgedrückt bedeutet dies, dass die Anordnung, wenn es einen Stärkungszauber anwendet, dem Spieler, auf den es gewirkt wird, Schaden zufügt (HP nimmt). Aufgrund der direkten Natur dieser Opfer ist die HP -> Stärkungszauber-Konvertierung für Spieler im frühen Spiel viel günstiger als ähnliche Buffs im Mod. Wenn zum Beispiel ein Stärkungszauber von einem Siegel 100 LP für 10 Sekunden Aktivierung kostet, kann ein stärkerer Stärkungszauber von dem Array für 30 Sekunden für 1 HP angewendet werden (das sind 100 LP in einem T1-Altar ohne Runen). Dies kann in den frühen Stufen als viel effizienter angesehen werden, während es in den späteren Stufen nicht so effizient ist. Wegen des stationären Charakters der Arrays werden sie jedoch einen stärkeren Effekt haben als ihre Siegelgegenstücke, so dass man sie vielleicht noch im späten Spiel verwenden möchte. -guide.bloodmagic.entry.alchemy.fastMiner.info=Wenn es darum geht, ein großes Stück Land auszuheben, ist es manchmal am besten, es einfach von Hand zu machen. Für diese Gelegenheiten ist diese Anordnung genau das Richtige für dich. Die Anordnung wendet einen Eile III Stärkungszauber auf Spieler innerhalb eines Radius von 10 Blöcken an und kostet den Benutzer 1 HP pro 30 Sekunden. Da es sich um einen allgemeinen Eile-Effekt handelt, erhöht es auch dein Angriffstempo im Wirkungsbereich, obwohl du vorsichtig sein musst, da auch andere Spieler davon profitieren werden! -guide.bloodmagic.entry.alchemy.furnace.info=Eines der vielen Probleme, auf die du zu Beginn deines Abenteuers stoßen könntest, ist die Unfähigkeit, deine Öfen in Betrieb zu halten. Ein angezündeter Ofen kann den Unterschied zwischen einem vollen Magen und starken Waffen oder dem Verhungern in einer Höhle bedeuten. Die Anordnung des Brennenden Ofens, wie der Name schon sagt, wird eine dringend benötigte Wärmequelle für jeden Ofen in der Nähe sein. Indem die Anordnung direkt neben einem gewöhnlichen Ofen platziert wird (es können mehrere sein), wird diese dem Ofen Brennstoff liefern, wenn ein Vorgang abgeschlossen werden kann - nichts wird passieren, wenn es neben einem leeren oder vollen Ofen steht, hauptsächlich zu deinem Schutz. \n\tNatürlich kommt das nicht ohne seine Kosten: wenn sich eine Person in der Nähe aufhält (innerhalb eines Radius von 10 Blöcken), wird die Anordnung ein halbes Herz für bis zu zwei Prozesse im Ofen verbrauchen. Dies wird hilfreich sein, um entweder einen schnellen Biss zu bekommen oder einen vollen Erzstapel zu schmelzen, aber leider hast du keine Möglichkeit gefunden, der Anordnung irgendwelche Sicherheitsmaßnahmen hinzuzufügen... -guide.bloodmagic.entry.alchemy.teleport.info=Das Teleportations-Anordnung dient als Möglichkeit, sofort von einem Ort zum anderen zu reisen, mit einigen spezifischen Einschränkungen. Wenn ein Spieler oder eine andere Entität auf die Anordnung tritt, sucht diese bis zu 20 Blöcke entfernt in der Richtung, in die es zeigt, nach einer anderen Alchemischen Anordnung (die nicht aktiv sein muss). Wenn es der Anordnung gelingt, ein Ziel zu finden, wird sie die Entität sofort zur gefundenen Anordnung teleportieren, sogar durch Wände hindurch. Das Studium dieses Arrays hat gezeigt, dass es weitere Einschränkungen gibt: Wegen der Natur des Biegens des Raum-Zeit-Gefüges wird eine Teleportations-Anordnung nicht etwas teleportieren, das innerhalb von 2 Sekunden teleportiert wurde. Dies soll allen Komponenten Zeit geben, sich in gewünschter Weise neu zu ordnen. -guide.bloodmagic.entry.alchemy.standardTurret.info=Die Macht, spitze Gegenstände auf weit entfernte Monster zu werfen, kann nicht hoch genug eingeschätzt werden. Die Geschütz-Anordnung ist in der Lage, ein feindliches Monster in der Nähe zu spüren und durch die Verwendung komplexer alchemistischer Mechanismen einen Pfeil zurückzuziehen und abzufeuern, um sein Ziel zu treffen. Die Anordnung sucht nach einem Inventar direkt darunter. Findet sie entweder einen normalen oder einen getränkten Pfeil, wird er aus dem Inventar abgezogen und auf einen Mob geschossen, der sich in einem Radius von 32 Blöcken befindet. \n\t(Aufgrund einer dummen Minecraft-Physik, bei der Pfeile von Wesen abprallen, die zu nahe am Entstehungsort sind, wird der Turm auch nur auf einen Mob feuern, der mehr als 3 Blocks entfernt ist. Denke daran!) -guide.bloodmagic.entry.alchemy.laputa.info=Es gibt eine Geschichte über ein verlorenes Königreich, das so fortgeschrittene Magie hatte, dass es durch die Wolken fliegen konnte. Obwohl dieses Königreich inzwischen zu Staub zerfallen ist, haben es einige Zeichnungen dieser Burg am Himmel geschafft, exquisite Details über die Mechanismen zu liefern, die sie zu der Legende werden ließen, die sie ist. \n\tDer Splitter von Laputa wandelt die Lebensessenz, die sich in der Erde befindet, in eine mehr aviäre Form um, wodurch die Umgebung in der Luft schwebt. Während das zugrundeliegende Prinzip einfach ist, verursachen die Variationen der Lebensessenz in der Erde ein wenig Inkonsistenz in der Art und Weise, wie viel Land bewegt wird. Das Array bewegt die Erde in einem kugelförmigen Radius zwischen 4 und 8 Blöcken über sich selbst um einen zufälligen Versatz zwischen einem und 5 Blöcken plus dem doppelten Radius des Effekts. Es sollte beachtet werden, dass, sobald der Effekt beginnt, alle Elemente, die zur Aktivierung des Arrays verwendet werden, verloren gehen. diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang deleted file mode 100644 index eb1d180a..00000000 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ /dev/null @@ -1,304 +0,0 @@ -# Book Information -guide.bloodmagic.title=Sanguine Scientiem -guide.bloodmagic.display=Sanguine Scientiem -guide.bloodmagic.author=Blood Magic -guide.bloodmagic.welcome=Blood Magic - -# Page Information -guide.bloodmagic.page.bloodAltar=Blood Altar Recipe -guide.bloodmagic.page.soulForge=Hellfire Forge Recipe -guide.bloodmagic.page.tier=Tier: %d -guide.bloodmagic.page.lp=LP: %d -guide.bloodmagic.page.minimumWill=Minimum Will: %f -guide.bloodmagic.page.drainedWill=Drained Will: %f -guide.bloodmagic.shapelessOrb=Shapeless Orb Recipe -guide.bloodmagic.shapedOrb=Shaped Orb Recipe -guide.bloodmagic.page.alchemyArray=Alchemy Array - - -# Categories -guide.bloodmagic.category.architect=The Architect -guide.bloodmagic.category.ritual=The Ritual Master -guide.bloodmagic.category.demon=The Demon Kin -guide.bloodmagic.category.spell=The Battle Mage -guide.bloodmagic.category.alchemy=The Alchemist - -# Ritual Master Entries -guide.bloodmagic.entry.ritual.intro=Introduction -guide.bloodmagic.entry.ritual.basics=The Basics of Rituals -guide.bloodmagic.entry.ritual.ritualStone=Ritual Stones -guide.bloodmagic.entry.ritual.masterRitualStone=Master Ritual Stone -guide.bloodmagic.entry.ritual.activationCrystal=Activation Crystals -guide.bloodmagic.entry.ritual.diviner=The Ritual Diviner -guide.bloodmagic.entry.ritual.fullSpring=Ritual of the Full Spring -guide.bloodmagic.entry.ritual.lava=Serenade of the Nether -guide.bloodmagic.entry.ritual.greenGrove=Ritual of the Green Grove -guide.bloodmagic.entry.ritual.magnetism=Ritual of Magnetism -guide.bloodmagic.entry.ritual.crusher=Ritual of the Crusher -guide.bloodmagic.entry.ritual.highJump=Ritual of the High Jump -guide.bloodmagic.entry.ritual.speed=Ritual of Speed -guide.bloodmagic.entry.ritual.wellOfSuffering=Well of Suffering -guide.bloodmagic.entry.ritual.featheredKnife=Ritual of the Feathered Knife -guide.bloodmagic.entry.ritual.regen=Ritual of Regeneration -guide.bloodmagic.entry.ritual.harvest=Reap of the Harvest Moon -guide.bloodmagic.entry.ritual.interdiction=Ritual of Interdiction -guide.bloodmagic.entry.ritual.containment=Ritual of Containment -guide.bloodmagic.entry.ritual.suppression=Dome of Suppression -guide.bloodmagic.entry.ritual.expulsion=Aura of Expulsion -guide.bloodmagic.entry.ritual.zephyr=Call of the Zephyr -guide.bloodmagic.entry.ritual.laying=Laying of the Filler -guide.bloodmagic.entry.ritual.timberman=Crash of the Timberman -guide.bloodmagic.entry.ritual.meteor=Mark of the Falling Tower -guide.bloodmagic.entry.ritual.downgrade=Penance of the Leadened Soul -guide.bloodmagic.entry.ritual.crystalSplit=Resonance of the Faceted Crystal -guide.bloodmagic.entry.ritual.portal=The Gate of the Fold -guide.bloodmagic.entry.ritual.altarBuilder=The Assembly of the High Altar -guide.bloodmagic.entry.ritual.pump=Hymn of Syphoning -guide.bloodmagic.entry.ritual.cobble=Le Vulcanos Frigius -guide.bloodmagic.entry.ritual.ellipsoid=Focus of the Ellipsoid -guide.bloodmagic.entry.ritual.crystalHarvest=Crack of the Fractured Crystal -guide.bloodmagic.entry.ritual.forsakenSoul=Gathering of the Forsaken Souls -guide.bloodmagic.entry.ritual.animalGrowth=Ritual of the Shephard -guide.bloodmagic.entry.ritual.livingEvolution=Ritual of the Living Evolution -guide.bloodmagic.entry.ritual.upgradeRemove=Ritual of the Cleansing Soul -guide.bloodmagic.entry.ritual.fullStomach=Ritual of the Satiated Stomach -guide.bloodmagic.entry.ritual.eternalSoul=Ritual of the Eternal Soul -guide.bloodmagic.entry.ritual.condor=Reverence of the Condor -guide.bloodmagic.entry.ritual.featheredEarth=Ritual of the Feathered Earth -guide.bloodmagic.entry.ritual.grounding=Ritual of Grounding -guide.bloodmagic.entry.ritual.veilOfEvil=Veil of Evil -guide.bloodmagic.entry.ritual.wardOfSacrosanctity=Ward of Sacrosanctity - -# Ritual Master Entry Text -guide.bloodmagic.entry.ritual.intro.info=Good evening. My name is Magus Arcana. I have had many guises over the years: a thief and a vigilante, a wizard and a warrior, a roaming nomad and even a politician. The title that I hold nowadays is one that many cannot comprehend, that at the very mention of it brings forth images of brutality that in some cases have been earned but in many others are misguided. I am of course talking about being a Blood Mage, though my friends simply call me Magus whereas my enemies refer to me as The Ritual Master.\n\tMy students have been pestering me for many months now, attempting to get me to document all of the myriad adventures that I have had in some form of book for me to distribute among any aspiring mages. I had been resistant, but it was Tiberius who put it best: "Although you may not see the value of it yourself, hearing the intricacies of any sort of craft from a man who has achieved mastership of the field will prove invaluable for future generations. It doesn't matter how accurately someone else retells it, if you don't have the utmost confidence in a source the gold sand could be nothing more than sulfur." You could tell he was delving into a bit of alchemy at that point, but since he was my first student for a long time I tend to value his opinion.\n\tSo, aspiring Blood Mage, training in the arcane that many yet do not fully understand, lend me your ears for these are words worth heeding: the field that you are studying has many aspects, and without careful consideration you may find your tools lacking. Therefore make sure to review this book often - I have put many enchantments on the tome that you carry with you so that whenever I write in my master copy the words will change for you.\n\tSo sit back, relax, and enjoy the teachings of a very old man. You may learn more than you've bargained for. -guide.bloodmagic.entry.ritual.basics.info=Modern day rituals are a lot different from those that were conducted centuries past. There was a time when people would inscribe arcane constructs out of dust on the ground and dance around until they got what they wanted. I even remember one hermit witch who gathered energy from her garden. I laughed at it all until she sicced her pet owl on me. \n\tThe rituals that Blood Mages use require the precise alignment of marked stones to focus and transform the power that a mage pumps into it. One day, my apprentice Tiberius was rummaging through some of the old artifacts that I had procured over the years in the closet of his new room. There was a vial of liquid Etherium that I haven't touched in ages (I was meaning to get back to that, but I haven't had any time) as well as a crystal ball that always seemed to say "Tuesday" when you peered through the glass. When one of the boxes that was labeled "Runic Dust" was knocked over a small red gem tumbled out and knocked against Tiberius's foot. Immediately a bright ruby light emanated from it and reacted with the dust in the box that he was carrying.\n\tNaturally, an explosion occurred. The unfocused energy that Tiberius inadvertently released through the gem sparked the runic dust and stones around him, and without a means of containing the power it simply was pushed outwards. After a few days in the medical ward, Tiberius and I started to get to work.\n\tThrough a mixture of several sleepless nights and a hardy helping of caffeine (I've really got to thank Mister Player for the coffee supply, I salute your efforts for a more awake tomorrow!) we eventually perfected the key ingredients for all rituals.\n\tThrough our experimentation, we learned that we needed four different things: we needed a bunch of ritual stones placed around an area in a set pattern, a few different inks that are applied to the ritual stones to help further specify the pattern, a central ritual stone that acts as a central conduit of power, and a crystal that activates the ritual. I think it's best to talk about these one by one. -guide.bloodmagic.entry.ritual.ritualStone.info.1=The Ritual Stone acts as a simple receptacle for magical energy, shaping it and further redirecting it in different ways depending on how the stone is configured. When you start off, there are five different stones that you have access to: Blank (the base stone that does not have any markings applied), Water, Fire, Air, and Earth. Every single ritual will have a number of these, and depending on how they are arranged around the Master Ritual Stone the overall effect will be different. -guide.bloodmagic.entry.ritual.ritualStone.info.2=In order to inscribe the correct symbols onto the ritual stones you must have a set of inscription tools. I have since developed a method for people to more easily apply the correct inks to the ritual stones while placing them in the correct configuration, but if one were to wish to do this manually they can use these tools. When you activate a ritual stone with one of the inscription tools in your hand (right clicking on the stone) you will apply some ink to the stone, changing it to the same type as the tool. In early tiers, you only have access to the base four colours, however once you become more powerful you will have more tools at your disposal. -guide.bloodmagic.entry.ritual.masterRitualStone.info=As with most magics, without a guiding force the effect of the ritual will either become uncontrollable or simply will not work at all. Thus, in order to control the rituals a Master Ritual Stone is required (I usually abbreviate this to "MRS" in my notes, but saying it in public is a little awkward. "I need more mrs please!"). The MRS takes in power from the owner's Soul Network and pushes it through the ritual stones, thus performing the ritual. \n\tAttaching the Soul Network to a large stone that we don't hold in our hands proved to be a bit tricky. I managed to do this one time by meditating on top of the stone in the lotus position, focusing my power through the stone and trying to link the tendrils of my network into the inner workings of the ritual. Although I got it working for a few minutes, all I was really awarded was a pair of wet pants as water condensed onto the ritual stones. I've learned to not meditate on any of my experiments again. -guide.bloodmagic.entry.ritual.activationCrystal.info.1=Instead of waiting an hour at a time to meditate a ritual active, we took the red gem that fell out of the box originally and started to analyze it. Tiberius was certain that it had the ability to "establish links between the corporeal realm of our reality and the incorporeal essence that is the manifested Soul Network." Sometimes I wonder if it was a good idea to have him become my apprentice, but it is times like these that I see his knack for the more arcane aspects of magic. Oh, I should probably write what he meant in English: by using this crystal, we could link our soul networks to the Master Ritual Stone in order to supply it with energy. -guide.bloodmagic.entry.ritual.activationCrystal.info.2=Thus we had ourselves a Weak Activation Crystal and a means in which to recreate its structure. The main ingredient for the crystal is another crystal that can be linked to my Soul Network: a Lava Crystal. Then, by quickly inscribing some instructions onto the crystal's surface the Blood Altar can do the rest of the work to transmute it into an activation crystal. Naturally, this crystal has to be bound to the user's soul network in order to function. When the ritual's stones are laid correctly around the MRS, the user should touch the activation crystal to the MRS and push out enough energy to jump start the ritual in question. If you have enough LP inside of your Soul Network the ritual will activate. If you do not, or if the stones are not laid out correctly, the ritual will simply not activate and no LP cost is incurred. -guide.bloodmagic.entry.ritual.diviner.info.1=After discerning the size and layout of many rituals I started to find it a little bothersome to continually consult my notes in order to build the rituals. That is why I worked to create a device that would allow anyone to simply place down the stones in the correct position through simple gestures and movements. I've placed this entry further up the list chronologically because it is best for people to learn of this item before starting with the actual construction of rituals. Otherwise they may find out that they don't have everything they need, or will summon a meteor from hell instead of a fresh bottle of spring water. -guide.bloodmagic.entry.ritual.diviner.info.2=The Ritual Diviner is essentially an encyclopaedia for rituals. By cycling through the diviner (shift-left click and shift-right click) you can select a different ritual from its store of knowledge. Gazing into the diviner will also tell you some simple information about the ritual. If you have Ritual Stones on your person and you touch the diviner onto the MRS (right click) you can place a stone for the ritual you want to construct. Doing this enough times will net you a completed ritual! -guide.bloodmagic.entry.ritual.fullSpring.info=A few years ago a travelling merchant stopped by the village near my house, peddling his wares to all who were willing to part with their coin. There was a drought at the time and the crops were dying, so the merchant brought forth a silver talisman with a blue gem set inside of it. "This, my friends," he said with great zeal, "will make sure that your rivers will not dry out! By using alchemy I can bring forth water from the very air!"\n\tUnfortunately for the village it seemed that the gem was a simple piece of sapphire, and before anyone realized that they were tricked he was already several miles away. I tend to not intervene in the affairs of the village because they tend not to like my magic, but in this case I made an exception. After I had a lovely chat with the "alchemist," I spent a few hours meditating near the irrigation channels. By condensing the water vapour in the air I managed to create enough water to keep the crops watered until the next downfall. This wasn't exactly an efficient method and I was drained for the next few days, using some of the water from the channel to rehydrate myself.\n\tRemembering this, I employed the same principles to create the Ritual of the Full Spring. By channeling a small amount of energy into the ritual, it condenses the moisture in the air around it to produce a source of water on top of the master ritual stone. The cost to activate the ritual is fairly insignificant, and the maintenance even more so. \n\tThe water's range can be expanded by using the ritual tinkerer and even placed in a different location, so one does not need to worry about where a ritual is placed if they are worrying about aesthetics. The miracles of magic! -guide.bloodmagic.entry.ritual.lava.info=Lava, perhaps one of the most rudimentary power sources. I tend not to use it much in my own research because it can be a little difficult to work with - it's not like you can use a simple iron bucket to pick some up! \n\tOne of the local tinkerers came by my house one day asking me if there were any sources nearby since they recently acquired some new hardware that they needed to power. I said that there were a few but most of them were already owned, but I decided to come to his place to look at the contraption.\n\tIt was a smeltery at least 5 metres high and just as wide, hooked up to several tanks that stood empty and barren. Although I wasn't entirely sure on how it operated I could tell that the raw heat of lava would be perfect for it - electricity would work well if it was modified correctly, but I could tell this wasn't from Immersive Industries. \n\tAfter a small chat with the tinkerer money changed hands and I asked him to stand back as I prepared my ritual stones. To enact what I wished I took four fire stones and arranged them in a cross around the master ritual stone and then pushed hard with my activation crystal while imagining the process in my head. In theory, it should be simple: take some rocks from deep in the earth and compress them with some energy, causing them to melt under the intense pressure and turn molten. This lava could them be retrieved off of the ritual stone and the process can be repeated.\n\tWhile simple in theory, in practice it was a little difficult. For my simple network at the time, the activation cost was quite steep because of the initial pressure required, and the drain for each source of lava was not something I was prepared for. (20000 LP to activate, 500 LP per source block)\n\tI staggered out of the building with a grin on my face, however: the tanks were full of lava, enough to keep the tinkerer in business for a couple fortnights until he could procure a more permanent source of lava. I made sure to pick up my ritual stones after I finished, though. \n\t----------\n\tWith no modifications to the ritual, the ritual will attempt to place a source of lava on the block directly above itself at a cost of 500 LP every tick if there is room, displacing liquids if they are flowing. This placement range, by default, can be expanded to a maximum of 9 blocks at a maximum distance of 3 away from the ritual.\n\tBy augmenting the ritual with Raw Will, the LP cost will decrease in proportion to the Will that is in the Aura, consuming Will proportional to the amount of LP that is saved. Using this Will can also grant the ability to place lava directly into a block's internal tanks, at a rate comparable to normal ritual operations.\n\tCorrosive Will causes the ritual to invert the invincibility granted from fire immunity, causing all entities that are immune to fire within a set area to be damaged severely based on the amount of Will in the Aura. Those that are not immune to fire are unhurt by this effect.\n\tWhen Vengeful Will is applied to the ritual, a volatile gas is released and causes all non-player entities within its specified range to be affected by Fire Fuse. When the timer of the debuff goes to 0, the entity will explode, forcefully propelling them into the air with explosive force.\n\tDestructive Will increases the maximum range and volume that the ritual may influence. The more Will you have, the more lava blocks that can be placed by a single ritual. Thankfully, the ritual does not drain any Destructive Will, however if your Will drops and the ritual's maximum range is lower than what you set it at, the ritual will not work at all until fixed.\n\tFinally, Steadfast Will grants all players within its range a Fire Resistance buff, whose time applied and cost in Will is affected by the amount of Will in the Aura. Careful note should be taken, because if you are affected by Fire Resistance you can be damaged by the ritual's Corrosive effect. -guide.bloodmagic.entry.ritual.greenGrove.info=Last week I started to teach Tiberius his cross-disciplinary magic. Every apprentice that I have had has had to learn another form of magic while learning Blood Magic. It doesn't matter much which one they choose as long as it does not consume some form of finite resource - I used to employ a form of magic from the Ars clan from the far East, but since the world's source of Etherium was consumed into scarcity it died out long ago. \n\tTiberius decided to learn Thaumaturgy, which employs using the magic of the world to perform your magic. This is a good counterbalance to Blood Magic, which uses the magic of life. As such, these magics use different means to perform the same tasks. To demonstrate I decided to highlight the differences to Tiberius when it comes to crop growth.\n\t"Thaumaturgy uses a growth catalyst that is fueled by the essentia Herba," I state while pointing towards the Essentia Flowchart that was pinned to the classroom wall. Sure, Tiberius was sitting at the only desk there, but sometimes a guy has to have some fun. "A small trickle of Aura and this essentia stimulates the photosynthetic process of the plant, encouraging it to grow by giving it more solar energy. This process requires that the soil is well fertilized, or else the crop can simply wither and die."\n\tI then take four earth and water ritual stones and place them in a circle around a master ritual stone. "Conversely, Blood Magic uses a different process." While speaking, I activate the ritual and cover it with some simple dirt. "By using your life force or the energy of animals, you can fertilize the plants in such a way that they don't need as much fertilizer. In essence, it force-feeds the plants so that they always have a high concentration of nutrients."\n\tI throw a few seeds onto the dirt and cover them slightly, uncorking and emptying a vial of water from inside my robes. "This process doesn't need any extra sunlight, because it uses a different source of energy. Though it does work much better when there is some light - the plant isn't exactly used to these sorts of conditions!"\n\tA few shoots have already poked their leaves out of the dirt while I was explaining, seemingly waving in response. I felt the mild strain on my body as each new leaf sprouted, minor each time but when accumulated it started to stack up. Once I finished the class I cleared up the dirt from the experiment and decided to have a nice stroll to the village: I had a bushel of wheat that needed selling. \n\t----------\n\tThe Ritual of the Green Grove, as the name may suggest, accelerates the rate of growth of plants that are nearby. By using the player's blood as a rich fertilizer, it will attempt to grow anything that it deems as a plant, such as wheat and carrots, growing anything within its range periodically. Through default operations, the ritual will look at the 3x3 area two blocks above itself and attempt to grow each block with a 30%% success rate every second. If manipulated with the Ritual Tinkerer, the ritual can handle a maximum of 81 crops at a time within a 5 block radius of the MRS. As another note\n\tWhen augmented with Demon Will, there are several effects that can be obtained. If Raw Will is used, the ritual will perform all operations at an accelerated rate, consuming 0.05 Will per successful growth and increasing its speed relative to how much Will is in the Aura.\n\tIf infused with Vengeful Will, the ritual will consume 0.05 Will per successful growth and will increase the chance that a given operational tick will be successful on the plant. By default without Will it is 30%%, but for instance if you have 100 Vengeful Will the rate will increase to 80%%.\n\tDestructive Will increases the effective maximum range of the ritual, meaning the more Will you have the more crops/plants a single ritual can handle. Thankfully, the ritual does not drain any Destructive Will, however if your Will drops and the ritual's maximum range is lower than what you set it at, the ritual will not work at all until fixed.\n\tSteadfast Will grants the ability to set an area around the ritual that will be automatically tilled and hydrated. Additionally, any seed that is within this range will be planted on a nearby block if possible. This costs a small amount of Steadfast Will, and its effects do not scale with Will in the Aura.\n\tWhen Corrosive Will is used in the ritual, the fundamental nature of the ritual may shift. When supplied and the new range is properly set, any mobs that enter in the ritual's area of influence will have the "Leech" effect applied. Every few ticks, the plants near the mobs will be damaged and the mob will be damaged proportionally. Fertilizing with mobs directly can prove beneficial! Every 10 seconds that the debuff is applied per mob, 0.2 Corrosive Will will be consumed. -guide.bloodmagic.entry.ritual.magnetism.info=The Ritual of Magnetism is the bread and butter of anyone who enjoys quarries. The ritual creates a revolving magnetic field, pulling up the rich ores from the ground underneath it and placing the contents in its area. This does not displace any rock, so no gaping holes will appear in the land - assuming that the land isn't made up entirely of ore. The ritual operates once every 40 ticks and costs 50LP per successful operation.\n\tThe default radius that this ritual operates is 3 blocks in each cardinal direction, giving an area of 7x7 blocks centered on the MRS. Because the ritual currently does not have any Will augments, you can only increase the radius of effect for the ritual by placing a valuable block directly underneath the MRS. If an iron block is used the radius becomes 7. If a gold block is used, the radius becomes 15. Finally, if a diamond block is used the radius expands to 31, meaning any ores below the ritual in a 63x63 area will be slowly pulled up into its 3x3x3 volume above the MRS. -guide.bloodmagic.entry.ritual.crusher.info=The Ritual of the Crusher's operation is rather simple. The ritual needs to have some form of inventory linked to it, which when unaltered simply sits on top of the MRS. While in operation, the ritual will look inside of its crushing range (by default the 3x3x3 area below the ritual) and break one block at a time at a rate of once every 2 seconds at the cost of 7 LP per successful operation. The broken blocks will then be transferred to the linked inventory - if there is no room for the items, they will instead be spewed on top of the chest.\n\tWhen fueled with Raw Will, the ritual will work at a faster rate based on the total amount of Will in the Aura. While sped up, it will consume 0.05 Raw Will per successful operation.\n\tDestructive Will causes blocks that are broken by the ritual to have Fortune applied to it. Currently the fortune level does not vary and is instead level 3 regardless of the Will amount. This will consume 0.2 Will per successful operation, regardless of whether it was useful.\n\tSteadfast Will will instead cause blocks to be broken with the Silk Touch effect. This costs 0.02 Will per operation, and will override the Destructive effect where possible.\n\tCorrosive Will makes it so that blocks that are broken by the ritual will be processed with some form of cutting fluid. This means that for instance if it is an iron block the result will be two pieces of iron sand. The current "cutting fluids" that the ritual uses are: Basic Cutting Fluid and Explosive Powder. The ritual consumes a different amount of Will based on what was used, and will only consume the Will if the effect applies. This overrides Silk Touch where applicable.\n\tVengeful Will causes it so that when a successful operation takes place the inventory has its contents compressed similar to the Sigil of Compression: if there is 65 redstone dust inside of the chest, one block of redstone will be crafted and 56 dust will remain. Will is only consumed when this is successful, and it costs 0.2 Will. -guide.bloodmagic.entry.ritual.highJump.info=This ritual uses a huge burst of air to propel all those who walk on top of it into the sky. What is more, if the user lands in the ritual's area of effect they will not suffer any fall damage. Players who sneak inside this ritual also are not affected.\n\tThe ritual costs 5LP per entity per tick of successful operation, so it won't cost anything if it doesn't fling people in the air. -guide.bloodmagic.entry.ritual.speed.info=As the name may suggest, the Ritual of Speed is used for transportation of various sorts. The ritual may be placed in the direction of any of the cardinal directions and any entities within its range will be launched in the direction that the ritual is pointing. When looking at a ritual, this direction is where the dusk ritual stone is. By default, the ritual has a radius of 2 blocks from the MRS, though this can be expanded or contracted when using a ritual tinkerer. This will apply a speed of 3 blocks/tick in the direction of the ritual and 1.2 blocks/tick vertically.\n\tIf the ritual is fueled with Raw Will, the speed of the ritual is increased substantially based on the Will that is in the Aura. For instance, the speed will be doubled if there is 100 Will inside of the Aura. For each successful operation, 0.1 Will is consumed.\n\tVengeful Will prevents the ritual from moving adult mobs, and Destructive Will prevents the ritual from moving child mobs. If either one of these are used, players are also prevented from using the ritual. If both of them are used, however, the effect is that only players may use the ritual and mobs cannot. These augmentations can be used effectively for sorting animal farms or even getting rid of those pesky child zombies in your sacrificial pen. The ritual will consume 0.05 Will for each type that is in effect on successful operation, so if a child enters the ritual space when you use Destructive Will it will not cost Will or LP. -guide.bloodmagic.entry.ritual.wellOfSuffering.info=For those of you who prefer to use mobs instead of your own health, the Well of Suffering damages all living non-player entities in a 10 block radius and places the health in a connected altar. The ritual will look for a blood altar within its range, checking 5 blocks horizontally and 10 blocks vertically unaltered. When it finds an altar, it will store its location internally - if there isn't an altar nearby, the ritual will not work. The ritual will deal 1 HP per entity and place 25 LP into the altar (100 for peaceful animals), which can be augmented with Sacrifice runes. -guide.bloodmagic.entry.ritual.featheredKnife.info=The Ritual of the Feathered Knife taps into the user's body, draining away their life force in order to fill a blood altar nearby. The ritual will look for a blood altar within its range, checking 5 blocks horizontally and 10 blocks vertically unaltered. When it finds an altar, it will store its location internally - if there isn't an altar nearby, the ritual will not work. When a player then enters within the ritual's damage range, which by default is a radius of 15 blocks horizontally and 20 blocks vertically, the ritual will damage the player for 1HP and then place that health into the connected altar directly (respecting blood runes). There are some safety mechanisms on the ritual, which cause it to not work on a player with less than 30%% of their max health. Unaugmented, the ritual does this once every second.\n\tThere are a few useful augmentations that you can use if you use Demon Will. If Raw Will is consumed by the ritual, the ritual will attempt to damage players within its range at a faster rate, operating twice per second. The ritual will consume 0.05 Raw Will per successful operation.\n\tIf you have more than 10 Steadfast Will in the Aura, the ritual will increase its safety threshold and instead will not work on players with less than 70%% health. This function currently does not consume Will.\n\tIf you have more than 10 Vengeful Will in the Aura, the ritual will remove some of its safety limitations, causing it to work on players until they only have 10%% of their maximum health left. If the ritual also has Steadfast Will augmented onto it the threshold will still be 70%% for the owner of the ritual only. This function currently does not consume Will.\n\tWhen Destructive Will is applied to the ritual, the ritual becomes a lot more efficient with its HP to LP conversion. The amount of LP that is added to the altar per health point increases based on the Will in the Aura, up to a maximum of +20%% for 100 Destructive Will. This effect stacks multiplicatively with runes, Living Armour Upgrades, and Incense. This consumes 0.05 Destructive Will per HP sacrificed.\n\tSpeaking of incense, if Corrosive Will is used in the ritual the ritual will respect the effects of incense on you. If you do not have the Soul Fray debuff on and you are empowered by an Incense Altar, the ritual will consume all of your HP up to the set threshold and pump all of the resultant LP into the altar. It will also remove the incense that you incurred and apply Soul Fray onto you. This effect stacks with the Destructive Will buff. -guide.bloodmagic.entry.ritual.regen.info=Arguably one of the best rituals for any potential Blood Mage who wishes to use his own life force to fuel his magic, the Ritual of Regeneration casts a veil of energy around itself, healing entities that find themselves within its range. Every 2.5 seconds the ritual will cast Regeneration I on living entities in its 15 block radius, costing 100LP per player and 10LP per other living entities for the 2.5 seconds of regen. \n\tIf Corrosive Will is used to augment the ritual a second range will be available, a "vampiric range". Any non-player entities within this range will be randomly damaged in order to directly heal players within the regular healing range. This costs 0.04 Will to use and will transfer 1HP per operational tick. -guide.bloodmagic.entry.ritual.harvest.info=This ritual will seek any harvestable plant block within its range (default is the 9x9x5 high area above the MRS) and try to harvest it, replanting any seeds if the plant can drop seeds. All of the drops from the plant will appear where the plant was harvested. The ritual will attempt to harvest plants once every 5 ticks and will cost 20LP per successful operation.\n\tPlants that can be harvested include, but are not limited to: pumpkins, wheat, carrots, potatos, nether wart, cactus, reeds. Keep in mind that the ritual makes no assumptions about the thing it is harvesting - it can only harvest mod-added crops if the mod in question registers a harvesting handler with the mod. -guide.bloodmagic.entry.ritual.interdiction.info=Based on an archaic alchemical device of legend, the Ritual of Interdiction attempts to forcibly push all non-player mobs away from the center of the ritual. By default, all mobs that are within two blocks of the MRS are pushed away from the MRS by setting their velocity. It should be noted that mobs within this range are not affected by fall damage, though that safety net wears off as soon as they are pushed away. -guide.bloodmagic.entry.ritual.containment.info=The opposite of Interdiction, the Ritual of Containment attempts to pull mobs within its area of effect towards the space above the MRS, suspending them in the air where they cannot move. The default range of the ritual is a 3 block horizontal radius from the bottom of the master stone to the top of the top-most runes, though this range can of course be altered.\n\tThis ritual costs 1LP per mob pulled every tick. -guide.bloodmagic.entry.ritual.suppression.info=The Dome of Suppression "suppresses" all liquids in a set radius, able to temporarily replace fluids in a hemisphere with a 10 block radius with air. If the ritual is turned off, this fluid will return in the same state it was before. This costs 2LP per operational tick. -guide.bloodmagic.entry.ritual.expulsion.info=If you play on a server you can face a situation where you have unwanted player visitors. Sometimes force fields and giant bloody rotors are not enough of a deterrent and they still manage to get into your base. This ritual attempts to alleviate this through the use of teleportation magic!\n\tIf a player that is not the owner enters the range of the ritual (default 12 block radius) the ritual will teleport the player randomly within a radius of 100 blocks away. However, if there is a chest on top of the MRS with a bound item from a player that player will be exempted from the teleportation, acting effectively like a whitelist.\n\tThe ritual costs 2000LP per successful teleportation. -guide.bloodmagic.entry.ritual.zephyr.info=Modelled after an ancient sword of proverb, the Call of the Zephyr uses the power of wind to collect the items that are around it and place them inside of the linked chest (default is right above the MRS). This is done instantly, meaning that the items are teleported directly into the inventory - no need to worry about weird suction effects!\n\tThe default item radius is 5 blocks away from the MRS. -guide.bloodmagic.entry.ritual.laying.info=As many are aware, being able to place blocks can be important in various automation tasks. This ritual takes the items/blocks from the connected chest (defaults to on top of the MRS) and places the blocks within the ritual, which is a radius of 2 on the same level as the MRS. This can be useful if you are trying to lay out saplings for a tree farm or if there are other blocks that must be placed. The ritual takes 50LP per successful operation. -guide.bloodmagic.entry.ritual.timberman.info=Got wood? This ritual has you covered. The Crash of the Timberman tethers a spectral entity using the LP of the owner to harvest the leaves and logs of all trees within its range and places the results inside of the connected chest. It will try to find all "trees" in a 10 block horizontal radius and up to 30 blocks above the MRS (by default) and use 10LP per felled block. -guide.bloodmagic.entry.ritual.meteor.info=For all intents and purposes, this is one of the most powerful rituals currently in the game. It costs one million LP to activate and can only be used once before needing to be reactivated. The ritual, once specific sacrifices are made, pulls a meteor from outer space and causes it to plummet towards the ground, causing a large explosion once it hits something solid. Because these meteors are not from the Overworld, they can hold a rich ore density never seen anywhere else.\n\tSacrifices can include: an iron block, a gold block, a diamond. This is configurable by the modpack or user. -guide.bloodmagic.entry.ritual.downgrade.info=In order to gain more power, sometimes you have to sacrifice something in return. The Penance of the Leadened Soul does just that - by sacrificing a few items to an unseen entity, you may reduce the effectiveness of some aspect of your Living Armour and get an increase in the number of upgrade points as compensation. When you construct the ritual you have to place an item frame on the top-most Blank ritual stone facing towards the Master Ritual stone, and some sort of inventory (see: chest) on top of the Dusk ritual stone. To acquire a Living Armour Downgrade, you then have to place the key item in the item frame and the consumables in the chest. Once the ritual is activated, you can sneak on top of the Master Ritual Stone at any time and acquire the downgrade.\n\tIn the case of the Quenched Living Armour Downgrade, its key item is a water bottle (placed in the item frame) and the recipe is Dragon's Breath (placed in the chest). The key item is never consumed, but the recipe is.\n\tIn order to view the recipe for the downgrades you can look them up in JEI - check the usage of the Master Ritual Stone and you will see the recipes for the Penance ritual. Also you can just check the recipe for the max level downgrade in JEI and then check the usage of the key item - the key item is always the same for the specific downgrade. -guide.bloodmagic.entry.ritual.crystalSplit.info=Once Demon Will has crystalized, there is no way to split it into its many aspects - or so I've thought until now. The "Resonance of the Faceted Crystal" works by separating the many aspects inside of an unaspected (or raw) crystal cluster by using the different aspected ritual stones. \n\tIn order to use the ritual, an unaspected crystal cluster has to be placed two blocks above the Master Ritual Stone. In other words, you can place a crystallizer on top of the MRS and a crystal cluster on top of that and it should work well. Next, you must make sure that there are no blocks directly above the four elemental-based ritual stones, and then wait for the crystal cluster to grow. \n\tAfter the cluster has grown a total of five or more spires, the ritual will split these spires off and create one spire each of Corrosive, Steadfast, Vengeful, and Destructive Will on top of the aspected ritual stones. If the unaspected cluster is allowed to grow further and these new clusters remain intact, the process will repeat and more spires will be added. \n\tThe mechanism for this process is quite simple. When the Raw Will crystal has at least five spires, the ritual breaks off four of these spires and converts the Will into its more incorporeal form. This Will is then pushed threw the final spire of the cluster, which forces the different aspects of the Will into more localized clumps of the particular aspect. This Will is then gathered into the ritual stones, which act as bases for which the new aspected crystal clusters can grow from. -guide.bloodmagic.entry.ritual.portal.info=##REQ-LORE##\n\t The Gate of the Fold is a ritual made for interdimensional teleportation without the need of additional interaction. Upon activation, all blocks that touch its ritual stones are used as a key pattern to link portals together. If another Gate of the Fold with the same key exists, the rituals will be linked together and walking through instantly teleports to its twin. Only up to 2 portals with the same key can exist at the same time.\n\t Activation Cost: 50,000LP\n\t Teleportation Cost: 1,000LP (same dimension) / 10,000LP (different dimensions) -guide.bloodmagic.entry.ritual.altarBuilder.info=##REQ-LORE##\n\t The Assembly of the High Altar is a ritual to quickly construct a new altar ziggurat from the blocks in the attached inventory (usually a chest on top of the MRS).\n\tActivation Cost: 450LP\n\tCost per component placed: 75LP -guide.bloodmagic.entry.ritual.pump.info=##REQ-LORE##\n\t The Hymn of Syphoning is used to syphon liquids in world around or below the ritual into an appropiate container (for example a Blood Tank) above the MRS. Liquids in world are replaced with Stone, preventing flowing liquids that could cause performance issues.\n\tActivation Cost: 500LP\n\tCost per operation: 250LP -guide.bloodmagic.entry.ritual.cobble.info=##REQ-LORE##\n\t Got tired of making one of these primitive buildings to generate cobblestone? Got tired of having OSHA on you or accidentally extinguishing your lava source? This ritual is for you. Generate insurmountable masses of cobblestone in a fast and efficient way with future-proof blood instead of using dangerous and limited lava (unless you generate lava from blood, that is). \n\n\t This ritual generates (by default) cobblestone on top of itself which can then be mined for personal use. \n\t Activation Cost: 500LP\n\t Cost per block: 25LP -guide.bloodmagic.entry.ritual.ellipsoid.info=##REQ-LORE##\n\t The Focus of the Ellipsoid creates a hollow sphere (by default) from materials in an inventory connected to the MRS (usually a chest on top of the MRS).\n\t Activiation Cost: 20,000LP\n\t Cost per block placed: 5LP -guide.bloodmagic.entry.ritual.crystalHarvest.info=##REQ-LORE##\n\t The Crack of the Fractured Crystal breaks off all but one spire of all Demon Will Crystal Clusters in range and drops them on the ground. Combined with the ritual "Call of the Zephyr", those items cann be collected and placed into an inventory for later use.\n\t Activation Cost: 40,000LP \n\t Cost per operation: 50LP -guide.bloodmagic.entry.ritual.forsakenSoul.info=##REQ-LORE##\n\t The Gathering of the Forsaken Souls speeds up Demon Crystal growth for crystal clusters above the ritual (by default). It does not generate will on its own though and still requires the crystal clusters to have Demon Crystallizers below them. In order to do that, it utilizes a mechanic known as "uniqueness" of mobs. The more different mobs die, the more efficent the crystal growth will be. It does not itself generate Demonic Will Aura though, so you need to supply it by either feeding back crystals or putting a Tartaric Gem with will into a Demon Crucible. This should eliminate the need for going out to farm demonic will unless you fail to supply mobs to feed it and/or run out of will.\n\t Activiation Cost: 40,000LP\n\t Cost per damage tick and mob: 2LP -guide.bloodmagic.entry.ritual.animalGrowth.info=##REQ-LORE##\n\t The Ritual of the Shephard increases the speed at which animals grow significantly.\n\t It also increases the rate of breeding if supplied with Vengeful Will or make the animals capable of searching hostile mobs and explode on them if supplied with Destructive Will. In either case, if supplied with Steadfast Will, it will automatically feed the animals with food from an inventory above the MRS (by default).\n\t Activation Cost: 10,000LP\n\t Cost per operation and animal: 2LP -guide.bloodmagic.entry.ritual.livingEvolution.info=##REQ-LORE##\n\t The Ritual of the Living Evolution increases the maximum amount of upgrade points for the Living Armor set to 300. To use it, simply activate the ritual and then step on the MRS with an equipped set of Living Armor.\n\t Activiation Cost: 50,000LP -guide.bloodmagic.entry.ritual.upgradeRemove.info=##REQ-LORE##\n\t The Ritual of the Cleansing Soul removes all upgrades and downgrades from a set of Living Armor. To use it, simply activate the ritual and then step on the MRS with an equipped set of Living Armor.\n\t Activiation Cost: 50,000LP -guide.bloodmagic.entry.ritual.fullStomach.info=##REQ-LORE##\n\t The Ritual of the Satiated Stomach feeds players in its area with food from a chest above the MRS. The food is fed in an efficient manner unless the food provides more than max saturation in which case it is fed anyways.\n\t Activation Cost: 100,000\n\tCost per operation: 20LP -guide.bloodmagic.entry.ritual.eternalSoul.info=##REQ-LORE##\n\t The Cry of the Eternal Soul is capable of feeding LP from the Soul Network back into an altar. This falls under the usual restrictions of pumping (liquid) Life Essence into an altar. Every point of LP transferred into the altar costs 2 LP from the network.\n\t Activiation Cost: 2,000,000LP\n\t Cost per operation: 2*transferLP -guide.bloodmagic.entry.ritual.condor.info=##REQ-LORE##\n\t The Reverence of the Condor allows flight for players in a local area around the ritual.\n\t Activation Cost: 1,000,000LP\n\t Cost per operation: 2LP -guide.bloodmagic.entry.ritual.featheredEarth.info=##REQ-LORE##\n\t The Ritual of the Feathered Earth constantly reduces the fall height to 0, effectivly eliminating fall damage.\n\t Activation Cost: 5,000LP\n\tCost per second: 20LP -guide.bloodmagic.entry.ritual.grounding.info=##REQ-LORE##\n\t The Ritual of Grounding manipulates the gravity in its area. By default, it drags mobs to the ground and prevents jumping.\n\t Supplying the ritual with Raw Will makes it affect players in addition to mobs.\n\t Corrosive Will simply disables gravity all together.\n\t Destructive Will vastly increases fall damage of affected entities.\n\t Steadfast Will allows the ritual to affect bosses.\n\t Vengeful Will alone amplifies the grounding effect, in combination with Corrosive Will, however, it transforms the ritual to provide levitation instead. Vengeful Will also increases the effect of Heavy Heart, increasing fall damage even more.\n\t Activiation Cost: 5,000LP\n\tCost per second: 20LP -guide.bloodmagic.entry.ritual.veilOfEvil.info=##REQ-LORE##\n\t The Veil of Evil casts a magical shroud over its area, allowing mobs to form where they usually would not. Spawns following vanilla rules will be forced to spawn. Spawns that are denied will follow vanilla spawning rules. -guide.bloodmagic.entry.ritual.wardOfSacrosanctity.info=##REQ-LORE##\n\t The Ward of Sacrosanctity provides a powerful ward, preventing mobs from forming even though they usually would. Spawns following vanilla rules will be prevented from spawning. Spawns that are forced or allowed will follow vanilla spawning rules. - -# Architect Entries -guide.bloodmagic.entry.architect.intro=Foreword -guide.bloodmagic.entry.architect.bloodaltar=The Blood Altar -guide.bloodmagic.entry.architect.ash=Arcane Ash -guide.bloodmagic.entry.architect.divination=Divination Sigil -guide.bloodmagic.entry.architect.soulnetwork=Soul Network -guide.bloodmagic.entry.architect.weakorb=Weak Blood Orb -guide.bloodmagic.entry.architect.incense=Incense Altar -guide.bloodmagic.entry.architect.bloodrune=Upgrading your Altar -guide.bloodmagic.entry.architect.inspectoris=Inspectoris Scandalum (Block Reader) -guide.bloodmagic.entry.architect.runeSpeed=Speed Rune -guide.bloodmagic.entry.architect.water=Water Sigil -guide.bloodmagic.entry.architect.lava=Lava Sigil -guide.bloodmagic.entry.architect.lavaCrystal=Lava Crystal -guide.bloodmagic.entry.architect.apprenticeorb=Apprentice Blood Orb -guide.bloodmagic.entry.architect.dagger=Dagger of Sacrifice -guide.bloodmagic.entry.architect.runeSacrifice=Rune of Sacrifice -guide.bloodmagic.entry.architect.runeSelfSacrifice=Rune of Self Sacrifice -guide.bloodmagic.entry.architect.holding=Sigil of Holding -guide.bloodmagic.entry.architect.air=Air Sigil -guide.bloodmagic.entry.architect.void=Void Sigil -guide.bloodmagic.entry.architect.greenGrove=Sigil of the Green Grove -guide.bloodmagic.entry.architect.fastMiner=Sigil of the Fast Miner -guide.bloodmagic.entry.architect.seer=Seer's Sigil -guide.bloodmagic.entry.architect.magicianOrb=Magician Blood Orb -guide.bloodmagic.entry.architect.capacity=Rune of Capacity -guide.bloodmagic.entry.architect.displacement=Displacement Rune -guide.bloodmagic.entry.architect.affinity=Sigil of Elemental Affinity -guide.bloodmagic.entry.architect.lamp=Sigil of the Blood Lamp -guide.bloodmagic.entry.architect.magnetism=Sigil of Magnetism -guide.bloodmagic.entry.architect.peritia=Tome of Peritia -guide.bloodmagic.entry.architect.livingArmour=Living Armour -guide.bloodmagic.entry.architect.upgradeTome=Living Armour Upgrade Tomes -guide.bloodmagic.entry.architect.teleposer=Teleposer -guide.bloodmagic.entry.architect.boundBlade=Bound Blade -guide.bloodmagic.entry.architect.boundTool=Bound Tools -guide.bloodmagic.entry.architect.weakShard=Weak Blood Shard -guide.bloodmagic.entry.architect.masterOrb=Master Blood Orb -guide.bloodmagic.entry.architect.runeOrb=Rune of the Orb -guide.bloodmagic.entry.architect.suppression=Sigil of Suppression -guide.bloodmagic.entry.architect.haste=Sigil of Haste -guide.bloodmagic.entry.architect.severance=Sigil of Ender Severance -guide.bloodmagic.entry.architect.teleposition=Teleposition Sigil -guide.bloodmagic.entry.architect.compression=Sigil of Compression -guide.bloodmagic.entry.architect.bridge=Sigil of the Phantom Bridge -guide.bloodmagic.entry.architect.mimic=Mimics -guide.bloodmagic.entry.architect.downgrade=Living Armour Downgrades - -guide.bloodmagic.entry.architect.augmentedCapacity=Rune of Augmented Capacity -guide.bloodmagic.entry.architect.charging=Charging Rune -guide.bloodmagic.entry.architect.acceleration=Rune of Acceleration - -guide.bloodmagic.entry.architect.tier3=Tier 3 Under da Sea - -# Architect Entry Texts -guide.bloodmagic.entry.architect.intro.info=Hello, everyone. My name is Tiberius. You can probably tell by this entry that the book is not exactly complete, and you would be right. Because of the 1.7.10 -> 1.8.9 and 1.9.4 (and above) updates, a lot of stuff has changed in the mod. As such, the books have had to be rewritten. Because the ultimate plan for these documents is to have each book in the form of a research journal / actual book, these documents will take a while to flesh out. As such, I am going to be updating this book periodically in order to fill in the necessary gaps. It will start as flavourless garbage to start with (Yeah... not the most appetizing of illustrations to go with for documents, but whatever!), but slowly it will be morphed into a story about a bunch of blood magi on a journey through discovery.\n\tBut enough about that, I need to get into character. *Cough cough*\n\tMy name is Tiberius, and I am a Blood Mage, and also otherwise known as The Architect. This book contains all of my research regarding the ethereal phenomenon called the "Soul Network," as well as the physical properties of some of the most central devices that any Blood Mage in training should be accustomed to. From the art of laying out the structure of a powerful Blood Altar, to the intricacies of sacrificing life force to increase a mage's power, and further to the powers gained through arcane glyphs and sigils, I have discovered, revised, and created new ways into train one's self to new heights.\n\tSo enter, Mage, for a new realm awaits you!\n\t...Yeah, Magus says that I can get a little grandiose, but what can you do? -guide.bloodmagic.entry.architect.bloodaltar.info.1=The Blood Altar is one of the most central devices in the mod. There are two main uses for the altar: either for crafting certain items essential for progressing through the mod, or for filling up one's Blood Orb. Both of these actions require the player to fill up the basin with Life Essence, which can be extracted from two different sources: monsters and peaceful creatures, and the player's own health. -guide.bloodmagic.entry.architect.bloodaltar.info.2=To add your own Life Essence into the basin, you need to craft yourself a Sacrificial Dagger and right click it while next to the altar. This will take a heart of health and add a total of 200LP to the unupgraded altar. "LP" is Life Points, which is a measure of how much life force is used in a task - no, it is not like YuGi-Oh. The Blood Altar has a capacity of 10,000LP. If you then right-click on the altar, you can place an item into the basin, and if it is a valid item the altar will start the crafting process.\n\tThe altar crafts an item by consuming the LP in the basin if the altar is a high enough tier. If there is enough LP, the altar will drain a bit of LP from the basin each tick and increase the progress of the crafting, emitting red particles. If there is no longer any LP in the basin, the altar will emit gray particles and the crafting will start to lose progress, which is not good at all! Finally, if the altar is filling up a Blood Orb, the altar will emit purple particles to indicate it is syphoning LP from the basin.\n\tThere are actually a total of three tanks in the Blood Altar: the main tank, which has a default capacity of 10 kLP as previously indicated, as well as an input tank and an output tank which both have 10%% of the total capacity of the main tank. Every 20 ticks by default, the LP in the input tank will transfer to the main tank at 20LP/s, and the LP in the main tank will transfer to the output tank at 20LP/s. As the names suggest, the input tank accepts the LP that is pumped into the altar acting as a buffer to limit the speed of transferring from outside sources, and the output tank can be pulled from using pipes out of the altar. -guide.bloodmagic.entry.architect.ash.info=Although not strictly part of the overall theme of this book, Arcane Ash is necessary in order to progress through the mod and get some of the more powerful devices available. This ash is crafted using the Hellfire Forge and Demon Will, so if you are new to this concept please consult the "Demon Kin." In essence, this is a way to craft items out of two separate items: a reagent of some sort to act as a catalyst, and a secondary item. \n\tThe ash has a total of twenty uses before you need to craft another. When you right click on the ground (or a wall, though it will only render one direction), you will inscribe a simple circle out of ash. If you click on the ash again with an item, it will be "placed inside of the ash" - assuming that this item is a valid catalyst, the circle will change shape to represent that it is ready for the next item. If it doesn't change shape, then you did something wrong.\n\tOnce it has changed shape, you can then place in the secondary item. If this item matches with the first item, the circle will start rotating and performing different actions depending on the recipe it is working on. After a while, if properly executed, an item will pop out.\n\tAll of the recipes for the Arcane Ash crafting (I call it Alchemy Array Crafting) can be found in JEI by checking the uses for Arcane Ash - the first item shown is the catalyst, and the second item is the secondary item. -guide.bloodmagic.entry.architect.divination.info=The Divination Sigil is one of the most useful tools in the mod, able to tell you many values that will make your life easier. This sigil is crafted using a piece of redstone and a blank slate (crafted in the Blood Altar) using an alchemy array.\n\tWhen you right click a Blood Altar with the sigil, you can see the current tier, amount of LP inside of the main basin, as well as the max capacity of the Blood Altar. Spam-clicking the altar with the sigil will overwrite the previous text from the sigil, meaning that there will not be any spam in your chat.\n\tIf you right click in the air with the sigil, the sigil will tell you the current amount of LP that is in your Soul Network. Although this is rather mundane to start with, this function alone will make it very likely that you will want to keep this sigil on you at all times. -guide.bloodmagic.entry.architect.soulnetwork.info=The Soul Network (commonly abbreviated as SN) is the term for the connections between the player and all of the items and structures that they have linked their soul to. When a blood mage becomes more powerful, the strength of their soul increases and thickens these bonds. These connections are ethereal strands of the soul, and only the most powerful of Blood Magi are able to see these in their physical form. To date, no mage has attained this ability...\n\tIn-game, the Soul Network is tied directly to the player. The data is stored inside of the world, and every player has only a single network - the LP placed into the network is not stored in any item, but is instead placed and drawn from a single pool. \n\tTo bind things to your network, the most common way is to simply right click an item that uses a network to power itself. Once bound, the item will indicate that it is owned by you and it can never be unbound (with current technology). If this item is used and it has an LP cost attributed to it, it will take the LP from the owner's network. If there is not enough LP in this network, it will take the missing LP directly from the user's health (not the owner's). Be careful when using items when you have a low amount of LP - it could end up being deadly. -guide.bloodmagic.entry.architect.weakorb.info.1=What good is any mage without a power source? A Blood Orb is a device that consumes physical LP and transfers it into the owner's Soul Network. Although not a battery itself, it does act as a conduit in order to fill up the power reserves of the blood mage. -guide.bloodmagic.entry.architect.weakorb.info.2=The Weak Blood Orb is the first such orb that you can make. By infusing a diamond inside of a Blood Altar with 2 kLP, you can create this orb. When bound and placed inside of an altar with some LP in it, the orb will syphon from the basin and transfer that LP directly into the network. Each orb has a maximum capacity that can only be extended by advanced runes on the altar. For the Weak Blood Orb, this maximum capacity is 5 kLP.\n\tBlood Orbs can also be filled directly from the player by simply right-clicking with them - this will transfer a heart of health into the orb and give you 200LP. This cannot increase past the orb's maximum capacity.\n\tA Blood Orb can only be filled by its tier of altar or higher; this means that if you have a T3 orb, it has to be filled in an altar that is greater than or equal to T3. A simple T1 altar would not do in this situation. -guide.bloodmagic.entry.architect.incense.info.1=One will quickly find that the speed of LP generation can become increasingly burdensome. Sure, by adding special runes to the Blood Altar you are able to increase the yield of self-sacrificing, but this can be a slow process all the same. If only there was a way to further increase how much LP you can get from yourself?\n\tEnter the Incense Altar. The Incense Altar acts as a central point for a tranquil area, calming the soul itself with the gentle wafts that emanate from the basin. Where this scent comes from you aren't entirely sure, but what could possibly go wrong?\n\tThe goal of this block is to create an area of tranquility to increase how much LP you get from a heart of health. When you are near the block (about five blocks) fire particles will be emitted to show that it is working - when you are affected by this tranquility, your Sacrificial Dagger will transform to indicate that you have an increased yield at the Blood Altar. This process takes about 5 seconds, and you will know you are finished when the fire particles stop appearing. At this point, if you use your Sacrificial Dagger at the Blood Altar you will sacrifice 90%% of your maximum health all at once and pump LP into the altar proportional to the amount of health sacrificed multiplied by a bonus based on how tranquil the surrounding area is: this bonus is +20%% by default.\n\tAs a side note, the Divination Sigil can be used on the Incense Altar to determine the amount of Tranquility as well as how much of a bonus the current altar gives. -guide.bloodmagic.entry.architect.incense.info.2=Of course just an additional 20%% is all well and good, but it can be further expanded by expanding the range of influence of the Incense Altar. If you place a row of three Wooden Path blocks two blocks away from the incense altar in each of the cardinal directions (making sure that all path blocks are on the same y-level, up to five blocks up or down from the incense altar) you can define an area. Any block placed within this area (a block that is the same distance horizontally away from the Incense Altar as the path blocks are horizontally, and on the same level or up to two blocks higher vertically from the path blocks) can add to the Tranquility of the Incense Altar. Another row of path blocks can be added past this initial row following the same rule: the new row must all be on the same y-level as each other, and the entire row has to be within 5 blocks vertically from the previous row of path blocks. This means that layouts such as pyramids, inverted pyramids, or more advanced staircase structures are possible.\n\tAll path blocks have a maximum distance that they can be from the Incense Altar in order to take effect. The Wooden Path blocks are able to work up to a total of three rows from the Incense Altar. Stone paths work up to five, worn stone paths seven and obsidian paths to nine blocks from the origin. So at a certain point you have to use better path blocks to extend your tranquility area, however you can use higher tiered path blocks in place of lower tiered path blocks, just not the other way around.\n\tBack to Tranquility. Only certain blocks are able to affect the Tranquility of an area, and there are different types of Tranquility blocks. If you place a crop such as potatoes in the area, you add a bit of Tranquility (using the Crops category). However, if you add another crop like potatoes again or even carrots, you will get less tranquility. Adding something from a different Tranquility category, you get the full effect. But adding more stuff using the same category has diminishing returns. Therefore in order to get the most Tranquility out of a certain area, it is most optimal to mix and match using as many different types of Tranquility as possible.\n\tSome things that add Tranquility are: Crops, logs, leaves, lava, netherrack, farmland, water, Life Essence, and other assorted things. -guide.bloodmagic.entry.architect.bloodrune.info.1=As you go through the mod you'll slowly learn that the humble blood altar before you is not powerful enough for you to fulfil your true ambitions. By placing special blocks known as Blood Runes around the altar you are able to expand the altar's strength significantly, unlocking higher tiers of recipes as well as allowing you to augment the abilities of the altar itself.\n\tTo upgrade the altar to its second tier, you need to place 8 blood runes around the altar and one level lower. If you are confused about the precise configuration, the item "Inspectoris Scandalum" can tell you the precise placement for the blocks required for the next tier.\n\tAlthough a blank rune is fine for simply getting your altar upgrade and running to a higher tier, it is advantageous to use upgrade runes for your altar. Each of the runes in a blood altar may be swapped out for any upgrade rune (the only exception to this is that at Tier 2 you cannot use the corner runes as upgrade runes - T3 onwards you can use these). There are runes that affect the speed of crafting, the capacity of the altar, as well as the efficiency of sacrificing at the altar. These runes can be found in their respective entries. -guide.bloodmagic.entry.architect.inspectoris.info.1=Literally "Block Reader" in Latin, this item's purpose is to give you more information about the more complex blocks in the mod when the blocks are in the world. Currently the only implementation for this item is the Blood Altar, and by simply shift-right clicking on a Blood Altar in the world it will tell you what blocks are required in the world for the next altar tier.\n\tIf this method doesn't suit you, you may shift-right click the item in the air to cycle through the tiers. If you then shift-right click on the altar, the altar will display ghost blocks in the world, showing exactly where the blood runes and the pillars are required in order to achieve that tier. If you set the displayed tier to 1, it will remove the hologram. -guide.bloodmagic.entry.architect.runeSpeed.info.1=The speed rune applies a pressure to the altar's basin, forcing the transmutation process so that crafting is a lot quicker. Each speed rune increases the consumption of the altar by +20%% per rune, effectively increasing the speed of the altar. This also affects the speed at which the blood orbs are filled by the altar at the same rate per rune. -guide.bloodmagic.entry.architect.water.info.1=The Water Sigil, as the name suggests, is able to gather moisture from the air to create a source of water at the point of contact on the ground. What is more, by clicking on a machine that accepts a fluid, you can insert up to 1000mB of water into the machine for the same cost as if you put it on the ground. For all intents and purposes, it acts as an infinite bucket of water - it won't work if you place it inside of a machine, however. 50LP per use. -guide.bloodmagic.entry.architect.lava.info.1=The Yang to the Water Sigil's Yin, this sigil heats up the rock in the local area and gathers it in one place, forming a source of lava where the sigil makes contact. A similar process occurs when you interact on a fluid-accepting machine, generating up to 1000mB of lava inside of the machine for the same cost. For some reason your hand is not burnt when you use it, however it doesn't mean that it is a wise choice to take a bath in it! 1000LP per use. -guide.bloodmagic.entry.architect.lavaCrystal.info.1=The lava crystal is a stone that has a piece of lava encased in the center of it that does not lose its heat. When placed as a fuel source inside of a furnace, it will "burn" for an amount that is enough to cook a single item in a standard furnace at the cost of 50LP from the owner's network. If the network does not have enough power in it (or if there is no owner) the crystal will simply not burn and will inflict nausea on the owner due to the strain.\n\tThis crystal will work for any solid fuel burning machine that accepts any fuel. -guide.bloodmagic.entry.architect.apprenticeorb.info.1=While out using the various devices, you will quickly realise that your 5kLP maximum capacity in your Soul Network will quickly run out. This is where you will start looking for a more powerful orb for your network.\n\tThe Apprentice Blood Orb requires a Tier 2 altar, and has a maximum capacity of 25kLP. It also allows you to create more powerful items and runes. -guide.bloodmagic.entry.architect.dagger.info.1=After a while of strengthening yourself through the use of self-sacrifice, you may be keen to attempt to try sacrificing the blood of mobs. The Dagger of Sacrifice, when used on a non-boss, non-player entity next to a Blood Altar, will kill the entity in one hit and pump all of the blood into the altar, converting it into life essence depending on the quality of the mob. Normally, hostile mobs will tend to give much more LP than peaceful mobs. -guide.bloodmagic.entry.architect.runeSacrifice.info.1=The Rune of Sacrifice, as the name may imply, increases the yield of all activities that sacrifice the health of mobs in return for LP. Each rune provides a +10%% increase in yield, additively. -guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=Similar to the Rune of Sacrifice, the Rune of Self Sacrifice increases the yield of LP provided from the player. Each rune provides a +10%% increase in yield, additively. -guide.bloodmagic.entry.architect.holding.info.1=As you will start to realize, there are a lot of useful sigils that are available - some toggleable, others active use. Because of this your inventory will quickly become clogged up. This need is filled by the Sigil of Holding.\n\tThis sigil can hold up to five other sigils (no, it cannot hold other Sigils of Holding) in its internal inventory. By pressing the "Holding" key, default 'H', you can open up the sigil's GUI to rearrange the sigils that are held. If you shift and use the scroll-wheel while it is equipped, you will cycle through the contained sigils. Once you land on the sigil that you want to use, you can use the sigil as if it was the one selected! \n\tNaturally, you can have multiple Sigils of Holding, each with their own inventory. To help determine which one is which at a glance, you can dye the sigil using the Alchemy Table. To do this, either place the Sigil of Holding in the Alchemy Table with a dye, or the sigil with a name tag with the colour that you want in 0xZZZZZZ format for the name. -guide.bloodmagic.entry.architect.air.info.1=The Air Sigil uses a rudimentary form of fission to generate a steady stream of air behind the user by the traces of water vapour in the air, propelling them forward. In essence, by using this sigil you can be launched forward a considerable distance. It should be noted that the sigil will only cancel the user's fall distance when used, so if you want to stick the landing you have to use it close to the ground! -guide.bloodmagic.entry.architect.void.info.1=As the name suggests, the Void Sigil will create a vacuum at the point of contact which will suck up the liquid source that it is used on, completely destroying the source. This is probably best used in conjunction with the Water Sigil or the Lava Sigil. -guide.bloodmagic.entry.architect.greenGrove.info.1=By using your blood as a simple growth catalyst of sorts, the Sigil of the Green Grove will increase the growth speed of any plants in a nearby area while activated. To activate the sigil, shift-right click it to toggle between activated and deactivated (easily seen by the tooltip or by the glowing symbols on the sigil). Keep in mind that every few seconds the sigil will syphon a bit of LP from the user to fuel the accelerated growth.\n\tIf used directly on a plant, the sigil will apply a bone-meal effect. This can be used to grow tall grass or other crops, just the same as bone-meal. -guide.bloodmagic.entry.architect.fastMiner.info.1=As any good Blood Mage should be aware of, blood has a high amount of iron within it. If skilled enough, one can manipulate blood while it is still within the body - it should be noted, however, that only the most advanced Blood Mages can twist the blood of those that are unwilling.\n\tOne of the principle uses is to accelerate the functions of one's own body. By magnetising the iron in the user's blood, the Sigil of the Fast Miner increases the speed of mining dramatically, applying Haste II while activated. This magnetism is too weak to affect things outside of one's own body, however it is sufficient enough to mine obsidian at a considerable speed. -guide.bloodmagic.entry.architect.seer.info.1=When tinkering around with the Blood Altar, you can sometimes get lost in the hidden intricacies of its operation that the Divination Sigil seems to be unable to divine. This is where the Seer's Sigil comes into play. Essentially an upgrade to the Divination Sigil, this sigil provides additional information about different stats of the altar. These range from the speed of the altar, the current LP, as well as the current progress of the crafted item. It also gives info about the player's soul network. -guide.bloodmagic.entry.architect.magicianOrb.info.1=Another tier, another Blood Orb. This time, in order to progress further in the mod you will have to craft yourself the Magician Blood Orb. In the default recipe you can see that it takes 25kLP in order to craft, however the maximum capacity of the Blood Altar is 10kLP. This means that for a successful craft to occur you will need to add LP into the Altar while it is in the process of crafting the orb. Be prepared, since it can be a difficult task if you do not have everything you need! -guide.bloodmagic.entry.architect.capacity.info.1=You are not exactly sure how it works the way it does, but the Rune of Capacity increases the capacity of the Blood Altar by 2kLP additively. Perhaps there is some sort of resonance effect that decreases the volume of the LP, therefore allowing you to pack more into the static basin? It does give you an idea on how to improve it further, though...\n\tIt should be reiterated that the size of the input and output buffers are 10%% of the maximum capacity of the main tank, so these runes will increase the buffer capacities as well. -guide.bloodmagic.entry.architect.displacement.info.1=By default, the transfer of LP between the buffer and main tanks is limited to 20LP/s. For systems that want to remove and re-add LP to the altar this speed is a sluggish crawl. That is where this rune comes into play.\n\tThe Displacement Rune increases the amount of LP transferred per operation. Each rune multiplies the transfer rate by 1.2x, stacking multiplicatively. So one rune would be 24LP per operation, two runes would be 28.8LP per operation, and three runes 34.56LP. If you have 20 runes on an altar, this jumps all the way up to 767LP per operation - that would clear a full altar in only 13 seconds. -guide.bloodmagic.entry.architect.affinity.info.1=At first glance, the Sigil of Elemental Affinity simply grants immunity to fire, drowning, and damage from heights while activated. Its operation is a lot more nuanced, however. This sigil creates a thin barrier of air around the user by using the sweat (and when required, blood) from the user, keeping the body away from the harsh elements. \n\tThis air barrier acts as a buffer between the skin and the fire or lava, circulating when required to prevent overheating. It also fills the lungs while under water to equalize the pressure of the body and the surrounding water. Finally, when falling from a large height, the air will shift to below the person's feet, acting as a cushion to dampen the fall. -guide.bloodmagic.entry.architect.lamp.info.1=There are quite a few "impurities" within the body and a person's blood. By harvesting some noble gases and encasing them with a source of heat, you can generate a ball of light that can be flung a large distance, sticking to the surface that it impacts with.\n\tThe Sigil of the Blood Lamp has two uses: you can either directly click a block and place a light source or fire a projectile that will generate a source of light at the point of contact. These light sources can be broken just like torches in one hit. -guide.bloodmagic.entry.architect.magnetism.info.1=This sigil magnetizes the iron in the blood stream of the user to attract small objects towards the sigil, allowing a quick and painless pickup. In essence this acts as an item magnet, but instead of actually "vacuuming" up items towards the player, it causes the player to pick up the item from a distance, so items don't need to fly around the place. Thankfully the magnetism is tuned so that it does not attract living objects, so you won't find creepers suddenly wanting to hug you at Mach 3. - -guide.bloodmagic.entry.architect.peritia.info.1=In the world, certain actions impress experiences on a person: slaying monsters, mining elements, and smelting ingots or food can give experience that is accumulated over a period of time. Through some arcane mechanisms, some structures and devices actually drains these experiences from you in order to fuel their own processes. It can therefore be useful to store these experiences in some medium.\n\tAlthough some containers store experience as a physical substance, the Tome of Peritia allows the person to transcribe their experiences into the book - by writing in the tome, the pages are imbued with your thoughts and past actions, storing them away for later use. If you then want to acquire these experiences back, you can hold your hand to the page and syphon them back; this will remove the writing from the page and transmit those actions back to your memory.\n\tNow for the actual usage; by shift-right clicking the tome in your hand, you can store a level of experience into the book (or down to the level if you have a partial level). Right clicking with the tome will grant you up to the next level if there is enough experience stored in the book. The total experience, as well as the equivalent level stored, is displayed on the tooltip of the tome. -guide.bloodmagic.entry.architect.livingArmour.info.1=Any person in Minecraft, especially with the newer incarnations of the world, will know that a good set of armour means difference between life and death. Usually when you pick a set of armour you choose a static set of benefits - does this armour offer more protection? Do I get flight when I wear this? Can I jump really high, or move really fast? These are all valid options on a set of armour, but you can never get a set that is tailored exactly to your needs. At least that is what they thought.\n\tA set of Living Armour is an engineered lifeform that is integrated with a simple set of iron armour. When worn, it enters a symbiotic relationship with the user - when you move, it moves. When you attack, it attacks. When you eat, it senses this and compensates. And just like a normal human body, it will start to grow and strengthen depending on what you do, being trained by your actions. \n\tLet's give an example. If you equip a new set of armour on and run around a lot, you will notice that you will receive an upgrade on the chest plate called "Quick Feet" - this upgrade provides an incremental increase to your speed at level 1, while subsequent levels provide a larger boost. You will also notice that the "Upgrade Points" now read "3/100" - each upgrade requires a number of upgrade points to be applied, and the chest plate has a maximum number of points that it can hold. If an upgrade that you can get is not obtainable with the number of free upgrade points you have it cannot be gained. \n\tKeep in mind that the Living Armour will only be trained when you have a full set of armour on, and the armour's effects will only take effect when a full set of armour is used.\n\tThe maximum number of upgrade points can be modified by a few different means. One of them is to create alchemical concoctions that will strengthen the bonds between the user and the Living Armour, vastly increasing the number of points you can have on a given set of equipment. One such example is the "Draft of Angelus," which increases the maximum number of points to 200. Information about these brews, as well as how to create them, can be found in "The Alchemist". -guide.bloodmagic.entry.architect.upgradeTome.info.1=Sometimes you may not be happy with the upgrades that you have gotten on your Living Armour. By using the ritual "Sound of the Cleansing Soul" (more information can be found in "The Ritual Master"), you can remove all of the upgrades from the armour and receive them in the form of "Upgrade Tomes". If you right-click these while wearing a full set of Living Armour (and while you have space for the upgrade) you can add the upgrade to your armour. \n\tThese tomes may also be combined in an anvil - if you combine two of the exact same upgrade tomes (same upgrade, same level) together in an anvil, you can get a single tome that is one level higher. So if you combine Quick Feet II with another Quick Feet II, you will get Quick Feet III. This can then be applied to the armour in the same way. -guide.bloodmagic.entry.architect.teleposer.info.1=The Teleposer is a device that teleports not just entities but blocks as well. In order to set up a Teleposer, you need at least two Teleposers and one Teleposition focus. One of the Teleposers acts as the Destination, and the other acts as the Beginning.\n\tTo set this up, you need to first bind the focus to you by right clicking it. You then right click the focus onto the Destination Teleposer to save its location (and dimension) and then insert the focus into the Beginning Teleposer by right clicking the Teleposer without a focus in your hand and placing the focus inside of the GUI.\n\tPowering the Beginning Teleposer (the one with the focus) with a strong redstone signal will cause the Teleposers to swap the entities and blocks (including any content in the tiles such as chest inventories) between the Teleposers, assuming that there is a Teleposer at the Destination. \n\tYou can either have one Teleposer have a focus, have both of the Teleposers have foci that are linked to each other, or you can have one Teleposer linked to another Teleposer that is not linked to it, so depending on how you set them up you can have very intricate systems.\n\tKeep in mind that currently the Teleposer will only swap the blocks and entities that are right above the block, and the size depends on the focus - the T1 focus only swaps the block on top of the Teleposer, the T2 focus swaps a 3x3x3 area above the Teleposer, etc. -guide.bloodmagic.entry.architect.boundBlade.info.1=The Bound Blade is an artifact from the past, a blade that is created by binding an entity to a sword in the same process that creates the Living Armour. It should be noted that this, as well as the Bound Tools, will change in later versions of the mod.\n\tThe sword has an active and inactive mode, which can be toggled by shift-right clicking. The sword does not deal any damage at all when inactive, but while active there will be a small LP drain over time. Likewise, when you damage a mob you will drain LP from your network. Sure, you have a lot of damage, but it may kill you!\n\tWhen a monster is killed, the monster has a chance to drop a Weak Blood Shard. These shards are used in order to upgrade your Blood Altar to a T4 altar. -guide.bloodmagic.entry.architect.boundTool.info.1=Similar to the Bound Blade, these Bound Tools (pickaxe, axe, and shovel) will eventually be modified to fit better in the mod. Like the Blade, the tools have an active and inactive mode that can be toggled between by shift-right clicking them. \n\tSomething that these tools have is something called "Beast Mode". If you hold right click, you can charge up the tool and unleash a powerful cleave that will instantly break the blocks that can be broken by the given tool - when fully charged, this is an 11x11x11 cube above you at a cost of 10kLP. Be careful with this powerful tool, since it may be your last! -guide.bloodmagic.entry.architect.weakShard.info.1=Everything that has life can have the ethereal connections that is known as the Soul Network. As seen in your experiences, non-living things can also have a Soul Network attached to them, such as sigils and rituals; however, these connections are the strongest in creatures and, naturally, humans. \n\tWhen you attack a monster with a Bound Blade, their Soul Network temporarily hardens and a piece of it will remain after death. This piece takes the form of a Weak Blood Shard, so named after the fact its reddish hue matches the colour of the Weak Blood Orb. At this point, it is not clear if there are stronger forms of blood shards, but you can tell that this would be very helpful in increasing the power of your own Soul Network -guide.bloodmagic.entry.architect.masterOrb.info.1=One of the uses for this increased affinity for the Soul Network is to use the Weak Blood Shard in a new blood orb: the Master Blood Orb. This orb has a maximum capacity of 1 million LP, and thus allows the wielder of the orb to access more powerful items and rituals. Perhaps meteors are not out of your reach... -guide.bloodmagic.entry.architect.runeOrb.info.1=Initially, this rune can be seen as somewhat useless. By thickening the ties between the blood orb in the altar and the Soul Network, the Rune of the Orb increases the maximum capacity of a blood orb filled by a Blood Altar by +2%% per rune, additively. For something like the Weak Blood Orb, this is just +100LP capacity, however for the Master Blood Orb this is a remarkable +20kLP capacity per rune. If you have a high tier blood orb and a few extra runes to spare on your altar, this may be something to round out your network. -guide.bloodmagic.entry.architect.suppression.info.1=The Sigil of Suppression uses the technology that is used in a Teleposer in order to temporarily displace fluids that are near it when active. This is done by teleposing the liquids in a sphere around the user to a hidden pocket dimension, replacing the liquid with air. Unfortunately, because you are overcharging the field used by the Teleposer, the teleposition is temporary - if the user walks away from the area that the liquid was teleposed away from or deactivates the sigil, the liquids will pop back where they were before as if nothing has happened, assuming that there are no newly-placed blocks there. This allows for fancy transportation when on foot, walking under the water instead of swimming through it or even parting the red seas of the Nether. -guide.bloodmagic.entry.architect.haste.info.1=Sugar and caffeine are interesting chemicals that the human body can process. One acts as a reservoir of energy that is quickly burned, whereas the other increases your wakefulness and allows you to access energy in other means. By mimicking these chemical processes to unleash more chemical energy, the Sigil of Haste allows the user to increase their movement abilities. \n\tWhile activated, the user can run a lot faster and is able to jump significantly higher. What is more, the sigil also offers "Step Assist," which allows the user to step up one block high ridges without needing to jump. It's like auto-jump, but less sucky. -guide.bloodmagic.entry.architect.severance.info.1=Teleportation is one of those odd powers that people can't fully explain. In most instances, teleportation can be described as a temporary warp in space-time, linking two places in space together so that the object in question can simply "step" through to the other side. The Sigil of Ender Severance attempts to stop this warping that teleportation requires, preventing creatures from teleporting when they are around the user. This does not stop some of the larger means of teleportation such as portals, but it will prevent Endermen from using their powers to warp around the user. -guide.bloodmagic.entry.architect.teleposition.info.1=The Teleposition Sigil has a contained Teleposer and focus in its structure. If you right click a Teleposer with this sigil, you can bind the coordinates and dimension to the sigil. Now, whenever you right click the sigil it will telepose you directly to the Teleposer (if it is there). Unfortunately, it doesn't seem like you are able to do a return trip... -guide.bloodmagic.entry.architect.compression.info.1=A miner will quickly find that during a long expedition their inventory will become filled with redstone dust, lapis, and several other materials. Most of these have recipes that will compress them down to storage blocks such as redstone blocks and blocks of diamonds, however they normally require a crafting table in order to combine them. \n\tThis sigil creases a miniature field of compression in the inventory of the user when activated, compressing items down to the lowest number of slots needed for the inventory. What this means is that if you have 63 redstone dust it will not do anything. However, if you have 64 dust it will compress 9 of them into a block of redstone. While this is technically not the ideal situation if you have exactly a stack of redstone dust, it will guarantee that you aren't left in the dust due to full pockets. If other mods are present this will work for other crafting recipes as well. -guide.bloodmagic.entry.architect.bridge.info.1=When activated and while the user is on solid ground, the Sigil of the Phantom Bridge solidifies the air beneath the user so that they may walk on it, essentially creating a Phantom Bridge. When you are shifting in the air, the bridge will instead form directly underneath you, allowing you to catch yourself in the air if you were falling. Although some calibration is needed in order to make it more effective for vertical travel as well as horizontal travel when moving quickly (due to lag messing up the creation of the bridge), it is a fancy way to effectively fly to different areas. -guide.bloodmagic.entry.architect.mimic.info.1=Mimics are arcane constructs that are designed to mimic whatever they are set to. When the mimic comes into contact with some form of block, its molecules shift their orientation in order to take on the shape, look, and feel of the block. Not all of the properties are copied, however: for instance, a normal mimic block when coming into contact with glowstone will not emit any form of light. \n\tWith normal use, there are two ways to use a mimic block. The first is placing the mimic block down and then right-clicking the mimic with the block that you want it to copy. This will place the block inside of the mimic and have the mimic take on the -default- shape of the block. So if a mimic is clicked with a stair, the mimic will always orient themselves in the same way.\n\tThe second method is to hold the mimic block in your hand and shift-click the block you want to replace. This will replace the block with the mimic and the mimic will have the exact same orientation that the replaced block had. This can be seen with stairs and chests, as well as other orientation-dependent blocks such as logs.\n\tThere are a few different variants of the normal mimics. The Opaque Mimic is the default mimic, able to take on the form and general properties of blocks - light cannot travel through these, however, so care should be taken with glass. The Ethereal Opaque Mimic can be walked through without any trouble because it has no hitbox, which is perfect for hidden doorways. Clear Mimic blocks work the same as their opaque variants, however they allow light through them even if it appears completely solid. Finally, the Lighted Mimic block is opaque and solid, but no matter what is placed inside of it, it will emit a strong light. No more dark areas in your base without torch spam!\n\tThere is one special variant of the mimic that you have to be wary of: the Sentient Mimic. If a player comes too close to one of these in the world, it will get up from where it is and attack you with a high degree of ferocity. These can be found in a variety of areas, but they are especially fond of dungeons. If one is mimicking a chest, however, be careful: they bite.\n\t***Creative Usage Only***\n\tThere are a few interesting features you can add to any mimic block when you are in creative mode. If you right click on a set mimic with a potion or potion flask, you can set the mimic to spawn potions around it if a player is nearby. If it is a regular mimic and you click on the east or west side, you can increase or decrease the radius that the potion will spawn in. If you click on the north or south side, you can increase or decrease the radius that the mimic will check for players around it before spawning the potions. Finally, clicking on the top or bottom of the block will increase or decrease the potion spawning interval, which is the number of ticks between dropped potions.\n\tIf the mimic is a sentient mimic, you can click the mimic anywhere to increase or decrease the detection radius for players - if a player is within this area and they can see the block, the mimic will spawn and jump at the player. \n\tAnother thing is that if the block is placed on the mimic while the placer is in creative, the block that is being mimicked will NOT drop when the mimic is destroyed.\n\tFinally, if the mimic is placed on any inventory or chest, the sentient mimic will place the chest on the ground with its contents once defeated - the regular mimic will instead just spew the contents everywhere when broken. -guide.bloodmagic.entry.architect.downgrade.info=Please see the entry "Penance of the Leadened Soul" in "The Ritual Master" for a detailed explanation about what these are as well as how to obtain them. - -guide.bloodmagic.entry.architect.augmentedCapacity.info=The Rune of Augmented Capacity functions similar to the Rune of Capacity in the sense that it increases the capacity of the Blood Altar. However, multiple runes on the same altar will begin to resonate with each other, increasing the capacity exponentially the more there are. One rune by itself will apply a +10%% increase to the capacity of the altar, however this functions multiplicatively with other Runes of Augmented Capacity: if there are two runes, it is a +21%% increase, three runes is +33.1%% increase, etc.\n\tUnfortunately, this multiplicative effect does not stack with the Rune of Capacity, meaning you will still only get the +2kLP bonus per rune. -guide.bloodmagic.entry.architect.charging.info=The Charging Rune is one of those beauties that will completely change the operation of the Blood Altar to something that can be seen as more useful for one-stop crafting. By syphoning off the LP from the Blood Altar slowly, the Charging rune begins storing "Charge," an internal value of the Blood Altar that can be seen using the Sigil of Sight. If the Blood Altar has enough Charge when it gets something to craft, it will use the required Charge up immediately and craft the item instantaneously. If there is not enough Charge, the Charge is all used to increase the progress of the item at a 1:1 Charge:LP ratio. \n\tThe maximum amount of Charge that can be stored in the Blood Altar is a function of the number of Charging Runes that it has multiplied by the current capacity of the altar (the capacity of the altar only comes into effect if it is greater than 20k). The rate that it charges is also related directly to the speed of the altar times the number of Charging Runes it has, and it will convert LP into Charge once every 20 ticks (one second). So if you were to design a Blood Altar with this rune, careful consideration will have to be made for all of the synergistic relationships that it has. -guide.bloodmagic.entry.architect.acceleration.info=Unlike most runes, the Rune of Acceleration works best only when paired with other runes, and its effects only increase to a limited amount. What this rune does is it increases the number of processing ticks that can occur in a given period of time, specifically when it comes to the Displacement Rune and Charging Rune. For each rune added, the number of ticks before the next processing tick decreases by one. For instance, by default the Displacement Rune displaces liquids at a rate of one operation per 20 ticks - with 10 Runes of Acceleration, this would occur at a rate of one operation per 10 ticks.\n\tObviously the maximum number of Acceleration Runes that presently matter is 19 - if you have this many, the Displacement Rune and Charging Rune will both activate their effects each tick. Noice! - -guide.bloodmagic.entry.architect.tier3.info=It is well known that a Tier 3 altar requires you to cap four pillars with glowstone blocks from the Nether. What is not as thoroughly understood is that you can actually use Sea Lanterns instead. So if you find yourself very far away from going to the Nether but have access to ocean temples, you can use other ways to advance yourself in Blood Magic. - -# Demon Kin Entries -guide.bloodmagic.entry.demon.intro=Bella Highborn -guide.bloodmagic.entry.demon.snare=Demon Will and Snares -guide.bloodmagic.entry.demon.forge=Hellfire Forge -guide.bloodmagic.entry.demon.petty=Petty Tartaric Gem -guide.bloodmagic.entry.demon.sword=Sentient Sword -guide.bloodmagic.entry.demon.lesser=Lesser Tartaric Gem -guide.bloodmagic.entry.demon.reactions=Unexpected Reactions -guide.bloodmagic.entry.demon.sentientGem=Sentient Armour -guide.bloodmagic.entry.demon.routing=Item Routing -guide.bloodmagic.entry.demon.aura=Demon Will Aura -guide.bloodmagic.entry.demon.types=Different Will Types -guide.bloodmagic.entry.demon.crucible=Demon Crucible -guide.bloodmagic.entry.demon.crystallizer=Demon Crystallizer -guide.bloodmagic.entry.demon.cluster=Demon Crystal Cluster -guide.bloodmagic.entry.demon.pylon=Demon Pylon -guide.bloodmagic.entry.demon.gauge=Demon Will Aura Gauge - -# Demon Kin Entry Texts -guide.bloodmagic.entry.demon.intro.info=My name is Bella Highborn, and I am known as the Demon Kin. Several months ago my village was attacked by a wave of demons, killing all other people while destroying every single building. I don't remember much from the attack, other than the screams of pain as each and every person I knew left this world for a happier one. Thankfully the demons did not hear me as I cowered underneath the fruit baskets in the basement of the church of Intactilis, trying desperately to keep my screams from joining the chorus of other voices. \nThere was one horrible moment when I accidentally knocked down the incense altar of the church and a demon came bounding into the sanctuary, unperturbed by what we assumed was a sacred place. It was a huge four-legged monster, with curved tusks hanging past a jutting mouth, saliva dripping onto serrated swords taking the place of his claws. It took a look around the room and I swear it locked eyes with me for a solid second, but then it just simply left as if it neither heard nor saw anything. Everything afterwards was a blur. \nIt was a full day before anyone came to see what happened. A trading caravan saw the smoke in the distance and decided to take the long way around past the demons. Many of the traders didn't even want to look at me, fearing that because I alone managed to survive unscathed it was a bad omen. But two brothers decided to take pity on me and try to convince the rest of the caravan to consider having me ride along. It took me selling the priestess's wand and locket, but I managed to buy safe passage to a village far enough away from the demons' path of destruction. -guide.bloodmagic.entry.demon.snare.info.1=Magus was telling me one day that every living being has a soul: humans, chicken, sheep, and even creepers have this life force that would give the body the will to live. It seems that Magus has done a lot of experiments in his time, and has even heard of a powerful mage that could take these souls and transfuse them into empty vessels such as zombies. But that made me wonder: if zombies and skeletons did not have souls, how is it that they had a will to live? What animated them so that they would try to hunt down any living creature and try to kill them? \n\tIt all came back to will, each and every single time. Anything "living" had to have a will in order to survive, but it didn't mean that it had to be their own. When I brought this up to Magus he pondered a little, and then brought out a blackboard and chalk (from where, who knows) and started to sketch some notes about other forms of magic. "In Thaumaturgy," he said while sketching out the form of a straw man, "golems are animated beings that are tasked to perform many mundane operations. They live, breathe, and can even die if they fall out of favour with their masters. In the current iteration of Thaumaturgy, and yes there have been several versions of this art over the centuries, the magician would imbue their will into their inanimate creation and bring them to life.\n\t"That, Bella, is how golems operate: by an imbuement of will."\n\tSo if a golem could live by another entity imbuing its will into an empty shell, maybe some other entity is imbuing its will into the bodies of the dead, bringing zombies and skeletons into existence. At this point I shivered, remembering briefly what happened in my old village. Only a demon could do something so cruel. But to test this hypothesis, I needed more proof. -guide.bloodmagic.entry.demon.snare.info.2=With some direction from Magus, and Tiberius when he could lend a hand from his own work, I made myself a rudimentary snare out of some iron, string, and a bit of redstone. Tiberius, who studied Thaumaturgy in-depth as his cross-discipline magic of choice, said that the snare should be able to disrupt the will of an entity that is controlling an animated object. "I was messing around with this when playing around with golems," he said with a smile. We all knew how well that turned out. "Redstone seemed to disrupt the connection between my golems and my will for them to move. In theory, if something is controlling the zombies or skeletons, you should be able to cut off the will."\n\tHe said that all I needed to do was to throw it - if it worked, some white dust should stream off of the entity for a period of time. "So you have to kill it after this happens in order for anything to really happen. But the snare might only work 25%% of the time, so be slightly liberal with them!"\n\tAfter crafting sixteen of them, I went out with my sword during the night. It was quite tricky, actually: I had to track down several zombies, ducking and dodging their lumbering swipes while chucking a few snares at them. Once the white particles came off of them, I killed them swiftly and picked up what was left of their bodies. A small amount of a blue viscous fluid seemed to lay in the gritty dust, beckoning to me. I picked it up, and it seemed like there was some otherworldly "presence" coming from the fluid. Quickly stowing the samples away, I elected to look at them more deeply when I got back home. \n\tIt seemed that the size and shape of each "Demonic Will" varied, as if the quality of the will depended on the source. Using a completely arbitrary unit of measurement, the Will that I got from the snares seem to range from zero to five "Will Quality". I am not sure what I can use this substance for yet, but it is very intriguing none the less. I can't tell if this is the imprint of the will of some sort of demon, or just a random crystal found in their bodies. More research is needed. -guide.bloodmagic.entry.demon.forge.info.1=I have spent several weeks researching the uses and properties of demonic will. There has been some success these past few days, however it has been infrequent. Tiberius asked me the other day if he could take a sample of demonic will for a few of his other experiments: he mentioned that it might be what he needed to construct a new blood altar to replace the beat-up basin that we were using in Magus's basement, since trying to replicate that old thing with just stone never seemed to create the right... receptacle for our blood magic. In other words, he thinks it may help.\n\tIt hasn't been a complete waste, however! I consulted several different alchemy textbooks discussing "Equivalent Exchange" and the many different ways to manipulate matter. I also talked to a couple of alchemists that were passing by, and they gave me a few tips on how to deconstruct matter and energy in order to study it more closely. (As a side note, I must say I loved the dark purple armour that one alchemist was wearing - just looking at it made me feel like I was being pulled by a dense object. Not talking about Tiberius, either!) From using those simple arrays with the little samples that I had, I managed to see that there were ways to actually tap into the power source inside of the demonic will. I just needed the right configuration. -guide.bloodmagic.entry.demon.forge.info.2=Just today, I managed to get a structure that I believed would fuse together items using this raw will. Dubbed the "Hellfire Forge", the structure uses a simple alchemy array carved into the glass on the top of it to fuse up to four items together while injecting it with demonic will. The piece of demonic will is placed on the right-hand side and the four ingredients are placed around the circle. It appears that there are many different "recipes" available in this forge, but there are some gating effects on these. \n\tFor starters, there is a minimum amount of demonic will that has to be in the sample in order for the items to combine - if there isn't enough will in the structure, nothing seems to happen. Next, it seems that although there is a minimum amount of will needed, most of the recipes don't drain the entire sample of its will. Some recipes need a vast amount of demonic will in order to start the process, but only a little bit is used in the crafting, if any at all. Some recipes seem to be very easy to create in large quantities, but others... not so much. -guide.bloodmagic.entry.demon.petty.info.1=I went out on one of my now-daily nighttime adventures in order to harvest some demonic will when I began to realize one of the major problems with the collection method: my bag kept on getting full from all of the samples! For some reason, perhaps because the ultimate source of the demonic will is different for each sample, the will would not compress into a more manageable form. At least the physical manifestation of the will. \n\tThus, I went to work with the hellfire forge that was nestled in my corner of the house, pushing aside some of Tiberius's least unpleasant experiments and getting some raw materials for my own study. One of these days I am going to make Tiberius his own forge, since I am tired of trying to get rid of all of the dust that coats my workplace from his "arcane experiments". I don't care that you are "trying to bridge the gap between the ethereal strands of the Soul Network and the physical construction of the slates", get your damned ash out of my stuff! -guide.bloodmagic.entry.demon.petty.info.2=Anyway, it did take a while in order to find materials that were most likely to resonate with the demonic will in order to store it in a better manner. Lapis seems to be the most readily available conductor of this energy, acting as a pathway for the will to be channeled. After adding some redstone to act as a shielding from electric fields in the air (adding two energies together seem to cause disastrous effects, at least that is what Magus said), gold as a dampening agent, and glass as a simple housing, I managed to create a very simple "Tartaric Gem". This means "a gem from the underworld, Tartarus."\n\tAfter further tests, I found out that this gem could hold up to a will quality of 64. (When I presented these findings to Magus, he remarked that it seemed like a nice, round number.) When I tried to pick up demonic will afterwards, it seemed to go directly into the gem unless full - after that, the will just seemed to... disappear. Convenient for my backpack, but otherwise a mystery. I also learned that if I hold the gem in my hand and focused (right clicked), about 10%% of the maximum capacity of the gem would flow into other gems I had on my person. I think this last feature is very helpful, especially if we were to find other, more powerful tartaric gems. -guide.bloodmagic.entry.demon.sword.info.1=My snares got tangled again.\n\tIt doesn't seem to matter how much I try to improve the design of them, the rudimentary snare never seems to work perfectly. It just gets tangled most of the time, and when I finally do manage to hit a zombie with it it's more likely to not work than work. In order to stop myself from pulling my own hair out, I went to the forge again and got to work right away.\n\tWell, not right away, since I had to first clean the ash off the top of it again. -guide.bloodmagic.entry.demon.sword.info.2=I infused the demon will-holding capabilities of the petty tartaric gem with an iron sword, and managed to create a blade that... was very dull and hardly did more damage than my fist. I was actually very disappointed with the outcome, because it took a long time of fiddling with the forge so that it would not overheat from the strain of using a petty tartaric gem as its power source.\n\tHowever, as soon as I picked up my Tartaric gem, the sword started to glow with a new energy. It seems that the higher the amount of demonic Will I have on my person, the more damage I seem to do with the sword as well as the more demon will that drops. Whenever you don't have a gem, the Will amount is very... miniscule.\n\tAfter a bit of testing I came to another realization: depending on what I kill, I receive different amounts of Will. It seems proportional to the amount of maximum health that the monster has - a spider, since it has a max health of 8 hearts gives 80%% the Will of a zombie, which has 10 hearts. This is probably because these monsters require more Will to animate. I should keep this in mind for later. -guide.bloodmagic.entry.demon.lesser.info.1=I was chatting with Tiberius today, discussing some of the projects that he is working on. I must say, when we start talking about his research it seems that he just keeps going on and on and on! Anyway, one of the recent inventions he wanted to talk about was his sigils: so far he managed to create a Water Sigil and a Lava Sigil, using the Hellfire Forge I finally constructed for him as a means to create them. I wasn't entirely sure how he actually made them - I knew he experimented by taking some ingredients and combining them inside of the forge using the tartaric gem as a catalyst, but I haven't actually seen him actively experimenting yet. Well, I got some insight finally as to what he uses that blasted ash for.\n\tLet's see if I can mimic what he said properly. Ahem. "By using the Demon Will contained inside of these gems to transmute the ingredients, a reaction occurs between things that normally don't do anything when combined. By harnessing this forced synergy, I am able to inscribe several arcane symbols in patterns that will direct the energy that I add myself to perform the desired task." Although it doesn't show well in writing, picture me saying this while pushing glasses up the bridge of my nose. I'm not sure if he's normally like this, but I swear he gets all... science-y when he explains things to me.\n\tAt any rate, he showed me how he created a Water Sigil by demonstrating it to me. After the, admittedly flashy, demonstration, he then got to the meat of the discussion. "When I try to replicate this process with some more advanced materials, it seems that the reagents tend to... explode when added to the alchemy array. They seem very unstable. My thinking is that the ingredients aren't getting properly fused together - perhaps there is not enough energy in the forge to fuse them properly."\n\tAfter thinking about this for a few minutes, I got to work - as I mentioned in a previous entry, I figured that a more powerful Tartaric gem would be required, but I still haven't figured out exactly how I could do this in an elegant way. So, I decided that a brute-force approach would be sufficient for this! -guide.bloodmagic.entry.demon.lesser.info.2=I took a block of lapis, block of redstone, and a diamond as well as an empty petty Tartaric gem that I had lying around - part of a past experiment that... didn't exactly go very well. All I can say about it is that I am surprised Magus can make holes in a solid concrete wall simply disappear. I then combined these four items in the Hellfire forge with a filled petty Tartaric gem to act as a power source - a minimum of 60 Will seems to be needed. After a bit of effort trying to find an optimal arrangement, I then set them together and watched as the empty Tartaric gem started to grow inside of the forge.\n\tJust as a side note, I tried using a block of gold instead of a diamond to grow the gem, but it seems that having another crystal structure was more beneficial.\n\tThis new, "Lesser Tartaric gem" seems to have a much larger capacity, able to hold a total of 256 raw Will. Hopefully this is enough to sate Tiberius's need for large amounts of Will for a while. But alas it seems that I will need to fill up this gem. Another long night is ahead of me! -guide.bloodmagic.entry.demon.reactions.info=I woke up in a hospital bed today, aching something fierce. I opened my eyes and saw the dull magenta that made up the ceiling of the "Intense Curse" wing of the hospital in Veteres, which is the closest major city to our village. I wasn't exactly worried by this information: it more so puzzled me that I somehow ended up here while seemingly only covered in scrapes and bruises, plus a simple cast on my left leg. Someone must have cast an "Ossa Fracta" curse on me or something, since all it could be was a simple broken bone! \n\tWhen Magus came in with one of the nurses with a solemn face, I knew it was something more drastic. Apparently, one of my experiments with the new Lesser Tartaric gem rebounded and created a small but forceful explosion. That much I could understand easily enough, but that wasn't it: the mixture of obsidian, iron and diamond that I used coated my lower left leg, forming into a rigid shell that couldn't be removed. The cast that I had on my leg wasn't actually a cast, but some form of runic matrix covering the light-blue shell. \n\tCalmly, I asked what Magus thought, even though I was pretty sure what had occurred. "I think," he said, giving a side-long glance towards the nurse that was listening intently before looking back at me, "that it is simply some sort of residue that is diamond-based, which is the main reason we can't remove it. It is also laced with a bit of... otherworldly energy, which is the main reason that you are here instead of a bed at the local clinic - the Conglomerate is rather stringent about unknown energy directly contacting people, ever since the Eldritch Incident, so we had to make sure that there wasn't any issues."\n\t"I see..." Normally Magus doesn't bother much with formalities such as making sure that the Conglomerate is informed about unknown energies - I've been experimenting with Demon Will for quite a while, and it isn't like the Conglomerate came knocking on our door to have this magic registered. I won't go into much detail here, since I am not well versed in politics, but I know that Magus partakes in it only sparingly. This meant that the power from this Will concerned Magus a lot, perhaps through some of his past dealings...?\n\t"Ah well, enough about that for now," Magus said, rolling up the sleeves of his robes. "I tried to break the shell when I first saw it, obviously after checking what it was. It didn't have an effect last time, but now..."\n\tThere was a searing heat on my left leg, accompanied by a blinding red light as Magus cupped his hands on top of the blue shell. After what felt like an eternity, but what must have been only a couple of seconds, the shell started to crack and fracture, falling apart. Honestly, it was kind of anticlimactic. \n\tI tried to get up, but Magus pushed me back into the bed with a small shove. "Bella, you need to stay and rest. You can work with your research on the gems later." I was initially annoyed, but that soon passed as I had a lot of time to think. The only reason that Magus wasn't able to do the exact same thing earlier was probably because I still had my Tartaric gem on my person after the explosion. So whatever happened to my leg had to be directly tied to the demon Will, and as soon as my gem was taken the shell was able to be removed. It got me thinking... -guide.bloodmagic.entry.demon.sentientGem.info.1=After a few days of some "well needed bed rest," prescribed and enforced by Magus, I decided to do a bit of research primarily on the sentient equipment that I have made so far. There is just so much that I do not know about the sentient sword as well as Demon Will in general. Sure, we know some of the theory, but considering that Magus and I were the ones that developed the theory in the first place it is hard to tell how accurate it is.\n\tFor this, I needed to get creative. Magus told me that whenever he takes an apprentice, he insists that they must learn another form of magic alongside the research that he is doing. Tiberius offered for me to learn Botany, but I scoffed at the idea - a bunch of flowers weren't going to help me much when fighting demons! -guide.bloodmagic.entry.demon.sentientGem.info.2=The Sentient Armour Gem is a toggleable item that is used to equip and unequip your Sentient Armour. When you right-click with the gem while you have a minimum of 16 Demon Will in your inventory, your armour will be replaced with a set of Sentient Armour that copies all of the enchants from the armour that you replaced - when you activate the gem again, your original armour is returned to you. This also works when you have no armour on at all to begin with.\n\tThe Sentient Armour initially acts as a simple set of iron armour, yielding no additional abilities besides protection. Similarly to other sentient tools, however, the armour provides more protection when you have more Demon Will in your possession. This makes the protection provided really powerful when you have a large quantity of Demon Will accumulated. The downside to this is that every hit you take will syphon a small bit of Demon Will from your Tartaric gems, and if you get too low your armour will revert back to its original form. Could be bad! -guide.bloodmagic.entry.demon.routing.info=Item transport in Blood Magic comes from linking strands of Demonic Will between routing nodes, which act as conduits in order to transfer items from one inventory to another. To start off with, let us explain how each individual item works.\n\tEvery single routing system needs a Master Routing node, which acts as the brains of the system. An Input Routing node inputs items into your system, and an Output Routing node outputs items from your system, and a regular routing node doesn't have any special function.\n\tTo form a network, you need to shift-click a node with your Node Router and then shift click another node that you want to connect. This links the two nodes together. As long as a node can trace some form of route to another node (and if it is connected to a Master Routing node) they can "talk" to each other.\n\tAs a rule of thumb, items are pulled from an inventory next to an input node and are pushed into an inventory next to an output node. In order to set what goes where, a filter should be used. By clicking on one of the buttons in the node's interface you can select what goes into the inventory in the given direction (N indicates North, etc). If you place an Item Filter into the left-most slot of the node you can specify the quantities and types of items that the node may interact with based on the filter. If you set a filter on an input filter, you can only pull those types of items from the inventory (keeping at least the given amount if you specify a quantity). If you set a filter on an output filter, you can only push those types of items into the inventory, up to a max of the quantity specified.\n\tThere are four types of filters: \n\tPrecise - The item needs to be matched exactly, including NBT and metadata\n\tMod Item - The item matches if it is from one of the filered mods.\n\tIgnore NBT - The item filter does not take into account any NBT\n\tOre Dictionary - Any item that matches one of the ore dictionary references of the filters are allowed.\n\tThere are two numbers that you will be able to see when you insert the filter into the routing node: the quantity and the priority. When you click on one of the items in the filter, the name of the item you have selected will appear and right below that is the quantity of items. By setting this number you can tell the filter how many of this type of item it will keep in stock in the connected inventory (either filling to that amount if it is an output node or making sure it keeps that amount left in the inventory if it is an input node). If you decrease the filter's amount to 0, you can set so that the filter allows "Everything," as in any amount, for that particular filter. Input nodes will pull as much as it can from the inventory, and output nodes will push as much as possible.\n\tThe second number is the priority of the node, altered by the arrow buttons next to it. This number is different for each side of the node. The node that has the LOWER NUMBER in the network will be used first. -guide.bloodmagic.entry.demon.aura.info=When an entity is killed normally, it evaporates over time and returns to the creator. When captured in a snare, it is pulled into this plane from the ethereal and is sort of stuck. We have, for all intents and purposes, broken its programming and it has frozen all action. When we burn it, it returns to an ethereal state and is able to resume normal operations. If this Will is injected into the air, we can then harness it in a variety of ways. Some of them are mundane in nature, whereas others are quite powerful.\n\tDemon Will when injected into the air stays within the chunk that it was put in without migrating. Each chunk has their own stored Will, with each type of Will stored individually (more on that in a different section). This Will can be accessed and manipulated by other blocks and items. -guide.bloodmagic.entry.demon.types.info=So far, the only type of Demon Will that we have discussed is raw Will. As the name suggests, it is the most raw and unadulterated form of Will there is, but this does not mean that it is pure. In fact, Demon Will takes on many different forms: Raw is the type we deal with normally, but there is also Corrosive, Destructive, Vengeful, and Steadfast. Raw Will is composed of a mixture of all four of these types, and perhaps mixed with other as of yet undiscovered types, but once split into these different Will types it seems impossible to recombine them.\n\tIt is not clear yet whether these different types of Will come from different sources, however we do know the process of generating these different types of Will. The Ritual "Resonance of the Faceted Crystal" can split a Raw Will Crystal into its pure parts, more on that in the corresponding entry in "The Ritual Master". A device able to obtain Raw Will Crystals is the Demon Crystallizer, whose entry can be found further down.\n\tEach of these four types of Will represent different aspects of one's desire. There may be more types of Will, however they are either not pure enough or simply cannot be created in this form.\n\tCorrosive represents the desire to break down all things around oneself, either with acid or by crushing force. One who can master this Will can wield debilitating status effects and are immune to horrible poisons.\n\tVengeful can be viewed as the desire to seek a target without tiring. Usually, this can be seen either as an increased speed of the body to seek their prey or to make sure that a target is not able to get away as you continually attack them.\n\tDestructive, as you can probably tell, is pure force. Attack strength and overall physical prowess can be gained if this Will is properly harnessed. It can also be used to crush and smash things when used in other applications.\n\tSteadfast is seen as the desire to prevent damage to oneself. In most cases, masters of this Will are the defensive bulwark of the party, able to withstand powerful attacks and not even feel it. If you need to stay alive, through your armour or by rituals, this is one choice that should be considered. -guide.bloodmagic.entry.demon.crucible.info=The Demon Crucible is a device that is able to burn the Demon Will inside of a Tartaric Gem and other items in order to inject it into the Aura of the chunk that it is in. There are a few different ways to use the crucible: one of the simplest ways is to place a Tartaric Gem inside of the crucible by right clicking on it with a gem in your hand. The crucible will then in that case drain the Will from the gem until either the Aura is saturated with that type of Will (a max of 100 by default) or until the gem is empty.\n\tAnother mode is to use the contained Tartaric Gem to drain the Will from the Aura - this is done by applying a strong redstone signal to the crucible and then the contained gem will attempt to drain as much Will as possible.\n\tFinally, a discrete piece of Will can be burned in the crucible if there is enough room in the Aura of that type. One example of this is a Demon Will Crystal, which has a value of 50. -guide.bloodmagic.entry.demon.crystallizer.info=As discussed previously, Demon Aura is the ethereal manifestation of Demon Will, and the substance obtained when killing a mob is its physical manifestation. The Demon Crystallizer acts as an anchoring point for Demon Will in the Aura to latch on to, transforming the ethereal Will back into a physical form once again in the form of a crystal.\n\tYou may be curious why you do not just take the Will from a Tartaric Gem directly and form a crystal from it. That is because by transforming the Will to its ethereal form we purify it and allow the Will to attempt to resume its normal operations - keep in mind that when we kill a monster with Demon Will attached to them, we freeze the programming of the Will so that it cannot do what it was sent out to do. By converting it into the ethereal form in the Aura, the Will becomes more active, and that is the Will that is grabbed by the crystallizer. Just don't look at it funny.\n\tIn order for the Demon Crystallizer to work it must be in a chunk with a high amount of Demon Will (80) of a particular type, and after a certain amount of time it will consume the Will from the Aura in order to create a Demon Crystal Cluster with a single spire. There are two ways for the Crystallizer to work: it can form a crystal from an aspected type of Will (Corrosive, Destructive, Vengeful, and Steadfast) if there is enough Will of that particular type, or it will take Raw Will from the Aura to create a crystal. \n\tIn previous incarnations of the device it was possible to transform Raw Will from the Aura into differently aspected crystals. However, that is no longer the case: you can still create new spires of a certain aspected Will if there is enough of it in the Aura, however you will need to look into other means to separate the many aspects from Raw Will. See the entry on "Resonance of the Faceted Crystal" in The Ritual Master for more details. -guide.bloodmagic.entry.demon.cluster.info=The Demon Crystal Cluster can either be created by a Demon Crystallizer or by crafting one in the Hellfire Forge with Demon Will Crystals. Crafted clusters can be placed on any solid surface, such as the floor, walls, and ceilings. There are a max of seven spires on the crystal when fully grown, and when broken with a pickaxe it will drop the spires as Demon Will Crystals. However, if you right-click the cluster when you have a Tartaric Gem with more than 1024 Raw Will inside of it, you can break off a single spire from the cluster without breaking the cluster itself; this will never break the main spire from the cluster.\n\tWhen left to its own devices, the cluster will syphon some Will of the same type from the Aura to grow itself slowly. This process is a bit slow, but there is a minor net gain.\n\tThere are two rituals that are used to grow and harvest these crystals: the "Gathering of the Forsaken Souls" and the "Crack of the fractured Crystal". In order to find out how to use them, please refer to The Ritual Master. -guide.bloodmagic.entry.demon.pylon.info=As you may know, Demon Aura remains in its own chunk if there are not any outside influences. Well, this is one of those influences. The Demon Pylon acts as a beacon for Will in the Aura, pulling the Will from neighbouring chunks (those chunks that are directly next to it in the four cardinal directions, not diagonal) into its chunk. The Pylon will attempt to equalize the Will in its chunk with its neighbour so that the Pylon's chunk has as much Will as its highest neighbour for each Will type. This process only happens one way, however: if the neighbouring chunk has less Will in it than the Pylon's chunk, the Will will not transfer the other direction. -guide.bloodmagic.entry.demon.gauge.info=In order to tell how much Will you have in a given chunk you need to have a Demon Will Gauge. When in your inventory, the gauge will display the Will in the chunk that you have in five bars in the top-left corner of the screen. You can tell how much there is exactly by shifting; numbers will appear to the right of the bars to give the amount rounded to the nearest whole number. - - - -# Alchemy Entries -guide.bloodmagic.entry.alchemy.intro=Introduction -guide.bloodmagic.entry.alchemy.ash=Arcane Ash -guide.bloodmagic.entry.alchemy.speed=Movement Array -guide.bloodmagic.entry.alchemy.updraft=Updraft Array -guide.bloodmagic.entry.alchemy.bounce=Bouncing Array -guide.bloodmagic.entry.alchemy.turret=Skeleton Turret Array -guide.bloodmagic.entry.alchemy.buff=Buff Arrays -guide.bloodmagic.entry.alchemy.fastMiner=Fast Miner Array -guide.bloodmagic.entry.alchemy.furnace=Burning Furnace Array -guide.bloodmagic.entry.alchemy.teleport=Teleportation Array -guide.bloodmagic.entry.alchemy.standardTurret=Turret Array -guide.bloodmagic.entry.alchemy.laputa=Shard of Laputa - - -# Alchemy Entry Texts -guide.bloodmagic.entry.alchemy.intro.info=My name is Vlad Highborn, and I am a Blood Mage. I have studied the intricate workings of alchemy and the process of "Equivalent Exchange," which governs all aspects of magic. Basically, you cannot create something from nothing, although many have tried when searching for a particular stone. That obviously didn't end well, because people are clamoring for a fake variant even today. Of course simply saying that I am an alchemist isn't enough, because one of the main things I do is study Blood Magic with The Ritual Master and The Architect, both of whom have achieved those titles by their own merits. Magus and Tiberius have been busy recording their own works over the years, although I don't think Magus has everything written down in a book - I have yet to find any actual proof.\n\tMy book deals with all things alchemical in Blood Magic. From the uses of Arcane Ash to the intricate workings of the Alchemy Table, you will find everything you need to know about some of the more complex elements in the world. Not everything you need to know is in this book - for a full understanding about Blood Magic, you will need to read the other entries in this entire tome.\n\tBut for now, I hope you enjoy my research notes. You shan't find any lies between these covers. -guide.bloodmagic.entry.alchemy.ash.info=Arcane Ash is necessary in order to create alchemy arrays, powerful circles that are able to provide various effects. This ash is crafted using the Hellfire Forge and Demon Will, so if you are new to this concept please consult the "Demon Kin." \n\tThe ash has a total of twenty uses before you need to craft another. When you right click on the ground (or a wall, though it will only render one direction), you will inscribe a simple circle out of ash. If you click on the ash again with an item, it will be "placed inside of the ash" - assuming that this item is valid, the circle will change shape to represent that it is ready for the next item. If it doesn't change shape, then you did something wrong.\n\tOnce it has changed shape, you can then place in the secondary item. If this item matches with the first item, the circle will start rotating and performing different actions depending on the recipe it is working on. \n\tEvery non-crafting effect that can be performed using these arrays can be found in this book, and even if the recipe changes through 3rd party means it will show updated here. The items shown are the order they need to be placed in. -guide.bloodmagic.entry.alchemy.speed.info=The Movement Array creates a small vortex of air at its center and uses a small amount of energy to heat it up. After that, once an animal or any other type of entity walks into its area of effect, they will be launched forward in the direction that it was placed in by the force of the air. What is more, if fallen onto from a large height, the array will eliminate the fall damage that would have incurred. Just be prepared for some mild motion afterward. \n\tThe direction of motion is in the direction of the arrow on the array.\n\tIt should also be noted that you will gain a much greater distance if you fall or jump onto the array than if you simply walked into its area. This has to do with the turbulence from your movements causing a much greater reaction. -guide.bloodmagic.entry.alchemy.updraft.info=Using the exact same principles as the Movement Array, this array launches the entity that steps on top of it vertically in the air. Naturally, any user would have to be careful because the way down may be a little arduous! -guide.bloodmagic.entry.alchemy.bounce.info=By using a source of heat near its center that is pushed downward, the array attempts to soften the ground underneath it. After it has done this, it then converts carbon and hydrogen into a rubbery material inside of the earth. This combination causes any entity to impact the surface to bounce in the air and eliminating the fall damage that would otherwise be sustained. This bouncing can be stopped by simply shifting, and it will still cushion your fall. -guide.bloodmagic.entry.alchemy.turret.info=By utilizing the Demon Will that is still controlling a mob, you can take over the mind of a skeleton in order to make it do your bidding. If a skeleton finds itself inside of the area of this array, it will act as a sentry and attack hostile monsters nearby. Unfortunately this array is still highly experimental, so it may not work very well or consistently. -guide.bloodmagic.entry.alchemy.buff.info=Through rigorous study, you realize that alchemical arrays have a wide range of applications. So far, you have managed to create powerful items through crafting arrays, as well as a couple of arrays that provide functional benefits such as rapid movement and weak forms of teleportation. However, one of the uses that you have yet to tap into is providing powerful buffs through an active array.\n\t"Buff Arrays" are the general term for alchemy arrays that provide some buff to players within its area of effect. These areas of effect tends to have a very large radius which cannot be manipulated (unlike Rituals). However, because alchemy arrays have no concept of a Soul Network, they have to power their effects through other means: mainly through direct blood offerings. In simplified terms, this means that whenever the array will apply a buff, it will damage (take HP) from the player that it is cast on. \n\tBecause of the direct nature of these sacrifices, the HP -> buff conversion is a lot more favourable for players in the early game compared to similar buffs in the mod. For instance, if a buff from a sigil cost 100 LP for 10 seconds of activation, a more powerful buff can be applied by the array for 30 seconds for 1 HP (which is 100 LP in a T1 altar with no runes). This can be seen as a lot more efficient in the early tiers, while during the later tiers it is not as efficient of an effect. However, because of the stationary nature of the arrays, they will tend to provide a stronger effect than their sigil counter parts, so people may wish to still use it in the late-game. -guide.bloodmagic.entry.alchemy.fastMiner.info=When tasked with carving out a large area of land, sometimes it is best to just do it by hand. For those occasions, this array is for you. The array applies a Haste III buff to players within a 10 block radius, costing the user 1 HP per 30 seconds. Because it is a general Haste buff, it will also increase your attack speed while in its area of effect, though you will have to be careful since other players will benefit from this too! -guide.bloodmagic.entry.alchemy.furnace.info=One of the many problems that you may encounter in the beginning of your adventure is the inability to keep your furnace lit. A lit furnace can mean the difference between having a full stomach and strong weapons or starving in a cave. \n\tThe Burning Furnace array, as the name implies, will provide a much needed heat source for any nearby furnace. By placing the array directly adjacent to a vanilla furnace (it can be next to multiple), it will provide fuel to the furnace if an operation is able to be completed - nothing will happen if it is next to an empty or a full furnace, mainly for your protection. \n\tThis does not come for free, however: when a person is nearby (within a 10 block radius), it will take away half a heart of health in order to cook up to two things in the furnace. This will be helpful to either get a quick bite or to smelt a full stack of ore, but unfortunately you haven't found a way to add any safety measures to the array... -guide.bloodmagic.entry.alchemy.teleport.info=The Teleportation Array acts as a way to travel instantly from one location to another with a few specific limitations. When a player or other entity steps onto the array, the array will search up to 20 blocks away in the direction it is facing for another alchemy array (which does not need to be active). If the array manages to successfully find a destination, it will then teleport the entity to its found array instantly, even through walls. \n\tStudying this array has shown that there are further limitations added to it: because of the nature of bending the fabric of space-time, a Teleportation Array will not teleport something that has teleported within 2 seconds. This is to allow time for all components to rearrange themselves in a desirable manner. -guide.bloodmagic.entry.alchemy.standardTurret.info=The power of flinging pointy objects at far away monsters cannot be overstated. The Turret Array is able to sense a nearby hostile monster and by utilizing complex alchemical mechanisms it is able to draw back and fire an arrow in order to strike its target. \n\tThe array searches for an inventory directly beneath it. If it finds either a normal or tipped arrow it will syphon from its container and fire at a mob that is within a 32 block radius. \n\t(Due to some silly Minecraft physics that has arrows bounce off of entities that are too close to where they spawn, the turret will also only fire on a mob that is greater than 3 blocks away. Keep that in mind!) -guide.bloodmagic.entry.alchemy.laputa.info=There exists a story of a lost kingdom that had such advanced magic that it could fly through the clouds. Although this kingdom has since crumbled to dust, a few drawings of this castle in the sky has managed to provide exquisite detail as to the mechanisms that allowed it to become the legend that it is. \n\tThe Shard of Laputa converts the life essence that is found within the earth into a more avian form, causing the surrounding area to levitate in the air. While the underlying principle is simple, the variations of the life essence in the earth cause a bit of inconsistency in how much land is moved. The array will move the earth in a spherical radius between 4 and 8 blocks up above itself a random offset between one and 5 blocks plus twice the radius of the effect. \n\tIt should be noted that as soon as the effect starts, all items used to activate the array will be lost. diff --git a/src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang b/src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang deleted file mode 100644 index 236db6e7..00000000 --- a/src/main/resources/assets/bloodmagicguide/lang/ru_RU.lang +++ /dev/null @@ -1,239 +0,0 @@ -# Book Information -guide.bloodmagic.title=Ðаука крови -guide.bloodmagic.display=Ðаука крови -guide.bloodmagic.author=Blood Magic -guide.bloodmagic.welcome=Blood Magic - -# Page Information -guide.bloodmagic.page.bloodAltar=Рецепт Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ -guide.bloodmagic.page.soulForge=Рецепт Кузницы ÐдÑкого Пламени -guide.bloodmagic.shapelessOrb=БеÑформенный рецепт шара -guide.bloodmagic.shapedOrb=Форменный рецепт шара - - -# Categories -guide.bloodmagic.category.architect=Ðрхитектор -guide.bloodmagic.category.ritual=Ритуал МаÑтер -guide.bloodmagic.category.demon=Демон Кин -guide.bloodmagic.category.spell=Боевой Маг -guide.bloodmagic.category.alchemy=Ðлхимик - -# Ritual Master Entries -guide.bloodmagic.entry.ritual.intro=Ð’Ñтупление - -# Ritual Master Entry Text -guide.bloodmagic.entry.ritual.intro.info=Добрый вечер. ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ ÐœÐ°Ð³ÑƒÑ Ðркана. За Ñти годы у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¾ много обликов: вор и дружинник, волшебник и воин, бродÑчий кочевник и даже политик. Ðазвание, которое Ñ Ð´ÐµÑ€Ð¶Ñƒ в наÑтоÑщее времÑ, - Ñто то, что многие не могут понÑÑ‚ÑŒ, что при Ñамом упоминании о нем возникают образы жеÑтокоÑти, которые в некоторых ÑлучаÑÑ… были заÑлужены, но во многих других введены в заблуждение. Я, конечно, говорю о том, чтобы быть Кровавым Магом, Ñ…Ð¾Ñ‚Ñ Ð¼Ð¾Ð¸ Ð´Ñ€ÑƒÐ·ÑŒÑ Ð¿Ñ€Ð¾Ñто называют Ð¼ÐµÐ½Ñ ÐœÐ°Ð³Ð¾Ð¼, тогда как мои враги называют Ð¼ÐµÐ½Ñ ÐœÐ°Ñтером Ритуала.\n\tМои ученики приÑтавали ко мне уже много меÑÑцев, пытаÑÑÑŒ заÑтавить Ð¼ÐµÐ½Ñ Ð·Ð°Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ вÑе беÑчиÑленные приключениÑ, которые у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¸, в какой-то форме книги, которую Ñ Ð¼Ð¾Ð³ бы раÑпроÑтранÑÑ‚ÑŒ Ñреди любых начинающих магов. Я был наÑтойчив, но Ñто был Тиберий, который выразил Ñто лучше вÑего: Â«Ð¥Ð¾Ñ‚Ñ Ð²Ñ‹, возможно, и Ñами не Ñможете оценить его ценноÑÑ‚ÑŒ, уÑлышать тонкоÑти любого рода ремеÑла от человека, который доÑтиг маÑтерÑтва в Ñтой облаÑти, окажетÑÑ Ð½ÐµÐ¾Ñ†ÐµÐ½Ð¸Ð¼Ñ‹Ð¼ Ð´Ð»Ñ Ð±ÑƒÐ´ÑƒÑ‰Ð¸Ñ… поколений. «Ðеважно, наÑколько точно кто-то другой переÑказывает Ñто, еÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ полной уверенноÑти в иÑточнике, золотой пеÑок может быть не чем иным, как Ñерой». Ð’Ñ‹ могли бы Ñказать, что в тот момент он углублÑлÑÑ Ð² алхимию, но так как он долгое Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð» моим первым учеником, Ñ Ñклонен ценить его мнение.\n\tТак, начинающий кровавый маг, тренирующийÑÑ Ð² тайне, который многие еще делают не до конца понимаю, подайте мне уши, потому что Ñти Ñлова заÑлуживают вниманиÑ: облаÑÑ‚ÑŒ, которую вы изучаете, имеет много аÑпектов, и без тщательного раÑÑÐ¼Ð¾Ñ‚Ñ€ÐµÐ½Ð¸Ñ Ð²Ñ‹ можете обнаружить, что ваши инÑтрументы не хватает. ПоÑтому не забывайте чаÑто читать Ñту книгу - Ñ Ð²Ð»Ð¾Ð¶Ð¸Ð» много чар в книгу, которую вы ноÑите Ñ Ñобой, чтобы вÑÑкий раз, когда Ñ Ð¿Ð¸ÑˆÑƒ в Ñвоей оÑновной копии, Ñлова менÑлиÑÑŒ Ð´Ð»Ñ Ð²Ð°Ñ.\n\tТак что ÑÑдьте, раÑÑлабьтеÑÑŒ и наÑлаждайтеÑÑŒ учением очень Ñтарого человека. Ð’Ñ‹ можете узнать больше, чем вы раÑÑчитывали. -guide.bloodmagic.entry.ritual.basics.info=Современные ритуалы Ð´Ð½Ñ Ñильно отличаютÑÑ Ð¾Ñ‚ тех, которые проводилиÑÑŒ в прошлом. Было времÑ, когда люди пиÑали на земле тайные конÑтрукции из пыли и танцевали, пока не получили то, что хотели. Я даже помню одну ведьму-отшельницу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñобирала Ñнергию из ее Ñада. Я ÑмеÑлаÑÑŒ над вÑем Ñтим, пока она не накурила на Ð¼ÐµÐ½Ñ Ñвою любимую Ñову. \n\tРитуалы, которые иÑпользуют Маги Крови, требуют точного Ð²Ñ‹Ñ€Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð½Ñ‹Ñ… камней, чтобы ÑфокуÑировать и преобразовать Ñилу, которую маг накачивает в него. Однажды мой ученик Тиберий копалÑÑ Ð² некоторых Ñтарых артефактах, которые Ñ Ð¿Ñ€Ð¸Ð¾Ð±Ñ€ÐµÐ» за Ñти годы в шкафу его новой комнаты. Был флакон Ñ Ð¶Ð¸Ð´ÐºÐ¸Ð¼ Этериумом, которого Ñ Ð½Ðµ трогал целую вечноÑÑ‚ÑŒ (Ñ Ñ…Ð¾Ñ‚ÐµÐ» вернутьÑÑ Ðº Ñтому, но у Ð¼ÐµÐ½Ñ Ð½Ðµ было времени), а также хруÑтальный шар, который, казалоÑÑŒ, вÑегда говорил «вторник», когда вы вглÑделÑÑ Ð² Ñтекло. Когда одна из коробок Ñ Ð½Ð°Ð´Ð¿Ð¸Ñью «РуничеÑÐºÐ°Ñ Ð¿Ñ‹Ð»ÑŒÂ» была опрокинута на маленькую краÑную жемчужину, она упала на ногу ТибериÑ. Сразу же от него иÑходил Ñркий рубиновый Ñвет, который реагировал Ñ Ð¿Ñ‹Ð»ÑŒÑŽ в коробке, которую он неÑ.\n\tЕÑтеÑтвенно, произошел взрыв. ÐеÑфокуÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÑнергиÑ, которую Тиберий непреднамеренно выÑвободил через драгоценный камень, зажгла руничеÑкую пыль и камни вокруг него, и без ÑредÑтв ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ñилы ее проÑто вытолкнули наружу. ПоÑле неÑкольких дней в медицинÑком отделении мы Ñ Ð¢Ð¸Ð±ÐµÑ€Ð¸ÐµÐ¼ приÑтупили к работе.\n\tÐ‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñочетанию неÑкольких беÑÑонных ночей и крепкой порции кофеина (Ñ Ð´ÐµÐ¹Ñтвительно должен поблагодарить МиÑтера Плейера за поÑтавку кофе, Ñ Ð¿Ñ€Ð¸Ð²ÐµÑ‚Ñтвую ваши уÑÐ¸Ð»Ð¸Ñ Ð¿Ð¾ более бодрÑтвующему завтра!), Ð’ итоге мы уÑовершенÑтвовали ключевые ингредиенты Ð´Ð»Ñ Ð²Ñех ритуалов.\n\tÐ’ результате наших ÑкÑпериментов мы узнали, что нам нужны четыре разные вещи: нам нужна куча ритуальных камней, помещенных вокруг облаÑти по заданному шаблону, неÑколько разных чернил, которые наноÑÑÑ‚ÑÑ Ð½Ð° ритуальные камни, чтобы помочь в дальнейшем определить образец, центральный ритуал камень, который дейÑтвует как центральный канал влаÑти, и криÑталл, который активирует ритуал. Я думаю, что лучше поговорить об Ñтом один за другим. -guide.bloodmagic.entry.ritual.ritualStone.info.1=Ритуальный Камень дейÑтвует как проÑÑ‚Ð°Ñ ÐµÐ¼ÐºÐ¾ÑÑ‚ÑŒ Ð´Ð»Ñ Ð¼Ð°Ð³Ð¸Ñ‡ÐµÑкой Ñнергии, формирует ее и дополнительно перенаправлÑет по-разному в завиÑимоÑти от конфигурации камнÑ. Когда вы начинаете, еÑÑ‚ÑŒ пÑÑ‚ÑŒ различных камней, к которым у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп: ПуÑтой (базовый камень, на который не нанеÑена маркировка), Вода, Огонь, Воздух и ЗемлÑ. Каждый ритуал будет иметь неÑколько из них, и в завиÑимоÑти от того, как они раÑположены вокруг МаÑтерÑкого ритуального камнÑ, общий Ñффект будет разным. -guide.bloodmagic.entry.ritual.ritualStone.info.2=Чтобы впиÑать правильные Ñимволы в ритуальные камни, у Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть набор инÑтрументов Ð´Ð»Ñ Ð½Ð°Ð´Ð¿Ð¸Ñи. С тех пор Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð» метод, позволÑющий людÑм легче наноÑить правильные чернила на ритуальные камни, Ð¿Ð¾Ð¼ÐµÑ‰Ð°Ñ Ð¸Ñ… в правильную конфигурацию, но еÑли кто-то захочет Ñделать Ñто вручную, они могут иÑпользовать Ñти инÑтрументы. Когда вы активируете ритуальный камень Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ одного из инÑтрументов Ð´Ð»Ñ Ð½Ð°Ð´Ð¿Ð¸Ñи в руке (щелкнув правой кнопкой мыши по камню), вы нанеÑете немного чернил на камень, изменив его на тот же тип, что и инÑтрумент. Ðа ранних уровнÑÑ… у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп только к четырем базовым цветам, однако, как только вы Ñтанете более могущеÑтвенным, в вашем раÑпорÑжении будет больше инÑтрументов. -guide.bloodmagic.entry.ritual.masterRitualStone.info=Как и в Ñлучае большинÑтва магии, без направлÑющей Ñилы Ñффект ритуала либо Ñтанет неуправлÑемым, либо проÑто не будет работать вообще. Таким образом, Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы контролировать ритуалы, требуетÑÑ ÐœÐ°ÑтерÑкий ритуальный камень (Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾ Ñокращаю Ñто до «MRS» в Ñвоих заметках, но говорить Ñто публично немного неловко. «Мне нужно больше миÑÑиÑ, пожалуйÑта!»). MRS получает влаÑÑ‚ÑŒ от Сети Души владельца и проталкивает ее через ритуальные камни, таким образом выполнÑÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð». \n\tПриÑоединение Сети Души к большому камню, который мы не держим в руках, оказалоÑÑŒ немного Ñложным. Мне удалоÑÑŒ Ñделать Ñто один раз, Ð¼ÐµÐ´Ð¸Ñ‚Ð¸Ñ€ÑƒÑ Ð½Ð° вершине ÐºÐ°Ð¼Ð½Ñ Ð² позе лотоÑа, ÑоÑÑ€ÐµÐ´Ð¾Ñ‚Ð°Ñ‡Ð¸Ð²Ð°Ñ Ñвою Ñилу через камень и пытаÑÑÑŒ ÑвÑзать уÑики моей Ñети Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ работой ритуала. Ð¥Ð¾Ñ‚Ñ Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð» неÑколько минут, вÑе, что Ñ Ð±Ñ‹Ð» дейÑтвительно награжден, - Ñто пара мокрых штанов, когда вода ринулаÑÑŒ на ритуальные камни. Я научилÑÑ Ð½Ðµ медитировать ни на одном из моих ÑкÑпериментов Ñнова. -guide.bloodmagic.entry.ritual.activationCrystal.info.1=ВмеÑто того чтобы ждать Ñ‡Ð°Ñ Ð·Ð° тем, чтобы медитировать ритуальный актив, мы взÑли краÑный драгоценный камень, который изначально выпал из коробки, и начали его анализировать. Тиберий был уверен, что у него была ÑпоÑобноÑÑ‚ÑŒ «уÑтановить ÑвÑзи между телеÑным царÑтвом нашей реальноÑти и беÑтелеÑной ÑущноÑтью, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ð¿Ñ€Ð¾Ñвленной Сетью Души». Иногда Ñ Ð·Ð°Ð´Ð°ÑŽÑÑŒ вопроÑом, было ли хорошей идеей, чтобы он Ñтал моим учеником, но в такие времена Ñ Ð²Ð¸Ð¶Ñƒ его ловкоÑÑ‚ÑŒ в более загадочных аÑпектах магии. О, Ñ, наверное, должен напиÑать, что он имел в виду на английÑком: иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñтот криÑталл, мы могли бы ÑвÑзать наши Ñети душ Ñ ÐšÐ°Ð¼Ð½ÐµÐ¼ МаÑтера Ритуала, чтобы Ñнабдить его Ñнергией. -guide.bloodmagic.entry.ritual.activationCrystal.info.2=Таким образом, мы получили Ñлабый активационный криÑталл и ÑредÑтво Ð´Ð»Ñ Ð²Ð¾ÑÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐµÐ³Ð¾ Ñтруктуры. ОÑновным компонентом криÑталла ÑвлÑетÑÑ ÐµÑ‰Ðµ один криÑталл, который может быть ÑвÑзан Ñ Ð¼Ð¾ÐµÐ¹ Ñетью душ: криÑталл лавы. Затем, быÑтро впиÑав некоторые инÑтрукции на поверхноÑÑ‚ÑŒ криÑталла, Ðлтарь Крови может выполнить оÑтавшуюÑÑ Ñ‡Ð°ÑÑ‚ÑŒ работы по превращению его в активационный криÑталл. ЕÑтеÑтвенно, Ñтот криÑталл должен быть ÑвÑзан Ñ Ð´ÑƒÑˆÐµÐ²Ð½Ð¾Ð¹ Ñетью пользователÑ, чтобы функционировать. Когда камни ритуала правильно уложены вокруг MRS, пользователь должен прикоÑнутьÑÑ Ðº криÑталлу активации к MRS и вытолкнуть доÑтаточно Ñнергии, чтобы начать Ñтот ритуал. ЕÑли у Ð²Ð°Ñ Ð´Ð¾Ñтаточно LP внутри вашей Soul Network, ритуал активируетÑÑ. ЕÑли вы Ñтого не Ñделаете, или еÑли камни не выложены правильно, ритуал проÑто не будет активирован, и никаких затрат на LP не будет. -guide.bloodmagic.entry.ritual.diviner.info.1=Изучив размер и раÑположение многих ритуалов, Ñ Ð½Ð°Ñ‡Ð°Ð» находить, что немного Ñкучно поÑтоÑнно проÑматривать Ñвои запиÑи, чтобы ÑоÑтавить ритуалы. Вот почему Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð» над Ñозданием уÑтройÑтва, которое позволÑло бы кому-либо проÑто помеÑтить камни в правильное положение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ проÑÑ‚Ñ‹Ñ… жеÑтов и движений. Я размеÑтил Ñту запиÑÑŒ дальше в хронологичеÑком порÑдке, потому что людÑм лучше вÑего изучить Ñтот предмет, прежде чем начинать Ñ Ñ„Ð°ÐºÑ‚Ð¸Ñ‡ÐµÑкого поÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð². Ð’ противном Ñлучае они могут узнать, что у них нет вÑего, что им нужно, или вызовут метеор из ада вмеÑто Ñвежей бутылки родниковой воды. -guide.bloodmagic.entry.ritual.diviner.info.2=Ritual Diviner - Ñто ÑÐ½Ñ†Ð¸ÐºÐ»Ð¾Ð¿ÐµÐ´Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð². ÐŸÐµÑ€ÐµÐ±Ð¸Ñ€Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñ†Ð°Ñ‚ÐµÐ»ÑŒ (щелчок левой кнопкой мыши и щелчок правой кнопкой мыши), вы можете выбрать другой ритуал из хранилища знаний. ВзглÑд на Ð¿Ñ€Ð¾Ñ€Ð¸Ñ†Ð°Ñ‚ÐµÐ»Ñ Ñ‚Ð°ÐºÐ¶Ðµ раÑÑкажет вам проÑтую информацию о ритуале. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ритуальные камни на вашем лице, и вы каÑаетеÑÑŒ предÑÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° MRS (щелчок правой кнопкой мыши), вы можете помеÑтить камень Ð´Ð»Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, который вы хотите поÑтроить. Ð”ÐµÐ»Ð°Ñ Ñто доÑтаточно раз, вы получите завершенный ритуал! -guide.bloodmagic.entry.ritual.fullSpring.info=ÐеÑколько лет назад торговец оÑтановилÑÑ Ð²Ð¾Ð·Ð»Ðµ деревни возле моего дома, Ð¿Ñ€Ð¾Ð´Ð°Ð²Ð°Ñ Ñвои товары вÑем, кто хотел раÑÑтатьÑÑ Ñо Ñвоей монетой. Ð’ то Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð»Ð° заÑуха, и поÑевы умирали, поÑтому торговец Ð¿Ñ€Ð¸Ð½ÐµÑ ÑеребрÑный талиÑман Ñ Ð³Ð¾Ð»ÑƒÐ±Ñ‹Ð¼ камнем внутри. «Это, Ð´Ñ€ÑƒÐ·ÑŒÑ Ð¼Ð¾Ð¸, - Ñказал он Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ уÑердием, - позаботитÑÑ Ð¾ том, чтобы ваши реки не выÑохли! ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ð»Ñ…Ð¸Ð¼Ð¸ÑŽ, Ñ Ð¼Ð¾Ð³Ñƒ вывеÑти воду из Ñамого воздуха!»\n\tК неÑчаÑтью Ð´Ð»Ñ Ð´ÐµÑ€ÐµÐ²Ð½Ð¸, казалоÑÑŒ, что Ñтот драгоценный камень был проÑтым куÑочком Ñапфира, и, прежде чем кто-то понÑл, что их обманули, он уже был в неÑкольких милÑÑ… отÑюда. Я Ñклонен не вмешиватьÑÑ Ð² дела деревни, потому что им не нравитÑÑ Ð¼Ð¾Ñ Ð¼Ð°Ð³Ð¸Ñ, но в Ñтом Ñлучае Ñ Ñделал иÑключение. ПоÑле того, как Ñ Ð¼Ð¸Ð»Ð¾ поболтал Ñ Â«Ð°Ð»Ñ…Ð¸Ð¼Ð¸ÐºÐ¾Ð¼Â», Ñ Ð¿Ñ€Ð¾Ð²ÐµÐ» неÑколько чаÑов, размышлÑÑ Ð²Ð¾Ð·Ð»Ðµ ирригационных каналов. КонденÑировав водÑной пар в воздухе, мне удалоÑÑŒ Ñоздать доÑтаточно воды, чтобы поливать урожай до Ñледующего падениÑ. Это был не ÑовÑем Ñффективный метод, и в течение Ñледующих неÑкольких дней Ð¼ÐµÐ½Ñ Ð¸Ñтощали, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‡Ð°ÑÑ‚ÑŒ воды из канала Ð´Ð»Ñ Ñ€ÐµÐ³Ð¸Ð´Ñ€Ð°Ñ‚Ð°Ñ†Ð¸Ð¸.\n\tÐŸÐ¾Ð¼Ð½Ñ Ð¾Ð± Ñтом, Ñ Ð¸Ñпользовал те же принципы Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð Ð¸Ñ‚ÑƒÐ°Ð»Ð° Полной ВеÑны. ÐаправлÑÑ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¾Ðµ количеÑтво Ñнергии в ритуал, он конденÑирует влагу в воздухе вокруг него, ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð¸Ñточник воды поверх оÑновного ритуального камнÑ. СтоимоÑÑ‚ÑŒ активации ритуала довольно незначительна, а обÑлуживание тем более. \n\tДиапазон воды может быть раÑширен Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ритуальной повозки и даже помещен в другое меÑто, поÑтому вам не нужно беÑпокоитьÑÑ Ð¾ том, где находитÑÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð», еÑли они беÑпокоÑÑ‚ÑÑ Ð¾Ð± ÑÑтетике. ЧудеÑа магии! -guide.bloodmagic.entry.ritual.lava.info=Лава, пожалуй, один из Ñамых Ñлементарных иÑточников Ñнергии. Я не очень чаÑто иÑпользую его в Ñвоих ÑобÑтвенных иÑÑледованиÑÑ…, потому что Ñ Ð½Ð¸Ð¼ может быть немного Ñложно работать - Ñто не то, что вы можете иÑпользовать проÑтое железное ведро, чтобы взÑÑ‚ÑŒ его! \n\tОдин один из меÑтных тинкеров пришел ко мне домой однажды и ÑпроÑил, еÑÑ‚ÑŒ ли поблизоÑти какие-нибудь иÑточники, поÑкольку недавно они приобрели какое-то новое оборудование, необходимое Ð´Ð»Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ. Я Ñказал, что их было неÑколько, но большинÑтво из них уже были в ÑобÑтвенноÑти, но Ñ Ñ€ÐµÑˆÐ¸Ð» приехать к нему, чтобы оÑмотреть уÑтройÑтво. \n\t Это был плавильный завод выÑотой не менее 5 метров и такой же ширины, подключенный к неÑкольким танки, которые ÑтоÑли пуÑтыми и беÑплодными. Ð¥Ð¾Ñ‚Ñ Ñ Ð½Ðµ был полноÑтью уверен в том, как он работает, Ñ Ð¼Ð¾Ð³ Ñказать, что Ð´Ð»Ñ Ñтого идеально подойдет Ñырое тепло лавы - ÑлектричеÑтво будет работать хорошо, еÑли его правильно модифицировать, но Ñ Ð¼Ð¾Ð³ Ñказать, что Ñто не от Immersive Industries. \n\tПоÑле небольшого разговора Ñ Ñ‚Ð¸Ð½ÐºÐµÑ€Ð¾Ð¼ деньги перешли к другому, и Ñ Ð¿Ð¾Ð¿Ñ€Ð¾Ñил его отойти в Ñторону, пока Ñ Ð³Ð¾Ñ‚Ð¾Ð²Ð¸Ð» Ñвои ритуальные камни. Чтобы иÑполнить то, что Ñ Ñ…Ð¾Ñ‚ÐµÐ», Ñ Ð²Ð·Ñл четыре огненных ÐºÐ°Ð¼Ð½Ñ Ð¸ раÑположил их в креÑте вокруг оÑновного ритуального камнÑ, а затем Ñильно толкнул Ñвоим криÑталлом активации, Ð²Ð¾Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ð² Ñвоей голове. ТеоретичеÑки Ñто должно быть проÑто: взÑÑ‚ÑŒ неÑколько камней из глубины земли и Ñжать их Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ñнергией, заÑтавлÑÑ Ð¸Ñ… плавитьÑÑ Ð¿Ð¾Ð´ Ñильным давлением и превращатьÑÑ Ð² раÑплавленный. Эту лаву можно было бы извлечь из ритуального камнÑ, и Ñтот процеÑÑ Ð¼Ð¾Ð¶Ð½Ð¾ повторить. Ð¥Ð¾Ñ‚Ñ Ñ‚ÐµÐ¾Ñ€ÐµÑ‚Ð¸Ñ‡ÐµÑки Ñто было проÑто, на практике Ñто было немного Ñложно. Ð”Ð»Ñ Ð¼Ð¾ÐµÐ¹ проÑтой Ñети в то Ð²Ñ€ÐµÐ¼Ñ ÑтоимоÑÑ‚ÑŒ активации была довольно выÑокой из-за первоначального требуемого давлениÑ, и Ñ Ð½Ðµ был готов к Ñтоку каждого иÑточника лавы. (20000 LP, чтобы активировать, 500 LP за иÑходный блок) \n\tЯ вышел из Ð·Ð´Ð°Ð½Ð¸Ñ Ñ ÑƒÑмешкой на моем лице, однако: танки были полны лавы, Ñтого доÑтаточно, чтобы держать тинкера в бизнеÑе на пару недель, пока он может обеÑпечить более поÑтоÑнный иÑточник лавы. Я вÑе же Ñобрал Ñвои ритуальные камни поÑле того, как закончил. \n\t ---------- \n\tБез изменений в ритуале, ритуал будет пытатьÑÑ Ð¿Ð¾Ð¼ÐµÑтить иÑточник лавы в блок непоÑредÑтвенно над Ñобой по цене 500 LP за каждый тик, еÑли еÑÑ‚ÑŒ Ñто меÑто, вытеÑнÑющее жидкоÑти, еÑли они текут. Этот диапазон Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию может быть раÑширен до 9 блоков на макÑимальном раÑÑтоÑнии 3 от ритуала. \n\tПри раÑширении ритуала Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Raw Will ÑтоимоÑÑ‚ÑŒ LP будет уменьшатьÑÑ Ð¿Ñ€Ð¾Ð¿Ð¾Ñ€Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾ воле, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ð² ауре, поглощающей волю, пропорционально количеÑтву Ñохраненного LP. ИÑпользование Ñтой воли может также предоÑтавить возможноÑÑ‚ÑŒ помещать лаву непоÑредÑтвенно во внутренние резервуары блока Ñо ÑкороÑтью, Ñравнимой Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼Ð¸ ритуальными операциÑми. \n\tCorrosive Will заÑтавлÑет ритуал инвертировать непобедимоÑÑ‚ÑŒ, обеÑпечиваемую иммунитетом к огню, в результате чего вÑе ÑущноÑти, обладающие иммунитетом ÑтрелÑÑ‚ÑŒ в пределах заданной облаÑти, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñерьезно повреждена в завиÑимоÑти от количеÑтва Воли в Ðуре. Те, кто не невоÑприимчив к огню, не поÑтрадают от Ñтого Ñффекта. \n\tПри мÑтительном желании, примененном к ритуалу, выделÑетÑÑ Ð»ÐµÑ‚ÑƒÑ‡Ð¸Ð¹ газ, из-за которого Огненный предохранитель воздейÑтвует на вÑех неигровых ÑущноÑтей в пределах указанного диапазона. Когда таймер дебаффа ÑтановитÑÑ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 0, ÑущноÑÑ‚ÑŒ взорветÑÑ, Ñилой взорвав их в воздух Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ взрывной Ñилы. \n\tDestructive Will увеличивает макÑимальную дальноÑÑ‚ÑŒ и объем, на которые может влиÑÑ‚ÑŒ ритуал. Чем больше у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚, тем больше лавовых блоков можно размеÑтить за один ритуал. К ÑчаÑтью, ритуал не иÑтощает никакой Разрушительной Воли, однако, еÑли ваша Ð’Ð¾Ð»Ñ Ð¿Ð°Ð´Ð°ÐµÑ‚ и макÑимальный диапазон ритуала ниже того, на котором вы его уÑтановили, ритуал не будет работать вообще до тех пор, пока не будет иÑправлен. \n\tÐаконец, Steadfast Will предоÑтавит вÑем игрокам в пределах его диапазона бафф огнеÑтойкоÑти, Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ ÑтоимоÑÑ‚ÑŒ которого в Воли завиÑÑÑ‚ от количеÑтва Воли в Ðуре. Ðеобходимо Ñоблюдать оÑторожноÑÑ‚ÑŒ, потому что еÑли вы подвержены воздейÑтвию огнеÑтойкоÑти, вы можете быть повреждены Ñффектом ритуала. -guide.bloodmagic.entry.ritual.greenGrove.info=Ðа прошлой неделе Ñ Ð½Ð°Ñ‡Ð°Ð» учить Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ Ñвоей междиÑциплинарной магии. Каждый мой ученик должен был изучать другую форму магии, Ð¸Ð·ÑƒÑ‡Ð°Ñ Ð¼Ð°Ð³Ð¸ÑŽ крови. Ðеважно, какой из них они выберут, пока он не потреблÑет какую-то форму ограниченного реÑурÑа - Ñ Ð¸Ñпользовал магию из клана ÐÑ€Ñ Ñ Ð”Ð°Ð»ÑŒÐ½ÐµÐ³Ð¾ ВоÑтока, но так как мировой иÑточник Ð­Ñ‚ÐµÑ€Ð¸Ñ Ð±Ñ‹Ð» поглощен в дефицит Ñто вымерло давно. \n\tТиберий решил изучить Тауматургию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ñпользует магию мира, чтобы выполнить Ñвою магию. Это хороший Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð¾Ð²ÐµÑ Ð¼Ð°Ð³Ð¸Ð¸ крови, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ñпользует магию жизни. Таким образом, Ñти магичеÑкие ÑредÑтва иÑпользуют разные ÑредÑтва Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¸Ñ… и тех же задач. Чтобы продемонÑтрировать, Ñ Ñ€ÐµÑˆÐ¸Ð» выделить Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ñ Ð¢Ð¸Ð±ÐµÑ€Ð¸ÑƒÑом, когда речь заходит о роÑте урожаÑ. \n\t "Ð¢Ð°ÑƒÐ¼Ð°Ñ‚ÑƒÑ€Ð³Ð¸Ñ Ð¸Ñпользует катализатор роÑта, который питаетÑÑ Ð¾Ñ‚ ÐÑпекты Herba", - заÑвлÑÑŽ Ñ, ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ Ð½Ð° блок-Ñхему Essentia, прикрепленную к клаÑÑной комнате. Ñтены. Конечно, Тиберий Ñидел за единÑтвенным Ñтолом там, но иногда парню нужно повеÑелитьÑÑ. «ÐÐµÐ±Ð¾Ð»ÑŒÑˆÐ°Ñ Ñтруйка ауры и Ñтой ÑÑÑенции Ñтимулирует процеÑÑ Ñ„Ð¾Ñ‚Ð¾Ñинтеза раÑтениÑ, Ð¿Ð¾Ð±ÑƒÐ¶Ð´Ð°Ñ ÐµÐ³Ð¾ раÑти, Ð´Ð°Ð²Ð°Ñ ÐµÐ¼Ñƒ больше Ñолнечной Ñнергии. Этот процеÑÑ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚, чтобы почва была хорошо удобрена, иначе урожай может проÑто заÑохнуть и умереть». \ Затем Ñ Ð±ÐµÑ€Ñƒ четыре ритуальных ÐºÐ°Ð¼Ð½Ñ Ð·ÐµÐ¼Ð»Ð¸ и воды и помещаю их в круг вокруг оÑновного ритуального камнÑ. «И наоборот, Blood Magic иÑпользует другой процеÑÑ». Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð° Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€ÑƒÑŽ ритуал и покрываю его проÑтой грÑзью. «ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñвою жизненную Ñилу или Ñнергию животных, вы можете удобрÑÑ‚ÑŒ раÑÑ‚ÐµÐ½Ð¸Ñ Ñ‚Ð°ÐºÐ¸Ð¼ образом, чтобы они не нуждалиÑÑŒ в таком большом количеÑтве удобрений. По Ñути, они наÑильÑтвенно кормÑÑ‚ раÑтениÑ, чтобы они вÑегда имели выÑокую концентрацию питательных вещеÑтв». . "\n\tЯ броÑаю неÑколько ÑемÑн в грÑзь и Ñлегка прикрываю их, Ð¾Ñ‚ÐºÑƒÐ¿Ð¾Ñ€Ð¸Ð²Ð°Ñ Ð¸ опорожнÑÑ Ñ„Ð»Ð°ÐºÐ¾Ð½ Ñ Ð²Ð¾Ð´Ð¾Ð¹ из моей мантии. «Этот процеÑÑ Ð½Ðµ нуждаетÑÑ Ð² дополнительном Ñолнечном Ñвете, потому что он иÑпользует другой иÑточник Ñнергии. Ð¥Ð¾Ñ‚Ñ Ð¾Ð½ работает намного лучше, когда еÑÑ‚ÑŒ немного Ñвета - раÑтение точно не привыкло к такого рода уÑловиÑм!» \n\tA неÑколько побегов уже выÑунули Ñвои лиÑÑ‚ÑŒÑ Ð¸Ð· грÑзи, пока Ñ Ð¾Ð±ÑŠÑÑнÑл, по-видимому, Ð¼Ð°Ñ…Ð°Ñ Ð² ответ. Я чувÑтвовал легкую нагрузку на Ñвое тело, когда каждый новый лиÑÑ‚ прораÑтал, каждый раз незначительный, но при накоплении он начинал ÑкладыватьÑÑ. Закончив урок, Ñ Ð¾Ñ‡Ð¸Ñтил ÑкÑперимент от грÑзи и решил прогулÑÑ‚ÑŒÑÑ Ð´Ð¾ деревни: у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð» бушель пшеницы, который нужно было продать. \n\t ---------- \n\tРитуал Зеленой рощи, как Ñледует из названиÑ, уÑкорÑет темпы роÑта находÑщихÑÑ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾Ñти раÑтений. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÑ€Ð¾Ð²ÑŒ игрока в качеÑтве богатого удобрениÑ, он будет пытатьÑÑ Ð²Ñ‹Ñ€Ð°Ñтить вÑе, что он Ñчитает раÑтением, например, пшеницу и морковь, периодичеÑки Ð²Ñ‹Ñ€Ð°Ñ‰Ð¸Ð²Ð°Ñ Ñ‡Ñ‚Ð¾-либо в пределах Ñвоего диапазона. С помощью операций по умолчанию ритуал будет Ñмотреть на облаÑÑ‚ÑŒ 3Ñ…3 на два блока выше ÑÐµÐ±Ñ Ð¸ пытатьÑÑ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ‚ÑŒ каждый блок Ñ Ð²ÐµÑ€Ð¾ÑтноÑтью уÑпеха 30 %% каждую Ñекунду. При манипулировании Ñ Ritual Tinkerer, ритуал может обрабатывать макÑимум 81 урожай за один раз в радиуÑе 5 блоков от MRS. Как еще одно примечание \n\t, когда оно дополнено волей демонов, еÑÑ‚ÑŒ неÑколько Ñффектов, которые можно получить. ЕÑли иÑпользуетÑÑ ÐÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð°Ñ Ð’Ð¾Ð»Ñ, ритуал будет выполнÑÑ‚ÑŒ вÑе операции Ñ ÑƒÑкоренной ÑкороÑтью, потреблÑÑ 0,05 Воли за каждый уÑпешный роÑÑ‚ и ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ Ñвою ÑкороÑÑ‚ÑŒ отноÑительно количеÑтва Воли в Ðуре. \n\tЕÑли вливаетÑÑ Ð² ÐœÑтительную Волю, ритуал будет поглощать 0.05 Ð’Ð¾Ð»Ñ Ð·Ð° уÑпешный роÑÑ‚ и увеличит вероÑтноÑÑ‚ÑŒ того, что данный рабочий тик будет уÑпешным на заводе. По умолчанию без Воли Ñто ÑоÑтавлÑет 30 %%, но, например, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ 100 ÐœÑтительного ВолÑ, показатель увеличитÑÑ Ð´Ð¾ 80 %%. \n\tDestructive Ð’Ð¾Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ макÑимальный Ñффективный диапазон ритуала, то еÑÑ‚ÑŒ чем больше у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚, тем больше культур / раÑтений, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ может ÑправитьÑÑ Ð¾Ð´Ð¸Ð½ ритуал. К ÑчаÑтью, ритуал не иÑтощает никакой разрушительной воли, однако, еÑли ваша Ð²Ð¾Ð»Ñ Ð¿Ð°Ð´Ð°ÐµÑ‚ и макÑимальный диапазон ритуала ниже того, на котором вы его уÑтановили, ритуал не будет работать вообще до тех пор, пока не будет иÑправлен. \n\tSteadfast ПредоÑтавит возможноÑÑ‚ÑŒ уÑтановить облаÑÑ‚ÑŒ вокруг ритуала, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ автоматичеÑки обрабатыватьÑÑ Ð¸ увлажнÑÑ‚ÑŒÑÑ. Кроме того, любое ÑемÑ, которое находитÑÑ Ð² Ñтом диапазоне, будет поÑеÑно в ÑоÑеднем блоке, еÑли Ñто возможно. Это Ñтоит небольшого количеÑтва УÑтойчивой Воли, и ее Ñффекты не маÑштабируютÑÑ Ñ Ð’Ð¾Ð»Ð¸ в Ðуре. \n\t Когда ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¹Ð½Ð°Ñ Ð’Ð¾Ð»Ñ Ð¸ÑпользуетÑÑ Ð² ритуале, Ñ„ÑƒÐ½Ð´Ð°Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¸Ñ€Ð¾Ð´Ð° ритуала может изменитьÑÑ. При поÑтавке и правильной наÑтройке нового диапазона на вÑех мобов, попадающих в зону влиÑÐ½Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, будет применÑÑ‚ÑŒÑÑ Ñффект «ПиÑвка». Каждые неÑколько тиков раÑÑ‚ÐµÐ½Ð¸Ñ Ð²Ð¾Ð·Ð»Ðµ мобов будут повреждены, а моб будет поврежден пропорционально. Оплодотворение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ мобов может оказатьÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ‹Ð¼! Каждые 10 Ñекунд Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´ÐµÐ±Ð°Ñ„Ñ„Ð° на моба будет поглощатьÑÑ 0,2 ед. -guide.bloodmagic.entry.ritual.magnetism.info=Ритуал магнетизма хлеб Ñ Ð¼Ð°Ñлом, кто пользуетÑÑ ÐºÐ°Ñ€ÑŒÐµÑ€Ð°Ð¼Ð¸. Ритуал Ñоздает вращающееÑÑ Ð¼Ð°Ð³Ð½Ð¸Ñ‚Ð½Ð¾Ðµ поле, подтÑгивание богатые руды Ñ Ð·ÐµÐ¼Ð»Ð¸ под ним и размещением Ñодержимого в Ñвоей облаÑти. Это не вытеÑнÑет какой-либо камень, так что никакие зиÑющие отверÑÑ‚Ð¸Ñ Ð½Ðµ будут поÑвлÑÑ‚ÑŒÑÑ Ð½Ð° земле - при уÑловии, что Ð·ÐµÐ¼Ð»Ñ Ð½Ðµ полноÑтью ÑоÑтоит из ротовой полоÑти. Ритуал дейÑтвует один раз каждые 40 тиков и раÑходы 50LP через уÑпешную операцию.\n\tÐ Ð°Ð´Ð¸ÑƒÑ Ð¿Ð¾ умолчанию, которым управлÑет Ñтот ритуал, ÑоÑтавлÑет 3 блока в каждом кардинальном направлении, Ð´Ð°Ð²Ð°Ñ Ð¿Ð»Ð¾Ñ‰Ð°Ð´ÑŒ 7x7 блоков Ñ Ñ†ÐµÐ½Ñ‚Ñ€Ð¾Ð¼ в MRS. ПоÑкольку у ритуала в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½ÐµÑ‚ никаких дополнений к Воли, вы можете только увеличить Ñ€Ð°Ð´Ð¸ÑƒÑ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, помеÑтив ценный блок непоÑредÑтвенно под MRS. ЕÑли иÑпользуетÑÑ Ð¶ÐµÐ»ÐµÐ·Ð½Ñ‹Ð¹ блок, Ñ€Ð°Ð´Ð¸ÑƒÑ ÑтановитÑÑ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 7. ЕÑли иÑпользуетÑÑ Ð·Ð¾Ð»Ð¾Ñ‚Ð¾Ð¹ блок, Ñ€Ð°Ð´Ð¸ÑƒÑ ÑтановитÑÑ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 15. Ðаконец, еÑли иÑпользуетÑÑ Ð°Ð»Ð¼Ð°Ð·Ð½Ñ‹Ð¹ блок, Ñ€Ð°Ð´Ð¸ÑƒÑ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð´Ð¾ 31, что означает, что Ð»ÑŽÐ±Ð°Ñ Ñ€ÑƒÐ´Ð° ниже ритуала в облаÑти 63x63 будет медленно подтÑнулÑÑ Ðº Ñвоему объему 3x3x3 выше MRS. -guide.bloodmagic.entry.ritual.crusher.info=Ритуал дейÑÑ‚Ð²Ð¸Ñ Ð´Ñ€Ð¾Ð±Ð¸Ð»ÐºÐ¸ довольно проÑÑ‚. Ритуал должен иметь какую-то форму инвентарÑ, ÑвÑзанную Ñ Ð½Ð¸Ð¼, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð² неизмененном виде проÑто раÑполагаетÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ… MRS. Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ ритуал будет Ñмотреть в пределах Ñвоего диапазона Ð´Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¸Ñ (по умолчанию облаÑÑ‚ÑŒ 3x3x3 ниже ритуала) и разбивать по одному блоку за раз Ñо ÑкороÑтью один раз каждые 2 Ñекунды за Ñчет 7 LP за уÑпешную операцию. Затем разбитые блоки будут перенеÑены в ÑвÑзанный инвентарь - еÑли нет меÑта Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð², они вмеÑто Ñтого будут извергатьÑÑ Ñверху Ñундука.\n\tПри заправке Ñырой волей ритуал будет работать быÑтрее, в завиÑимоÑти от общего количеÑтва воли в ауре. При уÑкорении он будет потреблÑÑ‚ÑŒ 0,05 необработанной воли за каждую уÑпешную операцию.\n\tÐ Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð¾Ð´Ð¸Ñ‚ к тому, что блоки, разбитые ритуалом, применÑÑŽÑ‚ к нему Фортуну. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ ÑоÑтоÑÐ½Ð¸Ñ Ð½Ðµ менÑетÑÑ Ð¸ ÑоÑтавлÑет 3 ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½ÐµÐ·Ð°Ð²Ð¸Ñимо от количеÑтва Воли. Это будет потреблÑÑ‚ÑŒ 0,2 Воли за уÑпешную операцию, незавиÑимо от того, была ли она полезной.\n\tВмеÑто Ñтого, Steadfast Will будет разрушать блоки Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñффекта Silk Touch. Это будет Ñтоить 0,02 Воли за операцию, и будет перекрывать Ñффект РазрушениÑ, где Ñто возможно.\n\tÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¹Ð½Ð°Ñ Ð²Ð¾Ð»Ñ Ð´ÐµÐ»Ð°ÐµÑ‚ так, чтобы блоки, разбитые ритуалом, обрабатывалиÑÑŒ какой-либо формой Ñмазочно-охлаждающей жидкоÑти. Это означает, что, например, еÑли Ñто железный блок, результатом будет два куÑка железного пеÑка. Текущие «Ñмазочно-охлаждающие жидкоÑти», которые иÑпользуютÑÑ Ð² ритуале: Ð±Ð°Ð·Ð¾Ð²Ð°Ñ Ñмазочно-Ð¾Ñ…Ð»Ð°Ð¶Ð´Ð°ÑŽÑ‰Ð°Ñ Ð¶Ð¸Ð´ÐºÐ¾ÑÑ‚ÑŒ и взрывчатый порошок. Ритуал потреблÑет различное количеÑтво Воли в завиÑимоÑти от того, что было иÑпользовано, и будет потреблÑÑ‚ÑŒ Волю только в том Ñлучае, еÑли применÑетÑÑ Ñффект. Это отменÑет Silk Touch, где Ñто применимо.\n\tÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð¾Ð´Ð¸Ñ‚ к тому, что при уÑпешной операции инвентарь Ñжимает Ñодержимое, аналогично Ñимволу ÑжатиÑ: еÑли внутри Ñундука 65 пыль краÑного камнÑ, то будет Ñоздан один блок краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ оÑтанетÑÑ 56 пыли. Ð’Ð¾Ð»Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð»ÑетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ тогда, когда Ñто уÑпешно, и Ñтоит 0,2 воли. -guide.bloodmagic.entry.ritual.highJump.info=Этот ритуал иÑпользует огромный взрыв воздуха, чтобы поднÑÑ‚ÑŒ вÑех тех, кто идет по нему, в небо. Более того, еÑли пользователь приземлитÑÑ Ð² зоне дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, он не получит никакого урона от падениÑ. Игроки, которые крадутÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ñтого ритуала, также не затрагиваютÑÑ.\n\tРитуал Ñтоит 5LP за единицу за такт уÑпешной операции, поÑтому ничего не будет Ñтоить, еÑли он не броÑит людей в воздух. -guide.bloodmagic.entry.ritual.speed.info=Как Ñледует из названиÑ, Ритуал СкороÑти иÑпользуетÑÑ Ð´Ð»Ñ Ñ‚Ñ€Ð°Ð½Ñпортировки различных видов. Ритуал может быть размещен в направлении любого из оÑновных направлений, и любые объекты в пределах его диапазона будут запущены в направлении, указанном ритуалом. При взглÑде на ритуал, Ñто направление, где находитÑÑ Ñумеречный ритуал. По умолчанию ритуал имеет Ñ€Ð°Ð´Ð¸ÑƒÑ 2 блока от MRS, Ñ…Ð¾Ñ‚Ñ ÐµÐ³Ð¾ можно раÑширить или Ñократить при иÑпользовании ритуала. Это будет применÑÑ‚ÑŒ ÑкороÑÑ‚ÑŒ 3 блока / тик в направлении ритуала и 1,2 блока / тик по вертикали.\n\tЕÑли ритуал заправлен Сырой Волей, ÑкороÑÑ‚ÑŒ ритуала ÑущеÑтвенно увеличиваетÑÑ Ð½Ð° оÑнове Воли, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð² Ðуре. Ðапример, ÑкороÑÑ‚ÑŒ будет удвоена, еÑли внутри Ðуры будет 100 Воли. Ðа каждую уÑпешную операцию раÑходуетÑÑ 0,1 Воли.\n\tÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð½Ðµ позволÑет ритуалу перемещать взроÑлых мобов, а ДеÑÑ‚Ñ€ÑƒÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð²Ð¾Ð»Ñ Ð½Ðµ дает ритуалу перемещать детÑких мобов. ЕÑли один из них иÑпользуетÑÑ, игрокам также запрещаетÑÑ Ð¸Ñпользовать ритуал. Однако, еÑли они оба иÑпользуютÑÑ, Ñффект ÑоÑтоит в том, что только игроки могут иÑпользовать ритуал, а мобы - нет. Эти Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ Ñффективно иÑпользоватьÑÑ Ð´Ð»Ñ Ñортировки ферм животных или даже Ð¸Ð·Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ñтих надоедливых детÑких зомби в вашей жертвенной ручке. Ритуал будет потреблÑÑ‚ÑŒ 0,05 Воли Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ типа, который дейÑтвует при уÑпешной операции, поÑтому, еÑли ребенок входит в ритуальное проÑтранÑтво, когда вы иÑпользуете Разрушительную волю, Ñто не будет Ñтоить Уилла или LP. -guide.bloodmagic.entry.ritual.wellOfSuffering.info=Ð”Ð»Ñ Ñ‚ÐµÑ… из ваÑ, кто предпочитает иÑпользовать мобов вмеÑто ÑобÑтвенного здоровьÑ, колодец Ñтраданий наноÑит урон вÑем живым ÑущеÑтвам, не ÑвлÑющимÑÑ Ð¸Ð³Ñ€Ð¾ÐºÐ°Ð¼Ð¸, в радиуÑе 10 блоков и помещает здоровье в подключенный алтарь. Ритуал будет иÑкать алтарь крови в пределах его диапазона, проверÑÑ 5 блоков по горизонтали и 10 блоков по вертикали без изменений. Когда он находит алтарь, он ÑохранÑет Ñвое меÑтоположение внутри - еÑли поблизоÑти нет алтарÑ, ритуал не будет работать. Ритуал будет давать 1 HP за единицу и помещать 25 алмазов в алтарь (100 Ð´Ð»Ñ Ð¼Ð¸Ñ€Ð½Ñ‹Ñ… животных), который может быть увеличен рунами ЖертвоприношениÑ. -guide.bloodmagic.entry.ritual.featheredKnife.info=Ритуал Пернатого Ðожа врезаетÑÑ Ð² тело пользователÑ, иÑÑ‚Ð¾Ñ‰Ð°Ñ ÐµÐ³Ð¾ жизненную Ñилу, чтобы заполнить кровавый алтарь поблизоÑти. Ритуал будет иÑкать алтарь крови в пределах его диапазона, проверÑÑ 5 блоков по горизонтали и 10 блоков по вертикали без изменений. Когда он находит алтарь, он ÑохранÑет Ñвое меÑтоположение внутри - еÑли поблизоÑти нет алтарÑ, ритуал не будет работать. Когда игрок входит в диапазон урона ритуала, который по умолчанию равен радиуÑу 15 блоков по горизонтали и 20 блоков по вертикали, ритуал наноÑит игроку урон в течение 1HP, а затем помещает Ñто здоровье непоÑредÑтвенно в подключенный алтарь (Ñ ÑƒÑ‡ÐµÑ‚Ð¾Ð¼ кровавых рун). Ð’ ритуале еÑÑ‚ÑŒ неÑколько механизмов безопаÑноÑти, которые не позволÑÑŽÑ‚ игроку, чье здоровье ÑоÑтавлÑет менее 30%. Ðе подвергаÑÑÑŒ Ñомнению, ритуал делает Ñто раз в Ñекунду. \n\tЕÑÑ‚ÑŒ неÑколько полезных дополнений, которые вы можете иÑпользовать, еÑли будете иÑпользовать Волю Демона. ЕÑли ÑÑ‹Ñ€Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ð¾Ð³Ð»Ð¾Ñ‰Ð°ÐµÑ‚ÑÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð¼, ритуал будет пытатьÑÑ Ð½Ð°Ð½Ð¾Ñить урон игрокам в пределах Ñвоего диапазона Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ ÑкороÑтью, Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ Ð´Ð²Ð° раза в Ñекунду. Ритуал потреблÑет 0,05 необработанной воли за каждую уÑпешную операцию. \n\tЕÑли у Ð²Ð°Ñ Ð² ауре более 10 Ñтойких волей, ритуал повыÑит Ñвой порог безопаÑноÑти и вмеÑто Ñтого не будет работать Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°Ð¼Ð¸, чье здоровье ÑоÑтавлÑет менее 70%. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½Ðµ потреблÑет Воли. \n\tЕÑли у Ð²Ð°Ñ Ð² Ðуре более 10 ÐœÑтительных желаний, ритуал Ñнимает некоторые Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти, заÑтавлÑÑ ÐµÐ³Ð¾ работать на игроков, пока у них не будет только 10 %% от их макÑимального здоровьÑ. оÑтавил. ЕÑли в ритуале также еÑÑ‚ÑŒ Steadfast Will, порог вÑе равно будет 70 %% только Ð´Ð»Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð° ритуала. Эта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð² наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½Ðµ потреблÑет Воли. \n\t Когда ДемонÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ Ð’Ð¾Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑетÑÑ Ðº ритуалу, ритуал ÑтановитÑÑ Ð½Ð°Ð¼Ð½Ð¾Ð³Ð¾ более Ñффективным Ñ ÐµÐ³Ð¾ преобразованием HP в LP. КоличеÑтво LP, которое добавлÑетÑÑ Ðº алтарю за единицу здоровьÑ, увеличиваетÑÑ Ð² завиÑимоÑти от Воли в Ðуре, макÑимум до + 20 %% за 100 Разрушительного ВолÑ. Этот Ñффект ÑкладываетÑÑ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¿Ð»Ð¸ÐºÐ°Ñ‚Ð¸Ð²Ð½Ð¾ Ñ Ñ€ÑƒÐ½Ð°Ð¼Ð¸, УлучшениÑми Живой Брони и БлаговониÑми. Это потреблÑет 0,05 Разрушительной Воли за принеÑенное в жертву HP. \n\t Ð“Ð¾Ð²Ð¾Ñ€Ñ Ð¾ благовониÑÑ…, еÑли в обрÑде иÑпользуетÑÑ ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð²Ð½Ð°Ñ Ð’Ð¾Ð»Ñ, ритуал будет уважать воздейÑтвие благовоний на ваÑ. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ дебаффа Soul Fray, и вы наделены Ñилой ÐÐ»Ñ‚Ð°Ñ€Ñ Ð‘Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ð¹, ритуал израÑходует вÑе ваши HP до уÑтановленного порога и накачает вÑе получившиеÑÑ LP в алтарь. Это также удалит благовониÑ, которые вы понеÑли, и нанеÑет на Ð²Ð°Ñ Soul Fray. Этот Ñффект накладываетÑÑ Ð½Ð° бафф Â«Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ». -guide.bloodmagic.entry.ritual.regen.info=Возможно, один из лучших ритуалов Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð³Ð¾ потенциального Кровавого Мага, который хочет иÑпользовать Ñвою ÑобÑтвенную жизненную Ñилу Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ‚ÐºÐ¸ Ñвоей магии, Ритуал Регенерации Ñоздает вокруг ÑÐµÐ±Ñ Ð·Ð°Ð²ÐµÑу Ñнергии, иÑцелÑющие ÑущноÑти, находÑщиеÑÑ Ð² его пределах. Каждые 2,5 Ñекунды ритуал разыгрывает Регенерацию I на живых ÑущеÑтвах в радиуÑе 15 блоков, ÑтоимоÑÑ‚ÑŒ 100 фунтов на игрока и 10 фунтов на других живых ÑущеÑтв в течение 2,5 Ñекунд регенерации. \n\tЕÑли Corrosive Will иÑпользуетÑÑ Ð´Ð»Ñ ÑƒÑÐ¸Ð»ÐµÐ½Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð°, будет доÑтупен второй диапазон, «вампиричеÑкий диапазон». Любые неигровые ÑущеÑтва в Ñтом диапазоне будут Ñлучайным образом повреждены, чтобы непоÑредÑтвенно иÑцелить игроков в обычном диапазоне иÑцелениÑ. Это Ñтоит 0,04 воли Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ будет переводить 1HP за операционный тик. -guide.bloodmagic.entry.ritual.harvest.info=Этот ритуал будет иÑкать любой Ñобираемый раÑтительный блок в пределах его диапазона (по умолчанию облаÑÑ‚ÑŒ 9x9x5 выше MRS) и попытатьÑÑ Ñобрать его, переÑÐ°Ð¶Ð¸Ð²Ð°Ñ Ð»ÑŽÐ±Ñ‹Ðµ Ñемена, еÑли раÑтение может пропуÑтить Ñемена. Ð’Ñе капли Ñ Ñ€Ð°ÑÑ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾ÑвÑÑ‚ÑÑ Ñ‚Ð°Ð¼, где было Ñобрано раÑтение. Ритуал будет пытатьÑÑ Ñобирать раÑÑ‚ÐµÐ½Ð¸Ñ Ð¾Ð´Ð¸Ð½ раз в 5 тиков и будет Ñтоить 20 фунтов Ñтерлингов за уÑпешную операцию.\n\tРаÑтениÑ, которые можно Ñобирать, включают, но не ограничиваютÑÑ Ð¸Ð¼Ð¸: тыквы, пшеницу, морковь, картофель, бородавку, кактуÑ, троÑтник. Имейте в виду, что ритуал не делает никаких предположений отноÑительно того, что он Ñобирает - он может Ñобирать урожай только Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¼ модом, еÑли данный мод региÑтрирует обработчик уборки Ñ Ð¼Ð¾Ð´Ð¾Ð¼. -guide.bloodmagic.entry.ritual.interdiction.info=ОÑнованный на архаичеÑком алхимичеÑком уÑтройÑтве легенды, Ритуал Запрета пытаетÑÑ Ð½Ð°Ñильно оттолкнуть вÑех неигровых мобов от центра ритуала. По умолчанию вÑе мобы, которые находÑÑ‚ÑÑ Ð² двух блоках MRS, отталкиваютÑÑ Ð¾Ñ‚ MRS, уÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ Ð¸Ñ… ÑкороÑÑ‚ÑŒ. Следует отметить, что мобы в Ñтом диапазоне не подвержены урону от падениÑ, Ñ…Ð¾Ñ‚Ñ Ñта Ð·Ð°Ñ‰Ð¸Ñ‚Ð½Ð°Ñ Ñетка ÑтираетÑÑ, как только их отталкивают. -guide.bloodmagic.entry.ritual.containment.info=Ð’ противоположноÑÑ‚ÑŒ Запрету, Ритуал ÑÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÑÑ Ð¿Ð¾Ð´Ñ‚Ñнуть мобов в пределах его зоны дейÑÑ‚Ð²Ð¸Ñ Ðº проÑтранÑтву над MRS, Ð¿Ð¾Ð´Ð²ÐµÑˆÐ¸Ð²Ð°Ñ Ð¸Ñ… в воздухе, где они не могут двигатьÑÑ. Диапазон ритуала по умолчанию - горизонтальный Ñ€Ð°Ð´Ð¸ÑƒÑ Ð² 3 блока от нижней чаÑти маÑтер-ÐºÐ°Ð¼Ð½Ñ Ð´Ð¾ верхней чаÑти Ñамых верхних рун, Ñ…Ð¾Ñ‚Ñ Ñтот диапазон, конечно, можно изменить.\n\tЭтот ритуал Ñтоит 1LP за моба, потÑнувшего каждый тик. -guide.bloodmagic.entry.ritual.suppression.info=Купол Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Â«Ð¿Ð¾Ð´Ð°Ð²Ð»Ñет» вÑе жидкоÑти в заданном радиуÑе, ÑпоÑобные временно заменить жидкоÑти в полушарии Ñ Ñ€Ð°Ð´Ð¸ÑƒÑом 10 блоков воздухом. ЕÑли ритуал выключен, Ñта жидкоÑÑ‚ÑŒ вернетÑÑ Ð² то же ÑоÑтоÑние, в котором она была раньше. Это Ñтоит 2LP за операционный такт. -guide.bloodmagic.entry.ritual.expulsion.info=ЕÑли вы играете на Ñервере, вы можете ÑтолкнутьÑÑ Ñ Ñитуацией, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ нежелательные поÑетители. Иногда Ñиловые Ð¿Ð¾Ð»Ñ Ð¸ гигантÑкие кровавые роторы не ÑвлÑÑŽÑ‚ÑÑ Ð´Ð¾Ñтаточным Ñдерживающим фактором, и им вÑе же удаетÑÑ Ð¿Ñ€Ð¾Ð½Ð¸ÐºÐ½ÑƒÑ‚ÑŒ на вашу базу. Этот ритуал пытаетÑÑ Ð¾Ð±Ð»ÐµÐ³Ñ‡Ð¸Ñ‚ÑŒ Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ магии телепортации!\n\tЕÑли игрок, не ÑвлÑющийÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼, входит в зону дейÑÑ‚Ð²Ð¸Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð° (по умолчанию Ñ€Ð°Ð´Ð¸ÑƒÑ 12 блоков), ритуал Ñлучайным образом телепортирует игрока в радиуÑе 100 блоков. Однако, еÑли на MRS еÑÑ‚ÑŒ Ñундук Ñ Ð¿Ñ€Ð¸Ð²Ñзанным предметом от игрока, Ñтот игрок будет оÑвобожден от телепортации, дейÑÑ‚Ð²ÑƒÑ Ñффективно как белый ÑпиÑок.\n\tРитуал Ñтоит 2000LP за уÑпешную телепортацию. -guide.bloodmagic.entry.ritual.zephyr.info=Созданный по образцу древнего меча поÑловицы, Зов Зефира иÑпользует Ñилу ветра, чтобы Ñобрать предметы, которые находÑÑ‚ÑÑ Ð²Ð¾ÐºÑ€ÑƒÐ³ него, и помеÑтить их в ÑвÑзанный Ñундук (по умолчанию прÑмо над MRS). Это делаетÑÑ Ð¼Ð³Ð½Ð¾Ð²ÐµÐ½Ð½Ð¾, что означает, что предметы телепортируютÑÑ Ð¿Ñ€Ñмо в инвентарь - не нужно беÑпокоитьÑÑ Ð¾ Ñтранных Ñффектах вÑаÑываниÑ!\n\tÐ Ð°Ð´Ð¸ÑƒÑ Ñлемента по умолчанию ÑоÑтавлÑет 5 блоков от MRS. -guide.bloodmagic.entry.ritual.laying.info=Как извеÑтно многим, возможноÑÑ‚ÑŒ размещать блоки может быть важной в различных задачах автоматизации. Этот ритуал берет предметы / блоки из подключенного Ñундука (по умолчанию Ñверху MRS) и помещает блоки в ритуал, Ñ€Ð°Ð´Ð¸ÑƒÑ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ равен 2 на том же уровне, что и MRS. Это может быть полезно, еÑли вы пытаетеÑÑŒ выложить Ñаженцы Ð´Ð»Ñ Ñ„ÐµÑ€Ð¼Ñ‹ деревьев или еÑли еÑÑ‚ÑŒ другие блоки, которые необходимо размеÑтить. Ритуал берет 50LP за уÑпешную операцию. -guide.bloodmagic.entry.ritual.timberman.info=ЕÑÑ‚ÑŒ дерево? Этот ритуал покрыл тебÑ. Crash of the Timberman привÑзывает Ñпектральную ÑущноÑÑ‚ÑŒ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ LP владельца, чтобы Ñобрать лиÑÑ‚ÑŒÑ Ð¸ бревна вÑех деревьев в пределах Ñвоего диапазона и помещает результаты в подключенный Ñундук. Он попытаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ вÑе «деревьÑ» в горизонтальном радиуÑе 10 блоков и до 30 блоков выше MRS (по умолчанию) и иÑпользовать 10LP на Ñрубленный блок. -guide.bloodmagic.entry.ritual.meteor.info=Ð”Ð»Ñ Ð²Ñех намерений и целей, Ñто один из Ñамых мощных ритуалов в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð² игре. ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñтоит один миллион LP и может быть иÑпользована только один раз перед повторной активацией. Ритуал, когда ÑовершаютÑÑ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ñ‹Ðµ жертвы, вытÑгивает метеор из коÑмоÑа и заÑтавлÑет его резко упаÑÑ‚ÑŒ к земле, Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ взрыв, когда он попадает во что-то твердое. ПоÑкольку Ñти метеоры не из Мира, они могут Ñодержать богатую плотноÑÑ‚ÑŒ руды, которую никогда не видели больше нигде.\n\tÐ–ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ включать в ÑебÑ: железный блок, золотой блок, алмаз. Это наÑтраиваетÑÑ Ð¼Ð¾Ð´Ð¿Ð°ÐºÐ¾Ð¼ или пользователем. -guide.bloodmagic.entry.ritual.downgrade.info=Чтобы получить больше Ñилы, иногда приходитÑÑ Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ñ‚ÑŒ чем-то взамен. ПокаÑние ОÑвобожденной Души делает именно Ñто - Ð¶ÐµÑ€Ñ‚Ð²ÑƒÑ Ð½ÐµÑколькими предметами невидимой ÑущноÑти, вы можете Ñнизить ÑффективноÑÑ‚ÑŒ какого-либо аÑпекта вашей Живой Брони и увеличить количеÑтво очков ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð² качеÑтве компенÑации. Когда вы Ñоздаете ритуал, вы должны размеÑтить рамку предмета на Ñамом верхнем ПуÑтом ритуальном камне, обращенном к Камню Главного Ритуала, и какой-то инвентарь (Ñм. Сундук) на вершине ÐšÐ°Ð¼Ð½Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ заката. Чтобы получить Понижение ÑƒÑ€Ð¾Ð²Ð½Ñ Ð–Ð¸Ð²Ð¾Ð¹ Брони, вы должны помеÑтить ключевой предмет в раму предмета и раÑходные материалы в Ñундук. Как только ритуал активирован, вы можете в любой момент прокраÑÑ‚ÑŒÑÑ Ð½Ð° МаÑтер ритуальный камень и получить понижение рейтинга.\n\tÐ’ Ñлучае Ð¿Ð¾Ð½Ð¸Ð¶ÐµÐ½Ð¸Ñ Â«Ð—Ð°ÐºÐ°Ð»ÐµÐ½Ð½Ð°Ñ Ð¶Ð¸Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ» его ключевым предметом ÑвлÑетÑÑ Ð±ÑƒÑ‚Ñ‹Ð»ÐºÐ° Ñ Ð²Ð¾Ð´Ð¾Ð¹ (помещаетÑÑ Ð² рамку предмета), а рецептом ÑвлÑетÑÑ Â«Ð”Ñ‹Ñ…Ð°Ð½Ð¸Ðµ дракона» (помещаетÑÑ Ð² Ñундук). Ключевой предмет никогда не раÑходуетÑÑ, но рецепт еÑÑ‚ÑŒ.\n\tЧтобы проÑмотреть рецепт понижениÑ, вы можете поÑмотреть их в JEI - проверьте иÑпользование Master Ritual Stone, и вы увидите рецепты Ð´Ð»Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð° ПокаÑниÑ. Также вы можете проÑто проверить рецепт Ð´Ð»Ñ Ð¼Ð°ÐºÑимального ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð² JEI, а затем проверить иÑпользование ключевого Ñлемента - ключевой Ñлемент вÑегда одинаков Ð´Ð»Ñ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ рейтинга. -guide.bloodmagic.entry.ritual.crystalSplit.info=ПоÑле того, как Ð’Ð¾Ð»Ñ Ð”ÐµÐ¼Ð¾Ð½Ð° криÑталлизовалаÑÑŒ, невозможно разделить ее на множеÑтво аÑпектов - или Ñ Ñ‚Ð°Ðº думал до Ñих пор. Â«Ð ÐµÐ·Ð¾Ð½Ð°Ð½Ñ Ð¾Ð³Ñ€Ð°Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ криÑталла» работает путем Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼Ð½Ð¾Ð¶ÐµÑтва аÑпектов внутри неведомого (или необработанного) клаÑтера криÑталлов Ñ Ð¸Ñпользованием различных аÑпектированных ритуальных камней. \n\tЧтобы иÑпользовать ритуал, неожиданный клаÑтер криÑталлов должен быть размещен в двух кварталах над Камнем МаÑтера Ритуала. Другими Ñловами, вы можете помеÑтить криÑталлизатор поверх MRS и клаÑтер криÑталлов поверх него, и он должен хорошо работать. Затем вы должны убедитьÑÑ, что нет никаких блоков непоÑредÑтвенно над Ñ‡ÐµÑ‚Ñ‹Ñ€ÑŒÐ¼Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¼Ð¸ камнÑми на оÑнове Ñлементов, а затем дождатьÑÑ Ñ€Ð¾Ñта клаÑтера криÑталлов. \n\tПоÑле того, как клаÑтер Ð²Ñ‹Ñ€Ð¾Ñ Ð² общей ÑложноÑти пÑÑ‚ÑŒ или более духа, ритуал отделилаÑÑŒ и Ñоздать Ñти шпили коррозионного каждый один дух, твердо, мÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸ Ñ€Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»ÑŽ аÑпектированного ритуала на вершине камней. Unaspected, еÑли клаÑтер имеет право раÑти и дальше, и Ñти новые клаÑтеры оÑтаютÑÑ Ð½ÐµÑ‚Ñ€Ð¾Ð½ÑƒÑ‚Ñ‹Ð¼Ð¸, процеÑÑ Ð±ÑƒÐ´ÐµÑ‚ повторÑÑ‚ÑŒÑÑ ÑˆÐ¿Ð¸Ð»Ñми и больше будет добавлен. \n\tМеханизм Ñтого процеÑÑа довольно проÑÑ‚. Когда у криÑталла Ðеобработанной Воли еÑÑ‚ÑŒ по крайней мере пÑÑ‚ÑŒ шпилей, ритуал разрывает четыре из Ñтих шпилей и преобразует Волю в ее более беÑтелеÑную форму. Затем Ñта Ð’Ð¾Ð»Ñ Ð¾Ñ‚Ð±Ñ€Ð°Ñывает поÑледний шпиль ÑкоплениÑ, что заÑтавлÑет различные аÑпекты Воли превращатьÑÑ Ð² более локализованные ÑÐºÐ¾Ð¿Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ аÑпекта. Затем Ñта Ð’Ð¾Ð»Ñ ÑобираетÑÑ Ð² ритуальные камни, которые Ñлужат оÑновой, из которой могут выраÑтать новые аÑпектированные криÑталличеÑкие клаÑтеры. -guide.bloodmagic.entry.ritual.portal.info=##REQ-LORE##\n\t Врата Сгиба - Ñто ритуал, предназначенный Ð´Ð»Ñ Ð¼ÐµÐ¶Ð¿Ñ€Ð¾ÑтранÑтвенной телепортации без необходимоÑти дополнительного взаимодейÑтвиÑ. ПоÑле активации вÑе блоки, которые каÑаютÑÑ ÐµÐ³Ð¾ ритуальных камней, иÑпользуютÑÑ Ð² качеÑтве ключевого шаблона Ð´Ð»Ñ ÑвÑзи порталов вмеÑте. ЕÑли ÑущеÑтвуют другие Ворота Сгиба Ñ Ñ‚ÐµÐ¼ же ключом, ритуалы будут ÑвÑзаны вмеÑте и мгновенно пройдут через телепортацию к Ñвоему близнецу. Одновременно могут ÑущеÑтвовать только до 2 порталов Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼ ключом.\n\t СтоимоÑÑ‚ÑŒ активации: 50,000LP\n\t СтоимоÑÑ‚ÑŒ телепортации: 1,000LP (одинаковое измерение) / 10,000LP (разные размеры) -guide.bloodmagic.entry.ritual.altarBuilder.info=##REQ-LORE##\n\t Сборка Ð’Ñ‹Ñокого ÐÐ»Ñ‚Ð°Ñ€Ñ - Ñто ритуал, позволÑющий быÑтро поÑтроить новый алтарь-зиккурат из блоков в прилагаемом инвентаре (обычно Ñто Ñундук Ñверху MRS).\n\tСтоимоÑÑ‚ÑŒ активации: 450LP\n\tСтоимоÑÑ‚ÑŒ за размещенный компонент: 75LP -guide.bloodmagic.entry.ritual.pump.info=##REQ-LORE##\n\t Гимн Ð¡Ð¸Ñ„Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñтей в мире вокруг или под ритуалом в подходÑщий контейнер (например, в Кровавый Бак) над MRS. ЖидкоÑти в мире заменены каменными, Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰Ð°Ñ Ñ‚ÐµÐºÑƒÑ‡Ð¸Ðµ жидкоÑти, которые могут вызвать проблемы Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñтью.\n\tСтоимоÑÑ‚ÑŒ активации: 500LP\n\tСтоимоÑÑ‚ÑŒ за операцию: 250LP -guide.bloodmagic.entry.ritual.cobble.info=##REQ-LORE##\n\t УÑтали от ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из Ñтих примитивных зданий Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ булыжника? Ð’Ñ‹ уÑтали от Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ OSHA на Ð²Ð°Ñ Ð¸Ð»Ð¸ Ñлучайно погаÑили ваш иÑточник лавы? Этот ритуал Ð´Ð»Ñ Ð²Ð°Ñ. Генерируйте непреодолимые маÑÑÑ‹ булыжника быÑтрым и Ñффективным ÑпоÑобом Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ крови, пригодной Ð´Ð»Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ³Ð¾, вмеÑто иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð¿Ð°Ñной и ограниченной лавы (еÑли только вы не генерируете лаву из крови). \n\n\t Этот ритуал генерирует (по умолчанию) булыжник поверх Ñамого ÑебÑ, который затем может быть добыт Ð´Ð»Ñ Ð»Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ иÑпользованиÑ. \n\t СтоимоÑÑ‚ÑŒ активации: 500LP\n\t СтоимоÑÑ‚ÑŒ за блок: 25LP -guide.bloodmagic.entry.ritual.ellipsoid.info=##REQ-LORE##\n\t Ð¤Ð¾ÐºÑƒÑ ÑллипÑоида Ñоздает полую Ñферу (по умолчанию) из материалов в инвентаре, подключенном к MRS (обычно Ñундук поверх MRS).\n\t СтоимоÑÑ‚ÑŒ активации: 20,000LP\n\t СтоимоÑÑ‚ÑŒ за размещенный блок: 5LP -guide.bloodmagic.entry.ritual.crystalHarvest.info=##REQ-LORE##\n\t Трещина Ñломанного криÑталла разрывает вÑе, кроме одного ÑˆÐ¿Ð¸Ð»Ñ Ð²Ñех клаÑтеров КриÑталла Воли Демона, и броÑает их на землю. Ð’ Ñочетании Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»Ð¾Ð¼ «Зов Зефира» Ñти предметы не могут быть Ñобраны и помещены в инвентарь Ð´Ð»Ñ Ð¿Ð¾Ñледующего иÑпользованиÑ.\n\t СтоимоÑÑ‚ÑŒ активации: 40,000LP \n\t СтоимоÑÑ‚ÑŒ за операцию: 50LP -guide.bloodmagic.entry.ritual.forsakenSoul.info=##REQ-LORE##\n\t Сбор ОтрекшихÑÑ Ð”ÑƒÑˆ уÑкорÑет роÑÑ‚ КриÑталлов Демонов Ð´Ð»Ñ ÐºÐ»Ð°Ñтеров криÑталлов выше ритуала (по умолчанию). Он не генерирует волю Ñам по Ñебе, но требует, чтобы под клаÑтерами криÑталлов были КриÑталлизаторы Демонов. Чтобы Ñделать Ñто, он иÑпользует механику, извеÑтную как «уникальноÑть» мобов. Чем больше мобов погибнет, тем Ñффективнее будет роÑÑ‚ криÑталлов. Сама она не генерирует Ðуру ДемоничеÑкой Воли, поÑтому вам нужно Ñнабдить ее либо путем подачи обратно криÑталлов, либо путем Ð¿Ð¾Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¢Ð°Ñ€Ñ‚Ð°Ñ€Ð½Ð¾Ð³Ð¾ ÐšÐ°Ð¼Ð½Ñ Ñ Ð²Ð¾Ð»ÐµÐ¹ в Тигель Демона. Это должно иÑключить необходимоÑÑ‚ÑŒ выходить на ферму демоничеÑкой воли, еÑли только вы не предоÑтавите мобов, чтобы накормить ее и / или иÑчерпать волю.\n\t СтоимоÑÑ‚ÑŒ активации: 40,000LP\n\t СтоимоÑÑ‚ÑŒ за тик урона и моб: 2LP -guide.bloodmagic.entry.ritual.animalGrowth.info=##REQ-LORE##\n\t Ритуал Шефарда значительно увеличивает ÑкороÑÑ‚ÑŒ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ животные раÑтут.\n\t Это также увеличивает ÑкороÑÑ‚ÑŒ размножениÑ, еÑли поÑтавлÑетÑÑ Ñ Vengeful Will или делает животных ÑпоÑобными иÑкать враждебных мобов и взрыватьÑÑ Ð½Ð° них, еÑли Ñнабжено Destructive Will. Ð’ любом Ñлучае, еÑли поÑтавлÑетÑÑ Ñ Steadfast Will, он автоматичеÑки будет кормить животных едой из Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ð²Ñ‹ÑˆÐµ MRS (по умолчанию).\n\t СтоимоÑÑ‚ÑŒ активации: 10,000LP\n\t СтоимоÑÑ‚ÑŒ за операцию и животное: 2LP -guide.bloodmagic.entry.ritual.livingEvolution.info=##REQ-LORE##\n\t Ритуал Живой Эволюции увеличивает макÑимальное количеÑтво очков ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð–Ð¸Ð²Ð¾Ð¹ Брони до 300. Чтобы иÑпользовать его, проÑто активируйте ритуал, а затем наÑтупите на MRS Ñ Ñкипированным набором Живой Брони.\n\t СтоимоÑÑ‚ÑŒ активации: 50,000LP -guide.bloodmagic.entry.ritual.upgradeRemove.info=##REQ-LORE##\n\t Ритуал Очищающей Души удалÑет вÑе ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð¸ Ð¿Ð¾Ð½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· набора Живой Брони. Чтобы иÑпользовать его, проÑто активируйте ритуал, а затем наÑтупите на MRS Ñ Ñкипированным набором Living Armor.\n\t СтоимоÑÑ‚ÑŒ активации: 50,000LP -guide.bloodmagic.entry.ritual.fullStomach.info=##REQ-LORE##\n\t Ритуал наÑыщенного желудка кормит игроков в Ñтой облаÑти едой из Ñундука над MRS. Пищу кормÑÑ‚ Ñффективным ÑпоÑобом, еÑли пища не обеÑпечивает более макÑимального наÑыщениÑ, и в Ñтом Ñлучае ее вÑе равно кормÑÑ‚.\n\t СтоимоÑÑ‚ÑŒ активации: 100 000\n\tСтоимоÑÑ‚ÑŒ за операцию: 20LP -guide.bloodmagic.entry.ritual.eternalSoul.info=##REQ-LORE##\n\t Крик Вечной Души ÑпоÑобен кормить LP из Сети Души обратно в алтарь. Это подпадает под обычные Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð°ÐºÐ°Ñ‡ÐºÐ¸ (жидкой) жизненной ÑущноÑти в алтарь. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° LP, Ð¿ÐµÑ€ÐµÐ´Ð°Ð½Ð½Ð°Ñ Ð² алтарь, Ñтоит 2 LP от Ñети.\n\t СтоимоÑÑ‚ÑŒ активации: 2,000,000LP\n\t СтоимоÑÑ‚ÑŒ за операцию: 2 LP -guide.bloodmagic.entry.ritual.condor.info=##REQ-LORE##\n\t Уважение к Кондору позволÑет игрокам Ñовершать полеты в окреÑтноÑÑ‚ÑÑ… ритуала.\n\t СтоимоÑÑ‚ÑŒ активации: 1,000,000LP\n\t СтоимоÑÑ‚ÑŒ за операцию: 2LP -guide.bloodmagic.entry.ritual.featheredEarth.info=##REQ-LORE##\n\t Ритуал Пернатой Земли поÑтоÑнно уменьшает выÑоту Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð´Ð¾ 0, Ñффективно уÑтранÑÑ ÑƒÑ€Ð¾Ð½ от падениÑ.\n\t СтоимоÑÑ‚ÑŒ активации: 5,000LP\n\tСтоимоÑÑ‚ÑŒ за Ñекунду: 20LP -guide.bloodmagic.entry.ritual.grounding.info=##REQ-LORE##\n\ŧ Ритуал Ð—Ð°Ð·ÐµÐ¼Ð»ÐµÐ½Ð¸Ñ Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€ÑƒÐµÑ‚ гравитацией в Ñвоей облаÑти. По умолчанию он перетаÑкивает мобов на землю и предотвращает прыжки.\n\t Снабжение ритуала Ñырой волей влиÑет на игроков в дополнение к мобам.\n\t Ð Ð°Ð·ÑŠÐµÐ´Ð°ÑŽÑ‰Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ñто отключает гравитацию вÑе вмеÑте.\n\t Ð Ð°Ð·Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ð¾Ð»Ñ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ увеличивает урон от падений пораженных ÑущеÑтв.\n\t ÐÐµÐ¿Ð¾ÐºÐ¾Ð»ÐµÐ±Ð¸Ð¼Ð°Ñ Ð²Ð¾Ð»Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет ритуалу воздейÑтвовать на боÑÑов.\n\t Одна лишь ÐœÑÑ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð’Ð¾Ð»Ñ ÑƒÑиливает Ñффект Ð·Ð°Ð·ÐµÐ¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñочетании Ñ ÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ð¹Ð½Ð¾Ð¹ волей, однако вмеÑто Ñтого она транÑформирует ритуал, чтобы обеÑпечить левитацию. Vengeful Will также увеличивает Ñффект Heavy Heart, еще больше ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÑƒÑ€Ð¾Ð½ от падениÑ.\n\t СтоимоÑÑ‚ÑŒ активации: 5,000LP\n\tСтоимоÑÑ‚ÑŒ за Ñекунду: 20LP - -# Architect Entries -guide.bloodmagic.entry.architect.intro=ПредиÑловие -guide.bloodmagic.entry.architect.bloodaltar=Кровавый алтарь -guide.bloodmagic.entry.architect.ash=Тайный пепел -guide.bloodmagic.entry.architect.divination=Символ Ð³Ð°Ð´Ð°Ð½Ð¸Ñ -guide.bloodmagic.entry.architect.soulnetwork=Душа Сеть -guide.bloodmagic.entry.architect.weakorb=Ð¡Ð»Ð°Ð±Ð°Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ð¡Ñ„ÐµÑ€Ð° -guide.bloodmagic.entry.architect.incense=Ðлтарь ладана -guide.bloodmagic.entry.architect.bloodrune=Обновление вашего ÐÐ»Ñ‚Ð°Ñ€Ñ -guide.bloodmagic.entry.architect.inspectoris=ИнÑпектор блок (блок Ñчитывание) -guide.bloodmagic.entry.architect.runeSpeed=СкороÑÑ‚Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° -guide.bloodmagic.entry.architect.water=Сигил воды -guide.bloodmagic.entry.architect.lava=Сигил лавы -guide.bloodmagic.entry.architect.lavaCrystal=КриÑталл лавы -guide.bloodmagic.entry.architect.apprenticeorb=Ученик Кровавого Шара -guide.bloodmagic.entry.architect.dagger=Кинжал Ð–ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ -guide.bloodmagic.entry.architect.runeSacrifice=Руна Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ -guide.bloodmagic.entry.architect.runeSelfSacrifice=Руна ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ -guide.bloodmagic.entry.architect.holding=Сигил ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ -guide.bloodmagic.entry.architect.air=Сигил воздуха -guide.bloodmagic.entry.architect.void=Сигил пуÑтоты -guide.bloodmagic.entry.architect.greenGrove=Сигил зеленой рощи -guide.bloodmagic.entry.architect.fastMiner=Sigil of the Fast Miner -guide.bloodmagic.entry.architect.seer=Сигил провидца -guide.bloodmagic.entry.architect.magicianOrb=Маги Кровавый Шар -guide.bloodmagic.entry.architect.capacity=Руна ЕмкоÑти -guide.bloodmagic.entry.architect.displacement=Руна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ -guide.bloodmagic.entry.architect.affinity=Sigil of Elemental Affinity -guide.bloodmagic.entry.architect.lamp=Сигил кровавого Ñветильника -guide.bloodmagic.entry.architect.magnetism=Сигил магнетизм -guide.bloodmagic.entry.architect.peritia=Фолиант ÑкÑпертизы -guide.bloodmagic.entry.architect.livingArmour=Ð–Ð¸Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ -guide.bloodmagic.entry.architect.upgradeTome=Ð–Ð¸Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Томов -guide.bloodmagic.entry.architect.teleposer=Телепортер -guide.bloodmagic.entry.architect.boundBlade=СвÑзанный клинок -guide.bloodmagic.entry.architect.boundTool=СвÑзанные инÑтрументы -guide.bloodmagic.entry.architect.weakShard=Слабый кровавый оÑколок -guide.bloodmagic.entry.architect.masterOrb=МаÑтер крови Ñфере -guide.bloodmagic.entry.architect.runeOrb=Руна Ñфера -guide.bloodmagic.entry.architect.suppression=Сигил ÐŸÐ¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -guide.bloodmagic.entry.architect.haste=Cигил уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ -guide.bloodmagic.entry.architect.severance=Sigil of Ender Severance -guide.bloodmagic.entry.architect.teleposition=Сигил телепозиции -guide.bloodmagic.entry.architect.compression=Сигил ÑÐ¶Ð°Ñ‚Ð¸Ñ -guide.bloodmagic.entry.architect.bridge=Сигил призрачного моÑта -guide.bloodmagic.entry.architect.mimic=Mimics подражает -guide.bloodmagic.entry.architect.downgrade=Понижение живой брони - -guide.bloodmagic.entry.architect.augmentedCapacity=Руна дополненной ÑпоÑобноÑти -guide.bloodmagic.entry.architect.charging=ЗарÑÐ´Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° -guide.bloodmagic.entry.architect.acceleration=Руна уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ - -guide.bloodmagic.entry.architect.tier3=Уровень 3 под морем - -# Architect Entry Texts -guide.bloodmagic.entry.architect.intro.info=ЗдравÑтвуйте вÑе. ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Тиберий. По Ñтой запиÑи вы, вероÑтно, можете Ñказать, что книга не ÑовÑем завершена, и вы были бы правы. Из-за обновлений 1.7.10 -> 1.8.9 и 1.9.4 (и выше) в моде многое изменилоÑÑŒ. Таким образом, книги должны были быть перепиÑаны. ПоÑкольку окончательный план Ð´Ð»Ñ Ñтих документов ÑоÑтоит в том, чтобы ÐºÐ°Ð¶Ð´Ð°Ñ ÐºÐ½Ð¸Ð³Ð° имела форму иÑÑледовательÑкого журнала / фактичеÑкой книги, Ñти документы потребуют времени, чтобы конкретизировать. ПоÑтому Ñ Ð±ÑƒÐ´Ñƒ периодичеÑки обновлÑÑ‚ÑŒ Ñту книгу, чтобы заполнить необходимые пробелы. Это начнетÑÑ ÐºÐ°Ðº муÑор без запаха, чтобы начать Ñ (Да ... не Ñамые аппетитные иллюÑтрации, чтобы пойти Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸, но безотноÑительно!), Ðо поÑтепенно Ñто превратитÑÑ Ð² иÑторию о куче кровавых магов во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÑƒÑ‚ÐµÑˆÐµÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾ открытие.\n\tÐо хватит об Ñтом, мне нужно войти в характер. * Кашель *\n\tÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Тиберий, и Ñ ÐœÐ°Ð³ крови, и также извеÑтный как Ðрхитектор. Эта книга Ñодержит вÑе мои иÑÑледованиÑ, каÑающиеÑÑ Ñфирного феномена, называемого «Сетью Души», а также физичеÑких ÑвойÑтв некоторых из Ñамых центральных уÑтройÑтв, к которым должен привыкнуть любой Кровавый Маг. Я обнаружил, переÑмотрел и Ñоздал новые пути в иÑкуÑÑтве ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñтруктуры мощного Кровавого ÐлтарÑ, в хитроÑплетениÑÑ… жертвенной жизненной Ñилы, чтобы увеличить Ñилу мага, и в дальнейшем к Ñилам, полученным Ð±Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñ‚Ð°Ð¹Ð½Ñ‹Ð¼ глифам и Ñимволам. тренировать ÑÐµÐ±Ñ Ðº новым выÑотам.\n\tТак что входите, Маг, ибо новое царÑтво ждет ваÑ!\n\t... Да, Маг говорит, что Ñ Ð¼Ð¾Ð³Ñƒ Ñтать немного грандиозным, но что Ñ‚Ñ‹ можешь Ñделать? -guide.bloodmagic.entry.architect.bloodaltar.info.1=Кровавый Ðлтарь - одно из Ñамых центральных уÑтройÑтв в моде. У Ð°Ð»Ñ‚Ð°Ñ€Ñ ÐµÑÑ‚ÑŒ два оÑновных ÑпоÑоба иÑпользованиÑ: либо Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ñ… предметов, необходимых Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´Ð°, либо Ð´Ð»Ñ Ð½Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñвоей Кровавой Сферы. Оба Ñтих дейÑÑ‚Ð²Ð¸Ñ Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ от игрока Ð½Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð±Ð°ÑÑейна Жизненной СущноÑтью, которую можно извлечь из двух разных иÑточников: монÑтров и мирных ÑущеÑтв, а также из ÑобÑтвенного Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð¸Ð³Ñ€Ð¾ÐºÐ°. -guide.bloodmagic.entry.architect.bloodaltar.info.2=Чтобы добавить Ñвою ÑобÑтвенную СущноÑÑ‚ÑŒ Жизни в баÑÑейн, вам нужно изготовить Ñебе Жертвенный Кинжал и щелкнуть по нему правой кнопкой мыши Ñ€Ñдом Ñ Ð°Ð»Ñ‚Ð°Ñ€ÐµÐ¼. Это обретет душевное здоровье и добавит 200 фунтов к алтарю без улучшений. «LP» - Ñто «Очки жизни», которые показывают, Ñколько жизненной Ñилы иÑпользуетÑÑ Ð² задании - нет, Ñто не похоже на YuGi-Oh. Кровавый Ðлтарь имеет вмеÑтимоÑÑ‚ÑŒ 10000 латов. ЕÑли вы затем щелкните правой кнопкой мыши на алтаре, вы можете помеÑтить предмет в баÑÑейн, и, еÑли Ñто дейÑтвительный предмет, алтарь начнет процеÑÑ Ð¸Ð·Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ.\n\tÐлтарь обрабатывает предмет, потреблÑÑ Ð›ÐŸ в тазу, еÑли алтарь доÑтаточно выÑокого уровнÑ. ЕÑли будет доÑтаточно LP, алтарь будет отводить немного LP из баÑÑейна каждый тик и увеличивать ход крафта, иÑпуÑÐºÐ°Ñ ÐºÑ€Ð°Ñные чаÑтицы. ЕÑли в баÑÑейне больше нет LP, алтарь иÑпуÑтит Ñерые чаÑтицы, и ремеÑло начнет терÑÑ‚ÑŒ прогреÑÑ, что ÑовÑем не хорошо! Ðаконец, еÑли алтарь заполнÑет Сферу Крови, алтарь будет иÑпуÑкать пурпурные чаÑтицы, чтобы указать, что он Ñифонирует LP из баÑÑейна.\n\tÐа Ñамом деле в Ðлтаре Крови находитÑÑ Ñ‚Ñ€Ð¸ танка: оÑновной танк, емкоÑÑ‚ÑŒ которого по умолчанию ÑоÑтавлÑет 10 кПа, как указано ранее, а также входной и выходной баки, каждый из которых имеет 10 %% от общей вмеÑтимоÑти. оÑновной танк. Каждые 20 тиков по умолчанию LP во входном баке будет передаватьÑÑ Ð² оÑновной бак Ñо ÑкороÑтью 20 л / Ñ, а LP в оÑновном баке будет передаватьÑÑ Ð² выходной бак Ñо ÑкороÑтью 20 л / Ñ. Как Ñледует из названий, входной резервуар принимает LP, который закачиваетÑÑ Ð² алтарь, выÑÑ‚ÑƒÐ¿Ð°Ñ Ð² качеÑтве буфера Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑкороÑти передачи из внешних иÑточников, и выходной резервуар можно извлечь из труб из алтарÑ. -guide.bloodmagic.entry.architect.ash.info=Ð¥Ð¾Ñ‚Ñ Arcane Ash не ÑвлÑетÑÑ Ñ‡Ð°Ñтью общей темы Ñтой книги, он необходим Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы пройти через мод и получить доÑтуп к некоторым из более мощных уÑтройÑтв. Этот пепел Ñоздан Ñ Ð¸Ñпользованием Кузницы ÐдÑкого Пламени и Воли Демона, поÑтому, еÑли вы новичок в Ñтой концепции, обратитеÑÑŒ к «Кин Демона». По Ñути, Ñто ÑпоÑоб Ð¸Ð·Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð² из двух отдельных предметов: какого-то реагента, который дейÑтвует как катализатор, и вторичного предмета. \n\tПепел имеет в общей ÑложноÑти двадцать применений, прежде чем вам понадобитÑÑ Ñоздать еще один. Когда вы щелкнете правой кнопкой мыши по земле (или Ñтене, Ñ…Ð¾Ñ‚Ñ Ð¾Ð½Ð° будет отображать только одно направление), вы начертите проÑтой круг из пепла. ЕÑли Ñнова щелкнуть по пеплу Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð¼, он будет «помещен в пепел» - при уÑловии, что Ñтот предмет ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным катализатором, круг изменит форму, чтобы показать, что он готов к Ñледующему предмету. ЕÑли Ñто не менÑет форму, значит, вы Ñделали что-то не так.\n\tКак только он изменил форму, вы можете помеÑтить его в дополнительный предмет. ЕÑли Ñтот Ñлемент Ñовпадает Ñ Ð¿ÐµÑ€Ð²Ñ‹Ð¼, круг начнет вращатьÑÑ Ð¸ выполнÑÑ‚ÑŒ различные дейÑÑ‚Ð²Ð¸Ñ Ð² завиÑимоÑти от рецепта, над которым он работает. Через некоторое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¸ правильном выполнении Ñлемент выÑкочит.\n\tÐ’Ñе рецепты Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð·Ð°ÐºÐ»Ð¸Ð½Ð°Ð½Ð¸Ñ Â«Ð§Ð°Ñ€Ð¾Ð´ÐµÐ¹Ñкий пепел» (Ñ Ð½Ð°Ð·Ñ‹Ð²Ð°ÑŽ Ñто «Создание алхимичеÑкого маÑÑива») можно найти в JEI, проверив иÑпользование «ЧародейÑкого пепла» - первый показанный предмет - катализатор, а второй - вторичный предмет. -guide.bloodmagic.entry.architect.divination.info=Символ Ð³Ð°Ð´Ð°Ð½Ð¸Ñ - один из Ñамых полезных инÑтрументов в моде, ÑпоÑобный раÑÑказать вам о многих ценноÑÑ‚ÑÑ…, которые Ñделают вашу жизнь проще. Этот Ñимвол изготовлен Ñ Ð¸Ñпользованием куÑочка краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ чиÑтого лиÑта (Ñозданного в Ðлтаре Крови) Ñ Ð¸Ñпользованием набора алхимии.\n\tКогда вы щелкнете правой кнопкой мыши на Ðлтаре Крови Ñ Ñимволом, вы увидите текущий уровень, количеÑтво ЛП внутри оÑновного баÑÑейна, а также макÑимальную емкоÑÑ‚ÑŒ Кровавого ÐлтарÑ. Ðажатие Ñпама на алтарь Ñ Ñимволом перезапишет предыдущий текÑÑ‚ Ñ Ñимвола, означаÑ, что в вашем чате не будет никакого Ñпама.\n\tЕÑли вы щелкнете правой кнопкой мыши в Ñфире Ñ Ñимволом, он Ñообщит вам текущее количеÑтво LP, которое находитÑÑ Ð² вашей Душа Сеть. Ð¥Ð¾Ñ‚Ñ Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° Ñто довольно обыденно, одна только Ñта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¾Ñ‡ÐµÐ½ÑŒ вероÑтно, что вы захотите вÑегда держать Ñтот Ñимвол на Ñебе. -guide.bloodmagic.entry.architect.soulnetwork.info=Сеть Души (обычно Ñокращенно SN) - Ñто термин, обозначающий ÑвÑзи между игроком и вÑеми предметами и Ñтруктурами, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ он ÑвÑзал Ñвою душу. Когда маг крови ÑтановитÑÑ Ð±Ð¾Ð»ÐµÐµ могущеÑтвенным, Ñила их души увеличиваетÑÑ Ð¸ укреплÑет Ñти ÑвÑзи. Эти ÑвÑзи ÑвлÑÑŽÑ‚ÑÑ Ñфирными нитÑми души, и только Ñамые могущеÑтвенные из Кровавых Волхвов ÑпоÑобны увидеть их в их физичеÑкой форме. Ðа ÑегоднÑшний день ни один маг не доÑтиг Ñтой ÑпоÑобноÑти ...\n\tÐ’ игре Сеть Души привÑзана непоÑредÑтвенно к игроку. Данные хранÑÑ‚ÑÑ Ð² мире, и у каждого игрока еÑÑ‚ÑŒ только одна Ñеть - LP, помещенный в Ñеть, не хранитÑÑ Ð½Ð¸ в одном Ñлементе, а вмеÑто Ñтого помещаетÑÑ Ð¸ беретÑÑ Ð¸Ð· одного пула. \n\tЧтобы ÑвÑзать вещи Ñ Ð²Ð°ÑˆÐµÐ¹ Ñетью, наиболее раÑпроÑтраненный ÑпоÑоб - проÑто щелкнуть правой кнопкой мыши Ñлемент, который иÑпользует Ñеть Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ. ПоÑле привÑзки предмет будет указывать, что он принадлежит вам, и он никогда не может быть оÑвобожден (Ñ Ð¸Ñпользованием текущей технологии). ЕÑли Ñтот предмет иÑпользуетÑÑ Ð¸ ему припиÑана ÑтоимоÑÑ‚ÑŒ ЛП, он получит ЛП из Ñети владельца. ЕÑли в Ñтой Ñети недоÑтаточно LP, недоÑтающий LP будет извлечен непоÑредÑтвенно из ÑоÑтоÑÐ½Ð¸Ñ Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (а не владельца). Будьте оÑторожны при иÑпользовании предметов, когда у Ð²Ð°Ñ Ð¼Ð°Ð»Ð¾ LP - Ñто может закончитьÑÑ Ñмертельным иÑходом. -guide.bloodmagic.entry.architect.weakorb.info.1=Что хорошего в Ñтом маге без иÑточника Ñнергии? Blood Orb - Ñто уÑтройÑтво, которое потреблÑет физичеÑкий LP и передает его в Душа Сеть владельца. Ð¥Ð¾Ñ‚Ñ Ñто и не Ñама батареÑ, она дейÑтвует как канал, чтобы воÑполнить резервы Ñнергии мага крови. -guide.bloodmagic.entry.architect.weakorb.info.2=Ð¡Ð»Ð°Ð±Ð°Ñ Ð¡Ñ„ÐµÑ€Ð° Крови - Ñто Ð¿ÐµÑ€Ð²Ð°Ñ Ñ‚Ð°ÐºÐ°Ñ Ñфера, которую вы можете Ñоздать. Ð’Ð»Ð¸Ð²Ð°Ñ Ð°Ð»Ð¼Ð°Ð· внутри ÐÐ»Ñ‚Ð°Ñ€Ñ ÐšÑ€Ð¾Ð²Ð¸ Ñ 2 кПа, вы можете Ñоздать Ñтот шар. Будучи ÑвÑзанным и помещенным в алтарь Ñ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ количеÑтвом ЛП в нем, Ñфера будет откачивать из баÑÑейна и передавать Ñтот ЛП непоÑредÑтвенно в Ñеть. ÐšÐ°Ð¶Ð´Ð°Ñ Ñфера имеет макÑимальную вмеÑтимоÑÑ‚ÑŒ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть раÑширена только продвинутыми рунами на алтаре. Ð”Ð»Ñ Weak Blood Orb Ñта макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð¼ÐµÑтимоÑÑ‚ÑŒ ÑоÑтавлÑет 5 LP.\n\tКровавые шары также можно заполнить непоÑредÑтвенно от игрока, проÑто щелкнув по ним правой кнопкой мыши - Ñто перенеÑет Ñердце Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð² шар и даÑÑ‚ вам 200LP. Это не может превышать макÑимальную емкоÑÑ‚ÑŒ шара.\n\tÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ñфера может быть заполнена только уровнем Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¸Ð»Ð¸ выше; Ñто означает, что еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ шар T3, он должен быть заполнен в алтаре, который больше или равен T3. ПроÑтой алтарь Т1 не подойдет в Ñтой Ñитуации. -guide.bloodmagic.entry.architect.incense.info.1=БыÑтро обнаружитÑÑ, что ÑкороÑÑ‚ÑŒ генерации LP может Ñтать вÑе более обременительной. Конечно, добавлÑÑ Ñпециальные руны к Кровавому Ðлтару, вы можете увеличить количеÑтво Ñамоотверженных жертв, но Ñто вÑе равно может быть медленным процеÑÑом. ЕÑли бы только был ÑпоÑоб еще больше увеличить, Ñколько LP вы можете получить от ÑебÑ?\n\tВойдите в алтарь ладана. Ðлтарь ладана дейÑтвует как Ñ†ÐµÐ½Ñ‚Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° Ð´Ð»Ñ Ñпокойной облаÑти, уÑÐ¿Ð¾ÐºÐ°Ð¸Ð²Ð°Ñ Ð´ÑƒÑˆÑƒ нежными волнами, которые иÑходÑÑ‚ из баÑÑейна. Откуда иÑходит Ñтот запах, вы не ÑовÑем уверены, но что может пойти не так?\n\tЦель Ñтого блока - Ñоздать зону ÑпокойÑтвиÑ, чтобы увеличить количеÑтво LP, которое вы получаете из Ñердца здоровьÑ. Когда вы находитеÑÑŒ Ñ€Ñдом Ñ Ð±Ð»Ð¾ÐºÐ¾Ð¼ (около пÑти блоков), огненные чаÑтицы будут излучатьÑÑ, чтобы показать, что он работает - когда на Ð²Ð°Ñ Ð²Ð¾Ð·Ð´ÐµÐ¹Ñтвует Ñто ÑпокойÑтвие, ваш Жертвенный Кинжал изменитÑÑ, показываÑ, что у Ð²Ð°Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½ урожай на Ðлтаре Крови. Этот процеÑÑ Ð·Ð°Ð½Ð¸Ð¼Ð°ÐµÑ‚ около 5 Ñекунд, и вы узнаете, что закончили, когда чаÑтицы Ð¾Ð³Ð½Ñ Ð¿ÐµÑ€ÐµÑтают поÑвлÑÑ‚ÑŒÑÑ. Ð’ Ñтот момент, еÑли вы иÑпользуете Ñвой Жертвенный Кинжал на Кровавом Ðлтаре, вы пожертвуете 90 %% от вашего макÑимального Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ñразу и накачаете LP в алтарь пропорционально количеÑтву пожертвованного здоровьÑ, умноженному на бонуÑ, оÑнованный на том, наÑколько Ñпокойным окружающий Площадь: по умолчанию Ñтот Ð±Ð¾Ð½ÑƒÑ + 20%.\n\tÐ’ качеÑтве дополнительного примечаниÑ, Символ Ð“Ð°Ð´Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован на Ðлтаре Ладана Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва СпокойÑтвиÑ, а также того, Ñколько бонуÑа дает текущий алтарь. -guide.bloodmagic.entry.architect.incense.info.2=Конечно, только дополнительные 20% - Ñто хорошо, но Ñто может быть раÑширено за Ñчет раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° влиÑÐ½Ð¸Ñ ÐÐ»Ñ‚Ð°Ñ€Ñ Ð‘Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ð¹. ЕÑли вы размеÑтите Ñ€Ñд из трех блоков «ДеревÑÐ½Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ°Â» в двух кварталах от Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð° в каждом из оÑновных направлений (убедитеÑÑŒ, что вÑе блоки дорожек находÑÑ‚ÑÑ Ð½Ð° одном и том же уровне y, до пÑти блоков вверх или вниз от Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð°) Ð’Ñ‹ можете определить облаÑÑ‚ÑŒ. Любой блок, размещенный в Ñтой облаÑти (блок, который находитÑÑ Ð½Ð° том же раÑÑтоÑнии по горизонтали от ÐÐ»Ñ‚Ð°Ñ€Ñ Ð±Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ð¹, что и блоки пути по горизонтали, и на том же уровне или на два ÑƒÑ€Ð¾Ð²Ð½Ñ Ð²Ñ‹ÑˆÐµ по вертикали от блоков пути), может добавить к СпокойÑтвию Ðлтарь ладана. ПоÑле Ñтой начальной Ñтроки можно добавить еще один Ñ€Ñд блоков пути, ÑÐ»ÐµÐ´ÑƒÑ Ñ‚Ð¾Ð¼Ñƒ же правилу: вÑе новые Ñтроки должны находитьÑÑ Ð½Ð° одном уровне y друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼, а вÑÑ Ñтрока должна находитьÑÑ Ð² пределах 5 блоков вертикально от предыдущей Ñтроки пути. блоки. Это означает, что возможны такие макеты, как пирамиды, перевернутые пирамиды или более Ñложные конÑтрукции леÑтниц. \n\tÐ’Ñе блоки пути имеют макÑимальное раÑÑтоÑние, которое они могут иметь от ÐÐ»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð°, чтобы иметь Ñффект. Блоки «ДеревÑÐ½Ð½Ð°Ñ Ñ‚Ñ€Ð¾Ð¿Ð°Â» могут работать в трех Ñ€Ñдах от ÐÐ»Ñ‚Ð°Ñ€Ñ Ð»Ð°Ð´Ð°Ð½Ð°. Каменные дорожки работают до пÑти, изношенные каменные дорожки - Ñемь, а обÑидиановые - до девÑти кварталов от иÑточника. Таким образом, в определенный момент вы должны иÑпользовать более качеÑтвенные блоки пути, чтобы раÑширить зону ÑпокойÑтвиÑ, однако вы можете иÑпользовать блоки более выÑокого ÑƒÑ€Ð¾Ð²Ð½Ñ Ð¿ÑƒÑ‚Ð¸ вмеÑто блоков более низкого ÑƒÑ€Ð¾Ð²Ð½Ñ Ð¿ÑƒÑ‚Ð¸, а не наоборот.\n\tВернутьÑÑ Ðº ÑпокойÑтвию. Только определенные блоки могут влиÑÑ‚ÑŒ на СпокойÑтвие облаÑти, и еÑÑ‚ÑŒ различные типы блоков СпокойÑтвиÑ. ЕÑли вы помеÑтите урожай, такой как картофель, в облаÑÑ‚ÑŒ, вы добавите немного СпокойÑÑ‚Ð²Ð¸Ñ (иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸ÑŽ «Зерновые культуры»). Однако, еÑли вы добавите еще одну культуру, например, картофель или даже морковь, вы получите меньше ÑпокойÑтвиÑ. ДобавлÑÑ Ñ‡Ñ‚Ð¾-то из другой категории Tranquility, вы получаете полный Ñффект. Ðо добавление большего количеÑтва материала Ñ Ð¸Ñпользованием той же категории имеет убывающую отдачу. ПоÑтому, чтобы получить наибольшее ÑпокойÑтвие из определенной облаÑти, наиболее оптимально Ñмешивать и Ñочетать, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ°Ðº можно больше разных типов ÑпокойÑтвиÑ..\n\tÐекоторые вещи, которые добавлÑÑŽÑ‚ СпокойÑтвие: Урожай, бревна, лиÑÑ‚ÑŒÑ, лава, пуÑтошь, ÑельхозугодьÑ, вода, ÑущноÑÑ‚ÑŒ жизни и другие разные вещи. -guide.bloodmagic.entry.architect.bloodrune.info.1=ÐŸÑ€Ð¾Ñ…Ð¾Ð´Ñ Ð¼Ð¾Ð´, вы поÑтепенно узнаете, что Ñкромный кровавый алтарь перед вами недоÑтаточно Ñилен, чтобы вы могли выполнить Ñвои иÑтинные амбиции. Ð Ð°Ð·Ð¼ÐµÑ‰Ð°Ñ Ñпециальные блоки, извеÑтные как Кровавые Руны, вокруг алтарÑ, вы можете значительно увеличить Ñилу алтарÑ, Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°Ñ Ð±Ð¾Ð»ÐµÐµ выÑокие уровни рецептов, а также ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÑпоÑобноÑти Ñамого алтарÑ.\n\tЧтобы улучшить алтарь до его второго уровнÑ, вам нужно размеÑтить 8 алтуров крови вокруг Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¸ на один уровень ниже. ЕÑли вы не уверены в точной конфигурации, пункт «Inspectoris Scandalum» может подÑказать вам точное размещение блоков, необходимых Ð´Ð»Ñ Ñледующего уровнÑ.\n\tÐ¥Ð¾Ñ‚Ñ Ð¿ÑƒÑтые руны хороши Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы проÑто получить обновление Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¸ перейти на более выÑокий уровень, полезно иÑпользовать руны Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñвоего алтарÑ. ÐšÐ°Ð¶Ð´Ð°Ñ Ð¸Ð· рун в кровавом алтаре может быть заменена на любую руну ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ (единÑтвенное иÑключение - Ñто то, что на Уровне 2 вы не можете иÑпользовать угловые руны в качеÑтве рун Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ - T3 и далее вы можете иÑпользовать их). ЕÑÑ‚ÑŒ руны, которые влиÑÑŽÑ‚ на ÑкороÑÑ‚ÑŒ изготовлениÑ, мощноÑÑ‚ÑŒ алтарÑ, а также ÑффективноÑÑ‚ÑŒ Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð¿Ñ€Ð¸Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ñƒ алтарÑ. Эти руны можно найти в ÑоответÑтвующих запиÑÑÑ…. -guide.bloodmagic.entry.architect.inspectoris.info.1=Буквально «Блок чтение» на латыни, цель Ñтого предмета - дать вам больше информации о более Ñложных блоках в моде, когда блоки находÑÑ‚ÑÑ Ð² мире. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÐµÐ´Ð¸Ð½Ñтвенной реализацией Ñтого предмета ÑвлÑетÑÑ ÐšÑ€Ð¾Ð²Ð°Ð²Ñ‹Ð¹ Ðлтарь, и, проÑто щелкнув правой кнопкой мыши на Кровавом Ðлтаре в мире, он Ñкажет вам, какие блоки требуютÑÑ Ð² мире Ð´Ð»Ñ Ñледующего ÑƒÑ€Ð¾Ð²Ð½Ñ ÐлтарÑ.\n\tЕÑли Ñтот метод вам не подходит, вы можете щелкнуть правой кнопкой мыши на Ñлементе в воздухе, чтобы переключитьÑÑ Ð¼ÐµÐ¶Ð´Ñƒ уровнÑми. ЕÑли вы затем щелкните правой кнопкой мыши на алтаре, на алтаре поÑвÑÑ‚ÑÑ Ð¿Ñ€Ð¸Ð·Ñ€Ð°Ñ‡Ð½Ñ‹Ðµ блоки в мире, показывающие, где именно находÑÑ‚ÑÑ Ñ€ÑƒÐ½Ñ‹ крови и Ñтолбы, необходимые Ð´Ð»Ñ Ð´Ð¾ÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñтого уровнÑ. ЕÑли вы уÑтановите отображаемый уровень на 1, голограмма будет удалена. -guide.bloodmagic.entry.architect.runeSpeed.info.1=СкороÑÑ‚Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° оказывает давление на таз алтарÑ, форÑÐ¸Ñ€ÑƒÑ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ñ‚Ñ€Ð°Ð½Ñмутации, так что крафт намного быÑтрее. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° ÑкороÑти увеличивает потребление Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð½Ð° + 20 %% за руну, Ñффективно ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÑкороÑÑ‚ÑŒ алтарÑ. Это также влиÑет на ÑкороÑÑ‚ÑŒ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ шары крови заполнÑÑŽÑ‚ÑÑ Ð°Ð»Ñ‚Ð°Ñ€ÐµÐ¼ Ñ Ñ‚Ð¾Ð¹ же ÑкороÑтью на руну. -guide.bloodmagic.entry.architect.water.info.1=Сигил воды, как Ñледует из названиÑ, ÑпоÑобен Ñобирать влагу из воздуха, ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð¸Ñточник воды в точке ÑоприкоÑÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ñ Ð·ÐµÐ¼Ð»ÐµÐ¹. Более того, щелкнув по машине, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ жидкоÑÑ‚ÑŒ, вы можете вÑтавить в машину до 1000mB воды за ту же цену, как еÑли бы вы положили ее на землю. Ð”Ð»Ñ Ð²Ñех намерений и целей он дейÑтвует как беÑконечное ведро воды - однако, он не будет работать, еÑли вы помеÑтите его внутрь машины. 50LP за иÑпользование. -guide.bloodmagic.entry.architect.lava.info.1=Инь, Ян, чтобы Ñигилы вода, Ñто запечатанное нагревает камень в локальной облаÑти и Ñобирает ее в одном меÑте, Ð¾Ð±Ñ€Ð°Ð·ÑƒÑ Ð¸Ñточник Ñтирки, где незапечатанный замыкающий контакт. Ðналогичный процеÑÑ Ð¿Ñ€Ð¾Ð¸Ñходит, когда вы взаимодейÑтвуете на машине флюид прием, генерировать до 1000mB лавы внутри машины по той же цене. По какой-то причине ваша рука не ÑжигаетÑÑ, когда вы иÑпользуете его, однако Ñто не означает, что Ñто мудрый выбор, чтобы принÑÑ‚ÑŒ ванну в нем! 1000LP Ð´Ð»Ñ Ð¸ÑпользованиÑ. -guide.bloodmagic.entry.architect.lavaCrystal.info.1=КриÑталл лавы - Ñто камень, в центре которого находитÑÑ ÐºÑƒÑочек лавы, не терÑющий тепла. При размещении в качеÑтве иÑточника топлива внутри печи, оно «Ñгорает» на количеÑтво, доÑтаточное Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ предмета в Ñтандартной печи по цене 50 LP из Ñети владельца. ЕÑли в Ñети недоÑтаточно Ñнергии (или нет владельца), криÑталл проÑто не Ñгорит и вызовет тошноту у владельца из-за нагрузки.\n\tЭтот криÑталл будет работать на любой машине, работающей на твердом топливе, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ любое топливо. -guide.bloodmagic.entry.architect.apprenticeorb.info.1=При иÑпользовании различных уÑтройÑтв вы быÑтро поймете, что ваша макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÐµÐ¼ÐºÐ¾ÑÑ‚ÑŒ 5 LP в вашей Душа Сеть быÑтро иÑÑÑкнет. ЗдеÑÑŒ вы начнете иÑкать более мощный шар Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ Ñети.\n\tÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ñфера Ученика требует Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð£Ñ€Ð¾Ð²Ð½Ñ 2 и имеет макÑимальную вмеÑтимоÑÑ‚ÑŒ 25 LP. Это также позволÑет Ñоздавать более мощные предметы и руны. -guide.bloodmagic.entry.architect.dagger.info.1=Через некоторое Ð²Ñ€ÐµÐ¼Ñ ÑƒÐºÑ€ÐµÐ¿Ð»ÐµÐ½Ð¸Ñ ÑÐµÐ±Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ°Ð¼Ð¾Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ можете попытатьÑÑ Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ñ‚ÑŒ кровью мобов. Dagger of Sacrifice, когда он иÑпользуетÑÑ Ð½Ð° не-боÑÑе, не игроке Ñ€Ñдом Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ñ‹Ð¼ Ðлтарем, убьет ÑущеÑтво одним ударом и накачает вÑÑŽ кровь в алтарь, Ð¿Ñ€ÐµÐ²Ñ€Ð°Ñ‰Ð°Ñ ÐµÐµ в ÑущноÑÑ‚ÑŒ жизни в завиÑимоÑти от качеÑтва толпа. Обычно, враждебные мобы будут давать гораздо больше LP, чем мирные мобы. -guide.bloodmagic.entry.architect.runeSacrifice.info.1=Руна жертвоприношениÑ, как Ñледует из названиÑ, увеличивает урожайноÑÑ‚ÑŒ вÑех видов деÑтельноÑти, которые приноÑÑÑ‚ в жертву здоровье мобов в обмен на LP. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° обеÑпечивает + 10% -ное увеличение урожаÑ, в добавок. -guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=Как и в Ñлучае Ñ Rune of Sacrifice, Rune of Self Sacrifice увеличивает доходноÑÑ‚ÑŒ LP от игрока. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° обеÑпечивает + 10% -ное увеличение урожаÑ, в добавок. -guide.bloodmagic.entry.architect.holding.info.1=Как вы начнете понимать, еÑÑ‚ÑŒ много полезных Ñимволов, некоторые из которых можно переключать, другие активно иÑпользовать. Из-за Ñтого ваш инвентарь быÑтро забьетÑÑ. Эта потребноÑÑ‚ÑŒ заполнÑетÑÑ Ð¡Ð¸Ð³Ð¸Ð»Ð¾Ð¹ Холдинга.\n\tЭтот Ñимвол может Ñодержать до пÑти других Ñимволов (нет, он не может Ñодержать других Ñимволов холдинга) во внутреннем инвентаре. Ðажав клавишу «Удержание», по умолчанию «H», вы можете открыть графичеÑкий Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñигил, чтобы изменить раÑположение удерживаемых Ñигил. ЕÑли вы перемещаете и иÑпользуете колеÑо прокрутки, пока оно уÑтановлено, вы будете перебирать ÑодержащиеÑÑ Ð² нем Ñигилы. Как только вы приземлитеÑÑŒ на тот Ñимвол, который хотите иÑпользовать, вы можете иÑпользовать Ñтот Ñимвол, как еÑли бы он был выбран! \n\tЕÑтеÑтвенно, у Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть неÑколько Сигил Холдинга, каждый Ñо Ñвоим инвентарем. Чтобы определить, какой из них Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ взглÑда, вы можете покраÑить Ñимвол, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ðлхимии. Чтобы Ñделать Ñто, помеÑтите Сигилу Ð”ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Ð² ÐлхимичеÑкую Таблицу Ñ ÐºÑ€Ð°Ñителем или Сигилу Ñ Ñ‚ÐµÐ³Ð¾Ð¼ имени нужного цвета в формате 0xZZZZZZ Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸. -guide.bloodmagic.entry.architect.air.info.1=Воздух Ñигил иÑпользует Ñлементарную форму делениÑ, чтобы генерировать Ñтабильный поток воздуха за пользователем по Ñледам водÑного пара в воздухе, Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ Ð¸Ñ… вперед. Ð’ ÑущноÑти, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтого незапечатанный, вы можете быть запущен вперед на значительное раÑÑтоÑние. Следует отметить, что запечатано только отменить раÑÑтоÑние Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ иÑпользовании, так что еÑли вы хотите придерживатьÑÑ Ð¿Ð¾Ñадок вы должны иÑпользовать его близко к земле! -guide.bloodmagic.entry.architect.void.info.1=Как Ñледует из названиÑ, пуÑтота Ñигил будет Ñоздавать вакуум в точке контакта, который будет вÑаÑывать жидкий иÑточник, который иÑпользуетÑÑ Ð½Ð°, полноÑтью уничтожить иÑточник. Это, вероÑтно, лучше вÑего иÑпользовать в Ñочетании Ñ Ñ‡Ð¸Ñтой Ñигилой Water или Ñигилами. -guide.bloodmagic.entry.architect.greenGrove.info.1=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñвою кровь в качеÑтве проÑтого катализатора роÑта Ñортов, Ñигил Зеленой Рощи увеличит ÑкороÑÑ‚ÑŒ роÑта любых раÑтений в ÑоÑеднем районе, а активируетÑÑ. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы активировать запечатанный, Ñдвиг-щелчок правой кнопкой Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ активируетÑÑ Ð¸ деактивируетÑÑ (легко видеть по подÑказке или ÑветÑщимиÑÑ Ñимволами на незакрытых). Имейте в виду, что каждые неÑколько Ñекунд запечатанные будет перекачать немного LP от Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ðº топливу уÑкоренного роÑта.\n\tЕÑли иÑпользуютÑÑ Ð½ÐµÐ¿Ð¾ÑредÑтвенно на плоÑкоÑти, Ñигил применит коÑÑ‚ÑŒ еды Ñффекта. Это может быть иÑпользовано Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ñ‰Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹Ñокой травы или других культур, так же, как коÑти еда. -guide.bloodmagic.entry.architect.fastMiner.info.1=Как должен знать любой хороший маг крови, в крови много железа. ЕÑли вы доÑтаточно опытны, вы можете манипулировать кровью, пока она еще находитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ тела - однако Ñледует отметить, что только Ñамые продвинутые Маги Крови могут Ñкручивать кровь тех, кто не желает.\n\tОдин из принципов, который иÑпользует Ñтот принцип, заключаетÑÑ Ð² уÑкорении функций ÑобÑтвенного тела. ÐÐ°Ð¼Ð°Ð³Ð½Ð¸Ñ‡Ð¸Ð²Ð°Ñ Ð¶ÐµÐ»ÐµÐ·Ð¾ в крови пользователÑ, Sigil of the Fast Miner резко увеличивает ÑкороÑÑ‚ÑŒ майнинга, применÑÑ Haste II во Ð²Ñ€ÐµÐ¼Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸. Этот магнетизм Ñлишком Ñлаб, чтобы воздейÑтвовать на вещи вне ÑобÑтвенного тела, однако его доÑтаточно Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы добывать обÑидиан Ñо значительной ÑкороÑтью. -guide.bloodmagic.entry.architect.seer.info.1=Ð Ð°Ð±Ð¾Ñ‚Ð°Ñ Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ñ‹Ð¼ Ðлтарем, вы иногда можете заблудитьÑÑ Ð² Ñкрытых тонкоÑÑ‚ÑÑ… его дейÑтвиÑ, которые, по-видимому, Гадательный Символ не может угадать. ЗдеÑÑŒ в игру вÑтупает Сигил Провидца. По Ñути, Ñто повышение до ГаданиÑ, Ñтот Ñимвол предоÑтавлÑет дополнительную информацию о различных характериÑтиках алтарÑ. Они варьируютÑÑ Ð¾Ñ‚ ÑкороÑти алтарÑ, текущего LP, а также текущего прогреÑÑа Ñозданного предмета. Это также дает информацию о душевной Ñети игрока. -guide.bloodmagic.entry.architect.magicianOrb.info.1=Еще один уровень, еще одна ÐšÑ€Ð¾Ð²Ð°Ð²Ð°Ñ Ñфера. Ðа Ñтот раз, чтобы продвинутьÑÑ Ð´Ð°Ð»ÑŒÑˆÐµ в моде, вам нужно будет Ñоздать Ñебе Магию Кровавого Шара. Ð’ рецепте по умолчанию вы можете видеть, что Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÑ€Ð°Ñ„Ñ‚Ð° требуетÑÑ 25kLP, однако макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð¼ÐµÑтимоÑÑ‚ÑŒ ÐÐ»Ñ‚Ð°Ñ€Ñ ÐšÑ€Ð¾Ð²Ð¸ ÑоÑтавлÑет 10kLP. Это означает, что Ð´Ð»Ñ ÑƒÑпешного ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ¾Ñ€Ð°Ð±Ð»Ñ Ð²Ð°Ð¼ нужно будет добавить LP в Ðлтарь, пока он находитÑÑ Ð² процеÑÑе ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑˆÐ°Ñ€Ð°. Будьте готовы, так как Ñто может быть трудной задачей, еÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ вÑего, что вам нужно! -guide.bloodmagic.entry.architect.capacity.info.1=Ð’Ñ‹ не ÑовÑем уверены, как Ñто работает так, как работает, но Руна СпоÑобноÑти увеличивает ÑпоÑобноÑÑ‚ÑŒ Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ Ð½Ð° 2kLP аддитивно. Возможно, ÑущеÑтвует какой-то резонанÑный Ñффект, который уменьшает объем LP, поÑтому позволÑет вам больше упаковывать в ÑтатичеÑкий таз? Это дает вам предÑтавление о том, как улучшить его, Ñ…Ð¾Ñ‚Ñ ...\n\tСледует повторить, что размер входного и выходного буферов ÑоÑтавлÑет 10 %% от макÑимальной емкоÑти оÑновного резервуара, поÑтому Ñти руны также увеличат буферные емкоÑти. -guide.bloodmagic.entry.architect.displacement.info.1=По умолчанию передача LP между буфером и оÑновными резервуарами ограничена 20LP / Ñ. Ð”Ð»Ñ ÑиÑтем, которые хотÑÑ‚ удалить и повторно добавить LP к алтарю, Ñта ÑкороÑÑ‚ÑŒ ÑвлÑетÑÑ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ñ‹Ð¼ Ñканированием. Вот где Ñта руна вÑтупает в игру.\n\tРуна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ количеÑтво ЛП, передаваемых за операцию. ÐšÐ°Ð¶Ð´Ð°Ñ Ñ€ÑƒÐ½Ð° умножает ÑкороÑÑ‚ÑŒ передачи в 1,2 раза, умножаÑÑÑŒ на Ñтопку. Таким образом, одна руна будет 24LP на операцию, две руны будут 28.8LP на операцию и три руны 34.56LP. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ 20 рун на алтаре, Ñто прыгает до 767LP за операцию - Ñто очиÑтит полный алтарь вÑего за 13 Ñекунд. -guide.bloodmagic.entry.architect.affinity.info.1=Ðа первый взглÑд, Символ СродÑтва Стихий проÑто дает иммунитет к огню, утоплению и урону Ñ Ð²Ñ‹Ñоты при активации. Однако, его работа намного более тонкаÑ. Этот Ñимвол Ñоздает тонкий барьер воздуха вокруг пользователÑ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð¾Ñ‚ (и, при необходимоÑти, кровь) от пользователÑ, ÑƒÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ Ñ‚ÐµÐ»Ð¾ вдали от резких Ñлементов. \n\tЭтот воздушный барьер дейÑтвует как буфер между кожей и огнем или лавой, Ñ†Ð¸Ñ€ÐºÑƒÐ»Ð¸Ñ€ÑƒÑ Ð¿Ñ€Ð¸ необходимоÑти Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ³Ñ€ÐµÐ²Ð°. Он также заполнÑет легкие, находÑÑÑŒ под водой, чтобы выровнÑÑ‚ÑŒ давление тела и окружающей воды. Ðаконец, при падении Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ выÑоты воздух ÑмещаетÑÑ Ð½Ð¸Ð¶Ðµ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½Ð¾Ð³ человека, выÑÑ‚ÑƒÐ¿Ð°Ñ Ð² качеÑтве подушки Ð´Ð»Ñ ÑмÑÐ³Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ. -guide.bloodmagic.entry.architect.lamp.info.1=Ð’ теле и крови человека довольно много «примеÑей». Ð¡Ð¾Ð±Ð¸Ñ€Ð°Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ благородные газы и Ð·Ð°ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¸Ñ… в иÑточник тепла, вы можете Ñоздать шар Ñвета, который можно отброÑить на большое раÑÑтоÑние, Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ñ Ðº поверхноÑти, на которую он ударÑет.\n\tСигил Кровавой Светильника имеет два назначениÑ: вы можете либо щелкнуть по блоку напрÑмую и помеÑтить иÑточник Ñвета, либо выÑтрелить ÑнарÑдом, который будет генерировать иÑточник Ñвета в точке контакта. Эти иÑточники Ñвета могут быть разбиты так же, как факелы за один удар. -guide.bloodmagic.entry.architect.magnetism.info.1=Этот Ñимвол намагничивает железо в потоке крови пользователÑ, притÑÐ³Ð¸Ð²Ð°Ñ Ðº нему мелкие предметы, обеÑÐ¿ÐµÑ‡Ð¸Ð²Ð°Ñ Ð±Ñ‹Ñтрый и безболезненный захват. По Ñути, Ñто дейÑтвует как магнит предмета, но вмеÑто того, чтобы фактичеÑки «пылеÑоÑить» предметы по отношению к игроку, он заÑтавлÑет игрока подбирать предмет Ñ Ñ€Ð°ÑÑтоÑниÑ, поÑтому предметы не должны летать вокруг меÑта. К ÑчаÑтью, магнетизм наÑтроен так, что он не притÑгивает к Ñебе живые объекты, поÑтому вы не найдете лианы, внезапно желающие обнÑÑ‚ÑŒ Ð²Ð°Ñ Ð½Ð° Mach 3. - -guide.bloodmagic.entry.architect.peritia.info.1=Ð’ мире определенные дейÑÑ‚Ð²Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´ÑÑ‚ впечатление на человека: убийÑтво монÑтров, добыча Ñлементов, плавка Ñлитков или пищи может дать опыт, накопленный за определенный период времени. Через некоторые тайные механизмы некоторые Ñтруктуры и уÑтройÑтва фактичеÑки иÑтощают Ñтот опыт у ваÑ, чтобы подпитывать Ñвои ÑобÑтвенные процеÑÑÑ‹. ПоÑтому может быть полезно хранить Ñтот опыт в некоторой Ñреде.\n\tÐ¥Ð¾Ñ‚Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ контейнеры хранÑÑ‚ опыт как физичеÑкую ÑубÑтанцию, «Фолиант Перитии» позволÑет человеку транÑкрибировать Ñвои Ð¿ÐµÑ€ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð² книгу - напиÑав в томе, Ñтраницы наполнены вашими мыÑлÑми и прошлыми дейÑтвиÑми, ÑохранÑÑ Ð¸Ñ… Ð´Ð»Ñ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐµÐ³Ð¾ иÑпользованиÑ. ЕÑли затем вы захотите получить Ñтот опыт обратно, вы можете поднеÑти руку к Ñтранице и откачать их обратно; Ñто удалит запиÑÑŒ Ñо Ñтраницы и передаÑÑ‚ Ñти дейÑÑ‚Ð²Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ в вашу памÑÑ‚ÑŒ. \n\tÐ¡ÐµÐ¹Ñ‡Ð°Ñ Ð´Ð»Ñ Ñ„Ð°ÐºÑ‚Ð¸Ñ‡ÐµÑкого иÑпользованиÑ; щелкнув правой кнопкой мыши на томе в Ñвоей руке, вы можете Ñохранить уровень опыта в книге (или до уровнÑ, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ чаÑтичный уровень). ЕÑли щелкнуть правой кнопкой мыши на томе, вы перейдете на Ñледующий уровень, еÑли в книге доÑтаточно опыта. Общий опыт, а также Ñохраненный Ñквивалентный уровень отображаютÑÑ Ð²Ð¾ вÑплывающей подÑказке в томе. -guide.bloodmagic.entry.architect.livingArmour.info.1=Любой человек в Minecraft, оÑобенно Ñ Ð½Ð¾Ð²Ñ‹Ð¼Ð¸ воплощениÑми мира, будет знать, что хороший набор доÑпехов означает разницу между жизнью и Ñмертью. Обычно, когда вы выбираете набор брони, вы выбираете ÑтатичеÑкий набор преимущеÑтв - обеÑпечивает ли Ñта Ð±Ñ€Ð¾Ð½Ñ Ð±Ð¾Ð»ÑŒÑˆÑƒÑŽ защиту? Получу ли Ñ Ñ€ÐµÐ¹Ñ, когда ношу Ñто? Могу ли Ñ Ð¿Ñ€Ñ‹Ð³Ð½ÑƒÑ‚ÑŒ очень выÑоко или двигатьÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ быÑтро? Ð’Ñе Ñто допуÑтимые параметры Ð´Ð»Ñ Ð½Ð°Ð±Ð¾Ñ€Ð° брони, но вы никогда не Ñможете получить набор, который точно ÑоответÑтвует вашим потребноÑÑ‚Ñм. По крайней мере, так они думали.\n\tÐабор Living Armor - Ñто ÑÐ¿Ñ€Ð¾ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð° жизни, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ð½Ñ‚ÐµÐ³Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð° Ñ Ð¿Ñ€Ð¾Ñтым набором железной брони. При ношении он вÑтупает в ÑимбиотичеÑкие Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ - когда вы двигаетеÑÑŒ, он движетÑÑ. Когда вы атакуете, он атакует. Когда вы едите, он Ñто чувÑтвует и компенÑирует. И так же, как нормальное человечеÑкое тело, оно начнет раÑти и укреплÑÑ‚ÑŒÑÑ Ð² завиÑимоÑти от того, что вы делаете, будучи обученным вашими дейÑтвиÑми. \n\tДавайте приведем пример. ЕÑли вы наденете новый комплект брони и будете много бегать, вы заметите, что вы получите апгрейд на нагрудную плиту под названием «БыÑтрые ноги» - Ñто апгрейд обеÑпечивает поÑтепенное увеличение вашей ÑкороÑти на уровне 1, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº поÑледующие уровни обеÑпечить больший импульÑ. Ð’Ñ‹ также заметите, что «Точки обновлениÑ» теперь читаютÑÑ ÐºÐ°Ðº «3/100» - каждое обновление требует Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ количеÑтва точек обновлениÑ, а на Ñундуке еÑÑ‚ÑŒ макÑимальное количеÑтво очков, которое она может удержать. ЕÑли обновление, которое вы можете получить, невозможно получить Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтвом имеющихÑÑ Ñƒ Ð²Ð°Ñ Ð±ÐµÑплатных точек обновлениÑ, его невозможно получить. \n\tИмейте в виду, что Живую Броню можно тренировать только тогда, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ полный комплект брони, а Ñффекты брони будут дейÑтвовать только тогда, когда иÑпользуетÑÑ Ð¿Ð¾Ð»Ð½Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ.\n\tМакÑимальное количеÑтво точек Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ изменить неÑколькими различными ÑпоÑобами. Одним из них ÑвлÑетÑÑ Ñоздание алхимичеÑких ÑмеÑей, которые укрепÑÑ‚ ÑвÑзи между пользователем и Живой Броней, значительно ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтво очков, которое вы можете получить на данном наборе ÑнарÑжениÑ. Одним из таких примеров ÑвлÑетÑÑ Â«Ð§ÐµÑ€Ð½Ð¾Ð²Ð¸Ðº Ðнгела», который увеличивает макÑимальное количеÑтво очков до 200. Информацию об Ñтих варевах, а также о том, как их Ñоздавать, можно найти в «Ðлхимике». -guide.bloodmagic.entry.architect.upgradeTome.info.1=Иногда вы можете быть недовольны улучшениÑми, которые вы получили в Ñвоей Живой Броне. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ€Ð¸Ñ‚ÑƒÐ°Ð» «Звук Очищающей Души» (дополнительную информацию можно найти в «Ритуальном МаÑтере»), вы можете удалить вÑе ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ñ Ð´Ð¾Ñпехов и получить их в виде «Ðпгрейдовых фолиантов». ЕÑли вы щелкнете по ним правой кнопкой мыши, Ð½Ð°Ð´ÐµÐ²Ð°Ñ Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ комплект Living Armor (и когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ меÑто Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ), вы можете добавить обновление к Ñвоей броне. \n\tЭти тома также могут быть объединены в наковальне - еÑли вы комбинируете два одинаковых тома Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ (одно и то же улучшение, тот же уровень) вмеÑте в наковальне, вы можете получить один том на один уровень выше. Таким образом, еÑли вы объедините Quick Feet II Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ Quick Feet II, вы получите Quick Feet III. Это может быть применено к броне таким же образом. -guide.bloodmagic.entry.architect.teleposer.info.1=Teleposer - Ñто уÑтройÑтво, которое телепортирует не только объекты, но и блоки. Чтобы наÑтроить Teleposer, вам нужно как минимум два Teleposers и один Teleposition focus. Один из Teleposers дейÑтвует как Ðазначение, а другой дейÑтвует как Ðачало.\n\tЧтобы наÑтроить Ñто, вам нужно Ñначала привÑзать Ñ„Ð¾ÐºÑƒÑ Ðº Ñебе, щелкнув по нему правой кнопкой мыши. Затем вы щелкаете правой кнопкой мыши по фокуÑу на Teleposer назначениÑ, чтобы Ñохранить его меÑтоположение (и размер), а затем вÑтавлÑете Ñ„Ð¾ÐºÑƒÑ Ð² Beginning Teleposer, Ñ‰ÐµÐ»ÐºÐ°Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ кнопкой мыши Teleposer без фокуÑа в руке и Ð¿Ð¾Ð¼ÐµÑ‰Ð°Ñ Ñ„Ð¾ÐºÑƒÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ GUI.\n\tВключение начинающего телепортера (тот, который в фокуÑе) Ñ Ñильным Ñигналом краÑного ÐºÐ°Ð¼Ð½Ñ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÐµÑ‚ к тому, что телепродавцы поменÑÑŽÑ‚ÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°Ð¼Ð¸ и блоками (Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð»ÑŽÐ±Ð¾Ð¹ контент в тайлах, таких как инвентарь Ñундуков) между телепозиционерами, предполагаÑ, что в телепоÑтере еÑÑ‚ÑŒ МеÑто назначениÑ. \n\tУ Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть один Teleposer Ñ Ñ„Ð¾ÐºÑƒÑом, у обоих Teleposrs еÑÑ‚ÑŒ фокуÑÑ‹, которые ÑвÑзаны друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼, или вы можете иметь один Teleposer, ÑвÑзанный Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Teleposer, который не ÑвÑзан Ñ Ð½Ð¸Ð¼, поÑтому в завиÑимоÑти от того, как вы их наÑтроили, вы можете может иметь очень Ñложные ÑиÑтемы.\n\tИмейте в виду, что в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Teleposer будет менÑÑ‚ÑŒ меÑтами только те блоки и объекты, которые находÑÑ‚ÑÑ Ð¿Ñ€Ñмо над блоком, а размер завиÑит от фокуÑа - Ñ„Ð¾ÐºÑƒÑ T1 менÑет меÑтами только блок поверх Teleposer, Ñ„Ð¾ÐºÑƒÑ T2 менÑет облаÑÑ‚ÑŒ 3x3x3 выше Телепортер и др. -guide.bloodmagic.entry.architect.boundBlade.info.1=СвÑзанный Клинок - Ñто артефакт из прошлого, клинок, Ñозданный путем привÑзки ÑущеÑтва к мечу в том же процеÑÑе, что и Ð–Ð¸Ð²Ð°Ñ Ð‘Ñ€Ð¾Ð½Ñ. Следует отметить, что Ñто, как и Bound Tools, изменитÑÑ Ð² более поздних верÑиÑÑ… мода.\n\tМеч имеет активный и неактивный режим, который можно переключать, Ñ‰ÐµÐ»ÐºÐ°Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ кнопкой мыши. Меч не наноÑит никакого урона вообще, когда неактивен, но когда он активен, Ñо временем произойдет небольшой раÑход ЛП. Точно так же, когда вы наноÑите урон мобу, вы вытÑгиваете LP из Ñвоей Ñети. Конечно, у Ð²Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾ урона, но Ñто может Ð²Ð°Ñ ÑƒÐ±Ð¸Ñ‚ÑŒ!\n\tКогда монÑÑ‚Ñ€ убит, у него еÑÑ‚ÑŒ ÑˆÐ°Ð½Ñ ÑброÑить оÑколок Ñлабой крови. Эти оÑколки иÑпользуютÑÑ Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÐÐ»Ñ‚Ð°Ñ€Ñ ÐšÑ€Ð¾Ð²Ð¸ до Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð¢4. -guide.bloodmagic.entry.architect.boundTool.info.1=Подобно Bound Blade, Ñти Bound Tools (кирка, топор и лопата) в конечном итоге будут модифицированы Ð´Ð»Ñ Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ ÑоответÑÑ‚Ð²Ð¸Ñ Ð¼Ð¾Ð´Ñƒ. Как и Blade, инÑтрументы имеют активный и неактивный режим, который можно переключать, Ñ‰ÐµÐ»ÐºÐ°Ñ Ð¸Ñ… правой кнопкой мыши. \n\tТо, что еÑÑ‚ÑŒ в Ñтих инÑтрументах, называетÑÑ Â«Ð ÐµÐ¶Ð¸Ð¼ зверÑ». ЕÑли вы удерживаете правой кнопкой мыши, вы можете зарÑдить инÑтрумент и выÑвободить мощное раÑщепление, которое мгновенно Ñломает блоки, которые могут быть разбиты данным инÑтрументом - при полной зарÑдке Ñто куб размером 11x11x11 над вами по цене 10kLP. Будьте оÑторожны Ñ Ñтим мощным инÑтрументом, так как он может быть вашим поÑледним! -guide.bloodmagic.entry.architect.weakShard.info.1=Ð’Ñе, что имеет жизнь, может иметь Ñфирные ÑвÑзи, извеÑтные как Сеть Души. Как видно из вашего опыта, к неживым вещам также может быть приÑоединена Сеть Души, Ñ‚Ð°ÐºÐ°Ñ ÐºÐ°Ðº Ñигилы и ритуалы; однако Ñти ÑвÑзи наиболее Ñильны у ÑущеÑтв и, еÑтеÑтвенно, у людей. \n\tКогда вы атакуете монÑтра Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Bound Blade, их Ñеть душ временно затвердевает, и чаÑÑ‚ÑŒ ее оÑтанетÑÑ Ð¿Ð¾Ñле Ñмерти. Эта чаÑÑ‚ÑŒ принимает форму оÑколка Ñлабой крови, названного так в Ñилу того, что ее краÑноватый оттенок ÑоответÑтвует цвету шара Ñлабой крови. Ðа данный момент неÑÑно, ÑущеÑтвуют ли более Ñильные формы кровÑных оÑколков, но вы можете Ñказать, что Ñто было бы очень полезно Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ñ‰Ð½Ð¾Ñти вашей ÑобÑтвенной Сети Души. -guide.bloodmagic.entry.architect.masterOrb.info.1=Одно из применений Ñтого увеличенного ÑродÑтва к Сети Души - иÑпользование Слабого Кровавого ОÑколка в новом кровавом шаре: МаÑтер Кровавого Шара. Этот шар имеет макÑимальную вмеÑтимоÑÑ‚ÑŒ 1 миллион LP, и, таким образом, владелец шара может получить доÑтуп к более мощным предметам и ритуалам. Возможно, метеоры не за пределами вашей доÑÑгаемоÑти ... -guide.bloodmagic.entry.architect.runeOrb.info.1=Изначально Ñту руну можно Ñчитать неÑколько беÑполезной. УкреплÑÑ ÑвÑзи между Ñферой крови в алтаре и Сетью Души, Руна Сферы увеличивает макÑимальную вмеÑтимоÑÑ‚ÑŒ шара крови, заполненного Кровавым Ðлтарем, на + 2 %% за каждую руну. Ð”Ð»Ñ Ñ‡ÐµÐ³Ð¾-то вроде Слабой Сферы Крови Ñто вÑего лишь емкоÑÑ‚ÑŒ + 100LP, однако Ð´Ð»Ñ Master Blood Orb Ñто Ð·Ð°Ð¼ÐµÑ‡Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐµÐ¼ÐºÐ¾ÑÑ‚ÑŒ + 20kLP на руну. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ выÑокоуровневый шар крови и неÑколько дополнительных рун, которые вы можете ÑÑкономить на Ñвоем алтаре, Ñто может быть чем-то, что может обогатить вашу Ñеть. -guide.bloodmagic.entry.architect.suppression.info.1=Символ Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ñпользует технологию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸ÑпользуетÑÑ Ð² Teleposer Ð´Ð»Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñтей, которые находÑÑ‚ÑÑ Ñ€Ñдом Ñ Ð½Ð¸Ð¼, когда активны. Это делаетÑÑ Ð¿ÑƒÑ‚ÐµÐ¼ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¶Ð¸Ð´ÐºÐ¾Ñтей в Ñфере вокруг Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ðº Ñкрытому карманному размеру, заменÑÑ Ð¶Ð¸Ð´ÐºÐ¾ÑÑ‚ÑŒ воздухом. К Ñожалению, из-за того, что вы перезарÑжаете поле, иÑпользуемое Teleposer, Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð° - еÑли пользователь уходит из облаÑти, в которой была удалена жидкоÑÑ‚ÑŒ, или деактивирует Ñигил, жидкоÑти будут возвращатьÑÑ Ñ‚ÑƒÐ´Ð°, где они были раньше, как будто ничего произошло, еÑли предположить, что там нет новых блоков. Это позволÑет Ñовершить необычную транÑпортировку пешком, гулÑÑ Ð¿Ð¾Ð´ водой вмеÑто того, чтобы плыть через нее или даже раÑÑтаватьÑÑ Ñ ÐºÑ€Ð°Ñными морÑми ПуÑтоты. -guide.bloodmagic.entry.architect.haste.info.1=Сахар и кофеин - интереÑные химичеÑкие вещеÑтва, которые человечеÑкий организм может перерабатывать. Один дейÑтвует как резервуар Ñнергии, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ñтро Ñгорает, тогда как другой увеличивает ваше бодрÑтвование и позволÑет вам получить доÑтуп к Ñнергии другими ÑпоÑобами. ÐŸÐ¾Ð´Ñ€Ð°Ð¶Ð°Ñ Ñтим химичеÑким процеÑÑам, чтобы выÑвободить больше химичеÑкой Ñнергии, Sigil of Haste позволÑет пользователю увеличить Ñвои ÑпоÑобноÑти к движению. \n\tПри активации пользователь может работать намного быÑтрее и может прыгать значительно выше. Более того, Ñигил также предлагает «Step Assist», который позволÑет пользователю поднÑÑ‚ÑŒÑÑ Ð½Ð° один блок выÑокими гребнÑми без необходимоÑти прыгать. Это как автоматичеÑкий прыжок, но менее отÑтойный. -guide.bloodmagic.entry.architect.severance.info.1=Ð¢ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ - одна из тех Ñтранных ÑпоÑобноÑтей, которые люди не могут полноÑтью объÑÑнить. Ð’ большинÑтве Ñлучаев Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть опиÑана как Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð´ÐµÑ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² проÑтранÑтве-времени, ÑвÑÐ·Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ Ð´Ð²Ð° меÑта в проÑтранÑтве так, что раÑÑматриваемый объект может проÑто «перешагнуть» на другую Ñторону. Sigil of Ender Severance пытаетÑÑ Ð¾Ñтановить Ñту деформацию, необходимую Ð´Ð»Ñ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ð¸, Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰Ð°Ñ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸ÑŽ ÑущеÑтв, когда они находÑÑ‚ÑÑ Ñ€Ñдом Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼. Это не оÑтановит некоторые из более крупных ÑредÑтв телепортации, таких как порталы, но предотвратит иÑпользование Эндерманом Ñвоих ÑпоÑобноÑтей Ð´Ð»Ñ Ð´ÐµÑ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ вокруг пользователÑ. -guide.bloodmagic.entry.architect.teleposition.info.1=Символ Телепозиции имеет в Ñвоем ÑоÑтаве Teleposer и фокуÑ. ЕÑли вы щелкните правой кнопкой мыши на Teleposer Ñ Ñтим Ñимволом, вы можете привÑзать координаты и размер к Ñимволу. Теперь, когда вы щелкнете правой кнопкой мыши по Ñимволу, он будет телепортировать Ð²Ð°Ñ Ð¿Ñ€Ñмо в Teleposer (еÑли он там еÑÑ‚ÑŒ). К Ñожалению, не похоже, что вы можете Ñовершить обратную поездку ... -guide.bloodmagic.entry.architect.compression.info.1=Шахтер быÑтро обнаружит, что во Ð²Ñ€ÐµÐ¼Ñ Ð´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ ÑкÑпедиции их инвентарь будет заполнен краÑнокаменной пылью, лÑпиÑом и неÑколькими другими материалами. У большинÑтва из них еÑÑ‚ÑŒ рецепты, которые Ñжимают их до блоков хранениÑ, таких как блоки из краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ блоки Ñ Ð±Ñ€Ð¸Ð»Ð»Ð¸Ð°Ð½Ñ‚Ð°Ð¼Ð¸, однако Ð´Ð»Ñ Ð¸Ñ… Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾ требуетÑÑ Ñтол Ð´Ð»Ñ ÐºÑ€Ð°Ñ„Ñ‚Ð°. \n\tЭтот Ñимвол Ñоздает миниатюрное поле ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð² инвентаре Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ активации, ÑÐ¶Ð¸Ð¼Ð°Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ñ‹ до минимального количеÑтва Ñлотов, необходимых Ð´Ð»Ñ Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ. Это означает, что еÑли у Ð²Ð°Ñ 63 краÑных камнÑ, Ñто ничего не даÑÑ‚. Однако, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ 64 пыли, он Ñожмет 9 из них в блок из краÑного камнÑ. Ð¥Ð¾Ñ‚Ñ Ñто техничеÑки не Ð¸Ð´ÐµÐ°Ð»ÑŒÐ½Ð°Ñ ÑитуациÑ, еÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ровно куча краÑной пыли, Ñто гарантирует, что вы не оÑтанетеÑÑŒ в пыли из-за полных карманов. ЕÑли приÑутÑтвуют другие моды, Ñто будет работать и Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… рецептов крафта. -guide.bloodmagic.entry.architect.bridge.info.1=Когда активировано и когда пользователь находитÑÑ Ð½Ð° твердой поверхноÑти, Сигилла Фантомного МоÑта затвердевает в воздухе под пользователем, так что они могут идти по нему, ÑоздаваÑ, по ÑущеÑтву, Фантомный МоÑÑ‚. Когда вы перемещаетеÑÑŒ в воздухе, моÑÑ‚ будет формироватьÑÑ Ð½ÐµÐ¿Ð¾ÑредÑтвенно под вами, позволÑÑ Ð²Ð°Ð¼ поймать ÑÐµÐ±Ñ Ð² воздухе, еÑли вы упадете. Ð¥Ð¾Ñ‚Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐºÐ°Ð»Ð¸Ð±Ñ€Ð¾Ð²ÐºÐ° необходима Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñделать ее более Ñффективной Ð´Ð»Ñ Ð²ÐµÑ€Ñ‚Ð¸ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ перемещениÑ, а также горизонтального Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ быÑтром движении (из-за запаздываниÑ, мешающего Ñозданию моÑта), Ñто Ñффективный ÑпоÑоб Ñффективно летать в разные районы. -guide.bloodmagic.entry.architect.mimic.info.1=Мимики - Ñто тайные конÑтрукции, которые предназначены Ð´Ð»Ñ Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ð¸ того, на что они наÑтроены. Когда мимика вÑтупает в контакт Ñ ÐºÐ°ÐºÐ¾Ð¹-либо формой блока, его молекулы изменÑÑŽÑ‚ Ñвою ориентацию, чтобы принÑÑ‚ÑŒ форму, внешний вид и ощущение блока. Однако не вÑе ÑвойÑтва копируютÑÑ: например, нормальный мимичеÑкий блок при контакте Ñо ÑветÑщимÑÑ ÐºÐ°Ð¼Ð½ÐµÐ¼ не будет излучать никакой формы Ñвета. \n\tПри обычном иÑпользовании, еÑÑ‚ÑŒ два ÑпоÑоба иÑпользовать блок мнемоÑхемы. Первый - помеÑтить блок мнемоники вниз, а затем щелкнуть правой кнопкой мыши на мнемоÑхеме Ñ Ð±Ð»Ð¾ÐºÐ¾Ð¼, который вы хотите Ñкопировать. Это помеÑтит блок в мнемоÑхему и придаÑÑ‚ ей форму -default-. Таким образом, еÑли щелкнуть по леÑтнице мимику, она вÑегда будет ориентироватьÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ð¾.\n\tВторой ÑпоÑоб заключаетÑÑ Ð² том, чтобы держать блок мимики в руке и нажимать клавишу Shift, щелкнув блок, который вы хотите заменить. Это заменит блок на мнемоÑхему, и мимик будет иметь ту же ориентацию, что и замененный блок. Это можно увидеть по леÑтницам и Ñундукам, а также по другим завиÑимым от ориентации блокам, таким как бревна.\n\tЕÑÑ‚ÑŒ неÑколько разных вариантов нормальной мимики. Ðепрозрачный мимик - Ñто имитатор по умолчанию, ÑпоÑобный принимать форму и общие ÑвойÑтва блоков - однако Ñвет не может проходить через них, поÑтому Ñледует Ñоблюдать оÑторожноÑÑ‚ÑŒ Ñо Ñтеклом. Ð’ Ethereal Opaque Mimic можно пройти без каких-либо проблем, поÑкольку у него нет хитбокÑа, который идеально подходит Ð´Ð»Ñ Ñкрытых дверных проемов. Блоки Clear Mimic работают так же, как и их непрозрачные варианты, однако они пропуÑкают Ñвет через них, даже еÑли он кажетÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ñтью Ñплошным. Ðаконец, блок Lighted Mimic непрозрачен и Ñплошен, но незавиÑимо от того, что находитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ него, он будет излучать Ñильный Ñвет. Ðет больше темных облаÑтей на вашей базе без факела Ñпам!\n\tЕÑÑ‚ÑŒ один оÑобый вариант подражаниÑ, к которому вы должны отноÑитьÑÑ Ñ Ð¾ÑторожноÑтью: чувÑтвующий подражатель. ЕÑли игрок подходит Ñлишком близко к одному из них в мире, он вÑтанет оттуда, где находитÑÑ, и нападет на Ð²Ð°Ñ Ñ Ð²Ñ‹Ñокой Ñтепенью ÑвирепоÑти. Их можно найти в Ñамых разных меÑтах, но оÑобенно они любÑÑ‚ подземельÑ. Однако еÑли имитировать Ñундук, будьте оÑторожны: они куÑаютÑÑ.\n\t*** Только Ð´Ð»Ñ Ñ‚Ð²Ð¾Ñ€Ñ‡ÐµÑкого иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ***\n\tЕÑÑ‚ÑŒ неÑколько интереÑных функций, которые вы можете добавить к любому блоку мнемоÑхемы, когда находитеÑÑŒ в творчеÑком режиме. ЕÑли вы щелкнете правой кнопкой мыши на мимике Ñ Ð·ÐµÐ»ÑŒÐµÐ¼ или флÑжкой Ñ Ð·ÐµÐ»ÑŒÐµÐ¼, вы можете уÑтановить мимику так, чтобы вокруг нее поÑвлÑлиÑÑŒ зельÑ, еÑли Ñ€Ñдом находитÑÑ Ð¸Ð³Ñ€Ð¾Ðº. ЕÑли Ñто Ð¾Ð±Ñ‹Ñ‡Ð½Ð°Ñ Ð¼Ð¸Ð¼Ð¸ÐºÐ°, и вы нажимаете на воÑточную или западную Ñторону, вы можете увеличивать или уменьшать радиуÑ, в котором будет поÑвлÑÑ‚ÑŒÑÑ Ð·ÐµÐ»ÑŒÐµ. ЕÑли вы нажмете на Ñеверную или южную Ñторону, вы можете увеличить или уменьшить радиуÑ, который имитирует проверим игроков вокруг него до поÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð·ÐµÐ»Ð¸Ð¹. Ðаконец, нажатие на верхнюю или нижнюю чаÑÑ‚ÑŒ блока увеличит или уменьшит интервал Ð¿Ð¾Ñ€Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð·ÐµÐ»ÑŒÑ, который предÑтавлÑет Ñобой чиÑло тактов между опущенными зельÑми. \n\tЕÑли мимика ÑвлÑетÑÑ Ñ€Ð°Ð·ÑƒÐ¼Ð½Ð¾Ð¹ мимикой, вы можете нажать на мимику в любом меÑте, чтобы увеличить или уменьшить Ñ€Ð°Ð´Ð¸ÑƒÑ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ¾Ð² - еÑли игрок находитÑÑ Ð² Ñтой облаÑти, и они могут видеть блок, мимика будет поÑвлÑÑ‚ÑŒÑÑ Ð¸ прыгать на игрока. \n\tДругое дело, что еÑли блок размещен на мнемоÑхеме, когда роÑÑыпь находитÑÑ Ð² креативе, то блок, который имитируетÑÑ, ÐЕ будет выпадать при уничтожении мимики. \n\t Ðаконец, еÑли мимик помещен в любой инвентарь или Ñундук, разумный мимик положит Ñундук на землю Ñ ÐµÐ³Ð¾ Ñодержимым поÑле Ð¿Ð¾Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ - вмеÑто Ñтого обычный мимик будет проÑто извергать Ñодержимое повÑюду, когда разбит. -guide.bloodmagic.entry.architect.downgrade.info=ПожалуйÑта, ознакомьтеÑÑŒ Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð¼ «ПокаÑние отмершей души» в «Ритуальном маÑтере», где подробно объÑÑнÑÑŽÑ‚ÑÑ, что Ñто такое, а также как их получить. - -guide.bloodmagic.entry.architect.augmentedCapacity.info=Руна дополненной ÑпоÑобноÑти функционирует аналогично Руне вмеÑтимоÑти в том ÑмыÑле, что она увеличивает емкоÑÑ‚ÑŒ Кровавого ÐлтарÑ. Тем не менее, неÑколько рун на одном алтаре начнут резонировать друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼, ÑкÑпоненциально ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°Ñ Ð²Ð¼ÐµÑтимоÑÑ‚ÑŒ. Одна руна Ñама по Ñебе увеличивает емкоÑÑ‚ÑŒ Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð½Ð° + 10%, однако она мультипликативно работает Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ рунами увеличенной вмеÑтимоÑти: еÑли еÑÑ‚ÑŒ две руны, Ñто увеличение на + 21%, три руны +33,1. %% увеличение и Ñ‚. д.\n\tК Ñожалению, Ñтот мультипликативный Ñффект не ÑкладываетÑÑ Ñ Ð ÑƒÐ½Ð¾Ð¹ ЕмкоÑти, то еÑÑ‚ÑŒ вы вÑе равно получите Ð±Ð¾Ð½ÑƒÑ + 2kLP за руну. -guide.bloodmagic.entry.architect.charging.info=ЗарÑÐ´Ð¾Ñ‡Ð½Ð°Ñ Ñ€ÑƒÐ½Ð° - одна из тех краÑавиц, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð»Ð½Ð¾Ñтью изменит дейÑтвие Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ Ð½Ð° что-то, что может быть Ñочтено более полезным Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð¹ оÑтановки. Медленно ÑÐ¸Ñ„Ð¾Ð½Ð¸Ñ€ÑƒÑ LP Ñ ÐšÑ€Ð¾Ð²Ð°Ð²Ð¾Ð³Ð¾ ÐлтарÑ, Руна ЗарÑдки начинает хранить «ЗарÑд», внутреннее значение Кровавого ÐлтарÑ, которое можно увидеть Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Sigil of Sight. ЕÑли у Кровавого ÐÐ»Ñ‚Ð°Ñ€Ñ Ð´Ð¾Ñтаточно ЗарÑда, когда он получает что-то Ð´Ð»Ñ Ð¸Ð·Ð³Ð¾Ñ‚Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, он немедленно иÑпользует требуемую ЗарÑдку и мгновенно Ñоздает предмет. ЕÑли зарÑда недоÑтаточно, веÑÑŒ зарÑд иÑпользуетÑÑ Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€ÐµÑÑа предмета в Ñоотношении зарÑд: LP 1: 1. \n\tМакÑимальное количеÑтво ЗарÑда, которое может быть Ñохранено в Ðлтаре Крови, ÑвлÑетÑÑ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ количеÑтва ЗарÑжающих Рун, которое оно умножило на текущую емкоÑÑ‚ÑŒ Ð°Ð»Ñ‚Ð°Ñ€Ñ (емкоÑÑ‚ÑŒ Ð°Ð»Ñ‚Ð°Ñ€Ñ Ð²Ñтупает в Ñилу, только еÑли она превышает 20k) , СкороÑÑ‚ÑŒ, которую он зарÑжает, также напрÑмую ÑвÑзана Ñо ÑкороÑтью алтарÑ, умноженной на количеÑтво зарÑженных рун, и он будет конвертировать LP в зарÑд каждые 20 тиков (одна Ñекунда). Так что, еÑли бы вы разработали Ðлтарь Крови Ñ Ñтой руной, нужно будет тщательно раÑÑмотреть вÑе его ÑинергетичеÑкие отношениÑ. -guide.bloodmagic.entry.architect.acceleration.info=Ð’ отличие от большинÑтва рун, Руна уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐµ вÑего работает только в Ñочетании Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ рунами, и ее Ñффекты только увеличиваютÑÑ Ð´Ð¾ ограниченного количеÑтва. Эта руна увеличивает количеÑтво тактов обработки, которые могут произойти за определенный период времени, оÑобенно когда речь идет о Руне Ð¡Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¸ Руне ЗарÑдки. Ð”Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ добавленной руны количеÑтво тактов перед Ñледующим тактом обработки уменьшаетÑÑ Ð½Ð° единицу. Ðапример, по умолчанию Руна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð²Ñ‹Ñ‚ÐµÑнÑет жидкоÑти Ñо ÑкороÑтью одной операции на 20 тиков - при 10 Рунах уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ñто проиÑходит Ñо ÑкороÑтью одной операции на 10 тиков.\n\tОчевидно, что макÑимальное количеÑтво рун уÑкорениÑ, которые в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð¼ÐµÑŽÑ‚ значение, ÑоÑтавлÑет 19 - еÑли у Ð²Ð°Ñ Ð¸Ñ… Ñтолько, Руна ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¸ Руна зарÑдки будут активировать Ñвои Ñффекты каждый тик. Noice! - -guide.bloodmagic.entry.architect.tier3.info=Хорошо извеÑтно, что алтарь Ð£Ñ€Ð¾Ð²Ð½Ñ 3 требует, чтобы вы закрыли четыре колонны блоками ÑветÑщихÑÑ ÐºÐ°Ð¼Ð½ÐµÐ¹ из ПуÑтоты. Что не так хорошо понÑто, так Ñто то, что вы можете вмеÑто Ñтого иÑпользовать МорÑкие Фонари. ПоÑтому, еÑли вы оказалиÑÑŒ очень далеко от перехода в ПуÑтоту, но у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп к океанÑким храмам, вы можете иÑпользовать другие ÑпоÑобы Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð² Магии Крови. - -# Demon Kin Entries -# TODO - -# Demon Kin Entry Texts -guide.bloodmagic.entry.demon.intro.info=ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Белла Хайборн, и Ñ Ð¸Ð·Ð²ÐµÑтна как Король Демонов. ÐеÑколько меÑÑцев назад на мою деревню напала волна демонов, убив вÑех оÑтальных людей и уничтожив вÑе зданиÑ. Я мало что помню о нападении,кроме криков боли, когда каждый человек, которого Ñ Ð·Ð½Ð°Ð», покидал Ñтот мир ради более ÑчаÑтливого. К ÑчаÑтью, демоны не уÑлышали менÑ, когда Ñ Ð·Ð°Ð±Ð¸Ð»Ð°ÑÑŒ под корзины Ñ Ñ„Ñ€ÑƒÐºÑ‚Ð°Ð¼Ð¸ в подвале церкви ИнтактилиÑ, отчаÑнно пытаÑÑÑŒ не дать Ñвоим крикам приÑоединитьÑÑ Ðº хору других голоÑов. \nБыл один ужаÑный момент, когда Ñ Ñлучайно опрокинула алтарь Ñ Ð±Ð»Ð°Ð³Ð¾Ð²Ð¾Ð½Ð¸Ñми в церкви, и демон ворвалÑÑ Ð² ÑвÑтилище, невозмутимый тем, что мы Ñчитали ÑвÑщенным меÑтом. Это было огромное четвероногое чудовище Ñ ÐºÑ€Ð¸Ð²Ñ‹Ð¼Ð¸ клыками, ÑвиÑающими из выÑтупающей паÑти, Ñлюна капала на зазубренные мечи вмеÑто когтей. Он оглÑдел комнату и, клÑнуÑÑŒ, на Ñекунду вÑтретилÑÑ Ñо мной взглÑдом, но потом проÑто ушел, Ñловно ничего не видел и не Ñлышал. Потом вÑе было как в тумане. \nПрошел целый день, прежде чем кто-то пришел поÑмотреть, что ÑлучилоÑÑŒ. Торговый караван увидел вдалеке дым и решил пройти длинным путем мимо демонов. Многие из торговцев даже не хотели Ñмотреть на менÑ, опаÑаÑÑÑŒ, что Ñто дурное предзнаменование, потому что только мне удалоÑÑŒ оÑтатьÑÑ Ð½ÐµÐ²Ñ€ÐµÐ´Ð¸Ð¼Ñ‹Ð¼. Ðо два брата решили ÑжалитьÑÑ Ð½Ð°Ð´Ð¾ мной и попытатьÑÑ ÑƒÐ±ÐµÐ´Ð¸Ñ‚ÑŒ оÑтальных членов каравана взÑÑ‚ÑŒ Ð¼ÐµÐ½Ñ Ñ Ñобой. Мне пришлоÑÑŒ продать жезл жрицы и заперетьÑÑ, но мне удалоÑÑŒ купить безопаÑный проход в деревню доÑтаточно далеко от пути демонов разрушениÑ. -guide.bloodmagic.entry.demon.snare.info.1=Однажды маг Ñказал мне, что у каждого живого ÑущеÑтва еÑÑ‚ÑŒ душа: люди, куры, овцы и даже ползучие раÑÑ‚ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð°Ð´Ð°ÑŽÑ‚ жизненной Ñилой, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð´Ð°ÐµÑ‚ телу волю к жизни. КажетÑÑ, что маг в Ñвое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ð²ÐµÐ» много ÑкÑпериментов и даже Ñлышал о могущеÑтвенном маге, который мог взÑÑ‚ÑŒ Ñти души и перелить их в пуÑтые ÑоÑуды, такие как зомби. Ðо Ñто заÑтавило Ð¼ÐµÐ½Ñ Ð·Ð°Ð´ÑƒÐ¼Ð°Ñ‚ÑŒÑÑ: еÑли у зомби и Ñкелетов не было души, как же у них была Ð²Ð¾Ð»Ñ Ðº жизни? Что заÑтавило их попытатьÑÑ Ð²Ñ‹Ñледить любое живое ÑущеÑтво и убить его? \n\tÐ’Ñе Ñто возвращалоÑÑŒ к Уиллу, каждый раз. Ð’Ñе "живое" должно иметь волю, чтобы выжить, но Ñто не значит, что оно должно быть их ÑобÑтвенным. Когда Ñ Ñ€Ð°ÑÑказал об Ñтом магу, он немного поразмыÑлил, а потом доÑтал доÑку и мел (откуда, кто знает) и начал набраÑывать какие-то заметки о других видах магии. - Ð’ Тавматургии, - Ñказал он, риÑÑƒÑ Ñ„Ð¸Ð³ÑƒÑ€Ñƒ Ñоломенного человека, - големы-Ñто живые ÑущеÑтва, которым поручено выполнÑÑ‚ÑŒ многие мирÑкие операции. Они живут, дышат и даже могут умереть, еÑли окажутÑÑ Ð² немилоÑти у Ñвоих хозÑев. Ð’ нынешней итерации Тауматургии, и да, на протÑжении веков ÑущеÑтвовало неÑколько верÑий Ñтого иÑкуÑÑтва, маг наполнÑл Ñвоей волей их неодушевленное творение и оживлÑл их.\n\t- Вот так, Белла, дейÑтвуют големы: Ñилой воли."\n\tТак что, еÑли голем может жить за Ñчет другого ÑущеÑтва, вкладывающего Ñвою волю в пуÑтую оболочку, возможно, какое-то другое ÑущеÑтво вкладывает Ñвою волю в тела мертвых, ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð·Ð¾Ð¼Ð±Ð¸ и Ñкелеты. Тут Ñ Ð²Ð·Ð´Ñ€Ð¾Ð³Ð½ÑƒÐ», вÑпомнив, что произошло в моей Ñтарой деревне. Только демон ÑпоÑобен на такую жеÑтокоÑÑ‚ÑŒ. Ðо чтобы проверить Ñту гипотезу, мне нужно было больше доказательÑтв. -guide.bloodmagic.entry.demon.snare.info.2=По указанию мага и ТибериÑ, когда он мог протÑнуть руку помощи, Ñ Ñделал Ñебе рудиментарную ловушку из железа, веревки и куÑка краÑного камнÑ. Тиберий, глубоко изучавший Тавматургию как магию выбора между диÑциплинами, Ñказал, что Ñилок должен быть ÑпоÑобен нарушить волю ÑущеÑтва, управлÑющего одушевленным объектом. -Я возилÑÑ Ñ Ñтим, когда играл Ñ Ð³Ð¾Ð»ÐµÐ¼Ð°Ð¼Ð¸, - Ñказал он Ñ ÑƒÐ»Ñ‹Ð±ÐºÐ¾Ð¹. Мы вÑе знали, как хорошо вÑе обернулоÑÑŒ. - РедÑтоун, казалоÑÑŒ, нарушил ÑвÑзь между моими големами и моей волей к движению. ТеоретичеÑки, еÑли что-то управлÑет зомби или Ñкелетами, вы должны быть в ÑоÑтоÑнии отрезать волю."\n\tОн Ñказал, что вÑе, что мне нужно Ñделать, Ñто броÑить его - еÑли Ñто Ñработает, какаÑ-то Ð±ÐµÐ»Ð°Ñ Ð¿Ñ‹Ð»ÑŒ должна ÑтруитьÑÑ Ð¾Ñ‚ ÑущеÑтва в течение некоторого времени. "ПоÑтому вы должны убить его поÑле того, как Ñто произойдет, чтобы что-то дейÑтвительно произошло. Ðо ловушка может работать только в 25% Ñлучаев, поÑтому будьте немного либеральны Ñ Ð½Ð¸Ð¼Ð¸!"\n\tСотворив шеÑтнадцать из них, Ñ Ð²Ñ‹ÑˆÐµÐ» ночью Ñ Ð¼ÐµÑ‡Ð¾Ð¼. Ðа Ñамом деле Ñто было довольно Ñложно: мне пришлоÑÑŒ выÑледить неÑкольких зомби, нырÑÑ Ð¸ уворачиваÑÑÑŒ от их неуклюжих ударов, броÑÐ°Ñ Ð² них неÑколько Ñилков. Как только белые чаÑтицы отделилиÑÑŒ от них, Ñ Ð±Ñ‹Ñтро убил их и подобрал то, что оÑталоÑÑŒ от их тел. Ðебольшое количеÑтво голубой вÑзкой жидкоÑти, казалоÑÑŒ, лежало в пеÑчаной пыли, ÐœÐ°Ð½Ñ Ð¼ÐµÐ½Ñ. Я поднÑл его, и мне показалоÑÑŒ, что из жидкоÑти иÑходит какое-то потуÑтороннее "приÑутÑтвие". БыÑтро убрав образцы, Ñ Ñ€ÐµÑˆÐ¸Ð» взглÑнуть на них более глубоко, когда вернуÑÑŒ домой. \n\tКазалоÑÑŒ, что размер и форма каждой "демоничеÑкой воли" варьировалиÑÑŒ, как будто качеÑтво воли завиÑело от иÑточника. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñовершенно произвольную единицу измерениÑ, волÑ, которую Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð» от Ñилков, кажетÑÑ, колеблетÑÑ Ð¾Ñ‚ Ð½ÑƒÐ»Ñ Ð´Ð¾ пÑти "волевых качеÑтв". Я не уверен, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ Ñ Ð¼Ð¾Ð³Ñƒ иÑпользовать Ñто вещеÑтво, но тем не менее Ñто очень интригующе. Я не могу Ñказать, отпечаток ли Ñто воли какого-то демона, или проÑто Ñлучайный криÑталл, найденный в их телах. Ðеобходимы дополнительные иÑÑледованиÑ. -guide.bloodmagic.entry.demon.forge.info.1=Я провел неÑколько недель, иÑÑÐ»ÐµÐ´ÑƒÑ Ð¸Ñпользование и ÑвойÑтва демоничеÑкой воли. Ð’ поÑледние неÑколько дней был некоторый уÑпех, однако он был нечаÑтым. Тиберий ÑпроÑил Ð¼ÐµÐ½Ñ Ð½Ð° днÑÑ…, может ли он взÑÑ‚ÑŒ образец демоничеÑкой воли Ð´Ð»Ñ Ð½ÐµÑкольких других Ñвоих ÑкÑпериментов: он упомÑнул, что Ñто может быть то, что ему нужно, чтобы поÑтроить новый кровавый алтарь, чтобы заменить побитый баÑÑейн, который мы иÑпользовали в подвале Мага, так как попытка воÑпроизвеÑти Ñту Ñтарую вещь Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ только камнÑ, казалоÑÑŒ, никогда не Ñоздавала правильную... вмеÑтилище нашей магии крови. Другими Ñловами, он думает, что Ñто может помочь.\n\tОднако Ñто не было полной потерей! Я проÑмотрел неÑколько учебников по алхимии, в которых обÑуждалÑÑ "Ñквивалентный обмен" и множеÑтво различных ÑпоÑобов Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð°Ñ‚ÐµÑ€Ð¸ÐµÐ¹. Я также поговорил Ñ Ð´Ð²ÑƒÐ¼Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸ÐºÐ°Ð¼Ð¸, которые проходили мимо, и они дали мне неÑколько Ñоветов о том, как деконÑтруировать материю и Ñнергию, чтобы изучить ее более внимательно. (КÑтати, Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° Ñказать, что мне нравилаÑÑŒ темно - Ñ„Ð¸Ð¾Ð»ÐµÑ‚Ð¾Ð²Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ, которую ноÑил один алхимик-проÑто глÑÐ´Ñ Ð½Ð° нее, Ñ Ñ‡ÑƒÐ²Ñтвовала, что Ð¼ÐµÐ½Ñ Ñ‚Ñнет какой-то плотный предмет. Ðе Ð³Ð¾Ð²Ð¾Ñ€Ñ ÑƒÐ¶Ðµ о Тиберии! ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñти проÑтые маÑÑивы Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¸Ð¼Ð¸ образцами, которые у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¸, Ñ Ñмог увидеть, что еÑÑ‚ÑŒ ÑпоÑобы фактичеÑки подключитьÑÑ Ðº иÑточнику Ñнергии внутри демоничеÑкой воли. Мне проÑто нужна была Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ. -guide.bloodmagic.entry.demon.forge.info.2=Только ÑÐµÐ³Ð¾Ð´Ð½Ñ Ð¼Ð½Ðµ удалоÑÑŒ получить Ñтруктуру, котораÑ, как Ñ Ð¿Ð¾Ð»Ð°Ð³Ð°Ð», объединит Ñлементы, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñту Ñырую волю. ÐÐ°Ð·Ð²Ð°Ð½Ð½Ð°Ñ "кузницей адÑкого огнÑ", Ñтруктура иÑпользует проÑтой маÑÑив алхимии, вырезанный в Ñтекле на его вершине, чтобы Ñплавить до четырех предметов вмеÑте, впрыÑÐºÐ¸Ð²Ð°Ñ ÐµÐ³Ð¾ Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей. ЧаÑÑ‚ÑŒ демоничеÑкой воли помещаетÑÑ Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ Ñтороны, а четыре ингредиента помещаютÑÑ Ð¿Ð¾ кругу. Похоже, что в Ñтой кузнице еÑÑ‚ÑŒ много разных "рецептов", но на них еÑÑ‚ÑŒ некоторые Ñффекты ÑтробированиÑ. \n\tÐ”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°, ÑущеÑтвует минимальное количеÑтво демоничеÑкой воли, которое должно быть в образце, чтобы Ñлементы объединÑлиÑÑŒ - еÑли в Ñтруктуре недоÑтаточно воли, ничего не проиÑходит. Далее, кажетÑÑ, что, Ñ…Ð¾Ñ‚Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ количеÑтво воли, большинÑтво рецептов не иÑтощают веÑÑŒ образец Ñвоей воли. Ðекоторые рецепты требуют огромного количеÑтва демоничеÑкой воли Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы начать процеÑÑ, но только немного иÑпользуетÑÑ Ð² крафте, еÑли таковые вообще еÑÑ‚ÑŒ. Ðекоторые рецепты кажутÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ легкими Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð² больших количеÑтвах, но другие... не Ñтолько. -guide.bloodmagic.entry.demon.petty.info.1=Я отправилÑÑ Ð² одно из Ñвоих ежедневных ночных приключений, чтобы Ñобрать немного демоничеÑкой воли, когда Ñ Ð½Ð°Ñ‡Ð°Ð» оÑознавать одну из главных проблем Ñ Ð¼ÐµÑ‚Ð¾Ð´Ð¾Ð¼ Ñбора: Ð¼Ð¾Ñ Ñумка продолжала наполнÑÑ‚ÑŒÑÑ Ð¾Ñ‚ вÑех образцов! По какой-то причине, возможно, потому, что конечный иÑточник демоничеÑкой воли различен Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ образца, Ð²Ð¾Ð»Ñ Ð½Ðµ будет ÑжиматьÑÑ Ð² более управлÑемую форму. По крайней мере, физичеÑкое проÑвление воли. \n\tТаким образом, Ñ Ð½Ð°Ñ‡Ð°Ð» работать Ñ Ð³Ð¾Ñ€Ð½Ð¾Ð¼ адÑкого огнÑ, который был раÑположен в моем углу дома, Ð¾Ñ‚Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ из наименее неприÑтных ÑкÑпериментов Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ Ñырье Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑобÑтвенного иÑÑледованиÑ. Ðа днÑÑ… Ñ ÑобираюÑÑŒ Ñделать Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ ÐµÐ³Ð¾ ÑобÑтвенной кузницей, так как Ñ ÑƒÑтал пытатьÑÑ Ð¸Ð·Ð±Ð°Ð²Ð¸Ñ‚ÑŒÑÑ Ð¾Ñ‚ вÑей пыли, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾ÐºÑ€Ñ‹Ð²Ð°ÐµÑ‚ мое рабочее меÑто от его "тайных ÑкÑпериментов". Мне вÑе равно, что вы "пытаетеÑÑŒ преодолеть разрыв между Ñфирными нитÑми Ñети души и физичеÑкой конÑтрукцией Ñланцев", уберите Ñвой проклÑтый пепел из моих вещей! -guide.bloodmagic.entry.demon.petty.info.2=Как бы то ни было, потребовалоÑÑŒ времÑ, чтобы найти материалы, которые, Ñкорее вÑего, резонировали бы Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей, чтобы лучше хранить их. ЛÑпиÑ, по-видимому, Ñамый доÑтупный проводник Ñтой Ñнергии, дейÑтвующий как путь Ð´Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð¾Ð»Ð¸. Добавив немного редÑтона в качеÑтве защиты от ÑлектричеÑких полей в воздухе (Ñложение двух Ñнергий вмеÑте, кажетÑÑ, вызывает катаÑтрофичеÑкие поÑледÑтвиÑ, по крайней мере, так Ñказал МагуÑ), золото в качеÑтве демпфирующего агента и Ñтекло в качеÑтве проÑтого корпуÑа, мне удалоÑÑŒ Ñоздать очень проÑтой "винный камень". Это означает " Драгоценный камень из подземного мира, Тартар."\n\tПоÑле дальнейших теÑтов Ñ ÑƒÐ·Ð½Ð°Ð», что Ñтот камень может выдержать качеÑтво воли 64. (Когда Ñ Ð¿Ñ€ÐµÐ´Ñтавил Ñти результаты МагуÑу, он заметил, что Ñто похоже на хорошее круглое чиÑло.) Когда Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ð»ÑÑ Ð²Ð¿Ð¾ÑледÑтвии забрать демоничеÑкую волю, она, казалоÑÑŒ,шла прÑмо в камень, еÑли не была полной - поÑле Ñтого они проÑто казалиÑÑŒ... иÑчезнуть. Удобно Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ рюкзака, но в оÑтальном загадка. Я также узнал, что еÑли Ñ Ð´ÐµÑ€Ð¶Ñƒ камень в руке и фокуÑируюÑÑŒ (щелкнув правой кнопкой мыши), около 10% макÑимальной емкоÑти ÐºÐ°Ð¼Ð½Ñ Ð±ÑƒÐ´ÐµÑ‚ перетекать в другие камни, которые у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¸ на моем лице. Я думаю, что Ñта поÑледнÑÑ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¾Ñ‡ÐµÐ½ÑŒ полезна, оÑобенно еÑли мы найдем другие, более мощные татарÑкие камни. -guide.bloodmagic.entry.demon.sword.info.1=Мои Ñилки Ñнова запуталиÑÑŒ.\n\tКажетÑÑ, не имеет значениÑ, наÑколько Ñ ÑтараюÑÑŒ улучшить их дизайн, Ñ€ÑƒÐ´Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð½Ð°Ñ Ð»Ð¾Ð²ÑƒÑˆÐºÐ° никогда не работает идеально. Он проÑто запутываетÑÑ Ð±Ð¾Ð»ÑŒÑˆÑƒÑŽ чаÑÑ‚ÑŒ времени, и когда мне наконец удаетÑÑ ÑƒÐ´Ð°Ñ€Ð¸Ñ‚ÑŒ им зомби, Ñто Ñкорее не Ñработает, чем Ñработает. Чтобы не рвать на Ñебе волоÑÑ‹, Ñ Ñнова пошел в кузницу и Ñразу принÑлÑÑ Ð·Ð° работу.\n\tÐу, не Ñразу, так как Ñначала Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ был Ñнова очиÑтить пепел Ñверху. -guide.bloodmagic.entry.demon.sword.info.2=Я вливал железный меч в демоничеÑкие Ñилы воли мелкого татарÑкого Ñамоцвета,и мне удалоÑÑŒ Ñоздать клинок... был очень тупым и едва ли причинил больше вреда, чем мой кулак. Ðа Ñамом деле Ñ Ð±Ñ‹Ð» очень разочарован результатом, потому что потребовалоÑÑŒ много времени, чтобы возитьÑÑ Ñ Ð³Ð¾Ñ€Ð½Ð¾Ð¼, чтобы оно не перегрелоÑÑŒ от напрÑÐ¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ иÑпользовании мелкого татарÑкого ÐºÐ°Ð¼Ð½Ñ Ð² качеÑтве иÑточника Ñнергии.\n\tОднако, как только Ñ Ð¿Ð¾Ð´Ð½Ñл Ñвой татарÑкий камень, меч начал ÑветитьÑÑ Ð½Ð¾Ð²Ð¾Ð¹ Ñнергией. КажетÑÑ, чем больше демоничеÑкой воли у Ð¼ÐµÐ½Ñ Ð½Ð° душе, тем больше вреда Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½ÑÑŽ мечом, а также тем больше демоничеÑкой воли падает. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ камнÑ, то будет очень... мизерный.поÑле небольшого иÑÐ¿Ñ‹Ñ‚Ð°Ð½Ð¸Ñ Ñ Ð¿Ñ€Ð¸ÑˆÐµÐ» к другому пониманию: в завиÑимоÑти от того, кого Ñ ÑƒÐ±Ð¸Ð²Ð°ÑŽ, Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°ÑŽ разное количеÑтво воли. КажетÑÑ, пропорционально количеÑтву макÑимального здоровьÑ, которое имеет монÑÑ‚Ñ€-паук, так как у него макÑимальное здоровье 8 Ñердец дает 80% воли зомби, у которого 10 Ñердец. Это, вероÑтно, потому, что Ñти монÑтры требуют больше воли, чтобы оживить. Я должен иметь Ñто в виду на потом. -guide.bloodmagic.entry.demon.lesser.info.1=Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ Ñ Ð±ÐµÑедовал Ñ Ð¢Ð¸Ð±ÐµÑ€Ð¸ÐµÐ¼, обÑуждал некоторые проекты, над которыми он работает. Должен Ñказать, когда мы начинаем говорить о его иÑÑледованиÑÑ…, кажетÑÑ, что он вÑе продолжает и продолжает! Как бы то ни было, одним из недавних изобретений, о которых он хотел поговорить, были его Ñигилы: до Ñих пор ему удавалоÑÑŒ Ñоздавать водный и лавовый Ñигилы, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ð´Ñкую кузницу, которую Ñ, наконец, поÑтроил Ð´Ð»Ñ Ð½ÐµÐ³Ð¾, как ÑредÑтво Ð´Ð»Ñ Ð¸Ñ… ÑозданиÑ. Я не был до конца уверен, как он их делал - Ñ Ð·Ð½Ð°Ð», что он ÑкÑпериментировал, ÑÐ¾Ð±Ð¸Ñ€Ð°Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ингредиенты и ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ€ÑƒÑ Ð¸Ñ… внутри кузницы, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‚Ð°Ñ‚Ð°Ñ€Ñкий камень в качеÑтве катализатора, но Ñ ÐµÑ‰Ðµ не видел, чтобы он активно ÑкÑпериментировал. Ðу, Ñ Ð½Ð°ÐºÐ¾Ð½ÐµÑ†-то понÑл, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ он иÑпользует Ñтот чертов пепел.\n\tПоÑмотрим, Ñмогу ли Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ то, что он Ñказал. Гм. - ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð²Ð¾Ð»ÑŽ демона, заключенную в Ñтих камнÑÑ…, чтобы преобразовать ингредиенты, проиÑходит Ñ€ÐµÐ°ÐºÑ†Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ вещами, которые обычно ничего не делают, когда объединÑÑŽÑ‚ÑÑ. ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñту вынужденную Ñинергию, Ñ Ð¼Ð¾Ð³Ñƒ впиÑать неÑколько тайных Ñимволов в узоры, которые направÑÑ‚ Ñнергию, которую Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑŽ Ñебе Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ð¹ задачи."Ð¥Ð¾Ñ‚Ñ Ñто не очень хорошо видно в пиÑьменной форме, предÑтавьте, что Ñ Ð³Ð¾Ð²Ð¾Ñ€ÑŽ Ñто, Ñдвинув очки на переноÑицу. Я не уверен, что он обычно такой, но Ñ ÐºÐ»ÑнуÑÑŒ, он получает вÑе... наукой, когда он мне вÑе объÑÑнÑет.\n\tВо вÑÑком Ñлучае, он показал мне, как он Ñоздал водный знак, продемонÑтрировав его мне. ПоÑле, по общему признанию, Ñркой демонÑтрации, он перешел к Ñути диÑкуÑÑии. "Когда Ñ Ð¿Ñ‹Ñ‚Ð°ÑŽÑÑŒ воÑпроизвеÑти Ñтот процеÑÑ Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ более продвинутыми материалами, кажетÑÑ, что реагенты имеют тенденцию... взрываетÑÑ Ð¿Ñ€Ð¸ добавлении в маÑÑив алхимии. Они кажутÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ неÑтабильными. Я думаю, что ингредиенты не ÑплавлÑÑŽÑ‚ÑÑ Ð´Ð¾Ð»Ð¶Ð½Ñ‹Ð¼ образом - возможно, в кузнице недоÑтаточно Ñнергии, чтобы Ñплавить их должным образом."\n\tПодумав об Ñтом неÑколько минут, Ñ Ð¿Ñ€Ð¸Ñтупил к работе - как Ñ ÑƒÐ¶Ðµ упоминал в предыдущей запиÑи, Ñ Ñ€ÐµÑˆÐ¸Ð», что потребуетÑÑ Ð±Ð¾Ð»ÐµÐµ мощный татарÑкий камень, но Ñ Ð²Ñе еще не понÑл, как Ñ Ð¼Ð¾Ð³Ñƒ Ñделать Ñто Ñлегантным ÑпоÑобом. Итак, Ñ Ñ€ÐµÑˆÐ¸Ð», что Ð´Ð»Ñ Ñтого будет доÑтаточно подхода грубой Ñилы! -guide.bloodmagic.entry.demon.lesser.info.2=Я взÑл блок ЛÑпиÑа, блок краÑного ÐºÐ°Ð¼Ð½Ñ Ð¸ бриллиант, а также пуÑтой мелкий татарÑкий камень, который лежал вокруг - чаÑÑ‚ÑŒ прошлого ÑкÑперимента... вÑе прошло не очень хорошо. Ð’Ñе, что Ñ Ð¼Ð¾Ð³Ñƒ Ñказать об Ñтом, Ñто то, что Ñ ÑƒÐ´Ð¸Ð²Ð»ÐµÐ½, что маг может Ñделать отверÑÑ‚Ð¸Ñ Ð² твердой бетонной Ñтене проÑто иÑчезнуть. Затем Ñ Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½Ð¸Ð» Ñти четыре предмета в кузнице адÑкого Ð¾Ð³Ð½Ñ Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ñ‹Ð¼ мелким татарÑким камнем, чтобы дейÑтвовать как иÑточник Ñнергии-кажетÑÑ, требуетÑÑ Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼ 60 воли. ПоÑле некоторого уÑилиÑ, пытаÑÑÑŒ найти оптимальное раÑположение, Ñ Ñобрал их вмеÑте и наблюдал, как пуÑтой камень начал раÑти внутри кузницы.\n\tПроÑто в качеÑтве примечаниÑ, Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ð»ÑÑ Ð¸Ñпользовать блок золота вмеÑто алмаза, чтобы выраÑтить драгоценный камень, но, похоже, что наличие другой криÑталличеÑкой Ñтруктуры было более полезным.\n\tЭтот новый, "меньший татарÑкий камень", похоже, имеет гораздо большую емкоÑÑ‚ÑŒ, ÑпоÑобную вмеÑтить в общей ÑложноÑти 256 Ñырых Воль. ÐадеюÑÑŒ, Ñтого доÑтаточно, чтобы удовлетворить потребноÑÑ‚ÑŒ Ð¢Ð¸Ð±ÐµÑ€Ð¸Ñ Ð² большом количеÑтве воли на некоторое времÑ. Ðо, увы, похоже, мне придетÑÑ Ð¿Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ñтот драгоценный камень. Еще одна Ð´Ð¾Ð»Ð³Ð°Ñ Ð½Ð¾Ñ‡ÑŒ впереди! -guide.bloodmagic.entry.demon.reactions.info=Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ Ñ Ð¿Ñ€Ð¾ÑнулаÑÑŒ на больничной койке, иÑÐ¿Ñ‹Ñ‚Ñ‹Ð²Ð°Ñ Ñильную боль. Я открыл глаза и увидел туÑкло-пурпурный потолок крыла больницы "интенÑивное проклÑтие" в ВетереÑе, ближайшем к нашей деревне крупном городе. ÐœÐµÐ½Ñ Ñта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ðµ оÑобенно беÑпокоила: она наÑтолько озадачила менÑ, что Ñ ÐºÐ°ÐºÐ¸Ð¼-то образом оказалÑÑ Ð·Ð´ÐµÑÑŒ, покрытый только царапинами и ÑинÑками, Ð¿Ð»ÑŽÑ Ð¿Ñ€Ð¾Ñтой Ð³Ð¸Ð¿Ñ Ð½Ð° левой ноге. Кто-то, должно быть, наложил на Ð¼ÐµÐ½Ñ Ð¿Ñ€Ð¾ÐºÐ»Ñтие "Ossa Fracta" или что-то в Ñтом роде, так как Ñто могла быть проÑто ÑÐ»Ð¾Ð¼Ð°Ð½Ð½Ð°Ñ ÐºÐ¾ÑÑ‚ÑŒ! \n\tКогда ÐœÐ°Ð³ÑƒÑ Ð²Ð¾ÑˆÐµÐ» Ñ Ð¾Ð´Ð½Ð¾Ð¹ из медÑеÑтер Ñ Ñерьезным лицом, Ñ Ð·Ð½Ð°Ð», что Ñто было что-то более радикальное. Очевидно, один из моих ÑкÑпериментов Ñ Ð½Ð¾Ð²Ñ‹Ð¼ камнем малого ÐºÐ°Ð¼Ð½Ñ Ð¾Ñ‚Ñкочил и вызвал небольшой, но мощный взрыв. Это Ñ Ð¼Ð¾Ð³ понÑÑ‚ÑŒ доÑтаточно легко, но Ñто было не так: ÑмеÑÑŒ обÑидиана, железа и Ðлмаза, которую Ñ Ð¸Ñпользовал, покрывала мою нижнюю левую ногу, Ð¾Ð±Ñ€Ð°Ð·ÑƒÑ Ð¶ÐµÑткую оболочку, которую Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ‹Ð»Ð¾ удалить. ГипÑ, который был у Ð¼ÐµÐ½Ñ Ð½Ð° ноге, на Ñамом деле не был гипÑом, а какой-то формой руничеÑкой матрицы, покрывающей Ñветло-голубую оболочку. \n\tЯ Ñпокойно ÑпроÑил, что думает МагуÑ, Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹Ð» Ñовершенно уверен в том, что произошло. -Я думаю,-Ñказал он, иÑкоÑа взглÑнув на медÑеÑтру, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð²Ð½Ð¸Ð¼Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñлушала, прежде чем Ñнова поÑмотреть на менÑ,-что Ñто проÑто какой-то оÑадок на оÑнове алмазов, и Ñто Ð³Ð»Ð°Ð²Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°, по которой мы не можем его удалить. Он также пронизан немного... потуÑтороннÑÑ ÑнергиÑ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ð¾Ñновной причиной того, что вы здеÑÑŒ вмеÑто кровати в меÑтной клинике - конгломерат довольно Ñтрог в отношении неизвеÑтной Ñнергии, непоÑредÑтвенно контактирующей Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð¸Ð½Ñ†Ð¸Ð´ÐµÐ½Ñ‚Ð° Eldritch, поÑтому мы должны были убедитьÑÑ, что не было никаких проблем."\n\t- Понимаю...- Обычно маг не утруждает ÑÐµÐ±Ñ Ñ‚Ð°ÐºÐ¸Ð¼Ð¸ формальноÑÑ‚Ñми, как получение информации от конгломерата о неизвеÑтных ÑнергиÑÑ… - Ñ Ð´Ð¾Ð²Ð¾Ð»ÑŒÐ½Ð¾ долго ÑкÑпериментировал Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей, и Ñто не похоже на то, что конгломерат поÑтучал в нашу дверь, чтобы зарегиÑтрировать Ñту магию. Я не буду вдаватьÑÑ Ð² подробноÑти, так как Ñ Ð½Ðµ очень хорошо разбираюÑÑŒ в политике, но Ñ Ð·Ð½Ð°ÑŽ, что маг учаÑтвует в ней очень редко. Это означало, что Ñила Ñтой воли Ñильно беÑпокоила МагуÑа, возможно, из-за некоторых его прошлых Ñделок...?\n\t- Ðу ладно, пока хватит об Ñтом, - Ñказал маг, Ð·Ð°ÐºÐ°Ñ‚Ñ‹Ð²Ð°Ñ Ñ€ÑƒÐºÐ°Ð²Ð° мантии. -Я пыталÑÑ Ñ€Ð°Ð·Ð±Ð¸Ñ‚ÑŒ Ñкорлупу, когда впервые увидел ее, очевидно, проверив, что Ñто такое. Ð’ прошлый раз Ñто не подейÑтвовало, но теперь подейÑтвовало..."\n\tÐа моей левой ноге был обжигающий жар, Ñопровождаемый оÑлепительным краÑным Ñветом, когда ÐœÐ°Ð³Ð½ÑƒÑ Ñложил ладони на голубой раковине. КазалоÑÑŒ, прошла Ñ†ÐµÐ»Ð°Ñ Ð²ÐµÑ‡Ð½Ð¾ÑÑ‚ÑŒ, но, должно быть, прошло вÑего неÑколько Ñекунд, прежде чем оболочка начала треÑкатьÑÑ Ð¸ раÑÑыпатьÑÑ Ð½Ð° чаÑти. ЧеÑтно говорÑ, Ñто было немного разочаровывающе. \n\tЯ попыталÑÑ Ð²Ñтать, но Халдей толкнул Ð¼ÐµÐ½Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ в кровать. - Белла, тебе нужно оÑтатьÑÑ Ð¸ отдохнуть. Ð’Ñ‹ можете поработать Ñ Ð²Ð°ÑˆÐ¸Ð¼Ð¸ иÑÑледованиÑми о драгоценных камнÑÑ… позже."Сначала Ñ Ð±Ñ‹Ð» раздражен, но вÑкоре Ñто прошло, так как у Ð¼ÐµÐ½Ñ Ð±Ñ‹Ð»Ð¾ много времени, чтобы подумать. ЕдинÑÑ‚Ð²ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°, по которой ÐœÐ°Ð³ÑƒÑ Ð½Ðµ Ñмог Ñделать то же Ñамое раньше, вероÑтно, потому, что у Ð¼ÐµÐ½Ñ Ð²Ñе еще был мой татарÑкий камень поÑле взрыва. ПоÑтому, что бы ни ÑлучилоÑÑŒ Ñ Ð¼Ð¾ÐµÐ¹ ногой, Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° была быть напрÑмую ÑвÑзана Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð¼ Уиллом, и как только мой камень был взÑÑ‚, раковину можно было ÑнÑÑ‚ÑŒ. Это заÑтавило Ð¼ÐµÐ½Ñ Ð·Ð°Ð´ÑƒÐ¼Ð°Ñ‚ÑŒÑÑ... -guide.bloodmagic.entry.demon.sentientGem.info.1=ПоÑле неÑкольких дней "хорошо необходимого поÑтельного режима", предпиÑанного и навÑзанного магом, Ñ Ñ€ÐµÑˆÐ¸Ð» провеÑти небольшое иÑÑледование в первую очередь на разумном оборудовании, которое Ñ Ñделал до Ñих пор. ЕÑÑ‚ÑŒ только так много, что Ñ Ð½Ðµ знаю о разумном мече, а также демон будет в целом. Конечно, мы знаем кое-что из теории, но, учитываÑ, что маг и Ñ Ð±Ñ‹Ð»Ð¸ теми, кто разработал теорию в первую очередь, трудно Ñказать, наÑколько она точна.\n\tÐ”Ð»Ñ Ñтого мне нужно было проÑвить творчеÑкий подход. Маг Ñказал мне, что вÑÑкий раз, когда он берет ученика, он наÑтаивает, что они должны изучать другую форму магии нарÑду Ñ Ð¸ÑÑледованиÑми, которые он проводит. Тиберий предложил мне изучать ботанику, но Ñ Ð¿Ð¾ÑмеÑлаÑÑŒ над Ñтой идеей - букет цветов не очень-то поможет мне в борьбе Ñ Ð´ÐµÐ¼Ð¾Ð½Ð°Ð¼Ð¸! -guide.bloodmagic.entry.demon.sentientGem.info.2=Sentient Armour Gem-Ñто переключаемый предмет, который иÑпользуетÑÑ Ð´Ð»Ñ Ð¾ÑÐ½Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸ оÑÐ½Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ чувÑтвительной брони. Когда вы щелкнете Правой Кнопкой Мыши Ñ Ð´Ñ€Ð°Ð³Ð¾Ñ†ÐµÐ½Ð½Ñ‹Ð¼ камнем, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ минимум 16 демонов в инвентаре, ваша Ð±Ñ€Ð¾Ð½Ñ Ð±ÑƒÐ´ÐµÑ‚ заменена набором разумных доÑпехов, который копирует вÑе Ð·Ð°ÐºÐ»Ð¸Ð½Ð°Ð½Ð¸Ñ Ð¸Ð· брони, которую вы заменили - когда вы активируете драгоценный камень Ñнова, ваша Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚ÑÑ Ðº вам. Это также работает, когда у Ð²Ð°Ñ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ нет брони.\n\tÐ Ð°Ð·ÑƒÐ¼Ð½Ð°Ñ Ð±Ñ€Ð¾Ð½Ñ Ð¿ÐµÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾ дейÑтвует как проÑтой набор железных доÑпехов, не Ð´Ð°Ð²Ð°Ñ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ… дополнительных ÑпоÑобноÑтей, кроме защиты. Однако, как и другие разумные инÑтрументы, Ð±Ñ€Ð¾Ð½Ñ Ð¾Ð±ÐµÑпечивает большую защиту, когда у Ð²Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ демоничеÑкой воли. Это делает защиту, предоÑтавлÑемую дейÑтвительно мощным, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ большое количеÑтво демона будет накоплено. ÐедоÑтатком Ñтого ÑвлÑетÑÑ Ñ‚Ð¾, что каждый удар будут Ñифон маленький куÑочек демон из винной камней, и еÑли вы получаете Ñлишком низок броню вернетÑÑ Ðº Ñвоей первоначальной форме. Может быть плохо! -guide.bloodmagic.entry.demon.routing.info=ТранÑпортировка предметов в магии крови проиÑходит от ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð¸Ñ‚ÐµÐ¹ демоничеÑкой воли между узлами маршрутизации, которые дейÑтвуют как каналы Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ предметов из одного Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ð² другой. Ð”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° давайте объÑÑним, как работает каждый отдельный Ñлемент.\n\tÐšÐ°Ð¶Ð´Ð°Ñ ÑиÑтема маршрутизации нуждаетÑÑ Ð² Главном узле маршрутизации, который дейÑтвует как мозг ÑиÑтемы. Входной узел маршрутизации вводит Ñлементы в ÑиÑтему, а выходной узел маршрутизации выводит Ñлементы из ÑиÑтемы, а обычный узел маршрутизации не имеет Ñпециальной функции.\n\tЧтобы Ñформировать Ñеть, необходимо щелкнуть узел Ñ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ узла, а затем щелкнуть другой узел, который требуетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ. Это ÑвÑзывает два узла вмеÑте. Пока узел может отÑлеживать некоторую форму маршрута к другому узлу (и еÑли он подключен к главному узлу маршрутизации), они могут "разговаривать" друг Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼.\n\tКак правило, Ñлементы извлекаютÑÑ Ð¸Ð· Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ñ€Ñдом Ñ Ð²Ñ…Ð¾Ð´Ð½Ñ‹Ð¼ узлом и помещаютÑÑ Ð² инвентарь Ñ€Ñдом Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ð¼ узлом. Чтобы уÑтановить, что куда идет, Ñледует иÑпользовать фильтр. Ðажав на одну из кнопок в интерфейÑе узла, вы можете выбрать, что входит в инвентарь в заданном направлении (N указывает на Ñевер и Ñ‚. д.). ЕÑли помеÑтить фильтр Ñлементов в Ñамый левый Ñлот узла, можно указать количеÑтва и типы Ñлементов, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ узел может взаимодейÑтвовать на оÑнове фильтра. При уÑтановке фильтра на входном фильтре можно извлекать только Ñти типы номенклатур из запаÑов (ÑохранÑÑ, по крайней мере, заданную Ñумму, еÑли указано количеÑтво). ЕÑли фильтр уÑтановлен на фильтре вывода, можно только перемеÑтить Ñти типы номенклатур в запаÑ, не более указанного количеÑтва.\n\tСущеÑтвует четыре типа фильтров: \n\tТочный-Ñлемент должен быть точно ÑопоÑтавлен, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ NBT и метаданные\n\tMod Item-предмет ÑоответÑтвует, еÑли он из одного из отфильтрованных модов.\n\tИгнорировать NBT - фильтр Ñлементов не учитывает NBT\n\tРудный Ñловарь - допуÑкаетÑÑ Ð»ÑŽÐ±Ð¾Ð¹ Ñлемент, ÑоответÑтвующий одной из ÑÑылок Рудного ÑÐ»Ð¾Ð²Ð°Ñ€Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð².\n\tЕÑÑ‚ÑŒ два чиÑла, которые вы Ñможете увидеть при вÑтавке фильтра в узел маршрутизации: количеÑтво и приоритет. При нажатии на один из Ñлементов в фильтре поÑвитÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ выбранного Ñлемента, а прÑмо под ним-количеÑтво Ñлементов. УÑтановив Ñтот номер, вы можете указать фильтру, Ñколько из Ñтого типа номенклатуры он будет хранить на Ñкладе в подключенном инвентаре (либо заполнÑÑ Ñту Ñумму, еÑли Ñто выходной узел, либо убедившиÑÑŒ, что он ÑохранÑет Ñту Ñумму, оÑтавленную в инвентаре, еÑли Ñто входной узел). ЕÑли вы уменьшите количеÑтво фильтра до 0, вы можете уÑтановить так, чтобы фильтр разрешал "вÑе", как в любом количеÑтве, Ð´Ð»Ñ Ñтого конкретного фильтра. Входные узлы будут вытÑгивать как можно больше из инвентарÑ, а выходные узлы будут толкать как можно больше.\n\tВторое чиÑло-Ñто приоритет узла, изменÑемый кнопками Ñо Ñтрелками Ñ€Ñдом Ñ Ð½Ð¸Ð¼. Это чиÑло отличаетÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ñтороны узла. Сначала будет иÑпользоватьÑÑ ÑƒÐ·ÐµÐ» Ñ Ð¼ÐµÐ½ÑŒÑˆÐ¸Ð¼ номером в Ñети. -guide.bloodmagic.entry.demon.aura.info=Когда ÑущноÑÑ‚ÑŒ убита нормально, она Ñо временем иÑпарÑетÑÑ Ð¸ возвращаетÑÑ Ðº Творцу. Когда он попадает в ловушку, он втÑгиваетÑÑ Ð² Ñтот план из Ñфирного и как бы заÑтревает. У Ð½Ð°Ñ ÐµÑÑ‚ÑŒ, Ð´Ð»Ñ Ð²Ñех намерений и целей, нарушена его программированиÑ, и он заморозил вÑе дейÑтвиÑ. Когда мы Ñжигаем его, он возвращаетÑÑ Ð² Ñфирное ÑоÑтоÑние и может возобновить нормальные операции. ЕÑли Ñто впрыÑкиваетÑÑ Ð² воздух, то мы можем иÑпользовать его в различных направлениÑÑ…. Ðекоторые из них мирÑкие по Ñвоей природе, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº другие довольно могущеÑтвенны.\n\tДемон будет при инъекции в воздух оÑтаетÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ куÑка, который он был введен без миграции. Каждый куÑок имеет Ñвою ÑобÑтвенную Ñохраненную волю, причем каждый тип воли хранитÑÑ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ð¾ (подробнее об Ñтом в другом разделе). Это будет доÑтупно и управлÑÑ‚ÑŒÑÑ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ блоками и Ñлементами. -guide.bloodmagic.entry.demon.types.info=До Ñих пор единÑтвенный тип демоничеÑкой Воли, который мы обÑуждали, - Ñто Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð°Ñ Ð²Ð¾Ð»Ñ. Как Ñледует из названиÑ, Ñто ÑÐ°Ð¼Ð°Ñ Ð³Ñ€ÑƒÐ±Ð°Ñ Ð¸ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÐ»ÑŒÐ½Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð° воли, но Ñто не значит, что она чиÑта. Ðа Ñамом деле, Ð²Ð¾Ð»Ñ Ð´ÐµÐ¼Ð¾Ð½Ð° принимает много различных форм: Ñырой-Ñто тип, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ мы имеем дело обычно, но еÑÑ‚ÑŒ также разъедающий, разрушительный, мÑтительный и Ñтойкий. ÐÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð°Ñ Ð²Ð¾Ð»Ñ ÑоÑтоит из ÑмеÑи вÑех четырех Ñтих типов и, возможно, Ñмешана Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸, еще не открытыми типами, но поÑле Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð½Ð° Ñти различные типы воли кажетÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼ их рекомбинировать.\n\tПока неÑÑно, проиÑходÑÑ‚ ли Ñти разные типы воли из разных иÑточников, однако мы знаем процеÑÑ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ñтих разных типов воли. Ритуальный " Ñ€ÐµÐ·Ð¾Ð½Ð°Ð½Ñ Ð³Ñ€Ð°Ð½ÐµÐ½Ð¾Ð³Ð¾ криÑталла "может раÑколоть необработанный КриÑталл воли на его чиÑтые чаÑти, подробнее об Ñтом в ÑоответÑтвующей запиÑи в"ритуальном МаÑтере". УÑтройÑтво, ÑпоÑобное получать необработанные криÑталлы воли, - Ñто криÑталлизатор демона, вход в который находитÑÑ Ð½Ð¸Ð¶Ðµ.\n\tКаждый из Ñтих четырех типов воли предÑтавлÑет различные аÑпекты желаниÑ. Могут быть и другие типы воли, однако они либо недоÑтаточно чиÑÑ‚Ñ‹, либо проÑто не могут быть Ñозданы в Ñтой форме.\n\tÐšÐ¾Ñ€Ñ€Ð¾Ð·Ð¸Ñ Ð¿Ñ€ÐµÐ´ÑтавлÑет Ñобой желание разрушить вÑе вокруг ÑебÑ, либо киÑлотой, либо Ñокрушительной Ñилой. Тот, кто может овладеть Ñтой волей, может обладать оÑлаблÑющими ÑтатуÑными Ñффектами и невоÑприимчив к ужаÑным Ñдам.мÑтительноÑÑ‚ÑŒ можно раÑÑматривать как желание без уÑтали иÑкать цель. Обычно Ñто можно раÑÑматривать либо как увеличение ÑкороÑти тела, чтобы иÑкать Ñвою добычу, либо чтобы убедитьÑÑ, что цель не в ÑоÑтоÑнии уйти, как вы поÑтоÑнно атакуете их.\n\tРазрушение, как вы, вероÑтно, можете Ñказать, Ñто чиÑÑ‚Ð°Ñ Ñила. Сила атаки и Ð¾Ð±Ñ‰Ð°Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð´Ð¾Ð±Ð»ÐµÑÑ‚ÑŒ могут быть получены, еÑли Ñта Ð²Ð¾Ð»Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹Ð¼ образом обуздана. Его можно также иÑпользовать Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы задавить и поломать вещи при иÑпользовании в других применениÑÑ….\n\tСтойкоÑÑ‚ÑŒ раÑÑматриваетÑÑ ÐºÐ°Ðº желание предотвратить вред Ñебе. Ð’ большинÑтве Ñлучаев хозÑева Ñтой воли ÑвлÑÑŽÑ‚ÑÑ Ð¾Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ оплотом партии, ÑпоÑобным противоÑтоÑÑ‚ÑŒ мощным атакам и даже не чувÑтвовать их. ЕÑли вам нужно оÑтатьÑÑ Ð² живых, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ доÑпехов или ритуалов, Ñто один из вариантов, который Ñледует раÑÑмотреть. -guide.bloodmagic.entry.demon.crucible.info=Тигель демона-Ñто уÑтройÑтво, которое ÑпоÑобно Ñжечь волю демона внутри ÐºÐ°Ð¼Ð½Ñ Ð¸ других предметов, чтобы ввеÑти его в ауру куÑка, в котором он находитÑÑ. ЕÑÑ‚ÑŒ неÑколько различных ÑпоÑобов иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚Ð¸Ð³Ð»Ñ: один из Ñамых проÑÑ‚Ñ‹Ñ… ÑпоÑобов-помеÑтить камень внутри тиглÑ, щелкнув по нему правой кнопкой мыши Ñ ÐºÐ°Ð¼Ð½ÐµÐ¼ в руке. Ð’ Ñтом Ñлучае тигель будет Ñливать волю из драгоценного ÐºÐ°Ð¼Ð½Ñ Ð´Ð¾ тех пор, пока аура не будет наÑыщена Ñтим типом воли (макÑимум 100 по умолчанию) или пока драгоценный камень не опуÑтеет.\n\tДругой ÑпоÑоб - иÑпользовать ÑодержащийÑÑ Ð² камне винный камень, чтобы Ñлить волю из ауры-Ñто делаетÑÑ Ð¿ÑƒÑ‚ÐµÐ¼ подачи Ñильного Ñигнала краÑного ÐºÐ°Ð¼Ð½Ñ Ð² тигель, а затем ÑодержащийÑÑ ÐºÐ°Ð¼ÐµÐ½ÑŒ попытаетÑÑ Ñлить как можно больше воли.\n\tÐаконец, отдельный куÑочек воли может быть Ñожжен в тигле, еÑли в ауре такого типа доÑтаточно меÑта. Одним из примеров Ñтого ÑвлÑетÑÑ ÐšÑ€Ð¸Ñталл воли демона, который имеет значение 50. -guide.bloodmagic.entry.demon.crystallizer.info=Как уже говорилоÑÑŒ ранее, аура демона-Ñто Ñфирное проÑвление воли демона, а вещеÑтво, получаемое при убийÑтве толпы, - ее физичеÑкое проÑвление. КриÑталлизатор демона дейÑтвует как Ð¯ÐºÐ¾Ñ€Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° Ð´Ð»Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой воли в ауре, чтобы зацепитьÑÑ, ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·ÑƒÑ Ñфирную волю обратно в физичеÑкую форму Ñнова в форме криÑталла.\n\tВам может быть интереÑно, почему вы проÑто не берете волю из татарÑкого ÐºÐ°Ð¼Ð½Ñ Ð½Ð°Ð¿Ñ€Ñмую и не формируете из нее КриÑталл. Это проиÑходит потому, что, транÑÑ„Ð¾Ñ€Ð¼Ð¸Ñ€ÑƒÑ Ð²Ð¾Ð»ÑŽ в ее Ñфирную форму, мы очищаем ее и позволÑем воле попытатьÑÑ Ð²Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñвои обычные дейÑÑ‚Ð²Ð¸Ñ - имейте в виду, что когда мы убиваем монÑтра Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¸Ñ‡ÐµÑкой волей, прикрепленной к ним, мы замораживаем Программирование воли, чтобы она не могла делать то, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ она была поÑлана. ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·ÑƒÑ ÐµÐ³Ð¾ в Ñфирную форму в ауре, Ð²Ð¾Ð»Ñ ÑтановитÑÑ Ð±Ð¾Ð»ÐµÐµ активной, и Ñто та волÑ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñхвачена криÑталлизатором. Только не Ñмотри на Ñто Ñмешно.\n\tÐ”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы криÑталлизатор демона работал, он должен быть в куÑке Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ количеÑтвом демоничеÑкой воли (80) определенного типа, и через определенное количеÑтво времени он будет потреблÑÑ‚ÑŒ волю из ауры, чтобы Ñоздать клаÑтер криÑталлов демона Ñ Ð¾Ð´Ð½Ð¸Ð¼ шпилем. ЕÑÑ‚ÑŒ два ÑпоÑоба работы криÑталлизатора: он может Ñформировать КриÑталл из определенного типа воли (агреÑÑивной, разрушительной, мÑтительной и Ñтойкой), еÑли будет доÑтаточно воли Ñтого конкретного типа, или он возьмет Ñырую волю из ауры, чтобы Ñоздать КриÑталл. \n\tÐ’ предыдущих воплощениÑÑ… уÑтройÑтва было возможно транÑформировать Ñырую волю из ауры в криÑталлы Ñ Ñ€Ð°Ð·Ð½Ñ‹Ð¼Ð¸ направлениÑми. Однако Ñто уже не так: вы вÑе еще можете Ñоздавать новые шпили определенной уÑтремленной воли, еÑли ее доÑтаточно в ауре, однако вам нужно будет иÑкать другие ÑредÑтва, чтобы отделить многие аÑпекты от Ñырой воли. Более подробно Ñмотрите запиÑÑŒ "Ñ€ÐµÐ·Ð¾Ð½Ð°Ð½Ñ Ð³Ñ€Ð°Ð½ÐµÐ½Ð¾Ð³Ð¾ КриÑталла" в ритуальном МаÑтере. -guide.bloodmagic.entry.demon.cluster.info=КлаÑтер криÑталлов демона может быть Ñоздан либо КриÑталлизатором демона, либо путем ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐµÐ³Ð¾ в кузнице адÑкого Ð¾Ð³Ð½Ñ Ñ ÐºÑ€Ð¸Ñталлами демона воли. Обработанные клаÑтеры могут быть размещены на любой твердой поверхноÑти, такой как пол, Ñтены и потолки. Ðа криÑталле еÑÑ‚ÑŒ макÑимум Ñемь шпилей, когда он полноÑтью выроÑ, и когда он Ñломан киркой, он уронит шпили, как демон криÑталлы. Однако, еÑли вы щелкните правой кнопкой мыши клаÑтер, когда у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Виннокаменный камень Ñ Ð±Ð¾Ð»ÐµÐµ чем 1024 необработанной волей внутри него, вы можете Ñломать один шпиль из клаÑтера, не Ð½Ð°Ñ€ÑƒÑˆÐ°Ñ Ñам клаÑтер; Ñто никогда не Ñломает главный шпиль клаÑтера.\n\tПредоÑтавленный Ñамому Ñебе, клаÑтер будет Ñифонировать некую волю того же типа из ауры, чтобы раÑти медленно. Этот процеÑÑ Ð½ÐµÐ¼Ð½Ð¾Ð³Ð¾ медленный, но еÑÑ‚ÑŒ небольшой чиÑтый выигрыш.\n\tЕÑÑ‚ÑŒ два ритуала, которые иÑпользуютÑÑ Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ñ‰Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¸ Ñбора Ñтих криÑталлов:" Ñбор покинутых душ "и"трещина разбитого КриÑталла". Чтобы узнать, как их иÑпользовать, обратитеÑÑŒ к маÑтеру ритуала. -guide.bloodmagic.entry.demon.pylon.info=Как вы, возможно, знаете, аура демона оÑтаетÑÑ Ð² Ñвоем ÑобÑтвенном куÑке, еÑли нет никаких внешних влиÑний. Ðу, Ñто одно из таких влиÑний. Пилон демона дейÑтвует как маÑк Ð´Ð»Ñ Ð’Ð¾Ð»Ð¸ в ауре, вытÑÐ³Ð¸Ð²Ð°Ñ Ð²Ð¾Ð»ÑŽ из ÑоÑедних куÑков (тех куÑков, которые находÑÑ‚ÑÑ Ð½ÐµÐ¿Ð¾ÑредÑтвенно Ñ€Ñдом Ñ Ð½Ð¸Ð¼ в четырех кардинальных направлениÑÑ…, а не по диагонали) в Ñвой куÑок. Пилон попытаетÑÑ ÑƒÑ€Ð°Ð²Ð½ÑÑ‚ÑŒ волю в Ñвоем куÑке Ñо Ñвоим ÑоÑедом так, чтобы у куÑка пилона было Ñтолько же воли, Ñколько у его выÑшего ÑоÑеда Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ типа. Однако Ñтот процеÑÑ Ð¿Ñ€Ð¾Ð¸Ñходит только в одном направлении: еÑли в ÑоÑеднем куÑке меньше воли, чем в куÑке пилона, Ð’Ð¾Ð»Ñ Ð½Ðµ будет передавать другое направление. -guide.bloodmagic.entry.demon.gauge.info=Чтобы Ñказать, Ñколько у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ в данном куÑке, вам нужно, чтобы демон измерил. Когда в вашем инвентаре, датчик будет отображать волю в куÑке, который у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ в пÑти барах в левом верхнем углу Ñкрана. Ð’Ñ‹ можете Ñказать, Ñколько точно, Ñдвинув; чиÑла поÑвÑÑ‚ÑÑ Ñправа от баров, чтобы дать Ñумму, округленную до ближайшего целого чиÑла. - - - -# Alchemy Entries -guide.bloodmagic.entry.alchemy.intro=Ð’Ñтупление -guide.bloodmagic.entry.alchemy.ash=Тайный пепел -guide.bloodmagic.entry.alchemy.speed=Движение МаÑÑив -guide.bloodmagic.entry.alchemy.updraft=МаÑÑив обновлений -guide.bloodmagic.entry.alchemy.bounce=Прыгающий маÑÑив -guide.bloodmagic.entry.alchemy.turret=Револьверный Ñкелет маÑÑива -guide.bloodmagic.entry.alchemy.buff=ОÑлаблÑющие маÑÑивы -guide.bloodmagic.entry.alchemy.fastMiner=МаÑÑив Fast Miner -guide.bloodmagic.entry.alchemy.furnace=Сжигание печи маÑÑив -guide.bloodmagic.entry.alchemy.teleport=МаÑÑив Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ -guide.bloodmagic.entry.alchemy.standardTurret=МаÑÑив турель -guide.bloodmagic.entry.alchemy.laputa=ОÑколок Лапута - - -# Alchemy Entry Texts -guide.bloodmagic.entry.alchemy.intro.info=ÐœÐµÐ½Ñ Ð·Ð¾Ð²ÑƒÑ‚ Влад Хайборн, и Ñ Ð¼Ð°Ð³ крови. Я изучал Ñложную работу алхимии и процеÑÑ "Ñквивалентного обмена", который управлÑет вÑеми аÑпектами магии. Ð’ принципе, вы не можете Ñоздать что-то из ничего, Ñ…Ð¾Ñ‚Ñ Ð¼Ð½Ð¾Ð³Ð¸Ðµ пыталиÑÑŒ при поиÑке определенного камнÑ. Это, очевидно, не закончилоÑÑŒ хорошо, потому что люди требуют поддельного варианта даже ÑегоднÑ. Конечно, проÑто Ñказать, что Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸Ðº, недоÑтаточно, потому что одна из главных вещей, которую Ñ Ð´ÐµÐ»Ð°ÑŽ, Ñто изучаю магию крови Ñ Ñ€Ð¸Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¼ маÑтером и архитектором, оба из которых доÑтигли Ñтих титулов по Ñвоим ÑобÑтвенным заÑлугам. Маг и Тиберий были занÑÑ‚Ñ‹ запиÑью Ñвоих ÑобÑтвенных работ на протÑжении многих лет, Ñ…Ð¾Ñ‚Ñ Ñ Ð½Ðµ думаю, что у мага вÑе запиÑано в книге - Ñ ÐµÑ‰Ðµ не нашел никаких фактичеÑких доказательÑтв.Ð¼Ð¾Ñ ÐºÐ½Ð¸Ð³Ð° поÑвÑщена вÑем алхимичеÑким вещам в магии крови. От иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚Ð°Ð¹Ð½Ð¾Ð³Ð¾ пепла до Ñложной работы таблицы алхимии, вы найдете вÑе, что вам нужно знать о некоторых из более Ñложных Ñлементов в мире. Ðе вÑе, что вам нужно знать, еÑÑ‚ÑŒ в Ñтой книге - Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð½Ð¸Ð¼Ð°Ð½Ð¸Ñ Ð¼Ð°Ð³Ð¸Ð¸ крови вам нужно будет прочитать другие запиÑи во вÑем Ñтом томе.\n\tBut а пока, надеюÑÑŒ, вам понравÑÑ‚ÑÑ Ð¼Ð¾Ð¸ запиÑи. Ты не найдешь никакой лжи между Ñтими покрывалами. -guide.bloodmagic.entry.alchemy.ash.info=Arcane Ash необходим Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñоздавать алхимичеÑкие маÑÑивы, мощные круги, которые ÑпоÑобны обеÑпечить различные Ñффекты. Этот пепел изготовлен Ñ Ð¸Ñпользованием Hellfire Forge и Demon Will, поÑтому, еÑли вы новичок в Ñтой концепции, обратитеÑÑŒ к "Королю демонов"." \n\tПепел имеет в общей ÑложноÑти двадцать применений, прежде чем вам нужно Ñоздать другой. Когда вы щелкните правой кнопкой мыши по земле (или Ñтене, Ñ…Ð¾Ñ‚Ñ Ð¾Ð½Ð° будет отображать только одно направление), вы напишете проÑтой круг из пепла. ЕÑли вы Ñнова нажмете на золу Ñ Ñлементом, он будет" помещен внутри золы " - предполагаÑ, что Ñтот Ñлемент дейÑтвителен, круг изменит форму, чтобы предÑтавить, что он готов к Ñледующему Ñлементу. ЕÑли он не менÑет форму, значит, вы Ñделали что-то не так.\n\tПоÑле того, как он изменил форму, вы можете помеÑтить во вторичный Ñлемент. ЕÑли Ñтот Ñлемент Ñовпадает Ñ Ð¿ÐµÑ€Ð²Ñ‹Ð¼ Ñлементом, круг начнет вращатьÑÑ Ð¸ выполнÑÑ‚ÑŒ различные дейÑÑ‚Ð²Ð¸Ñ Ð² завиÑимоÑти от рецепта, над которым он работает. \n\tКаждый не-крафтовый Ñффект, который можно выполнить Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтих маÑÑивов, можно найти в Ñтой книге, и даже еÑли рецепт изменитÑÑ Ñ‡ÐµÑ€ÐµÐ· 3rd party, он будет отображатьÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¼ здеÑÑŒ. Показанные Ñлементы-Ñто порÑдок, в котором они должны быть размещены. -guide.bloodmagic.entry.alchemy.speed.info=МаÑÑив Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñоздает небольшой вихрь воздуха в его центре и иÑпользует небольшое количеÑтво Ñнергии Ð´Ð»Ñ ÐµÐ³Ð¾ нагрева. ПоÑле Ñтого, как только животное или любой другой тип ÑущеÑтва войдет в зону его дейÑтвиÑ, они будут запущены вперед в том направлении, в котором он был помещен Ñилой воздуха. Более того, еÑли упаÑÑ‚ÑŒ Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ выÑоты, маÑÑив уÑтранит урон от падениÑ, который был бы нанеÑен. ПроÑто будьте готовы к некоторым мÑгким движением опоÑлÑ. \n\tÐаправление движениÑ-в направлении Ñтрелки на маÑÑиве.\n\tСледует также отметить, что вы получите гораздо большее раÑÑтоÑние, еÑли упадете или прыгнете на маÑÑив, чем еÑли бы вы проÑто вошли в его облаÑÑ‚ÑŒ. Это ÑвÑзано Ñ Ñ‚ÑƒÑ€Ð±ÑƒÐ»ÐµÐ½Ñ‚Ð½Ð¾Ñтью ваших движений, вызывающей гораздо большую реакцию. -guide.bloodmagic.entry.alchemy.updraft.info=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‚Ðµ же принципы, что и маÑÑив Movement, Ñтот маÑÑив запуÑкает объект, который Ñтупает поверх него вертикально в воздухе. ЕÑтеÑтвенно, любой пользователь должен быть оÑторожен, потому что путь вниз может быть немного трудным! -guide.bloodmagic.entry.alchemy.bounce.info=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¸Ñточник тепла вблизи Ñвоего центра, который толкаетÑÑ Ð²Ð½Ð¸Ð·, маÑÑив пытаетÑÑ ÑмÑгчить землю под ним. ПоÑле Ñтого он преобразует углерод и водород в резиновый материал внутри Земли. Эта ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ñет любую ÑущноÑÑ‚ÑŒ ударить поверхноÑÑ‚ÑŒ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы отÑкочить в воздухе и иÑключать повреждение Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ в противном Ñлучае было бы терпеть. Этот отÑкок может быть оÑтановлен проÑтым перемещением, и он вÑе равно ÑмÑгчит ваше падение. -guide.bloodmagic.entry.alchemy.turret.info=ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð²Ð¾Ð»ÑŽ демона, который вÑе еще контролирует толпу, вы можете захватить разум Ñкелета, чтобы заÑтавить его выполнÑÑ‚ÑŒ ваши приказы. ЕÑли Ñкелет окажетÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ облаÑти Ñтого маÑÑива, он будет дейÑтвовать как чаÑовой и атаковать враждебных монÑтров поблизоÑти. К Ñожалению, Ñтот маÑÑив вÑе еще очень ÑкÑпериментален, поÑтому он может работать не очень хорошо или поÑледовательно. -guide.bloodmagic.entry.alchemy.buff.info=Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñ‚Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¼Ñƒ изучению вы понимаете, что алхимичеÑкие маÑÑивы имеют широкий Ñпектр приложений. До Ñих пор вам удавалоÑÑŒ Ñоздавать мощные предметы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ крафтовых маÑÑивов, а также неÑкольких маÑÑивов, которые обеÑпечивают функциональные преимущеÑтва, такие как быÑтрое движение и Ñлабые формы телепортации. Однако одно из применений, которое вам еще предÑтоит иÑпользовать, - Ñто предоÑтавление мощных буферов через активный маÑÑив.\n\t"Бафф-маÑÑивы" - Ñто общий термин Ð´Ð»Ñ Ð°Ð»Ñ…Ð¸Ð¼Ð¸Ñ‡ÐµÑких маÑÑивов, которые предоÑтавлÑÑŽÑ‚ некоторый бафф игрокам в пределах Ñвоей облаÑти дейÑтвиÑ. Эти зоны влиÑÐ½Ð¸Ñ Ð¸Ð¼ÐµÑŽÑ‚ тенденцию иметь очень большой радиуÑ, которым Ð½ÐµÐ»ÑŒÐ·Ñ Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ (в отличие от ритуалов). Однако, поÑкольку алхимичеÑкие маÑÑивы не имеют понÑÑ‚Ð¸Ñ Ð¾ Ñети душ, они должны питать Ñвои Ñффекты другими ÑредÑтвами: в оÑновном через прÑмые кровавые подношениÑ.Проще говорÑ, Ñто означает, что вÑÑкий раз, когда маÑÑив будет применÑÑ‚ÑŒ бафф, он повредит (возьмет HP) у игрока, на которого он брошен. \n\tИз-за прÑмого характера Ñтих жертв преобразование HP - > buff намного более благоприÑтно Ð´Ð»Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ¾Ð² в ранней игре по Ñравнению Ñ Ð°Ð½Ð°Ð»Ð¾Ð³Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ баффами в моде. Ðапример, еÑли бафф из Ñигила Ñтоит 100 ЛП за 10 Ñекунд активации, более мощный бафф может быть применен маÑÑивом за 30 Ñекунд за 1 ЛП (что ÑоÑтавлÑет 100 ЛП в алтаре T1 без рун). Это можно раÑÑматривать как намного более Ñффективное на ранних уровнÑÑ…, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº на более поздних уровнÑÑ… Ñто не так Ñффективно. Однако, из-за Ñтационарной природы маÑÑивов, они, как правило, обеÑпечивают более Ñильный Ñффект, чем их Ñигил-Ñчетчики, поÑтому люди могут захотеть иÑпользовать его в конце игры. -guide.bloodmagic.entry.alchemy.fastMiner.info=Когда поÑтавлена задача вырезать большую площадь земли, иногда лучше вÑего проÑто Ñделать Ñто вручную. Ð”Ð»Ñ Ñ‚Ð°ÐºÐ¸Ñ… Ñлучаев, Ñтот маÑÑив Ð´Ð»Ñ Ð²Ð°Ñ. МаÑÑив применÑет Haste III buff к игрокам в радиуÑе 10 блоков, что Ñтоит пользователю 1 HP за 30 Ñекунд. Потому что Ñто Ð¾Ð±Ñ‰Ð°Ñ Ñпешка бафф, он также увеличит ÑкороÑÑ‚ÑŒ атаки в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº в Ñвоей облаÑти Ñффекта, Ñ…Ð¾Ñ‚Ñ Ð²Ð°Ð¼ придетÑÑ Ð±Ñ‹Ñ‚ÑŒ оÑторожным, так как другие игроки тоже выиграют от Ñтого! -guide.bloodmagic.entry.alchemy.furnace.info=Одна из многих проблем, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ вы можете ÑтолкнутьÑÑ Ð² начале Ñвоего приключениÑ, - Ñто неÑпоÑобноÑÑ‚ÑŒ поддерживать огонь в печи. ГорÑÑ‰Ð°Ñ Ð¿ÐµÑ‡ÑŒ может означать разницу между полным желудком и Ñильным оружием или голодом в пещере. \n\tГорÑщий маÑÑив печи, как Ñледует из названиÑ, обеÑпечит Ñтоль необходимый иÑточник тепла Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ близлежащей печи. Ð Ð°Ð·Ð¼ÐµÑ‰Ð°Ñ Ð¼Ð°ÑÑив непоÑредÑтвенно Ñ€Ñдом Ñ Ð²Ð°Ð½Ð¸Ð»ÑŒÐ½Ð¾Ð¹ печью (он может быть Ñ€Ñдом Ñ Ð½ÐµÑколькими), он обеÑпечит топливо Ð´Ð»Ñ Ð¿ÐµÑ‡Ð¸, еÑли Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть завершена - ничего не произойдет, еÑли она находитÑÑ Ñ€Ñдом Ñ Ð¿ÑƒÑтой или полной печью, в оÑновном Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ защиты. \n\tОднако Ñто не беÑплатно: когда человек находитÑÑ Ñ€Ñдом (в радиуÑе 10 кварталов), он заберет половину Ñердца здоровьÑ, чтобы приготовить до двух вещей в печи. Это будет полезно либо быÑтро перекуÑить, либо раÑплавить полный штабель руды, но, к Ñожалению, вы не нашли ÑпоÑоба добавить какие-либо меры безопаÑноÑти в маÑÑив... -guide.bloodmagic.entry.alchemy.teleport.info=МаÑÑив телепортации дейÑтвует как ÑпоÑоб мгновенно перемещатьÑÑ Ð¸Ð· одного меÑта в другое Ñ Ð½ÐµÑколькими конкретными ограничениÑми. Когда игрок или другой объект входит в маÑÑив, маÑÑив будет иÑкать до 20 блоков в направлении, в котором он ÑталкиваетÑÑ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ маÑÑивом алхимии (который не должен быть активным). ЕÑли маÑÑиву удаÑÑ‚ÑÑ ÑƒÑпешно найти пункт назначениÑ, он телепортирует объект в найденный маÑÑив мгновенно, даже через Ñтены. \n\tИзучение Ñтого маÑÑива показало, что к нему добавлÑÑŽÑ‚ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ограничениÑ: из-за природы изгиба ткани проÑтранÑтва-времени маÑÑив телепортации не будет телепортировать то, что телепортировалоÑÑŒ в течение 2 Ñекунд. Это должно дать Ð²Ñ€ÐµÐ¼Ñ Ð²Ñем компонентам переÑтроитьÑÑ Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ образом. -guide.bloodmagic.entry.alchemy.standardTurret.info=Ðевозможно переоценить Ñилу Ð¼ÐµÑ‚Ð°Ð½Ð¸Ñ Ð¾Ñтрых предметов в далеких монÑтров. Ð‘Ð°ÑˆÐµÐ½Ð½Ð°Ñ Ñ€ÐµÑˆÐµÑ‚ÐºÐ° ÑпоÑобна ощутить близкого враждебного монÑтра и, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñложные алхимичеÑкие механизмы, ÑпоÑобна отÑтупить и выÑтрелить Ñтрелой, чтобы поразить Ñвою цель. \ n \ t маÑÑив ищет инвентарь непоÑредÑтвенно под ним. ЕÑли он найдет нормальную или наклоненную Ñтрелку, он будет Ñифон из Ñвоего контейнера и ÑтрелÑÑ‚ÑŒ в толпу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð² радиуÑе 32 блока. \n\t(Из-за какой-то глупой физики Minecraft, в которой Ñтрелки отÑкакивают от объектов, которые Ñлишком близки к тому, где они поÑвлÑÑŽÑ‚ÑÑ, Ð±Ð°ÑˆÐ½Ñ Ñ‚Ð°ÐºÐ¶Ðµ будет ÑтрелÑÑ‚ÑŒ только по толпе, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ, чем в 3 кварталах. Имейте Ñто в виду!) -guide.bloodmagic.entry.alchemy.laputa.info=СущеÑтвует иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¾ потерÑнном королевÑтве, которое обладало такой развитой магией, что могло летать Ñквозь облака. Ð¥Ð¾Ñ‚Ñ Ñто королевÑтво Ñ Ñ‚ÐµÑ… пор раÑÑыпалоÑÑŒ в пыль, неÑколько риÑунков Ñтого замка в небе Ñумели предоÑтавить изыÑканные детали механизмов, которые позволили ему Ñтать легендой, что Ñто так. \n\tОÑколок Лапуты превращает ÑущноÑÑ‚ÑŒ жизни, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Земли, в более птичью форму, заÑтавлÑÑ Ð¾ÐºÑ€ÑƒÐ¶Ð°ÑŽÑ‰ÑƒÑŽ облаÑÑ‚ÑŒ левитировать в воздухе. Ð¥Ð¾Ñ‚Ñ Ð¾Ñновной принцип проÑÑ‚, вариации жизненной ÑущноÑти Земли вызывают некоторую непоÑледовательноÑÑ‚ÑŒ в том, Ñколько Земли перемещаетÑÑ. МаÑÑив будет перемещать землю в ÑферичеÑком радиуÑе между 4 и 8 блоками над Ñобой Ñлучайное Ñмещение между одним и 5 блоками Ð¿Ð»ÑŽÑ Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ñ€Ð°Ð´Ð¸ÑƒÑ Ñффекта. \n\tСледует отметить, что как только начнетÑÑ Ñффект, вÑе Ñлементы, иÑпользуемые Ð´Ð»Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸ маÑÑива, будут потерÑны. diff --git a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang b/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang deleted file mode 100644 index 37b61615..00000000 --- a/src/main/resources/assets/bloodmagicguide/lang/zh_CN.lang +++ /dev/null @@ -1,270 +0,0 @@ -# Book Information -guide.bloodmagic.title=血染知书 -guide.bloodmagic.display=血染知书 -guide.bloodmagic.author=血魔法 -guide.bloodmagic.welcome=血魔法 - -# Page Information -guide.bloodmagic.page.bloodAltar=血之祭å›åˆæˆ -guide.bloodmagic.page.soulForge=狱ç«ç†”炉åˆæˆ -guide.bloodmagic.page.tier=层级：%d -guide.bloodmagic.page.lp=LP: %d -guide.bloodmagic.page.minimumWill=å¯åŠ¨æ‰€éœ€æ„志：%f -guide.bloodmagic.page.drainedWill=åˆæˆæ¶ˆè€—æ„志：%f -guide.bloodmagic.shapelessOrb=æ— åºå®ç åˆæˆ -guide.bloodmagic.shapedOrb=有åºå®ç åˆæˆ -guide.bloodmagic.page.alchemyArray=炼金法阵 - - -# Categories -guide.bloodmagic.category.architect=缔造者 -guide.bloodmagic.category.ritual=仪å¼å¤§å¸ˆ -guide.bloodmagic.category.demon=æ¶é­”ä¹‹å­ -guide.bloodmagic.category.spell=战法师 -guide.bloodmagic.category.alchemy=炼金术士 - -# Ritual Master Entries -guide.bloodmagic.entry.ritual.intro=åº -guide.bloodmagic.entry.ritual.basics=仪å¼å…¥é—¨ -guide.bloodmagic.entry.ritual.ritualStone=仪å¼çŸ³ -guide.bloodmagic.entry.ritual.masterRitualStone=主仪å¼çŸ³ -guide.bloodmagic.entry.ritual.activationCrystal=激活水晶 -guide.bloodmagic.entry.ritual.diviner=仪å¼æŽ¨æµ‹æ– -guide.bloodmagic.entry.ritual.fullSpring=æ¶Œæ³‰ä»ªå¼ -guide.bloodmagic.entry.ritual.lava=下界夜曲 -guide.bloodmagic.entry.ritual.greenGrove=ç»¿ä¸›ä»ªå¼ -guide.bloodmagic.entry.ritual.magnetism=ç£åŠ›ä»ªå¼ -guide.bloodmagic.entry.ritual.crusher=æŒ–æŽ˜ä»ªå¼ -guide.bloodmagic.entry.ritual.highJump=é«˜è·³ä»ªå¼ -guide.bloodmagic.entry.ritual.speed=é€Ÿç§»ä»ªå¼ -guide.bloodmagic.entry.ritual.wellOfSuffering=苦难之井 -guide.bloodmagic.entry.ritual.featheredKnife=ç¾½åˆ€ä»ªå¼ -guide.bloodmagic.entry.ritual.regen=é‡ç”Ÿä»ªå¼ -guide.bloodmagic.entry.ritual.harvest=满月收割 -guide.bloodmagic.entry.ritual.interdiction=ç¦æ­¢ä»ªå¼ -guide.bloodmagic.entry.ritual.containment=ç‰µåˆ¶ä»ªå¼ -guide.bloodmagic.entry.ritual.suppression=æŠ‘æ¶²ä»ªå¼ -guide.bloodmagic.entry.ritual.expulsion=驱é€æ°›åœº -guide.bloodmagic.entry.ritual.zephyr=和风之唤 -guide.bloodmagic.entry.ritual.laying=é“ºè®¾ä»ªå¼ -guide.bloodmagic.entry.ritual.timberman=ä¼æž—ä»ªå¼ -guide.bloodmagic.entry.ritual.meteor=å æ˜Ÿæ ‡ä½ -guide.bloodmagic.entry.ritual.downgrade=沉é‡çµé­‚çš„å¿æ‚” -guide.bloodmagic.entry.ritual.crystalSplit=结晶共鸣 - -# Ritual Master Entry Text -guide.bloodmagic.entry.ritual.intro.info=晚上好，我就是马格斯·阿尔å¡çº³ã€‚在外人看æ¥æˆ‘有很多身份：盗贼ã€è‡ªè­¦å›¢ã€å·«å¸ˆã€æˆ˜å£«ã€åŸæ¸¸è¯—人ã€ç”šè‡³æ”¿æ²»å®¶ã€‚而现在，åªæœ‰å°‘数人清楚地知é“我的头衔——åªéœ€æåŠä¸€ä¸‹ï¼Œé‚£è‡†æƒ³ä¸­çš„残暴图景就å¯ä»¥ä»¤äººé—»é£Žä¸§èƒ†â€”—纵使这个说法有一åŠæ˜¯è¯¯å¯¼ï¼Œä½†è¿™ä¸ªè¯´æ³•æœ‰ä¸€åŠçš„确是真相。诚然，我说的便是作为èŒä¸šå­˜åœ¨çš„血法师。我的朋å‹ä¸€èˆ¬éƒ½ç›´å‘¼æˆ‘çš„å，而我的敌人一般称我为仪å¼å¤§å¸ˆã€‚\n\t/cut现在呢，我的学生们，为了让我把毕生所学传播给下一代有志者们，缠在我身边已有数月了。我一直在åšå®ˆç§˜å¯†ï¼Œä½†æ比略对此的评论更为精辟：“尽管你自己还看ä¸åˆ°ä½ è‡ªå·±çš„潜力，但ä¸è®ºæ˜¯åœ¨ä»€ä¹ˆé­”法领域中，那些已臻化境的大师们的故事总是对下一代人有好处的。然而，é‡çŽ°å¥‡è¿¹çš„细节其实并没有那么é‡è¦ã€‚若是没有对魔法能é‡çš„ç»å¯¹è‡ªä¿¡ï¼Œå³ä¾¿æ˜¯é‡‘沙，也ä¸è¿‡æ˜¯ä¸€å †ç¡«ç£ºç²‰è€Œå·²ã€‚â€å½“然你å¯ä»¥è®¤ä¸º/cutä»–å·²ç»è§¦ç¢°åˆ°äº†ç‚¼é‡‘术的真谛，但他毕竟是我的第一个学生，我有时候也会认真æ€è€ƒä»–的想法。\n\t所以呢，那些ä»åœ¨è‹¦è‹¦å¯»æ‰¾å‰è¿›çš„é“路的年轻血法师们，且å¬æˆ‘一言：血魔法的领域之广阔ä¸æ˜¯å¸¸äººå¯ä»¥ç†è§£çš„，若ä¸åŠ æ€è€ƒåœ°å‰è¿›ï¼Œå¾ˆå¿«ä½ å°±ä¼šé‡åˆ°ç“¶é¢ˆã€‚因此，请务必时常翻阅这本书——这本书上有我的魔法，åªè¦æˆ‘写下æ¥æ–°çš„内容，你们就能立刻看到。\n\t/cut诸ä½è¯·å。ä¸è¦ç´§å¼ ï¼Œè¯•ç€åŽ»æ„Ÿå—è€ä¸€è¾ˆè¡€æ³•å¸ˆçš„教诲。或许会比你讨价还价求到的东西还è¦æœ‰ç”¨ã€‚ -guide.bloodmagic.entry.ritual.basics.info=现在的魔法仪å¼å·²ç»å’Œå‡ ç™¾å¹´å‰å¤§ä¸ä¸€æ ·äº†ã€‚曾几何时，人们用粉末在地上组æˆé­”法阵，并在æ—边起舞，直到获得想è¦çš„东西。我甚至记得有一ä½ä»Žå¥¹è‡ªå®¶èŠ±å›­ä¸­æ”¶é›†é­”法能é‡çš„éšå£«ã€‚我一直都在嘲笑这ç§é­”法，直到她把她的猫头鹰丢过æ¥ç›‘视我。\n\t而血魔法师的仪å¼å‘¢ï¼Œéœ€è¦ç”¨åˆ°ä¸€ç§å¸¦ç‰¹æ®Šæ ‡è®°çš„石头，并且需è¦æŒ‰æŒ‡å®šæ–¹å¼ç²¾ç¡®æ‘†æ”¾ï¼Œæ–¹èƒ½è½¬åŒ–注入的能é‡ã€‚有一/cut天，我的学徒æ比略在他的新房间里翻找我过去的仪å¼èµ„料。那里有一ç½ä»Žæœªå¼€å°è¿‡çš„液æ€Etherium（我好åƒè¯´è¿‡å¾ˆå¤šæ¬¡è¦æŠŠå®ƒå–回æ¥ä½†æ¯æ¬¡è¯´å®Œå°±å¿˜äº†ï¼‰ï¼Œä»¥åŠä¸€ä¸ªé€è¿‡é•œç‰‡çœ‹æ—¶æ€»åƒæ˜¯åœ¨è¯´â€œæ˜ŸæœŸäºŒâ€çš„水晶çƒã€‚当有一个标有“符文尘埃â€çš„ç®±å­è¢«æ‰“ç¿»åŽï¼Œä¸€é¢—å°å°çš„红色å®çŸ³æ»šäº†å‡ºæ¥ï¼Œæ»šåˆ°äº†æ比略的脚下。霎那间，它å‘出的明亮的红å®çŸ³çš„光芒和他抱ç€çš„ç®±å­é‡Œçš„粉末å‘生了å应。\n\t/cut——自然地，瞬间爆炸。æ比略ä¸å°å¿ƒé‡Šæ”¾å‡ºçš„没有èšç„¦çš„能é‡æ¿€æ´»äº†ç¬¦æ–‡å°˜åŸƒå’Œå‘¨å›´çš„仪å¼çŸ³ï¼Œåœ¨æ²¡æœ‰å®¹çº³èƒ½é‡çš„装置的情况下，它们åªèƒ½å‘外扩散。在几天的治疗åŽï¼Œæ比略和我åˆå¼€å§‹äº†å·¥ä½œã€‚\n\t在ç»åŽ†äº†æ•°ä¸ªä¸çœ ä¹‹å¤œï¼Œå’Œé«˜æ•ˆçš„咖啡因的帮助下（啊，感谢Player先生的咖啡，感谢他给我带æ¥çš„更加精神的明天ï¼ï¼‰ï¼Œæˆ‘们终于找出了所有仪å¼æ‰€éœ€çš„关键æ料。\n\t/cutæ ¹æ®å®žéªŒï¼Œæˆ‘们需è¦è‡³å°‘å››ç§æ料：按照一定样å¼æ‘†æ”¾çš„仪å¼çŸ³ï¼›è‹¥å¹²ç§ä¸åŒçš„墨水，用于刻画仪å¼ç»†èŠ‚；置于仪å¼ä¸­å¤®çš„特殊仪å¼çŸ³ï¼Œç”¨äºŽä¼ é€’能é‡ï¼›ä»¥åŠç”¨äºŽæ¿€æ´»ä»ªå¼çš„水晶。我觉得有必è¦å°†å„个仪å¼å…¨éƒ¨è¯¦ç»†åœ°è§£è¯´ä¸€é。 -guide.bloodmagic.entry.ritual.ritualStone.info.1=仪å¼çŸ³ä¾¿æ˜¯é­”法能é‡çš„容器：根æ®çŸ³å¤´çš„ä¸åŒï¼Œå¯å°†èƒ½é‡å¡‘造为å„ç§å½¢çŠ¶ï¼Œæˆ–导å‘ä¸åŒçš„地方。仪å¼çŸ³åˆ†äº”ç§ï¼šç©ºç™½ï¼ˆæ²¡æœ‰ä»»ä½•é“­æ–‡ï¼‰ã€æ°´ã€ç«ã€é£Žå’ŒåœŸã€‚æ¯ä¸ªä»ªå¼éƒ½ä¼šç”¨åˆ°è‹¥å¹²ä¸åŒç§ç±»çš„仪å¼çŸ³ï¼Œæ¯ä¸ªä»ªå¼æ‰€éœ€çš„布局也ä¸å°½ç›¸åŒã€‚ -guide.bloodmagic.entry.ritual.ritualStone.info.2=为仪å¼çŸ³ç”»ä¸Šæ­£ç¡®çš„铭文需è¦ä¸€äº›å·¥å…·ã€‚我早已研究出一ç§å¿«é€Ÿå»ºé€ æ­£ç¡®ä»ªå¼çš„办法，但如果有人想自己动手æ­å»ºçš„è¯è¿˜æ˜¯å¯ä»¥ç”¨è¿™äº›å·¥å…·çš„。手æŒåˆé€‚的工具å³å‡»ä»ªå¼çŸ³ä¾¿å¯ä¸ºå…¶ç”»ä¸Šé“­æ–‡ã€‚一开始你åªèƒ½åˆ¶ä½œå‡ºå…¶ä¸­å››ç§å·¥å…·ï¼Œéšç€ä¿®è¡Œçš„深入你会得到更高级的工具的制作方法的。 -guide.bloodmagic.entry.ritual.masterRitualStone.info=和大部分魔法一样，仪å¼éœ€è¦å¼•å¯¼ï¼Œå¦åˆ™å…¶åŠ›é‡ä¼šå˜å¾—无法控制，或者仪å¼æœ¬èº«ä¼šå½»åº•å¤±æ•ˆã€‚有鉴于此，仪å¼éœ€è¦ç”±ä¸»ä»ªå¼çŸ³æŽ§åˆ¶ï¼ˆæˆ‘的笔记中通常会以缩写"MRS"表记，但也åªèƒ½è¿™æ ·å†™å†™è€Œå·²ã€‚试想：你喊一声“麻烦一下，我需è¦æ›´å¤šçš„MRSâ€...然åŽå°´å°¬ç—‡å°±çŠ¯äº†ã€‚）主仪å¼çŸ³ä¼šä»Žå…¶ä¸»äººçš„çµé­‚网络中抽å–能é‡ï¼Œå¹¶æ‰©æ•£è‡³æ¯ä¸€å—仪å¼çŸ³ä¸Šï¼Œä»Žè€Œå¯åŠ¨ä»ªå¼ã€‚\n\t把çµé­‚网络和一å—大石头绑一å—有点麻烦。我曾ç»æˆåŠŸ/cut过一次：在主仪å¼çŸ³é¡¶ä¸Šç›˜è…¿æ‰“å，将能é‡èšé›†äºŽçŸ³å¤´ä¸Šå¹¶å°½åŠ›å°†çµé­‚网络和仪å¼è¿žåœ¨ä¸€èµ·ã€‚虽说æˆåŠŸæŒç»­äº†å‡ åˆ†é’Ÿï¼Œä½†æˆ‘的裤å­å´å› ä¸ºæ°´åœ¨ä»ªå¼çŸ³ä¸Šå†·å‡è€Œæ¹¿é€äº†ã€‚于是我得到了一个教训：ä¸è¦è¯•å›¾åœ¨å®žéªŒä¸­è¿›è¡Œä»»ä½•å†¥æƒ³ã€‚ -guide.bloodmagic.entry.ritual.activationCrystal.info.1=于是我们åœæ­¢äº†å†¥æƒ³ï¼Œè½¬è€ŒåŽ»ç ”究那颗从箱å­é‡Œæ»šå‡ºçš„红色å®çŸ³ã€‚æ比略确信它有“将我们所在的肉体世界和主宰çµé­‚网络的精神世界连接在一起â€çš„能力。我一直在想到底è¦ä¸è¦æ”¶ä»–作学徒，但我的确能看出他对于那些晦涩难懂的魔法的ç†è§£ã€‚啊，我想我有必è¦ç¿»è¯‘一下，他想表达的是：我们å¯ä»¥ç”¨è¿™æ°´æ™¶å°†çµé­‚网络和主仪å¼çŸ³è¿žåœ¨ä¸€èµ·ï¼Œä»¥ç»™ä»ªå¼æ供能é‡ã€‚ -guide.bloodmagic.entry.ritual.activationCrystal.info.2=于是我们得到了虚弱激活水晶，以åŠå¤åˆ¶å®ƒçš„办法。它的原料是å¦ä¸€ç§å¯ä»¥ä¸Žçµé­‚网络链接的水晶：熔岩水晶。åªéœ€è¦è¿…速在上é¢åˆ»å¥½å¿…须的图案，血之祭å›å°±å¯ä»¥å°†å®ƒå˜æˆæ¿€æ´»æ°´æ™¶ã€‚自然地，它也需è¦å’Œä½¿ç”¨è€…çš„çµé­‚网络绑定。在仪å¼æ­£ç¡®æ‘†æ”¾åŽï¼Œåªéœ€æ‰‹æŒç†”岩水晶å³å‡»ä¸»ä»ªå¼çŸ³å°±å¯ä»¥å¼€å§‹äº†ã€‚当然，这需è¦æœ‰è¶³å¤Ÿå¤šçš„LP作为支撑。如果没有足够多的LP，仪å¼ä¸ä¼šå‘动，也ä¸ä¼šå› æ­¤æ¶ˆè€—LP。 -guide.bloodmagic.entry.ritual.diviner.info.1=在ä¸æ–­å‘现新的仪å¼è¿‡ç¨‹ä¸­ï¼Œæˆ‘愈å‘感到建造仪å¼çš„枯燥。这也是为什么我制作出这样一个工具的原因——这样所有人都å¯ä»¥é€šè¿‡ç®€å•çš„手势和动作æ¥å¿«é€Ÿéƒ¨ç½²ä»ªå¼äº†ã€‚按时间顺åºæ¥è¯´è¿™ä¸ªåº”该放在诸仪å¼çš„åŽé¢æ¥è®²ï¼Œä½†æˆ‘决定æ到å‰é¢ï¼Œå› ä¸ºæˆ‘觉得先学习这个的使用会更好。没人会想在临阵时æ‰å‘现仪å¼çŸ³æ²¡å¸¦å¤Ÿï¼ŒæŠ‘或原本åªæ˜¯æƒ³å˜å‡ºä¸€ç“¶æ°´ç»“æžœå´å¬å”¤äº†é™¨çŸ³å§ã€‚ -guide.bloodmagic.entry.ritual.diviner.info.2=仪å¼æŽ¨æµ‹æ–的本质是本仪å¼çš„百科全书。你å¯ä»¥é€šè¿‡ä¸€äº›æ“作（按ä½Shift左击或å³å‡»ï¼‰æ¥åœ¨ä¸åŒä»ªå¼é—´åˆ‡æ¢ï¼Œä»”细看的è¯ä½ è¿˜ä¼šå¾—知一些基础信æ¯ã€‚在你带ç€ä»ªå¼çŸ³çš„时候，手æŒæŽ¨æµ‹æ–å³å‡»ä¸»ä»ªå¼çŸ³ï¼Œä¾¿å¯åœ¨æ­£ç¡®ä½ç½®æ”¾ç½®ä¸€å—仪å¼çŸ³ã€‚åªéœ€è¦ä¸æ–­å³å‡»å°±å¯ä»¥å®Œæˆä»ªå¼äº†ï¼ -guide.bloodmagic.entry.ritual.fullSpring.info=几年å‰ï¼Œæœ‰ä¸€ä¸ªæ—…行商人路过我附近的一个æ‘å­ï¼Œå¹¶å‘众人兜售他的å„ç§å°ä¸œè¥¿ã€‚那个æ‘å­å¤§æ¦‚有很长时间没下雨了，庄稼也快旱死了，商人è§æ­¤ä¾¿æŽå‡ºäº†ä¸€ä¸ªé•¶æœ‰è“色å®çŸ³çš„银制护符。“看这个ï¼â€ï¼Œä»–的声音中带ç€å‡ åˆ†æ¿€åŠ¨ï¼Œâ€œè¿™ä¸ªä¸œè¥¿å¯ä»¥è®©æ²³æµæ°¸ä¸å¹²æ¶¸ï¼æˆ‘å¯ä»¥ç”¨ç‚¼é‡‘术从空气中å˜å‡ºæ°´ï¼â€\n\t然而æ‘民们觉得那å®çŸ³å¥½åƒåªæ˜¯æ™®é€šçš„è“å®çŸ³è€Œå·²ã€‚等他们å应过æ¥ä¸Šå½“å—骗时那/cut个商人已ç»æ¶ˆå¤±å¾—无影无踪了。我起åˆå¹¶ä¸æ‰“算干涉此事——因为他们似乎并ä¸å–œæ¬¢æˆ‘的魔法——但这次我破了个例。在和“炼金术士â€è¿›è¡Œäº†æ„‰å¿«çš„交æµåŽï¼Œæˆ‘在çŒæº‰æ¸ æ—打å了数å°æ—¶ã€‚我æˆåŠŸé€šè¿‡å†·å´ç©ºæ°”中水蒸气的办法给庄稼们带æ¥äº†è¶³å¤Ÿå¤šçš„水——足够撑到下一个旱季。自然这个方法并ä¸é è°±ï¼Œå› ä¸ºæˆ‘自己已ç»è¢«æ‰“å给榨干了，ä¸å¾—ä¸é è‡ªå·±é€ å‡ºæ¥çš„æ°´æ¥é‡æ–°è°ƒæ•´ã€‚\n\t/cut我å†æ¬¡æƒ³èµ·äº†è¿™ä¸ªäº‹ï¼Œå¹¶æŒ‰ç…§åŒæ ·çš„方法制作了涌泉仪å¼ã€‚给仪å¼çŒæ³¨å°‘é‡èƒ½é‡ï¼Œä»ªå¼ä¾¿å¯å°†é™„近空气中的水分èšé›†èµ·æ¥ï¼Œå¹¶åœ¨ä¸»ä»ªå¼çŸ³ä¸Šæ–¹äº§ç”Ÿä¸€ä¸ªæ°´æºã€‚激活仪å¼éœ€è¦çš„能é‡å¹¶ä¸å¤šï¼Œç»´æŒå…¶è¿è½¬çš„能é‡æ›´æ˜¯å¯ä»¥å¿½ç•¥ä¸è®¡ã€‚\n\t水的范围和放置的ä½ç½®éƒ½æ˜¯å¯ä»¥ç”¨ä»ªå¼è°ƒæ•´é’³è°ƒæ•´çš„，所以那些对美观表示担忧的魔法师们ä¸è¦æ‹…心了。这便是魔法的力é‡ï¼ -guide.bloodmagic.entry.ritual.lava.info=熔岩——æ怕是最普通的能é‡æ¥æºäº†å§ã€‚我平日的研究中很少使用熔岩，因为它其实并éžæ˜¯æ™®é€šçš„é“桶就能装起æ¥çš„东西ï¼\n\t有一天，当地的一åé“匠找到我，并å‘我打å¬é™„近的能é‡æºçš„事情。他说他们最近新造了一个大家伙，需è¦å¤§é‡èƒ½é‡æ¥è¿è½¬ã€‚我回答é“，“有倒是有，但它们并éžæ— ä¸»ä¹‹ç‰©ã€‚â€æˆ‘决定去亲眼看一下这个所谓的大家伙到底是何方神圣。\n\t/cut那是...一个至少五公尺（5米）è§æ–¹çš„冶炼炉，上é¢è¿˜è¿žç€å‡ ä¸ªç©ºç©ºå¦‚也的储ç½ã€‚虽然我ä¸çŸ¥é“这玩æ„儿到底是怎么工作的，但我的直觉告诉我，熔岩的热é‡ç”¨åœ¨è¿™é‡Œæ­£åˆé€‚——电力是ç»å¯¹ä¸è¡Œçš„，ç»å¯¹ä¸è¡Œã€‚除此之外，我åªçŸ¥é“è¿™ä¸æ˜¯æ²‰æµ¸å·¥ä¸šå…¬å¸çš„产å“。\n\t在ç»è¿‡çŸ­æš‚的讨价还价åŽï¼Œé“匠付了一笔费用，我便开始å«ä»–们ç¨å¾®è®©å¼€ä¸€ä¸‹ï¼Œä»¥ä¾¿å‡†å¤‡æ­å»ºä»ªå¼ã€‚按我的想法，我将/cutå››å—ç«ä¹‹ä»ªå¼çŸ³å’Œä¸»ä»ªå¼çŸ³æ‘†æˆå字，脑海中ä¸æ–­æƒ³è±¡æ•´ä¸ªè¿‡ç¨‹çš„åŒæ—¶ï¼Œæˆ‘用力将激活水晶推å‘了主仪å¼çŸ³ã€‚ç†è®ºä¸Šè¿™ä¸ªè¿‡ç¨‹åº”该å分简å•ï¼šä»ªå¼ä¸æ–­åœ°å°†å¤§åœ°æ·±å¤„的石头挖出æ¥ï¼Œåœ¨å·¨å¤§çš„压力下熔èžæˆç†”岩。这样制æˆçš„熔岩å¯ä»¥ç›´æŽ¥ä»Žä»ªå¼çŸ³ä¸­æå–出æ¥ï¼Œç„¶åŽä»ªå¼æœ¬èº«è¿˜å¯ä»¥è‡ªç»´æŒè¿™ç§ç±»ä¼¼æŒ¤åŽ‹çš„过程。\n\t然而这åªæ˜¯ç†è®ºã€‚说起æ¥å®¹æ˜“åšèµ·æ¥éš¾ï¼šå½“时我使用的简/cut易网络完全ä¸é€‚åˆæ‹¿æ¥ä¸ºè¿™ä¸ªä»ªå¼ä¾›åº”魔力，ä¸ä»…挤压熔岩需è¦çš„压力巨大（需è¦20000LPå¯åŠ¨ä»ªå¼ï¼‰ï¼ŒæŠ½å–熔岩的开支也ä¸å°ï¼ˆæ¯äº§ç”Ÿä¸€æ ¼ç†”岩需è¦500LP）。\n\t我摇摇晃晃地走出了é“匠们的基地，脸上带ç€ä¸€ä¸æ¬£æ…°ã€‚那些储ç½é‡Œçš„熔岩足够é“匠们用到他们找到新的岩浆æ¥æºäº†ã€‚当然，我也没忘记带走我的仪å¼çŸ³ã€‚\n\t---------------\n\t/cut在没有外力影å“下，这个仪å¼ä¼šä¸æ–­å°è¯•åœ¨ä¸»ä»ªå¼çŸ³ä¸Šæ–¹ç”Ÿæˆä¸€æ ¼ç†”岩，并消耗500LP。一般情况下，熔岩生æˆçš„范围å¯ä»¥æ‰©å±•åˆ°ä»ªå¼æœ¬èº«ä¸‰æ ¼å¼€å¤–。\n\t在原生æ„å¿—çš„å½±å“下，LP消耗和大气中æ„志的浓度æˆå比，åŒæ—¶ä¼šä¸æ–­æ¶ˆè€—æ„志，æ„志的消耗速度与节约的LPæ•°é‡æˆæ­£æ¯”。使用原生æ„志还å¯ä»¥è®©ä»ªå¼è‡ªåŠ¨å°†ç†”岩放置进å„å¼æ¶²ä½“容器中，速度大抵ä¿æŒä¸å˜ã€‚\n\t/cutè…蚀æ„志会å转ç«ç„°å…疫的效果。æ¢è¨€ä¹‹ï¼Œé‚£äº›å¹³æ—¶å¯¹ç«ç„°å…疫的生物，在这个仪å¼çš„å½±å“下会失去ç«ç„°å…疫的属性；而那些无法抵抗ç«ç„°çš„生物则会对ç«ç„°å…疫。\n\tå¤ä»‡æ„志会令此仪å¼é‡Šæ”¾å‡ºä¸€ç§æŒ¥å‘性气体，这ç§æ°”体会影å“任何ä¸æ˜¯çŽ©å®¶çš„生物。在这ç§æ°”体的作用范围内的生物都会获得“缓燃引线â€çš„效果。当这个效果的倒计时归零时，这个生物会爆炸，强行将生物赶回空气当中。\n\t/cutç ´åæ„å¿—å¯ä»¥å¼ºåŒ–这个仪å¼çš„å„ç§å±žæ€§ã€‚大气中这ç§æ„å¿—çš„å«é‡è¶Šå¤šï¼Œä»ªå¼èƒ½æ”¾ç½®çš„岩浆æºæ•°é‡ä¹Ÿå°±è¶Šå¤šã€‚更喜人的是这个仪å¼å¹¶ä¸ä¼šæ¶ˆè€—ç ´åæ„志。然而，当大气中的æ„å¿—æ•°é‡ä¸‹é™ï¼Œè€Œä¸”仪å¼çš„最大范围å°äºŽä½ è®¾å®šçš„范围时，仪å¼å°±ä¼šåœæ­¢å·¥ä½œï¼Œå¿…须进行手动修å¤ã€‚\n\t最åŽï¼Œåšæ¯…æ„志会令仪å¼èŒƒå›´å†…的玩家获得ç«ç„°æŠ—性，时效和空气中æ„志的浓度æˆæ­£æ¯”。å¦å¤–有一点è¦æ³¨æ„，è…蚀æ„/cutå¿—çš„å转效果会抵消掉åšæ¯…æ„志所带æ¥çš„ç«ç„°æŠ—性。 -guide.bloodmagic.entry.ritual.greenGrove.info=上星期我开始为æ比略讲授跨领域的魔法。除了血之魔法外，我的æ¯ä¸ªå­¦å¾’都学过一些其它形å¼çš„魔法。其实，学什么魔法都没有关系，åªè¦å®ƒä¸æµªè´¹èµ„æºå°±å¥½â€”—我曾ç»ä½¿ç”¨è¿‡æ¥è‡ªé¥è¿œçš„东方的Ars部è½çš„魔法，但是因为Etherium之æºå‡ ä¹Žè¢«æ¦¨å¹²äº†ï¼Œæ‰€ä»¥è¿™ä¸ªè®¡åˆ’也就夭折了。\n\tæ比略决定学习神秘学，一门利用世界本身的魔法æ¥åˆ›é€ å±žäºŽè‡ªå·±çš„魔法的魔法。它/cut正好和血之魔法相抗衡——åŽè€…使用的是生命本身具有的魔法。为了解释清楚，我决定用作物生长为例å­ï¼Œå±•ç¤ºä¸¤é—¨é­”法之间的差别。\n\t“在神秘学中，魔法师会使用以Herbaæºè´¨ç‚¼æˆçš„生长催化剂，â€æˆ‘一边这样说ç€ï¼Œä¸€è¾¹æŒ‡ç€æ•™å®¤å¢™ä¸ŠæŒ‚ç€çš„一幅æºè´¨åˆæˆå›¾ï¼›è¯šç„¶è¿™èŠ‚课其实åªæœ‰æ比略一个学生，但人总还是需è¦ç‚¹ä¹è¶£çš„，“一å°è‚¡çµæ°”å’Œæºè´¨æ··åˆåœ¨ä¸€èµ·å¯ä»¥åˆºæ¿€æ¤ç‰©çš„/cutå…‰åˆä½œç”¨ï¼Œä»Žè€Œä»¤æ¤ç‰©å¸æ”¶æ›´å¤šçš„光能，以此加速其生长。然而，这需è¦ä¿è¯ä½œç‰©ç”Ÿé•¿åœ¨è‚¥æ²ƒçš„土地上，å¦åˆ™ä½œç‰©æœ€ç»ˆåªèƒ½æž¯èŽæ­»äº¡ã€‚“\n\t然åŽæˆ‘找æ¥äº†åœŸä»ªå¼çŸ³å’Œæ°´ä»ªå¼çŸ³å„å››å—，摆出一个圆形，并在圆心处放置主仪å¼çŸ³ã€‚“血魔法与之正好相å，â€æˆ‘一边说ç€ï¼Œä¸€è¾¹æ¿€æ´»äº†ä¸»ä»ªå¼çŸ³ï¼Œå¹¶åœ¨ä¸Šé¢ç›–上了一层泥土。“你å¯ä»¥ç”¨ä½ è‡ªå·±çš„生命力，或者别的动物的生命力，æ¥åŠ é€Ÿä½œ/cut物的生长，从而节约一般肥料的使用。本质上æ¥è®²ï¼Œè¿™ä¸ªä»ªå¼ä¼šä¸æ–­ç»™äºˆæ¤ç‰©å…»åˆ†ï¼Œä»Žè€Œä½¿å…¶å…»åˆ†ä¿æŒåœ¨ä¸€ä¸ªè¾ƒé«˜æ°´å¹³ã€‚â€\n\t我å‘土中撒了几粒ç§å­ï¼Œå°å¿ƒç¿¼ç¿¼åœ°ç”¨åœŸç›–好，然åŽä»Žè´´èº«æ³•è¢ä¸­æŽå‡ºä¸€ä¸ªæ°´ç“¶ï¼Œæ‹”开瓶塞然åŽå°†æ°´æ´’在了泥土上。“这个过程ä¸éœ€è¦é˜³å…‰ï¼Œå› ä¸ºå®ƒç”¨åˆ°äº†å¦ä¸€ç§å½¢å¼çš„能é‡ã€‚尽管如此，阳光还是很有用的——毕竟作物一开始ä¸æ˜¯è¿™æ ·ç”Ÿ/cut长的嘛ï¼â€\n\t在我解释的时候，有几点绿色的东西就已ç»å†’出了土堆。æ¯æœ‰ä¸€ç‰‡æ–°å¶é•¿å‡ºï¼Œæˆ‘都会感å—到一ä¸åŽ‹åŠ›ï¼Œè™½ç„¶ä¸å¤§ï¼Œä½†ä¼šä¸æ–­ç§¯ç´¯ã€‚下课åŽï¼Œæˆ‘开始清ç†å®žéªŒç”¨çš„土堆，然åŽå†³å®šåŽ»æ‘å­é‡Œèµ°ä¸€åœˆï¼šæˆ‘现在有几斗å°éº¦è¦å–。\n\t---------------\n\t绿丛仪å¼ï¼Œæ­£å¦‚å…¶å，以血法师之血为养料，加速仪å¼é™„近之æ¤ç‰©ï¼Œè¯¸å¦‚å°éº¦ã€èƒ¡èåœä¹‹ç±»ï¼Œ/cut的生长。默认，仪å¼åªåœ¨3x3范围内寻找åˆé€‚的目标，æ¯ç§’大概åªæœ‰30%%的概率æˆåŠŸå‚¬ç”Ÿã€‚用仪å¼è°ƒæ•´é’³è°ƒæ•´åŽå¯å¯»æ‰¾5x5范围内的至多81棵作物。\n\tå¦å¤–，æ¶é­”æ„志对这个仪å¼ä¹Ÿæœ‰æ•ˆæžœã€‚原生æ„志会加快其工作速度，效果å–决于浓度，但æ¯æ¬¡å‚¬ç”Ÿä¼šå¤šæ¶ˆè€—0.05点æ„志。\n\t若辅以å¤ä»‡æ„志，仪å¼ä¾æ—§ä¼šåœ¨æ¯æ¬¡å‚¬ç”Ÿæ—¶å¤šæ¶ˆè€—0.05点æ„志，但会增加催生æˆåŠŸçš„概率。/cut之å‰æ到默认概率是30%%，但若是你有100点å¤ä»‡æ„志，这个概率会上å‡è‡³80%%。\n\tç ´åæ„å¿—å¯ä»¥æ高仪å¼çš„工作范围，这æ„味ç€ä½ çš„一个仪å¼å¯ä»¥è¦†ç›–到更多的作物上。而且这个仪å¼ä¸ä¼šæ¶ˆè€—ç ´åæ„å¿—ï¼ç„¶è€Œï¼Œè‹¥æ˜¯æ„志的浓度下é™ï¼Œè€Œä½ è®¾å®šçš„范围比仪å¼æœ€å¤§çš„工作范围还大，那仪å¼å°±ä¼šåœæ­¢å·¥ä½œï¼Œéœ€è¦æ‰‹åŠ¨ä¿®å¤ã€‚\n\t/cutåšæ¯…æ„志会让仪å¼åœ¨å‚¬ç†Ÿä½œç‰©çš„åŒæ—¶ä¿è¯è€•åœ°å·²ç»è¿‡ç¿»æ•´ä¸”ä¿æŒæ¹¿æ¶¦ã€‚å¦å¤–，若是仪å¼çš„工作范围内有掉在地上的ç§å­ï¼Œåšæ¯…æ„志会让仪å¼è‡ªåŠ¨ç”¨é‚£äº›ç§å­æ¥è¡¥ç§ã€‚自然地，这个效果会消耗æ„志，但消耗速度是固定的。\n\tè…蚀æ„志的效果则完全å转了这个仪å¼çš„工作原ç†â€”—æ¤ç‰©ä¼šåœ¨è¿™ç§æ„å¿—çš„å½±å“下转而去主动å¸è¡€ï¼Œå°±åƒæ°´è›­é‚£æ ·ã€‚具体æ¥è¯´ï¼šæ¯ä¸€åˆ»ï¼Œè‹¥æ¤ç‰©é™„/cut近若有怪物，那么æ¤ç‰©å’Œæ€ªç‰©éƒ½ä¼šå—到伤害，且两者伤害æˆæ­£æ¯”。事实上直接用怪物当作æ¤ç‰©çš„养料是有效的ï¼å¦å¤–，æ¯ä¸ªæ€ªç‰©ä¸Šæ¯æœ‰10秒中的负é¢æ•ˆæžœï¼Œå°±ä¼šæ¶ˆè€—0.2点è…蚀æ„志。 -guide.bloodmagic.entry.ritual.magnetism.info=ç£åŠ›ä»ªå¼å¯è°“是采石场必备。这个仪å¼ä¼šåˆ¶é€ å‡ºä¸€æ—‹è½¬çš„ç£åœºï¼Œå°†æ·±åŸ‹åœ°ä¸‹çš„丰富矿è—å¸åˆ°åœ°é¢ä¸Šã€‚这个仪å¼å¹¶ä¸ä¼šå¸èµ°çŸ³å¤´ï¼Œæ‰€ä»¥åœ°é¢ä¸Šä¹Ÿä¸ä¼šå› æ­¤å‡ºçŽ°å¤§æ´žï¼Œå‰æ是地下并éžå…¨æ˜¯çŸ¿çŸ³ã€‚这个仪å¼æ¯2秒就会试ç€å¸ä¸€ä¸ªçŸ¿çŸ³ï¼Œæ¯æˆåŠŸå¸å–一个矿石便消耗50LP。\n\t/cut默认，这个仪å¼çš„工作范围是以主仪å¼çŸ³ä¸ºä¸­å¿ƒçš„7x7正方形区域（å³åŠå¾„为3）。目å‰ï¼Œæ„志还ä¸èƒ½å½±å“这个仪å¼çš„工作，所以你åªèƒ½é€šè¿‡åœ¨ä¸»ä»ªå¼çŸ³æ­£ä¸‹æ–¹æ”¾ç½®æŸç§ä»·å€¼é«˜æ˜‚çš„æ–¹å—æ¥æ高其工作范围。一个é“å—å¯ä»¥è®©åŠå¾„增加到7。金å—则是增加到15。钻石效果最好，å¯ä»¥å°†å…¶å·¥ä½œèŒƒå›´æ‹“展为63x63，届时你åªéœ€è¦çœ‹ç€ä»ªå¼æ…¢æ‚ æ‚ åœ°æŠŠçŸ¿çŸ³å¸åˆ°ä¸»ä»ªå¼çŸ³ä¸Šæ–¹3x3的空间里就好了。 -guide.bloodmagic.entry.ritual.crusher.info=挖掘仪å¼çš„è¿è¡Œå分简å•ï¼šåªéœ€è¦å°†ç®±å­ä¹‹ç±»çš„东西放在主仪å¼çŸ³æ­£ä¸Šæ–¹ï¼Œå®ƒå°±å¯ä»¥æ¶ˆè€—LP并ä¸æ–­æŒ–掘主仪å¼çŸ³æ­£ä¸‹æ–¹3x3x3范围内的方å—了。仪å¼æ¯2秒会å°è¯•æŒ–掘，如果æˆåŠŸï¼Œä¼šæ¶ˆè€—7LP。挖下æ¥çš„æ–¹å—会放进与仪å¼é“¾æŽ¥çš„容器中，如果容器已满，就会掉在那个容器的上é¢ã€‚\n\t若以原生æ„志驱动仪å¼ï¼Œä»ªå¼å°†ä¼šå·¥ä½œå¾—更快，但æ¯æ¬¡æˆåŠŸæŒ–掘时都会多消耗0.05点原生æ„志。\n\t/cutç ´åæ„志会令仪å¼åœ¨æŒ–掘方å—时拥有时è¿çš„效果。目å‰æ¥çœ‹ï¼Œä¸è®ºæ供多少æ„志，时è¿çš„等级永远是三，并且æ¯æ¬¡æˆåŠŸæŒ–掘都会多消耗0.2点此ç§æ„志。\n\tåšæ¯…æ„志会令仪å¼åœ¨æŒ–掘方å—时拥有精准采集的效果。æ¯æ¬¡æˆåŠŸæŒ–掘都会多消耗0.2点此ç§æ„志。\n\tè…蚀æ„志会令仪å¼åœ¨æŒ–掘方å—æ—¶ç»è¿‡æŸç§æ¶²ä½“的浸洗。/cutè¿™ç§æ¶²ä½“带有粉碎的效果，æ¢è¨€ä¹‹â€”—此时你挖掘的é“矿时会å˜æˆä¸¤å †é“砂。目å‰è¿™ç§æ¶²ä½“å¯ä»¥æ˜¯åŸºç¡€åˆ‡å‰Šæ²¹æˆ–爆炸ç«è¯ã€‚æ ¹æ®æ‰€æœ‰æ¶²ä½“çš„ä¸åŒï¼Œä»ªå¼æ¶ˆè€—çš„æ„å¿—æ•°é‡ä¹Ÿä¸åŒã€‚这个效果会覆盖精准采集的效果。\n\t/cutå¤ä»‡æ„志的效果和压挤å°è®°å·®ä¸å¤šï¼Œå³ä¼šåŽ‹ç¼©æŒ–下æ¥çš„东西。举例：箱å­é‡ŒçŽ°åœ¨æœ‰65红石，一次挖掘åŽä¼šå°†å…¶ä¸­9个红石压缩为一红石å—，留下56红/cut石。仅当压缩æˆåŠŸæ—¶ä»ªå¼æ‰ä¼šæ¶ˆè€—0.2点å¤ä»‡æ„志。 -guide.bloodmagic.entry.ritual.highJump.info=这个仪å¼ä¼šç”¨å¼ºå¤§çš„æ°”æµå°†èµ°åœ¨ä¸Šé¢çš„人é€ä¸Šå¤©ã€‚å¦å¤–，这个仪å¼è¿˜ä¼šä»¤æ‘”下æ¥çš„人å…å—掉è½ä¼¤å®³ã€‚潜行å³å¯è§„é¿ä»ªå¼çš„效果。\n\tæ¯æ¬¡æˆåŠŸäº§ç”Ÿæ°”æµæ—¶ï¼Œä»ªå¼éƒ½ä¼šä»¥5LP/tick的速度消耗LP；若没能产生气æµï¼Œåˆ™ä¸ä¼šæ¶ˆè€—LP。 -guide.bloodmagic.entry.ritual.speed.info=仪å¼å¦‚å…¶å，速移仪å¼å¯ç”¨æ¥åŠ é€Ÿç§»åŠ¨ã€‚仪å¼æœ¬èº«å¯ä»¥æŒ‡å‘ä»»æ„æ–¹å‘，而在仪å¼çš„生效范围内的实体都会æœä»ªå¼æ‰€æŒ‡çš„æ–¹å‘加速。仪å¼çš„指å‘由那å—薄暮仪å¼çŸ³çš„ä½ç½®ç¡®å®šã€‚默认，工作范围是åŠå¾„二格è§æ–¹ï¼Œä½†å¯ä»¥ç”¨ä»ªå¼è°ƒæ•´é’³è°ƒæ•´ã€‚水平方å‘上的速度加æˆæ˜¯3æ–¹å—/tick，垂直方å‘上则是1.2æ–¹å—/tick。\n\t以原生æ„志驱动的速移仪å¼ä¼šä½¿ç”Ÿç‰©èŽ·å¾—更快的速度。/cut当周围充满原生æ„志（å³100点）时，速度会翻一番。æ¯æ¬¡åŠ æˆéƒ½ä¼šæ¶ˆè€—0.1点æ„志。\n\tå¤ä»‡æ„志将会迫使仪å¼å¯¹æˆå¹´åŠ¨ç‰©æ— æ•ˆï¼Œè€Œç ´åæ„志会迫使仪å¼å¯¹å¹¼å¹´åŠ¨ç‰©æ— æ•ˆã€‚å¤ä»‡å’Œç ´åæ„志都会令仪å¼å¯¹çŽ©å®¶æ— æ•ˆã€‚è‹¥åŒæ—¶ä½¿ç”¨è¿™ä¸¤ç§æ„志，则仪å¼åªä¼šå¯¹çŽ©å®¶æœ‰æ•ˆã€‚这些特性对于动物农场，甚至是过滤å°åƒµå°¸éƒ½æ˜¯å分有用的。仪å¼åªæœ‰åœ¨æˆåŠŸåŠ é€Ÿæ—¶æ¶ˆè€—0.05点æ„志。æ¢è¨€ä¹‹ï¼Œ/cut对于幼年动物æ¥è¯´ï¼Œä»ªå¼ä¸ä¼šæ¶ˆè€—ç ´åæ„志，也ä¸ä¼šæ¶ˆè€—LP——因为这时的仪å¼ä¸ä¼šå¯¹å¹¼å¹´åŠ¨ç‰©æœ‰æ•ˆã€‚ -guide.bloodmagic.entry.ritual.wellOfSuffering.info=对于那些ä¸æƒ³ç”¨è‡ªå·±çš„è¡€æ¥è¡¥å……LP供应的血法师，苦难之井便是他们的选择：这个仪å¼ä¼šå°†æ–¹åœ†å格范围内的éžçŽ©å®¶å®žä½“的生命èšé›†åˆ°è¡€ä¹‹ç¥­å›é‡Œã€‚苦难之井åªä¼šåœ¨ä¸Šä¸‹åæ ¼ã€æ°´å¹³æ–¹å‘上方圆五格的范围内寻找血之祭å›ã€‚如果找ä¸å¥—祭å›ï¼Œä»ªå¼ä¸ä¼šå·¥ä½œã€‚仪å¼æ¯æ¶ˆè€—1LP便å¯ä»Žæ€ªç‰©ä¸ŠæŠ½å‡º25LP；若是针对éžæ•Œå¯¹çš„生物，则å¯æŠ½å‡º100LP；具体数é‡ä¼šå—到献祭符文的增幅的影å“。 -guide.bloodmagic.entry.ritual.featheredKnife.info=羽刀仪å¼åƒæ˜¯ä¸€æŠŠç›´æ’使用者身上的刀，抽å–其血液，并为附近的血之祭å›è¡¥å……能é‡ã€‚一般，羽刀仪å¼é¦–先会在以主仪å¼çŸ³ä¸ºä¸­å¿ƒçš„11x11x21的范围内寻找一座祭å›â€”—若找ä¸åˆ°ç¥­å›ï¼Œä»ªå¼ä¸ä¼šå·¥ä½œï¼›æ‰¾åˆ°ç¥­å›åŽä»ªå¼ä¼šè®°ä¸‹è¿™ä¸ªç¥­å›çš„ä½ç½®ã€‚当有玩家进入仪å¼çš„范围（默认为31x31x41）åŽï¼Œä»ªå¼ä¼šæ¯ç§’对玩家造æˆä¸€ç‚¹ä¼¤å®³ï¼Œå¹¶å°†å…¶è½¬åŒ–为LPé€å…¥ç¥­å›ä¸­ã€‚这个过程会å—到血之符文的影å“。伤害玩家的速度å¯/cut以调整。ä¸è¦æ‹…心，这个仪å¼ä¹Ÿæœ‰å®‰å…¨ä¿æŠ¤æœºåˆ¶ï¼šå®ƒä¸ä¼šæ”»å‡»é‚£äº›åªå‰©ä¸‹ç™¾åˆ†ä¹‹ä¸‰åä¸åˆ°çš„生命值的玩家。\n\t有数ç§æ¶é­”æ„å¿—å¯ä»¥å½±å“这个仪å¼çš„工作。比如，原生æ„志——它å¯ä»¥æ高仪å¼çš„工作速度，准确地说是一秒攻击玩家两次。但æ¯æ¬¡æ”»å‡»æ—¶ä¼šå¤šæ¶ˆè€—0.05点原生æ„志。\n\t若周围的çµåŸŸä¸­æœ‰è‡³å°‘å点åšæ¯…æ„志，仪å¼ä¼šå°†å®‰å…¨é˜ˆå€¼/cut从百分之三åæ高到百分之七å。这层ä¿æŠ¤ä¸ä¼šå¤šæ¶ˆè€—æ„志。\n\t若周围的çµåŸŸä¸­æœ‰è‡³å°‘å点å¤ä»‡æ„志，仪å¼ä¼šé€æ­¥é™ä½Žå®‰å…¨é˜ˆå€¼è‡³ç™¾åˆ†ä¹‹å。若åŒæ—¶æœ‰è‡³å°‘å点åšæ¯…æ„志，那么åŽè€…的百分之七å的阈值将åªå¯¹ä»ªå¼çš„主人有效果。和åšæ¯…æ„志一样，这个效果ä¸ä¼šå¤šæ¶ˆè€—æ„志。\n\t/cut若仪å¼é™„è¿‘çš„çµåŸŸä¸­æœ‰ç ´åæ„志，这个仪å¼çš„生命值转LP的效率会有所æ高。转化率的增幅与破åæ„å¿—çš„å«é‡æˆæ­£æ¯”，最高为五分之一，对应100点破åæ„志。这个效果å¯ä»¥ä¸Žç¬¦æ–‡ã€æŸçµæŠ¤ç”²å‡çº§å’Œç†é¦™å åŠ ã€‚æ¯è½¬åŒ–一点HP，会多消耗0.05点破åæ„志。\n\t说到ç†é¦™â€”—è…蚀æ„志会令ç†é¦™çš„效果与此仪å¼å åŠ ã€‚若你身上没有“魂飞魄散â€æ•ˆæžœï¼Œå¹¶ä¸”你正好处在ç†é¦™çš„效果/cut范围内，你的生命值会被直接扣至安全阈值，并将转化出的LP一次性注入祭å›ä¸­ï¼Œå¹¶ç»™äºˆä½ é­‚飞魄散的效果。此效果å¯ä¸Žç ´åæ„å¿—å åŠ ã€‚ -guide.bloodmagic.entry.ritual.regen.info=虽然ä»æœ‰äº‰è®®ï¼Œä½†è¿™é‡ç”Ÿä»ªå¼å¯¹äºŽé‚£äº›æƒ³ç”¨è‡ªå·±çš„è¡€æ¥é©±åŠ¨é­”法的血法师们æ¥è¯´ï¼Œä»ç„¶æ˜¯ä¸€ä¸ªä¸é”™çš„选择，因为它会利用血法师的魔法在仪å¼èŒƒå›´å†…产生治疗光环的效果，藉由此治愈仪å¼èŒƒå›´å†…的生物，包括血法师他们自己。仪å¼æ¯2.5秒会给15格范围内的生物附加生命回å¤I的效果；对于玩家æ¥è¯´å®ƒä¼šæ¶ˆè€—100LP，对于其它生物æ¥è¯´æ˜¯10LP。\n\t/cutè…蚀æ„志会给仪å¼å†åŠ ä¸Šä¸€ä¸ªâ€œå¸è¡€é¬¼èŒƒå›´â€ã€‚此时，仪å¼ä¼šå¯¹æ‰€æœ‰éžçŽ©å®¶ç”Ÿç‰©éšæœºé€ æˆä¼¤å®³ï¼Œå¹¶è—‰ç”±æ­¤æ²»ç–—玩家。æ¯ä¸€ä¸ªå·¥ä½œçš„tick中它都会消耗0.04点è…蚀æ„志并将1点生命值转移到玩家身上。 -guide.bloodmagic.entry.ritual.harvest.info=这个仪å¼å¯ä»¥æ”¶èŽ·é»˜è®¤ä»¥ä»ªå¼çŸ³ä¸Šæ–¹9x9x5范围内的所有作物，并将收获到的ç§å­è¡¥ç§å›žåŽ»ã€‚所有收获到的物å“都会掉è½åœ¨åŽŸåœ°ã€‚仪å¼å·¥ä½œé¢‘率为5tickå°è¯•ä¸€æ¬¡ï¼Œæ¯æ¬¡æˆåŠŸæ”¶èŽ·éƒ½ä¼šæ¶ˆè€—20LP。\n\tå¯ä»¥æ”¶èŽ·çš„作物包括但ä¸é™äºŽï¼šå—ç“œã€å°éº¦ã€èƒ¡èåœã€åœŸè±†ã€åœ°ç‹±ç–£ã€ä»™äººæŽŒã€ç”˜è”—等。时刻记ä½ï¼Œè¿™ä¸ªä»ªå¼å¹¶ä¸ä¼šå¯¹å®ƒæ­£åœ¨æ”¶å‰²çš„作物作任何å‡è®¾â€”—åªè¦å®ƒè¢«è®¤ä¸ºæ˜¯ä¸€/cutç§å¯ä»¥æ”¶å‰²çš„作物，这个仪å¼å°±å¯ä»¥æ”¶å‰²ã€‚（译注：更精确地说，是指有对应的HarvestHandler支æŒçš„作物。） -guide.bloodmagic.entry.ritual.interdiction.info=在传说中的å¤ä»£ç‚¼é‡‘术设备的基础上，我们研å‘出了这个仪å¼ï¼Œå¯å°†ä»»ä½•ä¸æ˜¯çŽ©å®¶çš„生物赶出仪å¼æ‰€è¦†ç›–的范围。默认，任何è·ç¦»æ­¤ä»ªå¼çš„主仪å¼çŸ³ä¸è¶…过两格的éžçŽ©å®¶ç”Ÿç‰©çš„移动速度都会被此仪å¼å¹²æ¶‰åˆ°ã€‚è¦æ³¨æ„的是，尽管仪å¼èŒƒå›´å†…的生物ä¸ä¼šè¢«æŽ‰è½ä¼¤å®³å½±å“，但一旦超出了仪å¼çš„覆盖范围，ä¿æŠ¤å°±ä¼šå¤±æ•ˆã€‚ -guide.bloodmagic.entry.ritual.containment.info=å’Œç¦æ­¢ä»ªå¼æ­£å¥½ç›¸å，牵制仪å¼ä¼šè¯•å›¾å°†æ‰€æœ‰ç”Ÿç‰©å…¨éƒ¨æ‹‰è¿›ä»ªå¼ä¸Šæ–¹çš„范围中，并困ä½å®ƒä»¬ï¼Œä½¿å…¶æ— æ³•ç§»åŠ¨ã€‚默认范围是水平方å‘上3æ ¼è§æ–¹ï¼Œä»Žæœ€ä½Žçš„仪å¼çŸ³åˆ°æœ€é«˜çš„仪å¼çŸ³ä¸ºæ­¢ã€‚这个范围å¯ä»¥è°ƒæ•´ã€‚\n\t/cut默认，仪å¼çš„消耗是æ¯ä¸ªç”Ÿç‰©æ¯tick1LP。没有在拉生物时ä¸ä¼šæ¶ˆè€—LP。 -guide.bloodmagic.entry.ritual.suppression.info=抑液仪å¼ä¼šåŽ‹åˆ¶å…¶å½±å“范围内的所有液体——æ¢è¨€ä¹‹ï¼Œå°†èŒƒå›´å†…的液体全替æ¢ä¸ºç©ºæ°”。它的工作范围大约是åŠå¾„10格的上åŠçƒã€‚工作时，LP消耗速度为2LP/tick。仪å¼åœæ­¢å·¥ä½œæ—¶ä¼šå°†æ‰€æœ‰è¢«æ›¿æ¢çš„液体全部放置回去。 -guide.bloodmagic.entry.ritual.expulsion.info=å‡å¦‚你在玩æœåŠ¡å™¨æ—¶ï¼Œä½ å‘现，出于ç§ç§ç†ç”±ï¼Œä½ éœ€è¦æ‹’ç»æŸäº›çŽ©å®¶çš„造访，然åŽä½ å‘现力场护盾和æ€äººä¸çœ¨çœ¼çš„巨型转å­æ ¹æœ¬ä¸èƒ½é˜»æŒ¡ä»–们。那么就是这个仪å¼å‡ºåœºçš„时刻了ï¼åœ¨ä¼ é€é­”法的帮助下这个仪å¼ä¼šå¤§å¤§ç¼“解你的问题ï¼\n\t若有玩家进入此仪å¼çš„范围内，并且这个玩家并ä¸æ˜¯ä»ªå¼çš„主人，那么这个玩家就会被éšæœºä¼ é€åˆ°åŠå¾„100格的范围中的æŸä¸ªåœ°æ–¹ã€‚当然这个仪/cutå¼è¿˜æœ‰ä¸€ç§ç±»ä¼¼ç™½åå•çš„功能：在主仪å¼çŸ³ä¸Šæ”¾ä¸€ä¸ªç®±å­ï¼Œç„¶åŽå°†é‚£äº›ä¸Žä¸æƒ³è¢«ä¼ é€çš„玩家绑定的物å“放进箱å­é‡Œï¼Œè¿™äº›çŽ©å®¶å°±ä¸ä¼šè¢«ä¼ é€èµ°äº†ã€‚\n\tæ¯ä¼ é€æˆåŠŸä¸€æ¬¡ä¼šæ¶ˆè€—2000LP。 -guide.bloodmagic.entry.ritual.zephyr.info=和风之唤——以一把å¤å‰‘çš„å字命å——å¯ä»¥è—‰ç”±é£Žçš„力é‡å°†é™„近的物å“å·èµ·æ¥å¹¶é€å…¥ä¸Žä¹‹é“¾æŽ¥çš„ç®±å­é‡Œï¼ˆé»˜è®¤ï¼Œåªéœ€è¦æŠŠç®±å­æ”¾åœ¨ä¸»ä»ªå¼çŸ³æ­£ä¸Šæ–¹å³å¯ï¼‰ã€‚这个过程大概一瞬间就å¯ä»¥å®Œæˆï¼Œæ‰€ä»¥ä½ ä¸ç”¨æ‹…心有什么奇怪的å¸åŠ›é—®é¢˜ï¼\n\t默认的工作范围是主仪å¼çŸ³æ–¹åœ†5格之内的方形。 -guide.bloodmagic.entry.ritual.laying.info=很多时候，自动化任务需è¦æŸç§è‡ªåŠ¨æ”¾ç½®æ–¹å—的手段。这个仪å¼ä¾¿å¯ä»¥ä»Žé™„è¿‘çš„ç®±å­ä¸­ï¼ˆé»˜è®¤ï¼Œæ˜¯ä¸»ä»ªå¼çŸ³æ­£ä¸Šæ–¹ï¼‰å–出方å—并放置在仪å¼çš„内部。具体æ¥è¯´ï¼Œæ˜¯æ”¾ç½®åœ¨è·ç¦»ä¸»ä»ªå¼çŸ³ä¸¤æ ¼è¿œçš„地方，且高度相åŒã€‚å分适åˆåœ¨å»ºé€ æ ‘场时用于自动ç§æ ‘苗。æ¯æ”¾ç½®ä¸€ä¸ªæ–¹å—消耗50LP。 -guide.bloodmagic.entry.ritual.timberman.info=ç§äº†ä¸€å †æ ‘？想必你需è¦è¿™ä¸ªä»ªå¼ã€‚ä¼æž—仪å¼ä¼šå°†ä»ªå¼æŒæœ‰è€…çš„LP用æ¥é©±ä½¿ä¸€ä¸ªæ— å½¢çš„å¹½çµï¼Œä»¥ç ä¼é™„近的树木，并将ç ä¸‹æ¥çš„木头放入附近的箱å­é‡Œã€‚默认，它的工作范围是主仪å¼çŸ³å¾€ä¸Š30格，æ¯ä¸ªæ°´å¹³æ–¹å‘上å„延伸10格形æˆçš„长方体。æ¯ç æŽ‰ä¸€å—木头需è¦æ¶ˆè€—10LP。 -guide.bloodmagic.entry.ritual.meteor.info=就目å‰æ¥è¯´ï¼Œè¿™ä¸ªä»ªå¼æ˜¯æ‰€æœ‰ä»ªå¼ä¸­æœ€å¼ºå¤§çš„仪å¼ä¹‹ä¸€ã€‚激活此仪å¼éœ€è¦æ¶ˆè€—一百万LP，并且还有一段冷å´æ—¶é—´ã€‚然而它的效果也å分强大——åªéœ€æä¾›åˆé€‚的祭å“，它就å¯ä»¥ä»Žå®‡å®™ä¸­å¬å”¤ä¸€é¢—陨石并直接砸å‘地é¢ã€‚诚然，这样一个大家伙会在地é¢ä¸Šé€ æˆå¤§çˆ†ç‚¸ï¼Œä½†å› ä¸ºå®ƒæ¥è‡ªå®‡å®™ä¸­ï¼Œæ‰€ä»¥å¯èƒ½ä¼šåŒ…å«å¤§é‡ç¨€æœ‰çŸ¿çŸ³ã€‚ \n\t/cutå¯ç”¨çš„祭å“包括é“å—ã€é‡‘å—和钻石。（事实上，å¯ç”¨çš„祭å“是å¯ä»¥è¢«æ•´åˆä½œè€…或用户控制的） -guide.bloodmagic.entry.ritual.downgrade.info=为了获得更强大的力é‡ï¼Œä½ æˆ–许需è¦çŒ®ç¥­æŸç§ä¸œè¥¿ä½œä¸ºäº¤æ¢ã€‚而这“沉é‡çµé­‚çš„å¿æ‚”â€çš„任务正是如此——将一些物å“献祭给一个虚无缥缈的实体，你便å¯ä»¥ä»¥æŸçµæŠ¤ç”²çš„属性下é™ä¸ºä»£ä»·ï¼Œæ¥æ¢å–更多的å‡çº§ç‚¹æ•°ã€‚仪å¼è½æˆåŽï¼Œä½ éœ€è¦åœ¨æœ€é«˜çš„空白仪å¼çŸ³æŒ‚一个é¢æœä¸»ä»ªå¼çŸ³çš„物å“展示框，然åŽåœ¨è–„暮仪å¼çŸ³ä¸Šæ”¾ä¸€ä¸ªèƒ½è£…东西的方å—（例如箱å­ï¼‰ã€‚è¦çŒ®ç¥­çš„物å“需è¦æ”¾å…¥é‚£ä¸ªè£…东西的地方，而核心物å“/cut应挂入物å“展示框内。仪å¼æ¿€æ´»åŽï¼Œä½ ä¾¿å¯ä»¥è¹²åœ¨ä¸»ä»ªå¼çŸ³ä¸Šå¹¶èŽ·å¾—é™çº§åŽçš„物å“。\n\t举例，对于淬ç«é™çº§æ¥è¯´ï¼Œæ ¸å¿ƒç‰©å“是个水瓶，需è¦çŒ®ç¥­çš„物å“是龙æ¯ã€‚\n\t所有å¯ç”¨çš„é™çº§éƒ½å¯ä»¥é€šè¿‡JEI查询到——查询主仪å¼çŸ³çš„用途å³å¯ã€‚å¦å¤–，对于一个特定的é™çº§æ¥è¯´ï¼Œæ ¸å¿ƒç‰©å“是一定的，所以你也å¯ä»¥é€‰æ‹©æŸ¥è¯¢æŸä¸ªç‰©å“æ¥å®šä½æŸä¸ªé™çº§æ‰€éœ€çš„祭å“。 -guide.bloodmagic.entry.ritual.crystalSplit.info=晶化æ¶é­”æ„志一旦形æˆï¼Œå°±ä¸èƒ½å†é‡æ–°åˆ†è§£æˆå…¶ä»–类型的æ„志——至少我之å‰æ˜¯è¿™ä¹ˆè®¤ä¸ºçš„。“结晶共鸣â€ä»ªå¼å¯ä»¥åˆ©ç”¨å››å…ƒç´ ä»ªå¼çŸ³ï¼Œä»ŽåŽŸç”Ÿæ¶é­”æ„志中分离出å„ç§å…¶ä»–类型的æ¶é­”æ„志。\n\t首先è¦åœ¨ä¸»ä»ªå¼çŸ³ä¸Šæ–¹ä¸¤æ ¼å¤„放置原生æ„志晶簇。你å¯ä»¥åœ¨ä¸»ä»ªå¼çŸ³ä¸Šæ”¾ä¸€åº§ç»“晶å›ï¼Œç»“晶å›ä¸Šæ”¾ç½®æ¶é­”晶簇，这样就å¯ä»¥äº†ã€‚然åŽï¼Œç¡®ä¿å››ç§å…ƒç´ çš„仪å¼çŸ³ä¸Šä¸èƒ½æœ‰æ–¹å—/cuté®æŒ¡ï¼Œç¡®è®¤å®ŒåŽå°±å¯ä»¥ç­‰å¾…结晶生长了。\n\t晶簇长出五瓣åŽï¼Œè¿™ä¸ªä»ªå¼å°±ä¼šå°†å››ç“£æ™¶ç°‡åˆ†ç¦»å‡ºåŽ»ï¼Œæ­¤æ—¶å››å…ƒç´ ä»ªå¼çŸ³ä¸Šä¼šé•¿å‡ºè…蚀ã€åšæ¯…ã€æ¶æ„和破åå››ç§ç±»åž‹çš„æ¶é­”晶簇å„一瓣。若中间的原生晶簇ä»èƒ½ç»§ç»­ç”Ÿé•¿ï¼Œä¸”周围的四ç§å…¶ä»–类型的晶簇ä»ç„¶ä¿æŒå®Œæ•´ï¼Œé‚£ä¹ˆè¿™ä¸ªè¿‡ç¨‹å°±ä¼šæŒç»­ä¸‹åŽ»ã€‚\n\t这个过程的工作原ç†å¾ˆç®€å•ï¼Œ/cut原生æ„志晶簇有五瓣或者更多瓣的时候，仪å¼ä¼šæ”¶å‰²å…¶ä¸­çš„四瓣，转化为更无形的存在。然åŽï¼Œæ–°äº§ç”Ÿçš„æ„志就会被推出原生æ¶é­”晶簇的范围，迫使类型相近的æ„å¿—èšé›†åœ¨ä¸€èµ·ã€‚ä¸åŒç±»åž‹çš„æ„志最终会在仪å¼çŸ³ä¸Šé›†ç»“，而仪å¼çŸ³æœ¬èº«ä¹Ÿæ˜¯å¯ä¾›æŸç§éžåŽŸç”Ÿæ„志生长的基础。 - -# Architect Entries -guide.bloodmagic.entry.architect.intro=å‰è¨€ -guide.bloodmagic.entry.architect.bloodaltar=è¡€ä¹‹ç¥­å› -guide.bloodmagic.entry.architect.ash=å¥¥æœ¯ç²‰ç° -guide.bloodmagic.entry.architect.divination=å åœå°è®° -guide.bloodmagic.entry.architect.soulnetwork=çµé­‚网络 -guide.bloodmagic.entry.architect.weakorb=虚弱气血å®ç  -guide.bloodmagic.entry.architect.incense=ç†é¦™ç¥­å› -guide.bloodmagic.entry.architect.bloodrune=祭å›å‡çº§ -guide.bloodmagic.entry.architect.inspectoris=指示之书 -guide.bloodmagic.entry.architect.runeSpeed=速度符文 -guide.bloodmagic.entry.architect.water=水之å°è®° -guide.bloodmagic.entry.architect.lava=熔岩å°è®° -guide.bloodmagic.entry.architect.lavaCrystal=熔岩水晶 -guide.bloodmagic.entry.architect.apprenticeorb=学徒气血å®ç  -guide.bloodmagic.entry.architect.dagger=牺牲匕首 -guide.bloodmagic.entry.architect.runeSacrifice=献祭符文 -guide.bloodmagic.entry.architect.runeSelfSacrifice=牺牲符文 -guide.bloodmagic.entry.architect.holding=集æŒå°è®° -guide.bloodmagic.entry.architect.air=风之å°è®° -guide.bloodmagic.entry.architect.void=虚空å°è®° -guide.bloodmagic.entry.architect.greenGrove=绿丛å°è®° -guide.bloodmagic.entry.architect.fastMiner=速掘å°è®° -guide.bloodmagic.entry.architect.seer=è§è§£å°è®° -guide.bloodmagic.entry.architect.magicianOrb=法师气血å®ç  -guide.bloodmagic.entry.architect.capacity=增容符文 -guide.bloodmagic.entry.architect.displacement=转ä½ç¬¦æ–‡ -guide.bloodmagic.entry.architect.affinity=元素å°è®° -guide.bloodmagic.entry.architect.lamp=血光å°è®° -guide.bloodmagic.entry.architect.magnetism=ç£å¼•å°è®° -guide.bloodmagic.entry.architect.peritia=ç»éªŒä¹‹ä¹¦ -guide.bloodmagic.entry.architect.livingArmour=æŸçµæŠ¤ç”² -guide.bloodmagic.entry.architect.upgradeTome=æŸçµæŠ¤ç”²å‡çº§ä¹‹ä¹¦ -guide.bloodmagic.entry.architect.teleposer=ä¼ é€å™¨ -guide.bloodmagic.entry.architect.boundBlade=æŸç¼šä¹‹å‰‘ -guide.bloodmagic.entry.architect.boundTool=æŸç¼šå·¥å…· -guide.bloodmagic.entry.architect.weakShard=虚弱气血碎片 -guide.bloodmagic.entry.architect.masterOrb=导师气血å®ç  -guide.bloodmagic.entry.architect.runeOrb=å®ç ç¬¦æ–‡ -guide.bloodmagic.entry.architect.suppression=抑液å°è®° -guide.bloodmagic.entry.architect.haste=急速å°è®° -guide.bloodmagic.entry.architect.severance=ç»å½±å°è®° -guide.bloodmagic.entry.architect.teleposition=ä¼ é€å°è®° -guide.bloodmagic.entry.architect.compression=压挤å°è®° -guide.bloodmagic.entry.architect.bridge=影桥å°è®° -guide.bloodmagic.entry.architect.mimic=æ‹Ÿæ€ -guide.bloodmagic.entry.architect.downgrade=æŸçµæŠ¤ç”²é™çº§ - -guide.bloodmagic.entry.architect.augmentedCapacity=超容符文 -guide.bloodmagic.entry.architect.charging=充能符文 -guide.bloodmagic.entry.architect.acceleration=促进符文 - -guide.bloodmagic.entry.architect.tier3=æµ·æ´‹ä¹‹ä¸‹çš„ä¸‰çº§ç¥­å› - -# Architect Entry Texts -guide.bloodmagic.entry.architect.intro.info=大家好，我å«æ比略。你或许已ç»å‘现这本书并ä¸å®Œæ•´äº†ï¼Œä½†å¾ˆä¸å¹¸ä½ æ˜¯å¯¹çš„。因为1.7.10->1.8.9->1.9.4åŠä»¥ä¸Šçš„更新，血魔法也å‘生了巨大的å˜åŒ–。因此，这本书ä¸å¾—ä¸é‡å†™ã€‚这本书的最终目标是一本研究笔记，或者说是一本真正的书，所以è·ç¦»è¿™æœ¬ä¹¦çœŸæ­£å®Œæˆè¿˜æœ‰ä¸€æ®µè·ç¦»ã€‚有鉴于此，我会定期填补这本书中的空白。当然了，一开始这本书里将全是读起æ¥å‘³åŒåš¼èœ¡çš„文字（嘛...肯定ä¸æ˜¯é‚£ç§å¼•äººå…¥èƒœçš„å­—/cut啦，好啦ä¸è¦åœ¨æ„细节），但这个情况会éšç€æ—¶é—´çš„推移而得到改善的，等待ç€ä½ çš„将会是一部血法师们的心路历程。\n\t但ä¸å¥½æ„æ€æˆ‘想我得赶紧é‡æ–°åˆ‡å…¥è§’色当中去了。*咳嗽声*\n\t我åæ比略，一å血法师，åŒæ—¶ä¹Ÿä»¥â€œç¼”造者â€çš„åå­—é—»å于世。这本书中包å«äº†æˆ‘对å为“çµé­‚网络â€çš„自然现象的研究，以åŠæˆ‘对血魔法师需/cutè¦é€‚应的一些设备的物ç†ç‰¹æ€§çš„æ述。从æ­å»ºå¼ºå¤§çš„血之祭å›çš„技艺，到为增强法力而进行的生命献祭的ç§ç§ç»†èŠ‚，å†åˆ°å„ç§æ‹¥æœ‰å¼ºå¤§åŠ›é‡çš„魔法符文和å°è®°ï¼Œæˆ‘ä¸æ–­åœ°å‘现新的魔法，ä¸æ–­åœ°æ€»ç»“并找到强化自己的全新方å¼ã€‚\n\tæ¥å§ï¼Œæ–°å…¥é—¨çš„魔法师们，全新的领域在等待ç€ä½ ï¼\n\t...啊马格斯说我有时候有点浮夸，但那åˆå¦‚何？ -guide.bloodmagic.entry.architect.bloodaltar.info.1=血之祭å›ä¾¿æ˜¯è¡€é­”法中最核心的设备之一。它有两个主è¦ç”¨é€”：åˆæˆæŸäº›ç‰©å“，或将生命æºè´¨è½¬ç§»åˆ°å®ç ä¸­åŽ»ã€‚然而这两个用途都需è¦æ¶ˆè€—祭å›ä¸­çš„生命æºè´¨ã€‚自然地，也有两ç§è¡¥å……生命æºè´¨çš„æ–¹å¼ï¼šä»¥çŽ©å®¶çš„è¡€æ供生命æºè´¨ï¼Œæˆ–以别的动物或怪物的血æ供生命æºè´¨ã€‚ -guide.bloodmagic.entry.architect.bloodaltar.info.2=你需è¦ä¸€æŠŠç‰ºç‰²åŒ•é¦–æ‰èƒ½å°†ä½ çš„血转化为生命æºè´¨å¹¶æ³¨å…¥ç¥­å›ä¸­ã€‚具体æ“作如下：首先，站在祭å›æ—；然åŽï¼Œä½¿ç”¨åŒ•é¦–伤害自己（å³å³å‡»ï¼‰ï¼Œä½ ä¼šæŸå¤±ä¸€é¢—心的生命值，祭å›ä¸­ä¼šå¤šå‡º 200 LP。LP 是生命æºè´¨çš„ å•ä½ï¼Œç§°ä¸ºç”Ÿå‘½ç‚¹æ•°ï¼ˆLife Point， 缩写 LP），用于刻画æŸç§ä»» 务需è¦æ¶ˆè€—的生命力——ä¸ï¼Œå’Œæ¸¸æˆçŽ‹ä¸ä¸€æ ·ã€‚默认，普通的血之祭å›å®¹é‡ä»…为一万。你还å¯ä»¥æŠŠç‰©å“放入祭å›ä¸­ï¼ˆå³å‡»å³å¯ï¼‰ï¼Œè‹¥å¦‚æ­¤åšï¼Œåˆé€‚çš„/cut物å“便会触å‘åˆæˆè¿›ç¨‹ã€‚\n\t祭å›åˆæˆä¸ä»…需è¦æ¶ˆè€— LP，还需è¦ä¸€å®šçš„层级。满足 这些æ¡ä»¶åŽï¼Œç¥­å›ä¾¿ä¼šå¼€å§‹è‡ªåŠ¨æŠ½å– LP 用于åˆæˆï¼Œå¹¶å¼€ 始散å‘红色粒å­æ•ˆæžœã€‚è‹¥åˆæˆè¿˜æœªå®Œæˆï¼Œä½†æ­¤æ—¶ LP 已被 抽干，红色的粒å­æ•ˆæžœä¼šè½¬ä¸ºç°è‰²ï¼Œåˆæˆè¿›åº¦ä¹Ÿä¼šå¼€å§‹å€’退，所以尽é‡é¿å…è¿™ç§æƒ…况的出现ï¼æœ€åŽè¿˜æœ‰ä¸€ç‚¹ï¼Œå¦‚果你放进祭å›é‡Œçš„东西是气血å®ç ï¼Œé‚£ä¹ˆå®ƒ 会散å‘紫色的粒å­æ•ˆæžœï¼Œè¡¨æ˜Žå®ƒåœ¨å‘æŸä¸ªå®ç ä¸­çŒè¾“ LP。\n\t事实上，祭å›ä¸­æœ‰ä¸‰ä¸ªå­˜å‚¨ LP 的容器：之å‰æ到的一万容积指的是其主容器；除此之外，祭å›è¿˜æœ‰è¾“入容器和输出容器å„一，容积å‡ä¸ºä¸»å®¹å™¨å®¹ç§¯çš„å分之一。默认，输入容器中的生命æºè´¨ä¼šä»¥æ¯ç§’ 20 LP 的速度转移至主容器中，而主容器中的生命æºè´¨ä¹Ÿä¼šä»¥åŒæ ·çš„速度转移到输出容器中。如此一æ¥ï¼Œè¾“入容器和输出/cut容器在祭å›ä¸­æ‰®æ¼”的便是缓冲区的角色——它们是用æ¥é™åˆ¶å°†ç”Ÿå‘½æºè´¨è¾“入祭å›ï¼Œå’Œä»Žç¥­å›ä¸­å°†ç”Ÿå‘½æºè´¨æŠ½å–出æ¥çš„速度的。 -guide.bloodmagic.entry.architect.ash.info=尽管奥术粉ç°å¹¶ä¸æ˜¯è¿™ä¸€å·çš„核心，但它确实贯穿了本å·æ到的很多é“å…·çš„åˆæˆä¹‹ä¸­ã€‚åˆæˆå¥¥æœ¯ç²‰ç°éœ€è¦ç”¨åˆ°ç‹±ç«ç†”炉和æ¶é­”æ„志，关于这些东西的细节å¯ä»¥å‚考《æ¶é­”之å­ã€‹å·ã€‚简å•æ¥è¯´ï¼Œå®ƒæ˜¯ä¸€ç§äºŒå…ƒåˆæˆå·¥å…·ï¼šä½ éœ€è¦ä¸€ç§å¯å……当催化剂的å应试剂，以åŠæŸç§ç‰©å“作为次è¦åˆæˆæ料。\n\t一份奥术粉ç°å¯ä½¿ç”¨äºŒå次。对ç€åœ°é¢æˆ–者墙å£ä½¿ç”¨ä¾¿/cutå¯ç”»å‡ºä¸€ä¸ªåœ†å½¢çš„法阵（如果是墙å£ï¼Œä½ åªèƒ½åœ¨ä¸€ä¸ªæ–¹å‘上看到法阵）。然åŽï¼Œå¯¹æ³•é˜µä¸­å¤®ä½¿ç”¨åˆé€‚的催化剂å³å¯æ”¹å˜å…¶å½¢çŠ¶ï¼Œå½“然也会消耗催化剂（å³ï¼Œå³å‡»ä½¿ç”¨ï¼‰ã€‚如果法阵没有å˜å½¢ï¼Œé‚£ä¹ˆä½ è‚¯å®šæœ‰ä»€ä¹ˆåœ°æ–¹æžé”™äº†ã€‚\n\t在观察到法阵å˜å½¢åŽï¼Œä½ ä¾¿å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé€‚的次è¦ç‰©å“会å¯åŠ¨æ³•é˜µï¼Œå±Šæ—¶ä½ ä¼šçœ‹åˆ°æ³•é˜µå¼€å§‹æ—‹è½¬ï¼Œå¹¶å¼€å§‹äº§ç”Ÿå„ç§å˜åŒ–，具体å˜åŒ–éšæ³•/cut阵ä¸åŒè€Œä¸åŒâ€”—但正确å¯åŠ¨çš„法阵最终都会产生一ç§æ–°çš„物å“。\n\t所有用到奥术粉ç°çš„åˆæˆâ€”—我一般管这å«ç‚¼é‡‘阵列——都å¯ä»¥åœ¨JEI中查询到。注æ„，左侧的物å“一定是催化剂，而å³ä¾§çš„物å“一定是一个次è¦ç‰©å“。 -guide.bloodmagic.entry.architect.divination.info=å åœå°è®°æ˜¯è¡€æ³•å¸ˆæœ€å¸¸ç”¨çš„工具之一，因为它能解决你很多麻烦，具体æ¥è¯´æ˜¯èƒ½ç»™ä½ ä¸€äº›å…³é”®æ•°æ®ã€‚它的åˆæˆä¹Ÿå¾ˆç®€å•ï¼šåªéœ€è¦åœ¨ç‚¼é‡‘阵列中以红石为催化剂，以石æ¿ä¸ºæ¬¡è¦ç‰©å“åˆæˆå³å¯ã€‚\n\t对血之祭å›ä½¿ç”¨æ­¤å°è®°ä¾¿å¯çœ‹åˆ°ç¥­å›ä¸»å®¹å™¨ä¸­çš„LPæ•°é‡ï¼Œä»¥åŠå®¹é‡ä¸Šé™ã€‚短时间内åå¤ä½¿ç”¨å¹¶ä¸ä¼šå¯¼è‡´åˆ·å±ï¼Œåªä¼šè¦†ç›–之å‰çš„æ示。\n\t/cut对ç€ç©ºæ°”使用此å°è®°çš„è¯ï¼Œåˆ™èƒ½çœ‹åˆ°ä½ çš„çµé­‚网络中的LPæ•°é‡ã€‚尽管这功能看上去很普通，但你以åŽå°±ä¼šå‘现，你一刻也ä¸æƒ³è®©è¿™çŽ©æ„离手。 -guide.bloodmagic.entry.architect.soulnetwork.info=çµé­‚网络（Soul Network，缩写 SN）是指玩家和å„ç§ç‰©å“以 åŠç»“构之间的çµé­‚上的链接。éšç€è¡€æ³•å¸ˆèƒ½åŠ›çš„æå‡ï¼Œçµé­‚网络的强度也会éšä¹‹æ高。就存在æ¥è¯´ï¼Œå®ƒä»¬æ˜¯çµé­‚织æˆçš„一张无形的网，但最强大的血魔法师们是å¯ä»¥çœ‹åˆ°å…¶ç‰©ç†çš„具现的。然而，时至今日，ä»æ— äººå¯è¾¾æ­¤åŒ–境...\n\t在游æˆä¸­ï¼Œç½‘络是直接与玩家绑定在一å—的。玩家所在的世界早已记录下了这一切——/cutè¿™æ„味ç€ï¼ŒçŽ©å®¶çš„ LP 并éžæ˜¯ 记录在æŸé¢—气血å®ç ä¸­ï¼Œè€Œæ˜¯è¢«ä¸–界记录ç€ï¼›æ¯ä¸ªçŽ©å®¶ä¹‹é—´çš„网络互相独立，互ä¸å½±å“。\n\t绑定的过程通常在第一次使用æŸä¸ªç‰©å“时就已ç»å®Œæˆäº†ã€‚就目å‰çš„科技æ¥è¯´ï¼Œä¸€æ—¦ç»‘定，å³ä¾¿æ˜¯ç‰©å“的主人也无法解除。需è¦æ¶ˆè€—LP的物å“会直接消耗其主人çµé­‚网络中的LP。但，如果主人的çµé­‚网络中没有足够的 LP，它会从 当å‰ä½¿ç”¨è€…，而ä¸æ˜¯å…¶ä¸»äººï¼Œçš„身上抽å–生命值以填补空缺。因此，在快没有LP的时候è¦å°å¿ƒâ€”—因为这通常会致人于死地。 -guide.bloodmagic.entry.architect.weakorb.info.1=没了魔法æ¥æºçš„魔法师和咸鱼有什么区别？气血å®ç ä¾¿æ˜¯è¿™æ ·ä¸€ä¸ªé­”法æºï¼šå®ƒå¯ä»¥å°†ç‰©ç†å½¢å¼çš„生命转化æˆLP并输入到其主人的çµé­‚网络中去。它本身并éžç”µæ± ï¼Œç›¸å它倒åƒæ˜¯ä¸€æ ¹å¯¼ç®¡ï¼Œå¯å°†ç”Ÿå‘½åŠ›è½¬åŒ–æˆè¡€é­”法师需è¦çš„魔法。 -guide.bloodmagic.entry.architect.weakorb.info.2=虚弱气血å®ç ä¾¿æ˜¯ä½ èƒ½åˆ¶ä½œçš„第一ç§å®ç â€”—åªéœ€å‘一粒钻石中çŒæ³¨ä¸¤åƒLP的生命力å³å¯å®Œæˆã€‚将已绑定的å®ç æ”¾å…¥ç¥­å›ï¼Œå®ƒå°±å¯ä»¥ä¸æ–­åœ°ä»Žç¥­å›ä¸­æŠ½å–LP，直接输入çµé­‚网络中。å¦å¤–，ä¸è®ºä»€ä¹ˆå®ç ï¼Œå…¶å®¹é‡ä¸Šé™éƒ½åªèƒ½é€šè¿‡ä¸€äº›é«˜çº§ç¬¦æ–‡æ¥æå‡ï¼›è¿™é‡Œæ³¨æ„一点，这个容é‡æå‡çš„效果åªæœ‰åœ¨å®ç åœ¨ç¥­å›ä¸Šæ—¶æ‰æœ‰æ•ˆã€‚对于虚弱气血å®ç ï¼Œæœ€é«˜åªèƒ½æå‡åˆ°äº”åƒã€‚\n\t/cut玩家还å¯ä»¥é€šè¿‡ç®€å•åœ°ä½¿ç”¨æ°”è¡€å®ç æ¥èŽ·å¾—LP——æ¯ä¸€æ¬¡ä½¿ç”¨éƒ½ä¼šå¯¹çŽ©å®¶é€ æˆä¸€é¢—心的伤害并æä¾›200LP。此法ä¸èƒ½ä»¤ç½‘络中的LPæ•°é‡çªç ´å®¹é‡ä¸Šé™ã€‚\n\t祭å›åªå¯èƒ½ä¸ºä¸Žè‡ªå·±çº§åˆ«ç›¸å½“，或者比自己级别低的气血å®ç æä¾›LP。举例，三级的å®ç åªå¯èƒ½åœ¨ä¸‰çº§æˆ–更高级的祭å›ä¸­èŽ·å¾—LP，一级的祭å›æ˜¯æ— æ³•èƒœä»»çš„。 -guide.bloodmagic.entry.architect.incense.info.1=血法师会ç»å¸¸å‘现，它们的LP产能时常跟ä¸ä¸Šæ¶ˆè€—。当然，有特殊的符文å¯ä»¥æ高自我献祭所产生的生命æºè´¨çš„æ•°é‡ï¼Œä½†è¿™ä¸ªè¿‡ç¨‹ä¾æ—§æ˜¯å¦‚此缓慢。åªæœ‰è¿™ä¸€æ¡è·¯å¯ä»¥èµ°äº†å—？\n\t下é¢ä»‹ç»ç†é¦™ç¥­å›ã€‚ç†é¦™ç¥­å›æœ¬èº«å¯ä»¥ä»¥è‡ªèº«ä¸ºä¸­å¿ƒï¼Œæ ‡è®°å‡ºä¸€ç‰‡é™è°§çš„土地，在这范围内，它å¯ä»¥å€ŸåŠ©ç¥­å›æœ¬èº«æ•£å‘出的余力æ¥å®‰æŠšæƒŠæ‰°åˆ°çš„çµé­‚。当然你ä¸æ˜¯å¾ˆæ¸…楚这/cutè‚¡ç†é¦™çš„æ°”æ¯ä»Žä½•è€Œæ¥ï¼Œä½†å¥½åƒåˆæ²¡ä»€ä¹ˆä¸å¯¹ï¼Ÿå…ˆä¸ç®¡äº†ã€‚\n\tç†é¦™ç¥­å›çš„作用就是如此：利用é™è°§çš„环境æ¥æå‡å•é¢—心所创造出的生命æºè´¨çš„æ•°é‡ã€‚在你è·ç¦»ç†é¦™ç¥­å›åªæœ‰çº¦èŽ«äº”格远的地方时，它会散å‘出ç«ç„°é¢—粒以è¯æ˜Žå…¶å·²ç»åˆ›é€ å‡ºé™è°§åŒºåŸŸã€‚在它的影å“范围下，你的牺牲匕首也会å‘生å˜åŒ–，以è¯æ˜Žç†é¦™å·²ç»å‘挥其效果。整个过程大约æŒç»­äº”秒钟，你å¯ä»¥é€šè¿‡è§‚察ç«ç„°/cutç²’å­çš„存在æ¥åˆ¤æ–­æ˜¯å¦ç»“æŸã€‚此时，使用牺牲匕首献祭自己将会一次性献祭你生命值上é™çš„百分之ä¹å，并将对应数é‡çš„LP输入血之祭å›ä¹‹ä¸­ã€‚LPæ•°é‡å’ŒçŒ®ç¥­çš„生命值ä¾æ—§æˆæ­£æ¯”，但此时它的转化率会根æ®é™„è¿‘çš„é™è°§å€¼è€Œæœ‰æ‰€ä¸Šå‡ï¼›é»˜è®¤ï¼Œå¢žå¹…是百分之二å。\n\tå¦å¤–，å åœå°è®°å¯ä»¥æ­ç¤ºé™„è¿‘çš„é™è°§å€¼ï¼Œä»¥åŠé™è°§æ‰€å¸¦æ¥çš„具体增幅水平。 -guide.bloodmagic.entry.architect.incense.info.2=自然，百分之二å的增幅已ç»å¤Ÿå¤šäº†ï¼Œä½†ç†é¦™ç¥­å›ä½œç”¨çš„范围还是å¯ä»¥ç»§ç»­æ‰©å±•çš„。你åªéœ€è¦åœ¨ç†é¦™ç¥­å›æŸä¸ªåŸºç¡€æ–¹å‘（å³ï¼Œæ­£ä¸œã€æ­£è¥¿ã€æ­£å—ã€æ­£åŒ—）两格远的地方排出一列三å—高度一样木质路é¢å³å¯å®šä¹‰ä¸€ä¸ªâ€œèŒƒå›´â€ã€‚在此“范围â€ä¸­çš„ä»»æ„æ–¹å—都有助于让这片区域更加é™è°§ã€‚木质路é¢è¿˜å¯ä»¥ç»§ç»­æ‰©å±•ï¼ŒæƒŸéœ€éµå®ˆä»¥ä¸‹è§„则：一，æ¯ä¸€åˆ—木质路é¢å¿…须水平，å³æž„æˆæ–°ä¸€åˆ—è·¯é¢çš„æ–¹å—必须高度相åŒï¼›äºŒï¼Œæ–°çš„è·¯é¢å¿…é¡»ä½äºŽä¸Šä¸€åˆ—è·¯é¢çš„上/cut下五格范围内。简å•æ¥è¯´ï¼Œé‡‘å­—å¡”ã€å€’金字塔等阶梯å¼ç»“构都是å¯ä»¥çš„。\n\t然而，这个范围并éžå¯ä»¥æ— èŠ‚制地扩张。木质路é¢åªèƒ½å åŠ ä¸‰åˆ—ï¼›ä¸è¿‡ä¸ç”¨æ‹…心，还有一ç§å¯ä»¥å åŠ äº”列的石质路é¢ï¼›ç”šè‡³è¿˜æœ‰å¯ä»¥å åŠ ä¹åˆ—的碎石路é¢å’Œé»‘曜石路é¢ã€‚自然地，你在å åŠ ä¸‰åˆ—木路é¢åŽå°±éœ€è¦ç”¨çŸ³å¤´çš„；然而你完全å¯ä»¥ä¸€å¼€å§‹å°±ç”¨çŸ³å¤´çš„，åªè¦ä½ ä¸æ˜¯åªç”¨æœ¨è·¯é¢å°±å¥½ã€‚\n\t/cut回到é™è°§ç¨‹åº¦çš„问题上æ¥ã€‚事实上åªæœ‰ä¸€éƒ¨åˆ†æ–¹å—å¯ä»¥è®©è¿™ç‰‡åŒºåŸŸæ›´åŠ é™è°§ï¼Œè€Œæ ¹æ®å®žéªŒï¼Œè¿™äº›æ–¹å—被分æˆäº†è‹¥å¹²ç§ã€‚举个例å­ï¼Œä½ åœ¨è¿™ç‰‡åŒºåŸŸä¸­ç§äº†åœŸè±†ï¼ŒåœŸè±†å±žäºŽâ€œä½œç‰©â€åˆ†ç±»ï¼Œç„¶åŽè¿™ç‰‡åŒºåŸŸä¾¿å¹³é™äº†ä¸€äº›ã€‚ä¸è®ºæ˜¯ä½ æŽ¥ç€ç§åœŸè±†ï¼Œæˆ–者你ç§èµ·äº†èƒ¡èåœï¼Œå®ƒä»¬çš„效果都会éšç€ä½ ç§çš„æ•°é‡çš„增多而é™ä½Žï¼Œç”šè‡³è¿˜ä¼šæŠµæ¶ˆä¸€å¼€å§‹çš„效果，因为它们都属于“作物â€ã€‚为了最好的效果，你需è¦å°½å¯èƒ½ä½¿ç”¨å¤šç§ä¸åŒç±»åž‹çš„æ–¹å—。/cut有助于平é™çš„æ–¹å—有这么几类：作物ã€åŽŸæœ¨ã€æ ‘å¶ã€ç†”岩ã€åœ°ç‹±å²©ã€è€•åœ°ã€æ°´ã€ç”Ÿå‘½æºè´¨ã€ä»¥åŠå…¶ä»–东西（原文如此）。 -guide.bloodmagic.entry.architect.bloodrune.info.1=éšç€ä½ é€æ¸æ·±å…¥è¡€é­”法，你会å‘现你那普普通通的血之祭å›å·²æ— æ³•æ»¡è¶³ä½ çš„需è¦äº†ã€‚但你还å¯ä»¥é€šè¿‡æ”¾ç½®ä¸€ç§å为气血符文的特殊方å—æ¥æå‡ç¥­å›çš„整体属性，进而解é”更多的åˆæˆã€‚\n\t将血之祭å›å‡åˆ°2级的方法很简å•ï¼šåœ¨ç¥­å›æœ¬èº«å¾€ä¸‹ä¸€å±‚放置八个一圈的气血符文。如果你实在æžä¸æ¸…楚具体的ä½ç½®ï¼ŒæŒ‡ç¤ºä¹‹ä¹¦å¯ä»¥å¸®åˆ°ä½ â€”—它å¯ä»¥ä»¥ä¸€ç§ç±»ä¼¼å…¨æ¯æŠ•å½±çš„/cutæ–¹å¼æŒ‡æ˜Žä½ éœ€è¦æ”¾ç½®æ°”血符文的ä½ç½®ã€‚\n\t尽管åªéœ€è¦ç©ºç™½æ°”血符文就å¯ä»¥å®Œæˆç¥­å›å‡çº§ï¼Œæˆ‘ä»ç„¶æŽ¨è你对使用带有特殊强化的气血符文。祭å›ä¸Šçš„æ¯ä¸€ä¸ªç¬¦æ–‡éƒ½å¯ä»¥è¢«æ¢ä½œç‰¹æ®Šçš„气血符文（唯一的例外是，二级祭å›å››ä¸ªè§’è½ä¸Šçš„特殊符文ä¸ä¼šæœ‰æ•ˆæžœâ€”—但在三级åŠä»¥ä¸Šçš„祭å›ï¼Œè¿™å››ä¸ªä½ç½®çš„特殊符文则å¯ä»¥ä½¿ç”¨ï¼‰ã€‚这些带有特殊强化的气血符文å¯ä»¥æ高/cut祭å›çš„åˆæˆé€Ÿåº¦ã€å®¹é‡ä»¥åŠæ•ˆçŽ‡ã€‚有关这些特殊的气血符文的资料å¯ä»¥åœ¨åŽé¢çš„章节找到。 -guide.bloodmagic.entry.architect.inspectoris.info.1=Inspectoris Scandalum åœ¨æ‹‰ä¸ è¯­ä¸­å¤§æ¦‚çš„æ„æ€æ˜¯â€œæ–¹å—读å–器â€ã€‚事实上，它的用途是，潜行时对ç€æŸä¸ªæ–¹å—使用，便å¯è§£è¯»é‚£äº›å¤æ‚结构的信æ¯ï¼Œå¹¶å°†å…¶æ˜¾ç¤ºåœ¨ä½ çœ¼å‰ã€‚ç›®å‰ï¼Œå®ƒåªèƒ½ç»™å‡ºè¡€ä¹‹ç¥­å›çš„相关信æ¯ï¼šå®ƒå¯ä»¥ç»™å‡ºå‡çº§ç¥­å›æ‰€éœ€çš„æ–¹å—çš„ç§ç±»ï¼Œä»¥åŠå…·ä½“摆放ä½ç½®ã€‚\n\t若你觉得一次一次查询ä¸é€‚åˆä½ ï¼Œä½ å¯ä»¥è¯•ç€æ½œè¡Œæ—¶å¯¹ç€ç©ºæ°”使用此物以切æ¢ç›®æ ‡å±‚/cut级。这样，å†æ¬¡æŒ‰å‰æ–‡æ‰€è¿°çš„æ–¹å¼ä½¿ç”¨æ­¤ç‰©ï¼Œå®ƒå°±å¯ä»¥ä»¥ä¸€ç§ç±»ä¼¼å…¨æ¯æŠ•å½±çš„æ–¹å¼å°†å‡çº§æ‰€éœ€çš„æ–¹å—çš„ä½ç½®æŠ•å½±å‡ºæ¥ã€‚设定级别为1æ—¶å¯ä»¥å…³é—­è¿™ä¸ªç±»å…¨æ¯æŠ•å½±çš„效果。 -guide.bloodmagic.entry.architect.runeSpeed.info.1=速度符文å¯ä»¥æ高祭å›å†…的压力，藉由此加速嬗å˜è¿‡ç¨‹ï¼Œä»Žè€Œæ高åˆæˆé€Ÿåº¦ã€‚æ¯å—速度符文都会æ高20%%的祭å›çš„LP消耗速度。它åŒæ—¶ä¹Ÿä¼šå½±å“çŒæ³¨æ°”è¡€å®ç çš„速度。 -guide.bloodmagic.entry.architect.water.info.1=顾åæ€ä¹‰ï¼Œæ°´ä¹‹å°è®°æ˜¯ä¸€å—å¯å‡èšç©ºæ°”中水分，并将其集中于一点上的å°è®°ã€‚除此之外，对ç€ä»»ä½•èƒ½è£…水的设备使用水之å°è®°éƒ½å¯ä»¥å‘设备里é¢è£…一桶水。总而言之，它便是一个移动的无é™æ°´æºã€‚æ¯æ¬¡ä½¿ç”¨éƒ½ä¼šæ¶ˆè€—50点LP。 -guide.bloodmagic.entry.architect.lava.info.1=若说水之å°è®°å±žé˜´ï¼Œé‚£ä¹ˆï¼Œå±žé˜³çš„便是熔岩å°è®°ã€‚熔岩å°è®°å¯ä»¥å°†ä¸€ç‰‡åŒºåŸŸå†…的石头熔化æˆå²©æµ†ã€‚若是对æŸä¸ªå¯æŽ¥å—æµä½“岩浆的设备使用，这设备里就会多出一桶岩浆。尽管你拿ç€è¿™ä¸ªå°è®°ä¸ä¼šè®©ä½ è‡ªç‡ƒï¼Œä½†è¿™ä¸ç­‰äºŽä½ å¯ä»¥å¼€å§‹æ´—熔岩浴了ï¼è®°å¾—æ¯æ¬¡ä½¿ç”¨æ—¶ä¼šæ¶ˆè€—1000LP。 -guide.bloodmagic.entry.architect.lavaCrystal.info.1=熔岩晶体是å—里é¢å­˜å‚¨äº†ä¸€å›¢æ°¸ä¸å†·å´çš„熔岩的石头。若将其放入熔炉中当燃料使用，它会释放出热é‡ï¼Œè¿™äº›çƒ­é‡æ­£å¥½å¯ä»¥çƒ§ç‚¼ä¸€ä¸ªç‰©å“，然åŽæ¶ˆè€—50LP。若是它没有这么多LPå¯ä»¥æŠ½å–，它也ä¸ä¼šå› æ­¤æŸå，还会因此给网络的主人追加一个å胃效果。\n\tè¿™å—晶体ç†è®ºä¸Šåœ¨ä»»ä½•æ”¯æŒæ ‡å‡†å›ºæ€ç‡ƒæ–™çš„设备中都å¯ä»¥å·¥ä½œã€‚ -guide.bloodmagic.entry.architect.apprenticeorb.info.1=éšç€ä½ çš„新玩具越æ¥è¶Šå¤šï¼Œä½ ä¼šå‘现çµé­‚网络的五åƒLP上é™å·²ç»å¼€å§‹æ‰è¥Ÿè§è‚˜äº†ã€‚是时候åšä¸€é¢—更强大的气血å®ç äº†ã€‚\n\t学徒气血å®ç çš„制作需è¦äºŒçº§è¡€ä¹‹ç¥­å›ï¼Œå¯æä¾›2.5万LP的容é‡ã€‚åŒæ—¶ï¼Œå®ƒä¹Ÿæ˜¯åˆæˆå¾ˆå¤šæ›´é«˜çº§çš„物å“和符文的必须。 -guide.bloodmagic.entry.architect.dagger.info.1=在ä¸æ–­åœ°é€šè¿‡çŒ®ç¥­è‡ªå·±æ¥å¼ºåŒ–自己åŽï¼Œä½ å¯ä»¥å¼€å§‹è¯•ç€çŒ®ç¥­åˆ«çš„活物了。若是用这把牺牲匕首，在血之祭å›é™„近击中一åªæ™®é€šçš„生物（ä¸èƒ½æ˜¯BOSS，也ä¸èƒ½æ˜¯çŽ©å®¶ï¼‰ï¼Œé‚£ä¹ˆè¿™ä¸ªå¯æ€œçš„家伙就会立刻被献祭，并根æ®è´¨é‡çš„ä¸åŒï¼Œè½¬åŒ–æˆæ•°é‡ä¸ç­‰çš„生命æºè´¨ã€‚一般情况下，那些敌对怪物给予的生命æºè´¨è¦æ¯”那些平和的动物们è¦å¤šã€‚ -guide.bloodmagic.entry.architect.runeSacrifice.info.1=献祭符文，正如其å，å¯æ高献祭活物时获得的生命æºè´¨çš„æ•°é‡ï¼Œå‡†ç¡®åœ°è¯´ï¼Œæ˜¯æ¯å—符文增加å分之一。 -guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=牺牲符文和献祭符文差ä¸å¤šï¼Œä½†ç‰ºç‰²ç¬¦æ–‡æ˜¯é’ˆå¯¹çŽ©å®¶è‡ªå·±çš„。增幅和献祭符文一样，都是百分之å。 -guide.bloodmagic.entry.architect.holding.info.1=ä½ é€æ¸å¼€å§‹å‘现你有一堆å„å¼å„æ ·çš„å°è®°è¦å¸¦åœ¨èº«ä¸Šäº†ï¼šæœ‰çš„需è¦æ‰‹åŠ¨å¼€å…³ï¼Œæœ‰çš„åªéœ€è¦æ”¾åœ¨èƒŒåŒ…里就å¯ä»¥ä¸€ç›´æœ‰æ•ˆæžœã€‚有鉴于你的背包空间开始é€æ¸ç¼©æ°´ï¼Œä½ å¯èƒ½éœ€è¦ä¸€å—集æŒå°è®°çš„帮助。\n\t这集æŒå°è®°çš„作用，便是将五个其他å°è®°â€œåŽ‹ç¼©â€æˆä¸€ä¸ªï¼›ä½†æ˜¯ä½ å¹¶ä¸èƒ½åœ¨é›†æŒå°è®°é‡Œæ”¾é›†æŒå°è®°ã€‚默认，按下"Holding"键（默认为'H'）å¯æ‰“开其界é¢ï¼Œç”¨äºŽè°ƒæ•´é¡ºåºã€‚滚轮å¯åœ¨é€‰ä¸­/cutçš„å°è®°ä¹‹é—´å¾ªçŽ¯åˆ‡æ¢ã€‚被选中的å°è®°å¯ç›´æŽ¥å€ŸåŠ©é›†æŒå°è®°ä½¿ç”¨ï¼Œæ¯‹éœ€å–出。\n\t自然地，你å¯ä»¥èº«ä¸Šå¸¦è‹¥å¹²é›†æŒå°è®°ï¼Œè¿™äº›é›†æŒå°è®°äº’ä¸å½±å“。但为了一眼就能区分，你å¯ä»¥è€ƒè™‘在炼金术桌中为其染色。染色的方å¼æœ‰ä¸¤ç§ï¼š1.直接使用染料在炼金术桌中染色；2.使用å六进制数命å的命å牌，比如这样：0xFFFFFF。 -guide.bloodmagic.entry.architect.air.info.1=风之å°è®°ï¼Œç®€å•åœ°å°†æ°´è’¸æ°”分æˆæ•°è‚¡ï¼Œäº§ç”Ÿå¼ºå¤§çš„æ°”æµï¼Œé©±ä½¿çŽ©å®¶å‰è¿›ã€‚简å•æ¥è¯´ï¼Œä½ å¯ä»¥ç”¨è¿™å°è®°æŽ¨åŠ¨ä½ å‰è¿›ã€‚å¦å¤–，这个å°è®°å¯ä»¥å…除掉è½ä¼¤å®³ï¼Œä½†åªæœ‰ä½ ä½¿ç”¨æ—¶æ‰å¯ä»¥å…除，所以如果你想硬ç€é™†çš„è¯ï¼Œè®°å¾—è¦åœ¨å³å°†æ‘”åˆ°åœ°ä¸Šçš„ä¸€çž¬é—´ä½¿ç”¨ï¼ -guide.bloodmagic.entry.architect.void.info.1=顾åæ€ä¹‰ï¼Œè™šç©ºå°è®°ä¼šåˆ¶é€ çœŸç©ºï¼Œå¹¶å°†é™„近的液体全部å¸è¿›åŽ»ï¼Œå¹¶å½»åº•é”€æ¯ã€‚建议æ­é…水之å°è®°å’Œç†”岩å°è®°ä½¿ç”¨ã€‚ -guide.bloodmagic.entry.architect.greenGrove.info.1=绿丛å°è®°å¯ä»¥å°†ä½ çš„血转化æˆæ¤ç‰©ç”Ÿé•¿çš„催化剂，进而加速附近æ¤ç‰©çš„生长。激活å°è®°çš„æ–¹å¼å¾ˆç®€å•ï¼šæ½œè¡Œæ—¶å¯¹ç€ç©ºæ°”使用（å³å‡»ï¼‰å³å¯ï¼›ç›¸åŒçš„æ–¹å¼å¯ä»¥åœæ­¢å…¶å·¥ä½œï¼ˆå¯ä»¥é€šè¿‡å…¶ä¿¡æ¯æ示看出它是å¦å·²è¢«æ¿€æ´»ï¼‰ã€‚è¦è®°ä½ï¼Œå®ƒæ¯éš”几秒钟就会抽å–一次LP以补充养料。\n\t直接对作物使用的效果和骨粉无异。这样一æ¥ï¼Œè¿™ä¸ªå°è®°ä¹Ÿå¯ä»¥åƒéª¨ç²‰ä¸€æ ·ï¼Œç”¨äºŽåˆ¶é€ è‰ä¸›ã€‚ -guide.bloodmagic.entry.architect.fastMiner.info.1=大部分血法师都应该注æ„到了，血中å«æœ‰ä¸°å¯Œçš„é“元素。ç»éªŒä¸°å¯Œçš„血法师完全å¯ä»¥åœ¨ä¸æŠ½è¡€çš„情况下直接改å˜å…¶ä½“内血液的组æˆâ€”—然而，需è¦æ³¨æ„的是，åªæœ‰é‚£äº›æœ€é¡¶å°–的血法师æ‰å¯ä»¥æŠµæŠ—由此产生的排斥å应。\n\t这样一个技能有个ç»å…¸çš„用途，æ高身体的çµæ´»æ€§ï¼Œä»¥æ高其è¿åŠ¨é€Ÿåº¦ã€‚这速掘å°è®°ï¼Œé€šè¿‡ç”¨ç£é“å½±å“血液里的é“元素，å¯å¤§å¹…æå‡ä½¿ç”¨è€…的挖掘/cut速度。其实这个效果就是急迫II的效果。虽然åªèƒ½å½±å“使用者自身，但对于挖黑曜石æ¥è¯´çš„确是好用。 -guide.bloodmagic.entry.architect.seer.info.1=你在修ç†è¡€ä¹‹ç¥­å›æ—¶ï¼Œæ—¶å¸¸ä¼šå‘觉自己早已迷失在了那些å åœå°è®°æ— æ³•å¯Ÿè§‰çš„细节中。所以这就是轮到è§è§£å°è®°ç™»åœºçš„时刻了。è§è§£å°è®°å®žé™…上是å åœå°è®°çš„å‡çº§ç‰ˆï¼Œå®ƒèƒ½çœ‹åˆ°å¾ˆå¤šå åœå°è®°æ‰€çœ‹ä¸åˆ°çš„细节，诸如祭å›çš„åˆæˆé€Ÿåº¦ã€å½“å‰çš„LP储é‡ã€åˆæˆè¿›åº¦ã€ç”šè‡³çŽ©å®¶è‡ªå·±çš„çµé­‚网络的很多信æ¯ï¼Œè¿™é‡Œå°±ä¸ä½œèµ˜è¿°äº†ã€‚ -guide.bloodmagic.entry.architect.magicianOrb.info.1=新的祭å›ï¼Œæ–°çš„å®ç ã€‚这次，为了你的新玩具，你需è¦ä¸€é¢—法师气血å®ç ã€‚ä¸è¿‡æœ‰ä¸€ç‚¹è¦æ³¨æ„，åˆæˆæ³•å¸ˆæ°”è¡€å®ç éœ€è¦2.5万LP，但你的祭å›åªæœ‰ä¸€ä¸‡å®¹é‡ã€‚æ¢è¨€ä¹‹ï¼Œåœ¨åˆæˆè¿™é¢—å®ç æ—¶ï¼Œä½ éœ€è¦ä¸æ–­åœ°è¡¥å……生命æºè´¨ã€‚所以，在åˆæˆè¿™é¢—气血å®ç å‰ï¼Œè¯·åŠ¡å¿…åšå¥½ä¸‡å…¨çš„å‡†å¤‡ï¼ -guide.bloodmagic.entry.architect.capacity.info.1=虽然你并ä¸çŸ¥é“具体原ç†ï¼Œä½†è¿™å¢žå®¹ç¬¦æ–‡çš„确能给血之祭å›æ供两åƒçš„é¢å¤–容é‡ã€‚也许，是æŸç§å…±æŒ¯å¯¼è‡´å®¹ç§¯ä¸‹é™ï¼Œç„¶åŽä½ ä¾¿å¯ä»¥å¾€é‡Œé¢è£…入更多的容器？这样一想你倒是想到了进一步改进的方法...\n\t这里有必è¦å†é‡å¤ä¸€é，祭å›æœ¬èº«è¿˜æœ‰ç”¨äºŽç¼“冲的输入和输出容器，容积å‡ä¸ºä¸»å®¹å™¨çš„110%%。增容符文的效果对这两个缓冲容器也有效。 -guide.bloodmagic.entry.architect.displacement.info.1=默认，血之祭å›çš„缓冲区和主容器之间的LP转移速度是最高20LP/s。对于那些需è¦é¢‘ç¹è½¬ç§»LP的祭å›æ¥è¯´è¿™ä¸ªé€Ÿåº¦å¯ä»¥è¯´æ˜¯å·¨å¤§çš„瓶颈。这也是为什么会有转ä½ç¬¦æ–‡çš„原因。\n\t转ä½ç¬¦æ–‡å¯æå‡LP转移的速度。æ¯ä¸ªç¬¦æ–‡éƒ½å¯ä»¥å°†é€Ÿåº¦æ高至原æ¥çš„1.2å€ï¼Œå¤šä¸ªè½¬ä½ç¬¦æ–‡å¯ä»¥å åŠ ã€‚æ¢è¨€ä¹‹ï¼Œä¸€ä¸ªè½¬ä½ç¬¦æ–‡å¯ä»¥å°†é€Ÿåº¦æ高至一次24LP，两个则为28.8LP，三个/cut则为34.56LP，而20个则会达到767LP，足以在13秒内清空一座标准祭å›é‡Œæ‰€æœ‰çš„生命æºè´¨ã€‚ -guide.bloodmagic.entry.architect.affinity.info.1=表é¢ä¸Šçœ‹ï¼Œå…ƒç´ å°è®°ä¸è¿‡æ˜¯ä¸€ä¸ªèƒ½å…ç–«ç«ç„°ã€æººæ°´å’Œæ‘”è½ä¼¤å®³çš„å°è®°ã€‚事实上，它的工作方å¼å¹¶éžå¦‚此——激活此å°è®°åŽï¼Œå®ƒä¼šæ¶ˆè€—汗水（如有必è¦ï¼Œä¼šæ˜¯è¡€ï¼‰ï¼Œç„¶åŽåœ¨ä½¿ç”¨è€…身上形æˆä¸€æ ¼ä¿æŠ¤å±‚，进而抵挡æ„外伤害。\n\t这层空气护盾å¯ä»¥ç¼“冲ç«ç„°å’Œç†”岩的热é‡ï¼Œä¹Ÿå¯ä»¥åœ¨å¿…è¦æ—¶æ供空气以防溺水，åŒæ—¶è¿˜å¯ä»¥åœ¨ä¸æ…Žæ‘”è½æ—¶å……当无形的气垫使用。 -guide.bloodmagic.entry.architect.lamp.info.1=人和动物的血液中还是有“æ‚è´¨â€çš„。åªéœ€è¦æ”¶é›†ä¸€äº›ç¨€æœ‰æ°”体，然åŽè¾…以åˆé€‚的热æºï¼Œå°±å¯ä»¥åœ¨åœ°é¢ä¸Šäº§ç”Ÿä¸€å›¢æ˜Žäº®çš„å…‰çƒï¼Œç…§è€€ç€è¿œå¤„的大地。\n\t血光å°è®°çš„用途有两个：或直接对ç€æ–¹å—使用，产生一个光çƒï¼›æˆ–对ç€ç©ºæ°”使用，将光çƒå‘射到远处。这些光çƒå’Œç«æŠŠä¸€æ ·ï¼Œå¯ä»¥ç©ºæ‰‹æ‰“碎。 -guide.bloodmagic.entry.architect.magnetism.info.1=ç£å¼•å°è®°å¯å°†è¡€æ¶²ä¸­çš„é“元素转化为ç£é“，进而将å°ä»¶ç‰©å“å¸å¼•åˆ°èº«ä¸Šï¼Œå…除原地打转收集物å“的麻烦。就原ç†æ¥çœ‹ï¼Œå®ƒæ˜¯çœŸæ­£çš„物å“ç£é“，因为它并éžæ˜¯æŠŠç‰©å“å¸è¿‡æ¥ï¼Œè€Œæ˜¯çœŸæ­£ç›´æŽ¥æ¡èµ·è¿œå¤„的物å“。幸好这ç£é“çš„ç£åŠ›å¹¶ä¸å¤§ï¼Œä¸ç„¶å½“ä½ æ„外地将爬行者以3马赫的速度å¸è¿‡æ¥çš„时候一切就都结æŸäº†ã€‚ - -guide.bloodmagic.entry.architect.peritia.info.1=在这世界上，有æŸäº›è¡Œä¸ºå¯ä»¥ç´¯ç§¯ä¸€ä¸ªäººçš„ç»éªŒï¼šå‡»æ€æ€ªç‰©ã€é‡‡æŽ˜çŸ¿çŸ³ã€å†¶ç‚¼é‡‘属ã€çƒ¹é¥ªé£Ÿç‰©... åŒæ—¶ï¼Œä¸€äº›ç‰¹æ®Šçš„奥法设备å¯ä»¥ç›´æŽ¥å¸æ”¶è¿™äº›ç»éªŒï¼Œå¹¶ä½œä¸ºå…¶åŠ¨åŠ›ä½¿ç”¨ã€‚因此，若是有一ç§èƒ½å­˜å‚¨ç»éªŒçš„媒介，那就å†å¥½ä¸è¿‡äº†ã€‚\n\t尽管有很多设备都å¯ä»¥å°†è¿™ç»éªŒè½¬åŒ–æˆç‰©ç†å½¢æ€å‚¨å­˜ï¼Œä½†è¿™æœ¬ç»éªŒä¹‹ä¹¦å´æ˜¯ä»¥ä¹¦å†™çŸ¥è¯†çš„æ–¹å¼ï¼Œå°†ä½ è¿‡åŽ»æ‰€ç§¯ç´¯ä¸‹/cutçš„ç»éªŒä¿å­˜ä¸‹æ¥ï¼Œä»¥ä¾›æ—¥åŽä½¿ç”¨çš„。需è¦çš„时候，åªéœ€è¦æ‰‹æŒè¿™æœ¬ä¹¦å°±èƒ½è‡ªåŠ¨å¸æ”¶ä¹¦é¡µä¸­çš„知识，并将其转化为ç»éªŒã€‚\n\t具体æ¥è¯´ï¼Œè¿™æœ¬ä¹¦æ˜¯è¿™æ ·ç”¨çš„：潜行时å³å‡»å³å¯å°†ä¸€çº§ç»éªŒå­˜å…¥ä¹¦ä¸­ï¼ˆè‹¥æœ‰é›¶å¤´ï¼Œåˆ™å…ˆå¸æ”¶é›¶å¤´ï¼‰ã€‚平时å³å‡»ä¸€æ¬¡å¯ç›´æŽ¥èŽ·å¾—一整级ç»éªŒã€‚它所存储的ç»éªŒæ•°é‡å¯åœ¨å…¶ä¿¡æ¯æ示中找到。 -guide.bloodmagic.entry.architect.livingArmour.info.1=在这Minecraft的世界中，所有人，尤其是那些新生的人（译注：应该是指死亡åŽåˆšåˆšé‡ç”Ÿçš„玩家？），都清楚一套好的护甲的é‡è¦æ€§ã€‚通常，护甲的属性是确定的——护甲的ä¿æŠ¤æ€§èƒ½ã€é£žè¡Œçš„能力ã€è·³è·ƒæˆ–跑步的增幅ã€è¯¸å¦‚此类，ä¸èƒœæžšä¸¾ã€‚诚然有这些属性的护甲是好的，但你从未真正é‡åˆ°è¿‡ä¸€å¥—为你é‡èº«æ‰“造的护甲。至少，现在所有人都这么认为。\n\t而这æŸçµæŠ¤ç”²ï¼Œå®žé™…上是一/cut个被镶入é“甲中的，ç»è¿‡ç‰¹æ®Šæ”¹é€ åŽçš„活物。穿在身上时，它便会与穿戴者共生——他们将一起移动ã€ä¸€èµ·æ”»å‡»ã€ç”šè‡³åƒä¸œè¥¿æ—¶å®ƒä¹Ÿä¼šæœ‰æ‰€æ„Ÿè§‰ã€‚和普通的人体一样，它也会生长，也会ä¸æ–­åœ°å¼ºåŒ–自己，当然也需è¦æŽ¥å—训练。\n\t先举个例å­å§ã€‚当你穿上æŸçµæŠ¤ç”²ï¼Œå¹¶é•¿é€”奔袭一段时间åŽï¼Œä½ ä¼šæ³¨æ„到æŸçµèƒ¸ç”²ä¸Šå¤šäº†ä¸€ä¸ªå为“迅æ·åŒè¶³â€çš„å‡çº§ã€‚这个å‡çº§å¯ä»¥æ高你的/cut移动速度，虽然目å‰åªæœ‰ç­‰çº§1，但毕竟还是å¯ä»¥å‡çº§çš„。你还会注æ„到它拥有了“强化点数â€ï¼Œç›®å‰å¯èƒ½æ˜¯â€œ3/100â€è¿™æ ·å­ã€‚æ¯ä¸ªå‡çº§éƒ½éœ€è¦ä¸€å®šçš„强化点数，但护甲å¯ç”¨çš„强化点数有é™ã€‚æ¢è¨€ä¹‹ï¼Œè‹¥æ˜¯æ‹¿ä¸å‡ºæŸä¸ªå‡çº§éœ€è¦çš„点数，你是ä¸å¯èƒ½èŽ·å¾—这个å‡çº§çš„。\n\tè®°ä½ä¸€ç‚¹ï¼Œåªæœ‰å…¨å¥—æŸçµæŠ¤ç”²æ‰èƒ½æŽ¥å—训练，也åªæœ‰å…¨å¥—æŸçµæŠ¤ç”²æ‰èƒ½å‘挥其应有的效果。\n\t/cutæŸçµæŠ¤ç”²çš„强化点数还是å¯ä»¥è¢«äººä¸ºä¿®æ”¹çš„。有一ç§æ–¹æ³•æ˜¯åˆ©ç”¨ç‚¼é‡‘术增强穿戴者和护甲本身之间的链接，藉此大幅æå‡å¼ºåŒ–点数的上é™ï¼Œå…¸åž‹ä»£è¡¨ä¾¿æ˜¯â€œç¥·å‘Šä¹‹å§‹â€ï¼Œå¯å°†ä¸Šé™æå‡è‡³200。关于这些炼金术的产物以åŠåˆ¶é€ è¿‡ç¨‹ï¼Œå»ºè®®å‚阅本书《炼金术士》一å·ã€‚ -guide.bloodmagic.entry.architect.upgradeTome.info.1=若是æŸçµæŠ¤ç”²ä¸Šæœ‰ä½ ä¸æƒ³è¦çš„å‡çº§æ€Žä¹ˆåŠžå‘¢ï¼Ÿä½ å¯ä»¥ä½¿ç”¨å为“净çµä¹‹éŸ³â€çš„仪å¼æ¥æ¸…洗这些å‡çº§ï¼Œå¹¶èŽ·å¾—对应的“强化手册â€ã€‚关于仪å¼çš„细节å¯å‚阅本书《仪å¼å¤§å¸ˆã€‹å·ã€‚这“强化手册â€çš„用途便是，在你身ç€å…¨å¥—æŸçµæŠ¤ç”²æ—¶ï¼Œç›´æŽ¥ç»™äºˆæŠ¤ç”²å¯¹åº”çš„å‡çº§ã€‚\n\t当然，这强化手册也å¯ä»¥åœ¨é“砧中èžåˆâ€”—在é“砧中将两本一模一样的手册èžåˆåœ¨ä¸€èµ·å¯ä»¥èŽ·å¾—更高一级的手册。/cut比方说，两本迅æ·åŒè¶³IIå¯ä»¥èžåˆå‡ºä¸€æœ¬è¿…æ·åŒè¶³III。对于æŸçµæŠ¤ç”²æœ¬èº«æ¥è¯´ï¼Œä¹Ÿæœ‰ç±»ä¼¼çš„机制，这里ä¸ä½œèµ˜è¿°ã€‚ -guide.bloodmagic.entry.architect.teleposer.info.1=ä¼ é€å™¨ï¼Œé¡¾åæ€ä¹‰ï¼Œå¯ä»¥å°†æŸä¸ªç‰©ä½“ä¼ é€è‡³å¦ä¸€ä¸ªåœ°ç‚¹ï¼Œä½†è¿™ä¸ªä¼ é€å™¨ä¸ä»…å¯ä»¥ä¼ é€ç”Ÿç‰©ï¼Œè¿˜èƒ½ä¼ é€æ–¹å—。完整的传é€è£…置需è¦ä¸¤ä¸ªä¼ é€å™¨å’Œä¸€ä¸ªä¼ é€æ ¸å¿ƒã€‚其中，一个传é€å™¨å……当目的地，å¦ä¸€ä¸ªä¼ é€å™¨å……当出å‘地。\n\t在使用传é€å™¨ä¹‹å‰éœ€è¦ä¸€äº›é…置。首先，你需è¦å³å‡»ä¼ é€æ ¸å¿ƒå°†ä½ ä¸Žå…¶ç»‘定。然åŽï¼Œæ‰‹æŒæ ¸å¿ƒå³å‡»å……当目的地的传é€å™¨ä»¥è®°å½•ç›¸å…³ä¿¡æ¯ã€‚最终，/cut把这个记录了目的地信æ¯çš„ä¼ é€æ ¸å¿ƒé€è¿‡å…¶GUI放入充当始å‘地的传é€å™¨å³å¯ã€‚\n\t然åŽï¼Œç»™äºˆå§‹å‘地的传é€å™¨ä¸€ä¸ªçº¢çŸ³ä¿¡å·ï¼ˆå‡†ç¡®åœ°è¯´ï¼Œæ˜¯å¼ºå……能），这个传é€å™¨å°±ä¼šå°†å®žä½“和方å—（如果是箱å­è¿™æ ·å¸¦ç‰¹æ®Šæ•°æ®çš„æ–¹å—，一并ä¿ç•™ï¼‰ä¸€è‚¡è„‘全部传é€è¿‡åŽ»â€”—这个过程中我们å‡å®šç›®çš„地是有传é€å™¨çš„。\n\t当然，你å¯ä»¥åªè®©ä¸€ä¸ªä¼ é€å™¨/cut有核心，抑或两个传é€å™¨äº’相链接，或者更多传é€å™¨å½¢æˆä¸€æ¡é“¾ï¼Œè—‰æ­¤å½¢æˆæ›´å¤æ‚的系统。\n\tä¸è¿‡è¦è®°ä½ä¸€ç‚¹ï¼Œä¼ é€å™¨åªä¼ é€å…¶ä¸Šæ–¹çš„æ–¹å—，ä¸è¿‡ä¼ é€çš„范围是由传é€æ ¸å¿ƒå†³å®šçš„——T1çš„ä¼ é€æ ¸å¿ƒåªèƒ½ä¼ é€ä¸€ä¸ªæ–¹å—，而T2ä¼ é€æ ¸å¿ƒåˆ™èƒ½ä¼ é€3x3x3çš„æ–¹å—，以此类推。 -guide.bloodmagic.entry.architect.boundBlade.info.1=æŸç¼šä¹‹å‰‘是一把用制作æŸçµæŠ¤ç”²çš„æ–¹å¼åˆ¶ä½œå‡ºæ¥çš„剑，å¯ä»¥è¯´å·²æœ‰å¾ˆé•¿åŽ†å²äº†ã€‚ä¸è¿‡æœ‰ä¸€ç‚¹è¦æ³¨æ„，包括æŸç¼šä¹‹å‰‘在内的å„ç§æŸç¼šå·¥å…·çš„设定，在未æ¥éƒ½æœ‰å¯èƒ½æœ‰å˜åŠ¨ã€‚\n\t这把剑有激活模å¼å’ŒæŠ‘制模å¼ï¼Œæ½œè¡Œæ—¶å³å‡»å³å¯åˆ‡æ¢ã€‚在抑制状æ€ä¸‹å®ƒå¹¶ä¸ä¼šé€ æˆä»»ä½•ä¼¤å®³ï¼Œä½†æ˜¯åœ¨æ¿€æ´»æ¨¡å¼ä¸‹å®ƒæ˜¯ä¼šæ¶ˆè€—LP的。åŒæ ·çš„，你对怪物造æˆä¼¤å®³æ—¶ï¼Œä¹Ÿä¼šæ¶ˆè€—LP。所以，在你æ€æ­»æ€ªç‰©çš„时候，/cut这把剑也有å¯èƒ½æ€æ­»ä½ ï¼\n\t然而，用这把剑æ€æ­»æ€ªç‰©æ—¶ï¼Œä¼šæœ‰é‚£ä¹ˆä¸€ç‚¹æ¦‚率获得虚弱气血碎片——这个碎片便是将祭å›å‡çº§è‡³å››çº§çš„关键。 -guide.bloodmagic.entry.architect.boundTool.info.1=å’ŒæŸç¼šä¹‹å‰‘一样，æŸç¼šå·¥å…·ï¼ˆåŒ…括é•ã€æ–§å’Œé”¹ï¼‰çš„属性在未æ¥ä¹Ÿä¼šæœ‰æ‰€å˜åŠ¨ã€‚å’ŒæŸç¼šä¹‹å‰‘一样，æŸç¼šå·¥å…·æœ‰ä¸¤ä¸ªæ¨¡å¼ï¼Œåˆ‡æ¢æ–¹å¼åŒæŸç¼šä¹‹å‰‘，也是潜行时å³å‡»ã€‚\n\tå’ŒæŸç¼šä¹‹å‰‘ä¸åŒï¼ŒæŸç¼šå·¥å…·æ‹¥æœ‰â€œé‡Žå…½æ¨¡å¼â€ã€‚手æŒå·¥å…·å³é”®æŒ‰ä½ä¸åŠ¨å³å¯è“„力，蓄力结æŸåŽå·¥å…·ä¼šæ”¾å‡ºä¸€è‚¡å·¨å¤§çš„能é‡ï¼Œå¤§èŒƒå›´ç ´åæ–¹å—，最高å¯è¾¾11x11x11，但åŒæ—¶ä¹Ÿæœ‰æƒŠäººçš„消耗：一万LP。因此，使用时一/cut定è¦å°å¿ƒè°¨æ…Žï¼Œå› ä¸ºæžä¸å¥½è¿™å°±æ˜¯ä½ æœ€åŽä¸€æ¬¡ä½¿ç”¨è¿™äº›å·¥å…·ï¼ -guide.bloodmagic.entry.architect.weakShard.info.1=任何有生命的东西，都有一层看ä¸è§ï¼Œæ‘¸ä¸ç€çš„链接，这个现象被称作çµé­‚网络。实践è¯æ˜Žï¼Œè¯¸å¦‚å°è®°å’Œä»ªå¼è¿™æ ·çš„东西也是å¯ä»¥æœ‰é“¾æŽ¥çš„，然而这些链接的æ¥æºä¾¿æ˜¯æ‹¥æœ‰æœ€å¼ºé“¾æŽ¥çš„生物——人类。\n\t用æŸç¼šä¹‹å‰‘攻击生物时，那些å¯æ€œç”Ÿç‰©çš„一部分çµé­‚网络会直接硬化，在它们死åŽä¹Ÿå¯ä¿æŒå…¶å½¢çŠ¶ã€‚这部分çµé­‚网络便以虚弱气血碎片的形å¼çŽ°èº«äºŽä¸–，它们因其颜色与虚/cut弱气血å®ç ç›¸è¿‘而得å。\n\t虽然，至今ä»æœªæ‰¾åˆ°å­˜åœ¨æ›´å¼ºçš„气血碎片的è¯æ®ï¼Œä½†æ˜¯ä½ è‡³å°‘知é“，这些碎片对于增强你自己的çµé­‚网络肯定有帮助。 -guide.bloodmagic.entry.architect.masterOrb.info.1=如何利用这ç§å¯¹çµé­‚网络å分亲和的特性呢？答案是：用虚弱气血碎片打造全新的气血å®ç â€”—导师气血å®ç ã€‚它å¯ä»¥æ供一百万LP的上é™ï¼Œå®ƒå¯ä»¥å½»åº•è§£æ”¾ä½ å¯¹è¡€é­”法的想象力。也许，就算是陨石，也无法阻挡你的å‰è¿›äº†å§... -guide.bloodmagic.entry.architect.runeOrb.info.1=看上去这个符文并没什么用途。但是，这å®ç ç¬¦æ–‡å¯ä»¥æ高那些放入血之祭å›ä¸­å¡«å……çš„å®ç çš„容é‡ä¸Šé™ï¼Œæ¯å—符文都å¯ä»¥æå‡ç™¾åˆ†ä¹‹äºŒã€‚对于虚弱气血å®ç ï¼Œè¿™æ˜¯å¾®ä¸è¶³é“çš„100LP。而对于导师气血å®ç ï¼Œè¿™æ˜¯ä¸¤ä¸‡LP的增幅，效果å分显著ï¼å¦‚果你的祭å›ä¸Šè¿˜æœ‰ç©ºä½çš„è¯ï¼Œè¿™ä¸ªç¬¦æ–‡å…´è®¸å°±æ˜¯ä½ çš„首选。 -guide.bloodmagic.entry.architect.suppression.info.1=抑液å°è®°ï¼Œé‡‡ç”¨å’Œä¼ é€å™¨ä¸€æ ·çš„ä¼ é€ç§‘技，å¯ä»¥è®©ä¸€å®šèŒƒå›´å†…的液体瞬间消失。准确地说，是é€å…¥å¦ä¸€ä¸ªè¿·ä½ ç»´åº¦ä¸­ã€‚ä¸å¹¸çš„事，因为传é€ç§‘技的é™åˆ¶ï¼Œæ¶²ä½“还是会回æ¥çš„——比如说，在使用者走过本是液体的区域åŽã€‚ä¸è¿‡è¿™æ— ä¼¤å¤§é›…，毕竟ä¸è®ºæ˜¯åœ¨æ°´ä¸‹è¡Œèµ°ï¼Œè¿˜æ˜¯åœ¨ä¸‹ç•Œçš„熔岩之海上漫步，这å°è®°éƒ½æ˜¯å分好用的。 -guide.bloodmagic.entry.architect.haste.info.1=人体能消化的物质中有两ç§å分有趣：糖和咖啡因。å‰è€…是能é‡å‚¨å¤‡ï¼ŒåŽè€…å¯ä»¥ä»¤äººä¿æŒæ¸…醒。这急速å°è®°ï¼Œä¾¿å¯ä»¥é€šè¿‡æ¨¡æ‹ŸåŒ–å­¦å应的方å¼ï¼Œé‡Šæ”¾æ›´å¤šçš„化学能，进而æå‡å°è®°ä½¿ç”¨è€…的移动能力。\n\tå°è®°æ¿€æ´»åŽï¼Œä½¿ç”¨è€…会跑得更快，跳得更高，åŒæ—¶è¿˜ä¼šä»¤çŽ©å®¶åœ¨ä¸ç”¨è·³è·ƒçš„情况下跨越比较高的障ç¢ï¼ˆå®žé™…上是个改良版本的自动跳跃）。 -guide.bloodmagic.entry.architect.severance.info.1=人们至今无法解释传é€çš„机制。多数情况下，传é€è¢«è®¤ä¸ºæ˜¯æ—¶ç©ºæ‰­æ›²çš„一ç§è¡¨çŽ°å½¢å¼ï¼Œç‰©ä½“å¯é€šè¿‡ä¸¤ä¸ªä¸åŒæ—¶ç©ºçš„链接æ¥å®žçŽ°çž¬é—´ç§»åŠ¨ã€‚而这ç»å½±å°è®°å¯ä»¥é˜»æ­¢æ—¶ç©ºæ‰­æ›²çš„产生，从而阻止å¯åŠ¨æ­¤å°è®°çš„玩家附近的生物å‘动传é€æŠ€èƒ½ã€‚当然这个å°è®°å¹¶ä¸èƒ½é˜»æ­¢è¯¸å¦‚ä¼ é€é—¨ä¹‹ç±»çš„东西，但阻止类似末影人这样的生物还是å¯ä»¥çš„。 -guide.bloodmagic.entry.architect.teleposition.info.1=ä¼ é€å°è®°å®žé™…上是个自带传é€æ ¸å¿ƒçš„ä¼ é€å™¨ã€‚对æŸä¸ªä¼ é€å™¨ä½¿ç”¨æ­¤å°è®°ï¼Œå°è®°ä¼šè®°ä¸‹è¿™ä¸ªä¼ é€å™¨çš„ä½ç½®ï¼Œå†æ¬¡ä½¿ç”¨å°è®°å°±å¯ä»¥ç›´æŽ¥ä¼ é€åˆ°é‚£é‡ŒåŽ»äº†ã€‚然而它好åƒæ²¡ç»™ä½ è¿”程票... -guide.bloodmagic.entry.architect.compression.info.1=矿工ç»å¸¸é¢å¯¹çš„一个情况便是，它的背包中充满了红石粉ã€é’金石ã€ä»¥åŠå„ç§ä¹±ä¸ƒå…«ç³Ÿçš„东西。虽然å¯ä»¥åŽ‹ç¼©ï¼Œä½†æ˜¯å¹¶éžæ‰€æœ‰çŸ¿å·¥éƒ½ä¼šéšèº«æºå¸¦å·¥ä½œå°ã€‚\n\t压挤å°è®°æ‰€åˆ›é€ çš„å°åž‹åŽ‹ç¼©åŠ›åœºå¯ä»¥å°†å„ç§ç‰©å“压缩起æ¥ï¼Œè¿›è€ŒèŠ‚约背包空间。具体æ¥è¯´æ˜¯è¿™æ ·ï¼šå¦‚果你有63份红石粉，å°è®°ä¸ä¼šæœ‰æ•ˆæžœï¼›ä½†å¦‚果你有64份红石粉，它就会将其中63份压缩æˆ7个红石å—。虽/cut然并没腾出新的格å­ï¼Œä½†æ˜¯åˆ«å¿˜äº†é‚£ä¸ªå äº†ä¸€ä¸ªæ ¼å­çš„红石粉是å¯ä»¥æŽ¥ç€æ”¾çº¢çŸ³çš„。这个å°è®°å¯¹å…¶ä»–Mod的类似东西也是有效果的。 -guide.bloodmagic.entry.architect.bridge.info.1=影桥å°è®°å¯ä»¥å°†ä½¿ç”¨è€…脚下的空气固化æˆå¯ä»¥è¡Œèµ°çš„é“路，或者说，幻化出一座幻影之桥。若是你ä¸æ…Žè¸©ç©ºï¼Œå½±æ¡¥ä¼šç›´æŽ¥åœ¨ä½ è„šä¸‹å‡ºçŽ°ï¼Œé¿å…严é‡çš„摔伤。尽管在使用å‰éœ€è¦ä¸€äº›æµ‹é‡å·¥ä½œï¼ŒåŒæ—¶å½±æ¡¥å‡ºçŽ°ä¹Ÿä¼šé€ æˆå»¶è¿Ÿï¼Œå®ƒä»ä¸å¤±ä¸ºä¸€ç§â€œé£žè¡Œâ€çš„好方法。 -guide.bloodmagic.entry.architect.mimic.info.1=æ‹Ÿæ€æ˜¯ä¸€ç§å¯ä»¥æ¨¡ä»¿ä»»æ„给定结构的魔法结构。它本身å¯ä»¥æ ¹æ®å…¶ç¢°åˆ°çš„æ–¹å—，改å˜è‡ªèº«çš„分å­ç»“构，从而使其本身看起æ¥éƒ½æ˜¯å¦‚å‡åŒ…æ¢ä¸€æ ·ã€‚但，并éžæ‰€æœ‰çš„属性都å¯ä»¥å¤åˆ¶ï¼šæ¯”如说，普通的拟æ€æ–¹å—å˜æˆè¤çŸ³åŽä¸èƒ½å‘光。\n\t一般，拟æ€æ–¹å—有两ç§ç”¨æ³•ã€‚第一ç§ï¼Œå…ˆæ”¾ç½®æ‹Ÿæ€æ–¹å—，然åŽæ‰‹æŒè¦ä¼ªè£…çš„æ–¹å—对ç€æ‹Ÿæ€æ–¹å—å³å‡»ã€‚这样，被伪装的方å—就直接进入拟æ€æ–¹å—的内/cut部，拟æ€æ–¹å—也就å¯ä»¥ä¼ªè£…了。ä¸è¿‡ï¼Œè¿™ä¸ªæ–¹æ³•åªèƒ½ä¼ªè£…一个方å—的“默认â€å½¢çŠ¶ã€‚举个例å­ï¼Œæ­¤æ³•ä¼ªè£…的楼梯都是æœåŒä¸€ä¸ªæ–¹å‘的。\n\t第二ç§ï¼Œç›´æŽ¥å¯¹ç€æŸä¸ªæ–¹å—使用拟æ€æ–¹å—。若如此åšï¼Œæ‹Ÿæ€æ–¹å—便å¯ä»¥åšåˆ°ç²¾ç¡®ä¼ªè£…。还是刚æ‰æ¥¼æ¢¯çš„例å­ï¼Œè¿™æ ·ä¼ªè£…的楼梯就会很自然，因为方å‘被ä¿ç•™äº†ä¸‹æ¥ã€‚\n\t事实上，拟æ€æ–¹å—çš„å˜ç§æœ‰å¾ˆ/cut多。默认的ä¸é€æ˜Žæ‹Ÿæ€æ–¹å—å¯ä»¥æ¨¡ä»¿å½¢çŠ¶å’Œæ–¹å—的大多数属性，但光是无法照过去的。悬幽拟æ€æ–¹å—没有碰撞箱，适åˆåˆ¶ä½œéšè—门。清é€æ‹Ÿæ€æ–¹å—å¯ä»¥è§£å†³çŽ»ç’ƒçš„æ‹Ÿæ€é—®é¢˜ï¼šå…‰çº¿å¯ä»¥æ— è§†è¢«ä¼ªè£…çš„æ–¹å—的属性，穿é€è¿™ç§æ‹Ÿæ€æ–¹å—。最åŽï¼Œè¿˜æœ‰ä¸€ç§å…‰äº®æ‹Ÿæ€æ–¹å—，ä¸è®ºä½•æ—¶å®ƒéƒ½ä¼šå‘光。终于ä¸ç”¨ç«æŠŠäº†ï¼\n\t其实还有一ç§ç‰¹æ®Šçš„æ‹Ÿæ€æ–¹å—：感知拟æ€æ–¹å—。如果有玩/cut家接近，它们就会å‘å…¶å‘动猛烈攻击。这ç§æ–¹å—å¯åœ¨å¾ˆå¤šåœ°æ–¹æ‰¾åˆ°ï¼Œå°¤å…¶æ˜¯åœ°ç‰¢ä¸­ã€‚所以说，如果有一个感知拟æ€æ–¹å—伪装æˆäº†ç®±å­ï¼Œè¯·è®°ä½ï¼šå®ƒä»¬ä¼šå’¬äººã€‚\n\t***创造模å¼é™å®šå†…容***\n\t在创造模å¼ä¸‹ï¼Œæ‹Ÿæ€æ–¹å—会多出æ¥ä¸€äº›æœ‰è¶£ç‰¹æ€§ã€‚用è¯æ°´æˆ–è¯å‰‚瓶å³å‡»æ‹Ÿæ€æ–¹å—åŽï¼Œå¯ä»¤å…¶åœ¨æœ‰çŽ©å®¶åœ¨é™„近时产生对应的è¯æ°´æ•ˆæžœã€‚如果这是/cut普通的拟æ€æ–¹å—，那么：点击东é¢/西é¢å¯ä»¥åŠ /å‡è¯æ°´æ•ˆæžœçš„覆盖范围；点击北é¢/å—é¢å¯ä»¥åŠ /å‡çŽ©å®¶çš„检测范围；点击上é¢/下é¢å¯ä»¥æ高/é™ä½Žè¯æ°´ç”Ÿæˆé—´éš”，å³æ¯éš”多久生æˆä¸€æ¬¡è¯æ°´æ•ˆæžœã€‚\n\t如果你在é¢å¯¹ä¸€ä¸ªæ„ŸçŸ¥æ‹Ÿæ€æ–¹å—，你å¯ä»¥éšæ„点击这个拟æ€æ–¹å—，以改å˜å…¶æ£€æµ‹çŽ©å®¶çš„范围——如果玩家在检测范围中，并且å¯ä»¥çœ‹åˆ°è¿™ä¸ªæ‹Ÿæ€æ–¹å—，拟æ€æ–¹å—会直接出现在玩/cut家眼å‰ã€‚\n\tå¦å¤–，如果玩家在创造模å¼ä¸‹å°†è¦ä¼ªè£…çš„æ–¹å—放入拟æ€æ–¹å—中，这个方å—ä¸ä¼šåœ¨æ‹Ÿæ€æ–¹å—被破ååŽæŽ‰è½ã€‚\n\t最åŽçš„最åŽï¼Œå¦‚果拟æ€æ–¹å—伪装的是一个装ç€ä¸œè¥¿çš„ç®±å­æˆ–别的什么容器：对于感知拟æ€æ–¹å—，在它败北åŽä¼šæŠŠç®±å­è¿žåŒå†…容一å—放回æ¥ï¼›å¯¹äºŽå…¶ä»–æ‹Ÿæ€æ–¹å—，它会在被击溃时把物å“撒一地。 -guide.bloodmagic.entry.architect.downgrade.info=就护甲é™çº§çš„内容，我建议你阅读《仪å¼å¤§å¸ˆã€‹å·çš„“沉é‡çµé­‚çš„å¿æ‚”â€ä¸€ç« ï¼Œåœ¨é‚£é‡Œä½ å¯ä»¥å¾—到更详细的解释。 - -guide.bloodmagic.entry.architect.augmentedCapacity.info=和增容符文类似，超容符文也å¯ä»¥æå‡ç¥­å›çš„容é‡ã€‚但和增容符文ä¸åŒï¼Œå¤šå—超容符文会之间的共鸣会让容积呈指数级增长。具体æ¥è¯´ï¼Œæ˜¯åšä¹˜æ³•ï¼šæ¯ä¸€å—超容符文都会给予é¢å¤–10%%的容积；æ¢è¨€ä¹‹ï¼Œä¸¤å—å³21%%的增长，三å—å³33.1%%的增长，以此类推。\n\t然而，超容符文的效果ä¸ä¸Žå¢žå®¹ç¬¦æ–‡å åŠ ï¼Œæ¢è¨€ä¹‹ï¼Œä¸è®ºæœ‰å¤šå°‘超容符文，æ¯å—增容符文都åªæ供两åƒLP容é‡ã€‚ -guide.bloodmagic.entry.architect.charging.info=有那么一些东西对于åˆæˆå¾ˆæœ‰å¸®åŠ©ï¼Œè€Œè¿™å……能符文便是其中之一：它å¯ä»¥å¸æ”¶ LP，并将 其转化为“充能点数â€ï¼Œå…·ä½“æ•°é‡å¯ç”¨è§è§£å°è®°çœ‹åˆ°ã€‚若是åˆæˆæŸäº›ç‰©å“正好需è¦ä¸€å®šé‡çš„充能点数，那么这充能符文就å¯ä»¥ä»¥æ¶ˆè€—充能点数为代价，将物å“立刻åˆæˆå‡ºæ¥ã€‚若没有足够的充能点数，它就åªä¼šæŒ‰ä¸€æ¯”一的比例直接将充能点数转化为 LP 以加速 å…¶åˆæˆã€‚\n\t/cut血之祭å›æœ€å¤šå¯å­˜å‚¨çš„充能点数数é‡æ˜¯ç¥­å›å®¹ç§¯çš„函数，åŒæ—¶ä¹Ÿå……能符文的数é‡æˆæ­£æ¯”；其中容积需è¦è‡³å°‘为两万æ‰æœ‰æ•ˆæžœã€‚血之祭å›å……能的速度也是和充能符文数é‡ä»¥åŠå…¶æœ¬èº«çš„速度æˆæ­£æ¯”的（å³ï¼Œå……能速度=符文数é‡*祭å›æœ¬èº«åˆæˆé€Ÿåº¦ï¼‰ï¼Œæ¯ä¸€ç§’å®ƒéƒ½ä¼šå°†ä¸€å®šé‡ LP 转化为充能点数。所以，如果你的祭å›ä¸­æœ‰è¿™å—符文，åˆç†çš„设计将会使你事åŠåŠŸå€ã€‚ -guide.bloodmagic.entry.architect.acceleration.info=和大多数符文ä¸åŒï¼Œä¿ƒè¿›ç¬¦æ–‡éœ€è¦å’Œåˆ«çš„符文æ­é…使用，而且它的效果ä¸æ˜¯æ— é™åˆ¶å¢žé•¿çš„。这个符文的效果是，它å¯ä»¥è®©æŸäº›ç¬¦æ–‡çš„工作频率å˜é«˜ï¼Œæ¯”如说，转ä½ç¬¦æ–‡å’Œå……能符文。具体æ¥è¯´ï¼Œæ¯æœ‰ä¸€ä¸ªè¿™ä¸ªç¬¦æ–‡ï¼Œè·ç¦»ä¸‹ä¸€æ¬¡å·¥ä½œçš„等待时间就å‡ä¸€åˆ»ã€‚æ¢è¨€ä¹‹ï¼šå¦‚果有10å—促进符文，转ä½ç¬¦æ–‡ä¼šæ¯10刻就转移一次液体，而默认值å´æ˜¯æ¯20刻。\n\t显然，你的祭å›ä¸­åªå¯èƒ½æœ‰19/cutå—促进符文——在这ç§æƒ…况下，转ä½ç¬¦æ–‡å’Œå……能符文就会一刻ä¸åœåœ°å·¥ä½œã€‚éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸å¥½ï¼ - -guide.bloodmagic.entry.architect.tier3.info=众所周知，三级祭å›çš„结构中，四角的柱å­é¡¶éƒ¨éœ€è¦å››å—æ¥è‡ªä¸‹ç•Œçš„è§çŸ³ã€‚但有一个鲜为人知的事实：这四å—è§çŸ³å¯ä»¥ç”¨æµ·æ™¶ç¯ä»£æ›¿ã€‚如果地狱对你æ¥è¯´å¤ªè¿‡é¥è¿œï¼Œä½†ä½ å·²ç»æ‰¾åˆ°äº†æµ·æ´‹ç¥žæ®¿ï¼Œä½ å¯ä»¥é€šè¿‡è¿™ä¸ªæ–¹å¼æ¥æŽ¨è¿›ä½ çš„血魔法进程。 - -# Demon Kin Entries -guide.bloodmagic.entry.demon.intro=è´æ‹‰Â·æµ·æ³Šæ© -guide.bloodmagic.entry.demon.snare=æ¶é­”æ„志与投网 -guide.bloodmagic.entry.demon.forge=狱ç«ç†”炉 -guide.bloodmagic.entry.demon.petty=å¾®å°çš„地狱魂石 -guide.bloodmagic.entry.demon.sword=感知之剑 -guide.bloodmagic.entry.demon.lesser=å°åž‹åœ°ç‹±é­‚石 -guide.bloodmagic.entry.demon.reactions=æ„料之外的å应 -guide.bloodmagic.entry.demon.sentientGem=感知护甲 -guide.bloodmagic.entry.demon.routing=物å“路由 -guide.bloodmagic.entry.demon.aura=æ¶é­”çµåŸŸ -guide.bloodmagic.entry.demon.types=ä¸åŒç§ç±»çš„æ„å¿— -guide.bloodmagic.entry.demon.crucible=æ¶é­”å©åŸš -guide.bloodmagic.entry.demon.crystallizer=æ¶é­”ç»“æ™¶å› -guide.bloodmagic.entry.demon.cluster=æ¶é­”晶簇 -guide.bloodmagic.entry.demon.pylon=æ¶é­”导能塔 -guide.bloodmagic.entry.demon.gauge=çµåŸŸæµ‹é‡ä»ª - -# Demon Kin Entry Texts -guide.bloodmagic.entry.demon.intro.info=我的åå­—å«è´æ‹‰Â·æµ·æ³Šæ©ï¼Œä»¥æ¶é­”之å­çš„身份为人知晓。数个月å‰æˆ‘的家乡被一群æ¶é­”侵袭，其他æ‘民全部被æ€ï¼Œæˆ¿å±‹å…¨è¢«ç ´å。我无法记起袭击时的多少细节，除了我所认识的æ¯ä¸€ä¸ªï¼Œä¼´éšç€ç—›è‹¦çš„惨å«è€Œå‰å¾€ä¸€ä¸ªæ›´ç¾Žå¥½çš„世界的人们。庆幸那些æ¶é­”没有å¬åˆ°ï¼Œé‚£åœ¨ä¸å®¹æ˜“察觉的教堂的地下室里，ç•ç¼©äºŽæžœç¯®ä¸‹çš„我ç»æœ›åœ°é¿å…ç€è‡ªå·±çš„å°–å«å£°åŠ å…¥ä¼—人的åˆå£°ã€‚\n\t/cutå¯æ€•çš„瞬间，在我ä¸æ…Žæ’žå€’å ‚çš„ç†é¦™ç¥­å›æ—¶ï¼Œä¸€åªæ¶é­”çªç„¶é—¯å…¥åœ£æ‰€ï¼Œæˆ–许是这圣地的原由åˆé•‡é™ä¸‹æ¥ã€‚这是åªä½“型庞大的四足怪物，弯曲的ç ç‰™å€’悬在çªå‡ºçš„嘴上，唾液滴在带有锯齿的剑状爪å­ã€‚它环顾了四周，我å‘誓有那么一会它的眼ç›å’Œæˆ‘对上了，但之åŽå®ƒå°±è¿™ä¹ˆç¦»å¼€è¿™é‡Œï¼Œä»¿ä½›å®Œå…¨æ²¡æœ‰çœ‹åˆ°æˆ–者å¬åˆ°ä»€ä¹ˆã€‚之åŽå‘生的事记忆全都模糊ä¸æ¸…。\n\t/cut直到第二天æ‰æœ‰äººç»è¿‡çœ‹åˆ°è¿™ä¸€åˆ‡ã€‚这一商队看到远处的浓烟，决定绕一大段路好é¿å¼€è¿™äº›æ¶é­”。商队中许多人觉得我独自一人毫å‘æ— æŸåœ°ç”Ÿè¿˜å…´è®¸æ˜¯ä¸ªå兆头，有些甚至ä¸æ„¿å¤šçœ‹æˆ‘一眼。但有一对兄弟åŒæƒ…我的é­é‡ï¼Œå¹¶å°½åŠ›è¯´æœå•†é˜Ÿå…¶ä»–æˆå‘˜ä¹Ÿå¸¦ä¸Šæˆ‘。我å–掉了女祭å¸ä¹‹ä»—与一æ¡ç›’å¼æŒ‚å ï¼Œè—‰æ­¤æ¢åˆ°äº†è·Ÿç€å‰å¾€ä¸€ä¸ªè¿œç¦»æ¶é­”ç ´å路径上的一个安全æ‘庄的许å¯ã€‚ -guide.bloodmagic.entry.demon.snare.info.1=曾有一天，马格斯曾对我讲述é“，世间生çµçš†æœ‰çµé­‚：人类，鸡，羊，甚至是爬行者也存在这ç§ç»™äºˆèº¯ä½“生之æ„志的生命力é‡ã€‚似乎马格斯早已在这方é¢åšè¿‡å¤§é‡å®žéªŒï¼Œç”šè‡³æœ‰é—»ä¸€ä¸ªå¼ºå¤§çš„法师，å¯ä»¥å°†èŽ·å–这些çµé­‚并注入一个空的躯体，比如僵尸。但这也让我感到好奇：如果僵尸与骷髅并ä¸æ‹¥æœ‰çµé­‚，它们如何拥有这生的æ„志？是什么，给予他们生气，使他们会去追æ•å¹¶æ€å®³ç”Ÿçµï¼Ÿ\n\t/cutæ¯æ¯é’»ç ”最终还是回到了æ„志的问题上。任何“活物â€éƒ½å¿…须拥有使之生存下去的æ„志，但这ä¸æ„味ç€é‚£å¿…须是它们自己的。当我把这个想法告诉马格斯的时候他考虑了一会，接ç€æ‹¿å‡ºä¸€ä¸ªé»‘æ¿å’Œç²‰ç¬”（从哪？è°çŸ¥é“呢），开始速写并注上一些关于其他形å¼é­”法的注解。“在神秘学中，â€ä»–画出一åªç¨»è‰äººçš„å½¢æ€å¹¶è¯´é“，“分é…于执行许多简å•æ“作的傀儡被赋予了生气。它们活ç€ï¼Œå‘¼å¸ç€ï¼Œç”šè‡³å¯ä»¥æ­»äºŽä¸/cutå†éœ€è¦å®ƒä»¬çš„主人。几个世纪以æ¥ï¼Œä¼´éšç€ç¥žç§˜å­¦çš„进化，这门艺术已ç»æœ‰è¿‡æ•°ä¸ªç‰ˆæœ¬ï¼Œæ³•å¸ˆä¼šå°†ä»–们的æ„志注入那无生命的创造物中，给他们带æ¥ç”Ÿæ°”。\n\t“那么，è´æ‹‰ï¼Œå‚€å„¡æ˜¯å¦‚何è¿ä½œçš„呢：通过æ„å¿—çš„çŒè¾“。â€\n\t所以如果å¯ä»¥é€šè¿‡ä»–人将其æ„志注入一个空壳å¯ä»¥ä½¿å‚€å„¡èŽ·å¾—生命，那么就有å¯èƒ½æœ‰ä»€ä¹ˆæŠŠä»–们的æ„志注入亡者/cut的躯体，使得有了僵尸和骷髅的存在。想到这我打了个哆嗦，脑中闪过故乡的é­é‡ã€‚åªæœ‰æ¶é­”会åšåˆ°è¿™ä¹ˆæ®‹å¿çš„事。但è¦æ£€éªŒè¿™ä¸ªå‡è®¾ï¼Œæˆ‘需è¦æ›´å¤šè¯æ®ã€‚ -guide.bloodmagic.entry.demon.snare.info.2=在马格斯的指引，和æ比略百忙之中抽出时间为我æ供的帮助下，我用é“ã€çº¿å’Œä¸€ç‚¹çº¢çŸ³ä¾¿åšå‡ºäº†åŽŸå§‹æŠ•ç½‘。身兼神秘使的æ比略说这玩æ„å¯ä»¥åˆ‡æ–­æŽ§åˆ¶ç”Ÿç‰©çš„æ„志。“我拿这玩æ„在傀儡上瞎æžâ€ï¼Œä»–带ç€å¾®ç¬‘这样说é“。我们都知é“结果是什么样的。\n\t“红石似乎切断了我的æ„志和傀儡之间的è”系。ç†è®ºä¸Šæ¥è¯´ï¼Œå¦‚果僵尸和骷髅身上也有æ„志，那这投网也å¯ä»¥åˆ‡æ–­ã€‚â€\n\t/cut他说我åªéœ€è¦çž„准目标把投网丢过去就å¯ä»¥â€”—如果å¥æ•ˆï¼Œæˆ‘就能在目标生物上看到一些白色的颗粒。“然åŽä½ éœ€è¦æŠŠé‚£ä¸ªå¯æ€œçš„目标æ€æ­»æ‰èƒ½çœ‹åˆ°çœŸç›¸ã€‚但记ä½ï¼Œå¤§æ¦‚åªæœ‰å››åˆ†ä¹‹ä¸€çš„投网会对目标有效果。所以记得多备一些ï¼â€\n\t我制作了å六个投网，然åŽæˆ‘选择在深夜出å‘。事实上，这项工作相当棘手：è¦åŒæ—¶è¿½è¸ªå‡ ä¸ªåƒµå°¸ï¼Œè¿˜è¦é—ªé¿å®ƒä»¬çš„é‡å‡»ï¼Œè¿˜è¦çž„准它们丢出投网。/cut当我看到白色的颗粒时，我迅速将僵尸们悉数斩æ€ï¼Œå¹¶æ¸…点了它们留下的物å“。沙地上一些è“色的粘稠液体å¸å¼•äº†æˆ‘的注æ„。我æ¡èµ·æ¥çœ‹äº†ä¸€ä¸‹ï¼Œè¿™ä¼¼ä¹Žæ˜¯ä¸€ç§è¶…凡脱俗的存在...在快速收集好样本åŽæˆ‘决定先返回å†ä½œè¿›ä¸€æ­¥ç ”究。\n\tæ¯ä¸€ä»½æ”¶é›†åˆ°çš„“æ¶é­”æ„å¿—â€çš„形状和大å°éƒ½ä¸å°½ç›¸åŒï¼Œä¼¼ä¹Žå–决于它们的æ¥æºã€‚抛开å•ä½ä¸è°ˆï¼Œåªåšç²—略的定/cuté‡åˆ†æžçš„è¯ï¼Œå®ƒä»¬çš„å“è´¨å¯ä»¥æŒ‰0到5æ¥åˆ’分。我并ä¸æ˜¯å¾ˆæ¸…楚这些物质å¯ä»¥ç”¨æ¥å¹²ä»€ä¹ˆï¼Œä½†æ¯«æ— ç–‘问它们引起了我的注æ„。我也ä¸æ˜¯å¾ˆæ¸…楚这究竟是æ¶é­”çš„å°è®°ï¼ŒæŠ‘或仅是它们身上掉è½çš„æŸç§æ™¶ä½“。我需è¦è¿›ä¸€æ­¥çš„研究。 -guide.bloodmagic.entry.demon.forge.info.1=我已在æ¶é­”æ„志上投入了数星期的时间。虽然有所进展，但情况ä¾æ—§æ—¶å¥½æ—¶å。但有一天，æ比略问我能å¦å€Ÿç”¨ä¸€ç‚¹æ¶é­”æ„å¿—æ¥åšå®žéªŒï¼›ä»–解释说，这很有å¯èƒ½æ˜¯ä»–一直在寻找的新一代血之祭å›çš„æ料——马格斯原本的祭å›å·²ç»ç ´æ—§ä¸å ªï¼Œä½†æŒ‰å¤æ³•åˆ¶ä½œçš„祭å›å´æ€Žä¹ˆä¹Ÿæ— æ³•ä½¿ç”¨...总而言之，他觉得我能帮上忙。\n\t事实è¯æ˜Žä»–是对的。我查阅了很多讨论“等价交æ¢â€ä»¥åŠ/cut物质嬗å˜çš„炼金术书ç±ï¼›åŒæ—¶æˆ‘还咨询了一些途ç»æˆ‘们这里的炼金术师，他们也慷慨地给了我一些解构物质和能é‡çš„方法，以便进行深入研究。（啊，我必须承认我å分喜欢那些炼金术师的暗紫色盔甲——区区看一眼就会让人感觉è¦è¢«ä¸€ä¸ªè´¨é‡å·¨å¤§çš„东西拉过去一样。啊我没在说æ比略ï¼ï¼‰æˆ‘利用仅有的简易炼金阵列以åŠæžå°‘é‡æ ·æœ¬ä¾¿æˆåŠŸä»Žæ¶é­”æ„志中抽å–到了能é‡ã€‚剩下的事情就åªæœ‰åˆé€‚的构造了。 -guide.bloodmagic.entry.demon.forge.info.2=就在今天，我æˆåŠŸåˆ¶æˆäº†ä¸€ç§å¯å°†åŽŸç”Ÿæ„志注入物å“中的结构。我现在管这个东西å«â€œç‹±ç«ç†”炉â€ï¼Œå®žé™…上它åªæ˜¯ä¸ªé•¶å…¥çŽ»ç’ƒé¡¶å±‚中的简易炼金术阵列，å¯æœ€å¤šåŒæ—¶å°†å››ä¸ªç‰©å“和原生æ„å¿—èžåˆäºŽä¸€ä½“。æ¶é­”æ„志需è¦æ”¾åœ¨å³æ‰‹è¾¹ï¼Œæ˜¾è€Œæ˜“è§çš„圆圈则是为物å“准备的。目å‰æ¥è¯´æˆ‘已掌æ¡äº†è‹¥å¹²ç§â€œé…æ–¹â€ï¼Œä½†ä½¿ç”¨è¿™ç‚‰å­ä»ç„¶æœ‰ä¸€äº›è¦æ±‚。\n\t对于åˆæ¬¡ä½¿ç”¨ç‹±ç«ç†”炉的人/cutæ¥è¯´ï¼Œä»–们需è¦æ³¨æ„一些事情：一，物å“èžåˆéœ€è¦æ供一定数é‡çš„æ¶é­”æ„志，如果数é‡ä¸å¤Ÿï¼Œä»€ä¹ˆäº‹éƒ½ä¸ä¼šå‘生；二，å‰é¢è¯´åˆ°ç‰©å“èžåˆéœ€è¦æ供一定数é‡çš„æ¶é­”æ„志，但大部分é…方实际都消耗ä¸äº†é‚£ä¹ˆå¤šï¼›ä¸‰ï¼Œæœ‰äº›ç‰©å“çš„èžåˆéœ€è¦å¤§é‡æ„å¿—æ¥å¯åŠ¨ï¼Œä½†å´æ¶ˆè€—ä¸äº†å¤šå°‘，甚至根本ä¸æ¶ˆè€—；四，有些é…方的产é‡å·¨å¤§ï¼Œæœ‰äº›...并ä¸æ€Žä¹ˆé«˜ã€‚ -guide.bloodmagic.entry.demon.petty.info.1=åˆæ˜¯æ–°ä¸€ä¸ªå¤œæ™šï¼Œæˆ‘åˆå¼€å§‹äº†æ—¥å¸¸çš„收割工作。但是很快我æ„识到了一个问题：我的背包æ¯å¤©éƒ½ä¼šè¢«å„ç§æ ·æœ¬å¡žæ»¡ï¼åŽŸå› ä¸æ˜¯å¾ˆæ¸…楚，也许是因为æ¯ä»½æ ·æœ¬çš„最终æ¥æºéƒ½ä¸ä¸€æ ·ï¼Œå› æ­¤æ— æ³•åŽ‹ç¼©åœ¨ä¸€èµ·å§ã€‚至少，从它们物ç†è¡¨çŽ°å½¢å¼æ¥è¯´æ˜¯è¿™æ ·çš„。\n\t也因此我åˆå›žåˆ°äº†è¢«ä¸¢åœ¨å±‹å­ä¸€è§’的狱ç«ç†”炉æ—开始为我的实验准备æ料，将æ比略的那些令人窒æ¯çš„实验抛之/cutè„‘åŽã€‚我这几天在为æ比略准备他的熔炉，因为我已ç»æ”¾å¼ƒæŠµæŠ—那些因为他的“奥法实验â€è€Œäº§ç”Ÿçš„，笼罩在我的工作室里的粉ç°äº†ã€‚我管你是ä¸æ˜¯åœ¨â€œå¡«è¡¥çµé­‚网络那无形的网状结构与石æ¿çš„物ç†ç»“构的空白â€ï¼Œèµ¶å¿«è®©ä½ é‚£äº›å¤©æ€çš„ä¸œè¥¿æ»šå‡ºåŽ»ï¼ -guide.bloodmagic.entry.demon.petty.info.2=ä¸è®ºå¦‚何，寻找åˆé€‚的存储æ¶é­”æ„å¿—çš„æ料的确费了我一番功夫。é’金石似乎是一ç§å¾ˆå®¹æ˜“就能找到的能é‡å¯¼ä½“，å¯ä»¥å……当传导æ„志的通é“。然åŽæˆ‘为了é¿å…空气中的电场的影å“，加了一层红石充当“护盾â€ï¼ˆè‡³å°‘，马格斯说过，将两ç§èƒ½é‡æ··åœ¨ä¸€èµ·ä¼šäº§ç”Ÿç¾éš¾æ€§åŽæžœï¼‰ï¼›ç„¶åŽåŠ ä¸Šä¸€äº›é»„金充当抑性剂；并以玻璃制æˆå¤–壳。最终我得到了一å—“地狱魂石â€ã€‚这个åå­—çš„å«ä¹‰ä¾¿æ˜¯â€œæ¥è‡ªåœ°ä¸‹ä¸–界——塔尔塔罗斯 (ΤάÏταÏος, Tartarus) ——的å®çŸ³â€ã€‚\n\tç»è¿‡è¿‘一步测试，我å‘现这个å®çŸ³çš„容é‡æ˜¯64。（当我把这个结果拿给马格斯看时，他觉得这个数字是个å分完美的整数。）这样，我å†è¯•å›¾æ¡èµ·æ¶é­”æ„志时它就å¯ä»¥è‡ªåŠ¨å°†å…¶æ”¶é›†èµ·æ¥äº†ã€‚但...这样一æ¥æ„志它本身似乎就消失了。在拯救了我的背包的åŒæ—¶ä¹Ÿç»™æˆ‘带æ¥äº†æ–°çš„谜团呢。åŒæ—¶æˆ‘还å‘现，若是我手æŒå®çŸ³å¹¶å°†ç²¾ç¥žé›†ä¸­äºŽæ­¤ï¼ˆå³å‡»ï¼‰ï¼Œçº¦æœ‰/cut容é‡ä¸Šé™å分之一的æ„志就会æµå…¥æˆ‘身上的å¦ä¸€ä¸ªå®çŸ³ä¸­ã€‚我觉得这个性质会在我得到更强大的地狱魂石åŽå¤§æ˜¾èº«æ‰‹ã€‚ -guide.bloodmagic.entry.demon.sword.info.1=我的网åˆå‡ºé—®é¢˜äº†ã€‚\n\tä¸è®ºæˆ‘怎么努力改进，这投网似乎就是ä¸èƒ½å®Œç¾Žå·¥ä½œã€‚多数时候会打结。但å³ä¾¿æˆ‘æˆåŠŸæŠ•ä¸­äº†åƒµå°¸ï¼Œå®ƒè¿˜æ˜¯æœ‰å¾ˆé«˜æ¦‚率ä¸å·¥ä½œã€‚为了é¿å…自己的头å‘被网缠ä½çš„命è¿ï¼Œæˆ‘决定立刻回到我的狱ç«ç†”炉æ—开工。\n\t但，并éžç«‹åˆ»å¼€å·¥â€”—我首先得清ç†ä¸‹ä¸Šé¢çš„ç°å°˜ã€‚ -guide.bloodmagic.entry.demon.sword.info.2=我将那微å°çš„地狱魂石存储æ¶é­”æ„志的能力æˆåŠŸæ³¨å…¥åˆ°äº†é“剑里，并得到了一柄...伤害比我的拳头还低的剑。我对这个结果感到å分失望，因为我为了让以地狱魂石驱动的炼狱熔炉ä¸è¿‡çƒ­è€Œåœ¨ä¸€æ—摆弄了很久很久。\n\t然而，当我å†æ¬¡æ‹¿èµ·åœ°ç‹±é­‚石时，剑开始散å‘出了一ç§æ–°çš„能é‡ã€‚似乎，我身上的æ¶é­”æ„志越多，剑的伤害也就越高，获得的æ¶é­”æ„志也就越多；倘若/cut没有地狱魂石...这剑就如åŒåºŸé“一般。\n\tç»è¿‡æµ‹è¯•æˆ‘åˆå‘现了一件事：击æ€ä¸åŒçš„目标获得的æ„å¿—æ•°é‡ä¸ä¸€æ ·ã€‚具体的数é‡å’Œç›®æ ‡ç”Ÿç‰©çš„生命上é™æˆæ­£æ¯”——以蜘蛛为例，它最多åªæœ‰8颗心，因此æ€æ­»èœ˜è››èƒ½èŽ·å¾—çš„æ„å¿—æ•°é‡ä¾¿æ˜¯åƒµå°¸çš„百分之八å，因为僵尸最多有å颗心。或许是因为生命越多的生物动起æ¥æ—¶éœ€è¦çš„æ„志越多å§ã€‚我觉得这个事情得好好记ä½ï¼Œä»¥å¤‡ä¸æ—¶ä¹‹éœ€ã€‚ -guide.bloodmagic.entry.demon.lesser.info.1=今天在和æ比略èŠå¤©ï¼ŒèŠåˆ°äº†æœ€è¿‘他的一些工程。ä¸å¾—ä¸æ‰¿è®¤ï¼Œä¸€æ—¦è¯´èµ·ä»–的研究，他就会说个没完没了ï¼ä¸ç®¡äº†ã€‚æ比略说他最近一直在研究å°è®°ï¼Œç›®å‰ä»–å·²ç»åˆ©ç”¨æˆ‘给他造的狱ç«ç†”炉æˆåŠŸåˆ¶æˆäº†æ°´ä¹‹å°è®°å’Œç†”岩å°è®°ã€‚我ä¸æ˜¯å¾ˆæ¸…楚他是怎么åšçš„——我åªçŸ¥é“他以地狱魂石作为催化剂，将多ç§æ料在熔炉中炼æˆå°è®°ï¼Œä½†æˆ‘没亲眼目ç¹è¿‡ä»–的实验过程。ä¸è¿‡æˆ‘今天总算知é“了他那漫天飞舞的ç°å°˜æ˜¯/cut怎么回事。\n\t我æ¥è¯•ç€æŒ‰ä»–çš„æ–¹å¼å¤è¿°ä¸€ä¸‹ã€‚呃，“利用魂石中的æ„å¿—æ¥å¬—å˜å¹³æ—¶æ ¹æœ¬ä¸ä¼šå应的若干原料时，å‘生了å应。利用这ç§å¢žå¹…效应，我便å¯ä»¥åˆ»å‡ºæˆ‘所需è¦çš„铭文，以引导能é‡çš„æµåŠ¨ï¼Œä»Žè€Œå®Œæˆæˆ‘需è¦å®Œæˆçš„工作。â€è™½è¯´ç™½çº¸é»‘字难以想象，但我扶了扶眼镜åŽé‡æ–°å›žæƒ³èµ·äº†å½“时的景象...我ä¸ç¡®å®šä»–是ä¸æ˜¯å¹³æ—¶ä¹Ÿè¿™æ ·ï¼Œä½†æˆ‘å‘誓，一旦跟我解释东西，他就会å˜æˆ...科学家。\n\t/cutä¸è®ºå¦‚何，他为我展示了水之å°è®°çš„制作方å¼ã€‚在电光ç«çŸ³èˆ¬çš„演示åŽï¼Œä»–终于进入了正题。“我在试图用更高级的ææ–™é‡å¤ç›¸åŒçš„过程，但å应物似乎总会在我放进去的一瞬间...爆炸。看上去很ä¸ç¨³å®šã€‚我觉得是因为他们没有正确地èžåˆåœ¨ä¸€èµ·â€”—或许是能é‡ä¸å¤Ÿå§ã€‚â€\n\t我在æ€ç´¢äº†å‡ åˆ†é’ŸåŽä¾¿å¼€å§‹äº†å·¥ä½œâ€”—正如å‰æ–‡æ‰€è¯´ï¼Œæˆ‘觉得我会需è¦æ›´å¼ºå¤§çš„地狱魂/cut石的，但我ä»ç„¶åœ¨æ€è€ƒå¦‚何以优雅的方å¼å®Œæˆè¿™ä¸ªå·¥ä½œã€‚æ‰€ä»¥ï¼Œæˆ‘å†³å®šï¼šè¯‰è¯¸æš´åŠ›ï¼ -guide.bloodmagic.entry.demon.lesser.info.2=我找æ¥ä¸€æ•´å—é’金石ã€ä¸€æ•´å—红石ã€ä¸€é¢—钻石ã€ä»¥åŠä¸€å—空的地狱魂石——啊这å—魂石是我在地上å‘现的，应该是以å‰æŸä¸ªè¿›å±•ä¸é¡ºçš„实验中用的。我åªè®°å¾—马格斯å¯ä»¥è®©æ°´æ³¥å¢™ä¸Šçš„洞瞬间消失。然åŽæˆ‘将这四个物å“放入狱ç«ç†”炉，并以一å—满的地狱魂石供能——最终结果显示我需è¦è‡³å°‘大约60点æ„志。ç»è¿‡ä¸€ç³»åˆ—优化，我终于确定了é…方，并开始观察生长中的地狱魂石。\n\t/cutå¦å¤–还有一点，我试过用金å—代替钻石，但结果似乎åªè¯´æ˜Žå¦ä¸€ç§æ°´æ™¶ç»“构更有用。\n\t最终，我得到了全新的“å°åž‹åœ°ç‹±é­‚石â€ï¼Œå®ƒæ‹¥æœ‰256点容é‡ï¼Œæ¯”å¾®å°çš„地狱魂石大多了。希望这颗新魂石å¯ä»¥æ»¡è¶³æ比略的需求å§ã€‚哎呀这玩æ„的容é‡è¿™ä¹ˆé«˜ä¸å°±æ„味ç€æˆ‘得花更多时间æ¥æ”¶é›†æ¶é­”æ„å¿—å—？啊ï¼åˆæ˜¯ä¸€ä¸ªæ¼«æ¼«é•¿å¤œ...ï¼ -guide.bloodmagic.entry.demon.reactions.info=我今天一早醒æ¥å‘现自己躺在医院的病床上，身上有什么东西疼痛欲裂。我çå¼€åŒçœ¼ï¼Œå´çœ‹åˆ°äº†æ»¡çœ¼çš„暗洋红色——那是，Veteres——è·ç¦»æˆ‘们æ‘庄最近的大城市——的一家医院的天花æ¿ã€‚我对现在的环境倒ä¸æ˜¯æ€Žä¹ˆå¥‡æ€ªï¼Œå› ä¸ºæˆ‘的目光è½åœ¨äº†ä¸€å¤§ç‰‡æ“¦ä¼¤å’Œæ·¤é’上，以åŠæˆ‘左腿上的石è†...什么人肯定对我下了å为"Ossa-Fracta"的诅咒——因为那åªèƒ½æ˜¯æ ¹å掉的骨头ï¼\n\t/cut当马格斯和一å紧绷ç€è„¸çš„护士走进æ¥çš„时候，我就立刻明白了：我é­é‡çš„事情比想象中的还严é‡ã€‚显然，我针对新制的å°åž‹åœ°ç‹±é­‚石的实验å‘生了å弹并引起了爆炸，虽然规模ä¸å¤§ï¼Œä½†ä»æœ‰æ€ä¼¤åŠ›ã€‚ä¸è¿‡æˆ‘也就åªèƒ½æƒ³åˆ°è¿™ç‚¹äº‹æƒ…了：我左å°è…¿ä¸Šè¦†ç›–的黑曜石ã€é“和钻石制æˆçš„护甲，现在å˜æˆäº†æŸç§å®Œå…¨æ— æ³•æ‹†é™¤çš„护甲——更准确地说，是æŸç§æ·¡è“的，类似符文矩阵的魔法护甲。\n\t/cut我冷é™ä¸‹æ¥ï¼Œå¹¶é—®é©¬æ ¼æ–¯æ€Žä¹ˆçœ‹ï¼Œè™½ç„¶æˆ‘已然知é“å‘生了什么。“我觉得å§ï¼Œâ€ï¼Œä»–说，并在认真è†å¬çš„护士看我之å‰çž¥äº†æŠ¤å£«ä¸€çœ¼ï¼Œâ€œé‚£æ˜¯æŸç§é’»çŸ³æ®‹ç•™ç‰©ï¼Œè¿™ä¹Ÿæ˜¯ä¸ºä»€ä¹ˆæˆ‘们没办法拆掉它的原因。åŒæ—¶ï¼Œå®ƒè¿˜è¢«æŸç§...异域的能é‡æŸç¼šç€ï¼Œè¿™ä¹Ÿæ˜¯ä¸ºä»€ä¹ˆä½ çŽ°åœ¨ä¼šèººåœ¨è¿™é‡Œï¼Œè€Œä¸æ˜¯å½“地诊所，的原因——共èšä¼šè‡ªä»Žä¸Šæ¬¡é‚ªæœ¯äº‹ä»¶ä»¥æ¥å°±ä¸€ç›´å¯¹è¢­å‡»äººç±»çš„ä¸æ˜Žèƒ½é‡é«˜åº¦é‡è§†ï¼Œæˆ‘们必须ä¿è¯ä¸æ‹›æƒ¹æ˜¯éžã€‚â€\n\t/cut“我知é“了...â€å¹³æ—¥é‡Œï¼Œé©¬æ ¼æ–¯æ˜¯ä¸ä¼šåŽ»æ“心诸如就未知能é‡äº‹ä»¶ç…§ä¼šå…±èšä¼šè¿™ç§æ­£å¼çš„事情的——我已ç»ç€æ‰‹ç ”究æ¶é­”æ„志多时了，也ä¸è§å…±èšä¼šä¸Šé—¨æ¥ä¸ºæ–°çš„魔法能é‡åŠžç›¸å…³æ‰‹ç»­ã€‚我对政治ä¸æ„Ÿå…´è¶£ï¼Œæˆ‘也ä¸æ‰“ç®—é€éœ²å¤ªå¤šæ¶ˆæ¯ï¼Œä½†æˆ‘知é“马格斯对此事éžå¸¸è°¨æ…Žâ€”—这æ„味ç€ï¼Œåœ¨æŽ¥ä¸‹æ¥ä¸€æ®µæ—¶é—´å†…，马格斯都会为这æ„志所蕴å«çš„能é‡æ‹…忧，说ä¸å®šè¿˜ä¼šç‰µæ‰¯å‡ºé™ˆå¹´æ—§è´¦ä¹Ÿè¯´ä¸å®š...？\n\/cut“够了，è¯é¢˜åˆ°æ­¤ä¸ºæ­¢ï¼Œâ€é©¬æ ¼æ–¯è¯´ç½¢ä¾¿æŠ«ä¸Šäº†ä»–çš„é•¿è¢ï¼Œâ€œæˆ‘原本打算一开始就将之公之于众的，但那时它的å¨åŠ›è¿˜ä¸æ˜Žæ˜¾ï¼Œä½†çŽ°åœ¨...â€\n\t我感å—到左腿有一股热浪，就åƒè¦æŠŠæˆ‘的腿烧起æ¥ä¸€æ ·ï¼ŒåŒæ—¶ä¸ºçœ‹åˆ°é©¬æ ¼æ–¯æ§æˆæ¯çŠ¶çš„手盖在了è“色的壳上，散å‘出耀眼的红光。几秒钟åŽâ€”—虽然我感觉这åƒæ˜¯ç»è¿‡äº†æ°¸æ’的时间——壳开始碎裂并脱è½ã€‚说实è¯è¿™ä¸ªç»“局有些令人扫兴。\n\t/cut我试图起身，但马格斯一把把我按回床上：“è´æ‹‰ï¼Œä½ éœ€è¦ä¼‘æ¯ã€‚魂石的事情å¯ä»¥å…ˆæ”¾ä¸€æ”¾ã€‚â€å¯¹æ­¤ï¼Œä¸€å¼€å§‹æˆ‘是拒ç»çš„，但我åŽæ¥è½¬è€Œå¼€å§‹æ€è€ƒè¿™æ¬¡äº‹æ•…。马格斯ä¸æ—©ç‚¹è¿™ä¹ˆåšçš„ç†ç”±åªèƒ½æ˜¯åœ°ç‹±é­‚石在爆炸åŽä»ç•™åœ¨æˆ‘身上。æ¢è¨€ä¹‹ï¼Œæˆ‘腿上ä¸è®ºå‘生什么，都和æ¶é­”æ„志有关；åªè¦æ‹¿åŽ»é­‚石，那层壳也就能被移除。我开始了沉æ€... -guide.bloodmagic.entry.demon.sentientGem.info.1=几天åŽï¼Œé©¬æ ¼æ–¯å¼ºåˆ¶æ‰§è¡Œçš„“休养生æ¯â€ç»“æŸäº†ã€‚我决定在我现有的基础上继续研究感知护甲。然而，还有很多关于感知之剑和æ¶é­”æ„志的疑问没有解答。诚然，我们有一些ç†è®ºä¸Šçš„猜想，但毕竟是马格斯和我æ出的ç†è®ºï¼Œæˆ‘们也ä¸çŸ¥é“究竟有多准确。\n\t为此我需è¦ä¸€ç‚¹å¤§èƒ†çš„设想。马格斯告诉我说，我们在学习血之魔法时，也有必è¦å­¦ä¹ å¦ä¸€é—¨é­”法的艺术。æ比略/cut建议我去学习花之魔法，但我对此嗤之以鼻——“一堆花也能帮我击退æ¶é­”？ï¼â€ -guide.bloodmagic.entry.demon.sentientGem.info.2=感知护甲å®çŸ³æ˜¯å—å¯ä»¥è®©ä½ ç©¿å¸æ„ŸçŸ¥æŠ¤ç”²çš„工具。确ä¿èº«ä¸Šæœ‰16点æ¶é­”æ„志，使用这å—å®çŸ³ï¼ˆå³å‡»ï¼‰ï¼Œä¾¿ä¼šå°†ä½ èº«ä¸Šçš„护甲悉数替æ¢æˆä¸€å¥—全新的感知护甲，åŒæ—¶è¿˜ä¼šç»§æ‰¿ä½ æœ¬æ¥æŠ¤ç”²ä¸Šçš„附魔效果；å†æ¬¡ä½¿ç”¨è¿™å—å®çŸ³å°±å¯ä»¥è„±ä¸‹æ„ŸçŸ¥æŠ¤ç”²å¹¶æ¢å›žä½ æœ¬æ¥çš„护甲。当然，å³ä¾¿ä½ èº«ä¸Šæ²¡æœ‰æŠ¤ç”²ï¼Œè¿™å—å®çŸ³ä¹Ÿæ˜¯å¯ä»¥ç”¨çš„。\n\t感知护甲的效果一般与普通é“护甲无异，除此之外没有别/cut的效果。但，和感知工具一样，当你身上æŒæœ‰æ¶é­”æ„志时，感知护甲的ä¿æŠ¤èƒ½åŠ›å°±ä¼šä¸Šå‡ï¼Œä¸Šå‡å¹…度与æ„å¿—æ•°é‡æˆæ­£æ¯”。也正是因为此，当你身上有海é‡æ¶é­”æ„志时它的ä¿æŠ¤èƒ½åŠ›å°±ä¼šå˜å¾—å分强大。但有一点需è¦æ³¨æ„，就是你æ¯å—到一次伤害，都会消耗地狱魂石中的æ¶é­”æ„志，如果æ„å¿—æ•°é‡å¤ªä½Žï¼Œæ„ŸçŸ¥æŠ¤ç”²å°±å¯èƒ½ä¼šè¢«æ‰“回原形。说ä¸å®šæ˜¯ä¸ªå¼±ç‚¹å‘¢ï¼ -guide.bloodmagic.entry.demon.routing.info=血魔法的物å“ä¼ é€æ˜¯ä»¥æ¶é­”æ„志编织æˆçš„网的形å¼å‡ºçŽ°çš„，整张网构æˆäº†ç‰©å“传输的通路，连接ç€æ¯ä¸€ä¸ªå‚¨å­˜ç‚¹ã€‚让我æ¥å…ˆè®²è§£ä¸€ä¸‹æ¯ä¸€ä¸ªç‰©å“都是干什么的。\n\tæ¯ä¸€ä¸ªè·¯ç”±ç³»ç»Ÿéƒ½æœ‰ä¸€ä¸ªä¸»æŽ§è·¯ç”±èŠ‚点，相当于整个系统的中枢。输入节点用于将物å“输入路由网络，输出节点将物å“从网络中æå–出æ¥ï¼Œè€Œæ ‡å‡†çš„路由节点没有任何特殊功能。\n\t/cut网络的æ­å»ºæ–¹æ³•å¦‚下：首先，你需è¦åœ¨æ½œè¡Œæ—¶æ‰‹æŒèŠ‚点连接工具å³å‡»ä¸€ä¸ªèŠ‚点，然åŽä»¥åŒæ ·çš„方法å³å‡»å¦ä¸€ä¸ªä½ æƒ³ä¸Žä¹‹è¿žæŽ¥çš„节点。åªè¦ä¸¤ä¸ªèŠ‚点之间能找到æŸç§é€šè·¯ï¼ŒæŠ‘或都连接在主节点上，它们就å¯ä»¥äº’相“通信â€ã€‚\n\t物å“路由第一原则：物å“总是从最近的输入节点进入网络，从最近的输出节点离开网络。你需è¦ç­›é€‰å™¨æ¥é™åˆ¶ç‰©å“çš„æµå‘。在节点的æ“作界é¢/cut上有一个按钮å¯ä»¥è®©ä½ è¿›è¡Œè¿‡æ»¤è®¾ç½®ï¼Œå¯ä»¥ç²¾ç¡®åˆ°é¢ï¼ˆç•Œé¢ä¸­çš„N指北方，以此类推）。最左边的格å­è¿˜å¯ä»¥æŒ‡å®šç‰©å“æ•°é‡å’Œç§ç±»ã€‚对于输入节点æ¥è¯´ï¼Œç­›é€‰å™¨çš„存在会使它们åªæå–筛选器指定的物å“；如果你指定了数é‡ï¼Œå®ƒä»¬è¿˜ä¼šç•™ä¸‹æŒ‡å®šæ•°é‡çš„物å“，而éžå…¨éƒ¨æå–出æ¥ã€‚对于输出节点æ¥è¯´ï¼Œç­›é€‰å™¨åˆ™è®©å®ƒä»¬åªæŽ¥å—并输出指定的物å“；如果你指定了数é‡ï¼Œé‚£ä¹ˆå®ƒä»¬æœ€å¤šåªä¼šè¾“出那么多物å“。\n\t/cut有四ç§ä¸åŒç±»åž‹çš„筛选器：\n\t精确匹é…——物å“çš„NBT和元数æ®å¿…须完全匹é…。\n\t按模组匹é…——若物å“æ¥è‡ªæŒ‡å®šMod则匹é…æˆåŠŸã€‚\n\t忽略NBT——筛选器ä¸æ¯”较NBT标签。\n\t矿物字典——若物å“带有相åŒçŸ¿ç‰©å­—å…¸æ¡ç›®åˆ™åŒ¹é…æˆåŠŸã€‚\n\t/cut在将筛选器放入路由节点åŽï¼Œä½ å¯ä»¥åœ¨è·¯ç”±èŠ‚点上看到两个数字：数é‡å’Œä¼˜å…ˆçº§ã€‚点击筛选器中的任何物å“åŽå³å¯çœ‹åˆ°å…¶å字，正下方则会显示数é‡ã€‚如å‰æ–‡æ‰€è¿°ï¼Œè¿™ä¾¿æ˜¯æŒ‡å®šæ•°é‡çš„地方了。若你将数é‡è®¾å®šä¸º0，那么就æ„味ç€â€œæ‰€æœ‰â€â€”—对于输入节点æ¥è¯´ï¼Œé‚£å°±æ˜¯æŠ½å–所有物å“；对于输出节点æ¥è¯´ï¼Œå°±æ˜¯æ供所有物å“。\n\t第二个数字便是优先级，å¯ç”¨ä¸€æ—的箭头调整。数字越å°ï¼Œ/cut优先级越高，物å“将会首先试图å‰å¾€ä¼˜å…ˆçº§é«˜çš„节点。 -guide.bloodmagic.entry.demon.aura.info=生物被æ€æ­»åŽï¼Œå…¶çµé­‚会日æ¸æ¶ˆé€€ï¼Œæœ€ç»ˆå›žå½’创世之神。使用投网，å¯ä»¥å°†å…¶æŸç¼šäºŽçŽ°ä¸–，但也有一些难度。我们现在，出于ç§ç§ç†ç”±ï¼Œå¯¹è¿™äº›æ„志加以干扰并冻结其一切活性。若我们燃烧æ„志，它就会回归虚无。但若是我们直接将æ„志释放到空气中，我们便å¯ä»¥ä»¥æ›´çµæ´»çš„æ–¹å¼é©¾é©­è¿™è‚¡åŠ›é‡ã€‚有些方å¼å分普通，而有些方å¼åˆ™æ˜¾å¾—å分强大。\n\t在将æ¶é­”æ„志释放到空气中/cutåŽï¼Œå®ƒä¼šä¸€ç›´å¾…在释放出æ¥çš„那片土地上（å³ï¼Œé‚£ä¸ªåŒºå—），ä¸ä¼šè½»æ˜“离开。æ¯ä¸€ç‰‡åœŸåœ°ä¸Šçš„ä¸åŒç§ç±»çš„æ„志（关于æ„å¿—çš„ç§ç±»ï¼ŒåŽæ–‡æœ‰è¯¦è¿°ï¼‰äº’ä¸å½±å“。这些æ„志的存在还å¯ä»¥ç”¨å…¶ä»–çš„æ–¹å—和物å“æ¥è°ƒæ•´ã€‚ -guide.bloodmagic.entry.demon.types.info=到目å‰ä¸ºæ­¢ï¼Œæ¯å½“我们讨论æ¶é­”æ„志时，都是讨论的原生æ„志。这也就æ„味ç€è¿™æ˜¯å¤©ç„¶çš„æ„志，但这并ä¸ç­‰äºŽå®ƒæ˜¯çº¯çš„。事实上，æ¶é­”æ„志有若干类型；除开原生æ„志，还有è…蚀ã€ç ´åã€å¤ä»‡ä»¥åŠåšæ¯…å››ç§æ„志。原生æ„志实质是这四ç§æ„å¿—çš„æ··åˆç‰©ï¼Œä¹Ÿè®¸è¿˜æœ‰ä¸€äº›è‡³ä»Šæ²¡æœ‰è¯†åˆ«çš„æ„志，但有一点å¯ä»¥ç¡®å®šï¼Œå³åˆ†ç¦»åŽçš„æ„志很难å†èžåˆä¸ºä¸€ä½“。\n\tå››ç§ä¸åŒçš„æ„志的真正æ¥æº/cut至今ä»ç„¶ä¸æ˜Žï¼Œä½†æˆ‘们已ç»æŽŒæ¡äº†äº§ç”Ÿè¿™å››ç§æ„志的方法。将æ„志释放到空气中åŽï¼Œç›¸åŒç§ç±»çš„æ„志就会开始èšé›†åœ¨ä¸€èµ·ã€‚æ®æ­¤ï¼Œåªéœ€è¦æœ‰ä¸€ç§å¯ä»¥æ”¶é›†ç‰¹å®šç§ç±»æ„志的设备就å¯ä»¥å®Œæˆä»»åŠ¡äº†ã€‚接下æ¥çš„几个章节中将会讲述其中一ç§è®¾å¤‡â€”—æ¶é­”结晶å›ã€‚\n\tå››ç§æ„志代表了人的四ç§æ¬²æœ›ã€‚当然我们ä»ç„¶å¯ä»¥å‡å®šå­˜åœ¨æ›´å¤šç§æ„志，但也许它们/cut的纯度还ä¸å¤Ÿï¼Œä¹Ÿè®¸æ ¹æœ¬ä¸èƒ½å­˜åœ¨ï¼Œæ€»è€Œè¨€ä¹‹æˆ‘们目å‰è¿˜æ²¡å‘现新的æ„å¿—ç§ç±»ã€‚\n\tè…蚀——代表了通过å„ç§æ–¹å¼â€”—酸液ã€è›®åŠ›ã€ç­‰ç­‰â€”—破å万物的欲望。掌æ¡äº†è¿™ç§åŠ›é‡çš„人，将能自由地驱使å„ç§ç–¾ç—…（æ¢è¨€ä¹‹ï¼Œå„ç§è´Ÿé¢æ•ˆæžœï¼‰çš„力é‡ï¼Œå¹¶ä»¤è‡ªèº«å…å—剧毒的侵蚀。\n\tæ¶æ„——å¯çœ‹ä½œæ˜¯â€”—一ç§å­œå­œä¸å€¦å¯»æ‰¾å¯¹æ‰‹çš„欲望。通常，驾/cuté©­æ¶æ„能é‡çš„人，åªè¦é”定了目标，移动速度就会上å‡ï¼Œä½¿å¾—å¯æ€œçš„猎物无处躲è—，åªå¾—å以待毙。\n\tç ´å——你或许已ç»çŒœåˆ°äº†â€”—其实就是纯粹的力é‡ã€‚正确地使用这ç§åŠ›é‡å¯ä»¥ä»¤ä½¿ç”¨è€…的身体素质在短时间内获得快速æå‡ï¼›åŒæ—¶è¿˜å¯ä»¥ç”¨æ¥ç²‰ç¢Žæˆ–碾磨其他物å“。\n\tåšæ¯…——无数的观察表明——这是抵御攻击，使自身å…é­ä¼¤å®³çš„/cut欲望。大多数情况下，æ“纵这ç§æ¬²æœ›çš„人，都是团队中的铜墙é“å£â€”—任何攻击都ä¸ä¼šä¼¤ä»–分毫。如果你想藉由你的护甲或仪å¼æ¥ä¿éšœä½ çš„存活概率，这股力é‡ç»å¯¹æ˜¯ä½ çš„第一选择。 -guide.bloodmagic.entry.demon.crucible.info=æ¶é­”å©åŸšå¯å°†åœ°ç‹±é­‚石中的æ¶é­”æ„志散布到当地（å³å½“å‰åŒºå—）的大气之中。这å£å©åŸšæœ‰è‹¥å¹²ç”¨é€”：最简å•çš„一个就是直接将地狱魂石放入其中（å³å‡»æ”¾å…¥ï¼‰ã€‚å©åŸšä¼šè‡ªåŠ¨ä»Žé­‚石中抽å–æ¶é­”æ„志并散布到空气中，直到饱和（æ¯ç§æ„志大约都会在达到100点时饱和）或者魂石本身被抽干了。\n\t此外，它还å¯ä»¥æŠ½å–空气中的æ¶é­”æ„志并çŒè¾“进魂石中。æ“作方å¼å’Œæ•£å¸ƒæ¶é­”æ„å¿—æ— /cut异，åªæ˜¯å©åŸšéœ€è¦ä¸€ä¸ªå¼ºçš„红石信å·ï¼ˆå³å¼ºå……能）。\n\t最åŽï¼Œç›´æŽ¥å¾€é‡Œé¢æŠ•å…¥ä¸€å—æ¶é­”æ„志也是å¯ä»¥çš„，ä¸è®ºä»€ä¹ˆå½¢å¼ï¼Œåªè¦æœ‰å®¹çº³æ„志的空间就å¯ä»¥è¿›è¡Œè½¬åŒ–。举个例å­ï¼Œå°†æ™¶åŒ–æ¶é­”æ„志投入å©åŸšå¯äº§ç”Ÿ50点æ„志。 -guide.bloodmagic.entry.demon.crystallizer.info=正如之å‰æ‰€æ到的那样，æ¶é­”çµæ°”——通常我们会简å•ä»¥â€œå¤§æ°”â€æŒ‡ä»£ä¹‹â€”—是æ¶é­”æ„志的空çµçš„存在形å¼ï¼Œè€Œå‡»æ€æ€ªç‰©èŽ·å¾—的物质则是æ¶é­”æ„志物ç†å½¢å¼çš„具现。而这æ¶é­”结晶å›ï¼Œåˆ™åƒæ˜¯ä¸€ä¸ªé”šç‚¹ï¼Œè®©æ¼‚浮在大气中的æ¶é­”æ„志以晶体的形æ€é‡çŽ°ã€‚\n\t你也许会问，为什么ä¸ç›´æŽ¥ç”¨åœ°ç‹±é­‚石培养一å—晶体呢？这是因为在我们将æ¶é­”æ„志释放到空气中时，它身上的ç¦é”¢/cut就已ç»è¢«è§£é™¤äº†â€”—记ä½ï¼Œå½“我们æ€æ­»ä¸€ä¸ªæ€ªç‰©æ—¶ï¼Œå®ƒèº«ä¸Šçš„æ„志也就éšä¹‹è¢«æˆ‘们ç¦é”¢äº†ã€‚å†æ¬¡é‡Šæ”¾è‡ªç„¶ä¼šä»¤å…¶é‡æ–°æ¢å¤æ´»åŠ›ï¼Œè€Œè¿™ç»“晶å›å°±æ˜¯ç›´æŽ¥å¸æ”¶è¿™æ´»çš„æ¶é­”æ„志。ä¸è¦å¤ªæƒ³å½“然啦。\n\t结晶过程需è¦æ¯”较高的æ¶é­”çµæ°”的浓度（大概是80点），并且需è¦ä¸€æ®µæ—¶é—´ã€‚在这之åŽï¼Œç»“晶å›çš„上方便会长出åªæœ‰ä¸€æ ¹å°–çš„æ¶é­”晶簇。结晶å›æœ‰ä¸¤ç§å·¥ä½œæ–¹å¼ï¼šå®ƒæ—¢å¯ä»¥å¸æ”¶/cut特定的一ç§æ„志然åŽäº§ç”Ÿå¯¹åº”的晶体；也å¯ä»¥ç›´æŽ¥å¸æ”¶åŽŸç”Ÿæ„å¿—æ¥äº§ç”Ÿæ™¶ä½“。\n\tæ­¤å‰ç»“晶å›å¯ä»¥ç›´æŽ¥ä»ŽåŽŸç”Ÿæ„志中分离出特定类型的æ„志，现在你需è¦ä¸€äº›ç‰¹æ®Šçš„设备æ¥åšåˆ°è¿™ä¸€ç‚¹äº†ã€‚ä½ å¯èƒ½éœ€è¦å‚阅仪å¼å¤§å¸ˆå·çš„《结晶共鸣》一章。 -guide.bloodmagic.entry.demon.cluster.info=æ¶é­”晶簇既å¯ä»¥ä½¿ç”¨æ¶é­”结晶å›åŸ¹å…»ï¼Œä¹Ÿå¯åœ¨ç‹±ç«ç†”炉中用æ¶é­”结晶制作。晶簇å¯ä»¥åœ¨å„ç§åœ°æ–¹ç”Ÿé•¿â€”—地æ¿ã€å¢™å£ã€ç”šè‡³å¤©èŠ±æ¿ä¸Šã€‚完全长æˆçš„晶簇应该有七个尖，打掉åŽæ¯ä¸€ä¸ªå°–都会å˜æˆä¸€å—结晶。然而，如果你使用å«æœ‰è‡³å°‘1024点æ„志的地狱魂石æ¥æ”¶èŽ·ï¼ˆå³å‡»ï¼‰ï¼Œä½ ä¾¿èƒ½åªæ”¶èŽ·ä¸€å—结晶而ä¸å½±å“到整棵晶簇。\n\t晶簇生长的过程中，会å¸æ”¶åŒç§æ¶é­”çµæ°”。虽然慢，但的确/cut是有收益的。\n\t有两ç§å’Œæ™¶ç°‡çš„ç§æ¤å’Œæ”¶èŽ·ç›¸å…³çš„仪å¼ï¼šå­¤é­‚集会和碎晶裂纹。具体用法å¯ä»¥å‚阅《仪å¼å¤§å¸ˆã€‹ä¸€å·ã€‚ -guide.bloodmagic.entry.demon.pylon.info=你或许已ç»å‘现了，在没有外力的影å“下，æ¶é­”çµæ°”åªä¼šå¾…在它被释放出æ¥çš„那个地方（å³å½“å‰åŒºå—）。而这æ¶é­”导能塔，则为那些çµåŸŸä¸­çš„æ„志亮起了一ç›ç¯â€”—一ç›æŒ‡å¼•æ–¹å‘çš„ç¯ã€‚附近的æ„志在这ç¯çš„指引下会é€æ¸å‘ç¯é æ‹¢ï¼Œç›´è‡³è¿™äº›åœ°æ–¹çš„æ„å¿—æ•°é‡ä¿æŒå‡åŒ€ã€‚（注：这里所谓的“附近â€ä¸å«å¯¹è§’线上的区å—，å³åªæœ‰ä¸Žå¡”所在的区å—相邻的四个区å—会å—到影å“）。å¦å¤–è¦æ³¨æ„的是，æ„å¿—åªä¼šä»Žå¤šçš„地方æµ/cutå‘少的地方。若是什么地方的æ„志的浓度比附近的地方浓度低了，它就ä¸ä¼šç»§ç»­æµåŠ¨äº†ã€‚ -guide.bloodmagic.entry.demon.gauge.info=你需è¦ä¸€ä¸ªæµ‹é‡ä»ªæ¥æµ‹å®šçµåŸŸä¸­çš„æ¶é­”æ„志浓度。åªéœ€è¦ä¸€ç›´æ”¾åœ¨ä½ çš„背包中，测é‡ä»ªä¾¿å¯å°†æµ“度以五个指示器的形å¼æ˜¾ç¤ºå‡ºæ¥ï¼ˆåœ¨å±å¹•å·¦ä¸Šè§’）。潜行时你还能得知具体数é‡ï¼Œä½†è¿™ä¸ªç»“果是ç»è¿‡å››èˆäº”入的。 - - - -# Alchemy Entries -guide.bloodmagic.entry.alchemy.intro=åº -guide.bloodmagic.entry.alchemy.ash=å¥¥æœ¯ç²‰ç° -guide.bloodmagic.entry.alchemy.speed=法阵：æ•æ· -guide.bloodmagic.entry.alchemy.updraft=法阵：å‡è…¾ -guide.bloodmagic.entry.alchemy.bounce=法阵：弹跳 -guide.bloodmagic.entry.alchemy.turret=法阵：骷髅炮塔 -guide.bloodmagic.entry.alchemy.buff=增益法阵 -guide.bloodmagic.entry.alchemy.fastMiner=法阵：速掘 -guide.bloodmagic.entry.alchemy.furnace=法阵：燃炉 -guide.bloodmagic.entry.alchemy.teleport=æ³•é˜µï¼šä¼ é€ -guide.bloodmagic.entry.alchemy.standardTurret=法阵：标准炮塔 -guide.bloodmagic.entry.alchemy.laputa=法阵：拉普达碎片 - - -# Alchemy Entry Texts -guide.bloodmagic.entry.alchemy.intro.info=我å«å¼—拉德·海泊æ©ï¼Œæ˜¯ä¸€å血法师。我一直致力于研究炼金术的细节以åŠæ‰€æœ‰é­”法中共åŒçš„原则——“等价交æ¢â€ã€‚简å•æ¥è¯´ï¼Œä½ ä¸èƒ½æ— ä¸­ç”Ÿæœ‰ï¼Œè™½ç„¶å¾ˆå¤šäººä¸€ç›´åœ¨è‡´åŠ›äºŽå¯»æ‰¾é‚£ä¸ªå¯ä»¥æ— è§†æ­¤åŽŸåˆ™çš„石头。很显然，石头的寻找之旅并ä¸é¡ºåˆ©ï¼Œå› ä¸ºäººä»¬æ€»æ˜¯ä¼šåœ¨æƒŠè®¶å£°ä¸­å‘现石头是å‡è´§ã€‚当然，我ä¸åªæ˜¯ä¸ªç‚¼é‡‘术师，我主è¦è¿˜æ˜¯åœ¨è·Ÿä»ªå¼å¤§å¸ˆå’Œç¼”造者学习血之魔法，这二ä½åœ¨åœˆå†…业已是颇具声望的人物了。/cut马格斯和æ比略这几年æ¥ä¸€ç›´åœ¨è®°å½•ä»–们的æˆæžœï¼Œä½†æ˜¯æˆ‘一直ä¸çŸ¥é“马格斯是å¦çœŸçš„记录下了他的毕生所学——既ä¸èƒ½è¯æ˜Žï¼Œä¹Ÿä¸èƒ½è¯ä¼ªã€‚\n\t我的这本书将记录血魔法中的炼金术。从奥术粉尘，到å¤æ‚的炼金å°æ¡Œï¼Œä½ å°†ä¼šåœ¨è¿™æœ¬ä¹¦ä¸­æ‰¾åˆ°ä¸–é—´å„ç§å¤æ‚的元素的线索。当然，为了读懂这本书，你还需è¦é˜…读其余的几本书，以对血魔法有清楚的了解。\n\t/cut就现在æ¥è¯´å‘¢ï¼Œæˆ‘衷心希望é¢å‰çš„读者阅读愉快。这些书页的内容，都是如å‡åŒ…æ¢çš„真æ‰å®žå­¦ã€‚ -guide.bloodmagic.entry.alchemy.ash.info=奥术粉尘便是炼金法阵的基础，而炼金法阵（为简便，下简称法阵）——一ç§åœ†å½¢æ³•é˜µâ€”—则拥有多ç§å¼ºå¤§çš„功能。åˆæˆå¥¥æœ¯ç²‰å°˜éœ€è¦ç”¨åˆ°ç‹±ç«ç†”炉和æ¶é­”æ„志，关于这两样东西的细节å¯ä»¥å‚考本书《æ¶é­”之å­ã€‹ä¸€å·ã€‚\n\t/cut一份奥术粉尘å¯ä½¿ç”¨äºŒå次。对ç€åœ°é¢æˆ–者墙å£ä½¿ç”¨ä¾¿å¯ç”»å‡ºä¸€ä¸ªåœ†å½¢çš„法阵（如果是墙å£ï¼Œä½ åªèƒ½åœ¨ä¸€ä¸ªæ–¹å‘上看到法阵）。然åŽï¼Œå¯¹æ³•é˜µä¸­å¤®ä½¿ç”¨åˆé€‚的催化剂å³å¯æ”¹å˜å…¶å½¢çŠ¶ï¼Œå½“然也会消耗催化剂（å³ï¼Œå³å‡»ä½¿ç”¨ï¼‰ã€‚如果法阵没有å˜å½¢ï¼Œé‚£ä¹ˆä½ è‚¯å®šæœ‰ä»€ä¹ˆåœ°æ–¹æžé”™äº†ã€‚\n\t在观察到法阵å˜å½¢åŽï¼Œä½ ä¾¿å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé€‚的次è¦ç‰©å“会å¯åŠ¨æ³•é˜µï¼Œå±Šæ—¶ä½ ä¼šçœ‹åˆ°æ³•é˜µå¼€å§‹æ—‹è½¬ï¼Œå¹¶å¼€å§‹/cut产生å„ç§å˜åŒ–，具体å˜åŒ–éšæ³•é˜µä¸åŒè€Œä¸åŒã€‚\n\t所有éžåˆæˆçš„法阵用途都å¯ä»¥åœ¨æœ¬ä¹¦ä¸­æŸ¥é˜…到，å³ä¾¿åˆæˆè¢«ä»–人强行更改过也å¯ä»¥ã€‚对于需è¦çš„物å“，它们都已ç»è¿‡æŽ’åºï¼ŒæŒ‰ç…§æœ¬ä¹¦ç»™å‡ºçš„顺åºæ”¾ç½®å³å¯ã€‚ -guide.bloodmagic.entry.alchemy.speed.info=法阵：æ•æ·å¯ä»¥åˆ¶é€ è‹¥å¹²æ°”旋，并用法力加热。此åŽï¼Œä¸€æ—¦æœ‰ç”Ÿç‰©èµ°å…¥å…¶ä¸­ï¼Œå®ƒä»¬å°±ä¼šè¢«é£Žçš„力é‡æŽ¨å‘å‰æ–¹ã€‚此外，它还å¯ä»¥å…除所有因此产生的掉è½ä¼¤å®³ã€‚åªéœ€è¦åšäº›è¿åŠ¨å°±å¥½äº†ã€‚\n\t漩涡推进的方å‘是阵列上箭头的方å‘。\n\tå¦å¤–，相比于直接走入阵列中，从高处掉入阵列的效果会更好。这è¦å½’功于你掉下æ¥æ—¶å‘¨å›´ç©ºæ°”产生的æµåŠ¨ã€‚ -guide.bloodmagic.entry.alchemy.updraft.info=这个阵列使用和法阵：æ•æ·ä¸€æ ·çš„原ç†ï¼Œä¸è¿‡è¿™æ¬¡çš„æ–¹å‘是æœä¸Šäº†ã€‚自然地，使用阵列时务必å°å¿ƒï¼šå†ä¸‹æ¥å°±ä¸æ˜¯æ˜“äº‹äº†ï¼ -guide.bloodmagic.entry.alchemy.bounce.info=阵列会将接近中心的热é‡é›†ä¸­åˆ°ä¸‹é¢ï¼Œè¿›è€Œè½¯åŒ–地é¢ï¼Œå¹¶æœ€ç»ˆè½¬åŒ–为一ç§ç”±ç¢³å’Œæ°¢ç»„æˆçš„橡胶状物质。这ç§ç‰©è´¨ä¼šå°†ç”Ÿç‰©å¼¹è‡³ç©ºä¸­ï¼ŒåŒæ—¶ä¹Ÿèƒ½é¿å…掉è½ä¼¤å®³ã€‚潜行å³å¯é¿å…è¿™ç§ç¥žå¥‡æ料的影å“，当然这ä¸ä¼šå½±å“æ‘”è½ä¿æŠ¤çš„功能。 -guide.bloodmagic.entry.alchemy.turret.info=利用那些ä»ç„¶æŽ§åˆ¶ç€æ€ªç‰©çš„æ¶é­”æ„志，你å¯ä»¥æŽ§åˆ¶ä¸€ä¸ªéª·é«…的心智。åªè¦æœ‰éª·é«…进入了这个阵列的覆盖范围，这骷髅就会化身哨兵，并å‘所有敌对生物开ç«ã€‚ä¸è¿‡è¿™ä¸ªæ³•é˜µä»åœ¨å®žéªŒå½“中，它有时候会ä¸ç®¡ç”¨ã€‚ -guide.bloodmagic.entry.alchemy.buff.info=ç»è¿‡ä¸¥å¯†çš„研究，你å‘现法阵拥有强大的应用潜力。迄今，你已æˆåŠŸåˆ¶é€ äº†æ•°ç§é˜µåˆ—，从加速移动，到åˆçº§çš„ä¼ é€ï¼Œåº”有尽有。但唯有一ç§é˜µåˆ—，你至今ä»ç„¶æ²¡æœ‰ç€æ‰‹åŽ»ç ”究，那便是æ供强大的正é¢å¢žç›Šçš„阵列。\n\t增益阵列实际上是指一系列å¯ä»¥æ供范围增益效果的阵列。这些阵列产生的增益效果通常都有很大的固定覆盖范围，ä¸å—外力影å“。然而，因/cut为法阵ä¸ä¼šç‰µæ‰¯åˆ°çµé­‚网络，阵列需è¦åˆ«çš„æ–¹å¼æ¥ä¼ æ’­è¿™ç§æ•ˆæžœï¼Œé€šå¸¸æ˜¯ç›´æŽ¥ç”¨è¡€ã€‚æ¢è¨€ä¹‹ï¼Œå½“有玩家展开阵列时，玩家就会立刻å—到伤害（æŸå¤±ç”Ÿå‘½ï¼‰ï¼Œè—‰ç”±æ­¤å¯åŠ¨é˜µåˆ—。\n\t因为使用了直接献祭，å‰æœŸä½¿ç”¨è¿™ç§é˜µåˆ—会比使用其他获å–增益的手段更ç»æµŽä¸€äº›ã€‚è·ç¦»ï¼Œå¦‚æžœæŸä¸ªå°è®°å¯æ¶ˆè€—100LP并æ¢å–10秒的效果，阵列å¯ä»¥ä»¥1点生命的代价æ¢æ¥30秒åŒæ ·çš„效果（1点生命对于一级/cut祭å›æ¥è¯´æ˜¯100LP）。尽管到了åŽæœŸï¼Œè¿™ç§é˜µåˆ—å°±ä¸ä¼šå†æœ‰æ•ˆçŽ‡ä¸Šçš„优势，但因为它们的ä½ç½®æ˜¯å›ºå®šçš„，相比于å°è®°ï¼Œå®ƒä»¬é€šå¸¸ä¼šç»™äºˆæ›´å¼ºå¤§çš„效果，所以它们到了åŽæœŸä»æœ‰å®ƒä»¬çš„价值。 -guide.bloodmagic.entry.alchemy.fastMiner.info=é‡åˆ°å¤§èŒƒå›´çš„雕刻任务，有时候还是自己动手更划算一些。对于这ç§æƒ…况，这个阵列便是你的ä¸äºŒé€‰æ‹©ã€‚这个阵列å¯ä¸º10格内的玩家æ供急迫 III的效果，消耗则是æ¯30秒1点生命值（åŠé¢—心）。因为是普通的急迫效果，所以它也å¯ä»¥æ高你的攻击速度，ä¸è¿‡è¦è®°ä½ï¼Œåˆ«çš„玩家åŒæ ·ä¼šè¢«é˜µåˆ—è¦†ç›–åˆ°ï¼ -guide.bloodmagic.entry.alchemy.furnace.info=在冒险刚刚å¯ç¨‹æ—¶å¯èƒ½é‡åˆ°çš„众多问题之一，就是难以ä¿æŒç†”炉的燃烧。一个点ç€çš„熔炉æ„味ç€å¯ä»¥äº«å—美味的食物与精炼的装备，而ä¸æ˜¯èº²åœ¨æ´žç©´ä¸­æŒ¨é¥¿ã€‚\n\t燃炉法阵，顾åæ€ä¹‰ï¼Œå¯ä»¥å‘相邻的熔炉æ供所需的充足热æºã€‚直接在一个原版熔炉æ—边铺设下该法阵（å¯ä»¥ä¸Žå¤šä¸ªç†”炉相邻），åªè¦ç†”炉å¯ä»¥å®Œæˆä¸€æ¬¡çƒ§åˆ¶ï¼Œæ³•é˜µä¾¿ä¼šä¾›ç»™ç‡ƒæ–™â€”—如果相邻的熔炉是空的，或者已ç»å¡«æ»¡ï¼Œåˆ™ä»€ä¹ˆéƒ½ä¸ä¼šå‘生，/cut这也是为了ä¿æŠ¤ä½ ã€‚\n\t但是，这也ä¸æ˜¯å‡­ç©ºèƒ½åŠžåˆ°çš„：如果有人在附近（åæ ¼åŠå¾„之内），消耗1点生命值（åŠé¢—心）æ‰èƒ½ç»´æŒç†”炉中两个物å“的冶炼。这对åšç‚¹ä¸œè¥¿åž«åž«è‚šå­æˆ–者冶炼一堆矿石很有帮助，但ä¸å¹¸çš„是你还没有办法在法阵上设置什么ä¿æŠ¤æŽªæ–½â€¦â€¦ -guide.bloodmagic.entry.alchemy.teleport.info=法阵：传é€ï¼Œé¡¾åæ€ä¹‰å¯ä»¥ç”¨æ¥åœ¨ä¸¤ä¸ªåœ°ç‚¹é—´çž¬é—´ç§»åŠ¨ï¼Œä½†æœ‰è‹¥å¹²é™åˆ¶ã€‚当玩家或其他实体走进法阵åŽï¼Œæ³•é˜µä¼šæ²¿ç€å®ƒçš„æœå‘æœç´¢è‡³å¤š 20 æ–¹å—çš„è·ç¦»ï¼Œåœ¨å…¶ä¸­å¯»æ‰¾å¦ä¸€ä¸ªç‚¼é‡‘法阵，类型ä¸é™ï¼Œä¹Ÿä¸éœ€è¦æ¿€æ´»ã€‚若找到了å¦ä¸€ä¸ªæ³•é˜µï¼Œåˆ™å°†è¿›å…¥æ³•é˜µçš„实体传é€åˆ°æ³•é˜µé‚£è¾¹åŽ»ï¼Œè¿™ä¸ªè¿‡ç¨‹ç”šè‡³å¯ä»¥æ— è§†ä¸­é—´çš„墙å£ã€‚\n\t进一步的研究表明，这个法阵还有å¦ä¸€ä¸ªé™åˆ¶ï¼šæœ‰é‰´äºŽæ‰­æ›²/cut时空的本质，这个法阵ä¸ä¼šä¼ é€é‚£äº›åˆšä¼ é€å®Œä¸¤ç§’é’Ÿä¸åˆ°çš„物体。这样一æ¥ï¼Œè¿™äº›ç‰©ä½“就有时间æ¥é‡æ–°å¯¹è‡ªèº«è¿›è¡Œè°ƒæ•´ã€‚ -guide.bloodmagic.entry.alchemy.standardTurret.info=把尖é”物体弹射到远处的怪物上的力é‡å®žåœ¨æ˜¯ä¸èƒ½æ›´å¥½ç”¨äº†ã€‚法阵：标准炮塔å¯ä»¥æ„ŸçŸ¥é™„近的敌对生物的存在，并利用å¤æ‚的炼金术å‘其他敌对生物开ç«ã€‚\n\t法阵首先在其正下方æœç´¢ç‰©å“容器。若在容器中找到了箭头，或者带è¯æ°´çš„箭头，它就会将其å¸å‡ºï¼Œå¹¶ä½¿ç”¨å®ƒæœ 32 格范围内的生物开ç«ã€‚\n\t/cut（因为 Minecraft 奇葩的物ç†å­¦ï¼Œç®­å¤´è‹¥ç”ŸæˆäºŽç¦»ç”Ÿç‰©å¾ˆè¿‘的地方就会被弹开，所以炮塔åªä¼šæœè‡³å°‘三格开外的敌对生物开ç«ã€‚时刻留æ„这一点ï¼ï¼‰ -guide.bloodmagic.entry.alchemy.laputa.info=有个关于æŸå¤±è½çš„王国的传说，这个王国的居民拥有在云中自由穿梭的魔法。虽然关于这个王国的一切现在都已ä¸å¾—而知，æ绘了他们漂浮在空中的城堡的画å·å´æ供了所有让这魔法æˆä¸ºçŽ°å®žçš„细节。\n\t拉普达碎片（法阵）å¯ä»¥å°†åœ°é¢ä¸Šçš„生命æºè´¨æ°”化，这ç§æ°”化的生命æºè´¨å¯ä»¥å°†å‘¨å›´çš„大地举起æ¥ã€‚尽管原ç†å分简å•ï¼Œä½†å¤§åœ°ä¸­ç”Ÿå‘½æºè´¨çš„差异会/cutç¨å¾®å½±å“到举起的大地的范围。这个法阵能将以法阵中心为çƒå¿ƒï¼ŒåŠå¾„四到八格的çƒçŠ¶åŒºåŸŸå†…çš„æ–¹å—，举高到两å€äºŽåŠå¾„多éšæœºä¸€åˆ°äº”格的高度。\n\t需è¦æ³¨æ„的是，法阵生效时，所有å¯åŠ¨æ³•é˜µæ‰€ç”¨çš„物å“都会被消耗。 diff --git a/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang b/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang deleted file mode 100644 index fd3a40d4..00000000 --- a/src/main/resources/assets/bloodmagicguide/lang/zh_TW.lang +++ /dev/null @@ -1,258 +0,0 @@ -# Book Information -guide.bloodmagic.title=血染知書 -guide.bloodmagic.display=血染知書 -guide.bloodmagic.author=血魔法 -guide.bloodmagic.welcome=血魔法 - -# Page Information -guide.bloodmagic.page.bloodAltar=血之祭壇åˆæˆ -guide.bloodmagic.page.soulForge=ç„ç«ç†”çˆåˆæˆ -guide.bloodmagic.page.tier=層級：%d -guide.bloodmagic.page.lp=LP: %d -guide.bloodmagic.page.minimumWill=啟動所需æ„志：%f -guide.bloodmagic.page.drainedWill=åˆæˆæ¶ˆè€—æ„志：%f -guide.bloodmagic.shapelessOrb=ç„¡åºå¯¶ç åˆæˆ -guide.bloodmagic.shapedOrb=有åºå¯¶ç åˆæˆ -guide.bloodmagic.page.alchemyArray=煉金法陣 - - -# Categories -guide.bloodmagic.category.architect=締造者 -guide.bloodmagic.category.ritual=å„€å¼å¤§å¸« -guide.bloodmagic.category.demon=惡魔使者 -guide.bloodmagic.category.spell=戰法師 -guide.bloodmagic.category.alchemy=煉金術士 - -# Ritual Master Entries -guide.bloodmagic.entry.ritual.intro=åº -guide.bloodmagic.entry.ritual.basics=å„€å¼å…¥é–€ -guide.bloodmagic.entry.ritual.ritualStone=å„€å¼çŸ³ -guide.bloodmagic.entry.ritual.masterRitualStone=主儀å¼çŸ³ -guide.bloodmagic.entry.ritual.activationCrystal=驅動水晶 -guide.bloodmagic.entry.ritual.diviner=å„€å¼æŽ¨æ¸¬æ– -guide.bloodmagic.entry.ritual.fullSpring=æ¹§æ³‰å„€å¼ -guide.bloodmagic.entry.ritual.lava=下界夜曲 -guide.bloodmagic.entry.ritual.greenGrove=綠å¢å„€å¼ -guide.bloodmagic.entry.ritual.magnetism=ç£åŠ›å„€å¼ -guide.bloodmagic.entry.ritual.crusher=æŒ–æŽ˜å„€å¼ -guide.bloodmagic.entry.ritual.highJump=é«˜è·³å„€å¼ -guide.bloodmagic.entry.ritual.speed=é€Ÿç§»å„€å¼ -guide.bloodmagic.entry.ritual.wellOfSuffering=苦難之井 -guide.bloodmagic.entry.ritual.featheredKnife=ç¾½åˆ€å„€å¼ -guide.bloodmagic.entry.ritual.regen=é‡ç”Ÿå„€å¼ -guide.bloodmagic.entry.ritual.harvest=滿月收割 -guide.bloodmagic.entry.ritual.interdiction=ç¦æ­¢å„€å¼ -guide.bloodmagic.entry.ritual.containment=ç‰½åˆ¶å„€å¼ -guide.bloodmagic.entry.ritual.suppression=æŠ‘æ¶²å„€å¼ -guide.bloodmagic.entry.ritual.expulsion=é©…é€æ°›å ´ -guide.bloodmagic.entry.ritual.zephyr=和風之喚 -guide.bloodmagic.entry.ritual.laying=é‹ªè¨­å„€å¼ -guide.bloodmagic.entry.ritual.timberman=ä¼æž—å„€å¼ -guide.bloodmagic.entry.ritual.meteor=å¢œæ˜Ÿæ¨™ä½ -guide.bloodmagic.entry.ritual.downgrade=沉é‡éˆé­‚的懺悔 - -# Ritual Master Entry Text -guide.bloodmagic.entry.ritual.intro.info=晚上好，我就是馬格斯·阿爾å¡ç´ã€‚在外人看來我有很多身份：盜賊ã€è‡ªè­¦åœ˜ã€å·«å¸«ã€æˆ°å£«ã€åŸéŠè©©äººã€ç”šè‡³æ”¿æ²»å®¶ã€‚而ç¾åœ¨ï¼Œåªæœ‰å°‘數人清楚地知é“我的頭銜——åªéœ€æåŠä¸€ä¸‹ï¼Œé‚£è‡†æƒ³ä¸­çš„殘暴圖景就å¯ä»¥ä»¤äººèžé¢¨å–ªè†½â€”—縱使這個說法有一åŠæ˜¯èª¤å°Žï¼Œä½†é€™å€‹èªªæ³•æœ‰ä¸€åŠçš„確是真相。誠然，我說的便是作為è·æ¥­å­˜åœ¨çš„血術士。我的朋å‹ä¸€èˆ¬éƒ½ç›´å‘¼æˆ‘çš„å，而我的敵人一般稱我為儀å¼å¤§å¸«ã€‚\n\t/cutç¾åœ¨å‘¢ï¼Œæˆ‘的學生們，為了讓我把畢生所學傳播給下一代有志者們，çºåœ¨æˆ‘身邊已有數月了。我一直在堅守秘密，但æ比略å°æ­¤çš„評論更為精闢：「儘管你自己還看ä¸åˆ°ä½ è‡ªå·±çš„潛力，但ä¸è«–是在什麼魔法領域中，那些已臻化境的大師們的故事總是å°ä¸‹ä¸€ä»£äººæœ‰å¥½è™•çš„。然而，é‡ç¾å¥‡è·¡çš„細節其實並沒有那麼é‡è¦ã€‚若是沒有å°é­”法能é‡çš„絕å°è‡ªä¿¡ï¼Œå³ä¾¿æ˜¯é‡‘沙，也ä¸éŽæ˜¯ä¸€å †ç¡«ç£ºç²‰è€Œå·²ã€‚ã€ç•¶ç„¶ä½ å¯ä»¥èªç‚º/cut他已經觸碰到了煉金術的真諦，但他畢竟是我的第一個學生，我有時候也會èªçœŸæ€è€ƒä»–的想法。\n\t所以呢，那些ä»åœ¨è‹¦è‹¦å°‹æ‰¾å‰é€²çš„é“路的年輕血術士們，且è½æˆ‘一言：血魔法的領域之廣闊ä¸æ˜¯å¸¸äººå¯ä»¥ç†è§£çš„，若ä¸åŠ æ€è€ƒåœ°å‰é€²ï¼Œå¾ˆå¿«ä½ å°±æœƒé‡åˆ°ç“¶é ¸ã€‚因此，請務必時常翻閱這本書——這本書上有我的魔法，åªè¦æˆ‘寫下來新的內容，你們就能立刻看到。\n\t/cut諸ä½è«‹å。ä¸è¦ç·Šå¼µï¼Œè©¦è‘—去感å—è€ä¸€è¼©è¡€è¡“士的教誨。或許會比你討價還價求到的æ±è¥¿é‚„è¦æœ‰ç”¨ã€‚ -guide.bloodmagic.entry.ritual.basics.info=ç¾åœ¨çš„魔法儀å¼å·²ç¶“和幾百年å‰å¤§ä¸ä¸€æ¨£äº†ã€‚曾幾何時，人們用粉末在地上組æˆé­”法陣，並在æ—邊起舞，直到ç²å¾—想è¦çš„æ±è¥¿ã€‚我甚至記得有一ä½å¾žå¥¹è‡ªå®¶èŠ±åœ’中收集魔法能é‡çš„隱士。我一直都在嘲笑這種魔法，直到她把她的貓頭鷹丟éŽä¾†ç›£è¦–我。\n\t而血魔法師的儀å¼å‘¢ï¼Œéœ€è¦ç”¨åˆ°ä¸€ç¨®å¸¶ç‰¹æ®Šæ¨™è¨˜çš„石頭，並且需è¦æŒ‰æŒ‡å®šæ–¹å¼ç²¾ç¢ºæ“ºæ”¾ï¼Œæ–¹èƒ½è½‰åŒ–注入的能é‡ã€‚有一/cut天，我的學徒æ比略在他的新房間裡翻找我éŽåŽ»çš„å„€å¼è³‡æ–™ã€‚那裡有一ç½å¾žæœªé–‹å°éŽçš„液態Etherium（我好åƒèªªéŽå¾ˆå¤šæ¬¡è¦æŠŠå®ƒå–回來但æ¯æ¬¡èªªå®Œå°±å¿˜äº†ï¼‰ï¼Œä»¥åŠä¸€å€‹é€éŽé¡ç‰‡çœ‹æ™‚總åƒæ˜¯åœ¨èªªã€Œæ˜ŸæœŸäºŒã€çš„水晶çƒã€‚當有一個標有「符文塵埃ã€çš„ç®±å­è¢«æ‰“翻後，一顆å°å°çš„紅色寶石滾了出來，滾到了æ比略的腳下。霎那間，它發出的明亮的紅寶石的光芒和他抱著的箱å­è£¡çš„粉末發生了å應。\n\t/cut——自然地，瞬間爆炸。æ比略ä¸å°å¿ƒé‡‹æ”¾å‡ºçš„沒有èšç„¦çš„能é‡é©…動了符文塵埃和周åœçš„å„€å¼çŸ³ï¼Œåœ¨æ²’有容ç´èƒ½é‡çš„è£ç½®çš„情æ³ä¸‹ï¼Œå®ƒå€‘åªèƒ½å‘外擴散。在幾天的治療後，æ比略和我åˆé–‹å§‹äº†å·¥ä½œã€‚\n\t在經歷了數個ä¸çœ ä¹‹å¤œï¼Œå’Œé«˜æ•ˆçš„咖啡因的幫助下（啊，感è¬Player先生的咖啡，感è¬ä»–給我帶來的更加精神的明天ï¼ï¼‰ï¼Œæˆ‘們終於找出了所有儀å¼æ‰€éœ€çš„é—œéµæ料。\n\t/cut根據實驗，我們需è¦è‡³å°‘四種æ料：按照一定樣å¼æ“ºæ”¾çš„å„€å¼çŸ³ï¼›è‹¥å¹²ç¨®ä¸åŒçš„墨水，用於刻畫儀å¼ç´°ç¯€ï¼›ç½®æ–¼å„€å¼ä¸­å¤®çš„特殊儀å¼çŸ³ï¼Œç”¨æ–¼å‚³éžèƒ½é‡ï¼›ä»¥åŠç”¨æ–¼é©…å‹•å„€å¼çš„水晶。我覺得有必è¦å°‡å„個儀å¼å…¨éƒ¨è©³ç´°åœ°è§£èªªä¸€é。 -guide.bloodmagic.entry.ritual.ritualStone.info.1=å„€å¼çŸ³ä¾¿æ˜¯é­”法能é‡çš„容器：根據石頭的ä¸åŒï¼Œå¯å°‡èƒ½é‡å¡‘造為å„種形狀，或導å‘ä¸åŒçš„地方。儀å¼çŸ³åˆ†äº”種：空白（沒有任何銘文）ã€æ°´ã€ç«ã€é¢¨å’ŒåœŸã€‚æ¯å€‹å„€å¼éƒ½æœƒç”¨åˆ°è‹¥å¹¹ä¸åŒç¨®é¡žçš„å„€å¼çŸ³ï¼Œæ¯å€‹å„€å¼æ‰€éœ€çš„佈局也ä¸ç›¡ç›¸åŒã€‚ -guide.bloodmagic.entry.ritual.ritualStone.info.2=為儀å¼çŸ³ç•«ä¸Šæ­£ç¢ºçš„銘文需è¦ä¸€äº›å·¥å…·ã€‚我早已研究出一種快速建造正確儀å¼çš„辦法，但如果有人想自己動手æ­å»ºçš„話還是å¯ä»¥ç”¨é€™äº›å·¥å…·çš„。手æŒåˆé©çš„工具å³æ“Šå„€å¼çŸ³ä¾¿å¯ç‚ºå…¶ç•«ä¸ŠéŠ˜æ–‡ã€‚一開始你åªèƒ½è£½ä½œå‡ºå…¶ä¸­å››ç¨®å·¥å…·ï¼Œéš¨è‘—修行的深入你會得到更高級的工具的製作方法的。 -guide.bloodmagic.entry.ritual.masterRitualStone.info=和大部分魔法一樣，儀å¼éœ€è¦å¼•å°Žï¼Œå¦å‰‡å…¶åŠ›é‡æœƒè®Šå¾—無法控制，或者儀å¼æœ¬èº«æœƒå¾¹åº•å¤±æ•ˆã€‚有鑒於此，儀å¼éœ€è¦ç”±ä¸»å„€å¼çŸ³æŽ§åˆ¶ï¼ˆæˆ‘的筆記中通常會以縮寫"MRS"表記，但也åªèƒ½é€™æ¨£å¯«å¯«è€Œå·²ã€‚試想：你喊一è²ã€Œéº»ç…©ä¸€ä¸‹ï¼Œæˆ‘需è¦æ›´å¤šçš„MRSã€...然後尷尬症就犯了。）主儀å¼çŸ³æœƒå¾žå…¶ä¸»äººçš„éˆé­‚網絡中抽å–能é‡ï¼Œä¸¦æ“´æ•£è‡³æ¯ä¸€å¡Šå„€å¼çŸ³ä¸Šï¼Œå¾žè€Œå•Ÿå‹•å„€å¼ã€‚\n\t把éˆé­‚網絡和一塊大石頭ç¶ä¸€å¡Šæœ‰é»žéº»ç…©ã€‚我曾經æˆåŠŸ/cutéŽä¸€æ¬¡ï¼šåœ¨ä¸»å„€å¼çŸ³é ‚上盤腿打å，將能é‡èšé›†æ–¼çŸ³é ­ä¸Šä¸¦ç›¡åŠ›å°‡éˆé­‚網絡和儀å¼é€£åœ¨ä¸€èµ·ã€‚雖說æˆåŠŸæŒçºŒäº†å¹¾åˆ†é˜ï¼Œä½†æˆ‘的褲å­å»å› ç‚ºæ°´åœ¨å„€å¼çŸ³ä¸Šå†·å‡è€Œæ¿•é€äº†ã€‚於是我得到了一個教訓：ä¸è¦è©¦åœ–在實驗中進行任何冥想。 -guide.bloodmagic.entry.ritual.activationCrystal.info.1=於是我們åœæ­¢äº†å†¥æƒ³ï¼Œè½‰è€ŒåŽ»ç ”究那顆從箱å­è£¡æ»¾å‡ºçš„紅色寶石。æ比略確信它有「將我們所在的肉體世界和主宰éˆé­‚網絡的精神世界連接在一起ã€çš„能力。我一直在想到底è¦ä¸è¦æ”¶ä»–作學徒，但我的確能看出他å°æ–¼é‚£äº›æ™¦æ¾€é›£æ‡‚的魔法的ç†è§£ã€‚啊，我想我有必è¦ç¿»è­¯ä¸€ä¸‹ï¼Œä»–想表é”的是：我們å¯ä»¥ç”¨é€™æ°´æ™¶å°‡éˆé­‚網絡和主儀å¼çŸ³é€£åœ¨ä¸€èµ·ï¼Œä»¥çµ¦å„€å¼æ供能é‡ã€‚ -guide.bloodmagic.entry.ritual.activationCrystal.info.2=於是我們得到了虛弱驅動水晶，以åŠè¤‡è£½å®ƒçš„辦法。它的原料是å¦ä¸€ç¨®å¯ä»¥èˆ‡éˆé­‚網絡éˆæŽ¥çš„水晶：熔岩水晶。åªéœ€è¦è¿…速在上é¢åˆ»å¥½å¿…須的圖案，血之祭壇就å¯ä»¥å°‡å®ƒè®Šæˆé©…動水晶。自然地，它也需è¦å’Œä½¿ç”¨è€…çš„éˆé­‚網絡ç¶å®šã€‚在儀å¼æ­£ç¢ºæ“ºæ”¾å¾Œï¼Œåªéœ€æ‰‹æŒç†”岩水晶å³æ“Šä¸»å„€å¼çŸ³å°±å¯ä»¥é–‹å§‹äº†ã€‚當然，這需è¦æœ‰è¶³å¤ å¤šçš„LP作為支æ’。如果沒有足夠多的LP，儀å¼ä¸æœƒç™¼å‹•ï¼Œä¹Ÿä¸æœƒå› æ­¤æ¶ˆè€—LP。 -guide.bloodmagic.entry.ritual.diviner.info.1=在ä¸æ–·ç™¼ç¾æ–°çš„å„€å¼éŽç¨‹ä¸­ï¼Œæˆ‘愈發感到建造儀å¼çš„枯燥。這也是為什麼我製作出這樣一個工具的原因——這樣所有人都å¯ä»¥é€šéŽç°¡å–®çš„手勢和動作來快速部署儀å¼äº†ã€‚按時間順åºä¾†èªªé€™å€‹æ‡‰è©²æ”¾åœ¨è«¸å„€å¼çš„後é¢ä¾†è¬›ï¼Œä½†æˆ‘決定æ到å‰é¢ï¼Œå› ç‚ºæˆ‘覺得先學習這個的使用會更好。沒人會想在臨陣時æ‰ç™¼ç¾å„€å¼çŸ³æ²’帶夠，抑或原本åªæ˜¯æƒ³è®Šå‡ºä¸€ç“¶æ°´çµæžœå»å¬å–šäº†éš•çŸ³å§ã€‚ -guide.bloodmagic.entry.ritual.diviner.info.2=å„€å¼æŽ¨æ¸¬æ–的本質是本儀å¼çš„百科全書。你å¯ä»¥é€šéŽä¸€äº›æ“作（按ä½Shift左擊或å³æ“Šï¼‰ä¾†åœ¨ä¸åŒå„€å¼é–“切æ›ï¼Œä»”細看的話你還會得知一些基礎信æ¯ã€‚在你帶著儀å¼çŸ³çš„時候，手æŒæŽ¨æ¸¬æ–å³æ“Šä¸»å„€å¼çŸ³ï¼Œä¾¿å¯åœ¨æ­£ç¢ºä½ç½®æ”¾ç½®ä¸€å¡Šå„€å¼çŸ³ã€‚åªéœ€è¦ä¸æ–·å³æ“Šå°±å¯ä»¥å®Œæˆå„€å¼äº†ï¼ -guide.bloodmagic.entry.ritual.fullSpring.info=幾年å‰ï¼Œæœ‰ä¸€å€‹æ—…行商人路éŽæˆ‘附近的一個æ‘å­ï¼Œä¸¦å‘眾人兜售他的å„種å°æ±è¥¿ã€‚那個æ‘å­å¤§æ¦‚有很長時間沒下雨了，莊稼也快旱死了，商人見此便æŽå‡ºäº†ä¸€å€‹é‘²æœ‰è—色寶石的銀製護符。「看這個ï¼ã€ï¼Œä»–çš„è²éŸ³ä¸­å¸¶è‘—幾分激動，「這個æ±è¥¿å¯ä»¥è®“æ²³æµæ°¸ä¸ä¹¾æ¶¸ï¼æˆ‘å¯ä»¥ç”¨ç…‰é‡‘術從空氣中變出水ï¼ã€\n\t然而æ‘民們覺得那寶石好åƒåªæ˜¯æ™®é€šçš„è—寶石而已。等他們å應éŽä¾†ä¸Šç•¶å—騙時那/cut個商人已經消失得無影無蹤了。我起åˆä¸¦ä¸æ‰“算干涉此事——因為他們似乎並ä¸å–œæ­¡æˆ‘的魔法——但這次我破了個例。在和「煉金術士ã€é€²è¡Œäº†æ„‰å¿«çš„交æµå¾Œï¼Œæˆ‘在çŒæº‰æ¸ æ—打å了數å°æ™‚。我æˆåŠŸé€šéŽå†·å»ç©ºæ°£ä¸­æ°´è’¸æ°£çš„辦法給莊稼們帶來了足夠多的水——足夠æ’到下一個旱季。自然這個方法並ä¸é è­œï¼Œå› ç‚ºæˆ‘自己已經被打å給æ¾ä¹¾äº†ï¼Œä¸å¾—ä¸é è‡ªå·±é€ å‡ºä¾†çš„水來é‡æ–°èª¿æ•´ã€‚\n\t/cut我å†æ¬¡æƒ³èµ·äº†é€™å€‹äº‹ï¼Œä¸¦æŒ‰ç…§åŒæ¨£çš„方法製作了湧泉儀å¼ã€‚給儀å¼çŒæ³¨å°‘é‡èƒ½é‡ï¼Œå„€å¼ä¾¿å¯å°‡é™„近空氣中的水分èšé›†èµ·ä¾†ï¼Œä¸¦åœ¨ä¸»å„€å¼çŸ³ä¸Šæ–¹ç”¢ç”Ÿä¸€å€‹æ°´æºã€‚é©…å‹•å„€å¼éœ€è¦çš„能é‡ä¸¦ä¸å¤šï¼Œç¶­æŒå…¶é‹è½‰çš„能é‡æ›´æ˜¯å¯ä»¥å¿½ç•¥ä¸è¨ˆã€‚\n\t水的範åœå’Œæ”¾ç½®çš„ä½ç½®éƒ½æ˜¯å¯ä»¥ç”¨å„€å¼èª¿æ•´é‰—調整的，所以那些å°ç¾Žè§€è¡¨ç¤ºæ“”憂的魔法師們ä¸è¦æ“”心了。這便是魔法的力é‡ï¼ -guide.bloodmagic.entry.ritual.lava.info=熔岩——æ怕是最普通的能é‡ä¾†æºäº†å§ã€‚我平日的研究中很少使用熔岩，因為它其實並éžæ˜¯æ™®é€šçš„éµæ¡¶å°±èƒ½è£èµ·ä¾†çš„æ±è¥¿ï¼\n\t有一天，當地的一åéµåŒ æ‰¾åˆ°æˆ‘，並å‘我打è½é™„近的能é‡æºçš„事情。他說他們最近新造了一個大傢伙，需è¦å¤§é‡èƒ½é‡ä¾†é‹è½‰ã€‚我回答é“，「有倒是有，但它們並éžç„¡ä¸»ä¹‹ç‰©ã€‚ã€æˆ‘決定去親眼看一下這個所謂的大傢伙到底是何方神è–。\n\t/cut那是...一個至少五公尺（5米）見方的冶煉çˆï¼Œä¸Šé¢é‚„連著幾個空空如也的儲ç½ã€‚雖然我ä¸çŸ¥é“這玩æ„兒到底是怎麼工作的，但我的直覺告訴我，熔岩的熱é‡ç”¨åœ¨é€™è£¡æ­£åˆé©â€”—電力是絕å°ä¸è¡Œçš„，絕å°ä¸è¡Œã€‚除此之外，我åªçŸ¥é“這ä¸æ˜¯æ²‰æµ¸å·¥æ¥­å…¬å¸çš„產å“。\n\t在經éŽçŸ­æš«çš„討價還價後，éµåŒ ä»˜äº†ä¸€ç­†è²»ç”¨ï¼Œæˆ‘便開始å«ä»–們ç¨å¾®è®“開一下，以便準備æ­å»ºå„€å¼ã€‚按我的想法，我將/cut四塊ç«ä¹‹å„€å¼çŸ³å’Œä¸»å„€å¼çŸ³æ“ºæˆå字，腦海中ä¸æ–·æƒ³åƒæ•´å€‹éŽç¨‹çš„åŒæ™‚，我用力將驅動水晶推å‘了主儀å¼çŸ³ã€‚ç†è«–上這個éŽç¨‹æ‡‰è©²å分簡單：儀å¼ä¸æ–·åœ°å°‡å¤§åœ°æ·±è™•çš„石頭挖出來，在巨大的壓力下熔èžæˆç†”岩。這樣製æˆçš„熔岩å¯ä»¥ç›´æŽ¥å¾žå„€å¼çŸ³ä¸­æå–出來，然後儀å¼æœ¬èº«é‚„å¯ä»¥è‡ªç¶­æŒé€™ç¨®é¡žä¼¼æ“ å£“çš„éŽç¨‹ã€‚\n\t然而這åªæ˜¯ç†è«–。說起來容易åšèµ·ä¾†é›£ï¼šç•¶æ™‚我使用的簡/cut易網絡完全ä¸é©åˆæ‹¿ä¾†ç‚ºé€™å€‹å„€å¼ä¾›æ‡‰é­”力，ä¸åƒ…擠壓熔岩需è¦çš„壓力巨大（需è¦20000LPå•Ÿå‹•å„€å¼ï¼‰ï¼ŒæŠ½å–熔岩的開支也ä¸å°ï¼ˆæ¯ç”¢ç”Ÿä¸€æ ¼ç†”岩需è¦500LP）。\n\t我æ–æ–晃晃地走出了éµåŒ å€‘的基地，臉上帶著一絲欣慰。那些儲ç½è£¡çš„熔岩足夠éµåŒ å€‘用到他們找到新的岩漿來æºäº†ã€‚當然，我也沒忘記帶走我的儀å¼çŸ³ã€‚\n\t---------------\n\t/cut在沒有外力影響下，這個儀å¼æœƒä¸æ–·å˜—試在主儀å¼çŸ³ä¸Šæ–¹ç”Ÿæˆä¸€æ ¼ç†”岩，並消耗500LP。一般情æ³ä¸‹ï¼Œç†”岩生æˆçš„範åœå¯ä»¥æ“´å±•åˆ°å„€å¼æœ¬èº«ä¸‰æ ¼é–‹å¤–。\n\t在原生æ„志的影響下，LP消耗和大氣中æ„志的濃度æˆå比，åŒæ™‚會ä¸æ–·æ¶ˆè€—æ„志，æ„志的消耗速度與節約的LP數é‡æˆæ­£æ¯”。使用原生æ„å¿—é‚„å¯ä»¥è®“å„€å¼è‡ªå‹•å°‡ç†”岩放置進å„å¼æ¶²é«”容器中，速度大抵ä¿æŒä¸è®Šã€‚\n\t/cutè…è•æ„志會å轉ç«ç„°å…疫的效果。æ›è¨€ä¹‹ï¼Œé‚£äº›å¹³æ™‚å°ç«ç„°å…疫的生物，在這個儀å¼çš„影響下會失去ç«ç„°å…疫的屬性；而那些無法抵抗ç«ç„°çš„生物則會å°ç«ç„°å…疫。\n\t復仇æ„志會令此儀å¼é‡‹æ”¾å‡ºä¸€ç¨®æ®ç™¼æ€§æ°£é«”，這種氣體會影響任何ä¸æ˜¯çŽ©å®¶çš„生物。在這種氣體的作用範åœå…§çš„生物都會ç²å¾—「緩燃引線ã€çš„效果。當這個效果的倒計時歸零時，這個生物會爆炸，強行將生物趕回空氣當中。\n\t/cut破壞æ„å¿—å¯ä»¥å¼·åŒ–這個儀å¼çš„å„種屬性。大氣中這種æ„å¿—çš„å«é‡è¶Šå¤šï¼Œå„€å¼èƒ½æ”¾ç½®çš„岩漿æºæ•¸é‡ä¹Ÿå°±è¶Šå¤šã€‚更喜人的是這個儀å¼ä¸¦ä¸æœƒæ¶ˆè€—破壞æ„志。然而，當大氣中的æ„志數é‡ä¸‹é™ï¼Œè€Œä¸”å„€å¼çš„最大範åœå°æ–¼ä½ è¨­å®šçš„範åœæ™‚，儀å¼å°±æœƒåœæ­¢å·¥ä½œï¼Œå¿…須進行手動修復。\n\t最後，堅毅æ„志會令儀å¼ç¯„åœå…§çš„玩家ç²å¾—ç«ç„°æŠ—性，時效和空氣中æ„志的濃度æˆæ­£æ¯”。å¦å¤–有一點è¦æ³¨æ„，è…è•æ„/cutå¿—çš„å轉效果會抵消掉堅毅æ„志所帶來的ç«ç„°æŠ—性。 -guide.bloodmagic.entry.ritual.greenGrove.info=上星期我開始為æ比略講授跨領域的魔法。除了血之魔法外，我的æ¯å€‹å­¸å¾’都學éŽä¸€äº›å…¶å®ƒå½¢å¼çš„魔法。其實，學什麼魔法都沒有關係，åªè¦å®ƒä¸æµªè²»è³‡æºå°±å¥½â€”—我曾經使用éŽä¾†è‡ªé™é çš„æ±æ–¹çš„Ars部è½çš„魔法，但是因為Etherium之æºå¹¾ä¹Žè¢«æ¾ä¹¾äº†ï¼Œæ‰€ä»¥é€™å€‹è¨ˆåŠƒä¹Ÿå°±å¤­æŠ˜äº†ã€‚\n\tæ比略決定學習秘術學，一門利用世界本身的魔法來創造屬於自己的魔法的魔法。它/cut正好和血之魔法相抗衡——後者使用的是生命本身具有的魔法。為了解釋清楚，我決定用作物生長為例å­ï¼Œå±•ç¤ºå…©é–€é­”法之間的差別。\n\t「在秘術學中，魔法師會使用以Herbaæºè³ªç…‰æˆçš„生長催化劑，ã€æˆ‘一邊這樣說著，一邊指著教室牆上掛著的一幅æºè³ªåˆæˆåœ–；誠然這節課其實åªæœ‰æ比略一個學生，但人總還是需è¦é»žæ¨‚趣的，「一å°è‚¡éˆæ°£å’Œæºè³ªæ··åˆåœ¨ä¸€èµ·å¯ä»¥åˆºæ¿€æ¤ç‰©çš„/cutå…‰åˆä½œç”¨ï¼Œå¾žè€Œä»¤æ¤ç‰©å¸æ”¶æ›´å¤šçš„光能，以此加速其生長。然而，這需è¦ä¿è­‰ä½œç‰©ç”Ÿé•·åœ¨è‚¥æ²ƒçš„土地上，å¦å‰‡ä½œç‰©æœ€çµ‚åªèƒ½æž¯èŽæ­»äº¡ã€‚「\n\t然後我找來了土儀å¼çŸ³å’Œæ°´å„€å¼çŸ³å„四塊，擺出一個圓形，並在圓心處放置主儀å¼çŸ³ã€‚「血魔法與之正好相å，ã€æˆ‘一邊說著，一邊驅動了主儀å¼çŸ³ï¼Œä¸¦åœ¨ä¸Šé¢è“‹ä¸Šäº†ä¸€å±¤æ³¥åœŸã€‚「你å¯ä»¥ç”¨ä½ è‡ªå·±çš„生命力，或者別的動物的生命力，來加速作/cut物的生長，從而節約一般肥料的使用。本質上來講，這個儀å¼æœƒä¸æ–·çµ¦äºˆæ¤ç‰©é¤Šåˆ†ï¼Œå¾žè€Œä½¿å…¶é¤Šåˆ†ä¿æŒåœ¨ä¸€å€‹è¼ƒé«˜æ°´å¹³ã€‚ã€\n\t我å‘土中撒了幾粒種å­ï¼Œå°å¿ƒç¿¼ç¿¼åœ°ç”¨åœŸè“‹å¥½ï¼Œç„¶å¾Œå¾žè²¼èº«æ³•è¢ä¸­æŽå‡ºä¸€å€‹æ°´ç“¶ï¼Œæ‹”開瓶塞然後將水ç‘在了泥土上。「這個éŽç¨‹ä¸éœ€è¦é™½å…‰ï¼Œå› ç‚ºå®ƒç”¨åˆ°äº†å¦ä¸€ç¨®å½¢å¼çš„能é‡ã€‚儘管如此，陽光還是很有用的——畢竟作物一開始ä¸æ˜¯é€™æ¨£ç”Ÿ/cut長的嘛ï¼ã€\n\t在我解釋的時候，有幾點綠色的æ±è¥¿å°±å·²ç¶“冒出了土堆。æ¯æœ‰ä¸€ç‰‡æ–°è‘‰é•·å‡ºï¼Œæˆ‘都會感å—到一絲壓力，雖然ä¸å¤§ï¼Œä½†æœƒä¸æ–·ç©ç´¯ã€‚下課後，我開始清ç†å¯¦é©—用的土堆，然後決定去æ‘å­è£¡èµ°ä¸€åœˆï¼šæˆ‘ç¾åœ¨æœ‰å¹¾æ–—å°éº¥è¦è³£ã€‚\n\t---------------\n\t綠å¢å„€å¼ï¼Œæ­£å¦‚å…¶å，以血術士之血為養料，加速儀å¼é™„近之æ¤ç‰©ï¼Œè«¸å¦‚å°éº¥ã€èƒ¡è˜¿è””之類，/cut的生長。默èªï¼Œå„€å¼åªåœ¨3x3範åœå…§å°‹æ‰¾åˆé©çš„目標，æ¯ç§’大概åªæœ‰30%%的概率æˆåŠŸå‚¬ç”Ÿã€‚用儀å¼èª¿æ•´é‰—調整後å¯å°‹æ‰¾5x5範åœå…§çš„至多81棵作物。\n\tå¦å¤–，惡魔æ„å¿—å°é€™å€‹å„€å¼ä¹Ÿæœ‰æ•ˆæžœã€‚原生æ„志會加快其工作速度，效果å–決於濃度，但æ¯æ¬¡å‚¬ç”Ÿæœƒå¤šæ¶ˆè€—0.05點æ„志。\n\t若輔以復仇æ„志，儀å¼ä¾èˆŠæœƒåœ¨æ¯æ¬¡å‚¬ç”Ÿæ™‚多消耗0.05點æ„志，但會增加催生æˆåŠŸçš„概率。/cut之å‰æ到默èªæ¦‚率是30%%，但若是你有100點復仇æ„志，這個概率會上å‡è‡³80%%。\n\t破壞æ„å¿—å¯ä»¥æ高儀å¼çš„工作範åœï¼Œé€™æ„味著你的一個儀å¼å¯ä»¥è¦†è“‹åˆ°æ›´å¤šçš„作物上。而且這個儀å¼ä¸æœƒæ¶ˆè€—破壞æ„å¿—ï¼ç„¶è€Œï¼Œè‹¥æ˜¯æ„志的濃度下é™ï¼Œè€Œä½ è¨­å®šçš„範åœæ¯”å„€å¼æœ€å¤§çš„工作範åœé‚„大，那儀å¼å°±æœƒåœæ­¢å·¥ä½œï¼Œéœ€è¦æ‰‹å‹•ä¿®å¾©ã€‚\n\t/cut堅毅æ„志會讓儀å¼åœ¨å‚¬ç†Ÿä½œç‰©çš„åŒæ™‚ä¿è­‰è€•åœ°å·²ç¶“éŽç¿»æ•´ä¸”ä¿æŒæ¿•æ½¤ã€‚å¦å¤–，若是儀å¼çš„工作範åœå…§æœ‰æŽ‰åœ¨åœ°ä¸Šçš„種å­ï¼Œå …毅æ„志會讓儀å¼è‡ªå‹•ç”¨é‚£äº›ç¨®å­ä¾†è£œç¨®ã€‚自然地，這個效果會消耗æ„志，但消耗速度是固定的。\n\tè…è•æ„志的效果則完全å轉了這個儀å¼çš„工作原ç†â€”—æ¤ç‰©æœƒåœ¨é€™ç¨®æ„志的影響下轉而去主動å¸è¡€ï¼Œå°±åƒæ°´è›­é‚£æ¨£ã€‚具體來說：æ¯ä¸€åˆ»ï¼Œè‹¥æ¤ç‰©é™„/cut近若有怪物，那麼æ¤ç‰©å’Œæ€ªç‰©éƒ½æœƒå—到傷害，且兩者傷害æˆæ­£æ¯”。事實上直接用怪物當作æ¤ç‰©çš„養料是有效的ï¼å¦å¤–，æ¯å€‹æ€ªç‰©ä¸Šæ¯æœ‰10秒中的負é¢æ•ˆæžœï¼Œå°±æœƒæ¶ˆè€—0.2點è…è•æ„志。 -guide.bloodmagic.entry.ritual.magnetism.info=ç£åŠ›å„€å¼å¯è¬‚是採石場必備。這個儀å¼æœƒè£½é€ å‡ºä¸€æ—‹è½‰çš„ç£å ´ï¼Œå°‡æ·±åŸ‹åœ°ä¸‹çš„è±å¯Œç¤¦è—å¸åˆ°åœ°é¢ä¸Šã€‚這個儀å¼ä¸¦ä¸æœƒå¸èµ°çŸ³é ­ï¼Œæ‰€ä»¥åœ°é¢ä¸Šä¹Ÿä¸æœƒå› æ­¤å‡ºç¾å¤§æ´žï¼Œå‰æ是地下並éžå…¨æ˜¯ç¤¦çŸ³ã€‚這個儀å¼æ¯2秒就會試著å¸ä¸€å€‹ç¤¦çŸ³ï¼Œæ¯æˆåŠŸå¸å–一個礦石便消耗50LP。\n\t/cut默èªï¼Œé€™å€‹å„€å¼çš„工作範åœæ˜¯ä»¥ä¸»å„€å¼çŸ³ç‚ºä¸­å¿ƒçš„7x7正方形å€åŸŸï¼ˆå³åŠå¾‘為3）。目å‰ï¼Œæ„å¿—é‚„ä¸èƒ½å½±éŸ¿é€™å€‹å„€å¼çš„工作，所以你åªèƒ½é€šéŽåœ¨ä¸»å„€å¼çŸ³æ­£ä¸‹æ–¹æ”¾ç½®æŸç¨®åƒ¹å€¼é«˜æ˜‚的方塊來æ高其工作範åœã€‚一個éµå¡Šå¯ä»¥è®“åŠå¾‘增加到7。金塊則是增加到15。鑽石效果最好，å¯ä»¥å°‡å…¶å·¥ä½œç¯„åœæ‹“展為63x63，屆時你åªéœ€è¦çœ‹è‘—å„€å¼æ…¢æ‚ æ‚ åœ°æŠŠç¤¦çŸ³å¸åˆ°ä¸»å„€å¼çŸ³ä¸Šæ–¹3x3的空間裡就好了。 -guide.bloodmagic.entry.ritual.crusher.info=挖掘儀å¼çš„é‹è¡Œå分簡單：åªéœ€è¦å°‡ç®±å­ä¹‹é¡žçš„æ±è¥¿æ”¾åœ¨ä¸»å„€å¼çŸ³æ­£ä¸Šæ–¹ï¼Œå®ƒå°±å¯ä»¥æ¶ˆè€—LP並ä¸æ–·æŒ–掘主儀å¼çŸ³æ­£ä¸‹æ–¹3x3x3範åœå…§çš„方塊了。儀å¼æ¯2秒會嘗試挖掘，如果æˆåŠŸï¼Œæœƒæ¶ˆè€—7LP。挖下來的方塊會放進與儀å¼éˆæŽ¥çš„容器中，如果容器已滿，就會掉在那個容器的上é¢ã€‚\n\t若以原生æ„å¿—é©…å‹•å„€å¼ï¼Œå„€å¼å°‡æœƒå·¥ä½œå¾—更快，但æ¯æ¬¡æˆåŠŸæŒ–掘時都會多消耗0.05點原生æ„志。\n\t/cut破壞æ„志會令儀å¼åœ¨æŒ–掘方塊時æ“有時é‹çš„效果。目å‰ä¾†çœ‹ï¼Œä¸è«–æ供多少æ„志，時é‹çš„等級永é æ˜¯ä¸‰ï¼Œä¸¦ä¸”æ¯æ¬¡æˆåŠŸæŒ–掘都會多消耗0.2點此種æ„志。\n\t堅毅æ„志會令儀å¼åœ¨æŒ–掘方塊時æ“有精準採集的效果。æ¯æ¬¡æˆåŠŸæŒ–掘都會多消耗0.2點此種æ„志。\n\tè…è•æ„志會令儀å¼åœ¨æŒ–掘方塊時經éŽæŸç¨®æ¶²é«”的浸洗。/cut這種液體帶有粉碎的效果，æ›è¨€ä¹‹â€”—此時你挖掘的éµç¤¦æ™‚會變æˆå…©å †éµç ‚。目å‰é€™ç¨®æ¶²é«”å¯ä»¥æ˜¯åŸºç¤Žåˆ‡å‰Šæ²¹æˆ–爆炸ç«è—¥ã€‚根據所有液體的ä¸åŒï¼Œå„€å¼æ¶ˆè€—çš„æ„志數é‡ä¹Ÿä¸åŒã€‚這個效果會覆蓋精準採集的效果。\n\t/cut復仇æ„志的效果和壓擠å°è¨˜å·®ä¸å¤šï¼Œå³æœƒå£“縮挖下來的æ±è¥¿ã€‚舉例：箱å­è£¡ç¾åœ¨æœ‰65紅石，一次挖掘後會將其中9個紅石壓縮為一紅石塊，留下56ç´…/cut石。僅當壓縮æˆåŠŸæ™‚å„€å¼æ‰æœƒæ¶ˆè€—0.2點復仇æ„志。 -guide.bloodmagic.entry.ritual.highJump.info=這個儀å¼æœƒç”¨å¼·å¤§çš„æ°£æµå°‡èµ°åœ¨ä¸Šé¢çš„人é€ä¸Šå¤©ã€‚å¦å¤–，這個儀å¼é‚„會令摔下來的人å…å—掉è½å‚·å®³ã€‚潛行å³å¯è¦é¿å„€å¼çš„效果。\n\tæ¯æ¬¡æˆåŠŸç”¢ç”Ÿæ°£æµæ™‚，儀å¼éƒ½æœƒä»¥5LP/tick的速度消耗LP；若沒能產生氣æµï¼Œå‰‡ä¸æœƒæ¶ˆè€—LP。 -guide.bloodmagic.entry.ritual.speed.info=å„€å¼å¦‚å…¶å，速移儀å¼å¯ç”¨ä¾†åŠ é€Ÿç§»å‹•ã€‚å„€å¼æœ¬èº«å¯ä»¥æŒ‡å‘ä»»æ„æ–¹å‘，而在儀å¼çš„生效範åœå…§çš„實體都會æœå„€å¼æ‰€æŒ‡çš„æ–¹å‘加速。儀å¼çš„指å‘由那塊薄暮儀å¼çŸ³çš„ä½ç½®ç¢ºå®šã€‚默èªï¼Œå·¥ä½œç¯„åœæ˜¯åŠå¾‘二格見方，但å¯ä»¥ç”¨å„€å¼èª¿æ•´é‰—調整。水平方å‘上的速度加æˆæ˜¯3方塊/tick，垂直方å‘上則是1.2方塊/tick。\n\t以原生æ„志驅動的速移儀å¼æœƒä½¿ç”Ÿç‰©ç²å¾—更快的速度。/cut當周åœå……滿原生æ„志（å³100點）時，速度會翻一番。æ¯æ¬¡åŠ æˆéƒ½æœƒæ¶ˆè€—0.1點æ„志。\n\t復仇æ„志將會迫使儀å¼å°æˆå¹´å‹•ç‰©ç„¡æ•ˆï¼Œè€Œç ´å£žæ„志會迫使儀å¼å°å¹¼å¹´å‹•ç‰©ç„¡æ•ˆã€‚復仇和破壞æ„志都會令儀å¼å°çŽ©å®¶ç„¡æ•ˆã€‚è‹¥åŒæ™‚使用這兩種æ„志，則儀å¼åªæœƒå°çŽ©å®¶æœ‰æ•ˆã€‚這些特性å°æ–¼å‹•ç‰©è¾²å ´ï¼Œç”šè‡³æ˜¯éŽæ¿¾å°æ®­å±éƒ½æ˜¯å分有用的。儀å¼åªæœ‰åœ¨æˆåŠŸåŠ é€Ÿæ™‚消耗0.05點æ„志。æ›è¨€ä¹‹ï¼Œ/cutå°æ–¼å¹¼å¹´å‹•ç‰©ä¾†èªªï¼Œå„€å¼ä¸æœƒæ¶ˆè€—破壞æ„志，也ä¸æœƒæ¶ˆè€—LP——因為這時的儀å¼ä¸æœƒå°å¹¼å¹´å‹•ç‰©æœ‰æ•ˆã€‚ -guide.bloodmagic.entry.ritual.wellOfSuffering.info=å°æ–¼é‚£äº›ä¸æƒ³ç”¨è‡ªå·±çš„血來補充LP供應的血術士，苦難之井便是他們的é¸æ“‡ï¼šé€™å€‹å„€å¼æœƒå°‡æ–¹åœ“å格範åœå…§çš„éžçŽ©å®¶å¯¦é«”的生命èšé›†åˆ°è¡€ä¹‹ç¥­å£‡è£¡ã€‚苦難之井åªæœƒåœ¨ä¸Šä¸‹åæ ¼ã€æ°´å¹³æ–¹å‘上方圓五格的範åœå…§å°‹æ‰¾è¡€ä¹‹ç¥­å£‡ã€‚如果找ä¸å¥—祭壇，儀å¼ä¸æœƒå·¥ä½œã€‚å„€å¼æ¯æ¶ˆè€—1LP便å¯å¾žæ€ªç‰©ä¸ŠæŠ½å‡º25LP；若是é‡å°éžæ•µå°çš„生物，則å¯æŠ½å‡º100LP；具體數é‡æœƒå—到ç»ç¥­ç¬¦æ–‡çš„增幅的影響。 -guide.bloodmagic.entry.ritual.featheredKnife.info=羽刀儀å¼åƒæ˜¯ä¸€æŠŠç›´æ’使用者身上的刀，抽å–其血液，並為附近的血之祭壇補充能é‡ã€‚一般，羽刀儀å¼é¦–先會在以主儀å¼çŸ³ç‚ºä¸­å¿ƒçš„11x11x21的範åœå…§å°‹æ‰¾ä¸€åº§ç¥­å£‡â€”—若找ä¸åˆ°ç¥­å£‡ï¼Œå„€å¼ä¸æœƒå·¥ä½œï¼›æ‰¾åˆ°ç¥­å£‡å¾Œå„€å¼æœƒè¨˜ä¸‹é€™å€‹ç¥­å£‡çš„ä½ç½®ã€‚當有玩家進入儀å¼çš„範åœï¼ˆé»˜èªç‚º31x31x41）後，儀å¼æœƒæ¯ç§’å°çŽ©å®¶é€ æˆä¸€é»žå‚·å®³ï¼Œä¸¦å°‡å…¶è½‰åŒ–為LPé€å…¥ç¥­å£‡ä¸­ã€‚這個éŽç¨‹æœƒå—到血之符文的影響。傷害玩家的速度å¯/cut以調整。ä¸è¦æ“”心，這個儀å¼ä¹Ÿæœ‰å®‰å…¨ä¿è­·æ©Ÿåˆ¶ï¼šå®ƒä¸æœƒæ”»æ“Šé‚£äº›åªå‰©ä¸‹ç™¾åˆ†ä¹‹ä¸‰åä¸åˆ°çš„生命值的玩家。\n\t有數種惡魔æ„å¿—å¯ä»¥å½±éŸ¿é€™å€‹å„€å¼çš„工作。比如，原生æ„志——它å¯ä»¥æ高儀å¼çš„工作速度，準確地說是一秒攻擊玩家兩次。但æ¯æ¬¡æ”»æ“Šæ™‚會多消耗0.05點原生æ„志。\n\t若周åœçš„éˆåŸŸä¸­æœ‰è‡³å°‘å點堅毅æ„志，儀å¼æœƒå°‡å®‰å…¨é–¾å€¼/cut從百分之三åæ高到百分之七å。這層ä¿è­·ä¸æœƒå¤šæ¶ˆè€—æ„志。\n\t若周åœçš„éˆåŸŸä¸­æœ‰è‡³å°‘å點復仇æ„志，儀å¼æœƒé€æ­¥é™ä½Žå®‰å…¨é–¾å€¼è‡³ç™¾åˆ†ä¹‹å。若åŒæ™‚有至少å點堅毅æ„志，那麼後者的百分之七å的閾值將åªå°å„€å¼çš„主人有效果。和堅毅æ„志一樣，這個效果ä¸æœƒå¤šæ¶ˆè€—æ„志。\n\t/cut若儀å¼é™„è¿‘çš„éˆåŸŸä¸­æœ‰ç ´å£žæ„志，這個儀å¼çš„生命值轉LP的效率會有所æ高。轉化率的增幅與破壞æ„å¿—çš„å«é‡æˆæ­£æ¯”，最高為五分之一，å°æ‡‰100點破壞æ„志。這個效果å¯ä»¥èˆ‡ç¬¦æ–‡ã€æŸéˆè­·ç”²å‡ç´šå’Œç†é¦™ç–ŠåŠ ã€‚æ¯è½‰åŒ–一點HP，會多消耗0.05點破壞æ„志。\n\t說到ç†é¦™â€”—è…è•æ„志會令ç†é¦™çš„效果與此儀å¼ç–ŠåŠ ã€‚若你身上沒有「魂飛魄散ã€æ•ˆæžœï¼Œä¸¦ä¸”你正好處在ç†é¦™çš„效果/cut範åœå…§ï¼Œä½ çš„生命值會被直接扣至安全閾值，並將轉化出的LP一次性注入祭壇中，並給予你魂飛魄散的效果。此效果å¯èˆ‡ç ´å£žæ„志疊加。 -guide.bloodmagic.entry.ritual.regen.info=雖然ä»æœ‰çˆ­è­°ï¼Œä½†é€™é‡ç”Ÿå„€å¼å°æ–¼é‚£äº›æƒ³ç”¨è‡ªå·±çš„血來驅動魔法的血術士們來說，ä»ç„¶æ˜¯ä¸€å€‹ä¸éŒ¯çš„é¸æ“‡ï¼Œå› ç‚ºå®ƒæœƒåˆ©ç”¨è¡€è¡“士的魔法在儀å¼ç¯„åœå…§ç”¢ç”Ÿæ²»ç™‚光環的效果，藉由此治癒儀å¼ç¯„åœå…§çš„生物，包括血術士他們自己。儀å¼æ¯2.5秒會給15格範åœå…§çš„生物附加生命回復I的效果；å°æ–¼çŽ©å®¶ä¾†èªªå®ƒæœƒæ¶ˆè€—100LP，å°æ–¼å…¶å®ƒç”Ÿç‰©ä¾†èªªæ˜¯10LP。\n\t/cutè…è•æ„志會給儀å¼å†åŠ ä¸Šä¸€å€‹ã€Œå¸è¡€é¬¼ç¯„åœã€ã€‚此時，儀å¼æœƒå°æ‰€æœ‰éžçŽ©å®¶ç”Ÿç‰©éš¨æ©Ÿé€ æˆå‚·å®³ï¼Œä¸¦è—‰ç”±æ­¤æ²»ç™‚玩家。æ¯ä¸€å€‹å·¥ä½œçš„tick中它都會消耗0.04點è…è•æ„志並將1點生命值轉移到玩家身上。 -guide.bloodmagic.entry.ritual.harvest.info=這個儀å¼å¯ä»¥æ”¶ç©«é»˜èªä»¥å„€å¼çŸ³ä¸Šæ–¹9x9x5範åœå…§çš„所有作物，並將收穫到的種å­è£œç¨®å›žåŽ»ã€‚所有收穫到的物å“都會掉è½åœ¨åŽŸåœ°ã€‚å„€å¼å·¥ä½œé »çŽ‡ç‚º5tick嘗試一次，æ¯æ¬¡æˆåŠŸæ”¶ç©«éƒ½æœƒæ¶ˆè€—20LP。\n\tå¯ä»¥æ”¶ç©«çš„作物包括但ä¸é™æ–¼ï¼šå—ç“œã€å°éº¥ã€èƒ¡è˜¿è””ã€åœŸè±†ã€åœ°ç„ç–£ã€ä»™äººæŽŒã€ç”˜è”—等。時刻記ä½ï¼Œé€™å€‹å„€å¼ä¸¦ä¸æœƒå°å®ƒæ­£åœ¨æ”¶å‰²çš„作物作任何å‡è¨­â€”—åªè¦å®ƒè¢«èªç‚ºæ˜¯ä¸€/cut種å¯ä»¥æ”¶å‰²çš„作物，這個儀å¼å°±å¯ä»¥æ”¶å‰²ã€‚（譯註：更精確地說，是指有å°æ‡‰çš„HarvestHandler支æŒçš„作物。） -guide.bloodmagic.entry.ritual.interdiction.info=在傳說中的å¤ä»£ç…‰é‡‘術設備的基礎上，我們研發出了這個儀å¼ï¼Œå¯å°‡ä»»ä½•ä¸æ˜¯çŽ©å®¶çš„生物趕出儀å¼æ‰€è¦†è“‹çš„範åœã€‚默èªï¼Œä»»ä½•è·é›¢æ­¤å„€å¼çš„主儀å¼çŸ³ä¸è¶…éŽå…©æ ¼çš„éžçŽ©å®¶ç”Ÿç‰©çš„移動速度都會被此儀å¼å¹²æ¶‰åˆ°ã€‚è¦æ³¨æ„的是，儘管儀å¼ç¯„åœå…§çš„生物ä¸æœƒè¢«æŽ‰è½å‚·å®³å½±éŸ¿ï¼Œä½†ä¸€æ—¦è¶…出了儀å¼çš„覆蓋範åœï¼Œä¿è­·å°±æœƒå¤±æ•ˆã€‚ -guide.bloodmagic.entry.ritual.containment.info=å’Œç¦æ­¢å„€å¼æ­£å¥½ç›¸å，牽制儀å¼æœƒè©¦åœ–將所有生物全部拉進儀å¼ä¸Šæ–¹çš„範åœä¸­ï¼Œä¸¦å›°ä½å®ƒå€‘，使其無法移動。默èªç¯„åœæ˜¯æ°´å¹³æ–¹å‘上3格見方，從最低的儀å¼çŸ³åˆ°æœ€é«˜çš„å„€å¼çŸ³ç‚ºæ­¢ã€‚這個範åœå¯ä»¥èª¿æ•´ã€‚\n\t/cut默èªï¼Œå„€å¼çš„消耗是æ¯å€‹ç”Ÿç‰©æ¯tick1LP。沒有在拉生物時ä¸æœƒæ¶ˆè€—LP。 -guide.bloodmagic.entry.ritual.suppression.info=抑液儀å¼æœƒå£“制其影響範åœå…§çš„所有液體——æ›è¨€ä¹‹ï¼Œå°‡ç¯„åœå…§çš„液體全替æ›ç‚ºç©ºæ°£ã€‚它的工作範åœå¤§ç´„是åŠå¾‘10格的上åŠçƒã€‚工作時，LP消耗速度為2LP/tick。儀å¼åœæ­¢å·¥ä½œæ™‚會將所有被替æ›çš„液體全部放置回去。 -guide.bloodmagic.entry.ritual.expulsion.info=å‡å¦‚你在玩æœå‹™å™¨æ™‚，你發ç¾ï¼Œå‡ºæ–¼ç¨®ç¨®ç†ç”±ï¼Œä½ éœ€è¦æ‹’絕æŸäº›çŽ©å®¶çš„造訪，然後你發ç¾åŠ›å ´è­·ç›¾å’Œæ®ºäººä¸çœ¨çœ¼çš„巨型轉å­æ ¹æœ¬ä¸èƒ½é˜»æ“‹ä»–們。那麼就是這個儀å¼å‡ºå ´çš„時刻了ï¼åœ¨å‚³é€é­”法的幫助下這個儀å¼æœƒå¤§å¤§ç·©è§£ä½ çš„å•é¡Œï¼\n\t若有玩家進入此儀å¼çš„範åœå…§ï¼Œä¸¦ä¸”這個玩家並ä¸æ˜¯å„€å¼çš„主人，那麼這個玩家就會被隨機傳é€åˆ°åŠå¾‘100格的範åœä¸­çš„æŸå€‹åœ°æ–¹ã€‚當然這個儀/cutå¼é‚„有一種類似白å單的功能：在主儀å¼çŸ³ä¸Šæ”¾ä¸€å€‹ç®±å­ï¼Œç„¶å¾Œå°‡é‚£äº›èˆ‡ä¸æƒ³è¢«å‚³é€çš„玩家ç¶å®šçš„物å“放進箱å­è£¡ï¼Œé€™äº›çŽ©å®¶å°±ä¸æœƒè¢«å‚³é€èµ°äº†ã€‚\n\tæ¯å‚³é€æˆåŠŸä¸€æ¬¡æœƒæ¶ˆè€—2000LP。 -guide.bloodmagic.entry.ritual.zephyr.info=和風之喚——以一把å¤åŠçš„å字命å——å¯ä»¥è—‰ç”±é¢¨çš„力é‡å°‡é™„近的物å“æ²èµ·ä¾†ä¸¦é€å…¥èˆ‡ä¹‹éˆæŽ¥çš„ç®±å­è£¡ï¼ˆé»˜èªï¼Œåªéœ€è¦æŠŠç®±å­æ”¾åœ¨ä¸»å„€å¼çŸ³æ­£ä¸Šæ–¹å³å¯ï¼‰ã€‚這個éŽç¨‹å¤§æ¦‚一瞬間就å¯ä»¥å®Œæˆï¼Œæ‰€ä»¥ä½ ä¸ç”¨æ“”心有什麼奇怪的å¸åŠ›å•é¡Œï¼\n\t默èªçš„工作範åœæ˜¯ä¸»å„€å¼çŸ³æ–¹åœ“5格之內的方形。 -guide.bloodmagic.entry.ritual.laying.info=很多時候，自動化任務需è¦æŸç¨®è‡ªå‹•æ”¾ç½®æ–¹å¡Šçš„手段。這個儀å¼ä¾¿å¯ä»¥å¾žé™„è¿‘çš„ç®±å­ä¸­ï¼ˆé»˜èªï¼Œæ˜¯ä¸»å„€å¼çŸ³æ­£ä¸Šæ–¹ï¼‰å–出方塊並放置在儀å¼çš„內部。具體來說，是放置在è·é›¢ä¸»å„€å¼çŸ³å…©æ ¼é çš„地方，且高度相åŒã€‚å分é©åˆåœ¨å»ºé€ æ¨¹å ´æ™‚用於自動種樹苗。æ¯æ”¾ç½®ä¸€å€‹æ–¹å¡Šæ¶ˆè€—50LP。 -guide.bloodmagic.entry.ritual.timberman.info=種了一堆樹？想必你需è¦é€™å€‹å„€å¼ã€‚ä¼æž—å„€å¼æœƒå°‡å„€å¼æŒæœ‰è€…çš„LP用來驅使一個無形的幽éˆï¼Œä»¥ç ä¼é™„近的樹木，並將ç ä¸‹ä¾†çš„木頭放入附近的箱å­è£¡ã€‚默èªï¼Œå®ƒçš„工作範åœæ˜¯ä¸»å„€å¼çŸ³å¾€ä¸Š30格，æ¯å€‹æ°´å¹³æ–¹å‘上å„延伸10格形æˆçš„長方體。æ¯ç æŽ‰ä¸€å¡Šæœ¨é ­éœ€è¦æ¶ˆè€—10LP。 -guide.bloodmagic.entry.ritual.meteor.info=就目å‰ä¾†èªªï¼Œé€™å€‹å„€å¼æ˜¯æ‰€æœ‰å„€å¼ä¸­æœ€å¼·å¤§çš„å„€å¼ä¹‹ä¸€ã€‚驅動此儀å¼éœ€è¦æ¶ˆè€—一百è¬LP，並且還有一段冷å»æ™‚間。然而它的效果也å分強大——åªéœ€æä¾›åˆé©çš„祭å“，它就å¯ä»¥å¾žå®‡å®™ä¸­å¬å–šä¸€é¡†éš•çŸ³ä¸¦ç›´æŽ¥ç ¸å‘地é¢ã€‚誠然，這樣一個大傢伙會在地é¢ä¸Šé€ æˆå¤§çˆ†ç‚¸ï¼Œä½†å› ç‚ºå®ƒä¾†è‡ªå®‡å®™ä¸­ï¼Œæ‰€ä»¥å¯èƒ½æœƒåŒ…å«å¤§é‡ç¨€æœ‰ç¤¦çŸ³ã€‚ \n\t/cutå¯ç”¨çš„祭å“包括éµå¡Šã€é‡‘塊和鑽石。（事實上，å¯ç”¨çš„祭å“是å¯ä»¥è¢«æ•´åˆä½œè€…或用戶控制的） -guide.bloodmagic.entry.ritual.downgrade.info=為了ç²å¾—更強大的力é‡ï¼Œä½ æˆ–許需è¦ç»ç¥­æŸç¨®æ±è¥¿ä½œç‚ºäº¤æ›ã€‚而這「沉é‡éˆé­‚的懺悔ã€çš„任務正是如此——將一些物å“ç»ç¥­çµ¦ä¸€å€‹è™›ç„¡ç¸¹ç·²çš„實體，你便å¯ä»¥ä»¥æŸéˆè­·ç”²çš„屬性下é™ç‚ºä»£åƒ¹ï¼Œä¾†æ›å–更多的å‡ç´šé»žæ•¸ã€‚å„€å¼è½æˆå¾Œï¼Œä½ éœ€è¦åœ¨æœ€é«˜çš„空白儀å¼çŸ³æŽ›ä¸€å€‹é¢æœä¸»å„€å¼çŸ³çš„物å“展示框，然後在薄暮儀å¼çŸ³ä¸Šæ”¾ä¸€å€‹èƒ½è£æ±è¥¿çš„方塊（例如箱å­ï¼‰ã€‚è¦ç»ç¥­çš„物å“需è¦æ”¾å…¥é‚£å€‹è£æ±è¥¿çš„地方，而核心物å“/cut應掛入物å“展示框內。儀å¼é©…動後，你便å¯ä»¥è¹²åœ¨ä¸»å„€å¼çŸ³ä¸Šä¸¦ç²å¾—é™ç´šå¾Œçš„物å“。\n\t舉例，å°æ–¼æ·¬ç«é™ç´šä¾†èªªï¼Œæ ¸å¿ƒç‰©å“是個水瓶，需è¦ç»ç¥­çš„物å“是é¾æ¯ã€‚\n\t所有å¯ç”¨çš„é™ç´šéƒ½å¯ä»¥é€šéŽJEI查詢到——查詢主儀å¼çŸ³çš„用途å³å¯ã€‚å¦å¤–，å°æ–¼ä¸€å€‹ç‰¹å®šçš„é™ç´šä¾†èªªï¼Œæ ¸å¿ƒç‰©å“是一定的，所以你也å¯ä»¥é¸æ“‡æŸ¥è©¢æŸå€‹ç‰©å“來定ä½æŸå€‹é™ç´šæ‰€éœ€çš„祭å“。 - -# Architect Entries -guide.bloodmagic.entry.architect.intro=å‰è¨€ -guide.bloodmagic.entry.architect.bloodaltar=血之祭壇 -guide.bloodmagic.entry.architect.ash=å¥§è¡“ç²‰ç° -guide.bloodmagic.entry.architect.divination=å åœå°è¨˜ -guide.bloodmagic.entry.architect.soulnetwork=éˆé­‚網絡 -guide.bloodmagic.entry.architect.weakorb=è™›å¼±æ°£è¡€å¯¶ç  -guide.bloodmagic.entry.architect.incense=ç†é¦™ç¥­å£‡ -guide.bloodmagic.entry.architect.bloodrune=祭壇å‡ç´š -guide.bloodmagic.entry.architect.inspectoris=指示之書 -guide.bloodmagic.entry.architect.runeSpeed=速度符文 -guide.bloodmagic.entry.architect.water=水之å°è¨˜ -guide.bloodmagic.entry.architect.lava=熔岩å°è¨˜ -guide.bloodmagic.entry.architect.lavaCrystal=熔岩水晶 -guide.bloodmagic.entry.architect.apprenticeorb=å­¸å¾’æ°£è¡€å¯¶ç  -guide.bloodmagic.entry.architect.dagger=犧牲匕首 -guide.bloodmagic.entry.architect.runeSacrifice=ç»ç¥­ç¬¦æ–‡ -guide.bloodmagic.entry.architect.runeSelfSacrifice=犧牲符文 -guide.bloodmagic.entry.architect.holding=集æŒå°è¨˜ -guide.bloodmagic.entry.architect.air=風之å°è¨˜ -guide.bloodmagic.entry.architect.void=虛空å°è¨˜ -guide.bloodmagic.entry.architect.greenGrove=綠å¢å°è¨˜ -guide.bloodmagic.entry.architect.fastMiner=速掘å°è¨˜ -guide.bloodmagic.entry.architect.seer=見解å°è¨˜ -guide.bloodmagic.entry.architect.magicianOrb=æ³•å¸«æ°£è¡€å¯¶ç  -guide.bloodmagic.entry.architect.capacity=增容符文 -guide.bloodmagic.entry.architect.displacement=轉ä½ç¬¦æ–‡ -guide.bloodmagic.entry.architect.affinity=元素å°è¨˜ -guide.bloodmagic.entry.architect.lamp=血光å°è¨˜ -guide.bloodmagic.entry.architect.magnetism=ç£å¼•å°è¨˜ -guide.bloodmagic.entry.architect.peritia=經驗之書 -guide.bloodmagic.entry.architect.livingArmour=æŸéˆè­·ç”² -guide.bloodmagic.entry.architect.upgradeTome=æŸéˆè­·ç”²å‡ç´šä¹‹æ›¸ -guide.bloodmagic.entry.architect.teleposer=傳é€å™¨ -guide.bloodmagic.entry.architect.boundBlade=æŸç¸›ä¹‹åŠ -guide.bloodmagic.entry.architect.boundTool=æŸç¸›å·¥å…· -guide.bloodmagic.entry.architect.weakShard=虛弱氣血碎片 -guide.bloodmagic.entry.architect.masterOrb=å°Žå¸«æ°£è¡€å¯¶ç  -guide.bloodmagic.entry.architect.runeOrb=寶ç ç¬¦æ–‡ -guide.bloodmagic.entry.architect.suppression=抑液å°è¨˜ -guide.bloodmagic.entry.architect.haste=急速å°è¨˜ -guide.bloodmagic.entry.architect.severance=絕影å°è¨˜ -guide.bloodmagic.entry.architect.teleposition=傳é€å°è¨˜ -guide.bloodmagic.entry.architect.compression=壓擠å°è¨˜ -guide.bloodmagic.entry.architect.bridge=影橋å°è¨˜ -guide.bloodmagic.entry.architect.mimic=擬態 -guide.bloodmagic.entry.architect.downgrade=æŸéˆè­·ç”²é™ç´š - -guide.bloodmagic.entry.architect.augmentedCapacity=超容符文 -guide.bloodmagic.entry.architect.charging=充能符文 -guide.bloodmagic.entry.architect.acceleration=促進符文 - -# Architect Entry Texts -guide.bloodmagic.entry.architect.intro.info=大家好，我å«æ比略。你或許已經發ç¾é€™æœ¬æ›¸ä¸¦ä¸å®Œæ•´äº†ï¼Œä½†å¾ˆä¸å¹¸ä½ æ˜¯å°çš„。因為1.7.10->1.8.9->1.9.4åŠä»¥ä¸Šçš„更新，血魔法也發生了巨大的變化。因此，這本書ä¸å¾—ä¸é‡å¯«ã€‚這本書的最終目標是一本研究筆記，或者說是一本真正的書，所以è·é›¢é€™æœ¬æ›¸çœŸæ­£å®Œæˆé‚„有一段è·é›¢ã€‚有鑒於此，我會定期填補這本書中的空白。當然了，一開始這本書裡將全是讀起來味åŒåš¼è Ÿçš„文字（嘛...肯定ä¸æ˜¯é‚£ç¨®å¼•äººå…¥å‹çš„å­—/cut啦，好啦ä¸è¦åœ¨æ„細節），但這個情æ³æœƒéš¨è‘—時間的推移而得到改善的，等待著你的將會是一部血術士們的心路歷程。\n\t但ä¸å¥½æ„æ€æˆ‘想我得趕緊é‡æ–°åˆ‡å…¥è§’色當中去了。*咳嗽è²*\n\t我åæ比略，一å血術士，åŒæ™‚也以「締造者ã€çš„åå­—èžå於世。這本書中包å«äº†æˆ‘å°å為「éˆé­‚網絡ã€çš„自然ç¾è±¡çš„研究，以åŠæˆ‘å°è¡€é­”法師需/cutè¦é©æ‡‰çš„一些設備的物ç†ç‰¹æ€§çš„æ述。從æ­å»ºå¼·å¤§çš„血之祭壇的技è—，到為增強法力而進行的生命ç»ç¥­çš„種種細節，å†åˆ°å„種æ“有強大力é‡çš„魔法符文和å°è¨˜ï¼Œæˆ‘ä¸æ–·åœ°ç™¼ç¾æ–°çš„魔法，ä¸æ–·åœ°ç¸½çµä¸¦æ‰¾åˆ°å¼·åŒ–自己的全新方å¼ã€‚\n\t來å§ï¼Œæ–°å…¥é–€çš„魔法師們，全新的領域在等待著你ï¼\n\t...啊馬格斯說我有時候有點浮誇，但那åˆå¦‚何？ -guide.bloodmagic.entry.architect.bloodaltar.info.1=血之祭壇便是血魔法中最核心的設備之一。它有兩個主è¦ç”¨é€”：åˆæˆæŸäº›ç‰©å“，或將生命精è¯è½‰ç§»åˆ°å¯¶ç ä¸­åŽ»ã€‚然而這兩個用途都需è¦æ¶ˆè€—祭壇中的生命精è¯ã€‚自然地，也有兩種補充生命精è¯çš„æ–¹å¼ï¼šä»¥çŽ©å®¶çš„è¡€æ供生命精è¯ï¼Œæˆ–以別的動物或怪物的血æ供生命精è¯ã€‚ -guide.bloodmagic.entry.architect.bloodaltar.info.2=你需è¦ä¸€æŠŠçŠ§ç‰²åŒ•é¦–æ‰èƒ½å°‡ä½ çš„血轉化為生命精è¯ä¸¦æ³¨å…¥ç¥­å£‡ä¸­ã€‚å…·é«”æ“作如下：首先，站在祭壇æ—；然後，使用匕首傷害自己（å³å³æ“Šï¼‰ï¼Œä½ æœƒæ失一顆心的生命值，祭壇中會多出 200 LP。LP 是生命精è¯çš„ å–®ä½ï¼Œç¨±ç‚ºç”Ÿå‘½é»žæ•¸ï¼ˆLife Point， 縮寫 LP），用於刻畫æŸç¨®ä»» 務需è¦æ¶ˆè€—的生命力——ä¸ï¼Œå’ŒéŠæˆ²çŽ‹ä¸ä¸€æ¨£ã€‚默èªï¼Œæ™®é€šçš„血之祭壇容é‡åƒ…為一è¬ã€‚ä½ é‚„å¯ä»¥æŠŠç‰©å“放入祭壇中（å³æ“Šå³å¯ï¼‰ï¼Œè‹¥å¦‚æ­¤åšï¼Œåˆé©çš„/cut物å“便會觸發åˆæˆé€²ç¨‹ã€‚\n\t祭壇åˆæˆä¸åƒ…需è¦æ¶ˆè€— LP，還需è¦ä¸€å®šçš„層級。滿足 這些æ¢ä»¶å¾Œï¼Œç¥­å£‡ä¾¿æœƒé–‹å§‹è‡ªå‹•æŠ½å– LP 用於åˆæˆï¼Œä¸¦é–‹ 始散發紅色粒å­æ•ˆæžœã€‚è‹¥åˆæˆé‚„未完æˆï¼Œä½†æ­¤æ™‚ LP 已被 抽乾，紅色的粒å­æ•ˆæžœæœƒè½‰ç‚ºç°è‰²ï¼Œåˆæˆé€²åº¦ä¹Ÿæœƒé–‹å§‹å€’退，所以盡é‡é¿å…這種情æ³çš„出ç¾ï¼æœ€å¾Œé‚„有一點，如果你放進祭壇裡的æ±è¥¿æ˜¯æ°£è¡€å¯¶ç ï¼Œé‚£éº¼å®ƒ 會散發紫色的粒å­æ•ˆæžœï¼Œè¡¨æ˜Žå®ƒåœ¨å‘æŸå€‹å¯¶ç ä¸­çŒè¼¸ LP。\n\t事實上，祭壇中有三個存儲 LP 的容器：之å‰æ到的一è¬å®¹ç©æŒ‡çš„是其主容器；除此之外，祭壇還有輸入容器和輸出容器å„一，容ç©å‡ç‚ºä¸»å®¹å™¨å®¹ç©çš„å分之一。默èªï¼Œè¼¸å…¥å®¹å™¨ä¸­çš„生命精è¯æœƒä»¥æ¯ç§’ 20 LP 的速度轉移至主容器中，而主容器中的生命精è¯ä¹Ÿæœƒä»¥åŒæ¨£çš„速度轉移到輸出容器中。如此一來，輸入容器和輸出/cut容器在祭壇中扮演的便是緩è¡å€çš„角色——它們是用來é™åˆ¶å°‡ç”Ÿå‘½ç²¾è¯è¼¸å…¥ç¥­å£‡ï¼Œå’Œå¾žç¥­å£‡ä¸­å°‡ç”Ÿå‘½ç²¾è¯æŠ½å–出來的速度的。 -guide.bloodmagic.entry.architect.ash.info=儘管奧術粉ç°ä¸¦ä¸æ˜¯é€™ä¸€å·çš„核心，但它確實貫穿了本å·æ到的很多é“å…·çš„åˆæˆä¹‹ä¸­ã€‚åˆæˆå¥§è¡“粉ç°éœ€è¦ç”¨åˆ°ç„ç«ç†”çˆå’Œæƒ¡é­”æ„志，關於這些æ±è¥¿çš„細節å¯ä»¥åƒè€ƒã€Šæƒ¡é­”使者》å·ã€‚簡單來說，它是一種二元åˆæˆå·¥å…·ï¼šä½ éœ€è¦ä¸€ç¨®å¯å……當催化劑的å應試劑，以åŠæŸç¨®ç‰©å“作為次è¦åˆæˆæ料。\n\t一份奧術粉ç°å¯ä½¿ç”¨äºŒå次。å°è‘—地é¢æˆ–者牆å£ä½¿ç”¨ä¾¿/cutå¯ç•«å‡ºä¸€å€‹åœ“形的法陣（如果是牆å£ï¼Œä½ åªèƒ½åœ¨ä¸€å€‹æ–¹å‘上看到法陣）。然後，å°æ³•é™£ä¸­å¤®ä½¿ç”¨åˆé©çš„催化劑å³å¯æ”¹è®Šå…¶å½¢ç‹€ï¼Œç•¶ç„¶ä¹Ÿæœƒæ¶ˆè€—催化劑（å³ï¼Œå³æ“Šä½¿ç”¨ï¼‰ã€‚如果法陣沒有變形，那麼你肯定有什麼地方æžéŒ¯äº†ã€‚\n\t在觀察到法陣變形後，你便å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé©çš„次è¦ç‰©å“會啟動法陣，屆時你會看到法陣開始旋轉，並開始產生å„種變化，具體變化隨法/cut陣ä¸åŒè€Œä¸åŒâ€”—但正確啟動的法陣最終都會產生一種新的物å“。\n\t所有用到奧術粉ç°çš„åˆæˆâ€”—我一般管這å«ç…‰é‡‘陣列——都å¯ä»¥åœ¨JEI中查詢到。注æ„，左å´çš„物å“一定是催化劑，而å³å´çš„物å“一定是一個次è¦ç‰©å“。 -guide.bloodmagic.entry.architect.divination.info=å åœå°è¨˜æ˜¯è¡€è¡“士最常用的工具之一，因為它能解決你很多麻煩，具體來說是能給你一些關éµæ•¸æ“šã€‚它的åˆæˆä¹Ÿå¾ˆç°¡å–®ï¼šåªéœ€è¦åœ¨ç…‰é‡‘陣列中以紅石為催化劑，以石æ¿ç‚ºæ¬¡è¦ç‰©å“åˆæˆå³å¯ã€‚\n\tå°è¡€ä¹‹ç¥­å£‡ä½¿ç”¨æ­¤å°è¨˜ä¾¿å¯çœ‹åˆ°ç¥­å£‡ä¸»å®¹å™¨ä¸­çš„LP數é‡ï¼Œä»¥åŠå®¹é‡ä¸Šé™ã€‚短時間內å覆使用並ä¸æœƒå°Žè‡´åˆ·å±ï¼Œåªæœƒè¦†è“‹ä¹‹å‰çš„æ示。\n\t/cutå°è‘—空氣使用此å°è¨˜çš„話，則能看到你的éˆé­‚網絡中的LP數é‡ã€‚儘管這功能看上去很普通，但你以後就會發ç¾ï¼Œä½ ä¸€åˆ»ä¹Ÿä¸æƒ³è®“這玩æ„離手。 -guide.bloodmagic.entry.architect.soulnetwork.info=éˆé­‚網絡（Soul Network，縮寫 SN）是指玩家和å„種物å“以 åŠçµæ§‹ä¹‹é–“çš„éˆé­‚上的éˆæŽ¥ã€‚隨著血術士能力的æå‡ï¼Œéˆé­‚網絡的強度也會隨之æ高。就存在來說，它們是éˆé­‚ç¹”æˆçš„一張無形的網，但最強大的血魔法師們是å¯ä»¥çœ‹åˆ°å…¶ç‰©ç†çš„å…·ç¾çš„。然而，時至今日，ä»ç„¡äººå¯é”此化境...\n\t在éŠæˆ²ä¸­ï¼Œç¶²çµ¡æ˜¯ç›´æŽ¥èˆ‡çŽ©å®¶ç¶å®šåœ¨ä¸€å¡Šçš„。玩家所在的世界早已記錄下了這一切——/cut這æ„味著，玩家的 LP 並éžæ˜¯ 記錄在æŸé¡†æ°£è¡€å¯¶ç ä¸­ï¼Œè€Œæ˜¯è¢«ä¸–界記錄著；æ¯å€‹çŽ©å®¶ä¹‹é–“的網絡互相ç¨ç«‹ï¼Œäº’ä¸å½±éŸ¿ã€‚\n\tç¶å®šçš„éŽç¨‹é€šå¸¸åœ¨ç¬¬ä¸€æ¬¡ä½¿ç”¨æŸå€‹ç‰©å“時就已經完æˆäº†ã€‚就目å‰çš„科技來說，一旦ç¶å®šï¼Œå³ä¾¿æ˜¯ç‰©å“的主人也無法解除。需è¦æ¶ˆè€—LP的物å“會直接消耗其主人éˆé­‚網絡中的LP。但，如果主人的éˆé­‚網絡中沒有足夠的 LP，它會從 當å‰ä½¿ç”¨è€…，而ä¸æ˜¯å…¶ä¸»äººï¼Œçš„身上抽å–生命值以填補空缺。因此，在快沒有LP的時候è¦å°å¿ƒâ€”—因為這通常會致人於死地。 -guide.bloodmagic.entry.architect.weakorb.info.1=沒了魔法來æºçš„魔法師和鹹魚有什麼å€åˆ¥ï¼Ÿæ°£è¡€å¯¶ç ä¾¿æ˜¯é€™æ¨£ä¸€å€‹é­”法æºï¼šå®ƒå¯ä»¥å°‡ç‰©ç†å½¢å¼çš„生命轉化æˆLP並輸入到其主人的éˆé­‚網絡中去。它本身並éžé›»æ± ï¼Œç›¸å它倒åƒæ˜¯ä¸€æ ¹å°Žç®¡ï¼Œå¯å°‡ç”Ÿå‘½åŠ›è½‰åŒ–æˆè¡€é­”法師需è¦çš„魔法。 -guide.bloodmagic.entry.architect.weakorb.info.2=虛弱氣血寶ç ä¾¿æ˜¯ä½ èƒ½è£½ä½œçš„第一種寶ç â€”—åªéœ€å‘一粒鑽石中çŒæ³¨å…©åƒLP的生命力å³å¯å®Œæˆã€‚將已ç¶å®šçš„寶ç æ”¾å…¥ç¥­å£‡ï¼Œå®ƒå°±å¯ä»¥ä¸æ–·åœ°å¾žç¥­å£‡ä¸­æŠ½å–LP，直接輸入éˆé­‚網絡中。å¦å¤–，ä¸è«–什麼寶ç ï¼Œå…¶å®¹é‡ä¸Šé™éƒ½åªèƒ½é€šéŽä¸€äº›é«˜ç´šç¬¦æ–‡ä¾†æå‡ï¼›é€™è£¡æ³¨æ„一點，這個容é‡æå‡çš„效果åªæœ‰åœ¨å¯¶ç åœ¨ç¥­å£‡ä¸Šæ™‚æ‰æœ‰æ•ˆã€‚å°æ–¼è™›å¼±æ°£è¡€å¯¶ç ï¼Œæœ€é«˜åªèƒ½æå‡åˆ°äº”åƒã€‚\n\t/cut玩家還å¯ä»¥é€šéŽç°¡å–®åœ°ä½¿ç”¨æ°£è¡€å¯¶ç ä¾†ç²å¾—LP——æ¯ä¸€æ¬¡ä½¿ç”¨éƒ½æœƒå°çŽ©å®¶é€ æˆä¸€é¡†å¿ƒçš„傷害並æä¾›200LP。此法ä¸èƒ½ä»¤ç¶²çµ¡ä¸­çš„LP數é‡çªç ´å®¹é‡ä¸Šé™ã€‚\n\t祭壇åªå¯èƒ½ç‚ºèˆ‡è‡ªå·±ç´šåˆ¥ç›¸ç•¶ï¼Œæˆ–者比自己級別低的氣血寶ç æä¾›LP。舉例，三級的寶ç åªå¯èƒ½åœ¨ä¸‰ç´šæˆ–更高級的祭壇中ç²å¾—LP，一級的祭壇是無法å‹ä»»çš„。 -guide.bloodmagic.entry.architect.incense.info.1=血術士會經常發ç¾ï¼Œå®ƒå€‘çš„LP產能時常跟ä¸ä¸Šæ¶ˆè€—。當然，有特殊的符文å¯ä»¥æ高自我ç»ç¥­æ‰€ç”¢ç”Ÿçš„生命精è¯çš„數é‡ï¼Œä½†é€™å€‹éŽç¨‹ä¾èˆŠæ˜¯å¦‚此緩慢。åªæœ‰é€™ä¸€æ¢è·¯å¯ä»¥èµ°äº†å—Žï¼Ÿ\n\t下é¢ä»‹ç´¹ç†é¦™ç¥­å£‡ã€‚ç†é¦™ç¥­å£‡æœ¬èº«å¯ä»¥ä»¥è‡ªèº«ç‚ºä¸­å¿ƒï¼Œæ¨™è¨˜å‡ºä¸€ç‰‡éœè¬çš„土地，在這範åœå…§ï¼Œå®ƒå¯ä»¥å€ŸåŠ©ç¥­å£‡æœ¬èº«æ•£ç™¼å‡ºçš„餘力來安撫驚擾到的éˆé­‚。當然你ä¸æ˜¯å¾ˆæ¸…楚這/cutè‚¡ç†é¦™çš„æ°£æ¯å¾žä½•è€Œä¾†ï¼Œä½†å¥½åƒåˆæ²’什麼ä¸å°ï¼Ÿå…ˆä¸ç®¡äº†ã€‚\n\tç†é¦™ç¥­å£‡çš„作用就是如此：利用éœè¬çš„環境來æå‡å–®é¡†å¿ƒæ‰€å‰µé€ å‡ºçš„生命精è¯çš„數é‡ã€‚在你è·é›¢ç†é¦™ç¥­å£‡åªæœ‰ç´„莫五格é çš„地方時，它會散發出ç«ç„°é¡†ç²’以證明其已經創造出éœè¬å€åŸŸã€‚在它的影響範åœä¸‹ï¼Œä½ çš„犧牲匕首也會發生變化，以證明ç†é¦™å·²ç¶“發æ®å…¶æ•ˆæžœã€‚整個éŽç¨‹å¤§ç´„æŒçºŒäº”秒é˜ï¼Œä½ å¯ä»¥é€šéŽè§€å¯Ÿç«ç„°/cutç²’å­çš„存在來判斷是å¦çµæŸã€‚此時，使用犧牲匕首ç»ç¥­è‡ªå·±å°‡æœƒä¸€æ¬¡æ€§ç»ç¥­ä½ ç”Ÿå‘½å€¼ä¸Šé™çš„百分之ä¹å，並將å°æ‡‰æ•¸é‡çš„LP輸入血之祭壇之中。LP數é‡å’Œç»ç¥­çš„生命值ä¾èˆŠæˆæ­£æ¯”，但此時它的轉化率會根據附近的éœè¬å€¼è€Œæœ‰æ‰€ä¸Šå‡ï¼›é»˜èªï¼Œå¢žå¹…是百分之二å。\n\tå¦å¤–，å åœå°è¨˜å¯ä»¥æ­ç¤ºé™„è¿‘çš„éœè¬å€¼ï¼Œä»¥åŠéœè¬æ‰€å¸¶ä¾†çš„具體增幅水平。 -guide.bloodmagic.entry.architect.incense.info.2=自然，百分之二å的增幅已經夠多了，但ç†é¦™ç¥­å£‡ä½œç”¨çš„範åœé‚„是å¯ä»¥ç¹¼çºŒæ“´å±•çš„。你åªéœ€è¦åœ¨ç†é¦™ç¥­å£‡æŸå€‹åŸºç¤Žæ–¹å‘（å³ï¼Œæ­£æ±ã€æ­£è¥¿ã€æ­£å—ã€æ­£åŒ—）兩格é çš„地方排出一列三塊高度一樣木質路é¢å³å¯å®šç¾©ä¸€å€‹ã€Œç¯„åœã€ã€‚在此「範åœã€ä¸­çš„ä»»æ„方塊都有助於讓這片å€åŸŸæ›´åŠ éœè¬ã€‚木質路é¢é‚„å¯ä»¥ç¹¼çºŒæ“´å±•ï¼ŒæƒŸéœ€éµå®ˆä»¥ä¸‹è¦å‰‡ï¼šä¸€ï¼Œæ¯ä¸€åˆ—木質路é¢å¿…須水平，å³æ§‹æˆæ–°ä¸€åˆ—è·¯é¢çš„方塊必須高度相åŒï¼›äºŒï¼Œæ–°çš„è·¯é¢å¿…é ˆä½æ–¼ä¸Šä¸€åˆ—è·¯é¢çš„上/cut下五格範åœå…§ã€‚簡單來說，金字塔ã€å€’金字塔等階梯å¼çµæ§‹éƒ½æ˜¯å¯ä»¥çš„。\n\t然而，這個範åœä¸¦éžå¯ä»¥ç„¡ç¯€åˆ¶åœ°æ“´å¼µã€‚木質路é¢åªèƒ½ç–ŠåŠ ä¸‰åˆ—ï¼›ä¸éŽä¸ç”¨æ“”心，還有一種å¯ä»¥ç–ŠåŠ äº”列的石質路é¢ï¼›ç”šè‡³é‚„有å¯ä»¥ç–ŠåŠ ä¹åˆ—的碎石路é¢å’Œé»‘曜石路é¢ã€‚自然地，你在疊加三列木路é¢å¾Œå°±éœ€è¦ç”¨çŸ³é ­çš„；然而你完全å¯ä»¥ä¸€é–‹å§‹å°±ç”¨çŸ³é ­çš„，åªè¦ä½ ä¸æ˜¯åªç”¨æœ¨è·¯é¢å°±å¥½ã€‚\n\t/cut回到éœè¬ç¨‹åº¦çš„å•é¡Œä¸Šä¾†ã€‚事實上åªæœ‰ä¸€éƒ¨åˆ†æ–¹å¡Šå¯ä»¥è®“這片å€åŸŸæ›´åŠ éœè¬ï¼Œè€Œæ ¹æ“šå¯¦é©—，這些方塊被分æˆäº†è‹¥å¹²ç¨®ã€‚舉個例å­ï¼Œä½ åœ¨é€™ç‰‡å€åŸŸä¸­ç¨®äº†åœŸè±†ï¼ŒåœŸè±†å±¬æ–¼ã€Œä½œç‰©ã€åˆ†é¡žï¼Œç„¶å¾Œé€™ç‰‡å€åŸŸä¾¿å¹³éœäº†ä¸€äº›ã€‚ä¸è«–是你接著種土豆，或者你種起了胡蘿蔔，它們的效果都會隨著你種的數é‡çš„增多而é™ä½Žï¼Œç”šè‡³é‚„會抵消一開始的效果，因為它們都屬於「作物ã€ã€‚為了最好的效果，你需è¦ç›¡å¯èƒ½ä½¿ç”¨å¤šç¨®ä¸åŒé¡žåž‹çš„方塊。/cut有助於平éœçš„方塊有這麼幾類：作物ã€åŽŸæœ¨ã€æ¨¹è‘‰ã€ç†”岩ã€åœ°ç„å·–ã€è€•åœ°ã€æ°´ã€ç”Ÿå‘½ç²¾è¯ã€ä»¥åŠå…¶ä»–æ±è¥¿ï¼ˆåŽŸæ–‡å¦‚此）。 -guide.bloodmagic.entry.architect.bloodrune.info.1=隨著你é€æ¼¸æ·±å…¥è¡€é­”法，你會發ç¾ä½ é‚£æ™®æ™®é€šé€šçš„血之祭壇已無法滿足你的需è¦äº†ã€‚但你還å¯ä»¥é€šéŽæ”¾ç½®ä¸€ç¨®å為氣血符文的特殊方塊來æå‡ç¥­å£‡çš„整體屬性，進而解鎖更多的åˆæˆã€‚\n\t將血之祭壇å‡åˆ°2級的方法很簡單：在祭壇本身往下一層放置八個一圈的氣血符文。如果你實在æžä¸æ¸…楚具體的ä½ç½®ï¼ŒæŒ‡ç¤ºä¹‹æ›¸å¯ä»¥å¹«åˆ°ä½ â€”—它å¯ä»¥ä»¥ä¸€ç¨®é¡žä¼¼å…¨æ¯æŠ•å½±çš„/cutæ–¹å¼æŒ‡æ˜Žä½ éœ€è¦æ”¾ç½®æ°£è¡€ç¬¦æ–‡çš„ä½ç½®ã€‚\n\t儘管åªéœ€è¦ç©ºç™½æ°£è¡€ç¬¦æ–‡å°±å¯ä»¥å®Œæˆç¥­å£‡å‡ç´šï¼Œæˆ‘ä»ç„¶æŽ¨è–¦ä½ å°ä½¿ç”¨å¸¶æœ‰ç‰¹æ®Šå¼·åŒ–的氣血符文。祭壇上的æ¯ä¸€å€‹ç¬¦æ–‡éƒ½å¯ä»¥è¢«æ›ä½œç‰¹æ®Šçš„氣血符文（唯一的例外是，二級祭壇四個角è½ä¸Šçš„特殊符文ä¸æœƒæœ‰æ•ˆæžœâ€”—但在三級åŠä»¥ä¸Šçš„祭壇，這四個ä½ç½®çš„特殊符文則å¯ä»¥ä½¿ç”¨ï¼‰ã€‚這些帶有特殊強化的氣血符文å¯ä»¥æ高/cut祭壇的åˆæˆé€Ÿåº¦ã€å®¹é‡ä»¥åŠæ•ˆçŽ‡ã€‚有關這些特殊的氣血符文的資料å¯ä»¥åœ¨å¾Œé¢çš„章節找到。 -guide.bloodmagic.entry.architect.inspectoris.info.1=Inspectoris Scandalum åœ¨æ‹‰ä¸ èªžä¸­å¤§æ¦‚çš„æ„æ€æ˜¯ã€Œæ–¹å¡Šè®€å–器ã€ã€‚事實上，它的用途是，潛行時å°è‘—æŸå€‹æ–¹å¡Šä½¿ç”¨ï¼Œä¾¿å¯è§£è®€é‚£äº›è¤‡é›œçµæ§‹çš„ä¿¡æ¯ï¼Œä¸¦å°‡å…¶é¡¯ç¤ºåœ¨ä½ çœ¼å‰ã€‚ç›®å‰ï¼Œå®ƒåªèƒ½çµ¦å‡ºè¡€ä¹‹ç¥­å£‡çš„相關信æ¯ï¼šå®ƒå¯ä»¥çµ¦å‡ºå‡ç´šç¥­å£‡æ‰€éœ€çš„方塊的種類，以åŠå…·é«”擺放ä½ç½®ã€‚\n\t若你覺得一次一次查詢ä¸é©åˆä½ ï¼Œä½ å¯ä»¥è©¦è‘—潛行時å°è‘—空氣使用此物以切æ›ç›®æ¨™å±¤/cut級。這樣，å†æ¬¡æŒ‰å‰æ–‡æ‰€è¿°çš„æ–¹å¼ä½¿ç”¨æ­¤ç‰©ï¼Œå®ƒå°±å¯ä»¥ä»¥ä¸€ç¨®é¡žä¼¼å…¨æ¯æŠ•å½±çš„æ–¹å¼å°‡å‡ç´šæ‰€éœ€çš„方塊的ä½ç½®æŠ•å½±å‡ºä¾†ã€‚設定級別為1時å¯ä»¥é—œé–‰é€™å€‹é¡žå…¨æ¯æŠ•å½±çš„效果。 -guide.bloodmagic.entry.architect.runeSpeed.info.1=速度符文å¯ä»¥æ高祭壇內的壓力，藉由此加速嬗變éŽç¨‹ï¼Œå¾žè€Œæ高åˆæˆé€Ÿåº¦ã€‚æ¯å¡Šé€Ÿåº¦ç¬¦æ–‡éƒ½æœƒæ高20%%的祭壇的LP消耗速度。它åŒæ™‚也會影響çŒæ³¨æ°£è¡€å¯¶ç çš„速度。 -guide.bloodmagic.entry.architect.water.info.1=顧åæ€ç¾©ï¼Œæ°´ä¹‹å°è¨˜æ˜¯ä¸€å¡Šå¯å‡èšç©ºæ°£ä¸­æ°´åˆ†ï¼Œä¸¦å°‡å…¶é›†ä¸­æ–¼ä¸€é»žä¸Šçš„å°è¨˜ã€‚除此之外，å°è‘—任何能è£æ°´çš„設備使用水之å°è¨˜éƒ½å¯ä»¥å‘設備裡é¢è£ä¸€æ¡¶æ°´ã€‚總而言之，它便是一個移動的無é™æ°´æºã€‚æ¯æ¬¡ä½¿ç”¨éƒ½æœƒæ¶ˆè€—50點LP。 -guide.bloodmagic.entry.architect.lava.info.1=若說水之å°è¨˜å±¬é™°ï¼Œé‚£éº¼ï¼Œå±¬é™½çš„便是熔岩å°è¨˜ã€‚熔岩å°è¨˜å¯ä»¥å°‡ä¸€ç‰‡å€åŸŸå…§çš„石頭熔化æˆå²©æ¼¿ã€‚若是å°æŸå€‹å¯æŽ¥å—æµé«”岩漿的設備使用，這設備裡就會多出一桶岩漿。儘管你拿著這個å°è¨˜ä¸æœƒè®“你自燃，但這ä¸ç­‰æ–¼ä½ å¯ä»¥é–‹å§‹æ´—熔岩浴了ï¼è¨˜å¾—æ¯æ¬¡ä½¿ç”¨æ™‚會消耗1000LP。 -guide.bloodmagic.entry.architect.lavaCrystal.info.1=熔岩晶體是塊裡é¢å­˜å„²äº†ä¸€åœ˜æ°¸ä¸å†·å»çš„熔岩的石頭。若將其放入熔çˆä¸­ç•¶ç‡ƒæ–™ä½¿ç”¨ï¼Œå®ƒæœƒé‡‹æ”¾å‡ºç†±é‡ï¼Œé€™äº›ç†±é‡æ­£å¥½å¯ä»¥ç‡’煉一個物å“，然後消耗50LP。若是它沒有這麼多LPå¯ä»¥æŠ½å–，它也ä¸æœƒå› æ­¤æ壞，還會因此給網絡的主人追加一個å胃效果。\n\t這塊晶體ç†è«–上在任何支æŒæ¨™æº–固態燃料的設備中都å¯ä»¥å·¥ä½œã€‚ -guide.bloodmagic.entry.architect.apprenticeorb.info.1=隨著你的新玩具越來越多，你會發ç¾éˆé­‚網絡的五åƒLP上é™å·²ç¶“開始æ‰è¥Ÿè¦‹è‚˜äº†ã€‚是時候åšä¸€é¡†æ›´å¼·å¤§çš„氣血寶ç äº†ã€‚\n\t學徒氣血寶ç çš„製作需è¦äºŒç´šè¡€ä¹‹ç¥­å£‡ï¼Œå¯æä¾›2.5è¬LP的容é‡ã€‚åŒæ™‚，它也是åˆæˆå¾ˆå¤šæ›´é«˜ç´šçš„物å“和符文的必須。 -guide.bloodmagic.entry.architect.dagger.info.1=在ä¸æ–·åœ°é€šéŽç»ç¥­è‡ªå·±ä¾†å¼·åŒ–自己後，你å¯ä»¥é–‹å§‹è©¦è‘—ç»ç¥­åˆ¥çš„活物了。若是用這把犧牲匕首，在血之祭壇附近擊中一隻普通的生物（ä¸èƒ½æ˜¯BOSS，也ä¸èƒ½æ˜¯çŽ©å®¶ï¼‰ï¼Œé‚£éº¼é€™å€‹å¯æ†çš„傢伙就會立刻被ç»ç¥­ï¼Œä¸¦æ ¹æ“šè³ªé‡çš„ä¸åŒï¼Œè½‰åŒ–æˆæ•¸é‡ä¸ç­‰çš„生命精è¯ã€‚一般情æ³ä¸‹ï¼Œé‚£äº›æ•µå°æ€ªç‰©çµ¦äºˆçš„生命精è¯è¦æ¯”那些平和的動物們è¦å¤šã€‚ -guide.bloodmagic.entry.architect.runeSacrifice.info.1=ç»ç¥­ç¬¦æ–‡ï¼Œæ­£å¦‚å…¶å，å¯æ高ç»ç¥­æ´»ç‰©æ™‚ç²å¾—的生命精è¯çš„數é‡ï¼Œæº–確地說，是æ¯å¡Šç¬¦æ–‡å¢žåŠ å分之一。 -guide.bloodmagic.entry.architect.runeSelfSacrifice.info.1=犧牲符文和ç»ç¥­ç¬¦æ–‡å·®ä¸å¤šï¼Œä½†çŠ§ç‰²ç¬¦æ–‡æ˜¯é‡å°çŽ©å®¶è‡ªå·±çš„。增幅和ç»ç¥­ç¬¦æ–‡ä¸€æ¨£ï¼Œéƒ½æ˜¯ç™¾åˆ†ä¹‹å。 -guide.bloodmagic.entry.architect.holding.info.1=ä½ é€æ¼¸é–‹å§‹ç™¼ç¾ä½ æœ‰ä¸€å †å„å¼å„樣的å°è¨˜è¦å¸¶åœ¨èº«ä¸Šäº†ï¼šæœ‰çš„需è¦æ‰‹å‹•é–‹é—œï¼Œæœ‰çš„åªéœ€è¦æ”¾åœ¨èƒŒåŒ…裡就å¯ä»¥ä¸€ç›´æœ‰æ•ˆæžœã€‚有鑒於你的背包空間開始é€æ¼¸ç¸®æ°´ï¼Œä½ å¯èƒ½éœ€è¦ä¸€å¡Šé›†æŒå°è¨˜çš„幫助。\n\t這集æŒå°è¨˜çš„作用，便是將五個其他å°è¨˜ã€Œå£“縮ã€æˆä¸€å€‹ï¼›ä½†æ˜¯ä½ ä¸¦ä¸èƒ½åœ¨é›†æŒå°è¨˜è£¡æ”¾é›†æŒå°è¨˜ã€‚默èªï¼ŒæŒ‰ä¸‹"Holding"éµï¼ˆé»˜èªç‚º'H'）å¯æ‰“開其界é¢ï¼Œç”¨æ–¼èª¿æ•´é †åºã€‚滾輪å¯åœ¨é¸ä¸­/cutçš„å°è¨˜ä¹‹é–“循環切æ›ã€‚被é¸ä¸­çš„å°è¨˜å¯ç›´æŽ¥å€ŸåŠ©é›†æŒå°è¨˜ä½¿ç”¨ï¼Œæ¯‹éœ€å–出。\n\t自然地，你å¯ä»¥èº«ä¸Šå¸¶è‹¥å¹²é›†æŒå°è¨˜ï¼Œé€™äº›é›†æŒå°è¨˜äº’ä¸å½±éŸ¿ã€‚但為了一眼就能å€åˆ†ï¼Œä½ å¯ä»¥è€ƒæ…®åœ¨ç…‰é‡‘術桌中為其染色。染色的方å¼æœ‰å…©ç¨®ï¼š1.直接使用染料在煉金術桌中染色；2.使用å六進制數命å的命å牌，比如這樣：0xFFFFFF。 -guide.bloodmagic.entry.architect.air.info.1=風之å°è¨˜ï¼Œç°¡å–®åœ°å°‡æ°´è’¸æ°£åˆ†æˆæ•¸è‚¡ï¼Œç”¢ç”Ÿå¼·å¤§çš„æ°£æµï¼Œé©…使玩家å‰é€²ã€‚簡單來說，你å¯ä»¥ç”¨é€™å°è¨˜æŽ¨å‹•ä½ å‰é€²ã€‚å¦å¤–，這個å°è¨˜å¯ä»¥å…除掉è½å‚·å®³ï¼Œä½†åªæœ‰ä½ ä½¿ç”¨æ™‚æ‰å¯ä»¥å…除，所以如果你想硬著陸的話，記得è¦åœ¨å³å°‡æ‘”åˆ°åœ°ä¸Šçš„ä¸€çž¬é–“ä½¿ç”¨ï¼ -guide.bloodmagic.entry.architect.void.info.1=顧åæ€ç¾©ï¼Œè™›ç©ºå°è¨˜æœƒè£½é€ çœŸç©ºï¼Œä¸¦å°‡é™„近的液體全部å¸é€²åŽ»ï¼Œä¸¦å¾¹åº•éŠ·æ¯€ã€‚建議æ­é…水之å°è¨˜å’Œç†”岩å°è¨˜ä½¿ç”¨ã€‚ -guide.bloodmagic.entry.architect.greenGrove.info.1=綠å¢å°è¨˜å¯ä»¥å°‡ä½ çš„血轉化æˆæ¤ç‰©ç”Ÿé•·çš„催化劑，進而加速附近æ¤ç‰©çš„生長。驅動å°è¨˜çš„æ–¹å¼å¾ˆç°¡å–®ï¼šæ½›è¡Œæ™‚å°è‘—空氣使用（å³æ“Šï¼‰å³å¯ï¼›ç›¸åŒçš„æ–¹å¼å¯ä»¥åœæ­¢å…¶å·¥ä½œï¼ˆå¯ä»¥é€šéŽå…¶ä¿¡æ¯æ示看出它是å¦å·²è¢«é©…動）。è¦è¨˜ä½ï¼Œå®ƒæ¯éš”幾秒é˜å°±æœƒæŠ½å–一次LP以補充養料。\n\t直接å°ä½œç‰©ä½¿ç”¨çš„效果和骨粉無異。這樣一來，這個å°è¨˜ä¹Ÿå¯ä»¥åƒéª¨ç²‰ä¸€æ¨£ï¼Œç”¨æ–¼è£½é€ è‰å¢ã€‚ -guide.bloodmagic.entry.architect.fastMiner.info.1=大部分血術士都應該注æ„到了，血中å«æœ‰è±å¯Œçš„éµå…ƒç´ ã€‚經驗è±å¯Œçš„血術士完全å¯ä»¥åœ¨ä¸æŠ½è¡€çš„情æ³ä¸‹ç›´æŽ¥æ”¹è®Šå…¶é«”內血液的組æˆâ€”—然而，需è¦æ³¨æ„的是，åªæœ‰é‚£äº›æœ€é ‚尖的血術士æ‰å¯ä»¥æŠµæŠ—由此產生的排斥å應。\n\t這樣一個技能有個經典的用途，æ高身體的éˆæ´»æ€§ï¼Œä»¥æ高其é‹å‹•é€Ÿåº¦ã€‚這速掘å°è¨˜ï¼Œé€šéŽç”¨ç£éµå½±éŸ¿è¡€æ¶²è£¡çš„éµå…ƒç´ ï¼Œå¯å¤§å¹…æå‡ä½¿ç”¨è€…的挖掘/cut速度。其實這個效果就是急迫II的效果。雖然åªèƒ½å½±éŸ¿ä½¿ç”¨è€…自身，但å°æ–¼æŒ–黑曜石來說的確是好用。 -guide.bloodmagic.entry.architect.seer.info.1=你在修ç†è¡€ä¹‹ç¥­å£‡æ™‚，時常會發覺自己早已迷失在了那些å åœå°è¨˜ç„¡æ³•å¯Ÿè¦ºçš„細節中。所以這就是輪到見解å°è¨˜ç™»å ´çš„時刻了。見解å°è¨˜å¯¦éš›ä¸Šæ˜¯å åœå°è¨˜çš„å‡ç´šç‰ˆï¼Œå®ƒèƒ½çœ‹åˆ°å¾ˆå¤šä½”åœå°è¨˜æ‰€çœ‹ä¸åˆ°çš„細節，諸如祭壇的åˆæˆé€Ÿåº¦ã€ç•¶å‰çš„LP儲é‡ã€åˆæˆé€²åº¦ã€ç”šè‡³çŽ©å®¶è‡ªå·±çš„éˆé­‚網絡的很多信æ¯ï¼Œé€™è£¡å°±ä¸ä½œè´…述了。 -guide.bloodmagic.entry.architect.magicianOrb.info.1=新的祭壇，新的寶ç ã€‚這次，為了你的新玩具，你需è¦ä¸€é¡†æ³•å¸«æ°£è¡€å¯¶ç ã€‚ä¸éŽæœ‰ä¸€é»žè¦æ³¨æ„，åˆæˆæ³•å¸«æ°£è¡€å¯¶ç éœ€è¦2.5è¬LP，但你的祭壇åªæœ‰ä¸€è¬å®¹é‡ã€‚æ›è¨€ä¹‹ï¼Œåœ¨åˆæˆé€™é¡†å¯¶ç æ™‚，你需è¦ä¸æ–·åœ°è£œå……生命精è¯ã€‚所以，在åˆæˆé€™é¡†æ°£è¡€å¯¶ç å‰ï¼Œè«‹å‹™å¿…åšå¥½è¬å…¨çš„æº–å‚™ï¼ -guide.bloodmagic.entry.architect.capacity.info.1=雖然你並ä¸çŸ¥é“具體原ç†ï¼Œä½†é€™å¢žå®¹ç¬¦æ–‡çš„確能給血之祭壇æ供兩åƒçš„é¡å¤–容é‡ã€‚也許，是æŸç¨®å…±æŒ¯å°Žè‡´å®¹ç©ä¸‹é™ï¼Œç„¶å¾Œä½ ä¾¿å¯ä»¥å¾€è£¡é¢è£å…¥æ›´å¤šçš„容器？這樣一想你倒是想到了進一步改進的方法...\n\t這裡有必è¦å†é‡è¤‡ä¸€é，祭壇本身還有用於緩è¡çš„輸入和輸出容器，容ç©å‡ç‚ºä¸»å®¹å™¨çš„110%%。增容符文的效果å°é€™å…©å€‹ç·©è¡å®¹å™¨ä¹Ÿæœ‰æ•ˆã€‚ -guide.bloodmagic.entry.architect.displacement.info.1=默èªï¼Œè¡€ä¹‹ç¥­å£‡çš„ç·©è¡å€å’Œä¸»å®¹å™¨ä¹‹é–“çš„LP轉移速度是最高20LP/s。å°æ–¼é‚£äº›éœ€è¦é »ç¹è½‰ç§»LP的祭壇來說這個速度å¯ä»¥èªªæ˜¯å·¨å¤§çš„瓶頸。這也是為什麼會有轉ä½ç¬¦æ–‡çš„原因。\n\t轉ä½ç¬¦æ–‡å¯æå‡LP轉移的速度。æ¯å€‹ç¬¦æ–‡éƒ½å¯ä»¥å°‡é€Ÿåº¦æ高至原來的1.2å€ï¼Œå¤šå€‹è½‰ä½ç¬¦æ–‡å¯ä»¥ç–ŠåŠ ã€‚æ›è¨€ä¹‹ï¼Œä¸€å€‹è½‰ä½ç¬¦æ–‡å¯ä»¥å°‡é€Ÿåº¦æ高至一次24LP，兩個則為28.8LP，三個/cut則為34.56LP，而20個則會é”到767LP，足以在13秒內清空一座標準祭壇裡所有的生命精è¯ã€‚ -guide.bloodmagic.entry.architect.affinity.info.1=表é¢ä¸Šçœ‹ï¼Œå…ƒç´ å°è¨˜ä¸éŽæ˜¯ä¸€å€‹èƒ½å…ç–«ç«ç„°ã€æººæ°´å’Œæ‘”è½å‚·å®³çš„å°è¨˜ã€‚事實上，它的工作方å¼ä¸¦éžå¦‚此——驅動此å°è¨˜å¾Œï¼Œå®ƒæœƒæ¶ˆè€—汗水（如有必è¦ï¼Œæœƒæ˜¯è¡€ï¼‰ï¼Œç„¶å¾Œåœ¨ä½¿ç”¨è€…身上形æˆä¸€æ ¼ä¿è­·å±¤ï¼Œé€²è€ŒæŠµæ“‹æ„外傷害。\n\t這層空氣護盾å¯ä»¥ç·©è¡ç«ç„°å’Œç†”岩的熱é‡ï¼Œä¹Ÿå¯ä»¥åœ¨å¿…è¦æ™‚æ供空氣以防溺水，åŒæ™‚é‚„å¯ä»¥åœ¨ä¸æ…Žæ‘”è½æ™‚充當無形的氣墊使用。 -guide.bloodmagic.entry.architect.lamp.info.1=人和動物的血液中還是有「雜質ã€çš„。åªéœ€è¦æ”¶é›†ä¸€äº›ç¨€æœ‰æ°£é«”，然後輔以åˆé©çš„熱æºï¼Œå°±å¯ä»¥åœ¨åœ°é¢ä¸Šç”¢ç”Ÿä¸€åœ˜æ˜Žäº®çš„å…‰çƒï¼Œç…§è€€è‘—é è™•çš„大地。\n\t血光å°è¨˜çš„用途有兩個：或直接å°è‘—方塊使用，產生一個光çƒï¼›æˆ–å°è‘—空氣使用，將光çƒç™¼å°„到é è™•ã€‚這些光çƒå’Œç«æŠŠä¸€æ¨£ï¼Œå¯ä»¥ç©ºæ‰‹æ‰“碎。 -guide.bloodmagic.entry.architect.magnetism.info.1=ç£å¼•å°è¨˜å¯å°‡è¡€æ¶²ä¸­çš„éµå…ƒç´ è½‰åŒ–為ç£éµï¼Œé€²è€Œå°‡å°ä»¶ç‰©å“å¸å¼•åˆ°èº«ä¸Šï¼Œå…除原地打轉收集物å“的麻煩。就原ç†ä¾†çœ‹ï¼Œå®ƒæ˜¯çœŸæ­£çš„物å“ç£éµï¼Œå› ç‚ºå®ƒä¸¦éžæ˜¯æŠŠç‰©å“å¸éŽä¾†ï¼Œè€Œæ˜¯çœŸæ­£ç›´æŽ¥æ’¿èµ·é è™•çš„物å“。幸好這ç£éµçš„ç£åŠ›ä¸¦ä¸å¤§ï¼Œä¸ç„¶ç•¶ä½ æ„外地將爬行者以3馬赫的速度å¸éŽä¾†çš„時候一切就都çµæŸäº†ã€‚ - -guide.bloodmagic.entry.architect.peritia.info.1=在這世界上，有æŸäº›è¡Œç‚ºå¯ä»¥ç´¯ç©ä¸€å€‹äººçš„經驗：擊殺怪物ã€æŽ¡æŽ˜ç¤¦çŸ³ã€å†¶ç…‰é‡‘屬ã€çƒ¹é£ªé£Ÿç‰©... åŒæ™‚，一些特殊的奧法設備å¯ä»¥ç›´æŽ¥å¸æ”¶é€™äº›ç¶“驗，並作為其動力使用。因此，若是有一種能存儲經驗的媒介，那就å†å¥½ä¸éŽäº†ã€‚\n\t儘管有很多設備都å¯ä»¥å°‡é€™ç¶“驗轉化æˆç‰©ç†å½¢æ…‹å„²å­˜ï¼Œä½†é€™æœ¬ç¶“驗之書å»æ˜¯ä»¥æ›¸å¯«çŸ¥è­˜çš„æ–¹å¼ï¼Œå°‡ä½ éŽåŽ»æ‰€ç©ç´¯ä¸‹/cut的經驗ä¿å­˜ä¸‹ä¾†ï¼Œä»¥ä¾›æ—¥å¾Œä½¿ç”¨çš„。需è¦çš„時候，åªéœ€è¦æ‰‹æŒé€™æœ¬æ›¸å°±èƒ½è‡ªå‹•å¸æ”¶æ›¸é ä¸­çš„知識，並將其轉化為經驗。\n\t具體來說，這本書是這樣用的：潛行時å³æ“Šå³å¯å°‡ä¸€ç´šç¶“驗存入書中（若有零頭，則先å¸æ”¶é›¶é ­ï¼‰ã€‚平時å³æ“Šä¸€æ¬¡å¯ç›´æŽ¥ç²å¾—一整級經驗。它所存儲的經驗數é‡å¯åœ¨å…¶ä¿¡æ¯æ示中找到。 -guide.bloodmagic.entry.architect.livingArmour.info.1=在這Minecraft的世界中，所有人，尤其是那些新生的人（譯註：應該是指死亡後剛剛é‡ç”Ÿçš„玩家？），都清楚一套好的護甲的é‡è¦æ€§ã€‚通常，護甲的屬性是確定的——護甲的ä¿è­·æ€§èƒ½ã€é£›è¡Œçš„能力ã€è·³èºæˆ–跑步的增幅ã€è«¸å¦‚此類，ä¸å‹æžšèˆ‰ã€‚誠然有這些屬性的護甲是好的，但你從未真正é‡åˆ°éŽä¸€å¥—為你é‡èº«æ‰“造的護甲。至少，ç¾åœ¨æ‰€æœ‰äººéƒ½é€™éº¼èªç‚ºã€‚\n\t而這æŸéˆè­·ç”²ï¼Œå¯¦éš›ä¸Šæ˜¯ä¸€/cut個被鑲入éµç”²ä¸­çš„，經éŽç‰¹æ®Šæ”¹é€ å¾Œçš„活物。穿在身上時，它便會與穿戴者共生——他們將一起移動ã€ä¸€èµ·æ”»æ“Šã€ç”šè‡³åƒæ±è¥¿æ™‚它也會有所感覺。和普通的人體一樣，它也會生長，也會ä¸æ–·åœ°å¼·åŒ–自己，當然也需è¦æŽ¥å—訓練。\n\t先舉個例å­å§ã€‚當你穿上æŸéˆè­·ç”²ï¼Œä¸¦é•·é€”奔襲一段時間後，你會注æ„到æŸéˆèƒ¸ç”²ä¸Šå¤šäº†ä¸€å€‹å為「迅æ·é›™è¶³ã€çš„å‡ç´šã€‚這個å‡ç´šå¯ä»¥æ高你的/cut移動速度，雖然目å‰åªæœ‰ç­‰ç´š1，但畢竟還是å¯ä»¥å‡ç´šçš„。你還會注æ„到它æ“有了「強化點數ã€ï¼Œç›®å‰å¯èƒ½æ˜¯ã€Œ3/100ã€é€™æ¨£å­ã€‚æ¯å€‹å‡ç´šéƒ½éœ€è¦ä¸€å®šçš„強化點數，但護甲å¯ç”¨çš„強化點數有é™ã€‚æ›è¨€ä¹‹ï¼Œè‹¥æ˜¯æ‹¿ä¸å‡ºæŸå€‹å‡ç´šéœ€è¦çš„點數，你是ä¸å¯èƒ½ç²å¾—這個å‡ç´šçš„。\n\t記ä½ä¸€é»žï¼Œåªæœ‰å…¨å¥—æŸéˆè­·ç”²æ‰èƒ½æŽ¥å—訓練，也åªæœ‰å…¨å¥—æŸéˆè­·ç”²æ‰èƒ½ç™¼æ®å…¶æ‡‰æœ‰çš„效果。\n\t/cutæŸéˆè­·ç”²çš„強化點數還是å¯ä»¥è¢«äººç‚ºä¿®æ”¹çš„。有一種方法是利用煉金術增強穿戴者和護甲本身之間的éˆæŽ¥ï¼Œè—‰æ­¤å¤§å¹…æå‡å¼·åŒ–點數的上é™ï¼Œå…¸åž‹ä»£è¡¨ä¾¿æ˜¯ã€Œç¦±å‘Šä¹‹å§‹ã€ï¼Œå¯å°‡ä¸Šé™æå‡è‡³200。關於這些煉金術的產物以åŠè£½é€ éŽç¨‹ï¼Œå»ºè­°åƒé–±æœ¬æ›¸ã€Šç…‰é‡‘術士》一å·ã€‚ -guide.bloodmagic.entry.architect.upgradeTome.info.1=若是æŸéˆè­·ç”²ä¸Šæœ‰ä½ ä¸æƒ³è¦çš„å‡ç´šæ€Žéº¼è¾¦å‘¢ï¼Ÿä½ å¯ä»¥ä½¿ç”¨å為「淨éˆä¹‹éŸ³ã€çš„å„€å¼ä¾†æ¸…洗這些å‡ç´šï¼Œä¸¦ç²å¾—å°æ‡‰çš„「強化手冊ã€ã€‚關於儀å¼çš„細節å¯åƒé–±æœ¬æ›¸ã€Šå„€å¼å¤§å¸«ã€‹å·ã€‚這「強化手冊ã€çš„用途便是，在你身著全套æŸéˆè­·ç”²æ™‚，直接給予護甲å°æ‡‰çš„å‡ç´šã€‚\n\t當然，這強化手冊也å¯ä»¥åœ¨éµç §ä¸­èžåˆâ€”—在éµç §ä¸­å°‡å…©æœ¬ä¸€æ¨¡ä¸€æ¨£çš„手冊èžåˆåœ¨ä¸€èµ·å¯ä»¥ç²å¾—更高一級的手冊。/cut比方說，兩本迅æ·é›™è¶³IIå¯ä»¥èžåˆå‡ºä¸€æœ¬è¿…æ·é›™è¶³III。å°æ–¼æŸéˆè­·ç”²æœ¬èº«ä¾†èªªï¼Œä¹Ÿæœ‰é¡žä¼¼çš„機制，這裡ä¸ä½œè´…述。 -guide.bloodmagic.entry.architect.teleposer.info.1=傳é€å™¨ï¼Œé¡§åæ€ç¾©ï¼Œå¯ä»¥å°‡æŸå€‹ç‰©é«”傳é€è‡³å¦ä¸€å€‹åœ°é»žï¼Œä½†é€™å€‹å‚³é€å™¨ä¸åƒ…å¯ä»¥å‚³é€ç”Ÿç‰©ï¼Œé‚„能傳é€æ–¹å¡Šã€‚完整的傳é€è£ç½®éœ€è¦å…©å€‹å‚³é€å™¨å’Œä¸€å€‹å‚³é€æ ¸å¿ƒã€‚其中，一個傳é€å™¨å……當目的地，å¦ä¸€å€‹å‚³é€å™¨å……當出發地。\n\t在使用傳é€å™¨ä¹‹å‰éœ€è¦ä¸€äº›é…置。首先，你需è¦å³æ“Šå‚³é€æ ¸å¿ƒå°‡ä½ èˆ‡å…¶ç¶å®šã€‚然後，手æŒæ ¸å¿ƒå³æ“Šå……當目的地的傳é€å™¨ä»¥è¨˜éŒ„相關信æ¯ã€‚最終，/cut把這個記錄了目的地信æ¯çš„傳é€æ ¸å¿ƒé€éŽå…¶GUI放入充當始發地的傳é€å™¨å³å¯ã€‚\n\t然後，給予始發地的傳é€å™¨ä¸€å€‹ç´…石信號（準確地說，是強充能），這個傳é€å™¨å°±æœƒå°‡å¯¦é«”和方塊（如果是箱å­é€™æ¨£å¸¶ç‰¹æ®Šæ•¸æ“šçš„方塊，一併ä¿ç•™ï¼‰ä¸€è‚¡è…¦å…¨éƒ¨å‚³é€éŽåŽ»â€”—這個éŽç¨‹ä¸­æˆ‘們å‡å®šç›®çš„地是有傳é€å™¨çš„。\n\t當然，你å¯ä»¥åªè®“一個傳é€å™¨/cut有核心，抑或兩個傳é€å™¨äº’相éˆæŽ¥ï¼Œæˆ–者更多傳é€å™¨å½¢æˆä¸€æ¢éˆï¼Œè—‰æ­¤å½¢æˆæ›´è¤‡é›œçš„系統。\n\tä¸éŽè¦è¨˜ä½ä¸€é»žï¼Œå‚³é€å™¨åªå‚³é€å…¶ä¸Šæ–¹çš„方塊，ä¸éŽå‚³é€çš„範åœæ˜¯ç”±å‚³é€æ ¸å¿ƒæ±ºå®šçš„——T1的傳é€æ ¸å¿ƒåªèƒ½å‚³é€ä¸€å€‹æ–¹å¡Šï¼Œè€ŒT2傳é€æ ¸å¿ƒå‰‡èƒ½å‚³é€3x3x3的方塊，以此類推。 -guide.bloodmagic.entry.architect.boundBlade.info.1=æŸç¸›ä¹‹åŠæ˜¯ä¸€æŠŠç”¨è£½ä½œæŸéˆè­·ç”²çš„æ–¹å¼è£½ä½œå‡ºä¾†çš„åŠï¼Œå¯ä»¥èªªå·²æœ‰å¾ˆé•·æ­·å²äº†ã€‚ä¸éŽæœ‰ä¸€é»žè¦æ³¨æ„，包括æŸç¸›ä¹‹åŠåœ¨å…§çš„å„種æŸç¸›å·¥å…·çš„設定，在未來都有å¯èƒ½æœ‰è®Šå‹•ã€‚\n\t這把åŠæœ‰é©…動模å¼å’ŒæŠ‘制模å¼ï¼Œæ½›è¡Œæ™‚å³æ“Šå³å¯åˆ‡æ›ã€‚在抑制狀態下它並ä¸æœƒé€ æˆä»»ä½•å‚·å®³ï¼Œä½†æ˜¯åœ¨é©…動模å¼ä¸‹å®ƒæ˜¯æœƒæ¶ˆè€—LP的。åŒæ¨£çš„，你å°æ€ªç‰©é€ æˆå‚·å®³æ™‚，也會消耗LP。所以，在你殺死怪物的時候，/cut這把åŠä¹Ÿæœ‰å¯èƒ½æ®ºæ­»ä½ ï¼\n\t然而，用這把åŠæ®ºæ­»æ€ªç‰©æ™‚，會有那麼一點概率ç²å¾—虛弱氣血碎片——這個碎片便是將祭壇å‡ç´šè‡³å››ç´šçš„é—œéµã€‚ -guide.bloodmagic.entry.architect.boundTool.info.1=å’ŒæŸç¸›ä¹‹åŠä¸€æ¨£ï¼ŒæŸç¸›å·¥å…·ï¼ˆåŒ…括鎬ã€æ–§å’Œé¬ï¼‰çš„屬性在未來也會有所變動。和æŸç¸›ä¹‹åŠä¸€æ¨£ï¼ŒæŸç¸›å·¥å…·æœ‰å…©å€‹æ¨¡å¼ï¼Œåˆ‡æ›æ–¹å¼åŒæŸç¸›ä¹‹åŠï¼Œä¹Ÿæ˜¯æ½›è¡Œæ™‚å³æ“Šã€‚\n\tå’ŒæŸç¸›ä¹‹åŠä¸åŒï¼ŒæŸç¸›å·¥å…·æ“有「野ç¸æ¨¡å¼ã€ã€‚手æŒå·¥å…·å³éµæŒ‰ä½ä¸å‹•å³å¯è“„力，蓄力çµæŸå¾Œå·¥å…·æœƒæ”¾å‡ºä¸€è‚¡å·¨å¤§çš„能é‡ï¼Œå¤§ç¯„åœç ´å£žæ–¹å¡Šï¼Œæœ€é«˜å¯é”11x11x11，但åŒæ™‚也有驚人的消耗：一è¬LP。因此，使用時一/cut定è¦å°å¿ƒè¬¹æ…Žï¼Œå› ç‚ºæžä¸å¥½é€™å°±æ˜¯ä½ æœ€å¾Œä¸€æ¬¡ä½¿ç”¨é€™äº›å·¥å…·ï¼ -guide.bloodmagic.entry.architect.weakShard.info.1=任何有生命的æ±è¥¿ï¼Œéƒ½æœ‰ä¸€å±¤çœ‹ä¸è¦‹ï¼Œæ‘¸ä¸è‘—çš„éˆæŽ¥ï¼Œé€™å€‹ç¾è±¡è¢«ç¨±ä½œéˆé­‚網絡。實è¸è­‰æ˜Žï¼Œè«¸å¦‚å°è¨˜å’Œå„€å¼é€™æ¨£çš„æ±è¥¿ä¹Ÿæ˜¯å¯ä»¥æœ‰éˆæŽ¥çš„，然而這些éˆæŽ¥çš„來æºä¾¿æ˜¯æ“有最強éˆæŽ¥çš„生物——人類。\n\t用æŸç¸›ä¹‹åŠæ”»æ“Šç”Ÿç‰©æ™‚，那些å¯æ†ç”Ÿç‰©çš„一部分éˆé­‚網絡會直接硬化，在它們死後也å¯ä¿æŒå…¶å½¢ç‹€ã€‚這部分éˆé­‚網絡便以虛弱氣血碎片的形å¼ç¾èº«æ–¼ä¸–，它們因其é¡è‰²èˆ‡è™›/cut弱氣血寶ç ç›¸è¿‘而得å。\n\t雖然，至今ä»æœªæ‰¾åˆ°å­˜åœ¨æ›´å¼·çš„氣血碎片的證據，但是你至少知é“，這些碎片å°æ–¼å¢žå¼·ä½ è‡ªå·±çš„éˆé­‚網絡肯定有幫助。 -guide.bloodmagic.entry.architect.masterOrb.info.1=如何利用這種å°éˆé­‚網絡å分親和的特性呢？答案是：用虛弱氣血碎片打造全新的氣血寶ç â€”—導師氣血寶ç ã€‚它å¯ä»¥æ供一百è¬LP的上é™ï¼Œå®ƒå¯ä»¥å¾¹åº•è§£æ”¾ä½ å°è¡€é­”法的想åƒåŠ›ã€‚也許，就算是隕石，也無法阻擋你的å‰é€²äº†å§... -guide.bloodmagic.entry.architect.runeOrb.info.1=看上去這個符文並沒什麼用途。但是，這寶ç ç¬¦æ–‡å¯ä»¥æ高那些放入血之祭壇中填充的寶ç çš„容é‡ä¸Šé™ï¼Œæ¯å¡Šç¬¦æ–‡éƒ½å¯ä»¥æå‡ç™¾åˆ†ä¹‹äºŒã€‚å°æ–¼è™›å¼±æ°£è¡€å¯¶ç ï¼Œé€™æ˜¯å¾®ä¸è¶³é“çš„100LP。而å°æ–¼å°Žå¸«æ°£è¡€å¯¶ç ï¼Œé€™æ˜¯å…©è¬LP的增幅，效果å分顯著ï¼å¦‚果你的祭壇上還有空ä½çš„話，這個符文興許就是你的首é¸ã€‚ -guide.bloodmagic.entry.architect.suppression.info.1=抑液å°è¨˜ï¼ŒæŽ¡ç”¨å’Œå‚³é€å™¨ä¸€æ¨£çš„傳é€ç§‘技，å¯ä»¥è®“一定範åœå…§çš„液體瞬間消失。準確地說，是é€å…¥å¦ä¸€å€‹è¿·ä½ ç¶­åº¦ä¸­ã€‚ä¸å¹¸çš„事，因為傳é€ç§‘技的é™åˆ¶ï¼Œæ¶²é«”還是會回來的——比如說，在使用者走éŽæœ¬æ˜¯æ¶²é«”çš„å€åŸŸå¾Œã€‚ä¸éŽé€™ç„¡å‚·å¤§é›…，畢竟ä¸è«–是在水下行走，還是在下界的熔岩之海上漫步，這å°è¨˜éƒ½æ˜¯å分好用的。 -guide.bloodmagic.entry.architect.haste.info.1=人體能消化的物質中有兩種å分有趣：糖和咖啡因。å‰è€…是能é‡å„²å‚™ï¼Œå¾Œè€…å¯ä»¥ä»¤äººä¿æŒæ¸…醒。這急速å°è¨˜ï¼Œä¾¿å¯ä»¥é€šéŽæ¨¡æ“¬åŒ–å­¸å應的方å¼ï¼Œé‡‹æ”¾æ›´å¤šçš„化學能，進而æå‡å°è¨˜ä½¿ç”¨è€…的移動能力。\n\tå°è¨˜é©…動後，使用者會跑得更快，跳得更高，åŒæ™‚還會令玩家在ä¸ç”¨è·³èºçš„情æ³ä¸‹è·¨è¶Šæ¯”較高的障礙（實際上是個改良版本的自動跳èºï¼‰ã€‚ -guide.bloodmagic.entry.architect.severance.info.1=人們至今無法解釋傳é€çš„機制。多數情æ³ä¸‹ï¼Œå‚³é€è¢«èªç‚ºæ˜¯æ™‚空扭曲的一種表ç¾å½¢å¼ï¼Œç‰©é«”å¯é€šéŽå…©å€‹ä¸åŒæ™‚空的éˆæŽ¥ä¾†å¯¦ç¾çž¬é–“移動。而這絕影å°è¨˜å¯ä»¥é˜»æ­¢æ™‚空扭曲的產生，從而阻止啟動此å°è¨˜çš„玩家附近的生物發動傳é€æŠ€èƒ½ã€‚當然這個å°è¨˜ä¸¦ä¸èƒ½é˜»æ­¢è«¸å¦‚傳é€é–€ä¹‹é¡žçš„æ±è¥¿ï¼Œä½†é˜»æ­¢é¡žä¼¼æœ«å½±äººé€™æ¨£çš„生物還是å¯ä»¥çš„。 -guide.bloodmagic.entry.architect.teleposition.info.1=傳é€å°è¨˜å¯¦éš›ä¸Šæ˜¯å€‹è‡ªå¸¶å‚³é€æ ¸å¿ƒçš„傳é€å™¨ã€‚å°æŸå€‹å‚³é€å™¨ä½¿ç”¨æ­¤å°è¨˜ï¼Œå°è¨˜æœƒè¨˜ä¸‹é€™å€‹å‚³é€å™¨çš„ä½ç½®ï¼Œå†æ¬¡ä½¿ç”¨å°è¨˜å°±å¯ä»¥ç›´æŽ¥å‚³é€åˆ°é‚£è£¡åŽ»äº†ã€‚然而它好åƒæ²’給你返程票... -guide.bloodmagic.entry.architect.compression.info.1=礦工經常é¢å°çš„一個情æ³ä¾¿æ˜¯ï¼Œå®ƒçš„背包中充滿了紅石粉ã€é’金石ã€ä»¥åŠå„種亂七八糟的æ±è¥¿ã€‚雖然å¯ä»¥å£“縮，但是並éžæ‰€æœ‰ç¤¦å·¥éƒ½æœƒéš¨èº«æ”œå¸¶å·¥ä½œå°ã€‚\n\t壓擠å°è¨˜æ‰€å‰µé€ çš„å°åž‹å£“縮力場å¯ä»¥å°‡å„種物å“壓縮起來，進而節約背包空間。具體來說是這樣：如果你有63份紅石粉，å°è¨˜ä¸æœƒæœ‰æ•ˆæžœï¼›ä½†å¦‚果你有64份紅石粉，它就會將其中63份壓縮æˆ7個紅石塊。雖/cut然並沒騰出新的格å­ï¼Œä½†æ˜¯åˆ¥å¿˜äº†é‚£å€‹ä½”了一個格å­çš„紅石粉是å¯ä»¥æŽ¥è‘—放紅石的。這個å°è¨˜å°å…¶ä»–Modçš„é¡žä¼¼æ±è¥¿ä¹Ÿæ˜¯æœ‰æ•ˆæžœçš„。 -guide.bloodmagic.entry.architect.bridge.info.1=影橋å°è¨˜å¯ä»¥å°‡ä½¿ç”¨è€…腳下的空氣固化æˆå¯ä»¥è¡Œèµ°çš„é“路，或者說，幻化出一座幻影之橋。若是你ä¸æ…Žè¸©ç©ºï¼Œå½±æ©‹æœƒç›´æŽ¥åœ¨ä½ è…³ä¸‹å‡ºç¾ï¼Œé¿å…åš´é‡çš„摔傷。儘管在使用å‰éœ€è¦ä¸€äº›æ¸¬é‡å·¥ä½œï¼ŒåŒæ™‚影橋出ç¾ä¹Ÿæœƒé€ æˆå»¶é²ï¼Œå®ƒä»ä¸å¤±ç‚ºä¸€ç¨®ã€Œé£›è¡Œã€çš„好方法。 -guide.bloodmagic.entry.architect.mimic.info.1=擬態是一種å¯ä»¥æ¨¡ä»¿ä»»æ„給定çµæ§‹çš„魔法çµæ§‹ã€‚它本身å¯ä»¥æ ¹æ“šå…¶ç¢°åˆ°çš„方塊，改變自身的分å­çµæ§‹ï¼Œå¾žè€Œä½¿å…¶æœ¬èº«çœ‹èµ·ä¾†éƒ½æ˜¯å¦‚å‡åŒ…æ›ä¸€æ¨£ã€‚但，並éžæ‰€æœ‰çš„屬性都å¯ä»¥è¤‡è£½ï¼šæ¯”如說，普通的擬態方塊變æˆèž¢çŸ³å¾Œä¸èƒ½ç™¼å…‰ã€‚\n\t一般，擬態方塊有兩種用法。第一種，先放置擬態方塊，然後手æŒè¦å½è£çš„方塊å°è‘—擬態方塊å³æ“Šã€‚這樣，被å½è£çš„方塊就直接進入擬態方塊的內/cut部，擬態方塊也就å¯ä»¥å½è£äº†ã€‚ä¸éŽï¼Œé€™å€‹æ–¹æ³•åªèƒ½å½è£ä¸€å€‹æ–¹å¡Šçš„「默èªã€å½¢ç‹€ã€‚舉個例å­ï¼Œæ­¤æ³•å½è£çš„樓梯都是æœåŒä¸€å€‹æ–¹å‘的。\n\t第二種，直接å°è‘—æŸå€‹æ–¹å¡Šä½¿ç”¨æ“¬æ…‹æ–¹å¡Šã€‚若如此åšï¼Œæ“¬æ…‹æ–¹å¡Šä¾¿å¯ä»¥åšåˆ°ç²¾ç¢ºå½è£ã€‚還是剛æ‰æ¨“梯的例å­ï¼Œé€™æ¨£å½è£çš„樓梯就會很自然，因為方å‘被ä¿ç•™äº†ä¸‹ä¾†ã€‚\n\t事實上，擬態方塊的變種有很/cut多。默èªçš„ä¸é€æ˜Žæ“¬æ…‹æ–¹å¡Šå¯ä»¥æ¨¡ä»¿å½¢ç‹€å’Œæ–¹å¡Šçš„大多數屬性，但光是無法照éŽåŽ»çš„。懸幽擬態方塊沒有碰撞箱，é©åˆè£½ä½œéš±è—門。清é€æ“¬æ…‹æ–¹å¡Šå¯ä»¥è§£æ±ºçŽ»ç’ƒçš„擬態å•é¡Œï¼šå…‰ç·šå¯ä»¥ç„¡è¦–被å½è£çš„方塊的屬性，穿é€é€™ç¨®æ“¬æ…‹æ–¹å¡Šã€‚最後，還有一種光亮擬態方塊，ä¸è«–何時它都會發光。終於ä¸ç”¨ç«æŠŠäº†ï¼\n\t其實還有一種特殊的擬態方塊：感知擬態方塊。如果有玩/cut家接近，它們就會å‘其發動猛烈攻擊。這種方塊å¯åœ¨å¾ˆå¤šåœ°æ–¹æ‰¾åˆ°ï¼Œå°¤å…¶æ˜¯åœ°ç‰¢ä¸­ã€‚所以說，如果有一個感知擬態方塊å½è£æˆäº†ç®±å­ï¼Œè«‹è¨˜ä½ï¼šå®ƒå€‘會咬人。\n\t***創造模å¼é™å®šå…§å®¹***\n\t在創造模å¼ä¸‹ï¼Œæ“¬æ…‹æ–¹å¡Šæœƒå¤šå‡ºä¾†ä¸€äº›æœ‰è¶£ç‰¹æ€§ã€‚用藥水或藥劑瓶å³æ“Šæ“¬æ…‹æ–¹å¡Šå¾Œï¼Œå¯ä»¤å…¶åœ¨æœ‰çŽ©å®¶åœ¨é™„近時產生å°æ‡‰çš„藥水效果。如果這是/cut普通的擬態方塊，那麼：點擊æ±é¢/西é¢å¯ä»¥åŠ /減藥水效果的覆蓋範åœï¼›é»žæ“ŠåŒ—é¢/å—é¢å¯ä»¥åŠ /減玩家的檢測範åœï¼›é»žæ“Šä¸Šé¢/下é¢å¯ä»¥æ高/é™ä½Žè—¥æ°´ç”Ÿæˆé–“隔，å³æ¯éš”多久生æˆä¸€æ¬¡è—¥æ°´æ•ˆæžœã€‚\n\t如果你在é¢å°ä¸€å€‹æ„ŸçŸ¥æ“¬æ…‹æ–¹å¡Šï¼Œä½ å¯ä»¥éš¨æ„點擊這個擬態方塊，以改變其檢測玩家的範åœâ€”—如果玩家在檢測範åœä¸­ï¼Œä¸¦ä¸”å¯ä»¥çœ‹åˆ°é€™å€‹æ“¬æ…‹æ–¹å¡Šï¼Œæ“¬æ…‹æ–¹å¡Šæœƒç›´æŽ¥å‡ºç¾åœ¨çŽ©/cut家眼å‰ã€‚\n\tå¦å¤–，如果玩家在創造模å¼ä¸‹å°‡è¦å½è£çš„方塊放入擬態方塊中，這個方塊ä¸æœƒåœ¨æ“¬æ…‹æ–¹å¡Šè¢«ç ´å£žå¾ŒæŽ‰è½ã€‚\n\t最後的最後，如果擬態方塊å½è£çš„是一個è£è‘—æ±è¥¿çš„ç®±å­æˆ–別的什麼容器：å°æ–¼æ„ŸçŸ¥æ“¬æ…‹æ–¹å¡Šï¼Œåœ¨å®ƒæ•—北後會把箱å­é€£åŒå…§å®¹ä¸€å¡Šæ”¾å›žä¾†ï¼›å°æ–¼å…¶ä»–擬態方塊，它會在被擊潰時把物å“撒一地。 -guide.bloodmagic.entry.architect.downgrade.info=就護甲é™ç´šçš„內容，我建議你閱讀《儀å¼å¤§å¸«ã€‹å·çš„「沉é‡éˆé­‚的懺悔ã€ä¸€ç« ï¼Œåœ¨é‚£è£¡ä½ å¯ä»¥å¾—到更詳細的解釋。 - -guide.bloodmagic.entry.architect.augmentedCapacity.info=和增容符文類似，超容符文也å¯ä»¥æå‡ç¥­å£‡çš„容é‡ã€‚但和增容符文ä¸åŒï¼Œå¤šå¡Šè¶…容符文會之間的共鳴會讓容ç©å‘ˆæŒ‡æ•¸ç´šå¢žé•·ã€‚具體來說，是åšä¹˜æ³•ï¼šæ¯ä¸€å¡Šè¶…容符文都會給予é¡å¤–10%%的容ç©ï¼›æ›è¨€ä¹‹ï¼Œå…©å¡Šå³21%%的增長，三塊å³33.1%%的增長，以此類推。\n\t然而，超容符文的效果ä¸èˆ‡å¢žå®¹ç¬¦æ–‡ç–ŠåŠ ï¼Œæ›è¨€ä¹‹ï¼Œä¸è«–有多少超容符文，æ¯å¡Šå¢žå®¹ç¬¦æ–‡éƒ½åªæ供兩åƒLP容é‡ã€‚ -guide.bloodmagic.entry.architect.charging.info=有那麼一些æ±è¥¿å°æ–¼åˆæˆå¾ˆæœ‰å¹«åŠ©ï¼Œè€Œé€™å……能符文便是其中之一：它å¯ä»¥å¸æ”¶ LP，並將 其轉化為「充能點數ã€ï¼Œå…·é«”數é‡å¯ç”¨è¦‹è§£å°è¨˜çœ‹åˆ°ã€‚若是åˆæˆæŸäº›ç‰©å“正好需è¦ä¸€å®šé‡çš„充能點數，那麼這充能符文就å¯ä»¥ä»¥æ¶ˆè€—充能點數為代價，將物å“立刻åˆæˆå‡ºä¾†ã€‚若沒有足夠的充能點數，它就åªæœƒæŒ‰ä¸€æ¯”一的比例直接將充能點數轉化為 LP 以加速 å…¶åˆæˆã€‚\n\t/cut血之祭壇最多å¯å­˜å„²çš„充能點數數é‡æ˜¯å……能符文的數é‡ä¹˜ä»¥ç¥­å£‡çš„容ç©ï¼Œå…¶ä¸­å®¹ç©éœ€è¦è‡³å°‘為兩è¬æ‰æœ‰æ•ˆæžœã€‚血之祭壇充能的速度也是和充能符文數é‡ä»¥åŠå…¶æœ¬èº«çš„速度æˆæ­£æ¯”的（å³ï¼Œå……能速度=符文數é‡*祭壇本身åˆæˆé€Ÿåº¦ï¼‰ï¼Œæ¯ä¸€ç§’å®ƒéƒ½æœƒå°‡ä¸€å®šé‡ LP 轉化為充能點數。所以，如果你的祭壇中有這塊符文，åˆç†çš„設計將會使你事åŠåŠŸå€ã€‚ -guide.bloodmagic.entry.architect.acceleration.info=和大多數符文ä¸åŒï¼Œä¿ƒé€²ç¬¦æ–‡éœ€è¦å’Œåˆ¥çš„符文æ­é…使用，而且它的效果ä¸æ˜¯ç„¡é™åˆ¶å¢žé•·çš„。這個符文的效果是，它å¯ä»¥è®“æŸäº›ç¬¦æ–‡çš„工作頻率變高，比如說，轉ä½ç¬¦æ–‡å’Œå……能符文。具體來說，æ¯æœ‰ä¸€å€‹é€™å€‹ç¬¦æ–‡ï¼Œè·é›¢ä¸‹ä¸€æ¬¡å·¥ä½œçš„等待時間就減一刻。æ›è¨€ä¹‹ï¼šå¦‚果有10塊促進符文，轉ä½ç¬¦æ–‡æœƒæ¯10刻就轉移一次液體，而默èªå€¼å»æ˜¯æ¯20刻。\n\t顯然，你的祭壇中åªå¯èƒ½æœ‰19/cut塊促進符文——在這種情æ³ä¸‹ï¼Œè½‰ä½ç¬¦æ–‡å’Œå……能符文就會一刻ä¸åœåœ°å·¥ä½œã€‚éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸éžå¸¸å¥½ï¼ - -# Demon Kin Entries -guide.bloodmagic.entry.demon.intro=è²æ‹‰Â·æµ·æ³Šæ© -guide.bloodmagic.entry.demon.snare=惡魔æ„志與投網 -guide.bloodmagic.entry.demon.forge=ç„ç«ç†”çˆ -guide.bloodmagic.entry.demon.petty=å¾®å°çš„地ç„魂石 -guide.bloodmagic.entry.demon.sword=æ„ŸçŸ¥ä¹‹åŠ -guide.bloodmagic.entry.demon.lesser=å°åž‹åœ°ç„魂石 -guide.bloodmagic.entry.demon.reactions=æ„料之外的å應 -guide.bloodmagic.entry.demon.sentientGem=感知護甲 -guide.bloodmagic.entry.demon.routing=物å“路由 -guide.bloodmagic.entry.demon.aura=惡魔éˆåŸŸ -guide.bloodmagic.entry.demon.types=ä¸åŒç¨®é¡žçš„æ„å¿— -guide.bloodmagic.entry.demon.crucible=惡魔å©å  -guide.bloodmagic.entry.demon.crystallizer=惡魔çµæ™¶å£‡ -guide.bloodmagic.entry.demon.cluster=惡魔晶簇 -guide.bloodmagic.entry.demon.pylon=惡魔導能塔 -guide.bloodmagic.entry.demon.gauge=éˆåŸŸæ¸¬é‡å„€ - -# Demon Kin Entry Texts -guide.bloodmagic.entry.demon.intro.info=我的åå­—å«è²æ‹‰Â·æµ·æ³Šæ©ï¼Œä»¥æƒ¡é­”使者的身份被知曉。數個月å‰æˆ‘的家鄉被一群惡魔侵襲，其他æ‘民全部被殺，房屋全被破壞。我無法記起襲擊時的多少細節，除了我所èªè­˜çš„æ¯ä¸€å€‹ï¼Œä¼´éš¨è‘—痛苦的慘å«è€Œå‰å¾€ä¸€å€‹æ›´ç¾Žå¥½çš„世界的人們。慶幸那些惡魔沒有è½åˆ°ï¼Œé‚£åœ¨ä¸å®¹æ˜“察覺的教堂的地下室裡，ç•ç¸®æ–¼æžœç±ƒä¸‹çš„我絕望地é¿å…著自己的尖å«è²åŠ å…¥çœ¾äººçš„åˆè²ã€‚\n\t/cutå¯æ€•çš„瞬間，在我ä¸æ…Žæ’žå€’å ‚çš„ç†é¦™ç¥­å£‡æ™‚，一隻惡魔çªç„¶é—–å…¥è–所，或許是這è–地的原由åˆéŽ®éœä¸‹ä¾†ã€‚這是åªé«”åž‹é¾å¤§çš„四足怪物，彎曲的ç ç‰™å€’懸在çªå‡ºçš„嘴上，唾液滴在帶有鋸齒的åŠç‹€çˆªå­ã€‚它環顧了四周，我發誓有那麼一會它的眼ç›å’Œæˆ‘å°ä¸Šäº†ï¼Œä½†ä¹‹å¾Œå®ƒå°±é€™éº¼é›¢é–‹é€™è£¡ï¼Œå½·å½¿å®Œå…¨æ²’有看到或者è½åˆ°ä»€éº¼ã€‚之後發生的事記憶全都模糊ä¸æ¸…。\n\t/cut直到第二天æ‰æœ‰äººç¶“éŽçœ‹åˆ°é€™ä¸€åˆ‡ã€‚這一商隊看到é è™•çš„濃煙，決定繞一大段路好é¿é–‹é€™äº›æƒ¡é­”。商隊中許多人覺得我ç¨è‡ªä¸€äººæ¯«é«®ç„¡æ地生還興許是個壞兆頭，有些甚至ä¸é¡˜å¤šçœ‹æˆ‘一眼。但有一å°å…„弟åŒæƒ…我的é­é‡ï¼Œä¸¦ç›¡åŠ›èªªæœå•†éšŠå…¶ä»–æˆå“¡ä¹Ÿå¸¶ä¸Šæˆ‘。我賣掉了女祭å¸ä¹‹ä»—與一æ¢ç›’å¼æŽ›å¢œï¼Œè—‰æ­¤æ›åˆ°äº†è·Ÿè‘—å‰å¾€ä¸€å€‹é é›¢æƒ¡é­”破壞路徑上的一個安全æ‘莊的許å¯ã€‚ -guide.bloodmagic.entry.demon.snare.info.1=曾有一天，馬格斯曾å°æˆ‘講述é“，世間生éˆçš†æœ‰éˆé­‚：人類，雞，羊，甚至是爬行者也存在這種給予軀體生之æ„志的生命力é‡ã€‚似乎馬格斯早已在這方é¢åšéŽå¤§é‡å¯¦é©—，甚至有èžä¸€å€‹å¼·å¤§çš„法師，å¯ä»¥å°‡ç²å–這些éˆé­‚並注入一個空的軀體，比如殭å±ã€‚但這也讓我感到好奇：如果殭å±èˆ‡éª·é«ä¸¦ä¸æ“有éˆé­‚，它們如何æ“有這生的æ„志？是什麼，給予他們生氣，使他們會去追æ•ä¸¦æ®ºå®³ç”Ÿéˆï¼Ÿ\n\t/cutæ¯æ¯é‘½ç ”最終還是回到了æ„å¿—çš„å•é¡Œä¸Šã€‚任何「活物ã€éƒ½å¿…é ˆæ“有使之生存下去的æ„志，但這ä¸æ„味著那必須是它們自己的。當我把這個想法告訴馬格斯的時候他考慮了一會，接著拿出一個黑æ¿å’Œç²‰ç­†ï¼ˆå¾žå“ªï¼Ÿèª°çŸ¥é“呢），開始速寫並注上一些關於其他形å¼é­”法的註解。「在秘術學中，ã€ä»–畫出一隻稻è‰äººçš„形態並說é“，「分é…於執行許多簡單æ“作的傀儡被賦予了生氣。它們活著，呼å¸è‘—，甚至å¯ä»¥æ­»æ–¼ä¸/cutå†éœ€è¦å®ƒå€‘的主人。幾個世紀以來，伴隨著秘術學的進化，這門è—術已經有éŽæ•¸å€‹ç‰ˆæœ¬ï¼Œæ³•å¸«æœƒå°‡ä»–們的æ„志注入那無生命的創造物中，給他們帶來生氣。\n\t「那麼，è²æ‹‰ï¼Œå‚€å„¡æ˜¯å¦‚何é‹ä½œçš„呢：通éŽæ„å¿—çš„çŒè¼¸ã€‚ã€\n\t所以如果å¯ä»¥é€šéŽä»–人將其æ„志注入一個空殼å¯ä»¥ä½¿å‚€å„¡ç²å¾—生命，那麼就有å¯èƒ½æœ‰ä»€éº¼æŠŠä»–們的æ„志注入亡者/cut的軀體，使得有了殭å±å’Œéª·é«çš„存在。想到這我打了個哆嗦，腦中閃éŽæ•…鄉的é­é‡ã€‚åªæœ‰æƒ¡é­”會åšåˆ°é€™éº¼æ®˜å¿çš„事。但è¦æª¢é©—這個å‡è¨­ï¼Œæˆ‘需è¦æ›´å¤šè­‰æ“šã€‚ -guide.bloodmagic.entry.demon.snare.info.2=在馬格斯的指引，和æ比略百忙之中抽出時間為我æ供的幫助下，我用éµã€ç·šå’Œä¸€é»žç´…石便åšå‡ºäº†åŽŸå§‹æŠ•ç¶²ã€‚身兼秘術使的æ比略說這玩æ„å¯ä»¥åˆ‡æ–·æŽ§åˆ¶ç”Ÿç‰©çš„æ„志。「我拿這玩æ„在傀儡上瞎æžã€ï¼Œä»–帶著微笑這樣說é“。我們都知é“çµæžœæ˜¯ä»€éº¼æ¨£çš„。\n\t「紅石似乎切斷了我的æ„志和傀儡之間的è¯ç¹«ã€‚ç†è«–上來說，如果殭å±å’Œéª·é«èº«ä¸Šä¹Ÿæœ‰æ„志，那這投網也å¯ä»¥åˆ‡æ–·ã€‚ã€\n\t/cut他說我åªéœ€è¦çž„準目標把投網丟éŽåŽ»å°±å¯ä»¥â€”—如果å¥æ•ˆï¼Œæˆ‘就能在目標生物上看到一些白色的顆粒。「然後你需è¦æŠŠé‚£å€‹å¯æ†çš„目標殺死æ‰èƒ½çœ‹åˆ°çœŸç›¸ã€‚但記ä½ï¼Œå¤§æ¦‚åªæœ‰å››åˆ†ä¹‹ä¸€çš„投網會å°ç›®æ¨™æœ‰æ•ˆæžœã€‚所以記得多備一些ï¼ã€\n\t我製作了å六個投網，然後我é¸æ“‡åœ¨æ·±å¤œå‡ºç™¼ã€‚事實上，這項工作相當棘手：è¦åŒæ™‚追蹤幾個殭å±ï¼Œé‚„è¦é–ƒé¿å®ƒå€‘çš„é‡æ“Šï¼Œé‚„è¦çž„準它們丟出投網。/cut當我看到白色的顆粒時，我迅速將殭å±å€‘悉數斬殺，並清點了它們留下的物å“。沙地上一些è—色的粘稠液體å¸å¼•äº†æˆ‘的注æ„。我撿起來看了一下，這似乎是一種超凡脫俗的存在...在快速收集好樣本後我決定先返回å†ä½œé€²ä¸€æ­¥ç ”究。\n\tæ¯ä¸€ä»½æ”¶é›†åˆ°çš„「惡魔æ„å¿—ã€çš„形狀和大å°éƒ½ä¸ç›¡ç›¸åŒï¼Œä¼¼ä¹Žå–決於它們的來æºã€‚æ‹‹é–‹å–®ä½ä¸è«‡ï¼Œåªåšç²—略的定/cuté‡åˆ†æžçš„話，它們的å“質å¯ä»¥æŒ‰0到5來劃分。我並ä¸æ˜¯å¾ˆæ¸…楚這些物質å¯ä»¥ç”¨ä¾†å¹¹ä»€éº¼ï¼Œä½†æ¯«ç„¡ç–‘å•å®ƒå€‘引起了我的注æ„。我也ä¸æ˜¯å¾ˆæ¸…楚這究竟是惡魔的å°è¨˜ï¼ŒæŠ‘或僅是它們身上掉è½çš„æŸç¨®æ™¶é«”。我需è¦é€²ä¸€æ­¥çš„研究。 -guide.bloodmagic.entry.demon.forge.info.1=我已在惡魔æ„志上投入了數星期的時間。雖然有所進展，但情æ³ä¾èˆŠæ™‚好時壞。但有一天，æ比略å•æˆ‘能å¦å€Ÿç”¨ä¸€é»žæƒ¡é­”æ„志來åšå¯¦é©—；他解釋說，這很有å¯èƒ½æ˜¯ä»–一直在尋找的新一代血之祭壇的æ料——馬格斯原本的祭壇已經破舊ä¸å ªï¼Œä½†æŒ‰å¤æ³•è£½ä½œçš„祭壇å»æ€Žéº¼ä¹Ÿç„¡æ³•ä½¿ç”¨...總而言之，他覺得我能幫上忙。\n\t事實證明他是å°çš„。我查閱了很多討論「等價交æ›ã€ä»¥åŠ/cut物質嬗變的煉金術書ç±ï¼›åŒæ™‚我還咨詢了一些途經我們這裡的煉金術師，他們也慷慨地給了我一些解構物質和能é‡çš„方法，以便進行深入研究。（啊，我必須承èªæˆ‘å分喜歡那些煉金術師的暗紫色盔甲——å€å€çœ‹ä¸€çœ¼å°±æœƒè®“人感覺è¦è¢«ä¸€å€‹è³ªé‡å·¨å¤§çš„æ±è¥¿æ‹‰éŽåŽ»ä¸€æ¨£ã€‚啊我沒在說æ比略ï¼ï¼‰æˆ‘利用僅有的簡易煉金陣列以åŠæ¥µå°‘é‡æ¨£æœ¬ä¾¿æˆåŠŸå¾žæƒ¡é­”æ„志中抽å–到了能é‡ã€‚剩下的事情就åªæœ‰åˆé©çš„構造了。 -guide.bloodmagic.entry.demon.forge.info.2=就在今天，我æˆåŠŸè£½æˆäº†ä¸€ç¨®å¯å°‡åŽŸç”Ÿæ„志注入物å“中的çµæ§‹ã€‚我ç¾åœ¨ç®¡é€™å€‹æ±è¥¿å«ã€Œç„ç«ç†”çˆã€ï¼Œå¯¦éš›ä¸Šå®ƒåªæ˜¯å€‹é‘²å…¥çŽ»ç’ƒé ‚層中的簡易煉金術陣列，å¯æœ€å¤šåŒæ™‚將四個物å“和原生æ„å¿—èžåˆæ–¼ä¸€é«”。惡魔æ„志需è¦æ”¾åœ¨å³æ‰‹é‚Šï¼Œé¡¯è€Œæ˜“見的圓圈則是為物å“準備的。目å‰ä¾†èªªæˆ‘已掌æ¡äº†è‹¥å¹²ç¨®ã€Œé…æ–¹ã€ï¼Œä½†ä½¿ç”¨é€™çˆå­ä»ç„¶æœ‰ä¸€äº›è¦æ±‚。\n\tå°æ–¼åˆæ¬¡ä½¿ç”¨ç„ç«ç†”çˆçš„人/cut來說，他們需è¦æ³¨æ„一些事情：一，物å“èžåˆéœ€è¦æ供一定數é‡çš„惡魔æ„志，如果數é‡ä¸å¤ ï¼Œä»€éº¼äº‹éƒ½ä¸æœƒç™¼ç”Ÿï¼›äºŒï¼Œå‰é¢èªªåˆ°ç‰©å“èžåˆéœ€è¦æ供一定數é‡çš„惡魔æ„志，但大部分é…方實際都消耗ä¸äº†é‚£éº¼å¤šï¼›ä¸‰ï¼Œæœ‰äº›ç‰©å“çš„èžåˆéœ€è¦å¤§é‡æ„志來啟動，但å»æ¶ˆè€—ä¸äº†å¤šå°‘，甚至根本ä¸æ¶ˆè€—；四，有些é…方的產é‡å·¨å¤§ï¼Œæœ‰äº›...並ä¸æ€Žéº¼é«˜ã€‚ -guide.bloodmagic.entry.demon.petty.info.1=åˆæ˜¯æ–°ä¸€å€‹å¤œæ™šï¼Œæˆ‘åˆé–‹å§‹äº†æ—¥å¸¸çš„收割工作。但是很快我æ„識到了一個å•é¡Œï¼šæˆ‘的背包æ¯å¤©éƒ½æœƒè¢«å„種樣本塞滿ï¼åŽŸå› ä¸æ˜¯å¾ˆæ¸…楚，也許是因為æ¯ä»½æ¨£æœ¬çš„最終來æºéƒ½ä¸ä¸€æ¨£ï¼Œå› æ­¤ç„¡æ³•å£“縮在一起å§ã€‚至少，從它們物ç†è¡¨ç¾å½¢å¼ä¾†èªªæ˜¯é€™æ¨£çš„。\n\t也因此我åˆå›žåˆ°äº†è¢«ä¸Ÿåœ¨å±‹å­ä¸€è§’çš„ç„ç«ç†”çˆæ—開始為我的實驗準備æ料，將æ比略的那些令人窒æ¯çš„實驗拋之/cut腦後。我這幾天在為æ比略準備他的熔çˆï¼Œå› ç‚ºæˆ‘已經放棄抵抗那些因為他的「奧法實驗ã€è€Œç”¢ç”Ÿçš„，籠罩在我的工作室裡的粉ç°äº†ã€‚我管你是ä¸æ˜¯åœ¨ã€Œå¡«è£œéˆé­‚網絡那無形的網狀çµæ§‹èˆ‡çŸ³æ¿çš„物ç†çµæ§‹çš„空白ã€ï¼Œè¶•å¿«è®“你那些天殺的æ±è¥¿æ»¾å‡ºåŽ»ï¼ -guide.bloodmagic.entry.demon.petty.info.2=ä¸è«–如何，尋找åˆé©çš„存儲惡魔æ„å¿—çš„æ料的確費了我一番功夫。é’金石似乎是一種很容易就能找到的能é‡å°Žé«”，å¯ä»¥å……當傳導æ„志的通é“。然後我為了é¿å…空氣中的電場的影響，加了一層紅石充當「護盾ã€ï¼ˆè‡³å°‘，馬格斯說éŽï¼Œå°‡å…©ç¨®èƒ½é‡æ··åœ¨ä¸€èµ·æœƒç”¢ç”Ÿç½é›£æ€§å¾Œæžœï¼‰ï¼›ç„¶å¾ŒåŠ ä¸Šä¸€äº›é»ƒé‡‘充當抑性劑；並以玻璃製æˆå¤–殼。最終我得到了一塊「地ç„魂石ã€ã€‚這個åå­—çš„å«ç¾©ä¾¿æ˜¯ã€Œä¾†è‡ªåœ°ä¸‹ä¸–界——塔爾塔羅斯 (ΤάÏταÏος, Tartarus) ——的寶石ã€ã€‚\n\t經éŽè¿‘一步測試，我發ç¾é€™å€‹å¯¶çŸ³çš„容é‡æ˜¯64。（當我把這個çµæžœæ‹¿çµ¦é¦¬æ ¼æ–¯çœ‹æ™‚，他覺得這個數字是個å分完美的整數。）這樣，我å†è©¦åœ–撿起惡魔æ„志時它就å¯ä»¥è‡ªå‹•å°‡å…¶æ”¶é›†èµ·ä¾†äº†ã€‚但...這樣一來æ„志它本身似乎就消失了。在拯救了我的背包的åŒæ™‚也給我帶來了新的謎團呢。åŒæ™‚我還發ç¾ï¼Œè‹¥æ˜¯æˆ‘手æŒå¯¶çŸ³ä¸¦å°‡ç²¾ç¥žé›†ä¸­æ–¼æ­¤ï¼ˆå³æ“Šï¼‰ï¼Œç´„有/cut容é‡ä¸Šé™å分之一的æ„志就會æµå…¥æˆ‘身上的å¦ä¸€å€‹å¯¶çŸ³ä¸­ã€‚我覺得這個性質會在我得到更強大的地ç„魂石後大顯身手。 -guide.bloodmagic.entry.demon.sword.info.1=我的網åˆå‡ºå•é¡Œäº†ã€‚\n\tä¸è«–我怎麼努力改進，這投網似乎就是ä¸èƒ½å®Œç¾Žå·¥ä½œã€‚多數時候會打çµã€‚但å³ä¾¿æˆ‘æˆåŠŸæŠ•ä¸­äº†æ®­å±ï¼Œå®ƒé‚„是有很高概率ä¸å·¥ä½œã€‚為了é¿å…自己的頭髮被網çºä½çš„命é‹ï¼Œæˆ‘決定立刻回到我的ç„ç«ç†”çˆæ—開工。\n\t但，並éžç«‹åˆ»é–‹å·¥â€”—我首先得清ç†ä¸‹ä¸Šé¢çš„ç°å¡µã€‚ -guide.bloodmagic.entry.demon.sword.info.2=我將那微å°çš„地ç„魂石存儲惡魔æ„志的能力æˆåŠŸæ³¨å…¥åˆ°äº†éµåŠè£¡ï¼Œä¸¦å¾—到了一柄...傷害比我的拳頭還低的åŠã€‚我å°é€™å€‹çµæžœæ„Ÿåˆ°å分失望，因為我為了讓以地ç„魂石驅動的煉ç„熔çˆä¸éŽç†±è€Œåœ¨ä¸€æ—擺弄了很久很久。\n\t然而，當我å†æ¬¡æ‹¿èµ·åœ°ç„魂石時，åŠé–‹å§‹æ•£ç™¼å‡ºäº†ä¸€ç¨®æ–°çš„能é‡ã€‚似乎，我身上的惡魔æ„志越多，åŠçš„傷害也就越高，ç²å¾—的惡魔æ„志也就越多；倘若/cut沒有地ç„魂石...這åŠå°±å¦‚åŒå»¢éµä¸€èˆ¬ã€‚\n\t經éŽæ¸¬è©¦æˆ‘åˆç™¼ç¾äº†ä¸€ä»¶äº‹ï¼šæ“Šæ®ºä¸åŒçš„目標ç²å¾—çš„æ„志數é‡ä¸ä¸€æ¨£ã€‚具體的數é‡å’Œç›®æ¨™ç”Ÿç‰©çš„生命上é™æˆæ­£æ¯”——以蜘蛛為例，它最多åªæœ‰8顆心，因此殺死蜘蛛能ç²å¾—çš„æ„志數é‡ä¾¿æ˜¯æ®­å±çš„百分之八å，因為殭å±æœ€å¤šæœ‰å顆心。或許是因為生命越多的生物動起來時需è¦çš„æ„志越多å§ã€‚我覺得這個事情得好好記ä½ï¼Œä»¥å‚™ä¸æ™‚之需。 -guide.bloodmagic.entry.demon.lesser.info.1=今天在和æ比略èŠå¤©ï¼ŒèŠåˆ°äº†æœ€è¿‘他的一些工程。ä¸å¾—ä¸æ‰¿èªï¼Œä¸€æ—¦èªªèµ·ä»–的研究，他就會說個沒完沒了ï¼ä¸ç®¡äº†ã€‚æ比略說他最近一直在研究å°è¨˜ï¼Œç›®å‰ä»–已經利用我給他造的ç„ç«ç†”çˆæˆåŠŸè£½æˆäº†æ°´ä¹‹å°è¨˜å’Œç†”岩å°è¨˜ã€‚我ä¸æ˜¯å¾ˆæ¸…楚他是怎麼åšçš„——我åªçŸ¥é“他以地ç„魂石作為催化劑，將多種æ料在熔çˆä¸­ç…‰æˆå°è¨˜ï¼Œä½†æˆ‘沒親眼目ç¹éŽä»–的實驗éŽç¨‹ã€‚ä¸éŽæˆ‘今天總算知é“了他那漫天飛舞的ç°å¡µæ˜¯/cut怎麼回事。\n\t我來試著按他的方å¼è¤‡è¿°ä¸€ä¸‹ã€‚呃，「利用魂石中的æ„志來嬗變平時根本ä¸æœƒå應的若干原料時，發生了å應。利用這種增幅效應，我便å¯ä»¥åˆ»å‡ºæˆ‘所需è¦çš„銘文，以引導能é‡çš„æµå‹•ï¼Œå¾žè€Œå®Œæˆæˆ‘需è¦å®Œæˆçš„工作。ã€é›–說白紙黑字難以想åƒï¼Œä½†æˆ‘扶了扶眼é¡å¾Œé‡æ–°å›žæƒ³èµ·äº†ç•¶æ™‚的景象...我ä¸ç¢ºå®šä»–是ä¸æ˜¯å¹³æ™‚也這樣，但我發誓，一旦跟我解釋æ±è¥¿ï¼Œä»–就會變æˆ...科學家。\n\t/cutä¸è«–如何，他為我展示了水之å°è¨˜çš„製作方å¼ã€‚在電光ç«çŸ³èˆ¬çš„演示後，他終於進入了正題。「我在試圖用更高級的ææ–™é‡è¤‡ç›¸åŒçš„éŽç¨‹ï¼Œä½†å應物似乎總會在我放進去的一瞬間...爆炸。看上去很ä¸ç©©å®šã€‚我覺得是因為他們沒有正確地èžåˆåœ¨ä¸€èµ·â€”—或許是能é‡ä¸å¤ å§ã€‚ã€\n\t我在æ€ç´¢äº†å¹¾åˆ†é˜å¾Œä¾¿é–‹å§‹äº†å·¥ä½œâ€”—正如å‰æ–‡æ‰€èªªï¼Œæˆ‘覺得我會需è¦æ›´å¼·å¤§çš„地ç„é­‚/cut石的，但我ä»ç„¶åœ¨æ€è€ƒå¦‚何以優雅的方å¼å®Œæˆé€™å€‹å·¥ä½œã€‚æ‰€ä»¥ï¼Œæˆ‘æ±ºå®šï¼šè¨´è«¸æš´åŠ›ï¼ -guide.bloodmagic.entry.demon.lesser.info.2=我找來一整塊é’金石ã€ä¸€æ•´å¡Šç´…石ã€ä¸€é¡†é‘½çŸ³ã€ä»¥åŠä¸€å¡Šç©ºçš„地ç„魂石——啊這塊魂石是我在地上發ç¾çš„，應該是以å‰æŸå€‹é€²å±•ä¸é †çš„實驗中用的。我åªè¨˜å¾—馬格斯å¯ä»¥è®“水泥牆上的洞瞬間消失。然後我將這四個物å“放入ç„ç«ç†”çˆï¼Œä¸¦ä»¥ä¸€å¡Šæ»¿çš„地ç„魂石供能——最終çµæžœé¡¯ç¤ºæˆ‘需è¦è‡³å°‘大約60點æ„志。經éŽä¸€ç³»åˆ—優化，我終於確定了é…方，並開始觀察生長中的地ç„魂石。\n\t/cutå¦å¤–還有一點，我試éŽç”¨é‡‘塊代替鑽石，但çµæžœä¼¼ä¹Žåªèªªæ˜Žå¦ä¸€ç¨®æ°´æ™¶çµæ§‹æ›´æœ‰ç”¨ã€‚\n\t最終，我得到了全新的「å°åž‹åœ°ç„魂石ã€ï¼Œå®ƒæ“有256點容é‡ï¼Œæ¯”å¾®å°çš„地ç„魂石大多了。希望這顆新魂石å¯ä»¥æ»¿è¶³æ比略的需求å§ã€‚哎呀這玩æ„的容é‡é€™éº¼é«˜ä¸å°±æ„味著我得花更多時間來收集惡魔æ„志嗎？啊ï¼åˆæ˜¯ä¸€å€‹æ¼«æ¼«é•·å¤œ...ï¼ -guide.bloodmagic.entry.demon.reactions.info=我今天一早醒來發ç¾è‡ªå·±èººåœ¨é†«é™¢çš„病床上，身上有什麼æ±è¥¿ç–¼ç—›æ¬²è£‚。我çœé–‹é›™çœ¼ï¼Œå»çœ‹åˆ°äº†æ»¿çœ¼çš„暗洋紅色——那是，Veteres——è·é›¢æˆ‘們æ‘莊最近的大城市——的一家醫院的天花æ¿ã€‚我å°ç¾åœ¨çš„環境倒ä¸æ˜¯æ€Žéº¼å¥‡æ€ªï¼Œå› ç‚ºæˆ‘的目光è½åœ¨äº†ä¸€å¤§ç‰‡æ“¦å‚·å’Œæ·¤é’上，以åŠæˆ‘左腿上的石è†...什麼人肯定å°æˆ‘下了å為"Ossa-Fracta"的詛咒——因為那åªèƒ½æ˜¯æ ¹å£žæŽ‰çš„骨頭ï¼\n\t/cut當馬格斯和一å緊繃著臉的護士走進來的時候，我就立刻明白了：我é­é‡çš„事情比想åƒä¸­çš„é‚„åš´é‡ã€‚顯然，我é‡å°æ–°åˆ¶çš„å°åž‹åœ°ç„魂石的實驗發生了å彈並引起了爆炸，雖然è¦æ¨¡ä¸å¤§ï¼Œä½†ä»æœ‰æ®ºå‚·åŠ›ã€‚ä¸éŽæˆ‘也就åªèƒ½æƒ³åˆ°é€™é»žäº‹æƒ…了：我左å°è…¿ä¸Šè¦†è“‹çš„黑曜石ã€éµå’Œé‘½çŸ³è£½æˆçš„護甲，ç¾åœ¨è®Šæˆäº†æŸç¨®å®Œå…¨ç„¡æ³•æ‹†é™¤çš„護甲——更準確地說，是æŸç¨®æ·¡è—的，類似符文矩陣的魔法護甲。\n\t/cut我冷éœä¸‹ä¾†ï¼Œä¸¦å•é¦¬æ ¼æ–¯æ€Žéº¼çœ‹ï¼Œé›–然我已然知é“發生了什麼。「我覺得å§ï¼Œã€ï¼Œä»–說，並在èªçœŸè†è½çš„護士看我之å‰çž¥äº†è­·å£«ä¸€çœ¼ï¼Œã€Œé‚£æ˜¯æŸç¨®é‘½çŸ³æ®˜ç•™ç‰©ï¼Œé€™ä¹Ÿæ˜¯ç‚ºä»€éº¼æˆ‘們沒辦法拆掉它的原因。åŒæ™‚，它還被æŸç¨®...異域的能é‡æŸç¸›è‘—，這也是為什麼你ç¾åœ¨æœƒèººåœ¨é€™è£¡ï¼Œè€Œä¸æ˜¯ç•¶åœ°è¨ºæ‰€ï¼Œçš„原因——共èšæœƒè‡ªå¾žä¸Šæ¬¡é‚ªè¡“事件以來就一直å°è¥²æ“Šäººé¡žçš„ä¸æ˜Žèƒ½é‡é«˜åº¦é‡è¦–，我們必須ä¿è­‰ä¸æ‹›æƒ¹æ˜¯éžã€‚ã€\n\t/cut「我知é“了...ã€å¹³æ—¥è£¡ï¼Œé¦¬æ ¼æ–¯æ˜¯ä¸æœƒåŽ»æ“心諸如就未知能é‡äº‹ä»¶ç…§æœƒå…±èšæœƒé€™ç¨®æ­£å¼çš„事情的——我已經著手研究惡魔æ„志多時了，也ä¸è¦‹å…±èšæœƒä¸Šé–€ä¾†ç‚ºæ–°çš„魔法能é‡è¾¦ç›¸é—œæ‰‹çºŒã€‚我å°æ”¿æ²»ä¸æ„Ÿèˆˆè¶£ï¼Œæˆ‘也ä¸æ‰“ç®—é€éœ²å¤ªå¤šæ¶ˆæ¯ï¼Œä½†æˆ‘知é“馬格斯å°æ­¤äº‹éžå¸¸è¬¹æ…Žâ€”—這æ„味著，在接下來一段時間內，馬格斯都會為這æ„志所蘊å«çš„能é‡æ“”憂，說ä¸å®šé‚„會牽扯出陳年舊賬也說ä¸å®š...？\n\/cut「夠了，話題到此為止，ã€é¦¬æ ¼æ–¯èªªç½·ä¾¿æŠ«ä¸Šäº†ä»–çš„é•·è¢ï¼Œã€Œæˆ‘原本打算一開始就將之公之於眾的，但那時它的å¨åŠ›é‚„ä¸æ˜Žé¡¯ï¼Œä½†ç¾åœ¨...ã€\n\t我感å—到左腿有一股熱浪，就åƒè¦æŠŠæˆ‘的腿燒起來一樣，åŒæ™‚為看到馬格斯æ§æˆæ¯ç‹€çš„手蓋在了è—色的殼上，散發出耀眼的紅光。幾秒é˜å¾Œâ€”—雖然我感覺這åƒæ˜¯ç¶“éŽäº†æ°¸æ†çš„時間——殼開始碎裂並脫è½ã€‚說實話這個çµå±€æœ‰äº›ä»¤äººæŽƒèˆˆã€‚\n\t/cut我試圖起身，但馬格斯一把把我按回床上：「è²æ‹‰ï¼Œä½ éœ€è¦ä¼‘æ¯ã€‚魂石的事情å¯ä»¥å…ˆæ”¾ä¸€æ”¾ã€‚ã€å°æ­¤ï¼Œä¸€é–‹å§‹æˆ‘是拒絕的，但我後來轉而開始æ€è€ƒé€™æ¬¡äº‹æ•…。馬格斯ä¸æ—©é»žé€™éº¼åšçš„ç†ç”±åªèƒ½æ˜¯åœ°ç„魂石在爆炸後ä»ç•™åœ¨æˆ‘身上。æ›è¨€ä¹‹ï¼Œæˆ‘腿上ä¸è«–發生什麼，都和惡魔æ„志有關；åªè¦æ‹¿åŽ»é­‚石，那層殼也就能被移除。我開始了沉æ€... -guide.bloodmagic.entry.demon.sentientGem.info.1=幾天後，馬格斯強制執行的「休養生æ¯ã€çµæŸäº†ã€‚我決定在我ç¾æœ‰çš„基礎上繼續研究感知護甲。然而，還有很多關於感知之åŠå’Œæƒ¡é­”æ„å¿—çš„ç–‘å•æ²’有解答。誠然，我們有一些ç†è«–上的猜想，但畢竟是馬格斯和我æ出的ç†è«–，我們也ä¸çŸ¥é“究竟有多準確。\n\t為此我需è¦ä¸€é»žå¤§è†½çš„設想。馬格斯告訴我說，我們在學習血之魔法時，也有必è¦å­¸ç¿’å¦ä¸€é–€é­”法的è—術。æ比略/cut建議我去學習花之魔法，但我å°æ­¤å—¤ä¹‹ä»¥é¼»â€”—「一堆花也能幫我擊退惡魔？ï¼ã€ -guide.bloodmagic.entry.demon.sentientGem.info.2=感知護甲寶石是塊å¯ä»¥è®“ä½ ç©¿å¸æ„ŸçŸ¥è­·ç”²çš„工具。確ä¿èº«ä¸Šæœ‰16點惡魔æ„志，使用這塊寶石（å³æ“Šï¼‰ï¼Œä¾¿æœƒå°‡ä½ èº«ä¸Šçš„護甲悉數替æ›æˆä¸€å¥—全新的感知護甲，åŒæ™‚還會繼承你本來護甲上的附魔效果；å†æ¬¡ä½¿ç”¨é€™å¡Šå¯¶çŸ³å°±å¯ä»¥è„«ä¸‹æ„ŸçŸ¥è­·ç”²ä¸¦æ›å›žä½ æœ¬ä¾†çš„護甲。當然，å³ä¾¿ä½ èº«ä¸Šæ²’有護甲，這塊寶石也是å¯ä»¥ç”¨çš„。\n\t感知護甲的效果一般與普通éµè­·ç”²ç„¡ç•°ï¼Œé™¤æ­¤ä¹‹å¤–沒有別/cut的效果。但，和感知工具一樣，當你身上æŒæœ‰æƒ¡é­”æ„志時，感知護甲的ä¿è­·èƒ½åŠ›å°±æœƒä¸Šå‡ï¼Œä¸Šå‡å¹…度與æ„志數é‡æˆæ­£æ¯”。也正是因為此，當你身上有海é‡æƒ¡é­”æ„志時它的ä¿è­·èƒ½åŠ›å°±æœƒè®Šå¾—å分強大。但有一點需è¦æ³¨æ„，就是你æ¯å—到一次傷害，都會消耗地ç„魂石中的惡魔æ„志，如果æ„志數é‡å¤ªä½Žï¼Œæ„ŸçŸ¥è­·ç”²å°±å¯èƒ½æœƒè¢«æ‰“回原形。說ä¸å®šæ˜¯å€‹å¼±é»žå‘¢ï¼ -guide.bloodmagic.entry.demon.routing.info=血魔法的物å“傳é€æ˜¯ä»¥æƒ¡é­”æ„志編織æˆçš„網的形å¼å‡ºç¾çš„，整張網構æˆäº†ç‰©å“傳輸的通路，連接著æ¯ä¸€å€‹å„²å­˜é»žã€‚讓我來先講解一下æ¯ä¸€å€‹ç‰©å“都是幹什麼的。\n\tæ¯ä¸€å€‹è·¯ç”±ç³»çµ±éƒ½æœ‰ä¸€å€‹ä¸»æŽ§è·¯ç”±ç¯€é»žï¼Œç›¸ç•¶æ–¼æ•´å€‹ç³»çµ±çš„中樞。輸入節點用於將物å“輸入路由網絡，輸出節點將物å“從網絡中æå–出來，而標準的路由節點沒有任何特殊功能。\n\t/cut網絡的æ­å»ºæ–¹æ³•å¦‚下：首先，你需è¦åœ¨æ½›è¡Œæ™‚手æŒç¯€é»žé€£æŽ¥å·¥å…·å³æ“Šä¸€å€‹ç¯€é»žï¼Œç„¶å¾Œä»¥åŒæ¨£çš„方法å³æ“Šå¦ä¸€å€‹ä½ æƒ³èˆ‡ä¹‹é€£æŽ¥çš„節點。åªè¦å…©å€‹ç¯€é»žä¹‹é–“能找到æŸç¨®é€šè·¯ï¼ŒæŠ‘或都連接在主節點上，它們就å¯ä»¥äº’相「通信ã€ã€‚\n\t物å“路由第一原則：物å“總是從最近的輸入節點進入網絡，從最近的輸出節點離開網絡。你需è¦ç¯©é¸å™¨ä¾†é™åˆ¶ç‰©å“çš„æµå‘。在節點的æ“作界é¢/cut上有一個按鈕å¯ä»¥è®“你進行éŽæ¿¾è¨­ç½®ï¼Œå¯ä»¥ç²¾ç¢ºåˆ°é¢ï¼ˆç•Œé¢ä¸­çš„N指北方，以此類推）。最左邊的格å­é‚„å¯ä»¥æŒ‡å®šç‰©å“數é‡å’Œç¨®é¡žã€‚å°æ–¼è¼¸å…¥ç¯€é»žä¾†èªªï¼Œç¯©é¸å™¨çš„存在會使它們åªæå–篩é¸å™¨æŒ‡å®šçš„物å“；如果你指定了數é‡ï¼Œå®ƒå€‘還會留下指定數é‡çš„物å“，而éžå…¨éƒ¨æå–出來。å°æ–¼è¼¸å‡ºç¯€é»žä¾†èªªï¼Œç¯©é¸å™¨å‰‡è®“它們åªæŽ¥å—並輸出指定的物å“；如果你指定了數é‡ï¼Œé‚£éº¼å®ƒå€‘最多åªæœƒè¼¸å‡ºé‚£éº¼å¤šç‰©å“。\n\t/cut有四種ä¸åŒé¡žåž‹çš„篩é¸å™¨ï¼š\n\t精確匹é…——物å“çš„NBT和元數據必須完全匹é…。\n\t按模組匹é…——若物å“來自指定Mod則匹é…æˆåŠŸã€‚\n\t忽略NBT——篩é¸å™¨ä¸æ¯”較NBT標籤。\n\t礦物字典——若物å“帶有相åŒç¤¦ç‰©å­—å…¸æ¢ç›®å‰‡åŒ¹é…æˆåŠŸã€‚\n\t/cut在將篩é¸å™¨æ”¾å…¥è·¯ç”±ç¯€é»žå¾Œï¼Œä½ å¯ä»¥åœ¨è·¯ç”±ç¯€é»žä¸Šçœ‹åˆ°å…©å€‹æ•¸å­—：數é‡å’Œå„ªå…ˆç´šã€‚點擊篩é¸å™¨ä¸­çš„任何物å“後å³å¯çœ‹åˆ°å…¶å字，正下方則會顯示數é‡ã€‚如å‰æ–‡æ‰€è¿°ï¼Œé€™ä¾¿æ˜¯æŒ‡å®šæ•¸é‡çš„地方了。若你將數é‡è¨­å®šç‚º0，那麼就æ„味著「所有ã€â€”—å°æ–¼è¼¸å…¥ç¯€é»žä¾†èªªï¼Œé‚£å°±æ˜¯æŠ½å–所有物å“ï¼›å°æ–¼è¼¸å‡ºç¯€é»žä¾†èªªï¼Œå°±æ˜¯æ供所有物å“。\n\t第二個數字便是優先級，å¯ç”¨ä¸€æ—的箭頭調整。數字越å°ï¼Œ/cut優先級越高，物å“將會首先試圖å‰å¾€å„ªå…ˆç´šé«˜çš„節點。 -guide.bloodmagic.entry.demon.aura.info=生物被殺死後，其éˆé­‚會日漸消退，最終回歸創世之神。使用投網，å¯ä»¥å°‡å…¶æŸç¸›æ–¼ç¾ä¸–，但也有一些難度。我們ç¾åœ¨ï¼Œå‡ºæ–¼ç¨®ç¨®ç†ç”±ï¼Œå°é€™äº›æ„志加以干擾並å‡çµå…¶ä¸€åˆ‡æ´»æ€§ã€‚若我們燃燒æ„志，它就會回歸虛無。但若是我們直接將æ„志釋放到空氣中，我們便å¯ä»¥ä»¥æ›´éˆæ´»çš„æ–¹å¼é§•é¦­é€™è‚¡åŠ›é‡ã€‚有些方å¼å分普通，而有些方å¼å‰‡é¡¯å¾—å分強大。\n\t在將惡魔æ„志釋放到空氣中/cut後，它會一直待在釋放出來的那片土地上（å³ï¼Œé‚£å€‹å€å¡Šï¼‰ï¼Œä¸æœƒè¼•æ˜“離開。æ¯ä¸€ç‰‡åœŸåœ°ä¸Šçš„ä¸åŒç¨®é¡žçš„æ„志（關於æ„志的種類，後文有詳述）互ä¸å½±éŸ¿ã€‚這些æ„志的存在還å¯ä»¥ç”¨å…¶ä»–的方塊和物å“來調整。 -guide.bloodmagic.entry.demon.types.info=到目å‰ç‚ºæ­¢ï¼Œæ¯ç•¶æˆ‘們討論惡魔æ„志時，都是討論的原生æ„志。這也就æ„味著這是天然的æ„志，但這並ä¸ç­‰æ–¼å®ƒæ˜¯ç´”的。事實上，惡魔æ„志有若干類型；除開原生æ„志，還有è…è•ã€ç ´å£žã€å¾©ä»‡ä»¥åŠå …毅四種æ„志。原生æ„志實質是這四種æ„å¿—çš„æ··åˆç‰©ï¼Œä¹Ÿè¨±é‚„有一些至今沒有識別的æ„志，但有一點å¯ä»¥ç¢ºå®šï¼Œå³åˆ†é›¢å¾Œçš„æ„志很難å†èžåˆç‚ºä¸€é«”。\n\t四種ä¸åŒçš„æ„志的真正來æº/cut至今ä»ç„¶ä¸æ˜Žï¼Œä½†æˆ‘們已經掌æ¡äº†ç”¢ç”Ÿé€™å››ç¨®æ„志的方法。將æ„志釋放到空氣中後，相åŒç¨®é¡žçš„æ„志就會開始èšé›†åœ¨ä¸€èµ·ã€‚據此，åªéœ€è¦æœ‰ä¸€ç¨®å¯ä»¥æ”¶é›†ç‰¹å®šç¨®é¡žæ„志的設備就å¯ä»¥å®Œæˆä»»å‹™äº†ã€‚接下來的幾個章節中將會講述其中一種設備——惡魔çµæ™¶å£‡ã€‚\n\t四種æ„志代表了人的四種慾望。當然我們ä»ç„¶å¯ä»¥å‡å®šå­˜åœ¨æ›´å¤šç¨®æ„志，但也許它們/cut的純度還ä¸å¤ ï¼Œä¹Ÿè¨±æ ¹æœ¬ä¸èƒ½å­˜åœ¨ï¼Œç¸½è€Œè¨€ä¹‹æˆ‘們目å‰é‚„沒發ç¾æ–°çš„æ„志種類。\n\tè…è•â€”—代表了藉由å„種方å¼â€”—酸液ã€è »åŠ›ã€ç­‰ç­‰â€”—破壞è¬ç‰©çš„慾望。掌æ¡äº†é€™ç¨®åŠ›é‡çš„人，將能自由地驅使å„種疾病（æ›è¨€ä¹‹ï¼Œå„種負é¢æ•ˆæžœï¼‰çš„力é‡ï¼Œä¸¦ä»¤è‡ªèº«å…å—劇毒的侵è•ã€‚\n\t惡æ„——å¯çœ‹ä½œæ˜¯â€”—一種孜孜ä¸å€¦å°‹æ‰¾å°æ‰‹çš„慾望。通常，駕/cut馭惡æ„能é‡çš„人，åªè¦éŽ–定了目標，移動速度就會上å‡ï¼Œä½¿å¾—å¯æ†çš„çµç‰©ç„¡è™•èº²è—，åªå¾—å以待斃。\n\t破壞——你或許已經猜到了——其實就是純粹的力é‡ã€‚正確地使用這種力é‡å¯ä»¥ä»¤ä½¿ç”¨è€…的身體素質在短時間內ç²å¾—快速æå‡ï¼›åŒæ™‚é‚„å¯ä»¥ç”¨ä¾†ç²‰ç¢Žæˆ–碾磨其他物å“。\n\t堅毅——無數的觀察表明——這是抵禦攻擊，使自身å…é­å‚·å®³çš„/cut慾望。大多數情æ³ä¸‹ï¼Œæ“縱這種慾望的人，都是團隊中的銅牆éµå£â€”—任何攻擊都ä¸æœƒå‚·ä»–分毫。如果你想藉由你的護甲或儀å¼ä¾†ä¿éšœä½ çš„存活概率，這股力é‡çµ•å°æ˜¯ä½ çš„第一é¸æ“‡ã€‚ -guide.bloodmagic.entry.demon.crucible.info=惡魔å©å å¯å°‡åœ°ç„魂石中的惡魔æ„志散佈到當地（å³ç•¶å‰å€å¡Šï¼‰çš„大氣之中。這å£å©å æœ‰è‹¥å¹²ç”¨é€”：最簡單的一個就是直接將地ç„魂石放入其中（å³æ“Šæ”¾å…¥ï¼‰ã€‚å©å æœƒè‡ªå‹•å¾žé­‚石中抽å–惡魔æ„志並散佈到空氣中，直到飽和（æ¯ç¨®æ„志大約都會在é”到100點時飽和）或者魂石本身被抽乾了。\n\t此外，它還å¯ä»¥æŠ½å–空氣中的惡魔æ„志並çŒè¼¸é€²é­‚石中。æ“作方å¼å’Œæ•£ä½ˆæƒ¡é­”æ„å¿—ç„¡/cut異，åªæ˜¯å©å éœ€è¦ä¸€å€‹å¼·çš„紅石信號（å³å¼·å……能）。\n\t最後，直接往裡é¢æŠ•å…¥ä¸€å¡Šæƒ¡é­”æ„志也是å¯ä»¥çš„，ä¸è«–什麼形å¼ï¼Œåªè¦æœ‰å®¹ç´æ„志的空間就å¯ä»¥é€²è¡Œè½‰åŒ–。舉個例å­ï¼Œå°‡æ™¶åŒ–惡魔æ„志投入å©å å¯ç”¢ç”Ÿ50點æ„志。 -guide.bloodmagic.entry.demon.crystallizer.info=正如之å‰æ‰€æ到的那樣，惡魔éˆæ°£â€”—通常我們會簡單以「大氣ã€æŒ‡ä»£ä¹‹â€”—是惡魔æ„志的空éˆçš„存在形å¼ï¼Œè€Œæ“Šæ®ºæ€ªç‰©ç²å¾—的物質則是惡魔æ„志物ç†å½¢å¼çš„å…·ç¾ã€‚而這惡魔çµæ™¶å£‡ï¼Œå‰‡åƒæ˜¯ä¸€å€‹éŒ¨é»žï¼Œè®“漂浮在大氣中的惡魔æ„志以晶體的形態é‡ç¾ã€‚\n\t你也許會å•ï¼Œç‚ºä»€éº¼ä¸ç›´æŽ¥ç”¨åœ°ç„魂石培養一塊晶體呢？這是因為在我們將惡魔æ„志釋放到空氣中時，它身上的ç¦éŒ®/cut就已經被解除了——記ä½ï¼Œç•¶æˆ‘們殺死一個怪物時，它身上的æ„志也就隨之被我們ç¦éŒ®äº†ã€‚å†æ¬¡é‡‹æ”¾è‡ªç„¶æœƒä»¤å…¶é‡æ–°æ¢å¾©æ´»åŠ›ï¼Œè€Œé€™çµæ™¶å£‡å°±æ˜¯ç›´æŽ¥å¸æ”¶é€™æ´»çš„惡魔æ„志。ä¸è¦å¤ªæƒ³ç•¶ç„¶å•¦ã€‚\n\tçµæ™¶éŽç¨‹éœ€è¦æ¯”較高的惡魔éˆæ°£çš„濃度（大概是80點），並且需è¦ä¸€æ®µæ™‚間。在這之後，çµæ™¶å£‡çš„上方便會長出åªæœ‰ä¸€æ ¹å°–的惡魔晶簇。çµæ™¶å£‡æœ‰å…©ç¨®å·¥ä½œæ–¹å¼ï¼šå®ƒæ—¢å¯ä»¥å¸æ”¶/cut特定的一種æ„志然後產生å°æ‡‰çš„晶體；也å¯ä»¥ç›´æŽ¥å¸æ”¶åŽŸç”Ÿæ„志來產生晶體。\n\t這其中的å€åˆ¥åœ¨æ–¼ï¼Œä½¿ç”¨åŽŸç”Ÿæ„志時，有大約40%%概率會ç²å¾—ä»»æ„一種特定類型的晶體。而這將是你ç²å¾—特定類型的æ„志的第一步。 -guide.bloodmagic.entry.demon.cluster.info=惡魔晶簇既å¯ä»¥ä½¿ç”¨æƒ¡é­”çµæ™¶å£‡åŸ¹é¤Šï¼Œä¹Ÿå¯åœ¨ç„ç«ç†”çˆä¸­ç”¨æƒ¡é­”çµæ™¶è£½ä½œã€‚晶簇å¯ä»¥åœ¨å„種地方生長——地æ¿ã€ç‰†å£ã€ç”šè‡³å¤©èŠ±æ¿ä¸Šã€‚完全長æˆçš„晶簇應該有七個尖，打掉後æ¯ä¸€å€‹å°–都會變æˆä¸€å¡Šçµæ™¶ã€‚然而，如果你使用å«æœ‰è‡³å°‘1024點æ„志的地ç„魂石來收穫（å³æ“Šï¼‰ï¼Œä½ ä¾¿èƒ½åªæ”¶ç©«ä¸€å¡Šçµæ™¶è€Œä¸å½±éŸ¿åˆ°æ•´æ£µæ™¶ç°‡ã€‚\n\t晶簇生長的éŽç¨‹ä¸­ï¼Œæœƒå¸æ”¶åŒç¨®æƒ¡é­”éˆæ°£ã€‚雖然慢，但的確/cut是有收益的。\n\t有兩種和晶簇的種æ¤å’Œæ”¶ç©«ç›¸é—œçš„å„€å¼ï¼šå­¤é­‚集會和碎晶裂紋。具體用法å¯ä»¥åƒé–±ã€Šå„€å¼å¤§å¸«ã€‹ä¸€å·ã€‚ -guide.bloodmagic.entry.demon.pylon.info=你或許已經發ç¾äº†ï¼Œåœ¨æ²’有外力的影響下，惡魔éˆæ°£åªæœƒå¾…在它被釋放出來的那個地方（å³ç•¶å‰å€å¡Šï¼‰ã€‚而這惡魔導能塔，則為那些éˆåŸŸä¸­çš„æ„志亮起了一盞燈——一盞指引方å‘的燈。附近的æ„志在這燈的指引下會é€æ¼¸å‘燈é æ”，直至這些地方的æ„志數é‡ä¿æŒå‡å‹»ã€‚（註：這裡所謂的「附近ã€ä¸å«å°è§’線上的å€å¡Šï¼Œå³åªæœ‰èˆ‡å¡”所在的å€å¡Šç›¸é„°çš„四個å€å¡Šæœƒå—到影響）。å¦å¤–è¦æ³¨æ„的是，æ„å¿—åªæœƒå¾žå¤šçš„地方æµ/cutå‘少的地方。若是什麼地方的æ„志的濃度比附近的地方濃度低了，它就ä¸æœƒç¹¼çºŒæµå‹•äº†ã€‚ -guide.bloodmagic.entry.demon.gauge.info=你需è¦ä¸€å€‹æ¸¬é‡å„€ä¾†æ¸¬å®šéˆåŸŸä¸­çš„惡魔æ„志濃度。åªéœ€è¦ä¸€ç›´æ”¾åœ¨ä½ çš„背包中，測é‡å„€ä¾¿å¯å°‡æ¿ƒåº¦ä»¥äº”個指示器的形å¼é¡¯ç¤ºå‡ºä¾†ï¼ˆåœ¨å±å¹•å·¦ä¸Šè§’）。潛行時你還能得知具體數é‡ï¼Œä½†é€™å€‹çµæžœæ˜¯ç¶“éŽå››æ¨äº”入的。 - - - -# Alchemy Entries -guide.bloodmagic.entry.alchemy.intro=åº -guide.bloodmagic.entry.alchemy.ash=å¥§è¡“ç²‰ç° -guide.bloodmagic.entry.alchemy.speed=法陣：æ•æ· -guide.bloodmagic.entry.alchemy.updraft=法陣：å‡é¨° -guide.bloodmagic.entry.alchemy.bounce=法陣：彈跳 -guide.bloodmagic.entry.alchemy.turret=法陣：骷é«ç‚®å¡” -guide.bloodmagic.entry.alchemy.buff=增益法陣 -guide.bloodmagic.entry.alchemy.fastMiner=法陣：速掘 - - - - -# Alchemy Entry Texts -guide.bloodmagic.entry.alchemy.intro.info=我å«å¼—拉德·海泊æ©ï¼Œæ˜¯ä¸€å血術士。我一直致力於研究煉金術的細節以åŠæ‰€æœ‰é­”法中共åŒçš„原則——「等價交æ›ã€ã€‚簡單來說，你ä¸èƒ½ç„¡ä¸­ç”Ÿæœ‰ï¼Œé›–然很多人一直在致力於尋找那個å¯ä»¥ç„¡è¦–此原則的石頭。很顯然，石頭的尋找之旅並ä¸é †åˆ©ï¼Œå› ç‚ºäººå€‘總是會在驚è¨è²ä¸­ç™¼ç¾çŸ³é ­æ˜¯å‡è²¨ã€‚當然，我ä¸åªæ˜¯å€‹ç…‰é‡‘術師，我主è¦é‚„是在跟儀å¼å¤§å¸«å’Œç· é€ è€…學習血之魔法，這二ä½åœ¨åœˆå…§æ¥­å·²æ˜¯é —å…·è²æœ›çš„人物了。/cut馬格斯和æ比略這幾年來一直在記錄他們的æˆæžœï¼Œä½†æ˜¯æˆ‘一直ä¸çŸ¥é“馬格斯是å¦çœŸçš„記錄下了他的畢生所學——既ä¸èƒ½è­‰æ˜Žï¼Œä¹Ÿä¸èƒ½è­‰å½ã€‚\n\t我的這本書將記錄血魔法中的煉金術。從奧術粉塵，到複雜的煉金å°æ¡Œï¼Œä½ å°‡æœƒåœ¨é€™æœ¬æ›¸ä¸­æ‰¾åˆ°ä¸–é–“å„種複雜的元素的線索。當然，為了讀懂這本書，你還需è¦é–±è®€å…¶é¤˜çš„幾本書，以å°è¡€é­”法有清楚的瞭解。\n\t/cutå°±ç¾åœ¨ä¾†èªªå‘¢ï¼Œæˆ‘衷心希望é¢å‰çš„讀者閱讀愉快。這些書é çš„內容，都是如å‡åŒ…æ›çš„真æ‰å¯¦å­¸ã€‚ -guide.bloodmagic.entry.alchemy.ash.info=奧術粉塵便是煉金法陣的基礎，而煉金法陣（為簡便，下簡稱法陣）——一種圓形法陣——則æ“有多種強大的功能。åˆæˆå¥§è¡“粉塵需è¦ç”¨åˆ°ç„ç«ç†”çˆå’Œæƒ¡é­”æ„志，關於這兩樣æ±è¥¿çš„細節å¯ä»¥åƒè€ƒæœ¬æ›¸ã€Šæƒ¡é­”使者》一å·ã€‚\n\t/cut一份奧術粉塵å¯ä½¿ç”¨äºŒå次。å°è‘—地é¢æˆ–者牆å£ä½¿ç”¨ä¾¿å¯ç•«å‡ºä¸€å€‹åœ“形的法陣（如果是牆å£ï¼Œä½ åªèƒ½åœ¨ä¸€å€‹æ–¹å‘上看到法陣）。然後，å°æ³•é™£ä¸­å¤®ä½¿ç”¨åˆé©çš„催化劑å³å¯æ”¹è®Šå…¶å½¢ç‹€ï¼Œç•¶ç„¶ä¹Ÿæœƒæ¶ˆè€—催化劑（å³ï¼Œå³æ“Šä½¿ç”¨ï¼‰ã€‚如果法陣沒有變形，那麼你肯定有什麼地方æžéŒ¯äº†ã€‚\n\t在觀察到法陣變形後，你便å¯ä»¥æ”¾å…¥æ¬¡è¦ç‰©å“了。åˆé©çš„次è¦ç‰©å“會啟動法陣，屆時你會看到法陣開始旋轉，並開始/cut產生å„種變化，具體變化隨法陣ä¸åŒè€Œä¸åŒã€‚\n\t所有éžåˆæˆçš„法陣用途都å¯ä»¥åœ¨æœ¬æ›¸ä¸­æŸ¥é–±åˆ°ï¼Œå³ä¾¿åˆæˆè¢«ä»–人強行更改éŽä¹Ÿå¯ä»¥ã€‚å°æ–¼éœ€è¦çš„物å“，它們都已經éŽæŽ’åºï¼ŒæŒ‰ç…§æœ¬æ›¸çµ¦å‡ºçš„é †åºæ”¾ç½®å³å¯ã€‚ -guide.bloodmagic.entry.alchemy.speed.info=法陣：æ•æ·å¯ä»¥è£½é€ è‹¥å¹²æ°£æ—‹ï¼Œä¸¦ç”¨æ³•åŠ›åŠ ç†±ã€‚此後，一旦有生物走入其中，它們就會被風的力é‡æŽ¨å‘å‰æ–¹ã€‚此外，它還å¯ä»¥å…除所有因此產生的掉è½å‚·å®³ã€‚åªéœ€è¦åšäº›é‹å‹•å°±å¥½äº†ã€‚\n\t漩渦推進的方å‘是陣列上箭頭的方å‘。\n\tå¦å¤–，相比於直接走入陣列中，從高處掉入陣列的效果會更好。這è¦æ­¸åŠŸæ–¼ä½ æŽ‰ä¸‹ä¾†æ™‚周åœç©ºæ°£ç”¢ç”Ÿçš„æµå‹•ã€‚ -guide.bloodmagic.entry.alchemy.updraft.info=這個陣列使用和法陣：æ•æ·ä¸€æ¨£çš„原ç†ï¼Œä¸éŽé€™æ¬¡çš„æ–¹å‘是æœä¸Šäº†ã€‚自然地，使用陣列時務必å°å¿ƒï¼šå†ä¸‹ä¾†å°±ä¸æ˜¯æ˜“äº‹äº†ï¼ -guide.bloodmagic.entry.alchemy.bounce.info=陣列會將接近中心的熱é‡é›†ä¸­åˆ°ä¸‹é¢ï¼Œé€²è€Œè»ŸåŒ–地é¢ï¼Œä¸¦æœ€çµ‚轉化為一種由碳和氫組æˆçš„橡膠狀物質。這種物質會將生物彈至空中，åŒæ™‚也能é¿å…掉è½å‚·å®³ã€‚潛行å³å¯é¿å…這種神奇æ料的影響，當然這ä¸æœƒå½±éŸ¿æ‘”è½ä¿è­·çš„功能。 -guide.bloodmagic.entry.alchemy.turret.info=利用那些ä»ç„¶æŽ§åˆ¶è‘—怪物的惡魔æ„志，你å¯ä»¥æŽ§åˆ¶ä¸€å€‹éª·é«çš„心智。åªè¦æœ‰éª·é«é€²å…¥äº†é€™å€‹é™£åˆ—的覆蓋範åœï¼Œé€™éª·é«å°±æœƒåŒ–身哨兵，並å‘所有敵å°ç”Ÿç‰©é–‹ç«ã€‚ä¸éŽé€™å€‹æ³•é™£ä»åœ¨å¯¦é©—當中，它有時候會ä¸ç®¡ç”¨ã€‚ -guide.bloodmagic.entry.alchemy.buff.info=經éŽåš´å¯†çš„研究，你發ç¾æ³•é™£æ“有強大的應用潛力。迄今，你已æˆåŠŸè£½é€ äº†æ•¸ç¨®é™£åˆ—，從加速移動，到åˆç´šçš„傳é€ï¼Œæ‡‰æœ‰ç›¡æœ‰ã€‚但唯有一種陣列，你至今ä»ç„¶æ²’有著手去研究，那便是æ供強大的正é¢å¢žç›Šçš„陣列。\n\t增益陣列實際上是指一系列å¯ä»¥æ供範åœå¢žç›Šæ•ˆæžœçš„陣列。這些陣列產生的增益效果通常都有很大的固定覆蓋範åœï¼Œä¸å—外力影響。然而，因/cut為法陣ä¸æœƒç‰½æ‰¯åˆ°éˆé­‚網絡，陣列需è¦åˆ¥çš„æ–¹å¼ä¾†å‚³æ’­é€™ç¨®æ•ˆæžœï¼Œé€šå¸¸æ˜¯ç›´æŽ¥ç”¨è¡€ã€‚æ›è¨€ä¹‹ï¼Œç•¶æœ‰çŽ©å®¶å±•é–‹é™£åˆ—時，玩家就會立刻å—到傷害（æ失生命），藉由此啟動陣列。\n\t因為使用了直接ç»ç¥­ï¼Œå‰æœŸä½¿ç”¨é€™ç¨®é™£åˆ—會比使用其他ç²å–增益的手段更經濟一些。è·é›¢ï¼Œå¦‚æžœæŸå€‹å°è¨˜å¯æ¶ˆè€—100LP並æ›å–10秒的效果，陣列å¯ä»¥ä»¥1點生命的代價æ›ä¾†30秒åŒæ¨£çš„效果（1點生命å°æ–¼ä¸€ç´š/cut祭壇來說是100LP）。儘管到了後期，這種陣列就ä¸æœƒå†æœ‰æ•ˆçŽ‡ä¸Šçš„優勢，但因為它們的ä½ç½®æ˜¯å›ºå®šçš„，相比於å°è¨˜ï¼Œå®ƒå€‘通常會給予更強大的效果，所以它們到了後期ä»æœ‰å®ƒå€‘的價值。 -guide.bloodmagic.entry.alchemy.fastMiner.info=é‡åˆ°å¤§ç¯„åœçš„雕刻任務，有時候還是自己動手更划算一些。å°æ–¼é€™ç¨®æƒ…æ³ï¼Œé€™å€‹é™£åˆ—便是你的ä¸äºŒé¸æ“‡ã€‚這個陣列å¯ç‚º10格內的玩家æ供急迫 III的效果，消耗則是æ¯30秒1點生命值（åŠé¡†å¿ƒï¼‰ã€‚因為是普通的急迫效果，所以它也å¯ä»¥æ高你的攻擊速度，ä¸éŽè¦è¨˜ä½ï¼Œåˆ¥çš„玩家åŒæ¨£æœƒè¢«é™£åˆ—è¦†è“‹åˆ°ï¼ diff --git a/src/main/resources/assets/bloodmagicguide/textures/gui/alchemyarraycrafting.png b/src/main/resources/assets/bloodmagicguide/textures/gui/alchemyarraycrafting.png deleted file mode 100644 index fc3a6eabfd31d2aced9e8ca07b3666d390f9dfcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 zcmb_dc{J2}8~-tOSDF@XTuYiesXP|e9rTIw)6cw=Xv6t98d~!Dslh- zD4=bS=Kw%V1jPUuDUtBNJ-a3nQr>nbB=BG06%c?|obMB9WW#J+@c^)kv2(=&`{HFq zO6hR4y_NL1w2G3Mu1R;bwa82tjXZrma&UfR1nc}ojlmf^Y4BF*ctC8K{;QF+-8siW zA9F91I_pEr&d(06D$eNjm2mz=P?;Tbvj290*t#7{=w>S1F186G8WaXTLzvA$LJDkC zHH{!(|K=Ol-|L+#LgxgiYG@~I@oZ$g^O~tX@XPR43ogWvJ+_dfQ{oWwyG4agLj3bU zBdrdth){hiBm@jzS*fz=p>YMDGi_3^^!f%6J($UTr@a7yVTZ2I^crJ{5p&VVG^E$HfonTJefx!<-ebe-!SnpB3ucJ7#-WcOmHh1}Fd=~$uQ@_f_;60p^2xVu@d}HP$g;AOs4}eEQ;&kmY=<{HoofEs%6}a$FA>JkWgsQD#!3 zr@x|`$+g4Q{l4yRzTTPr8%aXb(QkWs@ZatZtuv_X;kB43sZF-8Ih*FFw_SVjsP1T= zrw%P33Y1LW4U%4g@8@be3Rw9MyEI}$-2E^Xm40Aw9iM!E>V{VLaYA`KiN9WUVyP*c zeZoCc?j8`VvgW(ZC-c`P&<3Nz+1T9+vAi18I^j<6N?;Q3Tn^gdcGmP%;*4x`eBLD76xho zDh~?5)6B4DeC{^oiE|I9^TRG9qrS{~d5w#1inb}y2kuxqNYXlB=h1s!`gzr$4tFUq znkq~a%i4t#ZSh3>(9+D1KFT)|l65KqS`(7=W(z0aZ+(hfc*`18JbO23gfNt^sQ-pS z7BSWjk33p2w}!1B5oYl0kw|ml5WaTn&5d7D8rf2si;7Z-anE|M;WdIoXq=D*vx;ck z<=uh%%cOp-Xmqo37yz8<($uvUpm{~+aosd!4t5#p|no|y+S{}Qo zoOGq9e`HKK6|ap`4OSoWz*S|oOgt8ZFC0X?$4CVdV8Vp??M7#H$?#C%8)oz*PB4n9FPH2ugx`~&BVlJ z&hK?5F7O^pY65C`HAN8dQh6+>nvp{OilVah-7h6Gn2N{5V6i6d%Ny$tmB_BLUXrXU zG|y}SlOD8cX?q%Q8)l*{JUzD$7H9$?Ov=LvV<62y)PcLMEgu5Zme<_Vm-eX_qX-`-2QKXu#|IE`q&Gk zjRSfFJ7i#Sax#k&claM&ixMy@26j%ekr2$IT)vwDQa< zN=?_k^4cnNpoPT>A%@?_d`psLIdp*}k(27X0tWwMdPC5+#QscXh7o^K$9=K1lOBIJ z^EfV!JH9*}x!G@4Ywn{+CuqSi*262TZ(^b)p-=j-SRjXuYJ$o#y4s7QWZZNCQN;<4 z`Sqs?xC?v9!A$wU_(xxJYD?yff7_0W`;+F9UsJSihpEl1m-5ztnLb#IkV;e_=?9rq>j` z;s#B#Ve~OuVDPG>6S;W6I#ka#Y?1RFCciHpJ0jh?n5s<{owFJE& zFFmZ6%OuH&NMtq1m02)0QxlGUN&12_$%TO$p|XfHtErf2EsWG3_IqOIH}+4~Crl61 zE=_@~y;?Gs4%}eX>fAlOLyrWo`){6p0N4%G{m^*d`{&1&_+vu$O$co(buoJb7)yZY NpsgH`v@>3R`~?_LV!RTDO71Xb`i^1X1ofh zNE1+6fJjlCK|}{fI-x6q1Okc)2noC=fO>Rva_{@x`IfNvb5{0Q>%aE??UIuZ;i#j% z&GIG6O8@{^zQfkq8316Q2?G|v!OI?6x<7bXOtsxb2LSm>afJmn9bF6nCf^WTJsF;M zKcH|Fk`C67;)~Y_Cs9Ff06<%YQ?a;UJVV_VA3z|RYmBffG}H-x<{BPIJ6$`f6+Vz) z8%e{vMB2OJB7c28klHw1eLZz!Qyo1d(%4vki@Lt9o*_b4520tEt!IidG(_p@s?WbP zES7*4n&#(^a<<++pALLyt`W#!P*Dg(SXh`&n1K$37J$$*H8n-(>Lc{^wLuSUdIXt) z4c8{q*UgE%)3L_WaWn#zL7*vf`0@=!$4bC&sEO= zWvGkN6YIU#fOvkY0q!3^ECc%=sX%=pI(|5mKZQoZGAsxrYyciXB?q7p9~vQ^?^hMd zibAB&z;59!4A6+rHAA9iR~l*una;qHarhn97GQ%8f#8QSGV=GuV+{c?T9%A*nD)1OHAcp~OnKc1g=EB4Rxi54GfC~z%+{ld=9 zfgT$1r?wB7=lngzb4p~+`kNw6^>hspdb;3iJ`{TU)6iXi9SXhuY3PSYH!^`?p+BGP zlV(Vi_~e~C7F@uG1iXb25@~=$BR*~ZG{TV(jwgCr6TtmT7q3cvq|toPr*}RZx$BFO zkUR5{bCU)6K%bq@Xz*u&>Ns0xI{=8>0040Z0O0Km zczp=~OkDsN^Z@|WMF3EuoWcCM9ROD1c35w74R0H2_jYU;FRKpW*)xOwaN4+ORe*B! z#oB9xf2c*Q42$}GV}%W6(+QGX0m^3+H&aIW7mH=I9jLT z;WEt}3!8i+iisBVBLWlX%CmTDm3ZTK zzYTnTx#^3wfagBg1enh5-)*T{0d(gx*xtT1n`Y>#{bOPFN{_ydql|UUh{|`m1msyb zG;u|b58nBS>k?AN$01;qy-Oi`}NO*zml4HjZKHIjua%1dJFPL@kqvLu<$MIAUjgVm*hSog(t4oz8x(_d)vC)M;2Da2{eW`c z38gK7ap%rQW-{X{aV3Y6fbP>vD=9k9qZ>yzf~kgH{1&x1z+zQ#60omPtmO=wD8<^k z1O6*S#Br7QsO6O%clOG}*=PW2cbr0utC9);;mgN2OryVo6?2+*0;5kBc3%tIJrX)` zRxz%XI1xLun|jv)#_Qv+2G9+#;_4pEspD}q|D0wou6+K|dt4Z~7*K5k+N(zqp1=z; zAx0^#rk?FQJsvb-UI8XLtPhNv3YRLz9TciR5y@M^Dy_bbi&!>ubxLz|pSb%eODoZb zW1SZGlvg@8h03uxrJTn%vvEv63B8 z+0ALak@QE`mM+X&1Ss|=$wh&0STRF(zj(;|o8N*>JWni(oa(!Cy{w6a5e(jo_sYGX z=DMX6+++Z-2moY&?w-Y4?d%eQf`VN4?#+4qn)aQ>DzG4pjDCO8zOQyDw~iTw!&xUJ ztST%pj7|AYTU#45S?=cMmYJF9toaYHoXK9HqBsGUarE}i9vlohckW!q&6_{)`TWe> zTn{U&s$~fYtVh$6dsxPX4OuBEoeQp(l`=IIknCENVQ6IAo)&GIjdo8kNS|xNFL)omo9SWhknT^+Nd*1H!lYsMzV7f)TZ* zX;IbS$cRg9Y!ZCoLPHaiZq??Fj%*%}+}PCgdvf@mW7Qq2V6$EIiSkj|>Xnm~<>Kvq z8FWUPn52KTaqrWkUm;#TI9-LJJ->D65FBY}H~^2?Cp__6bzNXr`PyNQ@%7G5RlY!= zd3wM@DPctfsbywkFF*&^!v+~$*u6Q zr@>0hmxafJNF?{*;QYy{sK&0YESEIjVtpisKksi&#BDRKF-En5NN==VE!y6xV*xv}Yc)|xY%Rh9I*;bw8I z+?oW3PcjCctX+d*JSZzuN+{A)CV~2Cw%6^MOt;LeESfC2dG(>g3k}ie?sANqo2Q!_ zRzXoQ^VTiLSa~?V-{(noVz!#fKRx4smhJ^IFtCUkN18FB7~@l+@}2cxc{n)i+329! zTywTs;dtR@#bBn*qR>FK5n|F^RgAOq%`<0w3yX@<3k$zHYMr$DsKq!lYC1TkBIm7$ zTu0&Foh21hftlvOc?gT7>E5v#GK)T%lOxY$G6(J-y@m?uO=n*W=pUWmYBo`vWrB&` z-ftC@luCmaMMswna=ABAuzqutjK0apovNzm&2lGp*JvYr*BSS|r^4Hz)^m4sjl&%suwe^&@+_HoF zmmJ(bI56O7V{^{W2n9jiI=* z(nOc4uT?~#$$)J9>IE_zzF!}C&i2h7uOy*YKWGSk#xv}Kbn>TOL)6#5C z+ZJk^4hjo-V!y4kv)GB!B@h~$j>?G~{l=uiabz@_Xl9CeMsi_CAUDxcovY9PnahthdWycq6;|&o#0s`2j>}P|# zlWcnQ6w-&C6y4Q}__1p3!K$@=&;7JEZsdp}sU~|esNs`iFvaU(P1*Hk+@_Lv7C+yy zMby$=87=1np5|?3Q7n}ftBkJtl!lQS@(h1+_K$apb5gF2gA1Z0mek3%*c>D!569@p zVbX8jbj0Hi(r9@3wkv2C|vlH%+BX@)MG1i*2Z-kqK1|_MoQ5 z$=?2?%IIl)tzjPVXO-^e`g(q3Wa(7owr%B0mb~sztzffvc64~Zjx-0$W-TqZUAr=( zF4YOzQ+yo3k{TcPy)3MCtf;UsGdtUj&qsnEVIgU7#biv5cNSQ=@Mytg>)e3U&CI-7 zTU*JFhc9T?kLKZdE2o?zOLbDy*tz}v{hKT;>%2Qg1_xa|Jkrot%wLBK(hCfepFWLy zSX&Ez(!LP1-+fJ6P+O~@xydQ{y0zerVDY`SwxGr)cXp+xdZ#DbopKYB&s?q&{zN`? zT*u4kz;FmAS{PC`Iq{4a9mei}cUV;7JosTlEh%fvLW}7UoM)GYIjrC*!SKTeEmu#R z(B`#wS$rL6qii%$`fRc4Mn+bT?D^y<}b!O!c>j(gBmMI=rEiDN`+&D-TwM0D45 zO>s=WcUiwBnR7+NFEA{-a{k3VgD7*7XqbPiC!W2iGRK=;5ZtW8s!l+7U!8cmf!r#1 ze!)GrDYdbFgw0WJyAnH@FJi$>5p`L2(7Ac}`9EF0ocid|4|sq7peeyJQrDG~$CqN$ z!8*{XTHxsFD(B|3%9YF`_r2hSCaPcxzkinHUII%Bjvk&ShIi}8+@kl}4}-_maI4t` z9jE@ejFw(yyDh!UMdj=Tl`)jA=|`;Px4f4 z6Fe3d^40>OueKC1j{1rPRnmJJT$iWaDCG>xqK#TWy~D3V?JD7IIfF_{N*Tq)4@5a} zW!?j0eKq~HbQ?hNpDIJ^YABKmSK_aL9_d;ZAoRF0+Xm{ zArJ?&_xzUa#R}p!Ws`lb?kqQ`8nPOuYk3T|KRn0kh|vN<2Ppl*qQk7?2Lwhb%gZn8 zdupDDX0)6SSn;|>L5o5Ab&2tW;?-6zDKWpfdIhkk(nGHM=K!P5)6pG2VD4XvSVU%V z^1M@7R8P$tBgSLiu&Gk>&fi7DuLMFx)hP>l_Be6A8z)XI!~6LK*58P&ST|LA+dOyq z^C3Ff>x$~o&#;T-m>YTdXqr%SoSF(UiWvt9r@CzgW$cg`r&EI7% z0%jKfjq>lhtv>%WANS$G{%OBj_1$F0+lP^4_|fP S{}ljVJHE5G&iU47|NjBVa!e=y diff --git a/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png b/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png deleted file mode 100644 index fd56d1bb0d67abaac3273f095eca6568630f53a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17840 zcmeI3c{tSF-^aghZflkbEmC8tB(qsYGmWu~H6)CX7Gvf+V`9vhnX*)(vQ>AIiiotx zuA-DsNK``Fv!p^&H$A0p-4&kiP|>%Vr|Wut&p*#Kb6vB1&gZ;8=bYF1oX>n`uIn4W zV!557{A_su02CeUt=*t^72#7>8hV{KI7)@y4LyEmRm+C9lhc=3PS9;t%Uc03RZV z#KqcGGM4~}&^rpUK$UY^6=qKCsPapzL#rhscSuwT5|=p2Mydi9;d`u30v5Isk?AQ5 z+<{Cfz_)?s*9ELV0=^5kKEDG*rhhoJNdoZMucaoDnFt`JgK^e?|5Bi!dF4(UzzYMY zG8}91z(XW}aqwi=1E97OUc@e^65`P&HwPW*J5qD?b^$2>_XiYS3y2 zheMl`ikg~mdrFnoAzxmW9@X~q>l*24&gWVHz*9j)%ZLHGWOn3I=}7j-vH1g1{%aL7 zHw^7!6f0Yt12X$sJqNi$Ha181mOXmZ)7|}WS*?{1^@it`5oXQ0D$n7-eN^9rM%HScKGI{1}&>8p0RP7B^+ow|F_ zFiSh$YTu%(^KXyRpLH61k|cGS0H@cJBsL`?bJox#|8ZQX;w7khHUt1~%Q@9|^<*U@ z{kK1D4jFxIK5UmcABbc)>DJa*saVO=Bj@mZ7Zq%?(u-+4t*P&ezH6arT;=K?lf+d*)p%S`GUFs3U_Nm*W#olezijg#=(>7}zrcE+LT4_ejsQqy+nBCf}&x@tQnn%HCAc2W=?_L^_a zcz@tySKD4pTzU;K-1a%9!VbGXs@T=+?v!)nvK-UdJ8X|B+@cGxsR`APi>Vmm6P1zTC-3)DaY~bf{RoCt)1y-h>i8K zH_*91EnzxZWm6ov)>L;|JlSwz+1@`K&YYm!o_5>zc95G+pFwV#vHfhFr0cEpfMOZ^ zegnkfYth~5-B-Gex;47B-ulR=`&k5^_~8Cb&+W$gWwUxzdW?Id!4yMFkK?Is9XUrS zQ%w?9Srr~Fbvxx6n={>bLn^*;ySjs8R^hP&cV_#~@E>BGdLg(twd26t<;k}^Z#VSW zy-0o``7UINVvO4M`Z%WEthAXjGnunOW}ZrMIyvjku37aIj4Ae2O79`%LmUq;{ZjqS zYKb@G4=g*d;DClcnv$D$GVgJog2$jo10^AMt^1ZDTMr}mu3Wjh2lGAh(pS84*KlX% zF3pL}W9D!u<|iV&hvTKauQ*+CA)j!~JhQH=q7I=zn^h8OpcSB)AG0CKq;|oX#z&hs z>X)YsYnJaa%ga5ACmSs@@+@&1+|MwV=}HOya9FThu2(NRc`#z?rri5el#*rrvW2S`+A$NF{!H(6f8^egEuXFK zY({urgvtxZ(l}af9dbD+dmts_(%Q%jCrTV4xne=iq8^|oKi!d7)>^gSc@deTg zv=%rzzjPi*b#pE|x#;9lr=?EyjW-*QHQqmDl4gc|VAz}1oAw~B^Stk>&{YPdIi(js zhvM#4C%p$sD}tg|;k~oGJXWnKu`Nt5oPWQ(usnNecG>cz<@p)+nO9D~DZO5rdw$mG zo`=$HMWyW0EmWr84CeW(MOOxrDwDQc-1673nT%rWBc*)JRhkj}vpiM8O2XsRro#i~ zTdux4*oS6%HLEl~H0mmy-ms{amF}K)$BsFJS;pT!7`H3laa#i_nS@HysOz{^*}Y8g zK6uU3@Z0ax(@N56`g7V&4d4b?1F`K#ZW!i@Cy)1DJr$f(RF~ zOBC~5uMV1qPV_8%aQb{!NZt_j^$gNKB;JuOQWw$mvEgIybvI3`&R;v<;BtkNu`ark zyj5qEJ{msS0%S+dmtac9M_ESs{PF2S_-3ukd&~)K;6KHW`Ym^7mRYJB=m z<$vw(y@gssy(vwJO)RD86%jA)-;$v|r|!BEF=b(NY_w;L`5tbZ*X$N-vPnowJDJ~U z{n7fM_2V=q)&+kGxy(eLl!sbRY&E@Te9^oP#qhp)&nw-_A<%IS9;IJ|3ktl{`MG~E z_F4Kfg|1CAQqb4daKnx^)x3+&R?kIEGawwaaEe>LWdDCzs_5sa@1Fm5ddU1e@?kZa zHB4=E3$7*ZA$hg_+~sfW^_|1_{he505~h3AD9fOyY{$afy%kQ1P91544E5BF2)3aa zp%S}&U*g_it2`~|q*CTf=5xlzh5|6Uc;sr(uJh=*2V|}Xl5uV^P>2?z7GdKvDXwX zX9xG!OWu|omeElveNcAyp5|>cid(|{#jos?>gQb=Nq-%JRKzKI{B^kQnGV-Fth;YW zu5)OvBB6ET?o9BEpF?X?s>s8^%P+p`=#I|aU|)EOMUs_^3CFo=W{eyg zX(*bZj*j?n@705*mXwyG$#0XBF0(gh4Zo~k+;Lm2o~K;+tb7uIE#u#O8db6?%Rt14CKAkO@8GvawVc-ytHDe*`iQqzX7Z z3WpO&8qczc-%rrbCt+40^gLNXbWR9=5fKfSOzihWG|-wV07;M%hs2m5u{a8pkJu#y z3?7Lwg|c!|knx_d7|u}c)2RaL??m~oFFX#1&SHf9R+NdJ-^XxvCO8D~1=JuK=wMBP z){bJa=mad*1k1o+@kqKcXoNIo7=uVWXh=mG`_ZTvI+hN(>0^uhUj9R9YYuILFp;3p z;|HJ4p+Vulr3V3zH^DQEa3B)vM~6USK^zkAw*-fznl8cMjj#+;Jj3+sK$C*~Fpvw6 z1=S^L;G{mnwa}r#@P4+!7GK1O%xd?duRf3G>5H z_AEY>O<|L=49c~!%Hs|Of8YAm5y%>=AY3Ys4+;;anfBL{`K{!9t0+Rv*a0U{X~Nn= zq6yO%gm8b?Ix($p$}ck3kK6fs2*%@2lK*;)5PvX8RQivH8te7zAbbu(5JKgFmP{x^ ze&=M4NBv#~4^Ko3Yjq&&|6n8d)Q$hUZTP)Y_5WfUCbF33PYq&%bQ1b&0)K7zy`3B1 z&+kvx*VFprNhH!~1O|u4rV23?p-V^Tsulh1 zvh{}|@~zhXCqGQA=sy`17E3$`42Wn`j7u~hm{*Jo21K+e#wD5$%qzwP10vcK;}XpW z<`v_D0TFGAaf#*w^NMl7fQUB5xJ2`TdBwP3Kt!8jT%!5FykcB1Afin%F425oUNJ5h z5YeU>muNmPuNW5$h-g!cOEe#tSBwh=M6@Z!C7KV+E5-!_BH9$=63qwZ72|>d5p9Zb ziRJ_IigCe!h&IKzMDu}p#kgQVM4MtDf=(Cpou0U&%n07PyFfPY7!_dWpFfB}G)zR=yJDF85ovv1v1Tc~fk zgS90kw6)+)qg;)JYVDgNQ>Aoz zUt!v?bP+=@SgtkJ`=yMIYEH{$*T3f19l7~xUR`Nv^&q{a`tyo680LldvKO>8{C36< z=;rKTo0@qjaoOk-k{;T7^sBMjPxkw&O+6h&e6~BxDN%iEA@3bCeEyX=vA50|ZKNJN dKd(~;nA;dtoW63W95hkD!DhL2k(KYZ{|2IhjL`r9 diff --git a/src/main/resources/assets/bloodmagicguide/textures/gui/soulforge.png b/src/main/resources/assets/bloodmagicguide/textures/gui/soulforge.png deleted file mode 100644 index 7ee6acd20f42d4c7b65fa13d59cdbc755586359d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3452 zcmd^>`9IX{8pppg7}3F0q_Xv##u5!uQrX)ywvd=J)?)085LpL3>cLZr2Svt`NJ6p< zF=N`OY-JmaF-c68naP-DjMwp&QIsQUia&|UY{TC_jP?<_YYULi?f}A{62XA z02C1C&$s~qXsZMP+aO!XJLXByR)Sn{usZ`tenkbLwqQ$t1 zQmJs;9&EAycllHLwyCy%aeqqPTZM%`GP}gm%07;YQ2%k$9Uzl_s;dQ!wrw*REJNOj$Qq} z7c_qNY9aPpOV6^Xh5k)I>{bp7Q_fn(4eEOpUmy&WC}-{4li&9c(#n{wP(Jsm@qhimd099Mz|W`6SYd zH#dZdd}8^Kk&=~RGC6m6lyw(dpvdJvc$GSXQ()#uz#A^Jb(lamMy6JRd+9iD~%KEgv z^)VQ5EOvoq9b2ViWmKpoO@g!v4+NY@WiJ~&5$*?$h2ybyUZXd&fI=;`>5Z|mp)E!N z4gVCy7YslA^d4#G!KdFM!Idm8EXZ1>-wus5eUf^PqMRI? zjvss($;uUf&KX9lsd-*n6q{=eGOhP4jQYx_@OVkE~Pxz(($OSgVI)v`{-!ouS&jDY1v4EiXy?sLc}W8#Q^C7F*n2{7N(a+YOn_CUg( z^?NQ9o??wMwYNcy%!z9?9T z>k%u{T->dJFi};-`b%=SVu6&Bm8!w~n;zkzm_iAzT$oW1^}KFOc-EFIRj5^Z66kgk zkJqvTE-HaMRRJuf>ur>b*UD{u1#90kn*ec#ThzPo}m` zHWP&*r|Smz6opKie0M*Lq8V}HYi_^z9|`KI86TCv{@19&kk4K`iSZ%HrhT3RGwpcK zqZd^S@RJzeICi?lE}t`BS&4KwgeWU3TV6ftDR}VU@bBc1X zHQ%hh!G_ZNal=NF%o(W#E!n$ifCYClpt%`e%1(f<3s2|ZsYy00oE01q78-gF#-Jvb z!InrF6c~aGE%)tP=mw7=0cH8M!!K)Uu55LuNqXF0JU$y`SU{c#LUEW;E#B>T z-bG4&DcedSJfbGONH`tue3{2|_L{!rb;41jw9GX3c2aL&fC`O4OA4dSKFKXdyZOjl z96fn}Mt8_*LMr)-krvxt%fN**>%LRFv5k}L070i_790<`14)^GkLlLZoZFt|1O*zu zb{2`(U1MXMW)+bRmQsjsqQu-~e zG-N*KI-WnTs*B+_!s@0piZLejlAL#)+4T|at_=+h`PECIqihT&9Il`Q3k|tG*3MZx zL|9ye8(P_;2k3W>b^L^wM=II0%l>E;&8tUY{nGg8v{4dD%HKBEZ%!f6dGm16x7b%gNf#c zScv?zYy20mC9>I!ano0HYXYYD=zg?G5SQ44b;)nNR(~+q-(T-oTr`~!(RK?Y3xU88 zWFIp67F34v;zFO7@GVq3&Kal3D{s`AgsA05|#nwbwDHZH%*q#7mA80B7d=K zQ+r3DuP2J{DUKk>G&OCc2%nM0nM&y@(xg-#RW*DGgXQ^LteinohGx5P8R1u{hX~NHLR(X~7JRKbbaE6@&+fLnJlzdDae zH0LJHrU@d`)=6$4m(W2ho4@tVw6sy;=+By`*j1{9zQq<|zfi@Bk+hLrfCm)#kW++* zN3$$>CCzxBIr4pE$x0MH$`qb_EF2|XT-?aA(b3fnQ0YP*nxs^fnHw7jV&cm(R_BTVn-6#9C(IFiz0u-twvLAED@Z0)mGcL>A|GTd> z8o$!cYP7pM;|B(iwgBu##T5s?xix!u%Ht_vR`7Piraoxn^I)+5J>dA2zE4qe!?%N- z`%vy?E3BZOO?U&QbD?Ha-X#~_P-i$~V(M`B-u2*}p6sjiZO5Yw{R0DG6H3;y7Gsa4AJ<7iVa% Date: Sat, 24 Oct 2020 09:00:46 -0400 Subject: [PATCH 343/493] Readded the fancier README Readded the fancier README file so that TehNut wouldn't laugh at my ineptitude. --- README.md | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 53 ----------------------- 2 files changed, 120 insertions(+), 53 deletions(-) create mode 100644 README.md delete mode 100644 README.txt diff --git a/README.md b/README.md new file mode 100644 index 00000000..c945030e --- /dev/null +++ b/README.md @@ -0,0 +1,120 @@ +# Blood Magic: Alchemical Wizardry [![](http://cf.way2muchnoise.eu/full_blood-magic_downloads.svg)](https://minecraft.curseforge.com/projects/blood-magic) [![Discord](https://img.shields.io/discord/259683256348311552.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/VtNrGrs) + +### Gruesome? Probably. Worth it? Definitely! +### [Downloads](http://minecraft.curseforge.com/projects/blood-magic/files) + +## Information + +Have you ever picked up a magic mod for Minecraft, and thought that it was too tame? Was there not enough danger involved when creating your next high-tech gadget? Bored with all of those peaceful animals just staring at you without a care in the world? Well then, I am glad you came here! + +Blood Magic is an arcane art that is practiced by mages who attempt to gather a vast amount of power through utilizing a forbidden material: blood. Even though it does grant a huge amount of power, every single action that is performed with this volatile magic can prove deadly. You have been warned. + +## Links +* Twitter: [@WayofTime](https://twitter.com/WayofTime) +* Wiki: Found at [FTBWiki](http://ftbwiki.org/Blood_Magic) +* [Minecraft Forum Thread](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1290532-bm) +* [Curseforge](http://minecraft.curseforge.com/projects/blood-magic) +* [Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=J7SNY7L82PQ82) +* [Patreon](https://www.patreon.com/BloodMagic) + +## Development Setup + +1. Fork this project to your own Github repository and clone it to your desktop. +2. Navigate to the directory you cloned to. Follow the [Forge Documentation](http://mcforge.readthedocs.io/en/latest/gettingstarted/#from-zero-to-modding) (start at step 4) to setup your workspace. If you use IDEA, follow [this set](http://mcforge.readthedocs.io/en/latest/gettingstarted/#terminal-free-intellij-idea-configuration) of steps. + +#### IntelliJ IDEA extra steps + +1. Navigate to `File > Settings > Plugins > Browse repositories...`. Search for Lombok and install the plugin. +2. Navigate to `File > Settings > Build, Execution, Deployment > Compiler > Annotation Processors`. Check `Enable annotation processing`. + +[Setup video](https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be) by LexManos. For more information, refer to the [Forge Forums](http://www.minecraftforge.net/forum/index.php/topic,14048.0.html). + + +## Developing Addons + +Add to your build.gradle: + + repositories { + maven { + url "http://tehnut.info/maven/" + } + } + + dependencies { + deobfCompile "com.wayoftime.bloodmagic:BloodMagic:" + } + +`` can be found on CurseForge (or via the Maven itself), check the file name of the version you want. + +## Custom Builds + +**Custom builds are *unsupported*. If you have an issue while using an unofficial build, it is not guaranteed that you will get support.** + +#### How to make a custom build: + +1. Clone directly from this repository to your desktop. +2. Navigate to the directory you cloned to. Open a command window there and run `gradlew build` +3. Once it completes, your new build will be found at `../build/libs/BloodMagic-*.jar`. You can ignore the `deobf`, `sources`, and `javadoc` jars. + +## License + +![CCA4.0](https://licensebuttons.net/l/by/4.0/88x31.png) + +Blood Magic: AlchemicalWizardry by WayofTime is licensed under a [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/). + +## Installation Instructions + +This mod requires "Minecraft Forge" in order to operate. It is incredibly easy to download and set up, so might as well get to it! + +1. Download [Forge](http://files.minecraftforge.net/). Usually "Recommended" is best - you want the "universal", not the source. Forge also has an "install" option now, so all you need to do is launch that program and it will make a lovely Forge profile. If you haven't, look up how to use the installer and the new 1.6.x launcher if you are confused! + +2. Download the latest version of BloodMagic from [Curseforge](http://minecraft.curseforge.com/mc-mods/224791-blood-magic). + +3. Place the mod in the **mods** folder of your .minecraft. If you are unsure of where that is located, it is here: `../Users/you/AppData/roaming/.minecraft`. + +## FAQ + +**Q**: My weak blood orb doesn't show my current LP! Fix it please. + +**A**: The mechanic for viewing the player's essence has changed due to some issues with mechanics. You now need a Divination Sigil to view a player's essence. It does other things, too, so it is worth it! + +**Q**: Why am I dying so much? + +**A**: It might be a good idea to make sure that you have enough essence to do a task. If you don't have enough essence for, say, an imperfect ritual, it will take it out of your health. If your health reaches 0... Well, you don't have to be a genius to see what would happen. + +**Q**: Waffles? + +**A**: Waffles! + +**Q**: Where is x? When I watched spotlight "w," it had an item called x. Don't you need x to make y, before you can create z? + +**A**: It might be wise to look at an updated spotlight, or check the changelogs. I'm not evil, so I do document everything that I can. There was most likely some issues with balance with the item, so it may have been removed for those reasons. Or you just grabbed the item from NEI without seeing it was a test item, in which case: shame on you! + +**Q**: Isn't that armour ... + +**A**: Yes, the armour texture is from the mod EE2. Pahimar and I are good friends, and I decided to use it for the armour and tools. He has given me his express permission for it, so need not worry! +[Proof](https://twitter.com/Pahimar/status/453590600689139712). + +**Q**: My game is crashing with the latest TC4! + +**A**: To help stop this, remove the TC4 API from my Blood Magic zip file (if it is there). It should solve things. + +**Q**: But, my Thaumcraft aspects are messed up! + +**A**: Once again, remove the TC4 API from the Blood Magic zip file to solve this. Azanor changed some aspect combinations. + +**Q**: When will 1.7.2 be released? + +**A**: It's out! Go get it! + +**Q**: Way, I've just had an amazing idea! Why not add an in-game book just like the Thaumonomicon? + +**A**: This has been suggested several times. It I being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. + +**Q**: Why do I not have a Sacrificial Orb? It's only showing up as a knife! + +**A**: This is a config option. The person you saw with an orb had a config that changed the knife to an orb. The orb and knife function exactly the same way, but you can change it in the configs by looking for the "Idontlikefun" option. + +**Q**: When I respawn, I appear to only come back with 3 hearts. What's happening? + +**A**: This is due to another config option in the "WhimpySettings," which is due to my attempt to combat Zerg Rushing. You can disable this if you really want to, but it shouldn't hurt unduly. diff --git a/README.txt b/README.txt deleted file mode 100644 index 6904b377..00000000 --- a/README.txt +++ /dev/null @@ -1,53 +0,0 @@ -------------------------------------------- -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "unrenamed" MCP source code (aka -srgnames) - this means that you will not be able to read them directly against -normal code. - -Source pack installation information: - -Standalone source installation -============================== - -See the Forge Documentation online for more detailed instructions: -http://mcforge.readthedocs.io/en/latest/gettingstarted/ - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run "gradlew eclipse" to generate the project. -(Current Issue) -4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment -5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again. - -Should it still not work, -Refer to #ForgeGradle on EsperNet for more information about the gradle environment. -or the Forge Project Discord discord.gg/UvedJ9m - -Forge source installation -========================= -MinecraftForge ships with this code and installs it as part of the forge -installation process, no further action is required on your part. - -LexManos' Install Video -======================= -https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be - -For more details update more often refer to the Forge Forums: -http://www.minecraftforge.net/forum/index.php/topic,14048.0.html From 1f0dcb608a4fc3daeba604e22e348147df951163 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 24 Oct 2020 14:50:25 -0400 Subject: [PATCH 344/493] Initial Work on Rituals Added the framework for Rituals, including the automatic registration of rituals using the annotation. This includes: - The Master Ritual Stone - The regular Ritual Stones (all 7 types) - The Ritual Registration system - The activation crystal items. - Reintroduction of the Demon Will Aura (changed saved Dimension ID from Integer to ResourceLocation) Localization needs to be completed, as well as the implementation of all the rituals. --- src/generated/resources/.cache/cache | 28 + .../blockstates/airritualstone.json | 7 + .../blockstates/duskritualstone.json | 7 + .../blockstates/earthritualstone.json | 7 + .../blockstates/fireritualstone.json | 7 + .../blockstates/lightritualstone.json | 7 + .../bloodmagic/blockstates/ritualstone.json | 7 + .../blockstates/waterritualstone.json | 7 + .../models/block/airritualstone.json | 6 + .../models/block/duskritualstone.json | 6 + .../models/block/earthritualstone.json | 6 + .../models/block/fireritualstone.json | 6 + .../models/block/lightritualstone.json | 6 + .../bloodmagic/models/block/ritualstone.json | 6 + .../models/block/waterritualstone.json | 6 + .../models/item/airritualstone.json | 3 + .../models/item/duskritualstone.json | 3 + .../models/item/earthritualstone.json | 3 + .../models/item/fireritualstone.json | 3 + .../models/item/lightritualstone.json | 3 + .../bloodmagic/models/item/ritualstone.json | 3 + .../models/item/waterritualstone.json | 3 + .../loot_tables/blocks/airritualstone.json | 19 + .../loot_tables/blocks/duskritualstone.json | 19 + .../loot_tables/blocks/earthritualstone.json | 19 + .../loot_tables/blocks/fireritualstone.json | 19 + .../loot_tables/blocks/lightritualstone.json | 19 + .../loot_tables/blocks/ritualstone.json | 19 + .../loot_tables/blocks/waterritualstone.json | 19 + .../java/WayofTime/bloodmagic/BloodMagic.java | 7 +- .../block/enums/EnumRitualController.java | 23 + .../common/block/BlockMasterRitualStone.java | 130 ++++ .../common/block/BlockRitualStone.java | 89 +++ .../common/block/BloodMagicBlocks.java | 11 + .../common/data/GeneratorBlockStates.java | 7 + .../common/data/GeneratorItemModels.java | 8 + .../common/data/GeneratorLootTable.java | 34 +- .../common/item/BloodMagicItems.java | 11 + .../common/item/ItemActivationCrystal.java | 72 ++ .../wayoftime/bloodmagic/demonaura/PosXY.java | 76 ++ .../bloodmagic/demonaura/WillChunk.java | 72 ++ .../bloodmagic/demonaura/WillWorld.java | 49 ++ .../demonaura/WorldDemonWillHandler.java | 218 ++++++ .../bloodmagic/event/RitualEvent.java | 151 ++++ .../bloodmagic/ritual/AreaDescriptor.java | 654 ++++++++++++++++++ .../bloodmagic/ritual/CapabilityRuneType.java | 58 ++ .../ritual/EnumReaderBoundaries.java | 22 + .../bloodmagic/ritual/EnumRuneType.java | 54 ++ .../bloodmagic/ritual/IMasterRitualStone.java | 81 +++ .../bloodmagic/ritual/IRitualStone.java | 20 + .../wayoftime/bloodmagic/ritual/Ritual.java | 427 ++++++++++++ .../bloodmagic/ritual/RitualComponent.java | 70 ++ .../bloodmagic/ritual/RitualManager.java | 177 +++++ .../bloodmagic/ritual/RitualRegister.java | 58 ++ .../bloodmagic/ritual/RitualRenderer.java | 14 + .../imperfect/IImperfectRitualStone.java | 20 + .../ritual/imperfect/ImperfectRitual.java | 108 +++ .../bloodmagic/ritual/types/RitualWater.java | 85 +++ .../tile/TileMasterRitualStone.java | 566 +++++++++++++++ .../bloodmagic/tile/base/TileTicking.java | 71 ++ .../bloodmagic/util/helper/RitualHelper.java | 253 +++++++ 61 files changed, 3943 insertions(+), 26 deletions(-) create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/airritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/ritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/airritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/ritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json create mode 100644 src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java create mode 100644 src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java create mode 100644 src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java create mode 100644 src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java create mode 100644 src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java create mode 100644 src/main/java/wayoftime/bloodmagic/event/RitualEvent.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/Ritual.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java create mode 100644 src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java create mode 100644 src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java create mode 100644 src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 3d4fa05e..79d86fc3 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,27 +1,42 @@ cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerationrune.json +43be0406da1c9f7cf734427bea235a65cda073d2 assets/bloodmagic/blockstates/airritualstone.json 4a60c54def00d68368ed0a0d4783979aa63d5f60 assets/bloodmagic/blockstates/altarcapacityrune.json 950fff9f06033741091aa8a66a62857da673efb9 assets/bloodmagic/blockstates/bettercapacityrune.json 8a5edb859a6f4d0adfbe2f608bab6b8c8addf01a assets/bloodmagic/blockstates/blankrune.json 904d9baa649250571bce5f965cf48fbec69c2c1a assets/bloodmagic/blockstates/bloodlight.json 631b579c38652efbcd9e5771d09ad6e476f3ba00 assets/bloodmagic/blockstates/chargingrune.json 6bd58d1d02a40416cec29409dee7ef80038b26d5 assets/bloodmagic/blockstates/dislocationrune.json +ba1cd8a9475212843e3b26232c8a9943fa0d2d20 assets/bloodmagic/blockstates/duskritualstone.json +bb3db171734f511fc0c259d86e869b49aa1d0c77 assets/bloodmagic/blockstates/earthritualstone.json +e780d6d9e891082dc6ce83fde1697ce36281a02a assets/bloodmagic/blockstates/fireritualstone.json +002795212cc7bf2cad2a91f873d85e2204c6367d assets/bloodmagic/blockstates/lightritualstone.json 372ecd737f7082a4c2c70e46745f893b1179f885 assets/bloodmagic/blockstates/orbcapacityrune.json +90daa355e528ab8a6582f796951201882f3c56da assets/bloodmagic/blockstates/ritualstone.json 285618c1a8ec36e36d479f577190579ae7616529 assets/bloodmagic/blockstates/sacrificerune.json b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json +e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json f7a92ca94cbd68344d89b92dc6c26c15cd1b85b5 assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json +bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json 3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json 7cd62092c6fb3109e016d42090cf89bfa3ab7fca assets/bloodmagic/models/block/bettercapacityrune.json 1fe0f89895addb7abcacf6ce7e39b6ddc87b0d85 assets/bloodmagic/models/block/blankrune.json 3c83e090a1cff00e2bb2c7eb475785954b6eb980 assets/bloodmagic/models/block/bloodlight.json 320827ad2feaa51a90ebb7064a70bdc6d3765203 assets/bloodmagic/models/block/chargingrune.json 6adbeedc17f649ef47419845a6da0d50cfc76742 assets/bloodmagic/models/block/dislocationrune.json +81313327125e6e7396df0408595228bf0f63e1c9 assets/bloodmagic/models/block/duskritualstone.json +c30064f4aa09c42d23e94d118ae5b148eadb3a6c assets/bloodmagic/models/block/earthritualstone.json +4ff1cab1014cd8f655e5f032ecf60dd371f421c3 assets/bloodmagic/models/block/fireritualstone.json +2e1a81c758bfeec2aee807b48239f23241302268 assets/bloodmagic/models/block/lightritualstone.json c3a813b735cd229f8597e41d04465926b2e65fe1 assets/bloodmagic/models/block/orbcapacityrune.json +9b2bf2a44b788cbaecbe63a3e085e8de76672e1b assets/bloodmagic/models/block/ritualstone.json a8a1d06fcc2f8395530c72d2846133fff37d5537 assets/bloodmagic/models/block/sacrificerune.json 791c9f2e27215ff0a45eed7efe385276bfc09aed assets/bloodmagic/models/block/selfsacrificerune.json 65fe5e01ed2660e45a5c329ff2389a87e4d791ec assets/bloodmagic/models/block/speedrune.json +6041f2e47f5437d90a58586e42d18dadc42df439 assets/bloodmagic/models/block/waterritualstone.json 9462d62d9bc9408359d30728de8651dc104aacf1 assets/bloodmagic/models/item/accelerationrune.json +fe8e3deb3ad0107ca3ebd70694c1fc55a987d912 assets/bloodmagic/models/item/airritualstone.json 17cbe9142ef3950ea1b6be11694b849f55e93f13 assets/bloodmagic/models/item/airsigil.json f150f178edf7d6d250bcfd84af1c28a21cff09c6 assets/bloodmagic/models/item/altarcapacityrune.json 866b8cdd3da56e2e82dbd5f16ab5117b5a503749 assets/bloodmagic/models/item/apprenticebloodorb.json @@ -40,11 +55,15 @@ f404148f9df3a61da3c18175885ffa56b2a85a6a assets/bloodmagic/models/item/daggerofs 9671199681493a396e07d7bcab20137c22d981d5 assets/bloodmagic/models/item/demonslate.json 7af07ab578bbd20e2f834b26d9cafb5fe23bc7d4 assets/bloodmagic/models/item/dislocationrune.json f4531e22aa1db1cff324db5ccb344d3b9fa85c8d assets/bloodmagic/models/item/divinationsigil.json +10aceefca3ad3f0da773cb317c4effc6c06051ea assets/bloodmagic/models/item/duskritualstone.json +4d56efd7fdbf430f49903ce201577047687c3804 assets/bloodmagic/models/item/earthritualstone.json 4c39378f6c14dc243a7d52564e5a21df94683415 assets/bloodmagic/models/item/etherealslate.json +c36bde4f98c0aeb3bf0f369ad3bc067e5f0dc916 assets/bloodmagic/models/item/fireritualstone.json 44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json 109b5485c25d978af55b46682d5bfa7008909458 assets/bloodmagic/models/item/infusedslate.json 588c5208e3f4ef941cd8375aeceeed44484d85d3 assets/bloodmagic/models/item/lavasigil.json +5a76914a87fc9b99079bb6afed1d4cfe3e4a532e assets/bloodmagic/models/item/lightritualstone.json 15d8178b626da912334774142d40d1012fb21fa0 assets/bloodmagic/models/item/magicianbloodorb.json 0a3566d3c86403f24c22977dd32ffaec727a9ad3 assets/bloodmagic/models/item/masterbloodorb.json 7596826c5b40c2809eb0a42eb5f5f2089290e3e5 assets/bloodmagic/models/item/miningsigil.json @@ -58,6 +77,7 @@ baafdb5915c5fbc99b84a54670ed64a6f26cb0fe assets/bloodmagic/models/item/reagentma 95b2925e96a7df71d72568e0ed7b03290293cbe7 assets/bloodmagic/models/item/reagentvoid.json fd1447d943ddc4540a51a72dcbb245d77d45da71 assets/bloodmagic/models/item/reagentwater.json 50bf796adbed412488df48ed9250fc9b0ecd851f assets/bloodmagic/models/item/reinforcedslate.json +2722891c9c40b124d85bf9ff8eb885e175f5e6ff assets/bloodmagic/models/item/ritualstone.json db73abb3bcb1731b6fc389e3577910b6aab87b10 assets/bloodmagic/models/item/sacrificerune.json 9403d6195d4d38d5876c2a42f4edfb9bdcd05210 assets/bloodmagic/models/item/sacrificialdagger.json cc71421e98ee7ee047a4cfbb6cb69529c2b02d4e assets/bloodmagic/models/item/selfsacrificerune.json @@ -102,6 +122,7 @@ ec6f6bf7f520182b2044f3cc5a10f1d4c7a8d7ab assets/bloodmagic/models/item/variants/ 2029220112f89a3f4d432ab4749dff6143846659 assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json 0f5a3e1e5993a03ccda156eed855b71fbd0be0a2 assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json 836b5a7f19915af809795a72983a23f0d5f9c5b2 assets/bloodmagic/models/item/voidsigil.json +a31019db55828cb937a071ac2f74b125a2d0c955 assets/bloodmagic/models/item/waterritualstone.json 7426fed5f833ce3d08602f727f1467dd3e107991 assets/bloodmagic/models/item/watersigil.json f72efc172699d43405019add97f455bd6b7f452b assets/bloodmagic/models/item/weakbloodorb.json 828c0f89e747d48d37c6a86030a8ec59ca5c29cb data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json @@ -116,6 +137,7 @@ e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bl 2d29dd0c24c4c11d7438cdeeb26b9357d4359e2c data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json 7a7f9f995d2414289d07c0a145647c8e735a6b78 data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json 639ebb2ccabb2eaece59be96c2e6f28c31f4d2f4 data/bloodmagic/loot_tables/blocks/accelerationrune.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/airritualstone.json 443550be9eaf1021b11fd2bbe6afcfe2cee6f7ad data/bloodmagic/loot_tables/blocks/alchemyarray.json 17d8dcc62320d5d2eeb781e925963d9b9d5eec54 data/bloodmagic/loot_tables/blocks/altar.json 05bb6268d7e884c962061a632e162d5baf73271e data/bloodmagic/loot_tables/blocks/altarcapacityrune.json @@ -124,11 +146,17 @@ e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bl f1a8e3131d85077665563372cad868534a72fb31 data/bloodmagic/loot_tables/blocks/bloodlight.json 779b809a2a51e6dab46f9e6799249f2f14653ebb data/bloodmagic/loot_tables/blocks/chargingrune.json a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/dislocationrune.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/duskritualstone.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/earthritualstone.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/fireritualstone.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/lightritualstone.json 95442c1bb740fab2eb8ee051f7184813f6023afa data/bloodmagic/loot_tables/blocks/orbcapacityrune.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/ritualstone.json e0239eff7762a414a4e4faa0158d844dffb8c1f6 data/bloodmagic/loot_tables/blocks/sacrificerune.json 9b697e37046b6238b3a19eae9113b88010ccff32 data/bloodmagic/loot_tables/blocks/selfsacrificerune.json f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soulforge.json 015e07226fd90935f7ec663f4bcf3873a57a82d1 data/bloodmagic/loot_tables/blocks/speedrune.json +26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/waterritualstone.json f41b0e9dfab608c42a85c3c5c5bbc050b03f02a1 data/bloodmagic/recipes/altar/apprenticebloodorb.json 2a67e37497a571b5ee944375d315fddccea87697 data/bloodmagic/recipes/altar/daggerofsacrifice.json c5a4a256a7437f2e13c574a6f0c4d75fc2e718cb data/bloodmagic/recipes/altar/demonicslate.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json new file mode 100644 index 00000000..a64ce156 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/airritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json new file mode 100644 index 00000000..474324b4 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/duskritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json new file mode 100644 index 00000000..75d2c5eb --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/earthritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json new file mode 100644 index 00000000..33e7f1b2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/fireritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json new file mode 100644 index 00000000..d198280b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/lightritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json new file mode 100644 index 00000000..8f09bcba --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/ritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json new file mode 100644 index 00000000..35b1d3aa --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/waterritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/airritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/airritualstone.json new file mode 100644 index 00000000..428b9552 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/airritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/airritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json new file mode 100644 index 00000000..ecfcfa10 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/duskritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json new file mode 100644 index 00000000..e0949faa --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/earthritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json new file mode 100644 index 00000000..1661fe87 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/fireritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json new file mode 100644 index 00000000..89bce579 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/lightritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/ritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/ritualstone.json new file mode 100644 index 00000000..ca5b7b23 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/ritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/ritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json new file mode 100644 index 00000000..1222a06c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/waterritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/airritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/airritualstone.json new file mode 100644 index 00000000..a32ef885 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/airritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/airritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json new file mode 100644 index 00000000..289ff1ee --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/duskritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json new file mode 100644 index 00000000..3758ede0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/earthritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json new file mode 100644 index 00000000..6eef57c2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/fireritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json new file mode 100644 index 00000000..96ca64a5 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/lightritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/ritualstone.json new file mode 100644 index 00000000..4dea1d50 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/ritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/ritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json new file mode 100644 index 00000000..4c02099f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/waterritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json new file mode 100644 index 00000000..e8935390 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:ritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 3ad54158..fb69752f 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -49,6 +49,7 @@ import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; import wayoftime.bloodmagic.core.registry.OrbRegistry; import wayoftime.bloodmagic.network.BloodMagicPacketHandler; import wayoftime.bloodmagic.potion.BloodMagicPotions; +import wayoftime.bloodmagic.ritual.RitualManager; import wayoftime.bloodmagic.tile.TileAlchemyArray; import wayoftime.bloodmagic.tile.TileAltar; import wayoftime.bloodmagic.tile.TileSoulForge; @@ -66,6 +67,7 @@ public class BloodMagic private static Gson GSON = null; public static final BloodMagicPacketHandler packetHandler = new BloodMagicPacketHandler(); + public static final RitualManager RITUAL_MANAGER = new RitualManager(); public BloodMagic() { @@ -134,8 +136,11 @@ public class BloodMagic public void onLoadComplete(FMLLoadCompleteEvent event) { OrbRegistry.tierMap.put(BloodMagicItems.ORB_WEAK.get().getTier(), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get())); + OrbRegistry.tierMap.put(BloodMagicItems.ORB_APPRENTICE.get().getTier(), new ItemStack(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())); + OrbRegistry.tierMap.put(BloodMagicItems.ORB_MAGICIAN.get().getTier(), new ItemStack(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())); + OrbRegistry.tierMap.put(BloodMagicItems.ORB_MASTER.get().getTier(), new ItemStack(BloodMagicItems.MASTER_BLOOD_ORB.get())); BloodMagicCorePlugin.INSTANCE.register(BloodMagicAPI.INSTANCE); - + RITUAL_MANAGER.discover(); } public void registerTileEntityTypes(RegistryEvent.Register> event) diff --git a/src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java b/src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java new file mode 100644 index 00000000..29948a7a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java @@ -0,0 +1,23 @@ +package wayoftime.bloodmagic.block.enums; + +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; + +//TODO: Will want to probably discontinue this due to The Flattening +public enum EnumRitualController implements IStringSerializable +{ + MASTER, IMPERFECT, INVERTED,; + + @Override + public String toString() + { + return name().toLowerCase(Locale.ENGLISH); + } + + @Override + public String getString() + { + return this.toString(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java new file mode 100644 index 00000000..7fb09854 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java @@ -0,0 +1,130 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.Explosion; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.item.ItemActivationCrystal; +import wayoftime.bloodmagic.iface.IBindable; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.tile.TileMasterRitualStone; +import wayoftime.bloodmagic.util.helper.RitualHelper; + +public class BlockMasterRitualStone extends Block +{ + public final boolean isInverted; + + public BlockMasterRitualStone(boolean isInverted) + { + super(Properties.create(Material.ROCK).sound(SoundType.STONE).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2)); + this.isInverted = isInverted; + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) + { + ItemStack heldItem = player.getHeldItem(hand); + TileEntity tile = world.getTileEntity(pos); + + if (tile instanceof TileMasterRitualStone) + { + if (heldItem.getItem() instanceof ItemActivationCrystal) + { + if (((IBindable) heldItem.getItem()).getBinding(heldItem) == null) + return ActionResultType.FAIL; + + String key = RitualHelper.getValidRitual(world, pos); + if (!key.isEmpty()) + { + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); + if (ritual != null) + { + Direction direction = RitualHelper.getDirectionOfRitual(world, pos, ritual); + // TODO: Give a message stating that this ritual is not a valid ritual. + if (direction != null && RitualHelper.checkValidRitual(world, pos, ritual, direction)) + { + if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, BloodMagic.RITUAL_MANAGER.getRitual(key))) + { + ((TileMasterRitualStone) tile).setDirection(direction); + if (isInverted) + ((TileMasterRitualStone) tile).setInverted(true); + } + } else + { + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + } + } else + { + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + } + } else + { + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + } + } + } + + return ActionResultType.FAIL; + } + + @Override + public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) + { + TileMasterRitualStone tile = (TileMasterRitualStone) world.getTileEntity(blockPos); + if (tile != null) + ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.BREAK_MRS); + + super.onPlayerDestroy(world, blockPos, blockState); + } + + @Override + public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + { + if (!state.isIn(newState.getBlock())) + { + TileEntity tile = worldIn.getTileEntity(pos); + if (tile instanceof TileMasterRitualStone) + { + ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.BREAK_MRS); + } + + super.onReplaced(state, worldIn, pos, newState, isMoving); + } + } + + @Override + public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion) + { + TileEntity tile = world.getTileEntity(pos); + + if (tile instanceof TileMasterRitualStone) + ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.EXPLOSION); + } + + @Override + public boolean hasTileEntity(BlockState state) + { + return true; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) + { + return new TileMasterRitualStone(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java new file mode 100644 index 00000000..d76bfe60 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java @@ -0,0 +1,89 @@ +package wayoftime.bloodmagic.common.block; + +import java.util.List; + +import javax.annotation.Nullable; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IRitualStone; + +public class BlockRitualStone extends Block implements IRitualStone +{ + private final EnumRuneType type; + + public BlockRitualStone(EnumRuneType type) + { + super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2)); + this.type = type; + } + + @Override + public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.decoration.safe")); + super.addInformation(stack, world, tooltip, flag); + } + +// @Override +// public int damageDropped(BlockState state) +// { +// return 0; +// } +// +// @Override +// public boolean canSilkHarvest(World world, BlockPos pos, BlockState state, PlayerEntity player) +// { +// return false; +// } + + @Override + public boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType) + { + return type.equals(runeType); + } + + @Override + public void setRuneType(World world, BlockPos pos, EnumRuneType runeType) + { + Block runeBlock = this; + switch (type) + { + case AIR: + runeBlock = BloodMagicBlocks.AIR_RITUAL_STONE.get(); + break; + case BLANK: + runeBlock = BloodMagicBlocks.BLANK_RITUAL_STONE.get(); + break; + case DAWN: + runeBlock = BloodMagicBlocks.DAWN_RITUAL_STONE.get(); + break; + case DUSK: + runeBlock = BloodMagicBlocks.DUSK_RITUAL_STONE.get(); + break; + case EARTH: + runeBlock = BloodMagicBlocks.EARTH_RITUAL_STONE.get(); + break; + case FIRE: + runeBlock = BloodMagicBlocks.FIRE_RITUAL_STONE.get(); + break; + case WATER: + runeBlock = BloodMagicBlocks.WATER_RITUAL_STONE.get(); + break; + } + + BlockState newState = runeBlock.getDefaultState(); + world.setBlockState(pos, newState); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java index 955b36b8..48e0dc40 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java @@ -18,6 +18,7 @@ import net.minecraftforge.registries.ForgeRegistries; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.block.enums.BloodRuneType; import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.ritual.EnumRuneType; import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; public class BloodMagicBlocks @@ -48,6 +49,16 @@ public class BloodMagicBlocks public static final RegistryObject BLOOD_ALTAR = BLOCKS.register("altar", () -> new BlockAltar()); public static final RegistryObject BLOOD_LIGHT = BLOCKS.register("bloodlight", () -> new BlockBloodLight()); + public static final RegistryObject BLANK_RITUAL_STONE = BLOCKS.register("ritualstone", () -> new BlockRitualStone(EnumRuneType.BLANK)); + public static final RegistryObject AIR_RITUAL_STONE = BLOCKS.register("airritualstone", () -> new BlockRitualStone(EnumRuneType.AIR)); + public static final RegistryObject WATER_RITUAL_STONE = BLOCKS.register("waterritualstone", () -> new BlockRitualStone(EnumRuneType.WATER)); + public static final RegistryObject FIRE_RITUAL_STONE = BLOCKS.register("fireritualstone", () -> new BlockRitualStone(EnumRuneType.FIRE)); + public static final RegistryObject EARTH_RITUAL_STONE = BLOCKS.register("earthritualstone", () -> new BlockRitualStone(EnumRuneType.EARTH)); + public static final RegistryObject DUSK_RITUAL_STONE = BLOCKS.register("duskritualstone", () -> new BlockRitualStone(EnumRuneType.DUSK)); + public static final RegistryObject DAWN_RITUAL_STONE = BLOCKS.register("lightritualstone", () -> new BlockRitualStone(EnumRuneType.DAWN)); + + public static final RegistryObject MASTER_RITUAL_STONE = BASICBLOCKS.register("masterritualstone", () -> new BlockMasterRitualStone(false)); + private static ForgeFlowingFluid.Properties makeProperties() { return new ForgeFlowingFluid.Properties(LIFE_ESSENCE_FLUID, LIFE_ESSENCE_FLUID_FLOWING, FluidAttributes.builder(FLUID_STILL, FLUID_FLOWING)).bucket(LIFE_ESSENCE_BUCKET).block(LIFE_ESSENCE_BLOCK); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java index cbb374ea..04b013f1 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java @@ -28,6 +28,13 @@ public class GeneratorBlockStates extends BlockStateProvider } buildCubeAll(BloodMagicBlocks.BLOOD_LIGHT.get()); + buildCubeAll(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + buildCubeAll(BloodMagicBlocks.AIR_RITUAL_STONE.get()); + buildCubeAll(BloodMagicBlocks.WATER_RITUAL_STONE.get()); + buildCubeAll(BloodMagicBlocks.FIRE_RITUAL_STONE.get()); + buildCubeAll(BloodMagicBlocks.EARTH_RITUAL_STONE.get()); + buildCubeAll(BloodMagicBlocks.DUSK_RITUAL_STONE.get()); + buildCubeAll(BloodMagicBlocks.DAWN_RITUAL_STONE.get()); } private void buildCubeAll(Block block) diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java index 06c2f49c..77739743 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java @@ -36,6 +36,14 @@ public class GeneratorItemModels extends ItemModelProvider registerBlockModel(block.get()); } + registerBlockModel(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.AIR_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.WATER_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.FIRE_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.EARTH_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.DUSK_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.DAWN_RITUAL_STONE.get()); + registerToggleableItem(BloodMagicItems.GREEN_GROVE_SIGIL.get()); registerToggleableItem(BloodMagicItems.FAST_MINER_SIGIL.get()); registerToggleableItem(BloodMagicItems.MAGNETISM_SIGIL.get()); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java index 5c4092c7..4115ea9a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java @@ -49,33 +49,17 @@ public class GeneratorLootTable extends LootTableProvider this.registerDropSelfLootTable(block.get()); } - this.registerDropSelfLootTable(BloodMagicBlocks.BLOOD_ALTAR.get()); + registerDropSelfLootTable(BloodMagicBlocks.BLOOD_ALTAR.get()); registerNoDropLootTable(BloodMagicBlocks.ALCHEMY_ARRAY.get()); registerNoDropLootTable(BloodMagicBlocks.BLOOD_LIGHT.get()); - this.registerDropSelfLootTable(BloodMagicBlocks.SOUL_FORGE.get()); - -// LootPool.Builder builder = LootPool.builder().name(ModBlocks.GOO_BLOCK.get().getRegistryName().toString()).rolls(ConstantRange.of(1)).acceptCondition(SurvivesExplosion.builder()).addEntry(ItemLootEntry.builder(ModItems.GOO_RESIDUE.get())); -// this.registerLootTable(ModBlocks.GOO_BLOCK.get(), LootTable.builder().addLootPool(builder)); -// -// LootPool.Builder builder2 = LootPool.builder().name(ModBlocks.GOO_BLOCK_TERRAIN.get().getRegistryName().toString()).rolls(ConstantRange.of(1)).acceptCondition(SurvivesExplosion.builder()).addEntry(ItemLootEntry.builder(ModItems.GOO_RESIDUE.get())); -// this.registerLootTable(ModBlocks.GOO_BLOCK_TERRAIN.get(), LootTable.builder().addLootPool(builder2)); -// -// this.registerDropSelfLootTable(ModBlocks.GOO_BLOCK_POISON.get()); -// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T1.get()); -// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T2.get()); -// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T3.get()); -// this.registerDropSelfLootTable(ModBlocks.GNT_BLOCK_T4.get()); -// this.registerDropSelfLootTable(ModBlocks.TURRET_BLOCK.get()); -// this.registerDropSelfLootTable(ModBlocks.ZAPPER_TURRET_BLOCK.get()); -// this.registerDropSelfLootTable(ModBlocks.ANTI_GOO_BEACON.get()); -// this.registerDropSelfLootTable(ModBlocks.ANTI_GOO_FIELD_GEN.get()); -// this.registerDropSelfLootTable(ModBlocks.GOOLIMINATIONFIELDGEN.get()); -// this.registerDropSelfLootTable(ModBlocks.GOO_DETECTOR.get()); -// this.registerDropping(ModBlocks.GOO_RENDER.get(), ItemStack.EMPTY.getItem()); -// // this.registerDropping(ModBlocks.GOO_RENDER_BURST.get(), -// // ItemStack.EMPTY.getItem()); -// this.registerDropping(ModBlocks.GOO_RENDER_TERRAIN.get(), ItemStack.EMPTY.getItem()); - + registerDropSelfLootTable(BloodMagicBlocks.SOUL_FORGE.get()); + registerDropSelfLootTable(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropping(BloodMagicBlocks.AIR_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropping(BloodMagicBlocks.WATER_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropping(BloodMagicBlocks.FIRE_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropping(BloodMagicBlocks.EARTH_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropping(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropping(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); } private void registerNoDropLootTable(Block block) diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index 69855511..f79ae7b2 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -54,6 +54,13 @@ public class BloodMagicItems public static final RegistryObject ORB_RUNE_ITEM = ITEMS.register("orbcapacityrune", () -> new BlockItem(BloodMagicBlocks.ORB_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject ACCELERATION_RUNE_ITEM = ITEMS.register("accelerationrune", () -> new BlockItem(BloodMagicBlocks.ACCELERATION_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject CHARGING_RUNE_ITEM = ITEMS.register("chargingrune", () -> new BlockItem(BloodMagicBlocks.CHARGING_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject BLANK_RITUAL_STONE_ITEM = ITEMS.register("ritualstone", () -> new BlockItem(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject AIR_RITUAL_STONE_ITEM = ITEMS.register("airritualstone", () -> new BlockItem(BloodMagicBlocks.AIR_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject WATER_RITUAL_STONE_ITEM = ITEMS.register("waterritualstone", () -> new BlockItem(BloodMagicBlocks.WATER_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject FIRE_RITUAL_STONE_ITEM = ITEMS.register("fireritualstone", () -> new BlockItem(BloodMagicBlocks.FIRE_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject EARTH_RITUAL_STONE_ITEM = ITEMS.register("earthritualstone", () -> new BlockItem(BloodMagicBlocks.EARTH_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUSK_RITUAL_STONE_ITEM = ITEMS.register("duskritualstone", () -> new BlockItem(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DAWN_RITUAL_STONE_ITEM = ITEMS.register("lightritualstone", () -> new BlockItem(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject BLOOD_ALTAR_ITEM = ITEMS.register("altar", () -> new BlockItem(BloodMagicBlocks.BLOOD_ALTAR.get(), new Item.Properties().group(BloodMagic.TAB))); @@ -87,6 +94,10 @@ public class BloodMagicItems public static final RegistryObject ARCANE_ASHES = BASICITEMS.register("arcaneashes", () -> new ItemArcaneAshes()); public static final RegistryObject DAGGER_OF_SACRIFICE = BASICITEMS.register("daggerofsacrifice", () -> new ItemDaggerOfSacrifice()); + public static final RegistryObject WEAK_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalweak", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.WEAK)); + public static final RegistryObject AWAKENED_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalawakened", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.AWAKENED)); + public static final RegistryObject CREATIVE_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalcreative", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.CREATIVE)); + // Reagents used to make the Sigils public static final RegistryObject REAGENT_WATER = BASICITEMS.register("reagentwater", () -> new ItemBase()); public static final RegistryObject REAGENT_LAVA = BASICITEMS.register("reagentlava", () -> new ItemBase()); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java new file mode 100644 index 00000000..83d97492 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java @@ -0,0 +1,72 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import javax.annotation.Nonnull; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.iface.IBindable; + +public class ItemActivationCrystal extends Item implements IBindable +{ + final CrystalType type; + + public ItemActivationCrystal(CrystalType type) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + this.type = type; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.activation_crystal." + type.name().toLowerCase())); + + if (!stack.hasTag()) + return; + + Binding binding = getBinding(stack); + if (binding != null) + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + + super.addInformation(stack, world, tooltip, flag); + } + + public int getCrystalLevel(ItemStack stack) + { + return this.type.equals(CrystalType.CREATIVE) ? Integer.MAX_VALUE : type.ordinal() + 1; + } + + public enum CrystalType + { + WEAK, AWAKENED, CREATIVE,; + + @Nonnull + public static ItemStack getStack(int level) + { + if (level < 0) + { + level = 0; + } + switch (level) + { + case 0: + return new ItemStack(BloodMagicItems.WEAK_ACTIVATION_CRYSTAL.get()); + case 1: + return new ItemStack(BloodMagicItems.AWAKENED_ACTIVATION_CRYSTAL.get()); + default: + return new ItemStack(BloodMagicItems.CREATIVE_ACTIVATION_CRYSTAL.get()); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java b/src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java new file mode 100644 index 00000000..2e2fd6da --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java @@ -0,0 +1,76 @@ +package wayoftime.bloodmagic.demonaura; + +import org.apache.commons.lang3.builder.ToStringBuilder; + +public class PosXY implements Comparable +{ + public int x; + public int y; + + public PosXY() + { + } + + public PosXY(int x, int y) + { + this.x = x; + this.y = y; + } + + @Override + public int compareTo(PosXY c) + { + return this.y == c.y ? this.x - c.x : this.y - c.y; + } + + public float getDistanceSquared(int x, int z) + { + float f = this.x - x; + float f2 = this.y - z; + return f * f + f2 * f2; + } + + public float getDistanceSquaredToChunkCoordinates(PosXY c) + { + return getDistanceSquared(c.x, c.y); + } + + public void setX(int x) + { + this.x = x; + } + + public void setY(int y) + { + this.y = y; + } + + @Override + public String toString() + { + return new ToStringBuilder(this).append("x", x).append("y", y).toString(); + } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (!(o instanceof PosXY)) + return false; + + PosXY posXY = (PosXY) o; + + if (x != posXY.x) + return false; + return y == posXY.y; + } + + @Override + public int hashCode() + { + int result = x; + result = 31 * result + y; + return result; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java b/src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java new file mode 100644 index 00000000..f93cfb8f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java @@ -0,0 +1,72 @@ +package wayoftime.bloodmagic.demonaura; + +import java.lang.ref.WeakReference; + +import net.minecraft.world.chunk.Chunk; +import wayoftime.bloodmagic.will.DemonWillHolder; + +public class WillChunk +{ + PosXY loc; + private short base; + private DemonWillHolder currentWill = new DemonWillHolder(); + private WeakReference chunkRef; + + public WillChunk(PosXY loc) + { + this.loc = loc; + } + + public WillChunk(Chunk chunk, short base, DemonWillHolder currentWill) + { + this.loc = new PosXY(chunk.getPos().x, chunk.getPos().z); + this.chunkRef = new WeakReference(chunk); + this.base = base; + this.currentWill = currentWill; + } + + public boolean isModified() + { + return (this.chunkRef != null) && (this.chunkRef.get() != null) && this.chunkRef.get().isModified(); + } + + public PosXY getLoc() + { + return loc; + } + + public void setLoc(PosXY loc) + { + this.loc = loc; + } + + public short getBase() + { + return base; + } + + public void setBase(short base) + { + this.base = base; + } + + public DemonWillHolder getCurrentWill() + { + return currentWill; + } + + public void setCurrentWill(DemonWillHolder currentWill) + { + this.currentWill = currentWill; + } + + public WeakReference getChunkRef() + { + return chunkRef; + } + + public void setChunkRef(WeakReference chunkRef) + { + this.chunkRef = chunkRef; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java b/src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java new file mode 100644 index 00000000..b1f92d9a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java @@ -0,0 +1,49 @@ +package wayoftime.bloodmagic.demonaura; + +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.util.ResourceLocation; + +public class WillWorld +{ + // TODO: It was noted I may need to use RegistryKey instead. + ResourceLocation dim; + ConcurrentHashMap willChunks = new ConcurrentHashMap<>(); + +// private static ConcurrentHashMap nodeTickets = new ConcurrentHashMap(); + + public WillWorld(ResourceLocation resourceLocation) + { + this.dim = resourceLocation; + } + + public WillChunk getWillChunkAt(int x, int y) + { + return getWillChunkAt(new PosXY(x, y)); + } + + public WillChunk getWillChunkAt(PosXY loc) + { + return this.willChunks.get(loc); + } + + public ConcurrentHashMap getWillChunks() + { + return willChunks; + } + + public void setWillChunks(ConcurrentHashMap willChunks) + { + this.willChunks = willChunks; + } + +// public static ConcurrentHashMap getNodeTickets() +// { +// return nodeTickets; +// } +// +// public static void setNodeTickets(ConcurrentHashMap nodeTickets) +// { +// nodeTickets = nodeTickets; +// } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java b/src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java new file mode 100644 index 00000000..c26cf624 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java @@ -0,0 +1,218 @@ +package wayoftime.bloodmagic.demonaura; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.annotation.Nullable; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; +import wayoftime.bloodmagic.util.BMLog; +import wayoftime.bloodmagic.will.DemonWillHolder; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +public class WorldDemonWillHandler +{ + public static ConcurrentHashMap> dirtyChunks = new ConcurrentHashMap<>(); + static ConcurrentHashMap containedWills = new ConcurrentHashMap<>(); + + @Nullable + public static DemonWillHolder getWillHolder(ResourceLocation resourceLocation, int x, int y) + { + WillChunk chunk = getWillChunk(resourceLocation, x, y); + if (chunk != null) + { + return chunk.getCurrentWill(); + } + + return null; + } + + public static DemonWillHolder getWillHolder(World world, BlockPos pos) + { + return getWillHolder(getDimensionResourceLocation(world), pos.getX() >> 4, pos.getZ() >> 4); + } + + public static WillWorld getWillWorld(int dim) + { + return containedWills.get(dim); + } + + @Nullable + public static WillChunk getWillChunk(ResourceLocation resourceLocation, int x, int y) + { + if (!containedWills.containsKey(resourceLocation)) + { + addWillWorld(resourceLocation); + } + + return (containedWills.get(resourceLocation)).getWillChunkAt(x, y); + } + + public static void addWillWorld(ResourceLocation resourceLocation) + { + if (!containedWills.containsKey(resourceLocation)) + { + containedWills.put(resourceLocation, new WillWorld(resourceLocation)); + BMLog.DEBUG.info("Creating demon will cache for world {}", resourceLocation); + } + } + + public static void removeWillWorld(int dim) + { + containedWills.remove(dim); + BMLog.DEBUG.info("Removing demon will cache for world {}", dim); + } + + public static void addWillChunk(ResourceLocation resourceLocation, Chunk chunk, short base, DemonWillHolder currentWill) + { + WillWorld aw = containedWills.get(resourceLocation); + if (aw == null) + { + aw = new WillWorld(resourceLocation); + } + aw.getWillChunks().put(new PosXY(chunk.getPos().x, chunk.getPos().z), new WillChunk(chunk, base, currentWill)); + + containedWills.put(resourceLocation, aw); + } + + public static void removeWillChunk(ResourceLocation resourceLocation, int x, int y) + { + WillWorld aw = containedWills.get(resourceLocation); + if (aw != null) + { + WillChunk chunk = aw.getWillChunks().remove(new PosXY(x, y)); + if (chunk != null) + { + markChunkAsDirty(chunk, resourceLocation); + } + } + } + + public static EnumDemonWillType getHighestDemonWillType(World world, BlockPos pos) + { + double currentMax = 0; + EnumDemonWillType currentHighest = EnumDemonWillType.DEFAULT; + + WillChunk willChunk = getWillChunk(world, pos); + + DemonWillHolder currentWill = willChunk.getCurrentWill(); + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + if (currentWill.getWill(type) > currentMax) + { + currentMax = currentWill.getWill(type); + currentHighest = type; + } + } + + return currentHighest; + } + + public static double drainWill(World world, BlockPos pos, EnumDemonWillType type, double amount, boolean doDrain) + { + WillChunk willChunk = getWillChunk(world, pos); + + DemonWillHolder currentWill = willChunk.getCurrentWill(); + double drain = Math.min(currentWill.getWill(type), amount); + if (!doDrain) + { + return drain; + } + + drain = currentWill.drainWill(type, drain); + markChunkAsDirty(willChunk, getDimensionResourceLocation(world)); + + return drain; + } + + public static double fillWillToMaximum(World world, BlockPos pos, EnumDemonWillType type, double amount, double max, boolean doFill) + { + WillChunk willChunk = getWillChunk(world, pos); + + DemonWillHolder currentWill = willChunk.getCurrentWill(); + double fill = Math.min(amount, max - currentWill.getWill(type)); + if (!doFill || fill <= 0) + { + return fill > 0 ? fill : 0; + } + + fill = currentWill.addWill(type, amount, max); + markChunkAsDirty(willChunk, getDimensionResourceLocation(world)); + + return fill; + } + + public static double fillWill(World world, BlockPos pos, EnumDemonWillType type, double amount, boolean doFill) + { + WillChunk willChunk = getWillChunk(world, pos); + + DemonWillHolder currentWill = willChunk.getCurrentWill(); + if (!doFill) + { + return amount; + } + + currentWill.addWill(type, amount); + markChunkAsDirty(willChunk, getDimensionResourceLocation(world)); + + return amount; + } + + public static WillChunk getWillChunk(World world, BlockPos pos) + { + WillChunk willChunk = getWillChunk(getDimensionResourceLocation(world), pos.getX() >> 4, pos.getZ() >> 4); + if (willChunk == null) + { + Chunk chunk = world.getChunk(pos.getX() >> 4, pos.getZ() >> 4); + generateWill(chunk); + + willChunk = getWillChunk(getDimensionResourceLocation(world), pos.getX() >> 4, pos.getZ() >> 4); + } + + return willChunk; + } + + public static double getCurrentWill(World world, BlockPos pos, EnumDemonWillType type) + { + WillChunk willChunk = getWillChunk(world, pos); + + if (willChunk == null) + { + return 0; + } + + DemonWillHolder currentWill = willChunk.getCurrentWill(); + return currentWill.getWill(type); + } + + private static void markChunkAsDirty(WillChunk chunk, ResourceLocation resourceLocation) + { + if (chunk.isModified()) + { + return; + } + PosXY pos = new PosXY(chunk.loc.x, chunk.loc.y); + if (!dirtyChunks.containsKey(resourceLocation)) + { + dirtyChunks.put(resourceLocation, new CopyOnWriteArrayList<>()); + } + CopyOnWriteArrayList dc = dirtyChunks.get(resourceLocation); + if (!dc.contains(pos)) + { + dc.add(pos); + } + } + + public static void generateWill(Chunk chunk) + { + addWillChunk(chunk.getWorld().getDimensionKey().getLocation(), chunk, (short) 1, new DemonWillHolder()); + } + + private static ResourceLocation getDimensionResourceLocation(World world) + { + return world.getDimensionKey().getLocation(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/event/RitualEvent.java b/src/main/java/wayoftime/bloodmagic/event/RitualEvent.java new file mode 100644 index 00000000..f5356ec8 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/event/RitualEvent.java @@ -0,0 +1,151 @@ +package wayoftime.bloodmagic.event; + +import java.util.UUID; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.imperfect.IImperfectRitualStone; +import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual; + +public class RitualEvent extends Event +{ + private final IMasterRitualStone mrs; + private final UUID ownerId; + private final Ritual ritual; + + private RitualEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) + { + this.mrs = mrs; + this.ownerId = ownerId; + this.ritual = ritual; + } + + public IMasterRitualStone getRitualStone() + { + return mrs; + } + + public UUID getOwnerId() + { + return ownerId; + } + + public Ritual getRitual() + { + return ritual; + } + + /** + * This event is called when a ritual is activated. If cancelled, it will not + * activate. + *

    + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} + */ + @Cancelable + public static class RitualActivatedEvent extends RitualEvent + { + + private final PlayerEntity player; + private final ItemStack crystalStack; + private final int crystalTier; + + public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, PlayerEntity player, ItemStack activationCrystal, int crystalTier) + { + super(mrs, ownerId, ritual); + + this.player = player; + this.crystalStack = activationCrystal; + this.crystalTier = crystalTier; + } + + public PlayerEntity getPlayer() + { + return player; + } + + public ItemStack getCrystalStack() + { + return crystalStack; + } + + public int getCrystalTier() + { + return crystalTier; + } + } + + /** + * This event is called when a Ritual effect is performed. If cancelled, the + * effect will not happen. + *

    + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)} + */ + @Cancelable + public static class RitualRunEvent extends RitualEvent + { + + public RitualRunEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) + { + super(mrs, ownerId, ritual); + } + } + + /** + * This event is called when a Ritual is stopped by a {@link Ritual.BreakType}. + *

    + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)} + */ + public static class RitualStopEvent extends RitualEvent + { + + private final Ritual.BreakType method; + + public RitualStopEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, Ritual.BreakType method) + { + super(mrs, ownerId, ritual); + + this.method = method; + } + + public Ritual.BreakType getMethod() + { + return method; + } + } + + @Cancelable + public static class ImperfectRitualActivatedEvent extends Event + { + + private final IImperfectRitualStone ims; + private final PlayerEntity activator; + private final ImperfectRitual imperfectRitual; + + public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, PlayerEntity activator, ImperfectRitual imperfectRitual) + { + this.ims = ims; + this.activator = activator; + this.imperfectRitual = imperfectRitual; + } + + public IImperfectRitualStone getRitualStone() + { + return ims; + } + + public PlayerEntity getActivator() + { + return activator; + } + + public ImperfectRitual getImperfectRitual() + { + return imperfectRitual; + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java new file mode 100644 index 00000000..b37eeb80 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java @@ -0,0 +1,654 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.gen.feature.template.PlacementSettings; +import net.minecraft.world.gen.feature.template.Template; +import wayoftime.bloodmagic.util.Constants; + +public abstract class AreaDescriptor implements Iterator +{ + public List getContainedPositions(BlockPos pos) + { + return new ArrayList<>(); + } + + public AxisAlignedBB getAABB(BlockPos pos) + { + return null; + } + + public abstract void resetCache(); + + public abstract boolean isWithinArea(BlockPos pos); + + public abstract void resetIterator(); + + public void readFromNBT(CompoundNBT tag) + { + + } + + public void writeToNBT(CompoundNBT tag) + { + + } + + public abstract AreaDescriptor copy(); + + public abstract int getVolumeForOffsets(BlockPos offset1, BlockPos offset2); + + public abstract boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit); + + public abstract int getVolume(); + + public abstract int getHeight(); + + public abstract boolean isWithinRange(int verticalLimit, int horizontalLimit); + + /** + * This method changes the area descriptor so that its range matches the two + * blocks that are selected. When implementing this method, assume that these + * positions are the blocks that are clicked by the player. + * + * @param pos1 + * @param pos2 + */ + public abstract void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2); + + public abstract boolean intersects(AreaDescriptor descriptor); + + public abstract AreaDescriptor offset(BlockPos offset); + + public abstract AreaDescriptor rotateDescriptor(PlacementSettings settings); + + public static class Rectangle extends AreaDescriptor + { + protected BlockPos minimumOffset; + protected BlockPos maximumOffset; // Non-inclusive maximum offset. + private BlockPos currentPosition; + + private ArrayList blockPosCache; + private BlockPos cachedPosition; + + private boolean cache = true; + + /** + * This constructor takes in the minimum and maximum BlockPos. The maximum + * offset is non-inclusive, meaning if you pass in (0,0,0) and (1,1,1), calling + * getContainedPositions() will only give (0,0,0). + * + * @param minimumOffset - + * @param maximumOffset - + */ + public Rectangle(BlockPos minimumOffset, BlockPos maximumOffset) + { + setOffsets(minimumOffset, maximumOffset); + } + + public Rectangle(BlockPos minimumOffset, int sizeX, int sizeY, int sizeZ) + { + this(minimumOffset, minimumOffset.add(sizeX, sizeY, sizeZ)); + } + + public Rectangle(BlockPos minimumOffset, int size) + { + this(minimumOffset, size, size, size); + } + + public Rectangle(AreaDescriptor.Rectangle rectangle) + { + this(rectangle.minimumOffset, rectangle.maximumOffset); + } + + public AreaDescriptor.Rectangle copy() + { + return new AreaDescriptor.Rectangle(this); + } + + @Override + public List getContainedPositions(BlockPos pos) + { + if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) + { + ArrayList posList = new ArrayList<>(); + + for (int j = minimumOffset.getY(); j < maximumOffset.getY(); j++) + { + for (int i = minimumOffset.getX(); i < maximumOffset.getX(); i++) + { + for (int k = minimumOffset.getZ(); k < maximumOffset.getZ(); k++) + { + posList.add(pos.add(i, j, k)); + } + } + } + + blockPosCache = posList; + cachedPosition = pos; + } + + return Collections.unmodifiableList(blockPosCache); + } + + @Override + public AxisAlignedBB getAABB(BlockPos pos) + { + AxisAlignedBB tempAABB = new AxisAlignedBB(minimumOffset, maximumOffset); + return tempAABB.offset(pos.getX(), pos.getY(), pos.getZ()); + } + + @Override + public int getHeight() + { + return this.maximumOffset.getY() - this.minimumOffset.getY(); + } + + public BlockPos getMinimumOffset() + { + return minimumOffset; + } + + public BlockPos getMaximumOffset() + { + return maximumOffset; + } + + /** + * Sets the offsets of the AreaDescriptor in a safe way that will make + * minimumOffset the lowest corner + * + * @param offset1 - + * @param offset2 - + */ + public void setOffsets(BlockPos offset1, BlockPos offset2) + { + this.minimumOffset = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); + this.maximumOffset = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); + blockPosCache = new ArrayList<>(); + } + + @Override + public void resetCache() + { + this.blockPosCache = new ArrayList<>(); + } + + @Override + public boolean isWithinArea(BlockPos pos) + { + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); + + return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() + && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ(); + } + + @Override + public boolean hasNext() + { + return currentPosition == null || !(currentPosition.getX() + 1 == maximumOffset.getX() + && currentPosition.getY() + 1 == maximumOffset.getY() + && currentPosition.getZ() + 1 == maximumOffset.getZ()); + } + + @Override + public BlockPos next() + { + if (currentPosition != null) + { + int nextX = currentPosition.getX() + 1 >= maximumOffset.getX() ? minimumOffset.getX() + : currentPosition.getX() + 1; + int nextZ = nextX != minimumOffset.getX() ? currentPosition.getZ() + : (currentPosition.getZ() + 1 >= maximumOffset.getZ() ? minimumOffset.getZ() + : currentPosition.getZ() + 1); + int nextY = (nextZ != minimumOffset.getZ() || nextX != minimumOffset.getX()) ? currentPosition.getY() + : (currentPosition.getY() + 1); + currentPosition = new BlockPos(nextX, nextY, nextZ); + } else + { + currentPosition = minimumOffset; + } + + return currentPosition; + } + + @Override + public void remove() + { + + } + + @Override + public void resetIterator() + { + currentPosition = null; + } + + @Override + public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) + { + setOffsets(pos1, pos2); + maximumOffset = maximumOffset.add(1, 1, 1); + resetIterator(); + resetCache(); + } + + @Override + public void readFromNBT(CompoundNBT tag) + { + minimumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "min"), tag.getInt(Constants.NBT.Y_COORD + "min"), tag.getInt(Constants.NBT.Z_COORD + "min")); + maximumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "max"), tag.getInt(Constants.NBT.Y_COORD + "max"), tag.getInt(Constants.NBT.Z_COORD + "max")); + } + + @Override + public void writeToNBT(CompoundNBT tag) + { + tag.putInt(Constants.NBT.X_COORD + "min", minimumOffset.getX()); + tag.putInt(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); + tag.putInt(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); + tag.putInt(Constants.NBT.X_COORD + "max", maximumOffset.getX()); + tag.putInt(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); + tag.putInt(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); + } + + @Override + public int getVolumeForOffsets(BlockPos offset1, BlockPos offset2) + { + BlockPos minPos = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); + BlockPos maxPos = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); + + maxPos = maxPos.add(1, 1, 1); + + return (maxPos.getX() - minPos.getX()) * (maxPos.getY() - minPos.getY()) * (maxPos.getZ() - minPos.getZ()); + } + + @Override + public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) + { + BlockPos minPos = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); + BlockPos maxPos = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); + + return minPos.getY() >= -verticalLimit && maxPos.getY() <= verticalLimit + && minPos.getX() >= -horizontalLimit && maxPos.getX() <= horizontalLimit + && minPos.getZ() >= -horizontalLimit && maxPos.getZ() <= horizontalLimit; + } + + @Override + public int getVolume() + { + return (maximumOffset.getX() - minimumOffset.getX()) * (maximumOffset.getY() - minimumOffset.getY()) + * (maximumOffset.getZ() - minimumOffset.getZ()); + } + + @Override + public boolean isWithinRange(int verticalLimit, int horizontalLimit) + { + return minimumOffset.getY() >= -verticalLimit && maximumOffset.getY() <= verticalLimit + 1 + && minimumOffset.getX() >= -horizontalLimit && maximumOffset.getX() <= horizontalLimit + 1 + && minimumOffset.getZ() >= -horizontalLimit && maximumOffset.getZ() <= horizontalLimit + 1; + } + + @Override + public boolean intersects(AreaDescriptor descriptor) + { + if (descriptor instanceof AreaDescriptor.Rectangle) + { + AreaDescriptor.Rectangle rectangle = (AreaDescriptor.Rectangle) descriptor; + + return !(minimumOffset.getX() >= rectangle.maximumOffset.getX() + || minimumOffset.getY() >= rectangle.maximumOffset.getY() + || minimumOffset.getZ() >= rectangle.maximumOffset.getZ() + || rectangle.minimumOffset.getX() >= maximumOffset.getX() + || rectangle.minimumOffset.getY() >= maximumOffset.getY() + || rectangle.minimumOffset.getZ() >= maximumOffset.getZ()); + } + + return false; + } + + @Override + public AreaDescriptor offset(BlockPos offset) + { + return new AreaDescriptor.Rectangle(this.minimumOffset.add(offset), this.maximumOffset.add(offset)); + } + + @Override + public AreaDescriptor rotateDescriptor(PlacementSettings settings) + { + BlockPos rotatePos1 = Template.transformedBlockPos(settings, minimumOffset); + BlockPos rotatePos2 = Template.transformedBlockPos(settings, maximumOffset.add(-1, -1, -1)); // It works, + // shut up! + + AreaDescriptor.Rectangle rectangle = new AreaDescriptor.Rectangle(this.minimumOffset, 1); + rectangle.modifyAreaByBlockPositions(rotatePos1, rotatePos2); + + return rectangle; + } + } + + public static class HemiSphere extends AreaDescriptor + { + private BlockPos minimumOffset; + private int radius; + + private ArrayList blockPosCache; + private BlockPos cachedPosition; + + private boolean cache = true; + + public HemiSphere(BlockPos minimumOffset, int radius) + { + setRadius(minimumOffset, radius); + } + + public HemiSphere(AreaDescriptor.HemiSphere hemiSphere) + { + this(hemiSphere.minimumOffset, hemiSphere.radius); + } + + public AreaDescriptor.HemiSphere copy() + { + return new AreaDescriptor.HemiSphere(this); + } + + public void setRadius(BlockPos minimumOffset, int radius) + { + this.minimumOffset = new BlockPos(Math.min(minimumOffset.getX(), minimumOffset.getX()), Math.min(minimumOffset.getY(), minimumOffset.getY()), Math.min(minimumOffset.getZ(), minimumOffset.getZ())); + this.radius = radius; + blockPosCache = new ArrayList<>(); + } + + @Override + public int getHeight() + { + return this.radius * 2; + } + + @Override + public List getContainedPositions(BlockPos pos) + { + if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) + { + ArrayList posList = new ArrayList<>(); + + int i = -radius; + int j = minimumOffset.getY(); + int k = -radius; + + // TODO For some reason the bottom of the hemisphere is not going up with the + // minOffset + + while (i <= radius) + { + while (j <= radius) + { + while (k <= radius) + { + if (i * i + j * j + k * k >= (radius + 0.5F) * (radius + 0.5F)) + { + k++; + continue; + } + + posList.add(pos.add(i, j, k)); + k++; + } + + k = -radius; + j++; + } + + j = minimumOffset.getY(); + i++; + } + + blockPosCache = posList; + cachedPosition = pos; + } + + return Collections.unmodifiableList(blockPosCache); + } + + /** + * Since you can't make a box using a sphere, this returns null + */ + @Override + public AxisAlignedBB getAABB(BlockPos pos) + { + return null; + } + + @Override + public void resetCache() + { + this.blockPosCache = new ArrayList<>(); + } + + @Override + public boolean isWithinArea(BlockPos pos) + { + return blockPosCache.contains(pos); + } + + @Override + public boolean hasNext() + { + return false; + } + + @Override + public BlockPos next() + { + return null; + } + + @Override + public void remove() + { + + } + + @Override + public void resetIterator() + { + + } + + @Override + public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) + { + + } + + @Override + public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) + { + return 0; + } + + @Override + public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) + { + return false; + } + + @Override + public int getVolume() + { + return 0; + } + + @Override + public boolean isWithinRange(int verticalLimit, int horizontalLimit) + { + return false; + } + + @Override + public boolean intersects(AreaDescriptor descriptor) + { + return false; + } + + @Override + public AreaDescriptor offset(BlockPos offset) + { + return new AreaDescriptor.HemiSphere(minimumOffset.add(offset), radius); + } + + @Override + public AreaDescriptor rotateDescriptor(PlacementSettings settings) + { + return this; + } + } + + public static class Cross extends AreaDescriptor + { + + private ArrayList blockPosCache; + private BlockPos cachedPosition; + + private BlockPos centerPos; + private int size; + + private boolean cache = true; + + public Cross(BlockPos center, int size) + { + this.centerPos = center; + this.size = size; + this.blockPosCache = new ArrayList<>(); + } + + public Cross(AreaDescriptor.Cross cross) + { + this(cross.centerPos, cross.size); + } + + public AreaDescriptor.Cross copy() + { + return new AreaDescriptor.Cross(this); + } + + @Override + public int getHeight() + { + return this.size * 2 + 1; + } + + @Override + public List getContainedPositions(BlockPos pos) + { + if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) + { + resetCache(); + + blockPosCache.add(centerPos.add(pos)); + for (int i = 1; i <= size; i++) + { + blockPosCache.add(centerPos.add(pos).add(i, 0, 0)); + blockPosCache.add(centerPos.add(pos).add(0, 0, i)); + blockPosCache.add(centerPos.add(pos).add(-i, 0, 0)); + blockPosCache.add(centerPos.add(pos).add(0, 0, -i)); + } + } + + cachedPosition = pos; + + return Collections.unmodifiableList(blockPosCache); + } + + @Override + public void resetCache() + { + blockPosCache = new ArrayList<>(); + } + + @Override + public boolean isWithinArea(BlockPos pos) + { + return blockPosCache.contains(pos); + } + + @Override + public boolean hasNext() + { + return false; + } + + @Override + public BlockPos next() + { + return null; + } + + @Override + public void remove() + { + + } + + @Override + public void resetIterator() + { + + } + + @Override + public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) + { + + } + + @Override + public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) + { + return 0; + } + + @Override + public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) + { + return false; + } + + @Override + public int getVolume() + { + return 0; + } + + @Override + public boolean isWithinRange(int verticalLimit, int horizontalLimit) + { + return false; + } + + @Override + public boolean intersects(AreaDescriptor descriptor) + { + return false; + } + + @Override + public AreaDescriptor offset(BlockPos offset) + { + return new AreaDescriptor.Cross(centerPos.add(offset), size); + } + + @Override + public AreaDescriptor rotateDescriptor(PlacementSettings settings) + { + return this; + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java b/src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java new file mode 100644 index 00000000..258867c4 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java @@ -0,0 +1,58 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.concurrent.Callable; + +import net.minecraft.nbt.ByteNBT; +import net.minecraft.nbt.INBT; +import net.minecraft.util.Direction; +import net.minecraftforge.common.capabilities.Capability; + +public final class CapabilityRuneType +{ + public static class RuneTypeStorage implements Capability.IStorage + { + @Override + public INBT writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) + { + return ByteNBT.valueOf((byte) instance.getRuneType().ordinal()); + } + + @Override + public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, INBT nbt) + { + instance.setRuneType(EnumRuneType.byMetadata(((ByteNBT) nbt).getByte())); + } + } + + public static class RuneTypeWrapper implements IRitualStone.Tile + { + private EnumRuneType type = EnumRuneType.BLANK; + + @Override + public boolean isRuneType(EnumRuneType runeType) + { + return type == runeType; + } + + @Override + public EnumRuneType getRuneType() + { + return type; + } + + public void setRuneType(EnumRuneType runeType) + { + type = runeType; + } + } + + public static class Factory implements Callable + { + @Override + public IRitualStone.Tile call() + throws Exception + { + return new RuneTypeWrapper(); + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java b/src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java new file mode 100644 index 00000000..3e664671 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java @@ -0,0 +1,22 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; + +public enum EnumReaderBoundaries implements IStringSerializable +{ + SUCCESS, VOLUME_TOO_LARGE, NOT_WITHIN_BOUNDARIES; + + @Override + public String toString() + { + return name().toLowerCase(Locale.ROOT); + } + + @Override + public String getString() + { + return toString(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java new file mode 100644 index 00000000..959e771d --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java @@ -0,0 +1,54 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.text.TextFormatting; + +public enum EnumRuneType implements IStringSerializable +{ + BLANK(TextFormatting.GRAY), + WATER(TextFormatting.AQUA), + FIRE(TextFormatting.RED), + EARTH(TextFormatting.GREEN), + AIR(TextFormatting.WHITE), + DUSK(TextFormatting.DARK_GRAY), + DAWN(TextFormatting.GOLD); + + public final TextFormatting colorCode; + + EnumRuneType(TextFormatting colorCode) + { + this.colorCode = colorCode; + } + + @Override + public String toString() + { + return name().toLowerCase(Locale.ENGLISH); + } + + @Override + public String getString() + { + return this.toString(); + } + +// @Nonnull +// public ItemStack getStack(int count) +// { +// ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); +// CompoundNBT tag = new CompoundNBT(); +// tag.putInt(Constants.NBT.USES, 10); +// ret.setTag(tag); +// return ret; +// } + + public static EnumRuneType byMetadata(int meta) + { + if (meta < 0 || meta >= values().length) + meta = 0; + + return values()[meta]; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java new file mode 100644 index 00000000..e82e2deb --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java @@ -0,0 +1,81 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +/** + * This interface is for internal implementation only. + *

    + * It is provided via the API for easy obtaining of basic data. + */ +public interface IMasterRitualStone +{ + UUID getOwner(); + + SoulNetwork getOwnerNetwork(); + + boolean activateRitual(ItemStack activationCrystal, PlayerEntity activator, Ritual ritual); + + void performRitual(World world, BlockPos pos); + + void stopRitual(Ritual.BreakType breakType); + + int getCooldown(); + + void setCooldown(int cooldown); + + boolean isActive(); + + void setActive(boolean active); + + Direction getDirection(); + + boolean areTanksEmpty(); + + int getRunningTime(); + + World getWorldObj(); + + BlockPos getBlockPos(); + + String getNextBlockRange(String range); + + void provideInformationOfRitualToPlayer(PlayerEntity player); + + void provideInformationOfRangeToPlayer(PlayerEntity player, String range); + + void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList); + + void setActiveWillConfig(PlayerEntity player, List typeList); + + EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2); + + List getActiveWillConfig(); + + default SoulTicket ticket(int amount) + { + return SoulTicket.block(getWorldObj(), getBlockPos(), amount); + } + + AreaDescriptor getBlockRange(String range); + + void addBlockRanges(Map blockRanges); + + void addBlockRange(String range, AreaDescriptor defaultRange); + + void setBlockRanges(Map blockRanges); + + void setBlockRange(String range, AreaDescriptor defaultRange); + + Ritual getCurrentRitual(); +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java b/src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java new file mode 100644 index 00000000..a4409fe9 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java @@ -0,0 +1,20 @@ +package wayoftime.bloodmagic.ritual; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public interface IRitualStone +{ + boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType); + + void setRuneType(World world, BlockPos pos, EnumRuneType runeType); + + interface Tile + { + boolean isRuneType(EnumRuneType runeType); + + EnumRuneType getRuneType(); + + void setRuneType(EnumRuneType runeType); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/Ritual.java b/src/main/java/wayoftime/bloodmagic/ritual/Ritual.java new file mode 100644 index 00000000..0ecd8c43 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/Ritual.java @@ -0,0 +1,427 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import java.util.function.Consumer; + +import org.apache.commons.lang3.builder.ToStringBuilder; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; +import wayoftime.bloodmagic.will.DemonWillHolder; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +/** + * Abstract class for creating new rituals. Register your ritual by annotating + * it with {@link RitualRegister} + */ +public abstract class Ritual +{ + + protected final Map modableRangeMap = new HashMap<>(); + protected final Map volumeRangeMap = new HashMap<>(); + protected final Map horizontalRangeMap = new HashMap<>(); + protected final Map verticalRangeMap = new HashMap<>(); + private final String name; + private final int crystalLevel; + private final int activationCost; + private final RitualRenderer renderer; + private final String unlocalizedName; + + public Ritual(String name, int crystalLevel, int activationCost, RitualRenderer renderer, String unlocalizedName) + { + this.name = name; + this.crystalLevel = crystalLevel; + this.activationCost = activationCost; + this.renderer = renderer; + this.unlocalizedName = unlocalizedName; + } + + /** + * @param name - The name of the ritual + * @param crystalLevel - Required Activation Crystal tier + * @param activationCost - Base LP cost for activating the ritual + */ + public Ritual(String name, int crystalLevel, int activationCost, String unlocalizedName) + { + this(name, crystalLevel, activationCost, null, unlocalizedName); + } + + public void readFromNBT(CompoundNBT tag) + { + ListNBT tags = tag.getList("areas", 10); + if (tags.isEmpty()) + { + return; + } + + for (int i = 0; i < tags.size(); i++) + { + CompoundNBT newTag = tags.getCompound(i); + String rangeKey = newTag.getString("key"); + + CompoundNBT storedTag = newTag.getCompound("area"); + AreaDescriptor desc = this.getBlockRange(rangeKey); + if (desc != null) + { + desc.readFromNBT(storedTag); + } + } + } + + public void writeToNBT(CompoundNBT tag) + { + ListNBT tags = new ListNBT(); + + for (Entry entry : modableRangeMap.entrySet()) + { + CompoundNBT newTag = new CompoundNBT(); + newTag.putString("key", entry.getKey()); + CompoundNBT storedTag = new CompoundNBT(); + + entry.getValue().writeToNBT(storedTag); + + newTag.put("area", storedTag); + + tags.add(newTag); + } + + tag.put("areas", tags); + } + + /** + * Called when the player attempts to activate the ritual. + *

    + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} + * + * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is + * bound to + * @param player - The activating player + * @param owner - Owner of the crystal activating this ritual, or + * the current owner of the ritual if being + * reactivated. + * @return - Whether activation was successful + */ + public boolean activateRitual(IMasterRitualStone masterRitualStone, PlayerEntity player, UUID owner) + { + return true; + } + + /** + * Called every {@link #getRefreshTime()} ticks while active. + *

    + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)} + * + * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is + * bound to + */ + public abstract void performRitual(IMasterRitualStone masterRitualStone); + + /** + * Called when the ritual is stopped for a given {@link Ritual.BreakType}. + *

    + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)} + * + * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is + * bound to + * @param breakType - The type of break that caused the stoppage. + */ + public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType) + { + + } + + /** + * Used to set the amount of LP drained every {@link #getRefreshTime()} ticks. + * + * @return - The amount of LP drained per refresh + */ + public abstract int getRefreshCost(); + + /** + * Used to set the refresh rate of the ritual. (How often + * {@link #performRitual(IMasterRitualStone)} is called. + * + * @return - How often to perform the effect in ticks. + */ + public int getRefreshTime() + { + return 20; + } + + public void addBlockRange(String range, AreaDescriptor defaultRange) + { + modableRangeMap.put(range, defaultRange); + } + + /** + * Used to grab the range of a ritual for a given effect. + * + * @param range - Range that needs to be pulled. + * @return - + */ + public AreaDescriptor getBlockRange(String range) + { + if (modableRangeMap.containsKey(range)) + { + return modableRangeMap.get(range); + } + + return null; + } + + public List getListOfRanges() + { + return new ArrayList<>(modableRangeMap.keySet()); + } + + public String getNextBlockRange(String range) + { + List rangeList = getListOfRanges(); + + if (rangeList.isEmpty()) + { + return ""; + } + + if (!rangeList.contains(range)) + { + return rangeList.get(0); + } + + boolean hasMatch = false; + + for (String rangeCheck : rangeList) + { + if (hasMatch) + { + return rangeCheck; + } else if (rangeCheck.equals(range)) + { + hasMatch = true; + } + } + + return rangeList.get(0); + } + + public EnumReaderBoundaries canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) + { + List willConfig = master.getActiveWillConfig(); + int maxVolume = getMaxVolumeForRange(range, willConfig, holder); + int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder); + int maxHorizontal = getMaxHorizontalRadiusForRange(range, willConfig, holder); + + return (maxVolume <= 0 || descriptor.getVolumeForOffsets(offset1, offset2) <= maxVolume) + ? descriptor.isWithinRange(offset1, offset2, maxVertical, maxHorizontal) ? EnumReaderBoundaries.SUCCESS + : EnumReaderBoundaries.NOT_WITHIN_BOUNDARIES + : EnumReaderBoundaries.VOLUME_TOO_LARGE; + } + + protected void setMaximumVolumeAndDistanceOfRange(String range, int volume, int horizontalRadius, int verticalRadius) + { + volumeRangeMap.put(range, volume); + horizontalRangeMap.put(range, horizontalRadius); + verticalRangeMap.put(range, verticalRadius); + } + + protected boolean checkDescriptorIsWithinRange(AreaDescriptor descriptor, int maxVolume, int maxHorizontal, int maxVertical) + { + return descriptor.getVolume() <= maxVolume && descriptor.isWithinRange(maxVertical, maxHorizontal); + } + + public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) + { + return volumeRangeMap.get(range); + } + + public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) + { + return verticalRangeMap.get(range); + } + + public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) + { + return horizontalRangeMap.get(range); + } + + public ITextComponent getErrorForBlockRangeOnFail(PlayerEntity player, String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) + { + AreaDescriptor descriptor = this.getBlockRange(range); + if (descriptor == null) + { + return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", "?"); + } + + List willConfig = master.getActiveWillConfig(); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(master.getWorldObj(), master.getBlockPos()); + + int maxVolume = this.getMaxVolumeForRange(range, willConfig, holder); + int maxVertical = this.getMaxVerticalRadiusForRange(range, willConfig, holder); + int maxHorizontal = this.getMaxHorizontalRadiusForRange(range, willConfig, holder); + + if (maxVolume > 0 && descriptor.getVolumeForOffsets(offset1, offset2) > maxVolume) + { + return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume); + } else + { + return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVertical, maxHorizontal); + } + } + + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) + { + return new ITextComponent[] + { new TranslationTextComponent(this.getTranslationKey() + ".info") }; + } + + public ITextComponent provideInformationOfRangeToPlayer(PlayerEntity player, String range) + { + if (getListOfRanges().contains(range)) + { + return new TranslationTextComponent(this.getTranslationKey() + "." + range + ".info"); + } else + { + return new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"); + } + } + + public abstract void gatherComponents(Consumer components); + + protected final void addRune(Consumer components, int offset1, int y, int offset2, EnumRuneType rune) + { + components.accept(new RitualComponent(new BlockPos(offset1, y, offset2), rune)); + } + + protected final void addOffsetRunes(Consumer components, int offset1, int offset2, int y, EnumRuneType rune) + { + addRune(components, offset1, y, offset2, rune); + addRune(components, offset2, y, offset1, rune); + addRune(components, offset1, y, -offset2, rune); + addRune(components, -offset2, y, offset1, rune); + addRune(components, -offset1, y, offset2, rune); + addRune(components, offset2, y, -offset1, rune); + addRune(components, -offset1, y, -offset2, rune); + addRune(components, -offset2, y, -offset1, rune); + } + + protected final void addCornerRunes(Consumer components, int offset, int y, EnumRuneType rune) + { + addRune(components, offset, y, offset, rune); + addRune(components, offset, y, -offset, rune); + addRune(components, -offset, y, -offset, rune); + addRune(components, -offset, y, offset, rune); + } + + protected final void addParallelRunes(Consumer components, int offset, int y, EnumRuneType rune) + { + addRune(components, offset, y, 0, rune); + addRune(components, -offset, y, 0, rune); + addRune(components, 0, y, -offset, rune); + addRune(components, 0, y, offset, rune); + } + + public double getWillRespectingConfig(World world, BlockPos pos, EnumDemonWillType type, List willConfig) + { + return willConfig.contains(type) ? WorldDemonWillHandler.getCurrentWill(world, pos, type) : 0; + } + + public abstract Ritual getNewCopy(); + + public String getName() + { + return name; + } + + public int getCrystalLevel() + { + return crystalLevel; + } + + public int getActivationCost() + { + return activationCost; + } + + public RitualRenderer getRenderer() + { + return renderer; + } + + public String getTranslationKey() + { + return unlocalizedName; + } + + public Map getModableRangeMap() + { + return modableRangeMap; + } + + public Map getVolumeRangeMap() + { + return volumeRangeMap; + } + + public Map getHorizontalRangeMap() + { + return horizontalRangeMap; + } + + public Map getVerticalRangeMap() + { + return verticalRangeMap; + } + + @Override + public String toString() + { + return new ToStringBuilder(this).append("name", name).append("crystalLevel", crystalLevel).append("activationCost", activationCost).append("renderer", renderer).append("unlocalizedName", unlocalizedName).append("modableRangeMap", modableRangeMap).append("volumeRangeMap", volumeRangeMap).append("horizontalRangeMap", horizontalRangeMap).append("verticalRangeMap", verticalRangeMap).append("refreshTime", getRefreshTime()).append("listOfRanges", getListOfRanges()).toString(); + } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (!(o instanceof Ritual)) + return false; + + Ritual ritual = (Ritual) o; + + if (crystalLevel != ritual.crystalLevel) + return false; + if (activationCost != ritual.activationCost) + return false; + if (name != null ? !name.equals(ritual.name) : ritual.name != null) + return false; + return unlocalizedName != null ? unlocalizedName.equals(ritual.unlocalizedName) + : ritual.unlocalizedName == null; + } + + @Override + public int hashCode() + { + int result = name != null ? name.hashCode() : 0; + result = 31 * result + crystalLevel; + result = 31 * result + activationCost; + result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); + return result; + } + + public enum BreakType + { + REDSTONE, BREAK_MRS, BREAK_STONE, ACTIVATE, DEACTIVATE, EXPLOSION, + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java new file mode 100644 index 00000000..0f34813f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java @@ -0,0 +1,70 @@ +package wayoftime.bloodmagic.ritual; + +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; + +/** + * Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage + * in Ritual creation. + */ +public class RitualComponent +{ + private final BlockPos offset; + private final EnumRuneType runeType; + + public RitualComponent(BlockPos offset, EnumRuneType runeType) + { + this.offset = offset; + this.runeType = runeType; + } + + public int getX(Direction direction) + { + switch (direction) + { + case EAST: + return -this.getOffset().getZ(); + case SOUTH: + return -this.getOffset().getX(); + case WEST: + return this.getOffset().getZ(); + default: + return this.getOffset().getX(); + } + } + + public int getY() + { + return this.getOffset().getY(); + } + + public int getZ(Direction direction) + { + switch (direction) + { + case EAST: + return this.getOffset().getX(); + case SOUTH: + return -this.getOffset().getZ(); + case WEST: + return -this.getOffset().getX(); + default: + return this.getOffset().getZ(); + } + } + + public BlockPos getOffset(Direction direction) + { + return new BlockPos(getX(direction), offset.getY(), getZ(direction)); + } + + public BlockPos getOffset() + { + return offset; + } + + public EnumRuneType getRuneType() + { + return runeType; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java new file mode 100644 index 00000000..92b29583 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java @@ -0,0 +1,177 @@ +package wayoftime.bloodmagic.ritual; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + +import net.minecraft.block.BlockState; +import net.minecraft.util.DamageSource; +import net.minecraftforge.fml.ModList; +import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual; +import wayoftime.bloodmagic.util.BMLog; + +public class RitualManager +{ + public static final DamageSource RITUAL_DAMAGE = new DamageSource("ritual_damage").setDamageBypassesArmor(); + + private final Map rituals; + private final Map ritualsReverse; + private final List sortedRituals; + private final Map imperfectRituals; + private final Map imperfectRitualsReverse; +// private final Configuration config; + + public RitualManager() + { + this.rituals = Maps.newTreeMap(); + this.ritualsReverse = Maps.newHashMap(); + this.sortedRituals = Lists.newArrayList(); + this.imperfectRituals = Maps.newTreeMap(); + this.imperfectRitualsReverse = Maps.newHashMap(); +// this.config = config; + } + +// public void discover(ASMDataTable dataTable) + public void discover() + { + ModList.get().getAllScanData().forEach(scan -> { + scan.getAnnotations().forEach(a -> { + if (a.getAnnotationType().getClassName().equals(RitualRegister.class.getName())) + { + try + { + + Class clazz = Class.forName(a.getClassType().getClassName()); + RitualRegister ritualRegister = clazz.getAnnotation(RitualRegister.class); + String id = ritualRegister.value(); + if (Ritual.class.isAssignableFrom(clazz)) + { + Ritual ritual = (Ritual) clazz.newInstance(); + rituals.put(id, ritual); + ritualsReverse.put(ritual, id); + BMLog.DEBUG.info("Registered ritual {}", id); + } else + { + BMLog.DEFAULT.error("Error creating ritual instance for {}.", id); + } + } catch (Exception e) + { + e.printStackTrace(); + } + } + }); + }); + + ModList.get().getAllScanData().forEach(scan -> { + scan.getAnnotations().forEach(a -> { + if (a.getAnnotationType().getClassName().equals(RitualRegister.Imperfect.class.getName())) + { + try + { + + Class clazz = Class.forName(a.getClassType().getClassName()); + RitualRegister.Imperfect ritualRegister = clazz.getAnnotation(RitualRegister.Imperfect.class); + String id = ritualRegister.value(); + if (ImperfectRitual.class.isAssignableFrom(clazz)) + { + ImperfectRitual ritual = (ImperfectRitual) clazz.newInstance(); + imperfectRituals.put(id, ritual); + imperfectRitualsReverse.put(ritual, id); + BMLog.DEBUG.info("Registered imperfect ritual {}", id); + } else + { + BMLog.DEFAULT.error("Error creating imperfect ritual instance for {}.", id); + } + } catch (Exception e) + { + e.printStackTrace(); + } + } + }); + }); + +// syncConfig(); + + // Sort rituals + sortedRituals.addAll(rituals.values()); + // Oh dear this is probably so slow + sortedRituals.sort((o1, o2) -> { + Set components = Sets.newHashSet(); + o1.gatherComponents(components::add); + int initialSize = components.size(); + components.clear(); + o2.gatherComponents(components::add); + return Integer.compare(initialSize, components.size()); + }); + } + + public Ritual getRitual(String id) + { + return rituals.get(id); + } + + public String getId(Ritual ritual) + { + return ritualsReverse.get(ritual); + } + + public ImperfectRitual getImperfectRitual(BlockState state) + { + for (ImperfectRitual ritual : imperfectRituals.values()) if (ritual.getBlockRequirement().test(state)) + return ritual; + + return null; + } + + public String getId(ImperfectRitual ritual) + { + return imperfectRitualsReverse.get(ritual); + } + + public Collection getRituals() + { + return rituals.values(); + } + + public Collection getImperfectRituals() + { + return imperfectRituals.values(); + } + + public List getSortedRituals() + { + return sortedRituals; + } + +// public void syncConfig() +// { +// config.addCustomCategoryComment("rituals", "Toggles for all rituals"); +// rituals.forEach((k, v) -> config.getBoolean(k, "rituals", true, "Enable the " + k + " ritual.")); +// imperfectRituals.forEach((k, v) -> config.getBoolean(k, "rituals.imperfect", true, "Enable the " + k + " imperfect ritual.")); +// config.save(); +// } +// + public boolean enabled(String id, boolean imperfect) + { + return id != null; +// return id != null && config.getBoolean(id, "rituals" + (imperfect ? ".imperfect" : ""), true, ""); + } +// +// public Configuration getConfig() +// { +// return config; +// } + + public static class BadRitualException extends RuntimeException + { + public BadRitualException(String message) + { + super(message); + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java new file mode 100644 index 00000000..56527fa6 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java @@ -0,0 +1,58 @@ +package wayoftime.bloodmagic.ritual; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.function.Function; + +import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface RitualRegister +{ + String value(); + + Class, Ritual>> factory() default DefaultRitualFactory.class; + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.TYPE) + @interface Imperfect + { + + String value(); + + Class, ImperfectRitual>> factory() default DefaultImperfectRitualFactory.class; + } + + class DefaultRitualFactory implements Function, Ritual> + { + @Override + public Ritual apply(Class aClass) + { + try + { + return aClass.newInstance(); + } catch (Exception e) + { + return null; + } + } + } + + class DefaultImperfectRitualFactory implements Function, ImperfectRitual> + { + @Override + public ImperfectRitual apply(Class aClass) + { + try + { + return aClass.newInstance(); + } catch (Exception e) + { + return null; + } + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java new file mode 100644 index 00000000..a2172c45 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java @@ -0,0 +1,14 @@ +package wayoftime.bloodmagic.ritual; + +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public abstract class RitualRenderer +{ + public abstract void renderAt(IMasterRitualStone masterRitualStone, double x, double y, double z); + + protected void bindTexture(ResourceLocation resourceLocation) + { + Minecraft.getInstance().getTextureManager().bindTexture(resourceLocation); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java new file mode 100644 index 00000000..856f5c60 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java @@ -0,0 +1,20 @@ +package wayoftime.bloodmagic.ritual.imperfect; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +/** + * This interface is for internal implementation only. + *

    + * It is provided via the API for easy obtaining of basic data. + */ +public interface IImperfectRitualStone +{ + + boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, PlayerEntity player); + + World getRitualWorld(); + + BlockPos getRitualPos(); +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java new file mode 100644 index 00000000..6fe28e1f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java @@ -0,0 +1,108 @@ +package wayoftime.bloodmagic.ritual.imperfect; + +import java.util.function.Predicate; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.world.World; + +/** + * Abstract class for creating new imperfect rituals. To register, annotate your + * class with {@link WayofTime.bloodmagic.ritual.RitualRegister.Imperfect} + */ +public abstract class ImperfectRitual +{ + + private final String name; + private final Predicate blockRequirement; + private final int activationCost; + private final boolean lightShow; + private final String unlocalizedName; + + public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, boolean lightShow, String unlocalizedName) + { + this.name = name; + this.blockRequirement = blockRequirement; + this.activationCost = activationCost; + this.lightShow = lightShow; + this.unlocalizedName = unlocalizedName; + } + + /** + * @param name The name of the ritual + * @param blockRequirement The block required above the ImperfectRitualStone + * @param activationCost Base LP cost for activating the ritual + */ + public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, String unlocalizedName) + { + this(name, blockRequirement, activationCost, false, unlocalizedName); + } + + /** + * Called when the player activates the ritual + * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, PlayerEntity)} + * + * @param imperfectRitualStone - The {@link IImperfectRitualStone} that the + * ritual is bound to + * @param player - The player activating the ritual + * @return - Whether activation was successful + */ + public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player); + + public String getName() + { + return name; + } + + public Predicate getBlockRequirement() + { + return blockRequirement; + } + + public int getActivationCost() + { + return activationCost; + } + + public boolean isLightShow() + { + return lightShow; + } + + public String getTranslationKey() + { + return unlocalizedName; + } + + @Override + public String toString() + { + return getName() + "@" + getActivationCost(); + } + + @Override + public boolean equals(Object o) + { + if (this == o) + return true; + if (!(o instanceof ImperfectRitual)) + return false; + + ImperfectRitual that = (ImperfectRitual) o; + + if (activationCost != that.activationCost) + return false; + if (name != null ? !name.equals(that.name) : that.name != null) + return false; + return unlocalizedName != null ? unlocalizedName.equals(that.unlocalizedName) : that.unlocalizedName == null; + } + + @Override + public int hashCode() + { + int result = name != null ? name.hashCode() : 0; + result = 31 * result + activationCost; + result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); + return result; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java new file mode 100644 index 00000000..aa7d230f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java @@ -0,0 +1,85 @@ +package wayoftime.bloodmagic.ritual.types; + +import java.util.function.Consumer; + +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.ritual.AreaDescriptor; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.ritual.RitualRegister; + +@RitualRegister("water") +public class RitualWater extends Ritual +{ + public static final String WATER_RANGE = "waterRange"; + + public RitualWater() + { + super("ritualWater", 0, 500, "ritual." + BloodMagic.MODID + ".waterRitual"); + addBlockRange(WATER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); + setMaximumVolumeAndDistanceOfRange(WATER_RANGE, 9, 3, 3); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + int maxEffects = currentEssence / getRefreshCost(); + int totalEffects = 0; + + AreaDescriptor waterRange = masterRitualStone.getBlockRange(WATER_RANGE); + + for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos())) + { + if (world.isAirBlock(newPos)) + { + world.setBlockState(newPos, Blocks.WATER.getDefaultState()); + totalEffects++; + } + + if (totalEffects >= maxEffects) + { + break; + } + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); + } + + @Override + public int getRefreshTime() + { + return 1; + } + + @Override + public int getRefreshCost() + { + return 25; + } + + @Override + public void gatherComponents(Consumer components) + { + addCornerRunes(components, 1, 0, EnumRuneType.WATER); + } + + @Override + public Ritual getNewCopy() + { + return new RitualWater(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java new file mode 100644 index 00000000..5e6083b7 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java @@ -0,0 +1,566 @@ +package wayoftime.bloodmagic.tile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import javax.annotation.Nullable; + +import com.google.common.base.Strings; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.registries.ObjectHolder; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.item.ItemActivationCrystal; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.core.data.SoulNetwork; +import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; +import wayoftime.bloodmagic.event.RitualEvent; +import wayoftime.bloodmagic.iface.IBindable; +import wayoftime.bloodmagic.ritual.AreaDescriptor; +import wayoftime.bloodmagic.ritual.EnumReaderBoundaries; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.tile.base.TileTicking; +import wayoftime.bloodmagic.util.ChatUtil; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.helper.BindableHelper; +import wayoftime.bloodmagic.util.helper.NBTHelper; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; +import wayoftime.bloodmagic.util.helper.RitualHelper; +import wayoftime.bloodmagic.will.DemonWillHolder; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone +{ + @ObjectHolder("bloodmagic:masterritualstone") + public static TileEntityType TYPE; + protected final Map modableRangeMap = new HashMap<>(); + private UUID owner; + private SoulNetwork cachedNetwork; + private boolean active; + private boolean redstoned; + private int activeTime; + private int cooldown; + private Ritual currentRitual; + private Direction direction = Direction.NORTH; + private boolean inverted; + private List currentActiveWillConfig = new ArrayList<>(); + + public TileMasterRitualStone(TileEntityType type) + { + super(type); + } + + public TileMasterRitualStone() + { + this(TYPE); + } + + @Override + public void onUpdate() + { + if (getWorld().isRemote) + return; + + if (isPowered() && isActive()) + { + active = false; + redstoned = true; + stopRitual(Ritual.BreakType.REDSTONE); + return; + } + + if (!isActive() && !isPowered() && isRedstoned() && getCurrentRitual() != null) + { + active = true; + ItemStack crystalStack = NBTHelper.checkNBT(ItemActivationCrystal.CrystalType.getStack(getCurrentRitual().getCrystalLevel())); + BindableHelper.applyBinding(crystalStack, new Binding(owner, PlayerHelper.getUsernameFromUUID(owner))); + activateRitual(crystalStack, null, getCurrentRitual()); + redstoned = false; + } + + if (getCurrentRitual() != null && isActive()) + { + if (activeTime % getCurrentRitual().getRefreshTime() == 0) + performRitual(getWorld(), getPos()); + + activeTime++; + } + } + + @Override + public void deserialize(CompoundNBT tag) + { + owner = tag.hasUniqueId("owner") ? tag.getUniqueId("owner") : null; + if (owner != null) + cachedNetwork = NetworkHelper.getSoulNetwork(owner); + currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); + if (currentRitual != null) + { + CompoundNBT ritualTag = tag.getCompound(Constants.NBT.CURRENT_RITUAL_TAG); + if (!ritualTag.isEmpty()) + { + currentRitual.readFromNBT(ritualTag); + } + } + active = tag.getBoolean(Constants.NBT.IS_RUNNING); + activeTime = tag.getInt(Constants.NBT.RUNTIME); + direction = Direction.values()[tag.getInt(Constants.NBT.DIRECTION)]; + redstoned = tag.getBoolean(Constants.NBT.IS_REDSTONED); + + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + if (tag.getBoolean("EnumWill" + type)) + { + currentActiveWillConfig.add(type); + } + } + } + + @Override + public CompoundNBT serialize(CompoundNBT tag) + { + String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); + if (owner != null) + tag.putUniqueId("owner", owner); + tag.putString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); + if (currentRitual != null) + { + CompoundNBT ritualTag = new CompoundNBT(); + currentRitual.writeToNBT(ritualTag); + tag.put(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); + } + tag.putBoolean(Constants.NBT.IS_RUNNING, isActive()); + tag.putInt(Constants.NBT.RUNTIME, getActiveTime()); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putBoolean(Constants.NBT.IS_REDSTONED, redstoned); + + for (EnumDemonWillType type : currentActiveWillConfig) + { + tag.putBoolean("EnumWill" + type, true); + } + + return tag; + } + + @Override + public boolean activateRitual(ItemStack activationCrystal, @Nullable PlayerEntity activator, Ritual ritual) + { + if (PlayerHelper.isFakePlayer(activator)) + return false; + + Binding binding = ((IBindable) activationCrystal.getItem()).getBinding(activationCrystal); + if (binding != null && ritual != null) + { + if (activationCrystal.getItem() instanceof ItemActivationCrystal) + { + int crystalLevel = ((ItemActivationCrystal) activationCrystal.getItem()).getCrystalLevel(activationCrystal); + if (RitualHelper.canCrystalActivate(ritual, crystalLevel)) + { + if (!getWorld().isRemote) + { + SoulNetwork network = NetworkHelper.getSoulNetwork(binding); + + if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() + && (activator != null && !activator.isCreative())) + { + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.weak"), true); + return false; + } + + if (currentRitual != null) + currentRitual.stopRitual(this, Ritual.BreakType.ACTIVATE); + + RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, binding.getOwnerId(), ritual, activator, activationCrystal, crystalLevel); + + if (MinecraftForge.EVENT_BUS.post(event)) + { + if (activator != null) + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.prevent"), true); + return false; + } + + if (ritual.activateRitual(this, activator, binding.getOwnerId())) + { + if (!isRedstoned() && (activator != null && !activator.isCreative())) + network.syphon(ticket(ritual.getActivationCost())); + + if (activator != null) + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.activate"), true); + + this.active = true; + this.owner = binding.getOwnerId(); + this.cachedNetwork = network; + this.currentRitual = ritual; + + if (!checkBlockRanges(ritual.getModableRangeMap())) + addBlockRanges(ritual.getModableRangeMap()); + + notifyUpdate(); + return true; + } + } + + notifyUpdate(); + return true; + } + } + } else + { + if (activator != null) + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + } + + return false; + } + + @Override + public void performRitual(World world, BlockPos pos) + { + if (!world.isRemote && getCurrentRitual() != null + && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(currentRitual), false)) + { + if (RitualHelper.checkValidRitual(getWorld(), getPos(), currentRitual, getDirection())) + { + Ritual ritual = getCurrentRitual(); + RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), ritual); + + if (MinecraftForge.EVENT_BUS.post(event)) + return; + + if (!checkBlockRanges(getCurrentRitual().getModableRangeMap())) + addBlockRanges(getCurrentRitual().getModableRangeMap()); + + getCurrentRitual().performRitual(this); + } else + { + stopRitual(Ritual.BreakType.BREAK_STONE); + } + } + } + + @Override + public void stopRitual(Ritual.BreakType breakType) + { + if (!getWorld().isRemote && getCurrentRitual() != null) + { + RitualEvent.RitualStopEvent event = new RitualEvent.RitualStopEvent(this, getOwner(), getCurrentRitual(), breakType); + + if (MinecraftForge.EVENT_BUS.post(event)) + return; + + getCurrentRitual().stopRitual(this, breakType); + if (breakType != Ritual.BreakType.REDSTONE) + { + this.currentRitual = null; + this.active = false; + this.activeTime = 0; + } + notifyUpdate(); + } + } + + @Override + public int getCooldown() + { + return cooldown; + } + + @Override + public void setCooldown(int cooldown) + { + this.cooldown = cooldown; + } + + @Override + public Direction getDirection() + { + return direction; + } + + public void setDirection(Direction direction) + { + this.direction = direction; + } + + @Override + public boolean areTanksEmpty() + { + return false; + } + + @Override + public int getRunningTime() + { + return activeTime; + } + + @Override + public UUID getOwner() + { + return owner; + } + + public void setOwner(UUID owner) + { + this.owner = owner; + } + + @Override + public SoulNetwork getOwnerNetwork() + { + return cachedNetwork; + } + + @Override + public World getWorld() + { + return super.getWorld(); + } + + @Override + public BlockPos getPos() + { + return super.getPos(); + } + + @Override + public World getWorldObj() + { + return getWorld(); + } + + @Override + public BlockPos getBlockPos() + { + return getPos(); + } + + @Override + public String getNextBlockRange(String range) + { + if (this.currentRitual != null) + { + return this.currentRitual.getNextBlockRange(range); + } + + return ""; + } + + @Override + public void provideInformationOfRitualToPlayer(PlayerEntity player) + { + if (this.currentRitual != null) + { + ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRitualToPlayer(player)); + } + } + + @Override + public void provideInformationOfRangeToPlayer(PlayerEntity player, String range) + { + if (this.currentRitual != null && this.currentRitual.getListOfRanges().contains(range)) + { + ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRangeToPlayer(player, range)); + } + } + + @Override + public void setActiveWillConfig(PlayerEntity player, List typeList) + { + this.currentActiveWillConfig = typeList; + } + + @Override + public EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2) + { + AreaDescriptor descriptor = this.getBlockRange(range); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos()); + + EnumReaderBoundaries modificationType = currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder); + if (modificationType == EnumReaderBoundaries.SUCCESS) + descriptor.modifyAreaByBlockPositions(offset1, offset2); + + return modificationType; + } + + @Override + public List getActiveWillConfig() + { + return new ArrayList<>(currentActiveWillConfig); + } + + @Override + public void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList) + { + // There is probably an easier way to make expanded chat messages + if (typeList.size() >= 1) + { + Object[] translations = new TranslationTextComponent[typeList.size()]; + StringBuilder constructedString = new StringBuilder("%s"); + + for (int i = 1; i < typeList.size(); i++) + { + constructedString.append(", %s"); + } + + for (int i = 0; i < typeList.size(); i++) + { + translations[i] = new TranslationTextComponent("tooltip.bloodmagic.currentBaseType." + typeList.get(i).name.toLowerCase()); + } + + ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.set", new TranslationTextComponent(constructedString.toString(), translations))); + } else + { + ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.void")); + } + } + + public boolean isPowered() + { + if (inverted) + return !getWorld().isBlockPowered(getPos()); + + return getWorld().isBlockPowered(getPos()); + } + + public SoulNetwork getCachedNetwork() + { + return cachedNetwork; + } + + public void setCachedNetwork(SoulNetwork cachedNetwork) + { + this.cachedNetwork = cachedNetwork; + } + + public boolean isActive() + { + return active; + } + + @Override + public void setActive(boolean active) + { + this.active = active; + } + + public boolean isRedstoned() + { + return redstoned; + } + + public void setRedstoned(boolean redstoned) + { + this.redstoned = redstoned; + } + + public int getActiveTime() + { + return activeTime; + } + + public void setActiveTime(int activeTime) + { + this.activeTime = activeTime; + } + + public Ritual getCurrentRitual() + { + return currentRitual; + } + + public void setCurrentRitual(Ritual currentRitual) + { + this.currentRitual = currentRitual; + } + + public boolean isInverted() + { + return inverted; + } + + public void setInverted(boolean inverted) + { + this.inverted = inverted; + } + + public List getCurrentActiveWillConfig() + { + return currentActiveWillConfig; + } + + public void setCurrentActiveWillConfig(List currentActiveWillConfig) + { + this.currentActiveWillConfig = currentActiveWillConfig; + } + + /** + * Used to grab the range of a ritual for a given effect. + * + * @param range - Range that needs to be pulled. + * @return - + */ + public AreaDescriptor getBlockRange(String range) + { + if (modableRangeMap.containsKey(range)) + { + return modableRangeMap.get(range); + } + + return null; + } + + @Override + public void addBlockRange(String range, AreaDescriptor defaultRange) + { + modableRangeMap.putIfAbsent(range, defaultRange.copy()); + } + + @Override + public void addBlockRanges(Map blockRanges) + { + for (Map.Entry entry : blockRanges.entrySet()) + { + modableRangeMap.putIfAbsent(entry.getKey(), entry.getValue().copy()); + } + } + + @Override + public void setBlockRange(String range, AreaDescriptor defaultRange) + { + modableRangeMap.put(range, defaultRange.copy()); + } + + @Override + public void setBlockRanges(Map blockRanges) + { + for (Map.Entry entry : blockRanges.entrySet()) + { + modableRangeMap.put(entry.getKey(), entry.getValue().copy()); + } + } + + public boolean checkBlockRanges(Map blockRanges) + { + for (Map.Entry entry : blockRanges.entrySet()) + { + if (modableRangeMap.get(entry.getKey()) == null) + return false; + } + return true; + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java b/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java new file mode 100644 index 00000000..545dec20 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java @@ -0,0 +1,71 @@ +package wayoftime.bloodmagic.tile.base; + +import net.minecraft.client.renderer.texture.ITickable; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.TileEntityType; + +/** + * Base class for tiles that tick. Allows disabling the ticking + * programmatically. + */ +// TODO - Move implementations that depend on existed ticks to new methods from here. +public abstract class TileTicking extends TileBase implements ITickable +{ + private int ticksExisted; + private boolean shouldTick = true; + + public TileTicking(TileEntityType type) + { + super(type); + } + + @Override + public final void tick() + { + if (shouldTick()) + { + ticksExisted++; + onUpdate(); + } + } + + @Override + void deserializeBase(CompoundNBT tagCompound) + { + this.ticksExisted = tagCompound.getInt("ticksExisted"); + this.shouldTick = tagCompound.getBoolean("shouldTick"); + } + + @Override + CompoundNBT serializeBase(CompoundNBT tagCompound) + { + tagCompound.putInt("ticksExisted", getTicksExisted()); + tagCompound.putBoolean("shouldTick", shouldTick()); + return tagCompound; + } + + /** + * Called every tick that {@link #shouldTick()} is true. + */ + public abstract void onUpdate(); + + public int getTicksExisted() + { + return ticksExisted; + } + + public void resetLifetime() + { + ticksExisted = 0; + } + + public boolean shouldTick() + { + return shouldTick; + } + + public void setShouldTick(boolean shouldTick) + { + this.shouldTick = shouldTick; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java new file mode 100644 index 00000000..3862d73a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java @@ -0,0 +1,253 @@ +package wayoftime.bloodmagic.util.helper; + +import java.util.List; + +import org.apache.commons.lang3.tuple.Pair; + +import com.google.common.collect.Lists; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; +import net.minecraftforge.common.util.LazyOptional; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BlockRitualStone; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IRitualStone; +import wayoftime.bloodmagic.ritual.IRitualStone.Tile; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.tile.TileMasterRitualStone; + +public class RitualHelper +{ + @CapabilityInject(IRitualStone.Tile.class) + static Capability RUNE_CAPABILITY = null; + + public static boolean canCrystalActivate(Ritual ritual, int crystalLevel) + { + return ritual.getCrystalLevel() <= crystalLevel + && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false); + } + + /** + * Checks the RitualRegistry to see if the configuration of the ritual stones in + * the world is valid for the given Direction. + * + * @param world - The world + * @param pos - Location of the MasterRitualStone + * @return The ID of the valid ritual + */ + public static String getValidRitual(World world, BlockPos pos) + { + for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) + { + for (int i = 0; i < 4; i++) + { + Direction direction = Direction.byHorizontalIndex(i); + + if (checkValidRitual(world, pos, ritual, direction)) + return BloodMagic.RITUAL_MANAGER.getId(ritual); + } + } + + return ""; + } + + public static Direction getDirectionOfRitual(World world, BlockPos pos, Ritual ritual) + { + for (int i = 0; i < 4; i++) + { + Direction direction = Direction.byHorizontalIndex(i); + if (checkValidRitual(world, pos, ritual, direction)) + return direction; + } + + return null; + } + + public static boolean checkValidRitual(World world, BlockPos pos, Ritual ritual, Direction direction) + { + if (ritual == null) + { + return false; + } + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + + for (RitualComponent component : components) + { + BlockPos newPos = pos.add(component.getOffset(direction)); + if (!isRuneType(world, newPos, component.getRuneType())) + return false; + } + + return true; + } + + public static boolean isRuneType(World world, BlockPos pos, EnumRuneType type) + { + if (world == null) + return false; + Block block = world.getBlockState(pos).getBlock(); + TileEntity tile = world.getTileEntity(pos); + + if (block instanceof IRitualStone) + return ((IRitualStone) block).isRuneType(world, pos, type); + else if (tile instanceof IRitualStone.Tile) + return ((IRitualStone.Tile) tile).isRuneType(type); + else if (tile != null && tile.getCapability(RUNE_CAPABILITY, null).isPresent()) + return tile.getCapability(RUNE_CAPABILITY, null).resolve().get().isRuneType(type); + + return false; + } + + public static boolean isRune(World world, BlockPos pos) + { + if (world == null) + return false; + Block block = world.getBlockState(pos).getBlock(); + TileEntity tile = world.getTileEntity(pos); + + if (block instanceof IRitualStone) + return true; + else if (tile instanceof IRitualStone.Tile) + return true; + else + return tile != null && tile.getCapability(RUNE_CAPABILITY, null).isPresent(); + + } + + public static void setRuneType(World world, BlockPos pos, EnumRuneType type) + { + if (world == null) + return; + BlockState state = world.getBlockState(pos); + TileEntity tile = world.getTileEntity(pos); + + if (state.getBlock() instanceof IRitualStone) + ((IRitualStone) state.getBlock()).setRuneType(world, pos, type); + else if (tile instanceof IRitualStone.Tile) + ((IRitualStone.Tile) tile).setRuneType(type); + else + { + LazyOptional cap = tile.getCapability(RUNE_CAPABILITY, null); + if (cap.isPresent()) + { + cap.resolve().get().setRuneType(type); + world.notifyBlockUpdate(pos, state, state, 3); + } + + } + } + + public static boolean createRitual(World world, BlockPos pos, Direction direction, Ritual ritual, boolean safe) + { + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + + if (abortConstruction(world, pos, direction, safe, components)) + return false; + + BlockState mrs = BloodMagicBlocks.MASTER_RITUAL_STONE.get().getDefaultState(); + world.setBlockState(pos, mrs); + + setRitualStones(direction, world, pos, components); + return true; + } + + public static boolean abortConstruction(World world, BlockPos pos, Direction direction, boolean safe, List components) + { + // TODO: can be optimized to check only for the first and last component if + // every ritual has those at the highest and lowest y-level respectivly. + for (RitualComponent component : components) + { + BlockPos offset = component.getOffset(direction); + BlockPos newPos = pos.add(offset); + if (world.isOutsideBuildHeight(newPos) || (safe && !world.isAirBlock(newPos))) + return true; + } + return false; + } + + public static boolean repairRitualFromRuins(TileMasterRitualStone tile, boolean safe) + { + Ritual ritual = tile.getCurrentRitual(); + Direction direction; + Pair pair; + if (ritual == null) + { + pair = getRitualFromRuins(tile); + ritual = pair.getKey(); + direction = pair.getValue(); + } else + direction = tile.getDirection(); + + World world = tile.getWorld(); + BlockPos pos = tile.getPos(); + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + + if (abortConstruction(world, pos, direction, safe, components)) + return false; + + setRitualStones(direction, world, pos, components); + return true; + } + + public static void setRitualStones(Direction direction, World world, BlockPos pos, List gatheredComponents) + { + for (RitualComponent component : gatheredComponents) + { + BlockPos offset = component.getOffset(direction); + BlockPos newPos = pos.add(offset); + ((BlockRitualStone) BloodMagicBlocks.BLANK_RITUAL_STONE.get()).setRuneType(world, newPos, component.getRuneType()); + } + } + + public static Pair getRitualFromRuins(TileMasterRitualStone tile) + { + BlockPos pos = tile.getPos(); + World world = tile.getWorld(); + Ritual possibleRitual = tile.getCurrentRitual(); + Direction possibleDirection = tile.getDirection(); + int highestCount = 0; + + if (possibleRitual == null || possibleDirection == null) + for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) + { + for (int i = 0; i < 4; i++) + { + Direction direction = Direction.byHorizontalIndex(i); + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + int currentCount = 0; + + for (RitualComponent component : components) + { + BlockPos newPos = pos.add(component.getOffset(direction)); + if (isRuneType(world, newPos, component.getRuneType())) + currentCount += 1; + } + if (currentCount > highestCount) + { + highestCount = currentCount; + possibleRitual = ritual; + possibleDirection = direction; + } + + } + + } + return Pair.of(possibleRitual, possibleDirection); + } +} From 446fe9cef773b912dbf45825bafc7ef062847d09 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 24 Oct 2020 14:53:54 -0400 Subject: [PATCH 345/493] rooBooli Fixed the improper files in the main directory so that they are not the default files from Forge. --- CREDITS.txt | 65 -- LICENSE | 87 ++ LICENSE.txt | 520 ------------ changelog.txt | 2261 ++++++++++++++++++++++++++----------------------- 4 files changed, 1295 insertions(+), 1638 deletions(-) delete mode 100644 CREDITS.txt create mode 100644 LICENSE delete mode 100644 LICENSE.txt diff --git a/CREDITS.txt b/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..264519f7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,87 @@ +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + +Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. +Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. +Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. +Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. +Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. +Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. +Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. +Licensor means the individual(s) or entity(ies) granting rights under this Public License. +Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. +Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. +You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. +Section 2 – Scope. + +License grant. +Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +reproduce and Share the Licensed Material, in whole or in part; and +produce, reproduce, and Share Adapted Material. +Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. +Term. The term of this Public License is specified in Section 6(a). +Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. +Downstream recipients. +Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. +No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. +No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). +Other rights. + +Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. +Patent and trademark rights are not licensed under this Public License. +To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + +Attribution. + +If You Share the Licensed Material (including in modified form), You must: + +retain the following if it is supplied by the Licensor with the Licensed Material: +identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); +a copyright notice; +a notice that refers to this Public License; +a notice that refers to the disclaimer of warranties; +a URI or hyperlink to the Licensed Material to the extent reasonably practicable; +indicate if You modified the Licensed Material and retain an indication of any previous modifications; and +indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. +You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. +If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. +If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + +for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; +if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and +You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +Section 5 – Disclaimer of Warranties and Limitation of Liability. + +Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. +To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. +The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. +Section 6 – Term and Termination. + +This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. +Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + +automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or +upon express reinstatement by the Licensor. +For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. +For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. +Sections 1, 5, 6, 7, and 8 survive termination of this Public License. +Section 7 – Other Terms and Conditions. + +The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. +Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. +Section 8 – Interpretation. + +For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. +To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. +No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. +Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/changelog.txt b/changelog.txt index 64fa0593..98c18c43 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,1053 +1,1208 @@ -Build: 1.16.3-34.1.0 - Thu Sep 24 07:05:13 GMT 2020 - lex: - Prep new RB. - -========= -Build: 1.16.3-34.0.21 - Thu Sep 24 06:46:57 GMT 2020 - ichttt: - Fix grass disappearing when alwaysSetupTerrainOffThread is true (#7291) - -========= -Build: 1.16.3-34.0.20 - Thu Sep 24 06:41:41 GMT 2020 - 35673674+alcatrazEscapee: - Accessors for inspecting and removal of biome generation settings. Fixed carvers still being immutable. (#7339) - -========= -Build: 1.16.3-34.0.19 - Thu Sep 24 06:36:25 GMT 2020 - lex: - Revive BiomeManager and BiomeLayer hooks. - -========= -Build: 1.16.3-34.0.18 - Thu Sep 24 03:12:19 GMT 2020 - richard: - Fix a few minor issues with custom tag types and fix OptionalNamedTags (#7316) - -========= -Build: 1.16.3-34.0.17 - Wed Sep 23 22:10:11 GMT 2020 - diesieben07: - Fix ToggleableKeyBinding differences to vanilla. (#7338) - -========= -Build: 1.16.3-34.0.16 - Wed Sep 23 21:34:47 GMT 2020 - Yunus1903: - Updated build badge versions to 1.16.3 in readme (#7325) - - diesieben07: - Fix forge light pipeline applying block offsets twice (#7323) - -========= -Build: 1.16.3-34.0.14 - Wed Sep 23 21:16:46 GMT 2020 - ichttt: - Add a better license error screen (#7350) - -========= -Build: 1.16.3-34.0.13 - Tue Sep 22 19:14:17 GMT 2020 - darklime: - Fixed container item being consumed in brewing stand. #7307 (#7314) - -========= -Build: 1.16.3-34.0.12 - Tue Sep 22 19:06:10 GMT 2020 - sciwhiz12: - Fix parse results of CommandEvent being disregarded (#7303) - -========= -Build: 1.16.3-34.0.11 - Tue Sep 22 18:58:28 GMT 2020 - 17338378+Nightenom: - [1.16] Fix possible crash when using rendering regionCache (#7207) - -========= -Build: 1.16.3-34.0.10 - Tue Sep 22 18:41:16 GMT 2020 - 35673674+alcatrazEscapee: - [1.16] Reimplement ICloudRenderHandler, ISkyRenderHandler and IWeatherRenderHandler (#6994) - -========= -Build: 1.16.3-34.0.9 - Fri Sep 18 00:58:08 GMT 2020 - 35673674+alcatrazEscapee: - Make Biome.Climate and BiomeAmbiance fields accessible (#7336) - -========= -Build: 1.16.3-34.0.8 - Thu Sep 17 20:42:53 GMT 2020 - cpw: - Use mixin 0.8.1. Should fix problems with mixin not working properly with latest modlauncher. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.0.7 - Tue Sep 15 20:07:25 GMT 2020 - sebastian: - Sets the empty/fill sounds for vanilla fluids. - Use Fluid's fillSound rather than emptySound when filling buckets. - -========= -Build: 1.16.3-34.0.6 - Tue Sep 15 19:47:08 GMT 2020 - cyborgmas18: - Add MatrixStack-aware alternatives to the methods in GuiUtils (#7127) - -========= -Build: 1.16.3-34.0.5 - Tue Sep 15 16:51:58 GMT 2020 - justin_wiblin: - Fix json biomes not setting registry name correctly for the BiomeLoadingEvent. (#7329) - -========= -Build: 1.16.3-34.0.4 - Tue Sep 15 14:18:16 GMT 2020 - David Quintana: - Fix inconsistencies in how the values from the model are passed into the baked model. - This puts them in line with vanilla, as intended. - -========= -Build: 1.16.3-34.0.3 - Tue Sep 15 13:23:05 GMT 2020 - Yunus1903: - Reimplemented drawHoveringText (#7268) - -========= -Build: 1.16.3-34.0.2 - Tue Sep 15 00:43:19 GMT 2020 - lex: - New BiomeLoadingEvent that allows modders to edit biomes as they are being deserialized. - -========= -Build: 1.16.3-34.0.1 - Fri Sep 11 15:55:28 GMT 2020 - lex: - Bump MCP version for lambda issue. - -========= -Build: 1.16.3-34.0.0 - Thu Sep 10 19:10:33 GMT 2020 - lex: - 1.16.3 Update - Also included a bunch of warning cleanups. - -========= -Build: 1.16.2-33.0.61 - Thu Sep 10 18:54:56 GMT 2020 - 42962686+RedstoneDubstep: - Fix tile entities being replaced when not needed. (#7318) - -========= -Build: 1.16.2-33.0.60 - Thu Sep 10 18:02:15 GMT 2020 - malte0811: - Fix exception when getting rendering box for tile entities with no collision boxes. (#7301) - -========= -Build: 1.16.2-33.0.59 - Wed Sep 09 23:05:21 GMT 2020 - cpw: - More crash reporting tweaks. Don't crash when trying to show warnings. Also, put the exception name in the error screen on the second line! - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.58 - Wed Sep 09 17:09:09 GMT 2020 - diesieben07: - Fix Minecart speed cap on rail being initialized to 0 (#7315) - -========= -Build: 1.16.2-33.0.57 - Wed Sep 09 02:10:45 GMT 2020 - richard: - Add support for custom tag types (#7289) - -========= -Build: 1.16.2-33.0.56 - Wed Sep 09 00:06:22 GMT 2020 - cpw: - More crash report tweaks. Put a button to open the generated crash report on the error screen, tweak formatting of crash report, and add the enhanced stack trace data (transformers et al) - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.55 - Tue Sep 08 21:00:19 GMT 2020 - championash5357: - New hook for better custom scaffolding movement (#7261) - -========= -Build: 1.16.2-33.0.54 - Tue Sep 08 20:47:48 GMT 2020 - mrtschipp: - Add partialTicks to RenderNameplateEvent (#7277) - - cyborgmas18: - Prevent duplicate wrapper tags from crashing (#7283) - - matthrewp: - Fix custom teleporters NPE (#7296) - - cyborgmas18: - Fixed crash with zip paths (#7300) - -========= -Build: 1.16.2-33.0.50 - Tue Sep 08 20:23:27 GMT 2020 - nrbeech: - Fixing logic in getCurrentRailPosition to correctly identify the rail… (#7276) - -========= -Build: 1.16.2-33.0.49 - Tue Sep 08 20:14:58 GMT 2020 - sciwhiz12: - Remove dead ForgeHooks.canToolHarvestBlock function. (#7262) - - sciwhiz12: - Bump resource pack version to 6 (#7299) - - Edwin.mindcraft: - [1.16.x] Fixes for Bamboo, Enchantments and Conduits, small adjustments to bring some patches closer to the vanilla code. (#7239) - -========= -Build: 1.16.2-33.0.46 - Tue Sep 08 19:50:14 GMT 2020 - championash5357: - Re-implement DrawHighlightEvent$HighlightEntity Firing (#7233) - -========= -Build: 1.16.2-33.0.45 - Tue Sep 08 19:25:58 GMT 2020 - ichttt: - Reimplement FarmlandWaterManager (#7213) - -========= -Build: 1.16.2-33.0.44 - Tue Sep 08 19:11:16 GMT 2020 - cyborgmas18: - Add dataprovider for Global Loot Modifiers (#6960) - -========= -Build: 1.16.2-33.0.43 - Tue Sep 08 19:01:09 GMT 2020 - ichttt: - Fix crash when dumping crash report for an exception that has a null cause (#7308) - -========= -Build: 1.16.2-33.0.42 - Mon Sep 07 01:29:40 GMT 2020 - cpw: - Tweak crash report dump to visit all the causes up to the top. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.41 - Sun Sep 06 23:39:13 GMT 2020 - cpw: - Fix ExplodedDirectoryLocator visiting non-existent paths. Closes #7203 - - Also, bump modlauncher to 7.0.1 to fix resources. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.40 - Sun Sep 06 22:08:22 GMT 2020 - cpw: - Use new enumeration mechanism in ModLauncher, to allow getResources to work. This enables serviceloader-in-mods, and other stuff that might need to visit multiple mod jars. Also, tweaked the visitor code slightly, may result in a trivial performance change. Closing #7302 as it's not really relevant any more. - - Signed-off-by: cpw - - cpw: - Park the polling thread for a bit, if we're not the one driving the task list forwards. This allows for the actual driver to work on low cpu count machines. - - Signed-off-by: cpw - - cpw: - Fix some potential issues in crash dumping during mod loading - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.37 - Thu Sep 03 16:37:38 GMT 2020 - cpw: - Fix compiler issue in eclipse properly - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.36 - Thu Sep 03 12:40:52 GMT 2020 - sciwhiz12: - Fix crash caused by previous commit (#7298) - -========= -Build: 1.16.2-33.0.35 - Thu Sep 03 04:15:27 GMT 2020 - lex: - Dirty casting hacks to fix eclipse compiler inference issue. I'm sorry cpw. - -========= -Build: 1.16.2-33.0.34 - Thu Sep 03 03:38:16 GMT 2020 - tterrag: - Fix broken ExistingFileHelper import - - Add licenses to some new files - - tterrag: - Add validation via resources for tag providers (#7271) - - BREAKING CHANGE: Moved ExistingFileHelper to common package - Remove various workarounds from forge tag providers - -========= -Build: 1.16.2-33.0.32 - Tue Sep 01 18:36:21 GMT 2020 - cpw: - Move the "modloading" thread activity onto _our_ worker pool. It turns out that the vanilla worker pool can deadlock during stitching if it's insufficiently large, if modloader "waitForTransition" is also a worker member of that pool. - - Closes #7293 (to reproduce issue easily, modify Util.func_240979_a_ and change the values in the MathHelper.clamp call). I've verified that 3 and below for "max" cause the problem. (I didn't test a whole range of values, just sufficient to reproduce problem and verify fix). Note that setting it to zero (and using the "direct executor" that's inaccessible in normal operation) works as well with this fix. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.31 - Tue Sep 01 02:27:07 GMT 2020 - cpw: - Fix missed debugging code. Read the config from the config. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.30 - Tue Sep 01 01:31:57 GMT 2020 - cpw: - Revert "Shut down all other mod handlers if the loading cycle errors. This prevents other mods from throwing errors and being blamed for initial cause. This is a temporary hack until cpw re-writes the mod event dispatcher." - - This reverts commit 7592bbe8 - - Signed-off-by: cpw - - cpw: - Revert "Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected." - - This reverts commit 30bad1e2 - - Signed-off-by: cpw - - cpw: - Redo event dispatch, removes a bunch of nonsense, and tries to integrate with the vanilla CF system where possible - - Signed-off-by: cpw - - cpw: - Fix up all the things. Removed SidedProvider because it served no real purpose anymore. - - Signed-off-by: cpw - - cpw: - Fix up slight registry change and other 1.16.2 stuffs. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.23 - Sun Aug 30 23:05:24 GMT 2020 - ichttt: - Add particle culling (#6981) - -========= -Build: 1.16.2-33.0.22 - Wed Aug 26 16:50:02 GMT 2020 - lex: - Wrap vanilla's 'default' biome registry in ForgeRegistry. - This should allow registering mod dimensions like in 1.16.1, while the data driven system is fleshed out. - -========= -Build: 1.16.2-33.0.21 - Tue Aug 25 01:11:38 GMT 2020 - David Quintana: - Clarify in the LazyOptional which methods carry the lazyness over to the returned value and which don't. (#6750) - - For consistency, this meant making a few changes: - - Renamed the existing lazy mapping method to lazyMap, to indicate that it doesn't run the mapping immediately. - - Added a new implementation of map(), which returns Optional, and resolves the value in the process. - - Changed filter() to return Optional, since there's no way to filter lazily. - - Added a new method resolve(), which helps convert the custom LazyOptional class into a standard Optional, for use - with library methods that expect Optional. - - * Update License headers. - -========= -Build: 1.16.2-33.0.20 - Fri Aug 21 21:27:21 GMT 2020 - sciwhiz12: - Add user-friendly exceptions when config loading fails (#7214) - -========= -Build: 1.16.2-33.0.19 - Fri Aug 21 18:53:46 GMT 2020 - dev: - Replace EntityHeight event with EntitySize event (#6858) - -========= -Build: 1.16.2-33.0.18 - Fri Aug 21 18:38:31 GMT 2020 - davide2910: - [1.16] ForgeEventFactory#canCreateFluidSource reintroduced (#7181) - -========= -Build: - Fri Aug 21 18:31:19 GMT 2020 - cyborgmas18: - Cleanup and expand Forge tags (#7004) - -========= -Build: 1.16.2-33.0.16 - Fri Aug 21 18:25:49 GMT 2020 - sciwhiz12: - Fix modproperties property in mods.toml causing exception (#7192) - -========= -Build: 1.16.2-33.0.15 - Fri Aug 21 18:15:53 GMT 2020 - me: - Log info about server list warning (#7209) - - Make it easier to figure out what mods are missing or have to be marked as client/server side only. - -========= -Build: 1.16.2-33.0.14 - Fri Aug 21 18:06:47 GMT 2020 - goto.minecraft: - Fix ItemStack#isDamageable is not calling Item#isDamagable (#7221) - -========= -Build: 1.16.2-33.0.13 - Fri Aug 21 17:48:58 GMT 2020 - diesieben07: - Improve performance and cleanup code for DelegatingResourcePack (#7228) - -========= -Build: 1.16.2-33.0.12 - Fri Aug 21 17:29:33 GMT 2020 - cyborgmas18: - Fix small logging issues with loading pack.png for mods (#7265) - -========= -Build: 1.16.2-33.0.11 - Fri Aug 21 17:23:30 GMT 2020 - diesieben07: - Fix config iteration order (#7230) - -========= -Build: 1.16.2-33.0.10 - Fri Aug 21 09:47:23 GMT 2020 - lex: - Cleanup Forge's build script, fix some unneeded patches. - Add checkExcscheckAll tasks. - -========= -Build: 1.16.2-33.0.9 - Fri Aug 21 04:35:17 GMT 2020 - championash5357: - Readding DifficultyChangeEvent hooks (#7240) - -========= -Build: 1.16.2-33.0.8 - Fri Aug 21 04:29:10 GMT 2020 - malte0811: - Improve startup time by caching the manifest data for mod jars (#7256) - -========= -Build: 1.16.2-33.0.7 - Wed Aug 19 05:47:46 GMT 2020 - Yunus1903: - Removed HarvestDropsEvent (#7193) - -========= -Build: 1.16.2-33.0.6 - Wed Aug 19 05:22:45 GMT 2020 - cyborgmas18: - Remove forge optional tags in favor of Vanilla's new system. (#7246) - -========= -Build: 1.16.2-33.0.5 - Fri Aug 14 19:05:15 GMT 2020 - lex: - Fix creating nether portals. - - lex: - New method for creating modded tag references, fix connecting to vanilla servers. - -========= -Build: 1.16.2-33.0.3 - Fri Aug 14 02:17:01 GMT 2020 - 43609023+spnda: - Print mod file name on InvalidModFileException (#7241) - -========= -Build: 1.16.2-33.0.2 - Thu Aug 13 19:26:22 GMT 2020 - cyborgmas18: - Fix server connection, misapplied patch (#7245) - - Yunus1903: - Updated MDK and README for 1.16.2 (#7243) - -========= -Build: 1.16.2-33.0.0 - Thu Aug 13 07:37:04 GMT 2020 - lex: - Initial 1.16.2 Update - -========= -Build: 1.16.1-32.0.108 - Sun Aug 09 20:05:01 GMT 2020 - David Quintana: - Fix ModelRegistryEvent firing every time resources reload instead of just once. - -========= -Build: 1.16.1-32.0.107 - Sat Aug 08 01:00:42 GMT 2020 - David Quintana: - Move ModelRegistryEvent invocation to when the model loading is about to start. - Freeze the ModelLoaderRegistry right after this event happens, just before model loading actually begins. - This means ModelRegistryEvent is now the correct place to register loaders, as it was intended. - This is a slight breaking change, but any mod that used FMLClientSetupEvent before will need to be updated regardless due to the existing race condition. - -========= -Build: 1.16.1-32.0.106 - Tue Aug 04 00:19:22 GMT 2020 - diesieben07: - Fix wrong BlockState param passed into canSustainPlant from FarmlandBlock (#7212) - -========= -Build: 1.16.1-32.0.105 - Tue Aug 04 00:06:45 GMT 2020 - sciwhiz12: - Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 (#7189) - -========= -Build: 1.16.1-32.0.104 - Tue Aug 04 00:00:40 GMT 2020 - sciwhiz12: - Fix debug world not generating modded blocks (#6926) - - championash5357: - New IForgeBlock#getToolModifiedState hook allow better control over tools interacting with blocks. (#7176) - - email.squishling: - Added new hook to allow Biomes to control their Edge biomes (#7000) - -========= -Build: 1.16.1-32.0.101 - Mon Aug 03 22:55:18 GMT 2020 - diesieben07: - Re-introduce "outdated" notification on Mods button in main menu (#7123) - - brandon4261: - Add support for custom elytra (#7202) - -========= -Build: 1.16.1-32.0.99 - Mon Aug 03 18:53:31 GMT 2020 - sciwhiz12: - Fix RenderTickEvent using wrong partial ticks value when game is paused. Fixes #6991 (#7208) - -========= -Build: 1.16.1-32.0.98 - Thu Jul 30 03:18:00 GMT 2020 - tterrag: - Implement forge IBakedModel methods in vanilla wrapper models - -========= -Build: 1.16.1-32.0.97 - Tue Jul 28 23:44:41 GMT 2020 - lex: - Fix another case of swallowed errors not shutting down mods. - -========= -Build: 1.16.1-32.0.96 - Tue Jul 28 21:40:06 GMT 2020 - lex: - Shut down all other mod handlers if the loading cycle errors. - This prevents other mods from throwing errors and being blamed for initial cause. - This is a temporary hack until cpw re-writes the mod event dispatcher. - -========= -Build: - Tue Jul 28 19:01:27 GMT 2020 - lex: - Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected. - - lex: - Enable EventBus type check during ForgeDev, and add IModBusEvent marker to ModelRegistryEvent. - -========= -Build: 1.16.1-32.0.93 - Tue Jul 28 07:16:31 GMT 2020 - lex: - Make license toml entry optional during 1.16.1 - There are to many existing mods to make this required. - Yes, we are technically before a RB and can do breaking changes. However this is too large. - -========= -Build: 1.16.1-32.0.92 - Tue Jul 28 01:14:20 GMT 2020 - cpw: - Missed one event. NewRegistry needs the marker. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.91 - Tue Jul 28 01:07:03 GMT 2020 - cpw: - Update MDK license to default to All rights reserved, and offer a link to chooseyourlicense.com as a place to research appropriate licenses. - - Note: the license field _is_ backwards compatible and will simply be ignored on older forge versions. - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.90 - Tue Jul 28 00:47:35 GMT 2020 - cpw: - Update modlauncher, eventbus, accesstransformers and more to use a newer mechanism for generating ASM. - - Introduced IModBusEvent as a marker interface for events on the ModBus. Expect exceptions if you use - the modbus for events not listened there. - - Signed-off-by: cpw - - cpw: - Update coremods and spi, include mandatory license field in metadata. Added at top level of mods.toml file. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.88 - Mon Jul 27 23:35:24 GMT 2020 - ray.neiheiser: - Fix rail 180 rotations (#7177) - - jmansfield: - Fire AnimalTameEvent for cats (#7172) Closes #7171 - -========= -Build: 1.16.1-32.0.86 - Mon Jul 27 22:56:16 GMT 2020 - lex: - Fix Biome generation error. - -========= -Build: 1.16.1-32.0.85 - Mon Jul 27 21:36:07 GMT 2020 - dev: - Fix SleepingTimeCheckEvent not being fired in initial sleep test. (#7005) - -========= -Build: 1.16.1-32.0.84 - Mon Jul 27 21:30:24 GMT 2020 - Yunus1903: - Fix ClimberPathNavigator spinning when width is small. Closes #6993 (#6997) - -========= -Build: 1.16.1-32.0.83 - Mon Jul 27 21:19:50 GMT 2020 - mrtschipp: - Re-added PlayerEvent.NameFormat (#6992) - -========= -Build: 1.16.1-32.0.82 - Mon Jul 27 21:14:02 GMT 2020 - email.squishling: - Fixed modded overworld biomes not spawning [1.16.x] (#6990) - -========= -Build: 1.16.1-32.0.81 - Mon Jul 27 21:08:23 GMT 2020 - christ.klinge: - Added EntityLeaveWorldEvent (#6984) - -========= -Build: 1.16.1-32.0.80 - Mon Jul 27 21:02:53 GMT 2020 - aqscode: - Re-implement moddable flammabilities (#6983) - -========= -Build: 1.16.1-32.0.79 - Mon Jul 27 20:46:11 GMT 2020 - diesieben07: - Re-add patch for PlayerSetSpawnEvent (#6977) - - Yunus1903: - Updated versions in README and removed flocker.tv mentions (#6978) - -========= -Build: 1.16.1-32.0.77 - Mon Jul 27 20:40:33 GMT 2020 - sciwhiz12: - Fix ChunkDataEvents using different data tags (#6961) Fixes #6957 - -========= -Build: - Mon Jul 27 20:27:00 GMT 2020 - joetarbit: - Post SoundLoadEvent on mod bus instead of forge bus (#6955) - -========= -Build: 1.16.1-32.0.75 - Wed Jul 22 01:26:19 GMT 2020 - cpw: - Remove startupquery. Currently wasn't functional, and 1.16 has out of band state loading in all cases, so the complex functionality there is no longer needed. Going to research using the Lifecycle indicator from DFU as a proxy/replacement. Probably with some codec FUN. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.74 - Wed Jul 22 00:34:43 GMT 2020 - lex: - Run Forge's data generators to sync 1.16 vanilla changes. - -========= -Build: 1.16.1-32.0.73 - Wed Jul 22 00:13:48 GMT 2020 - cpw: - Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds. - - Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.72 - Tue Jul 21 23:56:54 GMT 2020 - cpw: - Add mixin - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.71 - Mon Jul 20 22:56:31 GMT 2020 - cyborgmas18: - Load Modded Datapacks in DatapackScreen, before world creation (#6913) - -========= -Build: 1.16.1-32.0.70 - Sat Jul 18 22:35:53 GMT 2020 - tterrag: - Fix inconsistencies with model/blockstate datagen - -========= -Build: 1.16.1-32.0.69 - Fri Jul 17 17:35:47 GMT 2020 - dev: - Filter duplicate mod files from mod file scan data (#6855) - -========= -Build: 1.16.1-32.0.68 - Thu Jul 16 21:56:30 GMT 2020 - lex: - Fixed Forge commands. Closes #6973 Closes #6974 Closes #6976 - -========= -Build: 1.16.1-32.0.67 - Wed Jul 15 19:30:53 GMT 2020 - jaredlll08: - Added an event for registering commands. closes #6968 (#6969) - -========= -Build: 1.16.1-32.0.66 - Tue Jul 14 00:15:41 GMT 2020 - darklime: - Make all functions in Style common. (#6931) - -========= -Build: 1.16.1-32.0.65 - Mon Jul 13 22:44:53 GMT 2020 - 55965249+seymourimadeit: - Mark Raid.WaveMembers as an extensible enum. (#6878) - -========= -Build: 1.16.1-32.0.64 - Mon Jul 13 22:17:58 GMT 2020 - lex: - Fix checkPatches task. Closes #6956 - Fix patched in method using srg name. Closes #6965 - Fix capabilities not being collected for ClientWorld. Closes #6966 - Fix TagEmptyCondition using client side copy of tags instead of server. Closes #6949 - Fix ExtendedButton using narrator text. Closes #6958, Closes #6959 - Fix misaligned patch in RepairContainer. Closes #6950, Closes #6953 - Fix LivingJumpEvent not being fired for players jumping horses. Closes #6929 - Remove extra getToughness method in ArmorItem. Closes #6970 - Remove GetCollisionBoxesEvent. Closes #6921 - -========= -Build: 1.16.1-32.0.63 - Fri Jul 10 22:28:22 GMT 2020 - richard: - Fix race condition with DeferredRegister for custom registries (#6951) - -========= -Build: 1.16.1-32.0.62 - Fri Jul 10 17:49:51 GMT 2020 - sciwhiz12: - Remove hooks into beacon base/payments. Vanilla uses tags now for extensibility. (#6948) - -========= -Build: 1.16.1-32.0.61 - Wed Jul 08 21:33:38 GMT 2020 - jaredlll08: - Expose the DataPackRegistries instance to the AddReloadListenerEvent (#6933) - -========= -Build: 1.16.1-32.0.60 - Wed Jul 08 21:13:18 GMT 2020 - sciwhiz12: - Fix canRepair not being set true as default (#6936) - - Closes #6934 and #6935 - -========= -Build: 1.16.1-32.0.59 - Wed Jul 08 14:56:39 GMT 2020 - David Quintana: - Fix particles sometimes "losing" the lightmap and drawing fullbright. - - David Quintana: - Fix misaligned patch causing LivingEquipmentChangeEvent to never be posted. - -========= -Build: 1.16.1-32.0.57 - Mon Jul 06 21:32:33 GMT 2020 - JDLogic: - Add simple patch checker and cleanup patches (#6851) - - * Add simple patch checker and cleanup patches - - * Address comments - * move task implementation - * genPatches is now finalized by checkPatches - * the S2S artifacts are automatically removed - * added class and method access checking - -========= -Build: 1.16.1-32.0.56 - Mon Jul 06 21:27:02 GMT 2020 - richard: - Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 (#6902) - -========= -Build: 1.16.1-32.0.55 - Mon Jul 06 21:12:45 GMT 2020 - richard: - Fix harvest level and tool type not actually getting set #6906 (#6922) - -========= -Build: 1.16.1-32.0.54 - Mon Jul 06 20:46:01 GMT 2020 - richard: - Reimplement ITeleporter Patches (#6886) - -========= -Build: 1.16.1-32.0.53 - Mon Jul 06 20:39:37 GMT 2020 - 40738104+Mysterious-Dev: - Add function to add items with the same behavior as the pumpkin for enderman (#6890) - -========= -Build: 1.16.1-32.0.52 - Mon Jul 06 20:33:17 GMT 2020 - richard: - Custom Item integration with Piglins (#6914) - -========= -Build: 1.16.1-32.0.51 - Mon Jul 06 20:20:02 GMT 2020 - ichttt: - Some dead code cleanup, and re-implement some bed hooks. (#6903) - -========= -Build: 1.16.1-32.0.50 - Mon Jul 06 20:06:39 GMT 2020 - diesieben07: - Fix missing null checks in ForgeIngameGui (#6907) - -========= -Build: 1.16.1-32.0.49 - Mon Jul 06 19:50:02 GMT 2020 - sciwhiz12: - Fix swap offhand keybind not working in GUIs (#6920) - -========= -Build: 1.16.1-32.0.48 - Mon Jul 06 19:42:07 GMT 2020 - thpetuaudletang: - New AddReloadListenerEvent that gathers server side data reload handlers. (#6849) - -========= -Build: 1.16.1-32.0.47 - Fri Jul 03 12:40:42 GMT 2020 - David Quintana: - Attempt to use a more compatible method to initialize stencil support. - In case the separate attachments don't work for everyone, there's a new setting to choose the combined attachment. - -========= -Build: 1.16.1-32.0.46 - Fri Jul 03 04:00:22 GMT 2020 - David Quintana: - Update copyright year to 2020. - - David Quintana: - Fix multi-layer item rendering. - -========= -Build: 1.16.1-32.0.44 - Thu Jul 02 17:17:45 GMT 2020 - David Quintana: - Model system improvements: - - Port some things I did in 1.14 which I couldn't do in 1.15 due to breaking changes. - - Fix multi-layer block models not working (1.16 RenderType doesn't override toString the same way anymore) - - Implement multi-layer item rendering. - - Improve CompositeModel submodel data passing. - -========= -Build: 1.16.1-32.0.43 - Thu Jul 02 12:54:03 GMT 2020 - MartijnvandenBrand: - Include model data in getQuads call (#6884) - - The model data wasn't included when getting quads from specific sides, but was when getting quads for side = null. - - thpetuaudletang: - Pass matrixstack in tooltip render events (#6885) - -========= -Build: 1.16.1-32.0.41 - Thu Jul 02 05:54:25 GMT 2020 - tterrag: - Fix improper handling of baked lighting in forge light pipeline - - Closes #6812 - -========= -Build: 1.16.1-32.0.40 - Thu Jul 02 01:59:30 GMT 2020 - richard: - Fix FMLServerAboutToStartEvent being fired too late on the integrated server https://github.com/MinecraftForge/MinecraftForge/issues/6859 - -========= -Build: 1.16.1-32.0.39 - Wed Jul 01 18:14:25 GMT 2020 - ichttt: - Fix miss-aligned patch ItemEntity (#6895) - -========= -Build: 1.16.1-32.0.38 - Tue Jun 30 20:19:32 GMT 2020 - info: - Add hoe tool type (#6872) - -========= -Build: 1.16.1-32.0.36 - Tue Jun 30 20:09:21 GMT 2020 - curle: - Allow any armor to have custom knockback resistance (#6877) - -========= -Build: 1.16.1-32.0.35 - Tue Jun 30 19:57:32 GMT 2020 - diesieben07: - Add senderUUID to ClientChatReceivedEvent (#6881) - -========= -Build: 1.16.1-32.0.34 - Tue Jun 30 02:33:58 GMT 2020 - lex: - Re-write checkATs function and automate making Items/Blocks public. - -========= -Build: 1.16.1-32.0.33 - Tue Jun 30 02:10:14 GMT 2020 - cpw: - Reorganize modloading on the dediserver. This removes the DedicatedServer parameter from the FMLDedicatedServerSetupEvent. - Code for customizing the server instance should be moved to the ServerAboutToStartEvent or similar, where the server instance - is available. - - This reorganization means that mods will load fully before the server is even constructed, or the server properties loaded. We also move the EULA right to the front so we don't have to wait for bootstrap. - - This should fix the problems with mods which customize world data and other things. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.32 - Mon Jun 29 23:43:01 GMT 2020 - thpetuaudletang: - Fix datagen resolving tags and exploding. (#6865) - -========= -Build: 1.16.1-32.0.31 - Mon Jun 29 23:37:30 GMT 2020 - mattmess1221: - Fix Language.javaLocale parsing (#6862) - -========= -Build: 1.16.1-32.0.30 - Mon Jun 29 22:58:30 GMT 2020 - diesieben07: - Fix IItemHandler wrappers for chests not updating both chests (#6875) - -========= -Build: 1.16.1-32.0.29 - Mon Jun 29 21:08:55 GMT 2020 - lex: - Fix missed patch in PlayerList and EntitySelectioonContext. Closes #6846 Closes #6850 - -========= -Build: 1.16.1-32.0.27 - Mon Jun 29 20:09:12 GMT 2020 - richard: - Fix access levels being hardcoded to private via patch overriding AT entry (#6848) - -========= -Build: 1.16.1-32.0.26 - Mon Jun 29 19:42:50 GMT 2020 - lex: - Fix tag related issues when connecting to a vanilla server. - -========= -Build: 1.16.1-32.0.25 - Sun Jun 28 22:08:15 GMT 2020 - lex: - Fix Forge's internal handler being registered in wrong place. - Fix double call to loader end. - -========= -Build: 1.16.1-32.0.24 - Sat Jun 27 22:50:54 GMT 2020 - David Quintana: - Add a model loader that lets mods specify different models for different perspectives. - Allow custom models to reference vanilla item models as child models. - -========= -Build: 1.16.1-32.0.23 - Fri Jun 26 23:55:23 GMT 2020 - thpetuaudletang: - fix misapplied patch - - also sneak in an import patch removal - -========= -Build: 1.16.1-32.0.21 - Fri Jun 26 22:40:19 GMT 2020 - lex: - Fix blocks being harvested with incorrect tools. - -========= -Build: 1.16.1-32.0.20 - Fri Jun 26 19:53:02 GMT 2020 - lex: - Make installer use MCPConfig version to identify MC assets. - -========= -Build: 1.16.1-32.0.19 - Fri Jun 26 18:27:49 GMT 2020 - cpw: - Tweak the server startup a bit, make sure methods that can't work because they run before a server exists explode saying so. - Also fix other launch profiles. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.18 - Fri Jun 26 16:56:37 GMT 2020 - lex: - Fix dedicated server loading by constructing mods before data packs are created. - -========= -Build: 1.16.1-32.0.17 - Fri Jun 26 15:20:37 GMT 2020 - David Quintana: - Fix create method. - Fix test mods not loading correctly. - -========= -Build: 1.16.1-32.0.16 - Fri Jun 26 14:43:19 GMT 2020 - David Quintana: - Reintroduce missed patch in EntityClassification. - -========= -Build: 1.16.1-32.0.15 - Fri Jun 26 13:55:42 GMT 2020 - thpetuaudletang: - Include a getter for the matrix stack in OverlayEvent (#6834) - -========= -Build: 1.16.1-32.0.14 - Fri Jun 26 13:23:07 GMT 2020 - thpetuaudletang: - Fix block render types not being properly applied to item entities (#6832) - -========= -Build: 1.16.1-32.0.13 - Fri Jun 26 13:05:18 GMT 2020 - mods.itsmeow: - [1.16.x] Allow GlobalEntityTypeAttributes' EntityType -> AttributeModifierMap to be added to (#6822) - - * Make GlobalEntityTypeAttributes map able to be added to - - * Split get patch into two lines - - * Favor Forge's map over vanilla - -========= -Build: 1.16.1-32.0.12 - Fri Jun 26 12:59:19 GMT 2020 - thpetuaudletang: - Fixed creative screen arrows (#6827) - - Yunus1903: - Added call to method for tooltip with FontRenderer (#6831) - -========= -Build: 1.16.1-32.0.10 - Fri Jun 26 12:36:59 GMT 2020 - curle: - Retarget Block.Properties patch to the new AbstractBlock, reintroduce harvestLevel and harvestTool fields (#6819) - - * Retarget Block.Properties patch to the new AbstractBlock, reintroduces the harvestLevel and harvestTool fields. - - * Slight adjustment to fix the lootTableSupplier. - -========= -Build: 1.16.1-32.0.9 - Fri Jun 26 12:31:37 GMT 2020 - Yunus1903: - Fixed sneaking while swimming (#6817) - -========= -Build: - Fri Jun 26 12:25:07 GMT 2020 - thpetuaudletang: - Fixed tooltip rendering issues (#6815) - -========= -Build: 1.16.1-32.0.7 - Fri Jun 26 02:30:54 GMT 2020 - thpetuaudletang: - Fixed villager trades having non-applicable enchants - - Also added an AT at lex's request - -========= -Build: 1.16.1-32.0.6 - Fri Jun 26 01:52:19 GMT 2020 - thpetuaudletang: - Fix locate command (#6811) - - thpetuaudletang: - Fix block drops (#6810) - - contact: - Add missing patch to ScreenShotHelper (#6809) - - Adds the missed patch back - - Yunus1903: - Updated MDK mods.toml versions (#6808) - - thpetuaudletang: - Fix locate command (#6811) - - thpetuaudletang: - Fix block drops (#6810) - - contact: - Add missing patch to ScreenShotHelper (#6809) - - Adds the missed patch back - - Yunus1903: - Updated MDK mods.toml versions (#6808) - - thpetuaudletang: - Fix locate command (#6811) - - thpetuaudletang: - Fix block drops (#6810) - - contact: - Add missing patch to ScreenShotHelper (#6809) - - Adds the missed patch back - - Yunus1903: - Updated MDK mods.toml versions (#6808) - -========= -Build: 1.16.1-32.0.2 - Fri Jun 26 01:41:51 GMT 2020 - lex: - Rework BlockSnapshot and fix client notifications. Closes #6807 - -========= -Build: 1.16.1-32.0.1 - Thu Jun 25 23:24:48 GMT 2020 - lex: - Bump MCPConfig version. +------------------------------------------------------ +Version 2.4.3 +------------------------------------------------------ + +- Fixed Lava Crystals causing crash when used while not yet bound +- Fixed Teleposers sending entities at the destination position the wrong way +- Fixed Speed Runes not working on Tier 2 altars +- Fixed crash when checking tasks for some entities +- Fixed crash when checking some entities for potion effects +- Re-implemented the Boost potion + - The PR still had TODOs in the description when I merged so this may not be complete yet + +------------------------------------------------------ +Version 2.4.2 +------------------------------------------------------ +Now with no guarantees for working textures! + +Blood Altar: + - A Blood Altar with a Redstone Lamp below it will now emit a redstone signal upon finishing crafting (#1635) + - Fixed Blood Altar being able to obtain negative progress (#1649) + +Living Armor: + - Fixed Storm Trooper Level 4 costing 65 instead of -65 upgrade points (#1631) + +Rituals: + - Fixed Ritual of the Eternal Soul (Ritual Stone layout & didn't work) (#1633) + - Fixed Ritual Tinkerer (ritual area is now unique per ritual instance), added the ability to reset the ritual ranges to default (#1636) + +Misc: + - Lava Crystals can now set things on fire (#1652) + - Fixed parts of the German translation. Other translations still need to be reworked to accomodate changed translation keys (#1640) + - Fixed Guidebook showing wrong recipes (Rune of Self-Sacrifice instead of others) (#1641) + - Wooden Paths now behave like wood instead of stone (sound & efficient tool) (#1638) + + +Technical Stuff: + - Fixed Veil of Evil and Ward of Sacrosanctity console spam (which could eventually lead to an out of memory exception) (#1639) + - Fixed GLSL shader compilation errors (affected Mesa driver (AMD GPU) on Linux) (#1624) + - Fixed `/bloodmagic network` command permissions (#1613) + - Fixed a rare crash that could occur when summoning mobs (#1618) + +------------------------------------------------------ +Version 2.4.1 +------------------------------------------------------ + +Nut was too lazy to create a changelog, it's AEon's turn now! +Changes made from Feb 02 - now (Fill end date in later) + + +Living Armor: + - Fixed "Soft Fall" not preventing damage + - "Nocturnal Prowess" should not flash anymore + - "Trickshot" now ignores HurtResistanceTime + - "Trickshot" now works properly with sentient arrows + - "Step Assist" does not take effect while sneaking + +Sentient Bow: + - Fixed Destructive Will arrows exploding continuously + - Fixed Tipped Arrows getting improved even if no Will can be used + +Sigils: + - Buffed "Sigil of the Fast Miner" to be in accordance to the "Sanguine Scientium" + - Fixed a bug where "Sigil of the Fast Miner" would also cause the whirlwind effect + - Added "Whirlwind" to the potion registry + - Fixed broken Sigil tooltip formatting + - Fixed Sigil of Holding not updating some Sigil data, allowing for exploits + - Greatly improved "Sigil of Compression" performance + - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) + + +Rituals: + - Ported Veil of Evil & Ward of Sacrosanctity + - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) + - Added configurability to Ritual of the High Jump by modifying a new ritual area with the Ritual Tinkerer + +Misc: + - Fixed routing node oredict filter (crashes) + - Fixed mimic vanishing in some cases + - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) + - Stop insertions into Demon Crucible if the inventory is not empty + - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) (Gravestone bugginess) + - Fixed "Unmending" mod incompatibility + - Fixed Teleposers crashing the game if someone force-fed it junk + - added Nut being angery at contributors for messing stuff up + - Added some Russian language strings for the guide book + - Added repair recipes for Sentient Tools & Living Armor to JEI + - Many translation keys have changed which makes affected translations fall back to english + +Technical Stuff no player cares about: + - Formatted Project code + - Fixed BlockState parsing (mimic vanishing) + - Fixed some and streamlined ritual block ranges + - Mystery drain still mysterious + - Use TextFormatting rather than color codes in block lang names + - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) + - Fixed `/bloodmagic network get` command + - Added translation keys for tickethistory command help strings + +------------------------------------------------------ +Version 2.4.0 +------------------------------------------------------ + +It's been a while, eh? Some of you may be asking yourself "whats up with bloodmagic" like that damned recon on a certain +social media site. Well here's what's up: put something snarky here when done writing changelog + +There's so much here, I'm probably going to miss some. Here's a general overview from just skimming commit titles. + +Much of this was done via PR because I'm ~~lazy~~ too busy having fun with Fabric. + +- Fixed harvest moon not working with pumpkins +- [API] Added a way to unregister an altar component +- Moved anything related to Tier 6 behind an opt-in config. Please stop asking me how to get it. +- Fixed small demon stone bricks recipe so it returns 4 instead of 1 +- Ported some old rituals from 1.7 + - Cry of the Eternal Soul + - Reverence of the Condor + - Ritual of the Feathered Earth +- Added a new ritual, Ritual of Grounding +- Optimized bound tool harvesting +- Fixed render issues with demon crystals +- Fixed Hymn of Syphoning not updating some tanks visually +- Added very basic documentation for several rituals to the guide book +- Made meteor costs for Mark of the Falling Tower configurable in the meteor json +- Fluid related sigils should now work identically to buckets of the fluid +- Fixed ritual tinkerer area setting behaving wonkily +- Fixed Seer Sigil not working for incense altars +- Added the ability to buff movement and updraft arrays by providing more of their ingredient +- Ported the ritual dismantler from 1.7.10 +- Logic fix for the Solar Powered + - Now it requires a clear line of sight to the sky as well as it being day time +- Fixed Sigil of Magnetism AOE being offset from the player +- Rewrote commands + - They're different in some way, some how + - Don't ask me how +- Quality of life improvements for the ritual tinkerer +- Changed the activation crystal levels of some rituals to use the awakened crystal + - Mark of the Falling Tower + - All the living armor ones + - It's late and I'm tired don't hate me for being too lazy to look up their names +- Fixed up some bounding boxes for some blocks with fancier models +- Sentient Bow now properly handles modded and potion-ified arrows + +I can't wait for this to turn out to be very broken so I can yell at the contributor :> + +------------------------------------------------------ +Version 2.3.3 +------------------------------------------------------ + +- Fixed Altars not filling orbs of their own tier + +------------------------------------------------------ +Version 2.3.2 +------------------------------------------------------ + +looky bois, we beta now + +- Fixed Sentient Sword attacking mobs and players without being provoked +- Fixed weird Crystal Clusters being weird + - They are now less weird +- Fixed Ritual Reader and Tinkerer not being in the creative tab +- Fixed an NPE that would happen with some blocks in the Ritual of Magnetism's area of effect +- Fixed Mimics not being able to replace blocks during placement +- Fixed issues with inter-dimensional teleportation + - Teleposers and Teleposition Sigils are now fully functional +- Fixed custom arrows not having their effects when fired from the Sentient Bow +- Fixed Splash Potions being unthrowable while Living Armor had the quenched downgrade +- Fixed Ritual Stones being considered Iron instead of Rock +- Fixed the Lava, Water, and Void sigils so they now work properly with tanks +- Fixed an issue where the Teleposer would attempt to damage an offline player +- Fixed the Compression Sigil so it now functions +- Fixed low tier altars being able to fill high tier orbs +- Fixed Sentient Tools having the wrong material +- Fixed Sentient Tools not having a repair material + - It is now demon crystals +- Added a config to disable mob drops from mobs killed by the Well of Suffering +- Added an additional glow to the Dagger of Sacrifice when it has a full incense bonus +- Reworked the Phantom Bridge +- Updated german translation +- Updated chinese translation + +------------------------------------------------------ +Version 2.3.1 +------------------------------------------------------ + +- Fixed Ritual of Magnetism not being registered +- Fixed Mob Sacrifice Array so it no longer kills bosses and players +- Fixed Will type serializer using lowercase names +- Fixed item rendering for the Sigil of Holding HUD +- Added mod id to command localization keys to prevent potential conflicts + +------------------------------------------------------ +Version 2.3.0 +------------------------------------------------------ + +- Fixed Basic Cutting Fluid recipe so it no longer requires an unobtainable potion +- Fixed Teleposer Blacklist not working +- Fixed the bounding box on the Blood Tank +- Fixed crafted Inscription Tools not having their uses tag applied +- Fixed JEI queries with bound Blood Orbs +- Fixed Crushing Ritual not passing a valid player +- Fixed Mending applying to Potion Flasks +- Fixed Teleposition Sigil not checking for a Teleposer at it's destination +- Fixed Lava Crystal not syphoning LP +- Fixed the Laputa array moving unbreakable blocks + - ie: Bedrock +- Fixed the Ritual of the Green Grove not working on Cactus and Reeds +- Added a Mob Sacrifice array +- Updated the HUD system + - You can now edit the HUD layout via the in-game config editor with a drag'n'drop system. + - This screen is only available while in a world. +- Updated the German translation +- Updated the Chinese translation +- [API] Reworked how rituals are registered + - This will break any addons that work with rituals + - If you report an issue to me regarding broken addons, it will be closed without any comment + +------------------------------------------------------ +Version 2.2.12 +------------------------------------------------------ +- Fixed Hellfire Forge and Alchemy Table's shape-crafted-ness. +- Fixed Cutting Fluids so they now work properly. +- Fixed the Fluid filters so that they now work perfectly in the routing system. +- Fixed the Living Armour Upgrade that provides night vision, so it is no longer as finicky. +- Proved that Way could update the version number properly without being told by the maid. + +------------------------------------------------------ +Version 2.2.11 +------------------------------------------------------ +- Fixed the Alchemy Array from voiding items when broken when it shouldn't have. +- Fixed Blood Tank NBT transfer between item/tile form. +- Made sure to not offend TehNut's sensibilities :NutMaid: + +------------------------------------------------------ +Version 2.2.10 +------------------------------------------------------ +- Fixed Turret Array crash on servers. +- Fixed the Blood Altar so it can actually fill Blood Orbs (derp). + +------------------------------------------------------ +Version 2.2.9 +------------------------------------------------------ +- Fixed stupid NPE in the Furnace Array +- Fixed various issues with the Alchemy Table: + - Now works for recipes that require an LP cost. + - Hoppers no longer lose items when items are placed into the "slave" Alchemy Table who has some slots restricted. +- Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. +- Fixed the Demon Will crystals growing when they shouldn't. Also lowered the time between natural crystal growths in Will-enriched areas. + - Side note: who's bright idea was it to have to wait 15 minutes per crystal growth? +- Added the "Resonance of the Faceted Crystal", which can be used to create your first aspected Will crystal clusters. +- Made it so the Crystallizer no longer generates a random aspected Will crystal cluster. +- Fixed rare crash with the Blood Altar, which only has a chance of occuring on restart. + +------------------------------------------------------ +Version 2.2.8 +------------------------------------------------------ +- Fixed a client side null-pointer exception with the Blood Lamp + - It's a bright idea to fix this as soon as I can. +- Changed the recipe of the Teleport Array: + - Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time! +- Added new arrays + - The Turret Array: + > Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory. + - Spike Array: + > Place a piece of cobblestone and iron ingot in the array. The array deals damage to any living entity that enters +- Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system. +- Added additional effects to the Sentient Bow when aspected to different Will types. +- Added in book entries for the Teleport Array and the Turret Array. +- Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. +- Removed added health from "Quick Feet" - seriously, why was this a thing? +- Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. + - Note: The dictionary definition for "Ellipsoid" is a three-dimensional figure whose plane sections are ellipses or circles. For those who weren't born in a math class, it means it is a sphere that has different radii in each direction. +- Fixed an off by one in altar upgrade management causing the first of any upgrade to not be counted +- Fixed the LP cost of the Master Blood Orb + - This bug has gone unnoticed for 2 years now. +- Potion Flasks can be crafted now +- Fixed a server crash when handling dye recipes +- Moved several text outputs out of the chat and into the action bar +- Fixed a crash when trying to use unbound toggle-able sigils in the Sigil of Holding +- Fixed an issue where unbound sigils could be used inside the Sigil of Holding +- Added missing items for Demon Crystals and Demon Pylons + +------------------------------------------------------ +Version 2.2.7 +------------------------------------------------------ +- Added the Furnace Array: + - Name pending. + - Takes health from nearby players to power adjacent furnaces. + - Not covered by standard medical insurance. +- Added a new Teleport Array: + - Please keep all hands and feet inside the floating circle until you have come to a complete stop. + - Note to Scotty: Feed the non-floating circle a Feather followed by an Apple to initiate the Beaming sequence. +- Seer Sigil should now properly mimic all functions of the Divination Sigil. +- Fixed some console error spam when using Lava/Water/Void sigils. +- Registered Sulfur (dustSulfur) and Saltpeter (dustSaltpeter) to the ore dictionary. +- Rewrote how IBindable stores it's data: + - This will probably break existing worlds if you have Rituals running. Stop them before updating. + - This will also unbind any of your bound items. Bind them again after updating. + - *glances at the big red A next to all 1.12 files* +- Fixed Haste being *constricted* when above level 2. +- De-nerf Fast Miner array so it provides Haste 3 again. +- Prepped API for recipe tweaking mods. + +------------------------------------------------------ +Version 2.2.6 +------------------------------------------------------ + +- Fixed a weird thing where slates were weird +- Added HUD elements for Tranquility and Inversion +- Fixed Sigils stacking 64 times higher than they should have + +As a side note, I've been listening to http://loli.dance/ for the last like 2 hours now. + +------------------------------------------------------ +Version 2.2.5 +------------------------------------------------------ + +- We are now even more sure we're looking at a block before doing blocky things +- Fix Lava Crystal being consumed by furnaces +- Augmented Capacity and Self Sacrifice runes remember their names now +- Satiated Stomach will now let you gorge yourself on overly high saturation foods + - I'm looking at you, Pam. Stop being weird and giving your foods 28 saturation. +- Made Mod ID node filter dumber so it actually, like, works properly +- "Temporarily" disabled cross-dimensional teleports for entities. Temporarily. + - Did I mention this is temporary? As in totally not permanently? + - Who am I kidding? I'll probably forget about this. +- Bounce Arrays are no longer death traps when sneaking. + +------------------------------------------------------ +Version 2.2.4 +------------------------------------------------------ + +- Make sure we're looking at a block before doing blocky things +- Slightly altered the altar's renderer +- Added new spammy logging with config options + - Prints out information like mods registering things via the API and stuff + +------------------------------------------------------ +Version 2.2.3 +------------------------------------------------------ + +- Fixed mundane components being really really really thirsty + - (everything required water reagents. everything.) +- Buffed the Fast Miner array with a nerf + - Vanilla doesn't like Haste 3 I guess? +- Moved Divination Sigil altar output to a HUD element + - RIP Blood Altar chat spam 2014-2018 +- Mark of the Falling Tower is now re-opened and ready for sacrifices. +- Polished Demon Stones are no longer lonely uncraftable bois +- Somewhat more efficient (at least LoC wise) altar upgrade checking +- Blood Altar is now less stingy about outputs +- Coerced augmented Potion Flask recipe outputs out of hiding + +------------------------------------------------------ +Version 2.2.2 +------------------------------------------------------ + +- Fixed Alchemy Arrays so they might actually function now. Might. + - How did this even function properly before? I have no idea. +- Soul Snare should now stop giving the thrower ghosty debuffs. Should. +- Blood Magic is now in the mood to launch on servers. Probably. +- Soul Forge crafting works again! Potentially! +- Fixed the altar nuking any and all NBT attached to output items. +- Fixed the version not being replaced properly +- Rewrote Hwyla integration. + - Should now function a lot nicer. +- Implemented a new API for recipe registration + - Still need to move the alchemy table over, but otherwise this seems to function just fine. +- Implemented a new API for registering tranquility blocks. + - Will allow Chisel to stop crashing + +------------------------------------------------------ +Version 2.2.1 +------------------------------------------------------ + +- Fixed crashes when using systems that depended on internal entity names +- Fixed a crash when attempting to get the owner from unbound bindable items +- Fixed a server crash on startup +- Fixed GUIs not displaying the background and tooltips properly +- Helped the Sentient Sword get over it's identity crisis +- By the way I'm not actually upset or anything guys. + - Please stop overreacting Reddit. + +------------------------------------------------------ +Version 2.2.0 +------------------------------------------------------ + +- Basic port to 1.12 + - Does not include the vast majority of rewrites and cleanup I did on the other branch + - Completely untested. Done out of spite. Go away. + - There, you have it. Screw off now. + +------------------------------------------------------ +Version 2.1.11 +------------------------------------------------------ + +- Added support for some modded crops (Untested. Theoretically they work) + - Harvestcraft + - Actually Additions + - Extra Utilities +- Fixed permission level for sub-commands +- Large Bloodstone Bricks should receive 4 from a craft +- Fixed Diamond Meteor giving blocks of diamond +- Dynamically calculate Meteor Weight +- Fixed NPE in fluid filter +- Fixed Blood Tank capacity being reset when the chunk reloaded +- Updated russian translation +- Fixed Rune Type capability not registering on physical client +- Updated Sigil of Holding texture so set color is more visible +- Fixed blocks destroyed by bound tools not storing any NBT data +- Fixed Harvest ritual not working on Melons and Pumpkins +- [API] Methods for removing recipes + +------------------------------------------------------ +Version 2.1.10 +------------------------------------------------------ + +- Fixed malicious clients being able to load arbitrary chunks on the server +- Fixed Bound tools not setting their tool class and harvest level + +------------------------------------------------------ +Version 2.1.9 +------------------------------------------------------ + +- Fixed Alchemy Table overwriting output each time it crafted something + - https://github.com/WayofTime/BloodMagic/issues/1119 +- Blood Magic commands (/bloodmagic) can now be used in Command Blocks + - https://github.com/WayofTime/BloodMagic/issues/1117 +- Re-implemented the Soul Fray debuff on death + - No more exploiting sacrifice by killing yourself over and over (again) + - https://github.com/WayofTime/BloodMagic/issues/1118 +- Updated Traditional Chinese localization + - https://github.com/WayofTime/BloodMagic/pull/1116 + +------------------------------------------------------ +Version 2.1.8 +------------------------------------------------------ + +- Fixed more null stack issues + - Will it ever end? +- Fixed a crash when activating a ritual via Redstone +- Fixed a fluid handling issue with Blood Tanks + - https://github.com/WayofTime/BloodMagic/issues/1108 +- Fixed issue where Sigils inside a Sigil of Holding were using the wrong item + - https://github.com/WayofTime/BloodMagic/issues/1102 +- Fixed crash when activing Bound Tools + - https://github.com/WayofTime/BloodMagic/issues/1114 +- Updated the Chinese localization + - https://github.com/WayofTime/BloodMagic/pull/1052 +- Placer Ritual is now much more performant +- Many recipes have been moved over to support the Ore Dictionary + - https://github.com/WayofTime/BloodMagic/issues/1101 + +------------------------------------------------------ +Version 2.1.7 +------------------------------------------------------ + +- Fixed Grave Digger not applying damage bonus + - https://github.com/WayofTime/BloodMagic/issues/1098 +- Fixed crash when attempting to handle the dropping of Demonic Will + - https://github.com/WayofTime/BloodMagic/issues/1091 +- Fixed Crash of the Timberman dupe + - This also adds support for IItemHandler based inventories + - https://github.com/WayofTime/BloodMagic/issues/1090 +- Fixed a crash when a Meteor struck the ground + - https://github.com/WayofTime/BloodMagic/issues/1088 +- Fixed the Seer's Sigil not using Roman Numerals to display the altar tier + - https://github.com/WayofTime/BloodMagic/pull/1094 + +------------------------------------------------------ +Version 2.1.6 +------------------------------------------------------ +- Fixed invisible Sentient Specters destroying everything and everybody around their owners + - lol + - https://github.com/WayofTime/BloodMagic/issues/1065 +- Fixed occasional crash when Blood Altar checked it's recipe + - https://github.com/WayofTime/BloodMagic/issues/1086 +- Fixed Blood Light acting as a collidable block in obfuscated environments + - I think + - https://github.com/WayofTime/BloodMagic/issues/1083 +- Fixed crash when Alchemy Table fully depleted a Cutting Fluid item + - https://github.com/WayofTime/BloodMagic/issues/1082 +- Fixed crash when scrolling through Sigil of Holding + - https://github.com/WayofTime/BloodMagic/issues/1081 +- Fixed not being able to take Gems out of Demon Crucibles + - https://github.com/WayofTime/BloodMagic/issues/1079 +- Fixed some more null stack issues + - When is this going to be over... + - https://github.com/WayofTime/BloodMagic/issues/1068 +- Fixed JEI not displaying Armor Tomes +- Fixed Body Builder level 4 being 5x more expensive than level 5 + - https://github.com/WayofTime/BloodMagic/pull/1080 +- Updated Japanese localization + - https://github.com/WayofTime/BloodMagic/pull/1076 + +------------------------------------------------------ +Version 2.1.5 +------------------------------------------------------ +- Fixed Hellfire Forge slots acting up + - i is not j no matter how similar they look +- Fixed JEI compat for Alchemy Table recipes +- Fixed a lot more null stack checks +- Fixed (yet another) crash when creating an "invalid" stack of the Blood Tank +- Fixed Demon Will Crystal and Teleposer crashy interaction +- Fixed crash when working with toggleable sigils + +------------------------------------------------------ +Version 2.1.4 +------------------------------------------------------ +- Fixed a crash when checking if two items could be combined +- Fixed a crash when attempting to open the Sigil of Holding GUI +- Fixed a crash when somebody made an "invalid" stack of the Blood Tank +- Fixed a crash/hilarity where a Blood Altar would update itself as a Comparator + - Thanks to Arcaratus for causing this. I haven't laughed that hard in a while. + +------------------------------------------------------ +Version 2.1.3 +------------------------------------------------------ +- Added a new Master Ritual Stone that inverts it's redstone activity +- Fixed Living Armor attributes overriding eachother instead of adding up +- Fixed Ore doubling sometimes adding invalid recipes +- Downgrade tomes are now called Downgrade Tomes +- Added some caching to rituals to (hopefully) increase performance with less world data query-ing + +------------------------------------------------------ +Version 2.1.2 +------------------------------------------------------ +- Fixed server crash when creating the guide entries + +------------------------------------------------------ +Version 2.1.1-70 +------------------------------------------------------ +- Updated to Minecraft 1.11(.2) +- Fixed the Living Armour Sacrificial Upgrade +- Fixed Bound Tools not draining LP +- Implemented the Blood Tank + - Current recipes are temporaryâ„¢ +- Empty flasks can now be refilled to create a new flask +- Fixed Aura of Expulsion whitelist +- Added the Altar's Charge value to the Waila Tooltip when holding a Seer's Sigil +- Fixed meteor config error caused by EnderCore reloading configs early into startup +- Fixed meteor config not generating new entries +- Blacklisted Sentient Spectres from the Well of Suffering +- Fixed Sigils drawing from the user instead of the bound network +- Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter. +- Made it so the book does not give the filling recipe when the Blood Orb recipe is queried. +- Added a null check for the Will getter for the Aura incase the WillChunk somehow does not generate. +- [API] Added a new IMC API for modders to register their blocks as an altar component. + - Example: Chisel Glowstone can now be used for the Tier 3 caps (once Chisel implements it) + +------------------------------------------------------ +Version 2.1.0-69 +------------------------------------------------------ +- Fixed Phantom Bridge sigil glitch when travelling between dimensions and teleporting large distances. +- Added deprecated methods for easier updating - Oops! + +------------------------------------------------------ +Version 2.1.0-68 +------------------------------------------------------ +- Fixed Ritual of Regeneration's text +- Fixed silly dupe bug with the Zephyr ritual. + +------------------------------------------------------ +Version 2.1.0-67 +------------------------------------------------------ +- Added the Destructive Will effect to the Ritual of the Green Grove. This ritual now is done~ +- Finished the Augments for the Serenade of the Nether. +- Implemented a new model for the Blood Altar to be more in-line with the rest of the mod (Thanks, wiiv!) +- Made the Blood Altar respect the new capability system for fluid management. +- Finished the Augments for the Ritual of the Feathered Knife. +- Finished the Augments for the Ritual of the Crusher. +- Finished most of the Augments for the Ritual of the Shepherd. +- Changed the Ritual of the Feathered Knife so it respects the Tough Palms Living Armour Upgrade. +- Fixed the Ritual of the Feathered Knife so that its health threshold is percent-based. +- Made the aspected Sentient Tools drop their corresponding Will type on killing enemies. +- Made it so peaceful animals provide more LP by default (to encourage creating your own farm). +- Increased the effectiveness of animals for the Gathering of the Forsaken Souls ritual by a factor of 4. +- Added the framework for the Purification Altar. +- Fixed a crash with the Ritual Diviner when attempting to replace certain blocks. +- Snares can no longer hit the thrower of the snare within 20 ticks of throwing it. +- Updated the book so it contains most of the rituals. +- Added some placeholder recipes for the Living Armour Downgrades - they will eventually change. + +------------------------------------------------------ +Version 2.1.0-66 +------------------------------------------------------ +- Made it so that when you acquire a Living Armour Upgrade from a Tome, it raises the corresponding Stat Tracker up to that upgrade level. +- Added some more framework for the Living Armour Downgrades. +- Modified the Grim Reaper's Sprint so it is better at later levels. +- Added a Repairing Living Armour Upgrade (trained by damaging the chestplate of the Living Armour while you have a full set on - it repairs all of your armour pieces over time) +- Modified the Dwarven Might skill to better change the mining speed when mining. +- Added a Dig Slowdown armour downgrade called "Weakened Pick". +- Added the framework for a ritual that grants downgrades (instead of the potion method). +- Fixed the recipes for some of the Demon Will blocks +- Added the Sigil of Elasticity, the Sigil of the Claw, and the Sigil of Winter's Breath. +- Changed most of the BlockString blocks to a BlockEnum in order to solve a loading issue with schematics. +- Added the entries for the Skeleton Turret Array and the Updraft Array +- Added the Bounce Array +- Modified the Sigil of the Phantom Bridge so it better performs with speed modifications +- Added the ability to use Mimic Blocks containing a valid Altar Component to work with the altar (#945) + - Note: If using a Blood Rune, you do not get the ability of said rune. It just counts as a valid block. +- Fixed `/bloodmagic network get NAME` using the wrong localization (#955) +- Fixed Mimic Blocks causing an NPE with some Tile Entities (#951) +- Fixed a massive FPS drop when looking at a Master Ritual Stone while holding a Ritual Tinkerer (#950) +- Fixed an occasional crash when looking at a Mimic block with WAILA installed (#949) +- Fixed the displayed Lesser Tartaric Gem recipe in the Guide (#947) +- Fixed Dagger of Sacrifice one-shotting bosses. It now just doesn't work (#932) +- Fixed controls re-binding after each startup (#922) +- Added an alchemy array, the Array of the Fast Miner + +------------------------------------------------------ +Version 2.1.0-65 +------------------------------------------------------ +- Fixed NPE when attacking mobs when you don't have a set of Living Armour. Oops. + +------------------------------------------------------ +Version 2.1.0-64 +------------------------------------------------------ +- Fixed the symmetry issues of the Ritual of Containment +- Changed the recipe of the Acceleration rune so that it is a T4 rune. +- Added the Charging rune, which accumulates charge by using the LP from the Blood Altar (1 charge = 1 LP always). If enough charge is stored when crafting, the crafting occurs instantly. +- Added the entries for the Rune of Augmented Capacity, Charging Rune, and Rune of Acceleration +- Fixed the Sigil of Translocation so that it does not crash when picking up certain blocks. Also removed the damned lightning. +- Changed the Quick Feet upgrade and the speed boost sigil so that their speeds are applied when strafing and walking backwards as well. + +------------------------------------------------------ +Version 2.1.0-63 +------------------------------------------------------ +- Removed the darn testing code from the Divination Sigil. >.> + +------------------------------------------------------ +Version 2.1.0-62 +------------------------------------------------------ +- Fixed the fact rituals were not working (Might have been a compiler error). + +------------------------------------------------------ +Version 2.1.0-61 +------------------------------------------------------ +- Added fancy rendering for the Inversion Pillars. +- Made the Meteor registry more manageable by separating the meteors into independent .json files. +- Fixed the Sigil of Holding so that it does not crash servers when pressing the Holding key ('H' by default) + +------------------------------------------------------ +Version 2.1.0-60 +------------------------------------------------------ +- Fixed routing node serialization. +- Removed unwanted System.out lines when clicking on the slots in the routing node. + +------------------------------------------------------ +Version 2.1.0-59 +------------------------------------------------------ +- Added the Living Armour Upgrade, Nocturnal Prowess, which gives night vision in dark areas and increases damage while the area is dark. +- Added a LOT of dungeon blocks. I mean a lot. +- Finished adding the recipes for all of the blocks (except the Demon Alloy) +- Added a temporary texture (finally) for the Inspectoris Scandalum +- Fixed Specters spawning with the /give command +- Fixed the sacrifice range of the altar. +- Fixed the Regeneration ritual so that it works on non-players +- Added Mimic entry to The Architect. +- Configurified the Meteor Ritual - Modpacks and users can edit all of the major properties of the meteor ritual, including what items need to be dropped onto the ritual as well as what you get in the ritual, radius, etc. The config will refresh if there is a version change unless you set "resyncOnVersionChange" to false. +- Merged the three brick variants into one. +- Added the Inversion Pillar models and caps + +------------------------------------------------------ +Version 2.0.4-58 +------------------------------------------------------ +- Temporarily removed the dungeon stuff so that it doesn't crash. + +------------------------------------------------------ +Version 2.0.4-57 +------------------------------------------------------ +- Changed the Demon Will Aura Gauge so it refreshes based on the player's ticks existed +- Made Draft of Angelus craftable with gold dust +- Fixed Elytra upgrade +- Added the Mimics - the real ones +- Implemented a bit of framework for some T5 shenanigans. +- Fixed the Incense Altar so it properly detected the south sides of the altar. +- Updated the Filtered Item Routing Nodes' GUI so that it behaved less like ass. Also added the necessary nbt porting code. +- Further improved the routing GUI by allowing an amount to be typed into the amount bar. +- Updated the toggleable sigils so they drain the user's LP based on the user's total ticks existed instead of the world time. This is to solve the doDaylightCycle glitch in this scenario. + +------------------------------------------------------ +Version 2.0.4-56 +------------------------------------------------------ +- Fixed an incompatability between the 1.10.2 and the 1.9.4 versions + +------------------------------------------------------ +Version 2.0.4-55 +------------------------------------------------------ +- Made Guide-API a required mod. +- Fixed a funky issue where the Sound of the Cleansing Soul did not reset the upgrade points internally. +- Added Sentient Specters, which are essentially tamable companions. Drop a sentient tool if you have more than 1024 Will of a given type to summon one (at the cost of 100 Will). +- Added Mimic Blocks! + +------------------------------------------------------ +Version 2.0.3-54 +------------------------------------------------------ +- Eliminated some of the "wonkiness" from the Air Sigil +- Fixed the Hellfire Forge so that swapping Tartaric gems will not give free stuff. +- Added the Potion Flask and a few of the potion effects - max amount of effects that can be added to a single flask is currently 3. +- Fixed the Aura gauge not resetting in chunks that do not have any Aura +- Added tooltips for the progress to the next upgrade for Living Armour (hold shift + M) +- Finished off The Architect docs for now +- Finished off The Demon Kin docs for the time being + +------------------------------------------------------ +Version 2.0.3-53 +------------------------------------------------------ +- Fixed issue where the mod doesn't load on servers. Oops. + +------------------------------------------------------ +Version 2.0.3-52 +------------------------------------------------------ +- Updated the Sanguine Scientiem with Alchemy Array recipes +- Fixed the Blood Altar so that it can (again) work on a stack size larger than 1. + +------------------------------------------------------ +Version 2.0.3-51 +------------------------------------------------------ +- Added the Demon Will Aura Gauge to accurately determine the Will in the Aura. +- Added the ability for rituals to have a Demon Will set on them. Now to get rituals to use them. +- Fixed it so that the Crushing Ritual now ignores liquids +- Added the Mark of the Falling Tower ritual. +- Changed the tooltip of the ritual diviner so that it gives information about the selected ritual. +- Added more to the Sanguine Scientiem, including Hellfire Forge recipes and Altar recipes +- Updated a lot of the text in the Sanguine Scientiem + +------------------------------------------------------ +Version 2.0.2-50 +------------------------------------------------------ +- Fixed bad NPE when using the WoS. (Well, I guess all NPEs are technically bad, but I guess it depends on your perspective. That said, I don't think a changelog is the best place for a theoretical discussion about the rights and wrongs of errors, so I will stop now.) + +------------------------------------------------------ +Version 2.0.2-49 +------------------------------------------------------ +- All Alchemy Array recipes are WIP and are subject to change! ^.^ They are created using the Arcane Ash and are shown as first item + second item. +- Added the Movement Array (feather + redstone) +- Added the Mob Beacon Array (2x Zombie Flesh) +- Added the Updraft Array (feather + glowstone) +- Added the Skeleton Turret Array (Arrow + feather) +- Fixed the Lava Crystal recipe so that it can use all tiers of blood orb +- Nerfed the Bound Blade. This is temporary, since the sword eventually will be modified. +- Fixed Teleposers so they no longer crash 1.10 instances when teleposing tiles. + +------------------------------------------------------ +Version 2.0.2-48 +------------------------------------------------------ +- Fixed a stupid bug by a stupid Way + +------------------------------------------------------ +Version 2.0.2-47 +------------------------------------------------------ +- Fixed horrible memory leak in the Living Armour. +- Item Nodes can now be disabled by a (weak) redstone signal. + +------------------------------------------------------ +Version 2.0.2-46 +------------------------------------------------------ +- Fixed it so Ritual stones can be placed by the Ritual Diviner again. Also made it so that rituals are activateable and don't crash servers. + +------------------------------------------------------ +Version 2.0.2-45 +------------------------------------------------------ +- Changed the recipe of the Sanguine Scientiem +- Fixed the Routing system so that it properly eliminates the connection to the Master node when the Master node is broken. +- Fixed an issue where the Spectral Blocks (from the Sigil of Suppression) would return the liquid on the client side before the sigil was deactivated. +- Made it so that the bound tools are (supposedly more so) unbreakable. This will probably come bite me on the ehem later, but we'll see. +- Added Fire Resistance Living Armour Upgrade, "Gift of Ignis." +- Updated The Architect section of the documentation. +- Fixed it so the Ritual will call stopRitual when a ritual stone is broken. +- Added the recipe for the Inspectoris Scandalum (I had to check if I spelled that right) which acts as a helper for Altar Building +- Right-clicking a MRS with the Ritual Diviner will affix the ritual hologram to the MRS. + +------------------------------------------------------ +Version 2.0.2-44 +------------------------------------------------------ +- Added the Draft of Angelus, which increases the max number of upgrade points for Living Armour. It's strawberry flavoured! +- Fixed the Tome of Peritia again - <= and < are the same, right? +- Fixed an interaction between the Tome of Peritia and the Experienced upgrade + +------------------------------------------------------ +Version 2.0.1-43 +------------------------------------------------------ +- Added an initial method to divine where a blood rune is missing for the next tier of altar. +- Fixed an NPE with the Gathering of the Forsaken Souls +- Fixed Absorption Hearts remaining after the absorption buff ends for the Steadfast Sentient Sword +- Updated the Guide (Woooooooooooooo........) +- (Possibly?) fixed Tome of Peritia bug of the Negative Speed of Light +- Added recipes for all ores -> dust in the alchemy table. +- Added the recipes for the Sentient Tools - yes, they all drop Will. +- Fixed the bow so that it now gives you Will when you kill a mob - it does not drop the Will, it goes directly to you. + +------------------------------------------------------ +Version 2.0.1-42 +------------------------------------------------------ +- Fixed Demon Crucible's weird behaviour where right-clicking it with an invalid item would still put the item in the crucible + and give the player an item with a stacksize of 0. +- WAILA! +- Oh, and demon wings with the Elytra. + +------------------------------------------------------ +Version 2.0.1-40 +------------------------------------------------------ +- Bug fix version, and added several translations - some of these are still WIP. +- Fixed render bug with the Alchemy Table +- Demon WIll now drops from slimes at a reduced rate instead of not at all +- Fixed Jesus Water effect with Life Essence +- Added the Vengeful Will crystal cluster recipe. Oops! >.> +- Changed the "Default" Will into "Raw" Will. +- Fixed an item duplication bug with how item pick-up is handled with the Zephyr ritual and the magnetism sigil. +- Made the bound Axe function... correctly +- Fixed a command block only issue with BM commands + +------------------------------------------------------ +Version 2.0.0-39 +------------------------------------------------------ +- Updated to 1.9.4! +- Fixed the Trick Shot upgrade +- Fixed Gate of the Fold endless loop +- Added rune type colors to the Ritual Diviner tooltip +- Crusher ritual ignores unbreakable blocks + +------------------------------------------------------ +Version 2.0.0-38 +------------------------------------------------------ +- Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil +- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices +- Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources. +- Fixed bound sword stuttering + +------------------------------------------------------ +Version 2.0.0-37 +------------------------------------------------------ +- Fixed Elytra upgrade not working on servers. Oops! + +------------------------------------------------------ +Version 2.0.0-36 +------------------------------------------------------ +- Added JEI compat for the Alchemy Table +- Changed the Item Routing system so that it used capabilities instead +- Updated the Alchemy Table recipe system so that it can provide better custom recipes. +- Added some more recipes (like rudimentary ore doubling) to the alchemy table. +- Added Explosive Powder, which is used to reduce cobblestone into gravel and gravel into sand (64 uses) + +------------------------------------------------------ +Version 2.0.0-35 +------------------------------------------------------ +- Changed Living Armour so that it is now damagable. The Living Armour Chestplate will be damaged, but will not break. If it gets to ~0 durability, it will damage your LP network heavily. +- Living Armour is now repairable in an anvil with Binding Reagent. +- Started adding in the Alchemy Table... not really started. +- Changed it so that the Mending enchantment consumes the EXP before the Tome of Peritia does +- Added fall distance mitigation to the jump upgrade +- Fixed Lava Crystals... again. +- Worked on the Alchemy Table +- Added the Elytra upgrade - craft the tome in an anvil by using a book and a full Elytra. + +------------------------------------------------------ +Version 2.0.0-34 +------------------------------------------------------ +- Added config to Blood Magic that will prevent the compression handler from reading the recipes added by the Compression mod (default is true). +- Added Japanese localization and fixed Czech (I can't spell) localization. + +------------------------------------------------------ +Version 2.0.0-33 +------------------------------------------------------ +- Fixed a few localization derps. +- Fixed a few minor bugs. + +------------------------------------------------------ +Version 2.0.0-32 +------------------------------------------------------ +- Changed Tome of Peritia's recipe +- Added step assist living armour upgrade tracker. +- Added new Living Armour upgrades: + - Added Charging Strike, which increases knockback and damage for attacks while sprinting + - Added True Strike, increasing the damage of critical hits +- Updated for Forge 12.16.0.1859 +- Did some work on the Sentient Bow to start adding abilities to it +- Fixed the Speed and Jump rituals so that they correctly update the player's motion. +- Implemented the "Ritual Tinkerer" and added its recipe. + +------------------------------------------------------ +Version 2.0.0-31 +------------------------------------------------------ +- Fixed NPE when using an empty bucket. +- Added Living Armour Upgrades: + - Strong Legs increases jump height. Pro tip: hold shift to bypass this jump boost. + - Soft Fall decreases all fall damage, up to 100% at level 5. + - Grave Digger, for fun times with alternative weapons +- Added increase in speed for Routing nodes inside of a chunk with Demon Aura +- Fixed OutOfBoundsException in the Sentient Sword when you didn't have enough Will. +- Fixed custom potion effects so they could be applied server-sided +- Added recipe for the Tome of Peritia + +------------------------------------------------------ +Version 2.0.0-30 +------------------------------------------------------ +- Wow, there are a lot of bug fixes lately. +- Fixed it so that the blood orb is no longer consumed in the crafting grid. + +------------------------------------------------------ +Version 2.0.0-29 +------------------------------------------------------ +- Fixed formatting not working properly on servers. + +------------------------------------------------------ +Version 2.0.0-28 +------------------------------------------------------ +- Fixed the soul snare. +- Removed health buff from Steadfast armour +- Changed corrosive sword's effect from poison to wither +- Fixed living armour's training bracelet so that it deactivates any training of upgrades not supported +- Added "Experienced" living armour upgrade, which provides more xp from picked up orbs. +- Updated to Forge 1826 + +------------------------------------------------------ +Version 2.0.0-27 +------------------------------------------------------ +- Added OreDict support for the altar (was done in 26) +- Made it so that the Tartaric gem would show visually what type of will was contained +- Allowed the Sentient Sword to use different wills, and change its colour based on the used one. Also made it so you do not toggle it by right clicking, but it simply + rechecks itself when you smack something and when you right-click. +- Fixed item binding. Yusssss. +- Added Sword, Armour, and Bow texture changes when you have different demonic will in your inventory. +- Finalized sentient sword effects +- Did work on the unique demon will effects for armour +- FINALLY changed it so farm animals do not drop demon will. + +------------------------------------------------------ +Version 2.0.0-23 +------------------------------------------------------ +- Fixed "see through world" syndrome for most blocks +- Fixed .obj models so that they will properly render while in-hand +- Fixed routing node attaching logic +- Changed the growth behavior of the crystals +- Fixed Potion getting for various methods +- Started work on crystal automation ritual +- Finished first iteration of the iterator of AreaDescriptor (hehe) +- Finished the crystal automation ritual, "Gathering of the Forsaken Souls." This ritual damages mobs in it's area (21^3 cube around the MRS) and once it kills a mob it + uses its life essence to feed the demonic will crystals inside of its area (two blocks above the ritual stone, 7x7 region and 5 high). This costs LP and + demonic will from the aura of the particular type, and costs less will the more... varied the mobs killed are. Growth amount is dictated by the max health + of the mobs killed. +- Updated to Forge 1811 + +------------------------------------------------------ +Version 2.0.0-22 +------------------------------------------------------ +- Fixed client disconnect when joining servers +- Fixed Bound Blade having same damage between activated and deactivated states +- Fixed Sentient Armour gem so it works, now +- Fixed Armour model textures +- Fixed crash on newer versions of Forge +- Updated zh_CN localization + +------------------------------------------------------ +Version 2.0.0-21 +------------------------------------------------------ +- Initial release to 1.9. Many glitches that have yet to be ironed out, some of them Forge issues. Probably best not to play with this one until Forge stabilizes. + +------------------------------------------------------ +Version 2.0.0-20 +------------------------------------------------------ +- Fixed Blood Altar crashing on odd occasions. +- Fixed GUI of hellfire forge. +- Fixed issue with Will Chunks not generating when requested in new chunks +- Fixed issue where Orb Tier was never set for a player internally +- Fixed Creative Dagger. It now works correctly. Shift + Right Click on an Altar to fill it to capacity. +- Fixed step height being set to incorrect value. Your Chisels and Bits stairs should work, now! +- Fixed Bound Tools not being enchantable. +- Fixed Bound Tools "Beast Mode" breaking blocks unreliably. +- Fixed Blood Light Sigil not using LP +- Changed Will system so that it automatically goes into your inventory and then drops any excess Will on the ground. +- Changed Blood Light to render more particles when the sigil is held to make them easier to find. +- Added debug commands. These work exactly the same as in the 1.7.10 version +- [API] Fixed AddToNetworkEvent not being cancellable even though it should be +- [API] Helper method in NetworkHelper to obtain the highest possible capacity for a given tier. + +------------------------------------------------------ +Version 2.0.0-19 +------------------------------------------------------ +- Fixed path blocks so they are actually craftable. +- Added gui stuff to enable priority in the item routing system: nodes with a lower value priority will be accessed first. (May be rotated in the future) +- Grayed out the currently active side's button in the item routers. +- Added Demon Pylon +- Changed behaviour of Demon Crucible +- Fully implemented the behaviour of the crystal growing process. + - A Demon Crucible will be able to syphon the demon will from the tartaric gems inside of its inventory - right click with a gem to place it into the inventory. + - The syphoned will from the gem will go into the chunk, staying in the air - it will not move to neighbouring chunks unless forced to do so through other means + - The Demon Pylon draws will in the air from surrounding chunks and puts it into its own chunk - this acts as sort of like a pressure system, where it will even out the will distribution, but only goes one way. + - The Demon Crystallizer takes 100 will from the air (need a demon crucible for it to work) and forms a demon crystal on top of it. There is a 10% chance that this crystal will be of a special type. + - The Demon Crystals can be mined in order to collect their crystals. These crystals can be used for crafting more powerful stuff. If you have over 1024 will on your person when you right click the crystal, you can harvest a single crystal instead of the entire thing. + - You can put the harvested crystals inside of a demon crucible. Each crystal is worth 10 will, so this acts as a way to semi-automate will creation. + - When a hellfire forge is inside of a chunk with demon will, it will fill its contained tartaric gem with will. + - Changed a few recipes (like the greater tartaric gem) to match this new system. + +------------------------------------------------------ +Version 2.0.0-18 +------------------------------------------------------ +- Fixed issue with lava crystal working even their is no LP available. +- Added upgrade trainer +- Fixed step height issue with C&B stuff. Apparently step height is now 0.6 by default instead of 0.5. +- Added Ritual: Song of the Cleansing Soul to remove Living Armour upgrades from the armour. +- Added Ritual: Ritual of Living Evolution, which is used to set the living armour's max upgrade points to 300. +- Added Ritual: The Timberman to cut down trees. Requires a chest on top of the MRS in order to collect the drops from harvested trees. +- Added Ritual: Hymn of Syphoning, which syphons up fluids around it in a 16 block radius and puts the fluid in the tank above it. The tank above it must have at least one bucket of the fluid you want to syphon inside of it. +- Added Ritual: The Assembly of the High Altar, which places runes and blocks from the inventory above it in the world in the form of a blood altar. Autobuilding altars~ +- Added Ritual: The Gate of the Fold. +- Added Ritual: The Filler. Places blocks from the inventory on top of it in the world. +- Added Ritual: Le Vulcanos Frigius + +- Added tooltip to living armour to show the current upgrade points of the armour. +- Added recipe for the training bracelet. Combine in an anvil with an upgrade tome to set it as the upgrade to train. +- Ammended range of Zephyr ritual +- Fixed Green Grove ritual +- Fixed Crusher ritual so it didn't break everything at once. +- Removed the FOV effect from the Quick Feet speed upgrade. +- Minor work on the Demon Crucible. +- Crucibles now fill the tartaric gems of close-by hellfire forges +- Fixed rituals not correctly re-activating when taking off a redstone signal after reloading the world. +- Added Teleposition Sigil, which teleports the user to the bound Teleposer. +- Added Transposition Sigil, which picks up the block clicked on including the NBT of the given tile. + +------------------------------------------------------ +Version 2.0.0-17 +------------------------------------------------------ +- Added Living Armour Upgrades + - Solar Powered + - Grim Reaper's Sprint + - [Thaumcraft] Runic Shielding +- Fixed Blood Altar's progress resetting when clicking with another item +- Fixed Divination and Seer sigils crashing when clicking on an altar while not bound +- Added crafting recipes for the following sigils: + - Compression + - Phantom Bridge + - Ender Severance + - Haste +- Dagger now bypasses checks of armour + +------------------------------------------------------ +Version 2.0.0-16 +------------------------------------------------------ +- Fixed a major bug with the Blood Orbs. + +------------------------------------------------------ +Version 2.0.0-15 +------------------------------------------------------ +- Added blood lamp sigil array texture and reagent. Made it so the blood lamp sigil will place the light when right clicking on a block. +- Added magnetism sigil array texture and reagent. +- Added the ability for the blood altar to have its buffer tanks accessed (Semi-tested) +- Improved readability for large numbers +- Fixed break particle for Alchemy Array +- Waila handling for Alchemy Array +- Fixed Ritual eating LP when reactivated via a Redstone signal +- Ritual Stones now always drop blank stones +- Bound Blade is now enchant-able +- Goggles of Revealing upgrade for Living Helmet. Combine a Living Helmet and Goggles of Revealing in an Anvil +- Fixed config for disabling rituals +- [API] Lots of changes to the binding system. It's now handled automatically for all items that implement IBindable. +- Added Incense Altar system. +- Added models for the routing nodes, incense altar, and the hellfire forge. + +------------------------------------------------------ +Version 2.0.0-14 +------------------------------------------------------ +- [API] Added support for some IMC methods: + - FMLInterModComs.sendMessage("BloodMagic", "teleposerBlacklist", ItemStack) + - FMLInterModComs.sendMessage("BloodMagic", "sacrificeValue", "ClassName;Value") + - FMLInterModComs.sendMessage("BloodMagic", "greenGroveBlacklist", "domain:name") +- Fixed the bound sword so that it now drops weak blood shards. +- Fixed the demon will so that you can actually pick it up! + +------------------------------------------------------ +Version 2.0.0-13 +------------------------------------------------------ +- Added recipes and temp textures for path blocks. More path blocks to come. +- Tweaked the Incense altar and added its recipe. +- Fixed Blood Light sigil not providing the right coloured particles +- Added the ability for the divination sigil to look up information about the incense altar. +- Fix another NPE when checking of a player has a full set of Living Armor + +------------------------------------------------------ +Version 2.0.0-12 +------------------------------------------------------ +- This build doesn't exist. Shhh + +------------------------------------------------------ +Version 2.0.0-11 +------------------------------------------------------ +- Fix NPE when checking if a player has a full Living Armor set + +------------------------------------------------------ +Version 2.0.0-10 +------------------------------------------------------ +- Added recipe for Sentient Armour - craft a Sentient Armour Gem and right click with it to toggle the armour. +- Added recipes for the Greater and Grand Tartaric gems. These are temporary recipes. +- Updated textures. +- Added ability to fill gems from other gems. Right click with a gem to fill other gems in your inventory. +- Un-nerfed the Ritual Stone recipe to provide 4 again +- Rituals can now be toggled with Redstone. Provide a redstone signal to the Master Ritual Stone to turn it off. +- Made the Sentient sword able to block. +- Fixed the Sentient Sword so that even when not activated it will still do damage - just at a reduced amount. +- Made it so that Demon Will will be voided if all of the player's tartaric gems are filled. + +------------------------------------------------------ +Version 2.0.0-9 +------------------------------------------------------ +- Fixed the rituals so that they no longer caused nausea no matter what. + +------------------------------------------------------ +Version 2.0.0-8 +------------------------------------------------------ +- Fixed crash when activating rituals while operating on servers +- Added the majority of stuff for the item routing system. + +------------------------------------------------------ +Version 2.0.0-7 +------------------------------------------------------ +- JEI now displays more information for Altar recipes. Hover over the Altar image to view it. +- Added particles to the Blood Altar on the server-side. +- Allow configuration of entity sacrificial values +- [API] Allow setting of entity sacrificial values via API. Takes precedence over config values. +- [API] Method to easily get instances of Items and Blocks +- [API] Allow mods to blacklist their blocks from the Green Grove ritual/sigil + +------------------------------------------------------ +Version 2.0.0-6 +------------------------------------------------------ +- Fixed the LivingArmourTracker for defense so that it no longer ate up armour (om nom nom nom) + +------------------------------------------------------ +Version 2.0.0-5 +------------------------------------------------------ +- Tweaked Sentient Sword's will drop rate +- No longer 1.8.8 compatible +- Cleaned some clutter from JEI +- Added a potential fix to some server mod issues. + + +------------------------------------------------------ +Version 2.0.0-4 +------------------------------------------------------ +- Added Physical resistance upgrade (Tough skin) +- Added health boost upgrade (Healthy) +- Added melee damage upgrade (Fierce strike) +- Added trick shot upgrade (Have fun finding it! :D) +- Added T5 orb recipe and Demonic Activation Crystal +- Added Rituals: + - Animal Growth ritual + - Harvest ritual + - Magnetism ritual + - Crushing ritual + - Full Stomach ritual + +- Added parts for the new Demon Will System + - Added the Demon Will item + - Added the Sentient Sword, which will be powered by consuming demon will + - Added a Lesser Tartaric Gem in order to hold onto more will + - SSSSSSSSoooooooouuuuuuulllllllllsssssss + - Added Hellfire Forge block + - Added rudimentary snare and recipe - has 25% chance for monster to drop its soul + - Added Sentient Bow + - Added Sentient Armour + +- Fixed binding of togglable sigils +- Added saving for ritual tags + +------------------------------------------------------ +Version 2.0.0-3 +------------------------------------------------------ +- Fixed client-side issue when shift-clicking lava crystals into a furnace while on a server. +- Added poison upgrade to Living Armour +- Fixed digging upgrade +- Added self sacrifice upgrade to Living Armour (Tough Palms) +- Added knockback resistance upgrade to Living Armour, trained via eating (Body Builder) + + +------------------------------------------------------ +Version 2.0.0-2 +------------------------------------------------------ +- Added Life Essence bucket recipe +- Added the rendering of LP inside of the altar +- Added Living Armour including some upgrades: + - Added speed upgrade + - Added digging upgrade +- Modified Divination Sigil recipe - no longer uses a block of glass because of issues on servers (tempramental) +- Modified Apprentice Blood Orb recipe to require a block of redstone instead. +- Added the Reagent Air recipe. + + +------------------------------------------------------ +Version 2.0.0 +------------------------------------------------------ + +Initial release of the open beta for the mod to Minecraft v1.8.9! This mod version has a lot of changes. Because it is a full-on rewrite, some of the mechanics of the mod have changed/are going to change. As such, the feel of the mod will be slightly different than previous iterations. +This mod has a large amount of compatibility with the recipe look-up mod, Just Enough Items (JEI). It is VERY much recommended that you download JEI, since it will make your life a lot easier with the new mechanics. +Because this is a beta of a rewrite, there will be a lot of missing content. I am trying my hardest to add new content as fast as I can, but my team and I are only human and can only code so fast. Please give a little patience while we make the mod the best it possibly can! +Also, please submit bug reports or feature requests to the github, https://github.com/WayofTime/BloodMagic. We'll get to the issue soon! + +New +- Added "Alchemy Array" crafting - this is achieved by making some "Arcane Ash" and clicking on the ground to create an array. You then click on the array with the first ingredient and then the second - breaking the array will give the items back. +- Added JEI compatibility +- Added WAILA compatibility (No more needing 3rd-party addons!) + +Changed +- Lots of internals have changed. Too many to list. +- A graphical overhaul of everything has been implemented. These textures were provided by CyanideX's Unity texture pack. BBoldt and Yulife (Inap) from the Unity team are our new permanent texture artists. + +Bug Fixes +- From 85e47dbfa8548220273e252d348b123cd9c1425f Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 24 Oct 2020 22:37:04 -0400 Subject: [PATCH 346/493] Part 1 of reimplementing Ritual Diviner Finished the placement of the Ritual Stones from the ItemRitualDiviner. Still need to finish the rendering system for the ghost blocks. --- src/generated/resources/.cache/cache | 24 +- .../blockstates/masterritualstone.json | 7 + .../assets/bloodmagic/lang/en_us.json | 61 ++ .../models/block/masterritualstone.json | 6 + .../item/activationcrystalawakened.json | 6 + .../item/activationcrystalcreative.json | 6 + .../models/item/activationcrystalweak.json | 6 + .../bloodmagic/models/item/airscribetool.json | 6 + .../models/item/duskscribetool.json | 6 + .../models/item/earthscribetool.json | 6 + .../models/item/firescribetool.json | 6 + .../models/item/masterritualstone.json | 3 + .../bloodmagic/models/item/ritualdiviner.json | 6 + .../models/item/waterscribetool.json | 6 + .../bloodmagictab/ritual_stone_blank.json | 32 + .../bloodmagictab/ritual_stone_master.json | 32 + .../loot_tables/blocks/masterritualstone.json | 19 + .../bloodmagic/recipes/altar/air_tool.json | 14 + .../bloodmagic/recipes/altar/dusk_tool.json | 14 + .../bloodmagic/recipes/altar/earth_tool.json | 14 + .../bloodmagic/recipes/altar/fire_tool.json | 14 + .../bloodmagic/recipes/altar/water_tool.json | 14 + .../recipes/ritual_stone_blank.json | 24 + .../recipes/ritual_stone_master.json | 23 + .../java/WayofTime/bloodmagic/BloodMagic.java | 2 + .../client/render/block/RenderAltar.java | 2 - .../java/WayofTime/bloodmagic/util/Utils.java | 7 + .../client/render/block/RenderFakeBlocks.java | 66 ++ .../common/block/BlockMasterRitualStone.java | 6 +- .../common/block/BlockRitualStone.java | 2 +- .../common/data/GeneratorBaseRecipes.java | 2 + .../common/data/GeneratorLanguage.java | 70 +++ .../common/item/BloodMagicItems.java | 12 + .../common/item/ItemActivationCrystal.java | 2 +- .../common/item/ItemInscriptionTool.java | 66 ++ .../common/item/ItemRitualDiviner.java | 591 ++++++++++++++++++ .../recipe/BloodAltarRecipeProvider.java | 5 + .../tile/TileMasterRitualStone.java | 2 +- .../bloodmagic/tile/base/TileTicking.java | 4 +- .../util/handler/event/ClientHandler.java | 303 +++++++++ 40 files changed, 1486 insertions(+), 11 deletions(-) create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/airscribetool.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/firescribetool.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java create mode 100644 src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 79d86fc3..2564ed42 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -10,13 +10,14 @@ ba1cd8a9475212843e3b26232c8a9943fa0d2d20 assets/bloodmagic/blockstates/duskritua bb3db171734f511fc0c259d86e869b49aa1d0c77 assets/bloodmagic/blockstates/earthritualstone.json e780d6d9e891082dc6ce83fde1697ce36281a02a assets/bloodmagic/blockstates/fireritualstone.json 002795212cc7bf2cad2a91f873d85e2204c6367d assets/bloodmagic/blockstates/lightritualstone.json +e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterritualstone.json 372ecd737f7082a4c2c70e46745f893b1179f885 assets/bloodmagic/blockstates/orbcapacityrune.json 90daa355e528ab8a6582f796951201882f3c56da assets/bloodmagic/blockstates/ritualstone.json 285618c1a8ec36e36d479f577190579ae7616529 assets/bloodmagic/blockstates/sacrificerune.json b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -f7a92ca94cbd68344d89b92dc6c26c15cd1b85b5 assets/bloodmagic/lang/en_us.json +c2662c44f07cfb61b565f1918b4fee1d176ed6f7 assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json 3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json @@ -29,6 +30,7 @@ bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritua c30064f4aa09c42d23e94d118ae5b148eadb3a6c assets/bloodmagic/models/block/earthritualstone.json 4ff1cab1014cd8f655e5f032ecf60dd371f421c3 assets/bloodmagic/models/block/fireritualstone.json 2e1a81c758bfeec2aee807b48239f23241302268 assets/bloodmagic/models/block/lightritualstone.json +eab1713a8879decb2ae05258a6bcfa9da78ec67b assets/bloodmagic/models/block/masterritualstone.json c3a813b735cd229f8597e41d04465926b2e65fe1 assets/bloodmagic/models/block/orbcapacityrune.json 9b2bf2a44b788cbaecbe63a3e085e8de76672e1b assets/bloodmagic/models/block/ritualstone.json a8a1d06fcc2f8395530c72d2846133fff37d5537 assets/bloodmagic/models/block/sacrificerune.json @@ -36,7 +38,11 @@ a8a1d06fcc2f8395530c72d2846133fff37d5537 assets/bloodmagic/models/block/sacrific 65fe5e01ed2660e45a5c329ff2389a87e4d791ec assets/bloodmagic/models/block/speedrune.json 6041f2e47f5437d90a58586e42d18dadc42df439 assets/bloodmagic/models/block/waterritualstone.json 9462d62d9bc9408359d30728de8651dc104aacf1 assets/bloodmagic/models/item/accelerationrune.json +1aad9b00930b996e3680223cfcb631db2d9cb5ce assets/bloodmagic/models/item/activationcrystalawakened.json +5b8a9b260de9e5eccac525b3fa665ae973f5d23f assets/bloodmagic/models/item/activationcrystalcreative.json +80d2bbc93783663f605b360e6df25bd6497c704a assets/bloodmagic/models/item/activationcrystalweak.json fe8e3deb3ad0107ca3ebd70694c1fc55a987d912 assets/bloodmagic/models/item/airritualstone.json +0bcf230493163a43357cbee7c26b8756089cb548 assets/bloodmagic/models/item/airscribetool.json 17cbe9142ef3950ea1b6be11694b849f55e93f13 assets/bloodmagic/models/item/airsigil.json f150f178edf7d6d250bcfd84af1c28a21cff09c6 assets/bloodmagic/models/item/altarcapacityrune.json 866b8cdd3da56e2e82dbd5f16ab5117b5a503749 assets/bloodmagic/models/item/apprenticebloodorb.json @@ -56,9 +62,12 @@ f404148f9df3a61da3c18175885ffa56b2a85a6a assets/bloodmagic/models/item/daggerofs 7af07ab578bbd20e2f834b26d9cafb5fe23bc7d4 assets/bloodmagic/models/item/dislocationrune.json f4531e22aa1db1cff324db5ccb344d3b9fa85c8d assets/bloodmagic/models/item/divinationsigil.json 10aceefca3ad3f0da773cb317c4effc6c06051ea assets/bloodmagic/models/item/duskritualstone.json +5783901af844ab0a741958dbe684d668a9c293c4 assets/bloodmagic/models/item/duskscribetool.json 4d56efd7fdbf430f49903ce201577047687c3804 assets/bloodmagic/models/item/earthritualstone.json +98ee75786f9d0ab2a8c0835896d07d18df77de0f assets/bloodmagic/models/item/earthscribetool.json 4c39378f6c14dc243a7d52564e5a21df94683415 assets/bloodmagic/models/item/etherealslate.json c36bde4f98c0aeb3bf0f369ad3bc067e5f0dc916 assets/bloodmagic/models/item/fireritualstone.json +b5708a8cc7259fd36ffeabd155ea085b9fdef0fd assets/bloodmagic/models/item/firescribetool.json 44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json 109b5485c25d978af55b46682d5bfa7008909458 assets/bloodmagic/models/item/infusedslate.json @@ -66,6 +75,7 @@ f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil. 5a76914a87fc9b99079bb6afed1d4cfe3e4a532e assets/bloodmagic/models/item/lightritualstone.json 15d8178b626da912334774142d40d1012fb21fa0 assets/bloodmagic/models/item/magicianbloodorb.json 0a3566d3c86403f24c22977dd32ffaec727a9ad3 assets/bloodmagic/models/item/masterbloodorb.json +9e377ab2c131993f96ab6fb544bda4dbba0ab87e assets/bloodmagic/models/item/masterritualstone.json 7596826c5b40c2809eb0a42eb5f5f2089290e3e5 assets/bloodmagic/models/item/miningsigil.json ff9b802098659824626dc90dbb5a0d8960234228 assets/bloodmagic/models/item/orbcapacityrune.json b4e1259784354b048cd7ec5ef888a182e3909dc6 assets/bloodmagic/models/item/reagentair.json @@ -77,6 +87,7 @@ baafdb5915c5fbc99b84a54670ed64a6f26cb0fe assets/bloodmagic/models/item/reagentma 95b2925e96a7df71d72568e0ed7b03290293cbe7 assets/bloodmagic/models/item/reagentvoid.json fd1447d943ddc4540a51a72dcbb245d77d45da71 assets/bloodmagic/models/item/reagentwater.json 50bf796adbed412488df48ed9250fc9b0ecd851f assets/bloodmagic/models/item/reinforcedslate.json +8b727eee7b06ffa735e6ba49f0c13042b73c45c0 assets/bloodmagic/models/item/ritualdiviner.json 2722891c9c40b124d85bf9ff8eb885e175f5e6ff assets/bloodmagic/models/item/ritualstone.json db73abb3bcb1731b6fc389e3577910b6aab87b10 assets/bloodmagic/models/item/sacrificerune.json 9403d6195d4d38d5876c2a42f4edfb9bdcd05210 assets/bloodmagic/models/item/sacrificialdagger.json @@ -123,6 +134,7 @@ ec6f6bf7f520182b2044f3cc5a10f1d4c7a8d7ab assets/bloodmagic/models/item/variants/ 0f5a3e1e5993a03ccda156eed855b71fbd0be0a2 assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json 836b5a7f19915af809795a72983a23f0d5f9c5b2 assets/bloodmagic/models/item/voidsigil.json a31019db55828cb937a071ac2f74b125a2d0c955 assets/bloodmagic/models/item/waterritualstone.json +4130e8907fe8fcf0a5de805f9c2b7ba9166323e9 assets/bloodmagic/models/item/waterscribetool.json 7426fed5f833ce3d08602f727f1467dd3e107991 assets/bloodmagic/models/item/watersigil.json f72efc172699d43405019add97f455bd6b7f452b assets/bloodmagic/models/item/weakbloodorb.json 828c0f89e747d48d37c6a86030a8ec59ca5c29cb data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json @@ -133,6 +145,8 @@ e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bl 4a53004c651901cd1245de452810161736d9b067 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json 263f7c251d2f163db5bd229f2ab8a222f23ae03a data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json 7ca400d1141ff4be1b529cd060950b42cf3b9bfb data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json +c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json +1578416eb302aecb3fd61e481634c5c021541f51 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json 832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json 2d29dd0c24c4c11d7438cdeeb26b9357d4359e2c data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json 7a7f9f995d2414289d07c0a145647c8e735a6b78 data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json @@ -150,6 +164,7 @@ a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/disl 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/earthritualstone.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/fireritualstone.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/lightritualstone.json +72610188b4538d98ffcd015c2813d63d19889d5f data/bloodmagic/loot_tables/blocks/masterritualstone.json 95442c1bb740fab2eb8ee051f7184813f6023afa data/bloodmagic/loot_tables/blocks/orbcapacityrune.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/ritualstone.json e0239eff7762a414a4e4faa0158d844dffb8c1f6 data/bloodmagic/loot_tables/blocks/sacrificerune.json @@ -157,13 +172,18 @@ e0239eff7762a414a4e4faa0158d844dffb8c1f6 data/bloodmagic/loot_tables/blocks/sacr f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soulforge.json 015e07226fd90935f7ec663f4bcf3873a57a82d1 data/bloodmagic/loot_tables/blocks/speedrune.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/waterritualstone.json +3c9d829f7bff8a4d607c46fc3ff4f86dffa28fd5 data/bloodmagic/recipes/altar/air_tool.json f41b0e9dfab608c42a85c3c5c5bbc050b03f02a1 data/bloodmagic/recipes/altar/apprenticebloodorb.json 2a67e37497a571b5ee944375d315fddccea87697 data/bloodmagic/recipes/altar/daggerofsacrifice.json c5a4a256a7437f2e13c574a6f0c4d75fc2e718cb data/bloodmagic/recipes/altar/demonicslate.json +d79a96eb3eed597f1c18a8983764a6362a24748c data/bloodmagic/recipes/altar/dusk_tool.json +7272cdd4e1469cf83849e5444b4b93a7563a6bf2 data/bloodmagic/recipes/altar/earth_tool.json +37913b1babf9b8159332db09b114c919b1b49473 data/bloodmagic/recipes/altar/fire_tool.json 9aeb0d2d33d839eedb2d9bbdaf76fc73e0b39941 data/bloodmagic/recipes/altar/imbuedslate.json 2643d1516f6dae79128fdc8c48c4cfe23453f171 data/bloodmagic/recipes/altar/magicianbloodorb.json f38355165034ce314a9f0344ebc3a6cad22c76c8 data/bloodmagic/recipes/altar/reinforcedslate.json 584d01dff4d64bb88bd3783751a29723700f1728 data/bloodmagic/recipes/altar/slate.json +926d4a0e165c87a15a609744d832d2f5f04a40d0 data/bloodmagic/recipes/altar/water_tool.json 7551501cf361667ec7454c307b9d2368536fbed6 data/bloodmagic/recipes/altar/weakbloodorb.json e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json @@ -182,6 +202,8 @@ f905c1a8ca4d3a9f841ca6c44caa91de327fc29d data/bloodmagic/recipes/blood_rune_char b63d77c3762f86d4a91f62e192c3e9b26e3b52ca data/bloodmagic/recipes/blood_rune_sacrifice.json 7c4e247c1df6ef594bbb2fc2196afb102f45982b data/bloodmagic/recipes/blood_rune_self_sacrifice.json e2bcf2a6f951fbcef45554ec90ba28d14e261d18 data/bloodmagic/recipes/blood_rune_speed.json +7757e5fd52f71b0d21595e072593fc592210dd64 data/bloodmagic/recipes/ritual_stone_blank.json +8608f828f997b1a8015287bd9cd436e9d7dff2ff data/bloodmagic/recipes/ritual_stone_master.json aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json d699e777c72a5f61c4e6cdfea8705628e1c2b855 data/bloodmagic/recipes/soul_forge.json 2455bf8c205c7244fef2b7d7afeef060e30520b7 data/bloodmagic/recipes/soul_snare.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json new file mode 100644 index 00000000..c6276d28 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/masterritualstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index bc3f1ecf..174a9763 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -1,16 +1,32 @@ { "block.bloodmagic.accelerationrune": "Acceleration Rune", + "block.bloodmagic.airritualstone": "Air Ritual Stone", "block.bloodmagic.altar": "Blood Altar", "block.bloodmagic.altarcapacityrune": "Rune of Capacity", "block.bloodmagic.bettercapacityrune": "Rune of Augmented Capacity", "block.bloodmagic.blankrune": "Blank Rune", "block.bloodmagic.chargingrune": "Charging Rune", "block.bloodmagic.dislocationrune": "DisplacementRune", + "block.bloodmagic.duskritualstone": "Dusk Ritual Stone", + "block.bloodmagic.earthritualstone": "Earth Ritual Stone", + "block.bloodmagic.fireritualstone": "Fire Ritual Stone", + "block.bloodmagic.lightritualstone": "Dawn Ritual Stone", + "block.bloodmagic.masterritualstone": "Master Ritual Stone", "block.bloodmagic.orbcapacityrune": "Rune of the Orb", + "block.bloodmagic.ritualstone": "Ritual Stone", "block.bloodmagic.sacrificerune": "Rune of Sacrifice", "block.bloodmagic.selfsacrificerune": "Rune of Self Sacrifice", "block.bloodmagic.soulforge": "Hellfire Forge", "block.bloodmagic.speedrune": "Speed Rune", + "block.bloodmagic.waterritualstone": "Water Ritual Stone", + "chat.bloodmagic.ritual.activate": "A rush of energy flows through the ritual!", + "chat.bloodmagic.ritual.notValid": "You feel that these runes are not configured correctly...", + "chat.bloodmagic.ritual.prevent": "The ritual is actively resisting you!", + "chat.bloodmagic.ritual.weak": "You feel a push, but are too weak to perform this ritual.", + "item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal", + "item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal", + "item.bloodmagic.activationcrystalweak": "Weak Activation Crystal", + "item.bloodmagic.airscribetool": "Inscription Tool: Air", "item.bloodmagic.airsigil": "Air Sigil", "item.bloodmagic.apprenticebloodorb": "Apprentice Blood Orb", "item.bloodmagic.arcaneashes": "Arcane Ashes", @@ -24,7 +40,10 @@ "item.bloodmagic.daggerofsacrifice": "Dagger of Sacrifice", "item.bloodmagic.demonslate": "Demonic Slate", "item.bloodmagic.divinationsigil": "Divination Sigil", + "item.bloodmagic.duskscribetool": "Inscription Tool: Dusk", + "item.bloodmagic.earthscribetool": "Inscription Tool: Earth", "item.bloodmagic.etherealslate": "Ethereal Slate", + "item.bloodmagic.firescribetool": "Inscription Tool: Fire", "item.bloodmagic.growthsigil": "Sigil of the Green Grove", "item.bloodmagic.icesigil": "Sigil of the Frozen Lake", "item.bloodmagic.infusedslate": "Imbued Slate", @@ -50,6 +69,7 @@ "item.bloodmagic.soulsnare": "Soul Snare", "item.bloodmagic.soulsword": "Sentient Sword", "item.bloodmagic.voidsigil": "Void Sigil", + "item.bloodmagic.waterscribetool": "Inscription Tool: Water", "item.bloodmagic.watersigil": "Water Sigil", "item.bloodmagic.weakbloodorb": "Weak Blood Orb", "itemGroup.bloodmagic.creativeTab": "Blood Magic", @@ -63,7 +83,37 @@ "jei.bloodmagic.recipe.requiredtier": "Tier: %d", "jei.bloodmagic.recipe.soulforge": "Hellfire Forge", "jei.bloodmagic.recipe.soulsdrained": "Drained: %s Will", + "ritual.bloodmagic.altarBuilderRitual": "The Assembly of the High Altar", + "ritual.bloodmagic.animalGrowthRitual": "Ritual of the Shepherd", + "ritual.bloodmagic.armourEvolveRitual": "Ritual of Living Evolution", + "ritual.bloodmagic.cobblestoneRitual": "Le Vulcanos Frigius", + "ritual.bloodmagic.containmentRitual": "Ritual of Containment", + "ritual.bloodmagic.crushingRitual": "Ritual of the Crusher", + "ritual.bloodmagic.expulsionRitual": "Aura of Expulsion", + "ritual.bloodmagic.featheredKnifeRitual": "Ritual of the Feathered Knife", + "ritual.bloodmagic.fellingRitual": "The Timberman", + "ritual.bloodmagic.fullStomachRitual": "Ritual of the Satiated Stomach", + "ritual.bloodmagic.greenGroveRitual": "Ritual of the Green Grove", + "ritual.bloodmagic.harvestRitual": "Reap of the Harvest Moon", + "ritual.bloodmagic.interdictionRitual": "Ritual of Interdiction", + "ritual.bloodmagic.jumpRitual": "Ritual of the High Jump", + "ritual.bloodmagic.lavaRitual": "Serenade of the Nether", + "ritual.bloodmagic.magneticRitual": "Ritual of Magnetism", + "ritual.bloodmagic.placerRitual": "The Filler", + "ritual.bloodmagic.portalRitual": "The Gate of the Fold", + "ritual.bloodmagic.pumpRitual": "Hymn of Siphoning", + "ritual.bloodmagic.regenerationRitual": "Ritual of Regeneration", + "ritual.bloodmagic.speedRitual": "Ritual of Speed", + "ritual.bloodmagic.suppressionRitual": "Ritual of Suppression", + "ritual.bloodmagic.testRitual": "Test Ritual", + "ritual.bloodmagic.upgradeRemoveRitual": "Sound of the Cleansing Soul", + "ritual.bloodmagic.waterRitual": "Ritual of the Full Spring", + "ritual.bloodmagic.wellOfSufferingRitual": "Well of Suffering", + "ritual.bloodmagic.zephyrRitual": "Call of the Zephyr", "tile.bloodmagic.soulforge.name": "Hellfire Forge", + "tooltip.bloodmagic.activationcrystal.awakened": "Activates more powerful rituals", + "tooltip.bloodmagic.activationcrystal.creative": "Creative Only - Activates any ritual", + "tooltip.bloodmagic.activationcrystal.weak": "Activates low-level rituals", "tooltip.bloodmagic.arcaneAshes": "Ashes used to draw an alchemy circle", "tooltip.bloodmagic.config.disabled": "Currently disabled in the Config", "tooltip.bloodmagic.currentBaseType.corrosive": "Corrosive", @@ -80,6 +130,17 @@ "tooltip.bloodmagic.currentType.vengeful": "Contains: Vengeful Will", "tooltip.bloodmagic.decoration.notSafe": "Dangerous for decoration", "tooltip.bloodmagic.decoration.safe": "Safe for decoration", + "tooltip.bloodmagic.diviner.airRune": "Air Runes: %d", + "tooltip.bloodmagic.diviner.blankRune": "Blank Runes: %d", + "tooltip.bloodmagic.diviner.currentDirection": "Current Direction: %s", + "tooltip.bloodmagic.diviner.currentRitual": "Current Ritual: %s", + "tooltip.bloodmagic.diviner.dawnRune": "Dawn Runes: %d", + "tooltip.bloodmagic.diviner.duskRune": "Dusk Runes: %d", + "tooltip.bloodmagic.diviner.earthRune": "Earth Runes: %d", + "tooltip.bloodmagic.diviner.extraInfo": "Press shift for extra info", + "tooltip.bloodmagic.diviner.fireRune": "Fire Runes: %d", + "tooltip.bloodmagic.diviner.totalRune": "Total Runes: %d", + "tooltip.bloodmagic.diviner.waterRune": "Water Runes: %d", "tooltip.bloodmagic.extraInfo": "&9-Hold shift for more info-", "tooltip.bloodmagic.orb.desc": "Stores raw Life Essence", "tooltip.bloodmagic.orb.owner": "Added by: %s", diff --git a/src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json new file mode 100644 index 00000000..cbb503be --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/masterritualstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json new file mode 100644 index 00000000..649ad064 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/activationcrystalawakened" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json new file mode 100644 index 00000000..3492cbfa --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/activationcrystalcreative" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json new file mode 100644 index 00000000..ad573a49 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/activationcrystalweak" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/airscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/airscribetool.json new file mode 100644 index 00000000..a8fef50d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/airscribetool.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/airscribetool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json new file mode 100644 index 00000000..4f2c111c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/duskscribetool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json new file mode 100644 index 00000000..6cb9308c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/earthscribetool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/firescribetool.json b/src/generated/resources/assets/bloodmagic/models/item/firescribetool.json new file mode 100644 index 00000000..f5e0d3af --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/firescribetool.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/firescribetool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json new file mode 100644 index 00000000..84e36366 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/masterritualstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json b/src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json new file mode 100644 index 00000000..d0a26bd9 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/ritualdiviner" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json new file mode 100644 index 00000000..1c9aec5b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/waterscribetool" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json new file mode 100644 index 00000000..ef6c9fdb --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:ritual_stone_blank" + ] + }, + "criteria": { + "has_apprentice_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:apprenticebloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:ritual_stone_blank" + } + } + }, + "requirements": [ + [ + "has_apprentice_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json new file mode 100644 index 00000000..878c9ebb --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:ritual_stone_master" + ] + }, + "criteria": { + "has_magician_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:magicianbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:ritual_stone_master" + } + } + }, + "requirements": [ + [ + "has_magician_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json new file mode 100644 index 00000000..8b9eb94d --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:masterritualstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json new file mode 100644 index 00000000..a34cb046 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json @@ -0,0 +1,14 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "minecraft:ghast_tear" + }, + "output": { + "item": "bloodmagic:airscribetool", + "nbt": "{Damage:0}" + }, + "upgradeLevel": 2, + "altarSyphon": 1000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json new file mode 100644 index 00000000..a8a08519 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json @@ -0,0 +1,14 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:storage_blocks/coal" + }, + "output": { + "item": "bloodmagic:duskscribetool", + "nbt": "{Damage:0}" + }, + "upgradeLevel": 3, + "altarSyphon": 2000, + "consumptionRate": 20, + "drainRate": 10 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json new file mode 100644 index 00000000..72ddfcc8 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json @@ -0,0 +1,14 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:obsidian" + }, + "output": { + "item": "bloodmagic:earthscribetool", + "nbt": "{Damage:0}" + }, + "upgradeLevel": 2, + "altarSyphon": 1000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json new file mode 100644 index 00000000..859c6e17 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json @@ -0,0 +1,14 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "minecraft:magma_cream" + }, + "output": { + "item": "bloodmagic:firescribetool", + "nbt": "{Damage:0}" + }, + "upgradeLevel": 2, + "altarSyphon": 1000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json new file mode 100644 index 00000000..95508bc1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json @@ -0,0 +1,14 @@ +{ + "type": "bloodmagic:altar", + "input": { + "tag": "forge:storage_blocks/lapis" + }, + "output": { + "item": "bloodmagic:waterscribetool", + "nbt": "{Damage:0}" + }, + "upgradeLevel": 2, + "altarSyphon": 1000, + "consumptionRate": 5, + "drainRate": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json b/src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json new file mode 100644 index 00000000..aa493752 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "tag": "forge:obsidian" + }, + "b": { + "item": "bloodmagic:reinforcedslate" + }, + "c": { + "type": "bloodmagic:bloodorb", + "orb_tier": 2 + } + }, + "result": { + "item": "bloodmagic:ritualstone", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json b/src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json new file mode 100644 index 00000000..4cdb269e --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "tag": "forge:obsidian" + }, + "b": { + "item": "bloodmagic:ritualstone" + }, + "c": { + "type": "bloodmagic:bloodorb", + "orb_tier": 3 + } + }, + "result": { + "item": "bloodmagic:masterritualstone" + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index fb69752f..2fc39a67 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -52,6 +52,7 @@ import wayoftime.bloodmagic.potion.BloodMagicPotions; import wayoftime.bloodmagic.ritual.RitualManager; import wayoftime.bloodmagic.tile.TileAlchemyArray; import wayoftime.bloodmagic.tile.TileAltar; +import wayoftime.bloodmagic.tile.TileMasterRitualStone; import wayoftime.bloodmagic.tile.TileSoulForge; import wayoftime.bloodmagic.util.handler.event.GenericHandler; import wayoftime.bloodmagic.util.handler.event.WillHandler; @@ -149,6 +150,7 @@ public class BloodMagic event.getRegistry().register(TileEntityType.Builder.create(TileAltar::new, BloodMagicBlocks.BLOOD_ALTAR.get()).build(null).setRegistryName("altar")); event.getRegistry().register(TileEntityType.Builder.create(TileAlchemyArray::new, BloodMagicBlocks.ALCHEMY_ARRAY.get()).build(null).setRegistryName("alchemyarray")); event.getRegistry().register(TileEntityType.Builder.create(TileSoulForge::new, BloodMagicBlocks.SOUL_FORGE.get()).build(null).setRegistryName("soulforge")); + event.getRegistry().register(TileEntityType.Builder.create(TileMasterRitualStone::new, BloodMagicBlocks.MASTER_RITUAL_STONE.get()).build(null).setRegistryName("masterritualstone")); } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index e30c3cb1..ed85e794 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -3,7 +3,6 @@ package wayoftime.bloodmagic.client.render.block; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.block.RedstoneBlock; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; @@ -40,7 +39,6 @@ public class RenderAltar extends TileEntityRenderer @Override public void render(TileAltar tileAltar, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) { - RedstoneBlock d; ItemStack inputStack = tileAltar.getStackInSlot(0); float level = ((float) tileAltar.getCurrentBlood()) / (float) tileAltar.getCapacity(); diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 4c78886f..061e85ea 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,5 +1,7 @@ package wayoftime.bloodmagic.util; +import java.util.Locale; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; @@ -48,4 +50,9 @@ public class Utils return false; } + + public static String toFancyCasing(String input) + { + return String.valueOf(input.charAt(0)).toUpperCase(Locale.ENGLISH) + input.substring(1); + } } diff --git a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java b/src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java new file mode 100644 index 00000000..50f5a5f2 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java @@ -0,0 +1,66 @@ +package wayoftime.bloodmagic.client.render.block; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; + +public class RenderFakeBlocks +{ + public static void drawFakeBlock(TextureAtlasSprite texture, double minX, double minY, double minZ) + { + if (texture == null) + return; + + double maxX = minX + 1; + double maxY = minY + 1; + double maxZ = minZ + 1; + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder wr = tessellator.getBuffer(); + + Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(texture.getName()); + + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + + float texMinU = texture.getMinU(); + float texMinV = texture.getMinV(); + float texMaxU = texture.getMaxU(); + float texMaxV = texture.getMaxV(); + + wr.pos(minX, minY, minZ).tex(texMinU, texMinV).endVertex(); + wr.pos(maxX, minY, minZ).tex(texMaxU, texMinV).endVertex(); + wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); + wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); + + wr.pos(minX, maxY, maxZ).tex(texMinU, texMaxV).endVertex(); + wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMaxV).endVertex(); + wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); + wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex(); + + wr.pos(maxX, minY, minZ).tex(texMinU, texMaxV).endVertex(); + wr.pos(minX, minY, minZ).tex(texMaxU, texMaxV).endVertex(); + wr.pos(minX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); + wr.pos(maxX, maxY, minZ).tex(texMinU, texMinV).endVertex(); + + wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); + wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); + wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMinV).endVertex(); + wr.pos(minX, maxY, maxZ).tex(texMinU, texMinV).endVertex(); + + wr.pos(minX, minY, minZ).tex(texMinU, texMaxV).endVertex(); + wr.pos(minX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); + wr.pos(minX, maxY, maxZ).tex(texMaxU, texMinV).endVertex(); + wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex(); + + wr.pos(maxX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); + wr.pos(maxX, minY, minZ).tex(texMaxU, texMaxV).endVertex(); + wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); + wr.pos(maxX, maxY, maxZ).tex(texMinU, texMinV).endVertex(); + + tessellator.draw(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java index 7fb09854..f1113705 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java @@ -66,15 +66,15 @@ public class BlockMasterRitualStone extends Block } } else { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); } } else { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); } } else { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); } } } diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java index d76bfe60..e8600607 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java @@ -58,7 +58,7 @@ public class BlockRitualStone extends Block implements IRitualStone public void setRuneType(World world, BlockPos pos, EnumRuneType runeType) { Block runeBlock = this; - switch (type) + switch (runeType) { case AIR: runeBlock = BloodMagicBlocks.AIR_RITUAL_STONE.get(); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java index 60f56a5f..1d445664 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java @@ -45,6 +45,8 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CAPACITY_RUNE.get()).key('a', Tags.Items.STONE).key('b', Items.BUCKET).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', BloodMagicItems.IMBUED_SLATE.get()).patternLine("aba").patternLine("bcb").patternLine("ada").addCriterion("has_imbued_slate", hasItem(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl("blood_rune_capacity")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ORB_RUNE.get()).key('a', Tags.Items.STONE).key('b', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aba").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_orb")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CHARGING_RUNE.get()).key('R', Tags.Items.DUSTS_REDSTONE).key('r', BloodMagicBlocks.BLANK_RUNE.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).key('G', Tags.Items.DUSTS_GLOWSTONE).patternLine("RsR").patternLine("GrG").patternLine("ReR").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_charging")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), 4).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_blank")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.MASTER_RITUAL_STONE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicBlocks.BLANK_RITUAL_STONE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_master")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', Ingredient.fromItems(Items.DIAMOND)).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_standard")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_orb")); } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index e72dabd6..1f9f67dc 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -81,8 +81,54 @@ public class GeneratorLanguage extends LanguageProvider add("tooltip.bloodmagic.sigil.air.desc", "I feel lighter already..."); add("tooltip.bloodmagic.sigil.bloodlight.desc", "I see a light!"); + add("tooltip.bloodmagic.activationcrystal.weak", "Activates low-level rituals"); + add("tooltip.bloodmagic.activationcrystal.awakened", "Activates more powerful rituals"); + add("tooltip.bloodmagic.activationcrystal.creative", "Creative Only - Activates any ritual"); + add("itemGroup.bloodmagictab", "Blood Magic"); + // Ritual info + add("tooltip.bloodmagic.diviner.currentRitual", "Current Ritual: %s"); + add("tooltip.bloodmagic.diviner.blankRune", "Blank Runes: %d"); + add("tooltip.bloodmagic.diviner.waterRune", "Water Runes: %d"); + add("tooltip.bloodmagic.diviner.airRune", "Air Runes: %d"); + add("tooltip.bloodmagic.diviner.fireRune", "Fire Runes: %d"); + add("tooltip.bloodmagic.diviner.earthRune", "Earth Runes: %d"); + add("tooltip.bloodmagic.diviner.duskRune", "Dusk Runes: %d"); + add("tooltip.bloodmagic.diviner.dawnRune", "Dawn Runes: %d"); + add("tooltip.bloodmagic.diviner.totalRune", "Total Runes: %d"); + add("tooltip.bloodmagic.diviner.extraInfo", "Press shift for extra info"); + add("tooltip.bloodmagic.diviner.currentDirection", "Current Direction: %s"); + + add("ritual.bloodmagic.testRitual", "Test Ritual"); + add("ritual.bloodmagic.waterRitual", "Ritual of the Full Spring"); + add("ritual.bloodmagic.lavaRitual", "Serenade of the Nether"); + add("ritual.bloodmagic.greenGroveRitual", "Ritual of the Green Grove"); + add("ritual.bloodmagic.jumpRitual", "Ritual of the High Jump"); + add("ritual.bloodmagic.wellOfSufferingRitual", "Well of Suffering"); + add("ritual.bloodmagic.featheredKnifeRitual", "Ritual of the Feathered Knife"); + add("ritual.bloodmagic.regenerationRitual", "Ritual of Regeneration"); + add("ritual.bloodmagic.harvestRitual", "Reap of the Harvest Moon"); + add("ritual.bloodmagic.magneticRitual", "Ritual of Magnetism"); + add("ritual.bloodmagic.crushingRitual", "Ritual of the Crusher"); + add("ritual.bloodmagic.fullStomachRitual", "Ritual of the Satiated Stomach"); + add("ritual.bloodmagic.interdictionRitual", "Ritual of Interdiction"); + add("ritual.bloodmagic.containmentRitual", "Ritual of Containment"); + add("ritual.bloodmagic.speedRitual", "Ritual of Speed"); + add("ritual.bloodmagic.suppressionRitual", "Ritual of Suppression"); + add("ritual.bloodmagic.expulsionRitual", "Aura of Expulsion"); + add("ritual.bloodmagic.zephyrRitual", "Call of the Zephyr"); + add("ritual.bloodmagic.upgradeRemoveRitual", "Sound of the Cleansing Soul"); + add("ritual.bloodmagic.armourEvolveRitual", "Ritual of Living Evolution"); + add("ritual.bloodmagic.animalGrowthRitual", "Ritual of the Shepherd"); + + add("ritual.bloodmagic.cobblestoneRitual", "Le Vulcanos Frigius"); + add("ritual.bloodmagic.placerRitual", "The Filler"); + add("ritual.bloodmagic.fellingRitual", "The Timberman"); + add("ritual.bloodmagic.pumpRitual", "Hymn of Siphoning"); + add("ritual.bloodmagic.altarBuilderRitual", "The Assembly of the High Altar"); + add("ritual.bloodmagic.portalRitual", "The Gate of the Fold"); + // Block names addBlock(BloodMagicBlocks.BLANK_RUNE, "Blank Rune"); addBlock(BloodMagicBlocks.SPEED_RUNE, "Speed Rune"); @@ -96,6 +142,14 @@ public class GeneratorLanguage extends LanguageProvider addBlock(BloodMagicBlocks.CHARGING_RUNE, "Charging Rune"); addBlock(BloodMagicBlocks.BLOOD_ALTAR, "Blood Altar"); addBlock(BloodMagicBlocks.SOUL_FORGE, "Hellfire Forge"); + addBlock(BloodMagicBlocks.BLANK_RITUAL_STONE, "Ritual Stone"); + addBlock(BloodMagicBlocks.AIR_RITUAL_STONE, "Air Ritual Stone"); + addBlock(BloodMagicBlocks.WATER_RITUAL_STONE, "Water Ritual Stone"); + addBlock(BloodMagicBlocks.FIRE_RITUAL_STONE, "Fire Ritual Stone"); + addBlock(BloodMagicBlocks.EARTH_RITUAL_STONE, "Earth Ritual Stone"); + addBlock(BloodMagicBlocks.DUSK_RITUAL_STONE, "Dusk Ritual Stone"); + addBlock(BloodMagicBlocks.DAWN_RITUAL_STONE, "Dawn Ritual Stone"); + addBlock(BloodMagicBlocks.MASTER_RITUAL_STONE, "Master Ritual Stone"); // Item names addItem(BloodMagicItems.WEAK_BLOOD_ORB, "Weak Blood Orb"); @@ -144,6 +198,15 @@ public class GeneratorLanguage extends LanguageProvider addItem(BloodMagicItems.SOUL_SNARE, "Soul Snare"); addItem(BloodMagicItems.SENTIENT_SWORD, "Sentient Sword"); + addItem(BloodMagicItems.WEAK_ACTIVATION_CRYSTAL, "Weak Activation Crystal"); + addItem(BloodMagicItems.AWAKENED_ACTIVATION_CRYSTAL, "Awakened Activation Crystal"); + addItem(BloodMagicItems.CREATIVE_ACTIVATION_CRYSTAL, "Creative Activation Crystal"); + addItem(BloodMagicItems.WATER_INSCRIPTION_TOOL, "Inscription Tool: Water"); + addItem(BloodMagicItems.FIRE_INSCRIPTION_TOOL, "Inscription Tool: Fire"); + addItem(BloodMagicItems.EARTH_INSCRIPTION_TOOL, "Inscription Tool: Earth"); + addItem(BloodMagicItems.AIR_INSCRIPTION_TOOL, "Inscription Tool: Air"); + addItem(BloodMagicItems.DUSK_INSCRIPTION_TOOL, "Inscription Tool: Dusk"); + // addItem(BloodMagicItems , ""); // JEI @@ -157,5 +220,12 @@ public class GeneratorLanguage extends LanguageProvider add("jei.bloodmagic.recipe.altar", "Blood Altar"); add("jei.bloodmagic.recipe.soulforge", "Hellfire Forge"); add("jei.bloodmagic.recipe.alchemyarraycrafting", "Alchemy Array"); + + // Chat + add("chat.bloodmagic.ritual.weak", "You feel a push, but are too weak to perform this ritual."); + add("chat.bloodmagic.ritual.prevent", "The ritual is actively resisting you!"); + add("chat.bloodmagic.ritual.activate", "A rush of energy flows through the ritual!"); + add("chat.bloodmagic.ritual.notValid", "You feel that these runes are not configured correctly..."); + } } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index f79ae7b2..86307df1 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -25,6 +25,7 @@ import wayoftime.bloodmagic.common.item.soul.ItemSoulSnare; import wayoftime.bloodmagic.common.registration.impl.BloodOrbDeferredRegister; import wayoftime.bloodmagic.common.registration.impl.BloodOrbRegistryObject; import wayoftime.bloodmagic.orb.BloodOrb; +import wayoftime.bloodmagic.ritual.EnumRuneType; import wayoftime.bloodmagic.will.EnumDemonWillType; public class BloodMagicItems @@ -62,6 +63,8 @@ public class BloodMagicItems public static final RegistryObject DUSK_RITUAL_STONE_ITEM = ITEMS.register("duskritualstone", () -> new BlockItem(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject DAWN_RITUAL_STONE_ITEM = ITEMS.register("lightritualstone", () -> new BlockItem(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject MASTER_RITUAL_STONE_ITEM = ITEMS.register("masterritualstone", () -> new BlockItem(BloodMagicBlocks.MASTER_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject BLOOD_ALTAR_ITEM = ITEMS.register("altar", () -> new BlockItem(BloodMagicBlocks.BLOOD_ALTAR.get(), new Item.Properties().group(BloodMagic.TAB))); // TODO: Need to rework the above instantiations for the ItemBlocks so that it's @@ -94,10 +97,19 @@ public class BloodMagicItems public static final RegistryObject ARCANE_ASHES = BASICITEMS.register("arcaneashes", () -> new ItemArcaneAshes()); public static final RegistryObject DAGGER_OF_SACRIFICE = BASICITEMS.register("daggerofsacrifice", () -> new ItemDaggerOfSacrifice()); + // Ritual stuffs public static final RegistryObject WEAK_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalweak", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.WEAK)); public static final RegistryObject AWAKENED_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalawakened", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.AWAKENED)); public static final RegistryObject CREATIVE_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalcreative", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.CREATIVE)); + public static final RegistryObject AIR_INSCRIPTION_TOOL = BASICITEMS.register("airscribetool", () -> new ItemInscriptionTool(EnumRuneType.AIR)); + public static final RegistryObject FIRE_INSCRIPTION_TOOL = BASICITEMS.register("firescribetool", () -> new ItemInscriptionTool(EnumRuneType.FIRE)); + public static final RegistryObject WATER_INSCRIPTION_TOOL = BASICITEMS.register("waterscribetool", () -> new ItemInscriptionTool(EnumRuneType.WATER)); + public static final RegistryObject EARTH_INSCRIPTION_TOOL = BASICITEMS.register("earthscribetool", () -> new ItemInscriptionTool(EnumRuneType.EARTH)); + public static final RegistryObject DUSK_INSCRIPTION_TOOL = BASICITEMS.register("duskscribetool", () -> new ItemInscriptionTool(EnumRuneType.DUSK)); + + public static final RegistryObject BASE_RITUAL_DIVINER = BASICITEMS.register("ritualdiviner", () -> new ItemRitualDiviner(0)); + // Reagents used to make the Sigils public static final RegistryObject REAGENT_WATER = BASICITEMS.register("reagentwater", () -> new ItemBase()); public static final RegistryObject REAGENT_LAVA = BASICITEMS.register("reagentlava", () -> new ItemBase()); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java index 83d97492..f6df51f4 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java @@ -30,7 +30,7 @@ public class ItemActivationCrystal extends Item implements IBindable @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.activation_crystal." + type.name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.activationcrystal." + type.name().toLowerCase())); if (!stack.hasTag()) return; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java new file mode 100644 index 00000000..2b2c7f74 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java @@ -0,0 +1,66 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.List; + +import net.minecraft.block.BlockState; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BlockRitualStone; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.util.helper.TextHelper; + +public class ItemInscriptionTool extends Item +{ + private final EnumRuneType type; + + public ItemInscriptionTool(EnumRuneType type) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB).maxDamage(40)); + + this.type = type; + } + + @Override + public ActionResultType onItemUse(ItemUseContext context) + { + ItemStack stack = context.getItem(); + BlockPos pos = context.getPos(); + World world = context.getWorld(); + PlayerEntity player = context.getPlayer(); + BlockState state = world.getBlockState(pos); + + if (state.getBlock() instanceof BlockRitualStone + && !((BlockRitualStone) state.getBlock()).isRuneType(world, pos, type)) + { + ((BlockRitualStone) state.getBlock()).setRuneType(world, pos, type); + if (!player.isCreative()) + { + stack.damageItem(1, player, (entity) -> { + entity.sendBreakAnimation(EquipmentSlotType.MAINHAND); + }); + } + return ActionResultType.SUCCESS; + } + + return ActionResultType.FAIL; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + tooltip.add(new TranslationTextComponent(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc"))); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java new file mode 100644 index 00000000..f3ace9d3 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java @@ -0,0 +1,591 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.Collections; +import java.util.List; + +import com.google.common.collect.Lists; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.particles.ParticleTypes; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BlockRitualStone; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.tile.TileMasterRitualStone; +import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.Utils; +import wayoftime.bloodmagic.util.handler.event.ClientHandler; +import wayoftime.bloodmagic.util.helper.RitualHelper; +import wayoftime.bloodmagic.util.helper.TextHelper; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +public class ItemRitualDiviner extends Item +{ + final int type; + public static final String tooltipBase = "tooltip.bloodmagic.diviner."; + public static String[] names = + { "normal", "dusk", "dawn" }; + + public ItemRitualDiviner(int type) + { + super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); + this.type = type; + } + +// @Override +// public String getHighlightTip(ItemStack stack, String displayName) +// { +// if (Strings.isNullOrEmpty(getCurrentRitual(stack))) +// return displayName; +// +// Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(getCurrentRitual(stack)); +// if (ritual == null) +// return displayName; +// +// return displayName + ": " + TextHelper.localize(ritual.getTranslationKey()); +// } + + @Override + public ActionResultType onItemUse(ItemUseContext context) + { + ItemStack stack = context.getPlayer().getHeldItem(context.getHand()); + if (context.getPlayer().isSneaking()) + { + if (context.getWorld().isRemote) + { + trySetDisplayedRitual(stack, context.getWorld(), context.getPos()); + } + + return ActionResultType.SUCCESS; + } else if (addRuneToRitual(stack, context.getWorld(), context.getPos(), context.getPlayer())) + { + if (context.getWorld().isRemote) + { + spawnParticles(context.getWorld(), context.getPos().offset(context.getFace()), 15); + } + + return ActionResultType.SUCCESS; + // TODO: Have the diviner automagically build the ritual + } + + return ActionResultType.PASS; + } + + /** + * Adds a single rune to the ritual. + * + * @param stack - The Ritual Diviner stack + * @param world - The World + * @param pos - Block Position of the MRS. + * @param player - The Player attempting to place the ritual + * @return - True if a rune was successfully added + */ + public boolean addRuneToRitual(ItemStack stack, World world, BlockPos pos, PlayerEntity player) + { + TileEntity tile = world.getTileEntity(pos); + + if (tile instanceof TileMasterRitualStone) + { + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); + if (ritual != null) + { + Direction direction = getDirection(stack); + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + for (RitualComponent component : components) + { + if (!canPlaceRitualStone(component.getRuneType(), stack)) + { + return false; + } + BlockPos offset = component.getOffset(direction); + BlockPos newPos = pos.add(offset); + BlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); + if (RitualHelper.isRune(world, newPos)) + { + if (RitualHelper.isRuneType(world, newPos, component.getRuneType())) + { + if (world.isRemote) + { + undisplayHologram(); + } + } else + { + // Replace existing ritual stone + RitualHelper.setRuneType(world, newPos, component.getRuneType()); + return true; + } + } else if (block.isAir(state, world, newPos))// || block.isReplaceable(world, newPos)) + { + if (!consumeStone(stack, world, player)) + { + return false; + } + ((BlockRitualStone) BloodMagicBlocks.BLANK_RITUAL_STONE.get()).setRuneType(world, newPos, component.getRuneType()); + return true; + } else + { + return false; // TODO: Possibly replace the block with a + // ritual stone + } + } + } + } + + return false; + } + + @OnlyIn(Dist.CLIENT) + public void trySetDisplayedRitual(ItemStack itemStack, World world, BlockPos pos) + { + TileEntity tile = world.getTileEntity(pos); + + if (tile instanceof TileMasterRitualStone) + { + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(itemStack)); + TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tile; + + if (ritual != null) + { + Direction direction = getDirection(itemStack); + ClientHandler.setRitualHolo(masterRitualStone, ritual, direction, true); + } + } + } + + @OnlyIn(Dist.CLIENT) + public void undisplayHologram() + { + ClientHandler.setRitualHoloToNull(); + } + + // TODO: Make this work for any IRitualStone + public boolean consumeStone(ItemStack stack, World world, PlayerEntity player) + { + if (player.isCreative()) + { + return true; + } + + NonNullList inventory = player.inventory.mainInventory; + for (ItemStack newStack : inventory) + { + if (newStack.isEmpty()) + { + + continue; + } + Item item = newStack.getItem(); + if (item instanceof BlockItem) + { + Block block = ((BlockItem) item).getBlock(); + if (block instanceof BlockRitualStone) + { + newStack.shrink(1); + return true; + } + } + } + + return false; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) + { + if (!stack.hasTag()) + return; + + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); + if (ritual != null) + { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.diviner.currentRitual", new TranslationTextComponent(ritual.getTranslationKey()))); + + boolean sneaking = Screen.hasShiftDown(); +// boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); + boolean extraInfo = Screen.hasAltDown(); + + if (extraInfo) + { + tooltip.add(new StringTextComponent("")); + + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + if (TextHelper.canTranslate(ritual.getTranslationKey() + "." + type.name().toLowerCase() + ".info")) + { + tooltip.add(new TranslationTextComponent(ritual.getTranslationKey() + "." + type.name().toLowerCase() + ".info")); + } + } + } else if (sneaking) + { + tooltip.add(new TranslationTextComponent(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).name()))); + tooltip.add(new StringTextComponent("")); + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + + int blankRunes = 0; + int airRunes = 0; + int waterRunes = 0; + int fireRunes = 0; + int earthRunes = 0; + int duskRunes = 0; + int dawnRunes = 0; + int totalRunes = components.size(); + + for (RitualComponent component : components) + { + switch (component.getRuneType()) + { + case BLANK: + blankRunes++; + break; + case AIR: + airRunes++; + break; + case EARTH: + earthRunes++; + break; + case FIRE: + fireRunes++; + break; + case WATER: + waterRunes++; + break; + case DUSK: + duskRunes++; + break; + case DAWN: + dawnRunes++; + break; + } + } + + if (blankRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "blankRune", blankRunes).mergeStyle(EnumRuneType.BLANK.colorCode)); + if (waterRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "waterRune", waterRunes).mergeStyle(EnumRuneType.WATER.colorCode)); + if (airRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "airRune", airRunes).mergeStyle(EnumRuneType.AIR.colorCode)); + if (fireRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "fireRune", fireRunes).mergeStyle(EnumRuneType.FIRE.colorCode)); + if (earthRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "earthRune", earthRunes).mergeStyle(EnumRuneType.EARTH.colorCode)); + if (duskRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "duskRune", duskRunes).mergeStyle(EnumRuneType.DUSK.colorCode)); + if (dawnRunes > 0) + tooltip.add(new TranslationTextComponent(tooltipBase + "dawnRune", dawnRunes).mergeStyle(EnumRuneType.DAWN.colorCode)); + + tooltip.add(new StringTextComponent("")); + tooltip.add(new TranslationTextComponent(tooltipBase + "totalRune", totalRunes)); + } else + { + tooltip.add(new StringTextComponent("")); + if (TextHelper.canTranslate(ritual.getTranslationKey() + ".info")) + { + tooltip.add(new TranslationTextComponent(ritual.getTranslationKey() + ".info")); + tooltip.add(new StringTextComponent("")); + } + + tooltip.add(new TranslationTextComponent(tooltipBase + "extraInfo")); + tooltip.add(new TranslationTextComponent(tooltipBase + "extraExtraInfo")); + } + } + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) + { + ItemStack stack = player.getHeldItem(hand); + + RayTraceResult ray = rayTrace(world, player, RayTraceContext.FluidMode.NONE); + + if (ray != null && ray.getType() == RayTraceResult.Type.BLOCK) + { + return new ActionResult<>(ActionResultType.PASS, stack); + } + + if (player.isSneaking()) + { + if (!world.isRemote) + { + cycleRitual(stack, player, false); + } + + return new ActionResult<>(ActionResultType.SUCCESS, stack); + } + + return new ActionResult<>(ActionResultType.PASS, stack); + } + + @Override + public void onUse(World worldIn, LivingEntity entityLiving, ItemStack stack, int count) + { + if (!entityLiving.world.isRemote && entityLiving instanceof PlayerEntity) + { + PlayerEntity player = (PlayerEntity) entityLiving; + + RayTraceResult ray = rayTrace(player.world, player, RayTraceContext.FluidMode.NONE); + + if (ray != null && ray.getType() == RayTraceResult.Type.BLOCK) + { + return; +// return false; + } + + if (!player.isSwingInProgress) + { + if (player.isSneaking()) + { + cycleRitual(stack, player, true); + } else + { + cycleDirection(stack, player); + } + } + } + +// return false; + } + + public void cycleDirection(ItemStack stack, PlayerEntity player) + { + Direction direction = getDirection(stack); + Direction newDirection; + switch (direction) + { + case NORTH: + newDirection = Direction.EAST; + break; + case EAST: + newDirection = Direction.SOUTH; + break; + case SOUTH: + newDirection = Direction.WEST; + break; + case WEST: + newDirection = Direction.NORTH; + break; + default: + newDirection = Direction.NORTH; + } + + setDirection(stack, newDirection); + notifyDirectionChange(newDirection, player); + } + + public void notifyDirectionChange(Direction direction, PlayerEntity player) + { + player.sendStatusMessage(new TranslationTextComponent(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.name())), true); + } + + public void setDirection(ItemStack stack, Direction direction) + { + if (!stack.hasTag()) + { + stack.setTag(new CompoundNBT()); + } + + CompoundNBT tag = stack.getTag(); + + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); + } + + public Direction getDirection(ItemStack stack) + { + if (!stack.hasTag()) + { + stack.setTag(new CompoundNBT()); + return Direction.NORTH; + } + + CompoundNBT tag = stack.getTag(); + + int dir = tag.getInt(Constants.NBT.DIRECTION); + if (dir == 0) + { + return Direction.NORTH; + } + + return Direction.values()[tag.getInt(Constants.NBT.DIRECTION)]; + } + + /** + * Cycles the ritual forward or backward + */ + public void cycleRitual(ItemStack stack, PlayerEntity player, boolean reverse) + { + String key = getCurrentRitual(stack); + List rituals = BloodMagic.RITUAL_MANAGER.getSortedRituals(); + if (reverse) + Collections.reverse(rituals = Lists.newArrayList(rituals)); + + String firstId = ""; + boolean foundId = false; + boolean foundFirst = false; + + for (Ritual ritual : rituals) + { + String id = BloodMagic.RITUAL_MANAGER.getId(ritual); + + if (!BloodMagic.RITUAL_MANAGER.enabled(id, false) || !canDivinerPerformRitual(stack, ritual)) + { + continue; + } + + if (!foundFirst) + { + firstId = id; + foundFirst = true; + } + + if (foundId) + { + setCurrentRitual(stack, id); + notifyRitualChange(id, player); + return; + } else if (id.equals(key)) + { + foundId = true; + } + } + + if (foundFirst) + { + setCurrentRitual(stack, firstId); + notifyRitualChange(firstId, player); + } + } + + public boolean canDivinerPerformRitual(ItemStack stack, Ritual ritual) + { + if (ritual == null) + { + return false; + } + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + for (RitualComponent component : components) + { + if (!canPlaceRitualStone(component.getRuneType(), stack)) + { + return false; + } + } + + return true; + } + + public void notifyRitualChange(String key, PlayerEntity player) + { + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); + if (ritual != null) + { + player.sendStatusMessage(new TranslationTextComponent(ritual.getTranslationKey()), true); + } + } + + public void setCurrentRitual(ItemStack stack, String key) + { + if (!stack.hasTag()) + { + stack.setTag(new CompoundNBT()); + } + + CompoundNBT tag = stack.getTag(); + + tag.putString("current_ritual", key); + } + + public String getCurrentRitual(ItemStack stack) + { + if (!stack.hasTag()) + { + stack.setTag(new CompoundNBT()); + } + + CompoundNBT tag = stack.getTag(); + return tag.getString("current_ritual"); + } + + public boolean canPlaceRitualStone(EnumRuneType rune, ItemStack stack) + { + int meta = type; + switch (rune) + { + case BLANK: + case AIR: + case EARTH: + case FIRE: + case WATER: + return true; + case DUSK: + return meta >= 1; + case DAWN: + return meta >= 2; + } + + return false; + } + + public static void spawnParticles(World worldIn, BlockPos pos, int amount) + { + BlockState state = worldIn.getBlockState(pos); + Block block = worldIn.getBlockState(pos).getBlock(); + + if (block.isAir(state, worldIn, pos)) + { + for (int i = 0; i < amount; ++i) + { + double d0 = random.nextGaussian() * 0.02D; + double d1 = random.nextGaussian() * 0.02D; + double d2 = random.nextGaussian() * 0.02D; + worldIn.addParticle(ParticleTypes.HAPPY_VILLAGER, (double) ((float) pos.getX() + + random.nextFloat()), (double) pos.getY() + + (double) random.nextFloat(), (double) ((float) pos.getZ() + + random.nextFloat()), d0, d1, d2); + } + } else + { + for (int i1 = 0; i1 < amount; ++i1) + { + double d0 = random.nextGaussian() * 0.02D; + double d1 = random.nextGaussian() * 0.02D; + double d2 = random.nextGaussian() * 0.02D; + worldIn.addParticle(ParticleTypes.HAPPY_VILLAGER, (double) ((float) pos.getX() + + random.nextFloat()), (double) pos.getY() + + (double) random.nextFloat() + * 1.0f, (double) ((float) pos.getZ() + random.nextFloat()), d0, d1, d2); + } + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java index 671843fa..05a898a3 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java @@ -33,9 +33,14 @@ public class BloodAltarRecipeProvider implements ISubRecipeProvider // THREE BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.IMBUED_SLATE.get()), AltarTier.THREE.ordinal(), 5000, 15, 10).build(consumer, BloodMagic.rl(basePath + "imbuedslate")); BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_GOLD), new ItemStack(BloodMagicItems.MAGICIAN_BLOOD_ORB.get()), AltarTier.THREE.ordinal(), 25000, 20, 20).build(consumer, BloodMagic.rl(basePath + "magicianbloodorb")); + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.OBSIDIAN), new ItemStack(BloodMagicItems.EARTH_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "earth_tool")); + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_LAPIS), new ItemStack(BloodMagicItems.WATER_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "water_tool")); + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.MAGMA_CREAM), new ItemStack(BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "fire_tool")); + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.GHAST_TEAR), new ItemStack(BloodMagicItems.AIR_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "air_tool")); // FOUR BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.DEMONIC_SLATE.get()), AltarTier.FOUR.ordinal(), 15000, 20, 20).build(consumer, BloodMagic.rl(basePath + "demonicslate")); + BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL), new ItemStack(BloodMagicItems.DUSK_INSCRIPTION_TOOL.get()), AltarTier.FOUR.ordinal(), 2000, 20, 10).build(consumer, BloodMagic.rl(basePath + "dusk_tool")); // BloodAltarRecipeBuilder.altar(input, output, minimumTier, syphon, consumeRate, drainRate).build(consumer, BloodMagic.rl(basePath + "")); diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java index 5e6083b7..790efcc4 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java @@ -220,7 +220,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS } else { if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); + activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); } return false; diff --git a/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java b/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java index 545dec20..ffc70ebc 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java +++ b/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java @@ -1,7 +1,7 @@ package wayoftime.bloodmagic.tile.base; -import net.minecraft.client.renderer.texture.ITickable; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; /** @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntityType; * programmatically. */ // TODO - Move implementations that depend on existed ticks to new methods from here. -public abstract class TileTicking extends TileBase implements ITickable +public abstract class TileTicking extends TileBase implements ITickableTileEntity { private int ticksExisted; private boolean shouldTick = true; diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java new file mode 100644 index 00000000..0f3f019c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java @@ -0,0 +1,303 @@ +package wayoftime.bloodmagic.util.handler.event; + +import java.util.List; + +import com.google.common.collect.Lists; +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; +import wayoftime.bloodmagic.client.render.RenderResizableCuboid; +import wayoftime.bloodmagic.client.render.block.RenderFakeBlocks; +import wayoftime.bloodmagic.common.item.ItemRitualDiviner; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.tile.TileMasterRitualStone; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Dist.CLIENT) +@OnlyIn(Dist.CLIENT) +public class ClientHandler +{ + public static final boolean SUPPRESS_ASSET_ERRORS = true; + public static ResourceLocation ritualStoneBlank = BloodMagic.rl("block/ritualstone");; + public static ResourceLocation ritualStoneWater = BloodMagic.rl("block/waterritualstone");; + public static ResourceLocation ritualStoneFire = BloodMagic.rl("block/fireritualstone");; + public static ResourceLocation ritualStoneEarth = BloodMagic.rl("block/earthritualstone");; + public static ResourceLocation ritualStoneAir = BloodMagic.rl("block/airritualstone");; + public static ResourceLocation ritualStoneDawn = BloodMagic.rl("block/dawnritualstone");; + public static ResourceLocation ritualStoneDusk = BloodMagic.rl("block/lightritualstone");; + public static TextureAtlasSprite blankBloodRune; + public static TextureAtlasSprite stoneBrick; + public static TextureAtlasSprite glowstone; +// public static TextureAtlasSprite bloodStoneBrick; + public static TextureAtlasSprite beacon; +// public static TextureAtlasSprite crystalCluster; + public static Minecraft minecraft = Minecraft.getInstance(); + private static TileMasterRitualStone mrsHoloTile; + private static Ritual mrsHoloRitual; + private static Direction mrsHoloDirection; + private static boolean mrsHoloDisplay; + + @SubscribeEvent + public static void onTextureStitch(TextureStitchEvent.Pre event) + { + final String BLOCKS = "block/"; + +// ritualStoneBlank = Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(BloodMagic.rl(block//" + "blankrune")); +//// ritualStoneBlank = forName(event.getMap(), "ritualstone", BLOCKS); +// ritualStoneWater = forName(event.getMap(), "waterritualstone", BLOCKS); +// ritualStoneFire = forName(event.getMap(), "fireritualstone", BLOCKS); +// ritualStoneEarth = forName(event.getMap(), "earthritualstone", BLOCKS); +// ritualStoneAir = forName(event.getMap(), "airritualstone", BLOCKS); +// ritualStoneDawn = forName(event.getMap(), "lightritualstone", BLOCKS); +// ritualStoneDusk = forName(event.getMap(), "duskritualstone", BLOCKS); + + blankBloodRune = forName(event.getMap(), "blankrune", BLOCKS); + stoneBrick = event.getMap().getSprite(new ResourceLocation("minecraft:block/stonebrick")); + glowstone = event.getMap().getSprite(new ResourceLocation("minecraft:block/glowstone")); +// bloodStoneBrick = forName(event.getMap(), "BloodStoneBrick", BLOCKS); + beacon = event.getMap().getSprite(new ResourceLocation("minecraft:block/beacon")); +// crystalCluster = forName(event.getMap(), "ShardCluster", BLOCKS); + } + + @SubscribeEvent + public static void render(RenderWorldLastEvent event) + { + ClientPlayerEntity player = minecraft.player; + World world = player.getEntityWorld(); + + if (mrsHoloTile != null) + { + if (world.getTileEntity(mrsHoloTile.getPos()) instanceof TileMasterRitualStone) + { + if (mrsHoloDisplay) + { + IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); + MatrixStack stack = event.getMatrixStack(); + renderRitualStones(stack, buffers, mrsHoloTile, event.getPartialTicks()); + RenderSystem.disableDepthTest(); + buffers.finish(); + } else + ClientHandler.setRitualHoloToNull(); + } else + { + ClientHandler.setRitualHoloToNull(); + } + } + + if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.getType() != RayTraceResult.Type.BLOCK) + return; + + TileEntity tileEntity = world.getTileEntity(((BlockRayTraceResult) minecraft.objectMouseOver).getPos()); + + if (tileEntity instanceof TileMasterRitualStone && !player.getHeldItemMainhand().isEmpty() + && player.getHeldItemMainhand().getItem() instanceof ItemRitualDiviner) + renderRitualStones(player, event.getPartialTicks()); + } + + private static TextureAtlasSprite forName(AtlasTexture textureMap, String name, String dir) + { + return textureMap.getSprite(new ResourceLocation(BloodMagic.MODID + dir + "/" + name)); + } + + private static void renderRitualStones(ClientPlayerEntity player, float partialTicks) + { + World world = player.getEntityWorld(); + ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); + Direction direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); + Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); + + if (ritual == null) + return; + + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); +// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); +// GlStateManager.color4f(1F, 1F, 1F, 0.6125F); + + BlockPos vec3, vX; + vec3 = ((BlockRayTraceResult) minecraft.objectMouseOver).getPos(); + double posX = player.lastTickPosX + (player.getPosX() - player.lastTickPosX) * partialTicks; + double posY = player.lastTickPosY + (player.getPosY() - player.lastTickPosY) * partialTicks; + double posZ = player.lastTickPosZ + (player.getPosZ() - player.lastTickPosZ) * partialTicks; + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + for (RitualComponent ritualComponent : components) + { + vX = vec3.add(ritualComponent.getOffset(direction)); + double minX = vX.getX() - posX; + double minY = vX.getY() - posY; + double minZ = vX.getZ() - posZ; + + if (!world.getBlockState(vX).isOpaqueCube(world, vX)) + { + TextureAtlasSprite texture = null; + +// switch (ritualComponent.getRuneType()) +// { +// case BLANK: +// texture = ritualStoneBlank; +// break; +// case WATER: +// texture = ritualStoneWater; +// break; +// case FIRE: +// texture = ritualStoneFire; +// break; +// case EARTH: +// texture = ritualStoneEarth; +// break; +// case AIR: +// texture = ritualStoneAir; +// break; +// case DAWN: +// texture = ritualStoneDawn; +// break; +// case DUSK: +// texture = ritualStoneDusk; +// break; +// } + + RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); + } + } + + GlStateManager.popMatrix(); + } + + public static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks) + { + IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); + System.out.println("Attempting to render stones"); + ClientPlayerEntity player = minecraft.player; + World world = player.getEntityWorld(); + Direction direction = mrsHoloDirection; + Ritual ritual = mrsHoloRitual; + + if (ritual == null) + { + return; + } +// GlStateManager.pushMatrix(); +// GlStateManager.enableBlend(); +// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); +// GlStateManager.color4f(1F, 1F, 1F, 0.5F); + + BlockPos vec3, vX; + vec3 = masterRitualStone.getPos(); + double posX = player.lastTickPosX + (player.getPosX() - player.lastTickPosX) * partialTicks; + double posY = player.lastTickPosY + (player.getPosY() - player.lastTickPosY) * partialTicks; + double posZ = player.lastTickPosZ + (player.getPosZ() - player.lastTickPosZ) * partialTicks; + + List components = Lists.newArrayList(); + ritual.gatherComponents(components::add); + for (RitualComponent ritualComponent : components) + { + stack.push(); + vX = vec3.add(ritualComponent.getOffset(direction)); + Vector3d eyePos = player.getEyePosition(partialTicks); + double minX = vX.getX() - eyePos.x; + double minY = vX.getY() - eyePos.y; + double minZ = vX.getZ() - eyePos.z; + + stack.translate(minX, minY, minZ); + + if (!world.getBlockState(vX).isOpaqueCube(world, vX)) + { + + ResourceLocation rl = null; + + switch (ritualComponent.getRuneType()) + { + case BLANK: + rl = ritualStoneBlank; + break; + case WATER: + rl = ritualStoneWater; + break; + case FIRE: + rl = ritualStoneFire; + break; + case EARTH: + rl = ritualStoneEarth; + break; + case AIR: + rl = ritualStoneAir; + break; + case DAWN: + rl = ritualStoneDawn; + break; + case DUSK: + rl = ritualStoneDusk; + break; + } + + Model3D model = getBlockModel(rl); + + RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); + +// RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); + } + + stack.pop(); + } + +// GlStateManager.popMatrix(); + } + + private static Model3D getBlockModel(ResourceLocation rl) + { + Model3D model = new BloodMagicRenderer.Model3D(); + model.setTexture(Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(rl)); + model.minX = 0; + model.minY = 0; + model.minZ = 0; + model.maxX = 1; + model.maxY = 1; + model.maxZ = 1; + + return model; + } + + public static void setRitualHolo(TileMasterRitualStone masterRitualStone, Ritual ritual, Direction direction, boolean displayed) + { + mrsHoloDisplay = displayed; + mrsHoloTile = masterRitualStone; + mrsHoloRitual = ritual; + mrsHoloDirection = direction; + } + + public static void setRitualHoloToNull() + { + mrsHoloDisplay = false; + mrsHoloTile = null; + mrsHoloRitual = null; + mrsHoloDirection = Direction.NORTH; + } +} From e254287a5e18847644b33d4026cf85486aa6f4ad Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 25 Oct 2020 10:55:38 -0400 Subject: [PATCH 347/493] Implemented RitualDiviner Finished fully implementing the Ritual Diviner item. Changed the `cycleDirection` method to occur when the player does not sneak + right clicks, because the method for when a player left clicks with an item seems to have dissapeared. --- src/generated/resources/.cache/cache | 3 +- .../assets/bloodmagic/lang/en_us.json | 3 + .../models/item/ritualdivinerdusk.json | 6 ++ .../common/data/GeneratorLanguage.java | 4 + .../common/item/BloodMagicItems.java | 1 + .../common/item/ItemRitualDiviner.java | 13 ++- .../util/handler/event/ClientHandler.java | 98 ++++++++++-------- .../textures/item/ritualdivinerdawn.png | Bin 0 -> 1366 bytes .../textures/item/ritualdivinerdusk.png | Bin 0 -> 1366 bytes 9 files changed, 78 insertions(+), 50 deletions(-) create mode 100644 src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json create mode 100644 src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdawn.png create mode 100644 src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdusk.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 2564ed42..b3623613 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -17,7 +17,7 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -c2662c44f07cfb61b565f1918b4fee1d176ed6f7 assets/bloodmagic/lang/en_us.json +770d87c47f343107732e9191d216803419324608 assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json 3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json @@ -88,6 +88,7 @@ baafdb5915c5fbc99b84a54670ed64a6f26cb0fe assets/bloodmagic/models/item/reagentma fd1447d943ddc4540a51a72dcbb245d77d45da71 assets/bloodmagic/models/item/reagentwater.json 50bf796adbed412488df48ed9250fc9b0ecd851f assets/bloodmagic/models/item/reinforcedslate.json 8b727eee7b06ffa735e6ba49f0c13042b73c45c0 assets/bloodmagic/models/item/ritualdiviner.json +42b96a7c792d1672d798b52fa1c9c4ba58d2df71 assets/bloodmagic/models/item/ritualdivinerdusk.json 2722891c9c40b124d85bf9ff8eb885e175f5e6ff assets/bloodmagic/models/item/ritualstone.json db73abb3bcb1731b6fc389e3577910b6aab87b10 assets/bloodmagic/models/item/sacrificerune.json 9403d6195d4d38d5876c2a42f4edfb9bdcd05210 assets/bloodmagic/models/item/sacrificialdagger.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index 174a9763..cd53036e 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -61,6 +61,8 @@ "item.bloodmagic.reagentvoid": "Void Reagent", "item.bloodmagic.reagentwater": "Water Reagent", "item.bloodmagic.reinforcedslate": "Reinforced Slate", + "item.bloodmagic.ritualdiviner": "Ritual Diviner", + "item.bloodmagic.ritualdivinerdusk": "Ritual Diviner [Dusk]", "item.bloodmagic.sacrificialdagger": "Sacrificial Knife", "item.bloodmagic.sigilofmagnetism": "Sigil of Magnetism", "item.bloodmagic.soulgemcommon": "Common Tartaric Gem", @@ -137,6 +139,7 @@ "tooltip.bloodmagic.diviner.dawnRune": "Dawn Runes: %d", "tooltip.bloodmagic.diviner.duskRune": "Dusk Runes: %d", "tooltip.bloodmagic.diviner.earthRune": "Earth Runes: %d", + "tooltip.bloodmagic.diviner.extraExtraInfo": "-Hold shift + alt for augmentation info-", "tooltip.bloodmagic.diviner.extraInfo": "Press shift for extra info", "tooltip.bloodmagic.diviner.fireRune": "Fire Runes: %d", "tooltip.bloodmagic.diviner.totalRune": "Total Runes: %d", diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json b/src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json new file mode 100644 index 00000000..7b855e6c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/ritualdivinerdusk" + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index 1f9f67dc..f2299b04 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -98,6 +98,7 @@ public class GeneratorLanguage extends LanguageProvider add("tooltip.bloodmagic.diviner.dawnRune", "Dawn Runes: %d"); add("tooltip.bloodmagic.diviner.totalRune", "Total Runes: %d"); add("tooltip.bloodmagic.diviner.extraInfo", "Press shift for extra info"); + add("tooltip.bloodmagic.diviner.extraExtraInfo", "-Hold shift + alt for augmentation info-"); add("tooltip.bloodmagic.diviner.currentDirection", "Current Direction: %s"); add("ritual.bloodmagic.testRitual", "Test Ritual"); @@ -207,6 +208,9 @@ public class GeneratorLanguage extends LanguageProvider addItem(BloodMagicItems.AIR_INSCRIPTION_TOOL, "Inscription Tool: Air"); addItem(BloodMagicItems.DUSK_INSCRIPTION_TOOL, "Inscription Tool: Dusk"); + addItem(BloodMagicItems.BASE_RITUAL_DIVINER, "Ritual Diviner"); + addItem(BloodMagicItems.DUSK_RITUAL_DIVINER, "Ritual Diviner [Dusk]"); + // addItem(BloodMagicItems , ""); // JEI diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index 86307df1..97f0a557 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -109,6 +109,7 @@ public class BloodMagicItems public static final RegistryObject DUSK_INSCRIPTION_TOOL = BASICITEMS.register("duskscribetool", () -> new ItemInscriptionTool(EnumRuneType.DUSK)); public static final RegistryObject BASE_RITUAL_DIVINER = BASICITEMS.register("ritualdiviner", () -> new ItemRitualDiviner(0)); + public static final RegistryObject DUSK_RITUAL_DIVINER = BASICITEMS.register("ritualdivinerdusk", () -> new ItemRitualDiviner(1)); // Reagents used to make the Sigils public static final RegistryObject REAGENT_WATER = BASICITEMS.register("reagentwater", () -> new ItemBase()); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java index f3ace9d3..3e20849f 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java @@ -28,6 +28,7 @@ import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -232,7 +233,7 @@ public class ItemRitualDiviner extends Item boolean sneaking = Screen.hasShiftDown(); // boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); - boolean extraInfo = Screen.hasAltDown(); + boolean extraInfo = sneaking && Screen.hasAltDown(); if (extraInfo) { @@ -315,8 +316,8 @@ public class ItemRitualDiviner extends Item tooltip.add(new StringTextComponent("")); } - tooltip.add(new TranslationTextComponent(tooltipBase + "extraInfo")); - tooltip.add(new TranslationTextComponent(tooltipBase + "extraExtraInfo")); + tooltip.add(new TranslationTextComponent(tooltipBase + "extraInfo").mergeStyle(TextFormatting.BLUE)); + tooltip.add(new TranslationTextComponent(tooltipBase + "extraExtraInfo").mergeStyle(TextFormatting.BLUE)); } } } @@ -341,6 +342,12 @@ public class ItemRitualDiviner extends Item } return new ActionResult<>(ActionResultType.SUCCESS, stack); + } else + { + if (!world.isRemote) + { + cycleDirection(stack, player); + } } return new ActionResult<>(ActionResultType.PASS, stack); diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java index 0f3f019c..16e61ecb 100644 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java @@ -4,7 +4,6 @@ import java.util.List; import com.google.common.collect.Lists; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; @@ -33,7 +32,6 @@ import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.client.render.BloodMagicRenderer; import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; import wayoftime.bloodmagic.client.render.RenderResizableCuboid; -import wayoftime.bloodmagic.client.render.block.RenderFakeBlocks; import wayoftime.bloodmagic.common.item.ItemRitualDiviner; import wayoftime.bloodmagic.ritual.Ritual; import wayoftime.bloodmagic.ritual.RitualComponent; @@ -117,7 +115,13 @@ public class ClientHandler if (tileEntity instanceof TileMasterRitualStone && !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ItemRitualDiviner) - renderRitualStones(player, event.getPartialTicks()); + { + IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); + MatrixStack stack = event.getMatrixStack(); + renderRitualStones(stack, buffers, player, event.getPartialTicks()); + RenderSystem.disableDepthTest(); + buffers.finish(); + } } private static TextureAtlasSprite forName(AtlasTexture textureMap, String name, String dir) @@ -125,8 +129,9 @@ public class ClientHandler return textureMap.getSprite(new ResourceLocation(BloodMagic.MODID + dir + "/" + name)); } - private static void renderRitualStones(ClientPlayerEntity player, float partialTicks) + private static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, ClientPlayerEntity player, float partialTicks) { + IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); World world = player.getEntityWorld(); ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); Direction direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); @@ -135,11 +140,6 @@ public class ClientHandler if (ritual == null) return; - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); -// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -// GlStateManager.color4f(1F, 1F, 1F, 0.6125F); - BlockPos vec3, vX; vec3 = ((BlockRayTraceResult) minecraft.objectMouseOver).getPos(); double posX = player.lastTickPosX + (player.getPosX() - player.lastTickPosX) * partialTicks; @@ -150,51 +150,58 @@ public class ClientHandler ritual.gatherComponents(components::add); for (RitualComponent ritualComponent : components) { + stack.push(); vX = vec3.add(ritualComponent.getOffset(direction)); - double minX = vX.getX() - posX; - double minY = vX.getY() - posY; - double minZ = vX.getZ() - posZ; + Vector3d eyePos = player.getEyePosition(partialTicks); + double minX = vX.getX() - eyePos.x; + double minY = vX.getY() - eyePos.y; + double minZ = vX.getZ() - eyePos.z; +// double minX = vX.getX() - posX; +// double minY = vX.getY() - posY; +// double minZ = vX.getZ() - posZ; + + stack.translate(minX, minY, minZ); if (!world.getBlockState(vX).isOpaqueCube(world, vX)) { - TextureAtlasSprite texture = null; + ResourceLocation rl = null; -// switch (ritualComponent.getRuneType()) -// { -// case BLANK: -// texture = ritualStoneBlank; -// break; -// case WATER: -// texture = ritualStoneWater; -// break; -// case FIRE: -// texture = ritualStoneFire; -// break; -// case EARTH: -// texture = ritualStoneEarth; -// break; -// case AIR: -// texture = ritualStoneAir; -// break; -// case DAWN: -// texture = ritualStoneDawn; -// break; -// case DUSK: -// texture = ritualStoneDusk; -// break; -// } + switch (ritualComponent.getRuneType()) + { + case BLANK: + rl = ritualStoneBlank; + break; + case WATER: + rl = ritualStoneWater; + break; + case FIRE: + rl = ritualStoneFire; + break; + case EARTH: + rl = ritualStoneEarth; + break; + case AIR: + rl = ritualStoneAir; + break; + case DAWN: + rl = ritualStoneDawn; + break; + case DUSK: + rl = ritualStoneDusk; + break; + } - RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); + Model3D model = getBlockModel(rl); + + RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); } + stack.pop(); } - - GlStateManager.popMatrix(); } public static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks) { IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); - System.out.println("Attempting to render stones"); ClientPlayerEntity player = minecraft.player; World world = player.getEntityWorld(); Direction direction = mrsHoloDirection; @@ -204,10 +211,6 @@ public class ClientHandler { return; } -// GlStateManager.pushMatrix(); -// GlStateManager.enableBlend(); -// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -// GlStateManager.color4f(1F, 1F, 1F, 0.5F); BlockPos vec3, vX; vec3 = masterRitualStone.getPos(); @@ -226,11 +229,14 @@ public class ClientHandler double minY = vX.getY() - eyePos.y; double minZ = vX.getZ() - eyePos.z; +// double minX = vX.getX() - posX; +// double minY = vX.getY() - posY; +// double minZ = vX.getZ() - posZ; + stack.translate(minX, minY, minZ); if (!world.getBlockState(vX).isOpaqueCube(world, vX)) { - ResourceLocation rl = null; switch (ritualComponent.getRuneType()) diff --git a/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdawn.png b/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdawn.png new file mode 100644 index 0000000000000000000000000000000000000000..e06871c720ab17407d9d310079e525f575d7e691 GIT binary patch literal 1366 zcmbVMZA=?w96um1HjCR_7P}>8mm@5iaJ{#_-AOs2$4kvx8>kt{jP!cL6Ky^0E8hs}WsI7z@R+D16+G(l9tBu-Emfny|%5(Hy+F@zIdc@Wc@ zDn^+mu71UqdGa7JT~9C=mP{sXNy?_EZ5Tn*G=`HHNunkK)w*S!Poc6_p4Y$uO;DwT zE-5mc)5u4ZF5QEeo-T(FPx$?-ie+sjQD(}p6raEd8;-@}xww|ln%)Hdbz@Dm7V1s_ ztO;mJmnxX`h?eKcX7289Cr||fYKE1K%)_Xk5X=j+eJn4de-9GsXDH%rk2CqZk!~1gV^xExS%IP9%O+lXP zlQo@}1(3HbnYLHB-urSHuL^iwQA3K-k?(?FOwkoBrX*mm7k+fNB#TN?dn{L><$yV$ zN_&A=uPSkPDaDMmhIxlT;7*a^QHmDrC{Ek$C@=67D!Lp54FurA-8izs7yobSFw-e4 z*C+q!o4m+u#@u#w3e3am90A!J9@U(ZvhMcH5LED-kE;o#eu~^P47RA^h2kOcbmp@0 zTV`M1JA>Z`swY0~Uq4jv%+X5AT7nBV>n^ci zzTv(ep3gD4u+uHD(N-FmKQY)BZ`Q zQc5N-^#+_fOC|^9M(b=Tk!8PrC4GHy&;C!34-b|#yz5(32CmF2nRD5p6MO&a73u!& zQs>nt&OH6=qOmZ;_AkthkySyhO}yy{hcABg;?#MAD?AOKof;2^Po2eY&6ZED+v6hf zqlG(%r&()g{7`nw)`JaV+8mm@5iaJ{#_-AOs2$4kvx8>kt{jP!cL6Ky^0E8hs}WsI7z@R+D16+G(l9tBu-Emfny|%5(Hy+F@zIdc@Wc@ zDn^+mu71UqdGa7JT~9C=mP{sXNy?_EZ5Tn*G=`HHNunkK)w*S!Poc6_p4Y$uO;DwT zE-5mc)5u4ZF5QEeo-T(FPx$?-ie+sjQD(}p6raEd8;-@}xww|ln%)Hdbz@Dm7V1s_ ztO;mJmnxX`h?eKcX7289Cr||fYKE1K%)_Xk5X=j+eJn4de-9GsXDH%rk2CqZk!~1gV^xExS%IP9%O+lXP zlQo@}1(3HbnYLHB-urSHuL^iwQA3K-k?(?FOwkoBrX*mm7k+fNB#TN?dn{L><$yV$ zN_&A=uPSkPDaDMmhIxlT;7*a^QHmDrC{Ek$C@=67D!Lp54FurA-8izs7yobSFw-e4 z*C+q!o4m+u#@u#w3e3am90A!J9@U(ZvhMcH5LED-kE;o#eu~^P47RA^h2kOcbmp@0 zTV`M1JA>Z`swY0~Uq4jv%+X5AT7nBV>n^ci zzTv(ep3gD4u+uHD(N-FmKQY)BZ`Q zQc5N-^#+_fOC|^9M(b=Tk!8PrC4GHy&;C!34-b|#yz5(32CmF2nRD5p6MO&a73u!& zQs>nt&OH6=qOmZ;_AkthkySyhO}yy{hcABg;?#MAD?AOKof;2^Po2eY&6ZED+v6hf zqlG(%r&()g{7`nw)`JaV+ Date: Sun, 25 Oct 2020 11:17:22 -0400 Subject: [PATCH 348/493] Added lava crystal Added the Lava Crystal and fixed a bug where it would take a lot of LP initially. Now correctly only draws LP when getContainer is called. --- src/generated/resources/.cache/cache | 1 + .../bloodmagic/models/item/lavacrystal.json | 6 + .../common/data/GeneratorBaseRecipes.java | 1 + .../common/data/GeneratorLanguage.java | 2 + .../common/item/BloodMagicItems.java | 1 + .../common/item/ItemLavaCrystal.java | 117 ++++++++++++++++++ 6 files changed, 128 insertions(+) create mode 100644 src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index b3623613..d848edd0 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -71,6 +71,7 @@ b5708a8cc7259fd36ffeabd155ea085b9fdef0fd assets/bloodmagic/models/item/firescrib 44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json 109b5485c25d978af55b46682d5bfa7008909458 assets/bloodmagic/models/item/infusedslate.json +413fa378c40dec89cb765a7d5c8bfc9cdef1d828 assets/bloodmagic/models/item/lavacrystal.json 588c5208e3f4ef941cd8375aeceeed44484d85d3 assets/bloodmagic/models/item/lavasigil.json 5a76914a87fc9b99079bb6afed1d4cfe3e4a532e assets/bloodmagic/models/item/lightritualstone.json 15d8178b626da912334774142d40d1012fb21fa0 assets/bloodmagic/models/item/magicianbloodorb.json diff --git a/src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json b/src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json new file mode 100644 index 00000000..59a62520 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/lavacrystal" + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java index 1d445664..ab91c09b 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java @@ -47,6 +47,7 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CHARGING_RUNE.get()).key('R', Tags.Items.DUSTS_REDSTONE).key('r', BloodMagicBlocks.BLANK_RUNE.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).key('G', Tags.Items.DUSTS_GLOWSTONE).patternLine("RsR").patternLine("GrG").patternLine("ReR").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_charging")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), 4).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_blank")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.MASTER_RITUAL_STONE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicBlocks.BLANK_RITUAL_STONE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_master")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.LAVA_CRYSTAL.get()).key('a', Tags.Items.GLASS).key('b', Items.LAVA_BUCKET).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('d', Tags.Items.OBSIDIAN).key('e', Tags.Items.GEMS_DIAMOND).patternLine("aba").patternLine("bcb").patternLine("ded").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("lava_crystal")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', Ingredient.fromItems(Items.DIAMOND)).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_standard")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_orb")); } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index f2299b04..f1018ec5 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -71,6 +71,7 @@ public class GeneratorLanguage extends LanguageProvider add("tooltip.bloodmagic.currentBaseType.steadfast", "Steadfast"); add("tooltip.bloodmagic.sacrificialdagger.desc", "Just a prick of the finger will suffice..."); add("tooltip.bloodmagic.slate.desc", "Infused stone inside of a Blood Altar"); + add("tooltip.bloodmagic.inscriber.desc", "The writing is on the wall..."); add("tooltip.bloodmagic.sigil.water.desc", "Infinite water, anyone?"); add("tooltip.bloodmagic.sigil.lava.desc", "HOT! DO NOT EAT"); @@ -178,6 +179,7 @@ public class GeneratorLanguage extends LanguageProvider addItem(BloodMagicItems.DAGGER_OF_SACRIFICE, "Dagger of Sacrifice"); addItem(BloodMagicItems.SACRIFICIAL_DAGGER, "Sacrificial Knife"); + addItem(BloodMagicItems.LAVA_CRYSTAL, "Lava Crystal"); addItem(BloodMagicItems.REAGENT_WATER, "Water Reagent"); addItem(BloodMagicItems.REAGENT_LAVA, "Lava Reagent"); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index 97f0a557..30ae733e 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -96,6 +96,7 @@ public class BloodMagicItems public static final RegistryObject ARCANE_ASHES = BASICITEMS.register("arcaneashes", () -> new ItemArcaneAshes()); public static final RegistryObject DAGGER_OF_SACRIFICE = BASICITEMS.register("daggerofsacrifice", () -> new ItemDaggerOfSacrifice()); + public static final RegistryObject LAVA_CRYSTAL = BASICITEMS.register("lavacrystal", () -> new ItemLavaCrystal()); // Ritual stuffs public static final RegistryObject WEAK_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalweak", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.WEAK)); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java new file mode 100644 index 00000000..8f1ce086 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java @@ -0,0 +1,117 @@ +package wayoftime.bloodmagic.common.item; + +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.math.BlockPos; +import wayoftime.bloodmagic.core.data.Binding; +import wayoftime.bloodmagic.core.data.SoulTicket; +import wayoftime.bloodmagic.util.helper.NetworkHelper; +import wayoftime.bloodmagic.util.helper.PlayerHelper; + +//TODO: Make some hook somewhere that attaches the pos to the ticket otherwise the tickets are basically useless lmao +public class ItemLavaCrystal extends ItemBindableBase +{ + public ItemLavaCrystal() + { + super(); + } + + @Override + public ItemStack getContainerItem(ItemStack stack) + { + Binding binding = getBinding(stack); + if (binding != null) + NetworkHelper.getSoulNetwork(binding.getOwnerId()).syphon(SoulTicket.item(stack, 50)); + + ItemStack returnStack = new ItemStack(this); + returnStack.setTag(stack.getTag()); + return returnStack; + } + + @Override + public boolean hasContainerItem(ItemStack stack) + { + return true; + } + + @Override + public int getBurnTime(ItemStack stack) + { + Binding binding = getBinding(stack); + if (binding == null) + return -1; + +// if (NetworkHelper.syphonFromContainer(stack, SoulTicket.item(stack, 25))) + if (NetworkHelper.canSyphonFromContainer(stack, 50)) + return 200; + else + { + PlayerEntity player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); + if (player != null) + player.addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); + } + + return -1; + } + +// @Nullable +// @Override +// public Binding getBinding(ItemStack stack) +// { +// if (stack.getTag() == null) // hasTagCompound doesn't work on empty stacks with tags +// return null; +// +// NBTBase bindingTag = stack.getTag().get("binding"); +// if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag +// // compound and that it has actual +// // data. +// return null; +// +// NBTTagCompound nbt = (NBTTagCompound) bindingTag; +// return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); +// } + + @Override + public ActionResultType onItemUse(ItemUseContext context) + { + BlockPos pos = context.getPos(); + Direction facing = context.getFace(); + pos = pos.offset(facing); + PlayerEntity player = context.getPlayer(); + Hand hand = context.getHand(); + ItemStack itemstack = player.getHeldItem(hand); + + Binding binding = getBinding(player.getHeldItem(hand)); + + if (binding == null) + return ActionResultType.FAIL; + + if (!player.canPlayerEdit(pos, facing, itemstack)) + return ActionResultType.FAIL; + + if (context.getWorld().isAirBlock(pos) + && NetworkHelper.getSoulNetwork(binding).syphonAndDamage(player, SoulTicket.item(player.getHeldItem(hand), 100)).isSuccess()) + { + context.getWorld().playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, random.nextFloat() + * 0.4F + 0.8F); + context.getWorld().setBlockState(pos, Blocks.FIRE.getDefaultState(), 11); + } else + return ActionResultType.FAIL; + + if (player instanceof ServerPlayerEntity) + CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, itemstack); + + return ActionResultType.SUCCESS; + } +} From 9a274186b75d761b4a41ab6ef558c04dbf33627d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 25 Oct 2020 11:28:44 -0400 Subject: [PATCH 349/493] Ghost block fix Fixed the ClientHandler method for rendering the Ritual's ghost block. --- src/generated/resources/.cache/cache | 4 ++- .../assets/bloodmagic/lang/en_us.json | 2 ++ .../recipes/bloodmagictab/lava_crystal.json | 32 +++++++++++++++++++ .../data/bloodmagic/recipes/lava_crystal.json | 29 +++++++++++++++++ .../util/handler/event/ClientHandler.java | 21 ++++-------- 5 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/lava_crystal.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d848edd0..1a1bca55 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -17,7 +17,7 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -770d87c47f343107732e9191d216803419324608 assets/bloodmagic/lang/en_us.json +af6eebbeef7c75844a0651065016fecb365595dd assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json 3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json @@ -147,6 +147,7 @@ e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bl 4a53004c651901cd1245de452810161736d9b067 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json 263f7c251d2f163db5bd229f2ab8a222f23ae03a data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json 7ca400d1141ff4be1b529cd060950b42cf3b9bfb data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json +344567e6f5671131addcfebbd92d18e5cbd66ef5 data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json 1578416eb302aecb3fd61e481634c5c021541f51 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json 832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json @@ -204,6 +205,7 @@ f905c1a8ca4d3a9f841ca6c44caa91de327fc29d data/bloodmagic/recipes/blood_rune_char b63d77c3762f86d4a91f62e192c3e9b26e3b52ca data/bloodmagic/recipes/blood_rune_sacrifice.json 7c4e247c1df6ef594bbb2fc2196afb102f45982b data/bloodmagic/recipes/blood_rune_self_sacrifice.json e2bcf2a6f951fbcef45554ec90ba28d14e261d18 data/bloodmagic/recipes/blood_rune_speed.json +9dedad36e9d2ab6688e069c2e6df3851c395b583 data/bloodmagic/recipes/lava_crystal.json 7757e5fd52f71b0d21595e072593fc592210dd64 data/bloodmagic/recipes/ritual_stone_blank.json 8608f828f997b1a8015287bd9cd436e9d7dff2ff data/bloodmagic/recipes/ritual_stone_master.json aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index cd53036e..239385da 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -47,6 +47,7 @@ "item.bloodmagic.growthsigil": "Sigil of the Green Grove", "item.bloodmagic.icesigil": "Sigil of the Frozen Lake", "item.bloodmagic.infusedslate": "Imbued Slate", + "item.bloodmagic.lavacrystal": "Lava Crystal", "item.bloodmagic.lavasigil": "Lava Sigil", "item.bloodmagic.life_essence_bucket": "Bucket of Life", "item.bloodmagic.magicianbloodorb": "Magician Blood Orb", @@ -145,6 +146,7 @@ "tooltip.bloodmagic.diviner.totalRune": "Total Runes: %d", "tooltip.bloodmagic.diviner.waterRune": "Water Runes: %d", "tooltip.bloodmagic.extraInfo": "&9-Hold shift for more info-", + "tooltip.bloodmagic.inscriber.desc": "The writing is on the wall...", "tooltip.bloodmagic.orb.desc": "Stores raw Life Essence", "tooltip.bloodmagic.orb.owner": "Added by: %s", "tooltip.bloodmagic.sacrificialdagger.desc": "Just a prick of the finger will suffice...", diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json new file mode 100644 index 00000000..84bc8f36 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:lava_crystal" + ] + }, + "criteria": { + "has_weak_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:weakbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:lava_crystal" + } + } + }, + "requirements": [ + [ + "has_weak_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/lava_crystal.json b/src/generated/resources/data/bloodmagic/recipes/lava_crystal.json new file mode 100644 index 00000000..7a96e775 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/lava_crystal.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ded" + ], + "key": { + "a": { + "tag": "forge:glass" + }, + "b": { + "item": "minecraft:lava_bucket" + }, + "c": { + "type": "bloodmagic:bloodorb", + "orb_tier": 1 + }, + "d": { + "tag": "forge:obsidian" + }, + "e": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "bloodmagic:lavacrystal" + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java index 16e61ecb..0ff8c4b0 100644 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java @@ -9,6 +9,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -131,6 +132,8 @@ public class ClientHandler private static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, ClientPlayerEntity player, float partialTicks) { + ActiveRenderInfo activerenderinfo = Minecraft.getInstance().gameRenderer.getActiveRenderInfo(); + Vector3d eyePos = activerenderinfo.getProjectedView(); IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); World world = player.getEntityWorld(); ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); @@ -142,9 +145,6 @@ public class ClientHandler BlockPos vec3, vX; vec3 = ((BlockRayTraceResult) minecraft.objectMouseOver).getPos(); - double posX = player.lastTickPosX + (player.getPosX() - player.lastTickPosX) * partialTicks; - double posY = player.lastTickPosY + (player.getPosY() - player.lastTickPosY) * partialTicks; - double posZ = player.lastTickPosZ + (player.getPosZ() - player.lastTickPosZ) * partialTicks; List components = Lists.newArrayList(); ritual.gatherComponents(components::add); @@ -152,13 +152,9 @@ public class ClientHandler { stack.push(); vX = vec3.add(ritualComponent.getOffset(direction)); - Vector3d eyePos = player.getEyePosition(partialTicks); double minX = vX.getX() - eyePos.x; double minY = vX.getY() - eyePos.y; double minZ = vX.getZ() - eyePos.z; -// double minX = vX.getX() - posX; -// double minY = vX.getY() - posY; -// double minZ = vX.getZ() - posZ; stack.translate(minX, minY, minZ); @@ -201,6 +197,8 @@ public class ClientHandler public static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks) { + ActiveRenderInfo activerenderinfo = Minecraft.getInstance().gameRenderer.getActiveRenderInfo(); + Vector3d eyePos = activerenderinfo.getProjectedView(); IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); ClientPlayerEntity player = minecraft.player; World world = player.getEntityWorld(); @@ -214,9 +212,6 @@ public class ClientHandler BlockPos vec3, vX; vec3 = masterRitualStone.getPos(); - double posX = player.lastTickPosX + (player.getPosX() - player.lastTickPosX) * partialTicks; - double posY = player.lastTickPosY + (player.getPosY() - player.lastTickPosY) * partialTicks; - double posZ = player.lastTickPosZ + (player.getPosZ() - player.lastTickPosZ) * partialTicks; List components = Lists.newArrayList(); ritual.gatherComponents(components::add); @@ -224,15 +219,11 @@ public class ClientHandler { stack.push(); vX = vec3.add(ritualComponent.getOffset(direction)); - Vector3d eyePos = player.getEyePosition(partialTicks); + double minX = vX.getX() - eyePos.x; double minY = vX.getY() - eyePos.y; double minZ = vX.getZ() - eyePos.z; -// double minX = vX.getX() - posX; -// double minY = vX.getY() - posY; -// double minZ = vX.getZ() - posZ; - stack.translate(minX, minY, minZ); if (!world.getBlockState(vX).isOpaqueCube(world, vX)) From 6e3f1b3a4e715e20b80113c1606e8d28ae0841cb Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 25 Oct 2020 11:51:58 -0400 Subject: [PATCH 350/493] RItual Recipes Finished adding the base recipes that are required for the Rituals. --- .../wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java | 3 +++ .../bloodmagic/common/recipe/BloodAltarRecipeProvider.java | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java index ab91c09b..d2f11e9d 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java @@ -34,6 +34,8 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLOOD_ALTAR.get()).key('a', Tags.Items.STONE).key('b', Items.FURNACE).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicItems.MONSTER_SOUL_RAW.get()).patternLine("a a").patternLine("aba").patternLine("cdc").addCriterion("has_will", hasItem(BloodMagicItems.MONSTER_SOUL_RAW.get())).build(consumer, BloodMagic.rl("blood_altar")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SOUL_FORGE.get()).key('s', Tags.Items.STONE).key('g', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).key('o', Tags.Items.STORAGE_BLOCKS_IRON).patternLine("i i").patternLine("sgs").patternLine("sos").addCriterion("has_gold", hasItem(Items.GOLD_INGOT)).build(consumer, BloodMagic.rl("soul_forge")); ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SOUL_SNARE.get(), 4).key('r', Tags.Items.DUSTS_REDSTONE).key('s', Tags.Items.STRING).key('i', Tags.Items.INGOTS_IRON).patternLine("sis").patternLine("iri").patternLine("sis").addCriterion("has_redstone", hasItem(Items.REDSTONE)).build(consumer, BloodMagic.rl("soul_snare")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.BASE_RITUAL_DIVINER.get()).key('a', BloodMagicItems.AIR_INSCRIPTION_TOOL.get()).key('s', Tags.Items.RODS_WOODEN).key('d', Tags.Items.GEMS_DIAMOND).key('e', BloodMagicItems.EARTH_INSCRIPTION_TOOL.get()).key('f', BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()).key('w', BloodMagicItems.WATER_INSCRIPTION_TOOL.get()).addCriterion("has_scribe", hasItem(BloodMagicItems.AIR_INSCRIPTION_TOOL.get())).build(consumer, BloodMagic.rl("ritual_diviner_0")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.DUSK_RITUAL_DIVINER.get()).key('S', BloodMagicItems.DEMONIC_SLATE.get()).key('t', BloodMagicItems.DUSK_INSCRIPTION_TOOL.get()).key('d', BloodMagicItems.BASE_RITUAL_DIVINER.get()).patternLine(" S ").patternLine("tdt").patternLine(" S ").addCriterion("has_demon_slate", hasItem(BloodMagicItems.DEMONIC_SLATE.get())).build(consumer, BloodMagic.rl("ritual_diviner_1")); } private void addBloodOrbRecipes(Consumer consumer) @@ -47,6 +49,7 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CHARGING_RUNE.get()).key('R', Tags.Items.DUSTS_REDSTONE).key('r', BloodMagicBlocks.BLANK_RUNE.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).key('G', Tags.Items.DUSTS_GLOWSTONE).patternLine("RsR").patternLine("GrG").patternLine("ReR").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_charging")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), 4).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_blank")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.MASTER_RITUAL_STONE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicBlocks.BLANK_RITUAL_STONE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_master")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.LAVA_CRYSTAL.get()).key('a', Tags.Items.GLASS).key('b', Items.LAVA_BUCKET).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('d', Tags.Items.OBSIDIAN).key('e', Tags.Items.GEMS_DIAMOND).patternLine("aba").patternLine("bcb").patternLine("ded").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("lava_crystal")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', Ingredient.fromItems(Items.DIAMOND)).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_standard")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_orb")); diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java index 05a898a3..ab71d3f8 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java @@ -37,6 +37,7 @@ public class BloodAltarRecipeProvider implements ISubRecipeProvider BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_LAPIS), new ItemStack(BloodMagicItems.WATER_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "water_tool")); BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.MAGMA_CREAM), new ItemStack(BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "fire_tool")); BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.GHAST_TEAR), new ItemStack(BloodMagicItems.AIR_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "air_tool")); + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.LAVA_CRYSTAL.get()), new ItemStack(BloodMagicItems.WEAK_ACTIVATION_CRYSTAL.get()), AltarTier.THREE.ordinal(), 10000, 20, 10).build(consumer, BloodMagic.rl("weak_activation_crystal")); // FOUR BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.DEMONIC_SLATE.get()), AltarTier.FOUR.ordinal(), 15000, 20, 20).build(consumer, BloodMagic.rl(basePath + "demonicslate")); From 4ac0f311249fae429e31d8cf0584676ff75563a5 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 25 Oct 2020 14:00:11 -0400 Subject: [PATCH 351/493] Additional Rituals Added Ritual of Magnetism and Ritual of Crushing. --- .../entity/projectile/EntitySoulSnare.java | 2 +- .../java/WayofTime/bloodmagic/util/Utils.java | 390 ++++++++++++++++++ .../util/handler/event/WillHandler.java | 4 +- .../bloodmagic/potion/BloodMagicPotions.java | 6 +- .../bloodmagic/potion/PotionFireFuse.java | 40 ++ .../ritual/types/RitualCrushing.java | 360 ++++++++++++++++ .../bloodmagic/ritual/types/RitualLava.java | 362 ++++++++++++++++ .../ritual/types/RitualMagnetic.java | 202 +++++++++ .../util/handler/event/ClientHandler.java | 2 +- 9 files changed, 1362 insertions(+), 6 deletions(-) create mode 100644 src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java index 4510f1ac..b19b87d7 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java @@ -58,7 +58,7 @@ public class EntitySoulSnare extends ProjectileItemEntity if (result.getEntity() instanceof LivingEntity) { - ((LivingEntity) result.getEntity()).addPotionEffect(new EffectInstance(BloodMagicPotions.soulSnare, 300, 0)); + ((LivingEntity) result.getEntity()).addPotionEffect(new EffectInstance(BloodMagicPotions.SOUL_SNARE, 300, 0)); result.getEntity().attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_234616_v_()), (float) 0); } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 061e85ea..6f17f4d6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -2,8 +2,31 @@ package wayoftime.bloodmagic.util; import java.util.Locale; +import javax.annotation.Nullable; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.FlowingFluidBlock; +import net.minecraft.block.NetherPortalBlock; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.potion.Effects; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import wayoftime.bloodmagic.tile.TileInventory; @@ -55,4 +78,371 @@ public class Utils { return String.valueOf(input.charAt(0)).toUpperCase(Locale.ENGLISH) + input.substring(1); } + + public static boolean isImmuneToFireDamage(LivingEntity entity) + { + return entity.isImmuneToFire() || entity.isPotionActive(Effects.FIRE_RESISTANCE); + } + + public static boolean isBlockLiquid(BlockState state) + { + return (state instanceof IFluidBlock || state.getMaterial().isLiquid()); + } + + public static boolean isFlowingLiquid(World world, BlockPos pos, BlockState state) + { + Block block = state.getBlock(); + return ((block instanceof IFluidBlock && Math.abs(((IFluidBlock) block).getFilledPercentage(world, pos)) == 1) + || (block instanceof FlowingFluidBlock + && !((FlowingFluidBlock) block).getFluidState(state).isSource())); + } + + public static boolean spawnStackAtBlock(World world, BlockPos pos, @Nullable Direction pushDirection, ItemStack stack) + { + BlockPos spawnPos = new BlockPos(pos); + + double velX = 0; + double velY = 0; + double velZ = 0; + double velocity = 0.15D; + if (pushDirection != null) + { + spawnPos = spawnPos.offset(pushDirection); + + switch (pushDirection) + { + case DOWN: + { + velY = -velocity; + break; + } + case UP: + { + velY = velocity; + break; + } + case NORTH: + { + velZ = -velocity; + break; + } + case SOUTH: + { + velZ = velocity; + break; + } + case WEST: + { + velX = -velocity; + break; + } + case EAST: + { + velX = velocity; + break; + } + } + } + + double posX = spawnPos.getX() + 0.5; + double posY = spawnPos.getY() + 0.5; + double posZ = spawnPos.getZ() + 0.5; + + ItemEntity entityItem = new ItemEntity(world, posX, posY, posZ, stack); + entityItem.setVelocity(velX, velY, velZ); + + entityItem.setItem(stack); + return world.addEntity(entityItem); + } + + public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos) + { + return swapLocations(initialWorld, initialPos, finalWorld, finalPos, true); + } + + public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos, boolean playSound) + { + TileEntity initialTile = initialWorld.getTileEntity(initialPos); + TileEntity finalTile = finalWorld.getTileEntity(finalPos); + CompoundNBT initialTag = new CompoundNBT(); + CompoundNBT finalTag = new CompoundNBT(); + if (initialTile != null) + initialTile.write(initialTag); + if (finalTile != null) + finalTile.write(finalTag); + + BlockState initialState = initialWorld.getBlockState(initialPos); + BlockState finalState = finalWorld.getBlockState(finalPos); + + if ((initialState.getBlock().equals(Blocks.AIR) && finalState.getBlock().equals(Blocks.AIR)) + || initialState.getBlock() instanceof NetherPortalBlock + || finalState.getBlock() instanceof NetherPortalBlock) + return false; + + if (playSound) + { + initialWorld.playSound(initialPos.getX(), initialPos.getY(), initialPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); + finalWorld.playSound(finalPos.getX(), finalPos.getY(), finalPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); + } + + // Finally, we get to do something! (CLEARING TILES) + if (finalState.getBlock().hasTileEntity(finalState)) + finalWorld.removeTileEntity(finalPos); + if (initialState.getBlock().hasTileEntity(initialState)) + initialWorld.removeTileEntity(initialPos); + + // TILES CLEARED + BlockState initialBlockState = initialWorld.getBlockState(initialPos); + BlockState finalBlockState = finalWorld.getBlockState(finalPos); + finalWorld.setBlockState(finalPos, initialBlockState, 3); + + if (initialTile != null) + { +// TileEntity newTileInitial = TileEntity.create(finalWorld, initialTag); + TileEntity newTileInitial = TileEntity.readTileEntity(finalBlockState, initialTag); + + finalWorld.setTileEntity(finalPos, newTileInitial); +// newTileInitial.setPos(finalPos); + newTileInitial.setWorldAndPos(finalWorld, finalPos); + } + + initialWorld.setBlockState(initialPos, finalBlockState, 3); + + if (finalTile != null) + { +// TileEntity newTileFinal = TileEntity.create(initialWorld, finalTag); + TileEntity newTileFinal = TileEntity.readTileEntity(initialBlockState, finalTag); + + initialWorld.setTileEntity(initialPos, newTileFinal); +// newTileFinal.setPos(initialPos); + newTileFinal.setWorldAndPos(initialWorld, initialPos); + } + + initialWorld.notifyNeighborsOfStateChange(initialPos, finalState.getBlock()); + finalWorld.notifyNeighborsOfStateChange(finalPos, initialState.getBlock()); + + return true; + } + + public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, Direction dir) + { + LazyOptional capability = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); + if (capability.isPresent()) + { + IItemHandler handler = capability.resolve().get(); + + return insertStackIntoTile(stack, handler); + } else if (tile instanceof IInventory) + { + return insertStackIntoInventory(stack, (IInventory) tile, dir); + } + + return stack; + } + + public static ItemStack insertStackIntoTile(ItemStack stack, IItemHandler handler) + { + int numberOfSlots = handler.getSlots(); + + ItemStack copyStack = stack.copy(); + + for (int slot = 0; slot < numberOfSlots; slot++) + { + copyStack = handler.insertItem(slot, copyStack, false); + if (copyStack.isEmpty()) + { + return ItemStack.EMPTY; + } + } + + return copyStack; + } + + public static int getNumberOfFreeSlots(TileEntity tile, Direction dir) + { + int slots = 0; + + LazyOptional capability = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); + if (capability.isPresent()) + { + IItemHandler handler = capability.resolve().get(); + + for (int i = 0; i < handler.getSlots(); i++) + { + if (handler.getStackInSlot(i).isEmpty()) + { + slots++; + } + } + } else if (tile instanceof IInventory) + { + for (int i = 0; i < ((IInventory) tile).getSizeInventory(); i++) + { + if (((IInventory) tile).getStackInSlot(i).isEmpty()) + { + slots++; + } + } + } + + return slots; + } + + public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, Direction dir) + { + if (stack.isEmpty()) + { + return ItemStack.EMPTY; + } + + boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; + + if (inventory instanceof ISidedInventory) + { + int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); + for (int in : array) + { + canBeInserted[in] = inventory.isItemValidForSlot(in, stack) + && ((ISidedInventory) inventory).canInsertItem(in, stack, dir); + } + } else + { + for (int i = 0; i < canBeInserted.length; i++) + { + canBeInserted[i] = inventory.isItemValidForSlot(i, stack); + } + } + + for (int i = 0; i < inventory.getSizeInventory(); i++) + { + if (!canBeInserted[i]) + { + continue; + } + + ItemStack[] combinedStacks = combineStacks(stack, inventory.getStackInSlot(i)); + stack = combinedStacks[0]; + inventory.setInventorySlotContents(i, combinedStacks[1]); + + if (stack.isEmpty()) + { + return ItemStack.EMPTY; + } + } + + return stack; + } + + public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, Direction dir, boolean fillToLimit, int limit) + { + if (stack.isEmpty()) + { + return true; + } + + int itemsLeft = stack.getCount(); + + boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; + + if (inventory instanceof ISidedInventory) + { + int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); + for (int in : array) + { + canBeInserted[in] = inventory.isItemValidForSlot(in, stack) + && ((ISidedInventory) inventory).canInsertItem(in, stack, dir); + } + } else + { + for (int i = 0; i < canBeInserted.length; i++) + { + canBeInserted[i] = inventory.isItemValidForSlot(i, stack); + } + } + + int numberMatching = 0; + + if (fillToLimit) + { + for (int i = 0; i < inventory.getSizeInventory(); i++) + { + if (!canBeInserted[i]) + { + continue; + } + + ItemStack invStack = inventory.getStackInSlot(i); + + if (!invStack.isEmpty() && ItemHandlerHelper.canItemStacksStack(stack, invStack)) + { + numberMatching += invStack.getCount(); + } + } + } + + if (fillToLimit && limit < stack.getCount() + numberMatching) + { + return false; + } + + for (int i = 0; i < inventory.getSizeInventory(); i++) + { + if (!canBeInserted[i]) + { + continue; + } + + ItemStack invStack = inventory.getStackInSlot(i); + boolean canCombine = ItemHandlerHelper.canItemStacksStack(stack, invStack); + if (canCombine) + { + if (invStack.isEmpty()) + { + itemsLeft = 0; + } else + { + itemsLeft -= (invStack.getMaxStackSize() - invStack.getCount()); + } + } + + if (itemsLeft <= 0) + { + return true; + } + } + + return false; + } + + /** + * @param stack1 Stack that is placed into a slot + * @param stack2 Slot content that stack1 is placed into + * @return Stacks after stacking + */ + public static ItemStack[] combineStacks(ItemStack stack1, ItemStack stack2) + { + ItemStack[] returned = new ItemStack[2]; + + if (ItemHandlerHelper.canItemStacksStack(stack1, stack2)) + { + int transferedAmount = stack2.isEmpty() ? stack1.getCount() + : Math.min(stack2.getMaxStackSize() - stack2.getCount(), stack1.getCount()); + if (transferedAmount > 0) + { + ItemStack copyStack = stack1.split(transferedAmount); + if (stack2.isEmpty()) + { + stack2 = copyStack; + } else + { + stack2.grow(transferedAmount); + } + } + } + + returned[0] = stack1; + returned[1] = stack2; + + return returned; + } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 6f01c0e6..c4fe0395 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -72,10 +72,10 @@ public class WillHandler DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); - if (attackedEntity.isPotionActive(BloodMagicPotions.soulSnare) && (attackedEntity instanceof MobEntity + if (attackedEntity.isPotionActive(BloodMagicPotions.SOUL_SNARE) && (attackedEntity instanceof MobEntity || attackedEntity.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL)) { - EffectInstance eff = attackedEntity.getActivePotionEffect(BloodMagicPotions.soulSnare); + EffectInstance eff = attackedEntity.getActivePotionEffect(BloodMagicPotions.SOUL_SNARE); int lvl = eff.getAmplifier(); double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 4 + 1; diff --git a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java index 8e4cd60a..a47fe2b4 100644 --- a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java +++ b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java @@ -6,11 +6,13 @@ import net.minecraftforge.registries.IForgeRegistry; public class BloodMagicPotions { - public static final Effect soulSnare = new PotionSoulSnare(); + public static final Effect SOUL_SNARE = new PotionSoulSnare(); + public static final Effect FIRE_FUSE = new PotionFireFuse(); public static void registerPotions(RegistryEvent.Register evt) { IForgeRegistry reg = evt.getRegistry(); - reg.register(soulSnare.setRegistryName("soulsnare")); + reg.register(SOUL_SNARE.setRegistryName("soulsnare")); + reg.register(FIRE_FUSE.setRegistryName("firefuse")); } } diff --git a/src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java b/src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java new file mode 100644 index 00000000..639a6ed7 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java @@ -0,0 +1,40 @@ +package wayoftime.bloodmagic.potion; + +import java.util.Random; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.particles.ParticleTypes; +import net.minecraft.potion.EffectType; +import net.minecraft.world.Explosion; + +public class PotionFireFuse extends PotionBloodMagic +{ + public PotionFireFuse() + { + super(EffectType.HARMFUL, 0xFF0000FF); + } + + @Override + public void performEffect(LivingEntity entity, int amplifier) + { + if (entity.world.isRemote) + { + return; + } + + Random random = entity.world.rand; + entity.getEntityWorld().addParticle(ParticleTypes.FLAME, entity.getPosX() + + random.nextDouble() * 0.3, entity.getPosY() + + random.nextDouble() * 0.3, entity.getPosZ() + random.nextDouble() * 0.3, 0, 0.06d, 0); + + int radius = amplifier + 1; + + if (entity.getActivePotionEffect(BloodMagicPotions.FIRE_FUSE).getDuration() <= 3) + { + Explosion.Mode explosion$mode = net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(entity.world, entity) + ? Explosion.Mode.DESTROY + : Explosion.Mode.NONE; + entity.getEntityWorld().createExplosion(null, entity.getPosX(), entity.getPosY(), entity.getPosZ(), radius, false, explosion$mode); + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java new file mode 100644 index 00000000..87c264bf --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java @@ -0,0 +1,360 @@ +package wayoftime.bloodmagic.ritual.types; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +import com.mojang.authlib.GameProfile; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BlockMasterRitualStone; +import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; +import wayoftime.bloodmagic.ritual.AreaDescriptor; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.IRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.ritual.RitualRegister; +import wayoftime.bloodmagic.util.Utils; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +@RitualRegister("crushing") +public class RitualCrushing extends Ritual +{ + public static final String CRUSHING_RANGE = "crushingRange"; + public static final String CHEST_RANGE = "chest"; + + public static double rawWillDrain = 0.05; + public static double steadfastWillDrain = 0.2; + public static double destructiveWillDrain = 0.2; + public static double vengefulWillDrain = 0.2; + + public static Map cuttingFluidLPMap = new HashMap<>(); + public static Map cuttingFluidWillMap = new HashMap<>(); + public static int defaultRefreshTime = 40; + private FakePlayer fakePlayer; + public int refreshTime = 40; + + private static final ItemStack mockPick = new ItemStack(Items.DIAMOND_PICKAXE, 1); + static + { + mockPick.addEnchantment(Enchantments.SILK_TOUCH, 1); + } + + public RitualCrushing() + { + super("ritualCrushing", 0, 5000, "ritual." + BloodMagic.MODID + ".crushingRitual"); + addBlockRange(CRUSHING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, -3, -1), 3)); + addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); + + setMaximumVolumeAndDistanceOfRange(CRUSHING_RANGE, 50, 10, 10); + setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + World world = masterRitualStone.getWorldObj(); + if (world.isRemote) + { + return; + } + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + BlockPos pos = masterRitualStone.getBlockPos(); + AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); + TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); + + if (tile != null && Utils.getNumberOfFreeSlots(tile, Direction.DOWN) < 1) + { + return; + } + + List willConfig = masterRitualStone.getActiveWillConfig(); + + double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); + double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); + double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); + double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); + double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); + + refreshTime = getRefreshTimeForRawWill(rawWill); + + boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; + + boolean isSilkTouch = steadfastWill >= steadfastWillDrain; + boolean useCuttingFluid = corrosiveWill > 0; + + int fortune = destructiveWill > 0 ? 3 : 0; + + AreaDescriptor crushingRange = masterRitualStone.getBlockRange(CRUSHING_RANGE); + boolean hasOperated = false; + + double rawDrain = 0; + + for (BlockPos newPos : crushingRange.getContainedPositions(pos)) + { + if (world.isAirBlock(newPos)) + { + continue; + } + + BlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); + + if (block instanceof BlockMasterRitualStone || block instanceof IRitualStone + || state.getBlockHardness(world, newPos) == -1.0F || Utils.isBlockLiquid(state)) + { + continue; + } + + boolean isBlockClaimed = false; +// if (useCuttingFluid) +// { +// ItemStack checkStack = block.getItem(world, newPos, state); +// if (checkStack.isEmpty()) +// { +// continue; +// } +// +// ItemStack copyStack = checkStack.copy(); +// +// for (ICrushingHandler handler : CrushingRegistry.getCrushingHandlerList()) +// { +// int lpDrain = handler.getLpDrain(); +// double willDrain = handler.getWillDrain(); +// +// if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) +// { +// continue; +// } +// +// ItemStack result = handler.getRecipeOutput(copyStack, world, pos); +// +// if (result.isEmpty()) +// { +// continue; +// } +// +// if (tile != null) +// { +// result = Utils.insertStackIntoTile(result, tile, Direction.DOWN); +// if (!result.isEmpty()) +// { +// Utils.spawnStackAtBlock(world, pos, Direction.UP, result); +// } +// } else +// { +// Utils.spawnStackAtBlock(world, pos, Direction.UP, result); +// } +// +// WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, willDrain, true); +// corrosiveWill -= willDrain; +// +// masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); +// currentEssence -= lpDrain; +// +// isBlockClaimed = true; +// } +// +// } + + Blocks d; + if (!isBlockClaimed && isSilkTouch) + { + LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); + Vector3d blockCenter = new Vector3d(newPos.getX() + 0.5, newPos.getY() + 0.5, newPos.getZ() + 0.5); + List silkDrops = state.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockPick)); + + for (ItemStack item : silkDrops) + { + ItemStack copyStack = item.copy(); + + if (tile != null) + { + copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); + } else + { + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); + continue; + } + if (!copyStack.isEmpty()) + { + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); + } + } + + if (steadfastWill >= steadfastWillDrain) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastWillDrain, true); + steadfastWill -= steadfastWillDrain; + } else + { + continue; + } + + } else if (!isBlockClaimed) + { + if (fortune > 0 && destructiveWill < destructiveWillDrain) + { + fortune = 0; + } + + ItemStack mockFortunePick = new ItemStack(Items.DIAMOND_PICKAXE, 1); + mockFortunePick.addEnchantment(Enchantments.FORTUNE, fortune); + + LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); + Vector3d blockCenter = new Vector3d(newPos.getX() + 0.5, newPos.getY() + 0.5, newPos.getZ() + 0.5); + List stackList = state.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockFortunePick)); +// List stackList = Block.getDrops(state, world, newPos, world.getTileEntity(newPos)); + +// List stackList = block.getDrops(world, newPos, state, fortune); + + for (ItemStack item : stackList) + { + ItemStack copyStack = item.copy(); + + if (tile != null) + { + copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); + } else + { + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); + continue; + } + if (!copyStack.isEmpty()) + { + Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); + } + } + + if (fortune > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveWillDrain, true); + destructiveWill -= destructiveWillDrain; + } + } + + world.destroyBlock(newPos, false); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); + hasOperated = true; + + if (consumeRawWill) + { + rawDrain += rawWillDrain; + rawWill -= rawWillDrain; + } + + break; + } + +// if (hasOperated && tile != null && vengefulWill >= vengefulWillDrain) +// { +// Pair pair = CompressionRegistry.compressInventory(tile, world); +// if (pair.getRight()) +// { +// ItemStack returned = pair.getLeft(); +// if (returned != null) +// { +// Utils.spawnStackAtBlock(world, pos, Direction.UP, returned); +// } +// +// WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulWillDrain, true); +// } +// } + + if (rawDrain > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrain, true); + } + } + + public int getRefreshTimeForRawWill(double rawWill) + { + if (rawWill >= rawWillDrain) + { + return Math.max(1, (int) (40 - rawWill / 5)); + } + + return defaultRefreshTime; + } + + @Override + public int getRefreshTime() + { + return refreshTime; + } + + @Override + public int getRefreshCost() + { + return 7; + } + + @Override + public void gatherComponents(Consumer components) + { + addParallelRunes(components, 1, 0, EnumRuneType.EARTH); + addParallelRunes(components, 2, 0, EnumRuneType.FIRE); + addCornerRunes(components, 2, 0, EnumRuneType.DUSK); + addParallelRunes(components, 2, 1, EnumRuneType.AIR); + } + + @Override + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) + { + return new ITextComponent[] + { new TranslationTextComponent(this.getTranslationKey() + ".info"), + new TranslationTextComponent(this.getTranslationKey() + ".default.info"), + new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), + new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; + } + + @Override + public Ritual getNewCopy() + { + return new RitualCrushing(); + } + + public static void registerCuttingFluid(ItemStack stack, int lpDrain, double willDrain) + { + cuttingFluidLPMap.put(stack, lpDrain); + cuttingFluidWillMap.put(stack, willDrain); + } + + private FakePlayer getFakePlayer(ServerWorld world) + { + return fakePlayer == null + ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_crushing")) + : fakePlayer; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java new file mode 100644 index 00000000..ae29c08b --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java @@ -0,0 +1,362 @@ +package wayoftime.bloodmagic.ritual.types; + +import java.util.List; +import java.util.function.Consumer; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; +import wayoftime.bloodmagic.potion.BloodMagicPotions; +import wayoftime.bloodmagic.ritual.AreaDescriptor; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.ritual.RitualRegister; +import wayoftime.bloodmagic.util.DamageSourceBloodMagic; +import wayoftime.bloodmagic.util.Utils; +import wayoftime.bloodmagic.will.DemonWillHolder; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +@RitualRegister("lava") +public class RitualLava extends Ritual +{ + public static final String LAVA_RANGE = "lavaRange"; + public static final String FIRE_FUSE_RANGE = "fireFuse"; + public static final String FIRE_RESIST_RANGE = "fireResist"; + public static final String FIRE_DAMAGE_RANGE = "fireDamage"; + public static final String LAVA_TANK_RANGE = "lavaTank"; + + public static final double vengefulWillDrain = 1; + public static final double steadfastWillDrain = 0.5; + public static final double corrosiveWillDrain = 0.2; + public static final int corrosiveRefreshTime = 20; + public int timer = 0; + + public RitualLava() + { + super("ritualLava", 0, 10000, "ritual." + BloodMagic.MODID + ".lavaRitual"); + addBlockRange(LAVA_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); + addBlockRange(FIRE_FUSE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, -2, -2), 5)); + addBlockRange(FIRE_RESIST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); + addBlockRange(FIRE_DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); + addBlockRange(LAVA_TANK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); + + setMaximumVolumeAndDistanceOfRange(LAVA_RANGE, 9, 3, 3); + setMaximumVolumeAndDistanceOfRange(FIRE_FUSE_RANGE, 0, 10, 10); + setMaximumVolumeAndDistanceOfRange(FIRE_RESIST_RANGE, 0, 10, 10); + setMaximumVolumeAndDistanceOfRange(FIRE_DAMAGE_RANGE, 0, 10, 10); + setMaximumVolumeAndDistanceOfRange(LAVA_TANK_RANGE, 1, 10, 10); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + timer++; + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + int lpDrain = 0; + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + BlockPos pos = masterRitualStone.getBlockPos(); + List willConfig = masterRitualStone.getActiveWillConfig(); + + double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); + double rawDrained = 0; + + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); + AreaDescriptor lavaRange = masterRitualStone.getBlockRange(LAVA_RANGE); + + int maxLavaVolume = getMaxVolumeForRange(LAVA_RANGE, willConfig, holder); + if (!lavaRange.isWithinRange(getMaxVerticalRadiusForRange(LAVA_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(LAVA_RANGE, willConfig, holder)) + || (maxLavaVolume != 0 && lavaRange.getVolume() > maxLavaVolume)) + { + return; + } + + for (BlockPos newPos : lavaRange.getContainedPositions(pos)) + { + BlockState state = world.getBlockState(newPos); + if (world.isAirBlock(newPos) || Utils.isFlowingLiquid(world, newPos, state)) + { + int lpCost = getLPCostForRawWill(rawWill); + if (currentEssence < lpCost) + { + break; + } + world.setBlockState(newPos, Blocks.LAVA.getDefaultState()); + currentEssence -= lpCost; + lpDrain += lpCost; + if (rawWill > 0) + { + double drain = getWillCostForRawWill(rawWill); + rawWill -= drain; + rawDrained += drain; + } + } + } + + if (rawWill > 0) + { + AreaDescriptor chestRange = masterRitualStone.getBlockRange(LAVA_TANK_RANGE); + TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); + double drain = getWillCostForRawWill(rawWill); + int lpCost = getLPCostForRawWill(rawWill); + + if (rawWill >= drain && currentEssence >= lpCost) + { + if (tile != null) + { + LazyOptional capability = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + if (capability.isPresent()) + { + IFluidHandler handler = capability.resolve().get(); + double filled = handler.fill(new FluidStack(Fluids.LAVA, 1000), FluidAction.EXECUTE); + + double ratio = filled / 1000; + + rawWill -= drain * ratio; + rawDrained += drain * ratio; + + currentEssence -= Math.ceil(lpCost * ratio); + lpDrain += Math.ceil(lpCost * ratio); + } + } + } + } + + double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); + double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); + double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); + + if (vengefulWill >= vengefulWillDrain) + { + double vengefulDrained = 0; + AreaDescriptor fuseRange = masterRitualStone.getBlockRange(FIRE_FUSE_RANGE); + + AxisAlignedBB fuseArea = fuseRange.getAABB(pos); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, fuseArea); + + for (LivingEntity entity : entities) + { + if (vengefulWill < vengefulWillDrain) + { + break; + } + + if (entity instanceof PlayerEntity) + { + continue; + } + + if (!entity.isPotionActive(BloodMagicPotions.FIRE_FUSE)) + { + entity.addPotionEffect(new EffectInstance(BloodMagicPotions.FIRE_FUSE, 100, 0)); + + vengefulDrained += vengefulWillDrain; + vengefulWill -= vengefulWillDrain; + } + } + + if (vengefulDrained > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrained, true); + } + } + + if (steadfastWill >= steadfastWillDrain) + { + double steadfastDrained = 0; + AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_RESIST_RANGE); + + int duration = getFireResistForWill(steadfastWill); + + AxisAlignedBB resistArea = resistRange.getAABB(pos); + List entities = world.getEntitiesWithinAABB(PlayerEntity.class, resistArea); + + for (PlayerEntity entity : entities) + { + if (steadfastWill < steadfastWillDrain) + { + break; + } + if (!entity.isPotionActive(Effects.FIRE_RESISTANCE) + || (entity.getActivePotionEffect(Effects.FIRE_RESISTANCE).getDuration() < 2)) + { + entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 100, 0)); + + steadfastDrained += steadfastWillDrain; + steadfastWill -= steadfastWillDrain; + } + } + + if (steadfastDrained > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrained, true); + } + } + + if (timer % corrosiveRefreshTime == 0 && corrosiveWill >= corrosiveWillDrain) + { + double corrosiveDrained = 0; + AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_DAMAGE_RANGE); + + float damage = getCorrosiveDamageForWill(corrosiveWill); + + AxisAlignedBB damageArea = resistRange.getAABB(pos); + List entities = world.getEntitiesWithinAABB(LivingEntity.class, damageArea); + + for (LivingEntity entity : entities) + { + if (corrosiveWill < corrosiveWillDrain) + { + break; + } + + if (!entity.isAlive() && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity)) + { + if (entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, damage)) + { + corrosiveDrained += corrosiveWillDrain; + corrosiveWill -= corrosiveWillDrain; + } + } + } + + if (corrosiveDrained > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrained, true); + } + } + + if (rawDrained > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrained, true); + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); + } + + @Override + public int getRefreshTime() + { + return 1; + } + + @Override + public int getRefreshCost() + { + return 500; + } + + @Override + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) + { + return new ITextComponent[] + { new TranslationTextComponent(this.getTranslationKey() + ".info"), + new TranslationTextComponent(this.getTranslationKey() + ".default.info"), + new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), + new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; + } + + @Override + public void gatherComponents(Consumer components) + { + addParallelRunes(components, 1, 0, EnumRuneType.FIRE); + } + + @Override + public Ritual getNewCopy() + { + return new RitualLava(); + } + + @Override + public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) + { + if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) + { + double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); + if (destructiveWill > 0) + { + return 9 + (int) Math.pow(destructiveWill / 10, 1.5); + } + } + + return volumeRangeMap.get(range); + } + + @Override + public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) + { + if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) + { + double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); + if (destructiveWill > 0) + { + return (int) (3 + destructiveWill / 10d); + } + } + + return verticalRangeMap.get(range); + } + + @Override + public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) + { + if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) + { + double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); + if (destructiveWill > 0) + { + return (int) (3 + destructiveWill / 10d); + } + } + + return horizontalRangeMap.get(range); + } + + public int getFireResistForWill(double steadfastWill) + { + return (int) (200 + steadfastWill * 3); + } + + public float getCorrosiveDamageForWill(double corrosiveWill) + { + return (float) (1 + corrosiveWill * 0.05); + } + + public int getLPCostForRawWill(double raw) + { + return Math.max((int) (500 - raw), 0); + } + + public double getWillCostForRawWill(double raw) + { + return Math.min(1, raw / 500); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java new file mode 100644 index 00000000..16aab5ef --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java @@ -0,0 +1,202 @@ +package wayoftime.bloodmagic.ritual.types; + +import java.util.function.Consumer; + +import com.mojang.authlib.GameProfile; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.ritual.AreaDescriptor; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.ritual.RitualRegister; +import wayoftime.bloodmagic.util.Utils; + +@RitualRegister("magnetism") +public class RitualMagnetic extends Ritual +{ + public static final String PLACEMENT_RANGE = "placementRange"; + // public static final String SEARCH_RANGE = "searchRange"; + public BlockPos lastPos; // An offset + private FakePlayer fakePlayer; + + public RitualMagnetic() + { + super("ritualMagnetic", 0, 5000, "ritual." + BloodMagic.MODID + ".magneticRitual"); + addBlockRange(PLACEMENT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3)); + setMaximumVolumeAndDistanceOfRange(PLACEMENT_RANGE, 50, 4, 4); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + World world = masterRitualStone.getWorldObj(); + Vector3d MRSpos = new Vector3d(masterRitualStone.getBlockPos().getX(), masterRitualStone.getBlockPos().getY(), masterRitualStone.getBlockPos().getZ()); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + BlockPos pos = masterRitualStone.getBlockPos(); + + AreaDescriptor placementRange = masterRitualStone.getBlockRange(PLACEMENT_RANGE); + + BlockPos replacement = pos; + boolean replace = false; + + for (BlockPos offset : placementRange.getContainedPositions(pos)) + { + if (world.isAirBlock(offset)) + { + replacement = offset; + replace = true; + break; + } + } + + BlockState downState = world.getBlockState(pos.down()); + int radius = getRadius(downState.getBlock()); + + if (replace) + { + int j = -1; + int i = -radius; + int k = -radius; + + if (lastPos != null) + { + j = lastPos.getY(); + i = Math.min(radius, Math.max(-radius, lastPos.getX())); + k = Math.min(radius, Math.max(-radius, lastPos.getZ())); + } + + if (j + pos.getY() >= 0) + { + while (i <= radius) + { + while (k <= radius) + { + BlockPos newPos = pos.add(i, j, k); + Vector3d newPosVector = new Vector3d(newPos.getX(), newPos.getY(), newPos.getZ()); + BlockState state = world.getBlockState(newPos); +// RayTraceResult fakeRayTrace = world.rayTraceBlocks(MRSpos, newPosVector, false); +// ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((ServerWorld) world)); + ItemStack checkStack = new ItemStack(state.getBlock()); + if (isBlockOre(checkStack)) + { + Utils.swapLocations(world, newPos, world, replacement); + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); + k++; + this.lastPos = new BlockPos(i, j, k); + return; + } else + { + k++; + } + } + i++; + k = -radius; + } + j--; + i = -radius; + this.lastPos = new BlockPos(i, j, k); + return; + } + + j = -1; + this.lastPos = new BlockPos(i, j, k); + } + + } + + public int getRadius(Block block) + { + if (block == Blocks.IRON_BLOCK) + { + return 7; + } + + if (block == Blocks.GOLD_BLOCK) + { + return 15; + } + + if (block == Blocks.DIAMOND_BLOCK) + { + return 31; + } + + return 3; + } + + @Override + public int getRefreshTime() + { + return 40; + } + + @Override + public int getRefreshCost() + { + return 50; + } + + @Override + public void gatherComponents(Consumer components) + { + addCornerRunes(components, 1, 0, EnumRuneType.EARTH); + addParallelRunes(components, 2, 1, EnumRuneType.EARTH); + addCornerRunes(components, 2, 1, EnumRuneType.AIR); + addParallelRunes(components, 2, 2, EnumRuneType.FIRE); + } + + @Override + public Ritual getNewCopy() + { + return new RitualMagnetic(); + } + + private FakePlayer getFakePlayer(ServerWorld world) + { + return fakePlayer == null + ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_magnetic")) + : fakePlayer; + } + + public static boolean isBlockOre(ItemStack stack) + { + if (stack.isEmpty()) + return false; + + return stack.getItem().isIn(Tags.Items.ORES); + +// for(ResourceLocation rl : stack.getItem().getTags()) +// { +// rl.getPath() +// } + +// for (int id : OreDictionary.getOreIDs(stack)) +// { +// String oreName = OreDictionary.getOreName(id); +// if (oreName.contains("ore")) +// return true; +// } + +// return false; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java index 0ff8c4b0..033cc947 100644 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java @@ -49,7 +49,7 @@ public class ClientHandler public static ResourceLocation ritualStoneEarth = BloodMagic.rl("block/earthritualstone");; public static ResourceLocation ritualStoneAir = BloodMagic.rl("block/airritualstone");; public static ResourceLocation ritualStoneDawn = BloodMagic.rl("block/dawnritualstone");; - public static ResourceLocation ritualStoneDusk = BloodMagic.rl("block/lightritualstone");; + public static ResourceLocation ritualStoneDusk = BloodMagic.rl("block/duskritualstone");; public static TextureAtlasSprite blankBloodRune; public static TextureAtlasSprite stoneBrick; public static TextureAtlasSprite glowstone; From 2a8143844aa6d7145c40acfe996c521386d7108b Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 25 Oct 2020 14:19:05 -0400 Subject: [PATCH 352/493] Crushing Ritual fix Fixed a crash on servers for the Crushing Ritual. Also added the Ritual of the Feathered Knife. --- .../java/WayofTime/bloodmagic/util/Utils.java | 2 +- .../bloodmagic/potion/BloodMagicPotions.java | 3 + .../ritual/types/RitualFeatheredKnife.java | 255 ++++++++++++++++++ 3 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 6f17f4d6..69389827 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -149,7 +149,7 @@ public class Utils double posZ = spawnPos.getZ() + 0.5; ItemEntity entityItem = new ItemEntity(world, posX, posY, posZ, stack); - entityItem.setVelocity(velX, velY, velZ); + entityItem.setMotion(velX, velY, velZ); entityItem.setItem(stack); return world.addEntity(entityItem); diff --git a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java index a47fe2b4..3f449a97 100644 --- a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java +++ b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java @@ -1,6 +1,7 @@ package wayoftime.bloodmagic.potion; import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectType; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; @@ -8,11 +9,13 @@ public class BloodMagicPotions { public static final Effect SOUL_SNARE = new PotionSoulSnare(); public static final Effect FIRE_FUSE = new PotionFireFuse(); + public static final Effect SOUL_FRAY = new PotionBloodMagic(EffectType.HARMFUL, 0xFFFFFFFF); public static void registerPotions(RegistryEvent.Register evt) { IForgeRegistry reg = evt.getRegistry(); reg.register(SOUL_SNARE.setRegistryName("soulsnare")); reg.register(FIRE_FUSE.setRegistryName("firefuse")); + reg.register(SOUL_FRAY.setRegistryName("soulfray")); } } diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java new file mode 100644 index 00000000..ef6cf518 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -0,0 +1,255 @@ +package wayoftime.bloodmagic.ritual.types; + +import java.util.List; +import java.util.function.Consumer; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.potion.EffectInstance; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.ConfigHandler; +import wayoftime.bloodmagic.altar.IBloodAltar; +import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; +import wayoftime.bloodmagic.potion.BloodMagicPotions; +import wayoftime.bloodmagic.ritual.AreaDescriptor; +import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.ritual.IMasterRitualStone; +import wayoftime.bloodmagic.ritual.Ritual; +import wayoftime.bloodmagic.ritual.RitualComponent; +import wayoftime.bloodmagic.ritual.RitualRegister; +import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; +import wayoftime.bloodmagic.will.EnumDemonWillType; + +@RitualRegister("feathered_knife") +public class RitualFeatheredKnife extends Ritual +{ + public static final String ALTAR_RANGE = "altar"; + public static final String DAMAGE_RANGE = "damage"; + + public static double rawWillDrain = 0.05; + public static double destructiveWillDrain = 0.05; + public static double corrosiveWillThreshold = 10; + public static double steadfastWillThreshold = 10; + public static double vengefulWillThreshold = 10; + public static int defaultRefreshTime = 20; + public int refreshTime = 20; + public BlockPos altarOffsetPos = new BlockPos(0, 0, 0); // TODO: Save! + + public RitualFeatheredKnife() + { + super("ritualFeatheredKnife", 0, 25000, "ritual." + BloodMagic.MODID + ".featheredKnifeRitual"); + addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); + addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -20, -15), 31, 41, 31)); + + setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); + setMaximumVolumeAndDistanceOfRange(DAMAGE_RANGE, 0, 25, 15); + } + + @Override + public void performRitual(IMasterRitualStone masterRitualStone) + { + World world = masterRitualStone.getWorldObj(); + int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); + + if (currentEssence < getRefreshCost()) + { + masterRitualStone.getOwnerNetwork().causeNausea(); + return; + } + + BlockPos pos = masterRitualStone.getBlockPos(); + + List willConfig = masterRitualStone.getActiveWillConfig(); + + double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); + double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); + double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); + double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); + double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); + + refreshTime = getRefreshTimeForRawWill(rawWill); + + boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; + + int maxEffects = currentEssence / getRefreshCost(); + int totalEffects = 0; + + BlockPos altarPos = pos.add(altarOffsetPos); + + TileEntity tile = world.getTileEntity(altarPos); + + AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); + + if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof IBloodAltar)) + { + for (BlockPos newPos : altarRange.getContainedPositions(pos)) + { + TileEntity nextTile = world.getTileEntity(newPos); + if (nextTile instanceof IBloodAltar) + { + tile = nextTile; + altarOffsetPos = newPos.subtract(pos); + + altarRange.resetCache(); + break; + } + } + } + + boolean useIncense = corrosiveWill >= corrosiveWillThreshold; + + if (tile instanceof IBloodAltar) + { + IBloodAltar tileAltar = (IBloodAltar) tile; + + AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); + AxisAlignedBB range = damageRange.getAABB(pos); + + double destructiveDrain = 0; + + List entities = world.getEntitiesWithinAABB(PlayerEntity.class, range); + + for (PlayerEntity player : entities) + { + float healthThreshold = steadfastWill >= steadfastWillThreshold ? 0.7f : 0.3f; + + if (vengefulWill >= vengefulWillThreshold + && !player.getGameProfile().getId().equals(masterRitualStone.getOwner())) + { + healthThreshold = 0.1f; + } + + float health = player.getHealth(); + float maxHealth = player.getMaxHealth(); + + float sacrificedHealth = 1; + double lpModifier = 1; + + if ((health / player.getMaxHealth() > healthThreshold) + && (!useIncense || !player.isPotionActive(BloodMagicPotions.SOUL_FRAY))) + { + if (useIncense) + { + double incenseAmount = PlayerSacrificeHelper.getPlayerIncense(player); + + sacrificedHealth = health - maxHealth * healthThreshold; + lpModifier *= PlayerSacrificeHelper.getModifier(incenseAmount); + + PlayerSacrificeHelper.setPlayerIncense(player, 0); + player.addPotionEffect(new EffectInstance(BloodMagicPotions.SOUL_FRAY, PlayerSacrificeHelper.soulFrayDuration)); + } + + if (destructiveWill >= destructiveWillDrain * sacrificedHealth) + { + lpModifier *= getLPModifierForWill(destructiveWill); + destructiveWill -= destructiveWillDrain * sacrificedHealth; + destructiveDrain += destructiveWillDrain * sacrificedHealth; + } + +// if (LivingArmour.hasFullSet(player)) +// { +// ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); +// LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); +// if (armour != null) +// { +// LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack); +// +// if (upgrade instanceof LivingArmourUpgradeSelfSacrifice) +// { +// double modifier = ((LivingArmourUpgradeSelfSacrifice) upgrade).getSacrificeModifier(); +// +// lpModifier *= (1 + modifier); +// } +// } +// } + + player.setHealth(health - sacrificedHealth); + + tileAltar.sacrificialDaggerCall((int) (ConfigHandler.values.sacrificialDaggerConversion * lpModifier + * sacrificedHealth), false); + + totalEffects++; + + if (totalEffects >= maxEffects) + { + break; + } + + } + } + + if (destructiveDrain > 0) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, destructiveDrain, true); + } + } + + masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); + if (totalEffects > 0 && consumeRawWill) + { + WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWillDrain, true); + } + } + + @Override + public int getRefreshTime() + { + return refreshTime; + } + + @Override + public int getRefreshCost() + { + return 20; + } + + @Override + public void gatherComponents(Consumer components) + { + addParallelRunes(components, 1, 0, EnumRuneType.DUSK); + addParallelRunes(components, 2, -1, EnumRuneType.WATER); + addCornerRunes(components, 1, -1, EnumRuneType.AIR); + addOffsetRunes(components, 2, 4, -1, EnumRuneType.FIRE); + addOffsetRunes(components, 2, 4, 0, EnumRuneType.EARTH); + addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); + addCornerRunes(components, 3, 0, EnumRuneType.AIR); + } + + @Override + public Ritual getNewCopy() + { + return new RitualFeatheredKnife(); + } + + @Override + public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) + { + return new ITextComponent[] + { new TranslationTextComponent(this.getTranslationKey() + ".info"), + new TranslationTextComponent(this.getTranslationKey() + ".default.info"), + new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), + new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), + new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; + } + + public double getLPModifierForWill(double destructiveWill) + { + return 1 + destructiveWill * 0.2 / 100; + } + + public int getRefreshTimeForRawWill(double rawWill) + { + if (rawWill >= rawWillDrain) + { + return 10; + } + + return defaultRefreshTime; + } +} From ec1b0644cb3c523945244b38c8927a056b039c5c Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 26 Oct 2020 15:53:09 -0400 Subject: [PATCH 353/493] Framework for ARC Initial framework for the ARC block, including GUI, Container, Tile Entity, and Block. --- build.gradle | 2 +- src/generated/resources/.cache/cache | 9 + .../alchemicalreactionchamber.json | 34 +++ .../block/alchemicalreactionchamber.json | 9 + .../item/alchemicalreactionchamber.json | 3 + .../bloodmagictab/ritual_diviner_0.json | 32 +++ .../bloodmagictab/ritual_diviner_1.json | 32 +++ .../blocks/alchemicalreactionchamber.json | 19 ++ .../bloodmagic/recipes/ritual_diviner_0.json | 31 +++ .../bloodmagic/recipes/ritual_diviner_1.json | 22 ++ .../recipes/weak_activation_crystal.json | 13 ++ .../java/WayofTime/bloodmagic/BloodMagic.java | 2 + .../bloodmagic/tile/TileSoulForge.java | 42 ---- .../bloodmagic/client/ClientEvents.java | 2 + .../ScreenAlchemicalReactionChamber.java | 84 ++++++++ .../block/BlockAlchemicalReactionChamber.java | 162 ++++++++++++++ .../common/block/BlockSoulForge.java | 47 +++-- .../common/block/BloodMagicBlocks.java | 4 + .../common/data/GeneratorBaseRecipes.java | 2 +- .../common/data/GeneratorBlockStates.java | 25 +++ .../common/data/GeneratorItemModels.java | 1 + .../common/data/GeneratorLootTable.java | 1 + .../common/item/BloodMagicItems.java | 1 + .../bloodmagic/common/item/IARCTool.java | 6 + .../common/item/sigil/ItemSigilFluidBase.java | 5 +- .../tile/TileAlchemicalReactionChamber.java | 129 ++++++++++++ .../ContainerAlchemicalReactionChamber.java | 198 ++++++++++++++++++ .../bloodmagic/textures/block/arc_bottom.png | Bin 0 -> 915 bytes .../bloodmagic/textures/block/arc_front.png | Bin 0 -> 1283 bytes .../bloodmagic/textures/block/arc_side.png | Bin 0 -> 1200 bytes .../bloodmagic/textures/block/arc_top.png | Bin 0 -> 1317 bytes .../bloodmagic/textures/gui/arc_gui.png | Bin 0 -> 18575 bytes 32 files changed, 847 insertions(+), 70 deletions(-) create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json create mode 100644 src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java create mode 100644 src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java create mode 100644 src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java create mode 100644 src/main/resources/assets/bloodmagic/textures/block/arc_bottom.png create mode 100644 src/main/resources/assets/bloodmagic/textures/block/arc_front.png create mode 100644 src/main/resources/assets/bloodmagic/textures/block/arc_side.png create mode 100644 src/main/resources/assets/bloodmagic/textures/block/arc_top.png create mode 100644 src/main/resources/assets/bloodmagic/textures/gui/arc_gui.png diff --git a/build.gradle b/build.gradle index f06f3e9a..fa742ba4 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.16.3-3.0-0' +version = '1.16.3-3.0-1' group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'BloodMagic' diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1a1bca55..94f44db7 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,5 +1,6 @@ cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerationrune.json 43be0406da1c9f7cf734427bea235a65cda073d2 assets/bloodmagic/blockstates/airritualstone.json +5ba8e1b2a7ef85028044056cc971b8fe02ab7e7f assets/bloodmagic/blockstates/alchemicalreactionchamber.json 4a60c54def00d68368ed0a0d4783979aa63d5f60 assets/bloodmagic/blockstates/altarcapacityrune.json 950fff9f06033741091aa8a66a62857da673efb9 assets/bloodmagic/blockstates/bettercapacityrune.json 8a5edb859a6f4d0adfbe2f608bab6b8c8addf01a assets/bloodmagic/blockstates/blankrune.json @@ -20,6 +21,7 @@ e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritu af6eebbeef7c75844a0651065016fecb365595dd assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json +adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json 3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json 7cd62092c6fb3109e016d42090cf89bfa3ab7fca assets/bloodmagic/models/block/bettercapacityrune.json 1fe0f89895addb7abcacf6ce7e39b6ddc87b0d85 assets/bloodmagic/models/block/blankrune.json @@ -44,6 +46,7 @@ a8a1d06fcc2f8395530c72d2846133fff37d5537 assets/bloodmagic/models/block/sacrific fe8e3deb3ad0107ca3ebd70694c1fc55a987d912 assets/bloodmagic/models/item/airritualstone.json 0bcf230493163a43357cbee7c26b8756089cb548 assets/bloodmagic/models/item/airscribetool.json 17cbe9142ef3950ea1b6be11694b849f55e93f13 assets/bloodmagic/models/item/airsigil.json +92cc51b70ce22796804d093e3fc21141658f85fd assets/bloodmagic/models/item/alchemicalreactionchamber.json f150f178edf7d6d250bcfd84af1c28a21cff09c6 assets/bloodmagic/models/item/altarcapacityrune.json 866b8cdd3da56e2e82dbd5f16ab5117b5a503749 assets/bloodmagic/models/item/apprenticebloodorb.json 719e38516b76596e177809508b4e2b28f05acfb0 assets/bloodmagic/models/item/arcaneashes.json @@ -148,6 +151,8 @@ e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bl 263f7c251d2f163db5bd229f2ab8a222f23ae03a data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json 7ca400d1141ff4be1b529cd060950b42cf3b9bfb data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json 344567e6f5671131addcfebbd92d18e5cbd66ef5 data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json +01e90bb9c59d44a52777ecc0cf28754295fda675 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json +836e1fc171dba197e02d6a9e3e61a3718cb5a482 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json 1578416eb302aecb3fd61e481634c5c021541f51 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json 832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json @@ -155,6 +160,7 @@ c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bl 7a7f9f995d2414289d07c0a145647c8e735a6b78 data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json 639ebb2ccabb2eaece59be96c2e6f28c31f4d2f4 data/bloodmagic/loot_tables/blocks/accelerationrune.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/airritualstone.json +1ed1f3cebe68450b6d5ca3ce69e4728a7d250b1c data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json 443550be9eaf1021b11fd2bbe6afcfe2cee6f7ad data/bloodmagic/loot_tables/blocks/alchemyarray.json 17d8dcc62320d5d2eeb781e925963d9b9d5eec54 data/bloodmagic/loot_tables/blocks/altar.json 05bb6268d7e884c962061a632e162d5baf73271e data/bloodmagic/loot_tables/blocks/altarcapacityrune.json @@ -206,6 +212,8 @@ b63d77c3762f86d4a91f62e192c3e9b26e3b52ca data/bloodmagic/recipes/blood_rune_sacr 7c4e247c1df6ef594bbb2fc2196afb102f45982b data/bloodmagic/recipes/blood_rune_self_sacrifice.json e2bcf2a6f951fbcef45554ec90ba28d14e261d18 data/bloodmagic/recipes/blood_rune_speed.json 9dedad36e9d2ab6688e069c2e6df3851c395b583 data/bloodmagic/recipes/lava_crystal.json +bfd7925ad30534463d7daf0f7dce03cf1502cbcf data/bloodmagic/recipes/ritual_diviner_0.json +2ec436681cdd169bae99d090bb889c2a45420b6c data/bloodmagic/recipes/ritual_diviner_1.json 7757e5fd52f71b0d21595e072593fc592210dd64 data/bloodmagic/recipes/ritual_stone_blank.json 8608f828f997b1a8015287bd9cd436e9d7dff2ff data/bloodmagic/recipes/ritual_stone_master.json aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json @@ -222,3 +230,4 @@ e517023dc3e32929344ff5415397fc833bfbc29a data/bloodmagic/recipes/soulforge/reage c0e75e0e12290d191245c5b0b5b13bc739d2ff44 data/bloodmagic/recipes/soulforge/reagent_void.json a222d09abf1ea61feb684f2ac23d011c2034f526 data/bloodmagic/recipes/soulforge/reagent_water.json 7e281841a2953c1284d332c2bbf75097f8128241 data/bloodmagic/recipes/soulforge/sentientsword.json +d7d993bb729284a5201c164ea81fbe1d8e4e4750 data/bloodmagic/recipes/weak_activation_crystal.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json b/src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json new file mode 100644 index 00000000..05658c8b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,lit=false": { + "model": "bloodmagic:block/alchemicalreactionchamber" + }, + "facing=south,lit=false": { + "model": "bloodmagic:block/alchemicalreactionchamber", + "y": 180 + }, + "facing=west,lit=false": { + "model": "bloodmagic:block/alchemicalreactionchamber", + "y": 270 + }, + "facing=east,lit=false": { + "model": "bloodmagic:block/alchemicalreactionchamber", + "y": 90 + }, + "facing=north,lit=true": { + "model": "bloodmagic:block/alchemicalreactionchamber" + }, + "facing=south,lit=true": { + "model": "bloodmagic:block/alchemicalreactionchamber", + "y": 180 + }, + "facing=west,lit=true": { + "model": "bloodmagic:block/alchemicalreactionchamber", + "y": 270 + }, + "facing=east,lit=true": { + "model": "bloodmagic:block/alchemicalreactionchamber", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json b/src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json new file mode 100644 index 00000000..84690dfc --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/orientable_with_bottom", + "textures": { + "side": "bloodmagic:block/arc_side", + "front": "bloodmagic:block/arc_front", + "bottom": "bloodmagic:block/arc_bottom", + "top": "bloodmagic:block/arc_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json b/src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json new file mode 100644 index 00000000..bb6ed1e2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/alchemicalreactionchamber" +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json new file mode 100644 index 00000000..ac4dd373 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:ritual_diviner_0" + ] + }, + "criteria": { + "has_scribe": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:airscribetool" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:ritual_diviner_0" + } + } + }, + "requirements": [ + [ + "has_scribe", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json new file mode 100644 index 00000000..b671e3bd --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:ritual_diviner_1" + ] + }, + "criteria": { + "has_demon_slate": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:demonslate" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:ritual_diviner_1" + } + } + }, + "requirements": [ + [ + "has_demon_slate", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json new file mode 100644 index 00000000..e3d6ee73 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:alchemicalreactionchamber" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json b/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json new file mode 100644 index 00000000..5806cf36 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "dfd", + "ase", + "dwd" + ], + "key": { + "a": { + "item": "bloodmagic:airscribetool" + }, + "s": { + "tag": "forge:rods/wooden" + }, + "d": { + "tag": "forge:gems/diamond" + }, + "e": { + "item": "bloodmagic:earthscribetool" + }, + "f": { + "item": "bloodmagic:firescribetool" + }, + "w": { + "item": "bloodmagic:waterscribetool" + } + }, + "result": { + "item": "bloodmagic:ritualdiviner" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json b/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json new file mode 100644 index 00000000..46a797ed --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "tdt", + " S " + ], + "key": { + "S": { + "item": "bloodmagic:demonslate" + }, + "t": { + "item": "bloodmagic:duskscribetool" + }, + "d": { + "item": "bloodmagic:ritualdiviner" + } + }, + "result": { + "item": "bloodmagic:ritualdivinerdusk" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json b/src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json new file mode 100644 index 00000000..ba19a174 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:altar", + "input": { + "item": "bloodmagic:lavacrystal" + }, + "output": { + "item": "bloodmagic:activationcrystalweak" + }, + "upgradeLevel": 2, + "altarSyphon": 10000, + "consumptionRate": 20, + "drainRate": 10 +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 2fc39a67..4b3aa5ce 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -50,6 +50,7 @@ import wayoftime.bloodmagic.core.registry.OrbRegistry; import wayoftime.bloodmagic.network.BloodMagicPacketHandler; import wayoftime.bloodmagic.potion.BloodMagicPotions; import wayoftime.bloodmagic.ritual.RitualManager; +import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; import wayoftime.bloodmagic.tile.TileAlchemyArray; import wayoftime.bloodmagic.tile.TileAltar; import wayoftime.bloodmagic.tile.TileMasterRitualStone; @@ -151,6 +152,7 @@ public class BloodMagic event.getRegistry().register(TileEntityType.Builder.create(TileAlchemyArray::new, BloodMagicBlocks.ALCHEMY_ARRAY.get()).build(null).setRegistryName("alchemyarray")); event.getRegistry().register(TileEntityType.Builder.create(TileSoulForge::new, BloodMagicBlocks.SOUL_FORGE.get()).build(null).setRegistryName("soulforge")); event.getRegistry().register(TileEntityType.Builder.create(TileMasterRitualStone::new, BloodMagicBlocks.MASTER_RITUAL_STONE.get()).build(null).setRegistryName("masterritualstone")); + event.getRegistry().register(TileEntityType.Builder.create(TileAlchemicalReactionChamber::new, BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()).build(null).setRegistryName("alchemicalreactionchamber")); } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 0dcdcc12..6f8fccde 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -231,48 +231,6 @@ public class TileSoulForge extends TileInventory return ((double) burnTime) / ticksRequired; } -// private boolean canCraft(RecipeTartaricForge recipe) -// { -// if (recipe == null) -// return false; -// -// ItemStack currentOutputStack = getStackInSlot(outputSlot); -// if (recipe.getOutput().isEmpty()) -// return false; -// if (currentOutputStack.isEmpty()) -// return true; -// if (!currentOutputStack.isItemEqual(recipe.getOutput())) -// return false; -// int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); -// return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); -// -// } -// -// public void craftItem(RecipeTartaricForge recipe) -// { -// if (this.canCraft(recipe)) -// { -// ItemStack currentOutputStack = getStackInSlot(outputSlot); -// -// List inputList = new ArrayList<>(); -// for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) -// inputList.add(getStackInSlot(i).copy()); -// -// BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); -// MinecraftForge.EVENT_BUS.post(event); -// -// if (currentOutputStack.isEmpty()) -// { -// setInventorySlotContents(outputSlot, event.getOutput()); -// } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) -// { -// currentOutputStack.grow(event.getOutput().getCount()); -// } -// -// consumeInventory(); -// } -// } - public double getWill(EnumDemonWillType type) { ItemStack soulStack = getStackInSlot(soulSlot); diff --git a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java index 8d3b6065..032df2a9 100644 --- a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java +++ b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java @@ -16,6 +16,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.client.render.block.RenderAlchemyArray; import wayoftime.bloodmagic.client.render.block.RenderAltar; +import wayoftime.bloodmagic.client.screens.ScreenAlchemicalReactionChamber; import wayoftime.bloodmagic.client.screens.ScreenSoulForge; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; import wayoftime.bloodmagic.common.item.BloodMagicItems; @@ -39,6 +40,7 @@ public class ClientEvents public static void registerContainerScreens() { ScreenManager.registerFactory(BloodMagicBlocks.SOUL_FORGE_CONTAINER.get(), ScreenSoulForge::new); + ScreenManager.registerFactory(BloodMagicBlocks.ARC_CONTAINER.get(), ScreenAlchemicalReactionChamber::new); } public static void registerItemModelProperties(FMLClientSetupEvent event) diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java new file mode 100644 index 00000000..cc06b489 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java @@ -0,0 +1,84 @@ +package wayoftime.bloodmagic.client.screens; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.systems.RenderSystem; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; +import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; + +public class ScreenAlchemicalReactionChamber extends ScreenBase +{ + private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/arc_gui.png"); + public TileAlchemicalReactionChamber tileARC; + + public ScreenAlchemicalReactionChamber(ContainerAlchemicalReactionChamber container, PlayerInventory playerInventory, ITextComponent title) + { + super(container, playerInventory, title); + tileARC = container.tileARC; + this.xSize = 176; + this.ySize = 205; + } + + @Override + public ResourceLocation getBackground() + { + return background; + } + +// public + +// public ScreenSoulForge(InventoryPlayer playerInventory, IInventory tileSoulForge) +// { +// super(new ContainerSoulForge(playerInventory, tileSoulForge)); +// this.tileSoulForge = tileSoulForge; +// this.xSize = 176; +// this.ySize = 205; +// } +// +// @Override +// public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) +// { +// this.drawDefaultBackground(); +// super.drawScreen(mouseX, mouseY, partialTicks); +// this.renderHoveredToolTip(mouseX, mouseY); +// } +// + @Override + protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) + { + this.font.func_243248_b(stack, new TranslationTextComponent("tile.bloodmagic.arc.name"), 8, 5, 4210752); + this.font.func_243248_b(stack, new TranslationTextComponent("container.inventory"), 8, 111, 4210752); + } + +// + @Override + protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) + { + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + getMinecraft().getTextureManager().bindTexture(background); + int i = (this.width - this.xSize) / 2; + int j = (this.height - this.ySize) / 2; + this.blit(stack, i, j, 0, 0, this.xSize, this.ySize); + +// int l = this.getCookProgressScaled(90); +// this.blit(stack, i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); + } + +//// +// public int getCookProgressScaled(int scale) +// { +// double progress = ((TileSoulForge) tileSoulForge).getProgressForGui(); +//// if (tileSoulForge != null) +//// { +//// System.out.println("Tile is NOT null"); +//// } +//// double progress = ((float) this.container.data.get(0)) / ((float) this.container.data.get(1)); +//// System.out.println(this.container.data.get(0)); +// return (int) (progress * scale); +// } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java new file mode 100644 index 00000000..da151b5c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java @@ -0,0 +1,162 @@ +package wayoftime.bloodmagic.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.inventory.container.INamedContainerProvider; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.ItemStack; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.tileentity.AbstractFurnaceTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.fml.network.NetworkHooks; +import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; + +public class BlockAlchemicalReactionChamber extends Block +{ + public static final DirectionProperty FACING = HorizontalBlock.HORIZONTAL_FACING; + public static final BooleanProperty LIT = BlockStateProperties.LIT; + + public BlockAlchemicalReactionChamber() + { + super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2).sound(SoundType.STONE)); + this.setDefaultState(this.stateContainer.getBaseState().with(FACING, Direction.NORTH).with(LIT, Boolean.valueOf(false))); + } + + @Override + public boolean hasTileEntity(BlockState state) + { + return true; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) + { + return new TileAlchemicalReactionChamber(); + } + + @Override + public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) + { + TileAlchemicalReactionChamber arc = (TileAlchemicalReactionChamber) world.getTileEntity(blockPos); + if (arc != null) + arc.dropItems(); + + super.onPlayerDestroy(world, blockPos, blockState); + } + + @Override + public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + { + if (!state.isIn(newState.getBlock())) + { + TileEntity tileentity = worldIn.getTileEntity(pos); + if (tileentity instanceof TileAlchemicalReactionChamber) + { + ((TileAlchemicalReactionChamber) tileentity).dropItems(); + worldIn.updateComparatorOutputLevel(pos, this); + } + + super.onReplaced(state, worldIn, pos, newState, isMoving); + } + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) + { + if (world.isRemote) + return ActionResultType.SUCCESS; + + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileAlchemicalReactionChamber)) + return ActionResultType.FAIL; + + NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tile, pos); +// player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); + + return ActionResultType.SUCCESS; + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) + { + return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite()); + } + + /** + * Called by ItemBlocks after a block is set in the world, to allow post-place + * logic + */ + @Override + public void onBlockPlacedBy(World worldIn, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) + { + if (stack.hasDisplayName()) + { + TileEntity tileentity = worldIn.getTileEntity(pos); + if (tileentity instanceof AbstractFurnaceTileEntity) + { + ((AbstractFurnaceTileEntity) tileentity).setCustomName(stack.getDisplayName()); + } + } + + } + + /** + * Returns the blockstate with the given rotation from the passed blockstate. If + * inapplicable, returns the passed blockstate. + * + * @deprecated call via {@link IBlockState#withRotation(Rotation)} whenever + * possible. Implementing/overriding is fine. + */ + @Override + public BlockState rotate(BlockState state, Rotation rot) + { + return state.with(FACING, rot.rotate(state.get(FACING))); + } + + /** + * Returns the blockstate with the given mirror of the passed blockstate. If + * inapplicable, returns the passed blockstate. + * + * @deprecated call via {@link IBlockState#withMirror(Mirror)} whenever + * possible. Implementing/overriding is fine. + */ + @Override + public BlockState mirror(BlockState state, Mirror mirrorIn) + { + return state.rotate(mirrorIn.toRotation(state.get(FACING))); + } + + @Override + protected void fillStateContainer(StateContainer.Builder builder) + { + builder.add(FACING, LIT); + } + + public boolean eventReceived(BlockState state, World worldIn, BlockPos pos, int id, int param) + { + super.eventReceived(state, worldIn, pos, id, param); + TileEntity tileentity = worldIn.getTileEntity(pos); + return tileentity == null ? false : tileentity.receiveClientEvent(id, param); + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java index 27f7b461..dba36a9a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java @@ -15,6 +15,7 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; import net.minecraftforge.fml.network.NetworkHooks; @@ -27,13 +28,6 @@ public class BlockSoulForge extends Block// implements IBMBlock public BlockSoulForge() { super(Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); - -// setTranslationKey(BloodMagic.MODID + ".soulForge"); -// setHardness(2.0F); -// setResistance(5.0F); -// setSoundType(SoundType.METAL); -// setHarvestLevel("pickaxe", 1); -// setCreativeTab(BloodMagic.TAB_BM); } @Override @@ -76,20 +70,29 @@ public class BlockSoulForge extends Block// implements IBMBlock return ActionResultType.SUCCESS; } -// @Override -// public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) -// { -// TileSoulForge tileSoulForge = (TileSoulForge) world.getTileEntity(blockPos); -// if (tileSoulForge != null) -// tileSoulForge.dropItems(); -// -// super.breakBlock(world, blockPos, blockState); -// } + @Override + public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) + { + TileSoulForge forge = (TileSoulForge) world.getTileEntity(blockPos); + if (forge != null) + forge.dropItems(); -// -// @Override -// public BlockItem getItem() -// { -// return new BlockItem(this); -// } + super.onPlayerDestroy(world, blockPos, blockState); + } + + @Override + public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + { + if (!state.isIn(newState.getBlock())) + { + TileEntity tileentity = worldIn.getTileEntity(pos); + if (tileentity instanceof TileSoulForge) + { + ((TileSoulForge) tileentity).dropItems(); + worldIn.updateComparatorOutputLevel(pos, this); + } + + super.onReplaced(state, worldIn, pos, newState, isMoving); + } + } } diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java index 48e0dc40..af778e7d 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java @@ -19,6 +19,7 @@ import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.block.enums.BloodRuneType; import wayoftime.bloodmagic.common.item.BloodMagicItems; import wayoftime.bloodmagic.ritual.EnumRuneType; +import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; public class BloodMagicBlocks @@ -59,6 +60,8 @@ public class BloodMagicBlocks public static final RegistryObject MASTER_RITUAL_STONE = BASICBLOCKS.register("masterritualstone", () -> new BlockMasterRitualStone(false)); + public static final RegistryObject ALCHEMICAL_REACTION_CHAMBER = BLOCKS.register("alchemicalreactionchamber", () -> new BlockAlchemicalReactionChamber()); + private static ForgeFlowingFluid.Properties makeProperties() { return new ForgeFlowingFluid.Properties(LIFE_ESSENCE_FLUID, LIFE_ESSENCE_FLUID_FLOWING, FluidAttributes.builder(FLUID_STILL, FLUID_FLOWING)).bucket(LIFE_ESSENCE_BUCKET).block(LIFE_ESSENCE_BLOCK); @@ -71,6 +74,7 @@ public class BloodMagicBlocks public static RegistryObject LIFE_ESSENCE_BUCKET = ITEMS.register("life_essence_bucket", () -> new BucketItem(LIFE_ESSENCE_FLUID, new Item.Properties().containerItem(Items.BUCKET).maxStackSize(1).group(BloodMagic.TAB))); public static final RegistryObject> SOUL_FORGE_CONTAINER = CONTAINERS.register("soul_forge_container", () -> IForgeContainerType.create(ContainerSoulForge::new)); + public static final RegistryObject> ARC_CONTAINER = CONTAINERS.register("arc_container", () -> IForgeContainerType.create(ContainerAlchemicalReactionChamber::new)); // public static final RegistryObject BLOOD_STONE = registerNoItem("blood_stone", () -> new BloodstoneBlock()); // //// private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java index d2f11e9d..346be435 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java @@ -34,7 +34,7 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLOOD_ALTAR.get()).key('a', Tags.Items.STONE).key('b', Items.FURNACE).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicItems.MONSTER_SOUL_RAW.get()).patternLine("a a").patternLine("aba").patternLine("cdc").addCriterion("has_will", hasItem(BloodMagicItems.MONSTER_SOUL_RAW.get())).build(consumer, BloodMagic.rl("blood_altar")); ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SOUL_FORGE.get()).key('s', Tags.Items.STONE).key('g', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).key('o', Tags.Items.STORAGE_BLOCKS_IRON).patternLine("i i").patternLine("sgs").patternLine("sos").addCriterion("has_gold", hasItem(Items.GOLD_INGOT)).build(consumer, BloodMagic.rl("soul_forge")); ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SOUL_SNARE.get(), 4).key('r', Tags.Items.DUSTS_REDSTONE).key('s', Tags.Items.STRING).key('i', Tags.Items.INGOTS_IRON).patternLine("sis").patternLine("iri").patternLine("sis").addCriterion("has_redstone", hasItem(Items.REDSTONE)).build(consumer, BloodMagic.rl("soul_snare")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.BASE_RITUAL_DIVINER.get()).key('a', BloodMagicItems.AIR_INSCRIPTION_TOOL.get()).key('s', Tags.Items.RODS_WOODEN).key('d', Tags.Items.GEMS_DIAMOND).key('e', BloodMagicItems.EARTH_INSCRIPTION_TOOL.get()).key('f', BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()).key('w', BloodMagicItems.WATER_INSCRIPTION_TOOL.get()).addCriterion("has_scribe", hasItem(BloodMagicItems.AIR_INSCRIPTION_TOOL.get())).build(consumer, BloodMagic.rl("ritual_diviner_0")); + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.BASE_RITUAL_DIVINER.get()).key('a', BloodMagicItems.AIR_INSCRIPTION_TOOL.get()).key('s', Tags.Items.RODS_WOODEN).key('d', Tags.Items.GEMS_DIAMOND).key('e', BloodMagicItems.EARTH_INSCRIPTION_TOOL.get()).key('f', BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()).key('w', BloodMagicItems.WATER_INSCRIPTION_TOOL.get()).patternLine("dfd").patternLine("ase").patternLine("dwd").addCriterion("has_scribe", hasItem(BloodMagicItems.AIR_INSCRIPTION_TOOL.get())).build(consumer, BloodMagic.rl("ritual_diviner_0")); ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.DUSK_RITUAL_DIVINER.get()).key('S', BloodMagicItems.DEMONIC_SLATE.get()).key('t', BloodMagicItems.DUSK_INSCRIPTION_TOOL.get()).key('d', BloodMagicItems.BASE_RITUAL_DIVINER.get()).patternLine(" S ").patternLine("tdt").patternLine(" S ").addCriterion("has_demon_slate", hasItem(BloodMagicItems.DEMONIC_SLATE.get())).build(consumer, BloodMagic.rl("ritual_diviner_1")); } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java index 04b013f1..38288795 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java @@ -2,11 +2,15 @@ package wayoftime.bloodmagic.common.data; import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; +import net.minecraft.util.Direction; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.client.model.generators.VariantBlockStateBuilder; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.fml.RegistryObject; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BlockAlchemicalReactionChamber; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; public class GeneratorBlockStates extends BlockStateProvider @@ -35,6 +39,8 @@ public class GeneratorBlockStates extends BlockStateProvider buildCubeAll(BloodMagicBlocks.EARTH_RITUAL_STONE.get()); buildCubeAll(BloodMagicBlocks.DUSK_RITUAL_STONE.get()); buildCubeAll(BloodMagicBlocks.DAWN_RITUAL_STONE.get()); + + buildFurnace(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()); } private void buildCubeAll(Block block) @@ -42,4 +48,23 @@ public class GeneratorBlockStates extends BlockStateProvider getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(cubeAll(block)).build()); } + private void buildFurnace(Block block) + { +// ConfiguredModel[] furnaceModel = ConfiguredModel.builder().modelFile().build(); + ModelFile furnace_off = models().orientableWithBottom("alchemicalreactionchamber", BloodMagic.rl("block/arc_side"), BloodMagic.rl("block/arc_front"), BloodMagic.rl("block/arc_bottom"), BloodMagic.rl("block/arc_top")); +// getVariantBuilder(block).addModels(block.getDefaultState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, false), furnaceModel); + + VariantBlockStateBuilder builder = getVariantBuilder(block); + + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.EAST).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).rotationY(90).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.SOUTH).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).rotationY(180).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.WEST).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).rotationY(270).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.EAST).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).rotationY(90).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.SOUTH).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).rotationY(180).addModel(); + builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.WEST).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).rotationY(270).addModel(); + +// getVariantBuilder(block). + } } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java index 77739743..35edebf5 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java @@ -43,6 +43,7 @@ public class GeneratorItemModels extends ItemModelProvider registerBlockModel(BloodMagicBlocks.EARTH_RITUAL_STONE.get()); registerBlockModel(BloodMagicBlocks.DUSK_RITUAL_STONE.get()); registerBlockModel(BloodMagicBlocks.DAWN_RITUAL_STONE.get()); + registerBlockModel(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()); registerToggleableItem(BloodMagicItems.GREEN_GROVE_SIGIL.get()); registerToggleableItem(BloodMagicItems.FAST_MINER_SIGIL.get()); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java index 4115ea9a..5315c433 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java @@ -60,6 +60,7 @@ public class GeneratorLootTable extends LootTableProvider registerDropping(BloodMagicBlocks.EARTH_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); registerDropping(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); registerDropping(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); + registerDropSelfLootTable(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()); } private void registerNoDropLootTable(Block block) diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index 30ae733e..cd5a0ad0 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -62,6 +62,7 @@ public class BloodMagicItems public static final RegistryObject EARTH_RITUAL_STONE_ITEM = ITEMS.register("earthritualstone", () -> new BlockItem(BloodMagicBlocks.EARTH_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject DUSK_RITUAL_STONE_ITEM = ITEMS.register("duskritualstone", () -> new BlockItem(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject DAWN_RITUAL_STONE_ITEM = ITEMS.register("lightritualstone", () -> new BlockItem(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject ALCHEMICAL_REACTION_CHAMBER_ITEM = ITEMS.register("alchemicalreactionchamber", () -> new BlockItem(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get(), new Item.Properties().group(BloodMagic.TAB))); public static final RegistryObject MASTER_RITUAL_STONE_ITEM = ITEMS.register("masterritualstone", () -> new BlockItem(BloodMagicBlocks.MASTER_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java b/src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java new file mode 100644 index 00000000..11112588 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java @@ -0,0 +1,6 @@ +package wayoftime.bloodmagic.common.item; + +public interface IARCTool +{ + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java index 53224f84..4a9319e9 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java @@ -5,7 +5,6 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BucketItem; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -54,10 +53,8 @@ public abstract class ItemSigilFluidBase extends ItemSigilBase { BlockState state = world.getBlockState(blockPos); Block block = state.getBlock(); - BucketItem b; - System.out.println(block); + IFluidHandler targetFluidHandler = FluidUtil.getFluidHandler(world, blockPos, side).orElse(null); - System.out.println(targetFluidHandler); if (targetFluidHandler == null) diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java new file mode 100644 index 00000000..06be3d0e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java @@ -0,0 +1,129 @@ +package wayoftime.bloodmagic.tile; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.INamedContainerProvider; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.ITickableTileEntity; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraftforge.fluids.FluidAttributes; +import net.minecraftforge.fluids.capability.templates.FluidTank; +import net.minecraftforge.registries.ObjectHolder; +import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; +import wayoftime.bloodmagic.util.Constants; + +public class TileAlchemicalReactionChamber extends TileInventory implements ITickableTileEntity, INamedContainerProvider +{ + @ObjectHolder("bloodmagic:alchemicalreactionchamber") + public static TileEntityType TYPE; + + public static final int ARC_TOOL_SLOT = 0; + public static final int OUTPUT_SLOT = 1; + public static final int NUM_OUTPUTS = 5; + public static final int INPUT_SLOT = 6; + public static final int INPUT_BUCKET_SLOT = 7; + public static final int OUTPUT_BUCKET_SLOT = 8; + + public FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); + public FluidTank outputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); + +// Input slots are from 0 to 3. + + public int burnTime = 0; + + public TileAlchemicalReactionChamber(TileEntityType type) + { + super(type, 9, "alchemicalreactionchamber"); + } + + public TileAlchemicalReactionChamber() + { + this(TYPE); + } + + @Override + public void deserialize(CompoundNBT tag) + { + super.deserialize(tag); + + burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); + } + + @Override + public CompoundNBT serialize(CompoundNBT tag) + { + super.serialize(tag); + + tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); + return tag; + } + + @Override + public void tick() + { + + } + +// private boolean canCraft(RecipeTartaricForge recipe) +// { +// if (recipe == null) +// return false; +// +// ItemStack currentOutputStack = getStackInSlot(outputSlot); +// if (recipe.getOutput().isEmpty()) +// return false; +// if (currentOutputStack.isEmpty()) +// return true; +// if (!currentOutputStack.isItemEqual(recipe.getOutput())) +// return false; +// int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); +// return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); +// +// } +// +// public void craftItem(RecipeTartaricForge recipe) +// { +// if (this.canCraft(recipe)) +// { +// ItemStack currentOutputStack = getStackInSlot(outputSlot); +// +// List inputList = new ArrayList<>(); +// for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) +// inputList.add(getStackInSlot(i).copy()); +// +// BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); +// MinecraftForge.EVENT_BUS.post(event); +// +// if (currentOutputStack.isEmpty()) +// { +// setInventorySlotContents(outputSlot, event.getOutput()); +// } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) +// { +// currentOutputStack.grow(event.getOutput().getCount()); +// } +// +// consumeInventory(); +// } +// } + + @Override + public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_) + { + assert world != null; + return new ContainerAlchemicalReactionChamber(this, p_createMenu_1_, p_createMenu_2_); + } + + @Override + public ITextComponent getDisplayName() + { + return new StringTextComponent("Alchemical Reaction Chamber"); + } + + public double getProgressForGui() + { + return 0; + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java new file mode 100644 index 00000000..8b600788 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java @@ -0,0 +1,198 @@ +package wayoftime.bloodmagic.tile.contailer; + +import java.util.Optional; + +import javax.annotation.Nullable; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.IARCTool; +import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; + +public class ContainerAlchemicalReactionChamber extends Container +{ + public final TileAlchemicalReactionChamber tileARC; + +// public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileARC) +// { +// this.tileARC = tileARC; +// +// } + + public ContainerAlchemicalReactionChamber(int windowId, PlayerInventory playerInventory, PacketBuffer extraData) + { + this((TileAlchemicalReactionChamber) playerInventory.player.world.getTileEntity(extraData.readBlockPos()), windowId, playerInventory); + } + + public ContainerAlchemicalReactionChamber(@Nullable TileAlchemicalReactionChamber tile, int windowId, PlayerInventory playerInventory) + { + super(BloodMagicBlocks.ARC_CONTAINER.get(), windowId); + this.tileARC = tile; + this.setup(playerInventory, tile); + } + + public void setup(PlayerInventory inventory, IInventory tileARC) + { + this.addSlot(new SlotARCTool(tileARC, TileAlchemicalReactionChamber.ARC_TOOL_SLOT, 35, 51)); + for (int i = 0; i < TileAlchemicalReactionChamber.NUM_OUTPUTS; i++) + { + this.addSlot(new SlotOutput(tileARC, TileAlchemicalReactionChamber.OUTPUT_SLOT + i, 116, 15 + i * 18)); + } + this.addSlot(new Slot(tileARC, TileAlchemicalReactionChamber.INPUT_SLOT, 71, 15)); + this.addSlot(new SlotBucket(tileARC, TileAlchemicalReactionChamber.INPUT_BUCKET_SLOT, 8, 15, true)); + this.addSlot(new SlotBucket(tileARC, TileAlchemicalReactionChamber.OUTPUT_BUCKET_SLOT, 152, 87, false)); + +// this.addSlot(new SlotSoul(tileARC, TileSoulForge.soulSlot, 152, 51)); + + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 9; j++) + { + addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); + } + } + + for (int i = 0; i < 9; i++) + { + addSlot(new Slot(inventory, i, 8 + i * 18, 181)); + } + } + + @Override + public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) + { + ItemStack itemstack = ItemStack.EMPTY; + Slot slot = this.inventorySlots.get(index); + + if (slot != null && slot.getHasStack()) + { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + + if ((index >= 1 && index < 1 + 5) || (index == 7 || index == 8))// Attempting to transfer from output slots + // or bucket slots + { + if (!this.mergeItemStack(itemstack1, 9, 9 + 36, true)) + { + return ItemStack.EMPTY; + } + + slot.onSlotChange(itemstack1, itemstack); + } else if (index > 9) // Attempting to transfer from main inventory + { + if (itemstack1.getItem() instanceof IARCTool) // Try the tool slot first + { + if (!this.mergeItemStack(itemstack1, 0, 1, false)) + { + return ItemStack.EMPTY; + } + } else if (isBucket(itemstack1, true)) // If it's a full bucket, transfer to tank filler slot. + { + if (!this.mergeItemStack(itemstack1, 7, 8, false)) + { + return ItemStack.EMPTY; + } + } else if (isBucket(itemstack1, false)) // If it's an empty bucket, transfer to tank emptier slot. + { + if (!this.mergeItemStack(itemstack1, 8, 9, false)) + { + return ItemStack.EMPTY; + } + } else if (!this.mergeItemStack(itemstack1, 6, 7, false)) + { + return ItemStack.EMPTY; + } + } else if (!this.mergeItemStack(itemstack1, 9, 45, false)) // Attempting to transfer from input slots + { + return ItemStack.EMPTY; + } + + if (itemstack1.getCount() == 0) + { + slot.putStack(ItemStack.EMPTY); + } else + { + slot.onSlotChanged(); + } + + if (itemstack1.getCount() == itemstack.getCount()) + { + return ItemStack.EMPTY; + } + + slot.onTake(playerIn, itemstack1); + } + + return itemstack; + } + + @Override + public boolean canInteractWith(PlayerEntity playerIn) + { + return this.tileARC.isUsableByPlayer(playerIn); + } + + private class SlotARCTool extends Slot + { + public SlotARCTool(IInventory inventory, int slotIndex, int x, int y) + { + super(inventory, slotIndex, x, y); + } + + @Override + public boolean isItemValid(ItemStack itemStack) + { + return itemStack.getItem() instanceof IARCTool; + } + } + + private class SlotBucket extends Slot + { + private final boolean needsFullBucket; + + public SlotBucket(IInventory inventory, int slotIndex, int x, int y, boolean needsFullBucket) + { + super(inventory, slotIndex, x, y); + this.needsFullBucket = needsFullBucket; + } + + @Override + public boolean isItemValid(ItemStack itemStack) + { + Optional fluidStackOptional = FluidUtil.getFluidContained(itemStack); + + return fluidStackOptional.isPresent() && ((needsFullBucket && !fluidStackOptional.get().isEmpty()) + || (!needsFullBucket && fluidStackOptional.get().isEmpty())); + } + } + + private static boolean isBucket(ItemStack stack, boolean requiredFull) + { + Optional fluidStackOptional = FluidUtil.getFluidContained(stack); + + return fluidStackOptional.isPresent() && ((requiredFull && !fluidStackOptional.get().isEmpty()) + || (!requiredFull && fluidStackOptional.get().isEmpty())); + } + + private class SlotOutput extends Slot + { + public SlotOutput(IInventory inventory, int slotIndex, int x, int y) + { + super(inventory, slotIndex, x, y); + } + + @Override + public boolean isItemValid(ItemStack stack) + { + return false; + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/textures/block/arc_bottom.png b/src/main/resources/assets/bloodmagic/textures/block/arc_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab0e1201fad97abad7c98afb7a6a959f242eb38 GIT binary patch literal 915 zcmV;E18n?>P)EX>4Tx04R}tkv&MmKpe$iQ$;D23U*L&$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7h-;5kkMjOg)ia%)oPe-NVP%yC~1{KKJM7Q}QMQd?N82(+!JwgLr1s z(mC%FhgnHdh|h_~4Z0xlBiCh@-#8Z?7I5bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMY5*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMVS;j?z&5&G00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00C=BL_t(I%T-fJlEW|vY!=z7-13h6|6@5MQ6wM-4~(sg zsw|pb!1Q=LqP2#Iz!(F)cg#6KM2HAP1X^ogX3ROk%m4sp#^>{a&N*?v-$6tmBA6M7 z2zi(p5dn9vd*64sJIoB+d#|o*EdW47)HgG$Vj{w}ZCGnnGftWAj`KO&U}kLF1|ljY z5dk6sn;8H=L@w+if`}*;2><|9g^0k+pa~+P3kX0dNLCTSS_>jlc2q#&{yor80Cj4?n&P}TCCbrAtoJ*Hr0m3|hUGs*W~P^&Lc2pxckK_ z=f=5v$r@vnB6mk?4enk9s`~%0wAP@i=)L3hdez)TqzV&6MA-NJvat#P&*!t|{C>aD pdxx1_WREd$yWKFxs3za<7eA3sKmqZ1tQ-IU002ovPDHLkV1mU`iJ$-g literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodmagic/textures/block/arc_front.png b/src/main/resources/assets/bloodmagic/textures/block/arc_front.png new file mode 100644 index 0000000000000000000000000000000000000000..7b6cffb4fdcd94907b07ea654d09b7986d97adea GIT binary patch literal 1283 zcmV+e1^oJnP)EX>4Tx04R}tkv&MmKpe$iQ$;D23U*L&$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7h-;5kkMjOg)ia%)oPe-NVP%yC~1{KKJM7Q}QMQd?N82(+!JwgLr1s z(mC%FhgnHdh|h_~4Z0xlBiCh@-#8Z?7I5bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMY5*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMVS;j?z&5&G00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00P@dL_t(I%RQ01ZzEM4g}>jOJ7bUSc&x*0DW)#B=9y@1=;6Bc1wu z`i?yM;6tC~247kFZyhrl4#=*rK`Hhh9OAqs%MA1Blp@QhY(?B`(K|RGZZyz{aCmsc zLBCJE5fciuI~_JRH<`_5+}qw}wOV0};e0S4+1jFibi~E;A^-gO7b=}hXeS9*mm?-G z$Fw%uTwPw$P7?0-dR)AC!OQWOs8(aAx669DWN>x{)?rpFbdhDKKoQkjlzC27mPAp+ za4QV=`lCG@C5a6xB)+M1=yXtVvx&(v_WOq%zWy443h2M_CT5+J&gazPm`Cru&vj<7 z*3y6Y5b(V6>K?$2#JJg{C`xn~vAe&=a9*zWZx@`5Bu7>!0) z?~#*}6CZ{l&N+-RL{UVe(O|t^v-kEp?Cjp>mnTo~-XkJ}VMq`J6h(ox7CAmX_FG$9 zhzQO(y!UrC<_5dnZsVN8T8q{ir4#^*#R44!0RYxorqh%#)Btok2>?ndoO8_56eSAp z9o=r1vMh1Vp>9`~%N1HH+U*TK{_%U#bOAsR1WacspFI76BxwV1esO`;8fz`eT1yZF zcs!r~`t2Q_){5C|#$+<#-gcMUeDU))L}3Jgh@heEX>4Tx04R}tkv&MmKpe$iQ$;D23U*L&$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7h-;5kkMjOg)ia%)oPe-NVP%yC~1{KKJM7Q}QMQd?N82(+!JwgLr1s z(mC%FhgnHdh|h_~4Z0xlBiCh@-#8Z?7I5bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMY5*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMVS;j?z&5&G00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00M|fL_t(I%T1BZZX87vg}+->-P1o4_sF9FF)_}J6Ns?9 zj8G5{5LhNJz={Qrgm@3uplq{15m6+B#f+24jy>b~@2>8yE*4g|D5*C0o_o)Cb>zwS zKlt1h_}Vf4`h<(=gnYXNr8s;rqVbMAFIdj!lzC3=YT~rd!O;&cHPkn+>MSbCgzuQJ>0M>Z&3PL#C4n z;yqC>B#vXwr&E+b9LMBEL6WAd77J8A%McN!|D0h9OXVES)vT8bthLOqXS|#I%QsJ- za(MKB-FnR+8?c!u-%^SQBGQ?uFbt{d zn!2v}KTSKNwWg{noO9hdbzOI7s;a6w>=w&f+YvQQLz_}-V2tTbRzVP8j3J65cDo%S zLKucBy{@K|!nAQX=K#p_oG6OAR9XsaElHAKt?ibSWyyaaA8IJMlb?(L O0000EX>4Tx04R}tkv&MmKpe$iQ$;D23U*L&$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7h-;5kkMjOg)ia%)oPe-NVP%yC~1{KKJM7Q}QMQd?N82(+!JwgLr1s z(mC%FhgnHdh|h_~4Z0xlBiCh@-#8Z?7I5bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMY5*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMVS;j?z&5&G00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00R9nly_O*N)dX=AmD3kFN0kmtU(SOR4rHgRj3~KJiF)I}k;B zXMGM;Ns^=lzE7Sc?8`m6Y0*7BMK=s21c844oYTPo&CrnrIC30Z*JZQW@MW_}6h)+I z%A@CDHyRAi&zU|<_;fo&+^*Lg**2@^IqSs|tA51l`I#fzrrqr_eR^WCT%xEdt!{@n z4DrTeC=aAjgp?-3sstQe2&~=@M$pldVUDrv{6vH%m*=`Xn z+eQ!sCjX7e(u|@kDa$=!uqDef{MDLA?=wGq_(1RUj5rK&Y=>a&Q+FIh-84y)gx;V} z|MG&GSYvQ?O&Vuxg8)_6dH>VT?2?qSEE(L~02Ob(Istf{sGBBvULeT|o!$xI%L}?? zA_|ZuF(3c=8`H9AcDv+Rj&0k_=X1)cLMqD=MUoH%0nhV@f-O~5;kYiV`J7g#jiPES z7Yj1aV;4o}rp0!%K~YttB292y7q`(MNmIQ0djj8QyIdj5GODc5>U1zni}7g0+wZ=| zUoDXYm`$fhHAN+gB37#viY#H*>*QI6rYPk5lC{5Pe>jk)Da}@szyACK!!WqGx*{$L zq(fOE$qL7Y$=&dlsybkp7Qt?Z={W4dh&0ZSB$4Oo^p!2kJWQWh&Sr=J-gwO2@RmHw zaE@JyEN5_iO-&RzIXgqQ4D$UR-89h*9ox2f)9LVdcZZZjA^nSU4n@Jr_gTzlIIc?^ z@2J%z!Z1XjLaK?_#|@T?XEw_vMV?{UHsZzGcf?Ud{rDIWaNBK!T8;5&L=bF|Wf@J= zx%u`TaTL<&bZGZ_jQ_nOjbp_7;Vp`)az7e@AYhmlS(4Cbwn)N|EJ@HbjfeX&XID2M zNqia(`J&Z+js5uB@73JSuNLyQ_;>Rb?4eBtj$r08r&*CDj1{1bGAj2yl=uL$^|E z0HB%h)714)H}eL&y17`}Ia+}|d|j=;Rz7x+PM^ifEITh^zSM}PO`O1pZZu-}1Aq5$ zzQ+JKDmrxvz5Tr^`dCJG4vcT{E${kXT0fjTIbKu;Ka2{`ict3(sw?e%%T<-|OmrD> zf3n+gxr?~CUJ|*wye`Sjymlcm5i)srkdmwR?s!-ZY8|s6S{p#equ;!Yf4srtTCT3T z_sX9aH}>B8Y2C@JX@Ylt{Mg&c{N>m}sO${=dYRlaF)`h?emnSmz zxy+ZI?e3!nPp3_7UEdFGECQxkelFegBUdKx&?I&B`IdFS-Ha$tM7OaAAG|ur+L(T5 z`39ex_-?f;=*FF>i@TGL`mv^t?1Uls);GxT;o-&V8hRe{Bk>E{K6BY*uVHPvz8P+MMPNt`Ahe&`iHuwDx2a1H|zY&HEgY)j9S+}y*`Ya zUTmjXy3og4d0=}RNm-yGyqU32)QJQToux^TN9q4y>&Mp^tL-N=IHxOmt3D#PK3_LM zK9uG5`T6{E97}$Gsyy>Ry1u^WEOb(BafU-#L*rmUA_LFrijSDXisza{ve4zSLUjjf zuT2D|452R$$G+{fl1NYNJL?>)xv#H{BBqcSs_M__E2(Gl-Wop_zSAQBAALHhOx5wj??~tF`QGe!(x5y&4Te`xT)D}~LE3#~ZWMIySh<(j zH!w_p>l|$y$x`L@ATsZlb3yXf=#3DI3)T5)`-f&dpIQe0#G2f9*IRE!licYPgb%GO zPVbLu7@yu45HGooa*tgUU`#Irp`GmOOQPa>!L^x!xVKlBkOw-#`zCLMEf24j_3D?# z&X0r|2#!pQBlSnP940%bc_i~n=TAhpJUEt60S-=9J=GLBO0HusYbAWHB>u=E_bjN z9>0Hs#PZR_<5f&NOn!qwYv+n~)~go@KC|9yME)U4{z~8& zKS9BdMlcu(*IhO8;LU3n&YqDe zTDn_fZHz8j|IeM9eHx;2L-d_O6^_YvZundSds8*mp}AtFB1;je&t(WuX5C-PDXq1N zA%IovTih$jJOz%V*>G631Tl0tS;r$YeYARZwetn~lxL4n=#R8Ln`WcgrMBD5nLa3w zW4-^D2(zCypFtg7$`wLDo3s^>fBfpkGLA&?rGAKeV`3UT&y|~~ajBiS&movd=R-W9 zk*|-06RBqRS>Jp5_X#nu$G*JAP;=LI9FgTcN#DB0agS*^+Xvd#ErXa>LlOF4pzBVT z`MAOsL~aa{eK3zbz|C2e^ts50o0;PGsehP`;X{s)(xdJl*U}9aH<13K^L)Ozh|2fX zhb*Smk;#r(PoxHq3<87W!lol4X>coa0BUZ~8Xyvn0xRhj zH6O(sj;Lp=!V?r`*PzkwA#E{~?cOr_DiYh0L*x6~gx%smrA@rywOC_Kxx}DGBaY<5 zh?8VWfsRO5wqAhUz^)_JSM`-w@A@G8>=PZ+22H51TeRXVSwg1{)?33&_o3?Q)ho>8 zd^#%0AN$!`JYoJiZkT}5RzR)m9uclD^WGT?bv1I{oBoc+At0I5sgR|y99JfRLkmo;7)&n*a`$}-XLdYRdtO$1jp$H7>{uTO z3+@HC)IbP7E|hO&tE7N>Tfh3kfrWq$N^FtC25wqT% zTMcGd%4vLELf4PjUL2X|dB2YJr8NcD3(LosFZ^Moorx=?;O*Y<7 znKay>&ig#E-v}-sFP(O~48I8mkqy93_Phe|H+>^-WR}T4GR80~ps}<@4v}R_Pdt`U zuep?_3fV4~8!5*e-hq*?p}m!_DV@3uqLU!MRbkfJgzaz^&L@4bJ-t2hbM1S}_KzB8 z&VJ~q4``gaq@+388ha~qwbm5tr1H6R-TjMmZ^&oa&4WzWnUY<5yTX|9Gkstbx7c#u zBcu=$Q8cMizDSyNavsblL7*smS@hPF0OT-H(#o8U^ywY4hi+YH=C^H}lXb-TF5z%` zs=~Q1jT}x`iB!ln;rWkI@7Yr;-47S<^^4r8rkU~euHlq1YW^^XOq)6E*@q?tY)ir`5Hu z{qP7*3UOzZe1I*aP>5MFF)=fjUsEG`&i-vOrrRKMM_;X1ZoEbbQ!X`sW}y=BW98TtB8X!q4yhs&Hg#~tlo>cUS9qnTCQF;IJGXc~+@i)lMwBJ*=LitarzC8Jw?{Qzi8sAQjf?P!@I6T>4_ zF5WGb8ZJ}7=}fW>T`@gO*Id?BQCHJ>BNXP9J0drG&8Lt-R26FhXXhE+)4OQ~OP3*KO{tqAFN84ex=5Yhviy;4-;HiKDx=(uG$ zNg5f;-1;(BG!Zu#&Fx~N$U3gu0(G=IQh3k^l!M|Vt4NuP;!CgEL*^KF&#ql3FE$WY zV>aOzdF!RV1$_&>K|laIB=?V0UMy$oE)c;}7G=>$hQSbh$j7F?CzC`PNhx&*4IWX~ zA+@}ChDN%-@pu=3ewCms__SadYjYmGsD5T0Ju6tTL3hs+O<|zRm+SB{FUF;xYRctoxRm)iRjbHoR4E0pzKwbiSzbAf{cr2pw5<1xc500$btP zH4>?8+_EtDshOa(;?hyO<8^X86F+wENFv_2dMz8mAp`SB;+=iFQU&XL`xVDAxk{EC z(;)7s^}QPra$!Vzw}Z0&U~o```W2O_%qVAbMLt+QDIapQ`(o&9gR!y9Y0tEtCT(w) zN}^w4u0|QEjqC@a7U6>Z4N zB3TVlp-xRHd|y;eleXG^njxnz$>>M{KUbURS!~*U0jaKQMmHLBwc~mRw7tg6fc?82 zL9RD2o{v6dCMUjMhKFtn`1ew$&kOiJ=#9hliksMLl8cJ&ypxR+91NEf=Tt=ur9U2} zq<|}50F@B1OOMB1{t(hSq?4f`zk0v)#&Pon`t&))dxZBvvSm6`BBIQpi=96!eV-bB zPAx{vRG1^Wrig6f9;6G=PaVMK23MNEUFcRc_MZ2sOwm*frCusfxpcu=r%)^8)WzbJ zapl_}>|?6dEun$&TBOUNs$~NDcuHq>v(W^^U$<)|E|~G1d>_g_$9`7Si~aO$!)}Qc z2iQ$%CT&1~wr=M4Ir+q$C4mTIlS;VIW$PX}wBDb~oX&9ApdlgDj;GAVw88M4vpuzS zqNZmbYVP^uOlujM-JLSE2z7`e4$Soot^o17H6d1%>J5;V$y*#p3NlvRu<)pDd%7i| zxI7pn@Y{98N!#3HLU^_KkTQqRlu+58&L!=L32f5B?H%?bSPCOW_&1r|UEQX2JUaW< z_=4;cq^Y5kpRgB5>Bu&mMDW@+&$RKdFf_n$k=Z3W;n?k*I7%U|t!?@rSb};;dhxD# zYyUW#ClfaKao%9rkd`R3*e=Z#a;&;7l?Q2+yiuc7WR1Ei z3lFg}z(6QL(JGIm#jt`d?$E2zMkrsy=53~#Yp#%OlsQxjczG4aYdx9PYS-RX$( zzm7WjlwPH4i%i)iq^W*k(0Hy%+6%`q!?+}0i=>0dNQ>OPJLpc-S0k~9{;(KoPob$) zSrdlO6SCNjf~!pT*nalZFP&a{%nVA1FjcyKLejwsi+cda6XAh&8==Wv^iz*yPBfw5 zGR0j$*z}7JB-$e5vTr4(t}-PId<~Pq8Xxl2l|l+v;VzJjm^{C|NX`HJoG}lX0EbSo zWaArC!yGzV-e(*+Xm|KR%(q3EeiCsat`unp-W59n&E(dNLu;qk3gBK(q%>AdS2{XaN&IigF85mP5g$by}5TX8R=vcceN}m0sSLI3M+WhVV#y7 zIBS_35{t`&|IGKCMwD;19+lPo+jrg`c8p`$iVCcG zSf5I3)^+Sx9_k+oonIqF-lVzURD8Y)Lsb7d3raF2>=DD*+Q6j2up)-B%Cx7L?=vE0FPaj92+y_bV#Y}}cxt2t_iKYjnDgu(k@?agfs z3yj3TwrN|v7oCm7++d0QyfEKhjD_H^iglg3PiM`bh;vz8=%cYkMpYWjJHrB_;D(p-Ad4>^`JPak{lUBPSf=y8A=489pSp0w=-5G%;)}OjyefNx-=Ln z{T?^(ZD)C-^|OG?<>dG744Gk6cak3l!$mprh^MQ#pq}LwEfQ`z(8vCCM2&(b7?=2n z!uobGpzalvtdK3LllT6Cq@YIOLy@u5k-Wpu^X>H>@f?AYO2Xr@mK2wTz%16j~1WQL0#$*B#^pkymRPtJ@5Fm0q-C1?8}vKH3O+Qj0%*qUvV$`mihl z_cMv4PTYAwjuG1FI^lfckPQtAyyEtp(M2b-{fMkICYuB%^}%p=%q8IY?qUF1wBgqGpul{Fge7&};o_8>AjRnzfJou#8?5lOQ9KtXRjPu0Huh2cdV%)uW z^6Go4$wA_6a+Y;!u9+7`s>#yysTN9$G?$QxrxHy|}v=$q&(C^X6ED29a6#lC#?*D8xK zrQ^d&M9yrmjk51wITI+|0Ytl*RI%?3i?gxcg=WdcU>cCI+i5xpR#e<>9nMZ;lVq8R zb|WY&L^jIC7zE9B_9l1JVIJ0_Hl3^cui_rX;yD?h@rG_uZg;f}FU|*R!q;(_-QdLT z>d1-vzieA>?8oIHF!z)!yGV{G+#Zg}y7-Bq{L3eJ`%DQh(-^KAWhiPz z%?SBc9cdzl;)n@J1XMn(JySdNMkK#R541Hi>}%yAyPEHsfl;A_lX*%o#X|w_vC=Y( zP(q9ZBwkLZhoJ<)A01z(yA=3qX2!Uh=k@qTf10+noEgn@$V)-TG9dszt3Wy zA>PaaG0B+~m||%!7ASIHex|km=^~-^S_<3ytEJG}btZ{idYgZ7^Gg=NfraZ-!+YKa0Z$bTg!A=(V0`ctYqg#&8=m+1Na4GpdAWt&4A8 zF}`_WkuQ8~qpWisi8z9is3CC_o12J#k%Ay}oWo*3MT?Ip{z9??LqWFittkd8O{$7P z>(=IRrTrLs3D$5b+DhiOY+2KHllak_Gs~GqKlI60mzuRS>Bjx^tgLl4uZ;?S^3|9D zVy_D%V@ZnBP%Qgetp>@$vfpfTzLpWaX_=vNZkfq@K^F}#D>XxwtleypYP$Yuqa-JzZwm z0Yz>mbfwEK+Be_jF+9<~tsxG?$8L-6fmPuJ{o7K$ER+NG?Rp9;G4w!P*uc~{+2^$R z78#$qxWzru5A$%cFcIU=)ii%pF-O4ZhBeES_!VQb_b1d7C7otye=eWTV{?N!l*8a_ zfDYhplpPx?-OnOZ#c43~*<2P~468Y;OXn2i+KNpHCG}*Z-Rf|GjXMKB6&DZIF>+jP z-MhdP|m!{&ZB-)nEo*| zUpmLKu@-yPW5}>3JcEK_8jBOg@g_f4lgqfgyzr{sM7qs3+U5l9R-&|?1A$FE73^JO zAeKQKswCD%EO{a9#~92)N@!*woB-EV?`Yf|2!Hbx7Rs*Yg<>loJ99NG6v_bTVcOw@ zWC_+2Q`m~4Wu9-YFV!Mwj+FaGn|EyEknLX`T`Jujxrkz2R32o)5VR^7k%%{MAs#^? zQZuXiBQ`N0s~ya^dWh_Xdh3sfL@r%~Z%%|U5GdwF^?Wh3K5yvTG~Jp+)9nAE>LXR7 zGtnEHdjp3YZXqc1u0#OOPD&*)RWF=ijn6o=Es!ee(T`Z-+K;NpUIaQa|R?_zLJhNs7#@AZqW8qWxmQW3lbj^n+f2|s*U zq*4n}%n|;MM&DP7(xMvZl5dY(&|S1rIDQ=jgowQ9|9qH(FhjS)eOtGubi}Uu41$kuhOJ3H*M##YsZd! zWG#;<_Ebp-=Vpvazo58fy?e#CEUphKlKyxhsJ^r~GIFC>t|>coao4|oM?31WbXGm? zgSxl;@Kc&IEG_;18A*9-wjA)=ShvqPrE4{DC1dFaz6lTIcFXx|3&9{9S z6*1}!W<8LOYJZ2hr`*N^mQi&VQX36_rA1rk`wc1bE%nyN!T3psek&g)Uq#!7o}7^T z`$Y-A%Ac2EwjG7B8q#7=gmplSl@_;vqO?YKfBf5L8PDP-$xK}zL0_xewK#?m>bfo> zq&w5N)qIhWYAVHg#{Gb=sZ$r0%?eER#&07g_uq}re6T}aGv>65i@>vwg0JPB-KxuI zab3hki305LMx0fcwu0c;I0I$0iuA$TgmM&WUHuj>cV1|sUaH~cekayaN z7lE2Z-KpK-P~N@9rS}r2)_(uukf(S8ZFb2|6!jio{JYi(pOhG>uQey>cIMrM1 zNkkk#m>;)z6ESG_(8o^NT*5I6~k~G(3MdGIQWCBUpk(AlSjNxIavH7`_A! z(UGKckAral9^r5>S`Aj6W@?c(ET6pFBO^e4X*Ij0!5^vgXr8o=X%Uvxo=k!byjnvS zmtXs+DyWiAK{D!r@3gP#IUiE2!%>V(Z%y{hzGEs1_5eTqWQp{nN<(auo*PSTxRe>n zT9ZhZ&B7Z~A`%imPy=*%%PvQ_KuM|?wdd|FPvMGpoj{x~bE02V_0-i5|1N^E<42Uh z=(Nd6yHZo-SPL*xOSQ4tlybEGp4YBq^x#XJ-s%9M`^_YToGhWrwCm!^mcYX4CKADn zVjbTnabB&eE`eJ7;vrvTmju!Kn@H0$N`=%it+tj5#GeB1QMB?6jVl^k()tyTm3o9F zIs_XKfd08Q}9v^JiU(GVZIWunwD&rzgLp%_EV9N}jfs7|ho@!Fc6a?Hp=7@1p76dxRWa_r-sV16+HQ@PMY%eDW%59l;V){tbwLK^;nh`FL=!R zX&k8L%NlfuPchMUO7tQ(b>B~;_QVi>ylv{UKe!@L>kFFR9TQ3r$P!Y-^dtEeC{2Vq zuRcgdvgv7qQD95?9YtVa{!_j1s}g>yjByh6w=`*_sLz)*JQP-WIn{T4TdOk)4v_1` zJ}Sm%Y``HXhh8v_?k?mgW1D4Sm69Nqe(_n6=dLYyVteCMD1(K1}xSdCh*c{=JH0uqnq@^zFwJ!h+R0+t(ULs)wuRTK( zwW3dEKxE5Kb7#QFwQ|KE$D0quS-ObdSyvD^DLYzy*xJabZD-?|#XQ`}dYB7E2x)aB z5Jz4h24aMKqH`>FESImVCS za1t}I2y{Tw8$in&dnt+s|FLz^zjq47WkbI7Lz@%Q3>njQ@bUP4OZ|vl|GD@C1>j!WOB$ z#T4bC{@E zi><&emKT9PK4GgMAzU_v>OCdty3*#z)?Jo(N3x2aerHkQjq)j%QjIbfBim!WFmEDX zjkRNb%qA(8%J4-%sfvSTN+q3*B|t9HF0)ksRL)S;AU^p`zbTPq@3a0NGaR>p~qbfVt z5+2N<{$z0a`jVr#OAgloj(1Kl`P!XjOi>#Jua6)5c;`9U6{qc{*zthu31PPkcf09) z>_kaktzfI=wOfI+C&fFdTTkf;=Q!WVPYi%-R;;Zdk0|^MbMjong;V(;Q|V`88_LFMna$YlKu#fyYJ-LE0o_*uO;7p=A8Pvb9|c> z|G_tbi;(>F?9x;;k>Kq@HYR8mP24%>CwXa^3^aOU2k*Fu#$SbeZ^1xx zg(>;;3Ca3^L*R34KYZTzjSRu$eBSIKWno_*E)Rfu=}o2CO{}kZW@Tbo+S0TZ34c`0 z#6qbcS}m0E0Q`A|D z*Fm+Ss3?zKzRDs;?QrEyhKv!Ks^deV7B>ORPlOe64IEwKypI{!uu8GLdtk~%q9*%R zl>WLT&%&Y50Y-k{N$mhR9AEzIHGjuYX?HYBQs=gPLj&Ag9G~JhA zKydK1kfGUY8T&dK_o>V~a$n=;E+(bqk7BTS7yU zBwb+E&ujbJ^6N+Liwbwd(xpk%*X8mdVZ-7FuSL1O^7moPO7K~{VXZE1e>e|4I`}-c zRM`=HIMm667xS{Q`nb5f4N-r>fXi3G)d7cD#8tGPzo!aX@x4Zl}7P$VR2!r|5K*a9a@y zSx>X@b054ICEygoRX9U`dg+o2~T-N+rr)qJ>o0L92B z!eaMmKVCYK0QMxmG`Qm*7Wt+&SK`fk&VsJ%6!uJf;M%Y@X`ma|Euc%&FkP&dKE@Zg%4Ruvc90ne;LGg;B8>TDPJlP~sYv z*%<>Z+0X{>FWf8>^k+!)9cEsC4U-N04AR6o&uN7#7i=~1@6e+;T;k&`t}UQ8FL@Wy z=DmOG5KoqaD&6N}X+CJ7#lx8) zS57633OiER4YAx5+;-|xL^3PU|rbd(NHi-QF-f%N`x7TfQXD-x(PfsRm z%s4yCo1}ad{PxroWjzzp1)>_UI634f&G^rKd#u9H-tN2KAk;+UzQkzfiXYCNUeu;! zvWfQu@#zJ?T^4<;<1UI+LqPV3J$TvQI`KO(mACO;e z+f44;Ohk+j(zW~07pnIW#}%@;x-_(BuC`shsC_<6zo;uh3^xrTZ%e2|tAHR143W!mSR)U5iPAbf5^`0B&@ z)M)ajJ5R!E$80q1s`J3P7Ovs_-Frzg%wlM}y_jZHtX%gR!kq{2&8d4E5EE|H*rbd= z{>u_!Ot?;dd6kGPp-k%x-&qXOdmVJ#CBE0`SdJz9p>#KKPHn=^2h5Gb1$>-$+jW;_ zL^~6R!K%0GND<1zJ_YhT$yF+4%fbh)ul2|Heai|zX_hz<|16r6>*wTexd~gHIgRt0 zEctn?NvRr$lkL>N?@)_DRAU}J6ooce9@I-tM{tWE6BtK@%k&9TR`ZPJrQAN@qW2z( zA{xKR(>%vvc*Z_;s~UD2@#+L={28TlpJi-as{J^eM?QaeJ^N+|n1$>S0e2I)%|_ zSMQ(SG&=5)YcyRe2w^S-6!mF%{l@ht%o)O|Bg2({7*L8EUvl8-r#RijLoOCZ*hxsJ z%1KE4*Ih!0o2Lb83L!~-T8QgpA7yi{Kdt7bFC#PQ1G#+&BXc&jS08h>-b{9KEOfjI5-;r4{OACs$~7uG zU}4VPM1R#z5kek;Dc;quDD={JtlK?crEh4yjdtQ(_6_;)nx=Mv9zsFP^RrEkRN ztRgR-*)*tIRQjLe!CfrMXB=?KU<_el$%;oL5RQ~~i>GTR;$YJ)Cj0)3CJ9b8WN#TU z-O?4srKcJ~e}wO9<3iR*b5>`C^XOW*8lwI35t;L#@gdN0X&k%z3B}OPDYyYN7L;o2 z;_#9ZT#ssK*u>?F-n^|Bg2hV4s;iM|E{Y zNWi7@U)fyg$nJRXFP>dPHw$yi3+hqD1_1OdJILKmT_r_+3l}G5GfNk9D`p=jR|qoz zKv2ZT)y%@d$^&d}Wn_?Wq}uraf; zI63{3g}aB8*FXIIOAB{R$Q4@_bt`ulPd5uIDK9H$56Ztgb#?S~|GQ65cdK8b-*G!y zTC+fc`tAAeHZpQbs(;!1N~4XPlk0DbU)q1yw6yq3&(+h-@wbkp1&fuVl@lZocL*}u zKk0keS^r~#{%JhFdj6L{AnyLc|0nJL%Gd8$e&>~6(#68_ms2@OA&Ot|@>{xC*je)b zeq>`aw>0NqY1J0d5F=uCE=ldI!oU^-!nX`q}FDM8& zvmFG-ikI8U3Zl=%ZOzTa#QEFWnv09cf}M|x*MifW*UFmfZxAYOc92RibNqW$zo0B3 zQ0%N0+~ypX+)QSiW^7EH7G{=AyqvriOx#@NynN%!fs+P9@Z{yPLT4lbGCHxcK=70rk#_OhKJd&w6Srsa`15QadC5Sb93|Y@cctb+se%y zLi1m!Y^==e?7w>~E%>D&m}U^V**TfnSh2V|+x+hMH8K2<;XqPr_NzJ|$iL-~(eO*S zS($mbxM{k$I0{kxiWd9}@^?{z1^+A;enl6H--f@Htt@|4+@CckZf3*syD7->-zonu zNE)^--p>DbIR8-n3q{P$!`sEpLB&nQ+}_H<eAY}>oMwEy5C(FybNs=TztG)X ztUbKV+^ocGARK_qGo-kF&oh|zPyW&Ub2Q$zR=>!_%FfEf#>&Lbt;xp4&&JNr$wBeQ zY=Z?^eyy|KIZ=_-l>gm-|IT4Nq5BM>{LGf6mi?@#cS{_c!}LIr@Jx z|GU~B))FqRzK|-m^-%G4{%_s?3&lSW6zwdmoZVgiyU_ox@<&?!wh=*M{zC@Y;2`@Y z%U>JjpDg)RNdF%{f3olYqX!7|f1LbV`TbA2{*$hMD+B+Q@_*R%pLG3O8Thx9|HH2T zXX!%v$1As$GvwUo4SAt9wJ$k>yo|${E67L!4!{#I`aXH;3L-&tmDO_x0JPp;e;{01 z`4ET@-a}4F3VsWT5F3SoKHwS|()U(QQcTll@n}WGfoh0g=xk^2t0;IY1uriP6)m)T z)>n zF|MKDet?tCL52ZT{a{_SDCZd|(@WxjZre8CYvwj?XxS5QglHS|21G@qQvE zsVNj2c-#NgL|megx17u$`Ygfa=mjtu7S0Cb{X_yAPEGq1PcYx7_~4~59r zuhwQB76a(WZj#s1j2=0vkW@jYj7A~%V`N0Z{6|gf;u`oEz`QmvG&I!l6gpr|9vvM$ zAjJ0ku?zjkdv)bxn)z}*ap#>~3BoB^*{7mv7~zF2^e;o7KFQT;Bq-bmlP#XKFRjsJ zK2_(xG`R3|2vouC9K`Rg>{#E zLl2vkdt7N-@f?4b>kANZK4ubn1q7s>z&0+OdMe@APNT|pK!3MhN6`VXmZOQHKz|Gn z6rB&~iXws|fL`#!0~VeuDCzfg0B73k<$GAVxPx#^0f#Q6tW{8s%q(Xo=e(}Do}wI- zx|!u7V`z#zaK#KTU$Z4NfhLJ3(mwm!N5!iA;N0WeG!KWog%KpPoA2U-K!{r#(6~6E zat*V^^W-omfbbFSl|LwiO%r(i`JA4(({hEf;L&ITB2tTPu5XhTB0_RLJ-7Rx= zOzgmwmgycOfir*j0Yu)QXYm8l;r?TwZee>Mcs2Qi;b}^H{228E)pxPZIM(oxZrN6# zazMC_UbK!cj3F@S8O+xOB`v@v_^<@|iyk0(t_9*}02)ZO=tGtsyFJN8H-|d;fjPTn zuYo{NWo}*l1Q_JHgaJfpfVONd17fPDVQU=4QwA8IV7ePnAGWqEQ&kjWpH8M9{L5q= z_)Y_&x?Hwi4?c(+)=({sgIs-lc)vbCL1r=d=G^MUZb7PQ-Ew?p&1b~htT(xg+aD?> zM)x^AwQ^k`%+|Iqz(aS*PN4&m)@}Krwt=Mli~;!g$~f5ZzHCtkIW5ev;@(CGk_|S% zK?lmNth%1l6`w%14Zei)bQACZg@m;Pyi+m3v<>1=^;uh{-|E`NhoJ&k!>&&1te*NR zLtgZ+y-Sl1gk2wtwa15MO_MhuLc#z^{Soeg0`ZN7GgWa4SiuaFe+w@P zm=YTSYqdP{hR5zN*uLn3iaenuY-cD6l&OPQFhC)gnt&NfcjRNBKGv9C2Gv#@=&O@B z8v+8btS!tt0^R}WfgKiTeQt7E6U62QyBh45rvEAVJh@|9j}|9&;ptlSkTCYDGOw!7XUr>_k* z1Q}$Sy%c64(xtHyZEw2I02N=uXIndqb`F%j@ATNPPrIFx3*76^QXp$vTy%M(oW)V* zuw#RX1@y5v%?BzXi1wpH@$VFQDQEGq?Syyp(J*tm;jJ-0__ukOH$?7-0{8)&6L(D( z2#~c%48bv$Z$9fQ%fq{stk_v$7)EqpzP*~|fYUz(pe-^HC{~g~2zAl|^a_pn4h*yr zb$<#YYlTvw*f(_)yl6ztiA{BBkB6M=gYea1FP7R2djg(%eZWqyPfnQ zPModr@yL9}1Jk&d0RyPxccx*$zZFEM)_~zWr zP9L&x>atkSuHrd4-_sLHOicXa*2uWshg>B`Fkfqp9gytx>pCONdsQIx0XyXiA;u}! zs)xn^bm*{uI5|1Fm}g2cy)xtMNxk0c*~`Qo+`!B57Rhu3x4V-Y5E2nFK?Declaatb zHaAy9_Neo$WmG>QKi#8=S~=A0X#)~sn-b z@lppCgd!P8-S-hW7%-o2D!V=;y?N?2$QH7GU4^C!!oh;#3^M!*Tl0Ys;Q+*|cLY~t z*8Sz$M$7cePlXex=Jxw*CJ_|mTTf9fsq9$WMitdX!E~UTl%A0A$*T>h)iPK;X`)8R zAOzP3v9USBlPUv>c3hcv`mPq`3{dYcfsdi04WE^J^uYa7B2{Ff07{XXtM;Ky9RpOP zl;~`R!vljuNW_x|3t9~ug7kdH+r@157}a-Nq*bSW*w<8mmW0x~uW zUpV%Nzw5 zIX$5>;K-UD&ZmPnnR*vj$@3_HkZkVz3c_2ZWD~yQvy0rbEi3@vZ?mh+Y-ot*W_7n} zI`QHx7IIFpv9U2ALG!u)S&Id9rw{PzB? z(ai_|vPQ%9bPha#iW6`{S)CXW;S`&X7(jp`7IGLSuwd2|oYvE^GzMCbhjks|>S=tD z3k?De+n{#U;1bAT5CD{7q=oNayUKv$9H9DP6MY~Wcmra4i?J~JUF_)kV|DOjEpb;M z)#&$B0N_Rq4K!eW<96Rus~LRX(SCU{u@x^P()!@B&Khvq!6N*6vuOk+6rSfHpSq=2 zu?N*bHn=*!E9mv;d*Y{kUF+NcDwp8PcL6~q7^ggV!B4ppTR)?_=$K*dk@n1}Jj!__ z^B8MiX6NLL1PGr5w%-IWn>=jLsE=zJKW&}31qF4U;dg&fpL{p+LA}hH;)(yhf$@#P zF&vE7_l=)T>f`k9v?#RRtG|aUQ`e&Z`0i)24FyMKQAVuht6-4|%|{Lg>At7CQSU7Q zvi41~YDsIY`=F-_^j@|Kz2(H=BKi1)GQs=vmUiA-A`77Vb1T8ggU8O(@#N&o`;)?J zDK2O3b;_+4!E_y!&et{*Iha6q;L^%txYN$g&Ur=$88_Y;`Dw{lq5;pscksZEjW(#< zfXzgTp)UwPp2`JJnnm-`|D$%N&3K0H|O8kmfI(->49=C~%4c`3ga7^%4q!P>_a( zrsD}SsqY1=B0Yt*H3bC&GD{5w#t=d8i&h3GrZ)d>A) zu{Ml3%D=?_pWH%)l>7=x5rYBhMOF_P{B<;LDDUU>v-p=4ifRTMa& qsqhYlPz4bw@CY&u|Ia@7xlhpI%uf2OHHOl^K;@*AC9A|u!~O>r9H?6W literal 0 HcmV?d00001 From 152525bbe37d77daaf21473bc7025e81044561dc Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 26 Oct 2020 16:08:04 -0400 Subject: [PATCH 354/493] Fixed crash on death for servers Fixed an issue where the client would crash when you died by the Sacrificial Knife when on a server. --- build.gradle | 2 +- src/generated/resources/.cache/cache | 2 +- src/generated/resources/assets/bloodmagic/lang/en_us.json | 1 + .../WayofTime/bloodmagic/util/DamageSourceBloodMagic.java | 5 ++--- .../wayoftime/bloodmagic/common/data/GeneratorLanguage.java | 2 ++ .../bloodmagic/common/item/ItemSacrificialDagger.java | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index fa742ba4..cf634db2 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.16.3-3.0-1' +version = '1.16.3-3.0-2' group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'BloodMagic' diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 94f44db7..75896b7e 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -18,7 +18,7 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -af6eebbeef7c75844a0651065016fecb365595dd assets/bloodmagic/lang/en_us.json +775f7c01fb20ba9b55ff5c46d7fef0acd5f591ae assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index 239385da..7525e488 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -19,6 +19,7 @@ "block.bloodmagic.soulforge": "Hellfire Forge", "block.bloodmagic.speedrune": "Speed Rune", "block.bloodmagic.waterritualstone": "Water Ritual Stone", + "chat.bloodmagic.damageSource": "%s's soul became too weak", "chat.bloodmagic.ritual.activate": "A rush of energy flows through the ritual!", "chat.bloodmagic.ritual.notValid": "You feel that these runes are not configured correctly...", "chat.bloodmagic.ritual.prevent": "The ritual is actively resisting you!", diff --git a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java index 82d69ee7..19ff1231 100644 --- a/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java @@ -3,8 +3,7 @@ package wayoftime.bloodmagic.util; import net.minecraft.entity.LivingEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import wayoftime.bloodmagic.util.helper.TextHelper; +import net.minecraft.util.text.TranslationTextComponent; public class DamageSourceBloodMagic extends DamageSource { @@ -21,6 +20,6 @@ public class DamageSourceBloodMagic extends DamageSource @Override public ITextComponent getDeathMessage(LivingEntity livingBase) { - return new StringTextComponent(TextHelper.localizeEffect("chat.bloodmagic.damageSource", livingBase.getName())); + return new TranslationTextComponent("chat.bloodmagic.damageSource", livingBase.getName()); } } \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index f1018ec5..ca769d38 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -19,6 +19,8 @@ public class GeneratorLanguage extends LanguageProvider // Creative Tab add("itemGroup.bloodmagic.creativeTab", "Blood Magic"); + add("chat.bloodmagic.damageSource", "%s's soul became too weak"); + // Tile Entitites add("tile.bloodmagic.soulforge.name", "Hellfire Forge"); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java index 5f807d6e..b6062592 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java @@ -102,7 +102,7 @@ public class ItemSacrificialDagger extends Item player.hurtResistantTime = 0; player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F); player.setHealth(Math.max(player.getHealth() - 1.998F, 0.0001f)); - if (player.getHealth() <= 0.001f) + if (player.getHealth() <= 0.001f && !world.isRemote) { player.onDeath(DamageSourceBloodMagic.INSTANCE); player.setHealth(0); From f9327d8f5a58c2cbf92de93fec0e58248836c1c6 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 26 Oct 2020 21:48:53 -0400 Subject: [PATCH 355/493] ARC Recipe Framework Part 1 Added the serializers, deserializers, builders, etc, for the Alchemical Reaction Chamber recipe, ARCRecipe. The block does not currently have the functionality to use it yet. And only when I am currently writing this do I realize I forgot to add FluidStack functionality to the recipes. Welp. --- .settings/org.eclipse.jdt.core.prefs | 6 +- src/generated/resources/.cache/cache | 3 + .../data/bloodmagic/recipes/arc/test1.json | 20 +++ .../data/bloodmagic/recipes/arc/test2.json | 12 ++ .../data/bloodmagic/tags/items/arc_tool.json | 6 + .../java/WayofTime/bloodmagic/BloodMagic.java | 9 +- .../api/impl/recipe/RecipeBloodAltar.java | 1 - .../core/recipe/IngredientBloodOrb.java | 31 +---- .../WayofTime/bloodmagic/util/Constants.java | 3 + .../bloodmagic/api/impl/recipe/RecipeARC.java | 110 +++++++++++++++ .../common/data/GeneratorBlockTags.java | 40 ++++++ .../common/data/GeneratorItemTags.java | 48 +++++++ .../data/recipe/BloodMagicRecipeProvider.java | 3 +- .../data/recipe/builder/ARCRecipeBuilder.java | 89 ++++++++++++ .../common/recipe/ARCRecipeProvider.java | 23 ++++ .../common/recipe/BloodMagicRecipeType.java | 2 + .../serializer/ARCRecipeSerializer.java | 127 ++++++++++++++++++ .../BloodMagicRecipeSerializers.java | 4 + .../common/tags/BloodMagicTags.java | 12 ++ .../bloodmagic/recipe/IRecipeARC.java | 40 ++++++ .../ContainerAlchemicalReactionChamber.java | 6 +- 21 files changed, 556 insertions(+), 39 deletions(-) create mode 100644 src/generated/resources/data/bloodmagic/recipes/arc/test1.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/arc/test2.json create mode 100644 src/generated/resources/data/bloodmagic/tags/items/arc_tool.json create mode 100644 src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java create mode 100644 src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index d06adbc3..9bc7a5fb 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -20,7 +20,7 @@ org.eclipse.jdt.core.formatter.align_with_spaces=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=1 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=1 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=1 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=1 @@ -31,7 +31,7 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 @@ -49,7 +49,7 @@ org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=1 org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 75896b7e..58e9535a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -194,6 +194,8 @@ f38355165034ce314a9f0344ebc3a6cad22c76c8 data/bloodmagic/recipes/altar/reinforce 584d01dff4d64bb88bd3783751a29723700f1728 data/bloodmagic/recipes/altar/slate.json 926d4a0e165c87a15a609744d832d2f5f04a40d0 data/bloodmagic/recipes/altar/water_tool.json 7551501cf361667ec7454c307b9d2368536fbed6 data/bloodmagic/recipes/altar/weakbloodorb.json +4f511cfb93faf65aa50fabd7e753e0759ed95a1c data/bloodmagic/recipes/arc/test1.json +14e7bce6990a346e36171564c29f93a14e50df44 data/bloodmagic/recipes/arc/test2.json e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json 1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json @@ -231,3 +233,4 @@ c0e75e0e12290d191245c5b0b5b13bc739d2ff44 data/bloodmagic/recipes/soulforge/reage a222d09abf1ea61feb684f2ac23d011c2034f526 data/bloodmagic/recipes/soulforge/reagent_water.json 7e281841a2953c1284d332c2bbf75097f8128241 data/bloodmagic/recipes/soulforge/sentientsword.json d7d993bb729284a5201c164ea81fbe1d8e4e4750 data/bloodmagic/recipes/weak_activation_crystal.json +94ff722e094a3479433cad0e4a1386f68f170e7b data/bloodmagic/tags/items/arc_tool.json diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/test1.json b/src/generated/resources/data/bloodmagic/recipes/arc/test1.json new file mode 100644 index 00000000..8e9d5d69 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/test1.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:arc", + "input": { + "tag": "forge:gems/diamond" + }, + "tool": { + "tag": "forge:bones" + }, + "addedoutput": [ + { + "chance": 0.5, + "type": { + "item": "minecraft:diamond" + } + } + ], + "output": { + "item": "bloodmagic:altar" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/test2.json b/src/generated/resources/data/bloodmagic/recipes/arc/test2.json new file mode 100644 index 00000000..8037c2b9 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/test2.json @@ -0,0 +1,12 @@ +{ + "type": "bloodmagic:arc", + "input": { + "tag": "forge:gems/diamond" + }, + "tool": { + "item": "minecraft:acacia_boat" + }, + "output": { + "item": "bloodmagic:altar" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc_tool.json b/src/generated/resources/data/bloodmagic/tags/items/arc_tool.json new file mode 100644 index 00000000..a0b7317d --- /dev/null +++ b/src/generated/resources/data/bloodmagic/tags/items/arc_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond" + ] +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 4b3aa5ce..491329e2 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -38,7 +38,9 @@ import wayoftime.bloodmagic.client.render.entity.SoulSnareRenderer; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; import wayoftime.bloodmagic.common.data.GeneratorBaseRecipes; import wayoftime.bloodmagic.common.data.GeneratorBlockStates; +import wayoftime.bloodmagic.common.data.GeneratorBlockTags; import wayoftime.bloodmagic.common.data.GeneratorItemModels; +import wayoftime.bloodmagic.common.data.GeneratorItemTags; import wayoftime.bloodmagic.common.data.GeneratorLanguage; import wayoftime.bloodmagic.common.data.GeneratorLootTable; import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeProvider; @@ -117,7 +119,7 @@ public class BloodMagic private void registerRecipes(RegistryEvent.Register> event) { - System.out.println("Registering IngredientBloodOrb Serializer."); +// System.out.println("Registering IngredientBloodOrb Serializer."); CraftingHelper.register(IngredientBloodOrb.NAME, IngredientBloodOrb.Serializer.INSTANCE); // event.getRegistry().registerAll( @@ -171,6 +173,11 @@ public class BloodMagic gen.addProvider(new BloodMagicRecipeProvider(gen)); gen.addProvider(new GeneratorBaseRecipes(gen)); gen.addProvider(new GeneratorLootTable(gen)); + + GeneratorBlockTags bmBlockTags = new GeneratorBlockTags(gen, event.getExistingFileHelper()); + gen.addProvider(bmBlockTags); + gen.addProvider(new GeneratorItemTags(gen, bmBlockTags, event.getExistingFileHelper())); + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java index 8b8ab1c8..359c197b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -14,7 +14,6 @@ import wayoftime.bloodmagic.altar.AltarTier; public abstract class RecipeBloodAltar extends BloodMagicRecipe { - @Nonnull private final Ingredient input; @Nonnull diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index 35962b33..ab607824 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -18,12 +18,6 @@ import wayoftime.bloodmagic.orb.BloodOrb; public class IngredientBloodOrb extends Ingredient { - -// private final BloodOrb orb; -// private NonNullList orbs; -// private IntList itemIds = null; -// private ItemStack[] items; - public static final ResourceLocation NAME = new ResourceLocation(BloodMagic.MODID, "bloodorb"); public final int orbTier; @@ -61,14 +55,8 @@ public class IngredientBloodOrb extends Ingredient @Override public Collection getStacks() { -// System.out.println("BING BONG"); List orbGet = OrbRegistry.getOrbsDownToTier(orbTier); -// List orbGet = new ArrayList(); -// orbGet.add(new ItemStack(Items.DIAMOND)); -// orbs = NonNullList.withSize(orbGet.size(), ItemStack.EMPTY); -// -// for (int i = 0; i < orbGet.size(); i++) -// orbs.set(i, orbGet.get(i)); + return orbGet; } @@ -89,24 +77,7 @@ public class IngredientBloodOrb extends Ingredient @Override public Ingredient parse(JsonObject json) { - System.out.println("Parsing Blood Orb"); return new IngredientBloodOrb(JSONUtils.getInt(json, "orb_tier")); } } - -// -// @Override -// public boolean test(@Nullable ItemStack input) -// { -// System.out.println("Testing"); -// if (input == null || input.isEmpty()) -// return false; -// -// if (!(input.getItem() instanceof IBloodOrb)) -// return false; -// -// BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); -// return orb != null && orb.getTier() >= this.orbTier; -// } - } diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index 7821f745..f682b1f1 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -133,8 +133,10 @@ public class Constants public static class JSON { public static final String INPUT = "input"; + public static final String TOOL = "tool"; public static final String BASEINPUT = "baseinput"; public static final String ADDEDINPUT = "addedinput"; + public static final String ADDEDOUTPUT = "addedoutput"; public static final String OUTPUT = "output"; public static final String ITEM = "item"; public static final String COUNT = "count"; @@ -142,6 +144,7 @@ public class Constants public static final String TYPE = "type"; public static final String TEXTURE = "texture"; public static final String CONDITIONS = "conditions"; + public static final String CHANCE = "chance"; public static final String ALTAR_TIER = Constants.NBT.ALTAR_TIER; public static final String ALTAR_SYPHON = "altarSyphon"; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java new file mode 100644 index 00000000..343cb038 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java @@ -0,0 +1,110 @@ +package wayoftime.bloodmagic.api.impl.recipe; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; + +public abstract class RecipeARC extends BloodMagicRecipe +{ + public static final int MAX_RANDOM_OUTPUTS = 3; + + @Nonnull + private final Ingredient input; + @Nonnull + private final Ingredient arc_tool; + @Nonnull + private final ItemStack output; + + private final List> addedItems; + + protected RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output) + { + this(id, input, arc_tool, output, new ArrayList>()); + } + + protected RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output, List> addedItems) + { + super(id); + this.input = input; + this.arc_tool = arc_tool; + this.output = output; + this.addedItems = addedItems; + } + + public RecipeARC addRandomOutput(ItemStack stack, double chance) + { + if (addedItems.size() >= MAX_RANDOM_OUTPUTS) + { + return this; + } + + addedItems.add(Pair.of(stack, chance)); + + return this; + } + + @Nonnull + public final Ingredient getInput() + { + return input; + } + + @Override + public final NonNullList getIngredients() + { + NonNullList list = NonNullList.create(); + list.add(getInput()); + return list; + } + + public List getAllListedOutputs() + { + List list = new ArrayList(); + + list.add(output.copy()); + for (Pair pair : addedItems) + { + list.add(pair.getLeft().copy()); + } + + return list; + } + + public List getAllOutputs(Random rand) + { + List list = new ArrayList(); + + list.add(output.copy()); + for (Pair pair : addedItems) + { + if (rand.nextDouble() < pair.getRight()) + list.add(pair.getLeft().copy()); + } + + return list; + } + + @Override + public void write(PacketBuffer buffer) + { + input.write(buffer); + arc_tool.write(buffer); + buffer.writeItemStack(output); + buffer.writeInt(addedItems.size()); + for (Pair pair : addedItems) + { + buffer.writeItemStack(pair.getLeft()); + buffer.writeDouble(pair.getValue()); + } + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java new file mode 100644 index 00000000..f861928c --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java @@ -0,0 +1,40 @@ +package wayoftime.bloodmagic.common.data; + +import java.nio.file.Path; + +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.data.ExistingFileHelper; +import wayoftime.bloodmagic.BloodMagic; + +public class GeneratorBlockTags extends BlockTagsProvider +{ + public GeneratorBlockTags(DataGenerator generatorIn, ExistingFileHelper exFileHelper) + { + super(generatorIn, BloodMagic.MODID, exFileHelper); + } + + @Override + public void registerTags() + { + } + + /** + * Resolves a Path for the location to save the given tag. + */ + @Override + protected Path makePath(ResourceLocation id) + { + return this.generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/blocks/" + id.getPath() + ".json"); + } + + /** + * Gets a name for this provider, to use in logging. + */ + @Override + public String getName() + { + return "Block Tags"; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java new file mode 100644 index 00000000..7adb8e63 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java @@ -0,0 +1,48 @@ +package wayoftime.bloodmagic.common.data; + +import java.nio.file.Path; + +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.Items; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.data.ExistingFileHelper; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.tags.BloodMagicTags; + +public class GeneratorItemTags extends ItemTagsProvider +{ + public GeneratorItemTags(DataGenerator dataGenerator, BlockTagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) + { + super(dataGenerator, blockTagProvider, BloodMagic.MODID, existingFileHelper); + } + + @Override + public void registerTags() + { + this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).add(Items.DIAMOND); +// this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.DOORS); +// this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.BEDS); +// this.getOrCreateBuilder(GOORESISTANT).add(Blocks.PISTON, Blocks.PISTON_HEAD, Blocks.STICKY_PISTON, Blocks.MOVING_PISTON); + + } + + /** + * Resolves a Path for the location to save the given tag. + */ + @Override + protected Path makePath(ResourceLocation id) + { + return this.generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/items/" + id.getPath() + ".json"); + } + + /** + * Gets a name for this provider, to use in logging. + */ + @Override + public String getName() + { + return "Item Tags"; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java index 9bbf2eed..5a46c06b 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.data.DataGenerator; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.recipe.ARCRecipeProvider; import wayoftime.bloodmagic.common.recipe.AlchemyArrayRecipeProvider; import wayoftime.bloodmagic.common.recipe.BloodAltarRecipeProvider; import wayoftime.bloodmagic.common.recipe.ISubRecipeProvider; @@ -20,6 +21,6 @@ public class BloodMagicRecipeProvider extends BaseRecipeProvider @Override protected List getSubRecipeProviders() { - return Arrays.asList(new BloodAltarRecipeProvider(), new AlchemyArrayRecipeProvider(), new TartaricForgeRecipeProvider()); + return Arrays.asList(new BloodAltarRecipeProvider(), new AlchemyArrayRecipeProvider(), new TartaricForgeRecipeProvider(), new ARCRecipeProvider()); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java new file mode 100644 index 00000000..fac5b7ee --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java @@ -0,0 +1,89 @@ +package wayoftime.bloodmagic.common.data.recipe.builder; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.apache.commons.lang3.tuple.Pair; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; +import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; +import wayoftime.bloodmagic.util.Constants; + +public class ARCRecipeBuilder extends BloodMagicRecipeBuilder +{ + private final Ingredient input; + private final Ingredient arcTool; + private final ItemStack output; + private final List> addedItems = new ArrayList>(); + + protected ARCRecipeBuilder(Ingredient input, Ingredient arcTool, ItemStack output) + { + super(bmSerializer("arc")); + this.input = input; + this.arcTool = arcTool; + this.output = output; + } + + public static ARCRecipeBuilder arc(Ingredient input, Ingredient arcTool, ItemStack output) + { + return new ARCRecipeBuilder(input, arcTool, output); + } + + public ARCRecipeBuilder addRandomOutput(ItemStack stack, double chance) + { + if (addedItems.size() >= RecipeARC.MAX_RANDOM_OUTPUTS) + { + return this; + } + + addedItems.add(Pair.of(stack, chance)); + + return this; + } + + @Override + protected ARCRecipeResult getResult(ResourceLocation id) + { + return new ARCRecipeResult(id); + } + + public class ARCRecipeResult extends RecipeResult + { + protected ARCRecipeResult(ResourceLocation id) + { + super(id); + } + + @Override + public void serialize(@Nonnull JsonObject json) + { + json.add(Constants.JSON.INPUT, input.serialize()); + json.add(Constants.JSON.TOOL, arcTool.serialize()); + + if (addedItems.size() > 0) + { + JsonArray mainArray = new JsonArray(); + for (Pair pair : addedItems) + { + JsonObject jsonObj = new JsonObject(); + jsonObj.addProperty(Constants.JSON.CHANCE, pair.getValue().floatValue()); + jsonObj.add(Constants.JSON.TYPE, SerializerHelper.serializeItemStack(pair.getKey())); + mainArray.add(jsonObj); + } + + json.add(Constants.JSON.ADDEDOUTPUT, mainArray); + } + + json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java new file mode 100644 index 00000000..89dc4a5d --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java @@ -0,0 +1,23 @@ +package wayoftime.bloodmagic.common.recipe; + +import java.util.function.Consumer; + +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.common.Tags; +import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.data.recipe.builder.ARCRecipeBuilder; + +public class ARCRecipeProvider implements ISubRecipeProvider +{ + @Override + public void addRecipes(Consumer consumer) + { + String basePath = "arc/"; + ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.BONES), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get())).addRandomOutput(new ItemStack(Items.DIAMOND), 0.5).build(consumer, BloodMagic.rl(basePath + "test1")); + ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromItems(Items.ACACIA_BOAT), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get())).build(consumer, BloodMagic.rl(basePath + "test2")); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java index e8a99239..87a30fe4 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java @@ -1,6 +1,7 @@ package wayoftime.bloodmagic.common.recipe; import net.minecraft.item.crafting.IRecipeType; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; @@ -10,4 +11,5 @@ public class BloodMagicRecipeType public static final IRecipeType ALTAR = IRecipeType.register("altar"); public static final IRecipeType ARRAY = IRecipeType.register("array"); public static final IRecipeType TARTARICFORGE = IRecipeType.register("soulforge"); + public static final IRecipeType ARC = IRecipeType.register("arc"); } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java new file mode 100644 index 00000000..84481184 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java @@ -0,0 +1,127 @@ +package wayoftime.bloodmagic.common.recipe.serializer; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.apache.commons.lang3.tuple.Pair; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistryEntry; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; +import wayoftime.bloodmagic.util.Constants; + +public class ARCRecipeSerializer extends ForgeRegistryEntry> + implements IRecipeSerializer +{ + private final IFactory factory; + + public ARCRecipeSerializer(IFactory factory) + { + this.factory = factory; + } + + @Nonnull + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) + { + JsonElement input = JSONUtils.isJsonArray(json, Constants.JSON.INPUT) + ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT) + : JSONUtils.getJsonObject(json, Constants.JSON.INPUT); + + JsonElement tool = JSONUtils.isJsonArray(json, Constants.JSON.TOOL) + ? JSONUtils.getJsonArray(json, Constants.JSON.TOOL) + : JSONUtils.getJsonObject(json, Constants.JSON.TOOL); + + Ingredient inputIng = Ingredient.deserialize(input); + Ingredient toolIng = Ingredient.deserialize(tool); + ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); + + List> addedItems = new ArrayList>(); + if (json.has(Constants.JSON.ADDEDOUTPUT) && JSONUtils.isJsonArray(json, Constants.JSON.ADDEDOUTPUT)) + { + JsonArray mainArray = JSONUtils.getJsonArray(json, Constants.JSON.ADDEDOUTPUT); + + arrayLoop: for (JsonElement element : mainArray) + { + if (addedItems.size() >= RecipeARC.MAX_RANDOM_OUTPUTS) + { + break arrayLoop; + } + if (element.isJsonObject()) + { + JsonObject obj = element.getAsJsonObject(); + double chance = JSONUtils.getFloat(obj, Constants.JSON.CHANCE); + ItemStack extraDrop = SerializerHelper.getItemStack(obj, Constants.JSON.TYPE); + + addedItems.add(Pair.of(extraDrop, chance)); + } + } + } + + return this.factory.create(recipeId, inputIng, toolIng, output, addedItems); + } + + @Override + public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) + { + try + { + List> addedItems = new ArrayList>(); + Ingredient inputIng = Ingredient.read(buffer); + Ingredient toolIng = Ingredient.read(buffer); + ItemStack output = buffer.readItemStack(); + + int addedItemSize = buffer.readInt(); + for (int i = 0; i < addedItemSize; i++) + { + ItemStack stack = buffer.readItemStack(); + double chance = buffer.readDouble(); + addedItems.add(Pair.of(stack, chance)); + } + + buffer.writeInt(addedItems.size()); + for (Pair pair : addedItems) + { + buffer.writeItemStack(pair.getLeft()); + buffer.writeDouble(pair.getValue()); + } + + return this.factory.create(recipeId, inputIng, toolIng, output, addedItems); + } catch (Exception e) + { +// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); + throw e; + } + } + + @Override + public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) + { + try + { + recipe.write(buffer); + } catch (Exception e) + { +// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); + throw e; + } + } + + @FunctionalInterface + public interface IFactory + { + RECIPE create(ResourceLocation id, Ingredient input, Ingredient arcTool, ItemStack output, List> addedItems); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java index 53f454d7..3aee8ab2 100644 --- a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java +++ b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java @@ -1,14 +1,17 @@ package wayoftime.bloodmagic.common.registries; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.common.recipe.serializer.ARCRecipeSerializer; import wayoftime.bloodmagic.common.recipe.serializer.AlchemyArrayRecipeSerializer; import wayoftime.bloodmagic.common.recipe.serializer.BloodAltarRecipeSerializer; import wayoftime.bloodmagic.common.recipe.serializer.TartaricForgeRecipeSerializer; import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerDeferredRegister; import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerRegistryObject; +import wayoftime.bloodmagic.recipe.IRecipeARC; import wayoftime.bloodmagic.recipe.IRecipeAlchemyArray; import wayoftime.bloodmagic.recipe.IRecipeBloodAltar; import wayoftime.bloodmagic.recipe.IRecipeTartaricForge; @@ -25,6 +28,7 @@ public class BloodMagicRecipeSerializers public static final IRecipeSerializerRegistryObject ALTAR = RECIPE_SERIALIZERS.register("altar", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new)); public static final IRecipeSerializerRegistryObject ARRAY = RECIPE_SERIALIZERS.register("array", () -> new AlchemyArrayRecipeSerializer<>(IRecipeAlchemyArray::new)); public static final IRecipeSerializerRegistryObject TARTARIC = RECIPE_SERIALIZERS.register("soulforge", () -> new TartaricForgeRecipeSerializer<>(IRecipeTartaricForge::new)); + public static final IRecipeSerializerRegistryObject ARC = RECIPE_SERIALIZERS.register("arc", () -> new ARCRecipeSerializer<>(IRecipeARC::new)); // public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, BloodMagic.MODID); diff --git a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java new file mode 100644 index 00000000..9953561f --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java @@ -0,0 +1,12 @@ +package wayoftime.bloodmagic.common.tags; + +import net.minecraft.item.Item; +import net.minecraft.tags.ITag; +import net.minecraft.tags.ItemTags; + +public class BloodMagicTags +{ + public static final ITag.INamedTag ARC_TOOL = ItemTags.makeWrapperTag("bloodmagic:arc_tool"); + public static final ITag.INamedTag ARC_TOOL_FURNACE = ItemTags.makeWrapperTag("bloodmagic:arc_tool_furnace"); + public static final ITag.INamedTag ARC_TOOL_SIEVE = ItemTags.makeWrapperTag("bloodmagic:arc_tool_sieve"); +} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java new file mode 100644 index 00000000..6a388181 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java @@ -0,0 +1,40 @@ +package wayoftime.bloodmagic.recipe; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; +import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; +import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; + +public class IRecipeARC extends RecipeARC +{ + public IRecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output) + { + super(id, input, arc_tool, output, new ArrayList>()); + } + + public IRecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output, List> addedItems) + { + super(id, input, arc_tool, output, addedItems); + } + + @Override + public IRecipeSerializer getSerializer() + { + return BloodMagicRecipeSerializers.ARC.getRecipeSerializer(); + } + + @Override + public IRecipeType getType() + { + return BloodMagicRecipeType.ARC; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java index 8b600788..01bd3506 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java +++ b/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java @@ -14,7 +14,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.IARCTool; +import wayoftime.bloodmagic.common.tags.BloodMagicTags; import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; public class ContainerAlchemicalReactionChamber extends Container @@ -88,7 +88,7 @@ public class ContainerAlchemicalReactionChamber extends Container slot.onSlotChange(itemstack1, itemstack); } else if (index > 9) // Attempting to transfer from main inventory { - if (itemstack1.getItem() instanceof IARCTool) // Try the tool slot first + if (itemstack1.getItem().isIn(BloodMagicTags.ARC_TOOL)) // Try the tool slot first { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { @@ -150,7 +150,7 @@ public class ContainerAlchemicalReactionChamber extends Container @Override public boolean isItemValid(ItemStack itemStack) { - return itemStack.getItem() instanceof IARCTool; + return itemStack.getItem().isIn(BloodMagicTags.ARC_TOOL); } } From f0d62b997a88ac2ae49d1d34175c41cf706dbe95 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Oct 2020 10:40:39 -0400 Subject: [PATCH 356/493] Part 2 of ARC Recipe Implementation Added the ability for FluidStacks to be used as inputs and outputs, with a bit of cribbing off of how Mekanism handled their FluidStackIngredient. --- src/generated/resources/.cache/cache | 2 +- .../data/bloodmagic/recipes/arc/test2.json | 8 + .../WayofTime/bloodmagic/util/Constants.java | 5 + .../bloodmagic/api/SerializerHelper.java | 69 ++++ .../event/recipes/FluidStackIngredient.java | 385 ++++++++++++++++++ .../api/event/recipes/InputIngredient.java | 52 +++ .../api/event/recipes/TagResolverHelper.java | 32 ++ .../bloodmagic/api/impl/recipe/RecipeARC.java | 24 +- .../data/recipe/builder/ARCRecipeBuilder.java | 18 +- .../common/recipe/ARCRecipeProvider.java | 7 +- .../serializer/ARCRecipeSerializer.java | 38 +- .../bloodmagic/recipe/IRecipeARC.java | 10 +- 12 files changed, 634 insertions(+), 16 deletions(-) create mode 100644 src/main/java/wayoftime/bloodmagic/api/event/recipes/FluidStackIngredient.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/event/recipes/InputIngredient.java create mode 100644 src/main/java/wayoftime/bloodmagic/api/event/recipes/TagResolverHelper.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 58e9535a..63e83907 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -195,7 +195,7 @@ f38355165034ce314a9f0344ebc3a6cad22c76c8 data/bloodmagic/recipes/altar/reinforce 926d4a0e165c87a15a609744d832d2f5f04a40d0 data/bloodmagic/recipes/altar/water_tool.json 7551501cf361667ec7454c307b9d2368536fbed6 data/bloodmagic/recipes/altar/weakbloodorb.json 4f511cfb93faf65aa50fabd7e753e0759ed95a1c data/bloodmagic/recipes/arc/test1.json -14e7bce6990a346e36171564c29f93a14e50df44 data/bloodmagic/recipes/arc/test2.json +5e735ea45bb2a49b43803c53a586ecbd5f3cbfe1 data/bloodmagic/recipes/arc/test2.json e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json 1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/test2.json b/src/generated/resources/data/bloodmagic/recipes/arc/test2.json index 8037c2b9..ebb8cc3d 100644 --- a/src/generated/resources/data/bloodmagic/recipes/arc/test2.json +++ b/src/generated/resources/data/bloodmagic/recipes/arc/test2.json @@ -6,6 +6,14 @@ "tool": { "item": "minecraft:acacia_boat" }, + "inputfluid": { + "amount": 1000, + "fluid": "minecraft:lava" + }, + "outputfluid": { + "fluid": "minecraft:water", + "amount": 100 + }, "output": { "item": "bloodmagic:altar" } diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index f682b1f1..19a600b0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -141,10 +141,15 @@ public class Constants public static final String ITEM = "item"; public static final String COUNT = "count"; public static final String NBT = "nbt"; + public static final String TAG = "tag"; public static final String TYPE = "type"; public static final String TEXTURE = "texture"; public static final String CONDITIONS = "conditions"; public static final String CHANCE = "chance"; + public static final String FLUID = "fluid"; + public static final String AMOUNT = "amount"; + public static final String INPUT_FLUID = "inputfluid"; + public static final String OUTPUT_FLUID = "outputfluid"; public static final String ALTAR_TIER = Constants.NBT.ALTAR_TIER; public static final String ALTAR_SYPHON = "altarSyphon"; diff --git a/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java b/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java index c2840718..b61fec48 100644 --- a/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java +++ b/src/main/java/wayoftime/bloodmagic/api/SerializerHelper.java @@ -7,10 +7,18 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.JsonToNBT; import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.registries.ForgeRegistries; import wayoftime.bloodmagic.util.Constants; /** @@ -57,4 +65,65 @@ public class SerializerHelper } return json; } + + public static FluidStack getFluidStack(@Nonnull JsonObject json, @Nonnull String key) + { + validateKey(json, key); + return deserializeFluid(JSONUtils.getJsonObject(json, key)); + } + + public static FluidStack deserializeFluid(@Nonnull JsonObject json) + { + if (!json.has(Constants.JSON.AMOUNT)) + { + throw new JsonSyntaxException("Expected to receive a amount that is greater than zero"); + } + JsonElement count = json.get(Constants.JSON.AMOUNT); + if (!JSONUtils.isNumber(count)) + { + throw new JsonSyntaxException("Expected amount to be a number greater than zero."); + } + int amount = count.getAsJsonPrimitive().getAsInt(); + if (amount < 1) + { + throw new JsonSyntaxException("Expected amount to be greater than zero."); + } + ResourceLocation resourceLocation = new ResourceLocation(JSONUtils.getString(json, Constants.JSON.FLUID)); + Fluid fluid = ForgeRegistries.FLUIDS.getValue(resourceLocation); + if (fluid == null || fluid == Fluids.EMPTY) + { + throw new JsonSyntaxException("Invalid fluid type '" + resourceLocation + "'"); + } + CompoundNBT nbt = null; + if (json.has(Constants.JSON.NBT)) + { + JsonElement jsonNBT = json.get(Constants.JSON.NBT); + try + { + if (jsonNBT.isJsonObject()) + { + nbt = JsonToNBT.getTagFromJson(GSON.toJson(jsonNBT)); + } else + { + nbt = JsonToNBT.getTagFromJson(JSONUtils.getString(jsonNBT, Constants.JSON.NBT)); + } + } catch (CommandSyntaxException e) + { + throw new JsonSyntaxException("Invalid NBT entry for fluid '" + resourceLocation + "'"); + } + } + return new FluidStack(fluid, amount, nbt); + } + + public static JsonElement serializeFluidStack(@Nonnull FluidStack stack) + { + JsonObject json = new JsonObject(); + json.addProperty(Constants.JSON.FLUID, stack.getFluid().getRegistryName().toString()); + json.addProperty(Constants.JSON.AMOUNT, stack.getAmount()); + if (stack.hasTag()) + { + json.addProperty(Constants.JSON.NBT, stack.getTag().toString()); + } + return json; + } } diff --git a/src/main/java/wayoftime/bloodmagic/api/event/recipes/FluidStackIngredient.java b/src/main/java/wayoftime/bloodmagic/api/event/recipes/FluidStackIngredient.java new file mode 100644 index 00000000..cdcecea2 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/event/recipes/FluidStackIngredient.java @@ -0,0 +1,385 @@ +package wayoftime.bloodmagic.api.event.recipes; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSyntaxException; + +import net.minecraft.fluid.Fluid; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tags.FluidTags; +import net.minecraft.tags.ITag; +import net.minecraft.tags.TagCollectionManager; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; +import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.util.Constants; + +/** + * Created by Thiakil on 12/07/2019. + */ +public abstract class FluidStackIngredient implements InputIngredient +{ + + public static FluidStackIngredient from(@Nonnull Fluid instance, int amount) + { + return from(new FluidStack(instance, amount)); + } + + public static FluidStackIngredient from(@Nonnull FluidStack instance) + { + return new Single(instance); + } + + public static FluidStackIngredient from(@Nonnull ITag fluidTag, int minAmount) + { + return new Tagged(fluidTag, minAmount); + } + + public static FluidStackIngredient read(PacketBuffer buffer) + { + // TODO: Allow supporting serialization of different types than just the ones we + // implement? + IngredientType type = buffer.readEnumValue(IngredientType.class); + if (type == IngredientType.SINGLE) + { + return Single.read(buffer); + } else if (type == IngredientType.TAGGED) + { + return Tagged.read(buffer); + } + return Multi.read(buffer); + } + + public static FluidStackIngredient deserialize(@Nullable JsonElement json) + { + if (json == null || json.isJsonNull()) + { + throw new JsonSyntaxException("Ingredient cannot be null"); + } + if (json.isJsonArray()) + { + JsonArray jsonArray = json.getAsJsonArray(); + int size = jsonArray.size(); + if (size == 0) + { + throw new JsonSyntaxException("Ingredient array cannot be empty, at least one ingredient must be defined"); + } else if (size > 1) + { + FluidStackIngredient[] ingredients = new FluidStackIngredient[size]; + for (int i = 0; i < size; i++) + { + // Read all the ingredients + ingredients[i] = deserialize(jsonArray.get(i)); + } + return createMulti(ingredients); + } + // If we only have a single element, just set our json as that so that we don't + // have to use Multi for efficiency reasons + json = jsonArray.get(0); + } + if (!json.isJsonObject()) + { + throw new JsonSyntaxException("Expected fluid to be object or array of objects"); + } + JsonObject jsonObject = json.getAsJsonObject(); + if (jsonObject.has(Constants.JSON.FLUID) && jsonObject.has(Constants.JSON.TAG)) + { + throw new JsonParseException("An ingredient entry is either a tag or an fluid, not both"); + } else if (jsonObject.has(Constants.JSON.FLUID)) + { + return from(SerializerHelper.deserializeFluid(jsonObject)); + } else if (jsonObject.has(Constants.JSON.TAG)) + { + if (!jsonObject.has(Constants.JSON.AMOUNT)) + { + throw new JsonSyntaxException("Expected to receive a amount that is greater than zero"); + } + JsonElement count = jsonObject.get(Constants.JSON.AMOUNT); + if (!JSONUtils.isNumber(count)) + { + throw new JsonSyntaxException("Expected amount to be a number greater than zero."); + } + int amount = count.getAsJsonPrimitive().getAsInt(); + if (amount < 1) + { + throw new JsonSyntaxException("Expected amount to be greater than zero."); + } + ResourceLocation resourceLocation = new ResourceLocation(JSONUtils.getString(jsonObject, Constants.JSON.TAG)); + ITag tag = TagCollectionManager.getManager().getFluidTags().get(resourceLocation); + if (tag == null) + { + throw new JsonSyntaxException("Unknown fluid tag '" + resourceLocation + "'"); + } + return from(tag, amount); + } + throw new JsonSyntaxException("Expected to receive a resource location representing either a tag or a fluid."); + } + + public static FluidStackIngredient createMulti(FluidStackIngredient... ingredients) + { + if (ingredients.length == 0) + { + // TODO: Throw error + } else if (ingredients.length == 1) + { + return ingredients[0]; + } + List cleanedIngredients = new ArrayList<>(); + for (FluidStackIngredient ingredient : ingredients) + { + if (ingredient instanceof Multi) + { + // Don't worry about if our inner ingredients are multi as well, as if this is + // the only external method for + // creating a multi ingredient, then we are certified they won't be of a higher + // depth + cleanedIngredients.addAll(Arrays.asList(((Multi) ingredient).ingredients)); + } else + { + cleanedIngredients.add(ingredient); + } + } + // There should be more than a single fluid or we would have split out earlier + return new Multi(cleanedIngredients.toArray(new FluidStackIngredient[0])); + } + + public static class Single extends FluidStackIngredient + { + + @Nonnull + private final FluidStack fluidInstance; + + public Single(@Nonnull FluidStack fluidInstance) + { + this.fluidInstance = Objects.requireNonNull(fluidInstance); + } + + @Override + public boolean test(@Nonnull FluidStack fluidStack) + { + return testType(fluidStack) && fluidStack.getAmount() >= fluidInstance.getAmount(); + } + + @Override + public boolean testType(@Nonnull FluidStack fluidStack) + { + return Objects.requireNonNull(fluidStack).isFluidEqual(fluidInstance); + } + + @Nonnull + @Override + public FluidStack getMatchingInstance(@Nonnull FluidStack fluidStack) + { + return test(fluidStack) ? fluidInstance : FluidStack.EMPTY; + } + + @Nonnull + @Override + public List getRepresentations() + { + return Collections.singletonList(fluidInstance); + } + + @Override + public void write(PacketBuffer buffer) + { + buffer.writeEnumValue(IngredientType.SINGLE); + fluidInstance.writeToPacket(buffer); + } + + @Nonnull + @Override + public JsonElement serialize() + { + JsonObject json = new JsonObject(); + json.addProperty(Constants.JSON.AMOUNT, fluidInstance.getAmount()); + json.addProperty(Constants.JSON.FLUID, fluidInstance.getFluid().getRegistryName().toString()); + if (fluidInstance.hasTag()) + { + json.addProperty(Constants.JSON.NBT, fluidInstance.getTag().toString()); + } + return json; + } + + public static Single read(PacketBuffer buffer) + { + return new Single(FluidStack.readFromPacket(buffer)); + } + } + + public static class Tagged extends FluidStackIngredient + { + + @Nonnull + private final ITag tag; + private final int amount; + + public Tagged(@Nonnull ITag tag, int amount) + { + this.tag = tag; + this.amount = amount; + } + + @Override + public boolean test(@Nonnull FluidStack fluidStack) + { + return testType(fluidStack) && fluidStack.getAmount() >= amount; + } + + @Override + public boolean testType(@Nonnull FluidStack fluidStack) + { + return Objects.requireNonNull(fluidStack).getFluid().isIn(tag); + } + + @Nonnull + @Override + public FluidStack getMatchingInstance(@Nonnull FluidStack fluidStack) + { + if (test(fluidStack)) + { + // Our fluid is in the tag so we make a new stack with the given amount + return new FluidStack(fluidStack, amount); + } + return FluidStack.EMPTY; + } + + @Nonnull + @Override + public List getRepresentations() + { + // TODO: Can this be cached some how + List representations = new ArrayList<>(); + for (Fluid fluid : TagResolverHelper.getRepresentations(tag)) + { + representations.add(new FluidStack(fluid, amount)); + } + return representations; + } + + @Override + public void write(PacketBuffer buffer) + { + buffer.writeEnumValue(IngredientType.TAGGED); + buffer.writeResourceLocation(TagCollectionManager.getManager().getFluidTags().getValidatedIdFromTag(tag)); + buffer.writeVarInt(amount); + } + + @Nonnull + @Override + public JsonElement serialize() + { + JsonObject json = new JsonObject(); + json.addProperty(Constants.JSON.AMOUNT, amount); + json.addProperty(Constants.JSON.TAG, TagCollectionManager.getManager().getFluidTags().getValidatedIdFromTag(tag).toString()); + return json; + } + + public static Tagged read(PacketBuffer buffer) + { + return new Tagged(FluidTags.makeWrapperTag(buffer.readResourceLocation().toString()), buffer.readVarInt()); + } + } + + public static class Multi extends FluidStackIngredient + { + + private final FluidStackIngredient[] ingredients; + + protected Multi(@Nonnull FluidStackIngredient... ingredients) + { + this.ingredients = ingredients; + } + + @Override + public boolean test(@Nonnull FluidStack stack) + { + return Arrays.stream(ingredients).anyMatch(ingredient -> ingredient.test(stack)); + } + + @Override + public boolean testType(@Nonnull FluidStack stack) + { + return Arrays.stream(ingredients).anyMatch(ingredient -> ingredient.testType(stack)); + } + + @Nonnull + @Override + public FluidStack getMatchingInstance(@Nonnull FluidStack stack) + { + for (FluidStackIngredient ingredient : ingredients) + { + FluidStack matchingInstance = ingredient.getMatchingInstance(stack); + if (!matchingInstance.isEmpty()) + { + return matchingInstance; + } + } + return FluidStack.EMPTY; + } + + @Nonnull + @Override + public List getRepresentations() + { + List representations = new ArrayList<>(); + for (FluidStackIngredient ingredient : ingredients) + { + representations.addAll(ingredient.getRepresentations()); + } + return representations; + } + + @Override + public void write(PacketBuffer buffer) + { + buffer.writeEnumValue(IngredientType.MULTI); + buffer.writeVarInt(ingredients.length); + for (FluidStackIngredient ingredient : ingredients) + { + ingredient.write(buffer); + } + } + + @Nonnull + @Override + public JsonElement serialize() + { + JsonArray json = new JsonArray(); + for (FluidStackIngredient ingredient : ingredients) + { + json.add(ingredient.serialize()); + } + return json; + } + + public static FluidStackIngredient read(PacketBuffer buffer) + { + FluidStackIngredient[] ingredients = new FluidStackIngredient[buffer.readVarInt()]; + for (int i = 0; i < ingredients.length; i++) + { + ingredients[i] = FluidStackIngredient.read(buffer); + } + return createMulti(ingredients); + } + } + + private enum IngredientType + { + SINGLE, + TAGGED, + MULTI + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/event/recipes/InputIngredient.java b/src/main/java/wayoftime/bloodmagic/api/event/recipes/InputIngredient.java new file mode 100644 index 00000000..9e7f8e52 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/event/recipes/InputIngredient.java @@ -0,0 +1,52 @@ +package wayoftime.bloodmagic.api.event.recipes; + +import java.util.List; +import java.util.function.Predicate; + +import javax.annotation.Nonnull; + +import com.google.gson.JsonElement; + +import net.minecraft.network.PacketBuffer; + +public interface InputIngredient extends Predicate +{ + + /** + * Evaluates this predicate on the given argument, ignoring any size data. + * + * @param type the input argument + * + * @return {@code true} if the input argument matches the predicate, otherwise + * {@code false} + */ + boolean testType(@Nonnull TYPE type); + + TYPE getMatchingInstance(TYPE type); + + /** + * Primarily for JEI, a list of valid instances of the type + * + * @return List (empty means no valid registrations found and recipe is to be + * hidden) + * + * @apiNote Do not modify any of the values returned by the representations + */ + @Nonnull + List getRepresentations(); + + /** + * Writes this ingredient to a PacketBuffer. + * + * @param buffer The buffer to write to. + */ + void write(PacketBuffer buffer); + + /** + * Serializes this ingredient to a JsonElement + * + * @return JsonElement representation of this ingredient. + */ + @Nonnull + JsonElement serialize(); +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/event/recipes/TagResolverHelper.java b/src/main/java/wayoftime/bloodmagic/api/event/recipes/TagResolverHelper.java new file mode 100644 index 00000000..e66237e5 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/api/event/recipes/TagResolverHelper.java @@ -0,0 +1,32 @@ +package wayoftime.bloodmagic.api.event.recipes; + +import java.util.Collections; +import java.util.List; + +import net.minecraft.tags.ITag; + +/** + * Copied from Mekanism, including the author's rant about tags. + */ +public class TagResolverHelper +{ + + public static List getRepresentations(ITag tag) + { + try + { + return tag.getAllElements(); + } catch (IllegalStateException e) + { + // Why do tags have to be such an annoyance in 1.16 + // This is needed so that we can ensure we give JEI an empty list of + // representations + // instead of crashing on the first run, as recipes get "initialized" before + // tags are + // done initializing, and we don't want to spam the log with errors. JEI and + // things + // still work fine regardless of this + return Collections.emptyList(); + } + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java index 343cb038..632d44ca 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java +++ b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java @@ -13,6 +13,8 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.network.PacketBuffer; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; +import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; public abstract class RecipeARC extends BloodMagicRecipe { @@ -22,23 +24,27 @@ public abstract class RecipeARC extends BloodMagicRecipe private final Ingredient input; @Nonnull private final Ingredient arc_tool; + private final FluidStackIngredient inputFluid; @Nonnull private final ItemStack output; + private final FluidStack outputFluid; private final List> addedItems; - protected RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output) + protected RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid) { - this(id, input, arc_tool, output, new ArrayList>()); + this(id, input, arc_tool, inputFluid, output, new ArrayList>(), outputFluid); } - protected RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output, List> addedItems) + protected RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, FluidStackIngredient inputFluid, ItemStack output, List> addedItems, FluidStack outputFluid) { super(id); this.input = input; this.arc_tool = arc_tool; + this.inputFluid = inputFluid; this.output = output; this.addedItems = addedItems; + this.outputFluid = outputFluid; } public RecipeARC addRandomOutput(ItemStack stack, double chance) @@ -106,5 +112,17 @@ public abstract class RecipeARC extends BloodMagicRecipe buffer.writeItemStack(pair.getLeft()); buffer.writeDouble(pair.getValue()); } + + buffer.writeBoolean(inputFluid != null); + if (inputFluid != null) + { + inputFluid.write(buffer); + } + + buffer.writeBoolean(outputFluid != null); + if (outputFluid != null) + { + outputFluid.writeToPacket(buffer); + } } } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java index fac5b7ee..01f7d53a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java @@ -13,7 +13,9 @@ import com.google.gson.JsonObject; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; import wayoftime.bloodmagic.util.Constants; @@ -22,20 +24,24 @@ public class ARCRecipeBuilder extends BloodMagicRecipeBuilder { private final Ingredient input; private final Ingredient arcTool; + private final FluidStackIngredient inputFluid; private final ItemStack output; + private final FluidStack outputFluid; private final List> addedItems = new ArrayList>(); - protected ARCRecipeBuilder(Ingredient input, Ingredient arcTool, ItemStack output) + protected ARCRecipeBuilder(Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid) { super(bmSerializer("arc")); this.input = input; this.arcTool = arcTool; + this.inputFluid = inputFluid; this.output = output; + this.outputFluid = outputFluid; } - public static ARCRecipeBuilder arc(Ingredient input, Ingredient arcTool, ItemStack output) + public static ARCRecipeBuilder arc(Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid) { - return new ARCRecipeBuilder(input, arcTool, output); + return new ARCRecipeBuilder(input, arcTool, inputFluid, output, outputFluid); } public ARCRecipeBuilder addRandomOutput(ItemStack stack, double chance) @@ -69,6 +75,9 @@ public class ARCRecipeBuilder extends BloodMagicRecipeBuilder json.add(Constants.JSON.INPUT, input.serialize()); json.add(Constants.JSON.TOOL, arcTool.serialize()); + if (inputFluid != null) + json.add(Constants.JSON.INPUT_FLUID, inputFluid.serialize()); + if (addedItems.size() > 0) { JsonArray mainArray = new JsonArray(); @@ -83,6 +92,9 @@ public class ARCRecipeBuilder extends BloodMagicRecipeBuilder json.add(Constants.JSON.ADDEDOUTPUT, mainArray); } + if (outputFluid != null) + json.add(Constants.JSON.OUTPUT_FLUID, SerializerHelper.serializeFluidStack(outputFluid)); + json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java index 89dc4a5d..a06d5cf0 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java @@ -3,11 +3,14 @@ package wayoftime.bloodmagic.common.recipe; import java.util.function.Consumer; import net.minecraft.data.IFinishedRecipe; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.common.Tags; +import net.minecraftforge.fluids.FluidStack; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; import wayoftime.bloodmagic.common.data.recipe.builder.ARCRecipeBuilder; @@ -17,7 +20,7 @@ public class ARCRecipeProvider implements ISubRecipeProvider public void addRecipes(Consumer consumer) { String basePath = "arc/"; - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.BONES), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get())).addRandomOutput(new ItemStack(Items.DIAMOND), 0.5).build(consumer, BloodMagic.rl(basePath + "test1")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromItems(Items.ACACIA_BOAT), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get())).build(consumer, BloodMagic.rl(basePath + "test2")); + ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.BONES), null, new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), null).addRandomOutput(new ItemStack(Items.DIAMOND), 0.5).build(consumer, BloodMagic.rl(basePath + "test1")); + ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromItems(Items.ACACIA_BOAT), FluidStackIngredient.from(Fluids.LAVA, 1000), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), new FluidStack(Fluids.WATER, 100)).build(consumer, BloodMagic.rl(basePath + "test2")); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java index 84481184..b42ab927 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java @@ -17,8 +17,10 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.network.PacketBuffer; import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistryEntry; import wayoftime.bloodmagic.api.SerializerHelper; +import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.util.Constants; @@ -70,7 +72,24 @@ public class ARCRecipeSerializer extends ForgeRegistry } } - return this.factory.create(recipeId, inputIng, toolIng, output, addedItems); + FluidStackIngredient inputFluidIng = null; + + if (json.has(Constants.JSON.INPUT_FLUID)) + { + JsonElement inputFluid = JSONUtils.isJsonArray(json, Constants.JSON.INPUT_FLUID) + ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT_FLUID) + : JSONUtils.getJsonObject(json, Constants.JSON.INPUT_FLUID); + inputFluidIng = FluidStackIngredient.deserialize(inputFluid); + } + + FluidStack outputFluid = null; + + if (json.has(Constants.JSON.OUTPUT_FLUID)) + { + outputFluid = SerializerHelper.deserializeFluid(json); + } + + return this.factory.create(recipeId, inputIng, toolIng, inputFluidIng, output, addedItems, outputFluid); } @Override @@ -98,7 +117,20 @@ public class ARCRecipeSerializer extends ForgeRegistry buffer.writeDouble(pair.getValue()); } - return this.factory.create(recipeId, inputIng, toolIng, output, addedItems); + FluidStackIngredient inputFluid = null; + FluidStack outputFluid = null; + + if (buffer.readBoolean()) + { + inputFluid = FluidStackIngredient.read(buffer); + } + + if (buffer.readBoolean()) + { + outputFluid = FluidStack.readFromPacket(buffer); + } + + return this.factory.create(recipeId, inputIng, toolIng, inputFluid, output, addedItems, outputFluid); } catch (Exception e) { // Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); @@ -122,6 +154,6 @@ public class ARCRecipeSerializer extends ForgeRegistry @FunctionalInterface public interface IFactory { - RECIPE create(ResourceLocation id, Ingredient input, Ingredient arcTool, ItemStack output, List> addedItems); + RECIPE create(ResourceLocation id, Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, List> addedItems, FluidStack outputFluid); } } \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java index 6a388181..d2ead3c8 100644 --- a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java +++ b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java @@ -10,20 +10,22 @@ import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; +import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; public class IRecipeARC extends RecipeARC { - public IRecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output) + public IRecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid) { - super(id, input, arc_tool, output, new ArrayList>()); + super(id, input, arc_tool, inputFluid, output, new ArrayList>(), outputFluid); } - public IRecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, ItemStack output, List> addedItems) + public IRecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, FluidStackIngredient inputFluid, ItemStack output, List> addedItems, FluidStack outputFluid) { - super(id, input, arc_tool, output, addedItems); + super(id, input, arc_tool, inputFluid, output, addedItems, outputFluid); } @Override From ab230b7af47ba9590ae14a9c5f447e11677d132e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Oct 2020 14:49:26 -0400 Subject: [PATCH 357/493] Fixed recipes and System messages I'm stupid rooDerp --- src/generated/resources/.cache/cache | 2 +- .../assets/bloodmagic/lang/en_us.json | 3 + .../bloodmagic/altar/BloodAltar.java | 2 - .../bloodmagic/tile/TileInventory.java | 10 +- .../ScreenAlchemicalReactionChamber.java | 33 +- .../client/utils/BMRenderTypes.java | 153 +++++++++ .../common/data/GeneratorLanguage.java | 6 + .../recipe/BloodAltarRecipeProvider.java | 2 +- .../tile/TileAlchemicalReactionChamber.java | 59 +++- .../bloodmagic/util/MultiSlotItemHandler.java | 291 ++++++++++++++++++ .../util/handler/event/ClientHandler.java | 179 +++++++++++ 11 files changed, 720 insertions(+), 20 deletions(-) create mode 100644 src/main/java/wayoftime/bloodmagic/client/utils/BMRenderTypes.java create mode 100644 src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 63e83907..64f2dcbc 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -18,7 +18,7 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -775f7c01fb20ba9b55ff5c46d7fef0acd5f591ae assets/bloodmagic/lang/en_us.json +2fd83f690f0a9af248196620b528a4f9717962a1 assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index 7525e488..7647403e 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -24,6 +24,7 @@ "chat.bloodmagic.ritual.notValid": "You feel that these runes are not configured correctly...", "chat.bloodmagic.ritual.prevent": "The ritual is actively resisting you!", "chat.bloodmagic.ritual.weak": "You feel a push, but are too weak to perform this ritual.", + "gui.bloodmagic.empty": "Empty", "item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal", "item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal", "item.bloodmagic.activationcrystalweak": "Weak Activation Crystal", @@ -114,6 +115,7 @@ "ritual.bloodmagic.waterRitual": "Ritual of the Full Spring", "ritual.bloodmagic.wellOfSufferingRitual": "Well of Suffering", "ritual.bloodmagic.zephyrRitual": "Call of the Zephyr", + "tile.bloodmagic.arc.name": "Alchemical Reaction Chamber", "tile.bloodmagic.soulforge.name": "Hellfire Forge", "tooltip.bloodmagic.activationcrystal.awakened": "Activates more powerful rituals", "tooltip.bloodmagic.activationcrystal.creative": "Creative Only - Activates any ritual", @@ -147,6 +149,7 @@ "tooltip.bloodmagic.diviner.totalRune": "Total Runes: %d", "tooltip.bloodmagic.diviner.waterRune": "Water Runes: %d", "tooltip.bloodmagic.extraInfo": "&9-Hold shift for more info-", + "tooltip.bloodmagic.holdShiftForInfo": "Press shift for extra info", "tooltip.bloodmagic.inscriber.desc": "The writing is on the wall...", "tooltip.bloodmagic.orb.desc": "Stores raw Life Essence", "tooltip.bloodmagic.orb.owner": "Added by: %s", diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 34b6a77d..a93e82d3 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -178,7 +178,6 @@ public class BloodAltar// implements IFluidHandler public void startCycle() { -// System.out.println("Starting Cycle"); if (tileAltar.getWorld() != null) tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); @@ -332,7 +331,6 @@ public class BloodAltar// implements IFluidHandler } if (fluid != null && fluid.getAmount() >= 1) { - System.out.println("Draining in order to craft! Progress: " + progress + "/" + liquidRequired); // int liquidDrained = Math.min((int) (altarTier.ordinal() >= 1 // ? consumptionRate * (1 + consumptionMultiplier) // : consumptionRate), fluid.getAmount()); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index a737e704..961fc1fd 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -264,11 +264,11 @@ public class TileInventory extends TileBase implements IInventory if (this instanceof ISidedInventory) { handlerDown = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); - handlerUp = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); - handlerNorth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); - handlerSouth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); - handlerWest = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); - handlerEast = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); + handlerUp = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.UP)); + handlerNorth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.NORTH)); + handlerSouth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.SOUTH)); + handlerWest = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.WEST)); + handlerEast = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.EAST)); } else { handlerDown = LazyOptional.of(() -> new InvWrapper(this)); diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java index cc06b489..26c23ad7 100644 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java +++ b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java @@ -1,5 +1,8 @@ package wayoftime.bloodmagic.client.screens; +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; @@ -7,9 +10,11 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; +import net.minecraftforge.fml.client.gui.GuiUtils; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; +import wayoftime.bloodmagic.util.handler.event.ClientHandler; public class ScreenAlchemicalReactionChamber extends ScreenBase { @@ -40,13 +45,21 @@ public class ScreenAlchemicalReactionChamber extends ScreenBase tooltip = new ArrayList<>(); +// FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); +// inputTank.fill(new FluidStack(Fluids.WATER, 1000), FluidAction.EXECUTE); + + ClientHandler.handleGuiTank(stack, tileARC.inputTank, this.guiLeft + 8, this.guiTop + + 40, 16, 63, 194, 0, 16, 64, mouseX, mouseY, background.toString(), tooltip); + + if (!tooltip.isEmpty()) + GuiUtils.drawHoveringText(stack, tooltip, mouseX, mouseY, width, height, -1, font); + } + // @Override protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) @@ -65,6 +78,12 @@ public class ScreenAlchemicalReactionChamber extends ScreenBase { + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + }, RenderSystem::disableBlend); + protected static final RenderState.TransparencyState NO_TRANSPARENCY = new RenderState.TransparencyState("no_transparency", RenderSystem::disableBlend, () -> { + }); + protected static final RenderState.DepthTestState DEPTH_ALWAYS = new RenderState.DepthTestState("", GL11.GL_ALWAYS); + + static + { + RenderType.State fullbrightSolidState = RenderType.State.getBuilder().shadeModel(SHADE_ENABLED).lightmap(LIGHTMAP_DISABLED).texture(BLOCK_SHEET_MIPPED).build(true); + SOLID_FULLBRIGHT = RenderType.makeType(BloodMagic.MODID + ":block_fullbright", DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256, fullbrightSolidState); + RenderType.State translucentNoDepthState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).line(new LineState(OptionalDouble.of(2))).texture(new TextureState()).depthTest(DEPTH_ALWAYS).build(false); + RenderType.State translucentNoTextureState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).texture(new TextureState()).build(false); + TRANSLUCENT_LINES = RenderType.makeType(BloodMagic.MODID + ":translucent_lines", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, translucentNoDepthState); + LINES = RenderType.makeType(BloodMagic.MODID + ":lines", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, RenderType.State.getBuilder().build(false)); + TRANSLUCENT_TRIANGLES = RenderType.makeType(BloodMagic.MODID + ":translucent_triangle_fan", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, translucentNoDepthState); + TRANSLUCENT_POSITION_COLOR = RenderType.makeType(BloodMagic.MODID + ":translucent_pos_color", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, translucentNoTextureState); + TRANSLUCENT_NO_DEPTH = RenderType.makeType(BloodMagic.MODID + ":translucent_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, translucentNoDepthState); + RenderType.State chunkMarkerState = RenderType.State.getBuilder().texture(new TextureState()).transparency(TRANSLUCENT_TRANSPARENCY).cull(new CullState(false)).shadeModel(new ShadeModelState(true)).line(new LineState(OptionalDouble.of(5))).build(false); + CHUNK_MARKER = RenderType.makeType(BloodMagic.MODID + ":chunk_marker", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, chunkMarkerState); + VEIN_MARKER = RenderType.makeType(BloodMagic.MODID + ":vein_marker", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINE_LOOP, 256, chunkMarkerState); + POSITION_COLOR_TEX_LIGHTMAP = RenderType.makeType(BloodMagic.MODID + ":pos_color_tex_lightmap", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState(PlayerContainer.LOCATION_BLOCKS_TEXTURE, false, false)).lightmap(new LightmapState(true)).build(false)); + POSITION_COLOR_LIGHTMAP = RenderType.makeType(BloodMagic.MODID + ":pos_color_lightmap", DefaultVertexFormats.POSITION_COLOR_LIGHTMAP, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState()).lightmap(new LightmapState(true)).build(false)); + ITEM_DAMAGE_BAR = RenderType.makeType(BloodMagic.MODID + ":item_damage_bar", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, RenderType.State.getBuilder().depthTest(DEPTH_ALWAYS).texture(new TextureState()).alpha(new AlphaState(0)).transparency(NO_TRANSPARENCY).build(false)); + } + + public static RenderType getGui(ResourceLocation texture) + { + return RenderType.makeType("gui_" + texture, DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState(texture, false, false)).alpha(new AlphaState(0.5F)).build(false)); + } + + public static RenderType getLines(float lineWidth) + { + return RenderType.makeType("lines_color_pos_" + lineWidth, DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, RenderType.State.getBuilder().line(new LineState(OptionalDouble.of(lineWidth))).texture(new TextureState()).build(false)); + } + + public static RenderType getPoints(float pointSize) + { + // Not really a fog state, but using it like this makes using RenderType.State + // with custom states possible + FogState setPointSize = new FogState(BloodMagic.MODID + ":pointsize_" + pointSize, () -> GL11.glPointSize(pointSize), () -> { + GL11.glPointSize(1); + }); + return RenderType.makeType("point_pos_color_" + pointSize, DefaultVertexFormats.POSITION_COLOR, GL11.GL_POINTS, 256, RenderType.State.getBuilder().fog(setPointSize).texture(new TextureState()).build(false)); + } + + public static RenderType getPositionTex(ResourceLocation texture) + { + return RenderType.makeType(BloodMagic.MODID + ":pos_tex_" + texture, DefaultVertexFormats.POSITION_TEX, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState(texture, false, false)).build(false)); + } + + public static RenderType getFullbrightTranslucent(ResourceLocation resourceLocation) + { + RenderType.State glState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).texture(new TextureState(resourceLocation, false, false)).lightmap(new LightmapState(false)).build(false); + return RenderType.makeType("BloodMagic:fullbright_translucent_" + resourceLocation, DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256, glState); + } + + public static IRenderTypeBuffer wrapWithStencil(IRenderTypeBuffer in, Consumer setupStencilArea, String name, int ref) + { + return wrapWithAdditional(in, "stencil_" + name + "_" + ref, () -> { + GL11.glEnable(GL11.GL_STENCIL_TEST); + RenderSystem.colorMask(false, false, false, false); + RenderSystem.depthMask(false); + GL11.glStencilFunc(GL11.GL_NEVER, 1, 0xFF); + GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP); + + GL11.glStencilMask(0xFF); + RenderSystem.clear(GL11.GL_STENCIL_BUFFER_BIT, true); + RenderSystem.disableTexture(); + Tessellator tes = Tessellator.getInstance(); + BufferBuilder bb = tes.getBuffer(); + bb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + setupStencilArea.accept(bb); + tes.draw(); + RenderSystem.enableTexture(); + RenderSystem.colorMask(true, true, true, true); + RenderSystem.depthMask(true); + GL11.glStencilMask(0x00); + GL11.glStencilFunc(GL11.GL_EQUAL, ref, 0xFF); + }, () -> GL11.glDisable(GL11.GL_STENCIL_TEST)); + } + + public static IRenderTypeBuffer disableLighting(IRenderTypeBuffer in) + { + return wrapWithAdditional(in, "no_lighting", RenderSystem::disableLighting, () -> { + }); + } + + public static IRenderTypeBuffer disableCull(IRenderTypeBuffer in) + { + return wrapWithAdditional(in, "no_cull", RenderSystem::disableCull, RenderSystem::enableCull); + } + + private static IRenderTypeBuffer wrapWithAdditional(IRenderTypeBuffer in, String name, Runnable setup, Runnable teardown) + { + return type -> { + return in.getBuffer(new RenderType(BloodMagic.MODID + ":" + type + "_" + name, type.getVertexFormat(), type.getDrawMode(), type.getBufferSize(), type.isUseDelegate(), false, () -> { + type.setupRenderState(); + setup.run(); + }, () -> { + teardown.run(); + type.clearRenderState(); + }) + { + }); + }; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index ca769d38..c08a3baf 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -23,6 +23,7 @@ public class GeneratorLanguage extends LanguageProvider // Tile Entitites add("tile.bloodmagic.soulforge.name", "Hellfire Forge"); + add("tile.bloodmagic.arc.name", "Alchemical Reaction Chamber"); // Blood Orb tooltips add("tooltip.bloodmagic.extraInfo", "&9-Hold shift for more info-"); @@ -104,6 +105,8 @@ public class GeneratorLanguage extends LanguageProvider add("tooltip.bloodmagic.diviner.extraExtraInfo", "-Hold shift + alt for augmentation info-"); add("tooltip.bloodmagic.diviner.currentDirection", "Current Direction: %s"); + add("tooltip.bloodmagic.holdShiftForInfo", "Press shift for extra info"); + add("ritual.bloodmagic.testRitual", "Test Ritual"); add("ritual.bloodmagic.waterRitual", "Ritual of the Full Spring"); add("ritual.bloodmagic.lavaRitual", "Serenade of the Nether"); @@ -235,5 +238,8 @@ public class GeneratorLanguage extends LanguageProvider add("chat.bloodmagic.ritual.activate", "A rush of energy flows through the ritual!"); add("chat.bloodmagic.ritual.notValid", "You feel that these runes are not configured correctly..."); + // GUI + add("gui.bloodmagic.empty", "Empty"); + } } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java index ab71d3f8..6e6e86cf 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java @@ -26,7 +26,7 @@ public class BloodAltarRecipeProvider implements ISubRecipeProvider BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STONE), new ItemStack(BloodMagicItems.SLATE.get()), AltarTier.ONE.ordinal(), 1000, 5, 5).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath + "slate")); // TWO - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.REINFORCED_SLATE.get()), AltarTier.THREE.ordinal(), 2000, 5, 5).build(consumer, BloodMagic.rl(basePath + "reinforcedslate")); + BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.REINFORCED_SLATE.get()), AltarTier.TWO.ordinal(), 2000, 5, 5).build(consumer, BloodMagic.rl(basePath + "reinforcedslate")); BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), new ItemStack(BloodMagicItems.APPRENTICE_BLOOD_ORB.get()), AltarTier.TWO.ordinal(), 5000, 5, 5).build(consumer, BloodMagic.rl(basePath + "apprenticebloodorb")); BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.IRON_SWORD), new ItemStack(BloodMagicItems.DAGGER_OF_SACRIFICE.get()), AltarTier.TWO.ordinal(), 3000, 5, 5).build(consumer, BloodMagic.rl(basePath + "daggerofsacrifice")); diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java index 06be3d0e..059d643a 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java +++ b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java @@ -1,19 +1,26 @@ package wayoftime.bloodmagic.tile; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.INamedContainerProvider; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraftforge.fluids.FluidActionResult; import net.minecraftforge.fluids.FluidAttributes; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.templates.FluidTank; import net.minecraftforge.registries.ObjectHolder; import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; import wayoftime.bloodmagic.util.Constants; +import wayoftime.bloodmagic.util.MultiSlotItemHandler; public class TileAlchemicalReactionChamber extends TileInventory implements ITickableTileEntity, INamedContainerProvider { @@ -27,10 +34,8 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic public static final int INPUT_BUCKET_SLOT = 7; public static final int OUTPUT_BUCKET_SLOT = 8; - public FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); - public FluidTank outputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); - -// Input slots are from 0 to 3. + public FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 20); + public FluidTank outputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 20); public int burnTime = 0; @@ -50,6 +55,12 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic super.deserialize(tag); burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); + + CompoundNBT inputTankTag = tag.getCompound("inputtank"); + inputTank.readFromNBT(inputTankTag); + + CompoundNBT outputTankTag = tag.getCompound("outputtank"); + inputTank.readFromNBT(outputTankTag); } @Override @@ -58,13 +69,53 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic super.serialize(tag); tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); + + CompoundNBT inputTankTag = new CompoundNBT(); + inputTank.writeToNBT(inputTankTag); + tag.put("inputtank", inputTankTag); + + CompoundNBT outputTankTag = new CompoundNBT(); + inputTank.writeToNBT(outputTankTag); + tag.put("outputtank", outputTankTag); + return tag; } @Override public void tick() { + if (world.isRemote) + { + return; + } + ItemStack bucketStack = this.getStackInSlot(INPUT_BUCKET_SLOT); + ItemStack[] outputInventory = new ItemStack[] + { getStackInSlot(1), getStackInSlot(2), getStackInSlot(3), getStackInSlot(4), getStackInSlot(5) }; + + MultiSlotItemHandler outputSlotHandler = new MultiSlotItemHandler(outputInventory, 64); +// FluidActionResult res = FluidUtil.tryEmptyContainerAndStow(bucketStack, inputTank, outputSlotHandler, 1000, null, false); + FluidActionResult res = FluidUtil.tryEmptyContainerAndStow(bucketStack, inputTank, outputSlotHandler, 1000, null, true); + if (res.isSuccess()) + { +// FluidUtil.tryEmptyContainerAndStow(bucketStack, inputTank, outputSlotHandler, 1000, null, true); + this.setInventorySlotContents(INPUT_BUCKET_SLOT, ItemStack.EMPTY); + + if (!res.getResult().isEmpty()) + { + List arrayList = new ArrayList<>(); + arrayList.add(res.getResult()); + + outputSlotHandler.canTransferAllItemsToSlots(arrayList, false); + } + } + + for (int i = 0; i < NUM_OUTPUTS; i++) + { + this.setInventorySlotContents(OUTPUT_SLOT + i, outputSlotHandler.getStackInSlot(i)); + } + +// FluidUtil.tryEmptyContainer(container, fluidDestination, maxAmount, player, doDrain) } // private boolean canCraft(RecipeTartaricForge recipe) diff --git a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java new file mode 100644 index 00000000..65e41136 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java @@ -0,0 +1,291 @@ +package wayoftime.bloodmagic.util; + +import java.util.List; + +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; + +public class MultiSlotItemHandler implements IItemHandler +{ + private ItemStack[] items; + + private final int invLimit; + + public MultiSlotItemHandler(int size, int invLimit) + { + items = new ItemStack[size]; + for (int i = 0; i < size; i++) + { + items[i] = ItemStack.EMPTY; + } + + this.invLimit = invLimit; + } + + public MultiSlotItemHandler(ItemStack[] items, int invLimit) + { + this.items = items; + this.invLimit = invLimit; + } + + @Override + public int getSlots() + { + return items.length; + } + + @Override + public ItemStack getStackInSlot(int slot) + { + return items[slot]; + } + + public boolean isItemValid(int slot, ItemStack stack) + { + return true; + } + + public void setInventorySlotContents(int slot, ItemStack stack) + { + items[slot] = stack; + } + + @Override + @Nonnull + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) + { + if (stack.isEmpty()) + return ItemStack.EMPTY; + + ItemStack stackInSlot = getStackInSlot(slot); + + int m; + if (!stackInSlot.isEmpty()) + { + if (stackInSlot.getCount() >= Math.min(stackInSlot.getMaxStackSize(), getSlotLimit(slot))) + return stack; + + if (!ItemHandlerHelper.canItemStacksStack(stack, stackInSlot)) + return stack; + + if (!isItemValid(slot, stack)) + return stack; + + m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)) - stackInSlot.getCount(); + + if (stack.getCount() <= m) + { + if (!simulate) + { + ItemStack copy = stack.copy(); + copy.grow(stackInSlot.getCount()); + setInventorySlotContents(slot, copy); + } + + return ItemStack.EMPTY; + } else + { + // copy the stack to not modify the original one + stack = stack.copy(); + if (!simulate) + { + ItemStack copy = stack.split(m); + copy.grow(stackInSlot.getCount()); + setInventorySlotContents(slot, copy); + return stack; + } else + { + stack.shrink(m); + return stack; + } + } + } else + { + if (!isItemValid(slot, stack)) + return stack; + + m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)); + if (m < stack.getCount()) + { + // copy the stack to not modify the original one + stack = stack.copy(); + if (!simulate) + { + setInventorySlotContents(slot, stack.split(m)); + return stack; + } else + { + stack.shrink(m); + return stack; + } + } else + { + if (!simulate) + { + setInventorySlotContents(slot, stack); + } + return ItemStack.EMPTY; + } + } + } + + public boolean canTransferAllItemsToSlots(List stackList, boolean simulate) + { + ItemStack[] copyList = new ItemStack[items.length]; + for (int i = 0; i < copyList.length; i++) + { + copyList[i] = items[i].copy(); + } + + for (ItemStack stack : stackList) + { + if (stack.isEmpty()) + { + continue; + } + + slots: for (int slot = 0; slot < copyList.length; slot++) + { + ItemStack stackInSlot = copyList[slot]; + + int m; + if (!stackInSlot.isEmpty()) + { + if (stackInSlot.getCount() >= Math.min(stackInSlot.getMaxStackSize(), getSlotLimit(slot))) + continue; + + if (!ItemHandlerHelper.canItemStacksStack(stack, stackInSlot)) + continue; + + if (!isItemValid(slot, stack)) + continue; + + m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)) - stackInSlot.getCount(); + + if (stack.getCount() <= m) + { + if (!simulate) + { + ItemStack copy = stack.copy(); + copy.grow(stackInSlot.getCount()); + copyList[slot] = copy; + } + + break slots; + } else + { + // copy the stack to not modify the original one + stack = stack.copy(); + if (!simulate) + { + ItemStack copy = stack.split(m); + copy.grow(stackInSlot.getCount()); + copyList[slot] = copy; + } else + { + stack.shrink(m); + } + } + } else + { + if (!isItemValid(slot, stack)) + continue; + + m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)); + if (m < stack.getCount()) + { + // copy the stack to not modify the original one + stack = stack.copy(); + if (!simulate) + { + copyList[slot] = stack.split(m); + } else + { + stack.shrink(m); + } + } else + { + if (!simulate) + { + copyList[slot] = stack; + } + + stack = ItemStack.EMPTY; + } + } + } + + if (!stack.isEmpty()) + { + break; + } + } + + if (!simulate) + { + items = copyList; + } + + return false; + } + + @Override + @Nonnull + public ItemStack extractItem(int slot, int amount, boolean simulate) + { + if (amount == 0) + return ItemStack.EMPTY; + + ItemStack stackInSlot = getStackInSlot(slot); + + if (stackInSlot.isEmpty()) + return ItemStack.EMPTY; + + if (simulate) + { + if (stackInSlot.getCount() < amount) + { + return stackInSlot.copy(); + } else + { + ItemStack copy = stackInSlot.copy(); + copy.setCount(amount); + return copy; + } + } else + { + int m = Math.min(stackInSlot.getCount(), amount); + + ItemStack decrStackSize = decrStackSize(slot, m); + return decrStackSize; + } + } + + public ItemStack decrStackSize(int slot, int amount) + { + if (!getStackInSlot(slot).isEmpty()) + { + if (getStackInSlot(slot).getCount() <= amount) + { + ItemStack itemStack = getStackInSlot(slot); + setInventorySlotContents(slot, ItemStack.EMPTY); + return itemStack; + } + + ItemStack itemStack = getStackInSlot(slot).split(amount); + return itemStack; + } + + return ItemStack.EMPTY; + } + + @Override + public int getSlotLimit(int slot) + { + return invLimit; + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java index 033cc947..68976382 100644 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java @@ -1,5 +1,6 @@ package wayoftime.bloodmagic.util.handler.event; +import java.util.HashMap; import java.util.List; import com.google.common.collect.Lists; @@ -9,30 +10,44 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.text.IFormattableTextComponent; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fml.common.Mod; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.client.render.BloodMagicRenderer; import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; import wayoftime.bloodmagic.client.render.RenderResizableCuboid; +import wayoftime.bloodmagic.client.utils.BMRenderTypes; import wayoftime.bloodmagic.common.item.ItemRitualDiviner; import wayoftime.bloodmagic.ritual.Ritual; import wayoftime.bloodmagic.ritual.RitualComponent; @@ -62,6 +77,36 @@ public class ClientHandler private static Direction mrsHoloDirection; private static boolean mrsHoloDisplay; + static HashMap resourceMap = new HashMap(); + + public static Minecraft mc() + { + return Minecraft.getInstance(); + } + + public static void bindTexture(String path) + { + mc().getTextureManager().bindTexture(getResource(path)); + } + + public static void bindAtlas() + { + mc().getTextureManager().bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); + } + + public static ResourceLocation getResource(String path) + { + ResourceLocation rl = resourceMap.containsKey(path) ? resourceMap.get(path) : new ResourceLocation(path); + if (!resourceMap.containsKey(path)) + resourceMap.put(path, rl); + return rl; + } + + public static TextureAtlasSprite getSprite(ResourceLocation rl) + { + return mc().getModelManager().getAtlasTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE).getSprite(rl); + } + @SubscribeEvent public static void onTextureStitch(TextureStitchEvent.Pre event) { @@ -297,4 +342,138 @@ public class ClientHandler mrsHoloRitual = null; mrsHoloDirection = Direction.NORTH; } + + public static void handleGuiTank(MatrixStack transform, IFluidTank tank, int x, int y, int w, int h, int oX, int oY, int oW, int oH, int mX, int mY, String originalTexture, List tooltip) + { + handleGuiTank(transform, tank.getFluid(), tank.getCapacity(), x, y, w, h, oX, oY, oW, oH, mX, mY, originalTexture, tooltip); + } + + public static void handleGuiTank(MatrixStack transform, FluidStack fluid, int capacity, int x, int y, int w, int h, int oX, int oY, int oW, int oH, int mX, int mY, String originalTexture, List tooltip) + { + if (tooltip == null) + { + transform.push(); + IRenderTypeBuffer.Impl buffer = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + if (fluid != null && fluid.getFluid() != null) + { + int fluidHeight = (int) (h * (fluid.getAmount() / (float) capacity)); + drawRepeatedFluidSpriteGui(buffer, transform, fluid, x, y + h - fluidHeight, w, fluidHeight); + RenderSystem.color3f(1, 1, 1); + } + int xOff = (w - oW) / 2; + int yOff = (h - oH) / 2; + RenderType renderType = BMRenderTypes.getGui(new ResourceLocation(originalTexture)); + drawTexturedRect(buffer.getBuffer(renderType), transform, x + xOff, y + yOff, oW, oH, 256f, oX, oX + + oW, oY, oY + oH); + buffer.finish(renderType); + transform.pop(); + } else + { + if (mX >= x && mX < x + w && mY >= y && mY < y + h) + addFluidTooltip(fluid, tooltip, capacity); + } + } + + public static void drawRepeatedFluidSpriteGui(IRenderTypeBuffer buffer, MatrixStack transform, FluidStack fluid, float x, float y, float w, float h) + { + RenderType renderType = BMRenderTypes.getGui(PlayerContainer.LOCATION_BLOCKS_TEXTURE); + IVertexBuilder builder = buffer.getBuffer(renderType); + drawRepeatedFluidSprite(builder, transform, fluid, x, y, w, h); + } + + public static void drawRepeatedFluidSprite(IVertexBuilder builder, MatrixStack transform, FluidStack fluid, float x, float y, float w, float h) + { + TextureAtlasSprite sprite = getSprite(fluid.getFluid().getAttributes().getStillTexture(fluid)); + int col = fluid.getFluid().getAttributes().getColor(fluid); + int iW = sprite.getWidth(); + int iH = sprite.getHeight(); + if (iW > 0 && iH > 0) + drawRepeatedSprite(builder, transform, x, y, w, h, iW, iH, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV(), (col >> 16 + & 255) / 255.0f, (col >> 8 & 255) / 255.0f, (col & 255) / 255.0f, 1); + } + + public static void drawRepeatedSprite(IVertexBuilder builder, MatrixStack transform, float x, float y, float w, float h, int iconWidth, int iconHeight, float uMin, float uMax, float vMin, float vMax, float r, float g, float b, float alpha) + { + int iterMaxW = (int) (w / iconWidth); + int iterMaxH = (int) (h / iconHeight); + float leftoverW = w % iconWidth; + float leftoverH = h % iconHeight; + float leftoverWf = leftoverW / (float) iconWidth; + float leftoverHf = leftoverH / (float) iconHeight; + float iconUDif = uMax - uMin; + float iconVDif = vMax - vMin; + for (int ww = 0; ww < iterMaxW; ww++) + { + for (int hh = 0; hh < iterMaxH; hh++) drawTexturedRect(builder, transform, x + ww * iconWidth, y + + hh * iconHeight, iconWidth, iconHeight, r, g, b, alpha, uMin, uMax, vMin, vMax); + drawTexturedRect(builder, transform, x + ww * iconWidth, y + + iterMaxH * iconHeight, iconWidth, leftoverH, r, g, b, alpha, uMin, uMax, vMin, (vMin + + iconVDif * leftoverHf)); + } + if (leftoverW > 0) + { + for (int hh = 0; hh < iterMaxH; hh++) drawTexturedRect(builder, transform, x + iterMaxW * iconWidth, y + + hh * iconHeight, leftoverW, iconHeight, r, g, b, alpha, uMin, (uMin + + iconUDif * leftoverWf), vMin, vMax); + drawTexturedRect(builder, transform, x + iterMaxW * iconWidth, y + + iterMaxH * iconHeight, leftoverW, leftoverH, r, g, b, alpha, uMin, (uMin + + iconUDif * leftoverWf), vMin, (vMin + iconVDif * leftoverHf)); + } + } + + public static void drawTexturedRect(IVertexBuilder builder, MatrixStack transform, float x, float y, float w, float h, float r, float g, float b, float alpha, float u0, float u1, float v0, float v1) + { + Matrix4f mat = transform.getLast().getMatrix(); + builder.pos(mat, x, y + + h, 0).color(r, g, b, alpha).tex(u0, v1).overlay(OverlayTexture.NO_OVERLAY).lightmap(0xf000f0).normal(1, 1, 1).endVertex(); + builder.pos(mat, x + w, y + + h, 0).color(r, g, b, alpha).tex(u1, v1).overlay(OverlayTexture.NO_OVERLAY).lightmap(15728880).normal(1, 1, 1).endVertex(); + builder.pos(mat, x + + w, y, 0).color(r, g, b, alpha).tex(u1, v0).overlay(OverlayTexture.NO_OVERLAY).lightmap(15728880).normal(1, 1, 1).endVertex(); + builder.pos(mat, x, y, 0).color(r, g, b, alpha).tex(u0, v0).overlay(OverlayTexture.NO_OVERLAY).lightmap(15728880).normal(1, 1, 1).endVertex(); + } + + public static void drawTexturedRect(IVertexBuilder builder, MatrixStack transform, int x, int y, int w, int h, float picSize, int u0, int u1, int v0, int v1) + { + drawTexturedRect(builder, transform, x, y, w, h, 1, 1, 1, 1, u0 / picSize, u1 / picSize, v0 / picSize, v1 + / picSize); + } + + public static void addFluidTooltip(FluidStack fluid, List tooltip, int tankCapacity) + { + if (!fluid.isEmpty()) + tooltip.add(applyFormat(fluid.getDisplayName(), fluid.getFluid().getAttributes().getRarity(fluid).color)); + else + tooltip.add(new TranslationTextComponent("gui.bloodmagic.empty")); +// if (fluid.getFluid() instanceof IEFluid) +// ((IEFluid) fluid.getFluid()).addTooltipInfo(fluid, null, tooltip); + + if (mc().gameSettings.advancedItemTooltips && !fluid.isEmpty()) + { + if (!Screen.hasShiftDown()) + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.holdShiftForInfo")); + else + { + // TODO translation keys + tooltip.add(applyFormat(new StringTextComponent("Fluid Registry: " + fluid.getFluid().getRegistryName()), TextFormatting.DARK_GRAY)); + tooltip.add(applyFormat(new StringTextComponent("Density: " + fluid.getFluid().getAttributes().getDensity(fluid)), TextFormatting.DARK_GRAY)); + tooltip.add(applyFormat(new StringTextComponent("Temperature: " + fluid.getFluid().getAttributes().getTemperature(fluid)), TextFormatting.DARK_GRAY)); + tooltip.add(applyFormat(new StringTextComponent("Viscosity: " + fluid.getFluid().getAttributes().getViscosity(fluid)), TextFormatting.DARK_GRAY)); + tooltip.add(applyFormat(new StringTextComponent("NBT Data: " + fluid.getTag()), TextFormatting.DARK_GRAY)); + } + } + + if (tankCapacity > 0) + tooltip.add(applyFormat(new StringTextComponent(fluid.getAmount() + "/" + tankCapacity + "mB"), TextFormatting.GRAY)); + else + tooltip.add(applyFormat(new StringTextComponent(fluid.getAmount() + "mB"), TextFormatting.GRAY)); + } + + public static IFormattableTextComponent applyFormat(ITextComponent component, TextFormatting... color) + { + Style style = component.getStyle(); + for (TextFormatting format : color) style = style.applyFormatting(format); + return component.deepCopy().setStyle(style); + } + } From 6f6f2049c1e11753850f54c8bb0bb71c5d6d86d3 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Oct 2020 14:55:48 -0400 Subject: [PATCH 358/493] Update TartaricForgeRecipeProvider.java Updated the recipes so that the Air Reagent is craftable. --- .../bloodmagic/common/recipe/TartaricForgeRecipeProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java index 43344e81..57241d8e 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java @@ -24,6 +24,7 @@ public class TartaricForgeRecipeProvider implements ISubRecipeProvider TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.COMMON_GEM.get()), 240, 50, Ingredient.fromItems(BloodMagicItems.LESSER_GEM.get()), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_GOLD), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl(basePath + "commontartaricgem")); TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SWORD.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_SWORD)).build(consumer, BloodMagic.rl(basePath + "sentientsword")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_AIR.get()), 128, 20, Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromTag(Tags.Items.FEATHERS), Ingredient.fromTag(Tags.Items.FEATHERS)).build(consumer, BloodMagic.rl(basePath + "reagent_air")); TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), 0, 0, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DYES_WHITE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "arcaneashes")); TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 10, 3, Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.WATER_BUCKET), Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 32, 10, Ingredient.fromItems(Items.LAVA_BUCKET), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); From bacaf114fb01172ae3682338110f72b570b000e2 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Oct 2020 18:32:03 -0400 Subject: [PATCH 359/493] Fixed Sentient Sword Fixed the sentient sword so that it now extends `SwordItem` --- .../bloodmagic/common/item/BMItemTier.java | 62 +++++++++++++++++++ .../common/item/soul/ItemSentientSword.java | 6 +- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java b/src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java new file mode 100644 index 00000000..9da76ed4 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java @@ -0,0 +1,62 @@ +package wayoftime.bloodmagic.common.item; + +import java.util.function.Supplier; + +import net.minecraft.item.IItemTier; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.LazyValue; + +public enum BMItemTier implements IItemTier +{ + SENTIENT(4, 512, 6.0F, 2.0F, 50, () -> { + return Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()); + }); + + private final int harvestLevel; + private final int maxUses; + private final float efficiency; + private final float attackDamage; + private final int enchantability; + private final LazyValue repairMaterial; + + private BMItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) + { + this.harvestLevel = harvestLevelIn; + this.maxUses = maxUsesIn; + this.efficiency = efficiencyIn; + this.attackDamage = attackDamageIn; + this.enchantability = enchantabilityIn; + this.repairMaterial = new LazyValue<>(repairMaterialIn); + } + + public int getMaxUses() + { + return this.maxUses; + } + + public float getEfficiency() + { + return this.efficiency; + } + + public float getAttackDamage() + { + return this.attackDamage; + } + + public int getHarvestLevel() + { + return this.harvestLevel; + } + + public int getEnchantability() + { + return this.enchantability; + } + + public Ingredient getRepairMaterial() + { + return this.repairMaterial.getValue(); + } + +} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java index 8e59bcd2..a19c1d7e 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.SwordItem; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -30,6 +31,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.item.BMItemTier; import wayoftime.bloodmagic.common.item.BloodMagicItems; import wayoftime.bloodmagic.iface.IMultiWillTool; import wayoftime.bloodmagic.util.Constants; @@ -39,7 +41,7 @@ import wayoftime.bloodmagic.will.IDemonWill; import wayoftime.bloodmagic.will.IDemonWillWeapon; import wayoftime.bloodmagic.will.PlayerDemonWillHandler; -public class ItemSentientSword extends Item implements IDemonWillWeapon, IMultiWillTool +public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMultiWillTool { public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000, 2000, 4000 }; @@ -81,7 +83,7 @@ public class ItemSentientSword extends Item implements IDemonWillWeapon, IMultiW public ItemSentientSword() { // super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); - super(new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); + super(BMItemTier.SENTIENT, 6, -2.6f, new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); } // @Override From 4dfa414a56938388420885775e403c7ef0afdb76 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Oct 2020 18:32:43 -0400 Subject: [PATCH 360/493] Fixed the ARC Serialization --- build.gradle | 2 +- src/generated/resources/.cache/cache | 3 ++- .../recipes/altar/reinforcedslate.json | 2 +- .../recipes/soulforge/reagent_air.json | 17 +++++++++++++++++ .../java/WayofTime/bloodmagic/BloodMagic.java | 2 +- .../recipe/serializer/ARCRecipeSerializer.java | 15 +++++---------- 6 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_air.json diff --git a/build.gradle b/build.gradle index cf634db2..0efa9fd7 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.16.3-3.0-2' +version = '1.16.3-3.0-3' group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'BloodMagic' diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 64f2dcbc..5c45ea61 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -190,7 +190,7 @@ d79a96eb3eed597f1c18a8983764a6362a24748c data/bloodmagic/recipes/altar/dusk_tool 37913b1babf9b8159332db09b114c919b1b49473 data/bloodmagic/recipes/altar/fire_tool.json 9aeb0d2d33d839eedb2d9bbdaf76fc73e0b39941 data/bloodmagic/recipes/altar/imbuedslate.json 2643d1516f6dae79128fdc8c48c4cfe23453f171 data/bloodmagic/recipes/altar/magicianbloodorb.json -f38355165034ce314a9f0344ebc3a6cad22c76c8 data/bloodmagic/recipes/altar/reinforcedslate.json +30d84c946ad9235f6e59f1046edbe8d44acc799e data/bloodmagic/recipes/altar/reinforcedslate.json 584d01dff4d64bb88bd3783751a29723700f1728 data/bloodmagic/recipes/altar/slate.json 926d4a0e165c87a15a609744d832d2f5f04a40d0 data/bloodmagic/recipes/altar/water_tool.json 7551501cf361667ec7454c307b9d2368536fbed6 data/bloodmagic/recipes/altar/weakbloodorb.json @@ -225,6 +225,7 @@ f4763a58a8f471ec1aaa997cbd36eac8c7d51a12 data/bloodmagic/recipes/soulforge/arcan 8b64af8453c60b6b1ae55bd0dd1a68fe95e8ba19 data/bloodmagic/recipes/soulforge/commontartaricgem.json d46b61779b3c8382862d4e66c3909a1241ecca18 data/bloodmagic/recipes/soulforge/lessertartaricgem.json d6e06747c75fc06e708a15358911f1c63eee86b1 data/bloodmagic/recipes/soulforge/pettytartaricgem.json +42f6af3a4c723c6a6b2a6e1d680a875e15664e4f data/bloodmagic/recipes/soulforge/reagent_air.json 6b59a7e95e596997b7bbb894b6fbaf5015b213b5 data/bloodmagic/recipes/soulforge/reagent_fastminer.json ae3a6a760e9f793d5a62e2f0f6c45219b0017816 data/bloodmagic/recipes/soulforge/reagent_growth.json 1c391181ea77f5ed01f7226e0782b3b45162ab3c data/bloodmagic/recipes/soulforge/reagent_lava.json diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json index 9e16f279..52a37c81 100644 --- a/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json +++ b/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json @@ -6,7 +6,7 @@ "output": { "item": "bloodmagic:reinforcedslate" }, - "upgradeLevel": 2, + "upgradeLevel": 1, "altarSyphon": 2000, "consumptionRate": 5, "drainRate": 5 diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_air.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_air.json new file mode 100644 index 00000000..59453b27 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/soulforge/reagent_air.json @@ -0,0 +1,17 @@ +{ + "type": "bloodmagic:soulforge", + "input0": { + "item": "minecraft:ghast_tear" + }, + "input1": { + "tag": "forge:feathers" + }, + "input2": { + "tag": "forge:feathers" + }, + "output": { + "item": "bloodmagic:reagentair" + }, + "minimumDrain": 128.0, + "drain": 20.0 +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 491329e2..3466744f 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -66,7 +66,7 @@ public class BloodMagic { public static final String MODID = "bloodmagic"; // Directly reference a log4j logger. - private static final Logger LOGGER = LogManager.getLogger(); + public static final Logger LOGGER = LogManager.getLogger(); private static Gson GSON = null; diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java index b42ab927..9ec58585 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java @@ -11,6 +11,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; @@ -19,6 +20,7 @@ import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistryEntry; +import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.api.SerializerHelper; import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; @@ -110,15 +112,8 @@ public class ARCRecipeSerializer extends ForgeRegistry addedItems.add(Pair.of(stack, chance)); } - buffer.writeInt(addedItems.size()); - for (Pair pair : addedItems) - { - buffer.writeItemStack(pair.getLeft()); - buffer.writeDouble(pair.getValue()); - } - FluidStackIngredient inputFluid = null; - FluidStack outputFluid = null; + FluidStack outputFluid = new FluidStack(Fluids.EMPTY, 1000); if (buffer.readBoolean()) { @@ -133,7 +128,7 @@ public class ARCRecipeSerializer extends ForgeRegistry return this.factory.create(recipeId, inputIng, toolIng, inputFluid, output, addedItems, outputFluid); } catch (Exception e) { -// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); + BloodMagic.LOGGER.error("Error reading ARC recipe from packet.", e); throw e; } } @@ -146,7 +141,7 @@ public class ARCRecipeSerializer extends ForgeRegistry recipe.write(buffer); } catch (Exception e) { -// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); + BloodMagic.LOGGER.error("Error writing ARC recipe to packet.", e); throw e; } } From fea894a2b25ab7d1e40eee5e5ea15e0f2a9b1f67 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 27 Oct 2020 19:54:46 -0400 Subject: [PATCH 361/493] Work on the ARC Properly implemented the fluid handling for the input/output buckets. --- .../ScreenAlchemicalReactionChamber.java | 6 +- .../tile/TileAlchemicalReactionChamber.java | 83 +++++++++++++++---- .../bloodmagic/util/MultiSlotItemHandler.java | 9 +- 3 files changed, 81 insertions(+), 17 deletions(-) diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java index 26c23ad7..4fe9ccfb 100644 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java +++ b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java @@ -54,7 +54,9 @@ public class ScreenAlchemicalReactionChamber extends ScreenBase= 1000) { -// FluidUtil.tryEmptyContainerAndStow(bucketStack, inputTank, outputSlotHandler, 1000, null, true); - this.setInventorySlotContents(INPUT_BUCKET_SLOT, ItemStack.EMPTY); - - if (!res.getResult().isEmpty()) + ItemStack testFullBucketStack = ItemHandlerHelper.copyStackWithSize(fullBucketStack, 1); + LazyOptional fluidHandlerWrapper = FluidUtil.getFluidHandler(testFullBucketStack); + if (fluidHandlerWrapper.isPresent()) { - List arrayList = new ArrayList<>(); - arrayList.add(res.getResult()); + IFluidHandlerItem fluidHandler = fluidHandlerWrapper.resolve().get(); + FluidStack transferedStack = FluidUtil.tryFluidTransfer(inputTank, fluidHandler, 1000, false); + if (!transferedStack.isEmpty()) + { + fluidHandler.drain(transferedStack, FluidAction.EXECUTE); + List arrayList = new ArrayList<>(); + arrayList.add(fluidHandler.getContainer()); + if (outputSlotHandler.canTransferAllItemsToSlots(arrayList, true)) + { + inputTank.fill(transferedStack, FluidAction.EXECUTE); + outputSlotHandler.canTransferAllItemsToSlots(arrayList, false); + if (fullBucketStack.getCount() > 1) + { + fullBucketStack.setCount(fullBucketStack.getCount() - 1); + } else + { + setInventorySlotContents(INPUT_BUCKET_SLOT, ItemStack.EMPTY); + } + } + } + } + } - outputSlotHandler.canTransferAllItemsToSlots(arrayList, false); + if (!emptyBucketStack.isEmpty() && outputTank.getFluidAmount() >= 1000) + { + ItemStack testEmptyBucketStack = ItemHandlerHelper.copyStackWithSize(emptyBucketStack, 1); + LazyOptional fluidHandlerWrapper = FluidUtil.getFluidHandler(testEmptyBucketStack); + if (fluidHandlerWrapper.isPresent()) + { + IFluidHandlerItem fluidHandler = fluidHandlerWrapper.resolve().get(); + FluidStack transferedStack = FluidUtil.tryFluidTransfer(fluidHandler, outputTank, 1000, false); + if (!transferedStack.isEmpty()) + { + fluidHandler.fill(transferedStack, FluidAction.EXECUTE); + List arrayList = new ArrayList<>(); + arrayList.add(fluidHandler.getContainer()); + if (outputSlotHandler.canTransferAllItemsToSlots(arrayList, true)) + { + outputTank.drain(transferedStack, FluidAction.EXECUTE); + outputSlotHandler.canTransferAllItemsToSlots(arrayList, false); + if (emptyBucketStack.getCount() > 1) + { + emptyBucketStack.setCount(emptyBucketStack.getCount() - 1); + } else + { + setInventorySlotContents(OUTPUT_BUCKET_SLOT, ItemStack.EMPTY); + } + } + } } } diff --git a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java index 65e41136..b902207e 100644 --- a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java @@ -140,6 +140,8 @@ public class MultiSlotItemHandler implements IItemHandler copyList[i] = items[i].copy(); } + boolean hasStashedAll = true; + for (ItemStack stack : stackList) { if (stack.isEmpty()) @@ -167,12 +169,14 @@ public class MultiSlotItemHandler implements IItemHandler if (stack.getCount() <= m) { + ItemStack copy = stack.copy(); if (!simulate) { - ItemStack copy = stack.copy(); copy.grow(stackInSlot.getCount()); copyList[slot] = copy; } + stack = ItemStack.EMPTY; +// System.out.println("Count: " + stack.getCount() + ", m: " + m); break slots; } else @@ -220,6 +224,7 @@ public class MultiSlotItemHandler implements IItemHandler if (!stack.isEmpty()) { + hasStashedAll = false; break; } } @@ -229,7 +234,7 @@ public class MultiSlotItemHandler implements IItemHandler items = copyList; } - return false; + return hasStashedAll; } @Override From c159828248aeedeb74e19f7724fff2d67a66f837 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 29 Oct 2020 15:45:38 -0400 Subject: [PATCH 362/493] Initial work on the Sanguine Scientiem Downloaded patchouli and, after lots of remorse, managed to get the beginnings of a guide. --- build.gradle | 13 ++ gradle.properties | 3 +- runClient.launch | 2 +- runData.launch | 11 +- runServer.launch | 12 +- src/generated/resources/.cache/cache | 2 +- .../assets/bloodmagic/lang/en_us.json | 2 + .../api/impl/BloodMagicRecipeRegistrar.java | 36 +++++ .../WayofTime/bloodmagic/util/Constants.java | 2 + .../bloodmagic/api/impl/recipe/RecipeARC.java | 17 +++ .../common/data/GeneratorLanguage.java | 4 + .../tile/TileAlchemicalReactionChamber.java | 124 +++++++++++------- .../bloodmagic/util/MultiSlotItemHandler.java | 1 - .../alchemyarray/divination_array_1.png | Bin 0 -> 30510 bytes .../alchemyarray/divination_array_2.png | Bin 0 -> 39863 bytes .../entries/alchemyarray/simple_array.png | Bin 0 -> 27736 bytes .../images/entries/demonwill/demonwill.png | Bin 0 -> 59181 bytes .../entries/demonwill/snare_particles.png | Bin 0 -> 48876 bytes .../assets/bloodmagic/models/item/book.json | 6 + .../patchouli_books/guide/book.json | 9 ++ .../guide/en_us/categories/alchemyarray.json | 6 + .../guide/en_us/categories/altar.json | 6 + .../guide/en_us/categories/demonwill.json | 6 + .../guide/en_us/categories/sigil.json | 6 + .../en_us/entries/alchemyarray/arcaneash.json | 30 +++++ .../entries/alchemyarray/craftingarray.json | 15 +++ .../guide/en_us/entries/altar/bloodaltar.json | 15 +++ .../en_us/entries/demonwill/demonwill.json | 27 ++++ .../entries/demonwill/sentientsword.json | 15 +++ .../en_us/entries/demonwill/soulforge.json | 15 +++ .../en_us/entries/demonwill/soulsnare.json | 24 ++++ .../guide/en_us/entries/sigil/divination.json | 11 ++ 32 files changed, 352 insertions(+), 68 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/images/entries/alchemyarray/divination_array_1.png create mode 100644 src/main/resources/assets/bloodmagic/images/entries/alchemyarray/divination_array_2.png create mode 100644 src/main/resources/assets/bloodmagic/images/entries/alchemyarray/simple_array.png create mode 100644 src/main/resources/assets/bloodmagic/images/entries/demonwill/demonwill.png create mode 100644 src/main/resources/assets/bloodmagic/images/entries/demonwill/snare_particles.png create mode 100644 src/main/resources/assets/bloodmagic/models/item/book.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/book.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemyarray.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/demonwill.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/sigil.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemyarray/arcaneash.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemyarray/craftingarray.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/bloodaltar.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demonwill/demonwill.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demonwill/sentientsword.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demonwill/soulforge.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demonwill/soulsnare.json create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/divination.json diff --git a/build.gradle b/build.gradle index 0efa9fd7..96ae1bf5 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,8 @@ minecraft { runs { client { workingDirectory project.file('run') + + properties 'mixin.env.disableRefMap': 'true' // Recommended logging data for a userdev environment property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' @@ -52,6 +54,8 @@ minecraft { server { workingDirectory project.file('run') + + properties 'mixin.env.disableRefMap': 'true' // Recommended logging data for a userdev environment property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' @@ -68,6 +72,8 @@ minecraft { data { workingDirectory project.file('run') + + properties 'mixin.env.disableRefMap': 'true' // Recommended logging data for a userdev environment property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' @@ -90,6 +96,10 @@ repositories { maven { url "http://dvs1.progwml6.com/files/maven/" } + maven { + name = "The Loader" + url = "https://maven.blamejared.com" + } } dependencies { @@ -105,6 +115,9 @@ dependencies { compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19:api") runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19") + + compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api") + runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}") // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" // compile "some.group:artifact:version" diff --git a/gradle.properties b/gradle.properties index 6d57271b..fba356f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,5 @@ org.gradle.daemon=false minecraft_version=1.16.3 #Mod dependencies -jei_version=7.6.0.49 \ No newline at end of file +jei_version=7.6.0.49 +patchouli_version=1.16.2-47-SNAPSHOT \ No newline at end of file diff --git a/runClient.launch b/runClient.launch index 664cf9fe..24823cb8 100644 --- a/runClient.launch +++ b/runClient.launch @@ -16,6 +16,6 @@ - + diff --git a/runData.launch b/runData.launch index 296ac5fd..c9e117f3 100644 --- a/runData.launch +++ b/runData.launch @@ -1,11 +1,5 @@ - - - - - - @@ -15,13 +9,10 @@ - - - - + diff --git a/runServer.launch b/runServer.launch index 581f8b9c..72cf747b 100644 --- a/runServer.launch +++ b/runServer.launch @@ -1,11 +1,5 @@ - - - - - - @@ -15,12 +9,10 @@ - - - + - + diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 5c45ea61..152c3d51 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -18,7 +18,7 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json 487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -2fd83f690f0a9af248196620b528a4f9717962a1 assets/bloodmagic/lang/en_us.json +fb7a615c3c1cf62b3a9c4a3ef701d22e7b45108c assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index 7647403e..3a855484 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -25,6 +25,8 @@ "chat.bloodmagic.ritual.prevent": "The ritual is actively resisting you!", "chat.bloodmagic.ritual.weak": "You feel a push, but are too weak to perform this ritual.", "gui.bloodmagic.empty": "Empty", + "guide.bloodmagic.landing_text": "\"It is my dear hope that by holding this tome in your hands, I may impart the knowledge of the lost art that is Blood Magic\"$(br)$(o)- Magus Arcana$()", + "guide.bloodmagic.name": "Sanguine Scientiem", "item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal", "item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal", "item.bloodmagic.activationcrystalweak": "Weak Activation Crystal", diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index bb0652a8..aedd730b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -15,7 +15,9 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; import wayoftime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge; @@ -250,6 +252,40 @@ public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar return null; } + public RecipeARC getARC(World world, @Nonnull ItemStack input, @Nonnull ItemStack arcToolInput, @Nonnull FluidStack inputFluid) + { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(arcToolInput, "tool cannot be null."); + if (input.isEmpty() || arcToolInput.isEmpty()) + return null; + + List arcRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARC); + + for (RecipeARC recipe : arcRecipes) + { + if (recipe.getInput().test(input) && recipe.getTool().test(arcToolInput)) + { + if (recipe.getFluidIngredient() == null) + { + return recipe; + } else if (recipe.getFluidIngredient().test(inputFluid)) + { + return recipe; + } + } + } + +// if (input.isEmpty()) +// return null; +// +// List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR); +// +// for (RecipeBloodAltar recipe : altarRecipes) if (recipe.getInput().test(input)) +// return recipe; + + return null; + } + // @Nullable // public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) // { diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java index 19a600b0..d60f0b13 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -103,6 +103,8 @@ public class Constants public static final String SOUL_FORGE_BURN = "burnTime"; public static final String SOUL_FORGE_CONSUMED = "consumedSouls"; + public static final String ARC_PROGRESS = "progress"; + public static final String ROUTING_MASTER = "master"; public static final String ROUTING_CONNECTION = "connections"; public static final String ROUTING_PRIORITY = "prioritiesPeople"; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java index 632d44ca..73c04fb9 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java +++ b/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java @@ -65,11 +65,28 @@ public abstract class RecipeARC extends BloodMagicRecipe return input; } + @Nonnull + public final Ingredient getTool() + { + return arc_tool; + } + + public final FluidStackIngredient getFluidIngredient() + { + return inputFluid; + } + + public final FluidStack getFluidOutput() + { + return outputFluid; + } + @Override public final NonNullList getIngredients() { NonNullList list = NonNullList.create(); list.add(getInput()); + list.add(getTool()); return list; } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index c08a3baf..84159772 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -136,6 +136,10 @@ public class GeneratorLanguage extends LanguageProvider add("ritual.bloodmagic.altarBuilderRitual", "The Assembly of the High Altar"); add("ritual.bloodmagic.portalRitual", "The Gate of the Fold"); + // Guide + add("guide.bloodmagic.name", "Sanguine Scientiem"); + add("guide.bloodmagic.landing_text", "\"It is my dear hope that by holding this tome in your hands, I may impart the knowledge of the lost art that is Blood Magic\"$(br)$(o)- Magus Arcana$()"); + // Block names addBlock(BloodMagicBlocks.BLANK_RUNE, "Blank Rune"); addBlock(BloodMagicBlocks.SPEED_RUNE, "Speed Rune"); diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java index 13fe2f74..0f6f57b1 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java +++ b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java @@ -23,6 +23,8 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fluids.capability.templates.FluidTank; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.registries.ObjectHolder; +import wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.impl.recipe.RecipeARC; import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; import wayoftime.bloodmagic.util.Constants; import wayoftime.bloodmagic.util.MultiSlotItemHandler; @@ -42,7 +44,7 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic public FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 20); public FluidTank outputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 20); - public int burnTime = 0; + public double currentProgress = 0; public TileAlchemicalReactionChamber(TileEntityType type) { @@ -59,7 +61,7 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic { super.deserialize(tag); - burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); + currentProgress = tag.getDouble(Constants.NBT.ARC_PROGRESS); CompoundNBT inputTankTag = tag.getCompound("inputtank"); inputTank.readFromNBT(inputTankTag); @@ -73,7 +75,7 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic { super.serialize(tag); - tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); + tag.putDouble(Constants.NBT.ARC_PROGRESS, currentProgress); CompoundNBT inputTankTag = new CompoundNBT(); inputTank.writeToNBT(inputTankTag); @@ -165,6 +167,15 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic } } + ItemStack inputStack = this.getStackInSlot(INPUT_SLOT); + ItemStack toolStack = this.getStackInSlot(ARC_TOOL_SLOT); + RecipeARC recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getARC(world, inputStack, toolStack, inputTank.getFluid()); + if (recipe != null && outputSlotHandler.canTransferAllItemsToSlots(recipe.getAllListedOutputs(), true)) + { + // We have enough fluid (if applicable) and the theoretical outputs can fit. + + } + for (int i = 0; i < NUM_OUTPUTS; i++) { this.setInventorySlotContents(OUTPUT_SLOT + i, outputSlotHandler.getStackInSlot(i)); @@ -173,47 +184,72 @@ public class TileAlchemicalReactionChamber extends TileInventory implements ITic // FluidUtil.tryEmptyContainer(container, fluidDestination, maxAmount, player, doDrain) } -// private boolean canCraft(RecipeTartaricForge recipe) -// { -// if (recipe == null) -// return false; -// -// ItemStack currentOutputStack = getStackInSlot(outputSlot); -// if (recipe.getOutput().isEmpty()) -// return false; -// if (currentOutputStack.isEmpty()) -// return true; -// if (!currentOutputStack.isItemEqual(recipe.getOutput())) -// return false; -// int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); -// return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); -// -// } -// -// public void craftItem(RecipeTartaricForge recipe) -// { -// if (this.canCraft(recipe)) -// { -// ItemStack currentOutputStack = getStackInSlot(outputSlot); -// -// List inputList = new ArrayList<>(); -// for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) -// inputList.add(getStackInSlot(i).copy()); -// -// BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); -// MinecraftForge.EVENT_BUS.post(event); -// -// if (currentOutputStack.isEmpty()) -// { -// setInventorySlotContents(outputSlot, event.getOutput()); -// } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) -// { -// currentOutputStack.grow(event.getOutput().getCount()); -// } -// -// consumeInventory(); -// } -// } + private boolean canCraft(RecipeARC recipe, MultiSlotItemHandler outputSlotHandler) + { + if (recipe == null) + return false; + + if (outputSlotHandler.canTransferAllItemsToSlots(recipe.getAllListedOutputs(), true)) + { + FluidStack outputStack = recipe.getFluidOutput(); + return outputStack.isEmpty() ? true + : outputTank.fill(outputStack, FluidAction.SIMULATE) >= outputStack.getAmount(); + } + + return false; + } + + public void craftItem(RecipeARC recipe, MultiSlotItemHandler outputSlotHandler) + { + if (this.canCraft(recipe, outputSlotHandler)) + { + outputSlotHandler.canTransferAllItemsToSlots(recipe.getAllOutputs(world.rand), false); + outputTank.fill(recipe.getFluidOutput().copy(), FluidAction.EXECUTE); + consumeInventory(); + } + } + + public void consumeInventory() + { + ItemStack inputStack = getStackInSlot(INPUT_SLOT); + if (!inputStack.isEmpty()) + { + if (inputStack.getItem().hasContainerItem(inputStack)) + { + setInventorySlotContents(INPUT_SLOT, inputStack.getItem().getContainerItem(inputStack)); + } else + { + inputStack.shrink(1); + if (inputStack.isEmpty()) + { + setInventorySlotContents(INPUT_SLOT, ItemStack.EMPTY); + } + } + } + + ItemStack toolStack = getStackInSlot(ARC_TOOL_SLOT); + if (!toolStack.isEmpty()) + { + if (toolStack.isDamageable()) + { + toolStack.setDamage(toolStack.getDamage() + 1); + if (toolStack.getDamage() >= toolStack.getMaxDamage()) + { + setInventorySlotContents(ARC_TOOL_SLOT, ItemStack.EMPTY); + } + } else if (toolStack.getItem().hasContainerItem(toolStack)) + { + setInventorySlotContents(ARC_TOOL_SLOT, toolStack.getItem().getContainerItem(inputStack)); + } else + { + toolStack.shrink(1); + if (toolStack.isEmpty()) + { + setInventorySlotContents(ARC_TOOL_SLOT, ItemStack.EMPTY); + } + } + } + } @Override public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_) diff --git a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java index b902207e..5125c26f 100644 --- a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java @@ -176,7 +176,6 @@ public class MultiSlotItemHandler implements IItemHandler copyList[slot] = copy; } stack = ItemStack.EMPTY; -// System.out.println("Count: " + stack.getCount() + ", m: " + m); break slots; } else diff --git a/src/main/resources/assets/bloodmagic/images/entries/alchemyarray/divination_array_1.png b/src/main/resources/assets/bloodmagic/images/entries/alchemyarray/divination_array_1.png new file mode 100644 index 0000000000000000000000000000000000000000..d2e4c7c4b92f7bb5548a68fb73d05b8642ae658e GIT binary patch literal 30510 zcmYg%Q0003lK>*N@z&{GSRNEv zUxirpoA?D}@8G2Hgp}fok-8!5cBh5t`ilQ*3q+)#Pp#e>REd3DYS7q-qnYNZgEW97 z7)7LeK#o6NZ=%Q9XS08Jxt(hIPT=|YMD^|mm=EbK{yajYN05iv{2cc+TBxS9O4xMx zFhU#gE!nbZ>NXb^0j7u9%1Gf+c>jP=ZO|d28HFfC_Kz5fzYVn?8MQ)+f<=zTtH&ZT%ZTCj1ig?5*R;h#L@ebeh>c zky||D@tGXpz?U|*wBEUV0W1rPcL)v+&`}uF-kbZIomriq z-o=aCNQS?ia(g)1^njlQ(nwZP3}6lT280Is*WRegFA^U{J{f053wh zNXv^u9l#PGu@Jii{8R-1hyl`K!fGCC7g^>W1dEN&{@!K^s@HY&vQ39u-n|@EErHCP zA-JGr8*y3Y_Wa-yl&A+OF^jvSHCf6iEt%)sWlWMR|gEgv%pnM)a-|8C)dl$ZY%X!cDt2_ALc zbOn)#T}so-NX+?-p`P3-KW*u@=)^~6*nhWG<&iPi$b%`{lk^ZK%vG8(-A$^*Hu&J9 z^Lx|ii=8dwb?xrGujBQ?tk?W68yRYr8VUGnt8{T9I(%?E=0u@Y#OWThOL#R&80%Ju z%_v+7oT!ZT4-MO+L`JfsWxbIKnsTPkJVIu=fZ=rIU<~51lg>$i(AgaB13b*!NAK)0 ztg0Cg)`E+!*3|1@e9y;VmHeBW^A`@lqUo;3Ww(*r*ET98Y3Dh36033*5jhDQtc|+f z#9fA^lLH+Z`KIYhj--MD5YR$?zgf_>VT{NS(X*>YKip^avp#{akVIO_?QgdG@*92k zs1=stcnlfC?5vI66d)i;$t{1%#TVc~cU8Hnes4{I9b#BlTS`uzF`Zb2Cnn;Bw@oV_ zpe1fKXY?s1pa?)NSZP{NA(LM3q1%RmH@8d0Y)yScO15}WJoSzZFQ7gm)C+WG)Q2{@f+f2+N zE#J%L`d-LUe#_o5a`N*v;S8VL!vlIHeugRqyCO>s)I9huXWpedwS2xk(14og^{`ohO4_e}B~+^0r%pYA`tCW7>(dtFl87T1x#EaK=)h!mb4;Bmw7; zJhx-@!~hv*qNCeJwQ;i!WX506&Vj@E{4p=YGAc`kmN!f1DYimr(8BC>djt01Y7E=aze%B2b9^E+;V@kLQVbn^p)<3h8PTE`p(s4ZTeit)?iwJ4G2meI?V$-&UKHp~qgco}d z2n`UbsQ+$siT{9l*&zRCJxwc(Q%|geXeoc1BZAB{x)fv)@o(|hIm-P#&{w8y34hwU zTOIxIgy{;&J#8$PuVre3gWu!>2rG;K!=#cnCY?~%ZZOZDdwXs=?5gYHUeXI|n$jm_ zFNRP1ar~=@M7!0>*d-aH=ZNbZrlRsji=`|Xjv9YXK8+rAsf>=DQ7k?a)BI}u`A->@ zV+O-f1>e1k0f|WQX?1=y9cwpb@U(G^M>sXZ_!|@mzs=Z3XGo(c)lr3-@0c-6gGPLC z_^M;dBLH-(hWeYfyhd)dvhqQ*#TkP8wX8UHi7k++wWVt<7I*nAptM}5KBGiKvQHU< z`0NUeUQbKr{tY@}uygPj{IAhz4<_E>Vmt$dNN*C(R6ycuJtMgT=(xB3n5+3znuJTl ziTwb@#z$TE@^4L1KW98)k#e+9SyqU%{NHE)3pBEfg0nAVGvI&m#cm&na%2XC0r5r$ z3jl&Ik%QRgB+)Y-55Pl^%3*z^m0*5501@Kl)E={pff_w^v|ZW}+)uFV-4@A}oM?SJ z$UAec=t-E!9QZ-o%2w$5=@;1-?HKN+O3R1}3be#VjTEnX7hQm8@~qc=W$}>AM|RC? zCj|IsyzGO8;&d(qF{1$viDkqZ!bJ{A03|T(e{WYsg~6)Q}PZ z1DGKY{lY~pu(`O|7U)FJo7SMoB~iHCCW{Y{Un%g_{~k1}MjzZ@{tFrd`abQ7cu)?#bF^5}qCm?-5af#LsW(``bq!{sQ$|Hr(i;+7895@*p@N@a_S z>}(H@nBgtc5I34w{KJ=Z!%BwO+Ap1=WigSuH?+q&rbcOBDzJUKKypXNXmDjYBbR=v zo2IQVOd7je9z4mh`i2p5(9H*`(rx(6#TDDJwyW0LAo;az*(%#&>f9bN6y^#VQL}`C zqKsp1r;0MbEo+F>1symK(c;hDdW*>aQqn)?(;9Rd;V2i$Fxw0? z)e)mYuC18NwJN8Ofbu=EQ*KukU6k8I%0U9O?0hOT)LQCALV7xK-%~N@zO_VHAAd-$ zUC=bKrg?yl!QshubFq!A(pUv`~ng3N!Uz^Uyq2aiI8^~(q!B{ zbJ}#_+e;)!**9G5<2M8Q|1A;>gIMBcEU83pYn3hbWZxOvA_iU|_8?$qUaF2+qRH3F ze&dT~4waXUl@M3u_$gdpOnKqH;iGhqCfML>xIUb13A-ue;@+yxwOU*EQEph=7O*2BmxOwf5ceulzAN-k7dtc zg3{T32MI=&qQ>ELqS0M{j{UI+5UoQb3pRL7ap%(YZ%KPIP;Y&OPb*dgyOl;v97SEw z@Cpw`u))0lAleo(;#zq^-uzs+Dc)^N?rR+roRPanUC5xLaeKuB_ zV~g^aU*zGmw^yn`uH4P(+dUJ^EgoFZ6^%lPCrMUSAh7y`u#BU@wZuH-VJsD;BaYvD1M6@Ljex2}|o z5sh0$qVXZGX2YQ?qzjI`=AtxWlAm1NKd|PQFW3x3I$;zVc7(x-?b@WI0lFB>Yda$i z5^!qA%QU774Go(#IOw5=?&v9QT~Fgtq7j+V0s*xMyI>dzz7N|kBxx73`1F|=yy1<0 z{`u~xD#_CFN|UKNL9_@DV>CQf5F?s^G+5&B8A^M;&vv8|<93A=8^k4B{SahW@0jX7 ztn!#96f{^?2|k4mS`cvzlM?rX%0d64h9iIol?jEb@tLbT5PSXHvMCD$UlN>j!NjLi zUED|`Y`T>X%053~-6AA$WzUNxBFB~+z(4nn`3F6e{%PO&Yzb(*t^mB)<;n6a=UH^9 zeW>jiE3}GD-sV4`6?npL2MXlu%#qBZKS+XeYYwQY8DDcGqz7-yR6zhTF+*wr<0OsO zrI|S#pN1$-r_P~r2vX(c$T=p>Y=3o~GAKMx^Rro}%vLqZtH!p^_Tp9Y*T5Aw?wlbX z38h7JNX1PlJ^Z$ssj3Bpl?Opc=cY^bn&+y=sbZ2Z^Kw1V-eH&H_r`YBT$$e$s>D%f zM5taw8V}4KD7d@$2b15!Bi#d$la>jEF&MlK5RFEkmSIi>NDYGm7^9LB9tvX~&YAyC zdZ%)-IEHoU4#j6>%ev}ve|o{2K7|TOs$WE%um`cXAJ5h5{%mu@7Smi*hPRyI_9ph! z^ewGmEH3W~+nW#lRc}mq3X^pjmo=QE{LE7EjIM?wsl2GCrp^ih_@`u`=sSa63ZetU zp;}O`9uv4(rkNsST?+FHG(a6;fFn&*m8;=$VcH1b&Kw{3zdq8<9Hg$x)nB6ViNwETi)kN4GX+wB^wd+-sW+VGs&1KOsfqtC$I_J#6bXSvxrA6On>2JAihTh!RzN*m-BOr@}Tw~zCmYg^DUhS7kstBVT3|q_1ESj&?;vO>hCrGZhhYK z%x7J*#?m8-x2a&moC7svoYoIj)!icqAgsB5b)*|G{VwL>Dxv1|+ON-?s(*8O&fGmP zIjFaK&OG^O`<%dj700an#_A2jqb_J`E^a{b~y$5ptf%4^2Y;2V*^6%F6{` z!Shji<7*z66G+g5F?-_-tFG_=6t6w;-@V0Wr$-ax4ydWC2Cl36XS2Ct0$5b)!rdv@ zw(oI=EuZt~J$z=l0$ty?gi}e_23KwPs?J^UR&g$=E2+$eX9rzIu_dmjf;1bx=ad>Hw4N9rc+NfDsMefYfYV^5PZVmHmqABztwR-P~;lq|L>UImc=(Sv4k(ZSM) zvW@d+ttl9x6l@D`nta~+bcj3kGW8NZiEgK@9-o8)Td#;EXGnR_mGO&eUT(M}bGG%K z55+|FhdV}nUI1zY9R;Z2ad&ozXP{jNiRHuMd8UDZj7HTyBOl8NDWk(%?%aDLi`;Cq zZ;QiF+|E?k-@QR~5AIjn=PhN{mH;sk5ARackRcRpQ#=Sls7@eU{)1zDB>@_KI~sK& z$Z&S7e+$fZ5(Ci6dhTJ-p`@AlV(y z%N48fQp6`i#cdwGv-Z+%ruQ$K+r}GVqwr^}QODapA=A>;QPUW{3?R9(?Y$G}E=0GE zFq!2HM?sbT5cz?;ZSZ78!c=<{WbBa_3knrmUnE&|?~V;Nc+kQ@B_Nwz=X!P4w;TMg z(tA2E@`$#%jEo3Kg=B+0v~T`Xr)=*+OtqHL#fKmf^kJ z@P~lj>1o(&7YCVD2T4|RFvR@q@SHT90T|x5-O-o*jtxU8tT-aBPyPBG!1+4~QXIqE zb1%l6ifS#YKc(l5fM}k%07_D}nbobQ(!|u{c5CdX$5W&IY~v^LRn8;0e)qTegzh(8 z8~k9)k77_CFZBR{tRbiM1x7%Er?r0WoG&^xg4*Dee1CTcIcP}4_O*F`m-q(Xli?Aa zZ{WL`PuB6)7eo4)jg2#gFem7Se?QQE<{N7>(+xgjFl<)78TyI~sOi(%6}Pymh}eR# zjy_PEyUW%4i_;{FBtvJTP6dOous)K){QO`YkvE}PJxBTnxKU5Gjk!d6!V}1V1rVm~ zC!S%qOer&Af&Lfv5JHARP;El`*#m#*6$ z))st*CVZXIsXlRL4B{UkK5wOpCAAyepCmC@1ctXE&C00O($V9GOU(MFTW!Z&9!_YY zUUFtvYx=6%n?hb9ga})ZAG?s*Iq$w~i_%nkW^=ir*h~I&3?*>Diehxm80Z`f$q16O z=#(N<7BaHS$t3*`BLpK|{k)bpKlNO=uJY#C;V(GSvk4??z7NvPju(auvgJdM$l~eN zUtx{Cwndvex`0KTL^XrIaeqv#X2UK8ev`=)f&TOq**LO@xavg!u@Sgt>pf8vAxoP7 z#5c3Myk|lp1?8&ifwABHS+nQE(=}86G&!kPm@cKDm^ywf{lh#W;P`2&9yXnsbS_`H zphk{G*x*bgNh~rXJ{EZlz28-`aMa2ZQ-i0Eibb<4=~^Pl`$JE|UUMR*U_8TZ zf648`*;1<6vb20`FS=S^g|3T~ZRtvHWC7*bxzGhKFKpVRMI0R-_Ne}FB-BOfa0GlM5{+YlK|VuE-pIhX`N1&!zCt9-fD?}nbs1_qqWPGId7 z^pkh1XQYdhsbU#?>(?vZ@AwdGEZ=nXfYIlt6!U?+jcm(eiR?BR{Ul{=jQvVcU-k?U znGnxI{eLnI>GFfSbGYL%Cxc?BhKm9si!-${TGfKee7PF+3ieO8dVl3$8y&l;l{ zU7duwh#PyQ!Q(39MHe>0z0Pf#&pCO7D-m>)r_62CH?cdGklDk3JtsXX#XO*?Zee~e z%Y=-|Meb6udI}6@!ya5OC$zGCx!&&D2jIl|o^SmKZh}Cd@|I6UL&5GXEOXJsWrzC( zUXS$+DqhQ6dXN4?-<=hOf5O@M8&C9XCCe&NiXQj)Nayz5svK}6uT`lIpk)`5aqzEF z3$T7<#oPYZ7?9&2)$DVvG|@G`68 zgA0%Q#SmWPw~*tZU&6c&*B;v$s5r0|7OBL7&NHaDB&R4whLN06!&{GKFrB_-_j%qG zyjfiLA9c3>CQe86o#M>N2qGyWKj4J2`X|-xFd`KDcliEiil8O+S&P#Kip0#g-lu|brQplD?nyMh$*TQ- zCtHR!mcd1*`5O2YTaOIg@5l3*R6H`k8}NPJTw@EKAd0k=pm24Px3VyqKyN~Wq6Tu& z){j^a^t-NWAQPqb_;0@B={y}oHh$~f$Z1{gM9AqfMI=<9>R5T1Ufb5goCojUIlE>LLR2yE+E659 zvU)d*nN1()!9|6?xZb;A&I8Thl%WI7;SFUSccVK0#@(p|AYhLY2 z&*xMs!@XegdnGs#ULmz(e5AztYm4s>|2!7c>c?W!-*MZNCsuFXv!bFU#LXE@l?%@9 zFhUvVY%|V~6rgnpfpJXsj?ohtVMAJumZ76x4((S9tK$2d!%Z7W1^F|4VFWt((pp6~ zOuf{PkimqyfC}6{?mnltQ>d%g(w)tvfD;EI>1}okyACymjZ3E~nL3EjYW~GS+>pOVfBTEtP7#c_#d;%gV09i@#BlP<|Muuizs})a z|5wYYebj{@VSk+3q8bXcr!oewAz4pE^mRcQE?B!_!v8w2u5qD7F)@4Pw(bfo=H+$seA{HUt+{6Pf{*Jk)P%y#zJk?5 zqqwR`DrnWe)EaTb&MK;2m_OyYAp}L&;=5=JY#i=Q@$khgS2+zy*x$1dv@>-399LPDI zgObd6YHr`UszH%tskwDZiDv+-@0bN|{aD>uY*MjG(?U_1wwyAATM48T%RaDnn*K%V z72KTijZ!imC_0_L^)p87Fsq1BWnD?09JSX1{?V1fLTCG%5b}vIW?gl794@Cfk0LN^ zjozX_C4P}R19dpKxA}H1^m~)kPXzY}1!FEQugF zZ~Ma}(b!3#Dzy0T3&yt>Sior!n0bZJ8${GqkYI;Gw&6@VOYCV_E9zthFK)=dHH*zJ&vANJG?P~L6!qzBbZ#0%%EwCVKTb*w|13x0%Dq{+Cs|x)!H^Eh+{r& zP==&``14X{fUa}GiA>3me?r(Ur4hJ?&)PLGPM<$B90{EcpP)$V7I{{}&=!>BL*KKQ zYGj})gVn9#XMGlddN7Bf9huNz79Sf>>(;B0?Jwp`p^2(&`lzp#~6O|^h6790F1 z>a94>$#q`_c>&YY`*l-*S^JnOnpF=Km$nuo@BLE;MLnPX4$^9+%b%ZM-QCU!4tDlV zi9OIvRSvPS>`mn%uA}`*GeUuYlD3h*S?8HtC0I!;0BK~=*$APhwa zI#AxV)?(ZySm|WlldBD$Lxz0r0Xo!Wo(vZda_aa4s{cX>{hsVCV`&)H5P^Xi&;qSu z`}3N4bV|YGhihS7Ua)9MYQn{Yu}kwhb@`^Wm5LUeV5=Q?n!uT|m;0rnye@{n{>vw= z)jRaLp9CWA@E(FQm%96lAjL>+r2)+4ob$<|<3w@>=V0&eX#d=bx-cN%8!TtqClYa1 z?#!-RcN&3>vPaMgoai@ab3_U0Nxc(!+fk#dIqrZO-YNw#_1~QY^KXJ7f(NFL@jpSZ zXAjL%h&;k++?mr(FHaUN)#`OUHhR2q7QDIa?7^!2UQ}(YHZXikaF+RHLNE9bF>T*s zt#aE?_AF+Ff5iL^FXpMDf}YsE!J@Gm8?{ZHzBKN#rdh;h=_~AQ-mjw|36>B;nrEi{ zj)--PGNJ(h`gy0tp#R7ZAAzB&JJx*c=);^Lh(!Syr@SFWmowZv#7p6?1u>hO15=Ma zKO$I5lOPL1bf)(jukWPQrhau@>Z7L;QEsJq{kf*|bicf&{zpej`Hz)heRa+tVg|_Z zsYHa8)yDos{^fa5CiMz%U;2UwNbB#uOS2F|1q-k~9sDC>=EZx~xw!DACl{PNO`*H2!AESy^dJ< zgSQim0;i+!|IPwX)#Hc-6!+<3;%+AvG}%U=1N2-KTQz8 z6%BE;xQ$N9x1hfGZoB3jXx*dc>OvwJR0k;p7F(WIlh^Exmv7`JYMX}TR{3G*AH{APGgIyU*&f$L5+aq4veh@&(a;RwP52P4h&oWTtEW9Y#@ZKVZ zu(ezlQyP`^FB6vmyHtXYt)egdhHI`eKLl21_oSrUkP%PhF*LLY1ColDG%`f%8x}(7 zdBz$rQ<)mx*}U8ddai=Bxm;X`uGWaJ)&R+i>T)zX>+@v$gbCy$zozW!Zx4LCjkb5QlGMZz z{HHuJPCZWAW@%>TD%d>Ejf=`bCyUd!v}J@f#hDW&CP>kPRoRC#t}N@zpv4<_LfaT% zAV^b|yu_i=^OQA|Wu_H^q-vUvO$G_UVMUa27Vk9>(JP0~tB(gxH^G0~#le~;n*w=R zuoLmNOGV-k^?ISWd>aq6U=S8c%a*_tQG0yMD|iX^?w7Slbi9QK_v*>~w3G?P(6 z51Gi%sPH_{g29Wt4@kq6gG1z96LRKL!$s|n^@%md$a`pXl>< z7Sf&Xx~n&!T*nB7baeQ%5$VA4VR*x-5$7HG)Uny3A!ckM{!|OBRgKa3Hr1_6p7y{r zUFeEy8FB0i6`pGU<0Cvr)r@dmZDxhh9aQ(e@xVJ-cEwINGJl;~zF7z*$#-};0RdMo zxLyHij!XYLnLo+6N8p0j{~mj&w0MV^jq~q_AWvwZLoF-#pn^-)IkJ7o9>+K#bGHx2 zoYmF?%^6HDXrcPv1YLahl7ev`X)!)|Bbj8gB<{jWv9moz<~hFj2&WCD(0z;P_by;? z@x3a7ga-ZAX*~(*SFY5FwZtJ}~%N%QsrDI3^t~=KyLotHahs-)9V-5@*c^Ec8M-&}?*%5f-o0koA z^@|^rot#15F{b^2o;G|hgm_PW1Cz_X1*gxfkb=@yMv#LT!#APURb#x-SMI!x2#Yo= z?Kgs`55|q}oa^e3#NJ4@=0erG^3sYwaUs8I51_~gDDFlcatw0os~r$Ty%of5D?%;i zGx4eU#HKfPPb9+f=OstSuiTQiC?!%0L4DHoo&qhWi76)hzMrW?j2{9{Ez*CJvbo?K z{aQr?&9mr>(2XuJHp5a_PEt~8OTH-7qaTzM=S+rS3pFZ7#0eqS6k{r!TBvQlyGrn% zE82{!Z!7o_rpRKhM&B>0JgAq5Apdt+FUrhTQ_YM#J$U{l$W;4FT;i?ybjcApRKZTf z=-0A(16xc4=5$k;qs?l2x}k41C8IB~c(QkG8N*ff9l}wiM?B;9EBs+H1-u;5(8i;; zX5GDb7u)CZ2KSrgme%vXzt%TepaBgR*1W&^s|M$(OW=x16!u`$jGG5l*OjEXP{}#} zF`|V`zZTp5avLst7~_q zN>kv8N~AT@cdBIa- zUyq*?eV~XdOGhY*Qh|o|cI~g9Y^ z;v=e@Qk$ONHY@+>RF~a6O>C6kW-C2sn^Uc`OkK_X*vPI}Z<}kw?83N*tKm+@Jaa#O z+O$ZGmj!A&pFHvhO1F?4mwLUvoPJq?-LGuvXN6Ng`zmf@>#e>8HN8*Rz1(pJMzZI% zG1;SM{Rsi-xYiA|OjC?+9$h9@ha+%Mm67gRrZ%&G|K1()W(!02Uc~xEY^DSw|Hic^ zc?t_^OQhgqyOgB+^^A(b-_y^@AB_yVc%@pg@yJl%y(uC+NfLGcai4D0MPXGwnW?E3 zM0xchK+EYX7S!A(Uiz=N)I2g;3ao_wj{w0ibHi|pM89EJLS14<^TYN9Ptyb6jZ%gu z2v7kl)L-6>cFtw0nx|hP=BW7`;6pbQT%VE)C~iv^JO89y0*yanL7pK>~myDFXn=P&A4D{re(`_u}^T6ZnFA&EmbWmX=8jg-Y zo;8ZcBei~Eh2@lltdt;U8`TB!n+-h@nolUX}-erKoxXbAri zNy|lMOh3L1gB7@d@w6GEW~BEi0T1_HTsN#tThN5RnLYiiej_u4`#5XH_&~p_*lY~D zTN70_yN+8hVt}W4^;p)H!*S(|Z0@k)iA{MFhv1rG6`I1n!+=#JkofsIq4{M_nDJ;# zn0^Zn$HAxA!I~Uu_Q5$UgIMQyElH>UE}$y8IeFEot%;*G@mZgpYyU=XBT&~<*B*Na zNiyAnJoz(6oiyF1;GiX+CdU`>!q#D;r$Lm7h_#MLZ~y3%ToNav=#u<2oe@BaP8zN3 z5K&X>HSH}&^aT;axV@(1H>h%Bv1o8qGt6u{K_~F*(=4&Ey{MsZr=f_+c_mdDBigim zONg_tB?tq&&$SqVpCOpkD=u~Wo0(wF%lR`m<0LM5d{ec1q64E^May?&AcUAp-8<8= zpRlm-4EkNMqT2&wr=#1M^(`)OH5?1eA4+`X=8qNCKPnOR0@*PlC)MLBqw&C^4JKe$ zv5CBI7a8==UWBNJFCm+H|1xsl?u;CT7zub4xO27eYOU71wQBvo^e9`it>+o&f_hqL zFl8Z^;61=$QdEa(@2ClnPz2iICV95`o{OjPd|qd8=2Of?&~S77W@~@7#UAJI5h`OU zr(94hs5+%r*RJE@8HaZVGX{fb$6*vxOWPA=b6OWId+%y?yT5o%v(=oT1ouhxlv|Ei z$6b6cHdu+OntrDeqx-0mg0bd%MBys^4jf70+dkxA+C~>){p&P#5y4sPBOi&iY`AOzHg1oB%HVRO}G_jbL?)bbVdR<=^JX#qAeLIdNL%*#v zedZa8`73tgv{|3ZoUMVnb37>QI0@EM*c(e6+^0>{8CKj@vwpF`bf=*6WFevDrV{&u z-)ZTlBwj^DscDxFE7730`1mA8kaX?i9(B~vow;yZ>ZsZWqX5IRRdMTA7tKd18NS1MT{DocWZo}u8gP!y1Vt~V#Q(UN*=gpjH=LqaZ-e7x8HFp=Igt$(BNRDeIY_MKI`Wfe0A{1HoPy)A%-_E zw%^a;6|~f~6&(+rd5VDvWX$jdwTEth3xiEGY_x>@-oJpEc2x9AOxfy=4>o|?xu zD(=eG5o;4#RZo3jvcD_5C3qTBWOu7f(Xr!%3Z>K3!m6YqaD(qw&uQKL=b&b^LLw^PNAtG`w=GLKKWKz@T-! z45(qr{6mV%j1za$A{`h??YLVl>*Alsq% z1?|LpaJyCB-N;1jGKM>{IZq@?>goD*T|@aU7+)K40KfcW@vs%NA9xJFK{nHqqCpU4>l<`ajuGj#uqd)A}M4?I9` zP3T^oh?6sq@w^d)sDLM+1wQN8s!SGztmlLTZPn9&Oayue{_o%rzid858P<1<_OM^H zJOmLSp|K6F(`RpA_KxXbOsgEu2LNjy@h3(yb-|UvV(}pMv3fkb_{Ik7XKiVu z)2@E0BbI+YGe)lin7z-3wa6~<@?*wW90O<8Grb#TRl2-}R%m35>-D-L>g7BSv;BUK zT*1o{kq4QUv*U*-kotKm(DlwBAY$2*Am6dI+dcQvuh_a3E*NLNgo6kf+nGF4BVkZn zEyb#EHe%?VmHSi@UbO)@GH~U$Z79SSuV(0w_>CI89!|MX$S=5SA;r}->mJ!gI-I)UMBc2=5I}!O-W^T;U2spdpD0hu6=eLn5Lyz4_?Rc zBT4Op=a900)klMW1pChKft5d0H)rrRoSiqT;5vv`YbSzsDGan@3N zwzZy5SlXL9{ylYyNGCKhj#D>8P;@wDU|sOTKs3605$1f`75q<;onQlk-p(k60gqw;Ys!n+Dqe1;INdElhw^8e7pOFgYSciiXk~6*%tyFe$Q*}FI&d`JF};P`>mXQ5oZhGkbW?3gt~*Jft+!vo1u5Pw5mwX?xY1TCe+8cFiwsCIo~m}*W{pphW+TDPaZ&gO*7}_tpcHG{ z9SE}K-<0(aZP^8SuNpK#^+Oqs4yQ%FptIX@Pd)!-2dn(9Cc&-;@o_?5Je_WA;XQb*r~ThvJ;vyjS~PNqj_t=iG<@k$wTV(#?g6@~Qymp=7+5;+( z+P@b|LW^%qPT2~)2(Ukvj7psvcy-zZr}2Ftj?pUCeeJAcA#OqABT}MDOFcWT`2rt4 zen??Ff0YqK+>!-%2snE>`=>>&eSyAt4`do1z zI+n|~6n4(^uq|45)ZCbB`OM2wkiX$%v8mX@jOX4B^4>n`tHES9w@TA#zPqU|k+1)>!e)3|=o(^w{={OreML8d#zSVRiHO#%RnZc;!=?7~i0c{gQ z%MQZ;Xs>mo->h6=s*3#*V~zI`S0USq_LD#e+ewySi>B~0_GgJLU>RB3@+P@Gn_Kb& zt74TmwVl#0(wCCcVZDX&Z}$@g^6xy|DDPb#&0-9!53a0Q>2}NvaHD| z*GsOyNe65KTTegMxJjL;_IAItiH7&Bb8}q~%Ec*lR(~lk+R5gMYO&o{|2!6kKVdJ# zm~6Fe6^H)QoZ7Wg_yxUVa>#%jVQS|qzUc@GA_(lg=Hca;ZL3}~^v$?RJZ1IO*?!wW zhN$31U2ujUYH#Nask$iZffX^!@sQQhW;@`JwQWduR;To1`~yhGx`}dYwPIRQ1(+D* zcL-YWZ#UQvZ_W1ipE!VH7=PRES|!eXaxr{0414c5J#U(- zneN-{YdpqjkEK8mw|+fAbunF9a$LM4``=Wg&-|OGYCC*1y*={Re^?1|B`PXWWO2N) z1%|2W3r216)P`Lu5pn2fD@Bw|mLU}-lxS!*In<;I)IlQ`3Xq+|@=yAS#%I=vN*de< zQZB8o@#-STRDk89oTc7@F%jym{ zH+n$kL6g2`b%a9A*BD!#F0+SEA7sb(MdOBLa}Z+qT<5U4jUv)p-1e7c4>83qQ<7@0 z6L@M19Wk4g0|eiV(zsnvsIxiUN|Bm_9Y($Ob_t5n`Fm17#&Mq#1YrJKW3GOm{=S$0 zQFweonwIx(`%>F&@qAI^N*YRy-MW*G0+!`10nWNVW<-8mc7nL4I*GO0^s$R6j$d=k z!mgU3s51aLF3yG_`+b81UNk>K%#6_^Ce-egr@HGM3O&zhKKR|kf7tnfC~X@)6P`>? zLhA=m_X>?{%7aceC=8SiB9c(Gjl$tUX)X!uOEAU``7b*y9^y1bpdl?6eLtfRky0zk zQ0BifvWUHf&La-!yX!w_JP$$sy>U^sz#+FMG|PdQEE(xZC3f>>t=a5O2mp!{5K?B* zehFOW_{*`G6Duf*tF88MggF_ul*joICtUcno71HrXpU=Wz_HTF8He}yLq37?l7|VP z(wu+*%-}G^ej$H|>$!$W$XE*M9B!(u_JJ{O=MU4b z9zI6gtrNfgx2o3Qtl~gnTlg+>?xJ5%o7s9wXrK%#|JxMea5@uw#*Fdtd*|1IDIzJe zK$#`fzgx^&hk0jt((@WZ&bXbi9kwF!A&M+t$62RPds$EbRT-a@_@gD{Gj8PgX<@H! zET>Y?WL4wL=^v#RhhsQs^f^@L*SX7CJx_t|)L2diBkx|8--iALG;u~ef4MC`TYdMi zW*?zT{*8OsU+Nby7C}fUC_sXfwQb1^PgDVO8ba{YY=rA9IHu#3xmZ!y^KxfcQi9#* zI&0^3BK!p_I0<^2`}I(He>EV1VDOsRs)xKzwM|K-zM8upxp3!2ZwRS7ex6+%{+u(V zyZaq2IM0Zf{)1BTyBf`y6_ z$)c{D$@tghEzlN$UAg|wZsXIgMN_NHGj$quI$*g9cGJD znIE7zb-y8e{M=Oo7bDq!W@pjbv(7|5IfRv~UC!U*%$<7`CILrnNswv-^9mGu*fLMOXxbjX?Z z{{i_4oO+si)8DD#24?N=_EP(QNJ%$GM??ZeWi!K7%=T(4I^pF6NSF z|FIos#@FSZ55&`R2lo#}ax1OBY)K|7h#oW6HoGy{%K)+zMlqn~`oJkcB|)?1mXS(C z6a`m=3VW_4pZzd#j|E%6fbP86SI$$MJ9fe={dL`c-6t0viyP-v*?0N;Xgkt>y-(bO zL95i1zy8X8TLHk|}1v0!hgHP0-Ec!pr4r_ZrI=-2dR}$+1jy$1# zOY^Mojce^*f(osxC#ool>+@P=?qRtbivq2(cUM|YJ8bDLZc9_U1z?8R5h(=OghpHX zJScoVNICC{=n!EM5<|Kf)b1YcB3oanu_plrwCHgh$>~gG`fSIc#^$G;4%szSSN@)z zE;7x!(@WVlzx()Syr2MvXv?LmEPE?`$5qvnZD(-F2zOOw_sq>uPNw2-c^#PZ>NV_o zgApdA=??~PxTaZNe`Hn(etcT!J84-!uMjx-041;7{R#v!;(4%W+bAO1CBSB?=ZK{+ zzsV-Vb7<|tVHFx;DkSu2fYh@~YLI_P{=_3>4}YT4@w8y=op zr4TfPJXcz?4Tt-*M-;3(3BuRB{BvZ?pWG#VAI%`WStX0S&J0!2+yl@Cf9I6SM@-US zi(TAAsjJKz*BA@}qxC!rU~l~MO5Er2N`L3Jb=Bu42oA-*;+vXeD{W}+(cZbv35k-% zjVX8hK*C!r3PlijC@MJWheQL7NuDIRx!-y^w!OPnWS3bYU9b@EbgH)m{frHbaCKl3 zWUFQ;&Vnypwa*P$cE>$q^l6(pmajElMzZ{9vVkb4$cDgUWJmMS^@*0Ps+WakKcPYr zLB94I6$fE995g)p*?6^GDe=y8Mo9u}X|)x9CwD#`bk8*+8gz5EDiQ2i@urh28Sbxw zPz2K5rQVhckIvIyq5Xz2S#-IwcJ6(`K>?g+MzRiOJ5B@j9+w&5osh_&A{SfT(F_D$ zbynwmPHn}%id}Oo)3!c*GnCL4i;?F#Gb`5qlv9_k#ABDHi})nKp$ATu#U-ujRKmXX z%kR(il`!_&)!ssblrKrF+FN#6bzc32b&yvAwm0Mm{h+?}?lK~m+AA$guG0!BOjUIK z%OS9;xo7AGs7Ik?vP) zw~zZ5olBq9*m<94Lsn0MPt!O*=G2-sx`jA=CAU8ePwx805>^Rl5KERm94xu^ZHq%` zdxd=xUQtpF$QWuL`;!g24;W;CqV{ie=HF2Sd_n$ zc)A|+wqS>ggTOOIQ$L!LqT@}`ptd}vy;_L1=!}noy&0sRvjiT-Qx9pZ>974=ws~h< zJIkn~?w>KxlQR#FMxTx5@l*Ma=0kkr87Du8x|j~%f$Dk8=r%K;#sHJ#WY!NqeQ)P+ zP>^yC+n}IKK~LuvFr~P_D$CmF#;M~oB;C2txF6(B68+8&w?IdjW7zv<) zRu9lJ*(@77yp*tnA;4KX_TsqGHqjInQpc}Y?Tq8CdUtDBBK{3jmZ+*3@J%!lj{wqIW! zhZ1a)5~&jwtkE48cEG_@T#Q9imywD6GG2XR%F1hq^W%4girq;heG{Q-!wtSS7?#BL zU%=z&CmFoq%wQ#TrrTB;S4`Do&VChsULusm@SaKMkn*JHFn1ZN+XfpqmL44lY%er8 z|5M#JKS$OFdj}h9O*Q;02tlX}}7I;MbU) zS>1f{+0;dArr&|s8xI_m*&y|OjIR2IxLelD-s8fEa z!Q?=@5u9eMVaC@5#%1a|aX%-*E_lmkGyxs%F9ec41jFuH)&Y}|a}=I}#78wBn3a2$ zlEVo@RJ_l}bNNpC`MP+k9^^_}pX{`&hvjirPMk2THO=;M$GG+9!c}zo>O!5GIGuU-nLRzyRaN!ePSz6ngqa~6FLARw z1VhMcEmOgp1*S$c<`e6kaFDaKB$^?@6+ps!t<^NwFM`OYLZRSKlv{YCVfyqZ%XYL` z`gRT3IaleI+h*ip=!IajP-4AX<;lx_gXL!5^Xq2c9~M{Q%nu3!@6T}fLg&gymctep zhSd)?6VR626IhgeITPC}_|YG^M=|@j>2p*>Ac{2{N4`*I-_9Qg_byf zk?Y~BuHM;~-|{3xB}fJ%2H*2k!b6y_s;E5oIeFORqil9 ze||}&CK9`%`YML_MOv8G@9F`xA0jRPh&pHbOVEExnDA-L{#@Ut=Mc1{s?``DdTy?! zq8ss*FUygFajb3R6Kb9;x!V*s>-T1 z?b+GM|G^zGB(QgiHvZvEeyND&-;vlOnT;@B zOoOayAsNi$!Imtw@#ihoAzu}q$vTurIZ0`H>K)&EJN2ingBCeKR`??SHjTs6C|K!e zF>cnDke4Qz{m&hl;A=9;cBhYE7pg5e6P-Ck<-6HJDAgU;8zyA?{TB|w)}p8kQA(UJ z;)%>@d0a>wJBTUw0eVR)vz@MR6pO6?Mo1f4=#sX#!oJL-w`=6Y{>Diun!?%YI<~ZL5Y?DzzyY@)t|CXU#-Pss8yyuW%3WC_6)@f= zvMlf~=abyS;1l{Q^-d$}9zIig_66t`f2yzDm)^mzH!$bEcZ1^w^5dnSIYD}_C-R@c z+n&rs96eJMqeykieXmXa-lCHKL=7fMY4;He((RV%K&eN)+4Py#_RDL}D~ie0;i@(o zr&lB;bvjz!z_E=vIy^`blyfV$j1jpNxqevaaV)o@-}qJnLMK!*;o@LkkHX;ueOh+b z*Nm|=x2shK-M3@TxIqKz)1K0VeAZ4EepI5>`>)H|XTN=O@P7?AfBi1~>K0|^~!Bb17f@5q&kvEkjz4{m?s_Xf`m zF$9=U_mi@w`x1nmEnKJuvTvRME>^qP|BB!J5*#Q+pWGbc-mGvXs$ZWIuOSp(+wpA^ zq)SR_9lGf1+lwFIFtCUb`AR3~oUqYKblr||Zpe^qGrHOTL(Whf6F$W8a#!ydK~nBg^z*X>7f?@|nV$N( zGbxh?2rG4;JySsqrkdU$Ny01Lf6qQE*g^(9kns$buAf6%PCa~d7V@S?@rA7atB~ZG z>E8d2fx6FTY}eEh5uMkOZlt4PpLb8B$Ak+)db%DiTm8yF{tdB67cBqpV*q9f>~W!z zFdAtZ86pPU=mo(A7Briq<$30c=F(tVl(4vrH6a595JDs@q2>|UZ2x?-_Eonm zdYPKLQPc^+IIA37kwg!PNcCGM($zIHR7>3WKGh)b0i_3-131m7^MC!4HN!HgHD)O# z%U=?bX(%vglmCvE+H0aUSF#3(sK6_^ZfHwVopZjM2$)N7k!sku(eHVlWBt( zH`OhiuIjr4eE(WcQ>N!>4Ln(c=@-frVnNHUJ!cW6CiR^a>g{hb4QO9#F zl}IzLPbV+r(F3kSXdbwefmkXk4}*6X%A~_}b5_7)-&f0TS?Q31;YQlKTK!`_edTiD z#9$Aw)I9QK#;bVi#cIIF>Ny{1^;Hx8hnU19tzQ?a`9MKeuTvy_WQolYEz_w`T<-9B z!kqEqmbL}sp}WnlSdn?iN3QXtP*3eoZ#P1D(t~IjPRP>Ku5U{gUrHxl;|?6&8*AwAa;WZ=SB0m zJQi*}pP5c&E(j*9^Dlg;T&dA~1B?V|{-bBpE;2&R zG8xux_Ow6O7v0PxidAY){0MT_A4hO23ah;}i)nam#@PR9qn`&uG@K|%=@6h2uK{Fx z;IMH6At7kLZ-=BLU3Ng%m&laXg@k&MuylTMM2$akS{pc>NTaI;G3f!BHystHrb|a} zM&2y&1b-o3)p(}Gr}s#P=S&GWPJHgS(vwhO)$mpUgpFU@!Kzl`_9MErw#$Lnp6FFC zON7BrB@>%n#1NLLz?<2Oo?EnLht1sP5_!~gT(Xcqe1)(g^LmC>+e|VsN=KWeeHz8r z-P{nj9DTx*X05_I#fDG)S`Uh?h})tXcDYJms=D}J??YD_sf4YSSGQzaG5aO5$|ZeC z(JO8GL$2sY;bOPolb5w0r>pgHs^RA6cOqT1>L-+(4g#vgl9A)v}6Dt5oU zFt6y`(h<$UQ7}daW1mm0Mq{;*|6J4{ZP4oQ!6{%h`zt;f-D2znDj9_jdqatp!`?<7 zak9EdiFr21HX}`2K}TI>w&2uXA&!PHRG)d=-tyE7Q^pyS) z465_Xd7FCxGH(nSZm-IN{`qh4J^0&aIy1XLlAO2IkUNZ)XOwMQ@wt61PO;2F5_fTV zH$zLxON#u8@6zj;niQqqj>*tjf?{m>Bm-8Pvq9~b+`;SAKBoMdSI~rVlKO5pw{D~} z8^!~m1=?8d8J`%ux_;|FdXFAcypS;#W3y>ximcfIp0(@nJVh6J9cyz#j5;)4k|HrN zMt&{3o7lgG(oXAP@RTFUC{4jiu^ZCVocNO`uHEt;90r9&CLzvSCHIt&nKyj3)f1e* z@rJ*w=ftnn)BUwA(e$p%(4_T!{L@wkr}u1x)s#f^kz`{qq@UgMePv#YO;&qT(I0f= zr?+&>#dInd)i79RYWX=!SR?SS$nDCh*_#z|*b*?Jq!6ZN;aWgqkis5=Mr6D+afXJxXUu7`5N z(FPz-d-rY^a3QaRveno!|HgK`3%xFJYS)CSdD42iU3A<0W$9^ZptZ!yApeQL-*LU^ zz|^(;mym31`jpV2?{+!)4P1e#g=b&j+zrUTq0^X4A0pE7}Dw z>RGlI{4c;P@%Xr0X4BiW!ko9yQ5>ltXLM%%C$xg)@ljFWP&+d6prpDT@4DR4eA}QS z_{7GoU+=k%I+b)Lpr`8%+C&2+-DOD{+1G~ky2){(J>HTHU6Rt%D0PIZw9;VaK7@Fv zgkXG)j#GcLK^)IOkUqOU5ZqsK1%T&ZE;fh`?M=K5n=fT%jpoyY9J|Jkjlxb(>hbK( z*F0&q-upJkeWT`abq*i;Qc(0<45qi&x?X0N$+5TVZj+PaL|4mwGx+v`#A;IQ7HiC> z>voRCZ68CKE4UR#Q)hjg@DXXLBj1twycM!$@Hjomslrk7eu~Xyx`-{^ysv)*)t+}Z zogwIXLq)gtPO1lA8IQ#+BV-HN_r1xuV;vPDad%`2CjJ?vHxykKXqZy6rm900kqaqu z!%D?T$lio(OPrx~H9fHx(!DdM*qu>Y?w+`Bcyio4M7z6*!kt>NUB!BtSf>FQ<&(gya5Y#8zH;ebSZt!WY!0`(I#4>w>N9)iI(ZRIr9{oy zegi1rymOdpmiNM&?%HOpTU(b z-e+LO4S%eA|8}h!JAO9TfRBYa-!8JTufuWsR7ywH_B&nuO%huAQeN(U&v}|77;&2H zV6uLx;9Gy+Vg96Gb8CUgDQ-&XUg##vty5}>fec!#;LrC3uLuCqge_$KV=HrstV&s_ ztdm8^1(~me{XDZ43n3gg>BFzpZMvh7ryn0uS)OTi^8t4n9*f}xz&LC%7N><4WD=go zgVvV;UP|gjj<$l8P5=tOTpH%Rq$r~7IASKxz4?~z?Q~eG$iH8*;fx`1g&nr~n8e~X zJYMrrEPii()hqXOhn!R;E!K-A^S5K2+>|?Ykt-wn$;sWZwV!JU+hXwj7UzakTiNoG z4R|)bYlTiL56WKXCa;?-Gih&k3d~%m`M-42{5svBP>Du$-VUQp!^uacPpBXp`ODUN z1=8pU7FW5Sa{fge{(_jZgZrtk5J7YCoO;05#s8lo#eYwFGWV4tgyMueRWD$f}3IYqPFiEepLOh0_xtwNaON8qaNU9lJCSS%7kaKBO^EpQM_y3wfn;=cV~~ zt0X8IT>L+;2$(F@t{t?m^$2(dz^+uh_^lTPY)-QS5(DTzmHO1h-rIja2D97E?|Xhy zsbAlQD-|IGtFIs3p6E}{l&_N-yzR(r+;CKx05(p(5Z)iSrAt|t^&lqHeP3WP{%$SB zdXz-h{k)4QG0CDTJNn#6Get_aDkRu?8<9_?yCs1Mi?(&$*Uk0>xP~#7RJw_@*Rvn& zSC)gLC;QFR#(f*6JD6m|bne1W0T)|d0wk>ie9&`D#+u1mSG|!Iy`4PvHCR~?PjL19 zpu{KTE*5^;yrqyGkD{g9-s(=CGfETcG0mChecp>u_*j?CllVspBk7aL<_&94(Yssd zX1yHSTGNRc7vc$;7oMjAseTEHz%vEqO_r3KC1tOIa&nI!2PCB_DL{&XCa9w6#M2L& zzPJesFxIRb%wb28%K|4^par3U;6fie;m#xQ5^ujhNnmgAY7mQ7FS|&~uIyEf#J&B!pJGKNrM2vk!crh-`99ifx=m z>hN@fnFaB62D}I6ByZXkILCH@h#_*?J!Y)hr>h%|FBI^FH{l+aG;MAcVDl$S zldw-H=lZdlx|-;6P9TJD{o6GB7w(v@@LIdDyyQCpPgf+b^}d~PBaggRh%l>Ayfq8t zbC2qh5x_xC4xnmC@3QCd7>h{g&&VcyqV%4C%>4yR;_}f)U`$GD3?Tp=g+oOx|myj8)HXBI4E(2Lmb#M8DE_A1Sft$B(nth&^;()*1 zT&L6Y{f}9<;0w@lQqO&*6m-X}a`6oF6a-Txj;E{l{#3sda2Cf~YoP0$OxnZ1@<#ibP#_k&BP$*8{R2;43AN(4O# zXR^I&m^0t1`P$l0e8#I4MwB5GajC>-5R1-7$I1%xKRN7;t8m}l{_tU)tiNzrmz3|W zH3fqhX^bEZqxO4hVm1Yv-&e28cj+y%{|@7<(A3~5BJZa1E}dTNFJwxymo<9j5w^}1=|p6 zLTpt=IgI-swtdW-nr5J{n+CxL8jr(#Zk%MGX zILl1S#Ppg%eR>{8N?lA3iuMO_Ua?k;9_k4{GMW3mVhoSE8|$FErb~Id7hP<}O3BMU zX|CdTx8|y5b9x#AeN*|@gcNnG`FeL6j;_K->r=HzHt(dyZ6;Q{4qVvQxCDg(b{Wbn z*8B-MdFVqr4J0(IOu_th?_>~l(|$OB0$4h#!LT?gR;I{x8bPV8qeF&mws4z~EeV-T zoJ#0Y*J=F08DdPWWZ`&Y7d&tg!-&;MA*ych>s2K3Rht9O8 z?(k<*?oM}=v7r1(&g<1r%q^!<#wSF=VPttj>ZDn5!c5@<)Oyix`Yv0& z8lMuknq|&`^AwjwW-jj=0%!4t3nz!hV$rYrWw1r7Y^Sx#e+Ueb?W6-blDB*B{g$o_ z{^rj6M@?&nZ}Y`ChT?6xV0V4Sy~W9tK+V?cNHt6`h06&;AeiFP)A~ z%|$6W|A;quFK}ZB1cGz!x4`X(0odIJ?#7NA<)~RIukPokMO=QF^y>wo3xiEGB6+TU zL8fav;j2!LjGX@ZHA%IE0Bs&;6nd|1gS)UJ)?CP8_yYva^ z9WdM_a#I*wz41y0@&A0t!2SJ6fF-$9QG0?W#BpRPM>Efs&YO+(dF3hC0w%Ln4Ldud zT#{COZ|hE^H`bN^9=xRwmzcX1`0qgR=W~>&ML)@EuLmXtT>SpWc|JM)Zx9{lo-Km@ zT_dRjR}UY`z`3H}Z<9u~*CfLHk-*y~8rL&c46i+Y2Nv5MvlJr1p(+yLSh;wb+3fz@ z<@XHj{O*xm3aX(H0gg4Z$DPUe&+%iMt&y2-d4g-q?#nMi8_!+rIF~>5XmtZzqIPN| zmG;qIpSRll7nKni60299@z|+9GE#=*acVOMD|4GVOx6aG&-}scjga04p#$KS(7=OG zEqqgQI|m{5XZZAnyBTiwT{>&^sCsjXlld5Jv5)>lrT*Q`VjG_DysNEX0I2K}DxfF{ z${^=%Tbi=dyx^SagZEq$NUyK7TPO(6F@lz_XzxyA{f;e7iMH`fzb7aIq&294?PG)3 z7Eqxd%8t&X-XfSryL{FUMqg2B52}t?`nizO*yM-}6+1^EX{nyyIH>9atG?uw^mFAd)RT;(<4NizelraWWsT|ktq%3!?- z|Ciw`3~rpeZ$I)q{XXVNsh0KpNz|D8f@KX^RoH_@Q$>u$Ft`;x6QpO1hmYbBvfTun zL7z!EDdU%OC_n}^vtC^A?P zxOdEc;|Dj3`;6Vt@bHb-mJMN*z)-+c!|UU(lBifXA!>(Z3^0zr!G3BL=Ft;bfnBlO ziCgYBi9SEwnJb64`Q)wZgdC4Po#D@Y-QQ_3rG?)>r9fVmkKR+a8ws~n{@Wf0 z*B?o%7ki9uD|sS6v>H`5_%8z}BWm-=QmDjAx!cpY1l!PGz|EE>*tPny*+*=ob^~WP z`>y$>Tb*79nj%GL@b>TW(BbA#o!hg8yP8eH9~HG~2b!GCM##);`<}?^BtfRP*gUp@ z!G??9ma~n>r|wiH;R< ztQYUc#@q2zKlY(P`nDd1N-f*{sODp`wka0>V8IOEkon9DM$eKW)f&CK5*A%RCToZY zkq7fSu{AGMzbhFnJoD+byKjiPYboW`z;m_AA$_smD@1L+FM)kqc2H4|Z}Tk-Sog9* zupcp8D3%RN$9RxXVnMUks|zkCVs4Lx3Y&)o7qtCXO&$g`<->)iK_2;&n7HAPER5>} zH3ax{s12{hR4sALWyz2cAqqiUXezQ}1@z8#C?dPHQ8;3pP;`uI7LUhg6Xw6Z*&{|h zv3M*-Q+l&?yq|p@ls*B(Nq^1*uLwHJ$vR5)rAS6lbEUd~sLyBCFSe6iDH<0ejahkJ zm&!q}>cQNV+iu9G{7JamK8Sz{{K3-UHQ%nJ4vRCu%~|)hicipSU)ex!she*jfd@M; zxaLEO-#Oo{ghxJ68*Agxw@sTo?Up{24h2<(3k*&9Wv}?|u#+C0l5DtvL5*pnk@o!S z)e*ohnkIQeyT|Rkr5J_7u`w6+l(=jlp4(D%ef08q*byPMt7jdCnn2tO-H#}n3I?;x zgeC|GY`FiP5ny8wAOSC`n9i|&SYhRq?Bp{X#UEYpVMn{svFzyh44XGN%W-eSMC1Bgxq9MWC@vQRc zjmHFM;T?QGXx>takUYd=dX>7IT&M9Q{7>C)CziM>8Em&ZX~OBFwE8@Vp<+KS>WqJW zjxE6Wc6XjQmBgIB(JkQYbZ3U8GOO+@XXE#17VWx|uuGHv7A zJgEbiCP4y}%LX41{mK#DZ}IIu$nm%?{hYrfaSC zaAIGPhZ~8uwXSVKW+F2_ykQ7uhak+TJxD1^8R@zFCBpxSVrkme^^M{nWR)|ps~&@t(DQ)x75B@2-3sIK4O`bfFK zGG9G6W)G!L^ywZDR__k0kj{<3%PFsuSQLkZj5%C6a zNAjZp%)6t3S)%#2^Ix?jE@%)!02ETK1n%TwPPmy8$%IO33r>f_bKlRU^1oBo3X+rP zvfte~{IojZ>dq&$pDI<_z!8Mbnu)j@5$_RL*}$$-(`kv0z~eE}En=_T2GswW_~g7@ z`cXrg27}Ex+U^C6M+ghXs@sZ7!2zdG96car{m|(2D1KG_b(j~MSe+Ky(LE+$hL&L+ zJk|JSe`ehBp!uC6M9Cs~o(|?WR5^0;BWbc#UOf<2@eS1mS6QW|45}CRNrD%3!ONWA z6W+>kJ5|536oZt^miq--iL}I=Ubw)O+Wclo^V^2kcl*JK2*~|JRW?6h&qGsPNdax& zY}6RZ_086taDzVx5xkvrrrtgNHm{osjUvK7zDPC7!adRh%vnsW4eT)oS-#?pnB z^a4-VM3sr<)@$Z+Ng+(SS&`8%%UY?X$`tBN7g(dLBy8OyHPr?bIjIislc$r#4&lSp zA6mJ65xHiD1y+MG+-EBpnyjFYhYrJ3UsiV9w9|bfv+gQ(+%G z?U5N$9IuVpLgIheA9&u#1vn`9$Ds1&I(2L?Oz8fZQ@9$rMM-eA;m#=ZqpAP(U>g;0 zx9h|Gp65kxSkCq{CWX39;hDEzIY8q#9*}7TY@WIL_04cZRbZu+YPTgo)qro>s?e4LhczNiJhvC^La@)1dpesFnhXCtX%YH_D-Yb zRjJvcWeW_C63QPGG!&~@2x&PCWCYA@4}fhrYQTs!N+!+s zaAISbyA~(1GJ30jA4KrrNimIxV!85$<=y3A96Fisfi`N0^8PdXY3}EFmN}Li=2H80d6a~v>`^Chnuy?q?gm|;;BQ@WW1m&Ul z6r5e@knE8+8vaKIQ^2hKT+*7dw(ba{=GOFXF%=fp@!bF@o+2cy(5D0N$}A%*Ej7<^ z`GT`6q>rrzyx6bo0NAgnQcAkL z7u%3MPcyCYB>9IIlPoB!Hj{~2cvn2p%j)4eE6M95=L@B6rPu*#_x)f66h=0VSn-@k z#$?yhUfkUbT{&F3D}mB^N-be61NFDxqVvd)X$OVTo|o;nDy;`~W-qNC=Yz&l?`bsu zQ1*%U=6d)4N>5VLw-DWFb}N|KA)rlpV$|h{t;aCATCYd@>xU;BcIVO!UV-r;16R#z zli32rWP~5$u73$dwox_f`)r}bERj!mBFER*zT2Ro$67bbS}APRdi?~U72Ci@<{^Vi zy2WA~nzYjR@P3?$X8Ubx zRU0l~{zStXG`thc{Ev@>x4n!1M)b`*Ei9w?kLkbCR>5U>8M7Hql@+{ED$EZ(O`doV z6Rmx*wH>RC09GP4IJN?iBX~7j)YtmY9fPfpH|;-^Z9h7_pKtH^XnS*i-$Y9XFC4P>#YQooP4vxpys0HxM zxM*6^TBtkqi|Ldz>}{{6dhLdcSaSm*nmckdRsQ^dNsrqYiq~#U?f6MWU9JD_N>FA2 zd5M2GCEO4XLh=rkYzkd3)i`mhC_rs__X zUl5(yyw$W?A+0zKq{0VxU!}?r;J9(X>>XNjhKcj>RlMhiP-`ejzOE@}AZl}@3zFsMa$VRsveIyT1tS8L< zWc3@)jDV8ndmL}xjz^-UZ;po=iUS=LL&Tc#J?Mi~ofKRU~6YsK4SgvRsVa|{k(KAGk88jd>I(!T{wyef^JM~)sY;fFXrk*p~$ z#DF1K=mf&wLIHhD(nE-jC1(&S>>CM{w%SIN==Pm&7SdLU$%~Nb6O#?&Y~Xp)cC9Ds zrRozcK5^r%XW>i7=0(q5DX0p59X<}9DRv>obF`;ZZM{Lw4N7XjJX%qt+=GU9^CM@l zkajNV-`jjA5vsKdQbCLu%R_%2q?Ik;q1FDQB#A}5hi zB>MCjHHgnb&Feu=!YR&Tb8^}TFT(2FjMD9(QiYqnV!HHO7y+0{iRd>`Y)1&fUO!UV zl()z~YjjNZA*a$~|IonL!^GcoQovkzHO@`7v94Nex8c-%1c=gl8@HL&_~Wz^R$Uet zP_KuDn8w?sns6Aa=qQ_UqmKQRaRnlwyPYsxP$Dr=X_^1+zm_137bMQTUFLd6*(^20 zs{At!=NN_{=|?Eg8hU&*H13()t=%m95B8VoXQZh`3p8c%tHENU5%yk4s^UABnB~8m zCqyth0db2~WApdP!$&{vup!F9zDOB%$JnKI0ZrEM+A=u9qCe=NT_EULqV2-D!gaeL z%xreYo|U4(=&D=F=K)hLB!2md9%~#T=lBFHT;L|;f9<>v2@_mgdN*A7)b*u+E>O;) zTkuvXY|lXX6Iqi4d@ACw9xYL(WlCTaarVR3tYLNp=T zeG^u^mY^0F(8pzLlS3$%0`rsjchkF&(5zh-Zv3I(%5kl3nd?bPOfdx$KI`w_^~|{n z@^?H!_4R7(^66V8?gMm+{!BcZN4;VJKlkqmpCNSGCq_pt#cnkXl+o$CT)&Syejj(z z@sf_Tt0oRKVQj~XR3&I689KGYu!F0#()seHNJe?;*_RW-PHq$(F#XY{+v2_i!9iqv zlf{%3a@LGFZdPRj6<0i~L9H7!VX{JPrk&>c@36v+7Ixk(aH6b46P|WO<&vj?M*&I) z$w;Z3oWsx!exjL)9J-*ro;UaRv+do(ju&M9I4)aunyBd$lml##$on3{Z|QSF91ed;>o_Lh{j9=(ys{IIq7AF z&!HNXI3k7Z5h}1Eh03rZH&+2si}Wdw?GZAv4;9%3%CHcQ3wS?iv1r0~tD@Ac@$4s6 zIu_|tjwv^RkKcxZL(^xX&EcZTFE`fM zR*1d%bOYvBVI#al_tb>wZdyKGD4EYDY*a&qw*w$qiZ!a2yQwZH?B`x~c|u!s5bwZW z8@$zRUu84dhad4kHiL1z@Cc|<1`)3oMlOnAFkg4@@JTx)m|9FktPx~` zN24(B*l}?cu4WH4bjuNP;Zv2n`TZ}Lkk9$(b`3P<@6{c*wf#*N%F|QZw1?GKb*1I2 z=&&Tyt1}vFrmrv`!dAXmT!zFEekrA>VD^XiblfUPSqLIjtPnXs?7yfMD${}w_Z#S1 zA-Xh=`CH@G@YR8S8YAsy)~qF_#dJr)SIyrLXJK@T^AI7yD#+<^<*5@l!wsBYp-^#u za^KjJ#PepWOthkS{Ob%@F2k%#LCv#~Q`Pus1IoS`v&T>cvL6S5Gi;1i0kh#M3k5o8 zy?EXGwg-VJX&xw76&wi9iTZ-Dy| zU|u<=gyP`Cm&XmyeMrXlxK4hy*4o4YG^?gN96L!`5xBD)d#QIBE>BG(=*7!S>Vgkk znLF*7k%)P4n*9XX)~I>Dp@O)!#6*UTKwGGhR>a*mkC@B5(2K3G2W;8GH75Pr{Rd-^Ysy>$V~g6Vo!s~Kfg2x-P~AH5(hTs$WP1)%qcvARs;a846-gEM zMrVzto`=;pdyrNSdczFL<`M+YgLq0BB~W?y=<%E9{zbkdI6Z{smIt(4d{EZEmYB&f z@CVcFtdQl`u)2G>>Xw>Jq{Qi9_EwUr|F|gK)oqDv>#04v4Jfwl=I(b>Oj_-Af_9wE z>b(Q5a#arz8puv0!G~Xkj*9w-@||M zworzAZOHNuH_06j)Hi@uFjM%Bg$T}2aH#&zzBy^UeAc=-7M6(X@qnMC3Lzt@C{Zi+ HE9id!EEX>4Tx04R}tkv&MmKpe$iQ$;D23U*L&$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7h-;5kkMjOg)ia%)oPe-NVP%yC~1{KKJM7Q}QMQd?N82(+!JwgLr1s z(mC%FhgnHdh|h_~4Z0xlBiCh@-#8Z?7I5bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMY5*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMVS;j?z&5&G00006VoOIv0BZpM0L!J1()IuV010qNS#tmY z4#EHc4#EKyC`y0;000McNliruIfo;VjK{4L=hEKWK{P32-|klDOWo&re5CIQd+(}RYrX4TiT&l?uM4CvCi4G882B)3C;xZk zdx!%+`5fnP8iRlUzyQOv^3RD_AdbT1zlA^;cwpI^oFn!j zlILX%aO=f0c)bwQn~QrJSzLqTn#EcP>G>TKthhYpwsebi;|#V_d~a^Lmwz@2;{10w zXQ&Po*AKi1fghpRMxK8!@FMtLnBT|36$ANuLIBg_o&4XGnw76ja*g7Abz6S^{6ZA# z3jnrjfE&fSRi(A*G=20tL9&ek7+YF{nXYRT#+X>wN_Ln5Lkp_;_2XC|^y7S8yk3wT zN`UO&53c(Y!w&p1GXb#N3Y=Oa7l+Qw7Q}Iw3t%Gr$tu@|#=y}-N@2F8nLY|ixa z%g3=mx8>*e6GZ|}#mt2>j*4gPHhuWrLg_^5^&kMZW|C{<3MjqLOjsEh8bfZe-cgKD z5^}d@!L$lNih|;qnIaOK*EaJtYR~pCvZ#)11sX%enwu6!rDo^%B4U9!TdP{J0-jsdr75@k6%*#jUT01Pdtjp%z?yw3Vv4TLa(?rnkB!?l45P7|P@lCf1tJWwM$Lj$ez!-;HspcmlibC|e zom`+AV~b(e2lIc2y^eI?LiD?ZRRcF*)st%^mcNz@xmj(1F`gfspxu$WefmEE)0w@S;rAYA`3%?EV2VAl#>`o0ud|z7D>O;Y5J%(Z1UOs znhcU65eWQ9LJ}N|7r(<915Xu+;TULk0&*X+4v+;fLpUr$ZYD>sl|(A+k6{ zIt)(Lf+3-f9aaGd5yQ(Zc)Ive0B)G+;fqsk9cy3amYE!iRBGZV1mo!eU>smZeh@;h zO}?94GrL{{Z)UQ9cq0o@T`-a>j?T;$#8FfZ`Kt}&7!N?D)*uK#RuuBa$G!)nS}&}> zWux0}<$^mq)q{~L9m6y*FjC3iGo?e5D23wQMi$m!+KJ*Y3sF)*kFGLi^Ij7T}>F@Xo zz?+={Pf0VzI8ZGF)U+H7ELf6ny4UMSTDAhiFeQuCMz7PNg58@-4y^B?J3Cbzw4u>l z$p{hW{6U5W=EgUa->rxdb&JDY8D0RlK9EaSzuSiI^{HaXm6ZWgA`+{^qp&OW^k*Z? zZG0MW6aZjYw{a~@!yqJ>{OYwkr34vcK(FQJhgJ3Y9oHn5TRzi_F(Tw~EQ$lHXraU> zk1|{X!{S5%BwPYZuW1nCPbMK%VUSx<<$gv=AEri}89VT^-wBY!Up!c>M6LAI6O={0Ai!(hO$ zZ0WlJfVj}keqV#`GW+k0E|MU0g!a@#aey6{oTmEN;=(tco**0q;~YWihA_@i9U3iQ zsaq#-Q}(e#KZ1yhdt11CfE+T}YW6z;x-G9D{UnP80j%0@jBp2`q-c8G0NtGE6Bu4l zEv(p}qY;ra6Wv^(maQHk_uG=JXm!BJ4>to6mp~Lzg3%>~l5B5k6K33&gu=885-FJ4 z)K+|JMxRY07`JR}6J=6qSOupdS>Q|w$d;aQhQ^?quXn#Ym;ZL=G8GEfDxw^bt`G?4 z62`ewXbigq(d^I)z^WBiFc%OZz-=3SB7ls*X_>%tDpgdh!lHY<4*c{q#9;st7n{#a zi+nfibs@571LLqNwOokfFf7PO2$+=`Q4C?PKm*(`iSRpa6+E-zECu(mOu9u7B1#Xd z1)d27W8mD#4|8HIK$vS$@MthBPVl zA{NO#$(Fs>@+1qE!2CE)ENkFJxqt}(1EVyYDx;lh-OeKwVVEF`{5lLUcw)YV0Jy`5 ze=p)bWb*jjV&$? zb`&C%2tGAb=g&^(e`AcL7G315eS#hmhlstu>Gn6o`1a%-04MoU91DWNc8Vx~RjniJbr7Tk9^(d3siGIQ zO21$`6%4Q1vy>PVaYW!gH?71k&km;7FRU_Szh<)WmsjrF<1onIPkeT+xC+Igb!zqE@Cbqa+)VymW*F&V5v8#?#yH^%;?PGN z6tLGG8Z8ow0JOJ^7m&Ww!Q_S(%v1q{L7XRxFb3F;QCyWVEMGlLEN=!sk%sPMSgbP3 zvy)vVtjZ)sYrt|$!pO&x(rOI3L=kCxf$UR*<;ge+j81*|lo=mcR3!)?3ZwiwyX-we ze(UMKOiB9!ELd94Q4r&l$8ahp+H+nW;~8Ju%Cg51_!0V@0AWxlkj9XkZzZw#siN{p zB9NIVTO>S;%oD^>oJ2z8$W1566^K(YiIS5Oehh;X0&|B~0L(Cv5rOK9=G8OwdoR?kCuD%?bV&v=4Ud5c>O8>`?NAr@QV?F87Z%b4RT!~!p>E4VZNSNy_~C`s zG}X2=N=sZ30Z~}#5|_ucxt3$m79u{rWmM``juN6UMzlaqTfEe_i? z3VuN#|1HLo)ZgMdHpy<>u@!&>qt$Fb!!Yx|#c@R5k9-fzC>GSJ)wPTn`L{XeK>BYH zMPOigcApS249A7R+#E>+oz6VBEE2vVCjeQhObXUJDe4iWWT9!hs5FLhOBDHDo*=|I zhhw{W-nkG!Yo;iesSY?8UQo+_d1_OK9BLJc`(6Z2vffN0<+9}!u^{2Dz>mnkoeItI z_j&=sFrIITNb(Ki47=<-mamD|3o*5+Sl{-XN8qkphy(!5={cf&WKPrU8AdwQ1$duM0 zmeKklS>V-!&Xm6i2r$9Q5kU#++-fljW8{8KixUM=ZP+9^Xya3}`6a?IPK3o^8utJs zxdW0Xhicu1Tca`mFm)4x=^ko>uJYW1@EmH^Wvx*VrM?%UJ?o_c4QzU9mI$6(HS=F< z&-O_bWSkaE6$p)yI*2fcF}1l}6oZ)oDmAMh2did&Z>G)j#3lfk-O@#Ez}fK?z`9MF z(?j8>Njb?ve(&y|VsmpMXG0e*Z{z~dZTXnmTo6Y|YHBp^MQqn3+Suzwgrst-)Dp;> zC}I#xCt?A=9}y{(g)q?##mOHUs}Xqn)WehHvyI^j^#{2@-XB^}Az`m9^aTK|xjsC} z+Er?{V&SL-i4==n8?;FROmDnPV86U3UN0oq&fS1K#K_5WT9%Qokq}9qf4)Zo7+F#< z_5=J-uq(9u*^t)3FnG#oBwuLFcyOzxL~2q6Ua47xlaT*=hgATd{N9%m%OSJVLV$s# z)o{SzNTrCd35K~X{UnZ?hxcL$g6nXUvm)jzVgZg=3e#}%TTaCUlW;OCJcrzRnUa5- zRFpvy1ST6VaK`fAV+=42lN5&7wzUCP7TGj8G5cFKv`GYEcwv=T zuguEIkU9VDAVODCKC&VbLcpzA1P(Vw+#*dGAO$*LKx?|_+rSKlO1;R=YfklwoO}Tc z3{{A-iNYA|rbkg)LBZt3QMpSo)i08fVu67Xm(=_ByFpP24q9lGA%Scgd_RPcqQ!nc z#L!qZ|95@Jf!{0Erq>S1z65?mh)bDgP?6CNsQ>~$!iqgcaz>SbVZ#$ML?AXl-6ZU^ z93NG)xDtpg*Q5L7u(?$$udK@$X}=#yn;()`@sd>oa1=62PJrn)eUi$$Y_}mm$`#-E z)GXP^#;{B7l^~ODnBS{N505NF&FLQIri#qO;f1w4Wt0J!p6F0txg_yl))#>v=PPBH zl!)Uo0}GiHaZp_bnkkr+6Bln!tZ!lQ$^l3z_{2p}Ly(D;OpAnslHC~71|73oI#{@T zK*{W*2E>qDohXP&1SAUMyed)v@ckIox}M&OBb&*gov93%JNMMO)d+p`|(LvD`h z>Vpnuya=XU<&tbBTH*%j$`1IkL%TTKvwoW154 z#5zb+LkT)yiO_|D+-siG&j7$Azg4feM95{!CWIi05CF!O6vV0!0^{qNMBoWjHW(JI zEJ~r{NTeZ2mJ1DWtptc=T)3i<`^TB$F4mHf1{sV2Gm~Aiuc4gu1Hh7ugkdD5yV?C# zsy2dwh(Ig(*)7|^@PcZ=^8nbicCLg6%EE_E;!a6>Gd{ZUN^8>H`kh zmwCz69TEX}5jL+$4;Ba9ik16&VGySUKB>TYG>w!oM*L^SKs0rtFbr}K!hkNWoRpG< z*0lPi6o+hC0V>U6M#i42gvumUYH+Z#*&UbGCSTQZLyMC zbCOm|velH3s$){5R1y{}Bl?&WClpd$yC@+HW%9FN-^F}Ct?>z4b7u&dDU!@YIsI6@ zOdQ5}FN7$H5e9M5r$9wBY43!rkxJ(0^ZB#D(>jaf^PQH5+MrGD-*(J=@1rnLpxOIw z%}hd>>BpxhI)w1^y--ueJFEhb;jw9OA~118OHu`j__9dd0dfEpHe1c_j)E9M`kP_W zeDF9HKup?-Ap+aO<6w*y@uO*kXX5UXf z&vM4!_X@JI)AY3TT>{|+NHt)>5wytq$T0lPi9ew(%gB-%DLd|W159pc5oIi=O{>ozg>iwV08Dx>tpfcmpuFC_b+{suRAk{2SiTH~fM z@AG%&JhI*_-D8>Im+v78@FouDCz46o${&0rWyiL&~z zO9?Em(2zn1)CV2JqB!K7(PkL4Te`F(u49k`Apkg4+Fdy5gj+-l)G(T5Q=it5tbM;7 z5Oz0?82UZRd~Yq$Bk-dU`j2nEZZO!l>unZ&{k}j zi<4O@LRgA~*pv5Q{o~U_fpIx9llsQ8;%QFzi4@g`oP5t217;?A`5Fg)j15mneH?hg zNid`E%Vjn`;Q`|O-YwfiwQiF=bE_6{`DQ1(#D%h5gYY6w#mot3#*)M<`S;d8HbWvM z2_MAr=dU$va=l(BK+rGJoU0A1s87iDe8!^)b!SijhRMlc3w)_&TqN3ACXk{qMsuo1 z7G7;fEn5~L^u-)qL@UxPmlk(C@xX+_7tq3z(ZzL*e~=YUzeV%R8Dr>52!wMQUXp9| zGm9`cB{$Nr;Z$hHo>&TfF-BwOLQvRh*#?2601%GHMh{QOrQOKaV%*YRp zRdU##pa!9(Tjwd?NJ68@^;nMZq9D$1%j+hnB>N4XD&Opy_D;|h$OJ$w8-RYB7E;JP z@xhXQZ1Sr<=#Y){dLa>}D2icl1|w^_!C4;0$qtH~g#{$}*z)@-Guvr;^za0+#wVCk zk2pi^&!;rl5HZE9wE;(I2*F4=G4CtSB*dg-4KfLybCYR^!!Rhur^J&;3V5W492%>T z@~2MAS1Q&RsgH78lZ4+a+sK<<07)*uT$$r=dVwUDpLO-7<0ojEVzPDF8! z&Q4MX005>_NwlJT^qi`d$KK;eVAGm8sR0AW!sP>~r~TfANb1RRYbk*0AdR0VO&J;S z$K`_(1~E|xro}a%If{i6GE)wY@^7b74547qi(|OLdaFLG%1j z+5w3>bIwp}I0^|B$ld!B;fiRwtJ>k0!1W-O;4ahp0)#;%39LY4q(UHc6vmiXPkStk zF0Ij$UL^w3ne&J+%uaO?_{H!Hw`NkJRXN~ZKin#lZCVCa?Keo2(3I2>$TYdO4mt0W zp&Uk|Cu&N#Z5yy;zkf@QJf~ANNn)6~4sk39;!L<1%00L>ON&U!3)yS?TUGY;K^vn> z3&MA9s)zP$Yv)h^vM-q(+!>lZe84M}&=6 zt#cT}MJAX47Vpv^1fM!7M{U2&m3sKh?`37qatVK+zJyTILPgr_f?CHs=UwOsLr9~j z2+1^`0w{S!p&+>iZk1LSD#kClXTFulK-Nl3&YhM}Nfe2c{onpbgK6`RB7{uf;LO&)s6ShmcB6VAS5d!T4e7ut* z5km?U@9+vh-rV|-OGp>fNG-J}4yX#rR0|&}Bc!-8?4jR{$e}biwKB=j3!3bc!%@Ww z(eM^X2#2uKVWg#Zs!b@F!XL;mQ|lyfw##aoCx+FrNezVsOa^5O)`M5!e-O!JU zmg$`BJYm2@2HIqeKEZ=OhxKzQUlG_M2E^PWN5tRdTffdRBsd2qArDbWxS2 zO#2au`XmHuteq!L60J;9aX7xNNfM8Q5E?JjR}#wxM_dd`;b+G&wd~1xBT+l50;mtV zfDrKdVJ>H82Ej;(Dx~%9N=K?NjM3}(lzF$PA8dGxSl(*GrrCtCKp4iP=bS3cPKD;w z`~8Uc)~3aEBFZ%g(>%AOM}*I*TJ-R#g*J>)1;O+hhCqoz*p7i%?wsRCTBJgD5xBuf z9epAgG_=^6^R(!PY<;svnt43~kSBA^4>eR)oDz&rT{o+ zN$aYuk!Z2d*kGFU1B|b4lfNbN>eyCcFy~CK1ptMHD%4gBYD$SSu@xxI=Cgb;A?GYx zArWOE2xAhKWJvne%NG{PcLbmbxNKpPWGX{(!6+wCTAN|gl0~_DE&!~3WC{aP9*64Y zm9B*}J19!4mlcU=@gl;Mo+-77YGc?TTN`>2vEW>V z?P=AZydIA~FrlP>TiOR#h%2BV-Yq(>M z*Q1uWrsS-vq+=8b0+Y+^s^jYY?o^*r?eJrmG-6UyKHu*K8m#3?1VvQGvtjlv`jWhdoBW6K)ko8V1wDON#auO4zK-Dr_snlnV?i;J<2_ zs&%XQot<%0MOLX-bU{*4lj_?BUPzeyO3gwjMF-+I)_4PzpsNiyWVsECYgvS(lpK0% zvDR##Bo-yvn)E=(WT6lskUk@go6|jVFDjC-4O8oJp$-A@dcoh6RQ3O_3t+HfhF)qx zvyoAlxdlgcS!>|kpDK|6o=KZslxwL(_X|j_%@~^6gAA}_d{teL&9o1u1UT(FjC1U+hk;;=F=?WCyoSWC%WX~>mO70sA7-_xMk1Soarg??hs>A z>Z@fN8c)(`Q6IjcG#3ed+6h|3I!cIz09U3Xw`cq0dDQ$0p(swnV;Y%&vt9kCF0RsT-eK5I^Mh4U{Z=|#& z?{@=|!(mzsUY|0zaV%iTeH#TZDTRlHNJ@Z7OYtDqLX&Dcb#+}B=P)gU?02PZ>K%ua z_3gC-qRcJZR5~gNYP-SEBY#=qed-wrkEiR;wJX=mMs;9#0CrXmU>Ag>Y)c%mKsZdKM+8 zq-1Nlj}d94c@FWFZbYb-@GOEVf7NY)C?FMM43^E|?IfkZIRYT{)aeGOhg{7U|9cry z^>=tlzPEa?10?X{+(3kQ6-@c&{T_l#NU$vRw5USGcaY6nJAeP#>$Amtz&m( zA4I9!pk~x*1zVtNW0>iJ}k= zxXE%xIhh5=G#9iv-6u&!cE!Zf-3G}$8(ghS3?O2Qpc561B&DXxq3P0YMk9;s;1ZPV zcLHpDa*jOHvfYO@`Be|2Q?axVoty~808Ee5;Uj^ka1(E6c zG}h|`WB^PlVXA~svq+6R=RqjdMrsuvgibnc+1SF8U5ASG;jA=ogw8?G@6UD(l8}_S z4)SO+&S_U8#(~I}Nr$BWz=+baZiiI>GvirxUeOm#J%q6r!|%|JzwR*gaXT{}*)+r8 z7+zE*o78D~G!_iN>(X7WG@O#OV@B!&N-d|7h~!jEZ3u{}G}P?1GMFnzE9SG(2@c;{ z&wsX^wdGq+YZlnXa~IG@ahi+gH`Bo^aYQ3C$ryA-Gc#=iLVXN56*<;XR^X?EUHY+Z z(@*jNq|Z22OCy{S>(3{<0bV~$W-D-}p&ePl%Tt6{>RxhHlZ4QklE^K|r#5vkI9k~$ zY6MIbZtGzgy*9p_Af&%Dx}>J@1>JU_HGx!LK|iGR0g*^Lxk|`la8wCNg|XJdKj?>4 zz?C7E0>I*x1H@O*%A{J=R`ILWg4RX(wIwzBjGlWLd(i8M0pM}<}r}SIg zK^4HhM=l|7_woBDw4$Dsd(o0o6}tNUkTh^eti4YTOBlpSvr*|Z*M^)D_Bqxecu1Q* zmeq-?FthImT226ob;s#wX(gFOjU;GXL#%hA^^}mMX>roxyo~XuEyM~ERc(jWZR!nL z=`>uXDJhLdVIVmc$vqmH5U8w~?}ezL5S|6g8feXqBaD0VLJ-TSLytN#lIRshLPK(_ z1j)!9dNUSZ7Va!_Qf=mZTWHVFs8TjEof45d2?>~Oz=p?Xw2c^ESfydH zNS~OyEhwEa<)rhB%}WVD*{5V0M<7sBvJT6zaa>X)a&Ga;-uJ(RVmEF)nL(3TvG0iIt z{g4cGN%$6%Ok)NZHa;~=7I|AmQ#*tLDDvKuPQ5bI+Zc9JKQS-ALlDsU>;huD4!3C; zv<$Oq(r&E)rZ%<jvheOy3b5>h=|%%Q|mlzyOabh3&kZ9Zm6&)?XalQRt2s()x-4W z4heao#OD^VK-U{b6nAjxTWJ5}lCYx|+0onI9I7)@Ds>B;W|7_;cu~>< zOgfjAn@n%|d$KtHe|@o&-tbION+z?U)KVy|uhoM!Urs#zOst^<)20bQcEw8CH%kZB zty;7ja2R89eT#M(GMED8(is7wgdILfi%7=cr zLx%#)(2r0XaIkPigY@d(_|zOJx?qfapme14%@ZnZaI8Ja3f z!rCTRkqzC9Jw&mO=N<9}9Ch~b*mdO|cxug)c<3*G#>?J(B!(7LvFnlpanRn!V6R>G z$A91ZJ?yvZ(GViWs%3lN2X}oDW5bIvKD7?VAASayF!1ZY+=Q{QF$~t0VEvW{VHqyI z|KFd)!TTSEXYPLxK6m+d@ZvY^4X3g~+ZR^Crx4di=mSZ{mNzi5wxva0)CiMlDvdrk zBeNhfWlD`qgg7$i<)?N?5^#7?jU2XqH`M$y(_&k#q?0u$3AvP%RA#@O{T?^;EVGQ2 zmX*?sQW=+&6;oUu&L)ib|E%$8 zGD~4V$-(G@^#^hOnU`V3(p^xk)Nucw@55JaI3Eu^^(%-t#?Z(J&U?j2aQA(;;fb}6 zAP9X3!N3H^rp+5+2pfKzVItgw6^r)7Ly!Fdon8w^KlA0-II#wguYDZvKkv&p|D!KK zwc5bdH@qEh=U3r?y${A&r(KL&fBscE5!>fU>yRL1;_}e! z(3Ub(#Os$KRwPACJA(okT2Mvcg$O*5Fiq0aP3{v|!t5)3?=72`gz;$hA7czo)dFV} zI;#Yb*9#H!>F$^&*ZjY>5-TqAqlXt(F(5PEF|gsu*+P&Qu;GbWP55dJhoAxxi_(!{ zs+6h?MF42iZ+e|T>uA*PhFZLQbV;qGR>IN_f3Ky7A{k@o2h(`@b3TNsTgQ>lJPwaM z_AvhQuG{gMo6f>3pL->aKkA>+k7n@Xx`z^liwOJdb`ZY%<7@HaW8Vman~1}NM0?KR zCt$<)Q`j{77&cF>K^TVkmy_RvFW+(r5Suu7pX2a}>n_HT`<#kDJ^52GL*U*&{|X1} zeK4w(D(Zs{>0MB^T~QcoE|p<0cs*rIT9tLDU=$S8(F?4Z-7VGY|eC+^RwoPKoA{N?bI7db65 z;m``Kn|Ktrd}7quFfYJy)KIUe8ChZsVta_#)1H>AC6T zBt3^B3S+IWq3Y9Ht_edqN4-`6bHvaLgjQi0Qxs*{x&q(^OGm4V{GNmm+gB{MBe(#B zoGM8w3DrqFu_$KLNw92t1}Uh1_PmjV?IOh4Hl;xbftm3x5qirul2K8RXZO*=83wU7 z1z9i7DKBO!TZc$XFk;~9Kn_;M=<7p5)!%0ZLp4p1iQ^Eb9DN>+Joq_Sv1Ap#cEfe} z<%2&!%iD~F?g2RN@RRVpA5S5QBV2afsTgVO4=~`+eNMouPkjRh2Z!;kJFdZkCBt}R z({IuCXD~gp83UC?xcwL3!lDJsFw$6rzdZgRmM&g__)!n<{FiHR;4==v{SW>Tmwx6P zyyS$lvHxC&;p*$(g?=!XWC!*Ix-AcpGDVql2E$fS07qSc;I?CGnR%)po0fs0F;_Dr zTQ;>dH-m%(S>jTta~x)OhA^Od$ho0R&E-r>vo#Ek6?+bsl(*7r$Be?IIjIOT*_!uLI_S^pGX^R9i-sO$j-h6DF_E>3yg z8F=$0N8*g8HXw=u9CP@IIQK&@Mi}<6+rGrVmfwcO5%ra-!CnBz7obre#J6s}4o_@+ z5bGu$!Y42K1-^CbXV7kSapJKr#>Jm_Grn-yAFycALUg=2-1pEglQLh!!dGtkBo+;= z#%o{lRvdBIv*x`XXAIYU=i_)d{2f~DnKW7w;}`e*9Me;?__u#Q8w1saSg~mLq?Npz zqyb0iuo25ONNtBq2Fr>)j$;@y@uUn|?f1jdfva0KwKXGChRBxf*3kZ@mc^H$;T>85 zlnwH5YnIOJcLEK186`dJ)fhJC3=yYR!LFE;pi8Z)T7}0A1|~Q20Kh#)@?>q-)Ciq^ zFVK8BH6|}ad5W|8+;)jIDN}r9iY_VJExH0#YF6o*X2oz zdlH}i`sKLu!K?9}SKkZ~F+9EYG0Ze4aq9EVgdg~*R2;0{eP6VDEnINnvEaQ_*gruCfnWXpPTc>%AN6^DJP9=%chm{E@QokE#))-!WX=7!`BzuKG+cOm z4PJEEYw=3=bzqF)V_!NCZp}s~9LL<;EWZ1*kD_8P0AmbeOX{@qSq!XuY>GVRbQJ3y ze&!jlD3lIP5ic=fOhttr29%0c#w^;pd}pWzl!rJbaGiGVRpG4P57BK=Xk4jV+GeR0 zX_@OFPZMPt&_`elr5S{)sZvM$P@%C4I6)!yg#Rvi)e&FNwJ8!}bKe+}%2(NA7a;CcE>4iT@A+^#@O&On1+GrnVA%R`#Aa7vv9}(M_}3F z<+$;-|G>9z`8u9l`zZeK*lidc8v&CDiQ$D+%uIBZ#;qx@)7^seE$iRc2Dbq)EL*-C{`K@vW9`N#alk$YV{&>NxBm3IaGg4M+Cjwchg9hU7#Mc7 zoDtLHTBhFgc&DUWm7$&6+JHk91Ayihnvga-*`;J4kj|#ui4;HvLoM6Th^i>k9eoul zTebniWLhWJ#C@al2GuFQmSgBd+dKka+G0!fBN-#mEedsV&#hS)T|#>Y&Wv}o-yc=_ z3j)CS({tM27Ofm8vE=$N3w13UL#~E8#+I6z`>^@xIc(bSILph;%o=-#`irBpL+i-7#J9Z!7X%yEeQHu9Ch%^G29r#i%)n3HcxIutJTB{&e|1K zXQ6bj4rV6%+e9&OB&5nofp=YT1`gTp1bpa%tI=t80oKD&`@a-N9C{RP|HXH(&u$0e zns0p&uQ};$_|>28fML){zUp>bwtf~kXWD(#2OX`lj~mM8m>k+G6d2=-xLEy8P}=dC z@ttR+l$mKybs>6f-5)J0;msO|$Y;LS_Q~QWi>f2r)=XdP|F>{?gZRc_5bMn=((zI9 zMj0mGF01{2!>{{C3`)fw#O+^s61L;uT^~3X_dj+ws?H+vnS=Ix0Umzhk1)6i1_sA! z;NLI!J_hPT*fg;o*L?F5Ji6i6h$9f;|65*3D=oQkrwN{-hLewe3;y}|({TCc-i5#3 z@hhBr`W5)z&%T5p?4#3dq21r2MSh@E+PXCh-Ih-jal7fE(y+IkXHi1@20pDCWZ5+o z{>LzRIhnjOxd3IbSp6Gg2?MMyo+{XJNx?;#D-ngUCj4c@nD`&YW7Pq>JW`;bld?ls zHhfY|-eLbp`j}J+=?6`m_53UF%)Jl8t#^DMpT6mA)SQJdZ5OVy0AX0b<%ie&0uQaf z9Y^kWI$m(>X;`*!C0wV9R=bHc8y>^G5B+y?UuiwP)~db4>ZyoL2!O@erv+NQr}3hH zIvqj?Joo4q;w>LN28=Ph{|(ymuK9;SNy}$-lyxiw*8X*x z){&ST3zpH)QER$~O-dt8x2iYxWB}Zf>AEV>=1=zE2R@#$>oGX>1+T*5g-h|)555d- zZ!^Ai#iJN(45HO(;r*XH8?AOT-Kzix?Rf&uKI5$z92ml9zI-K)d-e;kYQ?Vbd=E>< zR$+Fs1D0xPyJBieR?Yp$5F72WAP_-dbZ{jMX5fS8eGdP1_m6Psfk)!!9`P0v_WNZb7D!X8=HH$m{^i@>r4K1lEjP(i2j4|2(1i zD(H0sa%MA^kZZ_s=S2Z#w;gB-VA09}&8KQj_q7AtZTV==c$)H1UuAJv%Qm-*?DKkI z2@x5VA__gkvF$_-QBsoDZTebQnc>k&Y1=Aoh>6(V?mv1XQ7>rYlNa5J70XuQ+c$p$ zANkx{Vc0;$ZQ#PIUJA=}5QHA0(1Z{%s?IPz`pz$6(ZVIT>DK?i^|xP!;rgyP;W;nD zxtF{IAA0*2Ff=d%!!Su_+`rw05m>%pU!41z_u{&5U4`knaa{bV*Wu8;{uuz!?5@ZA zUUxm3?Ky0idK8 z)|81;9bao-R~>M)ZbV5X>dt@wN~Y6jVXTrykC`QA+uYQ0IK8zAz5lyj+fDAMW6S?m z7%v^(eB8BiX?YB`AGYz*EBDz)44+jXQt$eKaZy!5PDx zKZRosd?}uF&@ouCau@ve-n;PaPhJHkEbO=Xxp?C%&c}N`aVjd+5#0ErFXEh6y%!a? z3O`H^xNYkQU_Oo2^Jj4CG4B8~VjQ^7k$A_)UIfP+0suI66^sMplbi5{ldr@d9=aQY z^#xeH^dS7?_n*fbPJ1_g`0MMySuuZrly;}cQ@yfb71@>9Io!OasVR}61r;q(M;on{ z8YvkqM3KP6`lc4Xttyk4wQ5&Ajb4K9r_rCv6e$`yJqRo#t5V)vzoOPHpKgZDWa zmwomvaI8A^-}QLB`OFLOnHw&_+PfY^5Oy%OcnAin_}A0U$7gPQ4;C*?+IMYfuY+N5 z)COD_sSs3361#*DBm`%03yxLCXD+xEH{SM5Jo@zgxb3d5p;{Rs{TZtO)j%r0)heo$ z8h-u2j}gTo){NhP)k}`R`_KLsKL72HAr65!&->8FqsNiZpm(Ka>3t#oA+5iiMDWfO z`;%qSRpP9jIS=hwPxBA8X{)?szO{hXW~;1$MyVwh0%4?g&Mli8sCLpZEnUF6Egw3% z5!=PkmvyQMN`{&+hNQ^^uyr@6v80vN8xw({RVG&{~0)7pF^?B($%>0 z_cvnYqW$nM?|C-j*h460@t!lkgM$t@6c0V}0M5E(e+&;U&wqTVwj3`#?i^hH%`@Sc zMOZR4<}ffYh|$62*f9BMV%0kV8bd~@KzLyjrylcmJi6w79C!GOaOQgtLDgOi#*)(F zI2O5e?)g)=;Ef-|cklQr9IJ}AzWQRk@v);^~R|^C$t3Omk8b!??*12Gj-f zxuC`O-;0RQx0^nO#wy!Ht~)dWkehGho5a|5 z!S%APJ8{Vf4uqQk03ZNKL_t)@=xhf3b}8Wh14{XSdXwjyXd|zoW7YAAfBP;*hDUMv zH6OrV*WQOq&;JZAy6Q~a^T2iFbVXRp@!M00t4& z63aQ#Sb^7{{C-?{{hMH-PPmXLj!~~RFkD}hD}bDSD0T@e7d#UfG4R?`-inJq{W=H{ z;j#7iqETHo?|LmCI~cRg8T{bRFT!#KHjbZ#PJbO>Vd?iCrDAE{PQp1>%>*0G5W+%Hl7XrwjyAY`* zRfOH^2Z*-NzWmjOttY$0BAN24_`qsiKj%!#?qZCgQ8L-JJ?Cj{pURYn*AG#aA!?Uo zh^g02Mt{Wwop8fS`hm&rO(e8K$hki8Cl2+)));nkf3+7(;qtfLhz%RpLl|r75~9Gg~%+I2j;nY?A~OLeJ$_C({<|5S5~q?Ma^ofTbgQ zA-@s}Df0-^DB5 zeIUjbEQV!Nh!S44cz?X{l^5WGD^EhzUQm8*CSaLVS%*;%D;FM$1NS-#M?CXrTzcI( z=m&FXPWy%Mr@u8j+0$V$XQ)`ic*b4_;rbtb0*gmi;#J4L8h79GQ!HP)5?}k=l}Q(& zNNC8hQnR$taFgp>Sg^dI31Yc3za1`}(1(t=6;m68(w_CS9sr5!2VmzJ4qUhZWiY?2 z(8aA<{}60;YkH`!tn5-H-2PvD={XDYJhL@`_nq@en5Kb?KJhy2vFuQs^z8ldr5is6 z({RwJEXR93{#pzTjpC~x{tX=4!G%}64qKXQP_c(fENOr@zve<*a?M)`;V)4D2DkCk zyMBZdk9`sT@aT^)QeT0$z4lUkrCZ#+FTOtzDDt7+O~!uNUgc zI$;bEmz2f&5ly-iKx3F|lWe@S-kVqkTW`}9^doID4r3*)x&d%CdLRS>t`Jj3(zB4x z14x`#whct#R!xXWfjCaATo87!Z0s4h=6&D5fBy0o-2BUr!?6eO!eif!wHuzu%TfEm z6yE-d&%tqR-1WO3;RnCD3XVO9p|M)NX2rckIOXWK;em($h<0z5WFD5yZ0z?uJhkRY zoc!!JVfm6>@a`*Lghp*SCbq24b}D~vwb5qaMcBNC);}D!@AEJ+G=|&$^Conf5#D?C zEAfgGFT^8{KZJ?dCyK$GU?rp}Lrs}InKkiH1(tJ$xQr4~QD&qMN@>pYF`x{csSmoC znd}l};d^0er9C7}KWUWd5;L;y0BY02Qtej#acU zoQMT{FVZ$aoidvpAk|87lWQAm**ePb`+=q?xWP#dd8Po$xQDWNByl=vnKKg~e#bYl z`>uQ7wmZLrpa1E4xb`Rx-RlH=@ssnzx*Jy3tFcnEXvLwBrWq?ypm1kV01&{?f~uBFJw4tnhqQ_-CPX?MlWp65 zn18l6G!6cDYhVF12DfjfTUq3xQn&u@#f+jD{Z5GE4}UpM{pVLA3>R!?ltk#KYV5W zdx(9!`UMvu6kWujft!Ey9h`jPX=rxWqGFHzO%a!44tg0D4X(hS9{U+MGvEbtIQW3W z@QvF)3dTA1Savv0Jo+X0z_qUiL*?&Yw|*zkrcyfTx(>mDNVD>WnGk8J0#O@mh}3;BOkabZ z>UW)rsm1>pV{oe$M2Qt{`sUHlpebTs-{v?-K^Q*(}YGU}lJy z9QzgoUW}W6`bAAq36XTxJ>l?I;>d%K!_9Yo9&0u|1jaaQqk=T3jcROY&EC zNCnWE>0^4LQ?hslf##N#bW#OqffTwyG%9wc}fT>MwOm9|5vx=pC-!S!2 zPlm}$Ep|uK=s+Cl^#k3uuc4XIr9wM&Q=2XIU3LLcO^YFGeT!{C7;#@SlTX50q zzlpEkb_FIUC-Bna--v6!`(8L^0~f#XI{fB$zr?whoI;Xi<}>~;Irc5+_B*)s7hfQs zXJBYl7hs>=4#LW%tMR~Je~){q?CpqYSul+YxR0Xh;lR}=;swt+ z4SwL^%isGLes%w?a4S_UH93g9bkhpox8Ds>AEX(T>F(mh!(WSCSMG^VfBSscW&?%^ zJpYI@vHLE2;v-*t4Xir`P_@UfYT0W1?%|*0il#N&$Iw_snYUQJUS+X%QBp*eC;&BT zz@X~#yr4@d>5d~kYqZSWVLTy0qfnqWV5fv6OG}n_k|=;I=w-sD`e^fNV=vP3_viKf zN-F)>JY<{J3!lwP0hCxgRysjfZRwr0;MQgh8cg?_MRGtJl`(ws;{U+C_uqrh-}phe zH4~<3;m#x4^mn{8>IkEFwJj;4{(f zxA23zz6gLLi~=0E$MHDr`L973h4}2ZFGZ_64gmqnaxhd|f>q1+l(<}mKm6r37>0@S zUh!Fc`R0%0Yd5)(juaP&aQJ@D$8M|k#FuZm6t(J5dOtP}-2V`K?c5Y@&o5#YJ$o~FBvlCxCSXx4U&bhH`$h4!4DUlPZ9&B^rUb~?(QD(|xJ zcBRDaZ44*HMT|@o-totSnWKwoI%F6|r39RsnU%2Z`r?`<*QV?SeniGT%Z$4!@Qz#F zn~;z)tblS_8?zwRYW^+TfT4`^a;lb=lOTl9XTpmlCavC2bE=0{dm3N3>__;;Z~q&g z`qtYpSYM36(ZULT`>qdT>9YNB(d(|p=f8e6UiZDDVW-J9WsOb&VCimy5CS;y;5VSt zZ{ZgYU61BW2ZPmxxa1w5z@Hy}0M~u5wz9e90<&?xuIcHtQ*R=;Goxeib+W`lEy4&D947r|N$I9jqa6KcjG2(7_Depg$##!nrms~aoyEyCQ_u*NG zJqIs)+uk_qR+c@|c&xXMbY?@e)1!6HCZ$5_6 zkuj`Y{}i@NP2%`tpAR7f8nvN$t{3CEhn|6h_B$L`edC>|*6R7+&pGX5xZ#J_;eb7k zz=Mz9gR@?G9zJmGYhfAH^2218`26z_s-^MwlC`c4I9f|M*#OArv9xQj&?8UXmXCoE zx701%p6OOQtP2nevE2g1wkIy0zGk;<--sn%BK&1O+t!39=;<>B|0hE_3=FS7=_5FB z-^20Ni(i4)zUU(u7_8y*-?$ntI`%a%T?4;)_%NNdsZF@z8*jqo#<}f_hl}J2 z=bm~c)@^84P(#U_QlWc z`2qg?_}ysD^zpuPK8tIw{|KgA>(K3Wankc&qNRE#)qODz+3Q3sU$P2Uef^!eKQBbm zi*VPKdtl2?HsHs2qz6pbx}K$!PoE2M99NxiiDOPN)uHf%kw z|9`c2-BD5$-S<|fiJKD{L?o!lPen0jOqdg*hzUW-f`K4e34#d(6%kCIqL?s)m;>g3 z;X{xp88%Ly>F)ad(KGALbXD)pEb9lmeb1SrhuKNpRj=N=@4frL8pufF3a_b6N-8r{ zp$w%RQ)y@Q41^T^BCMLyeMT1>1pz@IvK@mje;i#p9D!RW^g=;i2|6EgC;;HduHEtW z7Ynd+&+mA4+JCWa`!?MD;3dd%wP4OeRAb4Sh&t5}2ye!u^FPC`-MjGne}BiU#e?CL zazR`>FzVW8;cQ`?Ocw+r<+$g@x3GTGT0HpdP`H$QXsQl}n1_Sf9*jW12Q3Da zmhFWg2#_5DiduN97dWL9M>M+_9oluo%teFYlyd-Rh=x@(%kO}jE*SP7BqPPuvhYxhAG{KeJUto9zgmjk zy>7)TA3TPSzj+gDxBh@|)Q|Iy?~mRWUXMZd^oBoF2CuUP*DWH|gr$x)C5NLRrx`{L zoPgV>UyV?t0y@=@<8FlxEsw;Y>)yd*&(6Z1e}9i~vGy^ z0|0WfN-%5mGq`?a&+2<42m%(oJPSQfya=M;fT~4|v|h`T(4lol%z1uXeDfP7jhRmkf-|Mrs9lSW7(Mf5NRonM4?hddidtgk!a>N+Dl~1By2fS>mt-0zmktq= zQ{Xg6WKu^ifx$Vj$Vhj#ViGHr6u~sozDa}ttT;K!=(A6_Uo2*pbuU?Nout$~CKn}E zm!bw;rFF6s4z~M>3ur4J`v-F%)n#M&&HZ9tDtKHKdoH}Ro8IJ zQ5WI$51+y1rwu`m|2qk{O}rSDRb@#FE#ZPDjA<~s7uTLM9?gndz#+SE*ZtRE^evBK z%G{v{MJfTskIPTL1E=;l8{_BPf>5La4%sLX9(mntc-&r0nAaB$DaUwUYJ@$f9(e^? zHE)aQj}M0^8pB)9IsQ8M{XTs0#TOXbcLIoRNP>U!$1+e5douAMspLeQ>ldpz~VG|Zc@3@6bzfqm#9< zDJGX4qN&|Bk%3@(8;qhNs+&&^HD)dj;oU#hcdhxi;aCNZKkPD$A2kE>7d?P3ha84r z*oR-&eS*B~Vz`~zh=eKT-t#)%{qQw>@ZEC|hy*P~NkY{O$*P+#pMb*r5@?!=%Z4^b zo~J7+ecLg8XP4Juv;rTj7**Ei*h$w^`tW#rGJ+WrC^qLXEN0ZmHrOy!RDlp~h^An%N|FrJ)+r zOa(}?Lqs^3JffabTF17v#*_u9L+qZ2_3H|gB~RFbI(DO(D!bxHRgg)bRD0!z#f+&e5*Ise5s$7i%v&uTAuN$QS z&|>u?LSn2=Fbd=qv$f)4wG@yT;fS%p6Pb%tcypbmQzKPsJi%A64B3vYd-3G7l~})V z9qxVN8az7T6a4qDU$ANCuc-2uW7Cec*jD-{9-p!dOI~{xuYB|fB+*&D%3K~9F)e@x z?s^N~{PH2b`|S(NUwSv90U?R3>(H`0epvGfdY*9s`d>K`b6=bQ5+XVbm3; zk3ulw!&_fG4gqEjMj{dvfH4AP=L+1OSxFi&` zaGO4V`-Tc;*ItW*a?Itz49W3WlpmgulmQol&@@_tCAU{Gi73XRnkk+)tfj=X?yTN{ z)VL~vvYmd$#V1f)>}H`-OPPc3#BBNo|RDzr+!A(6$c5U(D=1V8T=l5aK zyi0NAS(9ruI!}APREzJ@8fea9)oA z5JZ9%-#r6S7NDsi#55J6pv1>;1FebBwzkmV}I-Pb*i`D0gN@w6{6;IgU4X{u!7rprg* zkr(eungei7_nQ$`gLw0^r%a!}bMIyxen=1KG>Y?%y9F^d3Mxj?z4N)IO27uIgdz1= zQS3LNl$v;mgmFp=IpdFTAX+`XE%`xB4_8(bXa-{aqrW_C9^5Lj%XC=+8k8C-B9>$p z+uD-)+8gGHl^}PB#al+yDoh#hGPZBujy_{f!lH>E;FY(Y$FJ)@#_)dkW9`O2FtGPH zJ5;$SblIqqr$6p2;g{9{HS;@9x;PcLKOWs^ZE#e1K>f-nDAfamYs0FT>?qMUZP z?&4t>Gv{&?6f`r2cB(qAICD63RmXd)p2pDLv+?ME#v>g4r+DYHAK$Cdm?j-g|5{7*fwamVjC?(kkHDQb=ZV=h2mRtFr~=4cF=vK-I7Hyb-6 zKj77`zCux32}NkbltI%q9j%MHV)9+HQC41xA@^PkPnLqJy-`$^8Vjx{yB#JBc^dD2 z_&U6rBR6L>{B%oGArwPa&nnv)ulWA zoKQey@=ZD;ZO5v}b1>w;0L1G;XbPDqnhXG?Y#l+_A%X;&paDoF$rPu^yuf9o_%)SYfYSp5ZpcGCe8+|Vvg4s__z@WaP@%q~@VfA0182R^v zYu}?kKKW_|iVK@#{M>&3lwimI<5IF9i3*1Goq}mk+@7@g!?6lX8@>dga1gJ&_Y6)v z`b5}i2z`2HxbEXAznZ^Y?G--tI? z&8^;avtGIh*Y~^+Ii3P6|L9%JoBSqTTJ{V+|LJvzf`a^#f;x5gb!dJpM%{QH=07_d zU;Oe)bzx6U<8VvwJFsW(E?jfrKn$O89@K!d#^$H!dE7NP<@htL|=-Y&P)IRkZN8qSr$x98$=** zdlfibDIy^em03~8)6h3mf(hfMnblxLNkDFq%e46el@X?GP@JN%kZXMBSVTib&>XfL zb@*wx`?hK5d7Bs0Z(WJvqGot#@p!EHeH|`1@iv@v%$dl^&PBgFPD6#S6td`q;v@j% z>czq%vJ%Zqq3B*bH0mupwPY^7|Ko$C8UO%jp5GBypFaR)<$IyX4m|kWu%7!&NZL4C&>w`pK?uo zY^iKf6qxQAYx7f`!dGEti}Oo7$jWn>Zla;zZod19Lt=+5B-!S-Z*dgH4xWM83npRG zO>g7n_ZQ&y8>YZ1<>1LFpJ3D98<3w@fZL~CW$5gQ&N>GuiBp489XFhRA0B;nI)2^o zvC&?Nkgs^i%>v|~4v6t}>b2m8Y5$&IJ3bad}< z5rSbKe)wxS9vHI(LnmB`HqE-=q+`#(OYbazuB&L*wj*x6aw4WJz6FF3jJaU}W;{L6 z;2-|SF!JzX9j~fU<||5d^ZeY|4pg#=jl!zQTQ&3m%tk6vhTK%503kVsGT)W#0vB_! zt7`pQZzGKMUqT48UAVp_8SPsfg&E`KWBzlq@yq&;u=In+;B{rAc}XjDYBn|CJ^ z*@4@q_fFcdY4I6U$Kc*GuyxlatX}^S^IP{hXB3(jw}Qu=g-MU~OEQcxEr=0)XQNd~ zJBWgaF%R}lx-aJ*JrFL32Oq6oi0jTCgPHTk;l|7EMvIcRc;@xlP_-y@s^gmThv4P+ zpG1$&7lBe8Q=aMzeIHG{Y^b?;E)PSAn!uRq%lP+niga|9E&h>Otfr|NG*yEj2+Y#u z#?1jR_dkWqI9(~&aT4#Q&@^lXA;xUN)Qj)0jMQ1Ep*qzQ|F&HZJ{1#3-H%6~o`uaj z|G-U`jz(@)A)K-YSKWRDI<+|wBW|96adWSP)13!E1PDRMA2t0>0;566R8J7~;f7w5 zv3185e6jj<076oMiK<6%$ti=Oswyr%=PJDP)-!N9y@+Wc06NY&W&k>MI1Denxex=d zxeIs9x(F_Z(SzS2?=a}J3a@`U7hYE(?z`nJy!`GWv}jw5MQ==lC`urrhI3B17T^5# z0a`R~iEhE;v1#l2xR+*BEE*>%iBEVoVsSwv@GuOnuOf`{-9e`DPYoFaflUPF6}y?j zr~ZnFS$q|M(%mU`j~os?HRD;1PX@kA=u~7h}T6`!VOKnaIxZ zVE7G_vGlEH@$Db)L(^1bIa*`NhSh4ci~`6nL8YW$QXU+OguRMKK!)yLl7ds?R7#RBBl;lh}V`shZw2En!kR> z55IhaAOB3|A53lB7KCe7u9Im1(n0y2kWo!n$Nf}yi4nv@gLFI>9S*0tNQxh&v(>Bb~x<0+^lw@S| zUAz1rZkyc8D7vY+P^pG%&%F}>uvb3AE*Xy<<*U)A@EF{5 z;dl(4+7li}bNIuXG5Y4`Q01@0(zl*R%c2gr`l6d~`@MajQ#HP^DPmd>?MjZuTPt6} zasPK3HtqZk^Iskfi8xK9io-f|$LsIDgjE|}OxpZ)&s$Gi`oKb)0wn4Nx@|OIOZ; zKtu?l3v*u_4NtZLNftqfh#{9hiX|)NVBwpS;8KdwwZkbm|Mbi7?#Hj-((|st3vWLH z5Mb*3K}qj@%%SJvxT8aP=PgR? z4Wq?$(?(BhQm_bnfz+Arp*jVxj)}DvSwf_$szK63b2TfaO=B(qSBjgYu@NbMsxI#u zmhU!CAKq6^mm1SB?An<)yz>zlHn|Uu>vkG?o^lcHAH4`4eEJraygvth&K-qwPrndX zk313w9n#+N{X|iyR?qQQMdFIM8b)6K0Q>ageV`nyZ8b?av6x{6+>^+VfM?Xk6VEnL|G7QS{LTsg+@N|72quck*q zAfQ!?)>!u00vyxjT!g{_+`I55D6$*Th{jE2v2+(DMPwG^{IN<*56JlECD8SZh>`Y0NY-A;zR1FhomP9!4}AVuq6WCGN&=00<#WbzNV1m|0%y zbSv=Ym``<0(;3RI6cvm(-{1>mruFAHWSGB8Ua{LW<(3cvrK}UqJmnm8@8!mTD`p|f zosEHaUxx9+=Hi;mZbo5VGaP%=2^cW;5-36*w)|OYdT)nIMzc2NAtz!W22Im(NXujK z{V%I9_{LEfGh;BaoE?$}Re)gPz@->=-{lBLlc)YtP=vxE48P_9EPio5{=4NXl;j?a z+Xqa>s?{H&WwX|p`OM_%K_apuLenUyPLbs*#)#{uV)1Ja;)`G2!EINM$CIzzhd`tZ z4%uVk9_r$G@g%Zkr^ICa^)w1)jB;tpIE~qAK&;S!yLe@hsR)!9@s=7MC{Br~bIDTz zjzt=OJ%B_hMJ%e;@n*8ag>+?QL#L}@kZ>0Z)40bfErZszyS4%=z)FCxCFI)VBO*OI% zkFTQf4+mui=$fiCt$bZ1n3F7MniW;)xu0CxXzWx4d+`n)L1R~<6wV%Kr z-hkV0oDNkB;o8e?!9xq~#fHu6@Z`+bFyy+4h-ww4_?`b9McjVl7Tzq44{2Z%9&ttAbk0VaOl9hME>(0j5Tj#*(aN&nFpWuaeAHe2a zKbsc1rpGYg@<}+m$F&$X{Ty6>>2UZ0doX;)dDvUEiFs{!c9b$6rQ7{TBMRi+Cl&`F zSdG|bJjLUTc)!V$<6xf;yuZ&jvJ#RknjVT%GCi6E3CLpHnSabN0KC6X*8q^T3;=<{ zCH*t$1{57ijz_nS$Ku+Ddg18Ky^MPLtUR31V+NMIJ0G3eoQO~;gkLv&j^8(aiSK^? z8pHdK!P`&%iTR5k!tzzmLm*Q1W=VA|y{-b>Ginw_&A1jvbT|chxp{C%1@Tp;bxAX8F|r9}V$qQI!>rGUivOik6fE_~`x*g6@j#%cge%@zcx zDhr$D%#*nM6KgS4?(&;VG^G^zB_7jhrfZa$|4+DuV3cOMIRsNVz^7*0nP{9ydSG!0p2x!T8xj5DiD5#dLi6^=F_l!C;ad#-hHx-^2KO z+ZL=||0x7WaJVGsG=`zqPQkpFCSvBuCHQXjmw4fwdDy)BM~E&5a$WAY38RRHj76(c z4F@;xj?=qegymnp21gdf6?>!Hy7Qs=S&O(tNt{Z6P_B;&jZrIahnmM&QFcr>ChzYX>&GR8>pg0yHtyx%xvC*?(GD8cM5Bzp9KawagWS;JkOjy`z+3;;ql1 zW%D)|Kj#(*M8Jgp&%qxm$D&ssL_`hX`tv5^^b^m<%I_8@pNMfeEdqj2qzboBx*pqh zZpG}$k7Lvg4;p!UB4YfINAS?o_dpg6mfb1m;mPOcLf3UXGVWdEWwii6(YAR4jhkbFT4%k{I(LG{rC>z0eBW6g%2@zrmy!Q;$_%aM&( zEQ<1~-MHf1{+Rdt^thoEO`9;Qj>9r)gC|Y>ySg^$)W+i1oAbrK)9fX2X+gAYeJGZFycjoKI1w+e zd>BzRh;CiFWBAmoA&Xhb-zk;#4VGf@()$5j#HlBqhH(SuAs7zeu33GnJLwX72S2P? zffrwW7JaX}5iiVJj?Y(p46i2(Yu5dNA=ggA-`h6gjrW&8a>wxPf8T>ZL=#yU(*n5V z;_2A9bsct=ZN?D?pM^tO9gf#Nnh%G=fopmV#iYl2!=)4wTC;fPxur@(*gt93YzDA2d}r)vq|+GBXqk zGWtInwE?Kxt@+CT8$KYziq_kV>=+y6w-K_Y;B)8g3jXIY9nt6=E| zbMg7lZ)3vHhf$DMi0)m^!msN;2Nj~oEBuRX==&ZF|;Z)Xn$e?gy^Ly7j+f(vYVxYFZy7^+j_L zj>S-_`q?ejpr(aPDbTWg7DUNhcrjuC9c+mcjU)tPQQkG-mOdF(t_S_b!jjEG}xa2B0QWTDCjDbbADWFej!;vS6Ol zLx4bK1iSzCnGA{S6xk|57VX8Xo2P3O;b08coj(;ZRmGRze+a+70z>;vz|?s|p+yK@ z`}AS-Jmv;?-Clh7^_%fcNEmS}JO7pC&c{6u4Mdw}oiTdQRQ&g^-!N_A01%Swa{EHN zK`F(i-K#P8o)!3X)rVNR;!%i#3_=8CxmkL7I)+_43qP!0gsqZO9nT9R1gI(xnNI)A{9+EV=QcJ9r48ec$HE%3d5J%jnEgdv9))R; zw0Mg!i{NZ3eE>-ufUZ%Cd&hpp$ztcJar3J8R*eU*0EkEKINcKW^j9P|jy$|OHf;I} z>$ZIZS@htAWsl*^W3I&VRnI{b6!bXqWbD|r9lvc{nMNF_$m-g%D~QsyW!%#Y5HL)16g6;k&pbafLEc& zEnegGwFsoi=mAt;8Qv&xtBam4Q^Ttxh=kKuVlB>Vht3@j#RCh+K^9$bC|USp-D>3L z7Z@?89>s}0PQ}wN&xay=nBQmT=Bkw6MsalKv(c(~J3RdSoz+t1x=!)Pb9Z6kOAp}O zQ!c~6OJ>63EWn7~kD}ba6BYhlSn%>xNTQ>bOF%H_%KLHJ31{P&ZYN;=OA}C-eGpDQ zrYF|#_z9o>^m2pW@O0$AQpvHJkHor2&E^OKff(lvYCgCOetd8PD>Gzdf!L&6LUz6` z4_3h#0EB|E_-EDldx4;!#Dg}S^3bMJe$ycVc||+CRE;Z3W;zG4u*P(s2=-l$H5A>8 z>7!TT(=R_lFj|4U>>_kIs0X(0+=vaE*FurpxayptD6c3(Y1Izol(eG{^tgTvdMf*pG{WBQY~R(~Gzw2FH}ED|jiQJMAnRHNLC3(w#> zToUtC^jAhq8*xst9 z>BjWvRB;z#37?~kato!!_haBb= z@`$2AD5e?!N)6E)Nj6_|mX2Vf3;_r+m|7ooI#4|bPsha}0^yz3Xd_w`c;{NhPFM&_)i@?8PubM7pKlY*pa>O+7l zD@bxb%@xeFGX|u{qM3OGS?@M?YI7nMic_5F`Y}$@M3nJY*Sv5 zi}~+XpTT2?**R&7i36X97I#M-ayI5Xe-9Kf7xz6r6q00ioRrs1Cci}Csg&tb*4&r}!ju-=Oh0pI=jIez}>XI#~*KVE$JJIs7^JSNWR zk2Wn2L#b~IzW?J>{JnQ|yrowJQwpcHlh&d#jh$Vg=6N5rz+V|b4x@lec8Do_$v^il z7SSLnb;~SBiXlCxX*vXfB$0Dvy8`Ty@)Rg&?lt{*K@_lOn~%*;c^RGqO$e5luSn1r zVS2#45%-Of1WX6KbPF%VWYurZ80Z8Fw*0hCWAM1Muzuq@{IcOgoY|ufx_3PRAAR*6 zHthTnK3`Q*Zl4eW#lcp)p+XGZ4mlprt(Xj1bR!b;;q30WVC|OGaOdY^^5gxWNZ9~{ zYJtcQL#!ki-Hkz)J%SBe*1;)f;oX&Qpx2p~D%V@JjBNmG<5jEX$g z^$G`6wuE&c##LQ1Hi-F14f-P7jyP8LGa&?uo2|^NYdZ4;t=JPpj4>3XX2DcV@H+9d z7`uBv#qZZg&VaZ2k+9B;lLi-^VX&zl5SF7}DonOnv;;>a-33bZmVb z_D0s2h%G`y6z6ot3m@DMfjH4TuM4if=ypth`c~+ghN`jl1W-pgyg5#@ejX(d1Ww<(05Iow5bKbP zX+_iXlH;*mdM~MYy^~MXD06H$Hv|y)34R{A$5I0_jGKA-Z?y&B%)j6Xjx>4$z&o8S zTO&C)gJ(2&AppG?^ybhA+wDeX~EsR`mE6g0d5UalX z4E|sh?woZIX5G0A;YbM69vuxuc4Fy=k3be($aXlgAKK|)N6lAqU+g5EcYStCd z^e7a;164KTvVU5)66-gvgWK(a*I9^Ath{>j-`Hy^R(|su+P6LgAOG+ww(R)@gb0vC z_JWD1J~Yqkf?RJA2KO6-2Nz7i^>-hIn=YA&i0a3MCl3PvOnIUoT#7Nsqvoiu0}h;< zB63D}ySy@@rCM5qAK&?)%=94-2|-(vL7{BPa4Rn$oe^YBmjfVt$tI^uPV4l~WQ`=b zn2`#sUi&rjvs$BD=VS2wFJGd0>lXNP9Cz_j7dV9X+pR{ks6C1T`e%x(i1@)1zordXwLjil^)$BZ zU5%-8?!ef=Gq7ON`}q0y?{Rp?Zdm%>bNFff8=zWEQjX%*OCNySVn-=DIh0KC2V(2ZHvOEObK_pbC+;VYV zN{+B(!T<;qP<4KGi_IxCt;xUuAQiVZTU{TggjAA6=E_l39bwK%uSPZI=^;r1a~zpL zG_n_g8Z!!b=8yjrBksKlZ+@}}U;JE*sP0GmmffHsgin8Z6)|PD>@x-h5LKGxam4%Sy&c)5WM`H7iUqN&?`do4| zo_%FL=8gXfGv<#)Wnc#YQfuwM)oD(x2s)ZxShR1stMuQD>uz&?AFma+Hj`@#|mTpscI{ z8+ZPQi{+j7KO0^b$79Eiy?s%8kJzJjjRvtw?5HAkP*l}cyNFp^iP{7;TYInCTAQL3 zv?!&NC;!KDf4V>4`+A*w&v}2&`50rV!#}^Kd!t0>&~OLRsH5)^k#qW9JCE8hNQwuP zGQS*(z6w01cC!u!rYd~1617#L+Y5C67KTZ7KBjx(;w76fT+aoTibPk zLu&wlB}QLc!`$}O-@15&Q-E8T0(&A|)+glmO!#Dhq3>F0&I8t@tt1BrjhyG}r3m4_ zcEJMss;UIW#`l!|OpuZJ3A6?mEu2Q|(=|1_+hLEn*Jy`}(VNM~0z_fZXc-=N_Gy+Q z{ns{{F+#fI)B^1FzxU}lzjK8>`p?*-6M2^?X+y8gYulD`a5uuk`Ul>uYs%)QWnqk9>udQX<+qEM35hkwnJb6+WTPvZ~%mRz%@1@gwc zV`%@@5^2?R$e_I-Jh&hzuILU_yS=o)g}mNr45Xwa_xTOaq{A&>$;&?FV^%&2s3|*4 z<)Th$n&k3%A$MBTl7ub${EaO#wp8GSfM0%W4 zj6Z2I+lK5?5EFx)UTslX-0|fa&X(CtZhM!>ib7i#?`CXI`M*78=GOm6`cvE<@-`W- zM9JlY1AfE~JtUerzs`hsu z^0MuO&+Ubx_jg(9I>WEKD4)#%>hMo*^2KvwVtqCU41~;8Bccsns8=f0e{=-iYCIIK z8J{gHm$iR&ukX3`kHI_~lT`c};JG3G+AQHwqrVv+O2wc%yVWtoA`HXR&%4OE3Bakg zrCq)x!Cs_i9S|D+3_sY%nWbrKvF3RG-fvEcYfzb_ph-cQ8Ht3J;wpp*@;U#mRS499 z?Xec=ARGLtAKB@4TRV5tga15#6PGMQ*4-dE>8*maJjJ5zD$-pG+4!H%Ky6+qJ8uJ; zy#nSq`m2YxP zS^6X4O?%%fSLyub{oRm9;oyobz1WNb@O`B|-)XW; z>31-~o{LaIA{_tYYYqZ3u7?e2)~{#YI+`(+ovX(jf$~n97;NobiZce?M}CV79ov4~ z$(%DfKCPx@lO=W2`F1KEBS`9=a$ZecIso_5(a^BWW^%YcMgLF?cNye;dYI;acgkYz z6t@9p(>#2EutA@Q?$e<2!K5VcNpxupI}7&G{q6Jxey}Qmi!%N*=;|TJ!ch)){{+3) z1RA_)^I4C|M&tGCu$eo$1Vtd7xA+YAqm|2cWo=3n&S09@TPeeaH;?8zRT2}D-vQR_ zW3MgXP|D1{|MaP7ys7k$&c@fi&~}Sv&5M;5%*v<(w;4J2=sPEm{BkyW=}t9I6tzM3M%kETzxWvYzwq(l~lZe$0yz?yjeCoqDN zCw}yv1NdD7DW+~xDPiki4rO^uTh0sEa=CG0t?DLhBOY{^?9$jPhJ9lm%e?q2KO(LO#9YqLUd{!{ESrW@NSC zV<7@SqSg)-@2>mi0lh+=e6*==9e7d5^_%QAt1^@q#FzeqD1pam+yq*POreudMeNa@ z!%Ru_Z0p}5H&MO~LI=uL6xZKm-4ikzXAa4O*({d>27vKLjWX*qLG8TtOAi;XhqXbh z;jJZrg+9B=eG)?o=}5%BVhW3gR8nwKn^174uO;g#3DR~tAN9*8O5nE>k^Qp~(-3(& zgiy52i3qiSim-%=TL3W^-7h0mkX0M4f6;skS}MWC!HoC{L5@vFVE;+R(7cHgF;EB)sZB4uV;)%ASVGT6# zD)*dqng6a3xE<;drQTloW2t9cQRi_KcV}K))51ltzPMAYpHjY6GWD^e`#F|X=lZ1g z;VZJL{5{#kF~WVPY|BT^&eDL{#^Hb4-MMDVf=mBeP$616=|Sn&j4OwVIFQ3m4O}V6lgohojU2m>K za4j2tO|L`Zbq0impOfTg!g2?d)&o+I#vzEN*@WJZRNf-PH{4|YA5*RzGV5`tsDwFhpw@06*U^gladrWDPemxA z(om_-4c2@ckPJj6LpIi8)u#|O_ZX@V`BB?0JLltJ)U&|($22Zc1FX`VC|*90!T(q)JcM;aDLuc z7QkxU^SN(rEHmoinE{t=(6SrtHd~LQOH7wroq1p|W(A`aBVe;_FJW)2iG#O1++yNh zQ&PD%EkoH$@KSf!&mRrR{ixl>6RpXo8KM%G3`8d&5TqjQ8$TR?==>7;;qQIk9O5gG zcG<$*`Q^WGYsLW{cSCGG^N>oaG6Fk|FhT)t4Hq>X*^rw%ewJ)LA@Asn}U#K~sCf1Ey+IY8=2;ei^9c<6E{n6tw}<^?GB-2s{b1Ss zC4VKOKw|8(Qi~6<3CPdV>uS5a?F8AG; zTfjrh%lyXNw0x+w_21YiL@=&=Vi zCF71JmJ=c0q}SG{P`9Aha2PyWkbUdDGVfD2Ebb>#FKF_45mj(fcA;D^Q)Iee;{E5< zzUnijKlV=oCsO;uWsZDZgcgZMo^Dxi;0JAq-m4NtmbiZoE7&Y<{HF4&yc3Z$;_l@R zPx>RezWs1(EYHMZH&+<-<6=oxZG?`h+LqjDu}}~sl7f%0=G8fF@?j@%EL}AgYS$5J z?aX4FSri6f-cX-enNOGu^>_Mx+q|W`d7u~9Bf}ma8RanGb3FFzXI54dhW=%GEZPHL zZqfV;P#Xl1)Ux2*S05%;9ez7JHMw9VR6hx~;{j=1WlAZapU-d;OlYJ*H#NPM<3PJX zjhrb(1fNCATh9|!Sq_RW9-9gh#uF|i*9J#Z_{Bd-Oz(X4hqZMtYBXmJ&4_iNPuTPE z>vXACeGn7A9%$FrEnw+X!n(M9Ft~9{CFYo;LRaGH8nJF?5FzGa@I_pi=qx|9oizg& zibz7V2Uw9wwrg4?FOAc%8o?M2mLC+HzlgbL6RlI9?+^R6QYL)M^wy1%I{I?Bdw8T+ zAdMtfW#lB;8%)Iv;V+d`6*%!>M(s=p)uC9?dJ-s(p}$qi*JFc{fjv-DVo_y`2o2rw z#2!$cE@r3RfF`jT;l(&8_0f1WzkvG%Vh zW}zvoav`%<$rsNocCZrE{!E!W^xVGtO(SKjW$a?%8sHVTjTGNbhLbUULO^CY6WbET zq%JNt3Uo4gO*qpx&agbf1bz4QPQE0x)> z-(+XFEfA|W*OGHlA~p3fqhSuRXjkohC>dJeX;^9Xi|Fp3k;K*3Snj9iWEDUML4HU~qxq8%3pxb3SBZW*l2}XL zqwA0=$J|c3@Gq`e-w%4Ft4mvtu6t;ZOTR75~XcY{vlc3;5eNv#y_K&T;Ag%L`%q^7!6^7N@vVX zrx#WPME2fRqB-!j3crB1UfI(EIWGc7S*8*-*J?r1Y>A6s3op~&|CT00nHt}kaEWTF~YSGabrHfwLD2W=F6uF^3`<#*)--f=^!pdG{HvDM@KYZp}t z+QG;xPD|*7=*h)0ymPOGFXxHVM1G%M!)fv-^pEUlT|Q_F#pa6BYZ|Jv?xZyy`RAV1 zPm2XIpjQJw1!hH)eI9@TwQv%<65E_KP}G_x(>xFa=xVdDPJQ>GT6yKxRmeY#jHl0O zq!qCDIER$PIlBym(Mf4%oKNl`r1*6>P1iHz!guX5>*&l3xSP~6O{$p=^uuDjWooW> z?kH2j1yar)AN-;~iXl&U8y7ujX#Ox$Jj_u*MJt>Qp= zVVxxwzjlZS@*RLyqeWn9ryAT}h&h+B<;b?pv3PpEUoLDmyqA#&PzKu7dAp(Kt*bV` zV{EwE+*Ie+nH|>qhRY-u;l-Wat;I@ac03LJRrZr}TvESuP=Ht??uG5M`oaP{u0{Hn zn3i|~N7;0;ecQZ_2nd|Ezv6&=NZ|u+*>ma-?O~P-@fQSB!O`TJ^X^m`hX&oeC*=&N zT3K}`iVFJI?A8>a5ufh?U`3T(2-qklraP2ZBrj`=cA@_9WIoN0X=DT_oHozvw=47f zL#;^W9JVq8{#CR8Woa2C$`p-zJ2r_BLFNIO<*SxEDfpnQ@eQKe4R-=gDJ6Dc^?KG1KS z9U0!0Q7iW=bvZyQq;3iWBAEqqq^FIqf7eV2c%w*P;@j?`pvYE+0S{W+5^_7ltj<6P z`@L$p2?bXfzP(n->C~0F*{!CQugER*2cUSX?Pe3}65|`@9Nc*DYowM<5f%y7a*v^xvf9Z+) zq408hr)<_m?#`=a7)Vd|BVA{;|LbNTkJNC*kC$OO@a;NS>kD~?4gL2us|X8rZ6T96 z{#A@Dc$cWFcq2aULBr)dN|RP}vGlfe;qlYz&iO_HB~Q5i`DFvmGF*oz7eFe*b>e~vnM(^v1bm6##UknK!fQc80L9Wi(6 z%18AmWr;D(@iD`6o9{aaJX3?F(3;{d#)aJB1K|6>jvy597-66M7-}=&`lVj|qwRc{ zy9zCxGj7O5w|tIQ1B7hi#Y)WL7;pR_CRUMg@#-5xg+7~A3PPVq4Wrd^>uH*_+8w0q zkg<+BRyR`X(VBb0X_TR7*h;Na*UeZ!_Oo2T1ea%|RV?WJIb{wV;L!L5Pj(^IC>MQdy{s-Io6=>VT2)(O^wPnt%gFAZK|!-cLz;=(4BuXEopy&k1lyP=hqsU1+=%efns? z6I_%2OpcZKM06;FqJGAfq(&*aGZ`Q-C$txA~{N9%<@tCcQ5u53&On~>`fwl*Cr`|jm08W9RZrjQRnF1fHAGr5J zd$+T(O_A<(sU$v9P(dju@bt6o&G%JB2=?k7#%@){14NIGRvxhB@d_F;Wctyv9b0CreY6$i|i z-JN-5nh6}d+Chdee9LM#t3^_Tez+Dj{!**L)OKuZMi4 zq8lzbPcLZfgPCOmh_ne+_7eHj4`kSuW`F#f>0yibxNu?a`XQsIdP$(}&^TyCqM8rY;(e}4;t`ayoyP5DbA0V^g4>&4^+1BGS8nx|ajG;svT z)MN2USiP%P10`&5wDrgGB9lh=0BsH>B>5Tm?Z;Fg3H-)OB;aEJc_cx7bhDEx04_P4 z=e_l}6P7KEn>RJah9tmSkx(XL8whIfB9J#9zmC`kv>PvIqOD|8m@lIjST%1OxC}H= zsrOhq^5sim4PN5iqSCZSqUZskbClU|3C;T1);0_N1oYPp*Kbc1;s|`ADb-dAygJwT z`-jORNHV*W6WtdW_Ou-gBE1ChWt3NW@Z0QDp-Q(`2_wkp7y>CnEiT}osS(6XXn8=! zH1c*?ci^o{cAo>wwy|B5hOJG78&Tv+td^YTN~6<293|WT+h({Y=AOhg`@59hI@cHg OxAb+4wCgn;qy7iVg#FO~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodmagic/images/entries/alchemyarray/simple_array.png b/src/main/resources/assets/bloodmagic/images/entries/alchemyarray/simple_array.png new file mode 100644 index 0000000000000000000000000000000000000000..04771848ec43f63759c5dddabe64dfc5beb55097 GIT binary patch literal 27736 zcmV*TKwQ6xP)EX>4Tx04R}tkv&MmKpe$iQ$;D23U*L&$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7h-;5kkMjOg)ia%)oPe-NVP%yC~1{KKJM7Q}QMQd?N82(+!JwgLr1s z(mC%FhgnHdh|h_~4Z0xlBiCh@-#8Z?7I5bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMY5*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMVS;j?z&5&G00006VoOIv0BZpM0L!J1()IuV010qNS#tmY z4#EHc4#EKyC`y0;000McNliru|+1`AOJ~3K~#9!?0t8XTt}7uSM}cO z+>=K+=V&F%mStITl#O!&8 ztdT~OXL>rmQ1$zxr(4tgZne56$hJoBoOh1Y)BQr#ty}kg_ulWaJO6&ZG`u>JF$-Wg zbx6P$Fpz&FVis)M$@v@O47$!;-#vb?9W3vf!zWZi%lmFJW+B#*%Kfnfl1a<;Si(aL!Q7!C3l! z`G?2netzAf<&J6Bv*zDRN{QyWsB5eeQPcgbhWlAPJ{?0wm%F~3j9ISFq8&*%w#fO+ zwgmazV7ZqZ|NKGJbPk>;CtPEws1CS(Z(EM*GshONE#bOmS(V>4e(_Ed9jyu1HLR3_ z6~EhF+$6q758ZJj%0dPLVNad_xxXxhgk?Fdzxz_|6?A9>i3cNgKB5 zK=)|^8!QlQi#%wK#Z-^+5}%ka7_9idd}z1vt~5w`{C3mBku0@u!dMWK8B zI%$4V<7}Bu@tcZtTM=C2V1)cc+mkt3Su;3n({Y=%030E}@@x*rkuD*22*Gx20U@Y~ z=HOhqKGP^+Crl&GxyuZ4Yyry@+2W=gg&8rIgUU?&l9z`5+wk zJ5<&Na$k)B4aXv|Qnt&rF^pWRpmInMm9_r-eI18)wYcVhYs|H;*fc! zJ?9Lmxb5<3D{B4VTF~XIH6H13Jw%|)Jn`Qw$Z?AjaSsI2wpDG*8fkxIpeocEHD7(B8JjdhVcxv)tEP@2y{{8zd^PY@W! zS?2;I<92qpKDBF0x1f|_d9k!WGKQQJdH0be$VdhNqlAYvVS5chobwa=V+bg0NC-*J zVQ*b^uCt<_VW1v5H5lP4KkX;V-VI!&B~jGwSt@=d`(ZxwfzF&8=0!H7bPH=q&m<*j z!cr@ckv_bHrWZe63Z3nG=IX&A)E{Zju>#bKhoyJ@ZYI3$(ct&#E=$r%+Vr#KU0cd7 z>x{X5^ZW>plt834;Tj)m9vNfshul^~ywfDzqqAB86er~w)0>eYD3^wH1c?_=VL7gG zxA1qFpQNc)DC{#JUpa|t!>2oPPt}zk_ z+q0qGb#2Fyq_Qcm^1H{2yXVWc1e)q1u6s4sMW7k(aR`LGrv(kAlsK}x#pQ-@&fq7^ zb%zMs2}gi)&9ymrygD35xUTEX3z15Z#!>R$S2&V%8K@9ztRpqxB1(F`G;2C1ed5f( z7qbA92@A=%;k&-g`acg`b@RcRt^pl_e#Oc^R;y?9UIO+8V+~7 zOT7U3o_9|uYr`@f=thy&ATjBTGXz3Lul)A%ngCi(L72|Fa4g{h?a(IAy@3#hQWGOdch z3Rs?yWn2$xQ3F6{Thi^z`86;ixq#X!soli39MtV=buGNXqsv{3r>!YYCb9&|yo75a z;UoM^E9tl_5yz2a7_e$ckW>mO;@w&sW3ELB04V}+^9Br;zt0#W)0{bHuDRn}bG?I= zau6uxPD4eq5gcfe9IXC&ab9(I!B?vv*nM4>bGUpK15oRE{nyni@TSZwBhmU14aSxTobH# z|B@A$++uuk0I;m$5!e1gXV0aD_wP}P(q^jSDa!bCWLoKE5|g@4-NU3NEI9)(> zzJLz^+0cud#1gc73Ay4HkttXDCeL~)phfGeK3NRHA>1ZMl(ef;Af8Yx9@`SGyaiq7 ziii#?a*PN!PeNH}BMI}7aR!<9-m1{4rZF;X*Kn-UHAWtvj+zl+msCjUPHq!YBHEsG zylJ{Nw8|{Tg|%HN=X(U$D%p)UgA>3eZpI|B=3XNoB#ZBu#p@fO1SVrmXn) zX3TB%FwRJSR!RahV04{=>M%SS?6@1Gpz{Oh6mUVLD(A1H4EDn~bM5wCzm5@;stEVQ zLVIJ}eNRfZY=L+r<=UfkgOjPvR?2ZbvoBy^#Dog0e0=BGtpFGUI$9F&`VE%}FC0lC zrD?h)$0fnufV)(cF%B<5EvBN3qG-6JRAg@Hj0D6efj5)3>kqolNw-Bff)p$cH}EAK zx81(~2C9CvypW3&rE6>b1PGL|3*m~ss=;F)WIaLt{(!sy+} zwuBqA;D8XEv|1>CQA+kMi43`md?c}+SkEr)n%B05I4TDPN-%xgJFHg$;!(0Cghal| z3WN=`HL~LH3q_f^=*nlwA1A}B0a5pJ#3E;ZB!Cx^5>-ZCDY0E@_b>G@73HIfrO|)O z?p?6@8KW!gNWRyTqN4{SbZBHUZq-}fsx=ThFXr|{x z)Fex+4Ub7$s%hnr`nv3On$BT(v>d>RF~EpxG+@G6ab~&%v`Tkwb~0wsv1Q#& zc@4&B<{&A_G-9rCcTKn=M(*+IG)DnvBu~K8#(UL&8!be;~BkLy4dIey3b%ZN?u1QbEEqJJmGe-i%z)}euTx01t zd%gllB*^3tJ*+8|i@O#f5cZG@OxHCcUqFI$_vCu~I=p^^6iUkcBe@UarPZIye)_Ty z>D1U_LvF0VEg9ifG46hzQV3ccTaXHXj8YWHDx?mNPbU>Xdfr)4_w@Mn0jU7EKVbA* zj6GE0?X|f|nP&ZM9=}(8zy5k^s&PnvAHC&0DCA~R5fF`YG6HqhTL3Ddp-glsOC)cU z#jjC{zN%Clg0a%_8QxWO-$n8*l&s-Z*_n#@>5FB~HAa>Imy(mv{YWM4Q!bov^G#?P zgW=JLJP4Zm&*Rg{(&td6uh&(T?>PlfQA0EJ*p?`MvKS);%}hD2_`Q@8k=7*1ZBMr1 z(mCm;YXm8UWOSIwwj5G%=>{k1u+uvP=|aE#ArA?(b+ja4CM;4L<f8+i6s~dKk#6vHWD1LM9E@7zyBMIwwO;iP*a%wjA#? zNd*wD^r59bN&x|9ba4nr0E7atOhrzC(&R55OHkJfoW&Rb$J1no zLNgg`;M~!RgK=^0B$bCPijRw~_P zDs!IoE=FWY8cp4O7qSv=3&S5YNR3}sMOznb#JdA@Q%J`a*#(ueSbRFl ziJtYbjuhDmNz=HCACYSegGPj1i@KvZf%?Pl1e~hDK@!|*Z;F#4E)~0Qsa2XK6gQUU zODi}S8DolyN>g6}!6Y5Fmm%$3q5wpButlCup1Ad?|vy4x=`fMnjcq>C}A&ORBz zEoJemQ2kOc1QkoH3hYvml4|{0GD<&VTv4Uw4|tTJM{@ENkFI*xQgSRbMRzGxwI}s? z8Uvsidniq>nhWLTqOgGaD+%d6jR7b{RQ5rk4C|A1(XU5@pbwW4D696LVxR5yfF+Si zW-txONLxV`3v3mzg6JeGcIF3@sT!OL2tiv0?p};QqSGYFN>vJ+h$Mq^md;iso+TbN z2SiSQUQkFRAcTNF>>+oBMAS-WW)T2WxYFH5O9iB98dnsM2v=js%+8Q+9Y~oW{mA{U zFJO>KDOSo<76^e$7trVR>!d(r{QOwt)b$wBRc;hGXj_8Zd7A1v$yG`TC;)V{#7Tvu zYOGN^EbLk^X41yVqi!HjReo)FG}1z(=14a*lvTO&BP`P)`4$~VKw~s9YCaGsWtzmJ zlOU$GOo#O0c>!IQ4@~O@MA_=qkz0N^Ovl1VASTsyH;rVV#*LeVQri1pr*D)jqO=+8?{ zh@r3n+e$A)7x{)qBNc$k95<5=842(O4N?L0*}^b1n9kW>9K_#Y%Q`C*l)#=#_IY<5 zs;tp>(;-V#jw;rlV3}t?%qc$|_`x_MTO|pHPP^^XOiD=uHv_F;(|lR5F^K5 z6|sqTn&gB?#e|cDD?*YS6zxrM*rxmY6@vrrXafUcZ7F3`fpTqP5tHa$$>8xDXTJi- zHS89*ri%vQDa zCQm!_vo5o~`&lzQl;y?GKdB>J8pV^}gA*R2D{GP-Sz) zII9wHREa!H)xnq18-*&7N!SAyQ_{17-v?E9QUd;*1uMI?JKs5&AmT&-l(qRBlp20^BaGbOm3 zc`wG`>qL}hR2n|Mg3MNnv?WPQg4`7)5Kt62IhKHJJ0zAsJx{bF zMPd@V!BIOrOzy_ij+|6fC~`%Tmv96e;(aNySRl0hK5LMRMnK$ zwgiF!0|V{QeL(}d!4=d~G$mCkVUatT5E3U2wv%htOHGELQ)W45sN2^{rY2U@1WCnn zXnT{ZD^Rf9OLp`<#WL)U0u*AkRVzJKv>9!9G&)mFD~(mfHXX9*ij)$XNf8KKmn9GSn+6S z{=Ba6-%1^Bk6#soPT|~9_@LUn_YCJzRZ$uxxr?P9X2L3+uTSyyl1tCeW*0!yO5Yh& z*;A!v=q012A4pY}38jgyG~J2M4KH08myFR`ooh4!sg-hQCBqn*#3Z{ZrEJBT1V&A%CbRC6F$+g_ zwYWa7s10Dq=yFn6RiP_KvE#PX$4GjrY++TNdt0Ui`y9lH+Bt}iHQn*kwAgXdP9gA+_sVcG7bWSQ0rl5(}4X%tznFFjlklxvrBo~`6 zV2}(zjwO_gERx7H({xVKPXjceE*JcaOgJ8Fi7NQ78O=?0HjW=m(i_epwc zF{&&BB9%GbX)2qymhAh=K75CF1okMcN|CbiPIuU*P?DFPl^8%DxmE8G=;=LplsMoe z$FCVmZu>=<)r>PVpNNv*FR%8MCX{+<&m$aBvj6V!s&J_R))`1W$)$0k*(IjdrV>`k zgbS&d<g05R>h_gVTd